From 12a52aa8ac783a0f9864e243c703e9108ccd0939 Mon Sep 17 00:00:00 2001 From: nanosimbiot Date: Sun, 11 Mar 2012 13:19:23 +0000 Subject: [PATCH] r384 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit чистка git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@384 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- upload/admin/admin_attach_cp.php | 6 +-- upload/admin/admin_attachments.php | 18 +++---- upload/admin/admin_board.php | 10 ++-- upload/admin/admin_bt_forum_cfg.php | 4 +- upload/admin/admin_bt_tracker_cfg.php | 2 +- upload/admin/admin_cron.php | 52 +++++++++---------- upload/admin/admin_disallow.php | 6 +-- upload/admin/admin_extensions.php | 18 +++---- upload/admin/admin_forumauth_list.php | 12 ++--- upload/admin/admin_forums.php | 16 +++--- upload/admin/admin_groups.php | 18 +++---- upload/admin/admin_log.php | 4 +- upload/admin/admin_mass_email.php | 6 +-- upload/admin/admin_ranks.php | 12 ++--- upload/admin/admin_rebuild_search.php | 13 ++--- upload/admin/admin_reports.php | 40 +++++++------- upload/admin/admin_smilies.php | 22 ++++---- upload/admin/admin_topic_templates.php | 12 ++--- upload/admin/admin_ug_auth.php | 18 +++---- upload/admin/admin_user_ban.php | 8 +-- upload/admin/admin_user_search.php | 26 +++++----- upload/admin/admin_words.php | 12 ++--- upload/admin/index.php | 6 +-- upload/admin/xs_cache.php | 2 +- upload/admin/xs_config.php | 12 ++--- upload/admin/xs_frameset.php | 34 ++++++------ upload/admin/xs_include.php | 2 +- upload/admin/xs_index.php | 28 +++++----- upload/attach_mod/displaying.php | 16 +++--- upload/attach_mod/displaying_torrent.php | 10 ++-- upload/attach_mod/posting_attachments.php | 2 +- upload/config.php | 4 +- upload/groupcp.php | 4 +- upload/includes/bbcode.php | 2 +- upload/includes/functions.php | 14 ++--- upload/includes/functions_admin_cron.php | 16 +++--- upload/includes/functions_post.php | 8 +-- upload/includes/functions_torrent.php | 10 ++-- upload/includes/page_header.php | 6 +-- upload/includes/report_hack/report_post.php | 2 +- .../includes/report_hack/report_privmsg.php | 6 +-- upload/includes/report_hack/report_topic.php | 2 +- upload/includes/report_hack/report_user.php | 2 +- upload/includes/sessions.php | 9 ---- upload/includes/template.php | 2 +- upload/includes/topic_templates.php | 10 ++-- upload/includes/torrent_show_dl_list.php | 4 +- upload/includes/ucp/torrent_userprofile.php | 6 +-- upload/includes/ucp/usercp_activate.php | 2 +- upload/includes/ucp/usercp_attachcp.php | 10 ++-- upload/includes/ucp/usercp_email.php | 8 +-- upload/includes/ucp/usercp_register.php | 16 +++--- upload/includes/ucp/usercp_sendpasswd.php | 6 +-- upload/includes/ucp/usercp_viewprofile.php | 8 +-- upload/memberlist.php | 16 +++--- upload/posting.php | 16 +++--- upload/privmsg.php | 44 ++++++++-------- upload/report.php | 42 +++++++-------- upload/viewtopic.php | 8 +-- 59 files changed, 361 insertions(+), 369 deletions(-) diff --git a/upload/admin/admin_attach_cp.php b/upload/admin/admin_attach_cp.php index 05eab88f3..36e0e33d9 100644 --- a/upload/admin/admin_attach_cp.php +++ b/upload/admin/admin_attach_cp.php @@ -211,7 +211,7 @@ else if ($delete && sizeof($delete_id_list) > 0) // Assign Default Template Vars $template->assign_vars(array( 'S_VIEW_SELECT' => $select_view, - 'S_MODE_ACTION' => append_sid('admin_attach_cp.php')) + 'S_MODE_ACTION' => 'admin_attach_cp.php') ); if ($submit_change && $view == 'attachments') @@ -516,7 +516,7 @@ if ($view == 'attachments') $post_title = str_short($post_title, 30); } - $view_topic = append_sid(BB_ROOT . 'viewtopic.php?' . POST_POST_URL . '=' . $ids[$j]['post_id'] . '#' . $ids[$j]['post_id']); + $view_topic = BB_ROOT . 'viewtopic.php?' . POST_POST_URL . '=' . $ids[$j]['post_id'] . '#' . $ids[$j]['post_id']; $post_titles[] = '' . $post_title . ''; } @@ -544,7 +544,7 @@ if ($view == 'attachments') 'S_DELETE_BOX' => $delete_box, 'S_HIDDEN' => $hidden_field, - 'U_VIEW_ATTACHMENT' => append_sid(BB_ROOT . 'download.php?id=' . $attachments[$i]['attach_id'])) + 'U_VIEW_ATTACHMENT' => BB_ROOT . 'download.php?id=' . $attachments[$i]['attach_id']) ); } diff --git a/upload/admin/admin_attachments.php b/upload/admin/admin_attachments.php index 848735d97..516ecdd8b 100644 --- a/upload/admin/admin_attachments.php +++ b/upload/admin/admin_attachments.php @@ -367,7 +367,7 @@ if ($check_upload) if (!$error) { - message_die(GENERAL_MESSAGE, $lang['TEST_SETTINGS_SUCCESSFUL'] . '

' . sprintf($lang['CLICK_RETURN_ATTACH_CONFIG'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); + message_die(GENERAL_MESSAGE, $lang['TEST_SETTINGS_SUCCESSFUL'] . '

' . sprintf($lang['CLICK_RETURN_ATTACH_CONFIG'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); } } @@ -376,7 +376,7 @@ if ($submit && $mode == 'manage') { if (!$error) { - message_die(GENERAL_MESSAGE, $lang['ATTACH_CONFIG_UPDATED'] . '

' . sprintf($lang['CLICK_RETURN_ATTACH_CONFIG'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); + message_die(GENERAL_MESSAGE, $lang['ATTACH_CONFIG_UPDATED'] . '

' . sprintf($lang['CLICK_RETURN_ATTACH_CONFIG'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); } } @@ -401,7 +401,7 @@ if ($mode == 'manage') $template->assign_vars(array( 'TPL_ATTACH_MANAGE' => true, - 'S_ATTACH_ACTION' => append_sid('admin_attachments.php?mode=manage'), + 'S_ATTACH_ACTION' => 'admin_attachments.php?mode=manage', 'S_FILESIZE' => $select_size_mode, 'S_FILESIZE_QUOTA' => $select_quota_size_mode, 'S_FILESIZE_PM' => $select_pm_size_mode, @@ -438,7 +438,7 @@ if ($submit && $mode == 'cats') { if (!$error) { - message_die(GENERAL_MESSAGE, $lang['ATTACH_CONFIG_UPDATED'] . '

' . sprintf($lang['CLICK_RETURN_ATTACH_CONFIG'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); + message_die(GENERAL_MESSAGE, $lang['ATTACH_CONFIG_UPDATED'] . '

' . sprintf($lang['CLICK_RETURN_ATTACH_CONFIG'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); } } @@ -515,7 +515,7 @@ if ($mode == 'cats') 'USE_GD2_YES' => $use_gd2_yes, 'USE_GD2_NO' => $use_gd2_no, 'S_ASSIGNED_GROUP_IMAGES' => implode(', ', $s_assigned_group_images), - 'S_ATTACH_ACTION' => append_sid('admin_attachments.php?mode=cats')) + 'S_ATTACH_ACTION' => 'admin_attachments.php?mode=cats') ); } @@ -675,7 +675,7 @@ if ($check_image_cat) if (!$error) { - message_die(GENERAL_MESSAGE, $lang['TEST_SETTINGS_SUCCESSFUL'] . '

' . sprintf($lang['CLICK_RETURN_ATTACH_CONFIG'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); + message_die(GENERAL_MESSAGE, $lang['TEST_SETTINGS_SUCCESSFUL'] . '

' . sprintf($lang['CLICK_RETURN_ATTACH_CONFIG'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); } } @@ -785,7 +785,7 @@ if ($submit && $mode == 'quota') if (!$error) { - $message = $lang['ATTACH_CONFIG_UPDATED'] . '

' . sprintf($lang['CLICK_RETURN_ATTACH_CONFIG'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); + $message = $lang['ATTACH_CONFIG_UPDATED'] . '

' . sprintf($lang['CLICK_RETURN_ATTACH_CONFIG'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); message_die(GENERAL_MESSAGE, $message); } @@ -810,7 +810,7 @@ if ($mode == 'quota') 'TPL_ATTACH_QUOTA' => true, 'MAX_FILESIZE' => $max_add_filesize, 'S_FILESIZE' => size_select('add_size_select', $size), - 'S_ATTACH_ACTION' => append_sid('admin_attachments.php?mode=quota')) + 'S_ATTACH_ACTION' => 'admin_attachments.php?mode=quota') ); $sql = "SELECT * FROM " . BB_QUOTA_LIMITS . " ORDER BY quota_limit DESC"; @@ -840,7 +840,7 @@ if ($mode == 'quota') 'QUOTA_NAME' => $rows[$i]['quota_desc'], 'QUOTA_ID' => $rows[$i]['quota_limit_id'], 'S_FILESIZE' => size_select('size_select_list[]', $size_format), - 'U_VIEW' => append_sid("admin_attachments.php?mode=$mode&e_mode=view_quota&quota_id=" . $rows[$i]['quota_limit_id']), + 'U_VIEW' => "admin_attachments.php?mode=$mode&e_mode=view_quota&quota_id=" . $rows[$i]['quota_limit_id'], 'MAX_FILESIZE' => $rows[$i]['quota_limit']) ); } diff --git a/upload/admin/admin_board.php b/upload/admin/admin_board.php index dd73bb48a..2526b9c42 100644 --- a/upload/admin/admin_board.php +++ b/upload/admin/admin_board.php @@ -15,9 +15,9 @@ require(INC_DIR .'functions_selects.php'); $mode = isset($_GET['mode']) ? $_GET['mode'] : ''; $return_links = array( - 'index' => '

'. sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''), - 'config' => '

'. sprintf($lang['CLICK_RETURN_CONFIG'], '', ''), - 'config_mods' => '

'. sprintf($lang['CLICK_RETURN_CONFIG_MODS'], '', '') + 'index' => '

'. sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''), + 'config' => '

'. sprintf($lang['CLICK_RETURN_CONFIG'], '', ''), + 'config_mods' => '

'. sprintf($lang['CLICK_RETURN_CONFIG_MODS'], '', '') ); // @@ -73,7 +73,7 @@ switch($mode) { case 'config_mods': $template->assign_vars(array( - 'S_CONFIG_ACTION' => append_sid('admin_board.php?mode=config_mods'), + 'S_CONFIG_ACTION' => 'admin_board.php?mode=config_mods', 'CONFIG_MODS' => true, 'REPORTS_ENABLED' => $new['reports_enabled'], @@ -123,7 +123,7 @@ switch($mode) default: $template->assign_vars(array( - 'S_CONFIG_ACTION' => append_sid('admin_board.php?mode=config'), + 'S_CONFIG_ACTION' => 'admin_board.php?mode=config', 'CONFIG' => true, 'SITENAME' => htmlCHR($new['sitename']), diff --git a/upload/admin/admin_bt_forum_cfg.php b/upload/admin/admin_bt_forum_cfg.php index 1f5685d10..6e5c1bcf5 100644 --- a/upload/admin/admin_bt_forum_cfg.php +++ b/upload/admin/admin_bt_forum_cfg.php @@ -83,7 +83,7 @@ if ($submit && $confirm) $datastore->update('cat_forums'); - $message = $lang['CONFIG_UPD'] .'

'. sprintf($lang['RETURN_CONFIG'], '', '') .'

'. sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); + $message = $lang['CONFIG_UPD'] .'

'. sprintf($lang['RETURN_CONFIG'], '', '') .'

'. sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); message_die(GENERAL_MESSAGE, $message); } @@ -151,7 +151,7 @@ $template->assign_vars(array( 'BT_SHOW_PEERS_MODE_FULL_SEL' => ($cfg['bt_show_peers_mode'] == SHOW_PEERS_FULL) ? HTML_CHECKED : '', 'S_HIDDEN_FIELDS' => '', - 'S_CONFIG_ACTION' => append_sid("admin_bt_forum_cfg.php"), + 'S_CONFIG_ACTION' => "admin_bt_forum_cfg.php", )); print_page('admin_bt_forum_cfg.tpl', 'admin'); diff --git a/upload/admin/admin_bt_tracker_cfg.php b/upload/admin/admin_bt_tracker_cfg.php index 618f121d3..358e89527 100644 --- a/upload/admin/admin_bt_tracker_cfg.php +++ b/upload/admin/admin_bt_tracker_cfg.php @@ -61,7 +61,7 @@ $template->assign_vars(array( 'DISABLE_SUBMIT' => true, 'S_HIDDEN_FIELDS' => '', - 'S_CONFIG_ACTION' => append_sid("admin_bt_tracker_cfg.php"), + 'S_CONFIG_ACTION' => "admin_bt_tracker_cfg.php", )); print_page('admin_bt_tracker_cfg.tpl', 'admin'); \ No newline at end of file diff --git a/upload/admin/admin_cron.php b/upload/admin/admin_cron.php index cc6efea08..226dcf993 100644 --- a/upload/admin/admin_cron.php +++ b/upload/admin/admin_cron.php @@ -14,7 +14,7 @@ $submit = isset($_POST['submit']); $jobs = isset($_POST['select']) ? implode(',', $_POST['select']) : ''; $cron_action = isset($_POST['cron_action']) ? $_POST['cron_action'] : ''; -if ($mode == 'run' && !$job_id) +if ($mode == 'run' && !$job_id) { define('BB_ROOT', './../'); require(BB_ROOT.'common.php'); @@ -41,19 +41,19 @@ foreach($sql as $row) $default_config[$config_name] = $config_value; $new[$config_name] = isset($_POST[$config_name]) ? $_POST[$config_name] : $default_config[$config_name]; - + if (isset($_POST['submit']) && $row['config_value'] != $new[$config_name]) { bb_update_config(array($config_name => $new[$config_name])); } } - + $template->assign_vars(array( 'CRON_ENABLED' => ($new['cron_enabled']) ? true : false, 'CRON_CHECK_INTERVAL' => $new['cron_check_interval'], )); - + switch($mode) { case 'list': @@ -77,10 +77,10 @@ switch($mode) $template->assign_vars(array( 'TPL_CRON_LIST' => true, - 'S_CRON_ACTION' => append_sid("admin_cron.php"), + 'S_CRON_ACTION' => "admin_cron.php", 'S_MODE' => 'list', )); - + //detect cron status if (@file_exists('../triggers/cron_running')) { @@ -89,15 +89,15 @@ switch($mode) )); } break; - + case 'repair': - if (@file_exists('../triggers/cron_running')) + if (@file_exists('../triggers/cron_running')) { rename("../triggers/cron_running", "../triggers/cron_allowed"); } redirect('admin/'.basename(__FILE__) . '?mode=list'); break; - + case 'run': run_jobs($job_id); redirect('admin/'.basename(__FILE__) . '?mode=list'); @@ -127,13 +127,13 @@ switch($mode) 'RUN_COUNTER' => $row['run_counter'], )); } - + $run_day = array($lang['DELTA_TIME']['INTERVALS']['mday'][0] => 0); for($i=1; $i<=28; $i++) { $run_day[$i] = $i; } - + $schedule = array($lang['SCHEDULE']['select'] => 0); foreach ($lang['SCHEDULE'] as $type => $key) { @@ -142,30 +142,30 @@ switch($mode) $template->assign_vars(array( 'TPL_CRON_EDIT' => true, - 'S_CRON_ACTION' => append_sid("admin_cron.php"), + 'S_CRON_ACTION' => "admin_cron.php", 'S_MODE' => 'edit', 'SCHEDULE' => build_select('schedule', $schedule, $row['schedule']), 'RUN_DAY' => build_select('run_day', $run_day, $row['run_day']), 'L_CRON_EDIT_HEAD' => $lang['CRON_EDIT_HEAD_EDIT'], )); break; - + case 'add': $run_day = array($lang['DELTA_TIME']['INTERVALS']['mday'][0] => 0); for($i=1; $i<=28; $i++) { $run_day[$i] = $i; } - + $schedule = array(); foreach ($lang['SCHEDULE'] as $type => $key) { $schedule[$key] = $type; } - + $template->assign_vars(array( 'TPL_CRON_EDIT' => true, - 'S_CRON_ACTION' => append_sid("admin_cron.php"), + 'S_CRON_ACTION' => "admin_cron.php", 'S_MODE' => 'add', 'SCHEDULE' => build_select('schedule', $schedule, 'select', null, null), 'RUN_DAY' => build_select('run_day', $run_day, 0, null, null), @@ -189,33 +189,33 @@ switch($mode) case 'delete': delete_jobs($job_id); - - $message = $lang['JOB_REMOVED'] . "

" . sprintf($lang['CLICK_RETURN_JOBS'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); + + $message = $lang['JOB_REMOVED'] . "

