jacobemerick / web

utility/Header.class.inc.php

Spacing +4 added lines, -4 removed lines

@@ -186,10 +186,10 @@ 
 
 	private static function send($array, $gzip = true)
 	{
-		if($gzip)
+		if ($gzip)
 			self::start_gzipping();
 		
-		foreach($array as $row)
+		foreach ($array as $row)
 		{
 			header($row, TRUE);
 		}
@@ -197,14 +197,14 @@ 
 
 	private static function get_date($timestamp = false)
 	{
-		if($timestamp == 0)
+		if ($timestamp == 0)
 			$timestamp = time();
 		return gmdate('D, d M Y H:i:s \G\M\T', $timestamp);
 	}
 
 	private static function start_gzipping()
 	{
-		if(!ob_start('ob_gzhandler'))
+		if (!ob_start('ob_gzhandler'))
             ob_start();
 	}
 

Doc Comments +3 added lines

@@ -131,6 +131,9 @@
 		self::send($array);
 	}
 
+	/**
+	 * @param string[] $array
+	 */
 	private static function send($array, $gzip = true)
 	{
 		if($gzip)

Indentation +1 added lines, -1 removed lines

@@ -152,7 +152,7 @@
 	private static function start_gzipping()
 	{
 		if(!ob_start('ob_gzhandler'))
-            ob_start();
+			ob_start();
 	}
 
 }

Braces +9 added lines, -6 removed lines

