r373

Фикс пагинации в админке, перенос дней рождений в админку Спасибо _Xz_ volkodav2000 за предоставленные наработки INSERT INTO `bb_config` VALUES ('birthday_enabled', '1'); INSERT INTO `bb_config` VALUES ('birthday_max_age', '99'); INSERT INTO `bb_config` VALUES ('birthday_min_age', '10'); INSERT INTO `bb_config` VALUES ('birthday_check_day', '7'); git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@373 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
2025-08-21 13:54:02 -07:00 · 2012-02-12 19:36:03 +00:00 · 2012-02-12 19:36:03 +00:00 · 29785c0dcf
commit 29785c0dcf
parent 06a538868c
24 changed files with 118 additions and 76 deletions
--- a/install/sql/mysql.sql
+++ b/install/sql/mysql.sql
@ -37,7 +37,6 @@ DROP TABLE IF EXISTS `bb_bt_users`;
 DROP TABLE IF EXISTS `bb_captcha`;
 DROP TABLE IF EXISTS `bb_categories`;
 DROP TABLE IF EXISTS `bb_config`;
-DROP TABLE IF EXISTS `bb_countries`;
 DROP TABLE IF EXISTS `bb_cron`;
 DROP TABLE IF EXISTS `bb_disallow`;
 DROP TABLE IF EXISTS `bb_extension_groups`;
@ -561,6 +560,10 @@ INSERT INTO `bb_config` VALUES ('board_email_form', '0');
 INSERT INTO `bb_config` VALUES ('board_email_sig', 'Thanks, The Management');
 INSERT INTO `bb_config` VALUES ('board_startdate', '');
 INSERT INTO `bb_config` VALUES ('board_timezone', '0');
+INSERT INTO `bb_config` VALUES ('birthday_enabled', '1');
+INSERT INTO `bb_config` VALUES ('birthday_max_age', '99');
+INSERT INTO `bb_config` VALUES ('birthday_min_age', '10');
+INSERT INTO `bb_config` VALUES ('birthday_check_day', '7');
 INSERT INTO `bb_config` VALUES ('bt_add_auth_key', '1');
 INSERT INTO `bb_config` VALUES ('bt_add_comment', '');
 INSERT INTO `bb_config` VALUES ('bt_add_publisher', 'YourSiteName');
--- a/upload/admin/admin_board.php
+++ b/upload/admin/admin_board.php
@ -92,7 +92,12 @@ switch($mode)
 		    'NETWORK_NEWS_COUNT' => $new['network_news_count'],
 		    'NETWORK_NEWS_FORUM_ID' => $new['network_news_forum_id'],
 		    'WHOIS_INFO' => $new['whois_info'],
-		    'SHOW_MOD_INDEX' => $new['show_mod_index'],
+		    'SHOW_MOD_INDEX' => $new['show_mod_index'],			
+		    'BIRTHDAY_ENABLED' => $new['birthday_enabled'],			
+		    'L_BIRTHDAY_YEARS' => $lang['DELTA_TIME']['INTERVALS']['year'][2],
+		    'BIRTHDAY_MAX_AGE' => $new['birthday_max_age'],
+		    'BIRTHDAY_MIN_AGE' => $new['birthday_min_age'],
+		    'BIRTHDAY_CHECK_DAY' => $new['birthday_check_day'],
 	    ));
 	break;

--- a/upload/admin/admin_log.php
+++ b/upload/admin/admin_log.php
@ -245,6 +245,7 @@ else

 generate_pagination($url, $items_count, $per_page, $start);

+
 $filter = array();

 if ($log_rowset)
--- a/upload/ajax/edit_user_profile.php
+++ b/upload/ajax/edit_user_profile.php
@ -56,7 +56,7 @@ switch ($field)
 		break;

 	case 'user_birthday':
-	    if(!$bb_cfg['birthday']['enabled']) $this->ajax_die($lang['MODULE_OFF']);
+	    if(!$bb_cfg['birthday_enabled']) $this->ajax_die($lang['MODULE_OFF']);
 	    $data = explode('-', $value);
 	    $b_day  = (isset($data[2])) ? (int) $data[2] : 0;
 		$b_md   = (isset($data[1])) ? (int) $data[1] : 0;
