Completed
Push — master ( ec656c...4bc6db )
by Jacob
04:58
created
collector/comment/CommentCollector.class.inc.php 1 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.
controller/PageController.class.inc.php 1 patch
Braces   +75 added lines, -56 removed lines patch added patch discarded remove patch
@@ -40,8 +40,9 @@  discard block
 block discarded – undo
40 40
 			'date' => date('Y')));
41 41
 		
42 42
 		Loader::loadInstance('utility', 'Database');
43
-		if(Database::isConnected() === false)
44
-			$this->unavailable();
43
+		if(Database::isConnected() === false) {
44
+					$this->unavailable();
45
+		}
45 46
 	}
46 47
 
47 48
 	protected function get_domain_container()
@@ -97,8 +98,9 @@  discard block
 block discarded – undo
97 98
 				$post->title = "Blogged about {$category}: <a href=\"{$row->url}\">{$row->title}</a>.";
98 99
 				$post->comments = $row->comments;
99 100
 				
100
-				if($format == 'full')
101
-					$post->image = Content::instance('FetchFirstPhoto', $row->body)->activate(false, 'standard');
101
+				if($format == 'full') {
102
+									$post->image = Content::instance('FetchFirstPhoto', $row->body)->activate(false, 'standard');
103
+				}
102 104
 			break;
103 105
 			case 'book' :
104 106
 				$row = BookCollector::getRow($raw_post->type_id);
@@ -106,8 +108,9 @@  discard block
 block discarded – undo
106 108
 				$post->type = 'book';
107 109
 				$post->title = "Just finished reading {$row->title} by {$row->author}.";
108 110
 				
109
-				if($format == 'full')
110
-					$post->image = "<img alt=\"{$row->title} by {$row->author}\" src=\"{$row->image}\" />";
111
+				if($format == 'full') {
112
+									$post->image = "<img alt=\"{$row->title} by {$row->author}\" src=\"{$row->image}\" />";
113
+				}
111 114
 			break;
112 115
 			case 'distance' :
113 116
 				$row = DistanceCollector::getRow($raw_post->type_id);
@@ -116,16 +119,16 @@  discard block
 block discarded – undo
116 119
 				if($row->type == 'running')
117 120
 				{
118 121
 					$post->title = "Ran {$row->distance} miles and felt {$row->felt}.";
119
-					if(strlen($row->message) > 0)
120
-						$post->title .= " Afterwards, I was all like '{$row->message}'.";
121
-				}
122
-				else if($row->type == 'hiking')
122
+					if(strlen($row->message) > 0) {
123
+											$post->title .= " Afterwards, I was all like '{$row->message}'.";
124
+					}
125
+				} else if($row->type == 'hiking')
123 126
 				{
124 127
 					$post->title = "Hiked {$row->distance} miles and felt {$row->felt}.";
125
-					if(strlen($row->title) > 0)
126
-						$post->title .= " I was hiking up around the {$row->title} area.";
127
-				}
128
-                else if ($row->type == 'walking') {
128
+					if(strlen($row->title) > 0) {
129
+											$post->title .= " I was hiking up around the {$row->title} area.";
130
+					}
131
+				} else if ($row->type == 'walking') {
129 132
                     $post->title = "Walked {$row->distance} miles and felt {$row->felt}.";
130 133
                 }
131 134
 			break;
@@ -140,10 +143,11 @@  discard block
 block discarded – undo
140 143
 				
141 144
 				$post->type = 'twitter';
142 145
 				
143
-				if($format == 'full')
144
-					$post->title = $row->text_formatted_full;
145
-				else
146
-					$post->title = $row->text_formatted;
146
+				if($format == 'full') {
147
+									$post->title = $row->text_formatted_full;
148
+				} else {
149
+									$post->title = $row->text_formatted;
150
+				}
147 151
 				
148 152
 				$post->retweets = ($row->is_retweet == 0) ? $row->retweets : 0;
149 153
 				$post->favorites = ($row->is_retweet == 0) ? $row->favorites : 0;
@@ -153,13 +157,15 @@  discard block
 block discarded – undo
153 157
 				
154 158
 				$post->type = 'youtube';
155 159
 				
