makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 12:28:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- check m_ permission for quickmod [Bug #1317]

Browse source 
- don't sync the global forum (id 0) [Bug #1383]
- corrections to available time zones [Bug #1306]
- only display open reports on mcp_front
- added whois information to mcp_post [Bug #1400]
- copy "dot" when copying a topic [Bug #1321]
- some language corrections [Bugs #1324, #1255, #1317]
- mozWrap scrolls back to previous position now [Bug #1190]
- some style related corrections [Bugs #1322, #1454, #1316]
- corrected copyrights [Bug #1468]
- fixed links on search results page [Bug #1469]


git-svn-id: file:///svn/phpbb/trunk@5779 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Nils Adermann 2006-04-09 21:20:24 +00:00
parent 5b24c3a7fb
commit fc394d6302
24 changed files with 151 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_users.php
View file

@ -1057,7 +1057,7 @@ class acp_users
$var_ary = array( $var_ary = array(
'dateformat' => array('string', false, 3, 30), 'dateformat' => array('string', false, 3, 30),
'lang' => array('match', false, '#^[a-z_]{2,}$#i'), '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_sk' => array('string', false, 1, 1),
'topic_sd' => array('string', false, 1, 1), 'topic_sd' => array('string', false, 1, 1),

6
phpBB/includes/functions.php
View file

@ -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/forum as read
* Marks a topic as posted to * 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; 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); $db->sql_return_on_error(true);
$sql_ary = array( $sql_ary = array(
'user_id' => $user->data['user_id'], 'user_id' => (!$user_id) ? $user->data['user_id'] : $user_id,
'topic_id' => $topic_id, 'topic_id' => $topic_id,
'topic_posted' => 1 'topic_posted' => 1
); );

4
phpBB/includes/functions_admin.php
View file

@ -918,11 +918,15 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false,
} }
else else
{ {
// Do not sync the "global forum"
$where_ids = array_diff($where_ids, array(0));
if (!sizeof($where_ids)) if (!sizeof($where_ids))
{ {
// Empty array with IDs. This means that we don't have any work to do. Just return. // Empty array with IDs. This means that we don't have any work to do. Just return.
return; return;
} }
// Limit the topics/forums we are syncing, use specific topic/forum IDs. // 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_type contains the field for the where clause (forum_id, topic_id)
$where_sql = 'WHERE ' . $mode{0} . ".$where_type IN (" . implode(', ', $where_ids) . ')'; $where_sql = 'WHERE ' . $mode{0} . ".$where_type IN (" . implode(', ', $where_ids) . ')';

2
phpBB/includes/mcp/mcp_front.php
View file

@ -115,6 +115,7 @@ function mcp_front_view($id, $mode, $action)
$sql = 'SELECT COUNT(r.report_id) AS total $sql = 'SELECT COUNT(r.report_id) AS total
FROM ' . REPORTS_TABLE . ' r, ' . POSTS_TABLE . ' p FROM ' . REPORTS_TABLE . ' r, ' . POSTS_TABLE . ' p
WHERE r.post_id = p.post_id WHERE r.post_id = p.post_id
AND r.report_closed = 0
AND p.forum_id IN (0, ' . implode(', ', $forum_list) . ')'; AND p.forum_id IN (0, ' . implode(', ', $forum_list) . ')';
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result); $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) 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) LEFT JOIN ' . FORUMS_TABLE . ' f ON (f.forum_id = p.forum_id)
WHERE r.post_id = p.post_id WHERE r.post_id = p.post_id
AND r.report_closed = 0
AND r.reason_id = rr.reason_id AND r.reason_id = rr.reason_id
AND p.topic_id = t.topic_id AND p.topic_id = t.topic_id
AND r.user_id = u.user_id AND r.user_id = u.user_id

10
phpBB/includes/mcp/mcp_main.php
View file

@ -170,7 +170,14 @@ class mcp_main
mcp_post_details($id, $mode, $action); mcp_post_details($id, $mode, $action);
if ($action == 'whois')
{
$this->tpl_name = 'mcp_whois';
}
else
{
$this->tpl_name = 'mcp_post'; $this->tpl_name = 'mcp_post';
}
break; break;
default: 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)); $db->sql_query('INSERT INTO ' . POSTS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));
$new_post_id = $db->sql_nextid(); $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 // Copy Attachments
if ($row['post_attachment']) if ($row['post_attachment'])
{ {

18
phpBB/includes/mcp/mcp_post.php
View file

@ -34,6 +34,22 @@ function mcp_post_details($id, $mode, $action)
switch ($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&amp;i=$id&amp;mode=$mode&amp;p=$post_id\">", '</a>'),
'WHOIS' => trim($whois))
);
// We're done with the whois page so return
return;
case 'chgposter': case 'chgposter':
$username = request_var('username', ''); $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'], '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&amp;i=$id&amp;mode=post_details&amp;rdns={$row['poster_ip']}#ip", 'U_LOOKUP_IP' => ($rdns_ip_num == $row['poster_ip'] || $rdns_ip_num == 'all') ? '' : "$url&amp;i=$id&amp;mode=post_details&amp;rdns={$row['poster_ip']}#ip",
'U_WHOIS' => "{$phpbb_root_path}mcp.$phpEx$SID&amp;i=$id&amp;mode=whois&amp;ip={$row['poster_ip']}") 'U_WHOIS' => "{$phpbb_root_path}mcp.$phpEx$SID&amp;i=$id&amp;mode=$mode&amp;action=whois&amp;p=$post_id&amp;ip={$row['poster_ip']}")
); );
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);

