jacobemerick / web

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

 	}

 

 }

router/SitemapRouter.class.inc.php

Indentation +3 added lines, -3 removed lines

@@ -16,9 +16,9 @@
 	protected function get_direct_array()

 	{

 		$site = URLDecode::getSite();

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

-            $site = 'waterfall';

-        }

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

+			$site = 'waterfall';

+		}

 		$site = ucwords($site);

 		

 		return array(

router/WaterfallRouter.class.inc.php

Indentation +62 added lines, -62 removed lines

@@ -1,8 +1,8 @@ 
 <?php

 

 Loader::load('collector', array(

-    'waterfall/LogCollector',

-    'waterfall/WaterfallCollector'));

+	'waterfall/LogCollector',

+	'waterfall/WaterfallCollector'));

 Loader::load('router', 'Router');

 

 class WaterfallRouter extends Router

@@ -26,15 +26,15 @@ 
 			(object) array(

 				'pattern' => '@^/falls/results(/?)$@',

 				'replace' => '/falls/'),

-            (object) array(

-                'pattern' => '@^/log(/?)$@',

-                'replace' => '/journal/'),

-            (object) array(

-                'pattern' => '@^/log/(\d+)(/?)$@',

-                'replace' => '/journal/$1'),

-            (object) array(

-                'pattern' => '@^/map/([^/]+)(/?)$@',

-                'replace' => '/map/'),

+			(object) array(

+				'pattern' => '@^/log(/?)$@',

+				'replace' => '/journal/'),

+			(object) array(

+				'pattern' => '@^/log/(\d+)(/?)$@',

+				'replace' => '/journal/$1'),

+			(object) array(

+				'pattern' => '@^/map/([^/]+)(/?)$@',

+				'replace' => '/map/'),

 			(object) array(

 				'pattern' => '@^/about/([a-z]*)(/?)$@',

 				'replace' => '/about/'),

@@ -73,57 +73,57 @@ 
 

 	protected function check_for_special_redirect($uri)

 	{

-        if (preg_match('@^/falls/([a-z\'-]+)(/?)$@', $uri, $matches)) {

-            $alias = $matches[1];

-            $alias = str_replace("'", '', $alias);

-            $alias .= '-falls';

-            $result = WaterfallCollector::getByOldAlias($alias);

-            if ($result !== null) {

-                return "/{$result->watercourse_alias}/{$result->alias}/";

-            } else {

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

-            }

-        }

+		if (preg_match('@^/falls/([a-z\'-]+)(/?)$@', $uri, $matches)) {

+			$alias = $matches[1];

+			$alias = str_replace("'", '', $alias);

+			$alias .= '-falls';

+			$result = WaterfallCollector::getByOldAlias($alias);

+			if ($result !== null) {

+				return "/{$result->watercourse_alias}/{$result->alias}/";

+			} else {

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

+			}

+		}

         

-        if (preg_match('@^/photos/([a-z\'-]+)-([^/]+)(/?)$@', $uri, $matches)) {

-            $alias = $matches[1];

-            $alias = explode('-', $alias);

-            array_pop($alias);

-            $alias = implode('-', $alias);

-            $alias = str_replace("'", '', $alias);

-            $alias .= '-falls';

-            $result = WaterfallCollector::getByOldAlias($alias);

-            if ($result !== null) {

-                return "/{$result->watercourse_alias}/{$result->alias}/";

-            } else {

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

-            }

-        }

+		if (preg_match('@^/photos/([a-z\'-]+)-([^/]+)(/?)$@', $uri, $matches)) {

+			$alias = $matches[1];

+			$alias = explode('-', $alias);

+			array_pop($alias);

+			$alias = implode('-', $alias);

+			$alias = str_replace("'", '', $alias);

+			$alias .= '-falls';

+			$result = WaterfallCollector::getByOldAlias($alias);

+			if ($result !== null) {

+				return "/{$result->watercourse_alias}/{$result->alias}/";

+			} else {

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

+			}

+		}

         

-        if (preg_match('@/log/([a-z]+-\d{2}-\d{4})(/?)$@', $uri, $matches)) {

-            $date = $matches[1];

-            $date = explode('-', $date);

-            $date = mktime(0, 0, 0, date('n', strtotime($date[0])), $date[1], $date[2]);

-            $date = date('Y-m-d', $date);

-            $result = LogCollector::getByDate($date);

-            if ($result !== null) {

-                return "/journal/{$result->alias}/";

-            } else {

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

-            }

-        }

+		if (preg_match('@/log/([a-z]+-\d{2}-\d{4})(/?)$@', $uri, $matches)) {

+			$date = $matches[1];

+			$date = explode('-', $date);

+			$date = mktime(0, 0, 0, date('n', strtotime($date[0])), $date[1], $date[2]);

+			$date = date('Y-m-d', $date);

+			$result = LogCollector::getByDate($date);

+			if ($result !== null) {

+				return "/journal/{$result->alias}/";

+			} else {

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

+			}

+		}

         

-        if (preg_match('@/map/([a-z\'-]+)(/?)$@', $uri, $matches)) {

-            $alias = $matches[1];

-            $alias = str_replace("'", '', $alias);

-            $alias .= '-falls';

-            $result = WaterfallCollector::getByOldAlias($alias);

-            if ($result !== null) {

-                return "/map/#{$result->watercourse_alias}/{$result->alias}";

-            } else {

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

-            }

-        }

+		if (preg_match('@/map/([a-z\'-]+)(/?)$@', $uri, $matches)) {

+			$alias = $matches[1];

+			$alias = str_replace("'", '', $alias);

+			$alias .= '-falls';

+			$result = WaterfallCollector::getByOldAlias($alias);

+			if ($result !== null) {

+				return "/map/#{$result->watercourse_alias}/{$result->alias}";

+			} else {

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

+			}

+		}

         

 		return $uri;

 	}