156
-				if($format == 'full')
157
-					$post->title = "Favorited {$row->title} by {$row->author} on YouTube.";
158
-				else
159
-					$post->title = "Favorited <a href=\"http://www.youtube.com/watch?feature=player_embedded&v={$row->video_id}\" rel=\"nofollow\" target=\"_blank\" title=\"{$row->content}\">{$row->title}</a> by {$row->author} on YouTube.";
160
+				if($format == 'full') {
161
+									$post->title = "Favorited {$row->title} by {$row->author} on YouTube.";
162
+				} else {
163
+									$post->title = "Favorited <a href=\"http://www.youtube.com/watch?feature=player_embedded&v={$row->video_id}\" rel=\"nofollow\" target=\"_blank\" title=\"{$row->content}\">{$row->title}</a> by {$row->author} on YouTube.";
164
+				}
160 165
 				
161
-				if($format == 'full')
162
-					$post->embed_code = "<iframe src=\"http://www.youtube.com/embed/{$row->video_id}?rel=0\" frameborder=\"0\" allowfullscreen></iframe>";
166
+				if($format == 'full') {
167
+									$post->embed_code = "<iframe src=\"http://www.youtube.com/embed/{$row->video_id}?rel=0\" frameborder=\"0\" allowfullscreen></iframe>";
168
+				}
163 169
 			break;
164 170
 		}
165 171
 		
@@ -188,10 +194,11 @@  discard block
 block discarded – undo
188 194
 		Loader::load('view', '/Head', $this->data_array['head']);
189 195
 		foreach($this->body_view_array as $view)
190 196
 		{
191
-			if(substr($view, 0, 1) == '/')
192
-				Loader::load('view', $view, $this->data_array['body']);
193
-			else
194
-				Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
197
+			if(substr($view, 0, 1) == '/') {
198
+							Loader::load('view', $view, $this->data_array['body']);
199
+			} else {
200
+							Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
201
+			}
195 202
 		}
196 203
         
197 204
         if (URLDecode::getSite() == 'waterfalls') {
@@ -200,8 +207,9 @@  discard block
 block discarded – undo
200 207
             Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
201 208
         }
202 209
 		
203
-		if($view == '/404' || $view == '/503')
204
-			exit;
210
+		if($view == '/404' || $view == '/503') {
211
+					exit;
212
+		}
205 213
 	}
206 214
 
207 215
 	protected function set_header_method($method)
@@ -261,11 +269,13 @@  discard block
 block discarded – undo
261 269
 		
262 270
 		$js_array = array();
263 271
 		
264
-		if(count($this->js_array) > 0)
265
-			$js_array = array_merge($js_array, $this->js_array);
272
+		if(count($this->js_array) > 0) {
273
+					$js_array = array_merge($js_array, $this->js_array);
274
+		}
266 275
 		
267
-		if(count($js_array) > 0)
268
-			$js_array = Asset::getJS($js_array);
276
+		if(count($js_array) > 0) {
277
+					$js_array = Asset::getJS($js_array);
278
+		}
269 279
 		
270 280
 		$this->set_head('css_link_array', $css_array);
271 281
 		$this->set_head('js_link_array', $js_array);
@@ -278,14 +288,16 @@  discard block
 block discarded – undo
278 288
 
279 289
 	protected function eject()
280 290
 	{
281
-		if(get_class($this) !== 'Error404Controller')
282
-			Loader::loadNew('controller', '/Error404Controller')->activate();
291
+		if(get_class($this) !== 'Error404Controller') {
292
+					Loader::loadNew('controller', '/Error404Controller')->activate();
293
+		}
283 294
 	}
284 295
 
285 296
 	protected function unavailable()
286 297
 	{
287
-		if(get_class($this) !== 'Error503Controller')
288
-			Loader::loadNew('controller', '/Error503Controller')->activate();
298
+		if(get_class($this) !== 'Error503Controller') {
299
+					Loader::loadNew('controller', '/Error503Controller')->activate();
300
+		}
289 301
 	}
290 302
 
291 303
 	protected function redirect($uri, $method = 301)
@@ -293,12 +305,14 @@  discard block
 block discarded – undo
293 305
 		switch($method)
