r570

Переход на set_die_append_msg git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@570 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
2025-08-14 10:37:30 -07:00 · 2014-01-27 20:36:14 +00:00 · 2014-01-27 20:36:14 +00:00 · 7c9f78d321
commit 7c9f78d321
parent dea57a6134
21 changed files with 3614 additions and 222 deletions
--- a/install/sql/mysql.sql
+++ b/install/sql/mysql.sql
@ -925,7 +925,7 @@ CREATE TABLE IF NOT EXISTS `bb_posts` (
 -- Дамп данных таблицы `bb_posts`
 --

-INSERT INTO `bb_posts` VALUES (1, 1, 1, 2, 1309421220, '', '', 0, 0, 0, 0, 1, '', 0, 0, '');
+INSERT INTO `bb_posts` VALUES (1, 1, 1, 2, UNIX_TIMESTAMP(), '', '', 0, 0, 0, 0, 1, '', 0, 0, '');

 -- --------------------------------------------------------

@ -1305,7 +1305,7 @@ CREATE TABLE IF NOT EXISTS `bb_topics` (
 -- Дамп данных таблицы `bb_topics`
 --

-INSERT INTO `bb_topics` VALUES (1, 1, 'Добро пожаловать в TorrentPier II', 2, 1309421220, 2, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 972086460, 0);
+INSERT INTO `bb_topics` VALUES (1, 1, 'Добро пожаловать в TorrentPier II', 2, UNIX_TIMESTAMP(), 2, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 972086460, 0);

 -- --------------------------------------------------------

--- a/upload/callseed.php
+++ b/upload/callseed.php
@ -8,6 +8,8 @@ require(BB_ROOT . 'common.php');
 // Init userdata
 $user->session_start(array('req_login' => true));

+set_die_append_msg();
+
 require(INC_DIR .'bbcode.php');

 function topic_info($topic_id)
@ -24,7 +26,8 @@ function topic_info($topic_id)
 		"topic_title"  => $row['topic_title'],
 		"forum_title"  => $row['forum_name'],
 		"attach_id"    => $row['attach_id'],
-		"topic_poster" => $row['poster_id']
+		"topic_poster" => $row['poster_id'],
+		"forum_id"     => $row['forum_id'],
 	);

 	return $t;
@ -74,6 +77,7 @@ function call_seed($topic_id, $t_info, $to_user_id)
 	$u_id = array();
 	$topic_id = request_var('t', 0);
 	$t_info = topic_info($topic_id);
+	$forum_id = $t_info['forum_id'];
 	$msg_error = "OK";

 	$sql = "SELECT call_seed_time FROM ". BB_BT_TORRENTS ." WHERE topic_id = $topic_id LIMIT 1";
@ -130,8 +134,7 @@ function call_seed($topic_id, $t_info, $to_user_id)
 	}

 	$msg = '';
-	meta_refresh("viewtopic.php?t=$topic_id", 8);
-	$return_to = sprintf ($lang['CALLSEED_RETURN'], $topic_id);
+	meta_refresh(TOPIC_URL . $topic_id, 8);

 	switch($msg_error) {
 		case "OK":
@ -157,5 +160,5 @@ function call_seed($topic_id, $t_info, $to_user_id)
 			break;
 	}

-$msg .= $return_to;
-message_die(GENERAL_MESSAGE, $msg);
+set_die_append_msg($forum_id, $topic_id);
+bb_die($msg);
--- a/upload/config.php
+++ b/upload/config.php
@ -55,8 +55,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do

 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.5 (unstable)';
-$bb_cfg['tp_release_date'] = '26-01-2014';
-$bb_cfg['tp_release_state'] = 'R568';
+$bb_cfg['tp_release_date'] = '27-01-2014';
+$bb_cfg['tp_release_state'] = 'R570';

 // Database
 $charset  = 'utf8';
@ -64,7 +64,7 @@ $pconnect = false;

 // Настройка баз данных ['db']['srv_name'] => (array) srv_cfg;
 // порядок параметров srv_cfg (хост, название базы, пользователь, пароль, charset, pconnect);
-$bb_cfg['db']['db1'] = array('localhost', 'tp2', 'root', 'vertrigo', $charset, $pconnect);
+$bb_cfg['db']['db1'] = array('localhost', 'dbase', 'user', 'pass', $charset, $pconnect);
 //$bb_cfg['db']['db2'] = array('localhost2', 'dbase2', 'user2', 'pass2', $charset, $pconnect);
 //$bb_cfg['db']['db3'] = array('localhost3', 'dbase3', 'user2', 'pass3', $charset, $pconnect);

@ -106,7 +106,7 @@ $bb_cfg['datastore_type'] = 'filecache';
 // Server
 $bb_cfg['server_name'] = $domain_name;              // The domain name from which this board runs
 $bb_cfg['server_port'] = (!empty($_SERVER['SERVER_PORT'])) ? $_SERVER['SERVER_PORT'] : 80;                       // The port your server is running on
-$bb_cfg['script_path'] = '/tp2/';                       // The path where FORUM is located relative to the domain name
+$bb_cfg['script_path'] = '/';                       // The path where FORUM is located relative to the domain name

 // Increase number after changing js or css
 $bb_cfg['js_ver']             = 1;
@ -201,7 +201,7 @@ $bb_cfg['dl_cancel_days_keep']   = 30;
 $bb_cfg['torstat_days_keep']     = 60;          // days to keep user's per-torrent stats

 // Tor-Help
