From f08c01f099fd89bcc3c1871efa62e5080d5e990b Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Mon, 15 Oct 2007 17:27:22 +0000 Subject: [PATCH 01/65] erm... i am very very sorry... but i think this one is responsible for the loops people still experience. :o git-svn-id: file:///svn/phpbb/trunk@8196 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/install/install_update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 320747b60b..4277246b07 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -604,7 +604,7 @@ class install_update extends module // Before we do anything, let us diff the files and store the raw file information "somewhere" $get_files = false; - $file_list = false; //$cache->get('_diff_files'); + $file_list = $cache->get('_diff_files'); if ($file_list === false || $file_list['status'] != -1) { From 83251720de42c0207dee47961de7b93fedd05354 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Mon, 15 Oct 2007 18:06:40 +0000 Subject: [PATCH 02/65] indeed. #14789 git-svn-id: file:///svn/phpbb/trunk@8197 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/acp/acp_forums.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 39d437b725..27e54a38a0 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -45,7 +45,7 @@ class acp_forums if ($update && !check_form_key($form_key)) { $update = false; - $error[] = $user->lang['FORM_INVALID']; + $errors[] = $user->lang['FORM_INVALID']; } // Check additional permissions From aee82d3a308b8df995b4418dcbdd15b409878542 Mon Sep 17 00:00:00 2001 From: David M Date: Tue, 16 Oct 2007 14:59:39 +0000 Subject: [PATCH 03/65] MSSQL works properly with SQL update related tools git-svn-id: file:///svn/phpbb/trunk@8198 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 6 ++++++ phpBB/includes/db/db_tools.php | 2 +- phpBB/install/database_update.php | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 7d92aa6a5a..4d47a6be41 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -78,6 +78,12 @@
+

1.i. Changes since 3.0.RC7

+ +
    +
  • [Fix] Fixed MSSQL related bug in the update system
    • +
+

