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

some fixes. :P

Browse source 
- language authors may review their email template files...


git-svn-id: file:///svn/phpbb/trunk@8092 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-09-18 14:49:19 +00:00
parent 36e99af959
commit 951f793dae
28 changed files with 50 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/adm/index.php
View file

@ -276,7 +276,7 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
$size = (int) $tpl_type[1]; $size = (int) $tpl_type[1];
$maxlength = (int) $tpl_type[2]; $maxlength = (int) $tpl_type[2];
$tpl = '<input id="' . $key . '" type="text"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="config[' . $config_key . '_height]" value="' . $new[$config_key . '_height'] . '" /> x <input type="text"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="config[' . $config_key . '_width]" value="' . $new[$config_key . '_width'] . '" />'; $tpl = '<input id="' . $key . '" type="text"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="config[' . $config_key . '_width]" value="' . $new[$config_key . '_width'] . '" /> x <input type="text"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="config[' . $config_key . '_height]" value="' . $new[$config_key . '_height'] . '" />';
break; break;
case 'textarea': case 'textarea':

1
phpBB/adm/style/acp_styles.html
View file

@ -237,6 +237,7 @@
} }
} }
} }
//--> //-->
</script> </script>

1
phpBB/adm/style/admin.css
View file

@ -421,7 +421,6 @@ span.corners-bottom span {
#menu li a:hover, #menu li a:hover span { #menu li a:hover, #menu li a:hover span {
text-decoration: none; text-decoration: none;
background-color: #FFFFFF; background-color: #FFFFFF;
color: #BC2A4D; color: #BC2A4D;
} }

2
phpBB/adm/style/install_convert.html
View file

@ -30,7 +30,7 @@
<th>{L_SOFTWARE}</th> <th>{L_SOFTWARE}</th>
<th>{L_VERSION}</th> <th>{L_VERSION}</th>
<th>{L_AUTHOR}</th> <th>{L_AUTHOR}</th>
<th>{L_OPTIONS}</th> <th>{L_CONVERT_OPTIONS}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

1
phpBB/adm/swatch.php
View file

@ -12,6 +12,7 @@
* @ignore * @ignore
*/ */
define('IN_PHPBB', true); define('IN_PHPBB', true);
define('ADMIN_START', true);
$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../'; $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
$phpEx = substr(strrchr(__FILE__, '.'), 1); $phpEx = substr(strrchr(__FILE__, '.'), 1);
include($phpbb_root_path . 'common.' . $phpEx); include($phpbb_root_path . 'common.' . $phpEx);

5
phpBB/docs/CHANGELOG.html
View file