-$bb_cfg['torhelp_enabled']       = true;        // find dead torrents (without seeder) that user might help seeding
+$bb_cfg['torhelp_enabled']       = false;        // find dead torrents (without seeder) that user might help seeding

 $page_cfg['show_torhelp'] = array(
 #	BB_SCRIPT => true
@ -223,7 +223,7 @@ define('TEMPLATES_DIR', BB_PATH .'/templates/');
 define('TRIGGERS_DIR',  BB_PATH .'/triggers/' );

 // URLs
-$bb_cfg['ajax_url']    = '/ajax.php';    #  "http://{$_SERVER['SERVER_NAME']}/ajax.php"
+$bb_cfg['ajax_url']    = 'ajax.php';    #  "http://{$_SERVER['SERVER_NAME']}/ajax.php"
 $bb_cfg['login_url']   = 'login.php';    #  "http://{$domain_name}/login.php"
 $bb_cfg['pm_url']      = 'privmsg.php';  #  "http://{$domain_name}/privmsg.php"
 $bb_cfg['posting_url'] = 'posting.php';  #  "http://{$domain_name}/posting.php"
@ -281,7 +281,7 @@ $bb_cfg['topic_tpl']['overall_header'] = TEMPLATES_DIR .'topic_tpl_overall_heade
 $bb_cfg['topic_tpl']['rules_video']    = TEMPLATES_DIR .'topic_tpl_rules_video.html';

 // Cookie
-$bb_cfg['cookie_domain'] = '.'. $domain_name;      # '.yourdomain.com'
+$bb_cfg['cookie_domain'] = ($domain_name != $_SERVER['SERVER_ADDR']) ? ".$domain_name" : '';      # '.yourdomain.com'
 $bb_cfg['cookie_secure'] = (!empty($_SERVER['HTTPS']) ? 1 : 0); # 0
 $bb_cfg['cookie_prefix'] = 'bb_';                  # 'bb_'

@ -341,7 +341,7 @@ define('SQL_LOG_ERRORS',       true);              // all SQL_xxx options enable
 define('SQL_CALC_QUERY_TIME',  true);              // for stats
 define('SQL_LOG_SLOW_QUERIES', true);
 define('SQL_SLOW_QUERY_TIME',  10);                // sec
-define('SQL_PREPEND_SRC_COMM', true);             // prepend source file(line) comment to sql query
+define('SQL_PREPEND_SRC_COMM', false);             // prepend source file(line) comment to sql query

 // Special users
 $bb_cfg['dbg_users'] = array(
--- a/upload/dl_list.php
+++ b/upload/dl_list.php
@ -57,6 +57,8 @@ else
 // Start session management
 $user->session_start();

+set_die_append_msg();
+
 // Check if user logged in
 if (!$userdata['session_logged_in'])
 {
@ -67,6 +69,7 @@ if ($bb_cfg['bt_min_ratio_dl_button'] && $btu = get_bt_userdata($user->id))
 {
 	if (($user_ratio = get_bt_ratio($btu)) < $bb_cfg['bt_min_ratio_dl_button'])
 	{
+		set_die_append_msg($forum_id, $topic_id);
 		bb_die($lang['BT_LOW_RATIO_FUNC']);
 	}
 }
--- a/upload/download.php
+++ b/upload/download.php
@ -167,6 +167,8 @@ function send_file_to_browser($attachment, $upload_dir)
 //
 $user->session_start();

+set_die_append_msg();
+
 if (!$download_id)
 {
 	message_die(GENERAL_ERROR, $lang['NO_ATTACHMENT_SELECTED']);
@ -216,7 +218,7 @@ for ($i = 0; $i < $num_auth_pages && $authorised == false; $i++)

 	if ($auth_pages[$i]['post_id'] != 0)
 	{
-		$sql = 'SELECT forum_id
+		$sql = 'SELECT forum_id, topic_id
 			FROM ' . BB_POSTS . '
 			WHERE post_id = ' . (int) $auth_pages[$i]['post_id'];

@ -227,10 +229,12 @@ for ($i = 0; $i < $num_auth_pages && $authorised == false; $i++)

 		$row = DB()->sql_fetchrow($result);

+		$topic_id = $row['topic_id'];
 		$forum_id = $row['forum_id'];

 		$is_auth = array();
 		$is_auth = auth(AUTH_ALL, $forum_id, $userdata);
+		set_die_append_msg($forum_id, $topic_id);

 		if ($is_auth['auth_download'])
 		{
@ -287,16 +291,6 @@ if (!$thumbnail)
 // Determine the 'presenting'-method
 if ($download_mode == PHYSICAL_LINK)
 {
-	$server_protocol = ($bb_cfg['cookie_secure']) ? 'https://' : 'http://';
-	$server_name = preg_replace('/^\/?(.*?)\/?$/', '\1', trim($bb_cfg['server_name']));
-	$server_port = ($bb_cfg['server_port'] <> 80) ? ':' . trim($bb_cfg['server_port']) : '';
-	$script_name = preg_replace('/^\/?(.*?)\/?$/', '/\1', trim($bb_cfg['script_path']));
-
-	if ($script_name[strlen($script_name)] != '/')
-	{
-		$script_name .= '/';
-	}
-
 	if (intval($attach_config['allow_ftp_upload']))
 	{
 		if (trim($attach_config['download_path']) == '')
@ -304,17 +298,15 @@ if ($download_mode == PHYSICAL_LINK)
 			message_die(GENERAL_ERROR, 'Physical Download not possible with the current Attachment Setting');
 		}

-		$url = trim($attach_config['download_path']) . '/' . $attachment['physical_filename'];
-		$redirect_path = $url;
+		$url = make_url($attach_config['download_path']) . '/' . $attachment['physical_filename'];
 	}
 	else
 	{
-		$url = $upload_dir . '/' . $attachment['physical_filename'];
-		$redirect_path = $server_protocol . $server_name . $server_port . $script_name . $url;
+		$url = make_url($upload_dir . '/' . $attachment['physical_filename']);
 	}

 	// Behave as per HTTP/1.1 spec for others
-	header('Location: ' . $redirect_path);
+	header('Location: ' . $url);
 	exit;
 }
 else
--- a/upload/groupcp.php
+++ b/upload/groupcp.php
@ -39,6 +39,8 @@ function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$

 $user->session_start(array('req_login' => true));

+set_die_append_msg();
+
 $group_id = isset($_REQUEST[POST_GROUPS_URL]) ? intval($_REQUEST[POST_GROUPS_URL]) : null;
 $start    = isset($_REQUEST['start']) ? abs(intval($_REQUEST['start'])) : 0;
 $per_page = $bb_cfg['groupcp_members_per_page'];
--- a/upload/includes/functions.php
+++ b/upload/includes/functions.php
@ -2000,11 +2000,6 @@ function redirect ($url)
 		message_die(CRITICAL_ERROR, 'Tried to redirect to potentially insecure url.');
 	}

-	if (!empty($_COOKIE['explain']))
-	{
-		message_die(GENERAL_MESSAGE, "redirect($url)");
-	}
-
 	$url = trim($url);
 	$server_protocol = ($bb_cfg['cookie_secure']) ? 'https://' : 'http://';

@ -2713,8 +2708,8 @@ function set_die_append_msg ($forum_id = null, $topic_id = null)
 	global $lang, $template;

 	$msg = '';
-	$msg .= ($topic_id) ? '<p class="mrg_10"><a href="viewtopic.php?t='. $topic_id .'">'. $lang['TOPIC_RETURN'] .'</a></p>' : '';
-	$msg .= ($forum_id) ? '<p class="mrg_10"><a href="viewforum.php?f='. $forum_id .'">'. $lang['FORUM_RETURN'] .'</a></p>' : '';
+	$msg .= ($topic_id) ? '<p class="mrg_10"><a href="'. TOPIC_URL . $topic_id .'">'. $lang['TOPIC_RETURN'] .'</a></p>' : '';
+	$msg .= ($forum_id) ? '<p class="mrg_10"><a href="'. FORUM_URL . $forum_id .'">'. $lang['FORUM_RETURN'] .'</a></p>' : '';
 	$msg .= '<p class="mrg_10"><a href="index.php">'. $lang['INDEX_RETURN'] .'</a></p>';
 	$template->assign_var('BB_DIE_APPEND_MSG', $msg);
 }
--- a/upload/includes/functions_post.php
+++ b/upload/includes/functions_post.php
@ -320,8 +320,8 @@ function submit_post($mode, &$post_data, &$message, &$meta, &$forum_id, &$topic_
 		}
 	}

-	meta_refresh("viewtopic.php?" . POST_POST_URL . "=" . $post_id) . '#' . $post_id;
-	$message = $lang['STORED'] . '<br /><br />' . sprintf($lang['CLICK_VIEW_MESSAGE'], '<a href="viewtopic.php?'. POST_POST_URL .'='. $post_id .'#'. $post_id .'">', '</a>') . '<br /><br />' . sprintf($lang['CLICK_RETURN_FORUM'], '<a href="viewforum.php?'. POST_FORUM_URL .'='. $forum_id . '">', '</a>');
+	meta_refresh(POST_URL ."$post_id#$post_id");
+	set_die_append_msg($forum_id, $topic_id);

 	return $mode;
 }
@ -454,14 +454,7 @@ function delete_post($mode, $post_data, &$message, &$meta, $forum_id, $topic_id,
 		post_delete($post_id);
 	}

-	if (!($mode == 'delete' && $post_data['first_post'] && $post_data['last_post']))
-	{
-		$message .= '<br /><br />';
-		$message .= sprintf($lang['CLICK_RETURN_TOPIC'], '<a href="'. TOPIC_URL . $topic_id .'">', '</a>');
-	}
-
-	$message .= '<br /><br />';
-	$message .= sprintf($lang['CLICK_RETURN_FORUM'], '<a href="'. FORUM_URL . $forum_id .'">', '</a>');
+	set_die_append_msg($forum_id, $topic_id);
 }

 //
