Completed
Push — master ( b9d18d...bf0847 )
by Jacob
04:04
created
controller/lifestream/HomeController.class.inc.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 	protected function get_page_number()
39 39
 	{
40 40
 		$page = URLDecode::getPiece(2);
41
-		if(isset($page) && is_numeric($page))
41
+		if (isset($page) && is_numeric($page))
42 42
 			return $page;
43 43
 		return 1;
44 44
 	}
@@ -58,16 +58,16 @@  discard block
 block discarded – undo
58 58
 
59 59
 	protected function get_list_next_link()
60 60
 	{
61
-		if($this->page == 1)
61
+		if ($this->page == 1)
62 62
 			return;
63
-		if($this->page == 2)
63
+		if ($this->page == 2)
64 64
 			return Loader::getRootUrl('lifestream');
65 65
 		return Loader::getRootUrl('lifestream') . 'page/' . ($this->page - 1) . '/';
66 66
 	}
67 67
 
68 68
 	protected function get_list_prev_link()
69 69
 	{
70
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
70
+		if (($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
71 71
 			return;
72 72
 		return Loader::getRootUrl('lifestream') . 'page/' . ($this->page + 1) . '/';
73 73
 	}
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 	private $total_post_count;
76 76
 	protected function get_total_post_count()
77 77
 	{
78
-		if(!isset($this->total_post_count))
78
+		if (!isset($this->total_post_count))
79 79
 			$this->total_post_count = ActivityCollector::getCount();
80 80
 		return $this->total_post_count;
81 81
 	}
Please login to merge, or discard this patch.
controller/ajax/SubmitCommentController.class.inc.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -14,19 +14,19 @@  discard block
 block discarded – undo
14 14
 
15 15
 	protected function set_data()
16 16
 	{
17
-		if(!Validate::checkRequest('post', 'name', 'name'))
17
+		if (!Validate::checkRequest('post', 'name', 'name'))
18 18
 			return $this->fail_response('You must include a valid name.');
19
-		if(!Validate::checkRequest('post', 'email', 'email'))
19
+		if (!Validate::checkRequest('post', 'email', 'email'))
20 20
 			return $this->fail_response('You must include a valid email.');
21
-		if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))
21
+		if (Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))
22 22
 			return $this->fail_response('Please include a valid website.');
23
-		if(!Validate::checkRequest('post', 'comment', 'string'))
23
+		if (!Validate::checkRequest('post', 'comment', 'string'))
24 24
 			return $this->fail_response('You must enter a comment.');
25
-		if(!Validate::checkRequest('post', 'save', 'boolean'))
25
+		if (!Validate::checkRequest('post', 'save', 'boolean'))
26 26
 			return $this->fail_response('You entered an invalid save request.');
27
-		if(!Validate::checkRequest('post', 'notify', 'boolean'))
27
+		if (!Validate::checkRequest('post', 'notify', 'boolean'))
28 28
 			return $this->fail_response('You entered an invalid notify request.');
29
-		if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))
29
+		if (Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))
30 30
 			return $this->fail_response('You entered an invalid reply value.');
31 31
 		
32 32
 		$referer_url = Request::getServer('HTTP_REFERER');
@@ -35,11 +35,11 @@  discard block
 block discarded – undo
35 35
 		$url = array_pop($url);
36 36
 		$post = PostCollector::getPostByURI($url);
37 37
 		
38
-		if($post === null)
38
+		if ($post === null)
39 39
 			return $this->fail_response('There seems to be a problem with this page.', 'error');
40 40
 		
41 41
 		$commentpage_result = CommentCollector::getCommentPageByURL($post->path, 2);
