jacobemerick / web

utility/Database.class.inc.php

Spacing +12 added lines, -12 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,23 +63,23 @@ 
 	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;
 		}
-		trigger_error('Could not preform query - ' . $query . ' - ' . self::instance()->read_connection->error);
+		trigger_error('Could not preform query - '.$query.' - '.self::instance()->read_connection->error);
 		return false;
 	}
 
 	public static function selectRow($query)
 	{
 		$result = self::select($query);
-		if(is_array($result))
+		if (is_array($result))
 			return array_pop($result);
 		return false;
 	}
@@ -87,19 +87,19 @@ 
 	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;
 		}
-		trigger_error('Could not preform query - ' . $query . '-' . self::instance()->write_connection->error);
+		trigger_error('Could not preform query - '.$query.'-'.self::instance()->write_connection->error);
 		return false;
 	}
 
 	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;
@@ -129,9 +129,9 @@ 
 
 	public static function explain($query)
 	{
-		$sql = 'EXPLAIN ' . $query['sql'];
+		$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;

module/form/CommentSubmitModule.class.inc.php

Spacing +21 added lines, -21 removed lines

@@ -26,15 +26,15 @@ 
 
 	public function activate()
 	{
-		if(!Request::hasPost())
+		if (!Request::hasPost())
 			return false;
-		if(!Request::getPost('submit') == 'Submit Comment')
+		if (!Request::getPost('submit') == 'Submit Comment')
 			return false;
 		
 		$errors = $this->fetch_errors();
-		if(count($errors) > 0)
+		if (count($errors) > 0)
 			return $errors;
-		if(Request::getPost('catch') !== '')
+		if (Request::getPost('catch') !== '')
 			return false;
 		
 		$page_id = $this->save_comment_page();
@@ -50,17 +50,17 @@ 
 	private function fetch_errors()
 	{
 		$errors = array();
-		if(!Validate::checkRequest('post', 'name', 'name'))
+		if (!Validate::checkRequest('post', 'name', 'name'))
 			$errors['name'] = 'You must include a valid name';
-		if(!Validate::checkRequest('post', 'email', 'email'))
+		if (!Validate::checkRequest('post', 'email', 'email'))
 			$errors['email'] = 'You must include a valid email';
-		if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))
+		if (Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))
 			$errors['website'] = 'Please enter a valid website';
-		if(!Validate::checkRequest('post', 'comment', 'string'))
+		if (!Validate::checkRequest('post', 'comment', 'string'))
 			$errors['comment'] = 'You must enter a comment';
-		if(Request::getPost('notify') && Request::getPost('notify') != 'check')
+		if (Request::getPost('notify') && Request::getPost('notify') != 'check')
 			$errors['notify'] = 'You entered an invalid notify request';
-		if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))
+		if (Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))
 			$errors['reply'] = 'You entered an invalid reply request';
 		
 		return $errors;
@@ -69,7 +69,7 @@ 
 	private function save_comment_page()
 	{
 		$page_result = CommentCollector::getCommentPageByURL($this->path, $this->site);
-		if($page_result !== null)
+		if ($page_result !== null)
 			return $page_result->id;
 		
 		$query = "INSERT INTO `jpemeric_comment`.`comment_page` (`site`, `path`) VALUES ('%d', '%s')";
@@ -85,7 +85,7 @@ 
 			'name' => Request::getPost('name'),
 			'email' => Request::getPost('email'));
 		
-		if(Request::getPost('website') != '')
+		if (Request::getPost('website') != '')
 			$cookie_value['website'] = Request::getPost('website');
 		
 		$cookie_value = json_encode($cookie_value);
@@ -95,7 +95,7 @@ 
 			->save();
 		
 		$commenter_result = CommentCollector::getCommenterByFields(Request::getPost('name'), Request::getPost('email'), Request::getPost('website'));
-		if($commenter_result !== null)
+		if ($commenter_result !== null)
 			return $commenter_result->id;
 		
 		$query = "INSERT INTO `jpemeric_comment`.`commenter` (`name`,`email`,`url`) VALUES ('%s','%s','%s')";
