jacobemerick / web

module/form/CommentSubmitModule.class.inc.php

Indentation +148 added lines, -148 removed lines

@@ -3,165 +3,165 @@ 
 Loader::load('collector', 'comment/CommentCollector');
 
 Loader::load('utility', array(
-	'Content',
-	'Request',
-	'Validate'));
+    'Content',
+    'Request',
+    'Validate'));
 
 final class CommentSubmitModule
 {
 
-	private $site;
-	private $path;
-	private $full_path;
-	private $page_title;
-
-	public function __construct($site, $path, $full_path, $page_title)
-	{
-		$this->site = $site;
-		$this->path = $path;
-		$this->full_path = $full_path;
-		$this->page_title = $page_title;
-	}
-
-	public function activate()
-	{
-		if(!Request::hasPost())
-			return false;
-		if(!Request::getPost('submit') == 'Submit Comment')
-			return false;
-		
-		$errors = $this->fetch_errors();
-		if(count($errors) > 0)
-			return $errors;
-		if(Request::getPost('catch') !== '')
-			return false;
-		
-		$page_id = $this->save_comment_page();
-		$commenter_id = $this->save_commenter();
-		$comment_id = $this->save_comment();
-		
-		$comment_meta_id = $this->save_comment_meta($commenter_id, $comment_id, $page_id);
+    private $site;
+    private $path;
+    private $full_path;
+    private $page_title;
+
+    public function __construct($site, $path, $full_path, $page_title)
+    {
+        $this->site = $site;
+        $this->path = $path;
+        $this->full_path = $full_path;
+        $this->page_title = $page_title;
+    }
+
+    public function activate()
+    {
+        if(!Request::hasPost())
+            return false;
+        if(!Request::getPost('submit') == 'Submit Comment')
+            return false;
+		
+        $errors = $this->fetch_errors();
+        if(count($errors) > 0)
+            return $errors;
+        if(Request::getPost('catch') !== '')
+            return false;
+		
+        $page_id = $this->save_comment_page();
+        $commenter_id = $this->save_commenter();
+        $comment_id = $this->save_comment();
+		
+        $comment_meta_id = $this->save_comment_meta($commenter_id, $comment_id, $page_id);
     $comment_service_id = $this->save_to_comment_service(Request::getPost());
 		
-		$this->send_notifications($page_id);
-		$this->redirect_to_comment($comment_meta_id);
-	}
-
-	private function fetch_errors()
-	{
-		$errors = array();
-		if(!Validate::checkRequest('post', 'name', 'name'))
-			$errors['name'] = 'You must include a valid name';
-		if(!Validate::checkRequest('post', 'email', 'email'))
-			$errors['email'] = 'You must include a valid email';
-		if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))
-			$errors['website'] = 'Please enter a valid website';
-		if(!Validate::checkRequest('post', 'comment', 'string'))
-			$errors['comment'] = 'You must enter a comment';
-		if(Request::getPost('notify') && Request::getPost('notify') != 'check')
-			$errors['notify'] = 'You entered an invalid notify request';
-		if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))
-			$errors['reply'] = 'You entered an invalid reply request';
-		
-		return $errors;
-	}
-
-	private function save_comment_page()
-	{
-		$page_result = CommentCollector::getCommentPageByURL($this->path, $this->site);
-		if($page_result !== null)
-			return $page_result->id;
-		
-		$query = "INSERT INTO `jpemeric_comment`.`comment_page` (`site`, `path`) VALUES ('%d', '%s')";
-		$query = sprintf($query, $this->site, $this->path);
-		Database::execute($query);
-		
-		return Database::lastInsertID();
-	}
-
-	private function save_commenter()
-	{
-		$cookie_value = array(
-			'name' => Request::getPost('name'),
-			'email' => Request::getPost('email'));
-		
-		if(Request::getPost('website') != '')
-			$cookie_value['website'] = Request::getPost('website');
+        $this->send_notifications($page_id);
+        $this->redirect_to_comment($comment_meta_id);
+    }
+
+    private function fetch_errors()
+    {
+        $errors = array();
+        if(!Validate::checkRequest('post', 'name', 'name'))
+            $errors['name'] = 'You must include a valid name';
+        if(!Validate::checkRequest('post', 'email', 'email'))
+            $errors['email'] = 'You must include a valid email';
+        if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))
+            $errors['website'] = 'Please enter a valid website';
+        if(!Validate::checkRequest('post', 'comment', 'string'))
+            $errors['comment'] = 'You must enter a comment';
+        if(Request::getPost('notify') && Request::getPost('notify') != 'check')
+            $errors['notify'] = 'You entered an invalid notify request';
+        if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))
+            $errors['reply'] = 'You entered an invalid reply request';
+		
+        return $errors;
+    }
+
+    private function save_comment_page()
+    {
+        $page_result = CommentCollector::getCommentPageByURL($this->path, $this->site);
+        if($page_result !== null)
+            return $page_result->id;
+		
+        $query = "INSERT INTO `jpemeric_comment`.`comment_page` (`site`, `path`) VALUES ('%d', '%s')";
+        $query = sprintf($query, $this->site, $this->path);
+        Database::execute($query);
+		
+        return Database::lastInsertID();
+    }
+
+    private function save_commenter()
+    {
+        $cookie_value = array(
+            'name' => Request::getPost('name'),
+            'email' => Request::getPost('email'));
+		
+        if(Request::getPost('website') != '')
+            $cookie_value['website'] = Request::getPost('website');
 
     setcookie('commenter', json_encode($cookie_value), time() + 31536000, '/', 'jacobemerick.com');
 
-		$commenter_result = CommentCollector::getCommenterByFields(Request::getPost('name'), Request::getPost('email'), Request::getPost('website'));
-		if($commenter_result !== null)
-			return $commenter_result->id;
+        $commenter_result = CommentCollector::getCommenterByFields(Request::getPost('name'), Request::getPost('email'), Request::getPost('website'));
+        if($commenter_result !== null)
+            return $commenter_result->id;
 		
-		$query = "INSERT INTO `jpemeric_comment`.`commenter` (`name`,`email`,`url`) VALUES ('%s','%s','%s')";
+        $query = "INSERT INTO `jpemeric_comment`.`commenter` (`name`,`email`,`url`) VALUES ('%s','%s','%s')";
 		
-		$name = Database::escape(Request::getPost('name'));
-		$email = Database::escape(Request::getPost('email'));
-		$website = Database::escape(Request::getPost('website'));
+        $name = Database::escape(Request::getPost('name'));
+        $email = Database::escape(Request::getPost('email'));
+        $website = Database::escape(Request::getPost('website'));
 		
-		$query = sprintf($query, $name, $email, $website);
-		Database::execute($query);
-		return Database::lastInsertID();
-	}
+        $query = sprintf($query, $name, $email, $website);
+        Database::execute($query);
+        return Database::lastInsertID();
+    }
 