--- a/upload/includes/functions_torrent.php
+++ b/upload/includes/functions_torrent.php
@ -136,7 +136,8 @@ function tracker_unregister ($attach_id, $mode = '')

 	if ($mode == 'request')
 	{
-		exit_redirect($lang['BT_UNREGISTERED'], $post_id, $forum_id);
+		set_die_append_msg($forum_id, $topic_id);
+		bb_die($lang['BT_UNREGISTERED']);
 	}
 }

@ -211,7 +212,7 @@ function change_tor_type ($attach_id, $tor_status_gold)
 	DB()->query("UPDATE ". BB_BT_TORRENTS ." SET tor_type = $tor_status_gold WHERE topic_id = $topic_id LIMIT 1");
 }

-function tracker_register ($attach_id, $mode = '', $tor_status = TOR_NOT_APPROVED)
+function tracker_register ($attach_id, $mode = '', $tor_status = TOR_NOT_APPROVED, $reg_time = TIMENOW)
 {
 	global $bb_cfg, $lang, $reg_mode, $tr_cfg;

@ -277,7 +278,9 @@ function tracker_register ($attach_id, $mode = '', $tor_status = TOR_NOT_APPROVE

 	if ($row = DB()->fetch_row("SELECT topic_id FROM ". BB_BT_TORRENTS ." WHERE info_hash = '$info_hash_sql' LIMIT 1"))
 	{
-		return torrent_error_exit(sprintf($lang['BT_REG_FAIL_SAME_HASH'], TOPIC_URL . $row['topic_id']));
+		$msg = sprintf($lang['BT_REG_FAIL_SAME_HASH'], TOPIC_URL . $row['topic_id']);
+		bb_die($msg);
+		set_die_append_msg($forum_id, $topic_id);
 	}

 	$totallen = 0;
@ -298,7 +301,6 @@ function tracker_register ($attach_id, $mode = '', $tor_status = TOR_NOT_APPROVE
 		return torrent_error_exit($lang['TORFILE_INVALID']);
 	}

-	$reg_time = TIMENOW;
 	$size = sprintf('%.0f', (float) $totallen);

 	$columns = ' info_hash,       post_id,  poster_id,  topic_id,  forum_id,  attach_id,    size,  reg_time,  tor_status';
@ -343,8 +345,9 @@ function tracker_register ($attach_id, $mode = '', $tor_status = TOR_NOT_APPROVE

 	if ($reg_mode == 'request' || $reg_mode == 'newtopic')
 	{
-		$mess = sprintf($lang['BT_REGISTERED'], "download.php?id=$attach_id");
-		exit_redirect($mess, $post_id, $forum_id);
+		set_die_append_msg($forum_id, $topic_id);
+		$mess = sprintf($lang['BT_REGISTERED'], DOWNLOAD_URL . $attach_id);
+		bb_die($mess);
 	}

 	return;
@ -568,14 +571,6 @@ function get_registered_torrents ($id, $mode)
 	}
 }

-function exit_redirect ($message, $post_id, $forum_id)
-{
-	global $lang;
-
-	$exit_message = $message .'<br /><br />'. sprintf($lang['CLICK_RETURN_TOPIC'], '<a href="viewtopic.php?'. POST_POST_URL .'='. $post_id .'#'. $post_id .'">', '</a>') .'<br /><br />'. sprintf($lang['CLICK_RETURN_FORUM'], '<a href="viewforum.php?'. POST_FORUM_URL .'='. $forum_id .'">', '</a>');
-	message_die(GENERAL_MESSAGE, $exit_message);
-}
-
 function torrent_error_exit ($message)
 {
 	global $reg_mode, $return_message, $lang;
--- a/upload/language/lang_english/lang_main.php
+++ b/upload/language/lang_english/lang_main.php
@ -2,7 +2,6 @@

 setlocale(LC_ALL, 'eu_US.UTF-8');
 $lang['CONTENT_ENCODING'] = 'UTF-8';
-$lang['CONTENT_DIRECTION'] = 'ltr';
 $lang['TRANSLATION_INFO'] = '';

 //
@ -376,6 +375,7 @@ $lang['ATTACH_SIGNATURE'] = 'Attach signature (signatures can be changed in prof
 $lang['NOTIFY'] = 'Notify me when a reply is posted';

 $lang['STORED'] = 'Your message has been entered successfully.';
+$lang['EDITED'] = 'The message has been changed';
 $lang['DELETED'] = 'Your message has been deleted successfully.';
 $lang['POLL_DELETE'] = 'Your poll has been deleted successfully.';
 $lang['VOTE_CAST'] = 'Your vote has been cast.';
@ -2918,8 +2918,6 @@ $lang['CALLSEED_MSG_POPUP']     = 'Error of popup';
 $lang['CALLSEED_MSG_TIME']      = 'Unable to set the last query';
 $lang['CALLSEED_HAVE_SEED']    = 'Topic does not require help (<b>Seeders:</b> %d, <b>Leechers:</b> %d)';

-$lang['CALLSEED_RETURN'] = '<br><br> <a href="viewtopic.php?t=%s"><b>Back to the topic</b></a>';
-
 $lang['LOG_ACTION']['LOG_TYPE'] = array(
 	'mod_topic_delete' => 'Topic:<br /> <b>deleted</b>',
 	'mod_topic_move'   => 'Topic:<br /> <b>moved</b>',
--- a/upload/language/lang_russian/lang_main.php
+++ b/upload/language/lang_russian/lang_main.php
--- a/upload/posting.php
+++ b/upload/posting.php
@ -49,6 +49,8 @@ $tracking_forums = get_tracks('forum');
 // Start session management
 $user->session_start();

+set_die_append_msg($forum_id, $topic_id);
+
 if ($mode == 'new_rel')
 {
 	require(INC_DIR .'posting_tpl.php');
@ -235,18 +237,18 @@ 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 .= '<br /><br />'. sprintf($lang['CLICK_RETURN_TOPIC'], '<a href="'. TOPIC_URL . $topic_id .'">', '</a>');
-
-			message_die(GENERAL_MESSAGE, $message);
 		}
 		elseif (!$post_data['last_post'] && !$is_auth['auth_mod'] && ($mode == 'delete' || $delete))
 		{
-			message_die(GENERAL_MESSAGE, $lang['CANNOT_DELETE_REPLIED']);
+			$message = $lang['CANNOT_DELETE_REPLIED'];
 		}
 		elseif (!$post_data['edit_poll'] && !$is_auth['auth_mod'] && ($mode == 'poll_delete' || $poll_delete))
 		{
-			message_die(GENERAL_MESSAGE, $lang['CANNOT_DELETE_POLL']);
+			$message = $lang['CANNOT_DELETE_POLL'];
 		}
+		
+		set_die_append_msg($forum_id, $topic_id);
+		if(isset($message)) bb_die($message);
 	}
 	else
 	{
@ -513,6 +515,13 @@ elseif ( ($submit || $confirm) && !$topic_has_new_posts )
 				$topic_type = ( isset($post_data['topic_type']) && $topic_type != $post_data['topic_type'] && !$is_auth['auth_sticky'] && !$is_auth['auth_announce'] ) ? $post_data['topic_type'] : $topic_type;

 				submit_post($mode, $post_data, $return_message, $return_meta, $forum_id, $topic_id, $post_id, $poll_id, $topic_type, DB()->escape($username), DB()->escape($subject), DB()->escape($message), DB()->escape($poll_title), $poll_options, $poll_length, $update_post_time);
+				
+				$post_url = POST_URL ."$post_id#$post_id";
+				$post_msg = ($mode == 'editpost') ? $lang['EDITED']: $lang['STORED'];
+				$onclick  = ($mode == 'editpost') ? 'onclick="return post2url(this.href);"': '';
+				$return_message .= $post_msg .'<br /><br />
+					<a '. $onclick .' href="'. $post_url .'" >'. $lang['POST_RETURN'] .'</a>
+				';
 			}
 			break;

--- a/upload/profile.php
+++ b/upload/profile.php
@ -8,7 +8,8 @@ require(BB_ROOT . 'common.php');
 // Start session management
 $user->session_start();

-$mode = (string) @$_REQUEST['mode'];
+set_die_append_msg();
+$mode = request_var('mode', '');

 switch ($mode)
 {
--- a/upload/report.php
+++ b/upload/report.php
@ -300,7 +300,7 @@ else
 			{
 				if (isset($_POST['confirm']))
 				{
-					$comment = (isset($_POST['comment'])) ? DB()->escape($_POST['comment']) : '';
+					$comment = (isset($_POST['comment'])) ? $_POST['comment'] : '';

 					switch ($mode)
 					{
--- a/upload/search.php
+++ b/upload/search.php
@ -17,6 +17,8 @@ $page_cfg['load_tpl_vars'] = array(

 $user->session_start(array('req_login' => $bb_cfg['disable_search_for_guest']));

+set_die_append_msg();
+
 if (isset($_POST['del_my_post']))
 {
 	$template->assign_var('BB_DIE_APPEND_MSG', '
@ -139,25 +141,25 @@ $ord_created  = 6;
 // Order options
 $order_opt = array(
 	$ord_posted    => array(
-		                 'lang' => $lang['SORT_TIME'],
-		                 'sql'  => 'item_id',
-		                ),
+		'lang' => $lang['SORT_TIME'],
+		'sql'  => 'item_id',
+	),
 	$ord_last_p    => array(
-		                 'lang' => $lang['BT_LAST_POST'],
-		                 'sql'  => 't.topic_last_post_id',
-		                ),
+		'lang' => $lang['BT_LAST_POST'],
+		'sql'  => 't.topic_last_post_id',
+	),
 	$ord_created   => array(
-		                 'lang' => $lang['BT_CREATED'],
-		                 'sql'  => 't.topic_time',
-		                ),
+		'lang' => $lang['BT_CREATED'],
+		'sql'  => 't.topic_time',
+	),
 	$ord_name      => array(
-		                 'lang' => $lang['SORT_TOPIC_TITLE'],
-		                 'sql'  => 't.topic_title',
-		                ),
+		'lang' => $lang['SORT_TOPIC_TITLE'],
+		'sql'  => 't.topic_title',
+	),
 	$ord_repl      => array(
-		                 'lang' => $lang['REPLIES'],
-		                 'sql'  => 't.topic_replies',
-		                ),
+		'lang' => $lang['REPLIES'],
+		'sql'  => 't.topic_replies',
+	),
 );
 $order_select = array();
 foreach ($order_opt as $val => $opt)
@ -168,13 +170,13 @@ foreach ($order_opt as $val => $opt)
 // Sort direction
 $sort_opt = array(
 	$sort_asc  => array(
-		             'lang' => $lang['ASC'],
-		             'sql'  => ' ASC ',
-		            ),
+		'lang' => $lang['ASC'],
+		'sql'  => ' ASC ',
+	),
 	$sort_desc => array(
-		             'lang' => $lang['DESC'],
-		             'sql'  => ' DESC ',
-		            ),
+		'lang' => $lang['DESC'],
+		'sql'  => ' DESC ',
+	),
 );
 $sort_select = array();
 foreach ($sort_opt as $val => $opt)
@ -185,29 +187,29 @@ foreach ($sort_opt as $val => $opt)
 // Previous days
 $time_opt = array(
 	$search_all => array(
-		     'lang' => $lang['BT_ALL_DAYS_FOR'],
-		     'sql'  => 0,
-		    ),
+		'lang' => $lang['BT_ALL_DAYS_FOR'],
+		'sql'  => 0,
+	),
 	1  => array(
-		     'lang' => $lang['BT_1_DAY_FOR'],
-		     'sql'  => TIMENOW - 86400,
-		    ),
+		'lang' => $lang['BT_1_DAY_FOR'],
+		'sql'  => TIMENOW - 86400,
+	),
 	3  => array(
-		     'lang' => $lang['BT_3_DAY_FOR'],
-		     'sql'  => TIMENOW - 86400*3,
-		    ),
+		'lang' => $lang['BT_3_DAY_FOR'],
+		'sql'  => TIMENOW - 86400*3,
+	),
 	7  => array(
-		     'lang' => $lang['BT_7_DAYS_FOR'],
-		     'sql'  => TIMENOW - 86400*7,
-		    ),
+		'lang' => $lang['BT_7_DAYS_FOR'],
+		'sql'  => TIMENOW - 86400*7,
+	),
 	14 => array(
-		     'lang' => $lang['BT_2_WEEKS_FOR'],
-		     'sql'  => TIMENOW - 86400*14,
-		    ),
+		'lang' => $lang['BT_2_WEEKS_FOR'],
+		'sql'  => TIMENOW - 86400*14,
+	),
 	30 => array(
-		     'lang' => $lang['BT_1_MONTH_FOR'],
-		     'sql'  => TIMENOW - 86400*30,
-		    ),
+		'lang' => $lang['BT_1_MONTH_FOR'],
+		'sql'  => TIMENOW - 86400*30,
+	),
 );
 $time_select = array();
 foreach ($time_opt as $val => $opt)
