jacobemerick / web

controller/PageController.class.inc.php

Doc Comments +31 added lines

@@ -113,6 +113,9 @@ 
 			exit;
 	}
 
+	/**
+	 * @param string $method
+	 */
 	protected function set_header_method($method)
 	{
 		$this->headers = $method;
@@ -123,6 +126,9 @@ 
 		$this->set_head('title', $value);
 	}
 
+	/**
+	 * @param string $value
+	 */
 	protected function set_author($value)
 	{
 		$this->set_head('author', $value);
@@ -138,26 +144,41 @@ 
 		$this->set_head('keywords', implode(', ', $array));
 	}
 	
+	/**
+	 * @param string $url
+	 */
 	protected function set_canonical($url)
 	{
 		$this->set_head('canonical', $url);
 	}
 
+	/**
+	 * @param string $set
+	 */
 	protected function set_head($set, $value)
 	{
 		$this->data_array['head'][$set] = $value;
 	}
 
+	/**
+	 * @param string $set
+	 */
 	protected function set_body($set, $value)
 	{
 		$this->data_array['body'][$set] = $value;
 	}
 
+	/**
+	 * @param string $file
+	 */
 	protected function add_css($file, $version = 1)
 	{
 		$this->css_array[] = [$file, $version];
 	}
 
+	/**
+	 * @param string $file
+	 */
 	protected function add_js($file)
 	{
 		$this->js_array[] = $file;
@@ -183,6 +204,9 @@ 
 		$this->set_head('js_link_array', $js_array);
 	}
 
+	/**
+	 * @param string $view
+	 */
 	protected function set_body_view($view)
 	{
 		$this->body_view_array[] = $view;
@@ -227,6 +251,10 @@ 
 	}
 
 	private $comment_errors;
+
+	/**
+	 * @param string $redirect_url
+	 */
 	protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title)
 	{
 		if(Request::hasPost() && Request::getPost('submit') == 'Submit Comment')
@@ -238,6 +266,9 @@ 
 		return;
 	}
 
