jacobemerick / web

controller/waterfalls/MapController.class.inc.php

Indentation +48 added lines, -48 removed lines

@@ -6,62 +6,62 @@
 final class MapController extends DefaultPageController

 {

 

-    private static $TITLE = 'Map of Upper Peninsula Waterfalls';

-    private static $DESCRIPTION = '';

-    private static $KEYWORD_ARRAY = array();

+	private static $TITLE = 'Map of Upper Peninsula Waterfalls';

+	private static $DESCRIPTION = '';

+	private static $KEYWORD_ARRAY = array();

 

-    private static $HIDE_ON_INITIAL_LOAD_LIST = array(

-        'Lower Tahquamenon Falls',

-        'Rainbow Falls',

-        'Sandstone Falls',

-        'Upper Tahquamenon Falls',

-    );

+	private static $HIDE_ON_INITIAL_LOAD_LIST = array(

+		'Lower Tahquamenon Falls',

+		'Rainbow Falls',

+		'Sandstone Falls',

+		'Upper Tahquamenon Falls',

+	);

 

-    public function __construct()

-    {

-        parent::__construct();

+	public function __construct()

+	{

+		parent::__construct();

 

-        $this->add_js('https://maps.googleapis.com/maps/api/js?sensor=false');

-        $this->add_waterfall_js();

-    }

+		$this->add_js('https://maps.googleapis.com/maps/api/js?sensor=false');

+		$this->add_waterfall_js();

+	}

 

-    protected function set_head_data()

-    {

-        parent::set_head_data();

+	protected function set_head_data()

+	{

+		parent::set_head_data();

         

-        $this->set_title(self::$TITLE . ' | ' . self::$WEBSITE_TITLE);

-        $this->set_description(self::$DESCRIPTION);

-        $this->set_keywords(self::$KEYWORD_ARRAY);

-    }

+		$this->set_title(self::$TITLE . ' | ' . self::$WEBSITE_TITLE);

+		$this->set_description(self::$DESCRIPTION);

+		$this->set_keywords(self::$KEYWORD_ARRAY);

+	}

 

-    protected function set_body_data($page_type = 'wide')

-    {

-        parent::set_body_data($page_type);

+	protected function set_body_data($page_type = 'wide')

+	{

+		parent::set_body_data($page_type);

         

-        $this->set_head('full_page_map', true);

-        $this->set_body('waterfall_list', $this->fetch_waterfall_list());

-        $this->set_body('view', 'Map');

-    }

+		$this->set_head('full_page_map', true);

+		$this->set_body('waterfall_list', $this->fetch_waterfall_list());

+		$this->set_body('view', 'Map');

+	}

 

-    private function fetch_waterfall_list()

-    {

-        $list = WaterfallCollector::getMapList();

-        array_walk($list, array($this, 'parse_waterfall'));

-        return $list;

-    }

+	private function fetch_waterfall_list()

+	{

+		$list = WaterfallCollector::getMapList();

+		array_walk($list, array($this, 'parse_waterfall'));

+		return $list;

+	}

 

-    private function parse_waterfall(&$waterfall)

-    {

-        $waterfall = (object) array(

-            'name'  => $waterfall->name,

-            'latitude' => $waterfall->latitude,

-            'longitude' => $waterfall->longitude,

-            'link' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/",

-            'image' => "/photo/{$waterfall->photo_category}/{$waterfall->photo}-size-medium.jpg",

-            'image_alt' => $waterfall->photo_description,

-            'watercourse' => $waterfall->watercourse,

-            'hide_on_initial_load' => (in_array($waterfall->name, self::$HIDE_ON_INITIAL_LOAD_LIST)),

-        );

-    }

+	private function parse_waterfall(&$waterfall)

+	{

+		$waterfall = (object) array(

+			'name'  => $waterfall->name,

+			'latitude' => $waterfall->latitude,

+			'longitude' => $waterfall->longitude,

+			'link' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/",

+			'image' => "/photo/{$waterfall->photo_category}/{$waterfall->photo}-size-medium.jpg",

+			'image_alt' => $waterfall->photo_description,

+			'watercourse' => $waterfall->watercourse,

+			'hide_on_initial_load' => (in_array($waterfall->name, self::$HIDE_ON_INITIAL_LOAD_LIST)),

+		);

+	}

 

 }

controller/waterfalls/PeriodListController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 		$alias = URLDecode::getPiece(2);

 		$this->period = PeriodCollector::getByAlias($alias);

 		

-		if(!$this->period)

+		if (!$this->period)

 			$this->eject();

 		

 		parent::__construct();

Braces +3 added lines, -2 removed lines

@@ -26,8 +26,9 @@
 		$alias = URLDecode::getPiece(2);

 		$this->period = PeriodCollector::getByAlias($alias);

 		

-		if(!$this->period)

-			$this->eject();

+		if(!$this->period) {

+					$this->eject();

+		}

 		

 		parent::__construct();

 	}

controller/waterfalls/SearchListController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	protected function get_page_number()

 	{

 		$page = URLDecode::getPiece(2);

-		if(isset($page) && is_numeric($page))

+		if (isset($page) && is_numeric($page))

 			return $page;

 		return 1;

 	}

Braces +3 added lines, -2 removed lines

@@ -27,8 +27,9 @@
 	protected function get_page_number()

 	{

 		$page = URLDecode::getPiece(2);

-		if(isset($page) && is_numeric($page))

-			return $page;

+		if(isset($page) && is_numeric($page)) {

+					return $page;

+		}

 		return 1;

 	}

 

controller/waterfalls/WatercourseListController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 		$path = URLDecode::getPiece(1);

 		$this->watercourse = WatercourseCollector::getByAlias($path);

 		

-		if(!$this->watercourse)

+		if (!$this->watercourse)

 			$this->eject();

 	

 		parent::__construct();

Braces +3 added lines, -2 removed lines

@@ -29,8 +29,9 @@
 		$path = URLDecode::getPiece(1);

 		$this->watercourse = WatercourseCollector::getByAlias($path);

 		

-		if(!$this->watercourse)

-			$this->eject();

+		if(!$this->watercourse) {

+					$this->eject();

+		}

 	

 		parent::__construct();

 	}

controller/waterfalls/WaterfallController.class.inc.php