@@ -112,7 +112,7 @@ 
 	private function save_comment()
 	{
 		$comment_result = CommentCollector::getCommentByBody(Request::getPost('comment'));
-		if($comment_result !== null)
+		if ($comment_result !== null)
 			return $comment_result->id;
 		
 		$query = "INSERT INTO `jpemeric_comment`.`comment` (`body`, `body_format`) VALUES ('%s', '%s')";
@@ -133,7 +133,7 @@ 
 		$query = "INSERT INTO `jpemeric_comment`.`comment_meta` (`commenter`,`comment`,`reply`,`notify`,`comment_page`,`date`,`display`) VALUES ('%d','%d','%d','%d','%d','%s','%d')";
 		
 		$reply = Database::escape(Request::getPost('type'));
-		if($reply == 'new')
+		if ($reply == 'new')
 			$reply = 0;
 		// else check to make sure value is legit
 		
@@ -152,13 +152,13 @@ 
 		
 		$commenter_result = CommentCollector::getCommenterByFields(Request::getPost('name'), Request::getPost('email'), Request::getPost('website'));
 		
-		if($commenter_result->trusted == 1)
+		if ($commenter_result->trusted == 1)
 		{
 			$notification_result = CommentCollector::getNotificationForPage($page);
 			
-			foreach($notification_result as $notification_row)
+			foreach ($notification_result as $notification_row)
 			{
-				if($notification_row->email == Request::getPost('email'))
+				if ($notification_row->email == Request::getPost('email'))
 					continue;
 				
 				$email_recipient_array[$notification_row->email] = array(
@@ -171,15 +171,15 @@ 
         
         if ($site == 'blog') {
             $subject = "New Comment on Jacob Emerick's Blog";
-            $message = "Hello!\nThere has been a new comment on the post '{$this->page_title}' at Jacob Emerick's Blog. You have chosen to be notified of it - please reply to jacob@jacobemerick.com if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";
+            $message = "Hello!\nThere has been a new comment on the post '{$this->page_title}' at Jacob Emerick's Blog. You have chosen to be notified of it - please reply to jacob@jacobemerick.com if you would like to be removed from these notifications.\n\nOn ".date('F j, Y g:i a').", ".Request::getPost('name')." commented...\n".Request::getPost('comment')."\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";
         } else if ($site == 'waterfalls') {
             $subject = "New Comment on Waterfalls of the Keweenaw";
-            $message = "Hello!\nThere has been a new comment on the page '{$this->page_title}' at Waterfalls of the Keweenaw. You have chosen to be notified of it - please reply to jacob@jacobemerick.com if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";
+            $message = "Hello!\nThere has been a new comment on the page '{$this->page_title}' at Waterfalls of the Keweenaw. You have chosen to be notified of it - please reply to jacob@jacobemerick.com if you would like to be removed from these notifications.\n\nOn ".date('F j, Y g:i a').", ".Request::getPost('name')." commented...\n".Request::getPost('comment')."\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";
         }
 
     global $container;
 
-		foreach($email_recipient_array as $email_recipient)
+		foreach ($email_recipient_array as $email_recipient)
 		{
       $sent = $container['mail']
         ->addTo($email_recipient['email'], $email_recipient['name'])

controller/lifestream/TagController.class.inc.php

Spacing +10 added lines, -10 removed lines

@@ -46,7 +46,7 @@ 
 
 	private function get_title()
 	{
-		switch($this->tag)
+		switch ($this->tag)
 		{
 			case 'blog' :
 				return 'Jacob has a Blog';
@@ -74,7 +74,7 @@ 
 
 	private function get_description()
 	{
-		switch($this->tag)
+		switch ($this->tag)
 		{
 			case 'blog' :
 				return 'Yeah, Jacob has a blog. Check out his posting activity.';
@@ -103,7 +103,7 @@ 
 	protected function get_page_number()
 	{
 		$page = URLDecode::getPiece(3);
-		if(isset($page) && is_numeric($page))
+		if (isset($page) && is_numeric($page))
 			return $page;
 		return 1;
 	}
@@ -123,24 +123,24 @@ 
 
 	protected function get_list_next_link()
 	{
-		if($this->page == 1)
+		if ($this->page == 1)
 			return;
-		if($this->page == 2)
-			return Loader::getRootUrl('lifestream') . $this->tag . '/';
-		return Loader::getRootUrl('lifestream') . $this->tag . '/page/' . ($this->page - 1) . '/';
+		if ($this->page == 2)
+			return Loader::getRootUrl('lifestream').$this->tag.'/';
+		return Loader::getRootUrl('lifestream').$this->tag.'/page/'.($this->page - 1).'/';
 	}
 
 	protected function get_list_prev_link()
 	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
+		if (($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
 			return;
-		return Loader::getRootUrl('lifestream') . $this->tag . '/page/' . ($this->page + 1) . '/';
+		return Loader::getRootUrl('lifestream').$this->tag.'/page/'.($this->page + 1).'/';
 	}
 
 	private $total_post_count;
 	protected function get_total_post_count()
 	{
-		if(!isset($this->total_post_count))
+		if (!isset($this->total_post_count))
 			$this->total_post_count = $this->activityRepository->getActivitiesByTypeCount($this->tag);
 		return $this->total_post_count;
 	}

controller/lifestream/HomeController.class.inc.php

Spacing +7 added lines, -7 removed lines

@@ -38,7 +38,7 @@ 
 	protected function get_page_number()
 	{
 		$page = URLDecode::getPiece(2);
-		if(isset($page) && is_numeric($page))
+		if (isset($page) && is_numeric($page))
 			return $page;
 		return 1;
 	}
@@ -58,24 +58,24 @@ 
 
 	protected function get_list_next_link()
 	{
-		if($this->page == 1)
+		if ($this->page == 1)
 			return;
-		if($this->page == 2)
+		if ($this->page == 2)
 			return Loader::getRootUrl('lifestream');
-		return Loader::getRootUrl('lifestream') . 'page/' . ($this->page - 1) . '/';
+		return Loader::getRootUrl('lifestream').'page/'.($this->page - 1).'/';
 	}
 
 	protected function get_list_prev_link()
 	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
+		if (($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
 			return;
-		return Loader::getRootUrl('lifestream') . 'page/' . ($this->page + 1) . '/';
+		return Loader::getRootUrl('lifestream').'page/'.($this->page + 1).'/';
 	}
 
 	private $total_post_count;
 	protected function get_total_post_count()
 	{
-		if(!isset($this->total_post_count))
+		if (!isset($this->total_post_count))
 			$this->total_post_count = $this->activityRepository->getActivitiesCount();
 		return $this->total_post_count;
 	}

controller/site/ContactController.class.inc.php

Spacing +9 added lines, -9 removed lines

@@ -28,17 +28,17 @@ 
 
 	private function get_form_results()
 	{
-		if(!Request::hasPost())
+		if (!Request::hasPost())
 			return array();
 		
-		if(!Validate::checkRequest('post', 'name', 'string'))
+		if (!Validate::checkRequest('post', 'name', 'string'))
 			$error_message['name'] = 'Please enter a value for your name.';
-		if(!Validate::checkRequest('post', 'email', 'string'))
+		if (!Validate::checkRequest('post', 'email', 'string'))
 			$error_message['email'] = 'Please enter a valid email address.';
-		if(!Validate::checkRequest('post', 'message', 'string'))
+		if (!Validate::checkRequest('post', 'message', 'string'))
 			$error_message['message'] = 'Please enter a message.';
 		
-		if(!empty($error_message))
+		if (!empty($error_message))
 		{
 			return array(
 				'error_message' => $error_message,
@@ -50,14 +50,14 @@ 
       ->addTo($container['config']->admin_email)
       ->setSubject('Site Contact')
       ->setPlainMessage(
-        'Name: ' . Request::getPost('name') . "\n" .
-        'Email: ' . Request::getPost('email') . "\n" .
-        'Message: ' . Request::getPost('message')
+        'Name: '.Request::getPost('name')."\n".
+        'Email: '.Request::getPost('email')."\n".
+        'Message: '.Request::getPost('message')
       )
       ->send();
 
 		return array(
-			'success_message' => "Thank you for your message, " . Request::getPost('name') . "! I'll get back to you as soon as possible.");
+			'success_message' => "Thank you for your message, ".Request::getPost('name')."! I'll get back to you as soon as possible.");
 	}
 
 }

controller/PageController.class.inc.php

Spacing +21 added lines, -21 removed lines

@@ -64,7 +64,7 @@ 
         $post_result = $activityRepository->getActivities(5);
 
         $post_array = array();
-        foreach($post_result as $row) {
+        foreach ($post_result as $row) {
             array_push($post_array, $this->expand_post($row));
         }
 
@@ -80,7 +80,7 @@ 
         ];
 
         if ($format != 'short') {
-            $post['url'] = Loader::getRootUrl('lifestream') . "{$raw_post['type']}/{$raw_post['id']}/";
+            $post['url'] = Loader::getRootUrl('lifestream')."{$raw_post['type']}/{$raw_post['id']}/";
 
             $metadata = json_decode($raw_post['metadata'], true);
             $post = array_merge($post, $metadata);
@@ -100,12 +100,12 @@ 
 		$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']);
+				Loader::load('view', URLDecode::getSite().'/'.$view, $this->data_array['body']);
 		}
         
         if (URLDecode::getSite() == 'waterfalls') {
@@ -114,7 +114,7 @@ 
             Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
         }
 		
-		if($view == '/404' || $view == '/503')
+		if ($view == '/404' || $view == '/503')
 			exit;
 	}
 
@@ -170,14 +170,14 @@ 
 
 	private function load_assets()
 	{
-    $css_array = array_map(function ($stylesheet) {
+    $css_array = array_map(function($stylesheet) {
       $path = "/css/{$stylesheet[0]}.css";
       if ($stylesheet[1] > 1) {
         $path .= "?v={$stylesheet[1]}";
       }
       return $path;
     }, $this->css_array);
-    $js_array = array_map(function ($script) {
+    $js_array = array_map(function($script) {
       if (substr($script, 0, 4) == 'http') {
         return $script;
       }
@@ -195,26 +195,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;
 		}
@@ -234,7 +234,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();
@@ -252,7 +252,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;
@@ -262,12 +262,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;
@@ -298,21 +298,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;

controller/waterfalls/MapController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
     {
         parent::set_head_data();
         
-        $this->set_title(self::$TITLE . ' | ' . self::$WEBSITE_TITLE);
+        $this->set_title(self::$TITLE.' | '.self::$WEBSITE_TITLE);
         $this->set_description(self::$DESCRIPTION);
         $this->set_keywords(self::$KEYWORD_ARRAY);
     }

controller/waterfalls/DefaultListController.class.inc.php

Spacing +19 added lines, -19 removed lines

@@ -20,14 +20,14 @@ 
 		$this->offset = ($this->page - 1) * $this->get_item_count_per_page();
 		
 		$items = $this->get_items();
-		if(count($items) < 1)
+		if (count($items) < 1)
 			$this->eject();
 	}
 
 	final protected function get_page_number()
 	{
 		$page = $this->get_page_number_piece();
-		if(isset($page) && is_numeric($page))
+		if (isset($page) && is_numeric($page))
 			return $page;
 		return 1;
 	}
@@ -41,7 +41,7 @@ 
 
 	final private function get_introduction()
 	{
-		if($this->page == 1)
+		if ($this->page == 1)
 			return $this->get_initial_introduction();
 		
 		return $this->get_subsequent_introduction();
@@ -53,7 +53,7 @@ 
 	private $items;
 	protected function get_items()
 	{
-		if(!isset($this->items))
+		if (!isset($this->items))
 		{
 			$total = $this->get_item_count_per_page();
 			$offset = ($this->page - 1) * $this->get_item_count_per_page();
@@ -68,7 +68,7 @@ 
 	private $item_count;
 	final private function get_item_count()
 	{
-		if(!isset($this->item_count))
+		if (!isset($this->item_count))
 			$this->item_count = $this->get_item_count_result();
 		return $this->item_count;
 	}
@@ -82,7 +82,7 @@ 
 		$this->set_head('next_link', $this->get_list_next_link());
 		$this->set_head('previous_link', $this->get_list_prev_link());
 		
-		if($this->page == 1)
+		if ($this->page == 1)
 			$meta_array = $this->get_initial_meta();
 		else
 			$meta_array = $this->get_subsequent_meta();
@@ -119,18 +119,18 @@ 
 
 	final private function get_list_prev_link()
 	{
-		if($this->page == 1)
+		if ($this->page == 1)
 			return;
-		if($this->page == 2)
+		if ($this->page == 2)
 			return $this->get_list_link_root();
-		return $this->get_list_link_root() . ($this->page - 1) . '/';
+		return $this->get_list_link_root().($this->page - 1).'/';
 	}
 
 	final private function get_list_next_link()
 	{
-		if(($this->page * $this->get_item_count_per_page()) >= $this->get_item_count())
+		if (($this->page * $this->get_item_count_per_page()) >= $this->get_item_count())
 			return;
-		return $this->get_list_link_root() . ($this->page + 1) . '/';
+		return $this->get_list_link_root().($this->page + 1).'/';
 	}
 
 	abstract protected function get_list_link_root();
@@ -139,30 +139,30 @@ 
 	{
 		$link_array = array();
 		
-		if($this->get_item_count_per_page() >= $this->get_item_count())
+		if ($this->get_item_count_per_page() >= $this->get_item_count())
 			return $link_array;
 		
 		$link = new stdclass();
 		$link->anchor = '&laquo; previous';
-		if($this->get_list_prev_link() !== null)
+		if ($this->get_list_prev_link() !== null)
 			$link->uri = $this->get_list_prev_link();
 		else
 			$link->class = 'inactive';
 		$link_array[] = $link;
 		
-		for($i = 1; $i <= ceil($this->get_item_count() / $this->get_item_count_per_page()); $i++)
+		for ($i = 1; $i <= ceil($this->get_item_count() / $this->get_item_count_per_page()); $i++)
 		{
 			$link = new stdclass();
 			$link->anchor = $i;
 			
-			if($i == $this->page)
+			if ($i == $this->page)
 				$link->class = 'current';
 			else
 			{
-				if($i == 1)
+				if ($i == 1)
 					$link->uri = $this->get_list_link_root();
 				else
-					$link->uri = $this->get_list_link_root() . $i . '/';
+					$link->uri = $this->get_list_link_root().$i.'/';
 			}
 			
 			$link_array[] = $link;
@@ -170,7 +170,7 @@ 
 		
 		$link = new stdclass();
 		$link->anchor = 'next &raquo;';
-		if($this->get_list_next_link() !== null)
+		if ($this->get_list_next_link() !== null)
 			$link->uri = $this->get_list_next_link();
 		else
 			$link->class = 'inactive';
@@ -192,7 +192,7 @@ 
 
 	final protected function get_image_element($category, $path, $description, $size = 'small')
 	{
-		switch($size)
+		switch ($size)
 		{
 			case 'medium' :
 				$height = 375;

controller/waterfalls/LogController.class.inc.php

Spacing +16 added lines, -16 removed lines

@@ -25,7 +25,7 @@ 
         $log_path = URLDecode::getPiece(2);
         
         $this->log = LogCollector::getByAlias($log_path);
-        if(!$this->log)
+        if (!$this->log)
             $this->eject();
 
         $this->parent_navigation_item = 'journal';
@@ -33,7 +33,7 @@ 
         $this->handle_comment_submit(
             self::$WATERFALL_SITE_ID,
             $this->log->alias,
-            Loader::getRootUrl('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/',
+            Loader::getRootUrl('waterfalls').self::$JOURNAL_DIRECTORY.'/'.$this->log->alias.'/',
             $this->log->title);
         
         $this->add_waterfall_js();
@@ -43,12 +43,12 @@ 
     {
         parent::set_head_data();
         
-        $this->set_title("{$this->log->title} | " . self::$WEBSITE_TITLE);
+        $this->set_title("{$this->log->title} | ".self::$WEBSITE_TITLE);
         $this->set_description($this->log->introduction);
         
         $keyword_array = array();
         $tag_result = LogCollector::getTagListForLog($this->log->id);
-        foreach($tag_result as $tag)
+        foreach ($tag_result as $tag)
         {
             $keyword_array[] = $tag->name;
         }
@@ -77,7 +77,7 @@ 
         
         $formatted_log['introduction'] = $this->get_log_introduction($this->log);
         $formatted_log['title'] = $this->log->title;
-        $formatted_log['url'] = Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/';
+        $formatted_log['url'] = Loader::getRootURL('waterfalls').self::$JOURNAL_DIRECTORY.'/'.$this->log->alias.'/';
 
         $formatted_log['body'] = $this->get_formatted_log_body();
         
@@ -88,7 +88,7 @@ 
     {
         return array(
             'title' => $log->title,
-            'url' => Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $log->alias . '/',
+            'url' => Loader::getRootURL('waterfalls').self::$JOURNAL_DIRECTORY.'/'.$log->alias.'/',
             'date' => $this->get_parsed_date($log->date),
             'publish_date' => $this->get_parsed_date($log->publish_date),
             'introduction' => $log->introduction,
@@ -120,19 +120,19 @@ 
             'next' => array());
         
         $previous_log = LogCollector::getPreviousLog($this->log->id);
-        if($previous_log != false)
+        if ($previous_log != false)
         {
             $series['previous'] = (object) array(
-                'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $previous_log->alias . '/',
+                'path' => '/'.self::$JOURNAL_DIRECTORY.'/'.$previous_log->alias.'/',
                 'title' => $previous_log->title,
                 'date' => $previous_log->date);
         }
         
         $next_log = LogCollector::getNextLog($this->log->id);
-        if($next_log != false)
+        if ($next_log != false)
         {
             $series['next'] = (object) array(
-                'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $next_log->alias . '/',
+                'path' => '/'.self::$JOURNAL_DIRECTORY.'/'.$next_log->alias.'/',
                 'title' => $next_log->title,
                 'date' => $next_log->date);
         }
@@ -146,7 +146,7 @@ 
         
         $sidebar['companion_list'] = array();
         $companions = LogCollector::getCompanionListForLog($this->log->id);
-        foreach($companions as $companion)
+        foreach ($companions as $companion)
         {
             $sidebar['companion_list'][] = (object) array(
                 'title' => $companion->name,
@@ -155,7 +155,7 @@ 
         
         $sidebar['tag_list'] = array();
         $tags = LogCollector::getTagListForLog($this->log->id);
-        foreach($tags as $tag)
+        foreach ($tags as $tag)
         {
             $sidebar['tag_list'][] = (object) array(
                 'title' => $tag->name,
@@ -164,7 +164,7 @@ 
         
         $sidebar['waterfall_list'] = array();
         $waterfalls = LogCollector::getWaterfallListForLog($this->log->id);
-        foreach($waterfalls as $waterfall)
+        foreach ($waterfalls as $waterfall)
         {
             $sidebar['waterfall_list'][] = (object) array(
                 'title' => $waterfall->name,
@@ -178,17 +178,17 @@ 
     {
         $album = array();
         
-        if($this->log->album == 0)
+        if ($this->log->album == 0)
             return $album;
         
         $photo_list = AlbumCollector::getPhotoListForAlbum($this->log->album);
-        foreach($photo_list as $photo)
+        foreach ($photo_list as $photo)
         {
             $photo_array = array();
             $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
             $photo_array['description'] = $photo->description;
             
-            if($photo->height < $photo->width)
+            if ($photo->height < $photo->width)
                 list($height, $width) = array(75, 100);
             else
                 list($height, $width) = array(100, 75);