+    /**
+     * @param string $site
+     */
     protected function get_comment_array($site, $path)
     {
         global $container;

Indentation +174 added lines, -174 removed lines

@@ -5,52 +5,52 @@ 
 abstract class PageController
 {
 
-	private static $TRACKING_CODE = 'UA-11745070-1';
+    private static $TRACKING_CODE = 'UA-11745070-1';
 	
-	protected static $DEPRECATED_BLOGS = array(
-		10 => 63,
-		55 => 67,
-	);
-
-	private $headers;
-	private $css_array = array();
-	private $font_css_array = array();
-	private $js_array = array();
-
-	private $data_array = array();
-	private $body_view_array = array();
-
-	protected function set_head_data() {}
-	protected function set_body_data() {}
-	protected function set_data() {}
-
-	public function __construct()
-	{
-		$this->set_header_method('sendHTML');
+    protected static $DEPRECATED_BLOGS = array(
+        10 => 63,
+        55 => 67,
+    );
+
+    private $headers;
+    private $css_array = array();
+    private $font_css_array = array();
+    private $js_array = array();
+
+    private $data_array = array();
+    private $body_view_array = array();
+
+    protected function set_head_data() {}
+    protected function set_body_data() {}
+    protected function set_data() {}
+
+    public function __construct()
+    {
+        $this->set_header_method('sendHTML');
 		
-		$this->set_head('google_verification', 'sgAISiuoWfK54KXnOfm2oU4vQdad8eyNCQX7LkZ1OxM');
-		$this->set_head('bing_verification', 'AF1A4CEA30A7589590E9294C4B512607');
+        $this->set_head('google_verification', 'sgAISiuoWfK54KXnOfm2oU4vQdad8eyNCQX7LkZ1OxM');
+        $this->set_head('bing_verification', 'AF1A4CEA30A7589590E9294C4B512607');
 		
-		$this->set_body('domain_container', $this->get_domain_container());
-		$this->set_body('footer', array(
-			'link' => Loader::getRootUrl('site'),
-			'anchor' => 'jacobemerick.com',
-			'date' => date('Y')));
-	}
-
-	protected function get_domain_container()
-	{
-		$domain_container = new stdclass();
+        $this->set_body('domain_container', $this->get_domain_container());
+        $this->set_body('footer', array(
+            'link' => Loader::getRootUrl('site'),
+            'anchor' => 'jacobemerick.com',
+            'date' => date('Y')));
+    }
+
+    protected function get_domain_container()
+    {
+        $domain_container = new stdclass();
 		
-		$domain_container->blog = Loader::getRootUrl('blog');
-		$domain_container->home = Loader::getRootUrl('home');
-		$domain_container->lifestream = Loader::getRootUrl('lifestream');
-		$domain_container->map = Loader::getRootUrl('map');
-		$domain_container->portfolio = Loader::getRootUrl('portfolio');
-		$domain_container->waterfalls = Loader::getRootUrl('waterfalls');
+        $domain_container->blog = Loader::getRootUrl('blog');
+        $domain_container->home = Loader::getRootUrl('home');
+        $domain_container->lifestream = Loader::getRootUrl('lifestream');
+        $domain_container->map = Loader::getRootUrl('map');
+        $domain_container->portfolio = Loader::getRootUrl('portfolio');
+        $domain_container->waterfalls = Loader::getRootUrl('waterfalls');
 		
-		return $domain_container;
-	}
+        return $domain_container;
+    }
 
     protected function get_recent_activity()
     {
@@ -84,24 +84,24 @@ 
         return (object) $post;
     }
 
-	public function activate()
-	{
-		$this->set_head_data();
-		$this->set_body_data();
-		$this->set_data();
+    public function activate()
+    {
+        $this->set_head_data();
+        $this->set_body_data();
+        $this->set_data();
 		
-		$this->load_assets();
+        $this->load_assets();
 		
-		$headers = $this->headers;
-		Header::$headers();
-		Loader::load('view', '/Head', $this->data_array['head']);
-		foreach($this->body_view_array as $view)
-		{
-			if(substr($view, 0, 1) == '/')
-				Loader::load('view', $view, $this->data_array['body']);
-			else
-				Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
-		}
+        $headers = $this->headers;
+        Header::$headers();
+        Loader::load('view', '/Head', $this->data_array['head']);
+        foreach($this->body_view_array as $view)
+        {
+            if(substr($view, 0, 1) == '/')
+                Loader::load('view', $view, $this->data_array['body']);
+            else
+                Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
+        }
         
         if (URLDecode::getSite() == 'waterfalls') {
             Loader::load('view', '/WaterfallFoot');
@@ -109,134 +109,134 @@ 
             Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
         }
 		
-		if($view == '/404' || $view == '/503')
-			exit;
-	}
-
-	protected function set_header_method($method)
-	{
-		$this->headers = $method;
-	}
-
-	protected function set_title($value)
-	{
-		$this->set_head('title', $value);
-	}
-
-	protected function set_author($value)
-	{
-		$this->set_head('author', $value);
-	}
-
-	protected function set_description($value)
-	{
-		$this->set_head('description', $value);
-	}
-
-	protected function set_keywords($array)
-	{
-		$this->set_head('keywords', implode(', ', $array));
-	}
+        if($view == '/404' || $view == '/503')
+            exit;
+    }
+
+    protected function set_header_method($method)
+    {
+        $this->headers = $method;
+    }
+
+    protected function set_title($value)
+    {
+        $this->set_head('title', $value);
+    }
+
+    protected function set_author($value)
+    {
+        $this->set_head('author', $value);
+    }
+
+    protected function set_description($value)
+    {
+        $this->set_head('description', $value);
+    }
+
+    protected function set_keywords($array)
+    {
+        $this->set_head('keywords', implode(', ', $array));
+    }
 	
-	protected function set_canonical($url)
-	{
-		$this->set_head('canonical', $url);
-	}
-
-	protected function set_head($set, $value)
-	{
-		$this->data_array['head'][$set] = $value;
-	}
-
-	protected function set_body($set, $value)
-	{
-		$this->data_array['body'][$set] = $value;
-	}
-
-	protected function add_css($file, $version = 1)
-	{
-		$this->css_array[] = [$file, $version];
-	}
-
-	protected function add_js($file)
-	{
-		$this->js_array[] = $file;
-	}
-
-	private function load_assets()
-	{
+    protected function set_canonical($url)
+    {
+        $this->set_head('canonical', $url);
+    }
+
+    protected function set_head($set, $value)
+    {
+        $this->data_array['head'][$set] = $value;
+    }
+
+    protected function set_body($set, $value)
+    {
+        $this->data_array['body'][$set] = $value;
+    }
+
+    protected function add_css($file, $version = 1)
+    {
+        $this->css_array[] = [$file, $version];
+    }
+
+    protected function add_js($file)
+    {
+        $this->js_array[] = $file;
+    }
+
+    private function load_assets()
+    {
     $css_array = array_map(function ($stylesheet) {
-      $path = "/css/{$stylesheet[0]}.css";
-      if ($stylesheet[1] > 1) {
+        $path = "/css/{$stylesheet[0]}.css";
+        if ($stylesheet[1] > 1) {
         $path .= "?v={$stylesheet[1]}";
-      }
-      return $path;
+        }
+        return $path;
     }, $this->css_array);
     $js_array = array_map(function ($script) {
-      if (substr($script, 0, 4) == 'http') {
+        if (substr($script, 0, 4) == 'http') {
         return $script;
-      }
-      return "/js/{$script}.min.js";
+        }
+        return "/js/{$script}.min.js";
     }, $this->js_array);
 		
-		$this->set_head('css_link_array', $css_array);
-		$this->set_head('js_link_array', $js_array);
-	}
-
-	protected function set_body_view($view)
-	{
-		$this->body_view_array[] = $view;
-	}
-
-	protected function eject()
-	{
-		if(get_class($this) !== 'Error404Controller')
-			Loader::loadNew('controller', '/Error404Controller')->activate();
-	}
-
-	protected function unavailable()
-	{
-		if(get_class($this) !== 'Error503Controller')
-			Loader::loadNew('controller', '/Error503Controller')->activate();
-	}
-
-	protected function redirect($uri, $method = 301)
-	{
-		switch($method)
-		{
-			case 301 :
-				if(get_class($this) !== 'Error301Controller')
-					Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();
-				break;
-			case 303 :
-				if(get_class($this) !== 'Error303Controller')
-					Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();
-				break;
-		}
-	}
-
-	final protected function get_parsed_date($date)
-	{
-		$parsed_date = new stdclass();
+        $this->set_head('css_link_array', $css_array);
+        $this->set_head('js_link_array', $js_array);
+    }
+
+    protected function set_body_view($view)
+    {
+        $this->body_view_array[] = $view;
+    }
+
+    protected function eject()
+    {
+        if(get_class($this) !== 'Error404Controller')
+            Loader::loadNew('controller', '/Error404Controller')->activate();
+    }
+
+    protected function unavailable()
+    {
+        if(get_class($this) !== 'Error503Controller')
+            Loader::loadNew('controller', '/Error503Controller')->activate();
+    }
+
+    protected function redirect($uri, $method = 301)
+    {
+        switch($method)
+        {
+            case 301 :
+                if(get_class($this) !== 'Error301Controller')
+                    Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();
+                break;
+            case 303 :
+                if(get_class($this) !== 'Error303Controller')
+                    Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();
+                break;
+        }
+    }
+
+    final protected function get_parsed_date($date)
+    {
+        $parsed_date = new stdclass();
 		
-		$parsed_date->stamp = date('c', strtotime($date));
-		$parsed_date->friendly = date('F j, Y', strtotime($date));
-		$parsed_date->elapsed = Content::instance('ElapsedTime', $date)->activate();
+        $parsed_date->stamp = date('c', strtotime($date));
+        $parsed_date->friendly = date('F j, Y', strtotime($date));
+        $parsed_date->elapsed = Content::instance('ElapsedTime', $date)->activate();
 		
-		return $parsed_date;
-	}
-
-	private $comment_errors;
-	protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title)
-	{
-		if(Request::hasPost() && Request::getPost('submit') == 'Submit Comment')
-		{
-			$parameters = array($site_id, $path, $redirect_url, $page_title);
-			$this->comment_errors = Loader::loadNew('module', 'form/CommentSubmitModule', $parameters)->activate();
-		}
+        return $parsed_date;
+    }
+
+    private $comment_errors;
+    protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title)
+    {
+        if(Request::hasPost() && Request::getPost('submit') == 'Submit Comment')
+        {
+            $parameters = array($site_id, $path, $redirect_url, $page_title);
+            $this->comment_errors = Loader::loadNew('module', 'form/CommentSubmitModule', $parameters)->activate();
+        }
 		
-		return;
-	}
+        return;
+    }
 
     protected function get_comment_array($site, $path)
     {

Spacing +15 added lines, -15 removed lines

@@ -59,7 +59,7 @@ 
         $post_result = $activityRepository->getActivities(5);
 
         $post_array = array();
-        foreach($post_result as $row) {
+        foreach ($post_result as $row) {
             array_push($post_array, $this->expand_post($row));
         }
 
@@ -75,7 +75,7 @@ 
         ];
 
         if ($format != 'short') {
-            $post['url'] = Loader::getRootUrl('lifestream') . "{$raw_post['type']}/{$raw_post['id']}/";
+            $post['url'] = Loader::getRootUrl('lifestream')."{$raw_post['type']}/{$raw_post['id']}/";
 
             $metadata = json_decode($raw_post['metadata'], true);
             $post = array_merge($post, $metadata);
@@ -95,12 +95,12 @@ 
 		$headers = $this->headers;
 		Header::$headers();
 		Loader::load('view', '/Head', $this->data_array['head']);
-		foreach($this->body_view_array as $view)
+		foreach ($this->body_view_array as $view)
 		{
-			if(substr($view, 0, 1) == '/')
+			if (substr($view, 0, 1) == '/')
 				Loader::load('view', $view, $this->data_array['body']);
 			else
-				Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
+				Loader::load('view', URLDecode::getSite().'/'.$view, $this->data_array['body']);
 		}
         
         if (URLDecode::getSite() == 'waterfalls') {
@@ -109,7 +109,7 @@ 
             Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
         }
 		
-		if($view == '/404' || $view == '/503')
+		if ($view == '/404' || $view == '/503')
 			exit;
 	}
 
@@ -165,14 +165,14 @@ 
 
 	private function load_assets()
 	{
-    $css_array = array_map(function ($stylesheet) {
+    $css_array = array_map(function($stylesheet) {
       $path = "/css/{$stylesheet[0]}.css";
       if ($stylesheet[1] > 1) {
         $path .= "?v={$stylesheet[1]}";
       }
       return $path;
     }, $this->css_array);
-    $js_array = array_map(function ($script) {
+    $js_array = array_map(function($script) {
       if (substr($script, 0, 4) == 'http') {
         return $script;
       }
@@ -190,26 +190,26 @@ 
 
 	protected function eject()
 	{
-		if(get_class($this) !== 'Error404Controller')
+		if (get_class($this) !== 'Error404Controller')
 			Loader::loadNew('controller', '/Error404Controller')->activate();
 	}
 
 	protected function unavailable()
 	{
-		if(get_class($this) !== 'Error503Controller')
+		if (get_class($this) !== 'Error503Controller')
 			Loader::loadNew('controller', '/Error503Controller')->activate();
 	}
 
 	protected function redirect($uri, $method = 301)
 	{
-		switch($method)
+		switch ($method)
 		{
 			case 301 :
-				if(get_class($this) !== 'Error301Controller')
+				if (get_class($this) !== 'Error301Controller')
 					Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();
 				break;
 			case 303 :
-				if(get_class($this) !== 'Error303Controller')
+				if (get_class($this) !== 'Error303Controller')
 					Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();
 				break;
 		}
@@ -229,7 +229,7 @@ 
 	private $comment_errors;
 	protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title)
 	{
-		if(Request::hasPost() && Request::getPost('submit') == 'Submit Comment')
+		if (Request::hasPost() && Request::getPost('submit') == 'Submit Comment')
 		{
 			$parameters = array($site_id, $path, $redirect_url, $page_title);
 			$this->comment_errors = Loader::loadNew('module', 'form/CommentSubmitModule', $parameters)->activate();
@@ -261,7 +261,7 @@ 
         $container['logger']->info("CommentService | Path | {$elapsed}");
 
         $array = array();
-        foreach((array) $comment_response as $comment)
+        foreach ((array) $comment_response as $comment)
         {
             $body = Content::instance('CleanComment', $comment['body'])->activate();
             $body = strip_tags($body);

Braces +77 added lines, -65 removed lines

@@ -2,8 +2,8 @@ 
 
 Loader::load('utility', 'Header');
 
-abstract class PageController
-{
+abstract class PageController

+{

 
 	private static $TRACKING_CODE = 'UA-11745070-1';
 	
@@ -20,12 +20,18 @@ 
 	private $data_array = array();
 	private $body_view_array = array();
 
-	protected function set_head_data() {}
-	protected function set_body_data() {}
-	protected function set_data() {}
+	protected function set_head_data()

+	{

+}
+	protected function set_body_data()

+	{

+}
+	protected function set_data()

+	{

+}
 
-	public function __construct()
-	{
+	public function __construct()

+	{

 		$this->set_header_method('sendHTML');
 		
 		$this->set_head('google_verification', 'sgAISiuoWfK54KXnOfm2oU4vQdad8eyNCQX7LkZ1OxM');
@@ -38,8 +44,8 @@ 
 			'date' => date('Y')));
 	}
 
-	protected function get_domain_container()
-	{
+	protected function get_domain_container()

+	{

 		$domain_container = new stdclass();
 		
 		$domain_container->blog = Loader::getRootUrl('blog');
@@ -52,8 +58,8 @@ 
 		return $domain_container;
 	}
 
-    protected function get_recent_activity()
-    {
+    protected function get_recent_activity()

+    {

         global $container;
         $activityRepository = new Jacobemerick\Web\Domain\Stream\Activity\MysqlActivityRepository($container['db_connection_locator']);
         $post_result = $activityRepository->getActivities(5);
@@ -66,8 +72,8 @@ 
         return $post_array;
     }
 
-    protected function expand_post($raw_post, $format = 'short')
-    {
+    protected function expand_post($raw_post, $format = 'short')

+    {

         $post = [
             'type' => $raw_post['type'],
             'title' => ($format == 'short') ? $raw_post['message'] : $raw_post['message_long'],
@@ -84,8 +90,8 @@ 
         return (object) $post;
     }
 
-	public function activate()
-	{
+	public function activate()

+	{

 		$this->set_head_data();
 		$this->set_body_data();
 		$this->set_data();
@@ -97,10 +103,11 @@ 
 		Loader::load('view', '/Head', $this->data_array['head']);
 		foreach($this->body_view_array as $view)
 		{
-			if(substr($view, 0, 1) == '/')
-				Loader::load('view', $view, $this->data_array['body']);
-			else
-				Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
+			if(substr($view, 0, 1) == '/') {

+							Loader::load('view', $view, $this->data_array['body']);

+			} else {

+							Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);

+			}

 		}
         
         if (URLDecode::getSite() == 'waterfalls') {
@@ -109,62 +116,63 @@ 
             Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
         }
 		
-		if($view == '/404' || $view == '/503')
-			exit;
+		if($view == '/404' || $view == '/503') {

+					exit;

+		}

 	}
 
-	protected function set_header_method($method)
-	{
+	protected function set_header_method($method)

+	{

 		$this->headers = $method;
 	}
 
-	protected function set_title($value)
-	{
+	protected function set_title($value)

+	{

 		$this->set_head('title', $value);
 	}
 
-	protected function set_author($value)
-	{
+	protected function set_author($value)

+	{

 		$this->set_head('author', $value);
 	}
 
-	protected function set_description($value)
-	{
+	protected function set_description($value)

+	{

 		$this->set_head('description', $value);
 	}
 
-	protected function set_keywords($array)
-	{
+	protected function set_keywords($array)

+	{

 		$this->set_head('keywords', implode(', ', $array));
 	}
 	
-	protected function set_canonical($url)
-	{
+	protected function set_canonical($url)

+	{

 		$this->set_head('canonical', $url);
 	}
 
-	protected function set_head($set, $value)
-	{
+	protected function set_head($set, $value)

+	{

 		$this->data_array['head'][$set] = $value;
 	}
 
-	protected function set_body($set, $value)
-	{
+	protected function set_body($set, $value)

+	{

 		$this->data_array['body'][$set] = $value;
 	}
 
-	protected function add_css($file, $version = 1)
-	{
+	protected function add_css($file, $version = 1)

+	{

 		$this->css_array[] = [$file, $version];
 	}
 
-	protected function add_js($file)
-	{
+	protected function add_js($file)

+	{

 		$this->js_array[] = $file;
 	}
 
-	private function load_assets()
-	{
+	private function load_assets()

+	{

     $css_array = array_map(function ($stylesheet) {
       $path = "/css/{$stylesheet[0]}.css";
       if ($stylesheet[1] > 1) {
@@ -183,40 +191,44 @@ 
 		$this->set_head('js_link_array', $js_array);
 	}
 
-	protected function set_body_view($view)
-	{
+	protected function set_body_view($view)

+	{

 		$this->body_view_array[] = $view;
 	}
 
-	protected function eject()
-	{
-		if(get_class($this) !== 'Error404Controller')
-			Loader::loadNew('controller', '/Error404Controller')->activate();
+	protected function eject()

+	{

+		if(get_class($this) !== 'Error404Controller') {

+					Loader::loadNew('controller', '/Error404Controller')->activate();

+		}

 	}
 
-	protected function unavailable()
-	{
-		if(get_class($this) !== 'Error503Controller')
-			Loader::loadNew('controller', '/Error503Controller')->activate();
+	protected function unavailable()

+	{

+		if(get_class($this) !== 'Error503Controller') {

+					Loader::loadNew('controller', '/Error503Controller')->activate();

+		}

 	}
 
-	protected function redirect($uri, $method = 301)
-	{
+	protected function redirect($uri, $method = 301)

+	{

 		switch($method)
 		{
 			case 301 :
-				if(get_class($this) !== 'Error301Controller')
-					Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();
+				if(get_class($this) !== 'Error301Controller') {

+									Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();

+				}

 				break;
 			case 303 :
-				if(get_class($this) !== 'Error303Controller')
-					Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();
+				if(get_class($this) !== 'Error303Controller') {

+									Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();

+				}

 				break;
 		}
 	}
 
-	final protected function get_parsed_date($date)
-	{
+	final protected function get_parsed_date($date)

+	{

 		$parsed_date = new stdclass();
 		
 		$parsed_date->stamp = date('c', strtotime($date));
@@ -227,8 +239,8 @@ 
 	}
 
 	private $comment_errors;
-	protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title)
-	{
+	protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title)

+	{

 		if(Request::hasPost() && Request::getPost('submit') == 'Submit Comment')
 		{
 			$parameters = array($site_id, $path, $redirect_url, $page_title);
@@ -238,8 +250,8 @@ 
 		return;
 	}
 
-    protected function get_comment_array($site, $path)
-    {
+    protected function get_comment_array($site, $path)

+    {

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

controller/waterfalls/HomeController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
         $container['logger']->info("CommentService | Sidebar | {$elapsed}");
 
         $array = array();
-        foreach($comment_response as $comment)
+        foreach ($comment_response as $comment)
         {
             $body = Content::instance('CleanComment', $comment['body'])->activate();
             $body = strip_tags($body);

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);

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);
@@ -106,8 +106,8 @@ 
         return $response->getId();
     }
 
-    private function redirectToComment($commentId)
-    {
+    private function redirectToComment($commentId)

+    {

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

Doc Comments +3 added lines

@@ -107,6 +107,9 @@
         return $response['id'];
     }
 
+    /**
+     * @param null|string $commentId
+     */
     private function redirectToComment($commentId)
     {
         $url = '';