jacobemerick / web

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,

utility/Environment.class.inc.php

Braces +3 added lines, -2 removed lines

@@ -9,8 +9,9 @@
 
 	public function __construct($user_agent = null)
 	{
-		if(!isset($user_agent))
-			$user_agent = Request::getServer('HTTP_USER_AGENT');
+		if(!isset($user_agent)) {

+					$user_agent = Request::getServer('HTTP_USER_AGENT');

+		}

 		$this->user_agent = $user_agent;
 	}
 

utility/Database.class.inc.php

Braces +12 added lines, -8 removed lines

@@ -36,8 +36,9 @@ 
 		$mysqli = new mysqli($host, $username, $password);
 		
 		$has_connection_error = $mysqli->connect_error;
-		if(isset($has_connection_error))
-			$this->has_connection_error = true;
+		if(isset($has_connection_error)) {

+					$this->has_connection_error = true;

+		}

 		
 		return $mysqli;
 	}
@@ -67,8 +68,9 @@ 
 		{
 			self::instance()->log_query($query, $start);
 			$array = array();
-			while($row = $result->fetch_object())
-				$array[] = $row;
+			while($row = $result->fetch_object()) {

+							$array[] = $row;

+			}

 			$result->close();
 			return $array;
 		}
@@ -79,8 +81,9 @@ 
 	public static function selectRow($query)
 	{
 		$result = self::select($query);
-		if(is_array($result))
-			return array_pop($result);
+		if(is_array($result)) {

+					return array_pop($result);

+		}

 		return false;
 	}
 
@@ -99,8 +102,9 @@ 
 	public static function lastInsertID()
 	{
 		$id = self::instance()->write_connection->insert_id;
-		if($id == 0)
-			return false;
+		if($id == 0) {

+					return false;

+		}

 		return $id;
 	}
 

utility/Loader.class.inc.php

Braces +17 added lines, -12 removed lines

@@ -17,8 +17,9 @@ 
 
 	public static function instance()
 	{
-		if(!isset(self::$instance))
-			self::$instance = new Loader();
+		if(!isset(self::$instance)) {

+					self::$instance = new Loader();

+		}

 		return self::$instance;
 	}
 
