diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 4c71fe0aa9..9401473353 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -127,6 +127,14 @@ function adm_page_header($page_title) 'U_ADM_INDEX' => append_sid("{$phpbb_admin_path}index.$phpEx"), 'U_INDEX' => append_sid("{$phpbb_root_path}index.$phpEx"), + 'T_IMAGES_PATH' => "{$phpbb_root_path}images/", + 'T_SMILIES_PATH' => "{$phpbb_root_path}{$config['smilies_path']}/", + 'T_AVATAR_PATH' => "{$phpbb_root_path}{$config['avatar_path']}/", + 'T_AVATAR_GALLERY_PATH' => "{$phpbb_root_path}{$config['avatar_gallery_path']}/", + 'T_ICONS_PATH' => "{$phpbb_root_path}{$config['icons_path']}/", + 'T_RANKS_PATH' => "{$phpbb_root_path}{$config['ranks_path']}/", + 'T_UPLOAD_PATH' => "{$phpbb_root_path}{$config['upload_path']}/", + 'S_CONTENT_DIRECTION' => $user->lang['DIRECTION'], 'S_CONTENT_ENCODING' => $user->lang['ENCODING'], 'S_CONTENT_DIR_LEFT' => $user->lang['LEFT'], diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html index 70a2415b6c..964a07bf67 100644 --- a/phpBB/adm/style/acp_attachments.html +++ b/phpBB/adm/style/acp_attachments.html @@ -176,11 +176,11 @@
-
checked="checked" />
+
checked="checked" />
-
checked="checked" />
+
checked="checked" />

{L_DOWNLOAD_MODE_EXPLAIN}
@@ -298,7 +298,7 @@ {extensions.EXTENSION} {extensions.GROUP_OPTIONS} - + @@ -331,8 +331,8 @@ {orphan.FILE} {orphan.FILESIZE} ID: - - + + diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html index 116aba0aff..d09f8a9e65 100644 --- a/phpBB/adm/style/acp_bbcodes.html +++ b/phpBB/adm/style/acp_bbcodes.html @@ -34,7 +34,7 @@ {L_SETTINGS}
-
checked="checked" />
+
checked="checked" />
diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html index 5d2fd9f77e..1924133bfd 100644 --- a/phpBB/adm/style/acp_bots.html +++ b/phpBB/adm/style/acp_bots.html @@ -79,7 +79,7 @@  {bots.L_ACTIVATE_DEACTIVATE}   {L_EDIT}   {L_DELETE}  - + diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html index 37b9557d83..f3eb218d8c 100644 --- a/phpBB/adm/style/acp_database.html +++ b/phpBB/adm/style/acp_database.html @@ -54,17 +54,17 @@ {L_BACKUP_OPTIONS}
-
 {L_FULL_BACKUP}   {L_STRUCTURE_ONLY}   {L_DATA_ONLY}
+
 {L_FULL_BACKUP}   {L_STRUCTURE_ONLY}   {L_DATA_ONLY}
- checked="checked" /> {methods.TYPE} + checked="checked" /> {methods.TYPE}
-
 {L_STORE_AND_DOWNLOAD}   {L_STORE_LOCAL}   {L_DOWNLOAD}
+
 {L_STORE_AND_DOWNLOAD}   {L_STORE_LOCAL}   {L_DOWNLOAD}
diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html index 25acf70a98..e06bcc3b04 100644 --- a/phpBB/adm/style/acp_email.html +++ b/phpBB/adm/style/acp_email.html @@ -40,7 +40,7 @@
-
+
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index c974f61eed..c2a4dd3efb 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -87,7 +87,7 @@

{L_FORUM_DESC_EXPLAIN}
-
checked="checked" /> {L_PARSE_BBCODE}   checked="checked" /> {L_PARSE_SMILIES}   checked="checked" /> {L_PARSE_URLS}
+
checked="checked" /> {L_PARSE_BBCODE}   checked="checked" /> {L_PARSE_SMILIES}   checked="checked" /> {L_PARSE_URLS}

{L_FORUM_IMAGE_EXPLAIN}
@@ -220,7 +220,7 @@

{L_FORUM_RULES_EXPLAIN}
-
checked="checked" /> {L_PARSE_BBCODE}   checked="checked" /> {L_PARSE_SMILIES}   checked="checked" /> {L_PARSE_URLS}
+
checked="checked" /> {L_PARSE_BBCODE}   checked="checked" /> {L_PARSE_SMILIES}   checked="checked" /> {L_PARSE_URLS}
diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index 471a41cf4c..ccf4c74521 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -28,7 +28,7 @@
-
checked="checked" /> {L_PARSE_BBCODE}   checked="checked" /> {L_PARSE_SMILIES}   checked="checked" /> {L_PARSE_URLS}
+
checked="checked" /> {L_PARSE_BBCODE}   checked="checked" /> {L_PARSE_SMILIES}   checked="checked" /> {L_PARSE_URLS}
@@ -56,11 +56,11 @@ {L_GROUP_SETTINGS_SAVE}
-
+
-
+

{L_GROUP_MESSAGE_LIMIT_EXPLAIN}
@@ -81,7 +81,7 @@

{L_AVATAR_EXPLAIN}
{AVATAR_IMAGE}
-
 {L_DELETE_AVATAR}
+
 {L_DELETE_AVATAR}
@@ -179,7 +179,7 @@ {L_YES}{L_NO} {leader.JOINED} {leader.USER_POSTS} - + @@ -200,7 +200,7 @@ {L_YES}{L_NO} {member.JOINED} {member.USER_POSTS} - + diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html index 8fb0592412..4cfcc2a4e5 100644 --- a/phpBB/adm/style/acp_icons.html +++ b/phpBB/adm/style/acp_icons.html @@ -48,7 +48,7 @@ - + @@ -57,7 +57,7 @@ - + diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html index dce0c00de6..5f32855f48 100644 --- a/phpBB/adm/style/acp_language.html +++ b/phpBB/adm/style/acp_language.html @@ -132,7 +132,7 @@ {PRINT_MESSAGE}
{L_FILE_FROM_STORAGE} -     {L_UPLOAD_METHOD}:  id="method" checked="checked" value="{buttons.VALUE}" name="method"> {buttons.VALUE}  +     {L_UPLOAD_METHOD}:  id="method" checked="checked" value="{buttons.VALUE}" name="method"> {buttons.VALUE}  @@ -144,7 +144,7 @@ {TPL} -     {L_UPLOAD_METHOD}:  {buttons.VALUE}  +     {L_UPLOAD_METHOD}:  {buttons.VALUE}  diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html index 8690103f1e..afb52bd792 100644 --- a/phpBB/adm/style/acp_logs.html +++ b/phpBB/adm/style/acp_logs.html @@ -47,7 +47,7 @@ {log.IP} {log.DATE} {log.ACTION}
{log.DATA} - + diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 5e2dfc7890..0d798833cf 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -127,7 +127,7 @@ {inactive.USERNAME} {inactive.DATE} -    +    diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html index fb6e494568..ea4c7bd169 100644 --- a/phpBB/adm/style/acp_modules.html +++ b/phpBB/adm/style/acp_modules.html @@ -83,14 +83,14 @@
-
-
+
+
style="display: none;">

