mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-21 01:42:30 +01:00
Code Issues Releases Wiki Activity

- use session_begin

Browse Source 
- fix permission presets to be at least usable


git-svn-id: file:///svn/phpbb/trunk@5244 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2005-10-02 18:25:30 +00:00
parent 2a75587153
commit 7aa5aef8a3
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
phpBB/adm/admin_permissions.php
View File

@ -354,7 +354,7 @@ switch ($submit)
case 'presetsave':
$holding_ary = array();
foreach ($auth_settings as $option => $setting)
foreach ($auth_settings[$which_mode] as $option => $setting)
{
switch ($setting)
{
@ -705,7 +705,23 @@ if (in_array($submit, array('add_options', 'edit_options', 'presetsave', 'preset
$sql = 'SELECT user_id AS id, username AS name
FROM ' . USERS_TABLE . '
WHERE ';
$sql .= ($submit == 'add_options') ? ' username IN (' . implode(', ', array_unique(preg_replace('#^[\s]*?(.*?)[\s]*?$#', "'\\1'", explode("\n", $ug_data[0])))) . ')' : ' user_id ' . ((is_array($ug_data)) ? 'IN (' . implode(', ', $ug_data) . ')' : '= ' . $ug_data);
if ($submit == 'add_options')
{
$_ug_data = explode("\r\n", $ug_data[0]);
$_u_sql = '';
foreach ($_ug_data as $_u_name)
{
$_u_sql .= (($_u_sql) ? ', ' : '') . "'" . $db->sql_escape($_u_name) . "'";
}
$sql .= ' username IN (' . $_u_sql . ')';
}
else
{
$sql .= ' user_id ' . ((is_array($ug_data)) ? 'IN (' . implode(', ', $ug_data) . ')' : '= ' . $ug_data);
}
break;
case 'group':
@ -818,8 +834,8 @@ if (in_array($submit, array('add_options', 'edit_options', 'presetsave', 'preset
$preset_update_options .= '<option value="' . $row['preset_id'] . '">' . $row['preset_name'] . '</option>';
$preset_options .= '<option value="preset_' . $row['preset_id'] . '">' . $row['preset_name'] . '</option>';
$preset_data = unserialize($row['preset_data']);
$preset_data = unserialize(stripslashes($row['preset_data']));
foreach ($preset_data as $preset_type => $preset_type_ary)
{
$holding[$preset_type] = '';
@ -830,7 +846,7 @@ if (in_array($submit, array('add_options', 'edit_options', 'presetsave', 'preset
}
$preset_js .= "\tpresets['preset_" . $row['preset_id'] . "'] = new Array();" . "\n";
$preset_js .= "\tpresets['preset_" . $row['preset_id'] . "'] = new preset_obj('" . $holding['allow'] . "', '" . $holding['deny'] . "', '" . $holding['inherit'] . "');\n";
$preset_js .= "\tpresets['preset_" . $row['preset_id'] . "'] = new preset_obj('" . $holding['yes'] . "', '" . $holding['no'] . "', '" . $holding['inherit'] . "');\n";
}
while ($row = $db->sql_fetchrow($result));
}

2
phpBB/adm/pagestart.php
View File

@ -21,7 +21,7 @@ require($phpbb_root_path . 'common.'.$phpEx);
require($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
// Start session management
$user->start();
$user->session_begin();
$auth->acl($user->data);
$user->setup('admin');
// End session management