@@ -71,8 +72,9 @@ 
 
 	public static function getImagePath($type, $file)
 	{
-		if($type == 'photo')
-			$type = 'photo/processed';
+		if($type == 'photo') {

+					$type = 'photo/processed';

+		}

 		
 		$path = self::instance()->get_root();
 		$path .= 'images';
@@ -110,11 +112,13 @@ 
 		foreach((array) $files as $file)
 		{
 			$file_path = self::instance()->get_path($type, $file);
-			if(in_array($file_path, self::instance()->get_included_files()) && $type !== 'view')
-				continue;
+			if(in_array($file_path, self::instance()->get_included_files()) && $type !== 'view') {

+							continue;

+			}

 			
-			if(!file_exists($file_path))
-				Debugger::logMessage("Requested file does not exist: {$type}, {$file}");
+			if(!file_exists($file_path)) {

+							Debugger::logMessage("Requested file does not exist: {$type}, {$file}");

+			}

 			
 			self::instance()->add_included_file($file_path);
 			
@@ -163,10 +167,11 @@ 
 		
 		$reflectionObject = self::create_reflection_class($file);
 		
-		if($reflectionObject->hasMethod('__construct'))
-			return $reflectionObject->newInstanceArgs($data);
-		else
-			return $reflectionObject->newInstance();
+		if($reflectionObject->hasMethod('__construct')) {

+					return $reflectionObject->newInstanceArgs($data);

+		} else {

+					return $reflectionObject->newInstance();

+		}

 	}
 
 	public static function getRoot()

utility/URLDecode.class.inc.php

Braces +21 added lines, -14 removed lines

@@ -15,12 +15,14 @@ 
 	static private function form_url_array($host, $uri)
 	{
 		$uri = substr($uri, 1);
-		if(strpos($uri, '?'))
-			$uri = substr($uri, 0, strpos($uri, '?'));
+		if(strpos($uri, '?')) {

+					$uri = substr($uri, 0, strpos($uri, '?'));

+		}

 		$uri_array = explode('/', $uri);
 		
-		if(!Loader::isLive())
-			$host = substr($host, strpos($host, '.') + 1);
+		if(!Loader::isLive()) {

+					$host = substr($host, strpos($host, '.') + 1);

+		}

 		
 		self::$array['host'] = $host;
 		
@@ -33,8 +35,9 @@ 
 		self::$array['base'] = 'http://' . (!Loader::isLive() ? 'dev.' : '') . $host . '/';
 		self::$array['uri'] = '/' . implode('/', $uri_array);
 		
-		if(end($uri_array) == '')
-			$uri_array = array_slice($uri_array, 0, count($uri_array) - 1);
+		if(end($uri_array) == '') {

+					$uri_array = array_slice($uri_array, 0, count($uri_array) - 1);

+		}

 		self::$array['pieces'] = (array) $uri_array;
 	}
 
@@ -61,22 +64,26 @@ 
 	static function getExtension()
 	{
 		$file = self::getPiece(-1);
-		if(substr($file, -1) == '/')
-			return false;
+		if(substr($file, -1) == '/') {

+					return false;

+		}

 		return substr($file, strrpos($file, '.') + 1);;
 	}
 
 	static function getPiece($piece = null)
 	{
-		if(!$piece)
-			return self::$array['pieces'];
+		if(!$piece) {

+					return self::$array['pieces'];

+		}

 		
-		if($piece == -1)
-			return end(self::$array['pieces']);
+		if($piece == -1) {

+					return end(self::$array['pieces']);

+		}

 		
 		$piece = $piece - 1;
-		if(array_key_exists($piece, self::$array['pieces']))
-			return self::$array['pieces'][$piece];
+		if(array_key_exists($piece, self::$array['pieces'])) {

+					return self::$array['pieces'][$piece];

+		}

 		return;
 	}
 

utility/Cookie.class.inc.php

Braces +30 added lines, -21 removed lines

@@ -21,8 +21,9 @@ 
 
 	public function setValue($value)
 	{
-		if(!$this->is_loaded)
-			$this->load();
+		if(!$this->is_loaded) {

+					$this->load();

+		}

 		
 		$this->value = $value;
 		return $this;
@@ -30,8 +31,9 @@ 
 
 	public function getValue()
 	{
-		if(!$this->is_loaded)
-			$this->load();
+		if(!$this->is_loaded) {

+					$this->load();

+		}

 		return $this->value;
 	}
 
@@ -42,24 +44,26 @@ 
 
 	public function exists()
 	{
-		if(!$this->is_loaded)
-			$this->load();
+		if(!$this->is_loaded) {

+					$this->load();

+		}

 		return $this->exists;
 	}
 
 	private final function load()
 	{
 		$name = $this->getName();
-		if(isset($_COOKIE[$name]))
-			$value = $_COOKIE[$name];
+		if(isset($_COOKIE[$name])) {

+					$value = $_COOKIE[$name];

+		}

 		
 		if(isset($value))
 		{
 			$this->value = $value;
 			$this->exists = true;
-		}
-		else
-			$this->exists = false;
+		} else {

+					$this->exists = false;

+		}

 		
 		$this->is_loaded = true;
 	}
@@ -84,24 +88,29 @@ 
 	private final function check_values()
 	{
 		$name = $this->getName();
-		if(empty($name) || strlen($name) < 1)
-			return false;
+		if(empty($name) || strlen($name) < 1) {

+					return false;

+		}

 		
 		$value = $this->getValue();
-		if(!isset($value) || strlen($value) < 1)
-			return false;
+		if(!isset($value) || strlen($value) < 1) {

+					return false;

+		}

 		
 		$expiration = $this->getExpiration();
-		if(!isset($expiration) || !is_int($expiration))
-			return false;
+		if(!isset($expiration) || !is_int($expiration)) {

+					return false;

+		}

 		
 		$domain = $this->getDomain();
-		if(!isset($domain) || strlen($domain) < 1)
-			return false;
+		if(!isset($domain) || strlen($domain) < 1) {

+					return false;

+		}

 		
 		$path = $this->getPath();
-		if(!isset($path) || strlen($path) < 1)
-			return false;
+		if(!isset($path) || strlen($path) < 1) {

+					return false;

+		}

 		
 		return true;
 	}

utility/ImageOld.class.inc.php

Braces +21 added lines, -17 removed lines

@@ -52,18 +52,20 @@ 
 
 	public function setSize($size)
 	{
-		if($this->get_version() > 1)
-			$position = strrpos($this->file, '-v');
-		else
-			$position = strrpos($this->file, '.');
+		if($this->get_version() > 1) {

+					$position = strrpos($this->file, '-v');

+		} else {

+					$position = strrpos($this->file, '.');

+		}

 		
 		$this->file = substr($this->file, 0, $position) . '-s' . $size . substr($this->file, $position);
 	}
 
 	public function getDimensions()
 	{
-		if(!$this->isValid())
-			return false;
+		if(!$this->isValid()) {

+					return false;

+		}

 		$imageinfo = getimagesize($this->getInternalPath());
 		return array($imageinfo[0], $imageinfo[1]);
 	}
@@ -85,10 +87,11 @@ 
 
 	private function get_image($image)
 	{
-		if(preg_match(self::$VERSION_PREG_MATCH, $image))
-			return preg_replace(self::$VERSION_PREG_MATCH, '', $image);
-		else
-			return $image;
+		if(preg_match(self::$VERSION_PREG_MATCH, $image)) {

+					return preg_replace(self::$VERSION_PREG_MATCH, '', $image);

+		} else {

+					return $image;

+		}

 	}
 
 	private function get_image_meta($image)
@@ -103,9 +106,9 @@ 
 		{
 			$position = strrpos($image, '.');
 			return substr($image, 0, $position) . '-v' . $this->get_version() . substr($image, $position);
-		}
-		else
-			return $image;
+		} else {

+					return $image;

+		}

 	}
 
 	private $version;