" . sprintf($lang['CLICK_RETURN_JOBS'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); message_die(GENERAL_MESSAGE, $message); break; -} +} -if ($submit) +if ($submit) { if ($_POST['mode'] == 'list') { - if ($cron_action == 'run' && $jobs) + if ($cron_action == 'run' && $jobs) { run_jobs($jobs); } - else if ($cron_action == 'delete' && $jobs) + else if ($cron_action == 'delete' && $jobs) { delete_jobs($jobs); } - else if (($cron_action == 'disable' || $cron_action == 'enable') && $jobs) + else if (($cron_action == 'disable' || $cron_action == 'enable') && $jobs) { toggle_active($jobs, $cron_action); } redirect('admin/'.basename(__FILE__) . '?mode=list'); } - else if (validate_cron_post($_POST) == 1) + else if (validate_cron_post($_POST) == 1) { - if($_POST['mode'] == 'edit') + if($_POST['mode'] == 'edit') { update_cron_job($_POST); } @@ -227,7 +227,7 @@ if ($submit) redirect('admin/'.basename(__FILE__) . '?mode=list'); } - else + else { $message = validate_cron_post($_POST); message_die(GENERAL_MESSAGE, $message); diff --git a/upload/admin/admin_disallow.php b/upload/admin/admin_disallow.php index 0a19801eb..ff667d43f 100644 --- a/upload/admin/admin_disallow.php +++ b/upload/admin/admin_disallow.php @@ -37,7 +37,7 @@ if( isset($_POST['add_name']) ) $message = $lang['DISALLOW_SUCCESSFUL']; } - $message .= "

" . sprintf($lang['CLICK_RETURN_DISALLOWADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); + $message .= "

" . sprintf($lang['CLICK_RETURN_DISALLOWADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); message_die(GENERAL_MESSAGE, $message); } @@ -53,7 +53,7 @@ else if( isset($_POST['delete_name']) ) message_die(GENERAL_ERROR, "Couldn't removed disallowed user.", "",__LINE__, __FILE__, $sql); } - $message .= $lang['DISALLOWED_DELETED'] . "

" . sprintf($lang['CLICK_RETURN_DISALLOWADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); + $message .= $lang['DISALLOWED_DELETED'] . "

" . sprintf($lang['CLICK_RETURN_DISALLOWADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); message_die(GENERAL_MESSAGE, $message); @@ -93,7 +93,7 @@ $disallow_select .= ''; $template->assign_vars(array( "S_DISALLOW_SELECT" => $disallow_select, - "S_FORM_ACTION" => append_sid("admin_disallow.php"), + "S_FORM_ACTION" => "admin_disallow.php", )); print_page('admin_disallow.tpl', 'admin'); diff --git a/upload/admin/admin_extensions.php b/upload/admin/admin_extensions.php index 2d7ec5cf5..21f2cc9b3 100644 --- a/upload/admin/admin_extensions.php +++ b/upload/admin/admin_extensions.php @@ -205,7 +205,7 @@ if ($submit && $mode == 'extensions') if (!@$error) { - $message = $lang['ATTACH_CONFIG_UPDATED'] . '

' . sprintf($lang['CLICK_RETURN_ATTACH_CONFIG'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); + $message = $lang['ATTACH_CONFIG_UPDATED'] . '

' . sprintf($lang['CLICK_RETURN_ATTACH_CONFIG'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); message_die(GENERAL_MESSAGE, $message); } @@ -216,8 +216,8 @@ if ($mode == 'extensions') // Extensions $template->assign_vars(array( 'TPL_ATTACH_EXTENSIONS' => true, - 'S_CANCEL_ACTION' => append_sid("admin_extensions.php?mode=extensions"), - 'S_ATTACH_ACTION' => append_sid("admin_extensions.php?mode=extensions")) + 'S_CANCEL_ACTION' => "admin_extensions.php?mode=extensions", + 'S_ATTACH_ACTION' => "admin_extensions.php?mode=extensions") ); if ($submit) @@ -420,7 +420,7 @@ if ($submit && $mode == 'groups') if (!@$error) { - $message = $lang['ATTACH_CONFIG_UPDATED'] . '

' . sprintf($lang['CLICK_RETURN_ATTACH_CONFIG'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); + $message = $lang['ATTACH_CONFIG_UPDATED'] . '

' . sprintf($lang['CLICK_RETURN_ATTACH_CONFIG'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); message_die(GENERAL_MESSAGE, $message); } @@ -454,8 +454,8 @@ if ($mode == 'groups') 'S_FILESIZE' => size_select('add_size_select', $size), 'S_ADD_DOWNLOAD_MODE' => download_select('add_download_mode'), 'S_SELECT_CAT' => category_select('add_category'), - 'S_CANCEL_ACTION' => append_sid("admin_extensions.php?mode=groups"), - 'S_ATTACH_ACTION' => append_sid("admin_extensions.php?mode=groups")) + 'S_CANCEL_ACTION' => "admin_extensions.php?mode=groups", + 'S_ATTACH_ACTION' => "admin_extensions.php?mode=groups") ); $sql = 'SELECT * @@ -503,8 +503,8 @@ if ($mode == 'groups') 'MAX_FILESIZE' => $extension_group[$i]['max_filesize'], 'CAT_BOX' => ( $viewgroup == $extension_group[$i]['group_id'] ) ? $lang['DECOLLAPSE'] : $lang['COLLAPSE'], - 'U_VIEWGROUP' => ( $viewgroup == $extension_group[$i]['group_id'] ) ? append_sid("admin_extensions.php?mode=groups") : append_sid("admin_extensions.php?mode=groups&" . POST_GROUPS_URL . "=" . $extension_group[$i]['group_id']), - 'U_FORUM_PERMISSIONS' => append_sid("admin_extensions.php?mode=$mode&e_mode=perm&e_group=" . $extension_group[$i]['group_id'])) + 'U_VIEWGROUP' => ( $viewgroup == $extension_group[$i]['group_id'] ) ? "admin_extensions.php?mode=groups" : "admin_extensions.php?mode=groups&" . POST_GROUPS_URL . "=" . $extension_group[$i]['group_id'], + 'U_FORUM_PERMISSIONS' => "admin_extensions.php?mode=$mode&e_mode=perm&e_group=" . $extension_group[$i]['group_id']) ); if ($viewgroup && $viewgroup == $extension_group[$i]['group_id']) @@ -713,7 +713,7 @@ if ($e_mode == 'perm' && $group) $template->assign_vars(array( 'TPL_ATTACH_EXTENSION_GROUPS_PERMISSIONS' => true, 'L_GROUP_PERMISSIONS_TITLE' => sprintf($lang['GROUP_PERMISSIONS_TITLE_ADMIN'], trim($group_name)), - 'A_PERM_ACTION' => append_sid("admin_extensions.php?mode=groups&e_mode=perm&e_group=$group")) + 'A_PERM_ACTION' => "admin_extensions.php?mode=groups&e_mode=perm&e_group=$group") ); $forum_option_values = array(GPERM_ALL => $lang['PERM_ALL_FORUMS']); diff --git a/upload/admin/admin_forumauth_list.php b/upload/admin/admin_forumauth_list.php index 4fb9d424d..5861067a3 100644 --- a/upload/admin/admin_forumauth_list.php +++ b/upload/admin/admin_forumauth_list.php @@ -171,7 +171,7 @@ if( isset($_POST['submit']) ) } $datastore->update('cat_forums'); - $message = $lang['FORUM_AUTH_UPDATED'] . '

' . sprintf($lang['CLICK_RETURN_FORUMAUTH'], '', ""); + $message = $lang['FORUM_AUTH_UPDATED'] . '

' . sprintf($lang['CLICK_RETURN_FORUMAUTH'], '', ""); message_die(GENERAL_MESSAGE, $message); } // End of submit @@ -230,7 +230,7 @@ if( empty($forum_id) && empty($cat_id) ) $template->assign_block_vars('cat_row', array( 'CAT_NAME' => htmlCHR($category_rows[$i]['cat_title']), - 'CAT_URL' => append_sid('admin_forumauth_list.php'.'?'.POST_CAT_URL.'='.$category_rows[$i]['cat_id'])) + 'CAT_URL' => 'admin_forumauth_list.php'.'?'.POST_CAT_URL.'='.$category_rows[$i]['cat_id']) ); for ($j=0; $jassign_block_vars('cat_row.forum_row', array( 'ROW_CLASS' => !($j % 2) ? 'row4' : 'row5', - 'FORUM_NAME' => ''.htmlCHR($forum_rows[$j]['forum_name']).'', + 'FORUM_NAME' => ''. htmlCHR($forum_rows[$j]['forum_name']) .'', 'IS_SUBFORUM' => $forum_rows[$j]['forum_parent'], )); @@ -298,7 +298,7 @@ else $template->assign_block_vars('cat_row', array( 'CAT_NAME' => htmlCHR($cat_name), - 'CAT_URL' => append_sid('admin_forumauth_list.php'.'?'.POST_CAT_URL.'='.$cat_id)) + 'CAT_URL' => 'admin_forumauth_list.php?'. POST_CAT_URL .'='. $cat_id) ); for ($j=0; $jassign_block_vars('cat_row.forum_row', array( 'ROW_CLASS' => !($j % 2) ? 'row4' : 'row5', - 'FORUM_NAME' => ''.htmlCHR($forum_rows[$j]['forum_name']).'', + 'FORUM_NAME' => ''. htmlCHR($forum_rows[$j]['forum_name']) .'', 'IS_SUBFORUM' => $forum_rows[$j]['forum_parent'], )); @@ -358,7 +358,7 @@ else $template->assign_vars(array( 'TPL_AUTH_CAT' => true, 'CAT_NAME' => htmlCHR($cat_name), - 'S_FORUMAUTH_ACTION' => append_sid("admin_forumauth_list.php"), + 'S_FORUMAUTH_ACTION' => "admin_forumauth_list.php", 'S_COLUMN_SPAN' => count($forum_auth_fields)+1, 'S_HIDDEN_FIELDS' => $s_hidden_fields) ); diff --git a/upload/admin/admin_forums.php b/upload/admin/admin_forums.php index 242807a28..a62095f70 100644 --- a/upload/admin/admin_forums.php +++ b/upload/admin/admin_forums.php @@ -147,7 +147,7 @@ if ($mode) 'S_FORUM_DISPLAY_SORT_LIST' => $forum_display_sort_list, 'S_FORUM_DISPLAY_ORDER_LIST' => $forum_display_order_list, - 'S_FORUM_ACTION' => append_sid("admin_forums.php"), + 'S_FORUM_ACTION' => "admin_forums.php", 'S_HIDDEN_FIELDS' => $s_hidden_fields, 'S_SUBMIT_VALUE' => $buttonvalue, 'S_CAT_LIST' => $catlist, @@ -229,7 +229,7 @@ if ($mode) renumber_order('forum', $cat_id); $datastore->update('cat_forums'); - $message = $lang['FORUMS_UPDATED'] . "

" . sprintf($lang['CLICK_RETURN_FORUMADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); + $message = $lang['FORUMS_UPDATED'] . "

" . sprintf($lang['CLICK_RETURN_FORUMADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); message_die(GENERAL_MESSAGE, $message); break; @@ -322,7 +322,7 @@ if ($mode) $message = $lang['FORUMS_UPDATED'] . "

"; $message .= ($fix) ? "$fix

" : ''; - $message .= sprintf($lang['CLICK_RETURN_FORUMADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); + $message .= sprintf($lang['CLICK_RETURN_FORUMADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); message_die(GENERAL_MESSAGE, $message); break; @@ -351,7 +351,7 @@ if ($mode) $datastore->update('cat_forums'); - $message = $lang['FORUMS_UPDATED'] . "

" . sprintf($lang['CLICK_RETURN_FORUMADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); + $message = $lang['FORUMS_UPDATED'] . "

" . sprintf($lang['CLICK_RETURN_FORUMADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); message_die(GENERAL_MESSAGE, $message); break; @@ -409,7 +409,7 @@ if ($mode) $datastore->update('cat_forums'); - $message = $lang['FORUMS_UPDATED'] . "

" . sprintf($lang['CLICK_RETURN_FORUMADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); + $message = $lang['FORUMS_UPDATED'] . "

" . sprintf($lang['CLICK_RETURN_FORUMADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); message_die(GENERAL_MESSAGE, $message); break; @@ -503,7 +503,7 @@ if ($mode) update_user_level('all'); $datastore->update('cat_forums'); - $message = $lang['FORUMS_UPDATED'] . "

" . sprintf($lang['CLICK_RETURN_FORUMADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); + $message = $lang['FORUMS_UPDATED'] . "

" . sprintf($lang['CLICK_RETURN_FORUMADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); message_die(GENERAL_MESSAGE, $message); break; @@ -582,7 +582,7 @@ if ($mode) $message = $lang['FORUMS_UPDATED'] . "

"; $message .= ($fix) ? "$fix

" : ''; - $message .= sprintf($lang['CLICK_RETURN_FORUMADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); + $message .= sprintf($lang['CLICK_RETURN_FORUMADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); message_die(GENERAL_MESSAGE, $message); break; @@ -716,7 +716,7 @@ if (!$mode || $show_main_page) $template->assign_vars(array( 'TPL_FORUMS_LIST' => true, - 'S_FORUM_ACTION' => append_sid("admin_forums.php"), + 'S_FORUM_ACTION' => "admin_forums.php", 'L_FORUM_TITLE' => $lang['FORUM_ADMIN_MAIN'] )); diff --git a/upload/admin/admin_groups.php b/upload/admin/admin_groups.php index 16093fdcc..64891b66d 100644 --- a/upload/admin/admin_groups.php +++ b/upload/admin/admin_groups.php @@ -59,14 +59,14 @@ if (!empty($_POST['edit']) || !empty($_POST['new'])) 'GROUP_DESCRIPTION' => stripslashes(htmlspecialchars($group_info['group_description'])), 'GROUP_MODERATOR' => replace_quote($group_info['group_mod_name']), 'T_GROUP_EDIT_DELETE' => ($mode == 'newgroup') ? $lang['CREATE_NEW_GROUP'] : $lang['EDIT_GROUP'], - 'U_SEARCH_USER' => append_sid(BB_ROOT ."search.php?mode=searchuser"), + 'U_SEARCH_USER' => BB_ROOT ."search.php?mode=searchuser", 'S_GROUP_OPEN_TYPE' => GROUP_OPEN, 'S_GROUP_CLOSED_TYPE' => GROUP_CLOSED, 'S_GROUP_HIDDEN_TYPE' => GROUP_HIDDEN, 'S_GROUP_OPEN_CHECKED' => ($group_info['group_type'] == GROUP_OPEN) ? HTML_CHECKED : '', 'S_GROUP_CLOSED_CHECKED' => ($group_info['group_type'] == GROUP_CLOSED) ? HTML_CHECKED : '', 'S_GROUP_HIDDEN_CHECKED' => ($group_info['group_type'] == GROUP_HIDDEN ) ? HTML_CHECKED : '', - 'S_GROUP_ACTION' => append_sid("admin_groups.php"), + 'S_GROUP_ACTION' => "admin_groups.php", 'S_HIDDEN_FIELDS' => $s_hidden_fields, )); } @@ -82,8 +82,8 @@ else if (!empty($_POST['group_update'])) delete_group($group_id); $message = $lang['DELETED_GROUP'] .'

'; - $message .= sprintf($lang['CLICK_RETURN_GROUPSADMIN'], '', '') .'

'; - $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); + $message .= sprintf($lang['CLICK_RETURN_GROUPSADMIN'], '', '') .'

'; + $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); bb_die($message); } @@ -144,8 +144,8 @@ else if (!empty($_POST['group_update'])) DB()->query("UPDATE ". BB_GROUPS ." SET $sql_args WHERE group_id = $group_id"); $message = $lang['UPDATED_GROUP'] .'

'; - $message .= sprintf($lang['CLICK_RETURN_GROUPSADMIN'], '', '') .'

'; - $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); + $message .= sprintf($lang['CLICK_RETURN_GROUPSADMIN'], '', '') .'

'; + $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); bb_die($message); } @@ -162,8 +162,8 @@ else if (!empty($_POST['group_update'])) add_user_into_group($new_group_id, $group_moderator); $message = $lang['ADDED_NEW_GROUP'] .'

'; - $message .= sprintf($lang['CLICK_RETURN_GROUPSADMIN'], '', '') .'

'; - $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); + $message .= sprintf($lang['CLICK_RETURN_GROUPSADMIN'], '', '') .'

'; + $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); bb_die($message); } @@ -178,7 +178,7 @@ else $template->assign_vars(array( 'TPL_GROUP_SELECT' => true, - 'S_GROUP_ACTION' => append_sid("admin_groups.php"), + 'S_GROUP_ACTION' => "admin_groups.php", 'S_GROUP_SELECT' => stripslashes(get_select('groups')), )); } diff --git a/upload/admin/admin_log.php b/upload/admin/admin_log.php index 258aacd82..46d4f010f 100644 --- a/upload/admin/admin_log.php +++ b/upload/admin/admin_log.php @@ -26,7 +26,7 @@ $poster_name_max_len = 25; $select_max_height = 16; $dt_format = 'Y-m-d'; // used in one-day filter -$url = append_sid(basename(__FILE__)); +$url = basename(__FILE__); // Key names $type_key = 'type'; @@ -409,7 +409,7 @@ $template->assign_vars(array( 'SEL_LOG_TYPE' => build_select("{$type_key}[]", $log_type_select, $type_selected, 60, $select_max_height), 'SEL_USERS' => build_select("{$user_key}[]", $users, $user_selected, 16, $select_max_height), - 'S_LOG_ACTION' => append_sid("admin_log.php"), + 'S_LOG_ACTION' => "admin_log.php", 'TOPIC_CSV' => $topic_csv, )); diff --git a/upload/admin/admin_mass_email.php b/upload/admin/admin_mass_email.php index 0b284b5d7..631d42459 100644 --- a/upload/admin/admin_mass_email.php +++ b/upload/admin/admin_mass_email.php @@ -110,7 +110,7 @@ if ( isset($_POST['submit']) ) $emailer->send(); $emailer->reset(); - message_die(GENERAL_MESSAGE, $lang['EMAIL_SENT'] . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); + message_die(GENERAL_MESSAGE, $lang['EMAIL_SENT'] . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', '')); } } @@ -150,10 +150,10 @@ require(PAGE_HEADER); $template->assign_vars(array( 'MESSAGE' => $message, 'SUBJECT' => $subject, - + 'L_NOTICE' => @$notice, - 'S_USER_ACTION' => append_sid('admin_mass_email.php'), + 'S_USER_ACTION' => 'admin_mass_email.php', 'S_GROUP_SELECT' => $select_list) ); diff --git a/upload/admin/admin_ranks.php b/upload/admin/admin_ranks.php index 8e96c6c59..7082c42c8 100644 --- a/upload/admin/admin_ranks.php +++ b/upload/admin/admin_ranks.php @@ -87,7 +87,7 @@ if($mode != "") "STYLE" => !empty($rank_info['rank_style']) ? $rank_info['rank_style'] : '', "IMAGE_DISPLAY" => !empty($rank_info['rank_image']) ? '' : "", - "S_RANK_ACTION" => append_sid("admin_ranks.php"), + "S_RANK_ACTION" => "admin_ranks.php", "S_HIDDEN_FIELDS" => $s_hidden_fields) ); @@ -159,7 +159,7 @@ if($mode != "") message_die(GENERAL_ERROR, "Couldn't update/insert into ranks table", "", __LINE__, __FILE__, $sql); } - $message .= "