@@ -133,8 +133,9 @@ 
 
 	private static function send($array, $gzip = true)
 	{
-		if($gzip)
-			self::start_gzipping();
+		if($gzip) {

+					self::start_gzipping();

+		}

 		
 		foreach($array as $row)
 		{
@@ -144,15 +145,17 @@ 
 
 	private static function get_date($timestamp = false)
 	{
-		if($timestamp == 0)
-			$timestamp = time();
+		if($timestamp == 0) {

+					$timestamp = time();

+		}

 		return gmdate('D, d M Y H:i:s \G\M\T', $timestamp);
 	}
 
 	private static function start_gzipping()
 	{
-		if(!ob_start('ob_gzhandler'))
-            ob_start();
+		if(!ob_start('ob_gzhandler')) {

+		            ob_start();

+		}

 	}
 
 }

utility/Search.class.inc.php

Spacing +6 added lines, -6 removed lines

@@ -39,20 +39,20 @@ 
 	public function perform()
 	{
 		$weighted_array = array();
-		foreach($this->result as $row)
+		foreach ($this->result as $row)
 		{
 			$weight = $this->get_search_weight($row);
-			if($weight > 0)
+			if ($weight > 0)
 				$weighted_array[$row->id] = $weight;
 		}
 		arsort($weighted_array);
 		
 		$final_array = array();
-		foreach($weighted_array as $id => $weight)
+		foreach ($weighted_array as $id => $weight)
 		{
-			foreach($this->result as $row)
+			foreach ($this->result as $row)
 			{
-				if($row->id == $id)
+				if ($row->id == $id)
 					$final_array[] = $row;
 			}
 		}
@@ -62,7 +62,7 @@ 
 	private function get_search_weight($row)
 	{
 		$weight = 0;
-		foreach($this->weight as $weight_array)
+		foreach ($this->weight as $weight_array)
 		{
 			$text = $row->{$weight_array['field']};
 			$weight += $weight_array['weight'] * substr_count(strtolower($text), strtolower($this->query));

Braces +6 added lines, -4 removed lines

@@ -42,8 +42,9 @@ 
 		foreach($this->result as $row)
 		{
 			$weight = $this->get_search_weight($row);
-			if($weight > 0)
-				$weighted_array[$row->id] = $weight;
+			if($weight > 0) {

+							$weighted_array[$row->id] = $weight;

+			}

 		}
 		arsort($weighted_array);
 		
@@ -52,8 +53,9 @@ 
 		{
 			foreach($this->result as $row)
 			{
-				if($row->id == $id)
-					$final_array[] = $row;
+				if($row->id == $id) {

+									$final_array[] = $row;

+				}

 			}
 		}
 		return $final_array;

controller/lifestream/DefaultListController.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -56,11 +56,11 @@
 	final private function get_list_posts()
 	{
 		$post_array = array();
-		foreach($this->get_list_results() as $post)
+		foreach ($this->get_list_results() as $post)
 		{
 			$post_array[] = $this->format_post($post, true);
 		}
-		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')
+		if (count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')
 			$this->eject();
 		return $post_array;
 	}

Braces +3 added lines, -2 removed lines

@@ -60,8 +60,9 @@
 		{
 			$post_array[] = $this->format_post($post, true);
 		}
-		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/home/ContactController.class.inc.php

Spacing +5 added lines, -5 removed lines

@@ -33,16 +33,16 @@ 
 
 	private function process_form()
 	{
-		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!')
+		if (!Request::hasPost() || Request::getPost('submit') != 'Send Message!')
 			return (object) array('display' => 'normal');
 		
 		Loader::load('utility', 'Validate');
 		$error_result = array();
-		if(!Validate::checkRequest('post', 'name', 'string'))
+		if (!Validate::checkRequest('post', 'name', 'string'))
 			$error_result['name'] = 'please enter your name';
-		if(!Validate::checkRequest('post', 'email', 'string'))
+		if (!Validate::checkRequest('post', 'email', 'string'))
 			$error_result['email'] = 'please enter a valid email';
-		if(!Validate::checkRequest('post', 'message', 'string'))
+		if (!Validate::checkRequest('post', 'message', 'string'))
 			$error_result['message'] = 'please write a message';
 		
 		$values = (object) array(
@@ -50,7 +50,7 @@ 
 			'email' => Request::getPost('email'),
 			'message' => Request::getPost('message'));
 		
-		if(count($error_result) > 0)
+		if (count($error_result) > 0)
 		{
 			return (object) array(
 				'display' => 'error',

Braces +12 added lines, -8 removed lines

@@ -33,17 +33,21 @@
 
 	private function process_form()
 	{
-		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!')
-			return (object) array('display' => 'normal');
+		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!') {

+					return (object) array('display' => 'normal');

+		}

 		
 		Loader::load('utility', 'Validate');
 		$error_result = array();
-		if(!Validate::checkRequest('post', 'name', 'string'))
-			$error_result['name'] = 'please enter your name';
-		if(!Validate::checkRequest('post', 'email', 'string'))
-			$error_result['email'] = 'please enter a valid email';
-		if(!Validate::checkRequest('post', 'message', 'string'))
-			$error_result['message'] = 'please write a message';
+		if(!Validate::checkRequest('post', 'name', 'string')) {

+					$error_result['name'] = 'please enter your name';

+		}

+		if(!Validate::checkRequest('post', 'email', 'string')) {

+					$error_result['email'] = 'please enter a valid email';

+		}

+		if(!Validate::checkRequest('post', 'message', 'string')) {

+					$error_result['message'] = 'please write a message';

+		}

 		
 		$values = (object) array(
 			'name' => Request::getPost('name'),

Indentation +10 added lines, -10 removed lines

@@ -60,16 +60,16 @@
 				'values' => $values);
 		}
 
-    global $container;
-    $sent = $container['mail']
-      ->addTo($container['config']->admin_email)
-      ->setSubject('Home Page Contact')
-      ->setPlainMessage(
-        "Name: {$values->name}\n" .
-        "Email: {$values->email}\n" .
-        "Message: {$values->message}"
-      )
-      ->send();		
+	global $container;
+	$sent = $container['mail']
+	  ->addTo($container['config']->admin_email)
+	  ->setSubject('Home Page Contact')
+	  ->setPlainMessage(
+		"Name: {$values->name}\n" .
+		"Email: {$values->email}\n" .
+		"Message: {$values->message}"
+	  )
+	  ->send();		
 
 		return (object) array('display' => 'success');
 	}

src/Domain/Stream/YouTube/MysqlYouTubeRepository.php

Doc Comments +1 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
     protected $connections;
 
     /**
-     * @param ConnectonLocator $connections
+     * @param ConnectionLocator $connections
      */
     public function __construct(ConnectionLocator $connections)
     {
@@ -41,7 +41,6 @@ 
     }
 
     /**
-     * @param string $title
      *
      * @return array|false
      */

Indentation +60 added lines, -60 removed lines

@@ -8,88 +8,88 @@
 class MysqlYouTubeRepository implements YouTubeRepositoryInterface
 {
 
-    /** @var  ConnectionLocator */
-    protected $connections;
+	/** @var  ConnectionLocator */
+	protected $connections;
 
-    /**
-     * @param ConnectonLocator $connections
-     */
-    public function __construct(ConnectionLocator $connections)
-    {
-        $this->connections = $connections;
-    }
+	/**
+	 * @param ConnectonLocator $connections
+	 */
+	public function __construct(ConnectionLocator $connections)
+	{
+		$this->connections = $connections;
+	}
 
-    public function getYouTubes($limit = null, $offset = 0)
-    {
-        $query = "
+	public function getYouTubes($limit = null, $offset = 0)
+	{
+		$query = "
             SELECT `id`, `video_id`, `datetime`
             FROM `jpemeric_stream`.`youtube`
             ORDER BY `datetime` DESC";
-        if (!is_null($limit)) {
-            $query .= "
+		if (!is_null($limit)) {
+			$query .= "
             LIMIT {$offset}, {$limit}";
-        }
+		}
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query);
+	}
 
-    /**
-     * @param string $title
-     *
-     * @return array|false
-     */
-    public function getYouTubeByVideoId($videoId)
-    {
-        $query = "
+	/**
+	 * @param string $title
+	 *
+	 * @return array|false
+	 */
+	public function getYouTubeByVideoId($videoId)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`youtube`
             WHERE `video_id` = :video_id
             LIMIT 1";
-        $bindings = [
-            'video_id' => $videoId,
-        ];
+		$bindings = [
+			'video_id' => $videoId,
+		];
 
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchOne($query, $bindings);
-    }
+		return $this
+			->connections
+			->getRead()
+			->fetchOne($query, $bindings);
+	}
 
-    public function getYouTubesUpdatedSince(DateTime $datetime)
-    {
-        $query = "
+	public function getYouTubesUpdatedSince(DateTime $datetime)
+	{
+		$query = "
             SELECT *
             FROM `jpemeric_stream`.`youtube`
             WHERE `updated_at` >= :last_update";
-        $bindings = [
-            'last_update' => $datetime->format('Y-m-d H:i:s'),
-        ];
-        return $this
-            ->connections
-            ->getRead()
-            ->fetchAll($query, $bindings);
-    }
+		$bindings = [
+			'last_update' => $datetime->format('Y-m-d H:i:s'),
+		];
+		return $this
+			->connections
+			->getRead()
+			->fetchAll($query, $bindings);
+	}
 
-    public function insertVideo($videoId, DateTime $datetime, array $metadata)
-    {
-        $query = "
+	public function insertVideo($videoId, DateTime $datetime, array $metadata)
+	{
+		$query = "
             INSERT INTO `jpemeric_stream`.`youtube`
                 (`video_id`, `datetime`, `metadata`)
             VALUES
                 (:video_id, :datetime, :metadata)";
 
-        $bindings = [
-            'video_id' => $videoId,
-            'datetime' => $datetime->format('Y-m-d H:i:s'),
-            'metadata' => json_encode($metadata),
-        ];
+		$bindings = [
+			'video_id' => $videoId,
+			'datetime' => $datetime->format('Y-m-d H:i:s'),
+			'metadata' => json_encode($metadata),
+		];
 
-        return $this
-            ->connections
-            ->getWrite()
-            ->perform($query, $bindings);
-    }
+		return $this
+			->connections
+			->getWrite()
+			->perform($query, $bindings);
+	}
 }

controller/lifestream/PostController.class.inc.php

Spacing +5 added lines, -5 removed lines

@@ -20,14 +20,14 @@ 
 		parent::__construct();
 		
 		$id = URLDecode::getPiece(2);
-		if(!$id || !is_numeric($id))
+		if (!$id || !is_numeric($id))
 			$this->eject();
 		
 		$post = $this->postRepository->getPostById($id);
-		if(!$post)
+		if (!$post)
 			$this->eject();
 		
-		if(URLDecode::getPiece(1) != $post['type'])
+		if (URLDecode::getPiece(1) != $post['type'])
 			$this->eject();
 		
 		$this->post = $post;
@@ -59,7 +59,7 @@ 
 
 	private function get_title()
 	{
-		switch($this->post['type'])
+		switch ($this->post['type'])
 		{
 			case 'blog' :
 				return 'Jacob blogged';
@@ -84,7 +84,7 @@ 
 
 	private function get_description()
 	{
-		switch($this->post['type'])
+		switch ($this->post['type'])
 		{
 			case 'blog' :
 				return 'Another awesome blog post from Jacob. Did I mention it was awesome?';

Braces +9 added lines, -6 removed lines

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

+					$this->eject();

+		}

 		
 		$post = $this->postRepository->getPostById($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;
 	}

Indentation +6 added lines, -6 removed lines

@@ -70,9 +70,9 @@ 
 			case 'distance' :
 				return 'Jacob ran xor hiked';
 			break;
-      case 'github' :
-        return 'Jacob did code';
-      break;
+	  case 'github' :
+		return 'Jacob did code';
+	  break;
 			case 'hulu' :
 				return 'What Jacob watched';
 			break;
@@ -98,9 +98,9 @@ 
 			case 'distance' :
 				return 'Well, it might have been both at the same time if there was a bear.';
 			break;
-      case 'github' :
-        return 'An epic code change by Jacob on the Githubs.';
-      break;
+	  case 'github' :
+		return 'An epic code change by Jacob on the Githubs.';
+	  break;
 			case 'hulu' :
 				return 'It was a cold, dark night, so Jacob watched something on Hulu.';
 			break;

controller/Error404Controller.class.inc.php

Indentation +31 added lines, -31 removed lines

@@ -32,37 +32,37 @@
 
 	private function get_sites()
 	{
-    return [
-      [
-        'url' => 'http://home.jacobemerick.com/',
-        'title' => "Jacob Emerick's Home",
-        'name' => 'Home'
-      ],
-      [
-        'url' => 'http://blog.jacobemerick.com/',
-        'title' => "Jacob Emerick's Blog",
-        'name' => 'Blog'
-      ],
-      [
-        'url' => 'http://lifestream.jacobemerick.com/',
-        'title' => "Jacob Emerick's Lifestream",
-        'name' => 'Lifestream'
-      ],
-      [
-        'url' => 'http://map.jacobemerick.com/',
-        'title' => "Jacob Emerick's Hiking Map",
-        'name' => 'Map'
-      ],
-      [
-        'url' => 'http://portfolio.jacobemerick.com/',
-        'title' => "Jacob Emerick's Portfolio",
-        'name' => 'Portfolio',
-      ],
-      [
-        'url' => 'http://www.waterfallsofthekeweenaw.com/',
-        'title' => 'Waterfalls of the Keweenaw',
-        'name' => 'Waterfalls'
-      ]
+	return [
+	  [
+		'url' => 'http://home.jacobemerick.com/',
+		'title' => "Jacob Emerick's Home",
+		'name' => 'Home'
+	  ],
+	  [
+		'url' => 'http://blog.jacobemerick.com/',
+		'title' => "Jacob Emerick's Blog",
+		'name' => 'Blog'
+	  ],
+	  [
+		'url' => 'http://lifestream.jacobemerick.com/',
+		'title' => "Jacob Emerick's Lifestream",
+		'name' => 'Lifestream'
+	  ],
+	  [
+		'url' => 'http://map.jacobemerick.com/',
+		'title' => "Jacob Emerick's Hiking Map",
+		'name' => 'Map'
+	  ],
+	  [
+		'url' => 'http://portfolio.jacobemerick.com/',
+		'title' => "Jacob Emerick's Portfolio",
+		'name' => 'Portfolio',
+	  ],
+	  [
+		'url' => 'http://www.waterfallsofthekeweenaw.com/',
+		'title' => 'Waterfalls of the Keweenaw',
+		'name' => 'Waterfalls'
+	  ]
   ];
 	}
 

controller/waterfalls/DefaultPageController.class.inc.php

Indentation +36 added lines, -36 removed lines

@@ -10,7 +10,7 @@ 
 
 	protected static $WATERFALL_SITE_ID = 5;
 
-    protected $parent_navigation_item = '';
+	protected $parent_navigation_item = '';
 
 	protected function set_head_data()
 	{
@@ -19,45 +19,45 @@ 
 		$this->add_css('waterfalls');
 	}
 
-    protected function add_waterfall_js()
-    {
-        $this->add_js('jquery');
-        $this->add_js('imagelightbox');
-        $this->add_js('waterfalls');
-    }
+	protected function add_waterfall_js()
+	{
+		$this->add_js('jquery');
+		$this->add_js('imagelightbox');
+		$this->add_js('waterfalls');
+	}
 
 	protected function set_body_data($page_type = 'normal')
 	{
 		$this->set_body('activity_array', $this->get_recent_activity());
 
-        $this->set_body('main_navigation', array(
-                (object) array(
-                    'uri' => '/falls/',
-                    'anchor' => 'Falls',
-                    'is_active' => $this->parent_navigation_item === 'falls',
-                ),
-                (object) array(
-                    'uri' => '/map/',
-                    'anchor' => 'Map',
-                    'is_active' => $this->parent_navigation_item === 'map',
-                ),
-                (object) array(
-                    'uri' => '/journal/',
-                    'anchor' => 'Journal',
-                    'is_active' => $this->parent_navigation_item === 'journal',
-                ),
-                (object) array(
-                    'uri' => '/about/',
-                    'anchor' => 'About',
-                    'is_active' => $this->parent_navigation_item === 'about',
-                )
-        ));
-
-        if ($page_type == 'wide') {
-            $this->set_body_view('WidePage');
-        } else {
-            $this->set_body_view('Page');
-        }
-    }
+		$this->set_body('main_navigation', array(
+				(object) array(
+					'uri' => '/falls/',
+					'anchor' => 'Falls',
+					'is_active' => $this->parent_navigation_item === 'falls',
+				),
+				(object) array(
+					'uri' => '/map/',
+					'anchor' => 'Map',
+					'is_active' => $this->parent_navigation_item === 'map',
+				),
+				(object) array(
+					'uri' => '/journal/',
+					'anchor' => 'Journal',
+					'is_active' => $this->parent_navigation_item === 'journal',
+				),
+				(object) array(
+					'uri' => '/about/',
+					'anchor' => 'About',
+					'is_active' => $this->parent_navigation_item === 'about',
+				)
+		));
+
+		if ($page_type == 'wide') {
+			$this->set_body_view('WidePage');
+		} else {
+			$this->set_body_view('Page');
+		}
+	}
 
 }

controller/ajax/GetPortfolioImageController.class.inc.php

Indentation +3 added lines, -3 removed lines

@@ -12,9 +12,9 @@
 		
 		$portfolio_result = PortfolioCollector::getImageById($id);
 
-    $image_path = "portfolio/{$portfolio_result->name}";
-    $image_path = Loader::getImagePath('image', $image_path);
-    $image_size = getimagesize($image_path);
+	$image_path = "portfolio/{$portfolio_result->name}";
+	$image_path = Loader::getImagePath('image', $image_path);
+	$image_size = getimagesize($image_path);
 
 		$main_image = new stdclass();
 		$main_image->id = $portfolio_result->id;