jacobemerick / web

controller/waterfalls/LogTagListController.class.inc.php

Braces +3 added lines, -2 removed lines

@@ -27,8 +27,9 @@
 		$alias = URLDecode::getPiece(3);

 		$this->tag = LogTagCollector::getTag($alias);

 		

-		if(!$this->tag)

-			$this->eject();

+		if(!$this->tag) {

+					$this->eject();

+		}

 		

 		parent::__construct();

 	}

controller/waterfalls/PeriodListController.class.inc.php

Braces +3 added lines, -2 removed lines

@@ -26,8 +26,9 @@
 		$alias = URLDecode::getPiece(2);

 		$this->period = PeriodCollector::getByAlias($alias);

 		

-		if(!$this->period)

-			$this->eject();

+		if(!$this->period) {

+					$this->eject();

+		}

 		

 		parent::__construct();

 	}

controller/waterfalls/SearchListController.class.inc.php

Braces +3 added lines, -2 removed lines

@@ -27,8 +27,9 @@
 	protected function get_page_number()

 	{

 		$page = URLDecode::getPiece(2);

-		if(isset($page) && is_numeric($page))

-			return $page;

+		if(isset($page) && is_numeric($page)) {

+					return $page;

+		}

 		return 1;

 	}

 

controller/waterfalls/WatercourseListController.class.inc.php

Braces +3 added lines, -2 removed lines

@@ -29,8 +29,9 @@
 		$path = URLDecode::getPiece(1);

 		$this->watercourse = WatercourseCollector::getByAlias($path);

 		

-		if(!$this->watercourse)

-			$this->eject();

+		if(!$this->watercourse) {

+					$this->eject();

+		}

 	

 		parent::__construct();

 	}

controller/waterfalls/WaterfallController.class.inc.php

Braces +8 added lines, -6 removed lines

@@ -112,8 +112,9 @@ 
     {

         $album = array();

         

-        if($this->waterfall->album == 0)

-            return $album;

+        if($this->waterfall->album == 0) {

+                    return $album;

+        }

         

         $photo_list = AlbumCollector::getPhotoListForAlbum($this->waterfall->album);

         foreach($photo_list as $photo)

@@ -122,10 +123,11 @@ 
             $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);

             $photo_array['description'] = $photo->description;

             

-            if($photo->height < $photo->width)

-                list($height, $width) = array(75, 100);

-            else

-                list($height, $width) = array(100, 75);

+            if($photo->height < $photo->width) {

+                            list($height, $width) = array(75, 100);

+            } else {

+                            list($height, $width) = array(100, 75);

+            }

             

             $photo_array['image_node'] = sprintf(

                 self::$THUMB_IMAGE_NODE,

module/form/CommentSubmitModule.class.inc.php

Braces +48 added lines, -32 removed lines

@@ -26,16 +26,20 @@ 
 

 	public function activate()

 	{

-		if(!Request::hasPost())

-			return false;

-		if(!Request::getPost('submit') == 'Submit Comment')

-			return false;

+		if(!Request::hasPost()) {

+					return false;

+		}

+		if(!Request::getPost('submit') == 'Submit Comment') {

+					return false;

+		}

 		

 		$errors = $this->fetch_errors();

-		if(count($errors) > 0)

-			return $errors;

-		if(Request::getPost('catch') !== '')

-			return false;

+		if(count($errors) > 0) {

+					return $errors;

+		}

+		if(Request::getPost('catch') !== '') {

+					return false;

+		}

 		

 		$page_id = $this->save_comment_page();

 		$commenter_id = $this->save_commenter();

@@ -50,18 +54,24 @@ 
 	private function fetch_errors()

 	{

 		$errors = array();

-		if(!Validate::checkRequest('post', 'name', 'name'))

-			$errors['name'] = 'You must include a valid name';

-		if(!Validate::checkRequest('post', 'email', 'email'))

-			$errors['email'] = 'You must include a valid email';

-		if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))

-			$errors['website'] = 'Please enter a valid website';

-		if(!Validate::checkRequest('post', 'comment', 'string'))

-			$errors['comment'] = 'You must enter a comment';

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

-			$errors['reply'] = 'You entered an invalid reply request';

+		if(!Validate::checkRequest('post', 'name', 'name')) {

+					$errors['name'] = 'You must include a valid name';

+		}

+		if(!Validate::checkRequest('post', 'email', 'email')) {

+					$errors['email'] = 'You must include a valid email';

+		}

+		if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url')) {

+					$errors['website'] = 'Please enter a valid website';

+		}

+		if(!Validate::checkRequest('post', 'comment', 'string')) {

+					$errors['comment'] = 'You must enter a comment';

+		}

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

