mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-09 22:17:14 +02:00
Code Issues Releases Wiki Activity

merged from 2.0.0 branch (marked merge_point_20020420) + assorted updates and trial stuff for example session alterations

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@2532 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
2002-04-20 00:22:29 +00:00
parent 65aa921828
commit 5b0bba72b1
56 changed files with 4087 additions and 3798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
phpBB/admin/admin_mass_email.php
View File

@@ -33,7 +33,7 @@ if( !empty($setmodules) )
// Load default header
//
$no_page_header = TRUE;
$phpbb_root_path = "../";
$phpbb_root_path = '../';
require($phpbb_root_path . 'extension.inc');
require('pagestart.' . $phpEx);
@@ -43,8 +43,8 @@ require('pagestart.' . $phpEx);
//
@set_time_limit(1200);
$message = "";
$subject = "";
$message = '';
$subject = '';
//
// Do the job ...
@@ -66,12 +66,15 @@ if( isset($HTTP_POST_VARS['submit']) )
$sql = "SELECT user_email
FROM " . USERS_TABLE;
}
if( !$result = $db->sql_query($sql) )
if( !($result = $db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, "Coult not select group members!", __LINE__, __FILE__, $sql);
message_die(GENERAL_ERROR, 'Could not select group members', '', __LINE__, __FILE__, $sql);
}
if( !$db->sql_numrows($result) )
{
//
@@ -81,9 +84,13 @@ if( isset($HTTP_POST_VARS['submit']) )
}
$email_list = $db->sql_fetchrowset($g_result);
$subject = stripslashes($HTTP_POST_VARS["subject"]);
$message = stripslashes($HTTP_POST_VARS["message"]);
$subject = stripslashes($HTTP_POST_VARS['subject']);
$message = stripslashes($HTTP_POST_VARS['message']);
//
// Error checking needs to go here ... if no subject and/or
@@ -107,39 +114,35 @@ if( isset($HTTP_POST_VARS['submit']) )
}
$emailer = new emailer($board_config['smtp_delivery']);
$email_headers = "From: " . $board_config['board_email'] . "\n";
$email_headers = 'From: ' . $board_config['board_email'] . "\n";
$bcc_list = "";
$bcc_list = '';
for($i = 0; $i < count($email_list); $i++)
{
if( $bcc_list != "" )
{
$bcc_list .= ", ";
}
$bcc_list .= $email_list[$i]['user_email'];
$bcc_list .= ( ( $bcc_list != '' ) ? ', ' : '' ) . $email_list[$i]['user_email'];
}
$email_headers .= "Bcc: $bcc_list\n";
$email_headers .= "Return-Path: " . $userdata['board_email'] . "\n";
$email_headers .= "X-AntiAbuse: Board servername - " . $server_name . "\n";
$email_headers .= "X-AntiAbuse: User_id - " . $userdata['user_id'] . "\n";
$email_headers .= "X-AntiAbuse: Username - " . $userdata['username'] . "\n";
$email_headers .= "X-AntiAbuse: User IP - " . decode_ip($user_ip) . "\r\n";
$email_headers .= 'Return-Path: ' . $userdata['board_email'] . "\n";
$email_headers .= 'X-AntiAbuse: Board servername - ' . $server_name . "\n";
$email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\n";
$email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\n";
$email_headers .= 'X-AntiAbuse: User IP - ' . decode_ip($user_ip) . "\r\n";
$emailer->use_template("admin_send_email");
$emailer->use_template('admin_send_email');
$emailer->email_address($board_config['board_email']);
$emailer->set_subject($subject);
$emailer->extra_headers($email_headers);
$emailer->assign_vars(array(
"SITENAME" => $board_config['sitename'],
"BOARD_EMAIL" => $board_config['board_email'],
"MESSAGE" => $message)
'SITENAME' => $board_config['sitename'],
'BOARD_EMAIL' => $board_config['board_email'],
'MESSAGE' => $message)
);
$emailer->send();
$emailer->reset();
$message = $lang['Email_sent'] . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
$message = $lang['Email_sent'] . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>');
message_die(GENERAL_MESSAGE, $message);
}
@@ -152,18 +155,21 @@ if( isset($HTTP_POST_VARS['submit']) )
$sql = "SELECT group_id, group_name
FROM ".GROUPS_TABLE . "
WHERE group_single_user <> 1";
$g_result = $db->sql_query($sql);
$group_list = $db->sql_fetchrowset($g_result);
$select_list = '<select name = "' . POST_GROUPS_URL . '">';
$select_list .= '<option value = "-1">' . $lang['All_users'] . '</option>';
for($i = 0;$i < count($group_list); $i++)
if ( !($result = $db->sql_query($sql)) )
{
$select_list .= "<option value = \"" . $group_list[$i]['group_id'];
$select_list .= "\">" . $group_list[$i]['group_name'] . "</option>";
message_die(GENERAL_ERROR, 'Could not obtain list of groups', '', __LINE__, __FILE__, $sql);
}
$select_list .= "</select>";
$select_list = '<select name = "' . POST_GROUPS_URL . '"><option value = "-1">' . $lang['All_users'] . '</option>';
if ( $row = $db->sql_fetchrow($result) )
{
do
{
$select_list .= '<option value = "' . $row['group_id'] . '">' . $row['group_name'] . '</option>';
}
while ( $row = $db->sql_fetchrow($result) );
}
$select_list .= '</select>';
//
// Generate page
@@ -171,28 +177,28 @@ $select_list .= "</select>";
include('page_header_admin.'.$phpEx);
$template->set_filenames(array(
"body" => "admin/user_email_body.tpl")
'body' => 'admin/user_email_body.tpl')
);
$template->assign_vars(array(
"MESSAGE" => $message,
"SUBJECT" => $subject,
'MESSAGE' => $message,
'SUBJECT' => $subject,
"L_EMAIL_TITLE" => $lang['Email'],
"L_EMAIL_EXPLAIN" => $lang['Mass_email_explain'],
"L_COMPOSE" => $lang['Compose'],
"L_RECIPIENTS" => $lang['Recipients'],
"L_EMAIL_SUBJECT" => $lang['Subject'],
"L_EMAIL_MSG" => $lang['Message'],
"L_EMAIL" => $lang['Email'],
"L_NOTICE" => $notice,
'L_EMAIL_TITLE' => $lang['Email'],
'L_EMAIL_EXPLAIN' => $lang['Mass_email_explain'],
'L_COMPOSE' => $lang['Compose'],
'L_RECIPIENTS' => $lang['Recipients'],
'L_EMAIL_SUBJECT' => $lang['Subject'],
'L_EMAIL_MSG' => $lang['Message'],
'L_EMAIL' => $lang['Email'],
'L_NOTICE' => $notice,
"S_USER_ACTION" => append_sid('admin_mass_email.'.$phpEx),
"S_GROUP_SELECT" => $select_list)
'S_USER_ACTION' => append_sid('admin_mass_email.'.$phpEx),
'S_GROUP_SELECT' => $select_list)
);
$template->pparse('body');
include('page_footer_admin.'.$phpEx);
?>
?>

25
phpBB/admin/page_footer_admin.php
View File

@@ -28,27 +28,16 @@ if ( !defined('IN_PHPBB') )
//
// Show the overall footer.
//
$current_time = time();
$template->set_filenames(array(
"page_footer" => "admin/page_footer.tpl")
'page_footer' => 'admin/page_footer.tpl')
);
$template->assign_vars(array(
"PHPBB_VERSION" => "2.0 " . $board_config['version'],
"TRANSLATION_INFO" => $lang['TRANSLATION_INFO'])
'PHPBB_VERSION' => '2' . $board_config['version'],
'TRANSLATION_INFO' => $lang['TRANSLATION_INFO'])
);
$template->pparse("page_footer");
//
// Output page creation time
//
$mtime = microtime();
$mtime = explode(" ",$mtime);
$mtime = $mtime[1] + $mtime[0];
$endtime = $mtime;
$totaltime = ($endtime - $starttime);
$template->pparse('page_footer');
//
// Close our DB connection.
@@ -73,10 +62,10 @@ if( $do_gzip_compress )
$gzip_contents = gzcompress($gzip_contents, 9);
$gzip_contents = substr($gzip_contents, 0, strlen($gzip_contents) - 4);
echo "\x1f\x8b\x08\x00\x00\x00\x00\x00";
echo '\x1f\x8b\x08\x00\x00\x00\x00\x00';
echo $gzip_contents;
echo pack("V", $gzip_crc);
echo pack("V", $gzip_size);
echo pack('V', $gzip_crc);
echo pack('V', $gzip_size);
}
exit;

288
phpBB/common.php
View File

@@ -29,71 +29,28 @@ error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninit
set_magic_quotes_runtime(0); // Disable magic_quotes_runtime
//
// addslashes to vars if magic_quotes_gpc is off
// this is a security precaution to prevent someone
// trying to break out of a SQL statement.
// addslashes to vars if magic_quotes_gpc is off this is a security precaution
// to prevent someone trying to break out of a SQL statement.
//
if( !get_magic_quotes_gpc() )
function slash_input_data(&$data)
{
if( is_array($HTTP_GET_VARS) )
if ( is_array($data) )
{
while( list($k, $v) = each($HTTP_GET_VARS) )
while( list($k, $v) = each($data) )
{
if( is_array($HTTP_GET_VARS[$k]) )
{
while( list($k2, $v2) = each($HTTP_GET_VARS[$k]) )
{
$HTTP_GET_VARS[$k][$k2] = addslashes($v2);
}
@reset($HTTP_GET_VARS[$k]);
}
else
{
$HTTP_GET_VARS[$k] = addslashes($v);
}
$data[$k] = ( is_array($v) ) ? slash_input_data($v) : addslashes($v);
}
@reset($HTTP_GET_VARS);
}
if( is_array($HTTP_POST_VARS) )
{
while( list($k, $v) = each($HTTP_POST_VARS) )
{
if( is_array($HTTP_POST_VARS[$k]) )
{
while( list($k2, $v2) = each($HTTP_POST_VARS[$k]) )
{
$HTTP_POST_VARS[$k][$k2] = addslashes($v2);
}
@reset($HTTP_POST_VARS[$k]);
}
else
{
$HTTP_POST_VARS[$k] = addslashes($v);
}
}
@reset($HTTP_POST_VARS);
@reset($data);
}
return $data;
}
if( is_array($HTTP_COOKIE_VARS) )
{
while( list($k, $v) = each($HTTP_COOKIE_VARS) )
{
if( is_array($HTTP_COOKIE_VARS[$k]) )
{
while( list($k2, $v2) = each($HTTP_COOKIE_VARS[$k]) )
{
$HTTP_COOKIE_VARS[$k][$k2] = addslashes($v2);
}
@reset($HTTP_COOKIE_VARS[$k]);
}
else
{
$HTTP_COOKIE_VARS[$k] = addslashes($v);
}
}
@reset($HTTP_COOKIE_VARS);
}
if ( !get_magic_quotes_gpc() )
{
$HTTP_GET_VARS = slash_input_data($HTTP_GET_VARS);
$HTTP_POST_VARS = slash_input_data($HTTP_POST_VARS);
$HTTP_COOKIE_VARS = slash_input_data($HTTP_COOKIE_VARS);
}
//
@@ -101,26 +58,213 @@ if( !get_magic_quotes_gpc() )
// malicious rewriting of language and otherarray values via
// URI params
//
$board_config = Array();
$userdata = Array();
$theme = Array();
$images = Array();
$lang = Array();
$board_config = array();
$userdata = array();
$theme = array();
$images = array();
$lang = array();
$gen_simple_header = FALSE;
@include($phpbb_root_path . 'config.'.$phpEx);
require($phpbb_root_path . 'config.'.$phpEx);
if( !defined("PHPBB_INSTALLED") )
{
header("Location: install.$phpEx");
}
include($phpbb_root_path . 'includes/constants.'.$phpEx);
// Debug Level
define('DEBUG', 1); // Debugging on
//define('DEBUG', 0); // Debugging off
// User Levels <- Do not change the values of USER or ADMIN
define('ANONYMOUS', -1);
define('USER', 0);
define('ADMIN', 1);
define('MOD', 2);
// User related
define('USER_ACTIVATION_NONE', 0);
define('USER_ACTIVATION_SELF', 1);
define('USER_ACTIVATION_ADMIN', 2);
define('USER_AVATAR_NONE', 0);
define('USER_AVATAR_UPLOAD', 1);
define('USER_AVATAR_REMOTE', 2);
define('USER_AVATAR_GALLERY', 3);
// Group settings
define('GROUP_OPEN', 0);
define('GROUP_CLOSED', 1);
define('GROUP_HIDDEN', 2);
// Forum state
define('FORUM_UNLOCKED', 0);
define('FORUM_LOCKED', 1);
// Topic status
define('TOPIC_UNLOCKED', 0);
define('TOPIC_LOCKED', 1);
define('TOPIC_MOVED', 2);
define('TOPIC_WATCH_NOTIFIED', 1);
define('TOPIC_WATCH_UN_NOTIFIED', 0);
// Topic types
define('POST_NORMAL', 0);
define('POST_STICKY', 1);
define('POST_ANNOUNCE', 2);
define('POST_GLOBAL_ANNOUNCE', 3);
// SQL codes
define('BEGIN_TRANSACTION', 1);
define('END_TRANSACTION', 2);
// Error codes
define('GENERAL_MESSAGE', 200);
define('GENERAL_ERROR', 202);
define('CRITICAL_MESSAGE', 203);
define('CRITICAL_ERROR', 204);
// Private messaging
define('PRIVMSGS_READ_MAIL', 0);
define('PRIVMSGS_NEW_MAIL', 1);
define('PRIVMSGS_SENT_MAIL', 2);
define('PRIVMSGS_SAVED_IN_MAIL', 3);
define('PRIVMSGS_SAVED_OUT_MAIL', 4);
define('PRIVMSGS_UNREAD_MAIL', 5);
// URL PARAMETERS
define('POST_TOPIC_URL', 't');
define('POST_CAT_URL', 'c');
define('POST_FORUM_URL', 'f');
define('POST_USERS_URL', 'u');
define('POST_POST_URL', 'p');
define('POST_GROUPS_URL', 'g');
// Session parameters
define('SESSION_METHOD_COOKIE', 100);
define('SESSION_METHOD_GET', 101);
// Page numbers for session handling
define('PAGE_INDEX', 0);
define('PAGE_LOGIN', -1);
define('PAGE_SEARCH', -2);
define('PAGE_REGISTER', -3);
define('PAGE_PROFILE', -4);
define('PAGE_VIEWONLINE', -6);
define('PAGE_VIEWMEMBERS', -7);
define('PAGE_FAQ', -8);
define('PAGE_POSTING', -9);
define('PAGE_PRIVMSGS', -10);
define('PAGE_GROUPCP', -11);
define('PAGE_TOPIC_OFFSET', 5000);
// Auth settings
define('AUTH_LIST_ALL', 0);
define('AUTH_ALL', 0);
define('AUTH_REG', 1);
define('AUTH_ACL', 2);
define('AUTH_MOD', 3);
define('AUTH_ADMIN', 5);
define('AUTH_VIEW', 1);
define('AUTH_READ', 2);
define('AUTH_POST', 3);
define('AUTH_REPLY', 4);
define('AUTH_EDIT', 5);
define('AUTH_DELETE', 6);
define('AUTH_ANNOUNCE', 7);
define('AUTH_STICKY', 8);
define('AUTH_POLLCREATE', 9);
define('AUTH_VOTE', 10);
define('AUTH_ATTACH', 11);
// Table names
define('AUTH_ACCESS_TABLE', $table_prefix.'auth_access');
define('BANLIST_TABLE', $table_prefix.'banlist');
define('CATEGORIES_TABLE', $table_prefix.'categories');
define('CONFIG_TABLE', $table_prefix.'config');
define('DISALLOW_TABLE', $table_prefix.'disallow');
define('FORUMS_TABLE', $table_prefix.'forums');
define('GROUPS_TABLE', $table_prefix.'groups');
define('POSTS_TABLE', $table_prefix.'posts');
define('POSTS_TEXT_TABLE', $table_prefix.'posts_text');
define('PRIVMSGS_TABLE', $table_prefix.'privmsgs');
define('PRIVMSGS_TEXT_TABLE', $table_prefix.'privmsgs_text');
define('PRIVMSGS_IGNORE_TABLE', $table_prefix.'privmsgs_ignore');
define('PRUNE_TABLE', $table_prefix.'forum_prune');
define('RANKS_TABLE', $table_prefix.'ranks');
define('SEARCH_TABLE', $table_prefix.'search_results');
define('SEARCH_WORD_TABLE', $table_prefix.'search_wordlist');
define('SEARCH_MATCH_TABLE', $table_prefix.'search_wordmatch');
define('SESSIONS_TABLE', $table_prefix.'sessions');
define('SMILIES_TABLE', $table_prefix.'smilies');
define('THEMES_TABLE', $table_prefix.'themes');
define('THEMES_NAME_TABLE', $table_prefix.'themes_name');
define('TOPICS_TABLE', $table_prefix.'topics');
define('TOPICS_WATCH_TABLE', $table_prefix.'topics_watch');
define('USER_GROUP_TABLE', $table_prefix.'user_group');
define('USERS_TABLE', $table_prefix.'users');
define('WORDS_TABLE', $table_prefix.'words');
define('VOTE_DESC_TABLE', $table_prefix.'vote_desc');
define('VOTE_RESULTS_TABLE', $table_prefix.'vote_results');
define('VOTE_USERS_TABLE', $table_prefix.'vote_voters');
include($phpbb_root_path . 'includes/template.'.$phpEx);
include($phpbb_root_path . 'includes/sessions.'.$phpEx);
include($phpbb_root_path . 'includes/auth.'.$phpEx);
include($phpbb_root_path . 'includes/functions.'.$phpEx);
include($phpbb_root_path . 'includes/db.'.$phpEx);
switch($dbms)
{
case 'mysql':
include($phpbb_root_path . 'db/mysql.'.$phpEx);
break;
case 'mysql4':
include($phpbb_root_path . 'db/mysql4.'.$phpEx);
break;
case 'postgres':
include($phpbb_root_path . 'db/postgres7.'.$phpEx);
break;
case 'mssql':
include($phpbb_root_path . 'db/mssql.'.$phpEx);
break;
case 'oracle':
include($phpbb_root_path . 'db/oracle.'.$phpEx);
break;
case 'msaccess':
include($phpbb_root_path . 'db/msaccess.'.$phpEx);
break;
case 'mssql-odbc':
include($phpbb_root_path . 'db/mssql-odbc.'.$phpEx);
break;
}
// Make the database connection.
$db = new sql_db($dbhost, $dbuser, $dbpasswd, $dbname, false);
if ( !$db->db_connect_id )
{
message_die(CRITICAL_ERROR, "Could not connect to the database");
}
//
// Mozilla navigation bar
@@ -170,22 +314,20 @@ $user_ip = encode_ip($client_ip);
//
$sql = "SELECT *
FROM " . CONFIG_TABLE;
if(!$result = $db->sql_query($sql))
if ( !($result = $db->sql_query($sql)) )
{
message_die(CRITICAL_ERROR, "Could not query config information", "", __LINE__, __FILE__, $sql);
message_die(CRITICAL_ERROR, 'Could not query config information', '', __LINE__, __FILE__, $sql);
}
else
while($row = $db->sql_fetchrow($result))
{
while($row = $db->sql_fetchrow($result))
{
$board_config[$row['config_name']] = $row['config_value'];
}
$board_config[$row['config_name']] = $row['config_value'];
}
//
// Show 'Board is disabled' message if needed.
//
if( $board_config['board_disable'] && !defined("IN_ADMIN") && !defined("IN_LOGIN") )
if ( $board_config['board_disable'] && !defined('IN_ADMIN') && !defined('IN_LOGIN') )
{
message_die(GENERAL_MESSAGE, 'Board_disable', 'Information');
}

