From 7e92605b36a697ae46f2b73145d9eff2c5664a47 Mon Sep 17 00:00:00 2001 From: Luca Libralato Date: Sun, 16 Oct 2011 11:50:31 +0200 Subject: [PATCH] Preparing Icy Phoenix 2.0 Beta 2 --- adm/admin_topic_shadow.php | 4 +-- common.php | 2 +- features.php | 4 +-- forum.php | 10 +++--- includes/class_captcha.php | 6 ++-- includes/constants.php | 2 +- includes/functions.php | 4 +-- includes/functions_categories_hierarchy.php | 2 +- includes/functions_topics_list.php | 2 +- includes/sessions.php | 35 +++++++++++---------- includes/similar_topics.php | 10 +++--- install/schemas/db_update_054.sql | 8 ++++- install/schemas/mysql_basic.sql | 2 +- install/schemas/sql_update_ip.php | 6 +++- install/schemas/versions.php | 2 +- language/lang_english/lang_features.php | 4 +-- posting.php | 6 ++-- recent.php | 4 +-- remove_cookies.php | 11 ++++--- search.php | 4 +-- subsc_forums.php | 2 +- templates/common/acp/index_navigate.tpl | 22 ++++++------- templates/common/xs.cfg | 9 +++--- templates/default/captcha_include.tpl | 2 +- templates/default/default.cfg | 8 ++--- templates/default/xs.cfg | 11 ++++--- viewforum.php | 4 +-- viewtopic.php | 4 +-- watched_topics.php | 4 +-- 29 files changed, 104 insertions(+), 90 deletions(-) diff --git a/adm/admin_topic_shadow.php b/adm/admin_topic_shadow.php index ded96257..a8c849f3 100644 --- a/adm/admin_topic_shadow.php +++ b/adm/admin_topic_shadow.php @@ -49,7 +49,7 @@ /** Get parameters. 'var_name' => 'default_value' /** Also get any saved cookie preferences. /******************************************************************************************/ -$preference_cookie = (isset($_COOKIE[MOD_COOKIE_PREF_NAME])) ? unserialize(stripslashes($_COOKIE[MOD_COOKIE_PREF_NAME])) : array(); +$preference_cookie = (isset($_COOKIE[$config['cookie_name'] . '_' . MOD_COOKIE_PREF_NAME])) ? unserialize(stripslashes($_COOKIE[$config['cookie_name'] . '_' . MOD_COOKIE_PREF_NAME])) : array(); $preference_cookie['test'] = true; $params = array( 'start' => 0, @@ -78,7 +78,7 @@ setting. If this is disabled, settings will NEVER be saved */ if(!DISABLE_PREFERENCE_SAVING && !$config['gzip_compress']) ob_start(); -@setcookie(MOD_COOKIE_PREF_NAME, serialize($preference_cookie), time() + 31536000, $config['cookie_path'], $config['cookie_domain'], $config['cookie_secure']); +$user->set_cookie(MOD_COOKIE_PREF_NAME, serialize($preference_cookie), $user->cookie_expire); /* Flush the output buffer to display the page header, if the ob_start() is removed, this one must be removed as well or strange things will happen */ diff --git a/common.php b/common.php index 6a584505..d6f210e2 100644 --- a/common.php +++ b/common.php @@ -300,7 +300,7 @@ function deregister_globals() founder_protect($founder_id); } -if ((isset($_GET['lofi']) && (intval($_GET['lofi']) == 1)) || (isset($_COOKIE['lofi']) && (intval($_COOKIE['lofi']) == 1))) +if ((isset($_GET['lofi']) && (intval($_GET['lofi']) == 1)) || (isset($_COOKIE[$config['cookie_name'] . '_lofi']) && (intval($_COOKIE[$config['cookie_name'] . '_lofi']) == 1))) { $lofi = 1; } diff --git a/features.php b/features.php index 021adbad..549cf163 100644 --- a/features.php +++ b/features.php @@ -88,8 +88,8 @@ 'registration' => array( 'coppa' => array('bb2' => $img_true, 'ip' => $img_true, 'bb3' => $img_true), 'l_r_a' => array('bb2' => $img_true, 'ip' => $img_true, 'bb3' => $img_true), - 'username_lenght' => array('bb2' => $img_false, 'ip' => $img_false, 'bb3' => $img_true), - 'pass_lenght' => array('bb2' => $img_false, 'ip' => $img_true, 'bb3' => $img_true), + 'username_length' => array('bb2' => $img_false, 'ip' => $img_false, 'bb3' => $img_true), + 'pass_length' => array('bb2' => $img_false, 'ip' => $img_true, 'bb3' => $img_true), 'l_u_c' => array('bb2' => $img_false, 'ip' => $img_true, 'bb3' => $img_true), 's_p_c_r' => array('bb2' => $img_false, 'ip' => $img_true, 'bb3' => $img_true), 'f_p_c' => array('bb2' => $img_false, 'ip' => $img_true, 'bb3' => $img_true), diff --git a/forum.php b/forum.php index 2b748cfb..e7c157df 100644 --- a/forum.php +++ b/forum.php @@ -91,7 +91,7 @@ // if(!$user->data['upi2db_access']) { - setcookie($config['cookie_name'] . '_f_all', time(), 0, $config['cookie_path'], $config['cookie_domain'], $config['cookie_secure']); + $user->set_cookie('f_all', time(), $user->cookie_expire); } else { @@ -114,9 +114,9 @@ // mark each forums for ($i = 0; $i < sizeof($keys['id']); $i++) { - if ($tree['type'][ $keys['idx'][$i] ] == POST_FORUM_URL) + if ($tree['type'][$keys['idx'][$i]] == POST_FORUM_URL) { - $forum_id = $tree['id'][ $keys['idx'][$i] ]; + $forum_id = $tree['id'][$keys['idx'][$i]]; $sql = "SELECT MAX(post_time) AS last_post FROM " . POSTS_TABLE . " WHERE forum_id = '" . $forum_id . "'"; $result = $db->sql_query($sql); if ($row = $db->sql_fetchrow($result)) @@ -124,7 +124,7 @@ $tracking_forums = (isset($_COOKIE[$config['cookie_name'] . '_f'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_f']) : array(); $tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_t'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_t']) : array(); - if ((sizeof($tracking_forums) + sizeof($tracking_topics)) >= 150 && empty($tracking_forums[$forum_id])) + if (((sizeof($tracking_forums) + sizeof($tracking_topics)) >= 150) && empty($tracking_forums[$forum_id])) { asort($tracking_forums); unset($tracking_forums[key($tracking_forums)]); @@ -133,7 +133,7 @@ if ($row['last_post'] > $user->data['user_lastvisit']) { $tracking_forums[$forum_id] = time(); - setcookie($config['cookie_name'] . '_f', serialize($tracking_forums), 0, $config['cookie_path'], $config['cookie_domain'], $config['cookie_secure']); + $user->set_cookie('f', serialize($tracking_forums), $user->cookie_expire); } } } diff --git a/includes/class_captcha.php b/includes/class_captcha.php index 5fa6f327..a09c4fbd 100644 --- a/includes/class_captcha.php +++ b/includes/class_captcha.php @@ -20,7 +20,7 @@ class class_captcha { var $attempts_limit = 3; - var $code_lenght = 6; + var $code_length = 6; /* * Creates CAPTCHA image @@ -38,7 +38,7 @@ function build_captcha() // 0 (zero) could get confused with O (the letter) so we change it //$code = substr(str_replace(array('0'), array('Z'), strtoupper(base_convert($code, 16, 35))), 2, 6); // Easiest to read charset... some letters and numbers may be ambiguous - $code = substr(str_replace(array('0', '1', '2', '5', 'O', 'I', 'Z', 'S'), array('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H'), strtoupper(base_convert($code, 16, 35))), 2, $this->code_lenght); + $code = substr(str_replace(array('0', '1', '2', '5', 'O', 'I', 'Z', 'S'), array('A', 'B', 'C', 'D', 'E', 'F', 'G', 'H'), strtoupper(base_convert($code, 16, 35))), 2, $this->code_length); $confirm_id = md5(uniqid($user->ip)); $sql = "INSERT INTO " . CONFIRM_TABLE . " (confirm_id, session_id, code) VALUES ('" . $db->sql_escape($confirm_id) . "', '" . $db->sql_escape($user->data['session_id']) . "', '" . $db->sql_escape($code) . "')"; @@ -51,7 +51,7 @@ function build_captcha() 'S_CAPTCHA' => true, 'CONFIRM_IMG' => $confirm_image, 'CAPTCHA_HIDDEN' => '', - 'CAPTCHA_CODE_LENGHT' => $this->code_lenght, + 'CAPTCHA_CODE_LENGTH' => $this->code_length, 'L_CONFIRM_CODE_IMPAIRED' => sprintf($lang['CONFIRM_CODE_IMPAIRED'], '', ''), ) diff --git a/includes/constants.php b/includes/constants.php index a5b8304f..0f0e015d 100644 --- a/includes/constants.php +++ b/includes/constants.php @@ -20,7 +20,7 @@ die('Hacking attempt'); } -define('ICYPHOENIX_VERSION', '1.3.25.78'); +define('ICYPHOENIX_VERSION', '1.3.26.79'); // FOUNDER ID, this is the ID of the main admin of the site, only this user canc access special features of the site and this ID is also used to send Welcome and Birthday PM define('FOUNDER_ID', '2'); diff --git a/includes/functions.php b/includes/functions.php index 6eb2de27..d64ee4bd 100644 --- a/includes/functions.php +++ b/includes/functions.php @@ -5136,8 +5136,8 @@ function page_footer($exit = true, $template_to_parse = 'body', $parse_template //Begin Lo-Fi Mod $path_parts = pathinfo($_SERVER['SCRIPT_NAME']); - $lofi = '' . (empty($_COOKIE['lofi']) ? ($lang['Lofi']) : ($lang['Full_Version'])) . ''; - $mobile_style = '' . (!empty($_COOKIE['mob']) ? ($lang['MOBILE_STYLE_DISABLE']) : ($lang['MOBILE_STYLE_ENABLE'])) . ''; + $lofi = '' . (empty($_COOKIE[$config['cookie_name'] . '_lofi']) ? ($lang['Lofi']) : ($lang['Full_Version'])) . ''; + $mobile_style = '' . (!empty($_COOKIE[$config['cookie_name'] . '_mob']) ? ($lang['MOBILE_STYLE_DISABLE']) : ($lang['MOBILE_STYLE_ENABLE'])) . ''; $template->assign_vars(array( 'L_LOFI' => $lang['Lofi'], 'L_FULL_VERSION' => $lang['Full_Version'], diff --git a/includes/functions_categories_hierarchy.php b/includes/functions_categories_hierarchy.php index 491e6fee..113686b2 100644 --- a/includes/functions_categories_hierarchy.php +++ b/includes/functions_categories_hierarchy.php @@ -403,8 +403,8 @@ function read_tree($force = false) // // read the user cookie - $tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_t'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_t']) : array(); $tracking_forums = (isset($_COOKIE[$config['cookie_name'] . '_f'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_f']) : array(); + $tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_t'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_t']) : array(); $tracking_all = (isset($_COOKIE[$config['cookie_name'] . '_f_all'])) ? intval($_COOKIE[$config['cookie_name'] . '_f_all']) : -1; // try the cache diff --git a/includes/functions_topics_list.php b/includes/functions_topics_list.php index 23ba22f7..7b3c9f44 100644 --- a/includes/functions_topics_list.php +++ b/includes/functions_topics_list.php @@ -131,8 +131,8 @@ function topic_list($box, $tpl='', $topic_rowset, $list_title='', $split_type = } // read the user cookie - $tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_t'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_t']) : array(); $tracking_forums = (isset($_COOKIE[$config['cookie_name'] . '_f'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_f']) : array(); + $tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_t'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_t']) : array(); $tracking_all = (isset($_COOKIE[$config['cookie_name'] . '_f_all'])) ? intval($_COOKIE[$config['cookie_name'] . '_f_all']) : NULL; // categories hierarchy v 2 compliancy diff --git a/includes/sessions.php b/includes/sessions.php index ca2a5393..d343d0da 100644 --- a/includes/sessions.php +++ b/includes/sessions.php @@ -23,6 +23,7 @@ class session { var $cookie_data = array(); + var $cookie_expire = 0; var $page = array(); var $data = array(); var $browser = ''; @@ -57,6 +58,7 @@ function session_begin($update_session_page = true) // Give us some basic information $this->time_now = time(); $this->cookie_data = array('u' => 0, 'k' => ''); + $this->cookie_expire = $this->time_now + (($config['max_autologin_time']) ? 86400 * (int) $config['max_autologin_time'] : 31536000); $this->update_session_page = (empty($update_session_page) || defined('IMG_THUMB')) ? false : true; //$this->browser = (!empty($_SERVER['HTTP_USER_AGENT'])) ? htmlspecialchars((string) $_SERVER['HTTP_USER_AGENT']) : ''; $this->browser = (!empty($_SERVER['HTTP_USER_AGENT'])) ? (string) $_SERVER['HTTP_USER_AGENT'] : ''; @@ -589,13 +591,9 @@ function session_create($user_id = false, $set_admin = false, $persist_login = f if (empty($this->data['is_bot'])) { - $cookie_expire = $this->time_now + (($config['max_autologin_time']) ? 86400 * (int) $config['max_autologin_time'] : 31536000); - - $this->set_cookie('u', $this->cookie_data['u'], $cookie_expire); - $this->set_cookie('k', $this->cookie_data['k'], $cookie_expire); - $this->set_cookie('sid', $this->session_id, $cookie_expire); - - unset($cookie_expire); + $this->set_cookie('u', $this->cookie_data['u'], $this->cookie_expire); + $this->set_cookie('k', $this->cookie_data['k'], $this->cookie_expire); + $this->set_cookie('sid', $this->session_id, $this->cookie_expire); $sql = "SELECT COUNT(session_id) AS sessions FROM " . SESSIONS_TABLE . " @@ -932,14 +930,17 @@ function confirm_gc() * * Sets a cookie of the given name with the specified data for the given length of time. If no time is specified, a session cookie will be set. * - * @param string $name Name of the cookie, will be automatically prefixed with the phpBB cookie name. track becomes [cookie_name]_track then. - * @param string $cookiedata The data to hold within the cookie - * @param int $cookietime The expiration time as UNIX timestamp. If 0 is provided, a session cookie is set. + * @param string $name Name of the cookie, will be automatically prefixed with the phpBB cookie name. track becomes [cookie_name]_track then. + * @param string $cookiedata The data to hold within the cookie + * @param int $cookietime The expiration time as UNIX timestamp. If 0 is provided, a session cookie is set. */ function set_cookie($name, $cookiedata, $cookietime) { global $config; + // Old setcookie version... + //setcookie($config['cookie_name'] . '_' . $name, $cookiedata, $cookietime, $config['cookie_path'], $config['cookie_domain'], $config['cookie_secure']); + $name_data = rawurlencode($config['cookie_name'] . '_' . $name) . '=' . rawurlencode($cookiedata); $expire = gmdate('D, d-M-Y H:i:s \\G\\M\\T', $cookietime); $domain = (!$config['cookie_domain'] || ($config['cookie_domain'] == 'localhost') || ($config['cookie_domain'] == '127.0.0.1')) ? '' : '; domain=' . $config['cookie_domain']; @@ -955,7 +956,7 @@ function set_cookie($name, $cookiedata, $cookietime) * this routine does not return on finding a banned user, it outputs a relevant * message and stops execution. * - * @param string|array $user_ips Can contain a string with one IP or an array of multiple IPs + * @param string|array $user_ips Can contain a string with one IP or an array of multiple IPs */ function check_ban($user_id = false, $user_ips = false, $user_email = false, $return = false) { @@ -1458,7 +1459,7 @@ function setup($lang_set = false, $style = false) { $test_language = str_replace(array('.', '/'), '', urldecode($test_language)); $config['default_lang'] = file_exists(@phpbb_realpath($this->lang_path . 'lang_' . basename($test_language) . '/lang_main.' . PHP_EXT)) ? $test_language : $config['default_lang']; - setcookie($config['cookie_name'] . '_lang', $config['default_lang'], (time() + 86400), $config['cookie_path'], $config['cookie_domain'], $config['cookie_secure']); + $this->set_cookie('lang', $config['default_lang'], $user->cookie_expire); } else { @@ -1705,8 +1706,8 @@ function setup($lang_set = false, $style = false) { $mob_get = (isset($_GET['mob']) && (intval($_GET['mob']) == 0)) ? 0 : 1; $_GET['mob'] = $mob_get; - @setcookie('mob', $mob_get, time() + 31536000); - $_COOKIE['mob'] = $mob_get; + $this->set_cookie('mob', $mob_get, $user->cookie_expire); + $_COOKIE[$config['cookie_name'] . '_mob'] = $mob_get; if (empty($mob_get)) { @@ -1714,7 +1715,7 @@ function setup($lang_set = false, $style = false) } } - $mob_cok = (isset($_COOKIE['mob']) && (intval($_COOKIE['mob']) == 0)) ? false : true; + $mob_cok = (isset($_COOKIE[$config['cookie_name'] . '_mob']) && (intval($_COOKIE[$config['cookie_name'] . '_mob']) == 0)) ? false : true; if (empty($mob_cok)) { $disable_mobile_style = true; @@ -1724,7 +1725,7 @@ function setup($lang_set = false, $style = false) if (empty($disable_mobile_style) && !empty($this->data['is_mobile']) && !defined('IN_CMS') && !defined('IN_ADMIN')) { $this->data['mobile_style'] = true; - @setcookie('mob', 1, time() + 31536000); + $this->set_cookie('mob', 1, $user->cookie_expire); $theme = setup_mobile_style(); } else @@ -1738,7 +1739,7 @@ function setup($lang_set = false, $style = false) { $config['default_style'] = urldecode($test_style); $config['default_style'] = (check_style_exists($config['default_style']) == false) ? $current_default_style : $config['default_style']; - setcookie($config['cookie_name'] . '_style', $config['default_style'], (time() + 86400), $config['cookie_path'], $config['cookie_domain'], $config['cookie_secure']); + $this->set_cookie('style', $config['default_style'], $user->cookie_expire); $change_style = true; } else diff --git a/includes/similar_topics.php b/includes/similar_topics.php index 82e815d7..9707391f 100644 --- a/includes/similar_topics.php +++ b/includes/similar_topics.php @@ -28,8 +28,8 @@ for($i = 0; $i < $count_similar; $i++) { $similar = $similar_topics[$i]; - $tracking_topics = (isset($_COOKIE[$config['cookie_name'] .'_t'])) ? unserialize($_COOKIE[$config['cookie_name'] .'_t']) : array(); - $tracking_forums = (isset($_COOKIE[$config['cookie_name'] .'_f'])) ? unserialize($_COOKIE[$config['cookie_name'] .'_f']) : array(); + $tracking_forums = (isset($_COOKIE[$config['cookie_name'] . '_f'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_f']) : array(); + $tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_t'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_t']) : array(); $topic_type = ($similar['topic_type'] == POST_ANNOUNCE) ? $lang['Topic_Announcement'] .' ': ''; $topic_type .= ($similar['topic_type'] == POST_STICKY) ? $lang['Topic_Sticky'] .' ': ''; $topic_type .= (!empty($similar['poll_start'])) ? $lang['Topic_Poll'] .' ': ''; @@ -77,7 +77,7 @@ { if($similar['post_time'] > $user->data['user_lastvisit']) { - if(!empty($tracking_topics) || !empty($tracking_forums) || isset($_COOKIE[$config['cookie_name'] .'_f_all'])) + if(!empty($tracking_topics) || !empty($tracking_forums) || isset($_COOKIE[$config['cookie_name'] . '_f_all'])) { $unread_topics = true; if(!empty($tracking_topics[$topic_id])) @@ -94,9 +94,9 @@ $unread_topics = false; } } - if(isset($_COOKIE[$config['cookie_name'] .'_f_all'])) + if(isset($_COOKIE[$config['cookie_name'] . '_f_all'])) { - if(intval($_COOKIE[$config['cookie_name'] .'_f_all']) >= $similar['post_time']) + if(intval($_COOKIE[$config['cookie_name'] . '_f_all']) >= $similar['post_time']) { $unread_topics = false; } diff --git a/install/schemas/db_update_054.sql b/install/schemas/db_update_054.sql index 242b4b11..f0bff36c 100644 --- a/install/schemas/db_update_054.sql +++ b/install/schemas/db_update_054.sql @@ -1033,12 +1033,18 @@ INSERT INTO `phpbb_bots` (`bot_name`, `bot_color`, `bot_agent`, `bot_ip`) VALUES +######################################## +## BUILD 079 ## +######################################## + + + ##################### ##UPDATE phpbb_config SET config_value = '2' WHERE config_name = 'main_admin_id'; #-- DB CHANGES FOR VERSIONING -UPDATE phpbb_config SET config_value = '1.3.25.78' WHERE config_name = 'ip_version'; +UPDATE phpbb_config SET config_value = '1.3.26.79' WHERE config_name = 'ip_version'; UPDATE phpbb_config SET config_value = '.0.23' WHERE config_name = 'version'; UPDATE phpbb_config SET config_value = '2.0.0' WHERE config_name = 'cms_version'; UPDATE phpbb_album_config SET config_value = '1.5.0' WHERE config_name = 'fap_version'; diff --git a/install/schemas/mysql_basic.sql b/install/schemas/mysql_basic.sql index 1a288718..cf99c45d 100644 --- a/install/schemas/mysql_basic.sql +++ b/install/schemas/mysql_basic.sql @@ -1,7 +1,7 @@ ## Better leaving these input at the beginning... so they will be inserted as first values into tables ## Roll on version INSERT INTO `phpbb_config` (`config_name`, `config_value`) VALUES ('version', '.0.23'); -INSERT INTO `phpbb_config` (`config_name`, `config_value`) VALUES ('ip_version', '1.3.25.78'); +INSERT INTO `phpbb_config` (`config_name`, `config_value`) VALUES ('ip_version', '1.3.26.79'); INSERT INTO `phpbb_config` (`config_name`, `config_value`) VALUES ('cms_version', '2.0.0'); INSERT INTO `phpbb_album_config` (`config_name`, `config_value`) VALUES ('fap_version', '1.5.0'); ## INSERT INTO phpbb_link_config (config_name, config_value) VALUES ('site_logo', 'http://www.mightygorgon.com/images/banners/banner_mightygorgon.gif'); diff --git a/install/schemas/sql_update_ip.php b/install/schemas/sql_update_ip.php index 5ab9f791..2f5bd440 100644 --- a/install/schemas/sql_update_ip.php +++ b/install/schemas/sql_update_ip.php @@ -79,7 +79,8 @@ case '132275': $current_ip_version = '1.3.22.75'; break; case '132376': $current_ip_version = '1.3.23.76'; break; case '132477': $current_ip_version = '1.3.24.77'; break; - case '132578': $current_ip_version = '1.3.28.78'; break; + case '132578': $current_ip_version = '1.3.25.78'; break; + case '132679': $current_ip_version = '1.3.26.79'; break; } // We need to force this because in MySQL 5.5.5 the new default DB Engine is InnoDB, not MyISAM any more @@ -4434,6 +4435,9 @@ /* Updating from IP 1.3.25.78 */ case '1.3.25.78': + /* Updating from IP 1.3.26.79 */ + case '1.3.26.79': + } $sql[] = "INSERT INTO " . $table_prefix . "config VALUES ('ip_version', '" . $ip_version . "')"; diff --git a/install/schemas/versions.php b/install/schemas/versions.php index 3554232f..e51cf238 100644 --- a/install/schemas/versions.php +++ b/install/schemas/versions.php @@ -23,7 +23,7 @@ // Versioning $fap_version = '1.5.0'; $phpbb_version = '.0.23'; -$ip_version = '1.3.25.78'; +$ip_version = '1.3.26.79'; // CHMOD $chmod_777 = array(); diff --git a/language/lang_english/lang_features.php b/language/lang_english/lang_features.php index a273ee35..375ec2f6 100644 --- a/language/lang_english/lang_features.php +++ b/language/lang_english/lang_features.php @@ -121,8 +121,8 @@ 'item_coppa' => 'COPPA Registrations', 'item_l_r_a' => 'Limit Registration Attempts', - 'item_username_lenght' => 'Set min / max Username Length', - 'item_pass_lenght' => 'Set min / max Password Length', + 'item_username_length' => 'Set min / max Username Length', + 'item_pass_length' => 'Set min / max Password Length', 'item_l_u_c' => 'Limit Username Chars', 'item_s_p_c_r' => 'Set Password Complexity Requirements', 'item_f_p_c' => 'Force Password Change', diff --git a/posting.php b/posting.php index 932ab9d2..7eff6ae2 100644 --- a/posting.php +++ b/posting.php @@ -1376,10 +1376,10 @@ } if (($mode == 'newtopic') || ($mode == 'reply')) { - $tracking_topics = (!empty($_COOKIE[$config['cookie_name'] . '_t'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_t']) : array(); $tracking_forums = (!empty($_COOKIE[$config['cookie_name'] . '_f'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_f']) : array(); + $tracking_topics = (!empty($_COOKIE[$config['cookie_name'] . '_t'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_t']) : array(); - if (sizeof($tracking_topics) + sizeof($tracking_forums) == 100 && empty($tracking_topics[$topic_id])) + if (((sizeof($tracking_topics) + sizeof($tracking_forums)) >= 150) && empty($tracking_topics[$topic_id])) { asort($tracking_topics); unset($tracking_topics[key($tracking_topics)]); @@ -1387,7 +1387,7 @@ $tracking_topics[$topic_id] = time(); - setcookie($config['cookie_name'] . '_t', serialize($tracking_topics), 0, $config['cookie_path'], $config['cookie_domain'], $config['cookie_secure']); + $user->set_cookie('t', serialize($tracking_topics), $user->cookie_expire); } // MOD: Redirect to Post (normal post) - BEGIN diff --git a/recent.php b/recent.php index 3af32e0b..cffdfa2c 100644 --- a/recent.php +++ b/recent.php @@ -247,8 +247,8 @@ } $db->sql_freeresult($result); -$tracking_topics = (isset($_COOKIE[$config['cookie_name'] .'_t'])) ? unserialize($_COOKIE[$config['cookie_name'] .'_t']) : array(); -$tracking_forums = (isset($_COOKIE[$config['cookie_name'] .'_f'])) ? unserialize($_COOKIE[$config['cookie_name'] .'_f']) : array(); +$tracking_forums = (isset($_COOKIE[$config['cookie_name'] . '_f'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_f']) : array(); +$tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_t'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_t']) : array(); // MG User Replied - BEGIN // check if user replied to the topic diff --git a/remove_cookies.php b/remove_cookies.php index 7a0a1c19..7eac9114 100644 --- a/remove_cookies.php +++ b/remove_cookies.php @@ -35,11 +35,12 @@ if ($confirm) { - setcookie($config['cookie_name'] . '_sid', $session_id, - 3600, $config['cookie_path'], $config['cookie_domain'], $config['cookie_secure']); - setcookie($config['cookie_name'] . '_f_all', time(), - 3600, $config['cookie_path'], $config['cookie_domain'], $config['cookie_secure']); - setcookie($config['cookie_name'] . '_t', serialize($tracking_topics), - 3600, $config['cookie_path'], $config['cookie_domain'], $config['cookie_secure']); - setcookie($config['cookie_name'] . '_f', serialize($tracking_forums), - 3600, $config['cookie_path'], $config['cookie_domain'], $config['cookie_secure']); - setcookie($config['cookie_name'] . '_data', serialize($sessiondata), - 3600, $config['cookie_path'], $config['cookie_domain'], $config['cookie_secure']); + $cookies_array = array('u', 'k', 'sid', 'f_all', 'f', 't'); + foreach ($cookies_array as $cookie_name) + { + $user->set_cookie($cookie_name, '', time() - 3600); + } + message_die(GENERAL_MESSAGE, $lang['Cookies_deleted']); } else diff --git a/search.php b/search.php index acaa0793..6786373a 100644 --- a/search.php +++ b/search.php @@ -1326,8 +1326,8 @@ $highlight_active = urlencode(trim($highlight_active)); - $tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_t'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_t']) : array(); $tracking_forums = (isset($_COOKIE[$config['cookie_name'] . '_f'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_f']) : array(); + $tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_t'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_t']) : array(); if ($show_results == 'posts') { @@ -1432,7 +1432,7 @@ if(!$user->data['upi2db_access']) { // - if ($user->data['session_logged_in'] && $searchset[$i]['post_time'] > $user->data['user_lastvisit']) + if ($user->data['session_logged_in'] && ($searchset[$i]['post_time'] > $user->data['user_lastvisit'])) { if (!empty($tracking_topics[$topic_id]) && !empty($tracking_forums[$forum_id])) { diff --git a/subsc_forums.php b/subsc_forums.php index d7d02fb8..e197b9e5 100644 --- a/subsc_forums.php +++ b/subsc_forums.php @@ -23,8 +23,8 @@ $subs_forums_list_sql = 'SELECT forum_id FROM ' . FORUMS_WATCH_TABLE . ' WHERE user_id = ' . $user->data['user_id'] . ' AND notify_status = 0'; $subs_forums_list = $db->sql_query($subs_forums_list_sql); -$tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_t'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_t']) : array(); $tracking_forums = (isset($_COOKIE[$config['cookie_name'] . '_f'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_f']) : array(); +$tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_t'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_t']) : array(); $subscribed_forums_count = 0; while ($subs_forum_line = $db->sql_fetchrow($subs_forums_list)) diff --git a/templates/common/acp/index_navigate.tpl b/templates/common/acp/index_navigate.tpl index 81507552..e490a09f 100644 --- a/templates/common/acp/index_navigate.tpl +++ b/templates/common/acp/index_navigate.tpl @@ -107,25 +107,25 @@ function onMenuCatClick(cat_id) queuedSteps = new Array(); currentStep = 0; - for( var catName in menuCats ) + for(var catName in menuCats) { - if( menuCats[catName].status == 'none' ) continue; + if(menuCats[catName].status == 'none') continue; - for( var i=(menuCats[catName].cat_rows-1); i >= 0; i-- ) + for(var i = (menuCats[catName].cat_rows - 1); i >= 0; i--) { - queuedSteps[currentStep++] = new queueStep(catName+'_'+i, 'none'); + queuedSteps[currentStep++] = new queueStep(catName + '_' + i, 'none'); } queuedSteps[currentStep++] = new queueStep(catName, 'none'); } - if( currentStatus == 'none' ) + if(currentStatus == 'none') { queuedSteps[currentStep++] = new queueStep(currentCat, 'block'); - for( var i=0; i < menuCats[currentCat].cat_rows; i++ ) + for(var i = 0; i < menuCats[currentCat].cat_rows; i++) { - queuedSteps[currentStep++] = new queueStep(currentCat+'_'+i, 'block'); + queuedSteps[currentStep++] = new queueStep(currentCat+'_' + i, 'block'); } - var expdate = new Date(); // 72 Hours from now + var expdate = new Date(); // 72 Hours from now expdate.setTime(expdate.getTime() + (72 * 60 * 60 * 1000)); setCookie('{COOKIE_NAME}_menu_cat_id', cat_id, expdate, ('{COOKIE_PATH}' == '') ? null : '{COOKIE_PATH}', @@ -150,17 +150,17 @@ function doOnLoadMenuACP() if( getObj('menuCat_0') ) { cat_id = getCookie('{COOKIE_NAME}_menu_cat_id'); - if( !menuCats['menuCat_'+cat_id] ) + if(!menuCats['menuCat_' + cat_id]) { cat_id = 0; } else { - menuCats['menuCat_'+cat_id].status = 'none'; + menuCats['menuCat_' + cat_id].status = 'none'; } onMenuCatClick(cat_id); } - if( oldOnLoadMenuACP ) + if(oldOnLoadMenuACP) { oldOnLoadMenuACP(); } diff --git a/templates/common/xs.cfg b/templates/common/xs.cfg index 30a1374b..0315cda3 100644 --- a/templates/common/xs.cfg +++ b/templates/common/xs.cfg @@ -4,8 +4,9 @@ global $user, $config, $lofi_bots_parsing; // Lo-Fi And Bots - BEGIN if(isset($_GET['lofi'])) { - @setcookie('lofi', intval($_GET['lofi']), time() + 31536000); - $_COOKIE['lofi'] = intval($_GET['lofi']); + $lofi_value = !empty($_GET['lofi']) ? 1 : 0; + $user->set_cookie('lofi', $lofi_value, $user->cookie_expire); + $_COOKIE[$config['cookie_name'] . '_lofi'] = intval($_GET['lofi']); } $lofi_bots_parsing = false; @@ -13,13 +14,13 @@ $lofi_bots_path = ''; $lofi_bots_suffix = ''; if($user->data['is_bot'] && $config['lofi_bots']) { - @setcookie('lofi', 1, time() + 31536000); + $user->set_cookie('lofi', 1, $user->cookie_expire); $lofi_bots_parsing = true; $lofi_bots_path = 'bots/'; $lofi_bots_suffix = 'bots_'; } -if((!empty($_COOKIE['lofi'])) || $lofi_bots_parsing) +if((!empty($_COOKIE[$config['cookie_name'] . '_lofi'])) || $lofi_bots_parsing) { $replace['page_header.tpl'] = 'lofi/' . $lofi_bots_path . 'lofi_' . $lofi_bots_suffix . 'header.tpl'; $replace['page_footer.tpl'] = 'lofi/' . $lofi_bots_path . 'lofi_' . $lofi_bots_suffix . 'footer.tpl'; diff --git a/templates/default/captcha_include.tpl b/templates/default/captcha_include.tpl index 86c923a9..bbafd2e6 100644 --- a/templates/default/captcha_include.tpl +++ b/templates/default/captcha_include.tpl @@ -1,6 +1,6 @@
{L_CONFIRM_CODE_IMPAIRED}

{CONFIRM_IMG}

- +
{L_CONFIRM_CODE}: *
{L_CONFIRM_CODE_EXPLAIN}
{CAPTCHA_HIDDEN}
diff --git a/templates/default/default.cfg b/templates/default/default.cfg index d5cd0bef..d3fbdcc5 100644 --- a/templates/default/default.cfg +++ b/templates/default/default.cfg @@ -42,9 +42,9 @@ $buttons_lang_folder = $buttons_lang_root . $current_lang; // MG Smart Tables - BEGIN $light_template = false; -if ($lofi_bots_parsing || !empty($_COOKIE['lofi']) || !empty($_GET['lofi']) || !empty($_POST['lofi'])) +if ($lofi_bots_parsing || !empty($_COOKIE[$config['cookie_name'] . '_lofi']) || !empty($_GET['lofi']) || !empty($_POST['lofi'])) { - $light_template = ($lofi_bots_parsing == true) ? true : (!empty($_COOKIE['lofi']) ? true : (!empty($_GET['lofi']) ? true : (!empty($_POST['lofi']) ? true : false))); + $light_template = ($lofi_bots_parsing == true) ? true : (!empty($_COOKIE[$config['cookie_name'] . '_lofi']) ? true : (!empty($_GET['lofi']) ? true : (!empty($_POST['lofi']) ? true : false))); //$light_template = true; } @@ -91,7 +91,7 @@ if (defined('IN_ADMIN') || defined('IN_CMS')) // MG Smart Tables - BEGIN $light_template = false; - $_COOKIE['lofi'] = false; + $_COOKIE[$config['cookie_name'] . '_lofi'] = false; $_GET['lofi'] = false; $_POST['lofi'] = false; @@ -723,7 +723,7 @@ $template->assign_vars(array( 'S_ADMIN_MOD' => ((($user->data['user_level'] == ADMIN) || ($user->data['user_level'] == MOD)) ? 1 : 0), 'S_BOT' => ($user->data['is_bot'] ? 1 : 0), 'S_MOBILE' => ($user->data['is_mobile'] ? 1 : 0), - 'S_LOFI' => ((!empty($_COOKIE['lofi'])) || $lofi_bots_parsing) ? true : false, + 'S_LOFI' => ((!empty($_COOKIE[$config['cookie_name'] . '_lofi'])) || $lofi_bots_parsing) ? true : false, 'S_LOFI_BOTS' => ($user->data['is_bot'] && $config['lofi_bots']) ? true : false, 'S_NIFTY' => (isset($nifty_corners) ? $nifty_corners : true), 'IS_XMAS' => $is_xmas, diff --git a/templates/default/xs.cfg b/templates/default/xs.cfg index cb31c239..f91c2a4c 100644 --- a/templates/default/xs.cfg +++ b/templates/default/xs.cfg @@ -13,13 +13,14 @@ global $user, $config, $lofi_bots_parsing; // Lo-Fi And Bots - BEGIN /* $config['lofi_bots'] = true; -$_COOKIE['lofi'] = 1; +$_COOKIE[$config['cookie_name'] . '_lofi'] = 1; */ if(isset($_GET['lofi'])) { - @setcookie('lofi', intval($_GET['lofi']), time() + 31536000); - $_COOKIE['lofi'] = intval($_GET['lofi']); + $lofi_value = !empty($_GET['lofi']) ? 1 : 0; + $user->set_cookie('lofi', $lofi_value, $user->cookie_expire); + $_COOKIE[$config['cookie_name'] . '_lofi'] = intval($_GET['lofi']); } $replace['index_body.tpl'] = 'xs_index.tpl'; @@ -32,13 +33,13 @@ $lofi_bots_path = ''; $lofi_bots_suffix = ''; if($user->data['is_bot'] && $config['lofi_bots']) { - @setcookie('lofi', 1, time() + 31536000); + $user->set_cookie('lofi', 1, $user->cookie_expire); $lofi_bots_parsing = true; $lofi_bots_path = 'bots/'; $lofi_bots_suffix = 'bots_'; } -if((!empty($_COOKIE['lofi'])) || $lofi_bots_parsing) +if((!empty($_COOKIE[$config['cookie_name'] . '_lofi'])) || $lofi_bots_parsing) { $replace['overall_header.tpl'] = '../common/lofi/' . $lofi_bots_path . 'lofi_' . $lofi_bots_suffix . 'header.tpl'; $replace['overall_footer.tpl'] = '../common/lofi/' . $lofi_bots_path . 'lofi_' . $lofi_bots_suffix . 'footer.tpl'; diff --git a/viewforum.php b/viewforum.php index ecb7bb97..c703455f 100644 --- a/viewforum.php +++ b/viewforum.php @@ -328,7 +328,7 @@ if ($row['last_post'] > $user->data['user_lastvisit']) { $tracking_forums[$forum_id] = time(); - setcookie($config['cookie_name'] . '_f', serialize($tracking_forums), 0, $config['cookie_path'], $config['cookie_domain'], $config['cookie_secure']); + $user->set_cookie('f', serialize($tracking_forums), $user->cookie_expire); } } // @@ -348,8 +348,8 @@ } // End handle marking posts -$tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_t'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_t']) : ''; $tracking_forums = (isset($_COOKIE[$config['cookie_name'] . '_f'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_f']) : ''; +$tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_t'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_t']) : ''; // Do the forum Prune if ($is_auth['auth_mod'] && $config['prune_enable']) diff --git a/viewtopic.php b/viewtopic.php index 837e6dd1..d00f6c5e 100644 --- a/viewtopic.php +++ b/viewtopic.php @@ -797,8 +797,8 @@ // Set a cookie for this topic if ($user->data['session_logged_in'] && !$user->data['is_bot']) { - $tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_t'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_t']) : array(); $tracking_forums = (isset($_COOKIE[$config['cookie_name'] . '_f'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_f']) : array(); + $tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_t'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_t']) : array(); if (!empty($tracking_topics[$topic_id]) && !empty($tracking_forums[$forum_id])) { @@ -821,7 +821,7 @@ $tracking_topics[$topic_id] = time(); - setcookie($config['cookie_name'] . '_t', serialize($tracking_topics), 0, $config['cookie_path'], $config['cookie_domain'], $config['cookie_secure']); + $user->set_cookie('t', serialize($tracking_topics), $user->cookie_expire); } // diff --git a/watched_topics.php b/watched_topics.php index 54369a8a..c136da02 100644 --- a/watched_topics.php +++ b/watched_topics.php @@ -97,8 +97,8 @@ // are we currently watching any topics? if ($watch_rows) { - $tracking_topics = (isset($_COOKIE[$config['cookie_name'] .'_t'])) ? unserialize($_COOKIE[$config['cookie_name'] .'_t']) : array(); - $tracking_forums = (isset($_COOKIE[$config['cookie_name'] .'_f'])) ? unserialize($_COOKIE[$config['cookie_name'] .'_f']) : array(); + $tracking_forums = (isset($_COOKIE[$config['cookie_name'] . '_f'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_f']) : array(); + $tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_t'])) ? unserialize($_COOKIE[$config['cookie_name'] . '_t']) : array(); // MG User Replied - BEGIN // check if user replied to the topic