@ -218,11 +220,11 @@ foreach ($time_opt as $val => $opt)
 // Display as
 $display_as_opt = array(
 	$as_topics => array(
-		             'lang' => $lang['TOPICS'],
-		            ),
+		'lang' => $lang['TOPICS'],
+	),
 	$as_posts  => array(
-		             'lang' => $lang['MESSAGE'],
-		            ),
+		'lang' => $lang['MESSAGE'],
+	),
 );
 $display_as_select = array();
 foreach ($display_as_opt as $val => $opt)
@ -233,11 +235,11 @@ foreach ($display_as_opt as $val => $opt)
 // Chars
 $chars_opt = array(
 	$show_all => array(
-		             'lang' => $lang['ALL_AVAILABLE'],
-		            ),
+		'lang' => $lang['ALL_AVAILABLE'],
+	),
 	$show_briefly  => array(
-		             'lang' => $lang['BRIEFLY'],
-		            ),
+		'lang' => $lang['BRIEFLY'],
+	),
 );
 $chars_select = array();
 foreach ($chars_opt as $val => $opt)
--- a/upload/templates/default/common.tpl
+++ b/upload/templates/default/common.tpl
@ -1,15 +1,17 @@
 <!-- IF TPL_GENERAL_MESSAGE -->
 <!--========================================================================-->