" . sprintf($lang['CLICK_RETURN_RANKADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); + $message .= "

" . sprintf($lang['CLICK_RETURN_RANKADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); $datastore->update('ranks'); @@ -200,7 +200,7 @@ if($mode != "") message_die(GENERAL_ERROR, $lang['NO_UPDATE_RANKS'], "", __LINE__, __FILE__, $sql); } - $message = $lang['RANK_REMOVED'] . "

" . sprintf($lang['CLICK_RETURN_RANKADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); + $message = $lang['RANK_REMOVED'] . "

" . sprintf($lang['CLICK_RETURN_RANKADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); $datastore->update('ranks'); @@ -234,7 +234,7 @@ else $template->assign_vars(array( 'TPL_RANKS_LIST' => true, - "S_RANKS_ACTION" => append_sid("admin_ranks.php")) + "S_RANKS_ACTION" => "admin_ranks.php") ); for($i = 0; $i < $rank_count; $i++) @@ -261,8 +261,8 @@ else "SPECIAL_RANK" => $rank_is_special, "RANK_MIN" => $rank_min, - "U_RANK_EDIT" => append_sid("admin_ranks.php?mode=edit&id=$rank_id"), - "U_RANK_DELETE" => append_sid("admin_ranks.php?mode=delete&id=$rank_id")) + "U_RANK_EDIT" => "admin_ranks.php?mode=edit&id=$rank_id", + "U_RANK_DELETE" => "admin_ranks.php?mode=delete&id=$rank_id") ); } } diff --git a/upload/admin/admin_rebuild_search.php b/upload/admin/admin_rebuild_search.php index a362c702f..ed7c93ea1 100644 --- a/upload/admin/admin_rebuild_search.php +++ b/upload/admin/admin_rebuild_search.php @@ -48,7 +48,7 @@ if (isset($_REQUEST['cancel_button'])) "); } - $message = sprintf($lang['REBUILD_SEARCH_ABORTED'], $last_session_data['end_post_id']) .'

'. sprintf($lang['CLICK_RETURN_REBUILD_SEARCH'], '', ''); + $message = sprintf($lang['REBUILD_SEARCH_ABORTED'], $last_session_data['end_post_id']) .'

'. sprintf($lang['CLICK_RETURN_REBUILD_SEARCH'], '', ''); message_die(GENERAL_MESSAGE, $message); } @@ -142,7 +142,7 @@ if ($mode == 'submit') { if ($session_posts_processing <= 0 || $post_limit <= 0 || $refresh_rate <= 0 || $time_limit <=0) { - $message = $lang['WRONG_INPUT'] .'

'. sprintf($lang['CLICK_RETURN_REBUILD_SEARCH'], '', ''); + $message = $lang['WRONG_INPUT'] .'

'. sprintf($lang['CLICK_RETURN_REBUILD_SEARCH'], '', ''); message_die(GENERAL_MESSAGE, $message); } } @@ -271,21 +271,22 @@ if ($mode == 'submit' || $mode == 'refresh') $form_parameters .= '&time_limit='.$time_limit; $form_parameters .= '&refresh_rate='.$refresh_rate; - $form_action = append_sid('admin_rebuild_search.php'.'?mode=refresh'.$form_parameters); + $form_action = 'admin_rebuild_search.php'.'?mode=refresh'.$form_parameters; $next_button = $lang['NEXT']; $progress_bar_img = $images['progress_bar']; $processing_messages .= sprintf($lang['PROCESSING_NEXT_POSTS'], $post_limit); + meta_refresh($form_action, $refresh_rate); + // create the meta tag for refresh $template->assign_vars(array( - 'META' => '', 'CANCEL_BUTTON' => true, )); } else // end of processing { - $form_action = append_sid("admin_rebuild_search.php"); + $form_action = "admin_rebuild_search.php"; $next_button = $lang['FINISHED']; $progress_bar_img = $images['progress_bar_full']; @@ -449,7 +450,7 @@ else // show the input page 'SESSION_ID' => $userdata['session_id'], 'S_HIDDEN_FIELDS' => $s_hidden_fields, - 'S_REBUILD_SEARCH_ACTION' => append_sid("admin_rebuild_search.php?mode=submit"), + 'S_REBUILD_SEARCH_ACTION' => "admin_rebuild_search.php?mode=submit", )); } diff --git a/upload/admin/admin_reports.php b/upload/admin/admin_reports.php index 1a1a07e62..d053ceff7 100644 --- a/upload/admin/admin_reports.php +++ b/upload/admin/admin_reports.php @@ -13,14 +13,14 @@ require(INC_DIR . 'functions_report.php'); require(INC_DIR . 'functions_report_admin.php'); $return_links = array( - 'index' => '

'. sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''), - 'config' => '

'. sprintf($lang['CLICK_RETURN_REPORT_CONFIG'], '', ''), - 'admin' => '

'. sprintf($lang['CLICK_RETURN_REPORT_ADMIN'], '', '') + 'index' => '

'. sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''), + 'config' => '

'. sprintf($lang['CLICK_RETURN_REPORT_CONFIG'], '', ''), + 'admin' => '

'. sprintf($lang['CLICK_RETURN_REPORT_ADMIN'], '', '') ); -$redirect_url = append_sid('admin/admin_reports.php', true); +$redirect_url = 'admin/admin_reports.php'; -$template->assign_var('S_REPORT_ACTION', append_sid('admin_reports.php')); +$template->assign_var('S_REPORT_ACTION', 'admin_reports.php'); if (isset($_POST['mode']) || isset($_GET['mode'])) { @@ -144,10 +144,10 @@ else if (isset($_POST[POST_CAT_URL]) || isset($_GET[POST_CAT_URL])) case 'reasons': $reason_mode = (isset($modes[1])) ? $modes[1] : ''; - $temp_url = append_sid("admin_reports.php?mode=reasons&" . POST_CAT_URL . "=$module_id"); + $temp_url = "admin_reports.php?mode=reasons&" . POST_CAT_URL . "=$module_id"; $return_links['reasons'] = '

' . sprintf($lang['CLICK_RETURN_REPORT_REASONS'], '', ''); - $redirect_url = append_sid('admin/admin_reports.php?mode=reasons&' . POST_CAT_URL . "=$module_id", true); + $redirect_url = 'admin/admin_reports.php?mode=reasons&' . POST_CAT_URL . "=$module_id"; if (isset($_POST[POST_REPORT_REASON_URL]) || isset($_GET[POST_REPORT_REASON_URL])) { @@ -333,10 +333,10 @@ else if (isset($_POST[POST_CAT_URL]) || isset($_GET[POST_CAT_URL])) $template->assign_block_vars('report_reasons', array( 'DESC' => $reason_desc, - 'U_EDIT' => append_sid('admin_reports.php?mode[]=reasons&' . POST_CAT_URL . "=$module_id&mode[]=edit&" . POST_REPORT_REASON_URL . "=$reason_id"), - 'U_MOVE_UP' => append_sid('admin_reports.php?mode[]=reasons&' . POST_CAT_URL . "=$module_id&mode[]=up&" . POST_REPORT_REASON_URL . "=$reason_id"), - 'U_MOVE_DOWN' => append_sid('admin_reports.php?mode[]=reasons&' . POST_CAT_URL . "=$module_id&mode[]=down&" . POST_REPORT_REASON_URL . "=$reason_id"), - 'U_DELETE' => append_sid('admin_reports.php?mode[]=reasons&' . POST_CAT_URL . "=$module_id&mode[]=delete&" . POST_REPORT_REASON_URL . "=$reason_id")) + 'U_EDIT' => 'admin_reports.php?mode[]=reasons&' . POST_CAT_URL . "=$module_id&mode[]=edit&" . POST_REPORT_REASON_URL . "=$reason_id", + 'U_MOVE_UP' => 'admin_reports.php?mode[]=reasons&' . POST_CAT_URL . "=$module_id&mode[]=up&" . POST_REPORT_REASON_URL . "=$reason_id", + 'U_MOVE_DOWN' => 'admin_reports.php?mode[]=reasons&' . POST_CAT_URL . "=$module_id&mode[]=down&" . POST_REPORT_REASON_URL . "=$reason_id", + 'U_DELETE' => 'admin_reports.php?mode[]=reasons&' . POST_CAT_URL . "=$module_id&mode[]=delete&" . POST_REPORT_REASON_URL . "=$reason_id") ); } } @@ -346,8 +346,8 @@ else if (isset($_POST[POST_CAT_URL]) || isset($_GET[POST_CAT_URL])) } $template->assign_vars(array( - 'U_ADD_REASON' => append_sid('admin_reports.php?mode[]=reasons&' . POST_CAT_URL . "=$module_id&mode[]=add"), - 'U_MODULES' => append_sid('admin_reports.php') + 'U_ADD_REASON' => 'admin_reports.php?mode[]=reasons&' . POST_CAT_URL . "=$module_id&mode[]=add", + 'U_MODULES' => 'admin_reports.php' )); print_page('report_module_reasons_body.tpl', 'admin'); @@ -503,12 +503,12 @@ else 'MODULE_EXPLAIN' => $module_info['explain'], 'REPORT_COUNT' => $report_counts[$report_module->id], - 'U_EDIT' => append_sid('admin_reports.php?mode=edit&' . POST_CAT_URL . '=' . $report_module->id), - 'U_REASONS' => append_sid('admin_reports.php?mode=reasons&' . POST_CAT_URL . '=' . $report_module->id), - 'U_MOVE_UP' => append_sid('admin_reports.php?mode=up&' . POST_CAT_URL . '=' . $report_module->id), - 'U_MOVE_DOWN' => append_sid('admin_reports.php?mode=down&' . POST_CAT_URL . '=' . $report_module->id), - 'U_SYNC' => append_sid('admin_reports.php?mode=sync&' . POST_CAT_URL . '=' . $report_module->id), - 'U_UNINSTALL' => append_sid('admin_reports.php?mode=uninstall&' . POST_CAT_URL . '=' . $report_module->id)) + 'U_EDIT' => 'admin_reports.php?mode=edit&' . POST_CAT_URL . '=' . $report_module->id, + 'U_REASONS' => 'admin_reports.php?mode=reasons&' . POST_CAT_URL . '=' . $report_module->id, + 'U_MOVE_UP' => 'admin_reports.php?mode=up&' . POST_CAT_URL . '=' . $report_module->id, + 'U_MOVE_DOWN' => 'admin_reports.php?mode=down&' . POST_CAT_URL . '=' . $report_module->id, + 'U_SYNC' => 'admin_reports.php?mode=sync&' . POST_CAT_URL . '=' . $report_module->id, + 'U_UNINSTALL' => 'admin_reports.php?mode=uninstall&' . POST_CAT_URL . '=' . $report_module->id) ); // @@ -541,7 +541,7 @@ else 'MODULE_EXPLAIN' => $module_info['explain'], 'REPORT_COUNT' => '-', - 'U_INSTALL' => append_sid('admin_reports.php?mode=install&module=' . $report_module->data['module_name'])) + 'U_INSTALL' => 'admin_reports.php?mode=install&module=' . $report_module->data['module_name']) ); } diff --git a/upload/admin/admin_smilies.php b/upload/admin/admin_smilies.php index 4c012ddd6..ac18da402 100644 --- a/upload/admin/admin_smilies.php +++ b/upload/admin/admin_smilies.php @@ -145,7 +145,7 @@ if( isset($_GET['import_pack']) || isset($_POST['import_pack']) ) } } - $message = $lang['SMILEY_IMPORT_SUCCESS'] . "

" . sprintf($lang['CLICK_RETURN_SMILEADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); + $message = $lang['SMILEY_IMPORT_SUCCESS'] . "

" . sprintf($lang['CLICK_RETURN_SMILEADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); message_die(GENERAL_MESSAGE, $message); } @@ -169,7 +169,7 @@ if( isset($_GET['import_pack']) || isset($_POST['import_pack']) ) $template->assign_vars(array( 'TPL_SMILE_IMPORT' => true, - "S_SMILEY_ACTION" => append_sid("admin_smilies.php"), + "S_SMILEY_ACTION" => "admin_smilies.php", "S_SMILE_SELECT" => $smile_paks_select, "S_HIDDEN_FIELDS" => $hidden_vars) ); @@ -209,7 +209,7 @@ else if( isset($_POST['export_pack']) || isset($_GET['export_pack']) ) exit; } - $message = sprintf($lang['EXPORT_SMILES'], "", "") . "

" . sprintf($lang['CLICK_RETURN_SMILEADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); + $message = sprintf($lang['EXPORT_SMILES'], "", "") . "

" . sprintf($lang['CLICK_RETURN_SMILEADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); message_die(GENERAL_MESSAGE, $message); @@ -230,7 +230,7 @@ else if( isset($_POST['add']) || isset($_GET['add']) ) $template->assign_vars(array( 'TPL_SMILE_EDIT' => true, "SMILEY_IMG" => BB_ROOT . $bb_cfg['smilies_path'] . '/' . $smiley_images[0], - "S_SMILEY_ACTION" => append_sid("admin_smilies.php"), + "S_SMILEY_ACTION" => "admin_smilies.php", "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list, "S_SMILEY_BASEDIR" => BB_ROOT . $bb_cfg['smilies_path']) @@ -257,7 +257,7 @@ else if ( $mode != "" ) } $datastore->update('smile_replacements'); - $message = $lang['SMILEY_DEL_SUCCESS'] . "

" . sprintf($lang['CLICK_RETURN_SMILEADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); + $message = $lang['SMILEY_DEL_SUCCESS'] . "

" . sprintf($lang['CLICK_RETURN_SMILEADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); message_die(GENERAL_MESSAGE, $message); break; @@ -303,7 +303,7 @@ else if ( $mode != "" ) "SMILEY_CODE" => $smile_data['code'], "SMILEY_EMOTICON" => $smile_data['emoticon'], "SMILEY_IMG" => BB_ROOT . $bb_cfg['smilies_path'] . '/' . $smiley_edit_img, - "S_SMILEY_ACTION" => append_sid("admin_smilies.php"), + "S_SMILEY_ACTION" => "admin_smilies.php", "S_HIDDEN_FIELDS" => $s_hidden_fields, "S_FILENAME_OPTIONS" => $filename_list, "S_SMILEY_BASEDIR" => BB_ROOT . $bb_cfg['smilies_path']) @@ -350,7 +350,7 @@ else if ( $mode != "" ) } $datastore->update('smile_replacements'); - $message = $lang['SMILEY_EDIT_SUCCESS'] . "

" . sprintf($lang['CLICK_RETURN_SMILEADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); + $message = $lang['SMILEY_EDIT_SUCCESS'] . "

" . sprintf($lang['CLICK_RETURN_SMILEADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); message_die(GENERAL_MESSAGE, $message); break; @@ -396,7 +396,7 @@ else if ( $mode != "" ) } $datastore->update('smile_replacements'); - $message = $lang['SMILEY_ADD_SUCCESS'] . "

" . sprintf($lang['CLICK_RETURN_SMILEADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); + $message = $lang['SMILEY_ADD_SUCCESS'] . "

" . sprintf($lang['CLICK_RETURN_SMILEADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); message_die(GENERAL_MESSAGE, $message); break; @@ -422,7 +422,7 @@ else $template->assign_vars(array( 'TPL_SMILE_MAIN' => true, "S_HIDDEN_FIELDS" => @$s_hidden_fields, - "S_SMILEY_ACTION" => append_sid("admin_smilies.php")) + "S_SMILEY_ACTION" => "admin_smilies.php") ); // @@ -445,8 +445,8 @@ else "CODE" => $smilies[$i]['code'], "EMOT" => $smilies[$i]['emoticon'], - "U_SMILEY_EDIT" => append_sid("admin_smilies.php?mode=edit&id=" . $smilies[$i]['smilies_id']), - "U_SMILEY_DELETE" => append_sid("admin_smilies.php?mode=delete&id=" . $smilies[$i]['smilies_id'])) + "U_SMILEY_EDIT" => "admin_smilies.php?mode=edit&id=" . $smilies[$i]['smilies_id'], + "U_SMILEY_DELETE" => "admin_smilies.php?mode=delete&id=" . $smilies[$i]['smilies_id']) ); } } diff --git a/upload/admin/admin_topic_templates.php b/upload/admin/admin_topic_templates.php index 17a7b387e..17a167dd3 100644 --- a/upload/admin/admin_topic_templates.php +++ b/upload/admin/admin_topic_templates.php @@ -28,7 +28,7 @@ if ($mode == 'templates') $template->assign_vars(array( 'TPL_LIST' => true, - 'S_ACTION' => append_sid("admin_topic_templates.php?mode=delete"), + 'S_ACTION' => "admin_topic_templates.php?mode=delete", )); } else if ($mode == 'add' || $mode == 'edit') @@ -44,12 +44,12 @@ else if ($mode == 'add' || $mode == 'edit') if(!$row) bb_die(''); $template->assign_vars(array( - 'S_ACTION' => append_sid("admin_topic_templates.php?mode=edit&tpl=$tpl_id"), + 'S_ACTION' => "admin_topic_templates.php?mode=edit&tpl=$tpl_id", )); } else { $template->assign_vars(array( - 'S_ACTION' => append_sid("admin_topic_templates.php?mode=add"), + 'S_ACTION' => "admin_topic_templates.php?mode=add", )); } $tpl_name = isset($_POST['tpl_name']) ? $_POST['tpl_name'] : @$row['tpl_name']; @@ -159,8 +159,8 @@ else } $message = $lang['CONFIG_UPD'] .'

