Completed
Push — master ( 67df75...25777a )
by Jacob
09:40 queued 05:17
created
router/WaterfallRouter.class.inc.php 1 patch
Indentation   +62 added lines, -62 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 Loader::load('collector', array(
4
-    'waterfall/LogCollector',
5
-    'waterfall/WaterfallCollector'));
4
+	'waterfall/LogCollector',
5
+	'waterfall/WaterfallCollector'));
6 6
 Loader::load('router', 'Router');
7 7
 
8 8
 class WaterfallRouter extends Router
@@ -26,15 +26,15 @@  discard block
 block discarded – undo
26 26
 			(object) array(
27 27
 				'pattern' => '@^/falls/results(/?)$@',
28 28
 				'replace' => '/falls/'),
29
-            (object) array(
30
-                'pattern' => '@^/log(/?)$@',
31
-                'replace' => '/journal/'),
32
-            (object) array(
33
-                'pattern' => '@^/log/(\d+)(/?)$@',
34
-                'replace' => '/journal/$1'),
35
-            (object) array(
36
-                'pattern' => '@^/map/([^/]+)(/?)$@',
37
-                'replace' => '/map/'),
29
+			(object) array(
30
+				'pattern' => '@^/log(/?)$@',
31
+				'replace' => '/journal/'),
32
+			(object) array(
33
+				'pattern' => '@^/log/(\d+)(/?)$@',
34
+				'replace' => '/journal/$1'),
35
+			(object) array(
36
+				'pattern' => '@^/map/([^/]+)(/?)$@',
37
+				'replace' => '/map/'),
38 38
 			(object) array(
39 39
 				'pattern' => '@^/about/([a-z]*)(/?)$@',
40 40
 				'replace' => '/about/'),
@@ -73,57 +73,57 @@  discard block
 block discarded – undo
73 73
 
74 74
 	protected function check_for_special_redirect($uri)