{L_MODULE_DISPLAYED_EXPLAIN}
-
-
+
+

diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html index 9538af8451..5ea2a3cfec 100644 --- a/phpBB/adm/style/acp_permission_roles.html +++ b/phpBB/adm/style/acp_permission_roles.html @@ -140,9 +140,9 @@ {auth.mask.PERMISSION} - checked="checked" value="1" /> - checked="checked" value="-1" /> - checked="checked" value="0" /> + checked="checked" value="1" /> + checked="checked" value="-1" /> + checked="checked" value="0" /> diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html index 2d4fcfd28c..a991b3f2fc 100644 --- a/phpBB/adm/style/acp_permissions.html +++ b/phpBB/adm/style/acp_permissions.html @@ -32,7 +32,7 @@
-
  {L_ALL_FORUMS}
+
  {L_ALL_FORUMS}
@@ -92,7 +92,7 @@
[ {L_FIND_USERNAME} ]
-
 {L_SELECT_ANONYMOUS}
+
 {L_SELECT_ANONYMOUS}
@@ -136,7 +136,7 @@ {L_MANAGE_USERS}
-
  {L_ALL_USERS}
+
  {L_ALL_USERS}
@@ -155,7 +155,7 @@

{L_USERNAMES_EXPLAIN}

-
 {L_SELECT_ANONYMOUS}
+
 {L_SELECT_ANONYMOUS}
@@ -183,7 +183,7 @@ {L_MANAGE_GROUPS}
-
  {L_ALL_GROUPS}
+
  {L_ALL_GROUPS}
@@ -245,7 +245,7 @@
[ {L_FIND_USERNAME} ]
-
 {L_SELECT_ANONYMOUS}
+
 {L_SELECT_ANONYMOUS}
diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html index d2e1da4374..d6cb44b272 100644 --- a/phpBB/adm/style/acp_profile.html +++ b/phpBB/adm/style/acp_profile.html @@ -33,7 +33,7 @@

{L_DISPLAY_PROFILE_FIELD_EXPLAIN}
-
checked="checked" /> {L_YES} checked="checked" /> {L_NO}
+
checked="checked" /> {L_YES} checked="checked" /> {L_NO}
@@ -41,19 +41,19 @@ {L_VISIBILITY_OPTION}
-
checked="checked" />
+
checked="checked" />

{L_DISPLAY_AT_REGISTER_EXPLAIN}
-
checked="checked" />
+
checked="checked" />

{L_REQUIRED_FIELD_EXPLAIN}
-
checked="checked" />
+
checked="checked" />

{L_HIDE_PROFILE_FIELD_EXPLAIN}
-
checked="checked" />
+
checked="checked" />
diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html index f27d9a43ea..fe6783e338 100644 --- a/phpBB/adm/style/acp_search.html +++ b/phpBB/adm/style/acp_search.html @@ -13,7 +13,7 @@ {L_GENERAL_SEARCH_SETTINGS}

{L_YES_SEARCH_EXPLAIN}
-
checked="checked" class="radio" /> {L_YES}   checked="checked" class="radio" /> {L_NO}
+
checked="checked" class="radio" /> {L_YES}   checked="checked" class="radio" /> {L_NO}

{L_SEARCH_INTERVAL_EXPLAIN}
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index 83e5e6c639..2c49e94ccf 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -106,7 +106,7 @@ {L_INCLUDE_DIMENSIONS}:
{L_DIMENSIONS_EXPLAIN} - checked="checked" /> {L_YES}   checked="checked" /> {L_NO} + checked="checked" /> {L_YES}   checked="checked" /> {L_NO}    @@ -237,7 +237,7 @@ function swatch(field) { - window.open('{UA_SWATCH}' + field, '_swatch', 'HEIGHT=115,resizable=yes,scrollbars=no,WIDTH=636'); + window.open('{UA_SWATCH}' + field, '_swatch', 'height=150, resizable=yes, scrollbars=no, width=636'); return false; } @@ -334,15 +334,15 @@
-
checked="checked" /> {L_YES}   checked="checked" /> {L_NO}   checked="checked" /> {L_UNSET}
+
checked="checked" /> {L_YES}   checked="checked" /> {L_NO}   checked="checked" /> {L_UNSET}
-
checked="checked" /> {L_YES}   checked="checked" /> {L_NO}   checked="checked" /> {L_UNSET}
+
checked="checked" /> {L_YES}   checked="checked" /> {L_NO}   checked="checked" /> {L_UNSET}
-
checked="checked" /> {L_YES}   checked="checked" /> {L_NO}   checked="checked" /> {L_UNSET}
+
checked="checked" /> {L_YES}   checked="checked" /> {L_NO}   checked="checked" /> {L_UNSET}
@@ -429,7 +429,7 @@ {file.FILESIZE} {file.CACHED} {file.MODIFIED} - + diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index 8e0747a1ae..c8e6215843 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -16,7 +16,7 @@
[ {L_FIND_USERNAME} ]
-
 {L_SELECT_ANONYMOUS}
+
 {L_SELECT_ANONYMOUS}
@@ -136,7 +136,7 @@

{L_DELETE_USER_EXPLAIN}
-
+
@@ -191,7 +191,7 @@ {log.ACTION}
» [ {log.DATA} ] - + @@ -440,7 +440,7 @@

{L_AVATAR_EXPLAIN}
{AVATAR_IMAGE}
-
 {L_DELETE_AVATAR}
+
 {L_DELETE_AVATAR}
@@ -592,15 +592,15 @@

-
-
-
-   {L_DISABLE_BBCODE}   -   {L_DISABLE_SMILIES}   -   {L_DISABLE_MAGIC_URL}   +
+
+   {L_DISABLE_BBCODE}   +   {L_DISABLE_SMILIES}   +   {L_DISABLE_MAGIC_URL}  

