mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-04 14:47:52 +02:00
Code Issues Releases Wiki Activity

fixing some bugs i introduced while fixing other bugs. :)

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@6899 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-01-18 10:00:39 +00:00
parent a64caea9b6
commit e6f685c25f
9 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/develop/create_schema_files.php
View File

@ -1327,7 +1327,7 @@ function get_schema_struct()
'rule_user_id' => array('UINT', 0),
'rule_group_id' => array('UINT', 0),
'rule_action' => array('UINT', 0),
'rule_folder_id' => array('UINT', 0),
'rule_folder_id' => array('INT:11', 0),
),
'PRIMARY_KEY' => 'rule_id',
'KEYS' => array(
@ -1346,7 +1346,7 @@ function get_schema_struct()
'pm_replied' => array('BOOL', 0),
'pm_marked' => array('BOOL', 0),
'pm_forwarded' => array('BOOL', 0),
'folder_id' => array('UINT', 0),
'folder_id' => array('INT:11', 0),
),
'KEYS' => array(
'msg_id' => array('INDEX', 'msg_id'),

4
phpBB/includes/acp/acp_permission_roles.php
View File

@ -330,9 +330,11 @@ class acp_permission_roles
if (sizeof($hold_ary))
{
$role_name = (!empty($user->lang[$role_row['role_name']])) ? $user->lang[$role_row['role_name']] : $role_row['role_name']
$template->assign_var(array(
'S_DISPLAY_ROLE_MASK' => true,
'L_ROLE_ASSIGNED_TO' => sprintf($user->lang['ROLE_ASSIGNED_TO'], $role_row['role_name']))
'L_ROLE_ASSIGNED_TO' => sprintf($user->lang['ROLE_ASSIGNED_TO'], $role_name))
);
$auth_admin->display_role_mask($hold_ary);

4
phpBB/install/database_update.php
View File

@ -330,10 +330,10 @@ $database_update_info = array(
'prune_freq' => array('UINT', 0),
),
PRIVMSGS_RULES_TABLE => array(
'rule_folder_id' => array('UINT', 0),
'rule_folder_id' => array('INT:11', 0),
),
PRIVMSGS_TO_TABLE => array(
'folder_id' => array('UINT', 0),
'folder_id' => array('INT:11', 0),
),
),
// Remove the following keys

4
phpBB/install/schemas/mysql_40_schema.sql
View File

