Completed
Push — master ( 6d742b...a712f0 )
by Jacob
03:01
created
collector/image/AlbumCollector.class.inc.php 1 patch
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -2,11 +2,11 @@
 block discarded – undo
2 2
 
3 3
 Loader::load('collector', 'Collector');
4 4
 
5
-final class AlbumCollector extends Collector
6
-{
5
+final class AlbumCollector extends Collector
6
+{
7 7
 
8
-	public static function getPhotoListForAlbum($album)
9
-	{
8
+	public static function getPhotoListForAlbum($album)
9
+	{
10 10
 		$query = "
11 11
 			SELECT
12 12
 				`photo`.`name`,
Please login to merge, or discard this patch.
collector/image/PhotoCollector.class.inc.php 1 patch
Braces   +6 added lines, -6 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 PhotoCollector extends Collector
6
-{
5
+final class PhotoCollector extends Collector
6
+{
7 7
 
8
-	public static function fetchRow($category, $photo)
9
-	{
8
+	public static function fetchRow($category, $photo)
9
+	{
10 10
 		$query = "
11 11
 			SELECT
12 12
 				`photo`.`name`,
@@ -27,8 +27,8 @@  discard block
 block discarded – undo
27 27
 		return self::run_row_query($query);
28 28
 	}
29 29
 
30
-	public static function getRow($id)
31
-	{
30
+	public static function getRow($id)
31
+	{
32 32
 		$query = "
33 33
 			SELECT
34 34
 				`photo`.`name`,
Please login to merge, or discard this patch.
collector/waterfall/CountyCollector.class.inc.php 1 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/WaterfallCollector.class.inc.php 1 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 WaterfallCollector extends Collector
6
-{
5
+final class WaterfallCollector extends Collector
6
+{
7 7
 
8
-	public static function getList($total, $offset = 0)
9
-	{
8
+	public static function getList($total, $offset = 0)
9
+	{
10 10
 		$query = "
11 11
 			SELECT
12 12
 				`waterfall`.`id`,
@@ -43,8 +43,8 @@  discard block
 block discarded – undo
43 43
 		return self::run_query($query);
44 44
 	}
45 45
 
46
-    public static function getMapList()
47
-    {
46
+    public static function getMapList()
47
+    {
48 48
         $query = "
49 49
             SELECT
50 50
                 `waterfall`.`name`,
@@ -74,8 +74,8 @@  discard block
 block discarded – undo
74 74
         return self::run_query($query);
75 75
     }
76 76
 
77
-	public static function getListCount()
78
-	{
77
+	public static function getListCount()
78
+	{
79 79
 		$query = "
80 80
 			SELECT
81 81
 				COUNT(1) AS `count`
@@ -92,8 +92,8 @@  discard block
 block discarded – undo
92 92
 		return self::get_count($query);
93 93
 	}
94 94
 
95
-    public static function getNearbyList($waterfall)
96
-    {
95
+    public static function getNearbyList($waterfall)
96
+    {
97 97
         $query = "
98 98
             SELECT
99 99
                 `waterfall`.`name`,
@@ -117,8 +117,8 @@  discard block
 block discarded – undo
117 117
         return self::run_query($query);
118 118
     }
119 119
 
120
-    public static function getByOldAlias($alias)
121
-    {
120
+    public static function getByOldAlias($alias)
121
+    {
122 122
         $alias = self::escape($alias);
123 123
         
124 124
         $query = "
@@ -137,8 +137,8 @@  discard block
 block discarded – undo
137 137
         return self::run_row_query($query);
138 138
     }
139 139
 
140
-	public static function getByAlias($watercourse, $waterfall)
141
-	{
140
+	public static function getByAlias($watercourse, $waterfall)
141
+	{
142 142
 		$watercourse = self::escape($watercourse);
143 143
 		$waterfall = self::escape($waterfall);
144 144
 		
Please login to merge, or discard this patch.
collector/waterfall/WatercourseCollector.class.inc.php 1 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/LogTagCollector.class.inc.php 1 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/waterfall/LogCollector.class.inc.php 1 patch
Braces   +26 added lines, -26 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 LogCollector extends Collector
6
-{
5
+final class LogCollector extends Collector
6
+{
7 7
 
8
-	public static function getList($total, $offset = 0)
9
-	{
8
+	public static function getList($total, $offset = 0)
9
+	{
10 10
 		$query = "
11 11
 			SELECT
12 12
 				`log`.`id`,
@@ -34,8 +34,8 @@  discard block
 block discarded – undo
34 34
 		return self::run_query($query);
35 35
 	}
36 36
 
37
-    public static function getRecentList($total)
38
-    {
37
+    public static function getRecentList($total)
38
+    {
39 39
         $query = "
40 40
             SELECT
41 41
                 `log`.`title`,
@@ -62,8 +62,8 @@  discard block
 block discarded – undo
62 62
         return self::run_query($query);
63 63
     }
64 64
 
65
-	public static function getListCount()
66
-	{
65
+	public static function getListCount()
66
+	{
67 67
 		$query = "
68 68
 			SELECT
69 69
 				COUNT(1) AS `count`
@@ -74,8 +74,8 @@  discard block
 block discarded – undo
74 74
 		return self::get_count($query);
75 75
 	}
76 76
 
77
-	public static function getCompanionListForLog($log)
78
-	{
77
+	public static function getCompanionListForLog($log)
78
+	{
79 79
 		$query = "
80 80
 			SELECT
81 81
 				`companion`.`name`,
@@ -90,8 +90,8 @@  discard block
 block discarded – undo
90 90
 		return self::run_query($query);
91 91
 	}
92 92
 
93
-	public static function getWaterfallListForLog($log)
94
-	{
93
+	public static function getWaterfallListForLog($log)
94
+	{
95 95
 		$query = "
96 96
 			SELECT
97 97
 				`waterfall`.`name`,
@@ -113,8 +113,8 @@  discard block
 block discarded – undo
113 113
 		return self::run_query($query);
114 114
 	}
115 115
 
116
-	public static function getLogListForWaterfall($waterfall)
117
-	{
116
+	public static function getLogListForWaterfall($waterfall)
117
+	{
118 118
 		$query = "
119 119
 			SELECT
120 120
 				`log`.`title`,
@@ -133,8 +133,8 @@  discard block
 block discarded – undo
133 133
 		return self::run_query($query);
134 134
 	}
135 135
 
136
-	public static function getTagListForLog($log)
137
-	{
136
+	public static function getTagListForLog($log)
137
+	{
138 138
 		$query = "
139 139
 			SELECT
140 140
 				`tag`.`name`,
@@ -147,8 +147,8 @@  discard block
 block discarded – undo
147 147
 		return self::run_query($query);
148 148
 	}
149 149
 
150
-	public static function getByAlias($alias)
151
-	{
150
+	public static function getByAlias($alias)
151
+	{
152 152
 		$alias = self::escape($alias);
153 153
 		
154 154
 		$query = "
@@ -178,8 +178,8 @@  discard block
 block discarded – undo
178 178
 		return self::run_row_query($query);
179 179
 	}
180 180
 
181
-    public static function getByDate($date)
182
-    {
181
+    public static function getByDate($date)
182
+    {
183 183
         $date = self::escape($date);
184 184
         
185 185
         $query = "
@@ -195,8 +195,8 @@  discard block
 block discarded – undo
195 195
         return self::run_row_query($query);
196 196
     }
197 197
 	
198
-	public static function getById($log)
199
-	{
198
+	public static function getById($log)
199
+	{
200 200
 		$query = "
201 201
 			SELECT
202 202
 				`title`,
@@ -211,8 +211,8 @@  discard block
 block discarded – undo
211 211
 		return self::run_row_query($query);
212 212
 	}
213 213
 
214
-	public static function getPreviousLog($log)
215
-	{
214
+	public static function getPreviousLog($log)
215
+	{
216 216
 		$query = "
217 217
 			SELECT
218 218
 				`title`,
@@ -236,8 +236,8 @@  discard block
 block discarded – undo
236 236
 		return self::run_row_query($query);
237 237
 	}
238 238
 
239
-	public static function getNextLog($log)
240
-	{
239
+	public static function getNextLog($log)
240
+	{
241 241
 		$query = "
242 242
 			SELECT
243 243
 				`title`,
Please login to merge, or discard this patch.
collector/waterfall/CompanionCollector.class.inc.php 1 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 1 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.