jacobemerick / web

utility/Loader.class.inc.php

Indentation +160 added lines, -160 removed lines

@@ -3,175 +3,175 @@
 final class Loader
 {
 
-	private $root;
-	private $is_live;
-	private $included_files = array();
-
-	private static $instance;
-
-	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();
-		return self::$instance;
-	}
-
-	private function get_root()
-	{
-		if(!isset($this->root))
-		{
-			$current_directory = dirname(__FILE__);
-			$current_directory = substr($current_directory, 0, -7);
-			$this->root = $current_directory;
-		}
+    private $root;
+    private $is_live;
+    private $included_files = array();
+
+    private static $instance;
+
+    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();
+        return self::$instance;
+    }
+
+    private function get_root()
+    {
+        if(!isset($this->root))
+        {
+            $current_directory = dirname(__FILE__);
+            $current_directory = substr($current_directory, 0, -7);
+            $this->root = $current_directory;
+        }
 		
-		return $this->root;
-	}
-
-	private function get_delimiter()
-	{
-		return (true || $this->is_live) ? '/' : '\\';
-	}
-
-	private function check_delimiters($path)
-	{
-		return (true || $this->is_live) ? $path : str_replace('/', '\\', $path);
-	}
-
-	private static function get_class_name($path)
-	{
-		$path_array = explode('/', $path);
-		return array_pop($path_array);
-	}
-
-	private static function get_extension($type)
-	{
-		switch($type)
-		{
-			case 'collector' :
-			case 'controller' :
-			case 'model' :
-			case 'module' :
-			case 'router' :
-			case 'utility' :
-				$extension = '.class.inc.php';
-			break;
-			case 'view' :
-				$extension = '.tpl.php';
-			break;
-		}
-		return $extension;
-	}
-
-	public static function getImagePath($type, $file)
-	{
-		$path = self::instance()->get_root();
-		$path .= 'public';
-		$path .= self::instance()->get_delimiter();
-		$path .= $type;
-		$path .= self::instance()->get_delimiter();
-		$path .= self::instance()->check_delimiters($file);
+        return $this->root;
+    }
+
+    private function get_delimiter()
+    {
+        return (true || $this->is_live) ? '/' : '\\';
+    }
+
+    private function check_delimiters($path)
+    {
+        return (true || $this->is_live) ? $path : str_replace('/', '\\', $path);
+    }
+
+    private static function get_class_name($path)
+    {
+        $path_array = explode('/', $path);
+        return array_pop($path_array);
+    }
+
+    private static function get_extension($type)
+    {
+        switch($type)
+        {
+            case 'collector' :
+            case 'controller' :
+            case 'model' :
+            case 'module' :
+            case 'router' :
+            case 'utility' :
+                $extension = '.class.inc.php';
+            break;
+            case 'view' :
+                $extension = '.tpl.php';
+            break;
+        }
+        return $extension;
+    }
+
+    public static function getImagePath($type, $file)
+    {
+        $path = self::instance()->get_root();
+        $path .= 'public';
+        $path .= self::instance()->get_delimiter();
+        $path .= $type;
+        $path .= self::instance()->get_delimiter();
+        $path .= self::instance()->check_delimiters($file);
 		
-		return $path;
-	}
-
-	private static function get_path($type, $file)
-	{
-		$path = self::instance()->get_root();
-		$path .= $type;
-		$path .= self::instance()->get_delimiter();
-		$path .= self::instance()->check_delimiters($file);
-		$path .= self::get_extension($type);
+        return $path;
+    }
+
+    private static function get_path($type, $file)
+    {
+        $path = self::instance()->get_root();
+        $path .= $type;
+        $path .= self::instance()->get_delimiter();
+        $path .= self::instance()->check_delimiters($file);
+        $path .= self::get_extension($type);
 		
-		return $path;
-	}
-
-	private function get_included_files()
-	{
-		return $this->included_files;
-	}
-
-	private function add_included_file($path)
-	{
-		$this->included_files[] = $path;
-	}
-
-	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;
+        return $path;
+    }
+
+    private function get_included_files()
+    {
+        return $this->included_files;
+    }
+
+    private function add_included_file($path)
+    {
+        $this->included_files[] = $path;
+    }
+
+    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;
 			
-			self::instance()->add_included_file($file_path);
+            self::instance()->add_included_file($file_path);
 			
