xpressengine / xe-core

modules/rss/rss.admin.controller.php

Doc Comments +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
 	/**
 	 * RSS Module configurations
 	 *
-	 * @return void
+	 * @return Object|null
 	 */
 	function procRssAdminInsertModuleConfig()
 	{

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * The admin controller class of the rss module
- *
- * @author NAVER (developers@xpressengine.com)
- */
+	 * The admin controller class of the rss module
+	 *
+	 * @author NAVER (developers@xpressengine.com)
+	 */
 class rssAdminController extends rss
 {
 	/**

Spacing +22 added lines, -22 removed lines

@@ -27,41 +27,41 @@ 
 		$total_config = $oModuleModel->getModuleConfig('rss');
 
 		$config_vars = Context::getRequestVars();
-		$config_vars->feed_document_count = (int)$config_vars->feed_document_count;
+		$config_vars->feed_document_count = (int) $config_vars->feed_document_count;
 
-		if(!$config_vars->use_total_feed) $alt_message = 'msg_invalid_request';
-		if(!in_array($config_vars->use_total_feed, array('Y','N'))) $config_vars->open_rss = 'Y';
+		if (!$config_vars->use_total_feed) $alt_message = 'msg_invalid_request';
+		if (!in_array($config_vars->use_total_feed, array('Y', 'N'))) $config_vars->open_rss = 'Y';
 
-		if($config_vars->image || $config_vars->del_image)
+		if ($config_vars->image || $config_vars->del_image)
 		{
 			$image_obj = $config_vars->image;
 			$config_vars->image = $total_config->image;
 			// Get a variable for the delete request
-			if($config_vars->del_image == 'Y' || $image_obj)
+			if ($config_vars->del_image == 'Y' || $image_obj)
 			{
 				FileHandler::removeFile($config_vars->image);
 				$config_vars->image = '';
 				$total_config->image = '';
 			}
 			// Ignore if the file is not the one which has been successfully uploaded
-			if($image_obj['tmp_name'] && is_uploaded_file($image_obj['tmp_name']) && checkUploadedFile($image_obj['tmp_name']))
+			if ($image_obj['tmp_name'] && is_uploaded_file($image_obj['tmp_name']) && checkUploadedFile($image_obj['tmp_name']))
 			{
 				// Ignore if the file is not an image (swf is accepted ~)
 				$image_obj['name'] = Context::convertEncodingStr($image_obj['name']);
 
-				if(!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name'])) $alt_message = 'msg_rss_invalid_image_format';
+				if (!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name'])) $alt_message = 'msg_rss_invalid_image_format';
 				else
 				{
 					// Upload the file to a path
 					$path = './files/attach/images/rss/';
 					// Create a directory
-					if(!FileHandler::makeDir($path)) $alt_message = 'msg_error_occured';
+					if (!FileHandler::makeDir($path)) $alt_message = 'msg_error_occured';
 					else
 					{
-						$filename = $path.$image_obj['name'];
+						$filename = $path . $image_obj['name'];
 
 						// Move the file
-						if(!move_uploaded_file($image_obj['tmp_name'], $filename)) $alt_message = 'msg_error_occured';
+						if (!move_uploaded_file($image_obj['tmp_name'], $filename)) $alt_message = 'msg_error_occured';
 						else
 						{
 							$config_vars->image = $filename;
@@ -70,11 +70,11 @@ 
 				}
 			}
 		}
-		if(!$config_vars->image && $config_vars->del_image != 'Y') $config_vars->image = $total_config->image;
+		if (!$config_vars->image && $config_vars->del_image != 'Y') $config_vars->image = $total_config->image;
 
 		$output = $this->setFeedConfig($config_vars);
 
-		if(!$alt_message) $alt_message = 'success_updated';
+		if (!$alt_message) $alt_message = 'success_updated';
 
 		$alt_message = Context::getLang($alt_message);
 		$this->setMessage($alt_message, 'info');
@@ -96,7 +96,7 @@ 
 		$originConfig = $oModuleModel->getModuleConfig('rss');
 
 		// Get a variable for the delete request
-		if($delImage == 'Y')
+		if ($delImage == 'Y')
 		{
 			FileHandler::removeFile($originConfig->image);
 
@@ -122,7 +122,7 @@ 
 		$feedCopyrightList = $config_vars->feed_copyright;
 		$targetModuleSrl = $config_vars->target_module_srl;
 
-		if($targetModuleSrl && !is_array($openRssList))
+		if ($targetModuleSrl && !is_array($openRssList))
 		{
 			$openRssList = array($targetModuleSrl => $openRssList);
 			$openTotalFeedList = array($targetModuleSrl => $openTotalFeedList);
@@ -130,16 +130,16 @@ 
 			$feedCopyrightList = array($targetModuleSrl => $feedCopyrightList);
 		}
 
-		if(is_array($openRssList))
+		if (is_array($openRssList))
 		{
-			foreach($openRssList AS $module_srl=>$open_rss)
+			foreach ($openRssList AS $module_srl=>$open_rss)
 			{
-				if(!$module_srl || !$open_rss)
+				if (!$module_srl || !$open_rss)
 				{
 					return new Object(-1, 'msg_invalid_request');
 				}
 
-				if(!in_array($open_rss, array('Y','H','N'))) $open_rss = 'N';
+				if (!in_array($open_rss, array('Y', 'H', 'N'))) $open_rss = 'N';
 
 				$this->setRssModuleConfig($module_srl, $open_rss, $openTotalFeedList[$module_srl], $feedDescriptionList[$module_srl], $feedCopyrightList[$module_srl]);
 			}
@@ -161,7 +161,7 @@ 
 	function setFeedConfig($config)
 	{
 		$oModuleController = getController('module');
-		$oModuleController->insertModuleConfig('rss',$config);
+		$oModuleController->insertModuleConfig('rss', $config);
 		return new Object();
 	}
 
@@ -181,9 +181,9 @@ 
 		$config = new stdClass;
 		$config->open_rss = $open_rss;
 		$config->open_total_feed = $open_total_feed;
-		if($feed_description != 'N') { $config->feed_description = $feed_description; }
-		if($feed_copyright != 'N') { $config->feed_copyright = $feed_copyright; }
-		$oModuleController->insertModulePartConfig('rss',$module_srl,$config);
+		if ($feed_description != 'N') { $config->feed_description = $feed_description; }
+		if ($feed_copyright != 'N') { $config->feed_copyright = $feed_copyright; }
+		$oModuleController->insertModulePartConfig('rss', $module_srl, $config);
 		return new Object();
 	}
 }

Braces +24 added lines, -11 removed lines

@@ -29,8 +29,12 @@ 
 		$config_vars = Context::getRequestVars();
 		$config_vars->feed_document_count = (int)$config_vars->feed_document_count;
 
-		if(!$config_vars->use_total_feed) $alt_message = 'msg_invalid_request';
-		if(!in_array($config_vars->use_total_feed, array('Y','N'))) $config_vars->open_rss = 'Y';
+		if(!$config_vars->use_total_feed) {
+			$alt_message = 'msg_invalid_request';
+		}
+		if(!in_array($config_vars->use_total_feed, array('Y','N'))) {
+			$config_vars->open_rss = 'Y';
+		}
 
 		if($config_vars->image || $config_vars->del_image)
 		{
@@ -49,20 +53,23 @@ 
 				// Ignore if the file is not an image (swf is accepted ~)
 				$image_obj['name'] = Context::convertEncodingStr($image_obj['name']);
 
-				if(!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name'])) $alt_message = 'msg_rss_invalid_image_format';
-				else
+				if(!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name'])) {
+					$alt_message = 'msg_rss_invalid_image_format';
+				} else
 				{
 					// Upload the file to a path
 					$path = './files/attach/images/rss/';
 					// Create a directory
-					if(!FileHandler::makeDir($path)) $alt_message = 'msg_error_occured';
-					else
+					if(!FileHandler::makeDir($path)) {
+						$alt_message = 'msg_error_occured';
+					} else
 					{
 						$filename = $path.$image_obj['name'];
 
 						// Move the file
-						if(!move_uploaded_file($image_obj['tmp_name'], $filename)) $alt_message = 'msg_error_occured';
-						else
+						if(!move_uploaded_file($image_obj['tmp_name'], $filename)) {
+							$alt_message = 'msg_error_occured';
+						} else
 						{
 							$config_vars->image = $filename;
 						}
@@ -70,11 +77,15 @@ 
 				}
 			}
 		}
-		if(!$config_vars->image && $config_vars->del_image != 'Y') $config_vars->image = $total_config->image;
+		if(!$config_vars->image && $config_vars->del_image != 'Y') {
+			$config_vars->image = $total_config->image;
+		}
 
 		$output = $this->setFeedConfig($config_vars);
 
-		if(!$alt_message) $alt_message = 'success_updated';
+		if(!$alt_message) {
+			$alt_message = 'success_updated';
+		}
 
 		$alt_message = Context::getLang($alt_message);
 		$this->setMessage($alt_message, 'info');
@@ -139,7 +150,9 @@ 
 					return new Object(-1, 'msg_invalid_request');
 				}
 
-				if(!in_array($open_rss, array('Y','H','N'))) $open_rss = 'N';
+				if(!in_array($open_rss, array('Y','H','N'))) {
+					$open_rss = 'N';
+				}
 
 				$this->setRssModuleConfig($module_srl, $open_rss, $openTotalFeedList[$module_srl], $feedDescriptionList[$module_srl], $feedCopyrightList[$module_srl]);
 			}

modules/spamfilter/spamfilter.admin.controller.php

Doc Comments +3 added lines

@@ -98,6 +98,7 @@ 
 	/**
 	 * @brief Delete IP
 	 * Remove the IP address which was previously registered as a spammers
+	 * @param string $ipaddress
 	 */
 	function deleteIP($ipaddress)
 	{
@@ -111,6 +112,7 @@ 
 	/**
 	 * @brief Register the spam word
 	 * The post, which contains the newly registered spam word, should be considered as a spam
+	 * @param string $word_list
 	 */
 	function insertWord($word_list)
 	{
@@ -141,6 +143,7 @@ 
 	/**
 	 * @brief Remove the spam word
 	 * Remove the word which was previously registered as a spam word
+	 * @param string $word
 	 */
 	function deleteWord($word)
 	{

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * @class  spamfilterAdminController
- * @author NAVER (developers@xpressengine.com)
- * @brief The admin controller class of the spamfilter module
- */
+	 * @class  spamfilterAdminController
+	 * @author NAVER (developers@xpressengine.com)
+	 * @brief The admin controller class of the spamfilter module
+	 */
 class spamfilterAdminController extends spamfilter
 {
 	/**

Spacing +25 added lines, -25 removed lines

@@ -17,15 +17,15 @@ 
 	function procSpamfilterAdminInsertConfig()
 	{
 		// Get the default information
-		$argsConfig = Context::gets('limits','check_trackback');
+		$argsConfig = Context::gets('limits', 'check_trackback');
 		$flag = Context::get('flag');
 		//interval, limit_count
-		if($argsConfig->check_trackback!='Y') $argsConfig->check_trackback = 'N';
-		if($argsConfig->limits!='Y') $argsConfig->limits = 'N';
+		if ($argsConfig->check_trackback != 'Y') $argsConfig->check_trackback = 'N';
+		if ($argsConfig->limits != 'Y') $argsConfig->limits = 'N';
 		// Create and insert the module Controller object
 		$oModuleController = getController('module');
-		$moduleConfigOutput = $oModuleController->insertModuleConfig('spamfilter',$argsConfig);
-		if(!$moduleConfigOutput->toBool()) return $moduleConfigOutput;
+		$moduleConfigOutput = $oModuleController->insertModuleConfig('spamfilter', $argsConfig);
+		if (!$moduleConfigOutput->toBool()) return $moduleConfigOutput;
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminConfigBlock');
 		$this->setRedirectUrl($returnUrl);
@@ -36,13 +36,13 @@ 
 		//스팸IP  추가
 		$ipaddress_list = Context::get('ipaddress_list');
 		$oSpamfilterController = getController('spamfilter');
-		if($ipaddress_list)
+		if ($ipaddress_list)
 		{
 			$output = $oSpamfilterController->insertIP($ipaddress_list);
-			if(!$output->toBool() && !$output->get('fail_list')) return $output;
+			if (!$output->toBool() && !$output->get('fail_list')) return $output;
 
-			if($output->get('fail_list')) $message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'),$output->get('fail_list')).'</em>';
-			$this->setMessage(Context::getLang('success_registed').$message_fail);
+			if ($output->get('fail_list')) $message_fail = '<em>' . sprintf(Context::getLang('msg_faillist'), $output->get('fail_list')) . '</em>';
+			$this->setMessage(Context::getLang('success_registed') . $message_fail);
 		}
 
 
@@ -54,13 +54,13 @@ 
 	{
 		//스팸 키워드 추가
 		$word_list = Context::get('word_list');
-		if($word_list)
+		if ($word_list)
 		{
 			$output = $this->insertWord($word_list);
-			if(!$output->toBool() && !$output->get('fail_list')) return $output;
+			if (!$output->toBool() && !$output->get('fail_list')) return $output;
 
-			if($output->get('fail_list')) $message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'),$output->get('fail_list')).'</em>';
-			$this->setMessage(Context::getLang('success_registed').$message_fail);
+			if ($output->get('fail_list')) $message_fail = '<em>' . sprintf(Context::getLang('msg_faillist'), $output->get('fail_list')) . '</em>';
+			$this->setMessage(Context::getLang('success_registed') . $message_fail);
 		}
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminDeniedWordList');
@@ -73,7 +73,7 @@ 
 	function procSpamfilterAdminDeleteDeniedIP()
 	{
 		$ipAddressList = Context::get('ipaddress');
-		if($ipAddressList) $this->deleteIP($ipAddressList);
+		if ($ipAddressList) $this->deleteIP($ipAddressList);
 
 		$this->setMessage(Context::getLang('success_deleted'));
 
@@ -91,7 +91,7 @@ 
 
 		$this->setMessage(Context::getLang('success_deleted'));
 
-		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminDeniedWordList','active','word');
+		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminDeniedWordList', 'active', 'word');
 		return $this->setRedirectUrl($returnUrl);
 	}
 
@@ -101,7 +101,7 @@ 
 	 */
 	function deleteIP($ipaddress)
 	{
-		if(!$ipaddress) return;
+		if (!$ipaddress) return;
 
 		$args = new stdClass;
 		$args->ipaddress = $ipaddress;
@@ -115,26 +115,26 @@ 
 	function insertWord($word_list)
 	{
 
-		$word_list = str_replace("\r","",$word_list);
-		$word_list = explode("\n",$word_list);
+		$word_list = str_replace("\r", "", $word_list);
+		$word_list = explode("\n", $word_list);
 
-		foreach($word_list as $word)
+		foreach ($word_list as $word)
 		{
-			if(!preg_match("/^(.{2,40}[\r\n]+)*.{2,40}$/", $word))
+			if (!preg_match("/^(.{2,40}[\r\n]+)*.{2,40}$/", $word))
 			{
 				return new Object(-1, 'msg_invalid');
 			}
 		}
 
 		$fail_word = '';
-		foreach($word_list as $word)
+		foreach ($word_list as $word)
 		{
 			$args = new stdClass;
-			if(trim($word)) $args->word = $word;
+			if (trim($word)) $args->word = $word;
 			$output = executeQuery('spamfilter.insertDeniedWord', $args);
-			if(!$output->toBool()) $fail_word .= $word.'<br />';
+			if (!$output->toBool()) $fail_word .= $word . '<br />';
 		}
-		$output->add('fail_list',$fail_word);
+		$output->add('fail_list', $fail_word);
 		return $output;
 	}
 
@@ -144,7 +144,7 @@ 
 	 */
 	function deleteWord($word)
 	{
-		if(!$word) return;
+		if (!$word) return;
 		$args = new stdClass;
 		$args->word = $word;
 		return executeQuery('spamfilter.deleteDeniedWord', $args);

Braces +36 added lines, -12 removed lines

@@ -20,12 +20,18 @@ 
 		$argsConfig = Context::gets('limits','check_trackback');
 		$flag = Context::get('flag');
 		//interval, limit_count
-		if($argsConfig->check_trackback!='Y') $argsConfig->check_trackback = 'N';
-		if($argsConfig->limits!='Y') $argsConfig->limits = 'N';
+		if($argsConfig->check_trackback!='Y') {
+			$argsConfig->check_trackback = 'N';
+		}
+		if($argsConfig->limits!='Y') {
+			$argsConfig->limits = 'N';
+		}
 		// Create and insert the module Controller object
 		$oModuleController = getController('module');
 		$moduleConfigOutput = $oModuleController->insertModuleConfig('spamfilter',$argsConfig);
-		if(!$moduleConfigOutput->toBool()) return $moduleConfigOutput;
+		if(!$moduleConfigOutput->toBool()) {
+			return $moduleConfigOutput;
+		}
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminConfigBlock');
 		$this->setRedirectUrl($returnUrl);
@@ -39,9 +45,13 @@ 
 		if($ipaddress_list)
 		{
 			$output = $oSpamfilterController->insertIP($ipaddress_list);
-			if(!$output->toBool() && !$output->get('fail_list')) return $output;
+			if(!$output->toBool() && !$output->get('fail_list')) {
+				return $output;
+			}
 
-			if($output->get('fail_list')) $message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'),$output->get('fail_list')).'</em>';
+			if($output->get('fail_list')) {
+				$message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'),$output->get('fail_list')).'</em>';
+			}
 			$this->setMessage(Context::getLang('success_registed').$message_fail);
 		}
 
@@ -57,9 +67,13 @@ 
 		if($word_list)
 		{
 			$output = $this->insertWord($word_list);
-			if(!$output->toBool() && !$output->get('fail_list')) return $output;
+			if(!$output->toBool() && !$output->get('fail_list')) {
+				return $output;
+			}
 
-			if($output->get('fail_list')) $message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'),$output->get('fail_list')).'</em>';
+			if($output->get('fail_list')) {
+				$message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'),$output->get('fail_list')).'</em>';
+			}
 			$this->setMessage(Context::getLang('success_registed').$message_fail);
 		}
 
@@ -73,7 +87,9 @@ 
 	function procSpamfilterAdminDeleteDeniedIP()
 	{
 		$ipAddressList = Context::get('ipaddress');
-		if($ipAddressList) $this->deleteIP($ipAddressList);
+		if($ipAddressList) {
+			$this->deleteIP($ipAddressList);
+		}
 
 		$this->setMessage(Context::getLang('success_deleted'));
 
@@ -101,7 +117,9 @@ 
 	 */
 	function deleteIP($ipaddress)
 	{
-		if(!$ipaddress) return;
+		if(!$ipaddress) {
+			return;
+		}
 
 		$args = new stdClass;
 		$args->ipaddress = $ipaddress;
@@ -130,9 +148,13 @@ 
 		foreach($word_list as $word)
 		{
 			$args = new stdClass;
-			if(trim($word)) $args->word = $word;
+			if(trim($word)) {
+				$args->word = $word;
+			}
 			$output = executeQuery('spamfilter.insertDeniedWord', $args);
-			if(!$output->toBool()) $fail_word .= $word.'<br />';
+			if(!$output->toBool()) {
+				$fail_word .= $word.'<br />';
+			}
 		}
 		$output->add('fail_list',$fail_word);
 		return $output;
@@ -144,7 +166,9 @@ 
 	 */
 	function deleteWord($word)
 	{
-		if(!$word) return;
+		if(!$word) {
+			return;
+		}
 		$args = new stdClass;
 		$args->word = $word;
 		return executeQuery('spamfilter.deleteDeniedWord', $args);

modules/spamfilter/spamfilter.controller.php

Doc Comments +2 added lines

@@ -161,6 +161,8 @@
 	/**
 	 * @brief IP registration
 	 * The registered IP address is considered as a spammer
+	 * @param string $ipaddress_list
+	 * @param string $description
 	 */
 	function insertIP($ipaddress_list, $description = null)
 	{

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * @class  spamfilterController
- * @author NAVER (developers@xpressengine.com)
- * @brief The controller class for the spamfilter module
- */
+	 * @class  spamfilterController
+	 * @author NAVER (developers@xpressengine.com)
+	 * @brief The controller class for the spamfilter module
+	 */
 class spamfilterController extends spamfilter
 {
 	/**

Spacing +42 added lines, -42 removed lines

@@ -27,25 +27,25 @@ 
 	 */
 	function triggerInsertDocument(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new Object();
+		if ($_SESSION['avoid_log']) return new Object();
 		// Check the login status, login information, and permission
 		$is_logged = Context::get('is_logged');
 		$logged_info = Context::get('logged_info');
 		$grant = Context::get('grant');
 		// In case logged in, check if it is an administrator
-		if($is_logged)
+		if ($is_logged)
 		{
-			if($logged_info->is_admin == 'Y') return new Object();
-			if($grant->manager) return new Object();
+			if ($logged_info->is_admin == 'Y') return new Object();
+			if ($grant->manager) return new Object();
 		}
 
 		$oFilterModel = getModel('spamfilter');
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check if there is a ban on the word
 		$text = '';
-		if($is_logged)
+		if ($is_logged)
 		{
 			$text = $obj->title . ' ' . $obj->content . ' ' . $obj->tags;
 		}
@@ -54,12 +54,12 @@ 
 			$text = $obj->title . ' ' . $obj->content . ' ' . $obj->nick_name . ' ' . $obj->homepage . ' ' . $obj->tags;	
 		}
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check the specified time beside the modificaiton time
-		if($obj->document_srl == 0)
+		if ($obj->document_srl == 0)
 		{
 			$output = $oFilterModel->checkLimited();
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 		// Save a log
 		$this->insertLog();
@@ -72,25 +72,25 @@ 
 	 */
 	function triggerInsertComment(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new Object();
+		if ($_SESSION['avoid_log']) return new Object();
 		// Check the login status, login information, and permission
 		$is_logged = Context::get('is_logged');
 		$logged_info = Context::get('logged_info');
 		$grant = Context::get('grant');
 		// In case logged in, check if it is an administrator
-		if($is_logged)
+		if ($is_logged)
 		{
-			if($logged_info->is_admin == 'Y') return new Object();
-			if($grant->manager) return new Object();
+			if ($logged_info->is_admin == 'Y') return new Object();
+			if ($grant->manager) return new Object();
 		}
 
 		$oFilterModel = getModel('spamfilter');
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check if there is a ban on the word
 		$text = '';
-		if($is_logged)
+		if ($is_logged)
 		{
 			$text = $obj->content;
 		}
@@ -99,12 +99,12 @@ 
 			$text = $obj->content . ' ' . $obj->nick_name . ' ' . $obj->homepage;	
 		}
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// If the specified time check is not modified
-		if(!$obj->__isupdate)
+		if (!$obj->__isupdate)
 		{
 			$output = $oFilterModel->checkLimited();
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 		unset($obj->__isupdate);
 		// Save a log
@@ -118,32 +118,32 @@ 
 	 */
 	function triggerInsertTrackback(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new Object();
+		if ($_SESSION['avoid_log']) return new Object();
 
 		$oFilterModel = getModel('spamfilter');
 		// Confirm if the trackbacks have been added more than once to your document
 		$output = $oFilterModel->isInsertedTrackback($obj->document_srl);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check if there is a ban on the word
 		$text = $obj->blog_name . ' ' . $obj->title . ' ' . $obj->excerpt . ' ' . $obj->url;
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Start Filtering
 		$oTrackbackModel = getModel('trackback');
 		$oTrackbackController = getController('trackback');
 
-		list($ipA,$ipB,$ipC,$ipD) = explode('.',$_SERVER['REMOTE_ADDR']);
-		$ipaddress = $ipA.'.'.$ipB.'.'.$ipC;
+		list($ipA, $ipB, $ipC, $ipD) = explode('.', $_SERVER['REMOTE_ADDR']);
+		$ipaddress = $ipA . '.' . $ipB . '.' . $ipC;
 		// In case the title and the blog name are indentical, investigate the IP address of the last 6 hours, delete and ban it.
-		if($obj->title == $obj->excerpt)
+		if ($obj->title == $obj->excerpt)
 		{
-			$oTrackbackController->deleteTrackbackSender(60*60*6, $ipaddress, $obj->url, $obj->blog_name, $obj->title, $obj->excerpt);
-			$this->insertIP($ipaddress.'.*', 'AUTO-DENIED : trackback.insertTrackback');
-			return new Object(-1,'msg_alert_trackback_denied');
+			$oTrackbackController->deleteTrackbackSender(60 * 60 * 6, $ipaddress, $obj->url, $obj->blog_name, $obj->title, $obj->excerpt);
+			$this->insertIP($ipaddress . '.*', 'AUTO-DENIED : trackback.insertTrackback');
+			return new Object(-1, 'msg_alert_trackback_denied');
 		}
 		// If trackbacks have been registered by one C-class IP address more than once for the last 30 minutes, ban the IP address and delete all the posts
 		/* 호스팅 환경을 감안하여 일단 이 부분은 동작하지 않도록 주석 처리
@@ -165,24 +165,24 @@ 
 	function insertIP($ipaddress_list, $description = null)
 	{
 		$regExr = "/^((\d{1,3}(?:.(\d{1,3}|\*)){3})\s*(\/\/(.*)\s*)?)*\s*$/";
-		if(!preg_match($regExr,$ipaddress_list)) return new Object(-1, 'msg_invalid');
-		$ipaddress_list = str_replace("\r","",$ipaddress_list);
-		$ipaddress_list = explode("\n",$ipaddress_list);
-		foreach($ipaddress_list as $ipaddressValue)
+		if (!preg_match($regExr, $ipaddress_list)) return new Object(-1, 'msg_invalid');
+		$ipaddress_list = str_replace("\r", "", $ipaddress_list);
+		$ipaddress_list = explode("\n", $ipaddress_list);
+		foreach ($ipaddress_list as $ipaddressValue)
 		{
 			$args = new stdClass();
-			preg_match("/(\d{1,3}(?:.(\d{1,3}|\*)){3})\s*(\/\/(.*)\s*)?/",$ipaddressValue,$matches);
-			if($ipaddress=trim($matches[1]))
+			preg_match("/(\d{1,3}(?:.(\d{1,3}|\*)){3})\s*(\/\/(.*)\s*)?/", $ipaddressValue, $matches);
+			if ($ipaddress = trim($matches[1]))
 			{
 				$args->ipaddress = $ipaddress;
-				if(!$description && $matches[4]) $args->description = $matches[4];
+				if (!$description && $matches[4]) $args->description = $matches[4];
 				else $args->description = $description;
 			}
 			$output = executeQuery('spamfilter.insertDeniedIP', $args);
-			if(!$output->toBool()) $fail_list .= $ipaddress.'<br/>';
+			if (!$output->toBool()) $fail_list .= $ipaddress . '<br/>';
 		}
 
-		$output->add('fail_list',$fail_list);
+		$output->add('fail_list', $fail_list);
 		return $output;
 	}
 
@@ -191,22 +191,22 @@ 
 	 */
 	function triggerSendMessage(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new Object();
+		if ($_SESSION['avoid_log']) return new Object();
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin == 'Y') return new Object();
+		if ($logged_info->is_admin == 'Y') return new Object();
 
 		$oFilterModel = getModel('spamfilter');
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check if there is a ban on the word
 		$text = $obj->title . ' ' . $obj->content;
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check the specified time
 		$output = $oFilterModel->checkLimited(TRUE);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Save a log
 		$this->insertLog();
 

Braces +76 added lines, -29 removed lines

@@ -27,7 +27,9 @@ 
 	 */
 	function triggerInsertDocument(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new Object();
+		if($_SESSION['avoid_log']) {
+			return new Object();
+		}
 		// Check the login status, login information, and permission
 		$is_logged = Context::get('is_logged');
 		$logged_info = Context::get('logged_info');
@@ -35,31 +37,40 @@ 
 		// In case logged in, check if it is an administrator
 		if($is_logged)
 		{
-			if($logged_info->is_admin == 'Y') return new Object();
-			if($grant->manager) return new Object();
+			if($logged_info->is_admin == 'Y') {
+				return new Object();
+			}
+			if($grant->manager) {
+				return new Object();
+			}
 		}
 
 		$oFilterModel = getModel('spamfilter');
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check if there is a ban on the word
 		$text = '';
 		if($is_logged)
 		{
 			$text = $obj->title . ' ' . $obj->content . ' ' . $obj->tags;
-		}
-		else
+		} else
 		{
 			$text = $obj->title . ' ' . $obj->content . ' ' . $obj->nick_name . ' ' . $obj->homepage . ' ' . $obj->tags;	
 		}
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check the specified time beside the modificaiton time
 		if($obj->document_srl == 0)
 		{
 			$output = $oFilterModel->checkLimited();
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 		// Save a log
 		$this->insertLog();
@@ -72,7 +83,9 @@ 
 	 */
 	function triggerInsertComment(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new Object();
+		if($_SESSION['avoid_log']) {
+			return new Object();
+		}
 		// Check the login status, login information, and permission
 		$is_logged = Context::get('is_logged');
 		$logged_info = Context::get('logged_info');
@@ -80,31 +93,40 @@ 
 		// In case logged in, check if it is an administrator
 		if($is_logged)
 		{
-			if($logged_info->is_admin == 'Y') return new Object();
-			if($grant->manager) return new Object();
+			if($logged_info->is_admin == 'Y') {
+				return new Object();
+			}
+			if($grant->manager) {
+				return new Object();
+			}
 		}
 
 		$oFilterModel = getModel('spamfilter');
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check if there is a ban on the word
 		$text = '';
 		if($is_logged)
 		{
 			$text = $obj->content;
-		}
-		else
+		} else
 		{
 			$text = $obj->content . ' ' . $obj->nick_name . ' ' . $obj->homepage;	
 		}
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// If the specified time check is not modified
 		if(!$obj->__isupdate)
 		{
 			$output = $oFilterModel->checkLimited();
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 		unset($obj->__isupdate);
 		// Save a log
@@ -118,20 +140,28 @@ 
 	 */
 	function triggerInsertTrackback(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new Object();
+		if($_SESSION['avoid_log']) {
+			return new Object();
+		}
 
 		$oFilterModel = getModel('spamfilter');
 		// Confirm if the trackbacks have been added more than once to your document
 		$output = $oFilterModel->isInsertedTrackback($obj->document_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check if there is a ban on the word
 		$text = $obj->blog_name . ' ' . $obj->title . ' ' . $obj->excerpt . ' ' . $obj->url;
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Start Filtering
 		$oTrackbackModel = getModel('trackback');
 		$oTrackbackController = getController('trackback');
@@ -165,7 +195,9 @@ 
 	function insertIP($ipaddress_list, $description = null)
 	{
 		$regExr = "/^((\d{1,3}(?:.(\d{1,3}|\*)){3})\s*(\/\/(.*)\s*)?)*\s*$/";
-		if(!preg_match($regExr,$ipaddress_list)) return new Object(-1, 'msg_invalid');
+		if(!preg_match($regExr,$ipaddress_list)) {
+			return new Object(-1, 'msg_invalid');
+		}
 		$ipaddress_list = str_replace("\r","",$ipaddress_list);
 		$ipaddress_list = explode("\n",$ipaddress_list);
 		foreach($ipaddress_list as $ipaddressValue)
@@ -175,11 +207,16 @@ 
 			if($ipaddress=trim($matches[1]))
 			{
 				$args->ipaddress = $ipaddress;
-				if(!$description && $matches[4]) $args->description = $matches[4];
-				else $args->description = $description;
+				if(!$description && $matches[4]) {
+					$args->description = $matches[4];
+				} else {
+					$args->description = $description;
+				}
 			}
 			$output = executeQuery('spamfilter.insertDeniedIP', $args);
-			if(!$output->toBool()) $fail_list .= $ipaddress.'<br/>';
+			if(!$output->toBool()) {
+				$fail_list .= $ipaddress.'<br/>';
+			}
 		}
 
 		$output->add('fail_list',$fail_list);
@@ -191,22 +228,32 @@ 
 	 */
 	function triggerSendMessage(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new Object();
+		if($_SESSION['avoid_log']) {
+			return new Object();
+		}
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin == 'Y') return new Object();
+		if($logged_info->is_admin == 'Y') {
+			return new Object();
+		}
 
 		$oFilterModel = getModel('spamfilter');
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check if there is a ban on the word
 		$text = $obj->title . ' ' . $obj->content;
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check the specified time
 		$output = $oFilterModel->checkLimited(TRUE);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Save a log
 		$this->insertLog();
 

modules/tag/tag.model.php

Doc Comments +2 added lines

@@ -49,6 +49,7 @@ 
 
 	/**
 	 * @brief document_srl the import tag
+	 * @param stdClass $obj
 	 */
 	function getDocumentSrlByTag($obj)
 	{
@@ -70,6 +71,7 @@ 
 
 	/**
 	 * @brief document used in the import tag
+	 * @param stdClass $obj
 	 */
 	function getDocumentsTagList($obj)
 	{

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * @class  tagModel
- * @author NAVER (developers@xpressengine.com)
- * @brief tag model class of the module
- */
+	 * @class  tagModel
+	 * @author NAVER (developers@xpressengine.com)
+	 * @brief tag model class of the module
+	 */
 class tagModel extends tag
 {
 	/**

Spacing +9 added lines, -9 removed lines

@@ -20,7 +20,7 @@ 
 	 */
 	function getTagList($obj)
 	{
-		if($obj->mid)
+		if ($obj->mid)
 		{
 			$oModuleModel = getModel('module');
 			$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
@@ -29,7 +29,7 @@ 
 
 		// Module_srl passed the array may be a check whether the array
 		$args = new stdClass;
-		if(is_array($obj->module_srl))
+		if (is_array($obj->module_srl))
 		{
 			$args->module_srl = implode(',', $obj->module_srl);
 		}
@@ -42,7 +42,7 @@ 
 		$args->count = $obj->sort_index;
 
 		$output = executeQueryArray('tag.getTagList', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		return $output;
 	}
@@ -53,7 +53,7 @@ 
 	function getDocumentSrlByTag($obj)
 	{
 		$args = new stdClass;
-		if(is_array($obj->module_srl))
+		if (is_array($obj->module_srl))
 		{
 			$args->module_srl = implode(',', $obj->module_srl);
 		}
@@ -74,7 +74,7 @@ 
 	function getDocumentsTagList($obj)
 	{
 		$args = new stdClass;
-		if(is_array($obj->document_srl))
+		if (is_array($obj->document_srl))
 		{
 			$args->document_srl = implode(',', $obj->document_srl);
 		}
@@ -84,7 +84,7 @@ 
 		}
 
 		$output = executeQueryArray('tag.getDocumentsTagList', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		return $output;
 	}
@@ -95,7 +95,7 @@ 
 	function getTagWithUsedList($obj)
 	{
 		$args = new stdClass;
-		if(is_array($obj->module_srl))
+		if (is_array($obj->module_srl))
 		{
 			$args->module_srl = implode(',', $obj->module_srl);
 		}
@@ -108,9 +108,9 @@ 
 		$output = $this->getDocumentSrlByTag($args);
 		$document_srl = array();
 
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $k => $v) $document_srl[] = $v->document_srl;
+			foreach ($output->data as $k => $v) $document_srl[] = $v->document_srl;
 		}
 		unset($args);
 

Braces +13 added lines, -11 removed lines

@@ -32,8 +32,7 @@ 
 		if(is_array($obj->module_srl))
 		{
 			$args->module_srl = implode(',', $obj->module_srl);
-		}
-		else
+		} else
 		{
 			$args->module_srl = $obj->module_srl;
 		}
@@ -42,7 +41,9 @@ 
 		$args->count = $obj->sort_index;
 
 		$output = executeQueryArray('tag.getTagList', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		return $output;
 	}
@@ -56,8 +57,7 @@ 
 		if(is_array($obj->module_srl))
 		{
 			$args->module_srl = implode(',', $obj->module_srl);
-		}
-		else
+		} else
 		{
 			$args->module_srl = $obj->module_srl;
 		}
@@ -77,14 +77,15 @@ 
 		if(is_array($obj->document_srl))
 		{
 			$args->document_srl = implode(',', $obj->document_srl);
-		}
-		else
+		} else
 		{
 			$args->document_srl = $obj->document_srl;
 		}
 
 		$output = executeQueryArray('tag.getDocumentsTagList', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		return $output;
 	}
@@ -98,8 +99,7 @@ 
 		if(is_array($obj->module_srl))
 		{
 			$args->module_srl = implode(',', $obj->module_srl);
-		}
-		else
+		} else
 		{
 			$args->module_srl = $obj->module_srl;
 		}
@@ -110,7 +110,9 @@ 
 
 		if($output->data)
 		{
-			foreach($output->data as $k => $v) $document_srl[] = $v->document_srl;
+			foreach($output->data as $k => $v) {
+				$document_srl[] = $v->document_srl;
+			}
 		}
 		unset($args);
 

modules/trash/trash.admin.controller.php

Doc Comments +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@ 
 	/**
 	 * Empty trash
 	 * @param array trashSrls
-	 * @return Object
+	 * @return Object|null
 	 */
 	function procTrashAdminEmptyTrash()
 	{
@@ -127,7 +127,7 @@ 
 
 	/**
 	 * Restore content object
-	 * @return void|Object
+	 * @return Object|null
 	 */
 	function procTrashAdminRestore()
 	{
@@ -183,7 +183,7 @@ 
 
 	/**
 	 * Set trash list to Context
-	 * @return void|Object
+	 * @return Object|null
 	 */
 	function procTrashAdminGetList()
 	{

Spacing +31 added lines, -31 removed lines

@@ -17,7 +17,7 @@ 
 	 */
 	function insertTrash($obj)
 	{
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new Object(-1, 'msg_not_permitted');
 		}
@@ -27,8 +27,8 @@ 
 		$oTrashVO = new TrashVO();
 		$oTrashVO = &$obj;
 
-		if(!$oTrashVO->getTrashSrl()) $oTrashVO->setTrashSrl(getNextSequence());
-		if(!is_string($oTrashVO->getSerializedObject())) $oTrashVO->setSerializedObject(serialize($oTrashVO->getSerializedObject()));
+		if (!$oTrashVO->getTrashSrl()) $oTrashVO->setTrashSrl(getNextSequence());
+		if (!is_string($oTrashVO->getSerializedObject())) $oTrashVO->setSerializedObject(serialize($oTrashVO->getSerializedObject()));
 		$oTrashVO->setIpaddress($_SERVER['REMOTE_ADDR']);
 		$oTrashVO->setRemoverSrl($logged_info->member_srl);
 		$oTrashVO->setRegdate(date('YmdHis'));
@@ -49,17 +49,17 @@ 
 		$tmpTrashSrls = Context::get('cart');
 
 		$trashSrls = array();
-		if($isAll != 'true')
+		if ($isAll != 'true')
 		{
-			if(is_array($tmpTrashSrls)) $trashSrls = $tmpTrashSrls;
+			if (is_array($tmpTrashSrls)) $trashSrls = $tmpTrashSrls;
 			else $trashSrls = explode('|@|', $tmpTrashSrls);
 		}
 
 		//module relation data delete...
 		$output = $this->_relationDataDelete($isAll, $trashSrls);
-		if(!$output->toBool()) return new Object(-1, $output->message);
+		if (!$output->toBool()) return new Object(-1, $output->message);
 
-		if(!$this->_emptyTrash($trashSrls)) return new Object(-1, $lang->fail_empty);
+		if (!$this->_emptyTrash($trashSrls)) return new Object(-1, $lang->fail_empty);
 
 		$this->setMessage('success_deleted', 'info');
 
@@ -76,17 +76,17 @@ 
 	function _relationDataDelete($isAll, &$trashSrls)
 	{
 		$oTrashModel = getModel('trash');
-		if($isAll == 'true')
+		if ($isAll == 'true')
 		{
 			$output = $oTrashModel->getTrashAllList(array());
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return new Object(-1, $output->message);
 			}
 
-			if(is_array($output->data))
+			if (is_array($output->data))
 			{
-				foreach($output->data as $value)
+				foreach ($output->data as $value)
 				{
 					$trashSrls[] = $value->getTrashSrl();
 				}
@@ -97,29 +97,29 @@ 
 			$args = new stdClass();
 			$args->trashSrl = $trashSrls;
 			$output = $oTrashModel->getTrashList($args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return new Object(-1, $output->message);
 			}
 		}
 
-		if(is_array($output->data))
+		if (is_array($output->data))
 		{
-			foreach($output->data as $oTrashVO)
+			foreach ($output->data as $oTrashVO)
 			{
 				//class file check
 				$classPath = ModuleHandler::getModulePath($oTrashVO->getOriginModule());
-				if(!is_dir(FileHandler::getRealPath($classPath))) return new Object(-1, 'not exist restore module directory');
+				if (!is_dir(FileHandler::getRealPath($classPath))) return new Object(-1, 'not exist restore module directory');
 
 				$classFile = sprintf('%s%s.admin.controller.php', $classPath, $oTrashVO->getOriginModule());
 				$classFile = FileHandler::getRealPath($classFile);
-				if(!file_exists($classFile)) return new Object(-1, 'not exist restore module class file');
+				if (!file_exists($classFile)) return new Object(-1, 'not exist restore module class file');
 
 				$oAdminController = getAdminController($oTrashVO->getOriginModule());
-				if(!method_exists($oAdminController, 'emptyTrash')) return new Object(-1, 'not exist restore method in module class file');
+				if (!method_exists($oAdminController, 'emptyTrash')) return new Object(-1, 'not exist restore method in module class file');
 
 				$output2 = $oAdminController->emptyTrash($oTrashVO->getSerializedObject());
-				if(!$output2->toBool()) return new Object(-1, $output2->message);
+				if (!$output2->toBool()) return new Object(-1, $output2->message);
 			}
 		}
 		return new Object(0, $lang->success_deleted);
@@ -134,33 +134,33 @@ 
 		global $lang;
 		$trashSrlList = Context::get('cart');
 
-		if(is_array($trashSrlList))
+		if (is_array($trashSrlList))
 		{
 			// begin transaction
 			$oDB = &DB::getInstance();
 			$oDB->begin();
 			// eache restore method call in each classfile
-			foreach($trashSrlList as $value)
+			foreach ($trashSrlList as $value)
 			{
 				$oTrashModel = getModel('trash');
 				$output = $oTrashModel->getTrash($value);
-				if(!$output->toBool()) return new Object(-1, $output->message);
+				if (!$output->toBool()) return new Object(-1, $output->message);
 
 				//class file check
 				$classPath = ModuleHandler::getModulePath($output->data->getOriginModule());
-				if(!is_dir(FileHandler::getRealPath($classPath))) return new Object(-1, 'not exist restore module directory');
+				if (!is_dir(FileHandler::getRealPath($classPath))) return new Object(-1, 'not exist restore module directory');
 
 				$classFile = sprintf('%s%s.admin.controller.php', $classPath, $output->data->getOriginModule());
 				$classFile = FileHandler::getRealPath($classFile);
-				if(!file_exists($classFile)) return new Object(-1, 'not exist restore module class file');
+				if (!file_exists($classFile)) return new Object(-1, 'not exist restore module class file');
 
 				$oAdminController = getAdminController($output->data->getOriginModule());
-				if(!method_exists($oAdminController, 'restoreTrash')) return new Object(-1, 'not exist restore method in module class file');
+				if (!method_exists($oAdminController, 'restoreTrash')) return new Object(-1, 'not exist restore method in module class file');
 
 				$originObject = unserialize($output->data->getSerializedObject());
 				$output = $oAdminController->restoreTrash($originObject);
 
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					$oDB->rollback();
 					return new Object(-1, $output->message);
@@ -168,7 +168,7 @@ 
 			}
 
 			// restore object delete in trash box
-			if(!$this->_emptyTrash($trashSrlList)) {
+			if (!$this->_emptyTrash($trashSrlList)) {
 				$oDB->rollback();
 				return new Object(-1, $lang->fail_empty);
 			}
@@ -187,11 +187,11 @@ 
 	 */
 	function procTrashAdminGetList()
 	{
-		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
 		$trashSrls = Context::get('trash_srls');
-		if($trashSrls) $trashSrlList = explode(',', $trashSrls);
+		if ($trashSrls) $trashSrlList = explode(',', $trashSrls);
 
-		if(count($trashSrlList) > 0)
+		if (count($trashSrlList) > 0)
 		{
 			$oTrashModel = getModel('trash');
 			$args = new stdClass();
@@ -218,11 +218,11 @@ 
 	 */
 	function _emptyTrash($trashSrls)
 	{
-		if(!is_array($trashSrls)) return false;
+		if (!is_array($trashSrls)) return false;
 		$args = new stdClass();
 		$args->trashSrls = $trashSrls;
 		$output = executeQuery('trash.deleteTrash', $args);
-		if(!$output->toBool()) return false;
+		if (!$output->toBool()) return false;
 
 		return true;
 	}

Braces +55 added lines, -22 removed lines

@@ -27,8 +27,12 @@ 
 		$oTrashVO = new TrashVO();
 		$oTrashVO = &$obj;
 
-		if(!$oTrashVO->getTrashSrl()) $oTrashVO->setTrashSrl(getNextSequence());
-		if(!is_string($oTrashVO->getSerializedObject())) $oTrashVO->setSerializedObject(serialize($oTrashVO->getSerializedObject()));
+		if(!$oTrashVO->getTrashSrl()) {
+			$oTrashVO->setTrashSrl(getNextSequence());
+		}
+		if(!is_string($oTrashVO->getSerializedObject())) {
+			$oTrashVO->setSerializedObject(serialize($oTrashVO->getSerializedObject()));
+		}
 		$oTrashVO->setIpaddress($_SERVER['REMOTE_ADDR']);
 		$oTrashVO->setRemoverSrl($logged_info->member_srl);
 		$oTrashVO->setRegdate(date('YmdHis'));
@@ -51,15 +55,22 @@ 
 		$trashSrls = array();
 		if($isAll != 'true')
 		{
-			if(is_array($tmpTrashSrls)) $trashSrls = $tmpTrashSrls;
-			else $trashSrls = explode('|@|', $tmpTrashSrls);
+			if(is_array($tmpTrashSrls)) {
+				$trashSrls = $tmpTrashSrls;
+			} else {
+				$trashSrls = explode('|@|', $tmpTrashSrls);
+			}
 		}
 
 		//module relation data delete...
 		$output = $this->_relationDataDelete($isAll, $trashSrls);
-		if(!$output->toBool()) return new Object(-1, $output->message);
+		if(!$output->toBool()) {
+			return new Object(-1, $output->message);
+		}
 
-		if(!$this->_emptyTrash($trashSrls)) return new Object(-1, $lang->fail_empty);
+		if(!$this->_emptyTrash($trashSrls)) {
+			return new Object(-1, $lang->fail_empty);
+		}
 
 		$this->setMessage('success_deleted', 'info');
 
@@ -91,8 +102,7 @@ 
 					$trashSrls[] = $value->getTrashSrl();
 				}
 			}
-		}
-		else
+		} else
 		{
 			$args = new stdClass();
 			$args->trashSrl = $trashSrls;
@@ -109,17 +119,25 @@ 
 			{
 				//class file check
 				$classPath = ModuleHandler::getModulePath($oTrashVO->getOriginModule());
-				if(!is_dir(FileHandler::getRealPath($classPath))) return new Object(-1, 'not exist restore module directory');
+				if(!is_dir(FileHandler::getRealPath($classPath))) {
+					return new Object(-1, 'not exist restore module directory');
+				}
 
 				$classFile = sprintf('%s%s.admin.controller.php', $classPath, $oTrashVO->getOriginModule());
 				$classFile = FileHandler::getRealPath($classFile);
-				if(!file_exists($classFile)) return new Object(-1, 'not exist restore module class file');
+				if(!file_exists($classFile)) {
+					return new Object(-1, 'not exist restore module class file');
+				}
 
 				$oAdminController = getAdminController($oTrashVO->getOriginModule());
-				if(!method_exists($oAdminController, 'emptyTrash')) return new Object(-1, 'not exist restore method in module class file');
+				if(!method_exists($oAdminController, 'emptyTrash')) {
+					return new Object(-1, 'not exist restore method in module class file');
+				}
 
 				$output2 = $oAdminController->emptyTrash($oTrashVO->getSerializedObject());
-				if(!$output2->toBool()) return new Object(-1, $output2->message);
+				if(!$output2->toBool()) {
+					return new Object(-1, $output2->message);
+				}
 			}
 		}
 		return new Object(0, $lang->success_deleted);
@@ -144,18 +162,26 @@ 
 			{
 				$oTrashModel = getModel('trash');
 				$output = $oTrashModel->getTrash($value);
-				if(!$output->toBool()) return new Object(-1, $output->message);
+				if(!$output->toBool()) {
+					return new Object(-1, $output->message);
+				}
 
 				//class file check
 				$classPath = ModuleHandler::getModulePath($output->data->getOriginModule());
-				if(!is_dir(FileHandler::getRealPath($classPath))) return new Object(-1, 'not exist restore module directory');
+				if(!is_dir(FileHandler::getRealPath($classPath))) {
+					return new Object(-1, 'not exist restore module directory');
+				}
 
 				$classFile = sprintf('%s%s.admin.controller.php', $classPath, $output->data->getOriginModule());
 				$classFile = FileHandler::getRealPath($classFile);
-				if(!file_exists($classFile)) return new Object(-1, 'not exist restore module class file');
+				if(!file_exists($classFile)) {
+					return new Object(-1, 'not exist restore module class file');
+				}
 
 				$oAdminController = getAdminController($output->data->getOriginModule());
-				if(!method_exists($oAdminController, 'restoreTrash')) return new Object(-1, 'not exist restore method in module class file');
+				if(!method_exists($oAdminController, 'restoreTrash')) {
+					return new Object(-1, 'not exist restore method in module class file');
+				}
 
 				$originObject = unserialize($output->data->getSerializedObject());
 				$output = $oAdminController->restoreTrash($originObject);
@@ -187,9 +213,13 @@ 
 	 */
 	function procTrashAdminGetList()
 	{
-		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new Object(-1,'msg_not_permitted');
+		}
 		$trashSrls = Context::get('trash_srls');
-		if($trashSrls) $trashSrlList = explode(',', $trashSrls);
+		if($trashSrls) {
+			$trashSrlList = explode(',', $trashSrls);
+		}
 
 		if(count($trashSrlList) > 0)
 		{
@@ -198,8 +228,7 @@ 
 			$args->trashSrl = $trashSrlList;
 			$output = $oTrashModel->getTrashList($args);
 			$trashList = $output->data;
-		}
-		else
+		} else
 		{
 			global $lang;
 			$trashList = array();
@@ -218,11 +247,15 @@ 
 	 */
 	function _emptyTrash($trashSrls)
 	{
-		if(!is_array($trashSrls)) return false;
+		if(!is_array($trashSrls)) {
+			return false;
+		}
 		$args = new stdClass();
 		$args->trashSrls = $trashSrls;
 		$output = executeQuery('trash.deleteTrash', $args);
-		if(!$output->toBool()) return false;
+		if(!$output->toBool()) {
+			return false;
+		}
 
 		return true;
 	}

Indentation +7 added lines, -7 removed lines

@@ -1,13 +1,13 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * trashAdminController class
- * trash admin the module's controller class
- *
- * @author NAVER (developers@xpressengine.com)
- * @package /modules/trash
- * @version 0.1
- */
+	 * trashAdminController class
+	 * trash admin the module's controller class
+	 *
+	 * @author NAVER (developers@xpressengine.com)
+	 * @package /modules/trash
+	 * @version 0.1
+	 */
 class trashAdminController extends trash
 {
 	/**

modules/widget/widget.controller.php

Doc Comments +3 added lines

@@ -696,6 +696,9 @@
 		return $GLOBALS['_xe_loaded_widgets_'][$widget];
 	}
 
+	/**
+	 * @param boolean $javascript_mode
+	 */
 	function compileWidgetStyle($widgetStyle,$widget,$widget_content_body, $args, $javascript_mode)
 	{
 		if(!$widgetStyle) return $widget_content_body;

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * @class  widgetController
- * @author NAVER (developers@xpressengine.com)
- * @brief Controller class for widget modules
- */
+	 * @class  widgetController
+	 * @author NAVER (developers@xpressengine.com)
+	 * @brief Controller class for widget modules
+	 */
 class widgetController extends widget
 {
 	// The results are not widget modify/delete and where to use the flag for

Spacing +143 added lines, -143 removed lines

@@ -34,13 +34,13 @@ 
 		$oModuleModel = getModel('module');
 		$skin_info = $oModuleModel->loadSkinInfo($path, $skin);
 
-		for($i=0;$i<count($skin_info->colorset);$i++)
+		for ($i = 0; $i < count($skin_info->colorset); $i++)
 		{
 			$colorset = sprintf('%s|@|%s', $skin_info->colorset[$i]->name, $skin_info->colorset[$i]->title);
 			$colorset_list[] = $colorset;
 		}
 
-		if(count($colorset_list)) $colorsets = implode("\n", $colorset_list);
+		if (count($colorset_list)) $colorsets = implode("\n", $colorset_list);
 		$this->add('colorset_list', $colorsets);
 	}
 
@@ -50,12 +50,12 @@ 
 	function procWidgetGenerateCode()
 	{
 		$widget = Context::get('selected_widget');
-		if(!$widget) return new Object(-1,'msg_invalid_request');
-		if(!Context::get('skin')) return new Object(-1,Context::getLang('msg_widget_skin_is_null'));
+		if (!$widget) return new Object(-1, 'msg_invalid_request');
+		if (!Context::get('skin')) return new Object(-1, Context::getLang('msg_widget_skin_is_null'));
 
 		$attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars);
 
-		$widget_code = sprintf('<img class="zbxe_widget_output" widget="%s" %s />', $widget, implode(' ',$attribute));
+		$widget_code = sprintf('<img class="zbxe_widget_output" widget="%s" %s />', $widget, implode(' ', $attribute));
 		// Code output
 		$this->add('widget_code', $widget_code);
 	}
@@ -66,9 +66,9 @@ 
 	function procWidgetGenerateCodeInPage()
 	{
 		$widget = Context::get('selected_widget');
-		if(!$widget) return new Object(-1,'msg_invalid_request');
+		if (!$widget) return new Object(-1, 'msg_invalid_request');
 
-		if(!in_array($widget,array('widgetBox','widgetContent')) && !Context::get('skin')) return new Object(-1,Context::getLang('msg_widget_skin_is_null'));
+		if (!in_array($widget, array('widgetBox', 'widgetContent')) && !Context::get('skin')) return new Object(-1, Context::getLang('msg_widget_skin_is_null'));
 
 		$attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars);
 		// Wanted results
@@ -89,7 +89,7 @@ 
 
 		$this->setLayoutPath('./common/tpl');
 		$this->setLayoutFile('default_layout.html');
-		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplatePath($this->module_path . 'tpl');
 		$this->setTemplateFile("top_refresh.html");
 	}
 
@@ -107,28 +107,28 @@ 
 		$err = 0;
 		$oLayoutModel = getModel('layout');
 		$layout_info = $oLayoutModel->getLayout($module_srl);
-		if(!$layout_info || $layout_info->type != 'faceoff') $err++;
+		if (!$layout_info || $layout_info->type != 'faceoff') $err++;
 		// Destination Information Wanted page module
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'module');
 		$page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
-		if(!$page_info->module_srl || $page_info->module != 'page') $err++;
+		if (!$page_info->module_srl || $page_info->module != 'page') $err++;
 
-		if($err > 1) return new Object(-1,'msg_invalid_request');
+		if ($err > 1) return new Object(-1, 'msg_invalid_request');
 		// Check permissions
 		$is_logged = Context::get('is_logged');
 		$logged_info = Context::get('logged_info');
 		$user_group = $logged_info->group_list;
 		$is_admin = false;
-		if(count($user_group)&&count($page_info->grants['manager']))
+		if (count($user_group) && count($page_info->grants['manager']))
 		{
 			$manager_group = $page_info->grants['manager'];
-			foreach($user_group as $group_srl => $group_info)
+			foreach ($user_group as $group_srl => $group_info)
 			{
-				if(in_array($group_srl, $manager_group)) $is_admin = true;
+				if (in_array($group_srl, $manager_group)) $is_admin = true;
 			}
 		}
-		if(!$is_admin && !$is_logged && $logged_info->is_admin != 'Y' && !$oModuleModel->isSiteAdmin($logged_info) && !(is_array($page_info->admin_id) && in_array($logged_info->user_id, $page_info->admin_id))) return new Object(-1,'msg_not_permitted');
+		if (!$is_admin && !$is_logged && $logged_info->is_admin != 'Y' && !$oModuleModel->isSiteAdmin($logged_info) && !(is_array($page_info->admin_id) && in_array($logged_info->user_id, $page_info->admin_id))) return new Object(-1, 'msg_not_permitted');
 		// Enter post
 		$oDocumentModel = getModel('document');
 		$oDocumentController = getController('document');
@@ -139,7 +139,7 @@ 
 		$obj->document_srl = $document_srl;
 
 		$oDocument = $oDocumentModel->getDocument($obj->document_srl, true);
-		if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
+		if ($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
 		{
 			$output = $oDocumentController->updateDocument($oDocument, $obj);
 		}
@@ -149,7 +149,7 @@ 
 			$obj->document_srl = $output->get('document_srl');
 		}
 		// Stop when an error occurs
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Return results
 		$this->add('document_srl', $obj->document_srl);
 	}
@@ -167,30 +167,30 @@ 
 		$oDocumentAdminController = getAdminController('document');
 
 		$oDocument = $oDocumentModel->getDocument($document_srl, true);
-		if(!$oDocument->isExists()) return new Object(-1,'msg_invalid_request');
+		if (!$oDocument->isExists()) return new Object(-1, 'msg_invalid_request');
 		$module_srl = $oDocument->get('module_srl');
 		// Destination Information Wanted page module
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'module');
 		$page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
-		if(!$page_info->module_srl || $page_info->module != 'page') return new Object(-1,'msg_invalid_request');
+		if (!$page_info->module_srl || $page_info->module != 'page') return new Object(-1, 'msg_invalid_request');
 		// Check permissions
 		$is_logged = Context::get('is_logged');
 		$logged_info = Context::get('logged_info');
 		$user_group = $logged_info->group_list;
 		$is_admin = false;
-		if(count($user_group)&&count($page_info->grants['manager']))
+		if (count($user_group) && count($page_info->grants['manager']))
 		{
 			$manager_group = $page_info->grants['manager'];
-			foreach($user_group as $group_srl => $group_info)
+			foreach ($user_group as $group_srl => $group_info)
 			{
-				if(in_array($group_srl, $manager_group)) $is_admin = true;
+				if (in_array($group_srl, $manager_group)) $is_admin = true;
 			}
 		}
-		if(!$is_admin && !$is_logged && $logged_info->is_admin != 'Y' && !$oModuleModel->isSiteAdmin($logged_info) && !(is_array($page_info->admin_id) && in_array($logged_info->user_id, $page_info->admin_id))) return new Object(-1,'msg_not_permitted');
+		if (!$is_admin && !$is_logged && $logged_info->is_admin != 'Y' && !$oModuleModel->isSiteAdmin($logged_info) && !(is_array($page_info->admin_id) && in_array($logged_info->user_id, $page_info->admin_id))) return new Object(-1, 'msg_not_permitted');
 
-		$output = $oDocumentAdminController->copyDocumentModule(array($oDocument->get('document_srl')), $oDocument->get('module_srl'),0);
-		if(!$output->toBool()) return $output;
+		$output = $oDocumentAdminController->copyDocumentModule(array($oDocument->get('document_srl')), $oDocument->get('module_srl'), 0);
+		if (!$output->toBool()) return $output;
 		// Return results
 		$copied_srls = $output->get('copied_srls');
 		$this->add('document_srl', $copied_srls[$oDocument->get('document_srl')]);
@@ -208,29 +208,29 @@ 
 		$oDocumentController = getController('document');
 
 		$oDocument = $oDocumentModel->getDocument($document_srl, true);
-		if(!$oDocument->isExists()) return new Object();
+		if (!$oDocument->isExists()) return new Object();
 		$module_srl = $oDocument->get('module_srl');
 		// Destination Information Wanted page module
 		$oModuleModel = getModel('module');
 		$page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-		if(!$page_info->module_srl || $page_info->module != 'page') return new Object(-1,'msg_invalid_request');
+		if (!$page_info->module_srl || $page_info->module != 'page') return new Object(-1, 'msg_invalid_request');
 		// Check permissions
 		$is_logged = Context::get('is_logged');
 		$logged_info = Context::get('logged_info');
 		$user_group = $logged_info->group_list;
 		$is_admin = false;
-		if(count($user_group)&&count($page_info->grants['manager']))
+		if (count($user_group) && count($page_info->grants['manager']))
 		{
 			$manager_group = $page_info->grants['manager'];
-			foreach($user_group as $group_srl => $group_info)
+			foreach ($user_group as $group_srl => $group_info)
 			{
-				if(in_array($group_srl, $manager_group)) $is_admin = true;
+				if (in_array($group_srl, $manager_group)) $is_admin = true;
 			}
 		}
-		if(!$is_admin && !$is_logged && $logged_info->is_admin != 'Y' && !$oModuleModel->isSiteAdmin($logged_info) && !(is_array($page_info->admin_id) && in_array($logged_info->user_id, $page_info->admin_id))) return new Object(-1,'msg_not_permitted');
+		if (!$is_admin && !$is_logged && $logged_info->is_admin != 'Y' && !$oModuleModel->isSiteAdmin($logged_info) && !(is_array($page_info->admin_id) && in_array($logged_info->user_id, $page_info->admin_id))) return new Object(-1, 'msg_not_permitted');
 
 		$output = $oDocumentController->deleteDocument($oDocument->get('document_srl'), true);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 	}
 
 	/**
@@ -247,7 +247,7 @@ 
 	 */
 	function triggerWidgetCompile(&$content)
 	{
-		if(Context::getResponseMethod()!='HTML') return new Object();
+		if (Context::getResponseMethod() != 'HTML') return new Object();
 		$content = $this->transWidgetCode($content, $this->layout_javascript_mode);
 		return new Object();
 	}
@@ -263,9 +263,9 @@ 
 		// Check whether to include information about editing
 		$this->javascript_mode = $javascript_mode;
 		// Widget code box change
-		$content = preg_replace_callback('!<div([^\>]*)widget=([^\>]*?)\><div><div>((<img.*?>)*)!is', array($this,'transWidgetBox'), $content);
+		$content = preg_replace_callback('!<div([^\>]*)widget=([^\>]*?)\><div><div>((<img.*?>)*)!is', array($this, 'transWidgetBox'), $content);
 		// Widget code information byeogyeong
-		$content = preg_replace_callback('!<img([^\>]*)widget=([^\>]*?)\>!is', array($this,'transWidget'), $content);
+		$content = preg_replace_callback('!<img([^\>]*)widget=([^\>]*?)\>!is', array($this, 'transWidget'), $content);
 
 		return $content;
 	}
@@ -280,11 +280,11 @@ 
 		$oXmlParser = new XmlParser();
 		$xml_doc = $oXmlParser->parse(trim($buff));
 
-		if($xml_doc->img) $vars = $xml_doc->img->attrs;
+		if ($xml_doc->img) $vars = $xml_doc->img->attrs;
 		else $vars = $xml_doc->attrs;
 
 		$widget = $vars->widget;
-		if(!$widget) return $matches[0];
+		if (!$widget) return $matches[0];
 		unset($vars->widget);
 
 		return $this->execute($widget, $vars, $this->javascript_mode);
@@ -295,13 +295,13 @@ 
 	 */
 	function transWidgetBox($matches)
 	{
-		$buff = preg_replace('/<div><div>(.*)$/i','</div>',$matches[0]);
+		$buff = preg_replace('/<div><div>(.*)$/i', '</div>', $matches[0]);
 		$oXmlParser = new XmlParser();
 		$xml_doc = $oXmlParser->parse($buff);
 
 		$vars = $xml_doc->div->attrs;
 		$widget = $vars->widget;
-		if(!$widget) return $matches[0];
+		if (!$widget) return $matches[0];
 		unset($vars->widget);
 
 		$vars->widgetbox_content = $matches[3];
@@ -322,28 +322,28 @@ 
 		$oXmlParser = new XmlParser();
 
 		$cnt = count($matches[1]);
-		for($i=0;$i<$cnt;$i++)
+		for ($i = 0; $i < $cnt; $i++)
 		{
 			$buff = $matches[0][$i];
 			$xml_doc = $oXmlParser->parse(trim($buff));
 
 			$args = $xml_doc->img->attrs;
-			if(!$args) continue;
+			if (!$args) continue;
 			// If you are not caching path
 			$widget = $args->widget;
 			$sequence = $args->widget_sequence;
 			$cache = $args->widget_cache;
-			if(!$sequence || !$cache) continue;
+			if (!$sequence || !$cache) continue;
 
-			if(count($args))
+			if (count($args))
 			{
-				foreach($args as $k => $v) $args->{$k} = urldecode($v);
+				foreach ($args as $k => $v) $args->{$k} = urldecode($v);
 			}
 			// If the cache file for each language widget regeneration
-			foreach($lang_list as $lang_type => $val)
+			foreach ($lang_list as $lang_type => $val)
 			{
 				$cache_file = sprintf('%s%d.%s.cache', $this->cache_path, $sequence, $lang_type);
-				if(!file_exists($cache_file)) continue;
+				if (!file_exists($cache_file)) continue;
 				$this->getCache($widget, $args, $lang_type, true);
 			}
 		}
@@ -355,7 +355,7 @@ 
 	function getCache($widget, $args, $lang_type = null, $ignore_cache = false)
 	{
 		// If the specified language specifies the current language
-		if(!$lang_type) $lang_type = Context::getLangType();
+		if (!$lang_type) $lang_type = Context::getLangType();
 		// widget, the cache number and cache values are set
 		$widget_sequence = $args->widget_sequence;
 		$widget_cache = $args->widget_cache;
@@ -363,10 +363,10 @@ 
 		/**
 		 * Even if the cache number and value of the cache and return it to extract data
 		 */
-		if(!$ignore_cache && (!$widget_cache || !$widget_sequence))
+		if (!$ignore_cache && (!$widget_cache || !$widget_sequence))
 		{
 			$oWidget = $this->getWidgetObject($widget);
-			if(!$oWidget || !method_exists($oWidget, 'proc')) return;
+			if (!$oWidget || !method_exists($oWidget, 'proc')) return;
 
 			$widget_content = $oWidget->proc($args);
 			$oModuleController = getController('module');
@@ -375,7 +375,7 @@ 
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('template');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$key = 'widget_cache:' . $widget_sequence;
 
@@ -383,7 +383,7 @@ 
 			$cache_body = preg_replace('@<\!--#Meta:@', '<!--Meta:', $cache_body);
 		}
 
-		if($cache_body)
+		if ($cache_body)
 		{
 			return $cache_body;
 		}
@@ -396,11 +396,11 @@ 
 			// Wanted cache file
 			$cache_file = sprintf('%s%d.%s.cache', $this->cache_path, $widget_sequence, $lang_type);
 			// If the file exists in the cache, the file validation
-			if(!$ignore_cache && file_exists($cache_file))
+			if (!$ignore_cache && file_exists($cache_file))
 			{
 				$filemtime = filemtime($cache_file);
 				// Should be modified compared to the time of the cache or in the future if creating more than widget.controller.php file a return value of the cache
-				if($filemtime + $widget_cache * 60 > $_SERVER['REQUEST_TIME'] && $filemtime > filemtime(_XE_PATH_.'modules/widget/widget.controller.php'))
+				if ($filemtime + $widget_cache * 60 > $_SERVER['REQUEST_TIME'] && $filemtime > filemtime(_XE_PATH_ . 'modules/widget/widget.controller.php'))
 				{
 					$cache_body = FileHandler::readFile($cache_file);
 					$cache_body = preg_replace('@<\!--#Meta:@', '<!--Meta:', $cache_body);
@@ -409,18 +409,18 @@ 
 				}
 			}
 			// cache update and cache renewal of the file mtime
-			if(!$oCacheHandler->isSupport())
+			if (!$oCacheHandler->isSupport())
 			{
 			touch($cache_file);
 			}
 
 			$oWidget = $this->getWidgetObject($widget);
-			if(!$oWidget || !method_exists($oWidget,'proc')) return;
+			if (!$oWidget || !method_exists($oWidget, 'proc')) return;
 
 			$widget_content = $oWidget->proc($args);
 			$oModuleController = getController('module');
 			$oModuleController->replaceDefinedLangCode($widget_content);
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$oCacheHandler->put($key, $widget_content, $widget_cache * 60);
 			}
@@ -442,16 +442,16 @@ 
 	function execute($widget, $args, $javascript_mode = false, $escaped = true)
 	{
 		// Save for debug run-time widget
-		if(__DEBUG__==3) $start = getMicroTime();
+		if (__DEBUG__ == 3) $start = getMicroTime();
 		$before = microtime(true);
 		// urldecode the value of args haejum
 		$object_vars = get_object_vars($args);
-		if(count($object_vars))
+		if (count($object_vars))
 		{
-			foreach($object_vars as $key => $val)
+			foreach ($object_vars as $key => $val)
 			{
-				if(in_array($key, array('widgetbox_content','body','class','style','widget_sequence','widget','widget_padding_left','widget_padding_top','widget_padding_bottom','widget_padding_right','widgetstyle','document_srl'))) continue;
-				if($escaped) $args->{$key} = utf8RawUrlDecode($val);
+				if (in_array($key, array('widgetbox_content', 'body', 'class', 'style', 'widget_sequence', 'widget', 'widget_padding_left', 'widget_padding_top', 'widget_padding_bottom', 'widget_padding_right', 'widgetstyle', 'document_srl'))) continue;
+				if ($escaped) $args->{$key} = utf8RawUrlDecode($val);
 			}
 		}
 
@@ -460,14 +460,14 @@ 
 		 * Widgets widgetContent/widgetBox Wanted If you are not content
 		 */
 		$widget_content = '';
-		if($widget != 'widgetContent' && $widget != 'widgetBox')
+		if ($widget != 'widgetContent' && $widget != 'widgetBox')
 		{
-			if(!is_dir(sprintf(_XE_PATH_.'widgets/%s/',$widget))) return;
+			if (!is_dir(sprintf(_XE_PATH_ . 'widgets/%s/', $widget))) return;
 			// Hold the contents of the widget parameter
 			$widget_content = $this->getCache($widget, $args);
 		}
 
-		if($widget == 'widgetBox')
+		if ($widget == 'widgetBox')
 		{
 			$widgetbox_content = $args->widgetbox_content;
 		}
@@ -476,7 +476,7 @@ 
 		 * Wanted specified by the administrator of the widget style
 		 */
 		// Sometimes the wrong code, background-image: url (none) can be heard but none in this case, the request for the url so unconditionally Removed
-		$style = preg_replace('/url\((.+)(\/?)none\)/is','', $args->style);
+		$style = preg_replace('/url\((.+)(\/?)none\)/is', '', $args->style);
 		// Find a style statement that based on the internal margin dropping pre-change
 		$widget_padding_left = $args->widget_padding_left;
 		$widget_padding_right = $args->widget_padding_right;
@@ -492,18 +492,18 @@ 
 		$widget_content_body = '';
 		$widget_content_footer = '';
 		// If general call is given on page styles should return immediately dreamin '
-		if(!$javascript_mode)
+		if (!$javascript_mode)
 		{
-			if($args->id) $args->id = ' id="'.$args->id.'" ';
-			switch($widget)
+			if ($args->id) $args->id = ' id="' . $args->id . '" ';
+			switch ($widget)
 			{
 				// If a direct orthogonal addition information
 				case 'widgetContent' :
-					if($args->document_srl)
+					if ($args->document_srl)
 					{
 						$oDocumentModel = getModel('document');
 						$oDocument = $oDocumentModel->getDocument($args->document_srl);
-						$body = $oDocument->getContent(false,false,false, false);
+						$body = $oDocument->getContent(false, false, false, false);
 					}
 					else
 					{
@@ -513,21 +513,21 @@ 
 					$oEditorController = getController('editor');
 					$body = $oEditorController->transComponent($body);
 
-					$widget_content_header = sprintf('<div class="xe_content xe-widget-wrapper ' . $args->css_class . '" %sstyle="%s"><div style="%s">', $args->id, $style,  $inner_style);
+					$widget_content_header = sprintf('<div class="xe_content xe-widget-wrapper ' . $args->css_class . '" %sstyle="%s"><div style="%s">', $args->id, $style, $inner_style);
 					$widget_content_body = $body;
 					$widget_content_footer = '</div></div>';
 
 					break;
 					// If the widget box; it could
 				case 'widgetBox' :
-					$widget_content_header = sprintf('<div class="xe-widget-wrapper ' . $args->css_class . '" %sstyle="%s;"><div style="%s"><div>', $args->id, $style,  $inner_style);
+					$widget_content_header = sprintf('<div class="xe-widget-wrapper ' . $args->css_class . '" %sstyle="%s;"><div style="%s"><div>', $args->id, $style, $inner_style);
 					$widget_content_body = $widgetbox_content;
 
 					break;
 					// If the General wijetil
 				default :
-					$widget_content_header = sprintf('<div class="xe-widget-wrapper ' . $args->css_class . '" %sstyle="%s">',$args->id,$style);
-					$widget_content_body = sprintf('<div style="*zoom:1;%s">%s</div>', $inner_style,$widget_content);
+					$widget_content_header = sprintf('<div class="xe-widget-wrapper ' . $args->css_class . '" %sstyle="%s">', $args->id, $style);
+					$widget_content_body = sprintf('<div style="*zoom:1;%s">%s</div>', $inner_style, $widget_content);
 					$widget_content_footer = '</div>';
 					break;
 			}
@@ -535,15 +535,15 @@ 
 		}
 		else
 		{
-			switch($widget)
+			switch ($widget)
 			{
 				// If a direct orthogonal addition information
 				case 'widgetContent' :
-					if($args->document_srl)
+					if ($args->document_srl)
 					{
 						$oDocumentModel = getModel('document');
 						$oDocument = $oDocumentModel->getDocument($args->document_srl);
-						$body = $oDocument->getContent(false,false,false);
+						$body = $oDocument->getContent(false, false, false);
 					}
 					else
 					{
@@ -551,12 +551,12 @@ 
 					}
 					// by args
 					$attribute = array();
-					if($args)
+					if ($args)
 					{
-						foreach($args as $key => $val)
+						foreach ($args as $key => $val)
 						{
-							if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget','widgetstyle','document_srl'))) continue;
-							if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val);
+							if (in_array($key, array('class', 'style', 'widget_padding_top', 'widget_padding_right', 'widget_padding_bottom', 'widget_padding_left', 'widget', 'widgetstyle', 'document_srl'))) continue;
+							if (strpos($val, '|@|') > 0) $val = str_replace('|@|', ',', $val);
 							$attribute[] = sprintf('%s="%s"', $key, htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 						}
 					}
@@ -564,44 +564,44 @@ 
 					$oWidgetController = getController('widget');
 
 					$widget_content_header = sprintf(
-						'<div class="xe_content widgetOutput ' . $args->css_class . '" widgetstyle="%s" style="%s" widget_padding_left="%s" widget_padding_right="%s" widget_padding_top="%s" widget_padding_bottom="%s" widget="widgetContent" document_srl="%d" %s>'.
-						'<div class="widgetResize"></div>'.
-						'<div class="widgetResizeLeft"></div>'.
-						'<div class="widgetBorder">'.
-						'<div style="%s">',$args->widgetstyle,
+						'<div class="xe_content widgetOutput ' . $args->css_class . '" widgetstyle="%s" style="%s" widget_padding_left="%s" widget_padding_right="%s" widget_padding_top="%s" widget_padding_bottom="%s" widget="widgetContent" document_srl="%d" %s>' .
+						'<div class="widgetResize"></div>' .
+						'<div class="widgetResizeLeft"></div>' .
+						'<div class="widgetBorder">' .
+						'<div style="%s">', $args->widgetstyle,
 						$style,
 						$args->widget_padding_left, $args->widget_padding_right, $args->widget_padding_top, $args->widget_padding_bottom,
 						$args->document_srl,
-						implode(' ',$attribute),
+						implode(' ', $attribute),
 						$inner_style);
 
 					$widget_content_body = $body;
-					$widget_content_footer = sprintf('</div>'.
-						'</div>'.
-						'<div class="widgetContent" style="display:none;width:1px;height:1px;overflow:hidden;">%s</div>'.
-						'</div>',base64_encode($body));
+					$widget_content_footer = sprintf('</div>' .
+						'</div>' .
+						'<div class="widgetContent" style="display:none;width:1px;height:1px;overflow:hidden;">%s</div>' .
+						'</div>', base64_encode($body));
 
 					break;
 					// If the widget box; it could
 				case 'widgetBox' :
 					// by args
 					$attribute = array();
-					if($args)
+					if ($args)
 					{
-						foreach($args as $key => $val)
+						foreach ($args as $key => $val)
 						{
-							if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget','widgetstyle','document_srl'))) continue;
-							if(!is_numeric($val) && (!is_string($val) || strlen($val)==0)) continue;
-							if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val);
+							if (in_array($key, array('class', 'style', 'widget_padding_top', 'widget_padding_right', 'widget_padding_bottom', 'widget_padding_left', 'widget', 'widgetstyle', 'document_srl'))) continue;
+							if (!is_numeric($val) && (!is_string($val) || strlen($val) == 0)) continue;
+							if (strpos($val, '|@|') > 0) $val = str_replace('|@|', ',', $val);
 							$attribute[] = sprintf('%s="%s"', $key, htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 						}
 					}
 
 					$widget_content_header = sprintf(
-						'<div class="widgetOutput ' . $args->css_class . '" widgetstyle="%s" widget="widgetBox" style="%s;" widget_padding_top="%s" widget_padding_right="%s" widget_padding_bottom="%s" widget_padding_left="%s" %s >'.
-						'<div class="widgetBoxResize"></div>'.
-						'<div class="widgetBoxResizeLeft"></div>'.
-						'<div class="widgetBoxBorder"><div class="nullWidget" style="%s">',$args->widgetstyle,$style, $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left,implode(' ',$attribute),$inner_style);
+						'<div class="widgetOutput ' . $args->css_class . '" widgetstyle="%s" widget="widgetBox" style="%s;" widget_padding_top="%s" widget_padding_right="%s" widget_padding_bottom="%s" widget_padding_left="%s" %s >' .
+						'<div class="widgetBoxResize"></div>' .
+						'<div class="widgetBoxResizeLeft"></div>' .
+						'<div class="widgetBoxBorder"><div class="nullWidget" style="%s">', $args->widgetstyle, $style, $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left, implode(' ', $attribute), $inner_style);
 
 					$widget_content_body = $widgetbox_content;
 
@@ -610,26 +610,26 @@ 
 				default :
 					// by args
 					$attribute = array();
-					if($args)
+					if ($args)
 					{
-						$allowed_key = array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget');
-						foreach($args as $key => $val)
+						$allowed_key = array('class', 'style', 'widget_padding_top', 'widget_padding_right', 'widget_padding_bottom', 'widget_padding_left', 'widget');
+						foreach ($args as $key => $val)
 						{
-							if(in_array($key, $allowed_key)) continue;
-							if(!is_numeric($val) && (!is_string($val) || strlen($val)==0)) continue;
-							if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val);
+							if (in_array($key, $allowed_key)) continue;
+							if (!is_numeric($val) && (!is_string($val) || strlen($val) == 0)) continue;
+							if (strpos($val, '|@|') > 0) $val = str_replace('|@|', ',', $val);
 							$attribute[] = sprintf('%s="%s"', $key, htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 						}
 					}
 
-					$widget_content_header = sprintf('<div class="widgetOutput ' . $args->css_class . '" widgetstyle="%s" style="%s" widget_padding_top="%s" widget_padding_right="%s" widget_padding_bottom="%s" widget_padding_left="%s" widget="%s" %s >'.
-						'<div class="widgetResize"></div>'.
-						'<div class="widgetResizeLeft"></div>'.
-						'<div class="widgetBorder">',$args->widgetstyle,$style,
+					$widget_content_header = sprintf('<div class="widgetOutput ' . $args->css_class . '" widgetstyle="%s" style="%s" widget_padding_top="%s" widget_padding_right="%s" widget_padding_bottom="%s" widget_padding_left="%s" widget="%s" %s >' .
+						'<div class="widgetResize"></div>' .
+						'<div class="widgetResizeLeft"></div>' .
+						'<div class="widgetBorder">', $args->widgetstyle, $style,
 						$widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left,
-						$widget, implode(' ',$attribute));
+						$widget, implode(' ', $attribute));
 
-					$widget_content_body = sprintf('<div style="%s">%s</div>',$inner_style, $widget_content);
+					$widget_content_body = sprintf('<div style="%s">%s</div>', $inner_style, $widget_content);
 
 					$widget_content_footer = '</div></div>';
 
@@ -637,11 +637,11 @@ 
 			}
 		}
 		// Compile the widget style.
-		if($args->widgetstyle) $widget_content_body = $this->compileWidgetStyle($args->widgetstyle,$widget, $widget_content_body, $args, $javascript_mode);
+		if ($args->widgetstyle) $widget_content_body = $this->compileWidgetStyle($args->widgetstyle, $widget, $widget_content_body, $args, $javascript_mode);
 
 		$output = $widget_content_header . $widget_content_body . $widget_content_footer;
 		// Debug widget creation time information added to the results
-		if(__DEBUG__==3) $GLOBALS['__widget_excute_elapsed__'] += getMicroTime() - $start;
+		if (__DEBUG__ == 3) $GLOBALS['__widget_excute_elapsed__'] += getMicroTime() - $start;
 
 		$after = microtime(true);
 
@@ -662,32 +662,32 @@ 
 	 */
 	function getWidgetObject($widget)
 	{
-		if(!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $widget))
+		if (!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $widget))
 		{
 			return Context::getLang('msg_invalid_request');
 		}
 
-		if(!$GLOBALS['_xe_loaded_widgets_'][$widget])
+		if (!$GLOBALS['_xe_loaded_widgets_'][$widget])
 		{
 			// Finding the location of a widget
 			$oWidgetModel = getModel('widget');
 			$path = $oWidgetModel->getWidgetPath($widget);
 			// If you do not find the class file error output widget (html output)
 			$class_file = sprintf('%s%s.class.php', $path, $widget);
-			if(!file_exists($class_file)) return sprintf(Context::getLang('msg_widget_is_not_exists'), $widget);
+			if (!file_exists($class_file)) return sprintf(Context::getLang('msg_widget_is_not_exists'), $widget);
 			// Widget classes include
 			require_once($class_file);
 
 			// Creating Objects
-			if(!class_exists($widget, false))
+			if (!class_exists($widget, false))
 			{
 				return sprintf(Context::getLang('msg_widget_object_is_null'), $widget);
 			}
 
 			$oWidget = new $widget();
-			if(!is_object($oWidget)) return sprintf(Context::getLang('msg_widget_object_is_null'), $widget);
+			if (!is_object($oWidget)) return sprintf(Context::getLang('msg_widget_object_is_null'), $widget);
 
-			if(!method_exists($oWidget, 'proc')) return sprintf(Context::getLang('msg_widget_proc_is_null'), $widget);
+			if (!method_exists($oWidget, 'proc')) return sprintf(Context::getLang('msg_widget_proc_is_null'), $widget);
 
 			$oWidget->widget_path = $path;
 
@@ -696,31 +696,31 @@ 
 		return $GLOBALS['_xe_loaded_widgets_'][$widget];
 	}
 
-	function compileWidgetStyle($widgetStyle,$widget,$widget_content_body, $args, $javascript_mode)
+	function compileWidgetStyle($widgetStyle, $widget, $widget_content_body, $args, $javascript_mode)
 	{
-		if(!$widgetStyle) return $widget_content_body;
+		if (!$widgetStyle) return $widget_content_body;
 
 		$oWidgetModel = getModel('widget');
 		// Bring extra_var widget style tie
 		$widgetstyle_info = $oWidgetModel->getWidgetStyleInfo($widgetStyle);
-		if(!$widgetstyle_info) return $widget_content_body;
+		if (!$widgetstyle_info) return $widget_content_body;
 
 		$widgetstyle_extra_var = new stdClass();
 		$widgetstyle_extra_var_key = get_object_vars($widgetstyle_info);
-		if(count($widgetstyle_extra_var_key['extra_var']))
+		if (count($widgetstyle_extra_var_key['extra_var']))
 		{
-			foreach($widgetstyle_extra_var_key['extra_var'] as $key => $val)
+			foreach ($widgetstyle_extra_var_key['extra_var'] as $key => $val)
 			{
-				$widgetstyle_extra_var->{$key} =  $args->{$key};
+				$widgetstyle_extra_var->{$key} = $args->{$key};
 			}
 		}
 		Context::set('widgetstyle_extra_var', $widgetstyle_extra_var);
 		// #18994272 오타를 수정했으나 하위 호환성을 위해 남겨둠 - deprecated
 		Context::set('widgetstyle_extar_var', $widgetstyle_extra_var);
 
-		if($javascript_mode && $widget=='widgetBox')
+		if ($javascript_mode && $widget == 'widgetBox')
 		{
-			Context::set('widget_content', '<div class="widget_inner">'.$widget_content_body.'</div>');
+			Context::set('widget_content', '<div class="widget_inner">' . $widget_content_body . '</div>');
 		}
 		else
 		{
@@ -742,7 +742,7 @@ 
 		$oWidgetModel = getModel('widget');
 		$widget_info = $oWidgetModel->getWidgetInfo($widget);
 
-		if(!$vars)
+		if (!$vars)
 		{
 			$vars = new stdClass();
 		}
@@ -753,31 +753,31 @@ 
 
 		$vars->skin = trim($request_vars->skin);
 		$vars->colorset = trim($request_vars->colorset);
-		$vars->widget_sequence = (int)($request_vars->widget_sequence);
-		$vars->widget_cache = (int)($request_vars->widget_cache);
+		$vars->widget_sequence = (int) ($request_vars->widget_sequence);
+		$vars->widget_cache = (int) ($request_vars->widget_cache);
 		$vars->style = trim($request_vars->style);
 		$vars->widget_padding_left = trim($request_vars->widget_padding_left);
 		$vars->widget_padding_right = trim($request_vars->widget_padding_right);
 		$vars->widget_padding_top = trim($request_vars->widget_padding_top);
 		$vars->widget_padding_bottom = trim($request_vars->widget_padding_bottom);
-		$vars->document_srl= trim($request_vars->document_srl);
+		$vars->document_srl = trim($request_vars->document_srl);
 
-		if(count($widget_info->extra_var))
+		if (count($widget_info->extra_var))
 		{
-			foreach($widget_info->extra_var as $key=>$val)
+			foreach ($widget_info->extra_var as $key=>$val)
 			{
 				$vars->{$key} = trim($request_vars->{$key});
 			}
 		}
 		// If the widget style
-		if($request_vars->widgetstyle)
+		if ($request_vars->widgetstyle)
 		{
 			$widgetStyle_info = $oWidgetModel->getWidgetStyleInfo($request_vars->widgetstyle);
-			if(count($widgetStyle_info->extra_var))
+			if (count($widgetStyle_info->extra_var))
 			{
-				foreach($widgetStyle_info->extra_var as $key=>$val)
+				foreach ($widgetStyle_info->extra_var as $key=>$val)
 				{
-					if($val->type =='color' || $val->type =='text' || $val->type =='select' || $val->type =='filebox' || $val->type == 'textarea')
+					if ($val->type == 'color' || $val->type == 'text' || $val->type == 'select' || $val->type == 'filebox' || $val->type == 'textarea')
 					{
 						$vars->{$key} = trim($request_vars->{$key});
 					}
@@ -785,23 +785,23 @@ 
 			}
 		}
 
-		if($vars->widget_sequence)
+		if ($vars->widget_sequence)
 		{
 			$cache_file = sprintf('%s%d.%s.cache', $this->cache_path, $vars->widget_sequence, Context::getLangType());
 			FileHandler::removeFile($cache_file);
 		}
 
-		if($vars->widget_cache>0) $vars->widget_sequence = getNextSequence();
+		if ($vars->widget_cache > 0) $vars->widget_sequence = getNextSequence();
 
 		$attribute = array();
-		foreach($vars as $key => $val)
+		foreach ($vars as $key => $val)
 		{
-			if(!$val)
+			if (!$val)
 			{
 				unset($vars->{$key});
 				continue;
 			}
-			if(strpos($val,'|@|') > 0) $val = str_replace('|@|', ',', $val);
+			if (strpos($val, '|@|') > 0) $val = str_replace('|@|', ',', $val);
 			$vars->{$key} = Context::convertEncodingStr($val);
 			$attribute[] = sprintf('%s="%s"', $key, htmlspecialchars(Context::convertEncodingStr($val), ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 		}

Braces +171 added lines, -69 removed lines

@@ -40,7 +40,9 @@ 
 			$colorset_list[] = $colorset;
 		}
 
-		if(count($colorset_list)) $colorsets = implode("\n", $colorset_list);
+		if(count($colorset_list)) {
+			$colorsets = implode("\n", $colorset_list);
+		}
 		$this->add('colorset_list', $colorsets);
 	}
 
@@ -50,8 +52,12 @@ 
 	function procWidgetGenerateCode()
 	{
 		$widget = Context::get('selected_widget');
-		if(!$widget) return new Object(-1,'msg_invalid_request');
-		if(!Context::get('skin')) return new Object(-1,Context::getLang('msg_widget_skin_is_null'));
+		if(!$widget) {
+			return new Object(-1,'msg_invalid_request');
+		}
+		if(!Context::get('skin')) {
+			return new Object(-1,Context::getLang('msg_widget_skin_is_null'));
+		}
 
 		$attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars);
 
@@ -66,9 +72,13 @@ 
 	function procWidgetGenerateCodeInPage()
 	{
 		$widget = Context::get('selected_widget');
-		if(!$widget) return new Object(-1,'msg_invalid_request');
+		if(!$widget) {
+			return new Object(-1,'msg_invalid_request');
+		}
 
-		if(!in_array($widget,array('widgetBox','widgetContent')) && !Context::get('skin')) return new Object(-1,Context::getLang('msg_widget_skin_is_null'));
+		if(!in_array($widget,array('widgetBox','widgetContent')) && !Context::get('skin')) {
+			return new Object(-1,Context::getLang('msg_widget_skin_is_null'));
+		}
 
 		$attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars);
 		// Wanted results
@@ -107,14 +117,20 @@ 
 		$err = 0;
 		$oLayoutModel = getModel('layout');
 		$layout_info = $oLayoutModel->getLayout($module_srl);
-		if(!$layout_info || $layout_info->type != 'faceoff') $err++;
+		if(!$layout_info || $layout_info->type != 'faceoff') {
+			$err++;
+		}
 		// Destination Information Wanted page module
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'module');
 		$page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
-		if(!$page_info->module_srl || $page_info->module != 'page') $err++;
+		if(!$page_info->module_srl || $page_info->module != 'page') {
+			$err++;
+		}
 
-		if($err > 1) return new Object(-1,'msg_invalid_request');
+		if($err > 1) {
+			return new Object(-1,'msg_invalid_request');
+		}
 		// Check permissions
 		$is_logged = Context::get('is_logged');
 		$logged_info = Context::get('logged_info');
@@ -125,10 +141,14 @@ 
 			$manager_group = $page_info->grants['manager'];
 			foreach($user_group as $group_srl => $group_info)
 			{
-				if(in_array($group_srl, $manager_group)) $is_admin = true;
+				if(in_array($group_srl, $manager_group)) {
+					$is_admin = true;
+				}
 			}
 		}
-		if(!$is_admin && !$is_logged && $logged_info->is_admin != 'Y' && !$oModuleModel->isSiteAdmin($logged_info) && !(is_array($page_info->admin_id) && in_array($logged_info->user_id, $page_info->admin_id))) return new Object(-1,'msg_not_permitted');
+		if(!$is_admin && !$is_logged && $logged_info->is_admin != 'Y' && !$oModuleModel->isSiteAdmin($logged_info) && !(is_array($page_info->admin_id) && in_array($logged_info->user_id, $page_info->admin_id))) {
+			return new Object(-1,'msg_not_permitted');
+		}
 		// Enter post
 		$oDocumentModel = getModel('document');
 		$oDocumentController = getController('document');
@@ -142,14 +162,15 @@ 
 		if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
 		{
 			$output = $oDocumentController->updateDocument($oDocument, $obj);
-		}
-		else
+		} else
 		{
 			$output = $oDocumentController->insertDocument($obj);
 			$obj->document_srl = $output->get('document_srl');
 		}
 		// Stop when an error occurs
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Return results
 		$this->add('document_srl', $obj->document_srl);
 	}
@@ -167,13 +188,17 @@ 
 		$oDocumentAdminController = getAdminController('document');
 
 		$oDocument = $oDocumentModel->getDocument($document_srl, true);
-		if(!$oDocument->isExists()) return new Object(-1,'msg_invalid_request');
+		if(!$oDocument->isExists()) {
+			return new Object(-1,'msg_invalid_request');
+		}
 		$module_srl = $oDocument->get('module_srl');
 		// Destination Information Wanted page module
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'module');
 		$page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
-		if(!$page_info->module_srl || $page_info->module != 'page') return new Object(-1,'msg_invalid_request');
+		if(!$page_info->module_srl || $page_info->module != 'page') {
+			return new Object(-1,'msg_invalid_request');
+		}
 		// Check permissions
 		$is_logged = Context::get('is_logged');
 		$logged_info = Context::get('logged_info');
@@ -184,13 +209,19 @@ 
 			$manager_group = $page_info->grants['manager'];
 			foreach($user_group as $group_srl => $group_info)
 			{
-				if(in_array($group_srl, $manager_group)) $is_admin = true;
+				if(in_array($group_srl, $manager_group)) {
+					$is_admin = true;
+				}
 			}
 		}
-		if(!$is_admin && !$is_logged && $logged_info->is_admin != 'Y' && !$oModuleModel->isSiteAdmin($logged_info) && !(is_array($page_info->admin_id) && in_array($logged_info->user_id, $page_info->admin_id))) return new Object(-1,'msg_not_permitted');
+		if(!$is_admin && !$is_logged && $logged_info->is_admin != 'Y' && !$oModuleModel->isSiteAdmin($logged_info) && !(is_array($page_info->admin_id) && in_array($logged_info->user_id, $page_info->admin_id))) {
+			return new Object(-1,'msg_not_permitted');
+		}
 
 		$output = $oDocumentAdminController->copyDocumentModule(array($oDocument->get('document_srl')), $oDocument->get('module_srl'),0);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Return results
 		$copied_srls = $output->get('copied_srls');
 		$this->add('document_srl', $copied_srls[$oDocument->get('document_srl')]);
@@ -208,12 +239,16 @@ 
 		$oDocumentController = getController('document');
 
 		$oDocument = $oDocumentModel->getDocument($document_srl, true);
-		if(!$oDocument->isExists()) return new Object();
+		if(!$oDocument->isExists()) {
+			return new Object();
+		}
 		$module_srl = $oDocument->get('module_srl');
 		// Destination Information Wanted page module
 		$oModuleModel = getModel('module');
 		$page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-		if(!$page_info->module_srl || $page_info->module != 'page') return new Object(-1,'msg_invalid_request');
+		if(!$page_info->module_srl || $page_info->module != 'page') {
+			return new Object(-1,'msg_invalid_request');
+		}
 		// Check permissions
 		$is_logged = Context::get('is_logged');
 		$logged_info = Context::get('logged_info');
@@ -224,13 +259,19 @@ 
 			$manager_group = $page_info->grants['manager'];
 			foreach($user_group as $group_srl => $group_info)
 			{
-				if(in_array($group_srl, $manager_group)) $is_admin = true;
+				if(in_array($group_srl, $manager_group)) {
+					$is_admin = true;
+				}
 			}
 		}
-		if(!$is_admin && !$is_logged && $logged_info->is_admin != 'Y' && !$oModuleModel->isSiteAdmin($logged_info) && !(is_array($page_info->admin_id) && in_array($logged_info->user_id, $page_info->admin_id))) return new Object(-1,'msg_not_permitted');
+		if(!$is_admin && !$is_logged && $logged_info->is_admin != 'Y' && !$oModuleModel->isSiteAdmin($logged_info) && !(is_array($page_info->admin_id) && in_array($logged_info->user_id, $page_info->admin_id))) {
+			return new Object(-1,'msg_not_permitted');
+		}
 
 		$output = $oDocumentController->deleteDocument($oDocument->get('document_srl'), true);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 	}
 
 	/**
@@ -247,7 +288,9 @@ 
 	 */
 	function triggerWidgetCompile(&$content)
 	{
-		if(Context::getResponseMethod()!='HTML') return new Object();
+		if(Context::getResponseMethod()!='HTML') {
+			return new Object();
+		}
 		$content = $this->transWidgetCode($content, $this->layout_javascript_mode);
 		return new Object();
 	}
@@ -280,11 +323,16 @@ 
 		$oXmlParser = new XmlParser();
 		$xml_doc = $oXmlParser->parse(trim($buff));
 
-		if($xml_doc->img) $vars = $xml_doc->img->attrs;
-		else $vars = $xml_doc->attrs;
+		if($xml_doc->img) {
+			$vars = $xml_doc->img->attrs;
+		} else {
+			$vars = $xml_doc->attrs;
+		}
 
 		$widget = $vars->widget;
-		if(!$widget) return $matches[0];
+		if(!$widget) {
+			return $matches[0];
+		}
 		unset($vars->widget);
 
 		return $this->execute($widget, $vars, $this->javascript_mode);
@@ -301,7 +349,9 @@ 
 
 		$vars = $xml_doc->div->attrs;
 		$widget = $vars->widget;
-		if(!$widget) return $matches[0];
+		if(!$widget) {
+			return $matches[0];
+		}
 		unset($vars->widget);
 
 		$vars->widgetbox_content = $matches[3];
@@ -328,22 +378,30 @@ 
 			$xml_doc = $oXmlParser->parse(trim($buff));
 
 			$args = $xml_doc->img->attrs;
-			if(!$args) continue;
+			if(!$args) {
+				continue;
+			}
 			// If you are not caching path
 			$widget = $args->widget;
 			$sequence = $args->widget_sequence;
 			$cache = $args->widget_cache;
-			if(!$sequence || !$cache) continue;
+			if(!$sequence || !$cache) {
+				continue;
+			}
 
 			if(count($args))
 			{
-				foreach($args as $k => $v) $args->{$k} = urldecode($v);
+				foreach($args as $k => $v) {
+					$args->{$k} = urldecode($v);
+				}
 			}
 			// If the cache file for each language widget regeneration
 			foreach($lang_list as $lang_type => $val)
 			{
 				$cache_file = sprintf('%s%d.%s.cache', $this->cache_path, $sequence, $lang_type);
-				if(!file_exists($cache_file)) continue;
+				if(!file_exists($cache_file)) {
+					continue;
+				}
 				$this->getCache($widget, $args, $lang_type, true);
 			}
 		}
@@ -355,7 +413,9 @@ 
 	function getCache($widget, $args, $lang_type = null, $ignore_cache = false)
 	{
 		// If the specified language specifies the current language
-		if(!$lang_type) $lang_type = Context::getLangType();
+		if(!$lang_type) {
+			$lang_type = Context::getLangType();
+		}
 		// widget, the cache number and cache values are set
 		$widget_sequence = $args->widget_sequence;
 		$widget_cache = $args->widget_cache;
@@ -366,7 +426,9 @@ 
 		if(!$ignore_cache && (!$widget_cache || !$widget_sequence))
 		{
 			$oWidget = $this->getWidgetObject($widget);
-			if(!$oWidget || !method_exists($oWidget, 'proc')) return;
+			if(!$oWidget || !method_exists($oWidget, 'proc')) {
+				return;
+			}
 
 			$widget_content = $oWidget->proc($args);
 			$oModuleController = getController('module');
@@ -386,8 +448,7 @@ 
 		if($cache_body)
 		{
 			return $cache_body;
-		}
-		else
+		} else
 		{
 			/**
 			 * Cache number and cache values are set so that the cache file should call
@@ -415,7 +476,9 @@ 
 			}
 
 			$oWidget = $this->getWidgetObject($widget);
-			if(!$oWidget || !method_exists($oWidget,'proc')) return;
+			if(!$oWidget || !method_exists($oWidget,'proc')) {
+				return;
+			}
 
 			$widget_content = $oWidget->proc($args);
 			$oModuleController = getController('module');
@@ -423,8 +486,7 @@ 
 			if($oCacheHandler->isSupport())
 			{
 				$oCacheHandler->put($key, $widget_content, $widget_cache * 60);
-			}
-			else
+			} else
 			{
 				FileHandler::writeFile($cache_file, $widget_content);
 			}
@@ -442,7 +504,9 @@ 
 	function execute($widget, $args, $javascript_mode = false, $escaped = true)
 	{
 		// Save for debug run-time widget
-		if(__DEBUG__==3) $start = getMicroTime();
+		if(__DEBUG__==3) {
+			$start = getMicroTime();
+		}
 		$before = microtime(true);
 		// urldecode the value of args haejum
 		$object_vars = get_object_vars($args);
@@ -450,8 +514,12 @@ 
 		{
 			foreach($object_vars as $key => $val)
 			{
-				if(in_array($key, array('widgetbox_content','body','class','style','widget_sequence','widget','widget_padding_left','widget_padding_top','widget_padding_bottom','widget_padding_right','widgetstyle','document_srl'))) continue;
-				if($escaped) $args->{$key} = utf8RawUrlDecode($val);
+				if(in_array($key, array('widgetbox_content','body','class','style','widget_sequence','widget','widget_padding_left','widget_padding_top','widget_padding_bottom','widget_padding_right','widgetstyle','document_srl'))) {
+					continue;
+				}
+				if($escaped) {
+					$args->{$key} = utf8RawUrlDecode($val);
+				}
 			}
 		}
 
@@ -462,7 +530,9 @@ 
 		$widget_content = '';
 		if($widget != 'widgetContent' && $widget != 'widgetBox')
 		{
-			if(!is_dir(sprintf(_XE_PATH_.'widgets/%s/',$widget))) return;
+			if(!is_dir(sprintf(_XE_PATH_.'widgets/%s/',$widget))) {
+				return;
+			}
 			// Hold the contents of the widget parameter
 			$widget_content = $this->getCache($widget, $args);
 		}
@@ -494,7 +564,9 @@ 
 		// If general call is given on page styles should return immediately dreamin '
 		if(!$javascript_mode)
 		{
-			if($args->id) $args->id = ' id="'.$args->id.'" ';
+			if($args->id) {
+				$args->id = ' id="'.$args->id.'" ';
+			}
 			switch($widget)
 			{
 				// If a direct orthogonal addition information
@@ -504,8 +576,7 @@ 
 						$oDocumentModel = getModel('document');
 						$oDocument = $oDocumentModel->getDocument($args->document_srl);
 						$body = $oDocument->getContent(false,false,false, false);
-					}
-					else
+					} else
 					{
 						$body = base64_decode($args->body);
 					}
@@ -532,8 +603,7 @@ 
 					break;
 			}
 			// Edit page is called when a widget if you add the code for handling
-		}
-		else
+		} else
 		{
 			switch($widget)
 			{
@@ -544,8 +614,7 @@ 
 						$oDocumentModel = getModel('document');
 						$oDocument = $oDocumentModel->getDocument($args->document_srl);
 						$body = $oDocument->getContent(false,false,false);
-					}
-					else
+					} else
 					{
 						$body = base64_decode($args->body);
 					}
@@ -555,8 +624,12 @@ 
 					{
 						foreach($args as $key => $val)
 						{
-							if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget','widgetstyle','document_srl'))) continue;
-							if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val);
+							if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget','widgetstyle','document_srl'))) {
+								continue;
+							}
+							if(strpos($val,'|@|')>0) {
+								$val = str_replace('|@|',',',$val);
+							}
 							$attribute[] = sprintf('%s="%s"', $key, htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 						}
 					}
@@ -590,9 +663,15 @@ 
 					{
 						foreach($args as $key => $val)
 						{
-							if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget','widgetstyle','document_srl'))) continue;
-							if(!is_numeric($val) && (!is_string($val) || strlen($val)==0)) continue;
-							if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val);
+							if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget','widgetstyle','document_srl'))) {
+								continue;
+							}
+							if(!is_numeric($val) && (!is_string($val) || strlen($val)==0)) {
+								continue;
+							}
+							if(strpos($val,'|@|')>0) {
+								$val = str_replace('|@|',',',$val);
+							}
 							$attribute[] = sprintf('%s="%s"', $key, htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 						}
 					}
@@ -615,9 +694,15 @@ 
 						$allowed_key = array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget');
 						foreach($args as $key => $val)
 						{
-							if(in_array($key, $allowed_key)) continue;
-							if(!is_numeric($val) && (!is_string($val) || strlen($val)==0)) continue;
-							if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val);
+							if(in_array($key, $allowed_key)) {
+								continue;
+							}
+							if(!is_numeric($val) && (!is_string($val) || strlen($val)==0)) {
+								continue;
+							}
+							if(strpos($val,'|@|')>0) {
+								$val = str_replace('|@|',',',$val);
+							}
 							$attribute[] = sprintf('%s="%s"', $key, htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 						}
 					}
@@ -637,11 +722,15 @@ 
 			}
 		}
 		// Compile the widget style.
-		if($args->widgetstyle) $widget_content_body = $this->compileWidgetStyle($args->widgetstyle,$widget, $widget_content_body, $args, $javascript_mode);
+		if($args->widgetstyle) {
+			$widget_content_body = $this->compileWidgetStyle($args->widgetstyle,$widget, $widget_content_body, $args, $javascript_mode);
+		}
 
 		$output = $widget_content_header . $widget_content_body . $widget_content_footer;
 		// Debug widget creation time information added to the results
-		if(__DEBUG__==3) $GLOBALS['__widget_excute_elapsed__'] += getMicroTime() - $start;
+		if(__DEBUG__==3) {
+			$GLOBALS['__widget_excute_elapsed__'] += getMicroTime() - $start;
+		}
 
 		$after = microtime(true);
 
@@ -674,7 +763,9 @@ 
 			$path = $oWidgetModel->getWidgetPath($widget);
 			// If you do not find the class file error output widget (html output)
 			$class_file = sprintf('%s%s.class.php', $path, $widget);
-			if(!file_exists($class_file)) return sprintf(Context::getLang('msg_widget_is_not_exists'), $widget);
+			if(!file_exists($class_file)) {
+				return sprintf(Context::getLang('msg_widget_is_not_exists'), $widget);
+			}
 			// Widget classes include
 			require_once($class_file);
 
@@ -685,9 +776,13 @@ 
 			}
 
 			$oWidget = new $widget();
-			if(!is_object($oWidget)) return sprintf(Context::getLang('msg_widget_object_is_null'), $widget);
+			if(!is_object($oWidget)) {
+				return sprintf(Context::getLang('msg_widget_object_is_null'), $widget);
+			}
 
-			if(!method_exists($oWidget, 'proc')) return sprintf(Context::getLang('msg_widget_proc_is_null'), $widget);
+			if(!method_exists($oWidget, 'proc')) {
+				return sprintf(Context::getLang('msg_widget_proc_is_null'), $widget);
+			}
 
 			$oWidget->widget_path = $path;
 
@@ -698,12 +793,16 @@ 
 
 	function compileWidgetStyle($widgetStyle,$widget,$widget_content_body, $args, $javascript_mode)
 	{
-		if(!$widgetStyle) return $widget_content_body;
+		if(!$widgetStyle) {
+			return $widget_content_body;
+		}
 
 		$oWidgetModel = getModel('widget');
 		// Bring extra_var widget style tie
 		$widgetstyle_info = $oWidgetModel->getWidgetStyleInfo($widgetStyle);
-		if(!$widgetstyle_info) return $widget_content_body;
+		if(!$widgetstyle_info) {
+			return $widget_content_body;
+		}
 
 		$widgetstyle_extra_var = new stdClass();
 		$widgetstyle_extra_var_key = get_object_vars($widgetstyle_info);
@@ -721,8 +820,7 @@ 
 		if($javascript_mode && $widget=='widgetBox')
 		{
 			Context::set('widget_content', '<div class="widget_inner">'.$widget_content_body.'</div>');
-		}
-		else
+		} else
 		{
 			Context::set('widget_content', $widget_content_body);
 		}
@@ -791,7 +889,9 @@ 
 			FileHandler::removeFile($cache_file);
 		}
 
-		if($vars->widget_cache>0) $vars->widget_sequence = getNextSequence();
+		if($vars->widget_cache>0) {
+			$vars->widget_sequence = getNextSequence();
+		}
 
 		$attribute = array();
 		foreach($vars as $key => $val)
@@ -801,7 +901,9 @@ 
 				unset($vars->{$key});
 				continue;
 			}
-			if(strpos($val,'|@|') > 0) $val = str_replace('|@|', ',', $val);
+			if(strpos($val,'|@|') > 0) {
+				$val = str_replace('|@|', ',', $val);
+			}
 			$vars->{$key} = Context::convertEncodingStr($val);
 			$attribute[] = sprintf('%s="%s"', $key, htmlspecialchars(Context::convertEncodingStr($val), ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 		}

tools/dbxml_validator/tests/xmlQueriesTest.php

Doc Comments +11 added lines

@@ -27,6 +27,11 @@ 
  

     // recursive glob

     // On Windows glob() is case-sensitive.

+
+    /**
+     * @param string $sDir
+     * @param integer $nFlags
+     */
     public function globr($sDir, $sPattern, $nFlags = NULL) 

     { 

 	// Get the list of all matching files currently in the 

@@ -129,6 +134,9 @@ 
 	$this->markTestIncomplete('XML Schema Language files should be fixed first.');

     }

 

+    /**
+     * @param integer $err_code
+     */
     public function invoke_testInvalidXmlFiles($filename, $err_code, $args = '')

     {

 	$cmd = $this->validator_cmd . ' '. $args . ' ' . escapeshellarg($filename);

@@ -166,6 +174,9 @@ 
 	return $this->invoke_testInvalidXmlFiles($filename, self::RETCODE_BUILTIN_CHECKS);

     }

 

+    /**
+     * @param string $dir_name
+     */
     public function getDirFilesList($dir_name)

     {

 	$output = array();

Indentation +101 added lines, -101 removed lines

@@ -2,33 +2,33 @@ 
 /* Copyright (C) NAVER <http://www.navercorp.com> */

 

 if (!defined('__DIR__'))

-    define('__DIR__', realpath(dirname(__FILE__))); 

+	define('__DIR__', realpath(dirname(__FILE__))); 

 

 /** The tests here are meant only for the built-in checks in validator.php, 

     and not for the entire syntax expressed by the .xsd files. */

 class XmlQueriesTest extends PHPUnit_Framework_TestCase

 {

-    // taken from validator.php

+	// taken from validator.php

 

-    const RETCODE_VALIDATOR_INTERNAL = 60;

-    const RETCODE_GENERIC_XML_SYNTAX = 50;

-    const RETCODE_QUERY_ELEMENT = 40;

-    const RETCODE_XSD_VALIDATION = 30;

-    const RETCODE_BUILTIN_CHECKS =    20;

-    const RETCODE_DB_SCHEMA_MATCH =10;	// no schema match is currently implemented.

-    const RETCODE_SUCCESS = 0;

+	const RETCODE_VALIDATOR_INTERNAL = 60;

+	const RETCODE_GENERIC_XML_SYNTAX = 50;

+	const RETCODE_QUERY_ELEMENT = 40;

+	const RETCODE_XSD_VALIDATION = 30;

+	const RETCODE_BUILTIN_CHECKS =    20;

+	const RETCODE_DB_SCHEMA_MATCH =10;	// no schema match is currently implemented.

+	const RETCODE_SUCCESS = 0;

 

-    public $validator_cmd;

+	public $validator_cmd;

 

-    public function setUp()

-    {

+	public function setUp()

+	{

 	 $this->validator_cmd = "php " . escapeshellarg(__DIR__ . '/../validate.php') . " ";

-    }

+	}

  

-    // recursive glob

-    // On Windows glob() is case-sensitive.

-    public function globr($sDir, $sPattern, $nFlags = NULL) 

-    { 

+	// recursive glob

+	// On Windows glob() is case-sensitive.

+	public function globr($sDir, $sPattern, $nFlags = NULL) 

+	{ 

 	// Get the list of all matching files currently in the 

 	// directory. 

 

@@ -41,25 +41,25 @@ 
 

 	foreach ($aDirs as $sSubDir) 

 	{ 

-	    if ($sSubDir != '.' && $sSubDir != '..')

-	    {

+		if ($sSubDir != '.' && $sSubDir != '..')

+		{

 		$aSubFiles = $this->globr($sSubDir, $sPattern, $nFlags); 

 		$aFiles = array_merge($aFiles, $aSubFiles); 

-	    }

+		}

 	} 

 

 	// return merged array with all (recursive) files

 	return $aFiles; 

-    } 

+	} 

 

-    /** Tests all XML Query and Schema Language files (in all modules/addons/widgets) in XE */

-    public function invoke_testReleasedXMLLangFiles

+	/** Tests all XML Query and Schema Language files (in all modules/addons/widgets) in XE */

+	public function invoke_testReleasedXMLLangFiles

 	(

-	    $released_files,

-	    $expected_return_code,

-	    $validator_args = ''

+		$released_files,

+		$expected_return_code,

+		$validator_args = ''

 	)

-    {

+	{

 	// this file is in tools/dbxml_validator/tests

 	$xe_dir = __DIR__ . '/../../..';

 

@@ -70,67 +70,67 @@ 
 	$xml_files = array();

 

 	foreach ($released_files as $released_file_mask)

-	    $xml_files =

+		$xml_files =

 		array_merge

 		(

-		    $xml_files,

-		    $this->globr

+			$xml_files,

+			$this->globr

 			(

-			    $xe_dir,

-			    $released_file_mask,

-			    GLOB_NOSORT | GLOB_NOESCAPE | GLOB_ERR

+				$xe_dir,

+				$released_file_mask,

+				GLOB_NOSORT | GLOB_NOESCAPE | GLOB_ERR

 			)

 		);

 

 	while ($cnt < count($xml_files))

 	{

-	    $cmd = $this->validator_cmd . $validator_args;

+		$cmd = $this->validator_cmd . $validator_args;

 

-	    // Validate 50 files at once

-	    foreach (array_slice($xml_files, $cnt, 50) as $xml_file)

+		// Validate 50 files at once

+		foreach (array_slice($xml_files, $cnt, 50) as $xml_file)

 		$cmd .= " " . escapeshellarg($xml_file);

 

-	    exec($cmd . ' 2>&1', $validator_output, $return_code);

+		exec($cmd . ' 2>&1', $validator_output, $return_code);

 

-	    $output_text = trim(trim(implode("\n", $validator_output)), "\n");

+		$output_text = trim(trim(implode("\n", $validator_output)), "\n");

 

-	    // Validator should not crash/exit-with-an-error.

-	    $this->assertLessThanOrEqual

+		// Validator should not crash/exit-with-an-error.

+		$this->assertLessThanOrEqual

 		(

-		    $expected_return_code,

-		    $return_code,

-		    "{$cmd}\n\n{$output_text}\nValidator returned code {$return_code}."

+			$expected_return_code,

+			$return_code,

+			"{$cmd}\n\n{$output_text}\nValidator returned code {$return_code}."

 		);

 

-	    $cnt += 50;

+		$cnt += 50;

+	}

 	}

-    }

 

-    public function testReleasedXMLQueryLangFiles()

-    {

+	public function testReleasedXMLQueryLangFiles()

+	{

 	$this->invoke_testReleasedXMLLangFiles

-	    (

+		(

 		array('queries/*.xml', 'xml_query/*.xml'),

 		self::RETCODE_QUERY_ELEMENT

-	    );

+		);

 

 	$this->markTestIncomplete('XML Query Language files should be fixed first.');

-    }

+	}

 

-    public function testReleasedXMLSchemaLangFiles()

-    {

+	public function testReleasedXMLSchemaLangFiles()

+	{

 	$this->invoke_testReleasedXMLLangFiles

-	    (

+		(

 		array('schemas/*.xml'),

 		self::RETCODE_BUILTIN_CHECKS,

 		' --schema-language'

-	    );

+		);

 

 	$this->markTestIncomplete('XML Schema Language files should be fixed first.');

-    }

+	}

 

-    public function invoke_testInvalidXmlFiles($filename, $err_code, $args = '')

-    {

+	public function invoke_testInvalidXmlFiles($filename, $err_code, $args = '')

+	{

 	$cmd = $this->validator_cmd . ' '. $args . ' ' . escapeshellarg($filename);

 	$validator_output = array();

 	$return_code = 0;

@@ -141,88 +141,88 @@ 
 

 	// Validator should not crash/exit-with-an-error.

 	$this->assertEquals

-	    (

+		(

 		$err_code,

 		$return_code,

 		"{$cmd}\n{$output_text}\nValidator returned code {$return_code}."

-	    );

+		);

 

 	// Validator should output some error on the test files

 	$basefilename = basename($filename);

 	$this->assertNotEmpty($output_text, "Error reporting failed for {$basefilename} validation.");

 

-    }

+	}

 

-    public function testInvalidQueryId()

-    {

+	public function testInvalidQueryId()

+	{

 	return $this->invoke_testInvalidXmlFiles(__DIR__.'/data/wrongQueryId.xml', self::RETCODE_QUERY_ELEMENT);

-    }

+	}

 

-    /**

-     * @dataProvider getFilesList

-     */

-    public function testInvalidXMLQueryFiles($filename)

-    {

+	/**

+	 * @dataProvider getFilesList

+	 */

+	public function testInvalidXMLQueryFiles($filename)

+	{

 	return $this->invoke_testInvalidXmlFiles($filename, self::RETCODE_BUILTIN_CHECKS);

-    }

+	}

 

-    public function getDirFilesList($dir_name)

-    {

+	public function getDirFilesList($dir_name)

+	{

 	$output = array();

 

 	$dir = opendir(__DIR__ . '/' . $dir_name);

 

 	if ($dir)

 	{

-	    $entry = readdir($dir);

+		$entry = readdir($dir);

 

-	    while ($entry !== FALSE)

-	    {

+		while ($entry !== FALSE)

+		{

 		$fname = __DIR__ . '/' . $dir_name .'/' . $entry;

 

 		if (!is_dir($fname)&& $entry != 'wrongQueryId.xml')

-		    $output[] = array($fname);

+			$output[] = array($fname);

 

 		$entry = readdir($dir);

-	    }

+		}

 

-	    closedir($dir);

+		closedir($dir);

 	}

 	else

-	    $this->assertFalse(TRUE);

+		$this->assertFalse(TRUE);

 

-        return $output;

-    }

+		return $output;

+	}

 

-    public function getFilesList()

-    {

+	public function getFilesList()

+	{

 	return $this->getDirFilesList('data');

-    }

+	}

 

-    public function getSchemaFilesList()

-    {

+	public function getSchemaFilesList()

+	{

 	return $this->getDirFilesList('data/schema');

-    }

+	}

 

-    public function getSchemaWarningFilesList()

-    {

+	public function getSchemaWarningFilesList()

+	{

 	return $this->getDirFilesList('data/schema/warnings');

-    }

+	}

 

-    /**

-     * @dataProvider getSchemaFilesList

-     */

-    public function testInvalidXMLSchemaFiles($filename)

-    {

+	/**

+	 * @dataProvider getSchemaFilesList

+	 */

+	public function testInvalidXMLSchemaFiles($filename)

+	{

 	return $this->invoke_testInvalidXmlFiles($filename, self::RETCODE_BUILTIN_CHECKS, '--schema-language');

-    }

+	}

 

-    /**

-     * @dataProvider getSchemaWarningFilesList

-     */

-    public function testWarningXMLSchemaFiles($filename)

-    {

+	/**

+	 * @dataProvider getSchemaWarningFilesList

+	 */

+	public function testWarningXMLSchemaFiles($filename)

+	{

 	return $this->invoke_testInvalidXmlFiles($filename, self::RETCODE_SUCCESS, '--schema-language');

-    }

+	}

 }

 

Spacing +13 added lines, -20 removed lines

@@ -14,8 +14,8 @@ 
     const RETCODE_GENERIC_XML_SYNTAX = 50;

     const RETCODE_QUERY_ELEMENT = 40;

     const RETCODE_XSD_VALIDATION = 30;

-    const RETCODE_BUILTIN_CHECKS =    20;

-    const RETCODE_DB_SCHEMA_MATCH =10;	// no schema match is currently implemented.

+    const RETCODE_BUILTIN_CHECKS = 20;

+    const RETCODE_DB_SCHEMA_MATCH = 10; // no schema match is currently implemented.

     const RETCODE_SUCCESS = 0;

 

     public $validator_cmd;

@@ -53,8 +53,7 @@ 
     } 

 

     /** Tests all XML Query and Schema Language files (in all modules/addons/widgets) in XE */

-    public function invoke_testReleasedXMLLangFiles

-	(

+    public function invoke_testReleasedXMLLangFiles(

 	    $released_files,

 	    $expected_return_code,

 	    $validator_args = ''

@@ -71,11 +70,9 @@ 
 

 	foreach ($released_files as $released_file_mask)

 	    $xml_files =

-		array_merge

-		(

+		array_merge(

 		    $xml_files,

-		    $this->globr

-			(

+		    $this->globr(

 			    $xe_dir,

 			    $released_file_mask,

 			    GLOB_NOSORT | GLOB_NOESCAPE | GLOB_ERR

@@ -95,8 +92,7 @@ 
 	    $output_text = trim(trim(implode("\n", $validator_output)), "\n");

 

 	    // Validator should not crash/exit-with-an-error.

-	    $this->assertLessThanOrEqual

-		(

+	    $this->assertLessThanOrEqual(

 		    $expected_return_code,

 		    $return_code,

 		    "{$cmd}\n\n{$output_text}\nValidator returned code {$return_code}."

@@ -108,8 +104,7 @@ 
 

     public function testReleasedXMLQueryLangFiles()

     {

-	$this->invoke_testReleasedXMLLangFiles

-	    (

+	$this->invoke_testReleasedXMLLangFiles(

 		array('queries/*.xml', 'xml_query/*.xml'),

 		self::RETCODE_QUERY_ELEMENT

 	    );

@@ -119,8 +114,7 @@ 
 

     public function testReleasedXMLSchemaLangFiles()

     {

-	$this->invoke_testReleasedXMLLangFiles

-	    (

+	$this->invoke_testReleasedXMLLangFiles(

 		array('schemas/*.xml'),

 		self::RETCODE_BUILTIN_CHECKS,

 		' --schema-language'

@@ -131,7 +125,7 @@ 
 

     public function invoke_testInvalidXmlFiles($filename, $err_code, $args = '')

     {

-	$cmd = $this->validator_cmd . ' '. $args . ' ' . escapeshellarg($filename);

+	$cmd = $this->validator_cmd . ' ' . $args . ' ' . escapeshellarg($filename);

 	$validator_output = array();

 	$return_code = 0;

 

@@ -140,8 +134,7 @@ 
 	$output_text = trim(trim(implode("\n", $validator_output)), "\n");

 

 	// Validator should not crash/exit-with-an-error.

-	$this->assertEquals

-	    (

+	$this->assertEquals(

 		$err_code,

 		$return_code,

 		"{$cmd}\n{$output_text}\nValidator returned code {$return_code}."

@@ -155,7 +148,7 @@ 
 

     public function testInvalidQueryId()

     {

-	return $this->invoke_testInvalidXmlFiles(__DIR__.'/data/wrongQueryId.xml', self::RETCODE_QUERY_ELEMENT);

+	return $this->invoke_testInvalidXmlFiles(__DIR__ . '/data/wrongQueryId.xml', self::RETCODE_QUERY_ELEMENT);

     }

 

     /**

@@ -178,9 +171,9 @@ 
 

 	    while ($entry !== FALSE)

 	    {

-		$fname = __DIR__ . '/' . $dir_name .'/' . $entry;

+		$fname = __DIR__ . '/' . $dir_name . '/' . $entry;

 

-		if (!is_dir($fname)&& $entry != 'wrongQueryId.xml')

+		if (!is_dir($fname) && $entry != 'wrongQueryId.xml')

 		    $output[] = array($fname);

 

 		$entry = readdir($dir);

Braces +16 added lines, -12 removed lines

@@ -1,8 +1,9 @@ 
 <?php

 /* Copyright (C) NAVER <http://www.navercorp.com> */

 

-if (!defined('__DIR__'))

-    define('__DIR__', realpath(dirname(__FILE__))); 

+if (!defined('__DIR__')) {
+    define('__DIR__', realpath(dirname(__FILE__)));
+}
 

 /** The tests here are meant only for the built-in checks in validator.php, 

     and not for the entire syntax expressed by the .xsd files. */

@@ -69,8 +70,8 @@ 
 	$cmd = $this->validator_cmd;

 	$xml_files = array();

 

-	foreach ($released_files as $released_file_mask)

-	    $xml_files =

+	foreach ($released_files as $released_file_mask) {
+		    $xml_files =

 		array_merge

 		(

 		    $xml_files,

@@ -80,15 +81,17 @@ 
 			    $released_file_mask,

 			    GLOB_NOSORT | GLOB_NOESCAPE | GLOB_ERR

 			)

-		);

+		);
+	}
 

 	while ($cnt < count($xml_files))

 	{

 	    $cmd = $this->validator_cmd . $validator_args;

 

 	    // Validate 50 files at once

-	    foreach (array_slice($xml_files, $cnt, 50) as $xml_file)

-		$cmd .= " " . escapeshellarg($xml_file);

+	    foreach (array_slice($xml_files, $cnt, 50) as $xml_file) {
+	    		$cmd .= " " . escapeshellarg($xml_file);
+	    }
 

 	    exec($cmd . ' 2>&1', $validator_output, $return_code);

 

@@ -180,16 +183,17 @@ 
 	    {

 		$fname = __DIR__ . '/' . $dir_name .'/' . $entry;

 

-		if (!is_dir($fname)&& $entry != 'wrongQueryId.xml')

-		    $output[] = array($fname);

+		if (!is_dir($fname)&& $entry != 'wrongQueryId.xml') {
+				    $output[] = array($fname);
+		}
 

 		$entry = readdir($dir);

 	    }

 

 	    closedir($dir);

-	}

-	else

-	    $this->assertFalse(TRUE);

+	} else {
+		    $this->assertFalse(TRUE);
+	}
 

         return $output;

     }

tools/dbxml_validator/validate.php

Doc Comments +5 added lines, -5 removed lines

@@ -173,7 +173,7 @@ 
  @return

  @param $xml_file

  @param $node

- @param $child_tag

+ @param string $child_tag

  */

 function checkDuplicateDescendants($xml_file, $node, $child_tag)

 {

@@ -199,13 +199,13 @@ 
 	messages.

  @param $node

 	The XML node with the children to be checked.

- @param $child_tags

+ @param string[] $child_tags

 	Array with tag names for the children elements

- @param $attr_tags

+ @param string[] $attr_tags

 	Array with names of attributes to be checked. If multiple attributes

 	are given, than the first one that is present on a child is included

 	in the check.

- @param $key

+ @param boolean $key

 	True if child elements are required to expose at least one of the 

 	attribute. False if only the child nodes with some of the

 	attributes present are to be checked.

@@ -489,7 +489,7 @@ 
 	@return

 	@param $xml_file

 	@param $container_element

-	@param $child_tag

+	@param string $child_tag

 */

 function checkVarContentsValidation

 	(

Indentation +28 added lines, -29 removed lines

@@ -90,7 +90,7 @@ 
 		@param $line_no

 		@param $message

 		@access

-	*/

+	 */

 	public function __construct($file, $line_no, $message)

 	{

 		parent::__construct("{$file}({$line_no}):\n\t$message");

@@ -112,7 +112,7 @@ 
 	@developer

 	@return

 	@access

-	*/

+	 */

 	public function __destruct()

 	{

 		libxml_clear_errors();

@@ -834,8 +834,7 @@ 
 

 	@brief

 	@developer

-

-	*/

+	 */

 	class RestoreWorkDir

 	{

 		protected $dirname;

@@ -845,7 +844,7 @@ 
 			@developer

 			@return

 			@access

-			*/

+		 */

 		public function __destruct()

 		{

 			try

@@ -868,7 +867,7 @@ 
 			@developer

 			@return

 			@access

-			*/

+		 */

 		public function __construct()

 		{

 			$this->dirname = getcwd();

@@ -1113,7 +1112,7 @@ 
 		@return

 		@access

 		@param $val

-	*/

+	 */

 	public function code($val = -1)

 	{

 		if($val == -1)

@@ -1135,7 +1134,7 @@ 
 		@return

 		@access

 		@param $val

-	*/

+	 */

 	public function push($val)

 	{

 		$this->save = $this->exit_code;

@@ -1147,7 +1146,7 @@ 
 		@developer

 		@access

 		@return

-	*/

+	 */

 	public function pop()

 	{

 		$this->exit_code = $this->save;

@@ -1160,7 +1159,7 @@ 
 		@return

 		@access

 		@param $val

-	*/

+	 */

 	public function __construct($val = 0)

 	{

 		$this->save = self::RETCODE_VALIDATOR_INTERNAL;

@@ -1181,7 +1180,7 @@ 
 		@developer

 		@access

 		@return

-	*/

+	 */

 	public function __destruct()

 	{

 		if($this->file_name)

@@ -1196,7 +1195,7 @@ 
 		@access

 		@return

 		@param $file_name

-	*/

+	 */

 	public function __construct($file_name)

 	{

 		$this->file_name = $file_name;

@@ -1439,7 +1438,7 @@ 
 

 			@brief

 			@developer

-		*/

+		 */

 		class Context

 		{

 			protected static $db_info = NULL;

@@ -1449,7 +1448,7 @@ 
 				@developer

 				@return

 				@access

-			*/

+			 */

 			public static function isInstalled()

 			{

 				return TRUE;

@@ -1460,7 +1459,7 @@ 
 				@developer

 				@return

 				@access

-			*/

+			 */

 			public static function getLangType()

 			{

 				return 'en';

@@ -1471,7 +1470,7 @@ 
 				@developer

 				@return

 				@access

-			*/

+			 */

 			public static function getLang()

 			{

 				return 'en';

@@ -1482,7 +1481,7 @@ 
 				@developer

 				@return

 				@access

-			*/

+			 */

 			public static function getDBType()

 			{

 				if(self::$db_info)

@@ -1501,7 +1500,7 @@ 
 				@return

 				@access

 				@param $db_info

-			*/

+			 */

 			public static function setDBInfo($db_info)

 			{

 				self::$db_info = $db_info;

@@ -1512,7 +1511,7 @@ 
 				@developer

 				@return

 				@access

-			*/

+			 */

 			public static function getDBInfo()

 			{

 				return self::$db_info;

@@ -1524,7 +1523,7 @@ 
 				@return

 				@access

 				@param $str

-			*/

+			 */

 			public static function convertEncodingStr($str)

 			{

 				return $str;

@@ -1535,7 +1534,7 @@ 
 				@developer

 				@return

 				@access

-			*/

+			 */

 			public static function setNoDBInfo()

 			{

 				$db_info = (object)NULL;

@@ -1562,7 +1561,7 @@ 
 				@developer

 				@access

 				@return

-			*/

+			 */

 			public static function setMysqlDBInfo()

 			{

 				$db_info = (object)NULL;

@@ -1604,7 +1603,7 @@ 
 				@developer

 				@return

 				@access

-			*/

+			 */

 			public static function setMysqliDBInfo()

 			{

 				$db_info = (object)NULL;

@@ -1646,7 +1645,7 @@ 
 				@developer

 				@return

 				@access

-			*/

+			 */

 			public static function setCubridDBInfo()

 			{

 				$db_info = (object)NULL;

@@ -1688,7 +1687,7 @@ 
 				@developer

 				@return

 				@access

-			*/

+			 */

 			public static function setMssqlDBInfo()

 			{

 				$db_info = (object)NULL;

@@ -1729,7 +1728,7 @@ 
 		/**

 			@brief

 			@developer

-		*/

+		 */

 		class Any_prop_obj_base

 		{

 			/**

@@ -1738,7 +1737,7 @@ 
 				@return

 				@param $property

 				@access

-			*/

+			 */

 			public function __get($property)

 			{

 				return NULL;

@@ -1748,7 +1747,7 @@ 
 		/**

 			@brief

 			@developer

-			*/

+		 */

 		class LangArgFilterErrorMessage

 		{

 			/**

@@ -1757,7 +1756,7 @@ 
 				@return

 				@param $property

 				@access

-			*/

+			 */

 			public function __get($property)

 			{

 				return 'Argument filter error';

Spacing +186 added lines, -205 removed lines

@@ -95,7 +95,7 @@ 
 	{

 		parent::__construct("{$file}({$line_no}):\n\t$message");

 

-		$this->xml_file	= $file;

+		$this->xml_file = $file;

 		$this->xml_line_no = $line_no;

 		$this->xml_message = $message;

 	}

@@ -133,21 +133,21 @@ 
 

 	$libXmlErrors = libxml_get_errors();

 

-	if(count($libXmlErrors))

+	if (count($libXmlErrors))

 	{

-		if(!$filename)

+		if (!$filename)

 		{

 			$filename = $libXmlErrors[0]->file;

 		}

 

 		$msg = '';

 

-		foreach($libXmlErrors as $libXmlError)

+		foreach ($libXmlErrors as $libXmlError)

 		{

 			$msg .= "{$libXmlError->file}({$libXmlError->line}):\n\t {$libXmlError->message}";

 		}

 

-		if($throw_error)

+		if ($throw_error)

 		{

 			throw new ErrorMessage($msg);

 		}

@@ -158,7 +158,7 @@ 
 	}

 	else

 	{

-		if($throw_error)

+		if ($throw_error)

 		{

 			throw new ErrorMessage('Schema validation failed.');

 		}

@@ -179,7 +179,7 @@ 
 {

 	$children = $node->getElementsByTagName($child_tag);

 

-	if($children->length > 1)

+	if ($children->length > 1)

 	{

 		throw 

 			new XmlSchemaError(

@@ -217,21 +217,21 @@ 
 {

 	$key_values = array();

 

-	foreach($node->childNodes as $child_node)

+	foreach ($node->childNodes as $child_node)

 	{

-		if($child_node->nodeType == XML_ELEMENT_NODE

+		if ($child_node->nodeType == XML_ELEMENT_NODE

 					&&

 				in_array($child_node->tagName, $child_tags))

 		{

 			$key_value = NULL;

 

-			foreach($attr_tags as $attr_tag)

+			foreach ($attr_tags as $attr_tag)

 			{

-				if($child_node->hasAttribute($attr_tag))

+				if ($child_node->hasAttribute($attr_tag))

 				{

 					$key_value = $child_node->getAttribute($attr_tag);

 

-					if(array_key_exists($key_value, $key_values))

+					if (array_key_exists($key_value, $key_values))

 					{

 						throw

 							new XmlSchemaError(

@@ -246,7 +246,7 @@ 
 				}

 			}

 

-			if(!$key_value && $key)

+			if (!$key_value && $key)

 			{

 				throw

 					new XmlSchemaError(

@@ -282,19 +282,19 @@ 
 	$table_name = NULL;

 	$join_type = NULL;

 

-	if($table_element->hasAttribute('name'))

+	if ($table_element->hasAttribute('name'))

 	{

 		$table_name = $table_element->getAttribute('name');

 	}

 

-	if($table_element->hasAttribute('type'))

+	if ($table_element->hasAttribute('type'))

 	{

 		$join_type = $table_element->getAttribute('type');

 	}

 

-	if($table_element->getAttribute('query') == 'true')

+	if ($table_element->getAttribute('query') == 'true')

 	{

-		if($table_name !== NULL)

+		if ($table_name !== NULL)

 		{

 			throw

 				new XmlSchemaError(

@@ -304,7 +304,7 @@ 
 				);

 		}

 

-		if($join_type !== NULL)

+		if ($join_type !== NULL)

 		{

 			throw

 				new XmlSchemaError(

@@ -322,9 +322,9 @@ 
 		// check contents for a select list or a table-specification

 		$has_query_clauses = FALSE;

 

-		foreach($table_element->childNodes as $query_clause)

+		foreach ($table_element->childNodes as $query_clause)

 		{

-			if($query_clause->nodeType == XML_ELEMENT_NODE

+			if ($query_clause->nodeType == XML_ELEMENT_NODE

 						&&

 					(

 						$query_clause->tagName == 'columns' 

@@ -335,7 +335,7 @@ 
 			}

 		}

 

-		if(!$has_query_clauses)

+		if (!$has_query_clauses)

 		{

 			throw

 				new XmlSchemaError(

@@ -351,17 +351,17 @@ 
 	{

 		// base table or view

 

-		if($join_type !== NULL)

+		if ($join_type !== NULL)

 		{

 			$has_conditions_element = FALSE;

 

-			foreach($table_element->childNodes as $child_node)

+			foreach ($table_element->childNodes as $child_node)

 			{

-				if($child_node->nodeType == XML_ELEMENT_NODE)

+				if ($child_node->nodeType == XML_ELEMENT_NODE)

 				{

-					if($child_node->tagName == 'conditions')

+					if ($child_node->tagName == 'conditions')

 					{

-						if($has_conditions_element)

+						if ($has_conditions_element)

 						{

 							throw

 								new XmlSchemaError(

@@ -387,7 +387,7 @@ 
 				}

 			}

 

-			if(!$has_conditions_element)

+			if (!$has_conditions_element)

 			{

 				throw

 					new XmlSchemaError(

@@ -399,9 +399,9 @@ 
 		}

 		else

 		{

-			foreach($table_element->childNodes as $child_node)

+			foreach ($table_element->childNodes as $child_node)

 			{

-				if($child_node->nodeType == XML_ELEMENT_NODE)

+				if ($child_node->nodeType == XML_ELEMENT_NODE)

 				{

 					throw

 						new XmlSchemaError(

@@ -429,26 +429,25 @@ 
  */

 function checkTablesClause($xml_file, $tables_element)

 {

-	checkUniqueKey

-		(

+	checkUniqueKey(

 			$xml_file,

 			$tables_element,

-			array('table'),				// child elements to be checked

-			array('alias', 'name'),		// attributes to be checked

+			array('table'), // child elements to be checked

+			array('alias', 'name'), // attributes to be checked

 			TRUE						// attributes are required

 		);

 

-	foreach($tables_element->childNodes as $table)

+	foreach ($tables_element->childNodes as $table)

 	{

-		if($table->nodeType == XML_ELEMENT_NODE

+		if ($table->nodeType == XML_ELEMENT_NODE

 					&&

 				$table->tagName == 'table')

 		{

 			checkTableExpression($xml_file, $table);

 

-			if($table->getAttribute('query') == 'true')

+			if ($table->getAttribute('query') == 'true')

 			{

-				validate_select_query($xml_file, $table);		// recursive call

+				validate_select_query($xml_file, $table); // recursive call

 			}

 		}

 	}

@@ -470,12 +469,11 @@ 
  */

 function checkSelectListClause($xml_file, $columns_element)

 {

-	checkUniqueKey

-		(

+	checkUniqueKey(

 			$xml_file,

 			$columns_element,

-			array('column', 'query'),	// child elements

-			array('alias', 'name'),		// attributes

+			array('column', 'query'), // child elements

+			array('alias', 'name'), // attributes

 			FALSE						// ignore if no attributes present

 		);

 }

@@ -491,8 +489,7 @@ 
 	@param $container_element

 	@param $child_tag

 */

-function checkVarContentsValidation

-	(

+function checkVarContentsValidation(

 		$xml_file,

 		$container_element,

 		$child_tag

@@ -503,23 +500,22 @@ 
 

 	static

 		$var_attrs =

-			array

-			(

+			array(

 				'filter', 'notnull', 'minlength',

 				'maxlength'

 			);

 

-	foreach($container_element->childNodes as $child_node)

+	foreach ($container_element->childNodes as $child_node)

 	{

-		if($child_node->nodeType == XML_ELEMENT_NODE

+		if ($child_node->nodeType == XML_ELEMENT_NODE

 					&&

 				$child_node->tagName == $child_tag)

 		{

-			if(!$child_node->hasAttribute($key_attr))

+			if (!$child_node->hasAttribute($key_attr))

 			{

-				foreach($var_attrs as $var_attr)

+				foreach ($var_attrs as $var_attr)

 				{

-					if($child_node->hasAttribute($var_attr))

+					if ($child_node->hasAttribute($var_attr))

 					{

 						throw

 							new XmlSchemaError(

@@ -551,9 +547,9 @@ 
 	$has_var_attribute = $condition->hasAttribute('var') || $condition->hasAttribute('default');

 	$query_line_no = -1;

 

-	foreach($condition->childNodes as $query_node)

+	foreach ($condition->childNodes as $query_node)

 	{

-		if($query_node->nodeType == XML_ELEMENT_NODE

+		if ($query_node->nodeType == XML_ELEMENT_NODE

 					&&

 				$query_node->tagName == 'query')

 		{

@@ -564,7 +560,7 @@ 
 		}

 	}

 

-	if($child_query_node && $has_var_attribute)

+	if ($child_query_node && $has_var_attribute)

 	{

 		throw 

 			new XmlSchemaError(

@@ -574,7 +570,7 @@ 
 			);

 	}

 

-	if(!($child_query_node || $has_var_attribute))

+	if (!($child_query_node || $has_var_attribute))

 	{

 		throw

 			new XmlSchemaError(

@@ -601,18 +597,18 @@ 
 {

 	$first_child = TRUE;

 

-	foreach($conditions->childNodes as $child_node)

+	foreach ($conditions->childNodes as $child_node)

 	{

-		if($child_node->nodeType == XML_ELEMENT_NODE)

+		if ($child_node->nodeType == XML_ELEMENT_NODE)

 		{

 			// check for 'pipe' attribute

-			if($first_child)

+			if ($first_child)

 			{

 				$first_child = FALSE;

 			}

 			else

 			{

-				if(!$child_node->hasAttribute('pipe'))

+				if (!$child_node->hasAttribute('pipe'))

 				{

 					throw

 						new XmlSchemaError(

@@ -626,19 +622,19 @@ 
 			}

 

 			// recurse in condition groups/queries

-			if($child_node->tagName == 'group')

+			if ($child_node->tagName == 'group')

 			{

 				checkConditionsGroup($xml_file, $child_node);

 			}

 			else

 			{

-				if($child_node->tagName == 'query')

+				if ($child_node->tagName == 'query')

 				{

 					validate_select_query($xml_file, $child_node);

 				}

 				else

 				{

-					if($child_node->tagName == 'condition')

+					if ($child_node->tagName == 'condition')

 					{

 						checkConditionElement($xml_file, $child_node);

 					}

@@ -664,12 +660,11 @@ 
  */

 function checkNavigationClauses($xml_file, $navigation_element)

 {

-	foreach(array('list_count', 'page_count', 'page')

+	foreach (array('list_count', 'page_count', 'page')

 				as

 			$navigation_el)

 	{

-		checkDuplicateDescendants

-			(

+		checkDuplicateDescendants(

 				$xml_file,

 				$navigation_element,

 				$navigation_el

@@ -693,11 +688,11 @@ 
  */

 function validate_select_query($xml_file, $query_element)

 {

-	foreach($query_element->childNodes as $select_clause)

+	foreach ($query_element->childNodes as $select_clause)

 	{

-		if($select_clause->nodeType == XML_ELEMENT_NODE)

+		if ($select_clause->nodeType == XML_ELEMENT_NODE)

 		{

-			switch($select_clause->tagName)

+			switch ($select_clause->tagName)

 			{

 				case 'columns':

 					checkSelectListClause($xml_file, $select_clause);

@@ -728,11 +723,11 @@ 
  */

 function validate_update_query($xml_file, $query_element)

 {

-	foreach($query_element->childNodes as $update_clause)

+	foreach ($query_element->childNodes as $update_clause)

 	{

-		if($update_clause->nodeType == XML_ELEMENT_NODE)

+		if ($update_clause->nodeType == XML_ELEMENT_NODE)

 		{

-			switch($update_clause->tagName)

+			switch ($update_clause->tagName)

 			{

 				case 'tables':

 					checkTablesClause($xml_file, $update_clause);

@@ -755,11 +750,11 @@ 
  */

 function validate_delete_query($xml_file, $query_element)

 {

-	foreach($query_element->childNodes as $delete_clause)

+	foreach ($query_element->childNodes as $delete_clause)

 	{

-		if($delete_clause->nodeType == XML_ELEMENT_NODE)

+		if ($delete_clause->nodeType == XML_ELEMENT_NODE)

 		{

-			switch($delete_clause->tagName)

+			switch ($delete_clause->tagName)

 			{

 				case 'conditions':

 					checkConditionsGroup($xml_file, $delete_clause);

@@ -778,11 +773,11 @@ 
  */

 function validate_insert_select_query($xml_file, $query_element)

 {

-	foreach($query_element->childNodes as $statement_clause)

+	foreach ($query_element->childNodes as $statement_clause)

 	{

-		if($statement_clause->nodeType == XML_ELEMENT_NODE)

+		if ($statement_clause->nodeType == XML_ELEMENT_NODE)

 		{

-			switch($statement_clause->tagName)

+			switch ($statement_clause->tagName)

 			{

 				case 'query':

 					validate_select_query($xml_file, $statement_clause);

@@ -793,8 +788,7 @@ 
 }

 

 $validate_query_type = 

-	array

-		(

+	array(

 			// 'insert' =>		

 							// there is currently nothing special to check

 							// for a plain insert, all the needed checks

@@ -818,13 +812,13 @@ 
 

 	$action = $query_element->getAttribute('action');

 

-	if(array_key_exists($action, $validate_query_type))

+	if (array_key_exists($action, $validate_query_type))

 	{

 		$validate_query_type[$action]($xml_file, $query_element);

 	}

 }

 

-if(strpos(PHP_SAPI, 'cli') !== FALSE

+if (strpos(PHP_SAPI, 'cli') !== FALSE

 			|| 

 		strpos(PHP_SAPI, 'cgi') !== FALSE)

 {

@@ -857,7 +851,7 @@ 
 				print "Failed to restore working dir {$this->dirname}.";

 			}

 

-			if(!$success)

+			if (!$success)

 			{

 				print "Failed to restore working dir {$this->dirname}.";

 			}

@@ -873,7 +867,7 @@ 
 		{

 			$this->dirname = getcwd();

 

-			if(!$this->dirname)

+			if (!$this->dirname)

 			{

 				throw new ErrorMessage("Failed to get current directory.");

 			}

@@ -903,7 +897,7 @@ 
 	$lowercase_name = strtolower($xml_path_info['basename']);

 	$uppercase_name = strtoupper($xml_path_info['basename']);

 

-	if(strlen($lowercase_name) != $filename_len

+	if (strlen($lowercase_name) != $filename_len

 				||

 			strlen($uppercase_name) != $filename_len)

 	{

@@ -916,9 +910,9 @@ 
 

 	$varing_case_filename = '';

 

-	for($i = 0; $i < $filename_len; $i++)

+	for ($i = 0; $i < $filename_len; $i++)

 	{

-		if($lowercase_name[$i] != $uppercase_name[$i])

+		if ($lowercase_name[$i] != $uppercase_name[$i])

 		{

 			$varing_case_filename .= "[{$lowercase_name[$i]}{$uppercase_name[$i]}]";

 		}

@@ -932,13 +926,13 @@ 
 

 	$restoreWorkDir = new RestoreWorkDir();

 

-	if($glob_pattern)

+	if ($glob_pattern)

 	{

 		// change current dir to the xml file directory to keep

 		// glob pattern shorter (maximum 260 chars).

 		$success = chdir($glob_pattern);

 

-		if(!$success)

+		if (!$success)

 		{

 			throw new ErrorMessage("Failed to change work dir to {$glob_pattern}.");

 		}

@@ -950,14 +944,14 @@ 
 	// realpath() would have the same effect, but it is not documented as such

 	$matched_files = glob($glob_pattern, GLOB_NOSORT | GLOB_NOESCAPE | GLOB_ERR);

 

-	unset($RestoreWorkDir);		// restore work dir after call to glob()

+	unset($RestoreWorkDir); // restore work dir after call to glob()

 

-	if($matched_files === FALSE || !is_array($matched_files))

+	if ($matched_files === FALSE || !is_array($matched_files))

 	{

 		throw new ErrorMessage("Directory listing for $xml_file failed.");

 	}

 

-	switch(count($matched_files))

+	switch (count($matched_files))

 	{

 		case 0:

 			throw new ErrorMessage("Directory listing for $xml_file failed.");

@@ -968,9 +962,9 @@ 
 		default:

 			// more than one files with the same name and different case

 			// case-sensitive file system

-			foreach($mached_files as $matched_file)

+			foreach ($mached_files as $matched_file)

 			{

-				if(pathinfo($matched_file, PATHINFO_BASENAME) == $xml_path_info['basename'])

+				if (pathinfo($matched_file, PATHINFO_BASENAME) == $xml_path_info['basename'])

 				{

 					return ($xml_path_info['filename'] == $query_id);

 				}

@@ -979,7 +973,7 @@ 
 

 	}

 

-	throw new ErrorMessage("Internal application error.");  // unreachable

+	throw new ErrorMessage("Internal application error."); // unreachable

 }

 

 /**

@@ -1000,9 +994,9 @@ 
 */

 function validate_schema_doc($xml_file, $table_element)

 {

-	foreach($table_element->childNodes as $col_node)

+	foreach ($table_element->childNodes as $col_node)

 	{

-		if($col_node->nodeType == XML_ELEMENT_NODE

+		if ($col_node->nodeType == XML_ELEMENT_NODE

 					&&

 				$col_node->tagName == 'column')

 		{

@@ -1010,10 +1004,9 @@ 
 			$col_size = NULL;

 

 			// check auto-increment column

-			if($col_node->hasAttribute('auto_increment'))

+			if ($col_node->hasAttribute('auto_increment'))

 			{

-				fwrite

-					(

+				fwrite(

 						fopen('php://stdout', 'wt'), 

 						$xml_file . '(' . $col_node->getLineNo() . ")\n\t"

 							.

@@ -1023,7 +1016,7 @@ 
 				static

 					$autoinc_types = array('number', 'bignumber');

 

-				if(!in_array($col_type, $autoinc_types))

+				if (!in_array($col_type, $autoinc_types))

 				{

 					throw

 						new XmlSchemaError(

@@ -1037,10 +1030,9 @@ 
 			}

 

 			// check tinytext

-			if($col_type == 'tinytext')

+			if ($col_type == 'tinytext')

 			{

-				fwrite

-					(

+				fwrite(

 						fopen('php://stdout', 'wt'), 

 						$xml_file . '(' . $col_node->getLineNo() . ")\n\t"

 							.

@@ -1049,12 +1041,12 @@ 
 			}

 

 			// check size attribute

-			if($col_node->hasAttribute('size'))

+			if ($col_node->hasAttribute('size'))

 			{

 				$col_size = $col_node->getAttribute('size');

 			}

 

-			if($col_type == 'varchar' && $col_size === NULL)

+			if ($col_type == 'varchar' && $col_size === NULL)

 			{

 				throw 

 					new XmlSchemaError(

@@ -1068,7 +1060,7 @@ 
 				$varsize_types = array('char', 'varchar', 'float');

 					

 

-			if($col_size !== NULL  && !in_array($col_type, $varsize_types))

+			if ($col_size !== NULL && !in_array($col_type, $varsize_types))

 			{

 				throw 

 					new XmlSchemaError(

@@ -1102,8 +1094,8 @@ 
 	const RETCODE_GENERIC_XML_SYNTAX = 50;

 	const RETCODE_QUERY_ELEMENT = 40;

 	const RETCODE_XSD_VALIDATION = 30;

-	const RETCODE_BUILTIN_CHECKS =	20;

-	const RETCODE_DB_SCHEMA_MATCH = 10;	// no schema match is currently implemented.

+	const RETCODE_BUILTIN_CHECKS = 20;

+	const RETCODE_DB_SCHEMA_MATCH = 10; // no schema match is currently implemented.

 	const RETCODE_SUCCESS = 0;

 

 

@@ -1116,13 +1108,13 @@ 
 	*/

 	public function code($val = -1)

 	{

-		if($val == -1)

+		if ($val == -1)

 		{

 			return $this->exit_code;

 		}

 		else

 		{

-			if($this->exit_code < $val)

+			if ($this->exit_code < $val)

 			{

 				$this->exit_code = $val;

 			}

@@ -1184,7 +1176,7 @@ 
 	*/

 	public function __destruct()

 	{

-		if($this->file_name)

+		if ($this->file_name)

 		{

 			unlink($this->file_name);

 			$this->file_name = NULL;

@@ -1214,12 +1206,12 @@ 
 	$cmdname = CMD_NAME;

 

 	// php manual says resources should not normally be declared constant

-	if(!defined('STDERR'))

+	if (!defined('STDERR'))

 	{

 		define('STDERR', fopen('php://stderr', 'wt'));

 	}

 

-	if(!defined('__DIR__'))

+	if (!defined('__DIR__'))

 	{

 		define('__DIR__', dirname(__FILE__)); 

 	}

@@ -1234,7 +1226,7 @@ 
 	$query_args = NULL;

 	$query_args_file = NULL;

 

-	while($argc >= 2 && $argv[1][0] == '-')

+	while ($argc >= 2 && $argv[1][0] == '-')

 	{

 		$option = $argv[1];

 

@@ -1242,17 +1234,17 @@ 
 		$argv = array_values($argv);

 		$argc = count($argv);

 

-		switch($option)

+		switch ($option)

 		{

 			case '-s':

 			case '--schema':

 			case '--schema-language':

-				if($query_args !== NULL)

+				if ($query_args !== NULL)

 				{

 					throw new SyntaxError("Both --args-string and --schema-language options given.");

 				}

 

-				if($query_args_file !== NULL)

+				if ($query_args_file !== NULL)

 				{

 					throw new SyntaxError("Both --args-file and --schema-language options given.");

 				}

@@ -1272,7 +1264,7 @@ 
 

 			case '--xe-path':

 			case '--xe':

-				if($argc < 2)

+				if ($argc < 2)

 				{

 					throw

 						new SyntaxError("Option '{$option}' requires an argument., see `{$cmdname} --help`");

@@ -1290,17 +1282,17 @@ 
 			case '--args-string':

 			case '--arguments':

 			case '--args':

-				if($schema_language !== NULL)

+				if ($schema_language !== NULL)

 				{

 					throw new SyntaxError("Both --schema-language and --args-string options given.");

 				}

 

-				if($query_args_file !== NULL)

+				if ($query_args_file !== NULL)

 				{

 					throw new SyntaxError("Both --args-string and --args-file options given.");

 				}

 

-				if($argc < 2)

+				if ($argc < 2)

 				{

 					throw

 						new SyntaxError("Option '{$option}' requires an argument., see `{$cmdname} --help`");

@@ -1316,17 +1308,17 @@ 
 

 			case '--arguments-file':

 			case '--args-file':

-				if($schema_language !== NULL)

+				if ($schema_language !== NULL)

 				{

 					throw new SyntaxError("Both --schema-language and --args-file options given.");

 				}

 

-				if($query_args !== NULL)

+				if ($query_args !== NULL)

 				{

 					throw new SyntaxError("Both --args-string and --args-file options given.");

 				}

 

-				if($argc < 2)

+				if ($argc < 2)

 				{

 					throw

 						new SyntaxError("Option '{$option}' requires an argument., see `{$cmdname} --help`");

@@ -1357,7 +1349,7 @@ 
 		}

 	}

 

-	if($argc < 2 ||

+	if ($argc < 2 ||

 			(

 				$argc == 2

 					&&

@@ -1415,21 +1407,21 @@ 
 	$query_user_args = array();

 

 	// check $xe_path, $query_args

-	if(!$validate_only)

+	if (!$validate_only)

 	{

-		if($xe_path == NULL)

+		if ($xe_path == NULL)

 		{

 			// assume validator.php is in directory .../xe/tools/dbxml_validator/ in an XE installation

 			$xe_path = dirname(dirname(realpath(__DIR__)));

 		}

 

-		if(!file_exists($xe_path . '/index.php'))

+		if (!file_exists($xe_path . '/index.php'))

 		{

 			throw

 				new ErrorMessage("File index.php not found in {$xe_path}.");

 		}

 

-		if(!defined('_XE_PATH_'))

+		if (!defined('_XE_PATH_'))

 		{

 			define('_XE_PATH_', $xe_path . '/');

 		}

@@ -1485,7 +1477,7 @@ 
 			*/

 			public static function getDBType()

 			{

-				if(self::$db_info)

+				if (self::$db_info)

 				{

 					return self::$db_info->master_db['db_type'];

 				}

@@ -1538,10 +1530,9 @@ 
 			*/

 			public static function setNoDBInfo()

 			{

-				$db_info = (object)NULL;

+				$db_info = (object) NULL;

 				$db_info->master_db =

-					array

-						(

+					array(

 							'db_type' => NULL,

 							'db_hostname' => NULL,

 							'db_port' => NULL,

@@ -1565,10 +1556,9 @@ 
 			*/

 			public static function setMysqlDBInfo()

 			{

-				$db_info = (object)NULL;

+				$db_info = (object) NULL;

 				$db_info->master_db =

-					array

-						(

+					array(

 							'db_type' => 'mysql',

 							'db_hostname' => NULL,

 							'db_port' => NULL,

@@ -1584,7 +1574,7 @@ 
 

 				self::setDBInfo($db_info);

 

-				if(array_key_exists('__DB__', $GLOBALS)

+				if (array_key_exists('__DB__', $GLOBALS)

 							&&

 						array_key_exists($db_info->master_db['db_type'], $GLOBALS['__DB__']))

 				{

@@ -1607,10 +1597,9 @@ 
 			*/

 			public static function setMysqliDBInfo()

 			{

-				$db_info = (object)NULL;

+				$db_info = (object) NULL;

 				$db_info->master_db =

-					array

-						(

+					array(

 							'db_type' => 'mysqli',

 							'db_hostname' => NULL,

 							'db_port' => NULL,

@@ -1626,7 +1615,7 @@ 
 

 				self::setDBInfo($db_info);

 

-				if(array_key_exists('__DB__', $GLOBALS)

+				if (array_key_exists('__DB__', $GLOBALS)

 							&&

 						array_key_exists($db_info->master_db['db_type'], $GLOBALS['__DB__']))

 				{

@@ -1649,10 +1638,9 @@ 
 			*/

 			public static function setCubridDBInfo()

 			{

-				$db_info = (object)NULL;

+				$db_info = (object) NULL;

 				$db_info->master_db =

-					array

-						(

+					array(

 							'db_type' => 'cubrid',

 							'db_hostname' => NULL,

 							'db_port' => NULL,

@@ -1668,7 +1656,7 @@ 
 

 				self::setDBInfo($db_info);

 

-				if(array_key_exists('__DB__', $GLOBALS)

+				if (array_key_exists('__DB__', $GLOBALS)

 							&&

 						array_key_exists($db_info->master_db['db_type'], $GLOBALS['__DB__']))

 				{

@@ -1691,10 +1679,9 @@ 
 			*/

 			public static function setMssqlDBInfo()

 			{

-				$db_info = (object)NULL;

+				$db_info = (object) NULL;

 				$db_info->master_db =

-					array

-						(

+					array(

 							'db_type' => 'mssql',

 							'db_hostname' => NULL,

 							'db_port' => NULL,

@@ -1710,7 +1697,7 @@ 
 

 				self::setDBInfo($db_info);

 

-				if(array_key_exists('__DB__', $GLOBALS)

+				if (array_key_exists('__DB__', $GLOBALS)

 							&&

 						array_key_exists($db_info->master_db['db_type'], $GLOBALS['__DB__']))

 				{

@@ -1765,25 +1752,25 @@ 
 		}

 

 		global $lang;

-		$lang = new Any_prop_obj_base();	// to return NULL on non-existent properties

+		$lang = new Any_prop_obj_base(); // to return NULL on non-existent properties

 		$lang->filter = New LangArgFilterErrorMessage();

 

-		if(!defined('__XE__'))

+		if (!defined('__XE__'))

 		{

 			define('__XE__', TRUE);

 		}

 

-		if(!defined('__ZBXE__'))

+		if (!defined('__ZBXE__'))

 		{

 			define('__ZBXE__', TRUE);

 		}

 

-		if(!defined('__DEBUG__'))

+		if (!defined('__DEBUG__'))

 		{

 			define('__DEBUG__', 0);

 		}

 

-		if(!defined('__DEBUG_QUERY__'))

+		if (!defined('__DEBUG_QUERY__'))

 		{

 			define('__DEBUG_QUERY__', 0);

 		}

@@ -1807,7 +1794,7 @@ 
 		require_once(__DIR__ . '/connect_wrapper.php');

 

 		// check $query_args, $query_args_file

-		if($query_args_file)

+		if ($query_args_file)

 		{

 			try

 			{

@@ -1821,7 +1808,7 @@ 
 		}

 		else

 		{

-			if($query_args)

+			if ($query_args)

 			{

 				try

 				{

@@ -1841,8 +1828,7 @@ 
 

 	$schema_file = NULL;

 	$schemas_set =

-		array

-			(

+		array(

 				'delete' => __DIR__ . '/xml_delete.xsd',

 				'update' => __DIR__ . '/xml_update.xsd',

 				'select' => __DIR__ . '/xml_select.xsd',

@@ -1855,12 +1841,12 @@ 
 

 	$i = 1;

 

-	if(pathinfo($argv[1], PATHINFO_EXTENSION) == 'xsd')

+	if (pathinfo($argv[1], PATHINFO_EXTENSION) == 'xsd')

 	{

 		$schema_file = $argv[$i++];

 	}

 	

-	for(; $i < count($argv); $i++)

+	for (; $i < count($argv); $i++)

 	{

 		try

 		{

@@ -1869,7 +1855,7 @@ 
 			$use_schema_language = $schema_language;

 

 			$retcode->push(ReturnCode::RETCODE_GENERIC_XML_SYNTAX);

-			if($domDocument->load($argv[$i]))

+			if ($domDocument->load($argv[$i]))

 			{

 				$retcode->pop();

 

@@ -1883,7 +1869,7 @@ 
 					}

 				}

 

-				if(!$schema_file && !$use_schema_language

+				if (!$schema_file && !$use_schema_language

 							&&

 						(

 							$queryElement->tagName != 'query'

@@ -1903,7 +1889,7 @@ 
 							);

 				}

 

-				if(!$schema_file && !$use_schema_language && !$skip_query_id

+				if (!$schema_file && !$use_schema_language && !$skip_query_id

 							&&

 						!validate_query_id($argv[$i], $queryElement->getAttribute('id')))

 				{

@@ -1916,24 +1902,24 @@ 
 						);

 				}

 

-				if($use_schema_language)

+				if ($use_schema_language)

 				{

 					$document_schema = $table_schema;

 				}

 				else

 				{

-					if(!$document_schema)

+					if (!$document_schema)

 					{

 						$document_schema = $schemas_set[$queryElement->getAttribute('action')];

 					}

 				}

 

 				$retcode->push(ReturnCode::RETCODE_XSD_VALIDATION);

-				if($domDocument->schemaValidate($document_schema))

+				if ($domDocument->schemaValidate($document_schema))

 				{

 					$retcode->pop();

 

-					if($use_schema_language)

+					if ($use_schema_language)

 					{

 						validate_schema_doc($argv[$i], $domDocument->documentElement);

 					}

@@ -1944,22 +1930,22 @@ 
 					$success = TRUE;

 				}

 

-				if(!$validate_only)

+				if (!$validate_only)

 				{

 					// Generate SQL with the db provider back-ends

 

-					if(function_exists('sys_get_temp_dir'))

+					if (function_exists('sys_get_temp_dir'))

 					{

 						$tmpdir = sys_get_temp_dir();

 					}

 					else

 					{

 						$tmpdir = getenv('TEMP');

-						if(!$tmpdir)

+						if (!$tmpdir)

 						{

 							$tmpdir = getenv('TMP');

 						}

-						if(!$tmpdir)

+						if (!$tmpdir)

 						{

 							$tmpdir = '/tmp';

 						}

@@ -1968,30 +1954,29 @@ 
 

 					global $_SERVER;

 

-					if(!is_array($_SERVER))

+					if (!is_array($_SERVER))

 					{

 						$_SERVER = array();

 					}

 

-					if(!array_key_exists('REMOTE_ADDR', $_SERVER))

+					if (!array_key_exists('REMOTE_ADDR', $_SERVER))

 					{

 						$_SERVER['REMOTE_ADDR'] = '127.0.0.1';

 					}

 

 					$set_db_info_methods =

-						array

-							(

+						array(

 								'mysql'		=> 'setMysqlDBInfo',

 								'mysqli'	=> 'setMysqliDBInfo',

 								'cubrid'	=> 'setCubridDBInfo',

 								'mssql'		=> 'setMssqlDBInfo'

 							);

 

-					foreach($set_db_info_methods as $db_type => $set_info_method)

+					foreach ($set_db_info_methods as $db_type => $set_info_method)

 					{

 						Context::$set_info_method(); // calls setMysqlDBInfo()/setCubridDBInfo()/...

 

-						if($use_schema_language)

+						if ($use_schema_language)

 						{

 							$GLOBALS['__DB__'][$db_type]->queries = '';

 							$GLOBALS['__DB__'][$db_type]->createTableByXmlFile($argv[$i]);

@@ -2010,26 +1995,25 @@ 
 							// copied from classes/db/DB.class.php

 							$oParser = new XmlQueryParser();

 							$args_array =

-								$oParser->parse_xml_query

-									(

+								$oParser->parse_xml_query(

 										pathinfo($argv[$i], PATHINFO_FILENAME), // query id

-										$argv[$i],								// xml file

+										$argv[$i], // xml file

 										$unlink_tmpfile->file_name				// cache file

 									);

 							$args_array = $args_array->queryTag->getArguments();

 

 							$GLOBALS['__DB__'][$db_type]->queries = '';

 							$k = 1;

-							foreach($args_array as $arg)

+							foreach ($args_array as $arg)

 							{

-								if(// why would there be a query arg without a var name ?

+								if (// why would there be a query arg without a var name ?

 										isset($arg->variable_name)

 											&&

 										!array_key_exists($arg->variable_name, $query_user_args))

 								{

-									if(isset($arg->argument_validator))

+									if (isset($arg->argument_validator))

 									{

-										if(FALSE	// some default values are to be parsed by php, some are not...

+										if (FALSE	// some default values are to be parsed by php, some are not...

 													&&

 												isset($arg->argument_validator->default_value)

 													&&

@@ -2040,9 +2024,9 @@ 
 										}

 										else

 										{

-											if($arg->argument_validator->filter)

+											if ($arg->argument_validator->filter)

 											{

-												switch($arg->argument_validator->filter)

+												switch ($arg->argument_validator->filter)

 												{

 													case 'email':

 													case 'email_address':

@@ -2081,18 +2065,17 @@ 
 										}

 									}

 

-									if(!array_key_exists($arg->variable_name, $query_user_args))

+									if (!array_key_exists($arg->variable_name, $query_user_args))

 									{

 										$query_user_args[$arg->variable_name] = sprintf('%06d', $k);

 									}

 

-									if(isset($arg->argument_validator))

+									if (isset($arg->argument_validator))

 									{

-										if(isset($arg->argument_validator->min_length))

+										if (isset($arg->argument_validator->min_length))

 										{

 											$query_user_args[$arg->variable_name] =

-												str_pad

-													(

+												str_pad(

 														$query_user_args[$arg->variable_name],

 														$arg->argument_validator->min_length,

 														isset($arg->argument_validator->filter) &&

@@ -2105,11 +2088,10 @@ 
 													);

 										}

 

-										if(isset($arg->argument_validator->max_length))

+										if (isset($arg->argument_validator->max_length))

 										{

 											$query_user_args[$arg->variable_name] =

-												substr

-													(

+												substr(

 														$query_user_args[$arg->variable_name],

 														0, 

 														$arg->argument_validator->max_length

@@ -2122,15 +2104,14 @@ 
 							}

 

 							$resultset = 

-								$GLOBALS['__DB__'][$db_type]->_executeQuery

-									(

-										$unlink_tmpfile->file_name,		// cache_file

-										(object)$query_user_args,		// source_args

-										basename($argv[$i]),			// query_id

+								$GLOBALS['__DB__'][$db_type]->_executeQuery(

+										$unlink_tmpfile->file_name, // cache_file

+										(object) $query_user_args, // source_args

+										basename($argv[$i]), // query_id

 										array()							// arg_columns

 									);

 

-							if(is_a($resultset, 'Object') && !$resultset->toBool())

+							if (is_a($resultset, 'Object') && !$resultset->toBool())

 							{

 								throw new XmlSchemaError($argv[$i], -1, 'mysql SQL query generation failed');

 							}

@@ -2147,7 +2128,7 @@ 
 				}

 			}

 

-			if(!$success)

+			if (!$success)

 			{

 				libXmlDisplayError($argv[$i], TRUE);

 			}

@@ -2160,7 +2141,7 @@ 
 		}

 		catch (ErrorMessage $exc)

 		{

-			if($retcode->code() == ReturnCode::RETCODE_SUCCESS)

+			if ($retcode->code() == ReturnCode::RETCODE_SUCCESS)

 			{

 				$retcode->code(ReturnCode::RETCODE_VALIDATOR_INTERNAL);

 			}

@@ -2170,7 +2151,7 @@ 
 		}

 		catch (ErrorException $exc)

 		{

-			if($retcode->code() == ReturnCode::RETCODE_SUCCESS)

+			if ($retcode->code() == ReturnCode::RETCODE_SUCCESS)

 			{

 				$retcode->code(ReturnCode::RETCODE_VALIDATOR_INTERNAL);

 			}

@@ -2194,21 +2175,21 @@ 
 catch (SyntaxError $syntax)

 {

 	fwrite(STDERR, $syntax->getMessage() . "\n");

-	exit(254);	// wrong command line

+	exit(254); // wrong command line

 				// 255 is reserved by php (for parse errors, etc.)

 }

 catch (ErrorMessage $exc)

 {

 	fwrite(STDERR, $exc->getMessage() . "\n");

 	libXmlDisplayError();

-	exit(ReturnCode::RETCODE_VALIDATOR_INTERNAL);		// internal validator error

+	exit(ReturnCode::RETCODE_VALIDATOR_INTERNAL); // internal validator error

 }

 catch (Exception $exc)

 {

 	fwrite(STDERR, $exc->getFile() . '(' . $exc->getLine() . ")\n\t" . $exc->getMessage() . "\n");

 	fwrite(STDERR, $exc->getTraceAsString());

 	libXmlDisplayError();

-	exit(ReturnCode::RETCODE_VALIDATOR_INTERNAL);		// internal validator error

+	exit(ReturnCode::RETCODE_VALIDATOR_INTERNAL); // internal validator error

 }

 

 /* End of file validate.php */

Braces +33 added lines, -66 removed lines

@@ -150,13 +150,11 @@ 
 		if($throw_error)

 		{

 			throw new ErrorMessage($msg);

-		}

-		else

+		} else

 		{

 			fwrite(STDERR, $msg . "\n");

 		}

-	}

-	else

+	} else

 	{

 		if($throw_error)

 		{

@@ -346,8 +344,7 @@ 
 					"\nANSI SQL-99 declares the table specification as required."

 				);

 		}

-	}

-	else

+	} else

 	{

 		// base table or view

 

@@ -369,13 +366,11 @@ 
 									$child_node->getLineNo(),

 									'Duplicate <conditions> elements.'

 								);

-						}

-						else

+						} else

 						{

 							$has_conditions_element = TRUE;

 						}

-					}

-					else

+					} else

 					{

 						throw

 							new XmlSchemaError(

@@ -396,8 +391,7 @@ 
 						'Expected <conditions> element as content.'

 					);

 			}

-		}

-		else

+		} else

 		{

 			foreach($table_element->childNodes as $child_node)

 			{

@@ -609,8 +603,7 @@ 
 			if($first_child)

 			{

 				$first_child = FALSE;

-			}

-			else

+			} else

 			{

 				if(!$child_node->hasAttribute('pipe'))

 				{

@@ -629,14 +622,12 @@ 
 			if($child_node->tagName == 'group')

 			{

 				checkConditionsGroup($xml_file, $child_node);

-			}

-			else

+			} else

 			{

 				if($child_node->tagName == 'query')

 				{

 					validate_select_query($xml_file, $child_node);

-				}

-				else

+				} else

 				{

 					if($child_node->tagName == 'condition')

 					{

@@ -851,8 +842,7 @@ 
 			try

 			{

 				$success = chdir($this->dirname);

-			}

-			catch (Exception $e)

+			} catch (Exception $e)

 			{

 				print "Failed to restore working dir {$this->dirname}.";

 			}

@@ -921,8 +911,7 @@ 
 		if($lowercase_name[$i] != $uppercase_name[$i])

 		{

 			$varing_case_filename .= "[{$lowercase_name[$i]}{$uppercase_name[$i]}]";

-		}

-		else

+		} else

 		{

 			$varing_case_filename .= $lowercase_name[$i];

 		}

@@ -1119,8 +1108,7 @@ 
 		if($val == -1)

 		{

 			return $this->exit_code;

-		}

-		else

+		} else

 		{

 			if($this->exit_code < $val)

 			{

@@ -1488,8 +1476,7 @@ 
 				if(self::$db_info)

 				{

 					return self::$db_info->master_db['db_type'];

-				}

-				else

+				} else

 				{

 					return NULL;

 				}

@@ -1588,8 +1575,7 @@ 
 							&&

 						array_key_exists($db_info->master_db['db_type'], $GLOBALS['__DB__']))

 				{

-				}

-				else

+				} else

 				{

 					$GLOBALS['__DB__'][$db_info->master_db['db_type']] =

 						new DBMysqlConnectWrapper();

@@ -1630,8 +1616,7 @@ 
 							&&

 						array_key_exists($db_info->master_db['db_type'], $GLOBALS['__DB__']))

 				{

-				}

-				else

+				} else

 				{

 					$GLOBALS['__DB__'][$db_info->master_db['db_type']] =

 						new DBMysqliConnectWrapper();

@@ -1672,8 +1657,7 @@ 
 							&&

 						array_key_exists($db_info->master_db['db_type'], $GLOBALS['__DB__']))

 				{

-				}

-				else

+				} else

 				{

 					$GLOBALS['__DB__'][$db_info->master_db['db_type']] =

 						new DBCubridConnectWrapper();

@@ -1714,8 +1698,7 @@ 
 							&&

 						array_key_exists($db_info->master_db['db_type'], $GLOBALS['__DB__']))

 				{

-				}

-				else

+				} else

 				{

 					$GLOBALS['__DB__'][$db_info->master_db['db_type']] =

 						new DBMssqlConnectWrapper();

@@ -1812,22 +1795,19 @@ 
 			try

 			{

 				$query_user_args = require($query_args_file);

-			}

-			catch (Exception $exc)

+			} catch (Exception $exc)

 			{

 				fwrite(STDERR, "Error in arguments file.\n");

 				throw $exc;

 			}

-		}

-		else

+		} else

 		{

 			if($query_args)

 			{

 				try

 				{

 					eval('$query_user_args = array(' . $query_args . ');');

-				}

-				catch (Exception $exc)

+				} catch (Exception $exc)

 				{

 					fwrite(STDERR, "Error in arguments string.\n");

 					throw $exc;

@@ -1919,8 +1899,7 @@ 
 				if($use_schema_language)

 				{

 					$document_schema = $table_schema;

-				}

-				else

+				} else

 				{

 					if(!$document_schema)

 					{

@@ -1936,8 +1915,7 @@ 
 					if($use_schema_language)

 					{

 						validate_schema_doc($argv[$i], $domDocument->documentElement);

-					}

-					else

+					} else

 					{

 						validate_xml_query($argv[$i], $domDocument->documentElement);

 					}

@@ -1951,8 +1929,7 @@ 
 					if(function_exists('sys_get_temp_dir'))

 					{

 						$tmpdir = sys_get_temp_dir();

-					}

-					else

+					} else

 					{

 						$tmpdir = getenv('TEMP');

 						if(!$tmpdir)

@@ -2001,8 +1978,7 @@ 
 							print " {$db_type} query:\n";

 							print $GLOBALS['__DB__'][$db_type]->queries;

 							print "\n";

-						}

-						else

+						} else

 						{

 							$unlink_tmpfile =

 								new UnlinkFile(tempnam($tmpdir, 'xe_'));

@@ -2037,8 +2013,7 @@ 
 										{

 											$query_user_args[$arg->variable_name] =

 												eval('return ' . $arg->argument_validator->default_value->toString() . ';');

-										}

-										else

+										} else

 										{

 											if($arg->argument_validator->filter)

 											{

@@ -2133,8 +2108,7 @@ 
 							if(is_a($resultset, 'Object') && !$resultset->toBool())

 							{

 								throw new XmlSchemaError($argv[$i], -1, 'mysql SQL query generation failed');

-							}

-							else

+							} else

 							{

 								print "\n";

 								print pathinfo($argv[$i], PATHINFO_FILENAME);

@@ -2151,14 +2125,12 @@ 
 			{

 				libXmlDisplayError($argv[$i], TRUE);

 			}

-		}

-		catch (XmlSchemaError $exc)

+		} catch (XmlSchemaError $exc)

 		{

 			$retcode->code(ReturnCode::RETCODE_BUILTIN_CHECKS);

 

 			fwrite(STDERR, $exc->getMessage() . "\n");

-		}

-		catch (ErrorMessage $exc)

+		} catch (ErrorMessage $exc)

 		{

 			if($retcode->code() == ReturnCode::RETCODE_SUCCESS)

 			{

@@ -2167,8 +2139,7 @@ 
 

 			fwrite(STDERR, $exc->getMessage() . "\n");

 			libXmlDisplayError($argv[$i]);

-		}

-		catch (ErrorException $exc)

+		} catch (ErrorException $exc)

 		{

 			if($retcode->code() == ReturnCode::RETCODE_SUCCESS)

 			{

@@ -2178,8 +2149,7 @@ 
 			fwrite(STDERR, "{$exc->getFile()}({$exc->getLine()}):\n\t{$exc->getMessage()}.\n");

 			fwrite(STDERR, $exc->getTraceAsString());

 			libXmlDisplayError($argv[$i]);

-		}

-		catch (Exception $exc)

+		} catch (Exception $exc)

 		{

 			$retcode->code(ReturnCode::RETCODE_VALIDATOR_INTERNAL);

 

@@ -2190,20 +2160,17 @@ 
 	}

 

 	exit($retcode->code());

-}

-catch (SyntaxError $syntax)

+} catch (SyntaxError $syntax)

 {

 	fwrite(STDERR, $syntax->getMessage() . "\n");

 	exit(254);	// wrong command line

 				// 255 is reserved by php (for parse errors, etc.)

-}

-catch (ErrorMessage $exc)

+} catch (ErrorMessage $exc)

 {

 	fwrite(STDERR, $exc->getMessage() . "\n");

 	libXmlDisplayError();

 	exit(ReturnCode::RETCODE_VALIDATOR_INTERNAL);		// internal validator error

-}

-catch (Exception $exc)

+} catch (Exception $exc)

 {

 	fwrite(STDERR, $exc->getFile() . '(' . $exc->getLine() . ")\n\t" . $exc->getMessage() . "\n");

 	fwrite(STDERR, $exc->getTraceAsString());

tools/minify/cssmin/CSSmin.php

Doc Comments +11 added lines, -2 removed lines

@@ -606,6 +606,11 @@ 
  * ---------------------------------------------------------------------------------------------
  */
 
+/**
+ * @param double $v1
+ * @param double $v2
+ * @param integer $vh
+ */
 private function hue_to_rgb($v1, $v2, $vh)
 {
 	$vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh);
@@ -620,6 +625,10 @@ 
 	return intval(floor(floatval($n) + 0.5), 10);
 }
 
+/**
+ * @param integer $min
+ * @param integer $max
+ */
 private function clamp_number($n, $min, $max)
 {
 	return min(max($n, $min), $max);
@@ -648,7 +657,7 @@ 
  *
  * @param string   $str
  * @param int      $from index
- * @param int|bool $to index (optional)
+ * @param integer $to index (optional)
  * @return string
  */
 private function substring($str, $from = 0, $to = FALSE)
@@ -680,7 +689,7 @@ 
  *
  * @param string   $str
  * @param int      $start index
- * @param int|bool $end index (optional)
+ * @param integer $end index (optional)
  * @return string
  */
 private function str_slice($str, $start = 0, $end = FALSE)

Spacing +15 added lines, -15 removed lines

@@ -47,7 +47,7 @@ 
 		$this->memory_limit = 128 * 1048576; // 128MB in bytes
 		$this->max_execution_time = 60; // 1 min
 		$this->pcre_backtrack_limit = 1000 * 1000;
-		$this->pcre_recursion_limit =  500 * 1000;
+		$this->pcre_recursion_limit = 500 * 1000;
 
 		$this->raise_php_limits = (bool) $raise_php_limits;
 	}
@@ -91,7 +91,7 @@ 
 	}
 
 	// preserve strings so their content doesn't get accidentally minified
-	$css = preg_replace_callback('/(?:"(?:[^\\\\"]|\\\\.|\\\\)*")|'."(?:'(?:[^\\\\']|\\\\.|\\\\)*')/S", array($this, 'replace_string'), $css);
+	$css = preg_replace_callback('/(?:"(?:[^\\\\"]|\\\\.|\\\\)*")|' . "(?:'(?:[^\\\\']|\\\\.|\\\\)*')/S", array($this, 'replace_string'), $css);
 
 	// Let's divide css code in chunks of 25.000 chars aprox.
 	// Reason: PHP's PCRE functions like preg_replace have a "backtrack limit"
@@ -229,8 +229,8 @@ 
 			$token_tring = self::TOKEN . (count($this->preserved_tokens) - 1) . '___';
 			$css = preg_replace($placeholder, $token_tring, $css, 1);
 			// Preserve new lines for /*! important comments
-			$css = preg_replace('/\s*[\n\r\f]+\s*(\/\*'. $token_tring .')/S', self::NL.'$1', $css);
-			$css = preg_replace('/('. $token_tring .'\*\/)\s*[\n\r\f]+\s*/S', '$1'.self::NL, $css);
+			$css = preg_replace('/\s*[\n\r\f]+\s*(\/\*' . $token_tring . ')/S', self::NL . '$1', $css);
+			$css = preg_replace('/(' . $token_tring . '\*\/)\s*[\n\r\f]+\s*/S', '$1' . self::NL, $css);
 			continue;
 		}
 
@@ -238,10 +238,10 @@ 
 		// shorten that to /*\*/ and the next one to /**/
 		if (substr($token, (strlen($token) - 1), 1) === '\\') {
 			$this->preserved_tokens[] = '\\';
-			$css = preg_replace($placeholder,  self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1);
+			$css = preg_replace($placeholder, self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1);
 			$i = $i + 1; // attn: advancing the loop
 			$this->preserved_tokens[] = '';
-			$css = preg_replace('/' . self::COMMENT . $i . '___/',  self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1);
+			$css = preg_replace('/' . self::COMMENT . $i . '___/', self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1);
 			continue;
 		}
 
@@ -252,7 +252,7 @@ 
 			if ($start_index > 2) {
 				if (substr($css, $start_index - 3, 1) === '>') {
 					$this->preserved_tokens[] = '';
-					$css = preg_replace($placeholder,  self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1);
+					$css = preg_replace($placeholder, self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1);
 				}
 			}
 		}
@@ -366,7 +366,7 @@ 
 					$css = preg_replace('/;;+/', ';', $css);
 
 					// Restore new lines for /*! important comments
-					$css = preg_replace('/'. self::NL .'/', "\n", $css);
+					$css = preg_replace('/' . self::NL . '/', "\n", $css);
 
 					// restore preserved comments and strings
 					for ($i = 0, $max = count($this->preserved_tokens); $i < $max; $i++) {
@@ -410,7 +410,7 @@ 
 			$terminator = ')';
 		}
 
-		while ($found_terminator === FALSE && $end_index+1 <= $max_index) {
+		while ($found_terminator === FALSE && $end_index + 1 <= $max_index) {
 			$end_index = $this->index_of($css, $terminator, $end_index + 1);
 
 			// endIndex == 0 doesn't really apply here
@@ -554,7 +554,7 @@ 
 			private function rgb_to_hex($matches)
 			{
 			// Support for percentage values rgb(100%, 0%, 45%);
-			if ($this->index_of($matches[1], '%') >= 0){
+			if ($this->index_of($matches[1], '%') >= 0) {
 				$rgbcolors = explode(',', str_replace('%', '', $matches[1]));
 				for ($i = 0; $i < count($rgbcolors); $i++) {
 					$rgbcolors[$i] = $this->round_number(floatval($rgbcolors[$i]) * 2.55);
@@ -570,7 +570,7 @@ 
 			}
 
 			// Fix for issue #2528093
-			if (!preg_match('/[\s\,\);\}]/', $matches[2])){
+			if (!preg_match('/[\s\,\);\}]/', $matches[2])) {
 				$matches[2] = ' ' . $matches[2];
 			}
 
@@ -594,12 +594,12 @@ 
 	} else {
 		$v2 = $l < 0.5 ? $l * (1 + $s) : ($l + $s) - ($s * $l);
 		$v1 = (2 * $l) - $v2;
-		$r = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h + (1/3)));
+		$r = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h + (1 / 3)));
 		$g = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h));
-		$b = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h - (1/3)));
+		$b = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h - (1 / 3)));
 	}
 
-	return $this->rgb_to_hex(array('', $r.','.$g.','.$b, $matches[2]));
+	return $this->rgb_to_hex(array('', $r . ',' . $g . ',' . $b, $matches[2]));
 }
 
 /* HELPERS
@@ -611,7 +611,7 @@ 
 	$vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh);
 	if ($vh * 6 < 1) return $v1 + ($v2 - $v1) * 6 * $vh;
 	if ($vh * 2 < 1) return $v2;
-	if ($vh * 3 < 2) return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6;
+	if ($vh * 3 < 2) return $v1 + ($v2 - $v1) * ((2 / 3) - $vh) * 6;
 	return $v1;
 }
 

Braces +9 added lines, -3 removed lines

@@ -609,9 +609,15 @@
 private function hue_to_rgb($v1, $v2, $vh)
 {
 	$vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh);
-	if ($vh * 6 < 1) return $v1 + ($v2 - $v1) * 6 * $vh;
-	if ($vh * 2 < 1) return $v2;
-	if ($vh * 3 < 2) return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6;
+	if ($vh * 6 < 1) {
+		return $v1 + ($v2 - $v1) * 6 * $vh;
+	}
+	if ($vh * 2 < 1) {
+		return $v2;
+	}
+	if ($vh * 3 < 2) {
+		return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6;
+	}
 	return $v1;
 }