75 75
 	{
76
-        if (preg_match('@^/falls/([a-z\'-]+)(/?)$@', $uri, $matches)) {
77
-            $alias = $matches[1];
78
-            $alias = str_replace("'", '', $alias);
79
-            $alias .= '-falls';
80
-            $result = WaterfallCollector::getByOldAlias($alias);
81
-            if ($result !== null) {
82
-                return "/{$result->watercourse_alias}/{$result->alias}/";
83
-            } else {
84
-                Loader::loadNew('controller', '/Error404Controller')->activate();
85
-            }
86
-        }
76
+		if (preg_match('@^/falls/([a-z\'-]+)(/?)$@', $uri, $matches)) {
77
+			$alias = $matches[1];
78
+			$alias = str_replace("'", '', $alias);
79
+			$alias .= '-falls';
80
+			$result = WaterfallCollector::getByOldAlias($alias);
81
+			if ($result !== null) {
82
+				return "/{$result->watercourse_alias}/{$result->alias}/";
83
+			} else {
84
+				Loader::loadNew('controller', '/Error404Controller')->activate();
85
+			}
86
+		}
87 87
         
88
-        if (preg_match('@^/photos/([a-z\'-]+)-([^/]+)(/?)$@', $uri, $matches)) {
89
-            $alias = $matches[1];
90
-            $alias = explode('-', $alias);
91
-            array_pop($alias);
92
-            $alias = implode('-', $alias);
93
-            $alias = str_replace("'", '', $alias);
94
-            $alias .= '-falls';
95
-            $result = WaterfallCollector::getByOldAlias($alias);
96
-            if ($result !== null) {
97
-                return "/{$result->watercourse_alias}/{$result->alias}/";
98
-            } else {
99
-                Loader::loadNew('controller', '/Error404Controller')->activate();
100
-            }
101
-        }
88
+		if (preg_match('@^/photos/([a-z\'-]+)-([^/]+)(/?)$@', $uri, $matches)) {
89
+			$alias = $matches[1];
90
+			$alias = explode('-', $alias);
91
+			array_pop($alias);
92
+			$alias = implode('-', $alias);
93
+			$alias = str_replace("'", '', $alias);
94
+			$alias .= '-falls';
95
+			$result = WaterfallCollector::getByOldAlias($alias);
96
+			if ($result !== null) {
97
+				return "/{$result->watercourse_alias}/{$result->alias}/";
98
+			} else {
99
+				Loader::loadNew('controller', '/Error404Controller')->activate();
100
+			}
101
+		}
102 102
         
103
-        if (preg_match('@/log/([a-z]+-\d{2}-\d{4})(/?)$@', $uri, $matches)) {
104
-            $date = $matches[1];
105
-            $date = explode('-', $date);
106
-            $date = mktime(0, 0, 0, date('n', strtotime($date[0])), $date[1], $date[2]);
107
-            $date = date('Y-m-d', $date);
108
-            $result = LogCollector::getByDate($date);
109
-            if ($result !== null) {
110
-                return "/journal/{$result->alias}/";
111
-            } else {
112
-                Loader::loadNew('controller', '/Error404Controller')->activate();
113
-            }
114
-        }
103
+		if (preg_match('@/log/([a-z]+-\d{2}-\d{4})(/?)$@', $uri, $matches)) {
104
+			$date = $matches[1];
105
+			$date = explode('-', $date);
106
+			$date = mktime(0, 0, 0, date('n', strtotime($date[0])), $date[1], $date[2]);
107
+			$date = date('Y-m-d', $date);
108
+			$result = LogCollector::getByDate($date);
109
+			if ($result !== null) {
110
+				return "/journal/{$result->alias}/";
111
+			} else {
112
+				Loader::loadNew('controller', '/Error404Controller')->activate();
113
+			}
114
+		}
115 115
         
116
-        if (preg_match('@/map/([a-z\'-]+)(/?)$@', $uri, $matches)) {
117
-            $alias = $matches[1];
118
-            $alias = str_replace("'", '', $alias);
119
-            $alias .= '-falls';
120
-            $result = WaterfallCollector::getByOldAlias($alias);
121
-            if ($result !== null) {
122
-                return "/map/#{$result->watercourse_alias}/{$result->alias}";
123
-            } else {
124
-                Loader::loadNew('controller', '/Error404Controller')->activate();
125
-            }
126
-        }
116
+		if (preg_match('@/map/([a-z\'-]+)(/?)$@', $uri, $matches)) {
117
+			$alias = $matches[1];
118
+			$alias = str_replace("'", '', $alias);
119
+			$alias .= '-falls';
120
+			$result = WaterfallCollector::getByOldAlias($alias);
121
+			if ($result !== null) {
122
+				return "/map/#{$result->watercourse_alias}/{$result->alias}";
123
+			} else {
124
+				Loader::loadNew('controller', '/Error404Controller')->activate();
125
+			}
126
+		}
127 127
         
128 128
 		return $uri;
129 129
 	}
@@ -164,9 +164,9 @@  discard block
 block discarded – undo
164 164
 			(object) array(
165 165
 				'match' => '/map/',
166 166
 				'controller' => 'MapController'),
167
-            (object) array(
168
-                'match' => '/map/#[a-z-/]+',
169
-                'controller' => 'MapController'),
167
+			(object) array(
168
+				'match' => '/map/#[a-z-/]+',
169
+				'controller' => 'MapController'),
170 170
 			(object) array(
171 171
 				'match' => '/journal/',
172 172
 				'controller' => 'LogListController'),
Please login to merge, or discard this patch.
router/BlogRouter.class.inc.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -45,11 +45,11 @@  discard block
 block discarded – undo
45 45
 
46 46
 	protected function check_for_special_redirect($uri)
