jacobemerick / web

router/PortfolioRouter.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
             ],
         ];
 
-        return array_map(function ($row) {
+        return array_map(function($row) {
             return (object) $row;
         }, $paths);
     }
@@ -48,7 +48,7 @@ 
             ],
         ];
 
-        return array_map(function ($row) {
+        return array_map(function($row) {
             return (object) $row;
         }, $paths);
     }

router/Router.class.inc.php

Spacing +15 added lines, -15 removed lines

@@ -18,10 +18,10 @@ 
 
 	private static function get_router_name()
 	{
-		if(Request::isAJAX())
+		if (Request::isAJAX())
 			return 'AJAXRouter';
 		
-		switch(URLDecode::getSite())
+		switch (URLDecode::getSite())
 		{
 			case 'ajax' :
 				return 'AjaxRouter';
@@ -65,42 +65,42 @@ 
 
 	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') {
             $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
-            $redirect_uri = $protocol . '://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
+            $redirect_uri = $protocol.'://'.(!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') {
       $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http';
-			$controller_check = preg_replace('@^' . $protocol . '://([a-z\.]+)@', '', $redirect_uri);
+			$controller_check = preg_replace('@^'.$protocol.'://([a-z\.]+)@', '', $redirect_uri);
     }
 		
 		$controller = $this->get_controller($controller_check);
-		if($controller == '/Error404Controller')
+		if ($controller == '/Error404Controller')
 		{
 			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;
+			$redirect_uri = URLDecode::getBase().$redirect_uri;
 		}
 		
 		Loader::loadNew('controller', '/Error301Controller', (array) $redirect_uri)
@@ -114,12 +114,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}";
 		}
 		
@@ -128,7 +128,7 @@ 
 
 	final private function get_primary_folder()
 	{
-		if(Request::isAjax())
+		if (Request::isAjax())
 			return 'ajax';
 		
 		return URLDecode::getSite();

public/portfolio/index.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 $namespace = 'portfolio';
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__.'/../../bootstrap.php';
 
 // route
 Loader::loadInstance('router', 'Router');

tests/bootstrap.php

Spacing +1 added lines, -1 removed lines

@@ -3,4 +3,4 @@
 error_reporting(E_ALL);
 date_default_timezone_set('America/Chicago');
 
-require_once __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';

utility/Header.class.inc.php

Spacing +12 added lines, -12 removed lines

@@ -10,8 +10,8 @@ 
 			'Cache-Control: no-cache',
 			'Content-Language: en',
 			'Content-Type: application/json',
-			'Expires: ' . self::get_date(time() - 1),
-			'Last-Modified: ' . self::get_date(),
+			'Expires: '.self::get_date(time() - 1),
+			'Last-Modified: '.self::get_date(),
 			'X-Powered-By: jacobemerick.com');
 		self::send($array);
 	}
@@ -23,8 +23,8 @@ 
 			'Cache-Control: no-cache',
 			'Content-Language: en',
 			'Content-Type: text/html',
-			'Expires: ' . self::get_date(time() - 1),
-			'Last-Modified: ' . self::get_date(),
+			'Expires: '.self::get_date(time() - 1),
+			'Last-Modified: '.self::get_date(),
 			'X-Powered-By: jacobemerick.com');
 		self::send($array);
 	}
@@ -42,8 +42,8 @@ 
 			'Cache-Control: no-cache',
 			'Content-Language: en',
 			'Content-Type: text/html',
-			'Expires: ' . self::get_date(time() - 1),
-			'Last-Modified: ' . self::get_date(),
+			'Expires: '.self::get_date(time() - 1),
+			'Last-Modified: '.self::get_date(),
 			'X-Powered-By: jacobemerick.com');
 		self::send($array);
 	}
@@ -55,18 +55,18 @@ 
 			'Cache-Control: no-cache',
 			'Content-Language: en',
 			'Content-Type: text/html',
