From 4c63ca4684d3c530ad3051899da593ae04bfd73f Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Sun, 14 Oct 2007 10:07:52 +0000 Subject: [PATCH 01/20] #14725 One check too many git-svn-id: file:///svn/phpbb/trunk@8176 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/acp/acp_ranks.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/phpBB/includes/acp/acp_ranks.php b/phpBB/includes/acp/acp_ranks.php index 51561e03f1..41ed5b0fba 100644 --- a/phpBB/includes/acp/acp_ranks.php +++ b/phpBB/includes/acp/acp_ranks.php @@ -139,11 +139,6 @@ class acp_ranks case 'edit': case 'add': - if (!check_form_key($form_name)) - { - trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING); - } - $data = $ranks = $existing_imgs = array(); $sql = 'SELECT * From 525b9bd79961041e3e095fa98eb1e8e57eaa2a7b Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 14 Oct 2007 11:35:32 +0000 Subject: [PATCH 02/20] - Submitting language changes via acp_language should be possible again [Bug #14736] git-svn-id: file:///svn/phpbb/trunk@8177 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 17 ++++++++++++----- phpBB/includes/acp/acp_language.php | 10 +++++----- phpBB/install/schemas/schema_data.sql | 2 +- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index b8003d6daa..17b5a2632c 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -53,6 +53,7 @@
  1. Changelog
      +
    1. Changes since RC-6
    2. Changes since RC-5
    3. Changes since RC-4
    4. Changes since RC-3
      5. @@ -77,7 +78,13 @@
      -

      1.i. Changes since 3.0.RC5

      +

      1.i. Changes since 3.0.RC6

      + +
        +
      • [Fix] Submitting language changes using acp_language (Bug #14736)
        • +
      + +

      1.ii. Changes since 3.0.RC5

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

      1.ii. Changes since 3.0.RC4

      +

      1.iii. Changes since 3.0.RC4

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

      1.iii. Changes since 3.0.RC3

      +

      1.iv. Changes since 3.0.RC3

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

      1.iv. Changes since 3.0.RC2

      +

      1.v. Changes since 3.0.RC2

      • [Fix] Re-allow searching within the memberlist
        • @@ -346,7 +353,7 @@
      -

      1.v. Changes since 3.0.RC1

      +

      1.vi. Changes since 3.0.RC1

      • [Fix] (X)HTML issues within the templates (Bug #11255, #11255)
        • diff --git a/phpBB/includes/acp/acp_language.php b/phpBB/includes/acp/acp_language.php index f68b3ea287..2af6d90284 100644 --- a/phpBB/includes/acp/acp_language.php +++ b/phpBB/includes/acp/acp_language.php @@ -42,11 +42,11 @@ class acp_language // Check and set some common vars $action = (isset($_POST['update_details'])) ? 'update_details' : ''; - $action = (isset($_POST['download_file'])) ? 'download_file' : ''; - $action = (isset($_POST['upload_file'])) ? 'upload_file' : ''; - $action = (isset($_POST['upload_data'])) ? 'upload_data' : ''; - $action = (isset($_POST['submit_file'])) ? 'submit_file' : ''; - $action = (isset($_POST['remove_store'])) ? 'details' : ''; + $action = (isset($_POST['download_file'])) ? 'download_file' : $action; + $action = (isset($_POST['upload_file'])) ? 'upload_file' : $action; + $action = (isset($_POST['upload_data'])) ? 'upload_data' : $action; + $action = (isset($_POST['submit_file'])) ? 'submit_file' : $action; + $action = (isset($_POST['remove_store'])) ? 'details' : $action; $submit = (empty($action)) ? false : true; $action = (empty($action)) ? request_var('action', '') : $action; diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 64f947783c..455e2f7e3f 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -213,7 +213,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.RC6'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.RC7-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 ea46faa8ffd7eac3696a2a12d9ceddad5f625e8e Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 14 Oct 2007 12:12:32 +0000 Subject: [PATCH 03/20] forum rules, forum descriptions and group description bbcode uid fixes git-svn-id: file:///svn/phpbb/trunk@8178 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 6 +++--- phpBB/docs/CHANGELOG.html | 3 ++- phpBB/install/database_update.php | 15 ++++++++++++++- phpBB/install/schemas/firebird_schema.sql | 6 +++--- phpBB/install/schemas/mssql_schema.sql | 6 +++--- phpBB/install/schemas/mysql_40_schema.sql | 6 +++--- phpBB/install/schemas/mysql_41_schema.sql | 6 +++--- phpBB/install/schemas/oracle_schema.sql | 6 +++--- phpBB/install/schemas/postgres_schema.sql | 6 +++--- phpBB/install/schemas/sqlite_schema.sql | 6 +++--- 10 files changed, 40 insertions(+), 26 deletions(-) diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index a761ae7bfa..205c530373 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1049,7 +1049,7 @@ function get_schema_struct() 'forum_desc' => array('TEXT_UNI', ''), 'forum_desc_bitfield' => array('VCHAR:255', ''), 'forum_desc_options' => array('UINT:11', 7), - 'forum_desc_uid' => array('VCHAR:5', ''), + 'forum_desc_uid' => array('VCHAR:8', ''), 'forum_link' => array('VCHAR_UNI', ''), 'forum_password' => array('VCHAR_UNI:40', ''), 'forum_style' => array('USINT', 0), @@ -1058,7 +1058,7 @@ function get_schema_struct() 'forum_rules_link' => array('VCHAR_UNI', ''), 'forum_rules_bitfield' => array('VCHAR:255', ''), 'forum_rules_options' => array('UINT:11', 7), - 'forum_rules_uid' => array('VCHAR:5', ''), + 'forum_rules_uid' => array('VCHAR:8', ''), 'forum_topics_per_page' => array('TINT:4', 0), 'forum_type' => array('TINT:4', 0), 'forum_status' => array('TINT:4', 0), @@ -1128,7 +1128,7 @@ function get_schema_struct() 'group_desc' => array('TEXT_UNI', ''), 'group_desc_bitfield' => array('VCHAR:255', ''), 'group_desc_options' => array('UINT:11', 7), - 'group_desc_uid' => array('VCHAR:5', ''), + 'group_desc_uid' => array('VCHAR:8', ''), 'group_display' => array('BOOL', 0), 'group_avatar' => array('VCHAR', ''), 'group_avatar_type' => array('TINT:2', 0), diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 17b5a2632c..f7c936c012 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -82,6 +82,7 @@
        • [Fix] Submitting language changes using acp_language (Bug #14736)
          • +
        • [Fix] Fixed wrong bbcode handling for forum rules, forum descriptions and group descriptions

        1.ii. Changes since 3.0.RC5

        @@ -106,7 +107,7 @@
      • [Feature] Added /includes/db/db_tools.php file, which includes tools for handling cross-db actions such as altering columns, etc.
      • [Change] Reset the start parameter when the timeframe is changed in the mcp topic page (Ticket #14438)
      • [Change] Added Code for cleaning the confirm table to the session garbage collection
        • -
      • [Fix] Fixed token handling in jabber class for extremely spec-compilant XMPP server (Bug #14445)
        • +
      • [Fix] Fixed token handling in jabber class for extremely spec-compliant XMPP server (Bug #14445)
      • [Fix] Disallowed galleries from using special characters (Bug #14466)
      • [Change] Listing the board url within the email text instead of appending it to the subject (Bug #14378)
      • [Fix] Always display the quote button as the most accessible one - edit is always before quote (Bug #14403)
        • diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 9ffd8cae12..122073ba42 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -8,7 +8,7 @@ * */ -$updates_to_version = '3.0.RC6'; +$updates_to_version = '3.0.RC7'; // 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')) @@ -447,6 +447,19 @@ $database_update_info = array( ), ), ), + // Changes from 3.0.RC6 to the next version + '3.0.RC6' => array( + // Change the following columns + 'change_columns' => array( + FORUMS_TABLE => array( + 'forum_desc_uid' => array('VCHAR:8', ''), + 'forum_rules_uid' => array('VCHAR:8', ''), + ), + GROUPS_TABLE => array( + 'group_desc_uid' => array('VCHAR:8', ''), + ), + ), + ), ); // Determine mapping database type diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql index 95123f9c18..ba8e8dddb6 100644 --- a/phpBB/install/schemas/firebird_schema.sql +++ b/phpBB/install/schemas/firebird_schema.sql @@ -339,7 +339,7 @@ CREATE TABLE phpbb_forums ( forum_desc BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, forum_desc_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, forum_desc_options INTEGER DEFAULT 7 NOT NULL, - forum_desc_uid VARCHAR(5) CHARACTER SET NONE DEFAULT '' NOT NULL, + forum_desc_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL, forum_link VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, forum_password VARCHAR(40) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, forum_style INTEGER DEFAULT 0 NOT NULL, @@ -348,7 +348,7 @@ CREATE TABLE phpbb_forums ( forum_rules_link VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, forum_rules_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, forum_rules_options INTEGER DEFAULT 7 NOT NULL, - forum_rules_uid VARCHAR(5) CHARACTER SET NONE DEFAULT '' NOT NULL, + forum_rules_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL, forum_topics_per_page INTEGER DEFAULT 0 NOT NULL, forum_type INTEGER DEFAULT 0 NOT NULL, forum_status INTEGER DEFAULT 0 NOT NULL, @@ -428,7 +428,7 @@ CREATE TABLE phpbb_groups ( group_desc BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, group_desc_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, group_desc_options INTEGER DEFAULT 7 NOT NULL, - group_desc_uid VARCHAR(5) CHARACTER SET NONE DEFAULT '' NOT NULL, + group_desc_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL, group_display INTEGER DEFAULT 0 NOT NULL, group_avatar VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL, group_avatar_type INTEGER DEFAULT 0 NOT NULL, diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql index ccb6b2ea7b..2b99abed4b 100644 --- a/phpBB/install/schemas/mssql_schema.sql +++ b/phpBB/install/schemas/mssql_schema.sql @@ -415,7 +415,7 @@ CREATE TABLE [phpbb_forums] ( [forum_desc] [varchar] (4000) DEFAULT ('') NOT NULL , [forum_desc_bitfield] [varchar] (255) DEFAULT ('') NOT NULL , [forum_desc_options] [int] DEFAULT (7) NOT NULL , - [forum_desc_uid] [varchar] (5) DEFAULT ('') NOT NULL , + [forum_desc_uid] [varchar] (8) DEFAULT ('') NOT NULL , [forum_link] [varchar] (255) DEFAULT ('') NOT NULL , [forum_password] [varchar] (40) DEFAULT ('') NOT NULL , [forum_style] [int] DEFAULT (0) NOT NULL , @@ -424,7 +424,7 @@ CREATE TABLE [phpbb_forums] ( [forum_rules_link] [varchar] (255) DEFAULT ('') NOT NULL , [forum_rules_bitfield] [varchar] (255) DEFAULT ('') NOT NULL , [forum_rules_options] [int] DEFAULT (7) NOT NULL , - [forum_rules_uid] [varchar] (5) DEFAULT ('') NOT NULL , + [forum_rules_uid] [varchar] (8) DEFAULT ('') NOT NULL , [forum_topics_per_page] [int] DEFAULT (0) NOT NULL , [forum_type] [int] DEFAULT (0) NOT NULL , [forum_status] [int] DEFAULT (0) NOT NULL , @@ -533,7 +533,7 @@ CREATE TABLE [phpbb_groups] ( [group_desc] [varchar] (4000) DEFAULT ('') NOT NULL , [group_desc_bitfield] [varchar] (255) DEFAULT ('') NOT NULL , [group_desc_options] [int] DEFAULT (7) NOT NULL , - [group_desc_uid] [varchar] (5) DEFAULT ('') NOT NULL , + [group_desc_uid] [varchar] (8) DEFAULT ('') NOT NULL , [group_display] [int] DEFAULT (0) NOT NULL , [group_avatar] [varchar] (255) DEFAULT ('') NOT NULL , [group_avatar_type] [int] DEFAULT (0) NOT NULL , diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql index 1e5faf7c63..2f9e1acc3e 100644 --- a/phpBB/install/schemas/mysql_40_schema.sql +++ b/phpBB/install/schemas/mysql_40_schema.sql @@ -225,7 +225,7 @@ CREATE TABLE phpbb_forums ( forum_desc blob NOT NULL, forum_desc_bitfield varbinary(255) DEFAULT '' NOT NULL, forum_desc_options int(11) UNSIGNED DEFAULT '7' NOT NULL, - forum_desc_uid varbinary(5) DEFAULT '' NOT NULL, + forum_desc_uid varbinary(8) DEFAULT '' NOT NULL, forum_link blob NOT NULL, forum_password varbinary(120) DEFAULT '' NOT NULL, forum_style smallint(4) UNSIGNED DEFAULT '0' NOT NULL, @@ -234,7 +234,7 @@ CREATE TABLE phpbb_forums ( forum_rules_link blob NOT NULL, forum_rules_bitfield varbinary(255) DEFAULT '' NOT NULL, forum_rules_options int(11) UNSIGNED DEFAULT '7' NOT NULL, - forum_rules_uid varbinary(5) DEFAULT '' NOT NULL, + forum_rules_uid varbinary(8) DEFAULT '' NOT NULL, forum_topics_per_page tinyint(4) DEFAULT '0' NOT NULL, forum_type tinyint(4) DEFAULT '0' NOT NULL, forum_status tinyint(4) DEFAULT '0' NOT NULL, @@ -300,7 +300,7 @@ CREATE TABLE phpbb_groups ( group_desc blob NOT NULL, group_desc_bitfield varbinary(255) DEFAULT '' NOT NULL, group_desc_options int(11) UNSIGNED DEFAULT '7' NOT NULL, - group_desc_uid varbinary(5) DEFAULT '' NOT NULL, + group_desc_uid varbinary(8) DEFAULT '' NOT NULL, group_display tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, group_avatar varbinary(255) DEFAULT '' NOT NULL, group_avatar_type tinyint(2) DEFAULT '0' NOT NULL, diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql index ade22d4f84..e085017bc2 100644 --- a/phpBB/install/schemas/mysql_41_schema.sql +++ b/phpBB/install/schemas/mysql_41_schema.sql @@ -225,7 +225,7 @@ CREATE TABLE phpbb_forums ( forum_desc text NOT NULL, forum_desc_bitfield varchar(255) DEFAULT '' NOT NULL, forum_desc_options int(11) UNSIGNED DEFAULT '7' NOT NULL, - forum_desc_uid varchar(5) DEFAULT '' NOT NULL, + forum_desc_uid varchar(8) DEFAULT '' NOT NULL, forum_link varchar(255) DEFAULT '' NOT NULL, forum_password varchar(40) DEFAULT '' NOT NULL, forum_style smallint(4) UNSIGNED DEFAULT '0' NOT NULL, @@ -234,7 +234,7 @@ CREATE TABLE phpbb_forums ( forum_rules_link varchar(255) DEFAULT '' NOT NULL, forum_rules_bitfield varchar(255) DEFAULT '' NOT NULL, forum_rules_options int(11) UNSIGNED DEFAULT '7' NOT NULL, - forum_rules_uid varchar(5) DEFAULT '' NOT NULL, + forum_rules_uid varchar(8) DEFAULT '' NOT NULL, forum_topics_per_page tinyint(4) DEFAULT '0' NOT NULL, forum_type tinyint(4) DEFAULT '0' NOT NULL, forum_status tinyint(4) DEFAULT '0' NOT NULL, @@ -300,7 +300,7 @@ CREATE TABLE phpbb_groups ( group_desc text NOT NULL, group_desc_bitfield varchar(255) DEFAULT '' NOT NULL, group_desc_options int(11) UNSIGNED DEFAULT '7' NOT NULL, - group_desc_uid varchar(5) DEFAULT '' NOT NULL, + group_desc_uid varchar(8) DEFAULT '' NOT NULL, group_display tinyint(1) UNSIGNED DEFAULT '0' NOT NULL, group_avatar varchar(255) DEFAULT '' NOT NULL, group_avatar_type tinyint(2) DEFAULT '0' NOT NULL, diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql index 8e327150be..25e43a486a 100644 --- a/phpBB/install/schemas/oracle_schema.sql +++ b/phpBB/install/schemas/oracle_schema.sql @@ -482,7 +482,7 @@ CREATE TABLE phpbb_forums ( forum_desc clob DEFAULT '' , forum_desc_bitfield varchar2(255) DEFAULT '' , forum_desc_options number(11) DEFAULT '7' NOT NULL, - forum_desc_uid varchar2(5) DEFAULT '' , + forum_desc_uid varchar2(8) DEFAULT '' , forum_link varchar2(765) DEFAULT '' , forum_password varchar2(120) DEFAULT '' , forum_style number(4) DEFAULT '0' NOT NULL, @@ -491,7 +491,7 @@ CREATE TABLE phpbb_forums ( forum_rules_link varchar2(765) DEFAULT '' , forum_rules_bitfield varchar2(255) DEFAULT '' , forum_rules_options number(11) DEFAULT '7' NOT NULL, - forum_rules_uid varchar2(5) DEFAULT '' , + forum_rules_uid varchar2(8) DEFAULT '' , forum_topics_per_page number(4) DEFAULT '0' NOT NULL, forum_type number(4) DEFAULT '0' NOT NULL, forum_status number(4) DEFAULT '0' NOT NULL, @@ -590,7 +590,7 @@ CREATE TABLE phpbb_groups ( group_desc clob DEFAULT '' , group_desc_bitfield varchar2(255) DEFAULT '' , group_desc_options number(11) DEFAULT '7' NOT NULL, - group_desc_uid varchar2(5) DEFAULT '' , + group_desc_uid varchar2(8) DEFAULT '' , group_display number(1) DEFAULT '0' NOT NULL, group_avatar varchar2(255) DEFAULT '' , group_avatar_type number(2) DEFAULT '0' NOT NULL, diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql index d642227cc9..64d4404b93 100644 --- a/phpBB/install/schemas/postgres_schema.sql +++ b/phpBB/install/schemas/postgres_schema.sql @@ -358,7 +358,7 @@ CREATE TABLE phpbb_forums ( forum_desc varchar(4000) DEFAULT '' NOT NULL, forum_desc_bitfield varchar(255) DEFAULT '' NOT NULL, forum_desc_options INT4 DEFAULT '7' NOT NULL CHECK (forum_desc_options >= 0), - forum_desc_uid varchar(5) DEFAULT '' NOT NULL, + forum_desc_uid varchar(8) DEFAULT '' NOT NULL, forum_link varchar(255) DEFAULT '' NOT NULL, forum_password varchar(40) DEFAULT '' NOT NULL, forum_style INT2 DEFAULT '0' NOT NULL CHECK (forum_style >= 0), @@ -367,7 +367,7 @@ CREATE TABLE phpbb_forums ( forum_rules_link varchar(255) DEFAULT '' NOT NULL, forum_rules_bitfield varchar(255) DEFAULT '' NOT NULL, forum_rules_options INT4 DEFAULT '7' NOT NULL CHECK (forum_rules_options >= 0), - forum_rules_uid varchar(5) DEFAULT '' NOT NULL, + forum_rules_uid varchar(8) DEFAULT '' NOT NULL, forum_topics_per_page INT2 DEFAULT '0' NOT NULL, forum_type INT2 DEFAULT '0' NOT NULL, forum_status INT2 DEFAULT '0' NOT NULL, @@ -443,7 +443,7 @@ CREATE TABLE phpbb_groups ( group_desc varchar(4000) DEFAULT '' NOT NULL, group_desc_bitfield varchar(255) DEFAULT '' NOT NULL, group_desc_options INT4 DEFAULT '7' NOT NULL CHECK (group_desc_options >= 0), - group_desc_uid varchar(5) DEFAULT '' NOT NULL, + group_desc_uid varchar(8) DEFAULT '' NOT NULL, group_display INT2 DEFAULT '0' NOT NULL CHECK (group_display >= 0), group_avatar varchar(255) DEFAULT '' NOT NULL, group_avatar_type INT2 DEFAULT '0' NOT NULL, diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql index a30406e968..490441fcaa 100644 --- a/phpBB/install/schemas/sqlite_schema.sql +++ b/phpBB/install/schemas/sqlite_schema.sql @@ -218,7 +218,7 @@ CREATE TABLE phpbb_forums ( forum_desc text(65535) NOT NULL DEFAULT '', forum_desc_bitfield varchar(255) NOT NULL DEFAULT '', forum_desc_options INTEGER UNSIGNED NOT NULL DEFAULT '7', - forum_desc_uid varchar(5) NOT NULL DEFAULT '', + forum_desc_uid varchar(8) NOT NULL DEFAULT '', forum_link varchar(255) NOT NULL DEFAULT '', forum_password varchar(40) NOT NULL DEFAULT '', forum_style INTEGER UNSIGNED NOT NULL DEFAULT '0', @@ -227,7 +227,7 @@ CREATE TABLE phpbb_forums ( forum_rules_link varchar(255) NOT NULL DEFAULT '', forum_rules_bitfield varchar(255) NOT NULL DEFAULT '', forum_rules_options INTEGER UNSIGNED NOT NULL DEFAULT '7', - forum_rules_uid varchar(5) NOT NULL DEFAULT '', + forum_rules_uid varchar(8) NOT NULL DEFAULT '', forum_topics_per_page tinyint(4) NOT NULL DEFAULT '0', forum_type tinyint(4) NOT NULL DEFAULT '0', forum_status tinyint(4) NOT NULL DEFAULT '0', @@ -292,7 +292,7 @@ CREATE TABLE phpbb_groups ( group_desc text(65535) NOT NULL DEFAULT '', group_desc_bitfield varchar(255) NOT NULL DEFAULT '', group_desc_options INTEGER UNSIGNED NOT NULL DEFAULT '7', - group_desc_uid varchar(5) NOT NULL DEFAULT '', + group_desc_uid varchar(8) NOT NULL DEFAULT '', group_display INTEGER UNSIGNED NOT NULL DEFAULT '0', group_avatar varchar(255) NOT NULL DEFAULT '', group_avatar_type tinyint(2) NOT NULL DEFAULT '0', From 2b60a090eec8bd5cc3778379c730e4c9e1dd38eb Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Sun, 14 Oct 2007 12:31:32 +0000 Subject: [PATCH 04/20] #14736 #14725 git-svn-id: file:///svn/phpbb/trunk@8179 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 4 ++++ phpBB/includes/functions_convert.php | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index f7c936c012..23ef2e5d12 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -83,6 +83,10 @@
        • [Fix] Submitting language changes using acp_language (Bug #14736)
        • [Fix] Fixed wrong bbcode handling for forum rules, forum descriptions and group descriptions
          • +
        • [Fix] Fixed faulty form token for acp_ranks (Bug #14736)
          • +
        • [Fix] Fixed bbcode uid generation in the phpBB2 converter (Bug #14725)
          • + +

        1.ii. Changes since 3.0.RC5

        diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php index 3a572e128c..ed35be3db7 100644 --- a/phpBB/includes/functions_convert.php +++ b/phpBB/includes/functions_convert.php @@ -224,9 +224,17 @@ function is_topic_locked($bool) */ function make_uid($timestamp) { - return substr(base_convert(unique_id(), 16, 36), 0, BBCODE_UID_LEN); + static $last_timestamp, $last_uid; + + if (empty($last_timestamp) || $timestamp != $last_timestamp) + { + $last_uid = substr(base_convert(unique_id(), 16, 36), 0, BBCODE_UID_LEN); + } + $last_timestamp = $timestamp; + return $last_uid; } + /** * Validate a website address */ From 83abd98a3d39ffaeeafa822b553cd1e266df890a Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 14 Oct 2007 13:12:08 +0000 Subject: [PATCH 05/20] fix download location for img wrap git-svn-id: file:///svn/phpbb/trunk@8180 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/download/file.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/download/file.php b/phpBB/download/file.php index ad2abf880e..0cc5b1465b 100644 --- a/phpBB/download/file.php +++ b/phpBB/download/file.php @@ -239,7 +239,7 @@ else if (($display_cat == ATTACHMENT_CATEGORY_NONE || $display_cat == ATTACHMENT if ($display_cat == ATTACHMENT_CATEGORY_IMAGE && $mode === 'view' && (strpos($attachment['mimetype'], 'image') === 0) && strpos(strtolower($user->browser), 'msie') !== false) { - wrap_img_in_html(append_sid('./download.' . $phpEx, 'id=' . $attachment['attach_id']), $attachment['real_filename']); + wrap_img_in_html(append_sid($phpbb_root_path . 'download/file.' . $phpEx, 'id=' . $attachment['attach_id']), $attachment['real_filename']); } else { From 10d997815a36f615c9ebdbe333edd51c71a2fa6d Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 14 Oct 2007 13:40:48 +0000 Subject: [PATCH 06/20] - Submitting language changes via acp_language should be possible again [Bug #14736] git-svn-id: file:///svn/phpbb/trunk@8181 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/acp/acp_language.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_language.php b/phpBB/includes/acp/acp_language.php index 2af6d90284..2a54d463a5 100644 --- a/phpBB/includes/acp/acp_language.php +++ b/phpBB/includes/acp/acp_language.php @@ -48,7 +48,7 @@ class acp_language $action = (isset($_POST['submit_file'])) ? 'submit_file' : $action; $action = (isset($_POST['remove_store'])) ? 'details' : $action; - $submit = (empty($action)) ? false : true; + $submit = (empty($action) && !isset($_POST['update']) && !isset($_POST['test_connection'])) ? false : true; $action = (empty($action)) ? request_var('action', '') : $action; $form_name = 'acp_lang'; From ba5c1f9b5f9d574bd88161da9195d7c7e3bd3cc1 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Sun, 14 Oct 2007 13:58:36 +0000 Subject: [PATCH 07/20] #14745 git-svn-id: file:///svn/phpbb/trunk@8182 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/styles/subsilver2/template/ucp_pm_message_footer.html | 1 - 1 file changed, 1 deletion(-) diff --git a/phpBB/styles/subsilver2/template/ucp_pm_message_footer.html b/phpBB/styles/subsilver2/template/ucp_pm_message_footer.html index 36965bff5f..314d03caf3 100644 --- a/phpBB/styles/subsilver2/template/ucp_pm_message_footer.html +++ b/phpBB/styles/subsilver2/template/ucp_pm_message_footer.html @@ -26,7 +26,6 @@   {S_FORM_TOKEN} - {S_FORM_TOKEN} From 1fb304c5f212c6e26a06363805950fe453f0c9c2 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 14 Oct 2007 15:46:44 +0000 Subject: [PATCH 08/20] more fixes... git-svn-id: file:///svn/phpbb/trunk@8183 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 2 +- phpBB/docs/CHANGELOG.html | 2 +- phpBB/includes/acp/acp_language.php | 5 +++++ phpBB/install/database_update.php | 3 +++ phpBB/install/install_update.php | 2 +- phpBB/install/schemas/firebird_schema.sql | 2 +- 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 | 2 +- phpBB/install/schemas/postgres_schema.sql | 2 +- phpBB/install/schemas/sqlite_schema.sql | 2 +- 12 files changed, 18 insertions(+), 10 deletions(-) diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 205c530373..abfe9b33ca 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1841,7 +1841,7 @@ function get_schema_struct() 'user_occ' => array('TEXT_UNI', ''), 'user_interests' => array('TEXT_UNI', ''), 'user_actkey' => array('VCHAR:32', ''), - 'user_newpasswd' => array('VCHAR_UNI:32', ''), + 'user_newpasswd' => array('VCHAR_UNI:40', ''), 'user_form_salt' => array('VCHAR_UNI:32', ''), ), diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 23ef2e5d12..58c85a5890 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -85,7 +85,7 @@
      • [Fix] Fixed wrong bbcode handling for forum rules, forum descriptions and group descriptions
      • [Fix] Fixed faulty form token for acp_ranks (Bug #14736)
      • [Fix] Fixed bbcode uid generation in the phpBB2 converter (Bug #14725)
        • - +
      • [Fix] Able to request new password (Bug #14743)
      diff --git a/phpBB/includes/acp/acp_language.php b/phpBB/includes/acp/acp_language.php index 2a54d463a5..fc2ae11b1e 100644 --- a/phpBB/includes/acp/acp_language.php +++ b/phpBB/includes/acp/acp_language.php @@ -1171,6 +1171,11 @@ class acp_language /** * DO NOT CHANGE */ +if (!defined(\'IN_PHPBB\')) +{ + exit; +} + if (empty($lang) || !is_array($lang)) { $lang = array(); diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 122073ba42..4d878b15c0 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -458,6 +458,9 @@ $database_update_info = array( GROUPS_TABLE => array( 'group_desc_uid' => array('VCHAR:8', ''), ), + USERS_TABLE => array( + 'user_newpasswd' => array('VCHAR_UNI:40', ''), + ), ), ), ); diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 14f3fb368a..36cb806ca6 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -1187,7 +1187,7 @@ class install_update extends module $template->assign_vars(array( 'DIFF_CONTENT' => $renderer->get_diff_content($diff), - 'DIFF_MODE' => $diff_mode, + 'DIFF_MODE' => $diff_mode, 'S_DIFF_MODE_OPTIONS' => $diff_mode_options, 'S_SHOW_DIFF' => true, )); diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql index ba8e8dddb6..686c59184b 100644 --- a/phpBB/install/schemas/firebird_schema.sql +++ b/phpBB/install/schemas/firebird_schema.sql @@ -1354,7 +1354,7 @@ CREATE TABLE phpbb_users ( user_occ BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, user_interests BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, user_actkey VARCHAR(32) CHARACTER SET NONE DEFAULT '' NOT NULL, - user_newpasswd VARCHAR(32) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, + user_newpasswd VARCHAR(40) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, user_form_salt VARCHAR(32) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE );; diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql index 2b99abed4b..804a970013 100644 --- a/phpBB/install/schemas/mssql_schema.sql +++ b/phpBB/install/schemas/mssql_schema.sql @@ -1621,7 +1621,7 @@ CREATE TABLE [phpbb_users] ( [user_occ] [varchar] (4000) DEFAULT ('') NOT NULL , [user_interests] [varchar] (4000) DEFAULT ('') NOT NULL , [user_actkey] [varchar] (32) DEFAULT ('') NOT NULL , - [user_newpasswd] [varchar] (32) DEFAULT ('') NOT NULL , + [user_newpasswd] [varchar] (40) DEFAULT ('') NOT NULL , [user_form_salt] [varchar] (32) DEFAULT ('') NOT NULL ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] GO diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql index 2f9e1acc3e..a4f617209b 100644 --- a/phpBB/install/schemas/mysql_40_schema.sql +++ b/phpBB/install/schemas/mysql_40_schema.sql @@ -954,7 +954,7 @@ CREATE TABLE phpbb_users ( user_occ blob NOT NULL, user_interests blob NOT NULL, user_actkey varbinary(32) DEFAULT '' NOT NULL, - user_newpasswd varbinary(96) DEFAULT '' NOT NULL, + user_newpasswd varbinary(120) DEFAULT '' NOT NULL, user_form_salt varbinary(96) DEFAULT '' NOT NULL, PRIMARY KEY (user_id), KEY user_birthday (user_birthday), diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql index e085017bc2..618b98b280 100644 --- a/phpBB/install/schemas/mysql_41_schema.sql +++ b/phpBB/install/schemas/mysql_41_schema.sql @@ -954,7 +954,7 @@ CREATE TABLE phpbb_users ( user_occ text NOT NULL, user_interests text NOT NULL, user_actkey varchar(32) DEFAULT '' NOT NULL, - user_newpasswd varchar(32) DEFAULT '' NOT NULL, + user_newpasswd varchar(40) DEFAULT '' NOT NULL, user_form_salt varchar(32) DEFAULT '' NOT NULL, PRIMARY KEY (user_id), KEY user_birthday (user_birthday), diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql index 25e43a486a..275de3d488 100644 --- a/phpBB/install/schemas/oracle_schema.sql +++ b/phpBB/install/schemas/oracle_schema.sql @@ -1771,7 +1771,7 @@ CREATE TABLE phpbb_users ( user_occ clob DEFAULT '' , user_interests clob DEFAULT '' , user_actkey varchar2(32) DEFAULT '' , - user_newpasswd varchar2(96) DEFAULT '' , + user_newpasswd varchar2(120) DEFAULT '' , user_form_salt varchar2(96) DEFAULT '' , CONSTRAINT pk_phpbb_users PRIMARY KEY (user_id), CONSTRAINT u_phpbb_username_clean UNIQUE (username_clean) diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql index 64d4404b93..34ebe22742 100644 --- a/phpBB/install/schemas/postgres_schema.sql +++ b/phpBB/install/schemas/postgres_schema.sql @@ -1217,7 +1217,7 @@ CREATE TABLE phpbb_users ( user_occ varchar(4000) DEFAULT '' NOT NULL, user_interests varchar(4000) DEFAULT '' NOT NULL, user_actkey varchar(32) DEFAULT '' NOT NULL, - user_newpasswd varchar(32) DEFAULT '' NOT NULL, + user_newpasswd varchar(40) DEFAULT '' NOT NULL, user_form_salt varchar(32) DEFAULT '' NOT NULL, PRIMARY KEY (user_id) ); diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql index 490441fcaa..5e2d28b5bc 100644 --- a/phpBB/install/schemas/sqlite_schema.sql +++ b/phpBB/install/schemas/sqlite_schema.sql @@ -924,7 +924,7 @@ CREATE TABLE phpbb_users ( user_occ text(65535) NOT NULL DEFAULT '', user_interests text(65535) NOT NULL DEFAULT '', user_actkey varchar(32) NOT NULL DEFAULT '', - user_newpasswd varchar(32) NOT NULL DEFAULT '', + user_newpasswd varchar(40) NOT NULL DEFAULT '', user_form_salt varchar(32) NOT NULL DEFAULT '' ); From 390407add94f33466e763932b4b186a97dd93d12 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 14 Oct 2007 16:10:37 +0000 Subject: [PATCH 09/20] hopefully now having correct bug ids? ;) git-svn-id: file:///svn/phpbb/trunk@8184 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 58c85a5890..8253a35291 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -83,8 +83,8 @@
      • [Fix] Submitting language changes using acp_language (Bug #14736)
      • [Fix] Fixed wrong bbcode handling for forum rules, forum descriptions and group descriptions
        • -
      • [Fix] Fixed faulty form token for acp_ranks (Bug #14736)
        • -
      • [Fix] Fixed bbcode uid generation in the phpBB2 converter (Bug #14725)
        • +
      • [Fix] Fixed faulty form token for acp_ranks (Bug #14725)
        • +
      • [Fix] Fixed bbcode uid generation in the phpBB2 converter (Bug #14722)
      • [Fix] Able to request new password (Bug #14743)
      From 6e9f6d44c75317e1da6373b7b8223e65054c7e1e Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 14 Oct 2007 16:18:01 +0000 Subject: [PATCH 10/20] :o --- from bug #14728 git-svn-id: file:///svn/phpbb/trunk@8185 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/styles/prosilver/template/memberlist_leaders.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/memberlist_leaders.html b/phpBB/styles/prosilver/template/memberlist_leaders.html index 60496139c2..88b4510a71 100644 --- a/phpBB/styles/prosilver/template/memberlist_leaders.html +++ b/phpBB/styles/prosilver/template/memberlist_leaders.html @@ -63,7 +63,7 @@ {L_NO_MEMBERS} - + From 1f8dec8c691c43b8fea7627527b894007942055d Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 14 Oct 2007 17:50:37 +0000 Subject: [PATCH 11/20] use language variable git-svn-id: file:///svn/phpbb/trunk@8186 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/acp/acp_forums.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 50b67d0346..d38ab3d1c5 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -613,7 +613,7 @@ class acp_forums if (strlen($forum_data['forum_password']) == 32) { - $errors[] = 'FORUM_PASSWORD_OLD'; + $errors[] = $user->lang['FORUM_PASSWORD_OLD']; } $template->assign_vars(array( From d33e6b8260be09ec5f9ffc935790bce39925b232 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Sun, 14 Oct 2007 19:12:32 +0000 Subject: [PATCH 12/20] #14755 git-svn-id: file:///svn/phpbb/trunk@8187 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_ban.html | 3 ++- phpBB/docs/CHANGELOG.html | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html index 8dd771f7fa..d8638f5bcd 100644 --- a/phpBB/adm/style/acp_ban.html +++ b/phpBB/adm/style/acp_ban.html @@ -73,7 +73,7 @@

      - +{S_FORM_TOKEN}

      @@ -117,6 +117,7 @@ +{S_FORM_TOKEN} diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 8253a35291..51001d68da 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -83,7 +83,7 @@
      • [Fix] Submitting language changes using acp_language (Bug #14736)
      • [Fix] Fixed wrong bbcode handling for forum rules, forum descriptions and group descriptions
        • -
      • [Fix] Fixed faulty form token for acp_ranks (Bug #14725)
        • +
      • [Fix] Fixed faulty form tokens (Bug #14725 and #14755)
      • [Fix] Fixed bbcode uid generation in the phpBB2 converter (Bug #14722)
      • [Fix] Able to request new password (Bug #14743)
        • From b3dbe946cd7a08bef28da98aee5859c4cb4afc67 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 14 Oct 2007 20:53:56 +0000 Subject: [PATCH 13/20] actually, these settings should not be enabled by default. git-svn-id: file:///svn/phpbb/trunk@8188 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/install/schemas/schema_data.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 455e2f7e3f..046dca8360 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -172,8 +172,8 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_urls', '5' INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_name_chars', '3'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_pass_chars', '6'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_search_author_chars', '3'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_time_reg', '5'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_time_terms', '2'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_time_reg', '0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_time_terms', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('override_user_style', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('pass_complex', 'PASS_TYPE_ANY'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_edit_time', '0'); From 15dcba000da61ff9212f0acf9a1a31732d836399 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 14 Oct 2007 21:26:07 +0000 Subject: [PATCH 14/20] ok, fought #14735 with the help from paul. git-svn-id: file:///svn/phpbb/trunk@8189 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/install_update.html | 17 ++++++++++++----- phpBB/install/install_update.php | 12 ++++++------ 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html index 2dbc0c7c47..c9059d8801 100644 --- a/phpBB/adm/style/install_update.html +++ b/phpBB/adm/style/install_update.html @@ -2,6 +2,17 @@ @@ -41,7 +41,7 @@ {L_COPPA_NO}  {L_COPPA_YES} -   +   @@ -51,7 +51,7 @@ {S_HIDDEN_FIELDS} {S_FORM_TOKEN} - +
        diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html index c8af288885..8fd722e241 100644 --- a/phpBB/styles/prosilver/template/ucp_register.html +++ b/phpBB/styles/prosilver/template/ucp_register.html @@ -10,7 +10,7 @@ document.forms['register'].change_lang.value = lang_iso; document.forms['register'].submit.click(); } - + function disable(disabl, name) { document.getElementById(name).disabled = disabl; @@ -23,12 +23,12 @@ document.getElementById(name).className = 'button1 enabled'; } } - + onload_functions.push('disable(true, "submit")'); - setTimeout('disable(false, "submit")', {S_TIME}); + setInterval('disable(false, "submit")', {S_TIME}); - + // ]]> @@ -68,9 +68,9 @@
        - +
        - +
        @@ -130,7 +130,7 @@
        {S_HIDDEN_FIELDS} -   +  
        diff --git a/phpBB/styles/subsilver2/template/ucp_agreement.html b/phpBB/styles/subsilver2/template/ucp_agreement.html index 04d978c70e..c02ebe18e6 100644 --- a/phpBB/styles/subsilver2/template/ucp_agreement.html +++ b/phpBB/styles/subsilver2/template/ucp_agreement.html @@ -4,12 +4,12 @@ // + + window.onload = disable_and_handle; - setTimeout("disable(false)", {S_TIME}); + setInterval("disable(false)", {S_TIME}); // ]]> - +
        - + @@ -57,7 +57,7 @@ {S_HIDDEN_FIELDS} {S_FORM_TOKEN} - +
        {SITENAME} - {L_REGISTRATION}
        diff --git a/phpBB/styles/subsilver2/template/ucp_register.html b/phpBB/styles/subsilver2/template/ucp_register.html index 159c663915..6a5adb8be8 100644 --- a/phpBB/styles/subsilver2/template/ucp_register.html +++ b/phpBB/styles/subsilver2/template/ucp_register.html @@ -10,14 +10,14 @@ document.forms['register'].change_lang.value = lang_iso; document.forms['register'].submit.click(); } - + var old_func = window.onload; - + function disable(disabl) { document.getElementById("submit").disabled = disabl; } - + function disable_and_handle() { if (old_func) @@ -26,10 +26,10 @@ } disable(true); } - - + + window.onload = disable_and_handle; - setTimeout("disable(false)", {S_TIME}); + setInterval("disable(false)", {S_TIME}); // ]]> @@ -48,12 +48,12 @@ - + - + From 6e0dd97c60793ce01d696a4fbf110a762aae33ce Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 14 Oct 2007 23:10:22 +0000 Subject: [PATCH 19/20] *** empty log message *** git-svn-id: file:///svn/phpbb/trunk@8194 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/acp/acp_forums.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index d38ab3d1c5..39d437b725 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -948,8 +948,8 @@ class acp_forums { return $errors; } - - // As we don't know the old password, it's kinda tricky to detect changes + + // As we don't know the old password, it's kinda tricky to detect changes if ($forum_data_sql['forum_password_unset']) { $forum_data_sql['forum_password'] = '';
        {L_REG_COND}
        {L_ITEMS_REQUIRED}