Indentation +193 added lines, -193 removed lines

@@ -1,231 +1,231 @@
 <?

 

 Loader::load('collector', array(

-    'image/AlbumCollector',

-    'waterfall/WatercourseCollector',

-    'waterfall/WaterfallCollector',

-    'waterfall/LogCollector'));

+	'image/AlbumCollector',

+	'waterfall/WatercourseCollector',

+	'waterfall/WaterfallCollector',

+	'waterfall/LogCollector'));

 Loader::load('controller', 'waterfalls/DefaultPageController');

 

 final class WaterfallController extends DefaultPageController

 {

 

-    private static $STANDARD_IMAGE_NODE = '<img src="/photo/%s/%s-size-standard.jpg" alt="%s" height="600" width="800" />';

-

-    private static $FULL_IMAGE_LINK = '/photo/%s/%s-size-standard.jpg';

-    private static $THUMB_IMAGE_NODE = '<img src="/photo/%s/%s-size-thumb.jpg" alt="%s" height="%s" width="%s" />';

-    private static $MEDIUM_IMAGE_NODE = '<img src="/photo/%s/%s-size-medium.jpg" alt="%s" height="375" width="500" />';

-

-    private $waterfall;

-

-    public function __construct()

-    {

-        parent::__construct();

-

-        $path_watercourse = URLDecode::getPiece(1);

-        $path_fall = URLDecode::getPiece(2);

-

-        $this->waterfall = WaterfallCollector::getByAlias($path_watercourse, $path_fall);

-        if (!$this->waterfall) {

-              $this->eject();

-        }

-        

-        $this->handle_comment_submit(

-            self::$WATERFALL_SITE_ID,

-            "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}",

-            Loader::getRootUrl('waterfalls') . "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}/",

-            $this->waterfall->name);

-        

-        $this->add_waterfall_js();

-    }

-

-    protected function set_head_data()

-    {

-        parent::set_head_data();

-

-        $this->set_title("{$this->waterfall->name} on {$this->waterfall->watercourse} | " . self::$WEBSITE_TITLE);

-        $this->set_description($this->waterfall->description);

-        $this->set_keywords((array) $this->waterfall->name);

-    }

-

-    protected function set_body_data($page_type = 'normal')

-    {

-        parent::set_body_data($page_type);

-

-        $body_data = $this->format_waterfall_data($this->waterfall);

-        $body_data['comment_array'] = $this->get_comment_array(self::$WATERFALL_SITE_ID, "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}");

-

-        $this->set_body('data', $body_data);

-

-        $this->set_body('view', 'Fall');

-    }

-

-    private function format_waterfall_data($waterfall)

-    {

-        $waterfall_data = array();

-        $waterfall_data['introduction'] = $this->get_waterfall_introduction($waterfall);

-        $waterfall_data['name'] = $waterfall->name;

-        $waterfall_data['watercourse'] = $waterfall->watercourse;

-        $waterfall_data['path'] = "/{$waterfall->watercourse_alias}/{$waterfall->alias}/";

-        $waterfall_data['tagline'] = $waterfall->introduction;

-        $waterfall_data['main_photo'] = sprintf(self::$STANDARD_IMAGE_NODE, $waterfall->photo_category, $waterfall->photo, $waterfall->photo_description);

-        $waterfall_data['album'] = $this->get_album();

-        $waterfall_data['body'] = $this->format_waterfall_content($waterfall->body);

-        $waterfall_data['directions'] = $this->format_waterfall_content($waterfall->directions);

-        $waterfall_data['sidebar'] = $this->get_sidebar($waterfall);

-

-        return $waterfall_data;

-    }

-

-    private function get_waterfall_introduction($waterfall)

-    {

-        return array(

-            'path' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/",

-            'name' => $waterfall->name,

-            'watercourse' => $waterfall->watercourse,

-            'tagline' => $waterfall->introduction,

-        );

-    }

-

-    private function get_main_watercourse($alias)

-    {

-        $watercourse = WatercourseCollector::getByAlias($alias);

-        if ($watercourse->parent != 0) {

-            $watercourse = WatercourseCollector::getById($watercourse->parent);

-        }

-        

-        return (object) array(

-            'name' => $watercourse->name,

-            'title' => $watercourse->name,

-            'alias' => $watercourse->alias,

-        );

-    }

-

-    private function format_waterfall_content($content)

-    {

-        $content = Content::instance('FixInternalLink', $content)->activate();

-        

-        return $content;

-    }

-

-    private function get_album()

-    {

-        $album = array();

-        

-        if($this->waterfall->album == 0)

-            return $album;

-        

-        $photo_list = AlbumCollector::getPhotoListForAlbum($this->waterfall->album);

-        foreach($photo_list as $photo)

-        {

-            $photo_array = array();

-            $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);

-            $photo_array['description'] = $photo->description;

+	private static $STANDARD_IMAGE_NODE = '<img src="/photo/%s/%s-size-standard.jpg" alt="%s" height="600" width="800" />';

+

+	private static $FULL_IMAGE_LINK = '/photo/%s/%s-size-standard.jpg';

+	private static $THUMB_IMAGE_NODE = '<img src="/photo/%s/%s-size-thumb.jpg" alt="%s" height="%s" width="%s" />';

+	private static $MEDIUM_IMAGE_NODE = '<img src="/photo/%s/%s-size-medium.jpg" alt="%s" height="375" width="500" />';

+

+	private $waterfall;

+

+	public function __construct()

+	{

+		parent::__construct();

+

+		$path_watercourse = URLDecode::getPiece(1);

+		$path_fall = URLDecode::getPiece(2);

+

+		$this->waterfall = WaterfallCollector::getByAlias($path_watercourse, $path_fall);

+		if (!$this->waterfall) {

+			  $this->eject();

+		}

+        

+		$this->handle_comment_submit(

+			self::$WATERFALL_SITE_ID,

+			"{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}",

+			Loader::getRootUrl('waterfalls') . "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}/",

+			$this->waterfall->name);

+        

+		$this->add_waterfall_js();

+	}

+

+	protected function set_head_data()

+	{

+		parent::set_head_data();

+

+		$this->set_title("{$this->waterfall->name} on {$this->waterfall->watercourse} | " . self::$WEBSITE_TITLE);

+		$this->set_description($this->waterfall->description);

+		$this->set_keywords((array) $this->waterfall->name);

+	}

+

+	protected function set_body_data($page_type = 'normal')

+	{

+		parent::set_body_data($page_type);

+

+		$body_data = $this->format_waterfall_data($this->waterfall);

+		$body_data['comment_array'] = $this->get_comment_array(self::$WATERFALL_SITE_ID, "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}");

+

+		$this->set_body('data', $body_data);

+

+		$this->set_body('view', 'Fall');

+	}

+

+	private function format_waterfall_data($waterfall)

+	{

+		$waterfall_data = array();

+		$waterfall_data['introduction'] = $this->get_waterfall_introduction($waterfall);

+		$waterfall_data['name'] = $waterfall->name;

+		$waterfall_data['watercourse'] = $waterfall->watercourse;

+		$waterfall_data['path'] = "/{$waterfall->watercourse_alias}/{$waterfall->alias}/";

+		$waterfall_data['tagline'] = $waterfall->introduction;

+		$waterfall_data['main_photo'] = sprintf(self::$STANDARD_IMAGE_NODE, $waterfall->photo_category, $waterfall->photo, $waterfall->photo_description);

+		$waterfall_data['album'] = $this->get_album();

+		$waterfall_data['body'] = $this->format_waterfall_content($waterfall->body);

+		$waterfall_data['directions'] = $this->format_waterfall_content($waterfall->directions);

+		$waterfall_data['sidebar'] = $this->get_sidebar($waterfall);

+

+		return $waterfall_data;

+	}

+

+	private function get_waterfall_introduction($waterfall)

+	{

+		return array(

+			'path' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/",

+			'name' => $waterfall->name,

+			'watercourse' => $waterfall->watercourse,

+			'tagline' => $waterfall->introduction,

+		);

+	}

+

+	private function get_main_watercourse($alias)

+	{

+		$watercourse = WatercourseCollector::getByAlias($alias);

+		if ($watercourse->parent != 0) {

+			$watercourse = WatercourseCollector::getById($watercourse->parent);

+		}

+        

+		return (object) array(

+			'name' => $watercourse->name,

+			'title' => $watercourse->name,

+			'alias' => $watercourse->alias,

+		);

+	}

+

+	private function format_waterfall_content($content)

+	{

+		$content = Content::instance('FixInternalLink', $content)->activate();

+        

+		return $content;

+	}

+

+	private function get_album()

+	{

+		$album = array();

+        

+		if($this->waterfall->album == 0)

+			return $album;

+        

+		$photo_list = AlbumCollector::getPhotoListForAlbum($this->waterfall->album);

+		foreach($photo_list as $photo)

+		{

+			$photo_array = array();

+			$photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);

+			$photo_array['description'] = $photo->description;

             

-            if($photo->height < $photo->width)

-                list($height, $width) = array(75, 100);

-            else

-                list($height, $width) = array(100, 75);

+			if($photo->height < $photo->width)

+				list($height, $width) = array(75, 100);

+			else

+				list($height, $width) = array(100, 75);

             

-            $photo_array['image_node'] = sprintf(

-                self::$THUMB_IMAGE_NODE,

-                $photo->category,

-                $photo->name,

-                $photo->description,

-                $height,

-                $width);

+			$photo_array['image_node'] = sprintf(

+				self::$THUMB_IMAGE_NODE,

+				$photo->category,

+				$photo->name,

+				$photo->description,

+				$height,

+				$width);

             

-            $album[] = (object) $photo_array;

-        }

+			$album[] = (object) $photo_array;

+		}

         

-        return $album;

-    }