-			'Expires: ' . self::get_date(time() - 1),
-			'Last-Modified: ' . self::get_date(),
+			'Expires: '.self::get_date(time() - 1),
+			'Last-Modified: '.self::get_date(),
 			'X-Powered-By: jacobemerick.com');
 		self::send($array);
 	}
 
 	private static function send($array, $gzip = true)
 	{
-		if($gzip)
+		if ($gzip)
 			self::start_gzipping();
 		
-		foreach($array as $row)
+		foreach ($array as $row)
 		{
 			header($row, TRUE);
 		}
@@ -74,14 +74,14 @@ 
 
 	private static function get_date($timestamp = false)
 	{
-		if($timestamp == 0)
+		if ($timestamp == 0)
 			$timestamp = time();
 		return gmdate('D, d M Y H:i:s \G\M\T', $timestamp);
 	}
 
 	private static function start_gzipping()
 	{
-		if(!ob_start('ob_gzhandler'))
+		if (!ob_start('ob_gzhandler'))
             ob_start();
 	}
 

utility/content/ImperialUnitContent.class.inc.php

Spacing +5 added lines, -5 removed lines

@@ -26,16 +26,16 @@ 
         
         switch ($type) {
             case 'full miles' :
-                $this->content = number_format(round($number / (12 * 3 * 1760))) . ' miles';
+                $this->content = number_format(round($number / (12 * 3 * 1760))).' miles';
                 break;
             case 'tenth miles' :
-                $this->content = round($number / (12 * 3 * 1760), 1) . ' miles';
+                $this->content = round($number / (12 * 3 * 1760), 1).' miles';
                 break;
             case 'yards' :
-                $this->content = number_format(round($number / (12 * 3))) . ' yards';
+                $this->content = number_format(round($number / (12 * 3))).' yards';
                 break;
             case 'feet' :
-                $this->content = number_format(round($number / 12)) . "'";
+                $this->content = number_format(round($number / 12))."'";
                 break;
             case 'inches' :
                 $feet = floor($number / 12);
@@ -49,7 +49,7 @@ 
                 }
                 
                 $this->content = '';
-                $this->content .= number_format($feet) . "'";
+                $this->content .= number_format($feet)."'";
                 if (isset($inches) && $inches > 0) {
                     $this->content .= " {$inches}\"";
                 }

utility/content/CleanCommentContent.class.inc.php

Spacing +6 added lines, -6 removed lines

@@ -40,10 +40,10 @@ 
 	{
 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
 		
-		if($match_count < 1)
+		if ($match_count < 1)
 			return;
 		
-		foreach($matches as $match)
+		foreach ($matches as $match)
 		{
 			$full_match = array_shift($match);
 			$placeholder = $this->create_placeholder($full_match);
@@ -56,7 +56,7 @@ 
 
 	private function create_placeholder($text)
 	{
-		return md5($text . rand());
+		return md5($text.rand());
 	}
 
 	private function create_full_match_pattern($text)
@@ -79,10 +79,10 @@ 
 	{
 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
 		
-		if($match_count < 1)
+		if ($match_count < 1)
 			return;
 		
-		foreach($matches as $match)
+		foreach ($matches as $match)
 		{
 			$full_match = array_shift($match);
 			$full_match_pattern = $this->create_full_match_pattern($full_match);
@@ -99,7 +99,7 @@ 
 
 	private function replace_element_patterns()
 	{
-		foreach($this->replacement_array as $key => $replace)
+		foreach ($this->replacement_array as $key => $replace)
 		{
 			$this->content = str_replace($key, $replace, $this->content);
 		}

utility/content/SmartTrimContent.class.inc.php

Spacing +15 added lines, -15 removed lines

@@ -27,20 +27,20 @@ 
 	protected function execute()
 	{
 		$args = func_get_args();
-		if(count($args) < 1)
+		if (count($args) < 1)
 		{
 			trigger_error('Someone called SmartTrimContent w/o defining a length... bad!');
 			return;
 		}
 		
-		if(count($args) == 2)
+		if (count($args) == 2)
 			$etc = $args[1];
 		else
 			$etc = self::$ETC;
 		
 		$length = $args[0];
 		
-		if($length < strlen($this->content))
+		if ($length < strlen($this->content))
 			$this->trim_string($length);
         else
             $etc = '';
@@ -54,7 +54,7 @@ 
 		
 		$last_right_bracket_position = strripos($content, self::$RIGHT_BRACKET);
 		$last_left_bracket_position = strripos($content, self::$LEFT_BRACKET);
-		if($last_left_bracket_position > $last_right_bracket_position)
+		if ($last_left_bracket_position > $last_right_bracket_position)
 			$content = substr($content, 0, $last_left_bracket_position);
 		$content = trim($content);
 		
@@ -73,16 +73,16 @@ 
 		$content = current($content);
 		
 		$max_length = $length;
-		foreach($matches[0] as $match)
+		foreach ($matches[0] as $match)
 		{
 			$max_length += strlen($match[0]);
-			if($max_length <= $match[1])
+			if ($max_length <= $match[1])
 				break;
 			
-			$content = substr($content, 0, $match[1]) . $match[0] . substr($content, $match[1]);
+			$content = substr($content, 0, $match[1]).$match[0].substr($content, $match[1]);
 		}
 		
-		if(substr($content, -7) == '</p><p>')
+		if (substr($content, -7) == '</p><p>')
 			$content = substr($content, 0, -7);
 		
 		return $content;
@@ -94,7 +94,7 @@ 
 		$tags_preg = $this->get_tags_preg(self::$EXCLUDE_TAGS);
 		preg_match_all($tags_preg, $content, $matches, PREG_OFFSET_CAPTURE);
 		
-		if(count($matches[1]) % 2 == 1)
+		if (count($matches[1]) % 2 == 1)
 		{
 			$cut_tag = end($matches[1]);
 			$cut_tag_position = $cut_tag[1] - 1;
@@ -112,9 +112,9 @@ 
 		preg_match_all($tags_preg, $content, $matches);
 		$open_tags = array();
 		
-		foreach($matches[1] as $tag)
+		foreach ($matches[1] as $tag)
 		{
-			if(in_array($tag, $open_tags))
+			if (in_array($tag, $open_tags))
 			{
 				$key = array_search($tag, $open_tags);
 				unset($open_tags[$key]);
@@ -124,11 +124,11 @@ 
 		}
 		
 		$open_tags = array_reverse($open_tags);
-		if(count($open_tags) > 0)
+		if (count($open_tags) > 0)
 		{
-			foreach($open_tags as $key => $open_tag)
+			foreach ($open_tags as $key => $open_tag)
 			{
-				if($key == count($open_tags) - 1)
+				if ($key == count($open_tags) - 1)
 					$content .= $etc;
 				$content .= "</{$open_tag}>";
 			}
@@ -141,7 +141,7 @@ 
 
 	private function get_tags_preg($tag_array)
 	{
-		return '@</?(' . implode('|', $tag_array) . ')@';
+		return '@</?('.implode('|', $tag_array).')@';
 	}
 
 }

utility/URLDecode.class.inc.php

Spacing +9 added lines, -9 removed lines

@@ -15,11 +15,11 @@ 
 	static private function form_url_array($host, $uri)
 	{
 		$uri = substr($uri, 1);
-		if(strpos($uri, '?'))
+		if (strpos($uri, '?'))
 			$uri = substr($uri, 0, strpos($uri, '?'));
 		$uri_array = explode('/', $uri);
 		
-		if(!Loader::isLive())
+		if (!Loader::isLive())
 			$host = substr($host, strpos($host, '.') + 1);
 		
 		self::$array['host'] = $host;
@@ -41,9 +41,9 @@ 
     $base .= '/';
 
 		self::$array['base'] = $base;
-		self::$array['uri'] = '/' . implode('/', $uri_array);
+		self::$array['uri'] = '/'.implode('/', $uri_array);
 		
-		if(end($uri_array) == '')
+		if (end($uri_array) == '')
 			$uri_array = array_slice($uri_array, 0, count($uri_array) - 1);
 		self::$array['pieces'] = (array) $uri_array;
 	}
@@ -71,21 +71,21 @@ 
 	static function getExtension()
 	{
 		$file = self::getPiece(-1);
-		if(substr($file, -1) == '/')
+		if (substr($file, -1) == '/')
 			return false;
-		return substr($file, strrpos($file, '.') + 1);;
+		return substr($file, strrpos($file, '.') + 1); ;
 	}
 
 	static function getPiece($piece = null)
 	{
-		if(!$piece)
+		if (!$piece)
 			return self::$array['pieces'];
 		
-		if($piece == -1)
+		if ($piece == -1)
 			return end(self::$array['pieces']);
 		
 		$piece = $piece - 1;
-		if(array_key_exists($piece, self::$array['pieces']))
+		if (array_key_exists($piece, self::$array['pieces']))
 			return self::$array['pieces'][$piece];
 		return;
 	}