diff --git a/e107_admin/admin_log.php b/e107_admin/admin_log.php index 588108d51..ed6b4accd 100644 --- a/e107_admin/admin_log.php +++ b/e107_admin/admin_log.php @@ -1107,7 +1107,7 @@ if(! defined("USER_WIDTH")) // CONFIGURATION OPTIONS MENU //==================================================================== - +/* if($action == "config") { // User Audit log options (for info) @@ -1246,6 +1246,7 @@ if($action == "config") $ns->tablerender(ADLAN_155.SEP.LAN_OPTIONS, $mes->render().$text); } +*/ //==================================================================== // LOG VIEW MENU diff --git a/e107_handlers/login.php b/e107_handlers/login.php index 1df37ed27..a7c4e3d7c 100644 --- a/e107_handlers/login.php +++ b/e107_handlers/login.php @@ -243,7 +243,7 @@ class userlogin // Problem is that USERCLASS_LIST just contains 'guest' and 'everyone' at this point $class_list = $this->userMethods->addCommonClasses($this->userData, TRUE); - $user_logging_opts = array_flip(explode(',',varset($pref['user_audit_opts'],''))); + $user_logging_opts = e107::getConfig()->get('user_audit_opts'); if (isset($user_logging_opts[USER_AUDIT_LOGIN]) && in_array(varset($pref['user_audit_class'],''),$class_list)) { // Need to note in user audit trail $this->e107->admin_log->user_audit(USER_AUDIT_LOGIN,'', $user_id,$user_name);