Changeset 865

Timestamp:

Sep 18, 2005, 12:22:22 AM (19 years ago)

Author:

plg

Message:

• improvement: add information about how to use an external table for users

• bug fixed: uses user configuration fields for filtering in admin/user_list

• bug fixed: don't try to create feeds automatically during sync_users (when line in user_infos is missing)

• bug fixed: create_user_infos function gives status admin if user id matches $confwebmaster_id

Location:

trunk

Files:

• admin/include/functions.php (modified) (1 diff)
• admin/user_list.php (modified) (1 diff)
• doc/ChangeLog (modified) (1 diff)
• include/config_default.inc.php (modified) (1 diff)
• include/functions_user.inc.php (modified) (1 diff)

trunk/admin/include/functions.php

@@ -1173 +1173 @@
       $insert['language'] = $conf['default_language'];
       $insert['recent_period'] = $conf['recent_period'];
-      $insert['feed_id'] = find_available_feed_id();
       $insert['expand'] = boolean_to_string($conf['auto_expand']);
       $insert['show_nb_comments'] =

trunk/admin/user_list.php

@@ -679 +679 @@
     LEFT JOIN '.USER_GROUP_TABLE.' AS ug
       ON u.'.$conf['user_fields']['id'].' = ug.user_id
-  WHERE id != '.$conf['guest_id'];
+  WHERE u.'.$conf['user_fields']['id'].' != '.$conf['guest_id'];
 if (isset($filter['username']))
 {
   $query.= '
-    AND username LIKE \''.$filter['username'].'\'';
+  AND u.'.$conf['user_fields']['username'].' LIKE \''.$filter['username'].'\'';
 }
 if (isset($filter['group']))

trunk/doc/ChangeLog

@@ +1 @@
+2005-09-17 Pierrick LE GALL
+
+        * improvement: add information about how to use an external table
+        for users
+        
+        * bug fixed: uses user configuration fields for filtering in
+        admin/user_list
+
+        * bug fixed: don't try to create feeds automatically during
+        sync_users (when line in user_infos is missing)
+
+        * bug fixed: create_user_infos function gives status admin if user
+        id matches $conf['webmaster_id']
+
 2005-09-17 Pierrick LE GALL
 

trunk/include/config_default.inc.php

@@ -298 +298 @@
 $conf['apache_authentication'] = false;
 
-// users_table : which table is the reference for users ? Can be a different
+// users_table: which table is the reference for users? Can be a different
 // table than PhpWebGallery table
+//
+// If you decide to use another table than the default one, you need to
+// prepare your database by deleting some datas :
+//
+// delete from phpwebgallery_user_access;
+// delete from phpwebgallery_user_cache;
+// delete from phpwebgallery_user_feed;
+// delete from phpwebgallery_user_group;
+// delete from phpwebgallery_user_infos;
+// delete from phpwebgallery_sessions;
+// delete from phpwebgallery_rate;
+// update phpwebgallery_images set average_rate = NULL;
+// delete from phpwebgallery_caddie;
+// delete from phpwebgallery_favorites;
+//
+// All informations contained in these tables and column are related to
+// phpwebgallery_users table.
 $conf['users_table'] = $prefixeTable.'users';
 

trunk/include/functions_user.inc.php

@@ -455 +455 @@
     array(
       'user_id' => $user_id,
-      'status' => 'guest',
+      'status' => $user_id == $conf['webmaster_id'] ? 'admin' : 'guest',
       'template' => $conf['default_template'],
       'nb_image_line' => $conf['nb_image_line'],