aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/common.inc.php54
-rw-r--r--include/config.inc.php4
-rw-r--r--include/functions_user.inc.php50
-rw-r--r--include/user.inc.php31
4 files changed, 35 insertions, 104 deletions
diff --git a/include/common.inc.php b/include/common.inc.php
index af92935c3..7e843488b 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -25,9 +25,9 @@
// | USA. |
// +-----------------------------------------------------------------------+
-if( !defined("PHPWG_ROOT_PATH") )
+if (!defined('PHPWG_ROOT_PATH'))
{
- die ("Hacking attempt!");
+ die('Hacking attempt!');
}
// determine the initial instant to indicate the generation time of this page
$t1 = explode( ' ', microtime() );
@@ -114,9 +114,9 @@ $lang = array();
include(PHPWG_ROOT_PATH .'include/mysql.inc.php');
-if( !defined("PHPWG_INSTALLED") )
+if (!defined('PHPWG_INSTALLED'))
{
- header( 'Location: install.php' );
+ header('Location: install.php');
exit;
}
@@ -125,45 +125,13 @@ include(PHPWG_ROOT_PATH . 'include/config.inc.php');
include(PHPWG_ROOT_PATH . 'include/functions.inc.php');
include(PHPWG_ROOT_PATH . 'include/template.php');
-//
// Database connection
-//
-
mysql_connect( $dbhost, $dbuser, $dbpasswd )
or die ( "Could not connect to database server" );
mysql_select_db( $dbname )
or die ( "Could not connect to database" );
//
-// Obtain and encode users IP
-//
-if ( getenv( 'HTTP_X_FORWARDED_FOR' ) != '' )
-{
- $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) )
- {
- $private_ip = array( '/^0\./'
- ,'/^127\.0\.0\.1/'
- ,'/^192\.168\..*/'
- ,'/^172\.16\..*/'
- ,'/^10.\.*/'
- ,'/^224.\.*/'
- ,'/^240.\.*/'
- );
- $client_ip = preg_replace($private_ip, $client_ip, $ip_list[1]);
- }
-}
-else
-{
- $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 gallery wide options, if this fails then we output a CRITICAL_ERROR
// since basic gallery information is not available
//
@@ -171,7 +139,7 @@ $query = '
SELECT param,value
FROM '.CONFIG_TABLE.'
;';
-if( !( $result = pwg_query( $query ) ) )
+if (!($result = pwg_query($query)))
{
die("Could not query config information");
}
@@ -194,14 +162,12 @@ while ( $row =mysql_fetch_array( $result ) )
}
}
-//---------------
-// A partir d'ici il faudra dispatcher le code dans d'autres fichiers
-//---------------
-
-include(PHPWG_ROOT_PATH . 'include/user.inc.php');
+include(PHPWG_ROOT_PATH.'include/user.inc.php');
// displaying the username in the language of the connected user, instead of
// "guest" as you can find in the database
-if ( $user['is_the_guest'] ) $user['username'] = $lang['guest'];
-define('PREFIX_TABLE', $table_prefix);
+if ($user['is_the_guest'])
+{
+ $user['username'] = $lang['guest'];
+}
?>
diff --git a/include/config.inc.php b/include/config.inc.php
index 22d205fad..08312eccc 100644
--- a/include/config.inc.php
+++ b/include/config.inc.php
@@ -158,10 +158,6 @@ $conf['session_id_size'] = 10;
// admin/infos_images
$conf['info_nb_elements_page'] = 5;
-// default_language : language used if language set in user database is not
-// available
-$conf['default_language'] = 'en_UK.iso-8859-1';
-
// show_queries : for debug purpose, show queries and execution times
$conf['show_queries'] = false;
diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php
index 474fa8154..8b71cf660 100644
--- a/include/functions_user.inc.php
+++ b/include/functions_user.inc.php
@@ -171,44 +171,6 @@ function check_login_authorization($guest_allowed = true)
}
}
-//
-// Initialise user settings on page load
-function init_userprefs($userdata)
-{
- global $conf, $template, $lang, $lang_info;
-
- $language = (!empty($userdata['language']) && !$userdata['is_the_guest'] )?$userdata['language']:$conf['default_language'];
-
- if (!empty($userdata['template']) and !$userdata['is_the_guest'])
- {
- $template = $userdata['template'];
- }
- else
- {
- $template = $conf['default_template'];
- }
-
- if ( !file_exists(@realpath(PHPWG_ROOT_PATH . 'language/' . $language . '/common.lang.php')) )
- {
- $language = $conf['default_language'];
- }
- include_once(PHPWG_ROOT_PATH . 'language/' . $language . '/common.lang.php');
-
-
- if ($userdata['status'] == 'admin')
- {
- if ( !file_exists(@realpath(PHPWG_ROOT_PATH . 'language/' . $language. '/admin.lang.php')) )
- {
- $language = $conf['default_language'];
- }
- include_once(PHPWG_ROOT_PATH . 'language/' . $language . '/admin.lang.php');
- include_once(PHPWG_ROOT_PATH . 'language/' . $language . '/faq.lang.php');
- }
-
- $template = setup_style($template);
- return;
-}
-
function setup_style($style)
{
$template_path = 'template/' ;
@@ -217,18 +179,6 @@ function setup_style($style)
return $template;
}
-function encode_ip($dotquad_ip)
-{
- $ip_sep = explode('.', $dotquad_ip);
- return sprintf('%02x%02x%02x%02x', $ip_sep[0], $ip_sep[1], $ip_sep[2], $ip_sep[3]);
-}
-
-function decode_ip($int_ip)
-{
- $hexipbang = explode('.', chunk_split($int_ip, 2, '.'));
- return hexdec($hexipbang[0]). '.' . hexdec($hexipbang[1]) . '.' . hexdec($hexipbang[2]) . '.' . hexdec($hexipbang[3]);
-}
-
function getuserdata($user)
{
$sql = "SELECT * FROM " . USERS_TABLE;
diff --git a/include/user.inc.php b/include/user.inc.php
index 4c1561071..c4dc68987 100644
--- a/include/user.inc.php
+++ b/include/user.inc.php
@@ -127,13 +127,32 @@ if ($user['restrictions'][0] == '')
$user['restrictions'] = array();
}
-$isadmin = false;
-if ($user['status'] == 'admin')
-{
- $isadmin = true;
-}
// calculation of the number of picture to display per page
$user['nb_image_page'] = $user['nb_image_line'] * $user['nb_line_page'];
-init_userprefs($user);
+if (empty($user['language'])
+ or !file_exists(PHPWG_ROOT_PATH.'language/'.
+ $user['language'].'/common.lang.php'))
+{
+ $user['language'] = $conf['default_language'];
+}
+include_once(PHPWG_ROOT_PATH.'language/'.$user['language'].'/common.lang.php');
+
+// only if we are in the administration section
+if (defined('IN_ADMIN') and IN_ADMIN)
+{
+ $langdir = PHPWG_ROOT_PATH.'language/'.$user['language'];
+ if (!file_exists($langdir.'/admin.lang.php'))
+ {
+ $langdir = PHPWG_ROOT_PATH.'language/'.$conf['default_language'];
+ }
+ include_once($langdir.'/admin.lang.php');
+ include_once($langdir.'/faq.lang.php');
+}
+
+if (empty($user['template']))
+{
+ $user['template'] = $conf['default_template'];
+}
+$template = setup_style($user['template']);
?>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 23:09:44 +0000