-			switch($type)
-			{
-				case 'images' :
-				case 'scripts' :
-				case 'styles' :
-					echo file_get_contents($file_path);
-				break;
-				case 'view' :
-					extract($data);
-					include($file_path);
-				break;
-				default :
-					include_once($file_path);
-				break;
-			}
-		}
-	}
-
-	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)
-	{
-		self::load($type, $file);
+            switch($type)
+            {
+                case 'images' :
+                case 'scripts' :
+                case 'styles' :
+                    echo file_get_contents($file_path);
+                break;
+                case 'view' :
+                    extract($data);
+                    include($file_path);
+                break;
+                default :
+                    include_once($file_path);
+                break;
+            }
+        }
+    }
+
+    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)
+    {
+        self::load($type, $file);
 		
-		$reflectionObject = self::create_reflection_class($file);
+        $reflectionObject = self::create_reflection_class($file);
 		
-		if(
-			$reflectionObject->hasMethod('instance') &&
-			$reflectionObject->getMethod('instance')->isStatic())
-		{
-			return $reflectionObject->getMethod('instance')->invoke(null);
-		}
-		trigger_error("Requested class cannot be instance'd: {$type}, {$file}");
-	}
-
-	public static function loadNew($type, $file, $data = array())
-	{
-		self::load($type, $file);
+        if(
+            $reflectionObject->hasMethod('instance') &&
+            $reflectionObject->getMethod('instance')->isStatic())
+        {
+            return $reflectionObject->getMethod('instance')->invoke(null);
+        }
+        trigger_error("Requested class cannot be instance'd: {$type}, {$file}");
+    }
+
+    public static function loadNew($type, $file, $data = array())
+    {
+        self::load($type, $file);
 		
-		$reflectionObject = self::create_reflection_class($file);
+        $reflectionObject = self::create_reflection_class($file);
 		
-		if($reflectionObject->hasMethod('__construct'))
-			return $reflectionObject->newInstanceArgs($data);
-		else
-			return $reflectionObject->newInstance();
-	}
-
-	public static function getRoot()
-	{
-		return self::instance()->get_root();
-	}
-
-	public static function isLive()
-	{
-		return self::instance()->is_live;
-	}
+        if($reflectionObject->hasMethod('__construct'))
+            return $reflectionObject->newInstanceArgs($data);
+        else
+            return $reflectionObject->newInstance();
+    }
+
+    public static function getRoot()
+    {
+        return self::instance()->get_root();
+    }
+
+    public static function isLive()
+    {
+        return self::instance()->is_live;
+    }
 
     public static function getRootURL($site = '')
     {

utility/Search.class.inc.php

Indentation +58 added lines, -58 removed lines

@@ -3,71 +3,71 @@
 final class Search
 {
 
-	private $query;
-	private $result;
-	private $weight;
+    private $query;
+    private $result;
+    private $weight;
 
-	function __construct()
-	{
-		return $this;
-	}
+    function __construct()
+    {
+        return $this;
+    }
 
-	public function setQuery($query)
-	{
-		$this->query = $query;
-		return $this;
-	}
+    public function setQuery($query)
+    {
+        $this->query = $query;
+        return $this;
+    }
 
-	public function setResult($array)
-	{
-		$this->result = $array;
-		return $this;
-	}
+    public function setResult($array)
+    {
+        $this->result = $array;
+        return $this;
+    }
 
-	public function setWeight($weight)
-	{
-		$this->weight = $weight;
-		return $this;
-	}
+    public function setWeight($weight)
+    {
+        $this->weight = $weight;
+        return $this;
+    }
 
-	public static function instance()
-	{
-		$reflection = new ReflectionClass('Search');
-		return $reflection->newInstance();
-	}
+    public static function instance()
+    {
+        $reflection = new ReflectionClass('Search');
+        return $reflection->newInstance();
+    }
 
-	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;
-		}
-		arsort($weighted_array);
+    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;
+        }
+        arsort($weighted_array);
 		
-		$final_array = array();
-		foreach($weighted_array as $id => $weight)
-		{
-			foreach($this->result as $row)
-			{
-				if($row['id'] == $id)
-					$final_array[] = $row;
-			}
-		}
-		return $final_array;
-	}
+        $final_array = array();
+        foreach($weighted_array as $id => $weight)
+        {
+            foreach($this->result as $row)
+            {
+                if($row['id'] == $id)
+                    $final_array[] = $row;
+            }
+        }
+        return $final_array;
+    }
 
-	private function get_search_weight($row)
-	{
-		$weight = 0;
-		foreach($this->weight as $weight_array)
-		{
-			$text = $row[$weight_array['field']];
-			$weight += $weight_array['weight'] * substr_count(strtolower($text), strtolower($this->query));
-		}
-		return $weight;
-	}
+    private function get_search_weight($row)
+    {
+        $weight = 0;
+        foreach($this->weight as $weight_array)
+        {
+            $text = $row[$weight_array['field']];
+            $weight += $weight_array['weight'] * substr_count(strtolower($text), strtolower($this->query));
+        }
+        return $weight;
+    }
 
 }

utility/content/URLSafeContent.class.inc.php

Indentation +4 added lines, -4 removed lines

