makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

ok, sorry for this. :/

Browse source 
- cleaned up table names/constants


git-svn-id: file:///svn/phpbb/trunk@6021 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-06-07 19:32:23 +00:00
parent 13b9021ae4
commit 0e7adebad6
31 changed files with 601 additions and 601 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/develop/add_permissions.php
View file

@ -37,9 +37,9 @@ define('ACL_NO', 0);
define('ACL_YES', 1); define('ACL_YES', 1);
define('ACL_UNSET', -1); define('ACL_UNSET', -1);
define('ACL_GROUPS_TABLE', $table_prefix.'auth_groups'); define('ACL_GROUPS_TABLE', $table_prefix.'acl_groups');
define('ACL_OPTIONS_TABLE', $table_prefix.'auth_options'); define('ACL_OPTIONS_TABLE', $table_prefix.'acl_options');
define('ACL_USERS_TABLE', $table_prefix.'auth_users'); define('ACL_USERS_TABLE', $table_prefix.'acl_users');
define('GROUPS_TABLE', $table_prefix.'groups'); define('GROUPS_TABLE', $table_prefix.'groups');
define('USERS_TABLE', $table_prefix.'users'); define('USERS_TABLE', $table_prefix.'users');

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

@ -1064,7 +1064,7 @@ class acp_forums
} }
unset($table_ary); unset($table_ary);
$table_ary = array(FORUMS_ACCESS_TABLE, FORUMS_TRACK_TABLE, FORUMS_WATCH_TABLE, MODERATOR_TABLE); $table_ary = array(FORUMS_ACCESS_TABLE, FORUMS_TRACK_TABLE, FORUMS_WATCH_TABLE, MODERATOR_CACHE_TABLE);
foreach ($table_ary as $table) foreach ($table_ary as $table)
{ {
@ -1338,7 +1338,7 @@ class acp_forums
// Delete everything else and thank MySQL for offering multi-table deletion // Delete everything else and thank MySQL for offering multi-table deletion
$tables_ary = array( $tables_ary = array(
SEARCH_MATCH_TABLE => 'post_id', SEARCH_WORDMATCH_TABLE => 'post_id',
REPORTS_TABLE => 'post_id', REPORTS_TABLE => 'post_id',
WARNINGS_TABLE => 'post_id', WARNINGS_TABLE => 'post_id',
BOOKMARKS_TABLE => 'topic_id', BOOKMARKS_TABLE => 'topic_id',
@ -1368,7 +1368,7 @@ class acp_forums
// Delete everything else and curse your DB for not offering multi-table deletion // Delete everything else and curse your DB for not offering multi-table deletion
$tables_ary = array( $tables_ary = array(
'post_id' => array( 'post_id' => array(
SEARCH_MATCH_TABLE, SEARCH_WORDMATCH_TABLE,
REPORTS_TABLE, REPORTS_TABLE,
WARNINGS_TABLE, WARNINGS_TABLE,
), ),
@ -1418,7 +1418,7 @@ class acp_forums
break; break;
} }
$table_ary = array(ACL_GROUPS_TABLE, ACL_USERS_TABLE, FORUMS_ACCESS_TABLE, FORUMS_TRACK_TABLE, FORUMS_WATCH_TABLE, LOG_TABLE, MODERATOR_TABLE, POSTS_TABLE, TOPICS_TABLE, TOPICS_TRACK_TABLE); $table_ary = array(ACL_GROUPS_TABLE, ACL_USERS_TABLE, FORUMS_ACCESS_TABLE, FORUMS_TRACK_TABLE, FORUMS_WATCH_TABLE, LOG_TABLE, MODERATOR_CACHE_TABLE, POSTS_TABLE, TOPICS_TABLE, TOPICS_TRACK_TABLE);
foreach ($table_ary as $table) foreach ($table_ary as $table)
{ {

14
phpBB/includes/acp/acp_profile.php
View file

@ -105,7 +105,7 @@ class acp_profile
$db->sql_query('DELETE FROM ' . PROFILE_FIELDS_TABLE . " WHERE field_id = $field_id"); $db->sql_query('DELETE FROM ' . PROFILE_FIELDS_TABLE . " WHERE field_id = $field_id");
$db->sql_query('DELETE FROM ' . PROFILE_FIELDS_LANG_TABLE . " WHERE field_id = $field_id"); $db->sql_query('DELETE FROM ' . PROFILE_FIELDS_LANG_TABLE . " WHERE field_id = $field_id");
$db->sql_query('DELETE FROM ' . PROFILE_LANG_TABLE . " WHERE field_id = $field_id"); $db->sql_query('DELETE FROM ' . PROFILE_LANG_TABLE . " WHERE field_id = $field_id");
$db->sql_query('ALTER TABLE ' . PROFILE_DATA_TABLE . " DROP $field_ident"); $db->sql_query('ALTER TABLE ' . PROFILE_FIELDS_DATA_TABLE . " DROP $field_ident");
$order = 0; $order = 0;
@ -993,7 +993,7 @@ class acp_profile
case 'mysqli': case 'mysqli':
// We are defining the biggest common value, because of the possibility to edit the min/max values of each field. // We are defining the biggest common value, because of the possibility to edit the min/max values of each field.
$sql = 'ALTER TABLE ' . PROFILE_DATA_TABLE . " ADD $field_ident "; $sql = 'ALTER TABLE ' . PROFILE_FIELDS_DATA_TABLE . " ADD $field_ident ";
switch ($field_type) switch ($field_type)
{ {
case FIELD_STRING: case FIELD_STRING:
@ -1028,7 +1028,7 @@ class acp_profile
case 'sqlite': case 'sqlite':
// We are defining the biggest common value, because of the possibility to edit the min/max values of each field. // We are defining the biggest common value, because of the possibility to edit the min/max values of each field.
$sql = 'ALTER TABLE ' . PROFILE_DATA_TABLE . " ADD $field_ident "; $sql = 'ALTER TABLE ' . PROFILE_FIELDS_DATA_TABLE . " ADD $field_ident ";
switch ($field_type) switch ($field_type)
{ {
@ -1065,7 +1065,7 @@ class acp_profile
case 'mssql_odbc': case 'mssql_odbc':
// We are defining the biggest common value, because of the possibility to edit the min/max values of each field. // We are defining the biggest common value, because of the possibility to edit the min/max values of each field.
$sql = 'ALTER TABLE [' . PROFILE_DATA_TABLE . "] ADD $field_ident "; $sql = 'ALTER TABLE [' . PROFILE_FIELDS_DATA_TABLE . "] ADD $field_ident ";
switch ($field_type) switch ($field_type)
{ {
@ -1098,7 +1098,7 @@ class acp_profile
case 'postgres': case 'postgres':
// We are defining the biggest common value, because of the possibility to edit the min/max values of each field. // We are defining the biggest common value, because of the possibility to edit the min/max values of each field.
$sql = 'ALTER TABLE ' . PROFILE_DATA_TABLE . " ADD COLUMN $field_ident "; $sql = 'ALTER TABLE ' . PROFILE_FIELDS_DATA_TABLE . " ADD COLUMN $field_ident ";
switch ($field_type) switch ($field_type)
{ {
@ -1134,7 +1134,7 @@ class acp_profile
case 'firebird': case 'firebird':
// We are defining the biggest common value, because of the possibility to edit the min/max values of each field. // We are defining the biggest common value, because of the possibility to edit the min/max values of each field.
$sql = 'ALTER TABLE ' . PROFILE_DATA_TABLE . " ADD $field_ident "; $sql = 'ALTER TABLE ' . PROFILE_FIELDS_DATA_TABLE . " ADD $field_ident ";
switch ($field_type) switch ($field_type)
{ {
@ -1167,7 +1167,7 @@ class acp_profile
case 'oracle': case 'oracle':
// We are defining the biggest common value, because of the possibility to edit the min/max values of each field. // We are defining the biggest common value, because of the possibility to edit the min/max values of each field.
$sql = 'ALTER TABLE ' . PROFILE_DATA_TABLE . " ADD $field_ident "; $sql = 'ALTER TABLE ' . PROFILE_FIELDS_DATA_TABLE . " ADD $field_ident ";
switch ($field_type) switch ($field_type)
{ {
case FIELD_STRING: case FIELD_STRING:

26
phpBB/includes/acp/acp_reasons.php
View file

@ -56,7 +56,7 @@ class acp_reasons
if ($action == 'edit') if ($action == 'edit')
{ {
$sql = 'SELECT reason_title $sql = 'SELECT reason_title
FROM ' . REASONS_TABLE . " FROM ' . REPORTS_REASONS_TABLE . "
WHERE reason_id = $reason_id"; WHERE reason_id = $reason_id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result); $row = $db->sql_fetchrow($result);
@ -76,7 +76,7 @@ class acp_reasons
if ($check_double) if ($check_double)
{ {
$sql = 'SELECT reason_id $sql = 'SELECT reason_id
FROM ' . REASONS_TABLE . " FROM ' . REPORTS_REASONS_TABLE . "
WHERE LOWER(reason_title) = '" . strtolower($reason_row['reason_title']) . "'"; WHERE LOWER(reason_title) = '" . strtolower($reason_row['reason_title']) . "'";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result); $row = $db->sql_fetchrow($result);
@ -95,7 +95,7 @@ class acp_reasons
{ {
// Get new order... // Get new order...
$sql = 'SELECT MAX(reason_order) as max_reason_order $sql = 'SELECT MAX(reason_order) as max_reason_order
FROM ' . REASONS_TABLE; FROM ' . REPORTS_REASONS_TABLE;
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$max_order = (int) $db->sql_fetchfield('max_reason_order'); $max_order = (int) $db->sql_fetchfield('max_reason_order');
$db->sql_freeresult($result); $db->sql_freeresult($result);
@ -106,7 +106,7 @@ class acp_reasons
'reason_order' => $max_order + 1 'reason_order' => $max_order + 1
); );
$db->sql_query('INSERT INTO ' . REASONS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); $db->sql_query('INSERT INTO ' . REPORTS_REASONS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));
$log = 'ADDED'; $log = 'ADDED';
} }
@ -117,7 +117,7 @@ class acp_reasons
'reason_description' => (string) $reason_row['reason_description'], 'reason_description' => (string) $reason_row['reason_description'],
); );
$db->sql_query('UPDATE ' . REASONS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' $db->sql_query('UPDATE ' . REPORTS_REASONS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
WHERE reason_id = ' . $reason_id); WHERE reason_id = ' . $reason_id);
$log = 'UPDATED'; $log = 'UPDATED';
@ -130,7 +130,7 @@ class acp_reasons
else if ($reason_id) else if ($reason_id)
{ {
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . REASONS_TABLE . ' FROM ' . REPORTS_REASONS_TABLE . '
WHERE reason_id = ' . $reason_id; WHERE reason_id = ' . $reason_id;
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$reason_row = $db->sql_fetchrow($result); $reason_row = $db->sql_fetchrow($result);
@ -173,7 +173,7 @@ class acp_reasons
case 'delete': case 'delete':
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . REASONS_TABLE . ' FROM ' . REPORTS_REASONS_TABLE . '
WHERE reason_id = ' . $reason_id; WHERE reason_id = ' . $reason_id;
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$reason_row = $db->sql_fetchrow($result); $reason_row = $db->sql_fetchrow($result);
@ -193,7 +193,7 @@ class acp_reasons
if (confirm_box(true)) if (confirm_box(true))
{ {
$sql = 'SELECT reason_id $sql = 'SELECT reason_id
FROM ' . REASONS_TABLE . " FROM ' . REPORTS_REASONS_TABLE . "
WHERE reason_title = 'other'"; WHERE reason_title = 'other'";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$other_reason_id = (int) $db->sql_fetchfield('reason_id'); $other_reason_id = (int) $db->sql_fetchfield('reason_id');
@ -205,7 +205,7 @@ class acp_reasons
WHERE reason_id = $reason_id"; WHERE reason_id = $reason_id";
$db->sql_query($sql); $db->sql_query($sql);
$db->sql_query('DELETE FROM ' . REASONS_TABLE . ' WHERE reason_id = ' . $reason_id); $db->sql_query('DELETE FROM ' . REPORTS_REASONS_TABLE . ' WHERE reason_id = ' . $reason_id);
add_log('admin', 'LOG_REASON_REMOVED', $reason_row['reason_title']); add_log('admin', 'LOG_REASON_REMOVED', $reason_row['reason_title']);
trigger_error($user->lang['REASON_REMOVED'] . adm_back_link($this->u_action)); trigger_error($user->lang['REASON_REMOVED'] . adm_back_link($this->u_action));
@ -228,7 +228,7 @@ class acp_reasons
$order = request_var('order', 0); $order = request_var('order', 0);
$order_total = $order * 2 + (($action == 'move_up') ? -1 : 1); $order_total = $order * 2 + (($action == 'move_up') ? -1 : 1);
$sql = 'UPDATE ' . REASONS_TABLE . ' $sql = 'UPDATE ' . REPORTS_REASONS_TABLE . '
SET reason_order = ' . $order_total . ' - reason_order SET reason_order = ' . $order_total . ' - reason_order
WHERE reason_order IN (' . $order . ', ' . (($action == 'move_up') ? $order - 1 : $order + 1) . ')'; WHERE reason_order IN (' . $order . ', ' . (($action == 'move_up') ? $order - 1 : $order + 1) . ')';
$db->sql_query($sql); $db->sql_query($sql);
@ -238,7 +238,7 @@ class acp_reasons
// By default, check that order is valid and fix it if necessary // By default, check that order is valid and fix it if necessary
$sql = 'SELECT reason_id, reason_order $sql = 'SELECT reason_id, reason_order
FROM ' . REASONS_TABLE . ' FROM ' . REPORTS_REASONS_TABLE . '
ORDER BY reason_order'; ORDER BY reason_order';
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -251,7 +251,7 @@ class acp_reasons
if ($row['reason_order'] != $order) if ($row['reason_order'] != $order)
{ {
$sql = 'UPDATE ' . REASONS_TABLE . " $sql = 'UPDATE ' . REPORTS_REASONS_TABLE . "
SET reason_order = $order SET reason_order = $order
WHERE reason_id = {$row['reason_id']}"; WHERE reason_id = {$row['reason_id']}";
$db->sql_query($sql); $db->sql_query($sql);
@ -280,7 +280,7 @@ class acp_reasons
$db->sql_freeresult($result); $db->sql_freeresult($result);
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . REASONS_TABLE . ' FROM ' . REPORTS_REASONS_TABLE . '
ORDER BY reason_order ASC'; ORDER BY reason_order ASC';
$result = $db->sql_query($sql); $result = $db->sql_query($sql);

98
phpBB/includes/acp/acp_styles.php
View file

@ -194,7 +194,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
case 'refresh': case 'refresh':
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . STYLES_TPL_TABLE . " FROM ' . STYLES_TEMPLATE_TABLE . "
WHERE template_id = $style_id"; WHERE template_id = $style_id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$template_row = $db->sql_fetchrow($result); $template_row = $db->sql_fetchrow($result);
@ -215,7 +215,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
$filelist = array('' => array()); $filelist = array('' => array());
$sql = 'SELECT template_filename, template_mtime $sql = 'SELECT template_filename, template_mtime
FROM ' . STYLES_TPLDATA_TABLE . " FROM ' . STYLES_TEMPLATE_DATA_TABLE . "
WHERE template_id = $style_id"; WHERE template_id = $style_id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -271,7 +271,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
case 'refresh': case 'refresh':
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . STYLES_CSS_TABLE . " FROM ' . STYLES_THEME_TABLE . "
WHERE theme_id = $style_id"; WHERE theme_id = $style_id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$theme_row = $db->sql_fetchrow($result); $theme_row = $db->sql_fetchrow($result);
@ -297,11 +297,11 @@ pagination_sep = \'{PAGINATION_SEP}\'
'theme_data' => $this->db_theme_data($theme_row) 'theme_data' => $this->db_theme_data($theme_row)
); );
$sql = 'UPDATE ' . STYLES_CSS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " $sql = 'UPDATE ' . STYLES_THEME_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . "
WHERE theme_id = $style_id"; WHERE theme_id = $style_id";
$db->sql_query($sql); $db->sql_query($sql);
$cache->destroy('sql', STYLES_CSS_TABLE); $cache->destroy('sql', STYLES_THEME_TABLE);
trigger_error($user->lang['THEME_REFRESHED'] . adm_back_link($this->u_action)); trigger_error($user->lang['THEME_REFRESHED'] . adm_back_link($this->u_action));
} }
@ -356,15 +356,15 @@ pagination_sep = \'{PAGINATION_SEP}\'
break; break;
case 'template': case 'template':
$sql_from = STYLES_TPL_TABLE; $sql_from = STYLES_TEMPLATE_TABLE;
break; break;
case 'theme': case 'theme':
$sql_from = STYLES_CSS_TABLE; $sql_from = STYLES_THEME_TABLE;
break; break;
case 'imageset': case 'imageset':
$sql_from = STYLES_IMAGE_TABLE; $sql_from = STYLES_IMAGESET_TABLE;
break; break;
} }
@ -495,7 +495,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
// Retrieve some information about the template // Retrieve some information about the template
$sql = 'SELECT template_storedb, template_path, template_name $sql = 'SELECT template_storedb, template_path, template_name
FROM ' . STYLES_TPL_TABLE . " FROM ' . STYLES_TEMPLATE_TABLE . "
WHERE template_id = $template_id"; WHERE template_id = $template_id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -529,7 +529,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
// If it's not stored in the db yet, then update the template setting and store all template files in the db // If it's not stored in the db yet, then update the template setting and store all template files in the db
if (!$template_info['template_storedb']) if (!$template_info['template_storedb'])
{ {
$sql = 'UPDATE ' . STYLES_TPL_TABLE . ' $sql = 'UPDATE ' . STYLES_TEMPLATE_TABLE . '
SET template_storedb = 1 SET template_storedb = 1
WHERE template_id = ' . $template_id; WHERE template_id = ' . $template_id;
$db->sql_query($sql); $db->sql_query($sql);
@ -542,7 +542,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
} }
// Update the template_data table entry for this template file // Update the template_data table entry for this template file
$sql = 'UPDATE ' . STYLES_TPLDATA_TABLE . " $sql = 'UPDATE ' . STYLES_TEMPLATE_DATA_TABLE . "
SET template_data = '" . $db->sql_escape($template_data) . "', template_mtime = " . time() . " SET template_data = '" . $db->sql_escape($template_data) . "', template_mtime = " . time() . "
WHERE template_id = $template_id WHERE template_id = $template_id
AND template_filename = '" . $db->sql_escape($template_file) . "'"; AND template_filename = '" . $db->sql_escape($template_file) . "'";
@ -577,7 +577,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
else else
{ {
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . STYLES_TPLDATA_TABLE . " FROM ' . STYLES_TEMPLATE_DATA_TABLE . "
WHERE template_id = $template_id"; WHERE template_id = $template_id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -694,7 +694,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
$submit = isset($_POST['submit']) ? true : false; $submit = isset($_POST['submit']) ? true : false;
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . STYLES_TPL_TABLE . " FROM ' . STYLES_TEMPLATE_TABLE . "
WHERE template_id = $template_id"; WHERE template_id = $template_id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -764,7 +764,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
if ($template_row['template_storedb']) if ($template_row['template_storedb'])
{ {
$sql = 'SELECT template_filename, template_mtime $sql = 'SELECT template_filename, template_mtime
FROM ' . STYLES_TPLDATA_TABLE . " FROM ' . STYLES_TEMPLATE_DATA_TABLE . "
WHERE template_id = $template_id"; WHERE template_id = $template_id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -831,7 +831,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
// Retrieve some information about the theme // Retrieve some information about the theme
$sql = 'SELECT theme_storedb, theme_path, theme_name, theme_data $sql = 'SELECT theme_storedb, theme_path, theme_name, theme_data
FROM ' . STYLES_CSS_TABLE . " FROM ' . STYLES_THEME_TABLE . "
WHERE theme_id = $theme_id"; WHERE theme_id = $theme_id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -1187,12 +1187,12 @@ pagination_sep = \'{PAGINATION_SEP}\'
'theme_storedb' => 1, 'theme_storedb' => 1,
'theme_data' => $this->db_theme_data($theme_info, $stylesheet), 'theme_data' => $this->db_theme_data($theme_info, $stylesheet),
); );
$sql = 'UPDATE ' . STYLES_CSS_TABLE . ' $sql = 'UPDATE ' . STYLES_THEME_TABLE . '
SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
WHERE theme_id = ' . $theme_id; WHERE theme_id = ' . $theme_id;
$db->sql_query($sql); $db->sql_query($sql);
$cache->destroy('sql', STYLES_CSS_TABLE); $cache->destroy('sql', STYLES_THEME_TABLE);
// notify the user if the template was not stored in the db before his modification // notify the user if the template was not stored in the db before his modification
if (!$theme_info['theme_storedb']) if (!$theme_info['theme_storedb'])
@ -1202,7 +1202,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
} }
} }
$cache->destroy('sql', STYLES_CSS_TABLE); $cache->destroy('sql', STYLES_THEME_TABLE);
add_log('admin', ($add_custom) ? 'LOG_THEME_EDIT_ADD' : 'LOG_THEME_EDIT', $theme_info['theme_name'], ($add_custom) ? $custom_class : $edit_class); add_log('admin', ($add_custom) ? 'LOG_THEME_EDIT_ADD' : 'LOG_THEME_EDIT', $theme_info['theme_name'], ($add_custom) ? $custom_class : $edit_class);
trigger_error($message . adm_back_link($this->u_action . "&action=edit&id=$theme_id&css_class=$edit_class&showcss=$show_css&text_rows=$text_rows")); trigger_error($message . adm_back_link($this->u_action . "&action=edit&id=$theme_id&css_class=$edit_class&showcss=$show_css&text_rows=$text_rows"));
@ -1242,7 +1242,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
{ {
$sql_select = ($imgname) ? ", $imgname" : ''; $sql_select = ($imgname) ? ", $imgname" : '';
$sql = "SELECT imageset_path, imageset_name, imageset_copyright$sql_select $sql = "SELECT imageset_path, imageset_name, imageset_copyright$sql_select
FROM " . STYLES_IMAGE_TABLE . " FROM " . STYLES_IMAGESET_TABLE . "
WHERE imageset_id = $imageset_id"; WHERE imageset_id = $imageset_id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -1297,12 +1297,12 @@ pagination_sep = \'{PAGINATION_SEP}\'
$imgpath = preg_replace('/^([^\/]+\/)/', '{LANG}/', $imgpath) . $imgheight . $imgwidth; $imgpath = preg_replace('/^([^\/]+\/)/', '{LANG}/', $imgpath) . $imgheight . $imgwidth;
$sql = 'UPDATE ' . STYLES_IMAGE_TABLE . " $sql = 'UPDATE ' . STYLES_IMAGESET_TABLE . "
SET $imgname = '" . $db->sql_escape($imgpath) . "' SET $imgname = '" . $db->sql_escape($imgpath) . "'
WHERE imageset_id = $imageset_id"; WHERE imageset_id = $imageset_id";
$db->sql_query($sql); $db->sql_query($sql);
$cache->destroy('sql', STYLES_IMAGE_TABLE); $cache->destroy('sql', STYLES_IMAGESET_TABLE);
add_log('admin', 'LOG_IMAGESET_EDIT', $imageset_name); add_log('admin', 'LOG_IMAGESET_EDIT', $imageset_name);
@ -1416,17 +1416,17 @@ pagination_sep = \'{PAGINATION_SEP}\'
break; break;
case 'template': case 'template':
$sql_from = STYLES_TPL_TABLE; $sql_from = STYLES_TEMPLATE_TABLE;
$sql_select = 'template_name, template_path, template_storedb'; $sql_select = 'template_name, template_path, template_storedb';
break; break;
case 'theme': case 'theme':
$sql_from = STYLES_CSS_TABLE; $sql_from = STYLES_THEME_TABLE;
$sql_select = 'theme_name, theme_path, theme_storedb'; $sql_select = 'theme_name, theme_path, theme_storedb';
break; break;
case 'imageset': case 'imageset':
$sql_from = STYLES_IMAGE_TABLE; $sql_from = STYLES_IMAGESET_TABLE;
$sql_select = 'imageset_name, imageset_path'; $sql_select = 'imageset_name, imageset_path';
break; break;
} }
@ -1568,7 +1568,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
$sql_select .= ($inc_template) ? ', t.*' : ', t.template_name'; $sql_select .= ($inc_template) ? ', t.*' : ', t.template_name';
$sql_select .= ($inc_theme) ? ', c.*' : ', c.theme_name'; $sql_select .= ($inc_theme) ? ', c.*' : ', c.theme_name';
$sql_select .= ($inc_imageset) ? ', i.*' : ', i.imageset_name'; $sql_select .= ($inc_imageset) ? ', i.*' : ', i.imageset_name';
$sql_from = STYLES_TABLE . ' s, ' . STYLES_TPL_TABLE . ' t, ' . STYLES_CSS_TABLE . ' c, ' . STYLES_IMAGE_TABLE . ' i'; $sql_from = STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . ' i';
$sql_where = "s.style_id = $style_id AND t.template_id = s.template_id AND c.theme_id = s.theme_id AND i.imageset_id = s.imageset_id"; $sql_where = "s.style_id = $style_id AND t.template_id = s.template_id AND c.theme_id = s.theme_id AND i.imageset_id = s.imageset_id";
$l_prefix = 'STYLE'; $l_prefix = 'STYLE';
@ -1578,7 +1578,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
$name = 'template_name'; $name = 'template_name';
$sql_select = '*'; $sql_select = '*';
$sql_from = STYLES_TPL_TABLE; $sql_from = STYLES_TEMPLATE_TABLE;
$sql_where = "template_id = $style_id"; $sql_where = "template_id = $style_id";
$l_prefix = 'TEMPLATE'; $l_prefix = 'TEMPLATE';
@ -1588,7 +1588,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
$name = 'theme_name'; $name = 'theme_name';
$sql_select = '*'; $sql_select = '*';
$sql_from = STYLES_CSS_TABLE; $sql_from = STYLES_THEME_TABLE;
$sql_where = "theme_id = $style_id"; $sql_where = "theme_id = $style_id";
$l_prefix = 'THEME'; $l_prefix = 'THEME';
@ -1598,7 +1598,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
$name = 'imageset_name'; $name = 'imageset_name';
$sql_select = '*'; $sql_select = '*';
$sql_from = STYLES_IMAGE_TABLE; $sql_from = STYLES_IMAGESET_TABLE;
$sql_where = "imageset_id = $style_id"; $sql_where = "imageset_id = $style_id";
$l_prefix = 'IMAGESET'; $l_prefix = 'IMAGESET';
@ -1671,7 +1671,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
else else
{ {
$sql = 'SELECT template_filename, template_data $sql = 'SELECT template_filename, template_data
FROM ' . STYLES_TPLDATA_TABLE . " FROM ' . STYLES_TEMPLATE_DATA_TABLE . "
WHERE template_id = {$style_row['template_id']}"; WHERE template_id = {$style_row['template_id']}";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -1880,7 +1880,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
$l_type = strtoupper($mode); $l_type = strtoupper($mode);
$error = array(); $error = array();
$element_ary = array('template' => STYLES_TPL_TABLE, 'theme' => STYLES_CSS_TABLE, 'imageset' => STYLES_IMAGE_TABLE); $element_ary = array('template' => STYLES_TEMPLATE_TABLE, 'theme' => STYLES_THEME_TABLE, 'imageset' => STYLES_IMAGESET_TABLE);
switch ($mode) switch ($mode)
{ {
@ -1889,15 +1889,15 @@ pagination_sep = \'{PAGINATION_SEP}\'
break; break;
case 'template': case 'template':
$sql_from = STYLES_TPL_TABLE; $sql_from = STYLES_TEMPLATE_TABLE;
break; break;
case 'theme': case 'theme':
$sql_from = STYLES_CSS_TABLE; $sql_from = STYLES_THEME_TABLE;
break; break;
case 'imageset': case 'imageset':
$sql_from = STYLES_IMAGE_TABLE; $sql_from = STYLES_IMAGESET_TABLE;
break; break;
} }
@ -2037,7 +2037,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
if (!$store_db && !$safe_mode && is_writeable("{$phpbb_root_path}styles/{$style_row['template_path']}/template")) if (!$store_db && !$safe_mode && is_writeable("{$phpbb_root_path}styles/{$style_row['template_path']}/template"))
{ {
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . STYLES_TPLDATA_TABLE . " FROM ' . STYLES_TEMPLATE_DATA_TABLE . "
WHERE template_id = $style_id"; WHERE template_id = $style_id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -2056,7 +2056,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
if (!$store_db) if (!$store_db)
{ {
$sql = 'DELETE FROM ' . STYLES_TPLDATA_TABLE . " $sql = 'DELETE FROM ' . STYLES_TEMPLATE_DATA_TABLE . "
WHERE template_id = $style_id"; WHERE template_id = $style_id";
$db->sql_query($sql); $db->sql_query($sql);
} }
@ -2263,11 +2263,11 @@ pagination_sep = \'{PAGINATION_SEP}\'
if ($mode == 'insert') if ($mode == 'insert')
{ {
$sql = 'INSERT INTO ' . STYLES_TPLDATA_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); $sql = 'INSERT INTO ' . STYLES_TEMPLATE_DATA_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
} }
else else
{ {
$sql = 'UPDATE ' . STYLES_TPLDATA_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " $sql = 'UPDATE ' . STYLES_TEMPLATE_DATA_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . "
WHERE template_id = $style_id WHERE template_id = $style_id
AND template_filename = '" . $db->sql_escape("$pathfile$file") . "'"; AND template_filename = '" . $db->sql_escape("$pathfile$file") . "'";
} }
@ -2310,7 +2310,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
/** /**
* Destroys cached versions of template files * Destroys cached versions of template files
* *
* @param array $template_row contains the template's row in the STYLES_TPL_TABLE database table * @param array $template_row contains the template's row in the STYLES_TEMPLATE_TABLE database table
* @param mixed $file_ary is optional and may contain an array of template file names which should be refreshed in the cache. * @param mixed $file_ary is optional and may contain an array of template file names which should be refreshed in the cache.
* The file names should be the original template file names and not the cache file names. * The file names should be the original template file names and not the cache file names.
*/ */
@ -2356,7 +2356,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
$error = $installcfg = $style_row = array(); $error = $installcfg = $style_row = array();
$root_path = $cfg_file = ''; $root_path = $cfg_file = '';
$element_ary = array('template' => STYLES_TPL_TABLE, 'theme' => STYLES_CSS_TABLE, 'imageset' => STYLES_IMAGE_TABLE); $element_ary = array('template' => STYLES_TEMPLATE_TABLE, 'theme' => STYLES_THEME_TABLE, 'imageset' => STYLES_IMAGESET_TABLE);
$install_path = request_var('path', ''); $install_path = request_var('path', '');
$update = (isset($_POST['update'])) ? true : false; $update = (isset($_POST['update'])) ? true : false;
@ -2501,7 +2501,7 @@ pagination_sep = \'{PAGINATION_SEP}\'
global $phpbb_root_path, $phpEx, $config, $db, $cache, $user, $template; global $phpbb_root_path, $phpEx, $config, $db, $cache, $user, $template;
$l_type = strtoupper($mode); $l_type = strtoupper($mode);
$element_ary = array('template' => STYLES_TPL_TABLE, 'theme' => STYLES_CSS_TABLE, 'imageset' => STYLES_IMAGE_TABLE); $element_ary = array('template' => STYLES_TEMPLATE_TABLE, 'theme' => STYLES_THEME_TABLE, 'imageset' => STYLES_IMAGESET_TABLE);
$error = array(); $error = array();
$style_row = array( $style_row = array(
@ -2529,17 +2529,17 @@ pagination_sep = \'{PAGINATION_SEP}\'
case 'template': case 'template':
$sql_select = 'template_id'; $sql_select = 'template_id';
$sql_from = STYLES_TPL_TABLE; $sql_from = STYLES_TEMPLATE_TABLE;
break; break;
case 'theme': case 'theme':
$sql_select = 'theme_id'; $sql_select = 'theme_id';
$sql_from = STYLES_CSS_TABLE; $sql_from = STYLES_THEME_TABLE;
break; break;
case 'imageset': case 'imageset':
$sql_select = 'imageset_id'; $sql_select = 'imageset_id';
$sql_from = STYLES_IMAGE_TABLE; $sql_from = STYLES_IMAGESET_TABLE;
break; break;
} }
@ -2657,15 +2657,15 @@ pagination_sep = \'{PAGINATION_SEP}\'
switch ($element) switch ($element)
{ {
case 'template': case 'template':
$sql_from = STYLES_TPL_TABLE; $sql_from = STYLES_TEMPLATE_TABLE;
break; break;
case 'theme': case 'theme':
$sql_from = STYLES_CSS_TABLE; $sql_from = STYLES_THEME_TABLE;
break; break;
case 'imageset': case 'imageset':
$sql_from = STYLES_IMAGE_TABLE; $sql_from = STYLES_IMAGESET_TABLE;
break; break;
} }
@ -2813,15 +2813,15 @@ pagination_sep = \'{PAGINATION_SEP}\'
switch ($mode) switch ($mode)
{ {
case 'template': case 'template':
$sql_from = STYLES_TPL_TABLE; $sql_from = STYLES_TEMPLATE_TABLE;
break; break;
case 'theme': case 'theme':
$sql_from = STYLES_CSS_TABLE; $sql_from = STYLES_THEME_TABLE;
break; break;
case 'imageset': case 'imageset':
$sql_from = STYLES_IMAGE_TABLE; $sql_from = STYLES_IMAGESET_TABLE;
break; break;
} }

4
phpBB/includes/acp/acp_users.php
View file

@ -925,7 +925,7 @@ class acp_users
// Update Custom Fields // Update Custom Fields
if (sizeof($cp_data)) if (sizeof($cp_data))
{ {
$sql = 'UPDATE ' . PROFILE_DATA_TABLE . ' $sql = 'UPDATE ' . PROFILE_FIELDS_DATA_TABLE . '
SET ' . $db->sql_build_array('UPDATE', $cp_data) . " SET ' . $db->sql_build_array('UPDATE', $cp_data) . "
WHERE user_id = $user_id"; WHERE user_id = $user_id";
$db->sql_query($sql); $db->sql_query($sql);
@ -936,7 +936,7 @@ class acp_users
$db->return_on_error = true; $db->return_on_error = true;
$sql = 'INSERT INTO ' . PROFILE_DATA_TABLE . ' ' . $db->sql_build_array('INSERT', $cp_data); $sql = 'INSERT INTO ' . PROFILE_FIELDS_DATA_TABLE . ' ' . $db->sql_build_array('INSERT', $cp_data);
$db->sql_query($sql); $db->sql_query($sql);
$db->return_on_error = false; $db->return_on_error = false;

40
phpBB/includes/constants.php
View file

@ -133,11 +133,11 @@ define('FIELD_DATE', 6);
// Table names // Table names
define('ACL_GROUPS_TABLE', $table_prefix . 'auth_groups'); define('ACL_GROUPS_TABLE', $table_prefix . 'acl_groups');
define('ACL_OPTIONS_TABLE', $table_prefix . 'auth_options'); define('ACL_OPTIONS_TABLE', $table_prefix . 'acl_options');
define('ACL_ROLES_TABLE', $table_prefix . 'auth_roles'); define('ACL_ROLES_TABLE', $table_prefix . 'acl_roles');
define('ACL_ROLES_DATA_TABLE', $table_prefix . 'auth_roles_data'); define('ACL_ROLES_DATA_TABLE', $table_prefix . 'acl_roles_data');
define('ACL_USERS_TABLE', $table_prefix . 'auth_users'); define('ACL_USERS_TABLE', $table_prefix . 'acl_users');
define('ATTACHMENTS_TABLE', $table_prefix . 'attachments'); define('ATTACHMENTS_TABLE', $table_prefix . 'attachments');
define('BANLIST_TABLE', $table_prefix . 'banlist'); define('BANLIST_TABLE', $table_prefix . 'banlist');
define('BBCODES_TABLE', $table_prefix . 'bbcodes'); define('BBCODES_TABLE', $table_prefix . 'bbcodes');
@ -148,21 +148,21 @@ define('CONFIG_TABLE', $table_prefix . 'config');
define('CONFIRM_TABLE', $table_prefix . 'confirm'); define('CONFIRM_TABLE', $table_prefix . 'confirm');
define('PROFILE_FIELDS_TABLE', $table_prefix . 'profile_fields'); define('PROFILE_FIELDS_TABLE', $table_prefix . 'profile_fields');
define('PROFILE_LANG_TABLE', $table_prefix . 'profile_lang'); define('PROFILE_LANG_TABLE', $table_prefix . 'profile_lang');
define('PROFILE_DATA_TABLE', $table_prefix . 'profile_fields_data'); define('PROFILE_FIELDS_DATA_TABLE', $table_prefix . 'profile_fields_data');
define('PROFILE_FIELDS_LANG_TABLE', $table_prefix . 'profile_fields_lang'); define('PROFILE_FIELDS_LANG_TABLE', $table_prefix . 'profile_fields_lang');
define('DISALLOW_TABLE', $table_prefix . 'disallow'); define('DISALLOW_TABLE', $table_prefix . 'disallow');
define('DRAFTS_TABLE', $table_prefix . 'drafts'); define('DRAFTS_TABLE', $table_prefix . 'drafts');
define('EXTENSIONS_TABLE', $table_prefix . 'extensions'); define('EXTENSIONS_TABLE', $table_prefix . 'extensions');
define('EXTENSION_GROUPS_TABLE', $table_prefix . 'extension_groups'); define('EXTENSION_GROUPS_TABLE', $table_prefix . 'extension_groups');
define('FORUMS_TABLE', $table_prefix . 'forums'); define('FORUMS_TABLE', $table_prefix . 'forums');
define('FORUMS_ACCESS_TABLE', $table_prefix . 'forum_access'); define('FORUMS_ACCESS_TABLE', $table_prefix . 'forums_access');
define('FORUMS_TRACK_TABLE', $table_prefix . 'forums_marking'); define('FORUMS_TRACK_TABLE', $table_prefix . 'forums_track');
define('FORUMS_WATCH_TABLE', $table_prefix . 'forums_watch'); define('FORUMS_WATCH_TABLE', $table_prefix . 'forums_watch');
define('GROUPS_TABLE', $table_prefix . 'groups'); define('GROUPS_TABLE', $table_prefix . 'groups');
define('ICONS_TABLE', $table_prefix . 'icons'); define('ICONS_TABLE', $table_prefix . 'icons');
define('LANG_TABLE', $table_prefix . 'lang'); define('LANG_TABLE', $table_prefix . 'lang');
define('LOG_TABLE', $table_prefix . 'log'); define('LOG_TABLE', $table_prefix . 'log');
define('MODERATOR_TABLE', $table_prefix . 'moderator_cache'); define('MODERATOR_CACHE_TABLE', $table_prefix . 'moderator_cache');
define('MODULES_TABLE', $table_prefix . 'modules'); define('MODULES_TABLE', $table_prefix . 'modules');
define('POSTS_TABLE', $table_prefix . 'posts'); define('POSTS_TABLE', $table_prefix . 'posts');
define('PRIVMSGS_TABLE', $table_prefix . 'privmsgs'); define('PRIVMSGS_TABLE', $table_prefix . 'privmsgs');
@ -172,30 +172,30 @@ define('PRIVMSGS_RULES_TABLE', $table_prefix . 'privmsgs_rules');
define('RANKS_TABLE', $table_prefix . 'ranks'); define('RANKS_TABLE', $table_prefix . 'ranks');
define('RATINGS_TABLE', $table_prefix . 'ratings'); define('RATINGS_TABLE', $table_prefix . 'ratings');
define('REPORTS_TABLE', $table_prefix . 'reports'); define('REPORTS_TABLE', $table_prefix . 'reports');
define('REASONS_TABLE', $table_prefix . 'reports_reasons'); define('REPORTS_REASONS_TABLE', $table_prefix . 'reports_reasons');
define('SEARCH_TABLE', $table_prefix . 'search_results'); define('SEARCH_RESULTS_TABLE', $table_prefix . 'search_results');
define('SEARCH_WORD_TABLE', $table_prefix . 'search_wordlist'); define('SEARCH_WORDLIST_TABLE', $table_prefix . 'search_wordlist');
define('SEARCH_MATCH_TABLE', $table_prefix . 'search_wordmatch'); define('SEARCH_WORDMATCH_TABLE', $table_prefix . 'search_wordmatch');
define('SESSIONS_TABLE', $table_prefix . 'sessions'); define('SESSIONS_TABLE', $table_prefix . 'sessions');
define('SESSIONS_KEYS_TABLE', $table_prefix . 'sessions_keys'); define('SESSIONS_KEYS_TABLE', $table_prefix . 'sessions_keys');
define('SITELIST_TABLE', $table_prefix . 'sitelist'); define('SITELIST_TABLE', $table_prefix . 'sitelist');
define('SMILIES_TABLE', $table_prefix . 'smilies'); define('SMILIES_TABLE', $table_prefix . 'smilies');
define('STYLES_TABLE', $table_prefix . 'styles'); define('STYLES_TABLE', $table_prefix . 'styles');
define('STYLES_TPL_TABLE', $table_prefix . 'styles_template'); define('STYLES_TEMPLATE_TABLE', $table_prefix . 'styles_template');
define('STYLES_TPLDATA_TABLE', $table_prefix . 'styles_template_data'); define('STYLES_TEMPLATE_DATA_TABLE',$table_prefix . 'styles_template_data');
define('STYLES_CSS_TABLE', $table_prefix . 'styles_theme'); define('STYLES_THEME_TABLE', $table_prefix . 'styles_theme');
define('STYLES_IMAGE_TABLE', $table_prefix . 'styles_imageset'); define('STYLES_IMAGESET_TABLE', $table_prefix . 'styles_imageset');
define('TOPICS_TABLE', $table_prefix . 'topics'); define('TOPICS_TABLE', $table_prefix . 'topics');
define('TOPICS_POSTED_TABLE', $table_prefix . 'topics_posted'); define('TOPICS_POSTED_TABLE', $table_prefix . 'topics_posted');
define('TOPICS_WATCH_TABLE', $table_prefix . 'topics_watch'); define('TOPICS_WATCH_TABLE', $table_prefix . 'topics_watch');
define('TOPICS_TRACK_TABLE', $table_prefix . 'topics_marking'); define('TOPICS_TRACK_TABLE', $table_prefix . 'topics_track');
define('USER_GROUP_TABLE', $table_prefix . 'user_group'); define('USER_GROUP_TABLE', $table_prefix . 'user_group');
define('USERS_TABLE', $table_prefix . 'users'); define('USERS_TABLE', $table_prefix . 'users');
define('USERS_NOTES_TABLE', $table_prefix . 'users_notes'); define('USERS_NOTES_TABLE', $table_prefix . 'users_notes');
define('WARNINGS_TABLE', $table_prefix . 'warnings'); define('WARNINGS_TABLE', $table_prefix . 'warnings');
define('WORDS_TABLE', $table_prefix . 'words'); define('WORDS_TABLE', $table_prefix . 'words');
define('POLL_OPTIONS_TABLE', $table_prefix . 'poll_results'); define('POLL_OPTIONS_TABLE', $table_prefix . 'poll_options');
define('POLL_VOTES_TABLE', $table_prefix . 'poll_voters'); define('POLL_VOTES_TABLE', $table_prefix . 'poll_votes');
define('ZEBRA_TABLE', $table_prefix . 'zebra'); define('ZEBRA_TABLE', $table_prefix . 'zebra');
// Additional tables // Additional tables

8
phpBB/includes/functions_admin.php
View file

@ -1873,10 +1873,10 @@ function cache_moderators()
global $db, $cache, $auth, $phpbb_root_path, $phpEx; global $db, $cache, $auth, $phpbb_root_path, $phpEx;
// Remove cached sql results // Remove cached sql results
$cache->destroy('sql', MODERATOR_TABLE); $cache->destroy('sql', MODERATOR_CACHE_TABLE);
// Clear table // Clear table
$db->sql_query(((SQL_LAYER != 'sqlite') ? 'TRUNCATE TABLE ' : 'DELETE FROM ') . MODERATOR_TABLE); $db->sql_query(((SQL_LAYER != 'sqlite') ? 'TRUNCATE TABLE ' : 'DELETE FROM ') . MODERATOR_CACHE_TABLE);
// We add moderators who have forum moderator permissions without an explicit ACL_NO setting // We add moderators who have forum moderator permissions without an explicit ACL_NO setting
$hold_ary = $ug_id_ary = $sql_ary = array(); $hold_ary = $ug_id_ary = $sql_ary = array();
@ -2018,13 +2018,13 @@ function cache_moderators()
case 'mysql': case 'mysql':
case 'mysql4': case 'mysql4':
case 'mysqli': case 'mysqli':
$db->sql_query('INSERT INTO ' . MODERATOR_TABLE . ' ' . $db->sql_build_array('MULTI_INSERT', $sql_ary)); $db->sql_query('INSERT INTO ' . MODERATOR_CACHE_TABLE . ' ' . $db->sql_build_array('MULTI_INSERT', $sql_ary));
break; break;
default: default:
foreach ($sql_ary as $ary) foreach ($sql_ary as $ary)
{ {
$db->sql_query('INSERT INTO ' . MODERATOR_TABLE . ' ' . $db->sql_build_array('INSERT', $ary)); $db->sql_query('INSERT INTO ' . MODERATOR_CACHE_TABLE . ' ' . $db->sql_build_array('INSERT', $ary));
} }
break; break;
} }

4
phpBB/includes/functions_display.php
View file

@ -571,7 +571,7 @@ function get_moderators(&$forum_moderators, $forum_id = false)
} }
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . MODERATOR_TABLE . " FROM ' . MODERATOR_CACHE_TABLE . "
WHERE display_on_index = 1 WHERE display_on_index = 1
$forum_sql"; $forum_sql";
$result = $db->sql_query($sql, 3600); $result = $db->sql_query($sql, 3600);
@ -900,7 +900,7 @@ function display_reasons($reason_id = 0)
global $db, $user, $template; global $db, $user, $template;
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . REASONS_TABLE . ' FROM ' . REPORTS_REASONS_TABLE . '
ORDER BY reason_order ASC'; ORDER BY reason_order ASC';
$result = $db->sql_query($sql); $result = $db->sql_query($sql);

2
phpBB/includes/functions_profile_fields.php
View file

@ -351,7 +351,7 @@ class custom_profile
} }
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . PROFILE_DATA_TABLE . ' FROM ' . PROFILE_FIELDS_DATA_TABLE . '
WHERE user_id IN (' . implode(', ', array_map('intval', $user_id)) . ')'; WHERE user_id IN (' . implode(', ', array_map('intval', $user_id)) . ')';
$result = $db->sql_query($sql); $result = $db->sql_query($sql);

8
phpBB/includes/functions_user.php
View file

@ -73,10 +73,10 @@ function user_update_name($old_name, $new_name)
global $config, $db, $cache; global $config, $db, $cache;
$update_ary = array( $update_ary = array(
FORUMS_TABLE => array('forum_last_poster_name'), FORUMS_TABLE => array('forum_last_poster_name'),
MODERATOR_TABLE => array('username'), MODERATOR_CACHE_TABLE => array('username'),
POSTS_TABLE => array('post_username'), POSTS_TABLE => array('post_username'),
TOPICS_TABLE => array('topic_first_poster_name', 'topic_last_poster_name'), TOPICS_TABLE => array('topic_first_poster_name', 'topic_last_poster_name'),
); );
foreach ($update_ary as $table => $field_ary) foreach ($update_ary as $table => $field_ary)

10
phpBB/includes/mcp/mcp_front.php
View file

@ -127,11 +127,11 @@ function mcp_front_view($id, $mode, $action)
'SELECT' => 'r.*, p.post_id, p.post_subject, u.username, t.topic_id, t.topic_title, f.forum_id, f.forum_name', 'SELECT' => 'r.*, p.post_id, p.post_subject, u.username, t.topic_id, t.topic_title, f.forum_id, f.forum_name',
'FROM' => array( 'FROM' => array(
REPORTS_TABLE => 'r', REPORTS_TABLE => 'r',
REASONS_TABLE => 'rr', REPORTS_REASONS_TABLE => 'rr',
TOPICS_TABLE => 't', TOPICS_TABLE => 't',
USERS_TABLE => 'u', USERS_TABLE => 'u',
POSTS_TABLE => 'p' POSTS_TABLE => 'p'
), ),

2
phpBB/includes/mcp/mcp_post.php
View file

@ -159,7 +159,7 @@ function mcp_post_details($id, $mode, $action)
if ($auth->acl_get('m_', $post_info['forum_id'])) if ($auth->acl_get('m_', $post_info['forum_id']))
{ {
$sql = 'SELECT r.*, re.*, u.user_id, u.username $sql = 'SELECT r.*, re.*, u.user_id, u.username
FROM ' . REPORTS_TABLE . ' r, ' . USERS_TABLE . ' u, ' . REASONS_TABLE . " re FROM ' . REPORTS_TABLE . ' r, ' . USERS_TABLE . ' u, ' . REPORTS_REASONS_TABLE . " re
WHERE r.post_id = $post_id WHERE r.post_id = $post_id
AND r.reason_id = re.reason_id AND r.reason_id = re.reason_id
AND u.user_id = r.user_id AND u.user_id = r.user_id

2
phpBB/includes/mcp/mcp_queue.php
View file

@ -578,7 +578,7 @@ function disapprove_post($post_id_list, $mode)
if ($reason_id) if ($reason_id)
{ {
$sql = 'SELECT reason_title, reason_description $sql = 'SELECT reason_title, reason_description
FROM ' . REASONS_TABLE . " FROM ' . REPORTS_REASONS_TABLE . "
WHERE reason_id = $reason_id"; WHERE reason_id = $reason_id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result); $row = $db->sql_fetchrow($result);

2
phpBB/includes/mcp/mcp_reports.php
View file

@ -71,7 +71,7 @@ class mcp_reports
$post_info = $post_info[$post_id]; $post_info = $post_info[$post_id];
$sql = 'SELECT r.user_id, r.report_closed, report_time, r.report_text, rr.reason_title, rr.reason_description, u.username $sql = 'SELECT r.user_id, r.report_closed, report_time, r.report_text, rr.reason_title, rr.reason_description, u.username
FROM ' . REPORTS_TABLE . ' r, ' . REASONS_TABLE . ' rr, ' . USERS_TABLE . " u FROM ' . REPORTS_TABLE . ' r, ' . REPORTS_REASONS_TABLE . ' rr, ' . USERS_TABLE . " u
WHERE r.post_id = $post_id WHERE r.post_id = $post_id
AND rr.reason_id = r.reason_id AND rr.reason_id = r.reason_id
AND r.user_id = u.user_id"; AND r.user_id = u.user_id";

4
phpBB/includes/search/fulltext_mysql.php
View file

@ -648,7 +648,7 @@ class fulltext_mysql extends search_backend
$db->sql_query('ALTER TABLE ' . POSTS_TABLE . ' ADD FULLTEXT (post_text)'); $db->sql_query('ALTER TABLE ' . POSTS_TABLE . ' ADD FULLTEXT (post_text)');
} }
$db->sql_query('TRUNCATE TABLE ' . SEARCH_TABLE); $db->sql_query('TRUNCATE TABLE ' . SEARCH_RESULTS_TABLE);
return false; return false;
} }
@ -681,7 +681,7 @@ class fulltext_mysql extends search_backend
$db->sql_query('ALTER TABLE ' . POSTS_TABLE . ' DROP INDEX post_text'); $db->sql_query('ALTER TABLE ' . POSTS_TABLE . ' DROP INDEX post_text');
} }
$db->sql_query('TRUNCATE TABLE ' . SEARCH_TABLE); $db->sql_query('TRUNCATE TABLE ' . SEARCH_RESULTS_TABLE);
return false; return false;
} }

52
phpBB/includes/search/fulltext_native.php
View file

@ -132,7 +132,7 @@ class fulltext_native extends search_backend
{ {
// identify common words and ignore them // identify common words and ignore them
$sql = 'SELECT word_text $sql = 'SELECT word_text
FROM ' . SEARCH_WORD_TABLE . " FROM ' . SEARCH_WORDLIST_TABLE . "
WHERE word_text IN ($in_words) WHERE word_text IN ($in_words)
AND word_common = 1"; AND word_common = 1";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -388,7 +388,7 @@ class fulltext_native extends search_backend
if (strstr($word, '%')) if (strstr($word, '%'))
{ {
$sql = "SELECT $sql_select $sql = "SELECT $sql_select
FROM $sql_from$sql_sort_table" . POSTS_TABLE . ' p, ' . SEARCH_MATCH_TABLE . ' m, ' . SEARCH_WORD_TABLE . " w FROM $sql_from$sql_sort_table" . POSTS_TABLE . ' p, ' . SEARCH_WORDMATCH_TABLE . ' m, ' . SEARCH_WORDLIST_TABLE . " w
WHERE w.word_text LIKE $word WHERE w.word_text LIKE $word
AND m.word_id = w.word_id AND m.word_id = w.word_id
AND w.word_common <> 1 AND w.word_common <> 1
@ -432,7 +432,7 @@ class fulltext_native extends search_backend
if ($sql_in) if ($sql_in)
{ {
$sql = "SELECT $sql_select, COUNT(DISTINCT m.word_id) as matches, " . $sort_by_sql[$sort_key] . " $sql = "SELECT $sql_select, COUNT(DISTINCT m.word_id) as matches, " . $sort_by_sql[$sort_key] . "
FROM $sql_from$sql_sort_table" . POSTS_TABLE . ' p, ' . SEARCH_MATCH_TABLE . ' m, ' . SEARCH_WORD_TABLE . " w FROM $sql_from$sql_sort_table" . POSTS_TABLE . ' p, ' . SEARCH_WORDMATCH_TABLE . ' m, ' . SEARCH_WORDLIST_TABLE . " w
WHERE w.word_text IN ($sql_in) WHERE w.word_text IN ($sql_in)
AND m.word_id = w.word_id AND m.word_id = w.word_id
AND w.word_common <> 1 AND w.word_common <> 1
@ -493,7 +493,7 @@ class fulltext_native extends search_backend
$sql_where = ($sql_in) ? $sql_where . (($sql_where) ? ' OR ' : '') . 'w.word_text IN (' . $sql_in . ')' : $sql_where; $sql_where = ($sql_in) ? $sql_where . (($sql_where) ? ' OR ' : '') . 'w.word_text IN (' . $sql_in . ')' : $sql_where;
$sql = "SELECT $sql_select $sql = "SELECT $sql_select
FROM $sql_from$sql_sort_table" . POSTS_TABLE . ' p, ' . SEARCH_MATCH_TABLE . ' m, ' . SEARCH_WORD_TABLE . " w FROM $sql_from$sql_sort_table" . POSTS_TABLE . ' p, ' . SEARCH_WORDMATCH_TABLE . ' m, ' . SEARCH_WORDLIST_TABLE . " w
WHERE ($sql_where) WHERE ($sql_where)
AND m.word_id = w.word_id AND m.word_id = w.word_id
AND w.word_common <> 1 AND w.word_common <> 1
@ -540,7 +540,7 @@ class fulltext_native extends search_backend
$sql_where = ($sql_in) ? $sql_where . (($sql_where) ? ' OR ' : '') . 'w.word_text IN (' . $sql_in . ')' : $sql_where; $sql_where = ($sql_in) ? $sql_where . (($sql_where) ? ' OR ' : '') . 'w.word_text IN (' . $sql_in . ')' : $sql_where;
$sql = "SELECT $sql_select $sql = "SELECT $sql_select
FROM $sql_from" . POSTS_TABLE . ' p, ' . SEARCH_MATCH_TABLE . ' m, ' . SEARCH_WORD_TABLE . " w FROM $sql_from" . POSTS_TABLE . ' p, ' . SEARCH_WORDMATCH_TABLE . ' m, ' . SEARCH_WORDLIST_TABLE . " w
WHERE ($sql_where) WHERE ($sql_where)
AND m.word_id = w.word_id AND m.word_id = w.word_id
AND w.word_common <> 1 AND w.word_common <> 1
@ -769,7 +769,7 @@ class fulltext_native extends search_backend
$words['del']['title'] = array(); $words['del']['title'] = array();
$sql = 'SELECT w.word_id, w.word_text, m.title_match $sql = 'SELECT w.word_id, w.word_text, m.title_match
FROM ' . SEARCH_WORD_TABLE . ' w, ' . SEARCH_MATCH_TABLE . " m FROM ' . SEARCH_WORDLIST_TABLE . ' w, ' . SEARCH_WORDMATCH_TABLE . " m
WHERE m.post_id = $post_id WHERE m.post_id = $post_id
AND w.word_id = m.word_id"; AND w.word_id = m.word_id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -806,7 +806,7 @@ class fulltext_native extends search_backend
if (sizeof($unique_add_words)) if (sizeof($unique_add_words))
{ {
$sql = 'SELECT word_id, word_text $sql = 'SELECT word_id, word_text
FROM ' . SEARCH_WORD_TABLE . ' FROM ' . SEARCH_WORDLIST_TABLE . '
WHERE word_text IN (' . implode(', ', preg_replace('#^(.*)$#', '\'$1\'', $unique_add_words)) . ')'; WHERE word_text IN (' . implode(', ', preg_replace('#^(.*)$#', '\'$1\'', $unique_add_words)) . ')';
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -824,7 +824,7 @@ class fulltext_native extends search_backend
switch (SQL_LAYER) switch (SQL_LAYER)
{ {
case 'mysql': case 'mysql':
$sql = 'INSERT INTO ' . SEARCH_WORD_TABLE . ' (word_text) $sql = 'INSERT INTO ' . SEARCH_WORDLIST_TABLE . ' (word_text)
VALUES ' . implode(', ', preg_replace('#^(.*)$#', '(\'$1\')', $new_words)); VALUES ' . implode(', ', preg_replace('#^(.*)$#', '(\'$1\')', $new_words));
$db->sql_query($sql); $db->sql_query($sql);
break; break;
@ -837,14 +837,14 @@ class fulltext_native extends search_backend
// make sure the longest word comes first, so nothing will be truncated // make sure the longest word comes first, so nothing will be truncated
usort($new_words, array(&$this, 'strlencmp')); usort($new_words, array(&$this, 'strlencmp'));
$sql = 'INSERT INTO ' . SEARCH_WORD_TABLE . ' (word_text) ' . implode(' UNION ALL ', preg_replace('#^(.*)$#', "SELECT '\$1'", $new_words)); $sql = 'INSERT INTO ' . SEARCH_WORDLIST_TABLE . ' (word_text) ' . implode(' UNION ALL ', preg_replace('#^(.*)$#', "SELECT '\$1'", $new_words));
$db->sql_query($sql); $db->sql_query($sql);
break; break;
default: default:
foreach ($new_words as $word) foreach ($new_words as $word)
{ {
$sql = 'INSERT INTO ' . SEARCH_WORD_TABLE . " (word_text) $sql = 'INSERT INTO ' . SEARCH_WORDLIST_TABLE . " (word_text)
VALUES ('$word')"; VALUES ('$word')";
$db->sql_query($sql); $db->sql_query($sql);
} }
@ -866,7 +866,7 @@ class fulltext_native extends search_backend
$sql_in[] = $cur_words[$word_in][$word]; $sql_in[] = $cur_words[$word_in][$word];
} }
$sql = 'DELETE FROM ' . SEARCH_MATCH_TABLE . ' $sql = 'DELETE FROM ' . SEARCH_WORDMATCH_TABLE . '
WHERE word_id IN (' . implode(', ', $sql_in) . ') WHERE word_id IN (' . implode(', ', $sql_in) . ')
AND post_id = ' . intval($post_id) . " AND post_id = ' . intval($post_id) . "
AND title_match = $title_match"; AND title_match = $title_match";
@ -881,9 +881,9 @@ class fulltext_native extends search_backend
if (sizeof($word_ary)) if (sizeof($word_ary))
{ {
$sql = 'INSERT INTO ' . SEARCH_MATCH_TABLE . " (post_id, word_id, title_match) $sql = 'INSERT INTO ' . SEARCH_WORDMATCH_TABLE . " (post_id, word_id, title_match)
SELECT $post_id, word_id, $title_match SELECT $post_id, word_id, $title_match
FROM " . SEARCH_WORD_TABLE . ' FROM " . SEARCH_WORDLIST_TABLE . '
WHERE word_text IN (' . implode(', ', preg_replace('#^(.*)$#', '\'$1\'', $word_ary)) . ')'; WHERE word_text IN (' . implode(', ', preg_replace('#^(.*)$#', '\'$1\'', $word_ary)) . ')';
$db->sql_query($sql); $db->sql_query($sql);
} }
@ -920,11 +920,11 @@ class fulltext_native extends search_backend
{ {
global $db; global $db;
$sql = 'DELETE FROM ' . SEARCH_MATCH_TABLE . ' $sql = 'DELETE FROM ' . SEARCH_WORDMATCH_TABLE . '
WHERE post_id IN (' . implode(', ', $post_ids) . ')'; WHERE post_id IN (' . implode(', ', $post_ids) . ')';
$db->sql_query($sql); $db->sql_query($sql);
// SEARCH_WORD_TABLE will be updated by tidy() // SEARCH_WORDLIST_TABLE will be updated by tidy()
$this->destroy_cache(array(), $author_ids); $this->destroy_cache(array(), $author_ids);
} }
@ -951,7 +951,7 @@ class fulltext_native extends search_backend
if ($config['num_posts'] >= 100) if ($config['num_posts'] >= 100)
{ {
$sql = 'SELECT word_id $sql = 'SELECT word_id
FROM ' . SEARCH_MATCH_TABLE . ' FROM ' . SEARCH_WORDMATCH_TABLE . '
GROUP BY word_id GROUP BY word_id
HAVING COUNT(word_id) > ' . floor($config['num_posts'] * 0.6); HAVING COUNT(word_id) > ' . floor($config['num_posts'] * 0.6);
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -969,12 +969,12 @@ class fulltext_native extends search_backend
$sql_in = implode(', ', $sql_in); $sql_in = implode(', ', $sql_in);
$sql = 'UPDATE ' . SEARCH_WORD_TABLE . " $sql = 'UPDATE ' . SEARCH_WORDLIST_TABLE . "
SET word_common = 1 SET word_common = 1
WHERE word_id IN ($sql_in)"; WHERE word_id IN ($sql_in)";
$db->sql_query($sql); $db->sql_query($sql);
$sql = 'DELETE FROM ' . SEARCH_MATCH_TABLE . " $sql = 'DELETE FROM ' . SEARCH_WORDMATCH_TABLE . "
WHERE word_id IN ($sql_in)"; WHERE word_id IN ($sql_in)";
$db->sql_query($sql); $db->sql_query($sql);
unset($sql_in); unset($sql_in);
@ -984,8 +984,8 @@ class fulltext_native extends search_backend
// Remove words with no matches ... this is a potentially nasty query // Remove words with no matches ... this is a potentially nasty query
$sql = 'SELECT w.word_id $sql = 'SELECT w.word_id
FROM ' . SEARCH_WORD_TABLE . ' w FROM ' . SEARCH_WORDLIST_TABLE . ' w
LEFT JOIN ' . SEARCH_MATCH_TABLE . ' m ON (w.word_id = m.word_id) LEFT JOIN ' . SEARCH_WORDMATCH_TABLE . ' m ON (w.word_id = m.word_id)
WHERE w.word_common = 0 AND m.word_id IS NULL WHERE w.word_common = 0 AND m.word_id IS NULL
GROUP BY w.word_id'; GROUP BY w.word_id';
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -1001,7 +1001,7 @@ class fulltext_native extends search_backend
$destroy_cache_words = array_merge($destroy_cache_words, $sql_in); $destroy_cache_words = array_merge($destroy_cache_words, $sql_in);
$sql = 'DELETE FROM ' . SEARCH_WORD_TABLE . ' $sql = 'DELETE FROM ' . SEARCH_WORDLIST_TABLE . '
WHERE word_id IN (' . implode(', ', $sql_in) . ')'; WHERE word_id IN (' . implode(', ', $sql_in) . ')';
$db->sql_query($sql); $db->sql_query($sql);
unset($sql_in); unset($sql_in);
@ -1021,9 +1021,9 @@ class fulltext_native extends search_backend
{ {
global $db; global $db;
$db->sql_query(((SQL_LAYER != 'sqlite') ? 'TRUNCATE TABLE ' : 'DELETE FROM ') . SEARCH_WORD_TABLE); $db->sql_query(((SQL_LAYER != 'sqlite') ? 'TRUNCATE TABLE ' : 'DELETE FROM ') . SEARCH_WORDLIST_TABLE);
$db->sql_query(((SQL_LAYER != 'sqlite') ? 'TRUNCATE TABLE ' : 'DELETE FROM ') . SEARCH_MATCH_TABLE); $db->sql_query(((SQL_LAYER != 'sqlite') ? 'TRUNCATE TABLE ' : 'DELETE FROM ') . SEARCH_WORDMATCH_TABLE);
$db->sql_query(((SQL_LAYER != 'sqlite') ? 'TRUNCATE TABLE ' : 'DELETE FROM ') . SEARCH_TABLE); $db->sql_query(((SQL_LAYER != 'sqlite') ? 'TRUNCATE TABLE ' : 'DELETE FROM ') . SEARCH_RESULTS_TABLE);
} }
/** /**
@ -1061,13 +1061,13 @@ class fulltext_native extends search_backend
global $db; global $db;
$sql = 'SELECT COUNT(*) as total_words $sql = 'SELECT COUNT(*) as total_words
FROM ' . SEARCH_WORD_TABLE; FROM ' . SEARCH_WORDLIST_TABLE;
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$this->stats['total_words'] = (int) $db->sql_fetchfield('total_words'); $this->stats['total_words'] = (int) $db->sql_fetchfield('total_words');
$db->sql_freeresult($result); $db->sql_freeresult($result);
$sql = 'SELECT COUNT(*) as total_matches $sql = 'SELECT COUNT(*) as total_matches
FROM ' . SEARCH_MATCH_TABLE; FROM ' . SEARCH_WORDMATCH_TABLE;
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$this->stats['total_matches'] = (int) $db->sql_fetchfield('total_matches'); $this->stats['total_matches'] = (int) $db->sql_fetchfield('total_matches');
$db->sql_freeresult($result); $db->sql_freeresult($result);

12
phpBB/includes/search/search.php
View file

@ -178,7 +178,7 @@ class search_backend
if (!empty($keywords) || sizeof($author_ary)) if (!empty($keywords) || sizeof($author_ary))
{ {
$sql = 'SELECT search_time $sql = 'SELECT search_time
FROM ' . SEARCH_TABLE . ' FROM ' . SEARCH_RESULTS_TABLE . '
WHERE search_key = \'' . $db->sql_escape($search_key) . '\''; WHERE search_key = \'' . $db->sql_escape($search_key) . '\'';
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -191,7 +191,7 @@ class search_backend
'search_authors' => ' ' . implode(' ', $author_ary) . ' ' 'search_authors' => ' ' . implode(' ', $author_ary) . ' '
); );
$sql = 'INSERT INTO ' . SEARCH_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); $sql = 'INSERT INTO ' . SEARCH_RESULTS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);
$db->sql_query($sql); $db->sql_query($sql);
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
@ -251,7 +251,7 @@ class search_backend
} }
$cache->put('_search_results_' . $search_key, $store, $config['search_store_results']); $cache->put('_search_results_' . $search_key, $store, $config['search_store_results']);
$sql = 'UPDATE ' . SEARCH_TABLE . ' $sql = 'UPDATE ' . SEARCH_RESULTS_TABLE . '
SET search_time = ' . time() . ' SET search_time = ' . time() . '
WHERE search_key = \'' . $db->sql_escape($search_key) . '\''; WHERE search_key = \'' . $db->sql_escape($search_key) . '\'';
$db->sql_query($sql); $db->sql_query($sql);
@ -279,7 +279,7 @@ class search_backend
} }
$sql = 'SELECT search_key $sql = 'SELECT search_key
FROM ' . SEARCH_TABLE . " FROM ' . SEARCH_RESULTS_TABLE . "
WHERE search_keywords LIKE '%*%' $sql_where"; WHERE search_keywords LIKE '%*%' $sql_where";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -300,7 +300,7 @@ class search_backend
} }
$sql = 'SELECT search_key $sql = 'SELECT search_key
FROM ' . SEARCH_TABLE . " FROM ' . SEARCH_RESULTS_TABLE . "
WHERE $sql_where"; WHERE $sql_where";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -312,7 +312,7 @@ class search_backend
} }
$sql = 'DELETE $sql = 'DELETE
FROM ' . SEARCH_TABLE . ' FROM ' . SEARCH_RESULTS_TABLE . '
WHERE search_time < ' . (time() - $config['search_store_results']); WHERE search_time < ' . (time() - $config['search_store_results']);
$db->sql_query($sql); $db->sql_query($sql);
} }

8
phpBB/includes/session.php
View file

@ -985,7 +985,7 @@ class user extends session
} }
$sql = 'SELECT s.style_id, t.*, c.*, i.* $sql = 'SELECT s.style_id, t.*, c.*, i.*
FROM ' . STYLES_TABLE . ' s, ' . STYLES_TPL_TABLE . ' t, ' . STYLES_CSS_TABLE . ' c, ' . STYLES_IMAGE_TABLE . " i FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . " i
WHERE s.style_id = $style WHERE s.style_id = $style
AND t.template_id = s.template_id AND t.template_id = s.template_id
AND c.theme_id = s.theme_id AND c.theme_id = s.theme_id
@ -1004,7 +1004,7 @@ class user extends session
$db->sql_query($sql); $db->sql_query($sql);
$sql = 'SELECT s.style_id, t.*, c.*, i.* $sql = 'SELECT s.style_id, t.*, c.*, i.*
FROM ' . STYLES_TABLE . ' s, ' . STYLES_TPL_TABLE . ' t, ' . STYLES_CSS_TABLE . ' c, ' . STYLES_IMAGE_TABLE . " i FROM ' . STYLES_TABLE . ' s, ' . STYLES_TEMPLATE_TABLE . ' t, ' . STYLES_THEME_TABLE . ' c, ' . STYLES_IMAGESET_TABLE . " i
WHERE s.style_id = $style WHERE s.style_id = $style
AND t.template_id = s.template_id AND t.template_id = s.template_id
AND c.theme_id = s.theme_id AND c.theme_id = s.theme_id
@ -1051,7 +1051,7 @@ class user extends session
'theme_storedb' => 1 'theme_storedb' => 1
); );
$db->sql_query('UPDATE ' . STYLES_CSS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' $db->sql_query('UPDATE ' . STYLES_THEME_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
WHERE theme_id = ' . $this->theme['theme_id']); WHERE theme_id = ' . $this->theme['theme_id']);
unset($sql_ary); unset($sql_ary);
@ -1238,7 +1238,7 @@ class user extends session
return; return;
} }
$sql = 'SELECT * FROM ' . PROFILE_DATA_TABLE . " $sql = 'SELECT * FROM ' . PROFILE_FIELDS_DATA_TABLE . "
WHERE user_id = $user_id"; WHERE user_id = $user_id";
$result = $db->sql_query_limit($sql, 1); $result = $db->sql_query_limit($sql, 1);

2
phpBB/includes/template.php
View file

@ -219,7 +219,7 @@ class template
if (isset($user->theme['template_storedb']) && $user->theme['template_storedb']) if (isset($user->theme['template_storedb']) && $user->theme['template_storedb'])
{ {
$sql = 'SELECT * FROM ' . STYLES_TPLDATA_TABLE . ' $sql = 'SELECT * FROM ' . STYLES_TEMPLATE_DATA_TABLE . '
WHERE template_id = ' . $user->theme['template_id'] . " WHERE template_id = ' . $user->theme['template_id'] . "
AND (template_filename = '" . $db->sql_escape($this->filename[$handle]) . "' AND (template_filename = '" . $db->sql_escape($this->filename[$handle]) . "'
OR template_included LIKE '%" . $db->sql_escape($this->filename[$handle]) . ":%')"; OR template_included LIKE '%" . $db->sql_escape($this->filename[$handle]) . ":%')";

4
phpBB/includes/ucp/ucp_profile.php
View file

@ -313,7 +313,7 @@ class ucp_profile
// Update Custom Fields // Update Custom Fields
if (sizeof($cp_data)) if (sizeof($cp_data))
{ {
$sql = 'UPDATE ' . PROFILE_DATA_TABLE . ' $sql = 'UPDATE ' . PROFILE_FIELDS_DATA_TABLE . '
SET ' . $db->sql_build_array('UPDATE', $cp_data) . ' SET ' . $db->sql_build_array('UPDATE', $cp_data) . '
WHERE user_id = ' . $user->data['user_id']; WHERE user_id = ' . $user->data['user_id'];
$db->sql_query($sql); $db->sql_query($sql);
@ -324,7 +324,7 @@ class ucp_profile
$db->return_on_error = true; $db->return_on_error = true;
$sql = 'INSERT INTO ' . PROFILE_DATA_TABLE . ' ' . $db->sql_build_array('INSERT', $cp_data); $sql = 'INSERT INTO ' . PROFILE_FIELDS_DATA_TABLE . ' ' . $db->sql_build_array('INSERT', $cp_data);
$db->sql_query($sql); $db->sql_query($sql);
$db->return_on_error = false; $db->return_on_error = false;

2
phpBB/includes/ucp/ucp_register.php
View file

@ -294,7 +294,7 @@ class ucp_register
if (sizeof($cp_data)) if (sizeof($cp_data))
{ {
$cp_data['user_id'] = (int) $user_id; $cp_data['user_id'] = (int) $user_id;
$sql = 'INSERT INTO ' . PROFILE_DATA_TABLE . ' ' . $db->sql_build_array('INSERT', $cp->build_insert_sql_array($cp_data)); $sql = 'INSERT INTO ' . PROFILE_FIELDS_DATA_TABLE . ' ' . $db->sql_build_array('INSERT', $cp->build_insert_sql_array($cp_data));
$db->sql_query($sql); $db->sql_query($sql);
} }

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

@ -40,8 +40,8 @@ BEGIN
END;; END;;
# phpbb_auth_groups # phpbb_acl_groups
CREATE TABLE phpbb_auth_groups ( CREATE TABLE phpbb_acl_groups (
group_id INTEGER DEFAULT 0 NOT NULL, group_id INTEGER DEFAULT 0 NOT NULL,
forum_id INTEGER DEFAULT 0 NOT NULL, forum_id INTEGER DEFAULT 0 NOT NULL,
auth_option_id INTEGER DEFAULT 0 NOT NULL, auth_option_id INTEGER DEFAULT 0 NOT NULL,
@ -49,12 +49,12 @@ CREATE TABLE phpbb_auth_groups (
auth_setting INTEGER DEFAULT 0 NOT NULL auth_setting INTEGER DEFAULT 0 NOT NULL
);; );;
CREATE INDEX phpbb_auth_groups_auth_opt_id ON phpbb_auth_groups(auth_option_id);; CREATE INDEX phpbb_acl_groups_auth_opt_id ON phpbb_acl_groups(auth_option_id);;
CREATE INDEX phpbb_auth_groups_group_id ON phpbb_auth_groups(group_id);; CREATE INDEX phpbb_acl_groups_group_id ON phpbb_acl_groups(group_id);;
# phpbb_auth_options # phpbb_acl_options
CREATE TABLE phpbb_auth_options ( CREATE TABLE phpbb_acl_options (
auth_option_id INTEGER NOT NULL, auth_option_id INTEGER NOT NULL,
auth_option VARCHAR(20) NOT NULL, auth_option VARCHAR(20) NOT NULL,
is_global INTEGER DEFAULT 0 NOT NULL, is_global INTEGER DEFAULT 0 NOT NULL,
@ -62,23 +62,23 @@ CREATE TABLE phpbb_auth_options (
founder_only INTEGER DEFAULT 0 NOT NULL founder_only INTEGER DEFAULT 0 NOT NULL
);; );;
ALTER TABLE phpbb_auth_options ADD PRIMARY KEY (auth_option_id);; ALTER TABLE phpbb_acl_options ADD PRIMARY KEY (auth_option_id);;
CREATE INDEX phpbb_auth_options_auth_option ON phpbb_auth_options(auth_option);; CREATE INDEX phpbb_acl_options_auth_option ON phpbb_acl_options(auth_option);;
CREATE GENERATOR phpbb_auth_options_gen;; CREATE GENERATOR phpbb_acl_options_gen;;
SET GENERATOR phpbb_auth_options_gen TO 0;; SET GENERATOR phpbb_acl_options_gen TO 0;;
CREATE TRIGGER t_phpbb_auth_options_gen FOR phpbb_auth_options CREATE TRIGGER t_phpbb_acl_options_gen FOR phpbb_acl_options
BEFORE INSERT BEFORE INSERT
AS AS
BEGIN BEGIN
NEW.auth_option_id = GEN_ID(phpbb_auth_options_gen, 1); NEW.auth_option_id = GEN_ID(phpbb_acl_options_gen, 1);
END;; END;;
# phpbb_auth_roles # phpbb_acl_roles
CREATE TABLE phpbb_auth_roles ( CREATE TABLE phpbb_acl_roles (
role_id INTEGER NOT NULL, role_id INTEGER NOT NULL,
role_name VARCHAR(255) DEFAULT '' NOT NULL, role_name VARCHAR(255) DEFAULT '' NOT NULL,
role_description BLOB SUB_TYPE TEXT, role_description BLOB SUB_TYPE TEXT,
@ -86,34 +86,34 @@ CREATE TABLE phpbb_auth_roles (
role_order INTEGER DEFAULT 0 NOT NULL role_order INTEGER DEFAULT 0 NOT NULL
);; );;
ALTER TABLE phpbb_auth_roles ADD PRIMARY KEY (role_id);; ALTER TABLE phpbb_acl_roles ADD PRIMARY KEY (role_id);;
CREATE INDEX phpbb_auth_roles_role_type ON phpbb_auth_roles(role_type);; CREATE INDEX phpbb_acl_roles_role_type ON phpbb_acl_roles(role_type);;
CREATE INDEX phpbb_auth_roles_role_order ON phpbb_auth_roles(role_order);; CREATE INDEX phpbb_acl_roles_role_order ON phpbb_acl_roles(role_order);;
CREATE GENERATOR phpbb_auth_roles_gen;; CREATE GENERATOR phpbb_acl_roles_gen;;
SET GENERATOR phpbb_auth_roles_gen TO 0;; SET GENERATOR phpbb_acl_roles_gen TO 0;;
CREATE TRIGGER t_phpbb_auth_roles_gen FOR phpbb_auth_roles CREATE TRIGGER t_phpbb_acl_roles_gen FOR phpbb_acl_roles
BEFORE INSERT BEFORE INSERT
AS AS
BEGIN BEGIN
NEW.role_id = GEN_ID(phpbb_auth_roles_gen, 1); NEW.role_id = GEN_ID(phpbb_acl_roles_gen, 1);
END;; END;;
# phpbb_auth_roles_data # phpbb_acl_roles_data
CREATE TABLE phpbb_auth_roles_data ( CREATE TABLE phpbb_acl_roles_data (
role_id INTEGER DEFAULT 0 NOT NULL, role_id INTEGER DEFAULT 0 NOT NULL,
auth_option_id INTEGER DEFAULT 0 NOT NULL, auth_option_id INTEGER DEFAULT 0 NOT NULL,
auth_setting INTEGER DEFAULT 0 NOT NULL auth_setting INTEGER DEFAULT 0 NOT NULL
);; );;
ALTER TABLE phpbb_auth_roles_data ADD PRIMARY KEY (role_id, auth_option_id);; ALTER TABLE phpbb_acl_roles_data ADD PRIMARY KEY (role_id, auth_option_id);;
# phpbb_auth_users # phpbb_acl_users
CREATE TABLE phpbb_auth_users ( CREATE TABLE phpbb_acl_users (
user_id INTEGER DEFAULT 0 NOT NULL, user_id INTEGER DEFAULT 0 NOT NULL,
forum_id INTEGER DEFAULT 0 NOT NULL, forum_id INTEGER DEFAULT 0 NOT NULL,
auth_option_id INTEGER DEFAULT 0 NOT NULL, auth_option_id INTEGER DEFAULT 0 NOT NULL,
@ -121,8 +121,8 @@ CREATE TABLE phpbb_auth_users (
auth_setting INTEGER DEFAULT 0 NOT NULL auth_setting INTEGER DEFAULT 0 NOT NULL
);; );;
CREATE INDEX phpbb_auth_users_auth_opt_id ON phpbb_auth_users(auth_option_id);; CREATE INDEX phpbb_acl_users_auth_opt_id ON phpbb_acl_users(auth_option_id);;
CREATE INDEX phpbb_auth_users_user_id ON phpbb_auth_users(user_id);; CREATE INDEX phpbb_acl_users_user_id ON phpbb_acl_users(user_id);;
# phpbb_banlist # phpbb_banlist
@ -384,24 +384,24 @@ BEGIN
END;; END;;
# phpbb_forum_access # phpbb_forums_access
CREATE TABLE phpbb_forum_access ( CREATE TABLE phpbb_forums_access (
forum_id INTEGER DEFAULT 0 NOT NULL, forum_id INTEGER DEFAULT 0 NOT NULL,
user_id INTEGER DEFAULT 0 NOT NULL, user_id INTEGER DEFAULT 0 NOT NULL,
session_id VARCHAR(32) DEFAULT '' NOT NULL session_id VARCHAR(32) DEFAULT '' NOT NULL
);; );;
ALTER TABLE phpbb_forum_access ADD PRIMARY KEY (forum_id, user_id, session_id);; ALTER TABLE phpbb_forums_access ADD PRIMARY KEY (forum_id, user_id, session_id);;
# phpbb_forums_marking # phpbb_forums_track
CREATE TABLE phpbb_forums_marking ( CREATE TABLE phpbb_forums_track (
user_id INTEGER DEFAULT 0 NOT NULL, user_id INTEGER DEFAULT 0 NOT NULL,
forum_id INTEGER DEFAULT 0 NOT NULL, forum_id INTEGER DEFAULT 0 NOT NULL,
mark_time INTEGER DEFAULT 0 NOT NULL mark_time INTEGER DEFAULT 0 NOT NULL
);; );;
ALTER TABLE phpbb_forums_marking ADD PRIMARY KEY (user_id, forum_id);; ALTER TABLE phpbb_forums_track ADD PRIMARY KEY (user_id, forum_id);;
# phpbb_forums_watch # phpbb_forums_watch
@ -577,28 +577,28 @@ BEGIN
END;; END;;
# phpbb_poll_results # phpbb_poll_options
CREATE TABLE phpbb_poll_results ( CREATE TABLE phpbb_poll_options (
poll_option_id INTEGER DEFAULT 0 NOT NULL, poll_option_id INTEGER DEFAULT 0 NOT NULL,
topic_id INTEGER NOT NULL, topic_id INTEGER NOT NULL,
poll_option_text BLOB SUB_TYPE TEXT, poll_option_text BLOB SUB_TYPE TEXT,
poll_option_total INTEGER DEFAULT 0 NOT NULL poll_option_total INTEGER DEFAULT 0 NOT NULL
);; );;
CREATE INDEX phpbb_poll_results_poll_opt_id ON phpbb_poll_results(poll_option_id);; CREATE INDEX phpbb_poll_options_poll_opt_id ON phpbb_poll_options(poll_option_id);;
CREATE INDEX phpbb_poll_results_topic_id ON phpbb_poll_results(topic_id);; CREATE INDEX phpbb_poll_options_topic_id ON phpbb_poll_options(topic_id);;
# phpbb_poll_voters # phpbb_poll_votes
CREATE TABLE phpbb_poll_voters ( CREATE TABLE phpbb_poll_votes (
topic_id INTEGER DEFAULT 0 NOT NULL, topic_id INTEGER DEFAULT 0 NOT NULL,
poll_option_id INTEGER DEFAULT 0 NOT NULL, poll_option_id INTEGER DEFAULT 0 NOT NULL,
vote_user_id INTEGER DEFAULT 0 NOT NULL, vote_user_id INTEGER DEFAULT 0 NOT NULL,
vote_user_ip VARCHAR(40) NOT NULL vote_user_ip VARCHAR(40) NOT NULL
);; );;
CREATE INDEX phpbb_poll_voters_vote_user_id ON phpbb_poll_voters(vote_user_id);; CREATE INDEX phpbb_poll_votes_vote_user_id ON phpbb_poll_votes(vote_user_id);;
CREATE INDEX phpbb_poll_voters_vote_user_ip ON phpbb_poll_voters(vote_user_ip);; CREATE INDEX phpbb_poll_votes_vote_user_ip ON phpbb_poll_votes(vote_user_ip);;
# phpbb_posts # phpbb_posts
@ -1263,17 +1263,17 @@ BEGIN
END;; END;;
# phpbb_topics_marking # phpbb_topics_track
CREATE TABLE phpbb_topics_marking ( CREATE TABLE phpbb_topics_track (
user_id INTEGER DEFAULT 0 NOT NULL, user_id INTEGER DEFAULT 0 NOT NULL,
topic_id INTEGER DEFAULT 0 NOT NULL, topic_id INTEGER DEFAULT 0 NOT NULL,
forum_id INTEGER DEFAULT 0 NOT NULL, forum_id INTEGER DEFAULT 0 NOT NULL,
mark_time INTEGER DEFAULT 0 NOT NULL mark_time INTEGER DEFAULT 0 NOT NULL
);; );;
ALTER TABLE phpbb_topics_marking ADD PRIMARY KEY (user_id, topic_id);; ALTER TABLE phpbb_topics_track ADD PRIMARY KEY (user_id, topic_id);;
CREATE INDEX phpbb_topics_marking_forum_id ON phpbb_topics_marking(forum_id);; CREATE INDEX phpbb_topics_track_forum_id ON phpbb_topics_track(forum_id);;
# phpbb_topics_posted # phpbb_topics_posted

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

@ -67,9 +67,9 @@ GO
/* /*
Table: phpbb_auth_groups Table: phpbb_acl_groups
*/ */
CREATE TABLE [phpbb_auth_groups] ( CREATE TABLE [phpbb_acl_groups] (
[group_id] [int] NOT NULL , [group_id] [int] NOT NULL ,
[forum_id] [int] NOT NULL , [forum_id] [int] NOT NULL ,
[auth_option_id] [int] NOT NULL , [auth_option_id] [int] NOT NULL ,
@ -78,25 +78,25 @@ CREATE TABLE [phpbb_auth_groups] (
) ON [PRIMARY] ) ON [PRIMARY]
GO GO
ALTER TABLE [phpbb_auth_groups] WITH NOCHECK ADD ALTER TABLE [phpbb_acl_groups] WITH NOCHECK ADD
CONSTRAINT [DF_phpbb_auth_g_group_id] DEFAULT (0) FOR [group_id], CONSTRAINT [DF_phpbb_acl_g_group_id] DEFAULT (0) FOR [group_id],
CONSTRAINT [DF_phpbb_auth_g_forum_id] DEFAULT (0) FOR [forum_id], CONSTRAINT [DF_phpbb_acl_g_forum_id] DEFAULT (0) FOR [forum_id],
CONSTRAINT [DF_phpbb_auth_g_auth_option_id] DEFAULT (0) FOR [auth_option_id], CONSTRAINT [DF_phpbb_acl_g_auth_option_id] DEFAULT (0) FOR [auth_option_id],
CONSTRAINT [DF_phpbb_auth_g_auth_role_id] DEFAULT (0) FOR [auth_role_id], CONSTRAINT [DF_phpbb_acl_g_auth_role_id] DEFAULT (0) FOR [auth_role_id],
CONSTRAINT [DF_phpbb_auth_g_auth_setting] DEFAULT (0) FOR [auth_setting] CONSTRAINT [DF_phpbb_acl_g_auth_setting] DEFAULT (0) FOR [auth_setting]
GO GO
CREATE INDEX [group_id] ON [phpbb_auth_groups]([group_id]) ON [PRIMARY] CREATE INDEX [group_id] ON [phpbb_acl_groups]([group_id]) ON [PRIMARY]
GO GO
CREATE INDEX [auth_option_id] ON [phpbb_auth_groups]([auth_option_id]) ON [PRIMARY] CREATE INDEX [auth_option_id] ON [phpbb_acl_groups]([auth_option_id]) ON [PRIMARY]
GO GO
/* /*
Table: phpbb_auth_options Table: phpbb_acl_options
*/ */
CREATE TABLE [phpbb_auth_options] ( CREATE TABLE [phpbb_acl_options] (
[auth_option_id] [int] IDENTITY (1, 1) NOT NULL , [auth_option_id] [int] IDENTITY (1, 1) NOT NULL ,
[auth_option] [varchar] (20) NOT NULL , [auth_option] [varchar] (20) NOT NULL ,
[is_global] [int] NOT NULL , [is_global] [int] NOT NULL ,
@ -105,27 +105,27 @@ CREATE TABLE [phpbb_auth_options] (
) ON [PRIMARY] ) ON [PRIMARY]
GO GO
ALTER TABLE [phpbb_auth_options] WITH NOCHECK ADD ALTER TABLE [phpbb_acl_options] WITH NOCHECK ADD
CONSTRAINT [PK_phpbb_auth_options] PRIMARY KEY CLUSTERED CONSTRAINT [PK_phpbb_acl_options] PRIMARY KEY CLUSTERED
( (
[auth_option_id] [auth_option_id]
) ON [PRIMARY] ) ON [PRIMARY]
GO GO
ALTER TABLE [phpbb_auth_options] WITH NOCHECK ADD ALTER TABLE [phpbb_acl_options] WITH NOCHECK ADD
CONSTRAINT [DF_phpbb_auth_o_is_global] DEFAULT (0) FOR [is_global], CONSTRAINT [DF_phpbb_acl_o_is_global] DEFAULT (0) FOR [is_global],
CONSTRAINT [DF_phpbb_auth_o_is_local] DEFAULT (0) FOR [is_local], CONSTRAINT [DF_phpbb_acl_o_is_local] DEFAULT (0) FOR [is_local],
CONSTRAINT [DF_phpbb_auth_o_founder_only] DEFAULT (0) FOR [founder_only] CONSTRAINT [DF_phpbb_acl_o_founder_only] DEFAULT (0) FOR [founder_only]
GO GO
CREATE INDEX [auth_option] ON [phpbb_auth_options]([auth_option]) ON [PRIMARY] CREATE INDEX [auth_option] ON [phpbb_acl_options]([auth_option]) ON [PRIMARY]
GO GO
/* /*
Table: phpbb_auth_roles Table: phpbb_acl_roles
*/ */
CREATE TABLE [phpbb_auth_roles] ( CREATE TABLE [phpbb_acl_roles] (
[role_id] [int] IDENTITY (1, 1) NOT NULL , [role_id] [int] IDENTITY (1, 1) NOT NULL ,
[role_name] [varchar] (255) NOT NULL , [role_name] [varchar] (255) NOT NULL ,
[role_description] [varchar] (8000) , [role_description] [varchar] (8000) ,
@ -134,55 +134,55 @@ CREATE TABLE [phpbb_auth_roles] (
) ON [PRIMARY] ) ON [PRIMARY]
GO GO
ALTER TABLE [phpbb_auth_roles] WITH NOCHECK ADD ALTER TABLE [phpbb_acl_roles] WITH NOCHECK ADD
CONSTRAINT [PK_phpbb_auth_roles] PRIMARY KEY CLUSTERED CONSTRAINT [PK_phpbb_acl_roles] PRIMARY KEY CLUSTERED
( (
[role_id] [role_id]
) ON [PRIMARY] ) ON [PRIMARY]
GO GO
ALTER TABLE [phpbb_auth_roles] WITH NOCHECK ADD ALTER TABLE [phpbb_acl_roles] WITH NOCHECK ADD
CONSTRAINT [DF_phpbb_auth_p_role_role_order] DEFAULT (0) FOR [role_order], CONSTRAINT [DF_phpbb_acl_p_role_role_order] DEFAULT (0) FOR [role_order],
CONSTRAINT [DF_phpbb_auth_p_role_role_type] DEFAULT ('') FOR [role_type], CONSTRAINT [DF_phpbb_acl_p_role_role_type] DEFAULT ('') FOR [role_type],
CONSTRAINT [DF_phpbb_auth_p_role_role_name] DEFAULT ('') FOR [role_name] CONSTRAINT [DF_phpbb_acl_p_role_role_name] DEFAULT ('') FOR [role_name]
GO GO
CREATE INDEX [role_type] ON [phpbb_auth_roles]([role_type]) ON [PRIMARY] CREATE INDEX [role_type] ON [phpbb_acl_roles]([role_type]) ON [PRIMARY]
GO GO
CREATE INDEX [role_order] ON [phpbb_auth_roles]([role_order]) ON [PRIMARY] CREATE INDEX [role_order] ON [phpbb_acl_roles]([role_order]) ON [PRIMARY]
GO GO
/* /*
Table: phpbb_auth_roles_data Table: phpbb_acl_roles_data
*/ */
CREATE TABLE [phpbb_auth_roles_data] ( CREATE TABLE [phpbb_acl_roles_data] (
[role_id] [int] NOT NULL , [role_id] [int] NOT NULL ,
[auth_option_id] [int] NOT NULL , [auth_option_id] [int] NOT NULL ,
[auth_setting] [int] NOT NULL [auth_setting] [int] NOT NULL
) ON [PRIMARY] ) ON [PRIMARY]
GO GO
ALTER TABLE [phpbb_auth_roles_data] WITH NOCHECK ADD ALTER TABLE [phpbb_acl_roles_data] WITH NOCHECK ADD
CONSTRAINT [PK_phpbb_auth_roles_data] PRIMARY KEY CLUSTERED CONSTRAINT [PK_phpbb_acl_roles_data] PRIMARY KEY CLUSTERED
( (
[role_id], [role_id],
[auth_option_id] [auth_option_id]
) ON [PRIMARY] ) ON [PRIMARY]
GO GO
ALTER TABLE [phpbb_auth_roles_data] WITH NOCHECK ADD ALTER TABLE [phpbb_acl_roles_data] WITH NOCHECK ADD
CONSTRAINT [DF_phpbb_auth_d_role_id] DEFAULT (0) FOR [role_id], CONSTRAINT [DF_phpbb_acl_d_role_id] DEFAULT (0) FOR [role_id],
CONSTRAINT [DF_phpbb_auth_d_auth_option_id] DEFAULT (0) FOR [auth_option_id], CONSTRAINT [DF_phpbb_acl_d_auth_option_id] DEFAULT (0) FOR [auth_option_id],
CONSTRAINT [DF_phpbb_auth_d_auth_setting] DEFAULT (0) FOR [auth_setting] CONSTRAINT [DF_phpbb_acl_d_auth_setting] DEFAULT (0) FOR [auth_setting]
GO GO
/* /*
Table: phpbb_auth_users Table: phpbb_acl_users
*/ */
CREATE TABLE [phpbb_auth_users] ( CREATE TABLE [phpbb_acl_users] (
[user_id] [int] NOT NULL , [user_id] [int] NOT NULL ,
[forum_id] [int] NOT NULL , [forum_id] [int] NOT NULL ,
[auth_option_id] [int] NOT NULL , [auth_option_id] [int] NOT NULL ,
@ -191,18 +191,18 @@ CREATE TABLE [phpbb_auth_users] (
) ON [PRIMARY] ) ON [PRIMARY]
GO GO
ALTER TABLE [phpbb_auth_users] WITH NOCHECK ADD ALTER TABLE [phpbb_acl_users] WITH NOCHECK ADD
CONSTRAINT [DF_phpbb_auth_u_user_id] DEFAULT (0) FOR [user_id], CONSTRAINT [DF_phpbb_acl_u_user_id] DEFAULT (0) FOR [user_id],
CONSTRAINT [DF_phpbb_auth_u_forum_id] DEFAULT (0) FOR [forum_id], CONSTRAINT [DF_phpbb_acl_u_forum_id] DEFAULT (0) FOR [forum_id],
CONSTRAINT [DF_phpbb_auth_u_auth_option_id] DEFAULT (0) FOR [auth_option_id], CONSTRAINT [DF_phpbb_acl_u_auth_option_id] DEFAULT (0) FOR [auth_option_id],
CONSTRAINT [DF_phpbb_auth_u_auth_role_id] DEFAULT (0) FOR [auth_role_id], CONSTRAINT [DF_phpbb_acl_u_auth_role_id] DEFAULT (0) FOR [auth_role_id],
CONSTRAINT [DF_phpbb_auth_u_auth_setting] DEFAULT (0) FOR [auth_setting] CONSTRAINT [DF_phpbb_acl_u_auth_setting] DEFAULT (0) FOR [auth_setting]
GO GO
CREATE INDEX [user_id] ON [phpbb_auth_users]([user_id]) ON [PRIMARY] CREATE INDEX [user_id] ON [phpbb_acl_users]([user_id]) ON [PRIMARY]
GO GO
CREATE INDEX [auth_option_id] ON [phpbb_auth_users]([auth_option_id]) ON [PRIMARY] CREATE INDEX [auth_option_id] ON [phpbb_acl_users]([auth_option_id]) ON [PRIMARY]
GO GO
@ -598,17 +598,17 @@ GO
/* /*
Table: phpbb_forum_access Table: phpbb_forums_access
*/ */
CREATE TABLE [phpbb_forum_access] ( CREATE TABLE [phpbb_forums_access] (
[forum_id] [int] NOT NULL , [forum_id] [int] NOT NULL ,
[user_id] [int] NOT NULL , [user_id] [int] NOT NULL ,
[session_id] [varchar] (32) NOT NULL [session_id] [varchar] (32) NOT NULL
) ON [PRIMARY] ) ON [PRIMARY]
GO GO
ALTER TABLE [phpbb_forum_access] WITH NOCHECK ADD ALTER TABLE [phpbb_forums_access] WITH NOCHECK ADD
CONSTRAINT [PK_phpbb_forum_access] PRIMARY KEY CLUSTERED CONSTRAINT [PK_phpbb_forums_access] PRIMARY KEY CLUSTERED
( (
[forum_id], [forum_id],
[user_id], [user_id],
@ -616,7 +616,7 @@ ALTER TABLE [phpbb_forum_access] WITH NOCHECK ADD
) ON [PRIMARY] ) ON [PRIMARY]
GO GO
ALTER TABLE [phpbb_forum_access] WITH NOCHECK ADD ALTER TABLE [phpbb_forums_access] WITH NOCHECK ADD
CONSTRAINT [DF_phpbb_forum__forum_id] DEFAULT (0) FOR [forum_id], CONSTRAINT [DF_phpbb_forum__forum_id] DEFAULT (0) FOR [forum_id],
CONSTRAINT [DF_phpbb_forum__user_id] DEFAULT (0) FOR [user_id], CONSTRAINT [DF_phpbb_forum__user_id] DEFAULT (0) FOR [user_id],
CONSTRAINT [DF_phpbb_forum__session_id] DEFAULT ('') FOR [session_id] CONSTRAINT [DF_phpbb_forum__session_id] DEFAULT ('') FOR [session_id]
@ -624,24 +624,24 @@ GO
/* /*
Table: phpbb_forums_marking Table: phpbb_forums_track
*/ */
CREATE TABLE [phpbb_forums_marking] ( CREATE TABLE [phpbb_forums_track] (
[user_id] [int] NOT NULL , [user_id] [int] NOT NULL ,
[forum_id] [int] NOT NULL , [forum_id] [int] NOT NULL ,
[mark_time] [int] NOT NULL [mark_time] [int] NOT NULL
) ON [PRIMARY] ) ON [PRIMARY]
GO GO
ALTER TABLE [phpbb_forums_marking] WITH NOCHECK ADD ALTER TABLE [phpbb_forums_track] WITH NOCHECK ADD
CONSTRAINT [PK_phpbb_forums_marking] PRIMARY KEY CLUSTERED CONSTRAINT [PK_phpbb_forums_track] PRIMARY KEY CLUSTERED
( (
[user_id], [user_id],
[forum_id] [forum_id]
) ON [PRIMARY] ) ON [PRIMARY]
GO GO
ALTER TABLE [phpbb_forums_marking] WITH NOCHECK ADD ALTER TABLE [phpbb_forums_track] WITH NOCHECK ADD
CONSTRAINT [DF_phpbb_forumm_user_id] DEFAULT (0) FOR [user_id], CONSTRAINT [DF_phpbb_forumm_user_id] DEFAULT (0) FOR [user_id],
CONSTRAINT [DF_phpbb_forumm_forum_id] DEFAULT (0) FOR [forum_id], CONSTRAINT [DF_phpbb_forumm_forum_id] DEFAULT (0) FOR [forum_id],
CONSTRAINT [DF_phpbb_forumm_mark_time] DEFAULT (0) FOR [mark_time] CONSTRAINT [DF_phpbb_forumm_mark_time] DEFAULT (0) FOR [mark_time]
@ -897,9 +897,9 @@ GO
/* /*
Table: phpbb_poll_results Table: phpbb_poll_options
*/ */
CREATE TABLE [phpbb_poll_results] ( CREATE TABLE [phpbb_poll_options] (
[poll_option_id] [int] NOT NULL , [poll_option_id] [int] NOT NULL ,
[topic_id] [int] NOT NULL , [topic_id] [int] NOT NULL ,
[poll_option_text] [varchar] (3000) , [poll_option_text] [varchar] (3000) ,
@ -907,22 +907,22 @@ CREATE TABLE [phpbb_poll_results] (
) ON [PRIMARY] ) ON [PRIMARY]
GO GO
ALTER TABLE [phpbb_poll_results] WITH NOCHECK ADD ALTER TABLE [phpbb_poll_options] WITH NOCHECK ADD
CONSTRAINT [DF_phpbb_poll_r_poll_option_id] DEFAULT (0) FOR [poll_option_id], CONSTRAINT [DF_phpbb_poll_o_poll_option_id] DEFAULT (0) FOR [poll_option_id],
CONSTRAINT [DF_phpbb_poll_r_poll_option_total] DEFAULT (0) FOR [poll_option_total] CONSTRAINT [DF_phpbb_poll_o_poll_option_total] DEFAULT (0) FOR [poll_option_total]
GO GO
CREATE INDEX [poll_option_id] ON [phpbb_poll_results]([poll_option_id]) ON [PRIMARY] CREATE INDEX [poll_option_id] ON [phpbb_poll_options]([poll_option_id]) ON [PRIMARY]
GO GO
CREATE INDEX [topic_id] ON [phpbb_poll_results]([topic_id]) ON [PRIMARY] CREATE INDEX [topic_id] ON [phpbb_poll_options]([topic_id]) ON [PRIMARY]
GO GO
/* /*
Table: phpbb_poll_voters Table: phpbb_poll_votes
*/ */
CREATE TABLE [phpbb_poll_voters] ( CREATE TABLE [phpbb_poll_votes] (
[topic_id] [int] NOT NULL , [topic_id] [int] NOT NULL ,
[poll_option_id] [int] NOT NULL , [poll_option_id] [int] NOT NULL ,
[vote_user_id] [int] NOT NULL , [vote_user_id] [int] NOT NULL ,
@ -930,19 +930,19 @@ CREATE TABLE [phpbb_poll_voters] (
) ON [PRIMARY] ) ON [PRIMARY]
GO GO
ALTER TABLE [phpbb_poll_voters] WITH NOCHECK ADD ALTER TABLE [phpbb_poll_votes] WITH NOCHECK ADD
CONSTRAINT [DF_phpbb_poll_v_topic_id] DEFAULT (0) FOR [topic_id], CONSTRAINT [DF_phpbb_poll_v_topic_id] DEFAULT (0) FOR [topic_id],
CONSTRAINT [DF_phpbb_poll_v_poll_option_id] DEFAULT (0) FOR [poll_option_id], CONSTRAINT [DF_phpbb_poll_v_poll_option_id] DEFAULT (0) FOR [poll_option_id],
CONSTRAINT [DF_phpbb_poll_v_vote_user_id] DEFAULT (0) FOR [vote_user_id] CONSTRAINT [DF_phpbb_poll_v_vote_user_id] DEFAULT (0) FOR [vote_user_id]
GO GO
CREATE INDEX [topic_id] ON [phpbb_poll_voters]([topic_id]) ON [PRIMARY] CREATE INDEX [topic_id] ON [phpbb_poll_votes]([topic_id]) ON [PRIMARY]
GO GO
CREATE INDEX [vote_user_id] ON [phpbb_poll_voters]([vote_user_id]) ON [PRIMARY] CREATE INDEX [vote_user_id] ON [phpbb_poll_votes]([vote_user_id]) ON [PRIMARY]
GO GO
CREATE INDEX [vote_user_ip] ON [phpbb_poll_voters]([vote_user_ip]) ON [PRIMARY] CREATE INDEX [vote_user_ip] ON [phpbb_poll_votes]([vote_user_ip]) ON [PRIMARY]
GO GO
@ -1999,9 +1999,9 @@ GO
/* /*
Table: phpbb_topics_marking Table: phpbb_topics_track
*/ */
CREATE TABLE [phpbb_topics_marking] ( CREATE TABLE [phpbb_topics_track] (
[user_id] [int] NOT NULL , [user_id] [int] NOT NULL ,
[topic_id] [int] NOT NULL , [topic_id] [int] NOT NULL ,
[forum_id] [int] NOT NULL , [forum_id] [int] NOT NULL ,
@ -2009,22 +2009,22 @@ CREATE TABLE [phpbb_topics_marking] (
) ON [PRIMARY] ) ON [PRIMARY]
GO GO
ALTER TABLE [phpbb_topics_marking] WITH NOCHECK ADD ALTER TABLE [phpbb_topics_track] WITH NOCHECK ADD
CONSTRAINT [PK_phpbb_topics_marking] PRIMARY KEY CLUSTERED CONSTRAINT [PK_phpbb_topics_track] PRIMARY KEY CLUSTERED
( (
[user_id], [user_id],
[topic_id] [topic_id]
) ON [PRIMARY] ) ON [PRIMARY]
GO GO
ALTER TABLE [phpbb_topics_marking] WITH NOCHECK ADD ALTER TABLE [phpbb_topics_track] WITH NOCHECK ADD
CONSTRAINT [DF_phpbb_tmarki_user_id] DEFAULT (0) FOR [user_id], CONSTRAINT [DF_phpbb_tmarki_user_id] DEFAULT (0) FOR [user_id],
CONSTRAINT [DF_phpbb_tmarki_topic_id] DEFAULT (0) FOR [topic_id], CONSTRAINT [DF_phpbb_tmarki_topic_id] DEFAULT (0) FOR [topic_id],
CONSTRAINT [DF_phpbb_tmarki_forum_id] DEFAULT (0) FOR [forum_id], CONSTRAINT [DF_phpbb_tmarki_forum_id] DEFAULT (0) FOR [forum_id],
CONSTRAINT [DF_phpbb_tmarki_mark_time] DEFAULT (0) FOR [mark_time] CONSTRAINT [DF_phpbb_tmarki_mark_time] DEFAULT (0) FOR [mark_time]
GO GO
CREATE INDEX [forum_id] ON [phpbb_topics_marking]([forum_id]) ON [PRIMARY] CREATE INDEX [forum_id] ON [phpbb_topics_track]([forum_id]) ON [PRIMARY]
GO GO

40
phpBB/install/schemas/mysql_schema.sql
View file

@ -29,8 +29,8 @@ CREATE TABLE phpbb_attachments (
KEY filesize (filesize) KEY filesize (filesize)
); );
# Table: 'phpbb_auth_groups' # Table: 'phpbb_acl_groups'
CREATE TABLE phpbb_auth_groups ( CREATE TABLE phpbb_acl_groups (
group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
auth_option_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, auth_option_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
@ -40,8 +40,8 @@ CREATE TABLE phpbb_auth_groups (
KEY auth_option_id (auth_option_id) KEY auth_option_id (auth_option_id)
); );
# Table: 'phpbb_auth_options' # Table: 'phpbb_acl_options'
CREATE TABLE phpbb_auth_options ( CREATE TABLE phpbb_acl_options (
auth_option_id mediumint(8) UNSIGNED NOT NULL auto_increment, auth_option_id mediumint(8) UNSIGNED NOT NULL auto_increment,
auth_option varchar(20) NOT NULL, auth_option varchar(20) NOT NULL,
is_global tinyint(1) DEFAULT '0' NOT NULL, is_global tinyint(1) DEFAULT '0' NOT NULL,
@ -51,8 +51,8 @@ CREATE TABLE phpbb_auth_options (
KEY auth_option (auth_option) KEY auth_option (auth_option)
); );
# Table: 'phpbb_auth_roles' # Table: 'phpbb_acl_roles'
CREATE TABLE phpbb_auth_roles ( CREATE TABLE phpbb_acl_roles (
role_id mediumint(8) UNSIGNED NOT NULL auto_increment, role_id mediumint(8) UNSIGNED NOT NULL auto_increment,
role_name varchar(255) DEFAULT '' NOT NULL, role_name varchar(255) DEFAULT '' NOT NULL,
role_description text, role_description text,
@ -63,16 +63,16 @@ CREATE TABLE phpbb_auth_roles (
KEY role_order (role_order) KEY role_order (role_order)
); );
# Table: 'phpbb_auth_roles_data' # Table: 'phpbb_acl_roles_data'
CREATE TABLE phpbb_auth_roles_data ( CREATE TABLE phpbb_acl_roles_data (
role_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, role_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
auth_option_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, auth_option_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
auth_setting tinyint(2) DEFAULT '0' NOT NULL, auth_setting tinyint(2) DEFAULT '0' NOT NULL,
PRIMARY KEY (role_id, auth_option_id) PRIMARY KEY (role_id, auth_option_id)
); );
# Table: 'phpbb_auth_users' # Table: 'phpbb_acl_users'
CREATE TABLE phpbb_auth_users ( CREATE TABLE phpbb_acl_users (
user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
auth_option_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, auth_option_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
@ -243,16 +243,16 @@ CREATE TABLE phpbb_forums (
KEY forum_last_post_id (forum_last_post_id) KEY forum_last_post_id (forum_last_post_id)
); );
# Table: 'phpbb_forum_access' # Table: 'phpbb_forums_access'
CREATE TABLE phpbb_forum_access ( CREATE TABLE phpbb_forums_access (
forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
session_id varchar(32) DEFAULT '' NOT NULL, session_id varchar(32) DEFAULT '' NOT NULL,
PRIMARY KEY (forum_id, user_id, session_id) PRIMARY KEY (forum_id, user_id, session_id)
); );
# Table: 'phpbb_forums_marking' # Table: 'phpbb_forums_track'
CREATE TABLE phpbb_forums_marking ( CREATE TABLE phpbb_forums_track (
user_id mediumint(9) UNSIGNED DEFAULT '0' NOT NULL, user_id mediumint(9) UNSIGNED DEFAULT '0' NOT NULL,
forum_id mediumint(9) UNSIGNED DEFAULT '0' NOT NULL, forum_id mediumint(9) UNSIGNED DEFAULT '0' NOT NULL,
mark_time int(11) DEFAULT '0' NOT NULL, mark_time int(11) DEFAULT '0' NOT NULL,
@ -365,8 +365,8 @@ CREATE TABLE phpbb_modules (
KEY module_enabled (module_enabled) KEY module_enabled (module_enabled)
); );
# Table: 'phpbb_poll_results' # Table: 'phpbb_poll_options'
CREATE TABLE phpbb_poll_results ( CREATE TABLE phpbb_poll_options (
poll_option_id tinyint(4) UNSIGNED DEFAULT '0' NOT NULL, poll_option_id tinyint(4) UNSIGNED DEFAULT '0' NOT NULL,
topic_id mediumint(8) UNSIGNED NOT NULL, topic_id mediumint(8) UNSIGNED NOT NULL,
poll_option_text text, poll_option_text text,
@ -375,8 +375,8 @@ CREATE TABLE phpbb_poll_results (
KEY topic_id (topic_id) KEY topic_id (topic_id)
); );
# Table: 'phpbb_poll_voters' # Table: 'phpbb_poll_votes'
CREATE TABLE phpbb_poll_voters ( CREATE TABLE phpbb_poll_votes (
topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
poll_option_id tinyint(4) UNSIGNED DEFAULT '0' NOT NULL, poll_option_id tinyint(4) UNSIGNED DEFAULT '0' NOT NULL,
vote_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, vote_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
@ -829,8 +829,8 @@ CREATE TABLE phpbb_topics (
KEY topic_last_post_time (topic_last_post_time) KEY topic_last_post_time (topic_last_post_time)
); );
# Table: 'phpbb_topic_marking' # Table: 'phpbb_topics_track'
CREATE TABLE phpbb_topics_marking ( CREATE TABLE phpbb_topics_track (
user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,

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

@ -91,9 +91,9 @@ CREATE INDEX phpbb_attachments_filesize on phpbb_attachments (filesize)
/* /*
Table: phpbb_auth_groups Table: phpbb_acl_groups
*/ */
CREATE TABLE phpbb_auth_groups ( CREATE TABLE phpbb_acl_groups (
group_id number(8) DEFAULT '0' NOT NULL, group_id number(8) DEFAULT '0' NOT NULL,
forum_id number(8) DEFAULT '0' NOT NULL, forum_id number(8) DEFAULT '0' NOT NULL,
auth_option_id number(8) DEFAULT '0' NOT NULL, auth_option_id number(8) DEFAULT '0' NOT NULL,
@ -102,94 +102,94 @@ CREATE TABLE phpbb_auth_groups (
) )
/ /
CREATE INDEX phpbb_auth_groups_group_id on phpbb_auth_groups (group_id) CREATE INDEX phpbb_acl_groups_group_id on phpbb_acl_groups (group_id)
/ /
CREATE INDEX phpbb_auth_groups_auth_opt_id on phpbb_auth_groups (auth_option_id) CREATE INDEX phpbb_acl_groups_auth_opt_id on phpbb_acl_groups (auth_option_id)
/ /
/* /*
Table: phpbb_auth_options Table: phpbb_acl_options
*/ */
CREATE TABLE phpbb_auth_options ( CREATE TABLE phpbb_acl_options (
auth_option_id number(8) NOT NULL, auth_option_id number(8) NOT NULL,
auth_option varchar2(20) NOT NULL, auth_option varchar2(20) NOT NULL,
is_global number(1) DEFAULT '0' NOT NULL, is_global number(1) DEFAULT '0' NOT NULL,
is_local number(1) DEFAULT '0' NOT NULL, is_local number(1) DEFAULT '0' NOT NULL,
founder_only number(1) DEFAULT '0' NOT NULL, founder_only number(1) DEFAULT '0' NOT NULL,
CONSTRAINT pk_phpbb_auth_options PRIMARY KEY (auth_option_id) CONSTRAINT pk_phpbb_acl_options PRIMARY KEY (auth_option_id)
) )
/ /
CREATE SEQUENCE phpbb_auth_options_seq CREATE SEQUENCE phpbb_acl_options_seq
/ /
CREATE OR REPLACE TRIGGER ai_phpbb_auth_options_seq CREATE OR REPLACE TRIGGER ai_phpbb_acl_options_seq
BEFORE INSERT ON phpbb_auth_options BEFORE INSERT ON phpbb_acl_options
FOR EACH ROW WHEN ( FOR EACH ROW WHEN (
new.auth_option_id IS NULL OR new.auth_option_id = 0 new.auth_option_id IS NULL OR new.auth_option_id = 0
) )
BEGIN BEGIN
SELECT phpbb_auth_options_seq.nextval SELECT phpbb_acl_options_seq.nextval
INTO :new.auth_option_id INTO :new.auth_option_id
FROM dual; FROM dual;
END; END;
/ /
CREATE INDEX phpbb_auth_options_auth_option on phpbb_auth_options (auth_option) CREATE INDEX phpbb_acl_options_auth_option on phpbb_acl_options (auth_option)
/ /
/* /*
Table: phpbb_auth_roles Table: phpbb_acl_roles
*/ */
CREATE TABLE phpbb_auth_roles ( CREATE TABLE phpbb_acl_roles (
role_id number(8) NOT NULL, role_id number(8) NOT NULL,
role_name varchar2(255) DEFAULT '', role_name varchar2(255) DEFAULT '',
role_description clob, role_description clob,
role_type varchar2(10) DEFAULT '', role_type varchar2(10) DEFAULT '',
role_order number(4) DEFAULT '0' NOT NULL, role_order number(4) DEFAULT '0' NOT NULL,
CONSTRAINT pk_phpbb_auth_roles PRIMARY KEY (role_id) CONSTRAINT pk_phpbb_acl_roles PRIMARY KEY (role_id)
) )
/ /
CREATE SEQUENCE phpbb_auth_roles_seq CREATE SEQUENCE phpbb_acl_roles_seq
/ /
CREATE OR REPLACE TRIGGER ai_phpbb_auth_roles_seq CREATE OR REPLACE TRIGGER ai_phpbb_acl_roles_seq
BEFORE INSERT ON phpbb_auth_roles BEFORE INSERT ON phpbb_acl_roles
FOR EACH ROW WHEN ( FOR EACH ROW WHEN (
new.role_id IS NULL OR new.role_id = 0 new.role_id IS NULL OR new.role_id = 0
) )
BEGIN BEGIN
SELECT phpbb_auth_roles_seq.nextval SELECT phpbb_acl_roles_seq.nextval
INTO :new.role_id INTO :new.role_id
FROM dual; FROM dual;
END; END;
/ /
CREATE INDEX phpbb_auth_roles_role_type on phpbb_auth_roles (role_type) CREATE INDEX phpbb_acl_roles_role_type on phpbb_acl_roles (role_type)
/ /
CREATE INDEX phpbb_auth_roles_role_order on phpbb_auth_roles (role_order) CREATE INDEX phpbb_acl_roles_role_order on phpbb_acl_roles (role_order)
/ /
/* /*
Table: phpbb_auth_roles_data Table: phpbb_acl_roles_data
*/ */
CREATE TABLE phpbb_auth_roles_data ( CREATE TABLE phpbb_acl_roles_data (
role_id number(8) DEFAULT '0' NOT NULL, role_id number(8) DEFAULT '0' NOT NULL,
auth_option_id number(8) DEFAULT '0' NOT NULL, auth_option_id number(8) DEFAULT '0' NOT NULL,
auth_setting number(2) DEFAULT '0' NOT NULL, auth_setting number(2) DEFAULT '0' NOT NULL,
CONSTRAINT pk_phpbb_auth_roles_data PRIMARY KEY (role_id, auth_option_id) CONSTRAINT pk_phpbb_acl_roles_data PRIMARY KEY (role_id, auth_option_id)
) )
/ /
/* /*
Table: phpbb_auth_users Table: phpbb_acl_users
*/ */
CREATE TABLE phpbb_auth_users ( CREATE TABLE phpbb_acl_users (
user_id number(8) DEFAULT '0' NOT NULL, user_id number(8) DEFAULT '0' NOT NULL,
forum_id number(8) DEFAULT '0' NOT NULL, forum_id number(8) DEFAULT '0' NOT NULL,
auth_option_id number(8) DEFAULT '0' NOT NULL, auth_option_id number(8) DEFAULT '0' NOT NULL,
@ -198,9 +198,9 @@ CREATE TABLE phpbb_auth_users (
) )
/ /
CREATE INDEX phpbb_auth_users_user_id on phpbb_auth_users (user_id) CREATE INDEX phpbb_acl_users_user_id on phpbb_acl_users (user_id)
/ /
CREATE INDEX phpbb_auth_users_auth_opt_id on phpbb_auth_users (auth_option_id) CREATE INDEX phpbb_acl_users_auth_opt_id on phpbb_acl_users (auth_option_id)
/ /
@ -533,25 +533,25 @@ CREATE INDEX phpbb_forums_forum_last_pst_id on phpbb_forums (forum_last_post_id)
/* /*
Table: phpbb_forum_access Table: phpbb_forums_access
*/ */
CREATE TABLE phpbb_forum_access ( CREATE TABLE phpbb_forums_access (
forum_id number(8) DEFAULT '0' NOT NULL, forum_id number(8) DEFAULT '0' NOT NULL,
user_id number(8) DEFAULT '0' NOT NULL, user_id number(8) DEFAULT '0' NOT NULL,
session_id varchar2(32) DEFAULT '', session_id varchar2(32) DEFAULT '',
CONSTRAINT pk_phpbb_forum_access PRIMARY KEY (forum_id, user_id, session_id) CONSTRAINT pk_phpbb_forums_access PRIMARY KEY (forum_id, user_id, session_id)
) )
/ /
/* /*
Table: phpbb_forums_marking Table: phpbb_forums_track
*/ */
CREATE TABLE phpbb_forums_marking ( CREATE TABLE phpbb_forums_track (
user_id number(9) DEFAULT '0' NOT NULL, user_id number(9) DEFAULT '0' NOT NULL,
forum_id number(9) DEFAULT '0' NOT NULL, forum_id number(9) DEFAULT '0' NOT NULL,
mark_time number(11) DEFAULT '0' NOT NULL, mark_time number(11) DEFAULT '0' NOT NULL,
CONSTRAINT pk_phpbb_forums_marking PRIMARY KEY (user_id, forum_id) CONSTRAINT pk_phpbb_forums_track PRIMARY KEY (user_id, forum_id)
) )
/ /
@ -784,9 +784,9 @@ CREATE INDEX phpbb_modules_left_right_id on phpbb_modules (left_id, right_id)
/* /*
Table: phpbb_poll_results Table: phpbb_poll_options
*/ */
CREATE TABLE phpbb_poll_results ( CREATE TABLE phpbb_poll_options (
poll_option_id number(4) DEFAULT '0' NOT NULL, poll_option_id number(4) DEFAULT '0' NOT NULL,
topic_id number(8) NOT NULL, topic_id number(8) NOT NULL,
poll_option_text varchar2(3000), poll_option_text varchar2(3000),
@ -794,16 +794,16 @@ CREATE TABLE phpbb_poll_results (
) )
/ /
CREATE INDEX phpbb_poll_results_poll_opt_id on phpbb_poll_results (poll_option_id) CREATE INDEX phpbb_poll_options_poll_opt_id on phpbb_poll_options (poll_option_id)
/ /
CREATE INDEX phpbb_poll_results_topic_id on phpbb_poll_results (topic_id) CREATE INDEX phpbb_poll_options_topic_id on phpbb_poll_options (topic_id)
/ /
/* /*
Table: phpbb_poll_voters Table: phpbb_poll_votes
*/ */
CREATE TABLE phpbb_poll_voters ( CREATE TABLE phpbb_poll_votes (
topic_id number(8) DEFAULT '0' NOT NULL, topic_id number(8) DEFAULT '0' NOT NULL,
poll_option_id number(4) DEFAULT '0' NOT NULL, poll_option_id number(4) DEFAULT '0' NOT NULL,
vote_user_id number(8) DEFAULT '0' NOT NULL, vote_user_id number(8) DEFAULT '0' NOT NULL,
@ -811,11 +811,11 @@ CREATE TABLE phpbb_poll_voters (
) )
/ /
CREATE INDEX phpbb_poll_voters_topic_id on phpbb_poll_voters (topic_id) CREATE INDEX phpbb_poll_votes_topic_id on phpbb_poll_votes (topic_id)
/ /
CREATE INDEX phpbb_poll_voters_vote_user_id on phpbb_poll_voters (vote_user_id) CREATE INDEX phpbb_poll_votes_vote_user_id on phpbb_poll_votes (vote_user_id)
/ /
CREATE INDEX phpbb_poll_voters_vote_user_ip on phpbb_poll_voters (vote_user_ip) CREATE INDEX phpbb_poll_votes_vote_user_ip on phpbb_poll_votes (vote_user_ip)
/ /
@ -1643,18 +1643,18 @@ CREATE INDEX phpbb_topics_last_post_time on phpbb_topics (topic_last_post_time)
/* /*
Table: phpbb_topics_marking Table: phpbb_topics_track
*/ */
CREATE TABLE phpbb_topics_marking ( CREATE TABLE phpbb_topics_track (
user_id number(8) DEFAULT '0' NOT NULL, user_id number(8) DEFAULT '0' NOT NULL,
topic_id number(8) DEFAULT '0' NOT NULL, topic_id number(8) DEFAULT '0' NOT NULL,
forum_id number(8) DEFAULT '0' NOT NULL, forum_id number(8) DEFAULT '0' NOT NULL,
mark_time number(11) DEFAULT '0' NOT NULL, mark_time number(11) DEFAULT '0' NOT NULL,
CONSTRAINT pk_phpbb_topics_marking PRIMARY KEY (user_id, topic_id) CONSTRAINT pk_phpbb_topics_track PRIMARY KEY (user_id, topic_id)
) )
/ /
CREATE INDEX phpbb_topics_marking_forum_id on phpbb_topics_marking (forum_id) CREATE INDEX phpbb_topics_track_forum_id on phpbb_topics_track (forum_id)
/ /

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

@ -118,8 +118,8 @@ CREATE INDEX phpbb_attachments_filesize ON phpbb_attachments (filesize);
/* Table: phpbb_auth_groups */ /* Table: phpbb_acl_groups */
CREATE TABLE phpbb_auth_groups ( CREATE TABLE phpbb_acl_groups (
group_id INT4 DEFAULT '0' NOT NULL, group_id INT4 DEFAULT '0' NOT NULL,
forum_id INT4 DEFAULT '0' NOT NULL, forum_id INT4 DEFAULT '0' NOT NULL,
auth_option_id INT4 DEFAULT '0' NOT NULL, auth_option_id INT4 DEFAULT '0' NOT NULL,
@ -127,15 +127,15 @@ CREATE TABLE phpbb_auth_groups (
auth_setting INT2 DEFAULT '0' NOT NULL auth_setting INT2 DEFAULT '0' NOT NULL
); );
CREATE INDEX phpbb_auth_groups_group_id ON phpbb_auth_groups (group_id); CREATE INDEX phpbb_acl_groups_group_id ON phpbb_acl_groups (group_id);
CREATE INDEX phpbb_auth_groups_auth_option_id ON phpbb_auth_groups (auth_option_id); CREATE INDEX phpbb_acl_groups_auth_option_id ON phpbb_acl_groups (auth_option_id);
/* Table: phpbb_auth_options */ /* Table: phpbb_acl_options */
CREATE SEQUENCE phpbb_auth_options_seq; CREATE SEQUENCE phpbb_acl_options_seq;
CREATE TABLE phpbb_auth_options ( CREATE TABLE phpbb_acl_options (
auth_option_id INT4 DEFAULT nextval('phpbb_auth_options_seq'), auth_option_id INT4 DEFAULT nextval('phpbb_acl_options_seq'),
auth_option varchar(20) NOT NULL, auth_option varchar(20) NOT NULL,
is_global INT2 DEFAULT '0' NOT NULL, is_global INT2 DEFAULT '0' NOT NULL,
is_local INT2 DEFAULT '0' NOT NULL, is_local INT2 DEFAULT '0' NOT NULL,
@ -143,16 +143,16 @@ CREATE TABLE phpbb_auth_options (
PRIMARY KEY (auth_option_id) PRIMARY KEY (auth_option_id)
); );
CREATE INDEX phpbb_auth_options_auth_option ON phpbb_auth_options (auth_option); CREATE INDEX phpbb_acl_options_auth_option ON phpbb_acl_options (auth_option);
/* Table: phpbb_auth_roles */ /* Table: phpbb_acl_roles */
CREATE SEQUENCE phpbb_auth_roles_seq; CREATE SEQUENCE phpbb_acl_roles_seq;
CREATE TABLE phpbb_auth_roles ( CREATE TABLE phpbb_acl_roles (
role_id INT4 DEFAULT nextval('phpbb_auth_roles_seq'), role_id INT4 DEFAULT nextval('phpbb_acl_roles_seq'),
role_name varchar(255) DEFAULT '' NOT NULL, role_name varchar(255) DEFAULT '' NOT NULL,
role_description varchar(8000), role_description varchar(8000),
role_type varchar(10) DEFAULT '' NOT NULL, role_type varchar(10) DEFAULT '' NOT NULL,
@ -160,14 +160,14 @@ CREATE TABLE phpbb_auth_roles (
PRIMARY KEY (role_id) PRIMARY KEY (role_id)
); );
CREATE INDEX phpbb_auth_roles_role_type ON phpbb_auth_roles (role_type); CREATE INDEX phpbb_acl_roles_role_type ON phpbb_acl_roles (role_type);
CREATE INDEX phpbb_auth_roles_role_order ON phpbb_auth_roles (role_order); CREATE INDEX phpbb_acl_roles_role_order ON phpbb_acl_roles (role_order);
/* Table: phpbb_auth_roles_data */ /* Table: phpbb_acl_roles_data */
CREATE TABLE phpbb_auth_roles_data ( CREATE TABLE phpbb_acl_roles_data (
role_id INT4 DEFAULT '0' NOT NULL, role_id INT4 DEFAULT '0' NOT NULL,
auth_option_id INT4 DEFAULT '0' NOT NULL, auth_option_id INT4 DEFAULT '0' NOT NULL,
auth_setting INT2 DEFAULT '0' NOT NULL, auth_setting INT2 DEFAULT '0' NOT NULL,
@ -175,8 +175,8 @@ CREATE TABLE phpbb_auth_roles_data (
); );
/* Table: phpbb_auth_users */ /* Table: phpbb_acl_users */
CREATE TABLE phpbb_auth_users ( CREATE TABLE phpbb_acl_users (
user_id INT4 DEFAULT '0' NOT NULL, user_id INT4 DEFAULT '0' NOT NULL,
forum_id INT4 DEFAULT '0' NOT NULL, forum_id INT4 DEFAULT '0' NOT NULL,
auth_option_id INT4 DEFAULT '0' NOT NULL, auth_option_id INT4 DEFAULT '0' NOT NULL,
@ -184,8 +184,8 @@ CREATE TABLE phpbb_auth_users (
auth_setting INT2 DEFAULT '0' NOT NULL auth_setting INT2 DEFAULT '0' NOT NULL
); );
CREATE INDEX phpbb_auth_users_user_id ON phpbb_auth_users (user_id); CREATE INDEX phpbb_acl_users_user_id ON phpbb_acl_users (user_id);
CREATE INDEX phpbb_auth_users_auth_option_id ON phpbb_auth_users (auth_option_id); CREATE INDEX phpbb_acl_users_auth_option_id ON phpbb_acl_users (auth_option_id);
/* Table: phpbb_banlist */ /* Table: phpbb_banlist */
@ -420,8 +420,8 @@ CREATE INDEX phpbb_forums_forum_last_post_id ON phpbb_forums (forum_last_post_id
/* Table: phpbb_forum_access */ /* Table: phpbb_forums_access */
CREATE TABLE phpbb_forum_access ( CREATE TABLE phpbb_forums_access (
forum_id INT4 DEFAULT '0' NOT NULL, forum_id INT4 DEFAULT '0' NOT NULL,
user_id INT4 DEFAULT '0' NOT NULL, user_id INT4 DEFAULT '0' NOT NULL,
session_id varchar(32) DEFAULT '' NOT NULL, session_id varchar(32) DEFAULT '' NOT NULL,
@ -431,8 +431,8 @@ CREATE TABLE phpbb_forum_access (
); );
/* Table: phpbb_forums_marking */ /* Table: phpbb_forums_track */
CREATE TABLE phpbb_forums_marking ( CREATE TABLE phpbb_forums_track (
user_id INT4 DEFAULT '0' NOT NULL, user_id INT4 DEFAULT '0' NOT NULL,
forum_id INT4 DEFAULT '0' NOT NULL, forum_id INT4 DEFAULT '0' NOT NULL,
mark_time INT4 DEFAULT '0' NOT NULL, mark_time INT4 DEFAULT '0' NOT NULL,
@ -594,29 +594,29 @@ CREATE INDEX phpbb_modules_left_right_id ON phpbb_modules (left_id, right_id);
/* Table: phpbb_poll_results */ /* Table: phpbb_poll_options */
CREATE TABLE phpbb_poll_results ( CREATE TABLE phpbb_poll_options (
poll_option_id INT2 DEFAULT '0' NOT NULL, poll_option_id INT2 DEFAULT '0' NOT NULL,
topic_id INT4 NOT NULL, topic_id INT4 NOT NULL,
poll_option_text varchar(3000), poll_option_text varchar(3000),
poll_option_total INT4 DEFAULT '0' NOT NULL poll_option_total INT4 DEFAULT '0' NOT NULL
); );
CREATE INDEX phpbb_poll_results_poll_option_id ON phpbb_poll_results (poll_option_id); CREATE INDEX phpbb_poll_options_poll_option_id ON phpbb_poll_options (poll_option_id);
CREATE INDEX phpbb_poll_results_topic_id ON phpbb_poll_results (topic_id); CREATE INDEX phpbb_poll_options_topic_id ON phpbb_poll_options (topic_id);
/* Table: phpbb_poll_voters */ /* Table: phpbb_poll_votes */
CREATE TABLE phpbb_poll_voters ( CREATE TABLE phpbb_poll_votes (
topic_id INT4 DEFAULT '0' NOT NULL, topic_id INT4 DEFAULT '0' NOT NULL,
poll_option_id INT2 DEFAULT '0' NOT NULL, poll_option_id INT2 DEFAULT '0' NOT NULL,
vote_user_id INT4 DEFAULT '0' NOT NULL, vote_user_id INT4 DEFAULT '0' NOT NULL,
vote_user_ip varchar(40) NOT NULL vote_user_ip varchar(40) NOT NULL
); );
CREATE INDEX phpbb_poll_voters_topic_id ON phpbb_poll_voters (topic_id); CREATE INDEX phpbb_poll_votes_topic_id ON phpbb_poll_votes (topic_id);
CREATE INDEX phpbb_poll_voters_vote_user_id ON phpbb_poll_voters (vote_user_id); CREATE INDEX phpbb_poll_votes_vote_user_id ON phpbb_poll_votes (vote_user_id);
CREATE INDEX phpbb_poll_voters_vote_user_ip ON phpbb_poll_voters (vote_user_ip); CREATE INDEX phpbb_poll_votes_vote_user_ip ON phpbb_poll_votes (vote_user_ip);
/* Table: phpbb_posts */ /* Table: phpbb_posts */
@ -1232,8 +1232,8 @@ CREATE INDEX phpbb_topics_topic_last_post_time ON phpbb_topics (topic_last_post_
/* Table: phpbb_topics_marking */ /* Table: phpbb_topics_track */
CREATE TABLE phpbb_topics_marking ( CREATE TABLE phpbb_topics_track (
user_id INT4 DEFAULT '0' NOT NULL, user_id INT4 DEFAULT '0' NOT NULL,
topic_id INT4 DEFAULT '0' NOT NULL, topic_id INT4 DEFAULT '0' NOT NULL,
forum_id INT4 DEFAULT '0' NOT NULL, forum_id INT4 DEFAULT '0' NOT NULL,
@ -1244,7 +1244,7 @@ CREATE TABLE phpbb_topics_marking (
CHECK (forum_id>=0) CHECK (forum_id>=0)
); );
CREATE INDEX phpbb_topics_marking_forum_id ON phpbb_topics_marking (forum_id); CREATE INDEX phpbb_topics_track_forum_id ON phpbb_topics_track (forum_id);
/* Table: phpbb_topics_posted */ /* Table: phpbb_topics_posted */

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

@ -227,154 +227,154 @@ INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('upload
INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('warnings_last_gc', '0', 1); INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('warnings_last_gc', '0', 1);
# -- Forum related auth options # -- Forum related auth options
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_announce', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_announce', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_attach', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_attach', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_bbcode', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_bbcode', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_bump', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_bump', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_delete', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_delete', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_download', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_download', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_edit', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_edit', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_email', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_email', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_flash', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_flash', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_icons', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_icons', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_ignoreflood', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_ignoreflood', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_img', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_img', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_list', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_list', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_noapprove', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_noapprove', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_print', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_print', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_poll', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_poll', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_post', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_post', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_postcount', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_postcount', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_read', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_read', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_reply', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_reply', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_report', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_report', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_search', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_search', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_sigs', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_sigs', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_smilies', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_smilies', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_sticky', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_sticky', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_subscribe', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_subscribe', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_user_lock', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_user_lock', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_vote', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_vote', 1);
INSERT INTO phpbb_auth_options (auth_option, is_local) VALUES ('f_votechg', 1); INSERT INTO phpbb_acl_options (auth_option, is_local) VALUES ('f_votechg', 1);
# -- Moderator related auth options # -- Moderator related auth options
INSERT INTO phpbb_auth_options (auth_option, is_local, is_global) VALUES ('m_', 1, 1); INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_', 1, 1);
INSERT INTO phpbb_auth_options (auth_option, is_local, is_global) VALUES ('m_approve', 1, 1); INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_approve', 1, 1);
INSERT INTO phpbb_auth_options (auth_option, is_local, is_global) VALUES ('m_chgposter', 1, 1); INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_chgposter', 1, 1);
INSERT INTO phpbb_auth_options (auth_option, is_local, is_global) VALUES ('m_delete', 1, 1); INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_delete', 1, 1);
INSERT INTO phpbb_auth_options (auth_option, is_local, is_global) VALUES ('m_edit', 1, 1); INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_edit', 1, 1);
INSERT INTO phpbb_auth_options (auth_option, is_local, is_global) VALUES ('m_info', 1, 1); INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_info', 1, 1);
INSERT INTO phpbb_auth_options (auth_option, is_local, is_global) VALUES ('m_lock', 1, 1); INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_lock', 1, 1);
INSERT INTO phpbb_auth_options (auth_option, is_local, is_global) VALUES ('m_merge', 1, 1); INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_merge', 1, 1);
INSERT INTO phpbb_auth_options (auth_option, is_local, is_global) VALUES ('m_move', 1, 1); INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_move', 1, 1);
INSERT INTO phpbb_auth_options (auth_option, is_local, is_global) VALUES ('m_report', 1, 1); INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_report', 1, 1);
INSERT INTO phpbb_auth_options (auth_option, is_local, is_global) VALUES ('m_split', 1, 1); INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_split', 1, 1);
INSERT INTO phpbb_auth_options (auth_option, is_local, is_global) VALUES ('m_warn', 1, 1); INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_warn', 1, 1);
# -- Global moderator auth option (not a local option) # -- Global moderator auth option (not a local option)
INSERT INTO phpbb_auth_options (auth_option, is_local, is_global) VALUES ('m_ban', 0, 1); INSERT INTO phpbb_acl_options (auth_option, is_local, is_global) VALUES ('m_ban', 0, 1);
# -- Admin related auth options # -- Admin related auth options
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_aauth', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_aauth', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_attach', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_attach', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_authgroups', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_authgroups', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_authusers', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_authusers', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_backup', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_backup', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_ban', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_ban', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_bbcode', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_bbcode', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_board', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_board', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_bots', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_bots', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_clearlogs', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_clearlogs', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_email', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_email', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_fauth', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_fauth', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_forum', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_forum', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_forumadd', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_forumadd', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_forumdel', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_forumdel', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_group', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_group', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_groupadd', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_groupadd', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_groupdel', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_groupdel', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_icons', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_icons', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_jabber', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_jabber', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_language', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_language', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_mauth', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_mauth', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_modules', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_modules', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_names', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_names', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_phpinfo', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_phpinfo', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_profile', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_profile', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_prune', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_prune', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_ranks', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_ranks', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_reasons', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_reasons', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_roles', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_roles', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_search', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_search', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_server', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_server', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_styles', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_styles', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_switchperm', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_switchperm', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_uauth', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_uauth', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_user', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_user', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_userdel', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_userdel', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_viewauth', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_viewauth', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_viewlogs', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_viewlogs', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('a_words', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_words', 1);
# -- User related auth options # -- User related auth options
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_sendemail', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_sendemail', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_readpm', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_readpm', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_sendpm', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_sendpm', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_sendim', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_sendim', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_ignoreflood', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_ignoreflood', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_hideonline', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_hideonline', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_viewonline', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_viewonline', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_viewprofile', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_viewprofile', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_chgavatar', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_chgavatar', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_chggrp', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_chggrp', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_chgemail', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_chgemail', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_chgname', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_chgname', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_chgpasswd', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_chgpasswd', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_chgcensors', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_chgcensors', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_search', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_search', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_savedrafts', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_savedrafts', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_download', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_download', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_attach', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_attach', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_sig', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_sig', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_attach', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_attach', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_bbcode', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_bbcode', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_smilies', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_smilies', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_download', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_download', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_edit', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_edit', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_printpm', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_printpm', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_emailpm', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_emailpm', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_forward', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_forward', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_delete', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_delete', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_img', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_img', 1);
INSERT INTO phpbb_auth_options (auth_option, is_global) VALUES ('u_pm_flash', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_pm_flash', 1);
# -- standard auth roles # -- standard auth roles
INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Standard Admin', 'ROLE_DESCRIPTION_ADMIN_STANDARD', 'a_', 1); INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Standard Admin', 'ROLE_DESCRIPTION_ADMIN_STANDARD', 'a_', 1);
INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Forum Admin', 'ROLE_DESCRIPTION_ADMIN_FORUM', 'a_', 3); INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Forum Admin', 'ROLE_DESCRIPTION_ADMIN_FORUM', 'a_', 3);
INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('User and Groups Admin', 'ROLE_DESCRIPTION_ADMIN_USERGROUP', 'a_', 4); INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('User and Groups Admin', 'ROLE_DESCRIPTION_ADMIN_USERGROUP', 'a_', 4);
INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Full Admin', 'ROLE_DESCRIPTION_ADMIN_FULL', 'a_', 2); INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Full Admin', 'ROLE_DESCRIPTION_ADMIN_FULL', 'a_', 2);
INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('All Features', 'ROLE_DESCRIPTION_USER_FULL', 'u_', 3); INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('All Features', 'ROLE_DESCRIPTION_USER_FULL', 'u_', 3);
INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Standard Features', 'ROLE_DESCRIPTION_USER_STANDARD', 'u_', 1); INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Standard Features', 'ROLE_DESCRIPTION_USER_STANDARD', 'u_', 1);
INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Limited Features', 'ROLE_DESCRIPTION_USER_LIMITED', 'u_', 2); INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Limited Features', 'ROLE_DESCRIPTION_USER_LIMITED', 'u_', 2);
INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('No Private Messages', 'ROLE_DESCRIPTION_USER_NOPM', 'u_', 4); INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('No Private Messages', 'ROLE_DESCRIPTION_USER_NOPM', 'u_', 4);
INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('No Avatar', 'ROLE_DESCRIPTION_USER_NOAVATAR', 'u_', 5); INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('No Avatar', 'ROLE_DESCRIPTION_USER_NOAVATAR', 'u_', 5);
INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Full Moderator', 'ROLE_DESCRIPTION_MOD_FULL', 'm_', 3); INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Full Moderator', 'ROLE_DESCRIPTION_MOD_FULL', 'm_', 3);
INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Standard Moderator', 'ROLE_DESCRIPTION_MOD_STANDARD', 'm_', 1); INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Standard Moderator', 'ROLE_DESCRIPTION_MOD_STANDARD', 'm_', 1);
INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Simple Moderator', 'ROLE_DESCRIPTION_MOD_SIMPLE', 'm_', 2); INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Simple Moderator', 'ROLE_DESCRIPTION_MOD_SIMPLE', 'm_', 2);
INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Queue Moderator', 'ROLE_DESCRIPTION_MOD_QUEUE', 'm_', 4); INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Queue Moderator', 'ROLE_DESCRIPTION_MOD_QUEUE', 'm_', 4);
INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Full Access', 'ROLE_DESCRIPTION_FORUM_FULL', 'f_', 6); INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Full Access', 'ROLE_DESCRIPTION_FORUM_FULL', 'f_', 6);
INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Standard Access', 'ROLE_DESCRIPTION_FORUM_STANDARD', 'f_', 4); INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Standard Access', 'ROLE_DESCRIPTION_FORUM_STANDARD', 'f_', 4);
INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('No Access', 'ROLE_DESCRIPTION_FORUM_NOACCESS', 'f_', 1); INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('No Access', 'ROLE_DESCRIPTION_FORUM_NOACCESS', 'f_', 1);
INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Read Only Access', 'ROLE_DESCRIPTION_FORUM_READONLY', 'f_', 2); INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Read Only Access', 'ROLE_DESCRIPTION_FORUM_READONLY', 'f_', 2);
INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Limited Access', 'ROLE_DESCRIPTION_FORUM_LIMITED', 'f_', 3); INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Limited Access', 'ROLE_DESCRIPTION_FORUM_LIMITED', 'f_', 3);
INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Bot Access', 'ROLE_DESCRIPTION_FORUM_BOT', 'f_', 8); INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Bot Access', 'ROLE_DESCRIPTION_FORUM_BOT', 'f_', 8);
INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('On Moderation Queue', 'ROLE_DESCRIPTION_FORUM_ONQUEUE', 'f_', 7); INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('On Moderation Queue', 'ROLE_DESCRIPTION_FORUM_ONQUEUE', 'f_', 7);
INSERT INTO phpbb_auth_roles (role_name, role_description, role_type, role_order) VALUES ('Standard Access + Polls', 'ROLE_DESCRIPTION_FORUM_POLLS', 'f_', 5); INSERT INTO phpbb_acl_roles (role_name, role_description, role_type, role_order) VALUES ('Standard Access + Polls', 'ROLE_DESCRIPTION_FORUM_POLLS', 'f_', 5);
# -- phpbb_styles # -- phpbb_styles
@ -440,122 +440,122 @@ INSERT INTO phpbb_bots (bot_active, bot_name, user_id, bot_agent, bot_ip) VALUES
# -- Roles data # -- Roles data
# Standard Admin (a_) # Standard Admin (a_)
INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 1, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'a_%' AND auth_option NOT IN ('a_switchperm', 'a_jabber', 'a_phpinfo', 'a_server', 'a_backup', 'a_styles', 'a_clearlogs', 'a_modules', 'a_language', 'a_email', 'a_bots', 'a_search', 'a_aauth', 'a_roles'); INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 1, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'a_%' AND auth_option NOT IN ('a_switchperm', 'a_jabber', 'a_phpinfo', 'a_server', 'a_backup', 'a_styles', 'a_clearlogs', 'a_modules', 'a_language', 'a_email', 'a_bots', 'a_search', 'a_aauth', 'a_roles');
# Forum admin (a_) # Forum admin (a_)
INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 2, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'a_%' AND auth_option IN ('a_', 'a_authgroups', 'a_authusers', 'a_fauth', 'a_forum', 'a_forumadd', 'a_forumdel', 'a_mauth', 'a_prune', 'a_uauth', 'a_viewauth', 'a_viewlogs'); INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 2, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'a_%' AND auth_option IN ('a_', 'a_authgroups', 'a_authusers', 'a_fauth', 'a_forum', 'a_forumadd', 'a_forumdel', 'a_mauth', 'a_prune', 'a_uauth', 'a_viewauth', 'a_viewlogs');
# User and Groups Admin (a_) # User and Groups Admin (a_)
INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 3, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'a_%' AND auth_option IN ('a_', 'a_authgroups', 'a_authusers', 'a_ban', 'a_group', 'a_groupadd', 'a_groupdel', 'a_ranks', 'a_uauth', 'a_user', 'a_viewauth', 'a_viewlogs'); INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 3, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'a_%' AND auth_option IN ('a_', 'a_authgroups', 'a_authusers', 'a_ban', 'a_group', 'a_groupadd', 'a_groupdel', 'a_ranks', 'a_uauth', 'a_user', 'a_viewauth', 'a_viewlogs');
# Full Admin (a_) # Full Admin (a_)
INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 4, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'a_%'; INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 4, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'a_%';
# All Features (u_) # All Features (u_)
INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 5, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'u_%'; INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 5, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%';
# Standard Features (u_) # Standard Features (u_)
INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 6, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_flash', 'u_pm_forward'); INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 6, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_flash', 'u_pm_forward');
# Limited Features (u_) # Limited Features (u_)
INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 7, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_attach', 'u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_attach', 'u_pm_emailpm', 'u_pm_flash', 'u_savedrafts', 'u_search', 'u_sendemail', 'u_sendim'); INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 7, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_attach', 'u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_attach', 'u_pm_emailpm', 'u_pm_flash', 'u_savedrafts', 'u_search', 'u_sendemail', 'u_sendim');
# No Private Messages (u_) # No Private Messages (u_)
INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 8, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_', 'u_chgavatar', 'u_chgcensors', 'u_chgemail', 'u_chgpasswd', 'u_download', 'u_hideonline', 'u_sig', 'u_viewonline', 'u_viewprofile'); INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 8, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_', 'u_chgavatar', 'u_chgcensors', 'u_chgemail', 'u_chgpasswd', 'u_download', 'u_hideonline', 'u_sig', 'u_viewonline', 'u_viewprofile');
INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 8, auth_option_id, 0 FROM phpbb_auth_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_readpm', 'u_sendpm'); INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 8, auth_option_id, 0 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_readpm', 'u_sendpm');
# No Avatar (u_) # No Avatar (u_)
INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 9, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_attach', 'u_chgavatar', 'u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_attach', 'u_pm_emailpm', 'u_pm_flash', 'u_savedrafts', 'u_search', 'u_sendemail', 'u_sendim'); INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 9, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_attach', 'u_chgavatar', 'u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_attach', 'u_pm_emailpm', 'u_pm_flash', 'u_savedrafts', 'u_search', 'u_sendemail', 'u_sendim');
INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 9, auth_option_id, 0 FROM phpbb_auth_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_chgavatar'); INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 9, auth_option_id, 0 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_chgavatar');
# Full Moderator (m_) # Full Moderator (m_)
INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 10, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'm_%'; INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 10, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'm_%';
# Standard Moderator (m_) # Standard Moderator (m_)
INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 11, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'm_%' AND auth_option IN ('m_', 'm_approve', 'm_delete', 'm_edit', 'm_info', 'm_report', 'm_warn'); INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 11, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'm_%' AND auth_option IN ('m_', 'm_approve', 'm_delete', 'm_edit', 'm_info', 'm_report', 'm_warn');
# Simple Moderator (m_) # Simple Moderator (m_)
INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 12, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'm_%' AND auth_option NOT IN ('m_approve', 'm_ban', 'm_chgposter', 'm_delete', 'm_warn'); INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 12, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'm_%' AND auth_option NOT IN ('m_approve', 'm_ban', 'm_chgposter', 'm_delete', 'm_warn');
# Queue Moderator (m_) # Queue Moderator (m_)
INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 13, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'm_%' AND auth_option IN ('m_', 'm_approve', 'm_edit'); INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 13, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'm_%' AND auth_option IN ('m_', 'm_approve', 'm_edit');
# Full Access (f_) # Full Access (f_)
INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 14, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'f_%'; INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 14, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%';
# Standard Access (f_) # Standard Access (f_)
INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 15, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_delete', 'f_ignoreflood', 'f_poll', 'f_sticky', 'f_user_lock'); INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 15, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_delete', 'f_ignoreflood', 'f_poll', 'f_sticky', 'f_user_lock');
# No Access (f_) # No Access (f_)
INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 16, auth_option_id, 0 FROM phpbb_auth_options WHERE auth_option = 'f_'; INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 16, auth_option_id, 0 FROM phpbb_acl_options WHERE auth_option = 'f_';
# Read Only Access (f_) # Read Only Access (f_)
INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 17, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_', 'f_download', 'f_list', 'f_read', 'f_search', 'f_subscribe'); INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 17, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_', 'f_download', 'f_list', 'f_read', 'f_search', 'f_subscribe');
# Limited Access (f_) # Limited Access (f_)
INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 18, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_attach', 'f_bump', 'f_delete', 'f_flash', 'f_icons', 'f_ignoreflood', 'f_poll', 'f_sticky', 'f_user_lock', 'f_votechg'); INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 18, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_attach', 'f_bump', 'f_delete', 'f_flash', 'f_icons', 'f_ignoreflood', 'f_poll', 'f_sticky', 'f_user_lock', 'f_votechg');
# Bot Access (f_) # Bot Access (f_)
INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 19, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_', 'f_download', 'f_list', 'f_read'); INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 19, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_', 'f_download', 'f_list', 'f_read');
# On Moderation Queue (f_) # On Moderation Queue (f_)
INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 20, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_bump', 'f_delete', 'f_flash', 'f_icons', 'f_ignoreflood', 'f_poll', 'f_sticky', 'f_user_lock', 'f_votechg', 'f_noapprove'); INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 20, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_bump', 'f_delete', 'f_flash', 'f_icons', 'f_ignoreflood', 'f_poll', 'f_sticky', 'f_user_lock', 'f_votechg', 'f_noapprove');
INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 20, auth_option_id, 0 FROM phpbb_auth_options WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_noapprove'); INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 20, auth_option_id, 0 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option IN ('f_noapprove');
# Standard Access + Polls (f_) # Standard Access + Polls (f_)
INSERT INTO phpbb_auth_roles_data (role_id, auth_option_id, auth_setting) SELECT 21, auth_option_id, 1 FROM phpbb_auth_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_delete', 'f_ignoreflood', 'f_sticky', 'f_user_lock'); INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 21, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'f_%' AND auth_option NOT IN ('f_announce', 'f_delete', 'f_ignoreflood', 'f_sticky', 'f_user_lock');
# Permissions # Permissions
# Admin user - full user features # Admin user - full user features
INSERT INTO phpbb_auth_users (user_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (2, 0, 0, 5, 0); INSERT INTO phpbb_acl_users (user_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (2, 0, 0, 5, 0);
# ADMINISTRATOR Group - full user features # ADMINISTRATOR Group - full user features
INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (7, 0, 0, 5, 0); INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (7, 0, 0, 5, 0);
# ADMINISTRATOR Group - standard admin # ADMINISTRATOR Group - standard admin
INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (7, 0, 0, 1, 0); INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (7, 0, 0, 1, 0);
# REGISTERED and REGISTERED_COPPA having standard user features # REGISTERED and REGISTERED_COPPA having standard user features
INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (4, 0, 0, 6, 0); INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (4, 0, 0, 6, 0);
INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (5, 0, 0, 6, 0); INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (5, 0, 0, 6, 0);
# GLOBAL_MODERATORS having full user features # GLOBAL_MODERATORS having full user features
INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (6, 0, 0, 5, 0); INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (6, 0, 0, 5, 0);
# GLOBAL_MODERATORS having full global moderator access # GLOBAL_MODERATORS having full global moderator access
INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (6, 0, 0, 10, 0); INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (6, 0, 0, 10, 0);
# Giving all groups read only access to the first category # Giving all groups read only access to the first category
# since administrators and moderators are already within the registered users group we do not need to set them here # since administrators and moderators are already within the registered users group we do not need to set them here
INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (1, 1, 0, 17, 0); INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (1, 1, 0, 17, 0);
INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (2, 1, 0, 17, 0); INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (2, 1, 0, 17, 0);
INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (3, 1, 0, 17, 0); INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (3, 1, 0, 17, 0);
INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (4, 1, 0, 17, 0); INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (4, 1, 0, 17, 0);
INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (5, 1, 0, 17, 0); INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (5, 1, 0, 17, 0);
INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (8, 1, 0, 17, 0); INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (8, 1, 0, 17, 0);
# Giving access to the first forum # Giving access to the first forum
# guests, inactive and inactive_coppa having read only access # guests, inactive and inactive_coppa having read only access
INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (1, 2, 0, 17, 0); INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (1, 2, 0, 17, 0);
INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (2, 2, 0, 17, 0); INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (2, 2, 0, 17, 0);
INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (3, 2, 0, 17, 0); INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (3, 2, 0, 17, 0);
# registered and registered_coppa having standard access # registered and registered_coppa having standard access
INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (4, 2, 0, 15, 0); INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (4, 2, 0, 15, 0);
INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (5, 2, 0, 15, 0); INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (5, 2, 0, 15, 0);
# global moderators having standard access + polls # global moderators having standard access + polls
INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (6, 2, 0, 21, 0); INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (6, 2, 0, 21, 0);
# administrators having full forum and full moderator access # administrators having full forum and full moderator access
INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (7, 2, 0, 14, 0); INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (7, 2, 0, 14, 0);
INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (7, 2, 0, 10, 0); INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (7, 2, 0, 10, 0);
# Bots having bot access # Bots having bot access
INSERT INTO phpbb_auth_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (8, 2, 0, 19, 0); INSERT INTO phpbb_acl_groups (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) VALUES (8, 2, 0, 19, 0);
# -- Demo Topic # -- Demo Topic

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

@ -32,8 +32,8 @@ CREATE INDEX phpbb_attachments_physical_filename on phpbb_attachments (physical_
CREATE INDEX phpbb_attachments_filesize on phpbb_attachments (filesize); CREATE INDEX phpbb_attachments_filesize on phpbb_attachments (filesize);
# Table: phpbb_auth_groups # Table: phpbb_acl_groups
CREATE TABLE phpbb_auth_groups ( CREATE TABLE phpbb_acl_groups (
group_id mediumint(8) NOT NULL DEFAULT '0', group_id mediumint(8) NOT NULL DEFAULT '0',
forum_id mediumint(8) NOT NULL DEFAULT '0', forum_id mediumint(8) NOT NULL DEFAULT '0',
auth_option_id mediumint(8) NOT NULL DEFAULT '0', auth_option_id mediumint(8) NOT NULL DEFAULT '0',
@ -41,12 +41,12 @@ CREATE TABLE phpbb_auth_groups (
auth_setting tinyint(2) NOT NULL DEFAULT '0' auth_setting tinyint(2) NOT NULL DEFAULT '0'
); );
CREATE INDEX phpbb_auth_groups_group_id on phpbb_auth_groups (group_id); CREATE INDEX phpbb_acl_groups_group_id on phpbb_acl_groups (group_id);
CREATE INDEX phpbb_auth_groups_auth_option_id on phpbb_auth_groups (auth_option_id); CREATE INDEX phpbb_acl_groups_auth_option_id on phpbb_acl_groups (auth_option_id);
# Table: phpbb_auth_options # Table: phpbb_acl_options
CREATE TABLE phpbb_auth_options ( CREATE TABLE phpbb_acl_options (
auth_option_id INTEGER PRIMARY KEY NOT NULL, auth_option_id INTEGER PRIMARY KEY NOT NULL,
auth_option varchar(20) NOT NULL, auth_option varchar(20) NOT NULL,
is_global tinyint(1) NOT NULL DEFAULT '0', is_global tinyint(1) NOT NULL DEFAULT '0',
@ -54,11 +54,11 @@ CREATE TABLE phpbb_auth_options (
founder_only tinyint(1) NOT NULL DEFAULT '0' founder_only tinyint(1) NOT NULL DEFAULT '0'
); );
CREATE INDEX phpbb_auth_options_auth_option on phpbb_auth_options (auth_option); CREATE INDEX phpbb_acl_options_auth_option on phpbb_acl_options (auth_option);
# Table: phpbb_auth_roles # Table: phpbb_acl_roles
CREATE TABLE phpbb_auth_roles ( CREATE TABLE phpbb_acl_roles (
role_id INTEGER PRIMARY KEY NOT NULL, role_id INTEGER PRIMARY KEY NOT NULL,
role_name varchar(255) NOT NULL DEFAULT '', role_name varchar(255) NOT NULL DEFAULT '',
role_description text(65535), role_description text(65535),
@ -66,12 +66,12 @@ CREATE TABLE phpbb_auth_roles (
role_order smallint(4) NOT NULL DEFAULT '0' role_order smallint(4) NOT NULL DEFAULT '0'
); );
CREATE INDEX phpbb_auth_roles_role_type on phpbb_auth_roles (role_type); CREATE INDEX phpbb_acl_roles_role_type on phpbb_acl_roles (role_type);
CREATE INDEX phpbb_auth_roles_role_order on phpbb_auth_roles (role_order); CREATE INDEX phpbb_acl_roles_role_order on phpbb_acl_roles (role_order);
# Table: phpbb_auth_roles_data # Table: phpbb_acl_roles_data
CREATE TABLE phpbb_auth_roles_data ( CREATE TABLE phpbb_acl_roles_data (
role_id mediumint(8) NOT NULL DEFAULT '0', role_id mediumint(8) NOT NULL DEFAULT '0',
auth_option_id mediumint(8) NOT NULL DEFAULT '0', auth_option_id mediumint(8) NOT NULL DEFAULT '0',
auth_setting tinyint(2) NOT NULL DEFAULT '0', auth_setting tinyint(2) NOT NULL DEFAULT '0',
@ -79,8 +79,8 @@ CREATE TABLE phpbb_auth_roles_data (
); );
# Table: phpbb_auth_users # Table: phpbb_acl_users
CREATE TABLE phpbb_auth_users ( CREATE TABLE phpbb_acl_users (
user_id mediumint(8) NOT NULL DEFAULT '0', user_id mediumint(8) NOT NULL DEFAULT '0',
forum_id mediumint(8) NOT NULL DEFAULT '0', forum_id mediumint(8) NOT NULL DEFAULT '0',
auth_option_id mediumint(8) NOT NULL DEFAULT '0', auth_option_id mediumint(8) NOT NULL DEFAULT '0',
@ -88,8 +88,8 @@ CREATE TABLE phpbb_auth_users (
auth_setting tinyint(2) NOT NULL DEFAULT '0' auth_setting tinyint(2) NOT NULL DEFAULT '0'
); );
CREATE INDEX phpbb_auth_users_user_id on phpbb_auth_users (user_id); CREATE INDEX phpbb_acl_users_user_id on phpbb_acl_users (user_id);
CREATE INDEX phpbb_auth_users_auth_option_id on phpbb_auth_users (auth_option_id); CREATE INDEX phpbb_acl_users_auth_option_id on phpbb_acl_users (auth_option_id);
# Table: phpbb_banlist # Table: phpbb_banlist
@ -263,8 +263,8 @@ CREATE INDEX phpbb_forums_left_right_id on phpbb_forums (left_id, right_id);
CREATE INDEX phpbb_forums_forum_last_post_id on phpbb_forums (forum_last_post_id); CREATE INDEX phpbb_forums_forum_last_post_id on phpbb_forums (forum_last_post_id);
# Table: phpbb_forum_access # Table: phpbb_forums_access
CREATE TABLE phpbb_forum_access ( CREATE TABLE phpbb_forums_access (
forum_id mediumint(8) NOT NULL DEFAULT '0', forum_id mediumint(8) NOT NULL DEFAULT '0',
user_id mediumint(8) NOT NULL DEFAULT '0', user_id mediumint(8) NOT NULL DEFAULT '0',
session_id varchar(32) NOT NULL DEFAULT '', session_id varchar(32) NOT NULL DEFAULT '',
@ -272,8 +272,8 @@ CREATE TABLE phpbb_forum_access (
); );
# Table: phpbb_forums_marking # Table: phpbb_forums_track
CREATE TABLE phpbb_forums_marking ( CREATE TABLE phpbb_forums_track (
user_id mediumint(9) NOT NULL DEFAULT '0', user_id mediumint(9) NOT NULL DEFAULT '0',
forum_id mediumint(9) NOT NULL DEFAULT '0', forum_id mediumint(9) NOT NULL DEFAULT '0',
mark_time int(11) NOT NULL DEFAULT '0', mark_time int(11) NOT NULL DEFAULT '0',
@ -394,29 +394,29 @@ CREATE INDEX phpbb_modules_module_enabled on phpbb_modules (module_enabled);
CREATE INDEX phpbb_modules_left_right_id on phpbb_modules (left_id, right_id); CREATE INDEX phpbb_modules_left_right_id on phpbb_modules (left_id, right_id);
# Table: phpbb_poll_results # Table: phpbb_poll_options
CREATE TABLE phpbb_poll_results ( CREATE TABLE phpbb_poll_options (
poll_option_id tinyint(4) NOT NULL DEFAULT '0', poll_option_id tinyint(4) NOT NULL DEFAULT '0',
topic_id mediumint(8) NOT NULL, topic_id mediumint(8) NOT NULL,
poll_option_text text(65535), poll_option_text text(65535),
poll_option_total mediumint(8) NOT NULL DEFAULT '0' poll_option_total mediumint(8) NOT NULL DEFAULT '0'
); );
CREATE INDEX phpbb_poll_results_poll_option_id on phpbb_poll_results (poll_option_id); CREATE INDEX phpbb_poll_options_poll_option_id on phpbb_poll_options (poll_option_id);
CREATE INDEX phpbb_poll_results_topic_id on phpbb_poll_results (topic_id); CREATE INDEX phpbb_poll_options_topic_id on phpbb_poll_options (topic_id);
# Table: phpbb_poll_voters # Table: phpbb_poll_votes
CREATE TABLE phpbb_poll_voters ( CREATE TABLE phpbb_poll_votes (
topic_id mediumint(8) NOT NULL DEFAULT '0', topic_id mediumint(8) NOT NULL DEFAULT '0',
poll_option_id tinyint(4) NOT NULL DEFAULT '0', poll_option_id tinyint(4) NOT NULL DEFAULT '0',
vote_user_id mediumint(8) NOT NULL DEFAULT '0', vote_user_id mediumint(8) NOT NULL DEFAULT '0',
vote_user_ip varchar(40) NOT NULL vote_user_ip varchar(40) NOT NULL
); );
CREATE INDEX phpbb_poll_voters_topic_id on phpbb_poll_voters (topic_id); CREATE INDEX phpbb_poll_votes_topic_id on phpbb_poll_votes (topic_id);
CREATE INDEX phpbb_poll_voters_vote_user_id on phpbb_poll_voters (vote_user_id); CREATE INDEX phpbb_poll_votes_vote_user_id on phpbb_poll_votes (vote_user_id);
CREATE INDEX phpbb_poll_voters_vote_user_ip on phpbb_poll_voters (vote_user_ip); CREATE INDEX phpbb_poll_votes_vote_user_ip on phpbb_poll_votes (vote_user_ip);
# Table: phpbb_posts # Table: phpbb_posts
@ -886,8 +886,8 @@ CREATE INDEX phpbb_topics_forum_topic_type on phpbb_topics (forum_id, topic_type
CREATE INDEX phpbb_topics_topic_last_post_time on phpbb_topics (topic_last_post_time); CREATE INDEX phpbb_topics_topic_last_post_time on phpbb_topics (topic_last_post_time);
# Table: phpbb_topics_marking # Table: phpbb_topics_track
CREATE TABLE phpbb_topics_marking ( CREATE TABLE phpbb_topics_track (
user_id mediumint(8) NOT NULL DEFAULT '0', user_id mediumint(8) NOT NULL DEFAULT '0',
topic_id mediumint(8) NOT NULL DEFAULT '0', topic_id mediumint(8) NOT NULL DEFAULT '0',
forum_id mediumint(8) NOT NULL DEFAULT '0', forum_id mediumint(8) NOT NULL DEFAULT '0',

2
phpBB/report.php
View file

@ -82,7 +82,7 @@ if ($report_data['post_reported'])
if ($submit && $reason_id) if ($submit && $reason_id)
{ {
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . REASONS_TABLE . " FROM ' . REPORTS_REASONS_TABLE . "
WHERE reason_id = $reason_id"; WHERE reason_id = $reason_id";
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result); $row = $db->sql_fetchrow($result);

2
phpBB/search.php
View file

@ -841,7 +841,7 @@ $template->assign_vars(array(
); );
$sql = 'SELECT search_time, search_keywords $sql = 'SELECT search_time, search_keywords
FROM ' . SEARCH_TABLE . ' FROM ' . SEARCH_RESULTS_TABLE . '
WHERE search_keywords <> \'\' WHERE search_keywords <> \'\'
ORDER BY search_time DESC'; ORDER BY search_time DESC';
$result = $db->sql_query_limit($sql, 5); $result = $db->sql_query_limit($sql, 5);