10 files changed, 35 insertions, 26 deletions
diff --git a/include/config.inc.php b/include/config.inc.php
index 5e11bb926..67b65cf80 100644
--- a/include/config.inc.php
+++ b/include/config.inc.php
@@ -45,7 +45,7 @@ $conf['nb_image_row']       = array(4,5,6,7,8);
 $conf['nb_row_page']        = array(2,3,4,5,6,7,10,20,1000);
 $conf['slideshow_period']   = array(2,5,10);
 $conf['last_days']          = array(1,2,3,10,30,365);
-$conf['version']            = 'BSF';
+
 // $conf['file_ext'] lists all extensions (case insensitive) allowed for
 // your PhpWebGallery installation
 $conf['file_ext']           = array('jpg','JPG','png','PNG','gif','GIF'
diff --git a/include/constants.php b/include/constants.php
index ccb2ecd34..be641fd10 100644
--- a/include/constants.php
+++ b/include/constants.php
@@ -25,8 +25,11 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 
-// Default Language
+// Default settings
 define('DEFAULT_LANGUAGE', 'en_UK.iso-8859-1');
+define('PHPWG_VERSION', 'BSF');
+define('PHPWG_URL', 'http://www.phpwebgallery.net');
+define('PHPWG_FORUM_URL', 'http://forum.phpwebgallery.net');
 
 // Debug Level
 define('DEBUG', 1); // Debugging on
diff --git a/include/functions.inc.php b/include/functions.inc.php
index afd4f87b0..1e4cc44c7 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -277,7 +277,7 @@ function get_languages()
     if (is_dir($path) and !is_link($path) and file_exists($path.'/iso.txt'))
     {
       list($language_name) = @file($path.'/iso.txt');
-      $languages[$file] = $language_name;
+      $languages[$language_name] = $file;
     }
   }
   closedir($dir);
@@ -354,16 +354,6 @@ function pwg_log( $file, $category, $picture = '' )
   }
 }
 
-function templatize_array( $array, $global_array_name, $handle )
-{
-  global $vtp, $lang, $page, $user, $conf;
-
-  foreach ( $array as $value ) {
-  if (isset(${$global_array_name}[$value]))
-    $vtp->setGlobalVar( $handle, $value, ${$global_array_name}[$value] );
-  }
-}
-
 // format_date returns a formatted date for display. The date given in
 // argument can be a unixdate (number of seconds since the 01.01.1970) or an
 // american format (2003-09-15). By option, you can show the time. The
diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php
index 4b456ca7b..4c68aa019 100644
--- a/include/functions_html.inc.php
+++ b/include/functions_html.inc.php
@@ -133,13 +133,15 @@ function style_select($default_style, $select_name = "style")
 {
   $templates = get_templates();
 
+  $style_selected = '<select name="' . $select_name . '" >';
   foreach ($templates as $template)
   {
     $selected = ( $template == $default_style ) ? ' selected="selected"' : '';
-    $style_select.= '<option value="'.$template.'"'.$selected.'>';
-    $style_select.= $template.'</option>';
+    $style_selected.= '<option value="'.$template.'"'.$selected.'>';
+    $style_selected.= $template.'</option>';
   }
-  return $style_select;
+  $style_selected .= '</select>';
+  return $style_selected;
 }
 
 // The function get_cat_display_name returns a string containing the list
