case '404': // Administrator login not found
setRequestPostElement('ok', $ret);
- $ret = getMessage('ADMIN_404');
+ $ret = sprintf(getMessage('ADMIN_404'), postRequestElement('login'));
destroyAdminSession();
break;
} else {
// Maybe an Admin want's to login?
$ret = ifAdminCookiesAreValid(getSession('admin_login'), getSession('admin_md5'));
- switch ($ret)
- {
+
+ // Check status
+ switch ($ret) {
case 'done':
// Check for access control line of current menu entry
- $GLOBALS['acl_allow'] = runFilterChain('check_admin_acl');
+ runFilterChain('check_admin_acl');
// When type of admin menu is not set fallback to old menu system
if (!isConfigEntrySet('admin_menu')) setConfigEntry('admin_menu', 'OLD');
loadIncludeOnce('inc/modules/admin/lasys-inc.php');
// Create new-style menu system will logical areas
- ADMIN_LOGICAL_AREA_SYSTEM($area, $action, getWhat());
+ doAdminLogicalArea($area, $action, getWhat());
} else {
// This little call constructs the whole default old and lacky menu system
// on left side. It also renders the content on right side
case '404': // Administrator login not found
setRequestPostElement('ok', $ret);
+ addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('ADMIN_404'), getSession('admin_login')));
destroyAdminSession();
- addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_404'));
break;
case 'pass': // Wrong password
setRequestPostElement('ok', $ret);
- destroyAdminSession();
addFatalMessage(__FILE__, __LINE__, getMessage('WRONG_PASS'));
+ destroyAdminSession();
break;
default: // Others will be logged
logDebugMessage(__FILE__, __LINE__, sprintf("Unknown return code %s from ifAdminCookiesAreValid()", $ret));
break;
- }
+ } // END - switch
}
// [EOF]