Completed
Push — master ( c330e2...cf0c7a )
by Jacob
03:58
created
collector/blog/PostCollector.class.inc.php 1 patch
Doc Comments   +9 added lines patch added patch discarded remove patch
@@ -17,6 +17,9 @@  discard block
 block discarded – undo
17 17
 		return self::run_query($query);
18 18
 	}
19 19
 
20
+	/**
21
+	 * @param integer $total
22
+	 */
20 23
 	public static function getMainList($total, $offset = 0)
21 24
 	{
22 25
 		$query = "SELECT `post`.`id` AS `id`, `title`, `path`, `date`, `body`, `category` FROM `jpemeric_blog`.`post` WHERE `display` = '1' ORDER BY `date` DESC LIMIT {$offset}, {$total}";
@@ -29,6 +32,9 @@  discard block
 block discarded – undo
29 32
 		return self::get_count($query);
30 33
 	}
31 34
 
35
+	/**
36
+	 * @param integer $total
37
+	 */
32 38
 	public static function getPostsForTag($tag_id, $total, $offset = 0)
33 39
 	{
34 40
 		$query = "SELECT `post`.`id` AS `id`, `title`, `path`, `date`, `body`, `category` FROM `jpemeric_blog`.`post`,`jpemeric_blog`.`ptlink` WHERE `display` = '1' && `post`.`id` = `ptlink`.`post_id` && `ptlink`.`tag_id` = '{$tag_id}' ORDER BY `date` DESC LIMIT {$offset}, {$total}";
@@ -41,6 +47,9 @@  discard block
 block discarded – undo
41 47
 		return self::get_count($query);
42 48
 	}
43 49
 
50
+	/**
51
+	 * @param integer $total
52
+	 */
44 53
 	public static function getPostsForCategory($category, $total, $offset = 0)
45 54
 	{
46 55
 		$category = self::escape($category);
Please login to merge, or discard this patch.
collector/comment/CommentCollector.class.inc.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -83,6 +83,9 @@
 block discarded – undo
83 83
 		return self::run_query($query);
84 84
 	}
85 85
 
86
+	/**
87
+	 * @param integer $count
88
+	 */
86 89
 	public static function getRecentBlogComments($count)
87 90
 	{
88 91
 		$query = "
Please login to merge, or discard this patch.
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.
collector/data/HuluCollector.class.inc.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -12,6 +12,9 @@
 block discarded – undo
12 12
 		return self::run_query($query);
13 13
 	}
14 14
 
15
+	/**
16
+	 * @param integer $action
17
+	 */
15 18
 	public static function getHuluByFields($title, $action)
16 19
 	{
17 20
 		$title = self::escape($title);
Please login to merge, or discard this patch.
collector/portfolio/PortfolioCollector.class.inc.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -19,6 +19,9 @@
 block discarded – undo
19 19
 		return self::run_row_query($query);
20 20
 	}
21 21
 
22
+	/**
23
+	 * @param integer $type
24
+	 */
22 25
 	public static function getImagesForPiece($piece_id, $type)
23 26
 	{
24 27
 		$piece_id = self::escape($piece_id);
Please login to merge, or discard this patch.
collector/stream/TwitterCollector.class.inc.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -17,6 +17,9 @@
 block discarded – undo
17 17
 		return self::run_row_query($query);
18 18
 	}
19 19
 
20
+	/**
21
+	 * @param string $date
22
+	 */
20 23
 	public static function getTweetByFields($date, $text)
21 24
 	{
22 25
 		$query = "SELECT * FROM `jpemeric_stream`.`twitter` WHERE `date` = '{$date}' && `text` = '{$text}' LIMIT 1";
Please login to merge, or discard this patch.
collector/waterfall/LogCollector.class.inc.php 2 patches
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -34,6 +34,9 @@  discard block
 block discarded – undo
34 34
 		return self::run_query($query);
35 35
 	}
36 36
 
37
+    /**
38
+     * @param integer $total
39
+     */
37 40
     public static function getRecentList($total)
38 41
     {
39 42
         $query = "
@@ -178,6 +181,9 @@  discard block
 block discarded – undo
178 181
 		return self::run_row_query($query);
179 182
 	}
180 183
 
184
+    /**
185
+     * @param string $date
186
+     */
181 187
     public static function getByDate($date)
182 188
     {
183 189
         $date = self::escape($date);
Please login to merge, or discard this patch.
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -34,9 +34,9 @@  discard block
 block discarded – undo
34 34
 		return self::run_query($query);
35 35
 	}
36 36
 
