makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-28 04:48:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

pre-freeze on main templates, various bug fixes (highlighting search results, various search related issues, blah blah). These updates need _thorough_ checking, quickly

Browse source 
git-svn-id: file:///svn/phpbb/trunk@2448 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2002-03-31 00:06:34 +00:00
parent f74fa81851
commit e1f7400b8d
57 changed files with 2598 additions and 2710 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
phpBB/config.php
View file

@ -0,0 +1,51 @@
<?php
//
// phpBB 2.x auto-generated config file
// Do not change anything in this file!
//
$dbms = "mysql4";
$dbhost = "localhost";
$dbname = "dev_starstreak_net";
$dbuser = "devhttp";
$dbpasswd = "efx2KarizonaD";
$dbhost = "localhost";
$dbname = "phpbb_com";
$dbuser = "devhttp";
$dbpasswd = "efx2KarizonaD";
/*
$dbhost = "localhost";
$dbname = "phpbb_test";
$dbuser = "devhttp";
$dbpasswd = "efx2KarizonaD";
$dbms = "mssql-odbc";
$dbhost = "mssql_phpbb_odbc";
$dbname = "";
$dbuser = "phpbb";
$dbpasswd = "efx2000";
$dbms = "msaccess";
$dbhost = "phpbb_msaccess_odbc";
$dbname = "";
$dbuser = "devhttp";
$dbpasswd = "efx2KarizonaD";
$dbms = "mssql";
$dbhost = "localhost";
$dbname = "phpbb";
$dbuser = "phpbb";
$dbpasswd = "efx2000";
*/
$table_prefix = "phpbb_";
define('PHPBB_INSTALLED', true);
?>

62
phpBB/faq.php
View file

@ -21,7 +21,7 @@
***************************************************************************/ ***************************************************************************/
define('IN_PHPBB', true); define('IN_PHPBB', true);
$phpbb_root_path = "./"; $phpbb_root_path = './';
include($phpbb_root_path . 'extension.inc'); include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'common.'.$phpEx); include($phpbb_root_path . 'common.'.$phpEx);
@ -37,24 +37,23 @@ init_userprefs($userdata);
// //
// Load the appropriate faq file // Load the appropriate faq file
// //
if( isset($HTTP_GET_VARS['mode']) ) if( isset($HTTP_GET_VARS['mode']) )
{ {
switch( $HTTP_GET_VARS['mode'] ) switch( $HTTP_GET_VARS['mode'] )
{ {
case 'bbcode': case 'bbcode':
$lang_file = "lang_bbcode"; $lang_file = 'lang_bbcode';
$l_title = $lang['BBCode_guide']; $l_title = $lang['BBCode_guide'];
break; break;
default: default:
$lang_file = "lang_faq"; $lang_file = 'lang_faq';
$l_title = $lang['FAQ']; $l_title = $lang['FAQ'];
break; break;
} }
} }
else else
{ {
$lang_file = "lang_faq"; $lang_file = 'lang_faq';
$l_title = $lang['FAQ']; $l_title = $lang['FAQ'];
} }
include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/' . $lang_file . '.' . $phpEx); include($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/' . $lang_file . '.' . $phpEx);
@ -70,7 +69,7 @@ $faq_block_titles = array();
for($i = 0; $i < count($faq); $i++) for($i = 0; $i < count($faq); $i++)
{ {
if( $faq[$i][0] != "--" ) if( $faq[$i][0] != '--' )
{ {
$faq_block[$j][$counter]['id'] = $counter_2; $faq_block[$j][$counter]['id'] = $counter_2;
$faq_block[$j][$counter]['question'] = $faq[$i][0]; $faq_block[$j][$counter]['question'] = $faq[$i][0];
@ -96,35 +95,24 @@ $page_title = $l_title;
include($phpbb_root_path . 'includes/page_header.'.$phpEx); include($phpbb_root_path . 'includes/page_header.'.$phpEx);
$template->set_filenames(array( $template->set_filenames(array(
"body" => "faq_body.tpl", 'body' => 'faq_body.tpl')
"jumpbox" => "jumpbox.tpl")
); );
make_jumpbox('viewforum.'.$phpEx, $forum_id);
$jumpbox = make_jumpbox($forum_id);
$template->assign_vars(array(
"L_GO" => $lang['Go'],
"L_JUMP_TO" => $lang['Jump_to'],
"L_SELECT_FORUM" => $lang['Select_forum'],
"S_JUMPBOX_LIST" => $jumpbox,
"S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"))
);
$template->assign_var_from_handle("JUMPBOX", "jumpbox");
$template->assign_vars(array( $template->assign_vars(array(
"L_FAQ_TITLE" => $l_title, 'L_FAQ_TITLE' => $l_title,
"L_BACK_TO_TOP" => $lang['Back_to_top']) 'L_BACK_TO_TOP' => $lang['Back_to_top'])
); );
for($i = 0; $i < count($faq_block); $i++) for($i = 0; $i < count($faq_block); $i++)
{ {
if( count($faq_block[$i]) ) if( count($faq_block[$i]) )
{ {
$template->assign_block_vars("faq_block", array( $template->assign_block_vars('faq_block', array(
"BLOCK_TITLE" => $faq_block_titles[$i]) 'BLOCK_TITLE' => $faq_block_titles[$i])
); );
$template->assign_block_vars("faq_block_link", array( $template->assign_block_vars('faq_block_link', array(
"BLOCK_TITLE" => $faq_block_titles[$i]) 'BLOCK_TITLE' => $faq_block_titles[$i])
); );
for($j = 0; $j < count($faq_block[$i]); $j++) for($j = 0; $j < count($faq_block[$i]); $j++)
@ -132,27 +120,27 @@ for($i = 0; $i < count($faq_block); $i++)
$row_color = ( !($j % 2) ) ? $theme['td_color1'] : $theme['td_color2']; $row_color = ( !($j % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
$row_class = ( !($j % 2) ) ? $theme['td_class1'] : $theme['td_class2']; $row_class = ( !($j % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
$template->assign_block_vars("faq_block.faq_row", array( $template->assign_block_vars('faq_block.faq_row', array(
"ROW_COLOR" => "#" . $row_color, 'ROW_COLOR' => '#' . $row_color,
"ROW_CLASS" => $row_class, 'ROW_CLASS' => $row_class,
"FAQ_QUESTION" => $faq_block[$i][$j]['question'], 'FAQ_QUESTION' => $faq_block[$i][$j]['question'],
"FAQ_ANSWER" => $faq_block[$i][$j]['answer'], 'FAQ_ANSWER' => $faq_block[$i][$j]['answer'],
"U_FAQ_ID" => $faq_block[$i][$j]['id']) 'U_FAQ_ID' => $faq_block[$i][$j]['id'])
); );
$template->assign_block_vars("faq_block_link.faq_row_link", array( $template->assign_block_vars('faq_block_link.faq_row_link', array(
"ROW_COLOR" => "#" . $row_color, 'ROW_COLOR' => '#' . $row_color,
"ROW_CLASS" => $row_class, 'ROW_CLASS' => $row_class,
"FAQ_LINK" => $faq_block[$i][$j]['question'], 'FAQ_LINK' => $faq_block[$i][$j]['question'],
"U_FAQ_LINK" => "#" . $faq_block[$i][$j]['id']) 'U_FAQ_LINK' => '#' . $faq_block[$i][$j]['id'])
); );
} }
} }
} }
$template->pparse("body"); $template->pparse('body');
include($phpbb_root_path . 'includes/page_tail.'.$phpEx); include($phpbb_root_path . 'includes/page_tail.'.$phpEx);

771
phpBB/groupcp.php
View file

File diff suppressed because it is too large Load diff

19
phpBB/includes/functions.php
View file

@ -90,9 +90,9 @@ function get_userdata($user)
return ( $row = $db->sql_fetchrow($result) ) ? $row : false; return ( $row = $db->sql_fetchrow($result) ) ? $row : false;
} }
function make_jumpbox($match_forum_id = 0) function make_jumpbox($action, $match_forum_id = 0)
{ {
global $lang, $db, $SID, $nav_links, $phpEx; global $template, $lang, $db, $SID, $nav_links, $phpEx;
$sql = "SELECT c.cat_id, c.cat_title, c.cat_order $sql = "SELECT c.cat_id, c.cat_title, c.cat_order
FROM " . CATEGORIES_TABLE . " c, " . FORUMS_TABLE . " f FROM " . CATEGORIES_TABLE . " c, " . FORUMS_TABLE . " f
@ -174,7 +174,20 @@ function make_jumpbox($match_forum_id = 0)
$boxstring .= '<input type="hidden" name="sid" value="' . $SID . '" />'; $boxstring .= '<input type="hidden" name="sid" value="' . $SID . '" />';
} }
return $boxstring; $template->set_filenames(array(
'jumpbox' => 'jumpbox.tpl')
);
$template->assign_vars(array(
'L_GO' => $lang['Go'],
'L_JUMP_TO' => $lang['Jump_to'],
'L_SELECT_FORUM' => $lang['Select_forum'],
'S_JUMPBOX_SELECT' => $boxstring,
'S_JUMPBOX_ACTION' => append_sid($action))
);
$template->assign_var_from_handle('JUMPBOX', 'jumpbox');
return;
} }
// //

142
phpBB/includes/functions_search.php
View file

@ -22,20 +22,12 @@
function clean_words($mode, &$entry, &$stopword_list, &$synonym_list) function clean_words($mode, &$entry, &$stopword_list, &$synonym_list)
{ {
// Weird, $init_match doesn't work with static when double quotes (") are used... // Weird, $init_match doesn't work with static when double quotes (") are used...
static $drop_char_match = array('^', '$', '&', '(', ')', '<', '>', '`', "'", '|', ',', '@', '_', '?', '%', '-', '~', '+', '.', '[', ']', '{', '}', ':', '\\', '/', '=', '#', '\'', ';', '!'); static $drop_char_match = array('^', '$', '&', '(', ')', '<', '>', '`', '\'', '"', '|', ',', '@', '_', '?', '%', '-', '~', '+', '.', '[', ']', '{', '}', ':', '\\', '/', '=', '#', '\'', ';', '!');
static $drop_char_replace = array(' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', '', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' , ' ', ' ', ' ', ' ', ' ', ' '); static $drop_char_replace = array(' ', ' ', ' ', ' ', ' ', ' ', ' ', '', '', ' ', ' ', ' ', ' ', '', ' ', ' ', '', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' , ' ', ' ', ' ', ' ', ' ', ' ');
// static $accent_match = array("ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è", "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "ø", "ù", "ú", "û", "ü", "ý", "þ", "ÿ");
// static $accent_replace = array("s", "a", "a", "a", "a", "a", "a", "a", "c", "e", "e", "e", "e", "i", "i", "i", "i", "o", "n", "o", "o", "o", "o", "o", "o", "u", "u", "u", "u", "y", "t", "y");
$entry = ' ' . strip_tags(strtolower($entry)) . ' '; $entry = ' ' . strip_tags(strtolower($entry)) . ' ';
for($i = 0; $i < count($accent_match); $i++) if ( $mode == 'post' )
{
$entry = str_replace($accent_match[$i], $accent_replace[$i], $entry);
}
if( $mode == 'post' )
{ {
// Replace line endings by a space // Replace line endings by a space
$entry = preg_replace('/[\n\r]/is', ' ', $entry); $entry = preg_replace('/[\n\r]/is', ' ', $entry);
@ -48,7 +40,7 @@ function clean_words($mode, &$entry, &$stopword_list, &$synonym_list)
$entry = preg_replace('/\[\/?url(=.*?)?\]/', ' ', $entry); $entry = preg_replace('/\[\/?url(=.*?)?\]/', ' ', $entry);
$entry = preg_replace('/\[\/?[a-z\*=\+\-]+(\:?[0-9a-z]+)?:[a-z0-9]{10,}(\:[a-z0-9]+)?=?.*?\]/', ' ', $entry); $entry = preg_replace('/\[\/?[a-z\*=\+\-]+(\:?[0-9a-z]+)?:[a-z0-9]{10,}(\:[a-z0-9]+)?=?.*?\]/', ' ', $entry);
} }
else if( $mode == 'search' ) else if ( $mode == 'search' )
{ {
$entry = str_replace('+', ' and ', $entry); $entry = str_replace('+', ' and ', $entry);
$entry = str_replace('-', ' not ', $entry); $entry = str_replace('-', ' not ', $entry);
@ -65,15 +57,15 @@ function clean_words($mode, &$entry, &$stopword_list, &$synonym_list)
$entry = str_replace($drop_char_match[$i], $drop_char_replace[$i], $entry); $entry = str_replace($drop_char_match[$i], $drop_char_replace[$i], $entry);
} }
if( $mode == 'post' ) if ( $mode == 'post' )
{ {
$entry = str_replace('*', ' ', $entry); $entry = str_replace('*', ' ', $entry);
// 'words' that consist of <=3 or >=25 characters are removed. // 'words' that consist of <=3 or >=25 characters are removed.
$entry = preg_replace('/\b([a-z0-9]{1,3}|[a-z0-9]{25,})\b/',' ', $entry); $entry = preg_replace('/\b([a-z0-9]{1,3}|[a-z0-9]{20,})\b/',' ', $entry);
} }
if( !empty($stopword_list) ) if ( !empty($stopword_list) )
{ {
for ($j = 0; $j < count($stopword_list); $j++) for ($j = 0; $j < count($stopword_list); $j++)
{ {
@ -86,7 +78,7 @@ function clean_words($mode, &$entry, &$stopword_list, &$synonym_list)
} }
} }
if( !empty($synonym_list) ) if ( !empty($synonym_list) )
{ {
for ($j = 0; $j < count($synonym_list); $j++) for ($j = 0; $j < count($synonym_list); $j++)
{ {
@ -103,7 +95,7 @@ function clean_words($mode, &$entry, &$stopword_list, &$synonym_list)
function split_words(&$entry, $mode = 'post') function split_words(&$entry, $mode = 'post')
{ {
if( $mode == 'post' ) if ( $mode == 'post' )
{ {
preg_match_all("/\b(\w[\w']*\w+|\w+?)\b/", $entry, $split_entries); preg_match_all("/\b(\w[\w']*\w+|\w+?)\b/", $entry, $split_entries);
} }
@ -128,10 +120,10 @@ function add_search_words($post_id, $post_text, $post_title = '')
$word = array(); $word = array();
$word_insert_sql = array(); $word_insert_sql = array();
while( list($word_in, $search_matches) = @each($search_raw_words) ) while ( list($word_in, $search_matches) = @each($search_raw_words) )
{ {
$word_insert_sql[$word_in] = ''; $word_insert_sql[$word_in] = '';
if( !empty($search_matches) ) if ( !empty($search_matches) )
{ {
for ($i = 0; $i < count($search_matches); $i++) for ($i = 0; $i < count($search_matches); $i++)
{ {
@ -149,7 +141,7 @@ function add_search_words($post_id, $post_text, $post_title = '')
} }
} }
if( count($word) ) if ( count($word) )
{ {
sort($word); sort($word);
@ -178,12 +170,12 @@ function add_search_words($post_id, $post_text, $post_title = '')
$sql = "SELECT word_id, word_text $sql = "SELECT word_id, word_text
FROM " . SEARCH_WORD_TABLE . " FROM " . SEARCH_WORD_TABLE . "
WHERE word_text IN ($word_text_sql)"; WHERE word_text IN ($word_text_sql)";
if( !($result = $db->sql_query($sql)) ) if ( !($result = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, 'Could not select words', '', __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not select words', '', __LINE__, __FILE__, $sql);
} }
while( $row = $db->sql_fetchrow($result) ) while ( $row = $db->sql_fetchrow($result) )
{ {
$check_words[$row['word_text']] = $row['word_id']; $check_words[$row['word_text']] = $row['word_id'];
} }
@ -195,18 +187,18 @@ function add_search_words($post_id, $post_text, $post_title = '')
for ($i = 0; $i < count($word); $i++) for ($i = 0; $i < count($word); $i++)
{ {
$new_match = true; $new_match = true;
if( isset($check_words[$word[$i]]) ) if ( isset($check_words[$word[$i]]) )
{ {
$new_match = false; $new_match = false;
} }
if( $new_match ) if ( $new_match )
{ {
switch( SQL_LAYER ) switch( SQL_LAYER )
{ {
case 'mysql': case 'mysql':
case 'mysql4': case 'mysql4':
$value_sql .= ( ( $value_sql != '' ) ? ', ' : '' ) . "('" . $word[$i] . "')"; $value_sql .= ( ( $value_sql != '' ) ? ', ' : '' ) . '(\'' . $word[$i] . '\')';
break; break;
case 'mssql': case 'mssql':
$value_sql .= ( ( $value_sql != '' ) ? ' UNION ALL ' : '' ) . "SELECT '" . $word[$i] . "'"; $value_sql .= ( ( $value_sql != '' ) ? ' UNION ALL ' : '' ) . "SELECT '" . $word[$i] . "'";
@ -238,7 +230,7 @@ function add_search_words($post_id, $post_text, $post_title = '')
break; break;
} }
if( !($result = $db->sql_query($sql)) ) if ( !($result = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, 'Could not insert new word', '', __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not insert new word', '', __LINE__, __FILE__, $sql);
} }
@ -255,7 +247,7 @@ function add_search_words($post_id, $post_text, $post_title = '')
SELECT $post_id, word_id, $title_match SELECT $post_id, word_id, $title_match
FROM " . SEARCH_WORD_TABLE . " FROM " . SEARCH_WORD_TABLE . "
WHERE word_text IN ($match_sql)"; WHERE word_text IN ($match_sql)";
if( !($result = $db->sql_query($sql)) ) if ( !($result = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, 'Could not insert new word matches', '', __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not insert new word matches', '', __LINE__, __FILE__, $sql);
} }
@ -278,18 +270,18 @@ function remove_common($mode, $fraction, $word_id_list = array())
global $db; global $db;
$sql = ( $mode == 'global' ) ? "SELECT COUNT(post_id) AS total_posts FROM " . SEARCH_MATCH_TABLE . " GROUP BY post_id" : "SELECT SUM(forum_posts) AS total_posts FROM " . FORUMS_TABLE; $sql = ( $mode == 'global' ) ? "SELECT COUNT(post_id) AS total_posts FROM " . SEARCH_MATCH_TABLE . " GROUP BY post_id" : "SELECT SUM(forum_posts) AS total_posts FROM " . FORUMS_TABLE;
if( !($result = $db->sql_query($sql)) ) if ( !($result = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, 'Could not obtain post count', '', __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not obtain post count', '', __LINE__, __FILE__, $sql);
} }
$row = $db->sql_fetchrow($result); $row = $db->sql_fetchrow($result);
if( $row['total_posts'] >= 100 ) if ( $row['total_posts'] >= 100 )
{ {
$common_threshold = floor($row['total_posts'] * $fraction); $common_threshold = floor($row['total_posts'] * $fraction);
if( $mode == 'single' && count($word_id_list) ) if ( $mode == 'single' && count($word_id_list) )
{ {
$word_id_sql = ''; $word_id_sql = '';
for($i = 0; $i < count($word_id_list); $i++) for($i = 0; $i < count($word_id_list); $i++)
@ -312,32 +304,32 @@ function remove_common($mode, $fraction, $word_id_list = array())
HAVING COUNT(word_id) > $common_threshold"; HAVING COUNT(word_id) > $common_threshold";
} }
if( !($result = $db->sql_query($sql)) ) if ( !($result = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, 'Could not obtain common word list', '', __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not obtain common word list', '', __LINE__, __FILE__, $sql);
} }
$common_word_id = ''; $common_word_id = '';
while( $row = $db->sql_fetchrow($result) ) while ( $row = $db->sql_fetchrow($result) )
{ {
$common_word_id .= ( ( $common_word_id != '' ) ? ', ' : '' ) . $row['word_id']; $common_word_id .= ( ( $common_word_id != '' ) ? ', ' : '' ) . $row['word_id'];
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
if( $common_word_id != '' ) if ( $common_word_id != '' )
{ {
$sql = "UPDATE " . SEARCH_WORD_TABLE . " $sql = "UPDATE " . SEARCH_WORD_TABLE . "
SET word_common = " . TRUE . " SET word_common = " . TRUE . "
WHERE word_id IN ($common_word_id)"; WHERE word_id IN ($common_word_id)";
if( !($result = $db->sql_query($sql)) ) if ( !($result = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, 'Could not delete word list entry', '', __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not delete word list entry', '', __LINE__, __FILE__, $sql);
} }
$sql = "DELETE FROM " . SEARCH_MATCH_TABLE . " $sql = "DELETE FROM " . SEARCH_MATCH_TABLE . "
WHERE word_id IN ($common_word_id)"; WHERE word_id IN ($common_word_id)";
if( !($result = $db->sql_query($sql)) ) if ( !($result = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, 'Could not delete word match entry', '', __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not delete word match entry', '', __LINE__, __FILE__, $sql);
} }
@ -353,7 +345,7 @@ function remove_search_post($post_id_sql)
$words_removed = false; $words_removed = false;
switch( SQL_LAYER ) switch ( SQL_LAYER )
{ {
case 'mysql': case 'mysql':
case 'mysql4': case 'mysql4':
@ -364,7 +356,7 @@ function remove_search_post($post_id_sql)
if ( $result = $db->sql_query($sql) ) if ( $result = $db->sql_query($sql) )
{ {
$word_id_sql = ''; $word_id_sql = '';
while( $row = $db->sql_fetchrow($result) ) while ( $row = $db->sql_fetchrow($result) )
{ {
$word_id_sql .= ( $word_id_sql != '' ) ? ', ' . $row['word_id'] : $row['word_id']; $word_id_sql .= ( $word_id_sql != '' ) ? ', ' . $row['word_id'] : $row['word_id'];
} }
@ -377,7 +369,7 @@ function remove_search_post($post_id_sql)
if ( $result = $db->sql_query($sql) ) if ( $result = $db->sql_query($sql) )
{ {
$word_id_sql = ''; $word_id_sql = '';
while( $row = $db->sql_fetchrow($result) ) while ( $row = $db->sql_fetchrow($result) )
{ {
$word_id_sql .= ( $word_id_sql != '' ) ? ', ' . $row['word_id'] : $row['word_id']; $word_id_sql .= ( $word_id_sql != '' ) ? ', ' . $row['word_id'] : $row['word_id'];
} }
@ -434,12 +426,12 @@ function remove_search_post($post_id_sql)
// //
// Username search // Username search
// //
function username_search($search_match, $is_inline_review = 0, $default_list = "") function username_search($search_match)
{ {
global $db, $board_config, $template, $lang, $images, $theme, $phpEx, $phpbb_root_path; global $db, $board_config, $template, $lang, $images, $theme, $phpEx, $phpbb_root_path;
global $starttime; global $starttime;
$author_list = ''; $username_list = '';
if ( !empty($search_match) ) if ( !empty($search_match) )
{ {
$username_search = preg_replace('/\*/', '%', trim(strip_tags($search_match))); $username_search = preg_replace('/\*/', '%', trim(strip_tags($search_match)));
@ -457,55 +449,49 @@ function username_search($search_match, $is_inline_review = 0, $default_list = "
{ {
do do
{ {
$author_list .= '<option value="' . $row['username'] . '">' .$row['username'] . '</option>'; $username_list .= '<option value="' . $row['username'] . '">' . $row['username'] . '</option>';
} }
while ( $row = $db->sql_fetchrow($result) ); while ( $row = $db->sql_fetchrow($result) );
} }
else else
{ {
$author_list = '<option>' . $lang['No_match']. '</option>'; $username_list .= '<option>' . $lang['No_match']. '</option>';
} }
} }
if ( !$is_inline_review ) $gen_simple_header = TRUE;
$page_title = $lang['Search'];
include($phpbb_root_path . 'includes/page_header.'.$phpEx);
$template->set_filenames(array(
'search_user_body' => 'search_username.tpl')
);
$template->assign_vars(array(
'USERNAME' => ( !empty($search_match) ) ? $search_match : '',
'L_CLOSE_WINDOW' => $lang['Close_window'],
'L_SEARCH_USERNAME' => $lang['Find_username'],
'L_UPDATE_USERNAME' => $lang['Select_username'],
'L_SELECT' => $lang['Select'],
'L_SEARCH' => $lang['Search'],
'L_SEARCH_EXPLAIN' => $lang['Search_author_explain'],
'L_CLOSE_WINDOW' => $lang['Close_window'],
'S_USERNAME_OPTIONS' => $username_list,
'S_SEARCH_ACTION' => append_sid("search.$phpEx?mode=searchuser"))
);
if ( $username_list != '' )
{ {
$gen_simple_header = TRUE; $template->assign_block_vars('switch_select_name', array());
$page_title = $lang['Search'];
include($phpbb_root_path . 'includes/page_header.'.$phpEx);
$template->set_filenames(array(
'search_user_body' => 'search_username.tpl')
);
$template->assign_vars(array(
'L_CLOSE_WINDOW' => $lang['Close_window'],
'L_SEARCH_USERNAME' => $lang['Find_username'],
'L_UPDATE_USERNAME' => $lang['Select_username'],
'L_SELECT' => $lang['Select'],
'L_SEARCH' => $lang['Search'],
'L_SEARCH_EXPLAIN' => $lang['Search_author_explain'],
'L_CLOSE_WINDOW' => $lang['Close_window'],
'S_AUTHOR_OPTIONS' => $author_list,
'S_SEARCH_ACTION' => append_sid("search.$phpEx?mode=searchuser"))
);
//
// If we have results then dump them out and enable
// the appropriate switch block
//
if ( !empty($author_list) )
{
$template->assign_block_vars('switch_select_name', array());
}
$template->pparse('search_user_body');
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
} }
return($author_list); $template->pparse('search_user_body');
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
return;
} }
?> ?>

136
phpBB/includes/page_header.php
View file

@ -31,22 +31,22 @@ define('HEADER_INC', TRUE);
// gzip_compression // gzip_compression
// //
$do_gzip_compress = FALSE; $do_gzip_compress = FALSE;
if($board_config['gzip_compress']) if ( $board_config['gzip_compress'] )
{ {
$phpver = phpversion(); $phpver = phpversion();
if($phpver >= '4.0.4pl1') if ( $phpver >= '4.0.4pl1' )
{ {
if(extension_loaded('zlib')) if ( extension_loaded('zlib') )
{ {
ob_start('ob_gzhandler'); ob_start('ob_gzhandler');
} }
} }
else if($phpver > '4.0') else if ( $phpver > '4.0' )
{ {
if(strstr($HTTP_SERVER_VARS['HTTP_ACCEPT_ENCODING'], 'gzip')) if ( strstr($HTTP_SERVER_VARS['HTTP_ACCEPT_ENCODING'], 'gzip') )
{ {
if(extension_loaded('zlib')) if ( extension_loaded('zlib') )
{ {
$do_gzip_compress = TRUE; $do_gzip_compress = TRUE;
ob_start(); ob_start();
@ -68,14 +68,14 @@ $template->set_filenames(array(
// //
// Generate logged in/logged out status // Generate logged in/logged out status
// //
if($userdata['session_logged_in']) if ( $userdata['session_logged_in'] )
{ {
$u_login_logout = "login.$phpEx?logout=true"; $u_login_logout = 'login.'.$phpEx.'?logout=true';
$l_login_logout = $lang['Logout'] . ' [ ' . $userdata["username"] . ' ]'; $l_login_logout = $lang['Logout'] . ' [ ' . $userdata['username'] . ' ]';
} }
else else
{ {
$u_login_logout = "login.$phpEx"; $u_login_logout = 'login.'.$phpEx;
$l_login_logout = $lang['Login']; $l_login_logout = $lang['Login'];
} }
@ -87,7 +87,6 @@ $s_last_visit = ( $userdata['session_logged_in'] ) ? create_date($board_config['
// //
$user_forum_sql = ( !empty($forum_id) ) ? "AND ( u.user_session_page = $forum_id $user_forum_sql = ( !empty($forum_id) ) ? "AND ( u.user_session_page = $forum_id
OR s.session_page = $forum_id)" : ''; OR 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 $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 FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
WHERE u.user_id = s.session_user_id WHERE u.user_id = s.session_user_id
@ -95,8 +94,7 @@ $sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_level, s.s
OR u.user_session_time >= " . ( time() - 300 ) . " ) OR u.user_session_time >= " . ( time() - 300 ) . " )
$user_forum_sql $user_forum_sql
ORDER BY u.username ASC, s.session_ip ASC"; ORDER BY u.username ASC, s.session_ip ASC";
$result = $db->sql_query($sql); if( !($result = $db->sql_query($sql)) )
if(!$result)
{ {
message_die(GENERAL_ERROR, 'Could not obtain user/online information', '', __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not obtain user/online information', '', __LINE__, __FILE__, $sql);
} }
@ -115,24 +113,24 @@ $prev_user_ip = '';
while( $row = $db->sql_fetchrow($result) ) while( $row = $db->sql_fetchrow($result) )
{ {
// User is logged in and therefor not a guest // User is logged in and therefor not a guest
if( $row['session_logged_in'] ) if ( $row['session_logged_in'] )
{ {
// Skip multiple sessions for one user // Skip multiple sessions for one user
if( $row['user_id'] != $prev_user_id ) if ( $row['user_id'] != $prev_user_id )
{ {
$style_color = ''; $style_color = '';
if( $row['user_level'] == ADMIN ) if ( $row['user_level'] == ADMIN )
{ {
$row['username'] = '<b>' . $row['username'] . '</b>'; $row['username'] = '<b>' . $row['username'] . '</b>';
$style_color = 'style="color:#' . $theme['fontcolor3'] . '"'; $style_color = 'style="color:#' . $theme['fontcolor3'] . '"';
} }
else if( $row['user_level'] == MOD ) else if ( $row['user_level'] == MOD )
{ {
$row['username'] = '<b>' . $row['username'] . '</b>'; $row['username'] = '<b>' . $row['username'] . '</b>';
$style_color = 'style="color:#' . $theme['fontcolor2'] . '"'; $style_color = 'style="color:#' . $theme['fontcolor2'] . '"';
} }
if( $row['user_allow_viewonline'] ) if ( $row['user_allow_viewonline'] )
{ {
$user_online_link = '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $row['user_id']) . '"' . $style_color .'>' . $row['username'] . '</a>'; $user_online_link = '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $row['user_id']) . '"' . $style_color .'>' . $row['username'] . '</a>';
$logged_visible_online++; $logged_visible_online++;
@ -143,26 +141,27 @@ while( $row = $db->sql_fetchrow($result) )
$logged_hidden_online++; $logged_hidden_online++;
} }
if( $row['user_allow_viewonline'] || $userdata['user_level'] == ADMIN ) if ( $row['user_allow_viewonline'] || $userdata['user_level'] == ADMIN )
{ {
$online_userlist .= ( $online_userlist != "" ) ? ", " . $user_online_link : $user_online_link; $online_userlist .= ( $online_userlist != '' ) ? ', ' . $user_online_link : $user_online_link;
} }
} }
$prev_user_id = $row['user_id'];
} }
else else
{ {
// Skip multiple sessions for one user // Skip multiple sessions for one user
if( $row['session_ip'] != $prev_session_ip ) if ( $row['session_ip'] != $prev_session_ip )
{ {
$guests_online++; $guests_online++;
} }
} }
$prev_session_ip = $row['session_ip']; $prev_session_ip = $row['session_ip'];
$prev_user_id = $row['user_id'];
} }
if( empty($online_userlist) ) if ( empty($online_userlist) )
{ {
$online_userlist = $lang['None']; $online_userlist = $lang['None'];
} }
@ -172,31 +171,31 @@ $total_online_users = $logged_visible_online + $logged_hidden_online + $guests_o
if ( $total_online_users > $board_config['record_online_users']) if ( $total_online_users > $board_config['record_online_users'])
{ {
$board_config['record_online_users'] = $total_online_users;
$board_config['record_online_date'] = time();
$sql = "UPDATE " . CONFIG_TABLE . " $sql = "UPDATE " . CONFIG_TABLE . "
SET config_value = '$total_online_users' SET config_value = '$total_online_users'
WHERE config_name = 'record_online_users'"; WHERE config_name = 'record_online_users'";
if ( !$result = $db->sql_query($sql) ) if ( !$db->sql_query($sql) )
{ {
message_die(GENERAL_ERROR, 'Could not update online user record (nr of users)', '', __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not update online user record (nr of users)', '', __LINE__, __FILE__, $sql);
} }
$sql = "UPDATE " . CONFIG_TABLE . " $sql = "UPDATE " . CONFIG_TABLE . "
SET config_value = '" . time() . "' SET config_value = '" . $board_config['record_online_date'] . "'
WHERE config_name = 'record_online_date'"; WHERE config_name = 'record_online_date'";
if ( !$result = $db->sql_query($sql) ) if ( !$db->sql_query($sql) )
{ {
message_die(GENERAL_ERROR, 'Could not update online user record (date)', '', __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not update online user record (date)', '', __LINE__, __FILE__, $sql);
} }
$board_config['record_online_users'] = $total_online_users;
$board_config['record_online_date'] = time();
} }
if( $total_online_users == 0 ) if ( $total_online_users == 0 )
{ {
$l_t_user_s = $lang['Online_users_zero_total']; $l_t_user_s = $lang['Online_users_zero_total'];
} }
else if( $total_online_users == 1 ) else if ( $total_online_users == 1 )
{ {
$l_t_user_s = $lang['Online_user_total']; $l_t_user_s = $lang['Online_user_total'];
} }
@ -205,11 +204,11 @@ else
$l_t_user_s = $lang['Online_users_total']; $l_t_user_s = $lang['Online_users_total'];
} }
if( $logged_visible_online == 0 ) if ( $logged_visible_online == 0 )
{ {
$l_r_user_s = $lang['Reg_users_zero_total']; $l_r_user_s = $lang['Reg_users_zero_total'];
} }
else if( $logged_visible_online == 1 ) else if ( $logged_visible_online == 1 )
{ {
$l_r_user_s = $lang['Reg_user_total']; $l_r_user_s = $lang['Reg_user_total'];
} }
@ -218,11 +217,11 @@ else
$l_r_user_s = $lang['Reg_users_total']; $l_r_user_s = $lang['Reg_users_total'];
} }
if( $logged_hidden_online == 0 ) if ( $logged_hidden_online == 0 )
{ {
$l_h_user_s = $lang['Hidden_users_zero_total']; $l_h_user_s = $lang['Hidden_users_zero_total'];
} }
else if( $logged_hidden_online == 1 ) else if ( $logged_hidden_online == 1 )
{ {
$l_h_user_s = $lang['Hidden_user_total']; $l_h_user_s = $lang['Hidden_user_total'];
} }
@ -231,11 +230,11 @@ else
$l_h_user_s = $lang['Hidden_users_total']; $l_h_user_s = $lang['Hidden_users_total'];
} }
if( $guests_online == 0 ) if ( $guests_online == 0 )
{ {
$l_g_user_s = $lang['Guest_users_zero_total']; $l_g_user_s = $lang['Guest_users_zero_total'];
} }
else if( $guests_online == 1 ) else if ( $guests_online == 1 )
{ {
$l_g_user_s = $lang['Guest_user_total']; $l_g_user_s = $lang['Guest_user_total'];
} }
@ -253,19 +252,19 @@ $l_online_users .= sprintf($l_g_user_s, $guests_online);
// Obtain number of new private messages // Obtain number of new private messages
// if user is logged in // if user is logged in
// //
if( $userdata['session_logged_in'] ) if ( $userdata['session_logged_in'] )
{ {
if( $userdata['user_new_privmsg'] ) if ( $userdata['user_new_privmsg'] )
{ {
$l_message_new = ( $userdata['user_new_privmsg'] == 1 ) ? $lang['New_pm'] : $lang['New_pms']; $l_message_new = ( $userdata['user_new_privmsg'] == 1 ) ? $lang['New_pm'] : $lang['New_pms'];
$l_privmsgs_text = sprintf($l_message_new, $userdata['user_new_privmsg']); $l_privmsgs_text = sprintf($l_message_new, $userdata['user_new_privmsg']);
if( $userdata['user_last_privmsg'] > $userdata['user_lastvisit'] ) if ( $userdata['user_last_privmsg'] > $userdata['user_lastvisit'] )
{ {
$sql = "UPDATE " . USERS_TABLE . " $sql = "UPDATE " . USERS_TABLE . "
SET user_last_privmsg = " . $userdata['user_lastvisit'] . " SET user_last_privmsg = " . $userdata['user_lastvisit'] . "
WHERE user_id = " . $userdata['user_id']; WHERE user_id = " . $userdata['user_id'];
if( !$status = $db->sql_query($sql) ) if ( !($status = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, 'Could not update private message new/read time for user', '', __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not update private message new/read time for user', '', __LINE__, __FILE__, $sql);
} }
@ -287,7 +286,7 @@ if( $userdata['session_logged_in'] )
$icon_pm = $images['pm_no_new_msg']; $icon_pm = $images['pm_no_new_msg'];
} }
if( $userdata['user_unread_privmsg'] ) if ( $userdata['user_unread_privmsg'] )
{ {
$l_message_unread = ( $userdata['user_unread_privmsg'] == 1 ) ? $lang['Unread_pm'] : $lang['Unread_pms']; $l_message_unread = ( $userdata['user_unread_privmsg'] == 1 ) ? $lang['Unread_pm'] : $lang['Unread_pms'];
$l_privmsgs_text_unread = sprintf($l_message_unread, $userdata['user_unread_privmsg']); $l_privmsgs_text_unread = sprintf($l_message_unread, $userdata['user_unread_privmsg']);
@ -301,7 +300,7 @@ else
{ {
$icon_pm = $images['pm_no_new_msg']; $icon_pm = $images['pm_no_new_msg'];
$l_privmsgs_text = $lang['Login_check_pm']; $l_privmsgs_text = $lang['Login_check_pm'];
$l_privmsgs_text_unread = ""; $l_privmsgs_text_unread = '';
$s_privmsg_new = 0; $s_privmsg_new = 0;
} }
@ -310,16 +309,16 @@ else
// //
$nav_links_html = ''; $nav_links_html = '';
$nav_link_proto = '<link rel="%s" href="%s" title="%s" />' . "\n"; $nav_link_proto = '<link rel="%s" href="%s" title="%s" />' . "\n";
while(list($nav_item, $nav_array) = @each($nav_links) ) while( list($nav_item, $nav_array) = @each($nav_links) )
{ {
if( !empty($nav_array['url']) ) if ( !empty($nav_array['url']) )
{ {
$nav_links_html .= sprintf($nav_link_proto, $nav_item, $nav_array['url'], $nav_array['title']); $nav_links_html .= sprintf($nav_link_proto, $nav_item, $nav_array['url'], $nav_array['title']);
} }
else else
{ {
// We have a nested array, used for items like <link rel='chapter'> that can occur more than once. // We have a nested array, used for items like <link rel='chapter'> that can occur more than once.
while(list(,$nested_array) = each($nav_array) ) while( list(,$nested_array) = each($nav_array) )
{ {
$nav_links_html .= sprintf($nav_link_proto, $nav_item, $nested_array['url'], $nested_array['title']); $nav_links_html .= sprintf($nav_link_proto, $nav_item, $nested_array['url'], $nested_array['title']);
} }
@ -328,27 +327,29 @@ while(list($nav_item, $nav_array) = @each($nav_links) )
// //
// The following assigns all _common_ variables that may be used at any point // The following assigns all _common_ variables that may be used at any point
// in a template. Note that all URL's should be wrapped in append_sid, as // in a template.
// should all S_x_ACTIONS for forms.
// //
$template->assign_vars(array( $template->assign_vars(array(
'SITENAME' => $board_config['sitename'], 'SITENAME' => $board_config['sitename'],
'SITE_DESCRIPTION' => $board_config['site_desc'], 'SITE_DESCRIPTION' => $board_config['site_desc'],
'PAGE_TITLE' => $page_title, 'PAGE_TITLE' => $page_title,
'LAST_VISIT_DATE' => sprintf($lang['You_last_visit'], $s_last_visit),
'CURRENT_TIME' => sprintf($lang['Current_time'], create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])),
'TOTAL_USERS_ONLINE' => $l_online_users, 'TOTAL_USERS_ONLINE' => $l_online_users,
'LOGGED_IN_USER_LIST' => $online_userlist, 'LOGGED_IN_USER_LIST' => $online_userlist,
'RECORD_USERS' => sprintf($lang['Record_online_users'], $board_config['record_online_users'], create_date($board_config['default_dateformat'], $board_config['record_online_date'], $board_config['board_timezone'])),
'PRIVATE_MESSAGE_INFO' => $l_privmsgs_text, 'PRIVATE_MESSAGE_INFO' => $l_privmsgs_text,
'PRIVATE_MESSAGE_INFO_UNREAD' => $l_privmsgs_text_unread, 'PRIVATE_MESSAGE_INFO_UNREAD' => $l_privmsgs_text_unread,
'PRIVATE_MESSAGE_NEW_FLAG' => $s_privmsg_new, 'PRIVATE_MESSAGE_NEW_FLAG' => $s_privmsg_new,
'LAST_VISIT_DATE' => sprintf($lang['You_last_visit'], $s_last_visit),
'CURRENT_TIME' => sprintf($lang['Current_time'], create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])),
'PRIVMSG_IMG' => $icon_pm, 'PRIVMSG_IMG' => $icon_pm,
'L_USERNAME' => $lang['Username'], 'L_USERNAME' => $lang['Username'],
'L_PASSWORD' => $lang['Password'], 'L_PASSWORD' => $lang['Password'],
'L_LOGIN_LOGOUT' => $l_login_logout,
'L_LOGIN' => $lang['Login'], 'L_LOGIN' => $lang['Login'],
'L_LOG_ME_IN' => $lang['Log_me_in'], 'L_LOG_ME_IN' => $lang['Log_me_in'],
'L_AUTO_LOGIN' => $lang['Log_me_in'],
'L_INDEX' => sprintf($lang['Forum_Index'], $board_config['sitename']), 'L_INDEX' => sprintf($lang['Forum_Index'], $board_config['sitename']),
'L_REGISTER' => $lang['Register'], 'L_REGISTER' => $lang['Register'],
'L_PROFILE' => $lang['Profile'], 'L_PROFILE' => $lang['Profile'],
@ -358,33 +359,11 @@ $template->assign_vars(array(
'L_MEMBERLIST' => $lang['Memberlist'], 'L_MEMBERLIST' => $lang['Memberlist'],
'L_FAQ' => $lang['FAQ'], 'L_FAQ' => $lang['FAQ'],
'L_USERGROUPS' => $lang['Usergroups'], 'L_USERGROUPS' => $lang['Usergroups'],
'L_FORUM' => $lang['Forum'],
'L_TOPICS' => $lang['Topics'],
'L_REPLIES' => $lang['Replies'],
'L_VIEWS' => $lang['Views'],
'L_POSTS' => $lang['Posts'],
'L_LASTPOST' => $lang['Last_Post'],
'L_NO_NEW_POSTS' => $lang['No_new_posts'],
'L_NEW_POSTS' => $lang['New_posts'],
'L_NO_NEW_POSTS_HOT' => $lang['No_new_posts_hot'],
'L_NEW_POSTS_HOT' => $lang['New_posts_hot'],
'L_NO_NEW_POSTS_LOCKED' => $lang['No_new_posts_locked'],
'L_NEW_POSTS_LOCKED' => $lang['New_posts_locked'],
'L_ANNOUNCEMENT' => $lang['Post_Announcement'],
'L_STICKY' => $lang['Post_Sticky'],
'L_POSTED' => $lang['Posted'],
'L_JOINED' => $lang['Joined'],
'L_AUTO_LOGIN' => $lang['Log_me_in'],
'L_AUTHOR' => $lang['Author'],
'L_SUBJECT' => $lang['Subject'],
'L_MESSAGE' => $lang['Message'],
'L_LOGIN_LOGOUT' => $l_login_logout,
'L_SEARCH_NEW' => $lang['Search_new'], 'L_SEARCH_NEW' => $lang['Search_new'],
'L_SEARCH_UNANSWERED' => $lang['Search_unanswered'], 'L_SEARCH_UNANSWERED' => $lang['Search_unanswered'],
'L_SEARCH_SELF' => $lang['Search_your_posts'], 'L_SEARCH_SELF' => $lang['Search_your_posts'],
'L_WHOSONLINE_ADMIN' => sprintf($lang['Admin_online_color'], '<span style="color:#' . $theme['fontcolor3'] . '">', '</span>'), '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_MOD' => sprintf($lang['Mod_online_color'], '<span style="color:#' . $theme['fontcolor2'] . '">', '</span>'),
'L_RECORD_USERS' => sprintf($lang['Record_online_users'], $board_config['record_online_users'], create_date($board_config['default_dateformat'], $board_config['record_online_date'], $board_config['board_timezone'])),
'U_SEARCH_UNANSWERED' => append_sid('search.'.$phpEx.'?search_id=unanswered'), 'U_SEARCH_UNANSWERED' => append_sid('search.'.$phpEx.'?search_id=unanswered'),
'U_SEARCH_SELF' => append_sid('search.'.$phpEx.'?search_id=egosearch'), 'U_SEARCH_SELF' => append_sid('search.'.$phpEx.'?search_id=egosearch'),
@ -455,7 +434,7 @@ $template->assign_vars(array(
// //
// Login box? // Login box?
// //
if( !$userdata['session_logged_in'] ) if ( !$userdata['session_logged_in'] )
{ {
$template->assign_block_vars('switch_user_logged_out', array()); $template->assign_block_vars('switch_user_logged_out', array());
} }
@ -463,21 +442,18 @@ else
{ {
$template->assign_block_vars('switch_user_logged_in', array()); $template->assign_block_vars('switch_user_logged_in', array());
if( !empty($userdata['user_popup_pm']) ) if ( !empty($userdata['user_popup_pm']) )
{ {
$template->assign_block_vars('switch_enable_pm_popup', array()); $template->assign_block_vars('switch_enable_pm_popup', array());
} }
} }
if ( $HTTP_SERVER_VARS['REQUEST_METHOD'] == 'POST' )
{ if ( getenv('REQUEST_METHOD') != 'POST' )
header ('Cache-Control: private, must-revalidate, max-age=25');
}
else
{ {
header ('Cache-Control: private, no-cache, must-revalidate, pre-check=2, post-check=2, max-age=25'); header ('Cache-Control: private, no-cache, must-revalidate, pre-check=2, post-check=2, max-age=25');
header ('Pragma: no-cache'); header ('Pragma: no-cache');
header ('Expires: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
} }
header ('Expires: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
header ('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); header ('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
$template->pparse('overall_header'); $template->pparse('overall_header');

65
phpBB/includes/topic_review.php
View file

@ -28,9 +28,9 @@ function topic_review($topic_id, $is_inline_review)
global $orig_word, $replacement_word; global $orig_word, $replacement_word;
global $starttime; global $starttime;
if( !$is_inline_review ) if ( !$is_inline_review )
{ {
if( !isset($topic_id) ) if ( !isset($topic_id) )
{ {
message_die(GENERAL_MESSAGE, 'Topic_not_exist'); message_die(GENERAL_MESSAGE, 'Topic_not_exist');
} }
@ -42,12 +42,12 @@ function topic_review($topic_id, $is_inline_review)
FROM " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f FROM " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f
WHERE t.topic_id = $topic_id WHERE t.topic_id = $topic_id
AND f.forum_id = t.forum_id"; AND f.forum_id = t.forum_id";
if( !($result = $db->sql_query($sql)) ) if ( !($result = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, "Couldn't obtain topic information", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not obtain topic information', '', __LINE__, __FILE__, $sql);
} }
if( !($forum_row = $db->sql_fetchrow($result)) ) if ( !($forum_row = $db->sql_fetchrow($result)) )
{ {
message_die(GENERAL_MESSAGE, 'Topic_post_not_exist'); message_die(GENERAL_MESSAGE, 'Topic_post_not_exist');
} }
@ -76,7 +76,7 @@ function topic_review($topic_id, $is_inline_review)
// //
// Define censored word matches // Define censored word matches
// //
if( empty($orig_word) && empty($replacement_word) ) if ( empty($orig_word) && empty($replacement_word) )
{ {
$orig_word = array(); $orig_word = array();
$replacement_word = array(); $replacement_word = array();
@ -87,15 +87,15 @@ function topic_review($topic_id, $is_inline_review)
// //
// Dump out the page header and load viewtopic body template // Dump out the page header and load viewtopic body template
// //
if( !$is_inline_review ) if ( !$is_inline_review )
{ {
$gen_simple_header = TRUE; $gen_simple_header = TRUE;
$page_title = $lang['Topic_review'] ." - $topic_title"; $page_title = $lang['Topic_review'] . ' - ' . $topic_title;
include($phpbb_root_path . 'includes/page_header.'.$phpEx); include($phpbb_root_path . 'includes/page_header.'.$phpEx);
$template->set_filenames(array( $template->set_filenames(array(
"reviewbody" => "posting_topic_review.tpl") 'reviewbody' => 'posting_topic_review.tpl')
); );
} }
@ -109,9 +109,9 @@ function topic_review($topic_id, $is_inline_review)
AND p.post_id = pt.post_id AND p.post_id = pt.post_id
ORDER BY p.post_time DESC ORDER BY p.post_time DESC
LIMIT " . $board_config['posts_per_page']; LIMIT " . $board_config['posts_per_page'];
if( !($result = $db->sql_query($sql)) ) if ( !($result = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, "Couldn't obtain post/user information.", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not obtain post/user information', '', __LINE__, __FILE__, $sql);
} }
// //
@ -120,6 +120,9 @@ function topic_review($topic_id, $is_inline_review)
// //
if ( $row = $db->sql_fetchrow($result) ) if ( $row = $db->sql_fetchrow($result) )
{ {
$mini_post_img = $images['icon_minipost'];
$mini_post_alt = $lang['Post'];
$i = 0; $i = 0;
do do
{ {
@ -128,8 +131,6 @@ function topic_review($topic_id, $is_inline_review)
$post_date = create_date($board_config['default_dateformat'], $row['post_time'], $board_config['board_timezone']); $post_date = create_date($board_config['default_dateformat'], $row['post_time'], $board_config['board_timezone']);
$mini_post_img = '<img src="' . $images['icon_minipost'] . '" alt="' . $lang['Post'] . '" />';
// //
// Handle anon users posting with usernames // Handle anon users posting with usernames
// //
@ -139,7 +140,7 @@ function topic_review($topic_id, $is_inline_review)
$poster_rank = $lang['Guest']; $poster_rank = $lang['Guest'];
} }
$post_subject = ( $row['post_subject'] != "" ) ? $row['post_subject'] : ""; $post_subject = ( $row['post_subject'] != '' ) ? $row['post_subject'] : '';
$message = $row['post_text']; $message = $row['post_text'];
$bbcode_uid = $row['bbcode_uid']; $bbcode_uid = $row['bbcode_uid'];
@ -150,12 +151,12 @@ function topic_review($topic_id, $is_inline_review)
// //
if ( !$board_config['allow_html'] && $row['enable_html'] ) if ( !$board_config['allow_html'] && $row['enable_html'] )
{ {
$message = preg_replace("#(<)([\/]?.*?)(>)#is", "&lt;\\2&gt;", $message); $message = preg_replace('#(<)([\/]?.*?)(>)#is', '&lt;\2&gt;', $message);
} }
if ( $bbcode_uid != "" ) if ( $bbcode_uid != "" )
{ {
$message = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($message, $bbcode_uid) : preg_replace("/\:[0-9a-z\:]+\]/si", "]", $message); $message = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($message, $bbcode_uid) : preg_replace('/\:[0-9a-z\:]+\]/si', ']', $message);
} }
$message = make_clickable($message); $message = make_clickable($message);
@ -171,7 +172,7 @@ function topic_review($topic_id, $is_inline_review)
$message = smilies_pass($message); $message = smilies_pass($message);
} }
$message = str_replace("\n", "<br />", $message); $message = str_replace("\n", '<br />', $message);
// //
// Again this will be handled by the templating // Again this will be handled by the templating
@ -180,15 +181,17 @@ function topic_review($topic_id, $is_inline_review)
$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
$template->assign_block_vars("postrow", array( $template->assign_block_vars('postrow', array(
"ROW_COLOR" => "#" . $row_color, 'ROW_COLOR' => '#' . $row_color,
"ROW_CLASS" => $row_class, 'ROW_CLASS' => $row_class,
"MINI_POST_IMG" => $mini_post_img, 'MINI_POST_IMG' => $mini_post_img,
"POSTER_NAME" => $poster, 'POSTER_NAME' => $poster,
"POST_DATE" => $post_date, 'POST_DATE' => $post_date,
"POST_SUBJECT" => $post_subject, 'POST_SUBJECT' => $post_subject,
"MESSAGE" => $message) 'MESSAGE' => $message,
'L_MINI_POST_ALT' => $mini_post_alt)
); );
$i++; $i++;
@ -197,18 +200,20 @@ function topic_review($topic_id, $is_inline_review)
} }
else else
{ {
message_die(GENERAL_MESSAGE, 'Topic_post_not_exist', "", __LINE__, __FILE__, $sql); message_die(GENERAL_MESSAGE, 'Topic_post_not_exist', '', __LINE__, __FILE__, $sql);
} }
$template->assign_vars(array( $template->assign_vars(array(
"L_POSTED" => $lang['Posted'], 'L_AUTHOR' => $lang['Author'],
"L_POST_SUBJECT" => $lang['Post_subject'], 'L_MESSAGE' => $lang['Message'],
"L_TOPIC_REVIEW" => $lang['Topic_review']) 'L_POSTED' => $lang['Posted'],
'L_POST_SUBJECT' => $lang['Post_subject'],
'L_TOPIC_REVIEW' => $lang['Topic_review'])
); );
if ( !$is_inline_review ) if ( !$is_inline_review )
{ {
$template->pparse("reviewbody"); $template->pparse('reviewbody');
include($phpbb_root_path . 'includes/page_tail.'.$phpEx); include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
} }
} }

5
phpBB/includes/usercp_avatar.php
View file

@ -278,7 +278,7 @@ function display_avatar_gallery($mode, &$category, &$user_id, &$email, &$current
} }
@reset($avatar_images); @reset($avatar_images);
$s_categories = ''; $s_categories = '<select name="avatarcategory">';
while( list($key) = each($avatar_images) ) while( list($key) = each($avatar_images) )
{ {
$selected = ( $key == $category ) ? ' selected="selected"' : ''; $selected = ( $key == $category ) ? ' selected="selected"' : '';
@ -287,6 +287,7 @@ function display_avatar_gallery($mode, &$category, &$user_id, &$email, &$current
$s_categories .= '<option value="' . $key . '"' . $selected . '>' . ucfirst($key) . '</option>'; $s_categories .= '<option value="' . $key . '"' . $selected . '>' . ucfirst($key) . '</option>';
} }
} }
$s_categories .= '</select>';
$s_colspan = 0; $s_colspan = 0;
for($i = 0; $i < count($avatar_images[$category]); $i++) for($i = 0; $i < count($avatar_images[$category]); $i++)
@ -323,7 +324,7 @@ function display_avatar_gallery($mode, &$category, &$user_id, &$email, &$current
'L_RETURN_PROFILE' => $lang['Return_profile'], 'L_RETURN_PROFILE' => $lang['Return_profile'],
'L_CATEGORY' => $lang['Select_category'], 'L_CATEGORY' => $lang['Select_category'],
'S_OPTIONS_CATEGORIES' => $s_categories, 'S_CATEGORY_SELECT' => $s_categories,
'S_COLSPAN' => $s_colspan, 'S_COLSPAN' => $s_colspan,
'S_PROFILE_ACTION' => append_sid("profile.$phpEx?mode=$mode"), 'S_PROFILE_ACTION' => append_sid("profile.$phpEx?mode=$mode"),
'S_HIDDEN_FIELDS' => $s_hidden_vars) 'S_HIDDEN_FIELDS' => $s_hidden_vars)

34
phpBB/includes/usercp_email.php
View file

@ -94,16 +94,16 @@ if ( $result = $db->sql_query($sql) )
include($phpbb_root_path . 'includes/emailer.'.$phpEx); include($phpbb_root_path . 'includes/emailer.'.$phpEx);
$emailer = new emailer($board_config['smtp_delivery']); $emailer = new emailer($board_config['smtp_delivery']);
$email_headers = "From: " . $userdata['user_email'] . "\n"; $email_headers = 'From: ' . $userdata['user_email'] . "\n";
if ( !empty($HTTP_POST_VARS['cc_email']) ) if ( !empty($HTTP_POST_VARS['cc_email']) )
{ {
$email_headers .= "Cc: " . $userdata['user_email'] . "\n"; $email_headers .= "Cc: " . $userdata['user_email'] . "\n";
} }
$email_headers .= "Return-Path: " . $userdata['user_email'] . "\n"; $email_headers .= 'Return-Path: ' . $userdata['user_email'] . "\n";
$email_headers .= "X-AntiAbuse: Board servername - " . $server_name . "\n"; $email_headers .= 'X-AntiAbuse: Board servername - ' . $server_name . "\n";
$email_headers .= "X-AntiAbuse: User_id - " . $userdata['user_id'] . "\n"; $email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\n";
$email_headers .= "X-AntiAbuse: Username - " . $userdata['username'] . "\n"; $email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\n";
$email_headers .= "X-AntiAbuse: User IP - " . decode_ip($user_ip) . "\r\n"; $email_headers .= 'X-AntiAbuse: User IP - ' . decode_ip($user_ip) . "\r\n";
$emailer->use_template('profile_send_email', $user_lang); $emailer->use_template('profile_send_email', $user_lang);
$emailer->email_address($user_email); $emailer->email_address($user_email);
@ -138,20 +138,9 @@ if ( $result = $db->sql_query($sql) )
include($phpbb_root_path . 'includes/page_header.'.$phpEx); include($phpbb_root_path . 'includes/page_header.'.$phpEx);
$template->set_filenames(array( $template->set_filenames(array(
'body' => 'profile_send_email.tpl', 'body' => 'profile_send_email.tpl')
'jumpbox' => 'jumpbox.tpl')
); );
make_jumpbox('viewforum.'.$phpEx);
$jumpbox = make_jumpbox();
$template->assign_vars(array(
'L_GO' => $lang['Go'],
'L_JUMP_TO' => $lang['Jump_to'],
'L_SELECT_FORUM' => $lang['Select_forum'],
'S_JUMPBOX_LIST' => $jumpbox,
'S_JUMPBOX_ACTION' => append_sid("viewforum.$phpEx"))
);
$template->assign_var_from_handle('JUMPBOX', 'jumpbox');
if ( $error ) if ( $error )
{ {
@ -164,15 +153,9 @@ if ( $result = $db->sql_query($sql) )
$template->assign_var_from_handle('ERROR_BOX', 'reg_header'); $template->assign_var_from_handle('ERROR_BOX', 'reg_header');
} }
if ( $userdata['user_sig'] != '' )
{
$template->assign_block_vars('signature_checkbox', array());
}
$template->assign_vars(array( $template->assign_vars(array(
'USERNAME' => $username, 'USERNAME' => $username,
'S_SIGNATURE_CHECKED' => ( $attach_sig ) ? 'checked="checked"' : '',
'S_POST_ACTION' => append_sid("profile.$phpEx?&amp;mode=email&amp;" . POST_USERS_URL . "=$user_id"), 'S_POST_ACTION' => append_sid("profile.$phpEx?&amp;mode=email&amp;" . POST_USERS_URL . "=$user_id"),
'L_SEND_EMAIL_MSG' => $lang['Send_email_msg'], 'L_SEND_EMAIL_MSG' => $lang['Send_email_msg'],
@ -184,7 +167,6 @@ if ( $result = $db->sql_query($sql) )
'L_EMPTY_MESSAGE_EMAIL' => $lang['Empty_message_email'], 'L_EMPTY_MESSAGE_EMAIL' => $lang['Empty_message_email'],
'L_OPTIONS' => $lang['Options'], 'L_OPTIONS' => $lang['Options'],
'L_CC_EMAIL' => $lang['CC_email'], 'L_CC_EMAIL' => $lang['CC_email'],
'L_NOTIFY_ON_REPLY' => $lang['Notify'],
'L_SPELLCHECK' => $lang['Spellcheck'], 'L_SPELLCHECK' => $lang['Spellcheck'],
'L_SEND_EMAIL' => $lang['Send_email']) 'L_SEND_EMAIL' => $lang['Send_email'])
); );

29
phpBB/includes/usercp_register.php
View file

@ -680,20 +680,7 @@ else if ( $mode == 'editprofile' && !isset($HTTP_POST_VARS['avatargallery']) &&
// //
include($phpbb_root_path . 'includes/page_header.'.$phpEx); include($phpbb_root_path . 'includes/page_header.'.$phpEx);
$template->set_filenames(array( make_jumpbox('viewforum.'.$phpEx);
"jumpbox" => "jumpbox.tpl")
);
$jumpbox = make_jumpbox();
$template->assign_vars(array(
'L_GO' => $lang['Go'],
'L_JUMP_TO' => $lang['Jump_to'],
'L_SELECT_FORUM' => $lang['Select_forum'],
'S_JUMPBOX_LIST' => $jumpbox,
'S_JUMPBOX_ACTION' => append_sid('viewforum.$phpEx'))
);
$template->assign_var_from_handle('JUMPBOX', 'jumpbox');
if ( $mode == 'editprofile' ) if ( $mode == 'editprofile' )
{ {
@ -711,7 +698,7 @@ if( isset($HTTP_POST_VARS['avatargallery']) && !$error )
$avatar_category = ( !empty($HTTP_POST_VARS['avatarcategory']) ) ? $HTTP_POST_VARS['avatarcategory'] : ''; $avatar_category = ( !empty($HTTP_POST_VARS['avatarcategory']) ) ? $HTTP_POST_VARS['avatarcategory'] : '';
$template->set_filenames(array( $template->set_filenames(array(
"body" => "profile_avatar_gallery.tpl") 'body' => 'profile_avatar_gallery.tpl')
); );
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); 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);
@ -786,7 +773,7 @@ else
if ( $mode == 'editprofile' ) if ( $mode == 'editprofile' )
{ {
$template->assign_block_vars('edit_profile', array()); $template->assign_block_vars('switch_edit_profile', array());
} }
// //
@ -908,25 +895,25 @@ else
// //
if ( $userdata['user_allowavatar'] && ( $board_config['allow_avatar_upload'] || $board_config['allow_avatar_local'] || $board_config['allow_avatar_remote'] ) ) if ( $userdata['user_allowavatar'] && ( $board_config['allow_avatar_upload'] || $board_config['allow_avatar_local'] || $board_config['allow_avatar_remote'] ) )
{ {
$template->assign_block_vars('avatar_block', array() ); $template->assign_block_vars('switch_avatar_block', array() );
if ( $board_config['allow_avatar_upload'] && file_exists('./' . $board_config['avatar_path']) ) if ( $board_config['allow_avatar_upload'] && file_exists('./' . $board_config['avatar_path']) )
{ {
if ( $form_enctype != '' ) if ( $form_enctype != '' )
{ {
$template->assign_block_vars('avatar_block.avatar_local_upload', array() ); $template->assign_block_vars('switch_avatar_block.switch_avatar_local_upload', array() );
} }
$template->assign_block_vars('avatar_block.avatar_remote_upload', array() ); $template->assign_block_vars('switch_avatar_block.switch_avatar_remote_upload', array() );
} }
if ( $board_config['allow_avatar_remote'] ) if ( $board_config['allow_avatar_remote'] )
{ {
$template->assign_block_vars('avatar_block.avatar_remote_link', array() ); $template->assign_block_vars('switch_avatar_block.switch_avatar_remote_link', array() );
} }
if ( $board_config['allow_avatar_local'] && file_exists('./' . $board_config['avatar_gallery_path']) ) if ( $board_config['allow_avatar_local'] && file_exists('./' . $board_config['avatar_gallery_path']) )
{ {
$template->assign_block_vars('avatar_block.avatar_local_gallery', array() ); $template->assign_block_vars('switch_avatar_block.switch_avatar_local_gallery', array() );
} }
} }
} }

68
phpBB/includes/usercp_sendpasswd.php
View file

@ -23,14 +23,14 @@
if ( !defined('IN_PHPBB') ) if ( !defined('IN_PHPBB') )
{ {
die("Hacking attempt"); die('Hacking attempt');
exit; exit;
} }
if ( isset($HTTP_POST_VARS['submit']) ) if ( isset($HTTP_POST_VARS['submit']) )
{ {
$username = ( !empty($HTTP_POST_VARS['username']) ) ? trim(strip_tags($HTTP_POST_VARS['username'])) : ""; $username = ( !empty($HTTP_POST_VARS['username']) ) ? trim(strip_tags($HTTP_POST_VARS['username'])) : '';
$email = ( !empty($HTTP_POST_VARS['email']) ) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['email']))) : ""; $email = ( !empty($HTTP_POST_VARS['email']) ) ? trim(strip_tags(htmlspecialchars($HTTP_POST_VARS['email']))) : '';
$sql = "SELECT user_id, username, user_email, user_active, user_lang $sql = "SELECT user_id, username, user_email, user_active, user_lang
FROM " . USERS_TABLE . " FROM " . USERS_TABLE . "
@ -40,7 +40,7 @@ if ( isset($HTTP_POST_VARS['submit']) )
{ {
if ( $row = $db->sql_fetchrow($result) ) if ( $row = $db->sql_fetchrow($result) )
{ {
if ( $row['user_active'] == 0 ) if ( !$row['user_active'] )
{ {
message_die(GENERAL_MESSAGE, $lang['No_send_account_inactive']); message_die(GENERAL_MESSAGE, $lang['No_send_account_inactive']);
} }
@ -53,37 +53,37 @@ if ( isset($HTTP_POST_VARS['submit']) )
$sql = "UPDATE " . USERS_TABLE . " $sql = "UPDATE " . USERS_TABLE . "
SET user_newpasswd = '" .md5($user_password) . "', user_actkey = '$user_actkey' SET user_newpasswd = '" .md5($user_password) . "', user_actkey = '$user_actkey'
WHERE user_id = " . $row['user_id']; WHERE user_id = " . $row['user_id'];
if ( !$result = $db->sql_query($sql) ) if ( !$db->sql_query($sql) )
{ {
message_die(GENERAL_ERROR, "Couldn't update new password information", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not update new password information', '', __LINE__, __FILE__, $sql);
} }
include($phpbb_root_path . 'includes/emailer.'.$phpEx); include($phpbb_root_path . 'includes/emailer.'.$phpEx);
$emailer = new emailer($board_config['smtp_delivery']); $emailer = new emailer($board_config['smtp_delivery']);
$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n"; $email_headers = 'From: ' . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
$emailer->use_template("user_activate_passwd", $row['user_lang']); $emailer->use_template('user_activate_passwd', $row['user_lang']);
$emailer->email_address($row['user_email']); $emailer->email_address($row['user_email']);
$emailer->set_subject();//$lang['New_password_activation'] $emailer->set_subject();//$lang['New_password_activation']
$emailer->extra_headers($email_headers); $emailer->extra_headers($email_headers);
$emailer->assign_vars(array( $emailer->assign_vars(array(
"SITENAME" => $board_config['sitename'], 'SITENAME' => $board_config['sitename'],
"USERNAME" => $username, 'USERNAME' => $username,
"PASSWORD" => $user_password, 'PASSWORD' => $user_password,
"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $board_config['board_email_sig']),
"U_ACTIVATE" => $server_url . "?mode=activate&act_key=$user_actkey") 'U_ACTIVATE' => $server_url . "?mode=activate&act_key=$user_actkey")
); );
$emailer->send(); $emailer->send();
$emailer->reset(); $emailer->reset();
$template->assign_vars(array( $template->assign_vars(array(
"META" => '<meta http-equiv="refresh" content="15;url=' . append_sid("index.$phpEx") . '">') 'META' => '<meta http-equiv="refresh" content="15;url=' . append_sid("index.$phpEx") . '">')
); );
$message = $lang['Password_updated'] . "<br /><br />" . sprintf($lang['Click_return_index'], "<a href=\"" . append_sid("index.$phpEx") . "\">", "</a>"); $message = $lang['Password_updated'] . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>');
message_die(GENERAL_MESSAGE, $message); message_die(GENERAL_MESSAGE, $message);
} }
@ -94,13 +94,13 @@ if ( isset($HTTP_POST_VARS['submit']) )
} }
else else
{ {
message_die(GENERAL_ERROR, "Couldn't obtain user information for sendpassword", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not obtain user information for sendpassword', '', __LINE__, __FILE__, $sql);
} }
} }
else else
{ {
$username = ""; $username = '';
$email = ""; $email = '';
} }
// //
@ -109,33 +109,23 @@ else
include($phpbb_root_path . 'includes/page_header.'.$phpEx); include($phpbb_root_path . 'includes/page_header.'.$phpEx);
$template->set_filenames(array( $template->set_filenames(array(
"body" => "profile_send_pass.tpl", 'body' => 'profile_send_pass.tpl')
"jumpbox" => "jumpbox.tpl")
); );
make_jumpbox('viewforum.'.$phpEx);
$jumpbox = make_jumpbox();
$template->assign_vars(array(
"L_GO" => $lang['Go'],
"L_JUMP_TO" => $lang['Jump_to'],
"L_SELECT_FORUM" => $lang['Select_forum'],
"S_JUMPBOX_LIST" => $jumpbox,
"S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"))
);
$template->assign_var_from_handle("JUMPBOX", "jumpbox");
$template->assign_vars(array( $template->assign_vars(array(
"USERNAME" => $username, 'USERNAME' => $username,
"EMAIL" => $email, 'EMAIL' => $email,
"L_SEND_PASSWORD" => $lang['Send_password'], 'L_SEND_PASSWORD' => $lang['Send_password'],
"L_ITEMS_REQUIRED" => $lang['Items_required'], 'L_ITEMS_REQUIRED' => $lang['Items_required'],
"L_EMAIL_ADDRESS" => $lang['Email_address'], 'L_EMAIL_ADDRESS' => $lang['Email_address'],
"L_SUBMIT" => $lang['Submit'], 'L_SUBMIT' => $lang['Submit'],
"L_RESET" => $lang['Reset']) 'L_RESET' => $lang['Reset'])
); );
$template->pparse("body"); $template->pparse('body');
include($phpbb_root_path . 'includes/page_tail.'.$phpEx); include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
?> ?>

103
phpBB/includes/usercp_viewprofile.php
View file

@ -51,20 +51,9 @@ $db->sql_freeresult($result);
// Output page header and profile_view template // Output page header and profile_view template
// //
$template->set_filenames(array( $template->set_filenames(array(
'body' => 'profile_view_body.tpl', 'body' => 'profile_view_body.tpl')
'jumpbox' => 'jumpbox.tpl')
); );
make_jumpbox('viewforum.'.$phpEx);
$jumpbox = make_jumpbox();
$template->assign_vars(array(
'L_GO' => $lang['Go'],
'L_JUMP_TO' => $lang['Jump_to'],
'L_SELECT_FORUM' => $lang['Select_forum'],
'S_JUMPBOX_LIST' => $jumpbox,
'S_JUMPBOX_ACTION' => append_sid("viewforum.$phpEx"))
);
$template->assign_var_from_handle('JUMPBOX', 'jumpbox');
// //
// Calculate the number of days this user has been a member ($memberdays) // Calculate the number of days this user has been a member ($memberdays)
@ -85,19 +74,6 @@ else
$percentage = 0; $percentage = 0;
} }
if ( !empty($profiledata['user_viewemail']) || $userdata['user_level'] == ADMIN )
{
$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&amp;" . POST_USERS_URL . "=" . $profiledata['user_id']) : 'mailto:' . $profiledata['user_email'];
$email = '<a href="' . $email_uri . '">' . $lang['Send_email'] . '</a>';
$email_img = '<a href="' . $email_uri . '"><img src="' . $images['icon_email'] . '" alt="' . $lang['Send_email'] . '" border="0" /></a>';
}
else
{
$email = '';
$email_img = '';
}
$avatar_img = ''; $avatar_img = '';
if ( $profiledata['user_avatar_type'] && $profiledata['user_allowavatar'] ) if ( $profiledata['user_avatar_type'] && $profiledata['user_allowavatar'] )
{ {
@ -140,29 +116,51 @@ else
} }
} }
$temp_url = append_sid("privmsg.$phpEx?mode=post&amp;" . POST_USERS_URL . "=" . $profiledata['user_id']);
$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($profiledata['user_viewemail']) || $userdata['user_level'] == ADMIN )
{
$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&amp;" . POST_USERS_URL .'=' . $profiledata['user_id']) : 'mailto:' . $profiledata['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>';
}
else
{
$email_img = '&nbsp;';
$email = '&nbsp;';
}
$www_img = ( $profiledata['user_website'] ) ? '<a href="' . $profiledata['user_website'] . '" target="_userwww"><img src="' . $images['icon_www'] . '" alt="' . $lang['Visit_website'] . '" title="' . $lang['Visit_website'] . '" border="0" /></a>' : '&nbsp;';
$www = ( $profiledata['user_website'] ) ? '<a href="' . $profiledata['user_website'] . '" target="_userwww">' . $profiledata['user_website'] . '</a>' : '&nbsp;';
if ( !empty($profiledata['user_icq']) ) if ( !empty($profiledata['user_icq']) )
{ {
$icq_status_img = '<a href="http://wwp.icq.com/' . $profiledata['user_icq'] . '#pager"><img src="http://web.icq.com/whitepages/online?icq=' . $profiledata['user_icq'] . '&amp;img=5" width="18" height="18" border="0" /></a>'; $icq_status_img = '<a href="http://wwp.icq.com/' . $profiledata['user_icq'] . '#pager"><img src="http://web.icq.com/whitepages/online?icq=' . $profiledata['user_icq'] . '&img=5" width="18" height="18" border="0" /></a>';
$icq_add_img = '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $profiledata['user_icq'] . '"><img src="' . $images['icon_icq'] . '" alt="' . $lang['ICQ'] . '" border="0" /></a>'; $icq_img = '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $profiledata['user_icq'] . '"><img src="' . $images['icon_icq'] . '" alt="' . $lang['ICQ'] . '" title="' . $lang['ICQ'] . '" border="0" /></a>';
$icq = '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $profiledata['user_icq'] . '">' . $lang['ICQ'] . '</a>';
} }
else else
{ {
$icq_status_img = '&nbsp;'; $icq_status_img = '&nbsp;';
$icq_add_img = '&nbsp;'; $icq_img = '&nbsp;';
$icq = '&nbsp;';
} }
$aim_img = ( $profiledata['user_aim'] ) ? '<a href="aim:goim?screenname=' . $profiledata['user_aim'] . '&amp;message=Hello+Are+you+there?"><img src="' . $images['icon_aim'] . '" border="0" alt="' . $lang['AIM'] . '" /></a>' : '&nbsp;'; $aim_img = ( $profiledata['user_aim'] ) ? '<a href="aim:goim?screenname=' . $profiledata['user_aim'] . '&amp;message=Hello+Are+you+there?"><img src="' . $images['icon_aim'] . '" alt="' . $lang['AIM'] . '" title="' . $lang['AIM'] . '" border="0" /></a>' : '&nbsp;';
$aim = ( $profiledata['user_aim'] ) ? '<a href="aim:goim?screenname=' . $profiledata['user_aim'] . '&amp;message=Hello+Are+you+there?">' . $lang['AIM'] . '</a>' : '&nbsp;';
$msnm_img = ( $profiledata['user_msnm'] ) ? '<img src="' . $images['icon_msnm'] . '" border="0" alt="' . $lang['MSNM'] . '" /> ' . $profiledata['user_msnm'] : '&nbsp;'; $msn_img = ( $profiledata['user_msnm'] ) ? $profiledata['user_msnm'] : '&nbsp;';
$msn = $msn_img;
$yim_img = ( $profiledata['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $profiledata['user_yim'] . '&amp;.src=pg"><img src="' . $images['icon_yim'] . '" border="0" alt="' . $lang['YIM'] . '" /></a>' : '&nbsp;'; $yim_img = ( $profiledata['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $profiledata['user_yim'] . '&amp;.src=pg"><img src="' . $images['icon_yim'] . '" alt="' . $lang['YIM'] . '" title="' . $lang['YIM'] . '" border="0" /></a>' : '';
$yim = ( $profiledata['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $profiledata['user_yim'] . '&amp;.src=pg">' . $lang['YIM'] . '</a>' : '';
$search_img = '<a href="' . append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username']) . "&amp;showresults=posts") . '"><img src="' . $images['icon_search'] . '" border="0" alt="' . $lang['Search_user_posts'] . '" /></a>'; $temp_url = append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username']) . "&amp;showresults=posts");
$search = '<a href="' . append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username']) . "&amp;showresults=posts") . '">' . $lang['Search_user_posts'] . '</a>'; $search_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_search'] . '" alt="' . $lang['Search_user_posts'] . '" title="' . $lang['Search_user_posts'] . '" border="0" /></a>';
$search = '<a href="' . $temp_url . '">' . $lang['Search_user_posts'] . '</a>';
$www_img = ( $profiledata['user_website'] ) ? '<a href="' . $profiledata['user_website'] . '"><img src="' . $images['icon_www'] . '" alt="' . $lang['Visit_website'] . '" border="0" /></a>' : '&nbsp;';
$pm_img = '<a href="' . append_sid("privmsg.$phpEx?mode=post&amp;" . POST_USERS_URL . "=" . $profiledata['user_id']) . '"><img src="' . $images['icon_pm'] . '" alt="' . $lang['Send_private_message'] . '" border="0" /></a>';
// //
// Generate page // Generate page
@ -180,23 +178,25 @@ $template->assign_vars(array(
'PERCENTAGE' => $percentage . '%', 'PERCENTAGE' => $percentage . '%',
'POST_DAY_STATS' => sprintf($lang['User_post_day_stats'], $posts_per_day), 'POST_DAY_STATS' => sprintf($lang['User_post_day_stats'], $posts_per_day),
'POST_PERCENT_STATS' => sprintf($lang['User_post_pct_stats'], $percentage), 'POST_PERCENT_STATS' => sprintf($lang['User_post_pct_stats'], $percentage),
'EMAIL' => $email,
'EMAIL_IMG' => $email_img,
'PM_IMG' => $pm_img,
'UL_SEARCH' => $search,
'SEARCH_IMG' => $search_img, 'SEARCH_IMG' => $search_img,
'ICQ' => ( $profiledata['user_icq'] ) ? $profiledata['user_icq'] : '&nbsp;', 'SEARCH' => $search,
'ICQ_IMG' => ( $profiledata['user_icq'] ) ? $images['icon_icq'] : '&nbsp;', 'PM_IMG' => $pm_img,
'ICQ_ADD_IMG' => $icq_add_img, 'PM' => $pm,
'EMAIL_IMG' => $email_img,
'EMAIL' => $email,
'WWW_IMG' => $www_img,
'WWW' => $www,
'ICQ_STATUS_IMG' => $icq_status_img, 'ICQ_STATUS_IMG' => $icq_status_img,
'AIM' => ( $profiledata['user_aim'] ) ? '<a href="aim:goim?screenname=' . $profiledata['user_aim'] . '&amp;message=Hello+Are+you+there?">' . $profiledata['user_aim'] . '</a>' : '&nbsp;', 'ICQ_IMG' => $icq_img,
'ICQ' => $icq,
'AIM_IMG' => $aim_img, 'AIM_IMG' => $aim_img,
'MSN' => ( $profiledata['user_msnm'] ) ? $profiledata['user_msnm'] : '&nbsp;', 'AIM' => $aim,
'MSN_IMG' => $msnm_img, 'MSN_IMG' => $msn_img,
'YIM' => ( $profiledata['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $profiledata['user_yim'] . '&amp;.src=pg">' . $profiledata['user_yim'] . '</a>' : '&nbsp;', 'MSN' => $msn,
'YIM_IMG' => $yim_img, 'YIM_IMG' => $yim_img,
'WEBSITE' => ( $profiledata['user_website'] ) ? '<a href="' . $profiledata['user_website'] . '" target="_phpbbwebsite">' . $profiledata['user_website'] . '</a>' : '&nbsp;', 'YIM' => $yim,
'WEBSITE_IMG' => $www_img,
'LOCATION' => ( $profiledata['user_from'] ) ? $profiledata['user_from'] : '&nbsp;', 'LOCATION' => ( $profiledata['user_from'] ) ? $profiledata['user_from'] : '&nbsp;',
'OCCUPATION' => ( $profiledata['user_occ'] ) ? $profiledata['user_occ'] : '&nbsp;', 'OCCUPATION' => ( $profiledata['user_occ'] ) ? $profiledata['user_occ'] : '&nbsp;',
'INTERESTS' => ( $profiledata['user_interests'] ) ? $profiledata['user_interests'] : '&nbsp;', 'INTERESTS' => ( $profiledata['user_interests'] ) ? $profiledata['user_interests'] : '&nbsp;',
@ -206,6 +206,7 @@ $template->assign_vars(array(
'L_ABOUT_USER' => sprintf($lang['About_user'], $profiledata['username']), 'L_ABOUT_USER' => sprintf($lang['About_user'], $profiledata['username']),
'L_AVATAR' => $lang['Avatar'], 'L_AVATAR' => $lang['Avatar'],
'L_POSTER_RANK' => $lang['Poster_rank'], 'L_POSTER_RANK' => $lang['Poster_rank'],
'L_JOINED' => $lang['Joined'],
'L_TOTAL_POSTS' => $lang['Total_posts'], 'L_TOTAL_POSTS' => $lang['Total_posts'],
'L_SEARCH_USER_POSTS' => sprintf($lang['Search_user_posts'], $profiledata['username']), 'L_SEARCH_USER_POSTS' => sprintf($lang['Search_user_posts'], $profiledata['username']),
'L_CONTACT' => $lang['Contact'], 'L_CONTACT' => $lang['Contact'],

54
phpBB/index.php
View file

@ -267,6 +267,17 @@ if( ( $total_categories = count($category_rows) ) )
'FORUM_NEW_IMG' => $images['forum_new'], 'FORUM_NEW_IMG' => $images['forum_new'],
'FORUM_LOCKED_IMG' => $images['forum_locked'], 'FORUM_LOCKED_IMG' => $images['forum_locked'],
'L_FORUM' => $lang['Forum'],
'L_TOPICS' => $lang['Topics'],
'L_REPLIES' => $lang['Replies'],
'L_VIEWS' => $lang['Views'],
'L_POSTS' => $lang['Posts'],
'L_LASTPOST' => $lang['Last_Post'],
'L_NO_NEW_POSTS' => $lang['No_new_posts'],
'L_NEW_POSTS' => $lang['New_posts'],
'L_NO_NEW_POSTS_LOCKED' => $lang['No_new_posts_locked'],
'L_NEW_POSTS_LOCKED' => $lang['New_posts_locked'],
'L_MODERATOR' => $lang['Moderators'], 'L_MODERATOR' => $lang['Moderators'],
'L_FORUM_LOCKED' => $lang['Forum_is_locked'], 'L_FORUM_LOCKED' => $lang['Forum_is_locked'],
'L_MARK_FORUMS_READ' => $lang['Mark_all_forums'], 'L_MARK_FORUMS_READ' => $lang['Mark_all_forums'],
@ -299,10 +310,10 @@ if( ( $total_categories = count($category_rows) ) )
// //
if ( $display_forums ) if ( $display_forums )
{ {
$template->assign_block_vars("catrow", array( $template->assign_block_vars('catrow', array(
"CAT_ID" => $cat_id, 'CAT_ID' => $cat_id,
"CAT_DESC" => $category_rows[$i]['cat_title'], 'CAT_DESC' => $category_rows[$i]['cat_title'],
"U_VIEWCAT" => append_sid("index.$phpEx?" . POST_CAT_URL . "=$cat_id")) 'U_VIEWCAT' => append_sid("index.$phpEx?" . POST_CAT_URL . "=$cat_id"))
); );
if ( $viewcat == $cat_id || $viewcat == -1 ) if ( $viewcat == $cat_id || $viewcat == -1 )
@ -317,7 +328,8 @@ if( ( $total_categories = count($category_rows) ) )
{ {
if ( $forum_data[$j]['forum_status'] == FORUM_LOCKED ) if ( $forum_data[$j]['forum_status'] == FORUM_LOCKED )
{ {
$folder_image = '<img src="' . $images['forum_locked'] . '" alt="' . $lang['Forum_locked'] . '" />'; $folder_image = $images['forum_locked'];
$folder_alt = $lang['Forum_locked'];
} }
else else
{ {
@ -365,7 +377,8 @@ if( ( $total_categories = count($category_rows) ) )
} }
} }
$folder_image = ( $unread_topics ) ? '<img src="' . $images['forum_new'] . '" alt="' . $lang['New_posts'] . '" title="' . $lang['New_posts'] . '" />' : '<img src="' . $images['forum'] . '" alt="' . $lang['No_new_posts'] . '" title="' . $lang['No_new_posts'] . '" />'; $folder_image = ( $unread_topics ) ? $images['forum_new'] : $images['forum'];
$folder_alt = ( $unread_topics ) ? $lang['New_posts'] : $lang['No_new_posts'];
} }
$posts = $forum_data[$j]['forum_posts']; $posts = $forum_data[$j]['forum_posts'];
@ -377,9 +390,9 @@ if( ( $total_categories = count($category_rows) ) )
$last_post = $last_post_time . '<br />'; $last_post = $last_post_time . '<br />';
$last_post .= ( $forum_data[$j]['user_id'] == ANONYMOUS ) ? ( ($forum_data[$j]['post_username'] != "" ) ? $forum_data[$j]['post_username'] . " " : $lang['Guest'] . " " ) : '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $forum_data[$j]['user_id']) . '">' . $forum_data[$j]['username'] . '</a> '; $last_post .= ( $forum_data[$j]['user_id'] == ANONYMOUS ) ? ( ($forum_data[$j]['post_username'] != '' ) ? $forum_data[$j]['post_username'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . '=' . $forum_data[$j]['user_id']) . '">' . $forum_data[$j]['username'] . '</a> ';
$last_post .= '<a href="' . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=" . $forum_data[$j]['forum_last_post_id']) . '#' . $forum_data[$j]['forum_last_post_id'] . '"><img src="' . $images['icon_latest_reply'] . '" border="0" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" /></a>'; $last_post .= '<a href="' . append_sid("viewtopic.$phpEx?" . POST_POST_URL . '=' . $forum_data[$j]['forum_last_post_id']) . '#' . $forum_data[$j]['forum_last_post_id'] . '"><img src="' . $images['icon_latest_reply'] . '" border="0" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" /></a>';
} }
else else
{ {
@ -400,20 +413,21 @@ if( ( $total_categories = count($category_rows) ) )
$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
$template->assign_block_vars("catrow.forumrow", array( $template->assign_block_vars('catrow.forumrow', array(
"ROW_COLOR" => '#' . $row_color, 'ROW_COLOR' => '#' . $row_color,
"ROW_CLASS" => $row_class, 'ROW_CLASS' => $row_class,
"FOLDER" => $folder_image, 'FORUM_FOLDER_IMG' => $folder_image,
"FORUM_NAME" => $forum_data[$j]['forum_name'], 'FORUM_NAME' => $forum_data[$j]['forum_name'],
"FORUM_DESC" => $forum_data[$j]['forum_desc'], 'FORUM_DESC' => $forum_data[$j]['forum_desc'],
"POSTS" => $forum_data[$j]['forum_posts'], 'POSTS' => $forum_data[$j]['forum_posts'],
"TOPICS" => $forum_data[$j]['forum_topics'], 'TOPICS' => $forum_data[$j]['forum_topics'],
"LAST_POST" => $last_post, 'LAST_POST' => $last_post,
"MODERATORS" => $moderator_list, 'MODERATORS' => $moderator_list,
"L_MODERATOR" => $l_moderators, 'L_MODERATOR' => $l_moderators,
'L_FORUM_FOLDER_ALT' => $folder_alt,
"U_VIEWFORUM" => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id")) 'U_VIEWFORUM' => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"))
); );
} }
} }

49
phpBB/login.php
View file

@ -27,7 +27,7 @@
define("IN_LOGIN", true); define("IN_LOGIN", true);
define('IN_PHPBB', true); define('IN_PHPBB', true);
$phpbb_root_path = "./"; $phpbb_root_path = './';
include($phpbb_root_path . 'extension.inc'); include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'common.'.$phpEx); include($phpbb_root_path . 'common.'.$phpEx);
@ -40,6 +40,8 @@ init_userprefs($userdata);
// End session management // End session management
// //
$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($HTTP_POST_VARS['logout']) || isset($HTTP_GET_VARS['logout']) ) if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($HTTP_POST_VARS['logout']) || isset($HTTP_GET_VARS['logout']) )
{ {
// //
@ -47,19 +49,17 @@ if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($
// since this doesn't exist for ISAPI mode and therefore the // since this doesn't exist for ISAPI mode and therefore the
// normal Location redirector is used in preference // normal Location redirector is used in preference
// //
$header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: ";
if( ( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) ) && !$userdata['session_logged_in'] ) if( ( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) ) && !$userdata['session_logged_in'] )
{ {
$username = isset($HTTP_POST_VARS['username']) ? $HTTP_POST_VARS['username'] : ""; $username = isset($HTTP_POST_VARS['username']) ? $HTTP_POST_VARS['username'] : '';
$password = isset($HTTP_POST_VARS['password']) ? $HTTP_POST_VARS['password'] : ""; $password = isset($HTTP_POST_VARS['password']) ? $HTTP_POST_VARS['password'] : '';
$sql = "SELECT user_id, username, user_password, user_active, user_level $sql = "SELECT user_id, username, user_password, user_active, user_level
FROM " . USERS_TABLE . " FROM " . USERS_TABLE . "
WHERE username = '" . str_replace("\'", "''", $username) . "'"; WHERE username = '" . str_replace("\'", "''", $username) . "'";
if ( !($result = $db->sql_query($sql)) ) if ( !($result = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, "Error in obtaining userdata : login", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Error in obtaining userdata', '', __LINE__, __FILE__, $sql);
} }
if( $row = $db->sql_fetchrow($result) ) if( $row = $db->sql_fetchrow($result) )
@ -94,10 +94,10 @@ if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($
} }
else else
{ {
$redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? $HTTP_POST_VARS['redirect'] : ""; $redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? $HTTP_POST_VARS['redirect'] : '';
$template->assign_vars(array( $template->assign_vars(array(
"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("login.$phpEx?redirect=$redirect") . '">') 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid("login.$phpEx?redirect=$redirect") . '">')
); );
$message = $lang['Error_login'] . '<br /><br />' . sprintf($lang['Click_return_login'], '<a href="' . append_sid("login.$phpEx?redirect=$redirect") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>'); $message = $lang['Error_login'] . '<br /><br />' . sprintf($lang['Click_return_login'], '<a href="' . append_sid("login.$phpEx?redirect=$redirect") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>');
@ -111,7 +111,7 @@ if( isset($HTTP_POST_VARS['login']) || isset($HTTP_GET_VARS['login']) || isset($
$redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? $HTTP_POST_VARS['redirect'] : ""; $redirect = ( !empty($HTTP_POST_VARS['redirect']) ) ? $HTTP_POST_VARS['redirect'] : "";
$template->assign_vars(array( $template->assign_vars(array(
"META" => '<meta http-equiv="refresh" content="3;url=' . append_sid("login.$phpEx?redirect=$redirect") . '">') 'META' => '<meta http-equiv="refresh" content="3;url=' . append_sid("login.$phpEx?redirect=$redirect") . '">')
); );
$message = $lang['Error_login'] . '<br /><br />' . sprintf($lang['Click_return_login'], '<a href="' . append_sid("login.$phpEx?redirect=$redirect") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>'); $message = $lang['Error_login'] . '<br /><br />' . sprintf($lang['Click_return_login'], '<a href="' . append_sid("login.$phpEx?redirect=$redirect") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_index'], '<a href="' . append_sid("index.$phpEx") . '">', '</a>');
@ -159,7 +159,7 @@ else
include($phpbb_root_path . 'includes/page_header.'.$phpEx); include($phpbb_root_path . 'includes/page_header.'.$phpEx);
$template->set_filenames(array( $template->set_filenames(array(
"body" => "login_body.tpl") 'body' => 'login_body.tpl')
); );
if( isset($HTTP_POST_VARS['redirect']) || isset($HTTP_GET_VARS['redirect']) ) if( isset($HTTP_POST_VARS['redirect']) || isset($HTTP_GET_VARS['redirect']) )
@ -170,25 +170,25 @@ else
{ {
$forward_to = ( !empty($forward_matches[3]) ) ? $forward_matches[3] : $forward_matches[1]; $forward_to = ( !empty($forward_matches[3]) ) ? $forward_matches[3] : $forward_matches[1];
$forward_match = explode("&", $forward_to); $forward_match = explode('&', $forward_to);
if(count($forward_match) > 1) if(count($forward_match) > 1)
{ {
$forward_page = ""; $forward_page = '';
for($i = 1; $i < count($forward_match); $i++) for($i = 1; $i < count($forward_match); $i++)
{ {
if( !ereg("sid=", $forward_match[$i]) ) if( !ereg("sid=", $forward_match[$i]) )
{ {
if( $forward_page != "" ) if( $forward_page != '' )
{ {
$forward_page .= "&"; $forward_page .= '&';
} }
$forward_page .= $forward_match[$i]; $forward_page .= $forward_match[$i];
} }
} }
$forward_page = $forward_match[0] . "?" . $forward_page; $forward_page = $forward_match[0] . '?' . $forward_page;
} }
else else
{ {
@ -198,31 +198,32 @@ else
} }
else else
{ {
$forward_page = ""; $forward_page = '';
} }
$username = ( $userdata['user_id'] != ANONYMOUS ) ? $userdata['username'] : ""; $username = ( $userdata['user_id'] != ANONYMOUS ) ? $userdata['username'] : '';
$s_hidden_fields = '<input type="hidden" name="redirect" value="' . $forward_page . '" />'; $s_hidden_fields = '<input type="hidden" name="redirect" value="' . $forward_page . '" />';
make_jumpbox('viewforum.'.$phpEx, $forum_id);
$template->assign_vars(array( $template->assign_vars(array(
"USERNAME" => $username, 'USERNAME' => $username,
"L_ENTER_PASSWORD" => $lang['Enter_password'], 'L_ENTER_PASSWORD' => $lang['Enter_password'],
"L_SEND_PASSWORD" => $lang['Forgotten_password'], 'L_SEND_PASSWORD' => $lang['Forgotten_password'],
"U_SEND_PASSWORD" => append_sid("profile.$phpEx?mode=sendpassword"), 'U_SEND_PASSWORD' => append_sid("profile.$phpEx?mode=sendpassword"),
"S_HIDDEN_FIELDS" => $s_hidden_fields) 'S_HIDDEN_FIELDS' => $s_hidden_fields)
); );
$template->pparse("body"); $template->pparse('body');
include($phpbb_root_path . 'includes/page_tail.'.$phpEx); include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
} }
else else
{ {
header("Location: " . append_sid("index.$phpEx", true)); header($header_location . append_sid("index.$phpEx", true));
} }
} }

371
phpBB/memberlist.php
View file

@ -20,7 +20,7 @@
***************************************************************************/ ***************************************************************************/
define('IN_PHPBB', true); define('IN_PHPBB', true);
$phpbb_root_path = "./"; $phpbb_root_path = './';
include($phpbb_root_path . 'extension.inc'); include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'common.'.$phpEx); include($phpbb_root_path . 'common.'.$phpEx);
@ -37,22 +37,78 @@ $start = ( isset($HTTP_GET_VARS['start']) ) ? $HTTP_GET_VARS['start'] : 0;
if(isset($HTTP_POST_VARS['order'])) if(isset($HTTP_POST_VARS['order']))
{ {
$sort_order = ($HTTP_POST_VARS['order'] == "ASC") ? "ASC" : "DESC"; $sort_order = ($HTTP_POST_VARS['order'] == 'ASC') ? 'ASC' : 'DESC';
} }
else if(isset($HTTP_GET_VARS['order'])) else if(isset($HTTP_GET_VARS['order']))
{ {
$sort_order = ($HTTP_GET_VARS['order'] == "ASC") ? "ASC" : "DESC"; $sort_order = ($HTTP_GET_VARS['order'] == 'ASC') ? 'ASC' : 'DESC';
} }
else else
{ {
$sort_order = "ASC"; $sort_order = 'ASC';
} }
if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode'])) //
{ // Memberlist sorting
$mode = (isset($HTTP_POST_VARS['mode'])) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode']; //
$mode_types_text = array($lang['Sort_Joined'], $lang['Sort_Username'], $lang['Sort_Location'], $lang['Sort_Posts'], $lang['Sort_Email'], $lang['Sort_Website'], $lang['Sort_Top_Ten']);
$mode_types = array('joindate', 'username', 'location', 'posts', 'email', 'website', 'topten');
switch($mode) $select_sort_mode = '<select name="mode">';
for($i = 0; $i < count($mode_types_text); $i++)
{
$selected = ( $mode == $mode_types[$i] ) ? ' selected="selected"' : '';
$select_sort_mode .= "<option value=\"" . $mode_types[$i] . "\"$selected>" . $mode_types_text[$i] . "</option>";
}
$select_sort_mode .= '</select>';
$select_sort_order = '<select name="order">';
if($sort_order == 'ASC')
{
$select_sort_order .= '<option value="ASC" selected="selected">' . $lang['Sort_Ascending'] . '</option><option value="DESC">' . $lang['Sort_Descending'] . '</option>';
}
else
{
$select_sort_order .= '<option value="ASC">' . $lang['Sort_Ascending'] . '</option><option value="DESC" selected="selected">' . $lang['Sort_Descending'] . '</option>';
}
$select_sort_order .= '</select>';
//
// Generate page
//
$page_title = $lang['Memberlist'];
include($phpbb_root_path . 'includes/page_header.'.$phpEx);
$template->set_filenames(array(
'body' => 'memberlist_body.tpl')
);
make_jumpbox('viewforum.'.$phpEx);
$template->assign_vars(array(
'L_SELECT_SORT_METHOD' => $lang['Select_sort_method'],
'L_EMAIL' => $lang['Email'],
'L_WEBSITE' => $lang['Website'],
'L_FROM' => $lang['Location'],
'L_ORDER' => $lang['Order'],
'L_SORT' => $lang['Sort'],
'L_SUBMIT' => $lang['Sort'],
'L_AIM' => $lang['AIM'],
'L_YIM' => $lang['YIM'],
'L_MSNM' => $lang['MSNM'],
'L_ICQ' => $lang['ICQ'],
'L_JOINED' => $lang['Joined'],
'L_POSTS' => $lang['Posts'],
'S_MODE_SELECT' => $select_sort_mode,
'S_ORDER_SELECT' => $select_sort_order,
'S_MODE_ACTION' => append_sid("memberlist.$phpEx"))
);
if ( isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']) )
{
$mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode'];
switch( $mode )
{ {
case 'joined': case 'joined':
$order_by = "user_regdate ASC LIMIT $start, " . $board_config['topics_per_page']; $order_by = "user_regdate ASC LIMIT $start, " . $board_config['topics_per_page'];
@ -84,213 +140,168 @@ else
{ {
$order_by = "user_regdate $sort_order LIMIT $start, " . $board_config['topics_per_page']; $order_by = "user_regdate $sort_order LIMIT $start, " . $board_config['topics_per_page'];
} }
$sql = "SELECT username, user_id, user_viewemail, user_posts, user_regdate, user_from, user_website, user_email, user_icq, user_aim, user_yim, user_msnm, user_avatar, user_avatar_type, user_allowavatar $sql = "SELECT username, user_id, user_viewemail, user_posts, user_regdate, user_from, user_website, user_email, user_icq, user_aim, user_yim, user_msnm, user_avatar, user_avatar_type, user_allowavatar
FROM " . USERS_TABLE . " FROM " . USERS_TABLE . "
WHERE user_id <> " . ANONYMOUS . " WHERE user_id <> " . ANONYMOUS . "
ORDER BY $order_by"; ORDER BY $order_by";
if( !($result = $db->sql_query($sql)) ) if( !($result = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, "Couldn't query users", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not query users', '', __LINE__, __FILE__, $sql);
} }
$members = $db->sql_fetchrowset($result);
$db->sql_freeresult($result); if ( $row = $db->sql_fetchrow($result) )
//
// Memberlist sorting
//
$mode_types_text = array($lang['Sort_Joined'], $lang['Sort_Username'], $lang['Sort_Location'], $lang['Sort_Posts'], $lang['Sort_Email'], $lang['Sort_Website'], $lang['Sort_Top_Ten']);
$mode_types = array("joindate", "username", "location", "posts", "email", "website", "topten");
$select_sort_mode = "<select name=\"mode\">";
for($i = 0; $i < count($mode_types_text); $i++)
{ {
$selected = ($mode == $mode_types[$i]) ? " selected=\"selected\"" : ""; $i = 0;
$select_sort_mode .= "<option value=\"" . $mode_types[$i] . "\"$selected>" . $mode_types_text[$i] . "</option>"; do
}
$select_sort_mode .= "</select>";
$select_sort_order = "<select name=\"order\">";
if($sort_order == "ASC")
{
$select_sort_order .= "<option value=\"ASC\" selected=\"selected\">" . $lang['Sort_Ascending'] . "</option><option value=\"DESC\">" . $lang['Sort_Descending'] . "</option>";
}
else
{
$select_sort_order .= "<option value=\"ASC\">" . $lang['Sort_Ascending'] . "</option><option value=\"DESC\" selected=\"selected\">" . $lang['Sort_Descending'] . "</option>";
}
$select_sort_order .= "</select>";
//
// Generate page
//
$page_title = $lang['Memberlist'];
include($phpbb_root_path . 'includes/page_header.'.$phpEx);
$template->set_filenames(array(
"body" => "memberlist_body.tpl",
"jumpbox" => "jumpbox.tpl"));
$jumpbox = make_jumpbox();
$template->assign_vars(array(
"L_GO" => $lang['Go'],
"L_JUMP_TO" => $lang['Jump_to'],
"L_SELECT_FORUM" => $lang['Select_forum'],
"S_JUMPBOX_LIST" => $jumpbox,
"S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"))
);
$template->assign_var_from_handle("JUMPBOX", "jumpbox");
$template->assign_vars(array(
"L_SELECT_SORT_METHOD" => $lang['Select_sort_method'],
"L_EMAIL" => $lang['Email'],
"L_WEBSITE" => $lang['Website'],
"L_FROM" => $lang['Location'],
"L_ORDER" => $lang['Order'],
"L_SORT" => $lang['Sort'],
"L_SUBMIT" => $lang['Sort'],
"L_AIM" => $lang['AIM'],
"L_YIM" => $lang['YIM'],
"L_MSNM" => $lang['MSNM'],
"L_ICQ" => $lang['ICQ'],
"S_MODE_SELECT" => $select_sort_mode,
"S_ORDER_SELECT" => $select_sort_order,
"S_MODE_ACTION" => append_sid("memberlist.$phpEx"))
);
for($i = 0; $i < count($members); $i++)
{
$username = $members[$i]['username'];
$user_id = $members[$i]['user_id'];
$from = ( !empty($members[$i]['user_from']) ) ? $members[$i]['user_from'] : "&nbsp;";
$joined = create_date($lang['DATE_FORMAT'], $members[$i]['user_regdate'], $board_config['board_timezone']);
$posts = ( $members[$i]['user_posts'] ) ? $members[$i]['user_posts'] : 0;
if( $members[$i]['user_avatar_type'] && $user_id != ANONYMOUS && $members[$i]['user_allowavatar'] )
{ {
switch( $postrow[$i]['user_avatar_type'] ) $username = $row['username'];
$user_id = $row['user_id'];
$from = ( !empty($row['user_from']) ) ? $row['user_from'] : '&nbsp;';
$joined = create_date($lang['DATE_FORMAT'], $row['user_regdate'], $board_config['board_timezone']);
$posts = ( $row['user_posts'] ) ? $row['user_posts'] : 0;
$poster_avatar = '';
if ( $row['user_avatar_type'] && $user_id != ANONYMOUS && $row['user_allowavatar'] )
{ {
case USER_AVATAR_UPLOAD: switch( $row['user_avatar_type'] )
$poster_avatar = "<img src=\"" . $board_config['avatar_path'] . "/" . $members[$i]['user_avatar'] . "\" alt=\"\" border=\"0\" />"; {
break; case USER_AVATAR_UPLOAD:
case USER_AVATAR_REMOTE: $poster_avatar = ( $board_config['allow_avatar_upload'] ) ? '<img src="' . $board_config['avatar_path'] . '/' . $row['user_avatar'] . '" alt="" border="0" />' : '';
$poster_avatar = "<img src=\"" . $members[$i]['user_avatar'] . "\" alt=\"\" border=\"0\" />"; break;
break; case USER_AVATAR_REMOTE:
case USER_AVATAR_GALLERY: $poster_avatar = ( $board_config['allow_avatar_remote'] ) ? '<img src="' . $row['user_avatar'] . '" alt="" border="0" />' : '';
$poster_avatar = "<img src=\"" . $board_config['avatar_gallery_path'] . "/" . $members[$i]['user_avatar'] . "\" alt=\"\" border=\"0\" />"; break;
break; case USER_AVATAR_GALLERY:
$poster_avatar = ( $board_config['allow_avatar_local'] ) ? '<img src="' . $board_config['avatar_gallery_path'] . '/' . $row['user_avatar'] . '" alt="" border="0" />' : '';
break;
}
} }
if ( !empty($row['user_viewemail']) || $userdata['user_level'] == ADMIN )
{
$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&amp;" . POST_USERS_URL .'=' . $user_id) : 'mailto:' . $row['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>';
}
else
{
$email_img = '&nbsp;';
$email = '&nbsp;';
}
$temp_url = append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$user_id");
$profile_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_profile'] . '" alt="' . $lang['Read_profile'] . '" title="' . $lang['Read_profile'] . '" border="0" /></a>';
$profile = '<a href="' . $temp_url . '">' . $lang['Read_profile'] . '</a>';
$temp_url = append_sid("privmsg.$phpEx?mode=post&amp;" . POST_USERS_URL . "=$user_id");
$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>';
$www_img = ( $row['user_website'] ) ? '<a href="' . $row['user_website'] . '" target="_userwww"><img src="' . $images['icon_www'] . '" alt="' . $lang['Visit_website'] . '" title="' . $lang['Visit_website'] . '" border="0" /></a>' : '';
$www = ( $row['user_website'] ) ? '<a href="' . $row['user_website'] . '" target="_userwww">' . $lang['Visit_website'] . '</a>' : '';
if ( !empty($row['user_icq']) )
{
$icq_status_img = '<a href="http://wwp.icq.com/' . $row['user_icq'] . '#pager"><img src="http://web.icq.com/whitepages/online?icq=' . $row['user_icq'] . '&img=5" width="18" height="18" border="0" /></a>';
$icq_img = '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $row['user_icq'] . '"><img src="' . $images['icon_icq'] . '" alt="' . $lang['ICQ'] . '" title="' . $lang['ICQ'] . '" border="0" /></a>';
$icq = '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $row['user_icq'] . '">' . $lang['ICQ'] . '</a>';
}
else
{
$icq_status_img = '';
$icq_img = '';
$icq = '';
}
$aim_img = ( $row['user_aim'] ) ? '<a href="aim:goim?screenname=' . $row['user_aim'] . '&amp;message=Hello+Are+you+there?"><img src="' . $images['icon_aim'] . '" alt="' . $lang['AIM'] . '" title="' . $lang['AIM'] . '" border="0" /></a>' : '';
$aim = ( $row['user_aim'] ) ? '<a href="aim:goim?screenname=' . $row['user_aim'] . '&amp;message=Hello+Are+you+there?">' . $lang['AIM'] . '</a>' : '';
$temp_url = append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$user_id");
$msn_img = ( $row['user_msnm'] ) ? '<a href="' . $temp_url . '"><img src="' . $images['icon_msnm'] . '" alt="' . $lang['MSNM'] . '" title="' . $lang['MSNM'] . '" border="0" /></a>' : '';
$msn = ( $row['user_msnm'] ) ? '<a href="' . $temp_url . '">' . $lang['MSNM'] . '</a>' : '';
$yim_img = ( $row['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $row['user_yim'] . '&amp;.src=pg"><img src="' . $images['icon_yim'] . '" alt="' . $lang['YIM'] . '" title="' . $lang['YIM'] . '" border="0" /></a>' : '';
$yim = ( $row['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $row['user_yim'] . '&amp;.src=pg">' . $lang['YIM'] . '</a>' : '';
$temp_url = append_sid("search.$phpEx?search_author=" . urlencode($username) . "&amp;showresults=posts");
$search_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_search'] . '" alt="' . $lang['Search_user_posts'] . '" title="' . $lang['Search_user_posts'] . '" border="0" /></a>';
$search = '<a href="' . $temp_url . '">' . $lang['Search_user_posts'] . '</a>';
$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
$template->assign_block_vars('memberrow', array(
'ROW_NUMBER' => $i + ( $HTTP_GET_VARS['start'] + 1 ),
'ROW_COLOR' => '#' . $row_color,
'ROW_CLASS' => $row_class,
'USERNAME' => $username,
'FROM' => $from,
'JOINED' => $joined,
'POSTS' => $posts,
'AVATAR_IMG' => $poster_avatar,
'PROFILE_IMG' => $profile_img,
'PROFILE' => $profile,
'SEARCH_IMG' => $search_img,
'SEARCH' => $search,
'PM_IMG' => $pm_img,
'PM' => $pm,
'EMAIL_IMG' => $email_img,
'EMAIL' => $email,
'WWW_IMG' => $www_img,
'WWW' => $www,
'ICQ_STATUS_IMG' => $icq_status_img,
'ICQ_IMG' => $icq_img,
'ICQ' => $icq,
'AIM_IMG' => $aim_img,
'AIM' => $aim,
'MSN_IMG' => $msn_img,
'MSN' => $msn,
'YIM_IMG' => $yim_img,
'YIM' => $yim,
'U_VIEWPROFILE' => append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$user_id"))
);
$i++;
} }
else while ( $row = $db->sql_fetchrow($result) );
{
$poster_avatar = "";
}
if( !empty($members[$i]['user_viewemail']) || $userdata['user_level'] == ADMIN )
{
$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&amp;" . POST_USERS_URL ."=" . $members[$i]['user_id']) : "mailto:" . $members[$i]['user_email'];
$email_img = "<a href=\"$email_uri\"><img src=\"" . $images['icon_email'] . "\" border=\"0\" alt=\"" . $lang['Send_email'] . "\" /></a>";
}
else
{
$email_img = "&nbsp;";
}
$pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post&amp;" . POST_USERS_URL . "=" . $members[$i]['user_id']) . "\"><img src=\"" . $images['icon_pm'] . "\" border=\"0\" alt=\"" . $lang['Send_private_message'] . "\" /></a>";
if( $members[$i]['user_website'] != "" )
{
$www_img = "<a href=\"" . $members[$i]['user_website'] . "\" target=\"_userwww\"><img src=\"" . $images['icon_www'] . "\" border=\"0\" alt=\"" . $lang['Visit_website'] . "\" /></a>";
}
else
{
$www_img = "&nbsp;";
}
if( $members[$i]['user_icq'] )
{
$icq_status_img = "<a href=\"http://wwp.icq.com/" . $members[$i]['user_icq'] . "#pager\"><img src=\"http://online.mirabilis.com/scripts/online.dll?icq=" . $members[$i]['user_icq'] . "&amp;img=5\" border=\"0\" alt=\"\" /></a>";
$icq_add_img = "<a href=\"http://wwp.icq.com/scripts/search.dll?to=" . $members[$i]['user_icq'] . "\"><img src=\"" . $images['icq'] . "\" alt=\"" . $lang['ICQ'] . "\" border=\"0\" /></a>";
}
else
{
$icq_status_img = "&nbsp;";
$icq_add_img = "&nbsp;";
}
$aim_img = ( $members[$i]['user_aim'] ) ? "<a href=\"aim:goim?screenname=" . $members[$i]['user_aim'] . "&amp;message=Hello+Are+you+there?\"><img src=\"" . $images['icon_aim'] . "\" border=\"0\" alt=\"" . $lang['AIM'] . "\" /></a>" : "&nbsp;";
$msn_img = ( $members[$i]['user_msnm'] ) ? "<a href=\"profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id\"><img src=\"" . $images['icon_msnm'] . "\" border=\"0\" alt=\"" . $lang['MSNM'] . "\" /></a>" : "&nbsp;";
$yim_img = ( $members[$i]['user_yim'] ) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $members[$i]['user_yim'] . "&.src=pg\"><img src=\"" . $images['icon_yim'] . "\" border=\"0\" alt=\"" . $lang['YIM'] . "\" /></a>" : "&nbsp;";
$search_img = "<a href=\"" . append_sid("search.$phpEx?a=" . urlencode($members[$i]['username']) . "&amp;f=all&amp;b=0&amp;d=DESC&amp;c=100&amp;dosearch=1") . "\"><img src=\"" . $images['icon_search'] . "\" border=\"0\" alt=\"" . $lang['Search'] . "\" /></a>";
$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
$template->assign_block_vars("memberrow", array(
"U_VIEWPROFILE" => append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $user_id),
"ROW_NUMBER" => $i + ( $HTTP_GET_VARS['start'] + 1 ),
"ROW_COLOR" => "#" . $row_color,
"ROW_CLASS" => $row_class,
"USERNAME" => $username,
"FROM" => $from,
"JOINED" => $joined,
"POSTS" => $posts,
"AVATAR_IMG" => $poster_avatar,
"EMAIL_IMG" => $email_img,
"PM_IMG" => $pm_img,
"WWW_IMG" => $www_img,
"ICQ_STATUS_IMG" => $icq_status_img,
"ICQ_ADD_IMG" => $icq_add_img,
"AIM_IMG" => $aim_img,
"YIM_IMG" => $yim_img,
"MSN_IMG" => $msn_img,
"SEARCH_IMG" => $search)
);
} }
if($mode != "topten" || $board_config['topics_per_page'] < 10) if ( $mode != 'topten' || $board_config['topics_per_page'] < 10 )
{ {
$sql = "SELECT count(*) AS total $sql = "SELECT count(*) AS total
FROM " . USERS_TABLE . " FROM " . USERS_TABLE . "
WHERE user_id <> " . ANONYMOUS; WHERE user_id <> " . ANONYMOUS;
if(!$count_result = $db->sql_query($sql)) if ( !($result = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, "Error getting total users.", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Error getting total users', '', __LINE__, __FILE__, $sql);
} }
else
if ( $total = $db->sql_fetchrow($result) )
{ {
$total = $db->sql_fetchrow($count_result);
$total_members = $total['total']; $total_members = $total['total'];
$pagination = generate_pagination("memberlist.$phpEx?mode=$mode&amp;order=$sort_order", $total_members, $board_config['topics_per_page'], $start)."&nbsp;"; $pagination = generate_pagination("memberlist.$phpEx?mode=$mode&amp;order=$sort_order", $total_members, $board_config['topics_per_page'], $start). '&nbsp;';
} }
} }
else else
{ {
$pagination = "&nbsp;"; $pagination = '&nbsp;';
$total_members = 10; $total_members = 10;
} }
$template->assign_vars(array( $template->assign_vars(array(
"PAGINATION" => $pagination, 'PAGINATION' => $pagination,
"PAGE_NUMBER" => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), ceil( $total_members / $board_config['topics_per_page'] )), 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), ceil( $total_members / $board_config['topics_per_page'] )),
"L_GOTO_PAGE" => $lang['Goto_page']) 'L_GOTO_PAGE' => $lang['Goto_page'])
); );
$template->pparse("body");
$template->pparse('body');
include($phpbb_root_path . 'includes/page_tail.'.$phpEx); include($phpbb_root_path . 'includes/page_tail.'.$phpEx);

132
phpBB/modcp.php
View file

@ -86,7 +86,9 @@ if ( isset($HTTP_POST_VARS['cancel']) )
{ {
$redirect = "index.$phpEx"; $redirect = "index.$phpEx";
} }
header("Location: " . append_sid($redirect, true));
$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
header($header_location . append_sid($redirect, true));
} }
// //
@ -179,7 +181,7 @@ init_userprefs($userdata);
// //
$is_auth = auth(AUTH_ALL, $forum_id, $userdata); $is_auth = auth(AUTH_ALL, $forum_id, $userdata);
if( !$is_auth['auth_mod'] ) if ( !$is_auth['auth_mod'] )
{ {
message_die(GENERAL_MESSAGE, $lang['Not_Moderator'], $lang['Not_Authorised']); message_die(GENERAL_MESSAGE, $lang['Not_Moderator'], $lang['Not_Authorised']);
} }
@ -403,14 +405,13 @@ switch($mode)
$topic_list .= ( ( $topic_list != '' ) ? ', ' : '' ) . $topics[$i]; $topic_list .= ( ( $topic_list != '' ) ? ', ' : '' ) . $topics[$i];
} }
$sql_select = "SELECT * $sql = "SELECT *
FROM " . TOPICS_TABLE . " FROM " . TOPICS_TABLE . "
WHERE topic_id IN ($topic_list) WHERE topic_id IN ($topic_list)
AND topic_moved_id = 0"; AND topic_moved_id = 0";
if ( !($result = $db->sql_query($sql, BEGIN_TRANSACTION)) )
if ( !($result = $db->sql_query($sql_select, BEGIN_TRANSACTION)) )
{ {
message_die(GENERAL_ERROR, 'Could not select from topic table', '', __LINE__, __FILE__, $sql_select); message_die(GENERAL_ERROR, 'Could not select from topic table', '', __LINE__, __FILE__, $sql);
} }
$row = $db->sql_fetchrowset($result); $row = $db->sql_fetchrowset($result);
@ -518,14 +519,14 @@ switch($mode)
'L_YES' => $lang['Yes'], 'L_YES' => $lang['Yes'],
'L_NO' => $lang['No'], 'L_NO' => $lang['No'],
'S_FORUM_BOX' => make_forum_select('new_forum', $forum_id), 'S_FORUM_SELECT' => make_forum_select('new_forum', $forum_id),
'S_MODCP_ACTION' => append_sid("modcp.$phpEx"), 'S_MODCP_ACTION' => append_sid("modcp.$phpEx"),
'S_HIDDEN_FIELDS' => $hidden_fields) 'S_HIDDEN_FIELDS' => $hidden_fields)
); );
$template->pparse("movetopic");
$template->pparse('movetopic');
include($phpbb_root_path . 'includes/page_tail.'.$phpEx); include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
} }
break; break;
@ -724,6 +725,7 @@ switch($mode)
'L_POST_SUBJECT' => $lang['Post_subject'], 'L_POST_SUBJECT' => $lang['Post_subject'],
'L_MARK_ALL' => $lang['Mark_all'], 'L_MARK_ALL' => $lang['Mark_all'],
'L_UNMARK_ALL' => $lang['Unmark_all'], 'L_UNMARK_ALL' => $lang['Unmark_all'],
'L_POST' => $lang['Post'],
'FORUM_NAME' => $forum_name, 'FORUM_NAME' => $forum_name,
@ -797,8 +799,9 @@ switch($mode)
'POST_DATE' => $post_date, 'POST_DATE' => $post_date,
'POST_SUBJECT' => $post_subject, 'POST_SUBJECT' => $post_subject,
'MESSAGE' => $message, 'MESSAGE' => $message,
'SPLIT_CHECKBOX' => $checkbox, 'POST_ID' => $post_id,
'POST_ID' => $post_id)
'S_SPLIT_CHECKBOX' => $checkbox)
); );
} }
@ -872,39 +875,43 @@ switch($mode)
message_die(GENERAL_ERROR, 'Could not get IP information for this user', '', __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not get IP information for this user', '', __LINE__, __FILE__, $sql);
} }
$poster_ips = $db->sql_fetchrowset($result); if ( $row = $db->sql_fetchrow($result) )
$j = 0;
for($i = 0; $i < count($poster_ips); $i++)
{ {
if ( $poster_ips[$i]['poster_ip'] == $post_row['poster_ip'] ) $i = 0;
do
{ {
$template->assign_vars(array( if ( $row['poster_ip'] == $post_row['poster_ip'] )
'POSTINGS' => $poster_ips[$i]['postings'] . ' ' .$lang['Posts']) {
$template->assign_vars(array(
'POSTS' => $row['postings'] . ' ' . ( ( $row['postings'] == 1 ) ? $lang['Post'] : $lang['Posts'] ))
);
continue;
}
$ip = decode_ip($row['poster_ip']);
$ip = ( $rdns_ip_num == $row['poster_ip'] || $rdns_ip_num == 'all') ? gethostbyaddr($ip) : $ip;
$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
$template->assign_block_vars('iprow', array(
'ROW_COLOR' => '#' . $row_color,
'ROW_CLASS' => $row_class,
'IP' => $ip,
'POSTS' => $row['postings'] . ' ' . ( ( $row['postings'] == 1 ) ? $lang['Post'] : $lang['Posts'] ),
'U_LOOKUP_IP' => append_sid("modcp.$phpEx?mode=ip&amp;" . POST_POST_URL . "=$post_id&amp;" . POST_TOPIC_URL . "=$topic_id&amp;rdns=" . $row['poster_ip']))
); );
continue;
$i++;
} }
$ip = decode_ip($poster_ips[$i]['poster_ip']); while ( $row = $db->sql_fetchrow($result) );
$ip = ( $rdns_ip_num == $poster_ips[$i]['poster_ip'] || $rdns_ip_num == 'all') ? gethostbyaddr($ip) : $ip;
$j++; // Can't use $i because of the 'continue'
$row_color = ( !($j % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
$row_class = ( !($j % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
$template->assign_block_vars('iprow', array(
'ROW_COLOR' => '#' . $row_color,
'ROW_CLASS' => $row_class,
'IP' => $ip,
'POSTINGS' => $poster_ips[$i]['postings'] . ' ' .$lang['Posts'],
'U_LOOKUP_IP' => append_sid("modcp.$phpEx?mode=ip&amp;" . POST_POST_URL . "=$post_id&amp;" . POST_TOPIC_URL . "=$topic_id&amp;rdns=" . $poster_ips[$i]['poster_ip']))
);
} }
// //
// Get other users who've posted under this IP // Get other users who've posted under this IP
// //
$sql = "SELECT u.user_id, u.username, count(*) as postings $sql = "SELECT u.user_id, u.username, COUNT(*) as postings
FROM " . USERS_TABLE ." u, " . POSTS_TABLE . " p FROM " . USERS_TABLE ." u, " . POSTS_TABLE . " p
WHERE p.poster_id = u.user_id WHERE p.poster_id = u.user_id
AND p.poster_ip = '" . $post_row['poster_ip'] . "' AND p.poster_ip = '" . $post_row['poster_ip'] . "'
@ -915,29 +922,34 @@ switch($mode)
message_die(GENERAL_ERROR, 'Could not get posters information based on IP', '', __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not get posters information based on IP', '', __LINE__, __FILE__, $sql);
} }
$poster_ids = $db->sql_fetchrowset($result); if ( $row = $db->sql_fetchrow($result) )
for($i = 0; $i < count($poster_ids); $i++)
{ {
$id = $poster_ids[$i]['user_id']; $i = 0;
$username = ( $is == ANONYMOUS ) ? $lang['Guest'] : $poster_ids[$i]['username']; do
{
$id = $row['user_id'];
$username = ( $id == ANONYMOUS ) ? $lang['Guest'] : $row['username'];
$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
$template->assign_block_vars('userrow', array( $template->assign_block_vars('userrow', array(
'ROW_COLOR' => '#' . $row_color, 'ROW_COLOR' => '#' . $row_color,
'ROW_CLASS' => $row_class, 'ROW_CLASS' => $row_class,
'USERNAME' => $username, 'USERNAME' => $username,
'POSTINGS' => $poster_ids[$i]['postings'] . ' ' .$lang['Posts'], 'POSTS' => $row['postings'] . ' ' . ( ( $row['postings'] == 1 ) ? $lang['Post'] : $lang['Posts'] ),
'L_SEARCH_POSTS' => sprintf($lang['Search_user_posts'], $username), 'L_SEARCH_POSTS' => sprintf($lang['Search_user_posts'], $username),
'U_PROFILE' => append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$id"), 'U_PROFILE' => append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$id"),
'U_SEARCHPOSTS' => append_sid("search.$phpEx?search_author=" . urlencode($username) . "&amp;showresults=topics")) 'U_SEARCHPOSTS' => append_sid("search.$phpEx?search_author=" . urlencode($username) . "&amp;showresults=topics"))
); );
$i++;
}
while ( $row = $db->sql_fetchrow($result) );
} }
$template->pparse("viewip"); $template->pparse('viewip');
break; break;
@ -961,6 +973,10 @@ switch($mode)
'L_MOVE' => $lang['Move'], 'L_MOVE' => $lang['Move'],
'L_LOCK' => $lang['Lock'], 'L_LOCK' => $lang['Lock'],
'L_UNLOCK' => $lang['Unlock'], 'L_UNLOCK' => $lang['Unlock'],
'L_TOPICS' => $lang['Topics'],
'L_REPLIES' => $lang['Replies'],
'L_LASTPOST' => $lang['Last_Post'],
'L_SELECT' => $lang['Select'],
'U_VIEW_FORUM' => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"), 'U_VIEW_FORUM' => append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"),
'S_HIDDEN_FIELDS' => '<input type="hidden" name="' . POST_FORUM_URL . '" value="' . $forum_id . '">', 'S_HIDDEN_FIELDS' => '<input type="hidden" name="' . POST_FORUM_URL . '" value="' . $forum_id . '">',
@ -1018,8 +1034,6 @@ switch($mode)
} }
} }
$folder_image = '<img src="' . $folder_img . '" alt="' . $folder_alt . '" title="' . $folder_alt . '" />';
$topic_id = $row['topic_id']; $topic_id = $row['topic_id'];
$topic_type = $row['topic_type']; $topic_type = $row['topic_type'];
$topic_status = $row['topic_status']; $topic_status = $row['topic_status'];
@ -1060,20 +1074,20 @@ switch($mode)
$template->assign_block_vars('topicrow', array( $template->assign_block_vars('topicrow', array(
'U_VIEW_TOPIC' => $u_view_topic, 'U_VIEW_TOPIC' => $u_view_topic,
'FOLDER_IMG' => $folder_image, 'TOPIC_FOLDER_IMG' => $folder_img,
'TOPIC_TYPE' => $topic_type, 'TOPIC_TYPE' => $topic_type,
'TOPIC_TITLE' => $topic_title, 'TOPIC_TITLE' => $topic_title,
'REPLIES' => $topic_replies, 'REPLIES' => $topic_replies,
'LAST_POST' => $last_post_time, 'LAST_POST_TIME' => $last_post_time,
'TOPIC_ID' => $topic_id) 'TOPIC_ID' => $topic_id,
'L_TOPIC_FOLDER_ALT' => $folder_alt)
); );
} }
$template->assign_vars(array( $template->assign_vars(array(
'PAGINATION' => generate_pagination("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id", $forum_topics, $board_config['topics_per_page'], $start), 'PAGINATION' => generate_pagination("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id", $forum_topics, $board_config['topics_per_page'], $start),
'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), ceil( $forum_topics / $board_config['topics_per_page'] )), 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $board_config['topics_per_page'] ) + 1 ), ceil( $forum_topics / $board_config['topics_per_page'] )),
'L_GOTO_PAGE' => $lang['Goto_page']) 'L_GOTO_PAGE' => $lang['Goto_page'])
); );

87
phpBB/posting.php
View file

@ -21,7 +21,7 @@
***************************************************************************/ ***************************************************************************/
define('IN_PHPBB', true); define('IN_PHPBB', true);
$phpbb_root_path = "./"; $phpbb_root_path = './';
include($phpbb_root_path . 'extension.inc'); include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'common.'.$phpEx); include($phpbb_root_path . 'common.'.$phpEx);
include($phpbb_root_path . 'includes/bbcode.'.$phpEx); include($phpbb_root_path . 'includes/bbcode.'.$phpEx);
@ -55,16 +55,16 @@ $topic_type = ( !empty($HTTP_POST_VARS['topictype']) ) ? $HTTP_POST_VARS['topict
// If the mode is set to topic review then output // If the mode is set to topic review then output
// that review ... // that review ...
// //
if( $mode == 'topicreview' ) if ( $mode == 'topicreview' )
{ {
require($phpbb_root_path . 'includes/topic_review.'.$phpEx); require($phpbb_root_path . 'includes/topic_review.'.$phpEx);
topic_review($topic_id, false); topic_review($topic_id, false);
exit; exit;
} }
else if( $mode == 'smilies' ) else if ( $mode == 'smilies' )
{ {
generate_smilies("window", PAGE_POSTING); generate_smilies('window', PAGE_POSTING);
exit; exit;
} }
@ -72,7 +72,7 @@ else if( $mode == 'smilies' )
// Was cancel pressed? If so then redirect to the appropriate // Was cancel pressed? If so then redirect to the appropriate
// page, no point in continuing with any further checks // page, no point in continuing with any further checks
// //
if( isset($HTTP_POST_VARS['cancel']) ) if ( isset($HTTP_POST_VARS['cancel']) )
{ {
if ( $post_id ) if ( $post_id )
{ {
@ -95,7 +95,9 @@ if( isset($HTTP_POST_VARS['cancel']) )
$post_append = ""; $post_append = "";
} }
header('Location: ' . append_sid($redirect) . $post_append, true); $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
header($header_location . append_sid($redirect) . $post_append, true);
exit;
} }
// //
@ -114,11 +116,11 @@ $is_auth = array();
switch( $mode ) switch( $mode )
{ {
case 'newtopic': case 'newtopic':
if( $topic_type == POST_ANNOUNCE ) if ( $topic_type == POST_ANNOUNCE )
{ {
$is_auth_type = 'auth_announce'; $is_auth_type = 'auth_announce';
} }
else if( $topic_type == POST_STICKY ) else if ( $topic_type == POST_STICKY )
{ {
$is_auth_type = 'auth_sticky'; $is_auth_type = 'auth_sticky';
} }
@ -190,9 +192,9 @@ switch ( $mode )
message_die(GENERAL_MESSAGE, $lang['No_post_id']); message_die(GENERAL_MESSAGE, $lang['No_post_id']);
} }
$select_sql = ( !$submit ) ? ", t.topic_title, p.enable_bbcode, p.enable_html, p.enable_smilies, p.enable_sig, p.post_username, pt.post_subject, pt.post_text, pt.bbcode_uid, u.username, u.user_id, u.user_sig" : ""; $select_sql = ( !$submit ) ? ", t.topic_title, p.enable_bbcode, p.enable_html, p.enable_smilies, p.enable_sig, p.post_username, pt.post_subject, pt.post_text, pt.bbcode_uid, u.username, u.user_id, u.user_sig" : '';
$from_sql = ( !$submit ) ? ", " . POSTS_TEXT_TABLE . " pt, " . USERS_TABLE . " u" : ""; $from_sql = ( !$submit ) ? ", " . POSTS_TEXT_TABLE . " pt, " . USERS_TABLE . " u" : '';
$where_sql = ( !$submit ) ? "AND pt.post_id = p.post_id AND u.user_id = p.poster_id" : ""; $where_sql = ( !$submit ) ? "AND pt.post_id = p.post_id AND u.user_id = p.poster_id" : '';
$sql = "SELECT f.*, t.topic_id, t.topic_status, t.topic_type, t.topic_first_post_id, t.topic_last_post_id, t.topic_vote, p.post_id, p.poster_id" . $select_sql . " $sql = "SELECT f.*, t.topic_id, t.topic_status, t.topic_type, t.topic_first_post_id, t.topic_last_post_id, t.topic_vote, p.post_id, p.poster_id" . $select_sql . "
FROM " . POSTS_TABLE . " p, " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f" . $from_sql . " FROM " . POSTS_TABLE . " p, " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f" . $from_sql . "
@ -245,7 +247,7 @@ if ( $result = $db->sql_query($sql) )
ORDER BY vr.vote_option_id"; ORDER BY vr.vote_option_id";
if ( !($result = $db->sql_query($sql)) ) if ( !($result = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, "Couldn't obtain vote data for this topic", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not obtain vote data for this topic', '', __LINE__, __FILE__, $sql);
} }
$poll_options = array(); $poll_options = array();
@ -276,16 +278,16 @@ if ( $result = $db->sql_query($sql) )
// //
if ( $post_info['poster_id'] != $userdata['user_id'] && !$is_auth['auth_mod'] ) if ( $post_info['poster_id'] != $userdata['user_id'] && !$is_auth['auth_mod'] )
{ {
$message = ( $delete || $mode == "delete" ) ? $lang['Delete_own_posts'] : $lang['Edit_own_posts']; $message = ( $delete || $mode == 'delete' ) ? $lang['Delete_own_posts'] : $lang['Edit_own_posts'];
$message .= '<br /><br />' . sprintf($lang['Click_return_topic'], '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . '">', '</a>'); $message .= '<br /><br />' . sprintf($lang['Click_return_topic'], '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id") . '">', '</a>');
message_die(GENERAL_MESSAGE, $message); message_die(GENERAL_MESSAGE, $message);
} }
else if ( !$post_data['last_post'] && !$is_auth['auth_mod'] && ( $mode == "delete" || $delete ) ) else if ( !$post_data['last_post'] && !$is_auth['auth_mod'] && ( $mode == 'delete' || $delete ) )
{ {
message_die(GENERAL_MESSAGE, $lang['Cannot_delete_replied']); message_die(GENERAL_MESSAGE, $lang['Cannot_delete_replied']);
} }
else if ( !$post_data['edit_poll'] && !$is_auth['auth_mod'] && ( $mode == "poll_delete" || $poll_delete ) ) else if ( !$post_data['edit_poll'] && !$is_auth['auth_mod'] && ( $mode == 'poll_delete' || $poll_delete ) )
{ {
message_die(GENERAL_MESSAGE, $lang['Cannot_delete_poll']); message_die(GENERAL_MESSAGE, $lang['Cannot_delete_poll']);
} }
@ -334,7 +336,7 @@ if ( !$is_auth[$is_auth_type] )
break; break;
} }
$header_location = ( @preg_match("/Microsoft|WebSTAR|Xitami/", getenv("SERVER_SOFTWARE")) ) ? "Refresh: 0; URL=" : "Location: "; $header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
header($header_location . append_sid("login.$phpEx?redirect=posting.$phpEx&" . $redirect, true)); header($header_location . append_sid("login.$phpEx?redirect=posting.$phpEx&" . $redirect, true));
exit; exit;
} }
@ -383,7 +385,7 @@ else
AND user_id = " . $userdata['user_id']; AND user_id = " . $userdata['user_id'];
if ( !($result = $db->sql_query($sql)) ) if ( !($result = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, "Couldn't obtain topic watch information", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not obtain topic watch information', '', __LINE__, __FILE__, $sql);
} }
$notify_user = ( $db->sql_fetchrow($result) ) ? TRUE : $userdata['user_notify']; $notify_user = ( $db->sql_fetchrow($result) ) ? TRUE : $userdata['user_notify'];
@ -399,7 +401,7 @@ $attach_sig = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['attach_sig']
// -------------------- // --------------------
// What shall we do? // What shall we do?
// //
if ( ( $delete || $poll_delete || $mode == "delete" ) && !$confirm ) if ( ( $delete || $poll_delete || $mode == 'delete' ) && !$confirm )
{ {
// //
// Confirm deletion // Confirm deletion
@ -450,7 +452,7 @@ else if ( $mode == 'vote' )
GROUP BY vd.vote_id"; GROUP BY vd.vote_id";
if ( !($result = $db->sql_query($sql)) ) if ( !($result = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, "Couldn't obtain vote data for this topic", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not obtain vote data for this topic', '', __LINE__, __FILE__, $sql);
} }
if ( $vote_info = $db->sql_fetchrow($result) ) if ( $vote_info = $db->sql_fetchrow($result) )
@ -463,7 +465,7 @@ else if ( $mode == 'vote' )
AND vote_user_id = " . $userdata['user_id']; AND vote_user_id = " . $userdata['user_id'];
if ( !($result = $db->sql_query($sql)) ) if ( !($result = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, "Couldn't obtain user vote data for this topic", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not obtain user vote data for this topic', '', __LINE__, __FILE__, $sql);
} }
if ( !($row = $db->sql_fetchrow($result)) ) if ( !($row = $db->sql_fetchrow($result)) )
@ -474,14 +476,14 @@ else if ( $mode == 'vote' )
AND vote_option_id = $vote_option_id"; AND vote_option_id = $vote_option_id";
if ( !$db->sql_query($sql, BEGIN_TRANSACTION) ) if ( !$db->sql_query($sql, BEGIN_TRANSACTION) )
{ {
message_die(GENERAL_ERROR, "Couldn't update poll result", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not update poll result', '', __LINE__, __FILE__, $sql);
} }
$sql = "INSERT INTO " . VOTE_USERS_TABLE . " (vote_id, vote_user_id, vote_user_ip) $sql = "INSERT INTO " . VOTE_USERS_TABLE . " (vote_id, vote_user_id, vote_user_ip)
VALUES ($vote_id, " . $userdata['user_id'] . ", '$user_ip')"; VALUES ($vote_id, " . $userdata['user_id'] . ", '$user_ip')";
if ( !$db->sql_query($sql, END_TRANSACTION) ) if ( !$db->sql_query($sql, END_TRANSACTION) )
{ {
message_die(GENERAL_ERROR, "Couldn't insert user_id for poll", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, "Could not insert user_id for poll", "", __LINE__, __FILE__, $sql);
} }
$message = $lang['Vote_cast']; $message = $lang['Vote_cast'];
@ -687,7 +689,8 @@ if( $refresh || isset($HTTP_POST_VARS['del_poll_option']) || $error_msg != '' )
'L_POST_SUBJECT' => $lang['Post_subject'], 'L_POST_SUBJECT' => $lang['Post_subject'],
'L_PREVIEW' => $lang['Preview'], 'L_PREVIEW' => $lang['Preview'],
'L_POSTED' => $lang['Posted']) 'L_POSTED' => $lang['Posted'],
'L_POST' => $lang['Post'])
); );
$template->assign_var_from_handle('POST_PREVIEW_BOX', 'preview'); $template->assign_var_from_handle('POST_PREVIEW_BOX', 'preview');
} }
@ -791,7 +794,7 @@ else
// //
if( $user_sig != '' ) if( $user_sig != '' )
{ {
$template->assign_block_vars('signature_checkbox', array()); $template->assign_block_vars('switch_signature_checkbox', array());
} }
// //
@ -800,7 +803,7 @@ if( $user_sig != '' )
if ( $board_config['allow_html'] ) if ( $board_config['allow_html'] )
{ {
$html_status = $lang['HTML_is_ON']; $html_status = $lang['HTML_is_ON'];
$template->assign_block_vars('html_checkbox', array()); $template->assign_block_vars('switch_html_checkbox', array());
} }
else else
{ {
@ -813,7 +816,7 @@ else
if ( $board_config['allow_bbcode'] ) if ( $board_config['allow_bbcode'] )
{ {
$bbcode_status = $lang['BBCode_is_ON']; $bbcode_status = $lang['BBCode_is_ON'];
$template->assign_block_vars('bbcode_checkbox', array()); $template->assign_block_vars('switch_bbcode_checkbox', array());
} }
else else
{ {
@ -826,7 +829,7 @@ else
if ( $board_config['allow_smilies'] ) if ( $board_config['allow_smilies'] )
{ {
$smilies_status = $lang['Smilies_are_ON']; $smilies_status = $lang['Smilies_are_ON'];
$template->assign_block_vars('smilies_checkbox', array()); $template->assign_block_vars('switch_smilies_checkbox', array());
} }
else else
{ {
@ -835,7 +838,7 @@ else
if( !$userdata['session_logged_in'] || ( $mode == 'editpost' && $post_info['poster_id'] == ANONYMOUS ) ) if( !$userdata['session_logged_in'] || ( $mode == 'editpost' && $post_info['poster_id'] == ANONYMOUS ) )
{ {
$template->assign_block_vars('username_select', array()); $template->assign_block_vars('switch_username_select', array());
} }
// //
@ -845,7 +848,7 @@ if ( $userdata['session_logged_in'] )
{ {
if ( $mode != 'editpost' || ( $mode == 'editpost' && $post_info['poster_id'] != ANONYMOUS ) ) if ( $mode != 'editpost' || ( $mode == 'editpost' && $post_info['poster_id'] != ANONYMOUS ) )
{ {
$template->assign_block_vars('notify_checkbox', array()); $template->assign_block_vars('switch_notify_checkbox', array());
} }
} }
@ -854,7 +857,7 @@ if ( $userdata['session_logged_in'] )
// //
if ( $mode == 'editpost' && ( ( $is_auth['auth_delete'] && $post_data['last_post'] && ( !$post_data['has_poll'] || $post_data['edit_poll'] ) ) || $is_auth['auth_mod'] ) ) if ( $mode == 'editpost' && ( ( $is_auth['auth_delete'] && $post_data['last_post'] && ( !$post_data['has_poll'] || $post_data['edit_poll'] ) ) || $is_auth['auth_mod'] ) )
{ {
$template->assign_block_vars('delete_checkbox', array()); $template->assign_block_vars('switch_delete_checkbox', array());
} }
// //
@ -863,7 +866,7 @@ if ( $mode == 'editpost' && ( ( $is_auth['auth_delete'] && $post_data['last_post
$topic_type_toggle = ''; $topic_type_toggle = '';
if ( $mode == 'newtopic' || ( $mode == 'editpost' && $post_data['first_post'] ) ) if ( $mode == 'newtopic' || ( $mode == 'editpost' && $post_data['first_post'] ) )
{ {
$template->assign_block_vars('type_toggle', array()); $template->assign_block_vars('switch_type_toggle', array());
if( $is_auth['auth_sticky'] ) if( $is_auth['auth_sticky'] )
{ {
@ -912,7 +915,7 @@ switch( $mode )
} }
// Generate smilies listing for page output // Generate smilies listing for page output
generate_smilies("inline", PAGE_POSTING); generate_smilies('inline', PAGE_POSTING);
// //
// Include page header // Include page header
@ -922,20 +925,9 @@ include($phpbb_root_path . 'includes/page_header.'.$phpEx);
$template->set_filenames(array( $template->set_filenames(array(
'body' => 'posting_body.tpl', 'body' => 'posting_body.tpl',
'pollbody' => 'posting_poll_body.tpl', 'pollbody' => 'posting_poll_body.tpl',
'jumpbox' => 'jumpbox.tpl',
'reviewbody' => 'posting_topic_review.tpl') 'reviewbody' => 'posting_topic_review.tpl')
); );
make_jumpbox('viewforum.'.$phpEx);
$jumpbox = make_jumpbox();
$template->assign_vars(array(
'L_GO' => $lang['Go'],
'L_JUMP_TO' => $lang['Jump_to'],
'L_SELECT_FORUM' => $lang['Select_forum'],
'S_JUMPBOX_LIST' => $jumpbox,
'S_JUMPBOX_ACTION' => append_sid("viewforum.$phpEx"))
);
$template->assign_var_from_handle('JUMPBOX', 'jumpbox');
$template->assign_vars(array( $template->assign_vars(array(
'FORUM_NAME' => $forum_name, 'FORUM_NAME' => $forum_name,
@ -1056,7 +1048,7 @@ if( ( $mode == 'newtopic' || ( $mode == 'editpost' && $post_data['first_post'] )
if( $mode == 'editpost' && $post_data['edit_poll'] ) if( $mode == 'editpost' && $post_data['edit_poll'] )
{ {
$template->assign_block_vars('poll_delete_toggle', array()); $template->assign_block_vars('switch_poll_delete_toggle', array());
} }
if( !empty($poll_options) ) if( !empty($poll_options) )
@ -1064,7 +1056,7 @@ if( ( $mode == 'newtopic' || ( $mode == 'editpost' && $post_data['first_post'] )
while( list($option_id, $option_text) = each($poll_options) ) while( list($option_id, $option_text) = each($poll_options) )
{ {
$template->assign_block_vars('poll_option_rows', array( $template->assign_block_vars('poll_option_rows', array(
'POLL_OPTION' => str_replace("\"", "&quot;", $option_text), 'POLL_OPTION' => str_replace('"', '&quot;', $option_text),
'S_POLL_OPTION_NUM' => $option_id) 'S_POLL_OPTION_NUM' => $option_id)
); );
@ -1086,9 +1078,6 @@ if( $mode == 'reply' )
$template->assign_var_from_handle('TOPIC_REVIEW_BOX', 'reviewbody'); $template->assign_var_from_handle('TOPIC_REVIEW_BOX', 'reviewbody');
} }
//
// Parse and print the body
//
$template->pparse('body'); $template->pparse('body');
include($phpbb_root_path . 'includes/page_tail.'.$phpEx); include($phpbb_root_path . 'includes/page_tail.'.$phpEx);

1325
phpBB/privmsg.php
View file

File diff suppressed because it is too large Load diff

340
phpBB/search.php
View file

@ -21,7 +21,7 @@
***************************************************************************/ ***************************************************************************/
define('IN_PHPBB', true); define('IN_PHPBB', true);
$phpbb_root_path = "./"; $phpbb_root_path = './';
include($phpbb_root_path . 'extension.inc'); include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'common.'.$phpEx); include($phpbb_root_path . 'common.'.$phpEx);
include($phpbb_root_path . 'includes/bbcode.'.$phpEx); include($phpbb_root_path . 'includes/bbcode.'.$phpEx);
@ -39,7 +39,7 @@ init_userprefs($userdata);
// //
// Define initial vars // Define initial vars
// //
if( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) ) if ( isset($HTTP_POST_VARS['mode']) || isset($HTTP_GET_VARS['mode']) )
{ {
$mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode']; $mode = ( isset($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode'];
} }
@ -48,7 +48,7 @@ else
$mode = ''; $mode = '';
} }
if( isset($HTTP_POST_VARS['search_keywords']) || isset($HTTP_GET_VARS['search_keywords']) ) if ( isset($HTTP_POST_VARS['search_keywords']) || isset($HTTP_GET_VARS['search_keywords']) )
{ {
$search_keywords = ( isset($HTTP_POST_VARS['search_keywords']) ) ? $HTTP_POST_VARS['search_keywords'] : $HTTP_GET_VARS['search_keywords']; $search_keywords = ( isset($HTTP_POST_VARS['search_keywords']) ) ? $HTTP_POST_VARS['search_keywords'] : $HTTP_GET_VARS['search_keywords'];
} }
@ -57,7 +57,7 @@ else
$search_keywords = ''; $search_keywords = '';
} }
if( isset($HTTP_POST_VARS['search_author']) || isset($HTTP_GET_VARS['search_author'])) if ( isset($HTTP_POST_VARS['search_author']) || isset($HTTP_GET_VARS['search_author']))
{ {
$search_author = ( isset($HTTP_POST_VARS['search_author']) ) ? $HTTP_POST_VARS['search_author'] : $HTTP_GET_VARS['search_author']; $search_author = ( isset($HTTP_POST_VARS['search_author']) ) ? $HTTP_POST_VARS['search_author'] : $HTTP_GET_VARS['search_author'];
} }
@ -66,11 +66,11 @@ else
$search_author = ''; $search_author = '';
} }
$search_id = ( isset($HTTP_GET_VARS['search_id']) ) ? $HTTP_GET_VARS['search_id'] : ""; $search_id = ( isset($HTTP_GET_VARS['search_id']) ) ? intval($HTTP_GET_VARS['search_id']) : '';
$show_results = ( isset($HTTP_POST_VARS['show_results']) ) ? $HTTP_POST_VARS['show_results'] : 'posts'; $show_results = ( isset($HTTP_POST_VARS['show_results']) ) ? $HTTP_POST_VARS['show_results'] : 'posts';
if( isset($HTTP_POST_VARS['search_terms']) ) if ( isset($HTTP_POST_VARS['search_terms']) )
{ {
$search_terms = ( $HTTP_POST_VARS['search_terms'] == 'all' ) ? 1 : 0; $search_terms = ( $HTTP_POST_VARS['search_terms'] == 'all' ) ? 1 : 0;
} }
@ -79,7 +79,7 @@ else
$search_terms = 0; $search_terms = 0;
} }
if( isset($HTTP_POST_VARS['search_fields']) ) if ( isset($HTTP_POST_VARS['search_fields']) )
{ {
$search_fields = ( $HTTP_POST_VARS['search_fields'] == 'all' ) ? 1 : 0; $search_fields = ( $HTTP_POST_VARS['search_fields'] == 'all' ) ? 1 : 0;
} }
@ -95,7 +95,7 @@ $search_forum = ( isset($HTTP_POST_VARS['search_forum']) ) ? intval($HTTP_POST_V
$sort_by = ( isset($HTTP_POST_VARS['sort_by']) ) ? intval($HTTP_POST_VARS['sort_by']) : 0; $sort_by = ( isset($HTTP_POST_VARS['sort_by']) ) ? intval($HTTP_POST_VARS['sort_by']) : 0;
if( isset($HTTP_POST_VARS['sort_dir']) ) if ( isset($HTTP_POST_VARS['sort_dir']) )
{ {
$sort_dir = ( $HTTP_POST_VARS['sort_dir'] == 'DESC' ) ? 'DESC' : 'ASC'; $sort_dir = ( $HTTP_POST_VARS['sort_dir'] == 'DESC' ) ? 'DESC' : 'ASC';
} }
@ -104,9 +104,9 @@ else
$sort_dir = 'DESC'; $sort_dir = 'DESC';
} }
if(!empty($HTTP_POST_VARS['search_time']) ) if ( !empty($HTTP_POST_VARS['search_time']) || !empty($HTTP_GET_VARS['search_time']))
{ {
$search_time = time() - ( intval($HTTP_POST_VARS['search_time']) * 86400 ); $search_time = time() - ( ( ( !empty($HTTP_POST_VARS['search_time']) ) ? intval($HTTP_POST_VARS['search_time']) : intval($HTTP_GET_VARS['search_time']) ) * 86400 );
} }
else else
{ {
@ -124,27 +124,23 @@ $sort_by_sql = array('p.post_time', 'pt.post_subject', 't.topic_title', 'u.usern
// //
// Begin core code // Begin core code
// //
if( $mode == 'searchuser' ) if ( $mode == 'searchuser' )
{ {
// //
// This handles the simple windowed user search // This handles the simple windowed user search functions called from various other scripts
// functions called from various other scripts. If a
// script allows an 'inline' user search then this is
// handled by the script itself, this is only for the
// windowed version
// //
if( isset($HTTP_POST_VARS['search_author']) ) if ( isset($HTTP_POST_VARS['search_username']) )
{ {
username_search($HTTP_POST_VARS['search_author'], false); username_search($HTTP_POST_VARS['search_username']);
} }
else else
{ {
username_search('', false); username_search('');
} }
exit; exit;
} }
else if( $search_keywords != '' || $search_author != '' || $search_id ) else if ( $search_keywords != '' || $search_author != '' || $search_id )
{ {
$store_vars = array('search_results', 'total_match_count', 'split_search', 'sort_by', 'sort_dir', 'show_results', 'return_chars'); $store_vars = array('search_results', 'total_match_count', 'split_search', 'sort_by', 'sort_dir', 'show_results', 'return_chars');
@ -271,7 +267,7 @@ else if( $search_keywords != '' || $search_author != '' || $search_id )
break; break;
default: default:
if( !empty($search_terms) ) if ( !empty($search_terms) )
{ {
$current_match_type = 'and'; $current_match_type = 'and';
} }
@ -600,12 +596,12 @@ else if( $search_keywords != '' || $search_author != '' || $search_id )
FROM " . SEARCH_TABLE . " FROM " . SEARCH_TABLE . "
WHERE search_id = $search_id WHERE search_id = $search_id
AND session_id = '". $userdata['session_id'] . "'"; AND session_id = '". $userdata['session_id'] . "'";
if( !($result = $db->sql_query($sql)) ) if ( !($result = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, 'Could not obtain search results', '', __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not obtain search results', '', __LINE__, __FILE__, $sql);
} }
if( $row = $db->sql_fetchrow($result) ) if ( $row = $db->sql_fetchrow($result) )
{ {
$search_data = unserialize($row['search_array']); $search_data = unserialize($row['search_array']);
for($i = 0; $i < count($store_vars); $i++) for($i = 0; $i < count($store_vars); $i++)
@ -632,13 +628,14 @@ else if( $search_keywords != '' || $search_author != '' || $search_id )
} }
else else
{ {
$sql = "SELECT t.*, f.forum_id, f.forum_name, u.username, u.user_id, u2.username as user2, u2.user_id as id2, p.post_time, p.post_username $sql = "SELECT t.*, f.forum_id, f.forum_name, u.username, u.user_id, u2.username as user2, u2.user_id as id2, p.post_username, p2.post_username AS post_username2, p2.post_time
FROM " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f, " . USERS_TABLE . " u, " . USERS_TABLE . " u2, " . POSTS_TABLE . " p FROM " . TOPICS_TABLE . " t, " . FORUMS_TABLE . " f, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . POSTS_TABLE . " p2, " . USERS_TABLE . " u2
WHERE t.topic_id IN ($search_results) WHERE t.topic_id IN ($search_results)
AND t.topic_poster = u.user_id
AND f.forum_id = t.forum_id AND f.forum_id = t.forum_id
AND u.user_id = t.topic_poster AND p.post_id = t.topic_first_post_id
AND p.post_id = t.topic_last_post_id AND p2.post_id = t.topic_last_post_id
AND p.poster_id = u2.user_id"; AND u2.user_id = p2.poster_id";
} }
$per_page = ( $show_results == 'posts' ) ? $board_config['posts_per_page'] : $board_config['topics_per_page']; $per_page = ( $show_results == 'posts' ) ? $board_config['posts_per_page'] : $board_config['topics_per_page'];
@ -674,28 +671,16 @@ else if( $search_keywords != '' || $search_author != '' || $search_id )
if ( $show_results == 'posts' ) if ( $show_results == 'posts' )
{ {
$template->set_filenames(array( $template->set_filenames(array(
'body' => 'search_results_posts.tpl', 'body' => 'search_results_posts.tpl')
'jumpbox' => 'jumpbox.tpl')
); );
} }
else else
{ {
$template->set_filenames(array( $template->set_filenames(array(
'body' => 'search_results_topics.tpl', 'body' => 'search_results_topics.tpl')
'jumpbox' => 'jumpbox.tpl')
); );
} }
make_jumpbox('viewforum.'.$phpEx);
$jumpbox = make_jumpbox();
$template->assign_vars(array(
'L_GO' => $lang['Go'],
'L_JUMP_TO' => $lang['Jump_to'],
'L_SELECT_FORUM' => $lang['Select_forum'],
'S_JUMPBOX_LIST' => $jumpbox,
'S_JUMPBOX_ACTION' => append_sid("viewforum.$phpEx"))
);
$template->assign_var_from_handle('JUMPBOX', 'jumpbox');
$l_search_matches = ( $total_match_count == 1 ) ? sprintf($lang['Found_search_match'], $total_match_count) : sprintf($lang['Found_search_matches'], $total_match_count); $l_search_matches = ( $total_match_count == 1 ) ? sprintf($lang['Found_search_match'], $total_match_count) : sprintf($lang['Found_search_matches'], $total_match_count);
@ -704,29 +689,24 @@ else if( $search_keywords != '' || $search_author != '' || $search_id )
'L_TOPIC' => $lang['Topic']) 'L_TOPIC' => $lang['Topic'])
); );
$highlight_active = ""; $highlight_active = '';
$search_string = array(); $highlight_match = array();
$replace_string = array();
for($j = 0; $j < count($split_search); $j++ ) for($j = 0; $j < count($split_search); $j++ )
{ {
$split_word = $split_search[$j]; $split_word = $split_search[$j];
if( $split_word != 'and' && $split_word != 'or' && $split_word != 'not' ) if ( $split_word != 'and' && $split_word != 'or' && $split_word != 'not' )
{ {
$highlight_match[] = '#\b(' . str_replace("*", "([\w]+)?", $split_word) . ')\b#is';
$highlight_active .= " " . $split_word; $highlight_active .= " " . $split_word;
$search_string[] = '#\b(' . str_replace("\*", ".*?", phpbb_preg_quote($split_word, '#')) . ')(?!.*?<\/a>)(?!.*?\[/url\])(?!.*?<\/span>)\b#i';
$replace_string[] = '<span style="color:#' . $theme['fontcolor3'] . '"><b>\1</b></span>';
for ($k = 0; $k < count($synonym_array); $k++) for ($k = 0; $k < count($synonym_array); $k++)
{ {
list($replace_synonym, $match_synonym) = split(' ', trim(strtolower($synonym_array[$k]))); list($replace_synonym, $match_synonym) = split(' ', trim(strtolower($synonym_array[$k])));
if( $replace_synonym == $split_word ) if ( $replace_synonym == $split_word )
{ {
$search_string[] = '#\b(' . str_replace('\*', '.*?', phpbb_preg_quote($replace_synonym, '#')) . ')(?!.*?<\/a>)(?!.*?\[/url\])(?!.*?<\/span>)\b#i'; $highlight_match[] = '#\b(' . str_replace("*", "([\w]+)?", $replace_synonym) . ')\b#is';
$replace_string[] = '<span style="color:#' . $theme['fontcolor3'] . '"><b>\1</b></span>';
$highlight_active .= ' ' . $match_synonym; $highlight_active .= ' ' . $match_synonym;
} }
} }
@ -740,9 +720,9 @@ else if( $search_keywords != '' || $search_author != '' || $search_id )
for($i = 0; $i < count($searchset); $i++) for($i = 0; $i < count($searchset); $i++)
{ {
$forum_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $searchset[$i]['forum_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"); $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']); $post_date = create_date($board_config['default_dateformat'], $searchset[$i]['post_time'], $board_config['board_timezone']);
@ -752,9 +732,9 @@ else if( $search_keywords != '' || $search_author != '' || $search_id )
$forum_id = $searchset[$i]['forum_id']; $forum_id = $searchset[$i]['forum_id'];
$topic_id = $searchset[$i]['topic_id']; $topic_id = $searchset[$i]['topic_id'];
if( $show_results == 'posts' ) if ( $show_results == 'posts' )
{ {
if( isset($return_chars) ) if ( isset($return_chars) )
{ {
$bbcode_uid = $searchset[$i]['bbcode_uid']; $bbcode_uid = $searchset[$i]['bbcode_uid'];
@ -762,43 +742,112 @@ else if( $search_keywords != '' || $search_author != '' || $search_id )
// If the board has HTML off but the post has HTML // If the board has HTML off but the post has HTML
// on then we process it, else leave it alone // on then we process it, else leave it alone
// //
if( $return_chars != -1 ) if ( $return_chars != -1 )
{ {
$message = strip_tags($message); $message = strip_tags($message);
$message = preg_replace("/\[.*?:$bbcode_uid:?.*?\]/si", '', $message); $message = preg_replace("/\[.*?:$bbcode_uid:?.*?\]/si", '', $message);
$message = preg_replace('/\[url\]|\[\/url\]/si', '', $message); $message = preg_replace('/\[url\]|\[\/url\]/si', '', $message);
$message = ( strlen($message) > $return_chars ) ? substr($message, 0, $return_chars) . ' ...' : $message; $message = ( strlen($message) > $return_chars ) ? substr($message, 0, $return_chars) . ' ...' : $message;
if( count($search_string) ) if ( count($search_string) )
{ {
$message = preg_replace($search_string, $replace_string, $message); $message = preg_replace($search_string, $replace_string, $message);
} }
} }
else else
{ {
if( !$board_config['allow_html'] ) if ( !$board_config['allow_html'] )
{ {
if( $postrow[$i]['enable_html'] ) if ( $postrow[$i]['enable_html'] )
{ {
$message = preg_replace('#(<)([\/]?.*?)(>)#is', '&lt;\\2&gt;', $message); $message = preg_replace('#(<)([\/]?.*?)(>)#is', '&lt;\\2&gt;', $message);
} }
} }
if( $bbcode_uid != '' ) if ( $bbcode_uid != '' )
{ {
$message = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($message, $bbcode_uid) : preg_replace('/\:[0-9a-z\:]+\]/si', ']', $message); $message = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($message, $bbcode_uid) : preg_replace('/\:[0-9a-z\:]+\]/si', ']', $message);
} }
$message = make_clickable($message); $message = make_clickable($message);
if( count($search_string) ) if ( $highlight_active )
{ {
$message = preg_replace($search_string, $replace_string, $message); if ( preg_match('/<.*>/', $message) )
} {
$message = preg_replace($highlight_match, '<!-- #sh -->\1<!-- #eh -->', $message);
$end_html = 0;
$start_html = 1;
$temp_message = '';
$message = ' ' . $message . ' ';
while( $start_html = strpos($message, '<', $start_html) )
{
$grab_length = $start_html - $end_html - 1;
$temp_message .= substr($message, $end_html + 1, $grab_length);
if ( $end_html = strpos($message, '>', $start_html) )
{
$length = $end_html - $start_html + 1;
$hold_string = substr($message, $start_html, $length);
if ( strrpos(' ' . $hold_string, '<') != 1 )
{
$end_html = $start_html + 1;
$end_counter = 1;
while ( $end_counter && $end_html < strlen($message) )
{
if ( substr($message, $end_html, 1) == '>' )
{
$end_counter--;
}
else if ( substr($message, $end_html, 1) == '<' )
{
$end_counter++;
}
$end_html++;
}
$length = $end_html - $start_html + 1;
$hold_string = substr($message, $start_html, $length);
$hold_string = str_replace('<!-- #sh -->', '', $hold_string);
$hold_string = str_replace('<!-- #eh -->', '', $hold_string);
}
else if ( $hold_string == '<!-- #sh -->' )
{
$hold_string = str_replace('<!-- #sh -->', '<span style="color:#' . $theme['fontcolor3'] . '"><b>', $hold_string);
}
else if ( $hold_string == '<!-- #eh -->' )
{
$hold_string = str_replace('<!-- #eh -->', '</b></span>', $hold_string);
}
$temp_message .= $hold_string;
$start_html += $length;
}
else
{
$start_html = strlen($message);
}
}
$grab_length = strlen($message) - $end_html - 1;
$temp_message .= substr($message, $end_html + 1, $grab_length);
$message = trim($temp_message);
}
else
{
$message = preg_replace($highlight_match, '<span style="color:#' . $theme['fontcolor3'] . '"><b>\1</b></span>', $message);
}
}
} }
if( count($orig_word) ) if ( count($orig_word) )
{ {
$topic_title = preg_replace($orig_word, $replacement_word, $topic_title); $topic_title = preg_replace($orig_word, $replacement_word, $topic_title);
$post_subject = ( $searchset[$i]['post_subject'] != "" ) ? preg_replace($orig_word, $replacement_word, $searchset[$i]['post_subject']) : $topic_title; $post_subject = ( $searchset[$i]['post_subject'] != "" ) ? preg_replace($orig_word, $replacement_word, $searchset[$i]['post_subject']) : $topic_title;
@ -810,7 +859,7 @@ else if( $search_keywords != '' || $search_author != '' || $search_id )
$post_subject = ( $searchset[$i]['post_subject'] != '' ) ? $searchset[$i]['post_subject'] : $topic_title; $post_subject = ( $searchset[$i]['post_subject'] != '' ) ? $searchset[$i]['post_subject'] : $topic_title;
} }
if($board_config['allow_smilies'] && $searchset[$i]['enable_smilies']) if ($board_config['allow_smilies'] && $searchset[$i]['enable_smilies'])
{ {
$message = smilies_pass($message); $message = smilies_pass($message);
} }
@ -823,29 +872,32 @@ else if( $search_keywords != '' || $search_author != '' || $search_id )
$poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? $searchset[$i]['username'] : ( ( $searchset[$i]['post_username'] != "" ) ? $searchset[$i]['post_username'] : $lang['Guest'] ); $poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? $searchset[$i]['username'] : ( ( $searchset[$i]['post_username'] != "" ) ? $searchset[$i]['post_username'] : $lang['Guest'] );
$poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? '</a>' : ''; $poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? '</a>' : '';
if( $userdata['session_logged_in'] && $searchset[$i]['post_time'] > $userdata['user_lastvisit'] ) if ( $userdata['session_logged_in'] && $searchset[$i]['post_time'] > $userdata['user_lastvisit'] )
{ {
if( !empty($tracking_topics[$topic_id]) && !empty($tracking_forums[$forum_id]) ) if ( !empty($tracking_topics[$topic_id]) && !empty($tracking_forums[$forum_id]) )
{ {
$topic_last_read = ( $tracking_topics[$topic_id] > $tracking_forums[$forum_id] ) ? $tracking_topics[$topic_id] : $tracking_forums[$forum_id]; $topic_last_read = ( $tracking_topics[$topic_id] > $tracking_forums[$forum_id] ) ? $tracking_topics[$topic_id] : $tracking_forums[$forum_id];
} }
else if( !empty($tracking_topics[$topic_id]) || !empty($tracking_forums[$forum_id]) ) else if ( !empty($tracking_topics[$topic_id]) || !empty($tracking_forums[$forum_id]) )
{ {
$topic_last_read = ( !empty($tracking_topics[$topic_id]) ) ? $tracking_topics[$topic_id] : $tracking_forums[$forum_id]; $topic_last_read = ( !empty($tracking_topics[$topic_id]) ) ? $tracking_topics[$topic_id] : $tracking_forums[$forum_id];
} }
if( $searchset[$i]['post_time'] > $topic_last_read ) if ( $searchset[$i]['post_time'] > $topic_last_read )
{ {
$mini_post_img = '<img src="' . $images['icon_minipost_new'] . '" alt="' . $lang['New_post'] . '" title="' . $lang['New_post'] . '" border="0" />'; $mini_post_img = $images['icon_minipost_new'];
$mini_post_alt = $lang['New_post'];
} }
else else
{ {
$mini_post_img = '<img src="' . $images['icon_minipost'] . '" alt="' . $lang['Post'] . '" title="' . $lang['Post'] . '" border="0" />'; $mini_post_img = $images['icon_minipost'];
$mini_post_alt = $lang['Post'];
} }
} }
else else
{ {
$mini_post_img = '<img src="' . $images['icon_minipost'] . '" alt="' . $lang['Post'] . '" title="' . $lang['Post'] . '" border="0" />'; $mini_post_img = $images['icon_minipost'];
$mini_post_alt = $lang['Post'];
} }
$template->assign_block_vars("searchresults", array( $template->assign_block_vars("searchresults", array(
@ -857,9 +909,10 @@ else if( $search_keywords != '' || $search_author != '' || $search_id )
'TOPIC_REPLIES' => $searchset[$i]['topic_replies'], 'TOPIC_REPLIES' => $searchset[$i]['topic_replies'],
'TOPIC_VIEWS' => $searchset[$i]['topic_views'], 'TOPIC_VIEWS' => $searchset[$i]['topic_views'],
'MESSAGE' => $message, 'MESSAGE' => $message,
'MINI_POST_IMG' => $mini_post_img, 'MINI_POST_IMG' => $mini_post_img,
'L_MINI_POST_ALT' => $mini_post_alt,
'U_POST' => $post_url, 'U_POST' => $post_url,
'U_TOPIC' => $topic_url, 'U_TOPIC' => $topic_url,
'U_FORUM' => $forum_url) 'U_FORUM' => $forum_url)
@ -869,27 +922,27 @@ else if( $search_keywords != '' || $search_author != '' || $search_id )
{ {
$message = ''; $message = '';
if( count($orig_word) ) if ( count($orig_word) )
{ {
$topic_title = preg_replace($orig_word, $replacement_word, $searchset[$i]['topic_title']); $topic_title = preg_replace($orig_word, $replacement_word, $searchset[$i]['topic_title']);
} }
$topic_type = $searchset[$i]['topic_type']; $topic_type = $searchset[$i]['topic_type'];
if($topic_type == POST_ANNOUNCE) if ($topic_type == POST_ANNOUNCE)
{ {
$topic_type = $lang['Topic_Announcement'] . ' '; $topic_type = $lang['Topic_Announcement'] . ' ';
} }
else if($topic_type == POST_STICKY) else if ($topic_type == POST_STICKY)
{ {
$topic_type = $lang['Topic_Sticky'] . ' '; $topic_type = $lang['Topic_Sticky'] . ' ';
} }
else else
{ {
$topic_type = ""; $topic_type = '';
} }
if( $searchset[$i]['topic_vote'] ) if ( $searchset[$i]['topic_vote'] )
{ {
$topic_type .= $lang['Topic_Poll'] . ' '; $topic_type .= $lang['Topic_Poll'] . ' ';
} }
@ -897,7 +950,7 @@ else if( $search_keywords != '' || $search_author != '' || $search_id )
$views = $searchset[$i]['topic_views']; $views = $searchset[$i]['topic_views'];
$replies = $searchset[$i]['topic_replies']; $replies = $searchset[$i]['topic_replies'];
if( ( $replies + 1 ) > $board_config['posts_per_page'] ) if ( ( $replies + 1 ) > $board_config['posts_per_page'] )
{ {
$total_pages = ceil( ( $replies + 1 ) / $board_config['posts_per_page'] ); $total_pages = ceil( ( $replies + 1 ) / $board_config['posts_per_page'] );
$goto_page = ' [ <img src="' . $images['icon_gotopost'] . '" alt="' . $lang['Goto_page'] . '" title="' . $lang['Goto_page'] . '" />' . $lang['Goto_page'] . ': '; $goto_page = ' [ <img src="' . $images['icon_gotopost'] . '" alt="' . $lang['Goto_page'] . '" title="' . $lang['Goto_page'] . '" />' . $lang['Goto_page'] . ': ';
@ -906,7 +959,7 @@ else if( $search_keywords != '' || $search_author != '' || $search_id )
for($j = 0; $j < $replies + 1; $j += $board_config['posts_per_page']) for($j = 0; $j < $replies + 1; $j += $board_config['posts_per_page'])
{ {
$goto_page .= '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $topic_id . "&amp;start=$j") . '">' . $times . '</a>'; $goto_page .= '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=" . $topic_id . "&amp;start=$j") . '">' . $times . '</a>';
if( $times == 1 && $total_pages > 4 ) if ( $times == 1 && $total_pages > 4 )
{ {
$goto_page .= ' ... '; $goto_page .= ' ... ';
$times = $total_pages - 3; $times = $total_pages - 3;
@ -925,7 +978,7 @@ else if( $search_keywords != '' || $search_author != '' || $search_id )
$goto_page = ''; $goto_page = '';
} }
if( $searchset[$i]['topic_status'] == TOPIC_MOVED ) if ( $searchset[$i]['topic_status'] == TOPIC_MOVED )
{ {
$topic_type = $lang['Topic_Moved'] . ' '; $topic_type = $lang['Topic_Moved'] . ' ';
$topic_id = $searchset[$i]['topic_moved_id']; $topic_id = $searchset[$i]['topic_moved_id'];
@ -935,24 +988,24 @@ else if( $search_keywords != '' || $search_author != '' || $search_id )
} }
else else
{ {
if( $searchset[$i]['topic_status'] == TOPIC_LOCKED ) if ( $searchset[$i]['topic_status'] == TOPIC_LOCKED )
{ {
$folder = $images['folder_locked']; $folder = $images['folder_locked'];
$folder_new = $images['folder_locked_new']; $folder_new = $images['folder_locked_new'];
} }
else if( $searchset[$i]['topic_type'] == POST_ANNOUNCE ) else if ( $searchset[$i]['topic_type'] == POST_ANNOUNCE )
{ {
$folder = $images['folder_announce']; $folder = $images['folder_announce'];
$folder_new = $images['folder_announce_new']; $folder_new = $images['folder_announce_new'];
} }
else if( $searchset[$i]['topic_type'] == POST_STICKY ) else if ( $searchset[$i]['topic_type'] == POST_STICKY )
{ {
$folder = $images['folder_sticky']; $folder = $images['folder_sticky'];
$folder_new = $images['folder_sticky_new']; $folder_new = $images['folder_sticky_new'];
} }
else else
{ {
if( $replies >= $board_config['hot_threshold'] ) if ( $replies >= $board_config['hot_threshold'] )
{ {
$folder = $images['folder_hot']; $folder = $images['folder_hot'];
$folder_new = $images['folder_hot_new']; $folder_new = $images['folder_hot_new'];
@ -964,42 +1017,43 @@ else if( $search_keywords != '' || $search_author != '' || $search_id )
} }
} }
if( $userdata['session_logged_in'] ) if ( $userdata['session_logged_in'] )
{ {
if( $searchset[$i]['post_time'] > $userdata['user_lastvisit'] ) if ( $searchset[$i]['post_time'] > $userdata['user_lastvisit'] )
{ {
if( !empty($tracking_topics) || !empty($tracking_forums) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) ) if ( !empty($tracking_topics) || !empty($tracking_forums) || isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) )
{ {
$unread_topics = true; $unread_topics = true;
if( !empty($tracking_topics[$topic_id]) ) if ( !empty($tracking_topics[$topic_id]) )
{ {
if( $tracking_topics[$topic_id] > $searchset[$i]['post_time'] ) if ( $tracking_topics[$topic_id] > $searchset[$i]['post_time'] )
{ {
$unread_topics = false; $unread_topics = false;
} }
} }
if( !empty($tracking_forums[$forum_id]) ) if ( !empty($tracking_forums[$forum_id]) )
{ {
if( $tracking_forums[$forum_id] > $searchset[$i]['post_time'] ) if ( $tracking_forums[$forum_id] > $searchset[$i]['post_time'] )
{ {
$unread_topics = false; $unread_topics = false;
} }
} }
if( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) ) if ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all']) )
{ {
if( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all'] > $searchset[$i]['post_time'] ) if ( $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_f_all'] > $searchset[$i]['post_time'] )
{ {
$unread_topics = false; $unread_topics = false;
} }
} }
if( $unread_topics ) if ( $unread_topics )
{ {
$folder_image = '<img src="' . $folder_new . '" alt="' . $lang['New_posts'] . '" title="' . $lang['New_posts'] . '" />'; $folder_image = $folder_new;
$folder_alt = $lang['New_posts'];
$newest_post_img = '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=newest") . '"><img src="' . $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> '; $newest_post_img = '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=newest") . '"><img src="' . $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> ';
} }
@ -1007,50 +1061,54 @@ else if( $search_keywords != '' || $search_author != '' || $search_id )
{ {
$folder_alt = ( $searchset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts']; $folder_alt = ( $searchset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
$folder_image = "<img src=\"$folder\" alt=\"$folder_alt\" title=\"$folder_alt\" border=\"0\" />"; $folder_image = $folder;
$folder_alt = $folder_alt;
$newest_post_img = ''; $newest_post_img = '';
} }
} }
else if( $searchset[$i]['post_time'] > $userdata['user_lastvisit'] ) else if ( $searchset[$i]['post_time'] > $userdata['user_lastvisit'] )
{ {
$folder_image = '<img src="' . $folder_new . '" alt="' . $lang['New_posts'] . '" title="' . $lang['New_posts'] . '" />'; $folder_image = $folder_new;
$folder_alt = $lang['New_posts'];
$newest_post_img = '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=newest") . '"><img src="' . $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> '; $newest_post_img = '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=newest") . '"><img src="' . $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> ';
} }
else else
{ {
$folder_image = $folder;
$folder_alt = ( $searchset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts']; $folder_alt = ( $searchset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
$folder_image = "<img src=\"$folder\" alt=\"$folder_alt\" title=\"$folder_alt\" border=\"0\" />"; $newest_post_img = '';
$newest_post_img = "";
} }
} }
else else
{ {
$folder_image = $folder;
$folder_alt = ( $searchset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts']; $folder_alt = ( $searchset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
$folder_image = "<img src=\"$folder\" alt=\"$folder_alt\" title=\"$folder_alt\" border=\"0\" />"; $newest_post_img = '';
$newest_post_img = "";
} }
} }
else else
{ {
$folder_image = $folder;
$folder_alt = ( $searchset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts']; $folder_alt = ( $searchset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
$folder_image = "<img src=\"$folder\" alt=\"$folder_alt\" title=\"$folder_alt\" border=\"0\" />"; $newest_post_img = '';
$newest_post_img = "";
} }
} }
$topic_poster = ( $searchset[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $searchset[$i]['user_id']) . '">' : '';
$topic_poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? $searchset[$i]['username'] : ( ( $searchset[$i]['post_username'] != '' ) ? $searchset[$i]['post_username'] : $lang['Guest'] ); $topic_author = ( $searchset[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . '=' . $searchset[$i]['user_id']) . '">' : '';
$topic_poster .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? '</a>' : ''; $topic_author .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? $searchset[$i]['username'] : ( ( $searchset[$i]['post_username'] != '' ) ? $searchset[$i]['post_username'] : $lang['Guest'] );
$topic_author .= ( $searchset[$i]['user_id'] != ANONYMOUS ) ? '</a>' : '';
$first_post_time = create_date($board_config['default_dateformat'], $searchset[$i]['topic_time'], $board_config['board_timezone']);
$last_post_time = create_date($board_config['default_dateformat'], $searchset[$i]['post_time'], $board_config['board_timezone']); $last_post_time = create_date($board_config['default_dateformat'], $searchset[$i]['post_time'], $board_config['board_timezone']);
$last_post_user = ( $searchset[$i]['id2'] == ANONYMOUS && $searchset[$i]['post_username'] != '' ) ? $searchset[$i]['post_username'] : $searchset[$i]['user2']; $last_post_author = ( $searchset[$i]['id2'] == ANONYMOUS ) ? ( ($searchset[$i]['post_username2'] != '' ) ? $searchset[$i]['post_username2'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . '=' . $searchset[$i]['id2']) . '">' . $searchset[$i]['user2'] . '</a>';
$last_post = $last_post_time . '<br />'; $last_post_url = '<a href="' . append_sid("viewtopic.$phpEx?" . POST_POST_URL . '=' . $searchset[$i]['topic_last_post_id']) . '#' . $searchset[$i]['topic_last_post_id'] . '"><img src="' . $images['icon_latest_reply'] . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>';
$last_post .= ( $searchset[$i]['id2'] == ANONYMOUS ) ? ( ($searchset[$i]['post_username'] != '' ) ? $searchset[$i]['post_username'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $searchset[$i]['id2']) . '">' . $searchset[$i]['user2'] . '</a> ';
$last_post .= '<a href="' . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=" . $searchset[$i]['topic_last_post_id']) . '#' . $searchset[$i]['topic_last_post_id'] . '"><img src="' . $images['icon_latest_reply'] . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>';
$template->assign_block_vars('searchresults', array( $template->assign_block_vars('searchresults', array(
'FORUM_NAME' => $searchset[$i]['forum_name'], 'FORUM_NAME' => $searchset[$i]['forum_name'],
@ -1058,17 +1116,22 @@ else if( $search_keywords != '' || $search_author != '' || $search_id )
'TOPIC_ID' => $topic_id, 'TOPIC_ID' => $topic_id,
'FOLDER' => $folder_image, 'FOLDER' => $folder_image,
'NEWEST_POST_IMG' => $newest_post_img, 'NEWEST_POST_IMG' => $newest_post_img,
'TOPIC_POSTER' => $topic_poster, 'TOPIC_FOLDER_IMG' => $folder_image,
'GOTO_PAGE' => $goto_page, 'GOTO_PAGE' => $goto_page,
'REPLIES' => $replies, 'REPLIES' => $replies,
'TOPIC_TITLE' => $topic_title, 'TOPIC_TITLE' => $topic_title,
'TOPIC_TYPE' => $topic_type, 'TOPIC_TYPE' => $topic_type,
'VIEWS' => $views, 'VIEWS' => $views,
'LAST_POST' => $last_post, 'TOPIC_AUTHOR' => $topic_author,
'FIRST_POST_TIME' => $first_post_time,
'LAST_POST_TIME' => $last_post_time,
'LAST_POST_AUTHOR' => $last_post_author,
'LAST_POST_IMG' => $last_post_url,
'L_TOPIC_FOLDER_ALT' => $folder_alt,
'U_VIEW_FORUM' => $forum_url, 'U_VIEW_FORUM' => $forum_url,
'U_VIEW_TOPIC' => $topic_url, 'U_VIEW_TOPIC' => $topic_url)
'U_TOPIC_POSTER_PROFILE' => append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $searchset[$i]['user_id']))
); );
} }
} }
@ -1079,6 +1142,17 @@ else if( $search_keywords != '' || $search_author != '' || $search_id )
'PAGINATION' => generate_pagination($base_url, $total_match_count, $per_page, $start), 'PAGINATION' => generate_pagination($base_url, $total_match_count, $per_page, $start),
'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $per_page ) + 1 ), ceil( $total_match_count / $per_page )), 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $per_page ) + 1 ), ceil( $total_match_count / $per_page )),
'L_AUTHOR' => $lang['Author'],
'L_MESSAGE' => $lang['Message'],
'L_FORUM' => $lang['Forum'],
'L_TOPICS' => $lang['Topics'],
'L_REPLIES' => $lang['Replies'],
'L_VIEWS' => $lang['Views'],
'L_POSTS' => $lang['Posts'],
'L_LASTPOST' => $lang['Last_Post'],
'L_POSTED' => $lang['Posted'],
'L_SUBJECT' => $lang['Subject'],
'L_GOTO_PAGE' => $lang['Goto_page']) 'L_GOTO_PAGE' => $lang['Goto_page'])
); );
@ -1096,7 +1170,7 @@ $sql = "SELECT c.cat_title, c.cat_id, f.forum_name, f.forum_id
WHERE f.cat_id = c.cat_id WHERE f.cat_id = c.cat_id
ORDER BY c.cat_id, f.forum_order"; ORDER BY c.cat_id, f.forum_order";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
if( !$result ) if ( !$result )
{ {
message_die(GENERAL_ERROR, 'Could not obtain forum_name/forum_id', '', __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not obtain forum_name/forum_id', '', __LINE__, __FILE__, $sql);
} }
@ -1106,17 +1180,17 @@ $is_auth_ary = auth(AUTH_READ, AUTH_LIST_ALL, $userdata);
$s_forums = ''; $s_forums = '';
while( $row = $db->sql_fetchrow($result) ) while( $row = $db->sql_fetchrow($result) )
{ {
if( $is_auth_ary[$row['forum_id']]['auth_read'] ) if ( $is_auth_ary[$row['forum_id']]['auth_read'] )
{ {
$s_forums .= '<option value="' . $row['forum_id'] . '">' . $row['forum_name'] . '</option>'; $s_forums .= '<option value="' . $row['forum_id'] . '">' . $row['forum_name'] . '</option>';
if( empty($list_cat[$row['cat_id']]) ) if ( empty($list_cat[$row['cat_id']]) )
{ {
$list_cat[$row['cat_id']] = $row['cat_title']; $list_cat[$row['cat_id']] = $row['cat_title'];
} }
} }
} }
if( $s_forums != '' ) if ( $s_forums != '' )
{ {
$s_forums = '<option value="-1">' . $lang['All_available'] . '</option>' . $s_forums; $s_forums = '<option value="-1">' . $lang['All_available'] . '</option>' . $s_forums;
@ -1177,20 +1251,9 @@ $page_title = $lang['Search'];
include($phpbb_root_path . 'includes/page_header.'.$phpEx); include($phpbb_root_path . 'includes/page_header.'.$phpEx);
$template->set_filenames(array( $template->set_filenames(array(
'body' => 'search_body.tpl', 'body' => 'search_body.tpl')
'jumpbox' => 'jumpbox.tpl')
); );
make_jumpbox('viewforum.'.$phpEx);
$jumpbox = make_jumpbox();
$template->assign_vars(array(
'L_GO' => $lang['Go'],
'L_JUMP_TO' => $lang['Jump_to'],
'L_SELECT_FORUM' => $lang['Select_forum'],
'S_JUMPBOX_LIST' => $jumpbox,
'S_JUMPBOX_ACTION' => append_sid("viewforum.$phpEx"))
);
$template->assign_var_from_handle('JUMPBOX', 'jumpbox');
$template->assign_vars(array( $template->assign_vars(array(
'L_SEARCH_QUERY' => $lang['Search_query'], 'L_SEARCH_QUERY' => $lang['Search_query'],
@ -1211,6 +1274,9 @@ $template->assign_vars(array(
'L_SORT_DESCENDING' => $lang['Sort_Descending'], 'L_SORT_DESCENDING' => $lang['Sort_Descending'],
'L_SEARCH_PREVIOUS' => $lang['Search_previous'], 'L_SEARCH_PREVIOUS' => $lang['Search_previous'],
'L_DISPLAY_RESULTS' => $lang['Display_results'], 'L_DISPLAY_RESULTS' => $lang['Display_results'],
'L_FORUM' => $lang['Forum'],
'L_TOPICS' => $lang['Topics'],
'L_POSTS' => $lang['Posts'],
'S_SEARCH_ACTION' => append_sid("search.$phpEx?mode=results"), 'S_SEARCH_ACTION' => append_sid("search.$phpEx?mode=results"),
'S_CHARACTER_OPTIONS' => $s_characters, 'S_CHARACTER_OPTIONS' => $s_characters,

32
phpBB/templates/subSilver/agreement.tpl
View file

@ -1,21 +1,19 @@
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr> <tr>
<td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> <td align="left"><span class="nav"><a class="nav" href="{U_INDEX}">{L_INDEX}</a></span></td>
</tr> </tr>
</table> </table>
<table width="100%" border="0" cellspacing="1" cellpadding="3" class="forumline">
<tr> <table class="forumline" width="100%" cellspacing="1" cellpadding="3" border="0">
<th valign="middle" class="thHead" height="25"><span class="tableTitle">{SITENAME} <tr>
- {REGISTRATION}</span></th> <th class="thHead" height="25" valign="middle"><span class="tableTitle">{SITENAME} - {REGISTRATION}</span></th>
</tr> </tr>
<tr> <tr>
<td align="center" class="row1"> <td class="row1" align="center"><table width="80%" cellspacing="2" cellpadding="2" border="0" align="center">
<table width="80%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr>
<tr> <td><span class="genmed"><br />{AGREEMENT}<br /><br /><br /><div align="center"><a href="{U_AGREE_OVER13}" class="genmed">{AGREE_OVER_13}</a><br /><br /><a href="{U_AGREE_UNDER13}" class="genmed">{AGREE_UNDER_13}</a><br /><br /><a href="{U_INDEX}" class="genmed">{DO_NOT_AGREE}</a></div><br /></span></td>
<td><span class="genmed"><br />{AGREEMENT}<br /><br /><br /><div align="center"><a href="{U_AGREE_OVER13}" class="genmed">{AGREE_OVER_13}</a><br /><br /><a href="{U_AGREE_UNDER13}" class="genmed">{AGREE_UNDER_13}</a><br /><br /><a href="{U_INDEX}" class="genmed">{DO_NOT_AGREE}</a></div><br /></span></td> </tr>
</tr> </table></td>
</table> </tr>
</td>
</tr>
</table> </table>

110
phpBB/templates/subSilver/bbcode.tpl
View file

@ -1,108 +1,60 @@
<!-- BEGIN ulist_open --> <!-- BEGIN ulist_open --><ul><!-- END ulist_open -->
<ul> <!-- BEGIN ulist_close --></ul><!-- END ulist_close -->
<!-- END ulist_open -->
<!-- BEGIN ulist_close -->
</ul>
<!-- END ulist_close -->
<!-- BEGIN olist_open --><ol type="{LIST_TYPE}"><!-- END olist_open -->
<!-- BEGIN olist_close --></ol><!-- END olist_close -->
<!-- BEGIN olist_open --> <!-- BEGIN listitem --><li><!-- END listitem -->
<ol type="{LIST_TYPE}">
<!-- END olist_open -->
<!-- BEGIN olist_close -->
</ol>
<!-- END olist_close -->
<!-- BEGIN listitem --> <!-- BEGIN quote_username_open --></span>
<li> <table width="80%" cellspacing="1" cellpadding="3" border="0" align="center">
<!-- END listitem -->
<!-- BEGIN quote_username_open -->
</span>
<table border="0" align="center" width="90%" cellpadding="3" cellspacing="1">
<tr> <tr>
<td><span class="genmed"><b>{USERNAME} {L_WROTE}:</b></span></td> <td><span class="genmed"><b>{USERNAME} {L_WROTE}:</b></span></td>
</tr> </tr>
<tr> <tr>
<td class="quote"> <td class="quote"><!-- END quote_username_open -->
<!-- END quote_username_open --> <!-- BEGIN quote_open --></span>
<table width="80%" cellspacing="1" cellpadding="3" border="0" align="center">
<!-- BEGIN quote_open -->
</span>
<table border="0" align="center" width="90%" cellpadding="3" cellspacing="1">
<tr> <tr>
<td><span class="genmed"><b>{L_QUOTE}:</b></span></td> <td><span class="genmed"><b>{L_QUOTE}:</b></span></td>
</tr> </tr>
<tr> <tr>
<td class="quote"> <td class="quote"><!-- END quote_open -->
<!-- END quote_open --> <!-- BEGIN quote_close --></td>
<!-- BEGIN quote_close -->
</td>
</tr> </tr>
</table> </table>
<span class="postbody"> <span class="postbody"><!-- END quote_close -->
<!-- END quote_close -->
<!-- BEGIN code_open --> <!-- BEGIN code_open --></span>
</span> <table width="80%" cellspacing="1" cellpadding="3" border="0" align="center">
<table border="0" align="center" width="90%" cellpadding="3" cellspacing="1">
<tr> <tr>
<td><span class="genmed"><b>{L_CODE}:</b></span></td> <td><span class="genmed"><b>{L_CODE}:</b></span></td>
</tr> </tr>
<tr> <tr>
<td class="code"> <td class="code"><!-- END code_open -->
<!-- END code_open --> <!-- BEGIN code_close --></td>
<!-- BEGIN code_close -->
</td>
</tr> </tr>
</table> </table>
<span class="postbody"> <span class="postbody"><!-- END code_close -->
<!-- END code_close -->
<!-- BEGIN b_open --> <!-- BEGIN b_open --><span style="font-weight: bold"><!-- END b_open -->
<span style="font-weight: bold"> <!-- BEGIN b_close --></span><!-- END b_close -->
<!-- END b_open -->
<!-- BEGIN b_close -->
</span>
<!-- END b_close -->
<!-- BEGIN u_open --> <!-- BEGIN u_open --><span style="text-decoration: underline"><!-- END u_open -->
<span style="text-decoration: underline"> <!-- BEGIN u_close --></span><!-- END u_close -->
<!-- END u_open -->
<!-- BEGIN u_close -->
</span>
<!-- END u_close -->
<!-- BEGIN i_open --> <!-- BEGIN i_open --><span style="font-style: italic"><!-- END i_open -->
<span style="font-style: italic"> <!-- BEGIN i_close --></span><!-- END i_close -->
<!-- END i_open -->
<!-- BEGIN i_close -->
</span>
<!-- END i_close -->
<!-- BEGIN color_open --> <!-- BEGIN color_open --><span style="color: {COLOR}"><!-- END color_open -->
<span style="color: {COLOR}"> <!-- BEGIN color_close --></span><!-- END color_close -->
<!-- END color_open -->
<!-- BEGIN color_close -->
</span>
<!-- END color_close -->
<!-- BEGIN size_open --> <!-- BEGIN size_open --><span style="font-size: {SIZE}px; line-height: normal"><!-- END size_open -->
<span style="font-size: {SIZE}px; line-height: normal"> <!-- BEGIN size_close --></span><!-- END size_close -->
<!-- END size_open -->
<!-- BEGIN size_close -->
</span>
<!-- END size_close -->
<!-- BEGIN img --> <!-- BEGIN img --><img src="{URL}" border="0" /><!-- END img -->
<img src="{URL}" border="0" />
<!-- END img -->
<!-- BEGIN url --> <!-- BEGIN url --><a href="{URL}" target="_blank" class="postlink">{DESCRIPTION}</a><!-- END url -->
<a href="{URL}" target="_blank" class="postlink">{DESCRIPTION}</a>
<!-- END url -->
<!-- BEGIN email --> <!-- BEGIN email --><a href="mailto:{EMAIL}">{EMAIL}</A><!-- END email -->
<a href="mailto:{EMAIL}">{EMAIL}</A>
<!-- END email -->

34
phpBB/templates/subSilver/confirm_body.tpl
View file

@ -1,21 +1,17 @@
<table width="100%" border="0" cellspacing="1" cellpadding="3" class="forumline"> <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr> <tr>
<th class="thHead" valign="middle" height="25"><span class="tableTitle">{MESSAGE_TITLE}</span></th> <td class="nav" align="left"><a class="nav" href="{U_INDEX}">{L_INDEX}</a></td>
</tr> </tr>
<tr>
<td class="row1" align="center">
<form action="{S_CONFIRM_ACTION}" method="POST">
<span class="gen"><br />
{MESSAGE_TEXT}<br />
<br />
{S_HIDDEN_FIELDS}
<input type="submit" name="confirm" value="{L_YES}" class="mainoption" />
&nbsp;&nbsp;
<input type="submit" name="cancel" value="{L_NO}" class="liteoption" />
</span>
</form>
</td>
</tr>
</table> </table>
<br />
<table class="forumline" width="100%" cellspacing="1" cellpadding="3" border="0">
<tr>
<th class="thHead" height="25" valign="middle"><span class="tableTitle">{MESSAGE_TITLE}</span></th>
</tr>
<tr>
<td class="row1" align="center"><form action="{S_CONFIRM_ACTION}" method="post"><span class="gen"><br />{MESSAGE_TEXT}<br /><br />{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{L_YES}" class="mainoption" />&nbsp;&nbsp;<input type="submit" name="cancel" value="{L_NO}" class="liteoption" /></span></form></td>
</tr>
</table>
<br clear="all" />

30
phpBB/templates/subSilver/error_body.tpl
View file

@ -1,20 +1,18 @@
<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline"> <table class="forumline" width="100%" cellspacing="1" cellpadding="4" border="0">
<tr> <tr>
<td> <td><table width="100%" cellspacing="0" cellpadding="1" border="0">
<table width="100%" border="0" cellspacing="0" cellpadding="1"> <tr>
<tr> <td>&nbsp;</td>
<td>&nbsp;</td> </tr>
</tr> <tr>
<tr> <td align="center"><span class="error">{ERROR_MESSAGE}</span></td>
<td align="center"><span class="error">{ERROR_MESSAGE}</span></td> </tr>
</tr> <tr>
<tr> <td>&nbsp;</td>
<td>&nbsp;</td> </tr>
</tr> </table></td>
</table> </tr>
</td>
</tr>
</table> </table>
<br clear="all" /> <br clear="all" />

47
phpBB/templates/subSilver/faq_body.tpl
View file

@ -1,40 +1,43 @@
<table width="100%" cellspacing="2" cellpadding="2" border="0"> <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr> <tr>
<td align="left" valign="bottom" nowrap><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> <td align="left" class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></td>
</tr> </tr>
</table> </table>
<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline" align="center"> <table class="forumline" width="100%" cellspacing="1" cellpadding="3" border="0" align="center">
<tr> <tr>
<th class="thHead">{L_FAQ_TITLE}</th> <th class="thHead">{L_FAQ_TITLE}</th>
</tr> </tr>
<tr><td class="row1"> <tr>
<!-- BEGIN faq_block_link --> <td class="row1">
<span class="gen"><b>{faq_block_link.BLOCK_TITLE}</b><br /> </span> <!-- BEGIN faq_block_link -->
<!-- BEGIN faq_row_link --> <span class="gen"><b>{faq_block_link.BLOCK_TITLE}</b></span><br />
<span class="gen"><a href="{faq_block_link.faq_row_link.U_FAQ_LINK}" class="postlink">{faq_block_link.faq_row_link.FAQ_LINK}</a></span><br /> <!-- BEGIN faq_row_link -->
<!-- END faq_row_link --> <span class="gen"><a href="{faq_block_link.faq_row_link.U_FAQ_LINK}" class="postlink">{faq_block_link.faq_row_link.FAQ_LINK}</a></span><br />
<br /> <!-- END faq_row_link -->
<!-- END faq_block_link --> <br />
</td><tr> <!-- END faq_block_link -->
<td height="28" class="catBottom">&nbsp;</td> </td>
</tr>
<tr>
<td class="catBottom" height="28">&nbsp;</td>
</tr> </tr>
</table> </table>
<br clear="all" /> <br clear="all" />
<!-- BEGIN faq_block --> <!-- BEGIN faq_block -->
<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline" align="center"> <table class="forumline" width="100%" cellspacing="1" cellpadding="3" border="0" align="center">
<tr> <tr>
<td height="28" class="catHead" align="center"><span class="cattitle">{faq_block.BLOCK_TITLE}</span></td> <td class="catHead" height="28" align="center"><span class="cattitle">{faq_block.BLOCK_TITLE}</span></td>
</tr> </tr>
<!-- BEGIN faq_row --> <!-- BEGIN faq_row -->
<tr> <tr>
<td align="left" valign="top" class="{faq_block.faq_row.ROW_CLASS}"><span class="postbody"><a name="{faq_block.faq_row.U_FAQ_ID}"></a><b>{faq_block.faq_row.FAQ_QUESTION}</b></span><br /><span class="postbody">{faq_block.faq_row.FAQ_ANSWER}<br /><a href="#Top" class="postlink">{L_BACK_TO_TOP}</a></span></td> <td class="{faq_block.faq_row.ROW_CLASS}" align="left" valign="top"><span class="postbody"><a name="{faq_block.faq_row.U_FAQ_ID}"></a><b>{faq_block.faq_row.FAQ_QUESTION}</b></span><br /><span class="postbody">{faq_block.faq_row.FAQ_ANSWER}<br /><a class="postlink" href="#Top">{L_BACK_TO_TOP}</a></span></td>
</tr> </tr>
<tr> <tr>
<td height="1" class="spaceRow"><img src="templates/subSilver/images/spacer.gif" alt="" width="1" height="1" /></td> <td class="spaceRow" height="1"><img src="templates/subSilver/images/spacer.gif" alt="" width="1" height="1" /></td>
</tr> </tr>
<!-- END faq_row --> <!-- END faq_row -->
</table> </table>
@ -43,7 +46,7 @@
<!-- END faq_block --> <!-- END faq_block -->
<table width="100%" cellspacing="2" border="0" align="center"> <table width="100%" cellspacing="2" border="0" align="center">
<tr> <tr>
<td align="right" valign="middle" nowrap><span class="gensmall">{S_TIMEZONE}</span><br /><br />{JUMPBOX}</td> <td align="right" valign="middle" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><br /><br />{JUMPBOX}</td>
</tr> </tr>
</table> </table>

53
phpBB/templates/subSilver/groupcp_info_body.tpl
View file

@ -1,45 +1,48 @@
<form method="post" action="{S_GROUPCP_ACTION}"> <form action="{S_GROUPCP_ACTION}" method="post">
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr> <tr>
<td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> <td align="left" class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></td>
</tr> </tr>
</table> </table>
<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> <table class="forumline" width="100%" cellspacing="1" cellpadding="4" border="0">
<tr> <tr>
<th colspan="7" class="thHead" height="25"><span class="tableTitle">{L_GROUP_INFORMATION}</span></th> <th class="thHead" colspan="7" height="25"><span class="tableTitle">{L_GROUP_INFORMATION}</span></th>
</tr> </tr>
<tr> <tr>
<td class="row1" width="20%"><span class="gen">{L_GROUP_NAME}:</span></td> <td class="row1" width="20%"><span class="gen">{L_GROUP_NAME}:</span></td>
<td class="row2"><span class="gen"><b>{GROUP_NAME}</b></span></td> <td class="row2"><span class="gen"><b>{GROUP_NAME}</b></span></td>
</tr> </tr>
<tr> <tr>
<td class="row1" width="20%"><span class="gen">{L_GROUP_DESC}:</span></td> <td class="row1" width="20%"><span class="gen">{L_GROUP_DESC}:</span></td>
<td class="row2"><span class="gen">{GROUP_DESC}</span></td> <td class="row2"><span class="gen">{GROUP_DESC}</span></td>
</tr> </tr>
<tr> <tr>
<td class="row1" width="20%"><span class="gen">{L_GROUP_MEMBERSHIP}:</span></td> <td class="row1" width="20%"><span class="gen">{L_GROUP_MEMBERSHIP}:</span></td>
<td class="row2"><span class="gen">{GROUP_DETAILS} &nbsp;&nbsp; <td class="row2"><span class="gen">{GROUP_DETAILS} &nbsp;&nbsp;
<!-- BEGIN switch_subscribe_group_input --> <!-- BEGIN switch_subscribe_group_input -->
<input class="mainoption" type="submit" name="joingroup" value="{L_JOIN_GROUP}" /> <input class="mainoption" type="submit" name="joingroup" value="{L_JOIN_GROUP}" />
<!-- END switch_subscribe_group_input --> <!-- END switch_subscribe_group_input -->
<!-- BEGIN switch_unsubscribe_group_input --> <!-- BEGIN switch_unsubscribe_group_input -->
<input class="mainoption" type="submit" name="unsub" value="{L_UNSUBSCRIBE_GROUP}" /> <input class="mainoption" type="submit" name="unsub" value="{L_UNSUBSCRIBE_GROUP}" />
<!-- END switch_unsubscribe_group_input --> <!-- END switch_unsubscribe_group_input -->
</span></td> </span></td>
</tr> </tr>
<!-- BEGIN switch_mod_option --> <!-- BEGIN switch_mod_option -->
<tr> <tr>
<td class="row1" width="20%"><span class="gen">{L_GROUP_TYPE}:</span></td> <td class="row1" width="20%"><span class="gen">{L_GROUP_TYPE}:</span></td>
<td class="row2"><span class="gen"><span class="gen"><input type="radio" name="group_type" value="{S_GROUP_OPEN_TYPE}" {S_GROUP_OPEN_CHECKED} /> {L_GROUP_OPEN} &nbsp;&nbsp;<input type="radio" name="group_type" value="{S_GROUP_CLOSED_TYPE}" {S_GROUP_CLOSED_CHECKED} /> {L_GROUP_CLOSED} &nbsp;&nbsp;<input type="radio" name="group_type" value="{S_GROUP_HIDDEN_TYPE}" {S_GROUP_HIDDEN_CHECKED} /> {L_GROUP_HIDDEN} &nbsp;&nbsp; <input class="mainoption" type="submit" name="groupstatus" value="{L_UPDATE}" /></span></td> <td class="row2"><span class="gen"><span class="gen"><input type="radio" name="group_type" value="{S_GROUP_OPEN_TYPE}" {S_GROUP_OPEN_CHECKED} /> {L_GROUP_OPEN} &nbsp;&nbsp;<input type="radio" name="group_type" value="{S_GROUP_CLOSED_TYPE}" {S_GROUP_CLOSED_CHECKED} /> {L_GROUP_CLOSED} &nbsp;&nbsp;<input type="radio" name="group_type" value="{S_GROUP_HIDDEN_TYPE}" {S_GROUP_HIDDEN_CHECKED} /> {L_GROUP_HIDDEN} &nbsp;&nbsp; <input class="mainoption" type="submit" name="groupstatus" value="{L_UPDATE}" /></span></td>
</tr> </tr>
<!-- END switch_mod_option --> <!-- END switch_mod_option -->
</table> </table>
{S_HIDDEN_FIELDS} {S_HIDDEN_FIELDS}
</form> </form>
<form method="post" action="{S_GROUPCP_ACTION}" name="post"> <form action="{S_GROUPCP_ACTION}" method="post" name="post">
<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
<tr> <tr>
<th class="thCornerL" height="25">{L_PM}</th> <th class="thCornerL" height="25">{L_PM}</th>
@ -50,11 +53,9 @@
<th class="thTop">{L_WEBSITE}</th> <th class="thTop">{L_WEBSITE}</th>
<th class="thCornerR">{L_SELECT}</th> <th class="thCornerR">{L_SELECT}</th>
</tr> </tr>
<tr> <tr>
<td class="catSides" colspan="8" height="28"><span class="cattitle">{L_GROUP_MODERATOR}</span></td> <td class="catSides" colspan="8" height="28"><span class="cattitle">{L_GROUP_MODERATOR}</span></td>
</tr> </tr>
<tr> <tr>
<td class="row1" align="center"> {MOD_PM_IMG} </td> <td class="row1" align="center"> {MOD_PM_IMG} </td>
<td class="row1" align="center"><span class="gen"><a href="{U_MOD_VIEWPROFILE}" class="gen">{MOD_USERNAME}</a></span></td> <td class="row1" align="center"><span class="gen"><a href="{U_MOD_VIEWPROFILE}" class="gen">{MOD_USERNAME}</a></span></td>
@ -64,11 +65,9 @@
<td class="row1" align="center">{MOD_WWW_IMG}</td> <td class="row1" align="center">{MOD_WWW_IMG}</td>
<td class="row1" align="center"> &nbsp; </td> <td class="row1" align="center"> &nbsp; </td>
</tr> </tr>
<tr> <tr>
<td class="catSides" colspan="8" height="28"><span class="cattitle">{L_GROUP_MEMBERS}</span></td> <td class="catSides" colspan="8" height="28"><span class="cattitle">{L_GROUP_MEMBERS}</span></td>
</tr> </tr>
<!-- BEGIN member_row --> <!-- BEGIN member_row -->
<tr> <tr>
<td class="{member_row.ROW_CLASS}" align="center"> {member_row.PM_IMG} </td> <td class="{member_row.ROW_CLASS}" align="center"> {member_row.PM_IMG} </td>

16
phpBB/templates/subSilver/groupcp_user_body.tpl
View file

@ -6,11 +6,11 @@
</table> </table>
<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
<!-- BEGIN groups_joined --> <!-- BEGIN switch_groups_joined -->
<tr> <tr>
<th colspan="2" align="center" class="thHead" height="25">{L_GROUP_MEMBERSHIP_DETAILS}</th> <th colspan="2" align="center" class="thHead" height="25">{L_GROUP_MEMBERSHIP_DETAILS}</th>
</tr> </tr>
<!-- BEGIN groups_member --> <!-- BEGIN switch_groups_member -->
<tr> <tr>
<td class="row1"><span class="gen">{L_YOU_BELONG_GROUPS}</span></td> <td class="row1"><span class="gen">{L_YOU_BELONG_GROUPS}</span></td>
<td class="row2" align="right"> <td class="row2" align="right">
@ -24,8 +24,8 @@
</table> </table>
</td> </td>
</tr> </tr>
<!-- END groups_member --> <!-- END switch_groups_member -->
<!-- BEGIN groups_pending --> <!-- BEGIN switch_groups_pending -->
<tr> <tr>
<td class="row1"><span class="gen">{L_PENDING_GROUPS}</span></td> <td class="row1"><span class="gen">{L_PENDING_GROUPS}</span></td>
<td class="row2" align="right"> <td class="row2" align="right">
@ -39,9 +39,9 @@
</table> </table>
</td> </td>
</tr> </tr>
<!-- END groups_pending --> <!-- END switch_groups_pending -->
<!-- END groups_joined --> <!-- END switch_groups_joined -->
<!-- BEGIN groups_remaining --> <!-- BEGIN switch_groups_remaining -->
<tr> <tr>
<th colspan="2" align="center" class="thHead" height="25">{L_JOIN_A_GROUP}</th> <th colspan="2" align="center" class="thHead" height="25">{L_JOIN_A_GROUP}</th>
</tr> </tr>
@ -58,7 +58,7 @@
</table> </table>
</td> </td>
</tr> </tr>
<!-- END groups_remaining --> <!-- END switch_groups_remaining -->
</table> </table>
<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2"> <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">

4
phpBB/templates/subSilver/index_body.tpl
View file

@ -27,7 +27,7 @@
</tr> </tr>
<!-- BEGIN forumrow --> <!-- BEGIN forumrow -->
<tr> <tr>
<td class="row1" align="center" valign="middle" height="50">{catrow.forumrow.FOLDER}</td> <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 /> <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="genmed">{catrow.forumrow.FORUM_DESC}<br />
</span><span class="gensmall">{catrow.forumrow.L_MODERATOR} {catrow.forumrow.MODERATORS}</span></td> </span><span class="gensmall">{catrow.forumrow.L_MODERATOR} {catrow.forumrow.MODERATORS}</span></td>
@ -56,7 +56,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="row1" align="left"><span class="gensmall">{TOTAL_USERS_ONLINE} &nbsp; [ {L_WHOSONLINE_ADMIN} ] &nbsp; [ {L_WHOSONLINE_MOD} ]<br />{L_RECORD_USERS}<br />{LOGGED_IN_USER_LIST}</span></td> <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> </tr>
</table> </table>

10
phpBB/templates/subSilver/jumpbox.tpl
View file

@ -1,10 +1,6 @@
<form method="GET" name="jumpbox" action="{S_JUMPBOX_ACTION}" onSubmit="if(document.jumpbox.f.value == -1){return false;}"> <form method="get" name="jumpbox" action="{S_JUMPBOX_ACTION}" onSubmit="if(document.jumpbox.f.value == -1){return false;}"><table cellspacing="0" cellpadding="0" border="0">
<table cellspacing="0" cellpadding="0" border="0">
<tr> <tr>
<td nowrap="nowrap"><span class="gensmall">{L_JUMP_TO}:&nbsp;{S_JUMPBOX_LIST}&nbsp; <td nowrap="nowrap"><span class="gensmall">{L_JUMP_TO}:&nbsp;{S_JUMPBOX_SELECT}&nbsp;<input type="submit" value="{L_GO}" class="liteoption" /></span></td>
<input type="submit" value="{L_GO}" class="liteoption" />
</span></td>
</tr> </tr>
</table> </table></form>
</form>

2
phpBB/templates/subSilver/memberlist_body.tpl
View file

@ -44,7 +44,7 @@
<table width="100%" cellspacing="0" cellpadding="0" border="0"> <table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr> <tr>
<td><span class="nav">{PAGE_NUMBER}</span></td> <td><span class="nav">{PAGE_NUMBER}</span></td>
<td align="right"><span class="gensmall">{S_TIMEZONE}</span><br /><span class="nav">{PAGINATION}&nbsp;</span></td> <td align="right"><span class="gensmall">{S_TIMEZONE}</span><br /><span class="nav">{PAGINATION}</span></td>
</tr> </tr>
</table></form> </table></form>

46
phpBB/templates/subSilver/message_body.tpl
View file

@ -1,27 +1,27 @@
<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr> <tr>
<td align="left" class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></td> <td align="left" class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></td>
</tr> </tr>
</table> </table>
<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
<tr> <table class="forumline" width="100%" cellspacing="1" cellpadding="4" border="0">
<th height="25" class="thHead"><b>{MESSAGE_TITLE}</b></th> <tr>
</tr> <th class="thHead" height="25"><b>{MESSAGE_TITLE}</b></th>
<tr> </tr>
<td class="row1"> <tr>
<table width="100%" border="0" cellspacing="0" cellpadding="1"> <td class="row1"><table width="100%" cellspacing="0" cellpadding="1" border="0">
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td align="center"><span class="gen">{MESSAGE_TEXT}</span></td> <td align="center"><span class="gen">{MESSAGE_TEXT}</span></td>
</tr> </tr>
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
</table> </table></td>
</td> </tr>
</tr>
</table> </table>
<br />
<br clear="all" />

4
phpBB/templates/subSilver/modcp_body.tpl
View file

@ -23,10 +23,10 @@
</tr> </tr>
<!-- BEGIN topicrow --> <!-- BEGIN topicrow -->
<tr> <tr>
<td class="row1" align="center" valign="middle">{topicrow.FOLDER_IMG}</td> <td class="row1" align="center" valign="middle"><img src="{topicrow.TOPIC_FOLDER_IMG}" width="19" height="18" alt="{topicrow.L_TOPIC_FOLDER_ALT}" title="{topicrow.L_TOPIC_FOLDER_ALT}" /></td>
<td class="row1">&nbsp;<span class="topictitle">{topicrow.TOPIC_TYPE}<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a></span></td> <td class="row1">&nbsp;<span class="topictitle">{topicrow.TOPIC_TYPE}<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a></span></td>
<td class="row2" align="center" valign="middle"><span class="postdetails">{topicrow.REPLIES}</span></td> <td class="row2" align="center" valign="middle"><span class="postdetails">{topicrow.REPLIES}</span></td>
<td class="row1" align="center" valign="middle"><span class="postdetails">{topicrow.LAST_POST}</span></td> <td class="row1" align="center" valign="middle"><span class="postdetails">{topicrow.LAST_POST_TIME}</span></td>
<td class="row2" align="center" valign="middle"> <td class="row2" align="center" valign="middle">
<input type="checkbox" name="topic_id_list[]" value="{topicrow.TOPIC_ID}" /> <input type="checkbox" name="topic_id_list[]" value="{topicrow.TOPIC_ID}" />
</td> </td>

2
phpBB/templates/subSilver/modcp_move.tpl
View file

@ -16,7 +16,7 @@
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td align="center"><span class="gen">{L_MOVE_TO_FORUM} &nbsp; {S_FORUM_BOX}<br /><br /> <td align="center"><span class="gen">{L_MOVE_TO_FORUM} &nbsp; {S_FORUM_SELECT}<br /><br />
<input type="checkbox" name="move_leave_shadow" checked="checked" />{L_LEAVESHADOW}<br /> <input type="checkbox" name="move_leave_shadow" checked="checked" />{L_LEAVESHADOW}<br />
<br /> <br />
{MESSAGE_TEXT}</span><br /> {MESSAGE_TEXT}</span><br />

4
phpBB/templates/subSilver/modcp_split.tpl
View file

@ -48,7 +48,7 @@
<td width="100%" valign="top" class="{postrow.ROW_CLASS}"> <td width="100%" valign="top" class="{postrow.ROW_CLASS}">
<table width="100%" cellspacing="0" cellpadding="3" border="0"> <table width="100%" cellspacing="0" cellpadding="3" border="0">
<tr> <tr>
<td valign="middle"><img src="templates/subSilver/images/icon_minipost.gif" alt="Post image icon"><span class="postdetails">{L_POSTED}: <td valign="middle"><img src="templates/subSilver/images/icon_minipost.gif" alt="{L_POST}"><span class="postdetails">{L_POSTED}:
{postrow.POST_DATE}&nbsp;&nbsp;&nbsp;&nbsp;{L_POST_SUBJECT}: {postrow.POST_SUBJECT}</span></td> {postrow.POST_DATE}&nbsp;&nbsp;&nbsp;&nbsp;{L_POST_SUBJECT}: {postrow.POST_SUBJECT}</span></td>
</tr> </tr>
<tr> <tr>
@ -58,7 +58,7 @@
</tr> </tr>
</table> </table>
</td> </td>
<td width="5%" align="center" class="{postrow.ROW_CLASS}">{postrow.SPLIT_CHECKBOX}</td> <td width="5%" align="center" class="{postrow.ROW_CLASS}">{postrow.S_SPLIT_CHECKBOX}</td>
</tr> </tr>
<tr> <tr>
<td colspan="3" height="1" class="row3"><img src="templates/subSilver/images/spacer.gif" width="1" height="1" alt="."></td> <td colspan="3" height="1" class="row3"><img src="templates/subSilver/images/spacer.gif" width="1" height="1" alt="."></td>

6
phpBB/templates/subSilver/modcp_viewip.tpl
View file

@ -16,7 +16,7 @@
<td class="row1"> <td class="row1">
<table width="100%" cellspacing="0" cellpadding="0" border="0"> <table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr> <tr>
<td>&nbsp;<span class="gen">{IP} ({POSTINGS})</span></td> <td>&nbsp;<span class="gen">{IP} [ {POSTS} ]</span></td>
<td align="right"><span class="gen">[ <a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a> <td align="right"><span class="gen">[ <a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a>
]&nbsp;</span></td> ]&nbsp;</span></td>
</tr> </tr>
@ -31,7 +31,7 @@
<td class="{userrow.ROW_CLASS}"> <td class="{userrow.ROW_CLASS}">
<table width="100%" cellspacing="0" cellpadding="0" border="0"> <table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr> <tr>
<td>&nbsp;<span class="gen"><a href="{userrow.U_PROFILE}">{userrow.USERNAME}</a> ({userrow.POSTINGS})</span></td> <td>&nbsp;<span class="gen"><a href="{userrow.U_PROFILE}">{userrow.USERNAME}</a> [ {userrow.POSTS} ]</span></td>
<td align="right"><a href="{userrow.U_SEARCHPOSTS}" title="{userrow.L_SEARCH_POSTS}"><img src="{SEARCH_IMG}" border="0" alt="{L_SEARCH}" /></a> <td align="right"><a href="{userrow.U_SEARCHPOSTS}" title="{userrow.L_SEARCH_POSTS}"><img src="{SEARCH_IMG}" border="0" alt="{L_SEARCH}" /></a>
&nbsp;</td> &nbsp;</td>
</tr> </tr>
@ -46,7 +46,7 @@
<tr> <tr>
<td class="{iprow.ROW_CLASS}"><table width="100%" cellspacing="0" cellpadding="0" border="0"> <td class="{iprow.ROW_CLASS}"><table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr> <tr>
<td>&nbsp;<span class="gen">{iprow.IP} ({iprow.POSTINGS})</span></td> <td>&nbsp;<span class="gen">{iprow.IP} [ {iprow.POSTS} ]</span></td>
<td align="right"><span class="gen">[ <a href="{iprow.U_LOOKUP_IP}">{L_LOOKUP_IP}</a> <td align="right"><span class="gen">[ <a href="{iprow.U_LOOKUP_IP}">{L_LOOKUP_IP}</a>
]&nbsp;</span></td> ]&nbsp;</span></td>
</tr> </tr>

33
phpBB/templates/subSilver/overall_footer.tpl
View file

@ -1,26 +1,19 @@
<div align="center"> <span class="copyright"><br />{ADMIN_LINK}<br /> <div align="center"><span class="copyright"><br />{ADMIN_LINK}<br />
<!-- <!--
We request you retain the full copyright notice below including the link to www.phpbb.com.
Please note that the following copyright notice This not only gives respect to the large amount of time given freely by the developers
MUST be displayed on each and every page output but also helps build interest, traffic and use of phpBB 2.0. If you cannot (for good
by phpBB. You may alter the font, colour etc. but reason) retain the full copyright we request you at least leave in place the
you CANNOT remove it, nor change it so that it be, Powered by phpBB {PHPBB_VERSION} line, with phpBB linked to www.phpbb.com. If you refuse
to all intents and purposes, invisible. You may ADD to include even this then support on our forums may be affected.
your own notice to it should you have altered the
code but you may not replace it. The hyperlink must
also remain intact. These conditions are part of the
licence this software is released under. See the
LICENCE and README files for more information.
The phpBB Group : 2001
The phpBB Group : 2002
// --> // -->
Powered by phpBB {PHPBB_VERSION} &copy; 2001 <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB Powered by <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} &copy; 2001 phpBB Group<br />{TRANSLATION_INFO}</span></div>
Group</a><br />{TRANSLATION_INFO}</span></div> </td>
</td> </tr>
</tr>
</table> </table>
&nbsp;
</body> </body>
</html> </html>

85
phpBB/templates/subSilver/overall_header.tpl
View file

@ -1,5 +1,4 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<!-- DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" -->
<html dir="{S_CONTENT_DIRECTION}"> <html dir="{S_CONTENT_DIRECTION}">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}"> <meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}">
@ -10,7 +9,6 @@
<!-- link rel="stylesheet" href="templates/subSilver/{T_HEAD_STYLESHEET}" type="text/css" --> <!-- link rel="stylesheet" href="templates/subSilver/{T_HEAD_STYLESHEET}" type="text/css" -->
<style type="text/css"> <style type="text/css">
<!-- <!--
/* /*
The original subSilver Theme for phpBB version 2+ The original subSilver Theme for phpBB version 2+
Created by subBlue design Created by subBlue design
@ -21,8 +19,7 @@
and place it in an external file, deleting this section to save bandwidth. and place it in an external file, deleting this section to save bandwidth.
*/ */
/* General page style. The scroll bar colours only visible in IE5.5+ */
/* General page style. The scroll bar colours only visible in IE5.5+ */
body { body {
background-color: {T_BODY_BGCOLOR}; background-color: {T_BODY_BGCOLOR};
scrollbar-face-color: {T_TR_COLOR2}; scrollbar-face-color: {T_TR_COLOR2};
@ -40,20 +37,17 @@ a:link,a:active,a:visited { color : {T_BODY_LINK}; }
a:hover { text-decoration: underline; color : {T_BODY_HLINK}; } a:hover { text-decoration: underline; color : {T_BODY_HLINK}; }
hr { height: 0px; border: solid {T_TR_COLOR3} 0px; border-top-width: 1px;} hr { height: 0px; border: solid {T_TR_COLOR3} 0px; border-top-width: 1px;}
/* This is the border line & background colour round the entire page */ /* This is the border line & background colour round the entire page */
.bodyline { background-color: {T_TD_COLOR2}; border: 1px {T_TH_COLOR1} solid; } .bodyline { background-color: {T_TD_COLOR2}; border: 1px {T_TH_COLOR1} solid; }
/* This is the outline round the main forum tables */ /* This is the outline round the main forum tables */
.forumline { background-color: {T_TD_COLOR2}; border: 2px {T_TH_COLOR2} solid; } .forumline { background-color: {T_TD_COLOR2}; border: 2px {T_TH_COLOR2} solid; }
/* Main table cell colours and backgrounds */ /* Main table cell colours and backgrounds */
td.row1 { background-color: {T_TR_COLOR1}; } td.row1 { background-color: {T_TR_COLOR1}; }
td.row2 { background-color: {T_TR_COLOR2}; } td.row2 { background-color: {T_TR_COLOR2}; }
td.row3 { background-color: {T_TR_COLOR3}; } td.row3 { background-color: {T_TR_COLOR3}; }
/* /*
This is for the table cell above the Topics, Post & Last posts on the index.php page This is for the table cell above the Topics, Post & Last posts on the index.php page
By default this is the fading out gradiated silver background. By default this is the fading out gradiated silver background.
@ -77,7 +71,6 @@ td.cat,td.catHead,td.catSides,td.catLeft,td.catRight,td.catBottom {
background-color:{T_TR_COLOR3}; border: {T_TH_COLOR3}; border-style: solid; height: 28px; background-color:{T_TR_COLOR3}; border: {T_TH_COLOR3}; border-style: solid; height: 28px;
} }
/* /*
Setting additional nice inner borders for the main table cells. Setting additional nice inner borders for the main table cells.
The names indicate which sides the border will be on. The names indicate which sides the border will be on.
@ -88,9 +81,11 @@ td.cat,td.catHead,td.catBottom {
border-width: 0px 0px 0px 0px; border-width: 0px 0px 0px 0px;
} }
th.thHead,th.thSides,th.thTop,th.thLeft,th.thRight,th.thBottom,th.thCornerL,th.thCornerR { th.thHead,th.thSides,th.thTop,th.thLeft,th.thRight,th.thBottom,th.thCornerL,th.thCornerR {
font-weight: bold; border: {T_TD_COLOR2}; border-style: solid; height: 28px; } font-weight: bold; border: {T_TD_COLOR2}; border-style: solid; height: 28px;
}
td.row3Right,td.spaceRow { td.row3Right,td.spaceRow {
background-color: {T_TR_COLOR3}; border: {T_TH_COLOR3}; border-style: solid; } background-color: {T_TR_COLOR3}; border: {T_TH_COLOR3}; border-style: solid;
}
th.thHead,td.catHead { font-size: {T_FONTSIZE3}px; border-width: 1px 1px 0px 1px; } th.thHead,td.catHead { font-size: {T_FONTSIZE3}px; border-width: 1px 1px 0px 1px; }
th.thSides,td.catSides,td.spaceRow { border-width: 0px 1px 0px 1px; } th.thSides,td.catSides,td.spaceRow { border-width: 0px 1px 0px 1px; }
@ -101,14 +96,12 @@ th.thTop { border-width: 1px 0px 0px 0px; }
th.thCornerL { border-width: 1px 0px 0px 1px; } th.thCornerL { border-width: 1px 0px 0px 1px; }
th.thCornerR { border-width: 1px 1px 0px 0px; } th.thCornerR { border-width: 1px 1px 0px 0px; }
/* The largest text used in the index page title and toptic title etc. */ /* The largest text used in the index page title and toptic title etc. */
.maintitle { .maintitle {
font-weight: bold; font-size: 22px; font-family: "{T_FONTFACE2}",{T_FONTFACE1}; font-weight: bold; font-size: 22px; font-family: "{T_FONTFACE2}",{T_FONTFACE1};
text-decoration: none; line-height : 120%; color : {T_BODY_TEXT}; text-decoration: none; line-height : 120%; color : {T_BODY_TEXT};
} }
/* General text */ /* General text */
.gen { font-size : {T_FONTSIZE3}px; } .gen { font-size : {T_FONTSIZE3}px; }
.genmed { font-size : {T_FONTSIZE2}px; } .genmed { font-size : {T_FONTSIZE2}px; }
@ -117,52 +110,44 @@ th.thCornerR { border-width: 1px 1px 0px 0px; }
a.gen,a.genmed,a.gensmall { color: {T_BODY_LINK}; text-decoration: none; } a.gen,a.genmed,a.gensmall { color: {T_BODY_LINK}; text-decoration: none; }
a.gen:hover,a.genmed:hover,a.gensmall:hover { color: {T_BODY_HLINK}; text-decoration: underline; } a.gen:hover,a.genmed:hover,a.gensmall:hover { color: {T_BODY_HLINK}; text-decoration: underline; }
/* The register, login, search etc links at the top of the page */ /* The register, login, search etc links at the top of the page */
.mainmenu { font-size : {T_FONTSIZE2}px; color : {T_BODY_TEXT} } .mainmenu { font-size : {T_FONTSIZE2}px; color : {T_BODY_TEXT} }
a.mainmenu { text-decoration: none; color : {T_BODY_LINK}; } a.mainmenu { text-decoration: none; color : {T_BODY_LINK}; }
a.mainmenu:hover{ text-decoration: underline; color : {T_BODY_HLINK}; } a.mainmenu:hover{ text-decoration: underline; color : {T_BODY_HLINK}; }
/* Forum category titles */ /* Forum category titles */
.cattitle { font-weight: bold; font-size: {T_FONTSIZE3}px ; letter-spacing: 1px; color : {T_BODY_LINK}} .cattitle { font-weight: bold; font-size: {T_FONTSIZE3}px ; letter-spacing: 1px; color : {T_BODY_LINK}}
a.cattitle { text-decoration: none; color : {T_BODY_LINK}; } a.cattitle { text-decoration: none; color : {T_BODY_LINK}; }
a.cattitle:hover{ text-decoration: underline; } a.cattitle:hover{ text-decoration: underline; }
/* Forum title: Text and link to the forums used in: index.php */ /* Forum title: Text and link to the forums used in: index.php */
.forumlink { font-weight: bold; font-size: {T_FONTSIZE3}px; color : {T_BODY_LINK}; } .forumlink { font-weight: bold; font-size: {T_FONTSIZE3}px; color : {T_BODY_LINK}; }
a.forumlink { text-decoration: none; color : {T_BODY_LINK}; } a.forumlink { text-decoration: none; color : {T_BODY_LINK}; }
a.forumlink:hover{ text-decoration: underline; color : {T_BODY_HLINK}; } a.forumlink:hover{ text-decoration: underline; color : {T_BODY_HLINK}; }
/* Used for the navigation text, (Page 1,2,3 etc) and the navigation bar when in a forum */ /* Used for the navigation text, (Page 1,2,3 etc) and the navigation bar when in a forum */
.nav { font-weight: bold; font-size: {T_FONTSIZE2}px; color : {T_BODY_TEXT};} .nav { font-weight: bold; font-size: {T_FONTSIZE2}px; color : {T_BODY_TEXT};}
a.nav { text-decoration: none; color : {T_BODY_LINK}; } a.nav { text-decoration: none; color : {T_BODY_LINK}; }
a.nav:hover { text-decoration: underline; } a.nav:hover { text-decoration: underline; }
/* titles for the topics: could specify viewed link colour too */ /* titles for the topics: could specify viewed link colour too */
.topictitle,h1,h2 { font-weight: bold; font-size: {T_FONTSIZE2}px; color : {T_BODY_TEXT}; } .topictitle,h1,h2 { font-weight: bold; font-size: {T_FONTSIZE2}px; color : {T_BODY_TEXT}; }
a.topictitle:link { text-decoration: none; color : {T_BODY_LINK}; } a.topictitle:link { text-decoration: none; color : {T_BODY_LINK}; }
a.topictitle:visited { text-decoration: none; color : {T_BODY_VLINK}; } a.topictitle:visited { text-decoration: none; color : {T_BODY_VLINK}; }
a.topictitle:hover { text-decoration: underline; color : {T_BODY_HLINK}; } a.topictitle:hover { text-decoration: underline; color : {T_BODY_HLINK}; }
/* Name of poster in viewmsg.php and viewtopic.php and other places */ /* Name of poster in viewmsg.php and viewtopic.php and other places */
.name { font-size : {T_FONTSIZE2}px; color : {T_BODY_TEXT};} .name { font-size : {T_FONTSIZE2}px; color : {T_BODY_TEXT};}
/* Location, number of posts, post date etc */ /* Location, number of posts, post date etc */
.postdetails { font-size : {T_FONTSIZE1}px; color : {T_BODY_TEXT}; } .postdetails { font-size : {T_FONTSIZE1}px; color : {T_BODY_TEXT}; }
/* The content of the posts (body of text) */ /* The content of the posts (body of text) */
.postbody { font-size : {T_FONTSIZE3}px; line-height: 18px} .postbody { font-size : {T_FONTSIZE3}px; line-height: 18px}
a.postlink:link { text-decoration: none; color : {T_BODY_LINK} } a.postlink:link { text-decoration: none; color : {T_BODY_LINK} }
a.postlink:visited { text-decoration: none; color : {T_BODY_VLINK}; } a.postlink:visited { text-decoration: none; color : {T_BODY_VLINK}; }
a.postlink:hover { text-decoration: underline; color : {T_BODY_HLINK}} a.postlink:hover { text-decoration: underline; color : {T_BODY_HLINK}}
/* Quote & Code blocks */ /* Quote & Code blocks */
.code { .code {
font-family: {T_FONTFACE3}; font-size: {T_FONTSIZE2}px; color: {T_FONTCOLOR2}; font-family: {T_FONTFACE3}; font-size: {T_FONTSIZE2}px; color: {T_FONTCOLOR2};
@ -176,13 +161,11 @@ a.postlink:hover { text-decoration: underline; color : {T_BODY_HLINK}}
border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px
} }
/* Copyright and bottom info */ /* Copyright and bottom info */
.copyright { font-size: {T_FONTSIZE1}px; font-family: {T_FONTFACE1}; color: {T_FONTCOLOR1}; letter-spacing: -1px;} .copyright { font-size: {T_FONTSIZE1}px; font-family: {T_FONTFACE1}; color: {T_FONTCOLOR1}; letter-spacing: -1px;}
a.copyright { color: {T_FONTCOLOR1}; text-decoration: none;} a.copyright { color: {T_FONTCOLOR1}; text-decoration: none;}
a.copyright:hover { color: {T_BODY_TEXT}; text-decoration: underline;} a.copyright:hover { color: {T_BODY_TEXT}; text-decoration: underline;}
/* Form elements */ /* Form elements */
input,textarea, select { input,textarea, select {
color : {T_BODY_TEXT}; color : {T_BODY_TEXT};
@ -222,18 +205,14 @@ input.liteoption {
*/ */
.helpline { background-color: {T_TR_COLOR2}; border-style: none; } .helpline { background-color: {T_TR_COLOR2}; border-style: none; }
/* Import the fancy styles for IE only (NS4.x doesn't use the @import function) */ /* Import the fancy styles for IE only (NS4.x doesn't use the @import function) */
@import url("templates/subSilver/formIE.css"); @import url("templates/subSilver/formIE.css");
--> -->
</style> </style>
<!-- BEGIN switch_enable_pm_popup --> <!-- BEGIN switch_enable_pm_popup -->
<script language="Javascript" type="text/javascript"> <script language="Javascript" type="text/javascript">
<!-- <!--
var new_pm_flag = {PRIVATE_MESSAGE_NEW_FLAG}; if ( {PRIVATE_MESSAGE_NEW_FLAG} )
if( new_pm_flag )
{ {
window.open('{U_PRIVATEMSGS_POPUP}', '_phpbbprivmsg', 'HEIGHT=225,resizable=yes,WIDTH=400');; window.open('{U_PRIVATEMSGS_POPUP}', '_phpbbprivmsg', 'HEIGHT=225,resizable=yes,WIDTH=400');;
} }
@ -241,31 +220,29 @@ input.liteoption {
</script> </script>
<!-- END switch_enable_pm_popup --> <!-- END switch_enable_pm_popup -->
</head> </head>
<body bgcolor="{T_BODY_BGCOLOR}" text="{T_BODY_TEXT}" link="{T_BODY_LINK}" vlink="{T_BODY_VLINK}"> <body bgcolor="{T_BODY_BGCOLOR}" text="{T_BODY_TEXT}" link="{T_BODY_LINK}" vlink="{T_BODY_VLINK}">
<span class="gen"><a name="top"></a></span><table width="100%" border="0" cellspacing="0" cellpadding="10" align="center">
<tr> <a name="top"></a>
<td class="bodyline">
<table width="100%" border="0" cellspacing="0" cellpadding="0"> <table width="100%" cellspacing="0" cellpadding="10" border="0" align="center">
<tr>
<td class="bodyline"><table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr> <tr>
<td><a href="{U_INDEX}"><img src="templates/subSilver/images/logo_phpBB.gif" border="0" alt="{L_INDEX}" vspace="1" /></a></td>
<td align="center" width="100%" valign="middle"><span class="maintitle">{SITENAME}</span><br /><span class="gen">{SITE_DESCRIPTION}<br />&nbsp; </span>
<td> <a href="{U_INDEX}"><img src="templates/subSilver/images/logo_phpBB.gif" border="0" alt="{L_INDEX}" vspace="1" /></a> <table cellspacing="0" cellpadding="2" border="0">
</td> <tr>
<td align="center" valign="top" nowrap="nowrap"><span class="mainmenu">&nbsp;<a href="{U_FAQ}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_faq.gif" width="12" height="13" border="0" alt="{L_FAQ}" hspace="3" />{L_FAQ}</a></span><span class="mainmenu">&nbsp; &nbsp;<a href="{U_SEARCH}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_search.gif" width="12" height="13" border="0" alt="{L_SEARCH}" hspace="3" />{L_SEARCH}</a>&nbsp; &nbsp;<a href="{U_MEMBERLIST}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_members.gif" width="12" height="13" border="0" alt="{L_MEMBERLIST}" hspace="3" />{L_MEMBERLIST}</a>&nbsp; &nbsp;<a href="{U_GROUP_CP}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_groups.gif" width="12" height="13" border="0" alt="{L_USERGROUPS}" hspace="3" />{L_USERGROUPS}</a>&nbsp;
<!-- BEGIN switch_user_logged_out -->
<td align="center" width="100%" valign="middle"><span class="maintitle">{SITENAME}</span><br /> &nbsp;<a href="{U_REGISTER}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_register.gif" width="12" height="13" border="0" alt="{L_REGISTER}" hspace="3" />{L_REGISTER}</a></span>&nbsp;
<span class="gen">{SITE_DESCRIPTION}<br />&nbsp; </span> <!-- END switch_user_logged_out -->
</td>
<table cellspacing="0" cellpadding="2" border="0"> </tr>
<tr> <tr>
<td valign="top" nowrap="nowrap" align="center"><span class="mainmenu">&nbsp;<a href="{U_FAQ}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_faq.gif" width="12" height="13" border="0" alt="{L_FAQ}" hspace="3" />{L_FAQ}</a></span><span class="mainmenu">&nbsp;&nbsp;&nbsp;<a href="{U_SEARCH}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_search.gif" width="12" height="13" border="0" alt="{L_SEARCH}" hspace="3" />{L_SEARCH}</a>&nbsp;&nbsp;&nbsp;<a href="{U_MEMBERLIST}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_members.gif" width="12" height="13" border="0" alt="{L_MEMBERLIST}" hspace="3" />{L_MEMBERLIST}</a>&nbsp;&nbsp;&nbsp;<a href="{U_GROUP_CP}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_groups.gif" width="12" height="13" border="0" alt="{L_USERGROUPS}" hspace="3" />{L_USERGROUPS}</a>&nbsp;&nbsp;&nbsp;<a href="{U_REGISTER}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_register.gif" width="12" height="13" border="0" alt="{L_REGISTER}" hspace="3" />{L_REGISTER}</a></span></td> <td height="25" align="center" valign="top" nowrap="nowrap"><span class="mainmenu">&nbsp;<a href="{U_PROFILE}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_profile.gif" width="12" height="13" border="0" alt="{L_PROFILE}" hspace="3" />{L_PROFILE}</a>&nbsp; &nbsp;<a href="{U_PRIVATEMSGS}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_message.gif" width="12" height="13" border="0" alt="{PRIVATE_MESSAGE_INFO}" hspace="3" />{PRIVATE_MESSAGE_INFO}</a>&nbsp; &nbsp;<a href="{U_LOGIN_LOGOUT}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_login.gif" width="12" height="13" border="0" alt="{L_LOGIN_LOGOUT}" hspace="3" />{L_LOGIN_LOGOUT}</a>&nbsp;</span></td>
</tr>
</table></td>
</tr> </tr>
<tr> </table>
<td nowrap="nowrap" valign="top" height="25" align="center"><span class="mainmenu">&nbsp;<a href="{U_PROFILE}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_profile.gif" width="12" height="13" border="0" alt="{L_PROFILE}" hspace="3" />{L_PROFILE}</a>&nbsp;&nbsp;&nbsp;<a href="{U_PRIVATEMSGS}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_message.gif" width="12" height="13" border="0" alt="{PRIVATE_MESSAGE_INFO}" hspace="3" />{PRIVATE_MESSAGE_INFO}</a>&nbsp;&nbsp;&nbsp;<a href="{U_LOGIN_LOGOUT}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_login.gif" width="12" height="13" border="0" alt="{L_LOGIN_LOGOUT}" hspace="3" />{L_LOGIN_LOGOUT}</a></span></td>
</tr> <br />
</table>
</td>
</tr>
</table>
<span class="mainmenu"> <br /> </span>

57
phpBB/templates/subSilver/posting_body.tpl
View file

@ -236,27 +236,22 @@ function storeCaret(textEl) {
</tr> </tr>
</table> </table>
<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline"> <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
<tr> <tr>
<th class="thHead" colspan="2" height="25"><b>{L_POST_A}</b></th> <th class="thHead" colspan="2" height="25"><b>{L_POST_A}</b></th>
</tr> </tr>
<!-- BEGIN username_select --> <!-- BEGIN switch_username_select -->
<tr>
<td class="row1"><span class="gen"><b>{L_USERNAME}</b></span></td>
<td class="row2"><span class="genmed"><input type="text" class="post" tabindex="1" name="username" size="25" maxlength="25" value="{USERNAME}" /></span></td>
</tr>
<!-- END username_select -->
<!-- This is for private messaging -->
<!-- BEGIN privmsg_extensions -->
<tr> <tr>
<td class="row1"><span class="gen"><b>{L_USERNAME}</b></span></td> <td class="row1"><span class="gen"><b>{L_USERNAME}</b></span></td>
<td class="row2"><span class="genmed"> <td class="row2"><span class="genmed"><input type="text" class="post" tabindex="1" name="username" size="25" maxlength="25" value="{USERNAME}" /></span></td>
<input type="text" class="post" name="username" maxlength="25" size="25" tabindex="1" value="{USERNAME}" />
&nbsp;
<input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" />
</span></td>
</tr> </tr>
<!-- END privmsg_extensions --> <!-- END switch_username_select -->
<!-- BEGIN switch_privmsg -->
<tr>
<td class="row1"><span class="gen"><b>{L_USERNAME}</b></span></td>
<td class="row2"><span class="genmed"><input type="text" class="post" name="username" maxlength="25" size="25" tabindex="1" value="{USERNAME}" />&nbsp;<input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('{U_SEARCH_USER}', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" /></span></td>
</tr>
<!-- END switch_privmsg -->
<tr> <tr>
<td class="row1" width="22%"><span class="gen"><b>{L_SUBJECT}</b></span></td> <td class="row1" width="22%"><span class="gen"><b>{L_SUBJECT}</b></span></td>
<td class="row2" width="78%"> <span class="gen"> <td class="row2" width="78%"> <span class="gen">
@ -374,60 +369,60 @@ function storeCaret(textEl) {
<td class="row1" valign="top"><span class="gen"><b>{L_OPTIONS}</b></span><br /><span class="gensmall">{HTML_STATUS}<br />{BBCODE_STATUS}<br />{SMILIES_STATUS}</span></td> <td class="row1" valign="top"><span class="gen"><b>{L_OPTIONS}</b></span><br /><span class="gensmall">{HTML_STATUS}<br />{BBCODE_STATUS}<br />{SMILIES_STATUS}</span></td>
<td class="row2"><span class="gen"> </span> <td class="row2"><span class="gen"> </span>
<table cellspacing="0" cellpadding="1" border="0"> <table cellspacing="0" cellpadding="1" border="0">
<!-- BEGIN html_checkbox --> <!-- BEGIN switch_html_checkbox -->
<tr> <tr>
<td> <td>
<input type="checkbox" name="disable_html" {S_HTML_CHECKED} /> <input type="checkbox" name="disable_html" {S_HTML_CHECKED} />
</td> </td>
<td><span class="gen">{L_DISABLE_HTML}</span></td> <td><span class="gen">{L_DISABLE_HTML}</span></td>
</tr> </tr>
<!-- END html_checkbox --> <!-- END switch_html_checkbox -->
<!-- BEGIN bbcode_checkbox --> <!-- BEGIN switch_bbcode_checkbox -->
<tr> <tr>
<td> <td>
<input type="checkbox" name="disable_bbcode" {S_BBCODE_CHECKED} /> <input type="checkbox" name="disable_bbcode" {S_BBCODE_CHECKED} />
</td> </td>
<td><span class="gen">{L_DISABLE_BBCODE}</span></td> <td><span class="gen">{L_DISABLE_BBCODE}</span></td>
</tr> </tr>
<!-- END bbcode_checkbox --> <!-- END switch_bbcode_checkbox -->
<!-- BEGIN smilies_checkbox --> <!-- BEGIN switch_smilies_checkbox -->
<tr> <tr>
<td> <td>
<input type="checkbox" name="disable_smilies" {S_SMILIES_CHECKED} /> <input type="checkbox" name="disable_smilies" {S_SMILIES_CHECKED} />
</td> </td>
<td><span class="gen">{L_DISABLE_SMILIES}</span></td> <td><span class="gen">{L_DISABLE_SMILIES}</span></td>
</tr> </tr>
<!-- END smilies_checkbox --> <!-- END switch_smilies_checkbox -->
<!-- BEGIN signature_checkbox --> <!-- BEGIN switch_signature_checkbox -->
<tr> <tr>
<td> <td>
<input type="checkbox" name="attach_sig" {S_SIGNATURE_CHECKED} /> <input type="checkbox" name="attach_sig" {S_SIGNATURE_CHECKED} />
</td> </td>
<td><span class="gen">{L_ATTACH_SIGNATURE}</span></td> <td><span class="gen">{L_ATTACH_SIGNATURE}</span></td>
</tr> </tr>
<!-- END signature_checkbox --> <!-- END switch_signature_checkbox -->
<!-- BEGIN notify_checkbox --> <!-- BEGIN switch_notify_checkbox -->
<tr> <tr>
<td> <td>
<input type="checkbox" name="notify" {S_NOTIFY_CHECKED} /> <input type="checkbox" name="notify" {S_NOTIFY_CHECKED} />
</td> </td>
<td><span class="gen">{L_NOTIFY_ON_REPLY}</span></td> <td><span class="gen">{L_NOTIFY_ON_REPLY}</span></td>
</tr> </tr>
<!-- END notify_checkbox --> <!-- END switch_notify_checkbox -->
<!-- BEGIN delete_checkbox --> <!-- BEGIN switch_delete_checkbox -->
<tr> <tr>
<td> <td>
<input type="checkbox" name="delete" /> <input type="checkbox" name="delete" />
</td> </td>
<td><span class="gen">{L_DELETE_POST}</span></td> <td><span class="gen">{L_DELETE_POST}</span></td>
</tr> </tr>
<!-- END delete_checkbox --> <!-- END switch_delete_checkbox -->
<!-- BEGIN type_toggle --> <!-- BEGIN switch_type_toggle -->
<tr> <tr>
<td></td> <td></td>
<td><span class="gen">{S_TYPE_TOGGLE}</span></td> <td><span class="gen">{S_TYPE_TOGGLE}</span></td>
</tr> </tr>
<!-- END type_toggle --> <!-- END switch_type_toggle -->
</table> </table>
</td> </td>
</tr> </tr>

4
phpBB/templates/subSilver/posting_poll_body.tpl
View file

@ -23,9 +23,9 @@
<td class="row1"><span class="gen"><b>{L_POLL_LENGTH}</b></span></td> <td class="row1"><span class="gen"><b>{L_POLL_LENGTH}</b></span></td>
<td class="row2"><span class="genmed"><input type="text" name="poll_length" size="3" maxlength="3" class="post" value="{POLL_LENGTH}" /></span>&nbsp;<span class="gen"><b>{L_DAYS}</b></span> &nbsp; <span class="gensmall">{L_POLL_LENGTH_EXPLAIN}</span></td> <td class="row2"><span class="genmed"><input type="text" name="poll_length" size="3" maxlength="3" class="post" value="{POLL_LENGTH}" /></span>&nbsp;<span class="gen"><b>{L_DAYS}</b></span> &nbsp; <span class="gensmall">{L_POLL_LENGTH_EXPLAIN}</span></td>
</tr> </tr>
<!-- BEGIN poll_delete_toggle --> <!-- BEGIN switch_poll_delete_toggle -->
<tr> <tr>
<td class="row1"><span class="gen"><b>{L_POLL_DELETE}</b></span></td> <td class="row1"><span class="gen"><b>{L_POLL_DELETE}</b></span></td>
<td class="row2"><input type="checkbox" name="poll_delete" /></td> <td class="row2"><input type="checkbox" name="poll_delete" /></td>
</tr> </tr>
<!-- END poll_delete_toggle --> <!-- END switch_poll_delete_toggle -->

43
phpBB/templates/subSilver/posting_preview.tpl
View file

@ -1,24 +1,23 @@
<table border="0" cellpadding="4" cellspacing="1" width="100%" class="forumline"> <table class="forumline" width="100%" cellspacing="1" cellpadding="4" border="0">
<tr> <tr>
<th height="25" class="thHead">{L_PREVIEW}</th> <th height="25" class="thHead">{L_PREVIEW}</th>
</tr> </tr>
<tr> <tr>
<td class="row1"><img src="templates/subSilver/images/icon_minipost.gif" alt="Post image icon" /><span class="postdetails">{L_POSTED}: {POST_DATE} &nbsp;&nbsp;&nbsp; {L_POST_SUBJECT}: {POST_SUBJECT}</span></td> <td class="row1"><img src="templates/subSilver/images/icon_minipost.gif" alt="{L_POST}" /><span class="postdetails">{L_POSTED}: {POST_DATE} &nbsp;&nbsp;&nbsp; {L_POST_SUBJECT}: {POST_SUBJECT}</span></td>
</tr> </tr>
<tr> <tr>
<td class="row1"> <td class="row1"><table width="100%" border="0" cellspacing="0" cellpadding="0">
<table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr>
<tr> <td>
<td> <span class="postbody">{MESSAGE}</span>
<span class="postbody">{MESSAGE}</span> </td>
</td> </tr>
</tr> </table></td>
</table> </tr>
</td> <tr>
</tr> <td class="spaceRow" height="1"><img src="templates/subSilver/images/spacer.gif" width="1" height="1" /></td>
<tr> </tr>
<td class="spaceRow" height="1"><img src="templates/subSilver/images/spacer.gif" width="1" height="1"></td>
</tr>
</table> </table>
<br />
<br clear="all" />

11
phpBB/templates/subSilver/posting_topic_review.tpl
View file

@ -2,15 +2,13 @@
<!-- BEGIN switch_inline_mode --> <!-- BEGIN switch_inline_mode -->
<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline"> <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline">
<tr> <tr>
<td class="catHead" height="28" align="center"><b><span class="cattitle">{L_TOPIC_REVIEW}</span></b></td>
<td class="catHead" height="28" align="center"><b><span class="cattitle">{L_TOPIC_REVIEW}</span></b></td>
</tr> </tr>
<tr> <tr>
<td class="row1"><iframe width="100%" height="300" src="{U_REVIEW_TOPIC}" > <td class="row1"><iframe width="100%" height="300" src="{U_REVIEW_TOPIC}" >
<!-- END switch_inline_mode --> <!-- 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" style="border: 0px #006699 solid "> <tr>
<tr>
<th class="thCornerL" width="22%" height="26">{L_AUTHOR}</th> <th class="thCornerL" width="22%" height="26">{L_AUTHOR}</th>
<th class="thCornerR">{L_MESSAGE}</th> <th class="thCornerR">{L_MESSAGE}</th>
</tr> </tr>
@ -19,7 +17,7 @@
<td width="22%" align="left" valign="top" class="{postrow.ROW_CLASS}"><span class="name"><a name="{postrow.U_POST_ID}"></a><b>{postrow.POSTER_NAME}</b></span></td> <td width="22%" align="left" valign="top" class="{postrow.ROW_CLASS}"><span class="name"><a name="{postrow.U_POST_ID}"></a><b>{postrow.POSTER_NAME}</b></span></td>
<td class="{postrow.ROW_CLASS}" height="28" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="0"> <td class="{postrow.ROW_CLASS}" height="28" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<td width="100%">{postrow.MINI_POST_IMG}<span class="postdetails">{L_POSTED}: {postrow.POST_DATE}<span class="gen">&nbsp;</span>&nbsp;&nbsp;&nbsp;{L_POST_SUBJECT}: {postrow.POST_SUBJECT}</span></td> <td width="100%"><img src="{postrow.MINI_POST_IMG}" width="12" height="9" alt="{postrow.L_MINI_POST_ALT}" title="{postrow.L_MINI_POST_ALT}" border="0" /><span class="postdetails">{L_POSTED}: {postrow.POST_DATE}<span class="gen">&nbsp;</span>&nbsp;&nbsp;&nbsp;{L_POST_SUBJECT}: {postrow.POST_SUBJECT}</span></td>
</tr> </tr>
<tr> <tr>
<td colspan="2"><hr /></td> <td colspan="2"><hr /></td>
@ -34,7 +32,6 @@
</tr> </tr>
<!-- END postrow --> <!-- END postrow -->
</table> </table>
<!-- BEGIN switch_inline_mode --> <!-- BEGIN switch_inline_mode -->
</iframe></td> </iframe></td>
</tr> </tr>

20
phpBB/templates/subSilver/privmsgs_body.tpl
View file

@ -18,18 +18,18 @@
<table height="40" cellspacing="2" cellpadding="2" border="0"> <table height="40" cellspacing="2" cellpadding="2" border="0">
<tr valign="middle"> <tr valign="middle">
<td>{INBOX_IMG}</td> <td>{INBOX_IMG}</td>
<td><span class="cattitle">{INBOX_LINK}&nbsp;&nbsp;</span></td> <td><span class="cattitle">{INBOX} &nbsp;</span></td>
<td>{SENTBOX_IMG}</td> <td>{SENTBOX_IMG}</td>
<td><span class="cattitle">{SENTBOX_LINK}&nbsp;&nbsp;</span></td> <td><span class="cattitle">{SENTBOX} &nbsp;</span></td>
<td>{OUTBOX_IMG}</td> <td>{OUTBOX_IMG}</td>
<td><span class="cattitle">{OUTBOX_LINK}&nbsp;&nbsp;</span></td> <td><span class="cattitle">{OUTBOX} &nbsp;</span></td>
<td>{SAVEBOX_IMG}</td> <td>{SAVEBOX_IMG}</td>
<td><span class="cattitle">{SAVEBOX_LINK}&nbsp;&nbsp;</span></td> <td><span class="cattitle">{SAVEBOX} &nbsp;</span></td>
</tr> </tr>
</table> </table>
</td> </td>
<td align="right"> <td align="right">
<!-- BEGIN box_size_notice --> <!-- BEGIN switch_box_size_notice -->
<table width="175" cellspacing="1" cellpadding="2" border="0" class="bodyline"> <table width="175" cellspacing="1" cellpadding="2" border="0" class="bodyline">
<tr> <tr>
<td colspan="3" width="100%" class="row1" nowrap="nowrap"><span class="gensmall">{BOX_SIZE_STATUS}</span></td> <td colspan="3" width="100%" class="row1" nowrap="nowrap"><span class="gensmall">{BOX_SIZE_STATUS}</span></td>
@ -49,7 +49,7 @@
<td width="33%" align="right" class="row1"><span class="gensmall">100%</span></td> <td width="33%" align="right" class="row1"><span class="gensmall">100%</span></td>
</tr> </tr>
</table> </table>
<!-- END box_size_notice --> <!-- END switch_box_size_notice -->
</td> </td>
</tr> </tr>
</table> </table>
@ -62,7 +62,7 @@
<td align="left" valign="middle">{POST_PM_IMG}</td> <td align="left" valign="middle">{POST_PM_IMG}</td>
<td align="left" width="100%">&nbsp;<span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td> <td align="left" width="100%">&nbsp;<span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></td>
<td align="right" nowrap="nowrap"><span class="gensmall">{L_DISPLAY_MESSAGES}: <td align="right" nowrap="nowrap"><span class="gensmall">{L_DISPLAY_MESSAGES}:
<select name="msgdays">{S_MSG_DAYS_OPTIONS} <select name="msgdays">{S_SELECT_MSG_DAYS}
</select> </select>
<input type="submit" value="{L_GO}" name="submit_msgdays" class="liteoption" /> <input type="submit" value="{L_GO}" name="submit_msgdays" class="liteoption" />
</span></td> </span></td>
@ -79,7 +79,7 @@
</tr> </tr>
<!-- BEGIN listrow --> <!-- BEGIN listrow -->
<tr> <tr>
<td width="5%" align="center" valign="middle" class="{listrow.ROW_CLASS}"><span class="postdetails">{listrow.ICON_FLAG_IMG}</span></td> <td class="{listrow.ROW_CLASS}" width="5%" align="center" valign="middle"><img src="{listrow.PRIVMSG_FOLDER_IMG}" width="19" height="18" alt="{listrow.L_PRIVMSG_FOLDER_ALT}" title="{listrow.L_PRIVMSG_FOLDER_ALT}" /></td>
<td width="55%" valign="middle" class="{listrow.ROW_CLASS}"><span class="topictitle">&nbsp;<a href="{listrow.U_READ}" class="topictitle">{listrow.SUBJECT}</a></span></td> <td width="55%" valign="middle" class="{listrow.ROW_CLASS}"><span class="topictitle">&nbsp;<a href="{listrow.U_READ}" class="topictitle">{listrow.SUBJECT}</a></span></td>
<td width="20%" valign="middle" align="center" class="{listrow.ROW_CLASS}"><span class="name">&nbsp;<a href="{listrow.U_FROM_USER_PROFILE}" class="name">{listrow.FROM}</a></span></td> <td width="20%" valign="middle" align="center" class="{listrow.ROW_CLASS}"><span class="name">&nbsp;<a href="{listrow.U_FROM_USER_PROFILE}" class="name">{listrow.FROM}</a></span></td>
<td width="15%" align="center" valign="middle" class="{listrow.ROW_CLASS}"><span class="postdetails">{listrow.DATE}</span></td> <td width="15%" align="center" valign="middle" class="{listrow.ROW_CLASS}"><span class="postdetails">{listrow.DATE}</span></td>
@ -88,11 +88,11 @@
</span></td> </span></td>
</tr> </tr>
<!-- END listrow --> <!-- END listrow -->
<!-- BEGIN nomessages --> <!-- BEGIN switch_no_messages -->
<tr> <tr>
<td class="row1" colspan="5" align="center" valign="middle"><span class="gen">{L_NO_MESSAGES}</span></td> <td class="row1" colspan="5" align="center" valign="middle"><span class="gen">{L_NO_MESSAGES}</span></td>
</tr> </tr>
<!-- END nomessages --> <!-- END switch_no_messages -->
<tr> <tr>
<td class="catBottom" colspan="5" height="28" align="right"> {S_HIDDEN_FIELDS} <td class="catBottom" colspan="5" height="28" align="right"> {S_HIDDEN_FIELDS}
<input type="submit" name="save" value="{L_SAVE_MARKED}" class="mainoption" /> <input type="submit" name="save" value="{L_SAVE_MARKED}" class="mainoption" />

14
phpBB/templates/subSilver/privmsgs_read_body.tpl
View file

@ -2,13 +2,13 @@
<table cellspacing="2" cellpadding="2" border="0" align="center"> <table cellspacing="2" cellpadding="2" border="0" align="center">
<tr> <tr>
<td valign="middle">{INBOX_IMG}</td> <td valign="middle">{INBOX_IMG}</td>
<td valign="middle"><span class="cattitle">{INBOX_LINK}&nbsp;&nbsp;</span></td> <td valign="middle"><span class="cattitle">{INBOX} &nbsp;</span></td>
<td valign="middle">{SENTBOX_IMG}</td> <td valign="middle">{SENTBOX_IMG}</td>
<td valign="middle"><span class="cattitle">{SENTBOX_LINK}&nbsp;&nbsp;</span></td> <td valign="middle"><span class="cattitle">{SENTBOX} &nbsp;</span></td>
<td valign="middle">{OUTBOX_IMG}</td> <td valign="middle">{OUTBOX_IMG}</td>
<td valign="middle"><span class="cattitle">{OUTBOX_LINK}&nbsp;&nbsp;</span></td> <td valign="middle"><span class="cattitle">{OUTBOX} &nbsp;</span></td>
<td valign="middle">{SAVEBOX_IMG}</td> <td valign="middle">{SAVEBOX_IMG}</td>
<td valign="middle"><span class="cattitle">{SAVEBOX_LINK}</span></td> <td valign="middle"><span class="cattitle">{SAVEBOX}</span></td>
</tr> </tr>
</table> </table>
@ -54,11 +54,11 @@
{WWW_IMG} {AIM_IMG} {YIM_IMG} {MSN_IMG}</td><td>&nbsp;</td><td valign="top" nowrap="nowrap"><script language="JavaScript" type="text/javascript"><!-- {WWW_IMG} {AIM_IMG} {YIM_IMG} {MSN_IMG}</td><td>&nbsp;</td><td valign="top" nowrap="nowrap"><script language="JavaScript" type="text/javascript"><!--
if ( navigator.userAgent.toLowerCase().indexOf('mozilla') != -1 && navigator.userAgent.indexOf('5.') == -1 ) if ( navigator.userAgent.toLowerCase().indexOf('mozilla') != -1 && navigator.userAgent.indexOf('5.') == -1 )
document.write('{ICQ_ADD_IMG}'); document.write('{ICQ_IMG}');
else else
document.write('<div style="position:relative"><div style="position:absolute">{ICQ_ADD_IMG}</div><div style="position:absolute;left:3px">{ICQ_STATUS_IMG}</div></div>'); document.write('<div style="position:relative"><div style="position:absolute">{ICQ_IMG}</div><div style="position:absolute;left:3px">{ICQ_STATUS_IMG}</div></div>');
//--></script><noscript>{ICQ_ADD_IMG}</noscript></td> //--></script><noscript>{ICQ_IMG}</noscript></td>
</tr> </tr>
</table> </table>
</td> </td>

24
phpBB/templates/subSilver/profile_add_body.tpl
View file

@ -24,7 +24,7 @@
<td class="row1"><span class="gen">{L_EMAIL_ADDRESS}: *</span></td> <td class="row1"><span class="gen">{L_EMAIL_ADDRESS}: *</span></td>
<td class="row2"><input type="text" class="post" style="width:200px" name="email" size="25" maxlength="255" value="{EMAIL}" /></td> <td class="row2"><input type="text" class="post" style="width:200px" name="email" size="25" maxlength="255" value="{EMAIL}" /></td>
</tr> </tr>
<!-- BEGIN edit_profile --> <!-- BEGIN switch_edit_profile -->
<tr> <tr>
<td class="row1"><span class="gen">{L_CURRENT_PASSWORD}: *</span><br /> <td class="row1"><span class="gen">{L_CURRENT_PASSWORD}: *</span><br />
<span class="gensmall">{L_CONFIRM_PASSWORD_EXPLAIN}</span></td> <span class="gensmall">{L_CONFIRM_PASSWORD_EXPLAIN}</span></td>
@ -32,7 +32,7 @@
<input type="password" class="post" style="width: 200px" name="cur_password" size="25" maxlength="100" value="{PASSWORD}" /> <input type="password" class="post" style="width: 200px" name="cur_password" size="25" maxlength="100" value="{PASSWORD}" />
</td> </td>
</tr> </tr>
<!-- END edit_profile --> <!-- END switch_edit_profile -->
<tr> <tr>
<td class="row1"><span class="gen">{L_NEW_PASSWORD}: *</span><br /> <td class="row1"><span class="gen">{L_NEW_PASSWORD}: *</span><br />
<span class="gensmall">{L_PASSWORD_IF_CHANGED}</span></td> <span class="gensmall">{L_PASSWORD_IF_CHANGED}</span></td>
@ -211,7 +211,7 @@
<tr> <tr>
<td class="catSides" colspan="2" height="28">&nbsp;</td> <td class="catSides" colspan="2" height="28">&nbsp;</td>
</tr> </tr>
<!-- BEGIN avatar_block --> <!-- BEGIN switch_avatar_block -->
<tr> <tr>
<th class="thSides" colspan="2" height="12" valign="middle">{L_AVATAR_PANEL}</th> <th class="thSides" colspan="2" height="12" valign="middle">{L_AVATAR_PANEL}</th>
</tr> </tr>
@ -223,31 +223,31 @@
</tr> </tr>
</table></td> </table></td>
</tr> </tr>
<!-- BEGIN avatar_local_upload --> <!-- BEGIN switch_avatar_local_upload -->
<tr> <tr>
<td class="row1"><span class="gen">{L_UPLOAD_AVATAR_FILE}:</span></td> <td class="row1"><span class="gen">{L_UPLOAD_AVATAR_FILE}:</span></td>
<td class="row2"><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}" /><input type="file" name="avatar" class="post" style="width:200px" /></td> <td class="row2"><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_SIZE}" /><input type="file" name="avatar" class="post" style="width:200px" /></td>
</tr> </tr>
<!-- END avatar_local_upload --> <!-- END switch_avatar_local_upload -->
<!-- BEGIN avatar_remote_upload --> <!-- BEGIN switch_avatar_remote_upload -->
<tr> <tr>
<td class="row1"><span class="gen">{L_UPLOAD_AVATAR_URL}:</span><br /><span class="gensmall">{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></td> <td class="row1"><span class="gen">{L_UPLOAD_AVATAR_URL}:</span><br /><span class="gensmall">{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></td>
<td class="row2"><input type="text" name="avatarurl" size="40" class="post" style="width:200px" /></td> <td class="row2"><input type="text" name="avatarurl" size="40" class="post" style="width:200px" /></td>
</tr> </tr>
<!-- END avatar_remote_upload --> <!-- END switch_avatar_remote_upload -->
<!-- BEGIN avatar_remote_link --> <!-- BEGIN switch_avatar_remote_link -->
<tr> <tr>
<td class="row1"><span class="gen">{L_LINK_REMOTE_AVATAR}:</span><br /><span class="gensmall">{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></td> <td class="row1"><span class="gen">{L_LINK_REMOTE_AVATAR}:</span><br /><span class="gensmall">{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></td>
<td class="row2"><input type="text" name="avatarremoteurl" size="40" class="post" style="width:200px" /></td> <td class="row2"><input type="text" name="avatarremoteurl" size="40" class="post" style="width:200px" /></td>
</tr> </tr>
<!-- END avatar_remote_link --> <!-- END switch_avatar_remote_link -->
<!-- BEGIN avatar_local_gallery --> <!-- BEGIN switch_avatar_local_gallery -->
<tr> <tr>
<td class="row1"><span class="gen">{L_AVATAR_GALLERY}:</span></td> <td class="row1"><span class="gen">{L_AVATAR_GALLERY}:</span></td>
<td class="row2"><input type="submit" name="avatargallery" value="{L_SHOW_GALLERY}" class="liteoption" /></td> <td class="row2"><input type="submit" name="avatargallery" value="{L_SHOW_GALLERY}" class="liteoption" /></td>
</tr> </tr>
<!-- END avatar_local_gallery --> <!-- END switch_avatar_local_gallery -->
<!-- END avatar_block --> <!-- END switch_avatar_block -->
<tr> <tr>
<td class="catBottom" colspan="2" align="center" height="28">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" name="reset" class="liteoption" /></td> <td class="catBottom" colspan="2" align="center" height="28">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" name="reset" class="liteoption" /></td>
</tr> </tr>

2
phpBB/templates/subSilver/profile_avatar_gallery.tpl
View file

@ -11,7 +11,7 @@
<th class="thHead" colspan="{S_COLSPAN}" height="25" valign="middle">{L_AVATAR_GALLERY}</th> <th class="thHead" colspan="{S_COLSPAN}" height="25" valign="middle">{L_AVATAR_GALLERY}</th>
</tr> </tr>
<tr> <tr>
<td class="catBottom" align="center" valign="middle" colspan="6" height="28"><span class="genmed">{L_CATEGORY}:&nbsp;<select name="avatarcategory">{S_OPTIONS_CATEGORIES}</select>&nbsp;<input type="submit" class="liteoption" value="{L_GO}" name="avatargallery" /></span></td> <td class="catBottom" align="center" valign="middle" colspan="6" height="28"><span class="genmed">{L_CATEGORY}:&nbsp;{S_CATEGORY_SELECT}&nbsp;<input type="submit" class="liteoption" value="{L_GO}" name="avatargallery" /></span></td>
</tr> </tr>
<!-- BEGIN avatar_row --> <!-- BEGIN avatar_row -->
<tr> <tr>

14
phpBB/templates/subSilver/profile_send_email.tpl
View file

@ -1,10 +1,4 @@
<!-- Spell checker option part 1: You must sign up for free at www.spellchecker.net to use this option -->
<!-- Change the path to point to the file you got once signed up at Spellchecker.net -->
<!-- Remember to uncomment the spellchecker button near the end of this template -->
<!-- script type="text/javascript" language="javascript" src=spellcheck/spch.js></script -->
<!-- End spellchecker option -->
<script language="JavaScript" type="text/javascript"> <script language="JavaScript" type="text/javascript">
<!-- <!--
function checkForm(formObj) { function checkForm(formObj) {
@ -63,13 +57,7 @@ function checkForm(formObj) {
</table></td> </table></td>
</tr> </tr>
<tr> <tr>
<td class="catBottom" colspan="2" align="center" height="28"> {S_HIDDEN_FORM_FIELDS} <td class="catBottom" colspan="2" align="center" height="28"><input type="submit" tabindex="6" name="submit" class="mainoption" value="{L_SEND_EMAIL}" /></td>
<!-- Spell checker option part 2: You must sign up for free at www.spellchecker.net to use this option -->
<!-- Change the path in the onclick function to point to your files you got once signed up at Spellchecker.net -->
<!-- Remember to uncomment the link to the javascript file at the top of this template -->
<!-- input type="button" tabindex="4" class="liteoption" name="spellcheck" value="{L_SPELLCHECK}" onClick= "doSpell ('uk', document.post.message, document.location.protocol + '//' + document.location.host + '/phpBB/spellcheck/sproxy.php', true);" / -->
<!-- End spellchecker option -->
&nbsp;<input type="submit" tabindex="6" name="submit" class="mainoption" value="{L_SEND_EMAIL}" /></td>
</tr> </tr>
</table> </table>

14
phpBB/templates/subSilver/profile_view_body.tpl
View file

@ -5,17 +5,17 @@
</tr> </tr>
</table> </table>
<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline" align="center"> <table class="forumline" width="100%" cellspacing="1" cellpadding="3" border="0" align="center">
<tr> <tr>
<th class="thHead" colspan="2" height="25" nowrap="nowrap">{L_VIEWING_PROFILE}</th> <th class="thHead" colspan="2" height="25" nowrap="nowrap">{L_VIEWING_PROFILE}</th>
</tr> </tr>
<tr> <tr>
<td class="catLeft" align="center" width="40%" height="28"><b><span class="gen">{L_AVATAR}</span></b></td> <td class="catLeft" width="40%" height="28" align="center"><b><span class="gen">{L_AVATAR}</span></b></td>
<td class="catRight" width="60%"><b><span class="gen">{L_ABOUT_USER}</span></b></td> <td class="catRight" width="60%"><b><span class="gen">{L_ABOUT_USER}</span></b></td>
</tr> </tr>
<tr> <tr>
<td class="row1" height="6" valign="top" align="center">{AVATAR_IMG}<br /><span class="postdetails">{POSTER_RANK}</span></td> <td class="row1" height="6" valign="top" align="center">{AVATAR_IMG}<br /><span class="postdetails">{POSTER_RANK}</span></td>
<td class="row1" valign="top" rowspan="3"><table width="100%" border="0" cellspacing="1" cellpadding="3"> <td class="row1" rowspan="3" valign="top"><table width="100%" border="0" cellspacing="1" cellpadding="3">
<tr> <tr>
<td valign="middle" align="right" nowrap="nowrap"><span class="gen">{L_JOINED}:&nbsp;</span></td> <td valign="middle" align="right" nowrap="nowrap"><span class="gen">{L_JOINED}:&nbsp;</span></td>
<td width="100%"><b><span class="gen">{JOINED}</span></b></td> <td width="100%"><b><span class="gen">{JOINED}</span></b></td>
@ -30,7 +30,7 @@
</tr> </tr>
<tr> <tr>
<td valign="middle" align="right" nowrap="nowrap"><span class="gen">{L_WEBSITE}:&nbsp;</span></td> <td valign="middle" align="right" nowrap="nowrap"><span class="gen">{L_WEBSITE}:&nbsp;</span></td>
<td><span class="gen"><b>{WEBSITE}</b></span></td> <td><span class="gen"><b>{WWW}</b></span></td>
</tr> </tr>
<tr> <tr>
<td valign="middle" align="right" nowrap="nowrap"><span class="gen">{L_OCCUPATION}:&nbsp;</span></td> <td valign="middle" align="right" nowrap="nowrap"><span class="gen">{L_OCCUPATION}:&nbsp;</span></td>
@ -73,11 +73,11 @@
<td class="row1"><script language="JavaScript" type="text/javascript"><!-- <td class="row1"><script language="JavaScript" type="text/javascript"><!--
if ( navigator.userAgent.toLowerCase().indexOf('mozilla') != -1 && navigator.userAgent.indexOf('5.') == -1 ) if ( navigator.userAgent.toLowerCase().indexOf('mozilla') != -1 && navigator.userAgent.indexOf('5.') == -1 )
document.write(' {ICQ_ADD_IMG}'); document.write(' {ICQ_IMG}');
else else
document.write('<table cellspacing="0" cellpadding="0" border="0"><tr><td nowrap="nowrap"><div style="position:relative;height:18px"><div style="position:absolute">{ICQ_ADD_IMG}</div><div style="position:absolute;left:3px;top:-1px">{ICQ_STATUS_IMG}</div></div></td></tr></table>'); document.write('<table cellspacing="0" cellpadding="0" border="0"><tr><td nowrap="nowrap"><div style="position:relative;height:18px"><div style="position:absolute">{ICQ_IMG}</div><div style="position:absolute;left:3px;top:-1px">{ICQ_STATUS_IMG}</div></div></td></tr></table>');
//--></script><noscript>{ICQ_ADD_IMG}</noscript></td> //--></script><noscript>{ICQ_IMG}</noscript></td>
</tr> </tr>
</table> </table>
</td> </td>

11
phpBB/templates/subSilver/search_results_posts.tpl
View file

@ -13,21 +13,20 @@
<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline" align="center"> <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline" align="center">
<tr> <tr>
<th width="22%" height="25" class="thCornerL" nowrap="nowrap">{L_AUTHOR}</th> <th width="150" height="25" class="thCornerL" nowrap="nowrap">{L_AUTHOR}</th>
<th class="thCornerR" nowrap="nowrap">{L_MESSAGE}</th> <th width="100%" class="thCornerR" nowrap="nowrap">{L_MESSAGE}</th>
</tr> </tr>
<!-- BEGIN searchresults --> <!-- BEGIN searchresults -->
<tr> <tr>
<td class="catHead" colspan="2" height="28"><span class="topictitle"><img src="templates/subSilver/images/folder.gif" align="absmiddle">&nbsp;&nbsp;{L_TOPIC}:&nbsp;<a href="{searchresults.U_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a></span></td> <td class="catHead" colspan="2" height="28"><span class="topictitle"><img src="templates/subSilver/images/folder.gif" align="absmiddle">&nbsp; {L_TOPIC}:&nbsp;<a href="{searchresults.U_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a></span></td>
</tr> </tr>
<tr> <tr>
<td width="22%" align="left" valign="top" class="row1" rowspan="2"><span class="name"><b>{searchresults.POSTER_NAME}</b></span><br /> <td width="150" align="left" valign="top" class="row1" rowspan="2"><span class="name"><b>{searchresults.POSTER_NAME}</b></span><br />
<br /> <br />
<span class="postdetails">{L_REPLIES}: <b>{searchresults.TOPIC_REPLIES}</b><br /> <span class="postdetails">{L_REPLIES}: <b>{searchresults.TOPIC_REPLIES}</b><br />
{L_VIEWS}: <b>{searchresults.TOPIC_VIEWS}</b></span><br /> {L_VIEWS}: <b>{searchresults.TOPIC_VIEWS}</b></span><br />
</td> </td>
<td valign="top" class="row1">{searchresults.MINI_POST_IMG}<span class="postdetails">{L_FORUM}:&nbsp;<b><a href="{searchresults.U_FORUM}" class="postdetails">{searchresults.FORUM_NAME}</a></b>&nbsp;&nbsp;&nbsp;{L_POSTED}: <td width="100%" valign="top" class="row1"><img src="{searchresults.MINI_POST_IMG}" width="12" height="9" alt="{searchresults.L_MINI_POST_ALT}" title="{searchresults.L_MINI_POST_ALT}" border="0" /><span class="postdetails">{L_FORUM}:&nbsp;<b><a href="{searchresults.U_FORUM}" class="postdetails">{searchresults.FORUM_NAME}</a></b>&nbsp; &nbsp;{L_POSTED}: {searchresults.POST_DATE}&nbsp; &nbsp;{L_SUBJECT}: <b><a href="{searchresults.U_POST}">{searchresults.POST_SUBJECT}</a></b></span></td>
{searchresults.POST_DATE}&nbsp;&nbsp;&nbsp;{L_SUBJECT}: <b><a href="{searchresults.U_POST}">{searchresults.POST_SUBJECT}</a></b></span></td>
</tr> </tr>
<tr> <tr>
<td valign="top" class="row1"><span class="postbody">{searchresults.MESSAGE}</span></td> <td valign="top" class="row1"><span class="postbody">{searchresults.MESSAGE}</span></td>

11
phpBB/templates/subSilver/search_results_topics.tpl
View file

@ -23,20 +23,15 @@
</tr> </tr>
<!-- BEGIN searchresults --> <!-- BEGIN searchresults -->
<tr> <tr>
<td class="row1" align="center" valign="middle">{searchresults.FOLDER}</td> <td class="row1" align="center" valign="middle"><img src="{searchresults.TOPIC_FOLDER_IMG}" width="19" height="18" alt="{searchresults.L_TOPIC_FOLDER_ALT}" title="{searchresults.L_TOPIC_FOLDER_ALT}" /></td>
<td class="row1"><span class="forumlink"><a href="{searchresults.U_VIEW_FORUM}" class="forumlink">{searchresults.FORUM_NAME}</a></span></td> <td class="row1"><span class="forumlink"><a href="{searchresults.U_VIEW_FORUM}" class="forumlink">{searchresults.FORUM_NAME}</a></span></td>
<td class="row2"><span class="topictitle">{searchresults.NEWEST_POST_IMG}{searchresults.TOPIC_TYPE}<a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a></span><br /><span class="gensmall">{searchresults.GOTO_PAGE}</span></td> <td class="row2"><span class="topictitle">{searchresults.NEWEST_POST_IMG}{searchresults.TOPIC_TYPE}<a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a></span><br /><span class="gensmall">{searchresults.GOTO_PAGE}</span></td>
<td class="row1" align="center" valign="middle"><span class="name">{searchresults.TOPIC_POSTER}</span></td> <td class="row1" align="center" valign="middle"><span class="name">{searchresults.TOPIC_AUTHOR}</span></td>
<td class="row2" align="center" valign="middle"><span class="postdetails">{searchresults.REPLIES}</span></td> <td class="row2" align="center" valign="middle"><span class="postdetails">{searchresults.REPLIES}</span></td>
<td class="row1" align="center" valign="middle"><span class="postdetails">{searchresults.VIEWS}</span></td> <td class="row1" align="center" valign="middle"><span class="postdetails">{searchresults.VIEWS}</span></td>
<td class="row2" align="center" valign="middle" nowrap="nowrap"><span class="postdetails">{searchresults.LAST_POST}</span></td> <td class="row2" align="center" valign="middle" nowrap="nowrap"><span class="postdetails">{searchresults.LAST_POST_TIME}<br />{searchresults.LAST_POST_AUTHOR} {searchresults.LAST_POST_IMG}</span></td>
</tr> </tr>
<!-- END searchresults --> <!-- END searchresults -->
<!-- BEGIN nosearchresults -->
<tr>
<td class="row1" colspan="7" height="30" align="center" valign="middle"><span class="gen">{L_NO_TOPICS}</span></td>
</tr>
<!-- END nosearchresults -->
<tr> <tr>
<td class="catBottom" colspan="7" height="28" valign="middle">&nbsp; </td> <td class="catBottom" colspan="7" height="28" valign="middle">&nbsp; </td>
</tr> </tr>

42
phpBB/templates/subSilver/search_username.tpl
View file

@ -5,38 +5,26 @@ function refresh_username(selected_username)
{ {
opener.document.forms['post'].username.value = selected_username; opener.document.forms['post'].username.value = selected_username;
opener.focus(); opener.focus();
window.close();
} }
//--> //-->
</script> </script>
<form method="post" name="search" action="{S_SEARCH_ACTION}"> <form method="post" name="search" action="{S_SEARCH_ACTION}">
<table width="100%" border="0" cellspacing="0" cellpadding="10"> <table width="100%" border="0" cellspacing="0" cellpadding="10">
<tr> <tr>
<td> <td><table width="100%" class="forumline" cellpadding="4" cellspacing="1" border="0">
<table width="100%" border="0" cellspacing="1" cellpadding="4" class="forumline"> <tr>
<tr> <th class="thHead" height="25">{L_SEARCH_USERNAME}</th>
<th class="thHead" height="25">{L_SEARCH_USERNAME}</th> </tr>
</tr> <tr>
<tr> <td valign="top" class="row1"><span class="genmed"><br /><input type="text" name="search_username" value="{USERNAME}" class="post" />&nbsp; <input type="submit" name="search" value="{L_SEARCH}" class="liteoption" /></span><br /><span class="gensmall">{L_SEARCH_EXPLAIN}</span><br />
<td valign="top" class="row1"><span class="genmed"><br /> <!-- BEGIN switch_select_name -->
<input type="text" name="search_author" value="{AUTHOR}" class="post" /> <span class="genmed">{L_UPDATE_USERNAME}<br /><select name="username_list">{S_USERNAME_OPTIONS}</select>&nbsp; <input type="submit" class="liteoption" onClick="refresh_username(this.form.username_list.options[this.form.username_list.selectedIndex].value);return false;" name="use" value="{L_SELECT}" /></span><br />
&nbsp; <!-- END switch_select_name -->
<input type="submit" name="search" value="{L_SEARCH}" class="liteoption" /> <br /><span class="genmed"><a href="javascript:window.close();" class="genmed">{L_CLOSE_WINDOW}</a></span></td>
</span><br /> </tr>
<span class="gensmall">{L_SEARCH_EXPLAIN}</span><br /> </table></td>
<!-- BEGIN switch_select_name -->
<span class="genmed">{L_UPDATE_USERNAME}<br />
<select name="author_list">{S_AUTHOR_OPTIONS}
</select>
&nbsp;
<input type="submit" class="liteoption" onClick="refresh_username(this.form.author_list.options[this.form.author_list.selectedIndex].value);return false;" name="use" value="{L_SELECT}" />
</span><br />
<!-- END switch_select_name -->
<br />
<span class="genmed"><a href="javascript:window.close();" class="genmed">{L_CLOSE_WINDOW}</a></span></td>
</tr>
</table>
</td>
</tr> </tr>
</table> </table>
</form> </form>

31
phpBB/templates/subSilver/simple_footer.tpl
View file

@ -1,22 +1,19 @@
<!-- <div align="center"><span class="copyright"><br />
<!--
Please note that the following copyright notice We request you retain the full copyright notice below including the link to www.phpbb.com.
MUST be displayed on each and every page output This not only gives respect to the large amount of time given freely by the developers
by phpBB. You may alter the font, colour etc. but but also helps build interest, traffic and use of phpBB 2.0. If you cannot (for good
you CANNOT remove it, nor change it so that it be, reason) retain the full copyright we request you at least leave in place the
to all intents and purposes, invisible. You may ADD Powered by phpBB {PHPBB_VERSION} line, with phpBB linked to www.phpbb.com. If you refuse
your own notice to it should you have altered the to include even this then support on our forums may be affected.
code but you may not replace it. The hyperlink must
also remain intact. These conditions are part of the
licence this software is released under. See the
LICENCE and README files for more information.
The phpBB Group : 2001
The phpBB Group : 2002
// --> // -->
<div align="center"> <span class="copyright"><br />Powered by phpBB {PHPBB_VERSION} &copy; 2001 <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB Powered by <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB</a> {PHPBB_VERSION} &copy; 2001 phpBB Group</span></div>
Group</a><br />{TRANSLATION_INFO}</span></div> </td>
&nbsp; </tr>
</table>
</body> </body>
</html> </html>

32
phpBB/templates/subSilver/viewforum_body.tpl
View file

@ -6,7 +6,7 @@
<td align="right" valign="bottom" nowrap><span class="gensmall"><b>{PAGINATION}</b></span></td> <td align="right" valign="bottom" nowrap><span class="gensmall"><b>{PAGINATION}</b></span></td>
</tr> </tr>
<tr> <tr>
<td align="left" valign="middle" width="50"><a href="{U_POST_NEW_TOPIC}"><img src="{IMG_POST}" border="0" alt="{L_POST_NEW_TOPIC}" /></a></td> <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>
<td align="left" valign="middle" class="nav" width="100%"><span class="nav">&nbsp;&nbsp;&nbsp;<a href="{U_INDEX}" class="nav">{L_INDEX}</a> -> <a class="nav" href="{U_VIEW_FORUM}">{FORUM_NAME}</a></span></td> <td align="left" valign="middle" class="nav" width="100%"><span class="nav">&nbsp;&nbsp;&nbsp;<a href="{U_INDEX}" class="nav">{L_INDEX}</a> -> <a class="nav" href="{U_VIEW_FORUM}">{FORUM_NAME}</a></span></td>
<td align="right" valign="bottom" class="nav" nowrap="nowrap"><span class="gensmall"><a href="{U_MARK_READ}">{L_MARK_TOPICS_READ}</a></span></td> <td align="right" valign="bottom" class="nav" nowrap="nowrap"><span class="gensmall"><a href="{U_MARK_READ}">{L_MARK_TOPICS_READ}</a></span></td>
</tr> </tr>
@ -16,26 +16,26 @@
<tr> <tr>
<th colspan="2" align="center" height="25" class="thCornerL" nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th> <th colspan="2" align="center" height="25" class="thCornerL" nowrap="nowrap">&nbsp;{L_TOPICS}&nbsp;</th>
<th width="50" align="center" class="thTop" nowrap="nowrap">&nbsp;{L_REPLIES}&nbsp;</th> <th width="50" align="center" class="thTop" nowrap="nowrap">&nbsp;{L_REPLIES}&nbsp;</th>
<th width="100" align="center" class="thTop" nowrap="nowrap">&nbsp;&nbsp;{L_AUTHOR}&nbsp;&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 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" nowrap="nowrap" class="thCornerR" nowrap="nowrap">&nbsp;{L_LASTPOST}&nbsp;</th>
</tr> </tr>
<!-- BEGIN topicrow --> <!-- BEGIN topicrow -->
<tr> <tr>
<td class="row1" align="center" valign="middle" width="20">{topicrow.FOLDER}</td> <td class="row1" align="center" valign="middle" width="20"><img src="{topicrow.TOPIC_FOLDER_IMG}" width="19" height="18" alt="{topicrow.L_TOPIC_FOLDER_ALT}" title="{topicrow.L_TOPIC_FOLDER_ALT}" /></td>
<td class="row1" width="100%"><span class="topictitle">{topicrow.NEWEST_POST_IMG}{topicrow.TOPIC_TYPE}<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a></span><span class="gensmall"><br /> <td class="row1" width="100%"><span class="topictitle">{topicrow.NEWEST_POST_IMG}{topicrow.TOPIC_TYPE}<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a></span><span class="gensmall"><br />
{topicrow.GOTO_PAGE}</span></td> {topicrow.GOTO_PAGE}</span></td>
<td class="row2" align="center" valign="middle"><span class="postdetails">{topicrow.REPLIES}</span></td> <td class="row2" align="center" valign="middle"><span class="postdetails">{topicrow.REPLIES}</span></td>
<td class="row3" align="center" valign="middle"><span class="name">{topicrow.TOPIC_POSTER}</span></td> <td class="row3" align="center" valign="middle"><span class="name">{topicrow.TOPIC_AUTHOR}</span></td>
<td class="row2" align="center" valign="middle"><span class="postdetails">{topicrow.VIEWS}</span></td> <td class="row2" align="center" valign="middle"><span class="postdetails">{topicrow.VIEWS}</span></td>
<td class="row3Right" align="center" valign="middle" nowrap="nowrap"><span class="postdetails">{topicrow.LAST_POST}</span></td> <td class="row3Right" align="center" valign="middle" nowrap="nowrap"><span class="postdetails">{topicrow.LAST_POST_TIME}<br />{topicrow.LAST_POST_AUTHOR} {topicrow.LAST_POST_IMG}</span></td>
</tr> </tr>
<!-- END topicrow --> <!-- END topicrow -->
<!-- BEGIN notopicsrow --> <!-- BEGIN switch_no_topics -->
<tr> <tr>
<td class="row1" colspan="6" height="30" align="center" valign="middle"><span class="gen">{L_NO_TOPICS}</span></td> <td class="row1" colspan="6" height="30" align="center" valign="middle"><span class="gen">{L_NO_TOPICS}</span></td>
</tr> </tr>
<!-- END notopicsrow --> <!-- END switch_no_topics -->
<tr> <tr>
<td class="catBottom" align="center" valign="middle" colspan="6" height="28"><span class="genmed">{L_DISPLAY_TOPICS}:&nbsp;{S_SELECT_TOPIC_DAYS}&nbsp; <td class="catBottom" align="center" valign="middle" colspan="6" height="28"><span class="genmed">{L_DISPLAY_TOPICS}:&nbsp;{S_SELECT_TOPIC_DAYS}&nbsp;
<input type="submit" class="liteoption" value="{L_GO}" name="submit" /> <input type="submit" class="liteoption" value="{L_GO}" name="submit" />
@ -45,7 +45,7 @@
<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2"> <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
<tr> <tr>
<td align="left" valign="middle" width="50"><a href="{U_POST_NEW_TOPIC}"><img src="{IMG_POST}" border="0" alt="{L_POST_NEW_TOPIC}" /></a></td> <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>
<td align="left" valign="middle" width="100%"><span class="nav">&nbsp;&nbsp;&nbsp;<a href="{U_INDEX}" class="nav">{L_INDEX}</a> -> <a class="nav" href="{U_VIEW_FORUM}">{FORUM_NAME}</a></span></td> <td align="left" valign="middle" width="100%"><span class="nav">&nbsp;&nbsp;&nbsp;<a href="{U_INDEX}" class="nav">{L_INDEX}</a> -> <a class="nav" href="{U_VIEW_FORUM}">{FORUM_NAME}</a></span></td>
<td align="right" valign="middle" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><br /><span class="nav">{PAGINATION}</span> <td align="right" valign="middle" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><br /><span class="nav">{PAGINATION}</span>
</td> </td>
@ -66,30 +66,30 @@
<tr> <tr>
<td align="left" valign="top"><table cellspacing="3" cellpadding="0" border="0"> <td align="left" valign="top"><table cellspacing="3" cellpadding="0" border="0">
<tr> <tr>
<td width="20" align="left"><img src="templates/subSilver/images/folder_new.gif" alt="{L_NEW_POSTS}" width="19" height="18" /></td> <td width="20" align="left"><img src="{FOLDER_NEW_IMG}" alt="{L_NEW_POSTS}" width="19" height="18" /></td>
<td class="gensmall">{L_NEW_POSTS}</td> <td class="gensmall">{L_NEW_POSTS}</td>
<td>&nbsp;&nbsp;</td> <td>&nbsp;&nbsp;</td>
<td width="20" align="center"><img src="templates/subSilver/images/folder.gif" alt="{L_NO_NEW_POSTS}" width="19" height="18" /></td> <td width="20" align="center"><img src="{FOLDER_IMG}" alt="{L_NO_NEW_POSTS}" width="19" height="18" /></td>
<td class="gensmall">{L_NO_NEW_POSTS}</td> <td class="gensmall">{L_NO_NEW_POSTS}</td>
<td>&nbsp;&nbsp;</td> <td>&nbsp;&nbsp;</td>
<td width="20" align="center"><img src="templates/subSilver/images/folder_announce.gif" alt="{L_ANNOUNCEMENT}" width="19" height="18" /></td> <td width="20" align="center"><img src="{FOLDER_ANNOUNCE_IMG}" alt="{L_ANNOUNCEMENT}" width="19" height="18" /></td>
<td class="gensmall">{L_ANNOUNCEMENT}</td> <td class="gensmall">{L_ANNOUNCEMENT}</td>
</tr> </tr>
<tr> <tr>
<td width="20" align="center"><img src="templates/subSilver/images/folder_new_hot.gif" alt="{L_NEW_POSTS_HOT}" width="19" height="18" /></td> <td width="20" align="center"><img src="{FOLDER_HOT_NEW_IMG}" alt="{L_NEW_POSTS_HOT}" width="19" height="18" /></td>
<td class="gensmall">{L_NEW_POSTS_HOT}</td> <td class="gensmall">{L_NEW_POSTS_HOT}</td>
<td>&nbsp;&nbsp;</td> <td>&nbsp;&nbsp;</td>
<td width="20" align="center"><img src="templates/subSilver/images/folder_hot.gif" alt="{L_NO_NEW_POSTS_HOT}" width="19" height="18" /></td> <td width="20" align="center"><img src="{FOLDER_HOT_IMG}" alt="{L_NO_NEW_POSTS_HOT}" width="19" height="18" /></td>
<td class="gensmall">{L_NO_NEW_POSTS_HOT}</td> <td class="gensmall">{L_NO_NEW_POSTS_HOT}</td>
<td>&nbsp;&nbsp;</td> <td>&nbsp;&nbsp;</td>
<td width="20" align="center"><img src="templates/subSilver/images/folder_sticky.gif" alt="{L_STICKY}" width="19" height="18" /></td> <td width="20" align="center"><img src="{FOLDER_STICKY_IMG}" alt="{L_STICKY}" width="19" height="18" /></td>
<td class="gensmall">{L_STICKY}</td> <td class="gensmall">{L_STICKY}</td>
</tr> </tr>
<tr> <tr>
<td class="gensmall"><img src="templates/subSilver/images/folder_lock_new.gif" alt="{L_NEW_POSTS_TOPIC_LOCKED}" width="19" height="18" /></td> <td class="gensmall"><img src="{FOLDER_LOCKED_NEW_IMG}" alt="{L_NEW_POSTS_TOPIC_LOCKED}" width="19" height="18" /></td>
<td class="gensmall">{L_NEW_POSTS_LOCKED}</td> <td class="gensmall">{L_NEW_POSTS_LOCKED}</td>
<td>&nbsp;&nbsp;</td> <td>&nbsp;&nbsp;</td>
<td class="gensmall"><img src="templates/subSilver/images/folder_lock.gif" alt="{L_NO_NEW_POSTS_TOPIC_LOCKED}" width="19" height="18" /></td> <td class="gensmall"><img src="{FOLDER_LOCKED_IMG}" alt="{L_NO_NEW_POSTS_TOPIC_LOCKED}" width="19" height="18" /></td>
<td class="gensmall">{L_NO_NEW_POSTS_LOCKED}</td> <td class="gensmall">{L_NO_NEW_POSTS_LOCKED}</td>
</tr> </tr>
</table></td> </table></td>

2
phpBB/templates/subSilver/viewonline_body.tpl
View file

@ -43,6 +43,8 @@
</tr> </tr>
</table> </table>
<br />
<table width="100%" cellspacing="2" border="0" align="center"> <table width="100%" cellspacing="2" border="0" align="center">
<tr> <tr>
<td valign="top" align="right">{JUMPBOX}</td> <td valign="top" align="right">{JUMPBOX}</td>

127
phpBB/templates/subSilver/viewtopic_body.tpl
View file

@ -9,91 +9,68 @@
<table width="100%" cellspacing="2" cellpadding="2" border="0"> <table width="100%" cellspacing="2" cellpadding="2" border="0">
<tr> <tr>
<td align="left" valign="bottom" nowrap="nowrap"><span class="nav"><a href="{U_POST_NEW_TOPIC}"><img src="{IMG_POST}" border="0" alt="{L_POST_NEW_TOPIC}" align="middle" /></a>&nbsp;&nbsp;&nbsp;<a href="{U_POST_REPLY_TOPIC}"><img src="{IMG_REPLY}" border="0" alt="{L_POST_REPLY_TOPIC}" align="middle" /></a></span></td> <td align="left" valign="bottom" nowrap="nowrap"><span class="nav"><a href="{U_POST_NEW_TOPIC}"><img src="{POST_IMG}" border="0" alt="{L_POST_NEW_TOPIC}" align="middle" /></a>&nbsp;&nbsp;&nbsp;<a href="{U_POST_REPLY_TOPIC}"><img src="{REPLY_IMG}" border="0" alt="{L_POST_REPLY_TOPIC}" align="middle" /></a></span></td>
<td align="left" valign="middle" width="100%"><span class="nav">&nbsp;&nbsp;&nbsp;<a href="{U_INDEX}" class="nav">{L_INDEX}</a> <td align="left" valign="middle" width="100%"><span class="nav">&nbsp;&nbsp;&nbsp;<a href="{U_INDEX}" class="nav">{L_INDEX}</a>
-> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td> -> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td>
</tr> </tr>
</table> </table>
<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline"> <table class="forumline" width="100%" cellspacing="1" cellpadding="3" border="0">
<tr align="right"> <tr align="right">
<td class="catHead" colspan="2" height="28"><span class="nav"><a href="{U_VIEW_OLDER_TOPIC}" class="nav">{L_VIEW_PREVIOUS_TOPIC}</a> <td class="catHead" colspan="2" height="28"><span class="nav"><a href="{U_VIEW_OLDER_TOPIC}" class="nav">{L_VIEW_PREVIOUS_TOPIC}</a> :: <a href="{U_VIEW_NEWER_TOPIC}" class="nav">{L_VIEW_NEXT_TOPIC}</a> &nbsp;</span></td>
:: <a href="{U_VIEW_NEWER_TOPIC}" class="nav">{L_VIEW_NEXT_TOPIC}</a> &nbsp;</span></td> </tr>
</tr> {POLL_DISPLAY}
{POLL_DISPLAY} <tr>
<tr> <th class="thLeft" width="150" height="26" nowrap="nowrap">{L_AUTHOR}</th>
<th class="thLeft" width="22%" height="26" nowrap="nowrap">{L_AUTHOR}</th> <th class="thRight" nowrap="nowrap">{L_MESSAGE}</th>
<th class="thRight" nowrap="nowrap">{L_MESSAGE}</th> </tr>
</tr> <!-- BEGIN postrow -->
<!-- BEGIN postrow --> <tr>
<tr> <td width="150" align="left" valign="top" class="{postrow.ROW_CLASS}"><span class="name"><a name="{postrow.U_POST_ID}"></a><b>{postrow.POSTER_NAME}</b></span><br /><span class="postdetails">{postrow.POSTER_RANK}<br />{postrow.RANK_IMAGE}{postrow.POSTER_AVATAR}<br /><br />{postrow.POSTER_JOINED}<br />{postrow.POSTER_POSTS}<br />{postrow.POSTER_FROM}</span><br /></td>
<td width="22%" align="left" valign="top" class="{postrow.ROW_CLASS}"><span class="name"><a name="{postrow.U_POST_ID}"></a><b>{postrow.POSTER_NAME}</b></span><br /> <td class="{postrow.ROW_CLASS}" width="100%" height="28" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="0">
<span class="postdetails">{postrow.POSTER_RANK}<br /> <tr>
{postrow.RANK_IMAGE}{postrow.POSTER_AVATAR}<br /> <td width="100%"><a href="{postrow.U_MINI_POST}"><img src="{postrow.MINI_POST_IMG}" width="12" height="9" alt="{postrow.L_MINI_POST_ALT}" title="{postrow.L_MINI_POST_ALT}" border="0" /></a><span class="postdetails">{L_POSTED}: {postrow.POST_DATE}<span class="gen">&nbsp;</span>&nbsp; &nbsp;{L_POST_SUBJECT}: {postrow.POST_SUBJECT}</span></td>
<br /> <td valign="top" align="right" nowrap="nowrap">{postrow.QUOTE_IMG} {postrow.EDIT_IMG} {postrow.DELETE_IMG} {postrow.IP_IMG}</td>
{postrow.POSTER_JOINED}<br /> </tr>
{postrow.POSTER_POSTS}<br /> <tr>
{postrow.POSTER_FROM}</span><br /> <td colspan="2"><hr /></td>
</td> </tr>
<td class="{postrow.ROW_CLASS}" height="28" valign="top"> <tr>
<table width="100%" border="0" cellspacing="0" cellpadding="0"> <td colspan="2"><span class="postbody">{postrow.MESSAGE}{postrow.SIGNATURE}</span><span class="gensmall">{postrow.EDITED_MESSAGE}</span></td>
<tr> </tr>
<td width="100%"><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><span class="postdetails">{L_POSTED}: </table></td>
{postrow.POST_DATE}<span class="gen">&nbsp;</span>&nbsp;&nbsp;&nbsp;{L_POST_SUBJECT}: </tr>
{postrow.POST_SUBJECT}</span></td> <tr>
<td nowrap="nowrap" valign="top" align="right">{postrow.QUOTE_IMG} <td class="{postrow.ROW_CLASS}" width="150" align="left" valign="middle"><span class="nav"><a href="#top" class="nav">{L_BACK_TO_TOP}</a></span></td>
{postrow.EDIT_IMG} {postrow.DELETE_IMG} {postrow.IP_IMG}</td> <td class="{postrow.ROW_CLASS}" width="100%" height="28" valign="bottom" nowrap="nowrap"><table cellspacing="0" cellpadding="0" border="0" height="18" width="18">
</tr> <tr>
<tr> <td valign="middle" nowrap="nowrap">{postrow.PROFILE_IMG} {postrow.PM_IMG} {postrow.EMAIL_IMG} {postrow.WWW_IMG} {postrow.AIM_IMG} {postrow.YIM_IMG} {postrow.MSN_IMG}<script language="JavaScript" type="text/javascript"><!--
<td colspan="2"><hr /></td>
</tr>
<tr>
<td colspan="2"><span class="postbody">{postrow.MESSAGE}{postrow.SIGNATURE}</span><span class="gensmall">{postrow.EDITED_MESSAGE}</span></td>
</tr>
</table>
</td>
</tr>
<tr>
<td width="22%" align="left" valign="middle" class="{postrow.ROW_CLASS}">
<span class="nav"><a href="#top" class="nav">{L_BACK_TO_TOP}</a></span></td>
<td width="78%" height="28" class="{postrow.ROW_CLASS}" nowrap="nowrap" valign="bottom">
<table cellspacing="0" cellpadding="0" border="0" height="18" width="18">
<tr>
<td valign="middle" nowrap="nowrap">{postrow.PROFILE_IMG} {postrow.PM_IMG} {postrow.EMAIL_IMG}
{postrow.WWW_IMG} {postrow.AIM_IMG} {postrow.YIM_IMG} {postrow.MSN_IMG}<script language="JavaScript" type="text/javascript"><!--
if ( navigator.userAgent.toLowerCase().indexOf('mozilla') != -1 && navigator.userAgent.indexOf('5.') == -1 ) if ( navigator.userAgent.toLowerCase().indexOf('mozilla') != -1 && navigator.userAgent.indexOf('5.') == -1 )
document.write(' {postrow.ICQ_ADD_IMG}'); document.write(' {postrow.ICQ_IMG}');
else else
document.write('</td><td>&nbsp;</td><td valign="top" nowrap="nowrap"><div style="position:relative"><div style="position:absolute">{postrow.ICQ_ADD_IMG}</div><div style="position:absolute;left:3px;top:-1px">{postrow.ICQ_STATUS_IMG}</div></div>'); document.write('</td><td>&nbsp;</td><td valign="top" nowrap="nowrap"><div style="position:relative"><div style="position:absolute">{postrow.ICQ_IMG}</div><div style="position:absolute;left:3px;top:-1px">{postrow.ICQ_STATUS_IMG}</div></div>');
//--></script><noscript>{postrow.ICQ_ADD_IMG}</noscript></td> //--></script><noscript>{postrow.ICQ_IMG}</noscript></td>
</tr> </tr>
</table> </table></td>
</td> </tr>
</tr> <tr>
<tr> <td class="spaceRow" colspan="2" height="1"><img src="templates/subSilver/images/spacer.gif" alt="" width="1" height="1" /></td>
<td colspan="2" height="1" class="spaceRow"><img src="templates/subSilver/images/spacer.gif" alt="" width="1" height="1" /></td> </tr>
</tr> <!-- END postrow -->
<!-- END postrow --> <tr align="center">
<tr align="center"> <td class="catBottom" colspan="2" height="28"><table cellspacing="0" cellpadding="0" border="0">
<td class="catBottom" colspan="2" height="28"> <tr><form method="post" action="{S_POST_DAYS_ACTION}">
<table border="0" cellspacing="0" cellpadding="0"> <td align="center"><span class="gensmall">{L_DISPLAY_POSTS}: {S_SELECT_POST_DAYS}&nbsp;{S_SELECT_POST_ORDER}&nbsp;<input type="submit" value="{L_GO}" class="liteoption" name="submit" /></span></td>
<tr> </form></tr>
<form method="post" action="{S_POST_DAYS_ACTION}"> </table></td>
<td align="center"><span class="gensmall">{L_DISPLAY_POSTS}:&nbsp;{S_SELECT_POST_DAYS}&nbsp;{S_SELECT_POST_ORDER}&nbsp; </tr>
<input type="submit" value="{L_GO}" class="liteoption" name="submit" />
</span></td>
</form>
</tr>
</table>
</td>
</tr>
</table> </table>
<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2"> <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
<tr> <tr>
<td align="left" valign="middle" nowrap="nowrap"><span class="nav"><a href="{U_POST_NEW_TOPIC}"><img src="{IMG_POST}" border="0" alt="{L_POST_NEW_TOPIC}" align="middle" /></a>&nbsp;&nbsp;&nbsp;<a href="{U_POST_REPLY_TOPIC}"><img src="{IMG_REPLY}" border="0" alt="{L_POST_REPLY_TOPIC}" align="middle" /></a></span></td> <td align="left" valign="middle" nowrap="nowrap"><span class="nav"><a href="{U_POST_NEW_TOPIC}"><img src="{POST_IMG}" border="0" alt="{L_POST_NEW_TOPIC}" align="middle" /></a>&nbsp;&nbsp;&nbsp;<a href="{U_POST_REPLY_TOPIC}"><img src="{REPLY_IMG}" border="0" alt="{L_POST_REPLY_TOPIC}" align="middle" /></a></span></td>
<td align="left" valign="middle" width="100%"><span class="nav">&nbsp;&nbsp;&nbsp;<a href="{U_INDEX}" class="nav">{L_INDEX}</a> <td align="left" valign="middle" width="100%"><span class="nav">&nbsp;&nbsp;&nbsp;<a href="{U_INDEX}" class="nav">{L_INDEX}</a>
-> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td> -> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td>
<td align="right" valign="top" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><br /><span class="nav">{PAGINATION}</span> <td align="right" valign="top" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span><br /><span class="nav">{PAGINATION}</span>

2
phpBB/templates/subSilver/viewtopic_poll_ballot.tpl
View file

@ -1,5 +1,5 @@
<tr> <tr>
<td class="row2" colspan="2"><br clear="all" /><form method="POST" action="{S_VOTE_ACTION}"><table cellspacing="0" cellpadding="4" border="0" align="center"> <td class="row2" colspan="2"><br clear="all" /><form method="POST" action="{S_POLL_ACTION}"><table cellspacing="0" cellpadding="4" border="0" align="center">
<tr> <tr>
<td align="center"><span class="gen"><b>{POLL_QUESTION}</b></span></td> <td align="center"><span class="gen"><b>{POLL_QUESTION}</b></span></td>
</tr> </tr>

85
phpBB/viewforum.php
View file

@ -389,26 +389,15 @@ $page_title = $lang['View_forum'] . ' - ' . $forum_row['forum_name'];
include($phpbb_root_path . 'includes/page_header.'.$phpEx); include($phpbb_root_path . 'includes/page_header.'.$phpEx);
$template->set_filenames(array( $template->set_filenames(array(
'body' => 'viewforum_body.tpl', 'body' => 'viewforum_body.tpl')
'jumpbox' => 'jumpbox.tpl')
); );
make_jumpbox('viewforum.'.$phpEx);
$jumpbox = make_jumpbox();
$template->assign_vars(array(
'L_GO' => $lang['Go'],
'L_JUMP_TO' => $lang['Jump_to'],
'L_SELECT_FORUM' => $lang['Select_forum'],
'S_JUMPBOX_LIST' => $jumpbox,
'S_JUMPBOX_ACTION' => append_sid("viewforum.$phpEx"))
);
$template->assign_var_from_handle('JUMPBOX', 'jumpbox');
$template->assign_vars(array( $template->assign_vars(array(
'FORUM_ID' => $forum_id, 'FORUM_ID' => $forum_id,
'FORUM_NAME' => $forum_row['forum_name'], 'FORUM_NAME' => $forum_row['forum_name'],
'MODERATORS' => $forum_moderators, 'MODERATORS' => $forum_moderators,
'IMG_POST' => ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $images['post_locked'] : $images['post_new'], 'POST_IMG' => ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $images['post_locked'] : $images['post_new'],
'FOLDER_IMG' => $images['folder'], 'FOLDER_IMG' => $images['folder'],
'FOLDER_NEW_IMG' => $images['folder_new'], 'FOLDER_NEW_IMG' => $images['folder_new'],
@ -421,9 +410,25 @@ $template->assign_vars(array(
'FOLDER_ANNOUNCE_IMG' => $images['folder_announce'], 'FOLDER_ANNOUNCE_IMG' => $images['folder_announce'],
'FOLDER_ANNOUNCE_NEW_IMG' => $images['folder_announce_new'], 'FOLDER_ANNOUNCE_NEW_IMG' => $images['folder_announce_new'],
'L_TOPICS' => $lang['Topics'],
'L_REPLIES' => $lang['Replies'],
'L_VIEWS' => $lang['Views'],
'L_POSTS' => $lang['Posts'],
'L_LASTPOST' => $lang['Last_Post'],
'L_MODERATOR' => $l_moderators, 'L_MODERATOR' => $l_moderators,
'L_MARK_TOPICS_READ' => $lang['Mark_all_topics'], 'L_MARK_TOPICS_READ' => $lang['Mark_all_topics'],
'L_POST_NEW_TOPIC' => ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $lang['Forum_locked'] : $lang['Post_new_topic'], 'L_POST_NEW_TOPIC' => ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $lang['Forum_locked'] : $lang['Post_new_topic'],
'L_NO_NEW_POSTS' => $lang['No_new_posts'],
'L_NEW_POSTS' => $lang['New_posts'],
'L_NO_NEW_POSTS_LOCKED' => $lang['No_new_posts_locked'],
'L_NEW_POSTS_LOCKED' => $lang['New_posts_locked'],
'L_NO_NEW_POSTS_HOT' => $lang['No_new_posts_hot'],
'L_NEW_POSTS_HOT' => $lang['New_posts_hot'],
'L_ANNOUNCEMENT' => $lang['Post_Announcement'],
'L_STICKY' => $lang['Post_Sticky'],
'L_POSTED' => $lang['Posted'],
'L_JOINED' => $lang['Joined'],
'L_AUTHOR' => $lang['Author'],
'S_AUTH_LIST' => $s_auth_can, 'S_AUTH_LIST' => $s_auth_can,
@ -473,7 +478,8 @@ if( $total_topics )
$topic_type = $lang['Topic_Moved'] . ' '; $topic_type = $lang['Topic_Moved'] . ' ';
$topic_id = $topic_rowset[$i]['topic_moved_id']; $topic_id = $topic_rowset[$i]['topic_moved_id'];
$folder_image = '<img src="' . $images['folder'] . '" alt="' . $lang['No_new_posts'] . '" title="' . $lang['No_new_posts'] . '" />'; $folder_image = $images['folder'];
$folder_alt = $lang['Topic_Moved'];
$newest_post_img = ''; $newest_post_img = '';
} }
else else
@ -542,36 +548,40 @@ if( $total_topics )
if( $unread_topics ) if( $unread_topics )
{ {
$folder_image = '<img src="' . $folder_new . '" alt="' . $lang['New_posts'] . '" title="' . $lang['New_posts'] . '" />'; $folder_image = $folder_new;
$folder_alt = $lang['New_posts'];
$newest_post_img = '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=newest") . '"><img src="' . $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> '; $newest_post_img = '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=newest") . '"><img src="' . $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> ';
} }
else else
{ {
$folder_image = $folder;
$folder_alt = ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts']; $folder_alt = ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
$folder_image = '<img src="' . $folder . '" alt="' . $folder_alt . '" title="' . $folder_alt . '" border="0" />';
$newest_post_img = ''; $newest_post_img = '';
} }
} }
else else
{ {
$folder_image = '<img src="' . $folder_new . '" alt="' . $lang['New_posts'] . '" title="' . $lang['New_posts'] . '" />'; $folder_image = $folder_new;
$folder_alt = ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
$newest_post_img = '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=newest") . '"><img src="' . $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> '; $newest_post_img = '<a href="' . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=newest") . '"><img src="' . $images['icon_newest_reply'] . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> ';
} }
} }
else else
{ {
$folder_image = $folder;
$folder_alt = ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts']; $folder_alt = ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
$folder_image = '<img src="' . $folder . '" alt="' . $folder_alt . '" title="' . $folder_alt . '" border="0" />';
$newest_post_img = ''; $newest_post_img = '';
} }
} }
else else
{ {
$folder_image = $folder;
$folder_alt = ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts']; $folder_alt = ( $topic_rowset[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];
$folder_image = '<img src="' . $folder . '" alt="' . $folder_alt . '" title="' . $folder_alt . '" border="0" />';
$newest_post_img = ''; $newest_post_img = '';
} }
} }
@ -606,35 +616,43 @@ if( $total_topics )
$view_topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id"); $view_topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id");
$topic_poster = ( $topic_rowset[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $topic_rowset[$i]['user_id']) . '">' : ''; $topic_author = ( $topic_rowset[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . '=' . $topic_rowset[$i]['user_id']) . '">' : '';
$topic_poster .= ( $topic_rowset[$i]['user_id'] != ANONYMOUS ) ? $topic_rowset[$i]['username'] : ( ( $topic_rowset[$i]['post_username'] != "" ) ? $topic_rowset[$i]['post_username'] : $lang['Guest'] ); $topic_author .= ( $topic_rowset[$i]['user_id'] != ANONYMOUS ) ? $topic_rowset[$i]['username'] : ( ( $topic_rowset[$i]['post_username'] != '' ) ? $topic_rowset[$i]['post_username'] : $lang['Guest'] );
$topic_poster .= ( $topic_rowset[$i]['user_id'] != ANONYMOUS ) ? '</a>' : '';
$topic_author .= ( $topic_rowset[$i]['user_id'] != ANONYMOUS ) ? '</a>' : '';
$first_post_time = create_date($board_config['default_dateformat'], $topic_rowset[$i]['topic_time'], $board_config['board_timezone']);
$last_post_time = create_date($board_config['default_dateformat'], $topic_rowset[$i]['post_time'], $board_config['board_timezone']); $last_post_time = create_date($board_config['default_dateformat'], $topic_rowset[$i]['post_time'], $board_config['board_timezone']);
$last_post = $last_post_time . '<br />'; $last_post_author = ( $topic_rowset[$i]['id2'] == ANONYMOUS ) ? ( ($topic_rowset[$i]['post_username2'] != '' ) ? $topic_rowset[$i]['post_username2'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . '=' . $topic_rowset[$i]['id2']) . '">' . $topic_rowset[$i]['user2'] . '</a>';
$last_post .= ( $topic_rowset[$i]['id2'] == ANONYMOUS ) ? ( ($topic_rowset[$i]['post_username2'] != "" ) ? $topic_rowset[$i]['post_username2'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $topic_rowset[$i]['id2']) . '">' . $topic_rowset[$i]['user2'] . '</a> ';
$last_post .= '<a href="' . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=" . $topic_rowset[$i]['topic_last_post_id']) . "#" . $topic_rowset[$i]['topic_last_post_id'] . '"><img src="' . $images['icon_latest_reply'] . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>'; $last_post_url = '<a href="' . append_sid("viewtopic.$phpEx?" . POST_POST_URL . '=' . $topic_rowset[$i]['topic_last_post_id']) . '#' . $topic_rowset[$i]['topic_last_post_id'] . '"><img src="' . $images['icon_latest_reply'] . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>';
$views = $topic_rowset[$i]['topic_views']; $views = $topic_rowset[$i]['topic_views'];
$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2']; $row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2']; $row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
$template->assign_block_vars("topicrow", array( $template->assign_block_vars('topicrow', array(
'ROW_COLOR' => $row_color,
'ROW_CLASS' => $row_class,
'FORUM_ID' => $forum_id, 'FORUM_ID' => $forum_id,
'TOPIC_ID' => $topic_id, 'TOPIC_ID' => $topic_id,
'FOLDER' => $folder_image, 'TOPIC_FOLDER_IMG' => $folder_image,
'TOPIC_POSTER' => $topic_poster, 'TOPIC_AUTHOR' => $topic_author,
'GOTO_PAGE' => $goto_page, 'GOTO_PAGE' => $goto_page,
'REPLIES' => $replies, 'REPLIES' => $replies,
'NEWEST_POST_IMG' => $newest_post_img, 'NEWEST_POST_IMG' => $newest_post_img,
'TOPIC_TITLE' => $topic_title, 'TOPIC_TITLE' => $topic_title,
'TOPIC_TYPE' => $topic_type, 'TOPIC_TYPE' => $topic_type,
'VIEWS' => $views, 'VIEWS' => $views,
'LAST_POST' => $last_post, 'FIRST_POST_TIME' => $first_post_time,
'ROW_COLOR' => $row_color, 'LAST_POST_TIME' => $last_post_time,
'ROW_CLASS' => $row_class, 'LAST_POST_AUTHOR' => $last_post_author,
'LAST_POST_IMG' => $last_post_url,
'L_TOPIC_FOLDER_ALT' => $folder_alt,
'U_VIEW_TOPIC' => $view_topic_url) 'U_VIEW_TOPIC' => $view_topic_url)
); );
@ -646,7 +664,6 @@ if( $total_topics )
'L_GOTO_PAGE' => $lang['Goto_page']) 'L_GOTO_PAGE' => $lang['Goto_page'])
); );
} }
else else
{ {
@ -658,7 +675,7 @@ else
'L_NO_TOPICS' => $no_topics_msg) 'L_NO_TOPICS' => $no_topics_msg)
); );
$template->assign_block_vars('notopicsrow', array() ); $template->assign_block_vars('switch_no_topics', array() );
} }

73
phpBB/viewonline.php
View file

@ -21,7 +21,7 @@
***************************************************************************/ ***************************************************************************/
define('IN_PHPBB', true); define('IN_PHPBB', true);
$phpbb_root_path = "./"; $phpbb_root_path = './';
include($phpbb_root_path . 'extension.inc'); include($phpbb_root_path . 'extension.inc');
include($phpbb_root_path . 'common.'.$phpEx); include($phpbb_root_path . 'common.'.$phpEx);
@ -35,37 +35,22 @@ init_userprefs($userdata);
// //
// //
// Output page header and load // Output page header and load viewonline template
// viewonline template
// //
$page_title = $lang['Who_is_online']; $page_title = $lang['Who_is_online'];
include($phpbb_root_path . 'includes/page_header.'.$phpEx); include($phpbb_root_path . 'includes/page_header.'.$phpEx);
$template->set_filenames(array( $template->set_filenames(array(
"body" => "viewonline_body.tpl", 'body' => 'viewonline_body.tpl')
"jumpbox" => "jumpbox.tpl")
); );
make_jumpbox('viewforum.'.$phpEx);
$jumpbox = make_jumpbox();
$template->assign_vars(array(
"L_GO" => $lang['Go'],
"L_JUMP_TO" => $lang['Jump_to'],
"L_SELECT_FORUM" => $lang['Select_forum'],
"S_JUMPBOX_LIST" => $jumpbox,
"S_JUMPBOX_ACTION" => append_sid("viewforum.$phpEx"))
);
$template->assign_var_from_handle("JUMPBOX", "jumpbox");
//
// End header
//
$template->assign_vars(array( $template->assign_vars(array(
"L_WHOSONLINE" => $lang['Who_is_online'], 'L_WHOSONLINE' => $lang['Who_is_online'],
"L_ONLINE_EXPLAIN" => $lang['Online_explain'], 'L_ONLINE_EXPLAIN' => $lang['Online_explain'],
"L_USERNAME" => $lang['Username'], 'L_USERNAME' => $lang['Username'],
"L_FORUM_LOCATION" => $lang['Forum_Location'], 'L_FORUM_LOCATION' => $lang['Forum_Location'],
"L_LAST_UPDATE" => $lang['Last_updated']) 'L_LAST_UPDATE' => $lang['Last_updated'])
); );
// //
@ -82,7 +67,7 @@ if( $result = $db->sql_query($sql) )
} }
else else
{ {
message_die(GENERAL_ERROR, "Couldn't obtain user/online forums information.", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not obtain user/online forums information', '', __LINE__, __FILE__, $sql);
} }
// //
@ -95,14 +80,14 @@ $is_auth_ary = auth(AUTH_VIEW, AUTH_LIST_ALL, $userdata);
// Get user list // 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_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
FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE . " s FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
WHERE u.user_id = s.session_user_id WHERE u.user_id = s.session_user_id
AND ( u.user_session_time >= " . ( time() - 300 ) . " AND ( s.session_time >= ".( time() - 300 ) . "
OR s.session_time >= " . ( time() - 300 ) . " ) OR u.user_session_time >= " . ( time() - 300 ) . " )
ORDER BY u.username ASC, s.session_ip"; ORDER BY u.username ASC, s.session_ip ASC";
if ( !($result = $db->sql_query($sql)) ) if ( !($result = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, "Couldn't obtain regd user/online information.", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Could not obtain regd user/online information', '', __LINE__, __FILE__, $sql);
} }
if( $row = $db->sql_fetchrow($result) ) if( $row = $db->sql_fetchrow($result) )
@ -128,7 +113,7 @@ if( $row = $db->sql_fetchrow($result) )
{ {
$username = $row['username']; $username = $row['username'];
$style_color = ""; $style_color = '';
if ( $row['user_level'] == ADMIN ) if ( $row['user_level'] == ADMIN )
{ {
$username = '<b style="color:#' . $theme['fontcolor3'] . '">' . $username . '</b>'; $username = '<b style="color:#' . $theme['fontcolor3'] . '">' . $username . '</b>';
@ -226,7 +211,7 @@ if( $row = $db->sql_fetchrow($result) )
} }
else else
{ {
$location_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $user_page); $location_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . '=' . $user_page);
$location = $forum_data[$user_page]; $location = $forum_data[$user_page];
} }
@ -234,14 +219,14 @@ if( $row = $db->sql_fetchrow($result) )
$row_class = ( $$which_counter % 2 ) ? $theme['td_class1'] : $theme['td_class2']; $row_class = ( $$which_counter % 2 ) ? $theme['td_class1'] : $theme['td_class2'];
$template->assign_block_vars("$which_row", array( $template->assign_block_vars("$which_row", array(
"ROW_COLOR" => "#" . $row_color, 'ROW_COLOR' => '#' . $row_color,
"ROW_CLASS" => $row_class, 'ROW_CLASS' => $row_class,
"USERNAME" => $username, 'USERNAME' => $username,
"LASTUPDATE" => create_date($board_config['default_dateformat'], $last_update, $board_config['board_timezone']), 'LASTUPDATE' => create_date($board_config['default_dateformat'], $last_update, $board_config['board_timezone']),
"FORUM_LOCATION" => $location, 'FORUM_LOCATION' => $location,
"U_USER_PROFILE" => append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $user_id), 'U_USER_PROFILE' => append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . '=' . $user_id),
"U_FORUM_LOCATION" => append_sid($location_url)) 'U_FORUM_LOCATION' => append_sid($location_url))
); );
$$which_counter++; $$which_counter++;
@ -289,26 +274,26 @@ if( $row = $db->sql_fetchrow($result) )
} }
$template->assign_vars(array( $template->assign_vars(array(
"TOTAL_REGISTERED_USERS_ONLINE" => sprintf($l_r_user_s, $registered_users) . sprintf($l_h_user_s, $hidden_users), 'TOTAL_REGISTERED_USERS_ONLINE' => sprintf($l_r_user_s, $registered_users) . sprintf($l_h_user_s, $hidden_users),
"TOTAL_GUEST_USERS_ONLINE" => sprintf($l_g_user_s, $guest_users)) 'TOTAL_GUEST_USERS_ONLINE' => sprintf($l_g_user_s, $guest_users))
); );
if ( $registered_users + $hidden_users == 0 ) if ( $registered_users + $hidden_users == 0 )
{ {
$template->assign_vars(array( $template->assign_vars(array(
"L_NO_REGISTERED_USERS_BROWSING" => $lang['No_users_browsing']) 'L_NO_REGISTERED_USERS_BROWSING' => $lang['No_users_browsing'])
); );
} }
if ( $guest_users == 0 ) if ( $guest_users == 0 )
{ {
$template->assign_vars(array( $template->assign_vars(array(
"L_NO_GUESTS_BROWSING" => $lang['No_users_browsing']) 'L_NO_GUESTS_BROWSING' => $lang['No_users_browsing'])
); );
} }
} }
$template->pparse("body"); $template->pparse('body');
include($phpbb_root_path . 'includes/page_tail.'.$phpEx); include($phpbb_root_path . 'includes/page_tail.'.$phpEx);

258
phpBB/viewtopic.php
View file

@ -45,11 +45,7 @@ if ( isset($HTTP_GET_VARS[POST_POST_URL]))
$start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0; $start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0;
// if ( !isset($topic_id) && !isset($post_id) )
// End initial var setup
//
if( !isset($topic_id) && !isset($post_id) )
{ {
message_die(GENERAL_MESSAGE, 'Topic_post_not_exist'); message_die(GENERAL_MESSAGE, 'Topic_post_not_exist');
} }
@ -62,6 +58,8 @@ if ( isset($HTTP_GET_VARS['view']) && empty($HTTP_GET_VARS[POST_POST_URL]) )
{ {
if ( $HTTP_GET_VARS['view'] == 'newest' ) if ( $HTTP_GET_VARS['view'] == 'newest' )
{ {
$header_location = ( @preg_match('/Microsoft|WebSTAR|Xitami/', getenv('SERVER_SOFTWARE')) ) ? 'Refresh: 0; URL=' : 'Location: ';
if ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_sid']) ) if ( isset($HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_sid']) )
{ {
$session_id = $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_sid']; $session_id = $HTTP_COOKIE_VARS[$board_config['cookie_name'] . '_sid'];
@ -85,24 +83,15 @@ if ( isset($HTTP_GET_VARS['view']) && empty($HTTP_GET_VARS[POST_POST_URL]) )
{ {
message_die(GENERAL_MESSAGE, 'No_new_posts_last_visit'); message_die(GENERAL_MESSAGE, 'No_new_posts_last_visit');
} }
else
{ $post_id = $row['post_id'];
$post_id = $row['post_id']; header($header_location . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=$post_id#$post_id", true));
header("Location: " . append_sid("viewtopic.$phpEx?" . POST_POST_URL . "=$post_id#$post_id", true));
exit;
}
}
else
{
header("Location: " . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id", true));
exit; exit;
} }
} }
else
{ header($header_location . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id", true));
header("Location: " . append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id", true)); exit;
exit;
}
} }
else if ( $HTTP_GET_VARS['view'] == 'next' || $HTTP_GET_VARS['view'] == 'previous' ) else if ( $HTTP_GET_VARS['view'] == 'next' || $HTTP_GET_VARS['view'] == 'previous' )
{ {
@ -224,7 +213,7 @@ if( $userdata['session_logged_in'] )
FROM " . TOPICS_WATCH_TABLE . " FROM " . TOPICS_WATCH_TABLE . "
WHERE topic_id = $topic_id WHERE topic_id = $topic_id
AND user_id = " . $userdata['user_id']; AND user_id = " . $userdata['user_id'];
if( !($result = $db->sql_query($sql)) ) if ( !($result = $db->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, "Could not obtain topic watch information", '', __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, "Could not obtain topic watch information", '', __LINE__, __FILE__, $sql);
} }
@ -462,7 +451,6 @@ if ( count($orig_word) )
if ( isset($HTTP_GET_VARS['highlight']) ) if ( isset($HTTP_GET_VARS['highlight']) )
{ {
$highlight_match = array(); $highlight_match = array();
$highlight_replace = array();
// //
// Split words and phrases // Split words and phrases
@ -473,13 +461,11 @@ if ( isset($HTTP_GET_VARS['highlight']) )
{ {
if ( trim($words[$i]) != '' ) if ( trim($words[$i]) != '' )
{ {
$highlight_match[] = '#\b(\/?)(' . str_replace("*", ".*?", $words[$i]) . ')(?!(.*?".">.*?<)|(.*?\">)|((1)?'.'>))\b#i'; $highlight_match[] = '#\b(' . str_replace("*", "([\w]+)?", $words[$i]) . ')\b#is';
$highlight_replace[] = '<span style="color:#' . $theme['fontcolor3'] . '"><b>\2</b></span>';
} }
} }
$highlight_active = ( count($highlight_match) ) ? true : false; $highlight_active = ( count($highlight_match) ) ? true : false;
} }
else else
{ {
@ -492,9 +478,7 @@ else
// //
$new_topic_url = append_sid("posting.$phpEx?mode=newtopic&amp;" . POST_FORUM_URL . "=$forum_id"); $new_topic_url = append_sid("posting.$phpEx?mode=newtopic&amp;" . POST_FORUM_URL . "=$forum_id");
$reply_topic_url = append_sid("posting.$phpEx?mode=reply&amp;" . POST_TOPIC_URL . "=$topic_id"); $reply_topic_url = append_sid("posting.$phpEx?mode=reply&amp;" . POST_TOPIC_URL . "=$topic_id");
$view_forum_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id"); $view_forum_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id");
$view_prev_topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=previous"); $view_prev_topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=previous");
$view_next_topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=next"); $view_next_topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=next");
@ -540,7 +524,7 @@ if ( $userdata['session_logged_in'] )
$topic_last_read = $userdata['user_lastvisit']; $topic_last_read = $userdata['user_lastvisit'];
} }
if( count($tracking_topics) == 150 && empty($tracking_topics[$topic_id]) ) if ( count($tracking_topics) >= 150 && empty($tracking_topics[$topic_id]) )
{ {
asort($tracking_topics); asort($tracking_topics);
unset($tracking_topics[key($tracking_topics)]); unset($tracking_topics[key($tracking_topics)]);
@ -548,39 +532,22 @@ if ( $userdata['session_logged_in'] )
$tracking_topics[$topic_id] = time(); $tracking_topics[$topic_id] = time();
setcookie($board_config['cookie_name'] . _t, serialize($tracking_topics), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']); setcookie($board_config['cookie_name'] . '_t', serialize($tracking_topics), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
} }
//
// Dump out the page header and load viewtopic body template
//
// //
// Load templates // Load templates
// //
$template->set_filenames(array( $template->set_filenames(array(
'body' => 'viewtopic_body.tpl', 'body' => 'viewtopic_body.tpl')
'jumpbox' => 'jumpbox.tpl')
); );
make_jumpbox('viewforum.'.$phpEx, $forum_id);
$jumpbox = make_jumpbox($forum_id);
$template->assign_vars(array(
'L_GO' => $lang['Go'],
'L_JUMP_TO' => $lang['Jump_to'],
'L_SELECT_FORUM' => $lang['Select_forum'],
'S_JUMPBOX_LIST' => $jumpbox,
'S_JUMPBOX_ACTION' => append_sid("viewforum.$phpEx"))
);
$template->assign_var_from_handle('JUMPBOX', 'jumpbox');
// //
// Output page header // Output page header
// //
$page_title = $lang['View_topic'] .' - ' . $topic_title; $page_title = $lang['View_topic'] .' - ' . $topic_title;
include($phpbb_root_path . 'includes/page_header.'.$phpEx); include($phpbb_root_path . 'includes/page_header.'.$phpEx);
//
// End header
//
// //
// User authorisation levels output // User authorisation levels output
@ -608,7 +575,6 @@ if ( $is_auth['auth_mod'] )
// Topic watch information // Topic watch information
// //
$s_watching_topic = ''; $s_watching_topic = '';
if ( $can_watch_topic ) if ( $can_watch_topic )
{ {
if ( $is_watching_topic ) if ( $is_watching_topic )
@ -640,9 +606,11 @@ $template->assign_vars(array(
'PAGINATION' => $pagination, 'PAGINATION' => $pagination,
'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $board_config['posts_per_page'] ) + 1 ), ceil( $total_replies / $board_config['posts_per_page'] )), 'PAGE_NUMBER' => sprintf($lang['Page_of'], ( floor( $start / $board_config['posts_per_page'] ) + 1 ), ceil( $total_replies / $board_config['posts_per_page'] )),
'IMG_POST' => $post_img, 'POST_IMG' => $post_img,
'IMG_REPLY' => $reply_img, 'REPLY_IMG' => $reply_img,
'L_AUTHOR' => $lang['Author'],
'L_MESSAGE' => $lang['Message'],
'L_POSTED' => $lang['Posted'], 'L_POSTED' => $lang['Posted'],
'L_POST_SUBJECT' => $lang['Post_subject'], 'L_POST_SUBJECT' => $lang['Post_subject'],
'L_VIEW_NEXT_TOPIC' => $lang['View_next_topic'], 'L_VIEW_NEXT_TOPIC' => $lang['View_next_topic'],
@ -803,11 +771,10 @@ if ( !empty($forum_row['topic_vote']) )
'POLL_QUESTION' => $vote_title, 'POLL_QUESTION' => $vote_title,
'S_HIDDEN_FIELDS' => ( !empty($s_hidden_fields) ) ? $s_hidden_fields : '', 'S_HIDDEN_FIELDS' => ( !empty($s_hidden_fields) ) ? $s_hidden_fields : '',
'S_VOTE_ACTION' => append_sid("posting.$phpEx?" . POST_TOPIC_URL . "=$topic_id")) 'S_POLL_ACTION' => append_sid("posting.$phpEx?" . POST_TOPIC_URL . "=$topic_id"))
); );
$template->assign_var_from_handle('POLL_DISPLAY', 'pollbox'); $template->assign_var_from_handle('POLL_DISPLAY', 'pollbox');
} }
} }
@ -861,31 +828,24 @@ for($i = 0; $i < $total_posts; $i++)
// //
if ( $userdata['session_logged_in'] && $postrow[$i]['post_time'] > $userdata['user_lastvisit'] && $postrow[$i]['post_time'] > $topic_last_read ) if ( $userdata['session_logged_in'] && $postrow[$i]['post_time'] > $userdata['user_lastvisit'] && $postrow[$i]['post_time'] > $topic_last_read )
{ {
$mini_post_img = '<img src="' . $images['icon_minipost_new'] . '" alt="' . $lang['New_post'] . '" title="' . $lang['New_post'] . '" border="0" />'; $mini_post_img = $images['icon_minipost_new'];
$mini_post_alt = $lang['New_post'];
} }
else else
{ {
$mini_post_img = '<img src="' . $images['icon_minipost'] . '" alt="' . $lang['Post'] . '" title="' . $lang['Post'] . '" border="0" />'; $mini_post_img = $images['icon_minipost'];
$mini_post_alt = $lang['Post'];
} }
$mini_post_url = append_sid("viewtopic.$phpEx?" . POST_POST_URL . '=' . $postrow[$i]['post_id']) . '#' . $postrow[$i]['post_id']; $mini_post_url = append_sid("viewtopic.$phpEx?" . POST_POST_URL . '=' . $postrow[$i]['post_id']) . '#' . $postrow[$i]['post_id'];
// //
// Generate ranks // Generate ranks, set them to empty string initially.
//
//
// Set them to empty string initially, in case we don't find a rank for this dude.
// //
$poster_rank = ''; $poster_rank = '';
$rank_image = ''; $rank_image = '';
if ( $postrow[$i]['user_id'] == ANONYMOUS ) if ( $postrow[$i]['user_id'] == ANONYMOUS )
{ {
//
// This is redundant, but some day we might wanna stick in a rank for anon. posts.
//
$poster_rank = '';
$rank_image = '';
} }
else if ( $postrow[$i]['user_rank'] ) else if ( $postrow[$i]['user_rank'] )
{ {
@ -919,85 +879,123 @@ for($i = 0; $i < $total_posts; $i++)
$poster_rank = $lang['Guest']; $poster_rank = $lang['Guest'];
} }
$temp_url = '';
if ( $poster_id != ANONYMOUS ) if ( $poster_id != ANONYMOUS )
{ {
$profile_img = '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$poster_id") . '"><img src="' . $images['icon_profile'] . '" alt="' . $lang['Read_profile'] . '" title="' . $lang['Read_profile'] . '" border="0" /></a>'; $temp_url = append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$poster_id");
$profile_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_profile'] . '" alt="' . $lang['Read_profile'] . '" title="' . $lang['Read_profile'] . '" border="0" /></a>';
$profile = '<a href="' . $temp_url . '">' . $lang['Read_profile'] . '</a>';
$pm_img = '<a href="' . append_sid("privmsg.$phpEx?mode=post&amp;" . POST_USERS_URL . "=$poster_id") . '"><img src="' . $images['icon_pm'] . '" alt="' . $lang['Send_private_message'] . '" title="' . $lang['Send_private_message'] . '" border="0" /></a>'; $temp_url = append_sid("privmsg.$phpEx?mode=post&amp;" . POST_USERS_URL . "=$poster_id");
$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($postrow[$i]['user_viewemail']) || $is_auth['auth_mod'] ) if ( !empty($postrow[$i]['user_viewemail']) || $is_auth['auth_mod'] )
{ {
$email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&amp;" . POST_USERS_URL .'=' . $poster_id) : 'mailto:' . $postrow[$i]['user_email']; $email_uri = ( $board_config['board_email_form'] ) ? append_sid("profile.$phpEx?mode=email&amp;" . POST_USERS_URL .'=' . $poster_id) : 'mailto:' . $postrow[$i]['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_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>';
} }
else else
{ {
$email_img = ''; $email_img = '';
$email = '';
} }
$www_img = ($postrow[$i]['user_website']) ? '<a href="' . $postrow[$i]['user_website'] . '" target="_userwww"><img src="' . $images['icon_www'] . '" alt="' . $lang['Visit_website'] . '" title="' . $lang['Visit_website'] . '" border="0" /></a>' : ''; $www_img = ( $postrow[$i]['user_website'] ) ? '<a href="' . $postrow[$i]['user_website'] . '" target="_userwww"><img src="' . $images['icon_www'] . '" alt="' . $lang['Visit_website'] . '" title="' . $lang['Visit_website'] . '" border="0" /></a>' : '';
$www = ( $postrow[$i]['user_website'] ) ? '<a href="' . $postrow[$i]['user_website'] . '" target="_userwww">' . $lang['Visit_website'] . '</a>' : '';
if ( !empty($postrow[$i]['user_icq']) ) if ( !empty($postrow[$i]['user_icq']) )
{ {
$icq_status_img = '<a href="http://wwp.icq.com/' . $postrow[$i]['user_icq'] . '#pager"><img src="http://web.icq.com/whitepages/online?icq=' . $postrow[$i]['user_icq'] . '&img=5" width="18" height="18" border="0" /></a>'; $icq_status_img = '<a href="http://wwp.icq.com/' . $postrow[$i]['user_icq'] . '#pager"><img src="http://web.icq.com/whitepages/online?icq=' . $postrow[$i]['user_icq'] . '&img=5" width="18" height="18" border="0" /></a>';
$icq_add_img = '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $postrow[$i]['user_icq'] . '"><img src="' . $images['icon_icq'] . '" alt="' . $lang['ICQ'] . '" title="' . $lang['ICQ'] . '" border="0" /></a>'; $icq_img = '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $postrow[$i]['user_icq'] . '"><img src="' . $images['icon_icq'] . '" alt="' . $lang['ICQ'] . '" title="' . $lang['ICQ'] . '" border="0" /></a>';
$icq = '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $postrow[$i]['user_icq'] . '">' . $lang['ICQ'] . '</a>';
} }
else else
{ {
$icq_status_img = ''; $icq_status_img = '';
$icq_add_img = ''; $icq_img = '';
$icq = '';
} }
$aim_img = ( $postrow[$i]['user_aim'] ) ? '<a href="aim:goim?screenname=' . $postrow[$i]['user_aim'] . '&amp;message=Hello+Are+you+there?"><img src="' . $images['icon_aim'] . '" alt="' . $lang['AIM'] . '" title="' . $lang['AIM'] . '" border="0" /></a>' : ''; $aim_img = ( $postrow[$i]['user_aim'] ) ? '<a href="aim:goim?screenname=' . $postrow[$i]['user_aim'] . '&amp;message=Hello+Are+you+there?"><img src="' . $images['icon_aim'] . '" alt="' . $lang['AIM'] . '" title="' . $lang['AIM'] . '" border="0" /></a>' : '';
$aim = ( $postrow[$i]['user_aim'] ) ? '<a href="aim:goim?screenname=' . $postrow[$i]['user_aim'] . '&amp;message=Hello+Are+you+there?">' . $lang['AIM'] . '</a>' : '';
$msn_img = ( $postrow[$i]['user_msnm'] ) ? '<a href="' . append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$poster_id") . '"><img src="' . $images['icon_msnm'] . '" alt="' . $lang['MSNM'] . '" title="' . $lang['MSNM'] . '" border="0" /></a>' : ''; $temp_url = append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=$poster_id");
$msn_img = ( $postrow[$i]['user_msnm'] ) ? '<a href="' . $temp_url . '"><img src="' . $images['icon_msnm'] . '" alt="' . $lang['MSNM'] . '" title="' . $lang['MSNM'] . '" border="0" /></a>' : '';
$msn = ( $postrow[$i]['user_msnm'] ) ? '<a href="' . $temp_url . '">' . $lang['MSNM'] . '</a>' : '';
$yim_img = ( $postrow[$i]['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $postrow[$i]['user_yim'] . '&amp;.src=pg"><img src="' . $images['icon_yim'] . '" alt="' . $lang['YIM'] . '" title="' . $lang['YIM'] . '" border="0" /></a>' : ''; $yim_img = ( $postrow[$i]['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $postrow[$i]['user_yim'] . '&amp;.src=pg"><img src="' . $images['icon_yim'] . '" alt="' . $lang['YIM'] . '" title="' . $lang['YIM'] . '" border="0" /></a>' : '';
$yim = ( $postrow[$i]['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $postrow[$i]['user_yim'] . '&amp;.src=pg">' . $lang['YIM'] . '</a>' : '';
} }
else else
{ {
$profile_img = ''; $profile_img = '';
$profile = '';
$pm_img = ''; $pm_img = '';
$pm = '';
$email_img = ''; $email_img = '';
$email = '';
$www_img = ''; $www_img = '';
$www = '';
$icq_status_img = ''; $icq_status_img = '';
$icq_add_img = ''; $icq_img = '';
$icq = '';
$aim_img = ''; $aim_img = '';
$aim = '';
$msn_img = ''; $msn_img = '';
$msn = '';
$yim_img = ''; $yim_img = '';
$yim = '';
} }
$quote_img = '<a href="' . append_sid("posting.$phpEx?mode=quote&amp;" . POST_POST_URL . "=" . $postrow[$i]['post_id']) . '"><img src="' . $images['icon_quote'] . '" alt="' . $lang['Reply_with_quote'] . '" title="' . $lang['Reply_with_quote'] . '" border="0" /></a>'; $temp_url = append_sid("posting.$phpEx?mode=quote&amp;" . POST_POST_URL . "=" . $postrow[$i]['post_id']);
$quote_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_quote'] . '" alt="' . $lang['Reply_with_quote'] . '" title="' . $lang['Reply_with_quote'] . '" border="0" /></a>';
$quote = '<a href="' . $temp_url . '">' . $lang['Reply_with_quote'] . '</a>';
$search_img = '<a href="' . append_sid("search.$phpEx?search_author=" . urlencode($poster)) . '"><img src="' . $images['icon_search'] . '" border="0" /></a>'; $temp_url = append_sid("search.$phpEx?search_author=" . urlencode($postrow[$i]['username']) . "&amp;showresults=posts");
$search_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_search'] . '" alt="' . $lang['Search_user_posts'] . '" title="' . $lang['Search_user_posts'] . '" border="0" /></a>';
$search = '<a href="' . $temp_url . '">' . $lang['Search_user_posts'] . '</a>';
if ( ( $userdata['user_id'] == $poster_id && $is_auth['auth_edit'] ) || $is_auth['auth_mod'] ) if ( ( $userdata['user_id'] == $poster_id && $is_auth['auth_edit'] ) || $is_auth['auth_mod'] )
{ {
$edit_img = '<a href="' . append_sid("posting.$phpEx?mode=editpost&amp;" . POST_POST_URL . "=" . $postrow[$i]['post_id']) . '"><img src="' . $images['icon_edit'] . '" alt="' . $lang['Edit_delete_post'] . '" title="' . $lang['Edit_delete_post'] . '" border="0" /></a>'; $temp_url = append_sid("posting.$phpEx?mode=editpost&amp;" . POST_POST_URL . "=" . $postrow[$i]['post_id']);
$edit_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_edit'] . '" alt="' . $lang['Edit_delete_post'] . '" title="' . $lang['Edit_delete_post'] . '" border="0" /></a>';
$edit = '<a href="' . $temp_url . '">' . $lang['Edit_delete_post'] . '</a>';
} }
else else
{ {
$edit_img = ''; $edit_img = '';
$edit = '';
} }
if ( $is_auth['auth_mod'] ) if ( $is_auth['auth_mod'] )
{ {
$ip_img = '<a href="' . append_sid("modcp.$phpEx?mode=ip&amp;" . POST_POST_URL . "=" . $postrow[$i]['post_id'] . "&amp;" . POST_TOPIC_URL . "=" . $topic_id) . '"><img src="' . $images['icon_ip'] . '" alt="' . $lang['View_IP'] . '" title="' . $lang['View_IP'] . '" border="0" /></a>'; $temp_url = append_sid("modcp.$phpEx?mode=ip&amp;" . POST_POST_URL . "=" . $postrow[$i]['post_id'] . "&amp;" . POST_TOPIC_URL . "=" . $topic_id);
$ip_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_ip'] . '" alt="' . $lang['View_IP'] . '" title="' . $lang['View_IP'] . '" border="0" /></a>';
$ip = '<a href="' . $temp_url . '">' . $lang['View_IP'] . '</a>';
$delpost_img = '<a href="' . append_sid("posting.$phpEx?mode=delete&amp;" . POST_POST_URL . "=" . $postrow[$i]['post_id']) . '"><img src="' . $images['icon_delpost'] . '" alt="' . $lang['Delete_post'] . '" title="' . $lang['Delete_post'] . '" border="0" /></a>'; $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 = '<a href="' . $temp_url . '">' . $lang['Delete_post'] . '</a>';
} }
else else
{ {
$ip_img = ''; $ip_img = '';
$ip = '';
if ( $userdata['user_id'] == $poster_id && $is_auth['auth_delete'] && $i == $total_replies - 1 ) if ( $userdata['user_id'] == $poster_id && $is_auth['auth_delete'] && $i == $total_replies - 1 )
{ {
$delpost_img = '<a href="' . append_sid("posting.$phpEx?mode=delete&amp;" . POST_POST_URL . "=" . $postrow[$i]['post_id']) . '"><img src="' . $images['icon_delpost'] . '" alt="' . $lang['Delete_post'] . '" title="' . $lang['Delete_post'] . '" border="0" /></a>'; $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>';
} }
else else
{ {
$delpost_img = ''; $delpost_img = '';
$delpost = '';
} }
} }
@ -1010,8 +1008,7 @@ for($i = 0; $i < $total_posts; $i++)
$user_sig_bbcode_uid = $postrow[$i]['user_sig_bbcode_uid']; $user_sig_bbcode_uid = $postrow[$i]['user_sig_bbcode_uid'];
// //
// Note! The order used for parsing the message _is_ // Note! The order used for parsing the message _is_ important, moving things around could break any
// important, moving things around could break any
// output // output
// //
@ -1048,7 +1045,7 @@ for($i = 0; $i < $total_posts; $i++)
} }
} }
if ( $user_sig != '' ) if ( $user_sig != '' && $board_config['allow_sig'] )
{ {
$user_sig = make_clickable($user_sig); $user_sig = make_clickable($user_sig);
} }
@ -1059,7 +1056,77 @@ for($i = 0; $i < $total_posts; $i++)
// //
if ( $highlight_active ) if ( $highlight_active )
{ {
$message = preg_replace($highlight_match, $highlight_replace, $message); if ( preg_match('/<.*>/', $message) )
{
$message = preg_replace($highlight_match, '<!-- #sh -->\1<!-- #eh -->', $message);
$end_html = 0;
$start_html = 1;
$temp_message = '';
$message = ' ' . $message . ' ';
while( $start_html = strpos($message, '<', $start_html) )
{
$grab_length = $start_html - $end_html - 1;
$temp_message .= substr($message, $end_html + 1, $grab_length);
if ( $end_html = strpos($message, '>', $start_html) )
{
$length = $end_html - $start_html + 1;
$hold_string = substr($message, $start_html, $length);
if ( strrpos(' ' . $hold_string, '<') != 1 )
{
$end_html = $start_html + 1;
$end_counter = 1;
while ( $end_counter && $end_html < strlen($message) )
{
if ( substr($message, $end_html, 1) == '>' )
{
$end_counter--;
}
else if ( substr($message, $end_html, 1) == '<' )
{
$end_counter++;
}
$end_html++;
}
$length = $end_html - $start_html + 1;
$hold_string = substr($message, $start_html, $length);
$hold_string = str_replace('<!-- #sh -->', '', $hold_string);
$hold_string = str_replace('<!-- #eh -->', '', $hold_string);
}
else if ( $hold_string == '<!-- #sh -->' )
{
$hold_string = str_replace('<!-- #sh -->', '<span style="color:#' . $theme['fontcolor3'] . '"><b>', $hold_string);
}
else if ( $hold_string == '<!-- #eh -->' )
{
$hold_string = str_replace('<!-- #eh -->', '</b></span>', $hold_string);
}
$temp_message .= $hold_string;
$start_html += $length;
}
else
{
$start_html = strlen($message);
}
}
$grab_length = strlen($message) - $end_html - 1;
$temp_message .= substr($message, $end_html + 1, $grab_length);
$message = trim($temp_message);
}
else
{
$message = preg_replace($highlight_match, '<span style="color:#' . $theme['fontcolor3'] . '"><b>\1</b></span>', $message);
}
} }
// //
@ -1098,7 +1165,7 @@ for($i = 0; $i < $total_posts; $i++)
// //
if ( $user_sig != '' ) if ( $user_sig != '' )
{ {
$user_sig = '<br />_________________<br />' . str_replace("\n", "\n<br />", $user_sig); $user_sig = '<br />_________________<br />' . str_replace("\n", "\n<br />\n", $user_sig);
} }
$message = str_replace("\n", "\n<br />\n", $message); $message = str_replace("\n", "\n<br />\n", $message);
@ -1127,8 +1194,6 @@ for($i = 0; $i < $total_posts; $i++)
$template->assign_block_vars('postrow', array( $template->assign_block_vars('postrow', array(
'ROW_COLOR' => '#' . $row_color, 'ROW_COLOR' => '#' . $row_color,
'ROW_CLASS' => $row_class, 'ROW_CLASS' => $row_class,
'MINI_POST_IMG' => $mini_post_img,
'POSTER_NAME' => $poster, 'POSTER_NAME' => $poster,
'POSTER_RANK' => $poster_rank, 'POSTER_RANK' => $poster_rank,
'RANK_IMAGE' => $rank_image, 'RANK_IMAGE' => $rank_image,
@ -1136,33 +1201,44 @@ for($i = 0; $i < $total_posts; $i++)
'POSTER_POSTS' => $poster_posts, 'POSTER_POSTS' => $poster_posts,
'POSTER_FROM' => $poster_from, 'POSTER_FROM' => $poster_from,
'POSTER_AVATAR' => $poster_avatar, 'POSTER_AVATAR' => $poster_avatar,
'POST_DATE' => $post_date, 'POST_DATE' => $post_date,
'POST_SUBJECT' => $post_subject, 'POST_SUBJECT' => $post_subject,
'MESSAGE' => $message, 'MESSAGE' => $message,
'SIGNATURE' => $user_sig, 'SIGNATURE' => $user_sig,
'EDITED_MESSAGE' => $l_edited_by, 'EDITED_MESSAGE' => $l_edited_by,
'MINI_POST_IMG' => $mini_post_img,
'PROFILE_IMG' => $profile_img, 'PROFILE_IMG' => $profile_img,
'PROFILE' => $profile,
'SEARCH_IMG' => $search_img, 'SEARCH_IMG' => $search_img,
'SEARCH' => $search,
'PM_IMG' => $pm_img, 'PM_IMG' => $pm_img,
'PM' => $pm,
'EMAIL_IMG' => $email_img, 'EMAIL_IMG' => $email_img,
'EMAIL' => $email,
'WWW_IMG' => $www_img, 'WWW_IMG' => $www_img,
'ICQ' => ( !empty($postrow[$i]['user_icq']) ) ? $postrow[$i]['user_icq'] : '&nbsp;', 'WWW' => $www,
'ICQ_IMG' => ( !empty($postrow[$i]['user_icq']) ) ? $images['icon_icq'] : '&nbsp;',
'ICQ_STATUS_IMG' => $icq_status_img, 'ICQ_STATUS_IMG' => $icq_status_img,
'ICQ_ADD_IMG' => $icq_add_img, 'ICQ_IMG' => $icq_img,
'ICQ' => $icq,
'AIM_IMG' => $aim_img, 'AIM_IMG' => $aim_img,
'AIM' => $aim,
'MSN_IMG' => $msn_img, 'MSN_IMG' => $msn_img,
'MSN' => $msn,
'YIM_IMG' => $yim_img, 'YIM_IMG' => $yim_img,
'YIM' => $yim,
'EDIT_IMG' => $edit_img, 'EDIT_IMG' => $edit_img,
'EDIT' => $edit,
'QUOTE_IMG' => $quote_img, 'QUOTE_IMG' => $quote_img,
'QUOTE' => $quote,
'IP_IMG' => $ip_img, 'IP_IMG' => $ip_img,
'IP' => $ip,
'DELETE_IMG' => $delpost_img, 'DELETE_IMG' => $delpost_img,
'DELETE' => $delpost,
'L_MINI_POST_ALT' => $mini_post_alt,
'U_MINI_POST' => $mini_post_url, 'U_MINI_POST' => $mini_post_url,
'U_POST_ID' => $postrow[$i]['post_id']) 'U_POST_ID' => $postrow[$i]['post_id'])
); );
} }