From cc79d31345a5087279aceed461289a838c438262 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 28 Jul 2007 17:38:39 +0000 Subject: [PATCH 01/96] tagged and up git-svn-id: file:///svn/phpbb/trunk@7976 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 cce71d0593..4fb2c25bb3 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -206,7 +206,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.RC4'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.RC5-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 bb3c365f45314bbc34f3abfd626797d5ed496852 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Sun, 29 Jul 2007 11:22:40 +0000 Subject: [PATCH 02/96] #13863 (oops) git-svn-id: file:///svn/phpbb/trunk@7977 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/auth.php b/phpBB/includes/auth.php index 389fe99bdb..08c8c89caa 100644 --- a/phpBB/includes/auth.php +++ b/phpBB/includes/auth.php @@ -349,7 +349,7 @@ class auth // Since this function is not called that often (we are caching the data) we check for this inconsistency. $sql = 'SELECT forum_id FROM ' . FORUMS_TABLE . ' - WHERE ' . $db->sql_in_set('forum_id', array_keys($hold_ary)); + WHERE ' . $db->sql_in_set('forum_id', array_keys($hold_ary),false, true); $result = $db->sql_query($sql); $forum_ids = (isset($hold_ary[0])) ? array(0) : array(); From 2915ba1a5a4c9e543e770cc693791aa867e536e3 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Sun, 29 Jul 2007 11:44:31 +0000 Subject: [PATCH 03/96] minor correction git-svn-id: file:///svn/phpbb/trunk@7978 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/language/en/ucp.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 34040317a0..44ae3bc196 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -104,8 +104,8 @@ $lang = array_merge($lang, array( 'BOOKMARKS_REMOVED' => 'Bookmarks removed successfully.', 'CANNOT_EDIT_MESSAGE_TIME' => 'You can no longer edit or delete that message.', - 'CANNOT_MOVE_TO_SAME_FOLDER'=> 'Messages can not be moved to the folder you want to remove.', - 'CANNOT_MOVE_FROM_SPECIAL' => 'Messages can not be moved from the outbox.', + 'CANNOT_MOVE_TO_SAME_FOLDER'=> 'Messages cannot be moved to the folder you want to remove.', + 'CANNOT_MOVE_FROM_SPECIAL' => 'Messages cannot be moved from the outbox.', 'CANNOT_RENAME_FOLDER' => 'This folder can not be renamed.', 'CANNOT_REMOVE_FOLDER' => 'This folder can not be removed.', 'CHANGE_DEFAULT_GROUP' => 'Change default group', From a2d1a8706f822be3bc49cb96a2c8e65907b8324a Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Sun, 29 Jul 2007 11:48:39 +0000 Subject: [PATCH 04/96] space, where art thou? git-svn-id: file:///svn/phpbb/trunk@7979 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/auth.php b/phpBB/includes/auth.php index 08c8c89caa..de9cc9bac7 100644 --- a/phpBB/includes/auth.php +++ b/phpBB/includes/auth.php @@ -349,7 +349,7 @@ class auth // Since this function is not called that often (we are caching the data) we check for this inconsistency. $sql = 'SELECT forum_id FROM ' . FORUMS_TABLE . ' - WHERE ' . $db->sql_in_set('forum_id', array_keys($hold_ary),false, true); + WHERE ' . $db->sql_in_set('forum_id', array_keys($hold_ary), false, true); $result = $db->sql_query($sql); $forum_ids = (isset($hold_ary[0])) ? array(0) : array(); From d7ae4540794708fe79fb9fff682935a3fa05d258 Mon Sep 17 00:00:00 2001 From: David M Date: Sun, 29 Jul 2007 14:44:43 +0000 Subject: [PATCH 05/96] #13862 git-svn-id: file:///svn/phpbb/trunk@7980 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 22 +++++- phpBB/install/database_update.php | 126 ++++++++++++++++++++++++------ 2 files changed, 123 insertions(+), 25 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 198d21d885..a8a0349adf 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -169,6 +169,7 @@ p a {
  1. Changelog
      +
    1. Changes since RC-4
    2. Changes since RC-3
    3. Changes since RC-2
    4. Changes since RC-1
      5. @@ -181,12 +182,27 @@ p a {

      1. Changelog

      - 1.i. Changes since 3.0.RC3 + 1.i. Changes since 3.0.RC4

      These fixes/changes are currently only present within CVS and will appear within the next phpBB3 version.

      +
        +
      • [Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)
        • + +
      + +
      + Top +

      + +
      + + 1.ii. Changes since 3.0.RC3 +

      +
      +
      • [Fix] Fixing some subsilver2 and prosilver style issues
      • [Fix] Parse error in MCP ban (Bug #13109)
        • @@ -300,7 +316,7 @@ p a {
        - 1.ii. Changes since 3.0.RC2 + 1.iii. Changes since 3.0.RC2

        @@ -354,7 +370,7 @@ p a {
        - 1.iii. Changes since 3.0.RC1 + 1.iiii. Changes since 3.0.RC1

        diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 34f0aebb12..48b94595af 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -8,7 +8,7 @@ * */ -$updates_to_version = '3.0.RC4'; +$updates_to_version = '3.0.RC5'; // Return if we "just include it" to find out for which version the database update is responsuble for if (defined('IN_PHPBB') && defined('IN_INSTALL')) @@ -387,6 +387,43 @@ $database_update_info = array( ), ), ), + // Changes from 3.0.RC4 to the next version + '3.0.RC4' => array( + // Change the following columns + 'change_columns' => array( + STYLES_TABLE => array( + 'style_id' => array('USINT', NULL, 'auto_increment'), + 'template_id' => array('USINT', 0), + 'theme_id' => array('USINT', 0), + 'imageset_id' => array('USINT', 0), + ), + STYLES_TEMPLATE_TABLE => array( + 'template_id' => array('USINT', NULL, 'auto_increment'), + ), + STYLES_TEMPLATE_DATA_TABLE => array( + 'template_id' => array('USINT', NULL, 'auto_increment'), + ), + STYLES_THEME_TABLE => array( + 'theme_id' => array('USINT', NULL, 'auto_increment'), + ), + STYLES_IMAGESET_TABLE => array( + 'imageset_id' => array('USINT', NULL, 'auto_increment'), + ), + STYLES_IMAGESET_DATA_TABLE => array( + 'imageset_id' => array('USINT', 0), + ), + USERS_TABLE => array( + 'user_style' => array('USINT', 0), + ), + FORUMS_TABLE => array( + 'forum_style' => array('USINT', 0), + ), + GROUPS_TABLE => array( + 'group_avatar_width' => array('USINT', 0), + 'group_avatar_height' => array('USINT', 0), + ), + ), + ), ); // Determine mapping database type @@ -1253,6 +1290,44 @@ if (version_compare($current_version, '3.0.RC3', '<=')) $no_updates = false; } +if (version_compare($current_version, '3.0.RC4', '<=')) +{ + $update_auto_increment = array( + STYLES_TABLE => 'style_id', + STYLES_TEMPLATE_TABLE => 'template_id', + STYLES_TEMPLATE_DATA_TABLE => 'template_id', + STYLES_THEME_TABLE => 'theme_id', + STYLES_IMAGESET_TABLE => 'imageset_id' + ); + + if ($map_dbms == 'mysql_40' || $map_dbms == 'mysql_41') + { + foreach ($update_auto_increment as $auto_table_name => $auto_column_name) + { + $sql = "SELECT MAX({$auto_column_name}) as max_id + FROM {$auto_table_name}"; + $result = _sql($sql, $errored, $error_ary); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + $max_id = ((int) $row['max_id']) + 1; + _sql("ALTER TABLE {$auto_table_name} AUTO_INCREMENT = {$max_id}"); + } + + $no_updates = false; + } + else if ($map_dbms == 'sqlite') + { + foreach ($update_auto_increment as $auto_table_name => $auto_column_name) + { + var_dump('eh?'); + sql_column_change($dbms, $auto_table_name, $auto_column_name, array('USINT', NULL, 'auto_increment')); + } + + $no_updates = false; + } +} + _write_result($no_updates, $errored, $error_ary); $error_ary = array(); @@ -1570,7 +1645,7 @@ function column_exists($dbms, $table, $column_name) /** * Function to prepare some column information for better usage */ -function prepare_column_data($dbms, $column_data) +function prepare_column_data($dbms, $column_data, $table_name, $column_name) { global $dbms_type_map, $unsigned_types; @@ -1709,17 +1784,23 @@ function prepare_column_data($dbms, $column_data) case 'postgres': $return_array['column_type'] = $column_type; - $return_array['null'] = 'NOT NULL'; - - if (!is_null($column_data[1])) - { - $return_array['default'] = $column_data[1]; - } $sql .= " {$column_type} "; - $sql .= 'NOT NULL '; - $sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}' " : ''; + if (isset($column_data[2]) && $column_data[2] == 'auto_increment') + { + $default_val = "nextval('{$table_name}_seq')"; + } + else if (!is_null($column_data[1])) + { + $default_val = "'" . $column_data[1] . "'"; + $return_array['null'] = 'NOT NULL'; + $sql .= 'NOT NULL '; + } + + $return_array['default'] = $default_val; + + $sql .= "DEFAULT {$default_val}"; // Unsigned? Then add a CHECK contraint if (in_array($orig_column_type, $unsigned_types)) @@ -1730,7 +1811,7 @@ function prepare_column_data($dbms, $column_data) break; case 'sqlite': -/* if (isset($column_data[2]) && $column_data[2] == 'auto_increment') + if (isset($column_data[2]) && $column_data[2] == 'auto_increment') { $sql .= ' INTEGER PRIMARY KEY'; } @@ -1738,8 +1819,6 @@ function prepare_column_data($dbms, $column_data) { $sql .= ' ' . $column_type; } -*/ - $sql .= ' ' . $column_type; $sql .= ' NOT NULL '; $sql .= (!is_null($column_data[1])) ? "DEFAULT '{$column_data[1]}'" : ''; @@ -1758,7 +1837,7 @@ function sql_column_add($dbms, $table_name, $column_name, $column_data) { global $errored, $error_ary; - $column_data = prepare_column_data($dbms, $column_data); + $column_data = prepare_column_data($dbms, $column_data, $table_name, $column_name); switch ($dbms) { @@ -2300,7 +2379,7 @@ function sql_column_change($dbms, $table_name, $column_name, $column_data) global $dbms_type_map, $db; global $errored, $error_ary; - $column_data = prepare_column_data($dbms, $column_data); + $column_data = prepare_column_data($dbms, $column_data, $table_name, $column_name); switch ($dbms) { @@ -2332,18 +2411,21 @@ function sql_column_change($dbms, $table_name, $column_name, $column_data) $sql_array = array(); $sql_array[] = 'ALTER COLUMN ' . $column_name . ' TYPE ' . $column_data['column_type']; - if ($column_data['null'] == 'NOT NULL') + if (isset($column_data['null'])) { - $sql_array[] = 'ALTER COLUMN ' . $column_name . ' SET NOT NULL'; - } - else - { - $sql_array[] = 'ALTER COLUMN ' . $column_name . ' DROP NOT NULL'; + if ($column_data['null'] == 'NOT NULL') + { + $sql_array[] = 'ALTER COLUMN ' . $column_name . ' SET NOT NULL'; + } + else if ($column_data['null'] == 'NULL') + { + $sql_array[] = 'ALTER COLUMN ' . $column_name . ' DROP NOT NULL'; + } } if (isset($column_data['default'])) { - $sql_array[] = 'ALTER COLUMN ' . $column_name . " SET DEFAULT '" . $column_data['default'] . "'"; + $sql_array[] = 'ALTER COLUMN ' . $column_name . ' SET DEFAULT ' . $column_data['default']; } // we don't want to double up on constraints if we change different number data types From 35152dcd537a092d19696f07cf62048939041a25 Mon Sep 17 00:00:00 2001 From: David M Date: Mon, 30 Jul 2007 03:16:31 +0000 Subject: [PATCH 06/96] #13874 git-svn-id: file:///svn/phpbb/trunk@7981 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/db/mssql.php | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index a8a0349adf..98bda631b5 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -190,6 +190,7 @@ p a {
        • [Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)
          • +
        • [Fix] Allow MS SQL to properly connect when using the mssql driver and PHP is less than either 4.4.1 or 5.1 (Bug #13874)
        diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/mssql.php index 422a5d44a4..f07d1adfe9 100644 --- a/phpBB/includes/db/mssql.php +++ b/phpBB/includes/db/mssql.php @@ -39,7 +39,14 @@ class dbal_mssql extends dbal @ini_set('mssql.textlimit', 2147483647); @ini_set('mssql.textsize', 2147483647); - $this->db_connect_id = ($this->persistency) ? @mssql_pconnect($this->server, $this->user, $sqlpassword, $new_link) : @mssql_connect($this->server, $this->user, $sqlpassword, $new_link); + if (version_compare(PHP_VERSION, '5.1.0', '>=') || (version_compare(PHP_VERSION, '5.0.0-dev', '<=') && version_compare(PHP_VERSION, '4.4.1', '>='))) + { + $this->db_connect_id = ($this->persistency) ? @mssql_pconnect($this->server, $this->user, $sqlpassword, $new_link) : @mssql_connect($this->server, $this->user, $sqlpassword, $new_link); + } + else + { + $this->db_connect_id = ($this->persistency) ? @mssql_pconnect($this->server, $this->user, $sqlpassword) : @mssql_connect($this->server, $this->user, $sqlpassword); + } if ($this->db_connect_id && $this->dbname != '') { From 63588e28e0582b5e54fb9ae7ead5e048e8418ad4 Mon Sep 17 00:00:00 2001 From: David M Date: Mon, 30 Jul 2007 21:09:38 +0000 Subject: [PATCH 07/96] reset bad style related ids git-svn-id: file:///svn/phpbb/trunk@7982 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/install/database_update.php | 117 +++++++++++++++++++++++++++--- 1 file changed, 108 insertions(+), 9 deletions(-) diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 48b94595af..a2557eba8b 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1300,6 +1300,100 @@ if (version_compare($current_version, '3.0.RC4', '<=')) STYLES_IMAGESET_TABLE => 'imageset_id' ); + $sql = 'SELECT * + FROM ' . STYLES_TABLE . ' + WHERE style_id = 0'; + $result = _sql($sql, $errored, $error_ary); + $bad_style_row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + if ($bad_style_row) + { + $sql = 'SELECT MAX(style_id) as max_id + FROM ' . STYLES_TABLE; + $result = _sql($sql, $errored, $error_ary); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + $proper_id = $row['max_id'] + 1; + + _sql('UPDATE ' . STYLES_TABLE . " SET style_id = $proper_id WHERE style_id = 0", $errored, $error_ary); + _sql('UPDATE ' . FORUMS_TABLE . " SET forum_style = $proper_id WHERE forum_style = 0", $errored, $error_ary); + + $sql = 'SELECT config_value + FROM ' . CONFIG_TABLE . " + WHERE config_name = 'default_style'"; + $result = _sql($sql, $errored, $error_ary); + $style_config = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + if ($style_config['config_value'] === '0') + { + set_config('default_style', (string) $proper_id); + } + } + + $sql = 'SELECT * + FROM ' . STYLES_TEMPLATE_TABLE . ' + WHERE template_id = 0'; + $result = _sql($sql, $errored, $error_ary); + $bad_style_row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + if ($bad_style_row) + { + $sql = 'SELECT MAX(template_id) as max_id + FROM ' . STYLES_TEMPLATE_TABLE; + $result = _sql($sql, $errored, $error_ary); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + $proper_id = $row['max_id'] + 1; + + _sql('UPDATE ' . STYLES_TABLE . " SET template_id = $proper_id WHERE template_id = 0", $errored, $error_ary); + } + + $sql = 'SELECT * + FROM ' . STYLES_THEME_TABLE . ' + WHERE theme_id = 0'; + $result = _sql($sql, $errored, $error_ary); + $bad_style_row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + if ($bad_style_row) + { + $sql = 'SELECT MAX(theme_id) as max_id + FROM ' . STYLES_THEME_TABLE; + $result = _sql($sql, $errored, $error_ary); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + $proper_id = $row['max_id'] + 1; + + _sql('UPDATE ' . STYLES_TABLE . " SET theme_id = $proper_id WHERE theme_id = 0", $errored, $error_ary); + } + + $sql = 'SELECT * + FROM ' . STYLES_IMAGESET_TABLE . ' + WHERE imageset_id = 0'; + $result = _sql($sql, $errored, $error_ary); + $bad_style_row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + if ($bad_style_row) + { + $sql = 'SELECT MAX(imageset_id) as max_id + FROM ' . STYLES_IMAGESET_TABLE; + $result = _sql($sql, $errored, $error_ary); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + $proper_id = $row['max_id'] + 1; + + _sql('UPDATE ' . STYLES_TABLE . " SET imageset_id = $proper_id WHERE imageset_id = 0", $errored, $error_ary); + _sql('UPDATE ' . STYLES_IMAGESET_DATA_TABLE . " SET imageset_id = $proper_id WHERE imageset_id = 0", $errored, $error_ary); + } + if ($map_dbms == 'mysql_40' || $map_dbms == 'mysql_41') { foreach ($update_auto_increment as $auto_table_name => $auto_column_name) @@ -1311,7 +1405,7 @@ if (version_compare($current_version, '3.0.RC4', '<=')) $db->sql_freeresult($result); $max_id = ((int) $row['max_id']) + 1; - _sql("ALTER TABLE {$auto_table_name} AUTO_INCREMENT = {$max_id}"); + _sql("ALTER TABLE {$auto_table_name} AUTO_INCREMENT = {$max_id}", $errored, $error_ary); } $no_updates = false; @@ -1320,7 +1414,6 @@ if (version_compare($current_version, '3.0.RC4', '<=')) { foreach ($update_auto_increment as $auto_table_name => $auto_column_name) { - var_dump('eh?'); sql_column_change($dbms, $auto_table_name, $auto_column_name, array('USINT', NULL, 'auto_increment')); } @@ -1446,13 +1539,19 @@ function _sql($sql, &$errored, &$error_ary, $echo_dot = true) $db->sql_return_on_error(true); - $result = $db->sql_query($sql); - - if ($db->sql_error_triggered) + if (preg_match('/^\\s*SELECT/', $sql)) { - $errored = true; - $error_ary['sql'][] = $db->sql_error_sql; - $error_ary['error_code'][] = $db->_sql_error(); + $result = $db->sql_query($sql); + if ($db->sql_error_triggered) + { + $errored = true; + $error_ary['sql'][] = $db->sql_error_sql; + $error_ary['error_code'][] = $db->_sql_error(); + } + } + else + { + var_dump($sql); } $db->sql_return_on_error(false); @@ -1462,7 +1561,7 @@ function _sql($sql, &$errored, &$error_ary, $echo_dot = true) echo ". \n"; flush(); } - +if (preg_match('/^\\s*SELECT/', $sql)) return $result; } From b1d0fa5d3592871587f6d408b2782df09e8b5d51 Mon Sep 17 00:00:00 2001 From: David M Date: Mon, 30 Jul 2007 21:10:40 +0000 Subject: [PATCH 08/96] remove debug code... git-svn-id: file:///svn/phpbb/trunk@7983 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/install/database_update.php | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index a2557eba8b..d7713bebd1 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1539,19 +1539,12 @@ function _sql($sql, &$errored, &$error_ary, $echo_dot = true) $db->sql_return_on_error(true); - if (preg_match('/^\\s*SELECT/', $sql)) + $result = $db->sql_query($sql); + if ($db->sql_error_triggered) { - $result = $db->sql_query($sql); - if ($db->sql_error_triggered) - { - $errored = true; - $error_ary['sql'][] = $db->sql_error_sql; - $error_ary['error_code'][] = $db->_sql_error(); - } - } - else - { - var_dump($sql); + $errored = true; + $error_ary['sql'][] = $db->sql_error_sql; + $error_ary['error_code'][] = $db->_sql_error(); } $db->sql_return_on_error(false); @@ -1561,7 +1554,7 @@ function _sql($sql, &$errored, &$error_ary, $echo_dot = true) echo ". \n"; flush(); } -if (preg_match('/^\\s*SELECT/', $sql)) + return $result; } From 6aaf8d1ad7871d5f1dcb621d7df832d36c5e638b Mon Sep 17 00:00:00 2001 From: David M Date: Mon, 30 Jul 2007 21:13:37 +0000 Subject: [PATCH 09/96] add PostgreSQL support git-svn-id: file:///svn/phpbb/trunk@7984 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/install/database_update.php | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index d7713bebd1..9d56717ee5 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1419,6 +1419,14 @@ if (version_compare($current_version, '3.0.RC4', '<=')) $no_updates = false; } + else if ($map_dbms == 'postgres') + { + foreach ($update_auto_increment as $auto_table_name => $auto_column_name) + { + $sql = "SELECT SETVAL('" . $auto_table_name . "_seq',(select case when max({$auto_column_name})>0 then max({$auto_column_name})+1 else 1 end from " . $auto_table_name . '));'; + _sql($sql, $errored, $error_ary); + } + } } _write_result($no_updates, $errored, $error_ary); @@ -1539,12 +1547,19 @@ function _sql($sql, &$errored, &$error_ary, $echo_dot = true) $db->sql_return_on_error(true); - $result = $db->sql_query($sql); - if ($db->sql_error_triggered) + if (preg_match('/^\\s*SELECT/', $sql)) { - $errored = true; - $error_ary['sql'][] = $db->sql_error_sql; - $error_ary['error_code'][] = $db->_sql_error(); + $result = $db->sql_query($sql); + if ($db->sql_error_triggered) + { + $errored = true; + $error_ary['sql'][] = $db->sql_error_sql; + $error_ary['error_code'][] = $db->_sql_error(); + } + } + else + { + var_dump($sql); } $db->sql_return_on_error(false); @@ -1554,7 +1569,7 @@ function _sql($sql, &$errored, &$error_ary, $echo_dot = true) echo ". \n"; flush(); } - +if (preg_match('/^\\s*SELECT/', $sql)) return $result; } From 03efc190e9f1d50058c145ce659c31d117dc970b Mon Sep 17 00:00:00 2001 From: David M Date: Mon, 30 Jul 2007 21:15:55 +0000 Subject: [PATCH 10/96] LEAVE git-svn-id: file:///svn/phpbb/trunk@7985 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/install/database_update.php | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 9d56717ee5..0763fb3ea5 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1547,19 +1547,12 @@ function _sql($sql, &$errored, &$error_ary, $echo_dot = true) $db->sql_return_on_error(true); - if (preg_match('/^\\s*SELECT/', $sql)) + $result = $db->sql_query($sql); + if ($db->sql_error_triggered) { - $result = $db->sql_query($sql); - if ($db->sql_error_triggered) - { - $errored = true; - $error_ary['sql'][] = $db->sql_error_sql; - $error_ary['error_code'][] = $db->_sql_error(); - } - } - else - { - var_dump($sql); + $errored = true; + $error_ary['sql'][] = $db->sql_error_sql; + $error_ary['error_code'][] = $db->_sql_error(); } $db->sql_return_on_error(false); @@ -1569,7 +1562,7 @@ function _sql($sql, &$errored, &$error_ary, $echo_dot = true) echo ". \n"; flush(); } -if (preg_match('/^\\s*SELECT/', $sql)) + return $result; } From 618e78e41eb9b7380aac2e6204d3cadd9c9fe303 Mon Sep 17 00:00:00 2001 From: David M Date: Tue, 31 Jul 2007 03:26:57 +0000 Subject: [PATCH 11/96] users are people too git-svn-id: file:///svn/phpbb/trunk@7986 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/install/database_update.php | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 0763fb3ea5..4d8671f5de 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1319,6 +1319,7 @@ if (version_compare($current_version, '3.0.RC4', '<=')) _sql('UPDATE ' . STYLES_TABLE . " SET style_id = $proper_id WHERE style_id = 0", $errored, $error_ary); _sql('UPDATE ' . FORUMS_TABLE . " SET forum_style = $proper_id WHERE forum_style = 0", $errored, $error_ary); + _sql('UPDATE ' . USERS_TABLE . " SET user_style = $proper_id WHERE user_style = 0", $errored, $error_ary); $sql = 'SELECT config_value FROM ' . CONFIG_TABLE . " From 33f5e4283b5087b07106e060a6e76ba36e1e584f Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 31 Jul 2007 14:52:09 +0000 Subject: [PATCH 12/96] my changes so far... git-svn-id: file:///svn/phpbb/trunk@7987 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/install/database_update.php | 4 +++- phpBB/styles/prosilver/template/ucp_pm_viewmessage.html | 4 ++-- phpBB/viewonline.php | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 98bda631b5..396f01c27c 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -191,6 +191,7 @@ p a {
        • [Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)
        • [Fix] Allow MS SQL to properly connect when using the mssql driver and PHP is less than either 4.4.1 or 5.1 (Bug #13874)
          • +
        • [Fix] Multiple PM recipients not separated (Bug #13876)
        diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 4d8671f5de..aca3b9f1c4 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -974,9 +974,11 @@ if ($exit) exit; } +_write_result(false, $errored, $error_ary); + // Schema updates ?> -



        +

        diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index c21d4b0213..2d76586262 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -31,8 +31,8 @@

        {L_SENT_AT}: {SENT_DATE}
        {L_PM_FROM}: {MESSAGE_AUTHOR_FULL} -
        {L_TO}: {to_recipient.NAME_FULL}{to_recipient.NAME} -
        {L_BCC}: {bcc_recipient.NAME_FULL}{bcc_recipient.NAME} +
        {L_TO}: {to_recipient.NAME_FULL}{to_recipient.NAME}  +
        {L_BCC}: {bcc_recipient.NAME_FULL}{bcc_recipient.NAME} 

        diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index f25afea1eb..5b4349254f 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -40,7 +40,7 @@ if (!$auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) login_box('', $user->lang['LOGIN_EXPLAIN_VIEWONLINE']); } -$sort_key_text = array('a' => $user->lang['SORT_USERNAME'], 'b' => $user->lang['SORT_LOCATION'], 'c' => $user->lang['SORT_JOINED']); +$sort_key_text = array('a' => $user->lang['SORT_USERNAME'], 'b' => $user->lang['SORT_JOINED'], 'c' => $user->lang['SORT_LOCATION']); $sort_key_sql = array('a' => 'u.username_clean', 'b' => 's.session_time', 'c' => 's.session_page'); // Sorting and order @@ -92,6 +92,7 @@ $sql = 'SELECT forum_id, forum_name, parent_id, forum_type, left_id, right_id ORDER BY left_id ASC'; $result = $db->sql_query($sql, 600); +$forum_data = array(); while ($row = $db->sql_fetchrow($result)) { $forum_data[$row['forum_id']] = $row; From de8c0a3b9c458bad81c4e854117b64a24e2704ab Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Tue, 31 Jul 2007 15:01:14 +0000 Subject: [PATCH 13/96] minor markup bugs (#13895, #13525) git-svn-id: file:///svn/phpbb/trunk@7988 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/styles/prosilver/template/index_body.html | 4 ++-- phpBB/styles/prosilver/template/ucp_profile_profile_info.html | 2 +- phpBB/styles/prosilver/template/ucp_register.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html index 51255489ef..0993bab93f 100644 --- a/phpBB/styles/prosilver/template/index_body.html +++ b/phpBB/styles/prosilver/template/index_body.html @@ -21,9 +21,9 @@     - | + diff --git a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html index 329597f542..2a40bcd53e 100644 --- a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html +++ b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html @@ -58,7 +58,7 @@
        -
        +
        for="{profile_fields.FIELD_ID}">{profile_fields.LANG_NAME}: *
        {profile_fields.LANG_EXPLAIN}
        {profile_fields.ERROR}
        {profile_fields.FIELD}
        diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html index 66245f3e6d..3b9d88d550 100644 --- a/phpBB/styles/prosilver/template/ucp_register.html +++ b/phpBB/styles/prosilver/template/ucp_register.html @@ -63,7 +63,7 @@
        -
        +
        for="{profile_fields.FIELD_ID}">{profile_fields.LANG_NAME}: *
        {profile_fields.LANG_EXPLAIN}
        {profile_fields.ERROR}
        {profile_fields.FIELD}
        From cef5720962ae88bae37eb2edc942b70400b2ff37 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Tue, 31 Jul 2007 16:31:30 +0000 Subject: [PATCH 14/96] #13906 Invalid files will be silently ignored git-svn-id: file:///svn/phpbb/trunk@7989 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/functions_user.php | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 396f01c27c..78fa24536f 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -191,6 +191,7 @@ p a {
        • [Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)
        • [Fix] Allow MS SQL to properly connect when using the mssql driver and PHP is less than either 4.4.1 or 5.1 (Bug #13874)
          • +
        • [Fix] Ignore files containging HTML special chars in the filenames as gallery avatars (Bug #13906)
        • [Fix] Multiple PM recipients not separated (Bug #13876)
        diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 0194ec06a4..08b2d963ca 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1981,14 +1981,13 @@ function avatar_gallery($category, $avatar_select, $items_per_column, $block_var $dp2 = @opendir("$path/$file"); while (($sub_file = readdir($dp2)) !== false) { - if (preg_match('#\.(?:gif|png|jpe?g)$#i', $sub_file)) + if (preg_match('#^[^&"<>]*\.(?:gif|png|jpe?g)$#i', $sub_file)) { $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) { From 30f81737096afe8c5910d6f494654d08950f4fcc Mon Sep 17 00:00:00 2001 From: David M Date: Tue, 31 Jul 2007 20:27:39 +0000 Subject: [PATCH 15/96] - found a bug, it caused MSSQL not being able to use templates stored in the DB since the first beta. removing pointless auto_increment git-svn-id: file:///svn/phpbb/trunk@7990 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 2 +- phpBB/install/database_update.php | 81 +++++++++++++++++++---- phpBB/install/schemas/firebird_schema.sql | 13 +--- phpBB/install/schemas/mssql_schema.sql | 2 +- phpBB/install/schemas/mysql_40_schema.sql | 2 +- phpBB/install/schemas/mysql_41_schema.sql | 2 +- phpBB/install/schemas/oracle_schema.sql | 18 +---- phpBB/install/schemas/postgres_schema.sql | 4 +- phpBB/install/schemas/sqlite_schema.sql | 2 +- 9 files changed, 77 insertions(+), 49 deletions(-) diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 1675fc0899..19334f5a2e 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1590,7 +1590,7 @@ function get_schema_struct() $schema_data['phpbb_styles_template_data'] = array( 'COLUMNS' => array( - 'template_id' => array('USINT', NULL, 'auto_increment'), + 'template_id' => array('USINT', 0), 'template_filename' => array('VCHAR:100', ''), 'template_included' => array('TEXT', ''), 'template_mtime' => array('TIMESTAMP', 0), diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index aca3b9f1c4..eb31c05fc9 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -401,7 +401,7 @@ $database_update_info = array( 'template_id' => array('USINT', NULL, 'auto_increment'), ), STYLES_TEMPLATE_DATA_TABLE => array( - 'template_id' => array('USINT', NULL, 'auto_increment'), + 'template_id' => array('USINT', 0), ), STYLES_THEME_TABLE => array( 'theme_id' => array('USINT', NULL, 'auto_increment'), @@ -1297,7 +1297,6 @@ if (version_compare($current_version, '3.0.RC4', '<=')) $update_auto_increment = array( STYLES_TABLE => 'style_id', STYLES_TEMPLATE_TABLE => 'template_id', - STYLES_TEMPLATE_DATA_TABLE => 'template_id', STYLES_THEME_TABLE => 'theme_id', STYLES_IMAGESET_TABLE => 'imageset_id' ); @@ -1413,15 +1412,6 @@ if (version_compare($current_version, '3.0.RC4', '<=')) $no_updates = false; } - else if ($map_dbms == 'sqlite') - { - foreach ($update_auto_increment as $auto_table_name => $auto_column_name) - { - sql_column_change($dbms, $auto_table_name, $auto_column_name, array('USINT', NULL, 'auto_increment')); - } - - $no_updates = false; - } else if ($map_dbms == 'postgres') { foreach ($update_auto_increment as $auto_table_name => $auto_column_name) @@ -1429,6 +1419,69 @@ if (version_compare($current_version, '3.0.RC4', '<=')) $sql = "SELECT SETVAL('" . $auto_table_name . "_seq',(select case when max({$auto_column_name})>0 then max({$auto_column_name})+1 else 1 end from " . $auto_table_name . '));'; _sql($sql, $errored, $error_ary); } + + $sql = 'DROP SEQUENCE ' . STYLES_TEMPLATE_DATA_TABLE . '_seq'; + _sql($sql, $errored, $error_ary); + } + else if ($map_dbms == 'firebird') + { + $sql = 'DROP TRIGGER t_' . STYLES_TEMPLATE_DATA_TABLE; + _sql($sql, $errored, $error_ary); + + $sql = 'DROP GENERATOR ' . STYLES_TEMPLATE_DATA_TABLE . '_gen'; + _sql($sql, $errored, $error_ary); + } + else if ($map_dbms == 'oracle') + { + $sql = 'DROP TRIGGER t_' . STYLES_TEMPLATE_DATA_TABLE; + _sql($sql, $errored, $error_ary); + + $sql = 'DROP SEQUENCE ' . STYLES_TEMPLATE_DATA_TABLE . '_seq'; + _sql($sql, $errored, $error_ary); + } + else if ($map_dbms == 'mssql') + { + // we use transactions because we need to have a working DB at the end of all of this + $db->sql_transaction('begin'); + + $sql = 'SELECT * + FROM ' . STYLES_TEMPLATE_TABLE; + $result = _sql($sql, $errored, $error_ary); + $old_style_rows = array(); + while ($row = $db->sql_fetchrow($result)) + { + $old_style_rows[] = $row; + } + $db->sql_freeresult($result); + + // death to the table, it is evil! + $sql = 'DROP TABLE ' . STYLES_TEMPLATE_DATA_TABLE; + _sql($sql, $errored, $error_ary); + + // the table of awesomeness, praise be to it (or something) + $sql = 'CREATE TABLE [' . STYLES_TEMPLATE_DATA_TABLE . "] ( + [template_id] [int] DEFAULT (0) NOT NULL , + [template_filename] [varchar] (100) DEFAULT ('') NOT NULL , + [template_included] [varchar] (8000) DEFAULT ('') NOT NULL , + [template_mtime] [int] DEFAULT (0) NOT NULL , + [template_data] [text] DEFAULT ('') NOT NULL + ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]"; + _sql($sql, $errored, $error_ary); + + // index? index + $sql = 'CREATE INDEX [tid] ON [' . STYLES_TEMPLATE_DATA_TABLE . ']([template_id]) ON [PRIMARY]'; + _sql($sql, $errored, $error_ary); + + // yet another index + $sql = 'CREATE INDEX [tfn] ON [' . STYLES_TEMPLATE_DATA_TABLE . ']([template_filename]) ON [PRIMARY]'; + _sql($sql, $errored, $error_ary); + + foreach ($old_style_rows as $return_row) + { + _sql('INSERT INTO ' . STYLES_TEMPLATE_DATA_TABLE . '(' . implode(', ', array_keys($return_row)) . ') VALUES (' . implode(', ', $return_row) . ')'); + } + + $db->sql_transaction('commit'); } } @@ -1882,7 +1935,11 @@ function prepare_column_data($dbms, $column_data, $table_name, $column_name) // In Oracle empty strings ('') are treated as NULL. // Therefore in oracle we allow NULL's for all DEFAULT '' entries - $sql .= ($column_data[1] === '') ? '' : 'NOT NULL'; + // Oracle does not like setting NOT NULL on a column that is already NOT NULL (this happens only on number fields) + if (preg_match('/number/i', $column_type)) + { + $sql .= ($column_data[1] === '') ? '' : 'NOT NULL'; + } break; case 'postgres': diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql index d0f9cf88d1..38ef13c412 100644 --- a/phpBB/install/schemas/firebird_schema.sql +++ b/phpBB/install/schemas/firebird_schema.sql @@ -1093,7 +1093,7 @@ END;; # Table: 'phpbb_styles_template_data' CREATE TABLE phpbb_styles_template_data ( - template_id INTEGER NOT NULL, + template_id INTEGER DEFAULT 0 NOT NULL, template_filename VARCHAR(100) CHARACTER SET NONE DEFAULT '' NOT NULL, template_included BLOB SUB_TYPE TEXT CHARACTER SET NONE DEFAULT '' NOT NULL, template_mtime INTEGER DEFAULT 0 NOT NULL, @@ -1103,17 +1103,6 @@ CREATE TABLE phpbb_styles_template_data ( CREATE INDEX phpbb_styles_template_data_tid ON phpbb_styles_template_data(template_id);; CREATE INDEX phpbb_styles_template_data_tfn ON phpbb_styles_template_data(template_filename);; -CREATE GENERATOR phpbb_styles_template_data_gen;; -SET GENERATOR phpbb_styles_template_data_gen TO 0;; - -CREATE TRIGGER t_phpbb_styles_template_data FOR phpbb_styles_template_data -BEFORE INSERT -AS -BEGIN - NEW.template_id = GEN_ID(phpbb_styles_template_data_gen, 1); -END;; - - # Table: 'phpbb_styles_theme' CREATE TABLE phpbb_styles_theme ( theme_id INTEGER NOT NULL, diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql index 7dd9c4e924..37e8f66b2a 100644 --- a/phpBB/install/schemas/mssql_schema.sql +++ b/phpBB/install/schemas/mssql_schema.sql @@ -1309,7 +1309,7 @@ GO Table: 'phpbb_styles_template_data' */ CREATE TABLE [phpbb_styles_template_data] ( - [template_id] [int] IDENTITY (1, 1) NOT NULL , + [template_id] [int] DEFAULT (0) NOT NULL , [template_filename] [varchar] (100) DEFAULT ('') NOT NULL , [template_included] [varchar] (8000) DEFAULT ('') NOT NULL , [template_mtime] [int] DEFAULT (0) NOT NULL , diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql index e2dc0718e7..a1450cacee 100644 --- a/phpBB/install/schemas/mysql_40_schema.sql +++ b/phpBB/install/schemas/mysql_40_schema.sql @@ -743,7 +743,7 @@ CREATE TABLE phpbb_styles_template ( # Table: 'phpbb_styles_template_data' CREATE TABLE phpbb_styles_template_data ( - template_id smallint(4) UNSIGNED NOT NULL auto_increment, + template_id smallint(4) UNSIGNED DEFAULT '0' NOT NULL, template_filename varbinary(100) DEFAULT '' NOT NULL, template_included blob NOT NULL, template_mtime int(11) UNSIGNED DEFAULT '0' NOT NULL, diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql index 022c3ecbfe..4cee662be6 100644 --- a/phpBB/install/schemas/mysql_41_schema.sql +++ b/phpBB/install/schemas/mysql_41_schema.sql @@ -743,7 +743,7 @@ CREATE TABLE phpbb_styles_template ( # Table: 'phpbb_styles_template_data' CREATE TABLE phpbb_styles_template_data ( - template_id smallint(4) UNSIGNED NOT NULL auto_increment, + template_id smallint(4) UNSIGNED DEFAULT '0' NOT NULL, template_filename varchar(100) DEFAULT '' NOT NULL, template_included text NOT NULL, template_mtime int(11) UNSIGNED DEFAULT '0' NOT NULL, diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql index 7dad10dd67..aabc00f0e2 100644 --- a/phpBB/install/schemas/oracle_schema.sql +++ b/phpBB/install/schemas/oracle_schema.sql @@ -1453,7 +1453,7 @@ END; Table: 'phpbb_styles_template_data' */ CREATE TABLE phpbb_styles_template_data ( - template_id number(4) NOT NULL, + template_id number(4) DEFAULT '0' NOT NULL, template_filename varchar2(100) DEFAULT '' , template_included clob DEFAULT '' , template_mtime number(11) DEFAULT '0' NOT NULL, @@ -1466,22 +1466,6 @@ CREATE INDEX phpbb_styles_template_data_tid ON phpbb_styles_template_data (templ CREATE INDEX phpbb_styles_template_data_tfn ON phpbb_styles_template_data (template_filename) / -CREATE SEQUENCE phpbb_styles_template_data_seq -/ - -CREATE OR REPLACE TRIGGER t_phpbb_styles_template_data -BEFORE INSERT ON phpbb_styles_template_data -FOR EACH ROW WHEN ( - new.template_id IS NULL OR new.template_id = 0 -) -BEGIN - SELECT phpbb_styles_template_data_seq.nextval - INTO :new.template_id - FROM dual; -END; -/ - - /* Table: 'phpbb_styles_theme' */ diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql index f9b0557d8a..5d4c6f477b 100644 --- a/phpBB/install/schemas/postgres_schema.sql +++ b/phpBB/install/schemas/postgres_schema.sql @@ -977,10 +977,8 @@ CREATE UNIQUE INDEX phpbb_styles_template_tmplte_nm ON phpbb_styles_template (te /* Table: 'phpbb_styles_template_data' */ -CREATE SEQUENCE phpbb_styles_template_data_seq; - CREATE TABLE phpbb_styles_template_data ( - template_id INT2 DEFAULT nextval('phpbb_styles_template_data_seq'), + template_id INT2 DEFAULT '0' NOT NULL CHECK (template_id >= 0), template_filename varchar(100) DEFAULT '' NOT NULL, template_included varchar(8000) DEFAULT '' NOT NULL, template_mtime INT4 DEFAULT '0' NOT NULL CHECK (template_mtime >= 0), diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql index 90847e9d31..546cfb0321 100644 --- a/phpBB/install/schemas/sqlite_schema.sql +++ b/phpBB/install/schemas/sqlite_schema.sql @@ -717,7 +717,7 @@ CREATE UNIQUE INDEX phpbb_styles_template_tmplte_nm ON phpbb_styles_template (te # Table: 'phpbb_styles_template_data' CREATE TABLE phpbb_styles_template_data ( - template_id INTEGER PRIMARY KEY NOT NULL , + template_id INTEGER UNSIGNED NOT NULL DEFAULT '0', template_filename varchar(100) NOT NULL DEFAULT '', template_included text(65535) NOT NULL DEFAULT '', template_mtime INTEGER UNSIGNED NOT NULL DEFAULT '0', From 0d9a8d01596d575105bda478f49674e25182b046 Mon Sep 17 00:00:00 2001 From: David M Date: Tue, 31 Jul 2007 21:00:43 +0000 Subject: [PATCH 16/96] oops git-svn-id: file:///svn/phpbb/trunk@7991 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/install/database_update.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index eb31c05fc9..d39dbbe674 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1445,7 +1445,7 @@ if (version_compare($current_version, '3.0.RC4', '<=')) $db->sql_transaction('begin'); $sql = 'SELECT * - FROM ' . STYLES_TEMPLATE_TABLE; + FROM ' . STYLES_TEMPLATE_DATA_TABLE; $result = _sql($sql, $errored, $error_ary); $old_style_rows = array(); while ($row = $db->sql_fetchrow($result)) @@ -1478,7 +1478,7 @@ if (version_compare($current_version, '3.0.RC4', '<=')) foreach ($old_style_rows as $return_row) { - _sql('INSERT INTO ' . STYLES_TEMPLATE_DATA_TABLE . '(' . implode(', ', array_keys($return_row)) . ') VALUES (' . implode(', ', $return_row) . ')'); + _sql('INSERT INTO ' . STYLES_TEMPLATE_DATA_TABLE . ' ' . $db->sql_build_array('INSERT', $return_row), $errored, $error_ary); } $db->sql_transaction('commit'); @@ -2619,7 +2619,7 @@ function sql_column_change($dbms, $table_name, $column_name, $column_data) if (!$constraint_exists) { - $sql_array[] = "ADD '" . $column_data['constraint'] . "'"; + $sql_array[] = 'ADD ' . $column_data['constraint']; } } From fae688ba2af955afb6c2eaecad7f923359836865 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Wed, 1 Aug 2007 15:50:47 +0000 Subject: [PATCH 17/96] Introducing some changes to acp_icons. This adds language variables. The JS candy is mostly only for firefox, the actual fix is splitting the list. #13917 #13911 git-svn-id: file:///svn/phpbb/trunk@7992 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_icons.html | 46 ++++++++++++++++++++++++---- phpBB/docs/CHANGELOG.html | 4 +++ phpBB/includes/acp/acp_icons.php | 41 +++++++++++++++++-------- phpBB/includes/functions_convert.php | 2 +- 4 files changed, 74 insertions(+), 19 deletions(-) diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html index 9c488c9f90..265136cbcc 100644 --- a/phpBB/adm/style/acp_icons.html +++ b/phpBB/adm/style/acp_icons.html @@ -4,8 +4,8 @@ + + var toggle_options; + + function toggle_select(smilie, display, select) + { + var disp = document.getElementById('order_disp[' + smilie + ']'); + var nodisp = document.getElementById('order_no_disp[' + smilie + ']'); + disp.disabled = !display; + //document.getElementById('order_disp[' + smilie + ']').style = ''; + nodisp.disabled = display; + //document.getElementById('order_no_disp[' + smilie + ']').style = 'display:none'; + if (display) + { + + document.getElementById(select).selectedIndex = 0; + + nodisp.style.display = 'none'; + disp.style.display = ''; + } + else + { + document.getElementById(select).selectedIndex = {S_ORDER_LIST_DISPLAY_COUNT}; + + disp.style.display = 'none'; + nodisp.style.display = ''; + } + } + + + « {L_BACK} @@ -89,13 +117,16 @@ - + - + @@ -113,8 +144,11 @@ - - + + diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 78fa24536f..f22ce6b952 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -193,6 +193,10 @@ p a {
      • [Fix] Allow MS SQL to properly connect when using the mssql driver and PHP is less than either 4.4.1 or 5.1 (Bug #13874)
      • [Fix] Ignore files containging HTML special chars in the filenames as gallery avatars (Bug #13906)
      • [Fix] Multiple PM recipients not separated (Bug #13876)
        • +
      • [Change] Split the select list for the smilie order to clarify which are feasible and which are not (Bug #13911)
        • +
      • [Fix] Convert empty homepage fields (Bug #13917)
        • + +
      diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php index 538a46358d..f0a0ad1a89 100644 --- a/phpBB/includes/acp/acp_icons.php +++ b/phpBB/includes/acp/acp_icons.php @@ -144,13 +144,19 @@ class acp_icons } } } - + $sql = "SELECT * FROM $table ORDER BY {$fields}_order " . (($icon_id || $action == 'add') ? 'DESC' : 'ASC'); $result = $db->sql_query($sql); - + $data = array(); + $after = false; + $display = 0; + $order_lists = array('', ''); + $add_order_lists = array('', ''); + $display_count = 0; + while ($row = $db->sql_fetchrow($result)) { if ($action == 'add') @@ -158,9 +164,11 @@ class acp_icons unset($_images[$row[$fields . '_url']]); } + if ($row[$fields . '_id'] == $icon_id) { $after = true; + $display = $row['display_on_posting']; $data[$row[$fields . '_url']] = $row; } else @@ -176,35 +184,41 @@ class acp_icons $selected = ' selected="selected"'; $after = false; } - + if ($row['display_on_posting']) + { + $display_count++; + } $after_txt = ($mode == 'smilies') ? $row['code'] : $row['icons_url']; - $order_list = '' . $order_list; + $order_lists[$row['display_on_posting']] = '' . $order_lists[$row['display_on_posting']]; if (!empty($default_row)) { - $add_order_list = '' . $add_order_list; + $add_order_lists[$row['display_on_posting']] = '' . $add_order_lists[$row['display_on_posting']]; } } } $db->sql_freeresult($result); - $order_list = '' . $order_list; - $add_order_list = '' . $add_order_list; - + $order_list = ''; + $add_order_list = ''; + if ($action == 'add') { $data = $_images; } - + $colspan = (($mode == 'smilies') ? '7' : '5'); $colspan += ($icon_id) ? 1 : 0; $colspan += ($action == 'add') ? 2 : 0; - + $template->assign_vars(array( 'S_EDIT' => true, 'S_SMILIES' => ($mode == 'smilies') ? true : false, 'S_ADD' => ($action == 'add') ? true : false, - 'S_ORDER_LIST' => $order_list, + + 'S_ORDER_LIST_DISPLAY' => $order_list . $order_lists[1], + 'S_ORDER_LIST_UNDISPLAY' => $order_list . $order_lists[0], + 'S_ORDER_LIST_DISPLAY_COUNT' => $display_count + 1, 'L_TITLE' => $user->lang['ACP_' . $lang], 'L_EXPLAIN' => $user->lang['ACP_' . $lang . '_EXPLAIN'], @@ -247,7 +261,10 @@ class acp_icons 'S_ADD_CODE' => true, 'S_IMG_OPTIONS' => $smiley_options, - 'S_ADD_ORDER_LIST' => $add_order_list, + + 'S_ADD_ORDER_LIST_DISPLAY' => $add_order_list . $add_order_lists[1], + 'S_ADD_ORDER_LIST_UNDISPLAY' => $add_order_list . $add_order_lists[0], + 'IMG_SRC' => $phpbb_root_path . $img_path . '/' . $default_row['smiley_url'], 'IMG_PATH' => $img_path, 'PHPBB_ROOT_PATH' => $phpbb_root_path, diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php index 159ec387bd..5e1159cb22 100644 --- a/phpBB/includes/functions_convert.php +++ b/phpBB/includes/functions_convert.php @@ -228,7 +228,7 @@ function validate_website($url) { return ''; } - else if (strpos(strtolower($url), 'http://') !== 0) + else if (strpos(strtolower($url), 'http://') !== 0 && strlen($url) > 0) { return 'http://' . $url; } From 2ffdd92975cdacd7c12b5a438a62730ec02e6129 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Wed, 1 Aug 2007 16:23:22 +0000 Subject: [PATCH 18/96] #13918 And the language entries for the last ci. git-svn-id: file:///svn/phpbb/trunk@7993 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/language/en/acp/posting.php | 6 +++++- phpBB/language/en/common.php | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index bededcf947..f5be3d4d5e 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -91,8 +91,12 @@ $lang = array_merge($lang, array( 'CURRENT_SMILIES' => 'Current smilies', 'CURRENT_SMILIES_EXPLAIN' => 'Choose what to do with the currently installed smilies.', - 'DISPLAY_ON_POSTING' => 'Display on posting page', + 'DISPLAY_ON_POSTING' => 'Display on posting page', + 'DISPLAY_POSTING' => 'On posting page', + 'DISPLAY_POSTING_NO' => 'Not on posting page', + + 'EDIT_ICONS' => 'Edit icons', 'EDIT_SMILIES' => 'Edit smilies', 'EMOTION' => 'Emotion', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index fe528d48fe..b082a00c52 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -591,8 +591,9 @@ $lang = array_merge($lang, array( 'UNREAD_MESSAGES' => 'Unread messages', 'UNREAD_PM' => '%d unread message', 'UNREAD_PMS' => '%d unread messages', - 'UNWATCHED_FORUMS' => 'You are no longer subscribed to the selected forums.', - 'UNWATCHED_TOPICS' => 'You are no longer subscribed to the selected topics.', + 'UNWATCHED_FORUMS' => 'You are no longer subscribed to the selected forums.', + 'UNWATCHED_TOPICS' => 'You are no longer subscribed to the selected topics.', + 'UNWATCHED_FORUMS_TOPICS' => 'You are no longer subscribed to the selected entries.', 'UPDATE' => 'Update', 'UPLOAD_IN_PROGRESS' => 'The upload is currently in progress.', 'URL_REDIRECT' => 'If your browser does not support meta redirection %splease click HERE to be redirected%s.', From 5ed0be15abe090c426114240f06a01005edfefea Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Wed, 1 Aug 2007 16:27:06 +0000 Subject: [PATCH 19/96] some tiny fixes and two new features. ;) git-svn-id: file:///svn/phpbb/trunk@7994 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_ban.html | 6 +++--- phpBB/docs/CHANGELOG.html | 7 +++++-- phpBB/includes/acp/acp_users.php | 22 ++++++++++++++-------- phpBB/includes/functions.php | 12 +++++++++++- phpBB/includes/functions_user.php | 2 +- phpBB/language/en/acp/board.php | 2 +- phpBB/posting.php | 1 + phpBB/styles/prosilver/template/editor.js | 3 ++- 8 files changed, 38 insertions(+), 17 deletions(-) diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html index 334d245edf..e371d48bfc 100644 --- a/phpBB/adm/style/acp_ban.html +++ b/phpBB/adm/style/acp_ban.html @@ -31,9 +31,9 @@ function display_details(option) { - document.getElementById('acp_ban').unbangivereason.value = ban_give_reason[option]; - document.getElementById('acp_ban').unbanreason.value = ban_reason[option]; - document.getElementById('acp_ban').unbanlength.value = ban_length[option]; + document.getElementById('acp_unban').unbangivereason.value = ban_give_reason[option]; + document.getElementById('acp_unban').unbanreason.value = ban_reason[option]; + document.getElementById('acp_unban').unbanlength.value = ban_length[option]; } //--> diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index f22ce6b952..8ca4d0a6e3 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -195,8 +195,11 @@ p a {
    5. [Fix] Multiple PM recipients not separated (Bug #13876)
    6. [Change] Split the select list for the smilie order to clarify which are feasible and which are not (Bug #13911)
    7. [Fix] Convert empty homepage fields (Bug #13917)
      8. - - +
    8. [Fix] Use board default DST setting on creating new profiles (Bug #11563)
      9. +
    9. [Feature] New constant PHPBB_EMBEDDED can be used to let phpBB not call exit; if wrapped/embedded (We may re-check this constant on other code locations later too)
      10. +
    10. [Feature] append_sid() having a check for the function append_sid_phpbb_hook(). This function is called in favor of append_sid() with the exact same parameters if present.
      11. +
    11. [Fix] Only list enabled modes within the dropdown at user administration (Bug #13883) - patch provided by damnian
      12. +
    12. [Fix] Properly display ban reason if selecting banned entries within the ACP (Bug #13896)
      13. diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 5b6a790e97..2a059121e0 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -114,20 +114,26 @@ class acp_users // Generate overall "header" for user admin $s_form_options = ''; - // Include info file... - include_once($phpbb_root_path . 'includes/acp/info/acp_users.' . $phpEx); - $forms_ary = acp_users_info::module(); + // Build modes dropdown list + $sql = 'SELECT module_mode, module_auth + FROM ' . MODULES_TABLE . ' + WHERE parent_id = ' . $this->p_master->p_parent . " + AND module_basename = 'users' + AND module_enabled = 1 + ORDER BY left_id"; + $result = $db->sql_query($sql); - foreach ($forms_ary['modes'] as $value => $ary) + while ($row = $db->sql_fetchrow($result)) { - if (!$this->p_master->module_auth($ary['auth'])) + if (!$this->p_master->module_auth($row['module_auth'])) { continue; } - - $selected = ($mode == $value) ? ' selected="selected"' : ''; - $s_form_options .= ''; + + $selected = ($mode == $row['module_mode']) ? ' selected="selected"' : ''; + $s_form_options .= ''; } + $db->sql_freeresult($result); $template->assign_vars(array( 'U_BACK' => $this->u_action, diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index daff12e3a8..5632d78022 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1582,6 +1582,13 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false) { global $_SID, $_EXTRA_URL; + // Developers using the hook function need to globalise the $_SID and $_EXTRA_URL on their own and also handle it appropiatly. + // They could mimick most of what is within this function + if (function_exists('append_sid_phpbb_hook')) + { + return append_sid_phpbb_hook($url, $params, $is_amp, $session_id); + } + // Assign sid if session id is not specified if ($session_id === false) { @@ -4276,7 +4283,10 @@ function page_footer($run_cron = true) garbage_collection(); - exit; + if (!defined('PHPBB_EMBEDDED')) + { + exit; + } } /** diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 08b2d963ca..2decddb54f 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -181,7 +181,7 @@ function user_add($user_row, $cp_data = false) 'user_lastpost_time' => 0, 'user_lastpage' => '', 'user_posts' => 0, - 'user_dst' => 0, + 'user_dst' => (int) $config['board_dst'], 'user_colour' => '', 'user_occ' => '', 'user_interests' => '', diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 5d0627475c..af88b47db5 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -353,7 +353,7 @@ $lang = array_merge($lang, array( 'BROWSER_VALID' => 'Validate browser', 'BROWSER_VALID_EXPLAIN' => 'Enables browser validation for each session improving security.', 'CHECK_DNSBL' => 'Check IP against DNS Blackhole List', - 'CHECK_DNSBL_EXPLAIN' => 'If enabled the user’s IP address is checked against the following DNSBL services on registration and posting: spamcop.net, dsbl.org and spamhaus.org. This lookup may take a while, depending on the server’s configuration. If slowdowns are experienced or too many false positives reported it is recommended to disable this check.', + 'CHECK_DNSBL_EXPLAIN' => 'If enabled the user’s IP address is checked against the following DNSBL services on registration and posting: spamcop.net, dsbl.org and www.spamhaus.org. This lookup may take a while, depending on the server’s configuration. If slowdowns are experienced or too many false positives reported it is recommended to disable this check.', 'CLASS_B' => 'A.B', 'CLASS_C' => 'A.B.C', 'EMAIL_CHECK_MX' => 'Check e-mail domain for valid MX record', diff --git a/phpBB/posting.php b/phpBB/posting.php index 92b44b3f21..af357a90b9 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -113,6 +113,7 @@ switch ($mode) else { upload_popup(); + garbage_collection(); exit; } break; diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js index 80dd20da99..61747f7e56 100644 --- a/phpBB/styles/prosilver/template/editor.js +++ b/phpBB/styles/prosilver/template/editor.js @@ -227,7 +227,8 @@ function addquote(post_id, username) theSelection = theSelection.replace(//ig, '\n'); theSelection = theSelection.replace(/<\;/ig, '<'); theSelection = theSelection.replace(/>\;/ig, '>'); - theSelection = theSelection.replace(/&\;/ig, '&'); + theSelection = theSelection.replace(/&\;/ig, '&'); + theSelection = theSelection.replace(/ \;/ig, ' '); } else if (document.all) { From f684da8e932c8faf36e9c142768e0d97d6b65dec Mon Sep 17 00:00:00 2001 From: David M Date: Thu, 2 Aug 2007 05:05:44 +0000 Subject: [PATCH 20/96] #13916 git-svn-id: file:///svn/phpbb/trunk@7995 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/db/oracle.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 8ca4d0a6e3..27cc0f0e1e 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -200,6 +200,7 @@ p a {
    13. [Feature] append_sid() having a check for the function append_sid_phpbb_hook(). This function is called in favor of append_sid() with the exact same parameters if present.
    14. [Fix] Only list enabled modes within the dropdown at user administration (Bug #13883) - patch provided by damnian
    15. [Fix] Properly display ban reason if selecting banned entries within the ACP (Bug #13896)
      16. +
    16. [Fix] Properly parse SQL expressions for Oracle (Bug #13916)
      17. diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php index 6049fa5734..18af5cbab0 100644 --- a/phpBB/includes/db/oracle.php +++ b/phpBB/includes/db/oracle.php @@ -115,7 +115,7 @@ class dbal_oracle extends dbal */ function _rewrite_where($where_clause) { - preg_match_all('/\s*(AND|OR)?\s*([\w_.]++)\s*(?:(=|<>)\s*((?>\'(?>[^\']++|\'\')*+\'|[\d-.]+))|((NOT )?IN\s*\((?>\'(?>[^\']++|\'\')*+\',? ?|[\d-.]+,? ?)*+\)))/', $where_clause, $result, PREG_SET_ORDER); + preg_match_all('/\s*(AND|OR)?\s*([\w_.]++)\s*(?:(=|<[=>]?|>=?)\s*((?>\'(?>[^\']++|\'\')*+\'|[\d-.]+))|((NOT )?IN\s*\((?>\'(?>[^\']++|\'\')*+\',? ?|[\d-.]+,? ?)*+\)))/', $where_clause, $result, PREG_SET_ORDER); $out = ''; foreach ($result as $val) { From 37973409f8c431e53b7964d53661c30468d98fc3 Mon Sep 17 00:00:00 2001 From: David M Date: Thu, 2 Aug 2007 17:58:33 +0000 Subject: [PATCH 21/96] #13936 git-svn-id: file:///svn/phpbb/trunk@7996 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_users_profile.html | 2 +- phpBB/docs/CHANGELOG.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html index 69edb1159b..6a50887141 100644 --- a/phpBB/adm/style/acp_users_profile.html +++ b/phpBB/adm/style/acp_users_profile.html @@ -49,7 +49,7 @@ {L_USER_CUSTOM_PROFILE_FIELDS}
      -

      {profile_fields.LANG_EXPLAIN}
      +
      for="{profile_fields.FIELD_ID}">{profile_fields.LANG_NAME}:
      {profile_fields.LANG_EXPLAIN}
      {profile_fields.FIELD}
      {profile_fields.ERROR}
      diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 27cc0f0e1e..094ba562fb 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -201,6 +201,7 @@ p a {
    17. [Fix] Only list enabled modes within the dropdown at user administration (Bug #13883) - patch provided by damnian
    18. [Fix] Properly display ban reason if selecting banned entries within the ACP (Bug #13896)
    19. [Fix] Properly parse SQL expressions for Oracle (Bug #13916)
      20. +
    20. [Fix] Added label bindings to the custom profile fields in the ACP (Bug #13936) - patch provided by damnian
      21. From b9cfdd71dc4100c48e5b9e839c8823b5bfaa9ff3 Mon Sep 17 00:00:00 2001 From: David M Date: Thu, 2 Aug 2007 18:29:30 +0000 Subject: [PATCH 22/96] #13860 git-svn-id: file:///svn/phpbb/trunk@7997 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/styles/prosilver/template/jumpbox.html | 2 +- phpBB/styles/prosilver/template/mcp_ban.html | 2 +- phpBB/styles/prosilver/template/viewtopic_body.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html index 637e5c7e9a..323668628d 100644 --- a/phpBB/styles/prosilver/template/jumpbox.html +++ b/phpBB/styles/prosilver/template/jumpbox.html @@ -17,7 +17,7 @@
      - +
      {L_FIND_USERNAME}
      diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 840d029b3b..02efecf338 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -256,7 +256,7 @@
      - {S_TOPIC_MOD} + {S_TOPIC_MOD}
      From c6cbae0397af492b48c4cef0cd84bb8696a1df92 Mon Sep 17 00:00:00 2001 From: David M Date: Thu, 2 Aug 2007 18:36:18 +0000 Subject: [PATCH 23/96] forgot one git-svn-id: file:///svn/phpbb/trunk@7998 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/styles/prosilver/template/ucp_pm_options.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/ucp_pm_options.html b/phpBB/styles/prosilver/template/ucp_pm_options.html index e8ecf2c306..02ffe3cee4 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_options.html +++ b/phpBB/styles/prosilver/template/ucp_pm_options.html @@ -100,7 +100,7 @@
      -
      +
      From 3d15be075ce50e5b09d6181b8ee44220a05aa7f6 Mon Sep 17 00:00:00 2001 From: David M Date: Thu, 2 Aug 2007 18:48:05 +0000 Subject: [PATCH 24/96] #13927 git-svn-id: file:///svn/phpbb/trunk@7999 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/styles/prosilver/template/index_body.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html index 0993bab93f..1214ebb946 100644 --- a/phpBB/styles/prosilver/template/index_body.html +++ b/phpBB/styles/prosilver/template/index_body.html @@ -21,7 +21,7 @@     - | + | From f6bfe8db161db271628df8128812209648c3b5e3 Mon Sep 17 00:00:00 2001 From: David M Date: Thu, 2 Aug 2007 19:03:53 +0000 Subject: [PATCH 25/96] #13936 git-svn-id: file:///svn/phpbb/trunk@8000 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/custom_profile_fields.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/phpBB/adm/style/custom_profile_fields.html b/phpBB/adm/style/custom_profile_fields.html index 1aba162d00..7516d6120e 100644 --- a/phpBB/adm/style/custom_profile_fields.html +++ b/phpBB/adm/style/custom_profile_fields.html @@ -1,32 +1,32 @@ - - + - + - + - checked="checked" /> + checked="checked" /> - + - {L_DAY}: - {L_MONTH}: - {L_YEAR}: + {L_DAY}: + {L_MONTH}: + {L_YEAR}: From 757d630522c3066cbc293faeeaf534b2b3a8c7be Mon Sep 17 00:00:00 2001 From: David M Date: Fri, 3 Aug 2007 04:42:27 +0000 Subject: [PATCH 26/96] OH NO, WHAT HAS HE DONE?! - bug in the normalizer, we must renormalize... again... git-svn-id: file:///svn/phpbb/trunk@8001 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/utf/utf_normalizer.php | 10 ++++++++-- phpBB/install/database_update.php | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/utf/utf_normalizer.php b/phpBB/includes/utf/utf_normalizer.php index c1a0fc9a7b..8b5cf5a993 100644 --- a/phpBB/includes/utf/utf_normalizer.php +++ b/phpBB/includes/utf/utf_normalizer.php @@ -123,6 +123,12 @@ class utf_normalizer include($phpbb_root_path . 'includes/utf/data/utf_nfc_qc.' . $phpEx); } + if (!isset($GLOBALS['utf_canonical_decomp'])) + { + global $phpbb_root_path, $phpEx; + include($phpbb_root_path . 'includes/utf/data/utf_canonical_decomp.' . $phpEx); + } + $str = utf_normalizer::recompose($str, $pos, $len, $GLOBALS['utf_nfc_qc'], $GLOBALS['utf_canonical_decomp']); } @@ -149,10 +155,10 @@ class utf_normalizer include($phpbb_root_path . 'includes/utf/data/utf_nfkc_qc.' . $phpEx); } - if (!isset($GLOBALS['utf_canonical_comp'])) + if (!isset($GLOBALS['utf_compatibility_decomp'])) { global $phpbb_root_path, $phpEx; - include($phpbb_root_path . 'includes/utf/data/utf_canonical_comp.' . $phpEx); + include($phpbb_root_path . 'includes/utf/data/utf_compatibility_decomp.' . $phpEx); } $str = utf_normalizer::recompose($str, $pos, $len, $GLOBALS['utf_nfkc_qc'], $GLOBALS['utf_compatibility_decomp']); diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index d39dbbe674..ba4bf5d170 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -532,7 +532,7 @@ else // Checks/Operations that have to be completed prior to starting the update itself $exit = false; -if (version_compare($current_version, '3.0.RC3', '<=')) +if (version_compare($current_version, '3.0.RC4', '<=')) { // Define missing language entries... if (!isset($lang['CLEANING_USERNAMES'])) From e9151c450f75f034f2721c70fb970f9259be79b5 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Fri, 3 Aug 2007 11:36:55 +0000 Subject: [PATCH 27/96] cleaning up a little (yucc, gross) git-svn-id: file:///svn/phpbb/trunk@8002 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_icons.html | 31 +++++++++++++------------------ phpBB/adm/style/admin.css | 5 +++++ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html index 265136cbcc..b2033a9c11 100644 --- a/phpBB/adm/style/acp_icons.html +++ b/phpBB/adm/style/acp_icons.html @@ -5,9 +5,9 @@ @@ -124,8 +119,8 @@ @@ -147,7 +142,7 @@ diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 4d30bb0b91..489b22a7d4 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -726,6 +726,11 @@ optgroup { font-weight: bold; } +optgroup.disabled-options { + display: none; + background-color: gray; +} + option { padding: 0 1em 0 0; color: #000; From f39202b42c8ab682cce675bdbd5871de5c41dcaa Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Fri, 3 Aug 2007 12:05:51 +0000 Subject: [PATCH 28/96] *** empty log message *** git-svn-id: file:///svn/phpbb/trunk@8003 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_icons.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html index b2033a9c11..5100de32d8 100644 --- a/phpBB/adm/style/acp_icons.html +++ b/phpBB/adm/style/acp_icons.html @@ -41,10 +41,10 @@ - function toggle_select(smilie, display, select) + function toggle_select(icon, display, select) { - var disp = document.getElementById('order_disp[' + smilie + ']'); - var nodisp = document.getElementById('order_no_disp[' + smilie + ']'); + var disp = document.getElementById('order_disp[' + icon + ']'); + var nodisp = document.getElementById('order_no_disp[' + icon + ']'); disp.disabled = !display; nodisp.disabled = display; if (display) From 92b02006fee63fd41c65cee0c7f79f7f62517f75 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 4 Aug 2007 13:49:52 +0000 Subject: [PATCH 29/96] small fix - we do not rely on the parent_id (it could be different for every single mode) git-svn-id: file:///svn/phpbb/trunk@8004 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/acp/acp_users.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 2a059121e0..3747282f1e 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -116,10 +116,11 @@ class acp_users // Build modes dropdown list $sql = 'SELECT module_mode, module_auth - FROM ' . MODULES_TABLE . ' - WHERE parent_id = ' . $this->p_master->p_parent . " - AND module_basename = 'users' + FROM ' . MODULES_TABLE . " + WHERE module_basename = 'users' AND module_enabled = 1 + AND module_class = 'acp' + GROUP BY module_mode ORDER BY left_id"; $result = $db->sql_query($sql); From 5d5df25f758ebec42d5202e97bfa3cc3c026b281 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Sat, 4 Aug 2007 13:53:19 +0000 Subject: [PATCH 30/96] #13961 - the fix is not perfect, we now nuke the avatar/rank when leaving a group - no matter what. git-svn-id: file:///svn/phpbb/trunk@8005 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/functions_user.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 094ba562fb..274c8bdc2f 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -202,6 +202,7 @@ p a {
    21. [Fix] Properly display ban reason if selecting banned entries within the ACP (Bug #13896)
    22. [Fix] Properly parse SQL expressions for Oracle (Bug #13916)
    23. [Fix] Added label bindings to the custom profile fields in the ACP (Bug #13936) - patch provided by damnian
      24. +
    24. [Fix] Always remove avatars/ranks when leaving a group. (Bug 13961)
      25. diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 2decddb54f..3d6e3d351a 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -2710,7 +2710,7 @@ function group_user_del($group_id, $user_id_ary = false, $username_ary = false, { if (isset($sql_where_ary[$gid]) && sizeof($sql_where_ary[$gid])) { - group_set_user_default($gid, $sql_where_ary[$gid], $special_group_data[$gid]); + group_set_user_default($gid, $sql_where_ary[$gid], $special_group_data[$gid], false, true); } } unset($special_group_data); @@ -2892,7 +2892,7 @@ function group_validate_groupname($group_id, $group_name) * * @private */ -function group_set_user_default($group_id, $user_id_ary, $group_attributes = false, $update_listing = false, $same_group = false) +function group_set_user_default($group_id, $user_id_ary, $group_attributes = false, $update_listing = false, $overwrite = false) { global $db; @@ -2930,7 +2930,7 @@ function group_set_user_default($group_id, $user_id_ary, $group_attributes = fal if (isset($group_attributes[$attribute])) { // If we are about to set an avatar or rank, we will not overwrite with empty, unless we are not actually changing the default group - if (!$same_group && (strpos($attribute, 'group_avatar') === 0 || strpos($attribute, 'group_rank') === 0) && !$group_attributes[$attribute]) + if (!$overwrite && (strpos($attribute, 'group_avatar') === 0 || strpos($attribute, 'group_rank') === 0) && !$group_attributes[$attribute]) { continue; } From a9ee9fbddc74114d2bfd37b5ff6879bbe2dd0cb5 Mon Sep 17 00:00:00 2001 From: David M Date: Sun, 5 Aug 2007 13:35:23 +0000 Subject: [PATCH 31/96] another thing was never included, now it is git-svn-id: file:///svn/phpbb/trunk@8006 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/utf/utf_normalizer.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/phpBB/includes/utf/utf_normalizer.php b/phpBB/includes/utf/utf_normalizer.php index 8b5cf5a993..e59863199d 100644 --- a/phpBB/includes/utf/utf_normalizer.php +++ b/phpBB/includes/utf/utf_normalizer.php @@ -240,6 +240,13 @@ class utf_normalizer include($phpbb_root_path . 'includes/utf/data/utf_normalizer_common.' . $phpEx); } + // Load the canonical composition table + if (!isset($utf_canonical_comp)) + { + global $phpbb_root_path, $phpEx; + include($phpbb_root_path . 'includes/utf/data/utf_canonical_comp.' . $phpEx); + } + // Buffer the last ASCII char before the UTF-8 stuff if applicable $tmp = ''; $i = $tmp_pos = $last_cc = 0; From 65abb76a8cfade8d541a8d956001836f00c212ab Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Sun, 5 Aug 2007 15:57:06 +0000 Subject: [PATCH 32/96] Okay, this add a few queries, but now ranks and avatars should behave as expected. git-svn-id: file:///svn/phpbb/trunk@8007 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 2 +- phpBB/includes/functions_user.php | 153 ++++++++++++++++++++++++++---- 2 files changed, 134 insertions(+), 21 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 274c8bdc2f..30b81d5f7a 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -202,7 +202,7 @@ p a {
    25. [Fix] Properly display ban reason if selecting banned entries within the ACP (Bug #13896)
    26. [Fix] Properly parse SQL expressions for Oracle (Bug #13916)
    27. [Fix] Added label bindings to the custom profile fields in the ACP (Bug #13936) - patch provided by damnian
      28. -
    28. [Fix] Always remove avatars/ranks when leaving a group. (Bug 13961)
      29. +
    29. [Change] Made group avatar/rank changes more intuitive
      30. diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 3d6e3d351a..e7d4cd7259 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -2301,6 +2301,7 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow if (!sizeof($error)) { + $user_ary = array(); $sql_ary = array( 'group_name' => (string) $name, 'group_desc' => (string) $desc, @@ -2334,6 +2335,26 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow if ($group_id) { + $sql = 'SELECT user_id + FROM ' . USERS_TABLE . ' + WHERE group_id = ' . $group_id; + $result = $db->sql_query($sql); + + while ($row = $db->sql_fetchrow($result)) + { + $user_ary[] = $row['user_id']; + } + $db->sql_freeresult($result); + + if (isset($sql_ary['group_avatar']) && !$sql_ary['group_avatar']) + { + remove_default_avatar($group_id, $user_ary); + } + if (isset($sql_ary['group_rank']) && !$sql_ary['group_rank']) + { + remove_default_rank($group_id, $user_ary); + } + $sql = 'UPDATE ' . GROUPS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " WHERE group_id = $group_id"; @@ -2379,24 +2400,10 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow } } - if (sizeof($sql_ary)) + if (sizeof($sql_ary) && sizeof($user_ary)) { - $sql = 'SELECT user_id - FROM ' . USERS_TABLE . ' - WHERE group_id = ' . $group_id; - $result = $db->sql_query($sql); - - $user_ary = array(); - while ($row = $db->sql_fetchrow($result)) - { - $user_ary[] = $row['user_id']; - } - $db->sql_freeresult($result); - - if (sizeof($user_ary)) - { - group_set_user_default($group_id, $user_ary, $sql_ary, false, true); - } + group_set_user_default($group_id, $user_ary, $sql_ary); + } $name = ($type == GROUP_SPECIAL) ? $user->lang['G_' . $name] : $name; @@ -2710,7 +2717,9 @@ function group_user_del($group_id, $user_id_ary = false, $username_ary = false, { if (isset($sql_where_ary[$gid]) && sizeof($sql_where_ary[$gid])) { - group_set_user_default($gid, $sql_where_ary[$gid], $special_group_data[$gid], false, true); + remove_default_rank($group_id, $sql_where_ary[$gid]); + remove_default_avatar($group_id, $sql_where_ary[$gid]); + group_set_user_default($gid, $sql_where_ary[$gid], $default_data_ary); } } unset($special_group_data); @@ -2738,6 +2747,82 @@ function group_user_del($group_id, $user_id_ary = false, $username_ary = false, return false; } + +/** +* Removes the group avatar of the default group from the users in user_ids who have that group as default. +*/ +function remove_default_avatar($group_id, $user_ids) +{ + global $db; + + if (!is_array($user_ids)) + { + $user_ids = array($user_ids); + } + if (empty($user_ids)) + { + return false; + } + + $user_ids = array_map('intval', $user_ids); + + $sql = 'SELECT * + FROM ' . GROUPS_TABLE . ' + WHERE group_id = ' . (int)$group_id; + $result = $db->sql_query($sql); + if (!$row = $db->sql_fetchrow($result)) + { + return false; + } + $sql = 'UPDATE ' . USERS_TABLE . ' + SET user_avatar = \'\', + user_avatar_type = 0, + user_avatar_width = 0, + user_avatar_height = 0 + WHERE group_id = ' . (int)$group_id . ' + AND user_avatar = \'' . $row['group_avatar'] . '\' + AND ' . $db->sql_in_set('user_id', $user_ids); + + $db->sql_query($sql); +} + +/** +* Removes the group rank of the default group from the users in user_ids who have that group as default. +*/ +function remove_default_rank($group_id, $user_ids) +{ + global $db; + + if (!is_array($user_ids)) + { + $user_ids = array($user_ids); + } + if (empty($user_ids)) + { + return false; + } + + $user_ids = array_map('intval', $user_ids); + + $sql = 'SELECT * + FROM ' . GROUPS_TABLE . ' + WHERE group_id = ' . (int)$group_id; + $result = $db->sql_query($sql); + if (!$row = $db->sql_fetchrow($result)) + { + return false; + } + + + $sql = 'UPDATE ' . USERS_TABLE . ' + SET user_rank = 0 + WHERE group_id = ' . (int)$group_id . ' + AND user_rank <> 0 + AND user_rank = ' . (int)$row['group_rank'] . ' + AND ' . $db->sql_in_set('user_id', $user_ids); + $db->sql_query($sql); +} + /** * This is used to promote (to leader), demote or set as default a member/s */ @@ -2826,6 +2911,26 @@ function group_user_attributes($action, $group_id, $user_id_ary = false, $userna break; case 'default': + $sql = 'SELECT user_id, group_id FROM ' . USERS_TABLE . ' + WHERE ' . $db->sql_in_set('user_id', $user_id_ary, false, true); + $result = $db->sql_query($sql); + + $groups = array(); + while ($row = $db->sql_fetchrow($result)) + { + if (!isset($groups[$row['group_id']])) + { + $groups[$row['group_id']] = array(); + } + $groups[$row['group_id']][] = $row['user_id']; + } + $db->sql_freeresult($result); + + foreach ($groups as $gid => $uids) + { + remove_default_rank($gid, $uids); + remove_default_avatar($gid, $uids); + } group_set_user_default($group_id, $user_id_ary, $group_attributes); $log = 'LOG_GROUP_DEFAULTS'; break; @@ -2892,7 +2997,7 @@ function group_validate_groupname($group_id, $group_name) * * @private */ -function group_set_user_default($group_id, $user_id_ary, $group_attributes = false, $update_listing = false, $overwrite = false) +function group_set_user_default($group_id, $user_id_ary, $group_attributes = false, $update_listing = false) { global $db; @@ -2925,12 +3030,14 @@ function group_set_user_default($group_id, $user_id_ary, $group_attributes = fal $db->sql_freeresult($result); } + + foreach ($attribute_ary as $attribute => $type) { if (isset($group_attributes[$attribute])) { // If we are about to set an avatar or rank, we will not overwrite with empty, unless we are not actually changing the default group - if (!$overwrite && (strpos($attribute, 'group_avatar') === 0 || strpos($attribute, 'group_rank') === 0) && !$group_attributes[$attribute]) + if ((strpos($attribute, 'group_avatar') === 0 || strpos($attribute, 'group_rank') === 0) && !$group_attributes[$attribute]) { continue; } @@ -2956,6 +3063,12 @@ function group_set_user_default($group_id, $user_id_ary, $group_attributes = fal } $db->sql_freeresult($result); } + else + { + unset($sql_ary['user_avatar_type']); + unset($sql_ary['user_avatar_height']); + unset($sql_ary['user_avatar_width']); + } $sql = 'UPDATE ' . USERS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' WHERE ' . $db->sql_in_set('user_id', $user_id_ary); From 7693609d0cdf434950e74e109d483637c60e8acf Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Sun, 5 Aug 2007 16:14:23 +0000 Subject: [PATCH 33/96] hrm git-svn-id: file:///svn/phpbb/trunk@8008 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions_user.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index e7d4cd7259..2eafbf4b8a 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -2772,8 +2772,11 @@ function remove_default_avatar($group_id, $user_ids) $result = $db->sql_query($sql); if (!$row = $db->sql_fetchrow($result)) { + $db->sql_freeresult($result); return false; } + $db->sql_freeresult($result); + $sql = 'UPDATE ' . USERS_TABLE . ' SET user_avatar = \'\', user_avatar_type = 0, @@ -2810,9 +2813,10 @@ function remove_default_rank($group_id, $user_ids) $result = $db->sql_query($sql); if (!$row = $db->sql_fetchrow($result)) { + $db->sql_freeresult($result); return false; } - + $db->sql_freeresult($result); $sql = 'UPDATE ' . USERS_TABLE . ' SET user_rank = 0 From 4c4dbba46daa9d066e9cfe4fa0b6f848b2e030ae Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Mon, 6 Aug 2007 10:49:42 +0000 Subject: [PATCH 34/96] Language changes, take them while they are hot. #13295 git-svn-id: file:///svn/phpbb/trunk@8009 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 2 ++ phpBB/includes/acp/acp_icons.php | 25 ++++++++++++++++++++++--- phpBB/language/en/acp/posting.php | 16 ++++++++++++---- 3 files changed, 36 insertions(+), 7 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 30b81d5f7a..41f0513029 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -203,6 +203,8 @@ p a {
    30. [Fix] Properly parse SQL expressions for Oracle (Bug #13916)
    31. [Fix] Added label bindings to the custom profile fields in the ACP (Bug #13936) - patch provided by damnian
    32. [Change] Made group avatar/rank changes more intuitive
      33. +
    33. [Fix] Give more feedback in icon/smilie management (Bug #13295)
      34. + diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php index f0a0ad1a89..813c8e0f14 100644 --- a/phpBB/includes/acp/acp_icons.php +++ b/phpBB/includes/acp/acp_icons.php @@ -323,6 +323,7 @@ class acp_icons } } + $icons_updated = 0; foreach ($images as $image) { if (($mode == 'smilies' && ($image_emotion[$image] == '' || $image_code[$image] == '')) || @@ -387,25 +388,43 @@ class acp_icons SET " . $db->sql_build_array('UPDATE', $img_sql) . " WHERE {$fields}_id = " . $image_id[$image]; $db->sql_query($sql); + $icons_updated++; } else if ($action !== 'modify') { $sql = "INSERT INTO $table " . $db->sql_build_array('INSERT', $img_sql); $db->sql_query($sql); + $icons_updated++; } + } } $cache->destroy('_icons'); $cache->destroy('sql', $table); - + + $level = E_USER_NOTICE; + switch ($icons_updated) + { + case 0: + $suc_lang = "{$lang}_NONE"; + $level = E_USER_WARNING; + break; + + case 1: + $suc_lang = "{$lang}_ONE"; + break; + + default: + $suc_lang = $lang; + } if ($action == 'modify') { - trigger_error($user->lang[$lang . '_EDITED'] . adm_back_link($this->u_action)); + trigger_error($user->lang[$suc_lang . '_EDITED'] . adm_back_link($this->u_action), $level); } else { - trigger_error($user->lang[$lang . '_ADDED'] . adm_back_link($this->u_action)); + trigger_error($user->lang[$suc_lang . '_ADDED'] . adm_back_link($this->u_action), $level); } break; diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index f5be3d4d5e..fdf3190cbe 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -108,11 +108,15 @@ $lang = array_merge($lang, array( 'FIRST' => 'First', 'ICONS_ADD' => 'Add a new icon', - 'ICONS_ADDED' => 'The icon has been added successfully.', + 'ICON_NONE_ADDED' => 'No icons were added.', + 'ICONS_ONE_ADDED' => 'The icon has been added successfully.', + 'ICONS_ADDED' => 'The icons have been added successfully.', 'ICONS_CONFIG' => 'Icon configuration', 'ICONS_DELETED' => 'The icon has been removed successfully.', 'ICONS_EDIT' => 'Edit icon', - 'ICONS_EDITED' => 'The icon has been updated successfully.', + 'ICONS_ONE_EDITED' => 'The icon has been updated successfully.', + 'ICON_NONE_EDITED' => 'No icons were updated.', + 'ICONS_EDITED' => 'The icons have been updated successfully.', 'ICONS_HEIGHT' => 'Icon height', 'ICONS_IMAGE' => 'Icon image', 'ICONS_IMPORTED' => 'The icons pack has been installed successfully.', @@ -144,12 +148,16 @@ $lang = array_merge($lang, array( 'SELECT_PACKAGE' => 'Select a package file', 'SMILIES_ADD' => 'Add a new smiley', - 'SMILIES_ADDED' => 'The smiley has been added successfully.', + 'SMILIES_NONE_ADDED' => 'No smilies were added.', + 'SMILIE_ONE_ADDED' => 'The smiley has been added successfully.', + 'SMILIES_ADDED' => 'The smilies have been added successfully.', 'SMILIES_CODE' => 'Smiley code', 'SMILIES_CONFIG' => 'Smiley configuration', 'SMILIES_DELETED' => 'The smiley has been removed successfully.', 'SMILIES_EDIT' => 'Edit smiley', - 'SMILIES_EDITED' => 'The smiley has been updated successfully.', + 'SMILIES_NONE_EDITED' => 'No smilies were updated.', + 'SMILIE__ONE_EDITED' => 'The smiley has been updated successfully.', + 'SMILIES_EDITED' => 'The smilies have been updated successfully.', 'SMILIES_EMOTION' => 'Emotion', 'SMILIES_HEIGHT' => 'Smiley height', 'SMILIES_IMAGE' => 'Smiley image', From dca78b88a07f87d72edc9dc113f88b36883e2527 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Mon, 6 Aug 2007 11:25:59 +0000 Subject: [PATCH 35/96] Better this way. git-svn-id: file:///svn/phpbb/trunk@8010 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions_user.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 2eafbf4b8a..cee09bef7c 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -2783,7 +2783,7 @@ function remove_default_avatar($group_id, $user_ids) user_avatar_width = 0, user_avatar_height = 0 WHERE group_id = ' . (int)$group_id . ' - AND user_avatar = \'' . $row['group_avatar'] . '\' + AND user_avatar = \'' . $db->sql_escape($row['group_avatar']) . '\' AND ' . $db->sql_in_set('user_id', $user_ids); $db->sql_query($sql); From 4d3add1686c222596f2875b71f77cdd587e42b16 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Mon, 6 Aug 2007 14:41:37 +0000 Subject: [PATCH 36/96] two fixes git-svn-id: file:///svn/phpbb/trunk@8011 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 3 +-- phpBB/includes/functions_posting.php | 12 ++++++++++++ phpBB/includes/session.php | 7 ++++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 41f0513029..1f6935fd47 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -204,8 +204,7 @@ p a {
    34. [Fix] Added label bindings to the custom profile fields in the ACP (Bug #13936) - patch provided by damnian
    35. [Change] Made group avatar/rank changes more intuitive
    36. [Fix] Give more feedback in icon/smilie management (Bug #13295)
      37. - - +
    37. [Fix] Correctly set user::lang_id (Bug #14010)
      38. diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 4b38919e81..9e7449cd50 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -652,11 +652,23 @@ function create_thumbnail($source, $destination, $mimetype) if ($type['version'] == 1) { $new_image = imagecreate($new_width, $new_height); + + if ($new_image === false) + { + return false; + } + imagecopyresized($new_image, $image, 0, 0, 0, 0, $new_width, $new_height, $width, $height); } else { $new_image = imagecreatetruecolor($new_width, $new_height); + + if ($new_image === false) + { + return false; + } + imagecopyresampled($new_image, $image, 0, 0, 0, 0, $new_width, $new_height, $width, $height); } diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 9d5f91a698..d1b70d41e5 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -1190,6 +1190,7 @@ class user extends session var $dst; var $lang_name; + var $lang_id = false; var $lang_path; var $img_lang; var $img_array = array(); @@ -1720,7 +1721,7 @@ class user extends session { global $config, $db; - if (isset($this->lang_id)) + if (!empty($this->lang_id)) { return $this->lang_id; } @@ -1734,10 +1735,10 @@ class user extends session FROM ' . LANG_TABLE . " WHERE lang_iso = '" . $db->sql_escape($this->lang_name) . "'"; $result = $db->sql_query($sql); - $lang_id = (int) $db->sql_fetchfield('lang_id'); + $this->lang_id = (int) $db->sql_fetchfield('lang_id'); $db->sql_freeresult($result); - return $lang_id; + return $this->lang_id; } /** From aa3e36eb8a1e08123ebcbf901c82b2602fdacde1 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Mon, 6 Aug 2007 17:12:15 +0000 Subject: [PATCH 37/96] heh, ... git-svn-id: file:///svn/phpbb/trunk@8012 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/language/en/acp/posting.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index fdf3190cbe..87301a3b49 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -156,7 +156,7 @@ $lang = array_merge($lang, array( 'SMILIES_DELETED' => 'The smiley has been removed successfully.', 'SMILIES_EDIT' => 'Edit smiley', 'SMILIES_NONE_EDITED' => 'No smilies were updated.', - 'SMILIE__ONE_EDITED' => 'The smiley has been updated successfully.', + 'SMILIES_ONE_EDITED' => 'The smiley has been updated successfully.', 'SMILIES_EDITED' => 'The smilies have been updated successfully.', 'SMILIES_EMOTION' => 'Emotion', 'SMILIES_HEIGHT' => 'Smiley height', From ffcdb3e2454ff9c6d6701894064b9d188ec1f2a0 Mon Sep 17 00:00:00 2001 From: David M Date: Mon, 6 Aug 2007 23:03:45 +0000 Subject: [PATCH 38/96] #14018 git-svn-id: file:///svn/phpbb/trunk@8013 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/styles/subsilver2/template/mcp_header.html | 2 +- phpBB/styles/subsilver2/template/mcp_notes_user.html | 1 + phpBB/styles/subsilver2/template/mcp_post.html | 12 ++++-------- phpBB/styles/subsilver2/template/mcp_viewlogs.html | 4 ++-- phpBB/styles/subsilver2/template/mcp_warn_user.html | 1 + 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/phpBB/styles/subsilver2/template/mcp_header.html b/phpBB/styles/subsilver2/template/mcp_header.html index eea9dffe58..7db7c31d5b 100644 --- a/phpBB/styles/subsilver2/template/mcp_header.html +++ b/phpBB/styles/subsilver2/template/mcp_header.html @@ -66,7 +66,7 @@ - + diff --git a/phpBB/styles/subsilver2/template/mcp_notes_user.html b/phpBB/styles/subsilver2/template/mcp_notes_user.html index fdc3bcd094..895c0d35e6 100644 --- a/phpBB/styles/subsilver2/template/mcp_notes_user.html +++ b/phpBB/styles/subsilver2/template/mcp_notes_user.html @@ -99,6 +99,7 @@ + diff --git a/phpBB/styles/subsilver2/template/mcp_post.html b/phpBB/styles/subsilver2/template/mcp_post.html index 5db2ffcc11..2c1d464d9a 100644 --- a/phpBB/styles/subsilver2/template/mcp_post.html +++ b/phpBB/styles/subsilver2/template/mcp_post.html @@ -125,18 +125,14 @@ - - - - + + - - - - + +
      {L_PLEASE_CONFIRM}{L_PLEASE_CONFIRM}

      {CONFIRM_MESSAGE}

      {S_HIDDEN_FIELDS}  

      {L_ADD_FEEDBACK_EXPLAIN}
      {L_CHANGE_POSTER}
      [ {L_FIND_USERNAME} ]
      		{L_CHANGE_POSTER}

      [ {L_FIND_USERNAME} ]
      {L_MOD_OPTIONS} {L_MOD_OPTIONS}
      diff --git a/phpBB/styles/subsilver2/template/mcp_viewlogs.html b/phpBB/styles/subsilver2/template/mcp_viewlogs.html index 785cada6bb..8f5a0753fb 100644 --- a/phpBB/styles/subsilver2/template/mcp_viewlogs.html +++ b/phpBB/styles/subsilver2/template/mcp_viewlogs.html @@ -38,10 +38,10 @@ {L_NO_ENTRIES} - - + + diff --git a/phpBB/styles/subsilver2/template/mcp_warn_user.html b/phpBB/styles/subsilver2/template/mcp_warn_user.html index 254f020db1..96ad4fb1a6 100644 --- a/phpBB/styles/subsilver2/template/mcp_warn_user.html +++ b/phpBB/styles/subsilver2/template/mcp_warn_user.html @@ -54,6 +54,7 @@ + From 64708e6bd2979167a380fd33be990552da370110 Mon Sep 17 00:00:00 2001 From: David M Date: Mon, 6 Aug 2007 23:17:40 +0000 Subject: [PATCH 39/96] #13968 git-svn-id: file:///svn/phpbb/trunk@8014 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/acp/acp_icons.php | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 1f6935fd47..4e78bd663b 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -205,6 +205,7 @@ p a {
    38. [Change] Made group avatar/rank changes more intuitive
    39. [Fix] Give more feedback in icon/smilie management (Bug #13295)
    40. [Fix] Correctly set user::lang_id (Bug #14010)
      41. +
    41. [Fix] Properly display the smiley export screen (Bug #13968)
      42. diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php index 813c8e0f14..56a660ced2 100644 --- a/phpBB/includes/acp/acp_icons.php +++ b/phpBB/includes/acp/acp_icons.php @@ -615,7 +615,10 @@ class acp_icons $template->assign_vars(array( 'MESSAGE_TITLE' => $user->lang['EXPORT_' . $lang], - 'MESSAGE_TEXT' => sprintf($user->lang['EXPORT_' . $lang . '_EXPLAIN'], '', '')) + 'MESSAGE_TEXT' => sprintf($user->lang['EXPORT_' . $lang . '_EXPLAIN'], '', ''), + + 'S_USER_NOTICE' => true, + ) ); return; From f3e04625fbf73ab4428bd6397f1c1ff0bb5f6ff6 Mon Sep 17 00:00:00 2001 From: David M Date: Thu, 9 Aug 2007 01:28:25 +0000 Subject: [PATCH 40/96] #13999 git-svn-id: file:///svn/phpbb/trunk@8015 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 24 ++++++++++++++++++++++++ phpBB/docs/CHANGELOG.html | 1 + 2 files changed, 25 insertions(+) diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 19334f5a2e..5d974639b1 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -46,6 +46,9 @@ $dbms_type_map = array( 'MTEXT_UNI' => 'mediumtext', 'TIMESTAMP' => 'int(11) UNSIGNED', 'DECIMAL' => 'decimal(5,2)', + 'DECIMAL:' => 'decimal(%d,2)', + 'PDECIMAL' => 'decimal(6,3)', + 'PDECIMAL:' => 'decimal(%d,3)', 'VCHAR_UNI' => 'varchar(255)', 'VCHAR_UNI:'=> 'varchar(%d)', 'VCHAR_CI' => 'varchar(255)', @@ -73,6 +76,9 @@ $dbms_type_map = array( 'MTEXT_UNI' => 'mediumblob', 'TIMESTAMP' => 'int(11) UNSIGNED', 'DECIMAL' => 'decimal(5,2)', + 'DECIMAL:' => 'decimal(%d,2)', + 'PDECIMAL' => 'decimal(6,3)', + 'PDECIMAL:' => 'decimal(%d,3)', 'VCHAR_UNI' => 'blob', 'VCHAR_UNI:'=> array('varbinary(%d)', 'limit' => array('mult', 3, 255, 'blob')), 'VCHAR_CI' => 'blob', @@ -100,6 +106,9 @@ $dbms_type_map = array( 'MTEXT_UNI' => 'BLOB SUB_TYPE TEXT CHARACTER SET UTF8', 'TIMESTAMP' => 'INTEGER', 'DECIMAL' => 'DOUBLE PRECISION', + 'DECIMAL:' => 'DOUBLE PRECISION', + 'PDECIMAL' => 'DOUBLE PRECISION', + 'PDECIMAL:' => 'DOUBLE PRECISION', 'VCHAR_UNI' => 'VARCHAR(255) CHARACTER SET UTF8', 'VCHAR_UNI:'=> 'VARCHAR(%d) CHARACTER SET UTF8', 'VCHAR_CI' => 'VARCHAR(255) CHARACTER SET UTF8', @@ -127,6 +136,9 @@ $dbms_type_map = array( 'MTEXT_UNI' => '[text]', 'TIMESTAMP' => '[int]', 'DECIMAL' => '[float]', + 'DECIMAL:' => '[float]', + 'PDECIMAL' => '[float]', + 'PDECIMAL:' => '[float]', 'VCHAR_UNI' => '[varchar] (255)', 'VCHAR_UNI:'=> '[varchar] (%d)', 'VCHAR_CI' => '[varchar] (255)', @@ -154,6 +166,9 @@ $dbms_type_map = array( 'MTEXT_UNI' => 'clob', 'TIMESTAMP' => 'number(11)', 'DECIMAL' => 'number(5, 2)', + 'DECIMAL:' => 'number(%d, 2)', + 'PDECIMAL' => 'number(6, 3)', + 'PDECIMAL:' => 'number(%d, 3)', 'VCHAR_UNI' => 'varchar2(765)', 'VCHAR_UNI:'=> array('varchar2(%d)', 'limit' => array('mult', 3, 765, 'clob')), 'VCHAR_CI' => 'varchar2(255)', @@ -181,6 +196,9 @@ $dbms_type_map = array( 'MTEXT_UNI' => 'mediumtext(16777215)', 'TIMESTAMP' => 'INTEGER UNSIGNED', //'int(11) UNSIGNED', 'DECIMAL' => 'decimal(5,2)', + 'DECIMAL:' => 'decimal(%d,2)', + 'PDECIMAL' => 'decimal(6,3)', + 'PDECIMAL:' => 'decimal(%d,3)', 'VCHAR_UNI' => 'varchar(255)', 'VCHAR_UNI:'=> 'varchar(%d)', 'VCHAR_CI' => 'varchar(255)', @@ -208,6 +226,9 @@ $dbms_type_map = array( 'MTEXT_UNI' => 'TEXT', 'TIMESTAMP' => 'INT4', // unsigned 'DECIMAL' => 'decimal(5,2)', + 'DECIMAL:' => 'decimal(%d,2)', + 'PDECIMAL' => 'decimal(6,3)', + 'PDECIMAL:' => 'decimal(%d,3)', 'VCHAR_UNI' => 'varchar(255)', 'VCHAR_UNI:'=> 'varchar(%d)', 'VCHAR_CI' => 'varchar_ci', @@ -771,6 +792,9 @@ foreach ($supported_dbms as $dbms) * VCHAR:x => varchar(x) * TIMESTAMP => int(11) UNSIGNED * DECIMAL => decimal number (5,2) +* DECIMAL: => decimal number (x,2) +* PDECIMAL => precision decimal number (6,3) +* PDECIMAL: => precision decimal number (x,3) * VCHAR_UNI => varchar(255) BINARY * VCHAR_CI => varchar_ci for postgresql, others VCHAR */ diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 4e78bd663b..4a8fc98fc0 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -206,6 +206,7 @@ p a {
    42. [Fix] Give more feedback in icon/smilie management (Bug #13295)
    43. [Fix] Correctly set user::lang_id (Bug #14010)
    44. [Fix] Properly display the smiley export screen (Bug #13968)
      45. +
    45. [Fix] Add "DECIMAL:", "PDECIMAL", and "PDECIMAL:" to the schema creation code (Bug #13999) - patch provided by poyntesm
      46. From 32226e71335e8b77be350a66ba7ae56a1e8b4e5a Mon Sep 17 00:00:00 2001 From: David M Date: Thu, 9 Aug 2007 02:45:28 +0000 Subject: [PATCH 41/96] #14034 git-svn-id: file:///svn/phpbb/trunk@8016 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/styles/prosilver/template/viewtopic_body.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 02efecf338..b1f7b7646b 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -128,7 +128,7 @@
    46. {L_EDIT_POST}
    47. {L_DELETE_POST}
    48. {L_REPORT_POST}
      49. -
    49. {WARN_USER}
      50. +
    50. {L_WARN_USER}
    51. {L_INFORMATION}
      52. From d6bcbf0521b833955068cafef51a0d68b395638d Mon Sep 17 00:00:00 2001 From: David M Date: Thu, 9 Aug 2007 03:12:38 +0000 Subject: [PATCH 42/96] #13973 git-svn-id: file:///svn/phpbb/trunk@8017 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 3 ++- phpBB/includes/mcp/mcp_queue.php | 41 ++++++++++++++++++++++++++++---- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 4a8fc98fc0..aa8fee3cb4 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -206,7 +206,8 @@ p a {
    52. [Fix] Give more feedback in icon/smilie management (Bug #13295)
    53. [Fix] Correctly set user::lang_id (Bug #14010)
    54. [Fix] Properly display the smiley export screen (Bug #13968)
      55. -
    55. [Fix] Add "DECIMAL:", "PDECIMAL", and "PDECIMAL:" to the schema creation code (Bug #13999) - patch provided by poyntesm
      56. +
    56. [Feature] Add "DECIMAL:", "PDECIMAL", and "PDECIMAL:" to the schema creation code (Bug #13999) - patch provided by poyntesm
      57. +
    57. [Fix] Don't show the notify checkbox in the approval queue if the only posts are written by ANONYMOUS (Bug #13973)
      58. diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index 06cabf65a0..f82a99c2c3 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -460,12 +460,12 @@ function approve_post($post_id_list, $id, $mode) 'redirect' => $redirect) ); + $post_info = get_post_data($post_id_list, 'm_approve'); + if (confirm_box(true)) { $notify_poster = (isset($_REQUEST['notify_poster'])) ? true : false; - $post_info = get_post_data($post_id_list, 'm_approve'); - // If Topic -> total_topics = total_topics+1, total_posts = total_posts+1, forum_topics = forum_topics+1, forum_posts = forum_posts+1 // If Post -> total_posts = total_posts+1, forum_posts = forum_posts+1, topic_replies = topic_replies+1 @@ -690,8 +690,23 @@ function approve_post($post_id_list, $id, $mode) } else { + $show_notify = false; + + foreach ($post_info as $post_data) + { + if ($post_data['poster_id'] == ANONYMOUS) + { + continue; + } + else + { + $show_notify = true; + break; + } + } + $template->assign_vars(array( - 'S_NOTIFY_POSTER' => true, + 'S_NOTIFY_POSTER' => $show_notify, 'S_APPROVE' => true) ); @@ -771,9 +786,10 @@ function disapprove_post($post_id_list, $id, $mode) } } + $post_info = get_post_data($post_id_list, 'm_approve'); + if (confirm_box(true)) { - $post_info = get_post_data($post_id_list, 'm_approve'); // If Topic -> forum_topics_real -= 1 // If Post -> topic_replies_real -= 1 @@ -929,8 +945,23 @@ function disapprove_post($post_id_list, $id, $mode) display_reasons($reason_id); + $show_notify = false; + + foreach ($post_info as $post_data) + { + if ($post_data['poster_id'] == ANONYMOUS) + { + continue; + } + else + { + $show_notify = true; + break; + } + } + $template->assign_vars(array( - 'S_NOTIFY_POSTER' => true, + 'S_NOTIFY_POSTER' => $show_notify, 'S_APPROVE' => false, 'REASON' => $reason, 'ADDITIONAL_MSG' => $additional_msg) From 7a6869f9b106b1d868f7f1a7a57a9f8cd58ae13a Mon Sep 17 00:00:00 2001 From: David M Date: Fri, 10 Aug 2007 02:19:35 +0000 Subject: [PATCH 43/96] #14055 git-svn-id: file:///svn/phpbb/trunk@8018 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/acp/acp_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 3747282f1e..40ab548a31 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -120,7 +120,7 @@ class acp_users WHERE module_basename = 'users' AND module_enabled = 1 AND module_class = 'acp' - GROUP BY module_mode + GROUP BY module_mode, module_auth ORDER BY left_id"; $result = $db->sql_query($sql); From 62690e5b75200bc83b79a0814f38369c3efc209e Mon Sep 17 00:00:00 2001 From: David M Date: Fri, 10 Aug 2007 03:04:59 +0000 Subject: [PATCH 44/96] brain not work git-svn-id: file:///svn/phpbb/trunk@8019 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/acp/acp_users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 40ab548a31..0b18a5c132 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -120,7 +120,7 @@ class acp_users WHERE module_basename = 'users' AND module_enabled = 1 AND module_class = 'acp' - GROUP BY module_mode, module_auth + GROUP BY module_mode, module_auth, left_id ORDER BY left_id"; $result = $db->sql_query($sql); From b2f29e9084cc3f0184a9a01e9a52f86b0fd77086 Mon Sep 17 00:00:00 2001 From: David M Date: Fri, 10 Aug 2007 03:15:23 +0000 Subject: [PATCH 45/96] work for everybody git-svn-id: file:///svn/phpbb/trunk@8020 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/acp/acp_users.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 0b18a5c132..edd5096862 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -115,12 +115,11 @@ class acp_users $s_form_options = ''; // Build modes dropdown list - $sql = 'SELECT module_mode, module_auth + $sql = 'SELECT DISTINCT module_mode, module_auth FROM ' . MODULES_TABLE . " WHERE module_basename = 'users' AND module_enabled = 1 AND module_class = 'acp' - GROUP BY module_mode, module_auth, left_id ORDER BY left_id"; $result = $db->sql_query($sql); From ca0139c939cf6c781a12035cf90ea49446ced5bc Mon Sep 17 00:00:00 2001 From: David M Date: Sat, 11 Aug 2007 20:51:02 +0000 Subject: [PATCH 46/96] finally got my dev machine running a decent DBMS git-svn-id: file:///svn/phpbb/trunk@8021 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/acp/acp_users.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index edd5096862..077764ddbb 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -115,12 +115,13 @@ class acp_users $s_form_options = ''; // Build modes dropdown list - $sql = 'SELECT DISTINCT module_mode, module_auth + $sql = 'SELECT module_mode, module_auth FROM ' . MODULES_TABLE . " WHERE module_basename = 'users' AND module_enabled = 1 AND module_class = 'acp' - ORDER BY left_id"; + GROUP BY module_mode, module_auth + ORDER BY MIN(left_id)"; $result = $db->sql_query($sql); while ($row = $db->sql_fetchrow($result)) From 3f9348bdf8ccc05f251b85caccaf5a241ae011fc Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 12 Aug 2007 18:16:01 +0000 Subject: [PATCH 47/96] fix bug with cron execution for all new RC4 installations as well as those having manually updated. git-svn-id: file:///svn/phpbb/trunk@8022 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/cron.php | 6 ++++++ phpBB/install/database_update.php | 5 +++++ phpBB/install/schemas/schema_data.sql | 1 + 3 files changed, 12 insertions(+) diff --git a/phpBB/cron.php b/phpBB/cron.php index b5a51a1688..79cf0f40fa 100644 --- a/phpBB/cron.php +++ b/phpBB/cron.php @@ -33,6 +33,12 @@ echo base64_decode('R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw== // test without flush ;) // flush(); +// +if (!isset($config['cron_lock'])) +{ + set_config('cron_lock', '0', true); +} + // make sure cron doesn't run multiple times in parallel if ($config['cron_lock']) { diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index ba4bf5d170..da8f6e9518 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1483,6 +1483,11 @@ if (version_compare($current_version, '3.0.RC4', '<=')) $db->sql_transaction('commit'); } + + // Setting this here again because new installations may not have it... + set_config('cron_lock', '0', true); + + $no_updates = false; } _write_result($no_updates, $errored, $error_ary); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 4fb2c25bb3..dd4017f19e 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -211,6 +211,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_da INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('cache_last_gc', '0', 1); +INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('cron_lock', '0', 1); INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('database_last_gc', '0', 1); INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('last_queue_run', '0', 1); INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('newest_user_colour', 'AA0000', 1); From ea636f16eeafdd87027a2f95b79b50608b269282 Mon Sep 17 00:00:00 2001 From: David M Date: Mon, 13 Aug 2007 05:20:20 +0000 Subject: [PATCH 48/96] remove the need for filesorting git-svn-id: file:///svn/phpbb/trunk@8023 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/viewtopic.php | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index afa818fdc3..1b0b6336af 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -109,13 +109,20 @@ if ($view && !$post_id) $sql_condition = ($view == 'next') ? '>' : '<'; $sql_ordering = ($view == 'next') ? 'ASC' : 'DESC'; - $sql = 'SELECT t.topic_id, t.forum_id - FROM ' . TOPICS_TABLE . ' t - LEFT JOIN ' . TOPICS_TABLE . " t2 ON (t2.topic_id = $topic_id AND t.forum_id = t2.forum_id) - WHERE t.topic_last_post_time $sql_condition t2.topic_last_post_time - " . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1') . " - AND t.topic_moved_id = 0 - ORDER BY t.topic_last_post_time $sql_ordering"; + $sql = 'SELECT forum_id, topic_last_post_time + FROM ' . TOPICS_TABLE . ' + WHERE topic_id = ' . $topic_id; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + $sql = 'SELECT topic_id, forum_id + FROM ' . TOPICS_TABLE . ' + WHERE forum_id = ' . $row['forum_id'] . " + AND topic_moved_id = 0 + AND topic_last_post_time $sql_condition {$row['topic_last_post_time']} + " . (($auth->acl_get('m_approve', $row['forum_id']) && false) ? '' : 'AND topic_approved = 1') . " + ORDER BY topic_last_post_time $sql_ordering"; $result = $db->sql_query_limit($sql, 1); $row = $db->sql_fetchrow($result); $db->sql_freeresult($result); From 11f05e3513f4133cce57d4177f9616c1ef32cd34 Mon Sep 17 00:00:00 2001 From: David M Date: Mon, 13 Aug 2007 05:39:57 +0000 Subject: [PATCH 49/96] kill the debug code git-svn-id: file:///svn/phpbb/trunk@8024 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/viewtopic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 1b0b6336af..165afcf9d5 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -121,7 +121,7 @@ if ($view && !$post_id) WHERE forum_id = ' . $row['forum_id'] . " AND topic_moved_id = 0 AND topic_last_post_time $sql_condition {$row['topic_last_post_time']} - " . (($auth->acl_get('m_approve', $row['forum_id']) && false) ? '' : 'AND topic_approved = 1') . " + " . (($auth->acl_get('m_approve', $row['forum_id'])) ? '' : 'AND topic_approved = 1') . " ORDER BY topic_last_post_time $sql_ordering"; $result = $db->sql_query_limit($sql, 1); $row = $db->sql_fetchrow($result); From e9188d4e05eeadfd9246d9dc44160736f6fa64d6 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Mon, 13 Aug 2007 12:14:07 +0000 Subject: [PATCH 50/96] Some changes... non-invasive... git-svn-id: file:///svn/phpbb/trunk@8025 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/common.php | 11 +- phpBB/docs/CHANGELOG.html | 6 + phpBB/includes/acp/acp_bots.php | 18 +-- phpBB/includes/acp/acp_users.php | 13 +- phpBB/includes/functions.php | 9 ++ phpBB/includes/functions_jabber.php | 2 +- phpBB/includes/functions_messenger.php | 6 + phpBB/includes/functions_module.php | 1 + phpBB/includes/functions_posting.php | 4 +- phpBB/includes/functions_privmsgs.php | 141 ++++++++++++++++++ phpBB/includes/ucp/ucp_pm_compose.php | 9 ++ phpBB/includes/ucp/ucp_pm_viewmessage.php | 140 ----------------- phpBB/language/en/acp/common.php | 2 +- phpBB/language/en/acp/database.php | 2 +- phpBB/language/en/acp/users.php | 2 +- phpBB/language/en/common.php | 2 + phpBB/language/en/email/forum_notify.txt | 6 + phpBB/language/en/email/topic_notify.txt | 3 + .../prosilver/template/memberlist_view.html | 9 +- .../prosilver/template/posting_pm_layout.html | 2 + .../prosilver/template/search_results.html | 2 +- .../prosilver/template/ucp_pm_history.html | 2 +- .../prosilver/template/viewforum_body.html | 4 +- .../prosilver/template/viewtopic_body.html | 2 +- phpBB/styles/prosilver/theme/bidi.css | 14 +- phpBB/styles/prosilver/theme/colours.css | 6 - phpBB/styles/prosilver/theme/common.css | 4 +- phpBB/styles/prosilver/theme/tweaks.css | 11 ++ .../subsilver2/template/posting_body.html | 1 + .../subsilver2/template/ucp_pm_history.html | 2 +- phpBB/viewforum.php | 1 + 31 files changed, 250 insertions(+), 187 deletions(-) diff --git a/phpBB/common.php b/phpBB/common.php index 3ee931e95d..5177bff5b8 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -98,16 +98,7 @@ else if (defined('IN_CRON')) { - chdir($phpbb_root_path); - if (@function_exists('getcwd')) - { - $phpbb_root_path = getcwd() . '/'; - } - else - { - // This is a best guess - $phpbb_root_path = pathinfo($_SERVER['SCRIPT_FILENAME'], PATHINFO_DIRNAME) . '/'; - } + $phpbb_root_path = dirname(__FILE__) . DIRECTORY_SEPARATOR; } if (!file_exists($phpbb_root_path . 'config.' . $phpEx)) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index aa8fee3cb4..9c936aafa6 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -208,6 +208,12 @@ p a {
    58. [Fix] Properly display the smiley export screen (Bug #13968)
    59. [Feature] Add "DECIMAL:", "PDECIMAL", and "PDECIMAL:" to the schema creation code (Bug #13999) - patch provided by poyntesm
    60. [Fix] Don't show the notify checkbox in the approval queue if the only posts are written by ANONYMOUS (Bug #13973)
      61. +
    61. [Fix] Redirect to bots management page on edit/add (Bug #14073)
      62. +
    62. [Fix] Display locked icon in viewforum/prosilver if forum locked (Bug #14009)
      63. +
    63. [Feature] Display message history in compose PM screen
      64. +
    64. [Change] Do not force login on visiting topic/forum from notification emails (Bug #13818)
      65. +
    65. [Fix] Fixed cron_lock value for cron execution. This bug led to users having problems with the email queue and other cron related issues.
      66. +
    66. [Fix] Prevent white pages on php notices with gzip compression enabled (Bug #14096)
      67. diff --git a/phpBB/includes/acp/acp_bots.php b/phpBB/includes/acp/acp_bots.php index dbee5f6eed..93108c7fec 100644 --- a/phpBB/includes/acp/acp_bots.php +++ b/phpBB/includes/acp/acp_bots.php @@ -279,7 +279,7 @@ class acp_bots $cache->destroy('_bots'); add_log('admin', 'LOG_BOT_' . $log, $bot_row['bot_name']); - trigger_error($user->lang['BOT_' . $log] . adm_back_link($this->u_action . "&id=$bot_id&action=$action")); + trigger_error($user->lang['BOT_' . $log] . adm_back_link($this->u_action)); } } @@ -376,14 +376,19 @@ class acp_bots $db->sql_freeresult($result); } + /** + * Validate bot name against username table + */ function validate_botname($newname, $oldname = false) { global $db; + if ($oldname && utf8_clean_string($newname) === $oldname) { return true; } - // Admins might want to use names otherwise forbidden, thus we only check for duplicates. + + // Admins might want to use names otherwise forbidden, thus we only check for duplicates. $sql = 'SELECT username FROM ' . USERS_TABLE . " WHERE username_clean = '" . $db->sql_escape(utf8_clean_string($newname)) . "'"; @@ -391,14 +396,7 @@ class acp_bots $row = $db->sql_fetchrow($result); $db->sql_freeresult($result); - if ($row) - { - return false; - } - else - { - return true; - } + return ($row) ? false : true; } } diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 077764ddbb..cab16af7b6 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -120,10 +120,10 @@ class acp_users WHERE module_basename = 'users' AND module_enabled = 1 AND module_class = 'acp' - GROUP BY module_mode, module_auth - ORDER BY MIN(left_id)"; + ORDER BY left_id, module_mode"; $result = $db->sql_query($sql); + $dropdown_modes = array(); while ($row = $db->sql_fetchrow($result)) { if (!$this->p_master->module_auth($row['module_auth'])) @@ -131,11 +131,16 @@ class acp_users continue; } - $selected = ($mode == $row['module_mode']) ? ' selected="selected"' : ''; - $s_form_options .= ''; + $dropdown_modes[$row['module_mode']] = true; } $db->sql_freeresult($result); + foreach ($dropdown_modes as $module_mode => $null) + { + $selected = ($mode == $module_mode) ? ' selected="selected"' : ''; + $s_form_options .= ''; + } + $template->assign_vars(array( 'U_BACK' => $this->u_action, 'U_MODE_SELECT' => append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&u=$user_id"), diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 5632d78022..64162cc598 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3692,6 +3692,15 @@ function msg_handler($errno, $msg_text, $errfile, $errline) if (strpos($errfile, 'cache') === false && strpos($errfile, 'template.') === false) { + // flush the content, else we get a white page if output buffering is on + if ($config['gzip_compress']) + { + if (@extension_loaded('zlib') && !headers_sent()) + { + ob_end_flush(); + } + } + // remove complete path to installation, with the risk of changing backslashes meant to be there $errfile = str_replace(array(phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $errfile); $msg_text = str_replace(array(phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $msg_text); diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php index f9c0a6308e..e58b85db19 100644 --- a/phpBB/includes/functions_jabber.php +++ b/phpBB/includes/functions_jabber.php @@ -416,7 +416,7 @@ class jabber } // Let's use TLS if SSL is not enabled and we can actually use it - if (!$this->session['ssl'] && $this->can_use_tls() && isset($xml['stream:features'][0]['#']['starttls'])) + if (!$this->session['ssl'] && $this->can_use_tls() && $this->can_use_ssl() && isset($xml['stream:features'][0]['#']['starttls'])) { $this->add_to_log('Switching to TLS.'); $this->send("\n"); diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index bd838a3346..cbc6dc5031 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -575,6 +575,12 @@ class queue $package_size = $data_ary['package_size']; $num_items = (!$package_size || sizeof($data_ary['data']) < $package_size) ? sizeof($data_ary['data']) : $package_size; + // If the amount of emails to be sent is way more than package_size than we need to increase it to prevent backlogs... + if (sizeof($data_ary['data']) > $package_size * 2.5) + { + $num_items = sizeof($data_ary['data']); + } + switch ($object) { case 'email': diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index 9db2c4fa25..a48f9ae2dd 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -364,6 +364,7 @@ class p_master $this->p_mode = $item_ary['mode']; $this->p_left = $item_ary['left']; $this->p_right = $item_ary['right']; + $this->p_icat = $icat; $this->module_cache['parents'] = $this->module_cache['parents'][$this->p_id]; $this->active_module = $item_ary['id']; diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 9e7449cd50..b246a72daf 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -1250,8 +1250,8 @@ function user_notification($mode, $subject, $topic_title, $forum_name, $forum_id 'TOPIC_TITLE' => htmlspecialchars_decode($topic_title), 'FORUM_NAME' => htmlspecialchars_decode($forum_name), - 'U_FORUM' => generate_board_url() . "/viewforum.$phpEx?f=$forum_id&e=0", - 'U_TOPIC' => generate_board_url() . "/viewtopic.$phpEx?f=$forum_id&t=$topic_id&e=0", + 'U_FORUM' => generate_board_url() . "/viewforum.$phpEx?f=$forum_id", + 'U_TOPIC' => generate_board_url() . "/viewtopic.$phpEx?f=$forum_id&t=$topic_id", 'U_NEWEST_POST' => generate_board_url() . "/viewtopic.$phpEx?f=$forum_id&t=$topic_id&p=$post_id&e=$post_id", 'U_STOP_WATCHING_TOPIC' => generate_board_url() . "/viewtopic.$phpEx?f=$forum_id&t=$topic_id&unwatch=topic", 'U_STOP_WATCHING_FORUM' => generate_board_url() . "/viewforum.$phpEx?f=$forum_id&unwatch=forum", diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index ca06e05b39..61f4648f4f 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -1684,4 +1684,145 @@ function pm_notification($mode, $author, $recipients, $subject, $message) unset($messenger); } +/** +* Display Message History +*/ +function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode = false) +{ + global $db, $user, $config, $template, $phpbb_root_path, $phpEx, $auth, $bbcode; + + // Get History Messages (could be newer) + $sql = 'SELECT t.*, p.*, u.* + FROM ' . PRIVMSGS_TABLE . ' p, ' . PRIVMSGS_TO_TABLE . ' t, ' . USERS_TABLE . ' u + WHERE t.msg_id = p.msg_id + AND p.author_id = u.user_id + AND t.folder_id NOT IN (' . PRIVMSGS_NO_BOX . ', ' . PRIVMSGS_HOLD_BOX . ") + AND t.user_id = $user_id"; + + if (!$message_row['root_level']) + { + $sql .= " AND (p.root_level = $msg_id OR (p.root_level = 0 AND p.msg_id = $msg_id))"; + } + else + { + $sql .= " AND (p.root_level = " . $message_row['root_level'] . ' OR p.msg_id = ' . $message_row['root_level'] . ')'; + } + $sql .= ' ORDER BY p.message_time DESC'; + + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + + if (!$row) + { + $db->sql_freeresult($result); + return false; + } + + $rowset = array(); + $bbcode_bitfield = ''; + $folder_url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm') . '&folder='; + + do + { + $folder_id = (int) $row['folder_id']; + + $row['folder'][] = (isset($folder[$folder_id])) ? '' . $folder[$folder_id]['folder_name'] . '' : $user->lang['UNKNOWN_FOLDER']; + + if (isset($rowset[$row['msg_id']])) + { + $rowset[$row['msg_id']]['folder'][] = (isset($folder[$folder_id])) ? '' . $folder[$folder_id]['folder_name'] . '' : $user->lang['UNKNOWN_FOLDER']; + } + else + { + $rowset[$row['msg_id']] = $row; + $bbcode_bitfield = $bbcode_bitfield | base64_decode($row['bbcode_bitfield']); + } + } + while ($row = $db->sql_fetchrow($result)); + $db->sql_freeresult($result); + + $title = $row['message_subject']; + + if (sizeof($rowset) == 1 && !$in_post_mode) + { + return false; + } + + // Instantiate BBCode class + if ((empty($bbcode) || $bbcode === false) && $bbcode_bitfield !== '') + { + if (!class_exists('bbcode')) + { + include($phpbb_root_path . 'includes/bbcode.' . $phpEx); + } + $bbcode = new bbcode(base64_encode($bbcode_bitfield)); + } + + $title = censor_text($title); + + $url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm'); + $next_history_pm = $previous_history_pm = $prev_id = 0; + + foreach ($rowset as $id => $row) + { + $author_id = $row['author_id']; + $folder_id = (int) $row['folder_id']; + + $subject = $row['message_subject']; + $message = $row['message_text']; + + $message = censor_text($message); + $message = str_replace("\n", '
      ', $message); + + if ($row['bbcode_bitfield']) + { + $bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']); + } + + $message = smiley_text($message, !$row['enable_smilies']); + + $subject = censor_text($subject); + + if ($id == $msg_id) + { + $next_history_pm = next($rowset); + $next_history_pm = (sizeof($next_history_pm)) ? (int) $next_history_pm['msg_id'] : 0; + $previous_history_pm = $prev_id; + } + + $template->assign_block_vars('history_row', array( + 'MESSAGE_AUTHOR_FULL' => get_username_string('full', $author_id, $row['username'], $row['user_colour'], $row['username']), + 'MESSAGE_AUTHOR_COLOUR' => get_username_string('colour', $author_id, $row['username'], $row['user_colour'], $row['username']), + 'MESSAGE_AUTHOR' => get_username_string('username', $author_id, $row['username'], $row['user_colour'], $row['username']), + 'U_MESSAGE_AUTHOR' => get_username_string('profile', $author_id, $row['username'], $row['user_colour'], $row['username']), + + 'SUBJECT' => $subject, + 'SENT_DATE' => $user->format_date($row['message_time']), + 'MESSAGE' => $message, + 'FOLDER' => implode(', ', $row['folder']), + + 'S_CURRENT_MSG' => ($row['msg_id'] == $msg_id), + 'S_AUTHOR_DELETED' => ($author_id == ANONYMOUS) ? true : false, + 'S_IN_POST_MODE' => $in_post_mode, + + 'MSG_ID' => $row['msg_id'], + 'U_VIEW_MESSAGE' => "$url&f=$folder_id&p=" . $row['msg_id'], + 'U_QUOTE' => (!$in_post_mode && $auth->acl_get('u_sendpm') && $author_id != ANONYMOUS && $author_id != $user->data['user_id']) ? "$url&mode=compose&action=quote&f=" . $folder_id . "&p=" . $row['msg_id'] : '', + 'U_POST_REPLY_PM' => ($author_id != $user->data['user_id'] && $author_id != ANONYMOUS && $auth->acl_get('u_sendpm')) ? "$url&mode=compose&action=reply&f=$folder_id&p=" . $row['msg_id'] : '') + ); + unset($rowset[$id]); + $prev_id = $id; + } + + $template->assign_vars(array( + 'QUOTE_IMG' => $user->img('icon_post_quote', $user->lang['REPLY_WITH_QUOTE']), + 'HISTORY_TITLE' => $title, + + 'U_VIEW_NEXT_HISTORY' => "$url&p=" . (($next_history_pm) ? $next_history_pm : $msg_id), + 'U_VIEW_PREVIOUS_HISTORY' => "$url&p=" . (($previous_history_pm) ? $previous_history_pm : $msg_id)) + ); + + return true; +} + ?> \ No newline at end of file diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index e81c572ddf..4b92bf4042 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -976,6 +976,15 @@ function compose_pm($id, $mode, $action) { posting_gen_attachment_entry($attachment_data, $filename_data); } + + // Message History + if ($action == 'reply' || $action == 'quote' || $action == 'forward') + { + if (message_history($msg_id, $user->data['user_id'], $post, array(), true)) + { + $template->assign_var('S_DISPLAY_HISTORY', true); + } + } } /** diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index 8fab63bc45..b980774403 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -230,146 +230,6 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) } } -/** -* Display Message History -*/ -function message_history($msg_id, $user_id, $message_row, $folder) -{ - global $db, $user, $config, $template, $phpbb_root_path, $phpEx, $auth, $bbcode; - - // Get History Messages (could be newer) - $sql = 'SELECT t.*, p.*, u.* - FROM ' . PRIVMSGS_TABLE . ' p, ' . PRIVMSGS_TO_TABLE . ' t, ' . USERS_TABLE . ' u - WHERE t.msg_id = p.msg_id - AND p.author_id = u.user_id - AND t.folder_id NOT IN (' . PRIVMSGS_NO_BOX . ', ' . PRIVMSGS_HOLD_BOX . ") - AND t.user_id = $user_id"; - - if (!$message_row['root_level']) - { - $sql .= " AND (p.root_level = $msg_id OR (p.root_level = 0 AND p.msg_id = $msg_id))"; - } - else - { - $sql .= " AND (p.root_level = " . $message_row['root_level'] . ' OR p.msg_id = ' . $message_row['root_level'] . ')'; - } - $sql .= ' ORDER BY p.message_time DESC'; - - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - - if (!$row) - { - $db->sql_freeresult($result); - return false; - } - - $rowset = array(); - $bbcode_bitfield = ''; - $folder_url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm') . '&folder='; - - do - { - $folder_id = (int) $row['folder_id']; - - $row['folder'][] = (isset($folder[$folder_id])) ? '' . $folder[$folder_id]['folder_name'] . '' : $user->lang['UNKNOWN_FOLDER']; - - if (isset($rowset[$row['msg_id']])) - { - $rowset[$row['msg_id']]['folder'][] = (isset($folder[$folder_id])) ? '' . $folder[$folder_id]['folder_name'] . '' : $user->lang['UNKNOWN_FOLDER']; - } - else - { - $rowset[$row['msg_id']] = $row; - $bbcode_bitfield = $bbcode_bitfield | base64_decode($row['bbcode_bitfield']); - } - } - while ($row = $db->sql_fetchrow($result)); - $db->sql_freeresult($result); - - $title = $row['message_subject']; - - if (sizeof($rowset) == 1) - { - return false; - } - - // Instantiate BBCode class - if ((empty($bbcode) || $bbcode === false) && $bbcode_bitfield !== '') - { - if (!class_exists('bbcode')) - { - include($phpbb_root_path . 'includes/bbcode.' . $phpEx); - } - $bbcode = new bbcode(base64_encode($bbcode_bitfield)); - } - - $title = censor_text($title); - - $url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm'); - $next_history_pm = $previous_history_pm = $prev_id = 0; - - foreach ($rowset as $id => $row) - { - $author_id = $row['author_id']; - $folder_id = (int) $row['folder_id']; - - $subject = $row['message_subject']; - $message = $row['message_text']; - - $message = censor_text($message); - $message = str_replace("\n", '
      ', $message); - - if ($row['bbcode_bitfield']) - { - $bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']); - } - - $message = smiley_text($message, !$row['enable_smilies']); - - $subject = censor_text($subject); - - if ($id == $msg_id) - { - $next_history_pm = next($rowset); - $next_history_pm = (sizeof($next_history_pm)) ? (int) $next_history_pm['msg_id'] : 0; - $previous_history_pm = $prev_id; - } - - $template->assign_block_vars('history_row', array( - 'MESSAGE_AUTHOR_FULL' => get_username_string('full', $author_id, $row['username'], $row['user_colour'], $row['username']), - 'MESSAGE_AUTHOR_COLOUR' => get_username_string('colour', $author_id, $row['username'], $row['user_colour'], $row['username']), - 'MESSAGE_AUTHOR' => get_username_string('username', $author_id, $row['username'], $row['user_colour'], $row['username']), - 'U_MESSAGE_AUTHOR' => get_username_string('profile', $author_id, $row['username'], $row['user_colour'], $row['username']), - - 'SUBJECT' => $subject, - 'SENT_DATE' => $user->format_date($row['message_time']), - 'MESSAGE' => $message, - 'FOLDER' => implode(', ', $row['folder']), - - 'S_CURRENT_MSG' => ($row['msg_id'] == $msg_id), - 'S_AUTHOR_DELETED' => ($author_id == ANONYMOUS) ? true : false, - - 'MSG_ID' => $row['msg_id'], - 'U_VIEW_MESSAGE' => "$url&f=$folder_id&p=" . $row['msg_id'], - 'U_QUOTE' => ($auth->acl_get('u_sendpm') && $author_id != ANONYMOUS && $author_id != $user->data['user_id']) ? "$url&mode=compose&action=quote&f=" . $folder_id . "&p=" . $row['msg_id'] : '', - 'U_POST_REPLY_PM' => ($author_id != $user->data['user_id'] && $author_id != ANONYMOUS && $auth->acl_get('u_sendpm')) ? "$url&mode=compose&action=reply&f=$folder_id&p=" . $row['msg_id'] : '') - ); - unset($rowset[$id]); - $prev_id = $id; - } - - $template->assign_vars(array( - 'QUOTE_IMG' => $user->img('icon_post_quote', $user->lang['REPLY_WITH_QUOTE']), - 'TITLE' => $title, - - 'U_VIEW_NEXT_HISTORY' => "$url&p=" . (($next_history_pm) ? $next_history_pm : $msg_id), - 'U_VIEW_PREVIOUS_HISTORY' => "$url&p=" . (($previous_history_pm) ? $previous_history_pm : $msg_id)) - ); - - return true; -} - /** * Get user information (only for message display) */ diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 576b87eabd..fbc82d4c5b 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -268,7 +268,7 @@ $lang = array_merge($lang, array( $lang = array_merge($lang, array( 'ACP_PHP_INFO_EXPLAIN' => 'This page lists information on the version of PHP installed on this server. It includes details of loaded modules, available variables and default settings. This information may be useful when diagnosing problems. Please be aware that some hosting companies will limit what information is displayed here for security reasons. You are advised to not give out any details on this page except when asked by official team members on the support forums.', - 'NO_PHPINFO_AVAILABLE' => 'The PHP informations are unable to be determined. Phpinfo() has been disabled for security reasons.', + 'NO_PHPINFO_AVAILABLE' => 'Information about your PHP configuration is unable to be determined. Phpinfo() has been disabled for security reasons.', )); // Logs diff --git a/phpBB/language/en/acp/database.php b/phpBB/language/en/acp/database.php index 9d0e5e3cf6..700aa321cc 100644 --- a/phpBB/language/en/acp/database.php +++ b/phpBB/language/en/acp/database.php @@ -33,7 +33,7 @@ if (empty($lang) || !is_array($lang)) // Database Backup/Restore $lang = array_merge($lang, array( 'ACP_BACKUP_EXPLAIN' => 'Here you can backup all your phpBB related data. You may store the resulting archive in your store/ folder or download it directly. Depending on your server configuration you may be able to compress the file in a number of formats.', - 'ACP_RESTORE_EXPLAIN' => 'This will perform a full restore of all phpBB tables from a saved file. If your server supports it you may use a gzip or bzip2 compressed text file and it will automatically be decompressed. WARNING This will overwrite any existing data. The restore may take a long time to process please do not move from this page till it is complete. Backups are stored in the store/ folder and are assumed to be generated by phpBBs backup functionality. Restoring backups that were not created by the built in system may or may not work.', + 'ACP_RESTORE_EXPLAIN' => 'This will perform a full restore of all phpBB tables from a saved file. If your server supports it you may use a gzip or bzip2 compressed text file and it will automatically be decompressed. WARNING This will overwrite any existing data. The restore may take a long time to process please do not move from this page till it is complete. Backups are stored in the store/ folder and are assumed to be generated by phpBB’s backup functionality. Restoring backups that were not created by the built in system may or may not work.', 'BACKUP_DELETE' => 'The backup file has been deleted successfully.', 'BACKUP_INVALID' => 'The selected file to backup is invalid.', diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php index 3a2b8170ab..48f3b29334 100644 --- a/phpBB/language/en/acp/users.php +++ b/phpBB/language/en/acp/users.php @@ -99,7 +99,7 @@ $lang = array_merge($lang, array( 'USER_ADMIN_DEL_AVATAR' => 'Delete avatar', 'USER_ADMIN_DEL_POSTS' => 'Delete all posts', 'USER_ADMIN_DEL_SIG' => 'Delete signature', - 'USER_ADMIN_EXPLAIN' => 'Here you can change your users information and certain specific options. To modify the users permissions please use the user and group permissions system.', + 'USER_ADMIN_EXPLAIN' => 'Here you can change your users information and certain specific options.', 'USER_ADMIN_FORCE' => 'Force reactivation', 'USER_ADMIN_MOVE_POSTS' => 'Move all posts', 'USER_ADMIN_SIG_REMOVED' => 'Successfully removed signature from user account.', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index b082a00c52..5a433af5ee 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -526,6 +526,7 @@ $lang = array_merge($lang, array( 'TOO_LONG_AIM' => 'The screenname you entered is too long.', 'TOO_LONG_CONFIRM_CODE' => 'The confirm code you entered is too long.', + 'TOO_LONG_DATEFORMAT' => 'The date format you entered is too long.', 'TOO_LONG_ICQ' => 'The ICQ number you entered is too long.', 'TOO_LONG_INTERESTS' => 'The interests you entered is too long.', 'TOO_LONG_JABBER' => 'The Jabber account name you entered is too long.', @@ -545,6 +546,7 @@ $lang = array_merge($lang, array( 'TOO_SHORT_AIM' => 'The screenname you entered is too short.', 'TOO_SHORT_CONFIRM_CODE' => 'The confirm code you entered is too short.', + 'TOO_SHORT_DATEFORMAT' => 'The date format you entered is too short.', 'TOO_SHORT_ICQ' => 'The ICQ number you entered is too short.', 'TOO_SHORT_INTERESTS' => 'The interests you entered is too short.', 'TOO_SHORT_JABBER' => 'The Jabber account name you entered is too short.', diff --git a/phpBB/language/en/email/forum_notify.txt b/phpBB/language/en/email/forum_notify.txt index f55e6dd80b..090782091e 100644 --- a/phpBB/language/en/email/forum_notify.txt +++ b/phpBB/language/en/email/forum_notify.txt @@ -6,6 +6,12 @@ You are receiving this notification because you are watching the forum, "{FORUM_ {U_NEWEST_POST} +If you want to view the topic, click the following link: +{U_TOPIC} + +If you want to view the forum, click the following link: +{U_TOPIC} + If you no longer wish to watch this forum you can either click the "Unsubscribe forum" link found in the forum above, or by clicking the following link: {U_STOP_WATCHING_FORUM} diff --git a/phpBB/language/en/email/topic_notify.txt b/phpBB/language/en/email/topic_notify.txt index 3c8c38cf0a..99587b28e0 100644 --- a/phpBB/language/en/email/topic_notify.txt +++ b/phpBB/language/en/email/topic_notify.txt @@ -10,6 +10,9 @@ If you want to view the newest post made since your last visit, click the follow If you want to view the topic, click the following link: {U_TOPIC} +If you want to view the forum, click the following link: +{U_FORUM} + If you no longer wish to watch this topic you can either click the "Unsubscribe topic" link found at the bottom of the topic above, or by clicking the following link: {U_STOP_WATCHING_TOPIC} diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html index ce299e22f6..33bb251eca 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -22,16 +22,19 @@ [ {L_USE_PERMISSIONS} ] -
      {L_RANK}:
      {RANK_TITLE}
      -
       {L_RANK}:
      {RANK_IMG}
      +
      {L_RANK}:
      {RANK_TITLE}
      +
       {L_RANK}:
      {RANK_IMG}
      -
      {L_USER_IS_INACTIVE}:
      {USER_INACTIVE_REASON}
      +
      {L_USER_IS_INACTIVE}:
      {USER_INACTIVE_REASON}
      {L_LOCATION}:
      {LOCATION}
      {L_AGE}:
      {AGE}
      {L_OCCUPATION}:
      {OCCUPATION}
      {L_INTERESTS}:
      {INTERESTS}
      {L_USERGROUPS}:
      {custom_fields.PROFILE_FIELD_NAME}:
      {custom_fields.PROFILE_FIELD_VALUE}
      +
      rank something somethinglong to display here to display
      Something
      +
      rank something somethinglong to display here to display
      Something
      +
      rank something somethinglong to display here to display
      Something
       
      {L_ADD_FRIEND}
      diff --git a/phpBB/styles/prosilver/template/posting_pm_layout.html b/phpBB/styles/prosilver/template/posting_pm_layout.html index 378c632858..48812da102 100644 --- a/phpBB/styles/prosilver/template/posting_pm_layout.html +++ b/phpBB/styles/prosilver/template/posting_pm_layout.html @@ -30,4 +30,6 @@ + + \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index 186f4b01da..3924fa3944 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -86,7 +86,7 @@ -
      +
      diff --git a/phpBB/styles/prosilver/template/ucp_pm_history.html b/phpBB/styles/prosilver/template/ucp_pm_history.html index 3c18462b8e..3a32beac95 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_history.html +++ b/phpBB/styles/prosilver/template/ucp_pm_history.html @@ -1,7 +1,7 @@

      {L_EXPAND_VIEW} - {L_MESSAGE_HISTORY}: {TITLE} + {L_MESSAGE_HISTORY}: {HISTORY_TITLE}

      diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index 7d03939605..83cf2581c1 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -39,7 +39,7 @@
      -
      {L_POST_TOPIC}
      +
      {L_FORUM_LOCKED}{L_POST_TOPIC}
      @@ -181,7 +181,7 @@
      -
      {L_POST_TOPIC}
      +
      {L_FORUM_LOCKED}{L_POST_TOPIC}
      diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index b1f7b7646b..970f2fb1a6 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -113,7 +113,7 @@ -
      +
      diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index 623ecc1226..17c0baf006 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -128,14 +128,26 @@ .rtl dl.details dt { float: right; + clear: right; text-align: left; } .rtl dl.details dd { - margin-right: 16em; + margin-right: 0; margin-left: 0; padding-right: 5px; padding-left: 0; + float: right; +} + +*:first-child+html dl.details dd { + margin-right: 16em; + float: none; +} + +* html dl.details dd { + margin-right: 16em; + float: none; } /* Pagination diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index ba089c7ce6..cda2ed9d07 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -442,12 +442,6 @@ dl.faq dt { color: #BC2A4D; } -.announce, .unreadpost { - /* Highlight the announcements & unread posts box */ - border-left-color: #BC2A4D; - border-right-color: #BC2A4D; -} - /* Post signature */ .signature { border-top-color: #CCCCCC; diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index e46bbba836..9ba258b7df 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -444,6 +444,7 @@ dl.details { dl.details dt { float: left; + clear: left; width: 16em; text-align: right; color: #000000; @@ -451,10 +452,11 @@ dl.details dt { } dl.details dd { - margin-left: 16em; + margin-left: 0; padding-left: 5px; margin-bottom: 5px; color: #828282; + float: left; } /* Pagination diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css index 52bdb1baaa..cfbb680997 100644 --- a/phpBB/styles/prosilver/theme/tweaks.css +++ b/phpBB/styles/prosilver/theme/tweaks.css @@ -59,3 +59,14 @@ dl.icon { margin-right: 35px; } +/* Correctly clear floating for details on profile view */ +*:first-child+html dl.details dd { + margin-left: 16em; + float: none; +} + +* html dl.details dd { + margin-left: 16em; + float: none; +} + diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html index c0870da8f6..ba4df7da89 100644 --- a/phpBB/styles/subsilver2/template/posting_body.html +++ b/phpBB/styles/subsilver2/template/posting_body.html @@ -391,6 +391,7 @@
      + diff --git a/phpBB/styles/subsilver2/template/ucp_pm_history.html b/phpBB/styles/subsilver2/template/ucp_pm_history.html index 1bcd042d03..9e05368340 100644 --- a/phpBB/styles/subsilver2/template/ucp_pm_history.html +++ b/phpBB/styles/subsilver2/template/ucp_pm_history.html @@ -1,7 +1,7 @@
      {PAGE_NUMBER}
      {L_ADD_WARNING_EXPLAIN}
      - + - + @@ -222,6 +222,7 @@ + diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index 5b4349254f..6da8e81dbd 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -19,7 +19,7 @@ include($phpbb_root_path . 'common.' . $phpEx); // Start session management $user->session_begin(); $auth->acl($user->data); -$user->setup(); +$user->setup('memberlist'); // Get and set some variables $mode = request_var('mode', ''); diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 165afcf9d5..1e1788db53 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -655,7 +655,7 @@ if (!empty($topic_data['poll_start'])) { if (!sizeof($voted_id) || sizeof($voted_id) > $topic_data['poll_max_options']) { - $redirect_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id"); + $redirect_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&start=$start"); meta_refresh(5, $redirect_url); @@ -723,7 +723,7 @@ if (!empty($topic_data['poll_start'])) //, topic_last_post_time = ' . time() . " -- for bumping topics with new votes, ignore for now $db->sql_query($sql); - $redirect_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id"); + $redirect_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&start=$start"); meta_refresh(5, $redirect_url); trigger_error($user->lang['VOTE_SUBMITTED'] . '

      ' . sprintf($user->lang['RETURN_TOPIC'], '', '')); From c9dcf849b9d196f27131c21b79ebf1793f3c1cda Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Thu, 16 Aug 2007 11:28:58 +0000 Subject: [PATCH 59/96] - two new packages... diff and utf - only 60 chars for topic title if new post (please see changelog for explanation) - change utf8_wordwrap (had some bugs david and nils spotted - was not really functional, sorry for this. :D) git-svn-id: file:///svn/phpbb/trunk@8034 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/diff/diff.php | 24 ++++---- phpBB/includes/diff/engine.php | 4 +- phpBB/includes/diff/renderer.php | 12 ++-- phpBB/includes/functions_messenger.php | 8 +-- phpBB/includes/ucp/ucp_pm_compose.php | 5 ++ phpBB/includes/utf/utf_normalizer.php | 4 +- phpBB/includes/utf/utf_tools.php | 55 +++++++++++-------- phpBB/posting.php | 6 ++ .../prosilver/template/posting_editor.html | 2 +- .../subsilver2/template/posting_body.html | 2 +- 11 files changed, 72 insertions(+), 51 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index cfa163a9a6..3dcb7057e1 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -221,6 +221,7 @@ p a {
    67. [Fix] Return to last page after voting in viewtopic instead of first page in topic (Bug #13976)
    68. [Fix] If sending PM's to groups only include activated member (Bug #14040)
    69. [Fix] Correctly wrap words in emails containing utf8 characters (Bug #14109)
      70. +
    70. [Change] For new posts or editing the first post topic titles have a maxlength of 60 characters. For any subsequent posts the length is extended to 64 to make room for the Re: part, but cutting at 60 characters. The maxlength need to be 64, else users using opera are unable to post (opera does not allow pre-filling a field with more characters than specified within the maxlength attribute)
      71. diff --git a/phpBB/includes/diff/diff.php b/phpBB/includes/diff/diff.php index b18970dab4..0308297c4e 100644 --- a/phpBB/includes/diff/diff.php +++ b/phpBB/includes/diff/diff.php @@ -1,7 +1,7 @@ */ class diff @@ -226,7 +226,7 @@ class diff } /** -* @package phpBB3 +* @package diff * @author Geoffrey T. Dairiki */ class mapped_diff extends diff @@ -274,7 +274,7 @@ class mapped_diff extends diff } /** -* @package phpBB3 +* @package diff * @author Geoffrey T. Dairiki * * @access private @@ -301,7 +301,7 @@ class diff_op } /** -* @package phpBB3 +* @package diff * @author Geoffrey T. Dairiki * * @access private @@ -326,7 +326,7 @@ class diff_op_copy extends diff_op } /** -* @package phpBB3 +* @package diff * @author Geoffrey T. Dairiki * * @access private @@ -347,7 +347,7 @@ class diff_op_delete extends diff_op } /** -* @package phpBB3 +* @package diff * @author Geoffrey T. Dairiki * * @access private @@ -368,7 +368,7 @@ class diff_op_add extends diff_op } /** -* @package phpBB3 +* @package diff * @author Geoffrey T. Dairiki * * @access private @@ -392,7 +392,7 @@ class diff_op_change extends diff_op /** * A class for computing three way diffs. * -* @package phpBB3 +* @package diff * @author Geoffrey T. Dairiki */ class diff3 extends diff @@ -637,7 +637,7 @@ class diff3 extends diff } /** -* @package phpBB3 +* @package diff * @author Geoffrey T. Dairiki * * @access private @@ -683,7 +683,7 @@ class diff3_op } /** -* @package phpBB3 +* @package diff * @author Geoffrey T. Dairiki * * @access private @@ -709,7 +709,7 @@ class diff3_op_copy extends diff3_op } /** -* @package phpBB3 +* @package diff * @author Geoffrey T. Dairiki * * @access private diff --git a/phpBB/includes/diff/engine.php b/phpBB/includes/diff/engine.php index a74fa9d263..c4802c2257 100644 --- a/phpBB/includes/diff/engine.php +++ b/phpBB/includes/diff/engine.php @@ -1,7 +1,7 @@ -* @package phpBB3 +* @package diff * * @access private */ diff --git a/phpBB/includes/diff/renderer.php b/phpBB/includes/diff/renderer.php index e920e9688f..feb741762a 100644 --- a/phpBB/includes/diff/renderer.php +++ b/phpBB/includes/diff/renderer.php @@ -1,7 +1,7 @@ addresses, mail_encode($this->subject), utf8_wordwrap($this->msg), $err_msg, $headers); + $result = smtpmail($this->addresses, mail_encode($this->subject), wordwrap(utf8_wordwrap($this->msg), 997, "\n", true), $err_msg, $headers); } else { ob_start(); - $result = $config['email_function_name']($mail_to, mail_encode($this->subject), utf8_wordwrap($this->msg), $headers); + $result = $config['email_function_name']($mail_to, mail_encode($this->subject), wordwrap(utf8_wordwrap($this->msg), 997, "\n", true), $headers); $err_msg = ob_get_clean(); } @@ -633,12 +633,12 @@ class queue if ($config['smtp_delivery']) { - $result = smtpmail($addresses, mail_encode($subject), utf8_wordwrap($msg), $err_msg, $headers); + $result = smtpmail($addresses, mail_encode($subject), wordwrap(utf8_wordwrap($msg), 997, "\n", true), $err_msg, $headers); } else { ob_start(); - $result = $config['email_function_name']($to, mail_encode($subject), utf8_wordwrap($msg), $headers); + $result = $config['email_function_name']($to, mail_encode($subject), wordwrap(utf8_wordwrap($msg), 997, "\n", true), $headers); $err_msg = ob_get_clean(); } diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 4b92bf4042..20086e605e 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -320,6 +320,11 @@ function compose_pm($id, $mode, $action) } } + if ($action == 'post') + { + $template->assign_var('S_NEW_MESSAGE', true); + } + if (!isset($icon_id)) { $icon_id = 0; diff --git a/phpBB/includes/utf/utf_normalizer.php b/phpBB/includes/utf/utf_normalizer.php index 3332f3f744..4c705b05cb 100644 --- a/phpBB/includes/utf/utf_normalizer.php +++ b/phpBB/includes/utf/utf_normalizer.php @@ -1,7 +1,7 @@ ''); $index = 0; - foreach ($words as $word) + foreach ($lines as $line) { - if (!isset($lines[$index])) + $words = explode(' ', $line); + + for ($i = 0, $size = sizeof($words); $i < $size; $i++) { - $lines[$index] = ''; + $word = $words[$i]; + + // If cut is true we need to cut the word if it is > width chars + if ($cut && utf8_strlen($word) > $width) + { + $words[$i] = utf8_substr($word, $width); + $word = utf8_substr($word, 0, $width); + $i--; + } + + if (utf8_strlen($new_lines[$index] . $word) > $width) + { + $new_lines[$index] = substr($new_lines[$index], 0, -1); + $index++; + $new_lines[$index] = ''; + } + + $new_lines[$index] .= $word . ' '; } - if (!empty($lines[$index]) && utf8_strlen($lines[$index]) > $width) - { - $lines[$index] = substr($lines[$index], 0, -1); - $index++; - $lines[$index] = ''; - } - - $lines[$index] .= $word . ' '; + $new_lines[$index] = substr($new_lines[$index], 0, -1); + $index++; + $new_lines[$index] = ''; } - return implode($break, $lines); + unset($new_lines[$index]); + return implode($break, $new_lines); } ?> \ No newline at end of file diff --git a/phpBB/posting.php b/phpBB/posting.php index af357a90b9..71e0dfc2c7 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -324,6 +324,11 @@ if ($mode == 'bump') trigger_error('BUMP_ERROR'); } +// Subject length limiting to 60 characters if first post... +if ($mode == 'post' || ($mode == 'edit' && $post_data['topic_first_post_id'] == $post_data['post_id'])) +{ + $template->assign_var('S_NEW_MESSAGE', true); +} // Determine some vars if (isset($post_data['poster_id']) && $post_data['poster_id'] == ANONYMOUS) @@ -334,6 +339,7 @@ else { $post_data['quote_username'] = isset($post_data['username']) ? $post_data['username'] : ''; } + $post_data['post_edit_locked'] = (isset($post_data['post_edit_locked'])) ? (int) $post_data['post_edit_locked'] : 0; $post_data['post_subject'] = (in_array($mode, array('quote', 'edit'))) ? $post_data['post_subject'] : ((isset($post_data['topic_title'])) ? $post_data['topic_title'] : ''); $post_data['topic_time_limit'] = (isset($post_data['topic_time_limit'])) ? (($post_data['topic_time_limit']) ? (int) $post_data['topic_time_limit'] / 86400 : (int) $post_data['topic_time_limit']) : 0; diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html index 26cbe54387..8a3e582cb2 100644 --- a/phpBB/styles/prosilver/template/posting_editor.html +++ b/phpBB/styles/prosilver/template/posting_editor.html @@ -93,7 +93,7 @@
      -
      +
      diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html index ba4df7da89..744fcb4189 100644 --- a/phpBB/styles/subsilver2/template/posting_body.html +++ b/phpBB/styles/subsilver2/template/posting_body.html @@ -173,7 +173,7 @@
      - +
      {L_MESSAGE_HISTORY} - {TITLE}{L_MESSAGE_HISTORY} - {HISTORY_TITLE}
      diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index dc56afc7d6..db6b1118e3 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -291,6 +291,7 @@ $template->assign_vars(array( 'S_DISPLAY_SEARCHBOX' => ($auth->acl_get('u_search') && $auth->acl_get('f_search', $forum_id) && $config['load_search']) ? true : false, 'S_SEARCHBOX_ACTION' => append_sid("{$phpbb_root_path}search.$phpEx", 'fid[]=' . $forum_id), '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, '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) : '', From 7bc3039cd9cc34a5a804811587e69a4a67dbc625 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Mon, 13 Aug 2007 12:24:20 +0000 Subject: [PATCH 51/96] this addition was only a test... git-svn-id: file:///svn/phpbb/trunk@8026 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions_module.php | 1 - 1 file changed, 1 deletion(-) diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index a48f9ae2dd..9db2c4fa25 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -364,7 +364,6 @@ class p_master $this->p_mode = $item_ary['mode']; $this->p_left = $item_ary['left']; $this->p_right = $item_ary['right']; - $this->p_icat = $icat; $this->module_cache['parents'] = $this->module_cache['parents'][$this->p_id]; $this->active_module = $item_ary['id']; From 4e55587c85b0a0fe18649b4499e647e801c567c6 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Mon, 13 Aug 2007 12:25:28 +0000 Subject: [PATCH 52/96] also only meant for testing purposes. :o git-svn-id: file:///svn/phpbb/trunk@8027 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/styles/prosilver/template/memberlist_view.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html index 33bb251eca..fe3d3f33b5 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -32,9 +32,6 @@
      {L_INTERESTS}:
      {INTERESTS}
      {L_USERGROUPS}:
      {custom_fields.PROFILE_FIELD_NAME}:
      {custom_fields.PROFILE_FIELD_VALUE}
      -
      rank something somethinglong to display here to display
      Something
      -
      rank something somethinglong to display here to display
      Something
      -
      rank something somethinglong to display here to display
      Something
       
      {L_ADD_FRIEND}
      From 0c948afde2f5cfbdf35a041f870c9bad175644cb Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Tue, 14 Aug 2007 12:14:26 +0000 Subject: [PATCH 53/96] #14072 git-svn-id: file:///svn/phpbb/trunk@8028 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/acp/acp_profile.php | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 9c936aafa6..b404925af9 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -214,6 +214,7 @@ p a {
    71. [Change] Do not force login on visiting topic/forum from notification emails (Bug #13818)
    72. [Fix] Fixed cron_lock value for cron execution. This bug led to users having problems with the email queue and other cron related issues.
    73. [Fix] Prevent white pages on php notices with gzip compression enabled (Bug #14096)
      74. +
    74. [Fix] Propagate the cleaned idendtifier for CFPs (Bug #14072)
      75. diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php index 9ff2db9704..3b70b716b4 100644 --- a/phpBB/includes/acp/acp_profile.php +++ b/phpBB/includes/acp/acp_profile.php @@ -662,6 +662,10 @@ class acp_profile { $var = false; } + else if ($key == 'field_ident' && isset($cp->vars[$key])) + { + $_new_key_ary[$key]= $cp->vars[$key]; + } else { $_new_key_ary[$key] = (is_array($_REQUEST[$key])) ? utf8_normalize_nfc(request_var($key, array(''), true)) : utf8_normalize_nfc(request_var($key, '', true)); From 8ab583dce0d0a266eb6f229f1a6afa4b72c70803 Mon Sep 17 00:00:00 2001 From: David M Date: Tue, 14 Aug 2007 12:27:35 +0000 Subject: [PATCH 54/96] turn on strict mode for databases that support it git-svn-id: file:///svn/phpbb/trunk@8029 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/db/mysql.php | 25 +++++++++++++++++++++++++ phpBB/includes/db/mysqli.php | 27 ++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php index 71a2002eb4..b3be4f9bd9 100644 --- a/phpBB/includes/db/mysql.php +++ b/phpBB/includes/db/mysql.php @@ -57,6 +57,31 @@ class dbal_mysql extends dbal if (version_compare($this->mysql_version, '4.1.3', '>=')) { @mysql_query("SET NAMES 'utf8'", $this->db_connect_id); + // enforce strict mode on databases that support it + if (version_compare($this->mysql_version, '5.0.2', '>=')) + { + $result = @mysql_query('SELECT @@session.sql_mode AS sql_mode', $this->db_connect_id); + $row = @mysql_fetch_assoc($result); + @mysql_free_result($result); + $modes = array_map('trim', explode(',', $row['sql_mode'])); + + // TRADITIONAL includes STRICT_ALL_TABLES and STRICT_TRANS_TABLES + if (!in_array('TRADITIONAL', $modes)) + { + if (!in_array('STRICT_ALL_TABLES', $modes)) + { + $modes[] = 'STRICT_ALL_TABLES'; + } + + if (!in_array('STRICT_TRANS_TABLES', $modes)) + { + $modes[] = 'STRICT_TRANS_TABLES'; + } + } + + $mode = implode(',', $modes); + @mysql_query("SET SESSION sql_mode='{$mode}'", $this->db_connect_id); + } } else if (version_compare($this->mysql_version, '4.0.0', '<')) { diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php index 660188d1c7..320171e852 100644 --- a/phpBB/includes/db/mysqli.php +++ b/phpBB/includes/db/mysqli.php @@ -45,6 +45,31 @@ class dbal_mysqli extends dbal if ($this->db_connect_id && $this->dbname != '') { @mysqli_query($this->db_connect_id, "SET NAMES 'utf8'"); + // enforce strict mode on databases that support it + if (mysqli_get_server_version($this->db_connect_id) >= 50002) + { + $result = @mysqli_query($this->db_connect_id, 'SELECT @@session.sql_mode AS sql_mode'); + $row = @mysqli_fetch_assoc($result); + @mysqli_free_result($result); + $modes = array_map('trim', explode(',', $row['sql_mode'])); + + // TRADITIONAL includes STRICT_ALL_TABLES and STRICT_TRANS_TABLES + if (!in_array('TRADITIONAL', $modes)) + { + if (!in_array('STRICT_ALL_TABLES', $modes)) + { + $modes[] = 'STRICT_ALL_TABLES'; + } + + if (!in_array('STRICT_TRANS_TABLES', $modes)) + { + $modes[] = 'STRICT_TRANS_TABLES'; + } + } + + $mode = implode(',', $modes); + @mysqli_query($this->db_connect_id, "SET SESSION sql_mode='{$mode}'"); + } return $this->db_connect_id; } @@ -314,7 +339,7 @@ class dbal_mysqli extends dbal if (strpos(mysqli_get_server_info($this->db_connect_id), 'community') !== false) { $ver = mysqli_get_server_version($this->db_connect_id); - if ($ver >= 50037 && $ver < 51000) + if ($ver >= 50037 && $ver < 50100) { $test_prof = true; } From 4ae2e77bcbabd43b6486c0c161167defc59943a4 Mon Sep 17 00:00:00 2001 From: David M Date: Tue, 14 Aug 2007 17:55:52 +0000 Subject: [PATCH 55/96] normalizer does not return, it works via refs. updated the normalizer test to reflect this. git-svn-id: file:///svn/phpbb/trunk@8030 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/utf_normalizer_test.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/phpBB/develop/utf_normalizer_test.php b/phpBB/develop/utf_normalizer_test.php index 45ffaa11e9..9ad9c5869f 100644 --- a/phpBB/develop/utf_normalizer_test.php +++ b/phpBB/develop/utf_normalizer_test.php @@ -132,7 +132,8 @@ while (!feof($fp)) foreach ($tests as $test) { - $utf_result = call_user_func(array('utf_normalizer', $form), $utf_expected); + $utf_result = $utf_expected; + call_user_func(array('utf_normalizer', $form), $utf_result); if (strcmp($utf_expected, $utf_result)) { @@ -196,7 +197,8 @@ while (!feof($fp)) foreach (array('nfc', 'nfkc', 'nfd', 'nfkd') as $form) { - $utf_result = utf_normalizer::$form($utf_expected); + $utf_result = $utf_expected; + utf_normalizer::$form($utf_result); $hex_result = utf_to_hexseq($utf_result); // echo "$form($utf_expected) == $utf_result\n"; From e6e0b7f07d7874e8df3b290b18d6e6c6c4c6ade2 Mon Sep 17 00:00:00 2001 From: David M Date: Tue, 14 Aug 2007 18:21:13 +0000 Subject: [PATCH 56/96] lest we forget git-svn-id: file:///svn/phpbb/trunk@8031 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/utf/utf_normalizer.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/phpBB/includes/utf/utf_normalizer.php b/phpBB/includes/utf/utf_normalizer.php index e59863199d..3332f3f744 100644 --- a/phpBB/includes/utf/utf_normalizer.php +++ b/phpBB/includes/utf/utf_normalizer.php @@ -89,6 +89,12 @@ class utf_normalizer include($phpbb_root_path . 'includes/utf/data/utf_nfc_qc.' . $phpEx); } + if (!isset($GLOBALS['utf_canonical_decomp'])) + { + global $phpbb_root_path, $phpEx; + include($phpbb_root_path . 'includes/utf/data/utf_canonical_decomp.' . $phpEx); + } + // Replace any byte in the range 0x00..0x1F, except for \r, \n and \t // We replace those characters with a 0xFF byte, which is illegal in UTF-8 and will in turn be replaced with a UTF replacement char $str = strtr( From 3ada3b76f0ce86274647758db029d84a0f404886 Mon Sep 17 00:00:00 2001 From: David M Date: Tue, 14 Aug 2007 18:53:17 +0000 Subject: [PATCH 57/96] add a noramlizer wrapper just for updates git-svn-id: file:///svn/phpbb/trunk@8032 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/install/data/confusables.php | 2 +- phpBB/install/data/new_normalizer.php | 181 ++++++++++++++++++++++++++ phpBB/install/database_update.php | 12 +- 3 files changed, 193 insertions(+), 2 deletions(-) create mode 100644 phpBB/install/data/new_normalizer.php diff --git a/phpBB/install/data/confusables.php b/phpBB/install/data/confusables.php index 86223bd726..4472946a55 100644 --- a/phpBB/install/data/confusables.php +++ b/phpBB/install/data/confusables.php @@ -621,7 +621,7 @@ function utf8_new_case_fold_nfkc($text, $option = 'full') } // convert to NFKC - utf_normalizer::nfkc($text); + utf_new_normalizer::nfkc($text); // FC_NFKC_Closure, http://www.unicode.org/Public/5.0.0/ucd/DerivedNormalizationProps.txt $text = strtr($text, $fc_nfkc_closure); diff --git a/phpBB/install/data/new_normalizer.php b/phpBB/install/data/new_normalizer.php new file mode 100644 index 0000000000..a050520690 --- /dev/null +++ b/phpBB/install/data/new_normalizer.php @@ -0,0 +1,181 @@ + $string) + { + if (is_array($string)) + { + foreach ($string as $_key => $_string) + { + utf_new_normalizer::nfc($strings[$key][$_key]); + } + } + else + { + utf_new_normalizer::nfc($strings[$key]); + } + } + } + + return $strings; +} + +class utf_new_normalizer +{ + /** + * Validate, cleanup and normalize a string + * + * The ultimate convenience function! Clean up invalid UTF-8 sequences, + * and convert to Normal Form C, canonical composition. + * + * @param string &$str The dirty string + * @return string The same string, all shiny and cleaned-up + */ + function cleanup(&$str) + { + // The string below is the list of all autorized characters, sorted by frequency in latin text + $pos = strspn($str, "\x20\x65\x69\x61\x73\x6E\x74\x72\x6F\x6C\x75\x64\x5D\x5B\x63\x6D\x70\x27\x0A\x67\x7C\x68\x76\x2E\x66\x62\x2C\x3A\x3D\x2D\x71\x31\x30\x43\x32\x2A\x79\x78\x29\x28\x4C\x39\x41\x53\x2F\x50\x22\x45\x6A\x4D\x49\x6B\x33\x3E\x35\x54\x3C\x44\x34\x7D\x42\x7B\x38\x46\x77\x52\x36\x37\x55\x47\x4E\x3B\x4A\x7A\x56\x23\x48\x4F\x57\x5F\x26\x21\x4B\x3F\x58\x51\x25\x59\x5C\x09\x5A\x2B\x7E\x5E\x24\x40\x60\x7F\x0D"); + $len = strlen($str); + + if ($pos == $len) + { + // ASCII strings with no special chars return immediately + return; + } + + // Note: we do not check for $GLOBALS['utf_canonical_decomp']. It is assumed they are always loaded together + if (!isset($GLOBALS['utf_nfc_qc'])) + { + global $phpbb_root_path, $phpEx; + include($phpbb_root_path . 'includes/utf/data/utf_nfc_qc.' . $phpEx); + } + + if (!isset($GLOBALS['utf_canonical_decomp'])) + { + global $phpbb_root_path, $phpEx; + include($phpbb_root_path . 'includes/utf/data/utf_canonical_decomp.' . $phpEx); + } + + // Replace any byte in the range 0x00..0x1F, except for \r, \n and \t + // We replace those characters with a 0xFF byte, which is illegal in UTF-8 and will in turn be replaced with a UTF replacement char + $str = strtr( + $str, + "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x0B\x0C\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F", + "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF" + ); + + $str = utf_new_normalizer::recompose($str, $pos, $len, $GLOBALS['utf_nfc_qc'], $GLOBALS['utf_canonical_decomp']); + } + + /** + * Validate and normalize a UTF string to NFC + * + * @param string &$str Unchecked UTF string + * @return string The string, validated and in normal form + */ + function nfc(&$str) + { + $pos = strspn($str, UTF8_ASCII_RANGE); + $len = strlen($str); + + if ($pos == $len) + { + // ASCII strings return immediately + return; + } + + if (!isset($GLOBALS['utf_nfc_qc'])) + { + global $phpbb_root_path, $phpEx; + include($phpbb_root_path . 'includes/utf/data/utf_nfc_qc.' . $phpEx); + } + + if (!isset($GLOBALS['utf_canonical_decomp'])) + { + global $phpbb_root_path, $phpEx; + include($phpbb_root_path . 'includes/utf/data/utf_canonical_decomp.' . $phpEx); + } + + $str = utf_new_normalizer::recompose($str, $pos, $len, $GLOBALS['utf_nfc_qc'], $GLOBALS['utf_canonical_decomp']); + } + + /** + * Validate and normalize a UTF string to NFKC + * + * @param string &$str Unchecked UTF string + * @return string The string, validated and in normal form + */ + function nfkc(&$str) + { + $pos = strspn($str, UTF8_ASCII_RANGE); + $len = strlen($str); + + if ($pos == $len) + { + // ASCII strings return immediately + return; + } + + if (!isset($GLOBALS['utf_nfkc_qc'])) + { + global $phpbb_root_path, $phpEx; + include($phpbb_root_path . 'includes/utf/data/utf_nfkc_qc.' . $phpEx); + } + + if (!isset($GLOBALS['utf_compatibility_decomp'])) + { + global $phpbb_root_path, $phpEx; + include($phpbb_root_path . 'includes/utf/data/utf_compatibility_decomp.' . $phpEx); + } + + $str = utf_new_normalizer::recompose($str, $pos, $len, $GLOBALS['utf_nfkc_qc'], $GLOBALS['utf_compatibility_decomp']); + } + + /** + * Recompose a UTF string + * + * @param string $str Unchecked UTF string + * @param integer $pos Position of the first UTF char (in bytes) + * @param integer $len Length of the string (in bytes) + * @param array &$qc Quick-check array, passed by reference but never modified + * @param array &$decomp_map Decomposition mapping, passed by reference but never modified + * @return string The string, validated and recomposed + * + * @access private + */ + function recompose($str, $pos, $len, &$qc, &$decomp_map) + { + global $utf_canonical_comp; + + // Load the canonical composition table + if (!isset($utf_canonical_comp)) + { + global $phpbb_root_path, $phpEx; + include($phpbb_root_path . 'includes/utf/data/utf_canonical_comp.' . $phpEx); + } + + return utf_normalizer::recompose($str, $pos, $len, &$qc, &$decomp_map); + } +} + +?> \ No newline at end of file diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index da8f6e9518..59a6a21689 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -567,6 +567,16 @@ if (version_compare($current_version, '3.0.RC4', '<=')) $modify_users = request_var('modify_users', array(0 => '')); $new_usernames = request_var('new_usernames', array(0 => ''), true); + if (!class_exists('utf_new_normalizer')) + { + if (!file_exists($phpbb_root_path . 'install/data/new_normalizer.' . $phpEx)) + { + global $lang; + trigger_error(sprintf($lang['UPDATE_REQUIRES_FILE'], $phpbb_root_path . 'install/data/new_normalizer.' . $phpEx), E_USER_ERROR); + } + include($phpbb_root_path . 'install/data/new_normalizer.' . $phpEx); + } + // the admin decided to change some usernames if (sizeof($modify_users) && $submit) { @@ -601,7 +611,7 @@ if (version_compare($current_version, '3.0.RC4', '<=')) case 'edit': if (isset($new_usernames[$user_id])) { - $data = array('username' => utf8_normalize_nfc($new_usernames[$user_id])); + $data = array('username' => utf8_new_normalize_nfc($new_usernames[$user_id])); // Need to update config, forum, topic, posting, messages, etc. if ($data['username'] != $row['username']) { From 2bbd2fb1f97d4668e82c26badbe89c3d3fdc8169 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Wed, 15 Aug 2007 17:32:48 +0000 Subject: [PATCH 58/96] some bugs fixed git-svn-id: file:///svn/phpbb/trunk@8033 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/custom_profile_fields.html | 2 +- phpBB/docs/CHANGELOG.html | 14 ++++-- phpBB/includes/acp/acp_language.php | 2 +- phpBB/includes/acp/acp_profile.php | 4 +- phpBB/includes/acp/acp_styles.php | 20 +++----- phpBB/includes/functions.php | 8 +-- phpBB/includes/functions_convert.php | 2 +- phpBB/includes/functions_messenger.php | 8 +-- phpBB/includes/functions_privmsgs.php | 10 ++-- phpBB/includes/functions_user.php | 1 + phpBB/includes/message_parser.php | 5 +- phpBB/includes/ucp/ucp_pm_options.php | 4 +- phpBB/includes/utf/utf_tools.php | 49 +++++++++++++++++-- phpBB/language/en/common.php | 4 +- phpBB/search.php | 4 +- phpBB/style.php | 18 ++++--- .../template/custom_profile_fields.html | 4 +- .../prosilver/template/memberlist_view.html | 4 +- .../prosilver/template/simple_header.html | 5 ++ .../prosilver/template/viewforum_body.html | 2 + .../subsilver2/template/viewforum_body.html | 3 +- phpBB/viewonline.php | 2 +- phpBB/viewtopic.php | 4 +- 23 files changed, 119 insertions(+), 60 deletions(-) diff --git a/phpBB/adm/style/custom_profile_fields.html b/phpBB/adm/style/custom_profile_fields.html index 7516d6120e..351397d3c7 100644 --- a/phpBB/adm/style/custom_profile_fields.html +++ b/phpBB/adm/style/custom_profile_fields.html @@ -15,7 +15,7 @@ - + checked="checked" /> diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index b404925af9..cfa163a9a6 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -191,13 +191,13 @@ p a {
      • [Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)
      • [Fix] Allow MS SQL to properly connect when using the mssql driver and PHP is less than either 4.4.1 or 5.1 (Bug #13874)
        • -
      • [Fix] Ignore files containging HTML special chars in the filenames as gallery avatars (Bug #13906)
        • +
      • [Fix] Ignore files containing HTML special chars in the filenames as gallery avatars (Bug #13906)
      • [Fix] Multiple PM recipients not separated (Bug #13876)
      • [Change] Split the select list for the smilie order to clarify which are feasible and which are not (Bug #13911)
      • [Fix] Convert empty homepage fields (Bug #13917)
      • [Fix] Use board default DST setting on creating new profiles (Bug #11563)
      • [Feature] New constant PHPBB_EMBEDDED can be used to let phpBB not call exit; if wrapped/embedded (We may re-check this constant on other code locations later too)
        • -
      • [Feature] append_sid() having a check for the function append_sid_phpbb_hook(). This function is called in favor of append_sid() with the exact same parameters if present.
        • +
      • [Feature] append_sid() having a check for the function append_sid_phpbb_hook(). This function is called in favour of append_sid() with the exact same parameters if present.
      • [Fix] Only list enabled modes within the dropdown at user administration (Bug #13883) - patch provided by damnian
      • [Fix] Properly display ban reason if selecting banned entries within the ACP (Bug #13896)
      • [Fix] Properly parse SQL expressions for Oracle (Bug #13916)
        • @@ -214,7 +214,13 @@ p a {
      • [Change] Do not force login on visiting topic/forum from notification emails (Bug #13818)
      • [Fix] Fixed cron_lock value for cron execution. This bug led to users having problems with the email queue and other cron related issues.
      • [Fix] Prevent white pages on php notices with gzip compression enabled (Bug #14096)
        • -
      • [Fix] Propagate the cleaned idendtifier for CFPs (Bug #14072)
        • +
      • [Fix] Propagate the cleaned identifier for CFPs (Bug #14072)
        • +
      • [Fix] Do not display NO_TOPICS message if viewing non-postable category (Bug #13489)
        • +
      • [Fix] Let the theme immediately expire if changed from ACP for at least 30 minutes after change
        • +
      • [Fix] Do not append hilit= in search if highlighting term is empty (Bug #13910)
        • +
      • [Fix] Return to last page after voting in viewtopic instead of first page in topic (Bug #13976)
        • +
      • [Fix] If sending PM's to groups only include activated member (Bug #14040)
        • +
      • [Fix] Correctly wrap words in emails containing utf8 characters (Bug #14109)
      @@ -286,7 +292,7 @@ p a {
    75. [Fix] Use global url validation for img bbcode tag (Bug #11935)
    76. [Fix] Added proper unicode support to style names (Bug #12165)
    77. [Fix] Search result extract should not end in the middle of a multibyte character (Bug #11863)
      78. -
    78. [Fix] Missing localisation for an imageset no longer triggers a lot of "imageset refreshed" log messages (Bug #12027)
      79. +
    79. [Fix] Missing localisation for an imageset no longer triggers a lot of "imageset refreshed" log messages (Bug #12027)
    80. [Fix] Explain that themes which need parsing cannot be stored on the filesystem (Bug #11134)
    81. [Fix] Normalize usernames
    82. [Change] Improved utf8_clean_string with a more complete list of homographs and NFKC normalization
      83. diff --git a/phpBB/includes/acp/acp_language.php b/phpBB/includes/acp/acp_language.php index ff827c5141..b59729c873 100644 --- a/phpBB/includes/acp/acp_language.php +++ b/phpBB/includes/acp/acp_language.php @@ -163,7 +163,7 @@ class acp_language case 'download_file': case 'upload_data': - if (!$lang_id || empty($_POST['entry'])) + if (!$lang_id || empty($_POST['entry']) || !is_array($_POST['entry'])) { trigger_error($user->lang['NO_LANG_ID'] . adm_back_link($this->u_action), E_USER_WARNING); } diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php index 3b70b716b4..00f8d64acb 100644 --- a/phpBB/includes/acp/acp_profile.php +++ b/phpBB/includes/acp/acp_profile.php @@ -492,11 +492,11 @@ class acp_profile } } } - else if ($field_type == FIELD_BOOL && $key == 'field_default_value') + /* else if ($field_type == FIELD_BOOL && $key == 'field_default_value') { // Get the number of options if this key is 'field_maxlen' $var = request_var('field_default_value', 0); - } + }*/ $cp->vars[$key] = $var; } diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index 45e0ed35d1..300e795f3b 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -666,10 +666,8 @@ parse_css_file = {PARSE_CSS_FILE} $filelist = $filelist_cats = array(); - // we want newlines no carriage returns! - $_POST['template_data'] = (isset($_POST['template_data']) && !empty($_POST['template_data'])) ? str_replace(array("\r\n", "\r"), array("\n", "\n"), $_POST['template_data']) : ''; - - $template_data = (STRIP) ? stripslashes($_POST['template_data']) : $_POST['template_data']; + $template_data = utf8_normalize_nfc(request_var('template_data', '', true)); + $template_data = htmlspecialchars_decode($template_data); $template_file = utf8_normalize_nfc(request_var('template_file', '', true)); $text_rows = max(5, min(999, request_var('text_rows', 20))); $save_changes = (isset($_POST['save'])) ? true : false; @@ -871,7 +869,7 @@ parse_css_file = {PARSE_CSS_FILE} 'SELECTED_TEMPLATE' => $template_info['template_name'], 'TEMPLATE_FILE' => $template_file, - 'TEMPLATE_DATA' => htmlspecialchars($template_data), + 'TEMPLATE_DATA' => utf8_htmlspecialchars($template_data), 'TEXT_ROWS' => $text_rows) ); } @@ -1021,11 +1019,9 @@ parse_css_file = {PARSE_CSS_FILE} $filelist = $filelist_cats = array(); - // we want newlines no carriage returns! - $_POST['template_data'] = (isset($_POST['template_data']) && !empty($_POST['template_data'])) ? str_replace(array("\r\n", "\r"), array("\n", "\n"), $_POST['template_data']) : ''; - - $theme_data = (STRIP) ? stripslashes($_POST['template_data']) : $_POST['template_data']; - $theme_file = utf8_normalize_nfc(request_var('template_file', '', true)); + $theme_data = utf8_normalize_nfc(request_var('template_data', '', true)); + $theme_data = htmlspecialchars_decode($theme_data); + $theme_file = utf8_normalize_nfc(request_var('template_file', '', true)); $text_rows = max(5, min(999, request_var('text_rows', 20))); $save_changes = (isset($_POST['save'])) ? true : false; @@ -1040,7 +1036,7 @@ parse_css_file = {PARSE_CSS_FILE} if (!($theme_info = $db->sql_fetchrow($result))) { - trigger_error($user->lang['NO_THEME'] . adm_bacl_link($this->u_action), E_USER_WARNING); + trigger_error($user->lang['NO_THEME'] . adm_back_link($this->u_action), E_USER_WARNING); } $db->sql_freeresult($result); @@ -1188,7 +1184,7 @@ parse_css_file = {PARSE_CSS_FILE} 'SELECTED_TEMPLATE' => $theme_info['theme_name'], 'TEMPLATE_FILE' => $theme_file, - 'TEMPLATE_DATA' => htmlspecialchars($theme_data), + 'TEMPLATE_DATA' => utf8_htmlspecialchars($theme_data), 'TEXT_ROWS' => $text_rows) ); } diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 64162cc598..ea8b45116a 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1977,7 +1977,7 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo if (isset($_POST['confirm'])) { // language frontier - if ($_POST['confirm'] == $user->lang['YES']) + if ($_POST['confirm'] === $user->lang['YES']) { $confirm = true; } @@ -3498,14 +3498,14 @@ function truncate_string($string, $max_length = 60, $allow_reply = true, $append } $_chars = utf8_str_split(htmlspecialchars_decode($string)); - $chars = array_map('htmlspecialchars', $_chars); + $chars = array_map('utf8_htmlspecialchars', $_chars); // Now check the length ;) if (sizeof($chars) > $max_length) { // Cut off the last elements from the array $string = implode('', array_slice($chars, 0, $max_length)); - $stripped = true; + $stripped = true; } if ($strip_reply) @@ -3697,7 +3697,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline) { if (@extension_loaded('zlib') && !headers_sent()) { - ob_end_flush(); + ob_flush(); } } diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php index 5e1159cb22..12b3109430 100644 --- a/phpBB/includes/functions_convert.php +++ b/phpBB/includes/functions_convert.php @@ -228,7 +228,7 @@ function validate_website($url) { return ''; } - else if (strpos(strtolower($url), 'http://') !== 0 && strlen($url) > 0) + else if (!preg_match('#^[a-z0-9]+://#i', $url) && strlen($url) > 0) { return 'http://' . $url; } diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index cbc6dc5031..735588ce21 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -399,12 +399,12 @@ class messenger if ($config['smtp_delivery']) { - $result = smtpmail($this->addresses, mail_encode($this->subject), wordwrap($this->msg), $err_msg, $headers); + $result = smtpmail($this->addresses, mail_encode($this->subject), utf8_wordwrap($this->msg), $err_msg, $headers); } else { ob_start(); - $result = $config['email_function_name']($mail_to, mail_encode($this->subject), implode("\n", preg_split("/\r?\n/", wordwrap($this->msg))), $headers); + $result = $config['email_function_name']($mail_to, mail_encode($this->subject), utf8_wordwrap($this->msg), $headers); $err_msg = ob_get_clean(); } @@ -633,12 +633,12 @@ class queue if ($config['smtp_delivery']) { - $result = smtpmail($addresses, mail_encode($subject), wordwrap($msg), $err_msg, $headers); + $result = smtpmail($addresses, mail_encode($subject), utf8_wordwrap($msg), $err_msg, $headers); } else { ob_start(); - $result = $config['email_function_name']($to, mail_encode($subject), implode("\n", preg_split("/\r?\n/", wordwrap($msg))), $headers); + $result = $config['email_function_name']($to, mail_encode($subject), utf8_wordwrap($msg), $headers); $err_msg = ob_get_clean(); } diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 61f4648f4f..2a8990b607 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -1348,10 +1348,12 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true) if (isset($data['address_list']['g']) && sizeof($data['address_list']['g'])) { - $sql = 'SELECT group_id, user_id - FROM ' . USER_GROUP_TABLE . ' - WHERE ' . $db->sql_in_set('group_id', array_keys($data['address_list']['g'])) . ' - AND user_pending = 0'; + $sql = 'SELECT u.user_type, ug.group_id, ug.user_id + FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . ' ug + WHERE ' . $db->sql_in_set('ug.group_id', array_keys($data['address_list']['g'])) . ' + AND ug.user_pending = 0 + AND u.user_id = ug.user_id + AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')'; $result = $db->sql_query($sql); while ($row = $db->sql_fetchrow($result)) diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index cee09bef7c..fed783e880 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -173,6 +173,7 @@ function user_add($user_row, $cp_data = false) 'user_ip' => '', 'user_regdate' => time(), 'user_passchg' => time(), + 'user_options' => 895, 'user_inactive_reason' => 0, 'user_inactive_time' => 0, diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index ea28061da0..fda31a20e3 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1370,9 +1370,10 @@ class parse_message extends bbcode_firstpass { include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx); - $index = (int) key($_POST['delete_file']); + $index = array_keys(request_var('delete_file', array(0 => 0))); + $index = (!empty($index[0])) ? $index[0] : false; - if (!empty($this->attachment_data[$index])) + if ($index !== false && !empty($this->attachment_data[$index])) { // delete selected attachment if ($this->attachment_data[$index]['is_orphan']) diff --git a/phpBB/includes/ucp/ucp_pm_options.php b/phpBB/includes/ucp/ucp_pm_options.php index 95326090c7..b4f2cbeb65 100644 --- a/phpBB/includes/ucp/ucp_pm_options.php +++ b/phpBB/includes/ucp/ucp_pm_options.php @@ -312,8 +312,8 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit // Remove Rule if (isset($_POST['delete_rule']) && !isset($_POST['cancel'])) { - $delete_id = array_map('intval', array_keys($_POST['delete_rule'])); - $delete_id = (int) $delete_id[0]; + $delete_id = array_keys(request_var('delete_rule', array(0 => 0))); + $delete_id = (!empty($delete_id[0])) ? $delete_id[0] : 0; if (!$delete_id) { diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php index 0c855be7c3..9ee39570a9 100644 --- a/phpBB/includes/utf/utf_tools.php +++ b/phpBB/includes/utf/utf_tools.php @@ -6,9 +6,6 @@ * @copyright (c) 2006 phpBB Group * @license http://opensource.org/licenses/gpl-license.php GNU Public License * -* @todo make sure the replacements are called correctly -* already done: strtolower, strtoupper, ucfirst, str_split, strrpos, strlen (hopefully!), strpos, substr, htmlspecialchars -* remaining: strspn, chr, ord */ /** @@ -621,7 +618,7 @@ else * @author Harry Fuecks * @param string $str UTF-8 encoded * @param int $split_len number to characters to split string by -* @return string characters in string reverses +* @return array characters in string reverses */ function utf8_str_split($str, $split_len = 1) { @@ -1864,4 +1861,48 @@ function utf8_convert_message($message) return utf8_htmlspecialchars(utf8_recode($message, 'ISO-8859-1')); } +/** +* UTF8-compatible wordwrap replacement +* +* @param string $string The input string +* @param int $width The column width. Defaults to 75. +* @param string $break The line is broken using the optional break parameter. Defaults to '\n'. +* @param bool $cut If the cut is set to TRUE, the string is always wrapped at the specified width. So if you have a word that is larger than the given width, it is broken apart. +* +* @return string the given string wrapped at the specified column. +* +*/ +function utf8_wordwrap($string, $width = 75, $break = "\n", $cut = false) +{ + // If cutting, we just split by $width chars + if ($cut) + { + return implode($break, utf8_str_split($string, $width)); + } + + // If not cutting, we first need to explode on spacer and then merge + $words = explode(' ', $string); + $lines = array(); + $index = 0; + + foreach ($words as $word) + { + if (!isset($lines[$index])) + { + $lines[$index] = ''; + } + + if (!empty($lines[$index]) && utf8_strlen($lines[$index]) > $width) + { + $lines[$index] = substr($lines[$index], 0, -1); + $index++; + $lines[$index] = ''; + } + + $lines[$index] .= $word . ' '; + } + + return implode($break, $lines); +} + ?> \ No newline at end of file diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 5a433af5ee..9b3ebbfe52 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -625,8 +625,8 @@ $lang = array_merge($lang, array( 'VIEW_LATEST_POST' => 'View the latest post', 'VIEW_NEWEST_POST' => 'View first unread post', 'VIEW_NOTES' => 'View user notes', - 'VIEW_ONLINE_TIME' => 'This data is based on users active over the past %d minute', - 'VIEW_ONLINE_TIMES' => 'This data is based on users active over the past %d minutes', + 'VIEW_ONLINE_TIME' => 'based on users active over the past %d minute', + 'VIEW_ONLINE_TIMES' => 'based on users active over the past %d minutes', 'VIEW_TOPIC' => 'View topic', 'VIEW_TOPIC_ANNOUNCEMENT' => 'Announcement: ', 'VIEW_TOPIC_GLOBAL' => 'Global Announcement: ', diff --git a/phpBB/search.php b/phpBB/search.php index 8dabfa895a..89403c8893 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -761,7 +761,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) $u_forum_id = $forum_id; } - $view_topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$u_forum_id&t=$result_topic_id&hilit=$u_hilit"); + $view_topic_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$u_forum_id&t=$result_topic_id" . (($u_hilit) ? "&hilit=$u_hilit" : '')); $replies = ($auth->acl_get('m_approve', $forum_id)) ? $row['topic_replies_real'] : $row['topic_replies']; @@ -890,7 +890,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) 'U_VIEW_TOPIC' => $view_topic_url, 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id), - 'U_VIEW_POST' => (!empty($row['post_id'])) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=" . $row['topic_id'] . '&p=' . $row['post_id'] . '&hilit=' . $u_hilit) . '#p' . $row['post_id'] : '') + 'U_VIEW_POST' => (!empty($row['post_id'])) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=" . $row['topic_id'] . '&p=' . $row['post_id'] . (($u_hilit) ? '&hilit=' . $u_hilit : '')) . '#p' . $row['post_id'] : '') )); } diff --git a/phpBB/style.php b/phpBB/style.php index b33d473ae7..0ce5460dac 100644 --- a/phpBB/style.php +++ b/phpBB/style.php @@ -46,7 +46,7 @@ if (strspn($sid, 'abcdefABCDEF0123456789') !== strlen($sid)) // happen to have a current session it will output nothing. We will also cache the // resulting CSS data for five minutes ... anything to reduce the load on the SQL // server a little -if ($id && $sid) +if ($id) { if (empty($acm_type) || empty($dbms)) { @@ -101,6 +101,11 @@ if ($id && $sid) $theme = $db->sql_fetchrow($result); $db->sql_freeresult($result); + if (!$theme) + { + exit; + } + if ($user['user_id'] == ANONYMOUS) { $user['user_lang'] = $config['default_lang']; @@ -115,16 +120,11 @@ if ($id && $sid) $result = $db->sql_query($sql, 3600); $img_array = array(); - while ($row = $db->sql_fetchrow($result)) { $img_array[$row['image_name']] = $row; } - - if (!$theme) - { - exit; - } + $db->sql_freeresult($result); // gzip_compression if ($config['gzip_compress']) @@ -191,7 +191,11 @@ if ($id && $sid) $db->sql_query($sql); $cache->destroy('sql', STYLES_THEME_TABLE); + } + // Only set the expire time if the theme changed data is older than 30 minutes - to cope with changes from the ACP + if ($recache || $theme['theme_mtime'] > (time() - 1800)) + { header('Cache-Control: private, no-cache="set-cookie"'); header('Expires: 0'); header('Pragma: no-cache'); diff --git a/phpBB/styles/prosilver/template/custom_profile_fields.html b/phpBB/styles/prosilver/template/custom_profile_fields.html index 81f6daabb4..44c68f532b 100644 --- a/phpBB/styles/prosilver/template/custom_profile_fields.html +++ b/phpBB/styles/prosilver/template/custom_profile_fields.html @@ -14,9 +14,9 @@ - + - checked="checked" /> + checked="checked" /> diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html index fe3d3f33b5..dfcf8a7f38 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -96,8 +96,8 @@

      {L_SIGNATURE}

      - -
      {SIGNATURE}
      + +
      {SIGNATURE}
      diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html index e702dcc48b..65538f5da9 100644 --- a/phpBB/styles/prosilver/template/simple_header.html +++ b/phpBB/styles/prosilver/template/simple_header.html @@ -49,6 +49,11 @@ + + + + + diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index 83cf2581c1..b581fb8e90 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -157,11 +157,13 @@ +
      {L_NO_TOPICS}
      + diff --git a/phpBB/styles/subsilver2/template/viewforum_body.html b/phpBB/styles/subsilver2/template/viewforum_body.html index f2786d4ea1..b4c58834b2 100644 --- a/phpBB/styles/subsilver2/template/viewforum_body.html +++ b/phpBB/styles/subsilver2/template/viewforum_body.html @@ -214,7 +214,7 @@
      {L_NO_TOPICS}{L_NO_TOPICS_TIME_FRAME}{L_NO_TOPICS}{L_NO_TOPICS_TIME_FRAME}
      {L_SUBJECT}:
      {L_MESSAGE_BODY}:
      {L_MESSAGE_BODY_EXPLAIN} 

      From 487ca9229997f0bd1c5ed228cf7dc3a033fce329 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Thu, 16 Aug 2007 12:19:26 +0000 Subject: [PATCH 60/96] - added information about Unicode to coding guidelines - two little changes git-svn-id: file:///svn/phpbb/trunk@8035 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/coding-guidelines.html | 95 ++++++++++++++++++++++++++++--- phpBB/includes/message_parser.php | 2 +- phpBB/includes/utf/utf_tools.php | 4 +- 3 files changed, 91 insertions(+), 10 deletions(-) diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index 14deabf135..d7d40d926e 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -3,7 +3,7 @@ Coding Guidelines - + @@ -215,6 +215,7 @@ p a {
    83. Styling
    84. Templating
      85. +
    85. Character Sets and Encodings
    86. Translation (i18n/L10n) Guidelines
      1. Standardisation
        2. @@ -1558,9 +1559,83 @@ div
        -

        5. Translation (i18n/L10n) Guidelines

        +

        5. Character Sets and Encodings

        - 5.i. Standardisation +
        + +

        What are Unicode, UCS and UTF-8?

        +

        The Universal Character Set (UCS) described in ISO/IEC 10646 consists of a large amount of characters. Each of them has a unique name and a code point which is an integer number. Unicode - which is an industry standard - complements the Universal Character Set with further information about the characters' properties and alternative character encodings. More information on Unicode can be found on the Unicode Consortium's website. One of the Unicode encodings is the 8-bit Unicode Transformation Format (UTF-8). It encodes characters with up to four bytes aiming for maximum compatability with the American Standard Code for Information Interchange which is a 7-bit encoding of a relatively small subset of the UCS.

        + +

        phpBB's use of Unicode

        +

        Unfortunately PHP does not faciliate the use of Unicode prior to version 6. Most functions simply treat strings as sequences of bytes assuming that each character takes up exactly one byte. This behaviour still allows for storing UTF-8 encoded text in PHP strings but many operations on strings have unexpected results. To circumvent this problem we have created some alternative functions to PHP's native string operations which use code points instead of bytes. These functions can be found in /includes/utf/utf_tools.php. They are also covered in the phpBB3 Sourcecode Documentation. A lot of native PHP functions still work with UTF-8 as long as you stick to certain restrictions. For example explode still works as long as the first and the last character of the delimiter string are ASCII characters.

        + +

        phpBB only uses the ASCII and the UTF-8 character encodings. Still all Strings are UTF-8 encoded because ASCII is a subset of UTF-8. The only exceptions to this rule are code sections which deal with external systems which use other encodings and character sets. Such external data should be converted to UTF-8 using the utf8_recode() function supplied with phpBB. It supports a variety of other character sets and encodings, a full list can be found below.

        + +

        With request_var() you can either allow all UCS characters in user input or restrict user input to ASCII characters. This feature is controlled by the function's third parameter called $multibyte. You should allow multibyte characters in posts, PMs, topic titles, forum names, etc. but it's not necessary for internal uses like a $mode variable which should only hold a predefined list of ASCII strings anyway.

        + +
        +// an input string containing a multibyte character
+$_REQUEST['multibyte_string'] = 'Käse';
+
+// print request variable as a UTF-8 string allowing multibyte characters
+echo request_var('multibyte_string', '', true);
+// print request variable as ASCII string
+echo request_var('multibyte_string', '');
+
        + +

        This code snippet will generate the following output:

        + +
        +Käse
+K??se
+
        + +

        Unicode Normalization

        + +

        If you retrieve user input with multibyte characters you should additionally normalize the string using utf8_normalize_nfc() before you work with it. This is necessary to make sure that equal characters can only occur in one particular binary representation. For example the character Å can be represented either as U+00C5 (LATIN CAPITAL LETTER A WITH RING ABOVE) or as U+212B (ANGSTROM SIGN). phpBB uses Normalization Form Canonical Composition (NFC) for all text. So the correct version of the above example would look like this:

        + +
        +$_REQUEST['multibyte_string'] = 'Käse';
+
+echo utf8_normalize_nfc(request_var('multibyte_string', '', true));
+echo request_var('multibyte_string', '');
+
        + +

        Case Folding

        + +

        Case insensitive comparison of strings is no longer possible with strtolower or strtoupper as some characters have multiple lower case or multiple upper case forms depending on their position in a word. So instead you should use case folding which gives you a case insensitive version of the string which can be used for case insensitive comparisons. An NFC normalized string can be case folded using utf8_case_fold_nfc().

        + +

        // Bad - The strings might be the same even if strtolower differs

        + +
        +if (strtolower($string1) == strtolower($string2))
+{
+	echo '$string1 and $string2 are equal or differ in case';
+}
+
        + +

        // Good - Case folding is really case insensitive

        + +
        +if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
+{
+	echo '$string1 and $string2 are equal or differ in case';
+}
+
        + +

        Confusables Detection

        + +

        phpBB offers a special method utf8_clean_string which can be used to make sure string identifiers are unique. This method uses Normalization Form Compatibility Composition (NFKC) instead of NFC and replaces similarly looking characters with a particular representative of the equivalence class. This method is currently used for usernames and group names to avoid confusion with similarly looking names.

        + +
        +Top +

        + +
        + +

        6. Translation (i18n/L10n) Guidelines

        + + 6.i. Standardisation

        @@ -1854,7 +1929,7 @@ div Top

        - 5.ii. Other considerations + 6.ii. Other considerations

        @@ -2118,7 +2193,7 @@ div Top

        - 5.iii. Writing Style + 6.iii. Writing Style

        @@ -2229,13 +2304,19 @@ div
        -

        6. Guidelines Changelog

        +

        7. Guidelines Changelog

        +

        Revision 1.24

        + + +

        Revision 1.16

        Revision 1.11-1.15

        diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index fda31a20e3..c2d40670af 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1371,7 +1371,7 @@ class parse_message extends bbcode_firstpass include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx); $index = array_keys(request_var('delete_file', array(0 => 0))); - $index = (!empty($index[0])) ? $index[0] : false; + $index = (!empty($index)) ? $index[0] : false; if ($index !== false && !empty($this->attachment_data[$index])) { diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php index f8156fb8d2..a3499062fe 100644 --- a/phpBB/includes/utf/utf_tools.php +++ b/phpBB/includes/utf/utf_tools.php @@ -908,8 +908,8 @@ function utf8_recode($string, $encoding) } // Trigger an error?! Fow now just give bad data :-( - //trigger_error('Unknown encoding: ' . $encoding, E_USER_ERROR); - return $string; + trigger_error('Unknown encoding: ' . $encoding, E_USER_ERROR); + //return $string; // use utf_normalizer::cleanup() ? } /** From da55886024b41d67d12efbe2efbdbddb05434754 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Thu, 16 Aug 2007 13:48:29 +0000 Subject: [PATCH 61/96] - added info on utf8_strtolower/upper git-svn-id: file:///svn/phpbb/trunk@8036 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/coding-guidelines.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index d7d40d926e..11d4dd2940 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -1603,7 +1603,7 @@ echo request_var('multibyte_string', '');

        Case Folding

        -

        Case insensitive comparison of strings is no longer possible with strtolower or strtoupper as some characters have multiple lower case or multiple upper case forms depending on their position in a word. So instead you should use case folding which gives you a case insensitive version of the string which can be used for case insensitive comparisons. An NFC normalized string can be case folded using utf8_case_fold_nfc().

        +

        Case insensitive comparison of strings is no longer possible with strtolower or strtoupper as some characters have multiple lower case or multiple upper case forms depending on their position in a word. The utf8_strtolower and the utf8_strtoupper functions suffer from the same problem so they can only be used to display upper/lower case versions of a string but they cannot be used for case insensitive comparisons either. So instead you should use case folding which gives you a case insensitive version of the string which can be used for case insensitive comparisons. An NFC normalized string can be case folded using utf8_case_fold_nfc().

        // Bad - The strings might be the same even if strtolower differs

        From 0a7abb6b374d06524301e5a276983d1db5b17848 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Thu, 16 Aug 2007 13:50:20 +0000 Subject: [PATCH 62/96] - added a comment on normalization git-svn-id: file:///svn/phpbb/trunk@8037 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/coding-guidelines.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index 11d4dd2940..66c0a08d8b 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -1597,7 +1597,9 @@ K??se 
         $_REQUEST['multibyte_string'] = 'Käse';
 
+// normalize multibyte strings
 echo utf8_normalize_nfc(request_var('multibyte_string', '', true));
+// ASCII strings do not need to be normalized
 echo request_var('multibyte_string', '');
        From 521dfdbb059b330e34d11e0fbfa96fbf831d1d20 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Thu, 16 Aug 2007 15:38:13 +0000 Subject: [PATCH 63/96] increase the odbc limit (64k is too low, the theme data itself is >64k) git-svn-id: file:///svn/phpbb/trunk@8038 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/coding-guidelines.html | 2 ++ phpBB/includes/db/mssql_odbc.php | 23 ++++++++++++++++++++++- phpBB/install/index.php | 5 +++-- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index 66c0a08d8b..1efeadb111 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -345,6 +345,7 @@ class ...
      2. /includes/db/sqlite.php
        Sqlite Database Abstraction Layer
        3. +
      3. diff
        /includes/diff
        Diff Engine
      4. docs
        /docs
        phpBB Documentation
      5. images
        /images
        All global images not connected to styles
      6. install
        /install
        Installation System
        7. @@ -353,6 +354,7 @@ class ...
      7. VC
        /includes/captcha
        CAPTCHA
      8. mcp
        mcp.php, /includes/mcp, report.php
        Moderator Control Panel
      9. ucp
        ucp.php, /includes/ucp
        User Control Panel
        10. +
      10. utf
        /includes/utf
        UTF8-related functions/classes
      11. search
        /includes/search, search.php
        Search System
      12. styles
        /styles, style.php
        phpBB Styles/Templates/Themes/Imagesets
        13. diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php index 290142103f..d3014f0e13 100644 --- a/phpBB/includes/db/mssql_odbc.php +++ b/phpBB/includes/db/mssql_odbc.php @@ -43,7 +43,28 @@ class dbal_mssql_odbc extends dbal $this->server = $sqlserver . (($port) ? ':' . $port : ''); $this->dbname = $database; - @ini_set('odbc.defaultlrl', 65536); + $max_size = @ini_get('odbc.defaultlrl'); + if (!empty($max_size)) + { + $unit = strtolower(substr($max_size, -1, 1)); + $max_size = (int) $max_size; + + if ($unit == 'k') + { + $max_size = floor($max_size / 1024); + } + else if ($unit == 'g') + { + $max_size *= 1024; + } + else if (is_numeric($unit)) + { + $max_size = floor((int) ($max_size . $unit) / 1048576); + } + $max_size = max(8, $max_size) . 'M'; + + @ini_set('odbc.defaultlrl', $max_size); + } $this->db_connect_id = ($this->persistency) ? @odbc_pconnect($this->server, $this->user, $sqlpassword) : @odbc_connect($this->server, $this->user, $sqlpassword); diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 7b0f120577..56da3590ff 100755 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -109,9 +109,10 @@ if (!empty($mem_limit)) { $unit = strtolower(substr($mem_limit, -1, 1)); $mem_limit = (int) $mem_limit; + if ($unit == 'k') { - $mem_limit = floor($mem_limit/1024); + $mem_limit = floor($mem_limit / 1024); } else if ($unit == 'g') { @@ -119,7 +120,7 @@ if (!empty($mem_limit)) } else if (is_numeric($unit)) { - $mem_limit = floor($mem_limit/1048576); + $mem_limit = floor((int) ($mem_limit . $unit) / 1048576); } $mem_limit = max(128, $mem_limit) . 'M'; } From c09bd8c69f6acc30f581a6cd9136c7c3a7d8f8aa Mon Sep 17 00:00:00 2001 From: David M Date: Thu, 16 Aug 2007 19:24:32 +0000 Subject: [PATCH 64/96] #14132 git-svn-id: file:///svn/phpbb/trunk@8039 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/message_parser.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index c2d40670af..65ffee8dd0 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -426,10 +426,10 @@ class bbcode_firstpass extends bbcode } $code = preg_replace('#^(.*)#s', '$2', $code); - $code = preg_replace('#(?:[\n\r\s\t]| )*$#u', '', $code); + $code = preg_replace('#(?:\s++| )*+$#u', '', $code); // remove newline at the end - if (!empty($code) && $code[strlen($code) - 1] == "\n") + if (!empty($code) && substr($code, -1) == "\n") { $code = substr($code, 0, -1); } @@ -1565,7 +1565,7 @@ class parse_message extends bbcode_firstpass $poll['poll_option_text'] = $this->parse($poll['enable_bbcode'], ($config['allow_post_links']) ? $poll['enable_urls'] : false, $poll['enable_smilies'], $poll['img_status'], false, false, $config['allow_post_links'], false); - $this->bbcode_bitfield = base64_encode(base64_decode($bbcode_bitfield) | base64_decode($this->bbcode_bitfield)); + $bbcode_bitfield = base64_encode(base64_decode($bbcode_bitfield) | base64_decode($this->bbcode_bitfield)); $this->message = $tmp_message; // Parse Poll Title From 021fec01b291e37a1ddec27628522c62f6a86521 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Fri, 17 Aug 2007 12:32:41 +0000 Subject: [PATCH 65/96] - IE6 is not able to correctly cope with gzip compression - hopefully fixed the rtl icon issue in FF without breaking ltr display. git-svn-id: file:///svn/phpbb/trunk@8040 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 2 + phpBB/style.php | 5 ++- .../prosilver/template/overall_header.html | 39 +++++++++---------- phpBB/styles/prosilver/theme/bidi.css | 24 ++++++++++++ phpBB/styles/prosilver/theme/buttons.css | 2 +- phpBB/styles/prosilver/theme/common.css | 16 +++++++- 6 files changed, 65 insertions(+), 23 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 3dcb7057e1..3b82d57c1e 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -222,6 +222,8 @@ p a {
      13. [Fix] If sending PM's to groups only include activated member (Bug #14040)
      14. [Fix] Correctly wrap words in emails containing utf8 characters (Bug #14109)
      15. [Change] For new posts or editing the first post topic titles have a maxlength of 60 characters. For any subsequent posts the length is extended to 64 to make room for the Re: part, but cutting at 60 characters. The maxlength need to be 64, else users using opera are unable to post (opera does not allow pre-filling a field with more characters than specified within the maxlength attribute)
        16. +
      16. [Fix] Disable gzip compression for cached stylesheet for Internet Explorer 6 or empty browser (IE6 is not able to properly display the compressed stylesheet) (Bug #14054)
        17. +
      17. [Fix] Header icons fixed in FF for RTL languages (Bug #14084)
        18. diff --git a/phpBB/style.php b/phpBB/style.php index 0ce5460dac..c82ff764b3 100644 --- a/phpBB/style.php +++ b/phpBB/style.php @@ -129,7 +129,10 @@ if ($id) // gzip_compression if ($config['gzip_compress']) { - if (@extension_loaded('zlib') && !headers_sent()) + // IE6 is not able to compress the style (do not ask us why!) + $browser = (!empty($_SERVER['HTTP_USER_AGENT'])) ? strtolower(htmlspecialchars((string) $_SERVER['HTTP_USER_AGENT'])) : ''; + + if ($browser && strpos($browser, 'msie 6.0') === false && @extension_loaded('zlib') && !headers_sent()) { ob_start('ob_gzhandler'); } diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 7b578d2c1d..202b50fe5d 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -124,7 +124,7 @@
        -
        diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index 17c0baf006..f54f0fc3ba 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -13,6 +13,11 @@ text-align: left; } +.rtl div.rules ul { + margin-left: 0; + margin-right: 20px; +} + /* Main blocks ---------------------------------------- */ .rtl #logo { @@ -67,6 +72,24 @@ text-align: left; } +.rtl ul.leftside li, .rtl ul.rightside li { + float: left; +} + +.rtl ul.leftside { + float: right; + margin-left: 5px; + margin-right: 0; + text-align: right; +} + +.rtl ul.rightside { + float: left; + margin-left: -5px; + margin-right: 5px; + text-align: left; +} + /* Table styles ----------------------------------------*/ .rtl table.table1 thead th { @@ -445,6 +468,7 @@ .rtl .sitehome, .rtl .icon-faq, .rtl .icon-members, .rtl .icon-home, .rtl .icon-ucp, .rtl .icon-register, .rtl .icon-logout, .rtl .icon-bookmark, .rtl .icon-bump, .rtl .icon-subscribe, .rtl .icon-unsubscribe, .rtl .icon-pages, .rtl .icon-search { background-position: 100% 50%; + padding: 0 17px 0 0; } /* Poster profile icons diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index 6d07dd3511..662b588d30 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -84,7 +84,7 @@ a.fontsize:hover { background-position: 0 50%; background-repeat: no-repeat; background-image: none; - padding: 1px 0 0 17px; + padding: 0 0 0 17px; } /* Poster profile icons diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 9ba258b7df..0a2f418aa8 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -326,6 +326,20 @@ ul.navlinks { font-weight: bold; } +ul.leftside { + float: left; + margin-left: 0; + margin-right: 5px; + text-align: left; +} + +ul.rightside { + float: right; + margin-left: 5px; + margin-right: -5px; + text-align: right; +} + /* Table styles ----------------------------------------*/ table.table1 { @@ -584,7 +598,7 @@ div.rules { font-size: 1.1em; } -div.rules li { +div.rules ul { margin-left: 20px; } From aecc7c91787abc8b61326f2f6460aeed9f372b52 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Fri, 17 Aug 2007 16:02:21 +0000 Subject: [PATCH 66/96] oki doki git-svn-id: file:///svn/phpbb/trunk@8041 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/install/data/new_normalizer.php | 2 +- phpBB/install/database_update.php | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/phpBB/install/data/new_normalizer.php b/phpBB/install/data/new_normalizer.php index a050520690..bd9920f5cd 100644 --- a/phpBB/install/data/new_normalizer.php +++ b/phpBB/install/data/new_normalizer.php @@ -174,7 +174,7 @@ class utf_new_normalizer include($phpbb_root_path . 'includes/utf/data/utf_canonical_comp.' . $phpEx); } - return utf_normalizer::recompose($str, $pos, $len, &$qc, &$decomp_map); + return utf_normalizer::recompose($str, $pos, $len, $qc, $decomp_map); } } diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 59a6a21689..5179979f5f 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -510,7 +510,7 @@ while ($row = $db->sql_fetchrow($result)) $db->sql_freeresult($result); echo $lang['PREVIOUS_VERSION'] . ' :: ' . $config['version'] . '
        '; -echo $lang['UPDATED_VERSION'] . ' :: ' . $updates_to_version . ''; +echo $lang['UPDATED_VERSION'] . ' :: ' . $updates_to_version . '

        '; $current_version = str_replace('rc', 'RC', strtolower($config['version'])); $latest_version = str_replace('rc', 'RC', strtolower($updates_to_version)); @@ -554,7 +554,7 @@ if (version_compare($current_version, '3.0.RC4', '<=')) )); } ?> -



        +

        @@ -767,6 +767,8 @@ if (version_compare($current_version, '3.0.RC4', '<=')) } $db->sql_freeresult($result); + _write_result(false, $errored, $error_ary); + // now retrieve all information about the users and let the admin decide what to do if (sizeof($colliding_users)) { @@ -822,7 +824,7 @@ if (version_compare($current_version, '3.0.RC4', '<=')) // for the admin: keep name, change name (with text input) or delete user $u_action = "database_update.$phpEx?language=$language&type=$inline_update"; ?> -



        +

        @@ -984,8 +986,6 @@ if ($exit) exit; } -_write_result(false, $errored, $error_ary); - // Schema updates ?>

        @@ -1583,8 +1583,6 @@ add_log('admin', 'LOG_UPDATE_DATABASE', $orig_version, $updates_to_version); // Now we purge the session table as well as all cache files $cache->purge(); -exit; - ?>
        @@ -1604,6 +1602,9 @@ exit; Date: Fri, 17 Aug 2007 20:47:50 +0000 Subject: [PATCH 67/96] test adding isset() calls to if expressions. :o git-svn-id: file:///svn/phpbb/trunk@8042 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions_template.php | 65 ++++++++++++++++++++++++--- 1 file changed, 59 insertions(+), 6 deletions(-) diff --git a/phpBB/includes/functions_template.php b/phpBB/includes/functions_template.php index 0d8a39eaee..5becb2458b 100644 --- a/phpBB/includes/functions_template.php +++ b/phpBB/includes/functions_template.php @@ -526,7 +526,60 @@ class template_compile } } - return (($elseif) ? '} else if (' : 'if (') . (implode(' ', $tokens) . ') { '); + // Try to combine some tokens... + $new_tokens = array(); + $j = 0; + + for ($i = 0, $size = sizeof($tokens); $i < $size; $i++) + { + $token = &$tokens[$i]; + + if ($token != '&&' && $token != '||') + { + $new_tokens[$j][] = $token; + continue; + } + + $this->_merge_tokens(' ', $new_tokens[$j]); + $new_tokens[$j++] .= $token; + } + + if (!sizeof($new_tokens)) + { + $new_tokens[$j] = &$tokens; + } + + if (isset($new_tokens[$j]) && is_array($new_tokens[$j])) + { + $this->_merge_tokens('', $new_tokens[$j]); + } + + return (($elseif) ? '} else if (' : 'if (') . (implode(' ', $new_tokens) . ') { '); + } + + /** + * Merge tokens from IF expression, correctly adding isset() calls. + * @access private + */ + function _merge_tokens($suffix, &$tokens) + { + for ($i = 0, $size = sizeof($tokens); $i < $size; $i++) + { + $token = &$tokens[$i]; + + if (strpos($token, '$this') === 0) + { + $token = '(isset(' . $token . ') && ' . $token; + $suffix = ')' . $suffix; + } + else if (strpos($token, 'sizeof(') === 0) + { + $token = '(isset(' . substr($token, 7, -1) . ') && ' . $token; + $suffix = ')' . $suffix; + } + } + + $tokens = implode(' ', $tokens) . $suffix; } /** @@ -627,11 +680,11 @@ class template_compile { $expr_end++; $expr_arg = $tokens[$expr_end++]; - $expr = "!(($is_arg / $expr_arg) % $expr_arg)"; + $expr = "!(isset($is_arg) && ($is_arg / $expr_arg) % $expr_arg)"; } else { - $expr = "!($is_arg & 1)"; + $expr = "!(isset($is_arg) && $is_arg & 1)"; } break; @@ -640,11 +693,11 @@ class template_compile { $expr_end++; $expr_arg = $tokens[$expr_end++]; - $expr = "(($is_arg / $expr_arg) % $expr_arg)"; + $expr = "(isset($is_arg) && ($is_arg / $expr_arg) % $expr_arg)"; } else { - $expr = "($is_arg & 1)"; + $expr = "(isset($is_arg) && $is_arg & 1)"; } break; @@ -653,7 +706,7 @@ class template_compile { $expr_end++; $expr_arg = $tokens[$expr_end++]; - $expr = "!($is_arg % $expr_arg)"; + $expr = "!(isset($is_arg) && $is_arg % $expr_arg)"; } break; } From 6b75e8ffcb805c9b7827ed4ecd70fbccf012a27b Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Fri, 17 Aug 2007 21:10:21 +0000 Subject: [PATCH 68/96] ok, we are not able to cover all possibilities (IF A eq (B & C)) for example... or IF A == B... this would require a lot more code we do not see the need for. git-svn-id: file:///svn/phpbb/trunk@8043 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions_template.php | 55 +-------------------------- 1 file changed, 1 insertion(+), 54 deletions(-) diff --git a/phpBB/includes/functions_template.php b/phpBB/includes/functions_template.php index 5becb2458b..ba3b1ab106 100644 --- a/phpBB/includes/functions_template.php +++ b/phpBB/includes/functions_template.php @@ -526,60 +526,7 @@ class template_compile } } - // Try to combine some tokens... - $new_tokens = array(); - $j = 0; - - for ($i = 0, $size = sizeof($tokens); $i < $size; $i++) - { - $token = &$tokens[$i]; - - if ($token != '&&' && $token != '||') - { - $new_tokens[$j][] = $token; - continue; - } - - $this->_merge_tokens(' ', $new_tokens[$j]); - $new_tokens[$j++] .= $token; - } - - if (!sizeof($new_tokens)) - { - $new_tokens[$j] = &$tokens; - } - - if (isset($new_tokens[$j]) && is_array($new_tokens[$j])) - { - $this->_merge_tokens('', $new_tokens[$j]); - } - - return (($elseif) ? '} else if (' : 'if (') . (implode(' ', $new_tokens) . ') { '); - } - - /** - * Merge tokens from IF expression, correctly adding isset() calls. - * @access private - */ - function _merge_tokens($suffix, &$tokens) - { - for ($i = 0, $size = sizeof($tokens); $i < $size; $i++) - { - $token = &$tokens[$i]; - - if (strpos($token, '$this') === 0) - { - $token = '(isset(' . $token . ') && ' . $token; - $suffix = ')' . $suffix; - } - else if (strpos($token, 'sizeof(') === 0) - { - $token = '(isset(' . substr($token, 7, -1) . ') && ' . $token; - $suffix = ')' . $suffix; - } - } - - $tokens = implode(' ', $tokens) . $suffix; + return (($elseif) ? '} else if (' : 'if (') . (implode(' ', $tokens) . ') { '); } /** From 8257d1c82809165608b33268a561b53fd78675a4 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Fri, 17 Aug 2007 21:29:20 +0000 Subject: [PATCH 69/96] ok, the nasty one then... :/ git-svn-id: file:///svn/phpbb/trunk@8044 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions_template.php | 10 +++++----- phpBB/includes/template.php | 8 ++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/phpBB/includes/functions_template.php b/phpBB/includes/functions_template.php index ba3b1ab106..0d8a39eaee 100644 --- a/phpBB/includes/functions_template.php +++ b/phpBB/includes/functions_template.php @@ -627,11 +627,11 @@ class template_compile { $expr_end++; $expr_arg = $tokens[$expr_end++]; - $expr = "!(isset($is_arg) && ($is_arg / $expr_arg) % $expr_arg)"; + $expr = "!(($is_arg / $expr_arg) % $expr_arg)"; } else { - $expr = "!(isset($is_arg) && $is_arg & 1)"; + $expr = "!($is_arg & 1)"; } break; @@ -640,11 +640,11 @@ class template_compile { $expr_end++; $expr_arg = $tokens[$expr_end++]; - $expr = "(isset($is_arg) && ($is_arg / $expr_arg) % $expr_arg)"; + $expr = "(($is_arg / $expr_arg) % $expr_arg)"; } else { - $expr = "(isset($is_arg) && $is_arg & 1)"; + $expr = "($is_arg & 1)"; } break; @@ -653,7 +653,7 @@ class template_compile { $expr_end++; $expr_arg = $tokens[$expr_end++]; - $expr = "!(isset($is_arg) && $is_arg % $expr_arg)"; + $expr = "!($is_arg % $expr_arg)"; } break; } diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php index f8db087d48..b13dbaa99a 100644 --- a/phpBB/includes/template.php +++ b/phpBB/includes/template.php @@ -149,6 +149,14 @@ class template { global $user; + if (defined('IN_ERROR_HANDLER')) + { + if ((E_NOTICE & error_reporting()) == E_NOTICE) + { + error_reporting(error_reporting() ^ E_NOTICE); + } + } + if ($filename = $this->_tpl_load($handle)) { ($include_once) ? include_once($filename) : include($filename); From d25ca29ca032d73ab1824179c86e6a08ddaba1f4 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Fri, 17 Aug 2007 23:53:06 +0000 Subject: [PATCH 70/96] - strip_bbcode should not treat smilies which look like BBCode and are placed in front of a closing tag as BBCode - highlight in post subjects and topic titles - language entry SMILIE_ONE_ADDED should have been SMILIES_ONE_ADDED git-svn-id: file:///svn/phpbb/trunk@8045 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions.php | 4 +++- phpBB/language/en/acp/posting.php | 8 ++++---- phpBB/search.php | 3 +++ phpBB/viewtopic.php | 7 ++++--- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index ea8b45116a..ab30aba48d 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2527,7 +2527,7 @@ function strip_bbcode(&$text, $uid = '') $uid = '[0-9a-z]{5,}'; } - $text = preg_replace("#\[\/?[a-z0-9\*\+\-]+(?:=.*?)?(?::[a-z])?(\:?$uid)\]#", ' ', $text); + $text = preg_replace("#\[\/?[a-z0-9\*\+\-]+(?:=(?:".*"|[^\]]*))?(?::[a-z])?(\:$uid)\]#", ' ', $text); $match = get_preg_expression('bbcode_htm'); $replace = array('\1', '\1', '\2', '\1', '', ''); @@ -3689,6 +3689,8 @@ function msg_handler($errno, $msg_text, $errfile, $errline) { return; } + static $counter = 0; + $counter++; //echo ""; var_dump($counter); echo ""; if (strpos($errfile, 'cache') === false && strpos($errfile, 'template.') === false) { diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index 87301a3b49..ebbbf61c44 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -109,12 +109,12 @@ $lang = array_merge($lang, array( 'ICONS_ADD' => 'Add a new icon', 'ICON_NONE_ADDED' => 'No icons were added.', - 'ICONS_ONE_ADDED' => 'The icon has been added successfully.', + 'ICONS_ONE_ADDED' => 'The icon has been added successfully.', 'ICONS_ADDED' => 'The icons have been added successfully.', 'ICONS_CONFIG' => 'Icon configuration', 'ICONS_DELETED' => 'The icon has been removed successfully.', 'ICONS_EDIT' => 'Edit icon', - 'ICONS_ONE_EDITED' => 'The icon has been updated successfully.', + 'ICONS_ONE_EDITED' => 'The icon has been updated successfully.', 'ICON_NONE_EDITED' => 'No icons were updated.', 'ICONS_EDITED' => 'The icons have been updated successfully.', 'ICONS_HEIGHT' => 'Icon height', @@ -148,8 +148,8 @@ $lang = array_merge($lang, array( 'SELECT_PACKAGE' => 'Select a package file', 'SMILIES_ADD' => 'Add a new smiley', - 'SMILIES_NONE_ADDED' => 'No smilies were added.', - 'SMILIE_ONE_ADDED' => 'The smiley has been added successfully.', + 'SMILIES_NONE_ADDED' => 'No smilies were added.', + 'SMILIES_ONE_ADDED' => 'The smiley has been added successfully.', 'SMILIES_ADDED' => 'The smilies have been added successfully.', 'SMILIES_CODE' => 'Smiley code', 'SMILIES_CONFIG' => 'Smiley configuration', diff --git a/phpBB/search.php b/phpBB/search.php index 89403c8893..9a50ce2fcb 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -776,6 +776,8 @@ if ($keywords || $author || $author_id || $search_id || $submit) $posts_unapproved = ($row['topic_approved'] && $row['topic_replies'] < $row['topic_replies_real'] && $auth->acl_get('m_approve', $forum_id)) ? true : false; $u_mcp_queue = ($topic_unapproved || $posts_unapproved) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . "&t=$result_topic_id", true, $user->session_id) : ''; + $row['topic_title'] = preg_replace('#(?!<.*)(?]*(?:)#is', '$1', $row['topic_title']); + $tpl_ary = array( 'TOPIC_AUTHOR' => get_username_string('username', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), 'TOPIC_AUTHOR_COLOUR' => get_username_string('colour', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), @@ -864,6 +866,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) { // post highlighting $row['post_text'] = preg_replace('#(?!<.*)(?]*(?:)#is', '$1', $row['post_text']); + $row['post_subject'] = preg_replace('#(?!<.*)(?]*(?:)#is', '$1', $row['post_subject']); } $tpl_ary = array( diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 1e1788db53..a99279c642 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1252,15 +1252,16 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) parse_attachments($forum_id, $message, $attachments[$row['post_id']], $update_count); } + // Replace naughty words such as farty pants + $row['post_subject'] = censor_text($row['post_subject']); + // Highlight active words (primarily for search) if ($highlight_match) { $message = preg_replace('#(?!<.*)(?]*(?:)#is', '\1', $message); + $row['post_subject'] = preg_replace('#(?!<.*)(?]*(?:)#is', '\1', $row['post_subject']); } - // Replace naughty words such as farty pants - $row['post_subject'] = censor_text($row['post_subject']); - // Editing information if (($row['post_edit_count'] && $config['display_last_edited']) || $row['post_edit_reason']) { From 6f6e3bba7e0da983708e97e36e2d7a57a012e44e Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Fri, 17 Aug 2007 23:57:14 +0000 Subject: [PATCH 71/96] - strip_bbcode should not treat smilies which look like BBCode and are placed in front of a closing tag as BBCode [Bug #14030] - highlight in post subjects and topic titles [Bug #13383] - language entry SMILIE_ONE_ADDED should have been SMILIES_ONE_ADDED git-svn-id: file:///svn/phpbb/trunk@8046 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 3b82d57c1e..ee0e2ec46e 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -224,6 +224,8 @@ p a {
      18. [Change] For new posts or editing the first post topic titles have a maxlength of 60 characters. For any subsequent posts the length is extended to 64 to make room for the Re: part, but cutting at 60 characters. The maxlength need to be 64, else users using opera are unable to post (opera does not allow pre-filling a field with more characters than specified within the maxlength attribute)
      19. [Fix] Disable gzip compression for cached stylesheet for Internet Explorer 6 or empty browser (IE6 is not able to properly display the compressed stylesheet) (Bug #14054)
      20. [Fix] Header icons fixed in FF for RTL languages (Bug #14084)
        21. +
      21. [Change] Words in topic titles and post subjects are highlighted on the search results page and viewtopic too now (Bug #13383)
        22. +
      22. [Fix] Made sure strip_bbcode cannot get the idea that a smiley is a BBCode (Bug #14030)
        23. From 979ee667735b091db9158d05fde8b0d337cc902b Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sat, 18 Aug 2007 13:52:33 +0000 Subject: [PATCH 72/96] - allow multibyte search configuration - added ldap_user_filter to add additional restrictions on the user objects used for authentication [Bug #12627] - improved ldap explanations a bit - display searchable subforums of invisible parents in advanced search forum selection [Bug #11395] git-svn-id: file:///svn/phpbb/trunk@8047 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/index.php | 2 +- phpBB/docs/CHANGELOG.html | 2 ++ phpBB/includes/acp/acp_search.php | 2 +- phpBB/includes/auth/auth_ldap.php | 45 +++++++++++++++++++++++-------- phpBB/install/database_update.php | 1 + phpBB/language/en/acp/board.php | 10 ++++--- phpBB/search.php | 8 +++--- 7 files changed, 49 insertions(+), 21 deletions(-) diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index f99a2f8a73..b8b83a439e 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -477,7 +477,7 @@ function validate_config_vars($config_vars, &$cfg_array, &$error) $cfg_array[$config_name] = trim($cfg_array[$config_name]); // Make sure no NUL byte is present... - if (strpos($cfg_array[$config_name], '\0') !== false || strpos($cfg_array[$config_name], '%00') !== false) + if (strpos($cfg_array[$config_name], "\0") !== false || strpos($cfg_array[$config_name], '%00') !== false) { $cfg_array[$config_name] = ''; break; diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index ee0e2ec46e..26c54d18d4 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -226,6 +226,8 @@ p a {
      23. [Fix] Header icons fixed in FF for RTL languages (Bug #14084)
      24. [Change] Words in topic titles and post subjects are highlighted on the search results page and viewtopic too now (Bug #13383)
      25. [Fix] Made sure strip_bbcode cannot get the idea that a smiley is a BBCode (Bug #14030)
        26. +
      26. [Change] Added a filter for user objects to LDAP configuration and improved explanations (Bug #12627)
        27. +
      27. [Fix] Display searchable subforums of invisible parents in advanced search forum selection (Bug #11395)
        28. diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php index 27c3157723..f8d4f1f80d 100644 --- a/phpBB/includes/acp/acp_search.php +++ b/phpBB/includes/acp/acp_search.php @@ -92,7 +92,7 @@ class acp_search unset($search); unset($error); - $cfg_array = (isset($_REQUEST['config'])) ? request_var('config', array('' => '')) : array(); + $cfg_array = (isset($_REQUEST['config'])) ? request_var('config', array('' => ''), true) : array(); $updated = request_var('updated', false); foreach ($settings as $config_name => $var_type) diff --git a/phpBB/includes/auth/auth_ldap.php b/phpBB/includes/auth/auth_ldap.php index ff6ff3edd1..1e90aebe7e 100644 --- a/phpBB/includes/auth/auth_ldap.php +++ b/phpBB/includes/auth/auth_ldap.php @@ -46,7 +46,7 @@ function init_ldap() $search = @ldap_search( $ldap, $config['ldap_base_dn'], - '(' . $config['ldap_uid'] . '=' . ldap_escape(htmlspecialchars_decode($user->data['username'])) . ')', + ldap_user_filter($user->data['username']), (empty($config['ldap_email'])) ? array($config['ldap_uid']) : array($config['ldap_uid'], $config['ldap_email']), 0, 1 @@ -114,7 +114,7 @@ function login_ldap(&$username, &$password) $search = @ldap_search( $ldap, $config['ldap_base_dn'], - '(' . $config['ldap_uid'] . '=' . ldap_escape(htmlspecialchars_decode($username)) . ')', + ldap_user_filter($username), (empty($config['ldap_email'])) ? array($config['ldap_uid']) : array($config['ldap_uid'], $config['ldap_email']), 0, 1 @@ -215,6 +215,25 @@ function login_ldap(&$username, &$password) ); } +/** +* Generates a filter string for ldap_search to find a user +* +* @param $username string Username identifying the searched user +* +* @return string A filter string for ldap_search +*/ +function ldap_user_filter($username) +{ + global $config; + + $filter = '(' . $config['ldap_uid'] . '=' . ldap_escape(htmlspecialchars_decode($username)) . ')'; + if ($config['ldap_user_filter']) + { + $filter = "(&$filter({$config['ldap_user_filter']}))"; + } + return $filter; +} + /** * Escapes an LDAP AttributeValue */ @@ -237,14 +256,6 @@ function acp_ldap(&$new)

        ' . $user->lang['LDAP_SERVER_EXPLAIN'] . '
        -
        -

        ' . $user->lang['LDAP_USER_EXPLAIN'] . '
        -
        -
        -
        -

        ' . $user->lang['LDAP_PASSWORD_EXPLAIN'] . '
        -
        -

        ' . $user->lang['LDAP_DN_EXPLAIN'] . '
        @@ -253,16 +264,28 @@ function acp_ldap(&$new)

        ' . $user->lang['LDAP_UID_EXPLAIN'] . '
        +
        +

        ' . $user->lang['LDAP_USER_FILTER_EXPLAIN'] . '
        +
        +

        ' . $user->lang['LDAP_EMAIL_EXPLAIN'] . '
        +
        +

        ' . $user->lang['LDAP_USER_EXPLAIN'] . '
        +
        +
        +
        +

        ' . $user->lang['LDAP_PASSWORD_EXPLAIN'] . '
        +
        +
        '; // These are fields required in the config table return array( 'tpl' => $tpl, - 'config' => array('ldap_server', 'ldap_user', 'ldap_password', 'ldap_base_dn', 'ldap_uid', 'ldap_email') + 'config' => array('ldap_server', 'ldap_base_dn', 'ldap_uid', 'ldap_user_filter', 'ldap_email', 'ldap_user', 'ldap_password') ); } diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 5179979f5f..393d1d3082 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1496,6 +1496,7 @@ if (version_compare($current_version, '3.0.RC4', '<=')) // Setting this here again because new installations may not have it... set_config('cron_lock', '0', true); + set_config('ldap_user_filter', ''); $no_updates = false; } diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index af88b47db5..8c1f502b09 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -304,13 +304,15 @@ $lang = array_merge($lang, array( 'LDAP_NO_EMAIL' => 'The specified e-mail attribute does not exist.', 'LDAP_NO_IDENTITY' => 'Could not find a login identity for %s.', 'LDAP_PASSWORD' => 'LDAP password', - 'LDAP_PASSWORD_EXPLAIN' => 'Leave blank to use anonymous access. Else fill in the password for the above user. WARNING: This password will be stored as plain text in the database visible to everybody who can access your database.', + 'LDAP_PASSWORD_EXPLAIN' => 'Leave blank to use anonymous binding. Else fill in the password for the above user. Required for Active Directory Servers. WARNING: This password will be stored as plain text in the database visible to everybody who can access your database or who can view this configuration page.', 'LDAP_SERVER' => 'LDAP server name', - 'LDAP_SERVER_EXPLAIN' => 'If using LDAP this is the name or IP address of the server.', + 'LDAP_SERVER_EXPLAIN' => 'If using LDAP this is the hostname or IP address of the LDAP server. Alternatively you can specify an URL like ldap://hostname:port/', 'LDAP_UID' => 'LDAP uid', 'LDAP_UID_EXPLAIN' => 'This is the key under which to search for a given login identity, e.g. uid, sn, etc.', - 'LDAP_USER' => 'LDAP user', - 'LDAP_USER_EXPLAIN' => 'Leave blank to use anonymous access. If filled in phpBB will connect to the LDAP server as the specified user.', + 'LDAP_USER' => 'LDAP user dn', + 'LDAP_USER_EXPLAIN' => 'Leave blank to use anonymous binding. If filled in phpBB uses the specified distinguished name on login attempts to find the correct user, e.g. uid=Username,ou=MyUnit,o=MyCompany,c=US. Required for Active Directory Servers.', + 'LDAP_USER_FILTER' => 'LDAP user filter', + 'LDAP_USER_FILTER_EXPLAIN' => 'Optionally you can further limit the searched objects with additional filters. For example objectClass=posixGroup would result in the use of (&(uid=$username)(objectClass=posixGroup))', )); // Server Settings diff --git a/phpBB/search.php b/phpBB/search.php index 9a50ce2fcb..d9010b73a8 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -939,9 +939,9 @@ while ($row = $db->sql_fetchrow($result)) continue; } - if (!$auth->acl_get('f_list', $row['forum_id']) || $row['forum_type'] == FORUM_LINK || ($row['forum_password'] && !$row['user_id'])) + if ($row['forum_type'] == FORUM_LINK || ($row['forum_password'] && !$row['user_id'])) { - // if the user does not have permissions to list this forum skip to the next branch + // if this forum is a link or password protected (user has not entered the password yet) then skip to the next branch continue; } @@ -964,9 +964,9 @@ while ($row = $db->sql_fetchrow($result)) $right = $row['right_id']; - if (!$auth->acl_get('f_search', $row['forum_id'])) + if ($auth->acl_gets('!f_search', '!f_list', $row['forum_id'])) { - // if the user does not have permissions to search this forum skip only this forum/category + // if the user does not have permissions to search or see this forum skip only this forum/category continue; } From 3d46fcb05c2ca9a41de66b5f45f407f7ad98b2ca Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 18 Aug 2007 16:11:44 +0000 Subject: [PATCH 73/96] and to the schema_data file too. git-svn-id: file:///svn/phpbb/trunk@8048 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/install/schemas/schema_data.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index dd4017f19e..abb15d08ee 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -123,6 +123,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_password', '' INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_server', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_uid', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_user', ''); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_user_filter', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('limit_load', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('limit_search_load', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_anon_lastread', '0'); From b8b85e5aca616c1e4b43246daa97a11881fb218d Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 19 Aug 2007 10:39:27 +0000 Subject: [PATCH 74/96] very tiny adjustements... git-svn-id: file:///svn/phpbb/trunk@8049 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions_jabber.php | 2 +- phpBB/includes/session.php | 2 +- phpBB/style.php | 2 +- phpBB/styles/prosilver/theme/bidi.css | 6 +++--- phpBB/styles/prosilver/theme/buttons.css | 2 +- phpBB/styles/prosilver/theme/common.css | 2 +- phpBB/styles/prosilver/theme/tweaks.css | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php index e58b85db19..04f664139f 100644 --- a/phpBB/includes/functions_jabber.php +++ b/phpBB/includes/functions_jabber.php @@ -14,7 +14,7 @@ * * @version class.jabber2.php 1306 2007-06-21 * @copyright 2006 Flyspray.org -* @author: Florian Schmitz (floele) +* @author Florian Schmitz (floele) * * Modified by Acyd Burn * diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index d1b70d41e5..a029388101 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -1398,7 +1398,7 @@ class user extends session $sql = 'SELECT image_name, image_filename, image_lang, image_height, image_width FROM ' . STYLES_IMAGESET_DATA_TABLE . ' WHERE imageset_id = ' . $this->theme['imageset_id'] . " - AND image_lang IN('" . $db->sql_escape($this->img_lang) . "', '')"; + AND image_lang IN ('" . $db->sql_escape($this->img_lang) . "', '')"; $result = $db->sql_query($sql, 3600); $localised_images = false; diff --git a/phpBB/style.php b/phpBB/style.php index c82ff764b3..7560a93dff 100644 --- a/phpBB/style.php +++ b/phpBB/style.php @@ -116,7 +116,7 @@ if ($id) $sql = 'SELECT * FROM ' . STYLES_IMAGESET_DATA_TABLE . ' WHERE imageset_id = ' . $theme['imageset_id'] . " - AND image_lang IN('" . $db->sql_escape($user_image_lang) . "', '')"; + AND image_lang IN ('" . $db->sql_escape($user_image_lang) . "', '')"; $result = $db->sql_query($sql, 3600); $img_array = array(); diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index f54f0fc3ba..1d08fb22bf 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -164,12 +164,12 @@ } *:first-child+html dl.details dd { - margin-right: 16em; + margin-right: 15em; float: none; } * html dl.details dd { - margin-right: 16em; + margin-right: 15em; float: none; } @@ -468,7 +468,7 @@ .rtl .sitehome, .rtl .icon-faq, .rtl .icon-members, .rtl .icon-home, .rtl .icon-ucp, .rtl .icon-register, .rtl .icon-logout, .rtl .icon-bookmark, .rtl .icon-bump, .rtl .icon-subscribe, .rtl .icon-unsubscribe, .rtl .icon-pages, .rtl .icon-search { background-position: 100% 50%; - padding: 0 17px 0 0; + padding: 1px 17px 0 0; } /* Poster profile icons diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index 662b588d30..6d07dd3511 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -84,7 +84,7 @@ a.fontsize:hover { background-position: 0 50%; background-repeat: no-repeat; background-image: none; - padding: 0 0 0 17px; + padding: 1px 0 0 17px; } /* Poster profile icons diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 0a2f418aa8..1a015ca882 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -459,7 +459,7 @@ dl.details { dl.details dt { float: left; clear: left; - width: 16em; + width: 15em; text-align: right; color: #000000; display: block; diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css index cfbb680997..20f3f67a38 100644 --- a/phpBB/styles/prosilver/theme/tweaks.css +++ b/phpBB/styles/prosilver/theme/tweaks.css @@ -61,12 +61,12 @@ dl.icon { /* Correctly clear floating for details on profile view */ *:first-child+html dl.details dd { - margin-left: 16em; + margin-left: 15em; float: none; } * html dl.details dd { - margin-left: 16em; + margin-left: 15em; float: none; } From d104d3d969d2fbc77f1004e0e5369e8c0c15738f Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 19 Aug 2007 13:40:53 +0000 Subject: [PATCH 75/96] - BBCode parsing order should ALWAYS be censor_text(), bbcode_secon_pass(), bbcode_nl2br(), smiley_text(), parse_attachments() - using \r on custom bbcodes to allow line breaks [Bug #10758] git-svn-id: file:///svn/phpbb/trunk@8050 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 2 ++ phpBB/includes/acp/acp_profile.php | 2 +- phpBB/includes/bbcode.php | 7 +++---- phpBB/includes/functions.php | 16 +++++++++++++--- phpBB/includes/functions_admin.php | 4 ++-- phpBB/includes/functions_posting.php | 6 ++---- phpBB/includes/functions_privmsgs.php | 2 +- phpBB/includes/functions_profile_fields.php | 4 ++-- phpBB/includes/mcp/mcp_post.php | 6 ++++-- phpBB/includes/mcp/mcp_queue.php | 4 +++- phpBB/includes/mcp/mcp_reports.php | 4 +++- phpBB/includes/mcp/mcp_topic.php | 2 +- phpBB/includes/mcp/mcp_warn.php | 5 ++--- phpBB/includes/message_parser.php | 7 ++++--- phpBB/includes/ucp/ucp_attachments.php | 2 +- phpBB/includes/ucp/ucp_pm_viewmessage.php | 6 +++--- phpBB/memberlist.php | 2 +- phpBB/search.php | 10 ++++------ phpBB/viewtopic.php | 11 +++++------ 19 files changed, 57 insertions(+), 45 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 26c54d18d4..d8db37ddfe 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -228,6 +228,8 @@ p a {
      28. [Fix] Made sure strip_bbcode cannot get the idea that a smiley is a BBCode (Bug #14030)
      29. [Change] Added a filter for user objects to LDAP configuration and improved explanations (Bug #12627)
      30. [Fix] Display searchable subforums of invisible parents in advanced search forum selection (Bug #11395)
        31. +
      31. [Fix] Allow line breaks in custom BBCodes (Bug #10758)
        32. +
      32. [Fix] Ordered BBcode parsing functions in the same way everywhere where they are used
        33. diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php index 00f8d64acb..c2fde25eb5 100644 --- a/phpBB/includes/acp/acp_profile.php +++ b/phpBB/includes/acp/acp_profile.php @@ -925,7 +925,7 @@ class acp_profile $lang_options[1]['lang_iso'] = $this->lang_defs['id'][$default_lang_id]; $lang_options[1]['fields'][$field] = array( 'TITLE' => $user->lang['CP_' . strtoupper($field)], - 'FIELD' => '
        ' . ((is_array($cp->vars[$field])) ? implode('
        ', $cp->vars[$field]) : str_replace("\n", '
        ', $cp->vars[$field])) . '
        ' + 'FIELD' => '
        ' . ((is_array($cp->vars[$field])) ? implode('
        ', $cp->vars[$field]) : bbcode_nl2br($cp->vars[$field])) . '
        ' ); if (isset($user->lang['CP_' . strtoupper($field) . '_EXPLAIN'])) diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index e2d8b7cde4..4b8ad62a51 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -156,10 +156,9 @@ class bbcode while ($row = $db->sql_fetchrow($result)) { // To circumvent replacing newlines with
        for the generated html, - // we just remove newlines here. We do not do this within the admin panel to - // let the admin lay out his html code nicely - $row['bbcode_tpl'] = str_replace(array("\n", "\r"), '', $row['bbcode_tpl']); - $row['second_pass_replace'] = str_replace(array("\n", "\r"), '', $row['second_pass_replace']); + // we use carriage returns here. They are later changed back to newlines + $row['bbcode_tpl'] = str_replace("\n", "\r", $row['bbcode_tpl']); + $row['second_pass_replace'] = str_replace("\n", "\r", $row['second_pass_replace']); $rowset[$row['bbcode_id']] = $row; } diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index ab30aba48d..0f92a2f8ba 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2571,8 +2571,7 @@ function generate_text_for_display($text, $uid, $bitfield, $flags) $bbcode->bbcode_second_pass($text, $uid); } - $text = str_replace("\n", '
        ', $text); - + $text = bbcode_nl2br($text); $text = smiley_text($text, !($flags & OPTION_FLAG_SMILIES)); return $text; @@ -2813,6 +2812,17 @@ function censor_text($text) return $text; } +/** +* custom version of nl2br which takes custom BBCodes into account +*/ +function bbcode_nl2br($text) +{ + // custom BBCodes might contain carriage returns so they + // are not converted into
        so now revert that + $text = str_replace(array("\n", "\r"), array('
        ', "\n"), $text); + return $text; +} + /** * Smiley processing */ @@ -2955,7 +2965,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count, $size_lang = ($filesize >= 1048576) ? $user->lang['MB'] : ( ($filesize >= 1024) ? $user->lang['KB'] : $user->lang['BYTES'] ); $filesize = ($filesize >= 1048576) ? round((round($filesize / 1048576 * 100) / 100), 2) : (($filesize >= 1024) ? round((round($filesize / 1024 * 100) / 100), 2) : $filesize); - $comment = str_replace("\n", '
        ', censor_text($attachment['attach_comment'])); + $comment = bbcode_nl2br(censor_text($attachment['attach_comment'])); $block_array += array( 'UPLOAD_ICON' => $upload_icon, diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 29d52406da..4dfd58e28c 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -2429,11 +2429,11 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id // If within the admin panel we do not censor text out if (defined('IN_ADMIN')) { - $log[$i]['action'] = str_replace("\n", '
        ', $log[$i]['action']); + $log[$i]['action'] = bbcode_nl2br($log[$i]['action']); } else { - $log[$i]['action'] = str_replace("\n", '
        ', censor_text($log[$i]['action'])); + $log[$i]['action'] = bbcode_nl2br(censor_text($log[$i]['action'])); } } else diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index b246a72daf..222f9a3843 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -1021,8 +1021,7 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id $decoded_message = $message; decode_message($decoded_message, $row['bbcode_uid']); - $decoded_message = censor_text($decoded_message); - $decoded_message = str_replace("\n", "
        ", $decoded_message); + $decoded_message = bbcode_nl2br($decoded_message); } if ($row['bbcode_bitfield']) @@ -1030,8 +1029,7 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id $bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']); } - $message = str_replace("\n", '
        ', $message); - + $message = bbcode_nl2br($message); $message = smiley_text($message, !$row['enable_smilies']); if (!empty($attachments[$row['post_id']])) diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 2a8990b607..ac6f4a0afe 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -1774,13 +1774,13 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode $message = $row['message_text']; $message = censor_text($message); - $message = str_replace("\n", '
        ', $message); if ($row['bbcode_bitfield']) { $bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']); } + $message = bbcode_nl2br($message); $message = smiley_text($message, !$row['enable_smilies']); $subject = censor_text($subject); diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php index f3ebe429cd..cbad80e28e 100644 --- a/phpBB/includes/functions_profile_fields.php +++ b/phpBB/includes/functions_profile_fields.php @@ -176,7 +176,7 @@ class custom_profile if (!empty($field_data['field_validation']) && $field_data['field_validation'] != '.*') { - $field_validate = ($field_type == FIELD_STRING) ? $field_value : str_replace("\n", ' ', $field_value); + $field_validate = ($field_type == FIELD_STRING) ? $field_value : bbcode_nl2br($field_value); if (!preg_match('#^' . str_replace('\\\\', '\\', $field_data['field_validation']) . '$#i', $field_validate)) { return 'FIELD_INVALID_CHARS'; @@ -462,7 +462,7 @@ class custom_profile $value = make_clickable($value); $value = censor_text($value); - $value = str_replace("\n", '
        ', $value); + $value = bbcode_nl2br($value); return $value; break; diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php index 698bcc8dd6..32fb572d3f 100644 --- a/phpBB/includes/mcp/mcp_post.php +++ b/phpBB/includes/mcp/mcp_post.php @@ -112,13 +112,15 @@ function mcp_post_details($id, $mode, $action) // Process message, leave it uncensored $message = $post_info['post_text']; - $message = str_replace("\n", '
        ', $message); + if ($post_info['bbcode_bitfield']) { include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); $bbcode = new bbcode($post_info['bbcode_bitfield']); $bbcode->bbcode_second_pass($message, $post_info['bbcode_uid'], $post_info['bbcode_bitfield']); } + + $message = bbcode_nl2br($message); $message = smiley_text($message); if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id'])) @@ -261,7 +263,7 @@ function mcp_post_details($id, $mode, $action) 'U_REPORTER' => ($row['user_id'] != ANONYMOUS) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . $row['user_id']) : '', 'USER_NOTIFY' => ($row['user_notify']) ? true : false, 'REPORT_TIME' => $user->format_date($row['report_time']), - 'REPORT_TEXT' => str_replace("\n", '
        ', trim($row['report_text']))) + 'REPORT_TEXT' => bbcode_nl2br(trim($row['report_text'])))) ); } while ($row = $db->sql_fetchrow($result)); diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index f82a99c2c3..0d2ea76498 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -119,13 +119,15 @@ class mcp_queue // Process message, leave it uncensored $message = $post_info['post_text']; - $message = str_replace("\n", '
        ', $message); + if ($post_info['bbcode_bitfield']) { include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); $bbcode = new bbcode($post_info['bbcode_bitfield']); $bbcode->bbcode_second_pass($message, $post_info['bbcode_uid'], $post_info['bbcode_bitfield']); } + + $message = bbcode_nl2br($message); $message = smiley_text($message); if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id'])) diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index 9a06b3bbf2..9528eec33b 100755 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -128,13 +128,15 @@ class mcp_reports // Process message, leave it uncensored $message = $post_info['post_text']; - $message = str_replace("\n", '
        ', $message); + if ($post_info['bbcode_bitfield']) { include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); $bbcode = new bbcode($post_info['bbcode_bitfield']); $bbcode->bbcode_second_pass($message, $post_info['bbcode_uid'], $post_info['bbcode_bitfield']); } + + $message = bbcode_nl2br($message); $message = smiley_text($message); if ($post_info['post_attachment'] && $auth->acl_get('u_download') && $auth->acl_get('f_download', $post_info['forum_id'])) diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php index a5bfba23fe..1002b1c918 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -175,13 +175,13 @@ function mcp_topic_view($id, $mode, $action) { $message = $row['post_text']; $post_subject = ($row['post_subject'] != '') ? $row['post_subject'] : $topic_info['topic_title']; - $message = str_replace("\n", '
        ', $message); if ($row['bbcode_bitfield']) { $bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']); } + $message = bbcode_nl2br($message); $message = smiley_text($message); if (!empty($attachments[$row['post_id']])) diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php index 915df898f7..892929539f 100755 --- a/phpBB/includes/mcp/mcp_warn.php +++ b/phpBB/includes/mcp/mcp_warn.php @@ -253,8 +253,7 @@ class mcp_warn // We want to make the message available here as a reminder // Parse the message and subject - $message = $user_row['post_text']; - $message = str_replace("\n", '
        ', censor_text($message)); + $message = censor_text($user_row['post_text']); // Second parse bbcode here if ($user_row['bbcode_bitfield']) @@ -265,7 +264,7 @@ class mcp_warn $bbcode->bbcode_second_pass($message, $user_row['bbcode_uid'], $user_row['bbcode_bitfield']); } - // Always process smilies after parsing bbcodes + $message = bbcode_nl2br($message); $message = smiley_text($message); // Generate the appropriate user information for the user we are looking at diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 65ffee8dd0..d2e54e1404 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1138,6 +1138,9 @@ class parse_message extends bbcode_firstpass $this->parse($allow_bbcode, $allow_magic_url, $allow_smilies, $this->allow_img_bbcode, $this->allow_flash_bbcode, $this->allow_quote_bbcode, $this->allow_url_bbcode, true); } + // Replace naughty words such as farty pants + $this->message = censor_text($this->message); + // Parse BBcode if ($allow_bbcode) { @@ -1147,11 +1150,9 @@ class parse_message extends bbcode_firstpass $this->bbcode_second_pass($this->message, $this->bbcode_uid); } + $this->message = bbcode_nl2br($this->message); $this->message = smiley_text($this->message, !$allow_smilies); - // Replace naughty words such as farty pants - $this->message = str_replace("\n", '
        ', censor_text($this->message)); - if (!$update_this_message) { unset($this->message); diff --git a/phpBB/includes/ucp/ucp_attachments.php b/phpBB/includes/ucp/ucp_attachments.php index 895cb51020..b20e4a55ed 100644 --- a/phpBB/includes/ucp/ucp_attachments.php +++ b/phpBB/includes/ucp/ucp_attachments.php @@ -121,7 +121,7 @@ class ucp_attachments $template->assign_block_vars('attachrow', array( 'ROW_NUMBER' => $row_count + ($start + 1), 'FILENAME' => $row['real_filename'], - 'COMMENT' => str_replace("\n", '
        ', $row['attach_comment']), + 'COMMENT' => bbcode_nl2br($row['attach_comment']), 'EXTENSION' => $row['extension'], 'SIZE' => ($row['filesize'] >= 1048576) ? ($row['filesize'] >> 20) . ' ' . $user->lang['MB'] : (($row['filesize'] >= 1024) ? ($row['filesize'] >> 10) . ' ' . $user->lang['KB'] : $row['filesize'] . ' ' . $user->lang['BYTES']), 'DOWNLOAD_COUNT' => $row['download_count'], diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index b980774403..492ce08b45 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -56,8 +56,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) $user_info = get_user_information($author_id, $message_row); // Parse the message and subject - $message = $message_row['message_text']; - $message = str_replace("\n", '
        ', censor_text($message)); + $message = censor_text($message_row['message_text']); // Second parse bbcode here if ($message_row['bbcode_bitfield']) @@ -66,6 +65,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) } // Always process smilies after parsing bbcodes + $message = bbcode_nl2br($message); $message = smiley_text($message); // Replace naughty words such as farty pants @@ -142,7 +142,6 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) if ($signature) { $signature = censor_text($signature); - $signature = str_replace("\n", '
        ', censor_text($signature)); if ($user_info['user_sig_bbcode_bitfield']) { @@ -155,6 +154,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) $bbcode->bbcode_second_pass($signature, $user_info['user_sig_bbcode_uid'], $user_info['user_sig_bbcode_bitfield']); } + $signature = bbcode_nl2br($signature); $signature = smiley_text($signature); } diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index c88845340b..bcacdc9156 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -471,7 +471,6 @@ switch ($mode) if ($member['user_sig']) { $member['user_sig'] = censor_text($member['user_sig']); - $member['user_sig'] = str_replace("\n", '
        ', $member['user_sig']); if ($member['user_sig_bbcode_bitfield']) { @@ -480,6 +479,7 @@ switch ($mode) $bbcode->bbcode_second_pass($member['user_sig'], $member['user_sig_bbcode_uid'], $member['user_sig_bbcode_bitfield']); } + $member['user_sig'] = bbcode_nl2br($member['user_sig']); $member['user_sig'] = smiley_text($member['user_sig']); } diff --git a/phpBB/search.php b/phpBB/search.php index d9010b73a8..9acad880d2 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -838,18 +838,19 @@ if ($keywords || $author || $author_id || $search_id || $submit) { // now find context for the searched words $row['post_text'] = get_context($row['post_text'], array_filter(explode('|', $hilit), 'strlen'), $return_chars); - $row['post_text'] = str_replace("\n", '
        ', $row['post_text']); + $row['post_text'] = bbcode_nl2br($row['post_text']); } else { - $row['post_text'] = str_replace("\n", '
        ', $row['post_text']); - // Second parse bbcode here if ($row['bbcode_bitfield']) { $bbcode->bbcode_second_pass($row['post_text'], $row['bbcode_uid'], $row['bbcode_bitfield']); } + $row['post_text'] = bbcode_nl2br($row['post_text']); + $row['post_text'] = smiley_text($row['post_text']); + if (!empty($attachments[$row['post_id']])) { parse_attachments($forum_id, $row['post_text'], $attachments[$row['post_id']], $update_count); @@ -857,9 +858,6 @@ if ($keywords || $author || $author_id || $search_id || $submit) // we only display inline attachments unset($attachments[$row['post_id']]); } - - // Always process smilies after parsing bbcodes - $row['post_text'] = smiley_text($row['post_text']); } if ($hilit) diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index a99279c642..0aa06721eb 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -747,23 +747,24 @@ if (!empty($topic_data['poll_start'])) for ($i = 0, $size = sizeof($poll_info); $i < $size; $i++) { $poll_info[$i]['poll_option_text'] = censor_text($poll_info[$i]['poll_option_text']); - $poll_info[$i]['poll_option_text'] = str_replace("\n", '
        ', $poll_info[$i]['poll_option_text']); if ($poll_bbcode !== false) { $poll_bbcode->bbcode_second_pass($poll_info[$i]['poll_option_text'], $poll_info[$i]['bbcode_uid'], $poll_option['bbcode_bitfield']); } + $poll_info[$i]['poll_option_text'] = bbcode_nl2br($poll_info[$i]['poll_option_text']); $poll_info[$i]['poll_option_text'] = smiley_text($poll_info[$i]['poll_option_text']); } $topic_data['poll_title'] = censor_text($topic_data['poll_title']); - $topic_data['poll_title'] = str_replace("\n", '
        ', $topic_data['poll_title']); if ($poll_bbcode !== false) { $poll_bbcode->bbcode_second_pass($topic_data['poll_title'], $poll_info[0]['bbcode_uid'], $poll_info[0]['bbcode_bitfield']); } + + $topic_data['poll_title'] = bbcode_nl2br($topic_data['poll_title']); $topic_data['poll_title'] = smiley_text($topic_data['poll_title']); unset($poll_bbcode); @@ -1222,13 +1223,13 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) if ($user_cache[$poster_id]['sig'] && $row['enable_sig'] && empty($user_cache[$poster_id]['sig_parsed'])) { $user_cache[$poster_id]['sig'] = censor_text($user_cache[$poster_id]['sig']); - $user_cache[$poster_id]['sig'] = str_replace("\n", '
        ', $user_cache[$poster_id]['sig']); if ($user_cache[$poster_id]['sig_bbcode_bitfield']) { $bbcode->bbcode_second_pass($user_cache[$poster_id]['sig'], $user_cache[$poster_id]['sig_bbcode_uid'], $user_cache[$poster_id]['sig_bbcode_bitfield']); } + $user_cache[$poster_id]['sig'] = bbcode_nl2br($user_cache[$poster_id]['sig']); $user_cache[$poster_id]['sig'] = smiley_text($user_cache[$poster_id]['sig']); $user_cache[$poster_id]['sig_parsed'] = true; } @@ -1242,9 +1243,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) $bbcode->bbcode_second_pass($message, $row['bbcode_uid'], $row['bbcode_bitfield']); } - $message = str_replace("\n", '
        ', $message); - - // Always process smilies after parsing bbcodes + $message = bbcode_nl2br($message); $message = smiley_text($message); if (!empty($attachments[$row['post_id']])) From e28c446244b2df172f54791c5decda1a103c4360 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 19 Aug 2007 14:08:26 +0000 Subject: [PATCH 76/96] - some typos [Bug #13465] git-svn-id: file:///svn/phpbb/trunk@8051 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/language/en/help_faq.php | 6 +++--- phpBB/styles/prosilver/template/viewforum_body.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php index 193e8cf3a2..60d652e1ce 100644 --- a/phpBB/language/en/help_faq.php +++ b/phpBB/language/en/help_faq.php @@ -44,7 +44,7 @@ $help = array( ), array( 0 => 'How do I prevent my username appearing in the online user listings?', - 1 => 'Within your User Control Panel, under “Board preferences”, you will find the option Hide your online status. Enable this option with Yesand you will only appear to the administrators, moderators and yourself. You will be counted as a hidden user.' + 1 => 'Within your User Control Panel, under “Board preferences”, you will find the option Hide your online status. Enable this option with Yes and you will only appear to the administrators, moderators and yourself. You will be counted as a hidden user.' ), array( 0 => 'I’ve lost my password!', @@ -88,7 +88,7 @@ $help = array( ), array( 0 => 'My language is not in the list!', - 1 => 'Either the administrator has not installed your language or someone has not translated this board into your language. Try asking the board administrator if they can install the language pack you need. If the language pack does not exist, feel free to create a new translation. More information can be found at the phpBB website (see link at the bottom of board pages).' + 1 => 'Either the administrator has not installed your language or nobody has translated this board into your language. Try asking the board administrator if they can install the language pack you need. If the language pack does not exist, feel free to create a new translation. More information can be found at the phpBB website (see link at the bottom of board pages).' ), array( 0 => 'How do I show an image below my username?', @@ -216,7 +216,7 @@ $help = array( ), array( 0 => 'Where are the usergroups and how do I join one?', - 1 => 'You can view all usergroups by via the “Usergroups” link within your User Control Panel. If you would like to join one, proceed by clicking the appropriate button. Not all groups have open access, however. Some may require approval to join, some may be closed and some may even have hidden memberships. If the group is open, you can join it by clicking the appropriate button. If a group requires approval to join you may request to join by clicking the appropriate button. The user group leader will need to approve your request and may ask why you want to join the group. Please do not harass a group leader if they reject your request; they will have their reasons.' + 1 => 'You can view all usergroups via the “Usergroups” link within your User Control Panel. If you would like to join one, proceed by clicking the appropriate button. Not all groups have open access, however. Some may require approval to join, some may be closed and some may even have hidden memberships. If the group is open, you can join it by clicking the appropriate button. If a group requires approval to join you may request to join by clicking the appropriate button. The user group leader will need to approve your request and may ask why you want to join the group. Please do not harass a group leader if they reject your request; they will have their reasons.' ), array( 0 => 'How do I become a usergroup leader?', diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index b581fb8e90..f5cc564a8e 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -4,7 +4,7 @@

        - + {FORUM_DESC}
         {L_MODERATOR}{L_MODERATORS}: {MODERATORS}

        From 29266c7eca862422f1adcc0e1f4ffa146ff5e9ea Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 19 Aug 2007 14:27:52 +0000 Subject: [PATCH 77/96] let the text float to the right. git-svn-id: file:///svn/phpbb/trunk@8052 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/styles/prosilver/theme/bidi.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index 1d08fb22bf..8cf8802e27 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -73,7 +73,7 @@ } .rtl ul.leftside li, .rtl ul.rightside li { - float: left; + float: right; } .rtl ul.leftside { From cf4950f4c60738944ffe1d51b1463dcab6994845 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 19 Aug 2007 14:51:37 +0000 Subject: [PATCH 78/96] away with debug code... git-svn-id: file:///svn/phpbb/trunk@8053 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 0f92a2f8ba..c00406512b 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3699,8 +3699,6 @@ function msg_handler($errno, $msg_text, $errfile, $errline) { return; } - static $counter = 0; - $counter++; //echo ""; var_dump($counter); echo ""; if (strpos($errfile, 'cache') === false && strpos($errfile, 'template.') === false) { From 1be20d2e30ee621201752f78b8f232f424b81f4f Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 19 Aug 2007 15:58:31 +0000 Subject: [PATCH 79/96] again... ie6 is still not behaving correctly... the pragma header invalidates the content. I hope this is really the cause now. :/ git-svn-id: file:///svn/phpbb/trunk@8054 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/style.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/phpBB/style.php b/phpBB/style.php index 7560a93dff..f177d30c03 100644 --- a/phpBB/style.php +++ b/phpBB/style.php @@ -174,8 +174,6 @@ if ($id) } } - header('Content-type: text/css; charset=UTF-8'); - if ($recache) { include_once($phpbb_root_path . 'includes/acp/acp_styles.' . $phpEx); @@ -199,15 +197,15 @@ if ($id) // Only set the expire time if the theme changed data is older than 30 minutes - to cope with changes from the ACP if ($recache || $theme['theme_mtime'] > (time() - 1800)) { - header('Cache-Control: private, no-cache="set-cookie"'); header('Expires: 0'); - header('Pragma: no-cache'); } else { header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + $expire_time)); } + header('Content-type: text/css; charset=UTF-8'); + // Parse Theme Data $replace = array( '{T_THEME_PATH}' => "{$phpbb_root_path}styles/" . $theme['theme_path'] . '/theme', From c06b3ce84ac21d45a59df601ac25169beefed81f Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 19 Aug 2007 18:02:33 +0000 Subject: [PATCH 80/96] parse error? parse error. git-svn-id: file:///svn/phpbb/trunk@8055 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/mcp/mcp_post.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php index 32fb572d3f..dd10750d99 100644 --- a/phpBB/includes/mcp/mcp_post.php +++ b/phpBB/includes/mcp/mcp_post.php @@ -263,8 +263,8 @@ function mcp_post_details($id, $mode, $action) 'U_REPORTER' => ($row['user_id'] != ANONYMOUS) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . $row['user_id']) : '', 'USER_NOTIFY' => ($row['user_notify']) ? true : false, 'REPORT_TIME' => $user->format_date($row['report_time']), - 'REPORT_TEXT' => bbcode_nl2br(trim($row['report_text'])))) - ); + 'REPORT_TEXT' => bbcode_nl2br(trim($row['report_text'])), + )); } while ($row = $db->sql_fetchrow($result)); } From 23e3766497d2c17213a5ff4ab52bcd1722f1cebb Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 19 Aug 2007 21:29:31 +0000 Subject: [PATCH 81/96] - Prevent {URL} token in custom BBCodes from make_clickable messing [Bug #14151] - Added alternative tokens to custom BBCodes which are safe for CSS/Javascript and changed TEXT token to entitise opening and closing parantheses. git-svn-id: file:///svn/phpbb/trunk@8056 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 2 ++ phpBB/includes/acp/acp_bbcodes.php | 14 ++++++++++---- phpBB/includes/bbcode.php | 2 +- phpBB/language/en/acp/posting.php | 8 +++++--- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index d8db37ddfe..b751103601 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -230,6 +230,8 @@ p a {
      33. [Fix] Display searchable subforums of invisible parents in advanced search forum selection (Bug #11395)
      34. [Fix] Allow line breaks in custom BBCodes (Bug #10758)
      35. [Fix] Ordered BBcode parsing functions in the same way everywhere where they are used
        36. +
      36. [Fix] Prevent {URL} token in custom BBCodes from make_clickable messing (Bug #14151)
        37. +
      37. [Sec] Added alternative tokens to custom BBCodes which are safe for CSS/Javascript and changed TEXT token to entitise opening and closing parantheses.
        38. diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index ce0d12b356..235028fc3c 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -295,16 +295,22 @@ class acp_bbcodes // @todo Make sure to change this too if something changed in message parsing $tokens = array( 'URL' => array( - '!([a-z0-9]+://)?([^< "\r\n\t\]]*?)!ie' => "(('\$1') ? '\$1\$2' : 'http://\$2')" + '!(?:(' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('url')) . ')|(' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('www_url')) . '))!ie' => "\$this->bbcode_specialchars(('\$1') ? '\$1' : 'http://\$2')" ), 'LOCAL_URL' => array( - '!([^:]+/[^< "\r\n\t\]]*?)!' => '$1' + '!(' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('relative_url')) . ')!e' => "\$this->bbcode_specialchars('$1')" ), 'EMAIL' => array( - '!([a-z0-9]+[a-z0-9\-\._]*@(?:(?:[0-9]{1,3}\.){3,5}[0-9]{1,3}|[a-z0-9]+[a-z0-9\-\._]*\.[a-z]+))!i' => '$1' + '!([a-z0-9]+[a-z0-9\-\._]*@(?:(?:[0-9]{1,3}\.){3,5}[0-9]{1,3}|[a-z0-9]+[a-z0-9\-\._]*\.[a-z]+))!i' => "\$this->bbcode_specialchars('$1')" ), 'TEXT' => array( - '!(.*?)!es' => "str_replace(\"\\r\\n\",\"\\n\", str_replace('\\\"', '\"', str_replace('\\'', ''', trim('\$1'))))" + '!(.*?)!es' => "str_replace(array(\"\\r\\n\", '\\\"', '\\'', '(', ')'), array(\"\\n\", '\"', ''', '(', ')'), trim('\$1'))" + ), + 'SIMPLETEXT' => array( + '!([a-zA-Z0-9-+.,_ ]+)!' => "$1" + ), + 'IDENTIFIER' => array( + '!([a-zA-Z0-9-_]+)!' => "$1" ), 'COLOR' => array( '!([a-z]+|#[0-9abcdef]+)!i' => '$1' diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index 4b8ad62a51..c877d56e2b 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -332,7 +332,7 @@ class bbcode // In order to use templates with custom bbcodes we need // to replace all {VARS} to corresponding backreferences // Note that backreferences are numbered from bbcode_match - if (preg_match_all('/\{(URL|EMAIL|TEXT|COLOR|NUMBER)[0-9]*\}/', $rowset[$bbcode_id]['bbcode_match'], $m)) + if (preg_match_all('/\{(URL|LOCAL_URL|EMAIL|TEXT|SIMPLETEXT|IDENTIFIER|COLOR|NUMBER)[0-9]*\}/', $rowset[$bbcode_id]['bbcode_match'], $m)) { foreach ($m[0] as $i => $tok) { diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index ebbbf61c44..2f995dc91d 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -49,14 +49,14 @@ $lang = array_merge($lang, array( 'BBCODE_TAG_TOO_LONG' => 'The tag name you selected is too long.', 'BBCODE_TAG_DEF_TOO_LONG' => 'The tag definition that you have entered is too long, please shorten your tag definition.', 'BBCODE_USAGE' => 'BBCode usage', - 'BBCODE_USAGE_EXAMPLE' => '[hilight={COLOR}]{TEXT}[/hilight]

        [font={TEXT1}]{TEXT2}[/font]', + 'BBCODE_USAGE_EXAMPLE' => '[hilight={COLOR}]{TEXT}[/hilight]

        [font={SIMPLETEXT1}]{SIMPLETEXT2}[/font]', 'BBCODE_USAGE_EXPLAIN' => 'Here you define how to use the BBCode. Replace any variable input by the corresponding token (%ssee below%s).', 'EXAMPLE' => 'Example:', 'EXAMPLES' => 'Examples:', 'HTML_REPLACEMENT' => 'HTML replacement', - 'HTML_REPLACEMENT_EXAMPLE' => '<span style="background-color: {COLOR};">{TEXT}</span>

        <span style="font-family: {TEXT1};">{TEXT2}</span>', + 'HTML_REPLACEMENT_EXAMPLE' => '<span style="background-color: {COLOR};">{TEXT}</span>

        <span style="font-family: {SIMPLETEXT1};">{SIMPLETEXT2}</span>', 'HTML_REPLACEMENT_EXPLAIN' => 'Here you define the default HTML replacement. Do not forget to put back tokens you used above!', 'TOKEN' => 'Token', @@ -66,7 +66,9 @@ $lang = array_merge($lang, array( 'TOO_MANY_BBCODES' => 'You cannot create any more BBCodes. Please remove one or more BBCodes then try again.', 'tokens' => array( - 'TEXT' => 'Any text, including foreign characters, numbers, etc…', + 'TEXT' => 'Any text, including foreign characters, numbers, etc… You should not use this token in HTML tags. Instead try to use IDENTIFIER or SIMPLETEXT.', + 'SIMPLETEXT' => 'Characters from the latin alphabet (A-Z), numbers, spaces, commas, dots, minus, plus, hyphen and underscore', + 'IDENTIFIER' => 'Characters from the latin alphabet (A-Z), numbers, hyphen and underscore', 'NUMBER' => 'Any series of digits', 'EMAIL' => 'A valid e-mail address', 'URL' => 'A valid URL using any protocol (http, ftp, etc… cannot be used for javascript exploits). If none is given, "http://" is prefixed to the string.', From 72a904c5007dae6cee52ce88241fbe4358e27878 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Mon, 20 Aug 2007 15:07:18 +0000 Subject: [PATCH 82/96] fix for bug #14165... hopefully git-svn-id: file:///svn/phpbb/trunk@8057 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions.php | 8 +++++--- phpBB/includes/ucp/ucp_register.php | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index c00406512b..d9f8256483 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2293,8 +2293,10 @@ function login_forum_box($forum_data) if ($password) { // Remove expired authorised sessions - $sql = 'SELECT session_id - FROM ' . SESSIONS_TABLE; + $sql = 'SELECT f.session_id + FROM ' . FORUMS_ACCESS_TABLE . ' f + LEFT JOIN ' . SESSIONS_TABLE . ' s ON (f.session_id = s.session_id) + WHERE s.session_id IS NULL'; $result = $db->sql_query($sql); if ($row = $db->sql_fetchrow($result)) @@ -2308,7 +2310,7 @@ function login_forum_box($forum_data) // Remove expired sessions $sql = 'DELETE FROM ' . FORUMS_ACCESS_TABLE . ' - WHERE ' . $db->sql_in_set('session_id', $sql_in, true); + WHERE ' . $db->sql_in_set('session_id', $sql_in); $db->sql_query($sql); } $db->sql_freeresult($result); diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index b62ee04318..2e22cf5519 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -427,8 +427,10 @@ class ucp_register $str = ''; if (!$change_lang) { - $sql = 'SELECT session_id - FROM ' . SESSIONS_TABLE; + $sql = 'SELECT c.session_id + FROM ' . CONFIRM_TABLE . ' c + LEFT JOIN ' . SESSIONS_TABLE . ' s ON (c.session_id = s.session_id) + WHERE s.session_id IS NULL'; $result = $db->sql_query($sql); if ($row = $db->sql_fetchrow($result)) @@ -443,7 +445,7 @@ class ucp_register if (sizeof($sql_in)) { $sql = 'DELETE FROM ' . CONFIRM_TABLE . ' - WHERE ' . $db->sql_in_set('session_id', $sql_in, true) . ' + WHERE ' . $db->sql_in_set('session_id', $sql_in) . ' AND confirm_type = ' . CONFIRM_REG; $db->sql_query($sql); } From 73165bd02ea45f5fbccd901564ec76ba10d670d4 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Mon, 20 Aug 2007 15:17:07 +0000 Subject: [PATCH 83/96] confirm_id anyone? git-svn-id: file:///svn/phpbb/trunk@8058 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/ucp/ucp_register.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 2e22cf5519..3d7df02850 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -427,7 +427,7 @@ class ucp_register $str = ''; if (!$change_lang) { - $sql = 'SELECT c.session_id + $sql = 'SELECT c.confirm_id FROM ' . CONFIRM_TABLE . ' c LEFT JOIN ' . SESSIONS_TABLE . ' s ON (c.session_id = s.session_id) WHERE s.session_id IS NULL'; @@ -438,14 +438,14 @@ class ucp_register $sql_in = array(); do { - $sql_in[] = (string) $row['session_id']; + $sql_in[] = (string) $row['confirm_id']; } while ($row = $db->sql_fetchrow($result)); if (sizeof($sql_in)) { $sql = 'DELETE FROM ' . CONFIRM_TABLE . ' - WHERE ' . $db->sql_in_set('session_id', $sql_in) . ' + WHERE ' . $db->sql_in_set('confirm_id', $sql_in) . ' AND confirm_type = ' . CONFIRM_REG; $db->sql_query($sql); } From c52e9039cf60f5170978f136bbcac2e1c7843c0d Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Mon, 20 Aug 2007 17:34:53 +0000 Subject: [PATCH 84/96] as i guessed... thanks ??? ????? git-svn-id: file:///svn/phpbb/trunk@8059 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/styles/prosilver/theme/bidi.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index 8cf8802e27..1d08fb22bf 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -73,7 +73,7 @@ } .rtl ul.leftside li, .rtl ul.rightside li { - float: right; + float: left; } .rtl ul.leftside { From 5f4cd5b65c22a35e8ef3005a9025c2a3f579cfaa Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Tue, 21 Aug 2007 14:08:23 +0000 Subject: [PATCH 85/96] #14105 Note that announcements can be global - that's not a bug. git-svn-id: file:///svn/phpbb/trunk@8060 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 2 ++ .../install/convertors/functions_phpbb20.php | 22 ++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index b751103601..41fd061e75 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -232,6 +232,8 @@ p a {
      38. [Fix] Ordered BBcode parsing functions in the same way everywhere where they are used
      39. [Fix] Prevent {URL} token in custom BBCodes from make_clickable messing (Bug #14151)
      40. [Sec] Added alternative tokens to custom BBCodes which are safe for CSS/Javascript and changed TEXT token to entitise opening and closing parantheses.
        41. +
      41. [Fix] Convert 2.0 moderator posting permissions (Bug #14105)
        42. + diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index ab1a1ede11..74ca47986e 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -587,7 +587,7 @@ function phpbb_convert_authentication($mode) $forum_access = array(); while ($row = $src_db->sql_fetchrow($result)) { - $forum_access[] = $row; + $forum_access[$row['forum_id']] = $row; } $src_db->sql_freeresult($result); @@ -967,6 +967,12 @@ function phpbb_convert_authentication($mode) { // And now the moderators // We make sure that they have at least standard access to the forums they moderate in addition to the moderating permissions + + $mod_post_map = array( + 'auth_announce' => 'f_announce', + 'auth_sticky' => 'f_sticky' + ); + foreach ($user_access as $forum_id => $access_map) { $forum_id = (int) $forum_id; @@ -977,6 +983,13 @@ function phpbb_convert_authentication($mode) { mass_auth('user_role', $forum_id, (int) phpbb_user_id($access['user_id']), 'MOD_STANDARD'); mass_auth('user_role', $forum_id, (int) phpbb_user_id($access['user_id']), 'FORUM_STANDARD'); + foreach ($mod_post_map as $old => $new) + { + if (isset($forum_access[$forum_id]) && isset($forum_access[$forum_id][$old]) && $forum_access[$forum_id][$old] == AUTH_MOD) + { + mass_auth('user', $forum_id, (int) phpbb_user_id($access['user_id']), $new, ACL_YES); + } + } } } } @@ -991,6 +1004,13 @@ function phpbb_convert_authentication($mode) { mass_auth('group_role', $forum_id, (int) $access['group_id'], 'MOD_STANDARD'); mass_auth('group_role', $forum_id, (int) $access['group_id'], 'FORUM_STANDARD'); + foreach ($mod_post_map as $old => $new) + { + if (isset($forum_access[$forum_id]) && isset($forum_access[$forum_id][$old]) && $forum_access[$forum_id][$old] == AUTH_MOD) + { + mass_auth('group', $forum_id, (int) $access['group_id'], $new, ACL_YES); + } + } } } } From ff3843b39e714ef879a91f245ee6170534947503 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 21 Aug 2007 15:09:52 +0000 Subject: [PATCH 86/96] - make sure the copyright/disclaimer is consistent - two fixes... git-svn-id: file:///svn/phpbb/trunk@8061 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 3 ++- phpBB/docs/FAQ.html | 2 +- phpBB/docs/INSTALL.html | 2 +- phpBB/docs/README.html | 2 +- phpBB/docs/auth_api.html | 15 ++++++++++++++- phpBB/docs/coding-guidelines.html | 17 +++++++++++++++-- phpBB/includes/functions.php | 4 ++-- phpBB/includes/functions_privmsgs.php | 8 ++++---- phpBB/includes/ucp/ucp_register.php | 6 +++--- phpBB/language/en/ucp.php | 6 +++--- 10 files changed, 46 insertions(+), 19 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 41fd061e75..3649e7be51 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -233,6 +233,7 @@ p a {
      42. [Fix] Prevent {URL} token in custom BBCodes from make_clickable messing (Bug #14151)
      43. [Sec] Added alternative tokens to custom BBCodes which are safe for CSS/Javascript and changed TEXT token to entitise opening and closing parantheses.
      44. [Fix] Convert 2.0 moderator posting permissions (Bug #14105)
        45. +
      45. [Fix] Correctly apply PM box limit of 0 to custom folder (Bug #14154)
        46. @@ -544,7 +545,7 @@ p a {
        -

        This application is opensource software released under the GPL. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2007 phpBB Group, All Rights Reserved.

        +

        This application is opensource software released under the GPL. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2000, 2002, 2005, 2007 phpBB Group, All Rights Reserved.

        Top diff --git a/phpBB/docs/FAQ.html b/phpBB/docs/FAQ.html index 0ceba33038..0ccc7c0886 100644 --- a/phpBB/docs/FAQ.html +++ b/phpBB/docs/FAQ.html @@ -364,7 +364,7 @@ p a {
        -

        This application is opensource software released under the GPL. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2007 phpBB Group, All Rights Reserved.

        +

        This application is opensource software released under the GPL. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2000, 2002, 2005, 2007 phpBB Group, All Rights Reserved.

        Top diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index 8d9cac6cf3..e87614b5b2 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -531,7 +531,7 @@ p a {
        -

        This application is opensource software released under the GPL. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2007 phpBB Group, All Rights Reserved.

        +

        This application is opensource software released under the GPL. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2000, 2002, 2005, 2007 phpBB Group, All Rights Reserved.

        Top diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index 9f84503ef2..3dc47ae63b 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -431,7 +431,7 @@ p a {
        -

        This application is opensource software released under the GPL. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2007 phpBB Group, All Rights Reserved.

        +

        This application is opensource software released under the GPL. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2000, 2002, 2005, 2007 phpBB Group, All Rights Reserved.

        Top diff --git a/phpBB/docs/auth_api.html b/phpBB/docs/auth_api.html index 8f86ae2740..f744466254 100644 --- a/phpBB/docs/auth_api.html +++ b/phpBB/docs/auth_api.html @@ -178,7 +178,7 @@ body {
        -

        This is an explanation of how to use the phpBB auth/acl API. This document is (c) 2006 phpBB Group, copying or redistribution is not allowed without permission.

        +

        This is an explanation of how to use the phpBB auth/acl API.

        Auth API

        @@ -195,6 +195,7 @@ body {
    87. Admin related functions
      88. +
    88. Copyright and disclaimer
      89. @@ -360,6 +361,18 @@ $auth_admin = new auth_admin(); Top +

      + +
      + +

      4. Copyright and disclaimer

      + +
      + +

      This application is opensource software released under the GPL. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2000, 2002, 2005, 2007 phpBB Group, All Rights Reserved.

      + +
      +Top diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html index 1efeadb111..a407be10ee 100644 --- a/phpBB/docs/coding-guidelines.html +++ b/phpBB/docs/coding-guidelines.html @@ -192,7 +192,7 @@ p a { -

      These are the phpBB Coding Guidelines for Olympus, all attempts should be made to follow them as closely as possible.
      This document is (c) 2006 phpBB Group, copying or redistribution is not allowed without permission.

      +

      These are the phpBB Coding Guidelines for Olympus, all attempts should be made to follow them as closely as possible.

      Coding Guidelines

      @@ -224,6 +224,7 @@ p a {
    89. Guidelines Changelog
      90. +
    90. Copyright and disclaimer
      91. @@ -803,7 +804,7 @@ $sql = 'SELECT *

      sql_escape():

      -

      Always use $db->sql_escape() if you need to check for a string within an SQL statement (even if you are sure the variable can not contain single quotes - never trust your input), for example:

      +

      Always use $db->sql_escape() if you need to check for a string within an SQL statement (even if you are sure the variable cannot contain single quotes - never trust your input), for example:

       $sql = 'SELECT *
@@ -2353,6 +2354,18 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
 
 
 
+
+Top
+

      
+
+
      
+
+
      8. Copyright and disclaimer
      
+
+	
      
+
+	
      This application is opensource software released under the GPL. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2000, 2002, 2005, 2007 phpBB Group, All Rights Reserved.
      
+
 
      
 Top
 
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index d9f8256483..142b1e8ce7 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1957,8 +1957,8 @@ function meta_refresh($time, $url)
 * @param boolean $check True for checking if confirmed (without any additional parameters) and false for displaying the confirm box
 * @param string $title Title/Message used for confirm box.
 *		message text is _CONFIRM appended to title. 
-*		If title can not be found in user->lang a default one is displayed
-*		If title_CONFIRM can not be found in user->lang the text given is used.
+*		If title cannot be found in user->lang a default one is displayed
+*		If title_CONFIRM cannot be found in user->lang the text given is used.
 * @param string $hidden Hidden variables
 * @param string $html_body Template used for confirm box
 * @param string $u_action Custom form action
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index ac6f4a0afe..f0d0520a03 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -778,7 +778,7 @@ function move_pm($user_id, $message_limit, $move_msg_ids, $dest_folder, $cur_fol
 				trigger_error('NOT_AUTHORISED');
 			}
 
-			if ($row['pm_count'] + sizeof($move_msg_ids) > $message_limit)
+			if ($message_limit && $row['pm_count'] + sizeof($move_msg_ids) > $message_limit)
 			{
 				$message = sprintf($user->lang['NOT_ENOUGH_SPACE_FOLDER'], $row['folder_name']) . '

      ';
 				$message .= sprintf($user->lang['CLICK_RETURN_FOLDER'], '', '', $row['folder_name']);
@@ -795,7 +795,7 @@ function move_pm($user_id, $message_limit, $move_msg_ids, $dest_folder, $cur_fol
 			$num_messages = (int) $db->sql_fetchfield('num_messages');
 			$db->sql_freeresult($result);
 
-			if ($num_messages + sizeof($move_msg_ids) > $message_limit)
+			if ($message_limit && $num_messages + sizeof($move_msg_ids) > $message_limit)
 			{
 				$message = sprintf($user->lang['NOT_ENOUGH_SPACE_FOLDER'], $user->lang['PM_INBOX']) . '

      ';
 				$message .= sprintf($user->lang['CLICK_RETURN_FOLDER'], '', '', $user->lang['PM_INBOX']);
@@ -1281,9 +1281,9 @@ function get_folder_status($folder_id, $folder)
 	$return = array(
 		'folder_name'	=> $folder['folder_name'], 
 		'cur'			=> $folder['num_messages'],
-		'remaining'		=> $user->data['message_limit'] - $folder['num_messages'],
+		'remaining'		=> ($user->data['message_limit']) ? $user->data['message_limit'] - $folder['num_messages'] : 0,
 		'max'			=> $user->data['message_limit'],
-		'percent'		=> ($user->data['message_limit'] > 0) ? round(($folder['num_messages'] / $user->data['message_limit']) * 100) : 100,
+		'percent'		=> ($user->data['message_limit']) ? (($user->data['message_limit'] > 0) ? round(($folder['num_messages'] / $user->data['message_limit']) * 100) : 100) : 0,
 	);
 
 	$return['message']	= sprintf($user->lang['FOLDER_STATUS_MSG'], $return['percent'], $return['cur'], $return['max']);
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index 3d7df02850..d6391a4821 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -427,7 +427,7 @@ class ucp_register
 			$str = '';
 			if (!$change_lang)
 			{
-				$sql = 'SELECT c.confirm_id
+				$sql = 'SELECT c.session_id
 					FROM ' . CONFIRM_TABLE . ' c
 					LEFT JOIN ' . SESSIONS_TABLE . ' s ON (c.session_id = s.session_id)
 					WHERE s.session_id IS NULL';
@@ -438,14 +438,14 @@ class ucp_register
 					$sql_in = array();
 					do
 					{
-						$sql_in[] = (string) $row['confirm_id'];
+						$sql_in[(string) $row['session_id']] = 1;
 					}
 					while ($row = $db->sql_fetchrow($result));
 
 					if (sizeof($sql_in))
 					{
 						$sql = 'DELETE FROM ' . CONFIRM_TABLE . '
-							WHERE ' . $db->sql_in_set('confirm_id', $sql_in) . '
+							WHERE ' . $db->sql_in_set('session_id', array_keys($sql_in)) . '
 								AND confirm_type = ' . CONFIRM_REG;
 						$db->sql_query($sql);
 					}
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 44ae3bc196..7c397535ca 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -34,7 +34,7 @@ if (empty($lang) || !is_array($lang))
 $lang = array_merge($lang, array(
 	'TERMS_OF_USE_CONTENT'	=> 'By accessing “%1$s” (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”), you agree to be legally bound by the following terms. If you do not agree to be legally bound by all of the following terms then please do not access and/or use “%1$s”. We may change these at any time and we’ll do our utmost in informing you, though it would be prudent to review this regularly yourself as your continued usage of “%1$s” after changes mean you agree to be legally bound by these terms as they are updated and/or amended.
      
 	
      
-	Our forums are powered by phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Group”, “phpBB Teams”) which is a bulletin board solution released under the “General Public License” (hereinafter “GPL”) and can be downloaded from www.phpbb.com. The phpBB software only facilitates internet based discussions, the phpBB Group are not responsible for what we allow and/or disallow as permissible content and/or conduct. For further information about phpBB, please see: http://www.phpbb.com/.
      
+	Our forums are powered by phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Group”, “phpBB Teams”) which is a bulletin board solution released under the “General Public License” (hereinafter “GPL”) and can be downloaded from www.phpbb.com. The phpBB software only facilitates internet based discussions, the phpBB Group are not responsible for what we allow and/or disallow as permissible content and/or conduct. For further information about phpBB, please see: http://www.phpbb.com/.
      
 	
      
 	You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-orientated or any other material that may violate any laws be it of your country, the country where “%1$s” is hosted or International Law. Doing so may lead to you being immediately and permanently banned, with notification of your Internet Service Provider if deemed required by us. The IP address of all posts are recorded to aid in enforcing these conditions. You agree that “%1$s” have the right to remove, edit, move or close any topic at any time should we see fit. As a user you agree to any information you have entered to being stored in a database. While this information will not be disclosed to any third party without your consent, neither “%1$s” nor phpBB shall be held responsible for any hacking attempt that may lead to the data being compromised.
 	',
@@ -106,8 +106,8 @@ $lang = array_merge($lang, array(
 	'CANNOT_EDIT_MESSAGE_TIME'	=> 'You can no longer edit or delete that message.',
 	'CANNOT_MOVE_TO_SAME_FOLDER'=> 'Messages cannot be moved to the folder you want to remove.',
 	'CANNOT_MOVE_FROM_SPECIAL'	=> 'Messages cannot be moved from the outbox.',
-	'CANNOT_RENAME_FOLDER'		=> 'This folder can not be renamed.',
-	'CANNOT_REMOVE_FOLDER'		=> 'This folder can not be removed.',
+	'CANNOT_RENAME_FOLDER'		=> 'This folder cannot be renamed.',
+	'CANNOT_REMOVE_FOLDER'		=> 'This folder cannot be removed.',
 	'CHANGE_DEFAULT_GROUP'		=> 'Change default group',
 	'CHANGE_PASSWORD'			=> 'Change password',
 	'CLICK_RETURN_FOLDER'		=> '%1$sReturn to your “%3$s” folder%2$s',

From b629d5d36a83da31ef84cbe2f5e0444d90616c24 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen 
Date: Tue, 21 Aug 2007 15:26:44 +0000
Subject: [PATCH 87/96] using distinct... david, please review and make sure it
 works on all supported dbms.

git-svn-id: file:///svn/phpbb/trunk@8062 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/ucp/ucp_register.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index d6391a4821..ca44260760 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -427,7 +427,7 @@ class ucp_register
 			$str = '';
 			if (!$change_lang)
 			{
-				$sql = 'SELECT c.session_id
+				$sql = 'SELECT DISTINCT c.session_id
 					FROM ' . CONFIRM_TABLE . ' c
 					LEFT JOIN ' . SESSIONS_TABLE . ' s ON (c.session_id = s.session_id)
 					WHERE s.session_id IS NULL';
@@ -438,14 +438,14 @@ class ucp_register
 					$sql_in = array();
 					do
 					{
-						$sql_in[(string) $row['session_id']] = 1;
+						$sql_in[] = (string) $row['session_id'];
 					}
 					while ($row = $db->sql_fetchrow($result));
 
 					if (sizeof($sql_in))
 					{
 						$sql = 'DELETE FROM ' . CONFIRM_TABLE . '
-							WHERE ' . $db->sql_in_set('session_id', array_keys($sql_in)) . '
+							WHERE ' . $db->sql_in_set('session_id', $sql_in) . '
 								AND confirm_type = ' . CONFIRM_REG;
 						$db->sql_query($sql);
 					}

From 382fe7cab41182eb0fe852de9736beaa153132b3 Mon Sep 17 00:00:00 2001
From: Nils Adermann 
Date: Tue, 21 Aug 2007 23:22:15 +0000
Subject: [PATCH 88/96] - after some debugging it turns out it was all due to
 an unclear explanation in an error message [Bug #13773]

git-svn-id: file:///svn/phpbb/trunk@8063 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/language/en/search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php
index 7f4b2d932f..616d1752c5 100644
--- a/phpBB/language/en/search.php
+++ b/phpBB/language/en/search.php
@@ -43,7 +43,7 @@ $lang = array_merge($lang, array(
 	'GLOBAL'				=> 'Global announcement',
 
 	'IGNORED_TERMS'			=> 'ignored',
-	'IGNORED_TERMS_EXPLAIN'	=> 'The following words in your search query were ignored: %s.',
+	'IGNORED_TERMS_EXPLAIN'	=> 'The following words in your search query were ignored because they are too common words: %s.',
 
 	'JUMP_TO_POST'			=> 'Jump to post',
 

From 35b45cdff1ad3a91f0e36853c721c7ec6472490c Mon Sep 17 00:00:00 2001
From: Nils Adermann 
Date: Thu, 23 Aug 2007 13:41:34 +0000
Subject: [PATCH 89/96] - added an option to specify a port for the LDAP server
 - restricted access to "Recent searches" to admins who are allowed to
 configure search [Bug #14085]

git-svn-id: file:///svn/phpbb/trunk@8064 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/auth/auth_ldap.php             | 30 +++++++-
 phpBB/install/database_update.php             |  1 +
 phpBB/install/schemas/schema_data.sql         |  1 +
 phpBB/language/en/acp/board.php               |  2 +
 phpBB/search.php                              | 74 ++++++++++---------
 .../prosilver/template/search_body.html       |  2 +
 .../subsilver2/template/search_body.html      |  2 +
 7 files changed, 74 insertions(+), 38 deletions(-)

diff --git a/phpBB/includes/auth/auth_ldap.php b/phpBB/includes/auth/auth_ldap.php
index 1e90aebe7e..a4e6365183 100644
--- a/phpBB/includes/auth/auth_ldap.php
+++ b/phpBB/includes/auth/auth_ldap.php
@@ -26,7 +26,17 @@ function init_ldap()
 		return $user->lang['LDAP_NO_LDAP_EXTENSION'];
 	}
 
-	if (!($ldap = @ldap_connect($config['ldap_server'])))
+	$config['ldap_port'] = (int) $config['ldap_port'];
+	if ($config['ldap_port'])
+	{
+		$ldap = @ldap_connect($config['ldap_server'], $config['ldap_port']);
+	}
+	else
+	{
+		$ldap = @ldap_connect($config['ldap_server']);
+	}
+
+	if (!$ldap)
 	{
 		return $user->lang['LDAP_NO_SERVER_CONNECTION'];
 	}
@@ -91,7 +101,17 @@ function login_ldap(&$username, &$password)
 		);
 	}
 
-	if (!($ldap = @ldap_connect($config['ldap_server'])))
+	$config['ldap_port'] = (int) $config['ldap_port'];
+	if ($config['ldap_port'])
+	{
+		$ldap = @ldap_connect($config['ldap_server'], $config['ldap_port']);
+	}
+	else
+	{
+		$ldap = @ldap_connect($config['ldap_server']);
+	}
+
+	if (!$ldap)
 	{
 		return array(
 			'status'		=> LOGIN_ERROR_EXTERNAL_AUTH,
@@ -256,6 +276,10 @@ function acp_ldap(&$new)
 		

      ' . $user->lang['LDAP_SERVER_EXPLAIN'] . '
      
 		
      
 	
+	
      
+		

      ' . $user->lang['LDAP_PORT_EXPLAIN'] . '
      
+		
      
+	
      
 	
      
 		

      ' . $user->lang['LDAP_DN_EXPLAIN'] . '
      
 		
      
@@ -285,7 +309,7 @@ function acp_ldap(&$new)
 	// These are fields required in the config table
 	return array(
 		'tpl'		=> $tpl,
-		'config'	=> array('ldap_server', 'ldap_base_dn', 'ldap_uid', 'ldap_user_filter', 'ldap_email', 'ldap_user', 'ldap_password')
+		'config'	=> array('ldap_server', 'ldap_port', 'ldap_base_dn', 'ldap_uid', 'ldap_user_filter', 'ldap_email', 'ldap_user', 'ldap_password')
 	);
 }
 
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 393d1d3082..4c15a4700f 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1496,6 +1496,7 @@ if (version_compare($current_version, '3.0.RC4', '<='))
 
 	// Setting this here again because new installations may not have it...
 	set_config('cron_lock', '0', true);
+	set_config('ldap_port', '');
 	set_config('ldap_user_filter', '');
 
 	$no_updates = false;
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index abb15d08ee..279837a698 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -120,6 +120,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_username', '')
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_base_dn', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_email', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_password', '');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_port', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_server', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_uid', '');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_user', '');
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 8c1f502b09..a1f311ff75 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -305,6 +305,8 @@ $lang = array_merge($lang, array(
 	'LDAP_NO_IDENTITY'				=> 'Could not find a login identity for %s.',
 	'LDAP_PASSWORD'					=> 'LDAP password',
 	'LDAP_PASSWORD_EXPLAIN'			=> 'Leave blank to use anonymous binding. Else fill in the password for the above user.  Required for Active Directory Servers. WARNING: This password will be stored as plain text in the database visible to everybody who can access your database or who can view this configuration page.',
+	'LDAP_PORT'						=> 'LDAP server port',
+	'LDAP_PORT_EXPLAIN'				=> 'Optionally you can specify a port which should be used to connect to the LDAP server instead of the default port 389.',
 	'LDAP_SERVER'					=> 'LDAP server name',
 	'LDAP_SERVER_EXPLAIN'			=> 'If using LDAP this is the hostname or IP address of the LDAP server. Alternatively you can specify an URL like ldap://hostname:port/',
 	'LDAP_UID'						=> 'LDAP uid',
diff --git a/phpBB/search.php b/phpBB/search.php
index 9acad880d2..dfeb76e946 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -1042,45 +1042,49 @@ $template->assign_vars(array(
 	'S_IN_SEARCH'			=> true,
 ));
 
-// Handle large objects differently for Oracle and MSSQL
-switch ($db->sql_layer)
+// only show recent searches to search administrators
+if ($auth->acl_get('a_search'))
 {
-	case 'oracle':
-		$sql = 'SELECT search_time, search_keywords
-			FROM ' . SEARCH_RESULTS_TABLE . '
-			WHERE dbms_lob.getlength(search_keywords) > 0
-			ORDER BY search_time DESC';
-	break;
+	// Handle large objects differently for Oracle and MSSQL
+	switch ($db->sql_layer)
+	{
+		case 'oracle':
+			$sql = 'SELECT search_time, search_keywords
+				FROM ' . SEARCH_RESULTS_TABLE . '
+				WHERE dbms_lob.getlength(search_keywords) > 0
+				ORDER BY search_time DESC';
+		break;
+	
+		case 'mssql':
+		case 'mssql_odbc':
+			$sql = 'SELECT search_time, search_keywords
+				FROM ' . SEARCH_RESULTS_TABLE . '
+				WHERE DATALENGTH(search_keywords) > 0
+				ORDER BY search_time DESC';
+		break;
+	
+		default:
+			$sql = 'SELECT search_time, search_keywords
+				FROM ' . SEARCH_RESULTS_TABLE . '
+				WHERE search_keywords <> \'\'
+				ORDER BY search_time DESC';
+		break;
+	}
+	$result = $db->sql_query_limit($sql, 5);
 
-	case 'mssql':
-	case 'mssql_odbc':
-		$sql = 'SELECT search_time, search_keywords
-			FROM ' . SEARCH_RESULTS_TABLE . '
-			WHERE DATALENGTH(search_keywords) > 0
-			ORDER BY search_time DESC';
-	break;
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$keywords = $row['search_keywords'];
 
-	default:
-		$sql = 'SELECT search_time, search_keywords
-			FROM ' . SEARCH_RESULTS_TABLE . '
-			WHERE search_keywords <> \'\'
-			ORDER BY search_time DESC';
-	break;
+		$template->assign_block_vars('recentsearch', array(
+			'KEYWORDS'	=> $keywords,
+			'TIME'		=> $user->format_date($row['search_time']),
+
+			'U_KEYWORDS'	=> append_sid("{$phpbb_root_path}search.$phpEx", 'keywords=' . urlencode(htmlspecialchars_decode($keywords)))
+		));
+	}
+	$db->sql_freeresult($result);
 }
-$result = $db->sql_query_limit($sql, 5);
-
-while ($row = $db->sql_fetchrow($result))
-{
-	$keywords = $row['search_keywords'];
-
-	$template->assign_block_vars('recentsearch', array(
-		'KEYWORDS'	=> $keywords,
-		'TIME'		=> $user->format_date($row['search_time']),
-
-		'U_KEYWORDS'	=> append_sid("{$phpbb_root_path}search.$phpEx", 'keywords=' . urlencode(htmlspecialchars_decode($keywords)))
-	));
-}
-$db->sql_freeresult($result);
 
 // Output the basic page
 page_header($user->lang['SEARCH']);
diff --git a/phpBB/styles/prosilver/template/search_body.html b/phpBB/styles/prosilver/template/search_body.html
index 95390c2545..f785fcf50a 100644
--- a/phpBB/styles/prosilver/template/search_body.html
+++ b/phpBB/styles/prosilver/template/search_body.html
@@ -91,6 +91,7 @@
 
 
 
+
 
      
 	
      
 
@@ -116,5 +117,6 @@
 
 	
      
 
      
+
 
 
\ No newline at end of file
diff --git a/phpBB/styles/subsilver2/template/search_body.html b/phpBB/styles/subsilver2/template/search_body.html
index a914e5f38d..82cb691c10 100644
--- a/phpBB/styles/subsilver2/template/search_body.html
+++ b/phpBB/styles/subsilver2/template/search_body.html
@@ -50,6 +50,7 @@
 
 	
      
 
+	
 	
@@ -68,6 +69,7 @@
 	
      
 	
      
 		{L_RECENT_SEARCHES}
      
 
 	
      
+	
 
 	
 

From 72d67ffc3816ed87222c1834f1420844abb5ce26 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen 
Date: Fri, 24 Aug 2007 14:06:54 +0000
Subject: [PATCH 90/96] forgot this line...

git-svn-id: file:///svn/phpbb/trunk@8065 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/index.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index b8b83a439e..b0d41f94e4 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -205,7 +205,10 @@ function adm_page_footer($copyright_html = true)
 
 	garbage_collection();
 
-	exit;
+	if (!defined('PHPBB_EMBEDDED'))
+	{
+		exit;
+	}
 }
 
 /**

From 445a0631e56519c210ac00dc2a8fcb83f7c6ec81 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen 
Date: Fri, 24 Aug 2007 16:36:23 +0000
Subject: [PATCH 91/96] patch by david for #14182

git-svn-id: file:///svn/phpbb/trunk@8066 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/db/mssql_odbc.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/phpBB/includes/db/mssql_odbc.php b/phpBB/includes/db/mssql_odbc.php
index d3014f0e13..72a424f46d 100644
--- a/phpBB/includes/db/mssql_odbc.php
+++ b/phpBB/includes/db/mssql_odbc.php
@@ -102,19 +102,15 @@ class dbal_mssql_odbc extends dbal
 		switch ($status)
 		{
 			case 'begin':
-				return @odbc_autocommit($this->db_connect_id, false);
+				return @odbc_exec($this->db_connect_id, 'BEGIN TRANSACTION');
 			break;
 
 			case 'commit':
-				$result = @odbc_commit($this->db_connect_id);
-				@odbc_autocommit($this->db_connect_id, true);
-				return $result;
+				return @odbc_exec($this->db_connect_id, 'COMMIT TRANSACTION');
 			break;
 
 			case 'rollback':
-				$result = @odbc_rollback($this->db_connect_id);
-				@odbc_autocommit($this->db_connect_id, true);
-				return $result;
+				return @odbc_exec($this->db_connect_id, 'ROLLBACK TRANSACTION');
 			break;
 		}
 

From a42fe680f40215159768e6b0cde4b851b711ca9b Mon Sep 17 00:00:00 2001
From: Meik Sievertsen 
Date: Fri, 24 Aug 2007 17:18:43 +0000
Subject: [PATCH 92/96] some language changes

git-svn-id: file:///svn/phpbb/trunk@8067 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/install_convert.html | 3 ++-
 phpBB/docs/CHANGELOG.html            | 2 +-
 phpBB/docs/FAQ.html                  | 4 ++--
 phpBB/language/en/install.php        | 8 ++++----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/phpBB/adm/style/install_convert.html b/phpBB/adm/style/install_convert.html
index 5d52015da6..783e89d6bf 100755
--- a/phpBB/adm/style/install_convert.html
+++ b/phpBB/adm/style/install_convert.html
@@ -120,8 +120,9 @@
 	
 
 	
+		
      {L_MESSAGE}
      
+
 		
      
-			
      {L_MESSAGE}
      
 			{S_HIDDEN}
 			disabled="disabled"  onclick="this.className = 'button1 disabled';" onsubmit="this.disabled = 'disabled';" name="submit" value="{L_SUBMIT}" />
 		
      
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 3649e7be51..886334175a 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -234,7 +234,7 @@ p a {
 		
    91. [Sec] Added alternative tokens to custom BBCodes which are safe for CSS/Javascript and changed TEXT token to entitise opening and closing parantheses.
      92. 
 		
    92. [Fix] Convert 2.0 moderator posting permissions (Bug #14105)
      93. 
 		
    93. [Fix] Correctly apply PM box limit of 0 to custom folder (Bug #14154)
      94. 
-
+		
    94. [Fix] odbc_autocommit causing existing result sets to be dropped (Bug #14182)
      95. 
 	
 
 	
diff --git a/phpBB/docs/FAQ.html b/phpBB/docs/FAQ.html
index 0ccc7c0886..6537adc1f9 100644
--- a/phpBB/docs/FAQ.html
+++ b/phpBB/docs/FAQ.html
@@ -310,7 +310,7 @@ p a {
 
 
      
 
-
      Please read our documentation about permissions.
      
+
      Please read the paragraph about permissions in our extensive online documentation.
      
 
 
      
 Top
@@ -348,7 +348,7 @@ p a {
 
 
      
 
-
      Please read our extensive user documentation first, it may just explain what you want to know.
      
+
      Please read our extensive user documentation first, it may just explain what you want to know.
      
 
 
      Feel free to search our community forum for the information you require. PLEASE DO NOT post your question without having first used search, chances are someone has already asked and answered your question. You can find our board here:
      
 
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 1a932369a8..b35e363563 100755
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -34,10 +34,10 @@ $lang = array_merge($lang, array(
 	'ADMIN_CONFIG'				=> 'Administrator configuration',
 	'ADMIN_PASSWORD'			=> 'Administrator password',
 	'ADMIN_PASSWORD_CONFIRM'	=> 'Confirm administrator password',
-	'ADMIN_PASSWORD_EXPLAIN'	=> '(Please enter a password between 6 and 30 characters in length.)',
+	'ADMIN_PASSWORD_EXPLAIN'	=> 'Please enter a password between 6 and 30 characters in length.',
 	'ADMIN_TEST'				=> 'Check administrator settings',
 	'ADMIN_USERNAME'			=> 'Administrator username',
-	'ADMIN_USERNAME_EXPLAIN'	=> '(Please enter a username between 3 and 20 characters in length.)',
+	'ADMIN_USERNAME_EXPLAIN'	=> 'Please enter a username between 3 and 20 characters in length.',
 	'APP_MAGICK'				=> 'Imagemagick support [ Attachments ]',
 	'AUTHOR_NOTES'				=> 'Author notes
      » %s',
 	'AVAILABLE'					=> 'Available',
@@ -333,10 +333,10 @@ $lang = array_merge($lang, array(
 	'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?',
-	'SYNC_FORUMS'				=> 'Starting to sync forums',
+	'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.',
-	'SYNC_TOPICS'				=> 'Starting to sync topics',
+	'SYNC_TOPICS'				=> 'Starting to synchronise topics',
 	'SYNC_TOPIC_ID'				=> 'Synchronising topics from topic_id %1$s to %2$s.',
 
 	'TABLES_MISSING'			=> 'Could not find these tables
      » %s.',

From 4c504813795b89b525be4d46268096d51335c80c Mon Sep 17 00:00:00 2001
From: David M 
Date: Fri, 24 Aug 2007 18:00:28 +0000
Subject: [PATCH 93/96] #14211 - doing is_null on Oracle is not good, we return
 empty strings instead

git-svn-id: file:///svn/phpbb/trunk@8068 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/db/firebird.php       | 2 +-
 phpBB/includes/functions_display.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php
index af8d523ab1..bc171e61be 100644
--- a/phpBB/includes/db/firebird.php
+++ b/phpBB/includes/db/firebird.php
@@ -297,7 +297,7 @@ class dbal_firebird extends dbal
 
 		foreach (get_object_vars($cur_row) as $key => $value)
 		{
-			$row[strtolower($key)] = trim(str_replace(array("\\0", "\\n"), array("\0", "\n"), $value));
+			$row[strtolower($key)] = (is_string($value)) ? trim(str_replace(array("\\0", "\\n"), array("\0", "\n"), $value)) : $value;
 		}
 
 		return (sizeof($row)) ? $row : false;
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index a28d91a7e9..208226257d 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -997,7 +997,7 @@ function watch_topic_forum($mode, &$s_watching, &$s_watching_img, $user_id, $for
 			$db->sql_freeresult($result);
 		}
 
-		if (!is_null($notify_status))
+		if (!is_null($notify_status) && $notify_status !== '')
 		{
 			if (isset($_GET['unwatch']))
 			{

From 4d0b422884d9d6cc6f28644acb2bdd93e33809d2 Mon Sep 17 00:00:00 2001
From: David M 
Date: Fri, 24 Aug 2007 18:09:59 +0000
Subject: [PATCH 94/96] #14207

git-svn-id: file:///svn/phpbb/trunk@8069 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/db/firebird.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/db/firebird.php b/phpBB/includes/db/firebird.php
index bc171e61be..771592a02a 100644
--- a/phpBB/includes/db/firebird.php
+++ b/phpBB/includes/db/firebird.php
@@ -164,9 +164,13 @@ class dbal_firebird extends dbal
 					}
 				}
 
-				if (!function_exists('ibase_affected_rows') && (preg_match('/^UPDATE ([\w_]++)\s+SET [\w_]++\s*=\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+)(?:,\s*[\w_]++\s*=\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+))*+\s+(WHERE.*)$/s', $query, $regs) || preg_match('/^DELETE FROM ([\w_]++)\s*WHERE\s*(.*)$/s', $query, $regs)))
+				if (!function_exists('ibase_affected_rows') && (preg_match('/^UPDATE ([\w_]++)\s+SET [\w_]++\s*=\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+)(?:,\s*[\w_]++\s*=\s*(?:\'(?:[^\']++|\'\')*+\'|[\d-.]+))*+\s+(WHERE.*)?$/s', $query, $regs) || preg_match('/^DELETE FROM ([\w_]++)\s*(WHERE\s*.*)?$/s', $query, $regs)))
 				{
-					$affected_sql = 'SELECT COUNT(*) as num_rows_affected FROM ' . $regs[1] . ' ' . $regs[2];
+					$affected_sql = 'SELECT COUNT(*) as num_rows_affected FROM ' . $regs[1];
+					if (!empty($regs[2]))
+					{
+						$affected_sql .= ' ' . $regs[2];
+					}
 
 					if (!($temp_q_id = @ibase_query($this->db_connect_id, $affected_sql)))
 					{

From 6f1d6e92460316e9d602fdf1b7466d4ad886564b Mon Sep 17 00:00:00 2001
From: Meik Sievertsen 
Date: Fri, 24 Aug 2007 18:26:15 +0000
Subject: [PATCH 95/96] erm, yeah...

git-svn-id: file:///svn/phpbb/trunk@8070 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/install/convertors/convert_phpbb20.php | 2 +-
 phpBB/install/schemas/schema_data.sql        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index bacd6e43b9..7f74f7bda3 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -31,7 +31,7 @@ unset($dbpasswd);
 */
 $convertor_data = array(
 	'forum_name'	=> 'phpBB 2.0.x',
-	'version'		=> '1.0.RC4',
+	'version'		=> '1.0.RC5',
 	'phpbb_version'	=> '3.0.0',
 	'author'		=> 'phpBB Group',
 	'dbms'			=> $dbms,
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 279837a698..4ea41610f1 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -208,7 +208,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.RC5-dev');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.RC5');
 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');