Changeset 518
- Timestamp:
- Sep 7, 2004, 9:29:42 PM (20 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/functions_session.inc.php
r364 r518 36 36 global $conf; 37 37 38 $md5 = md5( substr( microtime(), 2, 6 ).$conf['session_keyword']);38 $md5 = md5(substr(microtime(), 2, 6)); 39 39 $init = ''; 40 40 for ( $i = 0; $i < strlen( $md5 ); $i++ ) -
trunk/include/functions_user.inc.php
r463 r518 214 214 global $conf, $template, $lang, $lang_info; 215 215 216 $language = (!empty($userdata['language']) && !$userdata['is_the_guest'] )?$userdata['language']:$conf['default_lang '];217 $style = (!empty($userdata['template'])&& !$userdata['is_the_guest'] )?$userdata['template']:$conf['default_ style'];216 $language = (!empty($userdata['language']) && !$userdata['is_the_guest'] )?$userdata['language']:$conf['default_language']; 217 $style = (!empty($userdata['template'])&& !$userdata['is_the_guest'] )?$userdata['template']:$conf['default_template']; 218 218 219 219 if ( !file_exists(@realpath(PHPWG_ROOT_PATH . 'language/' . $language . '/common.lang.php')) ) -
trunk/install.php
r513 r518 154 154 155 155 include( './language/'.$language.'/common.lang.php' ); 156 include( './language/'.$language.'/admin.lang.php' ); 156 157 include( './language/'.$language.'/install.lang.php' ); 157 include( './language/'.$language.'/admin.lang.php' );158 158 159 159 // Obtain various vars … … 315 315 'L_DB_PREFIX_INFO'=>$lang['step1_prefix_info'], 316 316 'L_ADMIN_TITLE'=>$lang['step2_title'], 317 'L_ADMIN'=>$lang[' conf_general_webmaster'],318 'L_ADMIN_INFO'=>$lang[' conf_general_webmaster_info'],317 'L_ADMIN'=>$lang['install_webmaster'], 318 'L_ADMIN_INFO'=>$lang['install_webmaster_info'], 319 319 'L_ADMIN_PASSWORD'=>$lang['step2_pwd'], 320 320 'L_ADMIN_PASSWORD_INFO'=>$lang['step2_pwd_info'], 321 321 'L_ADMIN_CONFIRM_PASSWORD'=>$lang['step2_pwd_conf'], 322 322 'L_ADMIN_CONFIRM_PASSWORD_INFO'=>$lang['step2_pwd_conf_info'], 323 'L_ADMIN_EMAIL'=>$lang[' conf_general_mail'],324 'L_ADMIN_EMAIL_INFO'=>$lang[' conf_general_mail_info'],323 'L_ADMIN_EMAIL'=>$lang['install_mail_webmaster'], 324 'L_ADMIN_EMAIL_INFO'=>$lang['install_mail_webmaster_info'], 325 325 'L_SUBMIT'=>$lang['Start_Install'], 326 326 'L_HELP'=>$lang['install_help'], -
trunk/language/en_UK.iso-8859-1/install.lang.php
r367 r518 34 34 $lang['reg_err_mail_address'] = 'mail address must be like xxx@yyy.eee (example : jack@altern.org)'; 35 35 36 $lang['install_webmaster'] = 'webmaster login'; 37 $lang['install_webmaster_info'] = 'It will be shown to the visitors. It is necessary for website administration'; 38 $lang['install_mail_webmaster'] = $lang['conf_general_mail_webmaster']; 39 $lang['install_mail_webmaster_info'] = $lang['conf_general_mail_webmaster_info']; 40 36 41 $lang['step1_confirmation'] = 'Parameters are correct'; 37 42 $lang['step1_err_db'] = 'Connection to server succeed, but it was impossible to connect to database';
Note: See TracChangeset
for help on using the changeset viewer.