pull in dev branch changes

not pulled: swiftmailer, gzip

1 files changed, 5 insertions, 21 deletions

diff --git a/controllers/UsersController.php b/controllers/UsersController.php
index 3991738..d1b3193 100644
--- a/controllers/UsersController.php
+++ b/controllers/UsersController.php
@@ -11,7 +11,7 @@ use lithium\security\Auth;
 use lithium\util\String;
 use \MongoDate;
 use li3_flash_message\extensions\storage\FlashMessage;
-use app\libraries\openID\LightOpenID;
+use lithium\template\helper\Html;
 
 class UsersController extends \lithium\action\Controller {
 	public $secret = "marshmellows"; //I don't know why either?
@@ -223,21 +223,6 @@ class UsersController extends \lithium\action\Controller {
 		
 	}
 
-	public function openid()
-	{
-		if ($this->request->data)
-		{
-			if (!empty($this->request->query))
-			{
-				var_dump($this->request->query);
-			}
-			else 
-			{
-				$openid = new LightOpenID;
-				echo $openid->validates();
-			}
-		}
-	}
 
 	public function signup()
 	{
@@ -287,15 +272,14 @@ class UsersController extends \lithium\action\Controller {
 		}
 	}
 
-	public function login($location = null, $args = null)
-	{
-		//Put in a check to make sure the user has confirmed their account 
-		//The check should probably happen below after the auth check.
-		/*
+	/*
 			If the user is valid, but not confirmed,
 				tell the user they haven't confirmed,
 				offer to resend the confirmation email or changed their email address. 
 		*/
+	public function login($location = null, $args = null)
+	{
+		
 		if (!empty($this->request->data)) {
 			$user = Auth::check('default', $this->request);
 			if ($user)