-	<!-- IF IN_ADMIN --><br /><br /><!-- ELSE --><div class="spacer_10"></div><!-- ENDIF -->
+<!-- IF IN_ADMIN --><br /><br /><!-- ELSE --><div class="spacer_10"></div><!-- ENDIF -->

-	<table class="forumline message">
-		<tr><th>{MESSAGE_TITLE}</th></tr>
-		<tr><td>{MESSAGE_TEXT}</td></tr>
-		<!-- IF BB_DIE_APPEND_MSG --><tr><td>{BB_DIE_APPEND_MSG}</td></tr><!-- ENDIF -->
-	</table>
+<table class="forumline message">
+	<tr><th>{MESSAGE_TITLE}</th></tr>
+	<tr><td>
+		<div class="mrg_16">{MESSAGE_TEXT}</div>
+		<div class="mrg_12">{BB_DIE_APPEND_MSG}</div>
+	</td></tr>
+</table>

-	<!-- IF IN_ADMIN --><br /><br /><!-- ELSE --><div class="spacer_10"></div><!-- ENDIF -->
+<!-- IF IN_ADMIN --><br /><br /><!-- ELSE --><div class="spacer_10"></div><!-- ENDIF -->

 <!--========================================================================-->
 <!-- ENDIF / TPL_GENERAL_MESSAGE -->
