- dispatch of configuration

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

10 files changed, 599 insertions, 471 deletions

diff --git a/admin.php b/admin.php
index c4c8c6faf..4f813f619 100644
--- a/admin.php
+++ b/admin.php
@@ -186,12 +186,18 @@ $template->assign_vars(array(
   'L_LINKS'=>$lang['links'],
   'L_GALLERY_INDEX'=>$lang['gallery_index'],
   'L_GENERAL'=>$lang['general'],
-  'L_CONFIG'=>$lang['config'],
-  'L_SITES'=>$lang['remote_sites'],
   'L_DEFAULT'=>$lang['gallery_default'],
   'L_PHPINFO'=>$lang['phpinfos'],
   'L_HISTORY'=>$lang['history'],
   'L_FAQ'=>$lang['instructions'],
+  'L_CONFIGURATION'=>$lang['config'],
+  'L_CONFIG_GENERAL'=>$lang['general'],
+  'L_CONFIG_COMMENTS'=>$lang['comments'],
+  'L_CONFIG_DISPLAY'=>$lang['conf_default'],
+  'L_CONFIG_UPLOAD'=>$lang['upload'],
+  'L_CONFIG_SESSION'=>$lang['conf_cookie'],
+  'L_CONFIG_METADATA'=>$lang['metadata'],
+  'L_CONFIG_SITES'=>$lang['remote_sites'],
   'L_CATEGORIES'=>$lang['categories'],
   'L_MANAGE'=>$lang['manage'],
   'L_UPLOAD'=>$lang['upload'],
@@ -205,7 +211,13 @@ $template->assign_vars(array(
   'L_AUTH'=>$lang['permissions'],
   'L_UPDATE'=>$lang['update'],
     
-  'U_CONFIG'=>add_session_id($link_start.'configuration' ),
+  'U_CONFIG_GENERAL'=>add_session_id($link_start.'configuration&section=general' ),
+  'U_CONFIG_COMMENTS'=>add_session_id($link_start.'configuration&section=comments' ),
+  'U_CONFIG_DISPLAY'=>add_session_id($link_start.'configuration&section=default' ),
+  'U_CONFIG_UPLOAD'=>add_session_id($link_start.'configuration&section=upload' ),
+  'U_CONFIG_SESSION'=>add_session_id($link_start.'configuration&section=session' ),
+  'U_CONFIG_METADATA'=>add_session_id($link_start.'configuration&section=metadata' ),
+  'U_CONFIG_SITES'=>add_session_id($link_start.'remote_site'),
   'U_PHPINFO'=>add_session_id($link_start.'admin_phpinfo' ),
   'U_USERS'=>add_session_id($link_start.'user_search' ),
   'U_GROUPS'=>add_session_id($link_start.'group_list' ),
@@ -218,7 +230,6 @@ $template->assign_vars(array(
   'U_THUMBNAILS'=>add_session_id($link_start.'thumbnail' ),
   'U_HISTORY'=>add_session_id($link_start.'stats' ),
   'U_FAQ'=>add_session_id($link_start.'help' ),
-  'U_SITES'=>add_session_id($link_start.'remote_site'),
   'U_RETURN'=>add_session_id(PHPWG_ROOT_PATH.'category.php')
   ));
 
diff --git a/admin/configuration.php b/admin/configuration.php
index 675753eef..bd82f51c7 100644
--- a/admin/configuration.php
+++ b/admin/configuration.php
@@ -25,11 +25,12 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 
-if (!defined('PHPWG_ROOT_PATH'))
+if( !defined("PHPWG_ROOT_PATH") )
 {
-  die ("Hacking attempt!");
+	die ("Hacking attempt!");
 }
-include_once(PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php');
+
+include_once( PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php' );
 //-------------------------------------------------------- sections definitions
 if (!isset($_GET['section']))
 {
@@ -40,72 +41,6 @@ else
   $page['section'] = $_GET['section'];
 }
 
-// templates for fields definitions
-$true_false = array('type' => 'radio',
-                    'options' => array('true' => $lang['yes'],
-                                       'false' => $lang['no']));
-$textfield = array('type' => 'textfield');
-
-$nb_image_row = array();
-foreach ($conf['nb_image_row'] as $value)
-{
-  $nb_image_row[$value] = $value;
-}
-
-$nb_row_page = array();
-foreach ($conf['nb_row_page'] as $value)
-{
-  $nb_row_page[$value] = $value;
-}
-
-$sections = array(
-  'general' => array(
-    'mail_webmaster' => $textfield,
-    'prefix_thumbnail' => $textfield,
-    'access' => array('type' => 'radio',
-                      'options' => array(
-                        'free' => $lang['conf_general_access_1'],
-                        'restricted' => $lang['conf_general_access_2'])),
-    'log' => $true_false,
-    'mail_notification' => $true_false,
-   ),
-  'comments' => array(
-    'show_comments' => $true_false,
-    'comments_forall' => $true_false,
-    'nb_comment_page' => array('type' => 'textfield','size' => 2),
-    'comments_validation' => $true_false
-   ),
-  'default' => array(
-    'default_language' => array('type' => 'select',
-                                'options' => get_languages()),
-    'nb_image_line' => array('type' => 'radio','options' => $nb_image_row),
-    'nb_line_page' => array('type' => 'radio','options' => $nb_row_page),
-    'default_template' => array('type' => 'select',
-                                'options' => get_templates()),
-    'recent_period' => array('type' => 'textfield','size' => 3),
-    'auto_expand' => $true_false,
-    'show_nb_comments' => $true_false
-   ),
-  'upload' => array(
-    'upload_available' => $true_false,
-    'upload_maxfilesize' => array('type' => 'textfield','size' => 4),
-    'upload_maxwidth' => array('type' => 'textfield','size' => 4),
-    'upload_maxheight' => array('type' => 'textfield','size' => 4),
-    'upload_maxwidth_thumbnail' => array('type' => 'textfield','size' => 4),
-    'upload_maxheight_thumbnail' => array('type' => 'textfield','size' => 4)
-   ),
-  'session' => array(
-    'authorize_cookies' => $true_false,
-    'session_time' => array('type' => 'textfield','size' => 2),
-    'session_id_size' => array('type' => 'textfield','size' => 2)
-   ),
-  'metadata' => array(
-    'use_exif' => $true_false,
-    'use_iptc' => $true_false,
-    'show_exif' => $true_false,
-    'show_iptc' => $true_false
-   )
- );
 //------------------------------------------------------ $conf reinitialization
 $result = mysql_query('SELECT param,value FROM '.CONFIG_TABLE);
 while ($row = mysql_fetch_array($result))
@@ -113,19 +48,15 @@ while ($row = mysql_fetch_array($result))
   $conf[$row['param']] = $row['value'];
   // if the parameter is present in $_POST array (if a form is submited), we
   // override it with the submited value
-  if (isset($_POST[$row['param']]))
+  if (isset($_POST[$row['param']]) && !isset($_POST['reset']))
   {
     $conf[$row['param']] = $_POST[$row['param']];
   }
-}
+}					   
 //------------------------------ verification and registration of modifications
 $errors = array();
 if (isset($_POST['submit']))
 {
-//   echo '<pre>';
-//   print_r($_POST);
-//   echo '</pre>';
-  
   $int_pattern = '/^\d+$/';
   switch ($page['section'])
   {
@@ -134,13 +65,13 @@ if (isset($_POST['submit']))
       // thumbnail prefix must only contain simple ASCII characters
       if (!preg_match('/^[\w-]*$/', $_POST['prefix_thumbnail']))
       {
-        array_push($errors, $lang['conf_general_prefix_thumbnail_error']);
+        array_push($errors, $lang['conf_prefix_thumbnail_error']);
       }
       // mail must be formatted as follows : name@server.com
       $pattern = '/^[\w-]+(\.[\w-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)+$/';
       if (!preg_match($pattern, $_POST['mail_webmaster']))
       {
-        array_push($errors, $lang['conf_general_mail_webmaster_error']);
+        array_push($errors, $lang['conf_mail_webmaster_error']);
       }
       break;
     }
@@ -152,7 +83,7 @@ if (isset($_POST['submit']))
            or $_POST['nb_comment_page'] < 5
            or $_POST['nb_comment_page'] > 50)
       {
-        array_push($errors, $lang['conf_comments_nb_comment_page_error']);
+        array_push($errors, $lang['conf_nb_comment_page_error']);
       }
       break;
     }
@@ -162,7 +93,7 @@ if (isset($_POST['submit']))
       if (!preg_match($int_pattern, $_POST['recent_period'])
           or $_POST['recent_period'] <= 0)
       {
-        array_push($errors, $lang['conf_default_recent_period_error']);
+        array_push($errors, $lang['periods_error']);
       }
       break;
     }
@@ -173,7 +104,7 @@ if (isset($_POST['submit']))
           or $_POST['upload_maxfilesize'] < 10
           or $_POST['upload_maxfilesize'] > 1000)
       {
-        array_push($errors, $lang['conf_upload_upload_maxfilesize_error']);
+        array_push($errors, $lang['conf_upload_maxfilesize_error']);
       }
       
       foreach (array('upload_maxwidth',
@@ -185,7 +116,7 @@ if (isset($_POST['submit']))
         if (!preg_match($int_pattern, $_POST[$field])
           or $_POST[$field] < 10)
         {
-          array_push($errors, $lang['conf_upload_'.$field.'_error']);
+          array_push($errors, $lang['conf_'.$field.'_error']);
         }
       }
       break;
@@ -197,14 +128,14 @@ if (isset($_POST['submit']))
           or $_POST['session_id_size'] < 4
           or $_POST['session_id_size'] > 50)
       {
-        array_push($errors, $lang['conf_session_session_id_size_error']);
+        array_push($errors, $lang['conf_session_size_error']);
       }
       // session_time must be an integer between 5 and 60, in minutes
       if (!preg_match($int_pattern, $_POST['session_time'])
           or $_POST['session_time'] < 5
           or $_POST['session_time'] > 60)
       {
-        array_push($errors, $lang['conf_session_session_time_error']);
+        array_push($errors, $lang['conf_session_time_error']);
       }
       break;
     }
