mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 23:25:30 +02:00
Code Issues Releases Wiki Activity

Updates as opposed to downdates

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@3284 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2003-01-08 18:27:16 +00:00
parent f58083b8af
commit f236f3f838
11 changed files with 512 additions and 293 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
phpBB/includes/functions.php
View File

@ -671,16 +671,22 @@ function redirect($url)
$db->sql_close();
}
$protocol = ($config['cookie_secure']) ? 'https://' : 'http://';
$server = preg_replace('/^\/?(.*?)\/?$/', '\1', trim($config['server_name']));
$path = preg_replace('/^\/?(.*?)\/?$/', '/\1', trim($config['script_path']));
$port = ($config['server_port'] <> 80) ? ':' . trim($config['server_port']) . '/' : '/';
$server_protocol = ($config['cookie_secure']) ? 'https://' : 'http://';
$server_name = preg_replace('/^\/?(.*?)\/?$/', '\1', trim($config['server_name']));
$server_port = ($config['server_port'] <> 80) ? ':' . trim($config['server_port']) . '/' : '/';
$script_name = preg_replace('/^\/?(.*?)\/?$/', '\1', trim($config['script_path']));
$url = preg_replace('/^\/?(.*?)\/?$/', '/\1', trim($url));
// Redirect via an HTML form for PITA webservers
if (@preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')))
{
header('HTTP/1.0 302 Redirect');
header('Refresh: 0; URL=' . $server_protocol . $server_name . $server_port . $script_name . $url);
echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta http-equiv="refresh" content="0; url=' . $server_protocol . $server_name . $server_port . $script_name . $url . '"><title>Redirect</title></head><body><div align="center">If your browser does not support meta redirection please click <a href="' . $server_protocol . $server_name . $server_port . $script_name . $url . '">HERE</a> to be redirected</div></body></html>';
exit;
}
header('Location: ' . $protocol . $server . $path . $port . $url);
// Behave as per HTTP/1.1 spec for others
header('Location: ' . $server_protocol . $server_name . $server_port . $script_name . $url);
exit;
}
@ -691,7 +697,7 @@ function validate_username($username)
{
global $db, $user;
$username = sql_quote($username);
$username = $db->sql_escape($username);
$sql = "SELECT username
FROM " . USERS_TABLE . "
@ -719,7 +725,7 @@ function validate_username($username)
while ($row = $db->sql_fetchrow($result))
{
if (preg_match('#\b(' . str_replace('\*', '.*?', preg_quote($row['disallow_username'])) . ')\b#i', $username))
if (preg_match('#\b(' . str_replace('\*', '.*?', preg_quote($row['disallow_username'], '#')) . ')\b#i', $username))
{
return $user->lang['Username_disallowed'];
}
@ -731,7 +737,7 @@ function validate_username($username)
while ($row = $db->sql_fetchrow($result))
{
if (preg_match('#\b(' . str_replace('\*', '.*?', preg_quote($row['word'])) . ')\b#i', $username))
if (preg_match('#\b(' . str_replace('\*', '.*?', preg_quote($row['word'], '#')) . ')\b#i', $username))
{
return $user->lang['Username_disallowed'];
}
@ -761,7 +767,7 @@ function validate_email($email)
while ($row = $db->sql_fetchrow($result))
{
if (preg_match('/^' . str_replace('*', '.*?', $row['ban_email']) . '$/is', $email))
if (preg_match('#^' . str_replace('*', '.*?', $row['ban_email']) . '$#is', $email))
{
return $user->lang['Email_banned'];
}

23
phpBB/includes/functions_admin.php
View File

@ -170,10 +170,12 @@ function sync($type, $id)
return true;
}
function prune($forum_id, $prune_date)
function prune($forum_id, $prune_date, $sql_topics = '')
{
global $db, $lang, $phpEx, $phpbb_root_path;
if ($sql_topics = '')
{
// Those without polls ...
$sql = "SELECT t.topic_id
FROM " . POSTS_TABLE . " p, " . TOPICS_TABLE . " t
@ -193,6 +195,8 @@ function prune($forum_id, $prune_date)
{
$sql_topics .= (($sql_topics != '') ? ', ' : '') . $row['topic_id'];
}
$db->sql_freeresult($result);
}
if ($sql_topics != '')
{
@ -202,16 +206,20 @@ function prune($forum_id, $prune_date)
AND topic_id IN ($sql_topics)";
$result = $db->sql_query($sql);
$sql_post = '';
$sql_posts = '';
while ($row = $db->sql_fetchrow($result))
{
$sql_post .= ( ( $sql_post != '' ) ? ', ' : '' ) . $row['post_id'];
$sql_posts .= (($sql_posts != '') ? ', ' : '') . $row['post_id'];
}
if ($sql_post != '')
{
$db->sql_transaction();
$sql = "DELETE FROM " . TOPICS_WATCH_TABLE . "
WHERE topic_id IN ($sql_topics)";
$db->sql_query($sql);
$sql = "DELETE FROM " . TOPICS_TABLE . "
WHERE topic_id IN ($sql_topics)";
$db->sql_query($sql);
@ -219,20 +227,20 @@ function prune($forum_id, $prune_date)
$pruned_topics = $db->sql_affectedrows();
$sql = "DELETE FROM " . POSTS_TABLE . "
WHERE post_id IN ($sql_post)";
WHERE post_id IN ($sql_posts)";
$db->sql_query($sql);
$pruned_posts = $db->sql_affectedrows();
$sql = "DELETE FROM " . POSTS_TEXT_TABLE . "
WHERE post_id IN ($sql_post)";
WHERE post_id IN ($sql_posts)";
$db->sql_query($sql);
$sql = "DELETE FROM " . SEARCH_MATCH_TABLE . "
WHERE post_id IN ($sql_post)";
WHERE post_id IN ($sql_posts)";
$db->sql_query($sql);
remove_search_post($sql_post);
sync('forum', $forum_id);
$db->sql_transaction('commit');
@ -262,7 +270,6 @@ function auto_prune($forum_id = 0)
$next_prune = time() + ($row['prune_freq'] * 86400);
prune($forum_id, $prune_date);
sync('forum', $forum_id);
$sql = "UPDATE " . FORUMS_TABLE . "
SET prune_next = $next_prune

4
phpBB/includes/page_header.php
View File

@ -29,7 +29,7 @@ define('HEADER_INC', TRUE);
// gzip_compression
if ($config['gzip_compress'])
{
if (extension_loaded('zlib') && strstr($HTTP_USER_AGENT,'compatible') && !headers_sent())
if (extension_loaded('zlib') && !headers_sent())
{
ob_start('ob_gzhandler');
}
@ -306,7 +306,7 @@ $template->assign_vars(array(
'U_SEARCH' => 'search.'.$phpEx.$SID,
'U_REGISTER' => 'ucp.'.$phpEx.$SID.'&amp;mode=register',
'U_PROFILE' => 'ucp.'.$phpEx.$SID.'&amp;mode=editprofile',
'U_MODCP' => 'modcp.'.$phpEx.$SID,
'U_MODCP' => 'mcp.'.$phpEx.$SID,
'U_FAQ' => 'faq.'.$phpEx.$SID,
'U_SEARCH_SELF' => 'search.'.$phpEx.$SID.'&amp;search_id=egosearch',
'U_SEARCH_NEW' => 'search.'.$phpEx.$SID.'&amp;search_id=newposts',

2
phpBB/includes/session.php
View File

@ -203,8 +203,6 @@ class session
}
}
while ($row = $db->sql_fetchrow($result));
}
$db->sql_freeresult($result);

16
phpBB/includes/template.php
View File

@ -37,6 +37,12 @@
to this source
*/
// Changes for 2.2:
//
// * Allow use of Smarty plug-ins?
// * Allow use of DB for storage of compiled templates
// * Reduce number of methods and variables
class Template {
var $classname = 'Template';
@ -129,12 +135,12 @@ class Template {
// If we don't have a file assigned to this handle, die.
if (!isset($this->files[$handle]))
{
message_die("Template->loadfile(): No file specified for handle $handle");
trigger_error("Template->loadfile(): No file specified for handle $handle", E_USER_ERROR);
}
if (!($fp = @fopen($this->files[$handle], 'r')))
{
message_die("Template->loadfile(): Error - file $filename does not exist or is empty");
trigger_error("Template->loadfile(): Error - file $filename does not exist or is empty", E_USER_ERROR);
}
$str = '';
@ -173,7 +179,7 @@ class Template {
{
if (!$this->loadfile($handle))
{
message_die("Template->pparse(): Couldn't load template file for handle $handle");
trigger_error("Template->pparse(): Couldn't load template file for handle $handle", E_USER_ERROR);
}
// Actually compile the code now.
@ -202,7 +208,7 @@ class Template {
{
if (!$this->loadfile($handle))
{
message_die("Template->pparse(): Couldn't load template file for handle $handle");
trigger_error("Template->pparse(): Couldn't load template file for handle $handle", E_USER_ERROR);
}
$code = $this->compile($this->uncompiled_code[$handle], true, '_str');
@ -230,7 +236,7 @@ class Template {
{
if (!$this->loadfile($handle))
{
message_die("Template->pparse(): Couldn't load template file for handle $handle");
trigger_error("Template->pparse(): Couldn't load template file for handle $handle", E_USER_ERROR);
}
$this->compiled_code[$handle] = $this->compile($this->uncompiled_code[$handle]);

2
phpBB/language/en/lang_main.php
View File

@ -658,7 +658,7 @@ $lang = array_merge($lang, array(
'Auth_Administrators' => '<b>administrators</b>',
'Not_Moderator' => 'You are not a moderator of this forum',
'Not_Authorised' => 'Not Authorised',
'You_been_banned' => 'You have been banned from this forum<br />Please contact the webmaster or board administrator for more information',
'You_been_banned' => 'You have been banned from this forum<br />Please contact the %sboard administrator%s for more information',
'Reg_users_zero_online' => 'There are 0 Registered users and ',
'Reg_users_online' => 'There are %d Registered users and ',
'Reg_user_online' => 'There is %d Registered user and ',

197
phpBB/mcp.php
View File

@ -22,6 +22,7 @@
// TODO for 2.2:
//
// * Plug-in based?
// * Add session_id checks for all Moderator ops
// * Tab based system
// * Front page:
// * Select box listing all forums to which user has moderator rights
@ -137,6 +138,7 @@ if ( !empty($topic_id) )
$result = $db->sql_query($sql);
$topic_row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
$forum_topics = ($topic_row['forum_topics'] == 0) ? 1 : $topic_row['forum_topics'];
$forum_id = $topic_row['forum_id'];
@ -150,6 +152,7 @@ else if ( !empty($forum_id) )
$result = $db->sql_query($sql);
$topic_row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
$forum_topics = ($topic_row['forum_topics'] == 0) ? 1 : $topic_row['forum_topics'];
$forum_name = $topic_row['forum_name'];
@ -162,7 +165,7 @@ else
//
// Auth check
//
if ( !$auth->acl_get('m_', $forum_id) && !$auth->acl_get('a_') )
if (!$auth->acl_gets('m_', 'a_', $forum_id))
{
trigger_error($user->lang['Not_Moderator']);
}
@ -178,8 +181,6 @@ switch( $mode )
if ($confirm)
{
include($phpbb_root_path . 'includes/functions_search.'.$phpEx);
$topics = (isset($_POST['topic_id_list'])) ? $_POST['topic_id_list'] : array($topic_id);
$topic_id_sql = '';
@ -188,59 +189,25 @@ switch( $mode )
$topic_id_sql .= (($topic_id_sql != '') ? ', ' : '') . intval($topics[$i]);
}
$sql = "SELECT post_id
FROM " . POSTS_TABLE . "
WHERE topic_id IN ($topic_id_sql)";
$result = $db->sql_query($sql);
$post_id_sql = '';
while ( $row = $db->sql_fetchrow($result) )
{
$post_id_sql .= ( ( $post_id_sql != '' ) ? ', ' : '' ) . $row['post_id'];
}
$db->sql_freeresult($result);
// Use prune feature?
prune($forum_id, '', $topic_id_sql);
$sql = "SELECT vote_id
FROM " . VOTE_DESC_TABLE . "
WHERE topic_id IN ($topic_id_sql)";
$result = $db->sql_query($sql);
if ($row = $db->sql_fetchrow($result))
{
$vote_id_sql = '';
while ( $row = $db->sql_fetchrow($result) )
do
{
$vote_id_sql .= ( ( $vote_id_sql != '' ) ? ', ' : '' ) . $row['vote_id'];
$vote_id_sql .= (($vote_id_sql != '') ? ', ' : '') . intval($row['vote_id']);
}
$db->sql_freeresult($result);
while ($row = $db->sql_fetchrow($result));
//
// Got all required info so go ahead and start deleting everything
//
$sql = "DELETE
FROM " . TOPICS_TABLE . "
WHERE topic_id IN ($topic_id_sql)
OR topic_moved_id IN ($topic_id_sql)";
if ( !$db->sql_query($sql, BEGIN_TRANSACTION) )
{
message_die(GENERAL_ERROR, 'Could not delete topics', '', __LINE__, __FILE__, $sql);
}
$db->sql_transaction();
if ( $post_id_sql != '' )
{
$sql = "DELETE
FROM " . POSTS_TABLE . "
WHERE post_id IN ($post_id_sql)";
$db->sql_query($sql);
$sql = "DELETE
FROM " . POSTS_TEXT_TABLE . "
WHERE post_id IN ($post_id_sql)";
$db->sql_query($sql);
remove_search_post($post_id_sql);
}
if ( $vote_id_sql != '' )
{
$sql = "DELETE
FROM " . VOTE_DESC_TABLE . "
WHERE vote_id IN ($vote_id_sql)";
@ -255,17 +222,10 @@ switch( $mode )
FROM " . VOTE_USERS_TABLE . "
WHERE vote_id IN ($vote_id_sql)";
$db->sql_query($sql);
}
$sql = "DELETE
FROM " . TOPICS_WATCH_TABLE . "
WHERE topic_id IN ($topic_id_sql)";
if ( !$db->sql_query($sql, END_TRANSACTION) )
{
message_die(GENERAL_ERROR, 'Could not delete watched post list', '', __LINE__, __FILE__, $sql);
$db->sql_transaction('commit');
}
sync('forum', $forum_id);
$db->sql_freeresult($result);
if (!empty($topic_id))
{
@ -287,13 +247,12 @@ switch( $mode )
else
{
// Not confirmed, show confirmation message
if (empty($_POST['topic_id_list']) && empty($topic_id))
{
message_die(GENERAL_MESSAGE, $user->lang['None_selected']);
trigger_error($user->lang['None_selected']);
}
$hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" /><input type="hidden" name="' . POST_FORUM_URL . '" value="' . $forum_id . '" />';
$hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" /><input type="hidden" name="f" value="' . $forum_id . '" />';
if (isset($_POST['topic_id_list']))
{
@ -305,14 +264,12 @@ switch( $mode )
}
else
{
$hidden_fields .= '<input type="hidden" name="' . POST_TOPIC_URL . '" value="' . $topic_id . '" />';
$hidden_fields .= '<input type="hidden" name="t" value="' . $topic_id . '" />';
}
//
// Set template files
//
$template->set_filenames(array(
'confirm' => 'confirm_body.tpl')
'body' => 'confirm_body.html')
);
$template->assign_vars(array(
@ -322,12 +279,10 @@ switch( $mode )
'L_YES' => $user->lang['Yes'],
'L_NO' => $user->lang['No'],
'S_CONFIRM_ACTION' => append_sid("mcp.$phpEx"),
'S_CONFIRM_ACTION' => "mcp.$phpEx$SID",
'S_HIDDEN_FIELDS' => $hidden_fields)
);
$template->pparse('confirm');
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
}
break;
@ -355,50 +310,56 @@ switch( $mode )
FROM " . TOPICS_TABLE . "
WHERE topic_id IN ($topic_list)
AND topic_status <> " . ITEM_MOVED;
if ( !($result = $db->sql_query($sql, BEGIN_TRANSACTION)) )
{
message_die(GENERAL_ERROR, 'Could not select from topic table', '', __LINE__, __FILE__, $sql);
}
$result = $db->sql_query($sql);
$row = $db->sql_fetchrowset($result);
$db->sql_freeresult($result);
$db->sql_transaction();
for($i = 0; $i < count($row); $i++)
{
$topic_id = $row[$i]['topic_id'];
if (isset($_POST['move_leave_shadow']))
{
$shadow_sql = array(
'forum_id' => $old_forum_id,
'topic_title' => $db->sql_escape($row[$i]['topic_title']),
'topic_poster' => $row[$i]['topic_poster'],
'topic_time' => $row[$i]['topic_time'],
'topic_status' => ITEM_MOVED,
'topic_type' => POST_NORMAL,
'topic_vote' => $row[$i]['topic_vote'],
'topic_views' => $row[$i]['topic_views'],
'topic_replies' => $row[$i]['topic_replies'],
'topic_first_post_id' => $row[$i]['topic_first_post_id'],
'topic_last_post_id' => $row[$i]['topic_last_post_id'],
'topic_moved_id' => $topic_id,
);
// Insert topic in the old forum that indicates that the forum has moved.
$sql = "INSERT INTO " . TOPICS_TABLE . " (forum_id, topic_title, topic_poster, topic_time, topic_status, topic_type, topic_vote, topic_views, topic_replies, topic_first_post_id, topic_last_post_id, topic_moved_id)
VALUES ($old_forum_id, '" . addslashes(str_replace("\'", "''", $row[$i]['topic_title'])) . "', '" . str_replace("\'", "''", $row[$i]['topic_poster']) . "', " . $row[$i]['topic_time'] . ", " . ITEM_MOVED . ", " . POST_NORMAL . ", " . $row[$i]['topic_vote'] . ", " . $row[$i]['topic_views'] . ", " . $row[$i]['topic_replies'] . ", " . $row[$i]['topic_first_post_id'] . ", " . $row[$i]['topic_last_post_id'] . ", $topic_id)";
if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Could not insert shadow topic', '', __LINE__, __FILE__, $sql);
}
$sql = 'INSERT INTO ' . TOPICS_TABLE . ' ' . $db->sql_build_array('INSERT', $shadow_sql);
$db->sql_query($sql);
}
$sql = "UPDATE " . TOPICS_TABLE . "
SET forum_id = $new_forum_id
WHERE topic_id = $topic_id";
if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Could not update old topic', '', __LINE__, __FILE__, $sql);
}
$db->sql_query($sql);
$sql = "UPDATE " . POSTS_TABLE . "
SET forum_id = $new_forum_id
WHERE topic_id = $topic_id";
if ( !$db->sql_query($sql) )
{
message_die(GENERAL_ERROR, 'Could not update post topic ids', '', __LINE__, __FILE__, $sql);
}
$db->sql_query($sql);
}
// Sync the forum indexes
sync('forum', $new_forum_id);
sync('forum', $old_forum_id);
$db->sql_transaction('commit');
$message = $user->lang['Topics_Moved'] . '<br /><br />';
}
@ -418,22 +379,22 @@ switch( $mode )
$message .= sprintf($user->lang['Click_return_modcp'], '<a href="' . $redirect_page . '">', '</a>');
}
$message = $message . '<br \><br \>' . sprintf($user->lang['Click_return_forum'], '<a href="' . append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$old_forum_id") . '">', '</a>');
$message = $message . '<br \><br \>' . sprintf($user->lang['Click_return_forum'], '<a href="' . "viewforum.$phpEx$SID&amp;f=$old_forum_id" . '">', '</a>');
$template->assign_vars(array(
'META' => '<meta http-equiv="refresh" content="3;url=' . $redirect_page . '">')
);
message_die(GENERAL_MESSAGE, $message);
trigger_error($message);
}
else
{
if (empty($_POST['topic_id_list']) && empty($topic_id))
{
message_die(GENERAL_MESSAGE, $user->lang['None_selected']);
trigger_error($user->lang['None_selected']);
}
$hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" /><input type="hidden" name="' . POST_FORUM_URL . '" value="' . $forum_id . '" />';
$hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" /><input type="hidden" name="f" value="' . $forum_id . '" />';
if (isset($_POST['topic_id_list']))
{
@ -446,14 +407,12 @@ switch( $mode )
}
else
{
$hidden_fields .= '<input type="hidden" name="' . POST_TOPIC_URL . '" value="' . $topic_id . '" />';
$hidden_fields .= '<input type="hidden" name="t" value="' . $topic_id . '" />';
}
//
// Set template files
//
$template->set_filenames(array(
'movetopic' => 'modcp_move.tpl')
'body' => 'mcp_move.html')
);
$template->assign_vars(array(
@ -461,17 +420,13 @@ switch( $mode )
'MESSAGE_TEXT' => $user->lang['Confirm_move_topic'],
'L_MOVE_TO_FORUM' => $user->lang['Move_to_forum'],
'L_LEAVESHADOW' => $user->lang['Leave_shadow_topic'],
'L_YES' => $user->lang['Yes'],
'L_NO' => $user->lang['No'],
'L_LEAVE_SHADOW' => $user->lang['Leave_shadow_topic'],
'S_FORUM_SELECT' => '<select name="new_forum">' . make_forum_select(0, $forum_id) . '</select>',
'S_MODCP_ACTION' => append_sid("mcp.$phpEx"),
'S_MODCP_ACTION' => "mcp.$phpEx$SID",
'S_HIDDEN_FIELDS' => $hidden_fields)
);
$template->pparse('movetopic');
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
}
break;
@ -489,10 +444,7 @@ switch( $mode )
SET topic_status = " . ITEM_LOCKED . "
WHERE topic_id IN ($topic_id_sql)
AND topic_moved_id = 0";
if ( !($result = $db->sql_query($sql)) )
{
trigger_error('Could not update topics table');
}
$db->sql_query($sql);
if (!empty($topic_id))
{
@ -565,11 +517,13 @@ switch( $mode )
$result = $db->sql_query($sql);
$post_rowset = $db->sql_fetchrow($result);
$first_poster = str_replace("\'", "''", $post_rowset['poster_id']);
$db->sql_freeresult($result);
$first_poster = $post_rowset['poster_id'];
$topic_id = $post_rowset['topic_id'];
$post_time = $post_rowset['post_time'];
$post_subject = trim(htmlspecialchars($_POST['subject']));
$post_subject = $db->sql_escape(trim(htmlspecialchars($_POST['subject'])));
if (empty($post_subject))
{
trigger_error($user->lang['Empty_subject']);
@ -578,8 +532,10 @@ switch( $mode )
$new_forum_id = intval($_POST['new_forum_id']);
$topic_time = time();
$db->sql_transaction();
$sql = "INSERT INTO " . TOPICS_TABLE . " (topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type)
VALUES ('" . str_replace("\'", "''", $post_subject) . "', $first_poster, " . $topic_time . ", $new_forum_id, " . ITEM_UNLOCKED . ", " . POST_NORMAL . ")";
VALUES ('$post_subject', $first_poster, " . $topic_time . ", $new_forum_id, " . ITEM_UNLOCKED . ", " . POST_NORMAL . ")";
$db->sql_query($sql);
$new_topic_id = $db->sql_nextid();
@ -611,12 +567,13 @@ switch( $mode )
sync('forum', $new_forum_id);
sync('forum', $forum_id);
$db->sql_transaction('commit');
$template->assign_vars(array(
'META' => '<meta http-equiv="refresh" content="3;url=' . "viewtopic.$phpEx$SID&amp;t==$topic_id" . '">')
);
$message = $user->lang['Topic_split'] . '<br /><br />' . sprintf($user->lang['Click_return_topic'], '<a href="' . "viewtopic.$phpEx$SID&amp;t==$topic_id" . '">', '</a>');
trigger_error($message);
trigger_error($user->lang['Topic_split'] . '<br /><br />' . sprintf($user->lang['Click_return_topic'], '<a href="' . "viewtopic.$phpEx$SID&amp;t=$topic_id" . '">', '</a>'));
}
else
{
@ -624,7 +581,7 @@ switch( $mode )
// Set template files
//
$template->set_filenames(array(
'split_body' => 'modcp_split.tpl')
'body' => 'mcp_split.html')
);
$sql = "SELECT u.username, p.*, pt.post_text, pt.bbcode_uid, pt.post_subject, p.post_username
@ -679,10 +636,8 @@ switch( $mode )
$message = $postrow[$i]['post_text'];
$post_subject = ($postrow[$i]['post_subject'] != '') ? $postrow[$i]['post_subject'] : $topic_title;
//
// If the board has HTML off but the post has HTML
// on then we process it, else leave it alone
//
if (!$config['allow_html'])
{
if ($postrow[$i]['enable_html'])
@ -693,12 +648,10 @@ switch( $mode )
if ($bbcode_uid != '')
{
$message = ( $config['allow_bbcode'] ) ? bbencode_second_pass($message, $bbcode_uid) : preg_replace('/\:[0-9a-z\:]+\]/si', ']', $message);
// $message = ($config['allow_bbcode']) ? bbencode_second_pass($message, $bbcode_uid) : preg_replace('/\:[0-9a-z\:]+\]/si', ']', $message);
}
//
// Define censored word matches
//
$orig_word = array();
$replacement_word = array();
obtain_word_list($orig_word, $replacement_word);
@ -709,14 +662,11 @@ switch( $mode )
$message = preg_replace($orig_word, $replacement_word, $message);
}
$message = make_clickable($message);
if ($config['allow_smilies'] && $postrow[$i]['enable_smilies'])
{
$message = smilies_pass($message);
}
$message = str_replace("\n", '<br />', $message);
$message = nl2br($message);
$checkbox = ($i > 0) ? '<input type="checkbox" name="post_id_list[]" value="' . $post_id . '" />' : '&nbsp;';
@ -730,8 +680,6 @@ switch( $mode )
'S_SPLIT_CHECKBOX' => $checkbox)
);
}
$template->pparse('split_body');
}
}
break;
@ -747,11 +695,9 @@ switch( $mode )
trigger_error($user->lang['No_such_post']);
}
//
// Set template files
//
$template->set_filenames(array(
'viewip' => 'modcp_viewip.tpl')
'body' => 'mcp_viewip.html')
);
// Look up relevent data for this post
@ -822,10 +768,9 @@ switch( $mode )
}
while ($row = $db->sql_fetchrow($result));
}
$db->sql_freeresult($result);
//
// Get other users who've posted under this IP
//
$sql = "SELECT u.user_id, u.username, COUNT(*) as postings
FROM " . USERS_TABLE ." u, " . POSTS_TABLE . " p
WHERE p.poster_id = u.user_id
@ -855,9 +800,7 @@ switch( $mode )
}
while ($row = $db->sql_fetchrow($result));
}
$template->pparse('viewip');
$db->sql_freeresult($result);
break;
default:
@ -865,7 +808,7 @@ switch( $mode )
include($phpbb_root_path . 'includes/page_header.'.$phpEx);
$template->set_filenames(array(
'body' => 'modcp_body.html')
'body' => 'mcp_topics.html')
);
make_jumpbox('mcp.'.$phpEx);
@ -889,9 +832,7 @@ switch( $mode )
'S_MODCP_ACTION' => "mcp.$phpEx$SID")
);
//
// Define censored word matches
//
$orig_word = array();
$replacement_word = array();
obtain_word_list($orig_word, $replacement_word);