'; - $message .= sprintf($lang['RETURN_CONFIG'], '', '') .'

'; - $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); + $message .= sprintf($lang['RETURN_CONFIG'], '', '') .'

'; + $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); message_die(GENERAL_MESSAGE, $message); } @@ -180,7 +180,7 @@ else $template->assign_vars(array( 'FORUM_LIST' => true, - 'S_ACTION' => append_sid("admin_topic_templates.php"), + 'S_ACTION' => "admin_topic_templates.php", )); } print_page('admin_topic_templates.tpl', 'admin'); diff --git a/upload/admin/admin_ug_auth.php b/upload/admin/admin_ug_auth.php index a5ab72903..aca758798 100644 --- a/upload/admin/admin_ug_auth.php +++ b/upload/admin/admin_ug_auth.php @@ -86,8 +86,8 @@ if ($submit && $mode == 'user') delete_permissions($group_id, $user_id); $message = $lang['AUTH_UPDATED'] .'

'; - $message .= sprintf($lang['CLICK_RETURN_USERAUTH'], '', '') .'

'; - $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); + $message .= sprintf($lang['CLICK_RETURN_USERAUTH'], '', '') .'

'; + $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); bb_die($message); } @@ -105,8 +105,8 @@ if ($submit && $mode == 'user') delete_permissions($group_id, $user_id); $message = $lang['AUTH_UPDATED'] .'

'; - $message .= sprintf($lang['CLICK_RETURN_USERAUTH'], '', '') .'

'; - $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); + $message .= sprintf($lang['CLICK_RETURN_USERAUTH'], '', '') .'

'; + $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); bb_die($message); } @@ -136,8 +136,8 @@ if ($submit && $mode == 'user') $l_auth_return = ($mode == 'user') ? $lang['CLICK_RETURN_USERAUTH'] : $lang['CLICK_RETURN_GROUPAUTH']; $message = $lang['AUTH_UPDATED'] .'

'; - $message .= sprintf($l_auth_return, '', '') .'

'; - $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); + $message .= sprintf($l_auth_return, '', '') .'

'; + $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); bb_die($message); } @@ -169,8 +169,8 @@ else if ($submit && $mode == 'group' && is_array(@$_POST['auth'])) $l_auth_return = $lang['CLICK_RETURN_GROUPAUTH']; $message = $lang['AUTH_UPDATED'] .'

'; - $message .= sprintf($l_auth_return, '', '') .'

'; - $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); + $message .= sprintf($l_auth_return, '', '') .'

'; + $message .= sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); bb_die($message); } @@ -468,7 +468,7 @@ $template->assign_vars(array( 'NO_SIGN' => $no_sign, 'T_MOD_YES' => $lang['MODERATOR'], 'T_MOD_NO' => $lang['NO'], - 'S_AUTH_ACTION' => append_sid("admin_ug_auth.php"), + 'S_AUTH_ACTION' => "admin_ug_auth.php", 'SELECTED_CAT' => !empty($_REQUEST['c']) ? $_REQUEST['c'] : '', 'U_ALL_FORUMS' => !empty($base_url) ? "$base_url&c=all" : '', )); diff --git a/upload/admin/admin_user_ban.php b/upload/admin/admin_user_ban.php index 2cb94bef4..29ce640d9 100644 --- a/upload/admin/admin_user_ban.php +++ b/upload/admin/admin_user_ban.php @@ -290,7 +290,7 @@ if ( isset($_POST['submit']) ) } } - $message = $lang['BAN_UPDATE_SUCESSFUL'] . '

' . sprintf($lang['CLICK_RETURN_BANADMIN'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); + $message = $lang['BAN_UPDATE_SUCESSFUL'] . '

' . sprintf($lang['CLICK_RETURN_BANADMIN'], '', '') . '

' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '', ''); message_die(GENERAL_MESSAGE, $message); @@ -298,7 +298,7 @@ if ( isset($_POST['submit']) ) else { $template->assign_vars(array( - 'S_BANLIST_ACTION' => append_sid("admin_user_ban.php")) + 'S_BANLIST_ACTION' => "admin_user_ban.php") ); $userban_count = 0; @@ -381,11 +381,11 @@ else $select_emaillist = ''; $template->assign_vars(array( - 'U_SEARCH_USER' => append_sid("./../search.php?mode=searchuser"), + 'U_SEARCH_USER' => "./../search.php?mode=searchuser", 'S_UNBAN_USERLIST_SELECT' => $select_userlist, 'S_UNBAN_IPLIST_SELECT' => $select_iplist, 'S_UNBAN_EMAILLIST_SELECT' => $select_emaillist, - 'S_BAN_ACTION' => append_sid("admin_user_ban.php")) + 'S_BAN_ACTION' => "admin_user_ban.php") ); } diff --git a/upload/admin/admin_user_search.php b/upload/admin/admin_user_search.php index 00e8709be..32bc108b2 100644 --- a/upload/admin/admin_user_search.php +++ b/upload/admin/admin_user_search.php @@ -118,7 +118,7 @@ if(!isset($_POST['dosearch'])&&!isset($_GET['dosearch'])) 'STYLE_LIST' => $styles_list, 'LASTVISITED_LIST' => $lastvisited_list, - 'S_SEARCH_ACTION' => append_sid("admin_user_search.php") + 'S_SEARCH_ACTION' => "admin_user_search.php" )); } else @@ -1227,12 +1227,12 @@ else if($page > 1) { - $pagination .= ''.$lang['PREVIOUS'].''; + $pagination .= ''.$lang['PREVIOUS'].''; } if($page < $num_pages) { - $pagination .= ( $pagination == '' ) ? ''.$lang['NEXT'].'' : ' | '.$lang['NEXT'].''; + $pagination .= ( $pagination == '' ) ? ''.$lang['NEXT'].'' : ' | '.$lang['NEXT'].''; } if($num_pages > 2) @@ -1245,15 +1245,15 @@ else 'PAGE_NUMBER' => sprintf($lang['PAGE_OF'], $page, $num_pages), 'PAGINATION' => $pagination, - 'NEW_SEARCH' => sprintf($lang['SEARCH_USERS_NEW'],$text, $total_pages['total'],append_sid("admin_user_search.php")), + 'NEW_SEARCH' => sprintf($lang['SEARCH_USERS_NEW'],$text, $total_pages['total'], "admin_user_search.php"), - 'U_USERNAME' => ( ( $sort == 'username' ) ? append_sid("$base_url&sort=$sort&order=$o_order") : append_sid("$base_url&sort=username&order=$order") ), - 'U_EMAIL' => ( ( $sort == 'user_email' ) ? append_sid("$base_url&sort=$sort&order=$o_order") : append_sid("$base_url&sort=user_email&order=$order") ), - 'U_POSTS' => ( ( $sort == 'posts' ) ? append_sid("$base_url&sort=$sort&order=$o_order") : append_sid("$base_url&sort=posts&order=$order") ), - 'U_JOINDATE' => ( ( $sort == 'regdate' ) ? append_sid("$base_url&sort=$sort&order=$o_order") : append_sid("$base_url&sort=regdate&order=$order") ), - 'U_LASTVISIT' => ( ( $sort == 'lastvisit' ) ? append_sid("$base_url&sort=$sort&order=$o_order") : append_sid("$base_url&sort=lastvisit&order=$order") ), + 'U_USERNAME' => ($sort == 'username') ? "$base_url&sort=$sort&order=$o_order" : "$base_url&sort=username&order=$order", + 'U_EMAIL' => ($sort == 'user_email') ? "$base_url&sort=$sort&order=$o_order" : "$base_url&sort=user_email&order=$order", + 'U_POSTS' => ($sort == 'posts') ? "$base_url&sort=$sort&order=$o_order" : "$base_url&sort=posts&order=$order", + 'U_JOINDATE' => ($sort == 'regdate') ? "$base_url&sort=$sort&order=$o_order" : "$base_url&sort=regdate&order=$order", + 'U_LASTVISIT' => ($sort == 'lastvisit') ? "$base_url&sort=$sort&order=$o_order") : "$base_url&sort=lastvisit&order=$order", - 'S_POST_ACTION' => append_sid("$base_url&sort=$sort&order=$order") + 'S_POST_ACTION' => "$base_url&sort=$sort&order=$order" )); if(!$result = DB()->sql_query($select_sql)) @@ -1302,9 +1302,9 @@ else 'BAN' => ( ( !isset($banned[$rowset[$i]['user_id']]) ) ? $lang['NOT_BANNED'] : $lang['BANNED'] ), 'ABLED' => ( ( $rowset[$i]['user_active'] ) ? $lang['ENABLED'] : $lang['DISABLED'] ), - 'U_VIEWPOSTS' => append_sid("../search.php?search_author=1&uid={$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']), + 'U_VIEWPOSTS' => "../search.php?search_author=1&uid={$rowset[$i]['user_id']}", + 'U_MANAGE' => "../profile.php?mode=editprofile&".POST_USERS_URL."=".$rowset[$i]['user_id'], + 'U_PERMISSIONS' => "admin_ug_auth.php?mode=user&".POST_USERS_URL."=".$rowset[$i]['user_id'], )); } } diff --git a/upload/admin/admin_words.php b/upload/admin/admin_words.php index 413722442..2717f88fd 100644 --- a/upload/admin/admin_words.php +++ b/upload/admin/admin_words.php @@ -65,7 +65,7 @@ if( $mode != "" ) "WORD" => $word, "REPLACEMENT" => $replacement, - "S_WORDS_ACTION" => append_sid("admin_words.php"), + "S_WORDS_ACTION" => "admin_words.php", "S_HIDDEN_FIELDS" => $s_hidden_fields) ); } @@ -99,7 +99,7 @@ if( $mode != "" ) message_die(GENERAL_ERROR, "Could not insert data into words table", $lang['ERROR'], __LINE__, __FILE__, $sql); } - $message .= "

" . sprintf($lang['CLICK_RETURN_WORDADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); + $message .= "

" . sprintf($lang['CLICK_RETURN_WORDADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); message_die(GENERAL_MESSAGE, $message); } @@ -117,7 +117,7 @@ if( $mode != "" ) message_die(GENERAL_ERROR, "Could not remove data from words table", $lang['ERROR'], __LINE__, __FILE__, $sql); } - $message = $lang['WORD_REMOVED'] . "

" . sprintf($lang['CLICK_RETURN_WORDADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); + $message = $lang['WORD_REMOVED'] . "

