From 3d4308cb5309c6af2f320bd4009bb8de07796c9e Mon Sep 17 00:00:00 2001
From: Prasad <prasad@vtiger.com>
Date: Tue, 14 May 2024 22:46:26 +0530
Subject: [PATCH] Fixes #1880: Removed restriction of username admin
---
include/utils/utils.php | 4 ++--
modules/Calendar/models/Module.php | 2 +-
modules/Users/models/ListView.php | 1 -
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/include/utils/utils.php b/include/utils/utils.php
index e3272830b..98cd5cddc 100755
--- a/include/utils/utils.php
+++ b/include/utils/utils.php
@@ -148,13 +148,13 @@ function get_user_array($add_blank=true, $status="Active", $assigned_user="",$pr
vtiger_users.first_name as first_name ,vtiger_users.last_name as last_name, vtiger_users.userlabel AS userlabel
from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like ? and status='Active' union
select shareduserid as id,vtiger_users.user_name as user_name ,
- vtiger_users.first_name as first_name ,vtiger_users.last_name as last_name,vtiger_users.userlabel AS userlabel from vtiger_tmp_write_user_sharing_per inner join vtiger_users on vtiger_users.id=vtiger_tmp_write_user_sharing_per.shareduserid where status='Active' and vtiger_tmp_write_user_sharing_per.userid=? and vtiger_tmp_write_user_sharing_per.tabid=? and (user_name != 'admin' OR is_owner=1)";
+ vtiger_users.first_name as first_name ,vtiger_users.last_name as last_name,vtiger_users.userlabel AS userlabel from vtiger_tmp_write_user_sharing_per inner join vtiger_users on vtiger_users.id=vtiger_tmp_write_user_sharing_per.shareduserid where status='Active' and vtiger_tmp_write_user_sharing_per.userid=? and vtiger_tmp_write_user_sharing_per.tabid=?";
$params = array($current_user->id, $current_user_parent_role_seq."::%", $current_user->id, getTabid($module));
}
else
{
$log->debug("Sharing is Public. All vtiger_users should be listed");
- $query = "SELECT id, user_name,first_name,last_name,userlabel from vtiger_users WHERE status=? and (user_name != 'admin' OR is_owner=1)";
+ $query = "SELECT id, user_name,first_name,last_name,userlabel from vtiger_users WHERE status=?";
$params = array($status);
}
}
diff --git a/modules/Calendar/models/Module.php b/modules/Calendar/models/Module.php
index 9f34793c1..2eb78b813 100644
--- a/modules/Calendar/models/Module.php
+++ b/modules/Calendar/models/Module.php
@@ -306,7 +306,7 @@ class Calendar_Module_Model extends Vtiger_Module_Model {
$currentUser = Users_Record_Model::getCurrentUserModel();
if($currentUser->isAdminUser()) {
$query = "SELECT userlabel, id AS userid
- FROM vtiger_users WHERE status='Active' AND (user_name != 'admin' OR is_owner = 1) AND id <> ?";
+ FROM vtiger_users WHERE status='Active' AND id <> ?";
$result = $db->pquery($query, array($id));
} else {
$query = "SELECT vtiger_users.userlabel, vtiger_users.id AS userid
diff --git a/modules/Users/models/ListView.php b/modules/Users/models/ListView.php
index 20d72c0f6..963de8b27 100644
--- a/modules/Users/models/ListView.php
+++ b/modules/Users/models/ListView.php
@@ -74,7 +74,6 @@ class Users_ListView_Model extends Vtiger_ListView_Model {
$listQueryComponents = explode(" WHERE vtiger_users.status='Active' AND", $listQuery);
$listQuery = implode(' WHERE ', $listQueryComponents);
}
- $listQuery .= " AND (vtiger_users.user_name != 'admin' OR vtiger_users.is_owner = 1)";
// Impose non-admin restrictions.
$user = vglobal('current_user');
--
GitLab