jacobemerick / web

utility/content/SmartTrimContent.class.inc.php

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

Indentation +2 added lines, -2 removed lines

@@ -42,8 +42,8 @@
 		
 		if($length < strlen($this->content))
 			$this->trim_string($length);
-        else
-            $etc = '';
+		else
+			$etc = '';
 		$this->check_exclude_tags();
 		$this->close_tags($etc);
 	}

Spacing +13 added lines, -13 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]);
 		}
 		
-		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}>";
 			}

Braces +28 added lines, -22 removed lines

@@ -33,17 +33,19 @@ 
 			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);
 	}
@@ -54,8 +56,9 @@ 
 		
 		$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;
@@ -76,14 +79,16 @@ 
 		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;
 	}
@@ -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,13 +133,14 @@ 
 		{
 			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;
 	}

utility/Cookie.class.inc.php

Doc Comments +17 added lines

@@ -14,9 +14,20 @@ 
 		$this->class_new = $class_name;

 	}

 

+	/**
+	 * @return string
+	 */
 	abstract protected function getName();

 	abstract protected function getDuration();

+
+	/**
+	 * @return string|null
+	 */
 	abstract protected function getDomain();

+
+	/**
+	 * @return string|null
+	 */
 	abstract protected function getPath();

 

 	public function setValue($value)

@@ -28,6 +39,9 @@ 
 		return $this;

 	}

 

+	/**
+	 * @return string|null
+	 */
 	public function getValue()

 	{

 		if(!$this->is_loaded)

@@ -118,6 +132,9 @@ 
 		return $set_cookie;

 	}

 

