Changeset 1930
- Timestamp:
- Mar 29, 2007, 12:30:04 AM (17 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/cat_perm.php
r1900 r1930 276 276 '.$conf['user_fields']['username'].' AS username 277 277 FROM '.USERS_TABLE.' 278 WHERE '.$conf['user_fields']['id'].' != '.$conf['guest_id'].'279 278 ;'; 280 279 $result = pwg_query($query); -
trunk/admin/user_list.php
r1926 r1930 104 104 LEFT JOIN '.USER_GROUP_TABLE.' AS ug 105 105 ON u.'.$conf['user_fields']['id'].' = ug.user_id 106 WHERE u.'.$conf['user_fields']['id'].' != '.$conf['guest_id'];106 WHERE u.'.$conf['user_fields']['id'].' > 0'; 107 107 if (isset($filter['username'])) 108 108 { … … 792 792 'U_PROFILE' => $profile_url.$local_user['id'], 793 793 'U_PERM' => $perm_url.$local_user['id'], 794 'USERNAME' => $local_user['username'], 795 'STATUS' => $lang['user_status_'.$local_user['status']].(($local_user['adviser'] == 'true') ? ' ['.$lang['adviser'].']' : ''), 794 'USERNAME' => $local_user['username'] 795 .($local_user['id'] == $conf['guest_id'] 796 ? '<BR />['.l10n('is_the_guest').']' : '') 797 .($local_user['id'] == $conf['default_user_id'] 798 ? '<BR />['.l10n('is_the_default').']' : ''), 799 'STATUS' => $lang['user_status_'. 800 $local_user['status']].(($local_user['adviser'] == 'true') 801 ? '<BR />['.l10n('adviser').']' : ''), 796 802 'EMAIL' => get_email_address_as_display_text($local_user['email']), 797 803 'GROUPS' => $groups_string, 798 'PROPERTIES' => (isset($local_user['enabled_high']) and ($local_user['enabled_high'] == 'true')) ? $lang['is_high_enabled'] : $lang['is_high_disabled'] 804 'PROPERTIES' => 805 (isset($local_user['enabled_high']) and ($local_user['enabled_high'] == 'true')) 806 ? $lang['is_high_enabled'] : $lang['is_high_disabled'] 799 807 ) 800 808 ); -
trunk/include/functions_user.inc.php
r1926 r1930 727 727 $result = pwg_query($query); 728 728 $page['cache_default_user'] = mysql_fetch_assoc($result); 729 730 if ($page['cache_default_user'] !== false) 731 { 732 unset($page['cache_default_user']['user_id']); 733 unset($page['cache_default_user']['status']); 734 unset($page['cache_default_user']['registration_date']); 735 } 729 736 } 730 737 … … 794 801 * 795 802 * @param int user_id / array of user_if 796 */ 797 function create_user_infos($arg_id) 803 * @param array of values used to override default user values 804 */ 805 function create_user_infos($arg_id, $override_values = null) 798 806 { 799 807 global $conf; … … 823 831 $default_user = array(); 824 832 } 825 833 834 if (!is_null($override_values)) 835 { 836 $default_user = array_merge($default_user, $override_values); 837 print_r($default_user); 838 } 826 839 827 840 foreach ($user_ids as $user_id) … … 841 854 } 842 855 843 $insert = 856 $insert = array_merge( 857 $default_user, 844 858 array( 845 859 'user_id' => $user_id, 846 860 'status' => $status, 847 861 'registration_date' => $dbnow 848 ) ;862 )); 849 863 850 864 array_push($inserts, $insert); -
trunk/install.php
r1900 r1930 313 313 ); 314 314 315 $query = '316 UPDATE '.CONFIG_TABLE.'317 SET value = \''.$language.'\'318 WHERE param = \'default_language\'319 ;';320 mysql_query($query);321 322 315 // fill $conf global array 323 316 load_conf_from_db(); … … 344 337 mass_inserts(USERS_TABLE, array_keys($inserts[0]), $inserts); 345 338 346 create_user_infos(1); 347 create_user_infos(2); 348 349 $query = ' 350 UPDATE '.USER_INFOS_TABLE.' 351 SET language = \''.$language.'\' 352 ;'; 353 mysql_query($query); 339 create_user_infos(array(1,2), array('language' => $language)); 354 340 355 341 // Available upgrades must be ignored after a fresh installation. To -
trunk/language/en_UK.iso-8859-1/admin.lang.php
r1928 r1930 590 590 $lang['%d guests'] = '%d guests'; 591 591 $lang['Hour'] = 'Hour'; 592 $lang['is_the_guest'] = 'guest'; 593 $lang['is_the_default'] = 'default values'; 592 594 ?> -
trunk/language/fr_FR.iso-8859-1/admin.lang.php
r1928 r1930 589 589 $lang['%d guests'] = '%d invités'; 590 590 $lang['Hour'] = 'Heure'; 591 $lang['is_the_guest'] = 'invité'; 592 $lang['is_the_default'] = 'valeurs par défaut'; 591 593 ?>
Note: See TracChangeset
for help on using the changeset viewer.