jacobemerick / web

utility/CronController.class.inc.php

Spacing +7 added lines, -7 removed lines

@@ -20,9 +20,9 @@ 
 
 	public function activate()
 	{
-		foreach(self::$CRON_ARRAY as $cron => $frequency)
+		foreach (self::$CRON_ARRAY as $cron => $frequency)
 		{
-			if(!$this->time_to_run($frequency))
+			if (!$this->time_to_run($frequency))
 				continue;
 			
 			Loader::load('utility', "cron/{$cron}");
@@ -46,19 +46,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;
 		}

controller/PageController.class.inc.php

Spacing +31 added lines, -31 removed lines

@@ -38,7 +38,7 @@ 
 			'date' => date('Y')));
 		
 		Loader::loadInstance('utility', 'Database');
-		if(Database::isConnected() === false)
+		if (Database::isConnected() === false)
 			$this->unavailable();
 	}
 
@@ -63,9 +63,9 @@ 
     $post_result = $activityRepository->getPosts(5);
 
 		$post_array = array();
-		foreach($post_result as $row)
+		foreach ($post_result as $row)
 		{
-			$post_array[] = $this->expand_post($row);;
+			$post_array[] = $this->expand_post($row); ;
 		}
 		
 		return $post_array;
@@ -85,7 +85,7 @@ 
 
 		$post = new stdclass();
 		
-		switch($raw_post['type'])
+		switch ($raw_post['type'])
 		{
 			case 'blog' :
 				$row = $blogRepository->getBlogById($raw_post['type_id']);
@@ -96,7 +96,7 @@ 
 				$post->title = "Blogged about {$category}: <a href=\"{$row['url']}\">{$row['title']}</a>.";
 				$post->comments = $row['comments'];
 				
-				if($format == 'full')
+				if ($format == 'full')
 					$post->image = Content::instance('FetchFirstPhoto', $row['body'])->activate(false, 'standard');
 			break;
 			case 'book' :
@@ -105,23 +105,23 @@ 
 				$post->type = 'book';
 				$post->title = "Just finished reading {$row['title']} by {$row['author']}.";
 				
-				if($format == 'full')
+				if ($format == 'full')
 					$post->image = "<img alt=\"{$row['title']} by {$row['author']}\" src=\"{$row['image']}\" />";
 			break;
 			case 'distance' :
 				$row = $distanceRepository->getDistanceById($raw_post['type_id']);
 				
 				$post->type = 'distance';
-				if($row['type'] == 'running')
+				if ($row['type'] == 'running')
 				{
 					$post->title = "Ran {$row['distance']} miles and felt {$row['felt']}.";
-					if(strlen($row['message']) > 0)
+					if (strlen($row['message']) > 0)
 						$post->title .= " Afterwards, I was all like '{$row['message']}'.";
 				}
-				else if($row['type'] == 'hiking')
+				else if ($row['type'] == 'hiking')
 				{
 					$post->title = "Hiked {$row['distance']} miles and felt {$row['felt']}.";
-					if(strlen($row['title']) > 0)
+					if (strlen($row['title']) > 0)
 						$post->title .= " I was hiking up around the {$row['title']} area.";
 				}
                 else if ($row['type'] == 'walking') {
@@ -139,7 +139,7 @@ 
 				
 				$post->type = 'twitter';
 				
-				if($format == 'full')
+				if ($format == 'full')
 					$post->title = $row['text_formatted_full'];
 				else
 					$post->title = $row['text_formatted'];
@@ -152,12 +152,12 @@ 
 				
 				$post->type = 'youtube';
 				
-				if($format == 'full')
+				if ($format == 'full')
 					$post->title = "Favorited {$row['title']} by {$row['author']} on YouTube.";
 				else
 					$post->title = "Favorited <a href=\"http://www.youtube.com/watch?feature=player_embedded&v={$row['video_id']}\" rel=\"nofollow\" target=\"_blank\" title=\"{$row['content']}\">{$row['title']}</a> by {$row['author']} on YouTube.";
 				
-				if($format == 'full')
+				if ($format == 'full')
 					$post->embed_code = "<iframe src=\"http://www.youtube.com/embed/{$row['video_id']}?rel=0\" frameborder=\"0\" allowfullscreen></iframe>";
 			break;
 		}
@@ -185,9 +185,9 @@ 
 		$headers = $this->headers;
 		Header::$headers();
 		Loader::load('view', '/Head', $this->data_array['head']);
-		foreach($this->body_view_array as $view)
+		foreach ($this->body_view_array as $view)
 		{
-			if(substr($view, 0, 1) == '/')
+			if (substr($view, 0, 1) == '/')
 				Loader::load('view', $view, $this->data_array['body']);
 			else
 				Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
@@ -199,7 +199,7 @@ 
             Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
         }
 		
-		if($view == '/404' || $view == '/503')
+		if ($view == '/404' || $view == '/503')
 			exit;
 	}
 
