jacobemerick / web

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 .= '/';

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

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

router/map.php

Spacing +1 added lines, -1 removed lines

@@ -26,6 +26,6 @@
 	)

 );

 

-Router::route($redirect,$direct);

+Router::route($redirect, $direct);

 

 ?>
\ No newline at end of file

router/mymap.php

Spacing +1 added lines, -1 removed lines

@@ -20,6 +20,6 @@
 	)

 );

 

-Router::route($redirect,$direct);

+Router::route($redirect, $direct);

 

 ?>
\ No newline at end of file

utility/Asset.class.inc.php

Spacing +23 added lines, -23 removed lines

@@ -19,9 +19,9 @@ 
 	{

 		$simple_pieces = array();

 		$complex_pieces = array();

-		foreach($array as $piece)

+		foreach ($array as $piece)

 		{

-			switch($piece)

+			switch ($piece)

 			{

 				case 'global' :

 					$simple_pieces[] = $piece;

@@ -32,7 +32,7 @@ 
 			}

 		}

 		

-		foreach($simple_pieces as $piece)

+		foreach ($simple_pieces as $piece)

 		{

 			$final_files[] = self::process_simple_pieces('styles', $piece);

 		}

@@ -47,9 +47,9 @@ 
 		$complex_pieces = array();

 		$external_pieces = array();

 		

-		foreach($array as $piece)

+		foreach ($array as $piece)

 		{

-			switch($piece)

+			switch ($piece)

 			{

 				case 'jquery-1.4.2' :

                 case 'jquery-1.10.2.min' :

@@ -66,11 +66,11 @@ 
 			}

 		}

 		

-		foreach($external_pieces as $piece)

+		foreach ($external_pieces as $piece)

 		{

 			$final_files[] = $piece;

 		}

-		foreach($simple_pieces as $piece)

+		foreach ($simple_pieces as $piece)

 		{

 			$final_files[] = self::process_simple_pieces('scripts', $piece);

 		}

@@ -84,7 +84,7 @@ 
 		$piece_path = self::get_piece_path($type, $file);

 		$final_path = self::get_final_path($type, $file);

 		

-		if(!$final_path)

+		if (!$final_path)

 		{

 			$contents = file_get_contents($piece_path);

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

@@ -92,7 +92,7 @@ 
 		

 		$file_name = substr($final_path, strpos($final_path, $file), strrpos($final_path, '.') - strpos($final_path, $file));

 		

-		if(filemtime($final_path) < filemtime($piece_path))

+		if (filemtime($final_path) < filemtime($piece_path))

 		{

 			$contents = file_get_contents($piece_path);

 			return self::make_final_file($type, $contents, $file_name, true);

@@ -103,19 +103,19 @@ 
 

 	private static function process_complex_pieces($type, $array)

 	{

-		if(in_array(404, $array))

+		if (in_array(404, $array))

 			$site = '404';

-		else if(in_array(503, $array))

+		else if (in_array(503, $array))

 			$site = '503';

 		else

 			$site = strtolower(URLDecode::getSite());

 		

 		$final_path = self::get_final_path($type, $site);

 		

-		if(!$final_path)

+		if (!$final_path)

 		{

 			$contents = '';

-			foreach($array as $file)

+			foreach ($array as $file)

 			{

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

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

@@ -129,14 +129,14 @@ 
 		

 		$create_new = false;

 		$contents = '';

-		foreach($array as $file)

+		foreach ($array as $file)

 		{

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

 			$contents .= file_get_contents($piece_path);

-			if(filemtime($final_path) < filemtime($piece_path))

+			if (filemtime($final_path) < filemtime($piece_path))

 				$create_new = true;

 		}

-		if($create_new)

+		if ($create_new)

 			return self::make_final_file($type, $contents, $file_name, true);

 		

 		return self::get_final_link($type, $file_name);

@@ -147,7 +147,7 @@ 
 		$path = Loader::getRoot() . "/{$type}/final/{$file}*";

 		

 		$files = glob($path); 

-		if(count($files) > 0)

+		if (count($files) > 0)

 			return $files[0];

 		return;

 	}

@@ -157,18 +157,18 @@ 
 		$path = Loader::getRoot() . "/{$type}/piece/{$file}*";

 		

 		$files = glob($path);

-		if(count($files) > 0)

+		if (count($files) > 0)

 			return $files[0];

 		return;

 	}

 

 	private static function make_final_file($type, $contents, $file_name, $exists = false)

 	{

-		if($exists)

+		if ($exists)

 		{

 			$old_file = self::get_final_path($type, $file_name);

 			$version = substr($old_file, strpos($old_file, $file_name));

-			if(strpos($version, '-v'))

+			if (strpos($version, '-v'))

 			{

 				$version = substr($version, strpos($version, '-v'));

 				$version = substr($version, 2, strpos($version, '.') - 2);

@@ -182,7 +182,7 @@ 
 		

 		$path = Loader::getRoot() . "/{$type}/final/{$file_name}";

 		

-		switch($type)

+		switch ($type)

 		{

 			case 'styles' :

 				$path .= '.css';

@@ -193,7 +193,7 @@ 
 		}

 		

 		file_put_contents($path, $contents);

-		if($exists)

+		if ($exists)

 			unlink($old_file);

 		Debugger::logMessage("New {$type} file created - {$file_name}.");

 		return self::get_final_link($type, $file_name);

@@ -201,7 +201,7 @@ 
 

 	private static function get_final_link($type, $file_name)

 	{

-		switch($type)

+		switch ($type)

 		{

 			case 'styles' :

 				$path = "/style/{$file_name}.css";

utility/Cookie.class.inc.php

Spacing +12 added lines, -12 removed lines

@@ -21,7 +21,7 @@ 
 

 	public function setValue($value)

 	{

-		if(!$this->is_loaded)

+		if (!$this->is_loaded)

 			$this->load();

 		

 		$this->value = $value;

@@ -30,7 +30,7 @@ 
 

 	public function getValue()

 	{

-		if(!$this->is_loaded)

+		if (!$this->is_loaded)

 			$this->load();

 		return $this->value;

 	}

@@ -42,7 +42,7 @@ 
 

 	public function exists()

 	{

-		if(!$this->is_loaded)

+		if (!$this->is_loaded)

 			$this->load();

 		return $this->exists;

 	}

@@ -50,10 +50,10 @@ 
 	private final function load()

 	{

 		$name = $this->getName();

-		if(isset($_COOKIE[$name]))

+		if (isset($_COOKIE[$name]))

 			$value = $_COOKIE[$name];

 		

-		if(isset($value))

+		if (isset($value))

 		{

 			$this->value = $value;

 			$this->exists = true;

@@ -66,13 +66,13 @@ 
 

 	public final function save()

 	{

-		if(!$this->check_values())

+		if (!$this->check_values())

 		{

 			Debugger::error('Attempt to create a cookie without all of the values being set!');

 			return false;

 		}

 		

-		if(!$this->set_cookie())

+		if (!$this->set_cookie())

 		{

 			Debugger::log('There was a problem saving the cookie.');

 			return false;

@@ -84,23 +84,23 @@ 
 	private final function check_values()

 	{

 		$name = $this->getName();

-		if(empty($name) || strlen($name) < 1)

+		if (empty($name) || strlen($name) < 1)

 			return false;

 		

 		$value = $this->getValue();

-		if(!isset($value) || strlen($value) < 1)

+		if (!isset($value) || strlen($value) < 1)

 			return false;

 		

 		$expiration = $this->getExpiration();

-		if(!isset($expiration) || !is_int($expiration))

+		if (!isset($expiration) || !is_int($expiration))

 			return false;

 		

 		$domain = $this->getDomain();

-		if(!isset($domain) || strlen($domain) < 1)

+		if (!isset($domain) || strlen($domain) < 1)

 			return false;

 		

 		$path = $this->getPath();

-		if(!isset($path) || strlen($path) < 1)

+		if (!isset($path) || strlen($path) < 1)

 			return false;

 		

 		return true;

utility/CronController.class.inc.php

Spacing +6 added lines, -6 removed lines

@@ -22,7 +22,7 @@ 
 

 	public function activate()

 	{

-		foreach(self::$CRON_ARRAY as $cron => $frequency)

+		foreach (self::$CRON_ARRAY as $cron => $frequency)

 		{

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

 			//	continue;

@@ -49,19 +49,19 @@ 
 		$operator = explode(' ', $frequency);

 		list($time['minute'], $time['hour'], $time['day'], $time['month'], $time['weekday']) = $operator;

 		

-		foreach($time as $key => $value)

+		foreach ($time as $key => $value)

 		{

-			if($value == '*')

+			if ($value == '*')

 				continue;

-			if(stristr($value, '/'))

+			if (stristr($value, '/'))

 			{

 				$value = substr($value, 2);

-				if($cur[$key] % $value == 0)

+				if ($cur[$key] % $value == 0)

 					continue;

 				else

 					return;

 			}

-			if($cur[$key] == $value)

+			if ($cur[$key] == $value)

 				continue;

 			return;

 		}

utility/Database.class.inc.php

Spacing +9 added lines, -9 removed lines

@@ -36,7 +36,7 @@ 
 		$mysqli = new mysqli($host, $username, $password);

 		

 		$has_connection_error = $mysqli->connect_error;

-		if(isset($has_connection_error))

+		if (isset($has_connection_error))

 			$this->has_connection_error = true;

 		

 		return $mysqli;

@@ -44,7 +44,7 @@ 
 

 	public static function instance()

 	{

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

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

             global $config;

             self::$instance = new Database(

                 $config->database->master,

@@ -63,11 +63,11 @@ 
 	public static function select($query)

 	{

 		$start = microtime(true);

-		if($result = self::instance()->read_connection->query($query))

+		if ($result = self::instance()->read_connection->query($query))

 		{

 			self::instance()->log_query($query, $start);

 			$array = array();

-			while($row = $result->fetch_object())

+			while ($row = $result->fetch_object())

 				$array[] = $row;

 			$result->close();

 			return $array;

@@ -79,7 +79,7 @@ 
 	public static function selectRow($query)

 	{

 		$result = self::select($query);

-		if(is_array($result))

+		if (is_array($result))

 			return array_pop($result);

 		return false;

 	}

@@ -87,7 +87,7 @@ 
 	public static function execute($query)

 	{

 		$start = microtime(true);

-		if(self::instance()->write_connection->query($query))

+		if (self::instance()->write_connection->query($query))

 		{

 			self::instance()->log_query($query, $start);

 			return true;

@@ -99,7 +99,7 @@ 
 	public static function lastInsertID()

 	{

 		$id = self::instance()->write_connection->insert_id;

-		if($id == 0)

+		if ($id == 0)

 			return false;

 		return $id;

 	}

@@ -119,7 +119,7 @@ 
 	private function gather_query_data()

 	{

 		$query_data = array();

-		foreach($this->query_log as $query)

+		foreach ($this->query_log as $query)

 		{

 			$query = self::explain($query);

 			$query_data[] = $query;

@@ -131,7 +131,7 @@ 
 	{

 		$sql = 'EXPLAIN ' . $query['sql'];

 		

-		if($result = self::instance()->read_connection->query($sql))

+		if ($result = self::instance()->read_connection->query($sql))

 		{

 			$row = $result->fetch_assoc();

 			$query['explain'] = $row;