+		return $album;

+	}

 

 	private function get_sidebar($waterfall)

 	{

 		$sidebar_data = array();

 		$sidebar_data['name'] = $waterfall->name;

 		$sidebar_data['watercourse'] = $waterfall->watercourse;

-        $sidebar_data['main_watercourse'] = $this->get_main_watercourse($waterfall->watercourse_alias);

+		$sidebar_data['main_watercourse'] = $this->get_main_watercourse($waterfall->watercourse_alias);

 		$sidebar_data['rating_display'] = ($waterfall->rating / 2) . '/5';

-        $sidebar_data['rating'] = $waterfall->rating;

+		$sidebar_data['rating'] = $waterfall->rating;

 		$sidebar_data['height'] = Content::instance('ImperialUnit', $waterfall->height)->activate('inches');

 		$sidebar_data['width'] = Content::instance('ImperialUnit', $waterfall->width)->activate('inches');

 		$sidebar_data['drop_height'] = Content::instance('ImperialUnit', $waterfall->drop_height)->activate('inches');

 		$sidebar_data['drop_count'] = $waterfall->drop_count;

 		

-        $sidebar_data['county'] = (object) array (

-            'name' => $waterfall->county,

-            'alias' => $waterfall->county_alias,

-            'title' => $waterfall->county_title,

-        );

+		$sidebar_data['county'] = (object) array (

+			'name' => $waterfall->county,

+			'alias' => $waterfall->county_alias,

+			'title' => $waterfall->county_title,

+		);

         

 		$sidebar_data['nearest_town'] = $waterfall->nearest_town;

 		$sidebar_data['latitude'] = round($waterfall->latitude, 5);

 		$sidebar_data['longitude'] = round($waterfall->longitude, 5);

 		$sidebar_data['elevation'] = Content::instance('ImperialUnit', $waterfall->elevation)->activate('feet');

         

-        $sidebar_data['map'] = $this->get_map_piece($waterfall);

+		$sidebar_data['map'] = $this->get_map_piece($waterfall);

         

-        $sidebar_data['journal_list'] = $this->get_journal_list($waterfall->id);

+		$sidebar_data['journal_list'] = $this->get_journal_list($waterfall->id);

         

-        $sidebar_data['nearby_list'] = $this->get_nearby_list($waterfall->id);

+		$sidebar_data['nearby_list'] = $this->get_nearby_list($waterfall->id);

 		

 		return $sidebar_data;

 	}

 

-    private function get_journal_list($waterfall)