2
phpBB/includes/ucp/ucp_prefs.php
View file

@ -52,7 +52,7 @@ class ucp_prefs
$var_ary = array( $var_ary = array(
'dateformat' => array('string', false, 3, 30), 'dateformat' => array('string', false, 3, 30),
'lang' => array('match', false, '#^[a-z_]{2,}$#i'), '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); $error = validate_data($data, $var_ary);

2
phpBB/includes/ucp/ucp_register.php
View file

@ -122,7 +122,7 @@ class ucp_register
array('email')), array('email')),
'email_confirm' => array('string', false, 6, 60), 'email_confirm' => array('string', false, 6, 60),
'confirm_code' => array('string', !$config['enable_confirm'], 5, 8), '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'), 'lang' => array('match', false, '#^[a-z_]{2,}$#i'),
); );

96
phpBB/language/en/common.php
View file

@ -283,7 +283,8 @@ $lang = array_merge($lang, array(
'NEXT' => 'Next', 'NEXT' => 'Next',
'NO' => 'No', 'NO' => 'No',
'NONE' => 'None', '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.', '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' => '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.', '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', 'SELECT_FORUM' => 'Select a forum',
'SEND_EMAIL' => 'Email', 'SEND_EMAIL' => 'Email',
'SEND_PRIVATE_MESSAGE' => 'Send private message', 'SEND_PRIVATE_MESSAGE' => 'Send private message',
'SETTINGS' => 'Settings',
'SIGNATURE' => 'Signature', 'SIGNATURE' => 'Signature',
'SKIP' => 'Skip to content', 'SKIP' => 'Skip to content',
'SORRY_AUTH_READ' => 'You are not authorized to read this forum', 'SORRY_AUTH_READ' => 'You are not authorized to read this forum',
@ -565,37 +567,45 @@ $lang = array_merge($lang, array(
), ),
'tz' => array( 'tz' => array(
'-12' => 'GMT - 12 Hours', '-12' => 'GMT - 12 hours',
'-11' => 'GMT - 11 Hours', '-11' => 'GMT - 11 hours',
'-10' => 'GMT - 10 Hours', '-10' => 'GMT - 10 hours',
'-9' => 'GMT - 9 Hours', '-9.5' => 'GMT - 9:30 hours',
'-8' => 'GMT - 8 Hours', '-9' => 'GMT - 9 hours',
'-7' => 'GMT - 7 Hours', '-8' => 'GMT - 8 hours',
'-6' => 'GMT - 6 Hours', '-7' => 'GMT - 7 hours',
'-5' => 'GMT - 5 Hours', '-6' => 'GMT - 6 hours',
'-4' => 'GMT - 4 Hours', '-5' => 'GMT - 5 hours',
'-3.5' => 'GMT - 3.5 Hours', '-4' => 'GMT - 4 hours',
'-3' => 'GMT - 3 Hours', '-3.5' => 'GMT - 3:30 hours',
'-2' => 'GMT - 2 Hours', '-3' => 'GMT - 3 hours',
'-1' => 'GMT - 1 Hour', '-2' => 'GMT - 2 hours',
'-1' => 'GMT - 1 hour',
'0' => 'GMT', '0' => 'GMT',
'1' => 'GMT + 1 Hour', '1' => 'GMT + 1 hour',
'2' => 'GMT + 2 Hours', '2' => 'GMT + 2 hours',
'3' => 'GMT + 3 Hours', '3' => 'GMT + 3 hours',
'3.5' => 'GMT + 3.5 Hours', '3.5' => 'GMT + 3:30 hours',
'4' => 'GMT + 4 Hours', '4' => 'GMT + 4 hours',
'4.5' => 'GMT + 4.5 Hours', '4.5' => 'GMT + 4:30 hours',
'5' => 'GMT + 5 Hours', '5' => 'GMT + 5 hours',
'5.5' => 'GMT + 5.5 Hours', '5.5' => 'GMT + 5:30 hours',
'6' => 'GMT + 6 Hours', '5.75' => 'GMT + 5:45 hours',
'6.5' => 'GMT + 6.5 Hours', '6' => 'GMT + 6 hours',
'7' => 'GMT + 7 Hours', '6.5' => 'GMT + 6:30 hours',
'8' => 'GMT + 8 Hours', '7' => 'GMT + 7 hours',
'9' => 'GMT + 9 Hours', '8' => 'GMT + 8 hours',
'9.5' => 'GMT + 9.5 Hours', '8.75' => 'GMT + 8:45 hours',
'10' => 'GMT + 10 Hours', '9' => 'GMT + 9 hours',
'11' => 'GMT + 11 Hours', '9.5' => 'GMT + 9:30 hours',
'12' => 'GMT + 12 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 ]', 'dst' => '[ DST ]',
), ),
@ -603,13 +613,14 @@ $lang = array_merge($lang, array(
'-12' => '[GMT-12] Eniwetok, Kwaialein', '-12' => '[GMT-12] Eniwetok, Kwaialein',
'-11' => '[GMT-11] Midway Island, Samoa', '-11' => '[GMT-11] Midway Island, Samoa',
'-10' => '[GMT-10] Hawaii, Honolulu', '-10' => '[GMT-10] Hawaii, Honolulu',
'-9.5' => '[GMT-9:30] Marquesas Is.',
'-9' => '[GMT-9] Alaska, Anchorage', '-9' => '[GMT-9] Alaska, Anchorage',
'-8' => '[GMT-8] Los Angeles, San Francisco, Seattle', '-8' => '[GMT-8] Los Angeles, San Francisco, Seattle',
'-7' => '[GMT-7] Denver, Edmonton, Phoenix, Salt Lake City, Santa Fe', '-7' => '[GMT-7] Denver, Edmonton, Phoenix, Salt Lake City, Santa Fe',
'-6' => '[GMT-6] Chicago, Guatemala, Mexico City, Saskatchewan East', '-6' => '[GMT-6] Chicago, Guatemala, Mexico City, Saskatchewan East',
'-5' => '[GMT-5] Bogota, Kingston, Lima, New York', '-5' => '[GMT-5] Bogota, Kingston, Lima, New York',
'-4' => '[GMT-4] Caracas, Labrador, La Paz, Maritimes, Santiago', '-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', '-3' => '[GMT-3] Brazilia, Buenos Aires, Georgetown, Rio de Janero',
'-2' => '[GMT-2] Mid-Atlantic', '-2' => '[GMT-2] Mid-Atlantic',
'-1' => '[GMT-1] Azores, Cape Verde Is.', '-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', '1' => '[GMT+1] Amsterdam, Berlin, Bern, Brussells, Madrid, Paris, Rome, Oslo, Vienna',
'2' => '[GMT+2] Athens, Bucharest, Harare, Helsinki, Israel, Istanbul', '2' => '[GMT+2] Athens, Bucharest, Harare, Helsinki, Israel, Istanbul',
'3' => '[GMT+3] Ankara, Baghdad, Bahrain, Beruit, Kuwait, Moscow, Nairobi, Riyadh', '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' => '[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' => '[GMT+5] Pakistan',
'5.5' => '[GMT+5.5] Calcutta, India, Madras, New Dehli', '5.5' => '[GMT+5:30] Calcutta, India, Madras, New Dehli',
'6' => '[GMT+6] Almaty, Dhakar, Kathmandu', '5.75' => '[GMT+5:45] Kathmandu, Nepal',
'6.5' => '[GMT+6.5] Rangoon', '6' => '[GMT+6] Almaty, Dhakar, Sri Lanka',
'6.5' => '[GMT+6:30] Rangoon',
'7' => '[GMT+7] Bangkok, Hanoi, Jakarta, Phnom Penh', '7' => '[GMT+7] Bangkok, Hanoi, Jakarta, Phnom Penh',
'8' => '[GMT+8] Beijing, Hong Kong, Kuala Lumpar, Manila, Perth, Singapore, Taipei', '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' => '[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' => '[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.', '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 // The value is only an example and will get replaced by the current time on view

1
phpBB/language/en/mcp.php
View file

@ -265,6 +265,7 @@ $lang = array_merge($lang, array(
'RETURN_MESSAGE' => 'Click %sHere%s to return to the message', 'RETURN_MESSAGE' => 'Click %sHere%s to return to the message',
'RETURN_NEW_FORUM' => 'Click %sHere%s to return to the new forum', '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_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_QUEUE' => 'Click %sHere%s to return to the queue',
'RETURN_REPORTS' => 'Click %sHere%s to return to the reports', 'RETURN_REPORTS' => 'Click %sHere%s to return to the reports',

5
phpBB/language/en/memberlist.php
View file

@ -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' => 'Please note that you need AOL Instant Messenger installed to use this.',
'IM_AIM_EXPRESS' => 'AIM Express', 'IM_AIM_EXPRESS' => 'AIM Express',
'IM_DOWNLOAD_APP' => 'Download Application', 'IM_DOWNLOAD_APP' => 'Download Application',
'IM_ICQ' => '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 elected 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_JABBER_SUBJECT' => 'This is an automated message please do not reply! Message from user %1$s at %2$s',
'IM_MESSAGE' => 'Your Message', 'IM_MESSAGE' => 'Your Message',
'IM_MSNM' => 'Please note that you need Windows Messenger installed to use this.', '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', 'LESS_THAN' => 'Less than',
'LIST_USER' => '1 User', 'LIST_USER' => '1 User',
'LIST_USERS' => '%d Users', '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', 'MORE_THAN' => 'More than',
'MSNM' => 'MSNM', 'MSNM' => 'MSNM',

2
phpBB/language/en/ucp.php
View file

@ -343,7 +343,7 @@ $lang = array_merge($lang, array(
'UCP' => 'User Control Panel', 'UCP' => 'User Control Panel',
'UCP_ACTIVATE' => 'Activate account', '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_AIM' => 'AOL Instant Messenger',
'UCP_ATTACHMENTS' => 'Attachments', 'UCP_ATTACHMENTS' => 'Attachments',
'UCP_COPPA_BEFORE' => 'Before %s', 'UCP_COPPA_BEFORE' => 'Before %s',

5
phpBB/styles/subSilver/template/editor.js
View file

@ -323,6 +323,7 @@ function mozWrap(txtarea, open, close)
var selLength = txtarea.textLength; var selLength = txtarea.textLength;
var selStart = txtarea.selectionStart; var selStart = txtarea.selectionStart;
var selEnd = txtarea.selectionEnd; var selEnd = txtarea.selectionEnd;
var scrollTop = txtarea.scrollTop;
if (selEnd == 1 || selEnd == 2) if (selEnd == 1 || selEnd == 2)
selEnd = selLength; selEnd = selLength;
@ -330,6 +331,10 @@ function mozWrap(txtarea, open, close)
var s2 = (txtarea.value).substring(selStart, selEnd) var s2 = (txtarea.value).substring(selStart, selEnd)
var s3 = (txtarea.value).substring(selEnd, selLength); var s3 = (txtarea.value).substring(selEnd, selLength);
txtarea.value = s1 + open + s2 + close + s3; txtarea.value = s1 + open + s2 + close + s3;
txtarea.selectionStart = selEnd + open.length + close.length;
txtarea.selectionEnd = txtarea.selectionStart;
txtarea.focus();
txtarea.scrollTop = scrollTop;
return; return;
} }

4
phpBB/styles/subSilver/template/index_body.html
View file

@ -146,14 +146,14 @@
<td class="cat"><h4><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a></h4></td> <td class="cat"><h4><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a></h4></td>
</tr> </tr>
<tr> <tr>
<td class="row1" align="center"><span class="genmed">{L_USERNAME}:</span> <input class="post" type="text" name="username" size="10" />&nbsp; <span class="gensmall">{L_PASSWORD}:</span> <input class="post" type="password" name="password" size="10" />&nbsp; <span class="gensmall">{L_LOG_ME_IN}</span> <input class="text" type="checkbox" name="autologin" />&nbsp; <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" />&nbsp; <span class="genmed">{L_PASSWORD}:</span> <input class="post" type="password" name="password" size="10" />&nbsp; <span class="gensmall">{L_LOG_ME_IN}</span> <input class="text" type="checkbox" name="autologin" />&nbsp; <input type="submit" class="btnmain" name="login" value="{L_LOGIN}" /></td>
</tr> </tr>
</table></form> </table></form>
<!-- ENDIF --> <!-- ENDIF -->
<br clear="all" /> <br clear="all" />
<table align="center"> <table class="legend">
<tr> <tr>
<td width="20" align="center">{FORUM_NEW_IMG}</td> <td width="20" align="center">{FORUM_NEW_IMG}</td>
<td><span class="gensmall">{L_NEW_POSTS}</span></td> <td><span class="gensmall">{L_NEW_POSTS}</span></td>

15
phpBB/styles/subSilver/template/mcp_whois.html Normal file
View file

@ -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 -->

2
phpBB/styles/subSilver/template/overall_footer.html
View file

@ -4,7 +4,7 @@
<!-- <!--
We request you retain the full copyright notice below including the link to www.phpbb.com. 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 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 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 "phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
forums may be affected. forums may be affected.

4
phpBB/styles/subSilver/template/posting_body.html
View file

@ -227,7 +227,7 @@ function checkForm()
<!-- ENDIF --> <!-- ENDIF -->
</table></td> </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"> <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')" /> <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')" /> <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> <td class="genmed" align="center">{L_FONT_COLOR}</td>
</tr> </tr>
<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"><!-- <td width="80" align="center" valign="top"><script language="javascript" type="text/javascript"><!--
colorPalette('v', 7, 6) colorPalette('v', 7, 6)

4
phpBB/styles/subSilver/template/search_results.html
View file

@ -37,10 +37,10 @@
<!-- IF searchresults.S_UNREAD_TOPIC --><a href="{searchresults.U_NEWEST_POST}">{NEWEST_POST_IMG}</a><!-- ENDIF --> <!-- 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> {topicrow.ATTACH_ICON_IMG} <a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a>
<!-- IF searchresults.S_TOPIC_UNAPPROVED --> <!-- IF searchresults.S_TOPIC_UNAPPROVED -->
<a href="{topicrow.U_MCP_QUEUE}">{UNAPPROVED_IMG}</a>&nbsp; <a href="{searchresults.U_MCP_QUEUE}">{UNAPPROVED_IMG}</a>&nbsp;
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF searchresults.S_TOPIC_REPORTED --> <!-- IF searchresults.S_TOPIC_REPORTED -->
<a href="{topicrow.U_MCP_REPORT}">{REPORTED_IMG}</a>&nbsp; <a href="{searchresults.U_MCP_REPORT}">{REPORTED_IMG}</a>&nbsp;
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF searchresults.PAGINATION --> <!-- IF searchresults.PAGINATION -->
<p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {searchresults.PAGINATION} ] </p> <p class="gensmall"> [ {GOTO_PAGE_IMG}{L_GOTO_PAGE}: {searchresults.PAGINATION} ] </p>

2
phpBB/styles/subSilver/template/simple_footer.html
View file

@ -4,7 +4,7 @@
<!-- <!--
We request you retain the full copyright notice below including the link to www.phpbb.com. 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 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 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 "phpBB" linked to www.phpbb.com. If you refuse to include even this then support on our
forums may be affected. forums may be affected.

4
phpBB/styles/subSilver/template/ucp_agreement.html
View file

@ -4,7 +4,7 @@
<form method="post" action="{S_UCP_ACTION}"> <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> <tr>
<th height="25">{SITENAME} - {L_REGISTRATION}</th> <th height="25">{SITENAME} - {L_REGISTRATION}</th>
</tr> </tr>
@ -33,7 +33,7 @@
<!-- ELSEIF S_AGREEMENT --> <!-- ELSEIF S_AGREEMENT -->
<table class="tablebg" width="95%" cellspacing="1" cellpadding="4" border="0" align="center"> <table class="tablebg" width="100%" cellspacing="1">
<tr> <tr>
<th height="25">{SITENAME} - {AGREEMENT_TITLE}</th> <th height="25">{SITENAME} - {AGREEMENT_TITLE}</th>
</tr> </tr>

2
phpBB/styles/subSilver/template/ucp_register.html
View file

@ -16,7 +16,7 @@
</tr> </tr>
</table> </table>
<table class="tablebg" width="80%" cellspacing="1" cellpadding="4" border="0" align="center"> <table class="tablebg" width="100%" cellspacing="1">
<tr> <tr>
<th colspan="2" height="28" valign="middle">{L_REGISTRATION}</th> <th colspan="2" height="28" valign="middle">{L_REGISTRATION}</th>
</tr> </tr>

11
phpBB/styles/subSilver/template/viewtopic_print.html
View file

@ -90,12 +90,11 @@ hr.sep {
<!-- <!--
We request you retain the full copyright notice below including the link to www.phpbb.com. 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 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 {PHPBB_VERSION}" the full copyright we ask you at least leave in place the "Powered by phpBB" line. If you
line, with phpBB linked to www.phpbb.com. If you refuse to include even this then support on refuse to include even this then support on our forums may be affected.
our forums may be affected.
The phpBB Group : 2002 The phpBB Group : 2006
// --> // -->
<table width="85%" cellspacing="3" cellpadding="0" border="0" align="center"> <table width="85%" cellspacing="3" cellpadding="0" border="0" align="center">
<tr> <tr>
@ -103,7 +102,7 @@ hr.sep {
<td align="right"><span class="gensmall">{S_TIMEZONE}</span></td> <td align="right"><span class="gensmall">{S_TIMEZONE}</span></td>
</tr> </tr>
<tr> <tr>
<td colspan="2" align="center"><span class="gensmall">Powered by phpBB {PHPBB_VERSION} &copy; 2002 phpBB Group<br />http://www.phpbb.com/</span></td> <td colspan="2" align="center"><span class="gensmall">Powered by phpBB &copy; 2002, 2006 phpBB Group<br />http://www.phpbb.com/</span></td>
</tr> </tr>
</table> </table>

9
phpBB/styles/subSilver/theme/stylesheet.css
View file

@ -298,7 +298,10 @@ hr {
background-color: #D1D7DC; background-color: #D1D7DC;
color: #D1D7DC; color: #D1D7DC;
} }
.legend {
text-align:center;
margin: 0 auto;
}
/* Links /* Links
------------ */ ------------ */
@ -522,3 +525,7 @@ input.radio {
table.colortable td { table.colortable td {
padding: 0; padding: 0;
} }
pre {
font-size: 1.1em;
font-family: Monaco, 'Courier New', monospace;
}

8
phpBB/viewtopic.php
View file

@ -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_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_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_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('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('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('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_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_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>' : ''; $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. // If we've got a hightlight set pass it on to pagination.