xpressengine / xe-core

config/config.inc.php

Spacing +37 added lines, -37 removed lines

@@ -7,7 +7,7 @@ 
  * @file   config/config.inc.php
  * @author NAVER (developers@xpressengine.com)
  */
-if(version_compare(PHP_VERSION, '5.4.0', '<'))
+if (version_compare(PHP_VERSION, '5.4.0', '<'))
 {
 	@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_WARNING);
 }
@@ -16,7 +16,7 @@ 
 	@error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED ^ E_WARNING ^ E_STRICT);
 }
 
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 {
 	exit();
 }
@@ -53,9 +53,9 @@ 
 ini_set('session.use_only_cookies', 0);
 
 
-if(file_exists(_XE_PATH_ . 'config/package.inc.php'))
+if (file_exists(_XE_PATH_.'config/package.inc.php'))
 {
-	require _XE_PATH_ . 'config/package.inc.php';
+	require _XE_PATH_.'config/package.inc.php';
 }
 else
 {
@@ -97,12 +97,12 @@ 
  * define('__ENABLE_PHPUNIT_TEST__', 0);
  * define('__PROXY_SERVER__', 'http://domain:port/path');
  */
-if(file_exists(_XE_PATH_ . 'config/config.user.inc.php'))
+if (file_exists(_XE_PATH_.'config/config.user.inc.php'))
 {
-	require _XE_PATH_ . 'config/config.user.inc.php';
+	require _XE_PATH_.'config/config.user.inc.php';
 }
 
-if(!defined('__DEBUG__'))
+if (!defined('__DEBUG__'))
 {
 	/**
 	 * output debug message(bit value)
@@ -117,7 +117,7 @@ 
 	define('__DEBUG__', 0);
 }
 
-if(!defined('__DEBUG_OUTPUT__'))
+if (!defined('__DEBUG_OUTPUT__'))
 {
 	/**
 	 * output location of debug message
@@ -131,7 +131,7 @@ 
 	define('__DEBUG_OUTPUT__', 0);
 }
 
-if(!defined('__DEBUG_PROTECT__'))
+if (!defined('__DEBUG_PROTECT__'))
 {
 	/**
 	 * output comments of the firePHP console and browser
@@ -144,7 +144,7 @@ 
 	define('__DEBUG_PROTECT__', 1);
 }
 
-if(!defined('__DEBUG_PROTECT_IP__'))
+if (!defined('__DEBUG_PROTECT_IP__'))
 {
 	/**
 	 * Set a ip address to allow debug
@@ -152,7 +152,7 @@ 
 	define('__DEBUG_PROTECT_IP__', '127.0.0.1');
 }
 
-if(!defined('__DEBUG_DB_OUTPUT__'))
+if (!defined('__DEBUG_DB_OUTPUT__'))
 {
 	/**
 	 * DB error message definition
@@ -165,7 +165,7 @@ 
 	define('__DEBUG_DB_OUTPUT__', 0);
 }
 
-if(!defined('__LOG_SLOW_QUERY__'))
+if (!defined('__LOG_SLOW_QUERY__'))
 {
 	/**
 	 * Query log for only timeout query among DB queries
@@ -179,7 +179,7 @@ 
 	define('__LOG_SLOW_QUERY__', 0);
 }
 
-if(!defined('__LOG_SLOW_TRIGGER__'))
+if (!defined('__LOG_SLOW_TRIGGER__'))
 {
 	/**
 	 * Trigger excute time log
@@ -193,7 +193,7 @@ 
 	define('__LOG_SLOW_TRIGGER__', 0);
 }
 
-if(!defined('__LOG_SLOW_ADDON__'))
+if (!defined('__LOG_SLOW_ADDON__'))
 {
 	/**
 	 * Addon excute time log
@@ -207,7 +207,7 @@ 
 	define('__LOG_SLOW_ADDON__', 0);
 }
 
-if(!defined('__LOG_SLOW_WIDGET__'))
+if (!defined('__LOG_SLOW_WIDGET__'))
 {
 	/**
 	 * Widget excute time log
@@ -221,7 +221,7 @@ 
 	define('__LOG_SLOW_WIDGET__', 0);
 }
 
-if(!defined('__DEBUG_QUERY__'))
+if (!defined('__DEBUG_QUERY__'))
 {
 	/**
 	 * Leave DB query information
@@ -234,7 +234,7 @@ 
 	define('__DEBUG_QUERY__', 0);
 }
 
-if(!defined('__OB_GZHANDLER_ENABLE__'))
+if (!defined('__OB_GZHANDLER_ENABLE__'))
 {
 	/**
 	 * option to enable/disable a compression feature using ob_gzhandler
@@ -248,7 +248,7 @@ 
 	define('__OB_GZHANDLER_ENABLE__', 1);
 }
 
-if(!defined('__ENABLE_PHPUNIT_TEST__'))
+if (!defined('__ENABLE_PHPUNIT_TEST__'))
 {
 	/**
 	 * decide to use/not use the php unit test (Path/tests/index.php)
@@ -261,7 +261,7 @@ 
 	define('__ENABLE_PHPUNIT_TEST__', 0);
 }
 
-if(!defined('__PROXY_SERVER__'))
+if (!defined('__PROXY_SERVER__'))
 {
 	/**
 	 * __PROXY_SERVER__ has server information to request to the external through the target server
@@ -270,7 +270,7 @@ 
 	define('__PROXY_SERVER__', NULL);
 }
 
-if(!defined('__ERROR_LOG__'))
+if (!defined('__ERROR_LOG__'))
 {
 	/**
 	 * __ERROR_LOG__ 는 PHP의 에러로그를 출력하는 기능입니다. 개발시 워닝에러이상의 에러부터 잡기 시작합니다.
@@ -282,25 +282,25 @@ 
 }
 
 // Require specific files when using Firebug console output
-if((__DEBUG_OUTPUT__ == 2) && version_compare(PHP_VERSION, '6.0.0') === -1)
+if ((__DEBUG_OUTPUT__ == 2) && version_compare(PHP_VERSION, '6.0.0') === -1)
 {
-	require _XE_PATH_ . 'libs/FirePHPCore/FirePHP.class.php';
+	require _XE_PATH_.'libs/FirePHPCore/FirePHP.class.php';
 }
 
 // Set Timezone as server time
-if(version_compare(PHP_VERSION, '5.3.0') >= 0)
+if (version_compare(PHP_VERSION, '5.3.0') >= 0)
 {
 	date_default_timezone_set(@date_default_timezone_get());
 }
 
 // Require a function-defined-file for simple use
-require(_XE_PATH_ . 'config/func.inc.php');
+require(_XE_PATH_.'config/func.inc.php');
 
-if(__DEBUG__) {
+if (__DEBUG__) {
 	define('__StartTime__', getMicroTime());
 }
 
-if(__DEBUG__) {
+if (__DEBUG__) {
 	$GLOBALS['__elapsed_class_load__'] = 0;
 }
 
@@ -402,38 +402,38 @@ 
 
 function __xe_autoload($class_name)
 {
-	if(__DEBUG__) {
+	if (__DEBUG__) {
 		$time_at = getMicroTime();
 	}
 
-	if(isset($GLOBALS['__xe_autoload_file_map'][strtolower($class_name)]))
+	if (isset($GLOBALS['__xe_autoload_file_map'][strtolower($class_name)]))
 	{
-		require _XE_PATH_ . $GLOBALS['__xe_autoload_file_map'][strtolower($class_name)];
+		require _XE_PATH_.$GLOBALS['__xe_autoload_file_map'][strtolower($class_name)];
 	}
-	elseif(preg_match('/^([a-zA-Z0-9_]+?)(Admin)?(View|Controller|Model|Api|Wap|Mobile)?$/', $class_name, $matches))
+	elseif (preg_match('/^([a-zA-Z0-9_]+?)(Admin)?(View|Controller|Model|Api|Wap|Mobile)?$/', $class_name, $matches))
 	{
 		$candidate_filename = array();
-		$candidate_filename[] = 'modules/' . $matches[1] . '/' . $matches[1];
-		if(isset($matches[2]) && $matches[2]) $candidate_filename[] = 'admin';
+		$candidate_filename[] = 'modules/'.$matches[1].'/'.$matches[1];
+		if (isset($matches[2]) && $matches[2]) $candidate_filename[] = 'admin';
 		$candidate_filename[] = (isset($matches[3]) && $matches[3]) ? strtolower($matches[3]) : 'class';
 		$candidate_filename[] = 'php';
 
 		$candidate_filename = implode('.', $candidate_filename);
 
-		if(file_exists(_XE_PATH_ . $candidate_filename))
+		if (file_exists(_XE_PATH_.$candidate_filename))
 		{
-			require _XE_PATH_ . $candidate_filename;
+			require _XE_PATH_.$candidate_filename;
 		}
 	}
 
-	if(__DEBUG__) {
+	if (__DEBUG__) {
 		$GLOBALS['__elapsed_class_load__'] += getMicroTime() - $time_at;
 	}
 }
 spl_autoload_register('__xe_autoload');
 
-if(file_exists(_XE_PATH_  . '/vendor/autoload.php')) {
-	require _XE_PATH_  . '/vendor/autoload.php';
+if (file_exists(_XE_PATH_.'/vendor/autoload.php')) {
+	require _XE_PATH_.'/vendor/autoload.php';
 }
 /* End of file config.inc.php */
 /* Location: ./config/config.inc.php */

modules/point/point.controller.php

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

classes/cache/CacheFile.class.php

Spacing +10 added lines, -10 removed lines

@@ -23,7 +23,7 @@ 
 	 */

 	function getInstance()

 	{

-		if(!$GLOBALS['__CacheFile__'])

+		if (!$GLOBALS['__CacheFile__'])

 		{

 			$GLOBALS['__CacheFile__'] = new CacheFile();

 		}

@@ -37,7 +37,7 @@ 
 	 */

 	function CacheFile()

 	{

-		$this->cache_dir = _XE_PATH_ . $this->cache_dir;

+		$this->cache_dir = _XE_PATH_.$this->cache_dir;

 		FileHandler::makeDir($this->cache_dir);

 	}

 

@@ -49,7 +49,7 @@ 
 	 */

 	function getCacheFileName($key)

 	{

-		return $this->cache_dir . str_replace(':', DIRECTORY_SEPARATOR, $key) . '.php';

+		return $this->cache_dir.str_replace(':', DIRECTORY_SEPARATOR, $key).'.php';

 	}

 

 	/**

@@ -76,9 +76,9 @@ 
 		$content = array();

 		$content[] = '<?php';

 		$content[] = 'if(!defined(\'__XE__\')) { exit(); }';

-		$content[] = 'return \'' . addslashes(serialize($obj)) . '\';';

+		$content[] = 'return \''.addslashes(serialize($obj)).'\';';

 		FileHandler::writeFile($cache_file, implode(PHP_EOL, $content));

-		if(function_exists('opcache_invalidate'))

+		if (function_exists('opcache_invalidate'))

 		{

 			@opcache_invalidate($cache_file, true);

 		}

@@ -95,9 +95,9 @@ 
 	{

 		$cache_file = $this->getCacheFileName($key);

 

-		if(file_exists($cache_file))

+		if (file_exists($cache_file))

 		{

-			if($modified_time > 0 && filemtime($cache_file) < $modified_time)

+			if ($modified_time > 0 && filemtime($cache_file) < $modified_time)

 			{

 				FileHandler::removeFile($cache_file);

 				return false;

@@ -118,12 +118,12 @@ 
 	 */

 	function get($key, $modified_time = 0)

 	{

-		if(!$cache_file = FileHandler::exists($this->getCacheFileName($key)))

+		if (!$cache_file = FileHandler::exists($this->getCacheFileName($key)))

 		{

 			return false;

 		}

 

-		if($modified_time > 0 && filemtime($cache_file) < $modified_time)

+		if ($modified_time > 0 && filemtime($cache_file) < $modified_time)

 		{

 			FileHandler::removeFile($cache_file);

 			return false;

@@ -143,7 +143,7 @@ 
 	function _delete($_key)

 	{

 		$cache_file = $this->getCacheFileName($_key);

-		if(function_exists('opcache_invalidate'))

+		if (function_exists('opcache_invalidate'))

 		{

 			@opcache_invalidate($cache_file, true);

 		}

modules/autoinstall/autoinstall.admin.model.php

Spacing +43 added lines, -43 removed lines

@@ -19,19 +19,19 @@ 
 	function preProcParam(&$order_target, &$order_type, &$page)
 	{
 		$order_target_array = array('newest' => 1, 'download' => 1, 'popular' => 1);
-		if(!isset($order_target_array[$order_target]))
+		if (!isset($order_target_array[$order_target]))
 		{
 			$order_target = 'newest';
 		}
 
 		$order_type_array = array('asc' => 1, 'desc' => 1);
-		if(!isset($order_type_array[$order_type]))
+		if (!isset($order_type_array[$order_type]))
 		{
 			$order_type = 'desc';
 		}
 
 		$page = (int) $page;
-		if($page < 1)
+		if ($page < 1)
 		{
 			$page = 1;
 		}
@@ -63,12 +63,12 @@ 
 
 		$type_array = array('M' => 1, 'P' => 1);
 		$type = Context::get('type');
-		if(!isset($type_array[$type]))
+		if (!isset($type_array[$type]))
 		{
 			$type = 'P';
 		}
 
-		if($type == 'P')
+		if ($type == 'P')
 		{
 			$category_srl = $this->layout_category_srl;
 		}
@@ -95,12 +95,12 @@ 
 
 		$type_array = array('M' => 1, 'P' => 1);
 		$type = Context::get('type');
-		if(!isset($type_array[$type]))
+		if (!isset($type_array[$type]))
 		{
 			$type = 'P';
 		}
 
-		if($type == 'P')
+		if ($type == 'P')
 		{
 			$category_srl = $this->module_skin_category_srl;
 		}
@@ -118,11 +118,11 @@ 
 	 */
 	function getPackageList($type, $order_target = 'newest', $order_type = 'desc', $page = '1', $search_keyword = NULL, $category_srl = NULL, $parent_program = NULL)
 	{
-		if($type == 'menu')
+		if ($type == 'menu')
 		{
 			$params["act"] = "getResourceapiMenuPackageList";
 		}
-		elseif($type == 'skin')
+		elseif ($type == 'skin')
 		{
 			$params["act"] = "getResourceapiSkinPackageList";
 			$params['parent_program'] = $parent_program;
@@ -137,18 +137,18 @@ 
 		$params["order_type"] = $order_type;
 		$params["page"] = $page;
 
-		if($category_srl)
+		if ($category_srl)
 		{
 			$params["category_srl"] = $category_srl;
 		}
 
-		if($search_keyword)
+		if ($search_keyword)
 		{
 			$params["search_keyword"] = $search_keyword;
 		}
 
 		$xmlDoc = XmlGenerater::getXmlDoc($params);
-		if($xmlDoc && $xmlDoc->response->packagelist->item)
+		if ($xmlDoc && $xmlDoc->response->packagelist->item)
 		{
 			$item_list = $oAdminView->rearranges($xmlDoc->response->packagelist->item);
 			$this->add('item_list', $item_list);
@@ -169,14 +169,14 @@ 
 		
 		$is_authed = 0;
 		$output = $oAdminModel->checkUseDirectModuleInstall($package);
-		if($output->toBool()==TRUE)
+		if ($output->toBool() == TRUE)
 		{
 			$is_authed = 1;
 		}
 		else
 		{
 			$ftp_info = Context::getFTPInfo();
-			if(!$ftp_info->ftp_root_path)
+			if (!$ftp_info->ftp_root_path)
 			{
 				$is_authed = -1;
 			}
@@ -196,14 +196,14 @@ 
 	{
 		$oModel = getModel('autoinstall');
 		$output = executeQueryArray('autoinstall.getNeedUpdate');
-		if(!is_array($output->data))
+		if (!is_array($output->data))
 		{
 			return NULL;
 		}
 
 		$result = array();
 		$xml = new XmlParser();
-		foreach($output->data as $package)
+		foreach ($output->data as $package)
 		{
 			$packageSrl = $package->package_srl;
 
@@ -213,27 +213,27 @@ 
 			$packageInfo->type = $oModel->getTypeFromPath($package->path);
 			$packageInfo->url = $oModel->getUpdateUrlByPackageSrl($package->package_srl);
 
-			if($packageInfo->type == 'core')
+			if ($packageInfo->type == 'core')
 			{
 				$title = 'XpressEngine';
 			}
 			else
 			{
 				$configFile = $oModel->getConfigFilePath($packageInfo->type);
-				$xmlDoc = $xml->loadXmlFile(FileHandler::getRealPath($package->path) . $configFile);
+				$xmlDoc = $xml->loadXmlFile(FileHandler::getRealPath($package->path).$configFile);
 
-				if($xmlDoc)
+				if ($xmlDoc)
 				{
 					$type = $packageInfo->type;
-					if($type == "drcomponent")
+					if ($type == "drcomponent")
 					{
 						$type = "component";
 					}
-					if($type == "style" || $type == "m.skin")
+					if ($type == "style" || $type == "m.skin")
 					{
 						$type = "skin";
 					}
-					if($type == "m.layout")
+					if ($type == "m.layout")
 					{
 						$type = "layout";
 					}
@@ -267,7 +267,7 @@ 
 		$oModel = getModel('autoinstall');
 
 		$targetpackages = array();
-		if($xmlDoc)
+		if ($xmlDoc)
 		{
 			$xmlPackage = $xmlDoc->response->package;
 			$package = new stdClass();
@@ -276,15 +276,15 @@ 
 			$package->package_description = $xmlPackage->package_description->body;
 			$package->version = $xmlPackage->version->body;
 			$package->path = $xmlPackage->path->body;
-			if($xmlPackage->depends)
+			if ($xmlPackage->depends)
 			{
-				if(!is_array($xmlPackage->depends->item))
+				if (!is_array($xmlPackage->depends->item))
 				{
 					$xmlPackage->depends->item = array($xmlPackage->depends->item);
 				}
 
 				$package->depends = array();
-				foreach($xmlPackage->depends->item as $item)
+				foreach ($xmlPackage->depends->item as $item)
 				{
 					$dep_item = new stdClass();
 					$dep_item->package_srl = $item->package_srl->body;
@@ -297,23 +297,23 @@ 
 
 				$packages = $oModel->getInstalledPackages(array_keys($targetpackages));
 				$package->deplist = "";
-				foreach($package->depends as $key => $dep)
+				foreach ($package->depends as $key => $dep)
 				{
-					if(!$packages[$dep->package_srl])
+					if (!$packages[$dep->package_srl])
 					{
 						$package->depends[$key]->installed = FALSE;
-						$package->package_srl .= "," . $dep->package_srl;
+						$package->package_srl .= ",".$dep->package_srl;
 					}
 					else
 					{
 						$package->depends[$key]->installed = TRUE;
 						$package->depends[$key]->cur_version = $packages[$dep->package_srl]->current_version;
-						if(version_compare($dep->version, $packages[$dep->package_srl]->current_version, ">"))
+						if (version_compare($dep->version, $packages[$dep->package_srl]->current_version, ">"))
 						{
 							$package->depends[$key]->need_update = TRUE;
-							$package->package_srl .= "," . $dep->package_srl;
+							$package->package_srl .= ",".$dep->package_srl;
 
-							if($dep->path === '.')
+							if ($dep->path === '.')
 							{
 								$package->contain_core = TRUE;
 								$package->contain_core_version = $dep->version;
@@ -328,14 +328,14 @@ 
 			}
 
 			$installedPackage = $oModel->getInstalledPackage($packageSrl);
-			if($installedPackage)
+			if ($installedPackage)
 			{
 				$package->installed = TRUE;
 				$package->cur_version = $installedPackage->current_version;
 				$package->need_update = version_compare($package->version, $installedPackage->current_version, ">");
 			}
 
-			if($package->path === '.')
+			if ($package->path === '.')
 			{
 				$package->contain_core = TRUE;
 				$package->contain_core_version = $package->version;
@@ -351,7 +351,7 @@ 
 	public function getAutoInstallAdminInstallInfo()
 	{
 		$packageSrl = Context::get('package_srl');
-		if(!$packageSrl)
+		if (!$packageSrl)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -365,23 +365,23 @@ 
 		$directModuleInstall = TRUE;
 		$arrUnwritableDir = array();
 		$output = $this->isWritableDir($package->path);
-		if($output->toBool()==FALSE)
+		if ($output->toBool() == FALSE)
 		{
 			$directModuleInstall = FALSE;
 			$arrUnwritableDir[] = $output->get('path');
 		}
 
-		foreach($package->depends as $dep)
+		foreach ($package->depends as $dep)
 		{
 			$output = $this->isWritableDir($dep->path);
-			if($output->toBool()==FALSE)
+			if ($output->toBool() == FALSE)
 			{
 				$directModuleInstall = FALSE;
 				$arrUnwritableDir[] = $output->get('path');
 			}
 		}
 
-		if($directModuleInstall==FALSE)
+		if ($directModuleInstall == FALSE)
 		{
 			$output = new Object(-1, 'msg_direct_inall_invalid');
 			$output->add('path', $arrUnwritableDir);
@@ -396,17 +396,17 @@ 
 		$path_list = explode('/', dirname($path));
 		$real_path = './';
 
-		while($path_list)
+		while ($path_list)
 		{
-			$check_path = realpath($real_path . implode('/', $path_list));
-			if(FileHandler::isDir($check_path))
+			$check_path = realpath($real_path.implode('/', $path_list));
+			if (FileHandler::isDir($check_path))
 			{
 				break;
 			}
 			array_pop($path_list);
 		}
 
-		if(FileHandler::isWritableDir($check_path)==FALSE)
+		if (FileHandler::isWritableDir($check_path) == FALSE)
 		{
 			$output = new Object(-1, 'msg_unwritable_directory');
 			$output->add('path', FileHandler::getRealPath($check_path));

Braces +10 added lines, -20 removed lines

@@ -71,8 +71,7 @@ 
 		if($type == 'P')
 		{
 			$category_srl = $this->layout_category_srl;
-		}
-		else
+		} else
 		{
 			$category_srl = $this->mobile_layout_category_srl;
 		}
@@ -103,8 +102,7 @@ 
 		if($type == 'P')
 		{
 			$category_srl = $this->module_skin_category_srl;
-		}
-		else
+		} else
 		{
 			$category_srl = $this->module_mobile_skin_category_srl;
 		}
@@ -121,13 +119,11 @@ 
 		if($type == 'menu')
 		{
 			$params["act"] = "getResourceapiMenuPackageList";
-		}
-		elseif($type == 'skin')
+		} elseif($type == 'skin')
 		{
 			$params["act"] = "getResourceapiSkinPackageList";
 			$params['parent_program'] = $parent_program;
-		}
-		else
+		} else
 		{
 			$params["act"] = "getResourceapiPackagelist";
 		}
@@ -172,15 +168,13 @@ 
 		if($output->toBool()==TRUE)
 		{
 			$is_authed = 1;
-		}
-		else
+		} else
 		{
 			$ftp_info = Context::getFTPInfo();
 			if(!$ftp_info->ftp_root_path)
 			{
 				$is_authed = -1;
-			}
-			else
+			} else
 			{
 				$is_authed = (int) isset($_SESSION['ftp_password']);
 			}
@@ -216,8 +210,7 @@ 
 			if($packageInfo->type == 'core')
 			{
 				$title = 'XpressEngine';
-			}
-			else
+			} else
 			{
 				$configFile = $oModel->getConfigFilePath($packageInfo->type);
 				$xmlDoc = $xml->loadXmlFile(FileHandler::getRealPath($package->path) . $configFile);
@@ -238,8 +231,7 @@ 
 						$type = "layout";
 					}
 					$title = $xmlDoc->{$type}->title->body;
-				}
-				else
+				} else
 				{
 					$pathInfo = explode('/', $package->path);
 					$title = $pathInfo[count($pathInfo) - 1];
@@ -303,8 +295,7 @@ 
 					{
 						$package->depends[$key]->installed = FALSE;
 						$package->package_srl .= "," . $dep->package_srl;
-					}
-					else
+					} else
 					{
 						$package->depends[$key]->installed = TRUE;
 						$package->depends[$key]->cur_version = $packages[$dep->package_srl]->current_version;
@@ -318,8 +309,7 @@ 
 								$package->contain_core = TRUE;
 								$package->contain_core_version = $dep->version;
 							}
-						}
-						else
+						} else
 						{
 							$package->need_update = FALSE;
 						}

modules/member/member.model.php

Spacing +175 added lines, -175 removed lines

@@ -26,7 +26,7 @@ 
 	{
 		static $member_config;
 
-		if($member_config)
+		if ($member_config)
 		{
 			return $member_config;
 		}
@@ -35,42 +35,42 @@ 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
 
-		if(!$config->signupForm || !is_array($config->signupForm))
+		if (!$config->signupForm || !is_array($config->signupForm))
 		{
 			$oMemberAdminController = getAdminController('member');
 			$identifier = ($config->identifier) ? $config->identifier : 'email_address';
 			$config->signupForm = $oMemberAdminController->createSignupForm($identifier);
 		}
 		//for multi language
-		foreach($config->signupForm AS $key=>$value)
+		foreach ($config->signupForm AS $key=>$value)
 		{
 			$config->signupForm[$key]->title = ($value->isDefaultForm) ? Context::getLang($value->name) : $value->title;
-			if($config->signupForm[$key]->isPublic != 'N') $config->signupForm[$key]->isPublic = 'Y';
-			if($value->name == 'find_account_question') $config->signupForm[$key]->isPublic = 'N';
+			if ($config->signupForm[$key]->isPublic != 'N') $config->signupForm[$key]->isPublic = 'Y';
+			if ($value->name == 'find_account_question') $config->signupForm[$key]->isPublic = 'N';
 		}
 
 		// Get terms of user
 		$config->agreement = memberModel::_getAgreement();
 
-		if(!$config->webmaster_name) $config->webmaster_name = 'webmaster';
-		if(!$config->image_name_max_width) $config->image_name_max_width = 90;
-		if(!$config->image_name_max_height) $config->image_name_max_height = 20;
-		if(!$config->image_mark_max_width) $config->image_mark_max_width = 20;
-		if(!$config->image_mark_max_height) $config->image_mark_max_height = 20;
-		if(!$config->profile_image_max_width) $config->profile_image_max_width = 90;
-		if(!$config->profile_image_max_height) $config->profile_image_max_height = 90;
-		if(!$config->skin) $config->skin = 'default';
-		if(!$config->colorset) $config->colorset = 'white';
-		if(!$config->editor_skin || $config->editor_skin == 'default') $config->editor_skin = 'ckeditor';
-		if(!$config->group_image_mark) $config->group_image_mark = "N";
+		if (!$config->webmaster_name) $config->webmaster_name = 'webmaster';
+		if (!$config->image_name_max_width) $config->image_name_max_width = 90;
+		if (!$config->image_name_max_height) $config->image_name_max_height = 20;
+		if (!$config->image_mark_max_width) $config->image_mark_max_width = 20;
+		if (!$config->image_mark_max_height) $config->image_mark_max_height = 20;
+		if (!$config->profile_image_max_width) $config->profile_image_max_width = 90;
+		if (!$config->profile_image_max_height) $config->profile_image_max_height = 90;
+		if (!$config->skin) $config->skin = 'default';
+		if (!$config->colorset) $config->colorset = 'white';
+		if (!$config->editor_skin || $config->editor_skin == 'default') $config->editor_skin = 'ckeditor';
+		if (!$config->group_image_mark) $config->group_image_mark = "N";
 
-		if(!$config->identifier) $config->identifier = 'user_id';
+		if (!$config->identifier) $config->identifier = 'user_id';
 
-		if(!$config->max_error_count) $config->max_error_count = 10;
-		if(!$config->max_error_count_time) $config->max_error_count_time = 300;
+		if (!$config->max_error_count) $config->max_error_count = 10;
+		if (!$config->max_error_count_time) $config->max_error_count_time = 300;
 
-		if(!$config->signature_editor_skin || $config->signature_editor_skin == 'default') $config->signature_editor_skin = 'ckeditor';
-		if(!$config->sel_editor_colorset) $config->sel_editor_colorset = 'moono';
+		if (!$config->signature_editor_skin || $config->signature_editor_skin == 'default') $config->signature_editor_skin = 'ckeditor';
+		if (!$config->sel_editor_colorset) $config->sel_editor_colorset = 'moono';
 
 		$member_config = $config;
 
@@ -79,24 +79,24 @@ 
 
 	function _getAgreement()
 	{
-		$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt';
-		if(is_readable($agreement_file))
+		$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_'.Context::get('lang_type').'.txt';
+		if (is_readable($agreement_file))
 		{
 			return FileHandler::readFile($agreement_file);
 		}
 
 		$db_info = Context::getDBInfo();
-		$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . $db_info->lang_type . '.txt';
-		if(is_readable($agreement_file))
+		$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_'.$db_info->lang_type.'.txt';
+		if (is_readable($agreement_file))
 		{
 			return FileHandler::readFile($agreement_file);
 		}
 
 		$lang_selected = Context::loadLangSelected();
-		foreach($lang_selected as $key => $val)
+		foreach ($lang_selected as $key => $val)
 		{
-			$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . $key . '.txt';
-			if(is_readable($agreement_file))
+			$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_'.$key.'.txt';
+			if (is_readable($agreement_file))
 			{
 				return FileHandler::readFile($agreement_file);
 			}
@@ -116,12 +116,12 @@ 
 		$logged_info = Context::get('logged_info');
 		$act = Context::get('cur_act');
 		// When click user's own nickname
-		if($member_srl == $logged_info->member_srl) $member_info = $logged_info;
+		if ($member_srl == $logged_info->member_srl) $member_info = $logged_info;
 		// When click other's nickname
 		else $member_info = $this->getMemberInfoByMemberSrl($member_srl);
 
 		$member_srl = $member_info->member_srl;
-		if(!$member_srl) return;
+		if (!$member_srl) return;
 		// List variables
 		$user_id = $member_info->user_id;
 		$user_name = $member_info->user_name;
@@ -130,18 +130,18 @@ 
 
 		$oMemberController = getController('member');
 		// Display member information (Don't display to non-logged user)
-		if($logged_info->member_srl)
+		if ($logged_info->member_srl)
 		{
-			$url = getUrl('','mid',$mid,'act','dispMemberInfo','member_srl',$member_srl);
-			$oMemberController->addMemberPopupMenu($url,'cmd_view_member_info',$icon_path,'self');
+			$url = getUrl('', 'mid', $mid, 'act', 'dispMemberInfo', 'member_srl', $member_srl);
+			$oMemberController->addMemberPopupMenu($url, 'cmd_view_member_info', $icon_path, 'self');
 		}
 		// When click other's nickname
-		if($member_srl != $logged_info->member_srl && $logged_info->member_srl)
+		if ($member_srl != $logged_info->member_srl && $logged_info->member_srl)
 		{
 			// Get email config
-			foreach($this->module_config->signupForm as $field)
+			foreach ($this->module_config->signupForm as $field)
 			{
-				if($field->name == 'email_address')
+				if ($field->name == 'email_address')
 				{
 					$email_config = $field;
 					break;
@@ -149,36 +149,36 @@ 
 			}
 
 			// Send an email only if email address is public
-			if(($logged_info->is_admin == 'Y' || $email_config->isPublic == 'Y') && $member_info->email_address)
+			if (($logged_info->is_admin == 'Y' || $email_config->isPublic == 'Y') && $member_info->email_address)
 			{
 				$url = 'mailto:'.htmlspecialchars($member_info->email_address, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
-				$oMemberController->addMemberPopupMenu($url,'cmd_send_email',$icon_path);
+				$oMemberController->addMemberPopupMenu($url, 'cmd_send_email', $icon_path);
 			}
 		}
 		// View homepage info
-		if($member_info->homepage)
+		if ($member_info->homepage)
 			$oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->homepage, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), 'homepage', '', 'blank');
 		// View blog info
-		if($member_info->blog)
+		if ($member_info->blog)
 			$oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->blog, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), 'blog', '', 'blank');
 		// Call a trigger (after)
 		ModuleHandler::triggerCall('member.getMemberMenu', 'after', $null);
 		// Display a menu for editting member info to a top administrator
-		if($logged_info->is_admin == 'Y')
+		if ($logged_info->is_admin == 'Y')
 		{
-			$url = getUrl('','module','admin','act','dispMemberAdminInsert','member_srl',$member_srl);
-			$oMemberController->addMemberPopupMenu($url,'cmd_manage_member_info',$icon_path,'MemberModifyInfo');
+			$url = getUrl('', 'module', 'admin', 'act', 'dispMemberAdminInsert', 'member_srl', $member_srl);
+			$oMemberController->addMemberPopupMenu($url, 'cmd_manage_member_info', $icon_path, 'MemberModifyInfo');
 
-			$url = getUrl('','module','admin','act','dispDocumentAdminList','search_target','member_srl','search_keyword',$member_srl);
-			$oMemberController->addMemberPopupMenu($url,'cmd_trace_document',$icon_path,'TraceMemberDocument');
+			$url = getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList', 'search_target', 'member_srl', 'search_keyword', $member_srl);
+			$oMemberController->addMemberPopupMenu($url, 'cmd_trace_document', $icon_path, 'TraceMemberDocument');
 
-			$url = getUrl('','module','admin','act','dispCommentAdminList','search_target','member_srl','search_keyword',$member_srl);
-			$oMemberController->addMemberPopupMenu($url,'cmd_trace_comment',$icon_path,'TraceMemberComment');
+			$url = getUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_target', 'member_srl', 'search_keyword', $member_srl);
+			$oMemberController->addMemberPopupMenu($url, 'cmd_trace_comment', $icon_path, 'TraceMemberComment');
 		}
 		// Change a language of pop-up menu
 		$menus = Context::get('member_popup_menu_list');
 		$menus_count = count($menus);
-		for($i=0;$i<$menus_count;$i++)
+		for ($i = 0; $i < $menus_count; $i++)
 		{
 			$menus[$i]->str = Context::getLang($menus[$i]->str);
 		}
@@ -190,16 +190,16 @@ 
 	 * @brief Check if logged-in
 	 */
 	function isLogged() {
-		if($_SESSION['is_logged'])
+		if ($_SESSION['is_logged'])
 		{
-			if(Mobile::isFromMobilePhone())
+			if (Mobile::isFromMobilePhone())
 			{
 				return true;
 			}
-			elseif(filter_var($_SESSION['ipaddress'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
+			elseif (filter_var($_SESSION['ipaddress'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
 			{
 				// IPv6: require same /48
-				if(strncmp(inet_pton($_SESSION['ipaddress']), inet_pton($_SERVER['REMOTE_ADDR']), 6) == 0)
+				if (strncmp(inet_pton($_SESSION['ipaddress']), inet_pton($_SERVER['REMOTE_ADDR']), 6) == 0)
 				{
 					return true;
 				}
@@ -207,7 +207,7 @@ 
 			else
 			{
 				// IPv4: require same /24
-				if(ip2long($_SESSION['ipaddress']) >> 8 == ip2long($_SERVER['REMOTE_ADDR']) >> 8)
+				if (ip2long($_SESSION['ipaddress']) >> 8 == ip2long($_SERVER['REMOTE_ADDR']) >> 8)
 				{
 					return true;
 				}
@@ -224,23 +224,23 @@ 
 	function getLoggedInfo()
 	{
 		// Return session info if session info is requested and the user is logged-in
-		if($this->isLogged())
+		if ($this->isLogged())
 		{
 			$logged_info = Context::get('logged_info');
 			// Admin/Group list defined depending on site_module_info
 			$site_module_info = Context::get('site_module_info');
-			if($site_module_info->site_srl)
+			if ($site_module_info->site_srl)
 			{
 				$logged_info->group_list = $this->getMemberGroups($logged_info->member_srl, $site_module_info->site_srl);
 				// Add is_site_admin bool variable into logged_info if site_administrator is
 				$oModuleModel = getModel('module');
-				if($oModuleModel->isSiteAdmin($logged_info)) $logged_info->is_site_admin = true;
+				if ($oModuleModel->isSiteAdmin($logged_info)) $logged_info->is_site_admin = true;
 				else $logged_info->is_site_admin = false;
 			}
 			else
 			{
 				// Register a default group if the site doesn't have a member group
-				if(count($logged_info->group_list) === 0)
+				if (count($logged_info->group_list) === 0)
 				{
 					$default_group = $this->getDefaultGroup(0);
 					$oMemberController = getController('member');
@@ -263,13 +263,13 @@ 
 	 */
 	function getMemberInfoByUserID($user_id, $columnList = array())
 	{
-		if(!$user_id) return;
+		if (!$user_id) return;
 
 		$args = new stdClass;
 		$args->user_id = $user_id;
 		$output = executeQuery('member.getMemberInfo', $args);
-		if(!$output->toBool()) return $output;
-		if(!$output->data) return;
+		if (!$output->toBool()) return $output;
+		if (!$output->data) return;
 
 		$member_info = $this->arrangeMemberInfo($output->data);
 
@@ -281,12 +281,12 @@ 
 	 */
 	function getMemberInfoByEmailAddress($email_address)
 	{
-		if(!$email_address) return;
+		if (!$email_address) return;
 
 		$args = new stdClass();
 		
-		$db_info = Context::getDBInfo ();
-		if($db_info->master_db['db_type'] == "cubrid")
+		$db_info = Context::getDBInfo();
+		if ($db_info->master_db['db_type'] == "cubrid")
 		{
 			$args->email_address = strtolower($email_address);
 			$output = executeQuery('member.getMemberInfoByEmailAddressForCubrid', $args);
@@ -297,8 +297,8 @@ 
 			$output = executeQuery('member.getMemberInfoByEmailAddress', $args);
 		}
 		
-		if(!$output->toBool()) return $output;
-		if(!$output->data) return;
+		if (!$output->toBool()) return $output;
+		if (!$output->data) return;
 
 		$member_info = $this->arrangeMemberInfo($output->data);
 		return $member_info;
@@ -309,36 +309,36 @@ 
 	 */
 	function getMemberInfoByMemberSrl($member_srl, $site_srl = 0, $columnList = array())
 	{
-		if(!$member_srl) return;
+		if (!$member_srl) return;
 
 		//columnList size zero... get full member info
-		if(!$GLOBALS['__member_info__'][$member_srl] || count($columnList) == 0)
+		if (!$GLOBALS['__member_info__'][$member_srl] || count($columnList) == 0)
 		{
 			$GLOBALS['__member_info__'][$member_srl] = false;
 
 			$oCacheHandler = CacheHandler::getInstance('object');
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$columnList = array();
-				$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);
 				$GLOBALS['__member_info__'][$member_srl] = $oCacheHandler->get($cache_key);
 			}
 
-			if($GLOBALS['__member_info__'][$member_srl] === false)
+			if ($GLOBALS['__member_info__'][$member_srl] === false)
 			{
 				$args = new stdClass();
 				$args->member_srl = $member_srl;
 				$output = executeQuery('member.getMemberInfoByMemberSrl', $args, $columnList);
-				if(!$output->data) 
+				if (!$output->data) 
 				{
-					if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, new stdClass);
+					if ($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, new stdClass);
 					return;
 				}
 				$this->arrangeMemberInfo($output->data, $site_srl);
 
 				//insert in cache
-				if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $GLOBALS['__member_info__'][$member_srl]);
+				if ($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $GLOBALS['__member_info__'][$member_srl]);
 			}
 		}
 
@@ -350,7 +350,7 @@ 
 	 */
 	function arrangeMemberInfo($info, $site_srl = 0)
 	{
-		if(!$GLOBALS['__member_info__'][$info->member_srl])
+		if (!$GLOBALS['__member_info__'][$info->member_srl])
 		{
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('member');
@@ -359,25 +359,25 @@ 
 			$info->profile_image = $this->getProfileImage($info->member_srl);
 			$info->image_name = $this->getImageName($info->member_srl);
 			$info->image_mark = $this->getImageMark($info->member_srl);
-			if($config->group_image_mark=='Y')
+			if ($config->group_image_mark == 'Y')
 			{
-				$info->group_mark = $this->getGroupImageMark($info->member_srl,$site_srl);
+				$info->group_mark = $this->getGroupImageMark($info->member_srl, $site_srl);
 			}
 			$info->signature = $this->getSignature($info->member_srl);
 			$info->group_list = $this->getMemberGroups($info->member_srl, $site_srl);
 
 			$extra_vars = unserialize($info->extra_vars);
 			unset($info->extra_vars);
-			if($extra_vars)
+			if ($extra_vars)
 			{
-				foreach($extra_vars as $key => $val)
+				foreach ($extra_vars as $key => $val)
 				{
-					if(!is_array($val) && strpos($val, '|@|') !== FALSE) $val = explode('|@|', $val);
-					if(!$info->{$key}) $info->{$key} = $val;
+					if (!is_array($val) && strpos($val, '|@|') !== FALSE) $val = explode('|@|', $val);
+					if (!$info->{$key}) $info->{$key} = $val;
 				}
 			}
 
-			if(strlen($info->find_account_answer) == 32 && preg_match('/[a-zA-Z0-9]+/', $info->find_account_answer))
+			if (strlen($info->find_account_answer) == 32 && preg_match('/[a-zA-Z0-9]+/', $info->find_account_answer))
 			{
 				$info->find_account_answer = null;
 			}
@@ -389,13 +389,13 @@ 
 			$info->homepage = strip_tags($info->homepage);
 			$info->blog = strip_tags($info->blog);
 
-			if($extra_vars)
+			if ($extra_vars)
 			{
-				foreach($extra_vars as $key => $val)
+				foreach ($extra_vars as $key => $val)
 				{
-					if(is_array($val))
+					if (is_array($val))
 					{
-						$oSecurity->encodeHTML($key . '.');
+						$oSecurity->encodeHTML($key.'.');
 					}
 					else
 					{
@@ -406,12 +406,12 @@ 
 
 			// Check format.
 			$oValidator = new Validator();
-			if(!$oValidator->applyRule('url', $info->homepage))
+			if (!$oValidator->applyRule('url', $info->homepage))
 			{
 				$info->homepage = '';
 			}
 
-			if(!$oValidator->applyRule('url', $info->blog))
+			if (!$oValidator->applyRule('url', $info->blog))
 			{
 				$info->blog = '';
 			}
@@ -460,7 +460,7 @@ 
 	 */
 	function getLoggedMemberSrl()
 	{
-		if(!$this->isLogged()) return;
+		if (!$this->isLogged()) return;
 		return $_SESSION['member_srl'];
 	}
 
@@ -469,7 +469,7 @@ 
 	 */
 	function getLoggedUserID()
 	{
-		if(!$this->isLogged()) return;
+		if (!$this->isLogged()) return;
 		$logged_info = Context::get('logged_info');
 		return $logged_info->user_id;
 	}
@@ -484,16 +484,16 @@ 
 		// cache controll
 		$group_list = false;
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$object_key = 'member_groups:' . getNumberingPath($member_srl) . $member_srl . '_'.$site_srl;
+			$object_key = 'member_groups:'.getNumberingPath($member_srl).$member_srl.'_'.$site_srl;
 			$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
 			$group_list = $oCacheHandler->get($cache_key);
 		}
 
-		if(!$member_groups[$member_srl][$site_srl] || $force_reload)
+		if (!$member_groups[$member_srl][$site_srl] || $force_reload)
 		{
-			if($group_list === false)
+			if ($group_list === false)
 			{
 				$args = new stdClass();
 				$args->member_srl = $member_srl;
@@ -501,11 +501,11 @@ 
 				$output = executeQueryArray('member.getMemberGroups', $args);
 				$group_list = $output->data;
 				//insert in cache
-				if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $group_list);
+				if ($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $group_list);
 			}
-			if(!$group_list) return array();
+			if (!$group_list) return array();
 
-			foreach($group_list as $group)
+			foreach ($group_list as $group)
 			{
 				$result[$group->group_srl] = $group->title;
 			}
@@ -519,14 +519,14 @@ 
 	 */
 	function getMembersGroups($member_srls, $site_srl = 0)
 	{
-		$args->member_srls = implode(',',$member_srls);
+		$args->member_srls = implode(',', $member_srls);
 		$args->site_srl = $site_srl;
 		$args->sort_index = 'list_order';
 		$output = executeQueryArray('member.getMembersGroups', $args);
-		if(!$output->data) return array();
+		if (!$output->data) return array();
 
 		$result = array();
-		foreach($output->data as $key=>$val)
+		foreach ($output->data as $key=>$val)
 		{
 			$result[$val->member_srl][] = $val->title;
 		}
@@ -540,21 +540,21 @@ 
 	{
 		$default_group = false;
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$columnList = array();
-			$object_key = 'default_group_' . $site_srl;
+			$object_key = 'default_group_'.$site_srl;
 			$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
 			$default_group = $oCacheHandler->get($cache_key);
 		}
 
-		if($default_group === false)
+		if ($default_group === false)
 		{
 			$args = new stdClass();
 			$args->site_srl = $site_srl;
 			$output = executeQuery('member.getDefaultGroup', $args, $columnList);
 			$default_group = $output->data;
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$oCacheHandler->put($cache_key, $default_group);
 			}
@@ -588,25 +588,25 @@ 
 	 */
 	function getGroups($site_srl = 0)
 	{
-		if(!$GLOBALS['__group_info__'][$site_srl])
+		if (!$GLOBALS['__group_info__'][$site_srl])
 		{
 			$result = array();
 
-			if(!isset($site_srl))
+			if (!isset($site_srl))
 			{
 				$site_srl = 0;
 			}
 
 			$group_list = false;
 			$oCacheHandler = CacheHandler::getInstance('object', null, true);
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$object_key = 'member_groups:site_'.$site_srl;
 				$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
 				$group_list = $oCacheHandler->get($cache_key);
 			}
 
-			if($group_list === false)
+			if ($group_list === false)
 			{
 				$args = new stdClass();
 				$args->site_srl = $site_srl;
@@ -615,16 +615,16 @@ 
 				$output = executeQueryArray('member.getGroups', $args);
 				$group_list = $output->data;
 				//insert in cache
-				if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $group_list);
+				if ($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $group_list);
 			}
 
-			if(!$group_list)
+			if (!$group_list)
 			{
 				return array();
 			}
 
 
-			foreach($group_list as $val)
+			foreach ($group_list as $val)
 			{
 				$result[$val->group_srl] = $val;
 			}
@@ -655,7 +655,7 @@ 
 		// Set to ignore if a super administrator.
 		$logged_info = Context::get('logged_info');
 
-		if(!$this->join_form_list)
+		if (!$this->join_form_list)
 		{
 			// Argument setting to sort list_order column
 			$args = new stdClass();
@@ -663,11 +663,11 @@ 
 			$output = executeQuery('member.getJoinFormList', $args);
 			// NULL if output data deosn't exist
 			$join_form_list = $output->data;
-			if(!$join_form_list) return NULL;
+			if (!$join_form_list) return NULL;
 			// Need to unserialize because serialized array is inserted into DB in case of default_value
-			if(!is_array($join_form_list)) $join_form_list = array($join_form_list);
+			if (!is_array($join_form_list)) $join_form_list = array($join_form_list);
 			$join_form_count = count($join_form_list);
-			for($i=0;$i<$join_form_count;$i++)
+			for ($i = 0; $i < $join_form_count; $i++)
 			{
 				$join_form_list[$i]->column_name = strtolower($join_form_list[$i]->column_name);
 
@@ -679,10 +679,10 @@ 
 				// Add language variable
 				$lang->extend_vars[$column_name] = $column_title;
 				// unserialize if the data type if checkbox, select and so on
-				if(in_array($column_type, array('checkbox','select','radio')))
+				if (in_array($column_type, array('checkbox', 'select', 'radio')))
 				{
 					$join_form_list[$i]->default_value = unserialize($default_value);
-					if(!$join_form_list[$i]->default_value[0]) $join_form_list[$i]->default_value = '';
+					if (!$join_form_list[$i]->default_value[0]) $join_form_list[$i]->default_value = '';
 				}
 				else
 				{
@@ -694,16 +694,16 @@ 
 			$this->join_form_list = $list;
 		}
 		// Get object style if the filter_response is true
-		if($filter_response && count($this->join_form_list))
+		if ($filter_response && count($this->join_form_list))
 		{
-			foreach($this->join_form_list as $key => $val)
+			foreach ($this->join_form_list as $key => $val)
 			{
-				if($val->is_active != 'Y') continue;
+				if ($val->is_active != 'Y') continue;
 				unset($obj);
 				$obj->type = $val->column_type;
 				$obj->name = $val->column_name;
 				$obj->lang = $val->column_title;
-				if($logged_info->is_admin != 'Y') $obj->required = $val->required=='Y'?true:false;
+				if ($logged_info->is_admin != 'Y') $obj->required = $val->required == 'Y' ? true : false;
 				else $obj->required = false;
 				$filter_output[] = $obj;
 
@@ -730,15 +730,15 @@ 
 		$args->sort_index = "list_order";
 		$output = executeQueryArray('member.getJoinFormList', $args);
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return array();
 		}
 
 		$joinFormList = array();
-		foreach($output->data as $val)
+		foreach ($output->data as $val)
 		{
-			if($val->is_active != 'Y')
+			if ($val->is_active != 'Y')
 			{
 				continue;
 			}
@@ -755,20 +755,20 @@ 
 	function getCombineJoinForm($member_info)
 	{
 		$extend_form_list = $this->getJoinFormlist();
-		if(!$extend_form_list) return;
+		if (!$extend_form_list) return;
 		// Member info is open only to an administrator and him/herself when is_private is true.
 		$logged_info = Context::get('logged_info');
 
-		foreach($extend_form_list as $srl => $item)
+		foreach ($extend_form_list as $srl => $item)
 		{
 			$column_name = $item->column_name;
 			$value = $member_info->{$column_name};
 
 			// Change values depening on the type of extend form
-			switch($item->column_type)
+			switch ($item->column_type)
 			{
 				case 'checkbox' :
-					if($value && !is_array($value)) $value = array($value);
+					if ($value && !is_array($value)) $value = array($value);
 					break;
 				case 'text' :
 				case 'homepage' :
@@ -782,7 +782,7 @@ 
 
 			$extend_form_list[$srl]->value = $value;
 
-			if($member_info->{'open_'.$column_name}=='Y') $extend_form_list[$srl]->is_opened = true;
+			if ($member_info->{'open_'.$column_name} == 'Y') $extend_form_list[$srl]->is_opened = true;
 			else $extend_form_list[$srl]->is_opened = false;
 		}
 		return $extend_form_list;
@@ -796,12 +796,12 @@ 
 		$args->member_join_form_srl = $member_join_form_srl;
 		$output = executeQuery('member.getJoinForm', $args);
 		$join_form = $output->data;
-		if(!$join_form) return NULL;
+		if (!$join_form) return NULL;
 
 		$column_type = $join_form->column_type;
 		$default_value = $join_form->default_value;
 
-		if(in_array($column_type, array('checkbox','select','radio')))
+		if (in_array($column_type, array('checkbox', 'select', 'radio')))
 		{
 			$join_form->default_value = unserialize($default_value);
 		}
@@ -818,7 +818,7 @@ 
 	 */
 	function getDeniedIDList()
 	{
-		if(!$this->denied_id_list)
+		if (!$this->denied_id_list)
 		{
 			$args->sort_index = "list_order";
 			$args->page = Context::get('page');
@@ -834,14 +834,14 @@ 
 	function getDeniedIDs()
 	{
 		$output = executeQueryArray('member.getDeniedIDs');
-		if(!$output->toBool()) return array();
+		if (!$output->toBool()) return array();
 		return $output->data;
 	}
 
 	function getDeniedNickNames()
 	{
 		$output = executeQueryArray('member.getDeniedNickNames');
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return array();
 		}
@@ -857,7 +857,7 @@ 
 		$args = new stdClass();
 		$args->user_id = $user_id;
 		$output = executeQuery('member.chkDeniedID', $args);
-		if($output->data->count) return true;
+		if ($output->data->count) return true;
 		return false;
 	}
 
@@ -869,8 +869,8 @@ 
 		$args = new stdClass();
 		$args->nick_name = $nickName;
 		$output = executeQuery('member.chkDeniedNickName', $args);
-		if($output->data->count) return true;
-		if(!$output->toBool())
+		if ($output->data->count) return true;
+		if (!$output->toBool())
 		{
 			return true;
 		}
@@ -881,20 +881,20 @@ 
 	 */
 	function getProfileImage($member_srl)
 	{
-		if(!isset($GLOBALS['__member_info__']['profile_image'][$member_srl]))
+		if (!isset($GLOBALS['__member_info__']['profile_image'][$member_srl]))
 		{
 			$GLOBALS['__member_info__']['profile_image'][$member_srl] = null;
-			$exts = array('gif','jpg','png');
-			for($i=0;$i<3;$i++)
+			$exts = array('gif', 'jpg', 'png');
+			for ($i = 0; $i < 3; $i++)
 			{
 				$image_name_file = sprintf('files/member_extra_info/profile_image/%s%d.%s', getNumberingPath($member_srl), $member_srl, $exts[$i]);
-				if(file_exists($image_name_file))
+				if (file_exists($image_name_file))
 				{
 					list($width, $height, $type, $attrs) = getimagesize($image_name_file);
 					$info = new stdClass();
 					$info->width = $width;
 					$info->height = $height;
-					$info->src = Context::getRequestUri().$image_name_file . '?' . date('YmdHis', filemtime($image_name_file));
+					$info->src = Context::getRequestUri().$image_name_file.'?'.date('YmdHis', filemtime($image_name_file));
 					$info->file = './'.$image_name_file;
 					$GLOBALS['__member_info__']['profile_image'][$member_srl] = $info;
 					break;
@@ -910,16 +910,16 @@ 
 	 */
 	function getImageName($member_srl)
 	{
-		if(!isset($GLOBALS['__member_info__']['image_name'][$member_srl]))
+		if (!isset($GLOBALS['__member_info__']['image_name'][$member_srl]))
 		{
 			$image_name_file = sprintf('files/member_extra_info/image_name/%s%d.gif', getNumberingPath($member_srl), $member_srl);
-			if(file_exists($image_name_file))
+			if (file_exists($image_name_file))
 			{
 				list($width, $height, $type, $attrs) = getimagesize($image_name_file);
 				$info = new stdClass;
 				$info->width = $width;
 				$info->height = $height;
-				$info->src = Context::getRequestUri().$image_name_file. '?' . date('YmdHis', filemtime($image_name_file));
+				$info->src = Context::getRequestUri().$image_name_file.'?'.date('YmdHis', filemtime($image_name_file));
 				$info->file = './'.$image_name_file;
 				$GLOBALS['__member_info__']['image_name'][$member_srl] = $info;
 			}
@@ -933,15 +933,15 @@ 
 	 */
 	function getImageMark($member_srl)
 	{
-		if(!isset($GLOBALS['__member_info__']['image_mark'][$member_srl]))
+		if (!isset($GLOBALS['__member_info__']['image_mark'][$member_srl]))
 		{
 			$image_mark_file = sprintf('files/member_extra_info/image_mark/%s%d.gif', getNumberingPath($member_srl), $member_srl);
-			if(file_exists($image_mark_file))
+			if (file_exists($image_mark_file))
 			{
 				list($width, $height, $type, $attrs) = getimagesize($image_mark_file);
 				$info->width = $width;
 				$info->height = $height;
-				$info->src = Context::getRequestUri().$image_mark_file . '?' . date('YmdHis', filemtime($image_mark_file));
+				$info->src = Context::getRequestUri().$image_mark_file.'?'.date('YmdHis', filemtime($image_mark_file));
 				$info->file = './'.$image_mark_file;
 				$GLOBALS['__member_info__']['image_mark'][$member_srl] = $info;
 			}
@@ -955,27 +955,27 @@ 
 	/**
 	 * @brief Get the image mark of the group
 	 */
-	function getGroupImageMark($member_srl,$site_srl=0)
+	function getGroupImageMark($member_srl, $site_srl = 0)
 	{
-		if(!isset($GLOBALS['__member_info__']['group_image_mark'][$member_srl]))
+		if (!isset($GLOBALS['__member_info__']['group_image_mark'][$member_srl]))
 		{
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('member');
-			if($config->group_image_mark!='Y')
+			if ($config->group_image_mark != 'Y')
 			{
 				return null;
 			}
-			$member_group = $this->getMemberGroups($member_srl,$site_srl);
+			$member_group = $this->getMemberGroups($member_srl, $site_srl);
 			$groups_info = $this->getGroups($site_srl);
-			if(count($member_group) > 0 && is_array($member_group))
+			if (count($member_group) > 0 && is_array($member_group))
 			{
 				$memberGroups = array_keys($member_group);
 
-				foreach($groups_info as $group_srl=>$group_info)
+				foreach ($groups_info as $group_srl=>$group_info)
 				{
-					if(in_array($group_srl, $memberGroups))
+					if (in_array($group_srl, $memberGroups))
 					{
-						if($group_info->image_mark)
+						if ($group_info->image_mark)
 						{
 							$info = new stdClass();
 							$info->title = $group_info->title;
@@ -999,10 +999,10 @@ 
 	 */
 	function getSignature($member_srl)
 	{
-		if(!isset($GLOBALS['__member_info__']['signature'][$member_srl]))
+		if (!isset($GLOBALS['__member_info__']['signature'][$member_srl]))
 		{
 			$filename = sprintf('files/member_extra_info/signature/%s%d.signature.php', getNumberingPath($member_srl), $member_srl);
-			if(file_exists($filename))
+			if (file_exists($filename))
 			{
 				$buff = FileHandler::readFile($filename);
 				$signature = preg_replace('/<\?.*\?>/', '', $buff);
@@ -1020,10 +1020,10 @@ 
 	 * @param int $member_srl Set this to member_srl when comparing a member's password (optional)
 	 * @return bool
 	 */
-	function isValidPassword($hashed_password, $password_text, $member_srl=null)
+	function isValidPassword($hashed_password, $password_text, $member_srl = null)
 	{
 		// False if no password in entered
-		if(!$password_text)
+		if (!$password_text)
 		{
 			return false;
 		}
@@ -1032,31 +1032,31 @@ 
 		$oPassword = new Password();
 		$current_algorithm = $oPassword->checkAlgorithm($hashed_password);
 		$match = $oPassword->checkPassword($password_text, $hashed_password, $current_algorithm);
-		if(!$match)
+		if (!$match)
 		{
 			return false;
 		}
 		
 		// Update the encryption method if necessary
 		$config = $this->getMemberConfig();
-		if($member_srl > 0 && $config->password_hashing_auto_upgrade != 'N')
+		if ($member_srl > 0 && $config->password_hashing_auto_upgrade != 'N')
 		{
 			$need_upgrade = false;
 			
-			if(!$need_upgrade)
+			if (!$need_upgrade)
 			{
 				$required_algorithm = $oPassword->getCurrentlySelectedAlgorithm();
-				if($required_algorithm !== $current_algorithm) $need_upgrade = true;
+				if ($required_algorithm !== $current_algorithm) $need_upgrade = true;
 			}
 			
-			if(!$need_upgrade)
+			if (!$need_upgrade)
 			{
 				$required_work_factor = $oPassword->getWorkFactor();
 				$current_work_factor = $oPassword->checkWorkFactor($hashed_password);
-				if($current_work_factor !== false && $required_work_factor > $current_work_factor) $need_upgrade = true;
+				if ($current_work_factor !== false && $required_work_factor > $current_work_factor) $need_upgrade = true;
 			}
 			
-			if($need_upgrade === true)
+			if ($need_upgrade === true)
 			{
 				$args = new stdClass();
 				$args->member_srl = $member_srl;
@@ -1084,27 +1084,27 @@ 
 	function checkPasswordStrength($password, $strength)
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin == 'Y') return true;
+		if ($logged_info->is_admin == 'Y') return true;
 		
-		if($strength == NULL)
+		if ($strength == NULL)
 		{
 			$config = $this->getMemberConfig();
-			$strength = $config->password_strength?$config->password_strength:'normal';
+			$strength = $config->password_strength ? $config->password_strength : 'normal';
 		}
 		
 		$length = strlen($password);
 		
 		switch ($strength) {
 			case 'high':
-				if($length < 8 || !preg_match('/[^a-zA-Z0-9]/', $password)) return false;
+				if ($length < 8 || !preg_match('/[^a-zA-Z0-9]/', $password)) return false;
 				/* no break */
 				
 			case 'normal':
-				if($length < 6 || !preg_match('/[a-zA-Z]/', $password) || !preg_match('/[0-9]/', $password)) return false;
+				if ($length < 6 || !preg_match('/[a-zA-Z]/', $password) || !preg_match('/[0-9]/', $password)) return false;
 				break;
 				
 			case 'low':
-				if($length < 4) return false;
+				if ($length < 4) return false;
 				break; 
 		}
 		
@@ -1115,11 +1115,11 @@ 
 	{
 		$groupSrl = 0;
 		$output = $this->getGroups($site_srl);
-		if(is_array($output))
+		if (is_array($output))
 		{
-			foreach($output AS $key=>$value)
+			foreach ($output AS $key=>$value)
 			{
-				if($value->is_admin == 'Y')
+				if ($value->is_admin == 'Y')
 				{
 					$groupSrl = $value->group_srl;
 					break;

Braces +202 added lines, -83 removed lines

@@ -45,32 +45,68 @@ 
 		foreach($config->signupForm AS $key=>$value)
 		{
 			$config->signupForm[$key]->title = ($value->isDefaultForm) ? Context::getLang($value->name) : $value->title;
-			if($config->signupForm[$key]->isPublic != 'N') $config->signupForm[$key]->isPublic = 'Y';
-			if($value->name == 'find_account_question') $config->signupForm[$key]->isPublic = 'N';
+			if($config->signupForm[$key]->isPublic != 'N') {
+				$config->signupForm[$key]->isPublic = 'Y';
+			}
+			if($value->name == 'find_account_question') {
+				$config->signupForm[$key]->isPublic = 'N';
+			}
 		}
 
 		// Get terms of user
 		$config->agreement = memberModel::_getAgreement();
 
-		if(!$config->webmaster_name) $config->webmaster_name = 'webmaster';
-		if(!$config->image_name_max_width) $config->image_name_max_width = 90;
-		if(!$config->image_name_max_height) $config->image_name_max_height = 20;
-		if(!$config->image_mark_max_width) $config->image_mark_max_width = 20;
-		if(!$config->image_mark_max_height) $config->image_mark_max_height = 20;
-		if(!$config->profile_image_max_width) $config->profile_image_max_width = 90;
-		if(!$config->profile_image_max_height) $config->profile_image_max_height = 90;
-		if(!$config->skin) $config->skin = 'default';
-		if(!$config->colorset) $config->colorset = 'white';
-		if(!$config->editor_skin || $config->editor_skin == 'default') $config->editor_skin = 'ckeditor';
-		if(!$config->group_image_mark) $config->group_image_mark = "N";
+		if(!$config->webmaster_name) {
+			$config->webmaster_name = 'webmaster';
+		}
+		if(!$config->image_name_max_width) {
+			$config->image_name_max_width = 90;
+		}
+		if(!$config->image_name_max_height) {
+			$config->image_name_max_height = 20;
+		}
+		if(!$config->image_mark_max_width) {
+			$config->image_mark_max_width = 20;
+		}
+		if(!$config->image_mark_max_height) {
+			$config->image_mark_max_height = 20;
+		}
+		if(!$config->profile_image_max_width) {
+			$config->profile_image_max_width = 90;
+		}
+		if(!$config->profile_image_max_height) {
+			$config->profile_image_max_height = 90;
+		}
+		if(!$config->skin) {
+			$config->skin = 'default';
+		}
+		if(!$config->colorset) {
+			$config->colorset = 'white';
+		}
+		if(!$config->editor_skin || $config->editor_skin == 'default') {
+			$config->editor_skin = 'ckeditor';
+		}
+		if(!$config->group_image_mark) {
+			$config->group_image_mark = "N";
+		}
 
-		if(!$config->identifier) $config->identifier = 'user_id';
+		if(!$config->identifier) {
+			$config->identifier = 'user_id';
+		}
 
-		if(!$config->max_error_count) $config->max_error_count = 10;
-		if(!$config->max_error_count_time) $config->max_error_count_time = 300;
+		if(!$config->max_error_count) {
+			$config->max_error_count = 10;
+		}
+		if(!$config->max_error_count_time) {
+			$config->max_error_count_time = 300;
+		}
 
-		if(!$config->signature_editor_skin || $config->signature_editor_skin == 'default') $config->signature_editor_skin = 'ckeditor';
-		if(!$config->sel_editor_colorset) $config->sel_editor_colorset = 'moono';
+		if(!$config->signature_editor_skin || $config->signature_editor_skin == 'default') {
+			$config->signature_editor_skin = 'ckeditor';
+		}
+		if(!$config->sel_editor_colorset) {
+			$config->sel_editor_colorset = 'moono';
+		}
 
 		$member_config = $config;
 
@@ -116,12 +152,18 @@ 
 		$logged_info = Context::get('logged_info');
 		$act = Context::get('cur_act');
 		// When click user's own nickname
-		if($member_srl == $logged_info->member_srl) $member_info = $logged_info;
+		if($member_srl == $logged_info->member_srl) {
+			$member_info = $logged_info;
+		}
 		// When click other's nickname
-		else $member_info = $this->getMemberInfoByMemberSrl($member_srl);
+		else {
+			$member_info = $this->getMemberInfoByMemberSrl($member_srl);
+		}
 
 		$member_srl = $member_info->member_srl;
-		if(!$member_srl) return;
+		if(!$member_srl) {
+			return;
+		}
 		// List variables
 		$user_id = $member_info->user_id;
 		$user_name = $member_info->user_name;
@@ -156,11 +198,13 @@ 
 			}
 		}
 		// View homepage info
-		if($member_info->homepage)
-			$oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->homepage, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), 'homepage', '', 'blank');
+		if($member_info->homepage) {
+					$oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->homepage, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), 'homepage', '', 'blank');
+		}
 		// View blog info
-		if($member_info->blog)
-			$oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->blog, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), 'blog', '', 'blank');
+		if($member_info->blog) {
+					$oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->blog, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), 'blog', '', 'blank');
+		}
 		// Call a trigger (after)
 		ModuleHandler::triggerCall('member.getMemberMenu', 'after', $null);
 		// Display a menu for editting member info to a top administrator
@@ -195,16 +239,14 @@ 
 			if(Mobile::isFromMobilePhone())
 			{
 				return true;
-			}
-			elseif(filter_var($_SESSION['ipaddress'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
+			} elseif(filter_var($_SESSION['ipaddress'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
 			{
 				// IPv6: require same /48
 				if(strncmp(inet_pton($_SESSION['ipaddress']), inet_pton($_SERVER['REMOTE_ADDR']), 6) == 0)
 				{
 					return true;
 				}
-			}
-			else
+			} else
 			{
 				// IPv4: require same /24
 				if(ip2long($_SESSION['ipaddress']) >> 8 == ip2long($_SERVER['REMOTE_ADDR']) >> 8)
@@ -234,10 +276,12 @@ 
 				$logged_info->group_list = $this->getMemberGroups($logged_info->member_srl, $site_module_info->site_srl);
 				// Add is_site_admin bool variable into logged_info if site_administrator is
 				$oModuleModel = getModel('module');
-				if($oModuleModel->isSiteAdmin($logged_info)) $logged_info->is_site_admin = true;
-				else $logged_info->is_site_admin = false;
-			}
-			else
+				if($oModuleModel->isSiteAdmin($logged_info)) {
+					$logged_info->is_site_admin = true;
+				} else {
+					$logged_info->is_site_admin = false;
+				}
+			} else
 			{
 				// Register a default group if the site doesn't have a member group
 				if(count($logged_info->group_list) === 0)
@@ -263,13 +307,19 @@ 
 	 */
 	function getMemberInfoByUserID($user_id, $columnList = array())
 	{
-		if(!$user_id) return;
+		if(!$user_id) {
+			return;
+		}
 
 		$args = new stdClass;
 		$args->user_id = $user_id;
 		$output = executeQuery('member.getMemberInfo', $args);
-		if(!$output->toBool()) return $output;
-		if(!$output->data) return;
+		if(!$output->toBool()) {
+			return $output;
+		}
+		if(!$output->data) {
+			return;
+		}
 
 		$member_info = $this->arrangeMemberInfo($output->data);
 
@@ -281,7 +331,9 @@ 
 	 */
 	function getMemberInfoByEmailAddress($email_address)
 	{
-		if(!$email_address) return;
+		if(!$email_address) {
+			return;
+		}
 
 		$args = new stdClass();
 		
@@ -290,15 +342,18 @@ 
 		{
 			$args->email_address = strtolower($email_address);
 			$output = executeQuery('member.getMemberInfoByEmailAddressForCubrid', $args);
-		}
-		else
+		} else
 		{
 			$args->email_address = $email_address;
 			$output = executeQuery('member.getMemberInfoByEmailAddress', $args);
 		}
 		
-		if(!$output->toBool()) return $output;
-		if(!$output->data) return;
+		if(!$output->toBool()) {
+			return $output;
+		}
+		if(!$output->data) {
+			return;
+		}
 
 		$member_info = $this->arrangeMemberInfo($output->data);
 		return $member_info;
@@ -309,7 +364,9 @@ 
 	 */
 	function getMemberInfoByMemberSrl($member_srl, $site_srl = 0, $columnList = array())
 	{
-		if(!$member_srl) return;
+		if(!$member_srl) {
+			return;
+		}
 
 		//columnList size zero... get full member info
 		if(!$GLOBALS['__member_info__'][$member_srl] || count($columnList) == 0)
@@ -332,13 +389,17 @@ 
 				$output = executeQuery('member.getMemberInfoByMemberSrl', $args, $columnList);
 				if(!$output->data) 
 				{
-					if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, new stdClass);
+					if($oCacheHandler->isSupport()) {
+						$oCacheHandler->put($cache_key, new stdClass);
+					}
 					return;
 				}
 				$this->arrangeMemberInfo($output->data, $site_srl);
 
 				//insert in cache
-				if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $GLOBALS['__member_info__'][$member_srl]);
+				if($oCacheHandler->isSupport()) {
+					$oCacheHandler->put($cache_key, $GLOBALS['__member_info__'][$member_srl]);
+				}
 			}
 		}
 
@@ -372,8 +433,12 @@ 
 			{
 				foreach($extra_vars as $key => $val)
 				{
-					if(!is_array($val) && strpos($val, '|@|') !== FALSE) $val = explode('|@|', $val);
-					if(!$info->{$key}) $info->{$key} = $val;
+					if(!is_array($val) && strpos($val, '|@|') !== FALSE) {
+						$val = explode('|@|', $val);
+					}
+					if(!$info->{$key}) {
+						$info->{$key} = $val;
+					}
 				}
 			}
 
@@ -396,8 +461,7 @@ 
 					if(is_array($val))
 					{
 						$oSecurity->encodeHTML($key . '.');
-					}
-					else
+					} else
 					{
 						$oSecurity->encodeHTML($key);
 					}
@@ -460,7 +524,9 @@ 
 	 */
 	function getLoggedMemberSrl()
 	{
-		if(!$this->isLogged()) return;
+		if(!$this->isLogged()) {
+			return;
+		}
 		return $_SESSION['member_srl'];
 	}
 
@@ -469,7 +535,9 @@ 
 	 */
 	function getLoggedUserID()
 	{
-		if(!$this->isLogged()) return;
+		if(!$this->isLogged()) {
+			return;
+		}
 		$logged_info = Context::get('logged_info');
 		return $logged_info->user_id;
 	}
@@ -501,9 +569,13 @@ 
 				$output = executeQueryArray('member.getMemberGroups', $args);
 				$group_list = $output->data;
 				//insert in cache
-				if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $group_list);
+				if($oCacheHandler->isSupport()) {
+					$oCacheHandler->put($cache_key, $group_list);
+				}
+			}
+			if(!$group_list) {
+				return array();
 			}
-			if(!$group_list) return array();
 
 			foreach($group_list as $group)
 			{
@@ -523,7 +595,9 @@ 
 		$args->site_srl = $site_srl;
 		$args->sort_index = 'list_order';
 		$output = executeQueryArray('member.getMembersGroups', $args);
-		if(!$output->data) return array();
+		if(!$output->data) {
+			return array();
+		}
 
 		$result = array();
 		foreach($output->data as $key=>$val)
@@ -615,7 +689,9 @@ 
 				$output = executeQueryArray('member.getGroups', $args);
 				$group_list = $output->data;
 				//insert in cache
-				if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $group_list);
+				if($oCacheHandler->isSupport()) {
+					$oCacheHandler->put($cache_key, $group_list);
+				}
 			}
 
 			if(!$group_list)
@@ -663,9 +739,13 @@ 
 			$output = executeQuery('member.getJoinFormList', $args);
 			// NULL if output data deosn't exist
 			$join_form_list = $output->data;
-			if(!$join_form_list) return NULL;
+			if(!$join_form_list) {
+				return NULL;
+			}
 			// Need to unserialize because serialized array is inserted into DB in case of default_value
-			if(!is_array($join_form_list)) $join_form_list = array($join_form_list);
+			if(!is_array($join_form_list)) {
+				$join_form_list = array($join_form_list);
+			}
 			$join_form_count = count($join_form_list);
 			for($i=0;$i<$join_form_count;$i++)
 			{
@@ -682,9 +762,10 @@ 
 				if(in_array($column_type, array('checkbox','select','radio')))
 				{
 					$join_form_list[$i]->default_value = unserialize($default_value);
-					if(!$join_form_list[$i]->default_value[0]) $join_form_list[$i]->default_value = '';
-				}
-				else
+					if(!$join_form_list[$i]->default_value[0]) {
+						$join_form_list[$i]->default_value = '';
+					}
+				} else
 				{
 					$join_form_list[$i]->default_value = '';
 				}
@@ -698,13 +779,18 @@ 
 		{
 			foreach($this->join_form_list as $key => $val)
 			{
-				if($val->is_active != 'Y') continue;
+				if($val->is_active != 'Y') {
+					continue;
+				}
 				unset($obj);
 				$obj->type = $val->column_type;
 				$obj->name = $val->column_name;
 				$obj->lang = $val->column_title;
-				if($logged_info->is_admin != 'Y') $obj->required = $val->required=='Y'?true:false;
-				else $obj->required = false;
+				if($logged_info->is_admin != 'Y') {
+					$obj->required = $val->required=='Y'?true:false;
+				} else {
+					$obj->required = false;
+				}
 				$filter_output[] = $obj;
 
 				unset($open_obj);
@@ -755,7 +841,9 @@ 
 	function getCombineJoinForm($member_info)
 	{
 		$extend_form_list = $this->getJoinFormlist();
-		if(!$extend_form_list) return;
+		if(!$extend_form_list) {
+			return;
+		}
 		// Member info is open only to an administrator and him/herself when is_private is true.
 		$logged_info = Context::get('logged_info');
 
@@ -768,7 +856,9 @@ 
 			switch($item->column_type)
 			{
 				case 'checkbox' :
-					if($value && !is_array($value)) $value = array($value);
+					if($value && !is_array($value)) {
+						$value = array($value);
+					}
 					break;
 				case 'text' :
 				case 'homepage' :
@@ -782,8 +872,11 @@ 
 
 			$extend_form_list[$srl]->value = $value;
 
-			if($member_info->{'open_'.$column_name}=='Y') $extend_form_list[$srl]->is_opened = true;
-			else $extend_form_list[$srl]->is_opened = false;
+			if($member_info->{'open_'.$column_name}=='Y') {
+				$extend_form_list[$srl]->is_opened = true;
+			} else {
+				$extend_form_list[$srl]->is_opened = false;
+			}
 		}
 		return $extend_form_list;
 	}
@@ -796,7 +889,9 @@ 
 		$args->member_join_form_srl = $member_join_form_srl;
 		$output = executeQuery('member.getJoinForm', $args);
 		$join_form = $output->data;
-		if(!$join_form) return NULL;
+		if(!$join_form) {
+			return NULL;
+		}
 
 		$column_type = $join_form->column_type;
 		$default_value = $join_form->default_value;
@@ -804,8 +899,7 @@ 
 		if(in_array($column_type, array('checkbox','select','radio')))
 		{
 			$join_form->default_value = unserialize($default_value);
-		}
-		else
+		} else
 		{
 			$join_form->default_value = '';
 		}
@@ -834,7 +928,9 @@ 
 	function getDeniedIDs()
 	{
 		$output = executeQueryArray('member.getDeniedIDs');
-		if(!$output->toBool()) return array();
+		if(!$output->toBool()) {
+			return array();
+		}
 		return $output->data;
 	}
 
@@ -857,7 +953,9 @@ 
 		$args = new stdClass();
 		$args->user_id = $user_id;
 		$output = executeQuery('member.chkDeniedID', $args);
-		if($output->data->count) return true;
+		if($output->data->count) {
+			return true;
+		}
 		return false;
 	}
 
@@ -869,7 +967,9 @@ 
 		$args = new stdClass();
 		$args->nick_name = $nickName;
 		$output = executeQuery('member.chkDeniedNickName', $args);
-		if($output->data->count) return true;
+		if($output->data->count) {
+			return true;
+		}
 		if(!$output->toBool())
 		{
 			return true;
@@ -922,8 +1022,9 @@ 
 				$info->src = Context::getRequestUri().$image_name_file. '?' . date('YmdHis', filemtime($image_name_file));
 				$info->file = './'.$image_name_file;
 				$GLOBALS['__member_info__']['image_name'][$member_srl] = $info;
+			} else {
+				$GLOBALS['__member_info__']['image_name'][$member_srl] = null;
 			}
-			else $GLOBALS['__member_info__']['image_name'][$member_srl] = null;
 		}
 		return $GLOBALS['__member_info__']['image_name'][$member_srl];
 	}
@@ -944,8 +1045,9 @@ 
 				$info->src = Context::getRequestUri().$image_mark_file . '?' . date('YmdHis', filemtime($image_mark_file));
 				$info->file = './'.$image_mark_file;
 				$GLOBALS['__member_info__']['image_mark'][$member_srl] = $info;
+			} else {
+				$GLOBALS['__member_info__']['image_mark'][$member_srl] = null;
 			}
-			else $GLOBALS['__member_info__']['image_mark'][$member_srl] = null;
 		}
 
 		return $GLOBALS['__member_info__']['image_mark'][$member_srl];
@@ -987,9 +1089,13 @@ 
 					}
 				}
 			}
-			if (!$info) $GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N';
+			if (!$info) {
+				$GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N';
+			}
+		}
+		if ($GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N') {
+			return null;
 		}
-		if ($GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N') return null;
 
 		return $GLOBALS['__member_info__']['group_image_mark'][$member_srl];
 	}
@@ -1007,8 +1113,9 @@ 
 				$buff = FileHandler::readFile($filename);
 				$signature = preg_replace('/<\?.*\?>/', '', $buff);
 				$GLOBALS['__member_info__']['signature'][$member_srl] = $signature;
+			} else {
+				$GLOBALS['__member_info__']['signature'][$member_srl] = null;
 			}
-			else $GLOBALS['__member_info__']['signature'][$member_srl] = null;
 		}
 		return $GLOBALS['__member_info__']['signature'][$member_srl];
 	}
@@ -1046,14 +1153,18 @@ 
 			if(!$need_upgrade)
 			{
 				$required_algorithm = $oPassword->getCurrentlySelectedAlgorithm();
-				if($required_algorithm !== $current_algorithm) $need_upgrade = true;
+				if($required_algorithm !== $current_algorithm) {
+					$need_upgrade = true;
+				}
 			}
 			
 			if(!$need_upgrade)
 			{
 				$required_work_factor = $oPassword->getWorkFactor();
 				$current_work_factor = $oPassword->checkWorkFactor($hashed_password);
-				if($current_work_factor !== false && $required_work_factor > $current_work_factor) $need_upgrade = true;
+				if($current_work_factor !== false && $required_work_factor > $current_work_factor) {
+					$need_upgrade = true;
+				}
 			}
 			
 			if($need_upgrade === true)
@@ -1084,7 +1195,9 @@ 
 	function checkPasswordStrength($password, $strength)
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin == 'Y') return true;
+		if($logged_info->is_admin == 'Y') {
+			return true;
+		}
 		
 		if($strength == NULL)
 		{
@@ -1096,15 +1209,21 @@ 
 		
 		switch ($strength) {
 			case 'high':
-				if($length < 8 || !preg_match('/[^a-zA-Z0-9]/', $password)) return false;
+				if($length < 8 || !preg_match('/[^a-zA-Z0-9]/', $password)) {
+					return false;
+				}
 				/* no break */
 				
 			case 'normal':
-				if($length < 6 || !preg_match('/[a-zA-Z]/', $password) || !preg_match('/[0-9]/', $password)) return false;
+				if($length < 6 || !preg_match('/[a-zA-Z]/', $password) || !preg_match('/[0-9]/', $password)) {
+					return false;
+				}
 				break;
 				
 			case 'low':
-				if($length < 4) return false;
+				if($length < 4) {
+					return false;
+				}
 				break; 
 		}
 		

modules/board/board.class.php

Spacing +12 added lines, -12 removed lines

@@ -9,7 +9,7 @@ 
 
 class board extends ModuleObject
 {
-	var $search_option = array('title_content','title','content','comment','user_name','nick_name','user_id','tag'); ///< 검색 옵션
+	var $search_option = array('title_content', 'title', 'content', 'comment', 'user_name', 'nick_name', 'user_id', 'tag'); ///< 검색 옵션
 
 	var $order_target = array('list_order', 'update_order', 'regdate', 'voted_count', 'blamed_count', 'readed_count', 'comment_count', 'title', 'nick_name', 'user_name', 'user_id'); // 정렬 옵션
 
@@ -25,14 +25,14 @@ 
 	 */
 	function board()
 	{
-		if(!Context::isInstalled()) return;
+		if (!Context::isInstalled()) return;
 
-		if(!Context::isExistsSSLAction('dispBoardWrite') && Context::getSslStatus() == 'optional')
+		if (!Context::isExistsSSLAction('dispBoardWrite') && Context::getSslStatus() == 'optional')
 		{
 			$ssl_actions = array('dispBoardWrite', 'dispBoardWriteComment', 'dispBoardReplyComment', 'dispBoardModifyComment', 'dispBoardDelete', 'dispBoardDeleteComment', 'procBoardInsertDocument', 'procBoardDeleteDocument', 'procBoardInsertComment', 'procBoardDeleteComment', 'procBoardVerificationPassword');
 			Context::addSSLActions($ssl_actions);
 		}
-		if(!Context::isExistsSSLAction('dispTempSavedList') && Context::getSslStatus() == 'optional')
+		if (!Context::isExistsSSLAction('dispTempSavedList') && Context::getSslStatus() == 'optional')
 		{
 			Context::addSSLAction('dispTempSavedList');
 		}
@@ -54,7 +54,7 @@ 
 		$args = new stdClass;
 		$args->site_srl = 0;
 		$output = executeQuery('module.getSite', $args);
-		if(!$output->data->index_module_srl)
+		if (!$output->data->index_module_srl)
 		{
 			$args->mid = 'board';
 			$args->module = 'board';
@@ -63,7 +63,7 @@ 
 			$args->site_srl = 0;
 			$output = $oModuleController->insertModule($args);
 
-			if($output->toBool())
+			if ($output->toBool())
 			{
 				$module_srl = $output->get('module_srl');
 
@@ -87,10 +87,10 @@ 
 		$oModuleModel = getModel('module');
 
 		// 2007. 10. 17 get the member menu trigger
-		if(!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after')) return true;
+		if (!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after')) return true;
 
 		// 2011. 09. 20 when add new menu in sitemap, custom menu add
-		if(!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after')) return true;
+		if (!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after')) return true;
 		return false;
 	}
 
@@ -103,13 +103,13 @@ 
 		$oModuleController = getController('module');
 
 		// 2007. 10. 17  check the member menu trigger, if it is not existed then insert
-		if(!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after'))
+		if (!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after'))
 		{
 			$oModuleController->insertTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after');
 		}
 
 		// 2011. 09. 20 when add new menu in sitemap, custom menu add
-		if(!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after'))
+		if (!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after'))
 		{
 			$oModuleController->insertTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after');
 		}
@@ -120,12 +120,12 @@ 
 	function moduleUninstall()
 	{
 		$output = executeQueryArray("board.getAllBoard");
-		if(!$output->data) return new Object();
+		if (!$output->data) return new Object();
 		@set_time_limit(0);
 
 		$oModuleController = getController('module');
 
-		foreach($output->data as $board)
+		foreach ($output->data as $board)
 		{
 			$oModuleController->deleteModule($board->module_srl);
 		}

modules/file/file.model.php

Spacing +50 added lines, -50 removed lines

@@ -29,24 +29,24 @@ 
 		$mid = Context::get('mid');
 		$editor_sequence = Context::get('editor_sequence');
 		$upload_target_srl = Context::get('upload_target_srl');
-		if(!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		if (!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
 
-		if($upload_target_srl)
+		if ($upload_target_srl)
 		{
 			$tmp_files = $this->getFiles($upload_target_srl);
 			$file_count = count($tmp_files);
 
-			for($i=0;$i<$file_count;$i++)
+			for ($i = 0; $i < $file_count; $i++)
 			{
 				$file_info = $tmp_files[$i];
-				if(!$file_info->file_srl) continue;
+				if (!$file_info->file_srl) continue;
 
 				$obj = new stdClass;
 				$obj->file_srl = $file_info->file_srl;
 				$obj->source_filename = $file_info->source_filename;
 				$obj->file_size = $file_info->file_size;
 				$obj->disp_file_size = FileHandler::filesize($file_info->file_size);
-				if($file_info->direct_download=='N') $obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid, $file_info->module_srl);
+				if ($file_info->direct_download == 'N') $obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid, $file_info->module_srl);
 				else $obj->download_url = str_replace('./', '', $file_info->uploaded_filename);
 				$obj->direct_download = $file_info->direct_download;
 				$obj->cover_image = ($file_info->cover_image === 'Y') ? true : false;
@@ -66,17 +66,17 @@ 
 		//$config = $oModuleModel->getModuleInfoByMid($mid);	//perhaps config varialbles not used
 
 		$file_config = $this->getUploadConfig();
-		$left_size = $file_config->allowed_attach_size*1024*1024 - $attached_size;
+		$left_size = $file_config->allowed_attach_size * 1024 * 1024 - $attached_size;
 		// Settings of required information
 		$attached_size = FileHandler::filesize($attached_size);
-		$allowed_attach_size = FileHandler::filesize($file_config->allowed_attach_size*1024*1024);
-		$allowed_filesize = FileHandler::filesize($file_config->allowed_filesize*1024*1024);
+		$allowed_attach_size = FileHandler::filesize($file_config->allowed_attach_size * 1024 * 1024);
+		$allowed_filesize = FileHandler::filesize($file_config->allowed_filesize * 1024 * 1024);
 		$allowed_filetypes = $file_config->allowed_filetypes;
-		$this->add("files",$files);
-		$this->add("editor_sequence",$editor_sequence);
-		$this->add("upload_target_srl",$upload_target_srl);
-		$this->add("upload_status",$upload_status);
-		$this->add("left_size",$left_size);
+		$this->add("files", $files);
+		$this->add("editor_sequence", $editor_sequence);
+		$this->add("upload_target_srl", $upload_target_srl);
+		$this->add("upload_status", $upload_status);
+		$this->add("left_size", $left_size);
 		$this->add('attached_size', $attached_size);
 		$this->add('allowed_attach_size', $allowed_attach_size);
 		$this->add('allowed_filesize', $allowed_filesize);
@@ -94,7 +94,7 @@ 
 		$args = new stdClass();
 		$args->upload_target_srl = $upload_target_srl;
 		$output = executeQuery('file.getFilesCount', $args);
-		return (int)$output->data->count;
+		return (int) $output->data->count;
 	}
 
 	/**
@@ -104,7 +104,7 @@ 
 	 * @param string $sid
 	 * @return string Returns a url
 	 */
-	function getDownloadUrl($file_srl, $sid, $module_srl="")
+	function getDownloadUrl($file_srl, $sid, $module_srl = "")
 	{
 		return sprintf('?module=%s&amp;act=%s&amp;file_srl=%s&amp;sid=%s&amp;module_srl=%s', 'file', 'procFileDownload', $file_srl, $sid, $module_srl);
 	}
@@ -122,12 +122,12 @@ 
 
 		$file_module_config = $oModuleModel->getModuleConfig('file');
 
-		if($module_srl) $file_config = $oModuleModel->getModulePartConfig('file',$module_srl);
-		if(!$file_config) $file_config = $file_module_config;
+		if ($module_srl) $file_config = $oModuleModel->getModulePartConfig('file', $module_srl);
+		if (!$file_config) $file_config = $file_module_config;
 
 		$config = new stdClass();
 
-		if($file_config)
+		if ($file_config)
 		{
 			$config->allowed_filesize = $file_config->allowed_filesize;
 			$config->allowed_attach_size = $file_config->allowed_attach_size;
@@ -138,31 +138,31 @@ 
 			$config->allow_outlink_format = $file_config->allow_outlink_format;
 		}
 		// Property for all files comes first than each property
-		if(!$config->allowed_filesize) $config->allowed_filesize = $file_module_config->allowed_filesize;
-		if(!$config->allowed_attach_size) $config->allowed_attach_size = $file_module_config->allowed_attach_size;
-		if(!$config->allowed_filetypes) $config->allowed_filetypes = $file_module_config->allowed_filetypes;
-		if(!$config->allow_outlink) $config->allow_outlink = $file_module_config->allow_outlink;
-		if(!$config->allow_outlink_site) $config->allow_outlink_site = $file_module_config->allow_outlink_site;
-		if(!$config->allow_outlink_format) $config->allow_outlink_format = $file_module_config->allow_outlink_format;
-		if(!$config->download_grant) $config->download_grant = $file_module_config->download_grant;
+		if (!$config->allowed_filesize) $config->allowed_filesize = $file_module_config->allowed_filesize;
+		if (!$config->allowed_attach_size) $config->allowed_attach_size = $file_module_config->allowed_attach_size;
+		if (!$config->allowed_filetypes) $config->allowed_filetypes = $file_module_config->allowed_filetypes;
+		if (!$config->allow_outlink) $config->allow_outlink = $file_module_config->allow_outlink;
+		if (!$config->allow_outlink_site) $config->allow_outlink_site = $file_module_config->allow_outlink_site;
+		if (!$config->allow_outlink_format) $config->allow_outlink_format = $file_module_config->allow_outlink_format;
+		if (!$config->download_grant) $config->download_grant = $file_module_config->download_grant;
 		// Default setting if not exists
-		if(!$config->allowed_filesize) $config->allowed_filesize = '2';
-		if(!$config->allowed_attach_size) $config->allowed_attach_size = '3';
-		if(!$config->allowed_filetypes) $config->allowed_filetypes = '*.*';
-		if(!$config->allow_outlink) $config->allow_outlink = 'Y';
-		if(!$config->download_grant) $config->download_grant = array();
+		if (!$config->allowed_filesize) $config->allowed_filesize = '2';
+		if (!$config->allowed_attach_size) $config->allowed_attach_size = '3';
+		if (!$config->allowed_filetypes) $config->allowed_filetypes = '*.*';
+		if (!$config->allow_outlink) $config->allow_outlink = 'Y';
+		if (!$config->download_grant) $config->download_grant = array();
 
 		$size = ini_get('upload_max_filesize');
 		$unit = strtolower($size[strlen($size) - 1]);
-		$size = (float)$size;
-		if($unit == 'g') $size *= 1024;
-		if($unit == 'k') $size /= 1024;
+		$size = (float) $size;
+		if ($unit == 'g') $size *= 1024;
+		if ($unit == 'k') $size /= 1024;
 
-		if($config->allowed_filesize > $size) 
+		if ($config->allowed_filesize > $size) 
 		{	
 			$config->allowed_filesize = $size;
 		}
-		if($config->allowed_attach_size > $size) 
+		if ($config->allowed_attach_size > $size) 
 		{
 			$config->allowed_attach_size = $size;
 		}
@@ -182,10 +182,10 @@ 
 		$args = new stdClass();
 		$args->file_srl = $file_srl;
 		$output = executeQueryArray('file.getFile', $args, $columnList);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// old version compatibility
-		if(count($output->data) == 1)
+		if (count($output->data) == 1)
 		{
 			$file = $output->data[0];
 			$file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl);
@@ -196,9 +196,9 @@ 
 		{
 			$fileList = array();
 
-			if(is_array($output->data))
+			if (is_array($output->data))
 			{
-				foreach($output->data as $key=>$value)
+				foreach ($output->data as $key=>$value)
 				{
 					$file = $value;
 					$file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl);
@@ -222,16 +222,16 @@ 
 		$args = new stdClass();
 		$args->upload_target_srl = $upload_target_srl;
 		$args->sort_index = $sortIndex;
-		if($ckValid) $args->isvalid = 'Y';
+		if ($ckValid) $args->isvalid = 'Y';
 		$output = executeQuery('file.getFiles', $args, $columnList);
-		if(!$output->data) return;
+		if (!$output->data) return;
 
 		$file_list = $output->data;
 
-		if($file_list && !is_array($file_list)) $file_list = array($file_list);
+		if ($file_list && !is_array($file_list)) $file_list = array($file_list);
 
 		$file_count = count($file_list);
-		for($i=0;$i<$file_count;$i++)
+		for ($i = 0; $i < $file_count; $i++)
 		{
 			$file = $file_list[$i];
 			$file->source_filename = stripslashes($file->source_filename);
@@ -254,14 +254,14 @@ 
 
 		$module_srl = Context::get('module_srl');
 		// Get the current module if module_srl doesn't exist
-		if(!$module_srl)
+		if (!$module_srl)
 		{
 			$current_module_info = Context::get('current_module_info');
 			$module_srl = $current_module_info->module_srl;
 		}
 		$file_config = $this->getFileConfig($module_srl);
 
-		if($logged_info->is_admin == 'Y')
+		if ($logged_info->is_admin == 'Y')
 		{
 			$iniPostMaxSize = FileHandler::returnbytes(ini_get('post_max_size'));
 			$iniUploadMaxSize = FileHandler::returnbytes(ini_get('upload_max_filesize'));
@@ -287,9 +287,9 @@ 
 			'%s : %s/ %s<br /> %s : %s (%s : %s)',
 			Context::getLang('allowed_attach_size'),
 			FileHandler::filesize($attached_size),
-			FileHandler::filesize($file_config->allowed_attach_size*1024*1024),
+			FileHandler::filesize($file_config->allowed_attach_size * 1024 * 1024),
 			Context::getLang('allowed_filesize'),
-			FileHandler::filesize($file_config->allowed_filesize*1024*1024),
+			FileHandler::filesize($file_config->allowed_filesize * 1024 * 1024),
 			Context::getLang('allowed_filetypes'),
 			$file_config->allowed_filetypes
 		);
@@ -316,9 +316,9 @@ 
 	 */
 	function getFileGrant($file_info, $member_info)
 	{
-		if(!$file_info) return null;
+		if (!$file_info) return null;
 
-		if($_SESSION['__XE_UPLOADING_FILES_INFO__'][$file_info->file_srl])
+		if ($_SESSION['__XE_UPLOADING_FILES_INFO__'][$file_info->file_srl])
 		{
 			$file_grant->is_deletable = true;
 			return $file_grant;
@@ -329,7 +329,7 @@ 
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($file_info->upload_target_srl);
-		if($oDocument->isExists()) $document_grant = $oDocument->isGranted();
+		if ($oDocument->isExists()) $document_grant = $oDocument->isGranted();
 
 		$file_grant->is_deletable = ($document_grant || $member_info->is_admin == 'Y' || $member_info->member_srl == $file_info->member_srl || $grant->manager);
 

Braces +79 added lines, -30 removed lines

@@ -29,7 +29,9 @@ 
 		$mid = Context::get('mid');
 		$editor_sequence = Context::get('editor_sequence');
 		$upload_target_srl = Context::get('upload_target_srl');
-		if(!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		if(!$upload_target_srl) {
+			$upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		}
 
 		if($upload_target_srl)
 		{
@@ -39,22 +41,26 @@ 
 			for($i=0;$i<$file_count;$i++)
 			{
 				$file_info = $tmp_files[$i];
-				if(!$file_info->file_srl) continue;
+				if(!$file_info->file_srl) {
+					continue;
+				}
 
 				$obj = new stdClass;
 				$obj->file_srl = $file_info->file_srl;
 				$obj->source_filename = $file_info->source_filename;
 				$obj->file_size = $file_info->file_size;
 				$obj->disp_file_size = FileHandler::filesize($file_info->file_size);
-				if($file_info->direct_download=='N') $obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid, $file_info->module_srl);
-				else $obj->download_url = str_replace('./', '', $file_info->uploaded_filename);
+				if($file_info->direct_download=='N') {
+					$obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid, $file_info->module_srl);
+				} else {
+					$obj->download_url = str_replace('./', '', $file_info->uploaded_filename);
+				}
 				$obj->direct_download = $file_info->direct_download;
 				$obj->cover_image = ($file_info->cover_image === 'Y') ? true : false;
 				$files[] = $obj;
 				$attached_size += $file_info->file_size;
 			}
-		}
-		else
+		} else
 		{
 			$upload_target_srl = 0;
 			$attached_size = 0;
@@ -122,8 +128,12 @@ 
 
 		$file_module_config = $oModuleModel->getModuleConfig('file');
 
-		if($module_srl) $file_config = $oModuleModel->getModulePartConfig('file',$module_srl);
-		if(!$file_config) $file_config = $file_module_config;
+		if($module_srl) {
+			$file_config = $oModuleModel->getModulePartConfig('file',$module_srl);
+		}
+		if(!$file_config) {
+			$file_config = $file_module_config;
+		}
 
 		$config = new stdClass();
 
@@ -138,25 +148,53 @@ 
 			$config->allow_outlink_format = $file_config->allow_outlink_format;
 		}
 		// Property for all files comes first than each property
-		if(!$config->allowed_filesize) $config->allowed_filesize = $file_module_config->allowed_filesize;
-		if(!$config->allowed_attach_size) $config->allowed_attach_size = $file_module_config->allowed_attach_size;
-		if(!$config->allowed_filetypes) $config->allowed_filetypes = $file_module_config->allowed_filetypes;
-		if(!$config->allow_outlink) $config->allow_outlink = $file_module_config->allow_outlink;
-		if(!$config->allow_outlink_site) $config->allow_outlink_site = $file_module_config->allow_outlink_site;
-		if(!$config->allow_outlink_format) $config->allow_outlink_format = $file_module_config->allow_outlink_format;
-		if(!$config->download_grant) $config->download_grant = $file_module_config->download_grant;
+		if(!$config->allowed_filesize) {
+			$config->allowed_filesize = $file_module_config->allowed_filesize;
+		}
+		if(!$config->allowed_attach_size) {
+			$config->allowed_attach_size = $file_module_config->allowed_attach_size;
+		}
+		if(!$config->allowed_filetypes) {
+			$config->allowed_filetypes = $file_module_config->allowed_filetypes;
+		}
+		if(!$config->allow_outlink) {
+			$config->allow_outlink = $file_module_config->allow_outlink;
+		}
+		if(!$config->allow_outlink_site) {
+			$config->allow_outlink_site = $file_module_config->allow_outlink_site;
+		}
+		if(!$config->allow_outlink_format) {
+			$config->allow_outlink_format = $file_module_config->allow_outlink_format;
+		}
+		if(!$config->download_grant) {
+			$config->download_grant = $file_module_config->download_grant;
+		}
 		// Default setting if not exists
-		if(!$config->allowed_filesize) $config->allowed_filesize = '2';
-		if(!$config->allowed_attach_size) $config->allowed_attach_size = '3';
-		if(!$config->allowed_filetypes) $config->allowed_filetypes = '*.*';
-		if(!$config->allow_outlink) $config->allow_outlink = 'Y';
-		if(!$config->download_grant) $config->download_grant = array();
+		if(!$config->allowed_filesize) {
+			$config->allowed_filesize = '2';
+		}
+		if(!$config->allowed_attach_size) {
+			$config->allowed_attach_size = '3';
+		}
+		if(!$config->allowed_filetypes) {
+			$config->allowed_filetypes = '*.*';
+		}
+		if(!$config->allow_outlink) {
+			$config->allow_outlink = 'Y';
+		}
+		if(!$config->download_grant) {
+			$config->download_grant = array();
+		}
 
 		$size = ini_get('upload_max_filesize');
 		$unit = strtolower($size[strlen($size) - 1]);
 		$size = (float)$size;
-		if($unit == 'g') $size *= 1024;
-		if($unit == 'k') $size /= 1024;
+		if($unit == 'g') {
+			$size *= 1024;
+		}
+		if($unit == 'k') {
+			$size /= 1024;
+		}
 
 		if($config->allowed_filesize > $size) 
 		{	
@@ -182,7 +220,9 @@ 
 		$args = new stdClass();
 		$args->file_srl = $file_srl;
 		$output = executeQueryArray('file.getFile', $args, $columnList);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// old version compatibility
 		if(count($output->data) == 1)
@@ -191,8 +231,7 @@ 
 			$file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl);
 
 			return $file;
-		}
-		else
+		} else
 		{
 			$fileList = array();
 
@@ -222,13 +261,19 @@ 
 		$args = new stdClass();
 		$args->upload_target_srl = $upload_target_srl;
 		$args->sort_index = $sortIndex;
-		if($ckValid) $args->isvalid = 'Y';
+		if($ckValid) {
+			$args->isvalid = 'Y';
+		}
 		$output = executeQuery('file.getFiles', $args, $columnList);
-		if(!$output->data) return;
+		if(!$output->data) {
+			return;
+		}
 
 		$file_list = $output->data;
 
-		if($file_list && !is_array($file_list)) $file_list = array($file_list);
+		if($file_list && !is_array($file_list)) {
+			$file_list = array($file_list);
+		}
 
 		$file_count = count($file_list);
 		for($i=0;$i<$file_count;$i++)
@@ -316,7 +361,9 @@ 
 	 */
 	function getFileGrant($file_info, $member_info)
 	{
-		if(!$file_info) return null;
+		if(!$file_info) {
+			return null;
+		}
 
 		if($_SESSION['__XE_UPLOADING_FILES_INFO__'][$file_info->file_srl])
 		{
@@ -329,7 +376,9 @@ 
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($file_info->upload_target_srl);
-		if($oDocument->isExists()) $document_grant = $oDocument->isGranted();
+		if($oDocument->isExists()) {
+			$document_grant = $oDocument->isGranted();
+		}
 
 		$file_grant->is_deletable = ($document_grant || $member_info->is_admin == 'Y' || $member_info->member_srl == $file_info->member_srl || $grant->manager);
 

modules/board/board.mobile.php

Spacing +19 added lines, -19 removed lines

@@ -10,32 +10,32 @@ 
 		$oSecurity = new Security();

 		$oSecurity->encodeHTML('document_srl', 'comment_srl', 'vid', 'mid', 'page', 'category', 'search_target', 'search_keyword', 'sort_index', 'order_type', 'trackback_srl');

 

-		if($this->module_info->list_count) $this->list_count = $this->module_info->list_count;

-		if($this->module_info->mobile_list_count) $this->list_count = $this->module_info->mobile_list_count;

-		if($this->module_info->search_list_count) $this->search_list_count = $this->module_info->search_list_count;

-		if($this->module_info->mobile_search_list_count) $this->search_list_count = $this->module_info->mobile_search_list_count;
-		if($this->module_info->page_count) $this->page_count = $this->module_info->page_count;

-		if($this->module_info->mobile_page_count) $this->page_count = $this->module_info->mobile_page_count;

+		if ($this->module_info->list_count) $this->list_count = $this->module_info->list_count;

+		if ($this->module_info->mobile_list_count) $this->list_count = $this->module_info->mobile_list_count;

+		if ($this->module_info->search_list_count) $this->search_list_count = $this->module_info->search_list_count;

+		if ($this->module_info->mobile_search_list_count) $this->search_list_count = $this->module_info->mobile_search_list_count;
+		if ($this->module_info->page_count) $this->page_count = $this->module_info->page_count;

+		if ($this->module_info->mobile_page_count) $this->page_count = $this->module_info->mobile_page_count;

 		$this->except_notice = $this->module_info->except_notice == 'N' ? false : true;

 

 		// $this->_getStatusNameListecret option backward compatibility

 		$oDocumentModel = getModel('document');

 

 		$statusList = $this->_getStatusNameList($oDocumentModel);

-		if(isset($statusList['SECRET']))

+		if (isset($statusList['SECRET']))

 		{

 			$this->module_info->secret = 'Y';

 		}

 

 		// use_category <=1.5.x, hide_category >=1.7.x

 		$count_category = count($oDocumentModel->getCategoryList($this->module_info->module_srl));

-		if($count_category)

+		if ($count_category)

 		{

-			if($this->module_info->hide_category)

+			if ($this->module_info->hide_category)

 			{

 				$this->module_info->use_category = ($this->module_info->hide_category == 'Y') ? 'N' : 'Y';

 			}

-			else if($this->module_info->use_category)

+			else if ($this->module_info->use_category)

 			{

 				$this->module_info->hide_category = ($this->module_info->use_category == 'Y') ? 'N' : 'Y';

 			}

@@ -55,10 +55,10 @@ 
 		 * check the consultation function, if the user is admin then swich off consultation function

 		 * if the user is not logged, then disppear write document/write comment./ view document

 		 **/

-		if($this->module_info->consultation == 'Y' && !$this->grant->manager && !$this->grant->consultation_read)

+		if ($this->module_info->consultation == 'Y' && !$this->grant->manager && !$this->grant->consultation_read)

 		{

 			$this->consultation = true;

-			if(!Context::get('is_logged')) $this->grant->list = $this->grant->write_document = $this->grant->write_comment = $this->grant->view = false;

+			if (!Context::get('is_logged')) $this->grant->list = $this->grant->write_document = $this->grant->write_comment = $this->grant->view = false;

 		} else {

 			$this->consultation = false;

 		}

@@ -67,11 +67,11 @@ 
 		$extra_keys = $oDocumentModel->getExtraKeys($this->module_info->module_srl);

 		Context::set('extra_keys', $extra_keys);

 

-		$template_path = sprintf("%sm.skins/%s/",$this->module_path, $this->module_info->mskin);

-		if(!is_dir($template_path)||!$this->module_info->mskin)

+		$template_path = sprintf("%sm.skins/%s/", $this->module_path, $this->module_info->mskin);

+		if (!is_dir($template_path) || !$this->module_info->mskin)

 		{

 			$this->module_info->mskin = 'default';

-			$template_path = sprintf("%sm.skins/%s/",$this->module_path, $this->module_info->mskin);

+			$template_path = sprintf("%sm.skins/%s/", $this->module_path, $this->module_info->mskin);

 		}

 		$this->setTemplatePath($template_path);

 		Context::addJsFilter($this->module_path.'tpl/filter', 'input_password.xml');

@@ -87,13 +87,13 @@ 
 	function getBoardCommentPage()

 	{

 		$document_srl = Context::get('document_srl');

-		$oDocumentModel =& getModel('document');

-		if(!$document_srl)

+		$oDocumentModel = & getModel('document');

+		if (!$document_srl)

 		{

 			return new Object(-1, "msg_invalid_request");

 		}

 		$oDocument = $oDocumentModel->getDocument($document_srl);

-		if(!$oDocument->isExists())

+		if (!$oDocument->isExists())

 		{

 			return new Object(-1, "msg_invalid_request");

 		}

@@ -106,7 +106,7 @@ 
 	function dispBoardMessage($msg_code)

 	{

 		$msg = Context::getLang($msg_code);

-		$oMessageObject = &ModuleHandler::getModuleInstance('message','mobile');

+		$oMessageObject = &ModuleHandler::getModuleInstance('message', 'mobile');

 		$oMessageObject->setError(-1);

 		$oMessageObject->setMessage($msg);

 		$oMessageObject->dispMessage();

Braces +24 added lines, -13 removed lines

@@ -10,12 +10,24 @@ 
 		$oSecurity = new Security();

 		$oSecurity->encodeHTML('document_srl', 'comment_srl', 'vid', 'mid', 'page', 'category', 'search_target', 'search_keyword', 'sort_index', 'order_type', 'trackback_srl');

 

-		if($this->module_info->list_count) $this->list_count = $this->module_info->list_count;

-		if($this->module_info->mobile_list_count) $this->list_count = $this->module_info->mobile_list_count;

-		if($this->module_info->search_list_count) $this->search_list_count = $this->module_info->search_list_count;

-		if($this->module_info->mobile_search_list_count) $this->search_list_count = $this->module_info->mobile_search_list_count;
-		if($this->module_info->page_count) $this->page_count = $this->module_info->page_count;

-		if($this->module_info->mobile_page_count) $this->page_count = $this->module_info->mobile_page_count;

+		if($this->module_info->list_count) {
+			$this->list_count = $this->module_info->list_count;
+		}
+		if($this->module_info->mobile_list_count) {
+			$this->list_count = $this->module_info->mobile_list_count;
+		}
+		if($this->module_info->search_list_count) {
+			$this->search_list_count = $this->module_info->search_list_count;
+		}
+		if($this->module_info->mobile_search_list_count) {
+			$this->search_list_count = $this->module_info->mobile_search_list_count;
+		}
+		if($this->module_info->page_count) {
+			$this->page_count = $this->module_info->page_count;
+		}
+		if($this->module_info->mobile_page_count) {
+			$this->page_count = $this->module_info->mobile_page_count;
+		}
 		$this->except_notice = $this->module_info->except_notice == 'N' ? false : true;

 

 		// $this->_getStatusNameListecret option backward compatibility

@@ -34,18 +46,15 @@ 
 			if($this->module_info->hide_category)

 			{

 				$this->module_info->use_category = ($this->module_info->hide_category == 'Y') ? 'N' : 'Y';

-			}

-			else if($this->module_info->use_category)

+			} else if($this->module_info->use_category)

 			{

 				$this->module_info->hide_category = ($this->module_info->use_category == 'Y') ? 'N' : 'Y';

-			}

-			else

+			} else

 			{

 				$this->module_info->hide_category = 'N';

 				$this->module_info->use_category = 'Y';

 			}

-		}

-		else

+		} else

 		{

 			$this->module_info->hide_category = 'Y';

 			$this->module_info->use_category = 'N';

@@ -58,7 +67,9 @@ 
 		if($this->module_info->consultation == 'Y' && !$this->grant->manager && !$this->grant->consultation_read)

 		{

 			$this->consultation = true;

-			if(!Context::get('is_logged')) $this->grant->list = $this->grant->write_document = $this->grant->write_comment = $this->grant->view = false;

+			if(!Context::get('is_logged')) {
+				$this->grant->list = $this->grant->write_document = $this->grant->write_comment = $this->grant->view = false;
+			}
 		} else {

 			$this->consultation = false;

 		}

modules/document/document.model.php

Spacing +231 added lines, -231 removed lines

@@ -35,7 +35,7 @@ 
 	 */
 	function getDocumentExtraVarsFromDB($documentSrls)
 	{
-		if(!is_array($documentSrls) || count($documentSrls) == 0)
+		if (!is_array($documentSrls) || count($documentSrls) == 0)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -56,52 +56,52 @@ 
 		$_document_list = &$GLOBALS['XE_DOCUMENT_LIST'];
 
 		// XE XE_DOCUMENT_LIST all documents that the object referred to the global variable settings
-		if(count($_document_list) <= 0) return;
+		if (count($_document_list) <= 0) return;
 
 		// Find all called the document object variable has been set extension
 		$document_srls = array();
-		foreach($_document_list as $key => $val)
+		foreach ($_document_list as $key => $val)
 		{
-			if(!$val->document_srl || $checked_documents[$val->document_srl]) continue;
+			if (!$val->document_srl || $checked_documents[$val->document_srl]) continue;
 			$checked_documents[$val->document_srl] = true;
 			$document_srls[] = $val->document_srl;
 		}
 		// If the document number, return detected
-		if(!count($document_srls)) return;
+		if (!count($document_srls)) return;
 		// Expand variables mijijeongdoen article about a current visitor to the extension of the language code, the search variable
 		//$obj->document_srl = implode(',',$document_srls);
 		$output = $this->getDocumentExtraVarsFromDB($document_srls);
-		if($output->toBool() && $output->data)
+		if ($output->toBool() && $output->data)
 		{
-			foreach($output->data as $key => $val)
+			foreach ($output->data as $key => $val)
 			{
-				if(!isset($val->value)) continue;
-				if(!$extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0]) $extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0] = trim($val->value);
+				if (!isset($val->value)) continue;
+				if (!$extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0]) $extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0] = trim($val->value);
 				$extra_vars[$val->document_srl][$val->var_idx][$val->lang_code] = trim($val->value);
 			}
 		}
 
 		$user_lang_code = Context::getLangType();
-		for($i=0,$c=count($document_srls);$i<$c;$i++)
+		for ($i = 0, $c = count($document_srls); $i < $c; $i++)
 		{
 			$document_srl = $document_srls[$i];
 			unset($vars);
 
-			if(!$_document_list[$document_srl] || !is_object($_document_list[$document_srl]) || !$_document_list[$document_srl]->isExists()) continue;
+			if (!$_document_list[$document_srl] || !is_object($_document_list[$document_srl]) || !$_document_list[$document_srl]->isExists()) continue;
 			$module_srl = $_document_list[$document_srl]->get('module_srl');
 			$extra_keys = $this->getExtraKeys($module_srl);
 			$vars = $extra_vars[$document_srl];
 			$document_lang_code = $_document_list[$document_srl]->get('lang_code');
 			// Expand the variable processing
-			if(count($extra_keys))
+			if (count($extra_keys))
 			{
-				foreach($extra_keys as $idx => $key)
+				foreach ($extra_keys as $idx => $key)
 				{
 					$extra_keys[$idx] = clone($key);
 					$val = $vars[$idx];
-					if(isset($val[$user_lang_code])) $v = $val[$user_lang_code];
-					else if(isset($val[$document_lang_code])) $v = $val[$document_lang_code];
-					else if(isset($val[0])) $v = $val[0];
+					if (isset($val[$user_lang_code])) $v = $val[$user_lang_code];
+					else if (isset($val[$document_lang_code])) $v = $val[$document_lang_code];
+					else if (isset($val[0])) $v = $val[0];
 					else $v = null;
 					$extra_keys[$idx]->value = $v;
 				}
@@ -111,11 +111,11 @@ 
 			$evars = new ExtraVar($module_srl);
 			$evars->setExtraVarKeys($extra_keys);
 			// Title Processing
-			if($vars[-1][$user_lang_code]) $_document_list[$document_srl]->add('title',$vars[-1][$user_lang_code]);
+			if ($vars[-1][$user_lang_code]) $_document_list[$document_srl]->add('title', $vars[-1][$user_lang_code]);
 			// Information processing
-			if($vars[-2][$user_lang_code]) $_document_list[$document_srl]->add('content',$vars[-2][$user_lang_code]);
+			if ($vars[-2][$user_lang_code]) $_document_list[$document_srl]->add('content', $vars[-2][$user_lang_code]);
 
-			if($vars[-1][$user_lang_code] || $vars[-2][$user_lang_code])
+			if ($vars[-1][$user_lang_code] || $vars[-2][$user_lang_code])
 			{
 				unset($checked_documents[$document_srl]);
 			}
@@ -132,17 +132,17 @@ 
 	 * @param array $columnList
 	 * @return documentItem
 	 */
-	function getDocument($document_srl=0, $is_admin = false, $load_extra_vars=true, $columnList = array())
+	function getDocument($document_srl = 0, $is_admin = false, $load_extra_vars = true, $columnList = array())
 	{
-		if(!$document_srl) return new documentItem();
+		if (!$document_srl) return new documentItem();
 
-		if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
+		if (!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 		{
 			$oDocument = new documentItem($document_srl, $load_extra_vars, $columnList);
 			$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
-			if($load_extra_vars) $this->setToAllDocumentExtraVars();
+			if ($load_extra_vars) $this->setToAllDocumentExtraVars();
 		}
-		if($is_admin) $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->setGrant();
+		if ($is_admin) $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->setGrant();
 
 		return $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
 	}
@@ -155,12 +155,12 @@ 
 	 * @param array $columnList
 	 * @return array value type is documentItem
 	 */
-	function getDocuments($document_srls, $is_admin = false, $load_extra_vars=true, $columnList = array())
+	function getDocuments($document_srls, $is_admin = false, $load_extra_vars = true, $columnList = array())
 	{
-		if(is_array($document_srls))
+		if (is_array($document_srls))
 		{
 			$list_count = count($document_srls);
-			$document_srls = implode(',',$document_srls);
+			$document_srls = implode(',', $document_srls);
 		}
 		else
 		{
@@ -173,33 +173,33 @@ 
 
 		$output = executeQuery('document.getDocuments', $args, $columnList);
 		$document_list = $output->data;
-		if(!$document_list) return;
-		if(!is_array($document_list)) $document_list = array($document_list);
+		if (!$document_list) return;
+		if (!is_array($document_list)) $document_list = array($document_list);
 
 		$document_count = count($document_list);
-		foreach($document_list as $key => $attribute)
+		foreach ($document_list as $key => $attribute)
 		{
 			$document_srl = $attribute->document_srl;
-			if(!$document_srl) continue;
+			if (!$document_srl) continue;
 
-			if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
+			if (!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 			{
 				$oDocument = null;
 				$oDocument = new documentItem();
 				$oDocument->setAttribute($attribute, false);
-				if($is_admin) $oDocument->setGrant();
+				if ($is_admin) $oDocument->setGrant();
 				$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
 			}
 
 			$result[$attribute->document_srl] = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
 		}
 
-		if($load_extra_vars) $this->setToAllDocumentExtraVars();
+		if ($load_extra_vars) $this->setToAllDocumentExtraVars();
 
 		$output = null;
-		if(count($result))
+		if (count($result))
 		{
-			foreach($result as $document_srl => $val)
+			foreach ($result as $document_srl => $val)
 			{
 				$output[$document_srl] = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
 			}
@@ -216,7 +216,7 @@ 
 	 * @param array $columnList
 	 * @return Object
 	 */
-	function getDocumentList($obj, $except_notice = false, $load_extra_vars=true, $columnList = array())
+	function getDocumentList($obj, $except_notice = false, $load_extra_vars = true, $columnList = array())
 	{
 		$sort_check = $this->_setSortIndex($obj, $load_extra_vars);
 		$obj->sort_index = $sort_check->sort_index;
@@ -226,7 +226,7 @@ 
 		// Call trigger (before)
 		// This trigger can be used to set an alternative output using a different search method
 		$output = ModuleHandler::triggerCall('document.getDocumentList', 'before', $obj);
-		if($output instanceof Object && !$output->toBool())
+		if ($output instanceof Object && !$output->toBool())
 		{
 			return $output;
 		}
@@ -243,10 +243,10 @@ 
 			$output = $obj->use_alternate_output;
 			unset($obj->use_alternate_output);
 		}
-		elseif ($sort_check->isExtraVars && substr_count($obj->search_target,'extra_vars'))
+		elseif ($sort_check->isExtraVars && substr_count($obj->search_target, 'extra_vars'))
 		{
 			$query_id = 'document.getDocumentListWithinExtraVarsExtraSort';
-			$args->sort_index = str_replace('documents.','',$args->sort_index);
+			$args->sort_index = str_replace('documents.', '', $args->sort_index);
 			$output = executeQueryArray($query_id, $args);
 		}
 		elseif ($sort_check->isExtraVars)
@@ -258,16 +258,16 @@ 
 			// document.getDocumentList query execution
 			// Query_id if you have a group by clause getDocumentListWithinTag getDocumentListWithinComment or used again to perform the query because
 			$groupByQuery = array('document.getDocumentListWithinComment' => 1, 'document.getDocumentListWithinTag' => 1, 'document.getDocumentListWithinExtraVars' => 1);
-			if(isset($groupByQuery[$query_id]))
+			if (isset($groupByQuery[$query_id]))
 			{
 				$group_args = clone($args);
 				$group_args->sort_index = 'documents.'.$args->sort_index;
 				$output = executeQueryArray($query_id, $group_args);
-				if(!$output->toBool()||!count($output->data)) return $output;
+				if (!$output->toBool() || !count($output->data)) return $output;
 
-				foreach($output->data as $key => $val)
+				foreach ($output->data as $key => $val)
 				{
-					if($val->document_srl) $target_srls[] = $val->document_srl;
+					if ($val->document_srl) $target_srls[] = $val->document_srl;
 				}
 
 				$page_navigation = $output->page_navigation;
@@ -275,7 +275,7 @@ 
 				$virtual_number = $keys[0];
 
 				$target_args = new stdClass();
-				$target_args->document_srls = implode(',',$target_srls);
+				$target_args->document_srls = implode(',', $target_srls);
 				$target_args->list_order = $args->sort_index;
 				$target_args->order_type = $args->order_type;
 				$target_args->list_count = $args->list_count;
@@ -292,35 +292,35 @@ 
 			}
 		}
 		// Return if no result or an error occurs
-		if(!$output->toBool()||!count($output->data)) return $output;
+		if (!$output->toBool() || !count($output->data)) return $output;
 		$idx = 0;
 		$data = $output->data;
 		unset($output->data);
 
-		if(!isset($virtual_number))
+		if (!isset($virtual_number))
 		{
 			$keys = array_keys($data);
 			$virtual_number = $keys[0];
 		}
 
-		if($except_notice)
+		if ($except_notice)
 		{
-			foreach($data as $key => $attribute)
+			foreach ($data as $key => $attribute)
 			{
-				if($attribute->is_notice == 'Y') $virtual_number --;
+				if ($attribute->is_notice == 'Y') $virtual_number--;
 			}
 		}
 
-		foreach($data as $key => $attribute)
+		foreach ($data as $key => $attribute)
 		{
-			if($except_notice && $attribute->is_notice == 'Y') continue;
+			if ($except_notice && $attribute->is_notice == 'Y') continue;
 			$document_srl = $attribute->document_srl;
-			if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
+			if (!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 			{
 				$oDocument = null;
 				$oDocument = new documentItem();
 				$oDocument->setAttribute($attribute, false);
-				if($is_admin) $oDocument->setGrant();
+				if ($is_admin) $oDocument->setGrant();
 				$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
 			}
 
@@ -328,11 +328,11 @@ 
 			$virtual_number--;
 		}
 
-		if($load_extra_vars) $this->setToAllDocumentExtraVars();
+		if ($load_extra_vars) $this->setToAllDocumentExtraVars();
 
-		if(count($output->data))
+		if (count($output->data))
 		{
-			foreach($output->data as $number => $document)
+			foreach ($output->data as $number => $document)
 			{
 				$output->data[$number] = $GLOBALS['XE_DOCUMENT_LIST'][$document->document_srl];
 			}
@@ -354,16 +354,16 @@ 
 	{
 		$args = new stdClass();
 		$args->module_srl = $obj->module_srl;
-		$args->category_srl= $obj->category_srl;
+		$args->category_srl = $obj->category_srl;
 		$output = executeQueryArray('document.getNoticeList', $args, $columnList);
-		if(!$output->toBool()||!$output->data) return;
+		if (!$output->toBool() || !$output->data) return;
 
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			$document_srl = $val->document_srl;
-			if(!$document_srl) continue;
+			if (!$document_srl) continue;
 
-			if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
+			if (!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 			{
 				$oDocument = null;
 				$oDocument = new documentItem();
@@ -374,7 +374,7 @@ 
 		}
 		$this->setToAllDocumentExtraVars();
 
-		foreach($result->data as $document_srl => $val)
+		foreach ($result->data as $document_srl => $val)
 		{
 			$result->data[$document_srl] = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
 		}
@@ -390,20 +390,20 @@ 
 	 */
 	function getExtraKeys($module_srl)
 	{
-		if(!isset($GLOBALS['XE_EXTRA_KEYS'][$module_srl]))
+		if (!isset($GLOBALS['XE_EXTRA_KEYS'][$module_srl]))
 		{
 			$keys = false;
 			$oCacheHandler = CacheHandler::getInstance('object', null, true);
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
-				$object_key = 'module_document_extra_keys:' . $module_srl;
+				$object_key = 'module_document_extra_keys:'.$module_srl;
 				$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 				$keys = $oCacheHandler->get($cache_key);
 			}
 
 			$oExtraVar = ExtraVar::getInstance($module_srl);
 
-			if($keys === false)
+			if ($keys === false)
 			{
 				$obj = new stdClass();
 				$obj->module_srl = $module_srl;
@@ -413,13 +413,13 @@ 
 
 				// correcting index order
 				$isFixed = FALSE;
-				if(is_array($output->data))
+				if (is_array($output->data))
 				{
 					$prevIdx = 0;
-					foreach($output->data as $no => $value)
+					foreach ($output->data as $no => $value)
 					{
 						// case first
-						if($prevIdx == 0 && $value->idx != 1)
+						if ($prevIdx == 0 && $value->idx != 1)
 						{
 							$args = new stdClass();
 							$args->module_srl = $module_srl;
@@ -433,7 +433,7 @@ 
 						}
 
 						// case others
-						if($prevIdx > 0 && $prevIdx + 1 != $value->idx)
+						if ($prevIdx > 0 && $prevIdx + 1 != $value->idx)
 						{
 							$args = new stdClass();
 							$args->module_srl = $module_srl;
@@ -450,16 +450,16 @@ 
 					}
 				}
 
-				if($isFixed)
+				if ($isFixed)
 				{
 					$output = executeQueryArray('document.getDocumentExtraKeys', $obj);
 				}
 
 				$oExtraVar->setExtraVarKeys($output->data);
 				$keys = $oExtraVar->getExtraVars();
-				if(!$keys) $keys = array();
+				if (!$keys) $keys = array();
 
-				if($oCacheHandler->isSupport())
+				if ($oCacheHandler->isSupport())
 				{
 					$oCacheHandler->put($cache_key, $keys);
 				}
@@ -480,14 +480,14 @@ 
 	 */
 	function getExtraVars($module_srl, $document_srl)
 	{
-		if(!isset($GLOBALS['XE_EXTRA_VARS'][$document_srl]))
+		if (!isset($GLOBALS['XE_EXTRA_VARS'][$document_srl]))
 		{
 			// Extended to extract the values of variables set
 			$oDocument = $this->getDocument($document_srl, false);
 			$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
 			$this->setToAllDocumentExtraVars();
 		}
-		if(is_array($GLOBALS['XE_EXTRA_VARS'][$document_srl])) ksort($GLOBALS['XE_EXTRA_VARS'][$document_srl]);
+		if (is_array($GLOBALS['XE_EXTRA_VARS'][$document_srl])) ksort($GLOBALS['XE_EXTRA_VARS'][$document_srl]);
 		return $GLOBALS['XE_EXTRA_VARS'][$document_srl];
 	}
 
@@ -510,71 +510,71 @@ 
 
 		$oDocumentController = getController('document');
 		// Members must be a possible feature
-		if($logged_info->member_srl)
+		if ($logged_info->member_srl)
 		{
 			$oDocumentModel = getModel('document');
 			$columnList = array('document_srl', 'module_srl', 'member_srl', 'ipaddress');
 			$oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList);
 			$module_srl = $oDocument->get('module_srl');
 			$member_srl = $oDocument->get('member_srl');
-			if(!$module_srl) return new Object(-1, 'msg_invalid_request');
+			if (!$module_srl) return new Object(-1, 'msg_invalid_request');
 
 			$oModuleModel = getModel('module');
-			$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
-			if($document_config->use_vote_up!='N' && $member_srl!=$logged_info->member_srl)
+			$document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
+			if ($document_config->use_vote_up != 'N' && $member_srl != $logged_info->member_srl)
 			{
 				// Add a Referral Button
 				$url = sprintf("doCallModuleAction('document','procDocumentVoteUp','%s')", $document_srl);
-				$oDocumentController->addDocumentPopupMenu($url,'cmd_vote','','javascript');
+				$oDocumentController->addDocumentPopupMenu($url, 'cmd_vote', '', 'javascript');
 			}
 
-			if($document_config->use_vote_down!='N' && $member_srl!=$logged_info->member_srl)
+			if ($document_config->use_vote_down != 'N' && $member_srl != $logged_info->member_srl)
 			{
 				// Add button to negative
-				$url= sprintf("doCallModuleAction('document','procDocumentVoteDown','%s')", $document_srl);
-				$oDocumentController->addDocumentPopupMenu($url,'cmd_vote_down','','javascript');
+				$url = sprintf("doCallModuleAction('document','procDocumentVoteDown','%s')", $document_srl);
+				$oDocumentController->addDocumentPopupMenu($url, 'cmd_vote_down', '', 'javascript');
 			}
 
 			// Adding Report
 			$url = sprintf("doCallModuleAction('document','procDocumentDeclare','%s')", $document_srl);
-			$oDocumentController->addDocumentPopupMenu($url,'cmd_declare','','javascript');
+			$oDocumentController->addDocumentPopupMenu($url, 'cmd_declare', '', 'javascript');
 
 			// Add Bookmark button
 			$url = sprintf("doCallModuleAction('member','procMemberScrapDocument','%s')", $document_srl);
-			$oDocumentController->addDocumentPopupMenu($url,'cmd_scrap','','javascript');
+			$oDocumentController->addDocumentPopupMenu($url, 'cmd_scrap', '', 'javascript');
 		}
 		// Add print button
-		$url = getUrl('','module','document','act','dispDocumentPrint','document_srl',$document_srl);
-		$oDocumentController->addDocumentPopupMenu($url,'cmd_print','','printDocument');
+		$url = getUrl('', 'module', 'document', 'act', 'dispDocumentPrint', 'document_srl', $document_srl);
+		$oDocumentController->addDocumentPopupMenu($url, 'cmd_print', '', 'printDocument');
 		// Call a trigger (after)
 		ModuleHandler::triggerCall('document.getDocumentMenu', 'after', $menu_list);
-		if($this->grant->manager)
+		if ($this->grant->manager)
 		{
 			$str_confirm = Context::getLang('confirm_move');
 			$url = sprintf("if(!confirm('%s')) return; var params = new Array(); params['document_srl']='%s'; params['mid']=current_mid;params['cur_url']=current_url; exec_xml('document', 'procDocumentAdminMoveToTrash', params)", $str_confirm, $document_srl);
-			$oDocumentController->addDocumentPopupMenu($url,'cmd_trash','','javascript');
+			$oDocumentController->addDocumentPopupMenu($url, 'cmd_trash', '', 'javascript');
 		}
 
 		// If you are managing to find posts by ip
-		if($logged_info->is_admin == 'Y')
+		if ($logged_info->is_admin == 'Y')
 		{
 			$oDocumentModel = getModel('document');
-			$oDocument = $oDocumentModel->getDocument($document_srl);	//before setting document recycle
+			$oDocument = $oDocumentModel->getDocument($document_srl); //before setting document recycle
 
-			if($oDocument->isExists())
+			if ($oDocument->isExists())
 			{
 				// Find a post equivalent to ip address
-				$url = getUrl('','module','admin','act','dispDocumentAdminList','search_target','ipaddress','search_keyword',$oDocument->getIpAddress());
-				$oDocumentController->addDocumentPopupMenu($url,'cmd_search_by_ipaddress',$icon_path,'TraceByIpaddress');
+				$url = getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList', 'search_target', 'ipaddress', 'search_keyword', $oDocument->getIpAddress());
+				$oDocumentController->addDocumentPopupMenu($url, 'cmd_search_by_ipaddress', $icon_path, 'TraceByIpaddress');
 
 				$url = sprintf("var params = new Array(); params['ipaddress_list']='%s'; exec_xml('spamfilter', 'procSpamfilterAdminInsertDeniedIP', params, completeCallModuleAction)", $oDocument->getIpAddress());
-				$oDocumentController->addDocumentPopupMenu($url,'cmd_add_ip_to_spamfilter','','javascript');
+				$oDocumentController->addDocumentPopupMenu($url, 'cmd_add_ip_to_spamfilter', '', 'javascript');
 			}
 		}
 		// Changing the language of pop-up menu
 		$menus = Context::get('document_popup_menu_list');
 		$menus_count = count($menus);
-		for($i=0;$i<$menus_count;$i++)
+		for ($i = 0; $i < $menus_count; $i++)
 		{
 			$menus[$i]->str = Context::getLang($menus[$i]->str);
 		}
@@ -590,13 +590,13 @@ 
 	 */
 	function getDocumentCount($module_srl, $search_obj = NULL)
 	{
-		if(is_null($search_obj)) $search_obj = new stdClass();
+		if (is_null($search_obj)) $search_obj = new stdClass();
 		$search_obj->module_srl = $module_srl;
 
 		$output = executeQuery('document.getDocumentCount', $search_obj);
 		// Return total number of
 		$total_count = $output->data->count;
-		return (int)$total_count;
+		return (int) $total_count;
 	}
 
 	/**
@@ -607,7 +607,7 @@ 
 	function getDocumentCountByGroupStatus($search_obj = NULL)
 	{
 		$output = executeQuery('document.getDocumentCountByGroupStatus', $search_obj);
-		if(!$output->toBool()) return array();
+		if (!$output->toBool()) return array();
 
 		return $output->data;
 	}
@@ -626,7 +626,7 @@ 
 		$output = executeQuery('document.getDocumentExtraVarsCount', $args);
 		// Return total number of
 		$total_count = $output->data->count;
-		return (int)$total_count;
+		return (int) $total_count;
 	}
 
 	/**
@@ -643,17 +643,17 @@ 
 
 		$this->_setSearchOption($opt, $args, $query_id, $use_division);
 
-		if($sort_check->isExtraVars)
+		if ($sort_check->isExtraVars)
 		{
 			return 1;
 		}
 		else
 		{
-			if($sort_check->sort_index === 'list_order' || $sort_check->sort_index === 'update_order')
+			if ($sort_check->sort_index === 'list_order' || $sort_check->sort_index === 'update_order')
 			{
-				if($args->order_type === 'desc')
+				if ($args->order_type === 'desc')
 				{
-					$args->{'rev_' . $sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
+					$args->{'rev_'.$sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
 				}
 				else
 				{
@@ -667,9 +667,9 @@ 
 		}
 
 		// Guhanhu total number of the article search page
-		$output = executeQuery($query_id . 'Page', $args);
+		$output = executeQuery($query_id.'Page', $args);
 		$count = $output->data->count;
-		$page = (int)(($count-1)/$opt->list_count)+1;
+		$page = (int) (($count - 1) / $opt->list_count) + 1;
 		return $page;
 	}
 
@@ -681,16 +681,16 @@ 
 	 */
 	function getCategory($category_srl, $columnList = array())
 	{
-		$args =new stdClass();
+		$args = new stdClass();
 		$args->category_srl = $category_srl;
 		$output = executeQuery('document.getCategory', $args, $columnList);
 
 		$node = $output->data;
-		if(!$node) return;
+		if (!$node) return;
 
-		if($node->group_srls)
+		if ($node->group_srls)
 		{
-			$group_srls = explode(',',$node->group_srls);
+			$group_srls = explode(',', $node->group_srls);
 			unset($node->group_srls);
 			$node->group_srls = $group_srls;
 		}
@@ -711,8 +711,8 @@ 
 	{
 		$args = new stdClass();
 		$args->category_srl = $category_srl;
-		$output = executeQuery('document.getChildCategoryCount',$args);
-		if($output->data->count > 0) return true;
+		$output = executeQuery('document.getChildCategoryCount', $args);
+		if ($output->data->count > 0) return true;
 		return false;
 	}
 
@@ -728,10 +728,10 @@ 
 		// Category of the target module file swollen
 		$filename = sprintf("%sfiles/cache/document_category/%s.php", _XE_PATH_, $module_srl);
 		// If the target file to the cache file regeneration category
-		if(!file_exists($filename))
+		if (!file_exists($filename))
 		{
 			$oDocumentController = getController('document');
-			if(!$oDocumentController->makeCategoryFile($module_srl)) return array();
+			if (!$oDocumentController->makeCategoryFile($module_srl)) return array();
 		}
 
 		include($filename);
@@ -751,10 +751,10 @@ 
 	 */
 	function _arrangeCategory(&$document_category, $list, $depth)
 	{
-		if(!count($list)) return;
+		if (!count($list)) return;
 		$idx = 0;
 		$list_order = array();
-		foreach($list as $key => $val)
+		foreach ($list as $key => $val)
 		{
 			$obj = new stdClass;
 			$obj->mid = $val['mid'];
@@ -763,7 +763,7 @@ 
 			$obj->parent_srl = $val['parent_srl'];
 			$obj->title = $obj->text = $val['text'];
 			$obj->description = $val['description'];
-			$obj->expand = $val['expand']=='Y'?true:false;
+			$obj->expand = $val['expand'] == 'Y' ? true : false;
 			$obj->color = $val['color'];
 			$obj->document_count = $val['document_count'];
 			$obj->depth = $depth;
@@ -771,26 +771,26 @@ 
 			$obj->childs = array();
 			$obj->grant = $val['grant'];
 
-			if(Context::get('mid') == $obj->mid && Context::get('category') == $obj->category_srl) $selected = true;
+			if (Context::get('mid') == $obj->mid && Context::get('category') == $obj->category_srl) $selected = true;
 			else $selected = false;
 
 			$obj->selected = $selected;
 
 			$list_order[$idx++] = $obj->category_srl;
 			// If you have a parent category of child nodes apply data
-			if($obj->parent_srl)
+			if ($obj->parent_srl)
 			{
 				$parent_srl = $obj->parent_srl;
 				$document_count = $obj->document_count;
 				$expand = $obj->expand;
-				if($selected) $expand = true;
+				if ($selected) $expand = true;
 
-				while($parent_srl)
+				while ($parent_srl)
 				{
 					$document_category[$parent_srl]->document_count += $document_count;
 					$document_category[$parent_srl]->childs[] = $obj->category_srl;
 					$document_category[$parent_srl]->child_count = count($document_category[$parent_srl]->childs);
-					if($expand) $document_category[$parent_srl]->expand = $expand;
+					if ($expand) $document_category[$parent_srl]->expand = $expand;
 
 					$parent_srl = $document_category[$parent_srl]->parent_srl;
 				}
@@ -798,10 +798,10 @@ 
 
 			$document_category[$key] = $obj;
 
-			if(count($val['list'])) $this->_arrangeCategory($document_category, $val['list'], $depth+1);
+			if (count($val['list'])) $this->_arrangeCategory($document_category, $val['list'], $depth + 1);
 		}
 		$document_category[$list_order[0]]->first = true;
-		$document_category[$list_order[count($list_order)-1]]->last = true;
+		$document_category[$list_order[count($list_order) - 1]]->last = true;
 	}
 
 	/**
@@ -816,7 +816,7 @@ 
 		$args->module_srl = $module_srl;
 		$args->category_srl = $category_srl;
 		$output = executeQuery('document.getCategoryDocumentCount', $args);
-		return (int)$output->data->count;
+		return (int) $output->data->count;
 	}
 
 	/**
@@ -826,8 +826,8 @@ 
 	 */
 	function getCategoryXmlFile($module_srl)
 	{
-		$xml_file = sprintf('files/cache/document_category/%s.xml.php',$module_srl);
-		if(!file_exists($xml_file))
+		$xml_file = sprintf('files/cache/document_category/%s.xml.php', $module_srl);
+		if (!file_exists($xml_file))
 		{
 			$oDocumentController = getController('document');
 			$oDocumentController->makeCategoryFile($module_srl);
@@ -842,8 +842,8 @@ 
 	 */
 	function getCategoryPhpFile($module_srl)
 	{
-		$php_file = sprintf('files/cache/document_category/%s.php',$module_srl);
-		if(!file_exists($php_file))
+		$php_file = sprintf('files/cache/document_category/%s.php', $module_srl);
+		if (!file_exists($php_file))
 		{
 			$oDocumentController = getController('document');
 			$oDocumentController->makeCategoryFile($module_srl);
@@ -858,7 +858,7 @@ 
 	 */
 	function getMonthlyArchivedList($obj)
 	{
-		if($obj->mid)
+		if ($obj->mid)
 		{
 			$oModuleModel = getModel('module');
 			$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
@@ -866,13 +866,13 @@ 
 		}
 		// Module_srl passed the array may be a check whether the array
 		$args = new stdClass;
-		if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
+		if (is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
 		else $args->module_srl = $obj->module_srl;
 
 		$output = executeQuery('document.getMonthlyArchivedList', $args);
-		if(!$output->toBool()||!$output->data) return $output;
+		if (!$output->toBool() || !$output->data) return $output;
 
-		if(!is_array($output->data)) $output->data = array($output->data);
+		if (!is_array($output->data)) $output->data = array($output->data);
 
 		return $output;
 	}
@@ -884,7 +884,7 @@ 
 	 */
 	function getDailyArchivedList($obj)
 	{
-		if($obj->mid)
+		if ($obj->mid)
 		{
 			$oModuleModel = getModel('module');
 			$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
@@ -892,14 +892,14 @@ 
 		}
 		// Module_srl passed the array may be a check whether the array
 		$args = new stdClass;
-		if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
+		if (is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
 		else $args->module_srl = $obj->module_srl;
 		$args->regdate = $obj->regdate;
 
 		$output = executeQuery('document.getDailyArchivedList', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		if(!is_array($output->data)) $output->data = array($output->data);
+		if (!is_array($output->data)) $output->data = array($output->data);
 
 		return $output;
 	}
@@ -910,17 +910,17 @@ 
 	 */
 	function getDocumentCategories()
 	{
-		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
 		$module_srl = Context::get('module_srl');
-		$categories= $this->getCategoryList($module_srl);
+		$categories = $this->getCategoryList($module_srl);
 		$lang = Context::get('lang');
 		// No additional category
 		$output = "0,0,{$lang->none_category}\n";
-		if($categories)
+		if ($categories)
 		{
-			foreach($categories as $category_srl => $category)
+			foreach ($categories as $category_srl => $category)
 			{
-				$output .= sprintf("%d,%d,%s\n",$category_srl, $category->depth,$category->title);
+				$output .= sprintf("%d,%d,%s\n", $category_srl, $category->depth, $category->title);
 			}
 		}
 		$this->add('categories', $output);
@@ -932,13 +932,13 @@ 
 	 */
 	function getDocumentConfig()
 	{
-		if(!$GLOBALS['__document_config__'])
+		if (!$GLOBALS['__document_config__'])
 		{
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('document');
 
-			if(!$config) $config = new stdClass();
-			if(!$config->thumbnail_type) $config->thumbnail_type = 'crop';
+			if (!$config) $config = new stdClass();
+			if (!$config->thumbnail_type) $config->thumbnail_type = 'crop';
 			$GLOBALS['__document_config__'] = $config;
 		}
 		return $GLOBALS['__document_config__'];
@@ -1003,11 +1003,11 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
 		// Check permissions
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
-		if(!$grant->manager) return new Object(-1,'msg_not_permitted');
+		if (!$grant->manager) return new Object(-1, 'msg_not_permitted');
 
 		$category_srl = Context::get('category_srl');
 		$category_info = $this->getCategory($category_srl);
-		if(!$category_info)
+		if (!$category_info)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -1023,14 +1023,14 @@ 
 	 */
 	function getDocumentSrlByAlias($mid, $alias)
 	{
-		if(!$mid || !$alias) return null;
+		if (!$mid || !$alias) return null;
 		$site_module_info = Context::get('site_module_info');
 		$args = new stdClass;
 		$args->mid = $mid;
 		$args->alias_title = $alias;
 		$args->site_srl = $site_module_info->site_srl;
 		$output = executeQuery('document.getDocumentSrlByAlias', $args);
-		if(!$output->data) return null;
+		if (!$output->data) return null;
 		else return $output->data->document_srl;
 	}
 
@@ -1042,15 +1042,15 @@ 
 	 */
 	function getDocumentSrlByTitle($module_srl, $title)
 	{
-		if(!$module_srl || !$title) return null;
+		if (!$module_srl || !$title) return null;
 		$args = new stdClass;
 		$args->module_srl = $module_srl;
 		$args->title = $title;
 		$output = executeQuery('document.getDocumentSrlByTitle', $args);
-		if(!$output->data) return null;
+		if (!$output->data) return null;
 		else
 		{
-			if(is_array($output->data)) return $output->data[0]->document_srl;
+			if (is_array($output->data)) return $output->data[0]->document_srl;
 			return $output->data->document_srl;
 		}
 	}
@@ -1062,12 +1062,12 @@ 
 	 */
 	function getAlias($document_srl)
 	{
-		if(!$document_srl) return null;
+		if (!$document_srl) return null;
 		$args = new stdClass;
 		$args->document_srl = $document_srl;
 		$output = executeQueryArray('document.getAliases', $args);
 
-		if(!$output->data) return null;
+		if (!$output->data) return null;
 		else return $output->data[0]->alias_title;
 	}
 
@@ -1110,32 +1110,32 @@ 
 	{
 		// Variable check
 		$args = new stdClass;
-		$args->category_srl = $obj->category_srl?$obj->category_srl:null;
+		$args->category_srl = $obj->category_srl ? $obj->category_srl : null;
 		$args->sort_index = $obj->sort_index;
-		$args->order_type = $obj->order_type?$obj->order_type:'desc';
-		$args->page = $obj->page?$obj->page:1;
-		$args->list_count = $obj->list_count?$obj->list_count:20;
-		$args->page_count = $obj->page_count?$obj->page_count:10;
+		$args->order_type = $obj->order_type ? $obj->order_type : 'desc';
+		$args->page = $obj->page ? $obj->page : 1;
+		$args->list_count = $obj->list_count ? $obj->list_count : 20;
+		$args->page_count = $obj->page_count ? $obj->page_count : 10;
 		// Search options
 		$search_target = $obj->search_target;
 		$search_keyword = $obj->search_keyword;
-		if($search_target && $search_keyword)
+		if ($search_target && $search_keyword)
 		{
-			switch($search_target)
+			switch ($search_target)
 			{
 				case 'title' :
 				case 'content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->{"s_".$search_target} = $search_keyword;
 					$use_division = true;
 					break;
 				case 'title_content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_title = $search_keyword;
 					$args->s_content = $search_keyword;
 					break;
 				case 'user_id' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_user_id = $search_keyword;
 					$args->sort_index = 'documents.'.$args->sort_index;
 					break;
@@ -1143,13 +1143,13 @@ 
 				case 'nick_name' :
 				case 'email_address' :
 				case 'homepage' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->{"s_".$search_target} = $search_keyword;
 					break;
 				case 'is_notice' :
 				case 'is_secret' :
-					if($search_keyword=='N') $args->statusList = array($this->getConfigStatus('public'));
-					elseif($search_keyword=='Y') $args->statusList = array($this->getConfigStatus('secret'));
+					if ($search_keyword == 'N') $args->statusList = array($this->getConfigStatus('public'));
+					elseif ($search_keyword == 'Y') $args->statusList = array($this->getConfigStatus('secret'));
 					break;
 				case 'member_srl' :
 				case 'readed_count' :
@@ -1158,7 +1158,7 @@ 
 				case 'comment_count' :
 				case 'trackback_count' :
 				case 'uploaded_count' :
-					$args->{"s_".$search_target} = (int)$search_keyword;
+					$args->{"s_".$search_target} = (int) $search_keyword;
 					break;
 				case 'regdate' :
 				case 'last_update' :
@@ -1170,9 +1170,9 @@ 
 		}
 
 		$output = executeQueryArray('document.getTrashList', $args);
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $key => $attribute)
+			foreach ($output->data as $key => $attribute)
 			{
 				$oDocument = null;
 				$oDocument = new documentItem();
@@ -1191,46 +1191,46 @@ 
 	{
 		$args = new stdClass;
 		$document_srl = Context::get('document_srl');
-		if(!$document_srl) return new Object(-1,'msg_invalid_request');
+		if (!$document_srl) return new Object(-1, 'msg_invalid_request');
 
 		$point = Context::get('point');
-		if($point != -1) $point = 1;
+		if ($point != -1) $point = 1;
 
 		$oDocumentModel = getModel('document');
 		$columnList = array('document_srl', 'module_srl');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList);
 		$module_srl = $oDocument->get('module_srl');
-		if(!$module_srl) return new Object(-1, 'msg_invalid_request');
+		if (!$module_srl) return new Object(-1, 'msg_invalid_request');
 
 		$oModuleModel = getModel('module');
-		$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
-		if($point == -1)
+		$document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
+		if ($point == -1)
 		{
-			if($document_config->use_vote_down!='S') return new Object(-1, 'msg_invalid_request');
+			if ($document_config->use_vote_down != 'S') return new Object(-1, 'msg_invalid_request');
 			$args->below_point = 0;
 		}
 		else
 		{
-			if($document_config->use_vote_up!='S') return new Object(-1, 'msg_invalid_request');
+			if ($document_config->use_vote_up != 'S') return new Object(-1, 'msg_invalid_request');
 			$args->more_point = 0;
 		}
 
 		$args->document_srl = $document_srl;
 
-		$output = executeQueryArray('document.getVotedMemberList',$args);
-		if(!$output->toBool()) return $output;
+		$output = executeQueryArray('document.getVotedMemberList', $args);
+		if (!$output->toBool()) return $output;
 
 		$oMemberModel = getModel('member');
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $k => $d)
+			foreach ($output->data as $k => $d)
 			{
 				$profile_image = $oMemberModel->getProfileImage($d->member_srl);
 				$output->data[$k]->src = $profile_image->src;
 			}
 		}
 
-		$this->add('voted_member_list',$output->data);
+		$this->add('voted_member_list', $output->data);
 	}
 
 	/**
@@ -1240,7 +1240,7 @@ 
 	function getStatusNameList()
 	{
 		global $lang;
-		if(!isset($lang->status_name_list))
+		if (!isset($lang->status_name_list))
 			return array_flip($this->getStatusList());
 		else return $lang->status_name_list;
 	}
@@ -1255,7 +1255,7 @@ 
 	{
 		$sortIndex = $obj->sort_index;
 		$isExtraVars = false;
-		if(!in_array($sortIndex, array('list_order','regdate','last_update','update_order','readed_count','voted_count','blamed_count','comment_count','trackback_count','uploaded_count','title','category_srl')))
+		if (!in_array($sortIndex, array('list_order', 'regdate', 'last_update', 'update_order', 'readed_count', 'voted_count', 'blamed_count', 'comment_count', 'trackback_count', 'uploaded_count', 'title', 'category_srl')))
 		{
 			// get module_srl extra_vars list
 			if ($load_extra_vars)
@@ -1270,11 +1270,11 @@ 
 				else
 				{
 					$check_array = array();
-					foreach($extra_output->data as $val)
+					foreach ($extra_output->data as $val)
 					{
 						$check_array[] = $val->eid;
 					}
-					if(!in_array($sortIndex, $check_array)) $sortIndex = 'list_order';
+					if (!in_array($sortIndex, $check_array)) $sortIndex = 'list_order';
 					else $isExtraVars = true;
 				}
 			}
@@ -1302,13 +1302,13 @@ 
 	{
 		// Variable check
 		$args = new stdClass();
-		$args->category_srl = $searchOpt->category_srl?$searchOpt->category_srl:null;
+		$args->category_srl = $searchOpt->category_srl ? $searchOpt->category_srl : null;
 		$args->order_type = $searchOpt->order_type;
-		$args->page = $searchOpt->page?$searchOpt->page:1;
-		$args->list_count = $searchOpt->list_count?$searchOpt->list_count:20;
-		$args->page_count = $searchOpt->page_count?$searchOpt->page_count:10;
-		$args->start_date = $searchOpt->start_date?$searchOpt->start_date:null;
-		$args->end_date = $searchOpt->end_date?$searchOpt->end_date:null;
+		$args->page = $searchOpt->page ? $searchOpt->page : 1;
+		$args->list_count = $searchOpt->list_count ? $searchOpt->list_count : 20;
+		$args->page_count = $searchOpt->page_count ? $searchOpt->page_count : 10;
+		$args->start_date = $searchOpt->start_date ? $searchOpt->start_date : null;
+		$args->end_date = $searchOpt->end_date ? $searchOpt->end_date : null;
 		$args->member_srl = $searchOpt->member_srl;
 
 		$logged_info = Context::get('logged_info');
@@ -1317,10 +1317,10 @@ 
 		
 		// Check the target and sequence alignment
 		$orderType = array('desc' => 1, 'asc' => 1);
-		if(!isset($orderType[$args->order_type])) $args->order_type = 'asc';
+		if (!isset($orderType[$args->order_type])) $args->order_type = 'asc';
 
 		// If that came across mid module_srl instead of a direct module_srl guhaejum
-		if($searchOpt->mid)
+		if ($searchOpt->mid)
 		{
 			$oModuleModel = getModel('module');
 			$args->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
@@ -1328,30 +1328,30 @@ 
 		}
 
 		// Module_srl passed the array may be a check whether the array
-		if(is_array($searchOpt->module_srl)) $args->module_srl = implode(',', $searchOpt->module_srl);
+		if (is_array($searchOpt->module_srl)) $args->module_srl = implode(',', $searchOpt->module_srl);
 		else $args->module_srl = $searchOpt->module_srl;
 
 		// Except for the test module_srl
-		if(is_array($searchOpt->exclude_module_srl)) $args->exclude_module_srl = implode(',', $searchOpt->exclude_module_srl);
+		if (is_array($searchOpt->exclude_module_srl)) $args->exclude_module_srl = implode(',', $searchOpt->exclude_module_srl);
 		else $args->exclude_module_srl = $searchOpt->exclude_module_srl;
 
 		// only admin document list, temp document showing
-		if($searchOpt->statusList) $args->statusList = $searchOpt->statusList;
+		if ($searchOpt->statusList) $args->statusList = $searchOpt->statusList;
 		else
 		{
-			if($logged_info->is_admin == 'Y' && !$searchOpt->module_srl)
+			if ($logged_info->is_admin == 'Y' && !$searchOpt->module_srl)
 				$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'), $this->getConfigStatus('temp'));
 			else
 				$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'));
 		}
 
 		// Category is selected, further sub-categories until all conditions
-		if($args->category_srl)
+		if ($args->category_srl)
 		{
 			$category_list = $this->getCategoryList($args->module_srl);
 			$category_info = $category_list[$args->category_srl];
 			$category_info->childs[] = $args->category_srl;
-			$args->category_srl = implode(',',$category_info->childs);
+			$args->category_srl = implode(',', $category_info->childs);
 		}
 
 		// Used to specify the default query id (based on several search options to query id modified)
@@ -1364,24 +1364,24 @@ 
 		$search_target = $searchOpt->search_target;
 		$search_keyword = $searchOpt->search_keyword;
 
-		if($search_target && $search_keyword)
+		if ($search_target && $search_keyword)
 		{
-			switch($search_target)
+			switch ($search_target)
 			{
 				case 'title' :
 				case 'content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->{"s_".$search_target} = $search_keyword;
 					$use_division = true;
 					break;
 				case 'title_content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_title = $search_keyword;
 					$args->s_content = $search_keyword;
 					$use_division = true;
 					break;
 				case 'user_id' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_user_id = $search_keyword;
 					$args->sort_index = 'documents.'.$args->sort_index;
 					break;
@@ -1389,18 +1389,18 @@ 
 				case 'nick_name' :
 				case 'email_address' :
 				case 'homepage' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->{"s_".$search_target} = $search_keyword;
 					break;
 				case 'is_notice' :
-					if($search_keyword=='N') $args->{"s_".$search_target} = 'N';
-					elseif($search_keyword=='Y') $args->{"s_".$search_target} = 'Y';
+					if ($search_keyword == 'N') $args->{"s_".$search_target} = 'N';
+					elseif ($search_keyword == 'Y') $args->{"s_".$search_target} = 'Y';
 					else $args->{"s_".$search_target} = '';
 					break;
 				case 'is_secret' :
-					if($search_keyword=='N') $args->statusList = array($this->getConfigStatus('public'));
-					elseif($search_keyword=='Y') $args->statusList = array($this->getConfigStatus('secret'));
-					elseif($search_keyword=='temp') $args->statusList = array($this->getConfigStatus('temp'));
+					if ($search_keyword == 'N') $args->statusList = array($this->getConfigStatus('public'));
+					elseif ($search_keyword == 'Y') $args->statusList = array($this->getConfigStatus('secret'));
+					elseif ($search_keyword == 'temp') $args->statusList = array($this->getConfigStatus('temp'));
 					break;
 				case 'member_srl' :
 				case 'readed_count' :
@@ -1408,10 +1408,10 @@ 
 				case 'comment_count' :
 				case 'trackback_count' :
 				case 'uploaded_count' :
-					$args->{"s_".$search_target} = (int)$search_keyword;
+					$args->{"s_".$search_target} = (int) $search_keyword;
 					break;
 				case 'blamed_count' :
-					$args->{"s_".$search_target} = (int)$search_keyword * -1;
+					$args->{"s_".$search_target} = (int) $search_keyword * -1;
 					break;
 				case 'regdate' :
 				case 'last_update' :
@@ -1424,7 +1424,7 @@ 
 					$use_division = true;
 					break;
 				case 'tag' :
-					$args->s_tags = str_replace(' ','%',$search_keyword);
+					$args->s_tags = str_replace(' ', '%', $search_keyword);
 					$query_id = 'document.getDocumentListWithinTag';
 					break;
 				case 'extra_vars':
@@ -1432,9 +1432,9 @@ 
 					$query_id = 'document.getDocumentListWithinExtraVars';
 					break;
 				default :
-					if(strpos($search_target,'extra_vars')!==false) {
+					if (strpos($search_target, 'extra_vars') !== false) {
 						$args->var_idx = substr($search_target, strlen('extra_vars'));
-						$args->var_value = str_replace(' ','%',$search_keyword);
+						$args->var_value = str_replace(' ', '%', $search_keyword);
 						$args->sort_index = 'documents.'.$args->sort_index;
 						$query_id = 'document.getDocumentListWithExtraVars';
 					}
@@ -1451,18 +1451,18 @@ 
 			/**
 			 * list_order asc sort of division that can be used only when
 			 */
-			if($args->sort_index != 'list_order' || $args->order_type != 'asc') $use_division = false;
+			if ($args->sort_index != 'list_order' || $args->order_type != 'asc') $use_division = false;
 
 			/**
 			 * If it is true, use_division changed to use the document division
 			 */
-			if($use_division)
+			if ($use_division)
 			{
 				// Division begins
-				$division = (int)Context::get('division');
+				$division = (int) Context::get('division');
 
 				// order by list_order and (module_srl===0 or module_srl may count), therefore case table full scan
-				if($args->sort_index == 'list_order' && ($args->exclude_module_srl === '0' || count(explode(',', $args->module_srl)) > 5))
+				if ($args->sort_index == 'list_order' && ($args->exclude_module_srl === '0' || count(explode(',', $args->module_srl)) > 5))
 				{
 					$listSqlID = 'document.getDocumentListUseIndex';
 					$divisionSqlID = 'document.getDocumentDivisionUseIndex';
@@ -1474,7 +1474,7 @@ 
 				}
 
 				// If you do not value the best division top
-				if(!$division)
+				if (!$division)
 				{
 					$division_args = new stdClass();
 					$division_args->module_srl = $args->module_srl;
@@ -1485,7 +1485,7 @@ 
 					$division_args->statusList = $args->statusList;
 
 					$output = executeQuery($divisionSqlID, $division_args, array('list_order'));
-					if($output->data)
+					if ($output->data)
 					{
 						$item = array_pop($output->data);
 						$division = $item->list_order;
@@ -1494,10 +1494,10 @@ 
 				}
 
 				// The last division
-				$last_division = (int)Context::get('last_division');
+				$last_division = (int) Context::get('last_division');
 
 				// Division after division from the 5000 value of the specified Wanted
-				if(!$last_division)
+				if (!$last_division)
 				{
 					$last_division_args = new stdClass();
 					$last_division_args->module_srl = $args->module_srl;
@@ -1509,7 +1509,7 @@ 
 					$last_division_args->page = 5001;
 
 					$output = executeQuery($divisionSqlID, $last_division_args, array('list_order'));
-					if($output->data)
+					if ($output->data)
 					{
 						$item = array_pop($output->data);
 						$last_division = $item->list_order;
@@ -1517,14 +1517,14 @@ 
 				}
 
 				// Make sure that after last_division article
-				if($last_division)
+				if ($last_division)
 				{
 					$last_division_args = new stdClass();
 					$last_division_args->module_srl = $args->module_srl;
 					$last_division_args->exclude_module_srl = $args->exclude_module_srl;
 					$last_division_args->list_order = $last_division;
 					$output = executeQuery('document.getDocumentDivisionCount', $last_division_args);
-					if($output->data->count<1) $last_division = null;
+					if ($output->data->count < 1) $last_division = null;
 				}
 
 				$args->division = $division;
@@ -1557,7 +1557,7 @@ 
 	 * @param int $count
 	 * @return object
 	 */
-	function getDocumentListByMemberSrl($member_srl, $columnList = array(), $page = 0, $is_admin = FALSE, $count = 0 )
+	function getDocumentListByMemberSrl($member_srl, $columnList = array(), $page = 0, $is_admin = FALSE, $count = 0)
 	{
 		$args = new stdClass();
 		$args->member_srl = $member_srl;
@@ -1565,8 +1565,8 @@ 
 		$output = executeQuery('document.getDocumentListByMemberSrl', $args, $columnList);
 		$document_list = $output->data;
 		
-		if(!$document_list) return array();
-		if(!is_array($document_list)) $document_list = array($document_list);
+		if (!$document_list) return array();
+		if (!is_array($document_list)) $document_list = array($document_list);
 
 		return $document_list;	
 	}

Braces +303 added lines, -135 removed lines

@@ -56,18 +56,24 @@ 
 		$_document_list = &$GLOBALS['XE_DOCUMENT_LIST'];
 
 		// XE XE_DOCUMENT_LIST all documents that the object referred to the global variable settings
-		if(count($_document_list) <= 0) return;
+		if(count($_document_list) <= 0) {
+			return;
+		}
 
 		// Find all called the document object variable has been set extension
 		$document_srls = array();
 		foreach($_document_list as $key => $val)
 		{
-			if(!$val->document_srl || $checked_documents[$val->document_srl]) continue;
+			if(!$val->document_srl || $checked_documents[$val->document_srl]) {
+				continue;
+			}
 			$checked_documents[$val->document_srl] = true;
 			$document_srls[] = $val->document_srl;
 		}
 		// If the document number, return detected
-		if(!count($document_srls)) return;
+		if(!count($document_srls)) {
+			return;
+		}
 		// Expand variables mijijeongdoen article about a current visitor to the extension of the language code, the search variable
 		//$obj->document_srl = implode(',',$document_srls);
 		$output = $this->getDocumentExtraVarsFromDB($document_srls);
@@ -75,8 +81,12 @@ 
 		{
 			foreach($output->data as $key => $val)
 			{
-				if(!isset($val->value)) continue;
-				if(!$extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0]) $extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0] = trim($val->value);
+				if(!isset($val->value)) {
+					continue;
+				}
+				if(!$extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0]) {
+					$extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0] = trim($val->value);
+				}
 				$extra_vars[$val->document_srl][$val->var_idx][$val->lang_code] = trim($val->value);
 			}
 		}
@@ -87,7 +97,9 @@ 
 			$document_srl = $document_srls[$i];
 			unset($vars);
 
-			if(!$_document_list[$document_srl] || !is_object($_document_list[$document_srl]) || !$_document_list[$document_srl]->isExists()) continue;
+			if(!$_document_list[$document_srl] || !is_object($_document_list[$document_srl]) || !$_document_list[$document_srl]->isExists()) {
+				continue;
+			}
 			$module_srl = $_document_list[$document_srl]->get('module_srl');
 			$extra_keys = $this->getExtraKeys($module_srl);
 			$vars = $extra_vars[$document_srl];
@@ -99,10 +111,15 @@ 
 				{
 					$extra_keys[$idx] = clone($key);
 					$val = $vars[$idx];
-					if(isset($val[$user_lang_code])) $v = $val[$user_lang_code];
-					else if(isset($val[$document_lang_code])) $v = $val[$document_lang_code];
-					else if(isset($val[0])) $v = $val[0];
-					else $v = null;
+					if(isset($val[$user_lang_code])) {
+						$v = $val[$user_lang_code];
+					} else if(isset($val[$document_lang_code])) {
+						$v = $val[$document_lang_code];
+					} else if(isset($val[0])) {
+						$v = $val[0];
+					} else {
+						$v = null;
+					}
 					$extra_keys[$idx]->value = $v;
 				}
 			}
@@ -111,9 +128,13 @@ 
 			$evars = new ExtraVar($module_srl);
 			$evars->setExtraVarKeys($extra_keys);
 			// Title Processing
-			if($vars[-1][$user_lang_code]) $_document_list[$document_srl]->add('title',$vars[-1][$user_lang_code]);
+			if($vars[-1][$user_lang_code]) {
+				$_document_list[$document_srl]->add('title',$vars[-1][$user_lang_code]);
+			}
 			// Information processing
-			if($vars[-2][$user_lang_code]) $_document_list[$document_srl]->add('content',$vars[-2][$user_lang_code]);
+			if($vars[-2][$user_lang_code]) {
+				$_document_list[$document_srl]->add('content',$vars[-2][$user_lang_code]);
+			}
 
 			if($vars[-1][$user_lang_code] || $vars[-2][$user_lang_code])
 			{
@@ -134,15 +155,21 @@ 
 	 */
 	function getDocument($document_srl=0, $is_admin = false, $load_extra_vars=true, $columnList = array())
 	{
-		if(!$document_srl) return new documentItem();
+		if(!$document_srl) {
+			return new documentItem();
+		}
 
 		if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 		{
 			$oDocument = new documentItem($document_srl, $load_extra_vars, $columnList);
 			$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
-			if($load_extra_vars) $this->setToAllDocumentExtraVars();
+			if($load_extra_vars) {
+				$this->setToAllDocumentExtraVars();
+			}
+		}
+		if($is_admin) {
+			$GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->setGrant();
 		}
-		if($is_admin) $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->setGrant();
 
 		return $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
 	}
@@ -161,8 +188,7 @@ 
 		{
 			$list_count = count($document_srls);
 			$document_srls = implode(',',$document_srls);
-		}
-		else
+		} else
 		{
 			$list_count = 1;
 		}
@@ -173,28 +199,38 @@ 
 
 		$output = executeQuery('document.getDocuments', $args, $columnList);
 		$document_list = $output->data;
-		if(!$document_list) return;
-		if(!is_array($document_list)) $document_list = array($document_list);
+		if(!$document_list) {
+			return;
+		}
+		if(!is_array($document_list)) {
+			$document_list = array($document_list);
+		}
 
 		$document_count = count($document_list);
 		foreach($document_list as $key => $attribute)
 		{
 			$document_srl = $attribute->document_srl;
-			if(!$document_srl) continue;
+			if(!$document_srl) {
+				continue;
+			}
 
 			if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 			{
 				$oDocument = null;
 				$oDocument = new documentItem();
 				$oDocument->setAttribute($attribute, false);
-				if($is_admin) $oDocument->setGrant();
+				if($is_admin) {
+					$oDocument->setGrant();
+				}
 				$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
 			}
 
 			$result[$attribute->document_srl] = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
 		}
 
-		if($load_extra_vars) $this->setToAllDocumentExtraVars();
+		if($load_extra_vars) {
+			$this->setToAllDocumentExtraVars();
+		}
 
 		$output = null;
 		if(count($result))
@@ -242,18 +278,15 @@ 
 		{
 			$output = $obj->use_alternate_output;
 			unset($obj->use_alternate_output);
-		}
-		elseif ($sort_check->isExtraVars && substr_count($obj->search_target,'extra_vars'))
+		} elseif ($sort_check->isExtraVars && substr_count($obj->search_target,'extra_vars'))
 		{
 			$query_id = 'document.getDocumentListWithinExtraVarsExtraSort';
 			$args->sort_index = str_replace('documents.','',$args->sort_index);
 			$output = executeQueryArray($query_id, $args);
-		}
-		elseif ($sort_check->isExtraVars)
+		} elseif ($sort_check->isExtraVars)
 		{
 			$output = executeQueryArray($query_id, $args);
-		}
-		else
+		} else
 		{
 			// document.getDocumentList query execution
 			// Query_id if you have a group by clause getDocumentListWithinTag getDocumentListWithinComment or used again to perform the query because
@@ -263,11 +296,15 @@ 
 				$group_args = clone($args);
 				$group_args->sort_index = 'documents.'.$args->sort_index;
 				$output = executeQueryArray($query_id, $group_args);
-				if(!$output->toBool()||!count($output->data)) return $output;
+				if(!$output->toBool()||!count($output->data)) {
+					return $output;
+				}
 
 				foreach($output->data as $key => $val)
 				{
-					if($val->document_srl) $target_srls[] = $val->document_srl;
+					if($val->document_srl) {
+						$target_srls[] = $val->document_srl;
+					}
 				}
 
 				$page_navigation = $output->page_navigation;
@@ -285,14 +322,15 @@ 
 				$output->total_count = $page_navigation->total_count;
 				$output->total_page = $page_navigation->total_page;
 				$output->page = $page_navigation->cur_page;
-			}
-			else
+			} else
 			{
 				$output = executeQueryArray($query_id, $args, $columnList);
 			}
 		}
 		// Return if no result or an error occurs
-		if(!$output->toBool()||!count($output->data)) return $output;
+		if(!$output->toBool()||!count($output->data)) {
+			return $output;
+		}
 		$idx = 0;
 		$data = $output->data;
 		unset($output->data);
@@ -307,20 +345,26 @@ 
 		{
 			foreach($data as $key => $attribute)
 			{
-				if($attribute->is_notice == 'Y') $virtual_number --;
+				if($attribute->is_notice == 'Y') {
+					$virtual_number --;
+				}
 			}
 		}
 
 		foreach($data as $key => $attribute)
 		{
-			if($except_notice && $attribute->is_notice == 'Y') continue;
+			if($except_notice && $attribute->is_notice == 'Y') {
+				continue;
+			}
 			$document_srl = $attribute->document_srl;
 			if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 			{
 				$oDocument = null;
 				$oDocument = new documentItem();
 				$oDocument->setAttribute($attribute, false);
-				if($is_admin) $oDocument->setGrant();
+				if($is_admin) {
+					$oDocument->setGrant();
+				}
 				$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
 			}
 
@@ -328,7 +372,9 @@ 
 			$virtual_number--;
 		}
 
-		if($load_extra_vars) $this->setToAllDocumentExtraVars();
+		if($load_extra_vars) {
+			$this->setToAllDocumentExtraVars();
+		}
 
 		if(count($output->data))
 		{
@@ -356,12 +402,16 @@ 
 		$args->module_srl = $obj->module_srl;
 		$args->category_srl= $obj->category_srl;
 		$output = executeQueryArray('document.getNoticeList', $args, $columnList);
-		if(!$output->toBool()||!$output->data) return;
+		if(!$output->toBool()||!$output->data) {
+			return;
+		}
 
 		foreach($output->data as $key => $val)
 		{
 			$document_srl = $val->document_srl;
-			if(!$document_srl) continue;
+			if(!$document_srl) {
+				continue;
+			}
 
 			if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 			{
@@ -457,7 +507,9 @@ 
 
 				$oExtraVar->setExtraVarKeys($output->data);
 				$keys = $oExtraVar->getExtraVars();
-				if(!$keys) $keys = array();
+				if(!$keys) {
+					$keys = array();
+				}
 
 				if($oCacheHandler->isSupport())
 				{
@@ -487,7 +539,9 @@ 
 			$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
 			$this->setToAllDocumentExtraVars();
 		}
-		if(is_array($GLOBALS['XE_EXTRA_VARS'][$document_srl])) ksort($GLOBALS['XE_EXTRA_VARS'][$document_srl]);
+		if(is_array($GLOBALS['XE_EXTRA_VARS'][$document_srl])) {
+			ksort($GLOBALS['XE_EXTRA_VARS'][$document_srl]);
+		}
 		return $GLOBALS['XE_EXTRA_VARS'][$document_srl];
 	}
 
@@ -517,7 +571,9 @@ 
 			$oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList);
 			$module_srl = $oDocument->get('module_srl');
 			$member_srl = $oDocument->get('member_srl');
-			if(!$module_srl) return new Object(-1, 'msg_invalid_request');
+			if(!$module_srl) {
+				return new Object(-1, 'msg_invalid_request');
+			}
 
 			$oModuleModel = getModel('module');
 			$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
@@ -590,7 +646,9 @@ 
 	 */
 	function getDocumentCount($module_srl, $search_obj = NULL)
 	{
-		if(is_null($search_obj)) $search_obj = new stdClass();
+		if(is_null($search_obj)) {
+			$search_obj = new stdClass();
+		}
 		$search_obj->module_srl = $module_srl;
 
 		$output = executeQuery('document.getDocumentCount', $search_obj);
@@ -607,7 +665,9 @@ 
 	function getDocumentCountByGroupStatus($search_obj = NULL)
 	{
 		$output = executeQuery('document.getDocumentCountByGroupStatus', $search_obj);
-		if(!$output->toBool()) return array();
+		if(!$output->toBool()) {
+			return array();
+		}
 
 		return $output->data;
 	}
@@ -646,21 +706,18 @@ 
 		if($sort_check->isExtraVars)
 		{
 			return 1;
-		}
-		else
+		} else
 		{
 			if($sort_check->sort_index === 'list_order' || $sort_check->sort_index === 'update_order')
 			{
 				if($args->order_type === 'desc')
 				{
 					$args->{'rev_' . $sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
-				}
-				else
+				} else
 				{
 					$args->{$sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
 				}
-			}
-			else
+			} else
 			{
 				return 1;
 			}
@@ -686,15 +743,16 @@ 
 		$output = executeQuery('document.getCategory', $args, $columnList);
 
 		$node = $output->data;
-		if(!$node) return;
+		if(!$node) {
+			return;
+		}
 
 		if($node->group_srls)
 		{
 			$group_srls = explode(',',$node->group_srls);
 			unset($node->group_srls);
 			$node->group_srls = $group_srls;
-		}
-		else
+		} else
 		{
 			unset($node->group_srls);
 			$node->group_srls = array();
@@ -712,7 +770,9 @@ 
 		$args = new stdClass();
 		$args->category_srl = $category_srl;
 		$output = executeQuery('document.getChildCategoryCount',$args);
-		if($output->data->count > 0) return true;
+		if($output->data->count > 0) {
+			return true;
+		}
 		return false;
 	}
 
@@ -731,7 +791,9 @@ 
 		if(!file_exists($filename))
 		{
 			$oDocumentController = getController('document');
-			if(!$oDocumentController->makeCategoryFile($module_srl)) return array();
+			if(!$oDocumentController->makeCategoryFile($module_srl)) {
+				return array();
+			}
 		}
 
 		include($filename);
@@ -751,7 +813,9 @@ 
 	 */
 	function _arrangeCategory(&$document_category, $list, $depth)
 	{
-		if(!count($list)) return;
+		if(!count($list)) {
+			return;
+		}
 		$idx = 0;
 		$list_order = array();
 		foreach($list as $key => $val)
@@ -771,8 +835,11 @@ 
 			$obj->childs = array();
 			$obj->grant = $val['grant'];
 
-			if(Context::get('mid') == $obj->mid && Context::get('category') == $obj->category_srl) $selected = true;
-			else $selected = false;
+			if(Context::get('mid') == $obj->mid && Context::get('category') == $obj->category_srl) {
+				$selected = true;
+			} else {
+				$selected = false;
+			}
 
 			$obj->selected = $selected;
 
@@ -783,14 +850,18 @@ 
 				$parent_srl = $obj->parent_srl;
 				$document_count = $obj->document_count;
 				$expand = $obj->expand;
-				if($selected) $expand = true;
+				if($selected) {
+					$expand = true;
+				}
 
 				while($parent_srl)
 				{
 					$document_category[$parent_srl]->document_count += $document_count;
 					$document_category[$parent_srl]->childs[] = $obj->category_srl;
 					$document_category[$parent_srl]->child_count = count($document_category[$parent_srl]->childs);
-					if($expand) $document_category[$parent_srl]->expand = $expand;
+					if($expand) {
+						$document_category[$parent_srl]->expand = $expand;
+					}
 
 					$parent_srl = $document_category[$parent_srl]->parent_srl;
 				}
@@ -798,7 +869,9 @@ 
 
 			$document_category[$key] = $obj;
 
-			if(count($val['list'])) $this->_arrangeCategory($document_category, $val['list'], $depth+1);
+			if(count($val['list'])) {
+				$this->_arrangeCategory($document_category, $val['list'], $depth+1);
+			}
 		}
 		$document_category[$list_order[0]]->first = true;
 		$document_category[$list_order[count($list_order)-1]]->last = true;
@@ -866,13 +939,20 @@ 
 		}
 		// Module_srl passed the array may be a check whether the array
 		$args = new stdClass;
-		if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
-		else $args->module_srl = $obj->module_srl;
+		if(is_array($obj->module_srl)) {
+			$args->module_srl = implode(',', $obj->module_srl);
+		} else {
+			$args->module_srl = $obj->module_srl;
+		}
 
 		$output = executeQuery('document.getMonthlyArchivedList', $args);
-		if(!$output->toBool()||!$output->data) return $output;
+		if(!$output->toBool()||!$output->data) {
+			return $output;
+		}
 
-		if(!is_array($output->data)) $output->data = array($output->data);
+		if(!is_array($output->data)) {
+			$output->data = array($output->data);
+		}
 
 		return $output;
 	}
@@ -892,14 +972,21 @@ 
 		}
 		// Module_srl passed the array may be a check whether the array
 		$args = new stdClass;
-		if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
-		else $args->module_srl = $obj->module_srl;
+		if(is_array($obj->module_srl)) {
+			$args->module_srl = implode(',', $obj->module_srl);
+		} else {
+			$args->module_srl = $obj->module_srl;
+		}
 		$args->regdate = $obj->regdate;
 
 		$output = executeQuery('document.getDailyArchivedList', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
-		if(!is_array($output->data)) $output->data = array($output->data);
+		if(!is_array($output->data)) {
+			$output->data = array($output->data);
+		}
 
 		return $output;
 	}
@@ -910,7 +997,9 @@ 
 	 */
 	function getDocumentCategories()
 	{
-		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new Object(-1,'msg_not_permitted');
+		}
 		$module_srl = Context::get('module_srl');
 		$categories= $this->getCategoryList($module_srl);
 		$lang = Context::get('lang');
@@ -937,8 +1026,12 @@ 
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('document');
 
-			if(!$config) $config = new stdClass();
-			if(!$config->thumbnail_type) $config->thumbnail_type = 'crop';
+			if(!$config) {
+				$config = new stdClass();
+			}
+			if(!$config->thumbnail_type) {
+				$config->thumbnail_type = 'crop';
+			}
 			$GLOBALS['__document_config__'] = $config;
 		}
 		return $GLOBALS['__document_config__'];
@@ -1003,7 +1096,9 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
 		// Check permissions
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
-		if(!$grant->manager) return new Object(-1,'msg_not_permitted');
+		if(!$grant->manager) {
+			return new Object(-1,'msg_not_permitted');
+		}
 
 		$category_srl = Context::get('category_srl');
 		$category_info = $this->getCategory($category_srl);
@@ -1023,15 +1118,20 @@ 
 	 */
 	function getDocumentSrlByAlias($mid, $alias)
 	{
-		if(!$mid || !$alias) return null;
+		if(!$mid || !$alias) {
+			return null;
+		}
 		$site_module_info = Context::get('site_module_info');
 		$args = new stdClass;
 		$args->mid = $mid;
 		$args->alias_title = $alias;
 		$args->site_srl = $site_module_info->site_srl;
 		$output = executeQuery('document.getDocumentSrlByAlias', $args);
-		if(!$output->data) return null;
-		else return $output->data->document_srl;
+		if(!$output->data) {
+			return null;
+		} else {
+			return $output->data->document_srl;
+		}
 	}
 
 	/**
@@ -1042,15 +1142,20 @@ 
 	 */
 	function getDocumentSrlByTitle($module_srl, $title)
 	{
-		if(!$module_srl || !$title) return null;
+		if(!$module_srl || !$title) {
+			return null;
+		}
 		$args = new stdClass;
 		$args->module_srl = $module_srl;
 		$args->title = $title;
 		$output = executeQuery('document.getDocumentSrlByTitle', $args);
-		if(!$output->data) return null;
-		else
+		if(!$output->data) {
+			return null;
+		} else
 		{
-			if(is_array($output->data)) return $output->data[0]->document_srl;
+			if(is_array($output->data)) {
+				return $output->data[0]->document_srl;
+			}
 			return $output->data->document_srl;
 		}
 	}
@@ -1062,13 +1167,18 @@ 
 	 */
 	function getAlias($document_srl)
 	{
-		if(!$document_srl) return null;
+		if(!$document_srl) {
+			return null;
+		}
 		$args = new stdClass;
 		$args->document_srl = $document_srl;
 		$output = executeQueryArray('document.getAliases', $args);
 
-		if(!$output->data) return null;
-		else return $output->data[0]->alias_title;
+		if(!$output->data) {
+			return null;
+		} else {
+			return $output->data[0]->alias_title;
+		}
 	}
 
 	/**
@@ -1125,17 +1235,23 @@ 
 			{
 				case 'title' :
 				case 'content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->{"s_".$search_target} = $search_keyword;
 					$use_division = true;
 					break;
 				case 'title_content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_title = $search_keyword;
 					$args->s_content = $search_keyword;
 					break;
 				case 'user_id' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_user_id = $search_keyword;
 					$args->sort_index = 'documents.'.$args->sort_index;
 					break;
@@ -1143,13 +1259,18 @@ 
 				case 'nick_name' :
 				case 'email_address' :
 				case 'homepage' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->{"s_".$search_target} = $search_keyword;
 					break;
 				case 'is_notice' :
 				case 'is_secret' :
-					if($search_keyword=='N') $args->statusList = array($this->getConfigStatus('public'));
-					elseif($search_keyword=='Y') $args->statusList = array($this->getConfigStatus('secret'));
+					if($search_keyword=='N') {
+						$args->statusList = array($this->getConfigStatus('public'));
+					} elseif($search_keyword=='Y') {
+						$args->statusList = array($this->getConfigStatus('secret'));
+					}
 					break;
 				case 'member_srl' :
 				case 'readed_count' :
@@ -1191,34 +1312,45 @@ 
 	{
 		$args = new stdClass;
 		$document_srl = Context::get('document_srl');
-		if(!$document_srl) return new Object(-1,'msg_invalid_request');
+		if(!$document_srl) {
+			return new Object(-1,'msg_invalid_request');
+		}
 
 		$point = Context::get('point');
-		if($point != -1) $point = 1;
+		if($point != -1) {
+			$point = 1;
+		}
 
 		$oDocumentModel = getModel('document');
 		$columnList = array('document_srl', 'module_srl');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList);
 		$module_srl = $oDocument->get('module_srl');
-		if(!$module_srl) return new Object(-1, 'msg_invalid_request');
+		if(!$module_srl) {
+			return new Object(-1, 'msg_invalid_request');
+		}
 
 		$oModuleModel = getModel('module');
 		$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
 		if($point == -1)
 		{
-			if($document_config->use_vote_down!='S') return new Object(-1, 'msg_invalid_request');
+			if($document_config->use_vote_down!='S') {
+				return new Object(-1, 'msg_invalid_request');
+			}
 			$args->below_point = 0;
-		}
-		else
+		} else
 		{
-			if($document_config->use_vote_up!='S') return new Object(-1, 'msg_invalid_request');
+			if($document_config->use_vote_up!='S') {
+				return new Object(-1, 'msg_invalid_request');
+			}
 			$args->more_point = 0;
 		}
 
 		$args->document_srl = $document_srl;
 
 		$output = executeQueryArray('document.getVotedMemberList',$args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$oMemberModel = getModel('member');
 		if($output->data)
@@ -1240,9 +1372,11 @@ 
 	function getStatusNameList()
 	{
 		global $lang;
-		if(!isset($lang->status_name_list))
-			return array_flip($this->getStatusList());
-		else return $lang->status_name_list;
+		if(!isset($lang->status_name_list)) {
+					return array_flip($this->getStatusList());
+		} else {
+			return $lang->status_name_list;
+		}
 	}
 
 	/**
@@ -1266,20 +1400,22 @@ 
 				if (!$extra_output->data || !$extra_output->toBool())
 				{
 					$sortIndex = 'list_order';
-				}
-				else
+				} else
 				{
 					$check_array = array();
 					foreach($extra_output->data as $val)
 					{
 						$check_array[] = $val->eid;
 					}
-					if(!in_array($sortIndex, $check_array)) $sortIndex = 'list_order';
-					else $isExtraVars = true;
+					if(!in_array($sortIndex, $check_array)) {
+						$sortIndex = 'list_order';
+					} else {
+						$isExtraVars = true;
+					}
 				}
+			} else {
+							$sortIndex = 'list_order';
 			}
-			else
-				$sortIndex = 'list_order';
 		}
 		$returnObj = new stdClass();
 		$returnObj->sort_index = $sortIndex;
@@ -1317,7 +1453,9 @@ 
 		
 		// Check the target and sequence alignment
 		$orderType = array('desc' => 1, 'asc' => 1);
-		if(!isset($orderType[$args->order_type])) $args->order_type = 'asc';
+		if(!isset($orderType[$args->order_type])) {
+			$args->order_type = 'asc';
+		}
 
 		// If that came across mid module_srl instead of a direct module_srl guhaejum
 		if($searchOpt->mid)
@@ -1328,21 +1466,29 @@ 
 		}
 
 		// Module_srl passed the array may be a check whether the array
-		if(is_array($searchOpt->module_srl)) $args->module_srl = implode(',', $searchOpt->module_srl);
-		else $args->module_srl = $searchOpt->module_srl;
+		if(is_array($searchOpt->module_srl)) {
+			$args->module_srl = implode(',', $searchOpt->module_srl);
+		} else {
+			$args->module_srl = $searchOpt->module_srl;
+		}
 
 		// Except for the test module_srl
-		if(is_array($searchOpt->exclude_module_srl)) $args->exclude_module_srl = implode(',', $searchOpt->exclude_module_srl);
-		else $args->exclude_module_srl = $searchOpt->exclude_module_srl;
+		if(is_array($searchOpt->exclude_module_srl)) {
+			$args->exclude_module_srl = implode(',', $searchOpt->exclude_module_srl);
+		} else {
+			$args->exclude_module_srl = $searchOpt->exclude_module_srl;
+		}
 
 		// only admin document list, temp document showing
-		if($searchOpt->statusList) $args->statusList = $searchOpt->statusList;
-		else
+		if($searchOpt->statusList) {
+			$args->statusList = $searchOpt->statusList;
+		} else
 		{
-			if($logged_info->is_admin == 'Y' && !$searchOpt->module_srl)
-				$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'), $this->getConfigStatus('temp'));
-			else
-				$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'));
+			if($logged_info->is_admin == 'Y' && !$searchOpt->module_srl) {
+							$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'), $this->getConfigStatus('temp'));
+			} else {
+							$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'));
+			}
 		}
 
 		// Category is selected, further sub-categories until all conditions
@@ -1370,18 +1516,24 @@ 
 			{
 				case 'title' :
 				case 'content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->{"s_".$search_target} = $search_keyword;
 					$use_division = true;
 					break;
 				case 'title_content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_title = $search_keyword;
 					$args->s_content = $search_keyword;
 					$use_division = true;
 					break;
 				case 'user_id' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_user_id = $search_keyword;
 					$args->sort_index = 'documents.'.$args->sort_index;
 					break;
@@ -1389,18 +1541,28 @@ 
 				case 'nick_name' :
 				case 'email_address' :
 				case 'homepage' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->{"s_".$search_target} = $search_keyword;
 					break;
 				case 'is_notice' :
-					if($search_keyword=='N') $args->{"s_".$search_target} = 'N';
-					elseif($search_keyword=='Y') $args->{"s_".$search_target} = 'Y';
-					else $args->{"s_".$search_target} = '';
+					if($search_keyword=='N') {
+						$args->{"s_".$search_target} = 'N';
+					} elseif($search_keyword=='Y') {
+						$args->{"s_".$search_target} = 'Y';
+					} else {
+						$args->{"s_".$search_target} = '';
+					}
 					break;
 				case 'is_secret' :
-					if($search_keyword=='N') $args->statusList = array($this->getConfigStatus('public'));
-					elseif($search_keyword=='Y') $args->statusList = array($this->getConfigStatus('secret'));
-					elseif($search_keyword=='temp') $args->statusList = array($this->getConfigStatus('temp'));
+					if($search_keyword=='N') {
+						$args->statusList = array($this->getConfigStatus('public'));
+					} elseif($search_keyword=='Y') {
+						$args->statusList = array($this->getConfigStatus('secret'));
+					} elseif($search_keyword=='temp') {
+						$args->statusList = array($this->getConfigStatus('temp'));
+					}
 					break;
 				case 'member_srl' :
 				case 'readed_count' :
@@ -1445,13 +1607,14 @@ 
 		if ($searchOpt->isExtraVars)
 		{
 			$query_id = 'document.getDocumentListExtraSort';
-		}
-		else
+		} else
 		{
 			/**
 			 * list_order asc sort of division that can be used only when
 			 */
-			if($args->sort_index != 'list_order' || $args->order_type != 'asc') $use_division = false;
+			if($args->sort_index != 'list_order' || $args->order_type != 'asc') {
+				$use_division = false;
+			}
 
 			/**
 			 * If it is true, use_division changed to use the document division
@@ -1466,8 +1629,7 @@ 
 				{
 					$listSqlID = 'document.getDocumentListUseIndex';
 					$divisionSqlID = 'document.getDocumentDivisionUseIndex';
-				}
-				else
+				} else
 				{
 					$listSqlID = 'document.getDocumentList';
 					$divisionSqlID = 'document.getDocumentDivision';
@@ -1524,7 +1686,9 @@ 
 					$last_division_args->exclude_module_srl = $args->exclude_module_srl;
 					$last_division_args->list_order = $last_division;
 					$output = executeQuery('document.getDocumentDivisionCount', $last_division_args);
-					if($output->data->count<1) $last_division = null;
+					if($output->data->count<1) {
+						$last_division = null;
+					}
 				}
 
 				$args->division = $division;
@@ -1565,8 +1729,12 @@ 
 		$output = executeQuery('document.getDocumentListByMemberSrl', $args, $columnList);
 		$document_list = $output->data;
 		
-		if(!$document_list) return array();
-		if(!is_array($document_list)) $document_list = array($document_list);
+		if(!$document_list) {
+			return array();
+		}
+		if(!is_array($document_list)) {
+			$document_list = array($document_list);
+		}
 
 		return $document_list;	
 	}