jacobemerick / web

utility/Visitor.class.inc.php

Spacing +8 added lines, -8 removed lines

@@ -26,7 +26,7 @@ 
 
 	public static function instance()
 	{
-		if(!isset(self::$instance))
+		if (!isset(self::$instance))
 			self::$instance = new Visitor();
 		return self::$instance;
 	}
@@ -35,7 +35,7 @@ 
 	public static function getBrowser()
 	{
 		Loader::load('utility', 'environment/BrowserEnvironment');
-		if(!isset(self::instance()->browser))
+		if (!isset(self::instance()->browser))
 			self::instance()->browser = new BrowserEnvironment();
 		return self::instance()->browser;
 	}
@@ -44,7 +44,7 @@ 
 	public static function getPlatform()
 	{
 		Loader::load('utility', 'environment/PlatformEnvironment');
-		if(!isset(self::instance()->platform))
+		if (!isset(self::instance()->platform))
 			self::instance()->platform = new PlatformEnvironment();
 		return self::instance()->platform;
 	}
@@ -53,7 +53,7 @@ 
 	public static function getIP()
 	{
 		Loader::load('utility', 'Request');
-		if(!isset(self::instance()->ip_address))
+		if (!isset(self::instance()->ip_address))
 			self::instance()->ip_address = Request::getServer('REMOTE_ADDR');
 		return self::instance()->ip_address;
 	}
@@ -79,7 +79,7 @@ 
 		Loader::loadInstance('utility', 'Database');
 		
 		$query = $this->get_tracking_query();