@@ -255,10 +255,10 @@ 
 
 	private function load_assets()
 	{
-    $css_array = array_map(function ($stylesheet) {
+    $css_array = array_map(function($stylesheet) {
       return "/css/{$stylesheet}.css";
     }, $this->css_array);
-    $js_array = array_map(function ($script) {
+    $js_array = array_map(function($script) {
       return "/js/{$script}.js";
     }, $this->js_array);
 		
@@ -273,26 +273,26 @@ 
 
 	protected function eject()
 	{
-		if(get_class($this) !== 'Error404Controller')
+		if (get_class($this) !== 'Error404Controller')
 			Loader::loadNew('controller', '/Error404Controller')->activate();
 	}
 
 	protected function unavailable()
 	{
-		if(get_class($this) !== 'Error503Controller')
+		if (get_class($this) !== 'Error503Controller')
 			Loader::loadNew('controller', '/Error503Controller')->activate();
 	}
 
 	protected function redirect($uri, $method = 301)
 	{
-		switch($method)
+		switch ($method)
 		{
 			case 301 :
-				if(get_class($this) !== 'Error301Controller')
+				if (get_class($this) !== 'Error301Controller')
 					Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();
 				break;
 			case 303 :
-				if(get_class($this) !== 'Error303Controller')
+				if (get_class($this) !== 'Error303Controller')
 					Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();
 				break;
 		}
@@ -312,7 +312,7 @@ 
 	private $comment_errors;
 	protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title)
 	{
-		if(Request::hasPost() && Request::getPost('submit') == 'Submit Comment')
+		if (Request::hasPost() && Request::getPost('submit') == 'Submit Comment')
 		{
 			$parameters = array($site_id, $path, $redirect_url, $page_title);
 			$this->comment_errors = Loader::loadNew('module', 'form/CommentSubmitModule', $parameters)->activate();
@@ -330,7 +330,7 @@ 
 		$comment_array = array();
 		$comment_result = CommentCollector::getCommentsForURL($site, $path, $commenter->id);
 		
-		foreach($comment_result as $comment)
+		foreach ($comment_result as $comment)
 		{
 			$comment_object = new stdclass();
 			$comment_object->id = $comment->id;
@@ -340,12 +340,12 @@ 
 			$comment_object->url = $comment->url;
 			$comment_object->trusted = $comment->trusted;
 			
-			if($comment->reply == 0 && Request::getPost('type') == $comment->id)
+			if ($comment->reply == 0 && Request::getPost('type') == $comment->id)
 				$comment_object->errors = $this->comment_errors;
 			else
 				$comment_object->errors = array();
 			
-			if($comment->reply == 0)
+			if ($comment->reply == 0)
 			{
 				$comment_object->replies = array();
 				$comment_array[$comment->id] = $comment_object;
@@ -376,21 +376,21 @@ 
 		$commenter->website = '';
 		
 		$commenter_cookie = Cookie::instance('Commenter');
-		if(!$commenter_cookie->exists())
+		if (!$commenter_cookie->exists())
 			return $commenter;
 		
 		$commenter_cookie_value = $commenter_cookie->getValue();
 		$commenter_cookie_value = json_decode($commenter_cookie_value);
 		
-		if($commenter_cookie_value === NULL)
+		if ($commenter_cookie_value === NULL)
 			return $commenter;
 		
-		if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email))
+		if (!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email))
 			return $commenter;
 		
 		$commenter_object = CommentCollector::getCommenterByFields($commenter_cookie_value->name, $commenter_cookie_value->email, (isset($commenter_cookie_value->website) ? $commenter_cookie_value->website : ''));
 		
-		if($commenter_object === NULL)
+		if ($commenter_object === NULL)
 			return $commenter;
 		
 		$commenter->id = $commenter_object->id;

router/Router.class.inc.php

Spacing +22 added lines, -22 removed lines

@@ -19,18 +19,18 @@ 
 
 	private static function get_router_name()
 	{
-		if(Request::isAJAX())
+		if (Request::isAJAX())
 			return 'AJAXRouter';
-		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() == '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';
@@ -78,37 +78,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' ||
@@ -121,13 +121,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;
@@ -144,12 +144,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}";
 		}
 		
@@ -158,13 +158,13 @@ 
 
 	final private function get_primary_folder()
 	{
-		if(Request::isAjax())
+		if (Request::isAjax())
 			return 'ajax';
-		if(URLDecode::getURI() == '/sitemap.xml')
+		if (URLDecode::getURI() == '/sitemap.xml')
 			return 'sitemap';
-		if(URLDecode::getURI() == '/rss/')
+		if (URLDecode::getURI() == '/rss/')
 			return 'rss';
-		if(
+		if (
 			URLDecode::getExtension() == 'jpg' ||
 			URLDecode::getExtension() == 'png')
 			return 'images';