@@ -218,140 +149,227 @@ if (isset($_POST['submit']))
     {
       if (isset($_POST[$row['param']]))
       {
-        $query = '
-UPDATE '.CONFIG_TABLE.'
-  SET value = \''. str_replace("\'", "''", $_POST[$row['param']]).'\'
-  WHERE param = \''.$row['param'].'\'
-;';
+        $query = 'UPDATE '.CONFIG_TABLE.
+		  ' SET value = \''. str_replace("\'", "''", $_POST[$row['param']]).
+		  '\' WHERE param = \''.$row['param'].'\';';
         mysql_query($query);
       }
     }
   }
 }
-//----------------------------------------------------- template initialization
-$template->set_filenames(array('config'=>'admin/configuration.tpl'));
-
-$action = PHPWG_ROOT_PATH.'admin.php?page=configuration';
-$action.= '&amp;section='.$page['section'];
 
-$template->assign_vars(
-  array(
-    'L_CONFIRM'=>$lang['conf_confirmation'],
-    'L_SUBMIT'=>$lang['submit'],
-    'F_ACTION'=>add_session_id($action)
-   )
- );
+//----------------------------------------------------- template initialization
+$template->set_filenames( array('config'=>'admin/configuration.tpl') );
 
-$base_url = PHPWG_ROOT_PATH.'admin.php?page=configuration&amp;section=';
-foreach (array_keys($sections) as $section)
-{
-  if ($section == $page['section'])
-  {
-    $class = 'opened';
-  }
-  else
-  {
-    $class = '';
-  }
+$template->assign_vars(array(  
+  'L_CONFIRM'=>$lang['conf_confirmation'],
+  'L_YES'=>$lang['yes'],
+  'L_NO'=>$lang['no'],
+  'L_SUBMIT'=>$lang['submit'],
+  'L_RESET'=>$lang['reset'],
   
-  $template->assign_block_vars(
-    'confmenu_item',
-    array(
-      'CLASS' => $class,
-      'URL' => add_session_id($base_url.$section),
-      'NAME' => $lang['conf_'.$section.'_title']
-     ));
-}
+  'F_ACTION'=>add_session_id(PHPWG_ROOT_PATH.'admin.php?page=configuration&amp;section='.$page['section'])
+  ));
 
