jacobemerick / web

public/waterfalls/index.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 $namespace = 'waterfalls';
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__.'/../../bootstrap.php';
 
 // route
 Loader::loadInstance('router', 'Router');

public/home/index.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 $namespace = 'home';
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__.'/../../bootstrap.php';
 
 // route
 Loader::loadInstance('router', 'Router');

public/blog/index.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 $namespace = 'blog';
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__.'/../../bootstrap.php';
 
 // route
 Loader::loadInstance('router', 'Router');

public/portfolio/index.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 $namespace = 'portfolio';
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__.'/../../bootstrap.php';
 
 // route
 Loader::loadInstance('router', 'Router');

utility/content/ImperialUnitContent.class.inc.php

Spacing +5 added lines, -5 removed lines

@@ -26,16 +26,16 @@ 
         
         switch ($type) {
             case 'full miles' :
-                $this->content = number_format(round($number / (12 * 3 * 1760))) . ' miles';
+                $this->content = number_format(round($number / (12 * 3 * 1760))).' miles';
                 break;
             case 'tenth miles' :
-                $this->content = round($number / (12 * 3 * 1760), 1) . ' miles';
+                $this->content = round($number / (12 * 3 * 1760), 1).' miles';
                 break;
             case 'yards' :
-                $this->content = number_format(round($number / (12 * 3))) . ' yards';
+                $this->content = number_format(round($number / (12 * 3))).' yards';
                 break;
             case 'feet' :
-                $this->content = number_format(round($number / 12)) . "'";
+                $this->content = number_format(round($number / 12))."'";
                 break;
             case 'inches' :
                 $feet = floor($number / 12);
@@ -49,7 +49,7 @@ 
                 }
                 
                 $this->content = '';
-                $this->content .= number_format($feet) . "'";
+                $this->content .= number_format($feet)."'";
                 if (isset($inches) && $inches > 0) {
                     $this->content .= " {$inches}\"";
                 }

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

Spacing +6 added lines, -6 removed lines

