jacobemerick / web

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 +29 added lines, -20 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/ChangelogCron.class.inc.php

Doc Comments +3 added lines

@@ -49,6 +49,9 @@
 		Database::execute($query);

 	}

 

+	/**
+	 * @return string
+	 */
 	private function get_changeset_to_check()

 	{

 		$changeset = ChangelogCollector::getMostRecentChange();

Spacing +5 added lines, -5 removed lines

@@ -16,16 +16,16 @@ 
 	public function activate()

 	{

 		$loop_count = 0;

-		for($loop_count = 0; $loop_count < self::$MAXIMUM_LOOP_COUNT; $loop_count++)

+		for ($loop_count = 0; $loop_count < self::$MAXIMUM_LOOP_COUNT; $loop_count++)

 		{

 			$changeset_to_check = $this->get_changeset_to_check();

 			$data = $this->get_changeset_page_data($changeset_to_check);

 			

-			if(!isset($data))

+			if (!isset($data))

 				break;

 			

 			$this->save_changeset_data($data);

-			if($loop_count > 20)

+			if ($loop_count > 20)

 				exit;

 		}

 		

@@ -53,7 +53,7 @@ 
 	{

 		$changeset = ChangelogCollector::getMostRecentChange();

 		

-		if($changeset === null)

+		if ($changeset === null)

 			return 1;

 		

 		$number = $changeset->number;

@@ -66,7 +66,7 @@ 
 		$changeset_page = $this->get_changeset_page($page);

 		

 		preg_match('@<h1>(.+)</h1>@', $changeset_page, $match);

-		if(stristr($match[1], 'Error: Invalid Changeset Number') !== false)

+		if (stristr($match[1], 'Error: Invalid Changeset Number') !== false)

 			return;

 		

 		preg_match('@<h1>Changeset (\d+)</h1>@', $changeset_page, $match);

Braces +12 added lines, -8 removed lines

@@ -21,12 +21,14 @@ 
 			$changeset_to_check = $this->get_changeset_to_check();

 			$data = $this->get_changeset_page_data($changeset_to_check);

 			

-			if(!isset($data))

-				break;

+			if(!isset($data)) {

+							break;

+			}

 			

 			$this->save_changeset_data($data);

-			if($loop_count > 20)

-				exit;

+			if($loop_count > 20) {

+							exit;

+			}

 		}

 		

 		return true;

@@ -53,8 +55,9 @@ 
 	{

 		$changeset = ChangelogCollector::getMostRecentChange();

 		

-		if($changeset === null)

-			return 1;

+		if($changeset === null) {

+					return 1;

+		}

 		

 		$number = $changeset->number;

 		$number++;

@@ -66,8 +69,9 @@ 
 		$changeset_page = $this->get_changeset_page($page);

 		

 		preg_match('@<h1>(.+)</h1>@', $changeset_page, $match);

-		if(stristr($match[1], 'Error: Invalid Changeset Number') !== false)

-			return;

+		if(stristr($match[1], 'Error: Invalid Changeset Number') !== false) {

+					return;

+		}

 		

 		preg_match('@<h1>Changeset (\d+)</h1>@', $changeset_page, $match);

 		$number = $match[1];

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()!');

Spacing +7 added lines, -7 removed lines

@@ -5,7 +5,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;

@@ -23,7 +23,7 @@ 
 

 	public static function instance()

 	{

-		if(!isset(self::$instance))

+		if (!isset(self::$instance))

 			self::$instance = new Debugger();

 		return self::$instance;

 	}

@@ -51,11 +51,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("{$string}... TYPE: {$code}", $file, $line);

@@ -67,7 +67,7 @@ 
 	{

 		$error = error_get_last();

 		

-		if(isset($error))

+		if (isset($error))

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

 		

 		self::display();

@@ -81,7 +81,7 @@ 
 

 	public static function display()

 	{

-		if(!Loader::isLive() && self::instance()->display)

+		if (!Loader::isLive() && self::instance()->display)

 			self::instance()->profiler->display();

 	}

 

Braces +18 added lines, -12 removed lines

@@ -23,8 +23,9 @@ 
 

 	public static function instance()

 	{

-		if(!isset(self::$instance))

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

+		if(!isset(self::$instance)) {

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

+		}

 		return self::$instance;

 	}

 

@@ -51,12 +52,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("{$string}... TYPE: {$code}", $file, $line);

 		

@@ -67,8 +71,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;

@@ -81,8 +86,9 @@ 
 

 	public static function display()

 	{

-		if(!Loader::isLive() && self::instance()->display)

-			self::instance()->profiler->display();

+		if(!Loader::isLive() && self::instance()->display) {

+					self::instance()->profiler->display();

+		}

 	}

 

 }

utility/Header.class.inc.php

Doc Comments +6 added lines

@@ -74,6 +74,9 @@ 
 		self::send($array);

 	}

 

+	/**
+	 * @param integer $timestamp
+	 */
 	public static function sendCSS($timestamp)

 	{

 		$array = array(

@@ -184,6 +187,9 @@ 
 		self::send($array);

 	}

 

+	/**
+	 * @param string[] $array
+	 */
 	private static function send($array, $gzip = true)

 	{

 		if($gzip)

Indentation +1 added lines, -1 removed lines

@@ -205,7 +205,7 @@
 	private static function start_gzipping()

 	{

 		if(!ob_start('ob_gzhandler'))

-            ob_start();

+			ob_start();

 	}

 

 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -186,10 +186,10 @@ 
 

 	private static function send($array, $gzip = true)

 	{

-		if($gzip)

+		if ($gzip)

 			self::start_gzipping();

 		

-		foreach($array as $row)

+		foreach ($array as $row)

 		{

 			header($row, TRUE);

 		}

@@ -197,14 +197,14 @@ 
 

 	private static function get_date($timestamp = false)

 	{

-		if($timestamp == 0)

+		if ($timestamp == 0)

 			$timestamp = time();

 		return gmdate('D, d M Y H:i:s \G\M\T', $timestamp);

 	}

 

 	private static function start_gzipping()

 	{

-		if(!ob_start('ob_gzhandler'))

+		if (!ob_start('ob_gzhandler'))

             ob_start();

 	}

 

Braces +9 added lines, -6 removed lines

@@ -186,8 +186,9 @@ 
 

 	private static function send($array, $gzip = true)

 	{

-		if($gzip)

-			self::start_gzipping();

+		if($gzip) {

+					self::start_gzipping();

+		}

 		

 		foreach($array as $row)

 		{

@@ -197,15 +198,17 @@ 
 

 	private static function get_date($timestamp = false)

 	{

-		if($timestamp == 0)

-			$timestamp = time();

+		if($timestamp == 0) {

+					$timestamp = time();

+		}

 		return gmdate('D, d M Y H:i:s \G\M\T', $timestamp);

 	}

 

 	private static function start_gzipping()

 	{

-		if(!ob_start('ob_gzhandler'))

-            ob_start();

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

+		            ob_start();

+		}

 	}

 

 }
\ No newline at end of file

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 '/';

+	}

 

 }
\ No newline at end of file

Spacing +10 added lines, -10 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' :

@@ -71,7 +71,7 @@ 
 

 	public static function getImagePath($type, $file)

 	{

-		if($type == 'photo')

+		if ($type == 'photo')

 			$type = 'photo/processed';

 		

 		$path = self::instance()->get_root();

@@ -107,18 +107,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' :

@@ -148,7 +148,7 @@ 
 		

 		$reflectionObject = self::create_reflection_class($file);

 		

-		if(

+		if (

 			$reflectionObject->hasMethod('instance') &&

 			$reflectionObject->getMethod('instance')->isStatic())

 		{

@@ -163,7 +163,7 @@ 
 		

 		$reflectionObject = self::create_reflection_class($file);

 		

-		if($reflectionObject->hasMethod('__construct'))

+		if ($reflectionObject->hasMethod('__construct'))

 			return $reflectionObject->newInstanceArgs($data);

 		else

 			return $reflectionObject->newInstance();

Braces +17 added lines, -12 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;

 	}

 

@@ -71,8 +72,9 @@ 
 

 	public static function getImagePath($type, $file)

 	{

-		if($type == 'photo')

-			$type = 'photo/processed';

+		if($type == 'photo') {

+					$type = 'photo/processed';

+		}

 		

 		$path = self::instance()->get_root();

 		$path .= 'images';

@@ -110,11 +112,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);

 			

@@ -163,10 +167,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;

 	}