@@ -2,7 +2,7 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Jacobemerick\Web\Domain\Blog\Introduction; |
| 4 | 4 | |
| 5 | -interface IntroductionRepositoryInterface |
|
| 6 | -{ |
|
| 5 | +interface IntroductionRepositoryInterface |
|
| 6 | +{
|
|
| 7 | 7 | public function findByType($type, $value = ''); |
| 8 | 8 | } |
@@ -2,7 +2,7 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Jacobemerick\Web\Domain\Stream\Changelog; |
| 4 | 4 | |
| 5 | -interface ChangelogRepositoryInterface |
|
| 6 | -{ |
|
| 5 | +interface ChangelogRepositoryInterface |
|
| 6 | +{
|
|
| 7 | 7 | public function getChanges($limit = null, $offset = 0); |
| 8 | 8 | } |
@@ -2,8 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Jacobemerick\Web\Domain\Stream\Activity; |
| 4 | 4 | |
| 5 | -interface ActivityRepositoryInterface |
|
| 6 | -{ |
|
| 5 | +interface ActivityRepositoryInterface |
|
| 6 | +{
|
|
| 7 | 7 | public function getActivityById($id); |
| 8 | 8 | public function getActivities($limit = null, $offset = 0); |
| 9 | 9 | public function getActivitiesCount(); |
@@ -5,9 +5,9 @@ discard block |
||
| 5 | 5 | final class PhotoCollector extends Collector |
| 6 | 6 | { |
| 7 | 7 | |
| 8 | - public static function fetchRow($category, $photo) |
|
| 9 | - { |
|
| 10 | - $query = " |
|
| 8 | + public static function fetchRow($category, $photo) |
|
| 9 | + { |
|
| 10 | + $query = " |
|
| 11 | 11 | SELECT |
| 12 | 12 | `photo`.`name`, |
| 13 | 13 | `photo_category`.`name` AS `category`, |
@@ -24,12 +24,12 @@ discard block |
||
| 24 | 24 | `photo`.`name` = '{$photo}' && |
| 25 | 25 | `photo_category`.`name` = '{$category}' |
| 26 | 26 | LIMIT 1"; |
| 27 | - return self::run_row_query($query); |
|
| 28 | - } |
|
| 27 | + return self::run_row_query($query); |
|
| 28 | + } |
|
| 29 | 29 | |
| 30 | - public static function getRow($id) |
|
| 31 | - { |
|
| 32 | - $query = " |
|
| 30 | + public static function getRow($id) |
|
| 31 | + { |
|
| 32 | + $query = " |
|
| 33 | 33 | SELECT |
| 34 | 34 | `photo`.`name`, |
| 35 | 35 | `photo_category`.`name` AS `category`, |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | `photo`.`photographer` = `photographer`.`id` && |
| 46 | 46 | `photo`.`id` = '{$id}' |
| 47 | 47 | LIMIT 1"; |
| 48 | - return self::run_row_query($query); |
|
| 49 | - } |
|
| 48 | + return self::run_row_query($query); |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | 51 | } |
@@ -2,11 +2,11 @@ discard block |
||
| 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 |
||
| 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`, |
@@ -5,9 +5,9 @@ discard block |
||
| 5 | 5 | final class AlbumCollector extends Collector |
| 6 | 6 | { |
| 7 | 7 | |
| 8 | - public static function getPhotoListForAlbum($album) |
|
| 9 | - { |
|
| 10 | - $query = " |
|
| 8 | + public static function getPhotoListForAlbum($album) |
|
| 9 | + { |
|
| 10 | + $query = " |
|
| 11 | 11 | SELECT |
| 12 | 12 | `photo`.`name`, |
| 13 | 13 | `photo_category`.`name` AS `category`, |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | ORDER BY |
| 39 | 39 | `photo`.`date_taken`"; |
| 40 | 40 | |
| 41 | - return self::run_query($query); |
|
| 42 | - } |
|
| 41 | + return self::run_query($query); |
|
| 42 | + } |
|
| 43 | 43 | |
| 44 | 44 | } |
| 45 | 45 | \ No newline at end of file |
@@ -2,11 +2,11 @@ |
||
| 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`, |
@@ -5,9 +5,9 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
@@ -2,11 +2,11 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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` |
@@ -5,11 +5,11 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
@@ -2,11 +2,11 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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` |
@@ -5,11 +5,11 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
@@ -2,11 +2,11 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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` |
@@ -5,11 +5,11 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
@@ -2,11 +2,11 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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` |