jacobemerick / web

controller/portfolio/AboutController.class.inc.php

Braces +6 added lines, -6 removed lines

@@ -2,11 +2,11 @@ 
 
 Loader::load('controller', 'portfolio/DefaultPageController');
 
-class AboutController extends DefaultPageController
-{
+class AboutController extends DefaultPageController

+{

 
-    protected function set_head_data()
-    {
+    protected function set_head_data()

+    {

         $this->set_title("Jacob Emerick's Portfolio");
         $this->set_description("Jacob Emerick's Portfolio - collection of programming projects and resume");
         $this->set_keywords([
@@ -20,8 +20,8 @@ 
         ]);
     }
 
-    protected function set_body_data()
-    {
+    protected function set_body_data()

+    {

         $this->set_body('body_view', 'About');
         $this->set_body('body_data', []);
 

controller/Error303Controller.class.inc.php

Braces +10 added lines, -6 removed lines

@@ -2,16 +2,20 @@
 
 Loader::load('controller', '/PageController');
 
-class Error303Controller extends PageController
-{
+class Error303Controller extends PageController

+{

 
-	public function __construct($uri)
-	{
+	public function __construct($uri)

+	{

 		Header::redirect($uri, 303);
 		exit;
 	}
 
-	protected function set_head_data() {}
-	protected function set_body_data() {}
+	protected function set_head_data()

+	{

+}
+	protected function set_body_data()

+	{

+}
 
 }

controller/lifestream/PostController.class.inc.php

Braces +21 added lines, -18 removed lines

@@ -2,8 +2,8 @@ 
 
 Loader::load('controller', 'lifestream/DefaultPageController');
 
-final class PostController extends DefaultPageController
-{
+final class PostController extends DefaultPageController

+{

 
 	private static $TITLE = "Post %d | %s Activity | Jacob Emerick's Lifestream";
 	private static $DESCRIPTION = "Post %d of %s activity on Jacob Emerick's Lifestream.";
@@ -15,26 +15,29 @@ 
 
 	private $post;
 
-	public function __construct()
-	{
+	public function __construct()

+	{

 		parent::__construct();
 		
 		$id = URLDecode::getPiece(2);
-		if(!$id || !is_numeric($id))
-			$this->eject();
+		if(!$id || !is_numeric($id)) {

+					$this->eject();

+		}

 		
 		$post = $this->activityRepository->getActivityById($id);
-		if(!$post)
-			$this->eject();
+		if(!$post) {

+					$this->eject();

+		}

 		
-		if(URLDecode::getPiece(1) != $post['type'])
-			$this->eject();
+		if(URLDecode::getPiece(1) != $post['type']) {

+					$this->eject();

+		}

 		
 		$this->post = $post;
 	}
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		$this->set_title(sprintf(self::$TITLE, $this->post['id'], ucwords($this->post['type'])));
 		$this->set_description(sprintf(self::$DESCRIPTION, $this->post['id'], ucwords($this->post['type'])));
 		
@@ -45,8 +48,8 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body('title', $this->get_title());
 		$this->set_body('description', $this->get_description());
 		
@@ -57,8 +60,8 @@ 
 		parent::set_body_data();
 	}
 
-	private function get_title()
-	{
+	private function get_title()

+	{

 		switch($this->post['type'])
 		{
 			case 'blog' :
@@ -85,8 +88,8 @@ 
 		}
 	}
 
-	private function get_description()
-	{
+	private function get_description()

+	{

 		switch($this->post['type'])
 		{
 			case 'blog' :

controller/lifestream/DefaultPageController.class.inc.php

Braces +8 added lines, -8 removed lines

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

+{

 
   protected $activityRepository;
 
-  public function __construct()
-  {
+  public function __construct()

+  {

     parent::__construct();
 
     global $container;
     $this->activityRepository = new Jacobemerick\Web\Domain\Stream\Activity\MysqlActivityRepository($container['db_connection_locator']);
   }
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		$this->add_css('normalize');
 		$this->add_css('lifestream', 2);
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body_view('Page');
 	}
 

controller/lifestream/HomeController.class.inc.php

Braces +33 added lines, -28 removed lines

@@ -2,8 +2,8 @@ 
 
 Loader::load('controller', 'lifestream/DefaultListController');
 
-final class HomeController extends DefaultListController
-{
+final class HomeController extends DefaultListController

+{

 
 	private static $TITLE = "Jacob Emerick's Lifestream";
 	private static $DESCRIPTION = 'Lifestream for Jacob Emerick, a combination of his latest twitter, youtube, running, reading, and blogging activity.';
@@ -18,8 +18,8 @@ 
 
 	private static $LIST_DESCRIPTION = 'viewing %d - %d of %d total activities';
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		$this->set_title(self::$TITLE);
 		$this->set_description(self::$DESCRIPTION);
 		$this->set_keywords(self::$KEYWORD_ARRAY);
@@ -27,56 +27,61 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body('title', "What's Jacob Up To?");
 		$this->set_body('description', "A combination of Jacob Emerick's tweets, runs, reads, blogs, and YouTubes all in <em>one awesome lifestream</em>.");
 		
 		parent::set_body_data();
 	}
 
-	protected function get_page_number()
-	{
+	protected function get_page_number()

+	{

 		$page = URLDecode::getPiece(2);
-		if(isset($page) && is_numeric($page))
-			return $page;
+		if(isset($page) && is_numeric($page)) {

+					return $page;

+		}

 		return 1;
 	}
 
-	protected function get_list_results()
-	{
+	protected function get_list_results()

+	{

     return $this->activityRepository->getActivities(self::$POSTS_PER_PAGE, $this->offset);
 	}
 
-	protected function get_list_description()
-	{
+	protected function get_list_description()

+	{

 		$start = $this->offset + 1;
 		$end = min($this->offset + self::$POSTS_PER_PAGE, $this->get_total_post_count());
 		
 		return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count());
 	}
 
-	protected function get_list_next_link()
-	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return Loader::getRootUrl('lifestream');
+	protected function get_list_next_link()

+	{

+		if($this->page == 1) {

+					return;

+		}

+		if($this->page == 2) {

+					return Loader::getRootUrl('lifestream');

+		}

 		return Loader::getRootUrl('lifestream') . 'page/' . ($this->page - 1) . '/';
 	}
 
-	protected function get_list_prev_link()
-	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
-			return;
+	protected function get_list_prev_link()

+	{

+		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) {

+					return;

+		}

 		return Loader::getRootUrl('lifestream') . 'page/' . ($this->page + 1) . '/';
 	}
 
 	private $total_post_count;
-	protected function get_total_post_count()
-	{
-		if(!isset($this->total_post_count))
-			$this->total_post_count = $this->activityRepository->getActivitiesCount();
+	protected function get_total_post_count()

+	{

+		if(!isset($this->total_post_count)) {

+					$this->total_post_count = $this->activityRepository->getActivitiesCount();

+		}

 		return $this->total_post_count;
 	}
 

controller/lifestream/DefaultListController.class.inc.php

Braces +15 added lines, -14 removed lines

@@ -2,16 +2,16 @@ 
 
 Loader::load('controller', 'lifestream/DefaultPageController');
 
-abstract class DefaultListController extends DefaultPageController
-{
+abstract class DefaultListController extends DefaultPageController

+{

 
 	protected static $POSTS_PER_PAGE = 15;
 
 	protected $page;
 	protected $offset;
 
-	public function __construct()
-	{
+	public function __construct()

+	{

 		parent::__construct();
 
 		$this->page = $this->get_page_number();
@@ -25,24 +25,24 @@ 
 	abstract protected function get_list_prev_link();
 	abstract protected function get_total_post_count();
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		parent::set_head_data();
 		
 		$this->set_head('next_link', $this->get_list_next_link());
 		$this->set_head('previous_link', $this->get_list_prev_link());
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		parent::set_body_data();
 		
 		$this->set_body('view', 'Listing');
 		$this->set_body('data', $this->get_list_body_data());
 	}
 
-	final private function get_list_body_data()
-	{
+	final private function get_list_body_data()

+	{

 		return array(
 			'posts' => $this->get_list_posts(),
 			'type' => 'list',
@@ -52,15 +52,16 @@ 
 				'prev' => $this->get_list_prev_link()));
 	}
 
-	final private function get_list_posts()
-	{
+	final private function get_list_posts()

+	{

 		$post_array = array();
 		foreach($this->get_list_results() as $post)
 		{
 			$post_array[] = $this->expand_post($post, 'full');
 		}
-		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')
-			$this->eject();
+		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search') {

+					$this->eject();

+		}

 		return $post_array;
 	}
 

controller/lifestream/TagController.class.inc.php

Braces +39 added lines, -34 removed lines

@@ -2,8 +2,8 @@ 
 
 Loader::load('controller', 'lifestream/DefaultListController');
 
-final class TagController extends DefaultListController
-{
+final class TagController extends DefaultListController

+{

 
 	private static $TITLE = "%s Activity | Jacob Emerick's Lifestream";
 	private static $DESCRIPTION = "%s activity on Jacob Emerick's lifestream, all nice and paginated in one awesome website.";
@@ -17,15 +17,15 @@ 
 
 	private $tag;
 
-	public function __construct()
-	{
+	public function __construct()

+	{

 		parent::__construct();
 		
 		$this->tag = URLDecode::getPiece(1);
 	}
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		$this->set_title(sprintf(self::$TITLE, ucwords($this->tag)));
 		$this->set_description(sprintf(self::$DESCRIPTION, ucwords($this->tag)));
 		
@@ -36,16 +36,16 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body('title', $this->get_title());
 		$this->set_body('description', $this->get_description());
 		
 		parent::set_body_data();
 	}
 
-	private function get_title()
-	{
+	private function get_title()

+	{

 		switch($this->tag)
 		{
 			case 'blog' :
@@ -72,8 +72,8 @@ 
 		}
 	}
 
-	private function get_description()
-	{
+	private function get_description()

+	{

 		switch($this->tag)
 		{
 			case 'blog' :
@@ -100,48 +100,53 @@ 
 		}
 	}
 
-	protected function get_page_number()
-	{
+	protected function get_page_number()

+	{

 		$page = URLDecode::getPiece(3);
-		if(isset($page) && is_numeric($page))
-			return $page;
+		if(isset($page) && is_numeric($page)) {

+					return $page;

+		}

 		return 1;
 	}
 
-	protected function get_list_results()
-	{
+	protected function get_list_results()

+	{

 		return $this->activityRepository->getActivitiesByType($this->tag, self::$POSTS_PER_PAGE, $this->offset);
 	}
 
-	protected function get_list_description()
-	{
+	protected function get_list_description()

+	{

 		$start = $this->offset + 1;
 		$end = min($this->offset + self::$POSTS_PER_PAGE, $this->get_total_post_count());
 		
 		return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count(), $this->tag);
 	}
 
-	protected function get_list_next_link()
-	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return Loader::getRootUrl('lifestream') . $this->tag . '/';
+	protected function get_list_next_link()

+	{

+		if($this->page == 1) {

+					return;

+		}

+		if($this->page == 2) {

+					return Loader::getRootUrl('lifestream') . $this->tag . '/';

+		}

 		return Loader::getRootUrl('lifestream') . $this->tag . '/page/' . ($this->page - 1) . '/';
 	}
 
-	protected function get_list_prev_link()
-	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
-			return;
+	protected function get_list_prev_link()

+	{

+		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) {

+					return;

+		}

 		return Loader::getRootUrl('lifestream') . $this->tag . '/page/' . ($this->page + 1) . '/';
 	}
 
 	private $total_post_count;
-	protected function get_total_post_count()
-	{
-		if(!isset($this->total_post_count))
-			$this->total_post_count = $this->activityRepository->getActivitiesByTypeCount($this->tag);
+	protected function get_total_post_count()

+	{

+		if(!isset($this->total_post_count)) {

+					$this->total_post_count = $this->activityRepository->getActivitiesByTypeCount($this->tag);

+		}

 		return $this->total_post_count;
 	}
 

controller/PageController.class.inc.php

Braces +96 added lines, -80 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)

+	{

 		Loader::load('collector', 'comment/CommentCollector');
 		
 		$commenter = $this->get_commenter();
@@ -257,18 +269,19 @@ 
 			$comment_object->url = $comment->url;
 			$comment_object->trusted = $comment->trusted;
 			
-			if($comment->reply == 0 && Request::getPost('type') == $comment->id)
-				$comment_object->errors = $this->comment_errors;
-			else
-				$comment_object->errors = array();
+			if($comment->reply == 0 && Request::getPost('type') == $comment->id) {

+							$comment_object->errors = $this->comment_errors;

+			} else {

+							$comment_object->errors = array();

+			}

 			
 			if($comment->reply == 0)
 			{
 				$comment_object->replies = array();
 				$comment_array[$comment->id] = $comment_object;
-			}
-			else
-				$comment_array[$comment->reply]->replies[$comment->id] = $comment_object;
+			} else {

+							$comment_array[$comment->reply]->replies[$comment->id] = $comment_object;

+			}

 		}
 		
 		$comment_count = CommentCollector::getCommentCountForURL($site, $path);
@@ -280,8 +293,8 @@ 
 			'comment_count' => $comment_count);
 	}
 
-	private function get_commenter()
-	{
+	private function get_commenter()

+	{

 		Loader::load('collector', 'comment/CommentCollector');
 
 		$commenter = new stdclass();
@@ -297,16 +310,19 @@ 
 
 		$commenter_cookie_value = json_decode($_COOKIE['commenter']);
 		
-		if($commenter_cookie_value === NULL)
-			return $commenter;
+		if($commenter_cookie_value === NULL) {

+					return $commenter;

+		}

 		
-		if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email))
-			return $commenter;
+		if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email)) {

+					return $commenter;

+		}

 		
 		$commenter_object = CommentCollector::getCommenterByFields($commenter_cookie_value->name, $commenter_cookie_value->email, (isset($commenter_cookie_value->website) ? $commenter_cookie_value->website : ''));
 		
-		if($commenter_object === NULL)
-			return $commenter;
+		if($commenter_object === NULL) {

+					return $commenter;

+		}

 		
 		$commenter->id = $commenter_object->id;
 		$commenter->name = $commenter_object->name;

controller/AJAXController.class.inc.php

Braces +15 added lines, -13 removed lines

@@ -4,8 +4,8 @@ 
 	'Header',
 	'Request'));
 
-abstract class AJAXController
-{
+abstract class AJAXController

+{

 
 	private static $RESPONSE_HEADER = 'sendJSON';
 
@@ -13,18 +13,20 @@ 
 
 	abstract protected function set_data();
 
-	function __construct() {}
+	function __construct()

+	{

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

+	{

 		call_user_func(array('Header', self::$RESPONSE_HEADER));
 		
 		$this->set_data();
 		echo $this->response_as_json();
 	}
 
-	protected function set_response($message, $type = 'internal')
-	{
+	protected function set_response($message, $type = 'internal')

+	{

 		switch($type)
 		{
 			case 'internal' :
@@ -38,21 +40,21 @@ 
 		}
 	}
 
-	protected function fail_response($message)
-	{
+	protected function fail_response($message)

+	{

 		$this->set_response($message, 'error');
 		return false;
 	}
 
-	protected function eject($message)
-	{
+	protected function eject($message)

+	{

 		$this->fail_response($message);
 		echo $this->response_as_json();
 		exit();
 	}
 
-	private function response_as_json()
-	{
+	private function response_as_json()

+	{

 		return json_encode($this->response);
 	}