-    {

-        $list = array();

-        $log_result = LogCollector::getLogListForWaterfall($waterfall);

-        foreach ($log_result as $log_row) {

-            $list[] = (object) array(

-                'date' => date('F j, Y', strtotime($log_row->date)),

-                'title' => $log_row->title,

-                'url' => "/journal/{$log_row->alias}/",

-            );

-        }

-        

-        return $list;

-    }

-

-    private function get_map_piece($waterfall)

-    {

-        $map_holder = array();

-        

-        $url = 'http://maps.googleapis.com/maps/api/staticmap';

-        $url .= "?center={$waterfall->latitude},{$waterfall->longitude}";

-        $url .= "&zoom=8";

-        $url .= "&maptype=terrain";

-        $url .= "&size=230x200";

-        $url .= "&markers=color:red|size:small|{$waterfall->latitude},{$waterfall->longitude}";

-        $url .= "&sensor=false";

-        $url .= "&key=AIzaSyA3eWALjUTSIa44KsbOUYRpG0oMd3aNo00";

-        

-        $image = "<img src=\"{$url}\" height=\"200\" width=\"230\" alt=\"{$waterfall->name} Location\" />";

-        $map_holder['image'] = $image;

-        

-        $map_holder['uri'] = '/map/';

-        $map_holder['title'] = "View {$waterfall->name} on a larger map";

-        

-        return (object) $map_holder;

-    }

-

-    private function get_nearby_list($waterfall)

-    {

-        $nearby_list = array();

-        

-        $result = WaterfallCollector::getNearbyList($waterfall);

-        foreach ($result as $row) {

-            $nearby_list[] = (object) array(

-                'url' => "/{$row->watercourse_alias}/{$row->alias}/",

-                'anchor' => $row->name,

-                'title' => "{$row->name} of {$row->watercourse}",

-                'distance' => Content::instance('ImperialUnit', $row->distance)->activate(false),

-            );

-        }

-        

-        return $nearby_list;

-    }

+	private function get_journal_list($waterfall)

+	{

+		$list = array();

+		$log_result = LogCollector::getLogListForWaterfall($waterfall);

+		foreach ($log_result as $log_row) {

+			$list[] = (object) array(

+				'date' => date('F j, Y', strtotime($log_row->date)),

+				'title' => $log_row->title,

+				'url' => "/journal/{$log_row->alias}/",

+			);

+		}

+        

+		return $list;

+	}

+

+	private function get_map_piece($waterfall)

+	{

+		$map_holder = array();

+        

+		$url = 'http://maps.googleapis.com/maps/api/staticmap';

+		$url .= "?center={$waterfall->latitude},{$waterfall->longitude}";

+		$url .= "&zoom=8";

+		$url .= "&maptype=terrain";

+		$url .= "&size=230x200";

+		$url .= "&markers=color:red|size:small|{$waterfall->latitude},{$waterfall->longitude}";

+		$url .= "&sensor=false";

+		$url .= "&key=AIzaSyA3eWALjUTSIa44KsbOUYRpG0oMd3aNo00";

+        

+		$image = "<img src=\"{$url}\" height=\"200\" width=\"230\" alt=\"{$waterfall->name} Location\" />";

+		$map_holder['image'] = $image;

+        

+		$map_holder['uri'] = '/map/';

+		$map_holder['title'] = "View {$waterfall->name} on a larger map";

+        

+		return (object) $map_holder;

+	}

+

+	private function get_nearby_list($waterfall)

