From 6f41f5be78f0eb8145a593bcd6657dbad99ecc89 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Sun, 24 Jun 2007 22:05:50 +0000 Subject: [PATCH 01/50] Well, let's add the implementation. :| git-svn-id: file:///svn/phpbb/trunk@7794 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/index.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 78c876808b..836d2556f8 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -430,6 +430,21 @@ function validate_config_vars($config_vars, &$cfg_array, &$error) break; + // Absolute path + case 'lang': + if (!$cfg_array[$config_name]) + { + break; + } + + $cfg_array[$config_name] = basename($cfg_array[$config_name]); + + if (!file_exists($phpbb_root_path . 'language/' . $cfg_array[$config_name] . '/')) + { + $error[] = $user->lang['WRONG_DATA_LANG']; + } + break; + // Relative path (appended $phpbb_root_path) case 'rpath': case 'rwpath': From b3c1501e269421540f0f177b011d99415c774aec Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Mon, 25 Jun 2007 13:36:28 +0000 Subject: [PATCH 02/50] yeah, forgot these few lines. :( git-svn-id: file:///svn/phpbb/trunk@7795 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 17 ++++++++++++++++- phpBB/memberlist.php | 14 +++++++------- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 72fb2d5ad4..4d52e30a61 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -169,6 +169,7 @@ p a {
  1. Changelog
      +
    1. Changes since RC-2
    2. Changes since RC-1
    2. @@ -179,7 +180,21 @@ p a {

    1. Changelog

    - 1.i. Changes since 3.0.RC1 + 1.i. Changes since 3.0.RC2 +

    +
    + +
      +
    • [Fix] Re-allow searching within the memberlist
      • +
    + +
    + Top +

    + +
    + + 1.ii. Changes since 3.0.RC1

    diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 76b6aa2d27..ea13a0b49e 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -934,13 +934,13 @@ switch ($mode) $s_find_active_time .= ''; } - $sql_where .= ($username) ? ' AND u.username_clean ' . $db->sql_like_expression(str_replace('*', '%', utf8_clean_string($username))) : ''; - $sql_where .= ($email) ? ' AND u.user_email ' . $db->sql_like_expression(str_replace('*', '%', $email)) . ' ' : ''; - $sql_where .= ($icq) ? ' AND u.user_icq ' . $db->sql_like_expression(str_replace('*', '%', $icq)) . ' ' : ''; - $sql_where .= ($aim) ? ' AND u.user_aim ' . $db->sql_like_expression(str_replace('*', '%', $aim)) . ' ' : ''; - $sql_where .= ($yahoo) ? ' AND u.user_yim ' . $db->sql_like_expression(str_replace('*', '%', $yahoo)) . ' ' : ''; - $sql_where .= ($msn) ? ' AND u.user_msnm ' . $db->sql_like_expression(str_replace('*', '%', $msn)) . ' ' : ''; - $sql_where .= ($jabber) ? ' AND u.user_jabber ' . $db->sql_like_expression(str_replace('*', '%', $jabber)) . ' ' : ''; + $sql_where .= ($username) ? ' AND u.username_clean ' . $db->sql_like_expression(str_replace('*', $db->any_char, utf8_clean_string($username))) : ''; + $sql_where .= ($email) ? ' AND u.user_email ' . $db->sql_like_expression(str_replace('*', $db->any_char, $email)) . ' ' : ''; + $sql_where .= ($icq) ? ' AND u.user_icq ' . $db->sql_like_expression(str_replace('*', $db->any_char, $icq)) . ' ' : ''; + $sql_where .= ($aim) ? ' AND u.user_aim ' . $db->sql_like_expression(str_replace('*', $db->any_char, $aim)) . ' ' : ''; + $sql_where .= ($yahoo) ? ' AND u.user_yim ' . $db->sql_like_expression(str_replace('*', $db->any_char, $yahoo)) . ' ' : ''; + $sql_where .= ($msn) ? ' AND u.user_msnm ' . $db->sql_like_expression(str_replace('*', $db->any_char, $msn)) . ' ' : ''; + $sql_where .= ($jabber) ? ' AND u.user_jabber ' . $db->sql_like_expression(str_replace('*', $db->any_char, $jabber)) . ' ' : ''; $sql_where .= (is_numeric($count)) ? ' AND u.user_posts ' . $find_key_match[$count_select] . ' ' . (int) $count . ' ' : ''; $sql_where .= (sizeof($joined) > 1) ? " AND u.user_regdate " . $find_key_match[$joined_select] . ' ' . gmmktime(0, 0, 0, intval($joined[1]), intval($joined[2]), intval($joined[0])) : ''; $sql_where .= (sizeof($active) > 1) ? " AND u.user_lastvisit " . $find_key_match[$active_select] . ' ' . gmmktime(0, 0, 0, $active[1], intval($active[2]), intval($active[0])) : ''; From a3fd064b8a3754c906d2710121500962fef2f557 Mon Sep 17 00:00:00 2001 From: David M Date: Mon, 25 Jun 2007 15:28:47 +0000 Subject: [PATCH 03/50] a reminder for us all :) git-svn-id: file:///svn/phpbb/trunk@7796 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/coding-guidelines.html | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index 5dd70928fd..8fd904e7c0 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -780,6 +780,23 @@ $sql = 'SELECT *

    In other words use single quotes where no variable substitution is required or where the variable involved shouldn't appear within double quotes. Otherwise use double quotes.

    +

    Avoid DB specific SQL:

    +

    The "not equals operator", as defined by the SQL:2003 standard, is "<>"

    + +

    // This is wrong.

    + 
    +$sql = 'SELECT * 
