Changeset 1075


Ignore:
Timestamp:
Mar 10, 2006, 9:17:18 PM (18 years ago)
Author:
rub
Message:

Step 4 improvement issue 0000301:

o Correction lock categories and is_admin (functions with parameters now)
o Cannot use check_status with upgrade.php and upgrade_feed.php => New function check_upgrade use in upgrade*.php (new functionality for upgrade_feed.php)
o upgrade_feed.php is showed only for administrator user

Location:
trunk
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/common.inc.php

    r1070 r1075  
    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-2006 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | branch        : BSF (Best So Far)
    … …  
    133133or die ( "Could not connect to database" );
    134134
    135 if ($conf['check_upgrade_feed'])
     135//
     136// Setup gallery wide options, if this fails then we output a CRITICAL_ERROR
     137// since basic gallery information is not available
     138//
     139$query = '
     140SELECT param,value
     141 FROM '.CONFIG_TABLE.'
     142;';
     143if (!($result = pwg_query($query)))
     144{
     145  die("Could not query config information");
     146}
     147
     148while ( $row =mysql_fetch_array( $result ) )
     149{
     150  if ( isset( $row['value'] ) )
     151  {
     152    $conf[$row['param']] = $row['value'];
     153  }
     154  else
     155  {
     156    $conf[$row['param']] = '';
     157  }
     158  // If the field is true or false, the variable is transformed into a
     159  // boolean value.
     160  if ( $conf[$row['param']] == 'true' or $conf[$row['param']] == 'false' )
     161  {
     162    $conf[$row['param']] = get_boolean( $conf[$row['param']] );
     163  }
     164}
     165
     166include(PHPWG_ROOT_PATH.'include/user.inc.php');
     167
     168if (is_admin() and $conf['check_upgrade_feed'])
    136169{
    137170  // retrieve already applied upgrades
    … …  
    158191}
    159192
    160 //
    161 // Setup gallery wide options, if this fails then we output a CRITICAL_ERROR
    162 // since basic gallery information is not available
    163 //
    164 $query = '
    165 SELECT param,value
    166  FROM '.CONFIG_TABLE.'
    167 ;';
    168 if (!($result = pwg_query($query)))
    169 {
    170   die("Could not query config information");
    171 }
    172 
    173 while ( $row =mysql_fetch_array( $result ) )
    174 {
    175   if ( isset( $row['value'] ) )
    176   {
    177     $conf[$row['param']] = $row['value'];
    178   }
    179   else
    180   {
    181     $conf[$row['param']] = '';
    182   }
    183   // If the field is true or false, the variable is transformed into a
    184   // boolean value.
    185   if ( $conf[$row['param']] == 'true' or $conf[$row['param']] == 'false' )
    186   {
    187     $conf[$row['param']] = get_boolean( $conf[$row['param']] );
    188   }
    189 }
    190 
    191 include(PHPWG_ROOT_PATH.'include/user.inc.php');
    192 
    193193// language files
    194194include_once(get_language_filepath('common.lang.php'));

  • trunk/include/functions_user.inc.php

    r1072 r1075  
    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-2006 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | branch        : BSF (Best So Far)
    … …  
    278278function calculate_permissions($user_id, $user_status)
    279279{
     280  global $user;
     281
    280282  $private_array = array();
    281283  $authorized_array = array();
    … …  
    293295
    294296  // if user is not an admin, locked categories can be considered as private$
    295   if (!is_admin())
     297  if (!is_admin($user_status))
    296298  {
    297299    $query = '
    … …  
    542544 * @return bool
    543545*/
    544 function is_autorize_status($access_type)
     546function is_autorize_status($access_type, $user_status = '')
    545547{
    546548  global $user;
    547549
     550  if (($user_status == '') and isset($user['status']))
     551  {
     552    $user_status = $user['status'];
     553  }
     554
    548555  $access_type_status = ACCESS_NONE;
    549   if (isset($user['status']))
    550   {
    551     switch ($user['status'])
    552     {
    553       case 'guest':
    554       case 'generic':
    555       {
    556         $access_type_status = ACCESS_GUEST;
    557         break;
    558       }
    559       case 'normal':
    560       {
    561         $access_type_status = ACCESS_CLASSIC;
    562         break;
    563       }
    564       case 'admin':
    565       {
    566         $access_type_status = ACCESS_ADMINISTRATOR;
    567         break;
    568       }
    569       case 'webmaster':
    570       {
    571         $access_type_status = ACCESS_WEBMASTER;
    572         break;
    573       }
     556  switch ($user_status)
     557  {
     558    case 'guest':
     559    case 'generic':
     560    {
     561      $access_type_status = ACCESS_GUEST;
     562      break;
     563    }
     564    case 'normal':
     565    {
     566      $access_type_status = ACCESS_CLASSIC;
     567      break;
     568    }
     569    case 'admin':
     570    {
     571      $access_type_status = ACCESS_ADMINISTRATOR;
     572      break;
     573    }
     574    case 'webmaster':
     575    {
     576      $access_type_status = ACCESS_WEBMASTER;
     577      break;
    574578    }
    575579  }
    … …  
    584588 * @return none
    585589*/
    586 function check_status($access_type)
     590function check_status($access_type, $user_status = '')
    587591{
    588592  global $lang;
    589593
    590   if (!is_autorize_status($access_type))
     594  if (!is_autorize_status($access_type, $user_status))
    591595  {
    592596    echo '<div style="text-align:center;">'.$lang['access_forbiden'].'<br />';
    … …  
    600604 * @return bool
    601605*/
    602 function is_admin()
    603 {
    604   return is_autorize_status(ACCESS_ADMINISTRATOR);
     606function is_admin($user_status = '')
     607{
     608  return is_autorize_status(ACCESS_ADMINISTRATOR, $user_status);
    605609}
    606610

  • trunk/upgrade.php

    r971 r1075  
    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-2006 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | branch        : BSF (Best So Far)
    … …  
    3333
    3434include(PHPWG_ROOT_PATH.'include/mysql.inc.php');
    35 // Is PhpWebGallery already installed ?
    36 if (!defined('PHPWG_IN_UPGRADE') or !PHPWG_IN_UPGRADE)
    37 {
    38   $message = 'PhpWebGallery is not in upgrade mode. In include/mysql.inc.php,
    39 insert line
    40 <pre style="background-color:lightgray">
    41 define(\'PHPWG_IN_UPGRADE\', true);
    42 </pre>
    43 if you want to upgrade';
    44   die($message);
    45 }
     35
     36// +-----------------------------------------------------------------------+
     37// | Check Access and exit when it is not ok                               |
     38// +-----------------------------------------------------------------------+
     39check_upgrade();
    4640
    4741// concerning upgrade, we use the default users table

  • trunk/upgrade_feed.php

    r1027 r1075  
    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-2006 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | branch        : BSF (Best So Far)
    … …  
    3030include_once(PHPWG_ROOT_PATH.'include/functions.inc.php');
    3131include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
     32include_once(PHPWG_ROOT_PATH.'admin/include/functions_upgrade.php');
    3233include(PHPWG_ROOT_PATH.'include/template.php');
    3334include(PHPWG_ROOT_PATH.'include/mysql.inc.php');
     35
     36// +-----------------------------------------------------------------------+
     37// | Check Access and exit when it is not ok                               |
     38// +-----------------------------------------------------------------------+
     39check_upgrade();
    3440
    3541define('PREFIX_TABLE', $prefixeTable);
Note: See TracChangeset for help on using the changeset viewer.