37
-    public static function getRecentList($total)
38
-    {
39
-        $query = "
37
+	public static function getRecentList($total)
38
+	{
39
+		$query = "
40 40
             SELECT
41 41
                 `log`.`title`,
42 42
                 `log`.`alias`,
@@ -59,8 +59,8 @@  discard block
 block discarded – undo
59 59
                 `log`.`date` DESC
60 60
             LIMIT
61 61
                 {$total}";
62
-        return self::run_query($query);
63
-    }
62
+		return self::run_query($query);
63
+	}
64 64
 
65 65
 	public static function getListCount()
66 66
 	{
@@ -178,11 +178,11 @@  discard block
 block discarded – undo
178 178
 		return self::run_row_query($query);
179 179
 	}
180 180
 
181
-    public static function getByDate($date)
182
-    {
183
-        $date = self::escape($date);
181
+	public static function getByDate($date)
182
+	{
183
+		$date = self::escape($date);
184 184
         
185
-        $query = "
185
+		$query = "
186 186
             SELECT
187 187
                 `log`.`alias`
188 188
             FROM
@@ -192,8 +192,8 @@  discard block
 block discarded – undo
192 192
                 `log`.`is_public` = '1'
193 193
             LIMIT 1";
194 194
         
195
-        return self::run_row_query($query);
196
-    }
195
+		return self::run_row_query($query);
196
+	}
197 197
 	
198 198
 	public static function getById($log)
199 199
 	{
Please login to merge, or discard this patch.
collector/waterfall/WaterfallCollector.class.inc.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -117,6 +117,9 @@
 block discarded – undo
117 117
         return self::run_query($query);
118 118
     }
119 119
 
120
+    /**
121
+     * @param string $alias
122
+     */
120 123
     public static function getByOldAlias($alias)
121 124
     {
122 125
         $alias = self::escape($alias);
Please login to merge, or discard this 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.
controller/blog/DefaultPageController.class.inc.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -97,6 +97,9 @@
 block discarded – undo
97 97
 		return $tag_array;
98 98
 	}
99 99
 
100
+	/**
101
+	 * @param boolean $trim
102
+	 */
100 103
 	final private function get_body_for_post($post, $trim)
101 104
 	{
102 105
 		$body = $post->body;
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@
 block discarded – undo
86 86
 		Loader::load('collector', 'blog/TagCollector');
87 87
 		
88 88
 		$tag_result = TagCollector::getTagsForPost($post->id);
89
-        $tag_array = array();
89
+		$tag_array = array();
90 90
 		foreach($tag_result as $tag)
91 91
 		{
92 92
 			$tag_object = new stdclass();
Please login to merge, or discard this patch.
controller/PageController.class.inc.php 2 patches
Doc Comments   +28 added lines patch added patch discarded remove patch
@@ -204,6 +204,9 @@  discard block
 block discarded – undo
204 204
 			exit;
205 205
 	}
206 206
 
207
+	/**
208
+	 * @param string $method
209
+	 */
207 210
 	protected function set_header_method($method)
208 211
 	{
209 212
 		$this->headers = $method;
@@ -214,6 +217,9 @@  discard block
 block discarded – undo
214 217
 		$this->set_head('title', $value);
215 218
 	}
216 219
 
220
+	/**
221
+	 * @param string $value
222
+	 */
217 223
 	protected function set_author($value)
218 224
 	{
219 225
 		$this->set_head('author', $value);
@@ -229,26 +235,41 @@  discard block
 block discarded – undo
229 235
 		$this->set_head('keywords', implode(', ', $array));
230 236
 	}
231 237
 	
238
+	/**
239
+	 * @param string $url
240
+	 */
232 241
 	protected function set_canonical($url)
233 242
 	{
234 243
 		$this->set_head('canonical', $url);
235 244
 	}
236 245
 
246
+	/**
247
+	 * @param string $set
248
+	 */
237 249
 	protected function set_head($set, $value)
238 250
 	{
239 251
 		$this->data_array['head'][$set] = $value;
240 252
 	}
241 253
 
254
+	/**
255
+	 * @param string $set
256
+	 */
242 257
 	protected function set_body($set, $value)
243 258
 	{
244 259
 		$this->data_array['body'][$set] = $value;
245 260
 	}
246 261
 
262
+	/**
263
+	 * @param string $file
264
+	 */
247 265
 	protected function add_css($file)
248 266
 	{
249 267
 		$this->css_array[] = $file;
250 268
 	}
251 269
 
270
+	/**
271
+	 * @param string $file
272
+	 */
252 273
 	protected function add_js($file)
253 274
 	{
254 275
 		$this->js_array[] = $file;
@@ -271,6 +292,9 @@  discard block
 block discarded – undo
271 292
 		$this->set_head('js_link_array', $js_array);
272 293
 	}
273 294
 
295
+	/**
296
+	 * @param string $view
297
+	 */
274 298
 	protected function set_body_view($view)
275 299
 	{
276 300
 		$this->body_view_array[] = $view;
@@ -315,6 +339,10 @@  discard block
 block discarded – undo
315 339
 	}
316 340
 
317 341
 	private $comment_errors;
342
+
343
+	/**
344
+	 * @param string $redirect_url
345
+	 */
318 346
 	protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title)