@@ -40,10 +40,10 @@ 
 	{
 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
 		
-		if($match_count < 1)
+		if ($match_count < 1)
 			return;
 		
-		foreach($matches as $match)
+		foreach ($matches as $match)
 		{
 			$full_match = array_shift($match);
 			$placeholder = $this->create_placeholder($full_match);
@@ -56,7 +56,7 @@ 
 
 	private function create_placeholder($text)
 	{
-		return md5($text . rand());
+		return md5($text.rand());
 	}
 
 	private function create_full_match_pattern($text)
@@ -79,10 +79,10 @@ 
 	{
 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
 		
-		if($match_count < 1)
+		if ($match_count < 1)
 			return;
 		
-		foreach($matches as $match)
+		foreach ($matches as $match)
 		{
 			$full_match = array_shift($match);
 			$full_match_pattern = $this->create_full_match_pattern($full_match);
@@ -99,7 +99,7 @@ 
 
 	private function replace_element_patterns()
 	{
-		foreach($this->replacement_array as $key => $replace)
+		foreach ($this->replacement_array as $key => $replace)
 		{
 			$this->content = str_replace($key, $replace, $this->content);
 		}

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

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

Doc Comments +8 added lines

@@ -36,6 +36,10 @@ 
 		$this->replace_element_patterns();
 	}
 
+	/**
+	 * @param string $pattern
+	 * @param string $replace
+	 */
 	private function process_element($pattern, $replace)
 	{
 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
@@ -75,6 +79,10 @@ 
 		$this->content = strip_tags($this->content);
 	}
 
+	/**
+	 * @param string $pattern
+	 * @param string $replace
+	 */
 	private function link_unlinked_urls($pattern, $replace)
 	{
 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);

utility/content/SmartTrimContent.class.inc.php

Spacing +15 added lines, -15 removed lines

@@ -27,20 +27,20 @@ 
 	protected function execute()
 	{
 		$args = func_get_args();
-		if(count($args) < 1)
+		if (count($args) < 1)
 		{
 			trigger_error('Someone called SmartTrimContent w/o defining a length... bad!');
 			return;
 		}
 		
-		if(count($args) == 2)
+		if (count($args) == 2)
 			$etc = $args[1];
 		else
 			$etc = self::$ETC;
 		
 		$length = $args[0];
 		
-		if($length < strlen($this->content))
+		if ($length < strlen($this->content))
 			$this->trim_string($length);
         else
             $etc = '';
@@ -54,7 +54,7 @@ 
 		
 		$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)
+		if ($last_left_bracket_position > $last_right_bracket_position)
 			$content = substr($content, 0, $last_left_bracket_position);
 		$content = trim($content);
 		
@@ -73,16 +73,16 @@ 
 		$content = current($content);
 		
 		$max_length = $length;
-		foreach($matches[0] as $match)
+		foreach ($matches[0] as $match)
 		{
 			$max_length += strlen($match[0]);
-			if($max_length <= $match[1])
+			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>')
+		if (substr($content, -7) == '</p><p>')
 			$content = substr($content, 0, -7);
 		
 		return $content;
@@ -94,7 +94,7 @@ 
 		$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)
+		if (count($matches[1]) % 2 == 1)
 		{
 			$cut_tag = end($matches[1]);
 			$cut_tag_position = $cut_tag[1] - 1;
@@ -112,9 +112,9 @@ 
 		preg_match_all($tags_preg, $content, $matches);
 		$open_tags = array();
 		
-		foreach($matches[1] as $tag)
+		foreach ($matches[1] as $tag)
 		{
-			if(in_array($tag, $open_tags))
+			if (in_array($tag, $open_tags))
 			{
 				$key = array_search($tag, $open_tags);
 				unset($open_tags[$key]);
@@ -124,11 +124,11 @@ 
 		}
 		
 		$open_tags = array_reverse($open_tags);
-		if(count($open_tags) > 0)
+		if (count($open_tags) > 0)
 		{
-			foreach($open_tags as $key => $open_tag)
+			foreach ($open_tags as $key => $open_tag)
 			{
-				if($key == count($open_tags) - 1)
+				if ($key == count($open_tags) - 1)
 					$content .= $etc;
 				$content .= "</{$open_tag}>";
 			}
@@ -141,7 +141,7 @@ 
 
 	private function get_tags_preg($tag_array)
 	{
-		return '@</?(' . implode('|', $tag_array) . ')@';
+		return '@</?('.implode('|', $tag_array).')@';
 	}
 
 }

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) . ')@';
+    }
 
 }

Braces +42 added lines, -36 removed lines

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

+{

 
 	private static $EXCLUDE_TAGS = array(
 		'a',
@@ -24,8 +24,8 @@ 
 
 	private $is_trimmed;
 
-	protected function execute()
-	{
+	protected function execute()

+	{

 		$args = func_get_args();
 		if(count($args) < 1)
 		{
@@ -33,37 +33,40 @@ 
 			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];
 		
-		if($length < strlen($this->content))
-			$this->trim_string($length);
-        else
-            $etc = '';
+		if($length < strlen($this->content)) {

+					$this->trim_string($length);

+		} else {

+                    $etc = '';

+        }

 		$this->check_exclude_tags();
 		$this->close_tags($etc);
 	}
 
-	private function trim_string($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);
+		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;
 	}
 
-	private function trim_html_string($content, $length)
-	{
+	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);
@@ -76,20 +79,22 @@ 
 		foreach($matches[0] as $match)
 		{
 			$max_length += strlen($match[0]);
-			if($max_length <= $match[1])
-				break;
+			if($max_length <= $match[1]) {

+							break;

+			}

 			
 			$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;
 	}
 
-	private function check_exclude_tags()
-	{
+	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);
@@ -105,8 +110,8 @@ 
 		$this->content = $content;
 	}
 
-	private function close_tags($etc)
-	{
+	private function close_tags($etc)

+	{

 		$content = $this->content;
 		$tags_preg = $this->get_tags_preg(self::$INCLUDE_TAGS);
 		preg_match_all($tags_preg, $content, $matches);
@@ -118,9 +123,9 @@ 
 			{
 				$key = array_search($tag, $open_tags);
 				unset($open_tags[$key]);
-			}
-			else
-				$open_tags[] = $tag;
+			} else {

+							$open_tags[] = $tag;

+			}

 		}
 		
 		$open_tags = array_reverse($open_tags);
@@ -128,19 +133,20 @@ 
 		{
 			foreach($open_tags as $key => $open_tag)
 			{
-				if($key == count($open_tags) - 1)
-					$content .= $etc;
+				if($key == count($open_tags) - 1) {

+									$content .= $etc;

+				}

 				$content .= "</{$open_tag}>";
 			}
-		}
-		else
-			$content .= $etc;
+		} else {

+					$content .= $etc;

+		}

 		
 		$this->content = $content;
 	}
 
-	private function get_tags_preg($tag_array)
-	{
+	private function get_tags_preg($tag_array)

+	{

 		return '@</?(' . implode('|', $tag_array) . ')@';
 	}
 

Doc Comments +3 added lines

@@ -62,6 +62,9 @@
 		$this->is_trimmed = true;
 	}
 
+	/**
+	 * @param string $content
+	 */
 	private function trim_html_string($content, $length)
 	{
 		$content = preg_replace(self::$PHOTO_PLACEHOLDER_MATCH, '', $content);

utility/URLDecode.class.inc.php

Spacing +9 added lines, -9 removed lines

@@ -15,11 +15,11 @@ 
 	static private function form_url_array($host, $uri)
 	{
 		$uri = substr($uri, 1);
-		if(strpos($uri, '?'))
+		if (strpos($uri, '?'))
 			$uri = substr($uri, 0, strpos($uri, '?'));
 		$uri_array = explode('/', $uri);
 		
-		if(!Loader::isLive())
+		if (!Loader::isLive())
 			$host = substr($host, strpos($host, '.') + 1);
 		
 		self::$array['host'] = $host;
@@ -41,9 +41,9 @@ 
     $base .= '/';
 
 		self::$array['base'] = $base;
-		self::$array['uri'] = '/' . implode('/', $uri_array);
+		self::$array['uri'] = '/'.implode('/', $uri_array);
 		
-		if(end($uri_array) == '')
+		if (end($uri_array) == '')
 			$uri_array = array_slice($uri_array, 0, count($uri_array) - 1);
 		self::$array['pieces'] = (array) $uri_array;
 	}
@@ -71,21 +71,21 @@ 
 	static function getExtension()
 	{
 		$file = self::getPiece(-1);
-		if(substr($file, -1) == '/')
+		if (substr($file, -1) == '/')
 			return false;
-		return substr($file, strrpos($file, '.') + 1);;
+		return substr($file, strrpos($file, '.') + 1); ;
 	}
 
 	static function getPiece($piece = null)
 	{
-		if(!$piece)
+		if (!$piece)
 			return self::$array['pieces'];
 		
-		if($piece == -1)
+		if ($piece == -1)
 			return end(self::$array['pieces']);
 		
 		$piece = $piece - 1;
-		if(array_key_exists($piece, self::$array['pieces']))
+		if (array_key_exists($piece, self::$array['pieces']))
 			return self::$array['pieces'][$piece];
 		return;
 	}

Indentation +61 added lines, -61 removed lines

@@ -3,35 +3,35 @@ 
 class URLDecode
 {
 
-	private static $array = array();
+    private static $array = array();
 
-	static function init()
-	{
-		$host = $_SERVER['HTTP_HOST'];
-		$uri = $_SERVER['REQUEST_URI'];
-		self::form_url_array($host, $uri);
-	}
+    static function init()
+    {
+        $host = $_SERVER['HTTP_HOST'];
+        $uri = $_SERVER['REQUEST_URI'];
+        self::form_url_array($host, $uri);
+    }
 
-	static private function form_url_array($host, $uri)
-	{
-		$uri = substr($uri, 1);
-		if(strpos($uri, '?'))
-			$uri = substr($uri, 0, strpos($uri, '?'));
-		$uri_array = explode('/', $uri);
+    static private function form_url_array($host, $uri)
+    {
+        $uri = substr($uri, 1);
+        if(strpos($uri, '?'))
+            $uri = substr($uri, 0, strpos($uri, '?'));
+        $uri_array = explode('/', $uri);
 		
-		if(!Loader::isLive())
-			$host = substr($host, strpos($host, '.') + 1);
+        if(!Loader::isLive())
+            $host = substr($host, strpos($host, '.') + 1);
 		
-		self::$array['host'] = $host;
+        self::$array['host'] = $host;
 		
     if (
-      $host == 'www.waterfallsofthekeweenaw.com' ||
+        $host == 'www.waterfallsofthekeweenaw.com' ||
       $host == 'waterfallsofthekeweenaw.com'
     ) {
-			self::$array['site'] = 'waterfalls';
-		} else {
-			self::$array['site'] = substr($host, 0, strpos($host, '.'));
-		}
+            self::$array['site'] = 'waterfalls';
+        } else {
+            self::$array['site'] = substr($host, 0, strpos($host, '.'));
+        }
 
     $base = '';
     $base .= (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
@@ -40,55 +40,55 @@ 
     $base .= $host;
     $base .= '/';
 
-		self::$array['base'] = $base;
-		self::$array['uri'] = '/' . implode('/', $uri_array);
+        self::$array['base'] = $base;
+        self::$array['uri'] = '/' . implode('/', $uri_array);
 		
-		if(end($uri_array) == '')
-			$uri_array = array_slice($uri_array, 0, count($uri_array) - 1);
-		self::$array['pieces'] = (array) $uri_array;
-	}
+        if(end($uri_array) == '')
+            $uri_array = array_slice($uri_array, 0, count($uri_array) - 1);
+        self::$array['pieces'] = (array) $uri_array;
+    }
 
-	static function getSite()
-	{
-		return self::$array['site'];
-	}
+    static function getSite()
+    {
+        return self::$array['site'];
+    }
 
-	static function getHost()
-	{
-		return self::$array['host'];
-	}
+    static function getHost()
+    {
+        return self::$array['host'];
+    }
 
-	static function getBase()
-	{
-		return self::$array['base'];
-	}
+    static function getBase()
+    {
+        return self::$array['base'];
+    }
 
-	static function getURI()
-	{
-		return self::$array['uri'];
-	}
+    static function getURI()
+    {
+        return self::$array['uri'];
+    }
 
-	static function getExtension()
-	{
-		$file = self::getPiece(-1);
-		if(substr($file, -1) == '/')
-			return false;
-		return substr($file, strrpos($file, '.') + 1);;
-	}
+    static function getExtension()
+    {
+        $file = self::getPiece(-1);
+        if(substr($file, -1) == '/')
+            return false;
+        return substr($file, strrpos($file, '.') + 1);;
+    }
 
-	static function getPiece($piece = null)
-	{
-		if(!$piece)
-			return self::$array['pieces'];
+    static function getPiece($piece = null)
+    {
+        if(!$piece)
+            return self::$array['pieces'];
 		
-		if($piece == -1)
-			return end(self::$array['pieces']);
+        if($piece == -1)
+            return end(self::$array['pieces']);
 		
-		$piece = $piece - 1;
-		if(array_key_exists($piece, self::$array['pieces']))
-			return self::$array['pieces'][$piece];
-		return;
-	}
+        $piece = $piece - 1;
+        if(array_key_exists($piece, self::$array['pieces']))
+            return self::$array['pieces'][$piece];
+        return;
+    }
 
 }
 

Braces +39 added lines, -32 removed lines

@@ -1,26 +1,28 @@ 
 <?php
 
-class URLDecode
-{
+class URLDecode

+{

 
 	private static $array = array();
 
-	static function init()
-	{
+	static function init()

+	{

 		$host = $_SERVER['HTTP_HOST'];
 		$uri = $_SERVER['REQUEST_URI'];
 		self::form_url_array($host, $uri);
 	}
 
-	static private function form_url_array($host, $uri)
-	{
+	static private function form_url_array($host, $uri)

+	{

 		$uri = substr($uri, 1);
-		if(strpos($uri, '?'))
-			$uri = substr($uri, 0, strpos($uri, '?'));
+		if(strpos($uri, '?')) {

+					$uri = substr($uri, 0, strpos($uri, '?'));

+		}

 		$uri_array = explode('/', $uri);
 		
-		if(!Loader::isLive())
-			$host = substr($host, strpos($host, '.') + 1);
+		if(!Loader::isLive()) {

+					$host = substr($host, strpos($host, '.') + 1);

+		}

 		
 		self::$array['host'] = $host;
 		
@@ -43,50 +45,55 @@ 
 		self::$array['base'] = $base;
 		self::$array['uri'] = '/' . implode('/', $uri_array);
 		
-		if(end($uri_array) == '')
-			$uri_array = array_slice($uri_array, 0, count($uri_array) - 1);
+		if(end($uri_array) == '') {

+					$uri_array = array_slice($uri_array, 0, count($uri_array) - 1);

+		}

 		self::$array['pieces'] = (array) $uri_array;
 	}
 
-	static function getSite()
-	{
+	static function getSite()

+	{

 		return self::$array['site'];
 	}
 
-	static function getHost()
-	{
+	static function getHost()

+	{

 		return self::$array['host'];
 	}
 
-	static function getBase()
-	{
+	static function getBase()

+	{

 		return self::$array['base'];
 	}
 
-	static function getURI()
-	{
+	static function getURI()

+	{

 		return self::$array['uri'];
 	}
 
-	static function getExtension()
-	{
+	static function getExtension()

+	{

 		$file = self::getPiece(-1);
-		if(substr($file, -1) == '/')
-			return false;
+		if(substr($file, -1) == '/') {

+					return false;

+		}

 		return substr($file, strrpos($file, '.') + 1);;
 	}
 
-	static function getPiece($piece = null)
-	{
-		if(!$piece)
-			return self::$array['pieces'];
+	static function getPiece($piece = null)

+	{

+		if(!$piece) {

+					return self::$array['pieces'];

+		}

 		
-		if($piece == -1)
-			return end(self::$array['pieces']);
+		if($piece == -1) {

+					return end(self::$array['pieces']);

+		}

 		
 		$piece = $piece - 1;
-		if(array_key_exists($piece, self::$array['pieces']))
-			return self::$array['pieces'][$piece];
+		if(array_key_exists($piece, self::$array['pieces'])) {

+					return self::$array['pieces'][$piece];

+		}

 		return;
 	}
 

Doc Comments +6 added lines

@@ -48,6 +48,9 @@ 
 		self::$array['pieces'] = (array) $uri_array;
 	}
 
+	/**
+	 * @return string
+	 */
 	static function getSite()
 	{
 		return self::$array['site'];
@@ -76,6 +79,9 @@ 
 		return substr($file, strrpos($file, '.') + 1);;
 	}
 
+	/**
+	 * @param integer $piece
+	 */
 	static function getPiece($piece = null)
 	{
 		if(!$piece)

utility/Loader.class.inc.php

Spacing +9 added lines, -9 removed lines

@@ -17,14 +17,14 @@ 
 
 	public static function instance()
 	{
-		if(!isset(self::$instance))
+		if (!isset(self::$instance))
 			self::$instance = new Loader();
 		return self::$instance;
 	}
 
 	private function get_root()
 	{
-		if(!isset($this->root))
+		if (!isset($this->root))
 		{
 			$current_directory = dirname(__FILE__);
 			$current_directory = substr($current_directory, 0, -7);
@@ -52,7 +52,7 @@ 
 
 	private static function get_extension($type)
 	{
-		switch($type)
+		switch ($type)
 		{
 			case 'collector' :
 			case 'controller' :
@@ -104,15 +104,15 @@ 
 
 	public static function load($type, $files, $data = array())
 	{
-		foreach((array) $files as $file)
+		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')
+			if (in_array($file_path, self::instance()->get_included_files()) && $type !== 'view')
 				continue;
 			
 			self::instance()->add_included_file($file_path);
 			
-			switch($type)
+			switch ($type)
 			{
 				case 'images' :
 				case 'scripts' :
@@ -142,7 +142,7 @@ 
 		
 		$reflectionObject = self::create_reflection_class($file);
 		
-		if(
+		if (
 			$reflectionObject->hasMethod('instance') &&
 			$reflectionObject->getMethod('instance')->isStatic())
 		{
@@ -157,7 +157,7 @@ 
 		
 		$reflectionObject = self::create_reflection_class($file);
 		
-		if($reflectionObject->hasMethod('__construct'))
+		if ($reflectionObject->hasMethod('__construct'))
 			return $reflectionObject->newInstanceArgs($data);
 		else
 			return $reflectionObject->newInstance();
@@ -180,7 +180,7 @@ 
             if ($site == 'waterfalls' && self::instance()->is_live) {
                 return "{$protocol}://www.waterfallsofthekeweenaw.com/";
             } else {
-                return $protocol . '://' . (self::instance()->is_live ? '' : 'dev.') . $site . '.jacobemerick.com/';
+                return $protocol.'://'.(self::instance()->is_live ? '' : 'dev.').$site.'.jacobemerick.com/';
             }
         }
         return '/';

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

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

Doc Comments +6 added lines

@@ -69,6 +69,9 @@ 
 		return $extension;
 	}
 
+	/**
+	 * @param string $type
+	 */
 	public static function getImagePath($type, $file)
 	{
 		$path = self::instance()->get_root();
@@ -151,6 +154,9 @@ 
 		trigger_error("Requested class cannot be instance'd: {$type}, {$file}");
 	}
 
+	/**
+	 * @param string $type
+	 */
 	public static function loadNew($type, $file, $data = array())
 	{
 		self::load($type, $file);