+	{

+		$nearby_list = array();

+        

+		$result = WaterfallCollector::getNearbyList($waterfall);

+		foreach ($result as $row) {

+			$nearby_list[] = (object) array(

+				'url' => "/{$row->watercourse_alias}/{$row->alias}/",

+				'anchor' => $row->name,

+				'title' => "{$row->name} of {$row->watercourse}",

+				'distance' => Content::instance('ImperialUnit', $row->distance)->activate(false),

+			);

+		}

+        

+		return $nearby_list;

+	}

 

 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -112,17 +112,17 @@ 
     {

         $album = array();

         

-        if($this->waterfall->album == 0)

+        if ($this->waterfall->album == 0)

             return $album;

         

         $photo_list = AlbumCollector::getPhotoListForAlbum($this->waterfall->album);

-        foreach($photo_list as $photo)

+        foreach ($photo_list as $photo)

         {

             $photo_array = array();

             $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);

             $photo_array['description'] = $photo->description;

             

-            if($photo->height < $photo->width)

+            if ($photo->height < $photo->width)

                 list($height, $width) = array(75, 100);

             else

                 list($height, $width) = array(100, 75);

@@ -154,7 +154,7 @@ 
 		$sidebar_data['drop_height'] = Content::instance('ImperialUnit', $waterfall->drop_height)->activate('inches');

 		$sidebar_data['drop_count'] = $waterfall->drop_count;

 		

-        $sidebar_data['county'] = (object) array (

+        $sidebar_data['county'] = (object) array(

             'name' => $waterfall->county,

             'alias' => $waterfall->county_alias,

             'title' => $waterfall->county_title,

Braces +8 added lines, -6 removed lines

@@ -112,8 +112,9 @@ 
     {

         $album = array();

         

-        if($this->waterfall->album == 0)

-            return $album;

+        if($this->waterfall->album == 0) {

+                    return $album;

+        }

         

         $photo_list = AlbumCollector::getPhotoListForAlbum($this->waterfall->album);

         foreach($photo_list as $photo)

@@ -122,10 +123,11 @@ 
             $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);

             $photo_array['description'] = $photo->description;

             

-            if($photo->height < $photo->width)

-                list($height, $width) = array(75, 100);

-            else

-                list($height, $width) = array(100, 75);

+            if($photo->height < $photo->width) {

+                            list($height, $width) = array(75, 100);

+            } else {

+                            list($height, $width) = array(100, 75);

+            }

             

             $photo_array['image_node'] = sprintf(

                 self::$THUMB_IMAGE_NODE,

module/form/CommentSubmitModule.class.inc.php

Indentation +11 added lines, -11 removed lines

@@ -172,24 +172,24 @@
 			}

 		}

         

-        $site = URLDecode::getSite();

+		$site = URLDecode::getSite();

         

-        if ($site == 'blog') {

-            $message = "Hello!\nThere has been a new comment on the post '{$this->page_title}' at Jacob Emerick's Blog. You have chosen to be notified of it - please reply to jacob@jacobemerick.com if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";

-        } else if ($site == 'waterfalls') {

-            $message = "Hello!\nThere has been a new comment on the page '{$this->page_title}' at Waterfalls of the Keweenaw. You have chosen to be notified of it - please reply to jacob@jacobemerick.com if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";

-        }

+		if ($site == 'blog') {

+			$message = "Hello!\nThere has been a new comment on the post '{$this->page_title}' at Jacob Emerick's Blog. You have chosen to be notified of it - please reply to jacob@jacobemerick.com if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";

+		} else if ($site == 'waterfalls') {

+			$message = "Hello!\nThere has been a new comment on the page '{$this->page_title}' at Waterfalls of the Keweenaw. You have chosen to be notified of it - please reply to jacob@jacobemerick.com if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";

+		}

         

 		foreach($email_recipient_array as $email_recipient)

 		{

 			$mail = new Mail();

 			$mail->setToAddress($email_recipient['email'], $email_recipient['name']);

             

-            if ($site == 'blog') {

-                $mail->setSubject("New Comment on Jacob Emerick's Blog");

-            } else if ($site == 'waterfalls') {

-                $mail->setSubject("New Comment on Waterfalls of the Keweenaw");

-            }

+			if ($site == 'blog') {

+				$mail->setSubject("New Comment on Jacob Emerick's Blog");

+			} else if ($site == 'waterfalls') {

+				$mail->setSubject("New Comment on Waterfalls of the Keweenaw");

+			}

             

 			$mail->setMessage($message);

 			$mail->send();

Spacing +19 added lines, -19 removed lines

@@ -26,15 +26,15 @@ 
 

 	public function activate()

 	{

-		if(!Request::hasPost())

+		if (!Request::hasPost())

 			return false;

-		if(!Request::getPost('submit') == 'Submit Comment')

+		if (!Request::getPost('submit') == 'Submit Comment')

 			return false;

 		

 		$errors = $this->fetch_errors();

-		if(count($errors) > 0)

+		if (count($errors) > 0)

 			return $errors;

-		if(Request::getPost('catch') !== '')

+		if (Request::getPost('catch') !== '')

 			return false;

 		

 		$page_id = $this->save_comment_page();

@@ -50,17 +50,17 @@ 
 	private function fetch_errors()

 	{

 		$errors = array();

-		if(!Validate::checkRequest('post', 'name', 'name'))

+		if (!Validate::checkRequest('post', 'name', 'name'))

 			$errors['name'] = 'You must include a valid name';

-		if(!Validate::checkRequest('post', 'email', 'email'))

+		if (!Validate::checkRequest('post', 'email', 'email'))

 			$errors['email'] = 'You must include a valid email';

-		if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))

+		if (Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))

 			$errors['website'] = 'Please enter a valid website';

-		if(!Validate::checkRequest('post', 'comment', 'string'))

+		if (!Validate::checkRequest('post', 'comment', 'string'))

 			$errors['comment'] = 'You must enter a comment';

-		if(Request::getPost('notify') && Request::getPost('notify') != 'check')

+		if (Request::getPost('notify') && Request::getPost('notify') != 'check')

 			$errors['notify'] = 'You entered an invalid notify request';

-		if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))

+		if (Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))

 			$errors['reply'] = 'You entered an invalid reply request';

 		

 		return $errors;

@@ -69,7 +69,7 @@ 
 	private function save_comment_page()

 	{

 		$page_result = CommentCollector::getCommentPageByURL($this->path, $this->site);

-		if($page_result !== null)

+		if ($page_result !== null)

 			return $page_result->id;

 		

 		$query = "INSERT INTO `jpemeric_comment`.`comment_page` (`site`, `path`) VALUES ('%d', '%s')";

@@ -85,7 +85,7 @@ 
 			'name' => Request::getPost('name'),

 			'email' => Request::getPost('email'));

 		

-		if(Request::getPost('website') != '')

+		if (Request::getPost('website') != '')

 			$cookie_value['website'] = Request::getPost('website');

 		

 		$cookie_value = json_encode($cookie_value);

@@ -95,7 +95,7 @@ 
 			->save();

 		

 		$commenter_result = CommentCollector::getCommenterByFields(Request::getPost('name'), Request::getPost('email'), Request::getPost('website'));

-		if($commenter_result !== null)

+		if ($commenter_result !== null)

 			return $commenter_result->id;

 		

 		$query = "INSERT INTO `jpemeric_comment`.`commenter` (`name`,`email`,`url`) VALUES ('%s','%s','%s')";