294 306
 		{
295 307
 			case 301 :
296
-				if(get_class($this) !== 'Error301Controller')
297
-					Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();
308
+				if(get_class($this) !== 'Error301Controller') {
309
+									Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();
310
+				}
298 311
 				break;
299 312
 			case 303 :
300
-				if(get_class($this) !== 'Error303Controller')
301
-					Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();
313
+				if(get_class($this) !== 'Error303Controller') {
314
+									Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();
315
+				}
302 316
 				break;
303 317
 		}
304 318
 	}
@@ -345,18 +359,19 @@  discard block
 block discarded – undo
345 359
 			$comment_object->url = $comment->url;
346 360
 			$comment_object->trusted = $comment->trusted;
347 361
 			
348
-			if($comment->reply == 0 && Request::getPost('type') == $comment->id)
349
-				$comment_object->errors = $this->comment_errors;
350
-			else
351
-				$comment_object->errors = array();
362
+			if($comment->reply == 0 && Request::getPost('type') == $comment->id) {
363
+							$comment_object->errors = $this->comment_errors;
364
+			} else {
365
+							$comment_object->errors = array();
366
+			}
352 367
 			
353 368
 			if($comment->reply == 0)
354 369
 			{
355 370
 				$comment_object->replies = array();
356 371
 				$comment_array[$comment->id] = $comment_object;
372
+			} else {
373
+							$comment_array[$comment->reply]->replies[$comment->id] = $comment_object;
357 374
 			}
358
-			else
359
-				$comment_array[$comment->reply]->replies[$comment->id] = $comment_object;
360 375
 		}
361 376
 		
362 377
 		$comment_count = CommentCollector::getCommentCountForURL($site, $path);
@@ -381,22 +396,26 @@  discard block
 block discarded – undo
381 396
 		$commenter->website = '';
382 397
 		
383 398
 		$commenter_cookie = Cookie::instance('Commenter');
384
-		if(!$commenter_cookie->exists())
385
-			return $commenter;
399
+		if(!$commenter_cookie->exists()) {
400
+					return $commenter;
401
+		}
386 402
 		
387 403
 		$commenter_cookie_value = $commenter_cookie->getValue();
388 404
 		$commenter_cookie_value = json_decode($commenter_cookie_value);
389 405
 		
390
-		if($commenter_cookie_value === NULL)
391
-			return $commenter;
406
+		if($commenter_cookie_value === NULL) {
407
+					return $commenter;
408
+		}
392 409
 		
393
-		if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email))
394
-			return $commenter;
410
+		if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email)) {
411
+					return $commenter;
412
+		}
395 413
 		
396 414
 		$commenter_object = CommentCollector::getCommenterByFields($commenter_cookie_value->name, $commenter_cookie_value->email, (isset($commenter_cookie_value->website) ? $commenter_cookie_value->website : ''));
397 415
 		
398
-		if($commenter_object === NULL)
399
-			return $commenter;
416
+		if($commenter_object === NULL) {
417
+					return $commenter;
418
+		}
400 419
 		
401 420
 		$commenter->id = $commenter_object->id;
402 421
 		$commenter->name = $commenter_object->name;
Please login to merge, or discard this patch.
controller/RSSController.class.inc.php 1 patch
Braces   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -25,8 +25,9 @@  discard block
 block discarded – undo
25 25
 
26 26
 	final protected function setLink($url = null)
27 27
 	{
28
-		if(!isset($url))
29
-			$url = URLDecode::getBase();
28
+		if(!isset($url)) {
29
+					$url = URLDecode::getBase();
30
+		}
30 31
 		$this->xml->channel->addChild('link', $url);
31 32
 	}
32 33
 
@@ -50,8 +51,9 @@  discard block
 block discarded – undo
50 51
 
51 52
 	final protected function setCopyright($copyright = null)
52 53
 	{
53
-		if(!isset($copyright))
54
-			$copyright = 'Copyright ' . date('Y') . ' Jacob Emerick';
54
+		if(!isset($copyright)) {
55
+					$copyright = 'Copyright ' . date('Y') . ' Jacob Emerick';
56
+		}
55 57
 		$this->xml->channel->addChild('copyright', $copyright);
56 58
 	}
57 59
 
@@ -66,8 +68,9 @@  discard block
 block discarded – undo
66 68
 
67 69
 	final protected function setPubDate($date = null)
