makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 22:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit 'release-3.0-RC7'

Browse source
This commit is contained in:
Nils Adermann 2010-03-02 01:05:37 +01:00
commit 8a3c323933
27 changed files with 148 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/adm/style/acp_ban.html
View file

@ -73,7 +73,7 @@
</p>
</fieldset>
{S_FORM_TOKEN}
</form>
<br /><br />
@ -117,6 +117,7 @@
</fieldset>
<!-- ENDIF -->
{S_FORM_TOKEN}
</form>

17
phpBB/adm/style/install_update.html
View file

@ -2,6 +2,17 @@
<script type="text/javascript">
// <![CDATA[
function popup(url, width, height, name)
{
if (!name)
{
name = '_popup';
}
window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
return false;
}
function diff_popup(url)
{
popup(url, 950, 600, '_diff');
@ -52,7 +63,7 @@
<p>{L_UPDATE_SUCCESS_EXPLAIN}</p>
<fieldset class="submit-buttons">
<input class="button1" type="submit" name="submit" value="{L_CHECK_FILES_AGAIN}" />
<input class="button1" type="submit" name="check_again" value="{L_CHECK_FILES_AGAIN}" />
</fieldset>
</form>
@ -244,10 +255,6 @@
<dl>
<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
</dl>
<dl>
<dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt>
<dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE -->&nbsp;<!-- ENDIF --></dd>
</dl>
<!-- IF not files.S_BINARY -->
<dl>

8
phpBB/develop/create_schema_files.php
View file

@ -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),
@ -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', ''),
),

25
phpBB/docs/CHANGELOG.html
View file

@ -53,6 +53,7 @@
<ol>
<li><a href="#changelog">Changelog</a>
<ol style="list-style-type: lower-roman;">
<li><a href="#v30rc6">Changes since RC-6</a></li>
<li><a href="#v30rc5">Changes since RC-5</a></li>
<li><a href="#v30rc4">Changes since RC-4</a></li>
<li><a href="#v30rc3">Changes since RC-3</a></li>
@ -77,7 +78,17 @@
<div class="content">
<a name="v30rc5"></a><h3>1.i. Changes since 3.0.RC5</h3>
<a name="v30rc6"></a><h3>1.i. Changes since 3.0.RC6</h3>
<ul>
<li>[Fix] Submitting language changes using acp_language (Bug #14736)</li>
<li>[Fix] Fixed wrong bbcode handling for forum rules, forum descriptions and group descriptions</li>
<li>[Fix] Fixed faulty form tokens (Bug #14725, #14762 and #14755)</li>
<li>[Fix] Fixed bbcode uid generation in the phpBB2 converter (Bug #14722)</li>
<li>[Fix] Able to request new password (Bug #14743)</li>
</ul>
<a name="v30rc5"></a><h3>1.ii. Changes since 3.0.RC5</h3>
<ul>
<li>[Feature] Removing constant PHPBB_EMBEDDED in favor of using an exit_handler(); the constant was meant to achive this more or less.</li>
@ -99,10 +110,10 @@
<li>[Feature] Added /includes/db/db_tools.php file, which includes tools for handling cross-db actions such as altering columns, etc.</li>
<li>[Change] Reset the start parameter when the timeframe is changed in the mcp topic page (Ticket #14438)</li>
<li>[Change] Added Code for cleaning the confirm table to the session garbage collection</li>
<li>[Fix] Fixed token handling in jabber class for extremely spec-compilant XMPP server (Bug #14445)</li>
<li>[Fix] Fixed token handling in jabber class for extremely spec-compliant XMPP server (Bug #14445)</li>
<li>[Fix] Disallowed galleries from using special characters (Bug #14466)</li>
<li>[Change] Listing the board url within the email text instead of appending it to the subject (Bug #14378)</li>
<li>[Fix] Always display the quote button as the most accessible one - edit is always before quote (Bug #14403)</li>
<li>[Fix] Always display the quote button as the most accessible one (this means edit is before quote in prosilver due to the way we lay out profiles)</li>
<li>[Fix] Use correct dimension (width x height) in ACP (Bug #14452)</li>
<li>[Fix] Only display PM history links if there are PM's to be displayed (Bug #14484)</li>
<li>[Feature] Added completely new hook system to allow better application/mod integration - see docs/hook_system.html</li>
@ -140,7 +151,7 @@
<li>[Sec] New password hashing mechanism for storing passwords (#i42)</li>
</ul>
<a name="v30rc4"></a><h3>1.ii. Changes since 3.0.RC4</h3>
<a name="v30rc4"></a><h3>1.iii. Changes since 3.0.RC4</h3>
<ul>
<li>[Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)</li>
@ -191,7 +202,7 @@
<li>[Fix] odbc_autocommit causing existing result sets to be dropped (Bug #14182)</li>
</ul>
<a name="v30rc3"></a><h3>1.iii. Changes since 3.0.RC3</h3>
<a name="v30rc3"></a><h3>1.iv. Changes since 3.0.RC3</h3>
<ul>
<li>[Fix] Fixing some subsilver2 and prosilver style issues</li>
@ -300,7 +311,7 @@
</ul>
<a name="v30rc2"></a><h3>1.iv. Changes since 3.0.RC2</h3>
<a name="v30rc2"></a><h3>1.v. Changes since 3.0.RC2</h3>
<ul>
<li>[Fix] Re-allow searching within the memberlist</li>
@ -346,7 +357,7 @@
</ul>
<a name="v30rc1"></a><h3>1.v. Changes since 3.0.RC1</h3>
<a name="v30rc1"></a><h3>1.vi. Changes since 3.0.RC1</h3>
<ul>
<li>[Fix] (X)HTML issues within the templates (Bug #11255, #11255)</li>

2
phpBB/download/file.php
View file

@ -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
{

6
phpBB/includes/acp/acp_forums.php
View file

@ -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(
@ -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'] = '';

17
phpBB/includes/acp/acp_language.php
View file

@ -42,13 +42,13 @@ 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;
$submit = (empty($action) && !isset($_POST['update']) && !isset($_POST['test_connection'])) ? false : true;
$action = (empty($action)) ? request_var('action', '') : $action;
$form_name = 'acp_lang';
@ -1171,6 +1171,11 @@ class acp_language
/**
* DO NOT CHANGE
*/
if (!defined(\'IN_PHPBB\'))
{
exit;
}
if (empty($lang) || !is_array($lang))
{
$lang = array();

5
phpBB/includes/acp/acp_ranks.php
View file

@ -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 *

10
phpBB/includes/functions_convert.php
View file

@ -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
*/

2
phpBB/install/convertors/convert_phpbb20.php
View file

@ -31,7 +31,7 @@ unset($dbpasswd);
*/
$convertor_data = array(
'forum_name' => 'phpBB 2.0.x',
'version' => '1.0.RC6',
'version' => '1.0.RC7',
'phpbb_version' => '3.0.0',
'author' => '<a href="http://www.phpbb.com/">phpBB Group</a>',
'dbms' => $dbms,

18
phpBB/install/database_update.php
View file

@ -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,22 @@ $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', ''),
),
USERS_TABLE => array(
'user_newpasswd' => array('VCHAR_UNI:40', ''),
),
),
),
);
// Determine mapping database type

14
phpBB/install/install_update.php
View file

@ -321,7 +321,7 @@ class install_update extends module
$get_new_list = true;
}
if (!$get_new_list && $update_list['status'] != 'finished')
if (!$get_new_list && $update_list['status'] != -1)
{
$get_new_list = true;
}
@ -332,7 +332,7 @@ class install_update extends module
$cache->put('_update_list', $update_list);
// Refresh the page if we are still not finished...
if ($update_list['status'] != 'finished')
if ($update_list['status'] != -1)
{
$refresh_url = append_sid($this->p_master->module_url, "mode=$mode&amp;sub=file_check");
meta_refresh(2, $refresh_url);
@ -604,9 +604,9 @@ class install_update extends module
// Before we do anything, let us diff the files and store the raw file information "somewhere"
$get_files = false;
$file_list = $cache->get('_diff_files');
$file_list = false; //$cache->get('_diff_files');
if ($file_list === false || $file_list['status'] != 'finished')
if ($file_list === false || $file_list['status'] != -1)
{
$get_files = true;
}
@ -747,7 +747,7 @@ class install_update extends module
}
}
$file_list['status'] = 'finished';
$file_list['status'] = -1;
$cache->put('_diff_files', $file_list);
if (!empty($_REQUEST['download']))
@ -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,
));
@ -1291,7 +1291,7 @@ class install_update extends module
$update_list['status']++;
}
$update_list['status'] = 'finished';
$update_list['status'] = -1;
/* if (!sizeof($this->update_info['files']))
{
return $update_list;

8
phpBB/install/schemas/firebird_schema.sql
View file

@ -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,
@ -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
);;

8
phpBB/install/schemas/mssql_schema.sql
View file

@ -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 ,
@ -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

8
phpBB/install/schemas/mysql_40_schema.sql
View file

@ -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,
@ -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),

8
phpBB/install/schemas/mysql_41_schema.sql
View file

@ -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,
@ -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),

8
phpBB/install/schemas/oracle_schema.sql
View file

@ -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,
@ -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)

8
phpBB/install/schemas/postgres_schema.sql
View file

@ -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,
@ -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)
);

6
phpBB/install/schemas/schema_data.sql
View file

@ -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');
@ -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');
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');

8
phpBB/install/schemas/sqlite_schema.sql
View file

@ -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',
@ -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 ''
);

2
phpBB/styles/prosilver/template/memberlist_leaders.html
View file

@ -63,7 +63,7 @@
<tr class="bg1">
<td colspan="3"><strong>{L_NO_MEMBERS}</strong></td>
</tr>
<!-- END admin -->
<!-- END mod -->
</tbody>
</table>

10
phpBB/styles/prosilver/template/ucp_agreement.html
View file

@ -1,7 +1,7 @@
<!-- INCLUDE overall_header.html -->
<script type="text/javascript" defer="defer" >
// <![CDATA[
// <![CDATA[
function disable(disabl, name)
{
document.getElementById(name).disabled = disabl;
@ -14,10 +14,10 @@
document.getElementById(name).className = 'button1 enabled';
}
}
<!-- IF S_TIME -->
onload_functions.push('disable(true, "agreed")');
setTimeout('disable(false, "agreed")', {S_TIME});
setInterval('disable(false, "agreed")', {S_TIME});
<!-- ENDIF -->
// ]]>
</script>
@ -41,7 +41,7 @@
<!-- IF S_SHOW_COPPA -->
<strong><a href="{U_COPPA_NO}" class="button1">{L_COPPA_NO}</a></strong>&nbsp; <a href="{U_COPPA_YES}" class="button2">{L_COPPA_YES}</a>
<!-- ELSE -->
<input type="submit" name="agreed" id="agreed" value="{L_AGREE}" class="button1" />&nbsp;
<input type="submit" name="agreed" id="agreed" value="{L_AGREE}" class="button1" />&nbsp;
<input type="submit" name="not_agreed" value="{L_NOT_AGREE}" class="button2" />
<!-- ENDIF -->
</fieldset>
@ -51,7 +51,7 @@
{S_HIDDEN_FIELDS}
{S_FORM_TOKEN}
</form>
<!-- ELSEIF S_AGREEMENT -->
<div class="panel">

14
phpBB/styles/prosilver/template/ucp_register.html
View file

@ -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';
}
}
<!-- IF S_TIME -->
onload_functions.push('disable(true, "submit")');
setTimeout('disable(false, "submit")', {S_TIME});
setInterval('disable(false, "submit")', {S_TIME});
<!-- ENDIF -->
// ]]>
</script>
@ -68,9 +68,9 @@
<dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label></dt>
<dd><input type="password" tabindex="5" name="password_confirm" id="password_confirm" size="25" value="{PASSWORD_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_PASSWORD}" /></dd>
</dl>
<hr />
<dl>
<dt><label for="lang">{L_LANGUAGE}:</label></dt>
<dd><select name="lang" id="lang" onchange="change_language(this.value); return false;" title="{L_LANGUAGE}">{S_LANG_OPTIONS}</select></dd>
@ -130,7 +130,7 @@
<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}
<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
<input type="submit" name="submit" id ="submit" value="{L_SUBMIT}" class="button1" />
</fieldset>

6
phpBB/styles/subsilver2/template/mcp_post.html
View file

@ -2,7 +2,7 @@
<!-- IF S_MCP_REPORT -->
<form method="post" name="mcp_report" action="{U_CLOSE_ACTION}">
<table width="100%" cellpadding="3" cellspacing="1" border="0" class="tablebg">
<tr>
<th colspan="2" align="center">{L_REPORT_DETAILS}</th>
@ -95,7 +95,7 @@
<!-- END attachment -->
</table>
<!-- ENDIF -->
</td>
</tr>
<!-- IF S_POST_UNAPPROVED and S_MCP_QUEUE -->
@ -127,7 +127,7 @@
<!-- IF S_CAN_CHGPOSTER -->
<tr>
<td class="row1" valign="top"><b class="gen">{L_CHANGE_POSTER}</b></td>
<td class="row2"><form method="post" name="mcp_chgposter" action="{U_POST_ACTION}"><input class="post" type="text" name="username" value="" /> <input class="btnmain" type="submit" value="{L_CONFIRM}" name="action[chgposter]" /><br /><span class="gensmall">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span><!-- IF S_USER_SELECT --><br /><select name="u">{S_USER_SELECT}</select> <input type="submit" class="btnmain" name="action[chgposter_ip]" value="{L_CONFIRM}" /><!-- ENDIF --></form></td>
<td class="row2"><form method="post" name="mcp_chgposter" action="{U_POST_ACTION}"><input class="post" type="text" name="username" value="" /> <input class="btnmain" type="submit" value="{L_CONFIRM}" name="action[chgposter]" /><br /><span class="gensmall">[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span><!-- IF S_USER_SELECT --><br /><select name="u">{S_USER_SELECT}</select> <input type="submit" class="btnmain" name="action[chgposter_ip]" value="{L_CONFIRM}" /><!-- ENDIF -->{S_FORM_TOKEN}</form></td>
</tr>
<!-- ENDIF -->
<!-- IF S_CAN_LOCK_POST or S_CAN_DELETE_POST -->

16
phpBB/styles/subsilver2/template/ucp_agreement.html
View file

@ -4,12 +4,12 @@
// <![CDATA[
var old_func = window.onload;
function disable(disabl)
{
document.getElementById("agreed").disabled = disabl;
}
function disable_and_handle()
{
if (old_func)
@ -18,18 +18,18 @@
}
disable(true);
}
<!-- IF S_TIME -->
<!-- IF S_TIME -->
window.onload = disable_and_handle;
setTimeout("disable(false)", {S_TIME});
setInterval("disable(false)", {S_TIME});
<!-- ENDIF -->
// ]]>
</script>
<!-- IF S_SHOW_COPPA or S_REGISTRATION -->
<form method="post" action="{S_UCP_ACTION}">
<table class="tablebg" width="100%" cellspacing="1">
<tr>
<th height="25">{SITENAME} - {L_REGISTRATION}</th>
@ -57,7 +57,7 @@
{S_HIDDEN_FIELDS}
{S_FORM_TOKEN}
</form>
<!-- ELSEIF S_AGREEMENT -->
<table class="tablebg" width="100%" cellspacing="1">

1
phpBB/styles/subsilver2/template/ucp_pm_message_footer.html
View file

@ -26,7 +26,6 @@
<input type="hidden" name="p" value="{MSG_ID}" />
<select name="dest_folder">{S_TO_FOLDER_OPTIONS}</select>&nbsp;<input class="btnlite" type="submit" name="move_pm" value="{L_MOVE_TO_FOLDER}" />
{S_FORM_TOKEN}
{S_FORM_TOKEN}
</form>
<!-- ENDIF -->
<!-- ELSE -->

16
phpBB/styles/subsilver2/template/ucp_register.html
View file

@ -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);
}
<!-- IF S_TIME -->
<!-- IF S_TIME -->
window.onload = disable_and_handle;
setTimeout("disable(false)", {S_TIME});
setInterval("disable(false)", {S_TIME});
<!-- ENDIF -->
// ]]>
</script>
@ -48,12 +48,12 @@
<!-- ENDIF -->
<!-- IF L_REG_COND -->
<tr>
<tr>
<td class="row2" colspan="2"><span class="gensmall">{L_REG_COND}</span></td>
</tr>
<!-- ENDIF -->
<!-- IF .profile_fields -->
<tr>
<tr>
<td class="row2" colspan="2"><span class="gensmall">{L_ITEMS_REQUIRED}</span></td>
</tr>
<!-- ENDIF -->