aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-02-18 13:54:12 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-02-18 13:54:12 +0000
commit26a6d215d0897afa82eea9b0cc0fca79d4544da5 (patch)
tree50645d56ce20cb6fa5e18a2eb1036deba65a1068 /phpBB/includes/functions.php
parentf2f0dc78929228619f8644d6553a02a8d1572242 (diff)
downloadforums-26a6d215d0897afa82eea9b0cc0fca79d4544da5.tar
forums-26a6d215d0897afa82eea9b0cc0fca79d4544da5.tar.gz
forums-26a6d215d0897afa82eea9b0cc0fca79d4544da5.tar.bz2
forums-26a6d215d0897afa82eea9b0cc0fca79d4544da5.tar.xz
forums-26a6d215d0897afa82eea9b0cc0fca79d4544da5.zip
- fix some tiny bugs
- fix module system (sometimes the layout is broken due to falsly deactivated categories) - auth updates (setting permissions) - fix "category jumping" bug in acp - u_action is defined by the module itself git-svn-id: file:///svn/phpbb/trunk@5558 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php17
1 files changed, 15 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 1a2d927c99..807aeb6578 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1215,6 +1215,12 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
$err = '';
+ // Make sure user->setup() has been called
+ if (empty($user->lang))
+ {
+ $user->setup();
+ }
+
if (isset($_POST['login']))
{
$username = request_var('username', '');
@@ -1229,9 +1235,16 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
// If admin authentication
if ($admin)
{
- add_log('admin', 'LOG_ADMIN_AUTH_SUCCESS');
+ if ($auth->acl_get('a_'))
+ {
+ add_log('admin', 'LOG_ADMIN_AUTH_SUCCESS');
+ }
+ else
+ {
+ add_log('admin', 'LOG_ADMIN_AUTH_FAIL');
+ }
}
-
+
$redirect = request_var('redirect', "index.$phpEx$SID");
meta_refresh(3, $redirect);