View GitHub Repository web

Schedule Inspection
Subscribe
Completed
Push — master ( 43937d...c78172 )
by Jacob
04:00
created
Status
Category
Toggle Patches
router/Router.class.inc.php 1 patch
Braces   +21 added lines, -14 removed lines patch added patch discarded remove patch 
@@ -18,8 +18,9 @@  discard block
 
 block discarded – undo
18 18
19 19 
 	private static function get_router_name()
20 20 
 	{
21 
-		if(Request::isAJAX())
22 
-			return 'AJAXRouter';
21 
+		if(Request::isAJAX()) {
22 
+					return 'AJAXRouter';
23 
+		}
23 24
24 25 
 		switch(URLDecode::getSite())
25 26 
 		{
 
@@ -73,19 +74,22 @@  discard block
 
 block discarded – undo
73 74
74 75 
 		$redirect_uri = $this->check_for_special_redirect($redirect_uri);
75 76
76 
-		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
77 
-			$redirect_uri .= '/';
77 
+		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') {
78 
+					$redirect_uri .= '/';
79 
+		}
78 80
79 81 
         if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
80 82 
             $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
81 83 
         }
82 84
83 
-		if($redirect_uri == URLDecode::getURI())
84 
-			return;
85 
+		if($redirect_uri == URLDecode::getURI()) {
86 
+					return;
87 
+		}
85 88
86 89 
 		$controller_check = $redirect_uri;
87 
-		if(substr($redirect_uri, 0, 4) == 'http')
88 
-			$controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);
90 
+		if(substr($redirect_uri, 0, 4) == 'http') {
91 
+					$controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);
92 
+		}
89 93
90 94 
 		$controller = $this->get_controller($controller_check);
91 95 
 		if($controller == '/Error404Controller')
 
@@ -114,11 +118,13 @@  discard block
 
 block discarded – undo
114 118 
 	{
115 119 
 		foreach($this->get_direct_array() as $check)
116 120 
 		{
117 
-			if($uri == $check->match)
118 
-				return "{$this->get_primary_folder()}/{$check->controller}";
121 
+			if($uri == $check->match) {
122 
+							return "{$this->get_primary_folder()}/{$check->controller}";
123 
+			}
119 124
120 
-			if(preg_match("@^{$check->match}$@", $uri))
121 
-				return "{$this->get_primary_folder()}/{$check->controller}";
125 
+			if(preg_match("@^{$check->match}$@", $uri)) {
126 
+							return "{$this->get_primary_folder()}/{$check->controller}";
127 
+			}
122 128 
 		}
123 129
124 130 
 		return '/Error404Controller';
 
@@ -126,8 +132,9 @@  discard block
 
 block discarded – undo
126 132
127 133 
 	final private function get_primary_folder()
128 134 
 	{
129 
-		if(Request::isAjax())
130 
-			return 'ajax';
135 
+		if(Request::isAjax()) {
136 
+					return 'ajax';
137 
+		}
131 138
132 139 
 		return URLDecode::getSite();
133 140 
 	}
Please login to merge, or discard this patch.