@ -64,13 +64,13 @@ switch ($field)

 		if($b_day || $b_md || $b_year)
 		{
-			if((bb_date(TIMENOW, 'Y', 'false') - $b_year) > $bb_cfg['birthday']['max_user_age'])
+			if((bb_date(TIMENOW, 'Y', 'false') - $b_year) > $bb_cfg['birthday_max_age'])
 			{
-				$this->ajax_die(sprintf($lang['BIRTHDAY_TO_HIGH'], $bb_cfg['birthday']['max_user_age']));
+				$this->ajax_die(sprintf($lang['BIRTHDAY_TO_HIGH'], $bb_cfg['birthday_max_age']));
 			}
-            else if((bb_date(TIMENOW, 'Y', 'false') - $b_year) < $bb_cfg['birthday']['min_user_age'])
+            else if((bb_date(TIMENOW, 'Y', 'false') - $b_year) < $bb_cfg['birthday_min_age'])
 			{
-				$this->ajax_die(sprintf($lang['BIRTHDAY_TO_LOW'], $bb_cfg['birthday']['min_user_age']));
+				$this->ajax_die(sprintf($lang['BIRTHDAY_TO_LOW'], $bb_cfg['birthday_min_age']));
 			}
 			if (!checkdate($b_md, $b_day, $b_year))
 			{
--- a/upload/config.php
+++ b/upload/config.php
@ -30,7 +30,6 @@
  * Special users (dbg_users, unlimited_users, super_admins)
  * LOG
  * Error reporting
-  * Cron

  * Subforums
  * Forums
@ -53,7 +52,7 @@ $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'] = 'R372';
+$bb_cfg['tp_release_state'] = 'R373';
 $bb_cfg['tp_release_date'] = '12-02-2012';

 // Database
@ -280,7 +279,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'] = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : '';  # '.yourdomain.com'
+$bb_cfg['cookie_domain'] = (empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : '';  # '.yourdomain.com'
 $bb_cfg['cookie_path']   = '/';                    # '/forum/'
 $bb_cfg['cookie_secure'] = (!empty($_SERVER['HTTPS']) ? 1 : 0); # 0
 $bb_cfg['cookie_prefix'] = 'bb_';                  # 'bb_'
@ -510,9 +509,9 @@ $bb_cfg['first_logon_redirect_url']    = 'index.php';
 $bb_cfg['faq_url']                     = 'faq.php';
 $bb_cfg['terms_and_conditions_url']    = 'index.php';

-$bb_cfg['user_agreement_url']          = "misc.php?do=info&show=user_agreement";
-$bb_cfg['copyright_holders_url']       = "misc.php?do=info&show=copyright_holders";
-$bb_cfg['advert_url']                  = "misc.php?do=info&show=advert";
+$bb_cfg['user_agreement_url']          = 'misc.php?do=info&show=user_agreement';
+$bb_cfg['copyright_holders_url']       = 'misc.php?do=info&show=copyright_holders';
+$bb_cfg['advert_url']                  = 'misc.php?do=info&show=advert';

 $bb_cfg['html_path']                   = BB_PATH .'/misc/html/';  #
 $bb_cfg['user_agreement_html_path']    = $bb_cfg['html_path'] .'user_agreement.html';  #
@ -526,9 +525,3 @@ $bb_cfg['captcha'] = array(
 	'img_url'    => './images/captcha/',           # without '/'
 	'img_path'   => BB_PATH .'/images/captcha/',   # without '/'
 );
-
-// Birthday
-$bb_cfg['birthday']['enabled']      = true;
-$bb_cfg['birthday']['max_user_age'] = 99;
-$bb_cfg['birthday']['min_user_age'] = 10;
-$bb_cfg['birthday']['check_day']    = 7;
--- a/upload/includes/datastore/build_stats.php
+++ b/upload/includes/datastore/build_stats.php
@ -50,12 +50,12 @@ if ($bb_cfg['gender'])
 }

 // birthday stat
-if ($bb_cfg['birthday']['check_day'] && $bb_cfg['birthday']['enabled'])
+if ($bb_cfg['birthday_check_day'] && $bb_cfg['birthday_enabled'])
 {
 	$sql = DB()->fetch_rowset("SELECT user_id, username, user_birthday, user_birthday, user_rank FROM ". BB_USERS ." WHERE user_id NOT IN(". EXCLUDED_USERS_CSV .") AND user_birthday != 0 ORDER BY user_level DESC, username");
 	$this_year = bb_date(TIMENOW, 'Y', 'false');
 	$date_today = bb_date(TIMENOW, 'Ymd', 'false');
-	$date_forward = bb_date(TIMENOW + ($bb_cfg['birthday']['check_day']*86400), 'Ymd', 'false');
+	$date_forward = bb_date(TIMENOW + ($bb_cfg['birthday_check_day']*86400), 'Ymd', 'false');

 	$birthday_today_list = $birthday_week_list = array();

--- a/upload/includes/functions_admin.php
+++ b/upload/includes/functions_admin.php
@ -349,17 +349,18 @@ function topic_delete ($mode_or_topic_id, $forum_id = null, $prune_time = 0, $pr
 		}
 	}
 	unset($row, $result);
-
+	
 	// Delete posts, posts_text, attachments (from DB)
-	DB()->query("
-		DELETE p, pt, ps, a, d
-		FROM      ". $tmp_delete_topics     ." del
-		LEFT JOIN ". BB_POSTS            ." p  ON(p.topic_id = del.topic_id)
-		LEFT JOIN ". BB_POSTS_TEXT       ." pt ON(pt.post_id = p.post_id)
-		LEFT JOIN ". BB_POSTS_SEARCH     ." ps ON(ps.post_id = p.post_id)
-		LEFT JOIN ". BB_ATTACHMENTS      ." a  ON(a.post_id = p.post_id)
-		LEFT JOIN ". BB_ATTACHMENTS_DESC ." d  ON(d.attach_id = a.attach_id)
-	");
+    DB()->query("
+        DELETE p, pt, ps, a, d, ph
+        FROM      ". $tmp_delete_posts      ." del
+        LEFT JOIN ". BB_POSTS            ." p  ON(p.post_id  = del.post_id)
+        LEFT JOIN ". BB_POSTS_TEXT      ." pt  ON(pt.post_id  = del.post_id)
+        LEFT JOIN ". BB_POSTS_HTML      ." ph  ON(ph.post_id  = del.post_id)
+        LEFT JOIN ". BB_POSTS_SEARCH    ." ps  ON(ps.post_id  = del.post_id)
+        LEFT JOIN ". BB_ATTACHMENTS      ." a  ON(a.post_id  = del.post_id)
+        LEFT JOIN ". BB_ATTACHMENTS_DESC ." d  ON(d.attach_id = a.attach_id)
+    ");

 	// Delete topics, topics watch
 	DB()->query("
--- a/upload/includes/functions_validate.php
+++ b/upload/includes/functions_validate.php
@ -13,9 +13,13 @@ function validate_username ($username, $check_ban_and_taken = true)
 	$username = clean_username($username);

 	// Length
-	if (strlen($username) > USERNAME_MAX_LENGTH)
+	if (mb_strlen($username, 'UTF-8') > USERNAME_MAX_LENGTH)
 	{
 		return $lang['USERNAME_TOO_LONG'];
+	} 
+	else if (mb_strlen($username, 'UTF-8') < USERNAME_MIN_LENGTH)
+	{
+		return $lang['USERNAME_TOO_SMALL'];
 	}
 	// Allowed symbols
 	if (!preg_match('#^['.$name_chars.']+$#iu', $username, $m))
--- a/upload/includes/init_bb.php
+++ b/upload/includes/init_bb.php
@ -216,6 +216,8 @@ define('PRIVMSGS_SAVED_IN_MAIL',  3);
 define('PRIVMSGS_SAVED_OUT_MAIL', 4);
 define('PRIVMSGS_UNREAD_MAIL',    5);

+define('USERNAME_MIN_LENGTH',     3);
+
 // URL PARAMETERS (hardcoding allowed)
 define('POST_CAT_URL',    'c');
 define('POST_FORUM_URL',  'f');
--- a/upload/includes/sessions.php
+++ b/upload/includes/sessions.php
@ -29,7 +29,7 @@ class user_common
 		'tr_t_ax'  => 0,     // ajax open topics
 		'tr_t_t'   => 0,     // show time of the creation topics
 		'hl_tr'    => 1,     // show cursor in tracker.php
-		'i_aft_l'  => 1,     // show images only after full loading
+		'i_aft_l'  => 0,     // show images only after full loading
 	);

 	/**
--- a/upload/includes/ucp/usercp_register.php
+++ b/upload/includes/ucp/usercp_register.php
@ -720,7 +720,7 @@ foreach ($profile_fields as $field => $can_edit)
 	}
 }

-if($bb_cfg['birthday']['enabled'] && $mode != 'register')
+if($bb_cfg['birthday_enabled'] && $mode != 'register')
 {
 	$days = array($lang['DELTA_TIME']['INTERVALS']['mday'][0] => 0);
 	for($i=1; $i<=31; $i++)
@ -739,7 +739,7 @@ if($bb_cfg['birthday']['enabled'] && $mode != 'register')

 	$year = bb_date(TIMENOW, 'Y', 'false');
 	$years = array($lang['DELTA_TIME']['INTERVALS']['year'][0] => 0);
-	for($i=$year-$bb_cfg['birthday']['max_user_age']; $i<=$year-$bb_cfg['birthday']['min_user_age']; $i++)
+	for($i=$year-$bb_cfg['birthday_max_age']; $i<=$year-$bb_cfg['birthday_min_age']; $i++)
 	{
 		$years[$i] = $i;
 	}
--- a/upload/includes/ucp/usercp_sendpasswd.php
+++ b/upload/includes/ucp/usercp_sendpasswd.php
@ -30,6 +30,7 @@ if ( isset($_POST['submit']) )
 				bb_die($lang['NO_SEND_ACCOUNT']);
 			}

+			$username = $row['username'];
 			$user_id = $row['user_id'];

 			$user_actkey = make_rand_str(12);
@ -55,6 +56,7 @@ if ( isset($_POST['submit']) )

 			$emailer->assign_vars(array(
 				'SITENAME' => $bb_cfg['sitename'],
+				'USERNAME' => $username,
 				'PASSWORD' => $user_password,
 				'EMAIL_SIG' => (!empty($bb_cfg['board_email_sig'])) ? str_replace('<br />', "\n", "-- \n" . $bb_cfg['board_email_sig']) : '',

@ -79,10 +81,11 @@ if ( isset($_POST['submit']) )
 }
 else
 {
-	$email = '';
+	$email = $username = '';
 }

 $template->assign_vars(array(
+	'USERNAME' => $username,
 	'EMAIL' => $email,
 	'CAPTCHA_HTML'       => ($need_captcha) ? CAPTCHA()->get_html() : '',
 	'S_HIDDEN_FIELDS' => '',
--- a/upload/includes/ucp/usercp_viewprofile.php
+++ b/upload/includes/ucp/usercp_viewprofile.php
@ -120,8 +120,8 @@ $template->assign_vars(array(
 	'INTERESTS'            => $profiledata['user_interests'],
 	'SKYPE'                => $profiledata['user_skype'],
 	'GENDER'               => ($bb_cfg['gender'] && $profiledata['user_gender']) ? $lang['GENDER_SELECT'][$profiledata['user_gender']] : '',
-	'BIRTHDAY'             => ($bb_cfg['birthday']['enabled'] && $profiledata['user_birthday']) ? realdate($profiledata['user_birthday'], 'Y-m-d') : '',
-	'AGE'                  => ($bb_cfg['birthday']['enabled'] && $profiledata['user_birthday']) ? birthday_age($profiledata['user_birthday']) : '',
+	'BIRTHDAY'             => ($bb_cfg['birthday_enabled'] && $profiledata['user_birthday']) ? realdate($profiledata['user_birthday'], 'Y-m-d') : '',
+	'AGE'                  => ($bb_cfg['birthday_enabled'] && $profiledata['user_birthday']) ? birthday_age($profiledata['user_birthday']) : '',
 	'AVATAR_IMG'           => get_avatar($profiledata['user_avatar'], $profiledata['user_avatar_type'], !bf($profiledata['user_opt'], 'user_opt', 'allow_avatar')),

 	'L_VIEWING_PROFILE'    => sprintf($lang['VIEWING_USER_PROFILE'], $profiledata['username']),
@ -130,7 +130,7 @@ $template->assign_vars(array(
 	'U_SEARCH_TOPICS'      => "search.php?uid={$profiledata['user_id']}&amp;myt=1",
 	'U_SEARCH_RELEASES'    => "tracker.php?rid={$profiledata['user_id']}#results",

-	'S_PROFILE_ACTION'     => "profile.php",
+	'S_PROFILE_ACTION'     => 'profile.php',

 	'SIGNATURE'            => $signature,

--- a/upload/index.php
+++ b/upload/index.php
@ -364,7 +364,7 @@ if ($bb_cfg['show_network_news'])
    }
 }

-if ($bb_cfg['birthday']['check_day'] && $bb_cfg['birthday']['enabled'])
+if ($bb_cfg['birthday_check_day'] && $bb_cfg['birthday_enabled'])
 {
 	$week_list = $today_list = array();
 	$week_all = $today_all = false;
@ -383,9 +383,9 @@ if ($bb_cfg['birthday']['check_day'] && $bb_cfg['birthday']['enabled'])
 			$week_list[] = profile_url($week) .' <span class="small">('. birthday_age($week['age']) .')</span>';
 		}
 		$week_all = ($week_all) ? '&nbsp;<a class="txtb" href="#" onclick="ajax.exec({action: \'birthday_list\', mode: \'week\'}); return false;" title="'. $lang['ALL'] .'">...</a>' : '';
-		$week_list = sprintf($lang['BIRTHDAY_WEEK'], $bb_cfg['birthday']['check_day'], join(', ', $week_list)) . $week_all;
+		$week_list = sprintf($lang['BIRTHDAY_WEEK'], $bb_cfg['birthday_check_day'], join(', ', $week_list)) . $week_all;
 	}
-	else $week_list = sprintf($lang['NOBIRTHDAY_WEEK'], $bb_cfg['birthday']['check_day']);
+	else $week_list = sprintf($lang['NOBIRTHDAY_WEEK'], $bb_cfg['birthday_check_day']);

 	if ($stats['birthday_today_list'])
 	{
--- a/upload/language/lang_english/email/user_activate_passwd.tpl
+++ b/upload/language/lang_english/email/user_activate_passwd.tpl
@ -1,7 +1,7 @@
 Subject: New password activation
 Charset: UTF-8

-Hello!
+Hello {USERNAME}

 You are receiving this email because you have (or someone pretending to be you has) requested a new password be sent for your account on {SITENAME}. If you did not request this email then please ignore it, if you keep receiving it please contact the board administrator.

--- a/upload/language/lang_english/lang_main.php
+++ b/upload/language/lang_english/lang_main.php
@ -593,6 +593,10 @@ $lang['BIRTHDAY_TODAY'] = 'Users with a birthday today: ';
 $lang['BIRTHDAY_WEEK'] = 'Users with a birthday within the next %d days: %s';
 $lang['NOBIRTHDAY_WEEK'] = 'No users are having a birthday in the upcoming %d days'; // %d is substitude with the number of days
 $lang['NOBIRTHDAY_TODAY'] = 'No users have a birthday today';
+$lang['BIRTHDAY_ENABLE'] = 'Enable birthday';
+$lang['BIRTHDAY_MAX_AGE'] = 'Max age';
+$lang['BIRTHDAY_MIN_AGE'] = 'Min age';
+$lang['BIRTHDAY_CHECK_DAY'] = 'Days to check for come shortly birthdays';

 $lang['NO_THEMES'] = 'No Themes In database';
 $lang['TIMEZONE'] = 'Timezone';
--- a/upload/language/lang_russian/email/user_activate_passwd.tpl
+++ b/upload/language/lang_russian/email/user_activate_passwd.tpl
@ -1,7 +1,7 @@
 Subject: Активация нового пароля
 Charset: UTF-8

-Здравствуйте!
+Здравствуйте, {USERNAME}!

 Вы получили это письмо потому, что вы (либо кто-то, выдающий себя за вас) попросили выслать новый пароль к вашей учётной записи на сайте {SITENAME}. Если вы не просили выслать пароль, то не обращайте внимания на это письмо, если же подобные письма будут продолжать приходить, обратитесь к администратору сайта.

--- a/upload/language/lang_russian/lang_main.php
+++ b/upload/language/lang_russian/lang_main.php
@ -599,6 +599,10 @@ $lang['BIRTHDAY_TODAY'] = 'Пользователи, празднующие Де
 $lang['BIRTHDAY_WEEK'] = 'Пользователи, празднующие День Рождения в ближайшие %d дней: %s';
 $lang['NOBIRTHDAY_WEEK'] = 'В ближайшие %d дней никто не празднует День Рождения.'; // %d is substitude with the number of days
 $lang['NOBIRTHDAY_TODAY'] = 'Сегодня никто не празднует День Рождения.';
+$lang['BIRTHDAY_ENABLE'] = 'Показывать дни рождения';
+$lang['BIRTHDAY_MAX_AGE'] = 'Максимальный возраст';
+$lang['BIRTHDAY_MIN_AGE'] = 'Минимальный возраст';
+$lang['BIRTHDAY_CHECK_DAY'] = 'Показывать ближайшие дни рождения за';

 $lang['NO_THEMES'] = 'В базе нет цветовых схем';
 $lang['TIMEZONE'] = 'Часовой пояс';
--- a/upload/templates/admin/admin_board.tpl
+++ b/upload/templates/admin/admin_board.tpl
@ -394,6 +394,29 @@
 		<label><input type="radio" name="auto_delete_posted_pics" value="0" <!-- IF not AUTO_DELETE_POSTED_PICS -->checked="checked"<!-- ENDIF --> />{L_DISABLED}</label>
 	</td>
 </tr>
+
+<tr class="row3 med">
+	<td class="bold tCenter" colspan="2">{L_BIRTHDAY}</td>
+</tr>
+<tr>
+	<td><h4>{L_BIRTHDAY_ENABLE}</h4></td>
+	<td>
+	    <label><input type="radio" name="birthday_enabled" value="1" <!-- IF BIRTHDAY_ENABLED -->checked="checked"<!-- ENDIF --> />{L_ENABLED}</label>&nbsp;&nbsp;
+		<label><input type="radio" name="birthday_enabled" value="0" <!-- IF not BIRTHDAY_ENABLED -->checked="checked"<!-- ENDIF --> />{L_DISABLED}</label>
+	</td>
+</tr>
+<tr>
+	<td><h4>{L_BIRTHDAY_MAX_AGE}</h4></td>
+	<td><input class="post" type="text" size="25" maxlength="100" name="birthday_max_age" value="{BIRTHDAY_MAX_AGE}" />&nbsp;{L_BIRTHDAY_YEARS}</td>
+</tr>
+<tr>
+	<td><h4>{L_BIRTHDAY_MIN_AGE}</h4></td>
+	<td><input class="post" type="text" size="25" maxlength="100" name="birthday_min_age" value="{BIRTHDAY_MIN_AGE}" />&nbsp;{L_BIRTHDAY_YEARS}</td>
+</tr>
+<tr>
+	<td><h4>{L_BIRTHDAY_CHECK_DAY}</h4></td>
+	<td><input class="post" type="text" size="25" maxlength="100" name="birthday_check_day" value="{BIRTHDAY_CHECK_DAY}" />&nbsp;{L_DAYS}</td>
+</tr>
 <!-- ENDIF / CONFIG_MODS -->
 <tr>
 	<td class="catBottom" colspan="2">
--- a/upload/templates/admin/admin_log.tpl
+++ b/upload/templates/admin/admin_log.tpl
@ -123,7 +123,7 @@ table.log_filters td {
 			<div class="log_msg">{log.MSG}</div>
 			<!-- ENDIF -->
 			<!-- IF log.TOPIC_TITLE -->
-			<div class="nowrap">
+			<div>
 				<a href="{log.TOPIC_HREF_S}" class="med"><span class="med">{log.TOPIC_TITLE}</span></a>
 				<!-- IF log.TOPIC_HREF -->
 					<a href="{log.TOPIC_HREF}" class="med" target="_blank"><img src="{IMG}icon_latest_reply.gif" class="icon2" alt="" title="" /></a>
@ -169,17 +169,16 @@ table.log_filters td {

 </form>

-
 <!-- IF FILTERS -->
 <div class="spacer_8"></div>

 <fieldset class="row3">
 <legend>{L_ACTS_LOG_FILTER}</legend>
-<table class="log_filters" cellspacing="4"><tr>
-
+<table class="log_filters" cellspacing="4">
+<tr>
 	<!-- IF FILTER_FORUMS -->
 	<td>
-	<p class="med bold">Forums:</p>
+	<p class="med bold">{L_FORUMS}:</p>
 	<div>
 		<!-- BEGIN forums -->
 		<p class="med mrg_4">{forums.FORUM_NAME}</p>
@ -209,7 +208,7 @@ table.log_filters td {
 	</div>
 	</td>
 	<!-- ENDIF -->
-
+	
 </tr></table>
 </fieldset>
 <!-- ENDIF -->
--- a/upload/templates/default/index.tpl
+++ b/upload/templates/default/index.tpl
@ -178,7 +178,7 @@
 				<p>{SPEED_STAT}</p>
 				<!-- ENDIF -->

-				<!-- IF $bb_cfg['birthday']['enabled'] -->
+				<!-- IF $bb_cfg['birthday_enabled'] -->
 				<script type="text/javascript">
 				ajax.callback.birthday_list = function(data) {
 					$('#birthday_'+ data.mode).html(data.html);
--- a/upload/templates/default/page_header.tpl
+++ b/upload/templates/default/page_header.tpl
@ -265,6 +265,29 @@ function OpenInEditor ($file, $line)
 </div>
 <!-- ENDIF / EDITABLE_TPLS -->

+<!-- IF PAGINATION -->
+<div class="menu-sub" id="pg-jump">
+	<table cellspacing="1" cellpadding="4">
+	<tr><th>{L_GO_TO_PAGE}</th></tr>
+	<tr><td>
+		<form method="get" onsubmit="return go_to_page();">
+			<input id="pg-page" type="text" size="5" maxlength="4" />
+			<input type="submit" value="{L_JUMP_TO}"/>
+		</form>
+	</td></tr>
+	</table>
+</div>
+<script type="text/javascript">
+function go_to_page ()
+{
+	var page_num = (parseInt( $('#pg-page').val() ) > 1) ? $('#pg-page').val() : 1;
+	var pg_start = (page_num - 1) * {PG_PER_PAGE};
+	window.location = '{PG_BASE_URL}&start=' + pg_start;
+	return false;
+}
+</script>
+<!-- ENDIF -->
+
 <div id="ajax-loading"></div><div id="ajax-error"></div>
 <div id="preload" style="position: absolute; overflow: hidden; top: 0; left: 0; height: 1px; width: 1px;"></div>

@ -443,29 +466,6 @@ important_info

 <!--menus-->

-<!-- IF PAGINATION -->
-<div class="menu-sub" id="pg-jump">
-	<table cellspacing="1" cellpadding="4">
-	<tr><th>{L_GO_TO_PAGE}</th></tr>
-	<tr><td>
-		<form method="get" onsubmit="return go_to_page();">
-			<input id="pg-page" type="text" size="5" maxlength="4" />
-			<input type="submit" value="{L_JUMP_TO}"/>
-		</form>
-	</td></tr>
-	</table>
-</div>
-<script type="text/javascript">
-function go_to_page ()
-{
-	var page_num = (parseInt( $('#pg-page').val() ) > 1) ? $('#pg-page').val() : 1;
-	var pg_start = (page_num - 1) * {PG_PER_PAGE};
-	window.location = '{PG_BASE_URL}&start=' + pg_start;
-	return false;
-}
-</script>
-<!-- ENDIF -->
-
 <!-- IF SHOW_ONLY_NEW_MENU -->
 <div class="menu-sub" id="only-new-options">
 	<table cellspacing="1" cellpadding="4">
--- a/upload/viewforum.php
+++ b/upload/viewforum.php
@ -84,7 +84,7 @@ $tor_status = -1;  //  all by default

 if ($is_auth['auth_mod'])
 {
-	$redirect = isset($_POST['redirect']) ? $_POST['redirect'] : $_SERVER['REQUEST_URI'];
+	$redirect = isset($_POST['redirect']) ? $_POST['redirect'] : @$_SERVER['REQUEST_URI'];
 	$redirect = url_arg($redirect, 'mod', 1, '&');
 	$mod_redirect_url = "login.php?redirect=$redirect&admin=1";

--- a/upload/viewtopic.php
+++ b/upload/viewtopic.php
@ -192,7 +192,7 @@ $mod_redirect_url = '';

 if ($is_auth['auth_mod'])
 {
-	$redirect = isset($_POST['redirect']) ? $_POST['redirect'] : $_SERVER['REQUEST_URI'];
+	$redirect = isset($_POST['redirect']) ? $_POST['redirect'] : @$_SERVER['REQUEST_URI'];
 	$redirect = url_arg($redirect, 'mod', 1, '&');
 	$mod_redirect_url = "login.php?redirect=$redirect&admin=1";