-	private function save_comment()
-	{
-		$comment_result = CommentCollector::getCommentByBody(Request::getPost('comment'));
-		if($comment_result !== null)
-			return $comment_result->id;
+    private function save_comment()
+    {
+        $comment_result = CommentCollector::getCommentByBody(Request::getPost('comment'));
+        if($comment_result !== null)
+            return $comment_result->id;
 		
-		$query = "INSERT INTO `jpemeric_comment`.`comment` (`body`, `body_format`) VALUES ('%s', '%s')";
+        $query = "INSERT INTO `jpemeric_comment`.`comment` (`body`, `body_format`) VALUES ('%s', '%s')";
 		
-		$body = Database::escape(Request::getPost('comment'));
+        $body = Database::escape(Request::getPost('comment'));
 		
-		$body_format = Request::getPost('comment');
-		$body_format = Content::instance('CleanComment', $body_format)->activate();
-		$body_format = Database::escape($body_format);
+        $body_format = Request::getPost('comment');
+        $body_format = Content::instance('CleanComment', $body_format)->activate();
+        $body_format = Database::escape($body_format);
 		
-		$query = sprintf($query, $body, $body_format);
-		Database::execute($query);
-		return Database::lastInsertID();
-	}
+        $query = sprintf($query, $body, $body_format);
+        Database::execute($query);
+        return Database::lastInsertID();
+    }
 
