jacobemerick / web

controller/portfolio/ContactController.class.inc.php

Braces +8 added lines, -8 removed lines

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

+{

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

+    {

         $this->set_title("Contact Page | Jacob Emerick's Portfolio");
         $this->set_description("Contact page for Jacob Emerick's Portfolio");
         $this->set_keywords([
@@ -19,8 +19,8 @@ 
         ]);
     }
 
-    protected function set_body_data()
-    {
+    protected function set_body_data()

+    {

         $this->set_body('body_view', 'Contact');
 
         $body_data = [];
@@ -33,8 +33,8 @@ 
         parent::set_body_data();
     }
 
-    private function process_form_data()
-    {
+    private function process_form_data()

+    {

         $errors = [];
 
         if (

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

controller/Error301Controller.class.inc.php

Braces +10 added lines, -6 removed lines

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

+{

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

+	{

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

+	{

+}
+	protected function set_body_data()

+	{

+}
 
 }

controller/home/HomeController.class.inc.php

Braces +8 added lines, -8 removed lines

@@ -5,8 +5,8 @@ 
 Loader::load('controller', 'home/DefaultPageController');
 Loader::load('utility', 'Content');
 
-final class HomeController extends DefaultPageController
-{
+final class HomeController extends DefaultPageController

+{

 
 	private static $TITLE = "Jacob Emerick's Home | Web Developer, Hiker, Innovator";
 	private static $DESCRIPTION = 'Home page for Jacob Emerick, with links to his blog, waterfall site, and other side projects';
@@ -24,8 +24,8 @@ 
 	private static $POST_LENGTH_SHORT = 160;
 	private static $POST_LENGTH_LONG = 240;
 
-	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);
@@ -33,16 +33,16 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body('post_array', $this->get_recent_posts());
 		$this->set_body_view('Home');
 		
 		parent::set_body_data();
 	}
 
-	private function get_recent_posts()
-	{
+	private function get_recent_posts()

+	{

     global $container;
     $postRepository = new MysqlPostRepository($container['db_connection_locator']);
     $recentPosts = $postRepository->getActivePosts(3);

utility/content/FixPhotoContent.class.inc.php

Braces +14 added lines, -12 removed lines

@@ -2,15 +2,15 @@ 
 
 Loader::load('utility', 'Content');
 
-final class FixPhotoContent extends Content
-{
+final class FixPhotoContent extends Content

+{

 
 	private static $PHOTO_PLACEHOLDER_MATCH = '@{{photo="(.*)"}}@';
 	private static $ERROR_CONTENT = '<div class="photo-holder"><p class="photo-caption">Image (%s) could not be found!</p></div>';
 	private static $PHOTO_CONTENT = '<div class="photo-holder"><img src="%sphoto/%s/%s-size-%s.jpg" height="%d" width="%d" alt="%s" /><p class="photo-caption">%s</p></div>';
 
-	protected function execute($is_absolute = false, $size = 'medium')
-	{
+	protected function execute($is_absolute = false, $size = 'medium')

+	{

 		preg_match_all(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $matches);
 		foreach($matches[1] as $key => $match)
 		{
@@ -20,14 +20,14 @@ 
 		return;
 	}
 
-	private function get_file_path($category, $photo, $size, $extension)
-	{
+	private function get_file_path($category, $photo, $size, $extension)

+	{

 		$path = "{$category}/{$photo}-size-{$size}.{$extension}";
 		return Loader::getImagePath('photo', $path);
 	}
 
-	private function get_photo_content($string, $size, $is_absolute)
-	{
+	private function get_photo_content($string, $size, $is_absolute)

+	{

 		list($category, $file_name) = explode('/', $string);
 		list($photo, $extension) = explode('.', $file_name);
 		
@@ -37,16 +37,18 @@ 
 		
 		Loader::load('collector', 'image/PhotoCollector');
 		$photo_result = PhotoCollector::fetchRow($category, $photo);
-		if($photo_result == false)
-			return '';
+		if($photo_result == false) {

+					return '';

+		}

 		
 		$height = $file_size[1];
 		$width = $file_size[0];
 		$description = $photo_result->description;
         
 		$domain = '/';
-		if($is_absolute)
-			$domain = Loader::getRootUrl('blog');
+		if($is_absolute) {

+					$domain = Loader::getRootUrl('blog');

+		}

 		
 		return sprintf(self::$PHOTO_CONTENT, $domain, $category, $photo, $size, $height, $width, $description, $description);
 	}

utility/content/FetchFirstPhotoContent.class.inc.php

Braces +19 added lines, -16 removed lines

@@ -2,30 +2,31 @@ 
 
 Loader::load('utility', 'Content');
 
-final class FetchFirstPhotoContent extends Content
-{
+final class FetchFirstPhotoContent extends Content

+{

 
 	private static $PHOTO_PLACEHOLDER_MATCH = '@{{photo="(.*)"}}@';
 	private static $IMAGE_NODE = '<img src="%sphoto/%s/%s-size-%s.%s" height="%d" width="%d" alt="%s" />';
 	private static $DEFAULT_RETURN = '';
 
-	protected function execute($is_absolute = false, $size = 'thumb')
-	{
-		if(preg_match(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $match) === 1)
-			$this->content = $this->get_thumb($match[1], $is_absolute, $size);
-		else
-			$this->content = self::$DEFAULT_RETURN;
+	protected function execute($is_absolute = false, $size = 'thumb')

+	{

+		if(preg_match(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $match) === 1) {

+					$this->content = $this->get_thumb($match[1], $is_absolute, $size);

+		} else {

+					$this->content = self::$DEFAULT_RETURN;

+		}

 		return;
 	}
 
-	private function get_file_path($category, $photo, $size, $extension)
-	{
+	private function get_file_path($category, $photo, $size, $extension)

+	{

 		$path = "{$category}/{$photo}-size-{$size}.{$extension}";
 		return Loader::getImagePath('photo', $path);
 	}
 
-	private function get_thumb($string, $is_absolute, $size)
-	{
+	private function get_thumb($string, $is_absolute, $size)

+	{

 		list($category, $file_name) = explode('/', $string);
 		list($photo, $extension) = explode('.', $file_name);
 		
@@ -34,16 +35,18 @@ 
 		
 		Loader::load('collector', 'image/PhotoCollector');
 		$photo_result = PhotoCollector::fetchRow($category, $photo);
-		if($photo_result == false)
-			return '';
+		if($photo_result == false) {

+					return '';

+		}

 		
 		$height = $file_size[1];
 		$width = $file_size[0];
 		$description = $photo_result->description;
 		
 		$domain = '/';
-		if($is_absolute)
-			$domain = Loader::getRootURL(URLDecode::getSite());
+		if($is_absolute) {

+					$domain = Loader::getRootURL(URLDecode::getSite());

+		}

 
 		return sprintf(self::$IMAGE_NODE, $domain, $category, $photo, $size, $extension, $height, $width, $description);
 	}

utility/Loader.class.inc.php

Braces +49 added lines, -46 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-final class Loader
-{
+final class Loader

+{

 
 	private $root;
 	private $is_live;
@@ -9,21 +9,22 @@ 
 
 	private static $instance;
 
-	private function __construct()
-	{
+	private function __construct()

+	{

 		$this->is_live = (isset($_SERVER['HTTP_HOST']) && substr($_SERVER['HTTP_HOST'], 0, 4) !== 'dev.');
 		return $this;
 	}
 
-	public static function instance()
-	{
-		if(!isset(self::$instance))
-			self::$instance = new Loader();
+	public static function instance()

+	{

+		if(!isset(self::$instance)) {

+					self::$instance = new Loader();

+		}

 		return self::$instance;
 	}
 
-	private function get_root()
-	{
+	private function get_root()

+	{

 		if(!isset($this->root))
 		{
 			$current_directory = dirname(__FILE__);
@@ -34,24 +35,24 @@ 
 		return $this->root;
 	}
 
-	private function get_delimiter()
-	{
+	private function get_delimiter()

+	{

 		return (true || $this->is_live) ? '/' : '\\';
 	}
 
-	private function check_delimiters($path)
-	{
+	private function check_delimiters($path)

+	{

 		return (true || $this->is_live) ? $path : str_replace('/', '\\', $path);
 	}
 
-	private static function get_class_name($path)
-	{
+	private static function get_class_name($path)

+	{

 		$path_array = explode('/', $path);
 		return array_pop($path_array);
 	}
 
-	private static function get_extension($type)
-	{
+	private static function get_extension($type)

+	{

 		switch($type)
 		{
 			case 'collector' :
@@ -69,8 +70,8 @@ 
 		return $extension;
 	}
 
-	public static function getImagePath($type, $file)
-	{
+	public static function getImagePath($type, $file)

+	{

 		$path = self::instance()->get_root();
 		$path .= 'public';
 		$path .= self::instance()->get_delimiter();
@@ -81,8 +82,8 @@ 
 		return $path;
 	}
 
-	private static function get_path($type, $file)
-	{
+	private static function get_path($type, $file)

+	{

 		$path = self::instance()->get_root();
 		$path .= $type;
 		$path .= self::instance()->get_delimiter();
@@ -92,23 +93,24 @@ 
 		return $path;
 	}
 
-	private function get_included_files()
-	{
+	private function get_included_files()

+	{

 		return $this->included_files;
 	}
 
-	private function add_included_file($path)
-	{
+	private function add_included_file($path)

+	{

 		$this->included_files[] = $path;
 	}
 
-	public static function load($type, $files, $data = array())
-	{
+	public static function load($type, $files, $data = array())

+	{

 		foreach((array) $files as $file)
 		{
 			$file_path = self::instance()->get_path($type, $file);
-			if(in_array($file_path, self::instance()->get_included_files()) && $type !== 'view')
-				continue;
+			if(in_array($file_path, self::instance()->get_included_files()) && $type !== 'view') {

+							continue;

+			}

 			
 			self::instance()->add_included_file($file_path);
 			
@@ -130,14 +132,14 @@ 
 		}
 	}
 
-	private static function create_reflection_class($file)
-	{
+	private static function create_reflection_class($file)

+	{

 		$class_name = self::instance()->get_class_name($file);
 		return new ReflectionClass($class_name);
 	}
 
-	public static function loadInstance($type, $file)
-	{
+	public static function loadInstance($type, $file)

+	{

 		self::load($type, $file);
 		
 		$reflectionObject = self::create_reflection_class($file);
@@ -151,30 +153,31 @@ 
 		trigger_error("Requested class cannot be instance'd: {$type}, {$file}");
 	}
 
-	public static function loadNew($type, $file, $data = array())
-	{
+	public static function loadNew($type, $file, $data = array())

+	{

 		self::load($type, $file);
 		
 		$reflectionObject = self::create_reflection_class($file);
 		
-		if($reflectionObject->hasMethod('__construct'))
-			return $reflectionObject->newInstanceArgs($data);
-		else
-			return $reflectionObject->newInstance();
+		if($reflectionObject->hasMethod('__construct')) {

+					return $reflectionObject->newInstanceArgs($data);

+		} else {

+					return $reflectionObject->newInstance();

+		}

 	}
 
-	public static function getRoot()
-	{
+	public static function getRoot()

+	{

 		return self::instance()->get_root();
 	}
 
-	public static function isLive()
-	{
+	public static function isLive()

+	{

 		return self::instance()->is_live;
 	}
 
-    public static function getRootURL($site = '')
-    {
+    public static function getRootURL($site = '')

+    {

         if (strlen($site) > 0) {
             $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
             if ($site == 'waterfalls' && self::instance()->is_live) {