jacobemerick / web

controller/blog/DefaultPageController.class.inc.php

Braces +36 added lines, -32 removed lines

@@ -3,8 +3,8 @@ 
 Loader::load('controller', '/PageController');
 Loader::load('utility', 'Content');
 
-abstract class DefaultPageController extends PageController
-{
+abstract class DefaultPageController extends PageController

+{

 
 	private static $RECENT_COMMENT_COUNT = 10;
 	private static $MINIMUM_TAG_COUNT = 10;
@@ -14,8 +14,8 @@ 
 
 	private static $INTRODUCTION_IMAGE_PATTERN = '<img src="/photo/%s/%s-size-%s.jpg" height="%d" width="%d" alt="%s" />';
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

     $this->set_head('rss_link', [
       'title' => 'Jacob Emerick Blog Feed',
       'url' => '/rss.xml'
@@ -29,18 +29,19 @@ 
 		$this->add_css('blog');
 	}
 
-	protected function get_introduction()
-	{
+	protected function get_introduction()

+	{

 		return;
 	}
 
-	protected function get_introduction_image($id)
-	{
+	protected function get_introduction_image($id)

+	{

 		Loader::load('collector', 'image/PhotoCollector');
 		$photo_result = PhotoCollector::getRow($id);
 		
-		if($photo_result == null)
-			return;
+		if($photo_result == null) {

+					return;

+		}

 		
 		$name = $photo_result->name;
 		$category = $photo_result->category;
@@ -52,8 +53,8 @@ 
 		return sprintf(self::$INTRODUCTION_IMAGE_PATTERN, $category, $name, $size, $height, $width, $description);
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body('introduction', $this->get_introduction());
 		$this->set_body('right_side', $this->get_right_side());
 		$this->set_body('activity_array', $this->get_recent_activity());
@@ -61,8 +62,8 @@ 
 		$this->set_body_view('Page');
 	}
 
-	final protected function format_post($post, $trim = false)
-	{
+	final protected function format_post($post, $trim = false)

+	{

 		$post_object = new stdclass();
 		
 		$post_object->title = $post['title'];
@@ -77,8 +78,8 @@ 
 		return $post_object;
 	}
 
-	final private function get_tags_for_post($post)
-	{
+	final private function get_tags_for_post($post)

+	{

         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
         $tag_result = $repository->getTagsForPost($post['id']);
@@ -94,12 +95,13 @@ 
 		return $tag_array;
 	}
 
-	final private function get_body_for_post($post, $trim)
-	{
+	final private function get_body_for_post($post, $trim)

+	{

 		$body = $post['body'];
 		
-		if($trim)
-			$body = Content::instance('SmartTrim', $body)->activate(self::$LENGTH_OF_TRIMMED_POST);
+		if($trim) {

+					$body = Content::instance('SmartTrim', $body)->activate(self::$LENGTH_OF_TRIMMED_POST);

+		}

 		
 		$body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
 		$body = Content::instance('MarkupCode', $body)->activate();
@@ -107,16 +109,16 @@ 
 		return $body;
 	}
 
-	final protected function get_right_side()
-	{
+	final protected function get_right_side()

+	{

 		$side_array = array();
 		$side_array['tags'] = $this->get_tag_cloud();
 		$side_array['comments'] = $this->get_comments();
 		return $side_array;
 	}
 
-	final private function get_tag_cloud()
-	{
+	final private function get_tag_cloud()

+	{

         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
         $tag_result = $repository->getTagCloud();
@@ -126,8 +128,9 @@ 
 		$cloud_array = array();
 		foreach($tag_result as $tag)
 		{
-			if($tag['count'] < self::$MINIMUM_TAG_COUNT)
-				continue;
+			if($tag['count'] < self::$MINIMUM_TAG_COUNT) {

+							continue;

+			}

 			
 			$tag_object = new stdclass();
 			$tag_object->name = $tag['tag'];
@@ -139,20 +142,21 @@ 
 		return $cloud_array;
 	}
 
-	final private function get_maximum_tag_count($tag_result)
-	{
+	final private function get_maximum_tag_count($tag_result)

+	{

 		$maximum = 1;
 		
 		foreach($tag_result as $tag)
 		{
-			if($tag['count'] > $maximum)
-				$maximum = $tag['count'];
+			if($tag['count'] > $maximum) {

+							$maximum = $tag['count'];

+			}

 		}
 		return $maximum;
 	}
 
-    final private function get_comments()
-    {
+    final private function get_comments()

+    {

         global $container;
         $repository = new Jacobemerick\Web\Domain\Comment\Comment\ServiceCommentRepository($container['comment_service_api']);
         $start = microtime(true);

controller/waterfalls/HomeController.class.inc.php

Braces +8 added lines, -8 removed lines

@@ -6,8 +6,8 @@ 
 ));
 Loader::load('controller', 'waterfalls/DefaultPageController');
 
-final class HomeController extends DefaultPageController
-{
+final class HomeController extends DefaultPageController

+{

 
     private static $TITLE = 'Waterfalls of the Keweenaw | Stories and Tips from Jacob Emerick';
     private static $DESCRIPTION = 'Stories, maps, and details about many of the waterfalls in the Upper Peninsula of Michigan, compiled by Jacob Emerick.';
@@ -20,8 +20,8 @@ 
 
     private static $BANNER_IMAGE = 2661;
 
-    protected function set_head_data()
-    {
+    protected function set_head_data()

+    {

         parent::set_head_data();
         
         $this->set_title(self::$TITLE);
@@ -29,8 +29,8 @@ 
         $this->set_keywords(self::$KEYWORD_ARRAY);
     }
 
-    protected function set_body_data($page_type = 'wide')
-    {
+    protected function set_body_data($page_type = 'wide')

+    {

         parent::set_body_data($page_type);
         
         $photo = PhotoCollector::getRow(self::$BANNER_IMAGE);
@@ -59,8 +59,8 @@ 
         $this->set_body('view', 'Home');
     }
 
-    protected function get_comments()
-    {
+    protected function get_comments()

+    {

         global $container;
         $repository = new Jacobemerick\Web\Domain\Comment\Comment\ServiceCommentRepository($container['comment_service_api']);
         $start = microtime(true);

controller/waterfalls/WaterfallController.class.inc.php

Braces +34 added lines, -32 removed lines

@@ -7,8 +7,8 @@ 
     'waterfall/LogCollector'));
 Loader::load('controller', 'waterfalls/DefaultPageController');
 
-final class WaterfallController extends DefaultPageController
-{
+final class WaterfallController extends DefaultPageController

+{

 
     private static $STANDARD_IMAGE_NODE = '<img src="/photo/%s/%s-size-standard.jpg" alt="%s" height="600" width="800" />';
 
@@ -18,8 +18,8 @@ 
 
     private $waterfall;
 
-    public function __construct()
-    {
+    public function __construct()

+    {

         parent::__construct();
 
         $path_watercourse = URLDecode::getPiece(1);
@@ -39,8 +39,8 @@ 
         $this->add_waterfall_js();
     }
 
-    protected function set_head_data()
-    {
+    protected function set_head_data()

+    {

         parent::set_head_data();
 
         $this->set_title("{$this->waterfall->name} on {$this->waterfall->watercourse} | " . self::$WEBSITE_TITLE);
@@ -48,8 +48,8 @@ 
         $this->set_keywords((array) $this->waterfall->name);
     }
 
-    protected function set_body_data($page_type = 'normal')
-    {
+    protected function set_body_data($page_type = 'normal')

+    {

         parent::set_body_data($page_type);
 
         $body_data = array_merge(
@@ -66,8 +66,8 @@ 
         $this->set_body('view', 'Fall');
     }
 
-    private function format_waterfall_data($waterfall)
-    {
+    private function format_waterfall_data($waterfall)

+    {

         $waterfall_data = array();
         $waterfall_data['introduction'] = $this->get_waterfall_introduction($waterfall);
         $waterfall_data['name'] = $waterfall->name;
@@ -83,8 +83,8 @@ 
         return $waterfall_data;
     }
 
-    private function get_waterfall_introduction($waterfall)
-    {
+    private function get_waterfall_introduction($waterfall)

+    {

         return array(
             'path' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/",
             'name' => $waterfall->name,
@@ -93,8 +93,8 @@ 
         );
     }
 
-    private function get_main_watercourse($alias)
-    {
+    private function get_main_watercourse($alias)

+    {

         $watercourse = WatercourseCollector::getByAlias($alias);
         if ($watercourse->parent != 0) {
             $watercourse = WatercourseCollector::getById($watercourse->parent);
@@ -107,19 +107,20 @@ 
         );
     }
 
-    private function format_waterfall_content($content)
-    {
+    private function format_waterfall_content($content)

+    {

         $content = Content::instance('FixInternalLink', $content)->activate();
         
         return $content;
     }
 
-    private function get_album()
-    {
+    private function get_album()

+    {

         $album = array();
         
-        if($this->waterfall->album == 0)
-            return $album;
+        if($this->waterfall->album == 0) {

+                    return $album;

+        }

         
         $photo_list = AlbumCollector::getPhotoListForAlbum($this->waterfall->album);
         foreach($photo_list as $photo)
@@ -128,10 +129,11 @@ 
             $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
             $photo_array['description'] = $photo->description;
             
-            if($photo->height < $photo->width)
-                list($height, $width) = array(75, 100);
-            else
-                list($height, $width) = array(100, 75);
+            if($photo->height < $photo->width) {

+                            list($height, $width) = array(75, 100);

+            } else {

+                            list($height, $width) = array(100, 75);

+            }

             
             $photo_array['image_node'] = sprintf(
                 self::$THUMB_IMAGE_NODE,
@@ -147,8 +149,8 @@ 
         return $album;
     }
 
-	private function get_sidebar($waterfall)
-	{
+	private function get_sidebar($waterfall)

+	{

 		$sidebar_data = array();
 		$sidebar_data['name'] = $waterfall->name;
 		$sidebar_data['watercourse'] = $waterfall->watercourse;
@@ -180,8 +182,8 @@ 
 		return $sidebar_data;
 	}
 
-    private function get_journal_list($waterfall)
-    {
+    private function get_journal_list($waterfall)

+    {

         $list = array();
         $log_result = LogCollector::getLogListForWaterfall($waterfall);
         foreach ($log_result as $log_row) {
@@ -195,8 +197,8 @@ 
         return $list;
     }
 
-    private function get_map_piece($waterfall)
-    {
+    private function get_map_piece($waterfall)

+    {

         $map_holder = array();
         
         $url = 'https://maps.googleapis.com/maps/api/staticmap';
@@ -217,8 +219,8 @@ 
         return (object) $map_holder;
     }
 
-    private function get_nearby_list($waterfall)
-    {
+    private function get_nearby_list($waterfall)

+    {

         $nearby_list = array();
         
         $result = WaterfallCollector::getNearbyList($waterfall);

module/form/CommentSubmitModule.class.inc.php

Braces +12 added lines, -12 removed lines

@@ -7,22 +7,22 @@ 
 
 use Jacobemerick\Web\Domain\Comment\Comment\ServiceCommentRepository;
 
-class CommentSubmitModule
-{
+class CommentSubmitModule

+{

 
     private $site;
     private $path;
     private $fullPath;
 
-    public function __construct($site, $path, $fullPath, $pageTitle)
-    {
+    public function __construct($site, $path, $fullPath, $pageTitle)

+    {

         $this->site = $site;
         $this->path = $path;
         $this->fullPath = $fullPath;
     }
 
-    public function activate()
-    {
+    public function activate()

+    {

         // todo why is this responsible for checking on valid calls
         if (!Request::hasPost()) {
             return false;
@@ -44,8 +44,8 @@ 
         $this->redirectToComment($commentId);
     }
 
-    private function checkValidation()
-    {
+    private function checkValidation()

+    {

         $errors = array();
         if (!Validate::checkRequest('post', 'name', 'name')) {
             $errors['name'] = 'You must include a valid name';
@@ -69,8 +69,8 @@ 
         return $errors;
     }
 
-    private function save(array $data)
-    {
+    private function save(array $data)

+    {

         $path = $_SERVER['REQUEST_URI'];
         $path = explode('/', $path);
         $path = array_filter($path);
@@ -107,8 +107,8 @@ 
         return $response['id'];
     }
 
-    private function redirectToComment($commentId)
-    {
+    private function redirectToComment($commentId)

+    {

         $url = '';
         $url .= $this->fullPath;
         $url .= "#comment-{$commentId}";

src/Domain/Comment/Comment/ServiceCommentRepository.php

Braces +12 added lines, -12 removed lines

@@ -6,8 +6,8 @@ 
 use Jacobemerick\CommentService\Api\DefaultApi;
 use Jacobemerick\CommentService\Model\Comment;
 
-class ServiceCommentRepository implements CommentRepositoryInterface
-{
+class ServiceCommentRepository implements CommentRepositoryInterface

+{

 
     /**
      * @var DefaultApi
@@ -17,8 +17,8 @@ 
     /**
      * @param DefaultApi $api
      */
-    public function __construct(DefaultApi $api)
-    {
+    public function __construct(DefaultApi $api)

+    {

         $this->api = $api;
     }
 
@@ -27,8 +27,8 @@ 
      * @return array
      * @throws ApiException
      */
-    public function createComment(array $comment)
-    {
+    public function createComment(array $comment)

+    {

         $response = $this->api->createComment($comment);
         return $this->deserializeComment($response);
     }
@@ -38,8 +38,8 @@ 
      * @return array
      * @throws ApiException
      */
-    public function getComment($commentId)
-    {
+    public function getComment($commentId)

+    {

         $response = $this->api->getComment($commentId);
         return $this->deserializeComment($response);
     }
@@ -53,8 +53,8 @@ 
      * @return array
      * @throws ApiException
      */
-    public function getComments($domain = null, $path = null, $page = null, $perPage = null, $order = null)
-    {
+    public function getComments($domain = null, $path = null, $page = null, $perPage = null, $order = null)

+    {

         $response = (array) $this->api->getComments($page, $perPage, $order, $domain, $path);
         return array_map([$this, 'deserializeComment'], $response);
     }
@@ -63,8 +63,8 @@ 
      * @param Comment $comment
      * @return array
      */
-    protected function deserializeComment(Comment $comment)
-    {
+    protected function deserializeComment(Comment $comment)

+    {

         return [
             'id' => $comment->getId(),
             'commenter' => [

controller/waterfalls/MapController.class.inc.php

Braces +12 added lines, -12 removed lines

@@ -3,8 +3,8 @@ 
 Loader::load('controller', 'waterfalls/DefaultPageController');
 Loader::load('collector', 'waterfall/WaterfallCollector');
 
-final class MapController extends DefaultPageController
-{
+final class MapController extends DefaultPageController

+{

 
     private static $TITLE = 'Map of Upper Peninsula Waterfalls';
     private static $DESCRIPTION = '';
@@ -19,16 +19,16 @@ 
         'Upper Tahquamenon Falls',
     );
 
-    public function __construct()
-    {
+    public function __construct()

+    {

         parent::__construct();
 
         $this->add_js('https://maps.googleapis.com/maps/api/js?key=' . self::$API_KEY . '&sensor=false');
         $this->add_waterfall_js();
     }
 
-    protected function set_head_data()
-    {
+    protected function set_head_data()

+    {

         parent::set_head_data();
         
         $this->set_title(self::$TITLE . ' | ' . self::$WEBSITE_TITLE);
@@ -36,8 +36,8 @@ 
         $this->set_keywords(self::$KEYWORD_ARRAY);
     }
 
-    protected function set_body_data($page_type = 'wide')
-    {
+    protected function set_body_data($page_type = 'wide')

+    {

         parent::set_body_data($page_type);
         
         $this->set_head('full_page_map', true);
@@ -45,15 +45,15 @@ 
         $this->set_body('view', 'Map');
     }
 
-    private function fetch_waterfall_list()
-    {
+    private function fetch_waterfall_list()

+    {

         $list = WaterfallCollector::getMapList();
         array_walk($list, array($this, 'parse_waterfall'));
         return $list;
     }
 
-    private function parse_waterfall(&$waterfall)
-    {
+    private function parse_waterfall(&$waterfall)

+    {

         $waterfall = (object) array(
             'name'  => $waterfall->name,
             'latitude' => $waterfall->latitude,