-	private function save_comment_meta($commenter, $comment, $page)
-	{
-		$query = "INSERT INTO `jpemeric_comment`.`comment_meta` (`commenter`,`comment`,`reply`,`notify`,`comment_page`,`date`,`display`) VALUES ('%d','%d','%d','%d','%d','%s','%d')";
+    private function save_comment_meta($commenter, $comment, $page)
+    {
+        $query = "INSERT INTO `jpemeric_comment`.`comment_meta` (`commenter`,`comment`,`reply`,`notify`,`comment_page`,`date`,`display`) VALUES ('%d','%d','%d','%d','%d','%s','%d')";
 		
-		$reply = Database::escape(Request::getPost('type'));
-		if($reply == 'new')
-			$reply = 0;
-		// else check to make sure value is legit
+        $reply = Database::escape(Request::getPost('type'));
+        if($reply == 'new')
+            $reply = 0;
+        // else check to make sure value is legit
 		
-		$notify = (Request::getPost('notify') == 'check') ? 1 : 0;
-		$date = date('Y-m-d H:i:s');
-		$display = 1;
+        $notify = (Request::getPost('notify') == 'check') ? 1 : 0;
+        $date = date('Y-m-d H:i:s');
+        $display = 1;
 		
-		$query = sprintf($query, $commenter, $comment, $reply, $notify, $page, $date, $display);
-		Database::execute($query);
-		return Database::lastInsertID();
-	}
+        $query = sprintf($query, $commenter, $comment, $reply, $notify, $page, $date, $display);
+        Database::execute($query);
+        return Database::lastInsertID();
+    }
 
