From cc24876726854e2e799651b1d7e40e54a2c0375b Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 3 Feb 2008 22:55:10 +0000 Subject: merging r8373 into 3.0 branch: adding a new option to hide the entire list of subforums on listforums git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8374 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/develop') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 9ee9a81299..375ea8588d 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1072,6 +1072,7 @@ function get_schema_struct() 'forum_last_poster_name'=> array('VCHAR_UNI', ''), 'forum_last_poster_colour'=> array('VCHAR:6', ''), 'forum_flags' => array('TINT:4', 32), + 'display_subforum_list' => array('BOOL', 1), 'display_on_index' => array('BOOL', 1), 'enable_indexing' => array('BOOL', 1), 'enable_icons' => array('BOOL', 1), -- cgit v1.2.1 From b7ef95ed091580df66da23fc1bca403758645fc3 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Mon, 17 Mar 2008 16:25:07 +0000 Subject: This should get rid of the filesorts and temp tables on index (with topic read tracking as exception). Updater still needs testing. Not yet merged to 3.1 #22715 - thanks HoL git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8436 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'phpBB/develop') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 375ea8588d..cefdf404dd 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1144,7 +1144,7 @@ function get_schema_struct() ), 'PRIMARY_KEY' => 'group_id', 'KEYS' => array( - 'group_legend' => array('INDEX', 'group_legend'), + 'group_legend_name' => array('INDEX', array('group_legend', 'group_name')), ), ); @@ -1520,6 +1520,7 @@ function get_schema_struct() 'COLUMNS' => array( 'session_id' => array('CHAR:32', ''), 'session_user_id' => array('UINT', 0), + 'session_forum_id' => array('UINT', 0), 'session_last_visit' => array('TIMESTAMP', 0), 'session_start' => array('TIMESTAMP', 0), 'session_time' => array('TIMESTAMP', 0), @@ -1535,6 +1536,7 @@ function get_schema_struct() 'KEYS' => array( 'session_time' => array('INDEX', 'session_time'), 'session_user_id' => array('INDEX', 'session_user_id'), + 'session_forum_id' => array('INDEX', 'session_forum_id'), ), ); -- cgit v1.2.1 From fd57f020f75a19ef2f4dde32a40a3b41791c6df3 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Wed, 4 Jun 2008 15:37:06 +0000 Subject: removed executable props [Bug #6464] git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8598 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/adjust_avatars.php | 0 phpBB/develop/adjust_uids.php | 0 phpBB/develop/repair_bots.php | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 phpBB/develop/adjust_avatars.php mode change 100755 => 100644 phpBB/develop/adjust_uids.php mode change 100755 => 100644 phpBB/develop/repair_bots.php (limited to 'phpBB/develop') diff --git a/phpBB/develop/adjust_avatars.php b/phpBB/develop/adjust_avatars.php old mode 100755 new mode 100644 diff --git a/phpBB/develop/adjust_uids.php b/phpBB/develop/adjust_uids.php old mode 100755 new mode 100644 diff --git a/phpBB/develop/repair_bots.php b/phpBB/develop/repair_bots.php old mode 100755 new mode 100644 -- cgit v1.2.1 From b8647dc952b8992e3a09d31f27a5f3834fb4e8b5 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 21 Jun 2008 16:04:13 +0000 Subject: change subject/title column length git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8666 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'phpBB/develop') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index cefdf404dd..5f583648bf 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -674,7 +674,7 @@ foreach ($supported_dbms as $dbms) } $line .= ($key_data[0] == 'INDEX') ? 'CREATE INDEX' : ''; - + $line .= " {$table_name}_{$key_name} ON {$table_name} (" . implode(', ', $key_data[1]) . ")\n"; $line .= "/\n"; break; @@ -1005,7 +1005,7 @@ function get_schema_struct() 'topic_id' => array('UINT', 0), 'forum_id' => array('UINT', 0), 'save_time' => array('TIMESTAMP', 0), - 'draft_subject' => array('XSTEXT_UNI', ''), + 'draft_subject' => array('STEXT_UNI', ''), 'draft_message' => array('MTEXT_UNI', ''), ), 'PRIMARY_KEY' => 'draft_id', @@ -1067,7 +1067,7 @@ function get_schema_struct() 'forum_topics_real' => array('UINT', 0), 'forum_last_post_id' => array('UINT', 0), 'forum_last_poster_id' => array('UINT', 0), - 'forum_last_post_subject' => array('XSTEXT_UNI', ''), + 'forum_last_post_subject' => array('STEXT_UNI', ''), 'forum_last_post_time' => array('TIMESTAMP', 0), 'forum_last_poster_name'=> array('VCHAR_UNI', ''), 'forum_last_poster_colour'=> array('VCHAR:6', ''), @@ -1281,7 +1281,7 @@ function get_schema_struct() 'enable_magic_url' => array('BOOL', 1), 'enable_sig' => array('BOOL', 1), 'post_username' => array('VCHAR_UNI:255', ''), - 'post_subject' => array('XSTEXT_UNI', '', 'true_sort'), + 'post_subject' => array('STEXT_UNI', '', 'true_sort'), 'post_text' => array('MTEXT_UNI', ''), 'post_checksum' => array('VCHAR:32', ''), 'post_attachment' => array('BOOL', 0), @@ -1317,7 +1317,7 @@ function get_schema_struct() 'enable_smilies' => array('BOOL', 1), 'enable_magic_url' => array('BOOL', 1), 'enable_sig' => array('BOOL', 1), - 'message_subject' => array('XSTEXT_UNI', ''), + 'message_subject' => array('STEXT_UNI', ''), 'message_text' => array('MTEXT_UNI', ''), 'message_edit_reason' => array('STEXT_UNI', ''), 'message_edit_user' => array('UINT', 0), @@ -1536,7 +1536,7 @@ function get_schema_struct() 'KEYS' => array( 'session_time' => array('INDEX', 'session_time'), 'session_user_id' => array('INDEX', 'session_user_id'), - 'session_forum_id' => array('INDEX', 'session_forum_id'), + 'session_fid' => array('INDEX', 'session_forum_id'), ), ); @@ -1682,7 +1682,7 @@ function get_schema_struct() 'topic_attachment' => array('BOOL', 0), 'topic_approved' => array('BOOL', 1), 'topic_reported' => array('BOOL', 0), - 'topic_title' => array('XSTEXT_UNI', '', 'true_sort'), + 'topic_title' => array('STEXT_UNI', '', 'true_sort'), 'topic_poster' => array('UINT', 0), 'topic_time' => array('TIMESTAMP', 0), 'topic_time_limit' => array('TIMESTAMP', 0), @@ -1698,7 +1698,7 @@ function get_schema_struct() 'topic_last_poster_id' => array('UINT', 0), 'topic_last_poster_name' => array('VCHAR_UNI', ''), 'topic_last_poster_colour' => array('VCHAR:6', ''), - 'topic_last_post_subject' => array('XSTEXT_UNI', ''), + 'topic_last_post_subject' => array('STEXT_UNI', ''), 'topic_last_post_time' => array('TIMESTAMP', 0), 'topic_last_view_time' => array('TIMESTAMP', 0), 'topic_moved_id' => array('UINT', 0), -- cgit v1.2.1 From b95f78249368ca6e87a584f346fdca2ddb400a85 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 29 Jul 2008 14:59:58 +0000 Subject: update upgrader schema to 3.0.2 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8718 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/mysql_upgrader.php | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'phpBB/develop') diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php index ea64a1a94f..e60f327ab5 100644 --- a/phpBB/develop/mysql_upgrader.php +++ b/phpBB/develop/mysql_upgrader.php @@ -477,7 +477,7 @@ function get_schema_struct() 'topic_id' => array('UINT', 0), 'forum_id' => array('UINT', 0), 'save_time' => array('TIMESTAMP', 0), - 'draft_subject' => array('XSTEXT_UNI', ''), + 'draft_subject' => array('STEXT_UNI', ''), 'draft_message' => array('MTEXT_UNI', ''), ), 'PRIMARY_KEY' => 'draft_id', @@ -539,11 +539,12 @@ function get_schema_struct() 'forum_topics_real' => array('UINT', 0), 'forum_last_post_id' => array('UINT', 0), 'forum_last_poster_id' => array('UINT', 0), - 'forum_last_post_subject' => array('XSTEXT_UNI', ''), + 'forum_last_post_subject' => array('STEXT_UNI', ''), 'forum_last_post_time' => array('TIMESTAMP', 0), 'forum_last_poster_name'=> array('VCHAR_UNI', ''), 'forum_last_poster_colour'=> array('VCHAR:6', ''), 'forum_flags' => array('TINT:4', 32), + 'display_subforum_list' => array('BOOL', 1), 'display_on_index' => array('BOOL', 1), 'enable_indexing' => array('BOOL', 1), 'enable_icons' => array('BOOL', 1), @@ -615,7 +616,7 @@ function get_schema_struct() ), 'PRIMARY_KEY' => 'group_id', 'KEYS' => array( - 'group_legend' => array('INDEX', 'group_legend'), + 'group_legend_name' => array('INDEX', array('group_legend', 'group_name')), ), ); @@ -752,8 +753,8 @@ function get_schema_struct() 'enable_magic_url' => array('BOOL', 1), 'enable_sig' => array('BOOL', 1), 'post_username' => array('VCHAR_UNI:255', ''), - 'post_subject' => array('XSTEXT_UNI', '', 'true_sort'), - 'post_text' => array('MTEXT_UNI', '', ($GLOBALS['mysql_indexer']) ? 'true_sort' : 'no_sort'), + 'post_subject' => array('STEXT_UNI', '', 'true_sort'), + 'post_text' => array('MTEXT_UNI', ''), 'post_checksum' => array('VCHAR:32', ''), 'post_attachment' => array('BOOL', 0), 'bbcode_bitfield' => array('VCHAR:255', ''), @@ -788,7 +789,7 @@ function get_schema_struct() 'enable_smilies' => array('BOOL', 1), 'enable_magic_url' => array('BOOL', 1), 'enable_sig' => array('BOOL', 1), - 'message_subject' => array('XSTEXT_UNI', ''), + 'message_subject' => array('STEXT_UNI', ''), 'message_text' => array('MTEXT_UNI', ''), 'message_edit_reason' => array('STEXT_UNI', ''), 'message_edit_user' => array('UINT', 0), @@ -991,6 +992,7 @@ function get_schema_struct() 'COLUMNS' => array( 'session_id' => array('CHAR:32', ''), 'session_user_id' => array('UINT', 0), + 'session_forum_id' => array('UINT', 0), 'session_last_visit' => array('TIMESTAMP', 0), 'session_start' => array('TIMESTAMP', 0), 'session_time' => array('TIMESTAMP', 0), @@ -1006,6 +1008,7 @@ function get_schema_struct() 'KEYS' => array( 'session_time' => array('INDEX', 'session_time'), 'session_user_id' => array('INDEX', 'session_user_id'), + 'session_fid' => array('INDEX', 'session_forum_id'), ), ); @@ -1151,7 +1154,7 @@ function get_schema_struct() 'topic_attachment' => array('BOOL', 0), 'topic_approved' => array('BOOL', 1), 'topic_reported' => array('BOOL', 0), - 'topic_title' => array('XSTEXT_UNI', '', 'true_sort'), + 'topic_title' => array('STEXT_UNI', '', 'true_sort'), 'topic_poster' => array('UINT', 0), 'topic_time' => array('TIMESTAMP', 0), 'topic_time_limit' => array('TIMESTAMP', 0), @@ -1167,7 +1170,7 @@ function get_schema_struct() 'topic_last_poster_id' => array('UINT', 0), 'topic_last_poster_name' => array('VCHAR_UNI', ''), 'topic_last_poster_colour' => array('VCHAR:6', ''), - 'topic_last_post_subject' => array('XSTEXT_UNI', ''), + 'topic_last_post_subject' => array('STEXT_UNI', ''), 'topic_last_post_time' => array('TIMESTAMP', 0), 'topic_last_view_time' => array('TIMESTAMP', 0), 'topic_moved_id' => array('UINT', 0), -- cgit v1.2.1 From 612f7ebfc7b54e06035b72ddf6d2063d84416c4c Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Tue, 29 Jul 2008 15:01:09 +0000 Subject: Schema changes git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8719 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'phpBB/develop') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 5f583648bf..ae12e8345f 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1608,6 +1608,8 @@ function get_schema_struct() 'template_path' => array('VCHAR:100', ''), 'bbcode_bitfield' => array('VCHAR:255', 'kNg='), 'template_storedb' => array('BOOL', 0), + 'template_inherits_id' => array('UINT:4', 0), + 'template_inherit_path' => array('VCHAR', NULL), ), 'PRIMARY_KEY' => 'template_id', 'KEYS' => array( -- cgit v1.2.1 From 80c8b12577d1c5cb465aabf8f9158db2eb6c6810 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Tue, 29 Jul 2008 23:09:32 +0000 Subject: weird - schemas later git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8730 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/develop') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index ae12e8345f..ee3d5db88a 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1609,7 +1609,7 @@ function get_schema_struct() 'bbcode_bitfield' => array('VCHAR:255', 'kNg='), 'template_storedb' => array('BOOL', 0), 'template_inherits_id' => array('UINT:4', 0), - 'template_inherit_path' => array('VCHAR', NULL), + 'template_inherit_path' => array('VCHAR', ''), ), 'PRIMARY_KEY' => 'template_id', 'KEYS' => array( -- cgit v1.2.1 From 4a3db854b7d0ce56f3a3033f1dcc9f5baa0af8f9 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 23 Sep 2008 13:03:33 +0000 Subject: - Added 'max_recipients' setting for private messages. This setting allows admins to define the maximum number of recipients per private message with a board-wide setting and a group-specific setting. - Added new permission setting for sending private messages to groups. Now there are two permissions to define sending private messages to multiple recipients and private messages to groups. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8911 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 1 + phpBB/develop/mysql_upgrader.php | 1 + 2 files changed, 2 insertions(+) (limited to 'phpBB/develop') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index ee3d5db88a..3c8e5275a0 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1140,6 +1140,7 @@ function get_schema_struct() 'group_sig_chars' => array('UINT', 0), 'group_receive_pm' => array('BOOL', 0), 'group_message_limit' => array('UINT', 0), + 'group_max_recipients' => array('UINT', 0), 'group_legend' => array('BOOL', 1), ), 'PRIMARY_KEY' => 'group_id', diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php index e60f327ab5..82fbfb09eb 100644 --- a/phpBB/develop/mysql_upgrader.php +++ b/phpBB/develop/mysql_upgrader.php @@ -612,6 +612,7 @@ function get_schema_struct() 'group_sig_chars' => array('UINT', 0), 'group_receive_pm' => array('BOOL', 0), 'group_message_limit' => array('UINT', 0), + 'group_max_recipients' => array('UINT', 0), 'group_legend' => array('BOOL', 1), ), 'PRIMARY_KEY' => 'group_id', -- cgit v1.2.1 From fb77cdd0513994dca478c06a3c9ac5912da07872 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Wed, 26 Nov 2008 19:58:35 +0000 Subject: Better handling and finer control for custom profile fields visibility options. (Patch by Highway of Life) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9127 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 1 + phpBB/develop/mysql_upgrader.php | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'phpBB/develop') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 3c8e5275a0..32b9eceb6c 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1404,6 +1404,7 @@ function get_schema_struct() 'field_validation' => array('VCHAR_UNI:20', ''), 'field_required' => array('BOOL', 0), 'field_show_on_reg' => array('BOOL', 0), + 'field_show_profile' => array('BOOL', 0), 'field_hide' => array('BOOL', 0), 'field_no_view' => array('BOOL', 0), 'field_active' => array('BOOL', 0), diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php index 82fbfb09eb..752cb9ac5b 100644 --- a/phpBB/develop/mysql_upgrader.php +++ b/phpBB/develop/mysql_upgrader.php @@ -1,10 +1,10 @@ $table_data) $line = "ALTER TABLE {$table_name} $newline"; // Table specific so we don't get overlap - $modded_array = array(); + $modded_array = array(); // Write columns one by one... foreach ($table_data['COLUMNS'] as $column_name => $column_data) @@ -876,6 +876,7 @@ function get_schema_struct() 'field_validation' => array('VCHAR_UNI:20', ''), 'field_required' => array('BOOL', 0), 'field_show_on_reg' => array('BOOL', 0), + 'field_show_profile' => array('BOOL', 0), 'field_hide' => array('BOOL', 0), 'field_no_view' => array('BOOL', 0), 'field_active' => array('BOOL', 0), -- cgit v1.2.1 From 481e5c193fa21bd2cb8d7086fcdccd3d6964604d Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Thu, 27 Nov 2008 13:44:24 +0000 Subject: extend the style columns (style_id, template_id, imageset_id, image_id...) No, not only because of possible style demos. :o git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9129 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 24 ++++++++++++------------ phpBB/develop/mysql_upgrader.php | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) (limited to 'phpBB/develop') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 32b9eceb6c..4d39d0c6b0 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1052,7 +1052,7 @@ function get_schema_struct() 'forum_desc_uid' => array('VCHAR:8', ''), 'forum_link' => array('VCHAR_UNI', ''), 'forum_password' => array('VCHAR_UNI:40', ''), - 'forum_style' => array('USINT', 0), + 'forum_style' => array('UINT', 0), 'forum_image' => array('VCHAR', ''), 'forum_rules' => array('TEXT_UNI', ''), 'forum_rules_link' => array('VCHAR_UNI', ''), @@ -1585,13 +1585,13 @@ function get_schema_struct() $schema_data['phpbb_styles'] = array( 'COLUMNS' => array( - 'style_id' => array('USINT', NULL, 'auto_increment'), + 'style_id' => array('UINT', NULL, 'auto_increment'), 'style_name' => array('VCHAR_UNI:255', ''), 'style_copyright' => array('VCHAR_UNI', ''), 'style_active' => array('BOOL', 1), - 'template_id' => array('USINT', 0), - 'theme_id' => array('USINT', 0), - 'imageset_id' => array('USINT', 0), + 'template_id' => array('UINT', 0), + 'theme_id' => array('UINT', 0), + 'imageset_id' => array('UINT', 0), ), 'PRIMARY_KEY' => 'style_id', 'KEYS' => array( @@ -1604,7 +1604,7 @@ function get_schema_struct() $schema_data['phpbb_styles_template'] = array( 'COLUMNS' => array( - 'template_id' => array('USINT', NULL, 'auto_increment'), + 'template_id' => array('UINT', NULL, 'auto_increment'), 'template_name' => array('VCHAR_UNI:255', ''), 'template_copyright' => array('VCHAR_UNI', ''), 'template_path' => array('VCHAR:100', ''), @@ -1621,7 +1621,7 @@ function get_schema_struct() $schema_data['phpbb_styles_template_data'] = array( 'COLUMNS' => array( - 'template_id' => array('USINT', 0), + 'template_id' => array('UINT', 0), 'template_filename' => array('VCHAR:100', ''), 'template_included' => array('TEXT', ''), 'template_mtime' => array('TIMESTAMP', 0), @@ -1635,7 +1635,7 @@ function get_schema_struct() $schema_data['phpbb_styles_theme'] = array( 'COLUMNS' => array( - 'theme_id' => array('USINT', NULL, 'auto_increment'), + 'theme_id' => array('UINT', NULL, 'auto_increment'), 'theme_name' => array('VCHAR_UNI:255', ''), 'theme_copyright' => array('VCHAR_UNI', ''), 'theme_path' => array('VCHAR:100', ''), @@ -1651,7 +1651,7 @@ function get_schema_struct() $schema_data['phpbb_styles_imageset'] = array( 'COLUMNS' => array( - 'imageset_id' => array('USINT', NULL, 'auto_increment'), + 'imageset_id' => array('UINT', NULL, 'auto_increment'), 'imageset_name' => array('VCHAR_UNI:255', ''), 'imageset_copyright' => array('VCHAR_UNI', ''), 'imageset_path' => array('VCHAR:100', ''), @@ -1664,13 +1664,13 @@ function get_schema_struct() $schema_data['phpbb_styles_imageset_data'] = array( 'COLUMNS' => array( - 'image_id' => array('USINT', NULL, 'auto_increment'), + 'image_id' => array('UINT', NULL, 'auto_increment'), 'image_name' => array('VCHAR:200', ''), 'image_filename' => array('VCHAR:200', ''), 'image_lang' => array('VCHAR:30', ''), 'image_height' => array('USINT', 0), 'image_width' => array('USINT', 0), - 'imageset_id' => array('USINT', 0), + 'imageset_id' => array('UINT', 0), ), 'PRIMARY_KEY' => 'image_id', 'KEYS' => array( @@ -1808,7 +1808,7 @@ function get_schema_struct() 'user_timezone' => array('DECIMAL', 0), 'user_dst' => array('BOOL', 0), 'user_dateformat' => array('VCHAR_UNI:30', 'd M Y H:i'), - 'user_style' => array('USINT', 0), + 'user_style' => array('UINT', 0), 'user_rank' => array('UINT', 0), 'user_colour' => array('VCHAR:6', ''), 'user_new_privmsg' => array('INT:4', 0), diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php index 752cb9ac5b..bc1994bcb3 100644 --- a/phpBB/develop/mysql_upgrader.php +++ b/phpBB/develop/mysql_upgrader.php @@ -524,7 +524,7 @@ function get_schema_struct() 'forum_desc_uid' => array('VCHAR:8', ''), 'forum_link' => array('VCHAR_UNI', ''), 'forum_password' => array('VCHAR_UNI:40', ''), - 'forum_style' => array('USINT', 0), + 'forum_style' => array('UINT', 0), 'forum_image' => array('VCHAR', ''), 'forum_rules' => array('TEXT_UNI', ''), 'forum_rules_link' => array('VCHAR_UNI', ''), @@ -1057,13 +1057,13 @@ function get_schema_struct() $schema_data['phpbb_styles'] = array( 'COLUMNS' => array( - 'style_id' => array('USINT', NULL, 'auto_increment'), + 'style_id' => array('UINT', NULL, 'auto_increment'), 'style_name' => array('VCHAR_UNI:255', ''), 'style_copyright' => array('VCHAR_UNI', ''), 'style_active' => array('BOOL', 1), - 'template_id' => array('USINT', 0), - 'theme_id' => array('USINT', 0), - 'imageset_id' => array('USINT', 0), + 'template_id' => array('UINT', 0), + 'theme_id' => array('UINT', 0), + 'imageset_id' => array('UINT', 0), ), 'PRIMARY_KEY' => 'style_id', 'KEYS' => array( @@ -1076,7 +1076,7 @@ function get_schema_struct() $schema_data['phpbb_styles_template'] = array( 'COLUMNS' => array( - 'template_id' => array('USINT', NULL, 'auto_increment'), + 'template_id' => array('UINT', NULL, 'auto_increment'), 'template_name' => array('VCHAR_UNI:255', ''), 'template_copyright' => array('VCHAR_UNI', ''), 'template_path' => array('VCHAR:100', ''), @@ -1091,7 +1091,7 @@ function get_schema_struct() $schema_data['phpbb_styles_template_data'] = array( 'COLUMNS' => array( - 'template_id' => array('USINT', 0), + 'template_id' => array('UINT', 0), 'template_filename' => array('VCHAR:100', ''), 'template_included' => array('TEXT', ''), 'template_mtime' => array('TIMESTAMP', 0), @@ -1105,7 +1105,7 @@ function get_schema_struct() $schema_data['phpbb_styles_theme'] = array( 'COLUMNS' => array( - 'theme_id' => array('USINT', NULL, 'auto_increment'), + 'theme_id' => array('UINT', NULL, 'auto_increment'), 'theme_name' => array('VCHAR_UNI:255', ''), 'theme_copyright' => array('VCHAR_UNI', ''), 'theme_path' => array('VCHAR:100', ''), @@ -1121,7 +1121,7 @@ function get_schema_struct() $schema_data['phpbb_styles_imageset'] = array( 'COLUMNS' => array( - 'imageset_id' => array('USINT', NULL, 'auto_increment'), + 'imageset_id' => array('UINT', NULL, 'auto_increment'), 'imageset_name' => array('VCHAR_UNI:255', ''), 'imageset_copyright' => array('VCHAR_UNI', ''), 'imageset_path' => array('VCHAR:100', ''), @@ -1134,13 +1134,13 @@ function get_schema_struct() $schema_data['phpbb_styles_imageset_data'] = array( 'COLUMNS' => array( - 'image_id' => array('USINT', NULL, 'auto_increment'), + 'image_id' => array('UINT', NULL, 'auto_increment'), 'image_name' => array('VCHAR:200', ''), 'image_filename' => array('VCHAR:200', ''), 'image_lang' => array('VCHAR:30', ''), 'image_height' => array('USINT', 0), 'image_width' => array('USINT', 0), - 'imageset_id' => array('USINT', 0), + 'imageset_id' => array('UINT', 0), ), 'PRIMARY_KEY' => 'image_id', 'KEYS' => array( @@ -1278,7 +1278,7 @@ function get_schema_struct() 'user_timezone' => array('DECIMAL', 0), 'user_dst' => array('BOOL', 0), 'user_dateformat' => array('VCHAR_UNI:30', 'd M Y H:i'), - 'user_style' => array('USINT', 0), + 'user_style' => array('UINT', 0), 'user_rank' => array('UINT', 0), 'user_colour' => array('VCHAR:6', ''), 'user_new_privmsg' => array('INT:4', 0), -- cgit v1.2.1 From afb5f07213cc26bfd4f996a5a7f1c9eea7ddb550 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Fri, 6 Feb 2009 18:52:04 +0000 Subject: curtesty of toonarmy :) (shows cached sql queries to determine useless sql caches) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9313 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/collect_cache_stats.sh | 2 ++ 1 file changed, 2 insertions(+) create mode 100755 phpBB/develop/collect_cache_stats.sh (limited to 'phpBB/develop') diff --git a/phpBB/develop/collect_cache_stats.sh b/phpBB/develop/collect_cache_stats.sh new file mode 100755 index 0000000000..8231a3caea --- /dev/null +++ b/phpBB/develop/collect_cache_stats.sh @@ -0,0 +1,2 @@ +#!/bin/sh +cat sql_*.php | grep '/* SELECT' | sed 's,/\* ,,;s, \*/,,' | sort > _cache.txt -- cgit v1.2.1 From b6c056c1dbe401125a9bbf3e856f70cb1844ab52 Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Sat, 7 Feb 2009 00:34:45 +0000 Subject: Small fix up should work now when ran from anywhere :) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9314 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/collect_cache_stats.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'phpBB/develop') diff --git a/phpBB/develop/collect_cache_stats.sh b/phpBB/develop/collect_cache_stats.sh index 8231a3caea..5bb31c5173 100755 --- a/phpBB/develop/collect_cache_stats.sh +++ b/phpBB/develop/collect_cache_stats.sh @@ -1,2 +1,3 @@ #!/bin/sh -cat sql_*.php | grep '/* SELECT' | sed 's,/\* ,,;s, \*/,,' | sort > _cache.txt +DIR=$(dirname "$0")/../cache; +cat "$DIR/sql_*.php" | grep '/* SELECT' | sed 's,/\* ,,;s, \*/,,' | sort -- cgit v1.2.1 From 0f162568f241753ff3ec5a15c3ec9d3028c10f23 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Fri, 20 Mar 2009 13:22:19 +0000 Subject: Fix duplicate creation of acl options in acl_add_options() under certain conditions. (Bug #38385, #40225) Add unique key to ACL options table to prevent duplicate permission options. (Bug #41835) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9400 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/develop') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 4d39d0c6b0..52c72fc72c 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -855,7 +855,7 @@ function get_schema_struct() ), 'PRIMARY_KEY' => 'auth_option_id', 'KEYS' => array( - 'auth_option' => array('INDEX', 'auth_option'), + 'auth_option' => array('UNIQUE', 'auth_option'), ), ); -- cgit v1.2.1 From dc1e334d073fdb191a4742e02b401749b794f984 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 28 Apr 2009 14:14:32 +0000 Subject: bring mysql upgrader up-to-date with 3.0.5-dev git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9493 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/mysql_upgrader.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'phpBB/develop') diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php index bc1994bcb3..77341500e1 100644 --- a/phpBB/develop/mysql_upgrader.php +++ b/phpBB/develop/mysql_upgrader.php @@ -327,7 +327,7 @@ function get_schema_struct() ), 'PRIMARY_KEY' => 'auth_option_id', 'KEYS' => array( - 'auth_option' => array('INDEX', 'auth_option'), + 'auth_option' => array('UNIQUE', 'auth_option'), ), ); @@ -1082,6 +1082,8 @@ function get_schema_struct() 'template_path' => array('VCHAR:100', ''), 'bbcode_bitfield' => array('VCHAR:255', 'kNg='), 'template_storedb' => array('BOOL', 0), + 'template_inherits_id' => array('UINT:4', 0), + 'template_inherit_path' => array('VCHAR', ''), ), 'PRIMARY_KEY' => 'template_id', 'KEYS' => array( -- cgit v1.2.1 From 9f21f1ab5e2b70da18459ef26c14a2372bc0eb76 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 8 Jun 2009 12:36:26 +0000 Subject: Fix bug #44665 - Add index on log_time to the log table to prevent slowdown on boards with many log entries. Authorised by: acydburn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9564 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 1 + phpBB/develop/mysql_upgrader.php | 1 + 2 files changed, 2 insertions(+) (limited to 'phpBB/develop') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 52c72fc72c..d7173f6f1f 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1195,6 +1195,7 @@ function get_schema_struct() 'PRIMARY_KEY' => 'log_id', 'KEYS' => array( 'log_type' => array('INDEX', 'log_type'), + 'log_time' => array('INDEX', 'log_time'), 'forum_id' => array('INDEX', 'forum_id'), 'topic_id' => array('INDEX', 'topic_id'), 'reportee_id' => array('INDEX', 'reportee_id'), diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php index 77341500e1..22406d1286 100644 --- a/phpBB/develop/mysql_upgrader.php +++ b/phpBB/develop/mysql_upgrader.php @@ -667,6 +667,7 @@ function get_schema_struct() 'PRIMARY_KEY' => 'log_id', 'KEYS' => array( 'log_type' => array('INDEX', 'log_type'), + 'log_time' => array('INDEX', 'log_time'), 'forum_id' => array('INDEX', 'forum_id'), 'topic_id' => array('INDEX', 'topic_id'), 'reportee_id' => array('INDEX', 'reportee_id'), -- cgit v1.2.1 From d7d96223e7bae7cd60b13c6e7896d95838c3633c Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Fri, 19 Jun 2009 09:51:50 +0000 Subject: - Display coloured usernames in ACP groups management screens - Changed behaviour of group_create() function to support specifying additional group columns - New groups option to excempt group leaders from group permissions git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9625 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/develop') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index d7173f6f1f..05f1b217a4 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1125,6 +1125,7 @@ function get_schema_struct() 'group_id' => array('UINT', NULL, 'auto_increment'), 'group_type' => array('TINT:4', 1), 'group_founder_manage' => array('BOOL', 0), + 'group_skip_auth' => array('BOOL', 0), 'group_name' => array('VCHAR_CI', ''), 'group_desc' => array('TEXT_UNI', ''), 'group_desc_bitfield' => array('VCHAR:255', ''), -- cgit v1.2.1 From 5d9cf2aa41c61dd35114223006c5e16c104c5a2b Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Fri, 19 Jun 2009 12:31:28 +0000 Subject: Make captchas stricter by oly having one entry per session; fix a bug in ucp_register that caused three captcha instances to be generated. Non-MySQL databases and garbage collecting needs extensive testing. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9626 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/develop') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 05f1b217a4..e605d60a88 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -983,6 +983,7 @@ function get_schema_struct() 'confirm_type' => array('TINT:3', 0), 'code' => array('VCHAR:8', ''), 'seed' => array('UINT:10', 0), + 'attempts' => array('UINT', 0), ), 'PRIMARY_KEY' => array('session_id', 'confirm_id'), 'KEYS' => array( -- cgit v1.2.1 From 433de350c0fa2e1e09c23e6f5f29f118222d2df8 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 20 Jun 2009 18:45:16 +0000 Subject: - [Feature] New "Newly Registered Users" group for assigning permissions to newly registered users. They will be removed from this group once they reach a defineable amount of posts. - [Feature] Ability to define if the "Newly Registered Users" group will be assigned as the default group to newly registered users. As a coincidence also Bug #46535 got fixed. Additionally the error message displayed with trigger_error() if accessing the private message tab in the ucp is now displayed inline in addition to a slightly different message for newly registered users to let them know that access permissions may be lifted over time. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9636 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/develop') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index e605d60a88..efe442f006 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1853,7 +1853,7 @@ function get_schema_struct() 'user_actkey' => array('VCHAR:32', ''), 'user_newpasswd' => array('VCHAR_UNI:40', ''), 'user_form_salt' => array('VCHAR_UNI:32', ''), - + 'user_new' => array('BOOL', 1), ), 'PRIMARY_KEY' => 'user_id', 'KEYS' => array( -- cgit v1.2.1 From 762f87b8ad3e59d260d2d4e9fb1bf450ee92f58e Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 23 Jun 2009 10:58:44 +0000 Subject: update mysql upgrader to 3.0.6-dev git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9657 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/mysql_upgrader.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'phpBB/develop') diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php index 22406d1286..2fc02fde8a 100644 --- a/phpBB/develop/mysql_upgrader.php +++ b/phpBB/develop/mysql_upgrader.php @@ -455,6 +455,7 @@ function get_schema_struct() 'confirm_type' => array('TINT:3', 0), 'code' => array('VCHAR:8', ''), 'seed' => array('UINT:10', 0), + 'attempts' => array('UINT', 0), ), 'PRIMARY_KEY' => array('session_id', 'confirm_id'), 'KEYS' => array( @@ -597,6 +598,7 @@ function get_schema_struct() 'group_id' => array('UINT', NULL, 'auto_increment'), 'group_type' => array('TINT:4', 1), 'group_founder_manage' => array('BOOL', 0), + 'group_skip_auth' => array('BOOL', 0), 'group_name' => array('VCHAR_CI', ''), 'group_desc' => array('TEXT_UNI', ''), 'group_desc_bitfield' => array('VCHAR:255', ''), @@ -1323,7 +1325,7 @@ function get_schema_struct() 'user_actkey' => array('VCHAR:32', ''), 'user_newpasswd' => array('VCHAR_UNI:40', ''), 'user_form_salt' => array('VCHAR_UNI:32', ''), - + 'user_new' => array('BOOL', 1), ), 'PRIMARY_KEY' => 'user_id', 'KEYS' => array( -- cgit v1.2.1 From 4bef644a94f6865a948951c0e946a93b93d55b21 Mon Sep 17 00:00:00 2001 From: Ruslan Uzdenov Date: Sat, 27 Jun 2009 09:34:55 +0000 Subject: Addition to r9696 - update develop/ scripts Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9697 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 2 +- phpBB/develop/mysql_upgrader.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/develop') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index efe442f006..42f6251f67 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1833,7 +1833,7 @@ function get_schema_struct() 'user_allow_viewonline' => array('BOOL', 1), 'user_allow_viewemail' => array('BOOL', 1), 'user_allow_massemail' => array('BOOL', 1), - 'user_options' => array('UINT:11', 895), + 'user_options' => array('UINT:11', 230271), 'user_avatar' => array('VCHAR', ''), 'user_avatar_type' => array('TINT:2', 0), 'user_avatar_width' => array('USINT', 0), diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php index 2fc02fde8a..88934bde42 100644 --- a/phpBB/develop/mysql_upgrader.php +++ b/phpBB/develop/mysql_upgrader.php @@ -1305,7 +1305,7 @@ function get_schema_struct() 'user_allow_viewonline' => array('BOOL', 1), 'user_allow_viewemail' => array('BOOL', 1), 'user_allow_massemail' => array('BOOL', 1), - 'user_options' => array('UINT:11', 895), + 'user_options' => array('UINT:11', 230271), 'user_avatar' => array('VCHAR', ''), 'user_avatar_type' => array('TINT:2', 0), 'user_avatar_width' => array('USINT', 0), -- cgit v1.2.1 From 6e4a7c03d14d6fcc03955fbe26c3d5f725eb929d Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Tue, 21 Jul 2009 20:59:11 +0000 Subject: Users can report PMs to moderators which are then visible in a new MCP module git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9814 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'phpBB/develop') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 42f6251f67..ab021a15ec 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1332,6 +1332,7 @@ function get_schema_struct() 'message_edit_count' => array('USINT', 0), 'to_address' => array('TEXT_UNI', ''), 'bcc_address' => array('TEXT_UNI', ''), + 'message_reported' => array('BOOL', 0), ), 'PRIMARY_KEY' => 'msg_id', 'KEYS' => array( @@ -1465,6 +1466,7 @@ function get_schema_struct() 'report_id' => array('UINT', NULL, 'auto_increment'), 'reason_id' => array('USINT', 0), 'post_id' => array('UINT', 0), + 'pm_id' => array('UINT', 0), 'user_id' => array('UINT', 0), 'user_notify' => array('BOOL', 0), 'report_closed' => array('BOOL', 0), @@ -1472,6 +1474,10 @@ function get_schema_struct() 'report_text' => array('MTEXT_UNI', ''), ), 'PRIMARY_KEY' => 'report_id', + 'KEYS' => array( + 'post_id' => array('INDEX', 'post_id'), + 'pm_id' => array('INDEX', 'pm_id'), + ), ); $schema_data['phpbb_reports_reasons'] = array( -- cgit v1.2.1 From 4739c7ba3957dfe585973dafe7465cb9fd8c6d1f Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Fri, 24 Jul 2009 11:13:32 +0000 Subject: [Feature] Added new functionality to inactive users module: - Ability to set users per page. - Ability to sort by posts/number of reminders/last reminded date. - Show number of posts and ability to search posts. - Show number of reminders sent to user. - Show date of last reminder sent to user. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9845 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'phpBB/develop') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index ab021a15ec..09a42bc684 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1860,6 +1860,8 @@ function get_schema_struct() 'user_newpasswd' => array('VCHAR_UNI:40', ''), 'user_form_salt' => array('VCHAR_UNI:32', ''), 'user_new' => array('BOOL', 1), + 'user_reminded' => array('TINT:4', 0), + 'user_reminded_time' => array('TIMESTAMP', 0), ), 'PRIMARY_KEY' => 'user_id', 'KEYS' => array( -- cgit v1.2.1 From 1f871950d8bbefe59e18c00ea3238591c0b73807 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Mon, 3 Aug 2009 15:46:56 +0000 Subject: #48985 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9916 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/develop') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 09a42bc684..da84a6029e 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1408,6 +1408,7 @@ function get_schema_struct() 'field_validation' => array('VCHAR_UNI:20', ''), 'field_required' => array('BOOL', 0), 'field_show_on_reg' => array('BOOL', 0), + 'field_show_on_vt' => array('BOOL', 0), 'field_show_profile' => array('BOOL', 0), 'field_hide' => array('BOOL', 0), 'field_no_view' => array('BOOL', 0), -- cgit v1.2.1 From 58c0bd804fe40898b4c87444a07efb16e8e60750 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Wed, 5 Aug 2009 12:47:56 +0000 Subject: update mysql_upgrader git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9925 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/mysql_upgrader.php | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'phpBB/develop') diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php index 88934bde42..9caf9a3a04 100644 --- a/phpBB/develop/mysql_upgrader.php +++ b/phpBB/develop/mysql_upgrader.php @@ -804,6 +804,7 @@ function get_schema_struct() 'message_edit_count' => array('USINT', 0), 'to_address' => array('TEXT_UNI', ''), 'bcc_address' => array('TEXT_UNI', ''), + 'message_reported' => array('BOOL', 0), ), 'PRIMARY_KEY' => 'msg_id', 'KEYS' => array( @@ -879,6 +880,7 @@ function get_schema_struct() 'field_validation' => array('VCHAR_UNI:20', ''), 'field_required' => array('BOOL', 0), 'field_show_on_reg' => array('BOOL', 0), + 'field_show_on_vt' => array('BOOL', 0), 'field_show_profile' => array('BOOL', 0), 'field_hide' => array('BOOL', 0), 'field_no_view' => array('BOOL', 0), @@ -937,6 +939,7 @@ function get_schema_struct() 'report_id' => array('UINT', NULL, 'auto_increment'), 'reason_id' => array('USINT', 0), 'post_id' => array('UINT', 0), + 'pm_id' => array('UINT', 0), 'user_id' => array('UINT', 0), 'user_notify' => array('BOOL', 0), 'report_closed' => array('BOOL', 0), @@ -944,6 +947,10 @@ function get_schema_struct() 'report_text' => array('MTEXT_UNI', ''), ), 'PRIMARY_KEY' => 'report_id', + 'KEYS' => array( + 'post_id' => array('INDEX', 'post_id'), + 'pm_id' => array('INDEX', 'pm_id'), + ), ); $schema_data['phpbb_reports_reasons'] = array( @@ -1326,6 +1333,8 @@ function get_schema_struct() 'user_newpasswd' => array('VCHAR_UNI:40', ''), 'user_form_salt' => array('VCHAR_UNI:32', ''), 'user_new' => array('BOOL', 1), + 'user_reminded' => array('TINT:4', 0), + 'user_reminded_time' => array('TIMESTAMP', 0), ), 'PRIMARY_KEY' => 'user_id', 'KEYS' => array( -- cgit v1.2.1 From d0e9e4189ce83390beeb58acefee05bff2e6b167 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Wed, 5 Aug 2009 14:50:39 +0000 Subject: Fix Bug #46285 (drop index patch by Paul) - i hope the re-addition of the FULLTEXT index works. :o If someone wants to try? :) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9930 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/mysql_upgrader.php | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'phpBB/develop') diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php index 9caf9a3a04..1f8bccdd1f 100644 --- a/phpBB/develop/mysql_upgrader.php +++ b/phpBB/develop/mysql_upgrader.php @@ -40,13 +40,18 @@ $row = $db->sql_fetchrow($result); $db->sql_freeresult($result); -$mysql_indexer = false; +$mysql_indexer = $drop_index = false; if (strtolower($row['Type']) === 'mediumtext') { $mysql_indexer = true; } +if (strtolower($row['Key']) === 'mul') +{ + $drop_index = true; +} + echo "USE $dbname;$newline$newline"; @@ -124,6 +129,13 @@ foreach ($schema_data as $table_name => $table_data) // Create Table statement $generator = $textimage = false; + // Do we need to DROP a fulltext index before we alter the table? + if ($table_name == ($prefix . 'posts') && $drop_index) + { + echo "ALTER TABLE {$table_name}{$newline}"; + echo "DROP INDEX post_text,{$newline}DROP INDEX post_subject,{$newline}DROP INDEX post_content;{$newline}{$newline}"; + } + $line = "ALTER TABLE {$table_name} $newline"; // Table specific so we don't get overlap @@ -236,6 +248,12 @@ foreach ($schema_data as $table_name => $table_data) $line .= "\tDEFAULT CHARSET=utf8 COLLATE=utf8_bin;$newline$newline"; echo $line . "$newline"; + + // Do we now need to re-add the fulltext index? ;) + if ($table_name == ($prefix . 'posts') && $drop_index) + { + echo "ALTER TABLE $table_name ADD FULLTEXT (post_subject), ADD FULLTEXT (post_text), ADD FULLTEXT post_content (post_subject, post_text){$newline}"; + } } /** -- cgit v1.2.1 From ee65d2147b7e672c6dfdcd695f0b6314c40e42d2 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 5 Aug 2009 15:28:46 +0000 Subject: fix r9713 for #36565 Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9931 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/develop') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index da84a6029e..d8c34d0d76 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1305,6 +1305,7 @@ function get_schema_struct() 'poster_ip' => array('INDEX', 'poster_ip'), 'poster_id' => array('INDEX', 'poster_id'), 'post_approved' => array('INDEX', 'post_approved'), + 'post_username' => array('INDEX', 'post_username'), 'tid_post_time' => array('INDEX', array('topic_id', 'post_time')), ), ); -- cgit v1.2.1 From 09ad10a734c0993f9465e6ac3463951251602fc6 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Wed, 12 Aug 2009 15:00:47 +0000 Subject: ok, i am very sorry, but this needs to be fixed. Generally, our config table is not really suited for holding large datasets. Because feed settings for the forums to enable news feeds and excluded forums rely on the forums itself we have decided to introduce a forum_options table where custom options can be stored. Additionally, for this to work across all DBMS we support, we added a new method to the DBAL for the bitwise AND operator. Also moved the forum/topic feed template variable to the location where they belong to (forum and topic view) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9965 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 1 + phpBB/develop/mysql_upgrader.php | 1 + 2 files changed, 2 insertions(+) (limited to 'phpBB/develop') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index d8c34d0d76..b9017937c8 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1073,6 +1073,7 @@ function get_schema_struct() 'forum_last_poster_name'=> array('VCHAR_UNI', ''), 'forum_last_poster_colour'=> array('VCHAR:6', ''), 'forum_flags' => array('TINT:4', 32), + 'forum_options' => array('UINT:20', 0), 'display_subforum_list' => array('BOOL', 1), 'display_on_index' => array('BOOL', 1), 'enable_indexing' => array('BOOL', 1), diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php index 1f8bccdd1f..034c1c0c20 100644 --- a/phpBB/develop/mysql_upgrader.php +++ b/phpBB/develop/mysql_upgrader.php @@ -563,6 +563,7 @@ function get_schema_struct() 'forum_last_poster_name'=> array('VCHAR_UNI', ''), 'forum_last_poster_colour'=> array('VCHAR:6', ''), 'forum_flags' => array('TINT:4', 32), + 'forum_options' => array('UINT:20', 0), 'display_subforum_list' => array('BOOL', 1), 'display_on_index' => array('BOOL', 1), 'enable_indexing' => array('BOOL', 1), -- cgit v1.2.1 From 36b8b94ea647930eb14edaf2e4b4d27ab56a05c9 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 30 Aug 2009 11:10:12 +0000 Subject: script to update email hashes (they are not strings btw, but BINT) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10063 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/update_email_hash.php | 57 +++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 phpBB/develop/update_email_hash.php (limited to 'phpBB/develop') diff --git a/phpBB/develop/update_email_hash.php b/phpBB/develop/update_email_hash.php new file mode 100644 index 0000000000..80fd4bbc17 --- /dev/null +++ b/phpBB/develop/update_email_hash.php @@ -0,0 +1,57 @@ +session_begin(); +$auth->acl($user->data); +$user->setup(); + +$start = request_var('start', 0); +$num_items = 1000; + +echo '
Updating user email hashes' . "\n"; + +$sql = 'SELECT user_id, user_email + FROM ' . USERS_TABLE . ' + ORDER BY user_id ASC'; +$result = $db->sql_query($sql); + +$echos = 0; +while ($row = $db->sql_fetchrow($result)) +{ + $echos++; + + $sql = 'UPDATE ' . USERS_TABLE . " + SET user_email_hash = '" . $db->sql_escape(phpbb_email_hash($row['user_email'])) . "' + WHERE user_id = " . (int) $row['user_id']; + $db->sql_query($sql); + + if ($echos == 200) + { + echo '
'; + $echos = 0; + } + + echo '.'; + flush(); +} +$db->sql_freeresult($result); + +echo 'FINISHED'; + +// Done +$db->sql_close(); +?> \ No newline at end of file -- cgit v1.2.1 From 0fe74ebceac75c559b8779f291ebb2df80309e92 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 4 Sep 2009 15:44:10 +0000 Subject: Add INDEX on user_regdate because this is the default ORDER BY in memberlist.php - thanks nickvergessen. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10106 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/develop') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index b9017937c8..77c8f8217b 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1869,6 +1869,7 @@ function get_schema_struct() 'PRIMARY_KEY' => 'user_id', 'KEYS' => array( 'user_birthday' => array('INDEX', 'user_birthday'), + 'user_regdate' => array('INDEX', 'user_regdate'), 'user_email_hash' => array('INDEX', 'user_email_hash'), 'user_type' => array('INDEX', 'user_type'), 'username_clean' => array('UNIQUE', 'username_clean'), -- cgit v1.2.1 From fc5a21e16a6502a89fd7b541683f21e216c8cf2e Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 4 Sep 2009 17:27:13 +0000 Subject: Revert r10106 - Index usage is very unlikely because of WHERE IN (). :-| git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10107 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 1 - 1 file changed, 1 deletion(-) (limited to 'phpBB/develop') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 77c8f8217b..b9017937c8 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1869,7 +1869,6 @@ function get_schema_struct() 'PRIMARY_KEY' => 'user_id', 'KEYS' => array( 'user_birthday' => array('INDEX', 'user_birthday'), - 'user_regdate' => array('INDEX', 'user_regdate'), 'user_email_hash' => array('INDEX', 'user_email_hash'), 'user_type' => array('INDEX', 'user_type'), 'username_clean' => array('UNIQUE', 'username_clean'), -- cgit v1.2.1 From ae88f9580877d989d64cf5023b96700781d761d7 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 11 Oct 2009 09:56:11 +0000 Subject: update mysql_upgrader to latest schema git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10219 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/mysql_upgrader.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/develop') diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php index 034c1c0c20..a677f4464b 100644 --- a/phpBB/develop/mysql_upgrader.php +++ b/phpBB/develop/mysql_upgrader.php @@ -796,6 +796,7 @@ function get_schema_struct() 'poster_ip' => array('INDEX', 'poster_ip'), 'poster_id' => array('INDEX', 'poster_id'), 'post_approved' => array('INDEX', 'post_approved'), + 'post_username' => array('INDEX', 'post_username'), 'tid_post_time' => array('INDEX', array('topic_id', 'post_time')), ), ); -- cgit v1.2.1 From 42c5be5dacac486cb4bfc3d62a97f84f0bc92468 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Wed, 23 Dec 2009 01:31:19 +0000 Subject: Just a little reminder for when we decide to update the confusables one day git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10365 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/generate_utf_confusables.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'phpBB/develop') diff --git a/phpBB/develop/generate_utf_confusables.php b/phpBB/develop/generate_utf_confusables.php index f79471afc6..0ffa9720c9 100644 --- a/phpBB/develop/generate_utf_confusables.php +++ b/phpBB/develop/generate_utf_confusables.php @@ -114,10 +114,14 @@ $uniarray = array( $copy = $uniarray; +/** +* @todo we need to check that the $uniarray does not reverse any of the mappings defined in the unicode definition +*/ + foreach ($array as $value) { $temp_hold = implode(array_map('utf8_chr', array_map('hexdec', explode(' ', trim($value[2]))))); - + if (isset($copy[utf8_chr(hexdec((string)$value[1]))])) { $num = ''; -- cgit v1.2.1 From 5306a586b17d0c85d6a52dea994806bbb1891e50 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Mon, 25 Jan 2010 18:42:04 +0000 Subject: Revert r9564, Fix #54445, Related to #44665. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10445 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 1 - phpBB/develop/mysql_upgrader.php | 1 - 2 files changed, 2 deletions(-) (limited to 'phpBB/develop') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index b9017937c8..a612a318a7 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1198,7 +1198,6 @@ function get_schema_struct() 'PRIMARY_KEY' => 'log_id', 'KEYS' => array( 'log_type' => array('INDEX', 'log_type'), - 'log_time' => array('INDEX', 'log_time'), 'forum_id' => array('INDEX', 'forum_id'), 'topic_id' => array('INDEX', 'topic_id'), 'reportee_id' => array('INDEX', 'reportee_id'), diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php index a677f4464b..ae29b536bc 100644 --- a/phpBB/develop/mysql_upgrader.php +++ b/phpBB/develop/mysql_upgrader.php @@ -688,7 +688,6 @@ function get_schema_struct() 'PRIMARY_KEY' => 'log_id', 'KEYS' => array( 'log_type' => array('INDEX', 'log_type'), - 'log_time' => array('INDEX', 'log_time'), 'forum_id' => array('INDEX', 'forum_id'), 'topic_id' => array('INDEX', 'topic_id'), 'reportee_id' => array('INDEX', 'reportee_id'), -- cgit v1.2.1 From 2906a24122535856f5a195264dc1d9a6836e0bcd Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Thu, 28 Jan 2010 23:15:25 +0000 Subject: Bug #56545 - Speed up topic move operation by adding an index for topic_id on the topics track table. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10462 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 1 + phpBB/develop/mysql_upgrader.php | 1 + 2 files changed, 2 insertions(+) (limited to 'phpBB/develop') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index a612a318a7..03932bcc13 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1746,6 +1746,7 @@ function get_schema_struct() ), 'PRIMARY_KEY' => array('user_id', 'topic_id'), 'KEYS' => array( + 'topic_id' => array('INDEX', 'topic_id'), 'forum_id' => array('INDEX', 'forum_id'), ), ); diff --git a/phpBB/develop/mysql_upgrader.php b/phpBB/develop/mysql_upgrader.php index ae29b536bc..57230339e8 100644 --- a/phpBB/develop/mysql_upgrader.php +++ b/phpBB/develop/mysql_upgrader.php @@ -1236,6 +1236,7 @@ function get_schema_struct() ), 'PRIMARY_KEY' => array('user_id', 'topic_id'), 'KEYS' => array( + 'topic_id' => array('INDEX', 'topic_id'), 'forum_id' => array('INDEX', 'forum_id'), ), ); -- cgit v1.2.1 From 926d0f980ee2e064a2778da3fdca7b6be2e95e3d Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 31 Jan 2010 21:50:10 +0000 Subject: fix_files script must have been broken by svn:eol-style quite a while ago, now uses tr rather than sed to replace carriage returns git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10464 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/fix_files.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/develop') diff --git a/phpBB/develop/fix_files.sh b/phpBB/develop/fix_files.sh index 782418f504..d2207289dc 100755 --- a/phpBB/develop/fix_files.sh +++ b/phpBB/develop/fix_files.sh @@ -21,9 +21,9 @@ rm FILELIST.$$ for i in $(cat FILELIST); do if [ -f $i ]; then - sed -e s/ -//g $i > $i.tmp - mv $i.tmp $i + cat $i | tr -d '\r' > $i.tmp + mv $i.tmp $i fi done rm FILELIST + -- cgit v1.2.1 From bba33ead30a243a6df1377b2ae0fa56337bacc7c Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sat, 27 Feb 2010 18:04:32 +0000 Subject: Updating the create_schema_files.php file to reflect the minor mssql schema change introduced in r10489 (implementing mssql native driver support - Bug #57055) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10548 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/develop/create_schema_files.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'phpBB/develop') diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 03932bcc13..0515d801f2 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -266,7 +266,8 @@ foreach ($supported_dbms as $dbms) case 'mssql': $line = "/*\n\n \$I" . "d: $\n\n*/\n\n"; - $line .= "BEGIN TRANSACTION\nGO\n\n"; + // no need to do this, no transaction support for schema changes + //$line .= "BEGIN TRANSACTION\nGO\n\n"; break; case 'oracle': @@ -749,7 +750,8 @@ foreach ($supported_dbms as $dbms) switch ($dbms) { case 'mssql': - $line = "\nCOMMIT\nGO\n\n"; + // No need to do this, no transaction support for schema changes + //$line = "\nCOMMIT\nGO\n\n"; break; case 'sqlite': -- cgit v1.2.1