Inspection of "Silly hack" - jacobemerick/web - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 6336a8...2eca18 )

by Jacob

created 2021-05-05 20:01 UTC

Status

Braces +20 added lines, -16 removed lines patch added patch discarded remove patch

@@ -2,8 +2,8 @@  discard block
 block discarded – undo
 
 Loader::load('controller', 'home/DefaultPageController');
 
-final class ContactController extends DefaultPageController
-{
+final class ContactController extends DefaultPageController
+{
 
 	private static $TITLE = 'Contact | Jacob Emerick';
 	private static $DESCRIPTION = 'Contact page to reach Jacob Emerick by email or social networks';
@@ -16,8 +16,8 @@  discard block
 block discarded – undo
 		'email',
 		'connect');
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()
+	{
 		$this->set_title(self::$TITLE);
 		$this->set_description(self::$DESCRIPTION);
 		$this->set_keywords(self::$KEYWORD_ARRAY);
@@ -25,27 +25,31 @@  discard block
 block discarded – undo
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()
+	{
 		$this->set_body('form_container', $this->process_form());
 		$this->set_body_view('Contact');
 		
 		parent::set_body_data();
 	}
 
-	private function process_form()
-	{
-		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!')
-			return (object) array('display' => 'normal');
+	private function process_form()
+	{
+		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!') {
+					return (object) array('display' => 'normal');
+		}
 		
 		Loader::load('utility', 'Validate');
 		$error_result = array();
-		if(!Validate::checkRequest('post', 'name', 'string'))
-			$error_result['name'] = 'please enter your name';
-		if(!Validate::checkRequest('post', 'email', 'string'))
-			$error_result['email'] = 'please enter a valid email';
-		if(!Validate::checkRequest('post', 'message', 'string'))
-			$error_result['message'] = 'please write a message';
+		if(!Validate::checkRequest('post', 'name', 'string')) {
+					$error_result['name'] = 'please enter your name';
+		}
+		if(!Validate::checkRequest('post', 'email', 'string')) {
+					$error_result['email'] = 'please enter a valid email';
+		}
+		if(!Validate::checkRequest('post', 'message', 'string')) {
+					$error_result['message'] = 'please write a message';
+		}
 		
 		$values = (object) array(
 			'name' => Request::getPost('name'),

Please login to merge, or discard this patch.

controller/home/AboutController.class.inc.php 1 patch

Braces +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -2,8 +2,8 @@  discard block
 block discarded – undo
 
 Loader::load('controller', 'home/DefaultPageController');
 
-final class AboutController extends DefaultPageController
-{
+final class AboutController extends DefaultPageController
+{
 
 	private static $TITLE = 'About | Jacob Emerick';
 	private static $DESCRIPTION = 'Some basic information about Jacob Emerick and his past, web development, and hiking adventures';
@@ -17,8 +17,8 @@  discard block
 block discarded – undo
 		'web developer',
 		'hiker');
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()
+	{
 		$this->set_title(self::$TITLE);
 		$this->set_description(self::$DESCRIPTION);
 		$this->set_keywords(self::$KEYWORD_ARRAY);
@@ -26,8 +26,8 @@  discard block
 block discarded – undo
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()
+	{
 		$this->set_body_view('About');
 		
 		parent::set_body_data();

Please login to merge, or discard this patch.

controller/waterfalls/LogController.class.inc.php 1 patch

Braces +31 added lines, -28 removed lines patch added patch discarded remove patch

@@ -5,8 +5,8 @@  discard block
 block discarded – undo
     'waterfall/LogCollector'));
 Loader::load('controller', 'waterfalls/DefaultPageController');
 
-final class LogController extends DefaultPageController
-{
+final class LogController extends DefaultPageController
+{
 
     private static $AUTHOR = 'Jacob Emerick';
     private static $AUTHOR_URL = 'https://home.jacobemerick.com/';
@@ -18,15 +18,16 @@  discard block
 block discarded – undo
 
     private $log;
 
-    public function __construct()
-    {
+    public function __construct()
+    {
         parent::__construct();
         
         $log_path = URLDecode::getPiece(2);
         
         $this->log = LogCollector::getByAlias($log_path);
-        if(!$this->log)
-            $this->eject();
+        if(!$this->log) {
+                    $this->eject();
+        }
 
         $this->parent_navigation_item = 'journal';
         
@@ -39,8 +40,8 @@  discard block
 block discarded – undo
         $this->add_waterfall_js();
     }
 
-    protected function set_head_data()
-    {
+    protected function set_head_data()
+    {
         parent::set_head_data();
         
         $this->set_title("{$this->log->title} | " . self::$WEBSITE_TITLE);
@@ -56,8 +57,8 @@  discard block
 block discarded – undo
         $this->set_keywords($keyword_array);
     }
 
-    protected function set_body_data($page_type = 'normal')
-    {
+    protected function set_body_data($page_type = 'normal')
+    {
         parent::set_body_data($page_type);
         
         $this->set_body('view', 'Log');
@@ -71,8 +72,8 @@  discard block
 block discarded – undo
         $this->set_body('data', $body_data);
     }
 
-    private function get_formatted_log()
-    {
+    private function get_formatted_log()
+    {
         $formatted_log = array();
         
         $formatted_log['introduction'] = $this->get_log_introduction($this->log);
@@ -84,8 +85,8 @@  discard block
 block discarded – undo
         return $formatted_log;
     }
 
-    private function get_log_introduction($log)
-    {
+    private function get_log_introduction($log)
+    {
         return array(
             'title' => $log->title,
             'url' => Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $log->alias . '/',
@@ -103,8 +104,8 @@  discard block
 block discarded – undo
     }
 
     // @todo - link things up
-    private function get_formatted_log_body()
-    {
+    private function get_formatted_log_body()
+    {
         $body = $this->log->body;
         
         $body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
@@ -113,8 +114,8 @@  discard block
 block discarded – undo
         return $body;
     }
 
-    private function get_series()
-    {
+    private function get_series()
+    {
         $series = array(
             'previous' => array(),
             'next' => array());
@@ -140,8 +141,8 @@  discard block
 block discarded – undo
         return $series;
     }
 
-    private function get_sidebar()
-    {
+    private function get_sidebar()
+    {
         $sidebar = array();
         
         $sidebar['companion_list'] = array();
@@ -174,12 +175,13 @@  discard block
 block discarded – undo
         return $sidebar;
     }
 
-    private function get_album()
-    {
+    private function get_album()
+    {
         $album = array();
         
-        if($this->log->album == 0)
-            return $album;
+        if($this->log->album == 0) {
+                    return $album;
+        }
         
         $photo_list = AlbumCollector::getPhotoListForAlbum($this->log->album);
         foreach($photo_list as $photo)
@@ -188,10 +190,11 @@  discard block
 block discarded – undo
             $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,

Please login to merge, or discard this patch.

controller/waterfalls/DefaultWaterfallListController.class.inc.php 1 patch

Braces +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -7,23 +7,23 @@  discard block
 block discarded – undo
 	'waterfall/WaterfallCollector'));
 Loader::load('controller', 'waterfalls/DefaultListController');
 
-abstract class DefaultWaterfallListController extends DefaultListController
-{
+abstract class DefaultWaterfallListController extends DefaultListController
+{
 
 	protected static $ITEM_COUNT_PER_PAGE = 24;
 
-	final protected function get_list_view()
-	{
+	final protected function get_list_view()
+	{
 		return 'FallListing';
 	}
 
-	protected function get_item_count_per_page()
-	{
+	protected function get_item_count_per_page()
+	{
 		return self::$ITEM_COUNT_PER_PAGE;
 	}
 
-	final protected function format_item($item)
-	{
+	final protected function format_item($item)
+	{
 		$item_array = array();
 		
 		$item_array['name'] = $item->name;
@@ -36,8 +36,8 @@  discard block
 block discarded – undo
 		return $item_array;
 	}
 
-	final protected function get_sidebar()
-	{
+	final protected function get_sidebar()
+	{
 		$county_result = CountyCollector::getCountyList();
 		$county_list = array();
 		

Please login to merge, or discard this patch.

controller/waterfalls/LogListController.class.inc.php 1 patch

Braces +20 added lines, -20 removed lines patch added patch discarded remove patch

@@ -5,8 +5,8 @@  discard block
 block discarded – undo
 	'waterfall/LogCollector'));
 Loader::load('controller', 'waterfalls/DefaultLogListController');
 
-final class LogListController extends DefaultLogListController
-{
+final class LogListController extends DefaultLogListController
+{
 
 	private static $PRIMARY_TITLE = 'Journal from Waterfall Hikes';
 	private static $PRIMARY_DESCRIPTION = 'Stories written by Jacob Emerick about his epic waterfall adventures in the general Keweenaw, Ontonagon, and Marquette areas.';
@@ -28,8 +28,8 @@  discard block
 block discarded – undo
 	private static $NAVIGATION_DESCRIPTION = 'displaying %d ~ %d of %d total journal entries';
 	private static $LINK_ROOT = '/journal/';
 
-	protected function get_initial_meta()
-	{
+	protected function get_initial_meta()
+	{
 		$meta_array = array();
 		
 		$meta_array['title'] = self::$PRIMARY_TITLE . ' | ' . self::$WEBSITE_TITLE;
@@ -39,8 +39,8 @@  discard block
 block discarded – undo
 		return $meta_array;
 	}
 
-	protected function get_subsequent_meta()
-	{
+	protected function get_subsequent_meta()
+	{
 		$meta_array = array();
 		
 		$meta_array['title'] = sprintf(self::$SECONDARY_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->page);
@@ -50,8 +50,8 @@  discard block
 block discarded – undo
 		return $meta_array;
 	}
 
-	protected function get_initial_introduction()
-	{
+	protected function get_initial_introduction()
+	{
 		$introduction = array();
 		
 		$introduction['title'] = self::$PRIMARY_INTRODUCTION_HEADER;
@@ -63,34 +63,34 @@  discard block
 block discarded – undo
 		return $introduction;
 	}
 
-	protected function get_subsequent_introduction()
-	{
+	protected function get_subsequent_introduction()
+	{
 		return array(
 			'title' => sprintf(self::$SECONDARY_INTRODUCTION_HEADER, $this->page, $this->page_count));
 	}
 
-	protected function get_page_number_piece()
-	{
+	protected function get_page_number_piece()
+	{
 		return URLDecode::getPiece(2);
 	}
 
-	protected function get_item_result($total, $offset)
-	{
+	protected function get_item_result($total, $offset)
+	{
 		return LogCollector::getList($total, $offset);
 	}
 
-	protected function get_item_count_result()
-	{
+	protected function get_item_count_result()
+	{
 		return LogCollector::getListCount();
 	}
 
-	protected function get_list_description_pattern()
-	{
+	protected function get_list_description_pattern()
+	{
 		return self::$NAVIGATION_DESCRIPTION;
 	}
 
-	protected function get_list_link_root()
-	{
+	protected function get_list_link_root()
+	{
 		return self::$LINK_ROOT;
 	}
 

Please login to merge, or discard this patch.

controller/waterfalls/WatercourseListController.class.inc.php 1 patch

Braces +29 added lines, -28 removed lines patch added patch discarded remove patch

@@ -3,8 +3,8 @@  discard block
 block discarded – undo
 Loader::load('collector', 'waterfall/WaterfallCollector');
 Loader::load('controller', 'waterfalls/DefaultWaterfallListController');
 
-final class WatercourseListController extends DefaultWaterfallListController
-{
+final class WatercourseListController extends DefaultWaterfallListController
+{
 
 	private static $DEFAULT_TITLE = 'Hiking with %s, Page %d of %d';
 	private static $DEFAULT_DESCRIPTION = 'Page %d of %d of legendary hiking stories with %s written by Jacob Emerick, all about his adventures hunting waterfalls in the Upper Peninsula of Michigan';
@@ -24,19 +24,20 @@  discard block
 block discarded – undo
 
 	private $watercourse;
 
-	public function __construct()
-	{
+	public function __construct()
+	{
 		$path = URLDecode::getPiece(1);
 		$this->watercourse = WatercourseCollector::getByAlias($path);
 		
-		if(!$this->watercourse)
-			$this->eject();
+		if(!$this->watercourse) {
+					$this->eject();
+		}
 	
 		parent::__construct();
 	}
 
-	protected function get_initial_meta()
-	{
+	protected function get_initial_meta()
+	{
 		$meta_array = array();
 		
 		$meta_array['title'] = "{$this->watercourse->name} | " . self::$WEBSITE_TITLE;
@@ -46,8 +47,8 @@  discard block
 block discarded – undo
 		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->watercourse->name, $this->page, $this->page_count);
@@ -57,15 +58,15 @@  discard block
 block discarded – undo
 		return $meta_array;
 	}
 
-	private function get_keyword_array()
-	{
+	private function get_keyword_array()
+	{
 		$keyword_array = self::$KEYWORD_ARRAY;
 		array_unshift($keyword_array, strtolower($this->watercourse->name));
 		return $keyword_array;
 	}
 
-	protected function get_initial_introduction()
-	{
+	protected function get_initial_introduction()
+	{
 		$introduction = array();
 		
 		$introduction['title'] = $this->watercourse->header;
@@ -75,39 +76,39 @@  discard block
 block discarded – undo
 		return $introduction;
 	}
 
-	protected function get_subsequent_introduction()
-	{
+	protected function get_subsequent_introduction()
+	{
 		return array(
 			'title' => sprintf(self::$DEFAULT_HEADER, $this->page, $this->watercourse->name));
 	}
 
-	protected function get_item_count_per_page()
-	{
+	protected function get_item_count_per_page()
+	{
 		return self::$ITEM_COUNT_PER_PAGE;
 	}
 
-	protected function get_page_number_piece()
-	{
+	protected function get_page_number_piece()
+	{
 		return URLDecode::getPiece(2);
 	}
 
-	protected function get_item_result($total, $offset)
-	{
+	protected function get_item_result($total, $offset)
+	{
 		return WatercourseCollector::getLogListForWatercourse($this->watercourse->id, $total, $offset);
 	}
 
-	protected function get_item_count_result()
-	{
+	protected function get_item_count_result()
+	{
 		return WatercourseCollector::getLogCountForWatercourse($this->watercourse->id);
 	}
 
-	protected function get_list_description_pattern()
-	{
+	protected function get_list_description_pattern()
+	{
 		return str_replace('%COUNTY%', $this->watercourse->name, self::$NAVIGATION_DESCRIPTION);
 	}
 
-	protected function get_list_link_root()
-	{
+	protected function get_list_link_root()
+	{
 		return sprintf(self::$LINK_ROOT, $this->watercourse->alias);
 	}
 

Please login to merge, or discard this patch.

controller/waterfalls/DefaultLogListController.class.inc.php 1 patch

Braces +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -7,23 +7,23 @@  discard block
 block discarded – undo
 	'waterfall/PeriodCollector'));
 Loader::load('controller', 'waterfalls/DefaultListController');
 
-abstract class DefaultLogListController extends DefaultListController
-{
+abstract class DefaultLogListController extends DefaultListController
+{
 
 	private static $ITEM_COUNT_PER_PAGE = 10;
 
-	final protected function get_list_view()
-	{
+	final protected function get_list_view()
+	{
 		return 'LogListing';
 	}
 
-	final protected function get_item_count_per_page()
-	{
+	final protected function get_item_count_per_page()
+	{
 		return self::$ITEM_COUNT_PER_PAGE;
 	}
 
-	final protected function format_item($item)
-	{
+	final protected function format_item($item)
+	{
 		$item_array = array();
 		
 		$item_array['title'] = $item->title;
@@ -37,8 +37,8 @@  discard block
 block discarded – undo
 		return $item_array;
 	}
 
-	final protected function get_sidebar()
-	{
+	final protected function get_sidebar()
+	{
 		$companion_result = CompanionCollector::getCompanionList();
 		$companion_list = array();
 		

Please login to merge, or discard this patch.

controller/waterfalls/WaterfallListController.class.inc.php 1 patch

Braces +20 added lines, -20 removed lines patch added patch discarded remove patch

@@ -5,8 +5,8 @@  discard block
 block discarded – undo
 	'waterfall/WaterfallCollector'));
 Loader::load('controller', 'waterfalls/DefaultWaterfallListController');
 
-final class WaterfallListController extends DefaultWaterfallListController
-{
+final class WaterfallListController extends DefaultWaterfallListController
+{
 
 	private static $PRIMARY_TITLE = 'Full Listing of Falls';
 	private static $PRIMARY_DESCRIPTION = 'List of waterfalls found in the general Keweenaw Area, complete with photos, descriptions, directions, and maps.';
@@ -28,8 +28,8 @@  discard block
 block discarded – undo
 	private static $NAVIGATION_DESCRIPTION = 'displaying %d ~ %d of %d total waterfalls';
 	private static $LINK_ROOT = '/falls/';
 
-	protected function get_initial_meta()
-	{
+	protected function get_initial_meta()
+	{
 		$meta_array = array();
 		
 		$meta_array['title'] = self::$PRIMARY_TITLE . ' | ' . self::$WEBSITE_TITLE;
@@ -39,8 +39,8 @@  discard block
 block discarded – undo
 		return $meta_array;
 	}
 
-	protected function get_subsequent_meta()
-	{
+	protected function get_subsequent_meta()
+	{
 		$meta_array = array();
 		
 		$meta_array['title'] = sprintf(self::$SECONDARY_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->page, $this->page_count);
@@ -50,8 +50,8 @@  discard block
 block discarded – undo
 		return $meta_array;
 	}
 
-	protected function get_initial_introduction()
-	{
+	protected function get_initial_introduction()
+	{
 		$introduction = array();
 		
 		$introduction['title'] = self::$PRIMARY_INTRODUCTION_HEADER;
@@ -63,34 +63,34 @@  discard block
 block discarded – undo
 		return $introduction;
 	}
 
-	protected function get_subsequent_introduction()
-	{
+	protected function get_subsequent_introduction()
+	{
 		return array(
 			'title' => sprintf(self::$SECONDARY_INTRODUCTION_HEADER, $this->page, $this->page_count));
 	}
 
-	protected function get_page_number_piece()
-	{
+	protected function get_page_number_piece()
+	{
 		return URLDecode::getPiece(2);
 	}
 
-	protected function get_item_result($total, $offset)
-	{
+	protected function get_item_result($total, $offset)
+	{
 		return WaterfallCollector::getList($total, $offset);
 	}
 
-	protected function get_item_count_result()
-	{
+	protected function get_item_count_result()
+	{
 		return WaterfallCollector::getListCount();
 	}
 
-	protected function get_list_description_pattern()
-	{
+	protected function get_list_description_pattern()
+	{
 		return self::$NAVIGATION_DESCRIPTION;
 	}
 
-	protected function get_list_link_root()
-	{
+	protected function get_list_link_root()
+	{
 		return self::$LINK_ROOT;
 	}
 

Please login to merge, or discard this patch.

controller/waterfalls/DefaultPageController.class.inc.php 1 patch

Braces +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -2,8 +2,8 @@  discard block
 block discarded – undo
 
 Loader::load('controller', '/PageController');
 
-abstract class DefaultPageController extends PageController
-{
+abstract class DefaultPageController extends PageController
+{
 
 	protected static $WEBSITE_TITLE = 'Waterfalls of the Keweenaw';
 	protected static $PAGE_DESCRIPTION_LIMIT = 250;
@@ -12,22 +12,22 @@  discard block
 block discarded – undo
 
     protected $parent_navigation_item = '';
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()
+	{
 		$this->set_head('google_verification', 'm9ua4n8lp4FUYYa2UOh51UyZYfdivl-kRTtXKwaH0-s');
 		$this->add_css('normalize');
 		$this->add_css('waterfalls');
 	}
 
-    protected function add_waterfall_js()
-    {
+    protected function add_waterfall_js()
+    {
         $this->add_js('jquery');
         $this->add_js('imagelightbox');
         $this->add_js('waterfalls');
     }
 
-	protected function set_body_data($page_type = 'normal')
-	{
+	protected function set_body_data($page_type = 'normal')
+	{
 		$this->set_body('activity_array', $this->get_recent_activity());
 
         $this->set_body('main_navigation', array(

Please login to merge, or discard this patch.

		@@ -2,8 +2,8 @@ discard block
		block discarded – undo
2	2
3	3	Loader::load('controller', 'home/DefaultPageController');
4	4
5		-final class ContactController extends DefaultPageController
6		-{
	5	+final class ContactController extends DefaultPageController
	6	+{
7	7
8	8	private static $TITLE = 'Contact \| Jacob Emerick';
9	9	private static $DESCRIPTION = 'Contact page to reach Jacob Emerick by email or social networks';
		@@ -16,8 +16,8 @@ discard block
		block discarded – undo
16	16	'email',
17	17	'connect');
18	18
19		- protected function set_head_data()
20		- {
	19	+ protected function set_head_data()
	20	+ {
21	21	$this->set_title(self::$TITLE);
22	22	$this->set_description(self::$DESCRIPTION);
23	23	$this->set_keywords(self::$KEYWORD_ARRAY);
		@@ -25,27 +25,31 @@ discard block
		block discarded – undo
25	25	parent::set_head_data();
26	26	}
27	27
28		- protected function set_body_data()
29		- {
	28	+ protected function set_body_data()
	29	+ {
30	30	$this->set_body('form_container', $this->process_form());
31	31	$this->set_body_view('Contact');
32	32
33	33	parent::set_body_data();
34	34	}
35	35
36		- private function process_form()
37		- {
38		- if(!Request::hasPost() \|\| Request::getPost('submit') != 'Send Message!')
39		- return (object) array('display' => 'normal');
	36	+ private function process_form()
	37	+ {
	38	+ if(!Request::hasPost() \|\| Request::getPost('submit') != 'Send Message!') {
	39	+ return (object) array('display' => 'normal');
	40	+ }
40	41
41	42	Loader::load('utility', 'Validate');
42	43	$error_result = array();
43		- if(!Validate::checkRequest('post', 'name', 'string'))
44		- $error_result['name'] = 'please enter your name';
45		- if(!Validate::checkRequest('post', 'email', 'string'))
46		- $error_result['email'] = 'please enter a valid email';
47		- if(!Validate::checkRequest('post', 'message', 'string'))
48		- $error_result['message'] = 'please write a message';
	44	+ if(!Validate::checkRequest('post', 'name', 'string')) {
	45	+ $error_result['name'] = 'please enter your name';
	46	+ }
	47	+ if(!Validate::checkRequest('post', 'email', 'string')) {
	48	+ $error_result['email'] = 'please enter a valid email';
	49	+ }
	50	+ if(!Validate::checkRequest('post', 'message', 'string')) {
	51	+ $error_result['message'] = 'please write a message';
	52	+ }
49	53
50	54	$values = (object) array(
51	55	'name' => Request::getPost('name'),

		@@ -5,8 +5,8 @@ discard block
		block discarded – undo
5	5	'waterfall/LogCollector'));
6	6	Loader::load('controller', 'waterfalls/DefaultPageController');
7	7
8		-final class LogController extends DefaultPageController
9		-{
	8	+final class LogController extends DefaultPageController
	9	+{
10	10
11	11	private static $AUTHOR = 'Jacob Emerick';
12	12	private static $AUTHOR_URL = 'https://home.jacobemerick.com/';
		@@ -18,15 +18,16 @@ discard block
		block discarded – undo
18	18
19	19	private $log;
20	20
21		- public function __construct()
22		- {
	21	+ public function __construct()
	22	+ {
23	23	parent::__construct();
24	24
25	25	$log_path = URLDecode::getPiece(2);
26	26
27	27	$this->log = LogCollector::getByAlias($log_path);
28		- if(!$this->log)
29		- $this->eject();
	28	+ if(!$this->log) {
	29	+ $this->eject();
	30	+ }
30	31
31	32	$this->parent_navigation_item = 'journal';
32	33
		@@ -39,8 +40,8 @@ discard block
		block discarded – undo
39	40	$this->add_waterfall_js();
40	41	}
41	42
42		- protected function set_head_data()
43		- {
	43	+ protected function set_head_data()
	44	+ {
44	45	parent::set_head_data();
45	46
46	47	$this->set_title("{$this->log->title} \| " . self::$WEBSITE_TITLE);
		@@ -56,8 +57,8 @@ discard block
		block discarded – undo
56	57	$this->set_keywords($keyword_array);
57	58	}
58	59
59		- protected function set_body_data($page_type = 'normal')
60		- {
	60	+ protected function set_body_data($page_type = 'normal')
	61	+ {
61	62	parent::set_body_data($page_type);
62	63
63	64	$this->set_body('view', 'Log');
		@@ -71,8 +72,8 @@ discard block
		block discarded – undo
71	72	$this->set_body('data', $body_data);
72	73	}
73	74
74		- private function get_formatted_log()
75		- {
	75	+ private function get_formatted_log()
	76	+ {
76	77	$formatted_log = array();
77	78
78	79	$formatted_log['introduction'] = $this->get_log_introduction($this->log);
		@@ -84,8 +85,8 @@ discard block
		block discarded – undo
84	85	return $formatted_log;
85	86	}
86	87
87		- private function get_log_introduction($log)
88		- {
	88	+ private function get_log_introduction($log)
	89	+ {
89	90	return array(
90	91	'title' => $log->title,
91	92	'url' => Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $log->alias . '/',
		@@ -103,8 +104,8 @@ discard block
		block discarded – undo
103	104	}
104	105
105	106	// @todo - link things up
106		- private function get_formatted_log_body()
107		- {
	107	+ private function get_formatted_log_body()
	108	+ {
108	109	$body = $this->log->body;
109	110
110	111	$body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
		@@ -113,8 +114,8 @@ discard block
		block discarded – undo
113	114	return $body;
114	115	}
115	116
116		- private function get_series()
117		- {
	117	+ private function get_series()
	118	+ {
118	119	$series = array(
119	120	'previous' => array(),
120	121	'next' => array());
		@@ -140,8 +141,8 @@ discard block
		block discarded – undo
140	141	return $series;
141	142	}
142	143
143		- private function get_sidebar()
144		- {
	144	+ private function get_sidebar()
	145	+ {
145	146	$sidebar = array();
146	147
147	148	$sidebar['companion_list'] = array();
		@@ -174,12 +175,13 @@ discard block
		block discarded – undo
174	175	return $sidebar;
175	176	}
176	177
177		- private function get_album()
178		- {
	178	+ private function get_album()
	179	+ {
179	180	$album = array();
180	181
181		- if($this->log->album == 0)
182		- return $album;
	182	+ if($this->log->album == 0) {
	183	+ return $album;
	184	+ }
183	185
184	186	$photo_list = AlbumCollector::getPhotoListForAlbum($this->log->album);
185	187	foreach($photo_list as $photo)
		@@ -188,10 +190,11 @@ discard block
		block discarded – undo
188	190	$photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
189	191	$photo_array['description'] = $photo->description;
190	192
191		- if($photo->height < $photo->width)
192		- list($height, $width) = array(75, 100);
193		- else
194		- list($height, $width) = array(100, 75);
	193	+ if($photo->height < $photo->width) {
	194	+ list($height, $width) = array(75, 100);
	195	+ } else {
	196	+ list($height, $width) = array(100, 75);
	197	+ }
195	198
196	199	$photo_array['image_node'] = sprintf(
197	200	self::$THUMB_IMAGE_NODE,

		@@ -7,23 +7,23 @@ discard block
		block discarded – undo
7	7	'waterfall/WaterfallCollector'));
8	8	Loader::load('controller', 'waterfalls/DefaultListController');
9	9
10		-abstract class DefaultWaterfallListController extends DefaultListController
11		-{
	10	+abstract class DefaultWaterfallListController extends DefaultListController
	11	+{
12	12
13	13	protected static $ITEM_COUNT_PER_PAGE = 24;
14	14
15		- final protected function get_list_view()
16		- {
	15	+ final protected function get_list_view()
	16	+ {
17	17	return 'FallListing';
18	18	}
19	19
20		- protected function get_item_count_per_page()
21		- {
	20	+ protected function get_item_count_per_page()
	21	+ {
22	22	return self::$ITEM_COUNT_PER_PAGE;
23	23	}
24	24
25		- final protected function format_item($item)
26		- {
	25	+ final protected function format_item($item)
	26	+ {
27	27	$item_array = array();
28	28
29	29	$item_array['name'] = $item->name;
		@@ -36,8 +36,8 @@ discard block
		block discarded – undo
36	36	return $item_array;
37	37	}
38	38
39		- final protected function get_sidebar()
40		- {
	39	+ final protected function get_sidebar()
	40	+ {
41	41	$county_result = CountyCollector::getCountyList();
42	42	$county_list = array();
43	43

		@@ -3,8 +3,8 @@ discard block
		block discarded – undo
3	3	Loader::load('collector', 'waterfall/WaterfallCollector');
4	4	Loader::load('controller', 'waterfalls/DefaultWaterfallListController');
5	5
6		-final class WatercourseListController extends DefaultWaterfallListController
7		-{
	6	+final class WatercourseListController extends DefaultWaterfallListController
	7	+{
8	8
9	9	private static $DEFAULT_TITLE = 'Hiking with %s, Page %d of %d';
10	10	private static $DEFAULT_DESCRIPTION = 'Page %d of %d of legendary hiking stories with %s written by Jacob Emerick, all about his adventures hunting waterfalls in the Upper Peninsula of Michigan';
		@@ -24,19 +24,20 @@ discard block
		block discarded – undo
24	24
25	25	private $watercourse;
26	26
27		- public function __construct()
28		- {
	27	+ public function __construct()
	28	+ {
29	29	$path = URLDecode::getPiece(1);
30	30	$this->watercourse = WatercourseCollector::getByAlias($path);
31	31
32		- if(!$this->watercourse)
33		- $this->eject();
	32	+ if(!$this->watercourse) {
	33	+ $this->eject();
	34	+ }
34	35
35	36	parent::__construct();
36	37	}
37	38
38		- protected function get_initial_meta()
39		- {
	39	+ protected function get_initial_meta()
	40	+ {
40	41	$meta_array = array();
41	42
42	43	$meta_array['title'] = "{$this->watercourse->name} \| " . self::$WEBSITE_TITLE;
		@@ -46,8 +47,8 @@ discard block
		block discarded – undo
46	47	return $meta_array;
47	48	}
48	49
49		- protected function get_subsequent_meta()
50		- {
	50	+ protected function get_subsequent_meta()
	51	+ {
51	52	$meta_array = array();
52	53
53	54	$meta_array['title'] = sprintf(self::$DEFAULT_TITLE . ' \| ' . self::$WEBSITE_TITLE, $this->watercourse->name, $this->page, $this->page_count);
		@@ -57,15 +58,15 @@ discard block
		block discarded – undo
57	58	return $meta_array;
58	59	}
59	60
60		- private function get_keyword_array()
61		- {
	61	+ private function get_keyword_array()
	62	+ {
62	63	$keyword_array = self::$KEYWORD_ARRAY;
63	64	array_unshift($keyword_array, strtolower($this->watercourse->name));
64	65	return $keyword_array;
65	66	}
66	67
67		- protected function get_initial_introduction()
68		- {
	68	+ protected function get_initial_introduction()
	69	+ {
69	70	$introduction = array();
70	71
71	72	$introduction['title'] = $this->watercourse->header;
		@@ -75,39 +76,39 @@ discard block
		block discarded – undo
75	76	return $introduction;
76	77	}
77	78
78		- protected function get_subsequent_introduction()
79		- {
	79	+ protected function get_subsequent_introduction()
	80	+ {
80	81	return array(
81	82	'title' => sprintf(self::$DEFAULT_HEADER, $this->page, $this->watercourse->name));
82	83	}
83	84
84		- protected function get_item_count_per_page()
85		- {
	85	+ protected function get_item_count_per_page()
	86	+ {
86	87	return self::$ITEM_COUNT_PER_PAGE;
87	88	}
88	89
89		- protected function get_page_number_piece()
90		- {
	90	+ protected function get_page_number_piece()
	91	+ {
91	92	return URLDecode::getPiece(2);
92	93	}
93	94
94		- protected function get_item_result($total, $offset)
95		- {
	95	+ protected function get_item_result($total, $offset)
	96	+ {
96	97	return WatercourseCollector::getLogListForWatercourse($this->watercourse->id, $total, $offset);
97	98	}
98	99
99		- protected function get_item_count_result()
100		- {
	100	+ protected function get_item_count_result()
	101	+ {
101	102	return WatercourseCollector::getLogCountForWatercourse($this->watercourse->id);
102	103	}
103	104
104		- protected function get_list_description_pattern()
105		- {
	105	+ protected function get_list_description_pattern()
	106	+ {
106	107	return str_replace('%COUNTY%', $this->watercourse->name, self::$NAVIGATION_DESCRIPTION);
107	108	}
108	109
109		- protected function get_list_link_root()
110		- {
	110	+ protected function get_list_link_root()
	111	+ {
111	112	return sprintf(self::$LINK_ROOT, $this->watercourse->alias);
112	113	}
113	114

		@@ -7,23 +7,23 @@ discard block
		block discarded – undo
7	7	'waterfall/PeriodCollector'));
8	8	Loader::load('controller', 'waterfalls/DefaultListController');
9	9
10		-abstract class DefaultLogListController extends DefaultListController
11		-{
	10	+abstract class DefaultLogListController extends DefaultListController
	11	+{
12	12
13	13	private static $ITEM_COUNT_PER_PAGE = 10;
14	14
15		- final protected function get_list_view()
16		- {
	15	+ final protected function get_list_view()
	16	+ {
17	17	return 'LogListing';
18	18	}
19	19
20		- final protected function get_item_count_per_page()
21		- {
	20	+ final protected function get_item_count_per_page()
	21	+ {
22	22	return self::$ITEM_COUNT_PER_PAGE;
23	23	}
24	24
25		- final protected function format_item($item)
26		- {
	25	+ final protected function format_item($item)
	26	+ {
27	27	$item_array = array();
28	28
29	29	$item_array['title'] = $item->title;
		@@ -37,8 +37,8 @@ discard block
		block discarded – undo
37	37	return $item_array;
38	38	}
39	39
40		- final protected function get_sidebar()
41		- {
	40	+ final protected function get_sidebar()
	41	+ {
42	42	$companion_result = CompanionCollector::getCompanionList();
43	43	$companion_list = array();
44	44

		@@ -2,8 +2,8 @@ discard block
		block discarded – undo
2	2
3	3	Loader::load('controller', '/PageController');
4	4
5		-abstract class DefaultPageController extends PageController
6		-{
	5	+abstract class DefaultPageController extends PageController
	6	+{
7	7
8	8	protected static $WEBSITE_TITLE = 'Waterfalls of the Keweenaw';
9	9	protected static $PAGE_DESCRIPTION_LIMIT = 250;
		@@ -12,22 +12,22 @@ discard block
		block discarded – undo
12	12
13	13	protected $parent_navigation_item = '';
14	14
15		- protected function set_head_data()
16		- {
	15	+ protected function set_head_data()
	16	+ {
17	17	$this->set_head('google_verification', 'm9ua4n8lp4FUYYa2UOh51UyZYfdivl-kRTtXKwaH0-s');
18	18	$this->add_css('normalize');
19	19	$this->add_css('waterfalls');
20	20	}
21	21
22		- protected function add_waterfall_js()
23		- {
	22	+ protected function add_waterfall_js()
	23	+ {
24	24	$this->add_js('jquery');
25	25	$this->add_js('imagelightbox');
26	26	$this->add_js('waterfalls');
27	27	}
28	28
29		- protected function set_body_data($page_type = 'normal')
30		- {
	29	+ protected function set_body_data($page_type = 'normal')
	30	+ {
31	31	$this->set_body('activity_array', $this->get_recent_activity());
32	32
33	33	$this->set_body('main_navigation', array(

jacobemerick / web

Push — master ( 6336a8...2eca18 )

Status

Category

Braces +20 added lines, -16 removed lines patch added patch discarded remove patch

Braces +6 added lines, -6 removed lines patch added patch discarded remove patch

Braces +31 added lines, -28 removed lines patch added patch discarded remove patch

Braces +10 added lines, -10 removed lines patch added patch discarded remove patch

Braces +20 added lines, -20 removed lines patch added patch discarded remove patch

Braces +29 added lines, -28 removed lines patch added patch discarded remove patch

Braces +10 added lines, -10 removed lines patch added patch discarded remove patch

Braces +20 added lines, -20 removed lines patch added patch discarded remove patch

Braces +8 added lines, -8 removed lines patch added patch discarded remove patch