@@ -112,7 +112,7 @@ 
 	private function save_comment()

 	{

 		$comment_result = CommentCollector::getCommentByBody(Request::getPost('comment'));

-		if($comment_result !== null)

+		if ($comment_result !== null)

 			return $comment_result->id;

 		

 		$query = "INSERT INTO `jpemeric_comment`.`comment` (`body`, `body_format`) VALUES ('%s', '%s')";

@@ -133,7 +133,7 @@ 
 		$query = "INSERT INTO `jpemeric_comment`.`comment_meta` (`commenter`,`comment`,`reply`,`notify`,`comment_page`,`date`,`display`) VALUES ('%d','%d','%d','%d','%d','%s','%d')";

 		

 		$reply = Database::escape(Request::getPost('type'));

-		if($reply == 'new')

+		if ($reply == 'new')

 			$reply = 0;

 		// else check to make sure value is legit

 		

@@ -157,13 +157,13 @@ 
 		

 		$commenter_result = CommentCollector::getCommenterByFields(Request::getPost('name'), Request::getPost('email'), Request::getPost('website'));

 		

-		if($commenter_result->trusted == 1)

+		if ($commenter_result->trusted == 1)

 		{

 			$notification_result = CommentCollector::getNotificationForPage($page);

 			

-			foreach($notification_result as $notification_row)

+			foreach ($notification_result as $notification_row)

 			{

-				if($notification_row->email == Request::getPost('email'))

+				if ($notification_row->email == Request::getPost('email'))

 					continue;

 				

 				$email_recipient_array[$notification_row->email] = array(

@@ -180,7 +180,7 @@ 
             $message = "Hello!\nThere has been a new comment on the page '{$this->page_title}' at Waterfalls of the Keweenaw. You have chosen to be notified of it - please reply to jacob@jacobemerick.com if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";

         }

         

-		foreach($email_recipient_array as $email_recipient)

+		foreach ($email_recipient_array as $email_recipient)

 		{

 			$mail = new Mail();

 			$mail->setToAddress($email_recipient['email'], $email_recipient['name']);

Braces +48 added lines, -32 removed lines

@@ -26,16 +26,20 @@ 
 

 	public function activate()

 	{

-		if(!Request::hasPost())

-			return false;

-		if(!Request::getPost('submit') == 'Submit Comment')

-			return false;

+		if(!Request::hasPost()) {

+					return false;

+		}

+		if(!Request::getPost('submit') == 'Submit Comment') {

+					return false;

+		}

 		

 		$errors = $this->fetch_errors();

-		if(count($errors) > 0)

-			return $errors;

-		if(Request::getPost('catch') !== '')

-			return false;

+		if(count($errors) > 0) {

+					return $errors;

+		}

+		if(Request::getPost('catch') !== '') {

+					return false;

+		}

 		

 		$page_id = $this->save_comment_page();

 		$commenter_id = $this->save_commenter();

@@ -50,18 +54,24 @@ 
 	private function fetch_errors()

 	{

 		$errors = array();

-		if(!Validate::checkRequest('post', 'name', 'name'))

-			$errors['name'] = 'You must include a valid name';

-		if(!Validate::checkRequest('post', 'email', 'email'))

-			$errors['email'] = 'You must include a valid email';

-		if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))

-			$errors['website'] = 'Please enter a valid website';

-		if(!Validate::checkRequest('post', 'comment', 'string'))

-			$errors['comment'] = 'You must enter a comment';

-		if(Request::getPost('notify') && Request::getPost('notify') != 'check')

-			$errors['notify'] = 'You entered an invalid notify request';

-		if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))

-			$errors['reply'] = 'You entered an invalid reply request';

+		if(!Validate::checkRequest('post', 'name', 'name')) {

+					$errors['name'] = 'You must include a valid name';

+		}

+		if(!Validate::checkRequest('post', 'email', 'email')) {

+					$errors['email'] = 'You must include a valid email';

+		}

+		if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url')) {

+					$errors['website'] = 'Please enter a valid website';

+		}

+		if(!Validate::checkRequest('post', 'comment', 'string')) {

+					$errors['comment'] = 'You must enter a comment';

+		}

+		if(Request::getPost('notify') && Request::getPost('notify') != 'check') {

+					$errors['notify'] = 'You entered an invalid notify request';

+		}

+		if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer')) {

+					$errors['reply'] = 'You entered an invalid reply request';

+		}

 		

 		return $errors;

 	}

@@ -69,8 +79,9 @@ 
 	private function save_comment_page()

 	{

 		$page_result = CommentCollector::getCommentPageByURL($this->path, $this->site);

-		if($page_result !== null)

-			return $page_result->id;

+		if($page_result !== null) {

+					return $page_result->id;

+		}

 		

 		$query = "INSERT INTO `jpemeric_comment`.`comment_page` (`site`, `path`) VALUES ('%d', '%s')";

 		$query = sprintf($query, $this->site, $this->path);

@@ -85,8 +96,9 @@ 
 			'name' => Request::getPost('name'),

 			'email' => Request::getPost('email'));

 		

-		if(Request::getPost('website') != '')

-			$cookie_value['website'] = Request::getPost('website');

+		if(Request::getPost('website') != '') {

+					$cookie_value['website'] = Request::getPost('website');

+		}

 		

 		$cookie_value = json_encode($cookie_value);

 		

@@ -95,8 +107,9 @@ 
 			->save();

 		

 		$commenter_result = CommentCollector::getCommenterByFields(Request::getPost('name'), Request::getPost('email'), Request::getPost('website'));

-		if($commenter_result !== null)

-			return $commenter_result->id;

+		if($commenter_result !== null) {

+					return $commenter_result->id;

+		}

 		

 		$query = "INSERT INTO `jpemeric_comment`.`commenter` (`name`,`email`,`url`) VALUES ('%s','%s','%s')";

 		