{L_OPTIONS}: {BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {SMILIES_STATUS}
@@ -678,7 +678,7 @@ {attach.POST_TIME} {attach.SIZE} {attach.DOWNLOAD_COUNT} - + diff --git a/phpBB/adm/style/custom_profile_fields.html b/phpBB/adm/style/custom_profile_fields.html index c1f0d5c216..884f2059aa 100644 --- a/phpBB/adm/style/custom_profile_fields.html +++ b/phpBB/adm/style/custom_profile_fields.html @@ -17,7 +17,7 @@ {bool.options.VALUE}    - checked="checked" /> + checked="checked" /> diff --git a/phpBB/adm/style/editor.js b/phpBB/adm/style/editor.js index ef52b65998..6fff9c0deb 100644 --- a/phpBB/adm/style/editor.js +++ b/phpBB/adm/style/editor.js @@ -465,7 +465,7 @@ function colorPalette(dir, width, height) numberList[3] = 'BF'; numberList[4] = 'FF'; - document.writeln(''); + document.write('
'); for (r = 0; r < 5; r++) { @@ -484,8 +484,8 @@ function colorPalette(dir, width, height) for (b = 0; b < 5; b++) { color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]); - document.write(''); } diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html index beec9d011f..b98af2dfa4 100644 --- a/phpBB/adm/style/permission_mask.html +++ b/phpBB/adm/style/permission_mask.html @@ -157,7 +157,7 @@ diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html index 67e66b3a9d..836c2b8a52 100644 --- a/phpBB/adm/style/simple_header.html +++ b/phpBB/adm/style/simple_header.html @@ -78,7 +78,7 @@ function marklist(id, name, state) */ function swatch() { - window.open('{UA_SWATCH}', '_swatch', 'height=115, resizable=yes, scrollbars=no, width=636'); + window.open('{UA_SWATCH}', '_swatch', 'height=150, resizable=yes, scrollbars=no, width=636'); return false; } diff --git a/phpBB/cron.php b/phpBB/cron.php index 9f2c59966c..38bcd38d3e 100644 --- a/phpBB/cron.php +++ b/phpBB/cron.php @@ -207,14 +207,15 @@ switch ($cron_type) break; } -// Unload cache, must be done before the DB connection is closed -if (!empty($cache)) +// Unloading cache and closing db after having done the dirty work. +if ($use_shutdown_function) { - $cache->unload(); + register_shutdown_function('garbage_collection'); +} +else +{ + garbage_collection(); } - -// Close our DB connection. -$db->sql_close(); // Output transparent gif header('Cache-Control: no-cache'); diff --git a/phpBB/includes/acp/acp_language.php b/phpBB/includes/acp/acp_language.php index e54dc41dec..63b3c0dcdd 100644 --- a/phpBB/includes/acp/acp_language.php +++ b/phpBB/includes/acp/acp_language.php @@ -775,7 +775,7 @@ class acp_language $radio_buttons = ''; foreach ($methods as $method) { - $radio_buttons .= ' ' . $method . ' '; + $radio_buttons .= ' ' . $method . ' '; } $template->assign_vars(array( diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index 08b8126c36..cd93de4deb 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -1850,7 +1850,7 @@ pagination_sep = \'{PAGINATION_SEP}\' $format_buttons = ''; foreach ($methods as $method) { - $format_buttons .= ' ' . $method . ' '; + $format_buttons .= ' ' . $method . ' '; } $template->assign_vars(array( diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index f2ce3ee18c..0448b7e568 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -223,8 +223,8 @@ class acp_users user_ban(substr($action, 3), $ban, 0, 0, 0, $user->lang[$reason]); - add_log('admin', $log, $user->lang['reason']); - add_log('user', $user_id, $log, $user->lang['reason']); + add_log('admin', $log, $user->lang[$reason]); + add_log('user', $user_id, $log, $user->lang[$reason]); trigger_error($user->lang['BAN_SUCCESSFUL'] . adm_back_link($this->u_action . '&u=' . $user_id)); diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index d6cd9efd1f..a7adb4d600 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2747,6 +2747,19 @@ function page_footer() $template->display('body'); + garbage_collection(); + + exit; +} + +/** +* Closing the cache object and the database +* Cool function name, eh? We might want to add operations to it later +*/ +function garbage_collection() +{ + global $cache, $db; + // Unload cache, must be done before the DB connection if closed if (!empty($cache)) { @@ -2755,8 +2768,6 @@ function page_footer() // Close our DB connection. $db->sql_close(); - - exit; } ?> \ No newline at end of file diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 748295e632..88edddad50 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -2119,7 +2119,7 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id 'forum_id' => $row['forum_id'], 'topic_id' => $row['topic_id'], - 'viewforum' => ($row['forum_id'] && $auth->acl_get('f_read', $row['forum_id'])) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']) : '', + 'viewforum' => ($row['forum_id'] && $auth->acl_get('f_read', $row['forum_id'])) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']) : false, 'action' => (isset($user->lang[$row['log_operation']])) ? $user->lang[$row['log_operation']] : '{' . ucfirst(str_replace('_', ' ', $row['log_operation'])) . '}', ); @@ -2195,8 +2195,8 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id foreach ($log as $key => $row) { - $log[$key]['viewtopic'] = (isset($is_auth[$row['topic_id']])) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $is_auth[$row['topic_id']] . '&t=' . $row['topic_id']) : ''; - $log[$key]['viewlogs'] = (isset($is_mod[$row['topic_id']])) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=logs&mode=topic_logs&t=' . $row['topic_id'], true, $user->session_id) : ''; + $log[$key]['viewtopic'] = (isset($is_auth[$row['topic_id']])) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $is_auth[$row['topic_id']] . '&t=' . $row['topic_id']) : false; + $log[$key]['viewlogs'] = (isset($is_mod[$row['topic_id']])) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=logs&mode=topic_logs&t=' . $row['topic_id'], true, $user->session_id) : false; } } @@ -2214,7 +2214,7 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id foreach ($log as $key => $row) { - $log[$key]['reportee_username'] = (isset($reportee_names_list[$row['reportee_id']])) ? '' . $reportee_names_list[$row['reportee_id']] . '' : ''; + $log[$key]['reportee_username'] = (isset($reportee_names_list[$row['reportee_id']])) ? '' . $reportee_names_list[$row['reportee_id']] . '' : false; } } diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 319e8810b6..a8d0932d2a 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -280,7 +280,7 @@ function check_rule(&$rules, &$rule_row, &$message_row, $user_id) case ACTION_MARK_AS_READ: case ACTION_MARK_AS_IMPORTANT: case ACTION_DELETE_MESSAGE: - return array('action' => $rule_row['rule_action'], 'unread' => $message_row['unread'], 'important' => $message_row['important']); + return array('action' => $rule_row['rule_action'], 'unread' => $message_row['unread'], 'marked' => $message_row['marked']); break; default: @@ -465,7 +465,7 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false) break; case ACTION_MARK_AS_IMPORTANT: - if (!$rule_ary['important']) + if (!$rule_ary['marked']) { $important_ids[] = $msg_id; } diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php index d332fb7bc7..dfc72b54c4 100644 --- a/phpBB/includes/functions_profile_fields.php +++ b/phpBB/includes/functions_profile_fields.php @@ -963,7 +963,7 @@ class custom_profile_admin extends custom_profile ); $options = array( - 0 => array('TITLE' => $user->lang['FIELD_TYPE'], 'EXPLAIN' => $user->lang['BOOL_TYPE_EXPLAIN'], 'FIELD' => 'vars['field_length'] == 1) ? ' checked="checked"' : '') . ' />' . $user->lang['RADIO_BUTTONS'] . '   vars['field_length'] == 2) ? ' checked="checked"' : '') . ' />' . $user->lang['CHECKBOX'] . '   '), + 0 => array('TITLE' => $user->lang['FIELD_TYPE'], 'EXPLAIN' => $user->lang['BOOL_TYPE_EXPLAIN'], 'FIELD' => 'vars['field_length'] == 1) ? ' checked="checked"' : '') . ' />' . $user->lang['RADIO_BUTTONS'] . '   vars['field_length'] == 2) ? ' checked="checked"' : '') . ' />' . $user->lang['CHECKBOX'] . '   '), 1 => array('TITLE' => $user->lang['DEFAULT_VALUE'], 'FIELD' => $this->process_field_row('preview', $profile_row)) ); @@ -1029,7 +1029,7 @@ class custom_profile_admin extends custom_profile $options = array( 0 => array('TITLE' => $user->lang['DEFAULT_VALUE'], 'FIELD' => $this->process_field_row('preview', $profile_row)), - 1 => array('TITLE' => $user->lang['ALWAYS_TODAY'], 'FIELD' => ' ' . $user->lang['YES'] . ' ' . $user->lang['NO']), + 1 => array('TITLE' => $user->lang['ALWAYS_TODAY'], 'FIELD' => ' ' . $user->lang['YES'] . ' ' . $user->lang['NO']), ); return $options; diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index b817ee962d..e31b9e187e 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -324,7 +324,7 @@ class mcp_queue $poster = $row['username']; } - $s_checkbox = ''; + $s_checkbox = ''; $global_topic = ($row['forum_id']) ? false : true; if ($global_topic) diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index f62bb88d28..ef19dc2e1a 100755 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -295,7 +295,7 @@ class mcp_reports $poster = $row['username']; } - $s_checkbox = ''; + $s_checkbox = ''; $template->assign_block_vars('postrow', array( 'U_VIEWFORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $row['forum_id']), diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php index 7f290a5f03..1c0c1d9a68 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -119,7 +119,7 @@ function mcp_topic_view($id, $mode, $action) $message = str_replace("\n", '
', $message); $checked = ($post_id_list && in_array(intval($row['post_id']), $post_id_list)) ? 'checked="checked" ' : ''; - $s_checkbox = ''; + $s_checkbox = ''; if (!$row['post_approved']) { diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index afe66042dd..2c76b12c6d 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -269,21 +269,9 @@ class bbcode_firstpass extends bbcode } } - // Is the user trying to link to a php file in this domain and script path? - if (strpos($in, ".{$phpEx}") !== false && strpos($in, substr($user->page['root_script_path'], 0, -1)) !== false) + if ($this->path_in_domain($in)) { - $server_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME'); - - // Forcing server vars is the only way to specify/override the protocol - if ($config['force_server_vars'] || !$server_name) - { - $server_name = $config['server_name']; - } - - if (strpos($in, $server_name) !== false) - { - return '[img]' . $in . '[/img]'; - } + return '[img]' . $in . '[/img]'; } return '[img:' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($in) . '[/img:' . $this->bbcode_uid . ']'; @@ -317,21 +305,9 @@ class bbcode_firstpass extends bbcode } } - // Is the user trying to link to a php file in this domain and script path? - if (strpos($in, ".{$phpEx}") !== false && strpos($in, substr($user->page['root_script_path'], 0, -1)) !== false) + if ($this->path_in_domain($in)) { - $server_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME'); - - // Forcing server vars is the only way to specify/override the protocol - if ($config['force_server_vars'] || !$server_name) - { - $server_name = $config['server_name']; - } - - if (strpos($in, $server_name) !== false) - { - return '[flash=' . $width . ',' . $height . ']' . $in . '[/flash]'; - } + return '[flash=' . $width . ',' . $height . ']' . $in . '[/flash]'; } return '[flash=' . $width . ',' . $height . ':' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($in) . '[/flash:' . $this->bbcode_uid . ']'; @@ -796,6 +772,43 @@ class bbcode_firstpass extends bbcode return '[url' . (($var1) ? '=' . $var1 : '') . ']' . $var2 . '[/url]'; } + + /** + * Check if url is pointing to this domain/script_path/php-file + * + * @param string $url the url to check + * @return true if the url is pointing to this domain/script_path/php-file, false if not + * + * @private + */ + function path_in_domain($url) + { + global $config, $phpEx, $user; + + // Is the user trying to link to a php file in this domain and script path? + if (strpos($url, ".{$phpEx}") !== false && strpos($url, substr($user->page['root_script_path'], 0, -1)) !== false) + { + $server_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : getenv('SERVER_NAME'); + + // Forcing server vars is the only way to specify/override the protocol + if ($config['force_server_vars'] || !$server_name) + { + $server_name = $config['server_name']; + } + + // Check again in correct order... + $pos_ext = strpos($url, ".{$phpEx}"); + $pos_path = strpos($url, substr($user->page['root_script_path'], 0, -1)); + $pos_domain = strpos($url, $server_name); + + if ($pos_domain !== false && $pos_path >= $pos_domain && $pos_ext >= $pos_path) + { + return true; + } + } + + return false; + } } /** diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index 40e5fca5d3..00da0d9bd6 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -18,7 +18,8 @@ class ucp_groups function main($id, $mode) { - global $config, $db, $user, $auth, $template, $phpbb_root_path, $phpEx; + global $config, $phpbb_root_path, $phpEx; + global $db, $user, $auth, $cache, $template; $user->add_lang('groups'); diff --git a/phpBB/styles/subSilver/template/custom_profile_fields.html b/phpBB/styles/subSilver/template/custom_profile_fields.html index 0a1448a9f8..c8f287ddb4 100644 --- a/phpBB/styles/subSilver/template/custom_profile_fields.html +++ b/phpBB/styles/subSilver/template/custom_profile_fields.html @@ -14,9 +14,9 @@ - {bool.options.VALUE}    + {bool.options.VALUE}    - checked="checked" /> + checked="checked" /> diff --git a/phpBB/styles/subSilver/template/index_body.html b/phpBB/styles/subSilver/template/index_body.html index 028e5141ac..d91a5bf3ba 100644 --- a/phpBB/styles/subSilver/template/index_body.html +++ b/phpBB/styles/subSilver/template/index_body.html @@ -146,7 +146,7 @@ - +
'); - document.write('#' + color + ''); + document.write(''); + document.write('#' + color + ''); document.writeln('
style="display: none;"> -   +   {p_mask.f_mask.PADDING} {p_mask.f_mask.FOLDER_IMAGE} {p_mask.f_mask.NAME}

