jacobemerick / web

collector/Collector.class.inc.php

Indentation +24 added lines, -24 removed lines

@@ -5,29 +5,29 @@
 abstract class Collector
 {
 
-	protected static function run_query($query)
-	{
-		return Database::select($query);
-	}
-
-	protected static function run_row_query($query)
-	{
-		return Database::selectRow($query);
-	}
-
-	protected static function get_count($query)
-	{
-		return Database::selectRow($query)->count;
-	}
-
-	protected static function check_exists($query)
-	{
-		return Database::selectRow($query) !== null;
-	}
-
-	protected static function escape($string)
-	{
-		return Database::escape($string);
-	}
+    protected static function run_query($query)
+    {
+        return Database::select($query);
+    }
+
+    protected static function run_row_query($query)
+    {
+        return Database::selectRow($query);
+    }
+
+    protected static function get_count($query)
+    {
+        return Database::selectRow($query)->count;
+    }
+
+    protected static function check_exists($query)
+    {
+        return Database::selectRow($query) !== null;
+    }
+
+    protected static function escape($string)
+    {
+        return Database::escape($string);
+    }
 
 }

Braces +12 added lines, -12 removed lines

@@ -2,31 +2,31 @@
 
 Loader::loadInstance('utility', 'Database');
 
-abstract class Collector
-{
+abstract class Collector

+{

 
-	protected static function run_query($query)
-	{
+	protected static function run_query($query)

+	{

 		return Database::select($query);
 	}
 
-	protected static function run_row_query($query)
-	{
+	protected static function run_row_query($query)

+	{

 		return Database::selectRow($query);
 	}
 
-	protected static function get_count($query)
-	{
+	protected static function get_count($query)

+	{

 		return Database::selectRow($query)->count;
 	}
 
-	protected static function check_exists($query)
-	{
+	protected static function check_exists($query)

+	{

 		return Database::selectRow($query) !== null;
 	}
 
-	protected static function escape($string)
-	{
+	protected static function escape($string)

+	{

 		return Database::escape($string);
 	}
 

controller/waterfalls/DefaultPageController.class.inc.php

Indentation +12 added lines, -12 removed lines

@@ -5,19 +5,19 @@ 
 abstract class DefaultPageController extends PageController
 {
 
-	protected static $WEBSITE_TITLE = 'Waterfalls of the Keweenaw';
-	protected static $PAGE_DESCRIPTION_LIMIT = 250;
+    protected static $WEBSITE_TITLE = 'Waterfalls of the Keweenaw';
+    protected static $PAGE_DESCRIPTION_LIMIT = 250;
 
-	protected static $WATERFALL_SITE_ID = 5;
+    protected static $WATERFALL_SITE_ID = 5;
 
     protected $parent_navigation_item = '';
 
-	protected function set_head_data()
-	{
-		$this->set_head('google_verification', 'm9ua4n8lp4FUYYa2UOh51UyZYfdivl-kRTtXKwaH0-s');
-		$this->add_css('normalize');
-		$this->add_css('waterfalls');
-	}
+    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()
     {
@@ -26,9 +26,9 @@ 
         $this->add_js('waterfalls');
     }
 
-	protected function set_body_data($page_type = 'normal')
-	{
-		$this->set_body('activity_array', $this->get_recent_activity());
+    protected function set_body_data($page_type = 'normal')
+    {
+        $this->set_body('activity_array', $this->get_recent_activity());
 
         $this->set_body('main_navigation', array(
                 (object) array(

Braces +8 added lines, -8 removed lines

@@ -2,8 +2,8 @@ 
 
 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 @@ 
 
     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(

controller/lifestream/DefaultPageController.class.inc.php

Indentation +15 added lines, -15 removed lines

@@ -6,25 +6,25 @@
 abstract class DefaultPageController extends PageController
 {
 
-  protected $activityRepository;
+    protected $activityRepository;
 
-  public function __construct()
-  {
+    public function __construct()
+    {
     parent::__construct();
 
     global $container;
     $this->activityRepository = new Jacobemerick\Web\Domain\Stream\Activity\MysqlActivityRepository($container['db_connection_locator']);
-  }
-
-	protected function set_head_data()
-	{
-		$this->add_css('normalize');
-		$this->add_css('lifestream', 2);
-	}
-
-	protected function set_body_data()
-	{
-		$this->set_body_view('Page');
-	}
+    }
+
+    protected function set_head_data()
+    {
+        $this->add_css('normalize');
+        $this->add_css('lifestream', 2);
+    }
+
+    protected function set_body_data()
+    {
+        $this->set_body_view('Page');
+    }
 
 }

Braces +8 added lines, -8 removed lines

@@ -3,27 +3,27 @@
 Loader::load('controller', '/PageController');
 Loader::load('utility', 'Content');
 
-abstract class DefaultPageController extends PageController
-{
+abstract class DefaultPageController extends PageController

+{

 
   protected $activityRepository;
 
-  public function __construct()
-  {
+  public function __construct()

+  {

     parent::__construct();
 
     global $container;
     $this->activityRepository = new Jacobemerick\Web\Domain\Stream\Activity\MysqlActivityRepository($container['db_connection_locator']);
   }
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		$this->add_css('normalize');
 		$this->add_css('lifestream', 2);
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body_view('Page');
 	}
 

controller/lifestream/AboutController.class.inc.php

Indentation +23 added lines, -23 removed lines

@@ -5,33 +5,33 @@
 final class AboutController extends DefaultPageController
 {
 
-	private static $TITLE = "About | What's a Lifestream?";
-	private static $DESCRIPTION = 'A breakdown of what a lifestream is, why Jacob Emerick made one, and how he made it.';
+    private static $TITLE = "About | What's a Lifestream?";
+    private static $DESCRIPTION = 'A breakdown of what a lifestream is, why Jacob Emerick made one, and how he made it.';
 
-	private static $KEYWORD_ARRAY = array(
-		'about',
-		'lifestream',
-		'feed',
-		'activity stream',
-		'Jacob Emerick',
-		'jpemeric');
+    private static $KEYWORD_ARRAY = array(
+        'about',
+        'lifestream',
+        'feed',
+        'activity stream',
+        'Jacob Emerick',
+        'jpemeric');
 
-	protected function set_head_data()
-	{
-		$this->set_title(self::$TITLE);
-		$this->set_description(self::$DESCRIPTION);
-		$this->set_keywords(self::$KEYWORD_ARRAY);
+    protected function set_head_data()
+    {
+        $this->set_title(self::$TITLE);
+        $this->set_description(self::$DESCRIPTION);
+        $this->set_keywords(self::$KEYWORD_ARRAY);
 		
-		parent::set_head_data();
-	}
+        parent::set_head_data();
+    }
 
-	protected function set_body_data()
-	{
-		$this->set_body('title', "WHAT'S A LIFESTREAM?");
-		$this->set_body('type', 'about');
-		$this->set_body('view', 'About');
+    protected function set_body_data()
+    {
+        $this->set_body('title', "WHAT'S A LIFESTREAM?");
+        $this->set_body('type', 'about');
+        $this->set_body('view', 'About');
 		
-		parent::set_body_data();
-	}
+        parent::set_body_data();
+    }
 
 }
\ No newline at end of file

Braces +6 added lines, -6 removed lines

@@ -2,8 +2,8 @@ 
 
 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 @@ 
 		'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 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body_view('About');
 		
 		parent::set_body_data();

controller/Error503Controller.class.inc.php

Indentation +13 added lines, -13 removed lines

@@ -5,20 +5,20 @@
 class Error503Controller extends PageController
 {
 
-	protected function set_head_data()
-	{
-		$this->set_header_method('send503');
-		$this->add_css('normalize');
-		$this->add_css('503');
+    protected function set_head_data()
+    {
+        $this->set_header_method('send503');
+        $this->add_css('normalize');
+        $this->add_css('503');
 		
-		$this->set_title("Jacob Emerick's 503 Page");
-		$this->set_description('Global 503 page for sites under jacobemerick.com. Page not found!');
-		$this->set_keywords(array());
-	}
+        $this->set_title("Jacob Emerick's 503 Page");
+        $this->set_description('Global 503 page for sites under jacobemerick.com. Page not found!');
+        $this->set_keywords(array());
+    }
 
-	protected function set_body_data()
-	{
-		$this->set_body_view('/503');
-	}
+    protected function set_body_data()
+    {
+        $this->set_body_view('/503');
+    }
 
 }

Braces +6 added lines, -6 removed lines

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

+{

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

+	{

 		$this->set_header_method('send503');
 		$this->add_css('normalize');
 		$this->add_css('503');
@@ -16,8 +16,8 @@ 
 		$this->set_keywords(array());
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body_view('/503');
 	}
 

controller/Error301Controller.class.inc.php

Indentation +7 added lines, -7 removed lines

@@ -5,13 +5,13 @@
 class Error301Controller extends PageController
 {
 
-	public function __construct($uri)
-	{
-		Header::redirect($uri);
-		exit;
-	}
+    public function __construct($uri)
+    {
+        Header::redirect($uri);
+        exit;
+    }
 
-	protected function set_head_data() {}
-	protected function set_body_data() {}
+    protected function set_head_data() {}
+    protected function set_body_data() {}
 
 }

Braces +10 added lines, -6 removed lines

@@ -2,16 +2,20 @@
 
 Loader::load('controller', '/PageController');
 
-class Error301Controller extends PageController
-{
+class Error301Controller extends PageController

+{

 
-	public function __construct($uri)
-	{
+	public function __construct($uri)

+	{

 		Header::redirect($uri);
 		exit;
 	}
 
-	protected function set_head_data() {}
-	protected function set_body_data() {}
+	protected function set_head_data()

+	{

+}
+	protected function set_body_data()

+	{

+}
 
 }

controller/home/DefaultPageController.class.inc.php

Indentation +9 added lines, -9 removed lines

@@ -5,15 +5,15 @@
 abstract class DefaultPageController extends PageController
 {
 
-	protected function set_head_data()
-	{
-		$this->add_css('normalize');
-		$this->add_css('home');
-	}
+    protected function set_head_data()
+    {
+        $this->add_css('normalize');
+        $this->add_css('home');
+    }
 
-	protected function set_body_data()
-	{
-		$this->set_body('activity_array', $this->get_recent_activity());
-	}
+    protected function set_body_data()
+    {
+        $this->set_body('activity_array', $this->get_recent_activity());
+    }
 
 }

Braces +6 added lines, -6 removed lines

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

+{

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

+	{

 		$this->add_css('normalize');
 		$this->add_css('home');
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body('activity_array', $this->get_recent_activity());
 	}
 

controller/home/AboutController.class.inc.php

Indentation +22 added lines, -22 removed lines

@@ -5,32 +5,32 @@
 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';
+    private static $TITLE = 'About | Jacob Emerick';
+    private static $DESCRIPTION = 'Some basic information about Jacob Emerick and his past, web development, and hiking adventures';
 
-	private static $KEYWORD_ARRAY = array(
-		'Jacob Emerick',
-		'jacobemerick',
-		'jpemeric',
-		'about',
-		'bio',
-		'web developer',
-		'hiker');
+    private static $KEYWORD_ARRAY = array(
+        'Jacob Emerick',
+        'jacobemerick',
+        'jpemeric',
+        'about',
+        'bio',
+        'web developer',
+        'hiker');
 
-	protected function set_head_data()
-	{
-		$this->set_title(self::$TITLE);
-		$this->set_description(self::$DESCRIPTION);
-		$this->set_keywords(self::$KEYWORD_ARRAY);
+    protected function set_head_data()
+    {
+        $this->set_title(self::$TITLE);
+        $this->set_description(self::$DESCRIPTION);
+        $this->set_keywords(self::$KEYWORD_ARRAY);
 		
-		parent::set_head_data();
-	}
+        parent::set_head_data();
+    }
 
-	protected function set_body_data()
-	{
-		$this->set_body_view('About');
+    protected function set_body_data()
+    {
+        $this->set_body_view('About');
 		
-		parent::set_body_data();
-	}
+        parent::set_body_data();
+    }
 
 }
\ No newline at end of file

Braces +6 added lines, -6 removed lines

@@ -2,8 +2,8 @@ 
 
 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 @@ 
 		'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 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body_view('About');
 		
 		parent::set_body_data();

controller/site/TermsController.class.inc.php

Indentation +13 added lines, -13 removed lines

@@ -5,22 +5,22 @@
 final class TermsController extends DefaultPageController
 {
 
-	protected function set_head_data()
-	{
-		$this->set_title("Terms of Use for Jacob Emerick's Sites");
-		$this->set_description("Some basic (and boring) legal jargon and perferred usage of the content on Jacob Emerick's sites. Includes re-use terms and advice on retracing hikes.");
-		$this->set_keywords(array('terms of use', 'legal', 'accountability', 'trespassing', 'Jacob Emerick'));
+    protected function set_head_data()
+    {
+        $this->set_title("Terms of Use for Jacob Emerick's Sites");
+        $this->set_description("Some basic (and boring) legal jargon and perferred usage of the content on Jacob Emerick's sites. Includes re-use terms and advice on retracing hikes.");
+        $this->set_keywords(array('terms of use', 'legal', 'accountability', 'trespassing', 'Jacob Emerick'));
 		
-		parent::set_head_data();
-	}
+        parent::set_head_data();
+    }
 
-	protected function set_body_data()
-	{
-		$this->set_body('top_data', array('title' => 'Terms of Use'));
+    protected function set_body_data()
+    {
+        $this->set_body('top_data', array('title' => 'Terms of Use'));
 		
-		$this->set_body('body_view', 'Terms');
+        $this->set_body('body_view', 'Terms');
 		
-		parent::set_body_data();
-	}
+        parent::set_body_data();
+    }
 
 }

Braces +6 added lines, -6 removed lines

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

+{

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

+	{

 		$this->set_title("Terms of Use for Jacob Emerick's Sites");
 		$this->set_description("Some basic (and boring) legal jargon and perferred usage of the content on Jacob Emerick's sites. Includes re-use terms and advice on retracing hikes.");
 		$this->set_keywords(array('terms of use', 'legal', 'accountability', 'trespassing', 'Jacob Emerick'));
@@ -14,8 +14,8 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body('top_data', array('title' => 'Terms of Use'));
 		
 		$this->set_body('body_view', 'Terms');