68 70
 	{
69
-		if(!isset($date))
70
-			$date = date('r');
71
+		if(!isset($date)) {
72
+					$date = date('r');
73
+		}
71 74
 		$this->xml->channel->addChild('pubDate', $date);
72 75
 	}
73 76
 
Please login to merge, or discard this patch.
controller/RobotController.class.inc.php 1 patch
Braces   +17 added lines, -13 removed lines patch added patch discarded remove patch
@@ -27,9 +27,9 @@  discard block
 block discarded – undo
27 27
 	{
28 28
 		$entry = new stdclass();
29 29
 		$entry->agent = self::$ALL_ROBOTS;
30
-		if($url)
31
-			$entry->allow = $url;
32
-		else
30
+		if($url) {
31
+					$entry->allow = $url;
32
+		} else
33 33
 		{
34 34
 			$entry->disallow = '';
35 35
 			$entry->allow = self::$ALL_URL;
@@ -42,10 +42,11 @@  discard block
 block discarded – undo
42 42
 	{
43 43
 		$entry = new stdclass();
44 44
 		$entry->agent = self::$ALL_ROBOTS;
45
-		if($url)
46
-			$entry->disallow = $url;
47
-		else
48
-			$entry->disallow = self::$ALL_URL;
45
+		if($url) {
46
+					$entry->disallow = $url;
47
+		} else {
48
+					$entry->disallow = self::$ALL_URL;
49
+		}
49 50
 		
50 51
 		$this->entries[] = $entry;
51 52
 	}
@@ -57,12 +58,15 @@  discard block
 block discarded – undo
57 58
 		
58 59
 		foreach($this->entries as $key => $entry)
59 60
 		{
60
-			if($key == 0)
61
-				echo "User-agent: {$entry->agent}\n";
62
-			if(isset($entry->disallow) && $entry->disallow != '')
63
-				echo "Disallow: {$entry->disallow}\n";
64
-			if(isset($entry->allow))
65
-				echo "Allow: {$entry->allow}\n";
61
+			if($key == 0) {
62
+							echo "User-agent: {$entry->agent}\n";
63
+			}
64
+			if(isset($entry->disallow) && $entry->disallow != '') {
65
+							echo "Disallow: {$entry->disallow}\n";
66
+			}
67
+			if(isset($entry->allow)) {
68
+							echo "Allow: {$entry->allow}\n";
69
+			}
66 70
 			//echo "\n";
67 71
 		}
68 72
 		
Please login to merge, or discard this patch.
controller/SitemapController.class.inc.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,8 +22,9 @@
 block discarded – undo
22 22
 
23 23
 	protected function addURL($loc, $lastmod = false, $changefreq = 'monthly', $priority = .5)
24 24
 	{
25
-		if(!$lastmod)
26
-			$lastmod = $this->default_lastmod;
25
+		if(!$lastmod) {
26
+					$lastmod = $this->default_lastmod;
27
+		}
27 28
 		
28 29
 		$url = $this->xml->addChild('url');
29 30
 		
Please login to merge, or discard this patch.
controller/ajax/SubmitCommentController.class.inc.php 1 patch
Braces   +32 added lines, -24 removed lines patch added patch discarded remove patch
@@ -14,20 +14,27 @@  discard block
 block discarded – undo
14 14
 
15 15
 	protected function set_data()
16 16
 	{
17
-		if(!Validate::checkRequest('post', 'name', 'name'))
18
-			return $this->fail_response('You must include a valid name.');
19
-		if(!Validate::checkRequest('post', 'email', 'email'))
20
-			return $this->fail_response('You must include a valid email.');
21
-		if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))
22
-			return $this->fail_response('Please include a valid website.');
23
-		if(!Validate::checkRequest('post', 'comment', 'string'))
24
-			return $this->fail_response('You must enter a comment.');
25
-		if(!Validate::checkRequest('post', 'save', 'boolean'))
26
-			return $this->fail_response('You entered an invalid save request.');
27
-		if(!Validate::checkRequest('post', 'notify', 'boolean'))
28
-			return $this->fail_response('You entered an invalid notify request.');
29
-		if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))
30
-			return $this->fail_response('You entered an invalid reply value.');
17
+		if(!Validate::checkRequest('post', 'name', 'name')) {
18
+					return $this->fail_response('You must include a valid name.');
19
+		}
20
+		if(!Validate::checkRequest('post', 'email', 'email')) {
21
+					return $this->fail_response('You must include a valid email.');
22
+		}
23
+		if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url')) {
24
+					return $this->fail_response('Please include a valid website.');
25
+		}
26
+		if(!Validate::checkRequest('post', 'comment', 'string')) {
27
+					return $this->fail_response('You must enter a comment.');
28
+		}
29
+		if(!Validate::checkRequest('post', 'save', 'boolean')) {
30
+					return $this->fail_response('You entered an invalid save request.');
31
+		}
32
+		if(!Validate::checkRequest('post', 'notify', 'boolean')) {
33
+					return $this->fail_response('You entered an invalid notify request.');
34
+		}
35
+		if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer')) {
36
+					return $this->fail_response('You entered an invalid reply value.');
37
+		}
31 38
 		
