Browse Source

Fix queries when using multiple URL config see BT#15891

Julio Montoya 5 years ago
parent
commit
1dacd354a3

+ 1 - 1
main/admin/access_url_edit_usergroup_to_url.php

@@ -109,7 +109,7 @@ echo '</div>';
 api_display_tool_title($tool_name);
 
 $noUserGroupList = $userGroupList = [];
-$ajax_search = $add_type == 'unique' ? true : false;
+$ajax_search = $add_type === 'unique' ? true : false;
 
 if ($ajax_search) {
     $userGroups = UrlManager::get_url_rel_usergroup_data($access_url_id);

+ 1 - 1
main/admin/usergroup_user_import.php

@@ -83,7 +83,7 @@ function save_data($users_classes, $deleteUsersNotInList = false)
                      WHERE username = '".Database::escape_string(UserManager::purify_username($user_class['UserName'], $purification_option_for_usernames))."'";
             $res1 = Database::query($sql1);
             $obj1 = Database::fetch_object($res1);
-            $id = $usergroup->get_id_by_name($user_class['ClassName']);
+            $id = $usergroup->getIdByName($user_class['ClassName']);
 
             if ($obj1 && $id) {
                 $csv_data[$id]['user_list'][] = $obj1->user_id;

+ 3 - 1
main/inc/lib/formvalidator/FormValidator.class.php

@@ -914,7 +914,9 @@ EOT;
      */
     public function addHeader($text)
     {
-        $this->addElement('header', $text);
+        if (!empty($text)) {
+            $this->addElement('header', $text);
+        }
     }
 
     /**

+ 1 - 1
main/inc/lib/sessionmanager.lib.php

@@ -9161,7 +9161,7 @@ SQL;
             }
 
             $usergroup->subscribe_sessions_to_usergroup(
-                $usergroup->get_id_by_name($className),
+                $usergroup->getIdByName($className),
                 [$sessionId],
                 $deleteClassSessions
             );

File diff suppressed because it is too large
+ 265 - 146
main/inc/lib/usergroup.lib.php


+ 2 - 4
main/social/groups.php

@@ -21,10 +21,10 @@ $allowed_views = ['mygroups', 'newest', 'pop'];
 $content = null;
 
 if (isset($_GET['view']) && in_array($_GET['view'], $allowed_views)) {
-    if ($_GET['view'] == 'mygroups') {
+    if ($_GET['view'] === 'mygroups') {
         $interbreadcrumb[] = ['url' => 'groups.php', 'name' => get_lang('Groups')];
         $interbreadcrumb[] = ['url' => '#', 'name' => get_lang('MyGroups')];
-    } elseif ($_GET['view'] == 'newest') {
+    } elseif ($_GET['view'] === 'newest') {
         $interbreadcrumb[] = ['url' => 'groups.php', 'name' => get_lang('Groups')];
         $interbreadcrumb[] = ['url' => '#', 'name' => get_lang('Newest')];
     } else {
@@ -41,9 +41,7 @@ if (isset($_GET['view']) && in_array($_GET['view'], $allowed_views)) {
 // getting group information
 $relation_group_title = '';
 $my_group_role = 0;
-
 $usergroup = new UserGroup();
-
 $create_thread_link = '';
 
 $show_menu = 'browse_groups';

Some files were not shown because too many files changed in this diff