jacobemerick / web

controller/site/DefaultPageController.class.inc.php

Spacing +4 added lines, -4 removed lines

@@ -41,7 +41,7 @@ 
 		$active_page = $this->get_active_page();
 		
 		$menu = array();
-		foreach(self::$MENU as $item)
+		foreach (self::$MENU as $item)
 		{
 			$menu[] = (object) array(
 				'name' => $item['name'],
@@ -56,13 +56,13 @@ 
 	{
 		$current_uri = URLDecode::getPiece(1);
 		
-		if(!isset($current_uri))
+		if (!isset($current_uri))
 			return 'About';
 		
 		$menu = self::$MENU;
-		foreach($menu as $link)
+		foreach ($menu as $link)
 		{
-			if($link['uri'] == $current_uri)
+			if ($link['uri'] == $current_uri)
 				return $link['name'];
 		}
 		

Indentation +52 added lines, -52 removed lines

@@ -5,68 +5,68 @@
 abstract class DefaultPageController extends PageController
 {
 
-	private static $MENU = array(
-		array(
-			'name' => 'About',
-			'uri' => ''),
-		array(
-			'name' => 'Terms',
-			'uri' => 'terms'),
-		array(
-			'name' => 'Change Log',
-			'uri' => 'change-log'),
-		array(
-			'name' => 'Contact',
-			'uri' => 'contact'));
+    private static $MENU = array(
+        array(
+            'name' => 'About',
+            'uri' => ''),
+        array(
+            'name' => 'Terms',
+            'uri' => 'terms'),
+        array(
+            'name' => 'Change Log',
+            'uri' => 'change-log'),
+        array(
+            'name' => 'Contact',
+            'uri' => 'contact'));
 
-	protected function set_head_data()
-	{
-		$this->add_css('reset');
-		$this->add_css('site');
-	}
+    protected function set_head_data()
+    {
+        $this->add_css('reset');
+        $this->add_css('site');
+    }
 
-	protected function set_body_data()
-	{
-		$this->set_body('top_data', array());
-		$this->set_body('body_data', array());
+    protected function set_body_data()
+    {
+        $this->set_body('top_data', array());
+        $this->set_body('body_data', array());
 		
-		$this->set_body('left_side_data', array('menu' => $this->get_menu()));
+        $this->set_body('left_side_data', array('menu' => $this->get_menu()));
 		
-		$this->set_body('activity_array', $this->get_recent_activity());
-		$this->set_body_view('Page');
-	}
+        $this->set_body('activity_array', $this->get_recent_activity());
+        $this->set_body_view('Page');
+    }
 
-	private function get_menu()
-	{
-		$active_page = $this->get_active_page();
+    private function get_menu()
+    {
+        $active_page = $this->get_active_page();
 		
-		$menu = array();
-		foreach(self::$MENU as $item)
-		{
-			$menu[] = (object) array(
-				'name' => $item['name'],
-				'uri' => (strlen($item['uri']) > 0) ? "/{$item['uri']}/" : '/',
-				'is_active' => ($item['name'] == $active_page));
-		}
+        $menu = array();
+        foreach(self::$MENU as $item)
+        {
+            $menu[] = (object) array(
+                'name' => $item['name'],
+                'uri' => (strlen($item['uri']) > 0) ? "/{$item['uri']}/" : '/',
+                'is_active' => ($item['name'] == $active_page));
+        }
 		
-		return $menu;
-	}
+        return $menu;
+    }
 
-	private function get_active_page()
-	{
-		$current_uri = URLDecode::getPiece(1);
+    private function get_active_page()
+    {
+        $current_uri = URLDecode::getPiece(1);
 		
-		if(!isset($current_uri))
-			return 'About';
+        if(!isset($current_uri))
+            return 'About';
 		
-		$menu = self::$MENU;
-		foreach($menu as $link)
-		{
-			if($link['uri'] == $current_uri)
-				return $link['name'];
-		}
+        $menu = self::$MENU;
+        foreach($menu as $link)
+        {
+            if($link['uri'] == $current_uri)
+                return $link['name'];
+        }
 		
-		return 'About';
-	}
+        return 'About';
+    }
 
 }

Braces +16 added lines, -14 removed lines

@@ -2,8 +2,8 @@ 
 
 Loader::load('controller', '/PageController');
 
-abstract class DefaultPageController extends PageController
-{
+abstract class DefaultPageController extends PageController

+{

 
 	private static $MENU = array(
 		array(
@@ -19,14 +19,14 @@ 
 			'name' => 'Contact',
 			'uri' => 'contact'));
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		$this->add_css('reset');
 		$this->add_css('site');
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body('top_data', array());
 		$this->set_body('body_data', array());
 		
@@ -36,8 +36,8 @@ 
 		$this->set_body_view('Page');
 	}
 
-	private function get_menu()
-	{
+	private function get_menu()

+	{

 		$active_page = $this->get_active_page();
 		
 		$menu = array();
@@ -52,18 +52,20 @@ 
 		return $menu;
 	}
 
-	private function get_active_page()
-	{
+	private function get_active_page()

+	{

 		$current_uri = URLDecode::getPiece(1);
 		
-		if(!isset($current_uri))
-			return 'About';
+		if(!isset($current_uri)) {

+					return 'About';

+		}

 		
 		$menu = self::$MENU;
 		foreach($menu as $link)
 		{
-			if($link['uri'] == $current_uri)
-				return $link['name'];
+			if($link['uri'] == $current_uri) {

+							return $link['name'];

+			}

 		}
 		
 		return 'About';

controller/site/ChangelogController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 		Loader::load('collector', 'data/ChangelogCollector');
 		$changelog_result = ChangelogCollector::getLast20Changes();
 		
-		foreach($changelog_result as $change)
+		foreach ($changelog_result as $change)
 		{
 			$changelog[] = (object) array(
 				'date' => (object) array(

Indentation +27 added lines, -27 removed lines

@@ -7,42 +7,42 @@
 final class ChangelogController extends DefaultPageController
 {
 
-	protected function set_head_data()
-	{
-		$this->set_title("Changelog for Jacob Emerick's Sites");
-		$this->set_description("Listing of the last changes done on the framework behind Jacob Emerick's websites. Yeah, he's down with that version control.");
-		$this->set_keywords(array('changelog', 'version control', 'code', 'comments', 'Jacob Emerick'));
+    protected function set_head_data()
+    {
+        $this->set_title("Changelog for Jacob Emerick's Sites");
+        $this->set_description("Listing of the last changes done on the framework behind Jacob Emerick's websites. Yeah, he's down with that version control.");
+        $this->set_keywords(array('changelog', 'version control', 'code', 'comments', 'Jacob Emerick'));
 		
-		parent::set_head_data();
-	}
+        parent::set_head_data();
+    }
 
-	protected function set_body_data()
-	{
-		parent::set_body_data();
+    protected function set_body_data()
+    {
+        parent::set_body_data();
 		
-		$this->set_body('top_data', array('title' => 'Change Log'));
+        $this->set_body('top_data', array('title' => 'Change Log'));
 		
-		$this->set_body('body_data', $this->get_changelog());
-		$this->set_body('body_view', 'Changelog');
-	}
+        $this->set_body('body_data', $this->get_changelog());
+        $this->set_body('body_view', 'Changelog');
+    }
 
-	private function get_changelog()
-	{
+    private function get_changelog()
+    {
     global $container;
     $changelogRepository = new MysqlChangelogRepository($container['db_connection_locator']);
     $changelog_result = $changelogRepository->getChanges(40);
 		
-		foreach($changelog_result as $change)
-		{
-			$changelog[] = (object) array(
-				'date' => (object) array(
-					'stamp' => date('c', strtotime($change['datetime'])),
-					'short' => date('M j', strtotime($change['datetime'])),
-					'friendly' => date('F j, Y g:i A', strtotime($change['datetime']))),
-				'message' => $change['message_short']);
-		}
+        foreach($changelog_result as $change)
+        {
+            $changelog[] = (object) array(
+                'date' => (object) array(
+                    'stamp' => date('c', strtotime($change['datetime'])),
+                    'short' => date('M j', strtotime($change['datetime'])),
+                    'friendly' => date('F j, Y g:i A', strtotime($change['datetime']))),
+                'message' => $change['message_short']);
+        }
 		
-		return array('changelog' => $changelog);
-	}
+        return array('changelog' => $changelog);
+    }
 
 }

Braces +8 added lines, -8 removed lines

@@ -4,11 +4,11 @@ 
 
 Loader::load('controller', 'site/DefaultPageController');
 
-final class ChangelogController extends DefaultPageController
-{
+final class ChangelogController extends DefaultPageController

+{

 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		$this->set_title("Changelog for Jacob Emerick's Sites");
 		$this->set_description("Listing of the last changes done on the framework behind Jacob Emerick's websites. Yeah, he's down with that version control.");
 		$this->set_keywords(array('changelog', 'version control', 'code', 'comments', 'Jacob Emerick'));
@@ -16,8 +16,8 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		parent::set_body_data();
 		
 		$this->set_body('top_data', array('title' => 'Change Log'));
@@ -26,8 +26,8 @@ 
 		$this->set_body('body_view', 'Changelog');
 	}
 
-	private function get_changelog()
-	{
+	private function get_changelog()

+	{

     global $container;
     $changelogRepository = new MysqlChangelogRepository($container['db_connection_locator']);
     $changelog_result = $changelogRepository->getChanges(40);

utility/content/FixPhotoContent.class.inc.php

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 	protected function execute($is_absolute = false, $size = 'medium')
 	{
 		preg_match_all(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $matches);
-		foreach($matches[1] as $key => $match)
+		foreach ($matches[1] as $key => $match)
 		{
 			$photo_content = $this->get_photo_content($match, $size, $is_absolute);
 			$this->content = str_replace($matches[0][$key], $photo_content, $this->content);
@@ -37,7 +37,7 @@ 
 		
 		Loader::load('collector', 'image/PhotoCollector');
 		$photo_result = PhotoCollector::fetchRow($category, $photo);
-		if($photo_result == false)
+		if ($photo_result == false)
 			return '';
 		
 		$height = $file_size[1];
@@ -49,7 +49,7 @@ 
         }
 		
 		$domain = '/';
-		if($is_absolute)
+		if ($is_absolute)
 			$domain = Loader::getRootUrl('blog');
 		
 		return sprintf(self::$PHOTO_CONTENT, $domain, $category, $photo, $size, $height, $width, $description, $description);

Indentation +36 added lines, -36 removed lines

@@ -5,50 +5,50 @@
 final class FixPhotoContent extends Content
 {
 
-	private static $PHOTO_PLACEHOLDER_MATCH = '@{{photo="(.*)"}}@';
-	private static $ERROR_CONTENT = '<div class="photo-holder"><p class="photo-caption">Image (%s) could not be found!</p></div>';
-	private static $PHOTO_CONTENT = '<div class="photo-holder"><img src="%sphoto/%s/%s-size-%s.jpg" height="%d" width="%d" alt="%s" /><p class="photo-caption">%s</p></div>';
+    private static $PHOTO_PLACEHOLDER_MATCH = '@{{photo="(.*)"}}@';
+    private static $ERROR_CONTENT = '<div class="photo-holder"><p class="photo-caption">Image (%s) could not be found!</p></div>';
+    private static $PHOTO_CONTENT = '<div class="photo-holder"><img src="%sphoto/%s/%s-size-%s.jpg" height="%d" width="%d" alt="%s" /><p class="photo-caption">%s</p></div>';
 
-	protected function execute($is_absolute = false, $size = 'medium')
-	{
-		preg_match_all(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $matches);
-		foreach($matches[1] as $key => $match)
-		{
-			$photo_content = $this->get_photo_content($match, $size, $is_absolute);
-			$this->content = str_replace($matches[0][$key], $photo_content, $this->content);
-		}
-		return;
-	}
+    protected function execute($is_absolute = false, $size = 'medium')
+    {
+        preg_match_all(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $matches);
+        foreach($matches[1] as $key => $match)
+        {
+            $photo_content = $this->get_photo_content($match, $size, $is_absolute);
+            $this->content = str_replace($matches[0][$key], $photo_content, $this->content);
+        }
+        return;
+    }
 
-	private function get_file_path($category, $photo, $size, $extension)
-	{
-		$path = "{$category}/{$photo}-size-{$size}.{$extension}";
-		return Loader::getImagePath('photo', $path);
-	}
+    private function get_file_path($category, $photo, $size, $extension)
+    {
+        $path = "{$category}/{$photo}-size-{$size}.{$extension}";
+        return Loader::getImagePath('photo', $path);
+    }
 
-	private function get_photo_content($string, $size, $is_absolute)
-	{
-		list($category, $file_name) = explode('/', $string);
-		list($photo, $extension) = explode('.', $file_name);
+    private function get_photo_content($string, $size, $is_absolute)
+    {
+        list($category, $file_name) = explode('/', $string);
+        list($photo, $extension) = explode('.', $file_name);
 		
-		$file_path = $this->get_file_path($category, $photo, $size, $extension);
+        $file_path = $this->get_file_path($category, $photo, $size, $extension);
 		
-		$file_size = getimagesize($file_path);
+        $file_size = getimagesize($file_path);
 		
-		Loader::load('collector', 'image/PhotoCollector');
-		$photo_result = PhotoCollector::fetchRow($category, $photo);
-		if($photo_result == false)
-			return '';
+        Loader::load('collector', 'image/PhotoCollector');
+        $photo_result = PhotoCollector::fetchRow($category, $photo);
+        if($photo_result == false)
+            return '';
 		
-		$height = $file_size[1];
-		$width = $file_size[0];
-		$description = $photo_result->description;
+        $height = $file_size[1];
+        $width = $file_size[0];
+        $description = $photo_result->description;
         
-		$domain = '/';
-		if($is_absolute)
-			$domain = Loader::getRootUrl('blog');
+        $domain = '/';
+        if($is_absolute)
+            $domain = Loader::getRootUrl('blog');
 		
-		return sprintf(self::$PHOTO_CONTENT, $domain, $category, $photo, $size, $height, $width, $description, $description);
-	}
+        return sprintf(self::$PHOTO_CONTENT, $domain, $category, $photo, $size, $height, $width, $description, $description);
+    }
 
 }

Braces +14 added lines, -12 removed lines

@@ -2,15 +2,15 @@ 
 
 Loader::load('utility', 'Content');
 
-final class FixPhotoContent extends Content
-{
+final class FixPhotoContent extends Content

+{

 
 	private static $PHOTO_PLACEHOLDER_MATCH = '@{{photo="(.*)"}}@';
 	private static $ERROR_CONTENT = '<div class="photo-holder"><p class="photo-caption">Image (%s) could not be found!</p></div>';
 	private static $PHOTO_CONTENT = '<div class="photo-holder"><img src="%sphoto/%s/%s-size-%s.jpg" height="%d" width="%d" alt="%s" /><p class="photo-caption">%s</p></div>';
 
-	protected function execute($is_absolute = false, $size = 'medium')
-	{
+	protected function execute($is_absolute = false, $size = 'medium')

+	{

 		preg_match_all(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $matches);
 		foreach($matches[1] as $key => $match)
 		{
@@ -20,14 +20,14 @@ 
 		return;
 	}
 
-	private function get_file_path($category, $photo, $size, $extension)
-	{
+	private function get_file_path($category, $photo, $size, $extension)

+	{

 		$path = "{$category}/{$photo}-size-{$size}.{$extension}";
 		return Loader::getImagePath('photo', $path);
 	}
 
-	private function get_photo_content($string, $size, $is_absolute)
-	{
+	private function get_photo_content($string, $size, $is_absolute)

+	{

 		list($category, $file_name) = explode('/', $string);
 		list($photo, $extension) = explode('.', $file_name);
 		
@@ -37,16 +37,18 @@ 
 		
 		Loader::load('collector', 'image/PhotoCollector');
 		$photo_result = PhotoCollector::fetchRow($category, $photo);
-		if($photo_result == false)
-			return '';
+		if($photo_result == false) {

+					return '';

+		}

 		
 		$height = $file_size[1];
 		$width = $file_size[0];
 		$description = $photo_result->description;
         
 		$domain = '/';
-		if($is_absolute)
-			$domain = Loader::getRootUrl('blog');
+		if($is_absolute) {

+					$domain = Loader::getRootUrl('blog');

+		}

 		
 		return sprintf(self::$PHOTO_CONTENT, $domain, $category, $photo, $size, $height, $width, $description, $description);
 	}

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

Indentation +63 added lines, -63 removed lines

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

Braces +63 added lines, -62 removed lines

@@ -2,72 +2,73 @@
 
 Loader::load('utility', 'Content');
 
-final class ElapsedTimeContent extends Content
-{
+final class ElapsedTimeContent extends Content

+{

 
-	protected function execute()
-	{
+	protected function execute()

+	{

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+		} else {

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

+		}

 	}
 
 }
\ No newline at end of file

utility/content/FetchFirstPhotoContent.class.inc.php

Spacing +3 added lines, -3 removed lines

@@ -11,7 +11,7 @@ 
 
 	protected function execute($is_absolute = false, $size = 'thumb')
 	{
-		if(preg_match(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $match) === 1)
+		if (preg_match(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $match) === 1)
 			$this->content = $this->get_thumb($match[1], $is_absolute, $size);
 		else
 			$this->content = self::$DEFAULT_RETURN;
@@ -34,7 +34,7 @@ 
 		
 		Loader::load('collector', 'image/PhotoCollector');
 		$photo_result = PhotoCollector::fetchRow($category, $photo);
-		if($photo_result == false)
+		if ($photo_result == false)
 			return '';
 		
 		$height = $file_size[1];
@@ -42,7 +42,7 @@ 
 		$description = $photo_result->description;
 		
 		$domain = '/';
-		if($is_absolute)
+		if ($is_absolute)
 			$domain = Loader::getRootUrl();
 		
 		return sprintf(self::$IMAGE_NODE, $domain, $category, $photo, $size, $extension, $height, $width, $description);

Indentation +37 added lines, -37 removed lines

@@ -5,47 +5,47 @@
 final class FetchFirstPhotoContent extends Content
 {
 
-	private static $PHOTO_PLACEHOLDER_MATCH = '@{{photo="(.*)"}}@';
-	private static $IMAGE_NODE = '<img src="%sphoto/%s/%s-size-%s.%s" height="%d" width="%d" alt="%s" />';
-	private static $DEFAULT_RETURN = '';
-
-	protected function execute($is_absolute = false, $size = 'thumb')
-	{
-		if(preg_match(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $match) === 1)
-			$this->content = $this->get_thumb($match[1], $is_absolute, $size);
-		else
-			$this->content = self::$DEFAULT_RETURN;
-		return;
-	}
-
-	private function get_file_path($category, $photo, $size, $extension)
-	{
-		$path = "{$category}/{$photo}-size-{$size}.{$extension}";
-		return Loader::getImagePath('photo', $path);
-	}
-
-	private function get_thumb($string, $is_absolute, $size)
-	{
-		list($category, $file_name) = explode('/', $string);
-		list($photo, $extension) = explode('.', $file_name);
+    private static $PHOTO_PLACEHOLDER_MATCH = '@{{photo="(.*)"}}@';
+    private static $IMAGE_NODE = '<img src="%sphoto/%s/%s-size-%s.%s" height="%d" width="%d" alt="%s" />';
+    private static $DEFAULT_RETURN = '';
+
+    protected function execute($is_absolute = false, $size = 'thumb')
+    {
+        if(preg_match(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $match) === 1)
+            $this->content = $this->get_thumb($match[1], $is_absolute, $size);
+        else
+            $this->content = self::$DEFAULT_RETURN;
+        return;
+    }
+
+    private function get_file_path($category, $photo, $size, $extension)
+    {
+        $path = "{$category}/{$photo}-size-{$size}.{$extension}";
+        return Loader::getImagePath('photo', $path);
+    }
+
+    private function get_thumb($string, $is_absolute, $size)
+    {
+        list($category, $file_name) = explode('/', $string);
+        list($photo, $extension) = explode('.', $file_name);
 		
-		$file_path = $this->get_file_path($category, $photo, $size, $extension);
-		$file_size = getimagesize($file_path);
+        $file_path = $this->get_file_path($category, $photo, $size, $extension);
+        $file_size = getimagesize($file_path);
 		
-		Loader::load('collector', 'image/PhotoCollector');
-		$photo_result = PhotoCollector::fetchRow($category, $photo);
-		if($photo_result == false)
-			return '';
+        Loader::load('collector', 'image/PhotoCollector');
+        $photo_result = PhotoCollector::fetchRow($category, $photo);
+        if($photo_result == false)
+            return '';
 		
-		$height = $file_size[1];
-		$width = $file_size[0];
-		$description = $photo_result->description;
+        $height = $file_size[1];
+        $width = $file_size[0];
+        $description = $photo_result->description;
 		
-		$domain = '/';
-		if($is_absolute)
-			$domain = Loader::getRootURL(URLDecode::getSite());
+        $domain = '/';
+        if($is_absolute)
+            $domain = Loader::getRootURL(URLDecode::getSite());
 
-		return sprintf(self::$IMAGE_NODE, $domain, $category, $photo, $size, $extension, $height, $width, $description);
-	}
+        return sprintf(self::$IMAGE_NODE, $domain, $category, $photo, $size, $extension, $height, $width, $description);
+    }
 
 }

Braces +19 added lines, -16 removed lines

@@ -2,30 +2,31 @@ 
 
 Loader::load('utility', 'Content');
 
-final class FetchFirstPhotoContent extends Content
-{
+final class FetchFirstPhotoContent extends Content

+{

 
 	private static $PHOTO_PLACEHOLDER_MATCH = '@{{photo="(.*)"}}@';
 	private static $IMAGE_NODE = '<img src="%sphoto/%s/%s-size-%s.%s" height="%d" width="%d" alt="%s" />';
 	private static $DEFAULT_RETURN = '';
 
-	protected function execute($is_absolute = false, $size = 'thumb')
-	{
-		if(preg_match(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $match) === 1)
-			$this->content = $this->get_thumb($match[1], $is_absolute, $size);
-		else
-			$this->content = self::$DEFAULT_RETURN;
+	protected function execute($is_absolute = false, $size = 'thumb')

+	{

+		if(preg_match(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $match) === 1) {

+					$this->content = $this->get_thumb($match[1], $is_absolute, $size);

+		} else {

+					$this->content = self::$DEFAULT_RETURN;

+		}

 		return;
 	}
 
-	private function get_file_path($category, $photo, $size, $extension)
-	{
+	private function get_file_path($category, $photo, $size, $extension)

+	{

 		$path = "{$category}/{$photo}-size-{$size}.{$extension}";
 		return Loader::getImagePath('photo', $path);
 	}
 
-	private function get_thumb($string, $is_absolute, $size)
-	{
+	private function get_thumb($string, $is_absolute, $size)

+	{

 		list($category, $file_name) = explode('/', $string);
 		list($photo, $extension) = explode('.', $file_name);
 		
@@ -34,16 +35,18 @@ 
 		
 		Loader::load('collector', 'image/PhotoCollector');
 		$photo_result = PhotoCollector::fetchRow($category, $photo);
-		if($photo_result == false)
-			return '';
+		if($photo_result == false) {

+					return '';

+		}

 		
 		$height = $file_size[1];
 		$width = $file_size[0];
 		$description = $photo_result->description;
 		
 		$domain = '/';
-		if($is_absolute)
-			$domain = Loader::getRootURL(URLDecode::getSite());
+		if($is_absolute) {

+					$domain = Loader::getRootURL(URLDecode::getSite());

+		}

 
 		return sprintf(self::$IMAGE_NODE, $domain, $category, $photo, $size, $extension, $height, $width, $description);
 	}

controller/lifestream/DefaultListController.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -56,11 +56,11 @@
 	final private function get_list_posts()
 	{
 		$post_array = array();
-		foreach($this->get_list_results() as $post)
+		foreach ($this->get_list_results() as $post)
 		{
 			$post_array[] = $this->format_post($post, true);
 		}
-		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')
+		if (count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')
 			$this->eject();
 		return $post_array;
 	}

Indentation +48 added lines, -48 removed lines

@@ -5,63 +5,63 @@
 abstract class DefaultListController extends DefaultPageController
 {
 
-	protected static $POSTS_PER_PAGE = 15;
+    protected static $POSTS_PER_PAGE = 15;
 
-	protected $page;
-	protected $offset;
+    protected $page;
+    protected $offset;
 
-	public function __construct()
-	{
-		parent::__construct();
+    public function __construct()
+    {
+        parent::__construct();
 
-		$this->page = $this->get_page_number();
-		$this->offset = ($this->page - 1) * self::$POSTS_PER_PAGE;
-	}
+        $this->page = $this->get_page_number();
+        $this->offset = ($this->page - 1) * self::$POSTS_PER_PAGE;
+    }
 
-	abstract protected function get_page_number();
-	abstract protected function get_list_results();
-	abstract protected function get_list_description();
-	abstract protected function get_list_next_link();
-	abstract protected function get_list_prev_link();
-	abstract protected function get_total_post_count();
+    abstract protected function get_page_number();
+    abstract protected function get_list_results();
+    abstract protected function get_list_description();
+    abstract protected function get_list_next_link();
+    abstract protected function get_list_prev_link();
+    abstract protected function get_total_post_count();
 
-	protected function set_head_data()
-	{
-		parent::set_head_data();
+    protected function set_head_data()
+    {
+        parent::set_head_data();
 		
-		$this->set_head('next_link', $this->get_list_next_link());
-		$this->set_head('previous_link', $this->get_list_prev_link());
-	}
+        $this->set_head('next_link', $this->get_list_next_link());
+        $this->set_head('previous_link', $this->get_list_prev_link());
+    }
 
-	protected function set_body_data()
-	{
-		parent::set_body_data();
+    protected function set_body_data()
+    {
+        parent::set_body_data();
 		
-		$this->set_body('view', 'Listing');
-		$this->set_body('data', $this->get_list_body_data());
-	}
+        $this->set_body('view', 'Listing');
+        $this->set_body('data', $this->get_list_body_data());
+    }
 
-	final private function get_list_body_data()
-	{
-		return array(
-			'posts' => $this->get_list_posts(),
-			'type' => 'list',
-			'pagination' => array(
-				'description' => $this->get_list_description(),
-				'next' => $this->get_list_next_link(),
-				'prev' => $this->get_list_prev_link()));
-	}
+    final private function get_list_body_data()
+    {
+        return array(
+            'posts' => $this->get_list_posts(),
+            'type' => 'list',
+            'pagination' => array(
+                'description' => $this->get_list_description(),
+                'next' => $this->get_list_next_link(),
+                'prev' => $this->get_list_prev_link()));
+    }
 
-	final private function get_list_posts()
-	{
-		$post_array = array();
-		foreach($this->get_list_results() as $post)
-		{
-			$post_array[] = $this->expand_post($post, 'full');
-		}
-		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')
-			$this->eject();
-		return $post_array;
-	}
+    final private function get_list_posts()
+    {
+        $post_array = array();
+        foreach($this->get_list_results() as $post)
+        {
+            $post_array[] = $this->expand_post($post, 'full');
+        }
+        if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')
+            $this->eject();
+        return $post_array;
+    }
 
 }

Braces +15 added lines, -14 removed lines

@@ -2,16 +2,16 @@ 
 
 Loader::load('controller', 'lifestream/DefaultPageController');
 
-abstract class DefaultListController extends DefaultPageController
-{
+abstract class DefaultListController extends DefaultPageController

+{

 
 	protected static $POSTS_PER_PAGE = 15;
 
 	protected $page;
 	protected $offset;
 
-	public function __construct()
-	{
+	public function __construct()

+	{

 		parent::__construct();
 
 		$this->page = $this->get_page_number();
@@ -25,24 +25,24 @@ 
 	abstract protected function get_list_prev_link();
 	abstract protected function get_total_post_count();
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		parent::set_head_data();
 		
 		$this->set_head('next_link', $this->get_list_next_link());
 		$this->set_head('previous_link', $this->get_list_prev_link());
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		parent::set_body_data();
 		
 		$this->set_body('view', 'Listing');
 		$this->set_body('data', $this->get_list_body_data());
 	}
 
-	final private function get_list_body_data()
-	{
+	final private function get_list_body_data()

+	{

 		return array(
 			'posts' => $this->get_list_posts(),
 			'type' => 'list',
@@ -52,15 +52,16 @@ 
 				'prev' => $this->get_list_prev_link()));
 	}
 
-	final private function get_list_posts()
-	{
+	final private function get_list_posts()

+	{

 		$post_array = array();
 		foreach($this->get_list_results() as $post)
 		{
 			$post_array[] = $this->expand_post($post, 'full');
 		}
-		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')
-			$this->eject();
+		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search') {

+					$this->eject();

+		}

 		return $post_array;
 	}
 

controller/lifestream/PostController.class.inc.php

Spacing +5 added lines, -5 removed lines

@@ -20,14 +20,14 @@ 
 		parent::__construct();
 		
 		$id = URLDecode::getPiece(2);
-		if(!$id || !is_numeric($id))
+		if (!$id || !is_numeric($id))
 			$this->eject();
 		
 		$post = $this->postRepository->getPostById($id);
-		if(!$post)
+		if (!$post)
 			$this->eject();
 		
-		if(URLDecode::getPiece(1) != $post['type'])
+		if (URLDecode::getPiece(1) != $post['type'])
 			$this->eject();
 		
 		$this->post = $post;
@@ -59,7 +59,7 @@ 
 
 	private function get_title()
 	{
-		switch($this->post['type'])
+		switch ($this->post['type'])
 		{
 			case 'blog' :
 				return 'Jacob blogged';
@@ -84,7 +84,7 @@ 
 
 	private function get_description()
 	{
-		switch($this->post['type'])
+		switch ($this->post['type'])
 		{
 			case 'blog' :
 				return 'Another awesome blog post from Jacob. Did I mention it was awesome?';

Indentation +90 added lines, -90 removed lines

@@ -5,112 +5,112 @@
 final class PostController extends DefaultPageController
 {
 
-	private static $TITLE = "Post %d | %s Activity | Jacob Emerick's Lifestream";
-	private static $DESCRIPTION = "Post %d of %s activity on Jacob Emerick's Lifestream.";
+    private static $TITLE = "Post %d | %s Activity | Jacob Emerick's Lifestream";
+    private static $DESCRIPTION = "Post %d of %s activity on Jacob Emerick's Lifestream.";
 
-	private static $KEYWORD_ARRAY = array(
-		'lifestream',
-		'activity stream',
-		'Jacob Emerick');
+    private static $KEYWORD_ARRAY = array(
+        'lifestream',
+        'activity stream',
+        'Jacob Emerick');
 
-	private $post;
+    private $post;
 
-	public function __construct()
-	{
-		parent::__construct();
+    public function __construct()
+    {
+        parent::__construct();
 		
-		$id = URLDecode::getPiece(2);
-		if(!$id || !is_numeric($id))
-			$this->eject();
+        $id = URLDecode::getPiece(2);
+        if(!$id || !is_numeric($id))
+            $this->eject();
 		
-		$post = $this->activityRepository->getActivityById($id);
-		if(!$post)
-			$this->eject();
+        $post = $this->activityRepository->getActivityById($id);
+        if(!$post)
+            $this->eject();
 		
-		if(URLDecode::getPiece(1) != $post['type'])
-			$this->eject();
+        if(URLDecode::getPiece(1) != $post['type'])
+            $this->eject();
 		
-		$this->post = $post;
-	}
+        $this->post = $post;
+    }
 
-	protected function set_head_data()
-	{
-		$this->set_title(sprintf(self::$TITLE, $this->post['id'], ucwords($this->post['type'])));
-		$this->set_description(sprintf(self::$DESCRIPTION, $this->post['id'], ucwords($this->post['type'])));
+    protected function set_head_data()
+    {
+        $this->set_title(sprintf(self::$TITLE, $this->post['id'], ucwords($this->post['type'])));
+        $this->set_description(sprintf(self::$DESCRIPTION, $this->post['id'], ucwords($this->post['type'])));
 		
-		$keyword_array = self::$KEYWORD_ARRAY;
-		array_unshift($keyword_array, $this->post['type']);
-		$this->set_keywords($keyword_array);
+        $keyword_array = self::$KEYWORD_ARRAY;
+        array_unshift($keyword_array, $this->post['type']);
+        $this->set_keywords($keyword_array);
 		
-		parent::set_head_data();
-	}
+        parent::set_head_data();
+    }
 
-	protected function set_body_data()
-	{
-		$this->set_body('title', $this->get_title());
-		$this->set_body('description', $this->get_description());
+    protected function set_body_data()
+    {
+        $this->set_body('title', $this->get_title());
+        $this->set_body('description', $this->get_description());
 		
-		$this->set_body('post', $this->expand_post($this->post, 'full'));
-		$this->set_body('type', 'single');
-		$this->set_body('view', 'Post');
+        $this->set_body('post', $this->expand_post($this->post, 'full'));
+        $this->set_body('type', 'single');
+        $this->set_body('view', 'Post');
 		
-		parent::set_body_data();
-	}
+        parent::set_body_data();
+    }
 
-	private function get_title()
-	{
-		switch($this->post['type'])
-		{
-			case 'blog' :
-				return 'Jacob blogged';
-			break;
-			case 'book' :
-				return 'Jacob read again';
-			break;
-			case 'distance' :
-				return 'Jacob ran xor hiked';
-			break;
-      case 'github' :
+    private function get_title()
+    {
+        switch($this->post['type'])
+        {
+            case 'blog' :
+                return 'Jacob blogged';
+            break;
+            case 'book' :
+                return 'Jacob read again';
+            break;
+            case 'distance' :
+                return 'Jacob ran xor hiked';
+            break;
+        case 'github' :
         return 'Jacob did code';
-      break;
-			case 'hulu' :
-				return 'What Jacob watched';
-			break;
-			case 'twitter' :
-				return 'What Jacob tweeted';
-			break;
-			case 'youtube' :
-				return 'Jacob Liked a Video';
-			break;
-		}
-	}
+        break;
+            case 'hulu' :
+                return 'What Jacob watched';
+            break;
+            case 'twitter' :
+                return 'What Jacob tweeted';
+            break;
+            case 'youtube' :
+                return 'Jacob Liked a Video';
+            break;
+        }
+    }
 
-	private function get_description()
-	{
-		switch($this->post['type'])
-		{
-			case 'blog' :
-				return 'Another awesome blog post from Jacob. Did I mention it was awesome?';
-			break;
-			case 'book' :
-				return "Yup, Jacob read another book. Don't tell his parents.";
-			break;
-			case 'distance' :
-				return 'Well, it might have been both at the same time if there was a bear.';
-			break;
-      case 'github' :
+    private function get_description()
+    {
+        switch($this->post['type'])
+        {
+            case 'blog' :
+                return 'Another awesome blog post from Jacob. Did I mention it was awesome?';
+            break;
+            case 'book' :
+                return "Yup, Jacob read another book. Don't tell his parents.";
+            break;
+            case 'distance' :
+                return 'Well, it might have been both at the same time if there was a bear.';
+            break;
+        case 'github' :
         return 'An epic code change by Jacob on the Githubs.';
-      break;
-			case 'hulu' :
-				return 'It was a cold, dark night, so Jacob watched something on Hulu.';
-			break;
-			case 'twitter' :
-				return 'Just another awesome insight/thought/RT/random from Jacob.';
-			break;
-			case 'youtube' :
-				return "This is a video that Jacob liked on Youtube. It's probably awesome. You should check it out.";
-			break;
-		}
-	}
+        break;
+            case 'hulu' :
+                return 'It was a cold, dark night, so Jacob watched something on Hulu.';
+            break;
+            case 'twitter' :
+                return 'Just another awesome insight/thought/RT/random from Jacob.';
+            break;
+            case 'youtube' :
+                return "This is a video that Jacob liked on Youtube. It's probably awesome. You should check it out.";
+            break;
+        }
+    }
 
 }

Braces +21 added lines, -18 removed lines

@@ -2,8 +2,8 @@ 
 
 Loader::load('controller', 'lifestream/DefaultPageController');
 
-final class PostController extends DefaultPageController
-{
+final class PostController extends DefaultPageController

+{

 
 	private static $TITLE = "Post %d | %s Activity | Jacob Emerick's Lifestream";
 	private static $DESCRIPTION = "Post %d of %s activity on Jacob Emerick's Lifestream.";
@@ -15,26 +15,29 @@ 
 
 	private $post;
 
-	public function __construct()
-	{
+	public function __construct()

+	{

 		parent::__construct();
 		
 		$id = URLDecode::getPiece(2);
-		if(!$id || !is_numeric($id))
-			$this->eject();
+		if(!$id || !is_numeric($id)) {

+					$this->eject();

+		}

 		
 		$post = $this->activityRepository->getActivityById($id);
-		if(!$post)
-			$this->eject();
+		if(!$post) {

+					$this->eject();

+		}

 		
-		if(URLDecode::getPiece(1) != $post['type'])
-			$this->eject();
+		if(URLDecode::getPiece(1) != $post['type']) {

+					$this->eject();

+		}

 		
 		$this->post = $post;
 	}
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		$this->set_title(sprintf(self::$TITLE, $this->post['id'], ucwords($this->post['type'])));
 		$this->set_description(sprintf(self::$DESCRIPTION, $this->post['id'], ucwords($this->post['type'])));
 		
@@ -45,8 +48,8 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body('title', $this->get_title());
 		$this->set_body('description', $this->get_description());
 		
@@ -57,8 +60,8 @@ 
 		parent::set_body_data();
 	}
 
-	private function get_title()
-	{
+	private function get_title()

+	{

 		switch($this->post['type'])
 		{
 			case 'blog' :
@@ -85,8 +88,8 @@ 
 		}
 	}
 
-	private function get_description()
-	{
+	private function get_description()

+	{

 		switch($this->post['type'])
 		{
 			case 'blog' :

utility/Header.class.inc.php

Doc Comments +3 added lines

@@ -131,6 +131,9 @@
 		self::send($array);
 	}
 
+	/**
+	 * @param string[] $array
+	 */
 	private static function send($array, $gzip = true)
 	{
 		if($gzip)

Spacing +12 added lines, -12 removed lines

@@ -10,8 +10,8 @@ 
 			'Cache-Control: no-cache',
 			'Content-Language: en',
 			'Content-Type: application/json',
-			'Expires: ' . self::get_date(time() - 1),
-			'Last-Modified: ' . self::get_date(),
+			'Expires: '.self::get_date(time() - 1),
+			'Last-Modified: '.self::get_date(),
 			'X-Powered-By: jacobemerick.com');
 		self::send($array);
 	}
@@ -23,8 +23,8 @@ 
 			'Cache-Control: no-cache',
 			'Content-Language: en',
 			'Content-Type: text/html',
-			'Expires: ' . self::get_date(time() - 1),
-			'Last-Modified: ' . self::get_date(),
+			'Expires: '.self::get_date(time() - 1),
+			'Last-Modified: '.self::get_date(),
 			'X-Powered-By: jacobemerick.com');
 		self::send($array);
 	}
@@ -42,8 +42,8 @@ 
 			'Cache-Control: no-cache',
 			'Content-Language: en',
 			'Content-Type: text/html',
-			'Expires: ' . self::get_date(time() - 1),
-			'Last-Modified: ' . self::get_date(),
+			'Expires: '.self::get_date(time() - 1),
+			'Last-Modified: '.self::get_date(),
 			'X-Powered-By: jacobemerick.com');
 		self::send($array);
 	}
@@ -55,18 +55,18 @@ 
 			'Cache-Control: no-cache',
 			'Content-Language: en',
 			'Content-Type: text/html',
-			'Expires: ' . self::get_date(time() - 1),
-			'Last-Modified: ' . self::get_date(),
+			'Expires: '.self::get_date(time() - 1),
+			'Last-Modified: '.self::get_date(),
 			'X-Powered-By: jacobemerick.com');
 		self::send($array);
 	}
 
 	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);
 		}
@@ -74,14 +74,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();
 	}
 

Indentation +72 added lines, -72 removed lines

@@ -3,86 +3,86 @@
 final class Header
 {
 
-	public static function sendJSON()
-	{
-		$array = array(
-			'HTTP/1.1 200 OK',
-			'Cache-Control: no-cache',
-			'Content-Language: en',
-			'Content-Type: application/json',
-			'Expires: ' . self::get_date(time() - 1),
-			'Last-Modified: ' . self::get_date(),
-			'X-Powered-By: jacobemerick.com');
-		self::send($array);
-	}
+    public static function sendJSON()
+    {
+        $array = array(
+            'HTTP/1.1 200 OK',
+            'Cache-Control: no-cache',
+            'Content-Language: en',
+            'Content-Type: application/json',
+            'Expires: ' . self::get_date(time() - 1),
+            'Last-Modified: ' . self::get_date(),
+            'X-Powered-By: jacobemerick.com');
+        self::send($array);
+    }
 
-	public static function sendHTML()
-	{
-		$array = array(
-			'HTTP/1.1 200 OK',
-			'Cache-Control: no-cache',
-			'Content-Language: en',
-			'Content-Type: text/html',
-			'Expires: ' . self::get_date(time() - 1),
-			'Last-Modified: ' . self::get_date(),
-			'X-Powered-By: jacobemerick.com');
-		self::send($array);
-	}
+    public static function sendHTML()
+    {
+        $array = array(
+            'HTTP/1.1 200 OK',
+            'Cache-Control: no-cache',
+            'Content-Language: en',
+            'Content-Type: text/html',
+            'Expires: ' . self::get_date(time() - 1),
+            'Last-Modified: ' . self::get_date(),
+            'X-Powered-By: jacobemerick.com');
+        self::send($array);
+    }
 
-	public static function redirect($location, $method = 301)
-	{
-		header("Location: {$location}", TRUE, $method);
-		exit();
-	}
+    public static function redirect($location, $method = 301)
+    {
+        header("Location: {$location}", TRUE, $method);
+        exit();
+    }
 
-	public static function send404()
-	{
-		$array = array(
-			'HTTP/1.1 404 Not Found',
-			'Cache-Control: no-cache',
-			'Content-Language: en',
-			'Content-Type: text/html',
-			'Expires: ' . self::get_date(time() - 1),
-			'Last-Modified: ' . self::get_date(),
-			'X-Powered-By: jacobemerick.com');
-		self::send($array);
-	}
+    public static function send404()
+    {
+        $array = array(
+            'HTTP/1.1 404 Not Found',
+            'Cache-Control: no-cache',
+            'Content-Language: en',
+            'Content-Type: text/html',
+            'Expires: ' . self::get_date(time() - 1),
+            'Last-Modified: ' . self::get_date(),
+            'X-Powered-By: jacobemerick.com');
+        self::send($array);
+    }
 
-	public static function send503()
-	{
-		$array = array(
-			'HTTP/1.1 503 Service Unavailable',
-			'Cache-Control: no-cache',
-			'Content-Language: en',
-			'Content-Type: text/html',
-			'Expires: ' . self::get_date(time() - 1),
-			'Last-Modified: ' . self::get_date(),
-			'X-Powered-By: jacobemerick.com');
-		self::send($array);
-	}
+    public static function send503()
+    {
+        $array = array(
+            'HTTP/1.1 503 Service Unavailable',
+            'Cache-Control: no-cache',
+            'Content-Language: en',
+            'Content-Type: text/html',
+            'Expires: ' . self::get_date(time() - 1),
+            'Last-Modified: ' . self::get_date(),
+            'X-Powered-By: jacobemerick.com');
+        self::send($array);
+    }
 
-	private static function send($array, $gzip = true)
-	{
-		if($gzip)
-			self::start_gzipping();
+    private static function send($array, $gzip = true)
+    {
+        if($gzip)
+            self::start_gzipping();
 		
-		foreach($array as $row)
-		{
-			header($row, TRUE);
-		}
-	}
+        foreach($array as $row)
+        {
+            header($row, TRUE);
+        }
+    }
 
-	private static function get_date($timestamp = false)
-	{
-		if($timestamp == 0)
-			$timestamp = time();
-		return gmdate('D, d M Y H:i:s \G\M\T', $timestamp);
-	}
+    private static function get_date($timestamp = false)
+    {
+        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'))
+    private static function start_gzipping()
+    {
+        if(!ob_start('ob_gzhandler'))
             ob_start();
-	}
+    }
 
 }

Braces +27 added lines, -24 removed lines

@@ -1,10 +1,10 @@ 
 <?
 
-final class Header
-{
+final class Header

+{

 
-	public static function sendJSON()
-	{
+	public static function sendJSON()

+	{

 		$array = array(
 			'HTTP/1.1 200 OK',
 			'Cache-Control: no-cache',
@@ -16,8 +16,8 @@ 
 		self::send($array);
 	}
 
-	public static function sendHTML()
-	{
+	public static function sendHTML()

+	{

 		$array = array(
 			'HTTP/1.1 200 OK',
 			'Cache-Control: no-cache',
@@ -29,14 +29,14 @@ 
 		self::send($array);
 	}
 
-	public static function redirect($location, $method = 301)
-	{
+	public static function redirect($location, $method = 301)

+	{

 		header("Location: {$location}", TRUE, $method);
 		exit();
 	}
 
-	public static function send404()
-	{
+	public static function send404()

+	{

 		$array = array(
 			'HTTP/1.1 404 Not Found',
 			'Cache-Control: no-cache',
@@ -48,8 +48,8 @@ 
 		self::send($array);
 	}
 
-	public static function send503()
-	{
+	public static function send503()

+	{

 		$array = array(
 			'HTTP/1.1 503 Service Unavailable',
 			'Cache-Control: no-cache',
@@ -61,10 +61,11 @@ 
 		self::send($array);
 	}
 
-	private static function send($array, $gzip = true)
-	{
-		if($gzip)
-			self::start_gzipping();
+	private static function send($array, $gzip = true)

+	{

+		if($gzip) {

+					self::start_gzipping();

+		}

 		
 		foreach($array as $row)
 		{
@@ -72,17 +73,19 @@ 
 		}
 	}
 
-	private static function get_date($timestamp = false)
-	{
-		if($timestamp == 0)
-			$timestamp = time();
+	private static function get_date($timestamp = false)

+	{

+		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();
+	private static function start_gzipping()

+	{

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

+		            ob_start();

+		}

 	}
 
 }

utility/Database.class.inc.php

Doc Comments +3 added lines

@@ -84,6 +84,9 @@
 		return false;
 	}
 
+	/**
+	 * @param string $query
+	 */
 	public static function execute($query)
 	{
 		$start = microtime(true);

Spacing +12 added lines, -12 removed lines

@@ -36,7 +36,7 @@ 
 		$mysqli = new mysqli($host, $username, $password);
 		
 		$has_connection_error = $mysqli->connect_error;
-		if(isset($has_connection_error))
+		if (isset($has_connection_error))
 			$this->has_connection_error = true;
 		
 		return $mysqli;
@@ -44,7 +44,7 @@ 
 
 	public static function instance()
 	{
-		if(!isset(self::$instance)) {
+		if (!isset(self::$instance)) {
             global $config;
             self::$instance = new Database(
                 $config->database->master,
@@ -63,23 +63,23 @@ 
 	public static function select($query)
 	{
 		$start = microtime(true);
-		if($result = self::instance()->read_connection->query($query))
+		if ($result = self::instance()->read_connection->query($query))
 		{
 			self::instance()->log_query($query, $start);
 			$array = array();
-			while($row = $result->fetch_object())
+			while ($row = $result->fetch_object())
 				$array[] = $row;
 			$result->close();
 			return $array;
 		}
-		trigger_error('Could not preform query - ' . $query . ' - ' . self::instance()->read_connection->error);
+		trigger_error('Could not preform query - '.$query.' - '.self::instance()->read_connection->error);
 		return false;
 	}
 
 	public static function selectRow($query)
 	{
 		$result = self::select($query);
-		if(is_array($result))
+		if (is_array($result))
 			return array_pop($result);
 		return false;
 	}
@@ -87,19 +87,19 @@ 
 	public static function execute($query)
 	{
 		$start = microtime(true);
-		if(self::instance()->write_connection->query($query))
+		if (self::instance()->write_connection->query($query))
 		{
 			self::instance()->log_query($query, $start);
 			return true;
 		}
-		trigger_error('Could not preform query - ' . $query . '-' . self::instance()->write_connection->error);
+		trigger_error('Could not preform query - '.$query.'-'.self::instance()->write_connection->error);
 		return false;
 	}
 
 	public static function lastInsertID()
 	{
 		$id = self::instance()->write_connection->insert_id;
-		if($id == 0)
+		if ($id == 0)
 			return false;
 		return $id;
 	}
@@ -119,7 +119,7 @@ 
 	private function gather_query_data()
 	{
 		$query_data = array();
-		foreach($this->query_log as $query)
+		foreach ($this->query_log as $query)
 		{
 			$query = self::explain($query);
 			$query_data[] = $query;
@@ -129,9 +129,9 @@ 
 
 	public static function explain($query)
 	{
-		$sql = 'EXPLAIN ' . $query['sql'];
+		$sql = 'EXPLAIN '.$query['sql'];
 		
-		if($result = self::instance()->read_connection->query($sql))
+		if ($result = self::instance()->read_connection->query($sql))
 		{
 			$row = $result->fetch_assoc();
 			$query['explain'] = $row;

Indentation +122 added lines, -122 removed lines

@@ -3,19 +3,19 @@ 
 final class Database
 {
 
-	private $read_connection;
-	private $write_connection;
-	private $query_log = array();
-	private $query_total = array(
-		'count' => 0,
-		'time' => 0);
+    private $read_connection;
+    private $write_connection;
+    private $query_log = array();
+    private $query_total = array(
+        'count' => 0,
+        'time' => 0);
 
-	private $has_connection_error = false;
+    private $has_connection_error = false;
 
-	private static $instance;
+    private static $instance;
 
-	private function __construct($write_params, $read_params)
-	{
+    private function __construct($write_params, $read_params)
+    {
         $this->write_connection = $this->connect(
             $write_params->host,
             $write_params->user,
@@ -28,23 +28,23 @@ 
             $read_params->password
         );
 
-		return $this;
-	}
+        return $this;
+    }
 
-	private function connect($host, $username, $password)
-	{
-		$mysqli = new mysqli($host, $username, $password);
+    private function connect($host, $username, $password)
+    {
+        $mysqli = new mysqli($host, $username, $password);
 		
-		$has_connection_error = $mysqli->connect_error;
-		if(isset($has_connection_error))
-			$this->has_connection_error = true;
+        $has_connection_error = $mysqli->connect_error;
+        if(isset($has_connection_error))
+            $this->has_connection_error = true;
 		
-		return $mysqli;
-	}
+        return $mysqli;
+    }
 
-	public static function instance()
-	{
-		if(!isset(self::$instance)) {
+    public static function instance()
+    {
+        if(!isset(self::$instance)) {
             global $config;
             self::$instance = new Database(
                 $config->database->master,
@@ -52,107 +52,107 @@ 
             );
         }
 
-		return self::$instance;
-	}
-
-	public static function escape($string)
-	{
-		return self::instance()->read_connection->real_escape_string($string);
-	}
-
-	public static function select($query)
-	{
-		$start = microtime(true);
-		if($result = self::instance()->read_connection->query($query))
-		{
-			self::instance()->log_query($query, $start);
-			$array = array();
-			while($row = $result->fetch_object())
-				$array[] = $row;
-			$result->close();
-			return $array;
-		}
-		trigger_error('Could not preform query - ' . $query . ' - ' . self::instance()->read_connection->error);
-		return false;
-	}
-
-	public static function selectRow($query)
-	{
-		$result = self::select($query);
-		if(is_array($result))
-			return array_pop($result);
-		return false;
-	}
-
-	public static function execute($query)
-	{
-		$start = microtime(true);
-		if(self::instance()->write_connection->query($query))
-		{
-			self::instance()->log_query($query, $start);
-			return true;
-		}
-		trigger_error('Could not preform query - ' . $query . '-' . self::instance()->write_connection->error);
-		return false;
-	}
-
-	public static function lastInsertID()
-	{
-		$id = self::instance()->write_connection->insert_id;
-		if($id == 0)
-			return false;
-		return $id;
-	}
-
-	private function log_query($query, $start)
-	{
-		$time = (microtime(true) - $start) * 1000;
-		$query = array(
-			'sql' => $query,
-			'time' => $time);
-		array_push($this->query_log, $query);
+        return self::$instance;
+    }
+
+    public static function escape($string)
+    {
+        return self::instance()->read_connection->real_escape_string($string);
+    }
+
+    public static function select($query)
+    {
+        $start = microtime(true);
+        if($result = self::instance()->read_connection->query($query))
+        {
+            self::instance()->log_query($query, $start);
+            $array = array();
+            while($row = $result->fetch_object())
+                $array[] = $row;
+            $result->close();
+            return $array;
+        }
+        trigger_error('Could not preform query - ' . $query . ' - ' . self::instance()->read_connection->error);
+        return false;
+    }
+
+    public static function selectRow($query)
+    {
+        $result = self::select($query);
+        if(is_array($result))
+            return array_pop($result);
+        return false;
+    }
+
+    public static function execute($query)
+    {
+        $start = microtime(true);
+        if(self::instance()->write_connection->query($query))
+        {
+            self::instance()->log_query($query, $start);
+            return true;
+        }
+        trigger_error('Could not preform query - ' . $query . '-' . self::instance()->write_connection->error);
+        return false;
+    }
+
+    public static function lastInsertID()
+    {
+        $id = self::instance()->write_connection->insert_id;
+        if($id == 0)
+            return false;
+        return $id;
+    }
+
+    private function log_query($query, $start)
+    {
+        $time = (microtime(true) - $start) * 1000;
+        $query = array(
+            'sql' => $query,
+            'time' => $time);
+        array_push($this->query_log, $query);
 		
-		$this->query_total['count']++;
-		$this->query_total['time'] += $time;
-	}
-
-	private function gather_query_data()
-	{
-		$query_data = array();
-		foreach($this->query_log as $query)
-		{
-			$query = self::explain($query);
-			$query_data[] = $query;
-		}
-		return $query_data;
-	}
-
-	public static function explain($query)
-	{
-		$sql = 'EXPLAIN ' . $query['sql'];
+        $this->query_total['count']++;
+        $this->query_total['time'] += $time;
+    }
+
+    private function gather_query_data()
+    {
+        $query_data = array();
+        foreach($this->query_log as $query)
+        {
+            $query = self::explain($query);
+            $query_data[] = $query;
+        }
+        return $query_data;
+    }
+
+    public static function explain($query)
+    {
+        $sql = 'EXPLAIN ' . $query['sql'];
 		
-		if($result = self::instance()->read_connection->query($sql))
-		{
-			$row = $result->fetch_assoc();
-			$query['explain'] = $row;
-		}
+        if($result = self::instance()->read_connection->query($sql))
+        {
+            $row = $result->fetch_assoc();
+            $query['explain'] = $row;
+        }
 		
-		return $query;
-	}
-
-	public static function getQueryLog()
-	{
-		return self::instance()->gather_query_data();
-	}
-
-	public static function getQueryTotals()
-	{
-		return self::instance()->query_total;
-	}
-
-	public static function isConnected()
-	{
-		return !self::instance()->has_connection_error;
-	}
+        return $query;
+    }
+
+    public static function getQueryLog()
+    {
+        return self::instance()->gather_query_data();
+    }
+
+    public static function getQueryTotals()
+    {
+        return self::instance()->query_total;
+    }
+
+    public static function isConnected()
+    {
+        return !self::instance()->has_connection_error;
+    }
 
 }

Braces +42 added lines, -38 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
-final class Database
-{
+final class Database

+{

 
 	private $read_connection;
 	private $write_connection;
@@ -14,8 +14,8 @@ 
 
 	private static $instance;
 
-	private function __construct($write_params, $read_params)
-	{
+	private function __construct($write_params, $read_params)

+	{

         $this->write_connection = $this->connect(
             $write_params->host,
             $write_params->user,
@@ -31,19 +31,20 @@ 
 		return $this;
 	}
 
-	private function connect($host, $username, $password)
-	{
+	private function connect($host, $username, $password)

+	{

 		$mysqli = new mysqli($host, $username, $password);
 		
 		$has_connection_error = $mysqli->connect_error;
-		if(isset($has_connection_error))
-			$this->has_connection_error = true;
+		if(isset($has_connection_error)) {

+					$this->has_connection_error = true;

+		}

 		
 		return $mysqli;
 	}
 
-	public static function instance()
-	{
+	public static function instance()

+	{

 		if(!isset(self::$instance)) {
             global $config;
             self::$instance = new Database(
@@ -55,20 +56,21 @@ 
 		return self::$instance;
 	}
 
-	public static function escape($string)
-	{
+	public static function escape($string)

+	{

 		return self::instance()->read_connection->real_escape_string($string);
 	}
 
-	public static function select($query)
-	{
+	public static function select($query)

+	{

 		$start = microtime(true);
 		if($result = self::instance()->read_connection->query($query))
 		{
 			self::instance()->log_query($query, $start);
 			$array = array();
-			while($row = $result->fetch_object())
-				$array[] = $row;
+			while($row = $result->fetch_object()) {

+							$array[] = $row;

+			}

 			$result->close();
 			return $array;
 		}
@@ -76,16 +78,17 @@ 
 		return false;
 	}
 
-	public static function selectRow($query)
-	{
+	public static function selectRow($query)

+	{

 		$result = self::select($query);
-		if(is_array($result))
-			return array_pop($result);
+		if(is_array($result)) {

+					return array_pop($result);

+		}

 		return false;
 	}
 
-	public static function execute($query)
-	{
+	public static function execute($query)

+	{

 		$start = microtime(true);
 		if(self::instance()->write_connection->query($query))
 		{
@@ -96,16 +99,17 @@ 
 		return false;
 	}
 
-	public static function lastInsertID()
-	{
+	public static function lastInsertID()

+	{

 		$id = self::instance()->write_connection->insert_id;
-		if($id == 0)
-			return false;
+		if($id == 0) {

+					return false;

+		}

 		return $id;
 	}
 
-	private function log_query($query, $start)
-	{
+	private function log_query($query, $start)

+	{

 		$time = (microtime(true) - $start) * 1000;
 		$query = array(
 			'sql' => $query,
@@ -116,8 +120,8 @@ 
 		$this->query_total['time'] += $time;
 	}
 
-	private function gather_query_data()
-	{
+	private function gather_query_data()

+	{

 		$query_data = array();
 		foreach($this->query_log as $query)
 		{
@@ -127,8 +131,8 @@ 
 		return $query_data;
 	}
 
-	public static function explain($query)
-	{
+	public static function explain($query)

+	{

 		$sql = 'EXPLAIN ' . $query['sql'];
 		
 		if($result = self::instance()->read_connection->query($sql))
@@ -140,18 +144,18 @@ 
 		return $query;
 	}
 
-	public static function getQueryLog()
-	{
+	public static function getQueryLog()

+	{

 		return self::instance()->gather_query_data();
 	}
 
-	public static function getQueryTotals()
-	{
+	public static function getQueryTotals()

+	{

 		return self::instance()->query_total;
 	}
 
-	public static function isConnected()
-	{
+	public static function isConnected()

+	{

 		return !self::instance()->has_connection_error;
 	}