47 47
 	{
48
-		if(preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
48
+		if (preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
49 49
 		{
50 50
 			Loader::load('collector', 'blog/PostCollector');
51 51
 			$post = PostCollector::getPostByURI($matches[2]);
52
-			if(!$post)
52
+			if (!$post)
53 53
 			{
54 54
 				Loader::loadNew('controller', '/Error404Controller')
55 55
 					->activate();
@@ -61,21 +61,21 @@  discard block
 block discarded – undo
61 61
 		else
62 62
 		{
63 63
 			$post_uri = URLDecode::getPiece(1);
64
-			if($post_uri !== null)
64
+			if ($post_uri !== null)
65 65
 			{
66 66
 				Loader::load('collector', 'blog/PostCollector');
67 67
 				$post = PostCollector::getPostByURI($post_uri);
68 68
 				
69
-				if($post != false)
69
+				if ($post != false)
70 70
 				{
71 71
 					Loader::load('utility', 'Content');
72 72
 					$uri = Content::instance('URLSafe', "/{$post->category}/{$post->title_url}/")->activate();
73 73
 				}
74 74
 			}
75 75
 		}
76
-		if($uri == '/search/')
76
+		if ($uri == '/search/')
77 77
 		{
78
-			if(Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))
78
+			if (Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))
79 79
 			{
80 80
 				$uri .= Request::getGet('search');
81 81
 				$uri .= '/';
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -57,8 +57,7 @@
 block discarded – undo
57 57
 			
58 58
 			Loader::load('utility', 'Content');
59 59
 			$uri = Content::instance('URLSafe', "/{$post->category}/{$post->title_url}/")->activate();
60
-		}
61
-		else
60
+		} else
62 61
 		{
63 62
 			$post_uri = URLDecode::getPiece(1);
64 63
 			if($post_uri !== null)
Please login to merge, or discard this patch.
router/PortfolioRouter.class.inc.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,12 +27,12 @@
 block discarded – undo
27 27
 
28 28
 	protected function check_for_special_redirect($uri)
29 29
 	{
30
-		if(preg_match('@^/piece/([a-z0-9-]+)(/?)$@', $uri, $matches))
30
+		if (preg_match('@^/piece/([a-z0-9-]+)(/?)$@', $uri, $matches))
31 31
 		{
32 32
 			Loader::load('collector', 'portfolio/PortfolioCollector');
33 33
 			$piece = PortfolioCollector::getPieceByURI($matches[1]);
34 34
 			
35
-			if($piece === null)
35
+			if ($piece === null)
36 36
 			{
37 37
 				Loader::loadNew('controller', '/Error404Controller')
38 38
 					->activate();
Please login to merge, or discard this patch.
router/Router.class.inc.php 3 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -96,9 +96,9 @@  discard block
 block discarded – undo
96 96
 		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
97 97
 			$redirect_uri .= '/';
98 98
 		
99
-        if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
100
-            $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
101
-        }
99
+		if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
100
+			$redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
101
+		}
102 102
         
103 103
 		if($redirect_uri == URLDecode::getURI())
104 104
 			return;
@@ -129,8 +129,8 @@  discard block
 block discarded – undo
129 129
 			}
130 130
 
131 131
 			$image = new ImageOld($file);
132
-        	        if(!$image->isValid()) {
133
-                	        Loader::loadNew('controller', '/Error404Controller')->activate();
132
+					if(!$image->isValid()) {
133
+							Loader::loadNew('controller', '/Error404Controller')->activate();
134 134
 				exit();
135 135
 			}
136 136
 		}
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
 			URLDecode::getExtension() != 'jpg' &&
202 202
 			URLDecode::getExtension() != 'png' &&
203 203
 			URLDecode::getExtension() != 'ico' &&
204
-            strstr(URLDecode::getURI(), '#') === false);
204
+			strstr(URLDecode::getURI(), '#') === false);
205 205
 	}
206 206
 
207 207
 }
Please login to merge, or discard this patch.
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -19,26 +19,26 @@  discard block
 block discarded – undo
19 19
 
20 20
 	private static function get_router_name()