diff --git a/include/page_tail.php b/include/page_tail.php
index a31531fd1..bd8b726bf 100644
--- a/include/page_tail.php
+++ b/include/page_tail.php
@@ -33,7 +33,7 @@ $time = get_elapsed_time( $t2, get_moment() );
 $template->assign_vars(
   array(
     'TIME' =>  $time,
-    'VERSION' => $conf['version'],
+    'VERSION' => PHPWG_VERSION,
     'MAIL'=>$conf['mail_webmaster'],
     
     'L_GEN_TIME' => $lang['generation_time'],
diff --git a/install.php b/install.php
index b3fc2e425..55f8f3fec 100644
--- a/install.php
+++ b/install.php
@@ -320,8 +320,8 @@ $template->assign_vars(array(
   '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['install_mail_webmaster'],
-  'L_ADMIN_EMAIL_INFO'=>$lang['install_mail_webmaster_info'],
+  'L_ADMIN_EMAIL'=>$lang['conf_general_mail_webmaster'],
+  'L_ADMIN_EMAIL_INFO'=>$lang['conf_general_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/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index a16be9511..1f1668d37 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -257,7 +257,7 @@ $lang['help_access_title'] = 'Access authorization';
 $lang['help_access'][0] = 'PhpWebGallery is able to forbid access to categories. Categories can be "public" or "private". In order to forbid access to a category :';
 $lang['help_access'][1] = '1. Modify category informations (from the "categories" section in tha admin panel) and make it "private".';
 $lang['help_access'][2] = '2. On the page of permissions (for a group or a user) the private category will be shown and you\'ll be able to authorize access or not.';
-$lang['help_infos'][2] = 'If you have any question, do not hesitate to take a look at the forum or ask a question there. The <a href="http://forum.phpwebgallery.net" style="text-decoration:underline">forum</a> (message board) is available on the presentation site of PhpWebGallery.';
+$lang['help_infos'][2] = 'If you have any question, do not hesitate to take a look at the forum or ask a question there. The <a href="'.PHPWG_FORUM_URL.'" style="text-decoration:underline">forum</a> (message board) is available on the presentation site of PhpWebGallery.';
 
 // Image informations
 $lang['infoimage_general'] = 'General options for the category';
diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php
index 6d0832b84..b4f0178b6 100644
--- a/language/en_UK.iso-8859-1/common.lang.php
+++ b/language/en_UK.iso-8859-1/common.lang.php
@@ -53,6 +53,8 @@ $lang['filesize'] = 'Filesize';
 $lang['file'] = 'File';
 $lang['keywords'] = 'Keywords';
 $lang['default'] = 'Default';
+$lang['send_mail'] = 'Contact';
+$lang['webmaster'] = 'Webmaster';
 
 //Properties
 $lang['registration_date'] = 'Registered on';
@@ -144,8 +146,7 @@ $lang['previous_page'] = 'Previous';
 $lang['next_page'] = 'Next';
 $lang['recent_image'] = 'Image within the';
 $lang['days'] = 'days';
-$lang['send_mail'] = 'Contact';
-$lang['webmaster'] = 'webmaster';
+
 $lang['title_send_mail'] = 'A comment on your site';
 $lang['sub-cat'] = 'subcategories';
 $lang['images_available'] = 'images in this category';
@@ -158,9 +159,9 @@ $lang['about_page_title'] = 'About PhpWebGallery';
 $lang['about_title'] = 'About...';
 $lang['about_message'] = '<div style="text-align:center;font-weigh:bold;">Information about PhpWebGallery</div>
 <ul>
-  <li>This website uses <a href="http://www.phpwebgallery.net" style="text-decoration:underline">PhpWebGallery</a>. PhpWebGallery is a web application giving you the possibility to create an online images gallery easily.</li>
+  <li>This website uses the version '.PHPWG_VERSION.' of "<a href="'.PHPWG_URL.'" style="text-decoration:underline">PhpWebGallery</a>. PhpWebGallery is a web application giving you the possibility to create an online images gallery easily.</li>
   <li>Technicaly, PhpWebGallery is fully developped with PHP (the elePHPant) with a MySQL database (the SQuirreL).</li>
-  <li>If you have any suggestions or comments, please visit <a href="http://www.phpwebgallery.net" style="text-decoration:underline">PhpWebGallery</a> official site, and its dedicated <a href="http://forum.phpwebgallery.net" style="text-decoration:underline">forum</a>.</li>
+  <li>If you have any suggestions or comments, please visit <a href="'.PHPWG_URL.'" style="text-decoration:underline">PhpWebGallery</a> official site, and its dedicated <a href="'.PHPWG_FORUM_URL.'" style="text-decoration:underline">forum</a>.</li>
 </ul>';
 $lang['about_return'] = 'Back';
 $lang['ident_page_title'] = 'Identification';
diff --git a/language/en_UK.iso-8859-1/install.lang.php b/language/en_UK.iso-8859-1/install.lang.php
index dace0ef22..514cbce0a 100644
--- a/language/en_UK.iso-8859-1/install.lang.php
+++ b/language/en_UK.iso-8859-1/install.lang.php
@@ -32,17 +32,20 @@ $lang['step1_title'] = 'Database configuration';
 $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['mail_webmaster'] = 'Webmaster mail adress';
+$lang['mail_webmaster_info'] = 'Visitors will be able to contact site administrator with this mail';
+$lang['reg_err_mail_address'] = 'e-mail address refused, it must be like name@server.com';
 
 $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';
 $lang['step1_err_copy_2'] = 'The next step of the installation is now possible';
 $lang['step1_err_copy_next'] = 'next step';
+$lang['step1_err_copy'] = 'Copy the text between hyphens and paste it into the file "include/mysql.inc.php"(Warning : mysql.inc.php must only contain what is in blue, no line return or space character)';
+
 $lang['step1_host'] = 'MySQL host';
 $lang['step1_host_info'] = 'localhost, sql.multimania.com, toto.freesurf.fr';
 $lang['step1_user'] = 'user';
diff --git a/template/default/default.css b/template/default/default.css
index 0b52142b2..c215c94a7 100644
--- a/template/default/default.css
+++ b/template/default/default.css
@@ -144,6 +144,16 @@ ul.menu {
   border-collapse:collapse;
 }
 
+.row1,.row2 {
+  text-align:left;
+  padding:5px 0px 5px 0px;
+  height:20px;
+} 
+
+.row1 {
+  background-color:#505050;
+}
+
 .throw {
   color:#FFFFCC;
   background-color:#3F3F3F;