diff options
24 files changed, 151 insertions, 71 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 5f633b0dfd..89038ff2e6 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1057,7 +1057,7 @@ class acp_users $var_ary = array( 'dateformat' => array('string', false, 3, 30), 'lang' => array('match', false, '#^[a-z_]{2,}$#i'), - 'tz' => array('num', false, -13, 13), + 'tz' => array('num', false, -14, 14), 'topic_sk' => array('string', false, 1, 1), 'topic_sd' => array('string', false, 1, 1), diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index da93b4e403..0a6bf8d126 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -544,8 +544,10 @@ function watch_topic_forum($mode, &$s_watching, &$s_watching_img, $user_id, $mat /** * Marks a topic/forum as read * Marks a topic as posted to +* +* @param int $user_id can only be used with $mode == 'post' */ -function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0) +function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0, $user_id = 0) { global $db, $user, $config; @@ -786,7 +788,7 @@ function markread($mode, $forum_id = false, $topic_id = false, $post_time = 0) $db->sql_return_on_error(true); $sql_ary = array( - 'user_id' => $user->data['user_id'], + 'user_id' => (!$user_id) ? $user->data['user_id'] : $user_id, 'topic_id' => $topic_id, 'topic_posted' => 1 ); diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 0c259924d6..261cbe3f45 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -918,11 +918,15 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false, } else { + // Do not sync the "global forum" + $where_ids = array_diff($where_ids, array(0)); + if (!sizeof($where_ids)) { // Empty array with IDs. This means that we don't have any work to do. Just return. return; } + // Limit the topics/forums we are syncing, use specific topic/forum IDs. // $where_type contains the field for the where clause (forum_id, topic_id) $where_sql = 'WHERE ' . $mode{0} . ".$where_type IN (" . implode(', ', $where_ids) . ')'; diff --git a/phpBB/includes/mcp/mcp_front.php b/phpBB/includes/mcp/mcp_front.php index 67f0885caf..653af87a45 100644 --- a/phpBB/includes/mcp/mcp_front.php +++ b/phpBB/includes/mcp/mcp_front.php @@ -115,6 +115,7 @@ function mcp_front_view($id, $mode, $action) $sql = 'SELECT COUNT(r.report_id) AS total FROM ' . REPORTS_TABLE . ' r, ' . POSTS_TABLE . ' p WHERE r.post_id = p.post_id + AND r.report_closed = 0 AND p.forum_id IN (0, ' . implode(', ', $forum_list) . ')'; $result = $db->sql_query($sql); $row = $db->sql_fetchrow($result); @@ -126,6 +127,7 @@ function mcp_front_view($id, $mode, $action) FROM (' . REPORTS_TABLE . ' r, ' . REASONS_TABLE . ' rr,' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . USERS_TABLE . ' u) LEFT JOIN ' . FORUMS_TABLE . ' f ON (f.forum_id = p.forum_id) WHERE r.post_id = p.post_id + AND r.report_closed = 0 AND r.reason_id = rr.reason_id AND p.topic_id = t.topic_id AND r.user_id = u.user_id diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index 9513bc96f8..5b7433a6a3 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -170,7 +170,14 @@ class mcp_main mcp_post_details($id, $mode, $action); - $this->tpl_name = 'mcp_post'; + if ($action == 'whois') + { + $this->tpl_name = 'mcp_whois'; + } + else + { + $this->tpl_name = 'mcp_post'; + } break; default: @@ -868,6 +875,9 @@ function mcp_fork_topic($topic_ids) $db->sql_query('INSERT INTO ' . POSTS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); $new_post_id = $db->sql_nextid(); + // Copy whether the topic is dotted + markread('post', $to_forum_id, $new_topic_id, 0, $row['poster_id']); + // Copy Attachments if ($row['post_attachment']) { diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php index 5dfb5947f9..3880f036a8 100644 --- a/phpBB/includes/mcp/mcp_post.php +++ b/phpBB/includes/mcp/mcp_post.php @@ -34,6 +34,22 @@ function mcp_post_details($id, $mode, $action) switch ($action) { + case 'whois': + $ip = request_var('ip', ''); + include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + + $whois = user_ipwhois($ip); + + $whois = preg_replace('#(\s)([\w\-\._\+]+@[\w\-\.]+)(\s)#', '\1<a href="mailto:\2">\2</a>\3', $whois); + $whois = preg_replace('#(\s)(http:/{2}[^\s]*)(\s)#', '\1<a href="\2" target="_blank">\2</a>\3', $whois); + + $template->assign_vars(array( + 'RETURN_POST' => sprintf($user->lang['RETURN_POST'], "<a href=\"{$phpbb_root_path}mcp.$phpEx$SID&i=$id&mode=$mode&p=$post_id\">", '</a>'), + 'WHOIS' => trim($whois)) + ); + // We're done with the whois page so return + return; + case 'chgposter': $username = request_var('username', ''); @@ -249,7 +265,7 @@ function mcp_post_details($id, $mode, $action) 'L_POST_S' => ($row['postings'] == 1) ? $user->lang['POST'] : $user->lang['POSTS'], 'U_LOOKUP_IP' => ($rdns_ip_num == $row['poster_ip'] || $rdns_ip_num == 'all') ? '' : "$url&i=$id&mode=post_details&rdns={$row['poster_ip']}#ip", - 'U_WHOIS' => "{$phpbb_root_path}mcp.$phpEx$SID&i=$id&mode=whois&ip={$row['poster_ip']}") + 'U_WHOIS' => "{$phpbb_root_path}mcp.$phpEx$SID&i=$id&mode=$mode&action=whois&p=$post_id&ip={$row['poster_ip']}") ); } $db->sql_freeresult($result); diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php index 8bddeee325..580dced38e 100644 --- a/phpBB/includes/ucp/ucp_prefs.php +++ b/phpBB/includes/ucp/ucp_prefs.php @@ -52,7 +52,7 @@ class ucp_prefs $var_ary = array( 'dateformat' => array('string', false, 3, 30), 'lang' => array('match', false, '#^[a-z_]{2,}$#i'), - 'tz' => array('num', false, -13, 13), + 'tz' => array('num', false, -14, 14), ); $error = validate_data($data, $var_ary); diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index b471e1a79c..5970ac4d99 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -122,7 +122,7 @@ class ucp_register array('email')), 'email_confirm' => array('string', false, 6, 60), 'confirm_code' => array('string', !$config['enable_confirm'], 5, 8), - 'tz' => array('num', false, -13, 13), + 'tz' => array('num', false, -14, 14), 'lang' => array('match', false, '#^[a-z_]{2,}$#i'), ); diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 55cd584bb1..72907c97cb 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -283,7 +283,8 @@ $lang = array_merge($lang, array( 'NEXT' => 'Next', 'NO' => 'No', 'NONE' => 'None', - 'NOT_WATCHING_FORUM' => 'You no subscribe to updates on this forum', + 'NOT_AUTHORIZED' => 'You are not authorized to access this area.', + 'NOT_WATCHING_FORUM' => 'You are no longer subscribed to updates on this forum.', 'NOT_WATCHING_TOPIC' => 'You are no longer subscribed to this topic.', 'NO_AUTH_ADMIN' => 'You do not have admin permissions and therefore not allowed to access the administration control panel.', 'NO_AUTH_ADMIN_USER_DIFFER' => 'You are not able to re-authenticate as a different user.', @@ -404,6 +405,7 @@ $lang = array_merge($lang, array( 'SELECT_FORUM' => 'Select a forum', 'SEND_EMAIL' => 'Email', 'SEND_PRIVATE_MESSAGE' => 'Send private message', + 'SETTINGS' => 'Settings', 'SIGNATURE' => 'Signature', 'SKIP' => 'Skip to content', 'SORRY_AUTH_READ' => 'You are not authorized to read this forum', @@ -565,37 +567,45 @@ $lang = array_merge($lang, array( ), 'tz' => array( - '-12' => 'GMT - 12 Hours', - '-11' => 'GMT - 11 Hours', - '-10' => 'GMT - 10 Hours', - '-9' => 'GMT - 9 Hours', - '-8' => 'GMT - 8 Hours', - '-7' => 'GMT - 7 Hours', - '-6' => 'GMT - 6 Hours', - '-5' => 'GMT - 5 Hours', - '-4' => 'GMT - 4 Hours', - '-3.5' => 'GMT - 3.5 Hours', - '-3' => 'GMT - 3 Hours', - '-2' => 'GMT - 2 Hours', - '-1' => 'GMT - 1 Hour', + '-12' => 'GMT - 12 hours', + '-11' => 'GMT - 11 hours', + '-10' => 'GMT - 10 hours', + '-9.5' => 'GMT - 9:30 hours', + '-9' => 'GMT - 9 hours', + '-8' => 'GMT - 8 hours', + '-7' => 'GMT - 7 hours', + '-6' => 'GMT - 6 hours', + '-5' => 'GMT - 5 hours', + '-4' => 'GMT - 4 hours', + '-3.5' => 'GMT - 3:30 hours', + '-3' => 'GMT - 3 hours', + '-2' => 'GMT - 2 hours', + '-1' => 'GMT - 1 hour', '0' => 'GMT', - '1' => 'GMT + 1 Hour', - '2' => 'GMT + 2 Hours', - '3' => 'GMT + 3 Hours', - '3.5' => 'GMT + 3.5 Hours', - '4' => 'GMT + 4 Hours', - '4.5' => 'GMT + 4.5 Hours', - '5' => 'GMT + 5 Hours', - '5.5' => 'GMT + 5.5 Hours', - '6' => 'GMT + 6 Hours', - '6.5' => 'GMT + 6.5 Hours', - '7' => 'GMT + 7 Hours', - '8' => 'GMT + 8 Hours', - '9' => 'GMT + 9 Hours', - '9.5' => 'GMT + 9.5 Hours', - '10' => 'GMT + 10 Hours', - '11' => 'GMT + 11 Hours', - '12' => 'GMT + 12 Hours', + '1' => 'GMT + 1 hour', + '2' => 'GMT + 2 hours', + '3' => 'GMT + 3 hours', + '3.5' => 'GMT + 3:30 hours', + '4' => 'GMT + 4 hours', + '4.5' => 'GMT + 4:30 hours', + '5' => 'GMT + 5 hours', + '5.5' => 'GMT + 5:30 hours', + '5.75' => 'GMT + 5:45 hours', + '6' => 'GMT + 6 hours', + '6.5' => 'GMT + 6:30 hours', + '7' => 'GMT + 7 hours', + '8' => 'GMT + 8 hours', + '8.75' => 'GMT + 8:45 hours', + '9' => 'GMT + 9 hours', + '9.5' => 'GMT + 9:30 hours', + '10' => 'GMT + 10 hours', + '10.5' => 'GMT + 10:30 hours', + '11' => 'GMT + 11 hours', + '11.5' => 'GMT + 11:30 hours', + '12' => 'GMT + 12 hours', + '12.75' => 'GMT + 12:45 hours', + '13' => 'GMT + 13 hours', + '14' => 'GMT + 14 hours', 'dst' => '[ DST ]', ), @@ -603,13 +613,14 @@ $lang = array_merge($lang, array( '-12' => '[GMT-12] Eniwetok, Kwaialein', '-11' => '[GMT-11] Midway Island, Samoa', '-10' => '[GMT-10] Hawaii, Honolulu', + '-9.5' => '[GMT-9:30] Marquesas Is.', '-9' => '[GMT-9] Alaska, Anchorage', '-8' => '[GMT-8] Los Angeles, San Francisco, Seattle', '-7' => '[GMT-7] Denver, Edmonton, Phoenix, Salt Lake City, Santa Fe', '-6' => '[GMT-6] Chicago, Guatemala, Mexico City, Saskatchewan East', '-5' => '[GMT-5] Bogota, Kingston, Lima, New York', '-4' => '[GMT-4] Caracas, Labrador, La Paz, Maritimes, Santiago', - '-3.5' => '[GMT-3.5] Standard Time [Canada], Newfoundland', + '-3.5' => '[GMT-3:30] Standard Time [Canada], Newfoundland', '-3' => '[GMT-3] Brazilia, Buenos Aires, Georgetown, Rio de Janero', '-2' => '[GMT-2] Mid-Atlantic', '-1' => '[GMT-1] Azores, Cape Verde Is.', @@ -617,20 +628,27 @@ $lang = array_merge($lang, array( '1' => '[GMT+1] Amsterdam, Berlin, Bern, Brussells, Madrid, Paris, Rome, Oslo, Vienna', '2' => '[GMT+2] Athens, Bucharest, Harare, Helsinki, Israel, Istanbul', '3' => '[GMT+3] Ankara, Baghdad, Bahrain, Beruit, Kuwait, Moscow, Nairobi, Riyadh', - '3.5' => '[GMT+3.5] Iran', + '3.5' => '[GMT+3:30] Iran', '4' => '[GMT+4] Abu Dhabi, Kabul, Muscat, Tbilisi, Volgograd', - '4.5' => '[GMT+4.5] Afghanistan', + '4.5' => '[GMT+4:30] Afghanistan', '5' => '[GMT+5] Pakistan', - '5.5' => '[GMT+5.5] Calcutta, India, Madras, New Dehli', - '6' => '[GMT+6] Almaty, Dhakar, Kathmandu', - '6.5' => '[GMT+6.5] Rangoon', + '5.5' => '[GMT+5:30] Calcutta, India, Madras, New Dehli', + '5.75' => '[GMT+5:45] Kathmandu, Nepal', + '6' => '[GMT+6] Almaty, Dhakar, Sri Lanka', + '6.5' => '[GMT+6:30] Rangoon', '7' => '[GMT+7] Bangkok, Hanoi, Jakarta, Phnom Penh', '8' => '[GMT+8] Beijing, Hong Kong, Kuala Lumpar, Manila, Perth, Singapore, Taipei', + '8.75' => '[GMT+8:45] Caiguna, Eucla', '9' => '[GMT+9] Osaka, Sapporo, Seoul, Tokyo, Yakutsk', - '9.5' => '[GMT+9.5] Adelaide, Darwin', + '9.5' => '[GMT+9:30] Adelaide, Darwin', '10' => '[GMT+10] Brisbane, Canberra, Guam, Hobart, Melbourne, Port Moresby, Sydney', + '10.5' => '[GMT+10:30] Lord Howe Is.', '11' => '[GMT+11] Magadan, New Caledonia, Solomon Is.', - '12' => '[GMT+12] Auckland, Fiji, Kamchatka, Marshall Is., Suva, Wellington' + '11.5' => '[GMT+11:30] Norfolk Is.', + '12' => '[GMT+12] Auckland, Fiji, Kamchatka, Marshall Is., Suva, Wellington', + '12.75' => '[GMT+12:45] Chatham Is.', + '13' => '[GMT+13] Tonga, Phoenix Is.', + '14' => '[GMT+14] Line Is.', ), // The value is only an example and will get replaced by the current time on view diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index 854a472133..5ab9bacfd5 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -265,6 +265,7 @@ $lang = array_merge($lang, array( 'RETURN_MESSAGE' => 'Click %sHere%s to return to the message', 'RETURN_NEW_FORUM' => 'Click %sHere%s to return to the new forum', 'RETURN_NEW_TOPIC' => 'Click %sHere%s to return to the new topic', + 'RETURN_POST' => 'Click %sHere%s to return to the post', 'RETURN_QUEUE' => 'Click %sHere%s to return to the queue', 'RETURN_REPORTS' => 'Click %sHere%s to return to the reports', diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index a5fccc50f2..13eb24ff38 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -67,8 +67,8 @@ $lang = array_merge($lang, array( 'IM_AIM' => 'Please note that you need AOL Instant Messenger installed to use this.', 'IM_AIM_EXPRESS' => 'AIM Express', 'IM_DOWNLOAD_APP' => 'Download Application', - 'IM_ICQ' => 'Please note that users may have elected to not receive unsolicited instant messages.', - 'IM_JABBER' => 'Please note that users may have elected to not receive unsolicited instant messages.', + 'IM_ICQ' => 'Please note that users may have selected to not receive unsolicited instant messages.', + 'IM_JABBER' => 'Please note that users may have selected to not receive unsolicited instant messages.', 'IM_JABBER_SUBJECT' => 'This is an automated message please do not reply! Message from user %1$s at %2$s', 'IM_MESSAGE' => 'Your Message', 'IM_MSNM' => 'Please note that you need Windows Messenger installed to use this.', @@ -86,6 +86,7 @@ $lang = array_merge($lang, array( 'LESS_THAN' => 'Less than', 'LIST_USER' => '1 User', 'LIST_USERS' => '%d Users', + 'LOGIN_EXPLAIN_VIEWPROFILE' => 'The board administrator requires you to be registered and logged in to view profiles.', 'MORE_THAN' => 'More than', 'MSNM' => 'MSNM', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index c36e39042a..eb1ad6d45b 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -343,7 +343,7 @@ $lang = array_merge($lang, array( 'UCP' => 'User Control Panel', 'UCP_ACTIVATE' => 'Activate account', - 'UCP_ADMIN_ACTIVATE' => 'Please note that you will need to enter a valid email address before your account is activated. The administrator will review your account and if approved you will an email at the address you specified.', + 'UCP_ADMIN_ACTIVATE' => 'Please note that you will need to enter a valid email address before your account is activated. The administrator will review your account and if approved you will receive an email at the address you specified.', 'UCP_AIM' => 'AOL Instant Messenger', 'UCP_ATTACHMENTS' => 'Attachments', 'UCP_COPPA_BEFORE' => 'Before %s', diff --git a/phpBB/styles/subSilver/template/editor.js b/phpBB/styles/subSilver/template/editor.js index bbc89abcfb..5c7b6e4e29 100644 --- a/phpBB/styles/subSilver/template/editor.js +++ b/phpBB/styles/subSilver/template/editor.js @@ -323,6 +323,7 @@ function mozWrap(txtarea, open, close) var selLength = txtarea.textLength; var selStart = txtarea.selectionStart; var selEnd = txtarea.selectionEnd; + var scrollTop = txtarea.scrollTop; if (selEnd == 1 || selEnd == 2) selEnd = selLength; @@ -330,6 +331,10 @@ function mozWrap(txtarea, open, close) var s2 = (txtarea.value).substring(selStart, selEnd) var s3 = (txtarea.value).substring(selEnd, selLength); txtarea.value = s1 + open + s2 + close + s3; + txtarea.selectionStart = selEnd + open.length + close.length; + txtarea.selectionEnd = txtarea.selectionStart; + txtarea.focus(); + txtarea.scrollTop = scrollTop; return; } diff --git a/phpBB/styles/subSilver/template/index_body.html b/phpBB/styles/subSilver/template/index_body.html index 1c887edaa9..347f85d505 100644 --- a/phpBB/styles/subSilver/template/index_body.html +++ b/phpBB/styles/subSilver/template/index_body.html @@ -146,14 +146,14 @@ <td class="cat"><h4><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a></h4></td> </tr> <tr> - <td class="row1" align="center"><span class="genmed">{L_USERNAME}:</span> <input class="post" type="text" name="username" size="10" /> <span class="gensmall">{L_PASSWORD}:</span> <input class="post" type="password" name="password" size="10" /> <span class="gensmall">{L_LOG_ME_IN}</span> <input class="text" type="checkbox" name="autologin" /> <input type="submit" class="btnmain" name="login" value="{L_LOGIN}" /></td> + <td class="row1" align="center"><span class="genmed">{L_USERNAME}:</span> <input class="post" type="text" name="username" size="10" /> <span class="genmed">{L_PASSWORD}:</span> <input class="post" type="password" name="password" size="10" /> <span class="gensmall">{L_LOG_ME_IN}</span> <input class="text" type="checkbox" name="autologin" /> <input type="submit" class="btnmain" name="login" value="{L_LOGIN}" /></td> </tr> </table></form> <!-- ENDIF --> <br clear="all" /> - <table align="center"> + <table class="legend"> <tr> <td width="20" align="center">{FORUM_NEW_IMG}</td> <td><span class="gensmall">{L_NEW_POSTS}</span></td> diff --git a/phpBB/styles/subSilver/template/mcp_whois.html b/phpBB/styles/subSilver/template/mcp_whois.html new file mode 100644 index 0000000000..be0a6174b7 --- /dev/null +++ b/phpBB/styles/subSilver/template/mcp_whois.html @@ -0,0 +1,15 @@ +<!-- INCLUDE mcp_header.html --> + + <table class="tablebg" width="100%" cellspacing="1"> + <tr> + <th>{L_WHOIS}</th> + </tr> + <tr> + <td class="row3" align="center"><span class="gensmall">{RETURN_POST}</span></td> + </tr> + <tr> + <td class="row1"><pre>{WHOIS}</pre></td> + </tr> + </table> + +<!-- INCLUDE mcp_footer.html -->
\ No newline at end of file diff --git a/phpBB/styles/subSilver/template/overall_footer.html b/phpBB/styles/subSilver/template/overall_footer.html index 839d63609f..136b555331 100644 --- a/phpBB/styles/subSilver/template/overall_footer.html +++ b/phpBB/styles/subSilver/template/overall_footer.html @@ -4,7 +4,7 @@ <!-- We request you retain the full copyright notice below including the link to www.phpbb.com. This not only gives respect to the large amount of time given freely by the developers - but also helps build interest, traffic and use of phpBB2. If you (honestly) cannot retain + but also helps build interest, traffic and use of phpBB3. If you (honestly) cannot retain the full copyright we ask you at least leave in place the "Powered by phpBB" line, with "phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our forums may be affected. diff --git a/phpBB/styles/subSilver/template/posting_body.html b/phpBB/styles/subSilver/template/posting_body.html index 62cc990e2c..fb26e50b1c 100644 --- a/phpBB/styles/subSilver/template/posting_body.html +++ b/phpBB/styles/subSilver/template/posting_body.html @@ -227,7 +227,7 @@ function checkForm() <!-- ENDIF --> </table></td> - <td class="row2" valign="top"><table cellspacing="0" cellpadding="0" border="0"> + <td class="row2" valign="top"><table width="100%" cellspacing="0" cellpadding="0" border="0"> <tr valign="middle" align="left"> <td colspan="2"><input type="button" class="btnbbcode" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;" onclick="bbstyle(0)" onmouseover="helpline('b')" /> <input type="button" class="btnbbcode" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px;" onclick="bbstyle(2)" onmouseover="helpline('i')" /> @@ -261,7 +261,7 @@ function checkForm() <td class="genmed" align="center">{L_FONT_COLOR}</td> </tr> <tr> - <td valign="top"><textarea name="message" rows="15" cols="76" tabindex="3" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" style="width: 100%;">{MESSAGE}</textarea></td> + <td valign="top" style="width: 100%;"><textarea name="message" rows="15" cols="76" tabindex="3" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);" style="width: 98%;">{MESSAGE}</textarea></td> <td width="80" align="center" valign="top"><script language="javascript" type="text/javascript"><!-- colorPalette('v', 7, 6) diff --git a/phpBB/styles/subSilver/template/search_results.html b/phpBB/styles/subSilver/template/search_results.html index e23cda4866..04a6056591 100644 --- a/phpBB/styles/subSilver/template/search_results.html +++ b/phpBB/styles/subSilver/template/search_results.html @@ -37,10 +37,10 @@ <!-- IF searchresults.S_UNREAD_TOPIC --><a href="{searchresults.U_NEWEST_POST}">{NEWEST_POST_IMG}</a><!-- ENDIF --> {topicrow.ATTACH_ICON_IMG} <a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a> <!-- IF searchresults.S_TOPIC_UNAPPROVED --> - <a href="{topicrow.U_MCP_QUEUE}">{UNAPPROVED_IMG}</a> + <a href="{searchresults.U_MCP_QUEUE}">{UNAPPROVED_IMG}</a> <!-- ENDIF --> <!-- IF searchresults.S_TOPIC_REPORTED --> - <a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a> + <a href="{searchresults.U_MCP_REPORT}">{REPORTED_IMG}</a> <!-- ENDIF --> <!-- IF searchresults.PAGINATION --> <p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {searchresults.PAGINATION} ] </p> diff --git a/phpBB/styles/subSilver/template/simple_footer.html b/phpBB/styles/subSilver/template/simple_footer.html index 01e45ba0a8..1d627c1dda 100644 --- a/phpBB/styles/subSilver/template/simple_footer.html +++ b/phpBB/styles/subSilver/template/simple_footer.html @@ -4,7 +4,7 @@ <!-- We request you retain the full copyright notice below including the link to www.phpbb.com. This not only gives respect to the large amount of time given freely by the developers - but also helps build interest, traffic and use of phpBB2. If you (honestly) cannot retain + but also helps build interest, traffic and use of phpBB3. If you (honestly) cannot retain the full copyright we ask you at least leave in place the "Powered by phpBB" line, with "phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our forums may be affected. diff --git a/phpBB/styles/subSilver/template/ucp_agreement.html b/phpBB/styles/subSilver/template/ucp_agreement.html index f6029446be..3d25015101 100644 --- a/phpBB/styles/subSilver/template/ucp_agreement.html +++ b/phpBB/styles/subSilver/template/ucp_agreement.html @@ -4,7 +4,7 @@ <form method="post" action="{S_UCP_ACTION}"> - <table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center"> + <table class="tablebg" width="100%" cellspacing="1"> <tr> <th height="25">{SITENAME} - {L_REGISTRATION}</th> </tr> @@ -33,7 +33,7 @@ <!-- ELSEIF S_AGREEMENT --> - <table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center"> + <table class="tablebg" width="100%" cellspacing="1"> <tr> <th height="25">{SITENAME} - {AGREEMENT_TITLE}</th> </tr> diff --git a/phpBB/styles/subSilver/template/ucp_register.html b/phpBB/styles/subSilver/template/ucp_register.html index 22f35ad6eb..94a1e35cbe 100644 --- a/phpBB/styles/subSilver/template/ucp_register.html +++ b/phpBB/styles/subSilver/template/ucp_register.html @@ -16,7 +16,7 @@ </tr> </table> -<table class="tablebg" width="80%" cellspacing="1" cellpadding="4" border="0" align="center"> +<table class="tablebg" width="100%" cellspacing="1"> <tr> <th colspan="2" height="28" valign="middle">{L_REGISTRATION}</th> </tr> diff --git a/phpBB/styles/subSilver/template/viewtopic_print.html b/phpBB/styles/subSilver/template/viewtopic_print.html index ffbfb997ec..57c789aab4 100644 --- a/phpBB/styles/subSilver/template/viewtopic_print.html +++ b/phpBB/styles/subSilver/template/viewtopic_print.html @@ -90,12 +90,11 @@ hr.sep { <!-- We request you retain the full copyright notice below including the link to www.phpbb.com. This not only gives respect to the large amount of time given freely by the developers - but also helps build interest, traffic and use of phpBB2. If you (honestly) cannot retain - the full copyright we ask you at least leave in place the "Powered by phpBB {PHPBB_VERSION}" - line, with phpBB linked to www.phpbb.com. If you refuse to include even this then support on - our forums may be affected. + but also helps build interest, traffic and use of phpBB3. If you (honestly) cannot retain + the full copyright we ask you at least leave in place the "Powered by phpBB" line. If you + refuse to include even this then support on our forums may be affected. - The phpBB Group : 2002 + The phpBB Group : 2006 // --> <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center"> <tr> @@ -103,7 +102,7 @@ hr.sep { <td align="right"><span class="gensmall">{S_TIMEZONE}</span></td> </tr> <tr> - <td colspan="2" align="center"><span class="gensmall">Powered by phpBB {PHPBB_VERSION} © 2002 phpBB Group<br />http://www.phpbb.com/</span></td> + <td colspan="2" align="center"><span class="gensmall">Powered by phpBB © 2002, 2006 phpBB Group<br />http://www.phpbb.com/</span></td> </tr> </table> diff --git a/phpBB/styles/subSilver/theme/stylesheet.css b/phpBB/styles/subSilver/theme/stylesheet.css index 763e864dac..21b6946909 100644 --- a/phpBB/styles/subSilver/theme/stylesheet.css +++ b/phpBB/styles/subSilver/theme/stylesheet.css @@ -298,7 +298,10 @@ hr { background-color: #D1D7DC; color: #D1D7DC; } - +.legend { + text-align:center; + margin: 0 auto; + } /* Links ------------ */ @@ -522,3 +525,7 @@ input.radio { table.colortable td { padding: 0; } +pre { + font-size: 1.1em; + font-family: Monaco, 'Courier New', monospace; +}
\ No newline at end of file diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index c6e13fcec4..a1dfeff11a 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -423,11 +423,11 @@ $topic_mod .= ($auth->acl_get('m_delete', $forum_id)) ? '<option value="delete_t $topic_mod .= ($auth->acl_get('m_move', $forum_id)) ? '<option value="move">' . $user->lang['MOVE_TOPIC'] . '</option>' : ''; $topic_mod .= ($auth->acl_get('m_split', $forum_id)) ? '<option value="split">' . $user->lang['SPLIT_TOPIC'] . '</option>' : ''; $topic_mod .= ($auth->acl_get('m_merge', $forum_id)) ? '<option value="merge">' . $user->lang['MERGE_TOPIC'] . '</option>' : ''; -$topic_mod .= ($auth->acl_get('m_', $forum_id)) ? '<option value="fork">' . $user->lang['FORK_TOPIC'] . '</option>' : ''; +$topic_mod .= ($auth->acl_get('m_move', $forum_id)) ? '<option value="fork">' . $user->lang['FORK_TOPIC'] . '</option>' : ''; $topic_mod .= ($auth->acl_get('m_', $forum_id) && $topic_data['topic_type'] != POST_NORMAL) ? '<option value="make_normal">' . $user->lang['MAKE_NORMAL'] . '</option>' : ''; -$topic_mod .= ($auth->acl_get('f_sticky', $forum_id) && $topic_data['topic_type'] != POST_STICKY) ? '<option value="make_sticky">' . $user->lang['MAKE_STICKY'] . '</option>' : ''; -$topic_mod .= ($auth->acl_get('f_announce', $forum_id) && $topic_data['topic_type'] != POST_ANNOUNCE) ? '<option value="make_announce">' . $user->lang['MAKE_ANNOUNCE'] . '</option>' : ''; -$topic_mod .= ($auth->acl_get('f_announce', $forum_id) && $topic_data['topic_type'] != POST_GLOBAL) ? '<option value="make_global">' . $user->lang['MAKE_GLOBAL'] . '</option>' : ''; +$topic_mod .= ($auth->acl_get('m_', $forum_id) && $auth->acl_get('f_sticky', $forum_id) && $topic_data['topic_type'] != POST_STICKY) ? '<option value="make_sticky">' . $user->lang['MAKE_STICKY'] . '</option>' : ''; +$topic_mod .= ($auth->acl_get('m_', $forum_id) && $auth->acl_get('f_announce', $forum_id) && $topic_data['topic_type'] != POST_ANNOUNCE) ? '<option value="make_announce">' . $user->lang['MAKE_ANNOUNCE'] . '</option>' : ''; +$topic_mod .= ($auth->acl_get('m_', $forum_id) && $auth->acl_get('f_announce', $forum_id) && $topic_data['topic_type'] != POST_GLOBAL) ? '<option value="make_global">' . $user->lang['MAKE_GLOBAL'] . '</option>' : ''; $topic_mod .= ($auth->acl_get('m_', $forum_id)) ? '<option value="topic_logs">' . $user->lang['VIEW_TOPIC_LOGS'] . '</option>' : ''; // If we've got a hightlight set pass it on to pagination. |