32 39
 		$referer_url = Request::getServer('HTTP_REFERER');
33 40
 		$url = explode('/', $referer_url);
@@ -35,8 +42,9 @@  discard block
 block discarded – undo
35 42
 		$url = array_pop($url);
36 43
 		$post = PostCollector::getPostByURI($url);
37 44
 		
38
-		if($post === null)
39
-			return $this->fail_response('There seems to be a problem with this page.', 'error');
45
+		if($post === null) {
46
+					return $this->fail_response('There seems to be a problem with this page.', 'error');
47
+		}
40 48
 		
41 49
 		$commentpage_result = CommentCollector::getCommentPageByURL($post->path, 2);
42 50
 		if($commentpage_result === null)
@@ -49,9 +57,9 @@  discard block
 block discarded – undo
49 57
 			$query = sprintf($query, $site_id, $url);
50 58
 			Database::execute($query);
51 59
 			$commentpage_id = Database::lastInsertID();
60
+		} else {
61
+					$commentpage_id = $commentpage_result->id;
52 62
 		}
53
-		else
54
-			$commentpage_id = $commentpage_result->id;
55 63
 		
56 64
 		$save = (Request::getPost('save') == 'true') ? 1 : 0;
57 65
 		
@@ -67,8 +75,7 @@  discard block
 block discarded – undo
67 75
 			$query = sprintf($query, $name, $email, $website, $save);
68 76
 			Database::execute($query);
69 77
 			$commenter_id = Database::lastInsertID();
70
-		}
71
-		else
78
+		} else
72 79
 		{
73 80
 			if($commenter_result->save !== $save)
74 81
 			{
@@ -90,9 +97,9 @@  discard block
 block discarded – undo
90 97
 			$query = sprintf($query, $body);
91 98
 			Database::execute($query);
92 99
 			$comment_id = Database::lastInsertID();
100
+		} else {
101
+					$comment_id = $comment_result->id;
93 102
 		}
94
-		else
95
-			$comment_id = $comment_result->id;
96 103
 		
97 104
 		$query = "INSERT INTO `jpemeric_comment`.`comment_meta` (`commenter_id`,`comment_id`,`reply`,`notify`,`commentpage_id`,`date`,`display`) VALUES ('%d','%d','%d','%d','%d','%s','%d')";
98 105
 		
@@ -114,8 +121,9 @@  discard block
 block discarded – undo
114 121
 		
115 122
 		foreach($notification_result as $notification_row)
116 123
 		{
117
-			if($notification_row->email == $email)
118
-				continue;
124
+			if($notification_row->email == $email) {
125
+							continue;
126
+			}
119 127
 			
120 128
 			$email_recipient_array[$notification_row->email] = array(
121 129
 				'email' => $notification_row->email,
Please login to merge, or discard this patch.
controller/blog/CategoryController.class.inc.php 1 patch
Braces   +18 added lines, -16 removed lines patch added patch discarded remove patch
@@ -74,8 +74,7 @@  discard block
 block discarded – undo
74 74
 				{
75 75
 					$this->set_title(self::$TITLE_MAIN_HIKING);
76 76
 					$this->set_description(self::$DESCRIPTION_MAIN_HIKING);
77
-				}
78
-				else
77
+				} else
79 78
 				{
80 79
 					$this->set_title(sprintf(self::$TITLE_PAGINATED_HIKING, $this->page, $this->total_pages));
81 80
 					$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED_HIKING, $this->page, $this->total_pages));
@@ -87,8 +86,7 @@  discard block
 block discarded – undo
87 86
 				{
88 87
 					$this->set_title(self::$TITLE_MAIN_PERSONAL);
89 88
 					$this->set_description(self::$DESCRIPTION_MAIN_PERSONAL);
90
-				}
91
-				else
89
+				} else
92 90
 				{
93 91
 					$this->set_title(sprintf(self::$TITLE_PAGINATED_PERSONAL, $this->page, $this->total_pages));
94 92
 					$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED_PERSONAL, $this->page, $this->total_pages));