-$fields = $sections[$page['section']];
-foreach ($fields as $field_name => $field)
-{
-  $template->assign_block_vars(
-    'line',
-    array(
-      'NAME' => $lang['conf_'.$page['section'].'_'.$field_name],
-      'INFO' => $lang['conf_'.$page['section'].'_'.$field_name.'_info']
-     ));
-  if ($field['type'] == 'textfield')
+switch ($page['section'])
   {
-    if (isset($field['size']))
+    case 'general' :
     {
-      $size = $field['size'];
-    }
-    else
+      $access_free = ($conf['access']=='free')?'checked="checked"':'';
+	  $access_restricted = ($conf['access']=='restricted')?'checked="checked"':'';
+      $history_yes = ($conf['log']=='true')?'checked="checked"':'';
+	  $history_no  = ($conf['log']=='false')?'checked="checked"':'';
+	  $notif_yes = ($conf['mail_notification']=='true')?'checked="checked"':'';
+	  $notif_no = ($conf['mail_notification']=='false')?'checked="checked"':'';
+
+	  $template->assign_block_vars('general',array(
+	    'L_CONF_TITLE'=>$lang['conf_general_title'],
+		'L_CONF_MAIL'=>$lang['conf_mail_webmaster'],
+		'L_CONF_MAIL_INFO'=>$lang['conf_mail_webmaster_info'],
+		'L_CONF_TN_PREFIX'=>$lang['conf_prefix'],
+		'L_CONF_TN_PREFIX_INFO'=>$lang['conf_prefix_info'],
+		'L_CONF_ACCESS'=>$lang['conf_access'],
+		'L_CONF_ACCESS_INFO'=>$lang['conf_access_info'],
+		'L_CONF_ACCESS_FREE'=>$lang['free'],
+		'L_CONF_ACCESS_RESTRICTED'=>$lang['restricted'],
+		'L_CONF_HISTORY'=>$lang['history'],
+		'L_CONF_HISTORY_INFO'=>$lang['conf_log_info'],
+		'L_CONF_NOTIFICATION'=>$lang['conf_notification'],
+		'L_CONF_NOTIFICATION_INFO'=>$lang['conf_notification_info'],
+		
+		'ADMIN_MAIL'=>$conf['mail_webmaster'],
+		'THUMBNAIL_PREFIX'=>$conf['prefix_thumbnail'],
+		'ACCESS_FREE'=>$access_free,
+		'ACCESS_RESTRICTED'=>$access_restricted,
+		'HISTORY_YES'=>$history_yes,
+		'HISTORY_NO'=>$history_no,
+		'NOTIFICATION_YES'=>$notif_yes,
+		'NOTIFICATION_NO'=>$notif_no
+	  ));
+	  break;
+	}
+	case 'comments' :
     {
-      $size = '';
-    }
-    
-    $template->assign_block_vars(
-      'line.textfield',
-      array(
-        'NAME' => $field_name,
-        'VALUE' => $conf[$field_name],
-        'SIZE' => $size
-       ));
-  }
-  else if ($field['type'] == 'radio')
-  {
-    foreach ($field['options'] as $option_value => $option)
+	  $show_yes = ($conf['show_comments']=='true')?'checked="checked"':'';
+	  $show_no = ($conf['show_comments']=='false')?'checked="checked"':'';
+      $all_yes = ($conf['comments_forall']=='true')?'checked="checked"':'';
+	  $all_no  = ($conf['comments_forall']=='false')?'checked="checked"':'';
+	  $validate_yes = ($conf['comments_validation']=='true')?'checked="checked"':'';
+	  $validate_no = ($conf['comments_validation']=='false')?'checked="checked"':'';
+
+	  $template->assign_block_vars('comments',array(
+	    'L_CONF_TITLE'=>$lang['conf_comments_title'],
+		'L_CONF_SHOW_COMMENTS'=>$lang['conf_show_comments'],
+		'L_CONF_SHOW_COMMENTS_INFO'=>$lang['conf_show_comments_info'],
+		'L_CONF_COMMENTS_ALL'=>$lang['conf_comments_forall'],
+		'L_CONF_COMMENTS_ALL_INFO'=>$lang['conf_comments_forall_info'],
+		'L_CONF_NB_COMMENTS_PAGE'=>$lang['conf_nb_comment_page'],
+		'L_CONF_NB_COMMENTS_PAGE_INFO'=>$lang['conf_nb_comment_page'],
+		'L_CONF_VALIDATE'=>$lang['conf_comments_validation'],
+		'L_CONF_VALIDATE_INFO'=>$lang['conf_comments_validation_info'],
+				
+		'NB_COMMENTS_PAGE'=>$conf['nb_comment_page'],
+		'SHOW_COMMENTS_YES'=>$show_yes,
+		'SHOW_COMMENTS_NO'=>$show_no,
+		'COMMENTS_ALL_YES'=>$all_yes,
+		'COMMENTS_ALL_NO'=>$all_no,
+		'VALIDATE_YES'=>$validate_yes,
+		'VALIDATE_NO'=>$validate_no
+	  ));
+	  break;
+	}
+	case 'default' :
     {
-      if ($conf[$field_name] == $option_value)
-      {
-        $checked = 'checked="checked"';
-      }
-      else
-      {
-        $checked = '';
-      }
-      
-      $template->assign_block_vars(
-        'line.radio',
-        array(
-          'NAME' => $field_name,
-          'VALUE' => $option_value,
-          'CHECKED' => $checked,
-          'OPTION' => $option
-         ));
-    }
-  }
-  else if ($field['type'] == 'select')
-  {
-    $template->assign_block_vars(
-      'line.select',
-      array(
-        'NAME' => $field_name
-       ));
-    foreach ($field['options'] as $option_value => $option)
+	  $show_yes = ($conf['show_nb_comments']=='true')?'checked="checked"':'';
+	  $show_no = ($conf['show_nb_comments']=='false')?'checked="checked"':'';
+      $expand_yes = ($conf['auto_expand']=='true')?'checked="checked"':'';
+	  $expand_no  = ($conf['auto_expand']=='false')?'checked="checked"':'';
+
+	  $template->assign_block_vars('default',array(
+	    'L_CONF_TITLE'=>$lang['conf_default_title'],
+		'L_CONF_LANG'=>$lang['language'],
+		'L_CONF_LANG_INFO'=>$lang['conf_default_language_info'],
+		'L_NB_IMAGE_LINE'=>$lang['nb_image_per_row'],
+		'L_NB_IMAGE_LINE_INFO'=>$lang['conf_nb_image_line_info'],
+		'L_NB_ROW_PAGE'=>$lang['nb_row_per_page'],
+		'L_NB_ROW_PAGE_INFO'=>$lang['conf_nb_line_page_info'],
+		'L_CONF_STYLE'=>$lang['theme'],
+		'L_CONF_STYLE_INFO'=>$lang['conf_default_theme_info'],
+		'L_CONF_RECENT'=>$lang['recent_period'],
+		'L_CONF_RECENT_INFO'=>$lang['conf_recent_period_info'],
+		'L_CONF_EXPAND'=>$lang['auto_expand'],
+		'L_CONF_EXPAND_INFO'=>$lang['conf_default_expand_info'],
+		'L_NB_COMMENTS'=>$lang['show_nb_comments'],
+		'L_NB_COMMENTS_INFO'=>$lang['conf_show_nb_comments_info'],
+  
+		'CONF_LANG_SELECT'=>language_select($conf['default_language'], 'default_language'),
+		'NB_IMAGE_LINE'=>$conf['nb_image_line'],
+		'NB_ROW_PAGE'=>$conf['nb_line_page'],
+		'CONF_STYLE_SELECT'=>style_select($conf['default_template'], 'default_template'),
+		'CONF_RECENT'=>$conf['recent_period'],
+		'NB_COMMENTS_PAGE'=>$conf['nb_comment_page'],
+		'EXPAND_YES'=>$expand_yes,
+		'EXPAND_NO'=>$expand_no,
+		'SHOW_COMMENTS_YES'=>$show_yes,
+		'SHOW_COMMENTS_NO'=>$show_no
+	  ));
+	  break;
+	}
+	case 'upload' :
     {
-      if ($conf[$field_name] == $option_value)
-      {
-        $selected = 'selected="selected"';
-      }
-      else
-      {
-        $selected = '';
-      }
-      
-      $template->assign_block_vars(
-        'line.select.select_option',
-        array(
-          'VALUE' => $option_value,
-          'SELECTED' => $selected,
-          'OPTION' => $option
-         ));
-    }
+	  $upload_yes = ($conf['upload_available']=='true')?'checked="checked"':'';
+	  $upload_no = ($conf['upload_available']=='false')?'checked="checked"':'';
+	  
+	  $template->assign_block_vars('upload',array(
+	    'L_CONF_TITLE'=>$lang['conf_upload_title'],
+		'L_CONF_UPLOAD'=>$lang['conf_authorize_upload'],
+		'L_CONF_UPLOAD_INFO'=>$lang['conf_authorize_upload_info'],
+		'L_CONF_MAXSIZE'=>$lang['conf_upload_maxfilesize'],
+		'L_CONF_MAXSIZE_INFO'=>$lang['conf_upload_maxfilesize_info'],
+		'L_CONF_MAXWIDTH'=>$lang['conf_upload_maxwidth'],
+		'L_CONF_MAXWIDTH_INFO'=>$lang['conf_upload_maxwidth_info'],
+		'L_CONF_MAXHEIGHT'=>$lang['conf_upload_maxheight'],
+		'L_CONF_MAXHEIGHT_INFO'=>$lang['conf_upload_maxheight_info'],
+		'L_CONF_TN_MAXWIDTH'=>$lang['conf_upload_tn_maxwidth'],
+		'L_CONF_TN_MAXWIDTH_INFO'=>$lang['conf_upload_tn_maxwidth_info'],
+		'L_CONF_TN_MAXHEIGHT'=>$lang['conf_upload_tn_maxheight'],
+		'L_CONF_TN_MAXHEIGHT_INFO'=>$lang['conf_upload_tn_maxheight_info'],
+				
+		'UPLOAD_MAXSIZE'=>$conf['upload_maxfilesize'],
+		'UPLOAD_MAXWIDTH'=>$conf['upload_maxwidth'],
+		'UPLOAD_MAXHEIGHT'=>$conf['upload_maxheight'],
+		'TN_UPLOAD_MAXWIDTH'=>$conf['upload_maxwidth_thumbnail'],
+		'TN_UPLOAD_MAXHEIGHT'=>$conf['upload_maxheight_thumbnail'],
+		'UPLOAD_YES'=>$upload_yes,
+		'UPLOAD_NO'=>$upload_no
+	  ));
+	  break;
+	}
+	case 'session' :
+    {
+	  $cookie_yes = ($conf['upload_available']=='true')?'checked="checked"':'';
+	  $cookie_no = ($conf['upload_available']=='false')?'checked="checked"':'';
+	  
+	  $template->assign_block_vars('session',array(
+	    'L_CONF_TITLE'=>$lang['conf_session_title'],
+		'L_CONF_COOKIE'=>$lang['conf_cookies'],
+		'L_CONF_COOKIE_INFO'=>$lang['conf_cookies_info'],
+		'L_SESSION_LENGTH'=>$lang['conf_session_time'],
+		'L_SESSION_LENGTH_INFO'=>$lang['conf_session_time_info'],
+		'L_SESSION_ID_SIZE'=>$lang['conf_session_size'],
+		'L_SESSION_ID_SIZE_INFO'=>$lang['conf_session_size_info'],
+
+		'SESSION_LENGTH'=>$conf['session_time'],
+		'SESSION_ID_SIZE'=>$conf['session_id_size'],
+		'COOKIE_YES'=>$cookie_yes,
+		'COOKIE_NO'=>$cookie_no
+	  ));
+	  break;
+	}
+	case 'metadata' :
+    {
+	  $exif_yes = ($conf['use_exif']=='true')?'checked="checked"':'';
+	  $exif_no = ($conf['use_exif']=='false')?'checked="checked"':'';
+	  $iptc_yes = ($conf['use_iptc']=='true')?'checked="checked"':'';
+	  $iptc_no = ($conf['use_iptc']=='false')?'checked="checked"':'';
+	  $show_exif_yes = ($conf['show_exif']=='true')?'checked="checked"':'';
+	  $show_exif_no = ($conf['show_exif']=='false')?'checked="checked"':'';
+	  $show_iptc_yes = ($conf['show_iptc']=='true')?'checked="checked"':'';
+	  $show_iptc_no = ($conf['show_iptc']=='false')?'checked="checked"':'';
+	  
+	  $template->assign_block_vars('metadata',array(
+	    'L_CONF_TITLE'=>$lang['conf_metadata_title'],
+		'L_CONF_EXIF'=>$lang['conf_use_exif'],
+		'L_CONF_EXIF_INFO'=>$lang['conf_use_exif_info'],
+		'L_CONF_IPTC'=>$lang['conf_use_iptc'],
+		'L_CONF_IPTC_INFO'=>$lang['conf_use_iptc_info'],
+		'L_CONF_SHOW_EXIF'=>$lang['conf_show_exif'],
+		'L_CONF_SHOW_EXIF_INFO'=>$lang['conf_show_exif_info'],
+		'L_CONF_SHOW_IPTC'=>$lang['conf_show_iptc'],
+		'L_CONF_SHOW_IPTC_INFO'=>$lang['conf_show_iptc_info'],
+
+		'USE_EXIF_YES'=>$exif_yes,
+		'USE_EXIF_NO'=>$exif_no,
+		'USE_IPTC_YES'=>$iptc_yes,
+		'USE_IPTC_NO'=>$iptc_no,
+		'SHOW_EXIF_YES'=>$show_exif_yes,
+		'SHOW_EXIF_NO'=>$show_exif_no,
+		'SHOW_IPTC_YES'=>$show_iptc_yes,
+		'SHOW_IPTC_NO'=>$show_iptc_no
+	  ));
+	  break;
+	}
   }
-}
 //-------------------------------------------------------------- errors display
-if (count($errors) != 0)
+if ( sizeof( $errors ) != 0 )
 {
   $template->assign_block_vars('errors',array());
-  foreach ($errors as $error)
+  for ( $i = 0; $i < sizeof( $errors ); $i++ )
   {
-    $template->assign_block_vars('errors.error',array('ERROR'=>$error));
+    $template->assign_block_vars('errors.error',array('ERROR'=>$errors[$i]));
   }
 }
-else if (isset($_POST['submit']))
+elseif ( isset( $_POST['submit'] ) )
 {
   $template->assign_block_vars('confirmation' ,array());
 }
diff --git a/admin/stats.php b/admin/stats.php
index ba0e6f198..3e13817c1 100644
--- a/admin/stats.php
+++ b/admin/stats.php
@@ -24,12 +24,16 @@
 // | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
