diff options
Diffstat (limited to '')
| -rw-r--r-- | admin/include/functions.php | 1 | ||||
| -rw-r--r-- | admin/user_list.php | 4 | ||||
| -rw-r--r-- | doc/ChangeLog | 14 | ||||
| -rw-r--r-- | include/config_default.inc.php | 19 | ||||
| -rw-r--r-- | include/functions_user.inc.php | 2 |
5 files changed, 35 insertions, 5 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php index 12a032b39..5f59216bf 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -1172,7 +1172,6 @@ SELECT user_id $insert['nb_line_page'] = $conf['nb_line_page']; $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'] = boolean_to_string($conf['show_nb_comments']); diff --git a/admin/user_list.php b/admin/user_list.php index 91bcfc954..0982c0f43 100644 --- a/admin/user_list.php +++ b/admin/user_list.php @@ -678,11 +678,11 @@ SELECT DISTINCT u.'.$conf['user_fields']['id'].' AS id, ON u.'.$conf['user_fields']['id'].' = ui.user_id 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'])) { diff --git a/doc/ChangeLog b/doc/ChangeLog index 47a70328a..7f034c412 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,19 @@ 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 + * new: the number of elements waiting for validation is notified in RSS feed. diff --git a/include/config_default.inc.php b/include/config_default.inc.php index dbd5beb51..8d4309dfc 100644 --- a/include/config_default.inc.php +++ b/include/config_default.inc.php @@ -297,8 +297,25 @@ $conf['debug_l10n'] = false; // users table ? $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'; // user_fields : mapping between generic field names and table specific diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php index b669a61bc..41321a587 100644 --- a/include/functions_user.inc.php +++ b/include/functions_user.inc.php @@ -454,7 +454,7 @@ function create_user_infos($user_id) $insert = 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'], 'nb_line_page' => $conf['nb_line_page'], |