View GitHub Repository web

Schedule Inspection
Subscribe
Completed
Push — master ( d9eba8...4988a4 )
by Jacob
03:52
created
Status
Category
Toggle Patches
collector/waterfall/WatercourseCollector.class.inc.php 2 patches
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch 
@@ -5,9 +5,9 @@  discard block
 
 block discarded – undo
5 5 
 final class WatercourseCollector extends Collector
6 6 
 {
7 7
8 
-	public static function getById($id)
9 
-	{
10 
-		$query = "
8 
+    public static function getById($id)
9 
+    {
10 
+        $query = "
11 11 
 			SELECT
12 12 
 				`watercourse`.`name`,
13 13 
 				`watercourse`.`alias`
 
@@ -17,14 +17,14 @@  discard block
 
 block discarded – undo
17 17 
 				`watercourse`.`id` = '{$id}'
18 18 
 			LIMIT 1";
19 19
20 
-		return self::run_row_query($query);
21 
-	}
20 
+        return self::run_row_query($query);
21 
+    }
22 22
23 
-	public static function getByAlias($alias)
24 
-	{
25 
-		$alias = self::escape($alias);
23 
+    public static function getByAlias($alias)
24 
+    {
25 
+        $alias = self::escape($alias);
26 26
27 
-		$query = "
27 
+        $query = "
28 28 
 			SELECT
29 29 
 				`watercourse`.`id`,
30 30 
 				`watercourse`.`name`,
 
@@ -48,12 +48,12 @@  discard block
 
 block discarded – undo
48 48 
 				`watercourse`.`alias` = '{$alias}'
49 49 
 			LIMIT 1";
50 50
51 
-		return self::run_row_query($query);
52 
-	}
51 
+        return self::run_row_query($query);
52 
+    }
53 53
54 
-	public static function getWatercourseList()
55 
-	{
56 
-		$query = "
54 
+    public static function getWatercourseList()
55 
+    {
56 
+        $query = "
57 57 
 			SELECT
58 58 
 				`sum_table`.`name`,
59 59 
 				`sum_table`.`alias`,
 
@@ -111,12 +111,12 @@  discard block
 
 block discarded – undo
111 111 
 			ORDER BY
112 112 
 				`sum_table`.`name`";
113 113
114 
-		return self::run_query($query);
115 
-	}
114 
+        return self::run_query($query);
115 
+    }
116 116
117 
-	public static function getLogListForWatercourse($watercourse, $total, $offset = 0)
118 
-	{
119 
-		$query = "
117 
+    public static function getLogListForWatercourse($watercourse, $total, $offset = 0)
118 
+    {
119 
+        $query = "
120 120 
 			SELECT
121 121 
 				`waterfall`.`id`,
122 122 
 				`waterfall`.`name`,
 
@@ -150,16 +150,16 @@  discard block
 
 block discarded – undo
150 150 
 				`watercourse`
151 151 
 			LIMIT
152 152 
 				{$offset}, {$total}";
153 
-		return self::run_query($query);
154 
-	}
153 
+        return self::run_query($query);
154 
+    }
155 155
156 156 
     public static function getParentWatercourse($watercourse)
157 157 
     {
158 158 
     }
159 159
160 
-	public static function getLogCountForWatercourse($watercourse)
161 
-	{
162 
-		$query = "
160 
+    public static function getLogCountForWatercourse($watercourse)
161 
+    {
162 
+        $query = "
163 163 
 			SELECT
164 164 
 				SUM(`count`) AS `count`
165 165 
 			FROM
 
@@ -206,7 +206,7 @@  discard block
 
 block discarded – undo
206 206 
 					)
207 207 
 				) AS `sum_table`";
208 208
209 
-		return self::get_count($query);
210 
-	}
209 
+        return self::get_count($query);
210 
+    }
211 211
212 212 
 }
213 213 
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +14 added lines, -14 removed lines patch added patch discarded remove patch 
@@ -2,11 +2,11 @@  discard block
 
 block discarded – undo
2 2
3 3 
 Loader::load('collector', 'Collector');
