xpressengine / xe-core

modules/point/point.controller.php

Doc Comments +1 added lines

@@ -478,6 +478,7 @@
 
 	/**
 	 * @brief Set points
+	 * @param string $mode
 	 */
 	function setPoint($member_srl, $point, $mode = null)
 	{

Spacing +105 added lines, -105 removed lines

@@ -31,7 +31,7 @@ 
 		$point = $config->signup_point;
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point, 'signup');
+		$this->setPoint($member_srl, $cur_point, 'signup');
 
 		return new Object();
 	}
@@ -42,9 +42,9 @@ 
 	function triggerAfterLogin(&$obj)
 	{
 		$member_srl = $obj->member_srl;
-		if(!$member_srl) return new Object();
+		if (!$member_srl) return new Object();
 		// If the last login is not today, give the points
-		if(substr($obj->last_login,0,8)==date("Ymd")) return new Object();
+		if (substr($obj->last_login, 0, 8) == date("Ymd")) return new Object();
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -55,7 +55,7 @@ 
 		$point = $config->login_point;
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new Object();
 	}
@@ -66,30 +66,30 @@ 
 	function triggerInsertDocument(&$obj)
 	{
 		$oDocumentModel = getModel('document');
-		if($obj->status != $oDocumentModel->getConfigStatus('temp'))
+		if ($obj->status != $oDocumentModel->getConfigStatus('temp'))
 		{
 			$module_srl = $obj->module_srl;
 			$member_srl = $obj->member_srl;
-			if(!$module_srl || !$member_srl) return new Object();
+			if (!$module_srl || !$member_srl) return new Object();
 			// The fix to disable giving points for saving the document temporarily
-			if($module_srl == $member_srl) return new Object();
+			if ($module_srl == $member_srl) return new Object();
 			// Get the point module information
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('point');
-			$module_config = $oModuleModel->getModulePartConfig('point',$module_srl);
+			$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
 			// Get the points of the member
 			$oPointModel = getModel('point');
 			$cur_point = $oPointModel->getPoint($member_srl, true);
 
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
 			$cur_point += $point;
 			// Add points for attaching a file
 			$point = $module_config['upload_file'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-			if($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
+			if ($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
 			// Increase the point
-			$this->setPoint($member_srl,$cur_point);
+			$this->setPoint($member_srl, $cur_point);
 		}
 
 		return new Object();
@@ -106,24 +106,24 @@ 
 		$oDocument = $oDocumentModel->getDocument($document_srl);
 
 		// if status is TEMP or PUBLIC... give not point, only status is empty
-		if($oDocument->get('status') == $oDocumentModel->getConfigStatus('temp') && $obj->status != $oDocumentModel->getConfigStatus('temp'))
+		if ($oDocument->get('status') == $oDocumentModel->getConfigStatus('temp') && $obj->status != $oDocumentModel->getConfigStatus('temp'))
 		{
 			$oModuleModel = getModel('module');
 
 			// Get the point module information
 			$config = $oModuleModel->getModuleConfig('point');
-			$module_config = $oModuleModel->getModulePartConfig('point',$obj->module_srl);
+			$module_config = $oModuleModel->getModulePartConfig('point', $obj->module_srl);
 			// Get the points of the member
 			$oPointModel = getModel('point');
 			$cur_point = $oPointModel->getPoint($oDocument->get('member_srl'), true);
 
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
 			$cur_point += $point;
 			// Add points for attaching a file
 			$point = $module_config['upload_file'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-			if($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
+			if ($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
 			// Increase the point
 			$this->setPoint($oDocument->get('member_srl'), $cur_point);
 		}
@@ -141,42 +141,42 @@ 
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists()) return new Object();
+		if (!$oDocument->isExists()) return new Object();
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
-		$module_config = $oModuleModel->getModulePartConfig('point',$oDocument->get('module_srl'));
+		$module_config = $oModuleModel->getModulePartConfig('point', $oDocument->get('module_srl'));
 		// The process related to clearing the post comments
 		$comment_point = $module_config['insert_comment'];
-		if(strlen($comment_point) == 0 && !is_int($comment_point)) $comment_point = $config->insert_comment;
+		if (strlen($comment_point) == 0 && !is_int($comment_point)) $comment_point = $config->insert_comment;
 		// If there are comment points, attempt to deduct
-		if($comment_point>0) return new Object();
+		if ($comment_point > 0) return new Object();
 		// Get all the comments related to this post
 		$cp_args = new stdClass();
 		$cp_args->document_srl = $document_srl;
 		$output = executeQueryArray('point.getCommentUsers', $cp_args);
 		// Return if there is no object
-		if(!$output->data) return new Object();
+		if (!$output->data) return new Object();
 		// Organize the member number
 		$member_srls = array();
 		$cnt = count($output->data);
-		for($i=0;$i<$cnt;$i++)
+		for ($i = 0; $i < $cnt; $i++)
 		{
-			if($output->data[$i]->member_srl<1) continue;
+			if ($output->data[$i]->member_srl < 1) continue;
 			$member_srls[abs($output->data[$i]->member_srl)] = $output->data[$i]->count;
 		}
 		// Remove the member number who has written the original post
-		if($member_srl) unset($member_srls[abs($member_srl)]);
-		if(!count($member_srls)) return new Object();
+		if ($member_srl) unset($member_srls[abs($member_srl)]);
+		if (!count($member_srls)) return new Object();
 		// Remove all the points for each member
 		$oPointModel = getModel('point');
 		// Get the points
 		$point = $module_config['download_file'];
-		foreach($member_srls as $member_srl => $cnt)
+		foreach ($member_srls as $member_srl => $cnt)
 		{
 			$cur_point = $oPointModel->getPoint($member_srl, true);
 			$cur_point -= $cnt * $comment_point;
-			$this->setPoint($member_srl,$cur_point);
+			$this->setPoint($member_srl, $cur_point);
 		}
 
 		return new Object();
@@ -189,15 +189,15 @@ 
 	{
 		$oDocumentModel = getModel('document');
 		
-		if($obj->status != $oDocumentModel->getConfigStatus('temp'))
+		if ($obj->status != $oDocumentModel->getConfigStatus('temp'))
 		{
 			$module_srl = $obj->module_srl;
 			$member_srl = $obj->member_srl;
 			// The process related to clearing the post object
-			if(!$module_srl || !$member_srl) return new Object();
+			if (!$module_srl || !$member_srl) return new Object();
 			// Run only when logged in
 			$logged_info = Context::get('logged_info');
-			if(!$logged_info->member_srl) return new Object();
+			if (!$logged_info->member_srl) return new Object();
 			// Get the points of the member
 			$oPointModel = getModel('point');
 			$cur_point = $oPointModel->getPoint($member_srl, true);
@@ -207,16 +207,16 @@ 
 			$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
 	
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
 			// if the point is set to decrease when writing a document, make sure it does not increase the points when deleting an article
-			if($point < 0) return new Object();
+			if ($point < 0) return new Object();
 			$cur_point -= $point;
 			// Add points related to deleting an attachment
 			$point = $module_config['upload_file'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-			if($obj->uploaded_count) $cur_point -= $point * $obj->uploaded_count;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
+			if ($obj->uploaded_count) $cur_point -= $point * $obj->uploaded_count;
 			// Increase the point
-			$this->setPoint($member_srl,$cur_point);
+			$this->setPoint($member_srl, $cur_point);
 		}
 
 		return new Object();
@@ -229,12 +229,12 @@ 
 	{
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new Object();
+		if (!$module_srl || !$member_srl) return new Object();
 		// Do not increase the points if the member is the author of the post
 		$document_srl = $obj->document_srl;
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists() || abs($oDocument->get('member_srl'))==abs($member_srl)) return new Object();
+		if (!$oDocument->isExists() || abs($oDocument->get('member_srl')) == abs($member_srl)) return new Object();
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -244,10 +244,10 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['insert_comment'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
+		if (strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new Object();
 	}
@@ -264,11 +264,11 @@ 
 		$module_srl = $obj->module_srl;
 		$member_srl = abs($obj->member_srl);
 		$document_srl = $obj->document_srl;
-		if(!$module_srl || !$member_srl) return new Object();
+		if (!$module_srl || !$member_srl) return new Object();
 		// Get the original article (if the original article is missing or if the member is its author, do not apply the points)
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists()) return new Object();
-		if($oDocument->get('member_srl')==$member_srl) return new Object();
+		if (!$oDocument->isExists()) return new Object();
+		if ($oDocument->get('member_srl') == $member_srl) return new Object();
 		// Get the point module information
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
@@ -276,12 +276,12 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['insert_comment'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
+		if (strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
 		// if the point is set to decrease when writing a comment, make sure it does not increase the points when deleting a comment
-		if($point < 0) return new Object();
+		if ($point < 0) return new Object();
 		// Increase the point
 		$cur_point -= $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new Object();
 	}
@@ -301,11 +301,11 @@ 
 	 */
 	function triggerDeleteFile(&$obj)
 	{
-		if($obj->isvalid != 'Y') return new Object();
+		if ($obj->isvalid != 'Y') return new Object();
 
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new Object();
+		if (!$module_srl || !$member_srl) return new Object();
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -315,10 +315,10 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['upload_file'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
+		if (strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
 		// Increase the point
 		$cur_point -= $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new Object();
 	}
@@ -331,17 +331,17 @@ 
 		$logged_info = Context::get('logged_info');
 		$member_srl = $logged_info->member_srl;
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new Object();
+		if (!$module_srl) return new Object();
 		// Pass if it is your file
-		if(abs($obj->member_srl) == abs($member_srl)) return new Object();
+		if (abs($obj->member_srl) == abs($member_srl)) return new Object();
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
 		// If it is set not to allow downloading for non-logged in users, do not permit
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
-			if($config->disable_download == 'Y' && strlen($module_config['download_file']) == 0 && !is_int($module_config['download_file'])) return new Object(-1,'msg_not_permitted_download');
+			if ($config->disable_download == 'Y' && strlen($module_config['download_file']) == 0 && !is_int($module_config['download_file'])) return new Object(-1, 'msg_not_permitted_download');
 			else return new Object();
 		}
 		// Get the points of the member
@@ -349,9 +349,9 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 		// Get the points
 		$point = $module_config['download_file'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->download_file;
+		if (strlen($point) == 0 && !is_int($point)) $point = $config->download_file;
 		// If points are less than 0, and if downloading a file is not allowed in this case, give an errors
-		if($cur_point + $point < 0 && $config->disable_download == 'Y') return new Object(-1,'msg_cannot_download');
+		if ($cur_point + $point < 0 && $config->disable_download == 'Y') return new Object(-1, 'msg_cannot_download');
 
 		return new Object();
 	}
@@ -363,12 +363,12 @@ 
 	{
 		// Run only when logged in
 		$logged_info = Context::get('logged_info');
-		if(!$logged_info->member_srl) return new Object();
+		if (!$logged_info->member_srl) return new Object();
 		$module_srl = $obj->module_srl;
 		$member_srl = $logged_info->member_srl;
-		if(!$module_srl) return new Object();
+		if (!$module_srl) return new Object();
 		// Pass if it is your file
-		if(abs($obj->member_srl) == abs($member_srl)) return new Object();
+		if (abs($obj->member_srl) == abs($member_srl)) return new Object();
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -378,10 +378,10 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 		// Get the points
 		$point = $module_config['download_file'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->download_file;
+		if (strlen($point) == 0 && !is_int($point)) $point = $config->download_file;
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new Object();
 	}
@@ -400,22 +400,22 @@ 
 		// Get the original author number
 		$target_member_srl = abs($obj->get('member_srl'));
 		// Pass without increasing the hits if the viewer is the same as the author
-		if($target_member_srl == $member_srl) return new Object();
+		if ($target_member_srl == $member_srl) return new Object();
 		// Get the point information for each module
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $obj->get('module_srl'));
 		// Get hits points
 		$point = $module_config['read_document'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->read_document;
+		if (strlen($point) == 0 && !is_int($point)) $point = $config->read_document;
 		// Pass if there are no requested points
-		if(!$point) return new Object();
+		if (!$point) return new Object();
 		// In case of a registered member, if it is read but cannot just pass, then get the current points
-		if($member_srl)
+		if ($member_srl)
 		{
 			$args->member_srl = $member_srl;
 			$args->document_srl = $obj->document_srl;
 			$output = executeQuery('document.getDocumentReadedLogInfo', $args);
-			if($output->data->count) return new Object();
+			if ($output->data->count) return new Object();
 			$cur_point = $oPointModel->getPoint($member_srl, true);
 		}
 		else
@@ -426,7 +426,7 @@ 
 		$config = $oModuleModel->getModuleConfig('point');
 		// When the requested points are negative, compared it with the current point
 		$_SESSION['banned_document'][$obj->document_srl] = false;
-		if($config->disable_read_document == 'Y' && $point < 0 && abs($point)>$cur_point)
+		if ($config->disable_read_document == 'Y' && $point < 0 && abs($point) > $cur_point)
 		{
 			$message = sprintf(Context::getLang('msg_disallow_by_point'), abs($point), $cur_point);
 			$obj->add('content', $message);
@@ -434,14 +434,14 @@ 
 			return new Object(-1, $message);
 		}
 		// If not logged in, pass
-		if(!$logged_info->member_srl) return new Object();
+		if (!$logged_info->member_srl) return new Object();
 		// Pass, if there are no requested points
-		if(!$point) return new Object();
+		if (!$point) return new Object();
 		// If the read record is missing, leave it
 		$output = executeQuery('document.insertDocumentReadedLog', $args);
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new Object();
 	}
@@ -453,7 +453,7 @@ 
 	{
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new Object();
+		if (!$module_srl || !$member_srl) return new Object();
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -462,21 +462,21 @@ 
 		$oPointModel = getModel('point');
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
-		if( $obj->point > 0 )
+		if ($obj->point > 0)
 		{
 			$point = $module_config['voted'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->voted;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->voted;
 		}
 		else
 		{
 			$point = $module_config['blamed'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->blamed;
+			if (strlen($point) == 0 && !is_int($point)) $point = $config->blamed;
 		}
 
-		if(!$point) return new Object();
+		if (!$point) return new Object();
 		// Increase the point
 		$cur_point += $point;
-		$this->setPoint($member_srl,$cur_point);
+		$this->setPoint($member_srl, $cur_point);
 
 		return new Object();
 	}
@@ -488,7 +488,7 @@ 
 	{
 		$member_srl = abs($member_srl);
 		$mode_arr = array('add', 'minus', 'update', 'signup');
-		if(!$mode || !in_array($mode,$mode_arr)) $mode = 'update';
+		if (!$mode || !in_array($mode, $mode_arr)) $mode = 'update';
 
 		// Get configuration information
 		$oMemberModel = getModel('member');
@@ -505,7 +505,7 @@ 
 		$args->member_srl = $member_srl;
 		$args->point = $current_point;
 
-		switch($mode)
+		switch ($mode)
 		{
 			case 'add' :
 				$args->point += $point;
@@ -518,7 +518,7 @@ 
 				$args->point = $point;
 				break;
 		}
-		if($args->point < 0) $args->point = 0;
+		if ($args->point < 0) $args->point = 0;
 		$point = $args->point;
 
 		// Call a trigger (before)
@@ -529,7 +529,7 @@ 
 		$trigger_obj->current_level = $current_level;
 		$trigger_obj->set_point = $point;
 		$trigger_output = ModuleHandler::triggerCall('point.setPoint', 'before', $trigger_obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			return $trigger_output;
 		}
@@ -540,19 +540,19 @@ 
 
 		// If there are points, update, if no, insert
 		$oPointModel = getModel('point');
-		if($oPointModel->isExistsPoint($member_srl)) executeQuery("point.updatePoint", $args);
+		if ($oPointModel->isExistsPoint($member_srl)) executeQuery("point.updatePoint", $args);
 		else executeQuery("point.insertPoint", $args);
 
 		// Get a new level
 		$level = $oPointModel->getLevel($point, $config->level_step);
 
 		// If existing level and a new one are different attempt to set a point group
-		if($level != $current_level)
+		if ($level != $current_level)
 		{
 			// Check if the level, for which the current points are prepared, is calculate and set the correct group
 			$point_group = $config->point_group;
 			// If the point group exists
-			if($point_group && is_array($point_group) && count($point_group) )
+			if ($point_group && is_array($point_group) && count($point_group))
 			{
 				// Get the default group
 				$default_group = $oMemberModel->getDefaultGroup();
@@ -562,29 +562,29 @@ 
 
 				asort($point_group);
 				// Reset group after initialization
-				if($config->group_reset != 'N')
+				if ($config->group_reset != 'N')
 				{
 					// If the new level is in the right group
-					if(in_array($level, $point_group))
+					if (in_array($level, $point_group))
 					{
 						// Delete all groups except the one which the current level belongs to
-						foreach($point_group as $group_srl => $target_level)
+						foreach ($point_group as $group_srl => $target_level)
 						{
 							$del_group_list[] = $group_srl;
-							if($target_level == $level) $new_group_list[] = $group_srl;
+							if ($target_level == $level) $new_group_list[] = $group_srl;
 						}
 					}
 					// Otherwise, in case the level is reduced, add the recent group
 					else
 					{
 						$i = $level;
-						while($i > 0)
+						while ($i > 0)
 						{
-							if(in_array($i, $point_group))
+							if (in_array($i, $point_group))
 							{
-								foreach($point_group as $group_srl => $target_level)
+								foreach ($point_group as $group_srl => $target_level)
 								{
-									if($target_level == $i)
+									if ($target_level == $i)
 									{
 										$new_group_list[] = $group_srl;
 									}
@@ -595,9 +595,9 @@ 
 						}
 					}
 					// Delete the group of a level which is higher than the current level
-					foreach($point_group as $group_srl => $target_level)
+					foreach ($point_group as $group_srl => $target_level)
 					{
-						if($target_level > $level) $del_group_list[] = $group_srl;
+						if ($target_level > $level) $del_group_list[] = $group_srl;
 					}
 					$del_group_list[] = $default_group->group_srl;
 				}
@@ -605,16 +605,16 @@ 
 				else
 				{
 					// Check until the current level by rotating setting the configurations of the point groups
-					foreach($point_group as $group_srl => $target_level)
+					foreach ($point_group as $group_srl => $target_level)
 					{
 						$del_group_list[] = $group_srl;
-						if($target_level <= $level) $new_group_list[] = $group_srl;
+						if ($target_level <= $level) $new_group_list[] = $group_srl;
 					}
 				}
 				// If there is no a new group, granted the default group
-				if(!$new_group_list[0]) $new_group_list[0] = $default_group->group_srl;
+				if (!$new_group_list[0]) $new_group_list[0] = $default_group->group_srl;
 				// Remove linkage group
-				if($del_group_list && count($del_group_list))
+				if ($del_group_list && count($del_group_list))
 				{
 					$del_group_args = new stdClass;
 					$del_group_args->member_srl = $member_srl;
@@ -622,7 +622,7 @@ 
 					$del_group_output = executeQuery('point.deleteMemberGroup', $del_group_args);
 				}
 				// Grant a new group
-				foreach($new_group_list as $group_srl)
+				foreach ($new_group_list as $group_srl)
 				{
 					$new_group_args = new stdClass;
 					$new_group_args->member_srl = $member_srl;
@@ -637,7 +637,7 @@ 
 		$trigger_obj->del_group_list = $del_group_list;
 		$trigger_obj->new_level = $level;
 		$trigger_output = ModuleHandler::triggerCall('point.setPoint', 'after', $trigger_obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			$oDB->rollback();
 			return $trigger_output;
@@ -653,17 +653,17 @@ 
 		FileHandler::writeFile($cache_filename, $point);
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($new_group_list && $del_group_list && $oCacheHandler->isSupport())
+		if ($new_group_list && $del_group_list && $oCacheHandler->isSupport())
 		{
-			$object_key = 'member_groups:' . getNumberingPath($member_srl) . $member_srl . '_0';
+			$object_key = 'member_groups:'.getNumberingPath($member_srl).$member_srl.'_0';
 			$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
 			$oCacheHandler->delete($cache_key);
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($new_group_list && $del_group_list && $oCacheHandler->isSupport())
+		if ($new_group_list && $del_group_list && $oCacheHandler->isSupport())
 		{
-			$object_key = 'member_info:' . getNumberingPath($member_srl) . $member_srl;
+			$object_key = 'member_info:'.getNumberingPath($member_srl).$member_srl;
 			$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
 			$oCacheHandler->delete($cache_key);
 		}
@@ -677,9 +677,9 @@ 
 		$pointConfig = $oModuleModel->getModulePartConfig('point', $obj->originModuleSrl);
 
 		$oModuleController = getController('module');
-		if(is_array($obj->moduleSrlList))
+		if (is_array($obj->moduleSrlList))
 		{
-			foreach($obj->moduleSrlList AS $key=>$moduleSrl)
+			foreach ($obj->moduleSrlList AS $key=>$moduleSrl)
 			{
 				$oModuleController->insertModulePartConfig('point', $moduleSrl, $pointConfig);
 			}

Braces +186 added lines, -66 removed lines

@@ -42,9 +42,13 @@ 
 	function triggerAfterLogin(&$obj)
 	{
 		$member_srl = $obj->member_srl;
-		if(!$member_srl) return new Object();
+		if(!$member_srl) {
+			return new Object();
+		}
 		// If the last login is not today, give the points
-		if(substr($obj->last_login,0,8)==date("Ymd")) return new Object();
+		if(substr($obj->last_login,0,8)==date("Ymd")) {
+			return new Object();
+		}
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -70,9 +74,13 @@ 
 		{
 			$module_srl = $obj->module_srl;
 			$member_srl = $obj->member_srl;
-			if(!$module_srl || !$member_srl) return new Object();
+			if(!$module_srl || !$member_srl) {
+				return new Object();
+			}
 			// The fix to disable giving points for saving the document temporarily
-			if($module_srl == $member_srl) return new Object();
+			if($module_srl == $member_srl) {
+				return new Object();
+			}
 			// Get the point module information
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('point');
@@ -82,12 +90,18 @@ 
 			$cur_point = $oPointModel->getPoint($member_srl, true);
 
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->insert_document;
+			}
 			$cur_point += $point;
 			// Add points for attaching a file
 			$point = $module_config['upload_file'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-			if($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->upload_file;
+			}
+			if($obj->uploaded_count) {
+				$cur_point += $point * $obj->uploaded_count;
+			}
 			// Increase the point
 			$this->setPoint($member_srl,$cur_point);
 		}
@@ -118,12 +132,18 @@ 
 			$cur_point = $oPointModel->getPoint($oDocument->get('member_srl'), true);
 
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->insert_document;
+			}
 			$cur_point += $point;
 			// Add points for attaching a file
 			$point = $module_config['upload_file'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-			if($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->upload_file;
+			}
+			if($obj->uploaded_count) {
+				$cur_point += $point * $obj->uploaded_count;
+			}
 			// Increase the point
 			$this->setPoint($oDocument->get('member_srl'), $cur_point);
 		}
@@ -141,33 +161,47 @@ 
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists()) return new Object();
+		if(!$oDocument->isExists()) {
+			return new Object();
+		}
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point',$oDocument->get('module_srl'));
 		// The process related to clearing the post comments
 		$comment_point = $module_config['insert_comment'];
-		if(strlen($comment_point) == 0 && !is_int($comment_point)) $comment_point = $config->insert_comment;
+		if(strlen($comment_point) == 0 && !is_int($comment_point)) {
+			$comment_point = $config->insert_comment;
+		}
 		// If there are comment points, attempt to deduct
-		if($comment_point>0) return new Object();
+		if($comment_point>0) {
+			return new Object();
+		}
 		// Get all the comments related to this post
 		$cp_args = new stdClass();
 		$cp_args->document_srl = $document_srl;
 		$output = executeQueryArray('point.getCommentUsers', $cp_args);
 		// Return if there is no object
-		if(!$output->data) return new Object();
+		if(!$output->data) {
+			return new Object();
+		}
 		// Organize the member number
 		$member_srls = array();
 		$cnt = count($output->data);
 		for($i=0;$i<$cnt;$i++)
 		{
-			if($output->data[$i]->member_srl<1) continue;
+			if($output->data[$i]->member_srl<1) {
+				continue;
+			}
 			$member_srls[abs($output->data[$i]->member_srl)] = $output->data[$i]->count;
 		}
 		// Remove the member number who has written the original post
-		if($member_srl) unset($member_srls[abs($member_srl)]);
-		if(!count($member_srls)) return new Object();
+		if($member_srl) {
+			unset($member_srls[abs($member_srl)]);
+		}
+		if(!count($member_srls)) {
+			return new Object();
+		}
 		// Remove all the points for each member
 		$oPointModel = getModel('point');
 		// Get the points
@@ -194,10 +228,14 @@ 
 			$module_srl = $obj->module_srl;
 			$member_srl = $obj->member_srl;
 			// The process related to clearing the post object
-			if(!$module_srl || !$member_srl) return new Object();
+			if(!$module_srl || !$member_srl) {
+				return new Object();
+			}
 			// Run only when logged in
 			$logged_info = Context::get('logged_info');
-			if(!$logged_info->member_srl) return new Object();
+			if(!$logged_info->member_srl) {
+				return new Object();
+			}
 			// Get the points of the member
 			$oPointModel = getModel('point');
 			$cur_point = $oPointModel->getPoint($member_srl, true);
@@ -207,14 +245,22 @@ 
 			$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
 	
 			$point = $module_config['insert_document'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_document;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->insert_document;
+			}
 			// if the point is set to decrease when writing a document, make sure it does not increase the points when deleting an article
-			if($point < 0) return new Object();
+			if($point < 0) {
+				return new Object();
+			}
 			$cur_point -= $point;
 			// Add points related to deleting an attachment
 			$point = $module_config['upload_file'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-			if($obj->uploaded_count) $cur_point -= $point * $obj->uploaded_count;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->upload_file;
+			}
+			if($obj->uploaded_count) {
+				$cur_point -= $point * $obj->uploaded_count;
+			}
 			// Increase the point
 			$this->setPoint($member_srl,$cur_point);
 		}
@@ -229,12 +275,16 @@ 
 	{
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new Object();
+		if(!$module_srl || !$member_srl) {
+			return new Object();
+		}
 		// Do not increase the points if the member is the author of the post
 		$document_srl = $obj->document_srl;
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists() || abs($oDocument->get('member_srl'))==abs($member_srl)) return new Object();
+		if(!$oDocument->isExists() || abs($oDocument->get('member_srl'))==abs($member_srl)) {
+			return new Object();
+		}
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -244,7 +294,9 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['insert_comment'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
+		if(strlen($point) == 0 && !is_int($point)) {
+			$point = $config->insert_comment;
+		}
 		// Increase the point
 		$cur_point += $point;
 		$this->setPoint($member_srl,$cur_point);
@@ -264,11 +316,17 @@ 
 		$module_srl = $obj->module_srl;
 		$member_srl = abs($obj->member_srl);
 		$document_srl = $obj->document_srl;
-		if(!$module_srl || !$member_srl) return new Object();
+		if(!$module_srl || !$member_srl) {
+			return new Object();
+		}
 		// Get the original article (if the original article is missing or if the member is its author, do not apply the points)
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists()) return new Object();
-		if($oDocument->get('member_srl')==$member_srl) return new Object();
+		if(!$oDocument->isExists()) {
+			return new Object();
+		}
+		if($oDocument->get('member_srl')==$member_srl) {
+			return new Object();
+		}
 		// Get the point module information
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
@@ -276,9 +334,13 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['insert_comment'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->insert_comment;
+		if(strlen($point) == 0 && !is_int($point)) {
+			$point = $config->insert_comment;
+		}
 		// if the point is set to decrease when writing a comment, make sure it does not increase the points when deleting a comment
-		if($point < 0) return new Object();
+		if($point < 0) {
+			return new Object();
+		}
 		// Increase the point
 		$cur_point -= $point;
 		$this->setPoint($member_srl,$cur_point);
@@ -301,11 +363,15 @@ 
 	 */
 	function triggerDeleteFile(&$obj)
 	{
-		if($obj->isvalid != 'Y') return new Object();
+		if($obj->isvalid != 'Y') {
+			return new Object();
+		}
 
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new Object();
+		if(!$module_srl || !$member_srl) {
+			return new Object();
+		}
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -315,7 +381,9 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 
 		$point = $module_config['upload_file'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
+		if(strlen($point) == 0 && !is_int($point)) {
+			$point = $config->upload_file;
+		}
 		// Increase the point
 		$cur_point -= $point;
 		$this->setPoint($member_srl,$cur_point);
@@ -331,9 +399,13 @@ 
 		$logged_info = Context::get('logged_info');
 		$member_srl = $logged_info->member_srl;
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new Object();
+		if(!$module_srl) {
+			return new Object();
+		}
 		// Pass if it is your file
-		if(abs($obj->member_srl) == abs($member_srl)) return new Object();
+		if(abs($obj->member_srl) == abs($member_srl)) {
+			return new Object();
+		}
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -341,17 +413,24 @@ 
 		// If it is set not to allow downloading for non-logged in users, do not permit
 		if(!Context::get('is_logged'))
 		{
-			if($config->disable_download == 'Y' && strlen($module_config['download_file']) == 0 && !is_int($module_config['download_file'])) return new Object(-1,'msg_not_permitted_download');
-			else return new Object();
+			if($config->disable_download == 'Y' && strlen($module_config['download_file']) == 0 && !is_int($module_config['download_file'])) {
+				return new Object(-1,'msg_not_permitted_download');
+			} else {
+				return new Object();
+			}
 		}
 		// Get the points of the member
 		$oPointModel = getModel('point');
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 		// Get the points
 		$point = $module_config['download_file'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->download_file;
+		if(strlen($point) == 0 && !is_int($point)) {
+			$point = $config->download_file;
+		}
 		// If points are less than 0, and if downloading a file is not allowed in this case, give an errors
-		if($cur_point + $point < 0 && $config->disable_download == 'Y') return new Object(-1,'msg_cannot_download');
+		if($cur_point + $point < 0 && $config->disable_download == 'Y') {
+			return new Object(-1,'msg_cannot_download');
+		}
 
 		return new Object();
 	}
@@ -363,12 +442,18 @@ 
 	{
 		// Run only when logged in
 		$logged_info = Context::get('logged_info');
-		if(!$logged_info->member_srl) return new Object();
+		if(!$logged_info->member_srl) {
+			return new Object();
+		}
 		$module_srl = $obj->module_srl;
 		$member_srl = $logged_info->member_srl;
-		if(!$module_srl) return new Object();
+		if(!$module_srl) {
+			return new Object();
+		}
 		// Pass if it is your file
-		if(abs($obj->member_srl) == abs($member_srl)) return new Object();
+		if(abs($obj->member_srl) == abs($member_srl)) {
+			return new Object();
+		}
 		// Get the point module information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -378,7 +463,9 @@ 
 		$cur_point = $oPointModel->getPoint($member_srl, true);
 		// Get the points
 		$point = $module_config['download_file'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->download_file;
+		if(strlen($point) == 0 && !is_int($point)) {
+			$point = $config->download_file;
+		}
 		// Increase the point
 		$cur_point += $point;
 		$this->setPoint($member_srl,$cur_point);
@@ -400,25 +487,32 @@ 
 		// Get the original author number
 		$target_member_srl = abs($obj->get('member_srl'));
 		// Pass without increasing the hits if the viewer is the same as the author
-		if($target_member_srl == $member_srl) return new Object();
+		if($target_member_srl == $member_srl) {
+			return new Object();
+		}
 		// Get the point information for each module
 		$config = $oModuleModel->getModuleConfig('point');
 		$module_config = $oModuleModel->getModulePartConfig('point', $obj->get('module_srl'));
 		// Get hits points
 		$point = $module_config['read_document'];
-		if(strlen($point) == 0 && !is_int($point)) $point = $config->read_document;
+		if(strlen($point) == 0 && !is_int($point)) {
+			$point = $config->read_document;
+		}
 		// Pass if there are no requested points
-		if(!$point) return new Object();
+		if(!$point) {
+			return new Object();
+		}
 		// In case of a registered member, if it is read but cannot just pass, then get the current points
 		if($member_srl)
 		{
 			$args->member_srl = $member_srl;
 			$args->document_srl = $obj->document_srl;
 			$output = executeQuery('document.getDocumentReadedLogInfo', $args);
-			if($output->data->count) return new Object();
+			if($output->data->count) {
+				return new Object();
+			}
 			$cur_point = $oPointModel->getPoint($member_srl, true);
-		}
-		else
+		} else
 		{
 			$cur_point = 0;
 		}
@@ -434,9 +528,13 @@ 
 			return new Object(-1, $message);
 		}
 		// If not logged in, pass
-		if(!$logged_info->member_srl) return new Object();
+		if(!$logged_info->member_srl) {
+			return new Object();
+		}
 		// Pass, if there are no requested points
-		if(!$point) return new Object();
+		if(!$point) {
+			return new Object();
+		}
 		// If the read record is missing, leave it
 		$output = executeQuery('document.insertDocumentReadedLog', $args);
 		// Increase the point
@@ -453,7 +551,9 @@ 
 	{
 		$module_srl = $obj->module_srl;
 		$member_srl = $obj->member_srl;
-		if(!$module_srl || !$member_srl) return new Object();
+		if(!$module_srl || !$member_srl) {
+			return new Object();
+		}
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
@@ -465,15 +565,20 @@ 
 		if( $obj->point > 0 )
 		{
 			$point = $module_config['voted'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->voted;
-		}
-		else
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->voted;
+			}
+		} else
 		{
 			$point = $module_config['blamed'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->blamed;
+			if(strlen($point) == 0 && !is_int($point)) {
+				$point = $config->blamed;
+			}
 		}
 
-		if(!$point) return new Object();
+		if(!$point) {
+			return new Object();
+		}
 		// Increase the point
 		$cur_point += $point;
 		$this->setPoint($member_srl,$cur_point);
@@ -488,7 +593,9 @@ 
 	{
 		$member_srl = abs($member_srl);
 		$mode_arr = array('add', 'minus', 'update', 'signup');
-		if(!$mode || !in_array($mode,$mode_arr)) $mode = 'update';
+		if(!$mode || !in_array($mode,$mode_arr)) {
+			$mode = 'update';
+		}
 
 		// Get configuration information
 		$oMemberModel = getModel('member');
@@ -518,7 +625,9 @@ 
 				$args->point = $point;
 				break;
 		}
-		if($args->point < 0) $args->point = 0;
+		if($args->point < 0) {
+			$args->point = 0;
+		}
 		$point = $args->point;
 
 		// Call a trigger (before)
@@ -540,8 +649,11 @@ 
 
 		// If there are points, update, if no, insert
 		$oPointModel = getModel('point');
-		if($oPointModel->isExistsPoint($member_srl)) executeQuery("point.updatePoint", $args);
-		else executeQuery("point.insertPoint", $args);
+		if($oPointModel->isExistsPoint($member_srl)) {
+			executeQuery("point.updatePoint", $args);
+		} else {
+			executeQuery("point.insertPoint", $args);
+		}
 
 		// Get a new level
 		$level = $oPointModel->getLevel($point, $config->level_step);
@@ -571,7 +683,9 @@ 
 						foreach($point_group as $group_srl => $target_level)
 						{
 							$del_group_list[] = $group_srl;
-							if($target_level == $level) $new_group_list[] = $group_srl;
+							if($target_level == $level) {
+								$new_group_list[] = $group_srl;
+							}
 						}
 					}
 					// Otherwise, in case the level is reduced, add the recent group
@@ -597,7 +711,9 @@ 
 					// Delete the group of a level which is higher than the current level
 					foreach($point_group as $group_srl => $target_level)
 					{
-						if($target_level > $level) $del_group_list[] = $group_srl;
+						if($target_level > $level) {
+							$del_group_list[] = $group_srl;
+						}
 					}
 					$del_group_list[] = $default_group->group_srl;
 				}
@@ -608,11 +724,15 @@ 
 					foreach($point_group as $group_srl => $target_level)
 					{
 						$del_group_list[] = $group_srl;
-						if($target_level <= $level) $new_group_list[] = $group_srl;
+						if($target_level <= $level) {
+							$new_group_list[] = $group_srl;
+						}
 					}
 				}
 				// If there is no a new group, granted the default group
-				if(!$new_group_list[0]) $new_group_list[0] = $default_group->group_srl;
+				if(!$new_group_list[0]) {
+					$new_group_list[0] = $default_group->group_srl;
+				}
 				// Remove linkage group
 				if($del_group_list && count($del_group_list))
 				{

modules/poll/poll.admin.controller.php

Doc Comments +1 added lines

@@ -85,6 +85,7 @@
 
 	/**
 	 * @brief Delete the poll (when several questions are registered in one poll, delete this question)
+	 * @param string $poll_index_srl
 	 */
 	function deletePollTitle($poll_index_srl) 
 	{

Spacing +20 added lines, -20 removed lines

@@ -40,22 +40,22 @@ 
 		// Display an error no post is selected
 		$cart = Context::get('cart');
 
-		if(is_array($cart)) $poll_srl_list = $cart;
-		else $poll_srl_list= explode('|@|', $cart);
+		if (is_array($cart)) $poll_srl_list = $cart;
+		else $poll_srl_list = explode('|@|', $cart);
 
 		$poll_count = count($poll_srl_list);
-		if(!$poll_count) return $this->stop('msg_cart_is_null');
+		if (!$poll_count) return $this->stop('msg_cart_is_null');
 		// Delete the post
-		for($i=0;$i<$poll_count;$i++)
+		for ($i = 0; $i < $poll_count; $i++)
 		{
 			$poll_index_srl = trim($poll_srl_list[$i]);
-			if(!$poll_index_srl) continue;
+			if (!$poll_index_srl) continue;
 
 			$output = $this->deletePollTitle($poll_index_srl, true);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 
-		$this->setMessage( sprintf(Context::getLang('msg_checked_poll_is_deleted'), $poll_count) );
+		$this->setMessage(sprintf(Context::getLang('msg_checked_poll_is_deleted'), $poll_count));
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPollAdminList');
 		$this->setRedirectUrl($returnUrl);
@@ -63,7 +63,7 @@ 
 
 	function procPollAdminAddCart()
 	{
-		$poll_index_srl = (int)Context::get('poll_index_srl');
+		$poll_index_srl = (int) Context::get('poll_index_srl');
 
 		$oPollAdminModel = getAdminModel('poll');
 		//$columnList = array('comment_srl');
@@ -73,11 +73,11 @@ 
 
 		$output = $oPollAdminModel->getPollList($args);
 
-		if(is_array($output->data))
+		if (is_array($output->data))
 		{
-			foreach($output->data AS $key=>$value)
+			foreach ($output->data AS $key=>$value)
 			{
-				if($_SESSION['poll_management'][$value->poll_index_srl]) unset($_SESSION['poll_management'][$value->poll_index_srl]);
+				if ($_SESSION['poll_management'][$value->poll_index_srl]) unset($_SESSION['poll_management'][$value->poll_index_srl]);
 				else $_SESSION['poll_management'][$value->poll_index_srl] = true;
 			}
 		}
@@ -97,36 +97,36 @@ 
 		$oDB->begin();
 
 		$output = executeQueryArray('poll.getPollByDeletePollTitle', $args);
-		if($output->toBool() && $output->data && $output->data[0]->count == 1)
+		if ($output->toBool() && $output->data && $output->data[0]->count == 1)
 		{
 			$dargs->poll_srl = $output->data[0]->poll_srl;
 		}
 
 		$output = $oDB->executeQuery('poll.deletePollTitle', $args);
-		if(!$output)
+		if (!$output)
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
 		$output = $oDB->executeQuery('poll.deletePollItem', $args);
-		if(!$output)
+		if (!$output)
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
-		if($dargs->poll_srl)
+		if ($dargs->poll_srl)
 		{
 			$output = executeQuery('poll.deletePoll', $dargs);
-			if(!$output)
+			if (!$output)
 			{
 				$oDB->rollback();
 				return $output;
 			}
 
 			$output = executeQuery('poll.deletePollLog', $dargs);
-			if(!$output)
+			if (!$output)
 			{
 				$oDB->rollback();
 				return $output;
@@ -149,21 +149,21 @@ 
 		$oDB->begin();
 
 		$output = $oDB->executeQuery('poll.deletePoll', $args);
-		if(!$output)
+		if (!$output)
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
 		$output = $oDB->executeQuery('poll.deletePollTitle', $args);
-		if(!$output)
+		if (!$output)
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
 		$output = $oDB->executeQuery('poll.deletePollItem', $args);
-		if(!$output)
+		if (!$output)
 		{
 			$oDB->rollback();
 			return $output;

Braces +19 added lines, -7 removed lines

@@ -40,19 +40,28 @@ 
 		// Display an error no post is selected
 		$cart = Context::get('cart');
 
-		if(is_array($cart)) $poll_srl_list = $cart;
-		else $poll_srl_list= explode('|@|', $cart);
+		if(is_array($cart)) {
+			$poll_srl_list = $cart;
+		} else {
+			$poll_srl_list= explode('|@|', $cart);
+		}
 
 		$poll_count = count($poll_srl_list);
-		if(!$poll_count) return $this->stop('msg_cart_is_null');
+		if(!$poll_count) {
+			return $this->stop('msg_cart_is_null');
+		}
 		// Delete the post
 		for($i=0;$i<$poll_count;$i++)
 		{
 			$poll_index_srl = trim($poll_srl_list[$i]);
-			if(!$poll_index_srl) continue;
+			if(!$poll_index_srl) {
+				continue;
+			}
 
 			$output = $this->deletePollTitle($poll_index_srl, true);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 
 		$this->setMessage( sprintf(Context::getLang('msg_checked_poll_is_deleted'), $poll_count) );
@@ -77,8 +86,11 @@ 
 		{
 			foreach($output->data AS $key=>$value)
 			{
-				if($_SESSION['poll_management'][$value->poll_index_srl]) unset($_SESSION['poll_management'][$value->poll_index_srl]);
-				else $_SESSION['poll_management'][$value->poll_index_srl] = true;
+				if($_SESSION['poll_management'][$value->poll_index_srl]) {
+					unset($_SESSION['poll_management'][$value->poll_index_srl]);
+				} else {
+					$_SESSION['poll_management'][$value->poll_index_srl] = true;
+				}
 			}
 		}
 	}

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

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]);
 			}

Spacing +21 added lines, -21 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'];
 
 						// 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();
 	}
 }

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

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

Spacing +23 added lines, -23 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,12 +36,12 @@ 
 		//스팸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>';
+			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,12 +54,12 @@ 
 	{
 		//스팸 키워드 추가
 		$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>';
+			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 +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);

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

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

Spacing +45 added lines, -45 removed lines

@@ -27,39 +27,39 @@ 
 	 */
 	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;
+			$text = $obj->title.' '.$obj->content.' '.$obj->tags;
 		}
 		else
 		{
-			$text = $obj->title . ' ' . $obj->content . ' ' . $obj->nick_name . ' ' . $obj->homepage . ' ' . $obj->tags;	
+			$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,39 +72,39 @@ 
 	 */
 	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;
 		}
 		else
 		{
-			$text = $obj->content . ' ' . $obj->nick_name . ' ' . $obj->homepage;	
+			$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;
+		$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']);
+		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);
+			$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');
+			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;
+		$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)
 	{

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;
 	}

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;

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));
 		}

Spacing +133 added lines, -133 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
@@ -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,15 +375,15 @@ 
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('template');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$key = 'widget_cache:' . $widget_sequence;
+			$key = 'widget_cache:'.$widget_sequence;
 
 			$cache_body = $oCacheHandler->get($key);
 			$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="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 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));
+						'</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="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="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 >'.
+					$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,
+						'<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;
+		$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,29 +696,29 @@ 
 		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>');
 		}
@@ -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));
 		}

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

-    }

+	}

 }

 

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;

     }

Spacing +20 added lines, -27 removed lines

@@ -14,15 +14,15 @@ 
     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;

 

     public function setUp()

     {

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

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

     }

  

     // recursive glob

@@ -53,17 +53,16 @@ 
     } 

 

     /** 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 = ''

 	)

     {

 	// this file is in tools/dbxml_validator/tests

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

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

 

-	$this->assertTrue(file_exists($xe_dir . '/index.php'), 'XE directory not found');

+	$this->assertTrue(file_exists($xe_dir.'/index.php'), 'XE directory not found');

 

 	$cnt = 0;

 	$cmd = $this->validator_cmd;

@@ -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

@@ -84,19 +81,18 @@ 
 

 	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)

-		$cmd .= " " . escapeshellarg($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");

 

 	    // 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,17 +125,16 @@ 
 

     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;

 

-	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");

 

 	// 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}."

@@ -170,7 +163,7 @@ 
     {

 	$output = array();

 

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

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

 

 	if ($dir)

 	{

@@ -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);