diff options
Diffstat (limited to 'phpBB')
61 files changed, 3819 insertions, 2839 deletions
diff --git a/phpBB/admin/admin_board.php b/phpBB/admin/admin_board.php index ddce69b9a2..0b248c1b21 100644 --- a/phpBB/admin/admin_board.php +++ b/phpBB/admin/admin_board.php @@ -138,6 +138,7 @@ $template->assign_vars(array( "SMILE_NO" => $smile_no, "SIG_YES" => $sig_yes, "SIG_NO" => $sig_no, + "SIG_SIZE" => $new['max_sig_chars'], "NAMECHANGE_YES" => $namechange_yes, "NAMECHANGE_NO" => $namechange_no, "AVATARS_LOCAL_YES" => $avatars_local_yes, diff --git a/phpBB/db/mssql_basic.sql b/phpBB/db/mssql_basic.sql index 65d761815d..1cd27eba43 100644 --- a/phpBB/db/mssql_basic.sql +++ b/phpBB/db/mssql_basic.sql @@ -35,6 +35,9 @@ INSERT INTO phpbb_config VALUES ('topics_per_page','50'); INSERT INTO phpbb_config VALUES ('hot_threshold','25'); INSERT INTO phpbb_config VALUES ('max_poll_options','10'); INSERT INTO phpbb_config VALUES ('max_sig_chars','255'); +INSERT INTO phpbb_config VALUES ('max_inbox_privmsgs','50'); +INSERT INTO phpbb_config VALUES ('max_sentbox_privmsgs','25'); +INSERT INTO phpbb_config VALUES ('max_savebox_privmsgs','50'); INSERT INTO phpbb_config VALUES ('board_email_sig','Thanks, The Management'); INSERT INTO phpbb_config VALUES ('board_email','youraddress@yourdomain.com'); INSERT INTO phpbb_config VALUES ('smtp_delivery','0'); diff --git a/phpBB/db/mssql_schema.sql b/phpBB/db/mssql_schema.sql index ad29e5323e..e0e4fdcb0d 100644 --- a/phpBB/db/mssql_schema.sql +++ b/phpBB/db/mssql_schema.sql @@ -259,13 +259,13 @@ CREATE TABLE [phpbb_privmsgs] ( [privmsgs_enable_bbcode] [smallint] NULL , [privmsgs_enable_html] [smallint] NULL , [privmsgs_enable_smilies] [smallint] NULL , - [privmsgs_enable_sig] [smallint] NULL , - [privmsgs_bbcode_uid] [char] (10) NULL + [privmsgs_attach_sig] [smallint] NULL , ) ON [PRIMARY] GO CREATE TABLE [phpbb_privmsgs_text] ( [privmsgs_text_id] [int] NOT NULL , + [privmsgs_bbcode_uid] [char] (10) NULL [privmsgs_text] [text] NULL ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] GO diff --git a/phpBB/db/mysql_basic.sql b/phpBB/db/mysql_basic.sql index 7fa9606d02..36b0503c4a 100644 --- a/phpBB/db/mysql_basic.sql +++ b/phpBB/db/mysql_basic.sql @@ -29,6 +29,9 @@ INSERT INTO phpbb_config VALUES ('topics_per_page','50'); INSERT INTO phpbb_config VALUES ('hot_threshold','25'); INSERT INTO phpbb_config VALUES ('max_poll_options','10'); INSERT INTO phpbb_config VALUES ('max_sig_chars','255'); +INSERT INTO phpbb_config VALUES ('max_inbox_privmsgs','50'); +INSERT INTO phpbb_config VALUES ('max_sentbox_privmsgs','25'); +INSERT INTO phpbb_config VALUES ('max_savebox_privmsgs','50'); INSERT INTO phpbb_config VALUES ('board_email_sig','Thanks, The Management'); INSERT INTO phpbb_config VALUES ('board_email','youraddress@yourdomain.com'); INSERT INTO phpbb_config VALUES ('smtp_delivery','0'); diff --git a/phpBB/db/mysql_schema.sql b/phpBB/db/mysql_schema.sql index 76e62f2e0f..ab74d4b9ff 100644 --- a/phpBB/db/mysql_schema.sql +++ b/phpBB/db/mysql_schema.sql @@ -216,8 +216,7 @@ CREATE TABLE phpbb_privmsgs ( privmsgs_enable_bbcode tinyint(1) DEFAULT '1' NOT NULL, privmsgs_enable_html tinyint(1) DEFAULT '0' NOT NULL, privmsgs_enable_smilies tinyint(1) DEFAULT '1' NOT NULL, - privmsgs_enable_sig tinyint(1) DEFAULT '1' NOT NULL, - privmsgs_bbcode_uid char(10) DEFAULT '0' NOT NULL, + privmsgs_attach_sig tinyint(1) DEFAULT '1' NOT NULL, PRIMARY KEY (privmsgs_id), KEY privmsgs_from_userid (privmsgs_from_userid), KEY privmsgs_to_userid (privmsgs_to_userid) @@ -231,6 +230,7 @@ CREATE TABLE phpbb_privmsgs ( DROP TABLE IF EXISTS phpbb_privmsgs_text; CREATE TABLE phpbb_privmsgs_text ( privmsgs_text_id int(11) DEFAULT '0' NOT NULL, + privmsgs_bbcode_uid char(10) DEFAULT '0' NOT NULL, privmsgs_text text, PRIMARY KEY (privmsgs_text_id) ); diff --git a/phpBB/db/oracle_basic.sql b/phpBB/db/oracle_basic.sql index 301e6d1e6c..3a1c358353 100755 --- a/phpBB/db/oracle_basic.sql +++ b/phpBB/db/oracle_basic.sql @@ -29,6 +29,9 @@ INSERT INTO phpbb_config VALUES ('topics_per_page','50'); INSERT INTO phpbb_config VALUES ('hot_threshold','25'); INSERT INTO phpbb_config VALUES ('max_poll_options','10'); INSERT INTO phpbb_config VALUES ('max_sig_chars','255'); +INSERT INTO phpbb_config VALUES ('max_inbox_privmsgs','50'); +INSERT INTO phpbb_config VALUES ('max_sentbox_privmsgs','25'); +INSERT INTO phpbb_config VALUES ('max_savebox_privmsgs','50'); INSERT INTO phpbb_config VALUES ('board_email_sig','Thanks, The Management'); INSERT INTO phpbb_config VALUES ('board_email','youraddress@yourdomain.com'); INSERT INTO phpbb_config VALUES ('smtp_delivery','0'); diff --git a/phpBB/db/oracle_schema.sql b/phpBB/db/oracle_schema.sql index 193464efde..cbfc0e3139 100755 --- a/phpBB/db/oracle_schema.sql +++ b/phpBB/db/oracle_schema.sql @@ -231,7 +231,10 @@ CREATE TABLE phpbb_privmsgs ( privmsgs_to_userid number(4) DEFAULT '0' NOT NULL, privmsgs_date number(4) DEFAULT '0' NOT NULL, privmsgs_ip char(8) NOT NULL, - privmsgs_bbcode_uid varchar(10) DEFAULT '0' NOT NULL, + privmsgs_enable_bbcode number(1) DEFAULT '1' NOT NULL, + privmsgs_enable_html number(1) DEFAULT '0' NOT NULL, + privmsgs_enable_smilies number(1) DEFAULT '1' NOT NULL, + privmsgs_attach_sig number(1) DEFAULT '1' NOT NULL, CONSTRAINT phpbb_privmsgs_pkey PRIMARY KEY (privmsgs_id) ); CREATE INDEX privmsgs_from_userid_index ON phpbb_privmsgs (privmsgs_from_userid); @@ -243,6 +246,7 @@ CREATE INDEX privmsgs_to_userid_index ON phpbb_privmsgs (privmsgs_to_userid); -------------------------------------------------------- */ CREATE TABLE phpbb_privmsgs_text ( privmsgs_text_id number(4) DEFAULT '0' NOT NULL, + privmsgs_bbcode_uid char(10) DEFAULT '0' NOT NULL, privmsgs_text varchar(2000), CONSTRAINT phpbb_privmsgs_text_pkey PRIMARY KEY (privmsgs_text_id) ); diff --git a/phpBB/db/postgres_basic.sql b/phpBB/db/postgres_basic.sql index a1c2452cbe..6427269d6f 100755 --- a/phpBB/db/postgres_basic.sql +++ b/phpBB/db/postgres_basic.sql @@ -29,6 +29,9 @@ INSERT INTO phpbb_config VALUES ('topics_per_page','50'); INSERT INTO phpbb_config VALUES ('hot_threshold','25'); INSERT INTO phpbb_config VALUES ('max_poll_options','10'); INSERT INTO phpbb_config VALUES ('max_sig_chars','255'); +INSERT INTO phpbb_config VALUES ('max_inbox_privmsgs','50'); +INSERT INTO phpbb_config VALUES ('max_sentbox_privmsgs','25'); +INSERT INTO phpbb_config VALUES ('max_savebox_privmsgs','50'); INSERT INTO phpbb_config VALUES ('board_email_sig','Thanks, The Management'); INSERT INTO phpbb_config VALUES ('board_email','youraddress@yourdomain.com'); INSERT INTO phpbb_config VALUES ('smtp_delivery','0'); diff --git a/phpBB/db/postgres_schema.sql b/phpBB/db/postgres_schema.sql index f16b39bb49..17e5237494 100644 --- a/phpBB/db/postgres_schema.sql +++ b/phpBB/db/postgres_schema.sql @@ -198,7 +198,10 @@ CREATE TABLE phpbb_privmsgs ( privmsgs_to_userid int4 DEFAULT '0' NOT NULL, privmsgs_date int4 DEFAULT '0' NOT NULL, privmsgs_ip char(8) NOT NULL, - privmsgs_bbcode_uid varchar(10) DEFAULT '0' NOT NULL, + privmsgs_enable_bbcode int2 DEFAULT '1' NOT NULL, + privmsgs_enable_html int2 DEFAULT '0' NOT NULL, + privmsgs_enable_smilies int2 DEFAULT '1' NOT NULL, + privmsgs_attach_sig int2 DEFAULT '1' NOT NULL, CONSTRAINT phpbb_privmsgs_pkey PRIMARY KEY (privmsgs_id) ); CREATE INDEX privmsgs_from_userid_index ON phpbb_privmsgs (privmsgs_from_userid); @@ -210,6 +213,7 @@ CREATE INDEX privmsgs_to_userid_index ON phpbb_privmsgs (privmsgs_to_userid); -------------------------------------------------------- */ CREATE TABLE phpbb_privmsgs_text ( privmsgs_text_id int4 DEFAULT '0' NOT NULL, + privmsgs_bbcode_uid char(10) DEFAULT '0' NOT NULL, privmsgs_text text, CONSTRAINT phpbb_privmsgs_text_pkey PRIMARY KEY (privmsgs_text_id) ); diff --git a/phpBB/develop/convert_privmsgs.php b/phpBB/develop/convert_privmsgs.php new file mode 100644 index 0000000000..847d3e20cc --- /dev/null +++ b/phpBB/develop/convert_privmsgs.php @@ -0,0 +1,167 @@ +<?php + +$phpbb_root_path = "../"; + +include($phpbb_root_path . 'extension.inc'); +include($phpbb_root_path . 'config.'.$phpEx); +include($phpbb_root_path . 'includes/constants.'.$phpEx); +include($phpbb_root_path . 'includes/db.'.$phpEx); + +// +// Alter table ... +// +echo "Alter tables ... "; + +echo $sql = "ALTER TABLE " . PRIVMSGS_TABLE . " + ADD privmsgs_enable_bbcode TINYINT(1) DEFAULT '1' NOT NULL, + ADD privmsgs_enable_html TINYINT(1) DEFAULT '0' NOT NULL, + ADD privmsgs_enable_smilies TINYINT(1) DEFAULT '1' NOT NULL, + ADD privmsgs_attach_sig TINYINT(1) DEFAULT '1' NOT NULL"; +if( !$result = $db->sql_query($sql) ) +{ + die("Couldn't alter privmsgs table"); +} +echo $sql = "ALTER TABLE " . PRIVMSGS_TEXT_TABLE . " + ADD privmsgs_bbcode_uid CHAR(10) AFTER privmsgs_text_id"; +if( !$result = $db->sql_query($sql) ) +{ + die("Couldn't alter privmsgs text table"); +} +echo "COMPLETE<BR>"; + +// +// Move bbcode ... +// +echo "Move bbcode uid's ... "; + +$sql = "SELECT privmsgs_id, privmsgs_bbcode_uid + FROM " . PRIVMSGS_TABLE; +if( $result = $db->sql_query($sql) ) +{ + $rowset = $db->sql_fetchrowset($result); + + for($i = 0; $i < count($rowset); $i++) + { + $sql = "UPDATE " . PRIVMSGS_TEXT_TABLE . " + SET privmsgs_bbcode_uid = '" . $rowset[$i]['privmsgs_bbcode_uid'] . "' + WHERE privmsgs_text_id = " . $rowset[$i]['privmsgs_id']; + if( !$result = $db->sql_query($sql) ) + { + die("Couldn't update privmsgs text bbcode - " . $i); + } + } + + $sql = "ALTER TABLE " . PRIVMSGS_TABLE . " + DROP privmsgs_bbcode_uid"; + if( !$result = $db->sql_query($sql) ) + { + die("Couldn't alter privmsgs table - drop privmsgs_bbcode_uid"); + } +} + +echo "COMPLETE<BR>"; + +// +// Stripslashes from titles +// +echo "Strip subject slashes ... "; + +$sql = "SELECT privmsgs_subject , privmsgs_id, privmsgs_to_userid, privmsgs_from_userid + FROM " . PRIVMSGS_TABLE; +if( $result = $db->sql_query($sql) ) +{ + $rowset = $db->sql_fetchrowset($result); + + for($i = 0; $i < count($rowset); $i++) + { + $sql = "UPDATE " . PRIVMSGS_TABLE . " + SET privmsgs_subject = '" . addslashes(stripslashes($rowset[$i]['privmsgs_subject'])) . "' + WHERE privmsgs_id = " . $rowset[$i]['privmsgs_id']; + if( !$result = $db->sql_query($sql) ) + { + die("Couldn't update subjects - $i"); + } + } +} +echo "COMPLETE<BR>"; + +// +// Update sigs +// +echo "Remove [addsig], stripslashes and update privmsgs table sig enable ..."; + +$sql = "SELECT privmsgs_text_id , privmsgs_text + FROM " . PRIVMSGS_TEXT_TABLE; +if( $result = $db->sql_query($sql) ) +{ + $rowset = $db->sql_fetchrowset($result); + + $attach_sql = ""; + $non_attach_sql = ""; + + for($i = 0; $i < count($rowset); $i++) + { + if( ereg("\[addsig]$", $rowset[$i]['privmsgs_text'])) + { + if( $attach_sql != "" ) + { + $attach_sql .= ", "; + } + $attach_sql .= $rowset[$i]['privmsgs_text_id']; + + $sql = "UPDATE " . PRIVMSGS_TEXT_TABLE . " + SET privmsgs_text = '" . addslashes(preg_replace("/\[addsig\]/is", "", stripslashes($rowset[$i]['privmsgs_text']))) . "' + WHERE privmsgs_text_id = " . $rowset[$i]['privmsgs_text_id']; + if( !$result = $db->sql_query($sql) ) + { + die("Couldn't update privmsgs text - " . $i); + } + + } + else + { + $sql = "UPDATE " . PRIVMSGS_TEXT_TABLE . " + SET privmsgs_text = '" . addslashes(stripslashes($rowset[$i]['privmsgs_text'])) . "' + WHERE privmsgs_text_id = " . $rowset[$i]['privmsgs_text_id']; + if( !$result = $db->sql_query($sql) ) + { + die("Couldn't update privmsgs text - " . $i); + } + + if( $non_attach_sql != "" ) + { + $non_attach_sql .= ", "; + } + $non_attach_sql .= $rowset[$i]['privmsgs_text_id']; + } + } + + if( $attach_sql != "" ) + { + $sql = "UPDATE " . PRIVMSGS_TABLE . " + SET privmsgs_attach_sig = 1 + WHERE privmsgs_id IN ($attach_sql)"; + if( !$result = $db->sql_query($sql) ) + { + die("Couldn't update privmsgs table attach_sig - "); + } + } + + if( $non_attach_sql != "" ) + { + $sql = "UPDATE " . PRIVMSGS_TABLE . " + SET privmsgs_attach_sig = 0 + WHERE privmsgs_id IN ($non_attach_sql)"; + if( !$result = $db->sql_query($sql) ) + { + die("Couldn't update privmsgs table non_attach_sig - "); + } + } + +} + +echo "COMPLETE<BR>"; + +$db->sql_close(); + +?> diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index 5eb8288266..7b2d91da0f 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -156,7 +156,7 @@ function bbencode_second_pass($text, $uid) $text = str_replace("[/color:$uid]", $bbcode_tpl['color_close'], $text); // size - $text = preg_replace("/\[size=([\-\+]?[1-3]):$uid\]/si", $bbcode_tpl['size_open'], $text); + $text = preg_replace("/\[size=([\-\+]?[1-2]?[0-9]):$uid\]/si", $bbcode_tpl['size_open'], $text); $text = str_replace("[/size:$uid]", $bbcode_tpl['size_close'], $text); // [QUOTE] and [/QUOTE] for posting replies with quote, or just for quoting stuff. @@ -248,10 +248,10 @@ function bbencode_first_pass($text, $uid) $text = bbencode_first_pass_pda($text, $uid, $open_tag, "[/list]", "[/list:o]", false, 'replace_listitems'); // [color] and [/color] for setting text color - $text = preg_replace("#\[color=(\#[0-9A-F]{6}|[a-z]+)\](.*?)\[/color\]#si", "[color=\\1:$uid]\\2[/color:$uid]", $text); + $text = preg_replace("#\[color=(\#[0-9A-F]{6}|[a-z\-]+)\](.*?)\[/color\]#si", "[color=\\1:$uid]\\2[/color:$uid]", $text); // [size] and [/size] for setting text size - $text = preg_replace("#\[size=([\-\+]?[1-3])\](.*?)\[/size\]#si", "[size=\\1:$uid]\\2[/size:$uid]", $text); + $text = preg_replace("#\[size=([\-\+]?[1-2]?[0-9])\](.*?)\[/size\]#si", "[size=\\1:$uid]\\2[/size:$uid]", $text); // [b] and [/b] for bolding text. $text = preg_replace("#\[b\](.*?)\[/b\]#si", "[b:$uid]\\1[/b:$uid]", $text); diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 0b8323ea24..7d93624185 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -117,7 +117,7 @@ function get_userdata($username) { } } -function make_jumpbox() +function make_jumpbox($match_forum_id = 0) { global $lang, $db; @@ -131,13 +131,10 @@ function make_jumpbox() message_die(GENERAL_ERROR, "Couldn't obtain category list.", "", __LINE__, __FILE__, $sql); } - $total_categories = $db->sql_numrows(); - if($total_categories) + if( $total_categories = $db->sql_numrows() ) { $category_rows = $db->sql_fetchrowset($q_categories); - $limit_forums = ""; - $sql = "SELECT * FROM " . FORUMS_TABLE . " ORDER BY cat_id, forum_order"; @@ -145,25 +142,25 @@ function make_jumpbox() { message_die(GENERAL_ERROR, "Couldn't obtain forums information.", "", __LINE__, __FILE__, $sql); } + $total_forums = $db->sql_numrows($q_forums); $forum_rows = $db->sql_fetchrowset($q_forums); -// $is_auth_ary = auth(AUTH_VIEW, AUTH_LIST_ALL, $userdata); - $boxstring = '<select name="' . POST_FORUM_URL . '"><option value="-1">' . $lang['Select_forum'] . '</option>'; for($i = 0; $i < $total_categories; $i++) - { + { $boxstring .= '<option value="-1"> </option>'; $boxstring .= '<option value="-1">' . $category_rows[$i]['cat_title'] . '</option>'; $boxstring .= '<option value="-1">----------------</option>'; if($total_forums) { - for($y = 0; $y < $total_forums; $y++) + for($j = 0; $j < $total_forums; $j++) { - if( $forum_rows[$y]['cat_id'] == $category_rows[$i]['cat_id'] ) + if( $forum_rows[$j]['cat_id'] == $category_rows[$i]['cat_id'] && !$forum_rows[$j]['auth_view'] ) { - $boxstring .= '<option value="' . $forum_rows[$y]['forum_id'] . '">' . $forum_rows[$y]['forum_name'] . '</option>'; + $selected = ( $forum_rows[$j]['forum_id'] == $match_forum_id ) ? "selected=\"selected\"" : ""; + $boxstring .= '<option value="' . $forum_rows[$j]['forum_id'] . '"' . $selected . '>' . $forum_rows[$j]['forum_name'] . '</option>'; } } } @@ -892,6 +889,75 @@ function obtain_word_list(&$orig_word, &$replacement_word) } // +// Username search +// +function username_search($calling_script, $search_match, $enable_window = 0, $default_list = "") +{ + global $db, $template, $lang; + + if( $enable_window ) + { + $template->set_filenames(array( + "body" => "mini_search.tpl") + ); + } + + $author_list = ""; + if( !empty($search_match) ) + { + $username_search = preg_replace("/\*/", "%", trim(strip_tags($search_match))); + + $sql = "SELECT username + FROM " . USERS_TABLE . " + WHERE username LIKE '$username_search'"; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Couldn't obtain search results", "", __LINE__, __FILE__, $sql); + } + + if( $numrows = $db->sql_numrows($result) ) + { + $searchset = $db->sql_fetchrowset($result); + + for($i = 0; $i < $numrows; $i++) + { + $author_list .= "<option value=\"" . $searchset[$i]['username'] . "\">" .$searchset[$i]['username'] . "</option>"; + } + } + else + { + $author_list = "<option>" . $lang['No_match']. "</option>"; + } + + if( $enable_window ) + { + $template->assign_vars(array( + "S_AUTHOR_OPTIONS" => $author_list) + ); + + $template->assign_block_vars("select_name", array()); + } + } + + if( $enable_window ) + { + $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'], + + "S_SEARCH_ACTION" => append_sid("$calling_script?mode=searchuser")) + ); + + $template->pparse("body"); + } + + return($author_list); +} + +// // This function gets called to output any message or error // that doesn't require additional output from the calling // page. diff --git a/phpBB/language/email/privmsg_notify_english.tpl b/phpBB/language/email/privmsg_notify_english.tpl index cdf1d95475..4a07aacb82 100755 --- a/phpBB/language/email/privmsg_notify_english.tpl +++ b/phpBB/language/email/privmsg_notify_english.tpl @@ -1,7 +1,9 @@ -You are reciving this email because you have recived a private message -on {SITENAME} and you have requested that you be notified on this event. +Hello {USERNAME}, + +You have received a new private message to your account on "{SITENAME}" and you have requested that you be notified on this event. You can view your new message by clicking on the following link: -You can view your new private message by clicking on the following link: {U_INBOX} +Remember that you can always choose not to be notified of new messages by changing the appropriate setting in your profile. + {EMAIL_SIG}
\ No newline at end of file diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php index 1a8adffe6f..7ca132a737 100755 --- a/phpBB/language/lang_english.php +++ b/phpBB/language/lang_english.php @@ -384,6 +384,14 @@ $lang['No_post_id'] = "No post ID was specified"; $lang['No_such_folder'] = "No such folder exists"; $lang['No_folder'] = "No folder specified"; +$lang['Savedbox'] = "Saved box"; +$lang['Sentbox'] = "Sent box"; + +$lang['Mark_all'] = "Mark all"; +$lang['Unmark_all'] = "Unmark all"; + +$lang['Your'] = "Your"; // Example of use of this var : "Your Inbox is 50% full"; +$lang['full'] = "full"; // // Profiles/Registration @@ -963,7 +971,6 @@ $lang['Finish_Install'] = "Finish Installation"; $lang['Install_db_error'] = "An error occured trying to update the database"; $lang['ODBC_Instructs'] = "Someone please write some odbc instructions in the \$lang['ODBC_Instructs'] variable!"; $lang['Table_Prefix'] = "Table Name Prefix"; - // // End // ------------------------------------------------- @@ -1003,4 +1010,4 @@ $l_emailpass = "Email Lost Password"; $l_passexplain = "Please fill out the form, a new password will be sent to your Email address"; $l_sendpass = "Send Password"; -?> +?>
\ No newline at end of file diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php index 038df5496c..88da77606b 100644 --- a/phpBB/privmsg.php +++ b/phpBB/privmsg.php @@ -26,8 +26,37 @@ include($phpbb_root_path . 'common.'.$phpEx); include($phpbb_root_path . 'includes/post.'.$phpEx); include($phpbb_root_path . 'includes/bbcode.'.$phpEx); -$pagetype = "privmsgs"; -$page_title = "Private Messageing"; +// +// Var definitions +// +$html_entities_match = array("#<#", "#>#", "#& #", "#\"#"); +$html_entities_replace = array("<", ">", "& ", """); + +// +// Parameters +// +$submit = ( isset($HTTP_POST_VARS['submit']) ) ? TRUE : 0; +$submit_search = ( isset($HTTP_POST_VARS['usersubmit']) ) ? TRUE : 0; +$submit_msgdays = ( isset($HTTP_POST_VARS['submit_msgdays']) ) ? TRUE : 0; +$cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : 0; +$preview = ( isset($HTTP_POST_VARS['preview']) ) ? TRUE : 0; +$confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : 0; +$delete = ( isset($HTTP_POST_VARS['delete']) ) ? TRUE : 0; +$delete_all = ( isset($HTTP_POST_VARS['deleteall']) ) ? TRUE : 0; + +$refresh = $preview || $submit_search; + +$mark_list = ( !empty($HTTP_POST_VARS['mark']) ) ? $HTTP_POST_VARS['mark'] : 0; + +$folder = ( !empty($HTTP_POST_VARS['folder']) ) ? $HTTP_POST_VARS['folder'] : ( (!empty($HTTP_GET_VARS['folder'])) ? $HTTP_GET_VARS['folder'] : "inbox" ); + +// +// Cancel +// +if( $cancel ) +{ + header("Location: " . append_sid("privmsg.$phpEx?folder=$folder")); +} // // Start session management @@ -38,26 +67,49 @@ init_userprefs($userdata); // End session management // - -$folder = (!empty($HTTP_POST_VARS['folder'])) ? $HTTP_POST_VARS['folder'] : ( (!empty($HTTP_GET_VARS['folder'])) ? $HTTP_GET_VARS['folder'] : "inbox" ); -if(empty($HTTP_POST_VARS['cancel'])) +if( !empty($HTTP_POST_VARS['mode']) || !empty($HTTP_GET_VARS['mode']) ) { - $mode = (!empty($HTTP_POST_VARS['mode'])) ? $HTTP_POST_VARS['mode'] : ( (!empty($HTTP_GET_VARS['mode'])) ? $HTTP_GET_VARS['mode'] : "" ); + $mode = ( !empty($HTTP_POST_VARS['mode']) ) ? $HTTP_POST_VARS['mode'] : $HTTP_GET_VARS['mode']; } else { $mode = ""; } -$start = (!empty($HTTP_GET_VARS['start'])) ? $HTTP_GET_VARS['start'] : 0; + +$start = ( !empty($HTTP_GET_VARS['start']) ) ? $HTTP_GET_VARS['start'] : 0; + +if( isset($HTTP_POST_VARS[POST_POST_URL]) || isset($HTTP_GET_VARS[POST_POST_URL]) ) +{ + $privmsg_id = ( isset($HTTP_POST_VARS[POST_POST_URL]) ) ? $HTTP_POST_VARS[POST_POST_URL] : $HTTP_GET_VARS[POST_POST_URL]; +} +else +{ + $privmsg_id = ""; +} $error = FALSE; // +// Define the box image links +// +$inbox_img = ($folder != "inbox" || $mode != "") ? '<a href="' . append_sid("privmsg.$phpEx?folder=inbox") . '"><img src="' . $images['pm_inbox'] . '" border="0" alt="' . $lang['Inbox'] . '" /></a>' : '<img src="' . $images['pm_inbox'] . '" border="0" alt="' . $lang['Inbox'] . '" />'; +$inbox_url = ($folder != "inbox" || $mode != "") ? '<a href="' . append_sid("privmsg.$phpEx?folder=inbox") . '">' . $lang['Inbox'] . '</a>' : $lang['Inbox']; + +$outbox_img = ($folder != "outbox" || $mode != "") ? '<a href="' . append_sid("privmsg.$phpEx?folder=outbox") . '"><img src="' . $images['pm_outbox'] . '" border="0" alt="' . $lang['Outbox'] . '" /></a>' : '<img src="' . $images['pm_outbox'] . '" border="0" alt="' . $lang['Outbox'] . '" />'; +$outbox_url = ($folder != "outbox" || $mode != "") ? '<a href="' . append_sid("privmsg.$phpEx?folder=outbox") . '">' . $lang['Outbox'] . '</a>' : $lang['Outbox']; + +$sentbox_img = ($folder != "sentbox" || $mode != "") ? '<a href="' . append_sid("privmsg.$phpEx?folder=sentbox") . '"><img src="' . $images['pm_sentbox'] . '" border="0" alt="' . $lang['Sent'] . '" /></a>' : '<img src="' . $images['pm_sentbox'] . '" border="0" alt="' . $lang['Sent'] . '" />'; +$sentbox_url = ($folder != "sentbox" || $mode != "") ? '<a href="' . append_sid("privmsg.$phpEx?folder=sentbox") . '">' . $lang['Sent'] . '</a>' : $lang['Sent']; + +$savebox_img = ($folder != "savebox" || $mode != "") ? '<a href="' . append_sid("privmsg.$phpEx?folder=savebox") . '"><img src="' . $images['pm_savebox'] . '" border="0" alt="' . $lang['Savebox'] . '" /></a>' : '<img src="' . $images['pm_savebox'] . '" border="0" alt="' . $lang['Saved'] . '" />'; +$savebox_url = ($folder != "savebox" || $mode != "") ? '<a href="' . append_sid("privmsg.$phpEx?folder=savebox") . '">' . $lang['Saved'] . '</a>' : $lang['Saved']; + +// ---------- // Start main // -if($mode == "read") +if( $mode == "read" ) { - if(!empty($HTTP_GET_VARS[POST_POST_URL])) + if( !empty($HTTP_GET_VARS[POST_POST_URL]) ) { $privmsgs_id = $HTTP_GET_VARS[POST_POST_URL]; } @@ -66,36 +118,48 @@ if($mode == "read") message_die(GENERAL_ERROR, $lang['No_post_id']); } - if(!$userdata['session_logged_in']) + if( !$userdata['session_logged_in'] ) { header("Location: " . append_sid("login.$phpEx?forward_page=privmsg.$phpEx&folder=$folder&mode=$mode&" . POST_POST_URL . "=$privmsgs_id")); } - if(!empty($HTTP_GET_VARS['folder'])) + if( $folder ) { + // + // SQL to pull appropriate message, prevents nosey people + // reading other peoples messages ... hopefully! + // if($folder == "inbox") { - $user_to_sql = "AND pm.privmsgs_to_userid = " . $userdata['user_id']; - $user_from_sql = "AND u.user_id = pm.privmsgs_from_userid"; - $sql_type = "AND (pm.privmsgs_type = " . PRIVMSGS_READ_MAIL . " OR pm.privmsgs_type = " . PRIVMSGS_NEW_MAIL . " )"; + $l_box_name = $lang['Inbox']; + + $pm_sql_user = "AND pm.privmsgs_to_userid = " . $userdata['user_id'] . " + AND ( pm.privmsgs_type = " . PRIVMSGS_READ_MAIL . " + OR pm.privmsgs_type = " . PRIVMSGS_NEW_MAIL . " )"; } else if($folder == "outbox") { - $user_to_sql = "AND u.user_id = pm.privmsgs_to_userid"; - $user_from_sql = "AND pm.privmsgs_from_userid = " . $userdata['user_id']; - $sql_type = "AND pm.privmsgs_type = " . PRIVMSGS_NEW_MAIL; + $l_box_name = $lang['Outbox']; + + $pm_sql_user = "AND pm.privmsgs_from_userid = " . $userdata['user_id'] . " + AND pm.privmsgs_type = " . PRIVMSGS_NEW_MAIL; } else if($folder == "sentbox") { - $user_to_sql = "AND u.user_id = pm.privmsgs_to_userid"; - $user_from_sql = "AND pm.privmsgs_from_userid = " . $userdata['user_id']; - $sql_type = "AND pm.privmsgs_type = " . PRIVMSGS_SENT_MAIL; + $l_box_name = $lang['Sentbox']; + + $pm_sql_user = "AND pm.privmsgs_from_userid = " . $userdata['user_id'] . " + AND pm.privmsgs_type = " . PRIVMSGS_SENT_MAIL; } else if($folder == "savebox") { - $user_to_sql = "AND ( (pm.privmsgs_to_userid = " . $userdata['user_id'] . " AND u.user_id = pm.privmsgs_from_userid) "; - $user_from_sql = "OR (u.user_id = pm.privmsgs_to_userid AND pm.privmsgs_from_userid = " . $userdata['user_id'] . ") )"; - $sql_type = "AND pm.privmsgs_type = " . PRIVMSGS_SAVED_MAIL; + $l_box_name = $lang['Savebox']; + + $pm_sql_user .= "AND ( ( pm.privmsgs_to_userid = " . $userdata['user_id'] . " + AND pm.privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " ) + OR ( pm.privmsgs_from_userid = " . $userdata['user_id'] . " + AND pm.privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . " ) + )"; } else { @@ -107,35 +171,77 @@ if($mode == "read") message_die(GENERAL_ERROR, $lang['No_folder']); } - $sql = "SELECT u.username, u.user_id, u.user_website, u.user_icq, u.user_aim, u.user_yim, u.user_msnm, u.user_viewemail, u.user_email, u.user_sig, u.user_avatar, pm.privmsgs_id, pm.privmsgs_type, pm.privmsgs_subject, pm.privmsgs_from_userid, pm.privmsgs_to_userid, pm.privmsgs_date, pm.privmsgs_ip, pm.privmsgs_bbcode_uid, pmt.privmsgs_text - FROM ".PRIVMSGS_TABLE." pm, " . PRIVMSGS_TEXT_TABLE . " pmt, ".USERS_TABLE." u + // + // Major query obtains the message ... + // + $sql = "SELECT u.username AS username_1, u.user_id AS user_id_1, u2.username AS username_2, u2.user_id AS user_id_2, u.user_sig_bbcode_uid, u.user_posts, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, u.user_rank, u.user_sig, u.user_avatar, pm.*, pmt.privmsgs_bbcode_uid, pmt.privmsgs_text + FROM " . PRIVMSGS_TABLE . " pm, " . PRIVMSGS_TEXT_TABLE . " pmt, " . USERS_TABLE . " u, " . USERS_TABLE . " u2 WHERE pm.privmsgs_id = $privmsgs_id - AND pmt.privmsgs_text_id = pm.privmsgs_id - $user_to_sql - $user_from_sql - $sql_type"; - if(!$pm_status = $db->sql_query($sql)) + AND pmt.privmsgs_text_id = pm.privmsgs_id + $pm_sql_user + AND u.user_id = pm.privmsgs_from_userid + AND u2.user_id = pm.privmsgs_to_userid"; + if( !$pm_status = $db->sql_query($sql) ) { message_die(GENERAL_ERROR, "Could not query private message post information.", "", __LINE__, __FILE__, $sql); } - if(!$db->sql_numrows($pm_status)) + + // + // Did the query return any data? + // + if( !( $privmsg = $db->sql_fetchrow($pm_status) ) ) { header("Location: " . append_sid("privmsg.$phpEx?folder=$folder")); } - $privmsg = $db->sql_fetchrow($pm_status); + $privmsg_id = $privmsg['privmsgs_id']; - if($privmsg['privmsgs_type'] == PRIVMSGS_NEW_MAIL && $folder == "inbox") + // + // Is this a new message in the inbox? If it is then save + // a copy in the posters sent box + // + if( $privmsg['privmsgs_type'] == PRIVMSGS_NEW_MAIL && $folder == "inbox" ) { $sql = "UPDATE " . PRIVMSGS_TABLE . " SET privmsgs_type = " . PRIVMSGS_READ_MAIL . " WHERE privmsgs_id = " . $privmsg['privmsgs_id']; - if(!$pm_upd_status = $db->sql_query($sql)) + if( !$pm_upd_status = $db->sql_query($sql) ) { message_die(GENERAL_ERROR, "Could not update private message read status.", "", __LINE__, __FILE__, $sql); } // + // Check to see if the poster has a 'full' sent box + // + $sql = "SELECT COUNT(privmsgs_id) AS sent_items, MIN(privmsgs_date) AS oldest_post_time + FROM " . PRIVMSGS_TABLE . " + WHERE privmsgs_type = " . PRIVMSGS_SENT_MAIL . " + AND privmsgs_from_userid = " . $privmsg['privmsgs_from_userid']; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Could not obtain sent message info for sendee.", "", __LINE__, __FILE__, $sql); + } + + $sql_priority = (SQL_LAYER == "mysql") ? "LOW_PRIORITY" : ""; + + if( $db->sql_numrows($result) ) + { + $sent_info = $db->sql_fetchrow($result); + + if( $sent_info['sent_items'] > $board_config['max_sentbox_privmsgs'] ) + { + $sql = "DELETE $sql_priority FROM " . PRIVMSGS_TABLE . " + WHERE privmsgs_type = " . PRIVMSGS_SENT_MAIL . " + AND privmsgs_date <= " . $sent_info['oldest_post_time'] . " + AND privmsgs_from_userid = " . $privmsg['privmsgs_from_userid']; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Could not delete oldest privmsgs.", "", __LINE__, __FILE__, $sql); + } + } + } + + // // This makes a copy of the post and stores // it as a SENT message from the sendee. Perhaps // not the most DB friendly way but a lot easier @@ -143,9 +249,9 @@ if($mode == "read") // set limits on numbers of storable posts for // users ... hopefully! // - $sql = "INSERT INTO " . PRIVMSGS_TABLE . " (privmsgs_type, privmsgs_subject, privmsgs_from_userid, privmsgs_to_userid, privmsgs_date, privmsgs_ip, privmsgs_bbcode_uid) - VALUES (" . PRIVMSGS_SENT_MAIL . ", '" . $privmsg['privmsgs_subject'] . "', " . $privmsg['privmsgs_from_userid'] . ", " . $privmsg['privmsgs_to_userid'] . ", " . $privmsg['privmsgs_date'] . ", '" . $privmsg['privmsgs_ip'] . "', '" . $privmsg['privmsgs_bbcode_uid'] . "')"; - if(!$pm_sent_status = $db->sql_query($sql)) + $sql = "INSERT $sql_priority INTO " . PRIVMSGS_TABLE . " (privmsgs_type, privmsgs_subject, privmsgs_from_userid, privmsgs_to_userid, privmsgs_date, privmsgs_ip, privmsgs_enable_html, privmsgs_enable_bbcode, privmsgs_enable_smilies, privmsgs_attach_sig) + VALUES (" . PRIVMSGS_SENT_MAIL . ", '" . addslashes($privmsg['privmsgs_subject']) . "', " . $privmsg['privmsgs_from_userid'] . ", " . $privmsg['privmsgs_to_userid'] . ", " . $privmsg['privmsgs_date'] . ", '" . $privmsg['privmsgs_ip'] . "', " . $privmsg['privmsgs_enable_html'] . ", " . $privmsg['privmsgs_enable_bbcode'] . ", " . $privmsg['privmsgs_enable_smilies'] . ", " . $privmsg['privmsgs_attach_sig'] . ")"; + if( !$pm_sent_status = $db->sql_query($sql) ) { message_die(GENERAL_ERROR, "Could not insert private message sent info.", "", __LINE__, __FILE__, $sql); } @@ -153,8 +259,8 @@ if($mode == "read") { $privmsg_sent_id = $db->sql_nextid($pm_sent_status); - $sql = "INSERT INTO " . PRIVMSGS_TEXT_TABLE . " (privmsgs_text_id, privmsgs_text) - VALUES ($privmsg_sent_id, '" . $privmsg['privmsgs_text'] . "')"; + $sql = "INSERT $sql_priority INTO " . PRIVMSGS_TEXT_TABLE . " (privmsgs_text_id, privmsgs_bbcode_uid, privmsgs_text) + VALUES ($privmsg_sent_id, '" . $privmsg['privmsgs_bbcode_uid'] . "', '" . addslashes($privmsg['privmsgs_text']) . "')"; if(!$pm_sent_text_status = $db->sql_query($sql)) { message_die(GENERAL_ERROR, "Could not insert private message sent text.<BR>$sql", "", __LINE__, __FILE__, $sql); @@ -163,22 +269,55 @@ if($mode == "read") } // - // These may well be better handled in the - // templates + // Pick a folder, any folder, so long as it's one + // below ... // - $inbox_url = "<img src=\"images/msg_inbox.gif\" border=\"0\"> <a href=\"" . append_sid("privmsg.$phpEx?folder=inbox") . "\"><b>" . $lang['Inbox'] . "</b></a>"; - - $sentbox_url = "<img src=\"images/msg_sentbox.gif\" border=\"0\"> <a href=\"" . append_sid("privmsg.$phpEx?folder=sentbox") . "\"><b>" . $lang['Sent'] . "</b></a>"; - - $outbox_url = "<img src=\"images/msg_outbox.gif\" border=\"0\"> <a href=\"" . append_sid("privmsg.$phpEx?folder=outbox") . "\"><b>" . $lang['Outbox'] . "</b></a>"; - - $savebox_url = "<img src=\"images/msg_savebox.gif\" border=\"0\"> <a href=\"" . append_sid("privmsg.$phpEx?folder=savebox") . "\"><b>" . $lang['Saved'] . "</b></a>"; - - $post_new_mesg_url = "<a href=\"privmsg.$phpEx?mode=post\"><img src=\"templates/PSO/images/post.gif\" border=\"1\"></a>"; - $post_reply_mesg_url = ($folder == "inbox") ? "<a href=\"" . append_sid("privmsg.$phpEx?mode=reply&" . POST_POST_URL . "=$privmsgs_id") . "\"><img src=\"templates/PSO/images/reply.gif\" border=\"1\"></a>" : ""; + if( $folder == "inbox" ) + { + $post_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post") . "\"><img src=\"" . $images['pm_postmsg'] . "\" alt=\"" . $lang['Post_new_pm'] . "\" border=\"0\"></a>"; + $reply_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=reply&" . POST_POST_URL . "=$privmsg_id") . "\"><img src=\"" . $images['pm_replymsg'] . "\" alt=\"" . $lang['Post_reply_pm'] . "\" border=\"0\"></a>"; + $quote_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=quote&" . POST_POST_URL . "=$privmsg_id") . "\"><img src=\"" . $images['pm_quotemsg'] . "\" alt=\"" . $lang['Post_quote_pm'] . "\" border=\"0\"></a>"; + $edit_pm_img = ""; + $l_box_name = $lang['Inbox']; + } + else if( $folder == "outbox" ) + { + $post_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post") . "\"><img src=\"" . $images['pm_postmsg'] . "\" alt=\"" . $lang['Post_new_pm'] . "\" border=\"0\"></a>"; + $reply_pm_img = ""; + $quote_pm_img = ""; + $edit_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=edit&" . POST_POST_URL . "=$privmsg_id") . "\"><img src=\"" . $images['pm_editmsg'] . "\" alt=\"" . $lang['Edit_pm'] . "\" border=\"0\"></a>"; + $l_box_name = $lang['Outbox']; + } + else if( $folder == "savebox" ) + { + if( $privmsg['privmsgs_type'] == PRIVMSGS_SAVED_IN_MAIL ) + { + $post_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post") . "\"><img src=\"" . $images['pm_postmsg'] . "\" alt=\"" . $lang['Post_new_pm'] . "\" border=\"0\"></a>"; + $reply_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=reply&" . POST_POST_URL . "=$privmsg_id") . "\"><img src=\"" . $images['pm_replymsg'] . "\" alt=\"" . $lang['Post_reply_pm'] . "\" border=\"0\"></a>"; + $quote_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=quote&" . POST_POST_URL . "=$privmsg_id") . "\"><img src=\"" . $images['pm_quotemsg'] . "\" alt=\"" . $lang['Post_quote_pm'] . "\" border=\"0\"></a>"; + $edit_pm_img = ""; + } + else + { + $post_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post") . "\"><img src=\"" . $images['pm_postmsg'] . "\" alt=\"" . $lang['Post_new_pm'] . "\" border=\"0\"></a>"; + $reply_pm_img = ""; + $quote_pm_img = ""; + $edit_pm_img = ""; + } + $l_box_name = $lang['Saved']; + } + else if( $folder == "sentbox" ) + { + $post_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post") . "\"><img src=\"" . $images['pm_postmsg'] . "\" alt=\"" . $lang['Post_new_pm'] . "\" border=\"0\"></a>"; + $reply_pm_img = ""; + $quote_pm_img = ""; + $edit_pm_img = ""; + $l_box_name = $lang['Sent']; + } - $s_hidden_fields = "<input type=\"hidden\" name=\"mark[]\" value=\"$privmsgs_id\">"; + $s_hidden_fields = "<input type=\"hidden\" name=\"mark[]\" value=\"$privmsgs_id\" />"; + $page_title = $lang['Read_private_message']; include($phpbb_root_path . 'includes/page_header.'.$phpEx); // @@ -188,48 +327,82 @@ if($mode == "read") "body" => "privmsgs_read_body.tpl", "jumpbox" => "jumpbox.tpl") ); + $jumpbox = make_jumpbox(); $template->assign_vars(array( - "JUMPBOX_LIST" => $jumpbox, - "SELECT_NAME" => POST_FORUM_URL) + "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( - "INBOX" => $inbox_url, - "SENTBOX" => $sentbox_url, - "OUTBOX" => $outbox_url, - "SAVEBOX" => $savebox_url, - + "INBOX_IMG" => $inbox_img, + "SENTBOX_IMG" => $sentbox_img, + "OUTBOX_IMG" => $outbox_img, + "SAVEBOX_IMG" => $savebox_img, + "INBOX_LINK" => $inbox_url, + + "POST_PM_IMG" => $post_pm_img, + "REPLY_PM_IMG" => $reply_pm_img, + "EDIT_PM_IMG" => $edit_pm_img, + "QUOTE_PM_IMG" => $quote_pm_img, + + "SENTBOX_LINK" => $sentbox_url, + "OUTBOX_LINK" => $outbox_url, + "SAVEBOX_LINK" => $savebox_url, + + "BOX_NAME" => $l_box_name, + + "L_INBOX" => $lang['Inbox'], + "L_OUTBOX" => $lang['Outbox'], + "L_SENTBOX" => $lang['Sent'], + "L_SAVEBOX" => $lang['Saved'], "L_FLAG" => $lang['Flag'], "L_SUBJECT" => $lang['Subject'], "L_DATE" => $lang['Date'], - "L_FROM_OR_TO" => (($folder == "inbox" || $folder == "savebox") ? $lang['From'] : $lang['To']), + "L_FROM" => $lang['From'], + "L_TO" => $lang['To'], "S_PRIVMSGS_ACTION" => append_sid("privmsg.$phpEx?folder=$folder"), - "S_HIDDEN_FIELDS" => $s_hidden_fields, - "S_POST_NEW_MSG" => $post_new_mesg_url, - "S_POST_REPLY_MSG" => $post_reply_mesg_url) + "S_HIDDEN_FIELDS" => $s_hidden_fields) ); + + $username_from = $privmsg['username_1']; + $user_id_from = $privmsg['user_id_1']; + $username_to = $privmsg['username_2']; + $user_id_to = $privmsg['user_id_2']; - $poster = stripslashes($privmsg['username']); - $poster_id = $privmsg['user_id']; - - $post_date = create_date($board_config['default_dateformat'], $privmsg['privmsgs_date'], $board_config['board_timezone']); + $post_date = create_date($board_config['default_dateformat'], $privmsg['privmsgs_date'], $board_config['default_timezone']); - $poster_avatar = ($privmsg['user_avatar'] != "" && $userdata['user_id'] != ANONYMOUS) ? "<img src=\"" . $board_config['avatar_path'] . "/" . $privmsg['user_avatar'] . "\">" : ""; + $profile_img = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$user_id_from") . "\"><img src=\"" . $images['icon_profile'] . "\" alt=\"" . $lang['Read_profile'] . " $username_from\" border=\"0\" /></a>"; - $profile_img = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id") . "\"><img src=\"" . $images['icon_profile'] . "\" alt=\"" . $lang['Profile'] . "\" border=\"0\"></a>"; + $email_addr = str_replace("@", " at ", $privmsg['user_email']); + $email_img = ($privmsg['user_viewemail'] && $email_addr != "" ) ? "<a href=\"mailto:$email_addr\"><img src=\"" . $images['icon_email'] . "\" alt=\"" . $lang['Send_email'] . " $username_from\" border=\"0\" /></a>" : ""; - $email_img = ($privmsg['user_viewemail'] == 1) ? "<a href=\"mailto:" . $privmsg['user_email'] . "\"><img src=\"" .$images['icon_email'] . "\" alt=\"" . $lang['Email'] . "\" border=\"0\"></a>" : ""; - - $www_img = ($privmsg['user_website']) ? "<a href=\"" . $privmsg['user_website'] . "\"><img src=\"" . $images['icon_www'] . "\" alt=\"" . $lang['Website'] . "\" border=\"0\"></a>" : ""; + $www_img = ($privmsg['user_website']) ? "<a href=\"" . $privmsg['user_website'] . "\" target=\"_userwww\"><img src=\"" . $images['icon_www'] . "\" alt=\"" . $lang['Visit_website'] . "\" border=\"0\" /></a>" : ""; if($privmsg['user_icq']) { - $icq_status_img = "<a href=\"http://wwp.icq.com/" . $privmsg['user_icq'] . "#pager\"><img src=\"http://online.mirabilis.com/scripts/online.dll?icq=" . $privmsg['user_icq'] . "&img=5\" border=\"0\"></a>"; + $icq_status_img = "<a href=\"http://wwp.icq.com/" . $privmsg['user_icq'] . "#pager\"><img src=\"http://web.icq.com/whitepages/online?icq=" . $privmsg['user_icq'] . "&img=5\" width=\"18\" height=\"18\" border=\"0\" /></a>"; - $icq_add_img = "<a href=\"http://wwp.icq.com/scripts/search.dll?to=" . $privmsg['user_icq'] . "\"><img src=\"" . $images['icon_icq'] . "\" alt=\"" . $lang['ICQ'] . "\" border=\"0\"></a>"; + // + // This cannot stay like this, it needs a 'proper' solution, eg a separate + // template for overlaying the ICQ icon, or we just do away with the icq status + // display (which is after all somewhat a pain in the rear :D + // + if( $theme['template_name'] == "subSilver" ) + { + $icq_add_img = '<table width="59" border="0" cellspacing="0" cellpadding="0"><tr><td nowrap="nowrap" class="icqback"><img src="images/spacer.gif" width="3" height="18" alt = "">' . $icq_status_img . '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $privmsg['user_icq'] . '"><img src="images/spacer.gif" width="35" height="18" border="0" alt="' . $lang['ICQ'] . '" /></a></td></tr></table>'; + $icq_status_img = ""; + } + else + { + $icq_add_img = "<a href=\"http://wwp.icq.com/scripts/search.dll?to=" . $privmsg['user_icq'] . "\"><img src=\"" . $images['icon_icq'] . "\" alt=\"" . $lang['ICQ'] . "\" border=\"0\" /></a>"; + } } else { @@ -237,66 +410,95 @@ if($mode == "read") $icq_add_img = ""; } - $aim_img = ($privmsg['user_aim']) ? "<a href=\"aim:goim?screenname=" . $privmsg['user_aim'] . "&message=Hello+Are+you+there?\"><img src=\"" . $images['icon_aim'] . "\" border=\"0\"></a>" : ""; + $aim_img = ($privmsg['user_aim']) ? "<a href=\"aim:goim?screenname=" . $privmsg['user_aim'] . "&message=Hello+Are+you+there?\"><img src=\"" . $images['icon_aim'] . "\" border=\"0\" alt=\"" . $lang['AIM'] . "\" /></a>" : ""; + + $msn_img = ($privmsg['user_msnm']) ? "<a href=\"profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$user_id_from\"><img src=\"" . $images['icon_msnm'] . "\" border=\"0\" alt=\"" . $lang['MSNM'] . "\" /></a>" : ""; + + $yim_img = ($privmsg['user_yim']) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $privmsg['user_yim'] . "&.src=pg\"><img src=\"" . $images['icon_yim'] . "\" border=\"0\" alt=\"" . $lang['YIM'] . "\" /></a>" : ""; - $msn_img = ($privmsg['user_msnm']) ? "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id") . "\"><img src=\"" . $images['icon_msnm'] . "\" border=\"0\"></a>" : ""; + $search_img = "<a href=\"" . append_sid("search.$phpEx?search_author=" . urlencode($username_from) . "&showresults=topics") . "\"><img src=\"" . $images['icon_search'] . "\" border=\"0\" /></a>"; - $yim_img = ($privmsg['user_yim']) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $privmsg['user_yim'] . "&.src=pg\"><img src=\"" . $images['icon_yim'] . "\" border=\"0\"></a>" : ""; + // + // Processing of post + // + $post_subject = $privmsg['privmsgs_subject']; - if($folder == "inbox") + $private_message = $privmsg['privmsgs_text']; + $bbcode_uid = $privmsg['privmsgs_bbcode_uid']; + + $user_sig = ( $privmsg['privmsgs_from_userid'] == $userdata['user_id'] ) ? $userdata['user_sig'] : $privmsg['user_sig']; + $user_sig_bbcode_uid = ( $privmsg['privmsgs_from_userid'] == $userdata['user_id'] ) ? $userdata['user_sig_bbcode_uid'] : $privmsg['user_sig_bbcode_uid']; + + // + // If the board has HTML off but the post has HTML + // on then we process it, else leave it alone + // + if( !$board_config['allow_html'] ) { - $quote_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=reply"e=true&" . POST_POST_URL . "=" . $privmsgs_id) . "\"><img src=\"" . $images['icon_quote'] . "\" alt=\"\" border=\"0\"></a>"; + if( $user_sig != "" && $privmsg['privmsgs_enable_sig'] && $userdata['user_allowhtml'] ) + { + $user_sig = preg_replace("#(<)([\/]?.*?)(>)#is", "<\\2>", $user_sig); + } + + if( $privmsg['privmsgs_enable_html'] ) + { + $private_message = preg_replace("#(<)([\/]?.*?)(>)#is", "<\\2>", $private_message); + } } - if($folder == "outbox") + if( $user_sig != "" && $privmsg['privmsgs_attach_sig'] && $user_sig_bbcode_uid != "" ) { - $edit_img = "<a href=\"" . append_sid("privmsg.$phpEx?folder=$folder&mode=edit&" . POST_POST_URL . "=" . $privmsgs_id) . "\"><img src=\"" . $images['icon_edit'] . "\" alt=\"\" border=\"0\"></a>"; + $user_sig = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($user_sig, $user_sig_bbcode_uid) : preg_replace("/\:[0-9a-z\:]+\]/si", "]", $user_sig); } - $post_subject = stripslashes($privmsg['privmsgs_subject']); - - $message = stripslashes($privmsg['privmsgs_text']); - $bbcode_uid = $privmsg['privmsgs_bbcode_uid']; + if( $bbcode_uid != "" ) + { + $private_message = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($private_message, $bbcode_uid) : preg_replace("/\:[0-9a-z\:]+\]/si", "]", $private_message); + } - $user_sig = ($privmsg['privmsgs_from_userid'] == $userdata['user_id']) ? stripslashes($userdata['user_sig']) : stripslashes($privmsg['user_sig']); + $private_message = make_clickable($private_message); - if(!$board_config['allow_html']) + if( $privmsg['privmsgs_attach_sig'] && $user_sig != "" ) { - $user_sig = strip_tags($user_sig); - $message = strip_tags($message); + $private_message .= "<br /><br />_________________<br />" . make_clickable($user_sig); } - if($board_config['allow_bbcode']) + + if( count($orig_word) ) { - // do bbcode stuff here - $sig_uid = make_bbcode_uid(); - $user_sig = bbencode_first_pass($user_sig, $sig_uid); - $user_sig = bbencode_second_pass($user_sig, $sig_uid); + $post_subject = preg_replace($orig_word, $replacement_word, $post_subject); + $private_message = preg_replace($orig_word, $replacement_word, $private_message); + } - $message = bbencode_second_pass($message, $bbcode_uid); + if( $board_config['allow_smilies'] && $privmsg['privmsgs_enable_smilies'] ) + { + $private_message = smilies_pass($private_message); } - $message = make_clickable($message); - $message = str_replace("\n", "<br />", $message); - $message = eregi_replace("\[addsig]$", "<br /><br />_________________<br />" . nl2br($user_sig), $message); + $private_message = str_replace("\n", "<br />", $private_message); + // + // Dump it to the templating engine + // $template->assign_vars(array( - "POSTER_NAME" => $poster, + "MESSAGE_TO" => $username_to, + "MESSAGE_FROM" => $username_from, + "RANK_IMAGE" => $rank_image, + "POSTER_JOINED" => $poster_joined, + "POSTER_POSTS" => $poster_posts, + "POSTER_FROM" => $poster_from, "POSTER_AVATAR" => $poster_avatar, - "POST_DATE" => $post_date, - "POST_SUBJECT" => $post_subject, - "MESSAGE" => $message, "PROFILE_IMG" => $profile_img, + "SEARCH_IMG" => $search_img, "EMAIL_IMG" => $email_img, "WWW_IMG" => $www_img, "ICQ_STATUS_IMG" => $icq_status_img, "ICQ_ADD_IMG" => $icq_add_img, "AIM_IMG" => $aim_img, "MSN_IMG" => $msn_img, - "YIM_IMG" => $yim_img, - "QUOTE_IMG" => $quote_img, - "EDIT_IMG" => $edit_img, - - "L_FROM" => $lang['From']) + "YIM_IMG" => $yim_img, + "POST_SUBJECT" => $post_subject, + "MESSAGE" => $private_message, + "POST_DATE" => $post_date) ); $template->pparse("body"); @@ -304,309 +506,591 @@ if($mode == "read") include($phpbb_root_path . 'includes/page_tail.'.$phpEx); } -else if($mode == "post" || $mode == "reply" || $mode == "edit") +else if( ( $delete && $mark_list ) || $delete_all ) { - // ----------------------------- - // Posting capabilities are here - // ----------------------------- - if(!$userdata['session_logged_in']) { - header("Location: " . append_sid("login.$phpEx?forward_page=privmsg.$phpEx&folder=$folder&mode=$mode")); + header("Location: " . append_sid("login.$phpEx?forward_page=privmsg.$phpEx&folder=inbox")); } - if(!$userdata['user_allow_pm']) + if( !$confirm ) { + $s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" />'; + $s_hidden_fields .= (isset($HTTP_POST_VARS['delete'])) ? '<input type="hidden" name="delete" value="true" />' : '<input type="hidden" name="deleteall" value="true" />'; + + for($i = 0; $i < count($mark_list); $i++) + { + $s_hidden_fields .= '<input type="hidden" name="mark[]" value="' . $mark_list[$i] . '" />'; + } + // - // Admin has prevented user from sending PM's + // Output confirmation page // - $msg = $lang['Cannot_send_privmsg']; - message_die(GENERAL_MESSAGE, $msg); - } + include($phpbb_root_path . 'includes/page_header.'.$phpEx); - // - // When we get to the point of a code review we really really really need to look at - // combining the following fragments with the posting routine. I don't think or see it - // necessary to actually use posting for privmsgs but I'm sure more can be combined in - // common functions ... not that I think all functions are common, some functions are - // actually quite classy and sophisticated, champagne, caviar and all that - // + $template->set_filenames(array( + "confirm_body" => "confirm_body.tpl") + ); + $template->assign_vars(array( + "MESSAGE_TITLE" => $lang['Information'], + "MESSAGE_TEXT" => "Are you sure you want to delete these message?", + + "L_YES" => $lang['Yes'], + "L_NO" => $lang['No'], + + "S_CONFIRM_ACTION" => append_sid("privmsg.$phpEx?folder=$folder"), + "S_HIDDEN_FIELDS" => $s_hidden_fields) + ); + $template->pparse("confirm_body"); - $disable_html = (isset($HTTP_POST_VARS['disable_html'])) ? $HTTP_POST_VARS['disable_html'] : !$userdata['user_allowhtml']; - $disable_bbcode = (isset($HTTP_POST_VARS['disable_bbcode'])) ? $HTTP_POST_VARS['disable_bbcode'] : !$userdata['user_allowbbcode']; - $disable_smilies = (isset($HTTP_POST_VARS['disable_smile'])) ? $HTTP_POST_VARS['disable_smile'] : !$userdata['user_allowsmile']; - $attach_sig = (isset($HTTP_POST_VARS['attach_sig'])) ? $HTTP_POST_VARS['attach_sig'] : $userdata['user_attachsig']; - $preview = (isset($HTTP_POST_VARS['preview'])) ? TRUE : FALSE; - $submit = (isset($HTTP_POST_VARS['submit'])) ? TRUE : FALSE; + include($phpbb_root_path . 'includes/page_tail.'.$phpEx); - if($mode == "reply" || $mode == "edit") + } + else if( $confirm ) { - if(!empty($HTTP_GET_VARS[POST_POST_URL])) + if( $delete_all ) { - $privmsgs_id = $HTTP_GET_VARS[POST_POST_URL]; + switch($folder) + { + case 'inbox': + $delete_type = "privmsgs_to_userid = " . $userdata['user_id'] . " AND ( + privmsgs_type = " . PRIVMSGS_READ_MAIL . " OR privmsgs_type = " . PRIVMSGS_NEW_MAIL . " )"; + break; + + case 'outbox': + $delete_type = "privmsgs_from_userid = " . $userdata['user_id'] . " AND privmsgs_type = " . PRIVMSGS_NEW_MAIL; + break; + + case 'sentbox': + $delete_type = "privmsgs_from_userid = " . $userdata['user_id'] . " AND privmsgs_type = " . PRIVMSGS_SENT_MAIL; + break; + + case 'savebox': + $delete_type = "( ( privmsgs_from_userid = " . $userdata['user_id'] . " + AND privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . " ) + OR ( privmsgs_to_userid = " . $userdata['user_id'] . " + AND privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " ) )"; + break; + } + + $deleteall_sql = "SELECT privmsgs_id + FROM " . PRIVMSGS_TABLE . " + WHERE " . $delete_type; + + if(!$del_list_status = $db->sql_query($deleteall_sql)) + { + message_die(GENERAL_ERROR, "Could not obtain id list to delete all messages.", "", __LINE__, __FILE__, $deleteall_sql); + } + + $delete_list = $db->sql_fetchrowset($del_list_status); + for($i = 0; $i < count($delete_list); $i++) + { + $mark_list[] = $delete_list[$i]['privmsgs_id']; + } + unset($delete_list); + unset($delete_type); } - else if(!empty($HTTP_POST_VARS[POST_POST_URL])) + + $delete_sql = "DELETE FROM " . PRIVMSGS_TABLE . " + WHERE "; + $delete_text_sql = "DELETE FROM " . PRIVMSGS_TEXT_TABLE . " + WHERE "; + + $delete_sql_id = ""; + for($i = 0; $i < count($mark_list); $i++) { - $privmsgs_id = $HTTP_POST_VARS[POST_POST_URL]; + if( $delete_sql_id != "" ) + { + $delete_sql_id .= ", "; + } + $delete_sql_id .= $mark_list[$i]; } - else + + $delete_sql .= "privmsgs_id IN ($delete_sql_id)"; + $delete_text_sql .= "privmsgs_text_id IN ($delete_sql_id)"; + + $delete_sql .= " AND "; + + switch($folder) { - message_die(GENERAL_ERROR, $lang['No_post_id']); - } - } + case 'inbox': + $delete_sql .= "privmsgs_to_userid = " . $userdata['user_id'] . " AND ( + privmsgs_type = " . PRIVMSGS_READ_MAIL . " OR privmsgs_type = " . PRIVMSGS_NEW_MAIL . " )"; + break; - if(!empty($HTTP_GET_VARS[POST_USERS_URL]) && !$preview && empty($HTTP_POST_VARS['submit'])) - { - $user_id = $HTTP_GET_VARS[POST_USERS_URL]; + case 'outbox': + $delete_sql .= "privmsgs_from_userid = " . $userdata['user_id'] . " AND privmsgs_type = " . PRIVMSGS_NEW_MAIL; + break; + + case 'sentbox': + $delete_sql .= "privmsgs_from_userid = " . $userdata['user_id'] . " AND privmsgs_type = " . PRIVMSGS_SENT_MAIL; + break; + + case 'savebox': + $delete_sql .= "( ( privmsgs_from_userid = " . $userdata['user_id'] . " + AND privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . " ) + OR ( privmsgs_to_userid = " . $userdata['user_id'] . " + AND privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " ) )"; + break; + } - $sql = "SELECT username - FROM " . USERS_TABLE . " - WHERE user_id = $user_id - AND user_id <> " . ANONYMOUS; - if(!$result = $db->sql_query($sql)) + if(!$del_status = $db->sql_query($delete_sql, BEGIN_TRANSACTION)) { - $error = TRUE; - $error_msg = $lang['No_such_user']; + message_die(GENERAL_ERROR, "Could not delete private message info.", "", __LINE__, __FILE__, $delete_sql); } else { - list($to_username) = $db->sql_fetchrow($result); - $to_username = stripslashes($to_username); + if(!$del_text_status = $db->sql_query($delete_text_sql, END_TRANSACTION)) + { + message_die(GENERAL_ERROR, "Could not delete private message text.", "", __LINE__, __FILE__, $delete_text_sql); + } } } - else + +} +else if( $save && $mark_list && $folder != "savebox" && $folder != "outbox") +{ + if( !$userdata['session_logged_in'] ) { - if(!empty($HTTP_POST_VARS['username_list'])) - { - $to_username = $HTTP_POST_VARS['username_list']; - } - else - { - $to_username = ""; - } + header("Location: " . append_sid("login.$phpEx?forward_page=privmsg.$phpEx&folder=inbox")); } - if($mode == "edit" && !$preview && !$submit) + // + // See if recipient is at their savebox limit + // + $sql = "SELECT COUNT(privmsgs_id) AS savebox_items, MIN(privmsgs_date) AS oldest_post_time + FROM " . PRIVMSGS_TABLE . " + WHERE ( ( privmsgs_to_userid = " . $userdata['user_id'] . " + AND privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " ) + OR ( privmsgs_from_userid = " . $userdata['user_id'] . " + AND privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . ") )"; + if( !$result = $db->sql_query($sql) ) { - $sql = "SELECT pm.privmsgs_id, pm.privmsgs_subject, pmt.privmsgs_text, u.username, u.user_id - FROM " . PRIVMSGS_TABLE . " pm, " . PRIVMSGS_TEXT_TABLE . " pmt, " . USERS_TABLE . " u - WHERE pm.privmsgs_id = $privmsgs_id - AND pmt.privmsgs_text_id = pm.privmsgs_id - AND pm.privmsgs_from_userid = " . $userdata['user_id'] . " - AND pm.privmsgs_type = " . PRIVMSGS_NEW_MAIL . " - AND u.user_id = pm.privmsgs_to_userid"; - if(!$pm_edit_status = $db->sql_query($sql)) - { - message_die(GENERAL_ERROR, "Could not obtain private message for editing.", "", __LINE__, __FILE__, $sql); - } - if(!$db->sql_numrows($pm_edit_status)) + message_die(GENERAL_ERROR, "Could not obtain sent message info for sendee.", "", __LINE__, __FILE__, $sql); + } + + $sql_priority = (SQL_LAYER == "mysql") ? "LOW_PRIORITY" : ""; + + if( $db->sql_numrows($result) ) + { + $saved_info = $db->sql_fetchrow($result); + + if( $saved_info['savebox_items'] > $board_config['max_savebox_privmsgs'] ) { - header("Location: " . append_sid("privmsg.$phpEx?folder=$folder")); + $sql = "DELETE $sql_priority FROM " . PRIVMSGS_TABLE . " + WHERE ( ( privmsgs_to_userid = " . $userdata['user_id'] . " + AND privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " ) + OR ( privmsgs_from_userid = " . $userdata['user_id'] . " + AND privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . ") ) + AND privmsgs_date = " . $saved_info['oldest_post_time']; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Could not delete oldest privmsgs.", "", __LINE__, __FILE__, $sql); + } } + } - $privmsg = $db->sql_fetchrow($pm_edit_status); + // + // Process request + // + $saved_sql = "UPDATE " . PRIVMSGS_TABLE; - $subject = stripslashes($privmsg['privmsgs_subject']); - $message = stripslashes($privmsg['privmsgs_text']); - $message = str_replace("[addsig]", "", $message); - $message = preg_replace("/\:[0-9a-z\:]*?\]/si", "]", $message); + switch($folder) + { + case 'inbox': + $saved_sql .= " SET privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " + WHERE privmsgs_to_userid = " . $userdata['user_id'] . " + AND ( privmsgs_type = " . PRIVMSGS_READ_MAIL . " + OR privmsgs_type = " . PRIVMSGS_NEW_MAIL . " )"; + break; - $to_username = stripslashes($privmsg['username']); - $to_userid = $privmsg['user_id']; + case 'outbox': + $saved_sql .= " SET privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . " + WHERE privmsgs_from_userid = " . $userdata['user_id'] . " + AND privmsgs_type = " . PRIVMSGS_NEW_MAIL; + break; + case 'sentbox': + $saved_sql .= " SET privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . " + WHERE privmsgs_from_userid = " . $userdata['user_id'] . " + AND privmsgs_type = " . PRIVMSGS_SENT_MAIL; + break; } - else if($mode == "reply" && !$preview && !$submit) - { - $sql = "SELECT pm.privmsgs_subject, pm.privmsgs_date, pmt.privmsgs_text, u.username, u.user_id - FROM " . PRIVMSGS_TABLE . " pm, " . PRIVMSGS_TEXT_TABLE . " pmt, " . USERS_TABLE . " u - WHERE pm.privmsgs_id = $privmsgs_id - AND pmt.privmsgs_text_id = pm.privmsgs_id - AND pm.privmsgs_to_userid = " . $userdata['user_id'] . " - AND pm.privmsgs_type = " . PRIVMSGS_READ_MAIL . " - AND u.user_id = pm.privmsgs_from_userid"; - if(!$pm_reply_status = $db->sql_query($sql)) - { - message_die(GENERAL_ERROR, "Could not obtain private message for editing.", "", __LINE__, __FILE__, $sql); - } - if(!$db->sql_numrows($pm_reply_status)) + $saved_sql_id = ""; + for($i = 0; $i < count($mark_list); $i++) + { + if( $saved_sql_id != "" ) { - header("Location: " . append_sid("privmsg.$phpEx?folder=$folder")); + $saved_sql_id .= ", "; } - $privmsg = $db->sql_fetchrow($pm_reply_status); - - $subject = ( (strstr("Re:", $privmsg['privmsgs_subject'])) ? $lang['Re'] . ":" : "" ) . stripslashes($privmsg['privmsgs_subject']); + $saved_sql_id .= $mark_list[$i]; + } - $to_username = stripslashes($privmsg['username']); - $to_userid = $privmsg['user_id']; + $saved_sql .= " AND privmsgs_id IN ($saved_sql_id)"; - if(isset($HTTP_GET_VARS['quote'])) - { - $msg_date = create_date($board_config['default_dateformat'], $privmsg['privmsgs_date'], $board_config['board_timezone']); //"[date]" . $privmsg['privmsgs_time'] . "[/date]"; + if( !$save_status = $db->sql_query($saved_sql) ) + { + message_die(GENERAL_ERROR, "Could not save private messages.", "", __LINE__, __FILE__, $saved_sql); + } - $message = stripslashes(str_replace("[addsig]", "", $privmsg['privmsgs_text'])); - $message = preg_replace("/\:[0-9a-z\:]*?\]/si", "]", $message); - $message = "On " . $msg_date . " " . $to_username . " wrote:\n\n[quote]\n" . $message . "\n[/quote]"; - } +} +else if( $submit || $refresh || $mode != "" ) +{ + if(!$userdata['session_logged_in']) + { + header("Location: " . append_sid("login.$phpEx?forward_page=privmsg.$phpEx&folder=$folder&mode=$mode")); } - // - // Process the username list operations - // - if( !empty($HTTP_POST_VARS['usersubmit'])) + if( $mode == "searchuser" ) { - if(!empty($HTTP_POST_VARS['username_search']) && !$preview) + if( isset($HTTP_POST_VARS['search']) ) { - $username_search = stripslashes(str_replace("*", "%", $HTTP_POST_VARS['username_search'])); - $first_letter = 65; - - $sql = "SELECT username - FROM " . USERS_TABLE . " - WHERE ( username LIKE '%$username_search' - OR username LIKE '$username_search%' - OR username LIKE '%$username_search%' - OR username LIKE '$username_search' ) - AND user_id <> " . ANONYMOUS; + $username_list = username_search("privmsg.$phpEx", $HTTP_POST_VARS['search_author'], 1); } else { - $first_letter = $HTTP_POST_VARS['user_alpha']; - - $sql = "SELECT username - FROM " . USERS_TABLE . " - WHERE ( username LIKE '" . chr($first_letter) . "%' - OR username LIKE '" . chr($first_letter) . "' ) - AND user_id <> " . ANONYMOUS; + username_search("privmsg.$phpEx", "", 1); } + + // + // Remove this later + // + exit; + } + + // + // Toggles + // + if( !$board_config['allow_html'] ) + { + $html_on = 0; } else { - $first_letter = (!empty($to_username)) ? ord(ucfirst($to_username)) : 65; - - $sql = "SELECT username - FROM " . USERS_TABLE . " - WHERE ( username LIKE '" . chr($first_letter) . "%' - OR username LIKE '" . chr($first_letter) . "' ) - AND user_id <> " . ANONYMOUS; + $html_on = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['disable_html']) ) ? 0 : TRUE ) : $userdata['user_allowhtml']; } - $result = $db->sql_query($sql); - $name_set = $db->sql_fetchrowset($result); - - $user_names_select = "<select name=\"username_list\">"; - if($db->sql_numrows($result)) + if( !$board_config['allow_bbcode'] ) { - for($i = 0; $i < count($name_set); $i++) - { - $name_selected = ($to_username == $name_set[$i]['username']) ? " selected" : ""; - $user_names_select .= "<option value=\"" . $name_set[$i]['username'] . "\"$name_selected>" . $name_set[$i]['username'] . "</option>\n"; - } + $bbcode_on = 0; } else { - $user_names_select .= "<option value=\"" . ANONYMOUS . "\"$name_selected>" . $lang['No_match'] . "</option>\n"; + $bbcode_on = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['disable_bbcode']) ) ? 0 : TRUE ) : $userdata['user_allowbbcode']; } - $user_names_select .= "</select>"; - $user_alpha_select = "<select name=\"user_alpha\" onchange=\"\">"; - for($i = 65; $i < 91; $i++) + if( !$board_config['allow_smilies'] ) { - if($first_letter == $i) - { - $user_alpha_select .= "<option value=\"$i\" selected>" . chr($i) . "</option>"; - } - else - { - $user_alpha_select .= "<option value=\"$i\">" . chr($i) . "</option>"; - } + $smilies_on = 0; + } + else + { + $smilies_on = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['disable_smilies']) ) ? 0 : TRUE ) : $userdata['user_allowsmile']; } - $user_alpha_select .= "</select>"; - if($submit || $preview) + $attach_sig = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['attach_sig']) ) ? TRUE : 0 ) : $userdata['user_attachsig']; + + $user_sig = ( $userdata['user_sig'] != "" ) ? $userdata['user_sig'] : ""; + + if( $submit && $mode != "edit" ) { // // Flood control // - if($mode != 'edit' && !$preview) + $sql = "SELECT MAX(privmsgs_date) AS last_post_time + FROM " . PRIVMSGS_TABLE . " + WHERE privmsgs_from_userid = " . $userdata['user_id']; + if( $result = $db->sql_query($sql) ) { - $sql = "SELECT MAX(privmsgs_date) AS last_post_time - FROM " . PRIVMSGS_TABLE . " - WHERE privmsgs_ip = '$user_ip'"; - if($result = $db->sql_query($sql)) - { - $db_row = $db->sql_fetchrow($result); - $last_post_time = $db_row['last_post_time']; - $current_time = get_gmt_ts(); + $db_row = $db->sql_fetchrow($result); - if(($current_time - $last_post_time) < $board_config['flood_interval']) - { - $error = TRUE; - $error_msg = $lang['Flood_Error']; - } + $last_post_time = $db_row['last_post_time']; + $current_time = time(); + + if( ( $current_time - $last_post_time ) < $board_config['flood_interval']) + { + message_die(GENERAL_MESSAGE, $lang['Flood_Error']); } } // - // End: Flood control + // End Flood control // + } - $subject = (!empty($HTTP_POST_VARS['subject'])) ? $HTTP_POST_VARS['subject'] : ""; - $subject = trim(strip_tags(htmlspecialchars($subject))); - $message = (!empty($HTTP_POST_VARS['message'])) ? $HTTP_POST_VARS['message'] : ""; + if( $submit ) + { + if( !empty($HTTP_POST_VARS['username']) ) + { + $to_username = $HTTP_POST_VARS['username']; - if(empty($subject)) + $sql = "SELECT user_id, user_notify_pm, user_email + FROM " . USERS_TABLE . " + WHERE username = '" . $to_username . "' + AND user_id <> " . ANONYMOUS; + if(!$result = $db->sql_query($sql)) + { + $error = TRUE; + $error_msg = $lang['No_such_user']; + } + else + { + $to_userdata = $db->sql_fetchrow($result); + } + } + else { $error = TRUE; if(isset($error_msg)) { $error_msg .= "<br />"; } + $error_msg .= $lang['No_to_user']; + } + + $privmsg_subject = trim(strip_tags($HTTP_POST_VARS['subject'])); + if( empty($privmsg_subject) ) + { + $error = TRUE; + if( !empty($error_msg) ) + { + $error_msg .= "<br />"; + } $error_msg .= $lang['Empty_subject']; } - if( !empty($message) ) + if( !empty($HTTP_POST_VARS['message']) ) + { + if( !$error ) + { + if( $bbcode_on ) + { + $bbcode_uid = make_bbcode_uid(); + } + + $privmsg_message = prepare_message($HTTP_POST_VARS['message'], $html_on, $bbcode_on, $smilies_on, $bbcode_uid); + + } + } + else + { + $error = TRUE; + if(!empty($error_msg)) + { + $error_msg .= "<br />"; + } + $error_msg .= $lang['Empty_message']; + } + } + + if( $submit && !$error ) + { + // + // Has admin prevented user from sending PM's? + // + if( !$userdata['user_allow_pm'] ) { - if(!$error && !$preview) + $message = $lang['Cannot_send_privmsg']; + message_die(GENERAL_MESSAGE, $message); + } + + $msg_time = time(); + + if( $mode != "edit" ) + { + // + // See if recipient is at their inbox limit + // + $sql = "SELECT COUNT(privmsgs_id) AS inbox_items, MIN(privmsgs_date) AS oldest_post_time + FROM " . PRIVMSGS_TABLE . " + WHERE ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . " + OR privmsgs_type = " . PRIVMSGS_READ_MAIL . " ) + AND privmsgs_from_userid = " . $to_userdata['user_id']; + if( !$result = $db->sql_query($sql) ) { - $html_on = ($disable_html) ? FALSE : TRUE; - $bbcode_on = ($diable_bbcode) ? FALSE : TRUE; - $smile_on = ($disable_smilies) ? FALSE : TRUE; + message_die(GENERAL_ERROR, "Could not obtain sent message info for sendee.", "", __LINE__, __FILE__, $sql); + } - $bbcode_uid = make_bbcode_uid(); + $sql_priority = (SQL_LAYER == "mysql") ? "LOW_PRIORITY" : ""; - $message = prepare_message($message, $html_on, $bbcode_on, $smile_on, $bbcode_uid); - $message = preg_replace('#</textarea>#si', '</TEXTAREA>', $message); + if( $db->sql_numrows($result) ) + { + $inbox_info = $db->sql_fetchrow($result); - if($attach_sig && !empty($userdata['user_sig'])) + if( $inbox_info['inbox_items'] > $board_config['max_inbox_privmsgs'] ) { - $message .= "[addsig]"; + $sql = "DELETE $sql_priority FROM " . PRIVMSGS_TABLE . " + WHERE ( privmsgs_type = " . PRIVMSGS_NEW_MAIL . " + OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " ) + AND privmsgs_date = " . $inbox_info['oldest_post_time'] . " + AND privmsgs_to_userid = " . $to_userdata['user_id']; + if( !$result = $db->sql_query($sql) ) + { + message_die(GENERAL_ERROR, "Could not delete oldest privmsgs.", "", __LINE__, __FILE__, $sql); + } } } + + // + // This area is reserved for future use :D + // + + // + // + // + + $sql_info = "INSERT INTO " . PRIVMSGS_TABLE . " (privmsgs_type, privmsgs_subject, privmsgs_from_userid, privmsgs_to_userid, privmsgs_date, privmsgs_ip, privmsgs_enable_html, privmsgs_enable_bbcode, privmsgs_enable_smilies, privmsgs_attach_sig) + VALUES (" . PRIVMSGS_NEW_MAIL . ", '$privmsg_subject', " . $userdata['user_id'] . ", " . $to_userdata['user_id'] . ", $msg_time, '$user_ip', $html_on, $bbcode_on, $smilies_on, $attach_sig)"; + } + else + { + $sql_info = "UPDATE " . PRIVMSGS_TABLE . " + SET privmsgs_type = " . PRIVMSGS_NEW_MAIL . ", privmsgs_subject = '$privmsg_subject', privmsgs_from_userid = " . $userdata['user_id'] . ", privmsgs_to_userid = " . $to_userdata['user_id'] . ", privmsgs_date = $msg_time, privmsgs_ip = '$user_ip', privmsgs_enable_html = $html_on, privmsgs_enable_bbcode = $bbcode_on, privmsgs_enable_smilies = $smilies_on, privmsgs_attach_sig = $attach_sig + WHERE privmsgs_id = $privmsg_id"; + } + + if( !$pm_sent_status = $db->sql_query($sql_info, BEGIN_TRANSACTION) ) + { + message_die(GENERAL_ERROR, "Could not insert/update private message sent info.", "", __LINE__, __FILE__, $sql_info); + } + else + { + if( $mode != "edit" ) + { + $privmsg_sent_id = $db->sql_nextid(); + + $sql = "INSERT INTO " . PRIVMSGS_TEXT_TABLE . " (privmsgs_text_id, privmsgs_bbcode_uid, privmsgs_text) + VALUES ($privmsg_sent_id, '" . $bbcode_uid . "', '$privmsg_message')"; + } else { - if(!$error) + $sql = "UPDATE " . PRIVMSGS_TEXT_TABLE . " + SET privmsgs_text = '$privmsg_message', privmsgs_bbcode_uid = '$bbcode_uid' + WHERE privmsgs_text_id = $privmsg_id"; + } + + if( !$pm_sent_text_status = $db->sql_query($sql, END_TRANSACTION) ) + { + message_die(GENERAL_ERROR, "Could not insert/update private message sent text.", "", __LINE__, __FILE__, $sql_info); + } + else if( $mode != "edit" ) + { + if( $to_userdata['user_notify_pm'] && !empty($to_userdata['user_email']) ) { - // do stripslashes incase magic_quotes is on. - $message = stripslashes($HTTP_POST_VARS['message']); - $message = preg_replace('#</textarea>#si', '</TEXTAREA>', $message); + $path = (dirname($HTTP_SERVER_VARS['REQUEST_URI']) == "/") ? "" : dirname($HTTP_SERVER_VARS['REQUEST_URI']); + $email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n"; + + include($phpbb_root_path . 'includes/emailer.'.$phpEx); + $emailer = new emailer($board_config['smtp_delivery']); + + $emailer->use_template("privmsg_notify"); + + $emailer->extra_headers($email_headers); + $emailer->email_address($to_userdata['user_email']); + $emailer->set_subject($lang['Notification_subject']); + + $emailer->assign_vars(array( + "USERNAME" => $to_username, + "SITENAME" => $board_config['sitename'], + "EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), + + "U_INBOX" => "http://" . $HTTP_SERVER_VARS['SERVER_NAME'] . $path . "/privmsg.$phpEx?folder=inbox") + ); + + $emailer->send(); + $emailer->reset(); } } + + $template->assign_vars(array( + "META" => '<meta http-equiv="refresh" content="3;url=privmsg.' . $phpEx . '?folder=inbox">') + ); + + $msg = $lang['Message_sent'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("privmsg.$phpEx?folder=inbox") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_inbox'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("index.$phpEx") . "\">" . $lang['Here'] . "</a> ". $lang['to_return_index']; + + message_die(GENERAL_MESSAGE, $msg); } - else + } + else if( $preview || $refresh || $error ) + { + + // + // If we're previewing or refreshing then obtain the data + // passed to the script, process it a little, do some checks + // where neccessary, etc. + // + $to_username = ( isset($HTTP_POST_VARS['username']) ) ? trim(strip_tags(stripslashes($HTTP_POST_VARS['username']))) : ""; + $privmsg_subject = ( isset($HTTP_POST_VARS['subject']) ) ? trim(strip_tags(stripslashes($HTTP_POST_VARS['subject']))) : ""; + $privmsg_message = ( isset($HTTP_POST_VARS['message']) ) ? trim(stripslashes($HTTP_POST_VARS['message'])) : ""; + $privmsg_message = preg_replace('#<textarea>#si', '<textarea>', $privmsg_message); + + // + // Do mode specific things + // + if( $mode == "post" ) { - $error = TRUE; - if(isset($error_msg)) + $page_title = $lang['Send_new_privmsg']; + + $user_sig = ( $userdata['user_sig'] != "" ) ? $userdata['user_sig'] : ""; + + } + else if( $mode == "reply" ) + { + $page_title = $lang['Reply_privmsg']; + + $user_sig = ( $userdata['user_sig'] != "" ) ? $userdata['user_sig'] : ""; + + } + else if( $mode == "edit" ) + { + $page_title = $lang['Edit_privmsg']; + + $sql = "SELECT u.user_id, u.user_sig + FROM " . PRIVMSGS_TABLE . " pm, " . USERS_TABLE . " u + WHERE pm.privmsgs_id = $privmsg_id + AND u.user_id = pm.privmsgs_from_userid"; + if($result = $db->sql_query($sql)) + { + $postrow = $db->sql_fetchrow($result); + + if( $userdata['user_id'] != $postrow['user_id'] ) + { + message_die(GENERAL_MESSAGE, $lang['Sorry_edit_own_posts']); + } + + $user_sig = ( $postrow['user_sig'] != "" ) ? $postrow['user_sig'] : ""; + } + else + { + message_die(GENERAL_ERROR, "Couldn't obtain post and post text", "", __LINE__, __FILE__, $sql); + } + } + + // + // Process the username list operations + // + if( $submit_search ) + { + if( !empty($HTTP_POST_VARS['username_search']) ) { - $error_msg .= "<br />"; } - $error_msg .= $lang['Empty_msg']; + } + } + else + { + if( !$privmsg_id && ( $mode == "reply" || $mode == "edit" || $mode == "quote" ) ) + { + message_die(GENERAL_ERROR, $lang['No_post_id']); } - if( !empty($to_username) ) + if( !empty($HTTP_GET_VARS[POST_USERS_URL]) ) { - $sql = "SELECT user_id, username, user_notify_pm, user_email + $user_id = $HTTP_GET_VARS[POST_USERS_URL]; + + $sql = "SELECT username FROM " . USERS_TABLE . " - WHERE username = '" . addslashes($to_username) . "' + WHERE user_id = $user_id AND user_id <> " . ANONYMOUS; if(!$result = $db->sql_query($sql)) { @@ -615,145 +1099,205 @@ else if($mode == "post" || $mode == "reply" || $mode == "edit") } else { - $to_userdata = $db->sql_fetchrow($result); + $row = $db->sql_fetchrow($result); + $to_username = $row['username']; } } - else + + // + // Obtain list of groups/users is + // this user is a group moderator + // + if( $mode == "post" ) { - $error = TRUE; - if(isset($error_msg)) + unset($mod_group_list); + $sql = "SELECT g.group_id, g.group_name, g.group_moderator, g.group_single_user, u.username + FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug, " . USERS_TABLE . " u + WHERE g.group_moderator = " . $userdata['user_id'] ." + AND ug.group_id = g.group_id + AND u.user_id = ug.user_id"; + if(!$group_status = $db->sql_query($sql)) { - $error_msg .= "<br />"; + message_die(GENERAL_ERROR, "Could not obtain group moderator list.", "", __LINE__, __FILE__, $sql); + } + if($db->sql_numrows($group_status)) + { + $mod_group_list = $db->sql_fetchrowset($group_status); } - $error_msg .= $lang['No_to_user']; } - if(!$preview && !$error) + if( $mode == "edit" ) { - $msg_time = time(); - - if($mode != "edit") + $sql = "SELECT pm.privmsgs_id, pm.privmsgs_subject, pmt.privmsgs_text, u.username, u.user_id, u.user_sig + FROM " . PRIVMSGS_TABLE . " pm, " . PRIVMSGS_TEXT_TABLE . " pmt, " . USERS_TABLE . " u + WHERE pm.privmsgs_id = $privmsg_id + AND pmt.privmsgs_text_id = pm.privmsgs_id + AND pm.privmsgs_from_userid = " . $userdata['user_id'] . " + AND pm.privmsgs_type = " . PRIVMSGS_NEW_MAIL . " + AND u.user_id = pm.privmsgs_to_userid"; + if( !$pm_edit_status = $db->sql_query($sql) ) { - $sql_info = "INSERT INTO " . PRIVMSGS_TABLE . " (privmsgs_type, privmsgs_subject, privmsgs_from_userid, privmsgs_to_userid, privmsgs_date, privmsgs_ip, privmsgs_bbcode_uid) - VALUES (" . PRIVMSGS_NEW_MAIL . ", '$subject', " . $userdata['user_id'] . ", " . $to_userdata['user_id'] . ", $msg_time, '$user_ip', '" . $bbcode_uid . "')"; + message_die(GENERAL_ERROR, "Could not obtain private message for editing.", "", __LINE__, __FILE__, $sql); } - else + if(!$db->sql_numrows($pm_edit_status)) { - $sql_info = "UPDATE " . PRIVMSGS_TABLE . " - SET privmsgs_type = " . PRIVMSGS_NEW_MAIL . ", privmsgs_subject = '$subject', privmsgs_from_userid = " . $userdata['user_id'] . ", privmsgs_to_userid = " . $to_userdata['user_id'] . ", privmsgs_date = $msg_time, privmsgs_ip = '$user_ip', privmsgs_bbcode_uid = '$bbcode_uid' - WHERE privmsgs_id = $privmsgs_id"; + header("Location: " . append_sid("privmsg.$phpEx?folder=$folder")); } - if(!$pm_sent_status = $db->sql_query($sql_info, BEGIN_TRANSACTION)) + $privmsg = $db->sql_fetchrow($pm_edit_status); + + $privmsg_subject = $privmsg['privmsgs_subject']; + $privmsg_message = $privmsg['privmsgs_text']; + + $privmsg_message = preg_replace("/\:[0-9a-z\:]*?\]/si", "]", $privmsg_message); + $privmsg_message = str_replace("<br />", "\n", $privmsg_message); + $privmsg_message = preg_replace($html_entities_match, $html_entities_replace, $privmsg_message); + $privmsg_message = preg_replace('#</textarea>#si', '</textarea>', $privmsg_message); + + $user_sig = $privmsg['user_sig']; + + $to_username = $privmsg['username']; + $to_userid = $privmsg['user_id']; + + } + else if( $mode == "reply" || $mode == "quote" ) + { + + $sql = "SELECT pm.privmsgs_subject, pm.privmsgs_date, pmt.privmsgs_text, u.username, u.user_id + FROM " . PRIVMSGS_TABLE . " pm, " . PRIVMSGS_TEXT_TABLE . " pmt, " . USERS_TABLE . " u + WHERE pm.privmsgs_id = $privmsg_id + AND pmt.privmsgs_text_id = pm.privmsgs_id + AND pm.privmsgs_to_userid = " . $userdata['user_id'] . " + AND u.user_id = pm.privmsgs_from_userid"; + if(!$pm_reply_status = $db->sql_query($sql)) { - message_die(GENERAL_ERROR, "Could not insert/update private message sent info.", "", __LINE__, __FILE__, $sql_info); + message_die(GENERAL_ERROR, "Could not obtain private message for editing.", "", __LINE__, __FILE__, $sql); } - else + if( !$db->sql_numrows($pm_reply_status) ) { +// header("Location: " . append_sid("privmsg.$phpEx?folder=$folder")); + } + $privmsg = $db->sql_fetchrow($pm_reply_status); - if($mode != "edit") - { - $privmsg_sent_id = $db->sql_nextid(); + $privmsg_subject = ( (strstr("Re:", $privmsg['privmsgs_subject'])) ? $lang['Re'] . ":" : "" ) . $privmsg['privmsgs_subject']; - $sql = "INSERT INTO " . PRIVMSGS_TEXT_TABLE . " (privmsgs_text_id, privmsgs_text) - VALUES ($privmsg_sent_id, '$message')"; - } - else - { - $sql = "UPDATE " . PRIVMSGS_TEXT_TABLE . " - SET privmsgs_text = '$message' - WHERE privmsgs_text_id = $privmsgs_id"; - } + $to_username = $privmsg['username']; + $to_userid = $privmsg['user_id']; - if(!$pm_sent_text_status = $db->sql_query($sql, END_TRANSACTION)) - { - message_die(GENERAL_ERROR, "Could not insert/update private message sent text.", "", __LINE__, __FILE__, $sql_info); - } - else if($mode != "edit") - { - if($to_userdata['user_notify_pm'] && !empty($to_userdata['user_email'])) - { - $email_headers = "From: " . $board_config['board_email'] . "\r\n"; - include($phpbb_root_path . 'includes/emailer.'.$phpEx); - $emailer = new emailer($board_config['smtp_delivery']); - - $emailer->use_template("privmsg_notify"); - $emailer->email_address($to_userdata['user_email']); - $emailer->set_subject($lang['Notification_subject']); - $emailer->extra_headers($email_headers); - - $emailer->assign_vars(array("SITENAME" => $board_config['sitename'], - "U_INBOX" => "http://".$SERVER_NAME . $PHP_SELF . "?folder=inbox", - "EMAIL_SIG" => $board_config['email_sig'])); - $emailer->send(); - $emailer->reset(); - } - } + if( $mode == "quote" ) + { + $privmsg_message = $privmsg['privmsgs_text']; + + $msg_date = create_date($board_config['default_dateformat'], $privmsg['privmsgs_date'], $board_config['board_timezone']); //"[date]" . $privmsg['privmsgs_time'] . "[/date]"; + + $privmsg_message = preg_replace("/\:[0-9a-z\:]*?\]/si", "]", $privmsg_message); + $privmsg_message = str_replace("<br />", "\n", $privmsg_message); + $privmsg_message = preg_replace($html_entities_match, $html_entities_replace, $privmsg_message); + $privmsg_message = preg_replace('#</textarea>#si', '</textarea>', $privmsg_message); - $msg = $lang['Message_sent'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("privmsg.$phpEx?folder=inbox") . "\">" . $lang['Here'] . "</a> " . $lang['to_return_inbox'] . "<br /><br />" . $lang['Click'] . " <a href=\"" . append_sid("index.$phpEx") . "\">" . $lang['Here'] . "</a> ". $lang['to_return_index']; + $msg_date = create_date($board_config['default_dateformat'], $privmsg['privmsgs_date'], $board_config['default_timezone']); - message_die(GENERAL_MESSAGE, $msg); + $privmsg_message = $to_username . " wrote:\n\n[quote]\n" . $privmsg_message . "\n[/quote]"; + + $mode = "reply"; } } } // - // Obtain list of groups/users is - // this user is a group moderator + // Has admin prevented user from sending PM's? + // + if( !$userdata['user_allow_pm'] && $mode != "edit" ) + { + $message = $lang['Cannot_send_privmsg']; + message_die(GENERAL_MESSAGE, $message); + } + + // + // Start output, first preview, then errors + // then post form // - if($mode == "post") + $page_title = $lang['Send_private_message']; + include($phpbb_root_path . 'includes/page_header.'.$phpEx); + + if( $preview && !$error ) { - unset($mod_group_list); - $sql = "SELECT g.group_id, g.group_name, g.group_moderator, g.group_single_user, u.username - FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug, " . USERS_TABLE . " u - WHERE g.group_moderator = " . $userdata['user_id'] ." - AND ug.group_id = g.group_id - AND u.user_id = ug.user_id"; - if(!$group_status = $db->sql_query($sql)) + $orig_word = array(); + $replacement_word = array(); + $result = obtain_word_list($orig_word, $replacement_word); + + if( $bbcode_on ) { - message_die(GENERAL_ERROR, "Could not obtain group moderator list.", "", __LINE__, __FILE__, $sql); + $bbcode_uid = make_bbcode_uid(); } - if($db->sql_numrows($group_status)) + + $preview_message = prepare_message($privmsg_message, $html_on, $bbcode_on, $smilies_on, $bbcode_uid); + + // + // Finalise processing as per viewtopic + // + if( !$html_on ) { - $mod_group_list = $db->sql_fetchrowset($group_status); + if( $user_sig != "" || !$userdata['user_allowhtml'] ) + { + $user_sig = preg_replace("#(<)([\/]?.*?)(>)#is", "<\\2>", $user_sig); + } } - } - include($phpbb_root_path . 'includes/page_header.'.$phpEx); + if( $attach_sig && $user_sig != "" && $userdata['user_sig_bbcode_uid'] ) + { + $user_sig = bbencode_second_pass($user_sig, $userdata['user_sig_bbcode_uid']); + } - if($preview && !$error) - { - $bbcode_uid = make_bbcode_uid(); + if( $bbcode_on ) + { + $preview_message = bbencode_second_pass($preview_message, $bbcode_uid); + } - $preview_message = $message; - $preview_message = prepare_message($preview_message, TRUE, TRUE, TRUE, $bbcode_uid); - $preview_message = bbencode_second_pass($preview_message, $bbcode_uid); - $preview_message = make_clickable($preview_message); + if( $attach_sig && $user_sig != "" ) + { + $preview_message = $preview_message . "<br /><br />_________________<br />" . $user_sig; + } - $s_hidden_fields = "<input type=\"hidden\" name=\"folder\" value=\"$folder\">"; - $s_hidden_fields .= "<input type=\"hidden\" name=\"mode\" value=\"$mode\">"; - if(isset($HTTP_GET_VARS['quote'])) + if( count($orig_word) ) { - $s_hidden_fields .= "<input type=\"hidden\" name=\"quote\" value=\"true\">"; + $preview_subject = preg_replace($orig_word, $replacement_word, $privmsg_subject); + $preview_message = preg_replace($orig_word, $replacement_word, $preview_message); } - if(isset($privmsg_id)) + + if( $smilies_on ) { - $s_hidden_fields .= "<input type=\"hidden\" name=\"" . POST_POST_URL . "\" value=\"$privmsgs_id\">"; + $preview_message = smilies_pass($preview_message); + } + + $preview_message = make_clickable($preview_message); + $preview_message = str_replace("\n", "<br />", $preview_message); + + $s_hidden_fields = "<input type=\"hidden\" name=\"folder\" value=\"$folder\" />"; + $s_hidden_fields .= "<input type=\"hidden\" name=\"mode\" value=\"$mode\" />"; + + if( isset($privmsg_id) ) + { + $s_hidden_fields .= "<input type=\"hidden\" name=\"" . POST_POST_URL . "\" value=\"$privmsg_id\" />"; } $template->set_filenames(array( - "preview" => "posting_preview.tpl") + "preview" => "privmsgs_preview.tpl") ); $template->assign_vars(array( - "TOPIC_TITLE" => $subject, - "POST_SUBJECT" => $subject, - "ROW_COLOR" => "#" . $theme['td_color1'], - "POSTER_NAME" => $to_username, + "TOPIC_TITLE" => $preview_subject, + "POST_SUBJECT" => $preview_subject, + "MESSAGE_TO" => $to_username, + "MESSAGE_FROM" => $userdata['username'], "POST_DATE" => create_date($board_config['default_dateformat'], time(), $board_config['board_timezone']), - "MESSAGE" => stripslashes(nl2br($preview_message)), + "MESSAGE" => $preview_message, "S_HIDDEN_FIELDS" => $s_hidden_fields, + "L_SUBJECT" => $lang['Subject'], + "L_DATE" => $lang['Date'], + "L_FROM" => $lang['From'], + "L_TO" => $lang['To'], "L_PREVIEW" => $lang['Preview'], "L_POSTED" => $lang['Posted']) ); @@ -778,71 +1322,100 @@ else if($mode == "post" || $mode == "reply" || $mode == "edit") // // + // Generic posting form ... + // + + // // Load templates // $template->set_filenames(array( - "body" => "privmsgs_posting_body.tpl", + "body" => "posting_body.tpl", "jumpbox" => "jumpbox.tpl") ); $jumpbox = make_jumpbox(); $template->assign_vars(array( - "JUMPBOX_LIST" => $jumpbox, - "SELECT_NAME" => POST_FORUM_URL) + "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($board_config['allow_html']) + // + // Generate username search output + // + $result = $db->sql_query($sql_namesearch); + $name_set = $db->sql_fetchrowset($result); + + $user_names_select = ""; + if($db->sql_numrows($result)) { - $html_status = $lang['ON']; - $html_toggle = '<input type="checkbox" name="disable_html" '; - if($disable_html) + for($i = 0; $i < count($name_set); $i++) { - $html_toggle .= 'checked'; + $name_selected = ($to_username == $name_set[$i]['username']) ? " selected=\"selected\"" : ""; + $user_names_select .= "<option value=\"" . $name_set[$i]['username'] . "\"$name_selected>" . $name_set[$i]['username'] . "</option>\n"; } - $html_toggle .= "> " . $lang['Disable'] . $lang['HTML'] . $lang['in_this_post']; + } + else + { + $user_names_select .= "<option value=\"" . ANONYMOUS . "\"$name_selected>" . $lang['No_match'] . "</option>\n"; + } + + // + // Enable extensions in posting_body + // + $template->assign_block_vars("privmsg_extensions", array()); + + // + // HTML toggle selection + // + if($board_config['allow_html']) + { + $html_status = $lang['ON']; + $template->assign_block_vars("html_checkbox", array()); } else { $html_status = $lang['OFF']; } + // + // BBCode toggle selection + // if($board_config['allow_bbcode']) { $bbcode_status = $lang['ON']; - $bbcode_toggle = '<input type="checkbox" name="disable_bbcode" '; - if($disable_bbcode) - { - $bbcode_toggle .= "checked"; - } - $bbcode_toggle .= "> " . $lang['Disable'] . $lang['BBCode'] . $lang['in_this_post']; + $template->assign_block_vars("bbcode_checkbox", array()); } else { - $bbcode_status = $lang['BBCode'] . $lang['is_OFF']; + $bbcode_status = $lang['OFF']; } + // + // Smilies toggle selection + // if($board_config['allow_smilies']) { $smilies_status = $lang['ON']; - $smile_toggle = '<input type="checkbox" name="disable_smile" '; - if($disable_smilies) - { - $smile_toggle .= "checked"; - } - $smile_toggle .= "> " . $lang['Disable'] . $lang['Smilies'] . $lang['in_this_post']; + $template->assign_block_vars("smilies_checkbox", array()); } else { $smilies_status = $lang['OFF']; } - $sig_toggle = '<input type="checkbox" name="attach_sig" '; - if($attach_sig) + // + // Signature toggle selection - only show if + // the user has a signature + // + if( $user_sig != "" ) { - $sig_toggle .= "checked"; + $template->assign_block_vars("signature_checkbox", array()); } - $sig_toggle .= "> " . $lang['Attach_signature']; if($mode == 'post') { @@ -863,30 +1436,31 @@ else if($mode == "post" || $mode == "reply" || $mode == "edit") $post_a = $lang['Edit_message']; } - $username_input = '<input type="text" name="username_search" value="' . $username_search . '">'; - $subject_input = '<input type="text" name="subject" value="' . $subject . '" size="50" maxlength="255">'; - $message_input = '<textarea name="message" rows="10" cols="40" wrap="virtual">' . $message . '</textarea>'; - - $s_hidden_fields = "<input type=\"hidden\" name=\"folder\" value=\"$folder\">"; - $s_hidden_fields .= "<input type=\"hidden\" name=\"mode\" value=\"$mode\">"; + $s_hidden_fields = "<input type=\"hidden\" name=\"folder\" value=\"$folder\" />"; + $s_hidden_fields .= "<input type=\"hidden\" name=\"mode\" value=\"$mode\" />"; if($mode == "edit") { - $s_hidden_fields .= "<input type=\"hidden\" name=\"" . POST_POST_URL . "\" value=\"$privmsgs_id\">"; + $s_hidden_fields .= "<input type=\"hidden\" name=\"" . POST_POST_URL . "\" value=\"$privmsg_id\" />"; } $template->assign_vars(array( - "S_USERNAME_INPUT" => $username_input, - - "SUBJECT_INPUT" => $subject_input, - "MESSAGE_INPUT" => $message_input, - "HTML_STATUS" => $html_status, - "HTML_TOGGLE" => $html_toggle, - "SMILIES_STATUS" => $smilies_status, - "SMILE_TOGGLE" => $smile_toggle, - "SIG_TOGGLE" => $sig_toggle, - "NOTIFY_TOGGLE" => $notify_toggle, - "BBCODE_TOGGLE" => $bbcode_toggle, - "BBCODE_STATUS" => $bbcode_status, + "SUBJECT" => preg_replace($html_entities_match, $html_entities_replace, $privmsg_subject), + "USERNAME" => preg_replace($html_entities_match, $html_entities_replace, $to_username), + "MESSAGE" => $privmsg_message, + "HTML_STATUS" => $html_status, + "SMILIES_STATUS" => $smilies_status, + "BBCODE_STATUS" => $bbcode_status, + "FORUM_NAME" => $lang['Private_message'], + + "BOX_NAME" => $l_box_name, + "INBOX_IMG" => $inbox_img, + "SENTBOX_IMG" => $sentbox_img, + "OUTBOX_IMG" => $outbox_img, + "SAVEBOX_IMG" => $savebox_img, + "INBOX_LINK" => $inbox_url, + "SENTBOX_LINK" => $sentbox_url, + "OUTBOX_LINK" => $outbox_url, + "SAVEBOX_LINK" => $savebox_url, "L_SUBJECT" => $lang['Subject'], "L_MESSAGE_BODY" => $lang['Message_body'], @@ -900,11 +1474,20 @@ else if($mode == "post" || $mode == "reply" || $mode == "edit") "L_HTML_IS" => $lang['HTML'] . " " . $lang['is'], "L_BBCODE_IS" => $lang['BBCode'] . " " . $lang['is'], "L_SMILIES_ARE" => $lang['Smilies'] . " " . $lang['are'], - - "S_ALPHA_SELECT" => $user_alpha_select, + "L_DISABLE_HTML" => $lang['Disable'] . $lang['HTML'] . $lang['in_this_post'], + "L_DISABLE_BBCODE" => $lang['Disable'] . $lang['BBCode'] . $lang['in_this_post'], + "L_DISABLE_SMILIES" => $lang['Disable'] . $lang['Smilies'] . $lang['in_this_post'], + "L_ATTACH_SIGNATURE" => $lang['Attach_signature'], + + "S_HTML_CHECKED" => (!$html_on) ? "checked=\"checked\"" : "", + "S_BBCODE_CHECKED" => (!$bbcode_on) ? "checked=\"checked\"" : "", + "S_SMILIES_CHECKED" => (!$smilies_on) ? "checked=\"checked\"" : "", + "S_SIGNATURE_CHECKED" => ($attach_sig) ? "checked=\"checked\"" : "", "S_NAMES_SELECT" => $user_names_select, + "S_HIDDEN_FORM_FIELDS" => $s_hidden_fields, "S_POST_ACTION" => append_sid("privmsg.$phpEx"), - "S_HIDDEN_FORM_FIELDS" => $s_hidden_fields) + + "U_VIEW_FORUM" => append_sid("privmsg.$phpEx")) ); $template->pparse("body"); @@ -912,167 +1495,16 @@ else if($mode == "post" || $mode == "reply" || $mode == "edit") include($phpbb_root_path . 'includes/page_tail.'.$phpEx); } -else if( ( isset($HTTP_POST_VARS['delete']) && !empty($HTTP_POST_VARS['mark']) ) || !empty($HTTP_POST_VARS['deleteall']) ) -{ - if(!$userdata['session_logged_in']) - { - header("Location: " . append_sid("login.$phpEx?forward_page=privmsg.$phpEx&folder=inbox")); - } - - - if(isset($HTTP_POST_VARS['delete'])) - { - $delete_ary = $HTTP_POST_VARS['mark']; - } - else if(!empty($HTTP_POST_VARS['deleteall'])) - { - switch($folder) - { - case 'inbox': - $delete_type = "privmsgs_to_userid = " . $userdata['user_id'] . " AND ( - privmsgs_type = " . PRIVMSGS_READ_MAIL . " OR privmsgs_type = " . PRIVMSGS_NEW_MAIL . " )"; - break; - case 'outbox': - $delete_type = "privmsgs_from_userid = " . $userdata['user_id'] . " AND privmsgs_type = " . PRIVMSGS_NEW_MAIL; - break; - case 'sentbox': - $delete_type = "privmsgs_from_userid = " . $userdata['user_id'] . " AND privmsgs_type = " . PRIVMSGS_SENT_MAIL; - break; - case 'savebox': - $delete_type = "( privmsgs_from_userid = " . $userdata['user_id'] . " OR privmsgs_to_userid = " . $userdata['user_id'] . " ) - AND privmsgs_type = " . PRIVMSGS_SAVED_MAIL; - break; - } - - $deleteall_sql = "SELECT privmsgs_id - FROM " . PRIVMSGS_TABLE . " - WHERE " . $delete_type; - - if(!$del_list_status = $db->sql_query($deleteall_sql)) - { - message_die(GENERAL_ERROR, "Could not obtain id list to delete all messages.", "", __LINE__, __FILE__, $deleteall_sql); - } - - $delete_list = $db->sql_fetchrowset($del_list_status); - for($i = 0; $i < count($delete_list); $i++) - { - $delete_ary[] = $delete_list[$i]['privmsgs_id']; - } - unset($delete_list); - unset($delete_type); - } - - $delete_sql = "DELETE FROM " . PRIVMSGS_TABLE . " - WHERE "; - $delete_text_sql = "DELETE FROM " . PRIVMSGS_TEXT_TABLE . " - WHERE "; - - for($i = 0; $i < count($delete_ary); $i++) - { - $delete_sql .= "privmsgs_id = " . $delete_ary[$i] . " "; - $delete_text_sql .= "privmsgs_text_id = " . $delete_ary[$i] . " "; - - if($i < count($delete_ary) -1) - { - $delete_sql .= "OR "; - $delete_text_sql .= "OR "; - } - } - - $delete_sql .= "AND "; - - switch($folder) - { - case 'inbox': - $delete_sql .= "privmsgs_to_userid = " . $userdata['user_id'] . " AND ( - privmsgs_type = " . PRIVMSGS_READ_MAIL . " OR privmsgs_type = " . PRIVMSGS_NEW_MAIL . " )"; - break; - case 'outbox': - $delete_sql .= "privmsgs_from_userid = " . $userdata['user_id'] . " AND privmsgs_type = " . PRIVMSGS_NEW_MAIL; - break; - case 'sentbox': - $delete_sql .= "privmsgs_from_userid = " . $userdata['user_id'] . " AND privmsgs_type = " . PRIVMSGS_SENT_MAIL; - break; - case 'savebox': - $delete_sql .= "( privmsgs_from_userid = " . $userdata['user_id'] . " OR privmsgs_to_userid = " . $userdata['user_id'] . " ) - AND privmsgs_type = " . PRIVMSGS_SAVED_MAIL; - break; - } - - if(!$del_status = $db->sql_query($delete_sql, BEGIN_TRANSACTION)) - { - message_die(GENERAL_ERROR, "Could not delete private message info.", "", __LINE__, __FILE__, $delete_sql); - } - else - { - if(!$del_text_status = $db->sql_query($delete_text_sql, END_TRANSACTION)) - { - message_die(GENERAL_ERROR, "Could not delete private message text.", "", __LINE__, __FILE__, $delete_text_sql); - } - } - -} -else if( ( isset($HTTP_POST_VARS['save']) && !empty($HTTP_POST_VARS['mark']) ) && $folder != "savebox" && $folder != "outbox") -{ - if(!$userdata['session_logged_in']) - { - header("Location: " . append_sid("login.$phpEx?forward_page=privmsg.$phpEx&folder=inbox")); - } - - $saved_sql = "UPDATE " . PRIVMSGS_TABLE . " - SET privmsgs_type = " . PRIVMSGS_SAVED_MAIL . " - WHERE "; - - if(isset($HTTP_POST_VARS['save'])) - { - $saved_ary = $HTTP_POST_VARS['mark']; - - for($i = 0; $i < count($saved_ary); $i++) - { - $saved_sql .= "privmsgs_id = " . $saved_ary[$i] . " "; - if($i < count($saved_ary) -1) - { - $saved_sql .= "OR "; - } - } - $saved_sql .= "AND "; - } - - switch($folder) - { - case 'inbox': - $saved_sql .= "privmsgs_to_userid = " . $userdata['user_id'] . " AND ( - privmsgs_type = " . PRIVMSGS_READ_MAIL . " OR privmsgs_type = " . PRIVMSGS_NEW_MAIL . " )"; - break; - case 'sentbox': - $saved_sql .= "privmsgs_from_userid = " . $userdata['user_id'] . " AND privmsgs_type = " . PRIVMSGS_READ_MAIL; - break; - } - - if(!$save_status = $db->sql_query($saved_sql)) - { - message_die(GENERAL_ERROR, "Could not save private messages.", "", __LINE__, __FILE__, $saved_sql); - } - - $folder = "savebox"; - -} -else if($HTTP_POST_VARS['cancel']) -{ - $folder = "inbox"; - $mode = ""; - -} // // Default page // - if(!$userdata['session_logged_in']) { - header("Location: " . append_sid("login.$phpEx?forward_page=privmsg.$phpEx&folder=inbox")); + header("Location: " . append_sid("login.$phpEx?forward_page=privmsg.$phpEx&folder=inbox")); } +$page_title = $lang['Private_Messaging']; include($phpbb_root_path . 'includes/page_header.'.$phpEx); // @@ -1082,36 +1514,30 @@ $template->set_filenames(array( "body" => "privmsgs_body.tpl", "jumpbox" => "jumpbox.tpl") ); + $jumpbox = make_jumpbox(); $template->assign_vars(array( - "JUMPBOX_LIST" => $jumpbox, - "SELECT_NAME" => POST_FORUM_URL) + "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"); // -// These may well be better handled in the -// templates +// New message // -$inbox_url = "<img src=\"images/msg_inbox.gif\" border=\"0\"> "; -$inbox_url .= ($folder != "inbox") ? "<a href=\"" . append_sid("privmsg.$phpEx?folder=inbox") . "\"><b>" . $lang['Inbox'] . "</b></a>" : "<b>" . $lang['Inbox'] . "</b>"; - -$sentbox_url = "<img src=\"images/msg_sentbox.gif\" border=\"0\"> "; -$sentbox_url .= ($folder != "sentbox") ? "<a href=\"" . append_sid("privmsg.$phpEx?folder=sentbox") . "\"><b>" . $lang['Sent'] . "</b></a>" : "<b>" . $lang['Sent'] . "</b>"; - -$outbox_url = "<img src=\"images/msg_outbox.gif\" border=\"0\"> "; -$outbox_url .= ($folder != "outbox") ? "<a href=\"" . append_sid("privmsg.$phpEx?folder=outbox") . "\"><b>" . $lang['Outbox'] . "</b></a>" : "<b>" . $lang['Outbox'] . "</b>"; - -$savebox_url = "<img src=\"images/msg_savebox.gif\" border=\"0\"> "; -$savebox_url .= ($folder != "savebox") ? "<a href=\"" . append_sid("privmsg.$phpEx?folder=savebox") . "\"><b>" . $lang['Saved'] . "</b></a>" : "<b>" . $lang['Saved'] . "</b>"; - -$post_new_mesg_url = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post") . "\"><img src=\"templates/PSO/images/post.gif\" border=\"1\"></a>"; +$post_new_mesg_url = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post") . "\"><img src=\"" . $images['post_new'] . "\" alt=\"" . $lang['Post_new_message'] . "\" border=\"0\" /></a>"; // // General SQL to obtain messages // -$sql_tot = "SELECT COUNT(privmsgs_id) AS total FROM " . PRIVMSGS_TABLE . " "; -$sql = "SELECT pm.privmsgs_type, pm.privmsgs_id, pm.privmsgs_date, pm.privmsgs_subject, u.user_id, u.username FROM " . PRIVMSGS_TABLE . " pm, " . USERS_TABLE . " u "; +$sql_tot = "SELECT COUNT(privmsgs_id) AS total + FROM " . PRIVMSGS_TABLE . " "; +$sql = "SELECT pm.privmsgs_type, pm.privmsgs_id, pm.privmsgs_date, pm.privmsgs_subject, u.user_id, u.username + FROM " . PRIVMSGS_TABLE . " pm, " . USERS_TABLE . " u "; switch($folder) { @@ -1145,19 +1571,24 @@ switch($folder) break; case 'savebox': - $sql_tot .= "WHERE privmsgs_to_userid = " . $userdata['user_id'] . " - AND privmsgs_type = " . PRIVMSGS_SAVED_MAIL; - - $sql .= "WHERE pm.privmsgs_to_userid = " . $userdata['user_id'] . " - AND u.user_id = pm.privmsgs_from_userid - AND pm.privmsgs_type = " . PRIVMSGS_SAVED_MAIL; + $sql_tot .= "WHERE ( ( privmsgs_to_userid = " . $userdata['user_id'] . " + AND privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " ) + OR ( privmsgs_from_userid = " . $userdata['user_id'] . " + AND privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . ") )"; + + $sql .= "WHERE ( ( pm.privmsgs_to_userid = " . $userdata['user_id'] . " + AND pm.privmsgs_type = " . PRIVMSGS_SAVED_IN_MAIL . " + AND u.user_id = pm.privmsgs_from_userid ) + OR ( pm.privmsgs_from_userid = " . $userdata['user_id'] . " + AND pm.privmsgs_type = " . PRIVMSGS_SAVED_OUT_MAIL . " + AND u.user_id = pm.privmsgs_from_userid ) )"; break; } // // Show messages over previous x days/months // -if(!empty($HTTP_POST_VARS['msgdays']) || !empty($HTTP_GET_VARS['msgdays'])) +if( $submit_msgdays && ( !empty($HTTP_POST_VARS['msgdays']) || !empty($HTTP_GET_VARS['msgdays']) ) ) { $msg_days = (!empty($HTTP_POST_VARS['msgdays'])) ? $HTTP_POST_VARS['msgdays'] : $HTTP_GET_VARS['msgdays']; $min_msg_time = time() - ($msg_days * 86400); @@ -1177,106 +1608,220 @@ else } $sql .= $limit_msg_time . " ORDER BY pm.privmsgs_date DESC LIMIT $start, " . $board_config['topics_per_page']; +$sql_all_tot = $sql_tot; $sql_tot .= $limit_msg_time_total; // +// Get messages +// +if( !$pm_tot_status = $db->sql_query($sql_tot) ) +{ + message_die(GENERAL_ERROR, "Could not query private message information.", "", __LINE__, __FILE__, $sql_tot); +} +else +{ + if( $db->sql_numrows($pm_tot_status) ) + { + $row = $db->sql_fetchrow($pm_tot_status); + $pm_total = $row['total']; + } +} + +if( !$pm_all_status = $db->sql_query($sql_all_tot) ) +{ + message_die(GENERAL_ERROR, "Could not query private message information.", "", __LINE__, __FILE__, $sql_tot); +} +else +{ + if( $db->sql_numrows($pm_all_status) ) + { + $row = $db->sql_fetchrow($pm_all_status); + $pm_all_total = $row['total']; + } +} + +if( !$pm_status = $db->sql_query($sql) ) +{ + message_die(GENERAL_ERROR, "Could not query private messages.", "", __LINE__, __FILE__, $sql); +} +$pm_count = $db->sql_numrows($pm_status); + +$pm_list = $db->sql_fetchrowset($pm_status); + +// // Build select box // $previous_days = array(0, 1, 7, 14, 30, 90, 180, 364); $previous_days_text = array($lang['All_Messages'], "1 " . $lang['Day'], "7 " . $lang['Days'], "2 " . $lang['Weeks'], "1 " . $lang['Month'], "3 ". $lang['Months'], "6 " . $lang['Months'], "1 " . $lang['Year']); -$select_msg_days = "<select name=\"msgdays\">"; +$select_msg_days = ""; for($i = 0; $i < count($previous_days); $i++) { - $selected = ($msg_days == $previous_days[$i]) ? " selected" : ""; + $selected = ($msg_days == $previous_days[$i]) ? " selected=\"selected\"" : ""; $select_msg_days .= "<option value=\"" . $previous_days[$i] . "\"$selected>" . $previous_days_text[$i] . "</option>"; } -$select_msg_days .= "</select>"; + +// +// Define correct icons +// +if( $folder == "inbox" ) +{ + $post_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post") . "\"><img src=\"" . $images['pm_postmsg'] . "\" alt=\"" . $lang['Post_new_pm'] . "\" border=\"0\"></a>"; + $reply_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=reply&" . POST_POST_URL . "=$privmsg_id") . "\"><img src=\"" . $images['pm_replymsg'] . "\" alt=\"" . $lang['Post_reply_pm'] . "\" border=\"0\"></a>"; + $quote_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=quote&" . POST_POST_URL . "=$privmsg_id") . "\"><img src=\"" . $images['pm_quotemsg'] . "\" alt=\"" . $lang['Post_quote_pm'] . "\" border=\"0\"></a>"; + $edit_pm_img = ""; + + $l_box_name = $lang['Inbox']; +} +else if( $folder == "outbox" ) +{ + $post_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post") . "\"><img src=\"" . $images['pm_postmsg'] . "\" alt=\"" . $lang['Post_new_pm'] . "\" border=\"0\"></a>"; + $reply_pm_img = ""; + $quote_pm_img = ""; + $edit_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=edit&" . POST_POST_URL . "=$privmsg_id") . "\"><img src=\"" . $images['pm_editmsg'] . "\" alt=\"" . $lang['Edit_pm'] . "\" border=\"0\"></a>"; + + $l_box_name = $lang['Outbox']; +} +else if( $folder == "savebox" ) +{ + $post_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post") . "\"><img src=\"" . $images['pm_postmsg'] . "\" alt=\"" . $lang['Post_new_pm'] . "\" border=\"0\"></a>"; + $reply_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=reply&" . POST_POST_URL . "=$privmsg_id") . "\"><img src=\"" . $images['pm_replymsg'] . "\" alt=\"" . $lang['Post_reply_pm'] . "\" border=\"0\"></a>"; + $quote_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=quote&" . POST_POST_URL . "=$privmsg_id") . "\"><img src=\"" . $images['pm_quotemsg'] . "\" alt=\"" . $lang['Post_quote_pm'] . "\" border=\"0\"></a>"; + $edit_pm_img = ""; + + $l_box_name = $lang['Savedbox']; +} +else if( $folder == "sentbox" ) +{ + $post_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post") . "\"><img src=\"" . $images['pm_postmsg'] . "\" alt=\"" . $lang['Post_new_pm'] . "\" border=\"0\"></a>"; + $reply_pm_img = ""; + $quote_pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=quote&" . POST_POST_URL . "=$privmsg_id") . "\"><img src=\"" . $images['pm_quotemsg'] . "\" alt=\"" . $lang['Post_quote_pm'] . "\" border=\"0\"></a>"; + $edit_pm_img = ""; + + $l_box_name = $lang['Sentbox']; +} + +// +// Output data for inbox status +// +if( $folder != "outbox" ) +{ + $inbox_limit_pct = round(( $pm_all_total / $board_config['max_' . $folder . '_privmsgs'] ) * 100); + $inbox_limit_img_length = round(( $pm_all_total / $board_config['max_' . $folder . '_privmsgs'] ) * $board_config['privmsg_graphic_length']); + $inbox_limit_remain = $board_config['max_' . $folder . '_privmsgs'] - $pm_all_total; + + $template->assign_block_vars("box_size_notice", array()); + + $l_box_size_status = $lang['Your'] . " " . $l_box_name . " " . $lang['is'] . " " . $inbox_limit_pct . "% " . $lang['full']; + +} // // Dump vars to template // $template->assign_vars(array( - "INBOX" => $inbox_url, - "SENTBOX" => $sentbox_url, - "OUTBOX" => $outbox_url, - "SAVEBOX" => $savebox_url, - + "BOX_NAME" => $l_box_name, + "INBOX_IMG" => $inbox_img, + "SENTBOX_IMG" => $sentbox_img, + "OUTBOX_IMG" => $outbox_img, + "SAVEBOX_IMG" => $savebox_img, + "INBOX_LINK" => $inbox_url, + "SENTBOX_LINK" => $sentbox_url, + "OUTBOX_LINK" => $outbox_url, + "SAVEBOX_LINK" => $savebox_url, + + "POST_PM_IMG" => $post_pm_img, + + "INBOX_LIMIT_IMG_WIDTH" => $inbox_limit_img_length, + "INBOX_LIMIT_PERCENT" => $inbox_limit_pct, + + "BOX_SIZE_STATUS" => $l_box_size_status, + + "L_INBOX" => $lang['Inbox'], + "L_OUTBOX" => $lang['Outbox'], + "L_SENTBOX" => $lang['Sent'], + "L_SAVEBOX" => $lang['Saved'], "L_MARK" => $lang['Mark'], "L_FLAG" => $lang['Flag'], "L_SUBJECT" => $lang['Subject'], "L_DATE" => $lang['Date'], "L_DISPLAY_MESSAGES" => $lang['Display_messages'], - "L_FROM_OR_TO" => (($folder == "inbox" || $folder == "savebox") ? $lang['From'] : $lang['To']), + "L_FROM_OR_TO" => ($folder == "inbox" || $folder == "savebox") ? $lang['From'] : $lang['To'], + "L_MARK_ALL" => $lang['Mark_all'], + "L_UNMARK_ALL" => $lang['Unmark_all'], - "S_HIDDEN_FIELDS" => "", "S_PRIVMSGS_ACTION" => append_sid("privmsg.$phpEx?folder=$folder"), + "S_HIDDEN_FIELDS" => "", "S_POST_NEW_MSG" => $post_new_mesg_url, - "S_SELECT_MSG_DAYS" => $select_msg_days, - "S_MSG_DAYS_ACTION" => append_sid("privmsg.$phpEx?folder=$folder&start=$start"), + "S_MSG_DAYS_OPTIONS" => $select_msg_days, "U_POST_NEW_TOPIC" => $post_new_topic_url) ); -// -// Get messages -// -if(!$pm_tot_status = $db->sql_query($sql_tot)) -{ - message_die(GENERAL_ERROR, "Could not query private message information.", "", __LINE__, __FILE__, $sql_tot); -} -if(!$pm_status = $db->sql_query($sql)) -{ - message_die(GENERAL_ERROR, "Could not query private messages.", "", __LINE__, __FILE__, $sql); -} -$pm_total = $db->sql_numrows($pm_tot_status); -$pm_count = $db->sql_numrows($pm_status); -$pm_list = $db->sql_fetchrowset($pm_status); // // Okay, let's build the correct folder // -if($pm_count) +if( $pm_count ) { for($i = 0; $i < $pm_count; $i++) { $privmsg_id = $pm_list[$i]['privmsgs_id']; $flag = $pm_list[$i]['privmsgs_type']; - $icon_flag = ($flag == PRIVMSGS_READ_MAIL || $flag == PRIVMSGS_SAVED_MAIL || $flag == PRIVMSGS_SENT_MAIL) ? "<img src=\"images/msg_read.gif\">" : "<img src=\"images/msg_unread.gif\">"; + $icon_flag = ($flag == PRIVMSGS_NEW_MAIL ) ? "<img src=\"" . $images['pm_unreadmsg'] . "\" alt=\"" . $lang['Unread_message'] . "\" border=\"0\">" : "<img src=\"" . $images['pm_readmsg'] . "\" alt=\"" . $lang['Read_message'] . "\" border=\"0\">"; $msg_userid = $pm_list[$i]['user_id']; - $msg_username = stripslashes($pm_list[$i]['username']); + $msg_username = $pm_list[$i]['username']; - $u_from_user_profile = append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$msg_userid"); + $u_from_user_profile = append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$msg_userid"); - $msg_subject = stripslashes($pm_list[$i]['privmsgs_subject']); - $u_subject = append_sid("privmsg.$phpEx?folder=$folder&mode=read&" . POST_POST_URL . "=$privmsg_id"); + $msg_subject = $pm_list[$i]['privmsgs_subject']; + + if( count($orig_word) ) + { + $msg_subject = preg_replace($orig_word, $replacement_word, $msg_subject); + } + + $u_subject = append_sid("privmsg.$phpEx?folder=$folder&mode=read&" . POST_POST_URL . "=$privmsg_id"); $msg_date = create_date($board_config['default_dateformat'], $pm_list[$i]['privmsgs_date'], $board_config['board_timezone']); - if($flag == PRIVMSGS_NEW_MAIL && $folder == "inbox") + if( $flag == PRIVMSGS_NEW_MAIL && $folder == "inbox" ) { $msg_subject = "<b>" . $msg_subject . "</b>"; $msg_date = "<b>" . $msg_date . "</b>"; $msg_username = "<b>" . $msg_username . "</b>"; } - $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']; $template->assign_block_vars("listrow", array( + "ROW_COLOR" => "#". $row_color, + "ROW_CLASS" => $row_class, "ICON_FLAG_IMG" => $icon_flag, "FROM" => $msg_username, "SUBJECT" => $msg_subject, "DATE" => $msg_date, - "ROW_COLOR" => $row_color, - "S_DEL_CHECKBOX" => "<input type=\"checkbox\" name=\"mark[]\" value=\"$privmsg_id\">", + "S_MARK_ID" => $privmsg_id, "U_READ" => $u_subject, "U_FROM_USER_PROFILE" => $u_from_user_profile) ); } // for ... + + $template->assign_vars(array( + "PAGINATION" => generate_pagination("privmsg.$phpEx?folder=$folder", $pm_total, $board_config['topics_per_page'], $start), + "ON_PAGE" => (floor($start/$board_config['topics_per_page'])+1), + "TOTAL_PAGES" => ceil(($pm_total)/$board_config['topics_per_page']), + + "L_OF" => $lang['of'], + "L_PAGE" => $lang['Page'], + "L_GOTO_PAGE" => $lang['Goto_page']) + ); + } else { @@ -1287,16 +1832,6 @@ else $template->assign_block_vars("nomessages", array() ); } -$template->assign_vars(array( - "PAGINATION" => generate_pagination("privmsg.$phpEx?folder=$folder", $pm_total, $board_config['topics_per_page'], $start), - "ON_PAGE" => (floor($start/$board_config['topics_per_page'])+1), - "TOTAL_PAGES" => ceil(($pm_total)/$board_config['topics_per_page']), - - "L_OF" => $lang['of'], - "L_PAGE" => $lang['Page'], - "L_GOTO_PAGE" => $lang['Goto_page']) -); - $template->pparse("body"); include($phpbb_root_path . 'includes/page_tail.'.$phpEx); diff --git a/phpBB/templates/PSO/PSO.cfg b/phpBB/templates/PSO/PSO.cfg index 73be66064b..5cfd2159c1 100644 --- a/phpBB/templates/PSO/PSO.cfg +++ b/phpBB/templates/PSO/PSO.cfg @@ -55,7 +55,7 @@ $images['pm_savebox'] = "images/msg_savebox.gif"; $images['pm_sentbox'] = "images/msg_sentbox.gif"; $images['pm_readmsg'] = "images/msg_read.gif"; $images['pm_unreadmsg'] = "images/msg_unread.gif"; -$images['pm_postmsg'] = "templates/PSO/images/post.giff"; +$images['pm_postmsg'] = "templates/PSO/images/post.gif"; $images['pm_replymsg'] = "templates/PSO/images/reply.gif"; $images['pm_editmsg'] = "images/icon_edit.gif"; $images['pm_quotemsg'] = "images/icon_quote.gif"; @@ -91,5 +91,6 @@ $images['auth_mod'] = ""; // graphic, ie. 100% = this length // $board_config['vote_graphic_length'] = 300; +$board_config['privmsg_graphic_length'] = 200; ?>
\ No newline at end of file diff --git a/phpBB/templates/PSO/admin/admin_config_body.tpl b/phpBB/templates/PSO/admin/admin_config_body.tpl index 100b03ea2b..a0978180b3 100644 --- a/phpBB/templates/PSO/admin/admin_config_body.tpl +++ b/phpBB/templates/PSO/admin/admin_config_body.tpl @@ -9,145 +9,156 @@ <td class="cat" colspan="2"><span class="cattitle">{L_GENERAL_SETTINGS}</span></td> </tr> <tr> - <td class="row1">{L_SITE_NAME}:</td> + <td class="row1"><span class="gen">{L_SITE_NAME}:</span></td> <td class="row2"><input type="text" size="25" maxlength="100" name="sitename" value="{SITENAME}"></td> </tr> <tr> - <td class="row1">{L_ACCT_ACTIVATION}:</td> + <td class="row1"><span class="gen">{L_ACCT_ACTIVATION}:</span></td> <td class="row2"><input type="radio" name="require_activation" value="{ACTIVATION_NONE}" {ACTIVATION_NONE_CHECKED}>{L_NO}ne <input type="radio" name="require_activation" value="{ACTIVATION_USER}" {ACTIVATION_USER_CHECKED}>User <input type="radio" name="require_activation" value="{ACTIVATION_ADMIN}" {ACTIVATION_ADMIN_CHECKED}>Admin</td> </tr> <tr> - <td class="row1">Flood Interval: <br /><span class="gensmall">Number of seconds a user must wait between posts</span></td> + <td class="row1"><span class="gen">Flood Interval:</span><br /><span class="gensmall">Number of seconds a user must wait between posts</span></td> <td class="row2"><input type="text" size="3" maxlength="4" name="flood_interval" value="{FLOOD_INTERVAL}"></td> </tr> <tr> - <td class="row1">Topics Per Page</td> + <td class="row1"><span class="gen">Topics Per Page:</span></td> <td class="row2"><input type="text" name="topics_per_page" size="3" maxlength="4" value="{TOPICS_PER_PAGE}"></td> </tr> <tr> - <td class="row1">Posts Per Page</td> + <td class="row1"><span class="gen">Posts Per Page:</span></td> <td class="row2"><input type="text" name="posts_per_page" size="3" maxlength="4" value="{POSTS_PER_PAGE}"></td> </tr> <tr> - <td class="row1">Hot Threshold</td> + <td class="row1"><span class="gen">Hot Threshold:</span></td> <td class="row2"><input type="text" name="hot_threshold" size="3" maxlength="4" value="{HOT_TOPIC}"></td> </tr> <tr> - <td class="row1">Default Style:</td> + <td class="row1"><span class="gen">Default Style:</span></td> <td class="row2">{STYLE_SELECT}</td> </tr> <tr> - <td class="row1">Override user style:<br /><span class="gensmall">Replaces users style with the default</span></td> + <td class="row1"><span class="gen">Override user style:</span><br /><span class="gensmall">Replaces users style with the default</span></td> <td class="row2"><input type="radio" name="override_user_style" value="1" {OVERRIDE_STYLE_YES}> {L_YES} <input type="radio" name="override_user_style" value="0" {OVERRIDE_STYLE_NO}> {L_NO}</td> </tr> <tr> - <td class="row1">Default Language:</td> + <td class="row1"><span class="gen">Default Language:</span></td> <td class="row2">{LANG_SELECT}</td> </tr> <tr> - <td class="row1">Date Format:<br /><span class="gensmall">{L_DATE_FORMAT_EXPLAIN}</span></td> + <td class="row1"><span class="gen">Date Format:</span><br /><span class="gensmall">{L_DATE_FORMAT_EXPLAIN}</span></td> <td class="row2"><input type="text" maxlength="16" name="default_dateformat" value="{DEFAULT_DATEFORMAT}"></td> </tr> <tr> - <td class="row1">System Timezone:</td> + <td class="row1"><span class="gen">System Timezone:</span></td> <td class="row2">{TIMEZONE_SELECT}</td> </tr> <tr> - <td class="row1">Enable GZip Compression:</td> + <td class="row1"><span class="gen">Enable GZip Compression:</span></td> <td class="row2"><input type="radio" name="gzip_compress" value="1" {GZIP_YES}> {L_YES} <input type="radio" name="gzip_compress" value="0" {GZIP_NO}> {L_NO}</td> </tr> <tr> - <td class="row1">Enable Forum Pruning:</td> + <td class="row1"><span class="gen">Enable Forum Pruning:</span></td> <td class="row2"><input type="radio" name="prune_enable" value="1" {PRUNE_YES}> {L_YES} <input type="radio" name="prune_enable" value="0" {PRUNE_NO}> {L_NO}</td> </tr> <tr> <td class="cat" colspan="2"><span class="cattitle">User/Forum Ability Settings</span></td> </tr> <tr> - <td class="row1">Allow HTML</td> + <td class="row1"><span class="gen">Allow HTML:</span></td> <td class="row2"><input type="radio" name="allow_html" value="1" {HTML_YES}> {L_YES} <input type="radio" name="allow_html" value="0" {HTML_NO}> {L_NO}</td> </tr> <tr> - <td class="row1">Allow BBCode</td> + <td class="row1"><span class="gen">Allow BBCode:</span></td> <td class="row2"><input type="radio" name="allow_bbcode" value="1" {BBCODE_YES}> {L_YES} <input type="radio" name="allow_bbcode" value="0" {BBCODE_NO}> {L_NO}</td> </tr> <tr> - <td class="row1">Allow Smilies</td> + <td class="row1"><span class="gen">Allow Smilies:</span></td> <td class="row2"><input type="radio" name="allow_smilies" value="1" {SMILE_YES}> {L_YES} <input type="radio" name="allow_smilies" value="0" {SMILE_NO}> {L_NO}</td> </tr> <tr> - <td class="row1">Smilies Storage Path <br /><span class="gensmall">Path under your phpBB root dir, e.g. images/smilies</span></td> + <td class="row1"><span class="gen">Smilies Storage Path:</span><br /><span class="gensmall">Path under your phpBB root dir, e.g. images/smilies</span></td> <td class="row2"><input type="text" size="20" maxlength="255" name="smilies_path" value="{SMILIES_PATH}"></td> </tr> <tr> - <td class="row1">Allow Signatures</td> + <td class="row1"><span class="gen">Allow Signatures:</span></td> <td class="row2"><input type="radio" name="allow_sig" value="1" {SIG_YES}> {L_YES} <input type="radio" name="allow_sig" value="0" {SIG_NO}> {L_NO}</td> </tr> <tr> - <td class="row1">Maximum signature length<br /><span class="gensmall">Number of characters allowed</span></td> + <td class="row1"><span class="gen">Maximum signature length:</span><br /><span class="gensmall">Number of characters allowed</span></td> <td class="row2"><input type="text" size="5" maxlength="4" name="max_sig_chars" value="{SIG_SIZE}"></td> </tr> <tr> - <td class="row1">Allow Name Change</td> + <td class="row1"><span class="gen">Allow Name Change:</span></td> <td class="row2"><input type="radio" name="allow_namechange" value="1" {NAMECHANGE_YES}> {L_YES} <input type="radio" name="allow_namechange" value="0" {NAMECHANGE_NO}> {L_NO}</td> </tr> <tr> + <td class="row1"><span class="gen">Inbox limit:</span></td> + <td class="row2"><input type="text" size="5" maxlength="5" name="max_inbox_privmsgs" value="{INBOX_PRIVMSGS}"> messages</td> + </tr> + <tr> + <td class="row1"><span class="gen">Sentbox limit:</span></td> + <td class="row2"><input type="text" size="5" maxlength="5" name="max_sentbox_privmsgs" value="{SENTBOX_PRIVMSGS}"> messages</td> + </tr> + <tr> + <td class="row1"><span class="gen">Savebox limit:</span></td> + <td class="row2"><input type="text" size="5" maxlength="5" name="max_savebox_privmsgs" value="{SAVEBOX_PRIVMSGS}"> messages</td> + </tr> + <tr> <td class="cat" colspan="2"><span class="cattitle">Avatar Settings</span></td> </tr> <tr> - <td class="row1">Allow local gallery avatars</td> + <td class="row1"><span class="gen">Allow local gallery avatars:</span></td> <td class="row2"><input type="radio" name="allow_avatar_local" value="1" {AVATARS_LOCAL_YES}> {L_YES} <input type="radio" name="allow_avatar_local" value="0" {AVATARS_LOCAL_NO}> {L_NO}</td> </tr> <tr> - <td class="row1">Allow remote avatars <br /><span class="gensmall">Avatars linked from another website</span></td> + <td class="row1"><span class="gen">Allow remote avatars:</span><br /><span class="gensmall">Avatars linked from another website</span></td> <td class="row2"><input type="radio" name="allow_avatar_remote" value="1" {AVATARS_REMOTE_YES}> {L_YES} <input type="radio" name="allow_avatar_remote" value="0" {AVATARS_REMOTE_NO}> {L_NO}</td> </tr> <tr> - <td class="row1">Allow avatar uploading</td> + <td class="row1"><span class="gen">Allow avatar uploading:</span></td> <td class="row2"><input type="radio" name="allow_avatar_upload" value="1" {AVATARS_UPLOAD_YES}> {L_YES} <input type="radio" name="allow_avatar_upload" value="0" {AVATARS_UPLOAD_NO}> {L_NO}</td> </tr> <tr> - <td class="row1">Max. Avatar File Size<br /><span class="gensmall">For uploaded avatar files</span></td> + <td class="row1"><span class="gen">Max. Avatar File Size:</span><br /><span class="gensmall">For uploaded avatar files</span></td> <td class="row2"><input type="text" size="4" maxlength="10" name="avatar_filesize" value="{AVATAR_FILESIZE}"> Bytes</td> </tr> <tr> - <td class="row1">Max. Avatar Size <br /> - <span class="gensmall">(height x width)</span> + <td class="row1"><span class="gen">Max. Avatar Size:</span><br /><span class="gensmall">(height x width)</span> </td> <td class="row2"><input type="text" size="3" maxlength="4" name="avatar_max_height" value="{AVATAR_MAX_HEIGHT}"> x <input type="text" size="3" maxlength="4" name="avatar_max_width" value="{AVATAR_MAX_WIDTH}"></td> </tr> <tr> - <td class="row1">Avatar Storage Path <br /><span class="gensmall">Path under your phpBB root dir, e.g. images/avatars</span></td> + <td class="row1"><span class="gen">Avatar Storage Path:</span><br /><span class="gensmall">Path under your phpBB root dir, e.g. images/avatars</span></td> <td class="row2"><input type="text" size="20" maxlength="255" name="avatar_path" value="{AVATAR_PATH}"></td> </tr> <tr> <td class="cat" colspan="2"><span class="cattitle">Email Settings</span></td> </tr> <tr> - <td class="row1">Admin Email Address</td> + <td class="row1"><span class="gen">Admin Email Address:</span></td> <td class="row2"><input type="text" size="25" maxlength="100" name="board_email" value="{EMAIL_FROM}"></td> </tr> <tr> - <td class="row1">Email Signature<br /><span class="gensmall">This text will be attached to all emails the board sends</span></td> + <td class="row1"><span class="gen">Email Signature:</span><br /><span class="gensmall">This text will be attached to all emails the board sends</span></td> <td class="row2"><textarea name="board_email_sig" rows="5" cols="30">{EMAIL_SIG}</textarea></td> </tr> <tr> - <td class="row1">Use SMTP for delivery<br /><span class="gensmall">Say {L_YES} if you want or have to send email via a server instead of the local mail function</span></td> + <td class="row1"><span class="gen">Use SMTP for delivery:</span><br /><span class="gensmall">Say {L_YES} if you want or have to send email via a server instead of the local mail function</span></td> <td class="row2"><input type="radio" name="smtp_delivery" value="1" {SMTP_YES}> {L_YES} <input type="radio" name="smtp_delivery" value="0" {SMTP_NO}> {L_NO}</td> </tr> <tr> - <td class="row1">SMTP Server</td> + <td class="row1"><span class="gen">SMTP Server:</span></td> <td class="row2"><input type="text" name="smtp_host" value="{SMTP_HOST}" size="25" maxlength="50"></td> </tr> <tr> <td class="cat" colspan="2"><span class="cattitle">COPPA Settings</span></td> </tr> <tr> - <td class="row1">FAX Number</td> + <td class="row1"><span class="gen">FAX Number:</span></td> <td class="row2"><input type="text" name="coppa_fax" value="{COPPA_FAX}" size="25" maxlength="50"></td> </tr> <tr> - <td class="row1">Mailing Address<br /><span class="gensmall">Signed COPPA agreements will be mailed here</span></td> + <td class="row1"><span class="gen">Mailing Address:</span><br /><span class="gensmall">Signed COPPA agreements will be mailed here</span></td> <td class="row2"><textarea name="coppa_mail" rows="5" cols="30">{COPPA_MAIL}</textarea></td> </tr> <tr> diff --git a/phpBB/templates/PSO/bbcode.tpl b/phpBB/templates/PSO/bbcode.tpl index 2cfdb4b0fe..73697e5a92 100755 --- a/phpBB/templates/PSO/bbcode.tpl +++ b/phpBB/templates/PSO/bbcode.tpl @@ -15,62 +15,48 @@ </ol> <!-- END olist_close --> + <!-- BEGIN listitem --> <li> <!-- END listitem --> + <!-- BEGIN quote_open --> -<table border="0" align="center" width="85%"> +<table width="85%" cellspacing="0" cellpadding="0" border="0" align="center"> <tr> - <td> - <font size="-1">{L_QUOTE}</font> - <hr /> - </td> + <td><font size="-1">{L_QUOTE}</font><hr /></td> </tr> <tr> - <td> - <font size="-1"> - <blockquote> + <td><font size="-1"><blockquote> <!-- END quote_open --> <!-- BEGIN quote_close --> - </blockquote> - </font> - </td> + </blockquote></font></td> </tr> <tr> - <td> - <hr /> - </td> + <td><hr /></td> </tr> </table> <!-- END quote_close --> + <!-- BEGIN code_open --> -<table width="85%" border="0" align="center"> +<table width="85%" cellspacing="0" cellpadding="0" border="0" align="center"> <tr> - <td> - <font size="-1">{L_CODE}</font> - <hr /> - </td> + <td><font size="-1">{L_CODE}</font><hr /></td> </tr> <tr> - <td> - <font size="-1"> - <pre> + <td><font size="-1"><pre> <!-- END code_open --> <!-- BEGIN code_close --> - </pre> - </font> - </td> + </pre></font></td> </tr> <tr> - <td> - <hr /> - </td> + <td><hr /></td> </tr> </table> <!-- END code_close --> + <!-- BEGIN b_open --> <b> <!-- END b_open --> @@ -78,6 +64,7 @@ </b> <!-- END b_close --> + <!-- BEGIN u_open --> <u> <!-- END u_open --> @@ -85,6 +72,7 @@ </u> <!-- END u_close --> + <!-- BEGIN i_open --> <i> <!-- END i_open --> @@ -92,28 +80,33 @@ </i> <!-- END i_close --> + <!-- BEGIN color_open --> -<font color="{COLOR}"> +<span style="color:{COLOR}"> <!-- END color_open --> <!-- BEGIN color_close --> -</font> +</span> <!-- END color_close --> + <!-- BEGIN size_open --> -<font size="{SIZE}"> +<span style="font-size:{SIZE}px; line-height:normal"> <!-- END size_open --> <!-- BEGIN size_close --> -</font> +</span> <!-- END size_close --> + <!-- BEGIN img --> -<img src="{URL}" border="0"></img> +<img src="{URL}" border="0" /> <!-- END img --> + <!-- BEGIN url --> <a href="{URL}" target="_blank">{DESCRIPTION}</a> <!-- END url --> + <!-- BEGIN email --> -<a href="mailto:{EMAIL}">{EMAIL}</A> +<a href="mailto:{EMAIL}">{EMAIL}</a> <!-- END email --> diff --git a/phpBB/templates/PSO/mini_search.tpl b/phpBB/templates/PSO/mini_search.tpl new file mode 100644 index 0000000000..1eb50aaef6 --- /dev/null +++ b/phpBB/templates/PSO/mini_search.tpl @@ -0,0 +1,74 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!-- ?xml version="1.0" encoding="UTF-8"? --> +<!--DOCTYPE PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd" --> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> +<meta http-equiv="Content-Style-Type" content="text/css" /> +{META} +<title>{SITENAME} -+- {PAGE_TITLE}</title> +<style type="text/css"> +<!-- + +BODY {background-color:{T_BODY_BGCOLOR};color:{T_BODY_TEXT};scrollbar-base-color:{T_TH_COLOR2};scrollbar-arrow-color:{T_TH_COLOR1}} +P {font-family:{T_FONTFACE1};font-size:10pt} + +TH {background-color:{T_TH_COLOR3};font-family:{T_FONTFACE2};font-size:8pt;font-weight:normal} +TH.secondary {background-color:{T_TH_COLOR3};font-family:{T_FONTFACE1};font-size:10pt;font-weight:normal;text-align:left} +TD.tablebg {background-color:{T_TH_COLOR1}} +TD.cat {background-color:{T_TH_COLOR2};font-family:{T_FONTFACE1};font-size:12pt} +TD.row1 {background-color:{T_TD_COLOR1}} +TD.row2 {background-color:{T_TD_COLOR2}} + +SPAN.title {font-family:Impact,sans-serif;font-size:36pt} +SPAN.cattitle {font-family:{T_FONTFACE1};font-size:12pt;font-weight:bold} +SPAN.gen {font-family:{T_FONTFACE1};font-size:10pt} +SPAN.gensmall {font-family:{T_FONTFACE1};font-size:8pt} +SPAN.courier {font-family:{T_FONTFACE3};font-size:10pt} +SPAN.courier {font-family:{T_FONTFACE3};font-size:8pt} + +SELECT {font-family:Verdana;font-size:8pt} +INPUT {font-family:Verdana;font-size:8pt} +SELECT.small {font-family:"Courier New",courier;font-size:8pt;width:140px} +INPUT.text {font-family:"Courier New",courier;font-size:8pt;} + +//--> +</style> +</head> +<body bgcolor="{T_BODY_BGCOLOR}" text="{T_BODY_TEXT}" link="{T_BODY_LINK}" vlink="{T_BODY_VLINK}"> + +<a name="top"></a> + +<script language="javascript" type="text/javascript"> +<!-- +function refresh_username(selected_username) +{ + opener.document.forms['post'].username.value = selected_username; +} +//--> +</script> + +<form method="post" action="{S_SEARCH_ACTION}"><table width="98%" cellpadding="1" cellspacing="0" border="0" align="center"> + <tr> + <td class="tablebg" width="100%"><table width="100%" cellspacing="1" cellpadding="4" border="0"> + <tr> + <th colspan="2">{L_SEARCH_USERNAME}</th> + </tr> + <tr> + <td class="row1"><span class="gen">{L_SEARCH_USERNAME}: </span><br /><span class="gensmall">Use * as a wildcard</span></td> + <td class="row1" align="center"><input type="text" name="search_author" value="{AUTHOR}" /> <input type="submit" name="search" value="{L_SEARCH}" /></td> + <!-- BEGIN select_name --> + </tr> + <tr> + <td class="row2"><span class="gen">{L_UPDATE_USERNAME}: </span></td> + <td class="row2"><span class="cattitle"><select name="author_list">{S_AUTHOR_OPTIONS}</select> <input type="submit" onclick="refresh_username(this.form.author_list.options[this.form.author_list.selectedIndex].value); return false;" name="use" value="{L_SELECT}" /></span></td> + <!-- END select_name --> + </tr> + </table></td> + </tr> +</table></form> + +<div align="center"><span class="gensmall"><a href="javascript:window.close();">{L_CLOSE_WINDOW}</a></span></td></div> + +</body> +</html>
\ No newline at end of file diff --git a/phpBB/templates/PSO/posting_body.tpl b/phpBB/templates/PSO/posting_body.tpl index d97a7ebcf9..c94392523f 100644 --- a/phpBB/templates/PSO/posting_body.tpl +++ b/phpBB/templates/PSO/posting_body.tpl @@ -1,9 +1,21 @@ + +<!-- BEGIN privmsg_extensions --> +<table width="80%" cellpadding="1" cellspacing="0" border="0" align="center"> + <tr> + <td><span class="cattitle">{INBOX_IMG} {INBOX_LINK} {SENTBOX_IMG} {SENTBOX_LINK} {OUTBOX_IMG} {OUTBOX_LINK} {SAVEBOX_IMG} {SAVEBOX_LINK}</span></td> + </tr> +</table> + +<br clear="all" /> +<!-- END privmsg_extensions --> + <form action="{S_POST_ACTION}" method="POST" name="post"><table width="80%" cellspacing="0" cellpadding="4" border="0" align="center"> <tr> <td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME} {L_INDEX}</a> -> <a href="{U_VIEW_FORUM}">{FORUM_NAME}</a></span></td> </tr> </table> +<script type="text/javascript" language="javascript" src="spellcheck/spch.js"></script> <script language="JavaScript" type="text/javascript"> <!-- // @@ -48,6 +60,13 @@ function emoticon(theSmilie) { <td class="row2"><span class="courier"><input type="text" name="username" size="25" maxlength="25" value="{USERNAME}" /></span></td> </tr> <!-- END username_select --> + <!-- This is for private messaging --> + <!-- BEGIN privmsg_extensions --> + <tr> + <td class="row1"><span class="gen"><b>{L_USERNAME}</b></span></td> + <td class="row2"><input type="text" name="username" maxlength="50" size="20" /> <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('privmsg.php?mode=searchuser', '_phpbbsearch', 'HEIGHT=155,resizable=yes,WIDTH=400');return false;" /></td> + </tr> + <!-- END privmsg_extensions --> <tr> <td class="row1"><span class="gen"><b>{L_SUBJECT}</b></span></td> <td class="row2"><span class="courier"><input type="text" name="subject" size="50" maxlength="100" value="{SUBJECT}" /></span></td> @@ -61,7 +80,10 @@ function emoticon(theSmilie) { <td align="center"><span class="courier"><input type="button" name="addbbcode1" value=" B " title="Bold" style="font-weight:bold" onClick="bbstyle(this.form,'[b]','[/b]');"> <input type="button" name="addbbcode2" value=" i " title="Italic" style="font-style:italic" onClick="bbstyle(this.form,'[i]','[/i]');"> <input type="button" name="addbbcode3" value="Quote" title="Quote" onClick="bbstyle(this.form,'[quote]','[/quote]');"> <input type="button" name="addbbcode4" value="Code" title="Code" onClick="bbstyle(this.form,'[code]','[/code]');"> <input type="button" name="addbbcode5" value="List" title="List" onClick="bbstyle(this.form,'[list]','[/list]');"> <input type="button" name="addbbcode6" value="List=" title="Ordered list" onClick="bbstyle(this.form,'[list=]','[/list]');"> <input type="button" name="addbbcode7" value="Img" title="Image" onClick="bbstyle(this.form,'[img]','[/img]');"> <input type="button" name="addbbcode8" value="URL" title="URL" style="text-decoration: underline" onClick="bbstyle(this.form,'[url]','[/url]');"></span></td> </tr> <tr> - <td><span class="courier"><textarea name="message" rows="12" cols="45" wrap="virtual" tabindex="2">{MESSAGE}</textarea></span></td> + <td align="center"><span class="gensmall">Font color: </span><span class="courier"><select name="addbbcode9" onChange="bbstyle(this.form, '[color=' + this.form.addbbcode9.options[this.form.addbbcode9.selectedIndex].value + ']', '[/color]')"><option style="color:{T_FONTCOLOR1}" value="{T_FONTCOLOR1}">Default</option><option style="color:darkred" value="darkred">Dark Red</option><option style="color:red" value="darkred">Red</option><option style="color:orange" value="orange">Orange</option><option style="color:brown" value="brown">Brown</option><option style="color:yellow" value="yellow">Yellow</option><option style="color:green" value="green">Green</option><option style="color:olive" value="olive">Olive</option><option style="color:cyan" value="cyan">Cyan</option><option style="color:blue" value="blue">Blue</option><option style="color:darkblue" value="darkblue">Dark Blue</option><option style="color:indigo" value="indigo">Indigo</option><option style="color:violet" value="violet">Violet</option><option style="color:white" value="white">White</option><option style="color:black" value="black">Black</option></select> <span class="gensmall">Font size: </span><span class="courier"><select name="addbbcode10" onChange="bbstyle(this.form, '[size=' + this.form.addbbcode10.options[this.form.addbbcode10.selectedIndex].value + ']', '[/size]')"><option value="-3">Tiny</option><option value="-2">Smaller</option><option value="0" selected="selected">Normal</option><option value="+2">Larger</option><option value="+3">Largest</option></select></td> + </tr> + <tr> + <td><span class="courier"><textarea name="message" rows="12" cols="40" wrap="virtual" tabindex="2">{MESSAGE}</textarea></span></td> </tr> </table></td> <td width="50%" valign="middle"><table border="0" cellspacing="0" cellpadding="5" align="center"> @@ -151,7 +173,7 @@ function emoticon(theSmilie) { </tr> {POLLBOX} <tr> - <td class="cat" colspan="2" align="center">{S_HIDDEN_FORM_FIELDS}<input type="submit" name="preview" value="{L_PREVIEW}" /> <input type="submit" name="submit" value="{L_SUBMIT}" /> <input type="submit" name="cancel" value="{L_CANCEL}" /></td> + <td class="cat" colspan="2" align="center">{S_HIDDEN_FORM_FIELDS}<input type="button" tabindex="4" name="spellcheck" value="Spell Check" onclick= "doSpell ('uk', document.post.message, document.location.protocol + '//' + document.location.host + '/phpBB2/spellcheck/sproxy.php', true);" /> <input type="submit" name="preview" value="{L_PREVIEW}" /> <input type="submit" name="submit" value="{L_SUBMIT}" /> <input type="submit" name="cancel" value="{L_CANCEL}" /></td> </tr> </table></td> </tr> diff --git a/phpBB/templates/PSO/privmsgs_body.tpl b/phpBB/templates/PSO/privmsgs_body.tpl index fb84d9c41e..f2206a0878 100644 --- a/phpBB/templates/PSO/privmsgs_body.tpl +++ b/phpBB/templates/PSO/privmsgs_body.tpl @@ -1,18 +1,56 @@ +<script language="Javascript" type="text/javascript"> + // + // Should really check the browser to stop this whining ... + // + function select_switch(status) + { + for (i = 0; i < document.privmsg_list.length; i++) + { + document.privmsg_list.elements[i].checked = status; + } + } +</script> + +<form method="post" name="privmsg_list" action="{S_PRIVMSGS_ACTION}"> + +<!-- BEGIN box_size_notice --> +<table width="98%" cellpadding="1" cellspacing="0" border="0" align="center"> + <tr> + <td><span class="cattitle">{INBOX_IMG} {INBOX_LINK} {SENTBOX_IMG} {SENTBOX_LINK} {OUTBOX_IMG} {OUTBOX_LINK} {SAVEBOX_IMG} {SAVEBOX_LINK}</span></td> + <td><table width="200" cellspacing="0" cellpadding="0" border="0" align="right"> + <tr> + <td colspan="3" width="100%"><span class="gensmall">{BOX_SIZE_STATUS}</span></td> + </tr> + <tr> + <td colspan="3" width="100%" class="row1"><table cellspacing="0" cellpadding="0" border="0"> + <tr> + <td class="cat"><img src="images/spacer.gif" width="{INBOX_LIMIT_IMG_WIDTH}" height="20" alt="{INBOX_LIMIT_PERCENT}" /></td> + </table></td> + </tr> + <tr> + <td width="33%"><span class="gensmall">0%</span></td> + <td width="34%" align="center"><span class="gensmall">50%</span></td> + <td width="33%" align="right"><span class="gensmall">100%</span></td> + </tr> + </table> + </tr> +</table> +<!-- END box_size_notice --> + <table width="98%" cellspacing="0" cellpadding="4" border="0" align="center"> - <tr><form method="post" action="{S_MSG_DAYS_ACTION}"> + <tr> <td align="left" valign="bottom"><span class="gensmall"><a href="{U_INDEX}">{SITENAME} {L_INDEX}</a></span></td> - <td align="right" valign="bottom" nowrap><span class="gensmall">{L_DISPLAY_MESSAGES}: {S_SELECT_MSG_DAYS} <input type="submit" value="Go"></span></td> - </form></tr> + <td align="right" valign="bottom" nowrap><span class="gensmall">{L_DISPLAY_MESSAGES}: <select name="msgdays">{S_MSG_DAYS_OPTIONS}</select> <input class="button" type="submit" name="submit_msgdays" value="Go"></span></td> + </tr> </table> <table width="98%" cellpadding="1" cellspacing="0" border="0" align="center"> - <tr><form method="post" action="{S_PRIVMSGS_ACTION}"> + <tr> <td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%"> <tr> <td class="cat" colspan="5"><table width="100%" cellspacing="0" cellpadding="0" border="0"> <tr> - <td> <span class="cattitle">{INBOX} {SENTBOX} {OUTBOX} {SAVEBOX}</span></td> - <td align="right">{S_POST_NEW_MSG}</td> + <td align="right">{POST_PM_IMG}</td> </tr> </table></td> </tr> @@ -28,8 +66,8 @@ <td width="5%" align="center" valign="middle">{listrow.ICON_FLAG_IMG}</td> <td width="20%" valign="middle"> <span class="gen"><a href="{listrow.U_FROM_USER_PROFILE}">{listrow.FROM}</a></span></td> <td width="55%" valign="middle"> <span class="gen"><a href="{listrow.U_READ}">{listrow.SUBJECT}</a></span></td> - <td width="15%" align="center" valign="middle"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}">{listrow.DATE}</span></td> - <td width="5%" align="center" valign="middle">{listrow.S_DEL_CHECKBOX}</td> + <td width="15%" align="center" valign="middle"><span class="gensmall">{listrow.DATE}</span></td> + <td width="5%" align="center" valign="middle"><input type="checkbox" name="mark[]" value="{listrow.S_MARK_ID}" /></td> </tr> <!-- END listrow --> <!-- BEGIN nomessages --> @@ -40,20 +78,26 @@ <tr> <td class="cat" colspan="5"><table width="100%" cellspacing="0" cellpadding="0" border="0"> <tr> - <td width="5" align="left" valign="middle">{S_POST_NEW_MSG}</td> - <td align="left" valign="middle"> <span class="gen">{L_PAGE} <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></span> </td> - <td align="right" valign="middle"><span class="gen">{PAGINATION} </span></td> - <td align="right" valign="middle">{S_HIDDEN_FIELDS}<input type="submit" name="save" value="Save Marked"> <input type="submit" name="delete" value="Delete Marked"> <input type="submit" name="deleteall" value="Delete All"></td> + <td width="5" align="left" valign="top">{POST_PM_IMG}</td> + <td align="left" valign="top"> <span class="gen">{L_PAGE} <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></span> </td> + <td align="right" valign="top"><span class="gen">{PAGINATION} </span></td> + <td align="right" valign="top">{S_HIDDEN_FIELDS}<input class="button" type="submit" name="save" value="Save Marked" /> <input class="button" type="submit" name="delete" value="Delete Marked" /> <input class="button" type="submit" name="deleteall" value="Delete All" /></td> </tr> </table></td> </tr> </table></td> - </form></tr> + </tr> </table> -<table align="center" border="0" width="98%" align="center"> +<table width="98%" cellspacing="0" cellpadding="2" border="0" align="center"> + <tr> + <td colspan="5" align="right"><span class="gensmall"><a href="javascript:select_switch(true);">Mark all</a> :: <a href="javascript:select_switch(false);">Unmark all</a></span></td> + </tr> +</table></form> + +<table width="98%" align="center" border="0" align="center"> <tr> <td valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td> <td align="right" nowrap>{JUMPBOX}</td> </tr> -</table>
\ No newline at end of file +</table> diff --git a/phpBB/templates/PSO/privmsgs_preview.tpl b/phpBB/templates/PSO/privmsgs_preview.tpl new file mode 100644 index 0000000000..0f54f4fc09 --- /dev/null +++ b/phpBB/templates/PSO/privmsgs_preview.tpl @@ -0,0 +1,54 @@ +<table width="80%" border="0" cellpadding="1" cellspacing="0" align="center"> + <tr> + <td class="tablebg"><table border="0" cellpadding="4" cellspacing="1" width="100%"> + <tr> + <td class="cat"><table width="100%" cellspacing="0" cellpadding="0" border="0"> + <tr> + <td><span class="cattitle"><b>{L_PREVIEW}</b></span></td> + </tr> + </table></td> + </tr> + <tr> + <td class="row2" align="left"><table width="100%" cellspacing="0" cellpadding="0" border="0"> + <tr> + <td width="10%" align="left"><span class="gen"><b>{L_SUBJECT}:</b></span></td> + <td align="left"><span class="gen">{POST_SUBJECT}</span></td> + </tr> + </table></td> + </tr> + <tr> + <td class="row1" align="left"><table width="100%" cellspacing="0" cellpadding="0" border="0"> + <tr> + <td width="10%" align="left"><span class="gen"><b>{L_POSTED}:</b></span></td> + <td align="left"><span class="gen">{POST_DATE}</span></td> + </tr> + </table></td> + </tr> + <tr> + <td class="row2" align="left"><table width="100%" cellspacing="0" cellpadding="0" border="0"> + <tr> + <td width="10%" align="left"><span class="gen"><b>{L_FROM}:</b></span></td> + <td align="left"><span class="gen">{MESSAGE_FROM}</span></td> + </tr> + </table></td> + </tr> + <tr> + <td class="row1" align="left"><table width="100%" cellspacing="0" cellpadding="0" border="0"> + <tr> + <td width="10%" align="left"><span class="gen"><b>{L_TO}:</b></span></td> + <td align="left"><span class="gen">{MESSAGE_TO}</span></td> + </tr> + </table></td> + </tr> + <tr> + <td class="row2" height="100%" align="center"><table style="height:100%" width="100%" height="100%" cellspacing="1" cellpadding="0" border="0"> + <tr> + <td height="100%" valign="top"><span class="gen">{MESSAGE}</span></span></td> + </tr> + </table></td> + </tr> + </table></td> + </tr> +</table> + +<br clear="all" /> diff --git a/phpBB/templates/PSO/privmsgs_read_body.tpl b/phpBB/templates/PSO/privmsgs_read_body.tpl index 403888bd48..5ee85d1ff4 100644 --- a/phpBB/templates/PSO/privmsgs_read_body.tpl +++ b/phpBB/templates/PSO/privmsgs_read_body.tpl @@ -1,60 +1,76 @@ -<table width="98%" cellspacing="0" cellpadding="4" border="0" align="center"> + +<form method="post" action="{S_PRIVMSGS_ACTION}"><table width="80%" cellspacing="0" cellpadding="4" border="0" align="center"> <tr> - <td align="left"><font face="{T_FONTFACE1}" size="{T_FONTSIZE1}" color="{T_FONTCOLOR1}"><a href="{U_INDEX}">{SITENAME} {L_INDEX}</a></font></td> + <td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME} {L_INDEX}</a></span></td> </tr> </table> -<table border="0" cellpadding="1" cellspacing="0" width="98%" align="center"> - <tr><form method="post" action="{S_PRIVMSGS_ACTION}"> - <td bgcolor="{T_TH_COLOR1}"><table border="0" cellpadding="4" cellspacing="1" width="100%"> +<table border="0" cellpadding="1" cellspacing="0" width="80%" align="center"> + <tr> + <td class="tablebg"><table border="0" cellpadding="4" cellspacing="1" width="100%"> <tr> - <td class="cat" colspan="2"><table width="100%" cellspacing="0" cellpadding="0" border="0"> + <td class="cat"><table width="100%" cellspacing="0" cellpadding="0" border="0"> <tr> - <td><span class="cattitle">{INBOX} {SENTBOX} {OUTBOX} {SAVEBOX} </span></td> - <td align="right">{S_POST_REPLY_MSG} {S_POST_NEW_MSG}</td> + <td><span class="cattitle">{INBOX_IMG} {INBOX_LINK} {SENTBOX_IMG} {SENTBOX_LINK} {OUTBOX_IMG} {OUTBOX_LINK} {SAVEBOX_IMG} {SAVEBOX_LINK}</span></td> + <td align="right">{QUOTE_PM_IMG} {REPLY_PM_IMG} {EDIT_PM_IMG}</td> </tr> </table></td> </tr> <tr> - <th width="22%"<b>{L_FROM_OR_TO}</b></th> - <th><b>{L_MESSAGE}</b></th> + <th>{BOX_NAME} :: {L_MESSAGE}</th> </tr> <tr> - <td class="row2" width="20%" align="left" valign="top"><a name="{U_POST_ID}"></a><table height="100%" cellspacing="0" cellpadding="0" border="0"> + <td class="row2" align="left"><table width="100%" cellspacing="0" cellpadding="0" border="0"> <tr> - <td valign="top"><span class="gen"><b>{POSTER_NAME}</b></span><br><span class="gensmall">{POSTER_RANK}<br>{RANK_IMAGE}<br><br>{POSTER_AVATAR}<br><br>{POSTER_JOINED}<br>{POSTER_POSTS}<br>{POSTER_FROM}</span></td> + <td width="10%" align="left"><span class="gen"><b>{L_SUBJECT}:</b></span></td> + <td align="left"><span class="gen">{POST_SUBJECT}</span></td> </tr> </table></td> - <td class="row2" width="80%" height="100%"><table width="100%" height="100%" cellspacing="1" cellpadding="0" border="0"> + </tr> + <tr> + <td class="row1" align="left"><table width="100%" cellspacing="0" cellpadding="0" border="0"> <tr> - <td><table width="100%" cellspacing="0" cellpadding="0" border="0"> - <tr> - <td><img src="images/icon_minipost.gif" alt="Post image icon"><span class="gensmall">{L_POSTED}: {POST_DATE} {L_SUBJECT}: {POST_SUBJECT}</span></td> - <td align="right" valign="middle"> {EDIT_IMG} {QUOTE_IMG} </td> - </tr> - </table></td> + <td width="10%" align="left"><span class="gen"><b>{L_POSTED}:</b></span></td> + <td align="left"><span class="gen">{POST_DATE}</span></td> </tr> + </table></td> + </tr> + <tr> + <td class="row2" align="left"><table width="100%" cellspacing="0" cellpadding="0" border="0"> <tr> - <td height="100%" valign="top"><hr><span class="gen">{MESSAGE}</span></td> + <td width="10%" align="left"><span class="gen"><b>{L_FROM}:</b></span></td> + <td align="left"><span class="gen">{MESSAGE_FROM}</span></td> </tr> + </table></td> + </tr> + <tr> + <td class="row1" align="left"><table width="100%" cellspacing="0" cellpadding="0" border="0"> + <tr> + <td width="10%" align="left"><span class="gen"><b>{L_TO}:</b></span></td> + <td align="left"><span class="gen">{MESSAGE_TO}</span></td> + </tr> + </table></td> + </tr> + <tr> + <td class="row2" height="100%" align="center"><table style="height:100%" width="100%" height="100%" cellspacing="1" cellpadding="0" border="0"> <tr> - <td><hr> {PROFILE_IMG} {EMAIL_IMG} {WWW_IMG} {ICQ_STATUS_IMG} {ICQ_ADD_IMG} {AIM_IMG} {YIM_IMG} {MSN_IMG} </td> + <td height="100%" valign="top"><span class="gen">{MESSAGE}</span><hr />{PROFILE_IMG} {EMAIL_IMG} {SEARCH_IMG} {WWW_IMG} {ICQ_STATUS_IMG} {ICQ_ADD_IMG} {AIM_IMG} {YIM_IMG} {MSN_IMG}</td> </tr> </table></td> </tr> <tr> - <td class="cat" colspan="2"><table width="100%" cellspacing="0" cellpadding="0" border="0"> + <td class="cat"><table width="100%" cellspacing="0" cellpadding="0" border="0"> <tr> - <td width="140" align="left" valign="middle" nowrap>{S_POST_NEW_MSG} {S_POST_REPLY_MSG}</td> + <td>{QUOTE_PM_IMG} {REPLY_PM_IMG} {EDIT_PM_IMG}</td> <td align="right" valign="middle">{S_HIDDEN_FIELDS}<input type="submit" name="save" value="Save Post"> <input type="submit" name="delete" value="Delete Post"></td> </tr> </table></td> </tr> </table></td> - </form></tr> -</table> + </tr> +</table></form> -<table width="98%" cellspacing="2" border="0" align="center"> +<table width="80%" cellspacing="2" border="0" align="center"> <tr> <td width="40%" valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td> <td align="right" valign="top" nowrap>{JUMPBOX}</td> diff --git a/phpBB/templates/subSilver/admin/admin_config_body.tpl b/phpBB/templates/subSilver/admin/admin_config_body.tpl index baf19aeba4..a0978180b3 100644 --- a/phpBB/templates/subSilver/admin/admin_config_body.tpl +++ b/phpBB/templates/subSilver/admin/admin_config_body.tpl @@ -9,152 +9,162 @@ <td class="cat" colspan="2"><span class="cattitle">{L_GENERAL_SETTINGS}</span></td> </tr> <tr> - <td class="row1">{L_SITE_NAME}:</td> + <td class="row1"><span class="gen">{L_SITE_NAME}:</span></td> <td class="row2"><input type="text" size="25" maxlength="100" name="sitename" value="{SITENAME}"></td> </tr> <tr> - <td class="row1">{L_ACCT_ACTIVATION}:</td> + <td class="row1"><span class="gen">{L_ACCT_ACTIVATION}:</span></td> <td class="row2"><input type="radio" name="require_activation" value="{ACTIVATION_NONE}" {ACTIVATION_NONE_CHECKED}>{L_NO}ne <input type="radio" name="require_activation" value="{ACTIVATION_USER}" {ACTIVATION_USER_CHECKED}>User <input type="radio" name="require_activation" value="{ACTIVATION_ADMIN}" {ACTIVATION_ADMIN_CHECKED}>Admin</td> </tr> <tr> - <td class="row1">Flood Interval: <br /><span class="gensmall">Number of seconds a user must wait between posts</span></td> + <td class="row1"><span class="gen">Flood Interval:</span><br /><span class="gensmall">Number of seconds a user must wait between posts</span></td> <td class="row2"><input type="text" size="3" maxlength="4" name="flood_interval" value="{FLOOD_INTERVAL}"></td> </tr> <tr> - <td class="row1">Topics Per Page</td> + <td class="row1"><span class="gen">Topics Per Page:</span></td> <td class="row2"><input type="text" name="topics_per_page" size="3" maxlength="4" value="{TOPICS_PER_PAGE}"></td> </tr> <tr> - <td class="row1">Posts Per Page</td> + <td class="row1"><span class="gen">Posts Per Page:</span></td> <td class="row2"><input type="text" name="posts_per_page" size="3" maxlength="4" value="{POSTS_PER_PAGE}"></td> </tr> <tr> - <td class="row1">Hot Threshold</td> + <td class="row1"><span class="gen">Hot Threshold:</span></td> <td class="row2"><input type="text" name="hot_threshold" size="3" maxlength="4" value="{HOT_TOPIC}"></td> </tr> <tr> - <td class="row1">Default Style:</td> + <td class="row1"><span class="gen">Default Style:</span></td> <td class="row2">{STYLE_SELECT}</td> </tr> <tr> - <td class="row1">Override user style:<br /><span class="gensmall">Replaces users style with the default</span></td> + <td class="row1"><span class="gen">Override user style:</span><br /><span class="gensmall">Replaces users style with the default</span></td> <td class="row2"><input type="radio" name="override_user_style" value="1" {OVERRIDE_STYLE_YES}> {L_YES} <input type="radio" name="override_user_style" value="0" {OVERRIDE_STYLE_NO}> {L_NO}</td> </tr> <tr> - <td class="row1">Default Language:</td> + <td class="row1"><span class="gen">Default Language:</span></td> <td class="row2">{LANG_SELECT}</td> </tr> <tr> - <td class="row1">Date Format:<br /><span class="gensmall">{L_DATE_FORMAT_EXPLAIN}</span></td> + <td class="row1"><span class="gen">Date Format:</span><br /><span class="gensmall">{L_DATE_FORMAT_EXPLAIN}</span></td> <td class="row2"><input type="text" maxlength="16" name="default_dateformat" value="{DEFAULT_DATEFORMAT}"></td> </tr> <tr> - <td class="row1">System Timezone:</td> + <td class="row1"><span class="gen">System Timezone:</span></td> <td class="row2">{TIMEZONE_SELECT}</td> </tr> <tr> - <td class="row1">Enable GZip Compression:</td> + <td class="row1"><span class="gen">Enable GZip Compression:</span></td> <td class="row2"><input type="radio" name="gzip_compress" value="1" {GZIP_YES}> {L_YES} <input type="radio" name="gzip_compress" value="0" {GZIP_NO}> {L_NO}</td> </tr> <tr> - <td class="row1">Enable Forum Pruning:</td> + <td class="row1"><span class="gen">Enable Forum Pruning:</span></td> <td class="row2"><input type="radio" name="prune_enable" value="1" {PRUNE_YES}> {L_YES} <input type="radio" name="prune_enable" value="0" {PRUNE_NO}> {L_NO}</td> </tr> <tr> <td class="cat" colspan="2"><span class="cattitle">User/Forum Ability Settings</span></td> </tr> <tr> - <td class="row1">Allow HTML</td> + <td class="row1"><span class="gen">Allow HTML:</span></td> <td class="row2"><input type="radio" name="allow_html" value="1" {HTML_YES}> {L_YES} <input type="radio" name="allow_html" value="0" {HTML_NO}> {L_NO}</td> </tr> <tr> - <td class="row1">Allow BBCode</td> + <td class="row1"><span class="gen">Allow BBCode:</span></td> <td class="row2"><input type="radio" name="allow_bbcode" value="1" {BBCODE_YES}> {L_YES} <input type="radio" name="allow_bbcode" value="0" {BBCODE_NO}> {L_NO}</td> </tr> <tr> - <td class="row1">Allow Smilies</td> + <td class="row1"><span class="gen">Allow Smilies:</span></td> <td class="row2"><input type="radio" name="allow_smilies" value="1" {SMILE_YES}> {L_YES} <input type="radio" name="allow_smilies" value="0" {SMILE_NO}> {L_NO}</td> </tr> <tr> - <td class="row1">Smilies Storage Path <br /><span class="gensmall">Path under your phpBB root dir, e.g. images/smilies</span></td> + <td class="row1"><span class="gen">Smilies Storage Path:</span><br /><span class="gensmall">Path under your phpBB root dir, e.g. images/smilies</span></td> <td class="row2"><input type="text" size="20" maxlength="255" name="smilies_path" value="{SMILIES_PATH}"></td> </tr> <tr> - <td class="row1">Allow Signatures</td> + <td class="row1"><span class="gen">Allow Signatures:</span></td> <td class="row2"><input type="radio" name="allow_sig" value="1" {SIG_YES}> {L_YES} <input type="radio" name="allow_sig" value="0" {SIG_NO}> {L_NO}</td> </tr> <tr> - <td class="row1">Maximum signature length<br /><span class="gensmall">Number of characters allowed</span></td> + <td class="row1"><span class="gen">Maximum signature length:</span><br /><span class="gensmall">Number of characters allowed</span></td> <td class="row2"><input type="text" size="5" maxlength="4" name="max_sig_chars" value="{SIG_SIZE}"></td> </tr> <tr> - <td class="row1">Allow Name Change</td> + <td class="row1"><span class="gen">Allow Name Change:</span></td> <td class="row2"><input type="radio" name="allow_namechange" value="1" {NAMECHANGE_YES}> {L_YES} <input type="radio" name="allow_namechange" value="0" {NAMECHANGE_NO}> {L_NO}</td> </tr> <tr> + <td class="row1"><span class="gen">Inbox limit:</span></td> + <td class="row2"><input type="text" size="5" maxlength="5" name="max_inbox_privmsgs" value="{INBOX_PRIVMSGS}"> messages</td> + </tr> + <tr> + <td class="row1"><span class="gen">Sentbox limit:</span></td> + <td class="row2"><input type="text" size="5" maxlength="5" name="max_sentbox_privmsgs" value="{SENTBOX_PRIVMSGS}"> messages</td> + </tr> + <tr> + <td class="row1"><span class="gen">Savebox limit:</span></td> + <td class="row2"><input type="text" size="5" maxlength="5" name="max_savebox_privmsgs" value="{SAVEBOX_PRIVMSGS}"> messages</td> + </tr> + <tr> <td class="cat" colspan="2"><span class="cattitle">Avatar Settings</span></td> </tr> <tr> - <td class="row1">Allow local gallery avatars</td> + <td class="row1"><span class="gen">Allow local gallery avatars:</span></td> <td class="row2"><input type="radio" name="allow_avatar_local" value="1" {AVATARS_LOCAL_YES}> {L_YES} <input type="radio" name="allow_avatar_local" value="0" {AVATARS_LOCAL_NO}> {L_NO}</td> </tr> <tr> - <td class="row1">Allow remote avatars <br /><span class="gensmall">Avatars linked from another website</span></td> + <td class="row1"><span class="gen">Allow remote avatars:</span><br /><span class="gensmall">Avatars linked from another website</span></td> <td class="row2"><input type="radio" name="allow_avatar_remote" value="1" {AVATARS_REMOTE_YES}> {L_YES} <input type="radio" name="allow_avatar_remote" value="0" {AVATARS_REMOTE_NO}> {L_NO}</td> </tr> <tr> - <td class="row1">Allow avatar uploading</td> + <td class="row1"><span class="gen">Allow avatar uploading:</span></td> <td class="row2"><input type="radio" name="allow_avatar_upload" value="1" {AVATARS_UPLOAD_YES}> {L_YES} <input type="radio" name="allow_avatar_upload" value="0" {AVATARS_UPLOAD_NO}> {L_NO}</td> </tr> <tr> - <td class="row1">Max. Avatar File Size<br /><span class="gensmall">For uploaded avatar files</span></td> + <td class="row1"><span class="gen">Max. Avatar File Size:</span><br /><span class="gensmall">For uploaded avatar files</span></td> <td class="row2"><input type="text" size="4" maxlength="10" name="avatar_filesize" value="{AVATAR_FILESIZE}"> Bytes</td> </tr> <tr> - <td class="row1">Max. Avatar Size <br /> - <span class="gensmall">(height x width)</span> + <td class="row1"><span class="gen">Max. Avatar Size:</span><br /><span class="gensmall">(height x width)</span> </td> <td class="row2"><input type="text" size="3" maxlength="4" name="avatar_max_height" value="{AVATAR_MAX_HEIGHT}"> x <input type="text" size="3" maxlength="4" name="avatar_max_width" value="{AVATAR_MAX_WIDTH}"></td> </tr> <tr> - <td class="row1">Avatar Storage Path <br /><span class="gensmall">Path under your phpBB root dir, e.g. images/avatars</span></td> + <td class="row1"><span class="gen">Avatar Storage Path:</span><br /><span class="gensmall">Path under your phpBB root dir, e.g. images/avatars</span></td> <td class="row2"><input type="text" size="20" maxlength="255" name="avatar_path" value="{AVATAR_PATH}"></td> </tr> <tr> <td class="cat" colspan="2"><span class="cattitle">Email Settings</span></td> </tr> <tr> - <td class="row1">Admin Email Address</td> + <td class="row1"><span class="gen">Admin Email Address:</span></td> <td class="row2"><input type="text" size="25" maxlength="100" name="board_email" value="{EMAIL_FROM}"></td> </tr> <tr> - <td class="row1">Email Signature<br /><span class="gensmall">This text will be attached to all emails the board sends</span></td> + <td class="row1"><span class="gen">Email Signature:</span><br /><span class="gensmall">This text will be attached to all emails the board sends</span></td> <td class="row2"><textarea name="board_email_sig" rows="5" cols="30">{EMAIL_SIG}</textarea></td> </tr> <tr> - <td class="row1">Use SMTP for delivery<br /><span class="gensmall">Say {L_YES} if you want or have to send email via a server instead of the local mail function</span></td> + <td class="row1"><span class="gen">Use SMTP for delivery:</span><br /><span class="gensmall">Say {L_YES} if you want or have to send email via a server instead of the local mail function</span></td> <td class="row2"><input type="radio" name="smtp_delivery" value="1" {SMTP_YES}> {L_YES} <input type="radio" name="smtp_delivery" value="0" {SMTP_NO}> {L_NO}</td> </tr> <tr> - <td class="row1">SMTP Server</td> + <td class="row1"><span class="gen">SMTP Server:</span></td> <td class="row2"><input type="text" name="smtp_host" value="{SMTP_HOST}" size="25" maxlength="50"></td> </tr> <tr> <td class="cat" colspan="2"><span class="cattitle">COPPA Settings</span></td> </tr> <tr> - <td class="row1">FAX Number</td> + <td class="row1"><span class="gen">FAX Number:</span></td> <td class="row2"><input type="text" name="coppa_fax" value="{COPPA_FAX}" size="25" maxlength="50"></td> </tr> <tr> - <td class="row1">Mailing Address<br /><span class="gensmall">Signed COPPA agreements will be mailed here</span></td> + <td class="row1"><span class="gen">Mailing Address:</span><br /><span class="gensmall">Signed COPPA agreements will be mailed here</span></td> <td class="row2"><textarea name="coppa_mail" rows="5" cols="30">{COPPA_MAIL}</textarea></td> - </tr> + </tr> <tr> <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="Save Settings"> </td> </tr> - </table></form> <br clear="all"> diff --git a/phpBB/templates/subSilver/agreement.tpl b/phpBB/templates/subSilver/agreement.tpl index c91c8e0fce..d548aff360 100644 --- a/phpBB/templates/subSilver/agreement.tpl +++ b/phpBB/templates/subSilver/agreement.tpl @@ -4,74 +4,56 @@ <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> </tr> </table> -<table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> +<table width="100%" border="0" cellspacing="1" cellpadding="3" class="forumline"> <tr> - <td align="left" colspan="2" class="forumline"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> + <th valign="middle" class="thHead" height="25"><span class="tableTitle">{SITENAME} + - Forums Registration Agreement</span></th> + </tr> + <tr> + <td align="center" class="row1"> + <table width="80%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> - <td class="innerline"> - <table width="100%" border="0" cellspacing="1" cellpadding="3"> - <tr> - <th height="25" valign="middle" class="secondary"><b>{SITENAME} - Forums Registration - Agreement</b></th> - </tr> - <tr> - <td align="center" class="row1"> - <table width="80%" cellspacing="2" cellpadding="2" border="0" align="center"> - <tr> - <td><span class="postbody"><br /> - While the administrators and moderators of this forum - will attempt to remove or edit any generally objectionable - material as quickly as possible, it is impossible to review - every message. Therefore you acknowledge that all posts - made to these forums express the views and opinions of - the author and not the administrators, moderators or webmaster - (except for posts by these people) and hence will not - be held liable.<br /> - <br /> - You agree not to post any abusive, obscene, vulgar, slanderous, - hateful, threatening, sexually-orientated or any other - material that may violate any applicable laws. Doing so - may lead to you being immediately and permanently banned - (and your service provider being informed). The IP address - of all posts is recorded to aid in enforcing these conditions. - You agree that the webmaster, administrator and moderators - of this forum have the right to remove, edit, move or - close any topic at any time should they see fit. As a - user you agree to any information you have entered above - being stored in a database. While this information will - not be disclosed to any third party without your consent - the webmaster, administrator and moderators cannot be - held responsible for any hacking attempt that may lead - to the data being compromised.<br /> - <br /> - This forum system uses cookies to store information on - your local computer. These cookies do not contain any - of the information you have entered above, they serve - only to improve your viewing pleasure. The email address - is used only for confirming your registration details - and password (and for sending new passwords should you - forget your current one).<br /> - <br /> - By clicking Register below you agree to be bound by these - conditions.<br /> - <br /> - <br /> - <div align="center"><a href="{U_AGREE_OVER13}">I Agree - to these terms (and am over 13 years of age)</a><br /> - <br /> - <a href="{U_AGREE_UNDER13}">I Agree to these terms (and - am <b>under</b> 13 years of age)</a><br /> - <br /> - <a href="{U_INDEX}">I do not agree to these terms</a></div> - <br /> - </span></td> - </tr> - </table> - </td> - </tr> - </table> - </td> + <td><span class="genmed"><br /> + While the administrators and moderators of this forum will attempt + to remove or edit any generally objectionable material as quickly + as possible, it is impossible to review every message. Therefore you + acknowledge that all posts made to these forums express the views + and opinions of the author and not the administrators, moderators + or webmaster (except for posts by these people) and hence will not + be held liable.<br /> + <br /> + You agree not to post any abusive, obscene, vulgar, slanderous, hateful, + threatening, sexually-orientated or any other material that may violate + any applicable laws. Doing so may lead to you being immediately and + permanently banned (and your service provider being informed). The + IP address of all posts is recorded to aid in enforcing these conditions. + You agree that the webmaster, administrator and moderators of this + forum have the right to remove, edit, move or close any topic at any + time should they see fit. As a user you agree to any information you + have entered above being stored in a database. While this information + will not be disclosed to any third party without your consent the + webmaster, administrator and moderators cannot be held responsible + for any hacking attempt that may lead to the data being compromised.<br /> + <br /> + This forum system uses cookies to store information on your local + computer. These cookies do not contain any of the information you + have entered above, they serve only to improve your viewing pleasure. + The email address is used only for confirming your registration details + and password (and for sending new passwords should you forget your + current one).<br /> + <br /> + By clicking Register below you agree to be bound by these conditions.<br /> + <br /> + <br /> + <div align="center"><a href="{U_AGREE_OVER13}" class="genmed">I Agree to these terms + (and am over 13 years of age)</a><br /> + <br /> + <a href="{U_AGREE_UNDER13}" class="genmed">I Agree to these terms (and am <b>under</b> + 13 years of age)</a><br /> + <br /> + <a href="{U_INDEX}" class="genmed">I do not agree to these terms</a></div> + <br /> + </span></td> </tr> </table> </td> diff --git a/phpBB/templates/subSilver/bbcode.tpl b/phpBB/templates/subSilver/bbcode.tpl index 2cfdb4b0fe..82ad67d7c7 100755 --- a/phpBB/templates/subSilver/bbcode.tpl +++ b/phpBB/templates/subSilver/bbcode.tpl @@ -20,94 +20,75 @@ <!-- END listitem --> <!-- BEGIN quote_open --> -<table border="0" align="center" width="85%"> - <tr> - <td> - <font size="-1">{L_QUOTE}</font> - <hr /> - </td> - </tr> - <tr> - <td> - <font size="-1"> - <blockquote> -<!-- END quote_open --> -<!-- BEGIN quote_close --> - </blockquote> - </font> - </td> +</span> +<table border="0" align="center" width="90%" cellpadding="3" cellspacing="1"> +<tr> + <td><span class="genmed"><b>Quote:</b></span></td> </tr> <tr> - <td> - <hr /> + <td class="quote"> + <!-- END quote_open --> + <!-- BEGIN quote_close --> </td> </tr> </table> +<span class="postbody"> <!-- END quote_close --> <!-- BEGIN code_open --> -<table width="85%" border="0" align="center"> - <tr> - <td> - <font size="-1">{L_CODE}</font> - <hr /> - </td> +</span> +<table border="0" align="center" width="90%" cellpadding="3" cellspacing="1"> +<tr> + <td><span class="genmed"><b>{L_CODE}:</b></span></td> </tr> <tr> - <td> - <font size="-1"> - <pre> -<!-- END code_open --> -<!-- BEGIN code_close --> - </pre> - </font> - </td> - </tr> - <tr> - <td> - <hr /> + <td class="code"> + <!-- END code_open --> + <!-- BEGIN code_close --> </td> </tr> </table> +<span class="postbody"> <!-- END code_close --> + <!-- BEGIN b_open --> -<b> +<span style="font-weight: bold"> <!-- END b_open --> <!-- BEGIN b_close --> -</b> +</span> <!-- END b_close --> <!-- BEGIN u_open --> -<u> +<span style="text-decoration: underline"> <!-- END u_open --> <!-- BEGIN u_close --> -</u> +</span> <!-- END u_close --> <!-- BEGIN i_open --> -<i> +<span style="font-style: italic"> <!-- END i_open --> <!-- BEGIN i_close --> -</i> +</span> <!-- END i_close --> <!-- BEGIN color_open --> -<font color="{COLOR}"> +<span style="color: {COLOR}"> <!-- END color_open --> <!-- BEGIN color_close --> -</font> +</span> <!-- END color_close --> <!-- BEGIN size_open --> -<font size="{SIZE}"> +<span style="font-size: {SIZE}; line-height: normal"> <!-- END size_open --> <!-- BEGIN size_close --> -</font> +</span> <!-- END size_close --> <!-- BEGIN img --> -<img src="{URL}" border="0"></img> +<img src="{URL}" border="0" /> <!-- END img --> <!-- BEGIN url --> diff --git a/phpBB/templates/subSilver/confirm_body.tpl b/phpBB/templates/subSilver/confirm_body.tpl index f53bd67c21..d28ddb5847 100644 --- a/phpBB/templates/subSilver/confirm_body.tpl +++ b/phpBB/templates/subSilver/confirm_body.tpl @@ -1,30 +1,21 @@ - -<div align="center"> - <table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> - <tr> - <td align="left" colspan="2" class="forumline"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> - <tr> - <td class="innerline"> - <table width="100%" border="0" cellspacing="1" cellpadding="3"> - <tr> - <th class="secondary" height="25" valign="middle"><b>{MESSAGE_TITLE}</b></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" /> - - <input type="submit" name="cancel" value="{L_NO}" class="liteoption" /></span></form></td> - </tr> - </table> - </td> - </tr> - </table> - </td> - </tr> - </table> -</div> -<br />
\ No newline at end of file + +<table width="100%" border="0" cellspacing="1" cellpadding="3" class="forumline"> + <tr> + <th class="thHead" valign="middle" height="25"><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" /> + + <input type="submit" name="cancel" value="{L_NO}" class="liteoption" /> + </span> + </form> + </td> + </tr> +</table> +<br /> diff --git a/phpBB/templates/subSilver/error_body.tpl b/phpBB/templates/subSilver/error_body.tpl index 43d2be9b32..36d486cb92 100644 --- a/phpBB/templates/subSilver/error_body.tpl +++ b/phpBB/templates/subSilver/error_body.tpl @@ -1,29 +1,18 @@ -<table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> + +<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline"> <tr> - <td align="left" colspan="2" class="forumline"> + <td> <table width="100%" border="0" cellspacing="0" cellpadding="1"> <tr> - <td class="innerline"> - <table width="100%" cellpadding="4" cellspacing="1" border="0"> - <tr> - <td> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> - <tr> - <td> </td> - </tr> - <tr> - <td align="center"><span class="error">{ERROR_MESSAGE}</span></td> - </tr> - <tr> - <td> </td> - </tr> - </table> - </td> - </tr> - </table> - </td> + <td> </td> + </tr> + <tr> + <td align="center"><span class="error">{ERROR_MESSAGE}</span></td> + </tr> + <tr> + <td> </td> </tr> </table> </td> </tr> -</table>
\ No newline at end of file +</table> diff --git a/phpBB/templates/subSilver/formIE.css b/phpBB/templates/subSilver/formIE.css index d6caab6392..9e4bf2ceb4 100644 --- a/phpBB/templates/subSilver/formIE.css +++ b/phpBB/templates/subSilver/formIE.css @@ -14,4 +14,5 @@ border-top-width : 1px; border-right-width : 1px; border-bottom-width : 1px; border-left-width : 1px; -}
\ No newline at end of file +} + diff --git a/phpBB/templates/subSilver/groupcp_info_body.tpl b/phpBB/templates/subSilver/groupcp_info_body.tpl index 8aa3e758fa..84647e57cd 100644 --- a/phpBB/templates/subSilver/groupcp_info_body.tpl +++ b/phpBB/templates/subSilver/groupcp_info_body.tpl @@ -4,121 +4,94 @@ <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> </tr> </table> -<table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> - <tr> - <td align="left" colspan="2" class="forumline"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> - <tr><form method="POST" action="{S_GROUP_INFO_ACTION}"> - <td class="innerline"> - <table width="100%" cellpadding="4" cellspacing="1" border="0"> - <tr> - <th colspan="7" height="25" class="secondary">{L_GROUP_INFORMATION}</th> - </tr> - <tr> - <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> - </tr> - <tr> - <td class="row1" width="20%"><span class="gen">{L_GROUP_DESC}:</span></td> - <td class="row2"><span class="gen">{GROUP_DESC}</span></td> - </tr> - <tr> - <td class="row1" width="20%"><span class="gen">{L_GROUP_MEMBERSHIP}:</span></td> - <td class="row2"><span class="gen">{GROUP_DETAILS}{S_HIDDEN_FIELDS}</span></td> - </tr> - </table> - </td> - </form></tr> - </table> - </td> - </tr> -</table> -<br /> +<form method="POST" action="{S_GROUP_INFO_ACTION}"> + <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> + <tr> + <th colspan="7" class="thHead" height="25"><span class="tableTitle">{L_GROUP_INFORMATION}</span></th> + </tr> + <tr> + <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> + </tr> + <tr> + <td class="row1" width="20%"><span class="gen">{L_GROUP_DESC}:</span></td> + <td class="row2"><span class="gen">{GROUP_DESC}</span></td> + </tr> + <tr> + <td class="row1" width="20%"><span class="gen">{L_GROUP_MEMBERSHIP}:</span></td> + <td class="row2"><span class="gen">{GROUP_DETAILS}{S_HIDDEN_FIELDS}</span></td> + </tr> + </table> +</form> <form action="{S_PENDING_ACTION}" method="POST"> - <table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> + <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> + <tr> + <th class="thCornerL" height="25">Private Message</th> + <th class="thTop">{L_USERNAME}</th> + <th class="thTop">{L_POSTS}</th> + <th class="thTop">{L_FROM}</th> + <th class="thTop">{L_EMAIL}</th> + <th colspan="2" class="thCornerR">{L_WEBSITE}</th> + </tr> <tr> - <td align="left" colspan="2" class="forumline"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> - <tr> - <td class="innerline"> - <table width="100%" cellpadding="4" cellspacing="1" border="0"> - <tr> - <th>Private Message</th> - <th>{L_USERNAME}</th> - <th>{L_POSTS}</th> - <th>{L_FROM}</th> - <th>{L_EMAIL}</th> - <th colspan="2">{L_WEBSITE}</th> - </tr> - <tr> - <td class="cat" colspan="7" height="28"><span class="cattitle">Group - Moderator</span></td> - </tr> - <tr> - <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" valign="middle"><span class="gen">{MOD_POSTS}</span></td> - <td class="row1" align="center" valign="middle"><span class="gen">{MOD_FROM}</span></td> - <td class="row1" align="center" valign="middle"><span class="gen">{MOD_EMAIL_IMG}</span></td> - <td class="row1" align="center" colspan="2">{MOD_WWW_IMG}</td> - </tr> - <tr> - <td class="cat" colspan="8" height="28"><span class="cattitle">Group - Members</span></td> - </tr> - <!-- BEGIN memberrow --> - <tr> - <td class="{memberrow.ROW_CLASS}" align="center"> {memberrow.PM_IMG} - </td> - <td class="{memberrow.ROW_CLASS}" align="center"><span class="gen"><a href="{memberrow.U_VIEWPROFILE}" class="gen">{memberrow.USERNAME}</a></span></td> - <td class="{memberrow.ROW_CLASS}" align="center"><span class="gen">{memberrow.POSTS}</span></td> - <td class="{memberrow.ROW_CLASS}" align="center"><span class="gen"> - {memberrow.FROM} </span></td> - <td class="{memberrow.ROW_CLASS}" align="center" valign="middle"><span class="gen">{memberrow.EMAIL_IMG}</span></td> - <td class="{memberrow.ROW_CLASS}" align="center" colspan="2"> - {memberrow.WWW_IMG}</td> - </tr> - <!-- END memberrow --> - <!-- BEGIN pendingmembers --> - <tr> - <td class="cat" colspan="6" height="28"><span class="cattitle">Pending - Members</span></td> - <td class="cat" align="center"><span class="gen"><b>Action</b></span></td> - </tr> - <!-- END pendingmembers --> - <!-- BEGIN pendingmembersrow --> - <tr> - <td class="{pendingmembersrow.ROW_CLASS}" align="center"> {pendingmembersrow.PM_IMG} - </td> - <td class="{pendingmembersrow.ROW_CLASS}" align="center"><span class="gen"><a href="{pendingmembersrow.U_VIEWPROFILE}" class="gen">{pendingmembersrow.USERNAME}</a></span></td> - <td class="{pendingmembersrow.ROW_CLASS}" align="center"><span class="gen">{pendingmembersrow.POSTS}</span></td> - <td class="{pendingmembersrow.ROW_CLASS}" align="center"><span class="gen">{pendingmembersrow.FROM}</span></td> - <td class="{pendingmembersrow.ROW_CLASS}" align="center"><span class="gen">{pendingmembersrow.EMAIL_IMG}</span></td> - <td class="{pendingmembersrow.ROW_CLASS}" align="center"><span class="gen">{pendingmembersrow.WWW_IMG}</span></td> - <td class="{pendingmembersrow.ROW_CLASS}" align="center"><span class="gensmall">{pendingmembersrow.SELECT} {L_SELECT}</span></td> - </tr> - <!-- END pendingmembersrow --> - <!-- BEGIN pendingmembers --> - <tr> - <td class="cat" colspan="8" align="right"><span class="cattitle"> - <input type="submit" name="approve" value="{L_APPROVESELECTED}" class="mainoption" /> - - <input type="submit" name="deny" value="{L_DENYSELECTED}" class="liteoption" /> - </span></td> - </tr> - <!-- END pendingmembers --> - <!-- BEGIN nomembers --> - <tr> - <td class="row1" colspan="7" align="center">{L_NO_MEMBERS}</td> - </tr> - <!-- END nomembers --> - </table> - </td> - </tr> - </table> + <td class="catSides" colspan="7" height="28"><span class="cattitle">Group Moderator</span></td> + </tr> + <tr> + <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" valign="middle"><span class="gen">{MOD_POSTS}</span></td> + <td class="row1" align="center" valign="middle"><span class="gen">{MOD_FROM}</span></td> + <td class="row1" align="center" valign="middle"><span class="gen">{MOD_EMAIL_IMG}</span></td> + <td class="row1" align="center" colspan="2">{MOD_WWW_IMG}</td> + </tr> + <tr> + <td class="catSides" colspan="8" height="28"><span class="cattitle">Group Members</span></td> + </tr> + <!-- BEGIN memberrow --> + <tr> + <td class="{memberrow.ROW_CLASS}" align="center"> {memberrow.PM_IMG} </td> + <td class="{memberrow.ROW_CLASS}" align="center"><span class="gen"><a href="{memberrow.U_VIEWPROFILE}" class="gen">{memberrow.USERNAME}</a></span></td> + <td class="{memberrow.ROW_CLASS}" align="center"><span class="gen">{memberrow.POSTS}</span></td> + <td class="{memberrow.ROW_CLASS}" align="center"><span class="gen"> {memberrow.FROM} + </span></td> + <td class="{memberrow.ROW_CLASS}" align="center" valign="middle"><span class="gen">{memberrow.EMAIL_IMG}</span></td> + <td class="{memberrow.ROW_CLASS}" align="center" colspan="2"> {memberrow.WWW_IMG}</td> + </tr> + <!-- END memberrow --> + <!-- BEGIN pendingmembers --> + <tr> + <td class="catSides" colspan="6" height="28"><span class="cattitle">Pending Members</span></td> + <td class="catSides" align="center"><span class="gen"><b>Action</b></span></td> + </tr> + <!-- END pendingmembers --> + <!-- BEGIN pendingmembersrow --> + <tr> + <td class="{pendingmembersrow.ROW_CLASS}" align="center"> {pendingmembersrow.PM_IMG} </td> + <td class="{pendingmembersrow.ROW_CLASS}" align="center"><span class="gen"><a href="{pendingmembersrow.U_VIEWPROFILE}" class="gen">{pendingmembersrow.USERNAME}</a></span></td> + <td class="{pendingmembersrow.ROW_CLASS}" align="center"><span class="gen">{pendingmembersrow.POSTS}</span></td> + <td class="{pendingmembersrow.ROW_CLASS}" align="center"><span class="gen">{pendingmembersrow.FROM}</span></td> + <td class="{pendingmembersrow.ROW_CLASS}" align="center"><span class="gen">{pendingmembersrow.EMAIL_IMG}</span></td> + <td class="{pendingmembersrow.ROW_CLASS}" align="center"><span class="gen">{pendingmembersrow.WWW_IMG}</span></td> + <td class="{pendingmembersrow.ROW_CLASS}" align="center"><span class="gensmall">{pendingmembersrow.SELECT} + {L_SELECT}</span></td> + </tr> + <!-- END pendingmembersrow --> + <!-- BEGIN pendingmembers --> + <tr> + <td class="cat" colspan="8" align="right"><span class="cattitle"> + <input type="submit" name="approve" value="{L_APPROVESELECTED}" class="mainoption" /> + + <input type="submit" name="deny" value="{L_DENYSELECTED}" class="liteoption" /> + </span></td> + </tr> + <!-- END pendingmembers --> + <!-- BEGIN nomembers --> + <tr> + <td class="row1" colspan="7" align="center">{L_NO_MEMBERS}</td> </tr> + <!-- END nomembers --> </table> <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2"> <tr> diff --git a/phpBB/templates/subSilver/groupcp_list_body.tpl b/phpBB/templates/subSilver/groupcp_list_body.tpl index 820dc5ca18..a56802acdf 100644 --- a/phpBB/templates/subSilver/groupcp_list_body.tpl +++ b/phpBB/templates/subSilver/groupcp_list_body.tpl @@ -1,68 +1,56 @@ -<table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> +<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> <tr> - <td align="left" colspan="2" class="forumline"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> + <td class="catHead" colspan="7" height="28"><span class="cattitle">Group Moderator</span></td> + </tr> + <tr> + <th class="thLeft" height="25">{L_PM}</th> + <th>{L_USERNAME}</th> + <th>{L_EMAIL}</th> + <th>{L_FROM}</th> + <th>{L_JOINED}</th> + <th>{L_POSTS}</th> + <th class="thRight">{L_WEBSITE}</th> + </tr> + <tr> + <td class="row1" width="8%" align="center"> {MOD_PM_IMG} </td> + <td class="row1" align="center"><span class="gen"><a href="{U_MOD_VIEWPROFILE}">{MOD_USERNAME}</a></span></td> + <td class="row1" width="8%" align="center" valign="middle"> {MOD_EMAIL_IMG} </td> + <td class="row1" align="center" valign="middle"><span class="gen">{MOD_FROM}</span></td> + <td class="row1" align="center" valign="middle"><span class="gensmall">{MOD_JOINED}</span></td> + <td class="row1" align="center" valign="middle"><span class="gen">{MOD_POSTS}</span></td> + <td class="row1" width="8%" align="center"> {MOD_WWW_IMG} </td> + </tr> + <tr> + <td class="catSides" colspan="7" height="28"><span class="cattitle">Group + Members</span></td> + </tr> + <tr> + <th class="thLeft" height="25">{L_PM}</th> + <th>{L_USERNAME}</th> + <th>{L_EMAIL}</th> + <th>{L_FROM}</th> + <th>{L_JOINED}</th> + <th>{L_POSTS}</th> + <th class="thRight">{L_WEBSITE}</th> + </tr> + <!-- BEGIN memberrow --> + <tr> + <td width="8%" bgcolor="{memberrow.ROW_COLOR}" align="center"> {memberrow.PM_IMG} </td> + <td bgcolor="{memberrow.ROW_COLOR}" align="center"><span class="gen"><a href="{memberrow.U_VIEWPROFILE}">{memberrow.USERNAME}</a></span></td> + <td width="8%" bgcolor="{memberrow.ROW_COLOR}" align="center" valign="middle"> {memberrow.EMAIL_IMG} </td> + <td bgcolor="{memberrow.ROW_COLOR}" align="center" valign="middle"><span class="gen">{memberrow.FROM}</span></td> + <td bgcolor="{memberrow.ROW_COLOR}" align="center" valign="middle"><span class="gensmall">{memberrow.JOINED}</span></td> + <td bgcolor="{memberrow.ROW_COLOR}" align="center" valign="middle"><span class="gen">{memberrow.POSTS}</span></td> + <td width="8%" bgcolor="{memberrow.ROW_COLOR}" align="center"> {memberrow.WWW_IMG} </td> + </tr> + <!-- END memberrow --> + <tr> + <td class="catBottom" colspan="7" style="border: #FFFFFF; border-style: solid; border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 1px;"> + <table width="100%" cellspacing="0" cellpadding="0" border="0"> <tr> - <td class="innerline"> - <table width="100%" cellpadding="4" cellspacing="1" border="0"> - <tr> - <td class="cat" colspan="7"><span class="cattitle">Group Moderator</span></td> - </tr> - <tr> - <th>{L_PM}</th> - <th>{L_USERNAME}</th> - <th>{L_EMAIL}</th> - <th>{L_FROM}</th> - <th>{L_JOINED}</th> - <th>{L_POSTS}</th> - <th>{L_WEBSITE}</th> - </tr> - <tr> - <td class="row1" width="8%" align="center"> {MOD_PM_IMG} </td> - <td class="row1" align="center"><span class="gen"><a href="{U_MOD_VIEWPROFILE}">{MOD_USERNAME}</a></span></td> - <td class="row1" width="8%" align="center" valign="middle"> {MOD_EMAIL_IMG} </td> - <td class="row1" align="center" valign="middle"><span class="gen">{MOD_FROM}</span></td> - <td class="row1" align="center" valign="middle"><span class="gensmall">{MOD_JOINED}</span></td> - <td class="row1" align="center" valign="middle"><span class="gen">{MOD_POSTS}</span></td> - <td class="row1" width="8%" align="center"> {MOD_WWW_IMG} </td> - </tr> - <tr> - <td class="cat" colspan="7"><span class="cattitle">Group Members</span></td> - </tr> - <tr> - <th>{L_PM}</th> - <th>{L_USERNAME}</th> - <th>{L_EMAIL}</th> - <th>{L_FROM}</th> - <th>{L_JOINED}</th> - <th>{L_POSTS}</th> - <th>{L_WEBSITE}</th> - </tr> - <!-- BEGIN memberrow --> - <tr> - <td width="8%" bgcolor="{memberrow.ROW_COLOR}" align="center"> {memberrow.PM_IMG} </td> - <td bgcolor="{memberrow.ROW_COLOR}" align="center"><span class="gen"><a href="{memberrow.U_VIEWPROFILE}">{memberrow.USERNAME}</a></span></td> - <td width="8%" bgcolor="{memberrow.ROW_COLOR}" align="center" valign="middle"> {memberrow.EMAIL_IMG} </td> - <td bgcolor="{memberrow.ROW_COLOR}" align="center" valign="middle"><span class="gen">{memberrow.FROM}</span></td> - <td bgcolor="{memberrow.ROW_COLOR}" align="center" valign="middle"><span class="gensmall">{memberrow.JOINED}</span></td> - <td bgcolor="{memberrow.ROW_COLOR}" align="center" valign="middle"><span class="gen">{memberrow.POSTS}</span></td> - <td width="8%" bgcolor="{memberrow.ROW_COLOR}" align="center"> {memberrow.WWW_IMG} </td> - </tr> - <!-- END memberrow --> - <tr> - <td class="cat" colspan="7"> - <table width="100%" cellspacing="0" cellpadding="0" border="0"> - <tr> - <td><span class="nav"> {L_PAGE} <b>{ON_PAGE}</b> {L_OF} - <b>{TOTAL_PAGES}</b></span></td> - <td align="right"><span class="nav">{PAGINATION} </span></td> - </tr> - </table> - </td> - </tr> - </table> - </td> + <td><span class="nav"> {L_PAGE} <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></span></td> + <td align="right"><span class="nav">{PAGINATION} </span></td> </tr> </table> </td> diff --git a/phpBB/templates/subSilver/groupcp_user_body.tpl b/phpBB/templates/subSilver/groupcp_user_body.tpl index 04bc7c1f7c..0e8428d67b 100644 --- a/phpBB/templates/subSilver/groupcp_user_body.tpl +++ b/phpBB/templates/subSilver/groupcp_user_body.tpl @@ -4,69 +4,63 @@ <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> </tr> </table> -<table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> +<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> <tr> - <td align="left" colspan="2" class="forumline"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> + <th colspan="2" align="center" class="thHead" height="25">{L_GROUP_MEMBERSHIP_DETAILS}</th> + </tr> + <tr> + <td class="row1"><span class="gen">{L_YOU_BELONG_GROUPS}</span></td> + <td class="row2" align="right"> + <table width="90%" cellspacing="0" cellpadding="0" border="0"> + <tr> + <form method="post" action="{S_USERGROUP_ACTION}"> + <td width="40%"><span class="gensmall">{GROUP_MEMBER_SELECT}</span></td> + <td align="center" width="30%"> + <input type="submit" name="viewinfo" value="{L_VIEW_INFORMATION}" class="liteoption" /> + </td> + <td align="center" width="30%"> + <input type="submit" name="unsubjoin" value="{L_UNSUBSCRIBE}" class="liteoption" /> + </td> + </form> + </tr> + </table> + </td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_PENDING_GROUPS}</span></td> + <td class="row2" align="right"> + <table width="90%" cellspacing="0" cellpadding="0" border="0"> + <tr> + <form method="post" action="{S_USERGROUP_ACTION}"> + <td width="40%"><span class="gensmall">{GROUP_PENDING_SELECT}</span></td> + <td align="center" width="30%"> + <input type="submit" name="viewinfo2" value="{L_VIEW_INFORMATION}" class="liteoption" /> + </td> + <td align="center" width="30%"> + <input type="submit" name="unsubpending" value="{L_UNSUBSCRIBE}" class="liteoption" /> + </td> + </form> + </tr> + </table> + </td> + </tr> + <tr> + <td class="catSides" colspan="2" align="center" height="28"><span class="cattitle"><b>{L_JOIN_A_GROUP}</b></span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_SELECT_A_GROUP}</span></td> + <td class="row2" align="right"> + <table width="90%" cellspacing="0" cellpadding="0" border="0"> <tr> - <td class="innerline"> - <table width="100%" cellpadding="4" cellspacing="1" border="0"> - <tr> - <th colspan="2" align="center" height="25" class="secondary">{L_GROUP_MEMBERSHIP_DETAILS}</th> - </tr> - <tr> - <td class="row1"><span class="gen">{L_YOU_BELONG_GROUPS}</span></td> - <td class="row2" align="right"> - <table width="90%" cellspacing="0" cellpadding="0" border="0"> - <tr> - <form method="post" action="{S_USERGROUP_ACTION}"> - <td width="40%"><span class="gensmall">{GROUP_MEMBER_SELECT}</span></td> - <td align="center" width="30%"> -<input type="submit" name="viewinfo" value="{L_VIEW_INFORMATION}" class="liteoption" /></td> - <td align="center" width="30%"> -<input type="submit" name="unsubjoin" value="{L_UNSUBSCRIBE}" class="liteoption" /></td> - </form> - </tr> - </table> - </td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_PENDING_GROUPS}</span></td> - <td class="row2" align="right"> - <table width="90%" cellspacing="0" cellpadding="0" border="0"> - <tr> - <form method="post" action="{S_USERGROUP_ACTION}"> - <td width="40%"><span class="gensmall">{GROUP_PENDING_SELECT}</span></td> - <td align="center" width="30%"> - <input type="submit" name="viewinfo" value="{L_VIEW_INFORMATION}" class="liteoption" /></td> - <td align="center" width="30%"> - <input type="submit" name="unsubpending" value="{L_UNSUBSCRIBE}" class="liteoption" /></td> - </form> - </tr> - </table> - </td> - </tr> - <tr> - <td class="cat" colspan="2" align="center" height="28"><span class="cattitle"><b>{L_JOIN_A_GROUP}</b></span></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_SELECT_A_GROUP}</span></td> - <td class="row2" align="right"> - <table width="90%" cellspacing="0" cellpadding="0" border="0"> - <tr> - <form method="post" action="{S_USERGROUP_ACTION}"> - <td width="40%"><span class="gensmall">{GROUP_LIST_SELECT}</span></td> - <td align="center" width="30%"> - <input type="submit" name="viewinfo" value="{L_VIEW_INFORMATION}" class="liteoption" /></td> - <td align="center" width="30%"> - <input type="submit" name="subnew" value="{L_SUBSCRIBE}" class="liteoption" /></td> - </form> - </tr> - </table> - </td> - </tr> - </table> - </td> + <form method="post" action="{S_USERGROUP_ACTION}"> + <td width="40%"><span class="gensmall">{GROUP_LIST_SELECT}</span></td> + <td align="center" width="30%"> + <input type="submit" name="viewinfo2" value="{L_VIEW_INFORMATION}" class="liteoption" /> + </td> + <td align="center" width="30%"> + <input type="submit" name="subnew" value="{L_SUBSCRIBE}" class="liteoption" /> + </td> + </form> </tr> </table> </td> diff --git a/phpBB/templates/subSilver/index_body.tpl b/phpBB/templates/subSilver/index_body.tpl index 927b337649..d2c43f5a93 100644 --- a/phpBB/templates/subSilver/index_body.tpl +++ b/phpBB/templates/subSilver/index_body.tpl @@ -5,116 +5,76 @@ <td align="right" class="gensmall"><a href="{U_SEARCH_NEW}" class="gensmall">{L_SEARCH_NEW}</a><br /> on {LAST_VISIT_DATE}</td> </tr> +</table> +<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline"> <tr> - <td align="left" colspan="2" class="forumline"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> - <tr> - <td class="innerline"> - <table width="100%" cellpadding="2" cellspacing="1" border="0"> - <tr> - <th colspan="2" height="26"> {L_FORUM} </th> - <th width="50"> {L_TOPICS} </th> - <th width="50"> {L_POSTS} </th> - <th> {L_LASTPOST} </th> - </tr> - <!-- BEGIN catrow --> - <tr> - <td class="cat" colspan="2" height="28"><span class="cattitle"><a href="{catrow.U_VIEWCAT}" class="cattitle">{catrow.CAT_DESC}</a></span></td> - <td class="rowpic" colspan="3" align="right"> </td> - </tr> - <!-- BEGIN forumrow --> - <tr> - <td class="row1" align="center" valign="middle" height="50">{catrow.forumrow.FOLDER}</td> - <td class="row1" width="100%" height="50"><span class="forumlink"> - <a href="{catrow.forumrow.U_VIEWFORUM}" class="forumlink">{catrow.forumrow.FORUM_NAME}</a><br /> - </span> <span class="genmed">{catrow.forumrow.FORUM_DESC}<br /> - </span><span class="gensmall">{L_MODERATOR} {catrow.forumrow.MODERATORS}</span></td> - <td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{catrow.forumrow.TOPICS}</span></td> - <td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{catrow.forumrow.POSTS}</span></td> - <td class="row2" align="center" valign="middle" height="50" nowrap="nowrap"> - <span class="gensmall">{catrow.forumrow.LAST_POST}</span></td> - </tr> - <!-- END forumrow --> - <!-- END catrow --> - </table> - </td> - </tr> - </table> - </td> + <th colspan="2" class="thCornerL" height="25"> {L_FORUM} </th> + <th width="50" class="thTop"> {L_TOPICS} </th> + <th width="50" class="thTop"> {L_POSTS} </th> + <th class="thCornerR"> {L_LASTPOST} </th> + </tr> + <!-- BEGIN catrow --> + <tr> + <td class="catLeft" colspan="2" height="28"><span class="cattitle"><a href="{catrow.U_VIEWCAT}" class="cattitle">{catrow.CAT_DESC}</a></span></td> + <td class="rowpic" colspan="3" align="right"> </td> + </tr> + <!-- BEGIN forumrow --> + <tr> + <td class="row1" align="center" valign="middle" height="50">{catrow.forumrow.FOLDER}</td> + <td class="row1" width="100%" height="50"><span class="forumlink"> <a href="{catrow.forumrow.U_VIEWFORUM}" class="forumlink">{catrow.forumrow.FORUM_NAME}</a><br /> + </span> <span class="genmed">{catrow.forumrow.FORUM_DESC}<br /> + </span><span class="gensmall">{L_MODERATOR} {catrow.forumrow.MODERATORS}</span></td> + <td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{catrow.forumrow.TOPICS}</span></td> + <td class="row2" align="center" valign="middle" height="50"><span class="gensmall">{catrow.forumrow.POSTS}</span></td> + <td class="row2" align="center" valign="middle" height="50" nowrap="nowrap"> <span class="gensmall">{catrow.forumrow.LAST_POST}</span></td> </tr> + <!-- END forumrow --> + <!-- END catrow --> </table> -<table width="100%" cellspacing="2" border="0" align="center"> +<table width="100%" cellspacing="0" border="0" align="center" cellpadding="2"> <tr> <td align="left"><span class="gensmall"><a href="{U_MARK_READ}" class="gensmall">{L_MARK_FORUMS_READ}</a></span></td> <td align="right"><span class="gensmall">{S_TIMEZONE}</span></td> </tr> </table> -<table width="100%" cellpadding="2" cellspacing="0" border="0"> +<table width="100%" cellpadding="3" cellspacing="1" border="0" class="forumline"> + <tr> + <td class="catHead" colspan="2" height="28"><span class="cattitle"><a href="{U_VIEWONLINE}" class="cattitle">{L_WHO_IS_ONLINE}</a></span></td> + </tr> <tr> - <td class="forumline"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> - <tr> - <td class="innerline"> - <table width="100%" cellpadding="3" cellspacing="1" border="0"> - <tr> - <td class="cat" colspan="2" height="28"><span class="cattitle"><a href="{U_VIEWONLINE}" class="cattitle">{L_WHO_IS_ONLINE}</a></span></td> - </tr> - <tr> - <td class="row1" align="center" valign="middle" rowspan="2"><img src="templates/subSilver/images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" /></td> - <td class="row1" align="left" width="100%"> - <p><span class="gensmall">A total of <b>{TOTAL_POSTS}</b> posts - have been made.<br /> - We have <b>{TOTAL_USERS}</b> registered users.<br /> - Welcome to our newest member <b><a href="{U_NEWEST_USER_PROFILE}">{NEWEST_USER}</a></b>.</span></p> - </td> - </tr> - <tr> - <td class="row1" align="left"><span class="gensmall">{TOTAL_USERS_ONLINE}.<br /> - {LOGGED_IN_USER_LIST}</span></td> - </tr> - </table> - </td> - </tr> - </table> + <td class="row1" align="center" valign="middle" rowspan="2"><img src="templates/subSilver/images/whosonline.gif" alt="{L_WHO_IS_ONLINE}" /></td> + <td class="row1" align="left" width="100%"> + <p><span class="gensmall">A total of <b>{TOTAL_POSTS}</b> posts have been + made.<br /> + We have <b>{TOTAL_USERS}</b> registered users.<br /> + Welcome to our newest member <b><a href="{U_NEWEST_USER_PROFILE}">{NEWEST_USER}</a></b>.</span></p> </td> </tr> + <tr> + <td class="row1" align="left"><span class="gensmall">{TOTAL_USERS_ONLINE}.<br /> + {LOGGED_IN_USER_LIST}</span></td> + </tr> </table> <!-- BEGIN loginbox --> <br /> <form method="post" action="{S_LOGIN_ACTION}"> - <table width="100%" cellpadding="2" cellspacing="0" border="0"> - <tr> - <td class="forumline"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> - <tr> - <td class="innerline"> - <table width="100%" cellpadding="3" cellspacing="1" border="0"> - <tr> - <td class="cat" height="28"><a name="login"></a><span class="cattitle">{L_LOGIN_LOGOUT}</span></td> - </tr> - <tr> - - <td class="row1" align="center" valign="middle" height="28"><span class="gensmall">{L_USERNAME}: - - <input class="post" type="text" name="username" size="10" /> - {L_PASSWORD}: - - <input class="post" type="password" name="password" size="10" /> - {L_AUTO_LOGIN} - <input class="text" type="checkbox" name="autologin" /> - - - <input type="submit" class="mainoption" name="submit" value="{L_LOGIN}" /> - </span> </td> - </tr> - </table> - </td> - </tr> - </table> - </td> - </tr> - </table> - </form> + <table width="100%" cellpadding="3" cellspacing="1" border="0" class="forumline"> + <tr> + <td class="catHead" height="28"><a name="login"></a><span class="cattitle">{L_LOGIN_LOGOUT}</span></td> + </tr> + <tr> + <td class="row1" align="center" valign="middle" height="28"><span class="gensmall">{L_USERNAME}: + <input class="post" type="text" name="username" size="10" /> + {L_PASSWORD}: + <input class="post" type="password" name="password" size="10" /> + {L_AUTO_LOGIN} + <input class="text" type="checkbox" name="autologin" /> + + <input type="submit" class="mainoption" name="submit" value="{L_LOGIN}" /> + </span> </td> + </tr> + </table> +</form> <!-- END loginbox --> <br clear="all" /> diff --git a/phpBB/templates/subSilver/login_body.tpl b/phpBB/templates/subSilver/login_body.tpl index f45d934181..7b2d34b755 100644 --- a/phpBB/templates/subSilver/login_body.tpl +++ b/phpBB/templates/subSilver/login_body.tpl @@ -4,57 +4,46 @@ <td align="left" class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></td> </tr> </table> -<table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> +<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> <tr> - <td align="left" colspan="2" class="forumline"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> - <tr> - <td class="innerline"> - <table width="100%" cellpadding="4" cellspacing="1" border="0"> - <tr> - <th height="25" class="secondary">Please enter your username and password to login</th> - </tr> - <tr> - <td class="row1"> - <form action="{S_LOGIN_ACTION}" method="post"> - <table border="0" cellpadding="3" cellspacing="1" width="100%"> - <tr> - <td colspan="2" align="center"> </td> - </tr> - <tr> - <td width="45%" align="right"><span class="gen">{L_USERNAME}:</span></td> - <td> - <input type="text" name="username" size="25" maxlength="40" value="{USERNAME}" /> - </td> - </tr> - <tr> - <td align="right"><span class="gen">{L_PASSWORD}:</span></td> - <td> - <input type="password" name="password" size="25" maxlength="25" /> - </td> - </tr> - <tr align="center"> - <td colspan="2"><span class="gen">{L_AUTO_LOGIN}: - <input type="checkbox" name="autologin" /> - </span> </td> - </tr> - <tr align="center"> - <td colspan="2"> - <input type="hidden" name="forward_page" value="{FORWARD_PAGE}" /> - <input type="submit" name="submit" class="mainoption" value="{L_LOGIN}" /> - </td> - </tr> - <tr align="center"> - <td colspan="2"><span class="gensmall"><a href="{U_SEND_PASSWORD}" class="gensmall">{L_SEND_PASSWORD}</a></span></td> - </tr> - </table> - </form> - </td> - </tr> - </table> - </td> - </tr> - </table> + <th height="25" class="thHead">Please enter your username and password + to login</th> + </tr> + <tr> + <td class="row1"> + <form action="{S_LOGIN_ACTION}" method="post"> + <table border="0" cellpadding="3" cellspacing="1" width="100%"> + <tr> + <td colspan="2" align="center"> </td> + </tr> + <tr> + <td width="45%" align="right"><span class="gen">{L_USERNAME}:</span></td> + <td> + <input type="text" name="username" size="25" maxlength="40" value="{USERNAME}" /> + </td> + </tr> + <tr> + <td align="right"><span class="gen">{L_PASSWORD}:</span></td> + <td> + <input type="password" name="password" size="25" maxlength="25" /> + </td> + </tr> + <tr align="center"> + <td colspan="2"><span class="gen">{L_AUTO_LOGIN}: + <input type="checkbox" name="autologin" /> + </span> </td> + </tr> + <tr align="center"> + <td colspan="2"> + <input type="hidden" name="forward_page" value="{FORWARD_PAGE}" /> + <input type="submit" name="submit" class="mainoption" value="{L_LOGIN}" /> + </td> + </tr> + <tr align="center"> + <td colspan="2"><span class="gensmall"><a href="{U_SEND_PASSWORD}" class="gensmall">{L_SEND_PASSWORD}</a></span></td> + </tr> + </table> + </form> </td> </tr> </table> diff --git a/phpBB/templates/subSilver/memberlist_body.tpl b/phpBB/templates/subSilver/memberlist_body.tpl index 7dc3e32c35..aad19cbfd4 100644 --- a/phpBB/templates/subSilver/memberlist_body.tpl +++ b/phpBB/templates/subSilver/memberlist_body.tpl @@ -3,51 +3,38 @@ <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> - <td align="right" nowrap><span class="genmed">{L_SELECT_SORT_METHOD}: {S_MODE_SELECT} {L_ORDER} {S_ORDER_SELECT} + <td align="right" nowrap="nowrap"><span class="genmed">{L_SELECT_SORT_METHOD}: {S_MODE_SELECT} {L_ORDER} {S_ORDER_SELECT} <input type="submit" name="submit" value="{L_SUBMIT}" class="liteoption" /> </span></td> </tr> </table> - <table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> + <table width="100%" cellpadding="3" cellspacing="1" border="0" class="forumline"> <tr> - <td align="left" colspan="2" class="forumline"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> + <th height="25" class="thCornerL"> </th> + <th class="thTop">{L_USERNAME}</th> + <th class="thTop">{L_EMAIL}</th> + <th class="thTop">{L_FROM}</th> + <th class="thTop">{L_JOINED}</th> + <th class="thTop">{L_POSTS}</th> + <th class="thCornerR">{L_WEBSITE}</th> + </tr> + <!-- BEGIN memberrow --> + <tr> + <td class="{memberrow.ROW_CLASS}" align="center"> {memberrow.PM_IMG} </td> + <td class="{memberrow.ROW_CLASS}" align="center"><span class="gen"><a href="{memberrow.U_VIEWPROFILE}" class="gen">{memberrow.USERNAME}</a></span></td> + <td class="{memberrow.ROW_CLASS}" align="center" valign="middle"> {memberrow.EMAIL_IMG} </td> + <td class="{memberrow.ROW_CLASS}" align="center" valign="middle"><span class="gen">{memberrow.FROM}</span></td> + <td class="{memberrow.ROW_CLASS}" align="center" valign="middle"><span class="gensmall">{memberrow.JOINED}</span></td> + <td class="{memberrow.ROW_CLASS}" align="center" valign="middle"><span class="gen">{memberrow.POSTS}</span></td> + <td class="{memberrow.ROW_CLASS}" align="center"> {memberrow.WWW_IMG} </td> + </tr> + <!-- END memberrow --> + <tr> + <td class="catbottom" colspan="7" height="28"> + <table width="100%" cellspacing="0" cellpadding="0" border="0"> <tr> - <td class="innerline"> - <table width="100%" cellpadding="3" cellspacing="1" border="0"> - <tr> - <th height="25"> </th> - <th>{L_USERNAME}</th> - <th>{L_EMAIL}</th> - <th>{L_FROM}</th> - <th>{L_JOINED}</th> - <th>{L_POSTS}</th> - <th>{L_WEBSITE}</th> - </tr> - <!-- BEGIN memberrow --> - <tr> - <td class="{memberrow.ROW_CLASS}" align="center"> {memberrow.PM_IMG} </td> - <td class="{memberrow.ROW_CLASS}" align="center"><span class="gen"><a href="{memberrow.U_VIEWPROFILE}" class="gen">{memberrow.USERNAME}</a></span></td> - <td class="{memberrow.ROW_CLASS}" align="center" valign="middle"> {memberrow.EMAIL_IMG} </td> - <td class="{memberrow.ROW_CLASS}" align="center" valign="middle"><span class="gen">{memberrow.FROM}</span></td> - <td class="{memberrow.ROW_CLASS}" align="center" valign="middle"><span class="gensmall">{memberrow.JOINED}</span></td> - <td class="{memberrow.ROW_CLASS}" align="center" valign="middle"><span class="gen">{memberrow.POSTS}</span></td> - <td class="{memberrow.ROW_CLASS}" align="center"> {memberrow.WWW_IMG} </td> - </tr> - <!-- END memberrow --> - <tr> - <td class="cat" colspan="7" height="28"> - <table width="100%" cellspacing="0" cellpadding="0" border="0"> - <tr> - <td><span class="nav"> {L_PAGE} <b>{ON_PAGE}</b> - {L_OF} <b>{TOTAL_PAGES}</b></span></td> - <td align="right"><span class="nav">{PAGINATION} </span></td> - </tr> - </table> - </td> - </tr> - </table> - </td> + <td><span class="nav"> {L_PAGE} <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></span></td> + <td align="right"><span class="nav">{PAGINATION} </span></td> </tr> </table> </td> diff --git a/phpBB/templates/subSilver/message_body.tpl b/phpBB/templates/subSilver/message_body.tpl index f52f2cb89d..10da9d7734 100644 --- a/phpBB/templates/subSilver/message_body.tpl +++ b/phpBB/templates/subSilver/message_body.tpl @@ -4,34 +4,21 @@ <td align="left" class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></td> </tr> </table> -<table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> +<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> <tr> - <td align="left" colspan="2" class="forumline"> + <th height="25" class="thHead"><b>{MESSAGE_TITLE}</b></th> + </tr> + <tr> + <td class="row1"> <table width="100%" border="0" cellspacing="0" cellpadding="1"> <tr> - <td class="innerline"> - <table width="100%" cellpadding="4" cellspacing="1" border="0"> - <tr> - <th height="25" class="secondary"><b>{MESSAGE_TITLE}</b></th> - </tr> - <tr> - <td class="row1"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> - <tr> - <td> </td> - </tr> - <tr> - <td align="center"><span class="gen">{MESSAGE_TEXT}</span></td> - </tr> - <tr> - <td> </td> - </tr> - </table> - - </td> - </tr> - </table> - </td> + <td> </td> + </tr> + <tr> + <td align="center"><span class="gen">{MESSAGE_TEXT}</span></td> + </tr> + <tr> + <td> </td> </tr> </table> </td> diff --git a/phpBB/templates/subSilver/mini_search.tpl b/phpBB/templates/subSilver/mini_search.tpl new file mode 100644 index 0000000000..b8cc546148 --- /dev/null +++ b/phpBB/templates/subSilver/mini_search.tpl @@ -0,0 +1,162 @@ +<!-- DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" --> +<!-- <html xmlns="http://www.w3.org/1999/xhtml"> --> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> +<meta http-equiv="Content-Style-Type" content="text/css" /> + +<title>{SITENAME} -+- {PAGE_TITLE}</title> +<style type="text/css"> +<!-- +/* subSilver Theme for phpBB2 + * Created by subBlue design + * http://www.subBlue.com + */ + +body { background-color:#E5E5E5; + scrollbar-face-color: #C8D1D7; scrollbar-highlight-color: #EAF0F7; + scrollbar-shadow-color: #95AFC4; scrollbar-3dlight-color: #D6DDE2; + scrollbar-arrow-color: #006699; scrollbar-track-color: #EFEFEF; + scrollbar-darkshadow-color: #7294AF; +} + +font { font-family: Verdana, Arial, Helvetica, sans-serif } +td { font-family: Verdana, Arial, Helvetica, sans-serif } +th { font-family: Verdana, Arial, Helvetica, sans-serif } +P { font-family: Verdana, Arial, Helvetica, sans-serif } +hr { height: 1px; color:#c2cdd6 } + + +/* Forum colours */ +.bodyline { background-color:#FFFFFF; border: #AEBDC4; border-style: solid; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px; border-left-width: 1px } +.forumline { background-color:#FFFFFF; border: 2px #006699 solid } + + +/* Main table cell colours and backgrounds */ +TH { background-color: #1B7CAD; height: 25px; font-size: 11px; line-height : 100%; font-weight: bold; color: #FFB163; background-image: url(templates/subSilver/images/cellpic3.gif) } +TD.tablebg { background-color: #000000 } +TD.cat { background-color: #CBD3D9; height: 28px; background-image: url(templates/subSilver/images/cellpic1.gif) } +TD.row1 { background-color: #EFEFEF } + +TH.thHead,TH.thSides,TH.thTop,TH.thLeft,TH.thRight,TH.thBottom,TH.thCornerL,TH.thCornerR { border: #FFFFFF; border-style: solid; } + +TH.thHead { font-weight : bold; font-size: 12px; height: 25px; border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 0px } +TH.thSides { border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px } +TH.thTop { border-left-width: 0px; border-top-width: 1px; border-right-width: 0px; border-bottom-width: 0px } +TH.thLeft { border-left-width: 1px; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px } +TH.thRight { border-left-width: 0px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px } +TH.thBottom { border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 1px } +TH.thCornerL { border-left-width: 1px; border-top-width: 1px; border-right-width: 0px; border-bottom-width: 0px } +TH.thCornerR { border-left-width: 0px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 0px } + +TD.row3Right { background-color: #c2cdd6; border: #FFFFFF; border-style: solid; border-left-width: 0px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px } + + +/* General normal text */ +.gen { font-size : 12px; color : #000000; } +a.gen { color: #006699; text-decoration: none; } +a:hover.gen { color: #C23030; text-decoration: underline; } + +/* General medium text */ +.genmed { font-size : 11px; color : #000000; } +a.genmed { text-decoration: none; color : #006699; } +a:hover.genmed { text-decoration: underline; color : #C23030; } + + +/* General small */ +.gensmall { font-size : 10px; color : #000000; } +a.gensmall { color: #006699; text-decoration: none; } +a:hover.gensmall { color: #C23030; text-decoration: underline; } + +/* Form elements */ +input,textarea, select { +color : #000000; +font-family : Verdana, Arial, Helvetica, sans-serif; +font-size : 11px; +font-weight : normal; +border-color : #000000; +} + +/* The text input fields background colour */ +input.post, textarea.post, select { +background-color : #FFFFFF; +} + +input { text-indent : 2px; } + +/* The buttons used for bbCode styling in message post */ +input.button { +background-color : #EFEFEF; +color : #000000; +font-family : Verdana, Arial, Helvetica, sans-serif; +font-size : 11px; +} + + +/* The main submit button option */ +input.mainoption { +background-color : #FAFAFA; +font-weight : bold; +} + +/* None bold submit button */ +input.liteoption { +background-color : #FAFAFA; +font-weight : normal; +} + +/* Import the fancy styles for IE only (NS4.x doesn't use the @import function) */ +@import url("templates/subSilver/formIE.css"); + +--> +</style> + +</head> + +<body bgcolor="#E5E5E5" text="#000000" link="#006699" vlink="#5584AA"> + +<script language="javascript" type="text/javascript"> +<!-- +function refresh_username(selected_username) +{ + opener.document.forms['post'].username.value = selected_username; +} +//--> +</script> + +<table width="100%" border="0" cellspacing="0" cellpadding="10" align="center" height="100%"> + <tr> + <td class="bodyline" valign="top"> + <form method="post" name="search" action="{S_SEARCH_ACTION}"> + <table width="100%" border="0" cellspacing="1" cellpadding="4" class="forumline"> + <tr> + <th class="thHead">{L_SEARCH_USERNAME}</th> + </tr> + <tr> + <td valign="top" class="row1"><span class="genmed"><br /> + <input type="text" name="search_author" value="{AUTHOR}" class="post" /> + <input type="submit" name="search" value="{L_SEARCH}" class="liteoption" /> + </span><br /> + <span class="gensmall">Use * as a wildcard</span><br /> + <br /> + <!-- BEGIN select_name --> + <span class="genmed">{L_UPDATE_USERNAME}<br /> + <select name="author_list">{S_AUTHOR_OPTIONS}</select> + <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 /> + <br /> + <!-- END select_name --> + <span class="gen"><a href="javascript:window.close();" class="gen">Close window</a></span> + </td> + </tr> + </table> + </form> +</td> + </tr> +</table> + +</body> +</html> + diff --git a/phpBB/templates/subSilver/modcp_body.tpl b/phpBB/templates/subSilver/modcp_body.tpl index 2343390136..5d573af433 100644 --- a/phpBB/templates/subSilver/modcp_body.tpl +++ b/phpBB/templates/subSilver/modcp_body.tpl @@ -4,64 +4,54 @@ <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a> -> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td> </tr> </table> -<table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> - <tr> - <td align="left" colspan="2" class="forumline"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> - <tr><form method="post" action="{S_MODCP_ACTION}"> - <td class="innerline"> - <table width="100%" cellpadding="4" cellspacing="1" border="0"> - <tr> - <td class="cat" colspan="5" align="center" height="28"><span class="cattitle">{L_MOD_CP}</span> - </td> - </tr> - <tr> - <td class="row3" colspan="5" align="center"><span class="gensmall">{L_MOD_CP_EXPLAIN}</span></td> - </tr> - <tr> - <th width="4%"> </th> - <th> {L_TOPICS} </th> - <th width="8%"> {L_REPLIES} </th> - <th width="17%"> {L_LASTPOST} </th> - <th width="5%"> {L_SELECT} </th> - </tr> - <!-- BEGIN topicrow --> - <tr> - <td class="row1" align="center" valign="middle">{topicrow.FOLDER_IMG}</td> - <td class="row1"> <span class="topictitle"><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a></span></td> - <td class="row2" align="center" valign="middle"><span class="postdetails">{topicrow.REPLIES}</span></td> - <td class="row1" align="center" valign="middle"><span class="postdetails">{topicrow.LAST_POST}</span></td> - <td class="row2" align="center" valign="middle"> - <input type="checkbox" name="preform_op[]" value="{topicrow.TOPIC_ID}" /> - </td> - </tr> - <!-- END topicrow --> - <tr align="right"> - <td class="cat" colspan="5" height="28"> {S_HIDDEN_FIELDS} - <input type="submit" name="delete" class="liteoption" value="{L_DELETE}" /> - - <input type="submit" name="move" class="liteoption" value="{L_MOVE}" /> - - <input type="submit" name="lock" class="liteoption" value="{L_LOCK}" /> - - <input type="submit" name="unlock" class="liteoption" value="{L_UNLOCK}" /> - </td> - </tr> - </table> - </td> - </form></tr> - </table> - </td> - </tr> -</table> -<table width="100%" cellspacing="2" border="0" align="center" cellpadding="2"> +<form method="post" action="{S_MODCP_ACTION}"> + <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> + <tr> + <td class="catHead" colspan="5" align="center" height="28"><span class="cattitle">{L_MOD_CP}</span> + </td> + </tr> + <tr> + <td class="spaceRow" colspan="5" align="center"><span class="gensmall">{L_MOD_CP_EXPLAIN}</span></td> + </tr> + <tr> + <th width="4%" class="thLeft"> </th> + <th> {L_TOPICS} </th> + <th width="8%"> {L_REPLIES} </th> + <th width="17%"> {L_LASTPOST} </th> + <th width="5%" class="thRight"> {L_SELECT} </th> + </tr> + <!-- BEGIN topicrow --> + <tr> + <td class="row1" align="center" valign="middle">{topicrow.FOLDER_IMG}</td> + <td class="row1"> <span class="topictitle"><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a></span></td> + <td class="row2" align="center" valign="middle"><span class="postdetails">{topicrow.REPLIES}</span></td> + <td class="row1" align="center" valign="middle"><span class="postdetails">{topicrow.LAST_POST}</span></td> + <td class="row2" align="center" valign="middle"> + <input type="checkbox" name="preform_op[]" value="{topicrow.TOPIC_ID}" /> + </td> + </tr> + <!-- END topicrow --> + <tr align="right"> + <td class="catBottom" colspan="5" height="29"> {S_HIDDEN_FIELDS} + <input type="submit" name="delete" class="liteoption" value="{L_DELETE}" /> + + <input type="submit" name="move" class="liteoption" value="{L_MOVE}" /> + + <input type="submit" name="lock" class="liteoption" value="{L_LOCK}" /> + + <input type="submit" name="unlock" class="liteoption" value="{L_UNLOCK}" /> + </td> + </tr> + </table> + <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2"> <tr> <td align="left" valign="middle"><span class="nav">{L_PAGE} <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></span></td> - <td align="right" valign="top" nowrap><span class="nav">{PAGINATION}</span> + <td align="right" valign="top" nowrap="nowrap"><span class="nav">{PAGINATION}</span> <span class="gensmall"><br /> {S_TIMEZONE}</span></td> </tr> </table> +</form> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td align="right">{JUMPBOX}</td> diff --git a/phpBB/templates/subSilver/modcp_move.tpl b/phpBB/templates/subSilver/modcp_move.tpl index 0f350a5459..93cc1dc057 100644 --- a/phpBB/templates/subSilver/modcp_move.tpl +++ b/phpBB/templates/subSilver/modcp_move.tpl @@ -5,45 +5,32 @@ <td align="left" class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></td> </tr> </table> - <table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> + <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> <tr> - <td align="left" colspan="2" class="forumline"> + <th height="25" class="thHead"><b>{MESSAGE_TITLE}</b></th> + </tr> + <tr> + <td class="row1"> <table width="100%" border="0" cellspacing="0" cellpadding="1"> <tr> - <td class="innerline"> - <table width="100%" cellpadding="4" cellspacing="1" border="0"> - <tr> - <th height="25" class="secondary"><b>{MESSAGE_TITLE}</b></th> - </tr> - <tr> - <td class="row1"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> - <tr> - <td> </td> - </tr> - <tr> - <td align="center"><span class="gen">{L_MOVE_TO_FORUM} - {S_FORUM_BOX}<br /> - <br /> - {MESSAGE_TEXT}</span><br /> - <br /> - {S_HIDDEN_FIELDS} - <input type="submit" name="confirm" value="{L_YES}" /> - - <input type="submit" name="cancel" value="{L_NO}" /> - </td> - </tr> - <tr> - <td> </td> - </tr> - </table> - </td> - </tr> - </table> + <td> </td> + </tr> + <tr> + <td align="center"><span class="gen">{L_MOVE_TO_FORUM} {S_FORUM_BOX}<br /> + <br /> + {MESSAGE_TEXT}</span><br /> + <br /> + {S_HIDDEN_FIELDS} + <input type="submit" name="confirm" value="{L_YES}" /> + + <input type="submit" name="cancel" value="{L_NO}" /> </td> </tr> + <tr> + <td> </td> + </tr> </table> </td> </tr> </table> - </form> +</form> diff --git a/phpBB/templates/subSilver/modcp_split.tpl b/phpBB/templates/subSilver/modcp_split.tpl index 342dfd888f..13a2a1a0e4 100644 --- a/phpBB/templates/subSilver/modcp_split.tpl +++ b/phpBB/templates/subSilver/modcp_split.tpl @@ -6,90 +6,76 @@ -> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td> </tr> </table> - <table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> + <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> <tr> - <td align="left" colspan="2" class="forumline"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> + <th height="25" class="thHead" colspan="3">{L_SPLIT_TOPIC}</th> + </tr> + <tr> + <td class="row2" colspan="3" align="center"><span class="gensmall">{L_SPLIT_TOPIC_EXPLAIN}</span></td> + </tr> + <tr> + <td class="row1" nowrap="nowrap"><span class="gen">{L_SPLIT_SUBJECT}</span></td> + <td class="row2" colspan="2"><span class="courier"> + <input type="text" size="35" style="width: 350px" maxlength="100" name="subject" class="post" /> + </span></td> + </tr> + <tr> + <td class="row1" nowrap="nowrap"><span class="gen">{L_SPLIT_FORUM}</span></td> + <td class="row2" colspan="2"><span class="courier">{FORUM_INPUT}</span></td> + </tr> + <tr> + <td class="cat" colspan="3" height="28"> + <table width="60%" cellspacing="0" cellpadding="0" border="0" align="center"> + <tr> + <td width="50%" align="center"> + <input class="liteoption" type="submit" name="split_type_all" value="{L_SPLIT_POSTS}" /> + </td> + <td width="50%" align="center"> + <input class="liteoption" type="submit" name="split_type_beyond" value="{L_SPLIT_AFTER}" /> + </td> + </tr> + </table> + </td> + </tr> + <tr> + <th class="thLeft">{L_AUTHOR}</th> + <th>{L_MESSAGE}</th> + <th class="thRight">{L_SELECT}</th> + </tr> + <!-- BEGIN postrow --> + <tr> + <td align="left" valign="top" class="{postrow.ROW_CLASS}"><span class="name"><a name="{postrow.U_POST_ID}"></a>{postrow.POSTER_NAME}</span></td> + <td width="100%" valign="top" class="{postrow.ROW_CLASS}"> + <table width="100%" cellspacing="0" cellpadding="3" border="0"> + <tr> + <td valign="middle"><img src="images/icon_minipost.gif" alt="Post image icon"><span class="postdetails">{L_POSTED}: + {postrow.POST_DATE} {L_POST_SUBJECT}: {postrow.POST_SUBJECT}</span></td> + </tr> + <tr> + <td valign="top"> + <hr size="1" /> + <span class="postbody">{postrow.MESSAGE}</span></td> + </tr> + </table> + </td> + <td width="5%" align="center" class="{postrow.ROW_CLASS}"> + <input type="checkbox" name="post_id_list[]" value="{postrow.POST_ID}" /> + </td> + </tr> + <tr> + <td colspan="3" height="1" class="row3"><img src="templates/subSilver/images/spacer.gif" width="1" height="1" alt="."></td> + </tr> + <!-- END postrow --> + <tr> + <td class="catBottom" colspan="3" height="28"> + <table width="60%" cellspacing="0" cellpadding="0" border="0" align="center"> <tr> - <td class="innerline"> - <table width="100%" cellpadding="4" cellspacing="1" border="0"> - <tr> - <th height="25" class="secondary" colspan="3">{L_SPLIT_TOPIC}</th> - </tr> - <tr> - <td class="row2" colspan="3" align="center"><span class="gensmall">{L_SPLIT_TOPIC_EXPLAIN}</span></td> - </tr> - <tr> - <td class="row1" nowrap><span class="gen">{L_SPLIT_SUBJECT}</span></td> - <td class="row2" colspan="2"><span class="courier"> - <input type="text" size="35" style="width: 350px" maxlength="100" name="subject" class="post" /> - </span></td> - </tr> - <tr> - <td class="row1" nowrap><span class="gen">{L_SPLIT_FORUM}</span></td> - <td class="row2" colspan="2"><span class="courier">{FORUM_INPUT}</span></td> - </tr> - <tr> - <td class="cat" colspan="3" height="28"> - <table width="60%" cellspacing="0" cellpadding="0" border="0" align="center"> - <tr> - <td width="50%" align="center"> - <input class="liteoption" type="submit" name="split_type_all" value="{L_SPLIT_POSTS}" /> - </td> - <td width="50%" align="center"> - <input class="liteoption" type="submit" name="split_type_beyond" value="{L_SPLIT_AFTER}" /> - </td> - </tr> - </table> - </td> - </tr> - <tr> - <th>{L_AUTHOR}</th> - <th>{L_MESSAGE}</th> - <th>{L_SELECT}</th> - </tr> - <!-- BEGIN postrow --> - <tr> - <td align="left" valign="top" class="{postrow.ROW_CLASS}"><span class="name"><a name="{postrow.U_POST_ID}"></a>{postrow.POSTER_NAME}</span></td> - <td width="100%" valign="top" class="{postrow.ROW_CLASS}"> - <table width="100%" cellspacing="0" cellpadding="3" border="0"> - <tr> - <td valign="middle"><img src="images/icon_minipost.gif" alt="Post image icon"><span class="postdetails">{L_POSTED}: - {postrow.POST_DATE} {L_POST_SUBJECT}: - {postrow.POST_SUBJECT}</span></td> - </tr> - <tr> - <td valign="top"> - <hr size="1" /> - <span class="postbody">{postrow.MESSAGE}</span></td> - </tr> - </table> - - </td> - <td width="5%" align="center" class="{postrow.ROW_CLASS}"> - <input type="checkbox" name="post_id_list[]" value="{postrow.POST_ID}" /> - </td> - </tr> - <tr> - <td colspan="3" height="1" class="row3"><img src="templates/subSilver/images/spacer.gif" width="1" height="1" alt="."></td> - </tr> - <!-- END postrow --> - <tr> - <td class="cat" colspan="3" height="28"> - <table width="60%" cellspacing="0" cellpadding="0" border="0" align="center"> - <tr> - <td width="50%" align="center"> - <input class="liteoption" type="submit" name="split_type_all" value="{L_SPLIT_POSTS}" /> - </td> - <td width="50%" align="center"> - <input class="liteoption" type="submit" name="split_type_beyond" value="{L_SPLIT_AFTER}" /> - {S_HIDDEN_FIELDS} </td> - </tr> - </table> - </td> - </tr> - </table> + <td width="50%" align="center"> + <input class="liteoption" type="submit" name="split_type_all" value="{L_SPLIT_POSTS}" /> </td> + <td width="50%" align="center"> + <input class="liteoption" type="submit" name="split_type_beyond" value="{L_SPLIT_AFTER}" /> + {S_HIDDEN_FIELDS} </td> </tr> </table> </td> diff --git a/phpBB/templates/subSilver/modcp_viewip.tpl b/phpBB/templates/subSilver/modcp_viewip.tpl index 8f4f7ba3ed..f8628762ca 100644 --- a/phpBB/templates/subSilver/modcp_viewip.tpl +++ b/phpBB/templates/subSilver/modcp_viewip.tpl @@ -4,66 +4,54 @@ <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> </tr> </table> -<table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> +<table width="100%" cellpadding="3" cellspacing="1" border="0" class="forumline"> <tr> - <td align="left" colspan="2" class="forumline"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> + <th height="25" class="thHead">{L_IP_INFO}</th> + </tr> + <tr> + <td class="cat" height="28"><span class="cattitle"><b>{L_THIS_POST_IP}</b></span></td> + </tr> + <tr> + <td class="row1"> + <table width="100%" cellspacing="0" cellpadding="0" border="0"> + <tr> + <td> <span class="gen">{IP}</span></td> + <td align="right"><span class="gen">[ <a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a> + ] </span></td> + </tr> + </table> + </td> + </tr> + <tr> + <td class="cat" height="28"><span class="cattitle"><b>{L_OTHER_USERS}</b></span></td> + </tr> + <!-- BEGIN userrow --> + <tr> + <td class="{userrow.ROW_CLASS}"> + <table width="100%" cellspacing="0" cellpadding="0" border="0"> + <tr> + <td> <span class="gen"><a href="{userrow.U_PROFILE}">{userrow.USERNAME}</a></span></td> + <td align="right"><a href="%7Buserrow.U_SEARCHPOSTS%7D"><img src="{SEARCH_IMG}" border="0" alt="{L_SEARCH_POSTS}" /></a> + </td> + </tr> + </table> + </td> + </tr> + <!-- END userrow --> + <tr> + <td class="cat" height="28"><span class="cattitle"><b>{L_OTHER_IPS}</b></span></td> + </tr> + <!-- BEGIN iprow --> + <tr> + <td class="{iprow.ROW_CLASS}"> + <table width="100%" cellspacing="0" cellpadding="0" border="0"> <tr> - <td class="innerline"> - <table width="100%" cellpadding="3" cellspacing="1" border="0"> - <tr> - <th height="25" class="secondary">{L_IP_INFO}</th> - </tr> - <tr> - <td class="cat" height="28"><span class="cattitle"><b>{L_THIS_POST_IP}</b></span></td> - </tr> - <tr> - <td class="row1"> - <table width="100%" cellspacing="0" cellpadding="0" border="0"> - <tr> - <td> <span class="gen">{IP}</span></td> - <td align="right"><span class="gen">[ <a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a> - ] </span></td> - </tr> - </table> - </td> - </tr> - <tr> - <td class="cat" height="28"><span class="cattitle"><b>{L_OTHER_USERS}</b></span></td> - </tr> - <!-- BEGIN userrow --> - <tr> - <td class="{userrow.ROW_CLASS}"> - <table width="100%" cellspacing="0" cellpadding="0" border="0"> - <tr> - <td> <span class="gen"><a href="{userrow.U_PROFILE}">{userrow.USERNAME}</a></span></td> - <td align="right"><a href="%7Buserrow.U_SEARCHPOSTS%7D"><img src="{SEARCH_IMG}" border="0" alt="{L_SEARCH_POSTS}" /></a> - </td> - </tr> - </table> - </td> - </tr> - <!-- END userrow --> - <tr> - <td class="cat" height="28"><span class="cattitle"><b>{L_OTHER_IPS}</b></span></td> - </tr> - <!-- BEGIN iprow --> - <tr> - <td class="{iprow.ROW_CLASS}"> - <table width="100%" cellspacing="0" cellpadding="0" border="0"> - <tr> - <td> <span class="gen">{iprow.IP}</span></td> - <td align="right"><span class="gen">[ <a href="{iprow.U_LOOKUP_IP}">{L_LOOKUP_IP}</a> - ] </span></td> - </tr> - </table> - </td> - </tr> - <!-- END iprow --> - </table> - </td> + <td> <span class="gen">{iprow.IP}</span></td> + <td align="right"><span class="gen">[ <a href="{iprow.U_LOOKUP_IP}">{L_LOOKUP_IP}</a> + ] </span></td> </tr> </table> </td> </tr> + <!-- END iprow --> </table> diff --git a/phpBB/templates/subSilver/overall_footer.tpl b/phpBB/templates/subSilver/overall_footer.tpl index 745f1b6a74..d883f569d2 100644 --- a/phpBB/templates/subSilver/overall_footer.tpl +++ b/phpBB/templates/subSilver/overall_footer.tpl @@ -18,9 +18,6 @@ // --> Powered by phpBB {PHPBB_VERSION} © 2001 <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB Group</a></span></div> - </td> - </tr> - </table> </td> </tr> </table> diff --git a/phpBB/templates/subSilver/overall_header.tpl b/phpBB/templates/subSilver/overall_header.tpl index c17d641dcb..64416b665e 100644 --- a/phpBB/templates/subSilver/overall_header.tpl +++ b/phpBB/templates/subSilver/overall_header.tpl @@ -6,9 +6,15 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> <meta http-equiv="Content-Style-Type" content="text/css" /> +<style type="text/css"> +<!-- +--> +</style> + + {META} -<title>{PAGE_TITLE}</title> +<title>{SITENAME} :: {PAGE_TITLE}</title> <style type="text/css"> <!-- /* subSilver Theme for phpBB2 @@ -16,39 +22,61 @@ * http://www.subBlue.com */ -body { background-color:{T_BODY_BGCOLOR}; +body { background-color:{T_BODY_BGCOLOR}; scrollbar-face-color: #C8D1D7; scrollbar-highlight-color: #EAF0F7; scrollbar-shadow-color: #95AFC4; scrollbar-3dlight-color: #D6DDE2; scrollbar-arrow-color: #006699; scrollbar-track-color: #EFEFEF; scrollbar-darkshadow-color: #7294AF; } -font { font-family: Verdana, Arial, Helvetica, sans-serif; } -td { font-family: Verdana, Arial, Helvetica, sans-serif; } -th { font-family: Verdana, Arial, Helvetica, sans-serif; } -P { font-family: Verdana, Arial, Helvetica, sans-serif; font-size:12px; } -hr { height:1px;color:{T_TR_COLOR3};} +font { font-family: Verdana, Arial, Helvetica, sans-serif } +td { font-family: Verdana, Arial, Helvetica, sans-serif } +th { font-family: Verdana, Arial, Helvetica, sans-serif } +P { font-family: Verdana, Arial, Helvetica, sans-serif } +hr { height: 1px; color:{T_TR_COLOR3} } /* Forum colours */ -.bodyline { background-color:{T_TD_COLOR1}; } -.forumline { background-color:{T_TD_COLOR2}; } -.innerline { background-color:{T_TD_COLOR3}; } -.innerarea { background-color:#FFFFFF; } - -/* Table cell colours and backgrounds */ -TH {background-color:{T_TH_COLOR3};font-size:11px;line-height : 100%;font-weight:bold; color:#FFB163; background-image: url(templates/subSilver/images/cellpic3.gif);} -TH.secondary {font-size:12px;} -TD.tablebg {background-color:#000000} -TD.cat {background-color:{T_TH_COLOR1};background-image: url(templates/subSilver/images/cellpic1.gif);} -TD.row1 {background-color:{T_TR_COLOR1};} -TD.row2 {background-color:{T_TR_COLOR2};} -TD.row3 {background-color:{T_TR_COLOR3};} -TD.rowpic {background-color:#FFFFFF; background-image: url(templates/subSilver/images/cellpic2.jpg); background-repeat: repeat-y;} -TD.icqback {background-image: url(templates/subSilver/images/icon_icq_add.gif);} +.bodyline { background-color:#FFFFFF; border: {T_TD_COLOR1}; border-style: solid; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px; border-left-width: 1px } +.forumline { background-color:#FFFFFF; border: 2px #006699 solid } + + +/* Main table cell colours and backgrounds */ +TH { background-color: {T_TH_COLOR3}; height: 25px; font-size: 11px; line-height : 100%; font-weight: bold; color: #FFB163; background-image: url(templates/subSilver/images/cellpic3.gif) } +TD.tablebg { background-color: #000000 } +TD.cat { background-color: {T_TH_COLOR1}; height: 28px; background-image: url(templates/subSilver/images/cellpic1.gif) } +TD.row1 { background-color: {T_TR_COLOR1} } +TD.row2 { background-color: {T_TR_COLOR2} } +TD.row3 { background-color: {T_TR_COLOR3} } +TD.spaceRow { background-color: {T_TR_COLOR3}; border: #FFFFFF; border-style: solid; border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px } +TD.rowpic { background-color: #FFFFFF; background-image: url(templates/subSilver/images/cellpic2.jpg); background-repeat: repeat-y } +td.icqback { background-image: url(templates/subSilver/images/icon_icq_add.gif); background-repeat: no-repeat } + + +/* Setting additional nice borders for the main table cells */ +TD.catHead,TD.catSides,TD.catLeft,TD.catRight,TD.catBottom { background-color:{T_TH_COLOR1}; height: 28px; background-image: url(templates/subSilver/images/cellpic1.gif); border: #FFFFFF; border-style: solid; } + +TD.catHead { height: 29px; border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 0px } +TD.catSides { border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px } +TD.catLeft { border-left-width: 1px; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px } +TD.catRight { border-left-width: 0px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px } +TD.catBottom { height: 29px; border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 1px } + +TH.thHead,TH.thSides,TH.thTop,TH.thLeft,TH.thRight,TH.thBottom,TH.thCornerL,TH.thCornerR { border: #FFFFFF; border-style: solid; } + +TH.thHead { font-weight : bold; font-size: 12px; height: 25px; border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 0px } +TH.thSides { border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px } +TH.thTop { border-left-width: 0px; border-top-width: 1px; border-right-width: 0px; border-bottom-width: 0px } +TH.thLeft { border-left-width: 1px; border-top-width: 0px; border-right-width: 0px; border-bottom-width: 0px } +TH.thRight { border-left-width: 0px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px } +TH.thBottom { border-left-width: 1px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 1px } +TH.thCornerL { border-left-width: 1px; border-top-width: 1px; border-right-width: 0px; border-bottom-width: 0px } +TH.thCornerR { border-left-width: 0px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 0px } + +TD.row3Right { background-color: {T_TR_COLOR3}; border: #FFFFFF; border-style: solid; border-left-width: 0px; border-top-width: 0px; border-right-width: 1px; border-bottom-width: 0px } /* The largest text used in the index page title and toptic title etc. */ -.titlemedium { font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; font-size : 22px; font-weight : bold; text-decoration : none; line-height : 120%; color : #000000;} +.maintitle { font-family: "Trebuchet MS", Verdana, Arial, Helvetica, sans-serif; font-size : 22px; font-weight : bold; text-decoration : none; line-height : 120%; color : #000000;} /* General normal text */ @@ -112,14 +140,21 @@ a:hover.postdetails { color: #C23030; text-decoration: underline; } /* The content of the posts (body of text) */ -.postbody { font-size : 12px; line-height : 150%; color : #000000; } -a.postbody { text-decoration: none; color : #0176BC; } -a:hover.postbody { text-decoration: underline; color : #C23030; } +.postbody { font-size : 12px; } + +a.postbody, a.posttiny, a.postsmall, a.postlarge, a.posthuge { text-decoration: none; color : #0176BC } +a:hover.postbody, a:hover.posttiny, a:hover.postsmall, a:hover.postlarge, a:hover.posthuge{ text-decoration: underline; color : #C23030 } /* Quote Code (currently not used) */ -.code { font-family:Courier, Courier New; font-size:11px; color: #006600; line-height: 150%; } -.quot { font-family:Verdana, Arial; font-size:11px; color: #444444; line-height: 150%; } +.code { font-family: Courier, Courier New; font-size: 11px; color: #006600; + background-color: #FAFAFA; border: {T_TR_COLOR3}; border-style: solid; + border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px + } +.quote { font-family: Verdana, Arial; font-size: 11px; color: #444444; line-height: 125%; + background-color: #FAFAFA; border: {T_TR_COLOR3}; border-style: solid; + border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px + } .signature { font-size : 11px; text-decoration : none; line-height : 150%; color : #333366; } .editedby { font-size : 10px; line-height : 100%; color : #333333; } @@ -151,13 +186,13 @@ font-size : 11px; /* The main submit button option */ input.mainoption { -background-color : {T_TR_COLOR1}; +background-color : #FAFAFA; font-weight : bold; } /* None bold submit button */ input.liteoption { -background-color : {T_TR_COLOR1}; +background-color : #FAFAFA; font-weight : normal; } @@ -176,21 +211,19 @@ a.copyright:hover { color: #000000; text-decoration: underline;} </head> <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="1" align="center"> +<span class="gen"><a name="top"></a></span><table width="100%" border="0" cellspacing="0" cellpadding="10" align="center"> <tr> <td class="bodyline"> - <table width="100%" border="0" cellspacing="0" cellpadding="10" class="innerarea"> - <tr> - <td> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> - <td valign="top"><a href="{U_INDEX}"><img src="templates/subSilver/images/logo_phpBB.gif" border="0" alt="{L_TOPIC_POST}" width="200" height="89" /></a> - </td> + + <td> <a href="{U_INDEX}"><img src="templates/subSilver/images/logo_phpBB.gif" border="0" alt="Forum Home" vspace="1" /></a> + </td> - <td align="center" width="100%" valign="middle"> <span class="titlemedium"><b>phpBB.com - - Forums</b></span><br /> - <span class="gen">Text about the forum<br /> + + <td align="center" width="100%" valign="middle"><span class="maintitle">{SITENAME}</span><br /> + <span class="gen">Home to phpBB2<br /> </span> <table cellspacing="0" cellpadding="2" border="0"> <tr> diff --git a/phpBB/templates/subSilver/posting_body.tpl b/phpBB/templates/subSilver/posting_body.tpl index 3d10dad57b..71de4d50e2 100644 --- a/phpBB/templates/subSilver/posting_body.tpl +++ b/phpBB/templates/subSilver/posting_body.tpl @@ -1,9 +1,11 @@ - <!-- 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> --> +<!-- <script type="text/javascript" language="javascript" src=spellcheck/spch.js></script> --> <!-- End spellchecker option --> + + + <script language="JavaScript" type="text/javascript"> <!-- // bbCode control by @@ -21,7 +23,8 @@ o_help = "Ordered list: [list=]text[/list] (alt+o)"; p_help = "Insert image: [img]http://image_url[/img] (alt+p)"; w_help = "Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url] (alt+w)"; a_help = "Close all open bbCode tags"; - +s_help = "Font color: [color=red]text[/color] Tip: you can also use color=#FF0000"; +f_help = "Font size: [size=x-small]small text[/size]"; // Define the bbCode tags bbcode = new Array(); @@ -97,6 +100,25 @@ function emoticon(theSmilie) { } +function bbfontstyle(formObj, bbopen, bbclose) { + if ((parseInt(navigator.appVersion) >= 4) && (navigator.appName == "Microsoft Internet Explorer")) { + theSelection = document.selection.createRange().text; + if (!theSelection) { + formObj.message.value += bbopen + bbclose; + formObj.message.focus(); + return; + } + document.selection.createRange().text = bbopen + theSelection + bbclose; + formObj.message.focus(); + return; + } else { + formObj.message.value += bbopen + bbclose; + formObj.message.focus(); + return; + } +} + + function bbstyle(formObj, bbnumber) { donotinsert = false; @@ -165,7 +187,6 @@ function bbstyle(formObj, bbnumber) { //--> </script> - <form action="{S_POST_ACTION}" method="post" name="post" onSubmit="return checkForm(this)"> <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> @@ -173,204 +194,237 @@ function bbstyle(formObj, bbnumber) { -> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td> </tr> </table> - <table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> + <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline"> + <tr> + <th class="thHead" colspan="2" height="25"><b>{L_POST_A}</b></th> + </tr> + <!-- BEGIN 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> + <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="50" size="20" tabindex="1" value="{USERNAME}" /> + + <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('privmsg.php?mode=searchuser', '_phpbbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" /> + </span></td> + </tr> + <!-- END privmsg_extensions --> + <tr> + <td class="row1" width="22%"><span class="gen"><b>{L_SUBJECT}</b></span></td> + <td class="row2" width="78%"> <span class="gen"> + <input type="text" name="subject" size="45" maxlength="100" style="width:450px" tabindex="2" class="post" value="{SUBJECT}" /> + </span> </td> + </tr> <tr> - <td align="left" colspan="2" class="forumline"> + <td class="row1" valign="top"> <table width="100%" border="0" cellspacing="0" cellpadding="1"> <tr> - <td class="innerline"> - <table border="0" cellpadding="3" cellspacing="1" width="100%"> - <tr> - <th class="secondary" colspan="2" height="25"><b>{L_POST_A}</b></th> + <td><span class="gen"><b>{L_MESSAGE_BODY}</b></span> </td> + </tr> + <tr> + <td valign="middle" align="center"> <br /> + <table width="100" border="0" cellspacing="0" cellpadding="5"> + <tr align="center"> + <td colspan="4" class="gensmall"><b>Emoticons</b></td> </tr> - <!-- BEGIN anon_user --> - <tr> - <td class="row1"><span class="gen"><b>{L_USERNAME}</b></span></td> - <td class="row2"><span class="gen"><input type="text" class="post" tabindex="1" name="username" size="25" maxlength="25" value="{USERNAME}" /></span></td> + <tr align="center" valign="middle"> + <td><a href="javascript:emoticon(':)')"><img src="images/smiles/icon_smile.gif" width="15" height="15" border="0" alt="Smile" /></a></td> + <td><a href="javascript:emoticon(':D')"><img src="images/smiles/icon_biggrin.gif" width="15" height="15" border="0" alt="Big grin" /></a></td> + <td><a href="javascript:emoticon(':lol:')"> <img src="images/smiles/icon_lol.gif" width="15" height="15" border="0" alt="Laugh" /></a></td> + <td><a href="javascript:emoticon(';)')"><img src="images/smiles/icon_wink.gif" width="15" height="15" border="0" alt="Wink" /></a></td> </tr> - <!-- END anon_user --> - <tr> - <td class="row1" width="22%"><span class="gen"><b>{L_SUBJECT}</b></span></td> - <td class="row2" width="78%"> <span class="gen"> - <input type="text" name="subject" size="45" maxlength="100" style="width:450px" tabindex="2" class="post" value="{SUBJECT}" /> - </span> </td> + <tr align="center" valign="middle"> + <td><a href="javascript:emoticon(':|')"><img src="images/smiles/icon_neutral.gif" width="15" height="15" border="0" alt="Neutral" /></a></td> + <td><a href="javascript:emoticon(':(')"><img src="images/smiles/icon_sad.gif" width="15" height="15" border="0" alt="Sad" /></a></td> + <td><a href="javascript:emoticon(':?')"><img src="images/smiles/icon_confused.gif" width="15" height="15" border="0" alt="Uncertain" /></a></td> + <td><a href="javascript:emoticon(':o')"><img src="images/smiles/icon_eek.gif" width="15" height="15" border="0" alt="Surprise" /></a></td> </tr> - <tr> - <td class="row1" valign="top"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> - <tr> - <td><span class="gen"><b>{L_MESSAGE_BODY}</b></span> </td> - </tr> - <tr> - <td valign="middle" align="center"> <br /> - <table width="100" border="0" cellspacing="0" cellpadding="5"> - <tr align="center"> - <td colspan="4" class="gensmall"><b>Emoticons</b></td> - </tr> - <tr align="center" valign="middle"> - <td><a href="javascript:emoticon(':)')"><img src="images/smiles/icon_smile.gif" width="15" height="15" border="0" alt="Smile" /></a></td> - <td><a href="javascript:emoticon(':D')"><img src="images/smiles/icon_biggrin.gif" width="15" height="15" border="0" alt="Big grin" /></a></td> - <td><a href="javascript:emoticon(':lol:')"> <img src="images/smiles/icon_lol.gif" width="15" height="15" border="0" alt="Laugh" /></a></td> - <td><a href="javascript:emoticon(';)')"><img src="images/smiles/icon_wink.gif" width="15" height="15" border="0" alt="Wink" /></a></td> - </tr> - <tr align="center" valign="middle"> - <td><a href="javascript:emoticon(':|')"><img src="images/smiles/icon_neutral.gif" width="15" height="15" border="0" alt="Neutral" /></a></td> - <td><a href="javascript:emoticon(':(')"><img src="images/smiles/icon_sad.gif" width="15" height="15" border="0" alt="Sad" /></a></td> - <td><a href="javascript:emoticon(':?')"><img src="images/smiles/icon_confused.gif" width="15" height="15" border="0" alt="Uncertain" /></a></td> - <td><a href="javascript:emoticon(':o')"><img src="images/smiles/icon_eek.gif" width="15" height="15" border="0" alt="Surprise" /></a></td> - </tr> - <tr align="center" valign="middle"> - <td><a href="javascript:emoticon(':roll:')"><img src="images/smiles/icon_rolleyes.gif" width="15" height="15" border="0" alt="Roll eyes" /></a></td> - <td><a href="javascript:emoticon('8)')"><img src="images/smiles/icon_cool.gif" width="15" height="15" border="0" alt="Cool!" /></a></td> - <td><a href="javascript:emoticon(':p')"><img src="images/smiles/icon_razz.gif" width="15" height="15" border="0" alt="Razz" /></a></td> - <td><a href="javascript:emoticon(':oops:')"><img src="images/smiles/icon_redface.gif" width="15" height="15" border="0" alt="Embarassed" /></a></td> - </tr> - <tr align="center" valign="middle"> - <td><a href="javascript:emoticon(':evil:')"><img src="images/smiles/icon_evil.gif" width="15" height="15" border="0" alt="Evil" /></a></td> - <td><a href="javascript:emoticon(':x')"><img src="images/smiles/icon_mad.gif" width="15" height="15" border="0" alt="Mad" /></a></td> - <td><a href="javascript:emoticon(':cry:')"><img src="images/smiles/icon_cry.gif" width="15" height="15" border="0" alt="Cry" /></a></td> - <td><a href="javascript:emoticon(':o')"><img src="images/smiles/icon_surprised.gif" width="15" height="15" border="0" alt="Shock" /></a></td> - </tr> - <tr align="center" valign="middle"> - <td><a href="javascript:emoticon(':idea:')"><img src="images/smiles/icon_idea.gif" width="15" height="15" border="0" alt="Idea" /></a></td> - <td><a href="javascript:emoticon(':?')"><img src="images/smiles/icon_question.gif" width="15" height="15" border="0" alt="Question" /></a></td> - <td><a href="javascript:emoticon(':!')"><img src="images/smiles/icon_exclaim.gif" width="15" height="15" border="0" alt="Exclaim" /></a></td> - <td><a href="javascript:emoticon(':arrow:')"><img src="images/smiles/icon_arrow.gif" width="15" height="15" border="0" alt="Arrow" /></a></td> - </tr> - </table> - </td> - </tr> - </table> - </td> - <td class="row2" valign="top"><span class="gen"> - <table width="450" border="0" cellspacing="0" cellpadding="2"> - <tr align="center" valign="middle"> - <td><span class="genmed"> - <input type="button" class="button" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onClick="bbstyle(this.form,0)" onmouseover="helpline('b')" /> - </span></td> - <td><span class="genmed"> - <input type="button" class="button" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onClick="bbstyle(this.form,2)" onmouseover="helpline('i')" /> - </span></td> - <td><span class="genmed"> - <input type="button" class="button" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onClick="bbstyle(this.form,4)" onMouseOver="helpline('u')" /> - </span></td> - <td><span class="genmed"> - <input type="button" class="button" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onClick="bbstyle(this.form,6)" onmouseover="helpline('q')" /> - </span></td> - <td><span class="genmed"> - <input type="button" class="button" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onClick="bbstyle(this.form,8)" onmouseover="helpline('c')" /> - </span></td> - <td><span class="genmed"> - <input type="button" class="button" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onClick="bbstyle(this.form,10)" onmouseover="helpline('l')" /> - </span></td> - <td><span class="genmed"> - <input type="button" class="button" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onClick="bbstyle(this.form,12)" onmouseover="helpline('o')" /> - </span></td> - <td><span class="genmed"> - <input type="button" class="button" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onClick="bbstyle(this.form,14)" onmouseover="helpline('p')" /> - </span></td> - <td><span class="genmed"> - <input type="button" class="button" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onClick="bbstyle(this.form,16)" onmouseover="helpline('w')" /> - </span></td> - </tr> - <tr> - <td colspan="9"> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td><span class="gensmall"> - <input type="text" name="helpbox" size="35" maxlength="100" style="width:370px; font-size:10px" class="helpline" value="Tip: Styles can be applied quickly to selected text" /></span></td> - <td nowrap><span class="gensmall"><a href="javascript:bbstyle(document.post,-1)" class="genmed" onMouseOver="helpline('a')">Close Tags</a></span></td> - </tr> - </table> - </td> - </tr> - <tr> - <td colspan="9"><span class="gen"> - <textarea name="message" rows="15" cols="35" wrap="virtual" style="width:450px" tabindex="3" class="post">{MESSAGE}</textarea> - </span></td> - </tr> - </table> - </span></td> + <tr align="center" valign="middle"> + <td><a href="javascript:emoticon(':roll:')"><img src="images/smiles/icon_rolleyes.gif" width="15" height="15" border="0" alt="Roll eyes" /></a></td> + <td><a href="javascript:emoticon('8)')"><img src="images/smiles/icon_cool.gif" width="15" height="15" border="0" alt="Cool!" /></a></td> + <td><a href="javascript:emoticon(':p')"><img src="images/smiles/icon_razz.gif" width="15" height="15" border="0" alt="Razz" /></a></td> + <td><a href="javascript:emoticon(':oops:')"><img src="images/smiles/icon_redface.gif" width="15" height="15" border="0" alt="Embarassed" /></a></td> </tr> - <tr> - <td class="row1" valign="top"><span class="gen"><b>{L_OPTIONS}</b></span><br /> - <span class="gensmall">{L_HTML_IS} <u>{HTML_STATUS}</u><br /> - {L_BBCODE_IS} <u>{BBCODE_STATUS}</u><br /> - {L_SMILIES_ARE} <u>{SMILIES_STATUS}</u></span></td> - <td class="row2"><span class="gen"> </span> - <table cellspacing="0" cellpadding="1" border="0"> - <!-- BEGIN html_checkbox --> - <tr> - <td> - <input type="checkbox" name="disable_html" {S_HTML_CHECKED} /> - </td> - <td><span class="gen">{L_DISABLE_HTML}</span></td> - </tr> - <!-- END html_checkbox --> - <!-- BEGIN bbcode_checkbox --> - <tr> - <td> - <input type="checkbox" name="disable_bbcode" {S_BBCODE_CHECKED} /> - </td> - <td><span class="gen">{L_DISABLE_BBCODE}</span></td> - </tr> - <!-- END bbcode_checkbox --> - <!-- BEGIN smilies_checkbox --> - <tr> - <td> - <input type="checkbox" name="disable_smilies" {S_SMILIES_CHECKED} /> - </td> - <td><span class="gen">{L_DISABLE_SMILIES}</span></td> - </tr> - <!-- END smilies_checkbox --> - <!-- BEGIN signature_checkbox --> - <tr> - <td> - <input type="checkbox" name="attach_sig" {S_SIGNATURE_CHECKED} /> - </td> - <td><span class="gen">{L_ATTACH_SIGNATURE}</span></td> - </tr> - <!-- END signature_checkbox --> - <tr> - <td> - <input type="checkbox" name="notify" {S_NOTIFY_CHECKED} /> - </td> - <td><span class="gen">{L_NOTIFY_ON_REPLY}</span></td> - </tr> - <!-- BEGIN delete_checkbox --> - <tr> - <td> - <input type="checkbox" name="delete" /> - </td> - <td><span class="gen">{L_DELETE_POST}</span></td> - </tr> - <!-- END delete_checkbox --> - <!-- BEGIN type_toggle --> - <tr> - <td></td> - <td><span class="gen">{S_TYPE_TOGGLE}</span></td> - </tr> - <!-- END type_toggle --> - </table> - </td> + <tr align="center" valign="middle"> + <td><a href="javascript:emoticon(':evil:')"><img src="images/smiles/icon_evil.gif" width="15" height="15" border="0" alt="Evil" /></a></td> + <td><a href="javascript:emoticon(':x')"><img src="images/smiles/icon_mad.gif" width="15" height="15" border="0" alt="Mad" /></a></td> + <td><a href="javascript:emoticon(':cry:')"><img src="images/smiles/icon_cry.gif" width="15" height="15" border="0" alt="Cry" /></a></td> + <td><a href="javascript:emoticon(':o')"><img src="images/smiles/icon_surprised.gif" width="15" height="15" border="0" alt="Shock" /></a></td> </tr> - {POLLBOX} + <tr align="center" valign="middle"> + <td><a href="javascript:emoticon(':idea:')"><img src="images/smiles/icon_idea.gif" width="15" height="15" border="0" alt="Idea" /></a></td> + <td><a href="javascript:emoticon(':?')"><img src="images/smiles/icon_question.gif" width="15" height="15" border="0" alt="Question" /></a></td> + <td><a href="javascript:emoticon(':!')"><img src="images/smiles/icon_exclaim.gif" width="15" height="15" border="0" alt="Exclaim" /></a></td> + <td><a href="javascript:emoticon(':arrow:')"><img src="images/smiles/icon_arrow.gif" width="15" height="15" border="0" alt="Arrow" /></a></td> + </tr> + </table> + </td> + </tr> + </table> + </td> + <td class="row2" valign="top"><span class="gen"> <span class="genmed"> </span> + <table width="450" border="0" cellspacing="0" cellpadding="2"> + <tr align="center" valign="middle"> + <td><span class="genmed"> + <input type="button" class="button" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onClick="bbstyle(this.form,0)" onMouseOver="helpline('b')" /> + </span></td> + <td><span class="genmed"> + <input type="button" class="button" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onClick="bbstyle(this.form,2)" onMouseOver="helpline('i')" /> + </span></td> + <td><span class="genmed"> + <input type="button" class="button" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onClick="bbstyle(this.form,4)" onMouseOver="helpline('u')" /> + </span></td> + <td><span class="genmed"> + <input type="button" class="button" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onClick="bbstyle(this.form,6)" onMouseOver="helpline('q')" /> + </span></td> + <td><span class="genmed"> + <input type="button" class="button" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onClick="bbstyle(this.form,8)" onMouseOver="helpline('c')" /> + </span></td> + <td><span class="genmed"> + <input type="button" class="button" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onClick="bbstyle(this.form,10)" onMouseOver="helpline('l')" /> + </span></td> + <td><span class="genmed"> + <input type="button" class="button" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onClick="bbstyle(this.form,12)" onMouseOver="helpline('o')" /> + </span></td> + <td><span class="genmed"> + <input type="button" class="button" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onClick="bbstyle(this.form,14)" onMouseOver="helpline('p')" /> + </span></td> + <td><span class="genmed"> + <input type="button" class="button" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onClick="bbstyle(this.form,16)" onMouseOver="helpline('w')" /> + </span></td> + </tr> + <tr> + <td colspan="9"> + <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> - <td class="cat" colspan="2" align="center" height="28"> {S_HIDDEN_FORM_FIELDS} - <!-- 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="Spell Check" onclick= "doSpell ('uk', document.post.message, document.location.protocol + '//' + document.location.host + '/phpBB2/spellcheck/sproxy.php', true);" /> --> - <!-- End spellchecker option --> - <input type="submit" tabindex="5" name="preview" class="mainoption" value="{L_PREVIEW}" /> - - <input type="submit" tabindex="6" name="submit" class="mainoption" value="{L_SUBMIT}" /> - </td> + <td><span class="genmed"> Font color: + <select name="addbbcode18" onChange="bbfontstyle(this.form, '[color=' + this.form.addbbcode18.options[this.form.addbbcode18.selectedIndex].value + ']', '[/color]')" onMouseOver="helpline('s')"> + <option style="color:black; background-color: #FFFFFF " value="{T_FONTCOLOR1}" class="genmed">Default</option> + <option style="color:darkred; background-color: #DEE3E7" value="darkred" class="genmed">Dark + Red</option> + <option style="color:red; background-color: #DEE3E7" value="darkred" class="genmed">Red</option> + <option style="color:orange; background-color: #DEE3E7" value="orange" class="genmed">Orange</option> + <option style="color:brown; background-color: #DEE3E7" value="brown" class="genmed">Brown</option> + <option style="color:yellow; background-color: #DEE3E7" value="yellow" class="genmed">Yellow</option> + <option style="color:green; background-color: #DEE3E7" value="green" class="genmed">Green</option> + <option style="color:olive; background-color: #DEE3E7" value="olive" class="genmed">Olive</option> + <option style="color:cyan; background-color: #DEE3E7" value="cyan" class="genmed">Cyan</option> + <option style="color:blue; background-color: #DEE3E7" value="blue" class="genmed">Blue</option> + <option style="color:darkblue; background-color: #DEE3E7" value="darkblue" class="genmed">Dark + Blue</option> + <option style="color:indigo; background-color: #DEE3E7" value="indigo" class="genmed">Indigo</option> + <option style="color:violet; background-color: #DEE3E7" value="violet" class="genmed">Violet</option> + <option style="color:white; background-color: #DEE3E7" value="white" class="genmed">White</option> + <option style="color:black; background-color: #DEE3E7" value="black" class="genmed">Black</option> + </select> + Font size: + <select name="addbbcode20" onChange="bbfontstyle(this.form, '[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]')" onMouseOver="helpline('f')"> + <option value="9" class="genmed">Tiny</option> + <option value="10" class="genmed">Small</option> + <option value="12" selected class="genmed">Normal</option> + <option value="18" class="genmed">Large</option> + <option value="24" class="genmed">Huge</option> + </select> + </span></td> + <td nowrap="nowrap" align="right"><span class="gensmall"><a href="javascript:bbstyle(document.post,-1)" class="genmed" onMouseOver="helpline('a')">Close + Tags</a></span></td> </tr> </table> </td> </tr> + <tr> + <td colspan="9"> <span class="gensmall"> + <input type="text" name="helpbox" size="45" maxlength="100" style="width:450px; font-size:10px" class="helpline" value="Tip: Styles can be applied quickly to selected text" /> + </span></td> + </tr> + <tr> + <td colspan="9"><span class="gen"> + <textarea name="message" rows="15" cols="35" wrap="virtual" style="width:450px" tabindex="3" class="post">{MESSAGE}</textarea> + </span></td> + </tr> </table> + </span></td> + </tr> + <tr> + <td class="row1" valign="top"><span class="gen"><b>{L_OPTIONS}</b></span><br /> + <span class="gensmall">{L_HTML_IS} <u>{HTML_STATUS}</u><br /> + {L_BBCODE_IS} <u>{BBCODE_STATUS}</u><br /> + {L_SMILIES_ARE} <u>{SMILIES_STATUS}</u></span></td> + <td class="row2"><span class="gen"> </span> + <table cellspacing="0" cellpadding="1" border="0"> + <!-- BEGIN html_checkbox --> + <tr> + <td> + <input type="checkbox" name="disable_html" {S_HTML_CHECKED} /> + </td> + <td><span class="gen">{L_DISABLE_HTML}</span></td> + </tr> + <!-- END html_checkbox --> + <!-- BEGIN bbcode_checkbox --> + <tr> + <td> + <input type="checkbox" name="disable_bbcode" {S_BBCODE_CHECKED} /> + </td> + <td><span class="gen">{L_DISABLE_BBCODE}</span></td> + </tr> + <!-- END bbcode_checkbox --> + <!-- BEGIN smilies_checkbox --> + <tr> + <td> + <input type="checkbox" name="disable_smilies" {S_SMILIES_CHECKED} /> + </td> + <td><span class="gen">{L_DISABLE_SMILIES}</span></td> + </tr> + <!-- END smilies_checkbox --> + <!-- BEGIN signature_checkbox --> + <tr> + <td> + <input type="checkbox" name="attach_sig" {S_SIGNATURE_CHECKED} /> + </td> + <td><span class="gen">{L_ATTACH_SIGNATURE}</span></td> + </tr> + <!-- END signature_checkbox --> + <tr> + <td> + <input type="checkbox" name="notify" {S_NOTIFY_CHECKED} /> + </td> + <td><span class="gen">{L_NOTIFY_ON_REPLY}</span></td> + </tr> + <!-- BEGIN delete_checkbox --> + <tr> + <td> + <input type="checkbox" name="delete" /> + </td> + <td><span class="gen">{L_DELETE_POST}</span></td> + </tr> + <!-- END delete_checkbox --> + <!-- BEGIN type_toggle --> + <tr> + <td></td> + <td><span class="gen">{S_TYPE_TOGGLE}</span></td> + </tr> + <!-- END type_toggle --> + </table> + </td> + </tr> + {POLLBOX} + <tr> + <td class="catBottom" colspan="2" align="center" height="28"> {S_HIDDEN_FORM_FIELDS} + <!-- 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="Spell Check" onClick= "doSpell ('uk', document.post.message, 'http://www.yourhost.com/path_to_phpbb2/spellcheck/sproxy.php', true);" /> --> + <!-- End spellchecker option --> + + <input type="submit" tabindex="5" name="preview" class="mainoption" value="{L_PREVIEW}" /> + + <input type="submit" tabindex="6" name="submit" class="mainoption" value="{L_SUBMIT}" /> </td> </tr> </table> diff --git a/phpBB/templates/subSilver/posting_preview.tpl b/phpBB/templates/subSilver/posting_preview.tpl index 6affb05870..aa71b23c13 100644 --- a/phpBB/templates/subSilver/posting_preview.tpl +++ b/phpBB/templates/subSilver/posting_preview.tpl @@ -1,31 +1,18 @@ - -<table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> + +<table border="0" cellpadding="4" cellspacing="1" width="100%" class="forumline"> <tr> - <td align="left" colspan="2" class="forumline"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> - <tr> - <td class="innerline"> - <table border="0" cellpadding="4" cellspacing="1" width="100%"> - <tr> - <th height="25" class="secondary">{L_PREVIEW}</th> - </tr> - <tr> - <td class="row1"><img src="images/icon_minipost.gif" alt="Post image icon" /><span class="postdetails">{L_POSTED}: - {POST_DATE} Post Subject: {POST_SUBJECT}</span> - </td> - </tr> - <tr> - <td class="row1"><span class="postbody">{MESSAGE}</span></td> - </tr> - <tr> - <td class="row3" height="1"><img src="templates/subSilver/images/spacer.gif" width="1" height="1"></td> - </tr> - </table> - </td> - </tr> - </table> + <th height="25" class="thHead">{L_PREVIEW}</th> + </tr> + <tr> + <td class="row1"><img src="images/icon_minipost.gif" alt="Post image icon" /><span class="postdetails">{L_POSTED}: + {POST_DATE} Post Subject: {POST_SUBJECT}</span> </td> </tr> + <tr> + <td class="row1"><span class="postbody">{MESSAGE}</span></td> + </tr> + <tr> + <td class="spaceRow" height="1"><img src="templates/subSilver/images/spacer.gif" width="1" height="1"></td> + </tr> </table> - -<br clear="all" /> +<br /> diff --git a/phpBB/templates/subSilver/privmsgs_body.tpl b/phpBB/templates/subSilver/privmsgs_body.tpl index 5e8b334747..2ef472a134 100644 --- a/phpBB/templates/subSilver/privmsgs_body.tpl +++ b/phpBB/templates/subSilver/privmsgs_body.tpl @@ -1,75 +1,114 @@ -<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> - <tr><form method="post" action="{S_MSG_DAYS_ACTION}"> - <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> - <td align="right" nowrap><span class="gensmall">{L_DISPLAY_MESSAGES}: {S_SELECT_MSG_DAYS} - <input type="submit" value="Go" name="submit" class="liteoption" /> - </span></td> - </form></tr> -</table> -<form method="post" action="{S_PRIVMSGS_ACTION}"> -<table width="100%" cellspacing="2" cellpadding="2" border="0"> - <tr> - <td> <span class="cattitle">{INBOX} {SENTBOX} {OUTBOX} {SAVEBOX}</span></td> - <td align="right" valign="bottom">{S_POST_NEW_MSG}</td> - </tr> -</table> -<table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> +<script language="Javascript" type="text/javascript"> + // + // Should really check the browser to stop this whining ... + // + function select_switch(status) + { + for (i = 0; i < document.privmsg_list.length; i++) + { + document.privmsg_list.elements[i].checked = status; + } + } +</script> +<table border="0" cellspacing="0" cellpadding="0" align="center" width="100%"> <tr> - <td align="left" colspan="2" class="forumline"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> - <tr> - <td class="innerline"> - <table border="0" cellpadding="3" cellspacing="1" width="100%"> - <tr> - <th width="5%" height="25"> {L_FLAG} </th> - <th width="55%"> {L_SUBJECT} </th> - <th width="20%"> {L_FROM_OR_TO} </th> - <th width="15%"> {L_DATE} </th> - <th width="5%"> {L_MARK} </th> - </tr> - <!-- BEGIN listrow --> - <tr> - <td width="5%" align="center" valign="middle" class="{listrow.ROW_CLASS}"><span class="postdetails">{listrow.ICON_FLAG_IMG}</span></td> - <td width="55%" valign="middle" class="{listrow.ROW_CLASS}"><span class="topictitle"> <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"> <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="5%" align="center" valign="middle" class="{listrow.ROW_CLASS}"><span class="postdetails">{listrow.S_DEL_CHECKBOX}</span></td> - </tr> - <!-- END listrow --> - <!-- BEGIN nomessages --> - <tr> - <td class="row1" colspan="5" align="center" valign="middle"><span class="gen">{L_NO_MESSAGES}</span></td> - </tr> - <!-- END nomessages --> - <tr> - <td class="cat" colspan="5"> - <table width="100%" cellspacing="0" cellpadding="0" border="0"> - <tr> - <td align="right" valign="middle"> <span class="gen"> </span>{S_HIDDEN_FIELDS} - <input type="submit" name="save" value="Save Marked" class="mainoption" /> - - <input type="submit" name="delete" value="Delete Marked" class="liteoption" /> - - <input type="submit" name="deleteall" value="Delete All" class="liteoption" /> - </td> - </tr> - </table> - </td> - </tr> - </table> + <td valign="top" align="center" width="100%"> + <table height="40" cellspacing="2" cellpadding="2" border="0"> + <tr valign="middle"> + <td>{INBOX_IMG}</td> + <td><span class="cattitle">{INBOX_LINK} </span></td> + <td>{SENTBOX_IMG}</td> + <td><span class="cattitle">{SENTBOX_LINK} </span></td> + <td>{OUTBOX_IMG}</td> + <td><span class="cattitle">{OUTBOX_LINK} </span></td> + <td>{SAVEBOX_IMG}</td> + <td><span class="cattitle">{SAVEBOX_LINK} </span></td> + </tr> + </table> + </td> + <td align="right"> + <!-- BEGIN box_size_notice --> + <table width="175" cellspacing="1" cellpadding="2" border="0" class="bodyline"> + <tr> + <td colspan="3" width="100%" class="row1" nowrap="nowrap"><span class="gensmall">{BOX_SIZE_STATUS}</span></td> + </tr> + <tr> + <td colspan="3" width="100%" class="row2"> + <table cellspacing="0" cellpadding="1" border="0"> + <tr> + <td bgcolor="{T_TD_COLOR2}"><img src="templates/subSilver/images/spacer.gif" width="{INBOX_LIMIT_IMG_WIDTH}" height="8" alt="{INBOX_LIMIT_PERCENT}" /></td> + </tr> + </table> </td> </tr> + <tr> + <td width="33%" class="row1"><span class="gensmall">0%</span></td> + <td width="34%" align="center" class="row1"><span class="gensmall">50%</span></td> + <td width="33%" align="right" class="row1"><span class="gensmall">100%</span></td> + </tr> </table> + <!-- END box_size_notice --> </td> </tr> </table> +<br /> +<form method="post" name="privmsg_list" action="{S_PRIVMSGS_ACTION}"> + <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> + <tr> + <td align="left" valign="middle">{POST_PM_IMG}</td> + <td align="left" width="100%"> <span class="nav"><a href="../PSO/%7BU_INDEX%7D" class="nav">{SITENAME} {L_INDEX}</a></span></td> + <td align="right" nowrap="nowrap"><span class="gensmall">{L_DISPLAY_MESSAGES}: + <select name="msgdays">{S_MSG_DAYS_OPTIONS} + </select> + <input type="submit" value="Go" name="submit_msgdays" class="liteoption" /> + </span></td> + </tr> + </table> + <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline"> + <tr> + <th width="5%" height="25" class="thCornerL"> {L_FLAG} </th> + <th width="55%" class="thTop"> {L_SUBJECT} </th> + <th width="20%" class="thTop"> {L_FROM_OR_TO} </th> + <th width="15%" class="thTop"> {L_DATE} </th> + <th width="5%" class="thCornerR"> {L_MARK} </th> + </tr> + <!-- BEGIN listrow --> + <tr> + <td width="5%" align="center" valign="middle" class="{listrow.ROW_CLASS}"><span class="postdetails">{listrow.ICON_FLAG_IMG}</span></td> + <td width="55%" valign="middle" class="{listrow.ROW_CLASS}"><span class="topictitle"> <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"> <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="5%" align="center" valign="middle" class="{listrow.ROW_CLASS}"><span class="postdetails"> + <input type="checkbox" name="mark[]2" value="{listrow.S_MARK_ID}" /> + </span></td> + </tr> + <!-- END listrow --> + <!-- BEGIN nomessages --> + <tr> + <td class="row1" colspan="5" align="center" valign="middle"><span class="gen">{L_NO_MESSAGES}</span></td> + </tr> + <!-- END nomessages --> + <tr> + <td class="catBottom" colspan="5" height="28" align="right"> {S_HIDDEN_FIELDS} + <input type="submit" name="save" value="Save Marked" class="mainoption" /> + + <input type="submit" name="delete" value="Delete Marked" class="liteoption" /> + + <input type="submit" name="deleteall" value="Delete All" class="liteoption" /> + </td> + </tr> + </table> <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2"> <tr> - <td align="left" valign="middle"><span class="nav">{S_POST_NEW_MSG} {L_PAGE} - <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></span></td> - <td align="right" valign="top"><span class="nav">{PAGINATION}</span> <span class="gensmall"><br /> - {S_TIMEZONE}</span></td> + <td align="left" valign="middle"><span class="nav">{POST_PM_IMG}</span></td> + <td align="left" valign="middle" width="100%"><span class="nav"> {L_PAGE} + <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></span></td> + <td align="right" valign="top" nowrap="nowrap"><b><span class="gensmall"><a href="javascript:select_switch(true);" class="gensmall">Mark + all</a> :: <a href="javascript:select_switch(false);" class="gensmall">Unmark + all</a></span></b><br /> + <span class="nav">{PAGINATION}<br /> + </span><span class="gensmall">{S_TIMEZONE}</span></td> </tr> </table> </form> diff --git a/phpBB/templates/subSilver/privmsgs_preview.tpl b/phpBB/templates/subSilver/privmsgs_preview.tpl new file mode 100644 index 0000000000..bdfcf29f90 --- /dev/null +++ b/phpBB/templates/subSilver/privmsgs_preview.tpl @@ -0,0 +1,26 @@ + +<table border="0" cellpadding="4" cellspacing="1" width="100%" class="forumline"> + <tr> + <th height="25" class="thHead" colspan="2">{L_PREVIEW}</th> + </tr> + <tr> + <td class="row2"><span class="genmed">{L_FROM}:</span></td> + <td width="100%" class="row2"><span class="genmed">{MESSAGE_FROM}</span></td> + </tr> + <tr> + <td class="row2"><span class="genmed">{L_TO}:</span></td> + <td width="100%" class="row2"><span class="genmed">{MESSAGE_TO}</span></td> + </tr> + <tr> + <td class="row2"><span class="genmed">{L_POSTED}:</span></td> + <td width="100%" class="row2"><span class="genmed">{POST_DATE}</span></td> + </tr> + <tr> + <td class="row2"><span class="genmed">{L_SUBJECT}:</span></td> + <td width="100%" class="row2"><span class="genmed">{POST_SUBJECT}</span></td> + </tr> + <tr> + <td valign="top" colspan="2" class="row1"><span class="postbody">{MESSAGE}</span></td> + </tr> +</table> +<br clear="all" /> diff --git a/phpBB/templates/subSilver/privmsgs_read_body.tpl b/phpBB/templates/subSilver/privmsgs_read_body.tpl index c27c80a3af..acf30ac9c8 100644 --- a/phpBB/templates/subSilver/privmsgs_read_body.tpl +++ b/phpBB/templates/subSilver/privmsgs_read_body.tpl @@ -1,91 +1,77 @@ - -<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> + +<table cellspacing="2" cellpadding="2" border="0" align="center"> <tr> - <form method="post" action="{S_MSG_DAYS_ACTION}"> - <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> - </form> + <td valign="middle">{INBOX_IMG}</td> + <td valign="middle"><span class="cattitle">{INBOX_LINK} </span></td> + <td valign="middle">{SENTBOX_IMG}</td> + <td valign="middle"><span class="cattitle">{SENTBOX_LINK} </span></td> + <td valign="middle">{OUTBOX_IMG}</td> + <td valign="middle"><span class="cattitle">{OUTBOX_LINK} </span></td> + <td valign="middle">{SAVEBOX_IMG}</td> + <td valign="middle"><span class="cattitle">{SAVEBOX_LINK}</span></td> </tr> </table> +<br /> +<form method="post" action="{S_PRIVMSGS_ACTION}"> <table width="100%" cellspacing="2" cellpadding="2" border="0"> - <tr> - <td valign="middle"> <span class="forumlink">{INBOX} {SENTBOX} {OUTBOX} {SAVEBOX}</span></td> - <td align="right" valign="bottom"><span class="cattitle">{S_POST_REPLY_MSG} {S_POST_NEW_MSG}</span></td> - </tr> -</table> -<table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> <tr> - <td align="left" colspan="2" class="forumline"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> - <tr><form method="post" action="{S_PRIVMSGS_ACTION}"> - <td class="innerline"> - <table border="0" cellpadding="4" cellspacing="1" width="100%"> - <tr> - <th width="22%" height="26">{L_FROM_OR_TO}</th> - <th>{L_MESSAGE}</th> - </tr> - - <tr> - <td width="22%" align="left" valign="top" class="row1"><span class="name"><a name="{postrow.U_POST_ID}"></a><b>{POSTER_NAME}</b></span><br /> - <span class="postdetails">{POSTER_RANK}<br /> - {RANK_IMAGE}{POSTER_AVATAR}<br /> - <br /> - {POSTER_JOINED}<br /> - {POSTER_POSTS}<br /> - {POSTER_FROM}</span><br /> - </td> - <td valign="top" class="row1"> - <table width="100%" cellspacing="0" cellpadding="3" border="0"> - <tr> - <td valign="middle"><img src="images/icon_minipost.gif" alt="Post image icon"><span class="postdetails">{L_POSTED}: - {POST_DATE} {L_SUBJECT}: {POST_SUBJECT}</span></td> - <td align="right" valign="middle" nowrap> {EDIT_IMG} - {QUOTE_IMG} </td> - </tr> - <tr> - <td valign="top" colspan="2"> - <hr size="1" /> - <span class="postbody">{MESSAGE}</span></td> - </tr> - </table> - </td> - </tr> - <tr> - <td width="22%" align="left" valign="middle" class="row1"> </td> - <td width="78%" height="28" valign="bottom" class="row1"> - <table cellspacing="0" cellpadding="0" border="0" height="18" width="100%"> - <tr> - <td valign="middle" nowrap> {PROFILE_IMG} {PM_IMG} - {EMAIL_IMG} {WWW_IMG} {AIM_IMG} {YIM_IMG} {MSN_IMG} </td> - <td valign="top" align="left">{ICQ_STATUS_IMG}{ICQ_ADD_IMG}</td> - </tr> - </table> - </td> - </tr> - - <tr> - <td class="cat" colspan="2"> - <table width="100%" cellspacing="0" cellpadding="0" border="0"> - <tr> - <td align="right" valign="middle">{S_HIDDEN_FIELDS} - <input type="submit" name="save" value="Save Post" class="liteoption" /> - - <input type="submit" name="delete" value="Delete Post" class="liteoption" /> - </td> - </tr> - </table> - </td> - </tr> - </table> - </td> - </form></tr> - </table> - </td> + <td valign="middle">{REPLY_PM_IMG}</td> + <td width="100%"><span class="nav"> <a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> </tr> </table> +<table border="0" cellpadding="4" cellspacing="1" width="100%" class="forumline"> + <tr> + <th colspan="3" class="thHead">{BOX_NAME} :: {L_MESSAGE}</th> + </tr> + <tr> + <td class="row2"><span class="genmed">{L_FROM}:</span></td> + <td width="100%" class="row2" colspan="2"><span class="genmed">{MESSAGE_FROM}</span></td> + </tr> + <tr> + <td class="row2"><span class="genmed">{L_TO}:</span></td> + <td width="100%" class="row2" colspan="2"><span class="genmed">{MESSAGE_TO}</span></td> + </tr> + <tr> + <td class="row2"><span class="genmed">{L_POSTED}:</span></td> + <td width="100%" class="row2" colspan="2"><span class="genmed">{POST_DATE}</span></td> + </tr> + <tr> + <td class="row2"><span class="genmed">{L_SUBJECT}:</span></td> + <td width="100%" class="row2"><span class="genmed">{POST_SUBJECT}</span></td> + <td nowrap="nowrap" class="row2" align="right"> {QUOTE_PM_IMG} {EDIT_PM_IMG}</td> + </tr> + <tr> + <td valign="top" colspan="3" class="row1"><span class="postbody">{MESSAGE}</span></td> + </tr> + <tr> + <td width="78%" height="28" valign="bottom" colspan="3" class="row1"> + <table cellspacing="0" cellpadding="0" border="0" height="18"> + <tr> + <td valign="middle" nowrap="nowrap">{PROFILE_IMG} {PM_IMG} {EMAIL_IMG} + {WWW_IMG} {AIM_IMG} {YIM_IMG} {MSN_IMG} </td> + + <td valign="top" align="left" width="100%" nowrap="nowrap">{ICQ_STATUS_IMG}{ICQ_ADD_IMG}</td> + </tr> + </table> + </td> + </tr> + <tr> + <td class="catBottom" colspan="3" height="28" align="right"> {S_HIDDEN_FIELDS} + <input type="submit" name="save" value="Save Post" class="liteoption" /> + + <input type="submit" name="delete" value="Delete Post" class="liteoption" /> + </td> + </tr> + </table> + <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2"> + <tr> + <td>{REPLY_PM_IMG}</td> + <td align="right" valign="top"><span class="gensmall">{S_TIMEZONE}</span></td> + </tr> + </table> +</form> <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2"> <tr> - <td valign="top">{S_POST_NEW_MSG} {S_POST_REPLY_MSG}</td> - <td align="right" valign="top"><span class="gensmall">{S_TIMEZONE} <br /> - {JUMPBOX}</span></td> + <td valign="top" align="right"><span class="gensmall">{JUMPBOX}</span></td> </tr> </table> diff --git a/phpBB/templates/subSilver/profile_add_body.tpl b/phpBB/templates/subSilver/profile_add_body.tpl index 0f9fb2aee8..bfe7744670 100644 --- a/phpBB/templates/subSilver/profile_add_body.tpl +++ b/phpBB/templates/subSilver/profile_add_body.tpl @@ -5,268 +5,254 @@ <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> </tr> </table> -<table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> - <tr> - <td align="left" colspan="2" class="forumline"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> - <tr> - <td class="innerline"> - <table border="0" cellpadding="3" cellspacing="1" width="100%"> - <tr valign="middle"> - <th class="secondary" colspan="2" height="25">{L_REGISTRATION_INFO}</th> - </tr> - <tr> - <td class="row2" colspan="2"><span class="gensmall">{L_ITEMS_REQUIRED}</span></td> - </tr> - <tr> - <td class="row1" width="38%"><span class="gen">{L_USERNAME}: - *</span></td> - <td class="row2"> - <input type="text" class="post" style="width: 200px" name="username" size="25" maxlength="40" value="{USERNAME}" /> - </td> - </tr> - <tr> - <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> - </tr> - <tr> - <td class="row1"><span class="gen">{L_PASSWORD}: *</span><br /> - <span class="gensmall">{L_PASSWORD_IF_CHANGED}</span></td> - <td class="row2"> - <input type="password" class="post" style="width: 200px" name="password" size="25" maxlength="100" value="{PASSWORD}" /> - </td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_CONFIRM} {L_PASSWORD}: - * </span><br /> - <span class="gensmall">{L_PASSWORD_CONFIRM_IF_CHANGED}</span></td> - <td class="row2"> - <input type="password" class="post" style="width: 200px" name="password_confirm" size="25" maxlength="100" value="{PASSWORD_CONFIRM}" /> - </td> - </tr> - <tr> - <td class="cat" colspan="2" height="28"> </td> - </tr> - <tr valign="middle"> - <th class="secondary" colspan="2" height="25">{L_PROFILE_INFO}</th> - </tr> - <tr> - <td class="row2" colspan="2"><span class="gensmall">{L_PROFILE_INFO_NOTICE}</span></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_ICQ_NUMBER}:</span></td> - <td class="row2"> - <input type="text" name="icq" class="post"style="width: 100px" size="10" maxlength="15" value="{ICQ}" /> - </td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_AIM}:</span></td> - <td class="row2"> - <input type="text" class="post"style="width: 150px" name="aim" size="20" maxlength="255" value="{AIM}" /> - </td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_MESSENGER}:</span></td> - <td class="row2"> - <input type="text" class="post"style="width: 150px" name="msn" size="20" maxlength="255" value="{MSN}" /> - </td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_YAHOO}:</span></td> - <td class="row2"> - <input type="text" class="post"style="width: 150px" name="yim" size="20" maxlength="255" value="{YIM}" /> - </td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_WEBSITE}:</span></td> - <td class="row2"> - <input type="text" class="post"style="width: 200px" name="website" size="25" maxlength="255" value="{WEBSITE}" /> - </td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_LOCATION}:</span></td> - <td class="row2"> - <input type="text" class="post"style="width: 200px" name="location" size="25" maxlength="100" value="{LOCATION}" /> - </td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_OCCUPATION}:</span></td> - <td class="row2"> - <input type="text" class="post"style="width: 200px" name="occupation" size="25" maxlength="100" value="{OCCUPATION}" /> - </td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_INTERESTS}:</span></td> - <td class="row2"> - <input type="text" class="post"style="width: 200px" name="interests" size="35" maxlength="150" value="{INTERESTS}" /> - </td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_SIGNATURE}:</span><br /> - <span class="gensmall">{L_SIGNATURE_EXPLAIN}<br /> - <br /> - {L_HTML_IS} <u>{HTML_STATUS}</u><br /> - {L_BBCODE_IS} <u>{BBCODE_STATUS}</u><br /> - {L_SMILIES_ARE} <u>{SMILIES_STATUS}</u></span></td> - <td class="row2"> - <textarea name="signature"style="width: 300px" rows="6" cols="30" class="post">{SIGNATURE}</textarea> - </td> - </tr> - <tr> - <td class="cat" colspan="2" height="28"> </td> - </tr> - <tr valign="middle"> - <th class="secondary" colspan="2" height="25">{L_PREFERENCES}</th> - </tr> - <tr> - <td class="row1"><span class="gen">{L_PUBLIC_VIEW_EMAIL}:</span></td> - <td class="row2"> - <input type="radio" name="viewemail" value="1" {VIEW_EMAIL_YES} /> - <span class="gen">{L_YES}</span> - <input type="radio" name="viewemail" value="0" {VIEW_EMAIL_NO} /> - <span class="gen">{L_NO}</span></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_HIDE_USER}:</span></td> - <td class="row2"> - <input type="radio" name="hideonline" value="1" {HIDE_USER_YES} /> - <span class="gen">{L_YES}</span> - <input type="radio" name="hideonline" value="0" {HIDE_USER_NO} /> - <span class="gen">{L_NO}</span></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_NOTIFY_ON_REPLY}:</span><br /> - <span class="gensmall">{L_NOTIFY_ON_REPLY_EXPLAIN}</span></td> - <td class="row2"> - <input type="radio" name="notifyreply" value="1" {NOTIFY_REPLY_YES} /> - <span class="gen">{L_YES}</span> - <input type="radio" name="notifyreply" value="0" {NOTIFY_REPLY_NO} /> - <span class="gen">{L_NO}</span></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_NOTIFY_ON_PRIVMSG}:</span></td> - <td class="row2"> - <input type="radio" name="notifypm" value="1" {NOTIFY_PM_YES} /> - <span class="gen">{L_YES}</span> - <input type="radio" name="notifypm" value="0" {NOTIFY_PM_NO} /> - <span class="gen">{L_NO}</span></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_ALWAYS_ADD_SIGNATURE}:</span></td> - <td class="row2"> - <input type="radio" name="attachsig" value="1" {ALWAYS_ADD_SIGNATURE_YES} /> - <span class="gen">{L_YES}</span> - <input type="radio" name="attachsig" value="0" {ALWAYS_ADD_SIGNATURE_NO} /> - <span class="gen">{L_NO}</span></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_ALWAYS_ALLOW_BBCODE}:</span></td> - <td class="row2"> - <input type="radio" name="allowbbcode" value="1" {ALWAYS_ALLOW_BBCODE_YES} /> - <span class="gen">{L_YES}</span> - <input type="radio" name="allowbbcode" value="0" {ALWAYS_ALLOW_BBCODE_NO} /> - <span class="gen">{L_NO}</span></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_ALWAYS_ALLOW_HTML}:</span></td> - <td class="row2"> - <input type="radio" name="allowhtml" value="1" {ALWAYS_ALLOW_HTML_YES} /> - <span class="gen">{L_YES}</span> - <input type="radio" name="allowhtml" value="0" {ALWAYS_ALLOW_HTML_NO} /> - <span class="gen">{L_NO}</span></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_ALWAYS_ALLOW_SMILIES}:</span></td> - <td class="row2"> - <input type="radio" name="allowsmilies" value="1" {ALWAYS_ALLOW_SMILIES_YES} /> - <span class="gen">{L_YES}</span> - <input type="radio" name="allowsmilies" value="0" {ALWAYS_ALLOW_SMILIES_NO} /> - <span class="gen">{L_NO}</span></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_BOARD_LANGUAGE}:</span></td> - <td class="row2"><span class="gensmall">{LANGUAGE_SELECT}</span></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_BOARD_STYLE}:</span></td> - <td class="row2">{STYLE_SELECT}</td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_TIMEZONE}:</span></td> - <td class="row2"><span class="gensmall">{TIMEZONE_SELECT}</span></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_DATE_FORMAT}:</span><br /> - <span class="gensmall">{L_DATE_FORMAT_EXPLAIN}</span></td> - <td class="row2"> - <input type="text" name="dateformat" value="{DATE_FORMAT}" maxlength="16" class="post" /> - </td> - </tr> - <tr> - <td class="cat" colspan="2" height="28"> </td> - </tr> - <!-- BEGIN avatarblock --> - <tr valign="middle"> - <th class="secondary" colspan="2" height="25">{L_AVATAR_PANEL}</th> - </tr> - <tr> - <td class="row1" valign="top"> <span class="gensmall">{L_AVATAR_EXPLAIN}</span> - </td> - <td class="row2" align="left"><span class="gensmall">{L_CURRENT_IMAGE}</span><br /> - {AVATAR}<br /> - <input type="checkbox" name="avatardel" /> - <span class="gensmall">{L_DELETE_AVATAR}</span></td> - </tr> - <!-- BEGIN avatarupload --> - <tr> - <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> - </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="row2"> - <input type="text" name="avatarurl" size="40" class="post"style="width: 200px" /> - </td> - </tr> - <!-- END avatarupload --> - <!-- BEGIN avatarremote --> - <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="row2"> - <input type="text" name="avatarremoteurl" size="40" class="post"style="width: 200px" /> - </td> - </tr> - <!-- END avatarremote --> - <!-- BEGIN avatargallery --> - <tr> - <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> - </tr> - <!-- END avatargallery --> - <!-- END avatarblock --> - <tr> - <td class="cat" colspan="2" align="center" height="25">{S_HIDDEN_FIELDS} - <input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" /> - - <input type="reset" value="{L_RESET}" name="reset" class="liteoption" /> - </td> - </tr> - </table> - </td> - </tr> - </table> - </td> - </tr> -</table> + <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline"> + <tr valign="middle"> + <th class="thHead" colspan="2" height="25">{L_REGISTRATION_INFO}</th> + </tr> + <tr> + <td class="row2" colspan="2"><span class="gensmall">{L_ITEMS_REQUIRED}</span></td> + </tr> + <tr> + <td class="row1" width="38%"><span class="gen">{L_USERNAME}: *</span></td> + <td class="row2"> + <input type="text" class="post" style="width: 200px" name="username" size="25" maxlength="40" value="{USERNAME}" /> + </td> + </tr> + <tr> + <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> + </tr> + <tr> + <td class="row1"><span class="gen">{L_PASSWORD}: *</span><br /> + <span class="gensmall">{L_PASSWORD_IF_CHANGED}</span></td> + <td class="row2"> + <input type="password" class="post" style="width: 200px" name="password" size="25" maxlength="100" value="{PASSWORD}" /> + </td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_CONFIRM} {L_PASSWORD}: * </span><br /> + <span class="gensmall">{L_PASSWORD_CONFIRM_IF_CHANGED}</span></td> + <td class="row2"> + <input type="password" class="post" style="width: 200px" name="password_confirm" size="25" maxlength="100" value="{PASSWORD_CONFIRM}" /> + </td> + </tr> + <tr> + <td class="catSides" colspan="2" height="28"> </td> + </tr> + <tr valign="middle"> + <th class="thSides" colspan="2" height="25">{L_PROFILE_INFO}</th> + </tr> + <tr> + <td class="row2" colspan="2"><span class="gensmall">{L_PROFILE_INFO_NOTICE}</span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_ICQ_NUMBER}:</span></td> + <td class="row2"> + <input type="text" name="icq" class="post"style="width: 100px" size="10" maxlength="15" value="{ICQ}" /> + </td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_AIM}:</span></td> + <td class="row2"> + <input type="text" class="post"style="width: 150px" name="aim" size="20" maxlength="255" value="{AIM}" /> + </td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_MESSENGER}:</span></td> + <td class="row2"> + <input type="text" class="post"style="width: 150px" name="msn" size="20" maxlength="255" value="{MSN}" /> + </td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_YAHOO}:</span></td> + <td class="row2"> + <input type="text" class="post"style="width: 150px" name="yim" size="20" maxlength="255" value="{YIM}" /> + </td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_WEBSITE}:</span></td> + <td class="row2"> + <input type="text" class="post"style="width: 200px" name="website" size="25" maxlength="255" value="{WEBSITE}" /> + </td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_LOCATION}:</span></td> + <td class="row2"> + <input type="text" class="post"style="width: 200px" name="location" size="25" maxlength="100" value="{LOCATION}" /> + </td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_OCCUPATION}:</span></td> + <td class="row2"> + <input type="text" class="post"style="width: 200px" name="occupation" size="25" maxlength="100" value="{OCCUPATION}" /> + </td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_INTERESTS}:</span></td> + <td class="row2"> + <input type="text" class="post"style="width: 200px" name="interests" size="35" maxlength="150" value="{INTERESTS}" /> + </td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_SIGNATURE}:</span><br /> + <span class="gensmall">{L_SIGNATURE_EXPLAIN}<br /> + <br /> + {L_HTML_IS} <u>{HTML_STATUS}</u><br /> + {L_BBCODE_IS} <u>{BBCODE_STATUS}</u><br /> + {L_SMILIES_ARE} <u>{SMILIES_STATUS}</u></span></td> + <td class="row2"> + <textarea name="signature"style="width: 300px" rows="6" cols="30" class="post">{SIGNATURE}</textarea> + </td> + </tr> + <tr> + <td class="catSides" colspan="2" height="28"> </td> + </tr> + <tr valign="middle"> + <th class="thSides" colspan="2" height="25">{L_PREFERENCES}</th> + </tr> + <tr> + <td class="row1"><span class="gen">{L_PUBLIC_VIEW_EMAIL}:</span></td> + <td class="row2"> + <input type="radio" name="viewemail" value="1" {VIEW_EMAIL_YES} /> + <span class="gen">{L_YES}</span> + <input type="radio" name="viewemail" value="0" {VIEW_EMAIL_NO} /> + <span class="gen">{L_NO}</span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_HIDE_USER}:</span></td> + <td class="row2"> + <input type="radio" name="hideonline" value="1" {HIDE_USER_YES} /> + <span class="gen">{L_YES}</span> + <input type="radio" name="hideonline" value="0" {HIDE_USER_NO} /> + <span class="gen">{L_NO}</span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_NOTIFY_ON_REPLY}:</span><br /> + <span class="gensmall">{L_NOTIFY_ON_REPLY_EXPLAIN}</span></td> + <td class="row2"> + <input type="radio" name="notifyreply" value="1" {NOTIFY_REPLY_YES} /> + <span class="gen">{L_YES}</span> + <input type="radio" name="notifyreply" value="0" {NOTIFY_REPLY_NO} /> + <span class="gen">{L_NO}</span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_NOTIFY_ON_PRIVMSG}:</span></td> + <td class="row2"> + <input type="radio" name="notifypm" value="1" {NOTIFY_PM_YES} /> + <span class="gen">{L_YES}</span> + <input type="radio" name="notifypm" value="0" {NOTIFY_PM_NO} /> + <span class="gen">{L_NO}</span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_ALWAYS_ADD_SIGNATURE}:</span></td> + <td class="row2"> + <input type="radio" name="attachsig" value="1" {ALWAYS_ADD_SIGNATURE_YES} /> + <span class="gen">{L_YES}</span> + <input type="radio" name="attachsig" value="0" {ALWAYS_ADD_SIGNATURE_NO} /> + <span class="gen">{L_NO}</span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_ALWAYS_ALLOW_BBCODE}:</span></td> + <td class="row2"> + <input type="radio" name="allowbbcode" value="1" {ALWAYS_ALLOW_BBCODE_YES} /> + <span class="gen">{L_YES}</span> + <input type="radio" name="allowbbcode" value="0" {ALWAYS_ALLOW_BBCODE_NO} /> + <span class="gen">{L_NO}</span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_ALWAYS_ALLOW_HTML}:</span></td> + <td class="row2"> + <input type="radio" name="allowhtml" value="1" {ALWAYS_ALLOW_HTML_YES} /> + <span class="gen">{L_YES}</span> + <input type="radio" name="allowhtml" value="0" {ALWAYS_ALLOW_HTML_NO} /> + <span class="gen">{L_NO}</span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_ALWAYS_ALLOW_SMILIES}:</span></td> + <td class="row2"> + <input type="radio" name="allowsmilies" value="1" {ALWAYS_ALLOW_SMILIES_YES} /> + <span class="gen">{L_YES}</span> + <input type="radio" name="allowsmilies" value="0" {ALWAYS_ALLOW_SMILIES_NO} /> + <span class="gen">{L_NO}</span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_BOARD_LANGUAGE}:</span></td> + <td class="row2"><span class="gensmall">{LANGUAGE_SELECT}</span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_BOARD_STYLE}:</span></td> + <td class="row2"><span class="gensmall">{STYLE_SELECT}</span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_TIMEZONE}:</span></td> + <td class="row2"><span class="gensmall">{TIMEZONE_SELECT}</span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_DATE_FORMAT}:</span><br /> + <span class="gensmall">{L_DATE_FORMAT_EXPLAIN}</span></td> + <td class="row2"> + <input type="text" name="dateformat" value="{DATE_FORMAT}" maxlength="16" class="post" /> + </td> + </tr> + <tr> + <td class="catSides" colspan="2" height="28"> </td> + </tr> + <!-- BEGIN avatarblock --> + <tr valign="middle"> + <th class="thSides" colspan="2" height="25">{L_AVATAR_PANEL}</th> + </tr> + <tr> + <td class="row1" valign="top"> <span class="gensmall">{L_AVATAR_EXPLAIN}</span> + </td> + <td class="row2" align="left"><span class="gensmall">{L_CURRENT_IMAGE}</span><br /> + {AVATAR}<br /> + <input type="checkbox" name="avatardel" /> + <span class="gensmall">{L_DELETE_AVATAR}</span></td> + </tr> + <!-- BEGIN avatarupload --> + <tr> + <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> + </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="row2"> + <input type="text" name="avatarurl" size="40" class="post"style="width: 200px" /> + </td> + </tr> + <!-- END avatarupload --> + <!-- BEGIN avatarremote --> + <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="row2"> + <input type="text" name="avatarremoteurl" size="40" class="post"style="width: 200px" /> + </td> + </tr> + <!-- END avatarremote --> + <!-- BEGIN avatargallery --> + <tr> + <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> + </tr> + <!-- END avatargallery --> + <!-- END avatarblock --> + <tr> + <td class="catBottom" colspan="2" align="center" height="28">{S_HIDDEN_FIELDS} + <input type="submit" name="submit" value="{L_SUBMIT}" class="mainoption" /> + + <input type="reset" value="{L_RESET}" name="reset" class="liteoption" /> + </td> + </tr> + </table> </form> <!-- IF $S_ALLOW_AVATAR_UPLOAD eq TRUE || $S_ALLOW_AVATAR_LOCAL eq TRUE || $S_ALLOW_AVATAR_REMOTE eq TRUE --> diff --git a/phpBB/templates/subSilver/profile_view_body.tpl b/phpBB/templates/subSilver/profile_view_body.tpl index 37ef40604d..1b6c7ecf65 100644 --- a/phpBB/templates/subSilver/profile_view_body.tpl +++ b/phpBB/templates/subSilver/profile_view_body.tpl @@ -4,89 +4,79 @@ <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> </tr> </table> -<table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> +<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline"> <tr> - <td align="left" colspan="2" class="forumline"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> + <th class="thHead" colspan="2" height="25">{L_VIEWING_PROFILE} <i>{USERNAME}</i></th> + </tr> + <tr> + <td class="catLeft" align="center" width="40%" height="28"><b><span class="gen">Avatar</span></b></td> + <td class="catRight" width="60%"><b><span class="gen">All about {USERNAME}</span></b></td> + </tr> + <tr> + <td class="row1" height="6" valign="top" align="center">{AVATAR_IMG}</td> + <td class="row1" valign="top" rowspan="3"> + <table width="100%" border="0" cellspacing="1" cellpadding="3"> + <tr> + <td valign="middle"><span class="gen">{L_JOINED}: </span></td> + <td width="100%"><b><span class="gen">{JOINED}</span></b></td> + </tr> + <tr> + <td valign="top"><span class="gen">{L_POSTS}: </span></td> + <td valign="top"><b><span class="gen">{POSTS}</span></b><br /> + <span class="genmed">[{PERCENTAGE} {L_OF_TOTAL} / {POSTS_PER_DAY} + {L_PER_DAY}]</span> <br /> + <span class="genmed"><a href="{U_SEARCH_USER}" class="genmed">Find + all posts by {USERNAME}</a></span></td> + </tr> + <tr> + <td valign="middle"><span class="gen">{L_LOCATION}: </span></td> + <td><b><span class="gen">{LOCATION}</span></b></td> + </tr> + <tr> + <td valign="middle"><span class="gen">{L_WEBSITE}: </span></td> + <td><span class="gen"><b><a href="{WEBSITE}" class="gen" target="_blank">{WEBSITE}</a></b></span></td> + </tr> + <tr> + <td valign="middle"><span class="gen">{L_OCCUPATION}: </span></td> + <td><b><span class="gen">{OCCUPATION}</span></b></td> + </tr> + <tr> + <td valign="top"><span class="gen">{L_INTERESTS}:</span></td> + <td> <b><span class="gen">{INTERESTS}</span></b></td> + </tr> + </table> + </td> + </tr> + <tr> + <td class="catLeft" align="center" height="28"><b><span class="gen">{L_CONTACT} + {USERNAME} </span></b></td> + </tr> + <tr> + <td class="row1" valign="top"> + <table width="100%" border="0" cellspacing="1" cellpadding="3"> + <tr> + <td valign="middle"><span class="gen">{L_EMAIL_ADDRESS}:</span></td> + <td class="row1" valign="middle" width="100%"><b><span class="gen">{EMAIL}</span></b></td> + </tr> + <tr> + <td valign="middle" nowrap="nowrap"><span class="gen">{L_PM}:</span></td> + <td class="row1" valign="middle"><b><span class="gen">{PM_IMG}</span></b></td> + </tr> + <tr> + <td valign="middle"><span class="gen">{L_MESSENGER}:</span></td> + <td class="row1" valign="middle"><span class="gen">{MSN_IMG}</span></td> + </tr> + <tr> + <td valign="middle"><span class="gen">{L_YAHOO}:</span></td> + <td class="row1" valign="middle"><span class="gen">{YIM_IMG}</span></td> + </tr> + <tr> + <td valign="middle"><span class="gen">{L_AIM}:</span></td> + <td class="row1" valign="middle"><span class="gen">{AIM_IMG}</span></td> + </tr> <tr> - <td class="innerline"> - <table border="0" cellpadding="3" cellspacing="1" width="100%"> - <tr> - <th class="cat" colspan="2" height="25">{L_VIEWING_PROFILE} <i>{USERNAME}</i></th> - </tr> - <tr> - <td class="cat" align="center" width="40%"><b><span class="gen">Avatar</span></b></td> - <td class="cat" width="60%"><b><span class="gen">All about {USERNAME}</span></b></td> - </tr> - <tr> - <td class="row1" height="6" valign="top" align="center">{AVATAR_IMG}</td> - <td class="row1" valign="top" rowspan="3"> - <table width="100%" border="0" cellspacing="1" cellpadding="3"> - <tr> - <td valign="middle"><span class="gen">{L_JOINED}: </span></td> - <td width="100%"><b><span class="gen">{JOINED}</span></b></td> - </tr> - <tr> - <td valign="top"><span class="gen">{L_POSTS}: </span></td> - <td valign="top"><b><span class="gen">{POSTS}</span></b><br /> - <span class="genmed">[{PERCENTAGE} {L_OF_TOTAL} / {POSTS_PER_DAY} {L_PER_DAY}]</span> <br /> - <span class="genmed"><a href="{U_SEARCH_USER}" class="genmed">Find all posts by {USERNAME}</a></span></td> - </tr> - <tr> - <td valign="middle"><span class="gen">{L_LOCATION}: </span></td> - <td><b><span class="gen">{LOCATION}</span></b></td> - </tr> - <tr> - <td valign="middle"><span class="gen">{L_WEBSITE}: </span></td> - <td><span class="gen"><b><a href="{WEBSITE}" class="gen" target="_blank">{WEBSITE}</a></b></span></td> - </tr> - <tr> - <td valign="middle"><span class="gen">{L_OCCUPATION}: </span></td> - <td><b><span class="gen">{OCCUPATION}</span></b></td> - </tr> - <tr> - <td valign="top"><span class="gen">{L_INTERESTS}:</span></td> - <td> <b><span class="gen">{INTERESTS}</span></b></td> - </tr> - </table> - </td> - </tr> - <tr> - <td class="cat" align="center"><b><span class="gen">{L_CONTACT} {USERNAME} - </span></b></td> - </tr> - <tr> - <td class="row1" valign="top"> - <table width="100%" border="0" cellspacing="1" cellpadding="3"> - <tr> - <td valign="middle"><span class="gen">{L_EMAIL_ADDRESS}:</span></td> - <td class="row1" valign="middle" width="100%"><b><span class="gen">{EMAIL}</span></b></td> - </tr> - <tr> - <td valign="middle" nowrap><span class="gen">{L_PM}:</span></td> - <td class="row1" valign="middle"><b><span class="gen">{PM_IMG}</span></b></td> - </tr> - <tr> - <td valign="middle"><span class="gen">{L_MESSENGER}:</span></td> - <td class="row1" valign="middle"><span class="gen">{MSN_IMG}</span></td> - </tr> - <tr> - <td valign="middle"><span class="gen">{L_YAHOO}:</span></td> - <td class="row1" valign="middle"><span class="gen">{YIM_IMG}</span></td> - </tr> - <tr> - <td valign="middle"><span class="gen">{L_AIM}:</span></td> - <td class="row1" valign="middle"><span class="gen">{AIM_IMG}</span></td> - </tr> - <tr> - <td valign="middle"><span class="gen">{L_ICQ_NUMBER}:</span></td> - <td class="row1" valign="middle"><span class="gen">{ICQ_STATUS_IMG}{ICQ_ADD_IMG}</span></td> - </tr> - </table> - </td> - </tr> - </table> - </td> + <td valign="middle"><span class="gen">{L_ICQ_NUMBER}:</span></td> + <td class="row1" valign="middle"><span class="gen">{ICQ_STATUS_IMG}{ICQ_ADD_IMG}</span></td> </tr> </table> </td> @@ -94,6 +84,7 @@ </table> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> - <td align="right"><span class="nav">{JUMPBOX}</span></td> + <td align="right"><span class="nav"><br /> + {JUMPBOX}</span></td> </tr> </table> diff --git a/phpBB/templates/subSilver/search_body.tpl b/phpBB/templates/subSilver/search_body.tpl index f3db300c70..f51c97b181 100644 --- a/phpBB/templates/subSilver/search_body.tpl +++ b/phpBB/templates/subSilver/search_body.tpl @@ -4,77 +4,76 @@ <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> </tr> </table> - <table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> + <table border="0" cellpadding="4" cellspacing="1" width="100%" class="forumline"> <tr> - <td align="left" colspan="2" class="forumline"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> - <tr> - <td class="innerline"> - <table border="0" cellpadding="4" cellspacing="1" width="100%"> - <tr> - <th class="secondary" colspan="4" height="25">{L_SEARCH_QUERY}</th> - </tr> - <tr> - <td class="row1" colspan="2" width="50%"><span class="gen">{L_SEARCH_KEYWORDS}:</span><br /> - <span class="gensmall">{L_SEARCH_KEYWORDS_EXPLAIN}</span></td> - <td class="row2" colspan="2" valign="top"> - <input type="text" style="width: 300px" class="post" name="search_keywords" size="60" /> - <br /> - <input type="radio" name="addterms" value="any" checked /> - <span class="gensmall">{L_SEARCH_ANY_TERMS}<br /> - <input type="radio" name="addterms" value="all" /> - {L_SEARCH_ALL_TERMS}</span></td> - </tr> - <tr> - <td class="row1" colspan="2"><span class="gen">{L_SEARCH_AUTHOR}:</span><br /> - <span class="gensmall">{L_SEARCH_AUTHOR_EXPLAIN}</span></td> - <td class="row2" colspan="2" valign="middle"> - <input type="text" style="width: 300px" class="post" name="search_author" size="40" /> - </td> - </tr> - <tr> - <td class="cat" colspan="4" align="center" height="28"><b><span class="gen">{L_SEARCH_OPTIONS}</span></b></td> - </tr> - <tr> - <td class="row1" align="right"><span class="gen">{L_FORUM}: </span></td> - <td class="row2"> - <select class="post" name="searchforum">{S_FORUM_OPTIONS}</select> - </td> - <td class="row1" align="right"><span class="gen">{L_RETURN_FIRST}</span></td> - <td class="row2"> - <select class="post" name="charsreqd">{S_CHARACTER_OPTIONS} - </select> - <span class="gen">{L_CHARACTERS}</span></td> - </tr> - <tr> - <td class="row1" align="right"><span class="gen">{L_CATEGORY}: </span></td> - <td class="row2"> - <select class="post" name="searchcat">{S_CATEGORY_OPTIONS}</select> - </td> - <td class="row1" align="right"><span class="gen">{L_SORT_BY}: </span></td> - <td class="row2" valign="middle" nowrap> - <select class="post" name="sortby">{S_SORT_OPTIONS}</select> - <br /> - <input type="radio" name="sortdir" value="ASC" /> - <span class="gensmall">{L_SORT_ASCENDING}</span><br /> - <input type="radio" name="sortdir" value="DESC" checked /> - <span class="gensmall">{L_SORT_DESCENDING}</span> </td> - </tr> - <tr> - <td class="row1" align="right" nowrap><span class="gen">{L_DISPLAY_RESULTS}: </span></td> - <td class="row2" nowrap><input type="radio" name="showresults" value="posts" checked /><span class="gensmall">{L_POSTS}</span> <input type="radio" name="showresults" value="topics" /><span class="gensmall">{L_TOPICS}</span></td> - <td class="row1" align="right" nowrap><span class="gen">{L_SEARCH_PREVIOUS}: </span></td> - <td class="row2" valign="middle"><select name="resultdays">{S_TIME_OPTIONS}</select></td> - </tr> - <tr> - <td class="cat" colspan="4" align="center" height="28">{S_HIDDEN_FIELDS} - <input class="liteoption" type="submit" name="submit" value="{L_SEARCH}" /> - </td> - </tr> - </table> - </td> - </tr> - </table> + <th class="thHead" colspan="4" height="25">{L_SEARCH_QUERY}</th> + </tr> + <tr> + <td class="row1" colspan="2" width="50%"><span class="gen">{L_SEARCH_KEYWORDS}:</span><br /> + <span class="gensmall">{L_SEARCH_KEYWORDS_EXPLAIN}</span></td> + <td class="row2" colspan="2" valign="top"><span class="genmed"> + <input type="text" style="width: 300px" class="post" name="search_keywords" size="30" /> + <br /> + <input type="radio" name="addterms" value="any" checked /> + {L_SEARCH_ANY_TERMS}<br /> + <input type="radio" name="addterms" value="all" /> + {L_SEARCH_ALL_TERMS}</span></td> + </tr> + <tr> + <td class="row1" colspan="2"><span class="gen">{L_SEARCH_AUTHOR}:</span><br /> + <span class="gensmall">{L_SEARCH_AUTHOR_EXPLAIN}</span></td> + <td class="row2" colspan="2" valign="middle"><span class="genmed"> + <input type="text" style="width: 300px" class="post" name="search_author" size="30" /> + </span> </td> + </tr> + <tr> + <td class="catSides" colspan="4" align="center" height="28"><b><span class="gen">{L_SEARCH_OPTIONS}</span></b></td> + </tr> + <tr> + <td class="row1" align="right"><span class="gen">{L_FORUM}: </span></td> + <td class="row2"><span class="genmed"> + <select class="post" name="searchforum">{S_FORUM_OPTIONS} + </select> + </span></td> + <td class="row1" align="right"><span class="gen">{L_RETURN_FIRST}</span></td> + <td class="row2"><span class="genmed"> + <select class="post" name="charsreqd">{S_CHARACTER_OPTIONS} + </select> + {L_CHARACTERS}</span></td> + </tr> + <tr> + <td class="row1" align="right"><span class="gen">{L_CATEGORY}: </span></td> + <td class="row2"><span class="genmed"> + <select class="post" name="searchcat">{S_CATEGORY_OPTIONS} + </select> + </span></td> + <td class="row1" align="right"><span class="gen">{L_SORT_BY}: </span></td> + <td class="row2" valign="middle" nowrap="nowrap"><span class="genmed"> + <select class="post" name="sortby">{S_SORT_OPTIONS} + + </select> + <br /> + <input type="radio" name="sortdir" value="ASC" /> + {L_SORT_ASCENDING}<br /> + <input type="radio" name="sortdir" value="DESC" checked /> + {L_SORT_DESCENDING}</span> </td> + </tr> + <tr> + <td class="row1" align="right" nowrap="nowrap"><span class="gen">{L_DISPLAY_RESULTS}: </span></td> + <td class="row2" nowrap="nowrap"> + <input type="radio" name="showresults" value="posts" checked /> + <span class="genmed">{L_POSTS} + <input type="radio" name="showresults" value="topics" /> + {L_TOPICS}</span></td> + <td class="row1" align="right" nowrap="nowrap"><span class="gen">{L_SEARCH_PREVIOUS}: </span></td> + <td class="row2" valign="middle"><span class="genmed"> + <select class="post" name="sortby">{S_TIME_OPTIONS} + </select> + </span></td> + </tr> + <tr> + <td class="catBottom" colspan="4" align="center" height="28">{S_HIDDEN_FIELDS} + <input class="liteoption" type="submit" name="submit" value="{L_SEARCH}" /> </td> </tr> </table> diff --git a/phpBB/templates/subSilver/search_results_posts.tpl b/phpBB/templates/subSilver/search_results_posts.tpl index f5ba8b6c4c..8136106994 100644 --- a/phpBB/templates/subSilver/search_results_posts.tpl +++ b/phpBB/templates/subSilver/search_results_posts.tpl @@ -1,7 +1,7 @@ <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> - <td align="left" valign="bottom" colspan="3"><span class="titlemedium">{L_SEARCH} + <td align="left" valign="bottom" colspan="3"><span class="maintitle">{L_SEARCH} - {SEARCH_MATCHES} Matches</span><br /> </td> </tr> @@ -11,58 +11,37 @@ <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> </tr> </table> -<table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> +<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline"> <tr> - <td align="left" colspan="2" class="forumline"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> - <tr> - <td class="innerline"> - <table border="0" cellpadding="3" cellspacing="1" width="100%"> - <tr> - <th width="22%" height="28">{L_AUTHOR}</th> - <th height="28">{L_MESSAGE}</th> - </tr> - <!-- BEGIN searchresults --> - <tr> - <td class="cat" colspan="2" height="28"><span class="topictitle"><img src="templates/subSilver/images/folder.gif" align="absmiddle"> {L_TOPIC}: <a href="{searchresults.U_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a></span></td> - </tr> - <tr> - <td width="22%" align="left" valign="top" class="row1"><span class="name"><a href="{searchresults.U_USER_PROFILE}" class="name"><b>{searchresults.POSTER_NAME}</b></a></span><br> - <br /> - <span class="postdetails">{L_REPLIES}: <b>{searchresults.TOPIC_REPLIES}</b><br> - {L_VIEWS}: <b>{searchresults.TOPIC_VIEWS}</b></span><br /> - </td> - <td valign="top" class="row1"> - <table width="100%" cellspacing="0" cellpadding="3" border="0"> - <tr> - <td valign="middle"><img src="templates/subSilver/images/icon_minipost.gif" alt="Post image icon"><span class="postdetails">{L_FORUM}: <b><a href="{U_FORUM}" class="postdetails">{searchresults.FORUM_NAME}</a></b> {L_POSTED}: - {searchresults.POST_DATE} Subject: <b><a href="{searchresults.U_POST}">{searchresults.POST_SUBJECT}</a></b></span></td> - </tr> - <tr> - <td valign="top"> - <hr size="1" /> - <span class="postbody">{searchresults.MESSAGE}</span></td> - </tr> - </table> - </td> - </tr> - <!-- END searchresults --> - <tr> - <td class="cat" colspan="2" height="28" align="center"> </td> - </tr> - </table> - </td> - </tr> - </table> + <th width="22%" height="25" class="thCornerL">{L_AUTHOR}</th> + <th class="thCornerR">{L_MESSAGE}</th> + </tr> + <!-- BEGIN searchresults --> + <tr> + <td class="cat" colspan="2" height="28"><span class="topictitle"><img src="templates/subSilver/images/folder.gif" align="absmiddle"> {L_TOPIC}: <a href="{searchresults.U_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a></span></td> + </tr> + <tr> + <td width="22%" align="left" valign="top" class="row1" rowspan="2"><span class="name"><a href="{searchresults.U_USER_PROFILE}" class="name"><b>{searchresults.POSTER_NAME}</b></a></span><br /> + <br /> + <span class="postdetails">{L_REPLIES}: <b>{searchresults.TOPIC_REPLIES}</b><br /> + {L_VIEWS}: <b>{searchresults.TOPIC_VIEWS}</b></span><br /> </td> + <td valign="top" class="row1"> <img src="templates/subSilver/images/icon_minipost.gif" alt="Post image icon"><span class="postdetails">{L_FORUM}: <b><a href="{U_FORUM}" class="postdetails">{searchresults.FORUM_NAME}</a></b> {L_POSTED}: + {searchresults.POST_DATE} Subject: <b><a href="{searchresults.U_POST}">{searchresults.POST_SUBJECT}</a></b></span></td> + </tr> + <tr> + <td valign="top" class="row1"><span class="postbody">{searchresults.MESSAGE}</span></td> + </tr> + <!-- END searchresults --> + <tr> + <td class="catBottom" colspan="2" height="28" align="center"> </td> </tr> </table> <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2"> <tr> <td align="left" valign="top"><span class="nav"> {L_PAGE} <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></span></td> - <td align="right" valign="top" nowrap><span class="nav">{PAGINATION}</span> - <span class="gensmall"><br /> + <td align="right" valign="top" nowrap="nowrap"><span class="nav">{PAGINATION}</span><span class="gensmall"><br /> {S_TIMEZONE}</span></td> </tr> </table> diff --git a/phpBB/templates/subSilver/search_results_topics.tpl b/phpBB/templates/subSilver/search_results_topics.tpl index 8b979c9055..62d0c8e2d8 100644 --- a/phpBB/templates/subSilver/search_results_topics.tpl +++ b/phpBB/templates/subSilver/search_results_topics.tpl @@ -1,7 +1,7 @@ <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> - <td align="left" valign="bottom" colspan="3"><span class="cattitle">{L_SEARCH} + <td align="left" valign="bottom" colspan="3"><span class="maintitle">{L_SEARCH} - {SEARCH_MATCHES} Matches</span><br /> </td> </tr> @@ -11,54 +11,41 @@ <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> </tr> </table> -<table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> +<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> <tr> - <td align="left" colspan="2" class="forumline"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> - <tr> - <td class="innerline"> - <table width="100%" cellpadding="4" cellspacing="1" border="0"> - <tr> - <th width="4%" height="28"> </th> - <th height="28"> {L_FORUM} </th> - <th height="28"> {L_TOPICS} </th> - <th height="28"> {L_REPLIES} </th> - <th height="28"> {L_AUTHOR} </th> - <th height="28"> {L_VIEWS} </th> - <th height="28"> {L_LASTPOST} </th> - </tr> - <!-- BEGIN searchresults --> - <tr> - <td class="row1" align="center" valign="middle">{searchresults.FOLDER}</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><span class="gensmall"> {searchresults.GOTO_PAGE}</span></td> - <td class="row1" align="center" valign="middle"><span class="postdetails">{searchresults.REPLIES}</span></td> - <td class="row2" align="center" valign="middle"><span class="name"><a href="{searchresults.U_TOPIC_POSTER_PROFILE}" class="name">{searchresults.TOPIC_POSTER}</a></span></td> - <td class="row1" align="center" valign="middle"><span class="postdetails">{searchresults.VIEWS}</span></td> - <td class="row2" align="center" valign="middle" nowrap><span class="postdetails">{searchresults.LAST_POST}</span></td> - </tr> - <!-- 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> - <td class="cat" colspan="7" height="28" valign="middle"> </td> - </tr> - </table> - </td> - </tr> - </table> - </td> + <th width="4%" height="25" class="thCornerL"> </th> + <th class="thTop"> {L_FORUM} </th> + <th class="thTop"> {L_TOPICS} </th> + <th class="thTop"> {L_REPLIES} </th> + <th class="thTop"> {L_AUTHOR} </th> + <th class="thTop"> {L_VIEWS} </th> + <th class="thCornerR"> {L_LASTPOST} </th> + </tr> + <!-- BEGIN searchresults --> + <tr> + <td class="row1" align="center" valign="middle">{searchresults.FOLDER}</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><span class="gensmall"> {searchresults.GOTO_PAGE}</span></td> + <td class="row1" align="center" valign="middle"><span class="postdetails">{searchresults.REPLIES}</span></td> + <td class="row2" align="center" valign="middle"><span class="name"><a href="{searchresults.U_TOPIC_POSTER_PROFILE}" class="name">{searchresults.TOPIC_POSTER}</a></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> + </tr> + <!-- 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> + <td class="catBottom" colspan="7" height="28" valign="middle"> </td> </tr> </table> <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2"> <tr> <td align="left" valign="top"><span class="nav"> {L_PAGE} <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></span></td> - <td align="right" valign="top" nowrap><span class="nav">{PAGINATION}</span> - <span class="gensmall"><br /> + <td align="right" valign="top" nowrap="nowrap"><span class="nav">{PAGINATION}</span><span class="gensmall"><br /> {S_TIMEZONE}</span></td> </tr> </table> diff --git a/phpBB/templates/subSilver/split_body.tpl b/phpBB/templates/subSilver/split_body.tpl index 1f399c4d07..fe7c74b340 100644 --- a/phpBB/templates/subSilver/split_body.tpl +++ b/phpBB/templates/subSilver/split_body.tpl @@ -1,81 +1,61 @@ - +<form method="post" action="{S_SPLIT_ACTION}"> <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> - <td align="left" valign="bottom" nowrap><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a> + <td align="left" valign="bottom" nowrap="nowrap"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a> -> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td> </tr> </table> - <table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> + <table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline"> + <tr align="center"> + <td class="catHead" colspan="3" height="28"><b><span class="cattitle">{L_SPLIT_TOPIC}</span></b></td> + </tr> + <tr align="center"> + <td class="row2" colspan="3"><span class="gensmall">{L_SPLIT_TOPIC_EXPLAIN}</span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_SPLIT_SUBJECT}</span></td> + <td class="row2" colspan="2"><span class="genmed"> + <input type="text" size="45" maxlength="100" name="subject" style="width:450px" class="post"> + </span></td> + </tr> + <tr> + <td class="row1"><span class="gen">{L_SPLIT_FORUM}</span></td> + <td class="row2" colspan="2"><span class="genmed">{FORUM_INPUT}</span></td> + </tr> + {POLL_DISPLAY} + <tr> + <th width="22%" height="26" class="thLeft">{L_AUTHOR}</th> + <th>{L_MESSAGE}</th> + <th class="thRight">{L_SELECT}</th> + </tr> + <!-- BEGIN postrow --> + <tr> + <td width="22%" align="left" valign="top" class="row1" rowspan="2"><span class="name">{postrow.POSTER_NAME}</span> + </td> + <td valign="top" class="row2"> <img src="images/icon_minipost.gif" alt="Post image icon"><span class="postdetails">{L_POSTED}: + {postrow.POST_DATE} {L_POST_SUBJECT}: {postrow.POST_SUBJECT}</span></td> + <td valign="middle" class="row1" align="center" rowspan="2"> + <input type="checkbox" name="preform_op[]" value="{postrow.POST_ID}"> + </td> + </tr> + <tr> + <td valign="top" class="row2"><span class="postbody">{postrow.MESSAGE}</span></td> + </tr> + <tr> + <td colspan="3" height="1" class="spaceRow"><img src="templates/subSilver/images/spacer.gif" width="1" height="1" alt="."></td> + </tr> + <!-- END postrow --> <tr> - <td align="left" colspan="2" class="forumline"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> - <tr><form method="post" action="{S_SPLIT_ACTION}"> - <td class="innerline"> - <table border="0" cellpadding="3" cellspacing="1" width="100%"> - <tr align="center"> - <td class="cat" colspan="3" height="28"><b><span class="cattitle">{L_SPLIT_TOPIC}</span></b></td> - </tr> - <tr align="center"> - <td class="row2" colspan="3"><span class="gensmall">{L_SPLIT_TOPIC_EXPLAIN}</span></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_SPLIT_SUBJECT}</span></td> - <td class="row2" colspan="2"><span class="genmed"> - <input type="text" size="45" maxlength="100" name="subject" style="width:450px" class="post"> - </span></td> - </tr> - <tr> - <td class="row1"><span class="gen">{L_SPLIT_FORUM}</span></td> - <td class="row2" colspan="2"><span class="genmed">{FORUM_INPUT}</span></td> - </tr> - {POLL_DISPLAY} - <tr> - <th width="22%" height="26">{L_AUTHOR}</th> - <th>{L_MESSAGE}</th> - <th>{L_SELECT}</th> - </tr> - <!-- BEGIN postrow --> - <tr> - <td width="22%" align="left" valign="top" class="row1"><span class="name">{postrow.POSTER_NAME}</span> - </td> - <td valign="top" class="row2"> - <table width="100%" cellspacing="0" cellpadding="3" border="0"> - <tr> - <td valign="middle"><img src="images/icon_minipost.gif" alt="Post image icon"><span class="postdetails">{L_POSTED}: - {postrow.POST_DATE} {L_POST_SUBJECT}: - {postrow.POST_SUBJECT}</span></td> - </tr> - <tr> - <td valign="top"> - <hr size="1" /> - <span class="postbody">{postrow.MESSAGE}</span></td> - </tr> - </table> - </td> - <td valign="middle" class="row1" align="center"> - <input type="checkbox" name="preform_op[]" value="{postrow.POST_ID}"> - </td> - </tr> - <tr> - <td colspan="3" height="1" class="row3"><img src="templates/subSilver/images/spacer.gif" width="1" height="1" alt="."></td> - </tr> - <!-- END postrow --> - <tr> - <td class="cat" colspan="3" height="28" align="center">{S_HIDDEN_FIELDS} - <input type="submit" name="split_type_all" value="{L_SPLIT_POSTS}" class="liteoption"> - - <input type="submit" name="split_type_beyond" value="{L_SPLIT_AFTER}" class="liteoption"> - </td> - </tr> - </table> - </td> - </form></tr> - </table> + <td class="catBottom" colspan="3" height="28" align="center">{S_HIDDEN_FIELDS} + <input type="submit" name="split_type_all" value="{L_SPLIT_POSTS}" class="liteoption"> + + <input type="submit" name="split_type_beyond" value="{L_SPLIT_AFTER}" class="liteoption"> </td> </tr> </table> <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2"> <tr> - <td align="right" valign="top" nowrap><span class="gensmall">{S_TIMEZONE}</span></td> + <td align="right" valign="top" nowrap="nowrap"><span class="gensmall">{S_TIMEZONE}</span></td> </tr> </table> +</form>
\ No newline at end of file diff --git a/phpBB/templates/subSilver/subSilver.cfg b/phpBB/templates/subSilver/subSilver.cfg index 984dddf1e5..f7dcc522be 100644 --- a/phpBB/templates/subSilver/subSilver.cfg +++ b/phpBB/templates/subSilver/subSilver.cfg @@ -35,7 +35,9 @@ $images['icon_aim'] = "templates/subSilver/images/icon_aim.gif"; $images['icon_yim'] = "templates/subSilver/images/icon_yim.gif"; $images['icon_msnm'] = "templates/subSilver/images/icon_msnm.gif"; $images['icon_minipost'] = "templates/subSilver/images/icon_minipost.gif"; +$images['icon_minipost_new'] = "templates/subSilver/images/icon_minipost_new.gif"; $images['icon_latest_reply'] = "templates/subSilver/images/icon_latest_reply.gif"; +$images['icon_newest_reply'] = "templates/subSilver/images/icon_newest_reply.gif"; $images['forum'] = "templates/subSilver/images/folder_big.gif"; $images['forum_new'] = "templates/subSilver/images/folder_new_big.gif"; @@ -65,7 +67,8 @@ $images['pm_readmsg'] = "templates/subSilver/images/folder.gif"; $images['pm_unreadmsg'] = "templates/subSilver/images/folder_new.gif"; $images['pm_replymsg'] = "templates/subSilver/images/reply.gif"; $images['pm_postmsg'] = "templates/subSilver/images/msg_newpost.gif"; -$images['pm_quotemsg'] = "images/icon_quote.gif"; +$images['pm_quotemsg'] = "templates/subSilver/images/icon_quote.gif"; +$images['pm_editmsg'] = "templates/subSilver/images/icon_edit.gif"; $images['topic_watch'] = ""; $images['topic_un_watch'] = ""; @@ -97,16 +100,15 @@ $images['auth_mod'] = ""; // Vote graphic length defines the maximum length of a vote result // graphic, ie. 100% = this length // -$board_config['vote_graphic_length'] = 300; +$board_config['vote_graphic_length'] = 205; +$board_config['privmsg_graphic_length'] = 175; // // Default theme to use (can be blank if // themes aren't supported by this template) // -$template_default_theme = "subSilver-Default"; +$template_default_theme = "subSilver-subSilver"; -// Would be nice to use a standard vanilla admin template (since most people will only be bothered in theming the public side) -//$template_admin_theme = "PSO-Default"; ?>
\ No newline at end of file diff --git a/phpBB/templates/subSilver/viewforum_body.tpl b/phpBB/templates/subSilver/viewforum_body.tpl index 033358f95b..04fa491823 100644 --- a/phpBB/templates/subSilver/viewforum_body.tpl +++ b/phpBB/templates/subSilver/viewforum_body.tpl @@ -2,64 +2,51 @@ <form method="post" action="{S_POST_DAYS_ACTION}"> <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> <tr> - <td align="left" valign="bottom" colspan="3"><span class="titlemedium">{FORUM_NAME}</span><br /> + <td align="left" valign="bottom" colspan="3"><span class="maintitle">{FORUM_NAME}</span><br /> <b><span class="gensmall">{L_MODERATOR}: {MODERATORS}<br /> {PAGINATION}<br /> </span></b></td> </tr> <tr> - <td align="left" valign="middle" width="50"><a href="{U_POST_NEW_TOPIC}"><img src="{IMG_POST}" border="0" alt="{L_NEW_TOPIC}" /></a></td> + <td align="left" valign="middle" width="50"><a href="{U_POST_NEW_TOPIC}"><img src="{IMG_POST}" border="0" alt="{L_NEW_TOPIC}" width="82" height="25" /></a></td> <td align="left" valign="middle" class="nav" width="100%"><span class="nav"> <a href="index.php" class="nav">phpBB v2.0 Forum Index</a> -> {FORUM_NAME}</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> </table> - <table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> + <table border="0" cellpadding="4" cellspacing="1" width="100%" class="forumline"> <tr> - <td align="left" colspan="2" class="forumline"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> - <tr> - <td class="innerline"> - <table border="0" cellpadding="4" cellspacing="1" width="100%"> - <tr> - <th colspan="2" align="center" height="26"> {L_TOPICS} </th> - <th width="50" align="center"> {L_REPLIES} </th> - <th width="100" align="center"> {L_AUTHOR} </th> - <th width="50" align="center"> {L_VIEWS} </th> - <th align="center" nowrap="nowrap"> {L_LASTPOST} </th> - </tr> - <!-- BEGIN topicrow --> - <tr> - <td class="row1" align="center" valign="middle" width="20">{topicrow.FOLDER}</td> - <td class="row1" width="100%"><span class="topictitle">{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> - <td class="row2" align="center" valign="middle"><span class="postdetails">{topicrow.REPLIES}</span></td> - <td class="row3" align="center" valign="middle"><span class="name"><a href="{topicrow.U_TOPIC_POSTER_PROFILE}" class="name">{topicrow.TOPIC_POSTER}</a></span></td> - <td class="row2" align="center" valign="middle"><span class="postdetails">{topicrow.VIEWS}</span></td> - <td class="row3" align="center" valign="middle" nowrap="nowrap"> - <span class="postdetails">{topicrow.LAST_POST}</span></td> - </tr> - <!-- END topicrow --> - <!-- BEGIN notopicsrow --> - <tr> - <td class="row1" colspan="6" height="30" align="center" valign="middle"><span class="gen">{L_NO_TOPICS}</span></td> - </tr> - <!-- END notopicsrow --> - <tr> - <td class="cat" align="center" valign="middle" colspan="6"><span class="genmed">{L_DISPLAY_TOPICS}: {S_SELECT_TOPIC_DAYS} - <input type="submit" class="liteoption" value="{L_GO}" /> - </span></td> - </tr> - </table> - </td> - </tr> - </table> - </td> + <th colspan="2" align="center" height="25" class="thCornerL"> {L_TOPICS} </th> + <th width="50" align="center" class="thTop"> {L_REPLIES} </th> + <th width="100" align="center" class="thTop"> {L_AUTHOR} </th> + <th width="50" align="center" class="thTop"> {L_VIEWS} </th> + <th align="center" nowrap="nowrap" class="thCornerR"> {L_LASTPOST} </th> + </tr> + <!-- BEGIN topicrow --> + <tr> + <td class="row1" align="center" valign="middle" width="20">{topicrow.FOLDER}</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 /> + {topicrow.GOTO_PAGE}</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"><a href="{topicrow.U_TOPIC_POSTER_PROFILE}" class="name">{topicrow.TOPIC_POSTER}</a></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> + </tr> + <!-- END topicrow --> + <!-- BEGIN notopicsrow --> + <tr> + <td class="row1" colspan="6" height="30" align="center" valign="middle"><span class="gen">{L_NO_TOPICS}</span></td> + </tr> + <!-- END notopicsrow --> + <tr> + <td class="catBottom" align="center" valign="middle" colspan="6" height="28"><span class="genmed">{L_DISPLAY_TOPICS}: {S_SELECT_TOPIC_DAYS} + <input type="submit" class="liteoption" value="{L_GO}" name="submit" /> + </span></td> </tr> </table> <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2"> <tr> - <td align="left" valign="middle" width="50"><a href="{U_POST_NEW_TOPIC}"><img src="{IMG_POST}" border="0" alt="{L_NEW_TOPIC}" /></a></td> + <td align="left" valign="middle" width="50"><a href="{U_POST_NEW_TOPIC}"><img src="{IMG_POST}" border="0" alt="{L_NEW_TOPIC}" width="82" height="25" /></a></td> <td align="left" valign="middle" width="100%"><span class="nav"> {L_PAGE} <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></span></td> <td align="right" valign="top" nowrap="nowrap"><span class="nav">{PAGINATION}</span> diff --git a/phpBB/templates/subSilver/viewonline_body.tpl b/phpBB/templates/subSilver/viewonline_body.tpl index f20fca36d3..35c279d80b 100644 --- a/phpBB/templates/subSilver/viewonline_body.tpl +++ b/phpBB/templates/subSilver/viewonline_body.tpl @@ -4,47 +4,35 @@ <td align="left"><span class="nav"><a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a></span></td> </tr> </table> -<table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> - <tr> - <td align="left" colspan="2" class="forumline"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> - <tr> - <td class="innerline"> - <table width="100%" cellpadding="4" cellspacing="1" border="0"> - <tr> - <th width="35%"> {L_USERNAME} </th> - <th width="25%"> {L_LAST_UPDATE} </th> - <th width="40%"> {L_LOCATION} </th> - </tr> - <tr> - <td class="cat" colspan="3" height="28"><span class="cattitle"><b>{TOTAL_REGISTERED_USERS_ONLINE}</b></span></td> - </tr> - <!-- BEGIN reg_user_row --> - <tr> - <td width="35%" class="{reg_user_row.ROW_CLASS}"> <span class="gen"><a href="{reg_user_row.U_USER_PROFILE}" class="gen">{reg_user_row.USERNAME}</a></span> </td> - <td width="25%" align="center" nowrap class="{reg_user_row.ROW_CLASS}"> <span class="gen">{reg_user_row.LASTUPDATE}</span> </td> - <td width="40%" class="{reg_user_row.ROW_CLASS}"> <span class="gen"><a href="{reg_user_row.U_FORUM_LOCATION}" class="gen">{reg_user_row.LOCATION}</a></span> </td> - </tr> - <!-- END reg_user_row --> - <tr> - <td colspan="3" height="1" class="row3"><img src="templates/subSilver/images/spacer.gif" width="1" height="1" alt="."></td> - </tr> - <tr> - <td class="cat" colspan="3" height="28"><span class="cattitle"><b>{TOTAL_GUEST_USERS_ONLINE}</b></span></td> - </tr> - <!-- BEGIN guest_user_row --> - <tr> - <td width="35%" class="{guest_user_row.ROW_CLASS}"> <span class="gen"><a href="{guest_user_row.U_USER_PROFILE}" class="gen">{guest_user_row.USERNAME}</a></span> </td> - <td width="25%" align="center" nowrap class="{guest_user_row.ROW_CLASS}"> <span class="gen">{guest_user_row.LASTUPDATE}</span> </td> - <td width="40%" class="{guest_user_row.ROW_CLASS}"> <span class="gen"><a href="{guest_user_row.U_FORUM_LOCATION}" class="gen">{guest_user_row.LOCATION}</a></span> </td> - </tr> - <!-- END guest_user_row --> - </table> - </td> - </tr> - </table> - </td> +<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline"> + <tr> + <th width="35%" class="thCornerL" height="25"> {L_USERNAME} </th> + <th width="25%" class="thTop"> {L_LAST_UPDATE} </th> + <th width="40%" class="thCornerR"> {L_LOCATION} </th> + </tr> + <tr> + <td class="catSides" colspan="3" height="28"><span class="cattitle"><b>{TOTAL_REGISTERED_USERS_ONLINE}</b></span></td> + </tr> + <!-- BEGIN reg_user_row --> + <tr> + <td width="35%" class="{reg_user_row.ROW_CLASS}"> <span class="gen"><a href="{reg_user_row.U_USER_PROFILE}" class="gen">{reg_user_row.USERNAME}</a></span> </td> + <td width="25%" align="center" nowrap="nowrap" class="{reg_user_row.ROW_CLASS}"> <span class="gen">{reg_user_row.LASTUPDATE}</span> </td> + <td width="40%" class="{reg_user_row.ROW_CLASS}"> <span class="gen"><a href="{reg_user_row.U_FORUM_LOCATION}" class="gen">{reg_user_row.LOCATION}</a></span> </td> + </tr> + <!-- END reg_user_row --> + <tr> + <td colspan="3" height="1" class="row3"><img src="templates/subSilver/images/spacer.gif" width="1" height="1" alt="."></td> + </tr> + <tr> + <td class="catSides" colspan="3" height="28"><span class="cattitle"><b>{TOTAL_GUEST_USERS_ONLINE}</b></span></td> + </tr> + <!-- BEGIN guest_user_row --> + <tr> + <td width="35%" class="{guest_user_row.ROW_CLASS}"> <span class="gen"><a href="{guest_user_row.U_USER_PROFILE}" class="gen">{guest_user_row.USERNAME}</a></span> </td> + <td width="25%" align="center" nowrap="nowrap" class="{guest_user_row.ROW_CLASS}"> <span class="gen">{guest_user_row.LASTUPDATE}</span> </td> + <td width="40%" class="{guest_user_row.ROW_CLASS}"> <span class="gen"><a href="{guest_user_row.U_FORUM_LOCATION}" class="gen">{guest_user_row.LOCATION}</a></span> </td> </tr> + <!-- END guest_user_row --> </table> <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2"> <tr> diff --git a/phpBB/templates/subSilver/viewtopic_body.tpl b/phpBB/templates/subSilver/viewtopic_body.tpl index a19090e44b..db1e365599 100644 --- a/phpBB/templates/subSilver/viewtopic_body.tpl +++ b/phpBB/templates/subSilver/viewtopic_body.tpl @@ -1,88 +1,78 @@ - -<table width="100%" cellspacing="2" cellpadding="2" border="0" align="center"> + +<table width="100%" cellspacing="2" cellpadding="2" border="0"> <tr> - <td align="left" valign="bottom" colspan="2"><span class="titlemedium">{TOPIC_TITLE}</span><br /> + <td align="left" valign="bottom" colspan="2"><span class="maintitle">{TOPIC_TITLE}</span><br /> <span class="gensmall"><b>{PAGINATION}</b><br /> </span></td> </tr> +</table> +<table width="100%" cellspacing="2" cellpadding="2" border="0"> <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_TOPIC_POST}" align="middle" /></a> <a href="{U_POST_REPLY_TOPIC}"><img src="{IMG_REPLY}" border="0" alt="{L_TOPIC_REPLY}" align="middle" /></a></span></td> + <td align="left" valign="bottom" nowrap="nowrap"><span class="nav"><a href="{U_POST_NEW_TOPIC}"><img src="{IMG_POST}" border="0" alt="{L_TOPIC_POST}" align="middle" width="82" height="25" /></a> <a href="{U_POST_REPLY_TOPIC}"><img src="{IMG_REPLY}" border="0" alt="{L_TOPIC_REPLY}" align="middle" width="82" height="25" /></a></span></td> <td align="left" valign="middle" width="100%"><span class="nav"> <a href="{U_INDEX}" class="nav">{SITENAME} {L_INDEX}</a> -> <a href="{U_VIEW_FORUM}" class="nav">{FORUM_NAME}</a></span></td> </tr> </table> -<table width="100%" cellspacing="0" cellpadding="2" border="0" align="center"> +<table border="0" cellpadding="3" cellspacing="1" width="100%" class="forumline"> + <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> + :: <a href="{U_VIEW_NEWER_TOPIC}" class="nav">{L_VIEW_NEXT_TOPIC}</a> </span></td> + </tr> + {POLL_DISPLAY} <tr> - <td align="left" colspan="2" class="forumline"> - <table width="100%" border="0" cellspacing="0" cellpadding="1"> + <th class="thLeft" width="22%" height="26">{L_AUTHOR}</th> + <th class="thRight">{L_MESSAGE}</th> + </tr> + <!-- BEGIN postrow --> + <tr> + <td width="22%" align="left" valign="top" class="{postrow.ROW_CLASS}" rowspan="2"><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 class="{postrow.ROW_CLASS}" height="28"> + <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> - <td class="innerline"> - <table border="0" cellpadding="3" cellspacing="1" width="100%"> - <tr align="right"> - <td class="cat" 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> - </span></td> - </tr> - {POLL_DISPLAY} - <tr> - <th width="22%" height="26">{L_AUTHOR}</th> - <th>{L_MESSAGE}</th> - </tr> - <!-- BEGIN postrow --> - <tr> - <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 /> - <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 valign="top" class="{postrow.ROW_CLASS}"> - <table width="100%" cellspacing="0" cellpadding="3" border="0"> - <tr> - <td valign="middle"><img src="images/icon_minipost.gif" alt="Post image icon" /><span class="postdetails">{L_POSTED}: - {postrow.POST_DATE} {L_POST_SUBJECT}: - {postrow.POST_SUBJECT}</span></td> - <td align="right" valign="middle" nowrap="nowrap"> {postrow.EDIT_IMG} - {postrow.QUOTE_IMG} </td> - </tr> - <tr> - <td valign="top" colspan="2"> - <hr size="1" /> - <span class="postbody">{postrow.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">Back - to top</a></span></td> - <td width="78%" height="28" valign="bottom" class="{postrow.ROW_CLASS}"> - <table cellspacing="0" cellpadding="0" border="0" width="100%"> - <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} </td> - <td valign="top" align="left" width="100%">{postrow.ICQ_STATUS_IMG}{postrow.ICQ_ADD_IMG}</td> - <td valign="top" align="right">{postrow.IP_IMG}</td> - </tr> - </table> - </td> - </tr> - <tr> - <td colspan="2" height="1" class="row3"><img src="templates/subSilver/images/spacer.gif" width="1" height="1" alt="." /></td> - </tr> - <!-- END postrow --> - <tr align="center"> - <form method="post" action="{S_POST_DAYS_ACTION}"> - <td class="cat" colspan="2" height="28"><span class="gensmall">{L_DISPLAY_POSTS}: {S_SELECT_POST_DAYS} {S_SELECT_POST_ORDER} - <input type="submit" value="{L_GO}" class="liteoption" /> - </span> </td> - </form> - </tr> - </table> - </td> + <td>{postrow.MINI_POST_IMG}<span class="postdetails">{L_POSTED}: {postrow.POST_DATE}<span class="gen"> </span> {L_POST_SUBJECT}: + {postrow.POST_SUBJECT}</span></td> + <td nowrap="nowrap" valign="top" align="right">{postrow.IP_IMG} {postrow.QUOTE_IMG} + {postrow.EDIT_IMG}</td> + </tr> + </table> + </td> + </tr> + <tr> + <td valign="top" class="{postrow.ROW_CLASS}"><span class="postbody" style="line-height: 150%">{postrow.MESSAGE}</span></td> + </tr> + <tr> + <td width="22%" align="left" valign="middle" class="{postrow.ROW_CLASS}"><span class="nav"><a href="#top" class="nav">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"> + <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} </td> + <td valign="top" align="left" nowrap="nowrap">{postrow.ICQ_ADD_IMG}</td> + </tr> + </table> + </td> + </tr> + <tr> + <td colspan="2" height="1" class="spaceRow"><img src="templates/subSilver/images/spacer.gif" alt="" width="1" height="1" /></td> + </tr> + <!-- END postrow --> + <tr align="center"> + <td class="catBottom" colspan="2" height="28"> + <table border="0" cellspacing="0" cellpadding="0"> + <tr> + <form method="post" action="{S_POST_DAYS_ACTION}"> + <td align="center"><span class="gensmall">{L_DISPLAY_POSTS}: {S_SELECT_POST_DAYS} {S_SELECT_POST_ORDER} + <input type="submit" value="{L_GO}" class="liteoption" name="submit" /> + </span></td> + </form> </tr> </table> </td> @@ -90,7 +80,7 @@ </table> <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2"> <tr> - <td align="left" valign="middle" nowrap="nowrap"><a href="{U_POST_NEW_TOPIC}"><img src="{IMG_POST}" border="0" alt="{L_TOPIC_POST}" align="middle" /></a> <a href="{U_POST_REPLY_TOPIC}"><img src="{IMG_REPLY}" border="0" alt="{L_TOPIC_REPLY}" align="middle" /></a><span class="nav"></span></td> + <td align="left" valign="middle" nowrap="nowrap"><a href="{U_POST_NEW_TOPIC}"><img src="{IMG_POST}" border="0" alt="{L_TOPIC_POST}" align="middle" width="82" height="25" /></a> <a href="{U_POST_REPLY_TOPIC}"><img src="{IMG_REPLY}" border="0" alt="{L_TOPIC_REPLY}" align="middle" width="82" height="25" /></a><span class="nav"></span></td> <td align="left" valign="middle" width="100%"><span class="nav"> {L_PAGE} <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></span></td> <td align="right" valign="top" nowrap="nowrap"><span class="nav">{PAGINATION}</span> diff --git a/phpBB/templates/subSilver/viewtopic_poll_result.tpl b/phpBB/templates/subSilver/viewtopic_poll_result.tpl index 7b5be030f0..4da0300234 100644 --- a/phpBB/templates/subSilver/viewtopic_poll_result.tpl +++ b/phpBB/templates/subSilver/viewtopic_poll_result.tpl @@ -1,29 +1,36 @@ - <tr> - <td class="row2" colspan="2"><br clear="all" /><table cellspacing="0" cellpadding="4" border="0" align="center"> - <tr> - + +<tr> + <td class="row2" colspan="2"><br clear="all" /> + <table cellspacing="0" cellpadding="4" border="0" align="center"> + <tr> <td colspan="4" align="center"><span class="gen"><b>{POLL_QUESTION}</b></span></td> - </tr> - <tr> - <td align="center"><table cellspacing="0" cellpadding="2" border="0"> - <!-- BEGIN poll_option --> - <tr> - + </tr> + <tr> + <td align="center"> + <table cellspacing="0" cellpadding="2" border="0"> + <!-- BEGIN poll_option --> + <tr> <td><span class="gen">{poll_option.POLL_OPTION_CAPTION}</span></td> - <td><table width="{poll_option.POLL_OPTION_IMG_WIDTH}" cellspacing="0" cellpadding="0" border="0"> - <tr> - <td width="100%" bgcolor="{poll_option.POLL_OPTION_IMG_COLOR}"><img src="{poll_option.POLL_OPTION_IMG}" width="{poll_option.POLL_OPTION_IMG_WIDTH}" height="8" alt="{poll_option.POLL_OPTION_PERCENT}" /></td> - </tr> - </table></td> - - <td align="center"> <b><span class="gen">{poll_option.POLL_OPTION_PERCENT}</span></b> </td> - <td align="center"> <span class="gen">[ {poll_option.POLL_OPTION_RESULT} ]</span> </td> - </tr> - <!-- END poll_option --> - </table></td> - </tr> - <tr> - <td colspan="4" align="center"><span class="gen"><b>Total Votes : {TOTAL_VOTES}</b></span></td> - </tr> - </table><br clear="all" /></td> - </tr>
\ No newline at end of file + <td> + <table cellspacing="0" cellpadding="0" border="0"> + <tr> + <td><img src="templates/subSilver/images/vote_lcap.gif" width="4" alt="" height="12" /></td> + <td><img src="{poll_option.POLL_OPTION_IMG}" width="{poll_option.POLL_OPTION_IMG_WIDTH}" height="12" alt="{poll_option.POLL_OPTION_PERCENT}" /></td> + <td><img src="templates/subSilver/images/vote_rcap.gif" width="4" alt="" height="12" /></td> + </tr> + </table> + </td> + <td align="center"><b><span class="gen"> {poll_option.POLL_OPTION_PERCENT} </span></b></td> + <td align="center"><span class="gen">[ {poll_option.POLL_OPTION_RESULT} ]</span></td> + </tr> + <!-- END poll_option --> + </table> + </td> + </tr> + <tr> + <td colspan="4" align="center"><span class="gen"><b>Total Votes : {TOTAL_VOTES}</b></span></td> + </tr> + </table> + <br clear="all" /> + </td> +</tr> diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 31a15b232c..86e131322a 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -281,7 +281,7 @@ $sql = "SELECT t.*, u.username, u.user_id, u2.username as user2, u2.user_id as i AND t.topic_poster = u.user_id AND p.post_id = t.topic_last_post_id AND p.poster_id = u2.user_id - AND t.topic_type <> " . POST_ANNOUNCE . " + AND t.topic_type <> " . POST_ANNOUNCE . " $limit_topics_time ORDER BY t.topic_type DESC, p.post_time DESC LIMIT $start, ".$board_config['topics_per_page']; @@ -522,16 +522,29 @@ if($total_topics) if( empty($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id]) && $topic_rowset[$i]['post_time'] > $userdata['session_last_visit'] ) { $folder_image = "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" />"; + + $newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest\"><img src=\"" . $images['icon_newest_reply'] . "\" alt=\"" . $lang['View_newest_posts'] . "\" border=\"0\" /></a> "; } else { if( isset($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id]) ) { - $folder_image = ($HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id] < $topic_rowset[$i]['post_time'] ) ? "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" />" : "<img src=\"$folder\" alt=\"" . $lang['No_new_posts'] . "\" />"; + if( $HTTP_COOKIE_VARS['phpbb2_' . $forum_id . '_' . $topic_id] < $topic_rowset[$i]['post_time'] ) + { + $folder_image = "<img src=\"$folder_new\" alt=\"" . $lang['New_posts'] . "\" />"; + + $newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest\"><img src=\"" . $images['icon_newest_reply'] . "\" alt=\"" . $lang['View_newest_posts'] . "\" border=\"0\" /></a> "; + } + else + { + $folder_image = "<img src=\"$folder\" alt=\"" . $lang['No_new_posts'] . "\" />"; + $newest_post_img = ""; + } } else { $folder_image = "<img src=\"$folder\" alt=\"" . $lang['No_new_posts'] . "\" />"; + $newest_post_img = ""; } } } @@ -541,15 +554,6 @@ if($total_topics) $topic_poster = $topic_rowset[$i]['username']; $topic_poster_profile_url = append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $topic_rowset[$i]['user_id']); - if($topic_rowset[$i]['post_time'] >= $userdata['session_last_visit']) - { - $newest_post_img = "<a href=\"viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=newest\"><img src=\"" . $images['icon_newest_reply'] . "\" alt=\"" . $lang['View_newest_posts'] . "\" border=\"0\" /></a> "; - } - else - { - $newest_post_img = ""; - } - $last_post_time = create_date($board_config['default_dateformat'], $topic_rowset[$i]['post_time'], $board_config['board_timezone']); $last_post = $last_post_time . "<br />" . $lang['by'] . " "; diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 9d60156a07..494f018e41 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -428,7 +428,7 @@ $template->set_filenames(array( "jumpbox" => "jumpbox.tpl") ); -$jumpbox = make_jumpbox(); +$jumpbox = make_jumpbox($forum_id); $template->assign_vars(array( "L_GO" => $lang['Go'], "L_JUMP_TO" => $lang['Jump_to'], @@ -674,7 +674,7 @@ for($i = 0; $i < $total_posts; $i++) // // Define the little post icon // - if( $postrow[$i]['post_time'] > $userdata['session_last_visit'] ) + if( $postrow[$i]['post_time'] > $userdata['session_last_visit'] && $postrow[$i]['post_time'] > $HTTP_COOKIE_VAR['phpbb2_' . $forum_id . '_' . $topic_id]) { $mini_post_img = '<img src="' . $images['icon_minipost_new'] . '" alt="' . $lang['New_post'] . '" />'; } |