-		if(Database::execute($query) == true)
+		if (Database::execute($query) == true)
 		{
 			$this->raw_visit_log_id = Database::lastInsertID();
 			return true;
@@ -94,7 +94,7 @@ 
 		
 		$columns = '`';
 		$values = "'";
-		foreach(self::$tracking_field_array as $field_column => $server_array_key)
+		foreach (self::$tracking_field_array as $field_column => $server_array_key)
 		{
 			$value = Request::getServer($server_array_key);
 			$value = Database::escape($value);
@@ -103,7 +103,7 @@ 
 			$values .= "{$value}','";
 		}
 		
-		if(Request::hasPost())
+		if (Request::hasPost())
 		{
 			$value = Request::getPost();
 			$value = serialize($value);
@@ -121,7 +121,7 @@ 
 
 	private function track_response_error($code)
 	{
-		if(isset($this->raw_visit_log_id) && $this->raw_visit_log_id > 0)
+		if (isset($this->raw_visit_log_id) && $this->raw_visit_log_id > 0)
 		{
 			$query = "UPDATE `jpemeric_stat`.`raw_visit_log` SET `code` = '{$code}' WHERE `id` = '{$this->raw_visit_log_id}' LIMIT 1";
 			return Database::execute($query);

Braces +12 added lines, -8 removed lines

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

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

+		}

 		return self::$instance;
 	}
 
@@ -35,8 +36,9 @@ 
 	public static function getBrowser()
 	{
 		Loader::load('utility', 'environment/BrowserEnvironment');
-		if(!isset(self::instance()->browser))
-			self::instance()->browser = new BrowserEnvironment();
+		if(!isset(self::instance()->browser)) {

+					self::instance()->browser = new BrowserEnvironment();

+		}

 		return self::instance()->browser;
 	}
 
@@ -44,8 +46,9 @@ 
 	public static function getPlatform()
 	{
 		Loader::load('utility', 'environment/PlatformEnvironment');
-		if(!isset(self::instance()->platform))
-			self::instance()->platform = new PlatformEnvironment();
+		if(!isset(self::instance()->platform)) {

+					self::instance()->platform = new PlatformEnvironment();

+		}

 		return self::instance()->platform;
 	}
 
@@ -53,8 +56,9 @@ 
 	public static function getIP()
 	{
 		Loader::load('utility', 'Request');
-		if(!isset(self::instance()->ip_address))
-			self::instance()->ip_address = Request::getServer('REMOTE_ADDR');
+		if(!isset(self::instance()->ip_address)) {

+					self::instance()->ip_address = Request::getServer('REMOTE_ADDR');

+		}

 		return self::instance()->ip_address;
 	}
 

utility/ImageOld.class.inc.php

Spacing +8 added lines, -8 removed lines

@@ -52,7 +52,7 @@ 
 
 	public function setSize($size)
 	{
-		if($this->get_version() > 1)
+		if ($this->get_version() > 1)
 			$position = strrpos($this->file, '-v');
 		else
 			$position = strrpos($this->file, '.');
@@ -62,7 +62,7 @@ 
 
 	public function getDimensions()
 	{
-		if(!$this->isValid())
+		if (!$this->isValid())
 			return false;
 		$imageinfo = getimagesize($this->getInternalPath());
 		return array($imageinfo[0], $imageinfo[1]);
@@ -85,7 +85,7 @@ 
 
 	private function get_image($image)
 	{
-		if(preg_match(self::$VERSION_PREG_MATCH, $image))
+		if (preg_match(self::$VERSION_PREG_MATCH, $image))
 			return preg_replace(self::$VERSION_PREG_MATCH, '', $image);
 		else
 			return $image;
@@ -99,7 +99,7 @@ 
 
 	private function get_file($image)
 	{
-		if($this->get_version() > 1)
+		if ($this->get_version() > 1)
 		{
 			$position = strrpos($image, '.');
 			return substr($image, 0, $position) . '-v' . $this->get_version() . substr($image, $position);
@@ -111,14 +111,14 @@ 
 	private $version;
 	private function get_version()
 	{
-		if(!$this->version)
+		if (!$this->version)
 		{
-			$path = Loader::getRoot() .'/images/' . substr($this->image, 0, strrpos($this->image, '.')) . '*';
+			$path = Loader::getRoot() . '/images/' . substr($this->image, 0, strrpos($this->image, '.')) . '*';
 			$files = glob($path);
-			if(count($files) > 0)
+			if (count($files) > 0)
 			{
 				preg_match(self::$VERSION_PREG_MATCH, $files[0], $matches);
-				if(count($matches))
+				if (count($matches))
 					$this->version = $matches[1];
 				else
 					$this->version = 1;

Braces +21 added lines, -17 removed lines

@@ -52,18 +52,20 @@ 
 
 	public function setSize($size)
 	{
-		if($this->get_version() > 1)
-			$position = strrpos($this->file, '-v');
-		else
-			$position = strrpos($this->file, '.');
+		if($this->get_version() > 1) {

+					$position = strrpos($this->file, '-v');

+		} else {

+					$position = strrpos($this->file, '.');

+		}

 		
 		$this->file = substr($this->file, 0, $position) . '-s' . $size . substr($this->file, $position);
 	}
 
 	public function getDimensions()
 	{
-		if(!$this->isValid())
-			return false;
+		if(!$this->isValid()) {

+					return false;

+		}

 		$imageinfo = getimagesize($this->getInternalPath());
 		return array($imageinfo[0], $imageinfo[1]);
 	}
@@ -85,10 +87,11 @@ 
 
 	private function get_image($image)
 	{
-		if(preg_match(self::$VERSION_PREG_MATCH, $image))
-			return preg_replace(self::$VERSION_PREG_MATCH, '', $image);
-		else
-			return $image;
+		if(preg_match(self::$VERSION_PREG_MATCH, $image)) {

+					return preg_replace(self::$VERSION_PREG_MATCH, '', $image);

+		} else {

+					return $image;

+		}

 	}
 
 	private function get_image_meta($image)
@@ -103,9 +106,9 @@ 
 		{
 			$position = strrpos($image, '.');
 			return substr($image, 0, $position) . '-v' . $this->get_version() . substr($image, $position);
-		}
-		else
-			return $image;
+		} else {

+					return $image;

+		}

 	}
 
 	private $version;
@@ -118,10 +121,11 @@ 
 			if(count($files) > 0)
 			{
 				preg_match(self::$VERSION_PREG_MATCH, $files[0], $matches);
-				if(count($matches))
-					$this->version = $matches[1];
-				else
-					$this->version = 1;
+				if(count($matches)) {

+									$this->version = $matches[1];

+				} else {

+									$this->version = 1;

+				}

 			}
 		}
 		return $this->version;

utility/content/AcceptableContent.class.inc.php

Spacing +3 added lines, -3 removed lines

@@ -9,9 +9,9 @@ 
 	protected function execute()
 	{
 		$is_acceptable = true;
-		foreach($this->getUnacceptableWords() as $unacceptableWord)
+		foreach ($this->getUnacceptableWords() as $unacceptableWord)
 		{
-			if(stristr($unacceptableWord->word, $this->content))
+			if (stristr($unacceptableWord->word, $this->content))
 				$is_acceptable = false;
 		}
 		return $is_acceptable;
@@ -20,7 +20,7 @@ 
 	private $unacceptableWords;
 	private function getUnacceptableWords()
 	{
-		if(!$this->unacceptableWords)
+		if (!$this->unacceptableWords)
 			$this->unacceptableWords = UnacceptableWordCollector::getWords();
 		return $this->unacceptableWords;
 	}

Braces +6 added lines, -4 removed lines

@@ -11,8 +11,9 @@ 
 		$is_acceptable = true;
 		foreach($this->getUnacceptableWords() as $unacceptableWord)
 		{
-			if(stristr($unacceptableWord->word, $this->content))
-				$is_acceptable = false;
+			if(stristr($unacceptableWord->word, $this->content)) {

+							$is_acceptable = false;

+			}

 		}
 		return $is_acceptable;
 	}
@@ -20,8 +21,9 @@ 
 	private $unacceptableWords;
 	private function getUnacceptableWords()
 	{
-		if(!$this->unacceptableWords)
-			$this->unacceptableWords = UnacceptableWordCollector::getWords();
+		if(!$this->unacceptableWords) {

+					$this->unacceptableWords = UnacceptableWordCollector::getWords();

+		}

 		return $this->unacceptableWords;
 	}
 

utility/content/ImperialUnitContent.class.inc.php

Indentation +46 added lines, -46 removed lines

@@ -5,56 +5,56 @@
 final class ImperialUnitContent extends Content
 {
 
-    protected function execute($type = '')
-    {
-        $number = floatval($this->content);
-        $number *= 39.37; // convert to inches
+	protected function execute($type = '')
+	{
+		$number = floatval($this->content);
+		$number *= 39.37; // convert to inches
         
-        if ($type == '') {
-            if ($number > (12 * 3 * 1760 * 5)) {
-                $type = 'full miles';
-            } else if ($number > (12 * 3 * 1760 * .5)) {
-                $type = 'tenth miles';
-            } else if ($number > (12 * 3 * 150)) {
-                $type = 'yards';
-            } else if ($number > (12 * 10)) {
-                $type = 'feet';
-            } else {
-                $type = 'inches';
-            }
-        }
+		if ($type == '') {
+			if ($number > (12 * 3 * 1760 * 5)) {
+				$type = 'full miles';
+			} else if ($number > (12 * 3 * 1760 * .5)) {
+				$type = 'tenth miles';
+			} else if ($number > (12 * 3 * 150)) {
+				$type = 'yards';
+			} else if ($number > (12 * 10)) {
+				$type = 'feet';
+			} else {
+				$type = 'inches';
+			}
+		}
         
-        switch ($type) {
-            case 'full miles' :
-                $this->content = number_format(round($number / (12 * 3 * 1760))) . ' miles';
-                break;
-            case 'tenth miles' :
-                $this->content = round($number / (12 * 3 * 1760), 1) . ' miles';
-                break;
-            case 'yards' :
-                $this->content = number_format(round($number / (12 * 3))) . ' yards';
-                break;
-            case 'feet' :
-                $this->content = number_format(round($number / 12)) . "'";
-                break;
-            case 'inches' :
-                $feet = floor($number / 12);
+		switch ($type) {
+			case 'full miles' :
+				$this->content = number_format(round($number / (12 * 3 * 1760))) . ' miles';
+				break;
+			case 'tenth miles' :
+				$this->content = round($number / (12 * 3 * 1760), 1) . ' miles';
+				break;
+			case 'yards' :
+				$this->content = number_format(round($number / (12 * 3))) . ' yards';
+				break;
+			case 'feet' :
+				$this->content = number_format(round($number / 12)) . "'";
+				break;
+			case 'inches' :
+				$feet = floor($number / 12);
                 
-                $inches = $number - $feet * 12;
-                $inches = round($inches);
+				$inches = $number - $feet * 12;
+				$inches = round($inches);
                 
-                if ($inches == 12) {
-                    $feet++;
-                    $inches = 0;
-                }
+				if ($inches == 12) {
+					$feet++;
+					$inches = 0;
+				}
                 
-                $this->content = '';
-                $this->content .= number_format($feet) . "'";
-                if (isset($inches) && $inches > 0) {
-                    $this->content .= " {$inches}\"";
-                }
-                break;
-        }
-    }
+				$this->content = '';
+				$this->content .= number_format($feet) . "'";
+				if (isset($inches) && $inches > 0) {
+					$this->content .= " {$inches}\"";
+				}
+				break;
+		}
+	}
 
 }
\ No newline at end of file

utility/content/FixImageContent.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 	protected function execute($is_absolute = false)
 	{
 		preg_match_all(self::$IMAGE_PLACEHOLDER_MATCH, $this->content, $matches);
-		foreach($matches[1] as $key => $match)
+		foreach ($matches[1] as $key => $match)
 		{
 			$image_path = $this->get_file_path($match);
 			$this->content = str_replace($matches[0][$key], $image_path, $this->content);

utility/content/FixUnacceptableCharacterContent.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -11,9 +11,9 @@
 
 	protected function execute()
 	{
-		foreach(self::$UNACCEPTABLE_CHARACTER_ARRAY as $match => $replace)
+		foreach (self::$UNACCEPTABLE_CHARACTER_ARRAY as $match => $replace)
 		{
-			if(stristr($this->content, $match))
+			if (stristr($this->content, $match))
 				$this->content = str_replace($match, $replace, $this->content);
 		}
 		return;

Braces +3 added lines, -2 removed lines

@@ -13,8 +13,9 @@
 	{
 		foreach(self::$UNACCEPTABLE_CHARACTER_ARRAY as $match => $replace)
 		{
-			if(stristr($this->content, $match))
-				$this->content = str_replace($match, $replace, $this->content);
+			if(stristr($this->content, $match)) {

+							$this->content = str_replace($match, $replace, $this->content);

+			}

 		}
 		return;
 	}

utility/content/AutolinkTwitterHashContent.class.inc.php

Spacing +4 added lines, -4 removed lines

@@ -10,12 +10,12 @@ 
 
 	protected function execute()
 	{
-		if(stristr($this->content, '#') === false)
+		if (stristr($this->content, '#') === false)
 			return;
 		
 		// yeah yeah, i'm currently ignoring the link, whatevs
 		$parameters = func_get_args();
-		if(count($parameters) > 1 || (count($parameters) == 1 && !is_array($parameters[0])))
+		if (count($parameters) > 1 || (count($parameters) == 1 && !is_array($parameters[0])))
 		{
 			trigger_error('Unexpected parameters passed into AutolinkTwitterHash!');
 			return;
@@ -23,10 +23,10 @@ 
 		$parameters = array_shift($parameters);
 		
 		$found_hash = preg_match_all(self::$HASH_PATTERN, $this->content, $matches, PREG_SET_ORDER);
-		if($found_hash === false || $found_hash === 0)
+		if ($found_hash === false || $found_hash === 0)
 			return;
 		
-		foreach($matches as $match)
+		foreach ($matches as $match)
 		{
 			$replacement = $this->get_replacement_link($match[1], $match[0]);
 			$this->content = str_replace($match[0], $replacement, $this->content);

Braces +6 added lines, -4 removed lines

@@ -10,8 +10,9 @@ 
 
 	protected function execute()
 	{
-		if(stristr($this->content, '#') === false)
-			return;
+		if(stristr($this->content, '#') === false) {

+					return;

+		}

 		
 		// yeah yeah, i'm currently ignoring the link, whatevs
 		$parameters = func_get_args();
@@ -23,8 +24,9 @@ 
 		$parameters = array_shift($parameters);
 		
 		$found_hash = preg_match_all(self::$HASH_PATTERN, $this->content, $matches, PREG_SET_ORDER);
-		if($found_hash === false || $found_hash === 0)
-			return;
+		if($found_hash === false || $found_hash === 0) {

+					return;

+		}

 		
 		foreach($matches as $match)
 		{

utility/content/ElapsedTimeContent.class.inc.php

Spacing +28 added lines, -28 removed lines

@@ -10,61 +10,61 @@
 		$previous_time = strtotime($this->content);
 		$current_time = time();
 		
-		if($current_time <= $previous_time)
+		if ($current_time <= $previous_time)
 			$this->content = 'few seconds ago';
-		else if(($current_time - $previous_time) < 30)
+		else if (($current_time - $previous_time) < 30)
 			$this->content = 'few seconds ago';
-		else if(($current_time - $previous_time) < 1.5 * 60)
+		else if (($current_time - $previous_time) < 1.5 * 60)
 			$this->content = 'a minute ago';
-		else if(($current_time - $previous_time) < 4 * 60)
+		else if (($current_time - $previous_time) < 4 * 60)
 			$this->content = 'few minutes ago';
-		else if(($current_time - $previous_time) < 7 * 60)
+		else if (($current_time - $previous_time) < 7 * 60)
 			$this->content = 'five minutes ago';
-		else if(($current_time - $previous_time) < 12 * 60)
+		else if (($current_time - $previous_time) < 12 * 60)
 			$this->content = 'ten minutes ago';
-		else if(($current_time - $previous_time) < 17 * 60)
+		else if (($current_time - $previous_time) < 17 * 60)
 			$this->content = 'fifteen minutes ago';
-		else if(($current_time - $previous_time) < 22 * 60)
+		else if (($current_time - $previous_time) < 22 * 60)
 			$this->content = 'twenty minutes ago';
-		else if(($current_time - $previous_time) < 37 * 60)
+		else if (($current_time - $previous_time) < 37 * 60)
 			$this->content = 'half hour ago';
-		else if(($current_time - $previous_time) < 52 * 60)
+		else if (($current_time - $previous_time) < 52 * 60)
 			$this->content = 'forty-five minutes ago';
-		else if(($current_time - $previous_time) < 1.5 * 60 * 60)
+		else if (($current_time - $previous_time) < 1.5 * 60 * 60)
 			$this->content = 'an hour ago';
-		else if(($current_time - $previous_time) < 2.5 * 60 * 60)
+		else if (($current_time - $previous_time) < 2.5 * 60 * 60)
 			$this->content = 'two hours ago';
-		else if(($current_time - $previous_time) < 3.5 * 60 * 60)
+		else if (($current_time - $previous_time) < 3.5 * 60 * 60)
 			$this->content = 'three hours ago';
-		else if(($current_time - $previous_time) < 4.5 * 60 * 60)
+		else if (($current_time - $previous_time) < 4.5 * 60 * 60)
 			$this->content = 'few hours ago';
-		else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'pm')
+		else if (($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'pm')
 			$this->content = 'this afternoon';
-		else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'am')
+		else if (($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'am')
 			$this->content = 'this morning';
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm' && date('G', $previous_time) >= 17)
+		else if (($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm' && date('G', $previous_time) >= 17)
 			$this->content = 'yesterday evening';
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm')
+		else if (($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm')
 			$this->content = 'yesterday afternoon';
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'am')
+		else if (($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'am')
 			$this->content = 'yesterday morning';
-		else if(($current_time - $previous_time) < 3 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 2)
+		else if (($current_time - $previous_time) < 3 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 2)
 			$this->content = 'two days ago';
-		else if(($current_time - $previous_time) < 4 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 3)
+		else if (($current_time - $previous_time) < 4 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 3)
 			$this->content = 'three days ago';
-		else if(($current_time - $previous_time) < 1 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time))
+		else if (($current_time - $previous_time) < 1 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time))
 			$this->content = 'earlier this week';
-		else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1 && date('w', $previous_time) >= 3)
+		else if (($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1 && date('w', $previous_time) >= 3)
 			$this->content = 'late last week';
-		else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1)
+		else if (($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1)
 			$this->content = 'early last week';
-		else if(($current_time - $previous_time) < 3 * 7 * 24 * 60 * 60)
+		else if (($current_time - $previous_time) < 3 * 7 * 24 * 60 * 60)
 			$this->content = 'few weeks ago';
-		else if(($current_time - $previous_time) < 1.25* 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time))
+		else if (($current_time - $previous_time) < 1.25 * 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time))
 			$this->content = 'earlier this month';
-		else if(($current_time - $previous_time) < 2 * 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time) + 1)
+		else if (($current_time - $previous_time) < 2 * 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time) + 1)
 			$this->content = 'last month';
-		else if(($current_time - $previous_time) < 4 * 4 * 7 * 24 * 60 * 60)
+		else if (($current_time - $previous_time) < 4 * 4 * 7 * 24 * 60 * 60)
 			$this->content = 'several months ago';
 		else
 			$this->content = 'long ago';

Braces +59 added lines, -58 removed lines

@@ -10,64 +10,65 @@
 		$previous_time = strtotime($this->content);
 		$current_time = time();
 		
-		if($current_time <= $previous_time)
-			$this->content = 'few seconds ago';
-		else if(($current_time - $previous_time) < 30)
-			$this->content = 'few seconds ago';
-		else if(($current_time - $previous_time) < 1.5 * 60)
-			$this->content = 'a minute ago';
-		else if(($current_time - $previous_time) < 4 * 60)
-			$this->content = 'few minutes ago';
-		else if(($current_time - $previous_time) < 7 * 60)
-			$this->content = 'five minutes ago';
-		else if(($current_time - $previous_time) < 12 * 60)
-			$this->content = 'ten minutes ago';
-		else if(($current_time - $previous_time) < 17 * 60)
-			$this->content = 'fifteen minutes ago';
-		else if(($current_time - $previous_time) < 22 * 60)
-			$this->content = 'twenty minutes ago';
-		else if(($current_time - $previous_time) < 37 * 60)
-			$this->content = 'half hour ago';
-		else if(($current_time - $previous_time) < 52 * 60)
-			$this->content = 'forty-five minutes ago';
-		else if(($current_time - $previous_time) < 1.5 * 60 * 60)
-			$this->content = 'an hour ago';
-		else if(($current_time - $previous_time) < 2.5 * 60 * 60)
-			$this->content = 'two hours ago';
-		else if(($current_time - $previous_time) < 3.5 * 60 * 60)
-			$this->content = 'three hours ago';
-		else if(($current_time - $previous_time) < 4.5 * 60 * 60)
-			$this->content = 'few hours ago';
-		else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'pm')
-			$this->content = 'this afternoon';
-		else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'am')
-			$this->content = 'this morning';
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm' && date('G', $previous_time) >= 17)
-			$this->content = 'yesterday evening';
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm')
-			$this->content = 'yesterday afternoon';
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'am')
-			$this->content = 'yesterday morning';
-		else if(($current_time - $previous_time) < 3 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 2)
-			$this->content = 'two days ago';
-		else if(($current_time - $previous_time) < 4 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 3)
-			$this->content = 'three days ago';
-		else if(($current_time - $previous_time) < 1 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time))
-			$this->content = 'earlier this week';
-		else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1 && date('w', $previous_time) >= 3)
-			$this->content = 'late last week';
-		else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1)
-			$this->content = 'early last week';
-		else if(($current_time - $previous_time) < 3 * 7 * 24 * 60 * 60)
-			$this->content = 'few weeks ago';
-		else if(($current_time - $previous_time) < 1.25* 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time))
-			$this->content = 'earlier this month';
-		else if(($current_time - $previous_time) < 2 * 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time) + 1)
-			$this->content = 'last month';
-		else if(($current_time - $previous_time) < 4 * 4 * 7 * 24 * 60 * 60)
-			$this->content = 'several months ago';
-		else
-			$this->content = 'long ago';
+		if($current_time <= $previous_time) {

+					$this->content = 'few seconds ago';

+		} else if(($current_time - $previous_time) < 30) {

+					$this->content = 'few seconds ago';

+		} else if(($current_time - $previous_time) < 1.5 * 60) {

+					$this->content = 'a minute ago';

+		} else if(($current_time - $previous_time) < 4 * 60) {

+					$this->content = 'few minutes ago';

+		} else if(($current_time - $previous_time) < 7 * 60) {

+					$this->content = 'five minutes ago';

+		} else if(($current_time - $previous_time) < 12 * 60) {

+					$this->content = 'ten minutes ago';

+		} else if(($current_time - $previous_time) < 17 * 60) {

+					$this->content = 'fifteen minutes ago';

+		} else if(($current_time - $previous_time) < 22 * 60) {

+					$this->content = 'twenty minutes ago';

+		} else if(($current_time - $previous_time) < 37 * 60) {

+					$this->content = 'half hour ago';

+		} else if(($current_time - $previous_time) < 52 * 60) {

+					$this->content = 'forty-five minutes ago';

+		} else if(($current_time - $previous_time) < 1.5 * 60 * 60) {

+					$this->content = 'an hour ago';

+		} else if(($current_time - $previous_time) < 2.5 * 60 * 60) {

+					$this->content = 'two hours ago';

+		} else if(($current_time - $previous_time) < 3.5 * 60 * 60) {

+					$this->content = 'three hours ago';

+		} else if(($current_time - $previous_time) < 4.5 * 60 * 60) {

+					$this->content = 'few hours ago';

+		} else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'pm') {

+					$this->content = 'this afternoon';

+		} else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'am') {

+					$this->content = 'this morning';

+		} else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm' && date('G', $previous_time) >= 17) {

+					$this->content = 'yesterday evening';

+		} else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm') {

+					$this->content = 'yesterday afternoon';

+		} else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'am') {

+					$this->content = 'yesterday morning';

+		} else if(($current_time - $previous_time) < 3 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 2) {

+					$this->content = 'two days ago';

+		} else if(($current_time - $previous_time) < 4 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 3) {

+					$this->content = 'three days ago';

+		} else if(($current_time - $previous_time) < 1 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time)) {

+					$this->content = 'earlier this week';

+		} else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1 && date('w', $previous_time) >= 3) {

+					$this->content = 'late last week';

+		} else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1) {

+					$this->content = 'early last week';

+		} else if(($current_time - $previous_time) < 3 * 7 * 24 * 60 * 60) {

+					$this->content = 'few weeks ago';

+		} else if(($current_time - $previous_time) < 1.25* 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time)) {

+					$this->content = 'earlier this month';

+		} else if(($current_time - $previous_time) < 2 * 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time) + 1) {

+					$this->content = 'last month';

+		} else if(($current_time - $previous_time) < 4 * 4 * 7 * 24 * 60 * 60) {

+					$this->content = 'several months ago';

+		} else {

+					$this->content = 'long ago';

+		}

 	}
 
 }
