summaryrefslogtreecommitdiffstats
path: root/login.php
diff options
context:
space:
mode:
authorPaul 'flowerysong' Arthur <flowerysong00@yahoo.com>2010-03-14 20:14:52 +0000
committerPaul 'flowerysong' Arthur <flowerysong00@yahoo.com>2010-03-14 20:14:52 +0000
commit1cb0983ed04c65e06d502ae2ac9ed6d5e31d70dc (patch)
tree54655ff3e692a71a17f1d37cd97374b263557ca1 /login.php
parentef48bf3fbdca2a4d25f5d025f4c6ad23905e5369 (diff)
downloadampache-1cb0983ed04c65e06d502ae2ac9ed6d5e31d70dc.tar.gz
ampache-1cb0983ed04c65e06d502ae2ac9ed6d5e31d70dc.tar.bz2
ampache-1cb0983ed04c65e06d502ae2ac9ed6d5e31d70dc.zip
Cosmetics: remove trailing whitespace
Diffstat (limited to 'login.php')
-rw-r--r--login.php78
1 files changed, 39 insertions, 39 deletions
diff --git a/login.php b/login.php
index c4b10838..acff1833 100644
--- a/login.php
+++ b/login.php
@@ -24,21 +24,21 @@ define('NO_SESSION','1');
require_once 'lib/init.php';
/* We have to create a cookie here because IIS
- * can't handle Cookie + Redirect
+ * can't handle Cookie + Redirect
*/
-vauth::create_cookie();
+vauth::create_cookie();
Preference::init();
/**
* If Access Control is turned on then we don't
- * even want them to be able to get to the login
+ * even want them to be able to get to the login
* page if they aren't in the ACL
*/
-if (Config::get('access_control')) {
+if (Config::get('access_control')) {
if (!Access::check_network('interface','','5')) {
debug_event('access_denied','Access Denied:' . $_SERVER['REMOTE_ADDR'] . ' is not in the Interface Access list','3');
access_denied();
- exit();
+ exit();
}
} // access_control is enabled
@@ -47,13 +47,13 @@ unset($auth);
/* Check for posted username and password, or appropriate environment
variable if using HTTP auth */
-if (($_POST['username'] && $_POST['password']) ||
-(in_array('http',Config::get('auth_methods')) &&
+if (($_POST['username'] && $_POST['password']) ||
+(in_array('http',Config::get('auth_methods')) &&
($_SERVER['REMOTE_USER'] || $_SERVER['HTTP_REMOTE_USER']))) {
if ($_POST['rememberme']) {
- vauth::create_remember_cookie();
- }
+ vauth::create_remember_cookie();
+ }
/* If we are in demo mode let's force auth success */
if (Config::get('demo_mode')) {
@@ -78,39 +78,39 @@ if (($_POST['username'] && $_POST['password']) ||
}
$auth = vauth::authenticate($username, $password);
$user = User::get_from_username($username);
-
- if (!$auth['success']) {
- debug_event('Login',scrub_out($username) . ' attempted to login and failed','1');
- }
-
- if ($user->disabled == '1') {
+
+ if (!$auth['success']) {
+ debug_event('Login',scrub_out($username) . ' attempted to login and failed','1');
+ }
+
+ if ($user->disabled == '1') {
$auth['success'] = false;
- Error::add('general',_('User Disabled please contact Admin'));
- debug_event('Login',scrub_out($username) . ' is disabled and attempted to login','1');
+ Error::add('general',_('User Disabled please contact Admin'));
+ debug_event('Login',scrub_out($username) . ' is disabled and attempted to login','1');
} // if user disabled
-
-
- elseif (!$user->username AND $auth['success']) {
- /* This is run if we want to auto_create users who don't exist (usefull for non mysql auth) */
+
+
+ elseif (!$user->username AND $auth['success']) {
+ /* This is run if we want to auto_create users who don't exist (usefull for non mysql auth) */
if (Config::get('auto_create')) {
- $access = Config::get('auto_user') ? User::access_name_to_level(Config::get('auto_user')) : '5';
+ $access = Config::get('auto_user') ? User::access_name_to_level(Config::get('auto_user')) : '5';
$name = $auth['name'];
$email = $auth['email'];
-
- /* Attempt to create the user */
+
+ /* Attempt to create the user */
if (!$user->create($username, $name, $email,hash('sha256',mt_rand()), $access)) {
$auth['success'] = false;
- Error::add('general',_('Unable to create new account'));
+ Error::add('general',_('Unable to create new account'));
}
- else {
+ else {
$user = new User($username);
}
} // End if auto_create
else {
$auth['success'] = false;
- Error::add('general',_('No local account found'));
+ Error::add('general',_('No local account found'));
}
} // else user isn't disabled
@@ -129,38 +129,38 @@ if ($auth['success']) {
if ($current_ip AND $current_ip != inet_pton($_SERVER['REMOTE_ADDR'])) {
Error::add('general',_('User Already Logged in'));
require Config::get('prefix') . '/templates/show_login_form.inc.php';
- exit;
+ exit;
}
} // if prevent_multiple_logins
// $auth->info are the fields specified in the config file
// to retrieve for each user
vauth::session_create($auth);
-
+
//
// Not sure if it was me or php tripping out,
// but naming this 'user' didn't work at all
//
$_SESSION['userdata'] = $auth;
- //
+ //
// Record the IP of this person!
- //
- if (Config::get('track_user_ip')) {
- $user->insert_ip_history();
+ //
+ if (Config::get('track_user_ip')) {
+ $user->insert_ip_history();
}
- /* Make sure they are actually trying to get to this site and don't try to redirect them back into
+ /* Make sure they are actually trying to get to this site and don't try to redirect them back into
* an admin section
**/
- if (substr($_POST['referrer'],0,strlen(Config::get('web_path'))) == Config::get('web_path') AND
- !strstr($_POST['referrer'],"install.php") AND
- !strstr($_POST['referrer'],"login.php") AND
+ if (substr($_POST['referrer'],0,strlen(Config::get('web_path'))) == Config::get('web_path') AND
+ !strstr($_POST['referrer'],"install.php") AND
+ !strstr($_POST['referrer'],"login.php") AND
!strstr($_POST['referrer'],'logout.php') AND
!strstr($_POST['referrer'],"update.php") AND
!strstr($_POST['referrer'],"activate.php") AND
- !strstr($_POST['referrer'],"admin")) {
-
+ !strstr($_POST['referrer'],"admin")) {
+
header("Location: " . $_POST['referrer']);
exit();
} // if we've got a referrer