Fixed some nasty bugs in the redirector.

jasonlewis · jasonlewis · commit f6f275d7c5be · 2012-09-23T20:54:52.000+09:30
Signed-off-by: Jason Lewis &lt;jason.lewis1991@gmail.com&gt;
diff --git a/components/support/redirector.php b/components/support/redirector.php
@@ -3,6 +3,7 @@
 use URL;
 use URI;
 use Input;
+use Bundle;
 use Request;
 use Redirect;
 use Feather\Auth;
@@ -68,29 +69,29 @@ public function to_previous($default = null)
 	 * 
 	 * @return object
 	 */
-	public static function after_logout()
+	public function after_logout()
 	{
-		return $this->for_auth(Config::get('feather: auth.logout_url'));
+		return $this->for_auth(Config::get('feather: db.auth.logout_url'));
 	}
 
 	/**
 	 * Create a redirect response before a registration.
 	 * 
 	 * @return object
 	 */
-	public static function before_register()
+	public function before_register()
 	{
-		return $this->for_auth(Config::get('feather: auth.register_url'));
+		return $this->for_auth(Config::get('feather: db.auth.register_url'));
 	}
 
 	/**
 	 * Create a redirect response before a login.
 	 * 
 	 * @return object
 	 */
-	public static function before_login()
+	public function before_login()
 	{
-		return $this->for_auth(Config::get('feather: auth.login_url'));
+		return $this->for_auth(Config::get('feather: db.auth.login_url'));
 	}
 
 	/**
@@ -107,7 +108,7 @@ protected function for_auth($url)
 			'{token}'	=> Auth::online() ? Auth::user()->authenticator_token : null
 		);
 
-		if(Config::get('feather: auth.driver') == 'internal')
+		if(Config::get('feather: db.auth.driver') == 'internal')
 		{
 			$url = URL::to_route('feather');
 		}

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`use URL;`
`4`	`4`	`use URI;`
`5`	`5`	`use Input;`
	`6`	`+use Bundle;`
`6`	`7`	`use Request;`
`7`	`8`	`use Redirect;`
`8`	`9`	`use Feather\Auth;`
`@@ -68,29 +69,29 @@ public function to_previous($default = null)`
`68`	`69`	`*`
`69`	`70`	`* @return object`
`70`	`71`	`*/`
`71`		`- public static function after_logout()`
	`72`	`+ public function after_logout()`
`72`	`73`	`{`
`73`		`- return $this->for_auth(Config::get('feather: auth.logout_url'));`
	`74`	`+ return $this->for_auth(Config::get('feather: db.auth.logout_url'));`
`74`	`75`	`}`
`75`	`76`
`76`	`77`	`/**`
`77`	`78`	`* Create a redirect response before a registration.`
`78`	`79`	`*`
`79`	`80`	`* @return object`
`80`	`81`	`*/`
`81`		`- public static function before_register()`
	`82`	`+ public function before_register()`
`82`	`83`	`{`
`83`		`- return $this->for_auth(Config::get('feather: auth.register_url'));`
	`84`	`+ return $this->for_auth(Config::get('feather: db.auth.register_url'));`
`84`	`85`	`}`
`85`	`86`
`86`	`87`	`/**`
`87`	`88`	`* Create a redirect response before a login.`
`88`	`89`	`*`
`89`	`90`	`* @return object`
`90`	`91`	`*/`
`91`		`- public static function before_login()`
	`92`	`+ public function before_login()`
`92`	`93`	`{`
`93`		`- return $this->for_auth(Config::get('feather: auth.login_url'));`
	`94`	`+ return $this->for_auth(Config::get('feather: db.auth.login_url'));`
`94`	`95`	`}`
`95`	`96`
`96`	`97`	`/**`
`@@ -107,7 +108,7 @@ protected function for_auth($url)`
`107`	`108`	`'{token}' => Auth::online() ? Auth::user()->authenticator_token : null`
`108`	`109`	`);`
`109`	`110`
`110`		`- if(Config::get('feather: auth.driver') == 'internal')`
	`111`	`+ if(Config::get('feather: db.auth.driver') == 'internal')`
`111`	`112`	`{`
`112`	`113`	`$url = URL::to_route('feather');`
`113`	`114`	`}`