{L_LOGIN_LOGOUT}
{L_USERNAME}:   {L_PASSWORD}:   {L_LOG_ME_IN}   {L_USERNAME}:   {L_PASSWORD}:   {L_LOG_ME_IN}  
diff --git a/phpBB/styles/subSilver/template/login_body.html b/phpBB/styles/subSilver/template/login_body.html index 06a58abfc3..d61e3cf24a 100644 --- a/phpBB/styles/subSilver/template/login_body.html +++ b/phpBB/styles/subSilver/template/login_body.html @@ -45,11 +45,11 @@   - {L_LOG_ME_IN} + {L_LOG_ME_IN}   - {L_HIDE_ME} + {L_HIDE_ME} diff --git a/phpBB/styles/subSilver/template/mcp_approve.html b/phpBB/styles/subSilver/template/mcp_approve.html index efb5f5bcc6..e62476879e 100644 --- a/phpBB/styles/subSilver/template/mcp_approve.html +++ b/phpBB/styles/subSilver/template/mcp_approve.html @@ -14,7 +14,7 @@ {ADDITIONAL_MSG}
- {L_NOTIFY_POSTER_APPROVAL}{L_NOTIFY_POSTER_DISAPPROVAL}
+ {L_NOTIFY_POSTER_APPROVAL}{L_NOTIFY_POSTER_DISAPPROVAL}