21 21
 	{
22
-		if(Request::isAJAX())
22
+		if (Request::isAJAX())
23 23
 			return 'AJAXRouter';
24
-		if(URLDecode::getURI() == '/robots.txt')
24
+		if (URLDecode::getURI() == '/robots.txt')
25 25
 			return 'RobotRouter';
26
-		if(URLDecode::getURI() == '/sitemap.xml')
26
+		if (URLDecode::getURI() == '/sitemap.xml')
27 27
 			return 'SitemapRouter';
28
-		if(URLDecode::getURI() == '/rss/')
28
+		if (URLDecode::getURI() == '/rss/')
29 29
 			return 'RSSRouter';
30
-		if(URLDecode::getExtension() == 'css')
30
+		if (URLDecode::getExtension() == 'css')
31 31
 			return 'StyleRouter';
32
-		if(URLDecode::getExtension() == 'js')
32
+		if (URLDecode::getExtension() == 'js')
33 33
 			return 'ScriptRouter';
34
-		if(URLDecode::getExtension() == 'ico')
34
+		if (URLDecode::getExtension() == 'ico')
35 35
 			return 'ImageRouter';
36
-		if(URLDecode::getExtension() == 'jpg')
36
+		if (URLDecode::getExtension() == 'jpg')
37 37
 			return 'ImageRouter';
38
-		if(URLDecode::getExtension() == 'png')
38
+		if (URLDecode::getExtension() == 'png')
39 39
 			return 'ImageRouter';
40 40
 		
41
-		switch(URLDecode::getSite())
41
+		switch (URLDecode::getSite())
42 42
 		{
43 43
 			case 'ajax' :
44 44
 				return 'AjaxRouter';
@@ -86,37 +86,37 @@  discard block
 block discarded – undo
86 86
 
87 87
 	final protected function check_for_redirect($redirect_uri)
88 88
 	{
89
-		foreach($this->get_redirect_array() as $check)
89
+		foreach ($this->get_redirect_array() as $check)
90 90
 		{
91 91
 			$redirect_uri = preg_replace($check->pattern, $check->replace, $redirect_uri);
92 92
 		}
93 93
 		
94 94
 		$redirect_uri = $this->check_for_special_redirect($redirect_uri);
95 95
 		
96
-		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
96
+		if ($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
97 97
 			$redirect_uri .= '/';
98 98
 		
99 99
         if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
100 100
             $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
101 101
         }
102 102
         
103
-		if($redirect_uri == URLDecode::getURI())
103
+		if ($redirect_uri == URLDecode::getURI())
104 104
 			return;
105 105
 		
106 106
 		$controller_check = $redirect_uri;
107
-		if(substr($redirect_uri, 0, 4) == 'http')
107
+		if (substr($redirect_uri, 0, 4) == 'http')
108 108
 			$controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);
109 109
 		
110 110
 		$controller = $this->get_controller($controller_check);
111
-		if($controller == '/Error404Controller')
111
+		if ($controller == '/Error404Controller')
112 112
 		{
113 113
 			Loader::loadNew('controller', '/Error404Controller')
114 114
 				->activate();
115 115
 			exit;
116 116
 		}
117 117
 
118
-		if($this->get_primary_folder() == 'images') {
119
-			$file = $controller_check;//URLDecode::getURI();
118
+		if ($this->get_primary_folder() == 'images') {
119
+			$file = $controller_check; //URLDecode::getURI();
120 120
 
121 121
 			if (
122 122
 				URLDecode::getSite() == 'images' ||
@@ -129,13 +129,13 @@  discard block
 block discarded – undo
129 129
 			}
130 130
 
131 131
 			$image = new ImageOld($file);
132
-        	        if(!$image->isValid()) {
132
+        	        if (!$image->isValid()) {
133 133
                 	        Loader::loadNew('controller', '/Error404Controller')->activate();
134 134
 				exit();
135 135
 			}
136 136
 		}
137 137
 		
138
-		if(substr($redirect_uri, 0, 4) != 'http')
138
+		if (substr($redirect_uri, 0, 4) != 'http')
139 139
 		{
140 140
 			$redirect_uri = substr($redirect_uri, 1);
141 141
 			$redirect_uri = URLDecode::getBase() . $redirect_uri;
@@ -152,12 +152,12 @@  discard block
 block discarded – undo
152 152
 
153 153
 	final private function get_controller($uri)
154 154
 	{
155
-		foreach($this->get_direct_array() as $check)
155
+		foreach ($this->get_direct_array() as $check)
156 156
 		{
157
-			if($uri == $check->match)
157
+			if ($uri == $check->match)
158 158
 				return "{$this->get_primary_folder()}/{$check->controller}";
159 159
 			
160
-			if(preg_match("@^{$check->match}$@", $uri))
160
+			if (preg_match("@^{$check->match}$@", $uri))
161 161
 				return "{$this->get_primary_folder()}/{$check->controller}";
162 162
 		}
163 163
 		
@@ -166,19 +166,19 @@  discard block
 block discarded – undo
166 166
 
167 167
 	final private function get_primary_folder()
168 168
 	{
169
-		if(Request::isAjax())
169
+		if (Request::isAjax())
170 170
 			return 'ajax';
171
-		if(URLDecode::getURI() == '/robots.txt')
171
+		if (URLDecode::getURI() == '/robots.txt')
172 172
 			return 'robot';
173
-		if(URLDecode::getURI() == '/sitemap.xml')
173
+		if (URLDecode::getURI() == '/sitemap.xml')
174 174
 			return 'sitemap';
175
-		if(URLDecode::getURI() == '/rss/')
175
+		if (URLDecode::getURI() == '/rss/')
176 176
 			return 'rss';
177
-		if(URLDecode::getExtension() == 'css')
177
+		if (URLDecode::getExtension() == 'css')
178 178
 			return 'styles';
179
-		if(URLDecode::getExtension() == 'js')
179
+		if (URLDecode::getExtension() == 'js')
180 180
 			return 'scripts';
181
-		if(
181
+		if (
182 182
 			URLDecode::getExtension() == 'jpg' ||
183 183
 			URLDecode::getExtension() == 'ico' ||
184 184
 			URLDecode::getExtension() == 'png')
Please login to merge, or discard this patch.
Braces   +63 added lines, -42 removed lines patch added patch discarded remove patch
@@ -19,24 +19,33 @@  discard block
 block discarded – undo
19 19
 
20 20
 	private static function get_router_name()
21 21
 	{
22
-		if(Request::isAJAX())
23
-			return 'AJAXRouter';
24
-		if(URLDecode::getURI() == '/robots.txt')
25
-			return 'RobotRouter';
26
-		if(URLDecode::getURI() == '/sitemap.xml')
27
-			return 'SitemapRouter';
28
-		if(URLDecode::getURI() == '/rss/')
29
-			return 'RSSRouter';
30
-		if(URLDecode::getExtension() == 'css')
31
-			return 'StyleRouter';
32
-		if(URLDecode::getExtension() == 'js')
33
-			return 'ScriptRouter';
34
-		if(URLDecode::getExtension() == 'ico')
35
-			return 'ImageRouter';
36
-		if(URLDecode::getExtension() == 'jpg')
37
-			return 'ImageRouter';
38
-		if(URLDecode::getExtension() == 'png')
39
-			return 'ImageRouter';
22
+		if(Request::isAJAX()) {
23
+					return 'AJAXRouter';
24
+		}
25
+		if(URLDecode::getURI() == '/robots.txt') {
26
+					return 'RobotRouter';
27
+		}
28
+		if(URLDecode::getURI() == '/sitemap.xml') {
29
+					return 'SitemapRouter';
30
+		}
31
+		if(URLDecode::getURI() == '/rss/') {
32
+					return 'RSSRouter';
33
+		}
34
+		if(URLDecode::getExtension() == 'css') {
35
+					return 'StyleRouter';
36
+		}
37
+		if(URLDecode::getExtension() == 'js') {
38
+					return 'ScriptRouter';
39
+		}
40
+		if(URLDecode::getExtension() == 'ico') {
41
+					return 'ImageRouter';
42
+		}
43
+		if(URLDecode::getExtension() == 'jpg') {
44
+					return 'ImageRouter';
45
+		}
46
+		if(URLDecode::getExtension() == 'png') {
47
+					return 'ImageRouter';
48
+		}
40 49
 		
41 50
 		switch(URLDecode::getSite())
42 51
 		{
@@ -93,19 +102,22 @@  discard block
 block discarded – undo
93 102
 		
94 103
 		$redirect_uri = $this->check_for_special_redirect($redirect_uri);
95 104
 		
96
-		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
97
-			$redirect_uri .= '/';
105
+		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') {
106
+					$redirect_uri .= '/';
107
+		}
98 108
 		
99 109
         if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
100 110
             $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
101 111
         }
102 112
         
103
-		if($redirect_uri == URLDecode::getURI())
104
-			return;
113
+		if($redirect_uri == URLDecode::getURI()) {
114
+					return;
115
+		}
105 116
 		
106 117
 		$controller_check = $redirect_uri;
107
-		if(substr($redirect_uri, 0, 4) == 'http')
108
-			$controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);
118
+		if(substr($redirect_uri, 0, 4) == 'http') {
119
+					$controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);
120
+		}
109 121
 		
110 122
 		$controller = $this->get_controller($controller_check);
111 123
 		if($controller == '/Error404Controller')
@@ -154,11 +166,13 @@  discard block
 block discarded – undo
154 166
 	{
155 167
 		foreach($this->get_direct_array() as $check)
156 168
 		{
157
-			if($uri == $check->match)
158
-				return "{$this->get_primary_folder()}/{$check->controller}";
169
+			if($uri == $check->match) {
170
+							return "{$this->get_primary_folder()}/{$check->controller}";
171
+			}
159 172
 			
160
-			if(preg_match("@^{$check->match}$@", $uri))
161
-				return "{$this->get_primary_folder()}/{$check->controller}";
173
+			if(preg_match("@^{$check->match}$@", $uri)) {
174
+							return "{$this->get_primary_folder()}/{$check->controller}";
175
+			}
162 176
 		}
163 177
 		
164 178
 		return '/Error404Controller';
@@ -166,23 +180,30 @@  discard block
 block discarded – undo
166 180
 
167 181
 	final private function get_primary_folder()
168 182
 	{
169
-		if(Request::isAjax())
170
-			return 'ajax';
171
-		if(URLDecode::getURI() == '/robots.txt')
172
-			return 'robot';
173
-		if(URLDecode::getURI() == '/sitemap.xml')
174
-			return 'sitemap';
175
-		if(URLDecode::getURI() == '/rss/')
176
-			return 'rss';
177
-		if(URLDecode::getExtension() == 'css')
178
-			return 'styles';
179
-		if(URLDecode::getExtension() == 'js')
180
-			return 'scripts';
183
+		if(Request::isAjax()) {
184
+					return 'ajax';
185
+		}
186
+		if(URLDecode::getURI() == '/robots.txt') {
187
+					return 'robot';
188
+		}
189
+		if(URLDecode::getURI() == '/sitemap.xml') {
190
+					return 'sitemap';
191
+		}
192
+		if(URLDecode::getURI() == '/rss/') {
193
+					return 'rss';
194
+		}
195
+		if(URLDecode::getExtension() == 'css') {
196
+					return 'styles';
197
+		}
198
+		if(URLDecode::getExtension() == 'js') {
199
+					return 'scripts';
200
+		}
181 201
 		if(
182 202
 			URLDecode::getExtension() == 'jpg' ||
183 203
 			URLDecode::getExtension() == 'ico' ||
184
-			URLDecode::getExtension() == 'png')
185
-			return 'images';
204
+			URLDecode::getExtension() == 'png') {
205
+					return 'images';
206
+		}
186 207
 		
187 208
 		return URLDecode::getSite();
188 209
 	}
Please login to merge, or discard this patch.
router/mymap.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,6 +20,6 @@
 block discarded – undo
20 20
 	)
21 21
 );
22 22
 
23
-Router::route($redirect,$direct);
23
+Router::route($redirect, $direct);
24 24
 
25 25
 ?>
26 26
\ No newline at end of file
Please login to merge, or discard this patch.
router/map.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,6 +26,6 @@
 block discarded – undo
26 26
 	)
27 27
 );
28 28
 
29
-Router::route($redirect,$direct);
29
+Router::route($redirect, $direct);
30 30
 
31 31
 ?>
32 32
\ No newline at end of file
Please login to merge, or discard this patch.
router/SitemapRouter.class.inc.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -16,9 +16,9 @@
 block discarded – undo
16 16
 	protected function get_direct_array()
17 17
 	{
18 18
 		$site = URLDecode::getSite();
19
-        if ($site == 'waterfalls') {
20
-            $site = 'waterfall';
21
-        }
19
+		if ($site == 'waterfalls') {
20
+			$site = 'waterfall';
21
+		}
22 22
 		$site = ucwords($site);
23 23
 		
24 24
 		return array(
Please login to merge, or discard this patch.
collector/comment/CommentCollector.class.inc.php 3 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -114,9 +114,9 @@  discard block
 block discarded – undo
114 114
 		return self::run_query($query);
115 115
 	}
116 116
 
117
-    public static function getRecentWaterfallComments($count = 5)
118
-    {
119
-        $query = "
117
+	public static function getRecentWaterfallComments($count = 5)
118
+	{
119
+		$query = "
120 120
             SELECT
121 121
                 `comment_meta`.`id`,
122 122
                 CONCAT('journal/', `log`.`alias`) AS `log_path`,
@@ -156,8 +156,8 @@  discard block
 block discarded – undo
156 156
                 `comment_meta`.`date` DESC
157 157
             LIMIT {$count}";
158 158
         
159
-        return self::run_query($query);
160
-    }
159
+		return self::run_query($query);
160
+	}
161 161
 
162 162
 	public static function getCommentsForURL($site, $path, $commenter = 0)
163 163
 	{
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -163,7 +163,7 @@
 block discarded – undo
163 163
 	{
164 164
 		$path = self::escape($path);
165 165
 		
166
-		if($commenter != 0)
166
+		if ($commenter != 0)
167 167
 			$trusted_commenter_clause = "(`commenter`.`trusted` = '1' || `commenter`.`id` = '{$commenter}')";
168 168
 		else
169 169
 			$trusted_commenter_clause = "`commenter`.`trusted` = '1'";
Please login to merge, or discard this patch.
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -163,10 +163,11 @@
 block discarded – undo
163 163
 	{
164 164
 		$path = self::escape($path);
165 165
 		
166
-		if($commenter != 0)
167
-			$trusted_commenter_clause = "(`commenter`.`trusted` = '1' || `commenter`.`id` = '{$commenter}')";
168
-		else
169
-			$trusted_commenter_clause = "`commenter`.`trusted` = '1'";
166
+		if($commenter != 0) {
167
+					$trusted_commenter_clause = "(`commenter`.`trusted` = '1' || `commenter`.`id` = '{$commenter}')";
168
+		} else {
169
+					$trusted_commenter_clause = "`commenter`.`trusted` = '1'";
170
+		}
170 171
 		
171 172
 		$query = "
172 173
 			SELECT
Please login to merge, or discard this patch.
collector/waterfall/WaterfallCollector.class.inc.php 1 patch
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -43,9 +43,9 @@  discard block
 block discarded – undo
43 43
 		return self::run_query($query);
44 44
 	}
45 45
 
46
-    public static function getMapList()
47
-    {
48
-        $query = "
46
+	public static function getMapList()
47
+	{
48
+		$query = "
49 49
             SELECT
50 50
                 `waterfall`.`name`,
51 51
                 `waterfall`.`alias`,
@@ -71,8 +71,8 @@  discard block
 block discarded – undo
71 71
             ORDER BY
72 72
                 `waterfall`.`name`";
73 73
         
74
-        return self::run_query($query);
75
-    }
74
+		return self::run_query($query);
75
+	}
76 76
 
77 77
 	public static function getListCount()
78 78
 	{
@@ -92,9 +92,9 @@  discard block
 block discarded – undo
92 92
 		return self::get_count($query);
93 93
 	}
94 94
 
95
-    public static function getNearbyList($waterfall)
96
-    {
97
-        $query = "
95
+	public static function getNearbyList($waterfall)
96
+	{
97
+		$query = "
98 98
             SELECT
99 99
                 `waterfall`.`name`,
100 100
                 `waterfall`.`alias` AS `alias`,
@@ -114,14 +114,14 @@  discard block
 block discarded – undo
114 114
                 `waterfall`.`name`,
115 115
                 `watercourse`.`name`";
116 116
         
117
-        return self::run_query($query);
118
-    }
117
+		return self::run_query($query);
118
+	}
119 119
 
120
-    public static function getByOldAlias($alias)
121
-    {
122
-        $alias = self::escape($alias);
120
+	public static function getByOldAlias($alias)
121
+	{
122
+		$alias = self::escape($alias);
123 123
         
124
-        $query = "
124
+		$query = "
125 125
             SELECT
126 126
                 `waterfall`.`alias`,
127 127
                 `watercourse`.`alias` AS `watercourse_alias`
@@ -134,8 +134,8 @@  discard block
 block discarded – undo
134 134
                 `waterfall`.`is_public` = '1'
135 135
             LIMIT 1";
136 136
         
137
-        return self::run_row_query($query);
138
-    }
137
+		return self::run_row_query($query);
138
+	}
139 139
 
140 140
 	public static function getByAlias($watercourse, $waterfall)
141 141
 	{
Please login to merge, or discard this patch.