319 347
 	{
320 348
 		if(Request::hasPost() && Request::getPost('submit') == 'Submit Comment')
Please login to merge, or discard this patch.
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -60,9 +60,9 @@  discard block
 block discarded – undo
60 60
 
61 61
 	protected function get_recent_activity()
62 62
 	{
63
-    global $container;
64
-    $activityRepository = new Jacobemerick\Web\Domain\Stream\Post\MysqlPostRepository($container['db_connection_locator']);
65
-    $post_result = $activityRepository->getPosts(5);
63
+	global $container;
64
+	$activityRepository = new Jacobemerick\Web\Domain\Stream\Post\MysqlPostRepository($container['db_connection_locator']);
65
+	$post_result = $activityRepository->getPosts(5);
66 66
 
67 67
 		$post_array = array();
68 68
 		foreach($post_result as $row)
@@ -77,13 +77,13 @@  discard block
 block discarded – undo
77 77
 	{
78 78
 		Loader::load('utility', 'Content');
79 79
 
80
-    global $container;
81
-    $blogRepository = new Jacobemerick\Web\Domain\Stream\Blog\MysqlBlogRepository($container['db_connection_locator']);
82
-    $bookRepository = new Jacobemerick\Web\Domain\Stream\Book\MysqlBookRepository($container['db_connection_locator']);
83
-    $distanceRepository = new Jacobemerick\Web\Domain\Stream\Distance\MysqlDistanceRepository($container['db_connection_locator']);
84
-    $huluRepository = new Jacobemerick\Web\Domain\Stream\Hulu\MysqlHuluRepository($container['db_connection_locator']);
85
-    $twitterRepository = new Jacobemerick\Web\Domain\Stream\Twitter\MysqlTwitterRepository($container['db_connection_locator']);
86
-    $youtubeRepository = new Jacobemerick\Web\Domain\Stream\YouTube\MysqlYouTubeRepository($container['db_connection_locator']);
80
+	global $container;
81
+	$blogRepository = new Jacobemerick\Web\Domain\Stream\Blog\MysqlBlogRepository($container['db_connection_locator']);
82
+	$bookRepository = new Jacobemerick\Web\Domain\Stream\Book\MysqlBookRepository($container['db_connection_locator']);
83
+	$distanceRepository = new Jacobemerick\Web\Domain\Stream\Distance\MysqlDistanceRepository($container['db_connection_locator']);
84
+	$huluRepository = new Jacobemerick\Web\Domain\Stream\Hulu\MysqlHuluRepository($container['db_connection_locator']);
85
+	$twitterRepository = new Jacobemerick\Web\Domain\Stream\Twitter\MysqlTwitterRepository($container['db_connection_locator']);
86
+	$youtubeRepository = new Jacobemerick\Web\Domain\Stream\YouTube\MysqlYouTubeRepository($container['db_connection_locator']);
87 87
 
88 88
 		$post = new stdclass();
89 89
 		
@@ -126,9 +126,9 @@  discard block
 block discarded – undo
126 126
 					if(strlen($row['title']) > 0)
127 127
 						$post->title .= " I was hiking up around the {$row['title']} area.";
128 128
 				}
129
-                else if ($row['type'] == 'walking') {
130
-                    $post->title = "Walked {$row['distance']} miles and felt {$row['felt']}.";
131
-                }
129
+				else if ($row['type'] == 'walking') {
130
+					$post->title = "Walked {$row['distance']} miles and felt {$row['felt']}.";
131
+				}
132 132
 			break;
133 133
 			case 'hulu' :
134 134
 				$row = $huluRepository->getHuluById($raw_post['type_id']);
@@ -195,11 +195,11 @@  discard block
 block discarded – undo
195 195
 				Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
196 196
 		}
197 197
         
198
-        if (URLDecode::getSite() == 'waterfalls') {
199
-            Loader::load('view', '/WaterfallFoot');
200
-        } else {
201
-            Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
202
-        }
198
+		if (URLDecode::getSite() == 'waterfalls') {
199
+			Loader::load('view', '/WaterfallFoot');
200
+		} else {
201
+			Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
202
+		}
203 203
 		
204 204
 		if($view == '/404' || $view == '/503')
205 205
 			exit;
Please login to merge, or discard this patch.