@@ -5,9 +5,9 @@
 class URLSafeContent extends Content
 {
 
-	protected function execute()
-	{
-		$this->content = strtolower(str_replace(' ', '-', $this->content));
-	}
+    protected function execute()
+    {
+        $this->content = strtolower(str_replace(' ', '-', $this->content));
+    }
 
 }
\ No newline at end of file

utility/content/MarkupCodeContent.class.inc.php

Indentation +40 added lines, -40 removed lines

@@ -5,53 +5,53 @@
 final class MarkupCodeContent extends Content
 {
 
-	private static $MARKUP_DELIMITER = '@<pre( rel="(.*?)")?>(.*?)</pre>@s';
+    private static $MARKUP_DELIMITER = '@<pre( rel="(.*?)")?>(.*?)</pre>@s';
 
-	protected function execute($title = '')
-	{
-		preg_match_all(self::$MARKUP_DELIMITER, $this->content, $matches);
-		if(count($matches[1]) == 0)
-			return;
+    protected function execute($title = '')
+    {
+        preg_match_all(self::$MARKUP_DELIMITER, $this->content, $matches);
+        if(count($matches[1]) == 0)
+            return;
 		
-		foreach($matches[3] as $key => $match)
-		{
-			$replacement = $match;
-			$replacement = $this->wrap_in_list($replacement);
-			$replacement = $this->highlight_code($replacement, $matches[2][$key]);
+        foreach($matches[3] as $key => $match)
+        {
+            $replacement = $match;
+            $replacement = $this->wrap_in_list($replacement);
+            $replacement = $this->highlight_code($replacement, $matches[2][$key]);
 			
-			$this->content = str_replace($match, $replacement, $this->content);
-		}
+            $this->content = str_replace($match, $replacement, $this->content);
+        }
 		
-		return;
-	}
+        return;
+    }
 
-	private function wrap_in_list($content)
-	{
-		$content_array = explode("\n", $content);
+    private function wrap_in_list($content)
+    {
+        $content_array = explode("\n", $content);
 		
-		foreach($content_array as $key => $row)
-		{
-			$new_row = ($key % 2 == 0) ? '<li class="even">' : '<li class="odd">';
-			$new_row .= '<p>';
-			$new_row .= $row;
-			$new_row .= '</p>';
-			$new_row .= '</li>';
-			$content_array[$key] = $new_row;
-		}
+        foreach($content_array as $key => $row)
+        {
+            $new_row = ($key % 2 == 0) ? '<li class="even">' : '<li class="odd">';
+            $new_row .= '<p>';
+            $new_row .= $row;
+            $new_row .= '</p>';
+            $new_row .= '</li>';
+            $content_array[$key] = $new_row;
+        }
 		
-		$content = implode($content_array);
-		$content = "<ol>{$content}</ol>";
-		return $content;
-	}
+        $content = implode($content_array);
+        $content = "<ol>{$content}</ol>";
+        return $content;
+    }
 
-	private function highlight_code($content, $type)
-	{
-		switch($type)
-		{
-			default :
-				return $content;
-			break;
-		}
-	}
+    private function highlight_code($content, $type)
+    {
+        switch($type)
+        {
+            default :
+                return $content;
+            break;
+        }
+    }
 
 }
\ No newline at end of file

utility/content/SmartTrimContent.class.inc.php

Indentation +114 added lines, -114 removed lines