@ -511,7 +511,7 @@ CREATE TABLE phpbb_privmsgs_rules (
rule_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
rule_group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
rule_action mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
rule_folder_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
rule_folder_id int(11) DEFAULT '0' NOT NULL,
PRIMARY KEY (rule_id),
KEY user_id (user_id)
);
@ -528,7 +528,7 @@ CREATE TABLE phpbb_privmsgs_to (
pm_replied tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
pm_marked tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
pm_forwarded tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
folder_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
folder_id int(11) DEFAULT '0' NOT NULL,
KEY msg_id (msg_id),
KEY author_id (author_id),
KEY usr_flder_id (user_id, folder_id)

4
phpBB/install/schemas/mysql_41_schema.sql
View File

@ -511,7 +511,7 @@ CREATE TABLE phpbb_privmsgs_rules (
rule_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
rule_group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
rule_action mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
rule_folder_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
rule_folder_id int(11) DEFAULT '0' NOT NULL,
PRIMARY KEY (rule_id),
KEY user_id (user_id)
) CHARACTER SET `utf8` COLLATE `utf8_bin`;
@ -528,7 +528,7 @@ CREATE TABLE phpbb_privmsgs_to (
pm_replied tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
pm_marked tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
pm_forwarded tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
folder_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
folder_id int(11) DEFAULT '0' NOT NULL,
KEY msg_id (msg_id),
KEY author_id (author_id),
KEY usr_flder_id (user_id, folder_id)

4
phpBB/install/schemas/oracle_schema.sql
View File

@ -989,7 +989,7 @@ CREATE TABLE phpbb_privmsgs_rules (
rule_user_id number(8) DEFAULT '0' NOT NULL,
rule_group_id number(8) DEFAULT '0' NOT NULL,
rule_action number(8) DEFAULT '0' NOT NULL,
rule_folder_id number(8) DEFAULT '0' NOT NULL,
rule_folder_id number(11) DEFAULT '0' NOT NULL,
CONSTRAINT pk_phpbb_privmsgs_rules PRIMARY KEY (rule_id)
)
/
@ -1026,7 +1026,7 @@ CREATE TABLE phpbb_privmsgs_to (
pm_replied number(1) DEFAULT '0' NOT NULL,
pm_marked number(1) DEFAULT '0' NOT NULL,
pm_forwarded number(1) DEFAULT '0' NOT NULL,
folder_id number(8) DEFAULT '0' NOT NULL
folder_id number(11) DEFAULT '0' NOT NULL
)
/

4
phpBB/install/schemas/postgres_schema.sql
View File

@ -691,7 +691,7 @@ CREATE TABLE phpbb_privmsgs_rules (
rule_user_id INT4 DEFAULT '0' NOT NULL CHECK (rule_user_id >= 0),
rule_group_id INT4 DEFAULT '0' NOT NULL CHECK (rule_group_id >= 0),
rule_action INT4 DEFAULT '0' NOT NULL CHECK (rule_action >= 0),
rule_folder_id INT4 DEFAULT '0' NOT NULL CHECK (rule_folder_id >= 0),
rule_folder_id INT4 DEFAULT '0' NOT NULL,
PRIMARY KEY (rule_id)
);
@ -710,7 +710,7 @@ CREATE TABLE phpbb_privmsgs_to (
pm_replied INT2 DEFAULT '0' NOT NULL CHECK (pm_replied >= 0),
pm_marked INT2 DEFAULT '0' NOT NULL CHECK (pm_marked >= 0),
pm_forwarded INT2 DEFAULT '0' NOT NULL CHECK (pm_forwarded >= 0),
folder_id INT4 DEFAULT '0' NOT NULL CHECK (folder_id >= 0)
folder_id INT4 DEFAULT '0' NOT NULL
);
CREATE INDEX phpbb_privmsgs_to_msg_id ON phpbb_privmsgs_to (msg_id);

4
phpBB/install/schemas/sqlite_schema.sql
View File

@ -495,7 +495,7 @@ CREATE TABLE phpbb_privmsgs_rules (
rule_user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
rule_group_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
rule_action INTEGER UNSIGNED NOT NULL DEFAULT '0',
rule_folder_id INTEGER UNSIGNED NOT NULL DEFAULT '0'
rule_folder_id int(11) NOT NULL DEFAULT '0'
);
CREATE INDEX phpbb_privmsgs_rules_user_id ON phpbb_privmsgs_rules (user_id);
@ -511,7 +511,7 @@ CREATE TABLE phpbb_privmsgs_to (
pm_replied INTEGER UNSIGNED NOT NULL DEFAULT '0',
pm_marked INTEGER UNSIGNED NOT NULL DEFAULT '0',
pm_forwarded INTEGER UNSIGNED NOT NULL DEFAULT '0',
folder_id INTEGER UNSIGNED NOT NULL DEFAULT '0'
folder_id int(11) NOT NULL DEFAULT '0'
);
CREATE INDEX phpbb_privmsgs_to_msg_id ON phpbb_privmsgs_to (msg_id);

2
phpBB/viewforum.php
View File

@ -156,7 +156,7 @@ if (!$auth->acl_get('f_read', $forum_id))
'S_NO_READ_ACCESS' => true,
'S_AUTOLOGIN_ENABLED' => ($config['allow_autologin']) ? true : false,
'S_LOGIN_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login') . '&redirect=' . urlencode(build_url(array('_f_'))),
'S_LOGIN_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login') . '&redirect=' . urlencode(str_replace('&', '&', build_url(array('_f_')))),
));
page_footer();