@@ -118,10 +121,11 @@ 
 			if(count($files) > 0)
 			{
 				preg_match(self::$VERSION_PREG_MATCH, $files[0], $matches);
-				if(count($matches))
-					$this->version = $matches[1];
-				else
-					$this->version = 1;
+				if(count($matches)) {

+									$this->version = $matches[1];

+				} else {

+									$this->version = 1;

+				}

 			}
 		}
 		return $this->version;

utility/content/MarkupCodeContent.class.inc.php

Braces +3 added lines, -2 removed lines

@@ -10,8 +10,9 @@
 	protected function execute($title = '')
 	{
 		preg_match_all(self::$MARKUP_DELIMITER, $this->content, $matches);
-		if(count($matches[1]) == 0)
-			return;
+		if(count($matches[1]) == 0) {

+					return;

+		}

 		
 		foreach($matches[3] as $key => $match)
 		{

utility/content/FixInternalLinkContent.class.inc.php

Braces +17 added lines, -12 removed lines

@@ -14,10 +14,11 @@ 
 		preg_match_all(self::$LINK_PLACEHOLDER_MATCH, $this->content, $matches);
 		foreach($matches[1] as $key => $match)
 		{
-			if(isset($matches[3][$key]))
-				$link_content = $this->get_link($match, $is_absolute, $matches[3][$key]);
-			else
-				$link_content = $this->get_link($match, $is_absolute);
+			if(isset($matches[3][$key])) {

+							$link_content = $this->get_link($match, $is_absolute, $matches[3][$key]);

+			} else {

+							$link_content = $this->get_link($match, $is_absolute);

+			}

 			$this->content = str_replace($matches[0][$key], $link_content, $this->content);
 		}
 		return;
@@ -35,14 +36,16 @@ 
 				Loader::load('collector', 'blog/PostCollector');
 				$post = PostCollector::getPostByURI($uri);
 				
-				if($post === NULL)
-					return;
+				if($post === NULL) {

+									return;

+				}

 				
 				$link .= ($is_absolute) ? Loader::getRootURL('blog') : '/';
 				$link .= "{$post->category}/{$post->path}/";
 				
-				if($anchor == '')
-					$anchor = $post->title;
+				if($anchor == '') {

+									$anchor = $post->title;

+				}

 				
 				break;
 			case 'blog-tag' :
@@ -61,14 +64,16 @@ 
 				Loader::load('collector', 'waterfall/LogCollector');
 				$log = LogCollector::getByAlias($uri);
 				
-				if($log === NULL)
-					return;
+				if($log === NULL) {

+									return;

+				}

 				
 				$link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/';
 				$link .= "journal/{$log->alias}/";
 				
-				if($anchor == '')
-					$anchor = $log->title;
+				if($anchor == '') {

+									$anchor = $log->title;

+				}

 				
 				break;
 			case 'falls' :