+	/**
+	 * @param string $class_name
+	 */
 	public static function instance($class_name)

 	{

 		return Loader::loadNew('utility', "cookie/{$class_name}Cookie", (array) $class_name);

Spacing +12 added lines, -12 removed lines

@@ -21,7 +21,7 @@ 
 
 	public function setValue($value)
 	{
-		if(!$this->is_loaded)
+		if (!$this->is_loaded)
 			$this->load();
 		
 		$this->value = $value;
@@ -30,7 +30,7 @@ 
 
 	public function getValue()
 	{
-		if(!$this->is_loaded)
+		if (!$this->is_loaded)
 			$this->load();
 		return $this->value;
 	}
@@ -42,7 +42,7 @@ 
 
 	public function exists()
 	{
-		if(!$this->is_loaded)
+		if (!$this->is_loaded)
 			$this->load();
 		return $this->exists;
 	}
@@ -50,10 +50,10 @@ 
 	private final function load()
 	{
 		$name = $this->getName();
-		if(isset($_COOKIE[$name]))
+		if (isset($_COOKIE[$name]))
 			$value = $_COOKIE[$name];
 		
-		if(isset($value))
+		if (isset($value))
 		{
 			$this->value = $value;
 			$this->exists = true;
@@ -66,13 +66,13 @@ 
 
 	public final function save()
 	{
-		if(!$this->check_values())
+		if (!$this->check_values())
 		{
 			Debugger::error('Attempt to create a cookie without all of the values being set!');
 			return false;
 		}
 		
-		if(!$this->set_cookie())
+		if (!$this->set_cookie())
 		{
 			Debugger::log('There was a problem saving the cookie.');
 			return false;
@@ -84,23 +84,23 @@ 
 	private final function check_values()
 	{
 		$name = $this->getName();
-		if(empty($name) || strlen($name) < 1)
+		if (empty($name) || strlen($name) < 1)
 			return false;
 		
 		$value = $this->getValue();
-		if(!isset($value) || strlen($value) < 1)
+		if (!isset($value) || strlen($value) < 1)
 			return false;
 		
 		$expiration = $this->getExpiration();
-		if(!isset($expiration) || !is_int($expiration))
+		if (!isset($expiration) || !is_int($expiration))
 			return false;
 		
 		$domain = $this->getDomain();
-		if(!isset($domain) || strlen($domain) < 1)
+		if (!isset($domain) || strlen($domain) < 1)
 			return false;
 		
 		$path = $this->getPath();
-		if(!isset($path) || strlen($path) < 1)
+		if (!isset($path) || strlen($path) < 1)
 			return false;
 		
 		return true;

Braces +30 added lines, -21 removed lines

@@ -21,8 +21,9 @@ 
 
 	public function setValue($value)
 	{
-		if(!$this->is_loaded)
-			$this->load();
+		if(!$this->is_loaded) {

+					$this->load();

+		}

 		
 		$this->value = $value;
 		return $this;
@@ -30,8 +31,9 @@ 
 
 	public function getValue()
 	{
-		if(!$this->is_loaded)
-			$this->load();
+		if(!$this->is_loaded) {

+					$this->load();

+		}

 		return $this->value;
 	}
 
@@ -42,24 +44,26 @@ 
 
 	public function exists()
 	{
-		if(!$this->is_loaded)
-			$this->load();
+		if(!$this->is_loaded) {

+					$this->load();

+		}

 		return $this->exists;
 	}
 
 	private final function load()
 	{
 		$name = $this->getName();
-		if(isset($_COOKIE[$name]))
-			$value = $_COOKIE[$name];
+		if(isset($_COOKIE[$name])) {

+					$value = $_COOKIE[$name];

+		}

 		
 		if(isset($value))
 		{
 			$this->value = $value;
 			$this->exists = true;
-		}
-		else
-			$this->exists = false;
+		} else {

+					$this->exists = false;

+		}

 		
 		$this->is_loaded = true;
 	}
@@ -84,24 +88,29 @@ 
 	private final function check_values()
 	{
 		$name = $this->getName();
-		if(empty($name) || strlen($name) < 1)
-			return false;
+		if(empty($name) || strlen($name) < 1) {

+					return false;

+		}

 		
 		$value = $this->getValue();
-		if(!isset($value) || strlen($value) < 1)
-			return false;
+		if(!isset($value) || strlen($value) < 1) {

+					return false;

+		}

 		
 		$expiration = $this->getExpiration();
-		if(!isset($expiration) || !is_int($expiration))
-			return false;
+		if(!isset($expiration) || !is_int($expiration)) {

+					return false;

+		}

 		
 		$domain = $this->getDomain();
-		if(!isset($domain) || strlen($domain) < 1)
-			return false;
+		if(!isset($domain) || strlen($domain) < 1) {

+					return false;

+		}

 		
 		$path = $this->getPath();
-		if(!isset($path) || strlen($path) < 1)
-			return false;
+		if(!isset($path) || strlen($path) < 1) {

+					return false;

+		}

 		
 		return true;
 	}

utility/cron/Cron.class.inc.php

Doc Comments +3 added lines

@@ -7,6 +7,9 @@
 

 	abstract public function activate();

 

+	/**
+	 * @param string $value
+	 */
 	protected function error($value)

 	{

 		trigger_error("Cron failed: {$value}");

utility/cron/StreamCron.class.inc.php

Doc Comments +6 added lines

@@ -59,6 +59,9 @@ 
 		$this->add_posts($youtube_result, 'youtube');

 	}

 

+	/**
+	 * @param string $type
+	 */
 	private function remove_existing($result, $type)

 	{

 		foreach($result as $key => $row)

@@ -70,6 +73,9 @@ 
 		return $result;

 	}

 

+	/**
+	 * @param string $type
+	 */
 	private function add_posts($result, $type)

 	{

 		foreach($result as $row)

Spacing +3 added lines, -3 removed lines

@@ -61,10 +61,10 @@ 
 
 	private function remove_existing($result, $type)
 	{
-		foreach($result as $key => $row)
+		foreach ($result as $key => $row)
 		{
 			$stream_result = ActivityCollector::getPostByFields($row->id, $type);
-			if($stream_result)
+			if ($stream_result)
 				unset($result[$key]);
 		}
 		return $result;
@@ -72,7 +72,7 @@ 
 
 	private function add_posts($result, $type)
 	{
-		foreach($result as $row)
+		foreach ($result as $row)
 		{
 			$query = sprintf(self::$QUERY, $type, $row->id, $row->date);
 			Database::execute($query);

Braces +3 added lines, -2 removed lines

@@ -64,8 +64,9 @@
 		foreach($result as $key => $row)
 		{
 			$stream_result = ActivityCollector::getPostByFields($row->id, $type);
-			if($stream_result)
-				unset($result[$key]);
+			if($stream_result) {

+							unset($result[$key]);

+			}

 		}
 		return $result;
 	}

utility/cron/TwitterCron.class.inc.php

Doc Comments +3 added lines

@@ -239,6 +239,9 @@
 		return $text;

 	}

 

+	/**
+	 * @param string $type
+	 */
 	private function get_replace_text($entity_type, $entity, $type)

 	{

 		switch($entity_type)

Indentation +9 added lines, -9 removed lines

@@ -20,21 +20,21 @@
 	private static $USER_MENTION_LINK = '<a href="https://twitter.com/%1$s" rel="nofollow" target="_blank" title="%2$s (%1$s) on Twitter">@%1$s</a>';
 	private static $MEDIA_LINK = '<a class="photo" href="%s" rel="nofollow" target="_blank" title="%s"><img src="%s:%s" alt="%s" height="%s" width="%s" /></a>';
 
-    private $consumer_key;
-    private $consumer_secret;
-    private $access_token;
-    private $access_secret;
+	private $consumer_key;
+	private $consumer_secret;
+	private $access_token;
+	private $access_secret;
 
 	private $json;
 
 	public function __construct()
 	{
-        global $config;
+		global $config;
 
-        $this->consumer_key = $config->twitter->consumer_key;
-        $this->consumer_secret = $config->twitter->consumer_secret;
-        $this->access_token = $config->twitter->access_token;
-        $this->access_secret = $config->twitter->access_secret;
+		$this->consumer_key = $config->twitter->consumer_key;
+		$this->consumer_secret = $config->twitter->consumer_secret;
+		$this->access_token = $config->twitter->access_token;
+		$this->access_secret = $config->twitter->access_secret;
 
 		$json = $this->get_data();
 		

Spacing +15 added lines, -15 removed lines

@@ -83,7 +83,7 @@ 
 	private $oauth_array;
 	private function get_oauth_array()
 	{
-		if(!isset($this->oauth_array))
+		if (!isset($this->oauth_array))
 		{
 			$this->oauth_array = array(
 				'screen_name' => self::$SCREEN_NAME,
@@ -116,7 +116,7 @@ 
 	{
 		$encoded_array = array();
 		ksort($array);
-		foreach($array as $key => $value)
+		foreach ($array as $key => $value)
 		{
 			$value = rawurlencode($value);
 			$value = ($wrap_values) ? '"' . $value . '"' : $value;
@@ -127,27 +127,27 @@ 
 
 	public function activate()
 	{
-		if(!$this->json)
+		if (!$this->json)
 			return $this->error('Could not connect to twitter json feed.');
 		
 		$count = 0;
-		foreach($this->json as $status)
+		foreach ($this->json as $status)
 		{
 			$text = Database::escape($status->text);
 			$date = date('Y-m-d H:i:s', strtotime($status->created_at));
 			
 			$tweet_result = TwitterCollector::getTweetByFields($date, $text);
-			if($tweet_result !== null)
+			if ($tweet_result !== null)
 			{
 				$favorites = (int) $status->favorite_count;
-				if($favorites != 0 && $tweet_result->favorites != $favorites)
+				if ($favorites != 0 && $tweet_result->favorites != $favorites)
 				{
 					$query = sprintf(self::$UPDATE_FAVORITES_QUERY, $favorites, $tweet_result->id);
 					Database::execute($query);
 				}
 				
 				$retweets = (int) $status->retweet_count;
-				if($retweets != 0 && $tweet_result->retweets != $retweets)
+				if ($retweets != 0 && $tweet_result->retweets != $retweets)
 				{
 					$query = sprintf(self::$UPDATE_RETWEETS_QUERY, $retweets, $tweet_result->id);
 					Database::execute($query);
@@ -157,7 +157,7 @@ 
 			{
 				$twitter_id = (string) $status->id_str;
 				
-				if(isset($status->retweeted_status))
+				if (isset($status->retweeted_status))
 				{
 					$text_formatted = $this->get_formatted($status->retweeted_status->text, $status->retweeted_status->entities);
 					$text_formatted_full = $this->get_formatted($status->retweeted_status->text, $status->retweeted_status->entities, 'full');
@@ -200,9 +200,9 @@ 
 
 	private function get_source($source)
 	{
-		if(stristr($source, 'tweetdeck'))
+		if (stristr($source, 'tweetdeck'))
 			return 'tweetdeck';
-		if(stristr($source, 'windows phone'))
+		if (stristr($source, 'windows phone'))
 			return 'phone';
 		else
 			return '';
@@ -211,9 +211,9 @@ 
 	private function get_formatted($text, $entities, $type = 'short')
 	{
 		$holder = array();
-		foreach($entities as $entity_type => $entity_collection)
+		foreach ($entities as $entity_type => $entity_collection)
 		{
-			foreach($entity_collection as $entity)
+			foreach ($entity_collection as $entity)
 			{
 				$start = $entity->indices[0];
 				$end = $entity->indices[1];
@@ -228,7 +228,7 @@ 
 		
 		krsort($holder);
 		
-		foreach($holder as $entity)
+		foreach ($holder as $entity)
 		{
 			$text = mb_substr($text, 0, $entity->start, 'UTF-8') . $entity->replace . mb_substr($text, $entity->end, 5000, 'UTF-8');
 		}
@@ -241,7 +241,7 @@ 
 
 	private function get_replace_text($entity_type, $entity, $type)
 	{
-		switch($entity_type)
+		switch ($entity_type)
 		{
 			case 'hashtags' :
 				$replace = sprintf(self::$HASHTAG_LINK, $entity->text);
@@ -253,7 +253,7 @@ 
 				$replace = sprintf(self::$USER_MENTION_LINK, $entity->screen_name, $entity->name);
 				break;
 			case 'media' :
-				if($type == 'full')
+				if ($type == 'full')
 					$replace = sprintf(self::$MEDIA_LINK, $entity->url, $entity->display_url, $entity->media_url, 'large', 'Photo from Twitter', $entity->sizes->large->h, $entity->sizes->large->w);
 				else
 					$replace = sprintf(self::$URL_LINK, $entity->url, $entity->expanded_url, $entity->display_url);

Braces +18 added lines, -16 removed lines

@@ -127,8 +127,9 @@ 
 
 	public function activate()
 	{
-		if(!$this->json)
-			return $this->error('Could not connect to twitter json feed.');
+		if(!$this->json) {

+					return $this->error('Could not connect to twitter json feed.');

+		}

 		
 		$count = 0;
 		foreach($this->json as $status)
@@ -152,8 +153,7 @@ 
 					$query = sprintf(self::$UPDATE_RETWEETS_QUERY, $retweets, $tweet_result->id);
 					Database::execute($query);
 				}
-			}
-			else
+			} else
 			{
 				$twitter_id = (string) $status->id_str;
 				
@@ -164,8 +164,7 @@ 
 					
 					$text_formatted = $this->prepend_original_user($status->retweeted_status->user, $text_formatted);
 					$text_formatted_full = $this->prepend_original_user($status->retweeted_status->user, $text_formatted_full);
-				}
-				else
+				} else
 				{
 					$text_formatted = $this->get_formatted($status->text, $status->entities);
 					$text_formatted_full = $this->get_formatted($status->text, $status->entities, 'full');
@@ -200,12 +199,14 @@ 
 
 	private function get_source($source)
 	{
-		if(stristr($source, 'tweetdeck'))
-			return 'tweetdeck';
-		if(stristr($source, 'windows phone'))
-			return 'phone';
-		else
-			return '';
+		if(stristr($source, 'tweetdeck')) {

+					return 'tweetdeck';

+		}

+		if(stristr($source, 'windows phone')) {

+					return 'phone';

+		} else {

+					return '';

+		}

 	}
 
 	private function get_formatted($text, $entities, $type = 'short')
@@ -253,10 +254,11 @@ 
 				$replace = sprintf(self::$USER_MENTION_LINK, $entity->screen_name, $entity->name);
 				break;
 			case 'media' :
-				if($type == 'full')
-					$replace = sprintf(self::$MEDIA_LINK, $entity->url, $entity->display_url, $entity->media_url, 'large', 'Photo from Twitter', $entity->sizes->large->h, $entity->sizes->large->w);
-				else
-					$replace = sprintf(self::$URL_LINK, $entity->url, $entity->expanded_url, $entity->display_url);
+				if($type == 'full') {

+									$replace = sprintf(self::$MEDIA_LINK, $entity->url, $entity->display_url, $entity->media_url, 'large', 'Photo from Twitter', $entity->sizes->large->h, $entity->sizes->large->w);

+				} else {

+									$replace = sprintf(self::$URL_LINK, $entity->url, $entity->expanded_url, $entity->display_url);

+				}

 				break;
 			default :
 				$replace = '';

utility/Debugger.class.inc.php

Doc Comments +3 added lines

@@ -28,6 +28,9 @@
 		return self::$instance;

 	}

 

+	/**
+	 * @param string $message
+	 */
 	public static function log($message)

 	{

 		self::instance()->console->logError('Gah, this is using Debugger::log()!');

Indentation +25 added lines, -25 removed lines

@@ -18,8 +18,8 @@ 
 	private function __construct()
 	{
 		$this->console = new Console();
-    $this->profiler = new PhpQuickProfiler();
-    $this->profiler->setConsole($this->console);
+	$this->profiler = new PhpQuickProfiler();
+	$this->profiler->setConsole($this->console);
 	}
 
 	public static function instance()
@@ -82,29 +82,29 @@ 
 
 	public static function display()
 	{
-    if ($_COOKIE['debugger'] == 'display' && self::instance()->display) {
-      $pdo = '';
-      global $container;
-      if (!empty($container) && !empty($container['db_connection_locator'])) {
-        $pdo = $container['db_connection_locator']->getRead();
-      }
-      if (!empty($pdo)) {
-        $profiles = $pdo->getProfiler()->getProfiles();
-        $profiles = array_filter($profiles, function ($profile) {
-            return $profile['function'] == 'perform';
-        });
-        $profiles = array_map(function ($profile) {
-            return array(
-                'sql' => trim(preg_replace('/\s+/', ' ', $profile['statement'])),
-                'parameters' => $profile['bind_values'],
-                'time' => $profile['duration']
-            );
-        }, $profiles);
-        self::instance()->profiler->setProfiledQueries($profiles);
-      }
-      self::instance()->profiler->setDisplay(new Particletree\Pqp\Display());
-      self::instance()->profiler->display($pdo);
-    }
+	if ($_COOKIE['debugger'] == 'display' && self::instance()->display) {
+	  $pdo = '';
+	  global $container;
+	  if (!empty($container) && !empty($container['db_connection_locator'])) {
+		$pdo = $container['db_connection_locator']->getRead();
+	  }
+	  if (!empty($pdo)) {
+		$profiles = $pdo->getProfiler()->getProfiles();
+		$profiles = array_filter($profiles, function ($profile) {
+			return $profile['function'] == 'perform';
+		});
+		$profiles = array_map(function ($profile) {
+			return array(
+				'sql' => trim(preg_replace('/\s+/', ' ', $profile['statement'])),
+				'parameters' => $profile['bind_values'],
+				'time' => $profile['duration']
+			);
+		}, $profiles);
+		self::instance()->profiler->setProfiledQueries($profiles);
+	  }
+	  self::instance()->profiler->setDisplay(new Particletree\Pqp\Display());
+	  self::instance()->profiler->display($pdo);
+	}
 	}
 
 }

Spacing +8 added lines, -8 removed lines

@@ -8,7 +8,7 @@ 
 
 	private static $UNKNOWN_ERROR_FILE		= 'Unknown File';
 	private static $UNKNOWN_ERROR_LINE		= 'Unknown Line';
-	private static $UNKNOWN_ERROR_CONTEXT	= 'Unknown Context';
+	private static $UNKNOWN_ERROR_CONTEXT = 'Unknown Context';
 
 	private $profiler;
 	private $display = true;
@@ -24,7 +24,7 @@ 
 
 	public static function instance()
 	{
-		if(!isset(self::$instance))
+		if (!isset(self::$instance))
 			self::$instance = new Debugger();
 		return self::$instance;
 	}
@@ -52,11 +52,11 @@ 
 
 	public static function internal_error($code, $string, $file = null, $line = null, $context = null)
 	{
-		if($file == null)
+		if ($file == null)
 			$file = self::$UNKNOWN_ERROR_FILE;
-		if($line == null)
+		if ($line == null)
 			$line = self::$UNKNOWN_ERROR_LINE;
-		if($context == null)
+		if ($context == null)
 			$context = self::$UNKNOWN_ERROR_CONTEXT;
 		
 		self::instance()->console->logError(new Exception($string), "{$string}... TYPE: {$code}");
@@ -68,7 +68,7 @@ 
 	{
 		$error = error_get_last();
 		
-		if(isset($error))
+		if (isset($error))
 			self::internal_error($error['type'], $error['message'], $error['file'], $error['line']);
 		
 		self::display();
@@ -90,10 +90,10 @@ 
       }
       if (!empty($pdo)) {
         $profiles = $pdo->getProfiler()->getProfiles();
-        $profiles = array_filter($profiles, function ($profile) {
+        $profiles = array_filter($profiles, function($profile) {
             return $profile['function'] == 'perform';
         });
-        $profiles = array_map(function ($profile) {
+        $profiles = array_map(function($profile) {
             return array(
                 'sql' => trim(preg_replace('/\s+/', ' ', $profile['statement'])),
                 'parameters' => $profile['bind_values'],

Braces +15 added lines, -10 removed lines

@@ -24,8 +24,9 @@ 
 
 	public static function instance()
 	{
-		if(!isset(self::$instance))
-			self::$instance = new Debugger();
+		if(!isset(self::$instance)) {

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

+		}

 		return self::$instance;
 	}
 
@@ -52,12 +53,15 @@ 
 
 	public static function internal_error($code, $string, $file = null, $line = null, $context = null)
 	{
-		if($file == null)
-			$file = self::$UNKNOWN_ERROR_FILE;
-		if($line == null)
-			$line = self::$UNKNOWN_ERROR_LINE;
-		if($context == null)
-			$context = self::$UNKNOWN_ERROR_CONTEXT;
+		if($file == null) {

+					$file = self::$UNKNOWN_ERROR_FILE;

+		}

+		if($line == null) {

+					$line = self::$UNKNOWN_ERROR_LINE;

+		}

+		if($context == null) {

+					$context = self::$UNKNOWN_ERROR_CONTEXT;

+		}

 		
 		self::instance()->console->logError(new Exception($string), "{$string}... TYPE: {$code}");
 		
@@ -68,8 +72,9 @@ 
 	{
 		$error = error_get_last();
 		
-		if(isset($error))
-			self::internal_error($error['type'], $error['message'], $error['file'], $error['line']);
+		if(isset($error)) {

+					self::internal_error($error['type'], $error['message'], $error['file'], $error['line']);

+		}

 		
 		self::display();
 		return true;

utility/Loader.class.inc.php

Doc Comments +10 added lines

@@ -69,6 +69,9 @@ 
 		return $extension;

 	}

 

+	/**
+	 * @param string $type
+	 */
 	public static function getImagePath($type, $file)

 	{

 		if($type == 'photo')

@@ -142,6 +145,10 @@ 
 		return new ReflectionClass($class_name);

 	}

 

+	/**
+	 * @param string $type
+	 * @param string $file
+	 */
 	public static function loadInstance($type, $file)

 	{

 		self::load($type, $file);

@@ -157,6 +164,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);

Indentation +11 added lines, -11 removed lines

@@ -179,16 +179,16 @@
 		return self::instance()->is_live;
 	}
 
-    public static function getRootURL($site = '')
-    {
-        if (strlen($site) > 0) {
-            if ($site == 'waterfalls' && self::instance()->is_live) {
-                return 'http://www.waterfallsofthekeweenaw.com/';
-            } else {
-                return 'http://' . (self::instance()->is_live ? '' : 'dev.') . $site . '.jacobemerick.com/';
-            }
-        }
-        return '/';
-    }
+	public static function getRootURL($site = '')
+	{
+		if (strlen($site) > 0) {
+			if ($site == 'waterfalls' && self::instance()->is_live) {
+				return 'http://www.waterfallsofthekeweenaw.com/';
+			} else {
+				return 'http://' . (self::instance()->is_live ? '' : 'dev.') . $site . '.jacobemerick.com/';
+			}
+		}
+		return '/';
+	}
 
 }

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,18 +104,18 @@ 
 
 	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;
 			
-			if(!file_exists($file_path))
+			if (!file_exists($file_path))
 				Debugger::logMessage("Requested file does not exist: {$type}, {$file}");
 			
 			self::instance()->add_included_file($file_path);
 			
-			switch($type)
+			switch ($type)
 			{
 				case 'images' :
 				case 'scripts' :
@@ -145,7 +145,7 @@ 
 		
 		$reflectionObject = self::create_reflection_class($file);
 		
-		if(
+		if (
 			$reflectionObject->hasMethod('instance') &&
 			$reflectionObject->getMethod('instance')->isStatic())
 		{
@@ -160,7 +160,7 @@ 
 		
 		$reflectionObject = self::create_reflection_class($file);
 		
-		if($reflectionObject->hasMethod('__construct'))
+		if ($reflectionObject->hasMethod('__construct'))
 			return $reflectionObject->newInstanceArgs($data);
 		else
 			return $reflectionObject->newInstance();

Braces +14 added lines, -10 removed lines

@@ -17,8 +17,9 @@ 
 
 	public static function instance()
 	{
-		if(!isset(self::$instance))
-			self::$instance = new Loader();
+		if(!isset(self::$instance)) {

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

+		}

 		return self::$instance;
 	}
 
@@ -107,11 +108,13 @@ 
 		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;

+			}

 			
-			if(!file_exists($file_path))
-				Debugger::logMessage("Requested file does not exist: {$type}, {$file}");
+			if(!file_exists($file_path)) {

+							Debugger::logMessage("Requested file does not exist: {$type}, {$file}");

+			}

 			
 			self::instance()->add_included_file($file_path);
 			
@@ -160,10 +163,11 @@ 
 		
 		$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()

utility/Mail.class.inc.php

Doc Comments +9 added lines

@@ -18,6 +18,9 @@ 
 		$this->headers['Bcc'] = "Jacob <{$config->admin_email}>";

 	}

 

+	/**
+	 * @param string $person
+	 */
 	public function setToAddress($email, $person = null)

 	{

 		if($person)

@@ -27,12 +30,18 @@ 
 		return $this;

 	}

 

+	/**
+	 * @param string $subject
+	 */
 	public function setSubject($subject)

 	{

 		$this->subject = $subject;

 		return $this;

 	}

 

+	/**
+	 * @param string $message
+	 */
 	public function setMessage($message)

 	{

 		$this->message = $message;

Indentation +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 	public function __construct()
 	{
-        global $config;
+		global $config;
 		$this->headers['From'] = self::$FROM;
 		$this->headers['Reply-To'] = "Jacob <{$config->admin_email}>";
 		$this->headers['Bcc'] = "Jacob <{$config->admin_email}>";

Spacing +4 added lines, -4 removed lines

@@ -20,7 +20,7 @@ 
 
 	public function setToAddress($email, $person = null)
 	{
-		if($person)
+		if ($person)
 			$this->to[] = "{$person} <{$email}>";
 		else
 			$this->to[] = "{$email}";
@@ -41,7 +41,7 @@ 
 
 	public function send()
 	{
-		if(!Loader::isLive())
+		if (!Loader::isLive())
 		{
 			Debugger::logMessage("Email Failed:\n\n{$this->message}");
 			return;
@@ -51,14 +51,14 @@ 
 		$subject = $this->subject;
 		$message = $this->message;
 		
-		if(empty($to) || empty($subject) || empty($message))
+		if (empty($to) || empty($subject) || empty($message))
 		{
 			Debugger::logMessage("Attempted to send an email without all of the required fields.");
 			return;
 		}
 		
 		$header = '';
-		foreach($this->headers as $key => $value)
+		foreach ($this->headers as $key => $value)
 		{
 			$header .= "{$key}: {$value}\r\n";
 		}

Braces +5 added lines, -4 removed lines

@@ -20,10 +20,11 @@
 
 	public function setToAddress($email, $person = null)
 	{
-		if($person)
-			$this->to[] = "{$person} <{$email}>";
-		else
-			$this->to[] = "{$email}";
+		if($person) {

+					$this->to[] = "{$person} <{$email}>";

+		} else {

+					$this->to[] = "{$email}";

+		}

 		return $this;
 	}
 

utility/Request.class.inc.php

Doc Comments +3 added lines

@@ -34,6 +34,9 @@
 		return false;

 	}

 

+	/**
+	 * @param string $key
+	 */
 	static function getGet($key = null)

 	{

 		if($key)

Spacing +7 added lines, -7 removed lines

@@ -18,9 +18,9 @@ 
 
 	static function getServer($key = null)
 	{
-		if($key)
+		if ($key)
 		{
-			if(isset(self::$server[$key]))
+			if (isset(self::$server[$key]))
 				return self::$server[$key];
 			return false;
 		}
@@ -29,16 +29,16 @@ 
 
 	static function isAjax()
 	{
-		if(self::getServer(self::$AJAX_REQUEST))
+		if (self::getServer(self::$AJAX_REQUEST))
 			return true;
 		return false;
 	}
 
 	static function getGet($key = null)
 	{
-		if($key)
+		if ($key)
 		{
-			if(isset(self::$get[$key]))
+			if (isset(self::$get[$key]))
 				return self::$get[$key];
 			return false;
 		}
@@ -47,9 +47,9 @@ 
 
 	static function getPost($key = null)
 	{
-		if($key)
+		if ($key)
 		{
-			if(isset(self::$post[$key]))
+			if (isset(self::$post[$key]))
 				return self::$post[$key];
 			return false;
 		}

Braces +12 added lines, -8 removed lines

@@ -20,8 +20,9 @@ 
 	{
 		if($key)
 		{
-			if(isset(self::$server[$key]))
-				return self::$server[$key];
+			if(isset(self::$server[$key])) {

+							return self::$server[$key];

+			}

 			return false;
 		}
 		return self::$server;
@@ -29,8 +30,9 @@ 
 
 	static function isAjax()
 	{
-		if(self::getServer(self::$AJAX_REQUEST))
-			return true;
+		if(self::getServer(self::$AJAX_REQUEST)) {

+					return true;

+		}

 		return false;
 	}
 
@@ -38,8 +40,9 @@ 
 	{
 		if($key)
 		{
-			if(isset(self::$get[$key]))
-				return self::$get[$key];
+			if(isset(self::$get[$key])) {

+							return self::$get[$key];

+			}

 			return false;
 		}
 		return self::$get;
@@ -49,8 +52,9 @@ 
 	{
 		if($key)
 		{
-			if(isset(self::$post[$key]))
-				return self::$post[$key];
+			if(isset(self::$post[$key])) {

+							return self::$post[$key];

+			}

 			return false;
 		}
 		return self::$post;