+	FROM ' . SOME_TABLE . ' 
+	WHERE a != 2';
+
    + +

    // This is right.

    + 
    +$sql = 'SELECT * 
+	FROM ' . SOME_TABLE . ' 
+	WHERE a <> 2';
+
    +

    Common DBAL methods:

    sql_escape():

    From 2ed2996ebf54c42ca53f11cac683b38263043ba3 Mon Sep 17 00:00:00 2001 From: David M Date: Mon, 25 Jun 2007 23:58:11 +0000 Subject: [PATCH 04/50] - Force prune related values to integers during conversions git-svn-id: file:///svn/phpbb/trunk@7797 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/install/convertors/functions_phpbb20.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 4d52e30a61..d4f6a1149c 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -186,6 +186,7 @@ p a {
    • [Fix] Re-allow searching within the memberlist
      • +
    • [Fix] Force prune related values to integers during conversions
    diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index eca72b64bd..9b5e236b6d 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -216,10 +216,10 @@ function phpbb_insert_forums() 'forum_type' => FORUM_POST, 'forum_status' => is_item_locked($row['forum_status']), 'enable_prune' => ($prune_enabled) ? $row['prune_enable'] : 0, - 'prune_next' => null_to_zero($row['prune_next']), - 'prune_days' => null_to_zero($row['prune_days']), + 'prune_next' => (int) null_to_zero($row['prune_next']), + 'prune_days' => (int) null_to_zero($row['prune_days']), 'prune_viewed' => 0, - 'prune_freq' => null_to_zero($row['prune_freq']), + 'prune_freq' => (int) null_to_zero($row['prune_freq']), 'forum_flags' => phpbb_forum_flags(), From 28521e556840c79f882ce48cfee499bd531e340f Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 26 Jun 2007 13:53:07 +0000 Subject: [PATCH 05/50] fixing bugs within the updater... git-svn-id: file:///svn/phpbb/trunk@7798 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/install_update_diff.html | 2 +- phpBB/docs/CHANGELOG.html | 2 ++ phpBB/install/install_update.php | 38 ++++++++++++++++++++++-- phpBB/language/en/install.php | 2 +- 4 files changed, 39 insertions(+), 5 deletions(-) diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html index 794d285574..54242d94b4 100644 --- a/phpBB/adm/style/install_update_diff.html +++ b/phpBB/adm/style/install_update_diff.html @@ -54,7 +54,7 @@ div#codepanel { } - + /** * Unified Diff */ diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index d4f6a1149c..e2bb0a6ba1 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -187,6 +187,8 @@ p a {
    • [Fix] Re-allow searching within the memberlist
    • [Fix] Force prune related values to integers during conversions
      • +
    • [Fix] Updater now detects successfully merged files having conflicts and user chose to merge with modifications [Bug #12685]
      • +
    • [Fix] Updater is no longer listing missing language entries and styles if these had been removed [Bug #12655]
    diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 3a68e271ed..5c83ac2c67 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -776,11 +776,18 @@ class install_update extends module global $phpbb_root_path, $template, $user; $this->tpl_name = 'install_update_diff'; + + // Got the diff template itself updated? If so, we are able to directly use it + if (in_array('adm/style/install_update_diff.html', $this->update_info['files'])) + { + $this->tpl_name = '../../install/update/new/adm/style/install_update_diff'; + } + $this->page_title = 'VIEWING_FILE_DIFF'; $status = request_var('status', ''); $file = request_var('file', ''); - $diff_mode = request_var('diff_mode', 'inline'); + $diff_mode = request_var('diff_mode', 'side_by_side'); // First of all make sure the file is within our file update list with the correct status $found_entry = array(); @@ -852,6 +859,8 @@ class install_update extends module 'S_DIFF_CONFLICT_FILE' => true, 'NUM_CONFLICTS' => $diff->merged_output(false, false, false, true)) ); + + $diff = $this->return_diff($phpbb_root_path . $file, $diff->merged_output()); break; } @@ -947,7 +956,11 @@ class install_update extends module } else { - $update_list['no_update'][] = $file; + // Do not include style-related or language-related content + if (strpos($file, 'styles/') !== 0 && strpos($file, 'language/') !== 0) + { + $update_list['no_update'][] = $file; + } } unset($this->update_info['files'][$index]); } @@ -1090,8 +1103,25 @@ class install_update extends module if ($diff->merged_output(false, false, false, true)) { $update_ary['conflicts'] = $diff->_conflicting_blocks; - $update_list['conflict'][] = $update_ary; + // There is one special case... users having merged with a conflicting file... we need to check this + $tmp = array( + 'file1' => file_get_contents($phpbb_root_path . $file), + 'file2' => implode("\n", $diff->merged_orig_output()), + ); + + $diff = &new diff($tmp['file1'], $tmp['file2'], false); + $empty = $diff->is_empty(); + + if ($empty) + { + unset($update_ary['conflicts']); + unset($diff); + $update_list['up_to_date'][] = $update_ary; + return; + } + + $update_list['conflict'][] = $update_ary; unset($diff); return; @@ -1108,6 +1138,8 @@ class install_update extends module if ($empty) { + unset($diff); + $update_list['up_to_date'][] = $update_ary; return; } diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 8f37b52c09..c81b5c9f7b 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -394,7 +394,7 @@ $lang = array_merge($lang, array( 'FILE_DIFF_NOT_ALLOWED' => 'File not allowed to be diffed.', 'FILE_USED' => 'Information used from', // Single file 'FILES_CONFLICT' => 'Conflict files', - 'FILES_CONFLICT_EXPLAIN' => 'The following files are modified and do not represent the original files from the old version. phpBB determined that these files create conflicts if they are tried to be merged. Please investigate the conflicts and try to manually resolve them or continue the update choosing the preferred merging method. If you resolve the conflicts manually check the files again after you modified the them. You are also able to choose between the preferred merge method for every file. The first one will result in a file where the conflicting lines from your old file will be lost, the other one will result in loosing the changes from the newer file.', + 'FILES_CONFLICT_EXPLAIN' => 'The following files are modified and do not represent the original files from the old version. phpBB determined that these files create conflicts if they are tried to be merged. Please investigate the conflicts and try to manually resolve them or continue the update choosing the preferred merging method. If you resolve the conflicts manually check the files again after you modified them. You are also able to choose between the preferred merge method for every file. The first one will result in a file where the conflicting lines from your old file will be lost, the other one will result in loosing the changes from the newer file.', 'FILES_MODIFIED' => 'Modified files', 'FILES_MODIFIED_EXPLAIN' => 'The following files are modified and do not represent the original files from the old version. The updated file will be a merge between your modifications and the new file.', 'FILES_NEW' => 'New files', From 71b99a3f0449663eaf2a02a12119a1ceaad4409d Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 26 Jun 2007 13:53:41 +0000 Subject: [PATCH 06/50] and up the version number git-svn-id: file:///svn/phpbb/trunk@7799 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/install/schemas/schema_data.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 321cae118c..e3256f466c 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -205,7 +205,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page', INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.RC2'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.RC3-dev'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); From 78c1256e5cc3b5372c7b07cc4a13215c4f779c25 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Tue, 26 Jun 2007 14:27:22 +0000 Subject: [PATCH 07/50] Minor fixes #12699 git-svn-id: file:///svn/phpbb/trunk@7800 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/functions_posting.php | 5 +++++ phpBB/language/en/ucp.php | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index e2bb0a6ba1..9ec9144bb4 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -189,6 +189,7 @@ p a {
  2. [Fix] Force prune related values to integers during conversions
  3. [Fix] Updater now detects successfully merged files having conflicts and user chose to merge with modifications [Bug #12685]
  4. [Fix] Updater is no longer listing missing language entries and styles if these had been removed [Bug #12655]
    5. +
  5. [Fix] Correct approval of posts in global announcements (Bug #12699)
    6. diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 282e74fa7c..cf38f07a15 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -115,11 +115,16 @@ function update_post_information($type, $ids, $return_update_sql = false) { global $db; + if (empty($ids)) + { + return; + } if (!is_array($ids)) { $ids = array($ids); } + $update_sql = $empty_forums = $not_empty_forums = array(); if ($type != 'topic') diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 304b9952d1..de000cd0b3 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -210,7 +210,7 @@ $lang = array_merge($lang, array( 'GLOBAL_ANNOUNCEMENT' => 'Global announcement', 'HIDE_ONLINE' => 'Hide my online status', - 'HIDE_ONLINE_EXPLAIN' => 'Changing this setting to "No" won\'t become effective until your next visit to the board.', + 'HIDE_ONLINE_EXPLAIN' => 'Changing this setting won\'t become effective until your next visit to the board.', 'HOLD_NEW_MESSAGES' => 'Do not accept new messages (New messages will be held back until enough space is available)', 'HOLD_NEW_MESSAGES_SHORT' => 'New messages will be held back', From 3092624b9b8a5305199ed4f4e10ef76a9f89abf9 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Wed, 27 Jun 2007 10:08:33 +0000 Subject: [PATCH 08/50] #12771 git-svn-id: file:///svn/phpbb/trunk@7801 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/session.php | 41 ++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index c297a961a8..e97f3ac8e6 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -1510,29 +1510,32 @@ class user extends session } } - // Make sure the user is able to hide his session - if (!$this->data['session_viewonline']) + if (isset($this->data['session_viewonline'])) { - // Reset online status if not allowed to hide the session... - if (!$auth->acl_get('u_hideonline')) + // Make sure the user is able to hide his session + if (!$this->data['session_viewonline']) { - $sql = 'UPDATE ' . SESSIONS_TABLE . ' - SET session_viewonline = 1 - WHERE session_user_id = ' . $this->data['user_id']; - $db->sql_query($sql); - $this->data['session_viewonline'] = 1; + // Reset online status if not allowed to hide the session... + if (!$auth->acl_get('u_hideonline')) + { + $sql = 'UPDATE ' . SESSIONS_TABLE . ' + SET session_viewonline = 1 + WHERE session_user_id = ' . $this->data['user_id']; + $db->sql_query($sql); + $this->data['session_viewonline'] = 1; + } } - } - else if (!$this->data['user_allow_viewonline']) - { - // the user wants to hide and is allowed to -> cloaking device on. - if ($auth->acl_get('u_hideonline')) + else if (!$this->data['user_allow_viewonline']) { - $sql = 'UPDATE ' . SESSIONS_TABLE . ' - SET session_viewonline = 0 - WHERE session_user_id = ' . $this->data['user_id']; - $db->sql_query($sql); - $this->data['session_viewonline'] = 0; + // the user wants to hide and is allowed to -> cloaking device on. + if ($auth->acl_get('u_hideonline')) + { + $sql = 'UPDATE ' . SESSIONS_TABLE . ' + SET session_viewonline = 0 + WHERE session_user_id = ' . $this->data['user_id']; + $db->sql_query($sql); + $this->data['session_viewonline'] = 0; + } } } From 547bf5086682f65287551984bfc9ce5e1b928290 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Wed, 27 Jun 2007 15:46:22 +0000 Subject: [PATCH 09/50] reset permissions within the update process (also on re-runs of the updater due to it being outside of the version code). git-svn-id: file:///svn/phpbb/trunk@7802 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/install/database_update.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 56327f3a8c..f8222956e7 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -647,6 +647,10 @@ $sql = "UPDATE " . CONFIG_TABLE . " WHERE config_name = 'version'"; _sql($sql, $errored, $error_ary); +// Reset permissions +$sql = 'UPDATE ' . USERS_TABLE . " + SET user_permissions = ''"; +_sql($sql, $errored, $error_ary); /* Optimize/vacuum analyze the tables where appropriate // this should be done for each version in future along with From 190f35c4569a90f6b653e3f6b659db5f44516fff Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Wed, 27 Jun 2007 15:54:23 +0000 Subject: [PATCH 10/50] also refresh permissions on purge git-svn-id: file:///svn/phpbb/trunk@7803 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/acp/acp_main.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index b944765011..f7205a6b7a 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -270,6 +270,10 @@ class acp_main global $cache; $cache->purge(); + + // Clear permissions + $auth->acl_clear_prefetch(); + add_log('admin', 'LOG_PURGE_CACHE'); break; } From d57a16ad6964cc76843b7571f29c999ab6d8577a Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Wed, 27 Jun 2007 16:02:41 +0000 Subject: [PATCH 11/50] deny access to the posting page for bots... git-svn-id: file:///svn/phpbb/trunk@7804 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 6 ++++-- phpBB/posting.php | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 9ec9144bb4..c762718e33 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -187,9 +187,11 @@ p a {
    • [Fix] Re-allow searching within the memberlist
    • [Fix] Force prune related values to integers during conversions
      • -
    • [Fix] Updater now detects successfully merged files having conflicts and user chose to merge with modifications [Bug #12685]
      • -
    • [Fix] Updater is no longer listing missing language entries and styles if these had been removed [Bug #12655]
      • +
    • [Fix] Updater now detects successfully merged files having conflicts and user chose to merge with modifications (Bug #12685)
      • +
    • [Fix] Updater is no longer listing missing language entries and styles if these had been removed (Bug #12655)
    • [Fix] Correct approval of posts in global announcements (Bug #12699)
      • +
    • [Sec] Do not allow setup spiders/robots to post, even if permissions are given. We see no reason why this should be possible. (Thanks to Frank Rizzo for convincing us regarding this)
      • +
    diff --git a/phpBB/posting.php b/phpBB/posting.php index 675b390672..f3e6c008c4 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -164,6 +164,10 @@ if ($post_data['forum_password']) } // Check permissions +if ($user->data['is_bot']) +{ + redirect(append_sid("{$phpbb_root_path}index.$phpEx")); +} // Is the user able to read within this forum? if (!$auth->acl_get('f_read', $forum_id)) From f9ea21a0836301bc21b8f1288695767cd15543ab Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Thu, 28 Jun 2007 14:55:48 +0000 Subject: [PATCH 12/50] fixing some bugs git-svn-id: file:///svn/phpbb/trunk@7805 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 4 ++++ phpBB/includes/functions_profile_fields.php | 7 ++++--- phpBB/includes/message_parser.php | 7 +++++-- phpBB/includes/session.php | 13 +++++++++++-- phpBB/language/en/install.php | 10 +++++----- phpBB/memberlist.php | 5 +++-- .../styles/prosilver/template/memberlist_body.html | 8 ++++---- .../prosilver/template/memberlist_search.html | 2 ++ .../subsilver2/template/memberlist_search.html | 4 ++++ 9 files changed, 42 insertions(+), 18 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index c762718e33..6827a0c505 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -191,6 +191,10 @@ p a {
  6. [Fix] Updater is no longer listing missing language entries and styles if these had been removed (Bug #12655)
  7. [Fix] Correct approval of posts in global announcements (Bug #12699)
  8. [Sec] Do not allow setup spiders/robots to post, even if permissions are given. We see no reason why this should be possible. (Thanks to Frank Rizzo for convincing us regarding this)
    9. +
  9. [Sec] Do not display the last active column within the memberlist if u_viewonline permission is not given (Bug #12797)
    10. +
  10. [Fix] Display custom profile field "date" based on users language (Bug #12787)
    11. +
  11. [Fix] Allow adding of help language files within subdirectories (Bug #12783)
    12. +
  12. [Fix] Correctly apply smileys on posting having # within their emotion code
    13. diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php index 47d3ae03a9..7c5e39c3a7 100644 --- a/phpBB/includes/functions_profile_fields.php +++ b/phpBB/includes/functions_profile_fields.php @@ -469,8 +469,8 @@ class custom_profile // case 'datetime': case 'date': $date = explode('-', $value); - $month = (isset($date[0])) ? (int) $date[0] : 0; - $day = (isset($date[1])) ? (int) $date[1] : 0; + $day = (isset($date[0])) ? (int) $date[0] : 0; + $month = (isset($date[1])) ? (int) $date[1] : 0; $year = (isset($date[2])) ? (int) $date[2] : 0; if (!$day && !$month && !$year) @@ -479,7 +479,8 @@ class custom_profile } else if ($day && $month && $year) { - return sprintf('%4d-%02d-%02d', $year, $month, $day); + global $user; + return $user->format_date(mktime(0, 0, 0, $month, $day, $year), $user->lang['DATE_FORMAT'], true); } return $value; diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 1a70a7fd80..649708aff3 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1229,7 +1229,7 @@ class parse_message extends bbcode_firstpass while ($row = $db->sql_fetchrow($result)) { // (assertion) - $match[] = '#(?<=^|[\n .])' . preg_quote($row['code'], '#') . '(?![^<>]*>)#'; + $match[] = '(?<=^|[\n .])' . preg_quote($row['code'], '#') . '(?![^<>]*>)'; $replace[] = '' . $row['code'] . ''; } $db->sql_freeresult($result); @@ -1239,7 +1239,7 @@ class parse_message extends bbcode_firstpass { if ($max_smilies) { - $num_matches = preg_match_all('#' . str_replace('#', '', implode('|', $match)) . '#', $this->message, $matches); + $num_matches = preg_match_all('#' . implode('|', $match) . '#', $this->message, $matches); unset($matches); if ($num_matches !== false && $num_matches > $max_smilies) @@ -1249,6 +1249,9 @@ class parse_message extends bbcode_firstpass } } + // Make sure the delimiter # is added in front and at the end of every element within $match + $match = explode(chr(0), '#' . implode('#' . chr(0) . '#', $match) . '#'); + $this->message = trim(preg_replace($match, $replace, $this->message)); } } diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index e97f3ac8e6..35edf92749 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -1627,9 +1627,18 @@ class user extends session // - add appropriate variables here, name them as they are used within the language file... if (!$use_db) { - if ((include($this->lang_path . (($use_help) ? 'help_' : '') . "$lang_file.$phpEx")) === false) + if ($use_help && strpos($lang_file, '/') !== false) { - trigger_error("Language file {$this->lang_path}" . (($use_help) ? 'help_' : '') . "$lang_file.$phpEx couldn't be opened.", E_USER_ERROR); + $language_filename = $this->lang_path . substr($lang_file, 0, stripos($lang_file, '/') + 1) . 'help_' . substr($lang_file, stripos($lang_file, '/') + 1) . '.' . $phpEx; + } + else + { + $language_filename = $this->lang_path . (($use_help) ? 'help_' : '') . $lang_file . '.' . $phpEx; + } + + if ((include($language_filename)) === false) + { + trigger_error("Language file $language_filename couldn't be opened.", E_USER_ERROR); } } else if ($use_db) diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index c81b5c9f7b..9bfb8063f6 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -485,16 +485,16 @@ $lang = array_merge($lang, array(

    Release announcement

    -

    Please read the release announcement for the latest version before you continue your update process, it may contain useful information. It also contains full download links as well as the change log.

    +

    Please read the release announcement for the latest version before you continue your update process, it may contain useful information. It also contains full download links as well as the change log.


    -

    How to update your installation

    +

    How to update your installation with the Automatic Update Package

    -

    The recommended way of updating your installation only takes the following steps:

    +

    The recommended way of updating your installation listed here is only valid for the automatic update package. You are also able to update your installation using the methods listed within the INSTALL.html document. The steps for updating phpBB3 automatically are:

      -
    • Go to the phpBB.com downloads page and download the correct "phpBB Update Package" archive.

      • +
    • Go to the phpBB.com downloads page and download the "Automatic Update Package" archive.

    • Unpack the archive.

    • Upload the complete uncompressed install folder to your phpBB root directory (where your config.php file is).

    @@ -502,7 +502,7 @@ $lang = array_merge($lang, array(

    Once uploaded your board will be offline for normal users due to the install directory you uploaded now present.

    Now start the update process by pointing your browser to the install folder.

    - You will then be guided through the update process. You will be notified after the update is complete. + You will then be guided through the update process. You will be notified once the update is complete.

    ', 'UPDATE_METHOD' => 'Update method', diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index ea13a0b49e..991c73198f 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -943,7 +943,7 @@ switch ($mode) $sql_where .= ($jabber) ? ' AND u.user_jabber ' . $db->sql_like_expression(str_replace('*', $db->any_char, $jabber)) . ' ' : ''; $sql_where .= (is_numeric($count)) ? ' AND u.user_posts ' . $find_key_match[$count_select] . ' ' . (int) $count . ' ' : ''; $sql_where .= (sizeof($joined) > 1) ? " AND u.user_regdate " . $find_key_match[$joined_select] . ' ' . gmmktime(0, 0, 0, intval($joined[1]), intval($joined[2]), intval($joined[0])) : ''; - $sql_where .= (sizeof($active) > 1) ? " AND u.user_lastvisit " . $find_key_match[$active_select] . ' ' . gmmktime(0, 0, 0, $active[1], intval($active[2]), intval($active[0])) : ''; + $sql_where .= ($auth->acl_get('u_viewonline') && sizeof($active) > 1) ? " AND u.user_lastvisit " . $find_key_match[$active_select] . ' ' . gmmktime(0, 0, 0, $active[1], intval($active[2]), intval($active[0])) : ''; $sql_where .= ($search_group_id) ? " AND u.user_id = ug.user_id AND ug.group_id = $search_group_id AND ug.user_pending = 0 " : ''; if ($search_group_id) @@ -1387,11 +1387,12 @@ switch ($mode) 'U_SORT_AIM' => $sort_url . '&sk=h&sd=' . (($sort_key == 'h' && $sort_dir == 'a') ? 'd' : 'a'), 'U_SORT_MSN' => $sort_url . '&sk=i&sd=' . (($sort_key == 'i' && $sort_dir == 'a') ? 'd' : 'a'), 'U_SORT_YIM' => $sort_url . '&sk=j&sd=' . (($sort_key == 'j' && $sort_dir == 'a') ? 'd' : 'a'), - 'U_SORT_ACTIVE' => $sort_url . '&sk=l&sd=' . (($sort_key == 'l' && $sort_dir == 'a') ? 'd' : 'a'), + 'U_SORT_ACTIVE' => ($auth->acl_get('u_viewonline')) ? $sort_url . '&sk=l&sd=' . (($sort_key == 'l' && $sort_dir == 'a') ? 'd' : 'a') : '', 'U_SORT_RANK' => $sort_url . '&sk=m&sd=' . (($sort_key == 'm' && $sort_dir == 'a') ? 'd' : 'a'), 'U_LIST_CHAR' => $sort_url . '&sk=a&sd=' . (($sort_key == 'l' && $sort_dir == 'a') ? 'd' : 'a'), 'S_SHOW_GROUP' => ($mode == 'group') ? true : false, + 'S_VIEWONLINE' => $auth->acl_get('u_viewonline'), 'S_MODE_SELECT' => $s_sort_key, 'S_ORDER_SELECT' => $s_sort_dir, 'S_CHAR_OPTIONS' => $s_char_options, diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html index 081352924e..0f9d1cb792 100644 --- a/phpBB/styles/prosilver/template/memberlist_body.html +++ b/phpBB/styles/prosilver/template/memberlist_body.html @@ -83,7 +83,7 @@ {L_POSTS} {L_WEBSITE}{L_COMMA_SEPARATOR}{L_LOCATION} {L_JOINED} - {L_LAST_ACTIVE} + {L_LAST_ACTIVE} @@ -106,7 +106,7 @@       -   +   @@ -119,11 +119,11 @@ {memberrow.POSTS}{memberrow.POSTS}
    {memberrow.LOCATION}
      {memberrow.JOINED} - {memberrow.VISITED}  + {memberrow.VISITED}  - {L_NO_MEMBERS} + {L_NO_MEMBERS} diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html index ac7ac9821d..1061d30628 100644 --- a/phpBB/styles/prosilver/template/memberlist_search.html +++ b/phpBB/styles/prosilver/template/memberlist_search.html @@ -80,10 +80,12 @@ function insert_single(user)
    +
    +
    diff --git a/phpBB/styles/subsilver2/template/memberlist_search.html b/phpBB/styles/subsilver2/template/memberlist_search.html index 253fff9ecf..4d943e348d 100644 --- a/phpBB/styles/subsilver2/template/memberlist_search.html +++ b/phpBB/styles/subsilver2/template/memberlist_search.html @@ -96,8 +96,12 @@ + {L_LAST_ACTIVE}: + +   + {L_MSNM}: From 648de4354a02c0b48d1e823c6d0196720586cb73 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Thu, 28 Jun 2007 18:21:08 +0000 Subject: [PATCH 13/50] #12731 #12791 git-svn-id: file:///svn/phpbb/trunk@7806 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 2 ++ phpBB/includes/functions_convert.php | 10 ++++++++++ phpBB/install/convertors/convert_phpbb20.php | 4 ++-- phpBB/install/convertors/functions_phpbb20.php | 10 ++++++++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 6827a0c505..b01e970ef5 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -195,6 +195,8 @@ p a {
  13. [Fix] Display custom profile field "date" based on users language (Bug #12787)
  14. [Fix] Allow adding of help language files within subdirectories (Bug #12783)
  15. [Fix] Correctly apply smileys on posting having # within their emotion code
    16. +
  16. [Fix] Correctly convert smileys having double quotes within their emotion code (Bug #12731)
    17. + diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php index 414f6f2f20..324844aa7f 100644 --- a/phpBB/includes/functions_convert.php +++ b/phpBB/includes/functions_convert.php @@ -2413,4 +2413,14 @@ function get_smiley_display() return ($smiley_count < 50) ? 1 : 0; } + +function fill_dateformat($user_dateformat) +{ + global $config; + + return ((empty($user_dateformat)) ? $config['default_dateformat'] : $user_dateformat); +} + + + ?> \ No newline at end of file diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 796c2e19d4..573825b7bb 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -540,7 +540,7 @@ if (!$get_info) 'autoincrement' => 'smiley_id', array('smiley_id', 'smilies.smilies_id', ''), - array('code', 'smilies.code', 'phpbb_set_encoding'), + array('code', 'smilies.code', array('function1' => 'phpbb_smilie_html_decode', 'function2' => 'phpbb_set_encoding', 'function3' => 'utf8_htmlspecialchars')), array('emotion', 'smilies.emoticon', 'phpbb_set_encoding'), array('smiley_url', 'smilies.smile_url', 'import_smiley'), array('smiley_width', 'smilies.smile_url', 'get_smiley_width'), @@ -862,7 +862,7 @@ if (!$get_info) array('user_lang', $config['default_lang'], ''), array('', 'users.user_lang', ''), array('user_timezone', 'users.user_timezone', ''), - array('user_dateformat', 'users.user_dateformat', array('function1' => 'phpbb_set_encoding')), + array('user_dateformat', 'users.user_dateformat', array('function1' => 'phpbb_set_encoding', 'function2' => 'fill_dateformat')), array('user_inactive_reason', '', 'phpbb_inactive_reason'), array('user_inactive_time', '', 'phpbb_inactive_time'), diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index 9b5e236b6d..443855403b 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -1439,6 +1439,16 @@ function phpbb_avatar_type($type) return 0; } + +/** +* Just undos the replacing of '<' and '>' +*/ +function phpbb_smilie_html_decode($code) +{ + $code = str_replace('<', '<', $code); + return str_replace('>', '>', $code); +} + /** * Transfer avatars, copying the image if it was uploaded */ From 1c22e7a40728fde76b9b9e5afd168f8eb0313268 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Fri, 29 Jun 2007 11:39:22 +0000 Subject: [PATCH 14/50] Oh well, not much we can do for boards already converted. #12819 git-svn-id: file:///svn/phpbb/trunk@7807 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/functions_convert.php | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index b01e970ef5..b7201dface 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -196,6 +196,7 @@ p a {
  17. [Fix] Allow adding of help language files within subdirectories (Bug #12783)
  18. [Fix] Correctly apply smileys on posting having # within their emotion code
  19. [Fix] Correctly convert smileys having double quotes within their emotion code (Bug #12731)
    20. +
  20. [Fix] The converter now adds the protocol to user website profile fields missing it (Bug #12819)
    21. diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php index 324844aa7f..0aa3c205f5 100644 --- a/phpBB/includes/functions_convert.php +++ b/phpBB/includes/functions_convert.php @@ -224,7 +224,13 @@ function make_uid($timestamp) */ function validate_website($url) { - return ($url == 'http://') ? '' : $url; + if ($url === 'http://'){ + return ''; + } + else if (strstr('http://', $url) !== 0) + { + return 'http://' . $url; + } } /** From 6f37638caee649060dc9f933af6773652a813035 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Fri, 29 Jun 2007 13:00:54 +0000 Subject: [PATCH 15/50] - fixing some very very nasty opera bugs by changing the clearing method we use. - also properly apply preg_quote to some strings. git-svn-id: file:///svn/phpbb/trunk@7808 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/admin.css | 7 +++---- phpBB/docs/CHANGELOG.html | 6 +++--- phpBB/download.php | 4 ++-- phpBB/includes/acp/acp_attachments.php | 2 +- phpBB/includes/session.php | 8 ++++---- phpBB/includes/ucp/ucp_prefs.php | 1 + phpBB/styles/prosilver/template/editor.js | 4 ++-- phpBB/styles/prosilver/template/posting_buttons.html | 5 +++-- phpBB/styles/prosilver/template/ucp_pm_viewmessage.html | 2 +- phpBB/styles/prosilver/template/ucp_prefs_personal.html | 2 +- phpBB/styles/prosilver/theme/tweaks.css | 7 ++++--- 11 files changed, 25 insertions(+), 23 deletions(-) diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index f81c56846d..44f89fea33 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -1221,20 +1221,19 @@ input.disabled { } /* Nice method for clearing floated blocks without having to insert any extra markup - From http://www.positioniseverything.net/easyclearing.html */ + From http://www.positioniseverything.net/easyclearing.html .clearfix:after, #tabs:after, .row:after, #content:after, fieldset dl:after, #page-body:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; -} +}*/ -/* Hide from Mac IE, Windows IE uses this as it doesn't support the :after method above \*/ .clearfix, #tabs, .row, #content, fieldset dl, #page-body { height: 1%; + overflow: auto; } -/* End hide */ /* Syntax Highlighting ---------------------------------------- */ diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index b7201dface..7e24558e3c 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -195,9 +195,9 @@ p a {
  21. [Fix] Display custom profile field "date" based on users language (Bug #12787)
  22. [Fix] Allow adding of help language files within subdirectories (Bug #12783)
  23. [Fix] Correctly apply smileys on posting having # within their emotion code
    24. -
  24. [Fix] Correctly convert smileys having double quotes within their emotion code (Bug #12731)
    25. -
  25. [Fix] The converter now adds the protocol to user website profile fields missing it (Bug #12819)
    26. - +
  26. [Fix] Correctly escape banned ip/email using wildcard for ban check (Bug #12815)
    27. +
  27. [Fix] Fixed some very nasty opera bugs (dropdown list bug, cpu spike bug) (Bug #12763, #11609)
    28. +
  28. [Fix] Font colour list having the correct height in IE (Bug #9571)
    29. diff --git a/phpBB/download.php b/phpBB/download.php index c24ea81425..382c528db9 100644 --- a/phpBB/download.php +++ b/phpBB/download.php @@ -544,7 +544,7 @@ function download_allowed() { foreach ($iplist as $ip) { - if (preg_match('#^' . str_replace('*', '.*?', preg_quote($site_ip, '#')) . '$#i', $ip)) + if (preg_match('#^' . str_replace('\*', '.*?', preg_quote($site_ip, '#')) . '$#i', $ip)) { if ($row['ip_exclude']) { @@ -561,7 +561,7 @@ function download_allowed() if ($site_hostname) { - if (preg_match('#^' . str_replace('*', '.*?', preg_quote($site_hostname, '#')) . '$#i', $hostname)) + if (preg_match('#^' . str_replace('\*', '.*?', preg_quote($site_hostname, '#')) . '$#i', $hostname)) { if ($row['ip_exclude']) { diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index 1db18f6d5c..a0aaf8d67e 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -78,7 +78,7 @@ class acp_attachments } $db->sql_freeresult($result); - $l_legend_cat_images = $user->lang['SETTINGS_CAT_IMAGES'] . ' [' . $user->lang['ASSIGNED_GROUP'] . ': ' . ((sizeof($s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE])) ? implode(', ', $s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE]) : $user->lang['NO_EXT_GROUP']) . ']'; + $l_legend_cat_images = $user->lang['SETTINGS_CAT_IMAGES'] . ' [' . $user->lang['ASSIGNED_GROUP'] . ': ' . ((!empty($s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE])) ? implode(', ', $s_assigned_groups[ATTACHMENT_CATEGORY_IMAGE]) : $user->lang['NO_EXT_GROUP']) . ']'; $display_vars = array( 'title' => 'ACP_ATTACHMENT_SETTINGS', diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 35edf92749..9e70779556 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -884,13 +884,13 @@ class session { if (!is_array($user_ips)) { - $ip_banned = preg_match('#^' . str_replace('*', '.*?', $row['ban_ip']) . '$#i', $user_ips); + $ip_banned = preg_match('#^' . str_replace('\*', '.*?', preg_quote($row['ban_ip'], '#')) . '$#i', $user_ips); } else { foreach ($user_ips as $user_ip) { - if (preg_match('#^' . str_replace('*', '.*?', $row['ban_ip']) . '$#i', $user_ip)) + if (preg_match('#^' . str_replace('\*', '.*?', preg_quote($row['ban_ip'], '#')) . '$#i', $user_ip)) { $ip_banned = true; break; @@ -901,7 +901,7 @@ class session if ((!empty($row['ban_userid']) && intval($row['ban_userid']) == $user_id) || $ip_banned || - (!empty($row['ban_email']) && preg_match('#^' . str_replace('*', '.*?', $row['ban_email']) . '$#i', $user_email))) + (!empty($row['ban_email']) && preg_match('#^' . str_replace('\*', '.*?', preg_quote($row['ban_email'], '#')) . '$#i', $user_email))) { if (!empty($row['ban_exclude'])) { @@ -917,7 +917,7 @@ class session { $ban_triggered_by = 'user'; } - else if (!empty($row['ban_ip']) && preg_match('#^' . str_replace('*', '.*?', $row['ban_ip']) . '$#i', $user_ips)) + else if (!empty($row['ban_ip']) && preg_match('#^' . str_replace('\*', '.*?', preg_quote($row['ban_ip'], '#')) . '$#i', $user_ips)) { $ban_triggered_by = 'ip'; } diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php index 8a10254a6e..b0e8f098c2 100644 --- a/phpBB/includes/ucp/ucp_prefs.php +++ b/phpBB/includes/ucp/ucp_prefs.php @@ -123,6 +123,7 @@ class ucp_prefs 'S_DST' => $data['dst'], 'DATE_FORMAT' => $data['dateformat'], + 'A_DATE_FORMAT' => addslashes($data['dateformat']), 'S_DATEFORMAT_OPTIONS' => $dateformat_options, 'S_CUSTOM_DATEFORMAT' => $s_custom, 'DEFAULT_DATEFORMAT' => $config['default_dateformat'], diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js index 38dd77bdbe..500ea91c51 100644 --- a/phpBB/styles/prosilver/template/editor.js +++ b/phpBB/styles/prosilver/template/editor.js @@ -74,7 +74,7 @@ function bbstyle(bbnumber) function bbfontstyle(bbopen, bbclose) { theSelection = false; - + var textarea = document.forms[form_name].elements[text_name]; textarea.focus(); @@ -325,7 +325,7 @@ function colorPalette(dir, width, height) for (b = 0; b < 5; b++) { color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]); - document.write(''); + document.write(''); document.write('#' + color + ''); document.writeln(''); } diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html index 5f1f061532..56f8cdf709 100644 --- a/phpBB/styles/prosilver/template/posting_buttons.html +++ b/phpBB/styles/prosilver/template/posting_buttons.html @@ -62,7 +62,8 @@ -
    +
    {L_VIEW_PREVIOUS_HISTORY} {L_VIEW_NEXT_HISTORY}
    diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html index fea21f9693..6ffe6f69c3 100644 --- a/phpBB/styles/prosilver/template/ucp_prefs_personal.html +++ b/phpBB/styles/prosilver/template/ucp_prefs_personal.html @@ -107,7 +107,7 @@