jacobemerick / web

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/URLSafeContent.class.inc.php

Braces +4 added lines, -4 removed lines

@@ -2,11 +2,11 @@
 
 Loader::load('utility', 'Content');
 
-class URLSafeContent extends Content
-{
+class URLSafeContent extends Content

+{

 
-	protected function execute()
-	{
+	protected function execute()

+	{

 		$this->content = strtolower(str_replace(' ', '-', $this->content));
 	}
 

utility/content/CleanCommentContent.class.inc.php

Braces +24 added lines, -22 removed lines

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

+{

 
 	private static $LINK_PATTERN = '@<a.*href=["\']([^"\']*)["\'].*>(.*)</a>@i';
 	private static $BOLD_PATTERN = '@<b.*>(.*)</b>@i';
@@ -22,8 +22,8 @@ 
 
 	private $replacement_array = array();
 
-	protected function execute()
-	{
+	protected function execute()

+	{

 		$this->process_element(self::$CODE_PATTERN, self::$CODE_REPLACE);
 		$this->process_element(self::$LINK_PATTERN, self::$LINK_REPLACE);
 		$this->process_element(self::$ITALIC_PATTERN, self::$ITALIC_REPLACE);
@@ -36,12 +36,13 @@ 
 		$this->replace_element_patterns();
 	}
 
-	private function process_element($pattern, $replace)
-	{
+	private function process_element($pattern, $replace)

+	{

 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
 		
-		if($match_count < 1)
-			return;
+		if($match_count < 1) {

+					return;

+		}

 		
 		foreach($matches as $match)
 		{
@@ -54,13 +55,13 @@ 
 		}
 	}
 
-	private function create_placeholder($text)
-	{
+	private function create_placeholder($text)

+	{

 		return md5($text . rand());
 	}
 
-	private function create_full_match_pattern($text)
-	{
+	private function create_full_match_pattern($text)

+	{

 		$pattern = '';
 		$pattern .= '@';
 		$pattern .= preg_quote($text, '@');
@@ -70,17 +71,18 @@ 
 		return $pattern;
 	}
 
-	private function strip_extra_tags()
-	{
+	private function strip_extra_tags()

+	{

 		$this->content = strip_tags($this->content);
 	}
 
-	private function link_unlinked_urls($pattern, $replace)
-	{
+	private function link_unlinked_urls($pattern, $replace)

+	{

 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
 		
-		if($match_count < 1)
-			return;
+		if($match_count < 1) {

+					return;

+		}

 		
 		foreach($matches as $match)
 		{
@@ -92,13 +94,13 @@ 
 		}
 	}
 
-	private function add_line_breaks()
-	{
+	private function add_line_breaks()

+	{

 		$this->content = preg_replace(self::$LINE_BREAK_PATTERN, self::$LINE_BREAK_REPLACE, $this->content);
 	}
 
-	private function replace_element_patterns()
-	{
+	private function replace_element_patterns()

+	{

 		foreach($this->replacement_array as $key => $replace)
 		{
 			$this->content = str_replace($key, $replace, $this->content);

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/content/FixInternalLinkContent.class.inc.php

Braces +23 added lines, -18 removed lines

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

+{

 
 	private static $LINK_PLACEHOLDER_MATCH = '@{{link="([a-z0-9/-]*)"( anchor="([a-zA-Z0-9\s]*)")?}}@';
 	private static $ERROR_CONTENT = '<span>%s</span>';
 	private static $LINK_CONTENT = '<a href="%s" target="_blank" />%s</a>';
 
-	protected function execute($is_absolute = true)
-	{
+	protected function execute($is_absolute = true)

+	{

 		preg_match_all(self::$LINK_PLACEHOLDER_MATCH, $this->content, $matches);
 		foreach($matches[1] as $key => $match)
 		{
-			if(isset($matches[3][$key]))
-				$link_content = $this->get_link($match, $is_absolute, $matches[3][$key]);
-			else
-				$link_content = $this->get_link($match, $is_absolute);
+			if(isset($matches[3][$key])) {

+							$link_content = $this->get_link($match, $is_absolute, $matches[3][$key]);

+			} else {

+							$link_content = $this->get_link($match, $is_absolute);

+			}

 			$this->content = str_replace($matches[0][$key], $link_content, $this->content);
 		}
 		return;
 	}
 
-	private function get_link($string, $is_absolute, $anchor = '')
-	{
+	private function get_link($string, $is_absolute, $anchor = '')

+	{

 		list($type, $uri) = explode('/', $string, 2);
 		
 		$link = '';
@@ -36,14 +37,16 @@ 
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         $post = $repository->findPostByPath($uri);
 
-				if($post === NULL)
-					return;
+				if($post === NULL) {

+									return;

+				}

 				
 				$link .= ($is_absolute) ? Loader::getRootURL('blog') : '/';
 				$link .= "{$post['category']}/{$post['path']}/";
 				
-				if($anchor == '')
-					$anchor = $post['title'];
+				if($anchor == '') {

+									$anchor = $post['title'];

+				}

 				
 				break;
 			case 'blog-tag' :
@@ -62,14 +65,16 @@ 
 				Loader::load('collector', 'waterfall/LogCollector');
 				$log = LogCollector::getByAlias($uri);
 				
-				if($log === NULL)
-					return;
+				if($log === NULL) {

+									return;

+				}

 				
 				$link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/';
 				$link .= "journal/{$log->alias}/";
 				
-				if($anchor == '')
-					$anchor = $log->title;
+				if($anchor == '') {

+									$anchor = $log->title;

+				}

 				
 				break;
 			case 'falls' :

utility/content/ImperialUnitContent.class.inc.php

Braces +4 added lines, -4 removed lines

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

+{

 
-    protected function execute($type = '')
-    {
+    protected function execute($type = '')

+    {

         $number = floatval($this->content);
         $number *= 39.37; // convert to inches
         

utility/Search.class.inc.php

Braces +22 added lines, -20 removed lines

@@ -1,49 +1,50 @@ 
 <?
 
-final class Search
-{
+final class Search

+{

 
 	private $query;
 	private $result;
 	private $weight;
 
-	function __construct()
-	{
+	function __construct()

+	{

 		return $this;
 	}
 
-	public function setQuery($query)
-	{
+	public function setQuery($query)

+	{

 		$this->query = $query;
 		return $this;
 	}
 
-	public function setResult($array)
-	{
+	public function setResult($array)

+	{

 		$this->result = $array;
 		return $this;
 	}
 
-	public function setWeight($weight)
-	{
+	public function setWeight($weight)

+	{

 		$this->weight = $weight;
 		return $this;
 	}
 
-	public static function instance()
-	{
+	public static function instance()

+	{

 		$reflection = new ReflectionClass('Search');
 		return $reflection->newInstance();
 	}
 
-	public function perform()
-	{
+	public function perform()

+	{

 		$weighted_array = array();
 		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,15 +53,16 @@ 
 		{
 			foreach($this->result as $row)
 			{
-				if($row['id'] == $id)
-					$final_array[] = $row;
+				if($row['id'] == $id) {

+									$final_array[] = $row;

+				}

 			}
 		}
 		return $final_array;
 	}
 
-	private function get_search_weight($row)
-	{
+	private function get_search_weight($row)

+	{

 		$weight = 0;
 		foreach($this->weight as $weight_array)
 		{

utility/Header.class.inc.php

Braces +27 added lines, -24 removed lines

@@ -1,10 +1,10 @@ 
 <?
 
-final class Header
-{
+final class Header

+{

 
-	public static function sendJSON()
-	{
+	public static function sendJSON()

+	{

 		$array = array(
 			'HTTP/1.1 200 OK',
 			'Cache-Control: no-cache',
@@ -16,8 +16,8 @@ 
 		self::send($array);
 	}
 
-	public static function sendHTML()
-	{
+	public static function sendHTML()

+	{

 		$array = array(
 			'HTTP/1.1 200 OK',
 			'Cache-Control: no-cache',
@@ -29,14 +29,14 @@ 
 		self::send($array);
 	}
 
-	public static function redirect($location, $method = 301)
-	{
+	public static function redirect($location, $method = 301)

+	{

 		header("Location: {$location}", TRUE, $method);
 		exit();
 	}
 
-	public static function send404()
-	{
+	public static function send404()

+	{

 		$array = array(
 			'HTTP/1.1 404 Not Found',
 			'Cache-Control: no-cache',
@@ -48,8 +48,8 @@ 
 		self::send($array);
 	}
 
-	public static function send503()
-	{
+	public static function send503()

+	{

 		$array = array(
 			'HTTP/1.1 503 Service Unavailable',
 			'Cache-Control: no-cache',
@@ -61,10 +61,11 @@ 
 		self::send($array);
 	}
 
-	private static function send($array, $gzip = true)
-	{
-		if($gzip)
-			self::start_gzipping();
+	private static function send($array, $gzip = true)

+	{

+		if($gzip) {

+					self::start_gzipping();

+		}

 		
 		foreach($array as $row)
 		{
@@ -72,17 +73,19 @@ 
 		}
 	}
 
-	private static function get_date($timestamp = false)
-	{
-		if($timestamp == 0)
-			$timestamp = time();
+	private static function get_date($timestamp = false)

+	{

+		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();
+	private static function start_gzipping()

+	{

+		if(!ob_start('ob_gzhandler')) {

+		            ob_start();

+		}

 	}
 
 }

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