40
phpBB/templates/subSilver/mcp_move.html Normal file
View File

@ -0,0 +1,40 @@
<!-- INCLUDE overall_header.html -->
<form action="{S_MODCP_ACTION}" method="post">
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
<td align="left" class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></td>
</tr>
</table>
<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
<tr>
<th height="25" class="thHead"><b>{MESSAGE_TITLE}</b></th>
</tr>
<tr>
<td class="row1">
<table width="100%" border="0" cellspacing="0" cellpadding="1">
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<td align="center"><span class="gen">{L_MOVE_TO_FORUM} &nbsp; {S_FORUM_SELECT}<br /><br />
<input type="checkbox" name="move_leave_shadow" checked="checked" />{L_LEAVE_SHADOW}<br />
<br />
{MESSAGE_TEXT}</span><br />
<br />
{S_HIDDEN_FIELDS}
<input class="mainoption" type="submit" name="confirm" value="{L_YES}" />
&nbsp;&nbsp;
<input class="liteoption" type="submit" name="cancel" value="{L_NO}" />
</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
</table>
</td>
</tr>
</table>
</form>
<!-- INCLUDE overall_footer.html -->

90
phpBB/templates/subSilver/mcp_split.html Normal file
View File

@ -0,0 +1,90 @@
<!-- INCLUDE overall_header.html -->
<form method="post" action="{S_SPLIT_ACTION}">
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
<td align="left" class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a><span class="nav">
-> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td>
</tr>
</table>
<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
<tr>
<th height="25" class="thHead" colspan="3" nowrap="nowrap">{L_SPLIT_TOPIC}</th>
</tr>
<tr>
<td class="row2" colspan="3" align="center"><span class="gensmall">{L_SPLIT_TOPIC_EXPLAIN}</span></td>
</tr>
<tr>
<td class="row1" nowrap="nowrap"><span class="gen">{L_SPLIT_SUBJECT}</span></td>
<td class="row2" colspan="2"><span class="courier">
<input type="text" size="35" style="width: 350px" maxlength="100" name="subject" class="post" />
</span></td>
</tr>
<tr>
<td class="row1" nowrap="nowrap"><span class="gen">{L_SPLIT_FORUM}</span></td>
<td class="row2" colspan="2"><span class="courier">{S_FORUM_SELECT}</span></td>
</tr>
<tr>
<td class="catHead" colspan="3" height="28">
<table width="60%" cellspacing="0" cellpadding="0" border="0" align="center">
<tr>
<td width="50%" align="center">
<input class="liteoption" type="submit" name="split_type_all" value="{L_SPLIT_POSTS}" />
</td>
<td width="50%" align="center">
<input class="liteoption" type="submit" name="split_type_beyond" value="{L_SPLIT_AFTER}" />
</td>
</tr>
</table>
</td>
</tr>
<tr>
<th class="thLeft" nowrap="nowrap">{L_AUTHOR}</th>
<th nowrap="nowrap">{L_MESSAGE}</th>
<th class="thRight" nowrap="nowrap">{L_SELECT}</th>
</tr>
<!-- BEGIN postrow -->
<tr>
<td align="left" valign="top" class="{postrow.ROW_CLASS}"><span class="name"><a name="{postrow.U_POST_ID}"></a>{postrow.POSTER_NAME}</span></td>
<td width="100%" valign="top" class="{postrow.ROW_CLASS}">
<table width="100%" cellspacing="0" cellpadding="3" border="0">
<tr>
<td valign="middle"><img src="templates/subSilver/images/icon_minipost.gif" alt="{L_POST}"><span class="postdetails">{L_POSTED}:
{postrow.POST_DATE}&nbsp;&nbsp;&nbsp;&nbsp;{L_POST_SUBJECT}: {postrow.POST_SUBJECT}</span></td>
</tr>
<tr>
<td valign="top">
<hr size="1" />
<span class="postbody">{postrow.MESSAGE}</span></td>
</tr>
</table>
</td>
<td width="5%" align="center" class="{postrow.ROW_CLASS}">{postrow.S_SPLIT_CHECKBOX}</td>
</tr>
<tr>
<td colspan="3" height="1" class="row3"><img src="templates/subSilver/images/spacer.gif" width="1" height="1" alt="."></td>
</tr>
<!-- END postrow -->
<tr>
<td class="catBottom" colspan="3" height="28">
<table width="60%" cellspacing="0" cellpadding="0" border="0" align="center">
<tr>
<td width="50%" align="center">
<input class="liteoption" type="submit" name="split_type_all" value="{L_SPLIT_POSTS}" />
</td>
<td width="50%" align="center">
<input class="liteoption" type="submit" name="split_type_beyond" value="{L_SPLIT_AFTER}" />
{S_HIDDEN_FIELDS} </td>
</tr>
</table>
</td>
</tr>
</table>
<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
<tr>
<td align="right" valign="top"><span class="gensmall">{S_TIMEZONE}</span></td>
</tr>
</table>
</form>
<!-- INCLUDE overall_footer.html -->

