Changeset 1748


Ignore:
Timestamp:
Jan 23, 2007, 11:03:06 PM (17 years ago)
Author:
rub
Message:

Undo r1677 functions_html.inc.php, because links are wrong.
I wanted to add flat_cat on categories url, but I will keep same comportment of the calendar.

Some improvements when updating #_config table

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/admin/configuration.php

    r1744 r1748  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | branch        : BSF (Best So Far)
    … …  
    129129  {
    130130    //echo '<pre>'; print_r($_POST); echo '</pre>';
    131     $result = pwg_query('SELECT * FROM '.CONFIG_TABLE);
     131    $result = pwg_query('SELECT param FROM '.CONFIG_TABLE);
    132132    while ($row = mysql_fetch_array($result))
    133133    {
    … …  
    154154    array_push($page['infos'], $lang['conf_confirmation']);
    155155  }
    156 }
    157 
    158 //------------------------------------------------------ $conf reinitialization
    159 $result = pwg_query('SELECT param,value FROM '.CONFIG_TABLE);
    160 while ($row = mysql_fetch_array($result))
    161 {
    162   $conf[$row['param']] = $row['value'];
     156
     157  //------------------------------------------------------ $conf reinitialization
     158  load_conf_from_db();
    163159}
    164160
    … …  
    187183  case 'general' :
    188184  {
    189     $lock_yes = ($conf['gallery_locked']=='true')?'checked="checked"':'';
    190     $lock_no = ($conf['gallery_locked']=='false')?'checked="checked"':'';
     185    $lock_yes = ($conf['gallery_locked']==true)?'checked="checked"':'';
     186    $lock_no = ($conf['gallery_locked']==false)?'checked="checked"':'';
    191187
    192188    $template->assign_block_vars(
    … …  
    195191        'GALLERY_LOCKED_YES'=>$lock_yes,
    196192        'GALLERY_LOCKED_NO'=>$lock_no,
    197         ($conf['rate']=='true'?'RATE_YES':'RATE_NO')=>$html_check,
    198         ($conf['rate_anonymous']=='true'
     193        ($conf['rate']==true?'RATE_YES':'RATE_NO')=>$html_check,
     194        ($conf['rate_anonymous']==true
    199195             ? 'RATE_ANONYMOUS_YES' : 'RATE_ANONYMOUS_NO')=>$html_check,
    200196        'CONF_GALLERY_TITLE' => $conf['gallery_title'],
    … …  
    208204          'general',
    209205          array(
    210             strtoupper($checkbox) => ($conf[$checkbox]=='true')?$html_check:''
     206            strtoupper($checkbox) => ($conf[$checkbox]==true)?$html_check:''
    211207            )
    212208        );
    … …  
    227223          'comments',
    228224          array(
    229             strtoupper($checkbox) => ($conf[$checkbox]=='true')?$html_check:''
     225            strtoupper($checkbox) => ($conf[$checkbox]==true)?$html_check:''
    230226            )
    231227        );
    … …  
    235231  case 'default' :
    236232  {
    237     $show_yes = ($conf['show_nb_comments']=='true')?'checked="checked"':'';
    238     $show_no = ($conf['show_nb_comments']=='false')?'checked="checked"':'';
    239     $expand_yes = ($conf['auto_expand']=='true')?'checked="checked"':'';
    240     $expand_no  = ($conf['auto_expand']=='false')?'checked="checked"':'';
     233    $show_yes = ($conf['show_nb_comments']==true)?'checked="checked"':'';
     234    $show_no = ($conf['show_nb_comments']==false)?'checked="checked"':'';
     235    $expand_yes = ($conf['auto_expand']==true)?'checked="checked"':'';
     236    $expand_no  = ($conf['auto_expand']==false)?'checked="checked"':'';
    241237
    242238    $template->assign_block_vars(

  • trunk/admin/notification_by_mail.php

    r1571 r1748  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
    6 // | Copyright (C) 2006 Ruben ARNAUD - team@phpwebgallery.net              |
     5// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
     6// | Copyright (C) 2006-2007 Ruben ARNAUD - team@phpwebgallery.net         |
    77// +-----------------------------------------------------------------------+
    88// | branch        : BSF (Best So Far)
    … …  
    415415  case 'param' :
    416416  {
    417     $updated_param_count = 0;
    418     // Update param
    419     $result = pwg_query('select param, value from '.CONFIG_TABLE.' where param like \'nbm\\_%\'');
    420     while ($nbm_user = mysql_fetch_array($result))
    421     {
    422       if (isset($_POST['param_submit']) and !is_adviser())
     417    if (isset($_POST['param_submit']) and !is_adviser())
     418    {
     419      $updated_param_count = 0;
     420      // Update param
     421      $result = pwg_query('select param, value from '.CONFIG_TABLE.' where param like \'nbm\\_%\'');
     422      while ($nbm_user = mysql_fetch_array($result))
    423423      {
    424424        if (isset($_POST[$nbm_user['param']]))
    … …  
    428428          $query = '
    429429update
    430   '.CONFIG_TABLE.'
    431 set 
     430'.CONFIG_TABLE.'
     431set
    432432  value = \''. str_replace("\'", "''", $value).'\'
    433433where
    … …  
    437437        }
    438438      }
    439 
    440       $conf[$nbm_user['param']] = $nbm_user['value'];
    441 
    442       // if the parameter is present in $_POST array (if a form is submited), we
    443       // override it with the submited value
    444       if (isset($_POST[$nbm_user['param']]) and !is_adviser())
    445       {
    446         $conf[$nbm_user['param']] = stripslashes($_POST[$nbm_user['param']]);
    447       }
    448 
    449       // If the field is true or false, the variable is transformed into a
    450       // boolean value.
    451       if ($conf[$nbm_user['param']] == 'true' or $conf[$nbm_user['param']] == 'false')
    452       {
    453         $conf[$nbm_user['param']] = get_boolean($conf[$nbm_user['param']]);
    454       }
    455     }
    456439   
    457     if ($updated_param_count != 0)
    458     {
    459440      array_push($page['infos'], sprintf(l10n('nbm_updated_param_count'), $updated_param_count));
     441
     442      // Reload conf with new values
     443      load_conf_from_db('param like \'nbm\\_%\'');
    460444    }
    461445  }

  • trunk/include/functions.inc.php

    r1727 r1748  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | branch        : BSF (Best So Far)
    … …  
    10081008function l10n_dec($singular_fmt_key, $plural_fmt_key, $decimal)
    10091009{
    1010   return sprintf(l10n(($decimal > 1 ? $plural_fmt_key : 
     1010  return sprintf(l10n(($decimal > 1 ? $plural_fmt_key :
    10111011                                      $singular_fmt_key)), $decimal);
    10121012}
    … …  
    10951095 * @return void
    10961096 */
    1097 function load_conf_from_db()
     1097function load_conf_from_db($condition = '')
    10981098{
    10991099  global $conf;
    11001100
    11011101  $query = '
    1102 SELECT param,value
     1102SELECT param, value
    11031103 FROM '.CONFIG_TABLE.'
     1104 '.(!empty($condition) ? 'WHERE '.$condition : '').'
    11041105;';
    11051106  $result = pwg_query($query);
    11061107
    1107   if (mysql_num_rows($result) == 0)
     1108  if ((mysql_num_rows($result) == 0) and !empty($condition))
    11081109  {
    11091110    die('No configuration data');

  • trunk/include/functions_html.inc.php

    r1744 r1748  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | branch        : BSF (Best So Far)
    … …  
    289289      $output.= '<a class=""';
    290290      $output.= ' href="'
    291             .duplicate_index_url(
     291            .make_index_url(
    292292                array(
    293293                  'category'=>$id,
    294294                  'cat_name'=>$name
    295                   ),
    296                 array('start')
     295                  )
    297296              )
    298297            .'">';

  • trunk/language/en_UK.iso-8859-1

    • Property svn:ignore set to
      local.lang.php

  • trunk/language/fr_FR.iso-8859-1

    • Property svn:ignore set to
      local.lang.php
Note: See TracChangeset for help on using the changeset viewer.