diff options
| author | gweltas <gweltas@piwigo.org> | 2004-03-26 17:08:09 +0000 |
|---|---|---|
| committer | gweltas <gweltas@piwigo.org> | 2004-03-26 17:08:09 +0000 |
| commit | 9fd459d0510534ab6f92b7f4e9a3a4598ff3c1ab (patch) | |
| tree | 95e08d38d2604c350c1b200e0cb2c20cc53bbfc8 /include/common.inc.php | |
| parent | 4128835db8d7b8e619951d4c31e23bd934758f09 (diff) | |
- Template migration
- Admin Control Panel migration
- Category management
git-svn-id: http://piwigo.org/svn/trunk@394 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | include/common.inc.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/common.inc.php b/include/common.inc.php index 2478850a9..6a06706ce 100644 --- a/include/common.inc.php +++ b/include/common.inc.php @@ -120,7 +120,6 @@ if( !defined("PHPWG_INSTALLED") ) exit; } -define( 'PREFIX_INCLUDE', '' );// en attendant la migration complète include(PHPWG_ROOT_PATH . 'include/constants.php'); include(PHPWG_ROOT_PATH . 'include/config.inc.php'); include(PHPWG_ROOT_PATH . 'include/functions.inc.php'); @@ -140,7 +139,8 @@ or die ( "Could not connect to database" ); // if ( getenv( 'HTTP_X_FORWARDED_FOR' ) != '' ) { - $client_ip = ( !empty($_SERVER['REMOTE_ADDR']) ) ? $_SERVER['REMOTE_ADDR'] : ( ( !empty($_ENV['REMOTE_ADDR']) ) ? $_ENV['REMOTE_ADDR'] : $REMOTE_ADDR ); + $client_ip = ( !empty($_SERVER['REMOTE_ADDR']) ) ? + $_SERVER['REMOTE_ADDR'] : ( ( !empty($_ENV['REMOTE_ADDR']) ) ? $_ENV['REMOTE_ADDR'] : $REMOTE_ADDR ); if ( preg_match("/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/", getenv('HTTP_X_FORWARDED_FOR'), $ip_list) ) @@ -158,13 +158,14 @@ if ( getenv( 'HTTP_X_FORWARDED_FOR' ) != '' ) } else { - $client_ip = ( !empty($_SERVER['REMOTE_ADDR']) ) ? $_SERVER['REMOTE_ADDR'] : ( ( !empty($_ENV['REMOTE_ADDR']) ) ? $_ENV['REMOTE_ADDR'] : $REMOTE_ADDR ); + $client_ip = ( !empty($_SERVER['REMOTE_ADDR']) ) ? + $_SERVER['REMOTE_ADDR'] : ( ( !empty($_ENV['REMOTE_ADDR']) ) ? $_ENV['REMOTE_ADDR'] : $REMOTE_ADDR ); } $user_ip = encode_ip($client_ip); // -// Setup forum wide options, if this fails then we output a CRITICAL_ERROR -// since basic forum information is not available +// Setup gallery wide options, if this fails then we output a CRITICAL_ERROR +// since basic gallery information is not available // $query = 'SELECT param,value'; $query.= ' FROM '.CONFIG_TABLE; |