[php/libraries/UserPermissions.class.inc] Fix editing of users when a module is disabled (#7754)

if set one module as "No" in the module_manager, user account module can't edit the user ( 500 error). The query is incorrectly including inactivated modules, which causes an exception when trying to call getLongName() on the module.

Author: kongtiaowang

php/libraries/UserPermissions.class.inc

@@ -302,13 +302,13 @@ class UserPermissions
         if (!$this->hasPermission('superuser')) {
             $query  .= "JOIN user_perm_rel up ON (p.permID=up.PermID)
                 LEFT JOIN permissions_category pc ON (pc.ID=p.categoryID)
-                LEFT JOIN modules m ON (p.moduleID=m.ID)
-            WHERE up.userID = :UID
+                LEFT JOIN modules m ON p.moduleID=m.ID
+            WHERE up.userID = :UID and m.Active='Y'
                 ORDER BY p.categoryID, m.Name, p.description";
             $results = $DB->pselect($query, ['UID' => $this->userID]);
         } else {
             $query  .= "LEFT JOIN permissions_category pc ON (pc.ID=p.categoryID)
-                LEFT JOIN modules m ON (p.moduleID=m.ID)";
+                LEFT JOIN modules m ON p.moduleID=m.ID WHERE m.Active='Y'";
             $results = $DB->pselect($query, []);
 
         }

test/unittests/UserTest.php

@@ -184,13 +184,16 @@ class UserTest extends TestCase
 
     private $_moduleInfo = [
         0 => [
-            'ID'   => 2,
-            'Name' => 'candidate_list'
+            'ID'     => 2,
+            'Name'   => 'candidate_list',
+            'Active' => 'Y',
         ],
         1 => [
-            'ID'   => 5,
-            'Name' => 'timepoint_list'
+            'ID'     => 5,
+            'Name'   => 'timepoint_list',
+            'Active' => 'Y',
         ],
+
     ];
 
     private $_userPermInfo = [0 => ['permID' => 1,
@@ -1127,36 +1130,28 @@ public function testGetPermissionsVerbose()
         $this->assertEquals(
             $this->_user->getPermissionsVerbose(),
             [
-                0 => ['permID' => '1',
-                    'code'        => "superuser",
-                    'description' => "superuser description",
-                    'type'        => "superuser category",
-                    'action'      => null,
-                    'moduleID'    => null,
-                    'label'       => 'superuser description'
-                ],
-                1 => ['permID' => '2',
+                0 => ['permID' => '2',
                     'code'        => "test_permission",
                     'description' => "description 1",
                     'type'        => "category 1",
                     'action'      => "View",
-                    'moduleID'    => 2,
+                    'moduleID'    => '2',
                     'label'       => "Access Profile: View description 1"
                 ],
-                2 => ['permID' => '3',
+                1 => ['permID' => '3',
                     'code'        => "test_permission2",
                     'description' => "description 2",
                     'type'        => "category 2",
                     'action'      => "Edit",
-                    'moduleID'    => 5,
+                    'moduleID'    => '5',
                     'label'       => "Timepoint List: Edit description 2"
                 ],
-                3 => ['permID' => '4',
+                2 => ['permID' => '4',
                     'code'        => 'test_permission3',
                     'description' => 'description 3',
                     'type'        => null,
                     'action'      => 'View/Create',
-                    'moduleID'    => 5,
+                    'moduleID'    => '5',
                     'label'       => 'Timepoint List: View/Create description 3'
                 ]
             ]