update our login action for elgg 1.7; add needed username param to first time login forward

plugins/cas_auth_unl/actions/login.php

@@ -12,11 +12,7 @@
  * 
  */
  
-	// Safety first
-		action_gatekeeper();
-
 // Get $_GET inputs 
-       
 $username = get_input('username');
 $password = get_input("password");
 $persistent = get_input("persistent", false);
@@ -51,38 +47,27 @@
 				$_SESSION['loggedInWithCas'] = true;
 		} 
 	}
-        	
-			
 }
 
 // Set the system_message as appropriate
-        
 if ($result) {
     system_message(elgg_echo('loginok'));
-            if ($_SESSION['last_forward_from'])
-            {
+    if (isset($_SESSION['last_forward_from']) && $_SESSION['last_forward_from']) {
         $forward_url = $_SESSION['last_forward_from'];
-            	$_SESSION['last_forward_from'] = "";
+        unset($_SESSION['last_forward_from']);
         forward($forward_url);
-            }
-            else
-            {
-            	if (
-            		(isadminloggedin()) &&
-            		(!datalist_get('first_admin_login'))
-            	) 
-            	{
+    } else {
+        if ( (isadminloggedin()) && (!datalist_get('first_admin_login'))) {
             system_message(elgg_echo('firstadminlogininstructions'));
-            		
             datalist_set('first_admin_login', time());
 
             forward('pg/admin/plugins');
+        } else if ($_SESSION['user']->last_login == '0' && $view != 'mobile') {
+            forward('mod/profile/edit.php?username='.$_SESSION['username'].'&firstlogin=yes');
+        } else if (get_input('returntoreferer')) {
+            forward($_SERVER['HTTP_REFERER']);
         } else {
-            		$lastlogin_date = $_SESSION['user']->last_login;
-            		if (!$lastlogin_date && $view != 'mobile')
-            			forward("mod/profile/edit.php?firstlogin=yes");
-            		else
-            			forward("pg/dashboard/");
+            forward('pg/dashboard/');
         }
     }
 } else {
@@ -108,5 +93,3 @@
         register_error(elgg_echo('loginerror'));
     }
 }
-      
-?>
\ No newline at end of file