-include_once( './admin/include/isadmin.inc.php' );
+if( !defined("PHPWG_ROOT_PATH") )
+{
+	die ("Hacking attempt!");
+}
+include_once( PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php' );
 $max_pixels = 500;
 //------------------------------------------------------------ comment deletion
 if ( isset( $_GET['del'] ) and is_numeric( $_GET['del'] ) )
 {
-  $query = 'DELETE FROM '.PREFIX_TABLE.'comments';
+  $query = 'DELETE FROM '.COMMENTS_TABLE;
   $query.= ' WHERE id = '.$_GET['del'];
   $query.= ';';
   mysql_query( $query );
@@ -37,58 +41,52 @@ if ( isset( $_GET['del'] ) and is_numeric( $_GET['del'] ) )
 //--------------------------------------------------------- history table empty
 if ( isset( $_GET['act'] ) and $_GET['act'] == 'empty' )
 {
-  $query = 'DELETE FROM '.PREFIX_TABLE.'history';
-  $query.= ';';
+  $query = 'DELETE FROM '.HISTORY_TABLE.';';
   mysql_query( $query );
 }
+
+// empty link
+$url_empty = PHPWG_ROOT_PATH.'admin.php?page=stats';
+if (isset($_GET['last_days']))
+  	$url_empty .='&amp;last_days='.$_GET['last_days'];
+$url_empty.= '&amp;act=empty';
 //----------------------------------------------------- template initialization
-$sub = $vtp->Open( './template/'.$user['template'].'/admin/stats.vtp' );
-$tpl = array( 'stats_last_days','date','login',
-              'IP','file','picture','category','stats_pages_seen',
-              'stats_visitors','stats_empty', 'stats_pages_seen_graph_title',
-              'stats_visitors_graph_title');
-templatize_array( $tpl, 'lang', $sub );
-$vtp->setGlobalVar( $sub, 'user_template', $user['template'] );
-//--------------------------------------------------- number of days to display
+$template->set_filenames( array('stats'=>'admin/stats.tpl') );
+
 if ( isset( $_GET['last_days'] ) ) define( 'MAX_DAYS', $_GET['last_days'] );
 else                               define( 'MAX_DAYS', 0 );
 
 foreach ( $conf['last_days'] as $option ) {
-  $vtp->addSession( $sub, 'last_day_option' );
-  $vtp->setVar( $sub, 'last_day_option.option', $option );
-  $url = './admin.php?page=stats';
-  if (isset($_GET['expand']))
-	  $url .='&amp;expand='.$_GET['expand'];
-  $url.= '&amp;last_days='.($option - 1);
-  $vtp->setVar( $sub, 'last_day_option.link', add_session_id( $url ) );
-  if ( $option == MAX_DAYS + 1 )
-  {
-    $vtp->setVar( $sub, 'last_day_option.style', 'font-weight:bold;');
-  }
-  $vtp->closeSession( $sub, 'last_day_option' );
-}
-//---------------------------------------------------------------- log  history
-// empty link
-$url = './admin.php?page=stats';
-if (isset($_GET['last_days']))
-  	$url .='&amp;last_days='.$_GET['last_days'];
-// expand array management
-$expand_days = array();
-if (isset($_GET['expand']))
-{
-	$url.= '&amp;expand='.$_GET['expand'];
-	$expand_days = explode( ',', $_GET['expand'] );
-}
-$url.= '&amp;act=empty';
-$vtp->setVar( $sub, 'emply_url', add_session_id( $url ) );
-$page['expand_days'] = array();
-foreach ( $expand_days as $expand_day ) {
-  if ( is_numeric( $expand_day ) )
-  {
-    array_push( $page['expand_days'], $expand_day );
-  }
+  $url = $_SERVER['PHP_SELF'].'?last_days='.($option - 1);
+  $url.= '&amp;page=stats';
+  $template->assign_block_vars(
+    'last_day_option',
+    array(
+      'OPTION'=>$option,
+      'T_STYLE'=>(( $option == MAX_DAYS + 1 )?'text-decoration:underline;':''),
+      'U_OPTION'=>add_session_id( $url )
+      )
+    );
 }
 
+$template->assign_vars(array(
+  'L_STAT_LASTDAYS'=>$lang['stats_last_days'],
+  'L_STAT_DATE'=>$lang['date'],
+  'L_STAT_LOGIN'=>$lang['login'],
+  'L_STAT_IP'=>$lang['IP'],
+  'L_STAT_FILE'=>$lang['file'],
+  'L_STAT_CATEGORY'=>$lang['category'],
+  'L_STAT_PICTURE'=>$lang['picture'],
+  'L_STAT_EMPTY'=>$lang['stats_empty'],
+  'L_STAT_SEEN'=>$lang['stats_pages_seen'],
+  'L_STAT_VISITOR'=>$lang['stats_visitors'],
+  
+  'STAT_EMPTY_URL'=>$url_empty
+  ));
+
+$tpl = array( 'stats_pages_seen_graph_title', 'stats_visitors_graph_title');
+
+//---------------------------------------------------------------- log  history
 $days = array();
 $max_nb_visitors = 0;
 $max_pages_seen = 0;
@@ -98,7 +96,9 @@ $endtime   = mktime( 23,59,59,date('n'),date('j'),date('Y') );
 for ( $i = 0; $i <= MAX_DAYS; $i++ )
 {
   $day = array();
-  $vtp->addSession( $sub, 'day' );
+  $template->assign_block_vars('day',array(
+    ));
+  
   // link to open the day to see details
   $local_expand = $page['expand_days'];
   if ( in_array( $i, $page['expand_days'] ) )
@@ -168,30 +168,30 @@ for ( $i = 0; $i <= MAX_DAYS; $i++ )
   $starttime-= 24*60*60;
   $endtime  -= 24*60*60;
   $vtp->closeSession( $sub, 'day' );
-  array_push( $days, $day );
+  array_push( $days, $day );*/
 }
 //------------------------------------------------------------ pages seen graph
 foreach ( $days as $day ) {
-  $vtp->addSession( $sub, 'pages_day' );
+  /*$vtp->addSession( $sub, 'pages_day' );
   if ( $max_pages_seen > 0 )
     $width = floor( ( $day['nb_pages_seen']*$max_pixels ) / $max_pages_seen );
   else $width = 0;
   $vtp->setVar( $sub, 'pages_day.date', $day['date'] );
   $vtp->setVar( $sub, 'pages_day.width', $width );
   $vtp->setVar( $sub, 'pages_day.nb_pages', $day['nb_pages_seen'] );
-  $vtp->closeSession( $sub, 'pages_day' );
+  $vtp->closeSession( $sub, 'pages_day' );*/
 }
 //-------------------------------------------------------------- visitors grpah
 foreach ( $days as $day ) {
-  $vtp->addSession( $sub, 'visitors_day' );
+  /*$vtp->addSession( $sub, 'visitors_day' );
   if ( $max_nb_visitors > 0 )
     $width = floor( ( $day['nb_visitors'] * $max_pixels ) / $max_nb_visitors );
   else $width = 0;
   $vtp->setVar( $sub, 'visitors_day.date', $day['date'] );
   $vtp->setVar( $sub, 'visitors_day.width', $width );
   $vtp->setVar( $sub, 'visitors_day.nb_visitors', $day['nb_visitors'] );
-  $vtp->closeSession( $sub, 'visitors_day' );
+  $vtp->closeSession( $sub, 'visitors_day' );*/
 }
 //----------------------------------------------------------- sending html code
-$vtp->Parse( $handle , 'sub', $sub );
+$template->assign_var_from_handle('ADMIN_CONTENT', 'stats');
 ?>
diff --git a/comments.php b/comments.php
index 38d2f5392..564e93af2 100644
--- a/comments.php
+++ b/comments.php
@@ -80,7 +80,7 @@ $template->set_filenames( array('comments'=>'comments.tpl') );
 $template->assign_vars(array(
   'L_COMMENT_TITLE' => $title,
   'L_COMMENT_STATS' => $lang['stats_last_days'],
-  'L_COMMENT_RETURN' => $lang['search_return_main_page'],
+  'L_COMMENT_RETURN' => $lang['return_main_page'],
   'L_DELETE' =>$lang['delete'],
   'L_VALIDATE'=>$lang['submit'],
   
diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index b5081e11b..3468be092 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -41,6 +41,9 @@ $lang['storage'] = 'Directory';
 $lang['edit'] = 'Edit';
 $lang['authorized'] = 'Authorized';
 $lang['forbidden'] = 'Forbidden';
+$lang['free'] = 'Free';
+$lang['restricted'] = 'Restricted';
+$lang['metadata']='Metadata';
 
 // Specific words
 $lang['phpinfos'] = 'PHP Information';
@@ -107,124 +110,86 @@ $lang['cat_error_name'] = 'The name of a category mustn\'t be empty';
 
 //Configuration
 $lang['conf_confirmation'] = 'Information data registered in database';
+$lang['conf_default'] = 'Default display';
+$lang['conf_cookie'] = 'Session & Cookie';
 
 // Configuration -> general
-$lang['conf_general_title'] = 'Main';
-
-$lang['conf_general_mail_webmaster'] = 'Webmaster mail adress';
-$lang['conf_general_mail_webmaster_info'] = 'Visitors will be able to contact site administrator with this mail';
-$lang['conf_general_mail_webmaster_error'] = 'e-mail address refused, it must be like name@server.com';
-
-$lang['conf_general_prefix_thumbnail'] = 'Thumbnail prefix';
-$lang['conf_general_prefix_thumbnail_info'] = 'Thumbnails use this prefix. Do not fill if your not sure.';
-$lang['conf_general_prefix_thumbnail_error'] = 'thumbnail\'s prefix must only contain characters among : a to z (case insensitive), "-" or "_"';
-
-$lang['conf_general_access'] = 'Access type';
-$lang['conf_general_access_info'] = '- free : anyone can enter the site, any visitor can create an account in order to customize the appareance of the website<br />- restricted : the webmaster create accounts. Only registered users can enter the site';
-$lang['conf_general_access_1'] = 'Free';
-$lang['conf_general_access_2'] = 'Restricted';
-
-$lang['conf_general_log'] = $lang['history'];
-$lang['conf_general_log_info'] = 'Keep an history of visits on your website ? Visits will be shown in the history section of the administration panel';
-
-$lang['conf_general_mail_notification'] = 'Mail notification';
-$lang['conf_general_mail_notification_info'] = 'Automated mail notification for adminsitrators (and only for them) when a user add a comment or upload a picture.';
+$lang['conf_general_title'] = 'Main configuration';
+$lang['conf_mail_webmaster'] = 'Webmaster mail adress';
+$lang['conf_mail_webmaster_info'] = 'Visitors will be able to contact site administrator with this mail';
+$lang['conf_mail_webmaster_error'] = 'e-mail address refused, it must be like name@domain.com';
+$lang['conf_prefix'] = 'Thumbnail prefix';
+$lang['conf_prefix_info'] = 'Thumbnails use this prefix. Do not fill if your not sure.';
+$lang['conf_prefix_error'] = 'Thumbnail\'s prefix must only contain characters among : a to z (case insensitive), "-" or "_"';
+$lang['conf_access'] = 'Access type';
+$lang['conf_access_info'] = '- free : anyone can enter the site, any visitor can create an account in order to customize the appareance of the website<br />- restricted : the webmaster create accounts. Only registered users can enter the site';
+$lang['conf_log_info'] = 'Keep an history of visits on your website ? Visits will be shown in the history section of the administration panel';
+$lang['conf_notification'] = 'Mail notification';
+$lang['conf_notification_info'] = 'Automated mail notification for adminsitrators (and only for them) when a user add a comment or upload a picture.';
 
 // Configuration -> comments
 $lang['conf_comments_title'] = 'Users comments';
-
-$lang['conf_comments_show_comments'] = 'Show users comments';
-$lang['conf_comments_show_comments_info'] = 'display the users comments under each picture ?';
-
-$lang['conf_comments_nb_comment_page'] = 'Number of comments per page';
-$lang['conf_comments_nb_comment_page_info'] = 'number of comments to display on each page. This number is unlimited for a picture. Enter a number between 5 and 50.';
-$lang['conf_comments_nb_comment_page_error'] = 'The number of comments a page must be between 5 and 50 included.';
-
-$lang['conf_comments_comments_validation'] = 'validation';
-$lang['conf_comments_comments_validation_info'] = 'An administrator validate users posted comments before the becom visible on the site';
-
-$lang['conf_comments_comments_forall'] = 'for all ?';
-$lang['conf_comments_comments_forall_info'] = 'Even guest not registered can post comments';
-
-// Configuration -> upload
-$lang['conf_upload_title'] = 'Users upload';
-
-$lang['conf_upload_upload_available'] = 'authorized the upload of pictures';
-$lang['conf_upload_upload_available_info'] = '';
-
-$lang['conf_upload_upload_maxfilesize'] = 'maximum filesize';
-$lang['conf_upload_upload_maxfilesize_info'] = 'Maximum filesize for the uploaded pictures. Must be a number between 10 and 1000 KB.';
-$lang['conf_upload_upload_maxfilesize_error'] = 'Maximum filesize for the uploaded pictures must be a number between 10 and 1000 KB.';
-
-$lang['conf_upload_upload_maxwidth'] = 'maximum width';
-$lang['conf_upload_upload_maxwidth_info'] = 'Maximum width authorized for the uploaded images. Must be a number superior to 10 pixels';
-$lang['conf_upload_upload_maxwidth_error'] = 'maximum width authorized for the uploaded images must be a number superior to 10 pixels.';
-
-$lang['conf_upload_upload_maxheight'] = 'maximum height';
-$lang['conf_upload_upload_maxheight_info'] = 'Maximum height authorized for the uploaded images. Must be a number superior to 10 pixels';
-$lang['conf_upload_upload_maxheight_error'] = 'maximum height authorized for the uploaded images must be a number superior to 10 pixels.';
-
-$lang['conf_upload_upload_maxwidth_thumbnail'] = 'thumbnails maximum width';
-$lang['conf_upload_upload_maxwidth_thumbnail_info'] = 'Maximum width authorized for the uploaded thumbnails. Must be a number superior to 10 pixels';
-$lang['conf_upload_upload_maxwidth_thumbnail_error'] = 'Maximum width authorized for the uploaded thumbnails must be a number superior to 10 pixels.';
-
-$lang['conf_upload_upload_maxheight_thumbnail'] = 'thumbnails maximum height';
-$lang['conf_upload_upload_maxheight_thumbnail_info'] = 'Maximum height authorized for the uploaded thumbnails. Must be a number superior to 10 pixels';
-$lang['conf_upload_upload_maxheight_thumbnail_error'] = 'Maximum height authorized for the uploaded thumbnails must be a number superior to 10 pixels.';
+$lang['conf_show_comments'] = 'Show users comments';
+$lang['conf_show_comments_info'] = 'Display the users comments under each picture ?';
+$lang['conf_comments_forall'] = 'Comments for all ?';
+$lang['conf_comments_forall_info'] = 'Even guest not registered can post comments';
+$lang['conf_nb_comment_page'] = 'Number of comments per page';
+$lang['conf_nb_comment_page_info'] = 'number of comments to display on each page. This number is unlimited for a picture. Enter a number between 5 and 50.';
+$lang['conf_nb_comment_page_error'] = 'The number of comments a page must be between 5 and 50 included.';
+$lang['conf_comments_validation'] = 'Validation';
+$lang['conf_comments_validation_info'] = 'An administrator validate users posted comments before the becom visible on the site';
 
 // Configuration -> default
 $lang['conf_default_title'] = 'Default display';
+$lang['conf_default_language_info'] = 'Default language';
+$lang['conf_default_theme_info'] = 'Default theme';
+$lang['conf_nb_image_line_info'] = 'Number of pictures for each row by default';
+$lang['conf_nb_line_page_info'] = 'Number of rows by page by default';
+$lang['conf_recent_period_info'] = 'By days. Period within a picture is shown as new. Must be superior to 1 day.';
+$lang['conf_default_expand_info'] = 'Expand all categories by default in the menu ?';
+$lang['conf_show_nb_comments_info'] = 'show the number of comments for each picture on the thumbnails page';
 
-$lang['conf_default_default_language'] = $lang['customize_language'];
-$lang['conf_default_default_language_info'] = 'Default language';
-
-$lang['conf_default_default_template'] = $lang['customize_theme'];
-$lang['conf_default_default_template_info'] = 'Default theme';
-
-$lang['conf_default_nb_image_line'] = $lang['customize_nb_image_per_row'];
-$lang['conf_default_nb_image_line_info'] = 'number of pictures for each row by default';
-
-$lang['conf_default_nb_line_page'] = $lang['customize_nb_row_per_page'];
-$lang['conf_default_nb_line_page_info'] = 'number of rows by page by default';
-
-$lang['conf_default_recent_period'] = $lang['customize_recent_period'];
-$lang['conf_default_recent_period_info'] = 'By days. Period within a picture is shown as new. Must be superior to 1 day.';
-$lang['conf_default_recent_period_error'] = 'The recent period must be an integer value, superior to 1.';
-
-$lang['conf_default_auto_expand'] = $lang['customize_expand'];
-$lang['conf_default_auto_expand_info'] = 'expand all categories by default in the menu ?';
-
-$lang['conf_default_show_nb_comments'] = $lang['customize_show_nb_comments'];
-$lang['conf_default_show_nb_comments_info'] = 'show the number of comments for each picture on the thumbnails page';
+// Configuration -> upload
+$lang['conf_upload_title'] = 'Users upload';
+$lang['conf_authorize_upload'] = 'Authorize upload of pictures';
+$lang['conf_authorize_upload_info'] = '';
+$lang['conf_upload_maxfilesize'] = 'Maximum filesize';
+$lang['conf_upload_maxfilesize_info'] = 'Maximum filesize for the uploaded pictures. Must be a number between 10 and 1000 KB.';
+$lang['conf_upload_maxfilesize_error'] = 'Maximum filesize for the uploaded pictures must be a number between 10 and 1000 KB.';
+$lang['conf_upload_maxwidth'] = 'Maximum width';
+$lang['conf_upload_maxwidth_info'] = 'Maximum width authorized for the uploaded images. Must be a number superior to 10 pixels';
+$lang['conf_upload_maxwidth_error'] = 'maximum width authorized for the uploaded images must be a number superior to 10 pixels.';
+$lang['conf_upload_maxheight'] = 'Maximum height';
+$lang['conf_upload_maxheight_info'] = 'Maximum height authorized for the uploaded images. Must be a number superior to 10 pixels';
+$lang['conf_upload_maxheight_error'] = 'maximum height authorized for the uploaded images must be a number superior to 10 pixels.';
+$lang['conf_upload_tn_maxwidth'] = 'thumbnails maximum width';
+$lang['conf_upload_tn_maxwidth_info'] = 'Maximum width authorized for the uploaded thumbnails. Must be a number superior to 10 pixels';
+$lang['conf_upload_maxwidth_thumbnail_error'] = 'Maximum width authorized for the uploaded thumbnails must be a number superior to 10 pixels.';
+$lang['conf_upload_tn_maxheight'] = 'Thumbnails maximum height';
+$lang['conf_upload_tn_maxheight_info'] = 'Maximum height authorized for the uploaded thumbnails. Must be a number superior to 10 pixels';
+$lang['conf_upload_maxheight_thumbnail_error'] = 'Maximum height authorized for the uploaded thumbnails must be a number superior to 10 pixels.';
 
 // Configuration -> session
 $lang['conf_session_title'] = 'Sessions';
-
-$lang['conf_session_session_id_size'] = 'identifier size';
-$lang['conf_session_session_id_size_info'] = '- the longer your identifier is, the more secure your site is<br />- enter a number between 4 and 50';
-$lang['conf_session_session_id_size_error'] = 'the session identifier size must be an integer value between 4 and 50';
-
-$lang['conf_session_session_time'] = 'validity period';
-$lang['conf_session_session_time_info'] = '- the shorter the validity period is, the more secure your site is<br />- enter a number between 5 and 60, in minutes';
-$lang['conf_session_session_time_error'] = 'the session time must be an integer value between 5 and 60';
-
-$lang['conf_session_authorize_cookies'] = 'Authorize cookies';
-$lang['conf_session_authorize_cookies_info'] = 'users won\'t have to log on each visit any more. Less secure.';
+$lang['conf_cookies'] = 'Authorize cookies';
+$lang['conf_cookies_info'] = 'Users won\'t have to log on each visit any more. Less secure.';
+$lang['conf_session_size'] = 'Identifier size';
+$lang['conf_session_size_info'] = '- the longer your identifier is, the more secure your site is<br />- enter a number between 4 and 50';
+$lang['conf_session_size_error'] = 'the session identifier size must be an integer value between 4 and 50';
+$lang['conf_session_time'] = 'validity period';
+$lang['conf_session_time_info'] = '- the shorter the validity period is, the more secure your site is<br />- enter a number between 5 and 60, in minutes';
+$lang['conf_session_time_error'] = 'the session time must be an integer value between 5 and 60';
 
 // Configuration -> metadata
 $lang['conf_metadata_title'] = 'Metadata';
-
-$lang['conf_metadata_use_exif'] = 'Use EXIF';
-$lang['conf_metadata_use_exif_info'] = 'Use EXIF data during metadata synchronization into PhpWebGallery database';
-
-$lang['conf_metadata_use_iptc'] = 'Use IPTC';
-$lang['conf_metadata_use_iptc_info'] = 'Use IPTC data during metadata synchronization into PhpWebGallery database';
-
-$lang['conf_metadata_show_exif'] = 'Show EXIF';
-$lang['conf_metadata_show_exif_info'] = 'Give the possibility to show EXIF metadata on visualisation page. See include/config.inc.php for available EXIF fields';
-
-$lang['conf_metadata_show_iptc'] = 'Show IPTC';
-$lang['conf_metadata_show_iptc_info'] = 'Give the possibility to show IPTC metadata on visualisation page. See include/config.inc.php for available IPTC fields';
+$lang['conf_use_exif'] = 'Use EXIF';
+$lang['conf_use_exif_info'] = 'Use EXIF data during metadata synchronization into PhpWebGallery database';
+$lang['conf_use_iptc'] = 'Use IPTC';
+$lang['conf_use_iptc_info'] = 'Use IPTC data during metadata synchronization into PhpWebGallery database';
+$lang['conf_show_exif'] = 'Show EXIF';
+$lang['conf_show_exif_info'] = 'Give the possibility to show EXIF metadata on visualisation page. See include/config.inc.php for available EXIF fields';
+$lang['conf_show_iptc'] = 'Show IPTC';
+$lang['conf_show_iptc_info'] = 'Give the possibility to show IPTC metadata on visualisation page. See include/config.inc.php for available IPTC fields';
 
 // Configuration -> remote
 $lang['conf_remote_site_delete_info'] = 'Deleting a remote server will delete all the image and the categories in relation with this server.';
diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php
index b4f0178b6..24e636d4f 100644
--- a/language/en_UK.iso-8859-1/common.lang.php
+++ b/language/en_UK.iso-8859-1/common.lang.php
@@ -55,6 +55,7 @@ $lang['keywords'] = 'Keywords';
 $lang['default'] = 'Default';
 $lang['send_mail'] = 'Contact';
 $lang['webmaster'] = 'Webmaster';
+$lang['language']='Language';
 
 //Properties
 $lang['registration_date'] = 'Registered on';
@@ -65,6 +66,9 @@ $lang['submit'] = 'Submit';
 $lang['delete'] = 'Delete';
 $lang['reset'] = 'Reset';
 
+// Navigation
+$lang['return_main_page'] = 'Back to the index page';
+
 // Identification
 $lang['login'] = 'Login';
 $lang['logout'] = 'Logout';
@@ -97,6 +101,23 @@ $lang['day'][4] = 'Thursday';
 $lang['day'][5] = 'Friday';
 $lang['day'][6] = 'Saturday';
 
+// Customization
+$lang['customize_page_title'] = 'Customization';
+$lang['customize_title'] = 'Customization';
+$lang['nb_image_per_row'] = 'Number of images per row';
+$lang['nb_row_per_page'] = 'Number of rows per page';
+$lang['maxwidth'] = 'Maximum width of the pictures';
+$lang['maxheight'] = 'Maximum height of the pictures';
+$lang['maxwidth_error'] = 'Maximum width must be a number superior to 50';
+$lang['maxheight_error'] = 'Maximum height must be a number superior to 50';
+$lang['theme'] = 'Interface theme';
+$lang['auto_expand'] = 'Expand all categories';
+$lang['show_nb_comments'] = 'Show number of comments';
+$lang['recent_period'] = 'Recent period';
+$lang['periods_error'] = 'Recent period must be a positive integer value';
+$lang['create_cookie'] = 'Create a cookie';
+
+
 // search
 $lang['search_title'] = 'Search';
 $lang['search_wrong_date'] = ' : this date is not valid';
@@ -169,15 +190,7 @@ $lang['ident_title'] = 'Identification';
 $lang['ident_register'] = 'Register';
 $lang['ident_forgotten_password'] = 'Forget your password ?';
 $lang['ident_guest_visit'] = 'Go through the gallery as a visitor';
-$lang['customize_page_title'] = 'Customization';
-$lang['customize_title'] = 'Customization';
-$lang['customize_nb_image_per_row'] = 'number of images per row';
-$lang['customize_nb_row_per_page'] = 'number of rows per page';
-$lang['customize_language'] = 'language';
-$lang['maxwidth'] = 'maximum width of the pictures';
-$lang['maxheight'] = 'maximum height of the pictures';
-$lang['err_maxwidth'] = 'maximum width must be a number superior to 50';
-$lang['err_maxheight'] = 'maximum height must be a number superior to 50';
+
 $lang['previous_image'] = 'Previous';
 $lang['next_image'] = 'Next';
 $lang['back'] = 'Click on the image to go back to the thumbnails page';
@@ -241,17 +254,6 @@ $lang['recent_cats_cat_hint'] = 'Displays recently updated categories';
 $lang['recent_cats_cat'] = 'Last categories';
 $lang['visited'] = 'visited';
 $lang['times'] = 'times';
-$lang['customize_theme'] = 'interface theme';
-$lang['customize_expand'] = 'expand all categories';
-$lang['customize_show_nb_comments'] = 'show number of comments';
-$lang['customize_recent_period'] = 'recent period';
-$lang['customize_template'] = 'template';
-$lang['err_periods'] = 'recent period must be a positive integer value';
-$lang['create_cookie'] = 'create a cookie';
-$lang['customize_day'] = 'day';
-$lang['customize_week'] = 'week';
-$lang['customize_month'] = 'month';
-$lang['customize_year'] = 'year';
 $lang['slideshow'] = 'slideshow';
 $lang['period_seconds'] = 'seconds per picture';
 $lang['slideshow_stop'] = 'stop the slideshow';
diff --git a/profile.php b/profile.php
index 40cbb5fa7..8eb2ee0b8 100644
--- a/profile.php
+++ b/profile.php
@@ -53,19 +53,19 @@ if ( isset( $_POST['submit'] ) )
        and ( !preg_match( $int_pattern, $_POST['maxwidth'] )
              or $_POST['maxwidth'] < 50 ) )
   {
-    array_push( $errors, $lang['err_maxwidth'] );
+    array_push( $errors, $lang['maxwidth_error'] );
   }
   if ( $_POST['maxheight']
        and ( !preg_match( $int_pattern, $_POST['maxheight'] )
              or $_POST['maxheight'] < 50 ) )
   {
-    array_push( $errors, $lang['err_maxheight'] );
+    array_push( $errors, $lang['maxheight_error'] );
   }
   // periods must be integer values, they represents number of days
   if (!preg_match($int_pattern, $_POST['recent_period'])
       or $_POST['recent_period'] <= 0)
   {
-    array_push( $errors, $lang['err_periods'] );
+    array_push( $errors, $lang['periods_error'] );
   }
   $mail_error = validate_mail_address( $_POST['mail_address'] );
   if ( $mail_error != '' ) array_push( $errors, $mail_error );
@@ -138,13 +138,13 @@ $template->assign_vars(array(
   'L_NEW' =>  $lang['new'],
   'L_CONFIRM' =>  $lang['reg_confirm'],
   'L_COOKIE' =>  $lang['create_cookie'],
-  'L_LANG_SELECT'=>$lang['customize_language'],
-  'L_NB_IMAGE_LINE'=>$lang['customize_nb_image_per_row'],
-  'L_NB_ROW_PAGE'=>$lang['customize_nb_row_per_page'],
-  'L_STYLE_SELECT'=>$lang['customize_theme'],
-  'L_RECENT_PERIOD'=>$lang['customize_recent_period'],
-  'L_EXPAND_TREE'=>$lang['customize_expand'],
-  'L_NB_COMMENTS'=>$lang['customize_show_nb_comments'],
+  'L_LANG_SELECT'=>$lang['language'],
+  'L_NB_IMAGE_LINE'=>$lang['nb_image_per_row'],
+  'L_NB_ROW_PAGE'=>$lang['nb_row_per_page'],
+  'L_STYLE_SELECT'=>$lang['theme'],
+  'L_RECENT_PERIOD'=>$lang['recent_period'],
+  'L_EXPAND_TREE'=>$lang['auto_expand'],
+  'L_NB_COMMENTS'=>$lang['show_nb_comments'],
   'L_YES'=>$lang['yes'],
   'L_NO'=>$lang['no'],
   'L_SUBMIT'=>$lang['submit'],
diff --git a/template/default/admin.tpl b/template/default/admin.tpl
index 5652be28f..54d2a8a38 100644
--- a/template/default/admin.tpl
+++ b/template/default/admin.tpl
@@ -16,13 +16,22 @@
 <div class="menu">
 <ul class="menu">
   <li><a class="adminMenu" href="{U_FAQ}">{L_FAQ}</a></li>
-  <li><a class="adminMenu" href="{U_CONFIG}">{L_CONFIG}</a></li>
-  <li><a class="adminMenu" href="{U_SITES}">{L_SITES}</a></li>
-  <!--<li><a class="adminMenu" href="{U_CONFIG}">{L_DEFAULT}</a></li>-->
   <li><a class="adminMenu" href="{U_PHPINFO}">{L_PHPINFO}</a></li>
   <li><a class="adminMenu" href="{U_HISTORY}">{L_HISTORY}</a></li>
   </ul>
 </div>
+<div class="titreMenu">{L_CONFIGURATION}</div>
+<div class="menu">
+<ul class="menu">
+  <li><a class="adminMenu" href="{U_CONFIG_GENERAL}">{L_CONFIG_GENERAL}</a></li>
+  <li><a class="adminMenu" href="{U_CONFIG_COMMENTS}">{L_CONFIG_COMMENTS}</a></li>
+  <li><a class="adminMenu" href="{U_CONFIG_DISPLAY}">{L_CONFIG_DISPLAY}</a></li>
+  <li><a class="adminMenu" href="{U_CONFIG_UPLOAD}">{L_CONFIG_UPLOAD}</a></li>
+  <li><a class="adminMenu" href="{U_CONFIG_SESSION}">{L_CONFIG_SESSION}</a></li>
+  <li><a class="adminMenu" href="{U_CONFIG_METADATA}">{L_CONFIG_METADATA}</a></li>
+  <li><a class="adminMenu" href="{U_CONFIG_SITES}">{L_CONFIG_SITES}</a></li>
+  </ul>
+</div>
 <div class="titreMenu">{L_CATEGORIES}</div>
 <div class="menu">
 <ul class="menu">
diff --git a/template/default/admin/configuration.tpl b/template/default/admin/configuration.tpl
index 5f9609f47..98a5c2171 100644
--- a/template/default/admin/configuration.tpl
+++ b/template/default/admin/configuration.tpl
@@ -10,49 +10,211 @@
 <!-- BEGIN confirmation -->
 <div class="info">{L_CONFIRM}</div>
 <!-- END confirmation -->
-
 <form method="post" action="{F_ACTION}">
-
-<p class="confMenu">
-  <!-- BEGIN confmenu_item -->
-  <a class="{confmenu_item.CLASS}" href="{confmenu_item.URL}">{confmenu_item.NAME}</a>
-  <!-- END confmenu_item -->
-</p>
-
 <table width="100%" align="center">
-  <!-- BEGIN line -->
-  <tr>
-    <td width="50%">
-      <span class="confLineName">{line.NAME} :</span>
-      <br />
-      <span class="confLineInfo">{line.INFO}</span>
-    </td>
-    <td class="confLineField">
-
-      <!-- BEGIN textfield -->
-      <input type="text" size="{line.textfield.SIZE}" maxlength="{line.textfield.SIZE}" name="{line.textfield.NAME}" value="{line.textfield.VALUE}" />
-      <!-- END textfield -->
-
-      <!-- BEGIN radio -->
-      <input type="radio" class="radio" name="{line.radio.NAME}" value="{line.radio.VALUE}" {line.radio.CHECKED} />{line.radio.OPTION}
-      <!-- END radio -->
-
-      <!-- BEGIN select -->
-      <select name="{line.select.NAME}">
-        <!-- BEGIN select_option -->
-        <option value="{line.select.select_option.VALUE}" {line.select.select_option.SELECTED}>{line.select.select_option.OPTION}</option>
-        <!-- END select_option -->
-      </select>
-      <!-- END select -->
-
-    </td>
-  </tr>
-  <!-- END line -->
-  <tr>
-    <td colspan="2" align="center">
-      <input type="submit" name="submit" class="bouton" value="{L_SUBMIT}" />
-    </td>
-  </tr>
-</table>
-
+<!-- BEGIN general -->
+  <tr class="admin">
+    <th colspan="2">{general.L_CONF_TITLE}</th>
+  </tr>
+  <tr>
+    <td colspan="2">&nbsp;</td>
+  </tr>
+  <tr>
+    <td width="70%"><strong>{general.L_CONF_MAIL}&nbsp;:</strong><br /><span class="small">{general.L_CONF_MAIL_INFO}</span></td>
+	<td class="row1"><input type="text" size="25" maxlength="100" name="mail_webmaster" value="{general.ADMIN_MAIL}" /></td>
+  </tr>
+  <tr>
+    <td><strong>{general.L_CONF_TN_PREFIX}&nbsp;:</strong><br /><span class="small">{general.L_CONF_TN_PREFIX_INFO}</span></td>
+	<td class="row1"><input type="text" size="3" maxlength="4" name="prefix_thumbnail" value="{general.THUMBNAIL_PREFIX}" /></td>
+  </tr>
+  <tr>
+  <td><strong>{general.L_CONF_ACCESS}&nbsp;:</strong><br /><span class="small">{general.L_CONF_ACCESS_INFO}</span></td>
+	<td class="row1"><input type="radio" class="radio" name="access" value="free" {general.ACCESS_FREE} />{general.L_CONF_ACCESS_FREE}&nbsp;&nbsp;
+	<input type="radio" class="radio" name="access" value="restricted" {general.ACCESS_RESTRICTED} />{general.L_CONF_ACCESS_RESTRICTED}</td>
+  </tr>
+  <tr>
+    <td><strong>{general.L_CONF_HISTORY}&nbsp;:</strong><br /><span class="small">{general.L_CONF_HISTORY_INFO}</span></td>
+	<td class="row1"><input type="radio" class="radio" name="log" value="true" {general.HISTORY_YES} />{L_YES}&nbsp;&nbsp;
+	<input type="radio" class="radio" name="log" value="false" {general.HISTORY_NO} />{L_NO}</td>
+  </tr>
+  <tr>
+    <td><strong>{general.L_CONF_NOTIFICATION}&nbsp;:</strong><br /><span class="small">{general.L_CONF_NOTIFICATION_INFO}</span></td>
+	<td class="row1"><input type="radio" class="radio" name="mail_notification" value="true" {general.NOTIFICATION_YES} />{L_YES}&nbsp;&nbsp;
+	<input type="radio" class="radio" name="mail_notification" value="false" {general.NOTIFICATION_NO} />{L_NO}</td>
+  </tr>
+<!-- END general -->
+<!-- BEGIN comments -->
+  <tr class="admin">
+    <th colspan="2">{comments.L_CONF_TITLE}</th>
+  </tr>
+    <tr>
+    <td colspan="2">&nbsp;</td>
+  </tr>
+  <tr>
+    <td width="70%"><strong>{comments.L_CONF_SHOW_COMMENTS}&nbsp;:</strong><br /><span class="small">{comments.L_CONF_SHOW_COMMENTS_INFO}</span></td>
+	<td class="row1"><input type="radio" class="radio" name="show_comments" value="true" {comments.SHOW_COMMENTS_YES} />{L_YES}&nbsp;&nbsp;
+	<input type="radio" class="radio" name="show_comments" value="false" {comments.SHOW_COMMENTS_NO} />{L_NO}</td>
+  </tr>
+  <tr>
+    <td><strong>{comments.L_CONF_COMMENTS_ALL}&nbsp;:</strong><br /><span class="small">{comments.L_CONF_COMMENTS_ALL_INFO}</span></td>
+	<td class="row1"><input type="radio" class="radio" name="comments_forall" value="true" {comments.COMMENTS_ALL_YES} />{L_YES}&nbsp;&nbsp;
+	<input type="radio" class="radio" name="comments_forall" value="false" {comments.COMMENTS_ALL_NO} />{L_NO}</td>
+  </tr>
+  <tr>
+    <td><strong>{comments.L_CONF_NB_COMMENTS_PAGE}&nbsp;:</strong><br /><span class="small">{comments.L_CONF_NB_COMMENTS_PAGE_INFO}</span></td>
+	<td class="row1"><input type="text" size="3" maxlength="4" name="nb_comment_page" value="{comments.NB_COMMENTS_PAGE}" /></td>
+  </tr>
+  <tr>
+    <td><strong>{comments.L_CONF_VALIDATE}&nbsp;:</strong><br /><span class="small">{comments.L_CONF_VALIDATE_INFO}</span></td>
+	<td class="row1"><input type="radio" class="radio" name="comments_validation" value="true" {comments.VALIDATE_YES} />{L_YES}&nbsp;&nbsp;
+	<input type="radio" class="radio" name="comments_validation" value="false" {comments.VALIDATE_NO} />{L_NO}</td>
+  </tr>
+<!-- END comments -->
+<!-- BEGIN default -->
+  <tr class="admin">
+    <th colspan="2">{default.L_CONF_TITLE}</th>
+  </tr>
+    <tr>
+    <td colspan="2">&nbsp;</td>
+  </tr>
+  <tr>
+    <td width="70%"><strong>{default.L_CONF_LANG}&nbsp;:</strong><br /><span class="small">{default.L_CONF_LANG_INFO}</span></td>
+	<td class="row1">{default.CONF_LANG_SELECT}</td>
+  </tr>
+  <tr>
+    <td><strong>{default.L_NB_IMAGE_LINE}&nbsp;:</strong><br /><span class="small">{default.L_NB_IMAGE_LINE_INFO}</span></td>
+	<td class="row1"><input type="text" size="3" maxlength="2" name="nb_image_line" value="{default.NB_IMAGE_LINE}" /></td>
+  </tr>
+  <tr>
+    <td><strong>{default.L_NB_ROW_PAGE}&nbsp;:</strong><br /><span class="small">{default.L_NB_ROW_PAGE_INFO}</span></td>
+	<td class="row1"><input type="text" size="3" maxlength="2" name="nb_line_page" value="{default.NB_ROW_PAGE}" /></td>
+  </tr>
+  <tr>
+    <td><strong>{default.L_CONF_STYLE}&nbsp;:</strong><br /><span class="small">{default.L_CONF_STYLE_INFO}</span></td>
+	<td class="row1">{default.CONF_STYLE_SELECT}</td>
+  </tr>
+  <tr>
+    <td><strong>{default.L_CONF_RECENT}&nbsp;:</strong><br /><span class="small">{default.L_CONF_RECENT_INFO}</span></td>
+	<td class="row1"><input type="text" size="3" maxlength="2" name="recent_period" value="{default.CONF_RECENT}" /></td>
+  </tr>
+  <tr>
+    <td><strong>{default.L_CONF_EXPAND}&nbsp;:</strong><br /><span class="small">{default.L_CONF_EXPAND_INFO}</span></td>
+	<td class="row1"><input type="radio" class="radio" name="auto_expand" value="true" {default.EXPAND_YES} />{L_YES}&nbsp;&nbsp;
+	<input type="radio" class="radio" name="auto_expand" value="false" {default.EXPAND_NO} />{L_NO}</td>
+  </tr>
+  <tr>
+    <td><strong>{default.L_NB_COMMENTS}&nbsp;:</strong><br /><span class="small">{default.L_NB_COMMENTS_INFO}</span></td>
+	<td class="row1"><input type="radio" class="radio" name="show_nb_comments" value="true" {default.SHOW_COMMENTS_YES} />{L_YES}&nbsp;&nbsp;
+	<input type="radio" class="radio" name="show_nb_comments" value="false" {default.SHOW_COMMENTS_NO} />{L_NO}</td>
+  </tr>
+<!-- END default -->
+<!-- BEGIN upload -->
+  <tr class="admin">
+    <th colspan="2">{upload.L_CONF_TITLE}</th>
+  </tr>
+  <tr>
+    <td colspan="2">&nbsp;</td>
+  </tr>
+  <tr>
+    <td width="70%"><strong>{upload.L_CONF_UPLOAD}&nbsp;:</strong><br /><span class="small">{upload.L_CONF_UPLOAD_INFO}</span></td>
+	<td class="row1"><input type="radio" class="radio" name="upload_available" value="true" {upload.UPLOAD_YES} />{L_YES}&nbsp;&nbsp;
+	<input type="radio" class="radio" name="upload_available" value="false" {upload.UPLOAD_NO} />{L_NO}</td>
+  </tr>
+  <tr>
+    <td><strong>{upload.L_CONF_MAXSIZE}&nbsp;:</strong><br /><span class="small">{upload.L_CONF_MAXSIZE_INFO}</span></td>
+	<td class="row1"><input type="text" size="4" maxlength="4" name="upload_maxfilesize" value="{upload.UPLOAD_MAXSIZE}" /></td>
+  </tr>
+  <tr>
+    <td><strong>{upload.L_CONF_MAXWIDTH}&nbsp;:</strong><br /><span class="small">{upload.L_CONF_MAXWIDTH_INFO}</span></td>
+	<td class="row1"><input type="text" size="4" maxlength="4" name="upload_maxwidth" value="{upload.UPLOAD_MAXWIDTH}" /></td>
+  </tr>
+  <tr>
+    <td><strong>{upload.L_CONF_MAXHEIGHT}&nbsp;:</strong><br /><span class="small">{upload.L_CONF_MAXHEIGHT_INFO}</span></td>
+	<td class="row1"><input type="text" size="4" maxlength="4" name="upload_maxheight" value="{upload.UPLOAD_MAXHEIGHT}" /></td>
+  </tr>
+    <tr>
+    <td><strong>{upload.L_CONF_TN_MAXWIDTH}&nbsp;:</strong><br /><span class="small">{upload.L_CONF_TN_MAXWIDTH_INFO}</span></td>
+	<td class="row1"><input type="text" size="4" maxlength="4" name="upload_maxwidth_thumbnail" value="{upload.TN_UPLOAD_MAXWIDTH}" /></td>
+  </tr>
+  <tr>
+    <td><strong>{upload.L_CONF_TN_MAXHEIGHT}&nbsp;:</strong><br /><span class="small">{upload.L_CONF_TN_MAXHEIGHT_INFO}</span></td>
+	<td class="row1"><input type="text" size="4" maxlength="4" name="upload_maxheight_thumbnail" value="{upload.TN_UPLOAD_MAXHEIGHT}" /></td>
+  </tr>
+<!-- END upload -->
+<!-- BEGIN session -->
+  <tr class="admin">
+    <th colspan="2">{session.L_CONF_TITLE}</th>
+  </tr>
+  <tr>
+    <td colspan="2">&nbsp;</td>
+  </tr>
+    <tr>
+    <td width="70%"><strong>{session.L_CONF_COOKIE}&nbsp;:</strong><br /><span class="small">{session.L_CONF_COOKIE_INFO}</span></td>
+	<td class="row1"><input type="radio" class="radio" name="authorize_cookies" value="true" {session.COOKIE_YES} />{L_YES}&nbsp;&nbsp;
+	<input type="radio" class="radio" name="authorize_cookies" value="false" {session.COOKIE_NO} />{L_NO}</td>
+  </tr>
+  <tr>
+    <td><strong>{session.L_SESSION_LENGTH}&nbsp;:</strong><br /><span class="small">{session.L_SESSION_LENGTH_INFO}</span></td>
+	<td class="row1"><input type="text" size="4" maxlength="6" name="session_time" value="{session.SESSION_LENGTH}" /></td>
+  </tr>
+    <tr>
+    <td><strong>{session.L_SESSION_ID_SIZE}&nbsp;:</strong><br /><span class="small">{session.L_SESSION_ID_SIZE_INFO}</span></td>
+	<td class="row1"><input type="text" size="2" maxlength="3" name="session_id_size" value="{session.SESSION_ID_SIZE}" /></td>
+  </tr>
+<!-- END session -->
+<!-- BEGIN metadata -->
+  <tr class="admin">
+    <th colspan="2">{metadata.L_CONF_TITLE}</th>
+  </tr>
+  <tr>
+    <td colspan="2">&nbsp;</td>
+  </tr>
+  <tr>
+    <td width="70%">
+      <strong>{metadata.L_CONF_EXIF}&nbsp;:</strong>
+      <br /><span class="small">{metadata.L_CONF_EXIF_INFO}</span>
+    </td>
+    <td class="row1">
+      <input type="radio" class="radio" name="use_exif" value="true" {metadata.USE_EXIF_YES} />{L_YES}&nbsp;&nbsp;
+      <input type="radio" class="radio" name="use_exif" value="false" {metadata.USE_EXIF_NO} />{L_NO}
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <strong>{metadata.L_CONF_IPTC}&nbsp;:</strong>
+      <br /><span class="small">{metadata.L_CONF_IPTC_INFO}</span>
+    </td>
+    <td class="row1">
+      <input type="radio" class="radio" name="use_iptc" value="true" {metadata.USE_IPTC_YES} />{L_YES}&nbsp;&nbsp;
+      <input type="radio" class="radio" name="use_iptc" value="false" {metadata.USE_IPTC_NO} />{L_NO}
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <strong>{metadata.L_CONF_SHOW_EXIF}&nbsp;:</strong>
+      <br /><span class="small">{metadata.L_CONF_SHOW_EXIF_INFO}</span>
+    </td>
+    <td class="row1">
+      <input type="radio" class="radio" name="show_exif" value="true" {metadata.SHOW_EXIF_YES} />{L_YES}&nbsp;&nbsp;
+      <input type="radio" class="radio" name="show_exif" value="false" {metadata.SHOW_EXIF_NO} />{L_NO}
+    </td>
+  </tr>
+  <tr>
+    <td>
+      <strong>{metadata.L_CONF_SHOW_IPTC}&nbsp;:</strong>
+      <br /><span class="small">{metadata.L_CONF_SHOW_IPTC_INFO}</span>
+    </td>
+    <td class="row1">
+      <input type="radio" class="radio" name="show_iptc" value="true" {metadata.SHOW_IPTC_YES} />{L_YES}&nbsp;&nbsp;
+      <input type="radio" class="radio" name="show_iptc" value="false" {metadata.SHOW_IPTC_NO} />{L_NO}
+    </td>
+  </tr>
+<!-- END metadata -->
+    <tr>
+      <td colspan="2" align="center">
+        <input type="submit" name="submit" class="bouton" value="{L_SUBMIT}">
+		<input type="submit" name="reset" class="bouton" value="{L_RESET}">
+      </td>
+    </tr>
+  </table>
 </form>
diff --git a/template/default/default.css b/template/default/default.css
index caaf34152..b41fdfaf0 100644
--- a/template/default/default.css
+++ b/template/default/default.css
@@ -350,45 +350,6 @@ span.update_error_element, span.update_category_error {
   color:#ffe1e1;
 }
 
-.confMenu {
-  background-color:#444444;
-  text-align:center;
-}
-
-.confMenu a {
-  padding:2px;
-  border:1px solid gray;
-  background-color:#505050;
-  color:#fff48e;
-  color:lightgray;
-}
-
-.confMenu a:hover {
-  color:orange;
-  text-decoration:none;
-}
-
-.confMenu a.opened {
-  background-color:gray;
-  color:white;
-  text-decoration:none;
-}
-
-span.confLineName {
-  font-weight:bold;
-}
-
-span.confLineInfo {
-  font-size:80%;
-}
-
-td.confLineField {
-  text-align:left;
-  padding:5px 0px 5px 0px;
-  height:20px;
-  background-color:#505050;
-}
-
 div.remoteOutput {
   background-color:#444444;
   border:1px solid black;