@@ -5,143 +5,143 @@
 class SmartTrimContent extends Content
 {
 
-	private static $EXCLUDE_TAGS = array(
-		'a',
-		'div',
-		'h4',
-		'pre');
-	private static $INCLUDE_TAGS = array(
-		'li',
-		'ol',
-		'p',
-		'ul');
-	private static $PHOTO_PLACEHOLDER_MATCH = '/{{photo="(.*)"}}/';
-	private static $HTML_TAG_PATTERN = '/<[^>]+>/';
-	private static $CUT_MARKER = '/*/ CUT HERE /*/';
-	private static $RIGHT_BRACKET = '>';
-	private static $LEFT_BRACKET = '<';
-	private static $ETC = '&hellip;';
+    private static $EXCLUDE_TAGS = array(
+        'a',
+        'div',
+        'h4',
+        'pre');
+    private static $INCLUDE_TAGS = array(
+        'li',
+        'ol',
+        'p',
+        'ul');
+    private static $PHOTO_PLACEHOLDER_MATCH = '/{{photo="(.*)"}}/';
+    private static $HTML_TAG_PATTERN = '/<[^>]+>/';
+    private static $CUT_MARKER = '/*/ CUT HERE /*/';
+    private static $RIGHT_BRACKET = '>';
+    private static $LEFT_BRACKET = '<';
+    private static $ETC = '&hellip;';
 
-	private $is_trimmed;
+    private $is_trimmed;
 
-	protected function execute()
-	{
-		$args = func_get_args();
-		if(count($args) < 1)
-		{
-			trigger_error('Someone called SmartTrimContent w/o defining a length... bad!');
-			return;
-		}
+    protected function execute()
+    {
+        $args = func_get_args();
+        if(count($args) < 1)
+        {
+            trigger_error('Someone called SmartTrimContent w/o defining a length... bad!');
+            return;
+        }
 		
-		if(count($args) == 2)
-			$etc = $args[1];
-		else
-			$etc = self::$ETC;
+        if(count($args) == 2)
+            $etc = $args[1];
+        else
+            $etc = self::$ETC;
 		
-		$length = $args[0];
+        $length = $args[0];
 		
-		if($length < strlen($this->content))
-			$this->trim_string($length);
+        if($length < strlen($this->content))
+            $this->trim_string($length);
         else
             $etc = '';
-		$this->check_exclude_tags();
-		$this->close_tags($etc);
-	}
+        $this->check_exclude_tags();
+        $this->close_tags($etc);
+    }
 
-	private function trim_string($length)
-	{
-		$content = $this->trim_html_string($this->content, $length);
+    private function trim_string($length)
+    {
+        $content = $this->trim_html_string($this->content, $length);
 		
-		$last_right_bracket_position = strripos($content, self::$RIGHT_BRACKET);
-		$last_left_bracket_position = strripos($content, self::$LEFT_BRACKET);
-		if($last_left_bracket_position > $last_right_bracket_position)
-			$content = substr($content, 0, $last_left_bracket_position);
-		$content = trim($content);
+        $last_right_bracket_position = strripos($content, self::$RIGHT_BRACKET);
+        $last_left_bracket_position = strripos($content, self::$LEFT_BRACKET);
+        if($last_left_bracket_position > $last_right_bracket_position)
+            $content = substr($content, 0, $last_left_bracket_position);
+        $content = trim($content);
 		
-		$this->content = $content;
-		$this->is_trimmed = true;
-	}
+        $this->content = $content;
+        $this->is_trimmed = true;
+    }
 
-	private function trim_html_string($content, $length)
-	{
-		$content = preg_replace(self::$PHOTO_PLACEHOLDER_MATCH, '', $content);
-		preg_match_all(self::$HTML_TAG_PATTERN, $content, $matches, PREG_OFFSET_CAPTURE);
-		$content = strip_tags($content);
+    private function trim_html_string($content, $length)
+    {
+        $content = preg_replace(self::$PHOTO_PLACEHOLDER_MATCH, '', $content);
+        preg_match_all(self::$HTML_TAG_PATTERN, $content, $matches, PREG_OFFSET_CAPTURE);
+        $content = strip_tags($content);
 		
-		$content = wordwrap($content, $length, self::$CUT_MARKER);
-		$content = explode(self::$CUT_MARKER, $content);
-		$content = current($content);
+        $content = wordwrap($content, $length, self::$CUT_MARKER);
+        $content = explode(self::$CUT_MARKER, $content);
+        $content = current($content);
 		
-		$max_length = $length;
-		foreach($matches[0] as $match)
-		{
-			$max_length += strlen($match[0]);
-			if($max_length <= $match[1])
-				break;
+        $max_length = $length;
+        foreach($matches[0] as $match)
+        {
+            $max_length += strlen($match[0]);
+            if($max_length <= $match[1])
+                break;
 			
-			$content = substr($content, 0, $match[1]) . $match[0] . substr($content, $match[1]);
-		}
+            $content = substr($content, 0, $match[1]) . $match[0] . substr($content, $match[1]);
+        }
 		
-		if(substr($content, -7) == '</p><p>')
-			$content = substr($content, 0, -7);
+        if(substr($content, -7) == '</p><p>')
+            $content = substr($content, 0, -7);
 		
-		return $content;
-	}
+        return $content;
+    }
 
-	private function check_exclude_tags()
-	{
-		$content = $this->content;
-		$tags_preg = $this->get_tags_preg(self::$EXCLUDE_TAGS);
-		preg_match_all($tags_preg, $content, $matches, PREG_OFFSET_CAPTURE);
+    private function check_exclude_tags()
+    {
+        $content = $this->content;
+        $tags_preg = $this->get_tags_preg(self::$EXCLUDE_TAGS);
+        preg_match_all($tags_preg, $content, $matches, PREG_OFFSET_CAPTURE);
 		
-		if(count($matches[1]) % 2 == 1)
-		{
-			$cut_tag = end($matches[1]);
-			$cut_tag_position = $cut_tag[1] - 1;
-			$content = substr($content, 0, $cut_tag_position);
-		}
-		$content = trim($content);
+        if(count($matches[1]) % 2 == 1)
+        {
+            $cut_tag = end($matches[1]);
+            $cut_tag_position = $cut_tag[1] - 1;
+            $content = substr($content, 0, $cut_tag_position);
+        }
+        $content = trim($content);
 		
-		$this->content = $content;
-	}
+        $this->content = $content;
+    }
 
-	private function close_tags($etc)
-	{
-		$content = $this->content;
-		$tags_preg = $this->get_tags_preg(self::$INCLUDE_TAGS);
-		preg_match_all($tags_preg, $content, $matches);
-		$open_tags = array();
+    private function close_tags($etc)
+    {
+        $content = $this->content;
+        $tags_preg = $this->get_tags_preg(self::$INCLUDE_TAGS);
+        preg_match_all($tags_preg, $content, $matches);
+        $open_tags = array();
 		
-		foreach($matches[1] as $tag)
-		{
-			if(in_array($tag, $open_tags))
-			{
-				$key = array_search($tag, $open_tags);
-				unset($open_tags[$key]);
-			}
-			else
-				$open_tags[] = $tag;
-		}
+        foreach($matches[1] as $tag)
+        {
+            if(in_array($tag, $open_tags))
+            {
+                $key = array_search($tag, $open_tags);
+                unset($open_tags[$key]);
+            }
+            else
+                $open_tags[] = $tag;
+        }
 		
-		$open_tags = array_reverse($open_tags);
-		if(count($open_tags) > 0)
-		{
-			foreach($open_tags as $key => $open_tag)
-			{
-				if($key == count($open_tags) - 1)
-					$content .= $etc;
-				$content .= "</{$open_tag}>";
-			}
-		}
-		else
-			$content .= $etc;
+        $open_tags = array_reverse($open_tags);
+        if(count($open_tags) > 0)
+        {
+            foreach($open_tags as $key => $open_tag)
+            {
+                if($key == count($open_tags) - 1)
+                    $content .= $etc;
+                $content .= "</{$open_tag}>";
+            }
+        }
+        else
+            $content .= $etc;
 		
-		$this->content = $content;
-	}
+        $this->content = $content;
+    }
 
-	private function get_tags_preg($tag_array)
-	{
-		return '@</?(' . implode('|', $tag_array) . ')@';
-	}
+    private function get_tags_preg($tag_array)
+    {
+        return '@</?(' . implode('|', $tag_array) . ')@';
+    }
 
 }