1.i. Changes since 3.0.RC6

    diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php index 589ca39258..ee8825f136 100644 --- a/phpBB/includes/db/db_tools.php +++ b/phpBB/includes/db/db_tools.php @@ -500,7 +500,7 @@ class phpbb_db_tools case 'mssql': $sql = "SELECT c.name FROM syscolumns c - LEFT JOIN sysobjects o (ON c.id = o.id) + LEFT JOIN sysobjects o ON c.id = o.id WHERE o.name = '{$table}'"; $result = $this->db->sql_query($sql); while ($row = $this->db->sql_fetchrow($result)) diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 4d878b15c0..4c4c1eb690 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1759,7 +1759,7 @@ function column_exists($dbms, $table, $column_name) case 'mssql': $sql = "SELECT c.name FROM syscolumns c - LEFT JOIN sysobjects o (ON c.id = o.id) + LEFT JOIN sysobjects o ON c.id = o.id WHERE o.name = '{$table}'"; $result = $db->sql_query($sql); while ($row = $db->sql_fetchrow($result)) From fe66d104a6d89ccfc2185ccd078d9b14842e0d32 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Tue, 16 Oct 2007 22:11:32 +0000 Subject: [PATCH 04/65] Lesson learned. git-svn-id: file:///svn/phpbb/trunk@8199 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index ab27b62656..f55a5b4d39 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2034,7 +2034,8 @@ function check_form_key($form_name, $timespan = false, $return_page = '', $trigg if ($timespan === false) { - $timespan = $config['form_token_lifetime']; + // we enforce a minimum value of half a minute here. + $timespan = max(30, $config['form_token_lifetime']); } if ($minimum_time === false) { From d095649a655ce7dfeae124b2946dadc5248eafc4 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Wed, 17 Oct 2007 15:01:56 +0000 Subject: [PATCH 05/65] - Display "Return to" links on unwritable forums [Bug #14824] git-svn-id: file:///svn/phpbb/trunk@8200 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 3 ++- phpBB/styles/prosilver/template/jumpbox.html | 4 ++-- phpBB/viewforum.php | 1 + phpBB/viewtopic.php | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 4d47a6be41..d403b7bd28 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -78,10 +78,11 @@
    -

    1.i. Changes since 3.0.RC7

    +

    1.i. Changes since 3.0.RC7

    • [Fix] Fixed MSSQL related bug in the update system
      • +
    • [Fix] Display "Return to" links on unwritable forums (Bug #14824)

    1.i. Changes since 3.0.RC6

    diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html index 323668628d..cf98701c78 100644 --- a/phpBB/styles/prosilver/template/jumpbox.html +++ b/phpBB/styles/prosilver/template/jumpbox.html @@ -2,9 +2,9 @@
    - +

    {L_RETURN_TO} {FORUM_NAME}

    - +

    {L_RETURN_TO} {L_INDEX}

    {L_RETURN_TO}: {SEARCH_TOPIC}

    diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 46a5ccf5e7..c7888505cd 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -627,6 +627,7 @@ if (sizeof($topic_list)) 'S_POST_STICKY' => ($row['topic_type'] == POST_STICKY) ? true : false, 'S_TOPIC_LOCKED' => ($row['topic_status'] == ITEM_LOCKED) ? true : false, 'S_TOPIC_MOVED' => ($row['topic_status'] == ITEM_MOVED) ? true : false, + 'S_VIEWFORUM' => true, 'U_NEWEST_POST' => $view_topic_url . '&view=unread#unread', 'U_LAST_POST' => $view_topic_url . '&p=' . $row['topic_last_post_id'] . '#p' . $row['topic_last_post_id'], diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 9d2a6b61c0..32b35a2060 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1425,6 +1425,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) 'S_FIRST_UNREAD' => $s_first_unread, 'S_CUSTOM_FIELDS' => (isset($cp_row['row']) && sizeof($cp_row['row'])) ? true : false, 'S_TOPIC_POSTER' => ($topic_data['topic_poster'] == $poster_id) ? true : false, + 'S_VIEWTOPIC' => true, 'S_IGNORE_POST' => ($row['hide_post']) ? true : false, 'L_IGNORE_POST' => ($row['hide_post']) ? sprintf($user->lang['POST_BY_FOE'], get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), '', '') : '', From 7b1a8511ce1ae8e240720afe253618fb0866cac2 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Wed, 17 Oct 2007 15:47:18 +0000 Subject: [PATCH 06/65] fixing one severe bug showing since 5.2.4 git-svn-id: file:///svn/phpbb/trunk@8201 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 14 ++++++++------ phpBB/includes/functions.php | 16 +++++++++++++++- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index d403b7bd28..77c6e500e8 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -53,6 +53,7 @@
    1. Changelog
        +
      1. Changes since RC-7
      2. Changes since RC-6
      3. Changes since RC-5
      4. Changes since RC-4
        5. @@ -83,9 +84,10 @@
        • [Fix] Fixed MSSQL related bug in the update system
        • [Fix] Display "Return to" links on unwritable forums (Bug #14824)
          • +
        • [Fix] Mitigating different realpath() handling between PHP versions (fixing confirm box redirects)
        -

        1.i. Changes since 3.0.RC6

        +

        1.ii. Changes since 3.0.RC6

        • [Fix] Submitting language changes using acp_language (Bug #14736)
          • @@ -95,7 +97,7 @@
        • [Fix] Able to request new password (Bug #14743)
        -

        1.ii. Changes since 3.0.RC5

        +

        1.iii. Changes since 3.0.RC5

        • [Feature] Removing constant PHPBB_EMBEDDED in favor of using an exit_handler(); the constant was meant to achive this more or less.
          • @@ -158,7 +160,7 @@
        • [Sec] New password hashing mechanism for storing passwords (#i42)
        -

        1.iii. Changes since 3.0.RC4

        +

        1.iv. Changes since 3.0.RC4

        • [Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)
          • @@ -209,7 +211,7 @@
        • [Fix] odbc_autocommit causing existing result sets to be dropped (Bug #14182)
        -

        1.iv. Changes since 3.0.RC3

        +

        1.v. Changes since 3.0.RC3

        • [Fix] Fixing some subsilver2 and prosilver style issues
          • @@ -318,7 +320,7 @@
        -

        1.v. Changes since 3.0.RC2

        +

        1.vi. Changes since 3.0.RC2

        • [Fix] Re-allow searching within the memberlist
          • @@ -364,7 +366,7 @@
        -

        1.vi. Changes since 3.0.RC1

        +

        1.vii. Changes since 3.0.RC1

        • [Fix] (X)HTML issues within the templates (Bug #11255, #11255)
          • diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index f55a5b4d39..80a6faceca 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -683,6 +683,12 @@ if (!function_exists('realpath')) // Put the slashes back to the native operating systems slashes $resolved = str_replace('/', DIRECTORY_SEPARATOR, $resolved); + // Check for DIRECTORY_SEPARATOR at the end (and remove it!) + if (substr($resolved, -1) == DIRECTORY_SEPARATOR) + { + return substr($resolved, 0, -1); + } + return $resolved; // We got here, in the end! } } @@ -694,7 +700,15 @@ else */ function phpbb_realpath($path) { - return realpath($path); + $path = realpath($path); + + // Check for DIRECTORY_SEPARATOR at the end (and remove it!) + if (substr($path, -1) == DIRECTORY_SEPARATOR) + { + return substr($path, 0, -1); + } + + return $path; } } From 6e530cb85128e5121606493dcad0962d7c5c1499 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Thu, 18 Oct 2007 17:44:02 +0000 Subject: [PATCH 07/65] make the ban check perform a bit better :/ git-svn-id: file:///svn/phpbb/trunk@8202 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions_user.php | 12 +++++++++--- phpBB/includes/session.php | 29 ++++++++++++++++++++--------- 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 8501175d5f..95a92d93af 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -659,7 +659,7 @@ function user_active_flip($mode, $user_id_ary, $reason = INACTIVE_MANUAL) */ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reason, $ban_give_reason = '') { - global $db, $user, $auth; + global $db, $user, $auth, $cache; // Delete stale bans $sql = 'DELETE FROM ' . BANLIST_TABLE . ' @@ -1043,10 +1043,14 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas add_log('admin', $log_entry . strtoupper($mode), $ban_reason, $ban_list_log); add_log('mod', 0, 0, $log_entry . strtoupper($mode), $ban_reason, $ban_list_log); + $cache->destroy('sql', BANLIST_TABLE); + return true; } - // There was nothing to ban/exclude + // There was nothing to ban/exclude. But destroying the cache because of the removal of stale bans. + $cache->destroy('sql', BANLIST_TABLE); + return false; } @@ -1055,7 +1059,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas */ function user_unban($mode, $ban) { - global $db, $user, $auth; + global $db, $user, $auth, $cache; // Delete stale bans $sql = 'DELETE FROM ' . BANLIST_TABLE . ' @@ -1112,6 +1116,8 @@ function user_unban($mode, $ban) add_log('mod', 0, 0, 'LOG_UNBAN_' . strtoupper($mode), $l_unban_list); } + $cache->destroy('sql', BANLIST_TABLE); + return false; } diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 6ddc97fff8..7ca2cbcdd0 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -905,48 +905,59 @@ class session } $banned = false; + $cache_ttl = 3600; + $where_sql = array(); $sql = 'SELECT ban_ip, ban_userid, ban_email, ban_exclude, ban_give_reason, ban_end FROM ' . BANLIST_TABLE . ' - WHERE (ban_end >= ' . time() . ' OR ban_end = 0)'; + WHERE '; // Determine which entries to check, only return those if ($user_email === false) { - $sql .= " AND ban_email = ''"; + $where_sql[] = "ban_email = ''"; } if ($user_ips === false) { - $sql .= " AND (ban_ip = '' OR ban_exclude = 1)"; + $where_sql[] = "(ban_ip = '' OR ban_exclude = 1)"; } if ($user_id === false) { - $sql .= ' AND (ban_userid = 0 OR ban_exclude = 1)'; + $where_sql[] = '(ban_userid = 0 OR ban_exclude = 1)'; } else { - $sql .= ' AND (ban_userid = ' . $user_id; + $cache_ttl = ($user_id == ANONYMOUS) ? 3600 : 0; + $_sql = '(ban_userid = ' . $user_id; if ($user_email !== false) { - $sql .= " OR ban_email <> ''"; + $_sql .= " OR ban_email <> ''"; } if ($user_ips !== false) { - $sql .= " OR ban_ip <> ''"; + $_sql .= " OR ban_ip <> ''"; } - $sql .= ')'; + $_sql .= ')'; + + $where_sql[] = $_sql; } - $result = $db->sql_query($sql); + $sql .= (sizeof($where_sql)) ? implode(' AND ', $where_sql) : ''; + $result = $db->sql_query($sql, $cache_ttl); $ban_triggered_by = 'user'; while ($row = $db->sql_fetchrow($result)) { + if ($row['ban_end'] && $row['ban_end'] < time()) + { + continue; + } + $ip_banned = false; if (!empty($row['ban_ip'])) { From 8963b032de7c14151d9432ca208038c4f515d961 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Thu, 18 Oct 2007 18:25:06 +0000 Subject: [PATCH 08/65] #14834 - at least probably git-svn-id: file:///svn/phpbb/trunk@8203 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions_user.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 95a92d93af..32dee77df6 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -2035,7 +2035,7 @@ function avatar_gallery($category, $avatar_select, $items_per_column, $block_var } @ksort($avatar_list); - + $category = (!$category) ? key($avatar_list) : $category; $avatar_categories = array_keys($avatar_list); @@ -2050,8 +2050,8 @@ function avatar_gallery($category, $avatar_select, $items_per_column, $block_var 'S_IN_AVATAR_GALLERY' => true, 'S_CAT_OPTIONS' => $s_category_options) ); - - $avatar_list = $avatar_list[$category]; + + $avatar_list = (isset($avatar_list[$category])) ? $avatar_list[$category] : array(); foreach ($avatar_list as $avatar_row_ary) { From bc0898f55e2c0bda196fa44cc7d1bb15b6fda649 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Fri, 19 Oct 2007 13:10:13 +0000 Subject: [PATCH 09/65] fixing some annoying bugs git-svn-id: file:///svn/phpbb/trunk@8204 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 7 ++ phpBB/includes/acp/acp_users.php | 15 ++- phpBB/includes/functions_privmsgs.php | 91 +++++++++++-------- phpBB/includes/functions_user.php | 4 +- phpBB/includes/mcp/mcp_warn.php | 2 +- phpBB/includes/message_parser.php | 17 +++- phpBB/includes/ucp/ucp_activate.php | 3 +- phpBB/includes/ucp/ucp_pm.php | 9 +- .../prosilver/template/overall_header.html | 3 +- 9 files changed, 100 insertions(+), 51 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 77c6e500e8..e7cdbe9a8b 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -85,6 +85,13 @@
        • [Fix] Fixed MSSQL related bug in the update system
        • [Fix] Display "Return to" links on unwritable forums (Bug #14824)
        • [Fix] Mitigating different realpath() handling between PHP versions (fixing confirm box redirects)
          • +
        • [Fix] Fix signature editing - ability to remove signature (Bug #14820)
          • +
        • [Fix] Send correct activation key by forcing reactivation for inactive user (Bug #14819)
          • +
        • [Fix] Adding correct IP for private messages sent by issuing warnings (Bug #14781)
          • +
        • [Fix] Open private message notification (Bug #14773)
          • +
        • [Fix] Fixing false new private message indicator (Bug #14627)
          • +
        • [Fix] Let newly activated passwords work if users were converted (Bug #14787)
          • +
        • [Fix] Quote bbcode fixes. Letting parse quote="[" and re-allowing whitelisted bbcodes within username portion (Bug #14770)

        1.ii. Changes since 3.0.RC6

        diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 344df3169d..833d8e0173 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -322,6 +322,16 @@ class acp_users WHERE user_id = $user_id"; $db->sql_query($sql); } + else + { + // Grabbing the last confirm key - we only send a reminder + $sql = 'SELECT user_actkey + FROM ' . USERS_TABLE . ' + WHERE user_id = ' . $user_id; + $result = $db->sql_query($sql); + $user_actkey = (string) $db->sql_fetchfield('user_actkey'); + $db->sql_freeresult($result); + } $messenger = new messenger(false); @@ -774,8 +784,9 @@ class acp_users if ($update_password) { $sql_ary += array( - 'user_password' => phpbb_hash($data['new_password']), - 'user_passchg' => time(), + 'user_password' => phpbb_hash($data['new_password']), + 'user_passchg' => time(), + 'user_pass_convert' => 0, ); $user->reset_login_keys($user_id); diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 68e77ec421..d33ecf603f 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -312,6 +312,50 @@ function check_rule(&$rules, &$rule_row, &$message_row, $user_id) return false; } +/** +* Fix user PM count +*/ +function fix_pm_counts() +{ + global $user, $db; + + // Update unread count + $sql = 'SELECT COUNT(msg_id) as num_messages + FROM ' . PRIVMSGS_TO_TABLE . ' + WHERE pm_unread = 1 + AND folder_id <> ' . PRIVMSGS_OUTBOX . ' + AND user_id = ' . $user->data['user_id']; + $result = $db->sql_query($sql); + $user->data['user_unread_privmsg'] = (int) $db->sql_fetchfield('num_messages'); + $db->sql_freeresult($result); + + // Update new pm count + $sql = 'SELECT COUNT(msg_id) as num_messages + FROM ' . PRIVMSGS_TO_TABLE . ' + WHERE pm_new = 1 + AND folder_id IN (' . PRIVMSGS_NO_BOX . ', ' . PRIVMSGS_HOLD_BOX . ') + AND user_id = ' . $user->data['user_id']; + $result = $db->sql_query($sql); + $user->data['user_new_privmsg'] = (int) $db->sql_fetchfield('num_messages'); + $db->sql_freeresult($result); + + $db->sql_query('UPDATE ' . USERS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', array( + 'user_unread_privmsg' => (int) $user->data['user_unread_privmsg'], + 'user_new_privmsg' => (int) $user->data['user_new_privmsg'], + )) . ' WHERE user_id = ' . $user->data['user_id']); + + // Ok, here we need to repair something, other boxes than privmsgs_no_box and privmsgs_hold_box should not carry the pm_new flag. + if (!$user->data['user_new_privmsg']) + { + $sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . ' + SET pm_new = 0 + WHERE pm_new = 1 + AND folder_id NOT IN (' . PRIVMSGS_NO_BOX . ', ' . PRIVMSGS_HOLD_BOX . ') + AND user_id = ' . $user->data['user_id']; + $db->sql_query($sql); + } +} + /** * Place new messages into appropriate folder */ @@ -344,42 +388,7 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false) // We try to fix this on our way down... if (!$db->sql_affectedrows()) { - // Update unread count - $sql = 'SELECT COUNT(msg_id) as num_messages - FROM ' . PRIVMSGS_TO_TABLE . ' - WHERE pm_unread = 1 - AND folder_id <> ' . PRIVMSGS_OUTBOX . ' - AND user_id = ' . $user_id; - $result = $db->sql_query($sql); - $num_messages = (int) $db->sql_fetchfield('num_messages'); - $db->sql_freeresult($result); - - $db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_unread_privmsg = ' . $num_messages . ' WHERE user_id = ' . $user_id); - $user->data['user_unread_privmsg'] = $num_messages; - - // Update new pm count - $sql = 'SELECT COUNT(msg_id) as num_messages - FROM ' . PRIVMSGS_TO_TABLE . ' - WHERE pm_new = 1 - AND folder_id IN (' . PRIVMSGS_NO_BOX . ', ' . PRIVMSGS_HOLD_BOX . ') - AND user_id = ' . $user_id; - $result = $db->sql_query($sql); - $num_messages = (int) $db->sql_fetchfield('num_messages'); - $db->sql_freeresult($result); - - $db->sql_query('UPDATE ' . USERS_TABLE . ' SET user_new_privmsg = ' . $num_messages . ' WHERE user_id = ' . $user_id); - $user->data['user_new_privmsg'] = $num_messages; - - // Ok, here we need to repair something, other boxes than privmsgs_no_box and privmsgs_hold_box should not carry the pm_new flag. - if (!$num_messages) - { - $sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . ' - SET pm_new = 0 - WHERE pm_new = 1 - AND folder_id NOT IN (' . PRIVMSGS_NO_BOX . ', ' . PRIVMSGS_HOLD_BOX . ') - AND user_id = ' . $user_id; - $db->sql_query($sql); - } + fix_pm_counts(); // The function needs this value to be up-to-date $user_new_privmsg = (int) $user->data['user_new_privmsg']; @@ -413,7 +422,7 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false) while ($row = $db->sql_fetchrow($result)) { $action_ary[$row['msg_id']][] = array('action' => false); - $move_into_folder[PRIVMSGS_INBOX][] = $row['msg_id']; +// $move_into_folder[PRIVMSGS_INBOX][] = $row['msg_id']; } $db->sql_freeresult($result); } @@ -501,7 +510,7 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false) if (!$is_match) { $action_ary[$row['msg_id']][] = array('action' => false); - $move_into_folder[PRIVMSGS_INBOX][] = $row['msg_id']; +// $move_into_folder[PRIVMSGS_INBOX][] = $row['msg_id']; } } @@ -688,7 +697,11 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false) if ($full_folder_action == FULL_FOLDER_HOLD) { $num_not_moved += sizeof($msg_ary); - $num_new -= sizeof($msg_ary); + + if ($num_new) + { + $num_new -= sizeof($msg_ary); + } $sql = 'UPDATE ' . PRIVMSGS_TO_TABLE . ' SET folder_id = ' . PRIVMSGS_HOLD_BOX . ' diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 32dee77df6..b3be975d00 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -2035,7 +2035,7 @@ function avatar_gallery($category, $avatar_select, $items_per_column, $block_var } @ksort($avatar_list); - + $category = (!$category) ? key($avatar_list) : $category; $avatar_categories = array_keys($avatar_list); @@ -2050,7 +2050,7 @@ function avatar_gallery($category, $avatar_select, $items_per_column, $block_var 'S_IN_AVATAR_GALLERY' => true, 'S_CAT_OPTIONS' => $s_category_options) ); - + $avatar_list = (isset($avatar_list[$category])) ? $avatar_list[$category] : array(); foreach ($avatar_list as $avatar_row_ary) diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php index cab102f1f7..315a2c1362 100755 --- a/phpBB/includes/mcp/mcp_warn.php +++ b/phpBB/includes/mcp/mcp_warn.php @@ -418,7 +418,7 @@ function add_warning($user_row, $warning, $send_pm = true, $post_id = 0) $pm_data = array( 'from_user_id' => $user->data['user_id'], - 'from_user_ip' => $user->data['user_ip'], + 'from_user_ip' => $user->ip, 'from_username' => $user->data['username'], 'enable_sig' => false, 'enable_bbcode' => true, diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 311c75b410..f7ae685e95 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -674,7 +674,11 @@ class bbcode_firstpass extends bbcode /** * If you change this code, make sure the cases described within the following reports are still working: - * #3572, #14667 + * #3572 - [quote="[test]test"]test [ test[/quote] - (correct: parsed) + * #14667 - [quote]test[/quote] test ] and [ test [quote]test[/quote] (correct: parsed) + * #14770 - [quote="["]test[/quote] (correct: parsed) + * [quote="[i]test[/i]"]test[/quote] (correct: parsed) + * [quote="[quote]test[/quote]"]test[/quote] (correct: NOT parsed) */ $in = str_replace("\r\n", "\n", str_replace('\"', '"', trim($in))); @@ -684,6 +688,9 @@ class bbcode_firstpass extends bbcode return ''; } + // To let the parser not catch tokens within quote_username quotes we encode them before we start this... + $in = preg_replace('#quote="(.*?)"\]#ie', "'quote="' . str_replace(array('[', ']'), array('[', ']'), '\$1') . '"]'", $in); + $tok = ']'; $out = '['; @@ -745,7 +752,9 @@ class bbcode_firstpass extends bbcode if (isset($m[1]) && $m[1]) { - $username = preg_replace('#\[(?!b|i|u|color|url|email|/b|/i|/u|/color|/url|/email)#iU', '[$1', $m[1]); + $username = str_replace(array('[', ']'), array('[', ']'), $m[1]); + $username = preg_replace('#\[(?!b|i|u|color|url|email|/b|/i|/u|/color|/url|/email)#iU', '[$1', $username); + $end_tags = array(); $error = false; @@ -765,7 +774,7 @@ class bbcode_firstpass extends bbcode if ($error) { - $username = str_replace('[', '[', str_replace(']', ']', $m[1])); + $username = $m[1]; } $out .= 'quote="' . $username . '":' . $this->bbcode_uid . ']'; @@ -1073,7 +1082,7 @@ class parse_message extends bbcode_firstpass } // Check for "empty" message - if (!utf8_clean_string($this->message)) + if ($mode !== 'sig' && !utf8_clean_string($this->message)) { $this->warn_msg[] = $user->lang['TOO_FEW_CHARS']; return $this->warn_msg; diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php index 134729ffe9..355c9898c2 100644 --- a/phpBB/includes/ucp/ucp_activate.php +++ b/phpBB/includes/ucp/ucp_activate.php @@ -63,7 +63,8 @@ class ucp_activate $sql_ary = array( 'user_actkey' => '', 'user_password' => $user_row['user_newpasswd'], - 'user_newpasswd' => '' + 'user_newpasswd' => '', + 'user_pass_convert' => 0, ); $sql = 'UPDATE ' . USERS_TABLE . ' diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php index e843e89139..9ad6766ee8 100644 --- a/phpBB/includes/ucp/ucp_pm.php +++ b/phpBB/includes/ucp/ucp_pm.php @@ -249,10 +249,11 @@ class ucp_pm // If new messages arrived, place them into the appropriate folder $num_not_moved = $num_removed = 0; + $release = request_var('release', 0); if ($user->data['user_new_privmsg'] && $action == 'view_folder') { - $return = place_pm_into_folder($global_privmsgs_rules, request_var('release', 0)); + $return = place_pm_into_folder($global_privmsgs_rules, $release); $num_not_moved = $return['not_moved']; // Make sure num_not_moved is valid. @@ -270,6 +271,12 @@ class ucp_pm $num_removed = $return['deleted']; } + // If user released the message, we will re-calculate the statistics (again) + if ($release) + { + fix_pm_counts(); + } + if (!$msg_id && $folder_id == PRIVMSGS_NO_BOX) { $folder_id = PRIVMSGS_INBOX; diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 754f92ab0c..40547b5e6f 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -38,7 +38,8 @@ if ({S_NEW_PM}) { - popup('{UA_POPUP_PM}', 400, 225, '_phpbbprivmsg'); + var url = '{UA_POPUP_PM}'; + window.open(url.replace(/&/g, '&'), '_phpbbprivmsg', 'height=225,resizable=yes,scrollbars=yes, width=400'); } From 1a1a925e8f1c3e1504a9cca0a62b39a4742777af Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Fri, 19 Oct 2007 13:34:31 +0000 Subject: [PATCH 10/65] erm, switches could be more useful if not within a loop. ;) and :P git-svn-id: file:///svn/phpbb/trunk@8205 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/styles/prosilver/template/jumpbox.html | 20 ++++++++++---------- phpBB/viewforum.php | 2 +- phpBB/viewtopic.php | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html index cf98701c78..b46173f03e 100644 --- a/phpBB/styles/prosilver/template/jumpbox.html +++ b/phpBB/styles/prosilver/template/jumpbox.html @@ -1,17 +1,17 @@ + +

        {L_RETURN_TO} {FORUM_NAME}

        + +

        {L_RETURN_TO} {L_INDEX}

        + +

        {L_RETURN_TO}: {SEARCH_TOPIC}

        + +

        {L_RETURN_TO_SEARCH_ADV}

        + + - -

        {L_RETURN_TO} {FORUM_NAME}

        - -

        {L_RETURN_TO} {L_INDEX}

        - -

        {L_RETURN_TO}: {SEARCH_TOPIC}

        - -

        {L_RETURN_TO_SEARCH_ADV}

        - -
        diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index c7888505cd..cb4e44f569 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -292,6 +292,7 @@ $template->assign_vars(array( 'S_SEARCHBOX_ACTION' => append_sid("{$phpbb_root_path}search.$phpEx", 'fid[]=' . $forum_id), 'S_SINGLE_MODERATOR' => (!empty($moderators[$forum_id]) && sizeof($moderators[$forum_id]) > 1) ? false : true, 'S_IS_LOCKED' => ($forum_data['forum_status'] == ITEM_LOCKED) ? true : false, + 'S_VIEWFORUM' => true, 'U_MCP' => ($auth->acl_get('m_', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "f=$forum_id&i=main&mode=forum_view", true, $user->session_id) : '', 'U_POST_NEW_TOPIC' => ($auth->acl_get('f_post', $forum_id) || $user->data['user_id'] == ANONYMOUS) ? append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=post&f=' . $forum_id) : '', @@ -627,7 +628,6 @@ if (sizeof($topic_list)) 'S_POST_STICKY' => ($row['topic_type'] == POST_STICKY) ? true : false, 'S_TOPIC_LOCKED' => ($row['topic_status'] == ITEM_LOCKED) ? true : false, 'S_TOPIC_MOVED' => ($row['topic_status'] == ITEM_MOVED) ? true : false, - 'S_VIEWFORUM' => true, 'U_NEWEST_POST' => $view_topic_url . '&view=unread#unread', 'U_LAST_POST' => $view_topic_url . '&p=' . $row['topic_last_post_id'] . '#p' . $row['topic_last_post_id'], diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 32b35a2060..c44d413f60 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -572,6 +572,7 @@ $template->assign_vars(array( 'S_TOPIC_MOD' => ($topic_mod != '') ? '' : '', 'S_MOD_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", "f=$forum_id&t=$topic_id&quickmod=1&redirect=" . urlencode(str_replace('&', '&', $viewtopic_url)), true, $user->session_id), + 'S_VIEWTOPIC' => true, '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", 't=' . $topic_id), @@ -1425,7 +1426,6 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) 'S_FIRST_UNREAD' => $s_first_unread, 'S_CUSTOM_FIELDS' => (isset($cp_row['row']) && sizeof($cp_row['row'])) ? true : false, 'S_TOPIC_POSTER' => ($topic_data['topic_poster'] == $poster_id) ? true : false, - 'S_VIEWTOPIC' => true, 'S_IGNORE_POST' => ($row['hide_post']) ? true : false, 'L_IGNORE_POST' => ($row['hide_post']) ? sprintf($user->lang['POST_BY_FOE'], get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), '', '') : '', From 5d8ac9a393d145bafdcec94e1a60e7afd7379161 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Fri, 19 Oct 2007 13:39:29 +0000 Subject: [PATCH 11/65] hmm, let it not be clashed directly beneath buttons git-svn-id: file:///svn/phpbb/trunk@8206 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/styles/prosilver/template/jumpbox.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html index b46173f03e..95324bd161 100644 --- a/phpBB/styles/prosilver/template/jumpbox.html +++ b/phpBB/styles/prosilver/template/jumpbox.html @@ -1,12 +1,12 @@ -

        {L_RETURN_TO} {FORUM_NAME}

        +

        {L_RETURN_TO} {FORUM_NAME}

        -

        {L_RETURN_TO} {L_INDEX}

        +

        {L_RETURN_TO} {L_INDEX}

        -

        {L_RETURN_TO}: {SEARCH_TOPIC}

        +

        {L_RETURN_TO}: {SEARCH_TOPIC}

        -

        {L_RETURN_TO_SEARCH_ADV}

        +

        {L_RETURN_TO_SEARCH_ADV}

        From f31626cec7275790c741d31fc815c775a509aed2 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 20 Oct 2007 10:13:57 +0000 Subject: [PATCH 12/65] #14850 git-svn-id: file:///svn/phpbb/trunk@8207 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_users_signature.html | 2 +- phpBB/adm/style/install_update.html | 2 +- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/acp/acp_styles.php | 5 +++++ phpBB/includes/functions_display.php | 5 +++-- phpBB/styles/prosilver/template/posting_buttons.html | 2 +- phpBB/styles/subsilver2/template/posting_buttons.html | 2 +- 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html index e51b5ab68d..3b6303319b 100644 --- a/phpBB/adm/style/acp_users_signature.html +++ b/phpBB/adm/style/acp_users_signature.html @@ -27,7 +27,7 @@ t: '{LA_BBCODE_T_HELP}', tip: '{L_STYLES_TIP}' - ,cb_{custom_tags.BBCODE_ID}: '{custom_tags.BBCODE_HELPLINE}' + ,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}' } diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html index c9059d8801..318795f4cf 100644 --- a/phpBB/adm/style/install_update.html +++ b/phpBB/adm/style/install_update.html @@ -201,7 +201,7 @@

        {files.TITLE}

        - +

        {files.EXPLAIN}

        diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index e7cdbe9a8b..8913c7148d 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -92,6 +92,7 @@
      5. [Fix] Fixing false new private message indicator (Bug #14627)
      6. [Fix] Let newly activated passwords work if users were converted (Bug #14787)
      7. [Fix] Quote bbcode fixes. Letting parse quote="[" and re-allowing whitelisted bbcodes within username portion (Bug #14770)
        8. +
      8. [Sec] Fix bbcode helpline display for custom bbcodes - this requires style changes for any custom style (Bug #14850)

1.ii. Changes since 3.0.RC6

diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index 9e04ede90b..f4f7f8e56b 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -993,6 +993,11 @@ parse_css_file = {PARSE_CSS_FILE} $filename = "{$cache_prefix}_$file.html.$phpEx"; + if (!file_exists("{$phpbb_root_path}cache/$filename")) + { + continue; + } + $template->assign_block_vars('file', array( 'U_VIEWSOURCE' => $this->u_action . "&action=cache&id=$template_id&source=$file", diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index b75747a862..05630342d1 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -826,8 +826,9 @@ function display_custom_bbcodes() 'BBCODE_NAME' => "'[{$row['bbcode_tag']}]', '[/" . str_replace('=', '', $row['bbcode_tag']) . "]'", 'BBCODE_ID' => $num_predefined_bbcodes + ($i * 2), 'BBCODE_TAG' => $row['bbcode_tag'], - 'BBCODE_HELPLINE' => str_replace(array('&', '"', "'", '<', '>'), array('\&', '\"', '\\\'', '<', '>'), $row['bbcode_helpline'])) - ); + 'BBCODE_HELPLINE' => $row['bbcode_helpline'], + 'A_BBCODE_HELPLINE' => str_replace(array('&', '"', "'", '<', '>'), array('&', '"', "\'", '<', '>'), $row['bbcode_helpline']), + )); $i++; } diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html index c235e49d04..357d20c93b 100644 --- a/phpBB/styles/prosilver/template/posting_buttons.html +++ b/phpBB/styles/prosilver/template/posting_buttons.html @@ -28,7 +28,7 @@ e: '{LA_BBCODE_E_HELP}', d: '{LA_BBCODE_D_HELP}' - ,cb_{custom_tags.BBCODE_ID}: '{custom_tags.BBCODE_HELPLINE}' + ,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}' } diff --git a/phpBB/styles/subsilver2/template/posting_buttons.html b/phpBB/styles/subsilver2/template/posting_buttons.html index b57a273e25..5adfeab6cd 100644 --- a/phpBB/styles/subsilver2/template/posting_buttons.html +++ b/phpBB/styles/subsilver2/template/posting_buttons.html @@ -26,7 +26,7 @@ t: '{LA_BBCODE_T_HELP}', tip: '{L_STYLES_TIP}' - ,cb_{custom_tags.BBCODE_ID}: '{custom_tags.BBCODE_HELPLINE}' + ,cb_{custom_tags.BBCODE_ID}: '{custom_tags.A_BBCODE_HELPLINE}' } From e4b21e5618b0484445dff70afcc266027e94afdd Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 20 Oct 2007 11:17:42 +0000 Subject: [PATCH 13/65] re-allow using external API for flash files, whereby restricting internal API calls. This re-allows displaying external flash files (youtube for example) git-svn-id: file:///svn/phpbb/trunk@8208 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/styles/prosilver/template/attachment.html | 3 ++- phpBB/styles/prosilver/template/bbcode.html | 2 +- phpBB/styles/subsilver2/template/attachment.html | 3 ++- phpBB/styles/subsilver2/template/bbcode.html | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/phpBB/styles/prosilver/template/attachment.html b/phpBB/styles/prosilver/template/attachment.html index f48f49efb4..7472abaee6 100644 --- a/phpBB/styles/prosilver/template/attachment.html +++ b/phpBB/styles/prosilver/template/attachment.html @@ -66,7 +66,8 @@ - + + diff --git a/phpBB/styles/prosilver/template/bbcode.html b/phpBB/styles/prosilver/template/bbcode.html index a600a7c92a..bb90c46ced 100644 --- a/phpBB/styles/prosilver/template/bbcode.html +++ b/phpBB/styles/prosilver/template/bbcode.html @@ -37,4 +37,4 @@ {DESCRIPTION} - \ No newline at end of file + \ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/attachment.html b/phpBB/styles/subsilver2/template/attachment.html index c3352be251..d54994fe67 100644 --- a/phpBB/styles/subsilver2/template/attachment.html +++ b/phpBB/styles/subsilver2/template/attachment.html @@ -63,7 +63,8 @@ - + + diff --git a/phpBB/styles/subsilver2/template/bbcode.html b/phpBB/styles/subsilver2/template/bbcode.html index 19059c5b60..50162740d0 100644 --- a/phpBB/styles/subsilver2/template/bbcode.html +++ b/phpBB/styles/subsilver2/template/bbcode.html @@ -63,7 +63,7 @@ - - + + From 9c7e7905e067956d602faee08dc91204544b134e Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 20 Oct 2007 18:01:33 +0000 Subject: [PATCH 14/65] i thought i removed this ages ago... this only gives problems if you need to check for refresh, preview, attaching, poll editing, adding files, etc. Better handle error reporting within the code (we do not rely on JS code anyway). git-svn-id: file:///svn/phpbb/trunk@8209 89ea8834-ac86-4346-8a33-228a782c2dd0 --- .../prosilver/template/posting_buttons.html | 18 ------------------ .../prosilver/template/posting_layout.html | 2 +- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html index 357d20c93b..40f9503ca1 100644 --- a/phpBB/styles/prosilver/template/posting_buttons.html +++ b/phpBB/styles/prosilver/template/posting_buttons.html @@ -32,24 +32,6 @@ } - function checkForm() - { - if (document.getElementById(text_name).value.length < 2 && load_draft == false) - { - if (!upload) - { - alert('{LA_EMPTY_MESSAGE}'); - return false; - } - upload = false; - return true; - } - else - { - return true; - } - } - var panels = new Array('options-panel', 'attach-panel', 'poll-panel'); var show_panel = 'options-panel'; diff --git a/phpBB/styles/prosilver/template/posting_layout.html b/phpBB/styles/prosilver/template/posting_layout.html index 754d8a5218..ac9c288822 100644 --- a/phpBB/styles/prosilver/template/posting_layout.html +++ b/phpBB/styles/prosilver/template/posting_layout.html @@ -21,7 +21,7 @@
- +
From 1006e76733d4af412f7ec45301f82c034671d65f Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 21 Oct 2007 10:43:47 +0000 Subject: [PATCH 15/65] use same method as in viewprofile... git-svn-id: file:///svn/phpbb/trunk@8210 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/styles/prosilver/template/viewtopic_body.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index c1a8f3b067..0064e543e1 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -201,10 +201,10 @@
  • {L_PRIVATE_MESSAGE}
  • {L_WEBSITE}
    • -
  • {L_MSNM}
    • -
  • {L_ICQ}
    • -
  • {L_YIM}
    • -
  • {L_AIM}
    • +
  • {L_MSNM}
    • +
  • {L_ICQ}
    • +
  • {L_YIM}
    • +
  • {L_AIM}
  • {L_JABBER}
    • From 19d3483c3824c4d4859e8f14a50cb57d97577938 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 21 Oct 2007 11:26:24 +0000 Subject: [PATCH 16/65] make sure we always check for a valid directory handle git-svn-id: file:///svn/phpbb/trunk@8211 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/coding-guidelines.html | 2 +- phpBB/includes/acp/acp_icons.php | 12 ++++++----- phpBB/includes/acp/acp_main.php | 2 +- phpBB/includes/acp/acp_styles.php | 14 +++++++------ phpBB/includes/functions_user.php | 33 +++++++++++++++++++------------ phpBB/install/install_install.php | 5 ----- 6 files changed, 37 insertions(+), 31 deletions(-) diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index b5aeeccdc3..818f17246b 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -184,7 +184,7 @@ class ...
  • acp
    /adm, /includes/acp, /includes/functions_admin.php
    Administration Control Panel
  • dbal
    /includes/db
    Database Abstraction Layer.
    Base class is dbal
      -
    • /includes/db/dbal.php
      Base DBAL class, defining the overall framework as well as common detominators
      • +
    • /includes/db/dbal.php
      Base DBAL class, defining the overall framework
    • /includes/db/firebird.php
      Firebird/Interbase Database Abstraction Layer
    • /includes/db/msssql.php
      MSSQL Database Abstraction Layer
    • /includes/db/mssql_odbc.php
      MSSQL ODBC Database Abstraction Layer for MSSQL
      • diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php index 97864d0e27..537c0425a2 100644 --- a/phpBB/includes/acp/acp_icons.php +++ b/phpBB/includes/acp/acp_icons.php @@ -89,15 +89,17 @@ class acp_icons } unset($imglist); - $dir = @opendir($phpbb_root_path . $img_path); - while (($file = @readdir($dir)) !== false) + if ($dir = @opendir($phpbb_root_path . $img_path)) { - if (is_file($phpbb_root_path . $img_path . '/' . $file) && preg_match('#\.pak$#i', $file)) + while (($file = readdir($dir)) !== false) { - $_paks[] = $file; + if (is_file($phpbb_root_path . $img_path . '/' . $file) && preg_match('#\.pak$#i', $file)) + { + $_paks[] = $file; + } } + closedir($dir); } - @closedir($dir); } // What shall we do today? Oops, I believe that's trademarked ... diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index 06385fd97b..74369d2d92 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -322,7 +322,7 @@ class acp_main $avatar_dir_size += filesize($phpbb_root_path . $config['avatar_path'] . '/' . $file); } } - @closedir($avatar_dir); + closedir($avatar_dir); // This bit of code translates the avatar directory size into human readable format // Borrowed the code from the PHP.net annoted manual, origanally written by: diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index f4f7f8e56b..31e99a6b0c 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -637,7 +637,7 @@ parse_css_file = {PARSE_CSS_FILE} } } } - @closedir($dp); + closedir($dp); } unset($installed); @@ -1860,15 +1860,17 @@ parse_css_file = {PARSE_CSS_FILE} $imageset_root = "{$phpbb_root_path}styles/{$style_row['imageset_path']}/imageset/"; - $dh = @opendir($imageset_root); - while (($fname = readdir($dh)) !== false) + if ($dh = @opendir($imageset_root)) { - if ($fname[0] != '.' && $fname != 'CVS' && is_dir("$imageset_root$fname")) + while (($fname = readdir($dh)) !== false) { - $files[key($files)]['exclude'] .= ',' . $fname . '/imageset.cfg'; + if ($fname[0] != '.' && $fname != 'CVS' && is_dir("$imageset_root$fname")) + { + $files[key($files)]['exclude'] .= ',' . $fname . '/imageset.cfg'; + } } + closedir($dh); } - @closedir($dh); $imageset_lang = array(); diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index b3be975d00..1c6a4a988f 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1999,31 +1999,38 @@ function avatar_gallery($category, $avatar_select, $items_per_column, $block_var // Collect images $dp = @opendir($path); + if (!$dp) + { + return array($user->lang['NO_AVATAR_CATEGORY'] => array()); + } + while (($file = readdir($dp)) !== false) { if ($file[0] != '.' && preg_match('#^[^&"\'<>]+$#i', $file) && is_dir("$path/$file")) { $avatar_row_count = $avatar_col_count = 0; - $dp2 = @opendir("$path/$file"); - while (($sub_file = readdir($dp2)) !== false) + if ($dp2 = @opendir("$path/$file")) { - if (preg_match('#^[^&\'"<>]+\.(?:gif|png|jpe?g)$#i', $sub_file)) + while (($sub_file = readdir($dp2)) !== false) { - $avatar_list[$file][$avatar_row_count][$avatar_col_count] = array( - 'file' => "$file/$sub_file", - 'filename' => $sub_file, - 'name' => ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $sub_file))), - ); - $avatar_col_count++; - if ($avatar_col_count == $items_per_column) + if (preg_match('#^[^&\'"<>]+\.(?:gif|png|jpe?g)$#i', $sub_file)) { - $avatar_row_count++; - $avatar_col_count = 0; + $avatar_list[$file][$avatar_row_count][$avatar_col_count] = array( + 'file' => "$file/$sub_file", + 'filename' => $sub_file, + 'name' => ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $sub_file))), + ); + $avatar_col_count++; + if ($avatar_col_count == $items_per_column) + { + $avatar_row_count++; + $avatar_col_count = 0; + } } } + closedir($dp2); } - closedir($dp2); } } closedir($dp); diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index ca86816e9c..6fb2cd4881 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -8,11 +8,6 @@ * */ -/** -* @todo: check for those functions being 'available'? Though not able to check with function_exists, we need to create test cases -* ini_get(), glob, getimagesize, fsockopen, readfile -*/ - /** */ if (!defined('IN_INSTALL')) From 9c4cb18c0db51d37c8b0cd382887db5ec72b2efe Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 21 Oct 2007 11:50:16 +0000 Subject: [PATCH 17/65] - Correctly count announcements when filtering forums by date [Bug #14877] git-svn-id: file:///svn/phpbb/trunk@8212 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/viewforum.php | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 8913c7148d..b691f19015 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -93,6 +93,7 @@
    • [Fix] Let newly activated passwords work if users were converted (Bug #14787)
    • [Fix] Quote bbcode fixes. Letting parse quote="[" and re-allowing whitelisted bbcodes within username portion (Bug #14770)
    • [Sec] Fix bbcode helpline display for custom bbcodes - this requires style changes for any custom style (Bug #14850)
      • +
    • [Fix] Correctly count announcements when filtering forums by date (Bug #14877)

    1.ii. Changes since 3.0.RC6

    diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index cb4e44f569..8621ba8ab8 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -211,6 +211,8 @@ $s_limit_days = $s_sort_key = $s_sort_dir = $u_sort_param = ''; gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param); // Limit topics to certain time frame, obtain correct topic count +// global announcements must not be counted, normal announcements have to +// be counted, as forum_topics(_real) includes them if ($sort_days) { $min_post_time = time() - ($sort_days * 86400); @@ -218,8 +220,8 @@ if ($sort_days) $sql = 'SELECT COUNT(topic_id) AS num_topics FROM ' . TOPICS_TABLE . " WHERE forum_id = $forum_id - AND topic_type NOT IN (" . POST_ANNOUNCE . ', ' . POST_GLOBAL . ") - AND topic_last_post_time >= $min_post_time + AND ((topic_type <> " . POST_GLOBAL . " AND topic_last_post_time >= $min_post_time) + OR topic_type = " . POST_ANNOUNCE . ") " . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND topic_approved = 1'); $result = $db->sql_query($sql); $topics_count = (int) $db->sql_fetchfield('num_topics'); From 04876bd33039127f8767c53554baef83536acf2b Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Sun, 21 Oct 2007 17:17:33 +0000 Subject: [PATCH 18/65] #14883 actually older than form tokens git-svn-id: file:///svn/phpbb/trunk@8213 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/styles/subsilver2/template/ucp_footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/subsilver2/template/ucp_footer.html b/phpBB/styles/subsilver2/template/ucp_footer.html index e7b84390c7..3d246644c2 100644 --- a/phpBB/styles/subsilver2/template/ucp_footer.html +++ b/phpBB/styles/subsilver2/template/ucp_footer.html @@ -2,7 +2,7 @@ {S_FORM_TOKEN} -{S_FORM_TOKEN} +{S_FORM_TOKEN}
    From 56a1db7d7bf836df60975661940ff4fbe2cec6cd Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 21 Oct 2007 18:48:51 +0000 Subject: [PATCH 19/65] - Allow charset names containing underscores or spaces git-svn-id: file:///svn/phpbb/trunk@8214 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/utf/utf_tools.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index b691f19015..e75ccb5f42 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -94,6 +94,7 @@
  • [Fix] Quote bbcode fixes. Letting parse quote="[" and re-allowing whitelisted bbcodes within username portion (Bug #14770)
  • [Sec] Fix bbcode helpline display for custom bbcodes - this requires style changes for any custom style (Bug #14850)
  • [Fix] Correctly count announcements when filtering forums by date (Bug #14877)
    • +
  • [Fix] Allow charset names containing underscores or spaces

    • 1.ii. Changes since 3.0.RC6

    diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php index 77971f7e68..e7f144af51 100644 --- a/phpBB/includes/utf/utf_tools.php +++ b/phpBB/includes/utf/utf_tools.php @@ -768,7 +768,7 @@ function utf8_recode($string, $encoding) } // If nothing works, check if we have a custom transcoder available - if (!preg_match('#^[a-z0-9\\-]+$#', $encoding)) + if (!preg_match('#^[a-z0-9_ \\-]+$#', $encoding)) { // Make sure the encoding name is alphanumeric, we don't want it to be abused into loading arbitrary files trigger_error('Unknown encoding: ' . $encoding, E_USER_ERROR); From 2adef2c45775bc1eb957cbfd3825eff743568b92 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Sat, 27 Oct 2007 12:36:57 +0000 Subject: [PATCH 20/65] #14924 git-svn-id: file:///svn/phpbb/trunk@8215 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/download/index.htm | 10 ++++++++++ phpBB/install/install_convert.php | 24 ++++++++++++------------ 2 files changed, 22 insertions(+), 12 deletions(-) create mode 100755 phpBB/download/index.htm diff --git a/phpBB/download/index.htm b/phpBB/download/index.htm new file mode 100755 index 0000000000..ee1f723a7d --- /dev/null +++ b/phpBB/download/index.htm @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index 6fd5016a42..2496018f8e 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -184,8 +184,8 @@ class install_convert extends module 'L_CONTINUE' => $lang['CONTINUE_OLD_CONVERSION'], 'S_CONTINUE' => true, - 'U_NEW_ACTION' => $this->p_master->module_url . "?mode={$this->mode}&sub=intro&new_conv=1", - 'U_CONTINUE_ACTION' => $this->p_master->module_url . "?mode={$this->mode}&sub=in_progress&tag={$options['tag']}{$options['step']}", + 'U_NEW_ACTION' => $this->p_master->module_url . "?mode={$this->mode}&sub=intro&new_conv=1&language=$language", + 'U_CONTINUE_ACTION' => $this->p_master->module_url . "?mode={$this->mode}&sub=in_progress&tag={$options['tag']}{$options['step']}&language=$language", )); return; @@ -261,7 +261,7 @@ class install_convert extends module */ function list_convertors($sub) { - global $lang, $template, $phpbb_root_path, $phpEx; + global $lang, $language, $template, $phpbb_root_path, $phpEx; $this->page_title = $lang['SUB_INTRO']; @@ -327,7 +327,7 @@ class install_convert extends module 'SOFTWARE' => $convertors[$index]['forum_name'], 'VERSION' => $convertors[$index]['version'], - 'U_CONVERT' => $this->p_master->module_url . "?mode={$this->mode}&sub=settings&tag=" . $convertors[$index]['tag'], + 'U_CONVERT' => $this->p_master->module_url . "?mode={$this->mode}&language=$language&sub=settings&tag=" . $convertors[$index]['tag'], )); } } @@ -336,7 +336,7 @@ class install_convert extends module */ function get_convert_settings($sub) { - global $lang, $template, $db, $phpbb_root_path, $phpEx, $config, $cache; + global $lang, $language, $template, $db, $phpbb_root_path, $phpEx, $config, $cache; require($phpbb_root_path . 'config.' . $phpEx); require($phpbb_root_path . 'includes/constants.' . $phpEx); @@ -528,7 +528,7 @@ class install_convert extends module $template->assign_vars(array( 'L_SUBMIT' => $lang['BEGIN_CONVERT'], // 'S_HIDDEN' => $s_hidden_fields, - 'U_ACTION' => $this->p_master->module_url . "?mode={$this->mode}&sub=in_progress&tag=$convertor_tag", + 'U_ACTION' => $this->p_master->module_url . "?mode={$this->mode}&sub=in_progress&tag=$convertor_tag&language=$language", )); return; @@ -576,7 +576,7 @@ class install_convert extends module 'TITLE' => $lang['STAGE_SETTINGS'], 'BODY' => $lang['CONV_OPTIONS_BODY'], 'L_SUBMIT' => $lang['BEGIN_CONVERT'], - 'U_ACTION' => $this->p_master->module_url . "?mode={$this->mode}&sub=settings&tag=$convertor_tag", + 'U_ACTION' => $this->p_master->module_url . "?mode={$this->mode}&sub=settings&tag=$convertor_tag&language=$language", )); } @@ -858,7 +858,7 @@ class install_convert extends module $template->assign_vars(array( 'L_SUBMIT' => $user->lang['INSTALL_TEST'], - 'U_ACTION' => $this->p_master->module_url . "?mode={$this->mode}&sub=in_progress&tag={$convert->convertor_tag}", + 'U_ACTION' => $this->p_master->module_url . "?mode={$this->mode}&sub=in_progress&tag={$convert->convertor_tag}&language=$language", )); return; } @@ -1530,7 +1530,7 @@ class install_convert extends module */ function save_convert_progress($step) { - global $convert; + global $convert, $language; // Save convertor Status set_config('convert_progress', serialize(array( @@ -1551,7 +1551,7 @@ class install_convert extends module 'dbpasswd' => $convert->src_dbpasswd, )), true); - return $this->p_master->module_url . "?mode={$this->mode}&sub=in_progress&tag={$convert->convertor_tag}$step"; + return $this->p_master->module_url . "?mode={$this->mode}&sub=in_progress&tag={$convert->convertor_tag}$step&language=$language"; } /** @@ -1559,7 +1559,7 @@ class install_convert extends module */ function finish_conversion() { - global $db, $phpbb_root_path, $convert, $config, $user, $template; + global $db, $phpbb_root_path, $convert, $config, $language, $user, $template; $db->sql_query('DELETE FROM ' . CONFIG_TABLE . " WHERE config_name = 'convert_progress' @@ -1574,7 +1574,7 @@ class install_convert extends module // And finally, add a note to the log add_log('admin', 'LOG_INSTALL_CONVERTED', $convert->convertor_data['forum_name'], $config['version']); - $url = $this->p_master->module_url . "?mode={$this->mode}&sub=final"; + $url = $this->p_master->module_url . "?mode={$this->mode}&sub=final&language=$language"; $template->assign_vars(array( 'L_SUBMIT' => $user->lang['FINAL_STEP'], From 04ebbeca3fa00b3f11493c68d393405aeb90ed09 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Mon, 29 Oct 2007 13:39:34 +0000 Subject: [PATCH 21/65] '1' might not have been a good choice git-svn-id: file:///svn/phpbb/trunk@8216 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/constants.php | 2 +- phpBB/install/convertors/convert_phpbb20.php | 2 +- phpBB/language/en/viewtopic.php | 1 + phpBB/viewtopic.php | 18 +++++++++++++++--- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 18e92d70c0..c3bb2aa468 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -169,7 +169,7 @@ define('FIELD_DATE', 6); // Additional constants - +define('VOTE_CONVERTED', 9999); // Table names define('ACL_GROUPS_TABLE', $table_prefix . 'acl_groups'); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 91a9951e90..cb26833212 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -571,7 +571,7 @@ if (!$get_info) 'primary' => 'vote_desc.topic_id', 'query_first' => array('target', $convert->truncate_statement . POLL_VOTES_TABLE), - array('poll_option_id', 1, ''), + array('poll_option_id', VOTE_CONVERTED, ''), array('topic_id', 'vote_desc.topic_id', ''), array('vote_user_id', 'vote_voters.vote_user_id', 'phpbb_user_id'), array('vote_user_ip', 'vote_voters.vote_user_ip', 'decode_ip'), diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php index 27989f3c60..337a21c11f 100644 --- a/phpBB/language/en/viewtopic.php +++ b/phpBB/language/en/viewtopic.php @@ -105,6 +105,7 @@ $lang = array_merge($lang, array( 'VIEW_UNREAD_POST' => 'First unread post', 'VISIT_WEBSITE' => 'WWW', 'VOTE_SUBMITTED' => 'Your vote has been cast.', + 'VOTE_CONVERTED' => 'Changing votes is not supported for converted polls.', )); diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index c44d413f60..f99278aece 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -654,13 +654,25 @@ if (!empty($topic_data['poll_start'])) if ($update && $s_can_vote) { - if (!sizeof($voted_id) || sizeof($voted_id) > $topic_data['poll_max_options']) + + if (!sizeof($voted_id) || sizeof($voted_id) > $topic_data['poll_max_options'] || in_array(VOTE_CONVERTED, $cur_voted_id)) { $redirect_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&start=$start"); meta_refresh(5, $redirect_url); - - $message = (!sizeof($voted_id)) ? 'NO_VOTE_OPTION' : 'TOO_MANY_VOTE_OPTIONS'; + if (!sizeof($voted_id)) + { + $message = 'NO_VOTE_OPTION'; + } + else if (sizeof($voted_id) > $topic_data['poll_max_options']) + { + $message = 'TOO_MANY_VOTE_OPTIONS'; + } + else + { + $message = 'VOTE_CONVERTED'; + } + $message = $user->lang[$message] . '

    ' . sprintf($user->lang['RETURN_TOPIC'], '', ''); trigger_error($message); } From 48338c1f4ab5ba2d1fffafc762e238a62ce76457 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Mon, 29 Oct 2007 13:40:10 +0000 Subject: [PATCH 22/65] dumdeedum git-svn-id: file:///svn/phpbb/trunk@8217 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index e75ccb5f42..0d43b2f3f4 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -95,6 +95,7 @@
  • [Sec] Fix bbcode helpline display for custom bbcodes - this requires style changes for any custom style (Bug #14850)
  • [Fix] Correctly count announcements when filtering forums by date (Bug #14877)
  • [Fix] Allow charset names containing underscores or spaces
    • +
  • [Change] Do not assign converted votes to the first option in a vote.

    • 1.ii. Changes since 3.0.RC6

    From 4fa09c65758599a1b06e465e0a8c18bfcaed2e23 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Tue, 30 Oct 2007 16:35:13 +0000 Subject: [PATCH 23/65] #14985 git-svn-id: file:///svn/phpbb/trunk@8218 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/acp/acp_inactive.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index 73872c9b72..9791d525de 100755 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -246,6 +246,8 @@ class acp_inactive 'S_SORT_DIR' => $s_sort_dir, 'S_ON_PAGE' => on_page($inactive_count, $config['topics_per_page'], $start), 'PAGINATION' => generate_pagination($this->u_action . "&$u_sort_param", $inactive_count, $config['topics_per_page'], $start, true), + + 'U_ACTION' => $this->u_action, )); $this->tpl_name = 'acp_inactive'; From 57d50778ed17174e25f4da97c000d9a732876b3f Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Thu, 1 Nov 2007 12:00:20 +0000 Subject: [PATCH 24/65] Adding a repair script for people who converted with RC6. git-svn-id: file:///svn/phpbb/trunk@8219 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/adjust_uids.php | 129 ++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100755 phpBB/develop/adjust_uids.php diff --git a/phpBB/develop/adjust_uids.php b/phpBB/develop/adjust_uids.php new file mode 100755 index 0000000000..d301f3cadb --- /dev/null +++ b/phpBB/develop/adjust_uids.php @@ -0,0 +1,129 @@ +session_begin(); +$auth->acl($user->data); +$user->setup(); + +$echos = 0; + + +// Adjust user signatures +$sql = 'SELECT user_id, user_sig, user_sig_bbcode_uid + FROM ' . USERS_TABLE . ' + ORDER BY user_id ASC'; +$result = $db->sql_query($sql); + +while ($row = $db->sql_fetchrow($result)) +{ + $bbcode_uid = $row['user_sig_bbcode_uid']; + + // Only if a bbcode uid is present, the signature present and a size tag used... + if (!empty($bbcode_uid) && strpos($row['user_sig'], $bbcode_uid) === false) + { + $row['user_sig'] = preg_replace('/\:[0-9a-z]{8}\]/', ":$bbcode_uid]", $row['user_sig']); + + $sql = 'UPDATE ' . USERS_TABLE . " SET user_sig = '" . $db->sql_escape($row['user_sig']) . "' + WHERE user_id = " . $row['user_id']; + $db->sql_query($sql); + + if ($echos > 200) + { + echo '
    User: ' . "{$row['user_id']}\n"; + $echos = 0; + } + + echo '.'; + $echos++; + + flush(); + } +} +$db->sql_freeresult($result); + + +// Now adjust posts +$sql = 'SELECT post_id, post_text, bbcode_uid, enable_bbcode + FROM ' . POSTS_TABLE . ' + ORDER BY post_id ASC'; +$result = $db->sql_query($sql); + +while ($row = $db->sql_fetchrow($result)) +{ + $bbcode_uid = $row['bbcode_uid']; + + // Only if a bbcode uid is present, bbcode enabled and a size tag used... + if ($row['enable_bbcode'] && !empty($bbcode_uid) && strpos($row['post_text'], $bbcode_uid) === false) + { + $row['post_text'] = preg_replace('/\:[0-9a-z]{8}\]/', ":$bbcode_uid]", $row['post_text']); + + $sql = 'UPDATE ' . POSTS_TABLE . " SET post_text = '" . $db->sql_escape($row['post_text']) . "' + WHERE post_id = " . $row['post_id']; + $db->sql_query($sql); + + if ($echos > 200) + { + echo '
    Post: ' . "{$row['post_id']} \n"; + $echos = 0; + } + + echo '.'; + $echos++; + + flush(); + } +} +$db->sql_freeresult($result); + +// Now to the private messages +$sql = 'SELECT msg_id, message_text, bbcode_uid, enable_bbcode + FROM ' . PRIVMSGS_TABLE; +$result = $db->sql_query($sql); + +while ($row = $db->sql_fetchrow($result)) +{ + $bbcode_uid = $row['bbcode_uid']; + + // Only if a bbcode uid is present, bbcode enabled and a size tag used... + if ($row['enable_bbcode'] && !empty($bbcode_uid) && strpos($row['message_text'], $bbcode_uid) === false) + { + $row['message_text'] = preg_replace('/\:[0-9a-z]{8}\]/', ":$bbcode_uid]", $row['message_text']); + + $sql = 'UPDATE ' . PRIVMSGS_TABLE . " SET message_text = '" . $db->sql_escape($row['message_text']) . "' + WHERE msg_id = " . $row['msg_id']; + $db->sql_query($sql); + + if ($echos > 200) + { + echo '
    ' . "\n"; + $echos = 0; + } + + echo '.'; + $echos++; + + flush(); + } +} +$db->sql_freeresult($result); + +// Done +$db->sql_close(); +echo 'done'; +?> \ No newline at end of file From c2721483b651fcc399182225249faff4820ae881 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Thu, 1 Nov 2007 12:26:40 +0000 Subject: [PATCH 25/65] This might work for people who b0rked their BOTs table and thus have bots browsing as normal users. Use with extreme caution. On a backup. git-svn-id: file:///svn/phpbb/trunk@8220 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/repair_bots.php | 206 ++++++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+) create mode 100755 phpBB/develop/repair_bots.php diff --git a/phpBB/develop/repair_bots.php b/phpBB/develop/repair_bots.php new file mode 100755 index 0000000000..1ab81d3c7a --- /dev/null +++ b/phpBB/develop/repair_bots.php @@ -0,0 +1,206 @@ +session_begin(); +$auth->acl($user->data); +$user->setup(); + +$bots = array( + 'AdsBot [Google]', + 'Alexa [Bot]', + 'Alta Vista [Bot]', + 'Ask Jeeves [Bot]', + 'Baidu [Spider]', + 'Exabot [Bot]', + 'FAST Enterprise [Crawler]', + 'FAST WebCrawler [Crawler]', + 'Francis [Bot]', + 'Gigabot [Bot]', + 'Google Adsense [Bot]', + 'Google Desktop', + 'Google Feedfetcher', + 'Google [Bot]', + 'Heise IT-Markt [Crawler]', + 'Heritrix [Crawler]', + 'IBM Research [Bot]', + 'ICCrawler - ICjobs', + 'ichiro [Crawler]', + 'Majestic-12 [Bot]', + 'Metager [Bot]', + 'MSN NewsBlogs', + 'MSN [Bot]', + 'MSNbot Media', + 'NG-Search [Bot]', + 'Nutch [Bot]', + 'Nutch/CVS [Bot]', + 'OmniExplorer [Bot]', + 'Online link [Validator]', + 'psbot [Picsearch]', + 'Seekport [Bot]', + 'Sensis [Crawler]', + 'SEO Crawler', + 'Seoma [Crawler]', + 'SEOSearch [Crawler]', + 'Snappy [Bot]', + 'Steeler [Crawler]', + 'Synoo [Bot]', + 'Telekom [Bot]', + 'TurnitinBot [Bot]', + 'Voyager [Bot]', + 'W3 [Sitesearch]', + 'W3C [Linkcheck]', + 'W3C [Validator]', + 'WiseNut [Bot]', + 'YaCy [Bot]', + 'Yahoo MMCrawler [Bot]', + 'Yahoo Slurp [Bot]', + 'Yahoo [Bot]', + 'YahooSeeker [Bot]', +); + +$bot_ids = array(); +user_get_id_name($bot_ids, $bots, USER_IGNORE); +foreach($bot_ids as $bot) +{ + user_delete('remove', $bot); +} +// Done +add_bots(); +echo 'done'; + + +/** +* Add the search bots into the database +* This code should be used in execute_last if the source database did not have bots +* If you are converting bots this function should not be called +* @todo We might want to look at sharing the bot list between the install code and this code for consistency +*/ +function add_bots() +{ + global $db, $config; + + $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " WHERE group_name = 'BOTS'"; + $result = $db->sql_query($sql); + $group_id = (int) $db->sql_fetchfield('group_id', false, $result); + $db->sql_freeresult($result); + $db->sql_query('TRUNCATE TABLE ' . BOTS_TABLE); + + if (!$group_id) + { + add_default_groups(); + + $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " WHERE group_name = 'BOTS'"; + $result = $db->sql_query($sql); + $group_id = (int) $db->sql_fetchfield('group_id', false, $result); + $db->sql_freeresult($result); + + } + + $bots = array( + 'AdsBot [Google]' => array('AdsBot-Google', ''), + 'Alexa [Bot]' => array('ia_archiver', ''), + 'Alta Vista [Bot]' => array('Scooter/', ''), + 'Ask Jeeves [Bot]' => array('Ask Jeeves', ''), + 'Baidu [Spider]' => array('Baiduspider+(', ''), + 'Exabot [Bot]' => array('Exabot/', ''), + 'FAST Enterprise [Crawler]' => array('FAST Enterprise Crawler', ''), + 'FAST WebCrawler [Crawler]' => array('FAST-WebCrawler/', ''), + 'Francis [Bot]' => array('http://www.neomo.de/', ''), + 'Gigabot [Bot]' => array('Gigabot/', ''), + 'Google Adsense [Bot]' => array('Mediapartners-Google', ''), + 'Google Desktop' => array('Google Desktop', ''), + 'Google Feedfetcher' => array('Feedfetcher-Google', ''), + 'Google [Bot]' => array('Googlebot', ''), + 'Heise IT-Markt [Crawler]' => array('heise-IT-Markt-Crawler', ''), + 'Heritrix [Crawler]' => array('heritrix/1.', ''), + 'IBM Research [Bot]' => array('ibm.com/cs/crawler', ''), + 'ICCrawler - ICjobs' => array('ICCrawler - ICjobs', ''), + 'ichiro [Crawler]' => array('ichiro/2', ''), + 'Majestic-12 [Bot]' => array('MJ12bot/', ''), + 'Metager [Bot]' => array('MetagerBot/', ''), + 'MSN NewsBlogs' => array('msnbot-NewsBlogs/', ''), + 'MSN [Bot]' => array('msnbot/', ''), + 'MSNbot Media' => array('msnbot-media/', ''), + 'NG-Search [Bot]' => array('NG-Search/', ''), + 'Nutch [Bot]' => array('http://lucene.apache.org/nutch/', ''), + 'Nutch/CVS [Bot]' => array('NutchCVS/', ''), + 'OmniExplorer [Bot]' => array('OmniExplorer_Bot/', ''), + 'Online link [Validator]' => array('online link validator', ''), + 'psbot [Picsearch]' => array('psbot/0', ''), + 'Seekport [Bot]' => array('Seekbot/', ''), + 'Sensis [Crawler]' => array('Sensis Web Crawler', ''), + 'SEO Crawler' => array('SEO search Crawler/', ''), + 'Seoma [Crawler]' => array('Seoma [SEO Crawler]', ''), + 'SEOSearch [Crawler]' => array('SEOsearch/', ''), + 'Snappy [Bot]' => array('Snappy/1.1 ( http://www.urltrends.com/ )', ''), + 'Steeler [Crawler]' => array('http://www.tkl.iis.u-tokyo.ac.jp/~crawler/', ''), + 'Synoo [Bot]' => array('SynooBot/', ''), + 'Telekom [Bot]' => array('crawleradmin.t-info@telekom.de', ''), + 'TurnitinBot [Bot]' => array('TurnitinBot/', ''), + 'Voyager [Bot]' => array('voyager/1.0', ''), + 'W3 [Sitesearch]' => array('W3 SiteSearch Crawler', ''), + 'W3C [Linkcheck]' => array('W3C-checklink/', ''), + 'W3C [Validator]' => array('W3C_*Validator', ''), + 'WiseNut [Bot]' => array('http://www.WISEnutbot.com', ''), + 'YaCy [Bot]' => array('yacybot', ''), + 'Yahoo MMCrawler [Bot]' => array('Yahoo-MMCrawler/', ''), + 'Yahoo Slurp [Bot]' => array('Yahoo! DE Slurp', ''), + 'Yahoo [Bot]' => array('Yahoo! Slurp', ''), + 'YahooSeeker [Bot]' => array('YahooSeeker/', ''), + ); + + if (!function_exists('user_add')) + { + include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + } + + foreach ($bots as $bot_name => $bot_ary) + { + $user_row = array( + 'user_type' => USER_IGNORE, + 'group_id' => $group_id, + 'username' => $bot_name, + 'user_regdate' => time(), + 'user_password' => '', + 'user_colour' => '9E8DA7', + 'user_email' => '', + 'user_lang' => $config['default_lang'], + 'user_style' => 1, + 'user_timezone' => 0, + 'user_allow_massemail' => 0, + ); + + $user_id = user_add($user_row); + + if ($user_id) + { + $sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $db->sql_build_array('INSERT', array( + 'bot_active' => 1, + 'bot_name' => $bot_name, + 'user_id' => $user_id, + 'bot_agent' => $bot_ary[0], + 'bot_ip' => $bot_ary[1]) + ); + $db->sql_query($sql); + } + } +} + +?> \ No newline at end of file From 5f37327568ab7208e979edc18fe2fdf21c1a357e Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Thu, 1 Nov 2007 12:49:50 +0000 Subject: [PATCH 26/65] ... git-svn-id: file:///svn/phpbb/trunk@8221 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/repair_bots.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/phpBB/develop/repair_bots.php b/phpBB/develop/repair_bots.php index 1ab81d3c7a..431d40b6d6 100755 --- a/phpBB/develop/repair_bots.php +++ b/phpBB/develop/repair_bots.php @@ -166,10 +166,6 @@ function add_bots() 'YahooSeeker [Bot]' => array('YahooSeeker/', ''), ); - if (!function_exists('user_add')) - { - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); - } foreach ($bots as $bot_name => $bot_ary) { From ce8be416d84953ed39cdf3505d55494c7eb63e5b Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Thu, 1 Nov 2007 13:01:41 +0000 Subject: [PATCH 27/65] okay, enough git-svn-id: file:///svn/phpbb/trunk@8222 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/repair_bots.php | 159 ++++++++++++---------------------- 1 file changed, 54 insertions(+), 105 deletions(-) diff --git a/phpBB/develop/repair_bots.php b/phpBB/develop/repair_bots.php index 431d40b6d6..c5aaa75d9b 100755 --- a/phpBB/develop/repair_bots.php +++ b/phpBB/develop/repair_bots.php @@ -23,66 +23,66 @@ $auth->acl($user->data); $user->setup(); $bots = array( - 'AdsBot [Google]', - 'Alexa [Bot]', - 'Alta Vista [Bot]', - 'Ask Jeeves [Bot]', - 'Baidu [Spider]', - 'Exabot [Bot]', - 'FAST Enterprise [Crawler]', - 'FAST WebCrawler [Crawler]', - 'Francis [Bot]', - 'Gigabot [Bot]', - 'Google Adsense [Bot]', - 'Google Desktop', - 'Google Feedfetcher', - 'Google [Bot]', - 'Heise IT-Markt [Crawler]', - 'Heritrix [Crawler]', - 'IBM Research [Bot]', - 'ICCrawler - ICjobs', - 'ichiro [Crawler]', - 'Majestic-12 [Bot]', - 'Metager [Bot]', - 'MSN NewsBlogs', - 'MSN [Bot]', - 'MSNbot Media', - 'NG-Search [Bot]', - 'Nutch [Bot]', - 'Nutch/CVS [Bot]', - 'OmniExplorer [Bot]', - 'Online link [Validator]', - 'psbot [Picsearch]', - 'Seekport [Bot]', - 'Sensis [Crawler]', - 'SEO Crawler', - 'Seoma [Crawler]', - 'SEOSearch [Crawler]', - 'Snappy [Bot]', - 'Steeler [Crawler]', - 'Synoo [Bot]', - 'Telekom [Bot]', - 'TurnitinBot [Bot]', - 'Voyager [Bot]', - 'W3 [Sitesearch]', - 'W3C [Linkcheck]', - 'W3C [Validator]', - 'WiseNut [Bot]', - 'YaCy [Bot]', - 'Yahoo MMCrawler [Bot]', - 'Yahoo Slurp [Bot]', - 'Yahoo [Bot]', - 'YahooSeeker [Bot]', + 'AdsBot [Google]' => array('AdsBot-Google', ''), + 'Alexa [Bot]' => array('ia_archiver', ''), + 'Alta Vista [Bot]' => array('Scooter/', ''), + 'Ask Jeeves [Bot]' => array('Ask Jeeves', ''), + 'Baidu [Spider]' => array('Baiduspider+(', ''), + 'Exabot [Bot]' => array('Exabot/', ''), + 'FAST Enterprise [Crawler]' => array('FAST Enterprise Crawler', ''), + 'FAST WebCrawler [Crawler]' => array('FAST-WebCrawler/', ''), + 'Francis [Bot]' => array('http://www.neomo.de/', ''), + 'Gigabot [Bot]' => array('Gigabot/', ''), + 'Google Adsense [Bot]' => array('Mediapartners-Google', ''), + 'Google Desktop' => array('Google Desktop', ''), + 'Google Feedfetcher' => array('Feedfetcher-Google', ''), + 'Google [Bot]' => array('Googlebot', ''), + 'Heise IT-Markt [Crawler]' => array('heise-IT-Markt-Crawler', ''), + 'Heritrix [Crawler]' => array('heritrix/1.', ''), + 'IBM Research [Bot]' => array('ibm.com/cs/crawler', ''), + 'ICCrawler - ICjobs' => array('ICCrawler - ICjobs', ''), + 'ichiro [Crawler]' => array('ichiro/2', ''), + 'Majestic-12 [Bot]' => array('MJ12bot/', ''), + 'Metager [Bot]' => array('MetagerBot/', ''), + 'MSN NewsBlogs' => array('msnbot-NewsBlogs/', ''), + 'MSN [Bot]' => array('msnbot/', ''), + 'MSNbot Media' => array('msnbot-media/', ''), + 'NG-Search [Bot]' => array('NG-Search/', ''), + 'Nutch [Bot]' => array('http://lucene.apache.org/nutch/', ''), + 'Nutch/CVS [Bot]' => array('NutchCVS/', ''), + 'OmniExplorer [Bot]' => array('OmniExplorer_Bot/', ''), + 'Online link [Validator]' => array('online link validator', ''), + 'psbot [Picsearch]' => array('psbot/0', ''), + 'Seekport [Bot]' => array('Seekbot/', ''), + 'Sensis [Crawler]' => array('Sensis Web Crawler', ''), + 'SEO Crawler' => array('SEO search Crawler/', ''), + 'Seoma [Crawler]' => array('Seoma [SEO Crawler]', ''), + 'SEOSearch [Crawler]' => array('SEOsearch/', ''), + 'Snappy [Bot]' => array('Snappy/1.1 ( http://www.urltrends.com/ )', ''), + 'Steeler [Crawler]' => array('http://www.tkl.iis.u-tokyo.ac.jp/~crawler/', ''), + 'Synoo [Bot]' => array('SynooBot/', ''), + 'Telekom [Bot]' => array('crawleradmin.t-info@telekom.de', ''), + 'TurnitinBot [Bot]' => array('TurnitinBot/', ''), + 'Voyager [Bot]' => array('voyager/1.0', ''), + 'W3 [Sitesearch]' => array('W3 SiteSearch Crawler', ''), + 'W3C [Linkcheck]' => array('W3C-checklink/', ''), + 'W3C [Validator]' => array('W3C_*Validator', ''), + 'WiseNut [Bot]' => array('http://www.WISEnutbot.com', ''), + 'YaCy [Bot]' => array('yacybot', ''), + 'Yahoo MMCrawler [Bot]' => array('Yahoo-MMCrawler/', ''), + 'Yahoo Slurp [Bot]' => array('Yahoo! DE Slurp', ''), + 'Yahoo [Bot]' => array('Yahoo! Slurp', ''), + 'YahooSeeker [Bot]' => array('YahooSeeker/', ''), ); $bot_ids = array(); -user_get_id_name($bot_ids, $bots, USER_IGNORE); +user_get_id_name($bot_ids, array_keys($bots), USER_IGNORE); foreach($bot_ids as $bot) { user_delete('remove', $bot); } // Done -add_bots(); +add_bots($bots); echo 'done'; @@ -92,7 +92,7 @@ echo 'done'; * If you are converting bots this function should not be called * @todo We might want to look at sharing the bot list between the install code and this code for consistency */ -function add_bots() +function add_bots($bots) { global $db, $config; @@ -113,58 +113,7 @@ function add_bots() } - $bots = array( - 'AdsBot [Google]' => array('AdsBot-Google', ''), - 'Alexa [Bot]' => array('ia_archiver', ''), - 'Alta Vista [Bot]' => array('Scooter/', ''), - 'Ask Jeeves [Bot]' => array('Ask Jeeves', ''), - 'Baidu [Spider]' => array('Baiduspider+(', ''), - 'Exabot [Bot]' => array('Exabot/', ''), - 'FAST Enterprise [Crawler]' => array('FAST Enterprise Crawler', ''), - 'FAST WebCrawler [Crawler]' => array('FAST-WebCrawler/', ''), - 'Francis [Bot]' => array('http://www.neomo.de/', ''), - 'Gigabot [Bot]' => array('Gigabot/', ''), - 'Google Adsense [Bot]' => array('Mediapartners-Google', ''), - 'Google Desktop' => array('Google Desktop', ''), - 'Google Feedfetcher' => array('Feedfetcher-Google', ''), - 'Google [Bot]' => array('Googlebot', ''), - 'Heise IT-Markt [Crawler]' => array('heise-IT-Markt-Crawler', ''), - 'Heritrix [Crawler]' => array('heritrix/1.', ''), - 'IBM Research [Bot]' => array('ibm.com/cs/crawler', ''), - 'ICCrawler - ICjobs' => array('ICCrawler - ICjobs', ''), - 'ichiro [Crawler]' => array('ichiro/2', ''), - 'Majestic-12 [Bot]' => array('MJ12bot/', ''), - 'Metager [Bot]' => array('MetagerBot/', ''), - 'MSN NewsBlogs' => array('msnbot-NewsBlogs/', ''), - 'MSN [Bot]' => array('msnbot/', ''), - 'MSNbot Media' => array('msnbot-media/', ''), - 'NG-Search [Bot]' => array('NG-Search/', ''), - 'Nutch [Bot]' => array('http://lucene.apache.org/nutch/', ''), - 'Nutch/CVS [Bot]' => array('NutchCVS/', ''), - 'OmniExplorer [Bot]' => array('OmniExplorer_Bot/', ''), - 'Online link [Validator]' => array('online link validator', ''), - 'psbot [Picsearch]' => array('psbot/0', ''), - 'Seekport [Bot]' => array('Seekbot/', ''), - 'Sensis [Crawler]' => array('Sensis Web Crawler', ''), - 'SEO Crawler' => array('SEO search Crawler/', ''), - 'Seoma [Crawler]' => array('Seoma [SEO Crawler]', ''), - 'SEOSearch [Crawler]' => array('SEOsearch/', ''), - 'Snappy [Bot]' => array('Snappy/1.1 ( http://www.urltrends.com/ )', ''), - 'Steeler [Crawler]' => array('http://www.tkl.iis.u-tokyo.ac.jp/~crawler/', ''), - 'Synoo [Bot]' => array('SynooBot/', ''), - 'Telekom [Bot]' => array('crawleradmin.t-info@telekom.de', ''), - 'TurnitinBot [Bot]' => array('TurnitinBot/', ''), - 'Voyager [Bot]' => array('voyager/1.0', ''), - 'W3 [Sitesearch]' => array('W3 SiteSearch Crawler', ''), - 'W3C [Linkcheck]' => array('W3C-checklink/', ''), - 'W3C [Validator]' => array('W3C_*Validator', ''), - 'WiseNut [Bot]' => array('http://www.WISEnutbot.com', ''), - 'YaCy [Bot]' => array('yacybot', ''), - 'Yahoo MMCrawler [Bot]' => array('Yahoo-MMCrawler/', ''), - 'Yahoo Slurp [Bot]' => array('Yahoo! DE Slurp', ''), - 'Yahoo [Bot]' => array('Yahoo! Slurp', ''), - 'YahooSeeker [Bot]' => array('YahooSeeker/', ''), - ); + foreach ($bots as $bot_name => $bot_ary) From 61fc9605faa29d1bc5b1be8df2a4ab7f36c92264 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 3 Nov 2007 11:10:07 +0000 Subject: [PATCH 28/65] some changes git-svn-id: file:///svn/phpbb/trunk@8223 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions.php | 22 +++++-------------- phpBB/includes/mcp/mcp_front.php | 8 +++++++ phpBB/includes/mcp/mcp_reports.php | 2 +- phpBB/install/database_update.php | 2 +- phpBB/install/install_convert.php | 2 +- phpBB/language/en/install.php | 12 +++++----- .../subsilver2/template/ucp_footer.html | 2 +- 7 files changed, 23 insertions(+), 27 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 80a6faceca..5ef95761e0 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -89,7 +89,8 @@ function request_var($var_name, $default, $multibyte = false, $cookie = false) if ($type == 'array') { reset($default); - list($sub_key_type, $sub_type) = each(current($default)); + $default = current($default); + list($sub_key_type, $sub_type) = each($default); $sub_type = gettype($sub_type); $sub_type = ($sub_type == 'array') ? 'NULL' : $sub_type; $sub_key_type = gettype($sub_key_type); @@ -269,23 +270,12 @@ function phpbb_hash($password) $random = ''; $count = 6; - if (($fh = @fopen('/dev/urandom', 'rb'))) + for ($i = 0; $i < $count; $i += 16) { - $random = fread($fh, $count); - fclose($fh); - } - - if (strlen($random) < $count) - { - $random = ''; - - for ($i = 0; $i < $count; $i += 16) - { - $random_state = md5(unique_id() . $random_state); - $random .= pack('H*', md5($random_state)); - } - $random = substr($random, 0, $count); + $random_state = md5(unique_id() . $random_state); + $random .= pack('H*', md5($random_state)); } + $random = substr($random, 0, $count); $hash = _hash_crypt_private($password, _hash_gensalt_private($random, $itoa64), $itoa64); diff --git a/phpBB/includes/mcp/mcp_front.php b/phpBB/includes/mcp/mcp_front.php index d67a51cd89..707fe22685 100644 --- a/phpBB/includes/mcp/mcp_front.php +++ b/phpBB/includes/mcp/mcp_front.php @@ -73,6 +73,14 @@ function mcp_front_view($id, $mode, $action) } $db->sql_freeresult($result); + if (empty($post_list)) + { + $total = 0; + } + } + + if ($total) + { $sql = 'SELECT p.post_id, p.post_subject, p.post_time, p.poster_id, p.post_username, u.username, u.username_clean, t.topic_id, t.topic_title, t.topic_first_post_id, p.forum_id FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . USERS_TABLE . ' u WHERE ' . $db->sql_in_set('p.post_id', $post_list) . ' diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index 0faa1dc8b7..37ea7e5132 100755 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -599,7 +599,7 @@ function close_report($report_id_list, $mode, $action) } } - foreach($post_info as $post) + foreach ($post_info as $post) { $forum_ids[$post['forum_id']] = $post['forum_id']; $topic_ids[$post['topic_id']] = $post['topic_id']; diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 4c4c1eb690..3f39b7d494 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1178,7 +1178,7 @@ if (version_compare($current_version, '3.0.RC2', '<=')) } $db->sql_freeresult($result); - foreach($smileys as $id => $code) + foreach ($smileys as $id => $code) { // 2.0 only entitized lt and gt; We need to do something about double quotes. if (strchr($code, '"') === false) diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index 2496018f8e..d1e36ec4a4 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -1177,7 +1177,7 @@ class install_convert extends module if (!empty($schema['group_by'])) { $schema['group_by'] = array($schema['group_by']); - foreach($sql_data['select_fields'] as $select) + foreach ($sql_data['select_fields'] as $select) { $alias = strpos(strtolower($select), ' as '); $select = ($alias) ? substr($select, 0, $alias) : $select; diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 55ed3eaa88..de39cf0961 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -190,8 +190,8 @@ $lang = array_merge($lang, array(

    Go live with your phpBB3!

    Clicking the button below will take you to your Administration Control Panel (ACP). Take some time to examine the options available to you. Remember that help is available online via the Documentation and the support forums, see the README for further information.

    Please now delete, move or rename the install directory before you use your board. If this directory is still present, only the Administration Control Panel (ACP) will be accessible.

    ', 'INSTALL_INTRO' => 'Welcome to Installation', -// TODO: write some more introductions here - 'INSTALL_INTRO_BODY' => 'With this option, it is possible to install phpBB onto your server.

    In order to proceed, you will need your database settings. If you do not know your database settings, please contact your host and ask for them. You will not be able to continue without them. You need:

    + + 'INSTALL_INTRO_BODY' => 'With this option, it is possible to install phpBB3 onto your server.

    In order to proceed, you will need your database settings. If you do not know your database settings, please contact your host and ask for them. You will not be able to continue without them. You need:

    • The Database Type - the database you will be using.
      • @@ -277,9 +277,9 @@ $lang = array_merge($lang, array( 'NO_CONVERT_SPECIFIED' => 'No convertor specified.', 'NO_LOCATION' => 'Cannot determine location. If you know Imagemagick is installed, you may specify the location later within your administration control panel', 'NO_TABLES_FOUND' => 'No tables found.', -// TODO: Write some explanatory introduction text - 'OVERVIEW_BODY' => 'Welcome to our public release candidate of the next-generation of phpBB after 2.0.x, phpBB 3.0! This release is intended for wider scale use to help us identifying last bugs and problematic areas.

      Please read our installation guide for more information about installing phpBB3

      Note: This release is still not final. You may want to wait for the full final release before running it live.

      This installation system will guide you through the process of installing phpBB, converting from a different software package or updating to the latest version of phpBB. For more information on each option, select it from the menu above.', + // TODO: write introduction... + 'OVERVIEW_BODY' => 'Introduction body missing...', 'PCRE_UTF_SUPPORT' => 'PCRE UTF-8 support', 'PCRE_UTF_SUPPORT_EXPLAIN' => 'phpBB will not run if your PHP installation is not compiled with UTF-8 support in the PCRE extension.', @@ -305,7 +305,6 @@ $lang = array_merge($lang, array( 'REFRESH_PAGE' => 'Refresh page to continue conversion', 'REFRESH_PAGE_EXPLAIN' => 'If set to yes, the convertor will refresh the page to continue the conversion after having finished a step. If this is your first conversion for testing purposes and to determine any errors in advance, we suggest to set this to No.', -// 'REQUIRED' => 'Required', 'REQUIREMENTS_TITLE' => 'Installation compatibility', 'REQUIREMENTS_EXPLAIN' => 'Before proceeding with the full installation phpBB will carry out some tests on your server configuration and files to ensure that you are able to install and run phpBB. Please ensure you read through the results thoroughly and do not proceed until all the required tests are passed. If you wish to use any of the features depending on the optional tests, you should ensure that these tests are passed also.', 'RETRY_WRITE' => 'Retry writing config', @@ -337,8 +336,7 @@ $lang = array_merge($lang, array( 'SUB_LICENSE' => 'License', 'SUB_SUPPORT' => 'Support', 'SUCCESSFUL_CONNECT' => 'Successful connection', -// TODO: Write some text on obtaining support - 'SUPPORT_BODY' => 'During the release candidate phase full support will be given at the phpBB 3.0.x support forums. We will provide answers to general setup questions, configuration problems, conversion problems and support for determining common problems mostly related to bugs. We also allow discussions about modifications and custom code/style additions.

      For additional assistance, please refer to our Quick Start Guide and the online documentation.

      To ensure you stay up to date with the latest news and releases, why not subscribe to our mailing list?', + 'SUPPORT_BODY' => '

      Full support will be provided in the phpBB 3.0.x Support Forums.
      We will be happy to assist you with:

      • installation
      • configuration
      • technical questions
      • problems relating to potential bugs in the software
      • updating from release candidate versions to the latest stable version
      • converting from phpBB 2.0.x to phpBB3
      • converting from other discussion board software to phpBB3 (please see the Convertors Forum)
      For issues relating to MODs, please post in the appropriate Modifications Forum.
      For issues relating to styles, imagesets and templates, please post in the appropriate Styles Forum.

      For additional assistance, please refer to our Quick Start Guide and the online documentation.

      To ensure you stay up to date with the latest news and releases, why not subscribe to our mailing list?', 'SYNC_FORUMS' => 'Starting to synchronise forums', 'SYNC_POST_COUNT' => 'Synchronising post_counts', 'SYNC_POST_COUNT_ID' => 'Synchronising post_counts from entry %1$s to %2$s.', diff --git a/phpBB/styles/subsilver2/template/ucp_footer.html b/phpBB/styles/subsilver2/template/ucp_footer.html index 3d246644c2..1681fe3849 100644 --- a/phpBB/styles/subsilver2/template/ucp_footer.html +++ b/phpBB/styles/subsilver2/template/ucp_footer.html @@ -2,7 +2,7 @@ {S_FORM_TOKEN} -{S_FORM_TOKEN} +{S_FORM_TOKEN}
      From 18d014c7656717fe09aba0cafe2967eae7cea421 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 3 Nov 2007 20:31:05 +0000 Subject: [PATCH 29/65] further fixes - fix infinite loop on checking ban for those not having ever visited the page (or removed all session cookies) - avatar width/height switched in language files - fix windows switching to background on IE7 (smlies window for example) git-svn-id: file:///svn/phpbb/trunk@8224 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/session.php | 3 ++- phpBB/install/install_install.php | 4 ++-- phpBB/language/en/acp/board.php | 4 ++-- phpBB/styles/prosilver/template/editor.js | 9 +++++++-- phpBB/styles/prosilver/template/ucp_pm_options.html | 2 +- phpBB/styles/subsilver2/template/editor.js | 6 +++++- 6 files changed, 19 insertions(+), 9 deletions(-) diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 7ca2cbcdd0..5ecb18a001 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -1018,7 +1018,8 @@ class session // If the session is empty we need to create a valid one... if (empty($this->session_id)) { - $this->session_create(ANONYMOUS); + // This seems to be no longer needed? - #14971 +// $this->session_create(ANONYMOUS); } // Initiate environment ... since it won't be set at this stage diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 6fb2cd4881..720eddebcd 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -482,7 +482,7 @@ class install_install extends module 'LEGEND_EXPLAIN' => $lang['FILES_OPTIONAL_EXPLAIN'], )); - $directories = array('config.'.$phpEx, 'images/avatars/upload/'); + $directories = array('config.' . $phpEx, 'images/avatars/upload/'); foreach ($directories as $dir) { @@ -931,7 +931,7 @@ class install_install extends module // Note that all we check is that the file has _something_ in it // We don't compare the contents exactly - if they can't upload // a single file correctly, it's likely they will have other problems.... - if (filesize($phpbb_root_path . 'config.'.$phpEx) > 10) + if (filesize($phpbb_root_path . 'config.' . $phpEx) > 10) { $written = true; } diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 5b109efdc5..0cc1064916 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -96,11 +96,11 @@ $lang = array_merge($lang, array( 'AVATAR_STORAGE_PATH' => 'Avatar storage path', 'AVATAR_STORAGE_PATH_EXPLAIN' => 'Path under your phpBB root directory, e.g. images/avatars/upload.', 'MAX_AVATAR_SIZE' => 'Maximum avatar dimensions', - 'MAX_AVATAR_SIZE_EXPLAIN' => 'Height x Width in pixels.', + 'MAX_AVATAR_SIZE_EXPLAIN' => 'Width x Height in pixels.', 'MAX_FILESIZE' => 'Maximum avatar file size', 'MAX_FILESIZE_EXPLAIN' => 'For uploaded avatar files.', 'MIN_AVATAR_SIZE' => 'Minimum avatar dimensions', - 'MIN_AVATAR_SIZE_EXPLAIN' => 'Height x Width in pixels.', + 'MIN_AVATAR_SIZE_EXPLAIN' => 'Width x Height in pixels.', )); // Message Settings diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js index 61747f7e56..5631ab67d1 100644 --- a/phpBB/styles/prosilver/template/editor.js +++ b/phpBB/styles/prosilver/template/editor.js @@ -34,7 +34,7 @@ function initInsertions() { var doc; - if( document.forms[form_name]) + if (document.forms[form_name]) { doc = document; } @@ -44,11 +44,16 @@ function initInsertions() } var textarea = doc.forms[form_name].elements[text_name]; + if (is_ie && typeof(baseHeight) != 'number') { textarea.focus(); baseHeight = doc.selection.createRange().duplicate().boundingHeight; - // document.body.focus(); + + if (!document.forms[form_name]) + { + document.body.focus(); + } } } diff --git a/phpBB/styles/prosilver/template/ucp_pm_options.html b/phpBB/styles/prosilver/template/ucp_pm_options.html index 3fe24f04ee..db5781febf 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_options.html +++ b/phpBB/styles/prosilver/template/ucp_pm_options.html @@ -14,7 +14,7 @@

        -
      1. {L_IF} {rule.CHECK} {rule.RULE} {rule.STRING} | {rule.ACTION}: {rule.FOLDER}
        2. +
      2. {L_IF} {rule.CHECK} {rule.RULE} {rule.STRING} | {rule.ACTION}: {rule.FOLDER}
      3. {L_NO_RULES_DEFINED}
        4. diff --git a/phpBB/styles/subsilver2/template/editor.js b/phpBB/styles/subsilver2/template/editor.js index 72de8ef8ff..53b8b6222f 100644 --- a/phpBB/styles/subsilver2/template/editor.js +++ b/phpBB/styles/subsilver2/template/editor.js @@ -48,7 +48,11 @@ function initInsertions() { textarea.focus(); baseHeight = doc.selection.createRange().duplicate().boundingHeight; - // document.body.focus(); + + if (!document.forms[form_name]) + { + document.body.focus(); + } } } From 3989042217858c7bd2930b3d44f5e38d539711b1 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 4 Nov 2007 12:07:46 +0000 Subject: [PATCH 30/65] try to add another fix for bans git-svn-id: file:///svn/phpbb/trunk@8225 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/session.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 5ecb18a001..6149063dea 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -1064,6 +1064,9 @@ class session $message .= ($ban_row['ban_give_reason']) ? '

        ' . sprintf($this->lang['BOARD_BAN_REASON'], $ban_row['ban_give_reason']) : ''; $message .= '

        ' . $this->lang['BAN_TRIGGERED_BY_' . strtoupper($ban_triggered_by)] . ''; + // To circumvent session_begin returning a valid value and the check_ban() not called on second page view, we kill the session again + $this->session_kill(false); + trigger_error($message); } From 0a05595c9ef5e5e4239d496843be8f8a9f9df1e7 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Mon, 5 Nov 2007 18:20:44 +0000 Subject: [PATCH 31/65] some alterations to the documents git-svn-id: file:///svn/phpbb/trunk@8226 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/INSTALL.html | 14 ++++++++++---- phpBB/docs/README.html | 14 ++++++++------ 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index afd2655bd7..4f9e4ded70 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -261,7 +261,7 @@

        4.i. Full package

        -

        The full package is normally meant for new installations, but if you want to replace all source files this package comes in handy.

        +

        The full package is normally meant for new installations only, but if you want to replace all source files this package comes in handy.

        First you should make a copy of your existing config.php file, keep it in a safe place! Next delete all the existing phpBB3 files, you may want to leave your files/ and images/ directory in place. You can leave alternative styles in-place too. With this complete you can upload the new phpBB3 files (see New installation for details if necessary). Once complete copy back your saved config.php, replacing the new one. Another method is to just replace the existing files with the files from the full package - though make sure you do not overwrite your config.php file.

        @@ -271,6 +271,8 @@

        4.ii. Changed files only

        +

        This package is meant for those wanting to only replace changed files from a previous version to the latest version. This package normally contains the changed files from up to five previous versions.

        +

        This package contains a number of archives, each contains the files changed from a given release to the latest version. You should select the appropriate archive for your current version, e.g. if you currently have 3.0.0 you should select the phpBB-3.0.0_to_3.0.1.zip/tar.gz file.

        The directory structure has been preserved enabling you (if you wish) to simply upload the contents of the archive to the appropriate location on your server, i.e. simply overwrite the existing files with the new versions. Do not forget that if you have installed any MODs these files will overwrite the originals possibly destroying them in the process. You will need to re-add MODs to any affected file before uploading.

        @@ -279,7 +281,9 @@

        4.iii. Patch file

        -

        The patch file is probably the best solution for those with many Modifications (MODs) or other changes who do not want to re-add them back to all the changed files. To use this you will need command line access to a standard UNIX type patch application. If you do not have access to such an application but still want to use this update approach we recommend the Automatic update package explained below.

        +

        The patch file package is for those wanting to update through the patch application, and being compfortable with it.

        + +

        The patch file is one solution for those with many Modifications (MODs) or other changes who do not want to re-add them back to all the changed files if they use the method explained above. To use this you will need command line access to a standard UNIX type patch application. If you do not have access to such an application but still want to use this update approach, we strongly recommend the Automatic update package explained below. It is also the preferred update method.

        A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is 3.0.0 you need the phpBB-3.0.0_to_3.0.1.patch file. Place the correct patch in the parent directory containing the phpBB3 core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: patch -cl -d [PHPBB DIRECTORY] -p1 < [PATCH NAME] (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB3, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.

        @@ -289,12 +293,14 @@

        4.iv. Automatic update package

        +

        This update method is the preferred method for updating. This package allows detecting changed files automatically and merges changes if needed.

        +

        The automatic update package is holding - contrary to the others - only the update informations for updating the last released version to the latest available version. These package is meant for use with the automatic update tool.

        -

        To perform the update, either follow the instructions from the Administration Control Panel -> System Tab - this should point out that you are running an outdated version and will guide you through the update - or following the instructions listed below.

        +

        To perform the update, either follow the instructions from the Administration Control Panel->System Tab - this should point out that you are running an outdated version and will guide you through the update - or follow the instructions listed below.

          -
        • Go to the downloads page and download the latest update package listed there.
          • +
        • Go to the downloads page and download the latest update package listed there, matching your current version.
        • Upload the archives contents to your phpBB installation - only the install folder is required. Upload the whole install folder, retaining the file structure.
        • After the install folder is present, phpBB3 will go offline automatically.
        • Point your browser to the install directory, for example http://www.example.com/phpBB3/install/
          • diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index 9161050511..3510bc448e 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -105,9 +105,9 @@

          We give support for the following installation types:

            -
          • Updates from phpBB3 RC1 to any higher version
            • -
          • Conversions from phpBB 2.0.x to phpBB3 RC1 and higher
            • -
          • New installations of phpBB3 RC1 and higher
            • +
          • Updates from phpBB3 RC1 to the latest version
            • +
          • Conversions from phpBB 2.0.x to the latest version
            • +
          • New installations of phpBB3 - always only the latest released version
    @@ -136,9 +136,9 @@

    This is the official location for all supported language sets. If you download a package from a 3rd party site you do so with the understanding that we cannot offer support. So please, do not ask for help in these cases!

    -

    Installation of these packages is straightforward, simply download the required language pack and unarchive it into the languages/ folder. Please ensure you retain the directory structure when doing this! Once uploaded go to the Admin->System->Language Packs and install the now appeared new language pack. To install the style image packs you should unarchive the file/s into the styles/subsilver2/imageset directory, again you must retain the directory structure. Once installed the languages will become immediately available.

    +

    Installation of these packages is straightforward, simply download the required language pack and unarchive it into the languages/ folder. Please ensure you retain the directory structure when doing this! Once uploaded go to the Admin->System->Language Packs and install the now appeared new language pack. To install the style imageset you should download the imageset for your language and unarchive the file/s into the relevant imageset directory (styles/prosilver/imageset or styles/subsilver2/imageset), again you must retain the directory structure. Once installed the imageset will become immediately available.

    -

    If your language is not available please visit our forums where you will find a topic listing translations currently available or in preparation. This topic also gives you information should you wish to volunteer to translate a language not currently listed

    +

    If your language is not available please visit our forums where you will find a topic listing translations currently available or in preparation. This topic also gives you information should you wish to volunteer to translate a language not currently listed.

    2.ii. Styles

    @@ -150,6 +150,8 @@

    Once you have downloaded a style the usual next step is to unarchive (or upload the unarchived contents of) the package into your styles/ directory. You then need to visit Administration -> Styles, you should see the new style available, click install and it will become available for all your users.

    +

    Please note that if you create your own style or modify existing ones, please remember to enable the "Recompile stale style components" setting within the Admin->General->Load Settings screen. This setting allows the cache to detect changes made to the style and automatically refresh it. If this setting is disabled, you will not see your changes taking effect.

    +

    2.iii. Modifications

    Although not officially supported by phpBB Group, phpBB has a thriving modification scene. These third party modifications to the standard phpBB extend its capabilities still further and can be found at:

    @@ -292,7 +294,7 @@
    • Conversions may fail to complete on large boards under some hosts
    • Updates may fail to complete on large update sets under some hosts
      • -
    • URL redirects are not working correctly under PHP 5.2.4 and certain conditions due to a bug within this PHP version
      • +
    • Smilies placed directly after bbcode tags will not get parsed. Smilies always need to be separated by spaces.
    From 35f205ea61b5cab5dc202062284d2ade448e6b95 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Mon, 5 Nov 2007 19:07:10 +0000 Subject: [PATCH 32/65] #15038 I'm very sorry. This should make W3C happy again. git-svn-id: file:///svn/phpbb/trunk@8227 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_attachments.html | 15 ++++----- phpBB/adm/style/acp_ban.html | 7 ++-- phpBB/adm/style/acp_bbcodes.html | 5 +-- phpBB/adm/style/acp_board.html | 4 +-- phpBB/adm/style/acp_bots.html | 4 +-- phpBB/adm/style/acp_captcha.html | 2 +- phpBB/adm/style/acp_database.html | 5 ++- phpBB/adm/style/acp_disallow.html | 2 +- phpBB/adm/style/acp_email.html | 2 +- phpBB/adm/style/acp_forums.html | 8 ++--- phpBB/adm/style/acp_groups.html | 6 ++-- phpBB/adm/style/acp_icons.html | 7 ++-- phpBB/adm/style/acp_inactive.html | 4 +-- phpBB/adm/style/acp_jabber.html | 2 +- phpBB/adm/style/acp_language.html | 9 +++--- phpBB/adm/style/acp_logs.html | 2 +- phpBB/adm/style/acp_modules.html | 2 +- phpBB/adm/style/acp_permission_roles.html | 4 +-- phpBB/adm/style/acp_permissions.html | 32 ++++++++----------- phpBB/adm/style/acp_profile.html | 7 ++-- phpBB/adm/style/acp_prune_forums.html | 3 +- phpBB/adm/style/acp_prune_users.html | 2 +- phpBB/adm/style/acp_ranks.html | 4 +-- phpBB/adm/style/acp_reasons.html | 4 +-- phpBB/adm/style/acp_search.html | 8 ++--- phpBB/adm/style/acp_styles.html | 19 +++++------ phpBB/adm/style/acp_users.html | 12 +++---- phpBB/adm/style/acp_users_avatar.html | 2 +- phpBB/adm/style/acp_users_overview.html | 4 +-- phpBB/adm/style/acp_users_prefs.html | 2 +- phpBB/adm/style/acp_users_profile.html | 3 +- phpBB/adm/style/acp_users_signature.html | 2 +- phpBB/adm/style/acp_words.html | 5 ++- .../prosilver/template/confirm_body.html | 1 - .../styles/prosilver/template/index_body.html | 1 - .../styles/prosilver/template/login_body.html | 1 - .../prosilver/template/mcp_approve.html | 2 +- phpBB/styles/prosilver/template/mcp_ban.html | 2 +- .../styles/prosilver/template/mcp_forum.html | 2 +- .../styles/prosilver/template/mcp_front.html | 4 +-- phpBB/styles/prosilver/template/mcp_logs.html | 4 +-- phpBB/styles/prosilver/template/mcp_move.html | 2 +- .../prosilver/template/mcp_notes_front.html | 2 +- .../prosilver/template/mcp_notes_user.html | 2 +- phpBB/styles/prosilver/template/mcp_post.html | 10 +++--- .../styles/prosilver/template/mcp_queue.html | 2 +- .../prosilver/template/mcp_reports.html | 2 +- .../styles/prosilver/template/mcp_topic.html | 4 +-- .../prosilver/template/mcp_viewlogs.html | 4 ++- .../prosilver/template/mcp_warn_front.html | 2 +- .../prosilver/template/mcp_warn_list.html | 4 +-- .../prosilver/template/mcp_warn_post.html | 2 +- .../prosilver/template/mcp_warn_user.html | 2 +- .../prosilver/template/memberlist_email.html | 3 +- .../prosilver/template/memberlist_im.html | 2 +- .../prosilver/template/memberlist_search.html | 3 +- .../prosilver/template/posting_editor.html | 2 +- .../prosilver/template/posting_layout.html | 4 +-- .../prosilver/template/report_body.html | 2 +- .../prosilver/template/ucp_agreement.html | 5 ++- .../prosilver/template/ucp_attachments.html | 3 +- .../styles/prosilver/template/ucp_footer.html | 2 +- .../prosilver/template/ucp_groups_manage.html | 3 +- .../template/ucp_groups_membership.html | 4 +-- .../template/ucp_main_bookmarks.html | 2 +- .../prosilver/template/ucp_main_drafts.html | 4 ++- .../template/ucp_main_subscribed.html | 2 +- .../template/ucp_pm_message_footer.html | 2 +- .../prosilver/template/ucp_pm_options.html | 2 +- .../prosilver/template/ucp_pm_viewfolder.html | 2 +- .../template/ucp_prefs_personal.html | 2 +- .../prosilver/template/ucp_prefs_post.html | 2 +- .../prosilver/template/ucp_prefs_view.html | 2 +- .../template/ucp_profile_avatar.html | 2 +- .../template/ucp_profile_profile_info.html | 2 +- .../template/ucp_profile_reg_details.html | 2 +- .../template/ucp_profile_signature.html | 2 +- .../prosilver/template/ucp_register.html | 2 +- .../styles/prosilver/template/ucp_remind.html | 2 +- .../styles/prosilver/template/ucp_resend.html | 3 +- .../prosilver/template/ucp_zebra_foes.html | 2 +- .../prosilver/template/ucp_zebra_friends.html | 2 +- .../prosilver/template/viewtopic_body.html | 7 ++-- 83 files changed, 163 insertions(+), 170 deletions(-) diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html index 42ae610545..dd1374fee4 100644 --- a/phpBB/adm/style/acp_attachments.html +++ b/phpBB/adm/style/acp_attachments.html @@ -109,8 +109,8 @@

    {L_NO_IPS_DEFINED}

    - {S_FORM_TOKEN} + @@ -214,9 +214,9 @@  

    - - {S_FORM_TOKEN} + + @@ -257,8 +257,8 @@ {L_CREATE_GROUP}:

    - {S_FORM_TOKEN} + @@ -280,8 +280,8 @@

    - {S_FORM_TOKEN} +
    @@ -320,8 +320,8 @@  

    - {S_FORM_TOKEN} + @@ -367,9 +367,8 @@  

    - - {S_FORM_TOKEN} + diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html index d8638f5bcd..85b8acc393 100644 --- a/phpBB/adm/style/acp_ban.html +++ b/phpBB/adm/style/acp_ban.html @@ -71,9 +71,8 @@  

    - - {S_FORM_TOKEN} +

    @@ -109,15 +108,17 @@  

    + {S_FORM_TOKEN}

    {L_NO_BAN_CELL}

    + {S_FORM_TOKEN} -{S_FORM_TOKEN} + diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html index 48b117cfc9..a0b0016a11 100644 --- a/phpBB/adm/style/acp_bbcodes.html +++ b/phpBB/adm/style/acp_bbcodes.html @@ -51,6 +51,7 @@ {L_SUBMIT}   + {S_FORM_TOKEN}
    @@ -77,7 +78,6 @@ - {S_FORM_TOKEN} @@ -110,8 +110,9 @@

    + {S_FORM_TOKEN} -{S_FORM_TOKEN} + diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html index 2569b162ca..bb16204801 100644 --- a/phpBB/adm/style/acp_board.html +++ b/phpBB/adm/style/acp_board.html @@ -42,10 +42,8 @@  

    - + {S_FORM_TOKEN} - -{S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html index 92778472d8..7783356574 100644 --- a/phpBB/adm/style/acp_bots.html +++ b/phpBB/adm/style/acp_bots.html @@ -49,9 +49,9 @@

      + {S_FORM_TOKEN}

    - {S_FORM_TOKEN} @@ -93,8 +93,8 @@

    {L_MARK_ALL} • {L_UNMARK_ALL}

    + {S_FORM_TOKEN} - {S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html index ecb60e4b59..d9d087d6ba 100644 --- a/phpBB/adm/style/acp_captcha.html +++ b/phpBB/adm/style/acp_captcha.html @@ -63,8 +63,8 @@     + {S_FORM_TOKEN} -{S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html index dc24b55bb1..8165efe9a2 100644 --- a/phpBB/adm/style/acp_database.html +++ b/phpBB/adm/style/acp_database.html @@ -23,9 +23,8 @@

    - + {S_FORM_TOKEN} - {S_FORM_TOKEN} @@ -85,8 +84,8 @@  

    - {S_FORM_TOKEN} + diff --git a/phpBB/adm/style/acp_disallow.html b/phpBB/adm/style/acp_disallow.html index 020135e227..b68d3ab3c0 100644 --- a/phpBB/adm/style/acp_disallow.html +++ b/phpBB/adm/style/acp_disallow.html @@ -38,8 +38,8 @@

    {L_NO_DISALLOWED}

    + {S_FORM_TOKEN} -{S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html index bb891de0b4..b1d9b4af11 100644 --- a/phpBB/adm/style/acp_email.html +++ b/phpBB/adm/style/acp_email.html @@ -47,8 +47,8 @@  

    - {S_FORM_TOKEN} + diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 91c15999e5..560bc195bc 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -317,8 +317,8 @@ {L_SUBMIT}   + {S_FORM_TOKEN} - {S_FORM_TOKEN} @@ -366,8 +366,8 @@

    - {S_FORM_TOKEN} + @@ -475,8 +475,8 @@ {L_SELECT_FORUM}: + {S_FORM_TOKEN} - {S_FORM_TOKEN}
    @@ -486,8 +486,8 @@ + {S_FORM_TOKEN} - {S_FORM_TOKEN}
    diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index b615099b7c..c90a075f9e 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -154,8 +154,8 @@ {L_SUBMIT}   + {S_FORM_TOKEN} - {S_FORM_TOKEN} @@ -260,8 +260,8 @@

    - {S_FORM_TOKEN} + @@ -309,8 +309,8 @@ {L_CREATE_GROUP}: + {S_FORM_TOKEN} - {S_FORM_TOKEN}

    {L_SPECIAL_GROUPS}

    diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html index e02840f1c5..8bb8257318 100644 --- a/phpBB/adm/style/acp_icons.html +++ b/phpBB/adm/style/acp_icons.html @@ -158,9 +158,8 @@  

    - - {S_FORM_TOKEN} + @@ -194,8 +193,8 @@

    - {S_FORM_TOKEN} + @@ -256,8 +255,8 @@

       

    - {S_FORM_TOKEN} + diff --git a/phpBB/adm/style/acp_inactive.html b/phpBB/adm/style/acp_inactive.html index b5a05ec799..240cec1643 100755 --- a/phpBB/adm/style/acp_inactive.html +++ b/phpBB/adm/style/acp_inactive.html @@ -60,12 +60,12 @@
    -

    {L_MARK_ALL} • {L_UNMARK_ALL}

    +

    {L_MARK_ALL} • {L_UNMARK_ALL}

    + {S_FORM_TOKEN}
    -{S_FORM_TOKEN} \ No newline at end of file diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html index b57ad59af5..2cc715493a 100644 --- a/phpBB/adm/style/acp_jabber.html +++ b/phpBB/adm/style/acp_jabber.html @@ -58,8 +58,8 @@
      + {S_FORM_TOKEN}
    -{S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html index a6f99c2b56..815ebb024a 100644 --- a/phpBB/adm/style/acp_language.html +++ b/phpBB/adm/style/acp_language.html @@ -54,8 +54,8 @@

    - {S_FORM_TOKEN} +

    @@ -92,7 +92,7 @@ - {S_FORM_TOKEN} +
    {S_FORM_TOKEN}


    @@ -157,11 +157,10 @@ {TPL} -    + {S_FORM_TOKEN}   - {S_FORM_TOKEN} @@ -198,10 +197,10 @@
    {HIDDEN} + {S_FORM_TOKEN}
    - {S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html index cc1765e2a4..11ab5faa9c 100644 --- a/phpBB/adm/style/acp_logs.html +++ b/phpBB/adm/style/acp_logs.html @@ -56,6 +56,7 @@
    {L_DISPLAY_LOG}:  {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR} + {S_FORM_TOKEN}
    @@ -79,7 +80,6 @@ -{S_FORM_TOKEN} \ No newline at end of file diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html index 729ac56c5e..5396e78557 100644 --- a/phpBB/adm/style/acp_modules.html +++ b/phpBB/adm/style/acp_modules.html @@ -115,8 +115,8 @@  

    - {S_FORM_TOKEN} + diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html index f6ca6081aa..725c7a5ec1 100644 --- a/phpBB/adm/style/acp_permission_roles.html +++ b/phpBB/adm/style/acp_permission_roles.html @@ -124,8 +124,8 @@
    + {S_FORM_TOKEN}
    - {S_FORM_TOKEN} » {L_BACK_TO_TOP}
    @@ -178,8 +178,8 @@
    {L_CREATE_ROLE}:
    + {S_FORM_TOKEN}
    - {S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html index a4797fcc4f..b4386d5f19 100644 --- a/phpBB/adm/style/acp_permissions.html +++ b/phpBB/adm/style/acp_permissions.html @@ -35,11 +35,11 @@

    {S_HIDDEN_FIELDS} + {S_FORM_TOKEN}

    - {S_FORM_TOKEN} @@ -56,11 +56,11 @@

    {S_HIDDEN_FIELDS} + {S_FORM_TOKEN}

    - {S_FORM_TOKEN} @@ -80,10 +80,10 @@

    {S_HIDDEN_FIELDS} + {S_FORM_TOKEN}

    - {S_FORM_TOKEN} @@ -99,11 +99,11 @@

    {S_HIDDEN_FIELDS} + {S_FORM_TOKEN}

    - {S_FORM_TOKEN} @@ -126,9 +126,9 @@
    {S_HIDDEN_FIELDS} + {S_FORM_TOKEN}  
    - {S_FORM_TOKEN}
    @@ -144,9 +144,9 @@
    {S_HIDDEN_FIELDS} + {S_FORM_TOKEN}
    - {S_FORM_TOKEN}
    @@ -171,9 +171,9 @@
    {S_HIDDEN_FIELDS} + {S_FORM_TOKEN}  
    - {S_FORM_TOKEN}
    @@ -187,10 +187,9 @@
    {S_HIDDEN_FIELDS} + {S_FORM_TOKEN}
    - - {S_FORM_TOKEN}
    @@ -214,10 +213,9 @@
    {S_HIDDEN_FIELDS} + {S_FORM_TOKEN}
    - - {S_FORM_TOKEN}
    @@ -234,9 +232,9 @@
    {S_HIDDEN_FIELDS} + {S_FORM_TOKEN}
    - {S_FORM_TOKEN}
    @@ -256,10 +254,9 @@
    {S_HIDDEN_FIELDS} + {S_FORM_TOKEN}
    - - {S_FORM_TOKEN}
    @@ -275,10 +272,9 @@
    {S_HIDDEN_FIELDS} + {S_FORM_TOKEN}
    - - {S_FORM_TOKEN}
    @@ -318,11 +314,11 @@
    {S_HIDDEN_FIELDS} + {S_FORM_TOKEN} {L_SELECT_TYPE}:
    - {S_FORM_TOKEN} @@ -347,11 +343,11 @@
    + {S_FORM_TOKEN}


    - {S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html index 912e58b43c..eec975ad25 100644 --- a/phpBB/adm/style/acp_profile.html +++ b/phpBB/adm/style/acp_profile.html @@ -108,6 +108,7 @@
    {S_HIDDEN_FIELDS} + {S_FORM_TOKEN}
    @@ -129,6 +130,7 @@
    {S_HIDDEN_FIELDS} + {S_FORM_TOKEN}
    @@ -153,10 +155,11 @@
    {S_HIDDEN_FIELDS} + {S_FORM_TOKEN}
    - {S_FORM_TOKEN} + @@ -216,8 +219,8 @@ + {S_FORM_TOKEN} - {S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html index 14a367ce27..890a3ba569 100644 --- a/phpBB/adm/style/acp_prune_forums.html +++ b/phpBB/adm/style/acp_prune_forums.html @@ -97,11 +97,10 @@

    {S_HIDDEN_FIELDS} - + {S_FORM_TOKEN}

    - {S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html index 7d84146267..0f2b23dcef 100644 --- a/phpBB/adm/style/acp_prune_users.html +++ b/phpBB/adm/style/acp_prune_users.html @@ -51,9 +51,9 @@   + {S_FORM_TOKEN}

    -{S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html index 482fbcb02c..9306e30269 100644 --- a/phpBB/adm/style/acp_ranks.html +++ b/phpBB/adm/style/acp_ranks.html @@ -50,9 +50,9 @@   + {S_FORM_TOKEN}

    - {S_FORM_TOKEN} @@ -88,9 +88,9 @@

    + {S_FORM_TOKEN}

    - {S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_reasons.html b/phpBB/adm/style/acp_reasons.html index 221a776a24..23fcfbdeb8 100644 --- a/phpBB/adm/style/acp_reasons.html +++ b/phpBB/adm/style/acp_reasons.html @@ -52,9 +52,9 @@

      + {S_FORM_TOKEN}

    - {S_FORM_TOKEN} @@ -116,10 +116,10 @@ + {S_FORM_TOKEN}

    - {S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html index d4937c6ecc..0879780749 100644 --- a/phpBB/adm/style/acp_search.html +++ b/phpBB/adm/style/acp_search.html @@ -59,9 +59,8 @@ {L_SUBMIT}   + {S_FORM_TOKEN} - - {S_FORM_TOKEN} @@ -90,8 +89,8 @@ {L_SUBMIT}   + {S_FORM_TOKEN} - {S_FORM_TOKEN} @@ -141,8 +140,9 @@

    - {S_FORM_TOKEN} + + diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index a067e1a16b..4b3bcddf1d 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -25,9 +25,9 @@

    + {S_FORM_TOKEN}

    - {S_FORM_TOKEN} @@ -147,8 +147,8 @@
    {L_SUBMIT}    + {S_FORM_TOKEN}
    - {S_FORM_TOKEN} @@ -170,10 +170,9 @@
    + {S_FORM_TOKEN} - - {S_FORM_TOKEN} @@ -253,10 +252,9 @@
    {L_SUBMIT} {S_HIDDEN_FIELDS} + {S_FORM_TOKEN}
    - - {S_FORM_TOKEN} @@ -301,12 +299,10 @@

    {L_MARK_ALL} :: {L_UNMARK_ALL}
    - + {S_FORM_TOKEN}

    - - {S_FORM_TOKEN} @@ -360,11 +356,12 @@

    + {S_FORM_TOKEN}

    - {S_FORM_TOKEN} + @@ -508,9 +505,9 @@
    {L_SUBMIT} + {S_FORM_TOKEN}
    - {S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index 593889e7d1..2e4b3ef8f2 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -46,8 +46,8 @@
    + {S_FORM_TOKEN}
    - {S_FORM_TOKEN} @@ -69,8 +69,8 @@
    {L_SELECT_FORM}: + {S_FORM_TOKEN}
    - {S_FORM_TOKEN} @@ -109,8 +109,8 @@
    + {S_FORM_TOKEN}
    - {S_FORM_TOKEN} @@ -143,9 +143,9 @@
    {L_USER_GROUP_ADD}: + {S_FORM_TOKEN}
    - {S_FORM_TOKEN} @@ -201,8 +201,8 @@

    {L_MARK_ALL} • {L_UNMARK_ALL}

    + {S_FORM_TOKEN}
    - {S_FORM_TOKEN} @@ -217,8 +217,8 @@
    {L_SELECT_FORUM}: + {S_FORM_TOKEN}
    - {S_FORM_TOKEN}
     
    diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html index 2b5745ebb6..20b5b60050 100644 --- a/phpBB/adm/style/acp_users_avatar.html +++ b/phpBB/adm/style/acp_users_avatar.html @@ -70,7 +70,7 @@
    + {S_FORM_TOKEN}
    - {S_FORM_TOKEN} \ No newline at end of file diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html index da699968c5..0611ccba46 100644 --- a/phpBB/adm/style/acp_users_overview.html +++ b/phpBB/adm/style/acp_users_overview.html @@ -61,10 +61,10 @@

    + {S_FORM_TOKEN}

    -{S_FORM_TOKEN} @@ -134,11 +134,11 @@

    + {S_FORM_TOKEN}

    - {S_FORM_TOKEN} diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html index b8b847bd14..07a9bc5c78 100644 --- a/phpBB/adm/style/acp_users_prefs.html +++ b/phpBB/adm/style/acp_users_prefs.html @@ -152,7 +152,7 @@
    + {S_FORM_TOKEN}
    - {S_FORM_TOKEN} \ No newline at end of file diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html index 959494f5e3..0d1c6f8e46 100644 --- a/phpBB/adm/style/acp_users_profile.html +++ b/phpBB/adm/style/acp_users_profile.html @@ -61,7 +61,6 @@
    + {S_FORM_TOKEN}
    - - {S_FORM_TOKEN} \ No newline at end of file diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html index 3b6303319b..a6664a40e4 100644 --- a/phpBB/adm/style/acp_users_signature.html +++ b/phpBB/adm/style/acp_users_signature.html @@ -112,6 +112,6 @@
      + {S_FORM_TOKEN}
    -{S_FORM_TOKEN} \ No newline at end of file diff --git a/phpBB/adm/style/acp_words.html b/phpBB/adm/style/acp_words.html index 3f99637418..9bd0bf11a0 100644 --- a/phpBB/adm/style/acp_words.html +++ b/phpBB/adm/style/acp_words.html @@ -27,9 +27,9 @@

      + {S_FORM_TOKEN}

    - {S_FORM_TOKEN} @@ -65,9 +65,8 @@ - - {S_FORM_TOKEN} + diff --git a/phpBB/styles/prosilver/template/confirm_body.html b/phpBB/styles/prosilver/template/confirm_body.html index bc61b0a392..5b783915a4 100644 --- a/phpBB/styles/prosilver/template/confirm_body.html +++ b/phpBB/styles/prosilver/template/confirm_body.html @@ -1,7 +1,6 @@
    -{S_FORM_TOKEN}
    diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html index 95e9304943..ac0d4bb36d 100644 --- a/phpBB/styles/prosilver/template/index_body.html +++ b/phpBB/styles/prosilver/template/index_body.html @@ -16,7 +16,6 @@ - {S_FORM_TOKEN}

    {L_LOGIN_LOGOUT}  •  {L_REGISTER}

    -{S_FORM_TOKEN} \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_front.html b/phpBB/styles/prosilver/template/mcp_front.html index 3431d4f925..a186d95970 100644 --- a/phpBB/styles/prosilver/template/mcp_front.html +++ b/phpBB/styles/prosilver/template/mcp_front.html @@ -46,6 +46,7 @@
    + {S_FORM_TOKEN}
    @@ -55,8 +56,7 @@
    {L_MARK_ALL} :: {L_UNMARK_ALL}
    - {S_FORM_TOKEN} - + diff --git a/phpBB/styles/prosilver/template/mcp_logs.html b/phpBB/styles/prosilver/template/mcp_logs.html index 415cee547d..bf1e867be3 100644 --- a/phpBB/styles/prosilver/template/mcp_logs.html +++ b/phpBB/styles/prosilver/template/mcp_logs.html @@ -63,7 +63,7 @@ • {PAGE_NUMBER} • {PAGINATION} • {PAGE_NUMBER} - + {S_FORM_TOKEN} @@ -76,10 +76,10 @@ + {S_FORM_TOKEN} - {S_FORM_TOKEN}
    diff --git a/phpBB/styles/prosilver/template/mcp_move.html b/phpBB/styles/prosilver/template/mcp_move.html index 59c69795d1..804d76b14b 100644 --- a/phpBB/styles/prosilver/template/mcp_move.html +++ b/phpBB/styles/prosilver/template/mcp_move.html @@ -24,13 +24,13 @@
    {S_HIDDEN_FIELDS}  + {S_FORM_TOKEN}
    -{S_FORM_TOKEN} \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_notes_front.html b/phpBB/styles/prosilver/template/mcp_notes_front.html index dda7ff90d3..045a7619ed 100644 --- a/phpBB/styles/prosilver/template/mcp_notes_front.html +++ b/phpBB/styles/prosilver/template/mcp_notes_front.html @@ -21,8 +21,8 @@
      + {S_FORM_TOKEN}
    -{S_FORM_TOKEN} \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html index 19f2faacbe..a039aec04a 100644 --- a/phpBB/styles/prosilver/template/mcp_notes_user.html +++ b/phpBB/styles/prosilver/template/mcp_notes_user.html @@ -44,6 +44,7 @@
    {S_HIDDEN_FIELDS}  + {S_FORM_TOKEN}
    @@ -116,7 +117,6 @@ -{S_FORM_TOKEN} \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html index 5a3ba7f24c..b7c59b9a8b 100644 --- a/phpBB/styles/prosilver/template/mcp_post.html +++ b/phpBB/styles/prosilver/template/mcp_post.html @@ -32,8 +32,8 @@ + {S_FORM_TOKEN} - {S_FORM_TOKEN} @@ -60,8 +60,8 @@   + {S_FORM_TOKEN}

    - {S_FORM_TOKEN} @@ -121,8 +121,8 @@ [ {L_FIND_USERNAME} ] - {S_FORM_TOKEN} + @@ -138,8 +138,8 @@ - {S_FORM_TOKEN} + @@ -196,8 +196,8 @@
      + {S_FORM_TOKEN}
    - {S_FORM_TOKEN}
    diff --git a/phpBB/styles/prosilver/template/mcp_queue.html b/phpBB/styles/prosilver/template/mcp_queue.html index 805d7d7e09..e2f140667c 100644 --- a/phpBB/styles/prosilver/template/mcp_queue.html +++ b/phpBB/styles/prosilver/template/mcp_queue.html @@ -5,6 +5,7 @@
    + {S_FORM_TOKEN}

    {L_TITLE}

    @@ -90,7 +91,6 @@
    {L_MARK_ALL} :: {L_UNMARK_ALL}
    -{S_FORM_TOKEN} \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_reports.html b/phpBB/styles/prosilver/template/mcp_reports.html index a515c4f7ed..bc878f496c 100644 --- a/phpBB/styles/prosilver/template/mcp_reports.html +++ b/phpBB/styles/prosilver/template/mcp_reports.html @@ -5,6 +5,7 @@
    + {S_FORM_TOKEN}

    {L_TITLE}

    @@ -79,7 +80,6 @@
    {L_MARK_ALL} :: {L_UNMARK_ALL}
    -{S_FORM_TOKEN} \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html index 111030914d..122f861fd7 100644 --- a/phpBB/styles/prosilver/template/mcp_topic.html +++ b/phpBB/styles/prosilver/template/mcp_topic.html @@ -161,10 +161,10 @@ onload_functions.push('subPanels()');  
    {L_MARK_ALL} :: {L_UNMARK_ALL}
    - - {S_HIDDEN_FIELDS} {S_FORM_TOKEN} + + \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_viewlogs.html b/phpBB/styles/prosilver/template/mcp_viewlogs.html index fb02c4e9de..264152d3ae 100644 --- a/phpBB/styles/prosilver/template/mcp_viewlogs.html +++ b/phpBB/styles/prosilver/template/mcp_viewlogs.html @@ -37,8 +37,10 @@ {L_NO_ENTRIES} +
    + {S_FORM_TOKEN} +
    -{S_FORM_TOKEN} diff --git a/phpBB/styles/prosilver/template/mcp_warn_front.html b/phpBB/styles/prosilver/template/mcp_warn_front.html index e861136463..fc8fa37fab 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_front.html +++ b/phpBB/styles/prosilver/template/mcp_warn_front.html @@ -23,8 +23,8 @@
      + {S_FORM_TOKEN}
    -{S_FORM_TOKEN}
    diff --git a/phpBB/styles/prosilver/template/mcp_warn_list.html b/phpBB/styles/prosilver/template/mcp_warn_list.html index 250d542808..a432df4240 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_list.html +++ b/phpBB/styles/prosilver/template/mcp_warn_list.html @@ -57,10 +57,10 @@
    - - {S_FORM_TOKEN} + + \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_warn_post.html b/phpBB/styles/prosilver/template/mcp_warn_post.html index 1fb0ea0a0a..5937598a52 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_post.html +++ b/phpBB/styles/prosilver/template/mcp_warn_post.html @@ -65,8 +65,8 @@
      + {S_FORM_TOKEN}
    -{S_FORM_TOKEN} \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_warn_user.html b/phpBB/styles/prosilver/template/mcp_warn_user.html index 64ed5b0085..c807a6b640 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_user.html +++ b/phpBB/styles/prosilver/template/mcp_warn_user.html @@ -49,8 +49,8 @@
      + {S_FORM_TOKEN}
    -{S_FORM_TOKEN} \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/memberlist_email.html b/phpBB/styles/prosilver/template/memberlist_email.html index ce4eec9ad8..e8870d8921 100644 --- a/phpBB/styles/prosilver/template/memberlist_email.html +++ b/phpBB/styles/prosilver/template/memberlist_email.html @@ -57,8 +57,9 @@ - {S_FORM_TOKEN} + + \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html index e6174510b7..9bb1f90a58 100644 --- a/phpBB/styles/prosilver/template/memberlist_im.html +++ b/phpBB/styles/prosilver/template/memberlist_im.html @@ -76,12 +76,12 @@
    {L_IM_SENT_JABBER}
    + {S_FORM_TOKEN} {L_CLOSE_WINDOW} -{S_FORM_TOKEN}