@@ -112,8 +125,9 @@ 
 	private function save_comment()

 	{

 		$comment_result = CommentCollector::getCommentByBody(Request::getPost('comment'));

-		if($comment_result !== null)

-			return $comment_result->id;

+		if($comment_result !== null) {

+					return $comment_result->id;

+		}

 		

 		$query = "INSERT INTO `jpemeric_comment`.`comment` (`body`, `body_format`) VALUES ('%s', '%s')";

 		

@@ -133,8 +147,9 @@ 
 		$query = "INSERT INTO `jpemeric_comment`.`comment_meta` (`commenter`,`comment`,`reply`,`notify`,`comment_page`,`date`,`display`) VALUES ('%d','%d','%d','%d','%d','%s','%d')";

 		

 		$reply = Database::escape(Request::getPost('type'));

-		if($reply == 'new')

-			$reply = 0;

+		if($reply == 'new') {

+					$reply = 0;

+		}

 		// else check to make sure value is legit

 		

 		$notify = (Request::getPost('notify') == 'check') ? 1 : 0;

@@ -163,8 +178,9 @@ 
 			

 			foreach($notification_result as $notification_row)

 			{

-				if($notification_row->email == Request::getPost('email'))

-					continue;

+				if($notification_row->email == Request::getPost('email')) {

+									continue;

+				}

 				

 				$email_recipient_array[$notification_row->email] = array(

 					'email' => $notification_row->email,

router/BlogRouter.class.inc.php

Spacing +6 added lines, -6 removed lines

@@ -45,11 +45,11 @@ 
 

 	protected function check_for_special_redirect($uri)

 	{

-		if(preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))

+		if (preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))

 		{

 			Loader::load('collector', 'blog/PostCollector');

 			$post = PostCollector::getPostByURI($matches[2]);

-			if(!$post)

+			if (!$post)

 			{

 				Loader::loadNew('controller', '/Error404Controller')

 					->activate();

@@ -61,21 +61,21 @@ 
 		else

 		{

 			$post_uri = URLDecode::getPiece(1);

-			if($post_uri !== null)

+			if ($post_uri !== null)

 			{

 				Loader::load('collector', 'blog/PostCollector');

 				$post = PostCollector::getPostByURI($post_uri);

 				

-				if($post != false)

+				if ($post != false)

 				{

 					Loader::load('utility', 'Content');

 					$uri = Content::instance('URLSafe', "/{$post->category}/{$post->title_url}/")->activate();

 				}

 			}

 		}

-		if($uri == '/search/')

+		if ($uri == '/search/')

 		{

-			if(Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))

+			if (Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))

 			{

 				$uri .= Request::getGet('search');

 				$uri .= '/';

Braces +1 added lines, -2 removed lines

@@ -57,8 +57,7 @@
 			

 			Loader::load('utility', 'Content');

 			$uri = Content::instance('URLSafe', "/{$post->category}/{$post->title_url}/")->activate();

-		}

-		else

+		} else

 		{

 			$post_uri = URLDecode::getPiece(1);

 			if($post_uri !== null)

router/PortfolioRouter.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -27,12 +27,12 @@
 

 	protected function check_for_special_redirect($uri)

 	{

-		if(preg_match('@^/piece/([a-z0-9-]+)(/?)$@', $uri, $matches))

+		if (preg_match('@^/piece/([a-z0-9-]+)(/?)$@', $uri, $matches))

 		{

 			Loader::load('collector', 'portfolio/PortfolioCollector');

 			$piece = PortfolioCollector::getPieceByURI($matches[1]);

 			

-			if($piece === null)

+			if ($piece === null)

 			{

 				Loader::loadNew('controller', '/Error404Controller')

 					->activate();

router/Router.class.inc.php

Indentation +6 added lines, -6 removed lines

@@ -96,9 +96,9 @@ 
 		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')

 			$redirect_uri .= '/';

 		

-        if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {

-            $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;

-        }

+		if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {

+			$redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;

+		}

         

 		if($redirect_uri == URLDecode::getURI())

 			return;

@@ -129,8 +129,8 @@ 
 			}

 

 			$image = new ImageOld($file);

-        	        if(!$image->isValid()) {

-                	        Loader::loadNew('controller', '/Error404Controller')->activate();

+					if(!$image->isValid()) {

+							Loader::loadNew('controller', '/Error404Controller')->activate();

 				exit();

 			}

 		}

@@ -201,7 +201,7 @@ 
 			URLDecode::getExtension() != 'jpg' &&

 			URLDecode::getExtension() != 'png' &&

 			URLDecode::getExtension() != 'ico' &&

-            strstr(URLDecode::getURI(), '#') === false);

+			strstr(URLDecode::getURI(), '#') === false);

 	}

 

 }

Spacing +29 added lines, -29 removed lines

@@ -19,26 +19,26 @@ 
 

 	private static function get_router_name()

 	{

-		if(Request::isAJAX())

+		if (Request::isAJAX())

 			return 'AJAXRouter';

-		if(URLDecode::getURI() == '/robots.txt')

+		if (URLDecode::getURI() == '/robots.txt')

 			return 'RobotRouter';

-		if(URLDecode::getURI() == '/sitemap.xml')

+		if (URLDecode::getURI() == '/sitemap.xml')

 			return 'SitemapRouter';

-		if(URLDecode::getURI() == '/rss/')

+		if (URLDecode::getURI() == '/rss/')

 			return 'RSSRouter';

-		if(URLDecode::getExtension() == 'css')

+		if (URLDecode::getExtension() == 'css')

 			return 'StyleRouter';

-		if(URLDecode::getExtension() == 'js')

+		if (URLDecode::getExtension() == 'js')

 			return 'ScriptRouter';

-		if(URLDecode::getExtension() == 'ico')

+		if (URLDecode::getExtension() == 'ico')

 			return 'ImageRouter';

-		if(URLDecode::getExtension() == 'jpg')

+		if (URLDecode::getExtension() == 'jpg')

 			return 'ImageRouter';

-		if(URLDecode::getExtension() == 'png')

+		if (URLDecode::getExtension() == 'png')

 			return 'ImageRouter';

 		

-		switch(URLDecode::getSite())

+		switch (URLDecode::getSite())

 		{

 			case 'ajax' :

 				return 'AjaxRouter';

@@ -86,37 +86,37 @@ 
 

 	final protected function check_for_redirect($redirect_uri)

 	{

-		foreach($this->get_redirect_array() as $check)

+		foreach ($this->get_redirect_array() as $check)

 		{

 			$redirect_uri = preg_replace($check->pattern, $check->replace, $redirect_uri);

 		}

 		

 		$redirect_uri = $this->check_for_special_redirect($redirect_uri);

 		

-		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')

+		if ($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')

 			$redirect_uri .= '/';

 		

         if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {

             $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;

         }

         

-		if($redirect_uri == URLDecode::getURI())

+		if ($redirect_uri == URLDecode::getURI())

 			return;

 		

 		$controller_check = $redirect_uri;

-		if(substr($redirect_uri, 0, 4) == 'http')

+		if (substr($redirect_uri, 0, 4) == 'http')

 			$controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);

 		

 		$controller = $this->get_controller($controller_check);

-		if($controller == '/Error404Controller')

+		if ($controller == '/Error404Controller')

 		{

 			Loader::loadNew('controller', '/Error404Controller')

 				->activate();

 			exit;

 		}

 

-		if($this->get_primary_folder() == 'images') {

-			$file = $controller_check;//URLDecode::getURI();

+		if ($this->get_primary_folder() == 'images') {

+			$file = $controller_check; //URLDecode::getURI();

 

 			if (

 				URLDecode::getSite() == 'images' ||

@@ -129,13 +129,13 @@ 
 			}

 

 			$image = new ImageOld($file);

-        	        if(!$image->isValid()) {

+        	        if (!$image->isValid()) {

                 	        Loader::loadNew('controller', '/Error404Controller')->activate();

 				exit();

 			}

 		}

 		

-		if(substr($redirect_uri, 0, 4) != 'http')

+		if (substr($redirect_uri, 0, 4) != 'http')

 		{

 			$redirect_uri = substr($redirect_uri, 1);

 			$redirect_uri = URLDecode::getBase() . $redirect_uri;

@@ -152,12 +152,12 @@ 
 

 	final private function get_controller($uri)

 	{

-		foreach($this->get_direct_array() as $check)

+		foreach ($this->get_direct_array() as $check)

 		{

-			if($uri == $check->match)

+			if ($uri == $check->match)

 				return "{$this->get_primary_folder()}/{$check->controller}";

 			

-			if(preg_match("@^{$check->match}$@", $uri))

+			if (preg_match("@^{$check->match}$@", $uri))

 				return "{$this->get_primary_folder()}/{$check->controller}";

 		}

 		

@@ -166,19 +166,19 @@ 
 

 	final private function get_primary_folder()

 	{

-		if(Request::isAjax())

+		if (Request::isAjax())

 			return 'ajax';

-		if(URLDecode::getURI() == '/robots.txt')

+		if (URLDecode::getURI() == '/robots.txt')

 			return 'robot';

-		if(URLDecode::getURI() == '/sitemap.xml')

+		if (URLDecode::getURI() == '/sitemap.xml')

 			return 'sitemap';

-		if(URLDecode::getURI() == '/rss/')

+		if (URLDecode::getURI() == '/rss/')

 			return 'rss';

-		if(URLDecode::getExtension() == 'css')

+		if (URLDecode::getExtension() == 'css')

 			return 'styles';

-		if(URLDecode::getExtension() == 'js')

+		if (URLDecode::getExtension() == 'js')

 			return 'scripts';

-		if(

+		if (

 			URLDecode::getExtension() == 'jpg' ||

 			URLDecode::getExtension() == 'ico' ||

 			URLDecode::getExtension() == 'png')

Braces +63 added lines, -42 removed lines

@@ -19,24 +19,33 @@ 
 

 	private static function get_router_name()

 	{

-		if(Request::isAJAX())

-			return 'AJAXRouter';

-		if(URLDecode::getURI() == '/robots.txt')

-			return 'RobotRouter';

-		if(URLDecode::getURI() == '/sitemap.xml')

-			return 'SitemapRouter';

-		if(URLDecode::getURI() == '/rss/')

-			return 'RSSRouter';

-		if(URLDecode::getExtension() == 'css')

-			return 'StyleRouter';

-		if(URLDecode::getExtension() == 'js')

-			return 'ScriptRouter';

-		if(URLDecode::getExtension() == 'ico')

-			return 'ImageRouter';

-		if(URLDecode::getExtension() == 'jpg')

-			return 'ImageRouter';

-		if(URLDecode::getExtension() == 'png')

-			return 'ImageRouter';

+		if(Request::isAJAX()) {

+					return 'AJAXRouter';

+		}

+		if(URLDecode::getURI() == '/robots.txt') {

+					return 'RobotRouter';

+		}

+		if(URLDecode::getURI() == '/sitemap.xml') {

+					return 'SitemapRouter';

+		}

+		if(URLDecode::getURI() == '/rss/') {

+					return 'RSSRouter';

+		}

+		if(URLDecode::getExtension() == 'css') {

+					return 'StyleRouter';

+		}

+		if(URLDecode::getExtension() == 'js') {

+					return 'ScriptRouter';

+		}

+		if(URLDecode::getExtension() == 'ico') {

+					return 'ImageRouter';

+		}

+		if(URLDecode::getExtension() == 'jpg') {

+					return 'ImageRouter';

+		}

+		if(URLDecode::getExtension() == 'png') {

+					return 'ImageRouter';

+		}

 		

 		switch(URLDecode::getSite())

 		{

@@ -93,19 +102,22 @@ 
 		

 		$redirect_uri = $this->check_for_special_redirect($redirect_uri);

 		

-		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')

-			$redirect_uri .= '/';

+		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') {

+					$redirect_uri .= '/';

+		}

 		

         if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {

             $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;

         }

         

-		if($redirect_uri == URLDecode::getURI())

-			return;

+		if($redirect_uri == URLDecode::getURI()) {

+					return;

+		}

 		

 		$controller_check = $redirect_uri;

-		if(substr($redirect_uri, 0, 4) == 'http')

-			$controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);

+		if(substr($redirect_uri, 0, 4) == 'http') {

+					$controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);

+		}

 		

 		$controller = $this->get_controller($controller_check);

 		if($controller == '/Error404Controller')

@@ -154,11 +166,13 @@ 
 	{

 		foreach($this->get_direct_array() as $check)

 		{

-			if($uri == $check->match)

-				return "{$this->get_primary_folder()}/{$check->controller}";

+			if($uri == $check->match) {

+							return "{$this->get_primary_folder()}/{$check->controller}";

+			}

 			

-			if(preg_match("@^{$check->match}$@", $uri))

-				return "{$this->get_primary_folder()}/{$check->controller}";

+			if(preg_match("@^{$check->match}$@", $uri)) {

+							return "{$this->get_primary_folder()}/{$check->controller}";

+			}

 		}

 		

 		return '/Error404Controller';

@@ -166,23 +180,30 @@ 
 

 	final private function get_primary_folder()

 	{

-		if(Request::isAjax())

-			return 'ajax';

-		if(URLDecode::getURI() == '/robots.txt')

-			return 'robot';

-		if(URLDecode::getURI() == '/sitemap.xml')

-			return 'sitemap';

-		if(URLDecode::getURI() == '/rss/')

-			return 'rss';

-		if(URLDecode::getExtension() == 'css')

-			return 'styles';

-		if(URLDecode::getExtension() == 'js')

-			return 'scripts';

+		if(Request::isAjax()) {

+					return 'ajax';

+		}

+		if(URLDecode::getURI() == '/robots.txt') {

+					return 'robot';

+		}

+		if(URLDecode::getURI() == '/sitemap.xml') {

+					return 'sitemap';

+		}

+		if(URLDecode::getURI() == '/rss/') {

+					return 'rss';

+		}

+		if(URLDecode::getExtension() == 'css') {

+					return 'styles';

+		}

+		if(URLDecode::getExtension() == 'js') {

+					return 'scripts';

+		}

 		if(

 			URLDecode::getExtension() == 'jpg' ||

 			URLDecode::getExtension() == 'ico' ||

-			URLDecode::getExtension() == 'png')

-			return 'images';

+			URLDecode::getExtension() == 'png') {

+					return 'images';

+		}

 		

 		return URLDecode::getSite();

 	}