Index: /trunk/admin/cat_perm.php
===================================================================
--- /trunk/admin/cat_perm.php (revision 1929)
+++ /trunk/admin/cat_perm.php (revision 1930)
@@ -276,5 +276,4 @@
'.$conf['user_fields']['username'].' AS username
FROM '.USERS_TABLE.'
- WHERE '.$conf['user_fields']['id'].' != '.$conf['guest_id'].'
;';
$result = pwg_query($query);
Index: /trunk/admin/user_list.php
===================================================================
--- /trunk/admin/user_list.php (revision 1929)
+++ /trunk/admin/user_list.php (revision 1930)
@@ -104,5 +104,5 @@
LEFT JOIN '.USER_GROUP_TABLE.' AS ug
ON u.'.$conf['user_fields']['id'].' = ug.user_id
- WHERE u.'.$conf['user_fields']['id'].' != '.$conf['guest_id'];
+ WHERE u.'.$conf['user_fields']['id'].' > 0';
if (isset($filter['username']))
{
@@ -792,9 +792,17 @@
'U_PROFILE' => $profile_url.$local_user['id'],
'U_PERM' => $perm_url.$local_user['id'],
- 'USERNAME' => $local_user['username'],
- 'STATUS' => $lang['user_status_'.$local_user['status']].(($local_user['adviser'] == 'true') ? ' ['.$lang['adviser'].']' : ''),
+ 'USERNAME' => $local_user['username']
+ .($local_user['id'] == $conf['guest_id']
+ ? '
['.l10n('is_the_guest').']' : '')
+ .($local_user['id'] == $conf['default_user_id']
+ ? '
['.l10n('is_the_default').']' : ''),
+ 'STATUS' => $lang['user_status_'.
+ $local_user['status']].(($local_user['adviser'] == 'true')
+ ? '
['.l10n('adviser').']' : ''),
'EMAIL' => get_email_address_as_display_text($local_user['email']),
'GROUPS' => $groups_string,
- 'PROPERTIES' => (isset($local_user['enabled_high']) and ($local_user['enabled_high'] == 'true')) ? $lang['is_high_enabled'] : $lang['is_high_disabled']
+ 'PROPERTIES' =>
+ (isset($local_user['enabled_high']) and ($local_user['enabled_high'] == 'true'))
+ ? $lang['is_high_enabled'] : $lang['is_high_disabled']
)
);
Index: /trunk/include/functions_user.inc.php
===================================================================
--- /trunk/include/functions_user.inc.php (revision 1929)
+++ /trunk/include/functions_user.inc.php (revision 1930)
@@ -727,4 +727,11 @@
$result = pwg_query($query);
$page['cache_default_user'] = mysql_fetch_assoc($result);
+
+ if ($page['cache_default_user'] !== false)
+ {
+ unset($page['cache_default_user']['user_id']);
+ unset($page['cache_default_user']['status']);
+ unset($page['cache_default_user']['registration_date']);
+ }
}
@@ -794,6 +801,7 @@
*
* @param int user_id / array of user_if
- */
-function create_user_infos($arg_id)
+ * @param array of values used to override default user values
+ */
+function create_user_infos($arg_id, $override_values = null)
{
global $conf;
@@ -823,5 +831,10 @@
$default_user = array();
}
-
+
+ if (!is_null($override_values))
+ {
+ $default_user = array_merge($default_user, $override_values);
+ print_r($default_user);
+ }
foreach ($user_ids as $user_id)
@@ -841,10 +854,11 @@
}
- $insert =
+ $insert = array_merge(
+ $default_user,
array(
'user_id' => $user_id,
'status' => $status,
'registration_date' => $dbnow
- );
+ ));
array_push($inserts, $insert);
Index: /trunk/install.php
===================================================================
--- /trunk/install.php (revision 1929)
+++ /trunk/install.php (revision 1930)
@@ -313,11 +313,4 @@
);
- $query = '
-UPDATE '.CONFIG_TABLE.'
- SET value = \''.$language.'\'
- WHERE param = \'default_language\'
-;';
- mysql_query($query);
-
// fill $conf global array
load_conf_from_db();
@@ -344,12 +337,5 @@
mass_inserts(USERS_TABLE, array_keys($inserts[0]), $inserts);
- create_user_infos(1);
- create_user_infos(2);
-
- $query = '
-UPDATE '.USER_INFOS_TABLE.'
- SET language = \''.$language.'\'
-;';
- mysql_query($query);
+ create_user_infos(array(1,2), array('language' => $language));
// Available upgrades must be ignored after a fresh installation. To
Index: /trunk/language/en_UK.iso-8859-1/admin.lang.php
===================================================================
--- /trunk/language/en_UK.iso-8859-1/admin.lang.php (revision 1929)
+++ /trunk/language/en_UK.iso-8859-1/admin.lang.php (revision 1930)
@@ -590,3 +590,5 @@
$lang['%d guests'] = '%d guests';
$lang['Hour'] = 'Hour';
+$lang['is_the_guest'] = 'guest';
+$lang['is_the_default'] = 'default values';
?>
Index: /trunk/language/fr_FR.iso-8859-1/admin.lang.php
===================================================================
--- /trunk/language/fr_FR.iso-8859-1/admin.lang.php (revision 1929)
+++ /trunk/language/fr_FR.iso-8859-1/admin.lang.php (revision 1930)
@@ -589,3 +589,5 @@
$lang['%d guests'] = '%d invités';
$lang['Hour'] = 'Heure';
+$lang['is_the_guest'] = 'invité';
+$lang['is_the_default'] = 'valeurs par défaut';
?>