utility/content/CleanCommentContent.class.inc.php

Indentation +83 added lines, -83 removed lines

@@ -5,104 +5,104 @@
 final class CleanCommentContent extends Content
 {
 
-	private static $LINK_PATTERN = '@<a.*href=["\']([^"\']*)["\'].*>(.*)</a>@i';
-	private static $BOLD_PATTERN = '@<b.*>(.*)</b>@i';
-	private static $ITALIC_PATTERN = '@<i.*>(.*)</i>@i';
-	private static $CODE_PATTERN = '@<pre[^>]*>(.*)</pre>@is';
+    private static $LINK_PATTERN = '@<a.*href=["\']([^"\']*)["\'].*>(.*)</a>@i';
+    private static $BOLD_PATTERN = '@<b.*>(.*)</b>@i';
+    private static $ITALIC_PATTERN = '@<i.*>(.*)</i>@i';
+    private static $CODE_PATTERN = '@<pre[^>]*>(.*)</pre>@is';
 
-	private static $LINK_REPLACE = '<a href="%s" rel="nofollow" target="_blank">%s</a>';
-	private static $BOLD_REPLACE = '<b>%s</b>';
-	private static $ITALIC_REPLACE = '<i>%s</i>';
-	private static $CODE_REPLACE = '<pre>%s</pre>';
+    private static $LINK_REPLACE = '<a href="%s" rel="nofollow" target="_blank">%s</a>';
+    private static $BOLD_REPLACE = '<b>%s</b>';
+    private static $ITALIC_REPLACE = '<i>%s</i>';
+    private static $CODE_REPLACE = '<pre>%s</pre>';
 
-	private static $URL_PATTERN = '@(https?://[a-z0-9\.-]+\.[a-z]{2,6}[^\s]*[^\.,\?\!;\s]+)@i';
-	private static $LINE_BREAK_PATTERN = '@([\r\n]+)@';
+    private static $URL_PATTERN = '@(https?://[a-z0-9\.-]+\.[a-z]{2,6}[^\s]*[^\.,\?\!;\s]+)@i';
+    private static $LINE_BREAK_PATTERN = '@([\r\n]+)@';
 
-	private static $LINE_BREAK_REPLACE = '<br />';
+    private static $LINE_BREAK_REPLACE = '<br />';
 
-	private $replacement_array = array();
+    private $replacement_array = array();
 
-	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);
-		$this->process_element(self::$BOLD_PATTERN, self::$BOLD_REPLACE);
+    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);
+        $this->process_element(self::$BOLD_PATTERN, self::$BOLD_REPLACE);
 		
