Changeset 528


Ignore:
Timestamp:
Sep 20, 2004, 10:08:15 PM (20 years ago)
Author:
z0rglub
Message:
  • huge refactoring of admin/configuration.php (reminder : tabs in code are forbidden, only blank spaces are allowed)
  • in admin panel, remote site management is in "general" section and not in "configuration" section
  • when retrieving languages, the array keys must be the language code and not its display name (because 2 language codes might have the same display name)
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin.php

    r527 r528  
    198198  'L_CONFIG_SESSION'=>$lang['conf_cookie'],
    199199  'L_CONFIG_METADATA'=>$lang['metadata'],
    200   'L_CONFIG_SITES'=>$lang['remote_sites'],
     200  'L_SITES'=>$lang['remote_sites'],
    201201  'L_CATEGORIES'=>$lang['categories'],
    202202  'L_MANAGE'=>$lang['manage'],
     
    218218  'U_CONFIG_SESSION'=>add_session_id($link_start.'configuration&section=session' ),
    219219  'U_CONFIG_METADATA'=>add_session_id($link_start.'configuration&section=metadata' ),
    220   'U_CONFIG_SITES'=>add_session_id($link_start.'remote_site'),
     220  'U_SITES'=>add_session_id($link_start.'remote_site'),
    221221  'U_PHPINFO'=>add_session_id($link_start.'admin_phpinfo' ),
    222222  'U_USERS'=>add_session_id($link_start.'user_search' ),
  • trunk/admin/configuration.php

    r527 r528  
    4141  $page['section'] = $_GET['section'];
    4242}
    43 
    4443//------------------------------------------------------ $conf reinitialization
    4544$result = mysql_query('SELECT param,value FROM '.CONFIG_TABLE);
     
    142141  }
    143142 
    144   // updating configuraiton if no error found
     143  // updating configuration if no error found
    145144  if (count($errors) == 0)
    146145  {
     
    150149      if (isset($_POST[$row['param']]))
    151150      {
    152         $query = 'UPDATE '.CONFIG_TABLE.
    153                   ' SET value = \''. str_replace("\'", "''", $_POST[$row['param']]).
    154                   '\' WHERE param = \''.$row['param'].'\';';
     151        $query = '
     152UPDATE '.CONFIG_TABLE.'
     153  SET value = \''. str_replace("\'", "''", $_POST[$row['param']]).'\'
     154  WHERE param = \''.$row['param'].'\'
     155;';
    155156        mysql_query($query);
    156157      }
     
    162163$template->set_filenames( array('config'=>'admin/configuration.tpl') );
    163164
    164 $template->assign_vars(array( 
    165   'L_CONFIRM'=>$lang['conf_confirmation'],
    166   'L_YES'=>$lang['yes'],
    167   'L_NO'=>$lang['no'],
    168   'L_SUBMIT'=>$lang['submit'],
    169   'L_RESET'=>$lang['reset'],
     165$action = PHPWG_ROOT_PATH.'admin.php?page=configuration';
     166$action.= '&section='.$page['section'];
     167
     168$template->assign_vars(
     169  array(
     170    'L_CONFIRM'=>$lang['conf_confirmation'],
     171    'L_YES'=>$lang['yes'],
     172    'L_NO'=>$lang['no'],
     173    'L_SUBMIT'=>$lang['submit'],
     174    'L_RESET'=>$lang['reset'],
     175   
     176    'F_ACTION'=>add_session_id($action)
     177    ));
     178
     179switch ($page['section'])
     180{
     181  case 'general' :
     182  {
     183    $access_free = ($conf['access']=='free')?'checked="checked"':'';
     184    $access_restricted = ($conf['access']=='restricted')?'checked="checked"':'';
     185    $history_yes = ($conf['log']=='true')?'checked="checked"':'';
     186    $history_no  = ($conf['log']=='false')?'checked="checked"':'';
     187    $notif_yes = ($conf['mail_notification']=='true')?'checked="checked"':'';
     188    $notif_no = ($conf['mail_notification']=='false')?'checked="checked"':'';
     189   
     190    $template->assign_block_vars(
     191      'general',
     192      array(
     193        'L_CONF_TITLE'=>$lang['conf_general_title'],
     194        'L_CONF_MAIL'=>$lang['conf_mail_webmaster'],
     195        'L_CONF_MAIL_INFO'=>$lang['conf_mail_webmaster_info'],
     196        'L_CONF_TN_PREFIX'=>$lang['conf_prefix'],
     197        'L_CONF_TN_PREFIX_INFO'=>$lang['conf_prefix_info'],
     198        'L_CONF_ACCESS'=>$lang['conf_access'],
     199        'L_CONF_ACCESS_INFO'=>$lang['conf_access_info'],
     200        'L_CONF_ACCESS_FREE'=>$lang['free'],
     201        'L_CONF_ACCESS_RESTRICTED'=>$lang['restricted'],
     202        'L_CONF_HISTORY'=>$lang['history'],
     203        'L_CONF_HISTORY_INFO'=>$lang['conf_log_info'],
     204        'L_CONF_NOTIFICATION'=>$lang['conf_notification'],
     205        'L_CONF_NOTIFICATION_INFO'=>$lang['conf_notification_info'],
     206         
     207        'ADMIN_MAIL'=>$conf['mail_webmaster'],
     208        'THUMBNAIL_PREFIX'=>$conf['prefix_thumbnail'],
     209        'ACCESS_FREE'=>$access_free,
     210        'ACCESS_RESTRICTED'=>$access_restricted,
     211        'HISTORY_YES'=>$history_yes,
     212        'HISTORY_NO'=>$history_no,
     213        'NOTIFICATION_YES'=>$notif_yes,
     214        'NOTIFICATION_NO'=>$notif_no
     215        ));
     216    break;
     217  }
     218  case 'comments' :
     219  {
     220    $show_yes = ($conf['show_comments']=='true')?'checked="checked"':'';
     221    $show_no = ($conf['show_comments']=='false')?'checked="checked"':'';
     222    $all_yes = ($conf['comments_forall']=='true')?'checked="checked"':'';
     223    $all_no  = ($conf['comments_forall']=='false')?'checked="checked"':'';
     224    $validate_yes = ($conf['comments_validation']=='true')?'checked="checked"':'';
     225    $validate_no = ($conf['comments_validation']=='false')?'checked="checked"':'';
     226     
     227    $template->assign_block_vars(
     228      'comments',
     229      array(
     230        'L_CONF_TITLE'=>$lang['conf_comments_title'],
     231        'L_CONF_SHOW_COMMENTS'=>$lang['conf_show_comments'],
     232        'L_CONF_SHOW_COMMENTS_INFO'=>$lang['conf_show_comments_info'],
     233        'L_CONF_COMMENTS_ALL'=>$lang['conf_comments_forall'],
     234        'L_CONF_COMMENTS_ALL_INFO'=>$lang['conf_comments_forall_info'],
     235        'L_CONF_NB_COMMENTS_PAGE'=>$lang['conf_nb_comment_page'],
     236        'L_CONF_NB_COMMENTS_PAGE_INFO'=>$lang['conf_nb_comment_page'],
     237        'L_CONF_VALIDATE'=>$lang['conf_comments_validation'],
     238        'L_CONF_VALIDATE_INFO'=>$lang['conf_comments_validation_info'],
     239         
     240        'NB_COMMENTS_PAGE'=>$conf['nb_comment_page'],
     241        'SHOW_COMMENTS_YES'=>$show_yes,
     242        'SHOW_COMMENTS_NO'=>$show_no,
     243        'COMMENTS_ALL_YES'=>$all_yes,
     244        'COMMENTS_ALL_NO'=>$all_no,
     245        'VALIDATE_YES'=>$validate_yes,
     246        'VALIDATE_NO'=>$validate_no
     247        ));
     248    break;
     249  }
     250  case 'default' :
     251  {
     252    $show_yes = ($conf['show_nb_comments']=='true')?'checked="checked"':'';
     253    $show_no = ($conf['show_nb_comments']=='false')?'checked="checked"':'';
     254    $expand_yes = ($conf['auto_expand']=='true')?'checked="checked"':'';
     255    $expand_no  = ($conf['auto_expand']=='false')?'checked="checked"':'';
     256     
     257    $template->assign_block_vars(
     258      'default',
     259      array(
     260        'L_CONF_TITLE'=>$lang['conf_default_title'],
     261        'L_CONF_LANG'=>$lang['language'],
     262        'L_CONF_LANG_INFO'=>$lang['conf_default_language_info'],
     263        'L_NB_IMAGE_LINE'=>$lang['nb_image_per_row'],
     264        'L_NB_IMAGE_LINE_INFO'=>$lang['conf_nb_image_line_info'],
     265        'L_NB_ROW_PAGE'=>$lang['nb_row_per_page'],
     266        'L_NB_ROW_PAGE_INFO'=>$lang['conf_nb_line_page_info'],
     267        'L_CONF_STYLE'=>$lang['theme'],
     268        'L_CONF_STYLE_INFO'=>$lang['conf_default_theme_info'],
     269        'L_CONF_RECENT'=>$lang['recent_period'],
     270        'L_CONF_RECENT_INFO'=>$lang['conf_recent_period_info'],
     271        'L_CONF_EXPAND'=>$lang['auto_expand'],
     272        'L_CONF_EXPAND_INFO'=>$lang['conf_default_expand_info'],
     273        'L_NB_COMMENTS'=>$lang['show_nb_comments'],
     274        'L_NB_COMMENTS_INFO'=>$lang['conf_show_nb_comments_info'],
    170275 
    171   'F_ACTION'=>add_session_id(PHPWG_ROOT_PATH.'admin.php?page=configuration&section='.$page['section'])
    172   ));
    173 
    174 switch ($page['section'])
    175   {
    176     case 'general' :
    177     {
    178       $access_free = ($conf['access']=='free')?'checked="checked"':'';
    179           $access_restricted = ($conf['access']=='restricted')?'checked="checked"':'';
    180       $history_yes = ($conf['log']=='true')?'checked="checked"':'';
    181           $history_no  = ($conf['log']=='false')?'checked="checked"':'';
    182           $notif_yes = ($conf['mail_notification']=='true')?'checked="checked"':'';
    183           $notif_no = ($conf['mail_notification']=='false')?'checked="checked"':'';
    184 
    185           $template->assign_block_vars('general',array(
    186             'L_CONF_TITLE'=>$lang['conf_general_title'],
    187                 'L_CONF_MAIL'=>$lang['conf_mail_webmaster'],
    188                 'L_CONF_MAIL_INFO'=>$lang['conf_mail_webmaster_info'],
    189                 'L_CONF_TN_PREFIX'=>$lang['conf_prefix'],
    190                 'L_CONF_TN_PREFIX_INFO'=>$lang['conf_prefix_info'],
    191                 'L_CONF_ACCESS'=>$lang['conf_access'],
    192                 'L_CONF_ACCESS_INFO'=>$lang['conf_access_info'],
    193                 'L_CONF_ACCESS_FREE'=>$lang['free'],
    194                 'L_CONF_ACCESS_RESTRICTED'=>$lang['restricted'],
    195                 'L_CONF_HISTORY'=>$lang['history'],
    196                 'L_CONF_HISTORY_INFO'=>$lang['conf_log_info'],
    197                 'L_CONF_NOTIFICATION'=>$lang['conf_notification'],
    198                 'L_CONF_NOTIFICATION_INFO'=>$lang['conf_notification_info'],
    199                
    200                 'ADMIN_MAIL'=>$conf['mail_webmaster'],
    201                 'THUMBNAIL_PREFIX'=>$conf['prefix_thumbnail'],
    202                 'ACCESS_FREE'=>$access_free,
    203                 'ACCESS_RESTRICTED'=>$access_restricted,
    204                 'HISTORY_YES'=>$history_yes,
    205                 'HISTORY_NO'=>$history_no,
    206                 'NOTIFICATION_YES'=>$notif_yes,
    207                 'NOTIFICATION_NO'=>$notif_no
    208           ));
    209           break;
    210         }
    211         case 'comments' :
    212     {
    213           $show_yes = ($conf['show_comments']=='true')?'checked="checked"':'';
    214           $show_no = ($conf['show_comments']=='false')?'checked="checked"':'';
    215       $all_yes = ($conf['comments_forall']=='true')?'checked="checked"':'';
    216           $all_no  = ($conf['comments_forall']=='false')?'checked="checked"':'';
    217           $validate_yes = ($conf['comments_validation']=='true')?'checked="checked"':'';
    218           $validate_no = ($conf['comments_validation']=='false')?'checked="checked"':'';
    219 
    220           $template->assign_block_vars('comments',array(
    221             'L_CONF_TITLE'=>$lang['conf_comments_title'],
    222                 'L_CONF_SHOW_COMMENTS'=>$lang['conf_show_comments'],
    223                 'L_CONF_SHOW_COMMENTS_INFO'=>$lang['conf_show_comments_info'],
    224                 'L_CONF_COMMENTS_ALL'=>$lang['conf_comments_forall'],
    225                 'L_CONF_COMMENTS_ALL_INFO'=>$lang['conf_comments_forall_info'],
    226                 'L_CONF_NB_COMMENTS_PAGE'=>$lang['conf_nb_comment_page'],
    227                 'L_CONF_NB_COMMENTS_PAGE_INFO'=>$lang['conf_nb_comment_page'],
    228                 'L_CONF_VALIDATE'=>$lang['conf_comments_validation'],
    229                 'L_CONF_VALIDATE_INFO'=>$lang['conf_comments_validation_info'],
    230                                
    231                 'NB_COMMENTS_PAGE'=>$conf['nb_comment_page'],
    232                 'SHOW_COMMENTS_YES'=>$show_yes,
    233                 'SHOW_COMMENTS_NO'=>$show_no,
    234                 'COMMENTS_ALL_YES'=>$all_yes,
    235                 'COMMENTS_ALL_NO'=>$all_no,
    236                 'VALIDATE_YES'=>$validate_yes,
    237                 'VALIDATE_NO'=>$validate_no
    238           ));
    239           break;
    240         }
    241         case 'default' :
    242     {
    243           $show_yes = ($conf['show_nb_comments']=='true')?'checked="checked"':'';
    244           $show_no = ($conf['show_nb_comments']=='false')?'checked="checked"':'';
    245       $expand_yes = ($conf['auto_expand']=='true')?'checked="checked"':'';
    246           $expand_no  = ($conf['auto_expand']=='false')?'checked="checked"':'';
    247 
    248           $template->assign_block_vars('default',array(
    249             'L_CONF_TITLE'=>$lang['conf_default_title'],
    250                 'L_CONF_LANG'=>$lang['language'],
    251                 'L_CONF_LANG_INFO'=>$lang['conf_default_language_info'],
    252                 'L_NB_IMAGE_LINE'=>$lang['nb_image_per_row'],
    253                 'L_NB_IMAGE_LINE_INFO'=>$lang['conf_nb_image_line_info'],
    254                 'L_NB_ROW_PAGE'=>$lang['nb_row_per_page'],
    255                 'L_NB_ROW_PAGE_INFO'=>$lang['conf_nb_line_page_info'],
    256                 'L_CONF_STYLE'=>$lang['theme'],
    257                 'L_CONF_STYLE_INFO'=>$lang['conf_default_theme_info'],
    258                 'L_CONF_RECENT'=>$lang['recent_period'],
    259                 'L_CONF_RECENT_INFO'=>$lang['conf_recent_period_info'],
    260                 'L_CONF_EXPAND'=>$lang['auto_expand'],
    261                 'L_CONF_EXPAND_INFO'=>$lang['conf_default_expand_info'],
    262                 'L_NB_COMMENTS'=>$lang['show_nb_comments'],
    263                 'L_NB_COMMENTS_INFO'=>$lang['conf_show_nb_comments_info'],
    264  
    265                 'CONF_LANG_SELECT'=>language_select($conf['default_language'], 'default_language'),
    266                 'NB_IMAGE_LINE'=>$conf['nb_image_line'],
    267                 'NB_ROW_PAGE'=>$conf['nb_line_page'],
    268                 'CONF_STYLE_SELECT'=>style_select($conf['default_template'], 'default_template'),
    269                 'CONF_RECENT'=>$conf['recent_period'],
    270                 'NB_COMMENTS_PAGE'=>$conf['nb_comment_page'],
    271                 'EXPAND_YES'=>$expand_yes,
    272                 'EXPAND_NO'=>$expand_no,
    273                 'SHOW_COMMENTS_YES'=>$show_yes,
    274                 'SHOW_COMMENTS_NO'=>$show_no
    275           ));
    276           break;
    277         }
    278         case 'upload' :
    279     {
    280           $upload_yes = ($conf['upload_available']=='true')?'checked="checked"':'';
    281           $upload_no = ($conf['upload_available']=='false')?'checked="checked"':'';
    282          
    283           $template->assign_block_vars('upload',array(
    284             'L_CONF_TITLE'=>$lang['conf_upload_title'],
    285                 'L_CONF_UPLOAD'=>$lang['conf_authorize_upload'],
    286                 'L_CONF_UPLOAD_INFO'=>$lang['conf_authorize_upload_info'],
    287                 'L_CONF_MAXSIZE'=>$lang['conf_upload_maxfilesize'],
    288                 'L_CONF_MAXSIZE_INFO'=>$lang['conf_upload_maxfilesize_info'],
    289                 'L_CONF_MAXWIDTH'=>$lang['conf_upload_maxwidth'],
    290                 'L_CONF_MAXWIDTH_INFO'=>$lang['conf_upload_maxwidth_info'],
    291                 'L_CONF_MAXHEIGHT'=>$lang['conf_upload_maxheight'],
    292                 'L_CONF_MAXHEIGHT_INFO'=>$lang['conf_upload_maxheight_info'],
    293                 'L_CONF_TN_MAXWIDTH'=>$lang['conf_upload_tn_maxwidth'],
    294                 'L_CONF_TN_MAXWIDTH_INFO'=>$lang['conf_upload_tn_maxwidth_info'],
    295                 'L_CONF_TN_MAXHEIGHT'=>$lang['conf_upload_tn_maxheight'],
    296                 'L_CONF_TN_MAXHEIGHT_INFO'=>$lang['conf_upload_tn_maxheight_info'],
    297                                
    298                 'UPLOAD_MAXSIZE'=>$conf['upload_maxfilesize'],
    299                 'UPLOAD_MAXWIDTH'=>$conf['upload_maxwidth'],
    300                 'UPLOAD_MAXHEIGHT'=>$conf['upload_maxheight'],
    301                 'TN_UPLOAD_MAXWIDTH'=>$conf['upload_maxwidth_thumbnail'],
    302                 'TN_UPLOAD_MAXHEIGHT'=>$conf['upload_maxheight_thumbnail'],
    303                 'UPLOAD_YES'=>$upload_yes,
    304                 'UPLOAD_NO'=>$upload_no
    305           ));
    306           break;
    307         }
    308         case 'session' :
    309     {
    310           $cookie_yes = ($conf['upload_available']=='true')?'checked="checked"':'';
    311           $cookie_no = ($conf['upload_available']=='false')?'checked="checked"':'';
    312          
    313           $template->assign_block_vars('session',array(
    314             'L_CONF_TITLE'=>$lang['conf_session_title'],
    315                 'L_CONF_COOKIE'=>$lang['conf_cookies'],
    316                 'L_CONF_COOKIE_INFO'=>$lang['conf_cookies_info'],
    317                 'L_SESSION_LENGTH'=>$lang['conf_session_time'],
    318                 'L_SESSION_LENGTH_INFO'=>$lang['conf_session_time_info'],
    319                 'L_SESSION_ID_SIZE'=>$lang['conf_session_size'],
    320                 'L_SESSION_ID_SIZE_INFO'=>$lang['conf_session_size_info'],
    321 
    322                 'SESSION_LENGTH'=>$conf['session_time'],
    323                 'SESSION_ID_SIZE'=>$conf['session_id_size'],
    324                 'COOKIE_YES'=>$cookie_yes,
    325                 'COOKIE_NO'=>$cookie_no
    326           ));
    327           break;
    328         }
    329         case 'metadata' :
    330     {
    331           $exif_yes = ($conf['use_exif']=='true')?'checked="checked"':'';
    332           $exif_no = ($conf['use_exif']=='false')?'checked="checked"':'';
    333           $iptc_yes = ($conf['use_iptc']=='true')?'checked="checked"':'';
    334           $iptc_no = ($conf['use_iptc']=='false')?'checked="checked"':'';
    335           $show_exif_yes = ($conf['show_exif']=='true')?'checked="checked"':'';
    336           $show_exif_no = ($conf['show_exif']=='false')?'checked="checked"':'';
    337           $show_iptc_yes = ($conf['show_iptc']=='true')?'checked="checked"':'';
    338           $show_iptc_no = ($conf['show_iptc']=='false')?'checked="checked"':'';
    339          
    340           $template->assign_block_vars('metadata',array(
    341             'L_CONF_TITLE'=>$lang['conf_metadata_title'],
    342                 'L_CONF_EXIF'=>$lang['conf_use_exif'],
    343                 'L_CONF_EXIF_INFO'=>$lang['conf_use_exif_info'],
    344                 'L_CONF_IPTC'=>$lang['conf_use_iptc'],
    345                 'L_CONF_IPTC_INFO'=>$lang['conf_use_iptc_info'],
    346                 'L_CONF_SHOW_EXIF'=>$lang['conf_show_exif'],
    347                 'L_CONF_SHOW_EXIF_INFO'=>$lang['conf_show_exif_info'],
    348                 'L_CONF_SHOW_IPTC'=>$lang['conf_show_iptc'],
    349                 'L_CONF_SHOW_IPTC_INFO'=>$lang['conf_show_iptc_info'],
    350 
    351                 'USE_EXIF_YES'=>$exif_yes,
    352                 'USE_EXIF_NO'=>$exif_no,
    353                 'USE_IPTC_YES'=>$iptc_yes,
    354                 'USE_IPTC_NO'=>$iptc_no,
    355                 'SHOW_EXIF_YES'=>$show_exif_yes,
    356                 'SHOW_EXIF_NO'=>$show_exif_no,
    357                 'SHOW_IPTC_YES'=>$show_iptc_yes,
    358                 'SHOW_IPTC_NO'=>$show_iptc_no
    359           ));
    360           break;
    361         }
    362   }
     276        'CONF_LANG_SELECT'=>language_select($conf['default_language'], 'default_language'),
     277        'NB_IMAGE_LINE'=>$conf['nb_image_line'],
     278        'NB_ROW_PAGE'=>$conf['nb_line_page'],
     279        'CONF_STYLE_SELECT'=>style_select($conf['default_template'], 'default_template'),
     280        'CONF_RECENT'=>$conf['recent_period'],
     281        'NB_COMMENTS_PAGE'=>$conf['nb_comment_page'],
     282        'EXPAND_YES'=>$expand_yes,
     283        'EXPAND_NO'=>$expand_no,
     284        'SHOW_COMMENTS_YES'=>$show_yes,
     285        'SHOW_COMMENTS_NO'=>$show_no
     286        ));
     287    break;
     288  }
     289  case 'upload' :
     290  {
     291    $upload_yes = ($conf['upload_available']=='true')?'checked="checked"':'';
     292    $upload_no = ($conf['upload_available']=='false')?'checked="checked"':'';
     293     
     294    $template->assign_block_vars(
     295      'upload',
     296      array(
     297        'L_CONF_TITLE'=>$lang['conf_upload_title'],
     298        'L_CONF_UPLOAD'=>$lang['conf_authorize_upload'],
     299        'L_CONF_UPLOAD_INFO'=>$lang['conf_authorize_upload_info'],
     300        'L_CONF_MAXSIZE'=>$lang['conf_upload_maxfilesize'],
     301        'L_CONF_MAXSIZE_INFO'=>$lang['conf_upload_maxfilesize_info'],
     302        'L_CONF_MAXWIDTH'=>$lang['conf_upload_maxwidth'],
     303        'L_CONF_MAXWIDTH_INFO'=>$lang['conf_upload_maxwidth_info'],
     304        'L_CONF_MAXHEIGHT'=>$lang['conf_upload_maxheight'],
     305        'L_CONF_MAXHEIGHT_INFO'=>$lang['conf_upload_maxheight_info'],
     306        'L_CONF_TN_MAXWIDTH'=>$lang['conf_upload_tn_maxwidth'],
     307        'L_CONF_TN_MAXWIDTH_INFO'=>$lang['conf_upload_tn_maxwidth_info'],
     308        'L_CONF_TN_MAXHEIGHT'=>$lang['conf_upload_tn_maxheight'],
     309        'L_CONF_TN_MAXHEIGHT_INFO'=>$lang['conf_upload_tn_maxheight_info'],
     310         
     311        'UPLOAD_MAXSIZE'=>$conf['upload_maxfilesize'],
     312        'UPLOAD_MAXWIDTH'=>$conf['upload_maxwidth'],
     313        'UPLOAD_MAXHEIGHT'=>$conf['upload_maxheight'],
     314        'TN_UPLOAD_MAXWIDTH'=>$conf['upload_maxwidth_thumbnail'],
     315        'TN_UPLOAD_MAXHEIGHT'=>$conf['upload_maxheight_thumbnail'],
     316        'UPLOAD_YES'=>$upload_yes,
     317        'UPLOAD_NO'=>$upload_no
     318        ));
     319    break;
     320  }
     321  case 'session' :
     322  {
     323    $cookie_yes = ($conf['upload_available']=='true')?'checked="checked"':'';
     324    $cookie_no = ($conf['upload_available']=='false')?'checked="checked"':'';
     325     
     326    $template->assign_block_vars(
     327      'session',
     328      array(
     329        'L_CONF_TITLE'=>$lang['conf_session_title'],
     330        'L_CONF_COOKIE'=>$lang['conf_cookies'],
     331        'L_CONF_COOKIE_INFO'=>$lang['conf_cookies_info'],
     332        'L_SESSION_LENGTH'=>$lang['conf_session_time'],
     333        'L_SESSION_LENGTH_INFO'=>$lang['conf_session_time_info'],
     334        'L_SESSION_ID_SIZE'=>$lang['conf_session_size'],
     335        'L_SESSION_ID_SIZE_INFO'=>$lang['conf_session_size_info'],
     336         
     337        'SESSION_LENGTH'=>$conf['session_time'],
     338        'SESSION_ID_SIZE'=>$conf['session_id_size'],
     339        'COOKIE_YES'=>$cookie_yes,
     340        'COOKIE_NO'=>$cookie_no
     341        ));
     342    break;
     343  }
     344  case 'metadata' :
     345  {
     346    $exif_yes = ($conf['use_exif']=='true')?'checked="checked"':'';
     347    $exif_no = ($conf['use_exif']=='false')?'checked="checked"':'';
     348    $iptc_yes = ($conf['use_iptc']=='true')?'checked="checked"':'';
     349    $iptc_no = ($conf['use_iptc']=='false')?'checked="checked"':'';
     350    $show_exif_yes = ($conf['show_exif']=='true')?'checked="checked"':'';
     351    $show_exif_no = ($conf['show_exif']=='false')?'checked="checked"':'';
     352    $show_iptc_yes = ($conf['show_iptc']=='true')?'checked="checked"':'';
     353    $show_iptc_no = ($conf['show_iptc']=='false')?'checked="checked"':'';
     354     
     355    $template->assign_block_vars(
     356      'metadata',
     357      array(
     358        'L_CONF_TITLE'=>$lang['conf_metadata_title'],
     359        'L_CONF_EXIF'=>$lang['conf_use_exif'],
     360        'L_CONF_EXIF_INFO'=>$lang['conf_use_exif_info'],
     361        'L_CONF_IPTC'=>$lang['conf_use_iptc'],
     362        'L_CONF_IPTC_INFO'=>$lang['conf_use_iptc_info'],
     363        'L_CONF_SHOW_EXIF'=>$lang['conf_show_exif'],
     364        'L_CONF_SHOW_EXIF_INFO'=>$lang['conf_show_exif_info'],
     365        'L_CONF_SHOW_IPTC'=>$lang['conf_show_iptc'],
     366        'L_CONF_SHOW_IPTC_INFO'=>$lang['conf_show_iptc_info'],
     367         
     368        'USE_EXIF_YES'=>$exif_yes,
     369        'USE_EXIF_NO'=>$exif_no,
     370        'USE_IPTC_YES'=>$iptc_yes,
     371        'USE_IPTC_NO'=>$iptc_no,
     372        'SHOW_EXIF_YES'=>$show_exif_yes,
     373        'SHOW_EXIF_NO'=>$show_exif_no,
     374        'SHOW_IPTC_YES'=>$show_iptc_yes,
     375        'SHOW_IPTC_NO'=>$show_iptc_no
     376        ));
     377    break;
     378  }
     379}
    363380//-------------------------------------------------------------- errors display
    364381if ( sizeof( $errors ) != 0 )
  • trunk/include/functions.inc.php

    r519 r528  
    278278    {
    279279      list($language_name) = @file($path.'/iso.txt');
    280       $languages[$language_name] = $file;
     280      $languages[$file] = $language_name;
    281281    }
    282282  }
  • trunk/include/functions_html.inc.php

    r519 r528  
    117117
    118118  $lang_select = '<select name="' . $select_name . '" onchange="this.form.submit()">';
    119   foreach ($available_lang as $displayname => $code)
     119  foreach ($available_lang as $code => $displayname)
    120120  {
    121121    $selected = ( strtolower($default) == strtolower($code) ) ? ' selected="selected"' : '';
  • trunk/template/default/admin.tpl

    r527 r528  
    1717<ul class="menu">
    1818  <li><a class="adminMenu" href="{U_FAQ}">{L_FAQ}</a></li>
     19  <li><a class="adminMenu" href="{U_SITES}">{L_SITES}</a></li>
    1920  <li><a class="adminMenu" href="{U_PHPINFO}">{L_PHPINFO}</a></li>
    2021  <li><a class="adminMenu" href="{U_HISTORY}">{L_HISTORY}</a></li>
     
    3031  <li><a class="adminMenu" href="{U_CONFIG_SESSION}">{L_CONFIG_SESSION}</a></li>
    3132  <li><a class="adminMenu" href="{U_CONFIG_METADATA}">{L_CONFIG_METADATA}</a></li>
    32   <li><a class="adminMenu" href="{U_CONFIG_SITES}">{L_CONFIG_SITES}</a></li>
    33   </ul>
     33</ul>
    3434</div>
    3535<div class="titreMenu">{L_CATEGORIES}</div>
Note: See TracChangeset for help on using the changeset viewer.