42
-		if($commentpage_result === null)
42
+		if ($commentpage_result === null)
43 43
 		{
44 44
 			$query = "INSERT INTO `jpemeric_comment`.`comment_page` (`site_id`, `url`) VALUES ('%d', '%s')";
45 45
 			
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 		$save = (Request::getPost('save') == 'true') ? 1 : 0;
57 57
 		
58 58
 		$commenter_result = CommentCollector::getCommenterByFields(Request::getPost('name'), Request::getPost('email'), Request::getPost('website'));
59
-		if($commenter_result === null)
59
+		if ($commenter_result === null)
60 60
 		{
61 61
 			$query = "INSERT INTO `jpemeric_comment`.`commenter` (`name`,`email`,`url`,`save`) VALUES ('%s','%s','%s','%s')";
62 62
 			
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 		}
71 71
 		else
72 72
 		{
73
-			if($commenter_result->save !== $save)
73
+			if ($commenter_result->save !== $save)
74 74
 			{
75 75
 				$query = "UPDATE `jpemeric_comment`.`commenter` SET `save` = '%s' WHERE `id` = '%d'";
76 76
 				
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 		}
82 82
 		
83 83
 		$comment_result = CommentCollector::getCommentByBody(Request::getPost('comment'));
84
-		if($comment_result === null)
84
+		if ($comment_result === null)
85 85
 		{
86 86
 			$query = "INSERT INTO `jpemeric_comment`.`comment` (`body`) VALUES ('%s')";
87 87
 			
@@ -112,9 +112,9 @@  discard block
 block discarded – undo
112 112
 		
113 113
 		$notification_result = CommentCollector::getNotificationForPage($commentpage_id);
114 114
 		
115
-		foreach($notification_result as $notification_row)
115
+		foreach ($notification_result as $notification_row)
116 116
 		{
117
-			if($notification_row->email == $email)
117
+			if ($notification_row->email == $email)
118 118
 				continue;
119 119
 			
120 120
 			$email_recipient_array[$notification_row->email] = array(
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 		}
124 124
 		
125 125
 		$message = "Hello!\nThere has been a new post on the post '{$post->title}' at Jacob Emerick's Blog. You have chosen to be notified of it - please reply to {$config->admin_email} if you do would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$referer_url}#comments to see and reply to all the comments on this post.\nThank you!";
126
-		foreach($email_recipient_array as $email_recipient)
126
+		foreach ($email_recipient_array as $email_recipient)
127 127
 		{
128 128
 			$mail = new Mail();
129 129
 			$mail->setToAddress($email_recipient['email'], $email_recipient['name']);
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 			$mail->send();
133 133
 		}
134 134
 		
135
-		if(Request::getPost('save') == true)
135
+		if (Request::getPost('save') == true)
136 136
 		{
137 137
 			/*
138 138
 			$cookie = new Cookie('jpe_commenter');
Please login to merge, or discard this patch.
controller/waterfalls/WaterfallController.class.inc.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -112,17 +112,17 @@  discard block
 block discarded – undo
112 112
     {
113 113
         $album = array();
114 114
         
115
-        if($this->waterfall->album == 0)
115
+        if ($this->waterfall->album == 0)
116 116
             return $album;
117 117
         
118 118
         $photo_list = AlbumCollector::getPhotoListForAlbum($this->waterfall->album);
119
-        foreach($photo_list as $photo)
119
+        foreach ($photo_list as $photo)
120 120
         {
121 121
             $photo_array = array();
122 122
             $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
123 123
             $photo_array['description'] = $photo->description;
124 124
             
125
-            if($photo->height < $photo->width)
125
+            if ($photo->height < $photo->width)
126 126
                 list($height, $width) = array(75, 100);
127 127
             else
128 128
                 list($height, $width) = array(100, 75);
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 		$sidebar_data['drop_height'] = Content::instance('ImperialUnit', $waterfall->drop_height)->activate('inches');
155 155
 		$sidebar_data['drop_count'] = $waterfall->drop_count;
156 156
 		
157
-        $sidebar_data['county'] = (object) array (
157
+        $sidebar_data['county'] = (object) array(
158 158
             'name' => $waterfall->county,
159 159
             'alias' => $waterfall->county_alias,
160 160
             'title' => $waterfall->county_title,
Please login to merge, or discard this patch.
controller/waterfalls/CountyListController.class.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
 		$path = URLDecode::getPiece(1);
29 29
 		$this->county = CountyCollector::getByAlias($path);
30 30
 		
31
-		if(!$this->county)
31
+		if (!$this->county)
32 32
 			$this->eject();
33 33
 		
34 34
 		parent::__construct();
Please login to merge, or discard this patch.
controller/waterfalls/LogController.class.inc.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
         $log_path = URLDecode::getPiece(2);
26 26
         
27 27
         $this->log = LogCollector::getByAlias($log_path);
28
-        if(!$this->log)
28
+        if (!$this->log)
29 29
             $this->eject();
30 30
 
31 31
         $this->parent_navigation_item = 'journal';
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
         
49 49
         $keyword_array = array();
50 50
         $tag_result = LogCollector::getTagListForLog($this->log->id);
51
-        foreach($tag_result as $tag)
51
+        foreach ($tag_result as $tag)
52 52
         {
53 53
             $keyword_array[] = $tag->name;
54 54
         }
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
             'next' => array());
125 125
         
126 126
         $previous_log = LogCollector::getPreviousLog($this->log->id);
127
-        if($previous_log != false)
127
+        if ($previous_log != false)
128 128
         {
129 129
             $series['previous'] = (object) array(
130 130
                 'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $previous_log->alias . '/',
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
         }
134 134
         
135 135
         $next_log = LogCollector::getNextLog($this->log->id);
136
-        if($next_log != false)
136
+        if ($next_log != false)
137 137
         {
138 138
             $series['next'] = (object) array(
139 139
                 'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $next_log->alias . '/',
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
         
151 151
         $sidebar['companion_list'] = array();
152 152
         $companions = LogCollector::getCompanionListForLog($this->log->id);
153
-        foreach($companions as $companion)
153
+        foreach ($companions as $companion)
154 154
         {
155 155
             $sidebar['companion_list'][] = (object) array(
156 156
                 'title' => $companion->name,
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
         
160 160
         $sidebar['tag_list'] = array();
161 161
         $tags = LogCollector::getTagListForLog($this->log->id);
162
-        foreach($tags as $tag)
162
+        foreach ($tags as $tag)
163 163
         {
164 164
             $sidebar['tag_list'][] = (object) array(
165 165
                 'title' => $tag->name,
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
         
169 169
         $sidebar['waterfall_list'] = array();
170 170
         $waterfalls = LogCollector::getWaterfallListForLog($this->log->id);
171
-        foreach($waterfalls as $waterfall)
171
+        foreach ($waterfalls as $waterfall)
172 172
         {
173 173
             $sidebar['waterfall_list'][] = (object) array(
174 174
                 'title' => $waterfall->name,
@@ -182,17 +182,17 @@  discard block
 block discarded – undo
182 182
     {
183 183
         $album = array();
184 184
         
185
-        if($this->log->album == 0)
185
+        if ($this->log->album == 0)
186 186
             return $album;
187 187
         
188 188
         $photo_list = AlbumCollector::getPhotoListForAlbum($this->log->album);
189
-        foreach($photo_list as $photo)
189
+        foreach ($photo_list as $photo)
190 190
         {
191 191
             $photo_array = array();
192 192
             $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
193 193
             $photo_array['description'] = $photo->description;
194 194
             
195
-            if($photo->height < $photo->width)
195
+            if ($photo->height < $photo->width)
196 196
                 list($height, $width) = array(75, 100);
197 197
             else
198 198
                 list($height, $width) = array(100, 75);
Please login to merge, or discard this patch.
controller/waterfalls/PeriodListController.class.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
 		$alias = URLDecode::getPiece(2);
27 27
 		$this->period = PeriodCollector::getByAlias($alias);
28 28
 		
29
-		if(!$this->period)
29
+		if (!$this->period)
30 30
 			$this->eject();
31 31
 		
32 32
 		parent::__construct();
Please login to merge, or discard this patch.
controller/waterfalls/DefaultLogListController.class.inc.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 		$companion_result = CompanionCollector::getCompanionList();
43 43
 		$companion_list = array();
44 44
 		
45
-		foreach($companion_result as $companion_row)
45
+		foreach ($companion_result as $companion_row)
46 46
 		{
47 47
 			$companion = new stdclass();
48 48
 			$companion->name = $companion_row->name;
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 		$period_result = PeriodCollector::getPeriodList();
56 56
 		$period_list = array();
57 57
 		
58
-		foreach($period_result as $period_row)
58
+		foreach ($period_result as $period_row)
59 59
 		{
60 60
 			$period = new stdclass();
61 61
 			$period->name = $period_row->name;
Please login to merge, or discard this patch.
controller/waterfalls/SearchListController.class.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
 	protected function get_page_number()
28 28
 	{
29 29
 		$page = URLDecode::getPiece(2);
30
-		if(isset($page) && is_numeric($page))
30
+		if (isset($page) && is_numeric($page))
31 31
 			return $page;
32 32
 		return 1;
33 33
 	}
Please login to merge, or discard this patch.
controller/waterfalls/HomeController.class.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@
 block discarded – undo
59 59
         $recent_comments = CommentCollector::getRecentWaterfallComments();
60 60
         
61 61
         $recent_comment_container = array();
62
-        foreach($recent_comments as $comment) {
62
+        foreach ($recent_comments as $comment) {
63 63
             $body = $comment->body;
64 64
             $body = strip_tags($body);
65 65
             
Please login to merge, or discard this patch.