@@ -100,8 +98,7 @@  discard block
 block discarded – undo
100 98
 				{
101 99
 					$this->set_title(self::$TITLE_MAIN_WEBDEVELOPMENT);
102 100
 					$this->set_description(self::$DESCRIPTION_MAIN_WEBDEVELOPMENT);
103
-				}
104
-				else
101
+				} else
105 102
 				{
106 103
 					$this->set_title(sprintf(self::$TITLE_PAGINATED_WEBDEVELOPMENT, $this->page, $this->total_pages));
107 104
 					$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED_WEBDEVELOPMENT, $this->page, $this->total_pages));
@@ -133,8 +130,9 @@  discard block
 block discarded – undo
133 130
 	protected function get_page_number()
134 131
 	{
135 132
 		$page = URLDecode::getPiece(2);
136
-		if(isset($page) && is_numeric($page))
137
-			return $page;
133
+		if(isset($page) && is_numeric($page)) {
134
+					return $page;
135
+		}
138 136
 		return 1;
139 137
 	}
140 138
 
@@ -153,25 +151,29 @@  discard block
 block discarded – undo
153 151
 
154 152
 	protected function get_list_next_link()
155 153
 	{
156
-		if($this->page == 1)
157
-			return;
158
-		if($this->page == 2)
159
-			return Content::instance('URLSafe', "/{$this->category->link}/")->activate();
154
+		if($this->page == 1) {
155
+					return;
156
+		}
157
+		if($this->page == 2) {
158
+					return Content::instance('URLSafe', "/{$this->category->link}/")->activate();
159
+		}
160 160
 		return Content::instance('URLSafe', "/{$this->category->link}/" . ($this->page - 1) . '/')->activate();
161 161
 	}
162 162
 
163 163
 	protected function get_list_prev_link()
164 164
 	{
165
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
166
-			return;
165
+		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) {
166
+					return;
167
+		}
167 168
 		return Content::instance('URLSafe', "/{$this->category->link}/" . ($this->page + 1) . '/')->activate();
168 169
 	}
169 170
 
170 171
 	private $total_post_count;
171 172
 	protected function get_total_post_count()
172 173
 	{
173
-		if(!isset($this->total_post_count))
174
-			$this->total_post_count = PostCollector::getPostCountForCategory($this->category->link);
174
+		if(!isset($this->total_post_count)) {
175
+					$this->total_post_count = PostCollector::getPostCountForCategory($this->category->link);
176
+		}
175 177
 		return $this->total_post_count;
176 178
 	}
177 179
 
Please login to merge, or discard this patch.
controller/blog/DefaultPageController.class.inc.php 1 patch
Braces   +12 added lines, -8 removed lines patch added patch discarded remove patch
@@ -37,8 +37,9 @@  discard block
 block discarded – undo
37 37
 		Loader::load('collector', 'image/PhotoCollector');
38 38
 		$photo_result = PhotoCollector::getRow($id);
39 39
 		
40
-		if($photo_result == null)
41
-			return;
40
+		if($photo_result == null) {
41
+					return;
42
+		}
42 43
 		
43 44
 		$name = $photo_result->name;
44 45
 		$category = $photo_result->category;
@@ -101,8 +102,9 @@  discard block
 block discarded – undo