-		$this->strip_extra_tags();
+        $this->strip_extra_tags();
 		
-		$this->link_unlinked_urls(self::$URL_PATTERN, self::$LINK_REPLACE);
-		$this->add_line_breaks();
-		$this->replace_element_patterns();
-	}
-
-	private function process_element($pattern, $replace)
-	{
-		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
+        $this->link_unlinked_urls(self::$URL_PATTERN, self::$LINK_REPLACE);
+        $this->add_line_breaks();
+        $this->replace_element_patterns();
+    }
+
+    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)
-		{
-			$full_match = array_shift($match);
-			$placeholder = $this->create_placeholder($full_match);
-			$full_match_pattern = $this->create_full_match_pattern($full_match);
+        foreach($matches as $match)
+        {
+            $full_match = array_shift($match);
+            $placeholder = $this->create_placeholder($full_match);
+            $full_match_pattern = $this->create_full_match_pattern($full_match);
 			
-			$this->content = preg_replace($full_match_pattern, $placeholder, $this->content, 1);
-			$this->replacement_array[$placeholder] = vsprintf($replace, $match);
-		}
-	}
-
-	private function create_placeholder($text)
-	{
-		return md5($text . rand());
-	}
-
-	private function create_full_match_pattern($text)
-	{
-		$pattern = '';
-		$pattern .= '@';
-		$pattern .= preg_quote($text, '@');
-		$pattern .= '@';
-		$pattern .= 'i';
+            $this->content = preg_replace($full_match_pattern, $placeholder, $this->content, 1);
+            $this->replacement_array[$placeholder] = vsprintf($replace, $match);
+        }
+    }
+
+    private function create_placeholder($text)
+    {
+        return md5($text . rand());
+    }
+
+    private function create_full_match_pattern($text)
+    {
+        $pattern = '';
+        $pattern .= '@';
+        $pattern .= preg_quote($text, '@');
+        $pattern .= '@';
+        $pattern .= 'i';
 		
-		return $pattern;
-	}
+        return $pattern;
+    }
 
-	private function strip_extra_tags()
-	{
-		$this->content = strip_tags($this->content);
-	}
+    private function strip_extra_tags()
+    {
+        $this->content = strip_tags($this->content);
+    }
 
-	private function link_unlinked_urls($pattern, $replace)
-	{
-		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
+    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)
-		{
-			$full_match = array_shift($match);
-			$full_match_pattern = $this->create_full_match_pattern($full_match);
-			$replace = sprintf($replace, $match[0], $match[0]);
+        foreach($matches as $match)
+        {
+            $full_match = array_shift($match);
+            $full_match_pattern = $this->create_full_match_pattern($full_match);
+            $replace = sprintf($replace, $match[0], $match[0]);
 			
-			$this->content = preg_replace($full_match_pattern, $replace, $this->content, 1);
-		}
-	}
-
-	private function add_line_breaks()
-	{
-		$this->content = preg_replace(self::$LINE_BREAK_PATTERN, self::$LINE_BREAK_REPLACE, $this->content);
-	}
-
-	private function replace_element_patterns()
-	{
-		foreach($this->replacement_array as $key => $replace)
-		{
-			$this->content = str_replace($key, $replace, $this->content);
-		}
-	}
+            $this->content = preg_replace($full_match_pattern, $replace, $this->content, 1);
+        }
+    }
+
+    private function add_line_breaks()
+    {
+        $this->content = preg_replace(self::$LINE_BREAK_PATTERN, self::$LINE_BREAK_REPLACE, $this->content);
+    }
+
+    private function replace_element_patterns()
+    {
+        foreach($this->replacement_array as $key => $replace)
+        {
+            $this->content = str_replace($key, $replace, $this->content);
+        }
+    }
 
 }
\ No newline at end of file

utility/content/FetchFirstPhotoContent.class.inc.php

Indentation +37 added lines, -37 removed lines

@@ -5,47 +5,47 @@
 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;
-		return;
-	}
-
-	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)
-	{
-		list($category, $file_name) = explode('/', $string);
-		list($photo, $extension) = explode('.', $file_name);
+    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;
+        return;
+    }
+
+    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)
+    {
+        list($category, $file_name) = explode('/', $string);
+        list($photo, $extension) = explode('.', $file_name);
 		
-		$file_path = $this->get_file_path($category, $photo, $size, $extension);
-		$file_size = getimagesize($file_path);
+        $file_path = $this->get_file_path($category, $photo, $size, $extension);
+        $file_size = getimagesize($file_path);
 		
-		Loader::load('collector', 'image/PhotoCollector');
-		$photo_result = PhotoCollector::fetchRow($category, $photo);
-		if($photo_result == false)
-			return '';
+        Loader::load('collector', 'image/PhotoCollector');
+        $photo_result = PhotoCollector::fetchRow($category, $photo);
+        if($photo_result == false)
+            return '';
 		
-		$height = $file_size[1];
-		$width = $file_size[0];
-		$description = $photo_result->description;
+        $height = $file_size[1];
+        $width = $file_size[0];
+        $description = $photo_result->description;
 		
-		$domain = '/';
-		if($is_absolute)
-			$domain = Loader::getRootURL(URLDecode::getSite());
+        $domain = '/';
+        if($is_absolute)
+            $domain = Loader::getRootURL(URLDecode::getSite());
 
-		return sprintf(self::$IMAGE_NODE, $domain, $category, $photo, $size, $extension, $height, $width, $description);
-	}
+        return sprintf(self::$IMAGE_NODE, $domain, $category, $photo, $size, $extension, $height, $width, $description);
+    }
 
 }

