From c5cc2821311012a8a4385a304a043c4b41f2afbb Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 31 Aug 2009 19:05:21 +0000
Subject: All line endings are now Unix-style.

git-svn-id: https://code.elgg.org/elgg/trunk@3451 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 actions/login.php | 108 +++++++++++++++++++++++++++---------------------------
 1 file changed, 54 insertions(+), 54 deletions(-)

(limited to 'actions/login.php')

diff --git a/actions/login.php b/actions/login.php
index 1d2b7bc07..f3a60af6d 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -1,37 +1,37 @@
-<?php
-
-    /**
-	 * Elgg login action
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
+<?php
 
-	 * @author Curverider Ltd
+    /**
+	 * Elgg login action
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
 
-	 * @link http://elgg.org/
-	 */
+	 * @author Curverider Ltd
+
+	 * @link http://elgg.org/
+	 */
 	 
 	// Safety first
 		action_gatekeeper();
-
-    // Get username and password
-    
-        $username = get_input('username');
-        $password = get_input("password");
-        $persistent = get_input("persistent", false);
-        
-    // If all is present and correct, try to log in  
-    	$result = false;          
-        if (!empty($username) && !empty($password)) {
-        	if ($user = authenticate($username,$password)) {
-        		$result = login($user, $persistent);
-        	}
-        }
-        
-    // Set the system_message as appropriate
-        
-        if ($result) {
-            system_message(elgg_echo('loginok'));
+
+    // Get username and password
+    
+        $username = get_input('username');
+        $password = get_input("password");
+        $persistent = get_input("persistent", false);
+        
+    // If all is present and correct, try to log in  
+    	$result = false;          
+        if (!empty($username) && !empty($password)) {
+        	if ($user = authenticate($username,$password)) {
+        		$result = login($user, $persistent);
+        	}
+        }
+        
+    // Set the system_message as appropriate
+        
+        if ($result) {
+            system_message(elgg_echo('loginok'));
             if ($_SESSION['last_forward_from'])
             {
             	$forward_url = $_SESSION['last_forward_from'];
@@ -54,29 +54,29 @@
             		forward($_SERVER['HTTP_REFERER']);
             	} else
             		forward("pg/dashboard/");
-            }
-        } else {
-        	$error_msg = elgg_echo('loginerror');
-        	// figure out why the login failed
-        	if (!empty($username) && !empty($password)) {
-        		// See if it exists and is disabled
-				$access_status = access_get_show_hidden_status();
-				access_show_hidden_entities(true);
-        		if (($user = get_user_by_username($username)) && !$user->validated) {
-        			// give plugins a chance to respond
-        			if (!trigger_plugin_hook('unvalidated_login_attempt','user',array('entity'=>$user))) {
-        				// if plugins have not registered an action, the default action is to
-        				// trigger the validation event again and assume that the validation
-        				// event will display an appropriate message
-						trigger_elgg_event('validate', 'user', $user);
-        			}
-        		} else {
-        			 register_error(elgg_echo('loginerror'));
-        		}
-        		access_show_hidden_entities($access_status);
-        	} else {
-            	register_error(elgg_echo('loginerror'));
-        	}
-        }
-      
+            }
+        } else {
+        	$error_msg = elgg_echo('loginerror');
+        	// figure out why the login failed
+        	if (!empty($username) && !empty($password)) {
+        		// See if it exists and is disabled
+				$access_status = access_get_show_hidden_status();
+				access_show_hidden_entities(true);
+        		if (($user = get_user_by_username($username)) && !$user->validated) {
+        			// give plugins a chance to respond
+        			if (!trigger_plugin_hook('unvalidated_login_attempt','user',array('entity'=>$user))) {
+        				// if plugins have not registered an action, the default action is to
+        				// trigger the validation event again and assume that the validation
+        				// event will display an appropriate message
+						trigger_elgg_event('validate', 'user', $user);
+        			}
+        		} else {
+        			 register_error(elgg_echo('loginerror'));
+        		}
+        		access_show_hidden_entities($access_status);
+        	} else {
+            	register_error(elgg_echo('loginerror'));
+        	}
+        }
+      
 ?>
\ No newline at end of file
-- 
cgit v1.2.3