BIN
phpBB/db/schemas/ms_access_primer.zip
View File

Binary file not shown.

2
phpBB/db/schemas/mssql_basic.sql
View File

@@ -67,7 +67,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('record_online_user
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_name', 'www.yourdomain.tld');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.1.0 [20020402]');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.1.0 [20020420]');
/*
-- Categories

2
phpBB/db/schemas/mssql_schema.sql
View File

@@ -318,7 +318,7 @@ CREATE TABLE [phpbb_users] (
[user_regdate] [int] NOT NULL ,
[user_level] [smallint] NOT NULL ,
[user_posts] [int] NOT NULL ,
[user_timezone] [real] NOT NULL ,
[user_timezone] [decimal] (4,2) NOT NULL ,
[user_style] [int] NULL ,
[user_lang] [varchar] (255) NULL ,
[user_dateformat] [varchar] (14) NOT NULL ,

2
phpBB/db/schemas/mysql_basic.sql
View File

@@ -60,7 +60,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('record_online_date
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_name', 'www.myserver.tld');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.1.0 [20020402]');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.1.0 [20020420]');
# -- Categories

2
phpBB/db/schemas/mysql_schema.sql
View File

@@ -463,7 +463,7 @@ CREATE TABLE phpbb_users (
user_regdate int(11) DEFAULT '0' NOT NULL,
user_level tinyint(4) DEFAULT '0',
user_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
user_timezone float DEFAULT '0' NOT NULL,
user_timezone decimal(4,2) DEFAULT '0' NOT NULL,
user_style tinyint(4),
user_lang varchar(255),
user_dateformat varchar(14) DEFAULT 'd M Y H:i' NOT NULL,

2
phpBB/db/schemas/postgres_basic.sql
View File

@@ -61,7 +61,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('record_online_date
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_name', 'www.yourdomain.tld');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '80');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('script_path', '/phpBB2/');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.1.0 [20020402]');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '.1.0 [20020420]');
-- Categories
INSERT INTO phpbb_categories (cat_id, cat_title, cat_order) VALUES (1, 'Test category 1', 10);

2
phpBB/db/schemas/postgres_schema.sql
View File

@@ -478,7 +478,7 @@ CREATE TABLE phpbb_users (
user_avatar_type int2 DEFAULT '0' NOT NULL,
user_level int4 DEFAULT '1',
user_lang varchar(255),
user_timezone real DEFAULT '0' NOT NULL,
user_timezone decimal(4) DEFAULT '0' NOT NULL,
user_dateformat varchar(14) DEFAULT 'd M Y H:m' NOT NULL,
user_notify_pm int2 DEFAULT '1' NOT NULL,
user_popup_pm int2 DEFAULT '0' NOT NULL,

9
phpBB/groupcp.php
View File

@@ -29,7 +29,7 @@ include($phpbb_root_path . 'common.'.$phpEx);
//
function generate_user_info(&$row, $date_format, $group_mod, &$from, &$posts, &$joined, &$poster_avatar, &$profile_img, &$profile, &$search_img, &$search, &$pm_img, &$pm, &$email_img, &$email, &$www_img, &$www, &$icq_status_img, &$icq_img, &$icq, &$aim_img, &$aim, &$msn_img, &$msn, &$yim_img, &$yim)
{
global $lang, $images, $board_config;
global $lang, $images, $board_config, $phpEx;
$from = ( !empty($row['user_from']) ) ? $row['user_from'] : '&nbsp;';
$joined = create_date($date_format, $row['user_regdate'], $board_config['board_timezone']);
@@ -207,7 +207,7 @@ else if ( isset($HTTP_POST_VARS['joingroup']) && $group_id )
//
if ( !$userdata['session_logged_in'] )
{
header($header_location . ppend_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
header($header_location . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
}
$sql = "SELECT ug.user_id, g.group_type
@@ -308,7 +308,7 @@ else if ( isset($HTTP_POST_VARS['unsub']) || isset($HTTP_POST_VARS['unsubpending
//
if ( $cancel )
{
header($header_location . ppend_sid("groupcp.$phpEx", true));
header($header_location . append_sid("groupcp.$phpEx", true));
}
elseif ( !$userdata['session_logged_in'] )
{
@@ -912,7 +912,8 @@ else if ( $group_id )
'L_PENDING_MEMBERS' => $lang['Pending_members'],
'L_SELECT_SORT_METHOD' => $lang['Select_sort_method'],
'L_PM' => $lang['Private_Message'],
'L_EMAIL' => $lang['Email'],
'L_EMAIL' => $lang['Email'],
'L_POSTS' => $lang['Posts'],
'L_WEBSITE' => $lang['Website'],
'L_FROM' => $lang['Location'],
'L_ORDER' => $lang['Order'],

10
phpBB/includes/bbcode.php
View File

@@ -251,7 +251,7 @@ function bbencode_first_pass($text, $uid)
// [QUOTE] and [/QUOTE] for posting replies with quote, or just for quoting stuff.
$text = bbencode_first_pass_pda($text, $uid, '[quote]', '[/quote]', '', false, '');
$text = bbencode_first_pass_pda($text, $uid, '/\[quote=(\\\\".*?\\\\")\]/is', '[/quote]', '', false, '', "[quote:$uid=\\1]");
$text = bbencode_first_pass_pda($text, $uid, '/\[quote=(\\\\"[^"]*?\\\\")\]/is', '[/quote]', '', false, '', "[quote:$uid=\\1]");
// [list] and [list=x] for (un)ordered lists.
$open_tag = array();
@@ -433,7 +433,13 @@ function bbencode_first_pass_pda($text, $uid, $open_tag, $close_tag, $close_tag_
// Push its position, the text we matched, and its index in the open_tag array on to the stack, and then keep going to the right.
$match = array("pos" => $curr_pos, "tag" => $which_start_tag, "index" => $start_tag_index);
bbcode_array_push($stack, $match);
++$curr_pos;
//
// Rather than just increment $curr_pos
// Set it to the ending of the tag we just found
// Keeps error in nested tag from breaking out
// of table structure..
//
$curr_pos = $curr_pos + strlen($possible_start);
}
else
{

12
phpBB/includes/emailer.php
View File

@@ -178,17 +178,7 @@ class emailer
//
function send()
{
global $phpEx, $phpbb_root_dir;
if (isset($phpbb_root_dir))
{
// we must be in the admin section.
$phpbb_root_path = $phpbb_root_dir;
}
else
{
$phpbb_root_path = "./";
}
global $phpEx, $phpbb_root_path;
if ($this->address == NULL)
{

2
phpBB/includes/functions.php
View File

@@ -491,7 +491,7 @@ function obtain_word_list(&$orig_word, &$replacement_word)
//
function message_die($msg_code, $msg_text = '', $msg_title = '', $err_line = '', $err_file = '', $sql = '')
{
global $db, $template, $board_config, $theme, $lang, $phpEx, $phpbb_root_path, $nav_links;
global $db, $template, $board_config, $theme, $lang, $phpEx, $phpbb_root_path, $nav_links, $gen_simple_header;
global $userdata, $user_ip, $session_length;
global $starttime;

12
phpBB/includes/functions_post.php
View File

@@ -22,7 +22,7 @@
if ( !defined('IN_PHPBB') )
{
die("Hacking attempt");
die('Hacking attempt');
}
$html_entities_match = array('#&#', '#<#', '#>#');
@@ -380,7 +380,7 @@ function update_post_stats(&$mode, &$post_data, &$forum_id, &$topic_id, &$post_i
{
global $db;
$sign = ( $mode == 'delete' ) ? "- 1" : "+ 1";
$sign = ( $mode == 'delete' ) ? '- 1' : '+ 1';
$forum_update_sql = "forum_posts = forum_posts $sign";
$topic_update_sql = '';
@@ -395,7 +395,7 @@ function update_post_stats(&$mode, &$post_data, &$forum_id, &$topic_id, &$post_i
else
{
$topic_update_sql = "topic_replies = topic_replies - 1";
$topic_update_sql .= "topic_replies = topic_replies - 1";
$sql = "SELECT MAX(post_id) AS post_id
FROM " . POSTS_TABLE . "
@@ -439,9 +439,13 @@ function update_post_stats(&$mode, &$post_data, &$forum_id, &$topic_id, &$post_i
if ( $row = $db->sql_fetchrow($result) )
{
$topic_update_sql = 'topic_replies = topic_replies - 1, topic_first_post_id = ' . $row['post_id'];
$topic_update_sql .= 'topic_replies = topic_replies - 1, topic_first_post_id = ' . $row['post_id'];
}
}
else
{
$topic_update_sql .= 'topic_replies = topic_replies - 1';
}
}
else if ( $mode != 'poll_delete' )
{

5
phpBB/includes/functions_search.php
View File

@@ -428,7 +428,9 @@ function remove_search_post($post_id_sql)
function username_search($search_match)
{
global $db, $board_config, $template, $lang, $images, $theme, $phpEx, $phpbb_root_path;
global $starttime;
global $starttime, $gen_simple_header;
$gen_simple_header = TRUE;
$username_list = '';
if ( !empty($search_match) )
@@ -459,7 +461,6 @@ function username_search($search_match)
$db->sql_freeresult($result);
}
$gen_simple_header = TRUE;
$page_title = $lang['Search'];
include($phpbb_root_path . 'includes/page_header.'.$phpEx);

8
phpBB/includes/functions_validate.php
View File

@@ -63,7 +63,7 @@ function validate_username($username)
{
while( $row = $db->sql_fetchrow($result) )
{
if ( preg_match("#\b(" . str_replace("\*", "\w*?", preg_quote($row['disallow_username'])) . ")\b#i", $username) )
if ( preg_match("#\b(" . str_replace("\*", ".*?", preg_quote($row['disallow_username'])) . ")\b#i", $username) )
{
return array('error' => true, 'error_msg' => $lang['Username_disallowed']);
}
@@ -76,7 +76,7 @@ function validate_username($username)
{
while( $row = $db->sql_fetchrow($result) )
{
if ( preg_match("#\b(" . str_replace("\*", "\w*?", preg_quote($row['word'])) . ")\b#i", $username) )
if ( preg_match("#\b(" . str_replace("\*", ".*?", preg_quote($row['word'])) . ")\b#i", $username) )
{
return array('error' => true, 'error_msg' => $lang['Username_disallowed']);
}
@@ -102,7 +102,7 @@ function validate_email($email)
if ( $email != '' )
{
if ( preg_match('/^[a-z0-9\.\-_]+@[a-z0-9\-_]+\.([a-z0-9\-_]+\.)*?[a-z]+$/is', $email) )
if ( preg_match('/^[a-z0-9\.\-_\+]+@[a-z0-9\-_]+\.([a-z0-9\-_]+\.)*?[a-z]+$/is', $email) )
{
$sql = "SELECT ban_email
FROM " . BANLIST_TABLE;
@@ -110,7 +110,7 @@ function validate_email($email)
{
while( $row = $db->sql_fetchrow($result) )
{
$match_email = str_replace('*', '.*', $row['ban_email']);
$match_email = str_replace('*', '.*?', $row['ban_email']);
if ( preg_match('/^' . $match_email . '$/is', $email) )
{
return array('error' => true, 'error_msg' => $lang['Email_banned']);

10
phpBB/includes/page_header.php
View File

@@ -85,13 +85,11 @@ $s_last_visit = ( $userdata['session_logged_in'] ) ? create_date($board_config['
// Get basic (usernames + totals) online
// situation
//
$user_forum_sql = ( !empty($forum_id) ) ? "AND ( u.user_session_page = $forum_id
OR s.session_page = $forum_id)" : '';
$user_forum_sql = ( !empty($forum_id) ) ? "AND s.session_page = $forum_id" : '';
$sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_level, s.session_logged_in, s.session_ip
FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
WHERE u.user_id = s.session_user_id
AND ( s.session_time >= ".( time() - 300 ) . "
OR u.user_session_time >= " . ( time() - 300 ) . " )
AND s.session_time >= ".( time() - 300 ) . "
$user_forum_sql
ORDER BY u.username ASC, s.session_ip ASC";
if( !($result = $db->sql_query($sql)) )
@@ -364,6 +362,8 @@ $template->assign_vars(array(
'L_SEARCH_SELF' => $lang['Search_your_posts'],
'L_WHOSONLINE_ADMIN' => sprintf($lang['Admin_online_color'], '<span style="color:#' . $theme['fontcolor3'] . '">', '</span>'),
'L_WHOSONLINE_MOD' => sprintf($lang['Mod_online_color'], '<span style="color:#' . $theme['fontcolor2'] . '">', '</span>'),
'L_WHOSONLINE_USER' => sprintf($lang['User_online_color'], '<span style="color:#' . $theme['fontcolor1'] . '">', '</span>'),
'L_LEGEND' => $lang['Legend'],
'U_SEARCH_UNANSWERED' => append_sid('search.'.$phpEx.'?search_id=unanswered'),
'U_SEARCH_SELF' => append_sid('search.'.$phpEx.'?search_id=egosearch'),
@@ -386,7 +386,7 @@ $template->assign_vars(array(
'S_CONTENT_ENCODING' => $lang['ENCODING'],
'S_CONTENT_DIR_LEFT' => $lang['LEFT'],
'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'],
'S_TIMEZONE' => sprintf($lang['All_times'], $lang[$board_config['board_timezone']]),
'S_TIMEZONE' => sprintf($lang['All_times'], $lang[number_format($board_config['board_timezone'])]),
'S_LOGIN_ACTION' => append_sid('login.'.$phpEx),
'T_HEAD_STYLESHEET' => $theme['head_stylesheet'],

120
phpBB/includes/sessions.php
View File

@@ -20,8 +20,6 @@
*
***************************************************************************/
//
// session_begin()
//
// Adds/updates a new session to the database for the given userid.
// Returns the new session ID on success.
@@ -54,8 +52,7 @@ function session_begin($user_id, $user_ip, $page_id, $auto_create = 0, $enable_a
$expiry_time = $current_time - $board_config['session_length'];
//
// Try and pull the last time stored
// in a cookie, if it exists
// Try and pull the last time stored in a cookie, if it exists
//
$sql = "SELECT *
FROM " . USERS_TABLE . "
@@ -81,8 +78,6 @@ function session_begin($user_id, $user_ip, $page_id, $auto_create = 0, $enable_a
// autologinid matches password
$login = 1;
$enable_autologin = 1;
$last_visit = ( $userdata['user_session_time'] > 0 ) ? $userdata['user_session_time'] : $current_time;
}
else
{
@@ -102,7 +97,6 @@ function session_begin($user_id, $user_ip, $page_id, $auto_create = 0, $enable_a
}
else
{
$last_visit = ( $userdata['user_session_time'] > 0 ) ? $userdata['user_session_time'] : $current_time;
$login = 1;
}
}
@@ -146,27 +140,29 @@ function session_begin($user_id, $user_ip, $page_id, $auto_create = 0, $enable_a
SET session_user_id = $user_id, session_start = $current_time, session_time = $current_time, session_page = $page_id, session_logged_in = $login
WHERE session_id = '" . $session_id . "'
AND session_ip = '$user_ip'";
if ( !($result = $db->sql_query($sql)) || !$db->sql_affectedrows() )
if ( !$db->sql_query($sql) || !$db->sql_affectedrows() )
{
$session_id = md5(uniqid($user_ip));
$sql = "INSERT INTO " . SESSIONS_TABLE . "
(session_id, session_user_id, session_start, session_time, session_ip, session_page, session_logged_in)
VALUES ('$session_id', $user_id, $current_time, $current_time, '$user_ip', $page_id, $login)";
if ( !($result = $db->sql_query($sql)) )
if ( !$db->sql_query($sql) )
{
message_die(CRITICAL_ERROR, 'Error creating new session : session_begin', '', __LINE__, __FILE__, $sql);
message_die(CRITICAL_ERROR, 'Error creating new session', '', __LINE__, __FILE__, $sql);
}
}
if ( $user_id != ANONYMOUS )
{
{// ( $userdata['user_session_time'] > $expiry_time && $auto_create ) ? $userdata['user_lastvisit'] : (
$last_visit = ( $userdata['user_session_time'] > 0 ) ? $userdata['user_session_time'] : $current_time;
$sql = "UPDATE " . USERS_TABLE . "
SET user_session_time = $current_time, user_session_page = $page_id, user_lastvisit = $last_visit
WHERE user_id = $user_id";
if ( !$db->sql_query($sql) )
{
message_die(CRITICAL_ERROR, 'Error updating last visit time : session_begin', '', __LINE__, __FILE__, $sql);
message_die(CRITICAL_ERROR, 'Error updating last visit time', '', __LINE__, __FILE__, $sql);
}
$userdata['user_lastvisit'] = $last_visit;
@@ -185,8 +181,6 @@ function session_begin($user_id, $user_ip, $page_id, $auto_create = 0, $enable_a
setcookie($cookiename . '_data', serialize($sessiondata), $current_time + 31536000, $cookiepath, $cookiedomain, $cookiesecure);
setcookie($cookiename . '_sid', $session_id, 0, $cookiepath, $cookiedomain, $cookiesecure);
// header('Set-cookie: ' . $cookiename . '_data=' . urlencode(serialize($sessiondata)) . '; expires=' . gmdate("l, d-M-Y H:i:s", $current_time + 31536000) . ' GMT; domain=' . $cookiedomain . '; path=' . $cookiepath . $cookiesecure);
// header('Set-cookie: ' . $cookiename . '_sid=' . $session_id . '; domain=' . $cookiedomain . '; path=' . $cookiepath . $cookiesecure);
$SID = ( $sessionmethod == SESSION_METHOD_GET ) ? 'sid=' . $session_id : '';
@@ -194,8 +188,8 @@ function session_begin($user_id, $user_ip, $page_id, $auto_create = 0, $enable_a
}
//
// Checks for a given user session, tidies session
// table and updates user sessions at each page refresh
// Checks for a given user session, tidies session table and updates user
// sessions at each page refresh
//
function session_pagestart($user_ip, $thispage_id)
{
@@ -206,7 +200,6 @@ function session_pagestart($user_ip, $thispage_id)
$cookiepath = $board_config['cookie_path'];
$cookiedomain = $board_config['cookie_domain'];
$cookiesecure = $board_config['cookie_secure'];
$cookiesecure = ( $board_config['cookie_secure'] ) ? '; secure' : '';
$current_time = time();
unset($userdata);
@@ -240,7 +233,7 @@ function session_pagestart($user_ip, $thispage_id)
AND s.session_ip = '$user_ip'";
if ( !($result = $db->sql_query($sql)) )
{
message_die(CRITICAL_ERROR, 'Error doing DB query userdata row fetch : session_pagestart', '', __LINE__, __FILE__, $sql);
message_die(CRITICAL_ERROR, 'Error doing DB query userdata row fetch', '', __LINE__, __FILE__, $sql);
}
$userdata = $db->sql_fetchrow($result);
@@ -255,32 +248,66 @@ function session_pagestart($user_ip, $thispage_id)
//
// Only update session DB a minute or so after last update
//
$last_update = ( $userdata['user_id'] == ANONYMOUS ) ? $userdata['session_time'] : $userdata['user_session_time'];
if ( $current_time - $last_update > 60 )
{ // || $userdata['user_session_page'] != $thispage_id
$sql = ( $userdata['user_id'] == ANONYMOUS ) ? "UPDATE " . SESSIONS_TABLE . " SET session_time = $current_time, session_page = $thispage_id WHERE session_id = '" . $userdata['session_id'] . "' AND session_ip = '$user_ip'" : "UPDATE " . USERS_TABLE . " SET user_session_time = $current_time, user_session_page = $thispage_id WHERE user_id = " . $userdata['user_id'];
if ( $current_time - $userdata['session_time'] > 60 || $userdata['session_page'] != $thispage_id )
{
$sql = "UPDATE " . SESSIONS_TABLE . "
SET session_time = $current_time, session_page = $thispage_id
WHERE session_id = '" . $userdata['session_id'] . "'
AND session_ip = '$user_ip'";
if ( !$db->sql_query($sql) )
{
message_die(CRITICAL_ERROR, 'Error updating sessions table : session_pagestart', '', __LINE__, __FILE__, $sql);
message_die(CRITICAL_ERROR, 'Error updating sessions table', '', __LINE__, __FILE__, $sql);
}
//
// Delete expired sessions
//
$expiry_time = $current_time - $board_config['session_length'];
$sql = "DELETE FROM " . SESSIONS_TABLE . "
WHERE session_time < $expiry_time
AND session_id <> '$session_id'";
if ( !($result = $db->sql_query($sql)) )
if ( $current_time - $board_config['session_gc'] > $board_config['session_last_gc'] )
{
message_die(CRITICAL_ERROR, 'Error clearing sessions table : session_pagestart', '', __LINE__, __FILE__, $sql);
$sql = "SELECT *
FROM " . SESSIONS_TABLE . "
WHERE session_time < " . ( $current_time - $board_config['session_length'] ) . "
AND session_logged_in = 1";
if ( !($result = $db->sql_query($sql)) )
{
message_die(CRITICAL_ERROR, 'Could not obtain expired session list', '', __LINE__, __FILE__, $sql);
}
$del_session_id = '';
while ( $row = $db->sql_fetchrow($result) )
{
$sql = "UPDATE " . USERS_TABLE . "
SET user_lastvisit = " . $row['session_time'] . ", user_session_page = " . $row['session_page'] . "
WHERE user_id = " . $row['session_user_id'];
if ( !$db->sql_query($sql) )
{
message_die(CRITICAL_ERROR, 'Could not update user session info', '', __LINE__, __FILE__, $sql);
}
$del_session_id .= ( ( $del_session_id != '' ) ? ', ' : '' ) . '\'' . $row['session_id'] . '\'';
}
if ( $del_session_id != '' )
{
//
// Delete expired sessions
//
$sql = "DELETE FROM " . SESSIONS_TABLE . "
WHERE session_id IN ($del_session_id)";
if ( !$db->sql_query($sql) )
{
message_die(CRITICAL_ERROR, 'Error clearing sessions table', '', __LINE__, __FILE__, $sql);
}
}
echo $sql = "UPDATE " . CONFIG_TABLE . "
SET config_value = '$current_time'
WHERE config_name = 'session_last_gc'";
if ( !$db->sql_query($sql) )
{
message_die(CRITICAL_ERROR, 'Could not update session gc time', '', __LINE__, __FILE__, $sql);
}
}
setcookie($cookiename . '_data', serialize($sessiondata), $current_time + 31536000, $cookiepath, $cookiedomain, $cookiesecure);
setcookie($cookiename . '_sid', $session_id, 0, $cookiepath, $cookiedomain, $cookiesecure);
// header('Set-cookie: ' . $cookiename . '_data=' . urlencode(serialize($sessiondata)) . '; expires=' . gmdate("l, d-M-Y H:i:s", $current_time + 31536000) . ' GMT; domain=' . $cookiedomain . '; path=' . $cookiepath . $cookiesecure);
// header('Set-cookie: ' . $cookiename . '_sid=' . $session_id . '; domain=' . $cookiedomain . '; path=' . $cookiepath . $cookiesecure);
}
return $userdata;
@@ -295,7 +322,7 @@ function session_pagestart($user_ip, $thispage_id)
if ( !($userdata = session_begin($user_id, $user_ip, $thispage_id, TRUE)) )
{
message_die(CRITICAL_ERROR, 'Error creating user session : session_pagestart', '', __LINE__, __FILE__, $sql);
message_die(CRITICAL_ERROR, 'Error creating user session', '', __LINE__, __FILE__, $sql);
}
return $userdata;
@@ -316,7 +343,6 @@ function session_end($session_id, $user_id)
$cookiepath = $board_config['cookie_path'];
$cookiedomain = $board_config['cookie_domain'];
$cookiesecure = $board_config['cookie_secure'];
// $cookiesecure = ( $board_config['cookie_secure'] ) ? '; secure' : '';
//
// Pull cookiedata or grab the URI propagated sid
@@ -324,12 +350,10 @@ function session_end($session_id, $user_id)
if ( isset($HTTP_COOKIE_VARS[$cookiename . '_sid']) )
{
$session_id = isset( $HTTP_COOKIE_VARS[$cookiename . '_sid'] ) ? $HTTP_COOKIE_VARS[$cookiename . '_sid'] : '';
$sessionmethod = SESSION_METHOD_COOKIE;
}
else
{
$session_id = ( isset($HTTP_GET_VARS['sid']) ) ? $HTTP_GET_VARS['sid'] : '';
$sessionmethod = SESSION_METHOD_GET;
}
//
@@ -338,27 +362,19 @@ function session_end($session_id, $user_id)
$sql = "DELETE FROM " . SESSIONS_TABLE . "
WHERE session_id = '$session_id'
AND session_user_id = $user_id";
if ( !($result = $db->sql_query($sql)) )
if ( !$db->sql_query($sql) )
{
message_die(CRITICAL_ERROR, 'Error removing user session : session_end', '', __LINE__, __FILE__, $sql);
message_die(CRITICAL_ERROR, 'Error removing user session', '', __LINE__, __FILE__, $sql);
}
setcookie($cookiename . '_data', '', $current_time - 31536000, $cookiepath, $cookiedomain, $cookiesecure);
setcookie($cookiename . '_sid', '', $current_time - 31536000, $cookiepath, $cookiedomain, $cookiesecure);
// header('Set-cookie: ' . $cookiename . '_data=0; expires=' . gmdate("l, d-M-Y H:i:s", 0) . ' GMT; domain=' . $cookiedomain . '; path=' . $cookiepath. $cookiesecure);
// header('Set-cookie: ' . $cookiename . '_sid=0; expires=' . gmdate("l, d-M-Y H:i:s", 0) . ' GMT; domain=' . $cookiedomain . '; path=' . $cookiepath . $cookiesecure);
$SID = ( $sessionmethod == SESSION_METHOD_GET ) ? 'sid=' . $session_id : '';
return TRUE;
return true;
}
//
// Append $SID to a url. Borrowed from phplib and modified. This is an
// extra routine utilised by the session code above and acts as a wrapper
// around every single URL and form action. If you replace the session
// code you must include this routine, even if it's empty.
// Append $SID to a url. Borrowed from phplib and modified.
//
function append_sid($url, $non_html_amp = false)
{
@@ -372,4 +388,4 @@ function append_sid($url, $non_html_amp = false)
return($url);
}
?>
?>

6
phpBB/includes/usercp_avatar.php
View File

@@ -233,7 +233,7 @@ function user_avatar_upload($mode, $avatar_mode, &$current_avatar, &$current_typ
return $avatar_sql;
}
function display_avatar_gallery($mode, &$category, &$user_id, &$email, &$current_email, &$coppa, &$username, &$email, &$icq, &$aim, &$msn, &$yim, &$website, &$location, &$occupation, &$interests, &$signature, &$viewemail, &$notifypm, &$popuppm, &$notifyreply, &$attachsig, &$allowhtml, &$allowbbcode, &$allowsmilies, &$allowviewonline, &$style, &$language, &$timezone, &$dateformat)
function display_avatar_gallery($mode, &$category, &$user_id, &$email, &$current_email, &$coppa, &$username, &$email, &$icq, &$aim, &$msn, &$yim, &$website, &$location, &$occupation, &$interests, &$signature, &$viewemail, &$notifypm, &$popuppm, &$notifyreply, &$attachsig, &$allowhtml, &$allowbbcode, &$allowsmilies, &$hideonline, &$style, &$language, &$timezone, &$dateformat)
{
global $board_config, $db, $template, $lang, $images, $theme;
global $phpbb_root_path, $phpEx;
@@ -309,7 +309,7 @@ function display_avatar_gallery($mode, &$category, &$user_id, &$email, &$current
}
}
$params = array('coppa', 'user_id', 'username', 'email', 'current_email', 'icq', 'aim', 'msn', 'yim', 'website', 'location', 'occupation', 'interests', 'signature', 'viewemail', 'notifypm', 'popuppm', 'notifyreply', 'attachsig', 'allowhtml', 'allowbbcode', 'allowsmilies', 'allowviewonline', 'style', 'language', 'timezone', 'dateformat');
$params = array('coppa', 'user_id', 'username', 'email', 'current_email', 'icq', 'aim', 'msn', 'yim', 'website', 'location', 'occupation', 'interests', 'signature', 'viewemail', 'notifypm', 'popuppm', 'notifyreply', 'attachsig', 'allowhtml', 'allowbbcode', 'allowsmilies', 'hideonline', 'style', 'language', 'timezone', 'dateformat');
$s_hidden_vars = '<input type="hidden" name="agreed" value="true" />';
@@ -333,4 +333,4 @@ function display_avatar_gallery($mode, &$category, &$user_id, &$email, &$current
return;
}
?>
?>

12
phpBB/includes/usercp_email.php
View File

@@ -27,12 +27,6 @@ if ( !defined('IN_PHPBB') )
exit;
}
if ( !$userdata['session_logged_in'] )
{
header('Location: ' . append_sid("login.$phpEx?redirect=profile.$phpEx&mode=email&" . POST_USERS_URL . "=$user_id", true));
exit;
}
if ( !empty($HTTP_GET_VARS[POST_USERS_URL]) || !empty($HTTP_POST_VARS[POST_USERS_URL]) )
{
$user_id = ( !empty($HTTP_GET_VARS[POST_USERS_URL]) ) ? $HTTP_GET_VARS[POST_USERS_URL] : $HTTP_POST_VARS[POST_USERS_URL];
@@ -42,6 +36,12 @@ else
message_die(GENERAL_MESSAGE, $lang['No_user_specified']);
}
if ( !$userdata['session_logged_in'] )
{
header('Location: ' . append_sid("login.$phpEx?redirect=profile.$phpEx&mode=email&" . POST_USERS_URL . "=$user_id", true));
exit;
}
$sql = "SELECT username, user_email, user_viewemail, user_lang
FROM " . USERS_TABLE . "
WHERE user_id = $user_id";

20
phpBB/includes/usercp_register.php
View File

@@ -27,11 +27,11 @@ if ( !defined('IN_PHPBB') )
exit;
}
//
// ---------------------------------------
// Load agreement template since user has not yet
// agreed to registration conditions/coppa
//
function show_coppa(&$coppa)
function show_coppa()
{
global $template, $lang, $phpbb_root_path, $phpEx;
@@ -40,7 +40,6 @@ function show_coppa(&$coppa)
);
$template->assign_vars(array(
'COPPA' => $coppa,
'REGISTRATION' => $lang['Registration'],
'AGREEMENT' => $lang['Reg_agreement'],
"AGREE_OVER_13" => $lang['Agree_over_13'],
@@ -55,8 +54,7 @@ function show_coppa(&$coppa)
}
//
//
//
// ---------------------------------------
$error = FALSE;
$page_title = ( $mode == 'editprofile' ) ? $lang['Edit_profile'] : $lang['Register'];
@@ -65,12 +63,12 @@ if ( $mode == 'register' && !isset($HTTP_POST_VARS['agreed']) && !isset($HTTP_GE
{
include($phpbb_root_path . 'includes/page_header.'.$phpEx);
show_coppa($coppa);
show_coppa();
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
}
$coppa = ( ( !$HTTP_POST_VARS['coppa'] && !$HTTP_GET_VARS['coppa'] ) || $mode == 'register' ) ? 0 : TRUE;
$coppa = ( empty($HTTP_POST_VARS['coppa']) && empty($HTTP_GET_VARS['coppa']) ) ? 0 : TRUE;
//
// Check and initialize some variables if needed
@@ -223,14 +221,12 @@ if ( isset($HTTP_POST_VARS['submit']) )
}
else if ( $mode == 'register' )
{
$coppa = (!$HTTP_POST_VARS['coppa'] && !$HTTP_GET_VARS['coppa']) ? 0 : TRUE;
if ( empty($username) || empty($password) || empty($password_confirm) || empty($email) )
{
$error = TRUE;
$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Fields_empty'];
}
}
$passwd_sql = '';
@@ -707,6 +703,8 @@ if( isset($HTTP_POST_VARS['avatargallery']) && !$error )
'body' => 'profile_avatar_gallery.tpl')
);
$allowviewonline = !$allowviewonline;
display_avatar_gallery($mode, $avatar_category, $user_id, $email, $current_email, $coppa, $username, $email, $icq, $aim, $msn, $yim, $website, $location, $occupation, $interests, $signature, $viewemail, $notifypm, $popuppm, $notifyreply, $attachsig, $allowhtml, $allowbbcode, $allowsmilies, $allowviewonline, $user_style, $user_lang, $user_timezone, $user_dateformat);
}
else
@@ -787,7 +785,7 @@ else
// us from doing file uploads....
//
$ini_val = ( phpversion() >= '4.0.0' ) ? 'ini_get' : 'get_cfg_var';
$form_enctype = ( !@$ini_val('file_uploads') || phpversion() == '4.0.4pl1' || !$board_config['allow_avatar_upload'] || ( phpversion() < '4.0.3' && @$ini_val('open_basedir') != '' ) ) ? '' : 'enctype="multipart/form-data"';
$form_enctype = ( @$ini_val('file_uploads') == '0' || strtolower(@$ini_val('file_uploads') == 'off') || phpversion() == '4.0.4pl1' || !$board_config['allow_avatar_upload'] || ( phpversion() < '4.0.3' && @$ini_val('open_basedir') != '' ) ) ? '' : 'enctype="multipart/form-data"';
$template->assign_vars(array(
'USERNAME' => $username,

2
phpBB/language/lang_chinese_traditional_taiwan/email/admin_activate.tpl
View File

@@ -1,5 +1,3 @@
Subject: <20>s<EFBFBD><73><EFBFBD>|<7C><><EFBFBD>b<EFBFBD><62>
<EFBFBD>z<EFBFBD>n,
<EFBFBD>o<EFBFBD><EFBFBD> "{USERNAME}" <20><><EFBFBD>b<EFBFBD><62><EFBFBD><EFBFBD><EFBFBD>b<EFBFBD><62><EFBFBD>ݶ}<7D>q (<28>i<EFBFBD><69><EFBFBD>ȮɳQ<C9B3>ᵲ<EFBFBD>F<EFBFBD>άO<CEAC>~<7E>觹<EFBFBD><E8A7B9><EFBFBD><EFBFBD><EFBFBD>U<EFBFBD>{<EFBFBD><EFBFBD>). <EFBFBD>p<EFBFBD>G<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>n<EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <EFBFBD>Х<EFBFBD><EFBFBD>d<EFBFBD><EFBFBD><EFBFBD>o<EFBFBD>ӨϥΪ̪<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <EFBFBD>M<EFBFBD><EFBFBD><EFBFBD>Q<EFBFBD>ΥH<EFBFBD>U<EFBFBD>s<EFBFBD><EFBFBD><EFBFBD>ҥγo<EFBFBD>ӷ|<EFBFBD><EFBFBD><EFBFBD>b<EFBFBD><EFBFBD>:

2
phpBB/language/lang_chinese_traditional_taiwan/email/admin_welcome_activated.tpl
View File

@@ -1,5 +1,3 @@
Subject: <20>b<EFBFBD><62><EFBFBD>w<EFBFBD>g<EFBFBD>ҥ<EFBFBD>
<EFBFBD>˷R<EFBFBD><EFBFBD> {USERNAME} <20>z<EFBFBD>n,
<EFBFBD>z<EFBFBD>b"{SITENAME}"<22><><EFBFBD>b<EFBFBD><62><EFBFBD>w<EFBFBD>g<EFBFBD>ҥ<EFBFBD>, <20>z<EFBFBD>i<EFBFBD>H<EFBFBD>ϥΩҦ<CEA9><D2A6>쪺<EFBFBD>|<7C><><EFBFBD>b<EFBFBD><62><EFBFBD>αK<CEB1>X<EFBFBD>n<EFBFBD>J"{SITENAME}".

2
phpBB/language/lang_chinese_traditional_taiwan/email/admin_welcome_inactive.tpl
View File

@@ -1,5 +1,3 @@
Subject: w<><77><EFBFBD>Ө<EFBFBD> {SITENAME} <20>Q<EFBFBD>װ<EFBFBD>
{WELCOME_MSG}
<EFBFBD>Ч<EFBFBD><EFBFBD><EFBFBD><EFBFBD>O<EFBFBD>d<EFBFBD>o<EFBFBD>ʹq<EFBFBD>l<EFBFBD>l<EFBFBD><EFBFBD>. <20>z<EFBFBD><7A><EFBFBD>b<EFBFBD><62><EFBFBD><EFBFBD><EFBFBD>Ʀp<C6A6>U:

2
phpBB/language/lang_chinese_traditional_taiwan/email/coppa_welcome_inactive.tpl
View File

@@ -1,5 +1,3 @@
Subject: w<><77><EFBFBD>Ө<EFBFBD> {SITENAME} <20>Q<EFBFBD>װ<EFBFBD>
{WELCOME_MSG}
<EFBFBD>̷<EFBFBD>"<22><><EFBFBD><EFBFBD><EFBFBD>ൣ<EFBFBD><E0B5A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>p<EFBFBD>O<EFBFBD>@<40>k"<22>W<EFBFBD>w, <20>z<EFBFBD><7A><EFBFBD>b<EFBFBD><62><EFBFBD>|<7C><><EFBFBD><EFBFBD><EFBFBD>ҥ<EFBFBD>.

2
phpBB/language/lang_chinese_traditional_taiwan/email/group_added.tpl
View File

@@ -1,5 +1,3 @@
Subject: <20>z<EFBFBD>w<EFBFBD>g<EFBFBD>Q<EFBFBD>[<5B>J<EFBFBD>o<EFBFBD>ӷ|<7C><><EFBFBD>s<EFBFBD><73>
<EFBFBD><EFBFBD><EFBFBD>߱z,
<EFBFBD>z<EFBFBD>w<EFBFBD>g<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>[<5B>J"{SITENAME}"<22><>"{GROUP_NAME}"<22>o<EFBFBD>Ӹs<D3B8><73>.

2
phpBB/language/lang_chinese_traditional_taiwan/email/group_approved.tpl
View File

@@ -1,5 +1,3 @@
Subject: <20>z<EFBFBD><7A><EFBFBD>ШD<D0A8>w<EFBFBD>g<EFBFBD><67><EFBFBD>o<EFBFBD><6F><EFBFBD><EFBFBD>
<EFBFBD><EFBFBD><EFBFBD>߱z,
<EFBFBD>A<EFBFBD>b"{SITENAME}"<22>ҥӽХ[<5B>J<EFBFBD><4A><EFBFBD>s<EFBFBD><73>"{GROUP_NAME}", <20>w<EFBFBD>g<EFBFBD><67><EFBFBD>o<EFBFBD><6F><EFBFBD><EFBFBD>.

2
phpBB/language/lang_chinese_traditional_taiwan/email/group_request.tpl
View File

@@ -1,5 +1,3 @@
Subject: <20><><EFBFBD>@<40>ӷ|<7C><><EFBFBD>ӽХ[<5B>J<EFBFBD>z<EFBFBD><7A><EFBFBD>s<EFBFBD><73>
<EFBFBD>˷R<EFBFBD><EFBFBD> {GROUP_MODERATOR} <20>z<EFBFBD>n,
<EFBFBD><EFBFBD><EFBFBD>@<40>ӷ|<7C><><EFBFBD><EFBFBD><EFBFBD>X<EFBFBD>ӽХ[<5B>J<EFBFBD>A<EFBFBD>b"{SITENAME}"<22>Һ޲z<DEB2><7A><EFBFBD>|<7C><><EFBFBD>s<EFBFBD><73>.

2
phpBB/language/lang_chinese_traditional_taiwan/email/privmsg_notify.tpl
View File

@@ -1,5 +1,3 @@
Subject: "<22>z<EFBFBD><7A><EFBFBD>s<EFBFBD><73><EFBFBD>p<EFBFBD>H<EFBFBD>T<EFBFBD><54>
<EFBFBD>˷R<EFBFBD><EFBFBD> {USERNAME} <20>z<EFBFBD>n,
<EFBFBD>z<EFBFBD>b"{SITENAME}"<22><><EFBFBD>s<EFBFBD><73><EFBFBD>p<EFBFBD>H<EFBFBD>T<EFBFBD><54>, <20>ӥB<D3A5>z<EFBFBD>n<EFBFBD>D<EFBFBD>t<EFBFBD>ΥH<CEA5>q<EFBFBD>l<EFBFBD>l<EFBFBD><6C><EFBFBD>q<EFBFBD><71>. <20>z<EFBFBD>i<EFBFBD>H<EFBFBD>Q<EFBFBD>ΥH<CEA5>U<EFBFBD><55><EFBFBD>s<EFBFBD><73><EFBFBD>˵<EFBFBD><CBB5>z<EFBFBD>覬<EFBFBD>쪺<EFBFBD>p<EFBFBD>H<EFBFBD>T<EFBFBD><54>:

2
phpBB/language/lang_chinese_traditional_taiwan/email/topic_notify.tpl
View File

@@ -1,5 +1,3 @@
Subject: <20>D<EFBFBD>D<EFBFBD>^<5E>гq<D0B3><71> - {TOPIC_TITLE}
<EFBFBD>˷R<EFBFBD><EFBFBD> {USERNAME} <20>z<EFBFBD>n,
<EFBFBD>z<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>o<EFBFBD>ʳo<EFBFBD>ʹq<EFBFBD>l<EFBFBD>l<EFBFBD><EFBFBD><EFBFBD>O<EFBFBD>]<5D><><EFBFBD>z<EFBFBD>b"{SITENAME}"<22>q<EFBFBD>\<5C>F<EFBFBD>D<EFBFBD>D"{TOPIC_TITLE}", <20>o<EFBFBD>ӥD<D3A5>D<EFBFBD>b<EFBFBD>z<EFBFBD>W<EFBFBD><57><EFBFBD>ӳX<D3B3>ᦳ<EFBFBD>s<EFBFBD><73><EFBFBD>^<5E>аT<D0B0><54>. <20>z<EFBFBD>i<EFBFBD>H<EFBFBD>ϥΥH<CEA5>U<EFBFBD>s<EFBFBD><73><EFBFBD><EFBFBD><EFBFBD>[<5B>ݦ^<5E>Ъ<EFBFBD><D0AA>T<EFBFBD><54>, <20>b<EFBFBD>z<EFBFBD>[<5B>ݭ<EFBFBD><DDAD>D<EFBFBD>D<EFBFBD><44><EFBFBD>e, <20><><EFBFBD>|<7C><><EFBFBD><EFBFBD><EFBFBD>s<EFBFBD><73><EFBFBD>T<EFBFBD><54><EFBFBD>q<EFBFBD><71><EFBFBD>z.

2
phpBB/language/lang_chinese_traditional_taiwan/email/user_activate.tpl
View File

@@ -1,5 +1,3 @@
Subject: <20>z<EFBFBD><7A><EFBFBD>b<EFBFBD><62><EFBFBD>w<EFBFBD>g<EFBFBD><67><EFBFBD>_<EFBFBD>ҥ<EFBFBD>!
<EFBFBD>˷R<EFBFBD><EFBFBD> {USERNAME} <20>z<EFBFBD>n,
<EFBFBD>z<EFBFBD>b"{SITENAME}"<22><><EFBFBD>b<EFBFBD><62><EFBFBD>ȮɳQ<C9B3>ᵲ, <20>̦<EFBFBD><CCA6>i<EFBFBD>઺<EFBFBD><E0AABA><EFBFBD>]<5D>O<EFBFBD>]<5D><><EFBFBD>z<EFBFBD><7A><EFBFBD><EFBFBD><EFBFBD>L<EFBFBD>z<EFBFBD><7A><EFBFBD>ӤH<D3A4><48><EFBFBD><EFBFBD>. <20>ШϥΥH<CEA5>U<EFBFBD>s<EFBFBD><73><EFBFBD><EFBFBD><EFBFBD>s<EFBFBD>ҥαz<CEB1><7A><EFBFBD>b<EFBFBD><62>:

2
phpBB/language/lang_chinese_traditional_taiwan/email/user_activate_passwd.tpl
View File

@@ -1,5 +1,3 @@
Subject: <20>s<EFBFBD><73><EFBFBD>K<EFBFBD>X<EFBFBD>ҥ<EFBFBD>
<EFBFBD>˷R<EFBFBD><EFBFBD> {USERNAME} <20>z<EFBFBD>n,
<EFBFBD>z<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>o<EFBFBD>ʳo<EFBFBD>ʹq<EFBFBD>l<EFBFBD>l<EFBFBD><EFBFBD><EFBFBD>O<EFBFBD>]<5D><><EFBFBD>z (<28>Ϊ̬O<CCAC>Y<EFBFBD>H<EFBFBD>_<EFBFBD>R<EFBFBD>z<EFBFBD><7A><EFBFBD>W<EFBFBD>q) <20>ӽФF<D0A4>@<40>շs<D5B7><73><EFBFBD>K<EFBFBD>X. <20><><EFBFBD>p<EFBFBD>o<EFBFBD><6F><EFBFBD>O<EFBFBD>z<EFBFBD><7A><EFBFBD>H<EFBFBD>ҥӽ<D2A5>, <20>Ф<EFBFBD><D0A4>βz<CEB2>|<7C>o<EFBFBD>ʹq<CAB9>l<EFBFBD>l<EFBFBD><6C>, <20><><EFBFBD>O<EFBFBD>p<EFBFBD>G<EFBFBD>z<EFBFBD><7A><EFBFBD>򦬨<EFBFBD><F2A6ACA8>o<EFBFBD><6F><EFBFBD><EFBFBD><EFBFBD>H<EFBFBD><48><EFBFBD><EFBFBD><EFBFBD>Z, <20>бz<D0B1><7A><EFBFBD>֦V<D6A6>޲z<DEB2>H<EFBFBD><48><EFBFBD>sô.

2
phpBB/language/lang_chinese_traditional_taiwan/email/user_welcome.tpl
View File

@@ -1,5 +1,3 @@
Subject: w<><77><EFBFBD>Ө<EFBFBD> {SITENAME} <20>Q<EFBFBD>װ<EFBFBD>
{WELCOME_MSG}
<EFBFBD>Ч<EFBFBD><EFBFBD><EFBFBD><EFBFBD>O<EFBFBD>d<EFBFBD>o<EFBFBD>ʹq<EFBFBD>l<EFBFBD>l<EFBFBD><EFBFBD>. <20>z<EFBFBD><7A><EFBFBD>b<EFBFBD><62><EFBFBD><EFBFBD><EFBFBD>Ʀp<C6A6>U:

2
phpBB/language/lang_chinese_traditional_taiwan/email/user_welcome_inactive.tpl
View File

@@ -1,5 +1,3 @@
Subject: w<><77><EFBFBD>Ө<EFBFBD> {SITENAME} <20>Q<EFBFBD>װ<EFBFBD>
{WELCOME_MSG}
<EFBFBD>Ч<EFBFBD><EFBFBD><EFBFBD><EFBFBD>O<EFBFBD>d<EFBFBD>o<EFBFBD>ʹq<EFBFBD>l<EFBFBD>l<EFBFBD><EFBFBD>. <20>z<EFBFBD><7A><EFBFBD>b<EFBFBD><62><EFBFBD><EFBFBD><EFBFBD>Ʀp<C6A6>U:

1471
phpBB/language/lang_chinese_traditional_taiwan/lang_admin.php
View File

File diff suppressed because it is too large Load Diff

14
phpBB/language/lang_chinese_traditional_taiwan/lang_bbcode.php
View File

@@ -11,16 +11,16 @@
*
***************************************************************************/
/***************************************************************************
* Traditional Chinese[<5B>c<EFBFBD>餤<EFBFBD><E9A4A4><EFBFBD>y<EFBFBD>t] Translation
* -------------------
* begin : Thu Nov 26 2001
* by : <20>p<EFBFBD>ˤl, OOHOO, <20>Ӯa<D3AE>M<EFBFBD>h, <20><>
/***************************************************************************
* Traditional Chinese Translation [<5B>c<EFBFBD>餤<EFBFBD><E9A4A4><EFBFBD>y<EFBFBD>t]
* -------------------
* begin : Thu Nov 26 2001
* by : <20>p<EFBFBD>ˤl, OOHOO, <20>Ӯa<D3AE>M<EFBFBD>h, <20><>
* email : kyo.yoshika@msa.hinet.net
* mchiang@bigpond.net.au
* webdev@hotmail.com
* sjwu1@ms12.hinet.net
* f8806077@mail.dyu.edu.tw
*
*
* last modify : Sun Dec 30 2001
*
***************************************************************************/

16
phpBB/language/lang_chinese_traditional_taiwan/lang_faq.php
View File

@@ -11,16 +11,16 @@
*
***************************************************************************/
/***************************************************************************
* Traditional Chinese[<5B>c<EFBFBD>餤<EFBFBD><E9A4A4><EFBFBD>y<EFBFBD>t] Translation
* -------------------
* begin : Thu Nov 26 2001
* by : <20>p<EFBFBD>ˤl, OOHOO, <20>Ӯa<D3AE>M<EFBFBD>h, <20><>
/***************************************************************************
* Traditional Chinese Translation [<5B>c<EFBFBD>餤<EFBFBD><E9A4A4><EFBFBD>y<EFBFBD>t]
* -------------------
* begin : Thu Nov 26 2001
* by : <20>p<EFBFBD>ˤl, OOHOO, <20>Ӯa<D3AE>M<EFBFBD>h, <20><>
* email : kyo.yoshika@msa.hinet.net
* mchiang@bigpond.net.au
* webdev@hotmail.com
* sjwu1@ms12.hinet.net
* f8806077@mail.dyu.edu.tw
*
*
* last modify : Sun Dec 30 2001
*
***************************************************************************/
@@ -106,7 +106,7 @@ $faq[] = array("
$faq[] = array("--","phpBB 2 <20>n<EFBFBD><6E>");
$faq[] = array("<EFBFBD>ּg<EFBFBD>F<EFBFBD>o<EFBFBD>ӰQ<EFBFBD>ת<EFBFBD>?", "<EFBFBD>o<EFBFBD>ӵ{<EFBFBD><EFBFBD> (<28><><EFBFBD>g<EFBFBD>ק諸<D7A7>榡) <20><> phpBB Group <20>Ҷ}<7D>o<EFBFBD><6F><EFBFBD><EFBFBD><EFBFBD>X, <20>ۧ@<40><><EFBFBD>v<EFBFBD>k <a href=\"http://www.phpbb.com/\" target=\"_blank\">phpBB Group</a> <20>Ҧ<EFBFBD>. <20>̷ӡu<D3A1><75><EFBFBD><EFBFBD><EFBFBD>j<EFBFBD><6A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>v<EFBFBD>v(GNU General Public License) <20><><EFBFBD>n<EFBFBD><6E>, <20>o<EFBFBD>ӵ{<EFBFBD><EFBFBD><EFBFBD>i<EFBFBD>H<EFBFBD>ۥѪ<EFBFBD><EFBFBD>ϥΤδ<EFBFBD><EFBFBD><EFBFBD>, <20>p<EFBFBD>G<EFBFBD>z<EFBFBD>ݭn<DDAD><6E><EFBFBD>h<EFBFBD><68><EFBFBD><EFBFBD><EFBFBD>T<EFBFBD>i<EFBFBD>H<EFBFBD>Ѧ<EFBFBD> <a href=\"http://www.gnu.org/copyleft/gpl.html\" target=\"_blank\">GNU General Public License</a>.");
$faq[] = array("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>򤣯<EFBFBD><EFBFBD>ϥΧ<EFBFBD><EFBFBD>h<EFBFBD><EFBFBD><EFBFBD>\<EFBFBD><EFBFBD> ?", "<EFBFBD>o<EFBFBD>ӳn<EFBFBD><EFBFBD><EFBFBD>O<EFBFBD><EFBFBD> phpBB Group <20>һs<D2BB>@. <20>p<EFBFBD>G<EFBFBD>z<EFBFBD>{<EFBFBD><EFBFBD><EFBFBD>ݭn<EFBFBD>[<5B>J<EFBFBD><4A><EFBFBD>h<EFBFBD>\<EFBFBD><EFBFBD><EFBFBD>а<EFBFBD><EFBFBD>[ phpbb.com website <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20>Ф<EFBFBD><D0A4>n<EFBFBD>o<EFBFBD><6F><EFBFBD>i<EFBFBD><69><EFBFBD>\<EFBFBD><EFBFBD><EFBFBD>n<EFBFBD>D<EFBFBD><EFBFBD> phpbb.com <20><><EFBFBD>Q<EFBFBD>ת<EFBFBD>, <20>o<EFBFBD>|<7C>ϱo<CFB1>}<7D>o<EFBFBD>p<EFBFBD>դ<EFBFBD><D5A4>ߵL<DFB5>k<EFBFBD>P<EFBFBD>O<EFBFBD>s<EFBFBD>\<EFBFBD>઺<EFBFBD>}<7D>o. <20>Цb<D0A6><62><EFBFBD><EFBFBD><EFBFBD>s<EFBFBD><73>, <20>p<EFBFBD>G<EFBFBD><47><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڭ̤w<CCA4>}<7D>o<EFBFBD>B<EFBFBD>g<EFBFBD>L<EFBFBD><4C><EFBFBD>ժ<EFBFBD><D5AA>{<EFBFBD><EFBFBD><EFBFBD>ڭ̷|<7C><><EFBFBD>b<EFBFBD><62><EFBFBD><EFBFBD><EFBFBD>W<EFBFBD><57>.");
$faq[] = array("<EFBFBD>ڸӦV<EFBFBD><EFBFBD><EFBFBD>pô<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>o<EFBFBD>ӰQ<EFBFBD>ת<EFBFBD><EFBFBD>~<7E>ΩΪk<CEAA>ߤW<DFA4><57><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ư<EFBFBD>?", "<EFBFBD>z<EFBFBD>i<EFBFBD>H<EFBFBD>s<EFBFBD><EFBFBD><EFBFBD>o<EFBFBD>ӰQ<EFBFBD>ת<EFBFBD><EFBFBD><EFBFBD><EFBFBD>޲z<EFBFBD><EFBFBD>. <20>p<EFBFBD>G<EFBFBD>z<EFBFBD><7A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>o<EFBFBD>Ӫ<EFBFBD><D3AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޲z<DEB2>̥H<CCA5>M<EFBFBD>D<EFBFBD><44><EFBFBD>i<EFBFBD>@<40>B<EFBFBD><42><EFBFBD><EFBFBD><EFBFBD>pô. <20>p<EFBFBD>G<EFBFBD>z<EFBFBD>s<EFBFBD><73><EFBFBD>޲z<DEB2>̤<EFBFBD><CCA4>ᤴ<EFBFBD>M<EFBFBD>S<EFBFBD><53><EFBFBD>^<5E><> (<28>M<EFBFBD><4D> whois ) <20>Ϊ̨<CEAA><CCA8>O<EFBFBD>ݩ<EFBFBD><DDA9>@<40>Ӱ<EFBFBD><D3B0>椤<EFBFBD><E6A4A4><EFBFBD>K<EFBFBD>O<EFBFBD>A<EFBFBD><41> (<28>Ҧp: yahoo, free.fr, f2s.com...<2E><><EFBFBD><EFBFBD>), <20>޲z<DEB2>̩λ~<7E>Φ<EFBFBD><CEA6>A<EFBFBD>Ȫ<EFBFBD><C8AA><EFBFBD><EFBFBD><EFBFBD>. <20>аO<D0B0><4F> phpBB Group <20>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD>S<EFBFBD><53><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>v<EFBFBD>ӥB<D3A5><42><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>t<EFBFBD><74><EFBFBD><EFBFBD><EFBFBD>d<EFBFBD><64><EFBFBD><EFBFBD>, <20>o<EFBFBD>ӰQ<D3B0>ת<EFBFBD><D7AA><EFBFBD><EFBFBD>~<7E><><EFBFBD>B<EFBFBD>H<EFBFBD>Φ<EFBFBD><CEA6>H<EFBFBD>֦<EFBFBD>. <20>b<EFBFBD><62><EFBFBD><EFBFBD><EFBFBD>k<EFBFBD>O<EFBFBD>U, <20><><EFBFBD><EFBFBD><EFBFBD>S<EFBFBD><53><EFBFBD>V phpBB Group <20><><EFBFBD><EFBFBD> (cease and desist, liable, defamatory comment...<2E><><EFBFBD><EFBFBD>). <20>]<5D>\<EFBFBD><EFBFBD><EFBFBD>O<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> phpbb.com website <20><><EFBFBD>|<7C>ӱo, <20>Ϊ̬O<CCAC>u<EFBFBD><75> phpBB <20><><EFBFBD>n<EFBFBD>骺<EFBFBD><E9AABA><EFBFBD><EFBFBD><EFBFBD>Ӥw. <20>p<EFBFBD>G<EFBFBD>z email<69><6C> phpBB Group <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĤT<C4A4>̨ϥγn<CEB3><6E><EFBFBD>W<EFBFBD><57><EFBFBD><EFBFBD><EFBFBD>D, <20>z<EFBFBD><7A><EFBFBD><EFBFBD><EFBFBD>ױN<D7B1>|<7C>D<EFBFBD>`²<><C2B2><EFBFBD>άO<CEAC>ڥ<EFBFBD><DAA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>^<5E><>.");
$faq[] = array("<EFBFBD>ڸӦV<EFBFBD><EFBFBD><EFBFBD>pô<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>o<EFBFBD>ӰQ<EFBFBD>ת<EFBFBD><EFBFBD>~<7E>ΩΪk<CEAA>ߤW<DFA4><57><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ư<EFBFBD>?", "<EFBFBD>z<EFBFBD>i<EFBFBD>H<EFBFBD>s<EFBFBD><EFBFBD><EFBFBD>o<EFBFBD>ӰQ<EFBFBD>ת<EFBFBD><EFBFBD><EFBFBD><EFBFBD>޲z<EFBFBD><EFBFBD>. <20>p<EFBFBD>G<EFBFBD>z<EFBFBD><7A><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>o<EFBFBD>Ӫ<EFBFBD><D3AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޲z<DEB2>̥H<CCA5>M<EFBFBD>D<EFBFBD><44><EFBFBD>i<EFBFBD>@<40>B<EFBFBD><42><EFBFBD><EFBFBD><EFBFBD>pô. <20>p<EFBFBD>G<EFBFBD>z<EFBFBD>s<EFBFBD><73><EFBFBD>޲z<DEB2>̤<EFBFBD><CCA4>ᤴ<EFBFBD>M<EFBFBD>S<EFBFBD><53><EFBFBD>^<5E><> (<28>M<EFBFBD><4D> whois ) <20>Ϊ̨<CEAA><CCA8>O<EFBFBD>ݩ<EFBFBD><DDA9>@<40>Ӱ<EFBFBD><D3B0>椤<EFBFBD><E6A4A4><EFBFBD>K<EFBFBD>O<EFBFBD>A<EFBFBD><41> (<28>Ҧp: yahoo, free.fr, f2s.com...<2E><><EFBFBD><EFBFBD>), <20>޲z<DEB2>̩λ~<7E>Φ<EFBFBD><CEA6>A<EFBFBD>Ȫ<EFBFBD><C8AA><EFBFBD><EFBFBD><EFBFBD>. <20>аO<D0B0><4F> phpBB Group <20>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD>S<EFBFBD><53><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>v<EFBFBD>ӥB<D3A5><42><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>t<EFBFBD><74><EFBFBD><EFBFBD><EFBFBD>d<EFBFBD><64><EFBFBD><EFBFBD>, <20>o<EFBFBD>ӰQ<D3B0>ת<EFBFBD><D7AA><EFBFBD><EFBFBD>~<7E><><EFBFBD>B<EFBFBD>H<EFBFBD>Φ<EFBFBD><CEA6>H<EFBFBD>֦<EFBFBD>. <20>b<EFBFBD><62><EFBFBD><EFBFBD><EFBFBD>k<EFBFBD>O<EFBFBD>U, <20><><EFBFBD><EFBFBD><EFBFBD>S<EFBFBD><53><EFBFBD>V phpBB Group <20><><EFBFBD><EFBFBD> (cease and desist, liable, defamatory comment...<2E><><EFBFBD><EFBFBD>). <20>]<5D>\<EFBFBD><EFBFBD><EFBFBD>O<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> phpbb.com website <20><><EFBFBD>|<7C>ӱo, <20>Ϊ̬O<CCAC>u<EFBFBD><75> phpBB <20><><EFBFBD>n<EFBFBD>骺<EFBFBD><E9AABA><EFBFBD><EFBFBD><EFBFBD>Ӥw. <20>p<EFBFBD>G<EFBFBD>z email <EFBFBD><EFBFBD> phpBB Group <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĤT<C4A4>̨ϥγn<CEB3><6E><EFBFBD>W<EFBFBD><57><EFBFBD><EFBFBD><EFBFBD>D, <20>z<EFBFBD><7A><EFBFBD><EFBFBD><EFBFBD>ױN<D7B1>|<7C>D<EFBFBD>`²<><C2B2><EFBFBD>άO<CEAC>ڥ<EFBFBD><DAA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>^<5E><>.");
//
// This ends the FAQ entries

2015
phpBB/language/lang_chinese_traditional_taiwan/lang_main.php
View File

File diff suppressed because it is too large Load Diff

1476
phpBB/language/lang_english/lang_main.php
View File

File diff suppressed because it is too large Load Diff

1903
phpBB/language/lang_greek/lang_main.php
View File

File diff suppressed because it is too large Load Diff

6
phpBB/modcp.php
View File

@@ -343,7 +343,7 @@ switch( $mode )
$topics = $HTTP_POST_VARS['topic_id_list'];
for($i = 0; $i < count($topics); $i++)
{
$hidden_fields .= '<input type="hidden" name="topic_id_list[]" value="' . $topics[$i] . '" />';
$hidden_fields .= '<input type="hidden" name="topic_id_list[]" value="' . intval($topics[$i]) . '" />';
}
}
else
@@ -391,7 +391,7 @@ switch( $mode )
$topic_list = '';
for($i = 0; $i < count($topics); $i++)
{
$topic_list .= ( ( $topic_list != '' ) ? ', ' : '' ) . $topics[$i];
$topic_list .= ( ( $topic_list != '' ) ? ', ' : '' ) . intval($topics[$i]);
}
$sql = "SELECT *
@@ -624,7 +624,7 @@ switch( $mode )
message_die(GENERAL_MESSAGE, $lang['Empty_subject']);
}
$new_forum_id = $HTTP_POST_VARS['new_forum_id'];
$new_forum_id = intval($HTTP_POST_VARS['new_forum_id']);
$topic_time = time();
$sql = "INSERT INTO " . TOPICS_TABLE . " (topic_title, topic_poster, topic_time, forum_id, topic_status, topic_type)

16
phpBB/posting.php
View File

@@ -82,17 +82,17 @@ if ( isset($HTTP_POST_VARS['cancel']) )
else if ( $topic_id )
{
$redirect = "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id";
$post_append = "";
$post_append = '';
}
else if ( $forum_id )
{
$redirect = "viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id";
$post_append = "";
$post_append = '';
}
else
{
$redirect = "index.$phpEx";
$post_append = "";
$post_append = '';
}
$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
@@ -442,7 +442,7 @@ else if ( $mode == 'vote' )
//
if ( !empty($HTTP_POST_VARS['vote_id']) )
{
$vote_option_id = $HTTP_POST_VARS['vote_id'];
$vote_option_id = intval($HTTP_POST_VARS['vote_id']);
$sql = "SELECT vd.vote_id
FROM " . VOTE_DESC_TABLE . " vd, " . VOTE_RESULTS_TABLE . " vr
@@ -871,7 +871,7 @@ if ( $mode == 'newtopic' || ( $mode == 'editpost' && $post_data['first_post'] )
if( $is_auth['auth_sticky'] )
{
$topic_type_toggle .= '<input type="radio" name="topictype" value="' . POST_STICKY . '"';
if ( $post_data['topic_type'] == POST_STICKY )
if ( $post_data['topic_type'] == POST_STICKY || $topic_type == POST_STICKY )
{
$topic_type_toggle .= ' checked="checked"';
}
@@ -881,7 +881,7 @@ if ( $mode == 'newtopic' || ( $mode == 'editpost' && $post_data['first_post'] )
if( $is_auth['auth_announce'] )
{
$topic_type_toggle .= '<input type="radio" name="topictype" value="' . POST_ANNOUNCE . '"';
if ( $post_data['topic_type'] == POST_ANNOUNCE )
if ( $post_data['topic_type'] == POST_ANNOUNCE || $topic_type == POST_ANNOUNCE )
{
$topic_type_toggle .= ' checked="checked"';
}
@@ -890,7 +890,7 @@ if ( $mode == 'newtopic' || ( $mode == 'editpost' && $post_data['first_post'] )
if ( $topic_type_toggle != '' )
{
$topic_type_toggle = $lang['Post_topic_as'] . ': <input type="radio" name="topictype" value="' . POST_NORMAL .'"' . ( ( $post_data['topic_type'] == POST_NORMAL ) ? ' checked="checked"' : '' ) . ' /> ' . $lang['Post_Normal'] . '&nbsp;&nbsp;' . $topic_type_toggle;
$topic_type_toggle = $lang['Post_topic_as'] . ': <input type="radio" name="topictype" value="' . POST_NORMAL .'"' . ( ( $post_data['topic_type'] == POST_NORMAL || $topic_type == POST_NORMAL ) ? ' checked="checked"' : '' ) . ' /> ' . $lang['Post_Normal'] . '&nbsp;&nbsp;' . $topic_type_toggle;
}
}
@@ -1082,4 +1082,4 @@ $template->pparse('body');
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
?>
?>

20
phpBB/privmsg.php
View File

@@ -99,11 +99,11 @@ else
$mode = '';
}
$start = ( !empty($HTTP_GET_VARS['start']) ) ? $HTTP_GET_VARS['start'] : 0;
$start = ( !empty($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0;
if ( isset($HTTP_POST_VARS[POST_POST_URL]) || isset($HTTP_GET_VARS[POST_POST_URL]) )
{
$privmsg_id = ( isset($HTTP_POST_VARS[POST_POST_URL]) ) ? $HTTP_POST_VARS[POST_POST_URL] : $HTTP_GET_VARS[POST_POST_URL];
$privmsg_id = ( isset($HTTP_POST_VARS[POST_POST_URL]) ) ? intval($HTTP_POST_VARS[POST_POST_URL]) : intval($HTTP_GET_VARS[POST_POST_URL]);
}
else
{
@@ -173,7 +173,7 @@ else if ( $mode == 'read' )
{
if ( !empty($HTTP_GET_VARS[POST_POST_URL]) )
{
$privmsgs_id = $HTTP_GET_VARS[POST_POST_URL];
$privmsgs_id = intval($HTTP_GET_VARS[POST_POST_URL]);
}
else
{
@@ -472,9 +472,9 @@ else if ( $mode == 'read' )
$pm_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_pm'] . '" alt="' . $lang['Send_private_message'] . '" title="' . $lang['Send_private_message'] . '" border="0" /></a>';
$pm = '<a href="' . $temp_url . '">' . $lang['Send_private_message'] . '</a>';
if ( !empty($privmsg['user_viewemail']) || $is_auth['auth_mod'] )
if ( !empty($privmsg['user_viewemail']) || $userdata['user_level'] == ADMIN )
{
$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&amp;" . POST_USERS_URL .'=' . $poster_id) : 'mailto:' . $privmsg['user_email'];
$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&amp;" . POST_USERS_URL .'=' . $user_id_from) : 'mailto:' . $privmsg['user_email'];
$email_img = '<a href="' . $email_uri . '"><img src="' . $images['icon_email'] . '" alt="' . $lang['Send_email'] . '" title="' . $lang['Send_email'] . '" border="0" /></a>';
$email = '<a href="' . $email_uri . '">' . $lang['Send_email'] . '</a>';
@@ -910,7 +910,7 @@ else if ( $submit || $refresh || $mode != '' )
if ( !$userdata['session_logged_in'] )
{
$user_id = ( isset($HTTP_GET_VARS[POST_USERS_URL]) ) ? '&' . POST_USERS_URL . '=' . $HTTP_GET_VARS[POST_USERS_URL] : '';
$user_id = ( isset($HTTP_GET_VARS[POST_USERS_URL]) ) ? '&' . POST_USERS_URL . '=' . intval($HTTP_GET_VARS[POST_USERS_URL]) : '';
$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
header($header_location . append_sid("login.$phpEx?redirect=privmsg.$phpEx&folder=$folder&mode=$mode" . $user_id, true));
}
@@ -1037,7 +1037,7 @@ else if ( $submit || $refresh || $mode != '' )
$msg_time = time();
if ( $mode != "edit" )
if ( $mode != 'edit' )
{
//
// See if recipient is at their inbox limit
@@ -1087,7 +1087,7 @@ else if ( $submit || $refresh || $mode != '' )
message_die(GENERAL_ERROR, "Could not insert/update private message sent info.", "", __LINE__, __FILE__, $sql_info);
}
if ( $mode != "edit" )
if ( $mode != 'edit' )
{
$privmsg_sent_id = $db->sql_nextid();
@@ -1225,7 +1225,7 @@ else if ( $submit || $refresh || $mode != '' )
if ( !empty($HTTP_GET_VARS[POST_USERS_URL]) )
{
$user_id = $HTTP_GET_VARS[POST_USERS_URL];
$user_id = intval($HTTP_GET_VARS[POST_USERS_URL]);
$sql = "SELECT username
FROM " . USERS_TABLE . "
@@ -1745,7 +1745,7 @@ switch( $folder )
//
if ( $submit_msgdays && ( !empty($HTTP_POST_VARS['msgdays']) || !empty($HTTP_GET_VARS['msgdays']) ) )
{
$msg_days = ( !empty($HTTP_POST_VARS['msgdays']) ) ? $HTTP_POST_VARS['msgdays'] : $HTTP_GET_VARS['msgdays'];
$msg_days = ( !empty($HTTP_POST_VARS['msgdays']) ) ? intval($HTTP_POST_VARS['msgdays']) : intval($HTTP_GET_VARS['msgdays']);
$min_msg_time = time() - ($msg_days * 86400);
$limit_msg_time_total = " AND privmsgs_date > $min_msg_time";

39
phpBB/search.php
View File

@@ -115,11 +115,7 @@ else
$start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0;
//
// Define some globally used data
//
$sort_by_types = array($lang['Sort_Time'], $lang['Sort_Post_Subject'], $lang['Sort_Topic_Title'], $lang['Sort_Author'], $lang['Sort_Forum']);
$sort_by_sql = array('p.post_time', 'pt.post_subject', 't.topic_title', 'u.username', 'f.forum_id');
//
// Begin core code
@@ -161,7 +157,7 @@ else if ( $search_keywords != '' || $search_author != '' || $search_id )
}
else
{
header("Location: login.$phpEx?redirect=search&search_id=newposts");
header("Location: login.$phpEx?redirect=search.$phpEx&search_id=newposts", true);
exit;
}
@@ -179,7 +175,7 @@ else if ( $search_keywords != '' || $search_author != '' || $search_id )
}
else
{
header("Location: login.$phpEx?redirect=search&search_id=egosearch");
header("Location: login.$phpEx?redirect=search.$phpEx&search_id=egosearch", true);
exit;
}
@@ -446,8 +442,8 @@ else if ( $search_keywords != '' || $search_author != '' || $search_id )
}
else if ( $search_author != '' || $search_time || $auth_sql != '' )
{
$where_sql = ( $search_author == '' && $auth_sql == '' ) ? "post_id IN (" . implode(', ', $search_ids) . ")" : "p.post_id IN (" . implode(", ", $search_ids) . ")";
$from_sql = ( $search_author == '' && $auth_sql == '' ) ? POSTS_TABLE : POSTS_TABLE . " p";
$where_sql = ( $search_author == '' && $auth_sql == '' ) ? 'post_id IN (' . implode(', ', $search_ids) . ')' : 'p.post_id IN (' . implode(', ', $search_ids) . ')';
$from_sql = ( $search_author == '' && $auth_sql == '' ) ? POSTS_TABLE : POSTS_TABLE . ' p';
if ( $search_time )
{
@@ -640,10 +636,29 @@ else if ( $search_keywords != '' || $search_author != '' || $search_id )
AND p2.post_id = t.topic_last_post_id
AND u2.user_id = p2.poster_id";
}
$per_page = ( $show_results == 'posts' ) ? $board_config['posts_per_page'] : $board_config['topics_per_page'];
$sql .= " ORDER BY " . $sort_by_sql[$sort_by] . " $sort_dir LIMIT $start, " . $per_page;
$sql .= " ORDER BY ";
switch ( $sort_by )
{
case 1:
$sql .= ( $show_results == 'posts' ) ? 'pt.post_subject' : 't.topic_title';
break;
case 2:
$sql .= 't.topic_title';
break;
case 3:
$sql .= 'u.username';
break;
case 4:
$sql .= 'f.forum_id';
break;
default:
$sql .= ( $show_results == 'posts' ) ? 'p.post_time' : 'p2.post_time';
break;
}
$sql .= " $sort_dir LIMIT $start, " . $per_page;
if ( !$result = $db->sql_query($sql) )
{
@@ -725,7 +740,7 @@ else if ( $search_keywords != '' || $search_author != '' || $search_id )
{
$forum_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . '=' . $searchset[$i]['forum_id']);
$topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . '=' . $searchset[$i]['topic_id'] . "&amp;highlight=$highlight_active");
$post_url = append_sid("viewtopic.$phpEx?" . POST_POST_URL . '=' . $searchset[$i]['post_id'] . "&amp;highlight=$highlight_active#" . $searchset[$i]['post_id']);
$post_url = append_sid("viewtopic.$phpEx?" . POST_POST_URL . '=' . $searchset[$i]['post_id'] . "&amp;highlight=$highlight_active") . '#' . $searchset[$i]['post_id'];
$post_date = create_date($board_config['default_dateformat'], $searchset[$i]['post_time'], $board_config['board_timezone']);
@@ -1298,4 +1313,4 @@ $template->pparse('body');
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
?>
?>

6
phpBB/templates/subSilver/admin/board_config_body.tpl
View File

@@ -117,15 +117,15 @@
<td class="row2"><input type="radio" name="privmsg_disable" value="0" {S_PRIVMSG_ENABLED} />{L_ENABLED}&nbsp; &nbsp;<input type="radio" name="privmsg_disable" value="1" {S_PRIVMSG_DISABLED} />{L_DISABLED}</td>
</tr>
<tr>
<td class="row1">{L_INBOX_LIMIT}</span></td>
<td class="row1">{L_INBOX_LIMIT}</td>
<td class="row2"><input type="text" maxlength="4" size="4" name="max_inbox_privmsgs" value="{INBOX_LIMIT}" /></td>
</tr>
<tr>
<td class="row1">{L_SENTBOX_LIMIT}</span></td>
<td class="row1">{L_SENTBOX_LIMIT}</td>
<td class="row2"><input type="text" maxlength="4" size="4" name="max_sentbox_privmsgs" value="{SENTBOX_LIMIT}" /></td>
</tr>
<tr>
<td class="row1">{L_SAVEBOX_LIMIT}</span></td>
<td class="row1">{L_SAVEBOX_LIMIT}</td>
<td class="row2"><input type="text" maxlength="4" size="4" name="max_savebox_privmsgs" value="{SAVEBOX_LIMIT}" /></td>
</tr>
<tr>

4
phpBB/templates/subSilver/admin/ranks_list_body.tpl
View File

@@ -16,8 +16,8 @@
<td class="{ranks.ROW_CLASS}" align="center">{ranks.RANK}</td>
<td class="{ranks.ROW_CLASS}" align="center">{ranks.RANK_MIN}</td>
<td class="{ranks.ROW_CLASS}" align="center">{ranks.SPECIAL_RANK}</td>
<td class="{ranks.ROW_CLASS}" align="center"><a href="{ranks.U_RANK_EDIT}">{L_EDIT}</td>
<td class="{ranks.ROW_CLASS}" align="center"><a href="{ranks.U_RANK_DELETE}">{L_DELETE}</td>
<td class="{ranks.ROW_CLASS}" align="center"><a href="{ranks.U_RANK_EDIT}">{L_EDIT}</a></td>
<td class="{ranks.ROW_CLASS}" align="center"><a href="{ranks.U_RANK_DELETE}">{L_DELETE}</a></td>
</tr>
<!-- END ranks -->
<tr>

43
phpBB/templates/subSilver/index_body.tpl
View File

@@ -1,15 +1,21 @@
<table width="100%" cellspacing="0" cellpadding="2" border="0" align="center">
<tr>
<td align="left" valign="bottom"><span class="gensmall">
<!-- BEGIN switch_user_logged_in -->
{LAST_VISIT_DATE}<br />
<!-- END switch_user_logged_in -->
{CURRENT_TIME}<br /></span><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td>
<td align="right" valign="bottom" class="gensmall">
<!-- BEGIN switch_user_logged_in -->
<a href="{U_SEARCH_NEW}" class="gensmall">{L_SEARCH_NEW}</a><br /><a href="{U_SEARCH_SELF}" class="gensmall">{L_SEARCH_SELF}</a><br />
<!-- END switch_user_logged_in -->
<a href="{U_SEARCH_UNANSWERED}" class="gensmall">{L_SEARCH_UNANSWERED}</a></td>
<td width="100%" align="left" valign="bottom"><table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
<td align="left" valign="bottom"><p><span class="gensmall">{TOTAL_POSTS}<br />{TOTAL_USERS}<br />{NEWEST_USER}</span></p><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td>
<td align="right" class="gensmall" valign="bottom">
<!-- BEGIN switch_user_logged_in -->
<a href="{U_SEARCH_NEW}" class="gensmall">{L_SEARCH_NEW}</a><br /><a href="{U_SEARCH_SELF}" class="gensmall">{L_SEARCH_SELF}</a><br />
<!-- END switch_user_logged_in -->
<a href="{U_SEARCH_UNANSWERED}" class="gensmall">{L_SEARCH_UNANSWERED}</a><br />
<br />
<!-- BEGIN switch_user_logged_in -->
{LAST_VISIT_DATE}<br />
<!-- END switch_user_logged_in -->
{CURRENT_TIME}</td>
</tr>
</table></td>
</tr>
</table>
@@ -27,10 +33,8 @@
</tr>
<!-- BEGIN forumrow -->
<tr>
<td class="row1" align="center" valign="middle" height="50"><img src="{catrow.forumrow.FORUM_FOLDER_IMG}" width="46" height="25" alt="{catrow.forumrow.L_FORUM_FOLDER_ALT}" title="{catrow.forumrow.L_FORUM_FOLDER_ALT}" /></td>
<td class="row1" width="100%" height="50"><span class="forumlink"> <a href="{catrow.forumrow.U_VIEWFORUM}" class="forumlink">{catrow.forumrow.FORUM_NAME}</a><br />
</span> <span class="genmed">{catrow.forumrow.FORUM_DESC}<br />
</span><span class="gensmall">{catrow.forumrow.L_MODERATOR} {catrow.forumrow.MODERATORS}</span></td>
<td class="row1" width="50" height="50" align="center" valign="middle"><img src="{catrow.forumrow.FORUM_FOLDER_IMG}" width="46" height="25" alt="{catrow.forumrow.L_FORUM_FOLDER_ALT}" title="{catrow.forumrow.L_FORUM_FOLDER_ALT}" /></td>
<td class="row1" width="100%" height="50"><span class="forumlink"> <a href="{catrow.forumrow.U_VIEWFORUM}" class="forumlink">{catrow.forumrow.FORUM_NAME}</a><br /></span> <span class="genmed">{catrow.forumrow.FORUM_DESC}<br /></span><span class="gensmall">{catrow.forumrow.L_MODERATOR} {catrow.forumrow.MODERATORS}</span></td>
<td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{catrow.forumrow.TOPICS}</span></td>
<td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{catrow.forumrow.POSTS}</span></td>
<td class="row2" align="center" valign="middle" height="50" nowrap="nowrap"> <span class="gensmall">{catrow.forumrow.LAST_POST}</span></td>
@@ -46,17 +50,16 @@
</tr>
</table>
<table width="100%" cellpadding="3" cellspacing="1" border="0" class="forumline">
<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
<tr>
<td class="catHead" colspan="2" height="28"><span class="cattitle"><a href="{U_VIEWONLINE}" class="cattitle">{L_WHO_IS_ONLINE}</a></span></td>
</tr>
<tr>
<td class="row1" align="center" valign="middle" rowspan="2"><img src="templates/subSilver/images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" /></td>
<td class="row1" align="left" width="100%"><span class="gensmall">{TOTAL_POSTS}<br />{TOTAL_USERS}<br />{NEWEST_USER}</span>
</td>
<td class="row1" width="46" rowspan="2" align="center" valign="middle" rowspan="2"><img src="templates/subSilver/images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" /></td>
<td class="row1" align="left"><span class="gensmall">{TOTAL_USERS_ONLINE}<br />{RECORD_USERS}<br />{LOGGED_IN_USER_LIST}</span></td>
</tr>
<tr>
<td class="row1" align="left"><span class="gensmall">{TOTAL_USERS_ONLINE} &nbsp; [ {L_WHOSONLINE_ADMIN} ] &nbsp; [ {L_WHOSONLINE_MOD} ]<br />{RECORD_USERS}<br />{LOGGED_IN_USER_LIST}</span></td>
<tr>
<td class="row1" align="left"><span class="gensmall"><b>{L_LEGEND}</b> :: {L_WHOSONLINE_ADMIN} - {L_WHOSONLINE_MOD} - {L_WHOSONLINE_USER}</span></td>
</tr>
</table>

2
phpBB/templates/subSilver/posting_body.tpl
View File

@@ -279,7 +279,7 @@ function storeCaret(textEl) {
<!-- END smilies_row -->
<!-- BEGIN switch_smilies_extra -->
<tr align="center">
<td colspan="{S_SMILIES_COLSPAN}"><span class="nav"><a href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=300,resizable=yes,scrollbars=yes,WIDTH=250');return false;" target="_phpbbsmilies" class="nav">{L_MORE_SMILIES}</a></td>
<td colspan="{S_SMILIES_COLSPAN}"><span class="nav"><a href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=300,resizable=yes,scrollbars=yes,WIDTH=250');return false;" target="_phpbbsmilies" class="nav">{L_MORE_SMILIES}</a></span></td>
</tr>
<!-- END switch_smilies_extra -->
</table>

2
phpBB/templates/subSilver/posting_topic_review.tpl
View File

@@ -7,7 +7,7 @@
<tr>
<td class="row1"><iframe width="100%" height="300" src="{U_REVIEW_TOPIC}" >
<!-- END switch_inline_mode -->
<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline" style="border: 0px #006699 solid ">
<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
<tr>
<th class="thCornerL" width="22%" height="26">{L_AUTHOR}</th>
<th class="thCornerR">{L_MESSAGE}</th>

4
phpBB/templates/subSilver/viewforum_body.tpl
View File

@@ -3,7 +3,7 @@
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr>
<td align="left" valign="bottom" colspan="2"><a class="maintitle" href="{U_VIEW_FORUM}">{FORUM_NAME}</a><br /><span class="gensmall"><b>{L_MODERATOR}: {MODERATORS}<br /><br />{LOGGED_IN_USER_LIST}</b></span></td>
<td align="right" valign="bottom" nowrap><span class="gensmall"><b>{PAGINATION}</b></span></td>
<td align="right" valign="bottom" nowrap="nowrap"><span class="gensmall"><b>{PAGINATION}</b></span></td>
</tr>
<tr>
<td align="left" valign="middle" width="50"><a href="{U_POST_NEW_TOPIC}"><img src="{POST_IMG}" border="0" alt="{L_POST_NEW_TOPIC}" /></a></td>
@@ -18,7 +18,7 @@
<th width="50" align="center" class="thTop" nowrap="nowrap">&nbsp;{L_REPLIES}&nbsp;</th>
<th width="100" align="center" class="thTop" nowrap="nowrap">&nbsp;{L_AUTHOR}&nbsp;</th>
<th width="50" align="center" class="thTop" nowrap="nowrap">&nbsp;{L_VIEWS}&nbsp;</th>
<th align="center" nowrap="nowrap" class="thCornerR" nowrap="nowrap">&nbsp;{L_LASTPOST}&nbsp;</th>
<th align="center" class="thCornerR" nowrap="nowrap">&nbsp;{L_LASTPOST}&nbsp;</th>
</tr>
<!-- BEGIN topicrow -->
<tr>

41
phpBB/update_script.php
View File

@@ -20,20 +20,43 @@ if ( !($result = $db->sql_query($sql)) )
if ( $row = $db->sql_fetchrow($result) )
{
if ( $row['config_value'] != '.1.0 [20020402]' )
$sql = array();
switch ( $row['config_value'] )
{
$sql = "UPDATE " . CONFIG_TABLE . "
SET config_value = '.1.0 [20020402]'
WHERE config_name = 'version'";
if ( !($result = $db->sql_query($sql)) )
{
die("Couldn't update version info");
}
case '.1.0 [20020402]':
echo 'Updating from [20020402] :: ';
flush();
die("UPDATING COMPLETE");
$sql[] = "INSERT INTO " . CONFIG_TABLE . " (config_name, config_value)
VALUES ('session_gc', '3600')";
$sql[] = "INSERT INTO " . CONFIG_TABLE . " (config_name, config_value)
VALUES ('session_last_gc', '0')";
echo '<span style="color:green">DONE</span><br /><br />';
break;
default;
echo 'No updates made<br /><br />';
}
if ( count($sql) )
{
for($i = 0; $i < count($sql); $i++)
{
if ( !($result = $db->sql_query($sql[$i])) )
{
die("Couldn't run update >> " . $sql);
}
}
}
}
$sql = "UPDATE " . CONFIG_TABLE . "
SET config_value = '.1.0 [20020420]'
WHERE config_name = 'version'";
if ( !($result = $db->sql_query($sql)) )
{
die("Couldn't update version info");
}
echo "\n<br />\n<b>COMPLETE!</b><br />\n";
echo "\n<p>Don't forget to delete this file!</p>\n";

99
phpBB/upgrade.php
View File

@@ -161,7 +161,7 @@ function query($sql, $errormsg)
}
}
function smiley_replace($text = "")
function smiley_replace($text = '')
{
global $db;
@@ -186,7 +186,7 @@ function smiley_replace($text = "")
}
}
return ( $text != "" ) ? preg_replace($search, $replace, $text) : "";
return ( $text != '' ) ? preg_replace($search, $replace, $text) : '';
}
@@ -201,22 +201,22 @@ function get_schema()
{
$line = $schemafile[$i];
if ( preg_match("/^CREATE TABLE (\w+)/i", $line, $matches) )
if ( preg_match('/^CREATE TABLE (\w+)/i', $line, $matches) )
{
// Start of a new table definition, set some variables and go to the next line.
$tabledata = 1;
// Replace the 'phpbb_' prefix by the user defined prefix.
$table = str_replace("phpbb_", $table_prefix, $matches[1]);
$table = str_replace('phpbb_', $table_prefix, $matches[1]);
$table_def[$table] = "CREATE TABLE $table (\n";
continue;
}
if ( preg_match("/^\);/", $line) )
if ( preg_match('/^\);/', $line) )
{
// End of the table definition
// After this we will skip everything until the next 'CREATE' line
$tabledata = 0;
$table_def[$table] .= ")"; // We don't need the closing semicolon
$table_def[$table] .= ')'; // We don't need the closing semicolon
}
if ( $tabledata == 1 )
@@ -224,18 +224,18 @@ function get_schema()
// We are inside a table definition, parse this line.
// Add the current line to the complete table definition:
$table_def[$table] .= $line;
if ( preg_match("/^\s*(\w+)\s+(\w+)\((\d+)\)(.*)$/", $line, $matches) )
if ( preg_match('/^\s*(\w+)\s+(\w+)\(([\d,]+)\)(.*)$/', $line, $matches) )
{
// This is a column definition
$field = $matches[1];
$type = $matches[2];
$size = $matches[3];
preg_match("/DEFAULT (NULL|\'.*?\')[,\s](.*)$/i", $matches[4], $match);
preg_match('/DEFAULT (NULL|\'.*?\')[,\s](.*)$/i', $matches[4], $match);
$default = $match[1];
$notnull = ( preg_match("/NOT NULL/i", $matches[4]) ) ? 1 : 0;
$auto_increment = ( preg_match("/auto_increment/i", $matches[4]) ) ? 1 : 0;
$notnull = ( preg_match('/NOT NULL/i', $matches[4]) ) ? 1 : 0;
$auto_increment = ( preg_match('/auto_increment/i', $matches[4]) ) ? 1 : 0;
$field_def[$table][$field] = array(
'type' => $type,
@@ -246,17 +246,17 @@ function get_schema()
);
}
if ( preg_match("/\s*PRIMARY\s+KEY\s*\((.*)\).*/", $line, $matches) )
if ( preg_match('/\s*PRIMARY\s+KEY\s*\((.*)\).*/', $line, $matches) )
{
// Primary key
$key_def[$table]['PRIMARY'] = $matches[1];
}
else if ( preg_match("/\s*KEY\s+(\w+)\s*\((.*)\)/", $line, $matches) )
else if ( preg_match('/\s*KEY\s+(\w+)\s*\((.*)\)/', $line, $matches) )
{
// Normal key
$key_def[$table][$matches[1]] = $matches[2];
}
else if ( preg_match("/^\s*(\w+)\s*(.*?),?\s*$/", $line, $matches) )
else if ( preg_match('/^\s*(\w+)\s*(.*?),?\s*$/', $line, $matches) )
{
// Column definition
$create_def[$table][$matches[1]] = $matches[2];
@@ -280,11 +280,11 @@ function get_inserts()
{
global $table_prefix;
$insertfile = file("db/schemas/mysql_basic.sql");
$insertfile = file('db/schemas/mysql_basic.sql');
for($i = 0; $i < count($insertfile); $i++)
{
if ( preg_match("/(INSERT INTO (\w+)\s.*);/i", str_replace("phpbb_", $table_prefix, $insertfile[$i]), $matches) )
if ( preg_match('/(INSERT INTO (\w+)\s.*);/i', str_replace('phpbb_', $table_prefix, $insertfile[$i]), $matches) )
{
$returnvalue[$matches[2]][] = $matches[1];
}
@@ -323,16 +323,16 @@ function output_table_content($content)
function bbdecode($message)
{
// Undo [code]
$code_start_html = "<!-- BBCode Start --><TABLE BORDER=0 ALIGN=CENTER WIDTH=85%><TR><TD><font size=-1>Code:</font><HR></TD></TR><TR><TD><FONT SIZE=-1><PRE>";
$code_end_html = "</PRE></FONT></TD></TR><TR><TD><HR></TD></TR></TABLE><!-- BBCode End -->";
$message = str_replace($code_start_html, "[code]", $message);
$message = str_replace($code_end_html, "[/code]", $message);
$code_start_html = '<!-- BBCode Start --><TABLE BORDER=0 ALIGN=CENTER WIDTH=85%><TR><TD><font size=-1>Code:</font><HR></TD></TR><TR><TD><FONT SIZE=-1><PRE>';
$code_end_html = '</PRE></FONT></TD></TR><TR><TD><HR></TD></TR></TABLE><!-- BBCode End -->';
$message = str_replace($code_start_html, '[code]', $message);
$message = str_replace($code_end_html, '[/code]', $message);
// Undo [quote]
$quote_start_html = "<!-- BBCode Quote Start --><TABLE BORDER=0 ALIGN=CENTER WIDTH=85%><TR><TD><font size=-1>Quote:</font><HR></TD></TR><TR><TD><FONT SIZE=-1><BLOCKQUOTE>";
$quote_end_html = "</BLOCKQUOTE></FONT></TD></TR><TR><TD><HR></TD></TR></TABLE><!-- BBCode Quote End -->";
$message = str_replace($quote_start_html, "[quote]", $message);
$message = str_replace($quote_end_html, "[/quote]", $message);
$quote_start_html = '<!-- BBCode Quote Start --><TABLE BORDER=0 ALIGN=CENTER WIDTH=85%><TR><TD><font size=-1>Quote:</font><HR></TD></TR><TR><TD><FONT SIZE=-1><BLOCKQUOTE>';
$quote_end_html = '</BLOCKQUOTE></FONT></TD></TR><TR><TD><HR></TD></TR></TABLE><!-- BBCode Quote End -->';
$message = str_replace($quote_start_html, '[quote]', $message);
$message = str_replace($quote_end_html, '[/quote]', $message);
// Undo [b] and [i]
$message = preg_replace("#<!-- BBCode Start --><B>(.*?)</B><!-- BBCode End -->#s", "[b]\\1[/b]", $message);
@@ -353,17 +353,17 @@ function bbdecode($message)
// Undo lists (unordered/ordered)
// <li> tags:
$message = str_replace("<!-- BBCode --><LI>", "[*]", $message);
$message = str_replace('<!-- BBCode --><LI>', '[*]', $message);
// [list] tags:
$message = str_replace("<!-- BBCode ulist Start --><UL>", "[list]", $message);
$message = str_replace('<!-- BBCode ulist Start --><UL>', '[list]', $message);
// [list=x] tags:
$message = preg_replace("#<!-- BBCode olist Start --><OL TYPE=([A1])>#si", "[list=\\1]", $message);
$message = preg_replace('#<!-- BBCode olist Start --><OL TYPE=([A1])>#si', "[list=\\1]", $message);
// [/list] tags:
$message = str_replace("</UL><!-- BBCode ulist End -->", "[/list]", $message);
$message = str_replace("</OL><!-- BBCode olist End -->", "[/list]", $message);
$message = str_replace('</UL><!-- BBCode ulist End -->', '[/list]', $message);
$message = str_replace('</OL><!-- BBCode olist End -->', '[/list]', $message);
return $message;
}
@@ -1075,7 +1075,7 @@ if ( !empty($next) )
// undo 1.2.x encoding..
$row['post_text'] = bbdecode(stripslashes($row['post_text']));
$row['post_text'] = undo_make_clickable($row['post_text']);
$row['post_text'] = str_replace("<BR>", "\n", $row['post_text']);
$row['post_text'] = str_replace('<BR>', "\n", $row['post_text']);
// make a uid
$uid = make_bbcode_uid();
@@ -1086,14 +1086,14 @@ if ( !empty($next) )
$row['post_text'] = addslashes($row['post_text']);
$edited_sql = "";
if ( preg_match("/^(.*?)([\n]+<font size=\-1>\[ This message was .*?)$/s", $row['post_text'], $matches) )
if ( preg_match('/^(.*?)([\n]+<font size=\-1>\[ This message was .*?)$/s', $row['post_text'], $matches) )
{
$row['post_text'] = $matches[1];
$edit_info = $matches[2];
$edit_times = count(explode(" message ", $edit_info)) - 1; // Taken from example for substr_count in annotated PHP manual
$edit_times = count(explode(' message ', $edit_info)) - 1; // Taken from example for substr_count in annotated PHP manual
if ( preg_match("/^.* by: (.*?) on (....)-(..)-(..) (..):(..) \]<\/font>/s", $edit_info, $matches) )
if ( preg_match('/^.* by: (.*?) on (....)-(..)-(..) (..):(..) \]<\/font>/s', $edit_info, $matches) )
{
$edited_user = $matches[1];
$edited_time = gmmktime($matches[5], $matches[6], 0, $matches[3], $matches[4], $matches[2]);
@@ -1130,7 +1130,7 @@ if ( !empty($next) )
$inc++;
if ( $inc == $per_pct )
{
print ".";
print '.';
flush();
$inc = 0;
}
@@ -1259,7 +1259,7 @@ if ( !empty($next) )
$inc++;
if ( $inc == $per_pct )
{
print ".";
print '.';
flush();
$inc = 0;
}
@@ -1279,7 +1279,7 @@ if ( !empty($next) )
while( $row = $db->sql_fetchrow($result) )
{
// Check if this moderator and this forum still exist
$sql = "SELECT NULL
$sql = "SELECT user_id
FROM " . USERS_TABLE . ", " . FORUMS_TABLE . "
WHERE user_id = " . $row['user_id'] . "
AND forum_id = " . $row['forum_id'];
@@ -1309,6 +1309,35 @@ if ( !empty($next) )
print "<span class=\"ok\"><b>OK</b></span><br />\n";
}
print " * Setting correct user_level for moderators ::";
flush();
$sql = "SELECT DISTINCT u.user_id
FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug, " . AUTH_ACCESS_TABLE . " aa
WHERE aa.auth_mod = 1
AND ug.group_id = aa.group_id
AND u.user_id = ug.user_id
AND u.user_level <> " . ADMIN;
$result = query($sql, "Couldn't obtain list of moderators");
if ( $row = $db->sql_fetchrow($result) )
{
$ug_sql = '';
do
{
$ug_sql .= ( ( $ug_sql != '' ) ? ', ' : '' ) . $row['user_id'];
}
while ( $row = $db->sql_fetchrow($result) );
$sql = "UPDATE " . USERS_TABLE . "
SET user_level = " . MOD . "
WHERE user_id IN ($ug_sql)";
query($sql, "Couldn't set moderator status for users");
}
print "<span class=\"ok\"><b>OK</b></span><br />\n";
end_step('convert_privforums');

2
phpBB/viewforum.php
View File

@@ -34,7 +34,7 @@ if ( isset($HTTP_GET_VARS[POST_FORUM_URL]) || isset($HTTP_POST_VARS[POST_FORUM_U
}
else if ( isset($HTTP_GET_VARS['forum']))
{
$forum_id = $HTTP_GET_VARS['forum'];
$forum_id = intval($HTTP_GET_VARS['forum']);
}
else
{

23
phpBB/viewonline.php
View File

@@ -79,11 +79,10 @@ $is_auth_ary = auth(AUTH_VIEW, AUTH_LIST_ALL, $userdata);
//
// Get user list
//
$sql = "SELECT u.user_id, u.username, u.user_session_time, u.user_session_page, u.user_allow_viewonline, u.user_level, s.session_logged_in, s.session_time, s.session_page, s.session_ip
$sql = "SELECT u.user_id, u.username, u.user_allow_viewonline, u.user_level, s.session_logged_in, s.session_time, s.session_page, s.session_ip
FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
WHERE u.user_id = s.session_user_id
AND ( s.session_time >= ".( time() - 300 ) . "
OR u.user_session_time >= " . ( time() - 300 ) . " )
AND s.session_time >= ".( time() - 300 ) . "
ORDER BY u.username ASC, s.session_ip ASC";
if ( !($result = $db->sql_query($sql)) )
{
@@ -134,9 +133,6 @@ while ( $row = $db->sql_fetchrow($result) )
$registered_users++;
}
$last_update = $row['user_session_time'];
$user_page = $row['user_session_page'];
$which_counter = 'reg_counter';
$which_row = 'reg_user_row';
$prev_user = $user_id;
@@ -146,13 +142,10 @@ while ( $row = $db->sql_fetchrow($result) )
{
if ( $row['session_ip'] != $prev_ip )
{
$username = $lang['Guest'];
$view_online = true;
$guest_users++;
$username = $lang['Guest'];
$last_update = $row['session_time'];
$user_page = $row['session_page'];
$which_counter = 'guest_counter';
$which_row = 'guest_user_row';
}
@@ -162,9 +155,9 @@ while ( $row = $db->sql_fetchrow($result) )
if ( $view_online )
{
if ( $user_page < 1 || !$is_auth_ary[$user_page]['auth_view'] )
if ( $row['session_page'] < 1 || !$is_auth_ary[$row['session_page']]['auth_view'] )
{
switch( $user_page )
switch( $row['session_page'] )
{
case PAGE_INDEX:
$location = $lang['Forum_index'];
@@ -209,8 +202,8 @@ while ( $row = $db->sql_fetchrow($result) )
}
else
{
$location_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . '=' . $user_page);
$location = $forum_data[$user_page];
$location_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . '=' . $row['session_page']);
$location = $forum_data[$row['session_page']];
}
$row_color = ( $$which_counter % 2 ) ? $theme['td_color1'] : $theme['td_color2'];
@@ -220,7 +213,7 @@ while ( $row = $db->sql_fetchrow($result) )
'ROW_COLOR' => '#' . $row_color,
'ROW_CLASS' => $row_class,
'USERNAME' => $username,
'LASTUPDATE' => create_date($board_config['default_dateformat'], $last_update, $board_config['board_timezone']),
'LASTUPDATE' => create_date($board_config['default_dateformat'], $row['session_time'], $board_config['board_timezone']),
'FORUM_LOCATION' => $location,
'U_USER_PROFILE' => append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . '=' . $user_id),

2
phpBB/viewtopic.php
View File

@@ -990,7 +990,7 @@ for($i = 0; $i < $total_posts; $i++)
{
$temp_url = append_sid("posting.$phpEx?mode=delete&amp;" . POST_POST_URL . "=" . $postrow[$i]['post_id']);
$delpost_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_delpost'] . '" alt="' . $lang['Delete_post'] . '" title="' . $lang['Delete_post'] . '" border="0" /></a>';
$delpost_img = '<a href="' . $temp_url . '">' . $lang['Delete_post'] . '</a>';
$delpost = '<a href="' . $temp_url . '">' . $lang['Delete_post'] . '</a>';
}
else
{