" . sprintf($lang['CLICK_RETURN_WORDADMIN'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); message_die(GENERAL_MESSAGE, $message); } @@ -143,7 +143,7 @@ else $template->assign_vars(array( 'TPL_ADMIN_WORDS_LIST' => true, - "S_WORDS_ACTION" => append_sid("admin_words.php"), + "S_WORDS_ACTION" => "admin_words.php", "S_HIDDEN_FIELDS" => '') ); @@ -160,8 +160,8 @@ else "WORD" => $word, "REPLACEMENT" => $replacement, - "U_WORD_EDIT" => append_sid("admin_words.php?mode=edit&id=$word_id"), - "U_WORD_DELETE" => append_sid("admin_words.php?mode=delete&id=$word_id")) + "U_WORD_EDIT" => "admin_words.php?mode=edit&id=$word_id", + "U_WORD_DELETE" => "admin_words.php?mode=delete&id=$word_id") ); } } diff --git a/upload/admin/index.php b/upload/admin/index.php index 7f4953c17..a17bd4c96 100644 --- a/upload/admin/index.php +++ b/upload/admin/index.php @@ -24,8 +24,8 @@ if( isset($_GET['pane']) && $_GET['pane'] == 'left' ) $template->assign_vars(array( 'TPL_ADMIN_NAVIGATE' => true, - "U_FORUM_INDEX" => append_sid("../index.php"), - "U_ADMIN_INDEX" => append_sid("index.php?pane=right")) + "U_FORUM_INDEX" => "../index.php", + "U_ADMIN_INDEX" => "index.php?pane=right") ); ksort($module); @@ -50,7 +50,7 @@ if( isset($_GET['pane']) && $_GET['pane'] == 'left' ) $template->assign_block_vars("catrow.modulerow", array( "ROW_CLASS" => $row_class, "ADMIN_MODULE" => $action, - "U_ADMIN_MODULE" => append_sid($file)) + "U_ADMIN_MODULE" => $file) ); $row_count++; } diff --git a/upload/admin/xs_cache.php b/upload/admin/xs_cache.php index 374bce819..508b35496 100644 --- a/upload/admin/xs_cache.php +++ b/upload/admin/xs_cache.php @@ -11,7 +11,7 @@ if(empty($template->xs_version) || $template->xs_version !== 8) define('IN_XS', true); include('xs_include.php'); -$template->assign_block_vars('nav_left',array('ITEM' => '» ' . $lang['XS_MANAGE_CACHE'] . '')); +$template->assign_block_vars('nav_left',array('ITEM' => '» ' . $lang['XS_MANAGE_CACHE'] . '')); $data = ''; diff --git a/upload/admin/xs_config.php b/upload/admin/xs_config.php index 52b9d3b4a..b05dce8d0 100644 --- a/upload/admin/xs_config.php +++ b/upload/admin/xs_config.php @@ -11,12 +11,12 @@ if(empty($template->xs_version) || $template->xs_version !== 8) define('IN_XS', true); include('xs_include.php'); -$template->assign_block_vars('nav_left',array('ITEM' => '» ' . $lang['XS_CONFIGURATION'] . '')); +$template->assign_block_vars('nav_left',array('ITEM' => '» ' . $lang['XS_CONFIGURATION'] . '')); -$lang['XS_CONFIG_UPDATED_EXPLAIN'] = str_replace('{URL}', append_sid('xs_config.php'), $lang['XS_CONFIG_UPDATED_EXPLAIN']); +$lang['XS_CONFIG_UPDATED_EXPLAIN'] = str_replace('{URL}', 'xs_config.php', $lang['XS_CONFIG_UPDATED_EXPLAIN']); $lang['XS_CONFIG_TITLE'] = str_replace('{VERSION}', $template->xs_versiontxt, $lang['XS_CONFIG_TITLE']); -$lang['XS_CONFIG_WARNING_EXPLAIN'] = str_replace('{URL}', append_sid('xs_chmod.php'), $lang['XS_CONFIG_WARNING_EXPLAIN']); -$lang['XS_CONFIG_BACK'] = str_replace('{URL}', append_sid('xs_config.php'), $lang['XS_CONFIG_BACK']); +$lang['XS_CONFIG_WARNING_EXPLAIN'] = str_replace('{URL}', 'xs_chmod.php', $lang['XS_CONFIG_WARNING_EXPLAIN']); +$lang['XS_CONFIG_BACK'] = str_replace('{URL}', 'xs_config.php', $lang['XS_CONFIG_BACK']); // // Updating configuration @@ -37,7 +37,7 @@ if(isset($_POST['submit']) && !defined('DEMO_MODE')) if($shownav !== $bb_cfg['xs_shownav']) { $template->assign_block_vars('left_refresh', array( - 'ACTION' => append_sid('index.php?pane=left') + 'ACTION' => 'index.php?pane=left' )); } $_POST['xs_shownav'] = $shownav; @@ -77,7 +77,7 @@ $template->assign_vars(array( 'XS_PHP' => htmlspecialchars($bb_cfg['xs_php']), 'XS_ADD_COMMENTS_0' => $bb_cfg['xs_add_comments'] ? '' : ' checked="checked"', 'XS_ADD_COMMENTS_1' => $bb_cfg['xs_add_comments'] ? ' checked="checked"' : '', - 'FORM_ACTION' => append_sid('xs_config.php'), + 'FORM_ACTION' => 'xs_config.php' )); for($i=0; $i append_sid('xs_config.'.$get_data), - 'install' => append_sid('xs_install.'.$get_data), - 'uninstall' => append_sid('xs_uninstall.'.$get_data), - 'default' => append_sid('xs_styles.'.$get_data), - 'cache' => append_sid('xs_cache.'.$get_data), - 'import' => append_sid('xs_import.'.$get_data), - 'export' => append_sid('xs_export.'.$get_data), - 'clone' => append_sid('xs_clone.'.$get_data), - 'download' => append_sid('xs_download.'.$get_data), - 'edittpl' => append_sid('xs_edit.'.$get_data), - 'editdb' => append_sid('xs_edit_data.'.$get_data), - 'exportdb' => append_sid('xs_export_data.'.$get_data), - 'updates' => append_sid('xs_update.'.$get_data), - 'portal' => append_sid('xs_portal.'.$get_data), - 'style_config' => append_sid('xs_style_config.'.$get_data), + 'config' => 'xs_config.'.$get_data, + 'install' => 'xs_install.'.$get_data, + 'uninstall' => 'xs_uninstall.'.$get_data, + 'default' => 'xs_styles.'.$get_data, + 'cache' => 'xs_cache.'.$get_data, + 'import' => 'xs_import.'.$get_data, + 'export' => 'xs_export.'.$get_data, + 'clone' => 'xs_clone.'.$get_data, + 'download' => 'xs_download.'.$get_data, + 'edittpl' => 'xs_edit.'.$get_data, + 'editdb' => 'xs_edit_data.'.$get_data, + 'exportdb' => 'xs_export_data.'.$get_data, + 'updates' => 'xs_update.'.$get_data, + 'portal' => 'xs_portal.'.$get_data, + 'style_config' => 'xs_style_config.'.$get_data, ); if(isset($content_url[$action])) @@ -59,12 +59,12 @@ if(isset($content_url[$action])) } else { - $content = append_sid('xs_index.'.$get_data); + $content = 'xs_index.'.$get_data; } $template->set_filenames(array('body' => XS_TPL_PATH . 'frameset.tpl')); $template->assign_vars(array( - 'FRAME_TOP' => append_sid('xs_frame_top.php'), + 'FRAME_TOP' => 'xs_frame_top.php', 'FRAME_MAIN' => $content, )); diff --git a/upload/admin/xs_include.php b/upload/admin/xs_include.php index 0ac43aac0..28b6bac3b 100644 --- a/upload/admin/xs_include.php +++ b/upload/admin/xs_include.php @@ -151,7 +151,7 @@ if(!defined('NO_XS_HEADER')) $template->preparse = 'xs_header'; $template->postparse = 'xs_footer'; - $template->assign_block_vars('nav_left',array('ITEM' => '' . $lang['XS_MENU'] . '')); + $template->assign_block_vars('nav_left',array('ITEM' => '' . $lang['XS_MENU'] . '')); } // check if cache is writable diff --git a/upload/admin/xs_index.php b/upload/admin/xs_index.php index c29ca93b5..943f66683 100644 --- a/upload/admin/xs_index.php +++ b/upload/admin/xs_index.php @@ -13,24 +13,24 @@ include('xs_include.php'); if(isset($_GET['showwarning'])) { - $msg = str_replace('{URL}', append_sid('xs_index.php'), $lang['XS_MAIN_COMMENT3']); + $msg = str_replace('{URL}', 'xs_index.php', $lang['XS_MAIN_COMMENT3']); xs_message($lang['INFORMATION'], $msg); } $template->assign_vars(array( - 'U_CONFIG' => append_sid('xs_config.php'), - 'U_DEFAULT_STYLE' => append_sid('xs_styles.php'), - 'U_MANAGE_CACHE' => append_sid('xs_cache.php'), - 'U_IMPORT_STYLES' => append_sid('xs_import.php'), - 'U_EXPORT_STYLES' => append_sid('xs_export.php'), - 'U_CLONE_STYLE' => append_sid('xs_clone.php'), - 'U_DOWNLOAD_STYLES' => append_sid('xs_download.php'), - 'U_INSTALL_STYLES' => append_sid('xs_install.php'), - 'U_UNINSTALL_STYLES' => append_sid('xs_uninstall.php'), - 'U_EDIT_STYLES' => append_sid('xs_edit.php'), - 'U_EDIT_STYLES_DATA' => append_sid('xs_edit_data.php'), - 'U_EXPORT_DATA' => append_sid('xs_export_data.php'), - 'U_UPDATES' => append_sid('xs_update.php'), + 'U_CONFIG' => 'xs_config.php', + 'U_DEFAULT_STYLE' => 'xs_styles.php', + 'U_MANAGE_CACHE' => 'xs_cache.php', + 'U_IMPORT_STYLES' => 'xs_import.php', + 'U_EXPORT_STYLES' => 'xs_export.php', + 'U_CLONE_STYLE' => 'xs_clone.php', + 'U_DOWNLOAD_STYLES' => 'xs_download.php', + 'U_INSTALL_STYLES' => 'xs_install.php', + 'U_UNINSTALL_STYLES' => 'xs_uninstall.php', + 'U_EDIT_STYLES' => 'xs_edit.php', + 'U_EDIT_STYLES_DATA' => 'xs_edit_data.php', + 'U_EXPORT_DATA' => 'xs_export_data.php', + 'U_UPDATES' => 'xs_update.php', )); $template->set_filenames(array('body' => XS_TPL_PATH . 'index.tpl')); diff --git a/upload/attach_mod/displaying.php b/upload/attach_mod/displaying.php index 15746500a..6be4ebb17 100644 --- a/upload/attach_mod/displaying.php +++ b/upload/attach_mod/displaying.php @@ -292,13 +292,13 @@ function display_attachments($post_id) // Images // NOTE: If you want to use the download.php everytime an image is displayed inlined, replace the // Section between BEGIN and END with (Without the // of course): - // $img_source = append_sid(BB_ROOT . 'download.php?id=' . $attachments['_' . $post_id][$i]['attach_id']); + // $img_source = BB_ROOT . 'download.php?id=' . $attachments['_' . $post_id][$i]['attach_id']; // $download_link = TRUE; // // if (intval($attach_config['allow_ftp_upload']) && trim($attach_config['download_path']) == '') { - $img_source = append_sid(BB_ROOT . 'download.php?id=' . $attachments['_' . $post_id][$i]['attach_id']); + $img_source = BB_ROOT . 'download.php?id=' . $attachments['_' . $post_id][$i]['attach_id']; $download_link = TRUE; } else @@ -306,7 +306,7 @@ function display_attachments($post_id) // Check if we can reach the file or if it is stored outside of the webroot if ($attach_config['upload_dir'][0] == '/' || ( $attach_config['upload_dir'][0] != '/' && $attach_config['upload_dir'][1] == ':')) { - $img_source = append_sid(BB_ROOT . 'download.php?id=' . $attachments['_' . $post_id][$i]['attach_id']); + $img_source = BB_ROOT . 'download.php?id=' . $attachments['_' . $post_id][$i]['attach_id']; $download_link = TRUE; } else @@ -346,18 +346,18 @@ function display_attachments($post_id) // Images, but display Thumbnail // NOTE: If you want to use the download.php everytime an thumnmail is displayed inlined, replace the // Section between BEGIN and END with (Without the // of course): - // $thumb_source = append_sid(BB_ROOT . 'download.php?id=' . $attachments['_' . $post_id][$i]['attach_id'] . '&thumb=1'); + // $thumb_source = BB_ROOT . 'download.php?id=' . $attachments['_' . $post_id][$i]['attach_id'] . '&thumb=1'; // if (intval($attach_config['allow_ftp_upload']) && trim($attach_config['download_path']) == '') { - $thumb_source = append_sid(BB_ROOT . 'download.php?id=' . $attachments['_' . $post_id][$i]['attach_id'] . '&thumb=1'); + $thumb_source = BB_ROOT . 'download.php?id=' . $attachments['_' . $post_id][$i]['attach_id'] . '&thumb=1'; } else { // Check if we can reach the file or if it is stored outside of the webroot if ($attach_config['upload_dir'][0] == '/' || ( $attach_config['upload_dir'][0] != '/' && $attach_config['upload_dir'][1] == ':')) { - $thumb_source = append_sid(BB_ROOT . 'download.php?id=' . $attachments['_' . $post_id][$i]['attach_id'] . '&thumb=1'); + $thumb_source = BB_ROOT . 'download.php?id=' . $attachments['_' . $post_id][$i]['attach_id'] . '&thumb=1'; } else { @@ -371,7 +371,7 @@ function display_attachments($post_id) 'DOWNLOAD_NAME' => $display_name, 'S_UPLOAD_IMAGE' => $upload_image, - 'IMG_SRC' => append_sid(BB_ROOT . 'download.php?id=' . $attachments['_' . $post_id][$i]['attach_id']), + 'IMG_SRC' => BB_ROOT . 'download.php?id=' . $attachments['_' . $post_id][$i]['attach_id'], 'IMG_THUMB_SRC' => $thumb_source, 'FILESIZE' => $filesize, 'COMMENT' => $comment, @@ -442,7 +442,7 @@ function display_attachments($post_id) // display attachment $template->assign_block_vars('postrow.attach.attachrow', array( - 'U_DOWNLOAD_LINK' => append_sid(BB_ROOT . 'download.php?id=' . $attachments['_' . $post_id][$i]['attach_id']), + 'U_DOWNLOAD_LINK' => BB_ROOT . 'download.php?id=' . $attachments['_' . $post_id][$i]['attach_id'], 'S_UPLOAD_IMAGE' => $upload_image, 'DOWNLOAD_NAME' => $display_name, diff --git a/upload/attach_mod/displaying_torrent.php b/upload/attach_mod/displaying_torrent.php index 23de2bc63..ace177670 100644 --- a/upload/attach_mod/displaying_torrent.php +++ b/upload/attach_mod/displaying_torrent.php @@ -75,7 +75,7 @@ $tor_auth_del = ($tor_auth && $tor_reged); $tracker_link = ($tor_reged) ? $lang['BT_REG_YES'] : $lang['BT_REG_NO']; -$download_link = append_sid("download.php?id=$attach_id"); +$download_link = "download.php?id=$attach_id"; $description = ($comment) ? $comment : preg_replace("#.torrent$#i", '', $display_name); if ($tor_auth_reg || $tor_auth_del) @@ -406,7 +406,7 @@ if ($tor_reged && $tor_info) foreach ($peers as $pid => $peer) { - $u_prof_href = ($s_mode == 'count') ? '#' : append_sid("profile.php?mode=viewprofile&u=". $peer['user_id']) .'#torrent'; + $u_prof_href = ($s_mode == 'count') ? '#' : "profile.php?mode=viewprofile&u=". $peer['user_id'] ."#torrent"; // Full details mode if ($s_mode == 'full') @@ -429,7 +429,7 @@ if ($tor_reged && $tor_info) if (!defined('SEEDER_EXIST')) { define('SEEDER_EXIST', true); - $seed_order_action = append_sid("viewtopic.php?". POST_TOPIC_URL ."=$bt_topic_id&spmode=full") .'#seeders'; + $seed_order_action = "viewtopic.php?". POST_TOPIC_URL ."=$bt_topic_id&spmode=full#seeders"; $template->assign_block_vars("$x_full", array( 'SEED_ORD_ACT' => $seed_order_action, @@ -456,7 +456,7 @@ if ($tor_reged && $tor_info) if (!defined('LEECHER_EXIST')) { define('LEECHER_EXIST', true); - $leech_order_action = append_sid("viewtopic.php?". POST_TOPIC_URL ."=$bt_topic_id&spmode=full") .'#leechers'; + $leech_order_action = "viewtopic.php?". POST_TOPIC_URL ."=$bt_topic_id&spmode=full#leechers"; $template->assign_block_vars("$x_full", array( 'LEECH_ORD_ACT' => $leech_order_action, @@ -578,7 +578,7 @@ if ($bb_cfg['bt_allow_spmode_change'] && $s_mode != 'full') { $template->assign_vars(array( 'PEERS_FULL_LINK' => true, - 'SPMODE_FULL_HREF' => append_sid("viewtopic.php?". POST_TOPIC_URL ."=$bt_topic_id&spmode=full") .'#seeders', + 'SPMODE_FULL_HREF' => "viewtopic.php?". POST_TOPIC_URL ."=$bt_topic_id&spmode=full#seeders", )); } diff --git a/upload/attach_mod/posting_attachments.php b/upload/attach_mod/posting_attachments.php index 9532d189f..353d6ccc6 100644 --- a/upload/attach_mod/posting_attachments.php +++ b/upload/attach_mod/posting_attachments.php @@ -813,7 +813,7 @@ class attach_parent } else { - $download_link = append_sid(BB_ROOT . 'download.php?id=' . $this->attachment_id_list[$i]); + $download_link = BB_ROOT . 'download.php?id=' . $this->attachment_id_list[$i]; } $template->assign_block_vars('attach_row', array( diff --git a/upload/config.php b/upload/config.php index 3e4856247..925ea3fbc 100644 --- a/upload/config.php +++ b/upload/config.php @@ -52,8 +52,8 @@ $bb_cfg = $tr_cfg = $page_cfg = array(); // Increase number of revision after update $bb_cfg['tp_version'] = '2.4 (beta)'; -$bb_cfg['tp_release_state'] = 'R383'; -$bb_cfg['tp_release_date'] = '08-03-2012'; +$bb_cfg['tp_release_state'] = 'R384'; +$bb_cfg['tp_release_date'] = '11-03-2012'; // Database $charset = 'utf8'; diff --git a/upload/groupcp.php b/upload/groupcp.php index 3eab8a833..29d0ea59b 100644 --- a/upload/groupcp.php +++ b/upload/groupcp.php @@ -19,11 +19,11 @@ function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$ $joined = bb_date($row['user_regdate']); $user_time = ( !empty($row['user_time']) ) ? bb_date($row['user_time']) : $lang['NO']; $posts = ( $row['user_posts'] ) ? $row['user_posts'] : 0; - $pm = ($bb_cfg['text_buttons']) ? ''. $lang['SEND_PM_TXTB'] .'' : '' . $lang['SEND_PRIVATE_MESSAGE'] . ''; + $pm = ($bb_cfg['text_buttons']) ? ''. $lang['SEND_PM_TXTB'] .'' : '' . $lang['SEND_PRIVATE_MESSAGE'] . ''; if (bf($row['user_opt'], 'user_opt', 'viewemail') || $group_mod) { - $email_uri = ($bb_cfg['board_email_form']) ? append_sid("profile.php?mode=email&". POST_USERS_URL ."=".$row['user_id']) : 'mailto:'. $row['user_email']; + $email_uri = ($bb_cfg['board_email_form']) ? ("profile.php?mode=email&". POST_USERS_URL ."=".$row['user_id']) : 'mailto:'. $row['user_email']; $email = ''. $row['user_email'] .''; } else $email = ''; diff --git a/upload/includes/bbcode.php b/upload/includes/bbcode.php index 5667eb6d6..98d4a7857 100644 --- a/upload/includes/bbcode.php +++ b/upload/includes/bbcode.php @@ -168,7 +168,7 @@ function generate_smilies($mode) $template->assign_block_vars('switch_smilies_extra', array()); $template->assign_vars(array( - 'U_MORE_SMILIES' => append_sid("posting.php?mode=smilies")) + 'U_MORE_SMILIES' => "posting.php?mode=smilies") ); } diff --git a/upload/includes/functions.php b/upload/includes/functions.php index 3a613a9f4..9f436cd1f 100644 --- a/upload/includes/functions.php +++ b/upload/includes/functions.php @@ -1756,7 +1756,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add $init_page_max = ( $total_pages > $begin_end ) ? $begin_end : $total_pages; for($i = 1; $i < $init_page_max + 1; $i++) { - $page_string .= ( $i == $on_page ) ? '' . $i . '' : '' . $i . ''; + $page_string .= ( $i == $on_page ) ? '' . $i . '' : '' . $i . ''; if ( $i < $init_page_max ) { $page_string .= ", "; @@ -1774,7 +1774,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add for($i = $init_page_min - $from_middle; $i < $init_page_max + ($from_middle + 1); $i++) { - $page_string .= ($i == $on_page) ? '' . $i . '' : '' . $i . ''; + $page_string .= ($i == $on_page) ? '' . $i . '' : '' . $i . ''; if ( $i < $init_page_max + $from_middle ) { $page_string .= ', '; @@ -1788,7 +1788,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add } for($i = $total_pages - ($begin_end - 1); $i < $total_pages + 1; $i++) { - $page_string .= ( $i == $on_page ) ? '' . $i . '' : '' . $i . ''; + $page_string .= ( $i == $on_page ) ? '' . $i . '' : '' . $i . ''; if( $i < $total_pages ) { $page_string .= ", "; @@ -1800,7 +1800,7 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add { for($i = 1; $i < $total_pages + 1; $i++) { - $page_string .= ( $i == $on_page ) ? '' . $i . '' : '' . $i . ''; + $page_string .= ( $i == $on_page ) ? '' . $i . '' : '' . $i . ''; if ( $i < $total_pages ) { $page_string .= ', '; @@ -1812,12 +1812,12 @@ function generate_pagination($base_url, $num_items, $per_page, $start_item, $add { if ( $on_page > 1 ) { - $page_string = ' ' . $lang['PREVIOUS'] . '  ' . $page_string; + $page_string = ' ' . $lang['PREVIOUS'] . '  ' . $page_string; } if ( $on_page < $total_pages ) { - $page_string .= '  ' . $lang['NEXT'] . ''; + $page_string .= '  ' . $lang['NEXT'] . ''; } } @@ -2758,7 +2758,7 @@ function get_avatar ($avatar, $type, $allow_avatar = true, $height = '', $width function set_die_append_msg ($forum_id = null, $topic_id = null) { global $userdata, $lang, $template; - + $msg = ''; $msg .= ($topic_id) ? '

'. $lang['CLICK_RETURN_TOPIC'] .'

' : ''; $msg .= ($forum_id) ? '

'. $lang['CLICK_RETURN_FORUM'] .'

' : ''; diff --git a/upload/includes/functions_admin_cron.php b/upload/includes/functions_admin_cron.php index 7ac716951..9c5834267 100644 --- a/upload/includes/functions_admin_cron.php +++ b/upload/includes/functions_admin_cron.php @@ -80,24 +80,24 @@ function validate_cron_post($cron_arr) { } function insert_cron_job($cron_arr) -{ +{ $row = DB()->fetch_row("SELECT cron_title, cron_script FROM ". BB_CRON ." WHERE cron_title = '". $_POST['cron_title'] ."' or cron_script = '". $_POST['cron_script'] ."' "); - + if($row) { global $lang; - + if ($_POST['cron_script'] == $row['cron_script']) { $langmode = $lang['SCRIPT_DUPLICATE']; } else $langmode = $lang['TITLE_DUPLICATE']; - - $message = $langmode . "