-	private function send_notifications($page)
-	{
-		$email_recipient_array = array();
+    private function send_notifications($page)
+    {
+        $email_recipient_array = array();
 		
-		$commenter_result = CommentCollector::getCommenterByFields(Request::getPost('name'), Request::getPost('email'), Request::getPost('website'));
+        $commenter_result = CommentCollector::getCommenterByFields(Request::getPost('name'), Request::getPost('email'), Request::getPost('website'));
 		
-		if($commenter_result->trusted == 1)
-		{
-			$notification_result = CommentCollector::getNotificationForPage($page);
+        if($commenter_result->trusted == 1)
+        {
+            $notification_result = CommentCollector::getNotificationForPage($page);
 			
-			foreach($notification_result as $notification_row)
-			{
-				if($notification_row->email == Request::getPost('email'))
-					continue;
+            foreach($notification_result as $notification_row)
+            {
+                if($notification_row->email == Request::getPost('email'))
+                    continue;
 				
-				$email_recipient_array[$notification_row->email] = array(
-					'email' => $notification_row->email,
-					'name' => $notification_row->name);
-			}
-		}
+                $email_recipient_array[$notification_row->email] = array(
+                    'email' => $notification_row->email,
+                    'name' => $notification_row->name);
+            }
+        }
         
         $site = URLDecode::getSite();
         
@@ -175,26 +175,26 @@ 
 
     global $container;
 
-		foreach($email_recipient_array as $email_recipient)
-		{
-      $sent = $container['mail']
+        foreach($email_recipient_array as $email_recipient)
+        {
+        $sent = $container['mail']
         ->addTo($email_recipient['email'], $email_recipient['name'])
         ->addBCC($container['config']->admin_email)
         ->setSubject($subject)
         ->setPlainMessage($message)
         ->send();		
-		}
-	}
-
-	private function redirect_to_comment($comment_id)
-	{
-		$url = '';
-		$url .= $this->full_path;
-		$url .= "#comment-{$comment_id}";
-		
-		Loader::loadNew('controller', 'Error303Controller', array($url))->activate();
-		exit;
-	}
+        }
+    }
+
+    private function redirect_to_comment($comment_id)
+    {
+        $url = '';
+        $url .= $this->full_path;
+        $url .= "#comment-{$comment_id}";
+		
+        Loader::loadNew('controller', 'Error303Controller', array($url))->activate();
+        exit;
+    }
 
     private function save_to_comment_service(array $data)
     {

collector/image/PhotoCollector.class.inc.php

Indentation +10 added lines, -10 removed lines

@@ -5,9 +5,9 @@ 
 final class PhotoCollector extends Collector
 {
 
-	public static function fetchRow($category, $photo)
-	{
-		$query = "
+    public static function fetchRow($category, $photo)
+    {
+        $query = "
 			SELECT
 				`photo`.`name`,
 				`photo_category`.`name` AS `category`,
@@ -24,12 +24,12 @@ 
 				`photo`.`name` = '{$photo}' &&
 				`photo_category`.`name` = '{$category}'
 			LIMIT 1";
-		return self::run_row_query($query);
-	}
+        return self::run_row_query($query);
+    }
 
-	public static function getRow($id)
-	{
-		$query = "
+    public static function getRow($id)
+    {
+        $query = "
 			SELECT
 				`photo`.`name`,
 				`photo_category`.`name` AS `category`,
@@ -45,7 +45,7 @@ 
 				`photo`.`photographer` = `photographer`.`id` &&
 				`photo`.`id` = '{$id}'
 			LIMIT 1";
-		return self::run_row_query($query);
-	}
+        return self::run_row_query($query);
+    }
 
 }

collector/image/AlbumCollector.class.inc.php

Indentation +5 added lines, -5 removed lines

@@ -5,9 +5,9 @@ 
 final class AlbumCollector extends Collector
 {
 
-	public static function getPhotoListForAlbum($album)
-	{
-		$query = "
+    public static function getPhotoListForAlbum($album)
+    {
+        $query = "
 			SELECT
 				`photo`.`name`,
 				`photo_category`.`name` AS `category`,
@@ -38,7 +38,7 @@ 
 			ORDER BY
 				`photo`.`date_taken`";
 		
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 
 }
\ No newline at end of file

collector/waterfall/WatercourseCollector.class.inc.php

Indentation +26 added lines, -26 removed lines

@@ -5,9 +5,9 @@ 
 final class WatercourseCollector extends Collector
 {
 
-	public static function getById($id)
-	{
-		$query = "
+    public static function getById($id)
+    {
+        $query = "
 			SELECT
 				`watercourse`.`name`,
 				`watercourse`.`alias`
@@ -17,14 +17,14 @@ 
 				`watercourse`.`id` = '{$id}'
 			LIMIT 1";
 			
-		return self::run_row_query($query);
-	}
+        return self::run_row_query($query);
+    }
 
-	public static function getByAlias($alias)
-	{
-		$alias = self::escape($alias);
+    public static function getByAlias($alias)
+    {
+        $alias = self::escape($alias);
 		
-		$query = "
+        $query = "
 			SELECT
 				`watercourse`.`id`,
 				`watercourse`.`name`,
@@ -48,12 +48,12 @@ 
 				`watercourse`.`alias` = '{$alias}'
 			LIMIT 1";
 			
-		return self::run_row_query($query);
-	}
+        return self::run_row_query($query);
+    }
 
-	public static function getWatercourseList()
-	{
-		$query = "
+    public static function getWatercourseList()
+    {
+        $query = "
 			SELECT
 				`sum_table`.`name`,
 				`sum_table`.`alias`,
@@ -111,12 +111,12 @@ 
 			ORDER BY
 				`sum_table`.`name`";
 		
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 
-	public static function getLogListForWatercourse($watercourse, $total, $offset = 0)
-	{
-		$query = "
+    public static function getLogListForWatercourse($watercourse, $total, $offset = 0)
+    {
+        $query = "
 			SELECT
 				`waterfall`.`id`,
 				`waterfall`.`name`,
@@ -150,16 +150,16 @@ 
 				`watercourse`
 			LIMIT
 				{$offset}, {$total}";
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 
     public static function getParentWatercourse($watercourse)
     {
     }
 
-	public static function getLogCountForWatercourse($watercourse)
-	{
-		$query = "
+    public static function getLogCountForWatercourse($watercourse)
+    {
+        $query = "
 			SELECT
 				SUM(`count`) AS `count`
 			FROM
@@ -206,7 +206,7 @@ 
 					)
 				) AS `sum_table`";
 		
-		return self::get_count($query);
-	}
+        return self::get_count($query);
+    }
 
 }
\ No newline at end of file

collector/waterfall/CompanionCollector.class.inc.php

Indentation +21 added lines, -21 removed lines

@@ -5,11 +5,11 @@ 
 final class CompanionCollector extends Collector
 {
 
-	public static function getByAlias($alias)
-	{
-		$alias = self::escape($alias);
+    public static function getByAlias($alias)
+    {
+        $alias = self::escape($alias);
 		
-		$query = "
+        $query = "
 			SELECT
 				`companion`.`id`,
 				`companion`.`name`,
@@ -32,12 +32,12 @@ 
 				`companion`.`alias` = '{$alias}'
 			LIMIT 1";
 		
-		return self::run_row_query($query);
-	}
+        return self::run_row_query($query);
+    }
 
-	public static function getCompanionList()
-	{
-		$query = "
+    public static function getCompanionList()
+    {
+        $query = "
 			SELECT
 				`companion`.`name`,
 				`companion`.`alias`,
@@ -57,12 +57,12 @@ 
 			ORDER BY
 				`companion`.`name`";
 		
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 
-	public static function getLogListForCompanion($companion, $total, $offset = 0)
-	{
-		$query = "
+    public static function getLogListForCompanion($companion, $total, $offset = 0)
+    {
+        $query = "
 			SELECT
 				`log`.`id`,
 				`log`.`title`,
@@ -90,12 +90,12 @@ 
 				`log`.`date` DESC
 			LIMIT
 				{$offset}, {$total}";
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 
-	public static function getLogCountForCompanion($companion)
-	{
-		$query = "
+    public static function getLogCountForCompanion($companion)
+    {
+        $query = "
 			SELECT
 				COUNT(1) AS `count`
 			FROM
@@ -106,7 +106,7 @@ 
 			WHERE
 				`log_companion_map`.`companion` = '{$companion}' &&
 				`log`.`is_public` = '1'";
-		return self::get_count($query);
-	}
+        return self::get_count($query);
+    }
 
 }
\ No newline at end of file

collector/waterfall/PeriodCollector.class.inc.php

Indentation +21 added lines, -21 removed lines

@@ -5,11 +5,11 @@ 
 final class PeriodCollector extends Collector
 {
 
-	public static function getByAlias($alias)
-	{
-		$alias = self::escape($alias);
+    public static function getByAlias($alias)
+    {
+        $alias = self::escape($alias);
 		
-		$query = "
+        $query = "
 			SELECT
 				`period`.`id`,
 				`period`.`name`,
@@ -31,12 +31,12 @@ 
 			WHERE
 				`period`.`alias` = '{$alias}'
 			LIMIT 1";
-		return self::run_row_query($query);
-	}
+        return self::run_row_query($query);
+    }
 
-	public static function getPeriodList()
-	{
-		$query = "
+    public static function getPeriodList()
+    {
+        $query = "
 			SELECT
 				`period`.`name`,
 				`period`.`alias`,
@@ -52,12 +52,12 @@ 
 				`period`.`alias`
 			ORDER BY
 				`period`.`id`";
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 
-	public static function getLogListForPeriod($period, $total, $offset = 0)
-	{
-		$query = "
+    public static function getLogListForPeriod($period, $total, $offset = 0)
+    {
+        $query = "
 			SELECT
 				`log`.`id`,
 				`log`.`title`,
@@ -83,12 +83,12 @@ 
 			LIMIT
 				{$offset}, {$total}";
 		
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 
-	public static function getLogCountForPeriod($period)
-	{
-		$query = "
+    public static function getLogCountForPeriod($period)
+    {
+        $query = "
 			SELECT
 				COUNT(1) AS `count`
 			FROM
@@ -96,7 +96,7 @@ 
 			WHERE
 				`period` = '{$period}' &&
 				`is_public` = '1'";
-		return self::get_count($query);
-	}
+        return self::get_count($query);
+    }
 
 }
\ No newline at end of file

collector/waterfall/CountyCollector.class.inc.php

Indentation +21 added lines, -21 removed lines

@@ -5,11 +5,11 @@ 
 final class CountyCollector extends Collector
 {
 
-	public static function getByAlias($alias)
-	{
-		$alias = self::escape($alias);
+    public static function getByAlias($alias)
+    {
+        $alias = self::escape($alias);
 		
-		$query = "
+        $query = "
 			SELECT
 				`county`.`id`,
 				`county`.`name`,
@@ -32,12 +32,12 @@ 
 				`county`.`alias` = '{$alias}'
 			LIMIT 1";
 		
-		return self::run_row_query($query);
-	}
+        return self::run_row_query($query);
+    }
 
-	public static function getCountyList()
-	{
-		$query = "
+    public static function getCountyList()
+    {
+        $query = "
 			SELECT
 				`county`.`name`,
 				`county`.`alias`,
@@ -54,12 +54,12 @@ 
 			ORDER BY
 				`county`.`name`";
 		
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 
-	public static function getLogListForCounty($county, $total, $offset = 0)
-	{
-		$query = "
+    public static function getLogListForCounty($county, $total, $offset = 0)
+    {
+        $query = "
 			SELECT
 				`waterfall`.`id`,
 				`waterfall`.`name`,
@@ -93,12 +93,12 @@ 
 				`watercourse`.`name`
 			LIMIT
 				{$offset}, {$total}";
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 
-	public static function getLogCountForCounty($county)
-	{
-		$query = "
+    public static function getLogCountForCounty($county)
+    {
+        $query = "
 			SELECT
 				COUNT(1) AS `count`
 			FROM
@@ -109,7 +109,7 @@ 
 			WHERE
 				`waterfall`.`county` = '{$county}' &&
 				`waterfall`.`is_public` = '1'";
-		return self::get_count($query);
-	}
+        return self::get_count($query);
+    }
 
 }
\ No newline at end of file

collector/waterfall/LogCollector.class.inc.php

Indentation +51 added lines, -51 removed lines

@@ -5,9 +5,9 @@ 
 final class LogCollector extends Collector
 {
 
-	public static function getList($total, $offset = 0)
-	{
-		$query = "
+    public static function getList($total, $offset = 0)
+    {
+        $query = "
 			SELECT
 				`log`.`id`,
 				`log`.`title`,
@@ -31,8 +31,8 @@ 
 				`log`.`date` DESC
 			LIMIT
 				{$offset}, {$total}";
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 
     public static function getRecentList($total)
     {
@@ -62,21 +62,21 @@ 
         return self::run_query($query);
     }
 
-	public static function getListCount()
-	{
-		$query = "
+    public static function getListCount()
+    {
+        $query = "
 			SELECT
 				COUNT(1) AS `count`
 			FROM
 				`jpemeric_waterfall`.`log`
 			WHERE
 				`is_public` = '1'";
-		return self::get_count($query);
-	}
+        return self::get_count($query);
+    }
 
-	public static function getCompanionListForLog($log)
-	{
-		$query = "
+    public static function getCompanionListForLog($log)
+    {
+        $query = "
 			SELECT
 				`companion`.`name`,
 				`companion`.`alias`
@@ -87,12 +87,12 @@ 
 							ON `log_companion_map`.`companion` = `companion`.`id`
 			WHERE
 				`log_companion_map`.`log` = '{$log}'";
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 
-	public static function getWaterfallListForLog($log)
-	{
-		$query = "
+    public static function getWaterfallListForLog($log)
+    {
+        $query = "
 			SELECT
 				`waterfall`.`name`,
 				`waterfall`.`alias`,
@@ -110,12 +110,12 @@ 
 				`waterfall`.`is_public` = '1'
 			ORDER BY
 				`log_waterfall_map`.`order`";
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 
-	public static function getLogListForWaterfall($waterfall)
-	{
-		$query = "
+    public static function getLogListForWaterfall($waterfall)
+    {
+        $query = "
 			SELECT
 				`log`.`title`,
 				`log`.`alias`,
@@ -130,12 +130,12 @@ 
 				`log`.`is_public` = '1'
 			ORDER BY
 				`log`.`date`";
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 
-	public static function getTagListForLog($log)
-	{
-		$query = "
+    public static function getTagListForLog($log)
+    {
+        $query = "
 			SELECT
 				`tag`.`name`,
 				`tag`.`alias`
@@ -144,14 +144,14 @@ 
 					INNER JOIN
 						`jpemeric_waterfall`.`log_tag_map`
 							ON `log_tag_map`.`tag` = `tag`.`id` && `log_tag_map`.`log` = '{$log}'";
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 
-	public static function getByAlias($alias)
-	{
-		$alias = self::escape($alias);
+    public static function getByAlias($alias)
+    {
+        $alias = self::escape($alias);
 		
-		$query = "
+        $query = "
 			SELECT
 				`log`.`id`,
 				`log`.`title`,
@@ -175,8 +175,8 @@ 
 				`log`.`is_public` = '1'
 			LIMIT 1";
 		
-		return self::run_row_query($query);
-	}
+        return self::run_row_query($query);
+    }
 
     public static function getByDate($date)
     {
@@ -195,9 +195,9 @@ 
         return self::run_row_query($query);
     }
 	
-	public static function getById($log)
-	{
-		$query = "
+    public static function getById($log)
+    {
+        $query = "
 			SELECT
 				`title`,
 				`date`,
@@ -208,12 +208,12 @@ 
 				`id` = '{$log}' AND
 				`is_public` = '1'
 			LIMIT 1";
-		return self::run_row_query($query);
-	}
+        return self::run_row_query($query);
+    }
 
-	public static function getPreviousLog($log)
-	{
-		$query = "
+    public static function getPreviousLog($log)
+    {
+        $query = "
 			SELECT
 				`title`,
 				`date`,
@@ -233,12 +233,12 @@ 
 				`date` DESC
 			LIMIT 1";
 		
-		return self::run_row_query($query);
-	}
+        return self::run_row_query($query);
+    }
 
-	public static function getNextLog($log)
-	{
-		$query = "
+    public static function getNextLog($log)
+    {
+        $query = "
 			SELECT
 				`title`,
 				`date`,
@@ -258,7 +258,7 @@ 
 				`date` ASC
 			LIMIT 1";
 		
-		return self::run_row_query($query);
-	}
+        return self::run_row_query($query);
+    }
 
 }

collector/waterfall/WaterfallCollector.class.inc.php

Indentation +17 added lines, -17 removed lines

@@ -5,9 +5,9 @@ 
 final class WaterfallCollector extends Collector
 {
 
-	public static function getList($total, $offset = 0)
-	{
-		$query = "
+    public static function getList($total, $offset = 0)
+    {
+        $query = "
 			SELECT
 				`waterfall`.`id`,
 				`waterfall`.`name`,
@@ -40,8 +40,8 @@ 
 				`watercourse`.`name`
 			LIMIT
 				{$offset}, {$total}";
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 
     public static function getMapList()
     {
@@ -74,9 +74,9 @@ 
         return self::run_query($query);
     }
 
-	public static function getListCount()
-	{
-		$query = "
+    public static function getListCount()
+    {
+        $query = "
 			SELECT
 				COUNT(1) AS `count`
 			FROM
@@ -89,8 +89,8 @@ 
 							ON `county`.`id` = `waterfall`.`county`
 			WHERE
 				`waterfall`.`is_public` = '1'";
-		return self::get_count($query);
-	}
+        return self::get_count($query);
+    }
 
     public static function getNearbyList($waterfall)
     {
@@ -137,12 +137,12 @@ 
         return self::run_row_query($query);
     }
 
-	public static function getByAlias($watercourse, $waterfall)
-	{
-		$watercourse = self::escape($watercourse);
-		$waterfall = self::escape($waterfall);
+    public static function getByAlias($watercourse, $waterfall)
+    {
+        $watercourse = self::escape($watercourse);
+        $waterfall = self::escape($waterfall);
 		
-		$query = "
+        $query = "
 			SELECT
 				`waterfall`.`id` AS `id`,
 				`waterfall`.`name`,
@@ -192,7 +192,7 @@ 
 				`waterfall`.`is_public` = '1'
 			LIMIT 1";
 		
-		return self::run_row_query($query);
-	}
+        return self::run_row_query($query);
+    }
 
 }
\ No newline at end of file