70
phpBB/templates/subSilver/mcp_topics.html Normal file
View File

@ -0,0 +1,70 @@
<!-- INCLUDE overall_header.html -->
<form method="post" action="{S_MODCP_ACTION}"><table width="100%" cellspacing="0" cellpadding="0" border="0" align="center">
<tr>
<td valign="bottom">
<table cellspacing="1" cellpadding="4" border="0" bgcolor="#006699" align="left">
<tr>
<td class="cat">&nbsp;<span class="nav"><a href="">Front Page</a></span>&nbsp;</td>
<td class="cat">&nbsp;<span class="nav"><a href="">Topic Listing</a></span>&nbsp;</td>
</tr>
</table>
</td>
<td align="right" valign="bottom">
<table cellspacing="1" cellpadding="4" border="0">
<tr>
<td><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td>
</tr>
</table>
</td>
</tr>
<tr>
<td colspan="2">
<table width="100%" class="forumline" cellspacing="1" cellpadding="4" border="0">
<tr>
<th width="4%" class="thLeft" nowrap="nowrap">&nbsp;</th>
<th nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th>
<th width="8%" nowrap="nowrap">&nbsp;{L_REPLIES}&nbsp;</th>
<th width="17%" nowrap="nowrap">&nbsp;{L_LASTPOST}&nbsp;</th>
<th width="5%" class="thRight" nowrap="nowrap">&nbsp;{L_SELECT}&nbsp;</th>
</tr>
<!-- BEGIN topicrow -->
<tr>
<td class="row1" align="center" valign="middle"><img src="{topicrow.TOPIC_FOLDER_IMG}" width="19" height="18" alt="{topicrow.L_TOPIC_FOLDER_ALT}" title="{topicrow.L_TOPIC_FOLDER_ALT}" /></td>
<td class="row1">&nbsp;<span class="topictitle">{topicrow.TOPIC_TYPE}<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a></span></td>
<td class="row2" align="center" valign="middle"><span class="postdetails">{topicrow.REPLIES}</span></td>
<td class="row1" align="center" valign="middle"><span class="postdetails">{topicrow.LAST_POST_TIME}</span></td>
<td class="row2" align="center" valign="middle">
<input type="checkbox" name="topic_id_list[]" value="{topicrow.TOPIC_ID}" />
</td>
</tr>
<!-- END topicrow -->
<tr align="right">
<td class="catBottom" colspan="5" height="29"> {S_HIDDEN_FIELDS}
<input type="submit" name="delete" class="liteoption" value="{L_DELETE}" />
&nbsp;
<input type="submit" name="move" class="liteoption" value="{L_MOVE}" />
&nbsp;
<input type="submit" name="lock" class="liteoption" value="{L_LOCK}" />
&nbsp;
<input type="submit" name="unlock" class="liteoption" value="{L_UNLOCK}" />
</td>
</tr>
</table>
<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
<tr>
<td align="left" valign="middle"><span class="nav">{PAGE_NUMBER}</b></span></td>
<td align="right" valign="top" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><br /><span class="nav">{PAGINATION}</span></td>
</tr>
</table>
</form>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td align="right">{JUMPBOX}</td>
</tr>
</table>
</td>
</tr>
</table>
<!-- INCLUDE overall_footer.html -->