+					$errors['reply'] = 'You entered an invalid reply request';

+		}

 		

 		return $errors;

 	}

@@ -69,8 +79,9 @@ 
 	private function save_comment_page()

 	{

 		$page_result = CommentCollector::getCommentPageByURL($this->path, $this->site);

-		if($page_result !== null)

-			return $page_result->id;

+		if($page_result !== null) {

+					return $page_result->id;

+		}

 		

 		$query = "INSERT INTO `jpemeric_comment`.`comment_page` (`site`, `path`) VALUES ('%d', '%s')";

 		$query = sprintf($query, $this->site, $this->path);

@@ -85,8 +96,9 @@ 
 			'name' => Request::getPost('name'),

 			'email' => Request::getPost('email'));

 		

-		if(Request::getPost('website') != '')

-			$cookie_value['website'] = Request::getPost('website');

+		if(Request::getPost('website') != '') {

+					$cookie_value['website'] = Request::getPost('website');

+		}

 		

 		$cookie_value = json_encode($cookie_value);

 		

@@ -95,8 +107,9 @@ 
 			->save();

 		

 		$commenter_result = CommentCollector::getCommenterByFields(Request::getPost('name'), Request::getPost('email'), Request::getPost('website'));

-		if($commenter_result !== null)

-			return $commenter_result->id;

+		if($commenter_result !== null) {

+					return $commenter_result->id;

+		}

 		

 		$query = "INSERT INTO `jpemeric_comment`.`commenter` (`name`,`email`,`url`) VALUES ('%s','%s','%s')";

 		