--- a/upload/templates/default/page_header.tpl
+++ b/upload/templates/default/page_header.tpl
@ -1,7 +1,5 @@
 <!DOCTYPE html>
-
-<html dir="{L_CONTENT_DIRECTION}">
-
+<html>
 <head>
 <title><!-- IF PAGE_TITLE -->{PAGE_TITLE} :: {SITENAME}<!-- ELSE -->{SITENAME}<!-- ENDIF --></title>
 <meta http-equiv="Content-Type" content="text/html; charset={L_CONTENT_ENCODING}" />
@ -216,7 +214,7 @@ $(document).ready(function(){
 });
 <!-- ENDIF -->

-var ajax = new Ajax('{$bb_cfg['ajax_url']}', 'POST', 'json');
+var ajax = new Ajax('{SITE_URL}{$bb_cfg['ajax_url']}', 'POST', 'json');

 function getElText (e)
 {
@ -233,6 +231,28 @@ $(document).ready(function(){
  	$('.tablesorter').tablesorter(); //	{debug: true}
 });
 <!-- ENDIF -->
+
+function cfm (txt)
+{
+	return window.confirm(txt);
+}
+function post2url (url, params) {
+	params = params || {};
+	var f = document.createElement('form');
+	f.setAttribute('method', 'post');
+	f.setAttribute('action', url);
+	params['form_token'] = '{FORM_TOKEN}';
+	for (var k in params) {
+		var h = document.createElement('input');
+		h.setAttribute('type', 'hidden');
+		h.setAttribute('name', k);
+		h.setAttribute('value', params[k]);
+		f.appendChild(h);
+	}
+	document.body.appendChild(f);
+	f.submit();
+	return false;
+}
 </script>

 <!--[if lte IE 6]><script type="text/javascript">
--- a/upload/templates/default/search_results.tpl
+++ b/upload/templates/default/search_results.tpl
@ -10,7 +10,7 @@
 	<span id="edit-sel-topics" style="display: none;"><a href="#" class="bold adm" onclick="$('input.topic-chbox').trigger('click'); return false;">{L_SELECT_INVERT}</a></span>
 	<!-- ENDIF -->
 	&nbsp;&middot;&nbsp;
-	<!-- IF LOGGED_IN --><a href="#" class="med normal" onclick="setCookie('{COOKIE_MARK}', 'all_forums'); window.location.reload(); return false;">{L_MARK_ALL_FORUMS_READ}</a><!-- ENDIF -->
+	<!-- IF LOGGED_IN --><a href="#" class="med normal" onclick="setCookie('{COOKIE_MARK}', 'all_forums'); post2url ('{SITE_URL}'); return false;">{L_MARK_ALL_FORUMS_READ}</a><!-- ENDIF -->
 </div>

 <!-- IF DISPLAY_AS_POSTS -->
--- a/upload/tracker.php
+++ b/upload/tracker.php
@ -18,6 +18,8 @@ $page_cfg['load_tpl_vars'] = array(
 // Session start
 $user->session_start(array('req_login' => $bb_cfg['bt_tor_browse_only_reg']));

+set_die_append_msg();
+
 $tor_search_limit    = (IS_AM) ? 2000 : 500;
 $forum_select_size   = (UA_OPERA) ? 21 : 24;   // forum select box max rows
 $max_forum_name_len  = 60;                     // inside forum select box
@ -81,53 +83,53 @@ $ord_sp_down  = 13;
 // Order options
 $order_opt = array(
 	$ord_posted    => array(
-		                 'lang' => $lang['IS_REGISTERED'],
-		                 'sql'  => 'tor.reg_time',
-		                ),
+		'lang' => $lang['IS_REGISTERED'],
+		'sql'  => 'tor.reg_time',
+	),
 	$ord_name      => array(
-		                 'lang' => $lang['BT_TOPIC_TITLE'],
-		                 'sql'  => 't.topic_title',
-		                ),
+		'lang' => $lang['BT_TOPIC_TITLE'],
+		'sql'  => 't.topic_title',
+	),
 	$ord_compl     => array(
-		                 'lang' => $lang['COMPLETED'],
-		                 'sql'  => 'tor.complete_count',
-		                ),
+		'lang' => $lang['COMPLETED'],
+		'sql'  => 'tor.complete_count',
+	),
 	$ord_seeders   => array(
-		                 'lang' => $lang['SEEDS'],
-		                 'sql'  => 'sn.seeders',
-		                ),
+		'lang' => $lang['SEEDS'],
+		'sql'  => 'sn.seeders',
+	),
 	$ord_leechers  => array(
-		                 'lang' => $lang['LEECHS'],
-		                 'sql'  => 'sn.leechers',
-		                ),
+		'lang' => $lang['LEECHS'],
+		'sql'  => 'sn.leechers',
+	),
 	$ord_sp_up     => array(
-		                 'lang' => $lang['SPEED_UP'],
-		                 'sql'  => 'sn.speed_up',
-		                ),
+		'lang' => $lang['SPEED_UP'],
+		'sql'  => 'sn.speed_up',
+	),
 	$ord_sp_down   => array(
-		                 'lang' => $lang['SPEED_DOWN'],
-		                 'sql'  => 'sn.speed_down',
-		                ),
+		'lang' => $lang['SPEED_DOWN'],
+		'sql'  => 'sn.speed_down',
+	),
 	$ord_repl      => array(
-		                 'lang' => $lang['BT_REPLIES'],
-		                 'sql'  => 't.topic_replies',
-		                ),
+		'lang' => $lang['BT_REPLIES'],
+		'sql'  => 't.topic_replies',
+	),
 	$ord_views     => array(
-		                 'lang' => $lang['BT_VIEWS'],
-		                 'sql'  => 't.topic_views',
-		                ),
+		'lang' => $lang['BT_VIEWS'],
+		'sql'  => 't.topic_views',
+	),
 	$ord_size      => array(
-		                 'lang' => $lang['SIZE'],
-		                 'sql'  => 'tor.size',
-		                ),
+		'lang' => $lang['SIZE'],
+		'sql'  => 'tor.size',
+	),
 	$ord_last_p    => array(
-		                 'lang' => $lang['BT_LAST_POST'],
-		                 'sql'  => 't.topic_last_post_id',
-		                ),
+		'lang' => $lang['BT_LAST_POST'],
+		'sql'  => 't.topic_last_post_id',
+	),
 	$ord_last_s    => array(
-		                 'lang' => $lang['BT_SEEDER_LAST_SEEN'],
-		                 'sql'  => 'tor.seeder_last_seen',
-		                ),
+		'lang' => $lang['BT_SEEDER_LAST_SEEN'],
+		'sql'  => 'tor.seeder_last_seen',
+	),
 );
 $order_select = array();
 foreach ($order_opt as $val => $opt)