diff --git a/phpBB/styles/subSilver/template/mcp_ban.html b/phpBB/styles/subSilver/template/mcp_ban.html index 5c55bbd62c..d404c5c38d 100644 --- a/phpBB/styles/subSilver/template/mcp_ban.html +++ b/phpBB/styles/subSilver/template/mcp_ban.html @@ -53,7 +53,7 @@ {L_BAN_EXCLUDE}:
{L_BAN_EXCLUDE_EXPLAIN} - {L_YES}   {L_NO} + {L_YES}   {L_NO} {L_BAN_REASON}: diff --git a/phpBB/styles/subSilver/template/mcp_forum.html b/phpBB/styles/subSilver/template/mcp_forum.html index debd05866c..0a09addace 100644 --- a/phpBB/styles/subSilver/template/mcp_forum.html +++ b/phpBB/styles/subSilver/template/mcp_forum.html @@ -34,7 +34,7 @@

{topicrow.REPLIES}

{topicrow.LAST_POST_TIME}

- + diff --git a/phpBB/styles/subSilver/template/mcp_logs.html b/phpBB/styles/subSilver/template/mcp_logs.html index 5c984911f2..17bbc4a290 100755 --- a/phpBB/styles/subSilver/template/mcp_logs.html +++ b/phpBB/styles/subSilver/template/mcp_logs.html @@ -17,7 +17,7 @@ {log.IP} {log.DATE} {log.ACTION}
{log.DATA} - + diff --git a/phpBB/styles/subSilver/template/mcp_move.html b/phpBB/styles/subSilver/template/mcp_move.html index 8be30fd88e..f16ac03273 100644 --- a/phpBB/styles/subSilver/template/mcp_move.html +++ b/phpBB/styles/subSilver/template/mcp_move.html @@ -14,7 +14,7 @@
{L_SELECT_DESTINATION_FORUM}  
- {L_LEAVE_SHADOW}
+ {L_LEAVE_SHADOW}

