jacobemerick / web

controller/waterfalls/PeriodListController.class.inc.php

Braces +27 added lines, -26 removed lines

@@ -3,8 +3,8 @@ 
 Loader::load('collector', 'waterfall/PeriodCollector');
 Loader::load('controller', 'waterfalls/DefaultLogListController');
 
-final class PeriodListController extends DefaultLogListController
-{
+final class PeriodListController extends DefaultLogListController

+{

 
 	private static $DEFAULT_TITLE = '%s Hiking Stories, Page %d of %d';
 	private static $DEFAULT_DESCRIPTION = 'Page %d of %d of epic %s hiking stories written by Jacob Emerick, all about his adventures hunting waterfalls in the Upper Peninsula of Michigan';
@@ -21,19 +21,20 @@ 
 
 	private $period;
 
-	public function __construct()
-	{
+	public function __construct()

+	{

 		$alias = URLDecode::getPiece(2);
 		$this->period = PeriodCollector::getByAlias($alias);
 		
-		if(!$this->period)
-			$this->eject();
+		if(!$this->period) {

+					$this->eject();

+		}

 		
 		parent::__construct();
 	}
 
-	protected function get_initial_meta()
-	{
+	protected function get_initial_meta()

+	{

 		$meta_array = array();
 		
 		$meta_array['title'] = "Hiking Stories - {$this->period->name} | " . self::$WEBSITE_TITLE;
@@ -43,8 +44,8 @@ 
 		return $meta_array;
 	}
 
-	protected function get_subsequent_meta()
-	{
+	protected function get_subsequent_meta()

+	{

 		$meta_array = array();
 		
 		$meta_array['title'] = sprintf(self::$DEFAULT_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->period->name, $this->page, $this->page_count);
@@ -54,15 +55,15 @@ 
 		return $meta_array;
 	}
 
-	private function get_keyword_array()
-	{
+	private function get_keyword_array()

+	{

 		$keyword_array = self::$KEYWORD_ARRAY;
 		array_unshift($keyword_array, strtolower($this->period->name));
 		return $keyword_array;
 	}
 
-	protected function get_initial_introduction()
-	{
+	protected function get_initial_introduction()

+	{

 		$introduction = array();
 		
 		$introduction['title'] = $this->period->title;
@@ -72,37 +73,37 @@ 
 		return $introduction;
 	}
 
-	protected function get_subsequent_introduction()
-	{
+	protected function get_subsequent_introduction()

+	{

 		return array(
 			'title' => sprintf(self::$DEFAULT_HEADER, $this->page, $this->period->name));
 	}
 
-	protected function get_page_number_piece()
-	{
+	protected function get_page_number_piece()

+	{

 		return URLDecode::getPiece(3);
 	}
 
-	protected function get_item_result($total, $offset)
-	{
+	protected function get_item_result($total, $offset)

+	{

 		return PeriodCollector::getLogListForPeriod($this->period->id, $total, $offset);
 	}
 
-	protected function get_item_count_result()
-	{
+	protected function get_item_count_result()

+	{

 		return PeriodCollector::getLogCountForPeriod($this->period->id);
 	}
 
-	protected function get_list_description_pattern()
-	{
+	protected function get_list_description_pattern()

+	{

 		$period = $this->period->name;
 		$period = strtolower($period);
 		$navigation_description = str_replace('%PERIOD%', $period, self::$NAVIGATION_DESCRIPTION);
 		return $navigation_description;
 	}
 
-	protected function get_list_link_root()
-	{
+	protected function get_list_link_root()

+	{

 		return sprintf(self::$LINK_ROOT, $this->period->alias);
 	}
 

controller/Error404Controller.class.inc.php

Braces +8 added lines, -8 removed lines

@@ -2,11 +2,11 @@ 
 
 Loader::load('controller', '/PageController');
 
-class Error404Controller extends PageController
-{
+class Error404Controller extends PageController

+{

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

+	{

 		$this->set_header_method('send404');
 		$this->add_css('normalize');
 		$this->add_css('404');
@@ -16,15 +16,15 @@ 
 		$this->set_head('keywords', '');
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body('site_list', $this->get_sites());
 		
 		$this->set_body_view('/404');
 	}
 
-	private function get_sites()
-	{
+	private function get_sites()

+	{

     return [
       [
         'url' => 'https://home.jacobemerick.com/',

utility/content/ElapsedTimeContent.class.inc.php

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

Braces +42 added lines, -36 removed lines

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

+{

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

+	{

 		$args = func_get_args();
 		if(count($args) < 1)
 		{
@@ -33,37 +33,40 @@ 
 			return;
 		}
 		
-		if(count($args) == 2)
-			$etc = $args[1];
-		else
-			$etc = self::$ETC;
+		if(count($args) == 2) {

+					$etc = $args[1];

+		} else {

+					$etc = self::$ETC;

+		}

 		
 		$length = $args[0];
 		
-		if($length < strlen($this->content))
-			$this->trim_string($length);
-        else
-            $etc = '';
+		if($length < strlen($this->content)) {

+					$this->trim_string($length);

+		} else {

+                    $etc = '';

+        }

 		$this->check_exclude_tags();
 		$this->close_tags($etc);
 	}
 
-	private function trim_string($length)
-	{
+	private function trim_string($length)

+	{

 		$content = $this->trim_html_string($this->content, $length);
 		
 		$last_right_bracket_position = strripos($content, self::$RIGHT_BRACKET);
 		$last_left_bracket_position = strripos($content, self::$LEFT_BRACKET);
-		if($last_left_bracket_position > $last_right_bracket_position)
-			$content = substr($content, 0, $last_left_bracket_position);
+		if($last_left_bracket_position > $last_right_bracket_position) {

+					$content = substr($content, 0, $last_left_bracket_position);

+		}

 		$content = trim($content);
 		
 		$this->content = $content;
 		$this->is_trimmed = true;
 	}
 
-	private function trim_html_string($content, $length)
-	{
+	private function trim_html_string($content, $length)

+	{

 		$content = preg_replace(self::$PHOTO_PLACEHOLDER_MATCH, '', $content);
 		preg_match_all(self::$HTML_TAG_PATTERN, $content, $matches, PREG_OFFSET_CAPTURE);
 		$content = strip_tags($content);
@@ -76,20 +79,22 @@ 
 		foreach($matches[0] as $match)
 		{
 			$max_length += strlen($match[0]);
-			if($max_length <= $match[1])
-				break;
+			if($max_length <= $match[1]) {

+							break;

+			}

 			
 			$content = substr($content, 0, $match[1]) . $match[0] . substr($content, $match[1]);
 		}
 		
-		if(substr($content, -7) == '</p><p>')
-			$content = substr($content, 0, -7);
+		if(substr($content, -7) == '</p><p>') {

+					$content = substr($content, 0, -7);

+		}

 		
 		return $content;
 	}
 
-	private function check_exclude_tags()
-	{
+	private function check_exclude_tags()

+	{

 		$content = $this->content;
 		$tags_preg = $this->get_tags_preg(self::$EXCLUDE_TAGS);
 		preg_match_all($tags_preg, $content, $matches, PREG_OFFSET_CAPTURE);
@@ -105,8 +110,8 @@ 
 		$this->content = $content;
 	}
 
-	private function close_tags($etc)
-	{
+	private function close_tags($etc)

+	{

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

+							$open_tags[] = $tag;

+			}

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

+									$content .= $etc;

+				}

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

+					$content .= $etc;

+		}

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

+	{

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

utility/content/MarkupCodeContent.class.inc.php

Braces +11 added lines, -10 removed lines

@@ -2,16 +2,17 @@ 
 
 Loader::load('utility', 'Content');
 
-final class MarkupCodeContent extends Content
-{
+final class MarkupCodeContent extends Content

+{

 
 	private static $MARKUP_DELIMITER = '@<pre( rel="(.*?)")?>(.*?)</pre>@s';
 
-	protected function execute($title = '')
-	{
+	protected function execute($title = '')

+	{

 		preg_match_all(self::$MARKUP_DELIMITER, $this->content, $matches);
-		if(count($matches[1]) == 0)
-			return;
+		if(count($matches[1]) == 0) {

+					return;

+		}

 		
 		foreach($matches[3] as $key => $match)
 		{
@@ -25,8 +26,8 @@ 
 		return;
 	}
 
-	private function wrap_in_list($content)
-	{
+	private function wrap_in_list($content)

+	{

 		$content_array = explode("\n", $content);
 		
 		foreach($content_array as $key => $row)
@@ -44,8 +45,8 @@ 
 		return $content;
 	}
 
-	private function highlight_code($content, $type)
-	{
+	private function highlight_code($content, $type)

+	{

 		switch($type)
 		{
 			default :

utility/content/FixPhotoContent.class.inc.php

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

Braces +4 added lines, -4 removed lines

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

+{

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

+	{

 		$this->content = strtolower(str_replace(' ', '-', $this->content));
 	}
 

utility/content/CleanCommentContent.class.inc.php

Braces +24 added lines, -22 removed lines

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

+{

 
 	private static $LINK_PATTERN = '@<a.*href=["\']([^"\']*)["\'].*>(.*)</a>@i';
 	private static $BOLD_PATTERN = '@<b.*>(.*)</b>@i';
@@ -22,8 +22,8 @@ 
 
 	private $replacement_array = array();
 
-	protected function execute()
-	{
+	protected function execute()

+	{

 		$this->process_element(self::$CODE_PATTERN, self::$CODE_REPLACE);
 		$this->process_element(self::$LINK_PATTERN, self::$LINK_REPLACE);
 		$this->process_element(self::$ITALIC_PATTERN, self::$ITALIC_REPLACE);
@@ -36,12 +36,13 @@ 
 		$this->replace_element_patterns();
 	}
 
-	private function process_element($pattern, $replace)
-	{
+	private function process_element($pattern, $replace)

+	{

 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
 		
-		if($match_count < 1)
-			return;
+		if($match_count < 1) {

+					return;

+		}

 		
 		foreach($matches as $match)
 		{
@@ -54,13 +55,13 @@ 
 		}
 	}
 
-	private function create_placeholder($text)
-	{
+	private function create_placeholder($text)

+	{

 		return md5($text . rand());
 	}
 
-	private function create_full_match_pattern($text)
-	{
+	private function create_full_match_pattern($text)

+	{

 		$pattern = '';
 		$pattern .= '@';
 		$pattern .= preg_quote($text, '@');
@@ -70,17 +71,18 @@ 
 		return $pattern;
 	}
 
-	private function strip_extra_tags()
-	{
+	private function strip_extra_tags()

+	{

 		$this->content = strip_tags($this->content);
 	}
 
-	private function link_unlinked_urls($pattern, $replace)
-	{
+	private function link_unlinked_urls($pattern, $replace)

+	{

 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
 		
-		if($match_count < 1)
-			return;
+		if($match_count < 1) {

+					return;

+		}

 		
 		foreach($matches as $match)
 		{
@@ -92,13 +94,13 @@ 
 		}
 	}
 
-	private function add_line_breaks()
-	{
+	private function add_line_breaks()

+	{

 		$this->content = preg_replace(self::$LINE_BREAK_PATTERN, self::$LINE_BREAK_REPLACE, $this->content);
 	}
 
-	private function replace_element_patterns()
-	{
+	private function replace_element_patterns()

+	{

 		foreach($this->replacement_array as $key => $replace)
 		{
 			$this->content = str_replace($key, $replace, $this->content);

utility/content/FetchFirstPhotoContent.class.inc.php

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