@ -210,6 +210,11 @@ p a {
<li>[Change] Added Code for cleaning the confirm table to the session garbage collection</li> <li>[Change] Added Code for cleaning the confirm table to the session garbage collection</li>
<li>[Fix] Fixed token handling in jabber class for extremely spec-compilant XMPP server (Bug #14445)</li> <li>[Fix] Fixed token handling in jabber class for extremely spec-compilant XMPP server (Bug #14445)</li>
<li>[Fix] Disallowed galleries from using special characters (Bug #14466)</li> <li>[Fix] Disallowed galleries from using special characters (Bug #14466)</li>
<li>[Fix] Yahoo! IM no longer supporting non-yahoo users sending messages to them over the web. Needed to use the Yahoo! uri scheme which does not work for those not having the Yahoo! IM. (Bug #14353)</li>
<li>[Change] Listing the board url within the email text instead of appending it to the subject (Bug #14378)</li>
<li>[Fix] Always display the quote button as the most accessible one - edit is always before quote (Bug #14403)</li>
<li>[Fix] Use correct dimension (width x height) in ACP (Bug #14452)</li>
<li>[Fix] Only display PM history links if there are PM's to be displayed (Bug #14484)</li>
</ul> </ul>
</div> </div>

3
phpBB/docs/INSTALL.html
View file

@ -242,7 +242,8 @@ p a {
<li>Oracle</li> <li>Oracle</li>
</ul> </ul>
</li> </li>
<li><strong>PHP 4.3.3</strong> or above with support for the database you intend to use.</li> <li><strong>PHP 4.3.3+ (>=4.3.3, >4.4.x, >5.x.x, >6.0-dev (compatible))</strong> with support for the database you intend to use.</li>
<li>getimagesize() function need to be enabled.</li>
<li>These optional presence of the following modules within PHP will provide access to additional features, but they are not required. <li>These optional presence of the following modules within PHP will provide access to additional features, but they are not required.
<ul> <ul>
<li>zlib Compression support</li> <li>zlib Compression support</li>

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

@ -2101,7 +2101,7 @@ parse_css_file = {PARSE_CSS_FILE}
{ {
$cfg = parse_cfg_file("{$phpbb_root_path}styles/" . $style_row["{$mode}_path"] . "/theme/theme.cfg"); $cfg = parse_cfg_file("{$phpbb_root_path}styles/" . $style_row["{$mode}_path"] . "/theme/theme.cfg");
if (isset($cfg['parse_css_file']) && $cfg['parse_css_file']) if (isset($cfg['parse_css_file']) && $cfg['parse_css_file'] && !$store_db)
{ {
$error[] = $user->lang['EDIT_THEME_STORE_PARSED']; $error[] = $user->lang['EDIT_THEME_STORE_PARSED'];
$store_db = 1; $store_db = 1;

2
phpBB/includes/functions.php
View file

@ -3512,7 +3512,7 @@ function truncate_string($string, $max_length = 60, $allow_reply = true, $append
if (sizeof($chars) > $max_length) if (sizeof($chars) > $max_length)
{ {
// Cut off the last elements from the array // Cut off the last elements from the array
$string = implode('', array_slice($chars, 0, $max_length)); $string = implode('', array_slice($chars, 0, $max_length - utf8_strlen($append)));
$stripped = true; $stripped = true;
} }

6
phpBB/includes/functions_privmsgs.php
View file

@ -1831,9 +1831,9 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode
'QUOTE_IMG' => $user->img('icon_post_quote', $user->lang['REPLY_WITH_QUOTE']), 'QUOTE_IMG' => $user->img('icon_post_quote', $user->lang['REPLY_WITH_QUOTE']),
'HISTORY_TITLE' => $title, 'HISTORY_TITLE' => $title,
'U_VIEW_NEXT_HISTORY' => "$url&amp;p=" . (($next_history_pm) ? $next_history_pm : $msg_id), 'U_VIEW_NEXT_HISTORY' => ($next_history_pm) ? "$url&amp;p=" . $next_history_pm : '',
'U_VIEW_PREVIOUS_HISTORY' => "$url&amp;p=" . (($previous_history_pm) ? $previous_history_pm : $msg_id)) 'U_VIEW_PREVIOUS_HISTORY' => ($previous_history_pm) ? "$url&amp;p=" . $previous_history_pm : '',
); ));
return true; return true;
} }

4
phpBB/includes/ucp/ucp_pm_viewmessage.php
View file

@ -193,9 +193,9 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
'U_PM' => ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($user_info['user_allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=compose&amp;u=' . $author_id) : '', 'U_PM' => ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($user_info['user_allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=compose&amp;u=' . $author_id) : '',
'U_WWW' => (!empty($user_info['user_website'])) ? $user_info['user_website'] : '', 'U_WWW' => (!empty($user_info['user_website'])) ? $user_info['user_website'] : '',
'U_ICQ' => ($user_info['user_icq']) ? 'http://www.icq.com/people/webmsg.php?to=' . $user_info['user_icq'] : '', 'U_ICQ' => ($user_info['user_icq']) ? 'http://www.icq.com/people/webmsg.php?to=' . urlencode($user_info['user_icq']) : '',
'U_AIM' => ($user_info['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=aim&amp;u=' . $author_id) : '', 'U_AIM' => ($user_info['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=aim&amp;u=' . $author_id) : '',
'U_YIM' => ($user_info['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . $user_info['user_yim'] . '&amp;.src=pg' : '', 'U_YIM' => ($user_info['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($user_info['user_yim']) . '&amp;.src=pg' : '',
'U_MSN' => ($user_info['user_msnm'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=msnm&amp;u=' . $author_id) : '', 'U_MSN' => ($user_info['user_msnm'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=msnm&amp;u=' . $author_id) : '',
'U_JABBER' => ($user_info['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=jabber&amp;u=' . $author_id) : '', 'U_JABBER' => ($user_info['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=jabber&amp;u=' . $author_id) : '',

6
phpBB/install/install_convert.php
View file

@ -273,7 +273,7 @@ class install_convert extends module
'L_AVAILABLE_CONVERTORS' => $lang['AVAILABLE_CONVERTORS'], 'L_AVAILABLE_CONVERTORS' => $lang['AVAILABLE_CONVERTORS'],
'L_CONVERT' => $lang['CONVERT'], 'L_CONVERT' => $lang['CONVERT'],
'L_NO_CONVERTORS' => $lang['NO_CONVERTORS'], 'L_NO_CONVERTORS' => $lang['NO_CONVERTORS'],
'L_OPTIONS' => $lang['OPTIONS'], 'L_OPTIONS' => $lang['CONVERT_OPTIONS'],
'L_SOFTWARE' => $lang['SOFTWARE'], 'L_SOFTWARE' => $lang['SOFTWARE'],
'L_VERSION' => $lang['VERSION'], 'L_VERSION' => $lang['VERSION'],
@ -521,7 +521,7 @@ class install_convert extends module
set_config('convert_options', serialize(array('forum_path' => './../' . $forum_path, 'refresh' => $refresh)), true); set_config('convert_options', serialize(array('forum_path' => './../' . $forum_path, 'refresh' => $refresh)), true);
$template->assign_block_vars('checks', array( $template->assign_block_vars('checks', array(
'TITLE' => $lang['SPECIFY_OPTIONS'], 'TITLE' => $lang['VERIFY_OPTIONS'],
'RESULT' => $lang['CONVERT_SETTINGS_VERIFIED'], 'RESULT' => $lang['CONVERT_SETTINGS_VERIFIED'],
)); ));
@ -536,7 +536,7 @@ class install_convert extends module
else else
{ {
$template->assign_block_vars('checks', array( $template->assign_block_vars('checks', array(
'TITLE' => $lang['SPECIFY_OPTIONS'], 'TITLE' => $lang['VERIFY_OPTIONS'],
'RESULT' => '<b style="color:red">' . implode('<br />', $error) . '</b>', 'RESULT' => '<b style="color:red">' . implode('<br />', $error) . '</b>',
)); ));
} }

4
phpBB/language/en/email/admin_welcome_inactive.txt
View file

@ -1,4 +1,4 @@
Subject: Welcome to "{SITENAME}" - {U_BOARD} Subject: Welcome to "{SITENAME}"
{WELCOME_MSG} {WELCOME_MSG}
@ -7,6 +7,8 @@ Please keep this e-mail for your records. Your account information is as follows
---------------------------- ----------------------------
Username: {USERNAME} Username: {USERNAME}
Password: {PASSWORD} Password: {PASSWORD}
Board URL: {U_BOARD}
---------------------------- ----------------------------
Your account is currently inactive, the administrator of the board will need to activate it before you can log in. You will receive another e-mail when this has occurred. Your account is currently inactive, the administrator of the board will need to activate it before you can log in. You will receive another e-mail when this has occurred.

4
phpBB/language/en/email/coppa_resend_inactive.txt
View file

@ -1,4 +1,4 @@
Subject: Welcome to "{SITENAME}" - {U_BOARD} Subject: Welcome to "{SITENAME}"
{WELCOME_MSG} {WELCOME_MSG}
@ -13,7 +13,7 @@ OR mail it to:
{MAIL_INFO} {MAIL_INFO}
------------------------------ CUT HERE ------------------------------ ------------------------------ CUT HERE ------------------------------
Permission to participate at "{SITENAME}" Permission to participate at "{SITENAME}" - {U_BOARD}
Username: {USERNAME} Username: {USERNAME}
E-mail: {EMAIL_ADDRESS} E-mail: {EMAIL_ADDRESS}

4
phpBB/language/en/email/coppa_welcome_inactive.txt
View file

@ -1,4 +1,4 @@
Subject: Welcome to "{SITENAME}" - {U_BOARD} Subject: Welcome to "{SITENAME}"
{WELCOME_MSG} {WELCOME_MSG}
@ -13,7 +13,7 @@ OR mail it to:
{MAIL_INFO} {MAIL_INFO}
------------------------------ CUT HERE ------------------------------ ------------------------------ CUT HERE ------------------------------
Permission to participate at "{SITENAME}" Permission to participate at "{SITENAME}" - {U_BOARD}
Username: {USERNAME} Username: {USERNAME}
Password: {PASSWORD} Password: {PASSWORD}

2
phpBB/language/en/email/user_reactivate_account.txt
View file

@ -1,4 +1,4 @@
Subject: Reactivate your account on "{SITENAME}" - {U_BOARD} Subject: Reactivate your account on "{SITENAME}"
A board administrator requested that your account be reactivated. Your account is currently inactive. A board administrator requested that your account be reactivated. Your account is currently inactive.
Please follow the steps listed here to reactivate your account. Please follow the steps listed here to reactivate your account.

2
phpBB/language/en/email/user_resend_inactive.txt
View file

@ -1,4 +1,4 @@
Subject: Welcome to "{SITENAME}" - {U_BOARD} Subject: Welcome to "{SITENAME}"
{WELCOME_MSG} {WELCOME_MSG}

4
phpBB/language/en/email/user_welcome.txt
View file

@ -1,4 +1,4 @@
Subject: Welcome to "{SITENAME}" - {U_BOARD} Subject: Welcome to "{SITENAME}"
{WELCOME_MSG} {WELCOME_MSG}
@ -7,6 +7,8 @@ Please keep this e-mail for your records. Your account information is as follows
---------------------------- ----------------------------
Username: {USERNAME} Username: {USERNAME}
Password: {PASSWORD} Password: {PASSWORD}
Board URL: {U_BOARD}
---------------------------- ----------------------------
Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account. Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.

4
phpBB/language/en/email/user_welcome_inactive.txt
View file

@ -1,4 +1,4 @@
Subject: Welcome to "{SITENAME}" - {U_BOARD} Subject: Welcome to "{SITENAME}"
{WELCOME_MSG} {WELCOME_MSG}
@ -7,6 +7,8 @@ Please keep this e-mail for your records. Your account information is as follows
---------------------------- ----------------------------
Username: {USERNAME} Username: {USERNAME}
Password: {PASSWORD} Password: {PASSWORD}
Board URL: {U_BOARD}
---------------------------- ----------------------------
Your account is currently inactive. You cannot use it until you visit the following link: Your account is currently inactive. You cannot use it until you visit the following link:

4
phpBB/language/en/install.php
View file

@ -79,8 +79,9 @@ $lang = array_merge($lang, array(
'CONVERT_INTRO_BODY' => 'From here, you are able to import data from other (installed) board systems. The list below shows all the conversion modules currently available. If there is no convertor shown in this list for the board software you wish to convert from, please check our website where further conversion modules may be available for download.', 'CONVERT_INTRO_BODY' => 'From here, you are able to import data from other (installed) board systems. The list below shows all the conversion modules currently available. If there is no convertor shown in this list for the board software you wish to convert from, please check our website where further conversion modules may be available for download.',
'CONVERT_NEW_CONVERSION' => 'New conversion', 'CONVERT_NEW_CONVERSION' => 'New conversion',
'CONVERT_NOT_EXIST' => 'The specified convertor does not exist.', 'CONVERT_NOT_EXIST' => 'The specified convertor does not exist.',
'CONVERT_OPTIONS' => 'Options',
'CONVERT_SETTINGS_VERIFIED' => 'The information you entered has been verified. To start the conversion process, push the button below to begin.', 'CONVERT_SETTINGS_VERIFIED' => 'The information you entered has been verified. To start the conversion process, push the button below to begin.',
'CONV_ERR_FATAL' => 'Fatal conversion error', 'CONV_ERR_FATAL' => 'Fatal conversion error',
'CONV_ERROR_ATTACH_FTP_DIR' => 'FTP upload for attachments is enabled at the old board. Please disable the FTP upload option and make sure a valid upload directory is specified, then copy all attachment files to this new web accessible directory. Once you have done this, restart the convertor.', 'CONV_ERROR_ATTACH_FTP_DIR' => 'FTP upload for attachments is enabled at the old board. Please disable the FTP upload option and make sure a valid upload directory is specified, then copy all attachment files to this new web accessible directory. Once you have done this, restart the convertor.',
'CONV_ERROR_CONFIG_EMPTY' => 'There is no configuration information available for the conversion.', 'CONV_ERROR_CONFIG_EMPTY' => 'There is no configuration information available for the conversion.',
@ -350,6 +351,7 @@ $lang = array_merge($lang, array(
'UNWRITABLE' => 'Unwritable', 'UNWRITABLE' => 'Unwritable',
'UPDATE_TOPICS_POSTED' => 'Generating topics posted information', 'UPDATE_TOPICS_POSTED' => 'Generating topics posted information',
'UPDATE_TOPICS_POSTED_ERR' => 'An error occured while generating topics posted information. You can retry this step in the ACP after the conversion process is completed.', 'UPDATE_TOPICS_POSTED_ERR' => 'An error occured while generating topics posted information. You can retry this step in the ACP after the conversion process is completed.',
'VERIFY_OPTIONS' => 'Verifying conversion options',
'VERSION' => 'Version', 'VERSION' => 'Version',
'WELCOME_INSTALL' => 'Welcome to phpBB3 Installation', 'WELCOME_INSTALL' => 'Welcome to phpBB3 Installation',

4
phpBB/memberlist.php
View file

@ -1531,9 +1531,9 @@ function show_profile($data)
'U_PM' => ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($data['user_allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=compose&amp;u=' . $user_id) : '', 'U_PM' => ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($data['user_allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=compose&amp;u=' . $user_id) : '',
'U_EMAIL' => $email, 'U_EMAIL' => $email,
'U_WWW' => (!empty($data['user_website'])) ? $data['user_website'] : '', 'U_WWW' => (!empty($data['user_website'])) ? $data['user_website'] : '',
'U_ICQ' => ($data['user_icq']) ? 'http://www.icq.com/people/webmsg.php?to=' . $data['user_icq'] : '', 'U_ICQ' => ($data['user_icq']) ? 'http://www.icq.com/people/webmsg.php?to=' . urlencode($data['user_icq']) : '',
'U_AIM' => ($data['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=aim&amp;u=' . $user_id) : '', 'U_AIM' => ($data['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=aim&amp;u=' . $user_id) : '',
'U_YIM' => ($data['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . $data['user_yim'] . '&amp;.src=pg' : '', 'U_YIM' => ($data['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($data['user_yim']) . '&amp;.src=pg' : '',
'U_MSN' => ($data['user_msnm'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=msnm&amp;u=' . $user_id) : '', 'U_MSN' => ($data['user_msnm'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=msnm&amp;u=' . $user_id) : '',
'U_JABBER' => ($data['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=jabber&amp;u=' . $user_id) : '', 'U_JABBER' => ($data['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=jabber&amp;u=' . $user_id) : '',
'LOCATION' => ($data['user_from']) ? $data['user_from'] : '', 'LOCATION' => ($data['user_from']) ? $data['user_from'] : '',

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

@ -6,7 +6,7 @@
<div class="inner"><span class="corners-top"><span></span></span> <div class="inner"><span class="corners-top"><span></span></span>
<ul class="linklist"> <ul class="linklist">
<li><a class="icon-home" href="{U_INDEX}" accesskey="h">{L_INDEX}</a></li> <li class="icon-home"><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a></li>
<!-- IF not S_IS_BOT --> <!-- IF not S_IS_BOT -->
<!-- IF S_WATCH_FORUM_LINK --><li><a href="{S_WATCH_FORUM_LINK}" <!-- IF S_WATCHING_FORUM -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF --> title="{S_WATCH_FORUM_TITLE}">{S_WATCH_FORUM_TITLE}</a></li><!-- ENDIF --> <!-- IF S_WATCH_FORUM_LINK --><li><a href="{S_WATCH_FORUM_LINK}" <!-- IF S_WATCHING_FORUM -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF --> title="{S_WATCH_FORUM_TITLE}">{S_WATCH_FORUM_TITLE}</a></li><!-- ENDIF -->
<!-- IF U_WATCH_TOPIC --><li><a href="{U_WATCH_TOPIC}" title="{L_WATCH_TOPIC}" <!-- IF S_WATCHING_TOPIC -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->>{L_WATCH_TOPIC}</a></li><!-- ENDIF --> <!-- IF U_WATCH_TOPIC --><li><a href="{U_WATCH_TOPIC}" title="{L_WATCH_TOPIC}" <!-- IF S_WATCHING_TOPIC -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->>{L_WATCH_TOPIC}</a></li><!-- ENDIF -->

6
phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
View file

@ -5,10 +5,10 @@
<span class="corners-bottom"><span></span></span></div> <span class="corners-bottom"><span></span></span></div>
</div> </div>
<!-- IF S_DISPLAY_HISTORY --> <!-- IF S_DISPLAY_HISTORY and (U_VIEW_PREVIOUS_HISTORY or U_VIEW_NEXT_HISTORY) -->
<fieldset class="display-options clearfix"> <fieldset class="display-options clearfix">
<a href="{U_VIEW_PREVIOUS_HISTORY}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_HISTORY}</a> <!-- IF U_VIEW_PREVIOUS_HISTORY --><a href="{U_VIEW_PREVIOUS_HISTORY}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_HISTORY}</a><!-- ENDIF -->
<a href="{U_VIEW_NEXT_HISTORY}" class="right-box {S_CONTENT_FLOW_END}">{L_VIEW_NEXT_HISTORY}</a> <!-- IF U_VIEW_NEXT_HISTORY --><a href="{U_VIEW_NEXT_HISTORY}" class="right-box {S_CONTENT_FLOW_END}">{L_VIEW_NEXT_HISTORY}</a><!-- ENDIF -->
</fieldset> </fieldset>
<!-- ENDIF --> <!-- ENDIF -->

2
phpBB/styles/prosilver/template/viewtopic_body.html
View file

@ -124,12 +124,12 @@
<!-- IF not S_IS_BOT --> <!-- IF not S_IS_BOT -->
<!-- IF postrow.U_QUOTE or postrow.U_INFO or postrow.U_DELETE or postrow.U_EDIT --> <!-- IF postrow.U_QUOTE or postrow.U_INFO or postrow.U_DELETE or postrow.U_EDIT -->
<ul class="profile-icons"> <ul class="profile-icons">
<!-- IF postrow.U_QUOTE --><li class="quote-icon"><a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}"><span>{L_REPLY_WITH_QUOTE}</span></a></li><!-- ENDIF -->
<!-- IF postrow.U_EDIT --><li class="edit-icon"><a href="{postrow.U_EDIT}" title="{L_EDIT_POST}"><span>{L_EDIT_POST}</span></a></li><!-- ENDIF --> <!-- IF postrow.U_EDIT --><li class="edit-icon"><a href="{postrow.U_EDIT}" title="{L_EDIT_POST}"><span>{L_EDIT_POST}</span></a></li><!-- ENDIF -->
<!-- IF postrow.U_DELETE --><li class="delete-icon"><a href="{postrow.U_DELETE}" title="{L_DELETE_POST}"><span>{L_DELETE_POST}</span></a></li><!-- ENDIF --> <!-- IF postrow.U_DELETE --><li class="delete-icon"><a href="{postrow.U_DELETE}" title="{L_DELETE_POST}"><span>{L_DELETE_POST}</span></a></li><!-- ENDIF -->
<!-- IF postrow.U_REPORT --><li class="report-icon"><a href="{postrow.U_REPORT}" title="{L_REPORT_POST}"><span>{L_REPORT_POST}</span></a></li><!-- ENDIF --> <!-- IF postrow.U_REPORT --><li class="report-icon"><a href="{postrow.U_REPORT}" title="{L_REPORT_POST}"><span>{L_REPORT_POST}</span></a></li><!-- ENDIF -->
<!-- IF postrow.U_WARN --><li class="warn-icon"><a href="{postrow.U_WARN}" title="{L_WARN_USER}"><span>{L_WARN_USER}</span></a></li><!-- ENDIF --> <!-- IF postrow.U_WARN --><li class="warn-icon"><a href="{postrow.U_WARN}" title="{L_WARN_USER}"><span>{L_WARN_USER}</span></a></li><!-- ENDIF -->
<!-- IF postrow.U_INFO --><li class="info-icon"><a href="{postrow.U_INFO}" title="{L_INFORMATION}"><span>{L_INFORMATION}</span></a></li><!-- ENDIF --> <!-- IF postrow.U_INFO --><li class="info-icon"><a href="{postrow.U_INFO}" title="{L_INFORMATION}"><span>{L_INFORMATION}</span></a></li><!-- ENDIF -->
<!-- IF postrow.U_QUOTE --><li class="quote-icon"><a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}"><span>{L_REPLY_WITH_QUOTE}</span></a></li><!-- ENDIF -->
</ul> </ul>
<!-- ENDIF --> <!-- ENDIF -->
<!-- ENDIF --> <!-- ENDIF -->

1
phpBB/styles/prosilver/theme/content.css
View file

@ -579,7 +579,6 @@ dl.file dd {
dl.thumbnail img { dl.thumbnail img {
padding: 3px; padding: 3px;
border: 1px solid #666666; border: 1px solid #666666;
display: block;
background-color: #FFF; background-color: #FFF;
} }

2
phpBB/styles/subsilver2/template/ucp_pm_message_header.html
View file

@ -21,7 +21,7 @@
<!-- IF S_VIEW_MESSAGE --> <!-- IF S_VIEW_MESSAGE -->
<span class="gensmall"> <span class="gensmall">
<!-- IF S_DISPLAY_HISTORY --> <!-- IF S_DISPLAY_HISTORY -->
<a href="{U_VIEW_PREVIOUS_HISTORY}">{L_VIEW_PREVIOUS_HISTORY}</a> | <a href="{U_VIEW_NEXT_HISTORY}">{L_VIEW_NEXT_HISTORY}</a> | <!-- IF U_VIEW_PREVIOUS_HISTORY --><a href="{U_VIEW_PREVIOUS_HISTORY}">{L_VIEW_PREVIOUS_HISTORY}</a> | <!-- ENDIF --><!-- IF U_VIEW_NEXT_HISTORY --><a href="{U_VIEW_NEXT_HISTORY}">{L_VIEW_NEXT_HISTORY}</a> | <!-- ENDIF -->
<!-- ENDIF --><a href="{U_PREVIOUS_PM}">{L_VIEW_PREVIOUS_PM}</a> | <a href="{U_NEXT_PM}">{L_VIEW_NEXT_PM}</a>&nbsp; <!-- ENDIF --><a href="{U_PREVIOUS_PM}">{L_VIEW_PREVIOUS_PM}</a> | <a href="{U_NEXT_PM}">{L_VIEW_NEXT_PM}</a>&nbsp;
</span> </span>
<!-- ENDIF --> <!-- ENDIF -->

2
phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html
View file

@ -104,7 +104,7 @@
</tr> </tr>
<tr class="row1"> <tr class="row1">
<td><div class="gensmall" style="float: {S_CONTENT_FLOW_BEGIN};">&nbsp;<!-- IF U_MESSAGE_AUTHOR --><a href="{U_MESSAGE_AUTHOR}">{PROFILE_IMG}</a> <!-- ENDIF --> <!-- IF U_EMAIL --><a href="{U_EMAIL}">{EMAIL_IMG}</a> <!-- ENDIF -->&nbsp;</div> <div class="gensmall" style="float: {S_CONTENT_FLOW_END};"><!-- IF U_QUOTE --><a href="{U_QUOTE}">{QUOTE_IMG}</a> <!-- ENDIF --> <!-- IF U_POST_REPLY_PM --><a href="{U_POST_REPLY_PM}">{REPLY_IMG}</a><!-- ENDIF --> <!-- IF U_EDIT --><a href="{U_EDIT}">{EDIT_IMG}</a> <!-- ENDIF -->&nbsp;</div></td> <td><div class="gensmall" style="float: {S_CONTENT_FLOW_BEGIN};">&nbsp;<!-- IF U_MESSAGE_AUTHOR --><a href="{U_MESSAGE_AUTHOR}">{PROFILE_IMG}</a> <!-- ENDIF --> <!-- IF U_EMAIL --><a href="{U_EMAIL}">{EMAIL_IMG}</a> <!-- ENDIF -->&nbsp;</div> <div class="gensmall" style="float: {S_CONTENT_FLOW_END};"><!-- IF U_EDIT --><a href="{U_EDIT}">{EDIT_IMG}</a> <!-- ENDIF --> <!-- IF U_QUOTE --><a href="{U_QUOTE}">{QUOTE_IMG}</a> <!-- ENDIF --> <!-- IF U_POST_REPLY_PM --><a href="{U_POST_REPLY_PM}">{REPLY_IMG}</a><!-- ENDIF -->&nbsp;</div></td>
</tr> </tr>
<tr> <tr>

2
phpBB/viewtopic.php
View file

@ -1040,7 +1040,7 @@ while ($row = $db->sql_fetchrow($result))
'www' => $row['user_website'], 'www' => $row['user_website'],
'aim' => ($row['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&amp;action=aim&amp;u=$poster_id") : '', 'aim' => ($row['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&amp;action=aim&amp;u=$poster_id") : '',
'msn' => ($row['user_msnm'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&amp;action=msnm&amp;u=$poster_id") : '', 'msn' => ($row['user_msnm'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&amp;action=msnm&amp;u=$poster_id") : '',
'yim' => ($row['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . $row['user_yim'] . '&amp;.src=pg' : '', 'yim' => ($row['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($row['user_yim']) . '&amp;.src=pg' : '',
'jabber' => ($row['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&amp;action=jabber&amp;u=$poster_id") : '', 'jabber' => ($row['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&amp;action=jabber&amp;u=$poster_id") : '',
'search' => ($auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", 'search_author=' . urlencode($row['username']) .'&amp;showresults=posts') : '', 'search' => ($auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", 'search_author=' . urlencode($row['username']) .'&amp;showresults=posts') : '',
); );