" . sprintf($lang['CLICK_RETURN_JOBS_ADDED'], "", "") . "

" . sprintf($lang['CLICK_RETURN_JOBS'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); - + + $message = $langmode . "

" . sprintf($lang['CLICK_RETURN_JOBS_ADDED'], "", "") . "

" . sprintf($lang['CLICK_RETURN_JOBS'], "", "") . "

" . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], "", ""); + message_die(GENERAL_MESSAGE, $message); } - + $cron_active = $cron_arr['cron_active']; $cron_title = $cron_arr['cron_title']; $cron_script = $cron_arr['cron_script']; @@ -113,7 +113,7 @@ function insert_cron_job($cron_arr) $log_sql_queries = $cron_arr['log_sql_queries']; $disable_board = $cron_arr['disable_board']; $run_counter = $cron_arr['run_counter']; - + DB()->query("INSERT INTO ". BB_CRON ." (cron_active, cron_title, cron_script, schedule, run_day, run_time, run_order, last_run, next_run, run_interval, log_enabled, log_file, log_sql_queries, disable_board, run_counter) VALUES ( $cron_active, '$cron_title', '$cron_script', '$schedule', '$run_day', '$run_time', '$run_order', '$last_run', '$next_run', '$run_interval', $log_enabled, '$log_file', $log_sql_queries, $disable_board, '$run_counter')"); } diff --git a/upload/includes/functions_post.php b/upload/includes/functions_post.php index 4ffcb2266..28bb90363 100644 --- a/upload/includes/functions_post.php +++ b/upload/includes/functions_post.php @@ -305,8 +305,8 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_ } } - meta_refresh(append_sid("viewtopic.php?" . POST_POST_URL . "=" . $post_id) . '#' . $post_id); - $message = $lang['STORED'] . '

' . sprintf($lang['CLICK_VIEW_MESSAGE'], '', '') . '

' . sprintf($lang['CLICK_RETURN_FORUM'], '', ''); + meta_refresh("viewtopic.php?" . POST_POST_URL . "=" . $post_id) . '#' . $post_id; + $message = $lang['STORED'] . '

' . sprintf($lang['CLICK_VIEW_MESSAGE'], '', '') . '

' . sprintf($lang['CLICK_RETURN_FORUM'], '', ''); return $mode; } @@ -444,11 +444,11 @@ function delete_post($mode, $post_data, &$message, &$meta, $forum_id, $topic_id, if (!($mode == 'delete' && $post_data['first_post'] && $post_data['last_post'])) { $message .= '

'; - $message .= sprintf($lang['CLICK_RETURN_TOPIC'], '', ''); + $message .= sprintf($lang['CLICK_RETURN_TOPIC'], '', ''); } $message .= '

'; - $message .= sprintf($lang['CLICK_RETURN_FORUM'], '', ''); + $message .= sprintf($lang['CLICK_RETURN_FORUM'], '', ''); } // diff --git a/upload/includes/functions_torrent.php b/upload/includes/functions_torrent.php index 9bed0c95a..34bbe5b1b 100644 --- a/upload/includes/functions_torrent.php +++ b/upload/includes/functions_torrent.php @@ -5,7 +5,7 @@ if (!defined('BB_ROOT')) die(basename(__FILE__)); function get_torrent_info ($attach_id) { global $lang; - + $attach_id = intval($attach_id); $sql = " @@ -358,7 +358,7 @@ function tracker_register ($attach_id, $mode = '', $tor_status = TOR_NOT_APPROVE } if ($row = DB()->sql_fetchrow($result)) { - $msg = sprintf($lang['BT_REG_FAIL_SAME_HASH'], append_sid(TOPIC_URL . $row['topic_id'])); + $msg = sprintf($lang['BT_REG_FAIL_SAME_HASH'], TOPIC_URL . $row['topic_id']); torrent_error_exit($msg); } @@ -431,7 +431,7 @@ function tracker_register ($attach_id, $mode = '', $tor_status = TOR_NOT_APPROVE if ($reg_mode == 'request' || $reg_mode == 'newtopic') { - $mess = sprintf($lang['BT_REGISTERED'], append_sid("download.php?id=$attach_id")); + $mess = sprintf($lang['BT_REGISTERED'], "download.php?id=$attach_id"); exit_redirect($mess, $post_id, $forum_id); } @@ -493,7 +493,7 @@ function send_torrent_with_passkey ($filename) } else { - $mess = sprintf($lang['PASSKEY_ERR_EMPTY'], append_sid("profile.php?mode=editprofile#bittorrent")); + $mess = sprintf($lang['PASSKEY_ERR_EMPTY'], "profile.php?mode=editprofile#bittorrent"); message_die(GENERAL_ERROR, $mess); } } @@ -739,7 +739,7 @@ function exit_redirect ($message, $post_id, $forum_id) { global $template, $lang; - $exit_message = $message .'

'. sprintf($lang['CLICK_RETURN_TOPIC'], '', '') .'

'. sprintf($lang['CLICK_RETURN_FORUM'], '', ''); + $exit_message = $message .'

'. sprintf($lang['CLICK_RETURN_TOPIC'], '', '') .'

'. sprintf($lang['CLICK_RETURN_FORUM'], '', ''); message_die(GENERAL_MESSAGE, $exit_message); } diff --git a/upload/includes/page_header.php b/upload/includes/page_header.php index 9e2e8bde0..f68e17ce0 100644 --- a/upload/includes/page_header.php +++ b/upload/includes/page_header.php @@ -156,7 +156,7 @@ if ($bb_cfg['reports_enabled']) $template->assign_block_vars('switch_report_general', array()); $template->assign_vars(array( - 'U_WRITE_REPORT' => append_sid("report.php?mode=" . $report_general->mode), + 'U_WRITE_REPORT' => "report.php?mode=" . $report_general->mode, 'L_WRITE_REPORT' => $report_general->lang['WRITE_REPORT']) ); } @@ -171,7 +171,7 @@ $template->assign_vars(array( 'QUIRKS_MODE' => !empty($page_cfg['quirks_mode']), 'SHOW_ADS' => (!$logged_in || isset($bb_cfg['show_ads_users'][$user->id]) || (!($is_admin || $is_mod) && $user->show_ads)), 'USER_HIDE_CAT' => (BB_SCRIPT == 'index'), - + 'USER_RUS' => ($userdata['user_lang'] != 'english') ? true : false, 'INCLUDE_BBCODE_JS' => !empty($page_cfg['include_bbcode_js']), @@ -201,7 +201,7 @@ $template->assign_vars(array( // Report 'REPORT_LIST' => $report_list, - 'U_REPORT_LIST' => append_sid("report.php"), + 'U_REPORT_LIST' => "report.php", // Report [END] 'LOGGED_IN' => $logged_in, diff --git a/upload/includes/report_hack/report_post.php b/upload/includes/report_hack/report_post.php index 36b266fb2..eda37ab5b 100644 --- a/upload/includes/report_hack/report_post.php +++ b/upload/includes/report_hack/report_post.php @@ -164,7 +164,7 @@ class report_post extends report_module function subject_url($report_subject, $non_html_amp = false) { $report_subject = (int) $report_subject; - return append_sid("viewtopic.php?" . POST_POST_URL . "=$report_subject#$report_subject", $non_html_amp); + return "viewtopic.php?" . POST_POST_URL . "=$report_subject#$report_subject", $non_html_amp; } // diff --git a/upload/includes/report_hack/report_privmsg.php b/upload/includes/report_hack/report_privmsg.php index b675a858a..7295b3ee3 100644 --- a/upload/includes/report_hack/report_privmsg.php +++ b/upload/includes/report_hack/report_privmsg.php @@ -163,7 +163,7 @@ class report_privmsg extends report_module function subject_url($report_subject, $non_html_amp = false) { $sep = ($non_html_amp) ? '&' : '&'; - return append_sid("privmsg.php?mode=read$sep" . POST_POST_URL . '=' . (int) $report_subject, $non_html_amp); + return "privmsg.php?mode=read$sep" . POST_POST_URL . '=' . (int) $report_subject, $non_html_amp; } // @@ -193,7 +193,7 @@ class report_privmsg extends report_module // function subject_details_obtain($report_subject) { - $sql = 'SELECT p.privmsgs_subject, p.privmsgs_from_userid, pt.privmsgs_text, u.username + $sql = 'SELECT p.privmsgs_subject, p.privmsgs_from_userid, pt.privmsgs_text, u.username, u.user_id, u.user_rank FROM ' . BB_PRIVMSGS . ' p INNER JOIN ' . BB_PRIVMSGS_TEXT . ' pt ON pt.privmsgs_text_id = privmsgs_id @@ -215,7 +215,7 @@ class report_privmsg extends report_module $subject_details = array( 'MESSAGE_ID' => '#' . $report_subject, - 'MESSAGE_FROM' => '' . $row['username'] . '', + 'MESSAGE_FROM' => profile_url($row), 'MESSAGE_TITLE' => $row['privmsgs_subject'], 'MESSAGE_TEXT' => $row['privmsgs_text']); diff --git a/upload/includes/report_hack/report_topic.php b/upload/includes/report_hack/report_topic.php index 70511a50e..b853dff8c 100644 --- a/upload/includes/report_hack/report_topic.php +++ b/upload/includes/report_hack/report_topic.php @@ -163,7 +163,7 @@ class report_topic extends report_module // function subject_url($report_subject, $non_html_amp = false) { - return append_sid("viewtopic.php?" . POST_TOPIC_URL . '=' . (int) $report_subject, $non_html_amp); + return "viewtopic.php?" . POST_TOPIC_URL . '=' . (int) $report_subject, $non_html_amp; } // diff --git a/upload/includes/report_hack/report_user.php b/upload/includes/report_hack/report_user.php index 09600fcc3..323e7fb24 100644 --- a/upload/includes/report_hack/report_user.php +++ b/upload/includes/report_hack/report_user.php @@ -21,7 +21,7 @@ class report_user extends report_module function subject_url($id, $non_html_amp = false) { $sep = ($non_html_amp) ? '&' : '&'; - return append_sid("profile.php?mode=viewprofile$sep" . POST_USERS_URL . '=' . (int) $id, $non_html_amp); + return "profile.php?mode=viewprofile$sep" . POST_USERS_URL . '=' . (int) $id, $non_html_amp; } // diff --git a/upload/includes/sessions.php b/upload/includes/sessions.php index b99e0f107..6c5f1d412 100644 --- a/upload/includes/sessions.php +++ b/upload/includes/sessions.php @@ -907,15 +907,6 @@ function delete_user_sessions ($user_id) DB()->query("DELETE FROM ". BB_SESSIONS ." WHERE session_user_id IN($user_id)"); } -function append_sid ($url, $non_html_amp = false) -{ - if (defined('SID_GET') && !strpos($url, SID_GET)) - { - $url .= ((strpos($url, '?') !== false) ? (($non_html_amp) ? '&' : '&') : '?') . SID_GET; - } - return $url; -} - // deprecated function session_begin ($userdata, $page_id = 0, $enable_autologin = false, $auto_created = false) { diff --git a/upload/includes/template.php b/upload/includes/template.php index 10f8c9ba0..37e24ae78 100644 --- a/upload/includes/template.php +++ b/upload/includes/template.php @@ -1241,7 +1241,7 @@ class Template { // file extension with session ID (eg: "php?sid=123&" or "php?") // can be used to make custom URLs without modding phpbb // contains "&" or "?" at the end so you can easily append paramenters - $php = append_sid('php'); + $php = 'php'; if(strpos($php, '?')) { $php .= '&'; diff --git a/upload/includes/topic_templates.php b/upload/includes/topic_templates.php index 61081eb35..f235639e9 100644 --- a/upload/includes/topic_templates.php +++ b/upload/includes/topic_templates.php @@ -82,14 +82,14 @@ if ($topic_tpl = DB()->fetch_row($sql)) $template->assign_vars(array( 'PAGE_TITLE' => $lang['NEW_RELEASE'], 'FORUM_NAME' => htmlCHR($post_info['forum_name']), - 'S_ACTION' => append_sid("posting.php?mode=newtopic&tpl=1&". POST_FORUM_URL .'='. $post_info['forum_id']), - 'S_CANCEL_ACTION' => append_sid(FORUM_URL . $post_info['forum_id']), + 'S_ACTION' => "posting.php?mode=newtopic&tpl=1&". POST_FORUM_URL .'='. $post_info['forum_id'], + 'S_CANCEL_ACTION' => FORUM_URL . $post_info['forum_id'], 'TORRENT_EXT' => TORRENT_EXT, 'TORRENT_EXT_LEN' => strlen(TORRENT_EXT) + 1, - 'U_VIEW_FORUM' => append_sid(FORUM_URL . $post_info['forum_id']), + 'U_VIEW_FORUM' => FORUM_URL . $post_info['forum_id'], 'REGULAR_TOPIC_BUTTON' => true, # (IS_AM), - 'REGULAR_TOPIC_HREF' => append_sid("posting.php?mode=newtopic&". POST_FORUM_URL .'='. $post_info['forum_id']), + 'REGULAR_TOPIC_HREF' => "posting.php?mode=newtopic&". POST_FORUM_URL .'='. $post_info['forum_id'], 'L_TITLE' => $lang['TPL']['RELEASE_NAME'], 'L_TITLE_DESC' => $lang['TPL']['RELEASE_NAME_DESC'], @@ -109,7 +109,7 @@ if ($topic_tpl = DB()->fetch_row($sql)) foreach ($lang['TPL']['GUIDE'] as $name => $guide_post_id) { $template->assign_vars(array( - strtoupper($name) .'_HREF' => append_sid(POST_URL ."$guide_post_id&single=1#$guide_post_id"), + strtoupper($name) .'_HREF' => POST_URL ."$guide_post_id&single=1#$guide_post_id", )); } diff --git a/upload/includes/torrent_show_dl_list.php b/upload/includes/torrent_show_dl_list.php index 93ec3c10c..8ce2f2e52 100644 --- a/upload/includes/torrent_show_dl_list.php +++ b/upload/includes/torrent_show_dl_list.php @@ -75,7 +75,7 @@ if ($show_dl_list) } else { - $u_prof_href = ($u['user_id'] == ANONYMOUS) ? '#' : append_sid("profile.php?mode=viewprofile&u=". $u['user_id']) .'#torrent'; + $u_prof_href = ($u['user_id'] == ANONYMOUS) ? '#' : "profile.php?mode=viewprofile&u=". $u['user_id'] ."#torrent"; $dl_cat[$u['user_status']] .= ''. profile_url(array('username' => $u['username'], 'user_rank' => $u['user_rank'])) .', '; $dl_count[$u['user_status']]++; } @@ -132,7 +132,7 @@ if ($show_dl_buttons) $template->assign_vars(array( 'DL_HIDDEN_FIELDS' => $dl_hidden_fields, - 'S_DL_ACTION' => append_sid("dl_list.php?". POST_TOPIC_URL ."=$topic_id"), + 'S_DL_ACTION' => "dl_list.php?". POST_TOPIC_URL ."=$topic_id", )); } diff --git a/upload/includes/ucp/torrent_userprofile.php b/upload/includes/ucp/torrent_userprofile.php index 368d34453..4cb2b2272 100644 --- a/upload/includes/ucp/torrent_userprofile.php +++ b/upload/includes/ucp/torrent_userprofile.php @@ -22,7 +22,7 @@ if ($profile_user_id == $userdata['user_id']) { $template->assign_vars(array( 'EDIT_PROF' => true, - 'EDIT_PROF_HREF' => append_sid("profile.php?mode=editprofile"), + 'EDIT_PROF_HREF' => "profile.php?mode=editprofile", )); } else @@ -124,7 +124,7 @@ if ($seeding_count = count($seeding)) $is_gold = ' '; } } - + $template->assign_block_vars('seed.seedrow', array( 'FORUM_NAME' => htmlCHR($seeding[$i]['forum_name']), 'TOPIC_TITLE' => ($seeding[$i]['update_time']) ? wbr($seeding[$i]['topic_title']) : ''. wbr($seeding[$i]['topic_title']) .'', @@ -157,7 +157,7 @@ if ($leeching_count = count($leeching)) $is_gold = ' '; } } - + $compl_size = ($leeching[$i]['remain'] && $leeching[$i]['size'] && $leeching[$i]['size'] > $leeching[$i]['remain']) ? ($leeching[$i]['size'] - $leeching[$i]['remain']) : 0; $compl_perc = ($compl_size) ? floor($compl_size * 100 / $leeching[$i]['size']) : 0; diff --git a/upload/includes/ucp/usercp_activate.php b/upload/includes/ucp/usercp_activate.php index 66cb836fa..01923f31f 100644 --- a/upload/includes/ucp/usercp_activate.php +++ b/upload/includes/ucp/usercp_activate.php @@ -31,7 +31,7 @@ if ( $row = DB()->sql_fetchrow($result) ) { if (!$userdata['session_logged_in']) { - redirect(append_sid('login.php?redirect=profile.php&mode=activate&' . POST_USERS_URL . '=' . $row['user_id'] . '&act_key=' . trim($_GET['act_key']))); + redirect('login.php?redirect=profile.php&mode=activate&' . POST_USERS_URL . '=' . $row['user_id'] . '&act_key=' . trim($_GET['act_key'])); } else if (!IS_ADMIN) { diff --git a/upload/includes/ucp/usercp_attachcp.php b/upload/includes/ucp/usercp_attachcp.php index 34a2b7d2f..a5ab5b7d8 100644 --- a/upload/includes/ucp/usercp_attachcp.php +++ b/upload/includes/ucp/usercp_attachcp.php @@ -10,7 +10,7 @@ require(BB_ROOT .'attach_mod/attachment_mod.php'); if (!$userdata['session_logged_in']) { - redirect(append_sid("login.php?redirect={$_SERVER['REQUEST_URI']}", TRUE)); + redirect("login.php?redirect={$_SERVER['REQUEST_URI']}"); } // Page config @@ -174,7 +174,7 @@ $template->assign_vars(array( 'PAGE_TITLE' => $lang['USER_ACP_TITLE'], 'USERNAME' => $profiledata['username'], 'S_USER_HIDDEN' => $s_hidden, - 'S_MODE_ACTION' => append_sid(BB_ROOT ."profile.php?mode=attachcp"), + 'S_MODE_ACTION' => BB_ROOT ."profile.php?mode=attachcp", 'S_MODE_SELECT' => $select_sort_mode, 'S_ORDER_SELECT' => $select_sort_order) ); @@ -263,7 +263,7 @@ if (sizeof($attachments) > 0) $post_title = str_short($post_title, 30); - $view_topic = append_sid(BB_ROOT .'viewtopic.php?' . POST_POST_URL . '=' . $ids[$j]['post_id'] . '#' . $ids[$j]['post_id']); + $view_topic = BB_ROOT .'viewtopic.php?' . POST_POST_URL . '=' . $ids[$j]['post_id'] . '#' . $ids[$j]['post_id']; $post_titles[] = '' . $post_title . ''; } @@ -306,8 +306,8 @@ if (sizeof($attachments) > 0) 'S_DELETE_BOX' => $delete_box, 'S_HIDDEN' => $hidden_field, - 'U_VIEW_ATTACHMENT' => append_sid(BB_ROOT .'download.php?id=' . $attachments[$i]['attach_id'])) - // 'U_VIEW_POST' => ($attachments[$i]['post_id'] != 0) ? append_sid("../viewtopic.php?" . POST_POST_URL . "=" . $attachments[$i]['post_id'] . "#" . $attachments[$i]['post_id']) : '') + 'U_VIEW_ATTACHMENT' => BB_ROOT .'download.php?id=' . $attachments[$i]['attach_id']) + // 'U_VIEW_POST' => ($attachments[$i]['post_id'] != 0) ? "../viewtopic.php?" . POST_POST_URL . "=" . $attachments[$i]['post_id'] . "#" . $attachments[$i]['post_id'] : '') ); } } diff --git a/upload/includes/ucp/usercp_email.php b/upload/includes/ucp/usercp_email.php index ef969b8cc..f78bebd4c 100644 --- a/upload/includes/ucp/usercp_email.php +++ b/upload/includes/ucp/usercp_email.php @@ -9,7 +9,7 @@ if ( !defined('IN_PHPBB') ) // Is send through board enabled? No, return to index if (!$bb_cfg['board_email_form']) { - redirect(append_sid("index.php", true)); + redirect("index.php"); } if ( !empty($_GET[POST_USERS_URL]) || !empty($_POST[POST_USERS_URL]) ) @@ -23,7 +23,7 @@ else if ( !$userdata['session_logged_in'] ) { - redirect(append_sid("login.php?redirect=profile.php&mode=email&" . POST_USERS_URL . "=$user_id", true)); + redirect("login.php?redirect=profile.php&mode=email&" . POST_USERS_URL . "=$user_id"); } $sql = "SELECT username, user_email, user_lang @@ -109,7 +109,7 @@ if ( $row = DB()->fetch_row($sql) ) } sleep(7); - $message = $lang['EMAIL_SENT'] . '