\ No newline at end of file

utility/content/AutolinkTwitterUserContent.class.inc.php

Spacing +4 added lines, -4 removed lines

@@ -10,12 +10,12 @@ 
 
 	protected function execute()
 	{
-		if(stristr($this->content, '@') === false)
+		if (stristr($this->content, '@') === false)
 			return;
 		
 		// yeah yeah, i'm currently ignoring the link, whatevs
 		$parameters = func_get_args();
-		if(count($parameters) > 1 || (count($parameters) == 1 && !is_array($parameters[0])))
+		if (count($parameters) > 1 || (count($parameters) == 1 && !is_array($parameters[0])))
 		{
 			trigger_error('Unexpected parameters passed into AutolinkTwitterUser!');
 			return;
@@ -23,10 +23,10 @@ 
 		$parameters = array_shift($parameters);
 		
 		$found_user = preg_match_all(self::$USER_PATTERN, $this->content, $matches, PREG_SET_ORDER);
-		if($found_user === false || $found_user === 0)
+		if ($found_user === false || $found_user === 0)
 			return;
 		
-		foreach($matches as $match)
+		foreach ($matches as $match)
 		{
 			$replacement = $this->get_replacement_link($match[1], $match[0]);
 			$this->content = str_replace($match[0], $replacement, $this->content);

Braces +6 added lines, -4 removed lines

@@ -10,8 +10,9 @@ 
 
 	protected function execute()
 	{
-		if(stristr($this->content, '@') === false)
-			return;
+		if(stristr($this->content, '@') === false) {

+					return;

+		}

 		
 		// yeah yeah, i'm currently ignoring the link, whatevs
 		$parameters = func_get_args();
@@ -23,8 +24,9 @@ 
 		$parameters = array_shift($parameters);
 		
 		$found_user = preg_match_all(self::$USER_PATTERN, $this->content, $matches, PREG_SET_ORDER);
-		if($found_user === false || $found_user === 0)
-			return;
+		if($found_user === false || $found_user === 0) {

+					return;

+		}

 		
 		foreach($matches as $match)
 		{