Completed
Push — master ( ad16ce...5852b3 )
by Jacob
07:53
created
router/Router.class.inc.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -18,14 +18,14 @@  discard block
 block discarded – undo
18 18
 
19 19
 	private static function get_router_name()
20 20
 	{
21
-		if(Request::isAJAX())
21
+		if (Request::isAJAX())
22 22
 			return 'AJAXRouter';
23
-		if(URLDecode::getURI() == '/sitemap.xml')
23
+		if (URLDecode::getURI() == '/sitemap.xml')
24 24
 			return 'SitemapRouter';
25
-		if(URLDecode::getURI() == '/rss/')
25
+		if (URLDecode::getURI() == '/rss/')
26 26
 			return 'RSSRouter';
27 27
 		
28
-		switch(URLDecode::getSite())
28
+		switch (URLDecode::getSite())
29 29
 		{
30 30
 			case 'ajax' :
31 31
 				return 'AjaxRouter';
@@ -70,36 +70,36 @@  discard block
 block discarded – undo
70 70
 
71 71
 	final protected function check_for_redirect($redirect_uri)
72 72
 	{
73
-		foreach($this->get_redirect_array() as $check)
73
+		foreach ($this->get_redirect_array() as $check)
74 74
 		{
75 75
 			$redirect_uri = preg_replace($check->pattern, $check->replace, $redirect_uri);
76 76
 		}
77 77
 		
78 78
 		$redirect_uri = $this->check_for_special_redirect($redirect_uri);
79 79
 		
80
-		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
80
+		if ($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
81 81
 			$redirect_uri .= '/';
82 82
 		
83 83
         if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
84 84
             $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
85 85
         }
86 86
         
87
-		if($redirect_uri == URLDecode::getURI())
87
+		if ($redirect_uri == URLDecode::getURI())
88 88
 			return;
89 89
 		
90 90
 		$controller_check = $redirect_uri;
91
-		if(substr($redirect_uri, 0, 4) == 'http')
91
+		if (substr($redirect_uri, 0, 4) == 'http')
92 92
 			$controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);
93 93
 		
94 94
 		$controller = $this->get_controller($controller_check);
95
-		if($controller == '/Error404Controller')
95
+		if ($controller == '/Error404Controller')
96 96
 		{
97 97
 			Loader::loadNew('controller', '/Error404Controller')
98 98
 				->activate();
99 99
 			exit;
100 100
 		}
101 101
 
102
-		if(substr($redirect_uri, 0, 4) != 'http')
102
+		if (substr($redirect_uri, 0, 4) != 'http')
103 103
 		{
104 104
 			$redirect_uri = substr($redirect_uri, 1);
105 105
 			$redirect_uri = URLDecode::getBase() . $redirect_uri;
@@ -116,12 +116,12 @@  discard block
 block discarded – undo
116 116
 
117 117
 	final private function get_controller($uri)
118 118
 	{
119
-		foreach($this->get_direct_array() as $check)
119
+		foreach ($this->get_direct_array() as $check)
120 120
 		{
121
-			if($uri == $check->match)
121
+			if ($uri == $check->match)
122 122
 				return "{$this->get_primary_folder()}/{$check->controller}";
123 123
 			
124
-			if(preg_match("@^{$check->match}$@", $uri))
124
+			if (preg_match("@^{$check->match}$@", $uri))
125 125
 				return "{$this->get_primary_folder()}/{$check->controller}";
126 126
 		}
127 127
 		
@@ -130,11 +130,11 @@  discard block
 block discarded – undo
130 130
 
131 131
 	final private function get_primary_folder()
132 132
 	{
133
-		if(Request::isAjax())
133
+		if (Request::isAjax())
134 134
 			return 'ajax';
135
-		if(URLDecode::getURI() == '/sitemap.xml')
135
+		if (URLDecode::getURI() == '/sitemap.xml')
136 136
 			return 'sitemap';
137
-		if(URLDecode::getURI() == '/rss/')
137
+		if (URLDecode::getURI() == '/rss/')
138 138
 			return 'rss';
139 139
 		
140 140
 		return URLDecode::getSite();
Please login to merge, or discard this patch.