' . sprintf($lang['CLICK_RETURN_INDEX'], '', ''); + $message = $lang['EMAIL_SENT'] . '

' . sprintf($lang['CLICK_RETURN_INDEX'], '', ''); message_die(GENERAL_MESSAGE, $message); } } @@ -122,7 +122,7 @@ if ( $row = DB()->fetch_row($sql) ) $template->assign_vars(array( 'USERNAME' => $username, 'S_HIDDEN_FIELDS' => '', - 'S_POST_ACTION' => append_sid("profile.php?mode=email&" . POST_USERS_URL . "=$user_id"), + 'S_POST_ACTION' => "profile.php?mode=email&" . POST_USERS_URL . "=$user_id", )); print_page('usercp_email.tpl'); diff --git a/upload/includes/ucp/usercp_register.php b/upload/includes/ucp/usercp_register.php index e606731b8..2e1fb2602 100644 --- a/upload/includes/ucp/usercp_register.php +++ b/upload/includes/ucp/usercp_register.php @@ -627,7 +627,7 @@ foreach ($profile_fields as $field => $can_edit) $template->assign_vars(array( 'S_CATEGORY_SELECT' => $s_categories, 'S_COLSPAN' => $s_colspan, - 'S_PROFILE_ACTION' => append_sid("profile.php?mode=$mode"), + 'S_PROFILE_ACTION' => "profile.php?mode=$mode", 'S_HIDDEN_FIELDS' => $s_hidden_vars) ); @@ -840,7 +840,7 @@ if ($submit && !$errors) } } - $message = $message . '

' . sprintf($lang['CLICK_RETURN_INDEX'], '', ''); + $message = $message . '

' . sprintf($lang['CLICK_RETURN_INDEX'], '', ''); bb_die($message); } @@ -885,13 +885,13 @@ if ($submit && !$errors) $emailer->send(); $emailer->reset(); - $message = $lang['PROFILE_UPDATED_INACTIVE'] . '

' . sprintf($lang['CLICK_RETURN_INDEX'], '', ''); + $message = $lang['PROFILE_UPDATED_INACTIVE'] . '

' . sprintf($lang['CLICK_RETURN_INDEX'], '', ''); $user->session_end(); } else { - meta_refresh(append_sid("index.php"), 10); - $message = $lang['PROFILE_UPDATED'] . '

' . sprintf($lang['CLICK_RETURN_INDEX'], '', ''); + meta_refresh("index.php", 10); + $message = $lang['PROFILE_UPDATED'] . '

' . sprintf($lang['CLICK_RETURN_INDEX'], '', ''); } $sql_args = DB()->build_array('UPDATE', $db_data); @@ -914,12 +914,12 @@ if ($submit && !$errors) } elseif(!$pr_data['user_active']) { - bb_die($lang['PROFILE_UPDATED_INACTIVE'] . '

' . sprintf($lang['CLICK_RETURN_INDEX'], '', '')); + bb_die($lang['PROFILE_UPDATED_INACTIVE'] . '

' . sprintf($lang['CLICK_RETURN_INDEX'], '', '')); } else { - meta_refresh(append_sid("index.php"), 10); - bb_die($lang['PROFILE_UPDATED'] . '

'.$lang['RETURN_PROFILE'].'

' . sprintf($lang['CLICK_RETURN_INDEX'], '', '')); + meta_refresh("index.php", 10); + bb_die($lang['PROFILE_UPDATED'] . '

'.$lang['RETURN_PROFILE'].'

' . sprintf($lang['CLICK_RETURN_INDEX'], '', '')); } } else diff --git a/upload/includes/ucp/usercp_sendpasswd.php b/upload/includes/ucp/usercp_sendpasswd.php index 635c12239..b670fa408 100644 --- a/upload/includes/ucp/usercp_sendpasswd.php +++ b/upload/includes/ucp/usercp_sendpasswd.php @@ -9,7 +9,7 @@ if ( !defined('IN_PHPBB') ) if ($bb_cfg['emailer_disabled']) bb_die($lang['EMAILER_DISABLED']); $need_captcha = ($_GET['mode'] == 'sendpassword' && !IS_ADMIN); - + if ( isset($_POST['submit']) ) { if ($need_captcha && !CAPTCHA()->verify_code()) bb_die($lang['CONFIRM_CODE_WRONG']); @@ -65,7 +65,7 @@ if ( isset($_POST['submit']) ) $emailer->send(); $emailer->reset(); - $message = $lang['PASSWORD_UPDATED'] . '

' . sprintf($lang['CLICK_RETURN_INDEX'], '', ''); + $message = $lang['PASSWORD_UPDATED'] . '

' . sprintf($lang['CLICK_RETURN_INDEX'], '', ''); message_die(GENERAL_MESSAGE, $message); } @@ -89,7 +89,7 @@ $template->assign_vars(array( 'EMAIL' => $email, 'CAPTCHA_HTML' => ($need_captcha) ? CAPTCHA()->get_html() : '', 'S_HIDDEN_FIELDS' => '', - 'S_PROFILE_ACTION' => append_sid("profile.php?mode=sendpassword")) + 'S_PROFILE_ACTION' => "profile.php?mode=sendpassword") ); print_page('usercp_sendpasswd.tpl'); diff --git a/upload/includes/ucp/usercp_viewprofile.php b/upload/includes/ucp/usercp_viewprofile.php index 875dc368f..9b4ace2fc 100644 --- a/upload/includes/ucp/usercp_viewprofile.php +++ b/upload/includes/ucp/usercp_viewprofile.php @@ -19,7 +19,7 @@ if (!$profiledata = get_userdata($_GET[POST_USERS_URL])) if (!$userdata['session_logged_in']) { - redirect(append_sid("login.php?redirect={$_SERVER['REQUEST_URI']}", true)); + redirect("login.php?redirect={$_SERVER['REQUEST_URI']}"); } if (!$ranks = $datastore->get('ranks')) @@ -47,7 +47,7 @@ if (IS_ADMIN) if (bf($profiledata['user_opt'], 'user_opt', 'viewemail') || IS_AM) { - $email_uri = ($bb_cfg['board_email_form']) ? append_sid('profile.php?mode=email&'. POST_USERS_URL .'='. $profiledata['user_id']) : 'mailto:'. $profiledata['user_email']; + $email_uri = ($bb_cfg['board_email_form']) ? 'profile.php?mode=email&'. POST_USERS_URL .'='. $profiledata['user_id'] : 'mailto:'. $profiledata['user_email']; $email = ''. $profiledata['user_email'] .''; } else @@ -66,7 +66,7 @@ if ($report_user && $report_user->auth_check('auth_write')) { $template->assign_block_vars('switch_report_user', array()); $template->assign_vars(array( - 'U_REPORT_USER' => append_sid('report.php?mode='. $report_user->mode .'&id='. $profiledata['user_id']), + 'U_REPORT_USER' => 'report.php?mode='. $report_user->mode .'&id='. $profiledata['user_id'], 'L_REPORT_USER' => $report_user->lang['WRITE_REPORT']) ); } @@ -105,7 +105,7 @@ $template->assign_vars(array( 'RANK_IMAGE' => $rank_image, 'RANK_SELECT' => $rank_select, 'POSTS' => $profiledata['user_posts'], - 'PM' => ''. $lang['SEND_PRIVATE_MESSAGE'] .'', + 'PM' => ''. $lang['SEND_PRIVATE_MESSAGE'] .'', 'EMAIL' => $email, 'WWW' => $profiledata['user_website'], 'ICQ' => $profiledata['user_icq'], diff --git a/upload/memberlist.php b/upload/memberlist.php index a0c551d62..efd077cb6 100644 --- a/upload/memberlist.php +++ b/upload/memberlist.php @@ -67,7 +67,7 @@ $select_sort_order .= ''; $template->assign_vars(array( 'S_MODE_SELECT' => $select_sort_mode, 'S_ORDER_SELECT' => $select_sort_order, - 'S_MODE_ACTION' => append_sid("memberlist.php"), + 'S_MODE_ACTION' => "memberlist.php", 'S_USERNAME' => $paginationusername, )); @@ -132,19 +132,19 @@ if ($by_letter_req) // ENG for ($i=ord('A'), $cnt=ord('Z'); $i <= $cnt; $i++) { - $select_letter .= ($by_letter == chr($i)) ? ''. chr($i) .' ' : ''. chr($i) .' '; + $select_letter .= ($by_letter == chr($i)) ? ''. chr($i) .' ' : ''. chr($i) .' '; } // RUS $select_letter .= ': '; for ($i=224, $cnt=255; $i <= $cnt; $i++) { - $select_letter .= ($by_letter == iconv('windows-1251', 'UTF-8', chr($i))) ? ''. iconv('windows-1251', 'UTF-8', chr($i-32)) .' ' : ''. iconv('windows-1251', 'UTF-8', chr($i-32)) .' '; + $select_letter .= ($by_letter == iconv('windows-1251', 'UTF-8', chr($i))) ? ''. iconv('windows-1251', 'UTF-8', chr($i-32)) .' ' : ''. iconv('windows-1251', 'UTF-8', chr($i-32)) .' '; } $select_letter .= ': '; -$select_letter .= ($by_letter == 'others') ? ''. $lang['OTHERS'] .' ' : ''. $lang['OTHERS'] .' '; +$select_letter .= ($by_letter == 'others') ? ''. $lang['OTHERS'] .' ' : ''. $lang['OTHERS'] .' '; $select_letter .= ': '; -$select_letter .= ($by_letter == 'all') ? ''. $lang['ALL'] .'' : ''. $lang['ALL'] .''; +$select_letter .= ($by_letter == 'all') ? ''. $lang['ALL'] .'' : ''. $lang['ALL'] .''; $template->assign_vars(array( 'S_LETTER_SELECT' => $select_letter, @@ -171,11 +171,11 @@ if ($result = DB()->fetch_rowset($sql)) $from = $row['user_from']; $joined = bb_date($row['user_regdate'], $lang['DATE_FORMAT']); $posts = $row['user_posts']; - $pm = ($bb_cfg['text_buttons']) ? ''. $lang['SEND_PM_TXTB'] .'' : '' . $lang['SEND_PRIVATE_MESSAGE'] . ''; + $pm = ($bb_cfg['text_buttons']) ? ''. $lang['SEND_PM_TXTB'] .'' : '' . $lang['SEND_PRIVATE_MESSAGE'] . ''; if (bf($row['user_opt'], 'user_opt', 'viewemail') || IS_AM) { - $email_uri = ($bb_cfg['board_email_form']) ? append_sid("profile.php?mode=email&". POST_USERS_URL ."=$user_id") : 'mailto:'. $row['user_email']; + $email_uri = ($bb_cfg['board_email_form']) ? ("profile.php?mode=email&". POST_USERS_URL ."=$user_id") : 'mailto:'. $row['user_email']; $email = ''. $row['user_email'] .''; //$email = ($bb_cfg['text_buttons']) ? ''. $row['user_email'] .'' : '' . $lang['SEND_EMAIL_MSG'] . ''; @@ -206,7 +206,7 @@ if ($result = DB()->fetch_rowset($sql)) 'PM' => $pm, 'EMAIL' => $email, 'WWW' => $www, - 'U_VIEWPROFILE' => append_sid("profile.php?mode=viewprofile&". POST_USERS_URL ."=$user_id")) + 'U_VIEWPROFILE' => "profile.php?mode=viewprofile&". POST_USERS_URL ."=$user_id") ); } } diff --git a/upload/posting.php b/upload/posting.php index 22e659f5c..f8fcb419b 100644 --- a/upload/posting.php +++ b/upload/posting.php @@ -230,7 +230,7 @@ if ($post_info = DB()->fetch_row($sql)) if ($post_info['poster_id'] != $userdata['user_id'] && !$is_auth['auth_mod']) { $message = ($delete || $mode == 'delete') ? $lang['DELETE_OWN_POSTS'] : $lang['EDIT_OWN_POSTS']; - $message .= '

'. sprintf($lang['CLICK_RETURN_TOPIC'], '', ''); + $message .= '

'. sprintf($lang['CLICK_RETURN_TOPIC'], '', ''); message_die(GENERAL_MESSAGE, $message); } @@ -468,13 +468,13 @@ else if ( $mode == 'vote' ) } DB()->sql_freeresult($result); - meta_refresh(append_sid("viewtopic.php?" . POST_TOPIC_URL . "=$topic_id")); - $message .= '

' . sprintf($lang['CLICK_RETURN_TOPIC'], '', ''); + meta_refresh("viewtopic.php?" . POST_TOPIC_URL . "=$topic_id"); + $message .= '

