Changeset 518

Timestamp:

Sep 7, 2004, 9:29:42 PM (20 years ago)

Author:

z0rglub

Message:

• corrects bugs due to deletion of configuration parameters default_lang, default_style (renamed to default_language and default_template), session_keyword

• in install.php, corrects bug to deletion of language keys : conf_general_webmaster, conf_general_webmaster_info and renaming of conf_general_mail

Location:

trunk

Files:

• include/functions_session.inc.php (modified) (1 diff)
• include/functions_user.inc.php (modified) (1 diff)
• install.php (modified) (2 diffs)
• language/en_UK.iso-8859-1/install.lang.php (modified) (1 diff)

trunk/include/functions_session.inc.php

@@ -36 +36 @@
   global $conf;
 
-  $md5 = md5( substr( microtime(), 2, 6 ).$conf['session_keyword'] );
+  $md5 = md5(substr(microtime(), 2, 6));
   $init = '';
   for ( $i = 0; $i < strlen( $md5 ); $i++ )

trunk/include/functions_user.inc.php

@@ -214 +214 @@
   global $conf, $template, $lang, $lang_info;
     
-  $language = (!empty($userdata['language']) && !$userdata['is_the_guest'] )?$userdata['language']:$conf['default_lang'];
-  $style = (!empty($userdata['template'])&& !$userdata['is_the_guest'] )?$userdata['template']:$conf['default_style'];
+  $language = (!empty($userdata['language']) && !$userdata['is_the_guest'] )?$userdata['language']:$conf['default_language'];
+  $style = (!empty($userdata['template'])&& !$userdata['is_the_guest'] )?$userdata['template']:$conf['default_template'];
  
   if ( !file_exists(@realpath(PHPWG_ROOT_PATH . 'language/' . $language . '/common.lang.php')) )

trunk/install.php

@@ -154 +154 @@
 
 include( './language/'.$language.'/common.lang.php' );
+include( './language/'.$language.'/admin.lang.php' );
 include( './language/'.$language.'/install.lang.php' );
-include( './language/'.$language.'/admin.lang.php' );
 
 // Obtain various vars
@@ -315 +315 @@
   'L_DB_PREFIX_INFO'=>$lang['step1_prefix_info'],
   'L_ADMIN_TITLE'=>$lang['step2_title'],
-  'L_ADMIN'=>$lang['conf_general_webmaster'],
-  'L_ADMIN_INFO'=>$lang['conf_general_webmaster_info'],
+  'L_ADMIN'=>$lang['install_webmaster'],
+  'L_ADMIN_INFO'=>$lang['install_webmaster_info'],
   'L_ADMIN_PASSWORD'=>$lang['step2_pwd'],
   'L_ADMIN_PASSWORD_INFO'=>$lang['step2_pwd_info'],
   'L_ADMIN_CONFIRM_PASSWORD'=>$lang['step2_pwd_conf'],
   'L_ADMIN_CONFIRM_PASSWORD_INFO'=>$lang['step2_pwd_conf_info'],
-  'L_ADMIN_EMAIL'=>$lang['conf_general_mail'],
-  'L_ADMIN_EMAIL_INFO'=>$lang['conf_general_mail_info'],
+  'L_ADMIN_EMAIL'=>$lang['install_mail_webmaster'],
+  'L_ADMIN_EMAIL_INFO'=>$lang['install_mail_webmaster_info'],
   'L_SUBMIT'=>$lang['Start_Install'],
   'L_HELP'=>$lang['install_help'],

trunk/language/en_UK.iso-8859-1/install.lang.php

@@ -34 +34 @@
 $lang['reg_err_mail_address'] = 'mail address must be like xxx@yyy.eee (example : jack@altern.org)';
 
+$lang['install_webmaster'] = 'webmaster login';
+$lang['install_webmaster_info'] = 'It will be shown to the visitors. It is necessary for website administration';
+$lang['install_mail_webmaster'] = $lang['conf_general_mail_webmaster'];
+$lang['install_mail_webmaster_info'] = $lang['conf_general_mail_webmaster_info'];
+
 $lang['step1_confirmation'] = 'Parameters are correct';
 $lang['step1_err_db'] = 'Connection to server succeed, but it was impossible to connect to database';