mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-11 03:04:09 +02:00
Un-b0rked ACL options caching, small general fixes
git-svn-id: file:///svn/phpbb/trunk@3338 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -192,10 +192,10 @@ switch ($mode)
|
||||
'parent_id' => $parent_id,
|
||||
'left_id' => $left_id,
|
||||
'right_id' => $right_id,
|
||||
'forum_status' => ITEM_UNLOCKED,
|
||||
'forum_status' => intval($_POST['forum_status']),
|
||||
'forum_postable' => (!empty($_POST['forum_postable'])) ? 1 : 0,
|
||||
'forum_name' => sql_quote($_POST['forum_name']),
|
||||
'forum_desc' => sql_quote($_POST['forum_desc']),
|
||||
'forum_name' => $_POST['forum_name'],
|
||||
'forum_desc' => $_POST['forum_desc'],
|
||||
'forum_style' => (!empty($_POST['forum_style'])) ? intval($_POST['forum_style']) : 'NULL',
|
||||
'enable_post_count' => (!empty($_POST['disable_post_count'])) ? 0 : 1,
|
||||
'enable_icons' => (!empty($_POST['enable_icons'])) ? 1 : 0,
|
||||
@@ -282,6 +282,8 @@ switch ($mode)
|
||||
//
|
||||
// wasn't this form submitted? is anyone trying to remotely delete forums
|
||||
//
|
||||
// NOTE/TODO: this should not be possible because of session_id verification so this part can be removed
|
||||
//
|
||||
trigger_error('Did not submit', E_USER_ERROR);
|
||||
}
|
||||
|
||||
|
@@ -25,6 +25,7 @@ if (!defined('IN_PHPBB'))
|
||||
}
|
||||
|
||||
define('IN_ADMIN', true);
|
||||
define('NEED_SID', true);
|
||||
include($phpbb_root_path . 'common.'.$phpEx);
|
||||
|
||||
// Start session management
|
||||
@@ -33,17 +34,6 @@ $user->setup();
|
||||
$auth->acl($user->data);
|
||||
// End session management
|
||||
|
||||
//
|
||||
// If session_ids do not match, rewrite the URL correctly then redirect the user
|
||||
//
|
||||
if ($_REQUEST['sid'] != $user->data['session_id'])
|
||||
{
|
||||
$url = preg_replace('/sid=([^&]*)(&?)/i', '', $_SERVER['REQUEST_URI']);
|
||||
$url = preg_replace('/\?$/', '', $url);
|
||||
$url .= ((strpos($url, '?')) ? '&' : '?') . 'sid=' . $user->data['session_id'];
|
||||
redirect($url);
|
||||
}
|
||||
|
||||
// -----------------------------
|
||||
// Functions
|
||||
function page_header($sub_title, $meta = '', $table_html = true)
|
||||
|
Reference in New Issue
Block a user