diff -urbB punbb-1.1.1/upload/admin_bans.php punbb-1.1.2/upload/admin_bans.php --- punbb-1.1.1/upload/admin_bans.php 2004-03-21 16:29:19.000000000 +0100 +++ punbb-1.1.2/upload/admin_bans.php 2004-03-21 16:29:21.000000000 +0100 @@ -54,7 +54,7 @@ } else // Otherwise the username is in POST { - $ban_user = trim(strtolower($_POST['new_ban_user'])); + $ban_user = trim($_POST['new_ban_user']); if ($ban_user != '') { @@ -121,7 +121,7 @@ - + diff -urbB punbb-1.1.1/upload/admin_maintenance.php punbb-1.1.2/upload/admin_maintenance.php --- punbb-1.1.1/upload/admin_maintenance.php 2004-03-21 16:29:19.000000000 +0100 +++ punbb-1.1.2/upload/admin_maintenance.php 2004-03-21 16:29:21.000000000 +0100 @@ -42,6 +42,8 @@ if (empty($per_page) || empty($start_at)) message($lang_common['Bad request']); + @set_time_limit(0); + // If this is the first cycle of posts we empty the search index before we proceed if (isset($_GET['empty_index'])) { diff -urbB punbb-1.1.1/upload/admin_options.php punbb-1.1.2/upload/admin_options.php --- punbb-1.1.1/upload/admin_options.php 2004-03-21 16:29:19.000000000 +0100 +++ punbb-1.1.2/upload/admin_options.php 2004-03-21 16:29:22.000000000 +0100 @@ -392,11 +392,11 @@ - + - +
Username
The username to ban (case insensitive).		Username
The username to ban.
SMTP username
Username for SMTP server. Only enter a username if it is required by the SMTP server (most servers don't require authentication).
SMTP password
Password for SMTP server. Only enter a password if it is required by the SMTP server (most servers don't require authentication).
diff -urbB punbb-1.1.1/upload/admin_prune.php punbb-1.1.2/upload/admin_prune.php --- punbb-1.1.1/upload/admin_prune.php 2004-03-21 16:29:19.000000000 +0100 +++ punbb-1.1.2/upload/admin_prune.php 2004-03-21 16:29:22.000000000 +0100 @@ -87,7 +87,7 @@ $prune_from = $_POST['prune_from']; // Concatenate together the query for counting number or topics to prune - $sql = 'SELECT COUNT(id) FROM '.$db->prefix.'topics WHERE last_post<'.$prune_date; + $sql = 'SELECT COUNT(id) FROM '.$db->prefix.'topics WHERE last_post<'.$prune_date.' AND moved_to IS NULL'; if ($_POST['prune_sticky'] == '0') $sql .= ' AND sticky=\'0\''; @@ -98,7 +98,7 @@ // Fetch the forum name (just for cosmetic reasons) $result = $db->query('SELECT forum_name FROM '.$db->prefix.'forums WHERE id='.$prune_from) or error('Unable to fetch forum name', __FILE__, __LINE__, $db->error()); - $forum = '"'.$db->result($result, 0).'"'; + $forum = '"'.pun_htmlspecialchars($db->result($result, 0)).'"'; } else $forum = 'all forums'; diff -urbB punbb-1.1.1/upload/edit.php punbb-1.1.2/upload/edit.php --- punbb-1.1.1/upload/edit.php 2004-03-21 16:29:19.000000000 +0100 +++ punbb-1.1.2/upload/edit.php 2004-03-21 16:29:22.000000000 +0100 @@ -124,8 +124,7 @@ if ($smilies != '1') $smilies = '0'; - if (!isset($_POST['silent']) || !$is_admmod) - $edited_sql = ', edited='.time().', edited_by=\''.addslashes($cur_user['username']).'\''; + $edited_sql = (!isset($_POST['silent']) || !$is_admmod) ? $edited_sql = ', edited='.time().', edited_by=\''.addslashes($cur_user['username']).'\'' : ''; if ($is_topicpost && $is_admmod) { diff -urbB punbb-1.1.1/upload/footer.php punbb-1.1.2/upload/footer.php --- punbb-1.1.1/upload/footer.php 2004-03-21 16:29:19.000000000 +0100 +++ punbb-1.1.2/upload/footer.php 2004-03-21 16:29:22.000000000 +0100 @@ -72,10 +72,9 @@ + diff -urbB punbb-1.1.1/upload/profile.php punbb-1.1.2/upload/profile.php --- punbb-1.1.1/upload/profile.php 2004-03-21 16:29:19.000000000 +0100 +++ punbb-1.1.2/upload/profile.php 2004-03-21 16:29:23.000000000 +0100 @@ -49,7 +49,10 @@ { // If the user is already logged in we shouldn't be here :) if (!$cookie['is_guest']) + { header('Location: index.php'); + exit; + } $key = $_GET['key']; @@ -940,7 +943,7 @@ { $username_field = ''; $email_field = ' - '.$lang_common['Send e-mail'].''; - $user_title_field = '  '.$lang_prof_reg['Leave blank']; + $user_title_field = '  '.$lang_profile['Leave blank']; if ($cur_user['status'] == PUN_ADMIN && $img_size) $avatar_field .= '
 '.$lang_profile['Delete avatar'].''; @@ -955,7 +958,7 @@ $email_field = ''; if ($pun_config['p_users_set_title'] == '1') - $user_title_field = '  '.$lang_prof_reg['Leave blank']; + $user_title_field = '  '.$lang_profile['Leave blank']; else { $user_title_field = get_title($user); diff -urbB punbb-1.1.1/upload/register.php punbb-1.1.2/upload/register.php --- punbb-1.1.1/upload/register.php 2004-03-21 16:29:19.000000000 +0100 +++ punbb-1.1.2/upload/register.php 2004-03-21 16:29:23.000000000 +0100 @@ -29,7 +29,10 @@ // If we are logged in, we shouldn't be here if (!$cookie['is_guest']) +{ header('Location: index.php'); + exit; +} // Load the register.php language file require $pun_root.'lang/'.$language.'/'.$language.'_register.php'; diff -urbB punbb-1.1.1/upload/search.php punbb-1.1.2/upload/search.php --- punbb-1.1.1/upload/search.php 2004-03-21 16:29:19.000000000 +0100 +++ punbb-1.1.2/upload/search.php 2004-03-21 16:29:23.000000000 +0100 @@ -189,16 +189,15 @@ { $word = trim($word); if ($word != 'and' || $word != 'or' || $word != 'not') - $text = preg_replace('#\b'.preg_quote($word).'\b#', ' ', $text); + $keywords = preg_replace('#\b'.preg_quote($word).'\b#', ' ', $keywords); } } // Split up keywords - $keywords_array = preg_split('#[\s]+#', substr($keywords, 1, -1)); + $keywords_array = preg_split('#[\s]+#', trim($keywords)); // Should we search in message body or topic subject specifically? - if ($search_in) - $search_in_cond = ($search_in > 0) ? ' AND m.subject_match = 0' : ' AND m.subject_match = 1'; + $search_in_cond = ($search_in) ? (($search_in > 0) ? ' AND m.subject_match = 0' : ' AND m.subject_match = 1') : ''; } $match_type = 'or'; @@ -693,8 +692,7 @@ echo "\t\t\t\t\t".''."\n"; -if ($cur_user['status'] < PUN_USER) - $extra = ' WHERE f.admmod_only=\'0\''; +$extra_sql = ($cur_user['status'] < PUN_MOD) ? ' WHERE f.admmod_only=\'0\'' : ''; $result = $db->query('SELECT c.id AS cid, c.cat_name, f.id AS fid, f.forum_name FROM '.$db->prefix.'categories AS c INNER JOIN '.$db->prefix.'forums AS f ON c.id=f.cat_id'.$extra.' ORDER BY c.disp_position, c.id, f.disp_position') or error('Unable to fetch category/forum list', __FILE__, __LINE__, $db->error()); $num_forums = $db->num_rows($result); diff -urbB punbb-1.1.1/upload/userlist.php punbb-1.1.2/upload/userlist.php --- punbb-1.1.1/upload/userlist.php 2004-03-21 16:29:19.000000000 +0100 +++ punbb-1.1.2/upload/userlist.php 2004-03-21 16:29:23.000000000 +0100 @@ -161,7 +161,7 @@
- +
result($result, 0); if ($last_post_id) + { header('Location: viewtopic.php?pid='.$last_post_id.'#'.$last_post_id); + exit; + } }