- 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


git-svn-id: http://piwigo.org/svn/trunk@518 68402e56-0260-453c-a942-63ccdbb3a9ee

4 files changed, 13 insertions, 8 deletions

diff --git a/include/functions_session.inc.php b/include/functions_session.inc.php
index 17991bb58..a92deb7a4 100644
--- a/include/functions_session.inc.php
+++ b/include/functions_session.inc.php
@@ -35,7 +35,7 @@ function generate_key()
 {
   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++ )
   {
diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php
index 5af68ad4e..dfa980adb 100644
--- a/include/functions_user.inc.php
+++ b/include/functions_user.inc.php
@@ -213,8 +213,8 @@ function init_userprefs($userdata)
 {
   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')) )
   {
diff --git a/install.php b/install.php
index 8c57977aa..b3fc2e425 100644
--- a/install.php
+++ b/install.php
@@ -153,8 +153,8 @@ if ( !file_exists(@realpath(PHPWG_ROOT_PATH . 'language/' . $language . '/instal
 }
 
 include( './language/'.$language.'/common.lang.php' );
-include( './language/'.$language.'/install.lang.php' );
 include( './language/'.$language.'/admin.lang.php' );
+include( './language/'.$language.'/install.lang.php' );
 
 // Obtain various vars
 $dbhost = (!empty($_POST['dbhost'])) ? $_POST['dbhost'] : 'localhost';
@@ -314,14 +314,14 @@ $template->assign_vars(array(
   'L_DB_PREFIX'=>$lang['step1_prefix'],
   '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'],
   'L_ERR_COPY'=>$lang['step1_err_copy'],
diff --git a/language/en_UK.iso-8859-1/install.lang.php b/language/en_UK.iso-8859-1/install.lang.php
index 5e23892cf..dace0ef22 100644
--- a/language/en_UK.iso-8859-1/install.lang.php
+++ b/language/en_UK.iso-8859-1/install.lang.php
@@ -33,6 +33,11 @@ $lang['step2_title'] = 'Admin configuration';
 $lang['Start_Install'] = 'Start Install';
 $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';
 $lang['step1_err_server'] = 'Can\'t connect to server';