101 102
 	{
102 103
 		$body = $post->body;
103 104
 		
104
-		if($trim)
105
-			$body = Content::instance('SmartTrim', $body)->activate(self::$LENGTH_OF_TRIMMED_POST);
105
+		if($trim) {
106
+					$body = Content::instance('SmartTrim', $body)->activate(self::$LENGTH_OF_TRIMMED_POST);
107
+		}
106 108
 		
107 109
 		$body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
108 110
 		$body = Content::instance('MarkupCode', $body)->activate();
@@ -128,8 +130,9 @@  discard block
 block discarded – undo
128 130
 		$cloud_array = array();
129 131
 		foreach($tag_result as $tag)
130 132
 		{
131
-			if($tag->tag_count < self::$MINIMUM_TAG_COUNT)
132
-				continue;
133
+			if($tag->tag_count < self::$MINIMUM_TAG_COUNT) {
134
+							continue;
135
+			}
133 136
 			
134 137
 			$tag_object = new stdclass();
135 138
 			$tag_object->name = $tag->tag;
@@ -147,8 +150,9 @@  discard block
 block discarded – undo
147 150
 		
148 151
 		foreach($tag_result as $tag)
149 152
 		{
150
-			if($tag->tag_count > $maximum)
151
-				$maximum = $tag->tag_count;
153
+			if($tag->tag_count > $maximum) {
154
+							$maximum = $tag->tag_count;
155
+			}
152 156
 		}
153 157
 		return $maximum;
154 158
 	}
Please login to merge, or discard this patch.
controller/blog/HomeController.class.inc.php 1 patch
Braces   +25 added lines, -18 removed lines patch added patch discarded remove patch
@@ -32,15 +32,17 @@  discard block
 block discarded – undo
32 32
 	{
33 33
 		parent::set_head_data();
34 34
 		
35
-		if($this->page == 1)
36
-			$this->set_title(self::$TITLE_MAIN);
37
-		else
38
-			$this->set_title(sprintf(self::$TITLE_PAGINATED, $this->page, $this->total_pages));
35
+		if($this->page == 1) {
36
+					$this->set_title(self::$TITLE_MAIN);
37
+		} else {
38
+					$this->set_title(sprintf(self::$TITLE_PAGINATED, $this->page, $this->total_pages));
39
+		}
39 40
 		
40
-		if($this->page == 1)
41
-			$this->set_description(self::$DESCRIPTION_MAIN);
42
-		else
43
-			$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages));
41
+		if($this->page == 1) {
42
+					$this->set_description(self::$DESCRIPTION_MAIN);
43
+		} else {
44
+					$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages));
45
+		}
44 46
 		
45 47
 		$this->set_keywords(self::$KEYWORD_ARRAY);
46 48
 	}
@@ -67,8 +69,9 @@  discard block
 block discarded – undo
67 69
 	protected function get_page_number()
68 70
 	{
69 71
 		$page = URLDecode::getPiece(1);
70
-		if(isset($page) && is_numeric($page))
71
-			return $page;
72
+		if(isset($page) && is_numeric($page)) {
73
+					return $page;
74
+		}
72 75
 		return 1;
73 76
 	}
74 77
 
@@ -87,25 +90,29 @@  discard block
 block discarded – undo
87 90
 
88 91
 	protected function get_list_next_link()
89 92
 	{
90
-		if($this->page == 1)
91
-			return;
92
-		if($this->page == 2)
93
-			return '/';
93
+		if($this->page == 1) {
94
+					return;
95
+		}
96
+		if($this->page == 2) {
97
+					return '/';
98
+		}
94 99
 		return '/' . ($this->page - 1) . '/';
95 100
 	}
96 101
 
97 102
 	protected function get_list_prev_link()
98 103
 	{
99
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
100
-			return;
104
+		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) {
105
+					return;
106
+		}
101 107
 		return '/' . ($this->page + 1) . '/';
102 108
 	}
103 109
 
104 110
 	private $total_post_count;
105 111
 	protected function get_total_post_count()
106 112
 	{
107
-		if(!isset($this->total_post_count))
108
-			$this->total_post_count = PostCollector::getMainPostCount();
113
+		if(!isset($this->total_post_count)) {
114
+					$this->total_post_count = PostCollector::getMainPostCount();
115
+		}
109 116
 		return $this->total_post_count;
110 117
 	}
111 118
 
Please login to merge, or discard this patch.