Merge branch 'develop' of github.com:storytlr/core into develop

Author: jmhobbs

index.php

@@ -1,5 +1,5 @@
 <?php
-define("STORYTLR_VERSION","0.9.4-rc1");
+define("STORYTLR_VERSION","1.1-dev");
 define("DATABASE_VERSION", "1");
 define("AUTO_INSTALL", true);
 define("AUTO_UPGRADE", true);

protected/application/admin/controllers/AuthController.php

@@ -109,13 +109,14 @@ public function loginAction()
 		// Send the cookie with the authentication data
 		$cookie	= new Stuffpress_Cookie($user->id);
 		$cookie->set($remember);
-
+		
+		$config = Zend_Registry::get('configuration');
+		$domain = trim($config->web->host, " /");
+		$path   = trim($config->web->path, " /");
+		
+		
 		// If we have a special target
-		if ($values['target'] == 'user_page') {
-			$config = Zend_Registry::get('configuration');
-			$domain = trim($config->web->host, " /");
-			$path   = trim($config->web->path, " /");
-			
+		if ($values['target'] == 'user_page') {			
 			// If single user, we go back to the host
 			if (isset($config->app->user)) {
 				$url = "http://$domain/$path";
@@ -126,7 +127,8 @@ public function loginAction()
 			return $this->_redirect($url);
 		}
 		else if ($values['target']) {
-			return $this->_redirect($values['target']);
+			$target = trim($values['target'], " /");
+			return $this->_redirect("http://$domain/$target");
 		} 
 
 		// Otherwise we go back to the home page