61
phpBB/templates/subSilver/mcp_viewip.html Normal file
View File

@ -0,0 +1,61 @@
<!-- INCLUDE overall_header.html -->
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
<td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td>
</tr>
</table>
<table width="100%" cellpadding="3" cellspacing="1" border="0" class="forumline">
<tr>
<th height="25" class="thHead">{L_IP_INFO}</th>
</tr>
<tr>
<td class="catHead" height="28"><span class="cattitle"><b>{L_THIS_POST_IP}</b></span></td>
</tr>
<tr>
<td class="row1">
<table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
<td>&nbsp;<span class="gen">{IP} [ {POSTS} ]</span></td>
<td align="right"><span class="gen">[ <a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a>
]&nbsp;</span></td>
</tr>
</table>
</td>
</tr>
<tr>
<td class="catHead" height="28"><span class="cattitle"><b>{L_OTHER_USERS}</b></span></td>
</tr>
<!-- BEGIN userrow -->
<tr>
<td class="{userrow.ROW_CLASS}">
<table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
<td>&nbsp;<span class="gen"><a href="{userrow.U_PROFILE}">{userrow.USERNAME}</a> [ {userrow.POSTS} ]</span></td>
<td align="right"><a href="{userrow.U_SEARCHPOSTS}" title="{userrow.L_SEARCH_POSTS}"><img src="{SEARCH_IMG}" border="0" alt="{L_SEARCH}" /></a>
&nbsp;</td>
</tr>
</table>
</td>
</tr>
<!-- END userrow -->
<tr>
<td class="catHead" height="28"><span class="cattitle"><b>{L_OTHER_IPS}</b></span></td>
</tr>
<!-- BEGIN iprow -->
<tr>
<td class="{iprow.ROW_CLASS}"><table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
<td>&nbsp;<span class="gen">{iprow.IP} [ {iprow.POSTS} ]</span></td>
<td align="right"><span class="gen">[ <a href="{iprow.U_LOOKUP_IP}">{L_LOOKUP_IP}</a>
]&nbsp;</span></td>
</tr>
</table></td>
</tr>
<!-- END iprow -->
</table>
<br clear="all" />
<!-- INCLUDE overall_footer.html -->