Completed
Push — master ( b71929...bf05f4 )
by Jacob
10:14
created
controller/PageController.class.inc.php 1 patch
Braces   +37 added lines, -27 removed lines patch added patch discarded remove patch
@@ -102,10 +102,11 @@  discard block
 block discarded – undo
102 102
 		Loader::load('view', '/Head', $this->data_array['head']);
103 103
 		foreach($this->body_view_array as $view)
104 104
 		{
105
-			if(substr($view, 0, 1) == '/')
106
-				Loader::load('view', $view, $this->data_array['body']);
107
-			else
108
-				Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
105
+			if(substr($view, 0, 1) == '/') {
106
+							Loader::load('view', $view, $this->data_array['body']);
107
+			} else {
108
+							Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
109
+			}
109 110
 		}
110 111
         
111 112
         if (URLDecode::getSite() == 'waterfalls') {
@@ -114,8 +115,9 @@  discard block
 block discarded – undo
114 115
             Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
115 116
         }
116 117
 		
117
-		if($view == '/404' || $view == '/503')
118
-			exit;
118
+		if($view == '/404' || $view == '/503') {
119
+					exit;
120
+		}
119 121
 	}
120 122
 
121 123
 	protected function set_header_method($method)
@@ -195,14 +197,16 @@  discard block
 block discarded – undo
195 197
 
196 198
 	protected function eject()
197 199
 	{
198
-		if(get_class($this) !== 'Error404Controller')
199
-			Loader::loadNew('controller', '/Error404Controller')->activate();
200
+		if(get_class($this) !== 'Error404Controller') {
201
+					Loader::loadNew('controller', '/Error404Controller')->activate();
202
+		}
200 203
 	}
201 204
 
202 205
 	protected function unavailable()
203 206
 	{
204
-		if(get_class($this) !== 'Error503Controller')
205
-			Loader::loadNew('controller', '/Error503Controller')->activate();
207
+		if(get_class($this) !== 'Error503Controller') {
208
+					Loader::loadNew('controller', '/Error503Controller')->activate();
209
+		}
206 210
 	}
207 211
 
208 212
 	protected function redirect($uri, $method = 301)
@@ -210,12 +214,14 @@  discard block
 block discarded – undo
210 214
 		switch($method)
211 215
 		{
212 216
 			case 301 :
213
-				if(get_class($this) !== 'Error301Controller')
214
-					Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();
217
+				if(get_class($this) !== 'Error301Controller') {
218
+									Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();
219
+				}
215 220
 				break;
216 221
 			case 303 :
217
-				if(get_class($this) !== 'Error303Controller')
218
-					Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();
222
+				if(get_class($this) !== 'Error303Controller') {
223
+									Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();
224
+				}
219 225
 				break;
220 226
 		}
221 227
 	}
@@ -262,18 +268,19 @@  discard block
 block discarded – undo
262 268
 			$comment_object->url = $comment->url;
263 269
 			$comment_object->trusted = $comment->trusted;
264 270
 			
265
-			if($comment->reply == 0 && Request::getPost('type') == $comment->id)
266
-				$comment_object->errors = $this->comment_errors;
267
-			else
268
-				$comment_object->errors = array();
271
+			if($comment->reply == 0 && Request::getPost('type') == $comment->id) {
272
+							$comment_object->errors = $this->comment_errors;
273
+			} else {
274
+							$comment_object->errors = array();
275
+			}
269 276
 			
270 277
 			if($comment->reply == 0)
271 278
 			{
272 279
 				$comment_object->replies = array();
273 280
 				$comment_array[$comment->id] = $comment_object;
274
-			}
275
-			else
276
-				$comment_array[$comment->reply]->replies[$comment->id] = $comment_object;
281
+			} else {
282
+							$comment_array[$comment->reply]->replies[$comment->id] = $comment_object;
283
+			}
277 284
 		}
278 285
 		
279 286
 		$comment_count = CommentCollector::getCommentCountForURL($site, $path);
@@ -302,16 +309,19 @@  discard block
 block discarded – undo
302 309
 
303 310
 		$commenter_cookie_value = json_decode($_COOKIE['commenter']);
304 311
 		
305
-		if($commenter_cookie_value === NULL)
306
-			return $commenter;
312
+		if($commenter_cookie_value === NULL) {
313
+					return $commenter;
314
+		}
307 315
 		
308
-		if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email))
309
-			return $commenter;
316
+		if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email)) {
317
+					return $commenter;
318
+		}
310 319
 		
311 320
 		$commenter_object = CommentCollector::getCommenterByFields($commenter_cookie_value->name, $commenter_cookie_value->email, (isset($commenter_cookie_value->website) ? $commenter_cookie_value->website : ''));
312 321
 		
313
-		if($commenter_object === NULL)
314
-			return $commenter;
322
+		if($commenter_object === NULL) {
323
+					return $commenter;
324
+		}
315 325
 		
316 326
 		$commenter->id = $commenter_object->id;
317 327
 		$commenter->name = $commenter_object->name;
Please login to merge, or discard this patch.