diff --git a/upload/admin/admin_user_search.php b/upload/admin/admin_user_search.php index 7cb8d908c..b48d53c07 100644 --- a/upload/admin/admin_user_search.php +++ b/upload/admin/admin_user_search.php @@ -1335,7 +1335,7 @@ else 'U_VIEWPROFILE' => append_sid("../profile.php?mode=viewprofile&".POST_USERS_URL."=".$rowset[$i]['user_id']), 'U_VIEWPOSTS' => append_sid("../search.php?search_author=1&uid={$rowset[$i]['user_id']}"), - 'U_MANAGE' => append_sid("admin_users.php?mode=edit&".POST_USERS_URL."=".$rowset[$i]['user_id']), + 'U_MANAGE' => append_sid("profile.php?mode=editprofile&".POST_USERS_URL."=".$rowset[$i]['user_id']), 'U_PERMISSIONS' => append_sid("admin_ug_auth.php?mode=user&".POST_USERS_URL."=".$rowset[$i]['user_id']), )); } diff --git a/upload/admin/index.php b/upload/admin/index.php index b5b117171..93b13a94f 100644 --- a/upload/admin/index.php +++ b/upload/admin/index.php @@ -315,7 +315,7 @@ else if( isset($_GET['pane']) && $_GET['pane'] == 'right' ) "IP_ADDRESS" => $reg_ip, "U_WHOIS_IP" => "http://www.dnsstuff.com/tools/whois/?ip=$reg_ip", - "U_USER_PROFILE" => append_sid("admin_users.php?mode=edit&" . POST_USERS_URL . "=" . $onlinerow_reg[$i]['user_id']), + "U_USER_PROFILE" => append_sid("profile.php?mode=editprofile&" . POST_USERS_URL . "=" . $onlinerow_reg[$i]['user_id']), )); } } diff --git a/upload/common.php b/upload/common.php index 91891eed7..0bc2a1a69 100644 --- a/upload/common.php +++ b/upload/common.php @@ -1241,12 +1241,6 @@ else if (defined('IN_TRACKER')) header('Content-Type: text/plain'); header('Pragma: no-cache'); - if (STRIP_SLASHES) - { - array_deep($_GET, 'stripslashes'); - array_deep($_POST, 'stripslashes'); - } - if (!defined('IN_ADMIN')) { // Exit if tracker is disabled via ON/OFF trigger diff --git a/upload/config.php b/upload/config.php index 04ea49ca8..687bea00a 100644 --- a/upload/config.php +++ b/upload/config.php @@ -287,7 +287,6 @@ $bb_cfg['gzip_force'] = false; // always compress (don't che // Sessions $bb_cfg['session_update_intrv'] = 180; // sec - $bb_cfg['user_session_duration'] = 1800; // sec $bb_cfg['admin_session_duration'] = 6*3600; // sec $bb_cfg['user_session_gc_ttl'] = 1800; // number of seconds that a staled session entry may remain in sessions table @@ -302,7 +301,6 @@ $bb_cfg['unique_ip'] = false; // Deny registration of sever $bb_cfg['new_user_reg_restricted'] = false; $bb_cfg['reg_email_activation'] = false; - // Email $bb_cfg['emailer_disabled'] = false; @@ -313,7 +311,6 @@ $bb_cfg['email_change_disabled'] = false; // disable changing email by $bb_cfg['tech_admin_email'] = 'admin@' . $bb_cfg['server_name']; // email for sending error reports $bb_cfg['abuse_email'] = 'abuse@' . $bb_cfg['server_name']; -$bb_cfg['email_default_charset'] = 'UTF-8'; // AJAX define('AJAX_HTML_DIR', BB_ROOT .'ajax/html/'); @@ -351,11 +348,6 @@ $bb_cfg['super_admins'] = array( 2 => 'admin', ); -$bb_cfg['no_form_token_users'] = array( -# user_id => 'name', - 2 => 'admin', -); - // Log options define('LOG_EXT', 'log'); define('LOG_SEPR', ' | '); @@ -393,11 +385,8 @@ else } ini_set('error_log', LOG_DIR .'php_err.log'); -// Disable magic_quotes_runtime -@set_magic_quotes_runtime(0); -ini_set("magic_quotes_runtime", 0); -define('STRIP_SLASHES', get_magic_quotes_gpc()); -if (STRIP_SLASHES) die('set magic_quotes off'); +// magic quotes +if (get_magic_quotes_gpc()) die('set magic_quotes off'); // Triggers define('BB_ENABLED', TRIGGERS_DIR .'$on'); diff --git a/upload/includes/emailer.class.php b/upload/includes/emailer.class.php index bdbeab6e1..5625e9152 100644 --- a/upload/includes/emailer.class.php +++ b/upload/includes/emailer.class.php @@ -161,7 +161,7 @@ class emailer } else { - $this->encoding = !empty($lang['CONTENT_ENCODING']) ? trim($lang['CONTENT_ENCODING']) : $bb_cfg['email_default_charset']; + $this->encoding = trim($lang['CONTENT_ENCODING']); } $this->subject = $this->encode($this->subject); diff --git a/upload/includes/init_bb.php b/upload/includes/init_bb.php index 40754dfe1..088c76715 100644 --- a/upload/includes/init_bb.php +++ b/upload/includes/init_bb.php @@ -544,22 +544,6 @@ function make_url ($path) return FULL_URL . preg_replace('#^\/?(.*?)\/?$#', '\1', $path); } -if (STRIP_SLASHES) -{ - array_deep($_GET, 'stripslashes'); - array_deep($_POST, 'stripslashes'); - array_deep($_COOKIE, 'stripslashes'); - array_deep($_REQUEST, 'stripslashes'); - array_deep($_SERVER, 'stripslashes'); - array_deep($_ENV, 'stripslashes'); - array_deep($_FILES, 'stripslashes'); -} -elseif (!defined('IN_AJAX')) -{ - array_deep($_GET, 'addslashes'); - array_deep($_POST, 'addslashes'); -} - require(INC_DIR .'functions.php'); require(INC_DIR .'sessions.php'); require(INC_DIR .'template.php'); diff --git a/upload/includes/ucp/usercp_viewprofile.php b/upload/includes/ucp/usercp_viewprofile.php index e7ecfcd2d..1171e2541 100644 --- a/upload/includes/ucp/usercp_viewprofile.php +++ b/upload/includes/ucp/usercp_viewprofile.php @@ -234,7 +234,7 @@ if (IS_ADMIN) $template->assign_vars(array( 'EDITABLE_TPLS' => true, - 'U_MANAGE' => "admin/admin_users.php?mode=edit&u={$profiledata['user_id']}", + 'U_MANAGE' => "profile.php?mode=editprofile&u={$profiledata['user_id']}", 'U_PERMISSIONS' => "admin/admin_ug_auth.php?mode=user&u={$profiledata['user_id']}", )); diff --git a/upload/posting.php b/upload/posting.php index 049237ced..077968e43 100644 --- a/upload/posting.php +++ b/upload/posting.php @@ -299,7 +299,7 @@ if ($submit || $refresh) } else { - if (!IS_GUEST && $mode != 'newtopic' && bf($userdata['user_opt'], 'user_opt', 'user_notify')) + if (!IS_GUEST && $mode != 'newtopic' && bf($userdata['user_opt'], 'user_opt', 'notify')) { $notify_user = (int) DB()->fetch_row(" SELECT topic_id diff --git a/upload/templates/default/page_header.tpl b/upload/templates/default/page_header.tpl index 6818ec5d1..1b28fa170 100644 --- a/upload/templates/default/page_header.tpl +++ b/upload/templates/default/page_header.tpl @@ -186,20 +186,29 @@ $(document).ready(function(){ - + - - - + + + + + + @@ -217,7 +226,7 @@ function OpenInEditor ($file, $line)