if (!defined('__SECURITY')) {
$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
require($INC);
-}
+} // END - if
// Load include file
loadIncludeOnce('inc/modules/admin/admin-inc.php');
// Is no admin registered?
if (!isAdminRegistered()) {
// Admin is not registered so we have to inform the user
- if ((IS_FORM_SENT()) && ((!REQUEST_ISSET_POST(('login'))) || (!REQUEST_ISSET_POST(('pass'))) || (strlen(REQUEST_POST('pass')) < 4))) {
+ if ((isFormSent()) && ((!REQUEST_ISSET_POST('login')) || (!REQUEST_ISSET_POST('pass')) || (strlen(REQUEST_POST('pass')) < 4))) {
REQUEST_SET_POST('ok', '***');
- }
+ } // END - if
- if ((IS_FORM_SENT()) && (REQUEST_POST('ok') != '***')) {
+ if ((isFormSent()) && (REQUEST_POST('ok') != '***')) {
// Hash the password with the old function because we are here in install mode
$hashedPass = md5(REQUEST_POST('pass'));
// Do registration
$ret = REGISTER_ADMIN(REQUEST_POST('login'), $hashedPass, constant('WEBMASTER'));
- switch ($ret)
- {
+
+ // Check if registration wents fine
+ switch ($ret) {
case 'done':
$done = changeDataInFile(constant('PATH') . 'inc/cache/config-local.php', "ADMIN-SETUP", "setConfigEntry('ADMIN_REGISTERED', \"", "\");", 'Y', 0);
if ($done === true) {
redirectToUrl('modules.php?module=admin');
} // END - if
break;
- }
+ } // END - switch
}
// Whas that action okay?
if ($ret != 'done') {
// Fixes another notice
- if (REQUEST_ISSET_POST(('login'))) {
+ if (REQUEST_ISSET_POST('login')) {
define('__LOGIN_VALUE', REQUEST_POST('login'));
} else {
define('__LOGIN_VALUE', '');
}
// Yet-another notice-fix
- if ((IS_FORM_SENT()) && (REQUEST_POST('ok') == '***')) {
+ if ((isFormSent()) && (REQUEST_POST('ok') == '***')) {
// No login entered?
- if (!REQUEST_ISSET_POST(('login'))) $loginMessage = getMessage('ADMIN_NO_LOGIN');
+ if (!REQUEST_ISSET_POST('login')) $loginMessage = getMessage('ADMIN_NO_LOGIN');
// An error comes back from registration?
if (!empty($ret)) $loginMessage = $ret;
// No password entered?
- if (!REQUEST_ISSET_POST(('pass'))) $passwdMessage = getMessage('ADMIN_NO_PASS');
+ if (!REQUEST_ISSET_POST('pass')) $passwdMessage = getMessage('ADMIN_NO_PASS');
// Or password too short?
if (strlen(REQUEST_POST('pass')) < 4) $passwdMessage = getMessage('ADMIN_SHORT_PASS');
// Load register template
LOAD_TEMPLATE('admin_reg_form');
}
-} elseif (REQUEST_ISSET_GET(('reset_pass'))) {
+} elseif (REQUEST_ISSET_GET('reset_pass')) {
// Is the form submitted?
- if ((REQUEST_ISSET_POST(('send_link'))) && (REQUEST_ISSET_POST(('email')))) {
+ if ((REQUEST_ISSET_POST('send_link')) && (REQUEST_ISSET_POST('email'))) {
// Try to send the link out
$OUT = ADMIN_SEND_PASSWORD_RESET_LINK(REQUEST_POST('email'));
// Output result
LOAD_TEMPLATE('admin_settings_saved', false, $OUT);
- } elseif (REQUEST_ISSET_GET(('hash'))) {
+ } elseif (REQUEST_ISSET_GET('hash')) {
// Output form for hash validation
LOAD_TEMPLATE('admin_validate_reset_hash_form', false, REQUEST_GET('hash'));
- } elseif ((REQUEST_ISSET_POST(('validate_hash'))) && (REQUEST_ISSET_POST(('login'))) && (REQUEST_ISSET_POST(('hash')))) {
+ } elseif ((REQUEST_ISSET_POST('validate_hash')) && (REQUEST_ISSET_POST('login')) && (REQUEST_ISSET_POST('hash'))) {
// Validate the login data and hash
$valid = ADMIN_VALIDATE_RESET_LINK_HASH_LOGIN(REQUEST_POST('hash'), REQUEST_POST('login'));
// Cannot validate the login data and hash
LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_VALIDATION_RESET_LOGIN_HASH_FAILED'));
}
- } elseif ((REQUEST_ISSET_POST(('reset_pass'))) && (REQUEST_ISSET_POST(('hash'))) && (REQUEST_ISSET_POST(('login'))) && (REQUEST_ISSET_POST(('pass1'))) && (REQUEST_POST('pass1') == REQUEST_POST('pass2'))) {
+ } elseif ((REQUEST_ISSET_POST('reset_pass')) && (REQUEST_ISSET_POST('hash')) && (REQUEST_ISSET_POST('login')) && (REQUEST_ISSET_POST('pass1')) && (REQUEST_POST('pass1') == REQUEST_POST('pass2'))) {
// Okay, we shall the admin password here. So first revalidate the hash
if (ADMIN_VALIDATE_RESET_LINK_HASH_LOGIN(REQUEST_POST('hash'), REQUEST_POST('login'))) {
// Set the password now
redirectToUrl('modules.php?module=admin&logout=1');
} // END - if
- if (REQUEST_ISSET_GET(('register'))) {
+ if (REQUEST_ISSET_GET('register')) {
// Registration of first admin is done
if (REQUEST_GET('register') == 'done') LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_REGISTER_DONE'));
} // END - if
// Check if the admin has submitted data or not
- if ((IS_FORM_SENT()) && ((!REQUEST_ISSET_POST(('login'))) || (!REQUEST_ISSET_POST(('pass'))) || (strlen(REQUEST_POST('pass')) < 4))) {
+ if ((isFormSent()) && ((!REQUEST_ISSET_POST('login')) || (!REQUEST_ISSET_POST('pass')) || (strlen(REQUEST_POST('pass')) < 4))) {
REQUEST_SET_POST('ok', '***');
} // END - if
- if ((IS_FORM_SENT()) && (REQUEST_POST('ok') != '***')) {
+ if ((isFormSent()) && (REQUEST_POST('ok') != '***')) {
// All required data was entered so we check his account
$ret = CHECK_ADMIN_LOGIN(REQUEST_POST('login'), REQUEST_POST('pass'));
// Which status do we have?
- switch ($ret)
- {
+ switch ($ret) {
case 'done': // Admin and password are okay, so we log in now
// Construct URL and redirect
$URL = 'modules.php?module=admin&';
// Rewrite overview module
- if ($GLOBALS['what'] == 'overview') {
- $GLOBALS['action'] = getModeAction($GLOBALS['module'], $GLOBALS['what']);
+ if (getWhat() == 'overview') {
+ setAction(getModeAction(getModule(), getWhat()));
} // END - if
// Add data to URL
- if (!empty($GLOBALS['what'])) $URL .= 'what='.$GLOBALS['what'];
- elseif (!empty($GLOBALS['action'])) $URL .= 'action='.$GLOBALS['action'];
- elseif (REQUEST_ISSET_GET('area')) $URL .= 'area='.REQUEST_GET('area');
+ if (isWhatSet()) $URL .= 'what='.getWhat();
+ elseif (isActionSet()) $URL .= 'action='.getAction();
+ elseif (REQUEST_ISSET_GET('area')) $URL .= 'area='.REQUEST_GET('area');
// Load URL
redirectToUrl($URL);
// Error detected?
// @TODO Rewrite all these constants
if ($ret != 'done') {
- if (REQUEST_ISSET_POST(('login'))) {
+ if (REQUEST_ISSET_POST('login')) {
define('__LOGIN_VALUE', REQUEST_POST('login'));
} else {
define('__LOGIN_VALUE', '');
}
- if (IS_FORM_SENT()) {
+ if (isFormSent()) {
// Set messages to zero
$loginMessage = ''; $passwdMessage = '';
// No login entered?
- if (!REQUEST_ISSET_POST(('login'))) $loginMessage = getMessage('ADMIN_NO_LOGIN');
+ if (!REQUEST_ISSET_POST('login')) $loginMessage = getMessage('ADMIN_NO_LOGIN');
// An error comes back from login?
if ((!empty($ret)) && (REQUEST_POST('ok') == '404')) $loginMessage = $ret;
// No password entered?
- if (!REQUEST_ISSET_POST(('pass'))) $passwdMessage = getMessage('ADMIN_NO_PASS');
+ if (!REQUEST_ISSET_POST('pass')) $passwdMessage = getMessage('ADMIN_NO_PASS');
// Or password too short?
if (strlen(REQUEST_POST('pass')) < 4) $passwdMessage = getMessage('ADMIN_SHORT_PASS');
}
// Load login form
- if (!empty($GLOBALS['what'])) {
+ if (isWhatSet()) {
// Restore old what value
- $content = array('target' => 'what', 'value' => $GLOBALS['what']);
- } elseif (!empty($GLOBALS['action'])) {
- if ($GLOBALS['action'] != 'logout') {
+ $content = array('target' => 'what', 'value' => getWhat());
+ } elseif (isActionSet()) {
+ if (getAction() != 'logout') {
// Restore old action value
- $content = array('target' => 'action', 'value' => $GLOBALS['action']);
+ $content = array('target' => 'action', 'value' => getAction());
} else {
// Set default values
$content = array('target' => 'action', 'value' => 'login');
// Load login form template
LOAD_TEMPLATE('admin_login_form', false, $content);
} // END - if
-} elseif (REQUEST_ISSET_GET(('logout'))) {
+} elseif (REQUEST_ISSET_GET('logout')) {
// Only try to remove cookies
if (destroyAdminSession()) {
// Load logout template
- if (REQUEST_ISSET_GET(('register'))) {
+ if (REQUEST_ISSET_GET('register')) {
// Secure input
- $register = REQUEST_GET(('register'));
+ $register = REQUEST_GET('register');
// Special logout redirect for installation of given extension
LOAD_TEMPLATE(sprintf("admin_logout_%s_install", $register));
loadIncludeOnce('inc/modules/admin/lasys-inc.php');
// Create new-style menu system will logical areas
- ADMIN_LOGICAL_AREA_SYSTEM($area, $act, $GLOBALS['what']);
+ ADMIN_LOGICAL_AREA_SYSTEM($area, $act, 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
- ADMIN_DO_ACTION($GLOBALS['what']);
+ ADMIN_DO_ACTION(getWhat());
}
break;
projects / mailer.git / blobdiff