@ -138,41 +140,41 @@ foreach ($order_opt as $val => $opt)
 // Sort direction
 $sort_opt = array(
 	$sort_asc  => array(
-		             'lang' => $lang['ASC'],
-		             'sql'  => 'ASC',
-		            ),
+		'lang' => $lang['ASC'],
+		'sql'  => 'ASC',
+	),
 	$sort_desc => array(
-		             'lang' => $lang['DESC'],
-		             'sql'  => 'DESC',
-		            ),
+		'lang' => $lang['DESC'],
+		'sql'  => 'DESC',
+	),
 );

 // Previous days
 $time_opt = array(
 	$search_all => array(
-		     'lang' => $lang['BT_ALL_DAYS_FOR'],
-		     'sql'  => 0,
-		    ),
+		'lang' => $lang['BT_ALL_DAYS_FOR'],
+		'sql'  => 0,
+	),
 	1  => array(
-		     'lang' => $lang['BT_1_DAY_FOR'],
-		     'sql'  => TIMENOW - 86400,
-		    ),
+		'lang' => $lang['BT_1_DAY_FOR'],
+		'sql'  => TIMENOW - 86400,
+	),
 	3  => array(
-		     'lang' => $lang['BT_3_DAY_FOR'],
-		     'sql'  => TIMENOW - 86400*3,
-		    ),
+		'lang' => $lang['BT_3_DAY_FOR'],
+		'sql'  => TIMENOW - 86400*3,
+	),
 	7  => array(
-		     'lang' => $lang['BT_7_DAYS_FOR'],
-		     'sql'  => TIMENOW - 86400*7,
-		    ),
+		'lang' => $lang['BT_7_DAYS_FOR'],
+		'sql'  => TIMENOW - 86400*7,
+	),
 	14 => array(
-		     'lang' => $lang['BT_2_WEEKS_FOR'],
-		     'sql'  => TIMENOW - 86400*14,
-		    ),
+		'lang' => $lang['BT_2_WEEKS_FOR'],
+		'sql'  => TIMENOW - 86400*14,
+	),
 	30 => array(
-		     'lang' => $lang['BT_1_MONTH_FOR'],
-		     'sql'  => TIMENOW - 86400*30,
-		    ),
+		'lang' => $lang['BT_1_MONTH_FOR'],
+		'sql'  => TIMENOW - 86400*30,
+	),
 );
 $time_select = array();
 foreach ($time_opt as $val => $opt)