utility/content/FixPhotoContent.class.inc.php

Indentation +36 added lines, -36 removed lines

@@ -5,50 +5,50 @@
 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>';
+    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')
-	{
-		preg_match_all(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $matches);
-		foreach($matches[1] as $key => $match)
-		{
-			$photo_content = $this->get_photo_content($match, $size, $is_absolute);
-			$this->content = str_replace($matches[0][$key], $photo_content, $this->content);
-		}
-		return;
-	}
+    protected function execute($is_absolute = false, $size = 'medium')
+    {
+        preg_match_all(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $matches);
+        foreach($matches[1] as $key => $match)
+        {
+            $photo_content = $this->get_photo_content($match, $size, $is_absolute);
+            $this->content = str_replace($matches[0][$key], $photo_content, $this->content);
+        }
+        return;
+    }
 
-	private function get_file_path($category, $photo, $size, $extension)
-	{
-		$path = "{$category}/{$photo}-size-{$size}.{$extension}";
-		return Loader::getImagePath('photo', $path);
-	}
+    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)
-	{
-		list($category, $file_name) = explode('/', $string);
-		list($photo, $extension) = explode('.', $file_name);
+    private function get_photo_content($string, $size, $is_absolute)
+    {
+        list($category, $file_name) = explode('/', $string);
+        list($photo, $extension) = explode('.', $file_name);
 		
-		$file_path = $this->get_file_path($category, $photo, $size, $extension);
+        $file_path = $this->get_file_path($category, $photo, $size, $extension);
 		
-		$file_size = getimagesize($file_path);
+        $file_size = getimagesize($file_path);
 		
-		Loader::load('collector', 'image/PhotoCollector');
-		$photo_result = PhotoCollector::fetchRow($category, $photo);
-		if($photo_result == false)
-			return '';
+        Loader::load('collector', 'image/PhotoCollector');
+        $photo_result = PhotoCollector::fetchRow($category, $photo);
+        if($photo_result == false)
+            return '';
 		
-		$height = $file_size[1];
-		$width = $file_size[0];
-		$description = $photo_result->description;
+        $height = $file_size[1];
+        $width = $file_size[0];
+        $description = $photo_result->description;
         
-		$domain = '/';
-		if($is_absolute)
-			$domain = Loader::getRootUrl('blog');
+        $domain = '/';
+        if($is_absolute)
+            $domain = Loader::getRootUrl('blog');
 		
-		return sprintf(self::$PHOTO_CONTENT, $domain, $category, $photo, $size, $height, $width, $description, $description);
-	}
+        return sprintf(self::$PHOTO_CONTENT, $domain, $category, $photo, $size, $height, $width, $description, $description);
+    }
 
 }

utility/content/ElapsedTimeContent.class.inc.php

Indentation +63 added lines, -63 removed lines

