Changeset 27996

Timestamp:

Mar 28, 2014, 2:24:14 PM (11 years ago)

Author:

plg

Message:

bug 3065 fixed: avoid SQL errors with external authentication

Location:

branches/2.6

Files:

• admin/group_list.php (modified) (1 diff)
• admin/user_list_backend.php (modified) (3 diffs)
• include/functions_mail.inc.php (modified) (1 diff)

branches/2.6/admin/group_list.php

@@ -395 +395 @@
 {
   $query = '
-SELECT username
+SELECT u.'. $conf['user_fields']['username'].' AS username
   FROM '.USERS_TABLE.' AS u
   INNER JOIN '.USER_GROUP_TABLE.' AS ug

branches/2.6/admin/user_list_backend.php

@@ -36 +36 @@
  * you want to insert a non-database field (for example a counter or static image)
  */
-$aColumns = array('id', 'username', 'status', 'mail_address', 'recent_period', 'level', 'registration_date');
+$aColumns = array(
+  $conf['user_fields']['id'],
+  $conf['user_fields']['username'],
+  'status',
+  $conf['user_fields']['email'],
+  'recent_period',
+  'level',
+  'registration_date'
+  );
+
 $aColumns = trigger_change('user_list_columns', $aColumns);
         
 /* Indexed column (used for fast and accurate table cardinality) */
-$sIndexColumn = "id";
+$sIndexColumn = 'user_id';
         
 /* DB table to use */
-$sTable = USERS_TABLE.' INNER JOIN '.USER_INFOS_TABLE.' AS ui ON id = ui.user_id';
+$sTable = USERS_TABLE.' INNER JOIN '.USER_INFOS_TABLE.' AS ui ON '.$conf['user_fields']['id'].' = ui.user_id';
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -163 +172 @@
 while ( $aRow = pwg_db_fetch_array( $rResult ) )
 {
-  $user_ids[] = $aRow['id'];
+  $user_ids[] = $aRow[ $conf['user_fields']['id'] ];
   
   $row = array();
@@ -179 +188 @@
     {
       /* General output */
-      $row[] = $aRow[ $aColumns[$i] ];
-    }
+      $colname = $aColumns[$i];
+      foreach ($conf['user_fields'] as $real_name => $alias)
+      {
+        if ($aColumns[$i] == $real_name)
+        {
+          $colname = $alias;
+        }
+      }
+      
+      $row[] = $aRow[$colname];
+    }
+
   }
   $output['aaData'][] = $row;

branches/2.6/include/functions_mail.inc.php

@@ -441 +441 @@
     AND u.'.$conf['user_fields']['email'].' IS NOT NULL
     AND i.user_id <> '.$user['id'].'
-  ORDER BY username
+  ORDER BY name
 ;';
   $admins = array_from_query($query);