@ -183,33 +185,33 @@ foreach ($time_opt as $val => $opt)
 // Seeder not seen
 $s_not_seen_opt = array(
 	$search_all => array(
-		     'lang' => $lang['BT_DISREGARD'],
-		     'sql'  => 0,
-		    ),
+		'lang' => $lang['BT_DISREGARD'],
+		'sql'  => 0,
+	),
 	1  => array(
-		     'lang' => $lang['BT_1_DAY'],
-		     'sql'  => TIMENOW - 86400,
-		    ),
+		'lang' => $lang['BT_1_DAY'],
+		'sql'  => TIMENOW - 86400,
+	),
 	3  => array(
-		     'lang' => $lang['BT_3_DAYS'],
-		     'sql'  => TIMENOW - 86400*3,
-		    ),
+		'lang' => $lang['BT_3_DAYS'],
+		'sql'  => TIMENOW - 86400*3,
+	),
 	7  => array(
-		     'lang' => $lang['BT_7_DAYS'],
-		     'sql'  => TIMENOW - 86400*7,
-		    ),
+		'lang' => $lang['BT_7_DAYS'],
+		'sql'  => TIMENOW - 86400*7,
+	),
 	14 => array(
-		     'lang' => $lang['BT_2_WEEKS'],
-		     'sql'  => TIMENOW - 86400*14,
-		    ),
+		'lang' => $lang['BT_2_WEEKS'],
+		'sql'  => TIMENOW - 86400*14,
+	),
 	30 => array(
-		     'lang' => $lang['BT_1_MONTH'],
-		     'sql'  => TIMENOW - 86400*30,
-		    ),
+		'lang' => $lang['BT_1_MONTH'],
+		'sql'  => TIMENOW - 86400*30,
+	),
 	$never  => array(
-		     'lang' => $lang['BT_NEVER'],
-		     'sql'  => 0,
-		    ),
+		'lang' => $lang['BT_NEVER'],
+		'sql'  => 0,
+	),
 );
 $s_not_seen_select = array();
 foreach ($s_not_seen_opt as $val => $opt)
--- a/upload/viewforum.php
+++ b/upload/viewforum.php
@ -3,7 +3,7 @@
 define('IN_FORUM',   true);
 define('BB_SCRIPT', 'forum');
 define('BB_ROOT', './');
-require(BB_ROOT . "common.php");
+require(BB_ROOT . 'common.php');

 $page_cfg['include_bbcode_js'] = true;

@ -36,6 +36,7 @@ $req_page .= ($start) ? "_start{$start}" : '';
 define('REQUESTED_PAGE', $req_page);
 caching_output(IS_GUEST, 'send', REQUESTED_PAGE .'_guest');

+set_die_append_msg();
 if (!$forums = $datastore->get('cat_forums'))
 {
 	$datastore->update('cat_forums');
@ -117,10 +118,8 @@ if ($mark_read && !IS_GUEST)
 {
 	set_tracks(COOKIE_FORUM, $tracking_forums, $forum_id);

-	$message = $lang['TOPICS_MARKED_READ'] .'<br /><br />';
-	$message .= sprintf($lang['CLICK_RETURN_FORUM'], '<a href="'. FORUM_URL . $forum_id .'">', '</a>');
-	$message .= '<br /><br />';
-	$message .= sprintf($lang['CLICK_RETURN_INDEX'], '<a href="'. "index.php" .'">', '</a>');
+	set_die_append_msg($forum_id);
+	$message = $lang['TOPICS_MARKED_READ'];
 	bb_die($message);
 }

--- a/upload/viewtopic.php
+++ b/upload/viewtopic.php
@ -24,6 +24,8 @@ $post_id  = (!$topic_id && isset($_GET[POST_POST_URL])) ? (int) $_GET[POST_POST_
 // Start session
 $user->session_start();

+set_die_append_msg();
+
 // Posts per page
 $posts_per_page = $bb_cfg['posts_per_page'];
 $select_ppp = '';
@ -277,9 +279,10 @@ if ($bb_cfg['topic_notify_enabled'])
 						message_die(GENERAL_ERROR, "Could not delete topic watch information", '', __LINE__, __FILE__, $sql);
 					}
 				}
-
-				$message = $lang['NO_LONGER_WATCHING'] . '<br /><br />' . sprintf($lang['CLICK_RETURN_TOPIC'], '<a href="' . "viewtopic.php?t=$topic_id&amp;start=$start" . '">', '</a>');
-				bb_die($message);
+				
+				set_die_append_msg($forum_id, $topic_id);
+				bb_die($lang['NO_LONGER_WATCHING']);
+				
 			}
 			else
 			{
@ -314,8 +317,9 @@ if ($bb_cfg['topic_notify_enabled'])
 					}
 				}

-				$message = $lang['YOU_ARE_WATCHING'] . '<br /><br />' . sprintf($lang['CLICK_RETURN_TOPIC'], '<a href="' . "viewtopic.php?t=$topic_id&amp;start=$start" . '">', '</a>');
-				bb_die($message);
+				set_die_append_msg($forum_id, $topic_id);
+				bb_die($lang['YOU_ARE_WATCHING']);
+				
 			}
 			else
 			{