@@ -5,69 +5,69 @@
 final class ElapsedTimeContent extends Content
 {
 
-	protected function execute()
-	{
-		$previous_time = strtotime($this->content);
-		$current_time = time();
+    protected function execute()
+    {
+        $previous_time = strtotime($this->content);
+        $current_time = time();
 		
-		if($current_time <= $previous_time)
-			$this->content = 'few seconds ago';
-		else if(($current_time - $previous_time) < 30)
-			$this->content = 'few seconds ago';
-		else if(($current_time - $previous_time) < 1.5 * 60)
-			$this->content = 'a minute ago';
-		else if(($current_time - $previous_time) < 4 * 60)
-			$this->content = 'few minutes ago';
-		else if(($current_time - $previous_time) < 7 * 60)
-			$this->content = 'five minutes ago';
-		else if(($current_time - $previous_time) < 12 * 60)
-			$this->content = 'ten minutes ago';
-		else if(($current_time - $previous_time) < 17 * 60)
-			$this->content = 'fifteen minutes ago';
-		else if(($current_time - $previous_time) < 22 * 60)
-			$this->content = 'twenty minutes ago';
-		else if(($current_time - $previous_time) < 37 * 60)
-			$this->content = 'half hour ago';
-		else if(($current_time - $previous_time) < 52 * 60)
-			$this->content = 'forty-five minutes ago';
-		else if(($current_time - $previous_time) < 1.5 * 60 * 60)
-			$this->content = 'an hour ago';
-		else if(($current_time - $previous_time) < 2.5 * 60 * 60)
-			$this->content = 'two hours ago';
-		else if(($current_time - $previous_time) < 3.5 * 60 * 60)
-			$this->content = 'three hours ago';
-		else if(($current_time - $previous_time) < 4.5 * 60 * 60)
-			$this->content = 'few hours ago';
-		else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'pm')
-			$this->content = 'this afternoon';
-		else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'am')
-			$this->content = 'this morning';
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm' && date('G', $previous_time) >= 17)
-			$this->content = 'yesterday evening';
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm')
-			$this->content = 'yesterday afternoon';
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'am')
-			$this->content = 'yesterday morning';
-		else if(($current_time - $previous_time) < 3 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 2)
-			$this->content = 'two days ago';
-		else if(($current_time - $previous_time) < 4 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 3)
-			$this->content = 'three days ago';
-		else if(($current_time - $previous_time) < 1 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time))
-			$this->content = 'earlier this week';
-		else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1 && date('w', $previous_time) >= 3)
-			$this->content = 'late last week';
-		else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1)
-			$this->content = 'early last week';
-		else if(($current_time - $previous_time) < 3 * 7 * 24 * 60 * 60)
-			$this->content = 'few weeks ago';
-		else if(($current_time - $previous_time) < 1.25* 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time))
-			$this->content = 'earlier this month';
-		else if(($current_time - $previous_time) < 2 * 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time) + 1)
-			$this->content = 'last month';
-		else if(($current_time - $previous_time) < 4 * 4 * 7 * 24 * 60 * 60)
-			$this->content = 'several months ago';
-		else
-			$this->content = 'long ago';
-	}
+        if($current_time <= $previous_time)
+            $this->content = 'few seconds ago';
+        else if(($current_time - $previous_time) < 30)
+            $this->content = 'few seconds ago';
+        else if(($current_time - $previous_time) < 1.5 * 60)
+            $this->content = 'a minute ago';
+        else if(($current_time - $previous_time) < 4 * 60)
+            $this->content = 'few minutes ago';
+        else if(($current_time - $previous_time) < 7 * 60)
+            $this->content = 'five minutes ago';
+        else if(($current_time - $previous_time) < 12 * 60)
+            $this->content = 'ten minutes ago';
+        else if(($current_time - $previous_time) < 17 * 60)
+            $this->content = 'fifteen minutes ago';
+        else if(($current_time - $previous_time) < 22 * 60)
+            $this->content = 'twenty minutes ago';
+        else if(($current_time - $previous_time) < 37 * 60)
+            $this->content = 'half hour ago';
+        else if(($current_time - $previous_time) < 52 * 60)
+            $this->content = 'forty-five minutes ago';
+        else if(($current_time - $previous_time) < 1.5 * 60 * 60)
+            $this->content = 'an hour ago';
+        else if(($current_time - $previous_time) < 2.5 * 60 * 60)
+            $this->content = 'two hours ago';
+        else if(($current_time - $previous_time) < 3.5 * 60 * 60)
+            $this->content = 'three hours ago';
+        else if(($current_time - $previous_time) < 4.5 * 60 * 60)
+            $this->content = 'few hours ago';
+        else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'pm')
+            $this->content = 'this afternoon';
+        else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'am')
+            $this->content = 'this morning';
+        else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm' && date('G', $previous_time) >= 17)
+            $this->content = 'yesterday evening';
+        else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm')
+            $this->content = 'yesterday afternoon';
+        else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'am')
+            $this->content = 'yesterday morning';
+        else if(($current_time - $previous_time) < 3 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 2)
+            $this->content = 'two days ago';
+        else if(($current_time - $previous_time) < 4 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 3)
+            $this->content = 'three days ago';
+        else if(($current_time - $previous_time) < 1 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time))
+            $this->content = 'earlier this week';
+        else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1 && date('w', $previous_time) >= 3)
+            $this->content = 'late last week';
+        else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1)
+            $this->content = 'early last week';
+        else if(($current_time - $previous_time) < 3 * 7 * 24 * 60 * 60)
+            $this->content = 'few weeks ago';
+        else if(($current_time - $previous_time) < 1.25* 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time))
+            $this->content = 'earlier this month';
+        else if(($current_time - $previous_time) < 2 * 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time) + 1)
+            $this->content = 'last month';
+        else if(($current_time - $previous_time) < 4 * 4 * 7 * 24 * 60 * 60)
+            $this->content = 'several months ago';
+        else
+            $this->content = 'long ago';
+    }
 
 }
\ No newline at end of file