diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:37 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:37 +0100 |
| commit | 54f94e0d428c5963ecca86a40247105e51288432 (patch) | |
| tree | 275c5ec85c31595d0341d6ad630565b7a6a4cdcc /phpBB/develop | |
| parent | 1a09d0e238666a386a76878d6395986947b11c1e (diff) | |
| parent | b5535db081dca0187caae84cf7ffd8d6045dccba (diff) | |
| download | forums-54f94e0d428c5963ecca86a40247105e51288432.tar forums-54f94e0d428c5963ecca86a40247105e51288432.tar.gz forums-54f94e0d428c5963ecca86a40247105e51288432.tar.bz2 forums-54f94e0d428c5963ecca86a40247105e51288432.tar.xz forums-54f94e0d428c5963ecca86a40247105e51288432.zip | |
Merge commit 'release-3.0-RC6'
Diffstat (limited to 'phpBB/develop')
| -rw-r--r-- | phpBB/develop/create_schema_files.php | 32 | ||||
| -rw-r--r-- | phpBB/develop/generate_utf_casefold.php | 6 | ||||
| -rw-r--r-- | phpBB/develop/generate_utf_confusables.php | 6 | ||||
| -rw-r--r-- | phpBB/develop/generate_utf_tables.php | 6 | ||||
| -rw-r--r-- | phpBB/develop/search_fill.php | 20 | ||||
| -rw-r--r-- | phpBB/develop/utf_normalizer_test.php | 6 |
6 files changed, 40 insertions, 36 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 5d974639b1..a761ae7bfa 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package phpBB3 * @version $Id$ -* @copyright (c) 2006 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2006 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * * This file creates new schema files for every database. * The filenames will be prefixed with an underscore to not overwrite the current schema files. @@ -323,7 +323,7 @@ foreach ($supported_dbms as $dbms) } // 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) @@ -1285,7 +1285,7 @@ function get_schema_struct() 'post_checksum' => array('VCHAR:32', ''), 'post_attachment' => array('BOOL', 0), 'bbcode_bitfield' => array('VCHAR:255', ''), - 'bbcode_uid' => array('VCHAR:5', ''), + 'bbcode_uid' => array('VCHAR:8', ''), 'post_postcount' => array('BOOL', 1), 'post_edit_time' => array('TIMESTAMP', 0), 'post_edit_reason' => array('STEXT_UNI', ''), @@ -1322,7 +1322,7 @@ function get_schema_struct() 'message_edit_user' => array('UINT', 0), 'message_attachment' => array('BOOL', 0), 'bbcode_bitfield' => array('VCHAR:255', ''), - 'bbcode_uid' => array('VCHAR:5', ''), + 'bbcode_uid' => array('VCHAR:8', ''), 'message_edit_time' => array('TIMESTAMP', 0), 'message_edit_count' => array('USINT', 0), 'to_address' => array('TEXT_UNI', ''), @@ -1829,7 +1829,7 @@ function get_schema_struct() 'user_avatar_width' => array('USINT', 0), 'user_avatar_height' => array('USINT', 0), 'user_sig' => array('MTEXT_UNI', ''), - 'user_sig_bbcode_uid' => array('VCHAR:5', ''), + 'user_sig_bbcode_uid' => array('VCHAR:8', ''), 'user_sig_bbcode_bitfield' => array('VCHAR:255', ''), 'user_from' => array('VCHAR_UNI:100', ''), 'user_icq' => array('VCHAR:15', ''), @@ -1842,6 +1842,8 @@ function get_schema_struct() 'user_interests' => array('TEXT_UNI', ''), 'user_actkey' => array('VCHAR:32', ''), 'user_newpasswd' => array('VCHAR_UNI:32', ''), + 'user_form_salt' => array('VCHAR_UNI:32', ''), + ), 'PRIMARY_KEY' => 'user_id', 'KEYS' => array( @@ -1906,17 +1908,17 @@ function custom_data($dbms) /* CREATE TABLESPACE "PHPBB" - LOGGING - DATAFILE 'E:\ORACLE\ORADATA\LOCAL\PHPBB.ora' + LOGGING + DATAFILE 'E:\ORACLE\ORADATA\LOCAL\PHPBB.ora' SIZE 10M AUTOEXTEND ON NEXT 10M MAXSIZE 100M; -CREATE USER "PHPBB" - PROFILE "DEFAULT" - IDENTIFIED BY "phpbb_password" - DEFAULT TABLESPACE "PHPBB" - QUOTA UNLIMITED ON "PHPBB" +CREATE USER "PHPBB" + PROFILE "DEFAULT" + IDENTIFIED BY "phpbb_password" + DEFAULT TABLESPACE "PHPBB" + QUOTA UNLIMITED ON "PHPBB" ACCOUNT UNLOCK; GRANT ANALYZE ANY TO "PHPBB"; @@ -2020,4 +2022,6 @@ EOF; return ''; } +echo 'done'; + ?>
\ No newline at end of file diff --git a/phpBB/develop/generate_utf_casefold.php b/phpBB/develop/generate_utf_casefold.php index cb8ce489b7..89c4aec01a 100644 --- a/phpBB/develop/generate_utf_casefold.php +++ b/phpBB/develop/generate_utf_casefold.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package phpBB3 * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/develop/generate_utf_confusables.php b/phpBB/develop/generate_utf_confusables.php index 908ebbf6f4..f79471afc6 100644 --- a/phpBB/develop/generate_utf_confusables.php +++ b/phpBB/develop/generate_utf_confusables.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package phpBB3 * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/develop/generate_utf_tables.php b/phpBB/develop/generate_utf_tables.php index 047c61fd66..3d5188163d 100644 --- a/phpBB/develop/generate_utf_tables.php +++ b/phpBB/develop/generate_utf_tables.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package phpBB3 * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ diff --git a/phpBB/develop/search_fill.php b/phpBB/develop/search_fill.php index 6b83b6848b..371c8c74cc 100644 --- a/phpBB/develop/search_fill.php +++ b/phpBB/develop/search_fill.php @@ -1,4 +1,4 @@ -<?php +<?php // // Security message: @@ -54,9 +54,9 @@ print "<html>\n<body>\n"; // // Fetch a batch of posts_text entries // -$sql = "SELECT COUNT(*) as total, MAX(post_id) as max_post_id +$sql = "SELECT COUNT(*) as total, MAX(post_id) as max_post_id FROM ". POSTS_TABLE; -if ( !($result = $db->sql_query($sql)) ) +if ( !($result = $db->sql_query($sql)) ) { $error = $db->sql_error(); die("Couldn't get maximum post ID :: " . $sql . " :: " . $error['message']); @@ -77,10 +77,10 @@ for(;$postcounter <= $max_post_id; $postcounter += $batchsize) $batchend = $postcounter + $batchsize; $batchcount++; - $sql = "SELECT * - FROM " . POSTS_TABLE . " - WHERE post_id - BETWEEN $batchstart + $sql = "SELECT * + FROM " . POSTS_TABLE . " + WHERE post_id + BETWEEN $batchstart AND $batchend"; if( !($result = $db->sql_query($sql)) ) { @@ -97,16 +97,16 @@ for(;$postcounter <= $max_post_id; $postcounter += $batchsize) { // $sql = "LOCK TABLES ".POST_TEXT_TABLE." WRITE"; - // $result = $db->sql_query($sql); + // $result = $db->sql_query($sql); print "\n<p>\n<a href='{$_SERVER['PHP_SELF']}?batchstart=$batchstart'>Restart from posting $batchstart</a><br>\n"; // For every post in the batch: for($post_nr = 0; $post_nr < $post_rows; $post_nr++ ) - { + { print "."; flush(); - $post_id = $rowset[$post_nr]['post_id']; + $post_id = $rowset[$post_nr]['post_id']; $search->index('post', $rowset[$post_nr]['post_id'], $rowset[$post_nr]['post_text'], $rowset[$post_nr]['post_subject'], $rowset[$post_nr]['poster_id']); } diff --git a/phpBB/develop/utf_normalizer_test.php b/phpBB/develop/utf_normalizer_test.php index 9ad9c5869f..7705cd6851 100644 --- a/phpBB/develop/utf_normalizer_test.php +++ b/phpBB/develop/utf_normalizer_test.php @@ -1,10 +1,10 @@ <?php -/** +/** * * @package phpBB3 * @version $Id$ -* @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ |