diff --git a/phpBB/adm/admin_permissions.php b/phpBB/adm/admin_permissions.php
index 4f5187c406..d0755d94d0 100644
--- a/phpBB/adm/admin_permissions.php
+++ b/phpBB/adm/admin_permissions.php
@@ -42,50 +42,38 @@ require('pagestart.' . $phpEx);
// Grab and set some basic parameters
//
// 'mode' determines what we're altering; administrators, users, deps, etc.
-// 'type' is used primarily for deps and contains the original 'mode'
+// 'type' is used primarily for deps and contains the original 'mode'
+// 'submit' is used to determine what we're doing ... special format
$mode = (isset($_REQUEST['mode'])) ? htmlspecialchars($_REQUEST['mode']) : '';
$type = (isset($_REQUEST['type'])) ? htmlspecialchars($_REQUEST['type']) : '';
-$action = (isset($_REQUEST['action'])) ? htmlspecialchars($_REQUEST['action']) : '';
+$submit = array_values(preg_grep('#^submit_(.*)$#i', array_keys($_POST)));
+$submit = (sizeof($submit)) ? substr($submit[0], strpos($submit[0], '_') + 1) : '';
+
// Submitted setting data
//
// 'auth_settings' contains the submitted option settings assigned to options, should be an
-// associative array
+// associative array with integer values
// 'auth_setting' contains the value of the submitted 'auth_option', an integer value used
// mainly by deps mode
// 'auth_option' contains a single auth_option string, used mainly by deps mode
-$auth_settings = (isset($_POST['settings'])) ? $_POST['settings'] : array();
+$auth_settings = (isset($_POST['settings'])) ? array_map('intval', $_POST['settings']) : '';
$auth_option = (isset($_REQUEST['option'])) ? htmlspecialchars($_REQUEST['option']) : '';
$auth_setting = (isset($_REQUEST['setting'])) ? intval($_REQUEST['setting']) : '';
+
// Forum, User or Group information
//
// 'ug_type' is either user or groups used mainly for forum/admin/mod permissions
// 'ug_data' contains the list of usernames, user_id's or group_ids for the 'ug_type'
-// 'forum_id' contains the list of forums, 0 is used for "All forums", must be an array
+// 'forum_id' contains the list of forums, 0 is used for "All forums", can be array or scalar
$ug_type = (isset($_REQUEST['ug_type'])) ? htmlspecialchars($_REQUEST['ug_type']) : '';
$ug_data = (isset($_POST['ug_data'])) ? $_POST['ug_data'] : '';
-$forum_id = (isset($_REQUEST['f'])) ? ((!is_array($_REQUEST['f'])) ? array(intval($_REQUEST['f'])) : array_filter($_REQUEST['f'], 'int')) : array(0);
-
-
-
-
-
-
-
-
-
-$username = (isset($_REQUEST['username'])) ? $_REQUEST['username'] : '';
-$group_id = (isset($_REQUEST['g'])) ? intval($_REQUEST['g']) : '';
-
-
-
-
-
-
-
+$forum_id = (isset($_REQUEST['f'])) ? ((is_array($_REQUEST['f'])) ? array_map('intval', $_REQUEST['f']) : intval($_REQUEST['f'])) : 0;
+// Instantiate a new auth admin object in readiness
+$auth_admin = new auth_admin();
// What mode are we running? So we can output the correct title, explanation
@@ -141,7 +129,6 @@ switch ($mode)
break;
}
-
// Permission check
if (!$auth->acl_get($which_acl))
{
@@ -174,131 +161,682 @@ if ($mode == 'deps')
}
+// Does user want to update anything? Check here to find out
+// and act appropriately
+switch ($submit)
+{
+ case 'update':
+
+ switch ($mode)
+ {
+ case 'deps':
+ $forum_id = (!is_array($forum_id)) ? array($forum_id) : $forum_id;
+ $auth_settings_ary = $db->sql_escape(serialize($auth_settings));
+
+ $sql = '';
+ foreach ($forum_id as $id)
+ {
+ switch (SQL_LAYER)
+ {
+ case 'mysql':
+ case 'mysql4':
+ $sql .= (($sql != '') ? ', ' : '') . "('$option', $auth_setting, $id, '$auth_settings_ary')";
+ break;
+
+ case 'mssql':
+ $sql .= (($sql != '') ? ' UNION ALL ' : '') . " SELECT '$option', $auth_setting, $id, '$auth_settings_ary'";
+ break;
+
+ default:
+ $sql = "INSERT INTO " . ACL_DEPS_TABLE . " (auth_option, auth_setting, forum_id, auth_deps)
+ VALUES ('$option', $auth_setting, $id, '$auth_settings_ary')";
+ $result = $db->sql_query($sql);
+ $sql = '';
+ }
+ }
+
+ if ($sql != '')
+ {
+ echo $sql = "INSERT INTO " . ACL_DEPS_TABLE . " (auth_option, auth_setting, forum_id, auth_deps)
+ VALUES $sql";
+ $result = $db->sql_query($sql);
+ }
+
+ unset($auth_settings_ary);
+
+ exit;
+ break;
+
+ default:
+
+ // User wants to submit these changes ... before we allow this
+ // we first check to see if any dependencies exist. If they do
+ // we pull them, and give the user the option of applying them
+ // or skipping them
+ $sql_forum = (is_array($forum_id)) ? ' IN (' . implode(', ', $forum_id) . ')' : ' = ' . $forum_id;
+
+ $sql_dep = $sql_global = array();
+ foreach ($auth_settings as $option => $setting)
+ {
+ $sql_dep[$setting] .= (($sql_dep[$setting] != '') ? ', ' : '') . "'$option'";
+ }
+
+ $sql_options = '';
+ foreach ($sql_dep as $setting => $options)
+ {
+ $sql_options .= (($sql_options != '') ? ' OR ' : '') . " (auth_option IN ($options) AND auth_setting = $setting)";
+ }
+
+ $sql = "SELECT auth_deps
+ FROM " . ACL_DEPS_TABLE . "
+ WHERE $sql_options";
+// AND forum_id $sql_forum";
+ $result = $db->sql_query($sql);
+
+ if ($row = $db->sql_fetchrow($result))
+ {
+ do
+ {
+ $temp = unserialize($row['auth_deps']);
+ foreach ($temp as $option => $setting)
+ {
+ $auth_settings[$option] = (!isset($auth_settings[$option]) || $setting < $auth_settings[$option]) ? $setting : $auth_settings[$option];
+ }
+ }
+ while ($row = $db->sql_fetchrow($result));
+
+ unset($temp);
+ unset($option);
+ unset($setting);
+ unset($sql_auth_option);
+
+ $sql_option_mode = 'f';
+
+ }
+ $db->sql_freeresult($result);
+
+ //print_r($auth_settings);
+
+ //echo "HERE :: UPDATE ACLS";
+/*
+ // Admin wants subforums to inherit permissions ... so handle this
+ if (!empty($_POST['inherit']))
+ {
+ array_push($_POST['inherit'], $forum_id);
+ $forum_id = $_POST['inherit'];
+ }
+
+ foreach ($ug_data as $id)
+ {
+ $auth_admin->acl_set($ug_type, $forum_id, $id, $auth_settings);
+ }
+
+ cache_moderators();
+
+ trigger_error($user->lang['AUTH_UPDATED']);
+*/
+
+ }
+ break;
+
+ case 'delete':
+ echo "HERE :: DELETE";
+ exit;
+
+ switch ($mode)
+ {
+ case 'deps':
+ break;
+
+ default:
+/* $option_ids = false;
+ if (!empty($settings)
+ {
+ $sql = "SELECT auth_option_id
+ FROM " . ACL_OPTIONS_TABLE . "
+ WHERE auth_option LIKE '" . $settings['option'] . "_%'";
+ $result = $db->sql_query($sql);
+
+ if ($row = $db->sql_fetchrow($result))
+ {
+ $option_ids = array();
+ do
+ {
+ $option_ids[] = $row['auth_option_id'];
+ }
+ while($row = $db->sql_fetchrow($result));
+ }
+ $db->sql_freeresult($result);
+ }
+
+ foreach ($_POST['ug_id'] as $id)
+ {
+ $auth_admin->acl_delete($_POST['type'], $forum_id, $id, $option_ids);
+ }
+
+ cache_moderators();
+
+ trigger_error($user->lang['AUTH_UPDATED']);*/
+ break;
+ }
+ break;
+
+ case 'presetsave':
+ $holding_ary = array();
+ foreach ($auth_settings as $option => $setting)
+ {
+ switch ($setting)
+ {
+ case ACL_YES:
+ $holding_ary['yes'][] = $option;
+ break;
+
+ case ACL_NO:
+ $holding_ary['no'][] = $option;
+ break;
+
+ case ACL_UNSET:
+ $holding_ary['unset'][] = $option;
+ break;
+ }
+ }
+ unset($option);
+ unset($setting);
+
+ $sql = array(
+ 'preset_user_id'=> intval($user->data['user_id']),
+ 'preset_type' => $sql_option_mode,
+ 'preset_data' => $db->sql_escape(serialize($holding_ary))
+ );
+
+ if (!empty($_POST['presetname']))
+ {
+ $sql['preset_name'] = $db->sql_escape($_POST['presetname']);
+ }
+
+ if (!empty($_POST['presetname']) || $_POST['presetoption'] != -1)
+ {
+ $sql = ($_POST['presetoption'] == -1) ? 'INSERT INTO ' . ACL_PRESETS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql) : 'UPDATE ' . ACL_PRESETS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql) . ' WHERE preset_id =' . intval($_POST['presetoption']);
+ $db->sql_query($sql);
+ }
+ break;
+
+ case 'presetdel':
+ if (!empty($_POST['presetoption']))
+ {
+ $sql = "DELETE FROM " . ACL_PRESETS_TABLE . "
+ WHERE preset_id = " . intval($_POST['presetoption']);
+ $db->sql_query($sql);
+ }
+ break;
+}
+// End update
-
-
-
-
-
-
-
-//
-//
-// OUTPUT PAGE
-//
-//
+// Output page header
page_header($l_title);
+// First potential form ... this is for selecting forums, users
+// or groups.
+if (($mode == 'user' || $mode == 'group' || $mode == 'forum' || $mode == 'mod') && empty($submit))
+{
+?>
+
+
+
+
+
+
+
+
+
+
+
lang['USERS']; ?>
+
lang['GROUPS']; ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+lang['NO_MODE']);
+ }
+
+
+ // Grab the forum details if non-zero forum_id
+ if ($forum_id != 0)
+ {
+ $forum_data = array();
+ $sql = 'SELECT forum_id, forum_name, parent_id
+ FROM ' . FORUMS_TABLE . '
+ WHERE forum_id';
+ $sql .= (is_array($forum_id)) ? ' IN (' . implode(', ', $forum_id) . ')' : ' = ' . $forum_id;
+ $result = $db->sql_query($sql);
+
+ if (!($forum_data = $db->sql_fetchrow($result)))
+ {
+ trigger_error($user->lang['NO_FORUM']);
+ }
+ $db->sql_freeresult($result);
+ }
+
+
+ // Grab relevant user or group information
+ $ug_ids = $ug_names = $ug_hidden = '';
+ if ($mode != 'deps')
+ {
+ $l_no_error = '';
+ switch ($ug_type)
+ {
+ case 'user':
+ $l_no_error = $user->lang['NO_USER'];
+ $sql = 'SELECT user_id AS id, username AS name
+ FROM ' . USERS_TABLE . '
+ WHERE user_id';
+ $sql .= (is_array($ug_data)) ? ' IN (' . implode(', ', $ug_data) . ')' : ' = ' . $ug_data;
+ break;
+
+ case 'username':
+ $l_no_error = $user->lang['NO_USER'];
+ $sql = 'SELECT user_id AS id, username AS name
+ FROM ' . USERS_TABLE . '
+ WHERE username';
+ $sql .= (is_array($ug_data)) ? ' IN (' . implode(', ', preg_replace('#^[\s]*?(.*?)[\s]*?$#', "'\\1'", $ug_data)) . ')' : ' = ' . "'" . trim($ug_data) . "'";
+ break;
+
+ case 'group':
+ $l_no_error = $user->lang['NO_GROUP'];
+ $sql = 'SELECT group_id AS id, group_name AS name
+ FROM ' . GROUPS_TABLE . '
+ WHERE group_id';
+ $sql .= (is_array($ug_data)) ? ' IN (' . implode(', ', $ug_data) . ')' : ' = ' . $ug_data;
+ break;
+ }
+ $result = $db->sql_query($sql);
+
+ if (!$row = $db->sql_fetchrow($result))
+ {
+ trigger_error($l_no_error);
+ }
+ unset($l_no_error);
+ unset($ug_data);
+
+ // Store the user_ids and names for later use
+ do
+ {
+ $ug_names .= (($ug_names != '') ? ', ' : '') . $row['name'];
+ $ug_ids .= (($ug_ids != '') ? ', ' : '') . $row['id'];
+ $ug_hidden .= '';
+ }
+ while ($row = $db->sql_fetchrow($result));
+ $db->sql_freeresult($result);
+ }
+
+
+ // Grab the list of options ... if we're in deps mode we want all options,
+ // else we skip the master options
+ $sql_founder = ($user->data['user_founder']) ? ' AND founder_only <> 1' : '';
+ $sql_limit_option = ($mode == 'deps') ? '' : "AND auth_option <> '" . $sql_option_mode . "_'";
+ $sql = "SELECT auth_option_id, auth_option
+ FROM " . ACL_OPTIONS_TABLE . "
+ WHERE auth_option LIKE '" . $sql_option_mode . "_%'
+ $sql_limit_option
+ $sql_founder";
+ $result = $db->sql_query($sql);
+
+ $auth_options = array();
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $auth_options[] = $row;
+ }
+ $db->sql_freeresult($result);
+
+ unset($sql_limit_option);
+
+
+ // Now we'll build a list of preset options ...
+ $preset_options = $preset_js = $preset_update_options = '';
+ $holding = array();
+
+ // Do we have a parent forum? If so offer option to inherit from that
+ if ($forum_data['parent_id'] != 0)
+ {
+ switch ($ug_type)
+ {
+ case 'group':
+ $sql = "SELECT o.auth_option, a.auth_setting FROM " . ACL_GROUPS_TABLE . " a, " . ACL_OPTIONS_TABLE . " o WHERE o.auth_option LIKE '" . $sql_option_mode . "_%' AND a.auth_option_id = o.auth_option_id AND a.forum_id = " . $forum_data['parent_id'] . " AND a.group_id IN ($ug_ids)";
+ break;
+
+ case 'user':
+ $sql = "SELECT o.auth_option, a.auth_setting FROM " . ACL_USERS_TABLE . " a, " . ACL_OPTIONS_TABLE . " o WHERE o.auth_option LIKE '" . $sql_option_mode . "_%' AND a.auth_option_id = o.auth_option_id AND a.forum_id = " . $forum_data['parent_id'] . " AND a.user_id IN ($ug_ids)";
+ break;
+ }
$result = $db->sql_query($sql);
if ($row = $db->sql_fetchrow($result))
{
do
{
- $preset_update_options .= '';
- $preset_options .= '';
-
- $preset_data = unserialize($row['preset_data']);
-
- foreach ($preset_data as $preset_type => $preset_type_ary)
+ switch ($row['auth_setting'])
{
- $holding[$preset_type] = '';
- foreach ($preset_type_ary as $preset_option)
- {
- $holding[$preset_type] .= "$preset_option, ";
- }
- }
+ case ACL_YES:
+ $holding['allow'] .= $row['auth_option'] . ', ';
+ break;
- $preset_js .= "\tpresets['preset_" . $row['preset_id'] . "'] = new Array();" . "\n";
- $preset_js .= "\tpresets['preset_" . $row['preset_id'] . "'] = new preset_obj('" . $holding['allow'] . "', '" . $holding['deny'] . "', '" . $holding['inherit'] . "');\n";
+ case ACL_NO:
+ $holding['deny'] .= $row['auth_option'] . ', ';
+ break;
+
+ case ACL_UNSET:
+ $holding['inherit'] .= $row['auth_option'] . ', ';
+ break;
+ }
}
while ($row = $db->sql_fetchrow($result));
+
+ $preset_options .= '';
+ $preset_js .= "\tpresets['preset_0'] = new Array();" . "\n";
+ $preset_js .= "\tpresets['preset_0'] = new preset_obj('" . $holding['allow'] . "', '" . $holding['deny'] . "', '" . $holding['inherit'] . "');\n";
+ }
+ $db->sql_freeresult($result);
+ }
+
+ // Look for custom presets
+ $sql = "SELECT preset_id, preset_name, preset_data
+ FROM " . ACL_PRESETS_TABLE . "
+ WHERE preset_type = '" . (($mode == 'deps') ? 'f' : $sql_option_mode) . "'
+ ORDER BY preset_id ASC";
+ $result = $db->sql_query($sql);
+
+ if ($row = $db->sql_fetchrow($result))
+ {
+ do
+ {
+ $preset_update_options .= '';
+ $preset_options .= '';
+
+ $preset_data = unserialize($row['preset_data']);
+
+ foreach ($preset_data as $preset_type => $preset_type_ary)
+ {
+ $holding[$preset_type] = '';
+ foreach ($preset_type_ary as $preset_option)
+ {
+ $holding[$preset_type] .= "$preset_option, ";
+ }
+ }
+
+ $preset_js .= "\tpresets['preset_" . $row['preset_id'] . "'] = new Array();" . "\n";
+ $preset_js .= "\tpresets['preset_" . $row['preset_id'] . "'] = new preset_obj('" . $holding['yes'] . "', '" . $holding['no'] . "', '" . $holding['unset'] . "');\n";
+ }
+ while ($row = $db->sql_fetchrow($result));
+ }
+ $db->sql_freeresult($result);
+
+ unset($holding);
+
+
+ // If we aren't looking @ deps then we try and grab existing sessions for
+ // the given forum and user/group
+ if ($mode != 'deps' && $auth_settings == '')
+ {
+ switch ($ug_type)
+ {
+ case 'group':
+ $sql_table = ACL_GROUPS_TABLE . ' a ';
+ $sql_join = 'a.group_id';
+ break;
+
+ case 'user':
+ $sql_table = ACL_USERS_TABLE . ' a, ';
+ $sql_join = 'a.user_id';;
+ break;
+ }
+
+ $sql_forum = (is_array($forum_id)) ? ' IN (' . implode(', ', $forum_id) . ')' : ' = ' . $forum_id;
+ $sql = "SELECT o.auth_option, MIN(a.auth_setting) AS min_auth_setting
+ FROM $sql_table, " . ACL_OPTIONS_TABLE . " o
+ WHERE o.auth_option LIKE '" . $sql_option_mode . "_%'
+ AND a.auth_option_id = o.auth_option_id
+ AND a.forum_id $sql_forum
+ AND $sql_join IN ($ug_ids)
+ GROUP BY o.auth_option";
+ $result = $db->sql_query($sql);
+
+ $auth_settings = array();
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $auth_settings[$row['auth_option']] = $row['min_auth_setting'];
+ }
+ $db->sql_freeresult($result);
+ }
+ else if ($mode == 'deps')
+ {
+ $sql_forum = (is_array($forum_id)) ? ' IN (' . implode(', ', $forum_id) . ')' : ' = ' . $forum_id;
+ $sql_auth_option = (preg_match('#^[a-z]_$#', $auth_option)) ? " LIKE '$auth_option%'" : " IN ('" . $auth_option . "', '$sql_option_mode')";
+ $sql = "SELECT auth_deps
+ FROM " . ACL_DEPS_TABLE . "
+ WHERE auth_option $sql_auth_option
+ AND forum_id $sql_forum
+ AND auth_setting = $auth_setting";
+ $result = $db->sql_query($sql);
+
+ $auth_settings = (!isset($auth_settings)) ? array() : $auth_settings;
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $temp = unserialize($row['auth_deps']);
+ foreach ($temp as $option => $setting)
+ {
+ $auth_settings[$option] = (!isset($auth_settings[$option]) || $setting < $auth_settings[$option]) ? $setting : $auth_settings[$option];
+ }
}
$db->sql_freeresult($result);
- unset($holding);
+ unset($temp);
+ unset($option);
+ unset($setting);
+ unset($sql_auth_option);
+ }
?>
@@ -312,11 +850,11 @@ page_header($l_title);
?>
- function preset_obj(allow, deny, inherit)
+ function preset_obj(yes, no, unset)
{
- this.allow = allow;
- this.deny = deny;
- this.inherit = inherit;
+ this.yes = yes;
+ this.no = no;
+ this.unset = unset;
}
function use_preset(option)
@@ -328,30 +866,33 @@ page_header($l_title);
for (i = 0; i < document.acl.length; i++)
{
var elem = document.acl.elements[i];
- if (elem.name.indexOf('option') == 0)
+ if (elem.name.indexOf('settings') == 0)
{
switch (option)
{
case 'all_yes':
- if (elem.value == )
+ if (elem.value == )
elem.checked = true;
break;
- case 'all_no':
- if (elem.value == )
- elem.checked = true;
- break;
- case 'all_unset':
- if (elem.value == )
- elem.checked = true;
- break;
- default:
- option_name = elem.name.substr(7, elem.name.length - 8);
- if (presets[option].allow.indexOf(option_name + ',') != -1 && elem.value == )
+ case 'all_no':
+ if (elem.value == )
elem.checked = true;
- else if (presets[option].deny.indexOf(option_name + ',') != -1 && elem.value == )
+ break;
+
+ case 'all_unset':
+ if (elem.value == )
elem.checked = true;
- else if (presets[option].inherit.indexOf(option_name + ',') != -1 && elem.value == )
+ break;
+
+ default:
+ option_name = elem.name.substr(9, elem.name.length - 10);
+
+ if (presets[option].yes.indexOf(option_name + ',') != -1 && elem.value == )
+ elem.checked = true;
+ else if (presets[option].no.indexOf(option_name + ',') != -1 && elem.value == )
+ elem.checked = true;
+ else if (presets[option].unset.indexOf(option_name + ',') != -1 && elem.value == )
elem.checked = true;
break;
}
@@ -382,59 +923,33 @@ page_header($l_title);
+
+
Warning!
+
+
A number of dependencies have been set for the changes you have requested. You can skip setting these dependences if you wish by clicking the appropriate checkbox. You can also modify the dependencies as required. Clicking update will commit your previous setting changes and those listed below (unless you choose to skip them).
+
+
+
-
-
\ No newline at end of file
diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql
index 25f9174082..ba3331f75a 100644
--- a/phpBB/install/schemas/mysql_schema.sql
+++ b/phpBB/install/schemas/mysql_schema.sql
@@ -42,17 +42,18 @@ CREATE TABLE phpbb_attach_desc (
# --------------------------------------------------------
#
-# Table structure for table `phpbb_auth_dependencies`
+# Table structure for table `phpbb_auth_deps`
#
-CREATE TABLE phpbb_auth_dependencies (
+CREATE TABLE phpbb_auth_deps (
dep_id tinyint(4) UNSIGNED NOT NULL auto_increment,
- dep_name varchar(50) NOT NULL DEFAULT '',
- auth_value text NOT NULL,
- auth_allow tinyint(1) NOT NULL default '2',
- forum_id text NOT NULL,
+ auth_option char(20) DEFAULT '' NOT NULL,
+ auth_setting tinyint(1) DEFAULT '2' NOT NULL,
+ forum_id mediumint(8) DEFAULT '0' NOT NULL,
auth_deps text NOT NULL,
PRIMARY KEY (dep_id),
- KEY dep_name (dep_name)
+ KEY auth_option (auth_option),
+ KEY auth_setting (auth_setting),
+ KEY forum_id (forum_id)
);
@@ -64,7 +65,7 @@ CREATE TABLE phpbb_auth_groups (
group_id mediumint(8) unsigned NOT NULL default '0',
forum_id mediumint(8) unsigned NOT NULL default '0',
auth_option_id smallint(5) unsigned NOT NULL default '0',
- auth_allow_deny tinyint(4) NOT NULL default '1',
+ auth_setting tinyint(4) NOT NULL default '1',
KEY group_id (group_id),
KEY auth_option_id (auth_option_id)
);
@@ -76,12 +77,12 @@ CREATE TABLE phpbb_auth_groups (
#
CREATE TABLE phpbb_auth_options (
auth_option_id tinyint(4) NOT NULL auto_increment,
- auth_value char(20) NOT NULL,
+ auth_option char(20) NOT NULL,
is_global tinyint(1) DEFAULT '0' NOT NULL,
is_local tinyint(1) DEFAULT '0' NOT NULL,
founder_only tinyint(1) DEFAULT '0' NOT NULL,
PRIMARY KEY (auth_option_id),
- KEY auth_value (auth_value)
+ KEY auth_option (auth_option)
);
@@ -91,10 +92,10 @@ CREATE TABLE phpbb_auth_options (
#
CREATE TABLE phpbb_auth_presets (
preset_id tinyint(4) NOT NULL auto_increment,
- preset_name varchar(50) NOT NULL,
- preset_user_id mediumint(5) UNSIGNED NOT NULL,
- preset_type varchar(2) NOT NULL,
- preset_data text,
+ preset_name varchar(50) DEFAULT '' NOT NULL,
+ preset_user_id mediumint(5) DEFAULT 0 UNSIGNED NOT NULL,
+ preset_type varchar(2) DEFAULT '' NOT NULL,
+ preset_data text DEFAULT '' NOT NULL,
PRIMARY KEY (preset_id),
KEY preset_type (preset_type)
);
@@ -106,9 +107,9 @@ CREATE TABLE phpbb_auth_presets (
#
CREATE TABLE phpbb_auth_users (
user_id mediumint(8) UNSIGNED NOT NULL default '0',
- forum_id mediumint(8) unsigned NOT NULL default '0',
- auth_option_id smallint(5) unsigned NOT NULL default '0',
- auth_allow_deny tinyint(4) NOT NULL default '1',
+ forum_id mediumint(8) UNSIGNED NOT NULL default '0',
+ auth_option_id smallint(5) UNSIGNED NOT NULL default '0',
+ auth_setting tinyint(4) NOT NULL default '1',
KEY user_id (user_id),
KEY auth_option_id (auth_option_id)
);
@@ -120,14 +121,14 @@ CREATE TABLE phpbb_auth_users (
#
CREATE TABLE phpbb_banlist (
ban_id mediumint(8) UNSIGNED NOT NULL auto_increment,
- ban_userid mediumint(8) UNSIGNED,
- ban_ip varchar(40),
- ban_email varchar(50),
- ban_start int(11),
- ban_end int(11),
+ ban_userid mediumint(8) UNSIGNED DEFAULT 0 NOT NULL,
+ ban_ip varchar(40) DEFAULT '' NOT NULL,
+ ban_email varchar(50) DEFAULT '' NOT NULL,
+ ban_start int(11) DEFAULT '0' NOT NULL,
+ ban_end int(11) DEFAULT '0' NOT NULL,
ban_exclude tinyint(1) DEFAULT '0' NOT NULL,
- ban_reason varchar(255),
- ban_give_reason varchar(255),
+ ban_reason varchar(255) DEFAULT '' NOT NULL,
+ ban_give_reason varchar(255) DEFAULT '' NOT NULL,
PRIMARY KEY (ban_id)
);
@@ -150,10 +151,10 @@ CREATE TABLE phpbb_config (
# Table structure for table 'phpbb_confirm'
#
CREATE TABLE phpbb_confirm (
- confirm_id char(32) NOT NULL default '',
- session_id char(32) NOT NULL default '',
- code char(6) NOT NULL default '',
- time int(11) NOT NULL,
+ confirm_id char(32) DEFAULT '' NOT NULL,
+ session_id char(32) DEFAULT '' NOT NULL,
+ code char(6) DEFAULT '' NOT NULL,
+ time int(11) DEFAULT '0' NOT NULL,
PRIMARY KEY (session_id,confirm_id),
KEY time (time)
);
@@ -165,7 +166,7 @@ CREATE TABLE phpbb_confirm (
#
CREATE TABLE phpbb_disallow (
disallow_id mediumint(8) UNSIGNED NOT NULL auto_increment,
- disallow_username varchar(30),
+ disallow_username varchar(30) DEFAULT '' NOT NULL,
PRIMARY KEY (disallow_id)
);
@@ -177,8 +178,8 @@ CREATE TABLE phpbb_disallow (
CREATE TABLE phpbb_extensions (
extension_id mediumint(8) UNSIGNED NOT NULL auto_increment,
group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
- extension varchar(100) NOT NULL,
- comment varchar(100),
+ extension varchar(100) DEFAULT '' NOT NULL,
+ comment varchar(100) DEFAULT '' NOT NULL,
PRIMARY KEY (extension_id)
);
@@ -193,7 +194,7 @@ CREATE TABLE phpbb_extension_groups (
cat_id tinyint(2) DEFAULT '0' NOT NULL,
allow_group tinyint(1) DEFAULT '0' NOT NULL,
download_mode tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
- upload_icon varchar(100) DEFAULT '',
+ upload_icon varchar(100) DEFAULT '' NOT NULL,
max_filesize int(20) DEFAULT '0' NOT NULL,
PRIMARY KEY (group_id)
);
@@ -230,7 +231,6 @@ CREATE TABLE phpbb_forums (
forum_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
forum_topics mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
forum_topics_real mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
- forum_last_topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
forum_last_post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
forum_last_poster_id mediumint(8) DEFAULT '0' NOT NULL,
forum_last_post_time int(11) DEFAULT '0' NOT NULL,