4 4
5 
-final class WatercourseCollector extends Collector
6 
-{
5 
+final class WatercourseCollector extends Collector
6 
+{
7 7
8 
-	public static function getById($id)
9 
-	{
8 
+	public static function getById($id)
9 
+	{
10 10 
 		$query = "
11 11 
 			SELECT
12 12 
 				`watercourse`.`name`,
 
@@ -20,8 +20,8 @@  discard block
 
 block discarded – undo
20 20 
 		return self::run_row_query($query);
21 21 
 	}
22 22
23 
-	public static function getByAlias($alias)
24 
-	{
23 
+	public static function getByAlias($alias)
24 
+	{
25 25 
 		$alias = self::escape($alias);
26 26
27 27 
 		$query = "
 
@@ -51,8 +51,8 @@  discard block
 
 block discarded – undo
51 51 
 		return self::run_row_query($query);
52 52 
 	}
53 53
54 
-	public static function getWatercourseList()
55 
-	{
54 
+	public static function getWatercourseList()
55 
+	{
56 56 
 		$query = "
57 57 
 			SELECT
58 58 
 				`sum_table`.`name`,
 
@@ -114,8 +114,8 @@  discard block
 
 block discarded – undo
114 114 
 		return self::run_query($query);
115 115 
 	}
116 116
117 
-	public static function getLogListForWatercourse($watercourse, $total, $offset = 0)
118 
-	{
117 
+	public static function getLogListForWatercourse($watercourse, $total, $offset = 0)
118 
+	{
119 119 
 		$query = "
120 120 
 			SELECT
121 121 
 				`waterfall`.`id`,
 
@@ -153,12 +153,12 @@  discard block
 
 block discarded – undo
153 153 
 		return self::run_query($query);
154 154 
 	}
155 155
156 
-    public static function getParentWatercourse($watercourse)
157 
-    {
156 
+    public static function getParentWatercourse($watercourse)
157 
+    {
158 158 
     }
159 159
160 
-	public static function getLogCountForWatercourse($watercourse)
161 
-	{
160 
+	public static function getLogCountForWatercourse($watercourse)
161 
+	{
162 162 
 		$query = "
163 163 
 			SELECT
164 164 
 				SUM(`count`) AS `count`
Please login to merge, or discard this patch.
collector/waterfall/CompanionCollector.class.inc.php 2 patches
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch 
@@ -5,11 +5,11 @@  discard block
 
 block discarded – undo
5 5 
 final class CompanionCollector extends Collector
6 6 
 {
7 7
8 
-	public static function getByAlias($alias)
9 
-	{
10 
-		$alias = self::escape($alias);
8 
+    public static function getByAlias($alias)
9 
+    {
10 
+        $alias = self::escape($alias);
11 11
12 
-		$query = "
12 
+        $query = "
13 13 
 			SELECT
14 14 
 				`companion`.`id`,
15 15 
 				`companion`.`name`,
 
@@ -32,12 +32,12 @@  discard block
 
 block discarded – undo
32 32 
 				`companion`.`alias` = '{$alias}'
33 33 
 			LIMIT 1";
34 34
35 
-		return self::run_row_query($query);
36 
-	}
35 
+        return self::run_row_query($query);
36 
+    }
37 37
38 
-	public static function getCompanionList()
39 
-	{
40 
-		$query = "
38 
+    public static function getCompanionList()
39 
+    {
40 
+        $query = "
41 41 
 			SELECT
42 42 
 				`companion`.`name`,
43 43 
 				`companion`.`alias`,
 
@@ -57,12 +57,12 @@  discard block
 
 block discarded – undo
57 57 
 			ORDER BY
58 58 
 				`companion`.`name`";
59 59
60 
-		return self::run_query($query);
61 
-	}
60 
+        return self::run_query($query);
61 
+    }
62 62
63 
-	public static function getLogListForCompanion($companion, $total, $offset = 0)
64 
-	{
65 
-		$query = "
63 
+    public static function getLogListForCompanion($companion, $total, $offset = 0)
64 
+    {
65 
+        $query = "
66 66 
 			SELECT
67 67 
 				`log`.`id`,
68 68 
 				`log`.`title`,
 
@@ -90,12 +90,12 @@  discard block
 
 block discarded – undo
90 90 
 				`log`.`date` DESC
91 91 
 			LIMIT
92 92 
 				{$offset}, {$total}";
93 
-		return self::run_query($query);
94 
-	}
93 
+        return self::run_query($query);
94 
+    }
95 95
96 
-	public static function getLogCountForCompanion($companion)
97 
-	{
98 
-		$query = "
96 
+    public static function getLogCountForCompanion($companion)
97 
+    {
98 
+        $query = "
99 99 
 			SELECT
100 100 
 				COUNT(1) AS `count`
101 101 
 			FROM
 
@@ -106,7 +106,7 @@  discard block
 
 block discarded – undo
106 106 
 			WHERE
107 107 
 				`log_companion_map`.`companion` = '{$companion}' &&
108 108 
 				`log`.`is_public` = '1'";
109 
-		return self::get_count($query);
110 
-	}
109 
+        return self::get_count($query);
110 
+    }
111 111
112 112 
 }
113 113 
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +10 added lines, -10 removed lines patch added patch discarded remove patch 
@@ -2,11 +2,11 @@  discard block
 
 block discarded – undo
2 2
3 3 
 Loader::load('collector', 'Collector');
4 4
5 
-final class CompanionCollector extends Collector
6 
-{
5 
+final class CompanionCollector extends Collector
6 
+{
7 7
8 
-	public static function getByAlias($alias)
9 
-	{
8 
+	public static function getByAlias($alias)
9 
+	{
10 10 
 		$alias = self::escape($alias);
11 11
12 12 
 		$query = "
 
@@ -35,8 +35,8 @@  discard block
 
 block discarded – undo
35 35 
 		return self::run_row_query($query);
36 36 
 	}
37 37
38 
-	public static function getCompanionList()
39 
-	{
38 
+	public static function getCompanionList()
39 
+	{
40 40 
 		$query = "
41 41 
 			SELECT
42 42 
 				`companion`.`name`,
 
@@ -60,8 +60,8 @@  discard block
 
 block discarded – undo
60 60 
 		return self::run_query($query);
61 61 
 	}
62 62
63 
-	public static function getLogListForCompanion($companion, $total, $offset = 0)
64 
-	{
63 
+	public static function getLogListForCompanion($companion, $total, $offset = 0)
64 
+	{
65 65 
 		$query = "
66 66 
 			SELECT
67 67 
 				`log`.`id`,
 
@@ -93,8 +93,8 @@  discard block
 
 block discarded – undo
93 93 
 		return self::run_query($query);
94 94 
 	}
95 95
96 
-	public static function getLogCountForCompanion($companion)
97 
-	{
96 
+	public static function getLogCountForCompanion($companion)
97 
+	{
98 98 
 		$query = "
99 99 
 			SELECT
100 100 
 				COUNT(1) AS `count`
Please login to merge, or discard this patch.
collector/waterfall/PeriodCollector.class.inc.php 2 patches
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch 
@@ -5,11 +5,11 @@  discard block
 
 block discarded – undo
5 5 
 final class PeriodCollector extends Collector
6 6 
 {
7 7
8 
-	public static function getByAlias($alias)
9 
-	{
10 
-		$alias = self::escape($alias);
8 
+    public static function getByAlias($alias)
9 
+    {
10 
+        $alias = self::escape($alias);
11 11
12 
-		$query = "
12 
+        $query = "
13 13 
 			SELECT
14 14 
 				`period`.`id`,
15 15 
 				`period`.`name`,
 
@@ -31,12 +31,12 @@  discard block
 
 block discarded – undo
31 31 
 			WHERE
32 32 
 				`period`.`alias` = '{$alias}'
33 33 
 			LIMIT 1";
34 
-		return self::run_row_query($query);
35 
-	}
34 
+        return self::run_row_query($query);
35 
+    }
36 36
37 
-	public static function getPeriodList()
38 
-	{
39 
-		$query = "
37 
+    public static function getPeriodList()
38 
+    {
39 
+        $query = "
40 40 
 			SELECT
41 41 
 				`period`.`name`,
42 42 
 				`period`.`alias`,
 
@@ -52,12 +52,12 @@  discard block
 
 block discarded – undo
52 52 
 				`period`.`alias`
53 53 
 			ORDER BY
54 54 
 				`period`.`id`";
55 
-		return self::run_query($query);
56 
-	}
55 
+        return self::run_query($query);
56 
+    }
57 57
58 
-	public static function getLogListForPeriod($period, $total, $offset = 0)
59 
-	{
60 
-		$query = "
58 
+    public static function getLogListForPeriod($period, $total, $offset = 0)
59 
+    {
60 
+        $query = "
61 61 
 			SELECT
62 62 
 				`log`.`id`,
63 63 
 				`log`.`title`,
 
@@ -83,12 +83,12 @@  discard block
 
 block discarded – undo
83 83 
 			LIMIT
84 84 
 				{$offset}, {$total}";
85 85
86 
-		return self::run_query($query);
87 
-	}
86 
+        return self::run_query($query);
87 
+    }
88 88
89 
-	public static function getLogCountForPeriod($period)
90 
-	{
91 
-		$query = "
89 
+    public static function getLogCountForPeriod($period)
90 
+    {
91 
+        $query = "
92 92 
 			SELECT
93 93 
 				COUNT(1) AS `count`
94 94 
 			FROM
 
@@ -96,7 +96,7 @@  discard block
 
 block discarded – undo
96 96 
 			WHERE
97 97 
 				`period` = '{$period}' &&
98 98 
 				`is_public` = '1'";
99 
-		return self::get_count($query);
100 
-	}
99 
+        return self::get_count($query);
100 
+    }
101 101
102 102 
 }
103 103 
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +10 added lines, -10 removed lines patch added patch discarded remove patch 
@@ -2,11 +2,11 @@  discard block
 
 block discarded – undo
2 2
3 3 
 Loader::load('collector', 'Collector');
4 4
5 
-final class PeriodCollector extends Collector
6 
-{
5 
+final class PeriodCollector extends Collector
6 
+{
7 7
8 
-	public static function getByAlias($alias)
9 
-	{
8 
+	public static function getByAlias($alias)
9 
+	{
10 10 
 		$alias = self::escape($alias);
11 11
12 12 
 		$query = "
 
@@ -34,8 +34,8 @@  discard block
 
 block discarded – undo
34 34 
 		return self::run_row_query($query);
35 35 
 	}
36 36
37 
-	public static function getPeriodList()
38 
-	{
37 
+	public static function getPeriodList()
38 
+	{
39 39 
 		$query = "
40 40 
 			SELECT
41 41 
 				`period`.`name`,
 
@@ -55,8 +55,8 @@  discard block
 
 block discarded – undo
55 55 
 		return self::run_query($query);
56 56 
 	}
57 57
58 
-	public static function getLogListForPeriod($period, $total, $offset = 0)
59 
-	{
58 
+	public static function getLogListForPeriod($period, $total, $offset = 0)
59 
+	{
60 60 
 		$query = "
61 61 
 			SELECT
62 62 
 				`log`.`id`,
 
@@ -86,8 +86,8 @@  discard block
 
 block discarded – undo
86 86 
 		return self::run_query($query);
87 87 
 	}
88 88
89 
-	public static function getLogCountForPeriod($period)
90 
-	{
89 
+	public static function getLogCountForPeriod($period)
90 
+	{
91 91 
 		$query = "
92 92 
 			SELECT
93 93 
 				COUNT(1) AS `count`
Please login to merge, or discard this patch.
collector/waterfall/CountyCollector.class.inc.php 2 patches
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch 
@@ -5,11 +5,11 @@  discard block
 
 block discarded – undo
5 5 
 final class CountyCollector extends Collector
6 6 
 {
7 7
8 
-	public static function getByAlias($alias)
9 
-	{
10 
-		$alias = self::escape($alias);
8 
+    public static function getByAlias($alias)
9 
+    {
10 
+        $alias = self::escape($alias);
11 11
12 
-		$query = "
12 
+        $query = "
13 13 
 			SELECT
14 14 
 				`county`.`id`,
15 15 
 				`county`.`name`,
 
@@ -32,12 +32,12 @@  discard block
 
 block discarded – undo
32 32 
 				`county`.`alias` = '{$alias}'
33 33 
 			LIMIT 1";
34 34
35 
-		return self::run_row_query($query);
36 
-	}
35 
+        return self::run_row_query($query);
36 
+    }
37 37
38 
-	public static function getCountyList()
39 
-	{
40 
-		$query = "
38 
+    public static function getCountyList()
39 
+    {
40 
+        $query = "
41 41 
 			SELECT
42 42 
 				`county`.`name`,
43 43 
 				`county`.`alias`,
 
@@ -54,12 +54,12 @@  discard block
 
 block discarded – undo
54 54 
 			ORDER BY
55 55 
 				`county`.`name`";
56 56
57 
-		return self::run_query($query);
58 
-	}
57 
+        return self::run_query($query);
58 
+    }
59 59
60 
-	public static function getLogListForCounty($county, $total, $offset = 0)
61 
-	{
62 
-		$query = "
60 
+    public static function getLogListForCounty($county, $total, $offset = 0)
61 
+    {
62 
+        $query = "
63 63 
 			SELECT
64 64 
 				`waterfall`.`id`,
65 65 
 				`waterfall`.`name`,
 
@@ -93,12 +93,12 @@  discard block
 
 block discarded – undo
93 93 
 				`watercourse`.`name`
94 94 
 			LIMIT
95 95 
 				{$offset}, {$total}";
96 
-		return self::run_query($query);
97 
-	}
96 
+        return self::run_query($query);
97 
+    }
98 98
99 
-	public static function getLogCountForCounty($county)
100 
-	{
101 
-		$query = "
99 
+    public static function getLogCountForCounty($county)
100 
+    {
101 
+        $query = "
102 102 
 			SELECT
103 103 
 				COUNT(1) AS `count`
104 104 
 			FROM
 
@@ -109,7 +109,7 @@  discard block
 
 block discarded – undo
109 109 
 			WHERE
110 110 
 				`waterfall`.`county` = '{$county}' &&
111 111 
 				`waterfall`.`is_public` = '1'";
112 
-		return self::get_count($query);
113 
-	}
112 
+        return self::get_count($query);
113 
+    }
114 114
115 115 
 }
116 116 
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +10 added lines, -10 removed lines patch added patch discarded remove patch 
@@ -2,11 +2,11 @@  discard block
 
 block discarded – undo
2 2
3 3 
 Loader::load('collector', 'Collector');
4 4
5 
-final class CountyCollector extends Collector
6 
-{
5 
+final class CountyCollector extends Collector
6 
+{
7 7
8 
-	public static function getByAlias($alias)
9 
-	{
8 
+	public static function getByAlias($alias)
9 
+	{
10 10 
 		$alias = self::escape($alias);
11 11
12 12 
 		$query = "
 
@@ -35,8 +35,8 @@  discard block
 
 block discarded – undo
35 35 
 		return self::run_row_query($query);
36 36 
 	}
37 37
38 
-	public static function getCountyList()
39 
-	{
38 
+	public static function getCountyList()
39 
+	{
40 40 
 		$query = "
41 41 
 			SELECT
42 42 
 				`county`.`name`,
 
@@ -57,8 +57,8 @@  discard block
 
 block discarded – undo
57 57 
 		return self::run_query($query);
58 58 
 	}
59 59
60 
-	public static function getLogListForCounty($county, $total, $offset = 0)
61 
-	{
60 
+	public static function getLogListForCounty($county, $total, $offset = 0)
61 
+	{
62 62 
 		$query = "
63 63 
 			SELECT
64 64 
 				`waterfall`.`id`,
 
@@ -96,8 +96,8 @@  discard block
 
 block discarded – undo
96 96 
 		return self::run_query($query);
97 97 
 	}
98 98
99 
-	public static function getLogCountForCounty($county)
100 
-	{
99 
+	public static function getLogCountForCounty($county)
100 
+	{
101 101 
 		$query = "
102 102 
 			SELECT
103 103 
 				COUNT(1) AS `count`
Please login to merge, or discard this patch.
collector/waterfall/LogTagCollector.class.inc.php 2 patches
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch 
@@ -5,11 +5,11 @@  discard block
 
 block discarded – undo
5 5 
 final class LogTagCollector extends Collector
6 6 
 {
7 7
8 
-	public static function getTag($alias)
9 
-	{
10 
-		$alias = self::escape($alias);
8 
+    public static function getTag($alias)
9 
+    {
10 
+        $alias = self::escape($alias);
11 11
12 
-		$query = "
12 
+        $query = "
13 13 
 			SELECT
14 14 
 				`tag`.`id`,
15 15 
 				`tag`.`name`,
 
@@ -20,12 +20,12 @@  discard block
 
 block discarded – undo
20 20 
 				`tag`.`alias` = '{$alias}'
21 21 
 			LIMIT 1";
22 22
23 
-		return self::run_row_query($query);
24 
-	}
23 
+        return self::run_row_query($query);
24 
+    }
25 25
26 
-	public static function getLogListForTag($tag, $total, $offset = 0)
27 
-	{
28 
-		$query = "
26 
+    public static function getLogListForTag($tag, $total, $offset = 0)
27 
+    {
28 
+        $query = "
29 29 
 			SELECT
30 30 
 				`log`.`id`,
31 31 
 				`log`.`title`,
 
@@ -54,12 +54,12 @@  discard block
 
 block discarded – undo
54 54 
 			LIMIT
55 55 
 				{$offset}, {$total}";
56 56
57 
-		return self::run_query($query);
58 
-	}
57 
+        return self::run_query($query);
58 
+    }
59 59
60 
-	public static function getLogCountForTag($tag)
61 
-	{
62 
-		$query = "
60 
+    public static function getLogCountForTag($tag)
61 
+    {
62 
+        $query = "
63 63 
 			SELECT
64 64 
 				COUNT(1) AS `count`
65 65 
 			FROM
 
@@ -71,7 +71,7 @@  discard block
 
 block discarded – undo
71 71 
 				`log_tag_map`.`tag` = '{$tag}' &&
72 72 
 				`log`.`is_public` = '1'";
73 73
74 
-		return self::get_count($query);
75 
-	}
74 
+        return self::get_count($query);
75 
+    }
76 76
77 77 
 }
78 78 
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +8 added lines, -8 removed lines patch added patch discarded remove patch 
@@ -2,11 +2,11 @@  discard block
 
 block discarded – undo
2 2
3 3 
 Loader::load('collector', 'Collector');
4 4
5 
-final class LogTagCollector extends Collector
6 
-{
5 
+final class LogTagCollector extends Collector
6 
+{
7 7
8 
-	public static function getTag($alias)
9 
-	{
8 
+	public static function getTag($alias)
9 
+	{
10 10 
 		$alias = self::escape($alias);
11 11
12 12 
 		$query = "
 
@@ -23,8 +23,8 @@  discard block
 
 block discarded – undo
23 23 
 		return self::run_row_query($query);
24 24 
 	}
25 25
26 
-	public static function getLogListForTag($tag, $total, $offset = 0)
27 
-	{
26 
+	public static function getLogListForTag($tag, $total, $offset = 0)
27 
+	{
28 28 
 		$query = "
29 29 
 			SELECT
30 30 
 				`log`.`id`,
 
@@ -57,8 +57,8 @@  discard block
 
 block discarded – undo
57 57 
 		return self::run_query($query);
58 58 
 	}
59 59
60 
-	public static function getLogCountForTag($tag)
61 
-	{
60 
+	public static function getLogCountForTag($tag)
61 
+	{
62 62 
 		$query = "
63 63 
 			SELECT
64 64 
 				COUNT(1) AS `count`
Please login to merge, or discard this patch.
collector/Collector.class.inc.php 2 patches
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch 
@@ -5,29 +5,29 @@
 
 block discarded – undo
5 5 
 abstract class Collector
6 6 
 {
7 7
8 
-	protected static function run_query($query)
9 
-	{
10 
-		return Database::select($query);
11 
-	}
12 
-
13 
-	protected static function run_row_query($query)
14 
-	{
15 
-		return Database::selectRow($query);
16 
-	}
17 
-
18 
-	protected static function get_count($query)
19 
-	{
20 
-		return Database::selectRow($query)->count;
21 
-	}
22 
-
23 
-	protected static function check_exists($query)
24 
-	{
25 
-		return Database::selectRow($query) !== null;
26 
-	}
27 
-
28 
-	protected static function escape($string)
29 
-	{
30 
-		return Database::escape($string);
31 
-	}
8 
+    protected static function run_query($query)
9 
+    {
10 
+        return Database::select($query);
11 
+    }
12 
+
13 
+    protected static function run_row_query($query)
14 
+    {
15 
+        return Database::selectRow($query);
16 
+    }
17 
+
18 
+    protected static function get_count($query)
19 
+    {
20 
+        return Database::selectRow($query)->count;
21 
+    }
22 
+
23 
+    protected static function check_exists($query)
24 
+    {
25 
+        return Database::selectRow($query) !== null;
26 
+    }
27 
+
28 
+    protected static function escape($string)
29 
+    {
30 
+        return Database::escape($string);
31 
+    }
32 32
33 33 
 }
Please login to merge, or discard this patch.
Braces   +12 added lines, -12 removed lines patch added patch discarded remove patch 
@@ -2,31 +2,31 @@
 
 block discarded – undo
2 2
3 3 
 Loader::loadInstance('utility', 'Database');
4 4
5 
-abstract class Collector
6 
-{
5 
+abstract class Collector
6 
+{
7 7
8 
-	protected static function run_query($query)
9 
-	{
8 
+	protected static function run_query($query)
9 
+	{
10 10 
 		return Database::select($query);
11 11 
 	}
12 12
13 
-	protected static function run_row_query($query)
14 
-	{
13 
+	protected static function run_row_query($query)
14 
+	{
15 15 
 		return Database::selectRow($query);
16 16 
 	}
17 17
18 
-	protected static function get_count($query)
19 
-	{
18 
+	protected static function get_count($query)
19 
+	{
20 20 
 		return Database::selectRow($query)->count;
21 21 
 	}
22 22
23 
-	protected static function check_exists($query)
24 
-	{
23 
+	protected static function check_exists($query)
24 
+	{
25 25 
 		return Database::selectRow($query) !== null;
26 26 
 	}
27 27
28 
-	protected static function escape($string)
29 
-	{
28 
+	protected static function escape($string)
29 
+	{
30 30 
 		return Database::escape($string);
31 31 
 	}
32 32
Please login to merge, or discard this patch.
controller/waterfalls/DefaultPageController.class.inc.php 2 patches
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch 
@@ -5,19 +5,19 @@  discard block
 
 block discarded – undo
5 5 
 abstract class DefaultPageController extends PageController
6 6 
 {
7 7
8 
-	protected static $WEBSITE_TITLE = 'Waterfalls of the Keweenaw';
9 
-	protected static $PAGE_DESCRIPTION_LIMIT = 250;
8 
+    protected static $WEBSITE_TITLE = 'Waterfalls of the Keweenaw';
9 
+    protected static $PAGE_DESCRIPTION_LIMIT = 250;
10 10
11 
-	protected static $WATERFALL_SITE_ID = 5;
11 
+    protected static $WATERFALL_SITE_ID = 5;
12 12
13 13 
     protected $parent_navigation_item = '';
14 14
15 
-	protected function set_head_data()
16 
-	{
17 
-		$this->set_head('google_verification', 'm9ua4n8lp4FUYYa2UOh51UyZYfdivl-kRTtXKwaH0-s');
18 
-		$this->add_css('normalize');
19 
-		$this->add_css('waterfalls');
20 
-	}
15 
+    protected function set_head_data()
16 
+    {
17 
+        $this->set_head('google_verification', 'm9ua4n8lp4FUYYa2UOh51UyZYfdivl-kRTtXKwaH0-s');
18 
+        $this->add_css('normalize');
19 
+        $this->add_css('waterfalls');
20 
+    }
21 21
22 22 
     protected function add_waterfall_js()
23 23 
     {
 
@@ -26,9 +26,9 @@  discard block
 
 block discarded – undo
26 26 
         $this->add_js('waterfalls');
27 27 
     }
28 28
29 
-	protected function set_body_data($page_type = 'normal')
30 
-	{
31 
-		$this->set_body('activity_array', $this->get_recent_activity());
29 
+    protected function set_body_data($page_type = 'normal')
30 
+    {
31 
+        $this->set_body('activity_array', $this->get_recent_activity());
32 32
33 33 
         $this->set_body('main_navigation', array(
34 34 
                 (object) array(
Please login to merge, or discard this patch.
Braces   +8 added lines, -8 removed lines patch added patch discarded remove patch 
@@ -2,8 +2,8 @@  discard block
 
 block discarded – undo
2 2
3 3 
 Loader::load('controller', '/PageController');
4 4
5 
-abstract class DefaultPageController extends PageController
6 
-{
5 
+abstract class DefaultPageController extends PageController
6 
+{
7 7
8 8 
 	protected static $WEBSITE_TITLE = 'Waterfalls of the Keweenaw';
9 9 
 	protected static $PAGE_DESCRIPTION_LIMIT = 250;
 
@@ -12,22 +12,22 @@  discard block
 
 block discarded – undo
12 12
13 13 
     protected $parent_navigation_item = '';
14 14
15 
-	protected function set_head_data()
16 
-	{
15 
+	protected function set_head_data()
16 
+	{
17 17 
 		$this->set_head('google_verification', 'm9ua4n8lp4FUYYa2UOh51UyZYfdivl-kRTtXKwaH0-s');
18 18 
 		$this->add_css('normalize');
19 19 
 		$this->add_css('waterfalls');
20 20 
 	}
21 21
22 
-    protected function add_waterfall_js()
23 
-    {
22 
+    protected function add_waterfall_js()
23 
+    {
24 24 
         $this->add_js('jquery');
25 25 
         $this->add_js('imagelightbox');
26 26 
         $this->add_js('waterfalls');
27 27 
     }
28 28
29 
-	protected function set_body_data($page_type = 'normal')
30 
-	{
29 
+	protected function set_body_data($page_type = 'normal')
30 
+	{
31 31 
 		$this->set_body('activity_array', $this->get_recent_activity());
32 32
33 33 
         $this->set_body('main_navigation', array(
Please login to merge, or discard this patch.
controller/lifestream/DefaultPageController.class.inc.php 2 patches
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch 
@@ -6,25 +6,25 @@
 
 block discarded – undo
6 6 
 abstract class DefaultPageController extends PageController
7 7 
 {
8 8
9 
-  protected $activityRepository;
9 
+    protected $activityRepository;
10 10
11 
-  public function __construct()
12 
-  {
11 
+    public function __construct()
12 
+    {
13 13 
     parent::__construct();
14 14
15 15 
     global $container;
16 16 
     $this->activityRepository = new Jacobemerick\Web\Domain\Stream\Activity\MysqlActivityRepository($container['db_connection_locator']);
17 
-  }
18 
-
19 
-	protected function set_head_data()
20 
-	{
21 
-		$this->add_css('normalize');
22 
-		$this->add_css('lifestream', 2);
23 
-	}
24 
-
25 
-	protected function set_body_data()
26 
-	{
27 
-		$this->set_body_view('Page');
28 
-	}
17 
+    }
18 
+
19 
+    protected function set_head_data()
20 
+    {
21 
+        $this->add_css('normalize');
22 
+        $this->add_css('lifestream', 2);
23 
+    }
24 
+
25 
+    protected function set_body_data()
26 
+    {
27 
+        $this->set_body_view('Page');
28 
+    }
29 29
30 30 
 }
Please login to merge, or discard this patch.
Braces   +8 added lines, -8 removed lines patch added patch discarded remove patch 
@@ -3,27 +3,27 @@
 
 block discarded – undo
3 3 
 Loader::load('controller', '/PageController');
4 4 
 Loader::load('utility', 'Content');
5 5
6 
-abstract class DefaultPageController extends PageController
7 
-{
6 
+abstract class DefaultPageController extends PageController
7 
+{
8 8
9 9 
   protected $activityRepository;
10 10
11 
-  public function __construct()
12 
-  {
11 
+  public function __construct()
12 
+  {
13 13 
     parent::__construct();
14 14
15 15 
     global $container;
16 16 
     $this->activityRepository = new Jacobemerick\Web\Domain\Stream\Activity\MysqlActivityRepository($container['db_connection_locator']);
17 17 
   }
18 18
19 
-	protected function set_head_data()
20 
-	{
19 
+	protected function set_head_data()
20 
+	{
21 21 
 		$this->add_css('normalize');
22 22 
 		$this->add_css('lifestream', 2);
23 23 
 	}
24 24
25 
-	protected function set_body_data()
26 
-	{
25 
+	protected function set_body_data()
26 
+	{
27 27 
 		$this->set_body_view('Page');
28 28 
 	}
29 29
Please login to merge, or discard this patch.
controller/lifestream/AboutController.class.inc.php 2 patches
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch 
@@ -5,33 +5,33 @@
 
 block discarded – undo
5 5 
 final class AboutController extends DefaultPageController
6 6 
 {
7 7
8 
-	private static $TITLE = "About | What's a Lifestream?";
9 
-	private static $DESCRIPTION = 'A breakdown of what a lifestream is, why Jacob Emerick made one, and how he made it.';
8 
+    private static $TITLE = "About | What's a Lifestream?";
9 
+    private static $DESCRIPTION = 'A breakdown of what a lifestream is, why Jacob Emerick made one, and how he made it.';
10 10
11 
-	private static $KEYWORD_ARRAY = array(
12 
-		'about',
13 
-		'lifestream',
14 
-		'feed',
15 
-		'activity stream',
16 
-		'Jacob Emerick',
17 
-		'jpemeric');
11 
+    private static $KEYWORD_ARRAY = array(
12 
+        'about',
13 
+        'lifestream',
14 
+        'feed',
15 
+        'activity stream',
16 
+        'Jacob Emerick',
17 
+        'jpemeric');
18 18
19 
-	protected function set_head_data()
20 
-	{
21 
-		$this->set_title(self::$TITLE);
22 
-		$this->set_description(self::$DESCRIPTION);
23 
-		$this->set_keywords(self::$KEYWORD_ARRAY);
19 
+    protected function set_head_data()
20 
+    {
21 
+        $this->set_title(self::$TITLE);
22 
+        $this->set_description(self::$DESCRIPTION);
23 
+        $this->set_keywords(self::$KEYWORD_ARRAY);
24 24
25 
-		parent::set_head_data();
26 
-	}
25 
+        parent::set_head_data();
26 
+    }
27 27
28 
-	protected function set_body_data()
29 
-	{
30 
-		$this->set_body('title', "WHAT'S A LIFESTREAM?");
31 
-		$this->set_body('type', 'about');
32 
-		$this->set_body('view', 'About');
28 
+    protected function set_body_data()
29 
+    {
30 
+        $this->set_body('title', "WHAT'S A LIFESTREAM?");
31 
+        $this->set_body('type', 'about');
32 
+        $this->set_body('view', 'About');
33 33
34 
-		parent::set_body_data();
35 
-	}
34 
+        parent::set_body_data();
35 
+    }
36 36
37 37 
 }
38 38 
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -2,8 +2,8 @@  discard block
 
 block discarded – undo
2 2
3 3 
 Loader::load('controller', 'home/DefaultPageController');
4 4
5 
-final class AboutController extends DefaultPageController
6 
-{
5 
+final class AboutController extends DefaultPageController
6 
+{
7 7
8 8 
 	private static $TITLE = 'About | Jacob Emerick';
9 9 
 	private static $DESCRIPTION = 'Some basic information about Jacob Emerick and his past, web development, and hiking adventures';
 
@@ -17,8 +17,8 @@  discard block
 
 block discarded – undo
17 17 
 		'web developer',
18 18 
 		'hiker');
19 19
20 
-	protected function set_head_data()
21 
-	{
20 
+	protected function set_head_data()
21 
+	{
22 22 
 		$this->set_title(self::$TITLE);
23 23 
 		$this->set_description(self::$DESCRIPTION);
24 24 
 		$this->set_keywords(self::$KEYWORD_ARRAY);
 
@@ -26,8 +26,8 @@  discard block
 
 block discarded – undo
26 26 
 		parent::set_head_data();
27 27 
 	}
28 28
29 
-	protected function set_body_data()
30 
-	{
29 
+	protected function set_body_data()
30 
+	{
31 31 
 		$this->set_body_view('About');
32 32
33 33 
 		parent::set_body_data();
Please login to merge, or discard this patch.