@@ -164,9 +164,9 @@ 
 			(object) array(

 				'match' => '/map/',

 				'controller' => 'MapController'),

-            (object) array(

-                'match' => '/map/#[a-z-/]+',

-                'controller' => 'MapController'),

+			(object) array(

+				'match' => '/map/#[a-z-/]+',

+				'controller' => 'MapController'),

 			(object) array(

 				'match' => '/journal/',

 				'controller' => 'LogListController'),

utility/Asset.class.inc.php

Indentation +3 added lines, -3 removed lines

@@ -52,7 +52,7 @@ 
 			switch($piece)

 			{

 				case 'jquery-1.4.2' :

-                case 'jquery-1.10.2.min' :

+				case 'jquery-1.10.2.min' :

 				case 'jquery-ui-1.8.2' :

 				case 'ga' :

 					$simple_pieces[] = $piece;

@@ -118,9 +118,9 @@ 
 			foreach($array as $file)

 			{

 				$piece_path = self::get_piece_path($type, $file);

-                $contents .= "/*** {$file} ***/\n\n";

+				$contents .= "/*** {$file} ***/\n\n";

 				$contents .= file_get_contents($piece_path);

-                $contents .= "\n\n\n";

+				$contents .= "\n\n\n";

 			}

 			return self::make_final_file($type, $contents, $site);

 		}

utility/CronController.class.inc.php

Indentation +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 		{

 			//if(!$this->time_to_run($frequency))

 			//	continue;

-            if ($cron != 'TwitterCron') continue;

+			if ($cron != 'TwitterCron') continue;

 			

 			Loader::load('utility', "cron/{$cron}");

 			$reflection = new ReflectionClass($cron);

utility/Database.class.inc.php

Indentation +17 added lines, -17 removed lines

@@ -16,17 +16,17 @@ 
 

 	private function __construct($write_params, $read_params)

 	{

-        $this->write_connection = $this->connect(

-            $write_params->host,

-            $write_params->user,

-            $write_params->password

-        );

-

-        $this->read_connection = $this->connect(

-            $read_params->host,

-            $read_params->user,

-            $read_params->password

-        );

+		$this->write_connection = $this->connect(

+			$write_params->host,

+			$write_params->user,

+			$write_params->password

+		);

+

+		$this->read_connection = $this->connect(

+			$read_params->host,

+			$read_params->user,

+			$read_params->password

+		);

 

 		return $this;

 	}

@@ -45,12 +45,12 @@ 
 	public static function instance()

 	{

 		if(!isset(self::$instance)) {

-            global $config;

-            self::$instance = new Database(

-                $config->database->master,

-                $config->database->slave

-            );

-        }

+			global $config;

+			self::$instance = new Database(

+				$config->database->master,

+				$config->database->slave

+			);

+		}

 

 		return self::$instance;

 	}

utility/Header.class.inc.php

Indentation +1 added lines, -1 removed lines

@@ -205,7 +205,7 @@
 	private static function start_gzipping()

 	{

 		if(!ob_start('ob_gzhandler'))

-            ob_start();

+			ob_start();

 	}

 

 }
\ No newline at end of file

utility/Loader.class.inc.php

Indentation +11 added lines, -11 removed lines

@@ -179,16 +179,16 @@
 		return self::instance()->is_live;

 	}

 

-    public static function getRootURL($site = '')

-    {

-        if (strlen($site) > 0) {

-            if ($site == 'waterfalls' && self::instance()->is_live) {

-                return 'http://www.waterfallsofthekeweenaw.com/';

-            } else {

-                return 'http://' . (self::instance()->is_live ? '' : 'dev.') . $site . '.jacobemerick.com/';

-            }

-        }

-        return '/';

-    }

+	public static function getRootURL($site = '')

+	{

+		if (strlen($site) > 0) {

+			if ($site == 'waterfalls' && self::instance()->is_live) {

+				return 'http://www.waterfallsofthekeweenaw.com/';

+			} else {

+				return 'http://' . (self::instance()->is_live ? '' : 'dev.') . $site . '.jacobemerick.com/';

+			}

+		}

+		return '/';

+	}

 

 }
\ No newline at end of file

utility/Mail.class.inc.php

Indentation +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 

 	public function __construct()

 	{

-        global $config;

+		global $config;

 		$this->headers['From'] = self::$FROM;

 		$this->headers['Reply-To'] = "Jacob <{$config->admin_email}>";

 		$this->headers['Bcc'] = "Jacob <{$config->admin_email}>";