' . sprintf($lang['CLICK_RETURN_TOPIC'], '', ''); message_die(GENERAL_MESSAGE, $message); } else { - redirect(append_sid("viewtopic.php?" . POST_TOPIC_URL . "=$topic_id", true)); + redirect("viewtopic.php?" . POST_TOPIC_URL . "=$topic_id"); } } //snp @@ -568,7 +568,7 @@ else if ( ($submit || $confirm) && !$topic_has_new_posts ) AND tor_status IN(". TOR_APPROVED .",". TOR_DOUBTFUL .",". TOR_TMP .") LIMIT 1 ", 'checked_releases'); - + if ($count_checked_releases || IS_AM) tracker_register(TORRENT_ATTACH_ID, 'newtopic', TOR_NOT_APPROVED); else tracker_register(TORRENT_ATTACH_ID, 'newtopic', TOR_PREMOD); } @@ -821,7 +821,7 @@ $template->assign_vars(array( 'POSTING_TYPE_TITLE' => $page_title, 'POSTING_TOPIC_ID' => ($mode != 'newtopic') ? $topic_id : '', 'POSTING_TOPIC_TITLE' => ($mode != 'newtopic') ? wbr($post_info['topic_title']) : '', - 'U_VIEW_FORUM' => append_sid("viewforum.php?" . POST_FORUM_URL . "=$forum_id")) + 'U_VIEW_FORUM' => "viewforum.php?" . POST_FORUM_URL . "=$forum_id") ); if ($mode == 'newtopic' || $post_data['first_post']) @@ -848,12 +848,12 @@ $template->assign_vars(array( 'SUBJECT' => $subject, 'MESSAGE' => $message, - 'U_VIEWTOPIC' => ( $mode == 'reply' ) ? append_sid("viewtopic.php?" . POST_TOPIC_URL . "=$topic_id&postorder=desc") : '', + 'U_VIEWTOPIC' => ( $mode == 'reply' ) ? "viewtopic.php?" . POST_TOPIC_URL . "=$topic_id&postorder=desc" : '', 'S_NOTIFY_CHECKED' => ( $notify_user ) ? 'checked="checked"' : '', 'S_TYPE_TOGGLE' => $topic_type_toggle, 'S_TOPIC_ID' => $topic_id, - 'S_POST_ACTION' => append_sid("posting.php"), + 'S_POST_ACTION' => "posting.php", 'S_HIDDEN_FORM_FIELDS' => $hidden_form_fields) ); diff --git a/upload/privmsg.php b/upload/privmsg.php index a9bdd4e44..8a64e9875 100644 --- a/upload/privmsg.php +++ b/upload/privmsg.php @@ -77,7 +77,7 @@ $template->assign_vars(array( // if ( $cancel ) { - redirect(append_sid("privmsg.php?folder=$folder", true)); + redirect("privmsg.php?folder=$folder"); } // @@ -183,7 +183,7 @@ if ( $mode == 'read' ) // if ( !($privmsg = DB()->sql_fetchrow($result)) ) { - redirect(append_sid("privmsg.php?folder=$folder", true)); + redirect("privmsg.php?folder=$folder"); } $privmsg_id = $privmsg['privmsgs_id']; @@ -292,10 +292,10 @@ if ( $mode == 'read' ) // Pick a folder, any folder, so long as it's one below ... // $post_urls = array( - 'post' => append_sid("privmsg.php?mode=post"), - 'reply' => append_sid("privmsg.php?mode=reply&" . POST_POST_URL . "=$privmsg_id"), - 'quote' => append_sid("privmsg.php?mode=quote&" . POST_POST_URL . "=$privmsg_id"), - 'edit' => append_sid("privmsg.php?mode=edit&" . POST_POST_URL . "=$privmsg_id") + 'post' => "privmsg.php?mode=post", + 'reply' => "privmsg.php?mode=reply&" . POST_POST_URL . "=$privmsg_id", + 'quote' => "privmsg.php?mode=quote&" . POST_POST_URL . "=$privmsg_id", + 'edit' => "privmsg.php?mode=edit&" . POST_POST_URL . "=$privmsg_id" ); $post_icons = array( 'post_img' => '' . $lang['POST_NEW_PM'] . '', @@ -389,7 +389,7 @@ if ( $mode == 'read' ) } else { - $temp_url = append_sid("report.php?mode=" . $report_privmsg->mode . "&id=$privmsg_id"); + $temp_url = "report.php?mode=" . $report_privmsg->mode . "&id=$privmsg_id"; $report_img = '' . $report_privmsg->lang['WRITE_REPORT'] . ''; $report = '' . $report_privmsg->lang['WRITE_REPORT'] . ''; } @@ -430,7 +430,7 @@ if ( $mode == 'read' ) 'SAVEBOX' => $savebox_url, 'BOX_NAME' => $l_box_name, - 'S_PRIVMSGS_ACTION' => append_sid("privmsg.php?folder=$folder"), + 'S_PRIVMSGS_ACTION' => "privmsg.php?folder=$folder", 'S_HIDDEN_FIELDS' => $s_hidden_fields) ); @@ -441,15 +441,15 @@ if ( $mode == 'read' ) $post_date = bb_date($privmsg['privmsgs_date']); - $temp_url = append_sid("profile.php?mode=viewprofile&" . POST_USERS_URL . '=' . $user_id_from); + $temp_url = "profile.php?mode=viewprofile&" . POST_USERS_URL . '=' . $user_id_from; $profile_img = '' . $lang['READ_PROFILE'] . ''; $profile = '' . $lang['READ_PROFILE'] . ''; - $temp_url = append_sid("privmsg.php?mode=post&" . POST_USERS_URL . "=$user_id_from"); + $temp_url = "privmsg.php?mode=post&" . POST_USERS_URL . "=$user_id_from"; $pm_img = '' . $lang['SEND_PRIVATE_MESSAGE'] . ''; $pm = '' . $lang['SEND_PRIVATE_MESSAGE'] . ''; - $temp_url = append_sid("search.php?search_author=1&uid=$user_id_from"); + $temp_url = "search.php?search_author=1&uid=$user_id_from"; $search_img = '' . sprintf($lang['SEARCH_USER_POSTS'], $username_from) . ''; $search = '' . sprintf($lang['SEARCH_USER_POSTS'], $username_from) . ''; @@ -895,7 +895,7 @@ else if ( $save && $mark_list && $folder != 'savebox' && $folder != 'outbox' ) message_die(GENERAL_ERROR, 'Could not save private messages', '', __LINE__, __FILE__, $saved_sql); } - redirect(append_sid("privmsg.php?folder=savebox", true)); + redirect("privmsg.php?folder=savebox"); } } else if ( $submit || $refresh || $mode != '' ) @@ -1229,7 +1229,7 @@ else if ( $submit || $refresh || $mode != '' ) if ( !($privmsg = DB()->sql_fetchrow($result)) ) { - redirect(append_sid("privmsg.php?folder=$folder", true)); + redirect("privmsg.php?folder=$folder"); } $privmsg_subject = $privmsg['privmsgs_subject']; @@ -1255,7 +1255,7 @@ else if ( $submit || $refresh || $mode != '' ) if ( !($privmsg = DB()->sql_fetchrow($result)) ) { - redirect(append_sid("privmsg.php?folder=$folder", true)); + redirect("privmsg.php?folder=$folder"); } $privmsg_subject = ( ( !preg_match('/^Re:/', $privmsg['privmsgs_subject']) ) ? 'Re: ' : '' ) . $privmsg['privmsgs_subject']; @@ -1398,10 +1398,10 @@ else if ( $submit || $refresh || $mode != '' ) 'POSTING_TYPE_TITLE' => $post_a, 'S_HIDDEN_FORM_FIELDS' => $s_hidden_fields, - 'S_POST_ACTION' => append_sid("privmsg.php"), + 'S_POST_ACTION' => "privmsg.php", - 'U_SEARCH_USER' => append_sid("search.php?mode=searchuser"), - 'U_VIEW_FORUM' => append_sid("privmsg.php")) + 'U_SEARCH_USER' => "search.php?mode=searchuser", + 'U_VIEW_FORUM' => "privmsg.php") ); } else @@ -1450,7 +1450,7 @@ else // // New message // - $post_new_mesg_url = '' . $lang['SEND_A_NEW_MESSAGE'] . ''; + $post_new_mesg_url = '' . $lang['SEND_A_NEW_MESSAGE'] . ''; // // General SQL to obtain messages @@ -1586,7 +1586,7 @@ else $l_box_name = $lang['SENTBOX']; break; } - $post_pm = append_sid("privmsg.php?mode=post"); + $post_pm = "privmsg.php?mode=post"; $post_pm_img = '' . $lang['POST_NEW_PM'] . ''; $post_pm = '' . $lang['POST_NEW_PM'] . ''; @@ -1642,12 +1642,12 @@ else 'L_FROM_OR_TO' => ( $folder == 'inbox' || $folder == 'savebox' ) ? $lang['FROM'] : $lang['TO'], - 'S_PRIVMSGS_ACTION' => append_sid("privmsg.php?folder=$folder"), + 'S_PRIVMSGS_ACTION' => "privmsg.php?folder=$folder", 'S_HIDDEN_FIELDS' => '', 'S_POST_NEW_MSG' => $post_new_mesg_url, 'S_SELECT_MSG_DAYS' => $select_msg_days, - 'U_POST_NEW_TOPIC' => append_sid("privmsg.php?mode=post")) + 'U_POST_NEW_TOPIC' => "privmsg.php?mode=post") ); // @@ -1680,7 +1680,7 @@ else $msg_subject = preg_replace($orig_word, $replacement_word, $msg_subject); } - $u_subject = append_sid("privmsg.php?folder=$folder&mode=read&" . POST_POST_URL . "=$privmsg_id"); + $u_subject = "privmsg.php?folder=$folder&mode=read&" . POST_POST_URL . "=$privmsg_id"; $msg_date = bb_date($row['privmsgs_date']); diff --git a/upload/report.php b/upload/report.php index 683e34380..499c0bd51 100644 --- a/upload/report.php +++ b/upload/report.php @@ -13,8 +13,8 @@ $user->session_start(array('req_login' => true)); if(!$bb_cfg['reports_enabled']) bb_die($lang['REPORTS_DISABLE']); $return_links = array( - 'index' => '

' . sprintf($lang['CLICK_RETURN_INDEX'], '', ''), - 'list' => '

' . sprintf($lang['CLICK_RETURN_REPORT_LIST'], '', '') + 'index' => '

' . sprintf($lang['CLICK_RETURN_INDEX'], '', ''), + 'list' => '

' . sprintf($lang['CLICK_RETURN_REPORT_LIST'], '', '') ); if (isset($_POST['mode']) || isset($_GET['mode'])) @@ -120,7 +120,7 @@ if (isset($report_module)) } else if (isset($_POST['cancel'])) { - $redirect_url = (method_exists($report_module, 'subject_url')) ? $report_module->subject_url($report_subject_id, true) : append_sid("index.php", true); + $redirect_url = (method_exists($report_module, 'subject_url')) ? $report_module->subject_url($report_subject_id, true) : "index.php"; redirect($redirect_url); } @@ -193,7 +193,7 @@ if (isset($report_module)) $hidden_fields = ''; $template->assign_vars(array( - 'S_REPORT_ACTION' => append_sid("report.php"), + 'S_REPORT_ACTION' => "report.php", 'S_HIDDEN_FIELDS' => $hidden_fields, 'L_WRITE_REPORT' => $report_module->lang['WRITE_REPORT'], @@ -209,7 +209,7 @@ else { if ($userdata['user_level'] != ADMIN && ($bb_cfg['report_list_admin'] || $userdata['user_level'] != MOD)) { - redirect(append_sid("index.php", true)); + redirect("index.php"); } $params = array('open', 'process', 'clear', 'delete'); @@ -259,8 +259,7 @@ else if (empty($reports)) { - $template->assign_var('META', ''); - + meta_refresh('report.php', 3); message_die(GENERAL_MESSAGE, $lang['NO_REPORTS_SELECTED'] . $return_links['list'] . $return_links['index']); } @@ -270,7 +269,7 @@ else if (isset($_POST['cancel'])) { $redirect_url = ($single_report) ? "report.php?" . POST_REPORT_URL . '=' . $reports[0] : "report.php"; - redirect(append_sid($redirect_url, true)); + redirect($redirect_url); } // @@ -290,7 +289,7 @@ else } $template->assign_vars(array( - 'S_CONFIRM_ACTION' => append_sid("report.php"), + 'S_CONFIRM_ACTION' => "report.php", 'S_HIDDEN_FIELDS' => $hidden_fields) ); @@ -321,9 +320,10 @@ else reports_update_status($reports, $status, $comment); $meta_url = ($single_report) ? "report.php?" . POST_REPORT_URL . '=' . $reports[0] : "report.php"; - $template->assign_var('META', ''); - $return_link = ($single_report) ? '

' . sprintf($lang['CLICK_RETURN_REPORT'], '', '') : ''; + meta_refresh($meta_url, 3); + + $return_link = ($single_report) ? '

' . sprintf($lang['CLICK_RETURN_REPORT'], '', '') : ''; $message = ($single_report) ? 'REPORT_CHANGED' : 'REPORTS_CHANGED'; message_die(GENERAL_MESSAGE, $lang[$message] . $return_link . $return_links['list'] . $return_links['index']); } @@ -352,7 +352,7 @@ else { reports_delete($reports); - $template->assign_var('META', ''); + meta_refresh('report.php', 3); $message = ($single_report) ? 'REPORT_DELETED' : 'REPORTS_DELETED'; message_die(GENERAL_MESSAGE, $lang[$message] . $return_links['list'] . $return_links['index']); @@ -396,7 +396,7 @@ else // else if (count($reports) == 1) { - $redirect_url = append_sid("report.php?" . POST_REPORT_URL . '=' . $reports[0]['report_id'], true); + $redirect_url = "report.php?" . POST_REPORT_URL . '=' . $reports[0]['report_id']; redirect($redirect_url); } @@ -407,7 +407,7 @@ else ); $template->assign_vars(array( - 'S_REPORT_ACTION', append_sid("report.php"), + 'S_REPORT_ACTION', "report.php", 'L_STATUS_CLEARED' => $lang['REPORT_STATUS'][REPORT_CLEARED], 'L_STATUS_IN_PROCESS' => $lang['REPORT_STATUS'][REPORT_IN_PROCESS], @@ -420,7 +420,7 @@ else foreach ($reports as $report) { $template->assign_block_vars('open_reports', array( - 'U_SHOW' => append_sid("report.php?" . POST_REPORT_URL . '=' . $report['report_id']), + 'U_SHOW' => "report.php?" . POST_REPORT_URL . '=' . $report['report_id'], 'ID' => $report['report_id'], 'TITLE' => $report['report_title'], @@ -441,9 +441,9 @@ else ); $template->assign_vars(array( - 'S_REPORT_ACTION' => append_sid("report.php"), + 'S_REPORT_ACTION' => "report.php", - 'U_REPORT_INDEX' => append_sid("report.php"), + 'U_REPORT_INDEX' => "report.php", 'L_STATUS_CLEARED' => $lang['REPORT_STATUS'][REPORT_CLEARED], 'L_STATUS_IN_PROCESS' => $lang['REPORT_STATUS'][REPORT_IN_PROCESS], @@ -472,7 +472,7 @@ else } $template->assign_block_vars('report_modules', array( - 'U_SHOW' => append_sid("report.php?" . POST_CAT_URL . '=' . $report_module->id), + 'U_SHOW' => "report.php?" . POST_CAT_URL . '=' . $report_module->id, 'TITLE' => $report_module->lang['REPORT_LIST_TITLE']) ); @@ -504,7 +504,7 @@ else foreach ($reports[$report_module->id] as $report) { $template->assign_block_vars('report_modules.reports', array( - 'U_SHOW' => append_sid("report.php?" . POST_REPORT_URL . '=' . $report['report_id'] . $cat_url), + 'U_SHOW' => "report.php?" . POST_REPORT_URL . '=' . $report['report_id'] . $cat_url, 'ROW_CLASS' => $report_status_classes[$report['report_status']], 'ID' => $report['report_id'], @@ -694,7 +694,7 @@ else $template->assign_vars(array( 'S_HIDDEN_FIELDS' => '', - 'U_REPORT_AUTHOR_PRIVMSG' => append_sid("privmsg.php?mode=post&" . POST_USERS_URL . '=' . $report['user_id']), + 'U_REPORT_AUTHOR_PRIVMSG' => "privmsg.php?mode=post&" . POST_USERS_URL . '=' . $report['user_id'], 'REPORT_TYPE' => $report_module->lang['REPORT_TYPE'], 'REPORT_TITLE' => $report['report_title'], @@ -739,7 +739,7 @@ else $report_module =& $report_modules[$report['report_module_id']]; $template->assign_block_vars('switch_deleted_reports.deleted_reports', array( - 'U_SHOW' => append_sid("report.php?" . POST_REPORT_URL . '=' . $report['report_id'] . $cat_url), + 'U_SHOW' => "report.php?" . POST_REPORT_URL . '=' . $report['report_id'] . $cat_url, 'ID' => $report['report_id'], 'TITLE' => $report['report_title'], diff --git a/upload/viewtopic.php b/upload/viewtopic.php index 437af5b37..8fd3f962e 100644 --- a/upload/viewtopic.php +++ b/upload/viewtopic.php @@ -523,7 +523,7 @@ if ($report_topic && $report_topic->auth_check('auth_write')) if ($report_topic->auth_check('auth_view') && $is_auth) { $target = ($bb_cfg['report_new_window']) ? ' target="_blank"' : ''; - $s_report_topic =' ' . $report_topic->lang['DUPLICATE_REPORT'] . ' '; + $s_report_topic =' ' . $report_topic->lang['DUPLICATE_REPORT'] . ' '; } else { @@ -532,7 +532,7 @@ if ($report_topic && $report_topic->auth_check('auth_write')) } else { - $s_report_topic = ' ' . $report_topic->lang['WRITE_REPORT'] . ' '; + $s_report_topic = ' ' . $report_topic->lang['WRITE_REPORT'] . ' '; } $topic_mod .= $s_report_topic; @@ -952,7 +952,7 @@ for($i = 0; $i < $total_posts; $i++) $report_auth = ($userdata['user_level'] == ADMIN || (!$bb_cfg['report_list_admin'] && (!$bb_cfg['report_subject_auth'] || $is_auth['auth_mod']))); if ($report_post->auth_check('auth_view') && $report_auth) { - $temp_url = append_sid("report.php?mode=reported&" . POST_CAT_URL . '=' . $report_post->id . '&id=' . $postrow[$i]['post_id']); + $temp_url = "report.php?mode=reported&" . POST_CAT_URL . '=' . $report_post->id . '&id=' . $postrow[$i]['post_id']; $target = ($bb_cfg['report_new_window']) ? ' target="_blank"' : ''; $report_img = '' . $report_post->lang['DUPLICATE_REPORT'] . ''; $report = '[' . $report_post->lang['DUPLICATE_REPORT'] . ']'; @@ -965,7 +965,7 @@ for($i = 0; $i < $total_posts; $i++) } else { - $temp_url = append_sid("report.php?mode=" . $report_post->mode . '&id=' . $postrow[$i]['post_id']); + $temp_url = "report.php?mode=" . $report_post->mode . '&id=' . $postrow[$i]['post_id']; $report_img = '' . $report_post->lang['WRITE_REPORT'] . ''; $report = '[' . $report_post->lang['WRITE_REPORT'] . ']'; }