Enano CMS (1.1.x): comparison includes/sessions.php

equal deleted inserted replaced

-:adb7f8de8ce1
+:7468a663315f
 function start()
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 global $lang;
+global $timezone;
 if($this->started) return;
 $this->started = true;
 $user = false;
 if(isset($_COOKIE['sid']))
 {
 if(!$this->compat && $userdata['account_active'] != 1 && $data[1] != 'Special' && $data[1] != 'Admin')
 {
 $language = intval(getConfig('default_language'));
 $lang = new Language($language);
+@setlocale(LC_ALL, $lang->lang_code);
 $this->logout();
 $a = getConfig('account_activation');
 switch($a)
 {
 $this->theme = $template->default_theme;
 $this->style = $template->default_style;
 }
 }
 $user = true;
+$GLOBALS['timezone'] = $userdata['user_timezone'];
 // Set language
 if ( !defined('ENANO_ALLOW_LOAD_NOLANG') )
 {
 $lang_id = intval($userdata['user_lang']);
 $lang = new Language($lang_id);
+@setlocale(LC_ALL, $lang->lang_code);
 }
 if(isset($_REQUEST['auth']) && !$this->sid_super)
 {
 // Now he thinks he's a moderator. Or maybe even an administrator. Let's find out if he's telling the truth.
 // This is a VERY special case we are allowing. It lets the installer create languages using the Enano API.
 if ( !defined('ENANO_ALLOW_LOAD_NOLANG') )
 {
 $language = ( isset($_GET['lang']) && preg_match('/^[a-z0-9_]+$/', @$_GET['lang']) ) ? $_GET['lang'] : intval(getConfig('default_language'));
 $lang = new Language($language);
+@setlocale(LC_ALL, $lang->lang_code);
 }
 }
 /**
 * Validates a session key, and returns the userdata associated with the key or false
 $keyhash = md5($key);
 $salt = $db->escape($keydata[3]);
 // using a normal call to $db->sql_query to avoid failing on errors here
 $query = $db->sql_query('SELECT u.user_id AS uid,u.username,u.password,u.email,u.real_name,u.user_level,u.theme,u.style,u.signature,' . "\n"
 . '    u.reg_time,u.account_active,u.activation_key,u.user_lang,k.source_ip,k.time,k.auth_level,COUNT(p.message_id) AS num_pms,' . "\n"
-. '    x.* FROM '.table_prefix.'session_keys AS k' . "\n"
+. '    u.user_timezone, x.* FROM '.table_prefix.'session_keys AS k' . "\n"
 . '  LEFT JOIN '.table_prefix.'users AS u' . "\n"
 . '    ON ( u.user_id=k.user_id )' . "\n"
 . '  LEFT JOIN '.table_prefix.'users_extra AS x' . "\n"
 . '    ON ( u.user_id=x.user_id OR x.user_id IS NULL )' . "\n"
 . '  LEFT JOIN '.table_prefix.'privmsgs AS p' . "\n"
 . '    AND k.salt=\''.$salt.'\'' . "\n"
 . '  GROUP BY u.user_id,u.username,u.password,u.email,u.real_name,u.user_level,u.theme,u.style,u.signature,u.reg_time,u.account_active,u.activation_key,u.user_lang,k.source_ip,k.time,k.auth_level,x.user_id, x.user_aim, x.user_yahoo, x.user_msn, x.user_xmpp, x.user_homepage, x.user_location, x.user_job, x.user_hobbies, x.email_public;');
 if ( !$query )
 {
-$query = $this->sql('SELECT u.user_id AS uid,u.username,u.password,u.email,u.real_name,u.user_level,u.theme,u.style,u.signature,u.reg_time,u.account_active,u.activation_key,k.source_ip,k.time,k.auth_level,COUNT(p.message_id) AS num_pms FROM '.table_prefix.'session_keys AS k
+$query = $this->sql('SELECT u.user_id AS uid,u.username,u.password,u.email,u.real_name,u.user_level,u.theme,u.style,u.signature,u.reg_time,u.account_active,u.activation_key,k.source_ip,k.time,k.auth_level,COUNT(p.message_id) AS num_pms, 1440 AS user_timezone FROM '.table_prefix.'session_keys AS k
 LEFT JOIN '.table_prefix.'users AS u
 ON ( u.user_id=k.user_id )
 LEFT JOIN '.table_prefix.'privmsgs AS p
 ON ( p.message_to=u.username AND p.message_read=0 )
 WHERE k.session_key=\''.$keyhash.'\'
 $this->user_extra = $user_extra;
 // Leave the rest to PHP's automatic garbage collector ;-)
 $row['password'] = md5($real_pass);
+$row['user_timezone'] = intval($row['user_timezone']) - 1440;
 profiler_log("SessionManager: finished session check");
 return $row;
 }
 function compat_validate_session($key)
 {
 global $db, $session, $paths, $template, $plugins; // Common objects
 $key = $db->escape($key);
-$query = $this->sql('SELECT u.user_id,u.username,u.password,u.email,u.real_name,u.user_level,k.source_ip,k.salt,k.time,k.auth_level FROM '.table_prefix.'session_keys AS k
+$query = $this->sql('SELECT u.user_id,u.username,u.password,u.email,u.real_name,u.user_level,k.source_ip,k.salt,k.time,k.auth_level,1440 AS user_timezone FROM '.table_prefix.'session_keys AS k
 LEFT JOIN '.table_prefix.'users AS u
 ON u.user_id=k.user_id
 WHERE k.session_key=\''.$key.'\';');
 if($db->numrows() < 1)
 {
 $this->sw_timed_out = true;
 // Session timed out
 // echo '(debug) $session->validate_session: super session timed out<br />';
 return false;
 }
+$row['user_timezone'] = intval($row['user_timezone']) - 1440;
 return $row;
 }
 /**

changeset 406	7468a663315f
parent 402	d907601ccad2
child 411	d1a95497b68f