@@ -112,8 +125,9 @@ 
 	private function save_comment()

 	{

 		$comment_result = CommentCollector::getCommentByBody(Request::getPost('comment'));

-		if($comment_result !== null)

-			return $comment_result->id;

+		if($comment_result !== null) {

+					return $comment_result->id;

+		}

 		

 		$query = "INSERT INTO `jpemeric_comment`.`comment` (`body`, `body_format`) VALUES ('%s', '%s')";

 		

@@ -133,8 +147,9 @@ 
 		$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')

-			$reply = 0;

+		if($reply == 'new') {

+					$reply = 0;

+		}

 		// else check to make sure value is legit

 		

 		$notify = (Request::getPost('notify') == 'check') ? 1 : 0;

@@ -163,8 +178,9 @@ 
 			

 			foreach($notification_result as $notification_row)

 			{

-				if($notification_row->email == Request::getPost('email'))

-					continue;

+				if($notification_row->email == Request::getPost('email')) {

+									continue;

+				}

 				

 				$email_recipient_array[$notification_row->email] = array(

 					'email' => $notification_row->email,

router/BlogRouter.class.inc.php

Braces +1 added lines, -2 removed lines

@@ -57,8 +57,7 @@
 			

 			Loader::load('utility', 'Content');

 			$uri = Content::instance('URLSafe', "/{$post->category}/{$post->title_url}/")->activate();

-		}

-		else

+		} else

 		{

 			$post_uri = URLDecode::getPiece(1);

 			if($post_uri !== null)

router/Router.class.inc.php

Braces +63 added lines, -42 removed lines

@@ -19,24 +19,33 @@ 
 

 	private static function get_router_name()

 	{

-		if(Request::isAJAX())

-			return 'AJAXRouter';

-		if(URLDecode::getURI() == '/robots.txt')

-			return 'RobotRouter';

-		if(URLDecode::getURI() == '/sitemap.xml')

-			return 'SitemapRouter';

-		if(URLDecode::getURI() == '/rss/')

-			return 'RSSRouter';

-		if(URLDecode::getExtension() == 'css')

-			return 'StyleRouter';

-		if(URLDecode::getExtension() == 'js')

-			return 'ScriptRouter';

-		if(URLDecode::getExtension() == 'ico')

-			return 'ImageRouter';

-		if(URLDecode::getExtension() == 'jpg')

-			return 'ImageRouter';

-		if(URLDecode::getExtension() == 'png')

-			return 'ImageRouter';

+		if(Request::isAJAX()) {

+					return 'AJAXRouter';

+		}

+		if(URLDecode::getURI() == '/robots.txt') {

+					return 'RobotRouter';

+		}

+		if(URLDecode::getURI() == '/sitemap.xml') {

+					return 'SitemapRouter';

+		}

+		if(URLDecode::getURI() == '/rss/') {

+					return 'RSSRouter';

+		}

+		if(URLDecode::getExtension() == 'css') {

+					return 'StyleRouter';

+		}

+		if(URLDecode::getExtension() == 'js') {

+					return 'ScriptRouter';

+		}

+		if(URLDecode::getExtension() == 'ico') {

+					return 'ImageRouter';

+		}

+		if(URLDecode::getExtension() == 'jpg') {

+					return 'ImageRouter';

+		}

+		if(URLDecode::getExtension() == 'png') {

+					return 'ImageRouter';

+		}

 		

 		switch(URLDecode::getSite())

 		{

@@ -93,19 +102,22 @@ 
 		

 		$redirect_uri = $this->check_for_special_redirect($redirect_uri);

 		

-		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')

-			$redirect_uri .= '/';

+		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())

-			return;

+		if($redirect_uri == URLDecode::getURI()) {

+					return;

+		}

 		

 		$controller_check = $redirect_uri;

-		if(substr($redirect_uri, 0, 4) == 'http')

-			$controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);

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

@@ -154,11 +166,13 @@ 
 	{

 		foreach($this->get_direct_array() as $check)

 		{

-			if($uri == $check->match)

-				return "{$this->get_primary_folder()}/{$check->controller}";

+			if($uri == $check->match) {

+							return "{$this->get_primary_folder()}/{$check->controller}";

+			}

 			

-			if(preg_match("@^{$check->match}$@", $uri))

-				return "{$this->get_primary_folder()}/{$check->controller}";

+			if(preg_match("@^{$check->match}$@", $uri)) {

+							return "{$this->get_primary_folder()}/{$check->controller}";

+			}

 		}

 		

 		return '/Error404Controller';

@@ -166,23 +180,30 @@ 
 

 	final private function get_primary_folder()

 	{

-		if(Request::isAjax())

-			return 'ajax';

-		if(URLDecode::getURI() == '/robots.txt')

-			return 'robot';

-		if(URLDecode::getURI() == '/sitemap.xml')

-			return 'sitemap';

-		if(URLDecode::getURI() == '/rss/')

-			return 'rss';

-		if(URLDecode::getExtension() == 'css')

-			return 'styles';

-		if(URLDecode::getExtension() == 'js')

-			return 'scripts';

+		if(Request::isAjax()) {

+					return 'ajax';

+		}

+		if(URLDecode::getURI() == '/robots.txt') {

+					return 'robot';

+		}

+		if(URLDecode::getURI() == '/sitemap.xml') {

+					return 'sitemap';

+		}

+		if(URLDecode::getURI() == '/rss/') {

+					return 'rss';

+		}

+		if(URLDecode::getExtension() == 'css') {

+					return 'styles';

+		}

+		if(URLDecode::getExtension() == 'js') {

+					return 'scripts';

+		}

 		if(

 			URLDecode::getExtension() == 'jpg' ||

 			URLDecode::getExtension() == 'ico' ||

-			URLDecode::getExtension() == 'png')

-			return 'images';

+			URLDecode::getExtension() == 'png') {

+					return 'images';

+		}

 		

 		return URLDecode::getSite();

 	}

utility/Asset.class.inc.php

Braces +24 added lines, -18 removed lines

@@ -103,12 +103,13 @@ 
 

 	private static function process_complex_pieces($type, $array)

 	{

-		if(in_array(404, $array))

-			$site = '404';

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

-			$site = '503';

-		else

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

+		if(in_array(404, $array)) {

+					$site = '404';

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

+					$site = '503';

+		} else {

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

+		}

 		

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

 		

@@ -133,11 +134,13 @@ 
 		{

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

 			$contents .= file_get_contents($piece_path);

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

-				$create_new = true;

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

+							$create_new = true;

+			}

+		}

+		if($create_new) {

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

 		}

-		if($create_new)

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

 		

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

 	}

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

 		

 		$files = glob($path); 

-		if(count($files) > 0)

-			return $files[0];

+		if(count($files) > 0) {

+					return $files[0];

+		}

 		return;

 	}

 

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

 		

 		$files = glob($path);

-		if(count($files) > 0)

-			return $files[0];

+		if(count($files) > 0) {

+					return $files[0];

+		}

 		return;

 	}

 

@@ -174,9 +179,9 @@ 
 				$version = substr($version, 2, strpos($version, '.') - 2);

 				$version++;

 				$file_name = substr($file_name, 0, strpos($file_name, '-v'));

+			} else {

+							$version = 2;

 			}

-			else

-				$version = 2;

 			$file_name .= "-v{$version}";

 		}

 		

@@ -193,8 +198,9 @@ 
 		}

 		

 		file_put_contents($path, $contents);

-		if($exists)

-			unlink($old_file);

+		if($exists) {

+					unlink($old_file);

+		}

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

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

 	}