Completed
Push — master ( 3f527d...65c0bb )
by Jacob
21:28 queued 04:35
created
router/Router.class.inc.php 1 patch
Braces   +18 added lines, -12 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
 		{
@@ -72,16 +73,18 @@  discard block
 block discarded – undo
72 73
 		
73 74
 		$redirect_uri = $this->check_for_special_redirect($redirect_uri);
74 75
 		
75
-		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
76
-			$redirect_uri .= '/';
76
+		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') {
77
+					$redirect_uri .= '/';
78
+		}
77 79
 		
78 80
         if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
79 81
             $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
80 82
             $redirect_uri = $protocol . '://' . (!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 90
 		if(substr($redirect_uri, 0, 4) == 'http') {
@@ -115,11 +118,13 @@  discard block
 block discarded – undo
115 118
 	{
116 119
 		foreach($this->get_direct_array() as $check)
117 120
 		{
118
-			if($uri == $check->match)
119
-				return "{$this->get_primary_folder()}/{$check->controller}";
121
+			if($uri == $check->match) {
122
+							return "{$this->get_primary_folder()}/{$check->controller}";
123
+			}
120 124
 			
121
-			if(preg_match("@^{$check->match}$@", $uri))
122
-				return "{$this->get_primary_folder()}/{$check->controller}";
125
+			if(preg_match("@^{$check->match}$@", $uri)) {
126
+							return "{$this->get_primary_folder()}/{$check->controller}";
127
+			}
123 128
 		}
124 129
 		
125 130
 		return '/Error404Controller';
@@ -127,8 +132,9 @@  discard block
 block discarded – undo
127 132
 
128 133
 	final private function get_primary_folder()
129 134
 	{
130
-		if(Request::isAjax())
131
-			return 'ajax';
135
+		if(Request::isAjax()) {
136
+					return 'ajax';
137
+		}
132 138
 		
133 139
 		return URLDecode::getSite();
134 140
 	}
Please login to merge, or discard this patch.