diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-06-09 11:11:20 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-06-09 11:11:20 +0000 |
| commit | 455536773fd34f72e371386b5b0d9a517e0fc1e7 (patch) | |
| tree | b92b8cb07045e0aac93749f4e419d9d3a1f1654d | |
| parent | cbf7b00cb801bc7cbed5735452fc680c85cd9669 (diff) | |
| download | forums-455536773fd34f72e371386b5b0d9a517e0fc1e7.tar forums-455536773fd34f72e371386b5b0d9a517e0fc1e7.tar.gz forums-455536773fd34f72e371386b5b0d9a517e0fc1e7.tar.bz2 forums-455536773fd34f72e371386b5b0d9a517e0fc1e7.tar.xz forums-455536773fd34f72e371386b5b0d9a517e0fc1e7.zip | |
ok, mess around with the templates + fixing some bugs + adjusting headers for those files already modified to circumvent conflicts for those having their editor set to remove trailing spaces (not recommended!)
git-svn-id: file:///svn/phpbb/trunk@7736 89ea8834-ac86-4346-8a33-228a782c2dd0
89 files changed, 306 insertions, 262 deletions
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 6cc703a5a7..eaa7d3bf7a 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -161,7 +161,7 @@ </dl> <dl> <dt><label for="forum_password">{L_FORUM_PASSWORD}:</label><br /><span>{L_FORUM_PASSWORD_EXPLAIN}</span></dt> - <dd><input type="password" id="forum_password" name="forum_password" value="{FORUM_PASSWORD}" maxlength="40" /></dd> + <dd><input type="password" id="forum_password" name="forum_password" value="{FORUM_PASSWORD}" /></dd> </dl> <dl> <dt><label for="forum_password_confirm">{L_FORUM_PASSWORD_CONFIRM}:</label><br /><span>{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}</span></dt> diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html index 5c3d0077b6..e14e622080 100644 --- a/phpBB/adm/style/acp_profile.html +++ b/phpBB/adm/style/acp_profile.html @@ -129,7 +129,7 @@ <fieldset class="quick" style="float: right"> {S_HIDDEN_FIELDS} - <input class="button1" type="submit" name="next" value="{L_NEXT}" /> + <input class="button1" type="submit" name="next" value="{L_NEXT_STEP}" /> </fieldset> <!-- ELSEIF S_STEP_THREE --> diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html index dd6e615df2..6b361ec3f1 100644 --- a/phpBB/adm/style/install_update.html +++ b/phpBB/adm/style/install_update.html @@ -22,7 +22,7 @@ <p>{L_UPDATE_INSTALLATION_EXPLAIN}</p> <fieldset class="submit-buttons"> - <input class="button1" type="submit" name="submit" value="{L_NEXT}" /> + <input class="button1" type="submit" name="submit" value="{L_NEXT_STEP}" /> </fieldset> </form> @@ -100,8 +100,6 @@ <p> {L_PERFORM_DATABASE_UPDATE_EXPLAIN}<br /> - <br /> - <a href="{U_DB_UPDATE}"><strong>» {L_RUN_DATABASE_SCRIPT} «</strong></a> </p> <br /><br /> @@ -109,7 +107,9 @@ <form id="install_dbupdate" method="post" action="{U_DB_UPDATE_ACTION}"> <fieldset class="submit-buttons"> - <input class="button1" type="submit" name="db_update" value="{L_CHECK_UPDATE_DATABASE}" /> + <a href="{U_DB_UPDATE}" class="button1">{L_RUN_DATABASE_SCRIPT}</a> + + <!-- input class="button1" type="submit" name="db_update" value="{L_CHECK_UPDATE_DATABASE}" / --> </fieldset> </form> diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html index 2fd8142279..794d285574 100644 --- a/phpBB/adm/style/install_update_diff.html +++ b/phpBB/adm/style/install_update_diff.html @@ -35,7 +35,7 @@ function resize_panel() <!-- #main { - font-size: 1.25em; + font-size: 1em; line-height: 0.7em; margin: 0; padding: 0; @@ -214,13 +214,14 @@ table.hrdiff caption span { <h1>{L_VIEWING_FILE_DIFF}</h1> <!-- ENDIF --> <!-- IF not S_DIFF_NEW_FILE --> - <br /> <p id="skip"><a href="#acp">{L_SKIP}</a></p> <form method="post"> + <fieldset class="quick"> <label for="diff_mode">{L_SELECT_DIFF_MODE}:</label> <select name="diff_mode" id="diff_mode">{S_DIFF_MODE_OPTIONS}</select> <input class="button1" type="submit" id="submit" name="submit" value="{L_CHANGE}" /> + </fieldset> </form> <!-- ENDIF --> </div> diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index a4e629bbaa..10c2738c1e 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -249,8 +249,11 @@ p a { <li>[Fix] Correctly move pm's into folders if more than one is received (Bug #12135)</li> <li>[Fix] Corrected various bugs with CPF on multi-language boards (Bug #11803)</li> <li>[Fix] Disable notify checkbox in posting editor when board email is disabled (Bug #12263)</li> + <li>[Fix] Removed maxlength from password/username fields (Bugs #12215, #11797)</li> + <li>[Fix] Use icon-unsubscribe in prosilver (Bug #12211)</li> + <li>[Fix] Seperated PREVIOUS/NEXT language vars for pagination and next/previous step (Bug #12197)</li> + <li>[Feature] append_sid() supporting anchor (Bug #11535) - patch provided by Schumi and ToonArmy</li> - </ul> diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index 2fdbdbdbd1..99d7831390 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package acp * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 6bada468db..9cf36ca4bf 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package acp * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * * @todo add cron intervals to server settings? (database_gc, queue_interval, session_gc, search_gc, cache_gc, warnings_gc) */ diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 3e5ca705da..ced09a4708 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package acp * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/includes/acp/acp_jabber.php b/phpBB/includes/acp/acp_jabber.php index 76d91c5324..9f02530b27 100644 --- a/phpBB/includes/acp/acp_jabber.php +++ b/phpBB/includes/acp/acp_jabber.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package acp * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * * @todo Check/enter/update transport info */ diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php index fbdb1b3cc5..dfc1355f5c 100644 --- a/phpBB/includes/acp/acp_permissions.php +++ b/phpBB/includes/acp/acp_permissions.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package acp * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php index 82b14b2a3d..1041acc962 100644 --- a/phpBB/includes/acp/acp_profile.php +++ b/phpBB/includes/acp/acp_profile.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package acp * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php index a82579b65c..27c3157723 100644 --- a/phpBB/includes/acp/acp_search.php +++ b/phpBB/includes/acp/acp_search.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package acp * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index 89dcf2005d..f1e0fdef77 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package acp * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ @@ -52,8 +52,8 @@ class acp_styles # phpBB {MODE} configuration file # # @package phpBB3 -# @copyright (c) 2005 phpBB Group -# @license http://opensource.org/licenses/gpl-license.php GNU Public License +# @copyright (c) 2005 phpBB Group +# @license http://opensource.org/licenses/gpl-license.php GNU Public License # # # At the left is the name, please do not change this diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php index 24dc3ebabf..02d4c6bb3c 100644 --- a/phpBB/includes/acp/acp_update.php +++ b/phpBB/includes/acp/acp_update.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package acp * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 3b86dc668c..302e23e859 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package acp * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/includes/auth.php b/phpBB/includes/auth.php index 3b05652a87..c7b53b4a9a 100644 --- a/phpBB/includes/auth.php +++ b/phpBB/includes/auth.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package phpBB3 -* @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @version $Id$ +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/includes/cache.php b/phpBB/includes/cache.php index d021aac507..97b98e1227 100644 --- a/phpBB/includes/cache.php +++ b/phpBB/includes/cache.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package acm * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php index c0d960506d..bddf1602b3 100644 --- a/phpBB/includes/db/oracle.php +++ b/phpBB/includes/db/oracle.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package dbal * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 64d4b1ba37..fc1e173600 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package phpBB3 * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ @@ -1586,11 +1586,30 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false) // Appending custom url parameter? $append_url = (!empty($_EXTRA_URL)) ? implode($amp_delim, $_EXTRA_URL) : ''; + $anchor = ''; + if (strpos($url, '#') !== false) + { + list($url, $anchor) = explode('#', $url, 2); + $anchor = '#' . $anchor; + } + else if (!is_array($params) && strpos($params, '#') !== false) + { + list($params, $anchor) = explode('#', $params, 2); + $anchor = '#' . $anchor; + } + // Use the short variant if possible ;) if ($params === false) { // Append session id - return (!$session_id) ? $url . (($append_url) ? $url_delim . $append_url : '') : $url . (($append_url) ? $url_delim . $append_url . $amp_delim : $url_delim) . 'sid=' . $session_id; + if (!$session_id) + { + return $url . (($append_url) ? $url_delim . $append_url : '') . $anchor; + } + else + { + return $url . (($append_url) ? $url_delim . $append_url . $amp_delim : $url_delim) . 'sid=' . $session_id . $anchor; + } } // Build string if parameters are specified as array @@ -1605,6 +1624,12 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false) continue; } + if ($key == '#') + { + $anchor = '#' . $item; + continue; + } + $output[] = $key . '=' . $item; } @@ -1613,7 +1638,7 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false) // Append session id and parameters (even if they are empty) // If parameters are empty, the developer can still append his/her parameters without caring about the delimiter - return $url . (($append_url) ? $url_delim . $append_url . $amp_delim : $url_delim) . $params . ((!$session_id) ? '' : $amp_delim . 'sid=' . $session_id); + return $url . (($append_url) ? $url_delim . $append_url . $amp_delim : $url_delim) . $params . ((!$session_id) ? '' : $amp_delim . 'sid=' . $session_id) . $anchor; } /** diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 28a5ab9983..185b0d35d2 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package acp * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php index e2b50306e8..2723821f23 100644 --- a/phpBB/includes/functions_convert.php +++ b/phpBB/includes/functions_convert.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package install * @version $Id$ -* @copyright (c) 2006 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2006 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index f56de24a24..b87cf31d04 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package phpBB3 * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ @@ -476,24 +476,27 @@ function generate_forum_nav(&$forum_data) $forum_parents = get_forum_parents($forum_data); // Build navigation links - foreach ($forum_parents as $parent_forum_id => $parent_data) + if (!empty($forum_parents)) { - list($parent_name, $parent_type) = array_values($parent_data); - - // Skip this parent if the user does not have the permission to view it - if (!$auth->acl_get('f_list', $parent_forum_id)) + foreach ($forum_parents as $parent_forum_id => $parent_data) { - continue; - } + list($parent_name, $parent_type) = array_values($parent_data); - $template->assign_block_vars('navlinks', array( - 'S_IS_CAT' => ($parent_type == FORUM_CAT) ? true : false, - 'S_IS_LINK' => ($parent_type == FORUM_LINK) ? true : false, - 'S_IS_POST' => ($parent_type == FORUM_POST) ? true : false, - 'FORUM_NAME' => $parent_name, - 'FORUM_ID' => $parent_forum_id, - 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $parent_forum_id)) - ); + // Skip this parent if the user does not have the permission to view it + if (!$auth->acl_get('f_list', $parent_forum_id)) + { + continue; + } + + $template->assign_block_vars('navlinks', array( + 'S_IS_CAT' => ($parent_type == FORUM_CAT) ? true : false, + 'S_IS_LINK' => ($parent_type == FORUM_LINK) ? true : false, + 'S_IS_POST' => ($parent_type == FORUM_POST) ? true : false, + 'FORUM_NAME' => $parent_name, + 'FORUM_ID' => $parent_forum_id, + 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $parent_forum_id)) + ); + } } $template->assign_block_vars('navlinks', array( @@ -1057,6 +1060,7 @@ function watch_topic_forum($mode, &$s_watching, &$s_watching_img, $user_id, $for { $s_watching['link'] = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&" . (($is_watching) ? 'unwatch' : 'watch') . "=$mode&start=$start"); $s_watching['title'] = $user->lang[(($is_watching) ? 'STOP' : 'START') . '_WATCHING_' . strtoupper($mode)]; + $s_watching['is_watching'] = $is_watching; } return; diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index bf82802a29..61ac1883b3 100644 --- a/phpBB/includes/functions_install.php +++ b/phpBB/includes/functions_install.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package install * @version $Id$ -* @copyright (c) 2006 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2006 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php index f85db406a5..eb2a7245a5 100644 --- a/phpBB/includes/functions_jabber.php +++ b/phpBB/includes/functions_jabber.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package phpBB3 * @version $Id$ -* @copyright (c) 2006 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2007 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 1d2e33b661..26ff1491fb 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package phpBB3 * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 37d5087abd..862df6e4e1 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package phpBB3 * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index 758c0b22c2..a8f6985089 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package mcp * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php index 0281108a4d..dc8733d0a5 100644 --- a/phpBB/includes/mcp/mcp_post.php +++ b/phpBB/includes/mcp/mcp_post.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package mcp * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index 7e70bb1105..277fd58927 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package mcp * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index 7d8ccd32d9..be94521b14 100755 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package mcp * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 97077980c9..52e7af76cd 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package phpBB3 * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php index 0344eb3085..760b0753f2 100644 --- a/phpBB/includes/search/fulltext_mysql.php +++ b/phpBB/includes/search/fulltext_mysql.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package search * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index f650eda9f4..5e22576fdc 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package phpBB3 -* @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @version $Id$ +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index 4789da1f5a..c964bffec5 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package ucp * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php index 88ca6d64f5..63660b006d 100644 --- a/phpBB/includes/ucp/ucp_pm.php +++ b/phpBB/includes/ucp/ucp_pm.php @@ -2,8 +2,8 @@ /** * @package ucp * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 0134bd38e7..58416f0f98 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package ucp * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ @@ -445,8 +445,8 @@ class ucp_profile if (!sizeof($error) && $submit) { $sql_ary = array( - 'user_sig' => (string) $message_parser->message, - 'user_sig_bbcode_uid' => (string) $message_parser->bbcode_uid, + 'user_sig' => (string) $message_parser->message, + 'user_sig_bbcode_uid' => (string) $message_parser->bbcode_uid, 'user_sig_bbcode_bitfield' => $message_parser->bbcode_bitfield ); @@ -491,7 +491,7 @@ class ucp_profile 'L_SIGNATURE_EXPLAIN' => sprintf($user->lang['SIGNATURE_EXPLAIN'], $config['max_sig_chars']), - 'S_BBCODE_ALLOWED' => $config['allow_sig_bbcode'], + 'S_BBCODE_ALLOWED' => $config['allow_sig_bbcode'], 'S_SMILIES_ALLOWED' => $config['allow_sig_smilies'], 'S_BBCODE_IMG' => ($config['allow_sig_img']) ? true : false, 'S_BBCODE_FLASH' => ($config['allow_sig_flash']) ? true : false, diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php index 99fe3d9427..0a1409041b 100644 --- a/phpBB/includes/utf/utf_tools.php +++ b/phpBB/includes/utf/utf_tools.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package phpBB3 * @version $Id$ -* @copyright (c) 2006 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2006 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * * @todo make sure the replacements are called correctly * already done: strtolower, strtoupper, ucfirst, str_split, strrpos, strlen (hopefully!), strpos, substr, htmlspecialchars diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 24e2d8d4c0..56327f3a8c 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -693,7 +693,7 @@ else <p><?php echo ((isset($lang['INLINE_UPDATE_SUCCESSFUL'])) ? $lang['INLINE_UPDATE_SUCCESSFUL'] : 'The database update was successful. Now you need to continue the update process.'); ?></p> - <p><a href="<?php echo append_sid("{$phpbb_root_path}install/index.{$phpEx}", "mode=update&sub=file_check&lang=$language"); ?>">» <?php echo (isset($lang['CONTINUE_UPDATE_NOW'])) ? $lang['CONTINUE_UPDATE_NOW'] : 'Continue the update process now'; ?></a></p> + <p><a href="<?php echo append_sid("{$phpbb_root_path}install/index.{$phpEx}", "mode=update&sub=file_check&lang=$language"); ?>" class="button1"><?php echo (isset($lang['CONTINUE_UPDATE_NOW'])) ? $lang['CONTINUE_UPDATE_NOW'] : 'Continue the update process now'; ?></a></p> <?php } diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index fce3668da6..5244e656c9 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -63,7 +63,7 @@ class install_install extends module $template->assign_vars(array( 'TITLE' => $lang['INSTALL_INTRO'], 'BODY' => $lang['INSTALL_INTRO_BODY'], - 'L_SUBMIT' => $lang['NEXT'], + 'L_SUBMIT' => $lang['NEXT_STEP'], 'S_LANG_SELECT' => '<select id="language" name="language">' . $this->p_master->inst_language_select($language) . '</select>', 'U_ACTION' => $this->p_master->module_url . "?mode=$mode&sub=requirements&language=$language", )); diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 9f08f2ec64..a7f288bc0b 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -108,6 +108,9 @@ class install_update extends module } $db->sql_freeresult($result); + // Force template recompile + $config['load_tplcompile'] = 1; + // First of all, init the user session $user->session_begin(); $auth->acl($user->data); diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 2c8d60565e..74a80c5047 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -1,12 +1,12 @@ <?php -/** +/** * * acp_board [English] * * @package language * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ @@ -343,10 +343,10 @@ $lang = array_merge($lang, array( 'ACP_SECURITY_SETTINGS_EXPLAIN' => 'Here you are able to define session and login related settings.', 'ALL' => 'All', - 'ALLOW_AUTOLOGIN' => 'Allow persistent logins', - 'ALLOW_AUTOLOGIN_EXPLAIN' => 'Determines whether users can autologin when they visit the board.', - 'AUTOLOGIN_LENGTH' => 'Persistent login key expiration length (in days)', - 'AUTOLOGIN_LENGTH_EXPLAIN' => 'Number of days after which persistent login keys are removed or zero to disable.', + 'ALLOW_AUTOLOGIN' => 'Allow persistent logins', + 'ALLOW_AUTOLOGIN_EXPLAIN' => 'Determines whether users can autologin when they visit the board.', + 'AUTOLOGIN_LENGTH' => 'Persistent login key expiration length (in days)', + 'AUTOLOGIN_LENGTH_EXPLAIN' => 'Number of days after which persistent login keys are removed or zero to disable.', 'BROWSER_VALID' => 'Validate browser', 'BROWSER_VALID_EXPLAIN' => 'Enables browser validation for each session improving security.', 'CHECK_DNSBL' => 'Check IP against DNS Blackhole List', diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 64de2e9ed7..aada3a4ee0 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -1,12 +1,12 @@ <?php -/** +/** * * acp common [English] * * @package language * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/language/en/acp/database.php b/phpBB/language/en/acp/database.php index dc40657649..8efeaef978 100644 --- a/phpBB/language/en/acp/database.php +++ b/phpBB/language/en/acp/database.php @@ -1,12 +1,12 @@ <?php -/** +/** * * acp_database [English] * * @package language * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php index 668195c6b6..936dc9bf3c 100644 --- a/phpBB/language/en/acp/groups.php +++ b/phpBB/language/en/acp/groups.php @@ -1,12 +1,12 @@ <?php -/** +/** * * acp_groups [English] * * @package language * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index 1b9fbf22ce..00c53257ad 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -1,11 +1,11 @@ <?php -/** +/** * acp_permissions (phpBB Permission Set) [English] * * @package language * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License */ /** @@ -32,7 +32,7 @@ if (empty($lang) || !is_array($lang)) * MODDERS PLEASE NOTE * * You are able to put your permission sets into a separate file too by -* prefixing the new file with permissions_ and putting it into the acp +* prefixing the new file with permissions_ and putting it into the acp * language folder. * * An example of how the file could look like: diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index ebed47b56d..1644e1393b 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -1,12 +1,12 @@ <?php -/** +/** * * posting [English] * * @package language * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ @@ -30,7 +30,7 @@ if (empty($lang) || !is_array($lang)) // equally where a string contains only two placeholders which are used to wrap text // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine -// BBCodes +// BBCodes // Note to translators: you can translate everything but what's between { and } $lang = array_merge($lang, array( 'ACP_BBCODES_EXPLAIN' => 'BBCode is a special implementation of HTML offering greater control over what and how something is displayed. From this page you can add, remove and edit custom BBCodes.', diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php index 9ae307233d..24e7b732f2 100644 --- a/phpBB/language/en/acp/profile.php +++ b/phpBB/language/en/acp/profile.php @@ -1,12 +1,12 @@ <?php -/** +/** * * acp_profile [English] * * @package language * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index 33ad3354d8..8dc5d21775 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -1,12 +1,12 @@ <?php -/** +/** * * acp_styles [English] * * @package language * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php index eabdd93d22..d003dee469 100644 --- a/phpBB/language/en/acp/users.php +++ b/phpBB/language/en/acp/users.php @@ -1,12 +1,12 @@ <?php -/** +/** * * acp_users [English] * * @package language * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 286552129b..9d2755667d 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -1,12 +1,12 @@ <?php -/** +/** * * common [English] * * @package language * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ @@ -30,7 +30,7 @@ if (empty($lang) || !is_array($lang)) // equally where a string contains only two placeholders which are used to wrap text // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine // -// Some characters you may want to copy&paste: +// Some characters you may want to copy&paste: // ’ » “ ” … // @@ -327,7 +327,8 @@ $lang = array_merge($lang, array( 'NEW_PMS' => '<strong>%d</strong> new messages', 'NEW_POST' => 'New post', 'NEW_POSTS' => 'New posts', - 'NEXT' => 'Next', + 'NEXT' => 'Next', // Used in pagination + 'NEXT_STEP' => 'Next', 'NEVER' => 'Never', 'NO' => 'No', 'NOT_ALLOWED_MANAGE_GROUP' => 'You are not allowed to manage this group.', @@ -412,7 +413,8 @@ $lang = array_merge($lang, array( 'POST_TOPIC' => 'Post a new topic', 'POST_UNAPPROVED' => 'This post is waiting for approval', 'PREVIEW' => 'Preview', - 'PREVIOUS' => 'Previous', + 'PREVIOUS' => 'Previous', // Used in pagination + 'PREVIOUS_STEP' => 'Previous', 'PRIVACY' => 'Privacy policy', 'PRIVATE_MESSAGE' => 'Private message', 'PRIVATE_MESSAGES' => 'Private messages', diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php index a407f7f4d0..2681dc32cc 100644 --- a/phpBB/language/en/help_faq.php +++ b/phpBB/language/en/help_faq.php @@ -1,12 +1,12 @@ <?php -/** +/** * * help_faq [English] * * @package language * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index a457f1b6b7..881859b728 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -1,12 +1,12 @@ <?php -/** +/** * * install [English] * * @package language * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ @@ -443,7 +443,7 @@ $lang = array_merge($lang, array( 'OLD_UPDATE_FILES' => 'Update files are out of date. The update files found are for updating from phpBB %1$s to phpBB %2$s but the latest version of phpBB is %3$s.', 'PERFORM_DATABASE_UPDATE' => 'Perform database update', - 'PERFORM_DATABASE_UPDATE_EXPLAIN' => 'Below you will find a link to the database update script. This script needs to be run separately because updating the database might result in unexpected behaviour if you are logged in. The database update can take a while, so please do not stop the execution if it seems to hang. After you performed the database update just follow the link presented to continue the update process.', + 'PERFORM_DATABASE_UPDATE_EXPLAIN' => 'Below you will find a link to the database update script. This script needs to be run separately because updating the database might result in unexpected behaviour if you are logged in. The database update can take a while, so please do not stop the execution if it seems to hang. After the database update had been performed just follow the link presented to continue the update process.', 'PREVIOUS_VERSION' => 'Previous version', 'PROGRESS' => 'Progress', diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index 5b4e239952..087e8997e5 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -1,12 +1,12 @@ <?php -/** +/** * * mcp [English] * * @package language * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index edba14a434..ef3f2fb985 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -1,12 +1,12 @@ <?php -/** +/** * * posting [English] * * @package language * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 7c294644a8..6a46ad96fb 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -1,12 +1,12 @@ <?php -/** +/** * * ucp [English] * * @package language * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/mcp.php b/phpBB/mcp.php index 8874ef7f33..94c17c83f7 100644 --- a/phpBB/mcp.php +++ b/phpBB/mcp.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package mcp * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 7a6bbed253..f6420e33f3 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package phpBB3 * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/posting.php b/phpBB/posting.php index 512ea1e831..eb6483ffd3 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package phpBB3 * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/style.php b/phpBB/style.php index cf9911c9ee..58eabd0e7f 100644 --- a/phpBB/style.php +++ b/phpBB/style.php @@ -1,10 +1,10 @@ -<?php -/** +<?php +/** * * @package phpBB3 * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/styles/prosilver/template/login_body.html b/phpBB/styles/prosilver/template/login_body.html index d4ccc8740e..90e53975d2 100644 --- a/phpBB/styles/prosilver/template/login_body.html +++ b/phpBB/styles/prosilver/template/login_body.html @@ -11,11 +11,11 @@ <!-- IF LOGIN_ERROR --><div class="error">{LOGIN_ERROR}</div><!-- ENDIF --> <dl> <dt><label for="username">{L_USERNAME}:</label></dt> - <dd><input type="text" tabindex="1" name="username" id="username" size="25" maxlength="40" value="{USERNAME}" class="inputbox autowidth" /></dd> + <dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd> </dl> <dl> <dt><label for="password">{L_PASSWORD}:</label></dt> - <dd><input type="password" tabindex="2" id="password" name="password" size="25" maxlength="25" class="inputbox autowidth" /></dd> + <dd><input type="password" tabindex="2" id="password" name="password" size="25" class="inputbox autowidth" /></dd> <!-- IF S_DISPLAY_FULL_LOGIN and (U_SEND_PASSWORD or U_RESEND_ACTIVATION) --> <!-- IF U_SEND_PASSWORD --><dd><a href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a></dd><!-- ENDIF --> <!-- IF U_RESEND_ACTIVATION --><dd><a href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a></dd><!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/login_forum.html b/phpBB/styles/prosilver/template/login_forum.html index 46544339f5..6d388da120 100644 --- a/phpBB/styles/prosilver/template/login_forum.html +++ b/phpBB/styles/prosilver/template/login_forum.html @@ -18,7 +18,7 @@ <!-- ENDIF --> <dl> <dt><label for="password">{L_PASSWORD}:</label></dt> - <dd><input class="inputbox narrow" type="password" name="password" id="password" size="25" maxlength="25" tabindex="1" /></dd> + <dd><input class="inputbox narrow" type="password" name="password" id="password" size="25" tabindex="1" /></dd> </dl> <dl class="fields2"> <dt> </dt> diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html index 704624b993..52d815eb8e 100644 --- a/phpBB/styles/prosilver/template/mcp_topic.html +++ b/phpBB/styles/prosilver/template/mcp_topic.html @@ -67,7 +67,7 @@ onload_functions.push('subPanels()'); <dl> <dt><label for="subject">{L_SPLIT_SUBJECT}:</label></dt> - <dd><input type="text" name="subject" id="subject" size="45" maxlength="60" tabindex="2" value="{SPLIT_SUBJECT}" title="Type the post subject" class="inputbox" /></dd> + <dd><input type="text" name="subject" id="subject" size="45" maxlength="64" tabindex="2" value="{SPLIT_SUBJECT}" title="Type the post subject" class="inputbox" /></dd> </dl> <dl> <dt><label>{L_SPLIT_FORUM}:</label></dt> diff --git a/phpBB/styles/prosilver/template/memberlist_email.html b/phpBB/styles/prosilver/template/memberlist_email.html index 137c4939f4..cb5bf8d4ea 100644 --- a/phpBB/styles/prosilver/template/memberlist_email.html +++ b/phpBB/styles/prosilver/template/memberlist_email.html @@ -45,7 +45,7 @@ function checkForm(formObj) </dl> <dl> <dt><label for="subject">{L_SUBJECT}:</label></dt> - <dd><input class="inputbox autowidth" type="text" name="subject" id="subject" size="50" maxlength="100" tabindex="1" value="{SUBJECT}" /></dd> + <dd><input class="inputbox autowidth" type="text" name="subject" id="subject" size="50" tabindex="1" value="{SUBJECT}" /></dd> </dl> <!-- ELSE --> <dl> @@ -54,7 +54,7 @@ function checkForm(formObj) </dl> <dl> <dt><label for="name">{L_REAL_NAME}:</label></dt> - <dd><input class="inputbox autowidth" type="text" name="name" id="name" size="50" maxlength="100" tabindex="3" value="{NAME}" /></dd> + <dd><input class="inputbox autowidth" type="text" name="name" id="name" size="50" tabindex="3" value="{NAME}" /></dd> </dl> <dl> <dt><label for="lang">{L_DEST_LANG}:</label><br /> diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html index 96d165228e..b12d5314c7 100644 --- a/phpBB/styles/prosilver/template/memberlist_im.html +++ b/phpBB/styles/prosilver/template/memberlist_im.html @@ -19,7 +19,7 @@ <!-- IF S_SEND_ICQ --> <dl class="fields2"> <dt><label for="from">{L_IM_NAME}:</label></dt> - <dd><input class="inputbox autowidth" type="text" name="from" id="from" size="20" maxlength="40" /></dd> + <dd><input class="inputbox autowidth" type="text" name="from" id="from" size="20" /></dd> </dl> <dl class="fields2"> <dt><label for="body">{L_IM_MESSAGE}:</label></dt> diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html index 4f37fbda1b..ac7ac9821d 100644 --- a/phpBB/styles/prosilver/template/memberlist_search.html +++ b/phpBB/styles/prosilver/template/memberlist_search.html @@ -51,7 +51,7 @@ function insert_single(user) <fieldset class="fields1 column1"> <dl> <dt><label for="username">{L_USERNAME}:</label></dt> - <dd><input type="text" name="username" id="username" value="{USERNAME}" maxlength="40" class="inputbox" /></dd> + <dd><input type="text" name="username" id="username" value="{USERNAME}" class="inputbox" /></dd> </dl> <dl> <dt><label for="email">{L_EMAIL}:</label></dt> diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index d56102f0bf..19fd7ad3eb 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -9,8 +9,8 @@ <li> <a class="icon-home" href="{U_INDEX}" accesskey="h">{L_INDEX}</a> <!-- IF not S_IS_BOT --> - <!-- IF S_WATCH_FORUM_LINK --><a href="{S_WATCH_FORUM_LINK}" class="icon-subscribe" title="{S_WATCH_FORUM_TITLE}">{S_WATCH_FORUM_TITLE}</a> <!-- ENDIF --> - <!-- IF U_WATCH_TOPIC --><a href="{U_WATCH_TOPIC}" title="{L_WATCH_TOPIC}" class="icon-subscribe">{L_WATCH_TOPIC}</a> <!-- ENDIF --> + <!-- IF S_WATCH_FORUM_LINK --><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> <!-- ENDIF --> + <!-- IF U_WATCH_TOPIC --><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> <!-- ENDIF --> <!-- IF U_BOOKMARK_TOPIC --><a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}" class="icon-bookmark">{L_BOOKMARK_TOPIC}</a> <!-- ENDIF --> <!-- IF U_BUMP_TOPIC --><a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}" class="icon-bump">{L_BUMP_TOPIC}</a> <!-- ENDIF --> <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html index fde14662a2..7ce6f86dea 100644 --- a/phpBB/styles/prosilver/template/posting_editor.html +++ b/phpBB/styles/prosilver/template/posting_editor.html @@ -48,7 +48,7 @@ </dd> <!-- ENDIF --> - <dd><input class="inputbox" type="text" name="username_list" id="username_list" size="20" maxlength="40" value="" /> <input type="submit" name="add_to" value="{L_ADD}" class="button2" /></dd> + <dd><input class="inputbox" type="text" name="username_list" id="username_list" size="20" value="" /> <input type="submit" name="add_to" value="{L_ADD}" class="button2" /></dd> </dl> <!-- ENDIF --> @@ -86,7 +86,7 @@ <!-- IF not S_PRIVMSGS and S_DISPLAY_USERNAME --> <dl> <dt><label for="username">{L_USERNAME}:</label></dt> - <dd><input type="text" tabindex="1" name="username" id="username" size="25" maxlength="30" value="{USERNAME}" class="inputbox" /></dd> + <dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox" /></dd> </dl> <!-- ENDIF --> @@ -250,7 +250,7 @@ <!-- IF S_EDIT_REASON --> <dl> <dt><label for="edit_reason">{L_EDIT_REASON}:</label></dt> - <dd><input type="text" name="edit_reason" id="edit_reason" maxlength="100" value="{EDIT_REASON}" class="inputbox" /></dd> + <dd><input type="text" name="edit_reason" id="edit_reason" value="{EDIT_REASON}" class="inputbox" /></dd> </dl> <!-- ENDIF --> </fieldset> diff --git a/phpBB/styles/prosilver/template/ucp_pm_options.html b/phpBB/styles/prosilver/template/ucp_pm_options.html index 8e2626a29a..e8ecf2c306 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_options.html +++ b/phpBB/styles/prosilver/template/ucp_pm_options.html @@ -28,32 +28,32 @@ <dl> <dt><label<!-- IF S_CHECK_SELECT --> for="check_option"<!-- ENDIF -->>{L_IF}:</label></dt> <dd> - <!-- IF S_CHECK_SELECT --><select name="check_option" id="check_option">{S_CHECK_OPTIONS}</select> <input type="submit" name="next" value="{L_NEXT}" class="button2" /><!-- ELSE -->{CHECK_CURRENT}<input type="hidden" name="check_option" value="{CHECK_OPTION}" /><!-- ENDIF --> + <!-- IF S_CHECK_SELECT --><select name="check_option" id="check_option">{S_CHECK_OPTIONS}</select> <input type="submit" name="next" value="{L_NEXT_STEP}" class="button2" /><!-- ELSE -->{CHECK_CURRENT}<input type="hidden" name="check_option" value="{CHECK_OPTION}" /><!-- ENDIF --> </dd> </dl> <!-- ENDIF --> <!-- IF S_RULE_DEFINED --> <dl> - <dt><!-- IF S_RULE_SELECT --><input type="submit" name="back[rule]" value="{L_PREVIOUS}" class="button2" /><!-- ELSE --><label> </label><!-- ENDIF --></dt> - <dd><!-- IF S_RULE_SELECT --><select name="rule_option" id="rule_option">{S_RULE_OPTIONS}</select> <input type="submit" name="next" value="{L_NEXT}" class="button2" /><!-- ELSE --><em>{RULE_CURRENT}</em><input type="hidden" name="rule_option" value="{RULE_OPTION}" /><!-- ENDIF --></dd> + <dt><!-- IF S_RULE_SELECT --><input type="submit" name="back[rule]" value="{L_PREVIOUS_STEP}" class="button2" /><!-- ELSE --><label> </label><!-- ENDIF --></dt> + <dd><!-- IF S_RULE_SELECT --><select name="rule_option" id="rule_option">{S_RULE_OPTIONS}</select> <input type="submit" name="next" value="{L_NEXT_STEP}" class="button2" /><!-- ELSE --><em>{RULE_CURRENT}</em><input type="hidden" name="rule_option" value="{RULE_OPTION}" /><!-- ENDIF --></dd> </dl> <!-- ENDIF --> <!-- IF S_COND_DEFINED --> <!-- IF S_COND_SELECT or COND_CURRENT --> <dl> - <dt><!-- IF S_COND_SELECT --><input type="submit" name="back[cond]" value="{L_PREVIOUS}" class="button2" /><!-- ELSE --><label> </label><!-- ENDIF --></dt> + <dt><!-- IF S_COND_SELECT --><input type="submit" name="back[cond]" value="{L_PREVIOUS_STEP}" class="button2" /><!-- ELSE --><label> </label><!-- ENDIF --></dt> <dd> <!-- IF S_COND_SELECT --> <!-- IF S_TEXT_CONDITION --> <input type="text" name="rule_string" value="{CURRENT_STRING}" class="inputbox medium" maxlength="250" /> <!-- ELSEIF S_USER_CONDITION --> - <input type="text" name="rule_string" value="{CURRENT_STRING}" class="inputbox small" maxlength="50" /> <span>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</span> + <input type="text" name="rule_string" value="{CURRENT_STRING}" class="inputbox tiny" /> <span>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</span> <!-- ELSEIF S_GROUP_CONDITION --> <input type="hidden" name="rule_string" value="{CURRENT_STRING}" /><!-- IF S_GROUP_OPTIONS --><select name="rule_group_id">{S_GROUP_OPTIONS}</select><!-- ELSE -->{L_NO_GROUPS}<!-- ENDIF --> <!-- ENDIF --> - <input type="submit" name="next" value="{L_NEXT}" class="button2" /> + <input type="submit" name="next" value="{L_NEXT_STEP}" class="button2" /> <!-- ELSE --> <strong>{COND_CURRENT}</strong><input type="hidden" name="rule_string" value="{CURRENT_STRING}" /><input type="hidden" name="rule_user_id" value="{CURRENT_USER_ID}" /><input type="hidden" name="rule_group_id" value="{CURRENT_GROUP_ID}" /> <!-- ENDIF --> @@ -68,7 +68,7 @@ <!-- IF S_ACTION_DEFINED --> <dl> - <dt><!-- IF S_ACTION_SELECT --><input type="submit" name="back[action]" value="{L_PREVIOUS}" class="button2" /><!-- ELSE --><label> </label><!-- ENDIF --></dt> + <dt><!-- IF S_ACTION_SELECT --><input type="submit" name="back[action]" value="{L_PREVIOUS_STEP}" class="button2" /><!-- ELSE --><label> </label><!-- ENDIF --></dt> <dd><!-- IF S_ACTION_SELECT --> <select name="action_option">{S_ACTION_OPTIONS}</select> <input type="submit" name="add_rule" value="{L_ADD_RULE}" class="button1" /><!-- ELSE -->{ACTION_CURRENT}<input type="hidden" name="action_option" value="{ACTION_OPTION}" /><!-- ENDIF --></dd> </dl> <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/ucp_profile_reg_details.html b/phpBB/styles/prosilver/template/ucp_profile_reg_details.html index 269582d847..a7009ecf23 100644 --- a/phpBB/styles/prosilver/template/ucp_profile_reg_details.html +++ b/phpBB/styles/prosilver/template/ucp_profile_reg_details.html @@ -14,16 +14,16 @@ <!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF --> <dl> <dt><label <!-- IF S_CHANGE_USERNAME -->for="username"<!-- ENDIF -->>{L_USERNAME}:</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt> - <dd><!-- IF S_CHANGE_USERNAME --><input type="text" name="username" id="username" maxlength="30" value="{USERNAME}" class="inputbox" title="{L_USERNAME}" /><!-- ELSE --><strong>{USERNAME}</strong><!-- ENDIF --></dd> + <dd><!-- IF S_CHANGE_USERNAME --><input type="text" name="username" id="username" value="{USERNAME}" class="inputbox" title="{L_USERNAME}" /><!-- ELSE --><strong>{USERNAME}</strong><!-- ENDIF --></dd> </dl> <dl> <dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt> - <dd><!-- IF S_CHANGE_EMAIL --><input type="text" name="email" id="email" maxlength="60" value="{EMAIL}" class="inputbox" title="{L_EMAIL_ADDRESS}" /><!-- ELSE --><strong>{EMAIL}</strong><!-- ENDIF --></dd> + <dd><!-- IF S_CHANGE_EMAIL --><input type="text" name="email" id="email" maxlength="100" value="{EMAIL}" class="inputbox" title="{L_EMAIL_ADDRESS}" /><!-- ELSE --><strong>{EMAIL}</strong><!-- ENDIF --></dd> </dl> <!-- IF S_CHANGE_EMAIL --> <dl> <dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label><br /><span>{L_CONFIRM_EMAIL_EXPLAIN}</span></dt> - <dd><input type="text" name="email_confirm" id="email_confirm" maxlength="60" value="{CONFIRM_EMAIL}" class="inputbox" title="{L_CONFIRM_EMAIL}" /></dd> + <dd><input type="text" name="email_confirm" id="email_confirm" maxlength="100" value="{CONFIRM_EMAIL}" class="inputbox" title="{L_CONFIRM_EMAIL}" /></dd> </dl> <!-- ENDIF --> <!-- IF S_CHANGE_PASSWORD --> diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html index 5bb55c66f8..e9e17fc2cf 100644 --- a/phpBB/styles/prosilver/template/ucp_register.html +++ b/phpBB/styles/prosilver/template/ucp_register.html @@ -31,23 +31,23 @@ <dl> <dt><label for="username">{L_USERNAME}:</label><br /><span>{L_USERNAME_EXPLAIN}</span></dt> - <dd><input type="text" tabindex="1" name="username" id="username" size="25" maxlength="30" value="{USERNAME}" class="inputbox autowidth" title="{L_USERNAME}" /></dd> + <dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" title="{L_USERNAME}" /></dd> </dl> <dl> <dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt> - <dd><input type="text" tabindex="2" name="email" id="email" size="25" maxlength="255" value="{EMAIL}" class="inputbox autowidth" title="{L_EMAIL_ADDRESS}" /></dd> + <dd><input type="text" tabindex="2" name="email" id="email" size="25" maxlength="100" value="{EMAIL}" class="inputbox autowidth" title="{L_EMAIL_ADDRESS}" /></dd> </dl> <dl> <dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label></dt> - <dd><input type="text" tabindex="3" name="email_confirm" id="email_confirm" size="25" maxlength="255" value="{EMAIL_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_EMAIL}" /></dd> + <dd><input type="text" tabindex="3" name="email_confirm" id="email_confirm" size="25" maxlength="100" value="{EMAIL_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_EMAIL}" /></dd> </dl> <dl> <dt><label for="new_password">{L_PASSWORD}:</label><br /><span>{L_PASSWORD_EXPLAIN}</span></dt> - <dd><input type="password" tabindex="4" name="new_password" id="new_password" size="25" maxlength="30" value="{PASSWORD}" class="inputbox autowidth" title="{L_NEW_PASSWORD}" /></dd> + <dd><input type="password" tabindex="4" name="new_password" id="new_password" size="25" value="{PASSWORD}" class="inputbox autowidth" title="{L_NEW_PASSWORD}" /></dd> </dl> <dl> <dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label></dt> - <dd><input type="password" tabindex="5" name="password_confirm" id="password_confirm" size="25" maxlength="30" value="{PASSWORD_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_PASSWORD}" /></dd> + <dd><input type="password" tabindex="5" name="password_confirm" id="password_confirm" size="25" value="{PASSWORD_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_PASSWORD}" /></dd> </dl> <hr /> diff --git a/phpBB/styles/prosilver/template/ucp_remind.html b/phpBB/styles/prosilver/template/ucp_remind.html index 971bc36344..5114e4dec8 100644 --- a/phpBB/styles/prosilver/template/ucp_remind.html +++ b/phpBB/styles/prosilver/template/ucp_remind.html @@ -11,11 +11,11 @@ <fieldset class="fields2"> <dl> <dt><label for="username">{L_USERNAME}:</label></dt> - <dd><input class="inputbox narrow" type="text" name="username" id="username" size="25" maxlength="60" /></dd> + <dd><input class="inputbox narrow" type="text" name="username" id="username" size="25" /></dd> </dl> <dl> <dt><label for="email">{L_EMAIL_ADDRESS}:</label><br /><span>{L_EMAIL_REMIND}</span></dt> - <dd><input class="inputbox narrow" type="text" name="email" id="email" size="25" maxlength="255" /></dd> + <dd><input class="inputbox narrow" type="text" name="email" id="email" size="25" maxlength="100" /></dd> </dl> <dl> <dt> </dt> diff --git a/phpBB/styles/prosilver/template/ucp_resend.html b/phpBB/styles/prosilver/template/ucp_resend.html index 01e8312bc8..a1d3d5c193 100644 --- a/phpBB/styles/prosilver/template/ucp_resend.html +++ b/phpBB/styles/prosilver/template/ucp_resend.html @@ -12,11 +12,11 @@ <fieldset class="fields2"> <dl> <dt><label for="username">{L_USERNAME}:</label></dt> - <dd><input class="inputbox narrow" type="text" name="username" id="username" size="25" maxlength="60" /></dd> + <dd><input class="inputbox narrow" type="text" name="username" id="username" size="25" /></dd> </dl> <dl> <dt><label for="email">{L_EMAIL_ADDRESS}:</label><br /><span>{L_EMAIL_REMIND}</span></dt> - <dd><input class="inputbox narrow" type="text" name="email" id="email" size="25" maxlength="255" /></dd> + <dd><input class="inputbox narrow" type="text" name="email" id="email" size="25" maxlength="100" /></dd> </dl> <dl> <dt> </dt> diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index ab50f0017d..e92a359ca8 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -90,11 +90,11 @@ <fieldset class="fields1"> <dl> <dt><label for="username">{L_USERNAME}:</label></dt> - <dd><input type="text" tabindex="1" name="username" id="username" size="25" maxlength="40" value="{USERNAME}" class="inputbox autowidth" /></dd> + <dd><input type="text" tabindex="1" name="username" id="username" size="25" value="{USERNAME}" class="inputbox autowidth" /></dd> </dl> <dl> <dt><label for="password">{L_PASSWORD}:</label></dt> - <dd><input type="password" tabindex="2" id="password" name="password" size="25" maxlength="25" class="inputbox autowidth" /></dd> + <dd><input type="password" tabindex="2" id="password" name="password" size="25" class="inputbox autowidth" /></dd> <!-- IF S_AUTOLOGIN_ENABLED --><dd><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="3" /> {L_LOG_ME_IN}</label></dd><!-- ENDIF --> <dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="4" /> {L_HIDE_ME}</label></dd> </dl> diff --git a/phpBB/styles/subsilver2/template/login_body.html b/phpBB/styles/subsilver2/template/login_body.html index 7243c983fe..2462914756 100644 --- a/phpBB/styles/subsilver2/template/login_body.html +++ b/phpBB/styles/subsilver2/template/login_body.html @@ -35,7 +35,7 @@ <tr> <td valign="top" <!-- IF S_ADMIN_AUTH -->style="width: 50%; text-align: {S_CONTENT_FLOW_END};"<!-- ENDIF -->><b class="gensmall">{L_USERNAME}:</b></td> - <td><input class="post" type="text" name="username" size="25" maxlength="40" value="{USERNAME}" tabindex="1" /> + <td><input class="post" type="text" name="username" size="25" value="{USERNAME}" tabindex="1" /> <!-- IF not S_ADMIN_AUTH --> <br /><a class="gensmall" href="{U_REGISTER}">{L_REGISTER}</a> <!-- ENDIF --> @@ -44,7 +44,7 @@ <tr> <td valign="top" <!-- IF S_ADMIN_AUTH -->style="width: 50%; text-align: {S_CONTENT_FLOW_END};"<!-- ENDIF -->><b class="gensmall">{L_PASSWORD}:</b></td> <td> - <input class="post" type="password" name="password" size="25" maxlength="100" tabindex="2" /> + <input class="post" type="password" name="password" size="25" tabindex="2" /> <!-- IF U_SEND_PASSWORD --><br /><a class="gensmall" href="{U_SEND_PASSWORD}">{L_FORGOT_PASS}</a><!-- ENDIF --> <!-- IF U_RESEND_ACTIVATION and not S_ADMIN_AUTH --><br /><a class="gensmall" href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a><!-- ENDIF --> </td> diff --git a/phpBB/styles/subsilver2/template/login_forum.html b/phpBB/styles/subsilver2/template/login_forum.html index 06a26666e7..0ede67154e 100644 --- a/phpBB/styles/subsilver2/template/login_forum.html +++ b/phpBB/styles/subsilver2/template/login_forum.html @@ -22,7 +22,7 @@ <!-- ENDIF --> <tr> <td class="gensmall"><b>{L_PASSWORD}:</b></td> - <td><input class="post" type="password" name="password" size="25" maxlength="25" tabindex="2" /></td> + <td><input class="post" type="password" name="password" size="25" tabindex="2" /></td> </tr> </table> </td> diff --git a/phpBB/styles/subsilver2/template/mcp_notes_front.html b/phpBB/styles/subsilver2/template/mcp_notes_front.html index b374773f65..663da412f7 100644 --- a/phpBB/styles/subsilver2/template/mcp_notes_front.html +++ b/phpBB/styles/subsilver2/template/mcp_notes_front.html @@ -8,7 +8,7 @@ </tr> <tr> <td class="row1" width="40%"><b class="gen">{L_FIND_USERNAME}: </b><br /><span class="gensmall">[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</span></td> - <td class="row2"><input type="text" class="post" name="username" maxlength="50" size="20" /></td> + <td class="row2"><input type="text" class="post" name="username" size="20" /></td> </tr> <tr> <td class="cat" colspan="2" align="center"><input type="submit" name="submituser" value="{L_SUBMIT}" class="btnmain" /></td> diff --git a/phpBB/styles/subsilver2/template/mcp_topic.html b/phpBB/styles/subsilver2/template/mcp_topic.html index b73190cffa..5cf4ac5ca6 100644 --- a/phpBB/styles/subsilver2/template/mcp_topic.html +++ b/phpBB/styles/subsilver2/template/mcp_topic.html @@ -12,7 +12,7 @@ </tr> <tr> <td class="row1" nowrap="nowrap"><span class="gen">{L_SPLIT_SUBJECT}</span></td> - <td class="row2" colspan="2"><input class="post" style="width: 350px" type="text" size="35" maxlength="100" name="subject" value="{SPLIT_SUBJECT}" /></td> + <td class="row2" colspan="2"><input class="post" style="width: 350px" type="text" size="35" maxlength="64" name="subject" value="{SPLIT_SUBJECT}" /></td> </tr> <tr> <td class="row1" nowrap="nowrap"><span class="gen">{L_SPLIT_FORUM}</span></td> diff --git a/phpBB/styles/subsilver2/template/mcp_warn_front.html b/phpBB/styles/subsilver2/template/mcp_warn_front.html index 087e9124ff..b8322fe669 100644 --- a/phpBB/styles/subsilver2/template/mcp_warn_front.html +++ b/phpBB/styles/subsilver2/template/mcp_warn_front.html @@ -8,7 +8,7 @@ </tr> <tr> <td class="row1" width="40%"><b class="gen">{L_FIND_USERNAME}: </b><br /><span class="gensmall">[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</span></td> - <td class="row2"><input type="text" class="post" name="username" maxlength="50" size="20" /></td> + <td class="row2"><input type="text" class="post" name="username" size="20" /></td> </tr> <tr> <td class="cat" colspan="2" align="center"><input type="submit" name="submituser" value="{L_SUBMIT}" class="btnmain" /></td> diff --git a/phpBB/styles/subsilver2/template/memberlist_email.html b/phpBB/styles/subsilver2/template/memberlist_email.html index 92df7910a5..9e74ec5335 100644 --- a/phpBB/styles/subsilver2/template/memberlist_email.html +++ b/phpBB/styles/subsilver2/template/memberlist_email.html @@ -47,7 +47,7 @@ function checkForm(formObj) </tr> <tr> <td class="row1" width="35%"><b class="genmed">{L_SUBJECT}</b></td> - <td class="row2"><input class="post" type="text" name="subject" size="50" maxlength="100" tabindex="2" value="{SUBJECT}" /></td> + <td class="row2"><input class="post" type="text" name="subject" size="50" tabindex="2" value="{SUBJECT}" /></td> </tr> <!-- ELSE --> <tr> @@ -56,7 +56,7 @@ function checkForm(formObj) </tr> <tr> <td class="row1" width="35%"><b class="genmed">{L_REAL_NAME}</b></td> - <td class="row2"><input class="post" type="text" name="name" size="50" maxlength="100" value="{NAME}" /></td> + <td class="row2"><input class="post" type="text" name="name" size="50" value="{NAME}" /></td> </tr> <tr> <td class="row1" width="35%"><b class="genmed">{L_DEST_LANG}</b><br /><span class="gensmall">{L_DEST_LANG_EXPLAIN}</span></td> diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html index 76d6ea85f9..7a803f5e7d 100644 --- a/phpBB/styles/subsilver2/template/posting_body.html +++ b/phpBB/styles/subsilver2/template/posting_body.html @@ -137,7 +137,7 @@ <!-- IF not S_PRIVMSGS and S_DISPLAY_USERNAME --> <tr> <td class="row1"><b class="genmed">{L_USERNAME}:</b></td> - <td class="row2"><input class="post" type="text" tabindex="1" name="username" size="25" maxlength="25" value="{USERNAME}" /></td> + <td class="row2"><input class="post" type="text" tabindex="1" name="username" size="25" value="{USERNAME}" /></td> </tr> <!-- ENDIF --> @@ -329,7 +329,7 @@ <!-- IF S_EDIT_REASON --> <tr> <td class="row1" valign="top"><b class="genmed">{L_EDIT_REASON}:</b></td> - <td class="row2"><input class="post" type="text" name="edit_reason" size="50" maxlength="100" value="{EDIT_REASON}" /></td> + <td class="row2"><input class="post" type="text" name="edit_reason" size="50" value="{EDIT_REASON}" /></td> </tr> <!-- ENDIF --> diff --git a/phpBB/styles/subsilver2/template/posting_buttons.html b/phpBB/styles/subsilver2/template/posting_buttons.html index eda483e48f..61b5bd9da0 100644 --- a/phpBB/styles/subsilver2/template/posting_buttons.html +++ b/phpBB/styles/subsilver2/template/posting_buttons.html @@ -89,7 +89,7 @@ <!-- ENDIF --> <!-- IF S_BBCODE_ALLOWED --> <tr> - <td<!-- IF $S_SIGNATURE or S_EDIT_DRAFT --> colspan="2"<!-- ENDIF -->><input type="text" readonly="readonly" name="helpbox" style="width:100%" maxlength="100" class="helpline" value="{L_STYLES_TIP}" /></td> + <td<!-- IF $S_SIGNATURE or S_EDIT_DRAFT --> colspan="2"<!-- ENDIF -->><input type="text" readonly="readonly" name="helpbox" style="width:100%" class="helpline" value="{L_STYLES_TIP}" /></td> <!-- IF not $S_SIGNATURE and not S_EDIT_DRAFT --> <td class="genmed" align="center">{L_FONT_COLOR}</td> <!-- ENDIF --> diff --git a/phpBB/styles/subsilver2/template/ucp_header.html b/phpBB/styles/subsilver2/template/ucp_header.html index 6ade3a5745..d4dafbb71b 100644 --- a/phpBB/styles/subsilver2/template/ucp_header.html +++ b/phpBB/styles/subsilver2/template/ucp_header.html @@ -19,7 +19,7 @@ </tr> <tr> - <td class="row2"><input class="post" type="text" name="username_list" size="20" maxlength="40" value="" /> <input class="post" type="submit" name="add_to" value="{L_ADD}" /></td> + <td class="row2"><input class="post" type="text" name="username_list" size="20" value="" /> <input class="post" type="submit" name="add_to" value="{L_ADD}" /></td> </tr> <!-- ELSE --> <tr> diff --git a/phpBB/styles/subsilver2/template/ucp_pm_options.html b/phpBB/styles/subsilver2/template/ucp_pm_options.html index 4802b06720..a2a95826fd 100644 --- a/phpBB/styles/subsilver2/template/ucp_pm_options.html +++ b/phpBB/styles/subsilver2/template/ucp_pm_options.html @@ -22,27 +22,27 @@ <tr> <td class="row1" width="50" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><b class="gen">{L_IF}:</b></td> <td class="row2" align="center" valign="top"><!-- IF S_CHECK_SELECT --><select name="check_option">{S_CHECK_OPTIONS}</select><!-- ELSE --><b class="gen">{CHECK_CURRENT}</b><input type="hidden" name="check_option" value="{CHECK_OPTION}" /><!-- ENDIF --></td> - <td class="row1" width="50" align="{S_CONTENT_FLOW_END}" valign="top"><!-- IF S_CHECK_SELECT --><input type="submit" name="next" value="{L_NEXT}" class="btnlite" /><!-- ELSE --> <!-- ENDIF --></td> + <td class="row1" width="50" align="{S_CONTENT_FLOW_END}" valign="top"><!-- IF S_CHECK_SELECT --><input type="submit" name="next" value="{L_NEXT_STEP}" class="btnlite" /><!-- ELSE --> <!-- ENDIF --></td> </tr> <!-- ENDIF --> <!-- IF S_RULE_DEFINED --> <tr> - <td class="row1" width="50" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><!-- IF S_RULE_SELECT --><input type="submit" name="back[rule]" value="{L_PREVIOUS}" class="btnlite" /><!-- ELSE --> <!-- ENDIF --></td> + <td class="row1" width="50" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><!-- IF S_RULE_SELECT --><input type="submit" name="back[rule]" value="{L_PREVIOUS_STEP}" class="btnlite" /><!-- ELSE --> <!-- ENDIF --></td> <td class="row2" align="center" valign="top"><!-- IF S_RULE_SELECT --><select name="rule_option">{S_RULE_OPTIONS}</select><!-- ELSE --><b class="gen">{RULE_CURRENT}</b><input type="hidden" name="rule_option" value="{RULE_OPTION}" /><!-- ENDIF --></td> - <td class="row1" width="50" align="{S_CONTENT_FLOW_END}" valign="top"><!-- IF S_RULE_SELECT --><input type="submit" name="next" value="{L_NEXT}" class="btnlite" /><!-- ELSE --> <!-- ENDIF --></td> + <td class="row1" width="50" align="{S_CONTENT_FLOW_END}" valign="top"><!-- IF S_RULE_SELECT --><input type="submit" name="next" value="{L_NEXT_STEP}" class="btnlite" /><!-- ELSE --> <!-- ENDIF --></td> </tr> <!-- ENDIF --> <!-- IF S_COND_DEFINED --> <!-- IF S_COND_SELECT or COND_CURRENT --> <tr> - <td class="row1" width="50" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><!-- IF S_COND_SELECT --><input type="submit" name="back[cond]" value="{L_PREVIOUS}" class="btnlite" /><!-- ELSE --> <!-- ENDIF --></td> + <td class="row1" width="50" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><!-- IF S_COND_SELECT --><input type="submit" name="back[cond]" value="{L_PREVIOUS_STEP}" class="btnlite" /><!-- ELSE --> <!-- ENDIF --></td> <td class="row2" align="center" valign="top"> <!-- IF S_COND_SELECT --> <!-- IF S_TEXT_CONDITION --> <input type="text" name="rule_string" value="{CURRENT_STRING}" size="30" maxlength="250" class="post" /> <!-- ELSEIF S_USER_CONDITION --> - <input type="text" class="post" name="rule_string" value="{CURRENT_STRING}" maxlength="50" size="20" /> <span class="gensmall">[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</span> + <input type="text" class="post" name="rule_string" value="{CURRENT_STRING}" size="20" /> <span class="gensmall">[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</span> <!-- ELSEIF S_GROUP_CONDITION --> <input type="hidden" name="rule_string" value="{CURRENT_STRING}" /><!-- IF S_GROUP_OPTIONS --><select name="rule_group_id">{S_GROUP_OPTIONS}</select><!-- ELSE -->{L_NO_GROUPS}<!-- ENDIF --> <!-- ENDIF --> @@ -51,7 +51,7 @@ <input type="hidden" name="rule_string" value="{CURRENT_STRING}" /><input type="hidden" name="rule_user_id" value="{CURRENT_USER_ID}" /><input type="hidden" name="rule_group_id" value="{CURRENT_GROUP_ID}" /> <!-- ENDIF --> </td> - <td class="row1" width="50" align="{S_CONTENT_FLOW_END}" valign="top"><!-- IF S_COND_SELECT --><input type="submit" name="next" value="{L_NEXT}" class="btnlite" /><!-- ELSE --> <!-- ENDIF --></td> + <td class="row1" width="50" align="{S_CONTENT_FLOW_END}" valign="top"><!-- IF S_COND_SELECT --><input type="submit" name="next" value="{L_NEXT_STEP}" class="btnlite" /><!-- ELSE --> <!-- ENDIF --></td> </tr> <!-- ENDIF --> <input type="hidden" name="cond_option" value="{COND_OPTION}" /> @@ -61,7 +61,7 @@ <!-- IF S_ACTION_DEFINED --> <tr> - <td class="row1" width="50" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><!-- IF S_ACTION_SELECT --><input type="submit" name="back[action]" value="{L_PREVIOUS}" class="btnlite" /><!-- ELSE --> <!-- ENDIF --></td> + <td class="row1" width="50" align="{S_CONTENT_FLOW_BEGIN}" valign="top"><!-- IF S_ACTION_SELECT --><input type="submit" name="back[action]" value="{L_PREVIOUS_STEP}" class="btnlite" /><!-- ELSE --> <!-- ENDIF --></td> <td class="row2" align="center" valign="top"><!-- IF S_ACTION_SELECT --><select name="action_option">{S_ACTION_OPTIONS}</select><!-- ELSE --><b class="gen">{ACTION_CURRENT}</b><input type="hidden" name="action_option" value="{ACTION_OPTION}" /><!-- ENDIF --></td> <td class="row1" width="50" align="{S_CONTENT_FLOW_END}" valign="top"><!-- IF S_ACTION_SELECT --><input type="submit" name="add_rule" value="{L_ADD_RULE}" class="btnlite" /><!-- ELSE --> <!-- ENDIF --></td> </tr> diff --git a/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html b/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html index 6ade4c8cba..eed1efcb64 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html @@ -16,16 +16,16 @@ <!-- ENDIF --> <tr> <td class="row1" width="35%"><b class="genmed">{L_USERNAME}: </b><br /><span class="gensmall">{L_USERNAME_EXPLAIN}</span></td> - <td class="row2"><!-- IF S_CHANGE_USERNAME --><input type="text" class="post" name="username" size="30" maxlength="30" value="{USERNAME}" /><!-- ELSE --><b class="gen">{USERNAME}</b><!-- ENDIF --></td> + <td class="row2"><!-- IF S_CHANGE_USERNAME --><input type="text" class="post" name="username" size="30" value="{USERNAME}" /><!-- ELSE --><b class="gen">{USERNAME}</b><!-- ENDIF --></td> </tr> <tr> <td class="row1" width="35%"><b class="genmed">{L_EMAIL_ADDRESS}: </b></td> - <td class="row2"><!-- IF S_CHANGE_EMAIL --><input type="text" class="post" name="email" size="30" maxlength="60" value="{EMAIL}" /><!-- ELSE --><b class="gen">{EMAIL}</b><!-- ENDIF --></td> + <td class="row2"><!-- IF S_CHANGE_EMAIL --><input type="text" class="post" name="email" size="30" maxlength="100" value="{EMAIL}" /><!-- ELSE --><b class="gen">{EMAIL}</b><!-- ENDIF --></td> </tr> <!-- IF S_CHANGE_EMAIL --> <tr> <td class="row1" width="35%"><b class="genmed">{L_CONFIRM_EMAIL}: </b><br /><span class="gensmall">{L_CONFIRM_EMAIL_EXPLAIN}</span></td> - <td class="row2"><input type="text" class="post" name="email_confirm" size="30" maxlength="60" value="{CONFIRM_EMAIL}" /></td> + <td class="row2"><input type="text" class="post" name="email_confirm" size="30" maxlength="100" value="{CONFIRM_EMAIL}" /></td> </tr> <!-- ENDIF --> <!-- IF S_CHANGE_PASSWORD --> diff --git a/phpBB/styles/subsilver2/template/ucp_register.html b/phpBB/styles/subsilver2/template/ucp_register.html index 870c2ae1c7..171b017633 100644 --- a/phpBB/styles/subsilver2/template/ucp_register.html +++ b/phpBB/styles/subsilver2/template/ucp_register.html @@ -39,23 +39,23 @@ <tr> <td class="row1" width="38%"><b class="genmed">{L_USERNAME}: </b><br /><span class="gensmall">{L_USERNAME_EXPLAIN}</span></td> - <td class="row2"><input class="post" type="text" name="username" size="25" maxlength="40" value="{USERNAME}" /></td> + <td class="row2"><input class="post" type="text" name="username" size="25" value="{USERNAME}" /></td> </tr> <tr> <td class="row1"><b class="genmed">{L_EMAIL_ADDRESS}: </b></td> - <td class="row2"><input class="post" type="text" name="email" size="25" maxlength="255" value="{EMAIL}" /></td> + <td class="row2"><input class="post" type="text" name="email" size="25" maxlength="100" value="{EMAIL}" /></td> </tr> <tr> <td class="row1"><b class="genmed">{L_CONFIRM_EMAIL}: </b></td> - <td class="row2"><input class="post" type="text" name="email_confirm" size="25" maxlength="255" value="{EMAIL_CONFIRM}" /></td> + <td class="row2"><input class="post" type="text" name="email_confirm" size="25" maxlength="100" value="{EMAIL_CONFIRM}" /></td> </tr> <tr> <td class="row1"><b class="genmed">{L_PASSWORD}: </b><br /><span class="gensmall">{L_PASSWORD_EXPLAIN}</span></td> - <td class="row2"><input class="post" type="password" name="new_password" size="25" maxlength="100" value="{PASSWORD}" /></td> + <td class="row2"><input class="post" type="password" name="new_password" size="25" value="{PASSWORD}" /></td> </tr> <tr> <td class="row1"><b class="genmed">{L_CONFIRM_PASSWORD}: </b></td> - <td class="row2"><input class="post" type="password" name="password_confirm" size="25" maxlength="100" value="{PASSWORD_CONFIRM}" /></td> + <td class="row2"><input class="post" type="password" name="password_confirm" size="25" value="{PASSWORD_CONFIRM}" /></td> </tr> <tr> <td class="row1"><b class="genmed">{L_LANGUAGE}: </b></td> diff --git a/phpBB/styles/subsilver2/template/ucp_remind.html b/phpBB/styles/subsilver2/template/ucp_remind.html index 47baf1d447..cf724c3f42 100644 --- a/phpBB/styles/subsilver2/template/ucp_remind.html +++ b/phpBB/styles/subsilver2/template/ucp_remind.html @@ -10,11 +10,11 @@ </tr> <tr> <td class="row1" width="38%"><b class="genmed">{L_USERNAME}: </b></td> - <td class="row2"><input type="text" class="post" name="username" size="25" maxlength="60" value="{USERNAME}" /></td> + <td class="row2"><input type="text" class="post" name="username" size="25" value="{USERNAME}" /></td> </tr> <tr> <td class="row1"><b class="genmed">{L_EMAIL_ADDRESS}: </b><br /><span class="gensmall">{L_EMAIL_REMIND}</span></td> - <td class="row2"><input type="text" class="post" name="email" size="25" maxlength="255" value="{EMAIL}" /></td> + <td class="row2"><input type="text" class="post" name="email" size="25" maxlength="100" value="{EMAIL}" /></td> </tr> <tr> <td class="cat" colspan="2" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SUBMIT}" class="btnmain" /> <input type="reset" value="{L_RESET}" name="reset" class="btnlite" /></td> diff --git a/phpBB/styles/subsilver2/template/ucp_resend.html b/phpBB/styles/subsilver2/template/ucp_resend.html index df72b523bc..08b6c6c22a 100644 --- a/phpBB/styles/subsilver2/template/ucp_resend.html +++ b/phpBB/styles/subsilver2/template/ucp_resend.html @@ -10,7 +10,7 @@ </tr> <tr> <td class="row1" width="38%"><b class="genmed">{L_USERNAME}: </b></td> - <td class="row2"><input type="text" class="post" name="username" size="25" maxlength="60" value="{USERNAME}" /></td> + <td class="row2"><input type="text" class="post" name="username" size="25" value="{USERNAME}" /></td> </tr> <tr> <td class="row1"><b class="genmed">{L_EMAIL_ADDRESS}: </b><br /><span class="gensmall">{L_EMAIL_REMIND}</span></td> diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 7bad55b34f..00a302cef4 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -190,6 +190,8 @@ if ($forum_data['prune_next'] < time() && $forum_data['enable_prune']) // Forum rules and subscription info $s_watching_forum = $s_watching_forum_img = array(); $s_watching_forum['link'] = $s_watching_forum['title'] = ''; +$s_watching_forum['is_watching'] = false; + if (($config['email_enable'] || $config['jab_enable']) && $config['allow_forum_notify'] && $auth->acl_get('f_subscribe', $forum_id)) { $notify_status = (isset($forum_data['notify_status'])) ? $forum_data['notify_status'] : NULL; @@ -281,6 +283,7 @@ $template->assign_vars(array( 'S_TOPIC_ICONS' => ($s_display_active && sizeof($active_forum_ary)) ? max($active_forum_ary['enable_icons']) : (($forum_data['enable_icons']) ? true : false), 'S_WATCH_FORUM_LINK' => $s_watching_forum['link'], 'S_WATCH_FORUM_TITLE' => $s_watching_forum['title'], + 'S_WATCHING_FORUM' => $s_watching_forum['is_watching'], 'S_FORUM_ACTION' => append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id&start=$start"), 'S_DISPLAY_SEARCHBOX' => ($auth->acl_get('u_search') && $auth->acl_get('f_search', $forum_id) && $config['load_search']) ? true : false, 'S_SEARCHBOX_ACTION' => append_sid("{$phpbb_root_path}search.$phpEx", 'fid[]=' . $forum_id), diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 98d852737e..e65388d35e 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -428,6 +428,8 @@ $viewtopic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&a // Are we watching this topic? $s_watching_topic = $s_watching_topic_img = array(); $s_watching_topic['link'] = $s_watching_topic['title'] = ''; +$s_watching_topic['is_watching'] = false; + if ($config['email_enable'] && $config['allow_topic_notify'] && $user->data['is_registered']) { watch_topic_forum('topic', $s_watching_topic, $s_watching_topic_img, $user->data['user_id'], $forum_id, $topic_id, $topic_data['notify_status'], $start); @@ -574,6 +576,7 @@ $template->assign_vars(array( 'U_WATCH_TOPIC' => $s_watching_topic['link'], 'L_WATCH_TOPIC' => $s_watching_topic['title'], + 'S_WATCHING_TOPIC' => $s_watching_topic['is_watching'], 'U_BOOKMARK_TOPIC' => ($user->data['is_registered'] && $config['allow_bookmarks']) ? $viewtopic_url . '&bookmark=1' : '', 'L_BOOKMARK_TOPIC' => ($user->data['is_registered'] && $config['allow_bookmarks'] && $topic_data['bookmarked']) ? $user->lang['BOOKMARK_TOPIC_REMOVE'] : $user->lang['BOOKMARK_TOPIC'], |