{S_HIDDEN_FIELDS}{MESSAGE_TEXT}

   diff --git a/phpBB/styles/subSilver/template/mcp_notes_user.html b/phpBB/styles/subSilver/template/mcp_notes_user.html index d666b3a098..eece61fa98 100755 --- a/phpBB/styles/subSilver/template/mcp_notes_user.html +++ b/phpBB/styles/subSilver/template/mcp_notes_user.html @@ -49,7 +49,7 @@ colspan="2">{L_REPORT_BY}: {usernotes.REPORT_BY} {L_ON} {usernotes.REPORT_AT}
{usernotes.ACTION} - + diff --git a/phpBB/styles/subSilver/template/mcp_queue.html b/phpBB/styles/subSilver/template/mcp_queue.html index 1cd5b71f52..2e04f7afed 100644 --- a/phpBB/styles/subSilver/template/mcp_queue.html +++ b/phpBB/styles/subSilver/template/mcp_queue.html @@ -5,7 +5,7 @@ {L_DISPLAY_OPTIONS} - {L_DISPLAY_ITEMS}: {S_SELECT_SORT_DAYS} {L_SORT_BY} {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} {L_FORUM}     {L_ONLY_TOPIC}   + {L_DISPLAY_ITEMS}: {S_SELECT_SORT_DAYS} {L_SORT_BY} {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} {L_FORUM}     {L_ONLY_TOPIC}    {L_TOPIC}  diff --git a/phpBB/styles/subSilver/template/mcp_reports.html b/phpBB/styles/subSilver/template/mcp_reports.html index 885302643c..fce5027899 100644 --- a/phpBB/styles/subSilver/template/mcp_reports.html +++ b/phpBB/styles/subSilver/template/mcp_reports.html @@ -5,7 +5,7 @@ {L_DISPLAY_OPTIONS} - {L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS} {L_SORT_BY} {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} {L_FORUM}     {L_ONLY_TOPIC}   + {L_DISPLAY_POSTS}: {S_SELECT_SORT_DAYS} {L_SORT_BY} {S_SELECT_SORT_KEY} {S_SELECT_SORT_DIR} {L_FORUM}     {L_ONLY_TOPIC}    {L_POST}  diff --git a/phpBB/styles/subSilver/template/mcp_topic.html b/phpBB/styles/subSilver/template/mcp_topic.html index 348d900e64..8e4cc693f2 100644 --- a/phpBB/styles/subSilver/template/mcp_topic.html +++ b/phpBB/styles/subSilver/template/mcp_topic.html @@ -21,7 +21,7 @@ {L_TOPIC_ICON} - +
checked="checked" />{L_NONE} checked="checked" /> checked="checked" />{L_NONE} checked="checked" />
diff --git a/phpBB/styles/subSilver/template/mcp_warn_post.html b/phpBB/styles/subSilver/template/mcp_warn_post.html index 04b7c75e32..0d454fe645 100755 --- a/phpBB/styles/subSilver/template/mcp_warn_post.html +++ b/phpBB/styles/subSilver/template/mcp_warn_post.html @@ -42,7 +42,7 @@ - {L_NOTIFY_USER_WARN} + {L_NOTIFY_USER_WARN}    diff --git a/phpBB/styles/subSilver/template/mcp_warn_user.html b/phpBB/styles/subSilver/template/mcp_warn_user.html index 866b51b470..ec6dd7f735 100755 --- a/phpBB/styles/subSilver/template/mcp_warn_user.html +++ b/phpBB/styles/subSilver/template/mcp_warn_user.html @@ -53,7 +53,7 @@ - {L_NOTIFY_USER_WARN} + {L_NOTIFY_USER_WARN}    diff --git a/phpBB/styles/subSilver/template/memberlist_body.html b/phpBB/styles/subSilver/template/memberlist_body.html index b513586035..2d0464ac85 100644 --- a/phpBB/styles/subSilver/template/memberlist_body.html +++ b/phpBB/styles/subSilver/template/memberlist_body.html @@ -64,7 +64,7 @@  {memberrow.PROFILE_FIELD1_VALUE} - + diff --git a/phpBB/styles/subSilver/template/memberlist_email.html b/phpBB/styles/subSilver/template/memberlist_email.html index 358afeaa83..c7fd0716c4 100644 --- a/phpBB/styles/subSilver/template/memberlist_email.html +++ b/phpBB/styles/subSilver/template/memberlist_email.html @@ -66,7 +66,7 @@ function checkForm(formObj) { {L_OPTIONS} - +
{L_CC_EMAIL}
diff --git a/phpBB/styles/subSilver/template/posting_body.html b/phpBB/styles/subSilver/template/posting_body.html index a0246e7b3a..e7fecbbce9 100644 --- a/phpBB/styles/subSilver/template/posting_body.html +++ b/phpBB/styles/subSilver/template/posting_body.html @@ -158,7 +158,7 @@ function checkForm() {L_DELETE_POST}: - [ {L_DELETE_POST_WARN} ] + [ {L_DELETE_POST_WARN} ] @@ -167,7 +167,7 @@ function checkForm() {L_ICON}: - +
{L_NONE} {L_NONE}
@@ -297,33 +297,33 @@ function checkForm() - + - + - + - + - + @@ -331,14 +331,14 @@ function checkForm() - + - + @@ -346,7 +346,7 @@ function checkForm() - + @@ -404,7 +404,7 @@ function checkForm() - + diff --git a/phpBB/styles/subSilver/template/posting_poll_body.html b/phpBB/styles/subSilver/template/posting_poll_body.html index c03ddb8a35..8b1402acec 100644 --- a/phpBB/styles/subSilver/template/posting_poll_body.html +++ b/phpBB/styles/subSilver/template/posting_poll_body.html @@ -24,11 +24,11 @@ - + - + diff --git a/phpBB/styles/subSilver/template/posting_preview.html b/phpBB/styles/subSilver/template/posting_preview.html index 704d5a13f0..862d85bf0e 100644 --- a/phpBB/styles/subSilver/template/posting_preview.html +++ b/phpBB/styles/subSilver/template/posting_preview.html @@ -20,9 +20,9 @@ diff --git a/phpBB/styles/subSilver/template/report_body.html b/phpBB/styles/subSilver/template/report_body.html index 78c219a0b7..f586389be0 100644 --- a/phpBB/styles/subSilver/template/report_body.html +++ b/phpBB/styles/subSilver/template/report_body.html @@ -18,7 +18,7 @@ - + diff --git a/phpBB/styles/subSilver/template/ucp_attachments.html b/phpBB/styles/subSilver/template/ucp_attachments.html index c9447d0b85..69a083bae4 100644 --- a/phpBB/styles/subSilver/template/ucp_attachments.html +++ b/phpBB/styles/subSilver/template/ucp_attachments.html @@ -32,7 +32,7 @@ - + diff --git a/phpBB/styles/subSilver/template/ucp_groups_manage.html b/phpBB/styles/subSilver/template/ucp_groups_manage.html index 7d4b3f6c1a..8b7fd7987e 100644 --- a/phpBB/styles/subSilver/template/ucp_groups_manage.html +++ b/phpBB/styles/subSilver/template/ucp_groups_manage.html @@ -5,7 +5,7 @@ @@ -35,7 +35,7 @@ @@ -69,7 +69,7 @@ - + @@ -174,7 +174,7 @@ - + diff --git a/phpBB/styles/subSilver/template/ucp_groups_membership.html b/phpBB/styles/subSilver/template/ucp_groups_membership.html index bd280acc87..f73a887d41 100644 --- a/phpBB/styles/subSilver/template/ucp_groups_membership.html +++ b/phpBB/styles/subSilver/template/ucp_groups_membership.html @@ -20,13 +20,13 @@ - + - + @@ -37,13 +37,13 @@ - + - + @@ -60,7 +60,7 @@
{pending.GROUP_DESC}
{pending.GROUP_STATUS} - + @@ -77,7 +77,7 @@
{nonmember.GROUP_DESC}
{nonmember.GROUP_STATUS} - + diff --git a/phpBB/styles/subSilver/template/ucp_main_bookmarks.html b/phpBB/styles/subSilver/template/ucp_main_bookmarks.html index bb11d7c922..808a742c7b 100644 --- a/phpBB/styles/subSilver/template/ucp_main_bookmarks.html +++ b/phpBB/styles/subSilver/template/ucp_main_bookmarks.html @@ -39,7 +39,7 @@ - + diff --git a/phpBB/styles/subSilver/template/ucp_main_drafts.html b/phpBB/styles/subSilver/template/ucp_main_drafts.html index 780a0e9a7b..401533785b 100644 --- a/phpBB/styles/subSilver/template/ucp_main_drafts.html +++ b/phpBB/styles/subSilver/template/ucp_main_drafts.html @@ -38,7 +38,7 @@ {L_NO_TOPIC_FORUM} - + diff --git a/phpBB/styles/subSilver/template/ucp_main_subscribed.html b/phpBB/styles/subSilver/template/ucp_main_subscribed.html index 17d58bd132..c88e473bd1 100644 --- a/phpBB/styles/subSilver/template/ucp_main_subscribed.html +++ b/phpBB/styles/subSilver/template/ucp_main_subscribed.html @@ -22,7 +22,7 @@ - + @@ -68,7 +68,7 @@ {topicrow.LAST_POST_IMG}

- + diff --git a/phpBB/styles/subSilver/template/ucp_pm_options.html b/phpBB/styles/subSilver/template/ucp_pm_options.html index cdc01eb818..9e774126f9 100644 --- a/phpBB/styles/subSilver/template/ucp_pm_options.html +++ b/phpBB/styles/subSilver/template/ucp_pm_options.html @@ -145,11 +145,11 @@ - + - + @@ -167,15 +167,15 @@ - + - + - + diff --git a/phpBB/styles/subSilver/template/ucp_pm_viewfolder.html b/phpBB/styles/subSilver/template/ucp_pm_viewfolder.html index 603f9f821e..08e0325cc9 100644 --- a/phpBB/styles/subSilver/template/ucp_pm_viewfolder.html +++ b/phpBB/styles/subSilver/template/ucp_pm_viewfolder.html @@ -71,7 +71,7 @@ - + diff --git a/phpBB/styles/subSilver/template/ucp_prefs_personal.html b/phpBB/styles/subSilver/template/ucp_prefs_personal.html index e0ade73a10..d1e1e7cbc4 100644 --- a/phpBB/styles/subSilver/template/ucp_prefs_personal.html +++ b/phpBB/styles/subSilver/template/ucp_prefs_personal.html @@ -29,35 +29,35 @@ - + - + - + - + - + - + - + @@ -73,7 +73,7 @@ - + diff --git a/phpBB/styles/subSilver/template/ucp_prefs_post.html b/phpBB/styles/subSilver/template/ucp_prefs_post.html index 668954b5db..7ef608f379 100644 --- a/phpBB/styles/subSilver/template/ucp_prefs_post.html +++ b/phpBB/styles/subSilver/template/ucp_prefs_post.html @@ -11,19 +11,19 @@ - + - + - + - + diff --git a/phpBB/styles/subSilver/template/ucp_prefs_view.html b/phpBB/styles/subSilver/template/ucp_prefs_view.html index d3495b5346..41b6cd88cd 100644 --- a/phpBB/styles/subSilver/template/ucp_prefs_view.html +++ b/phpBB/styles/subSilver/template/ucp_prefs_view.html @@ -11,28 +11,28 @@ - + - + - + - + - + - + diff --git a/phpBB/styles/subSilver/template/ucp_profile_avatar.html b/phpBB/styles/subSilver/template/ucp_profile_avatar.html index 7ae30a7d63..1cd5b76064 100644 --- a/phpBB/styles/subSilver/template/ucp_profile_avatar.html +++ b/phpBB/styles/subSilver/template/ucp_profile_avatar.html @@ -11,7 +11,7 @@ - + @@ -59,7 +59,7 @@ - + diff --git a/phpBB/styles/subSilver/template/ucp_profile_signature.html b/phpBB/styles/subSilver/template/ucp_profile_signature.html index f36eff9a58..01b0b58a10 100644 --- a/phpBB/styles/subSilver/template/ucp_profile_signature.html +++ b/phpBB/styles/subSilver/template/ucp_profile_signature.html @@ -42,7 +42,7 @@ e_help = "{LA_BBCODE_E_HELP}"; - +
{L_DISABLE_BBCODE}
{L_DISABLE_SMILIES}
{L_DISABLE_MAGIC_URL}
{L_ATTACH_SIG}
{L_NOTIFY_REPLY}
{L_LOCK_TOPIC}
{L_LOCK_POST} [{L_LOCK_POST_EXPLAIN}]
 {L_CHANGE_TOPIC_TO}{L_POST_TOPIC_AS}: {topic_type.L_TOPIC_TYPE}  {L_CHANGE_TOPIC_TO}{L_POST_TOPIC_AS}: {topic_type.L_TOPIC_TYPE}  
{L_POLL_DELETE}:
{L_POLL_VOTE_CHANGE}:
{L_POLL_VOTE_CHANGE_EXPLAIN}
{L_POLL_DELETE}
- + - + {poll_option.POLL_OPTION_CAPTION}
{L_REPORT_NOTIFY}:
{L_REPORT_NOTIFY_EXPLAIN}		 checked="checked" />  {L_YES}   checked="checked" />  {L_NO} checked="checked" />  {L_YES}   checked="checked" />  {L_NO}
 {attachrow.POST_TIME}  {attachrow.SIZE} {attachrow.DOWNLOAD_COUNT}
-
checked="checked" /> {L_PARSE_BBCODE}   checked="checked" /> {L_PARSE_SMILIES}   checked="checked" /> {L_PARSE_URLS} +
checked="checked" /> {L_PARSE_BBCODE}   checked="checked" /> {L_PARSE_SMILIES}   checked="checked" /> {L_PARSE_URLS}

{L_AVATAR_EXPLAIN}		{AVATAR_IMAGE}

 {L_DELETE_AVATAR}		{AVATAR_IMAGE}

 {L_DELETE_AVATAR}
{L_YES}{L_NO} {member.JOINED} {member.USER_POSTS}
checked="checked" value="{leader.GROUP_ID}" /> checked="checked" value="{leader.GROUP_ID}" /> {leader.GROUP_NAME}
{leader.GROUP_DESC}
{leader.GROUP_STATUS}
checked="checked" value="{member.GROUP_ID}" /> checked="checked" value="{member.GROUP_ID}" /> {member.GROUP_NAME}
{member.GROUP_DESC}
{member.GROUP_STATUS}
 {L_MOVE_UP} | {L_MOVE_DOWN} 
{L_LOAD_DRAFT}
{L_VIEW_EDIT}
{forumrow.FORUM_FOLDER_IMG}

{forumrow.FORUM_NAME}

 {forumrow.LAST_POST_TIME}
{forumrow.LAST_POST_AUTHOR}{forumrow.LAST_POST_AUTHOR} {forumrow.LAST_POST_IMG}{L_NO_POSTS}
  {L_MOVE_DELETED_MESSAGES_TO}   {L_MOVE_DELETED_MESSAGES_TO}  
  {L_DELETE_MESSAGES_IN_FOLDER} {L_DELETE_MESSAGES_IN_FOLDER}
 
{L_IF_FOLDER_FULL}:  {L_DELETE_OLDEST_MESSAGES} {L_DELETE_OLDEST_MESSAGES}
  {L_MOVE_TO_FOLDER}:  {L_MOVE_TO_FOLDER}:
  {L_HOLD_NEW_MESSAGES} {L_HOLD_NEW_MESSAGES}
{L_DEFAULT_ACTION}:
{L_DEFAULT_ACTION_EXPLAIN}

{messagerow.RECIPIENTS}{messagerow.MESSAGE_AUTHOR}

{messagerow.SENT_TIME}
{L_SHOW_EMAIL}: checked="checked" />{L_YES}   checked="checked" />{L_NO} checked="checked" />{L_YES}   checked="checked" />{L_NO}
{L_ADMIN_EMAIL}: checked="checked" />{L_YES}   checked="checked" />{L_NO} checked="checked" />{L_YES}   checked="checked" />{L_NO}
{L_ALLOW_PM}:
{L_ALLOW_PM_EXPLAIN}		 checked="checked" />{L_YES}   checked="checked" />{L_NO} checked="checked" />{L_YES}   checked="checked" />{L_NO}
{L_HIDE_ONLINE}: checked="checked" />{L_YES}   checked="checked" />{L_NO} checked="checked" />{L_YES}   checked="checked" />{L_NO}
{L_NOTIFY_METHOD}:
{L_NOTIFY_METHOD_EXPLAIN}		 checked="checked" />{L_NOTIFY_METHOD_EMAIL}   checked="checked" />{L_NOTIFY_METHOD_IM}   checked="checked" />{L_NOTIFY_METHOD_BOTH} checked="checked" />{L_NOTIFY_METHOD_EMAIL}   checked="checked" />{L_NOTIFY_METHOD_IM}   checked="checked" />{L_NOTIFY_METHOD_BOTH}
{L_NOTIFY_ON_PM}: checked="checked" />{L_YES}   checked="checked" />{L_NO} checked="checked" />{L_YES}   checked="checked" />{L_NO}
{L_POPUP_ON_PM}: checked="checked" />{L_YES}   checked="checked" />{L_NO} checked="checked" />{L_YES}   checked="checked" />{L_NO}
{L_BOARD_LANGUAGE}:
{L_BOARD_DST}: checked="checked" /> {L_YES}   checked="checked" /> {L_NO} checked="checked" /> {L_YES}   checked="checked" /> {L_NO}
{L_BOARD_DATE_FORMAT}:
{L_BOARD_DATE_FORMAT_EXPLAIN}
{L_DEFAULT_BBCODE}: checked="checked" />{L_YES}    checked="checked" />{L_NO} checked="checked" />{L_YES}    checked="checked" />{L_NO}
{L_DEFAULT_SMILIES}: checked="checked" />{L_YES}    checked="checked" />{L_NO} checked="checked" />{L_YES}    checked="checked" />{L_NO}
{L_DEFAULT_ADD_SIG}: checked="checked" />{L_YES}    checked="checked" />{L_NO} checked="checked" />{L_YES}    checked="checked" />{L_NO}
{L_DEFAULT_NOTIFY}: checked="checked" />{L_YES}    checked="checked" />{L_NO} checked="checked" />{L_YES}    checked="checked" />{L_NO}
{S_HIDDEN_FIELDS}  
{L_VIEW_IMAGES}: checked="checked" />{L_YES}    checked="checked" />{L_NO} checked="checked" />{L_YES}    checked="checked" />{L_NO}
{L_VIEW_FLASH}: checked="checked" />{L_YES}    checked="checked" />{L_NO} checked="checked" />{L_YES}    checked="checked" />{L_NO}
{L_VIEW_SMILIES}: checked="checked" />{L_YES}    checked="checked" />{L_NO} checked="checked" />{L_YES}    checked="checked" />{L_NO}
{L_VIEW_SIGS}: checked="checked" />{L_YES}    checked="checked" />{L_NO} checked="checked" />{L_YES}    checked="checked" />{L_NO}
{L_VIEW_AVATARS}: checked="checked" />{L_YES}    checked="checked" />{L_NO} checked="checked" />{L_YES}    checked="checked" />{L_NO}
{L_DISABLE_CENSORS}: checked="checked" />{L_YES}    checked="checked" />{L_NO} checked="checked" />{L_YES}    checked="checked" />{L_NO}
{L_CURRENT_IMAGE}:
{L_AVATAR_EXPLAIN}
{AVATAR}

 {L_DELETE_AVATAR}
{AVATAR}

 {L_DELETE_AVATAR}
{L_SIGNATURE}:
{L_SIGNATURE_EXPLAIN}		{L_SIGNATURE}:
{L_SIGNATURE_EXPLAIN}		 - +
@@ -80,14 +80,14 @@ e_help = "{LA_BBCODE_E_HELP}";
- @@ -113,18 +113,18 @@ e_help = "{LA_BBCODE_E_HELP}"; diff --git a/phpBB/styles/subSilver/template/viewtopic_body.html b/phpBB/styles/subSilver/template/viewtopic_body.html index fcda0750c4..6362199c5e 100644 --- a/phpBB/styles/subSilver/template/viewtopic_body.html +++ b/phpBB/styles/subSilver/template/viewtopic_body.html @@ -70,9 +70,9 @@
- + - + - +
{L_DISABLE_BBCODE}
{L_DISABLE_SMILIES}
{L_DISABLE_MAGIC_URL}
- checked="checked" /> + checked="checked" /> - checked="checked" /> + checked="checked" />