xpressengine / xe-core

classes/xml/xmlquery/tags/navigation/LimitTag.class.php

Spacing +7 added lines, -7 removed lines

@@ -48,11 +48,11 @@ 
 	 */

 	function LimitTag($index)

 	{

-		if($index->page && $index->page->attrs && $index->page_count && $index->page_count->attrs)

+		if ($index->page && $index->page->attrs && $index->page_count && $index->page_count->attrs)

 		{

-			if(!isset($index->page->attrs->default))

+			if (!isset($index->page->attrs->default))

 				$index->page->attrs->default = 1;

-			if(!isset($index->page_count->attrs->default))

+			if (!isset($index->page_count->attrs->default))

 				$index->page_count->attrs->default = 10;

 			$this->page = new QueryArgument($index->page);

 			$this->page_count = new QueryArgument($index->page_count);

@@ -60,12 +60,12 @@ 
 			$this->arguments[] = $this->page_count;

 		}

 

-		if(!isset($index->list_count->attrs->default))

+		if (!isset($index->list_count->attrs->default))

 			$index->list_count->attrs->default = 0;

 		$this->list_count = new QueryArgument($index->list_count);

 		$this->arguments[] = $this->list_count;

 		

-		if(isset($index->offset) && isset($index->offset->attrs))

+		if (isset($index->offset) && isset($index->offset->attrs))

 		{

 			$this->offset = new QueryArgument($index->offset);

 			$this->arguments[] = $this->offset;

@@ -74,11 +74,11 @@ 
 

 	function toString()

 	{

-		if($this->page)

+		if ($this->page)

 		{

 			return sprintf('new Limit(${\'%s_argument\'}, ${\'%s_argument\'}, ${\'%s_argument\'})', $this->list_count->getArgumentName(), $this->page->getArgumentName(), $this->page_count->getArgumentName());

 		}

-		elseif($this->offset)

+		elseif ($this->offset)

 		{

 			return sprintf('new Limit(${\'%s_argument\'}, NULL, NULL, ${\'%s_argument\'})', $this->list_count->getArgumentName(), $this->offset->getArgumentName());

 		}

Braces +11 added lines, -10 removed lines

@@ -50,18 +50,21 @@ 
 	{

 		if($index->page && $index->page->attrs && $index->page_count && $index->page_count->attrs)

 		{

-			if(!isset($index->page->attrs->default))

-				$index->page->attrs->default = 1;

-			if(!isset($index->page_count->attrs->default))

-				$index->page_count->attrs->default = 10;

+			if(!isset($index->page->attrs->default)) {
+							$index->page->attrs->default = 1;
+			}
+			if(!isset($index->page_count->attrs->default)) {
+							$index->page_count->attrs->default = 10;
+			}
 			$this->page = new QueryArgument($index->page);

 			$this->page_count = new QueryArgument($index->page_count);

 			$this->arguments[] = $this->page;

 			$this->arguments[] = $this->page_count;

 		}

 

-		if(!isset($index->list_count->attrs->default))

-			$index->list_count->attrs->default = 0;

+		if(!isset($index->list_count->attrs->default)) {
+					$index->list_count->attrs->default = 0;
+		}
 		$this->list_count = new QueryArgument($index->list_count);

 		$this->arguments[] = $this->list_count;

 		

@@ -77,12 +80,10 @@ 
 		if($this->page)

 		{

 			return sprintf('new Limit(${\'%s_argument\'}, ${\'%s_argument\'}, ${\'%s_argument\'})', $this->list_count->getArgumentName(), $this->page->getArgumentName(), $this->page_count->getArgumentName());

-		}

-		elseif($this->offset)

+		} elseif($this->offset)

 		{

 			return sprintf('new Limit(${\'%s_argument\'}, NULL, NULL, ${\'%s_argument\'})', $this->list_count->getArgumentName(), $this->offset->getArgumentName());

-		}

-		else

+		} else

 		{

 			return sprintf('new Limit(${\'%s_argument\'})', $this->list_count->getArgumentName());

 		}

classes/db/queryparts/limit/Limit.class.php

Spacing +5 added lines, -5 removed lines

@@ -44,7 +44,7 @@ 
 	function Limit($list_count, $page = NULL, $page_count = NULL, $offset = NULL)

 	{

 		$this->list_count = $list_count;

-		if($page)

+		if ($page)

 		{

 			$list_count_value = $list_count->getValue();

 			$page_value = $page->getValue();

@@ -52,7 +52,7 @@ 
 			$this->page_count = $page_count;

 			$this->page = $page;

 		}
-		elseif($offset)
+		elseif ($offset)
 		{
 			$this->start = $offset->getValue();
 		}

@@ -64,7 +64,7 @@ 
 	 */

 	function isPageHandler()

 	{

-		if($this->page)

+		if ($this->page)

 		{

 			return true;

 		}

@@ -86,9 +86,9 @@ 
 

 	function toString()

 	{

-		if($this->page || $this->start)

+		if ($this->page || $this->start)

 		{

-			return $this->start . ' , ' . $this->list_count->getValue();

+			return $this->start.' , '.$this->list_count->getValue();

 		}

 		else

 		{

Braces +3 added lines, -6 removed lines

@@ -51,8 +51,7 @@ 
 			$this->start = ($page_value - 1) * $list_count_value;

 			$this->page_count = $page_count;

 			$this->page = $page;

-		}
-		elseif($offset)
+		} elseif($offset)
 		{
 			$this->start = $offset->getValue();
 		}

@@ -67,8 +66,7 @@ 
 		if($this->page)

 		{

 			return true;

-		}

-		else

+		} else

 		{

 			return false;

 		}

@@ -89,8 +87,7 @@ 
 		if($this->page || $this->start)

 		{

 			return $this->start . ' , ' . $this->list_count->getValue();

-		}

-		else

+		} else

 		{

 			return $this->list_count->getValue();

 		}

modules/document/document.item.php

Spacing +181 added lines, -181 removed lines

@@ -79,7 +79,7 @@ 
 	 */
 	function _loadFromDB($load_extra_vars = true)
 	{
-		if(!$this->document_srl) return;
+		if (!$this->document_srl) return;
 
 		$document_item = false;
 		$cache_put = false;
@@ -88,11 +88,11 @@ 
 
 		// cache controll
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$cache_key = 'document_item:' . getNumberingPath($this->document_srl) . $this->document_srl;
+			$cache_key = 'document_item:'.getNumberingPath($this->document_srl).$this->document_srl;
 			$document_item = $oCacheHandler->get($cache_key);
-			if($document_item !== false)
+			if ($document_item !== false)
 			{
 				$columnList = array('readed_count', 'voted_count', 'blamed_count', 'comment_count', 'trackback_count');
 			}
@@ -102,12 +102,12 @@ 
 		$args->document_srl = $this->document_srl;
 		$output = executeQuery('document.getDocument', $args, $columnList);
 
-		if($document_item === false)
+		if ($document_item === false)
 		{
 			$document_item = $output->data;
 
 				//insert in cache
-			if($document_item && $oCacheHandler->isSupport())
+			if ($document_item && $oCacheHandler->isSupport())
 			{
 				$oCacheHandler->put($cache_key, $document_item);
 			}
@@ -124,9 +124,9 @@ 
 		$this->setAttribute($document_item, $load_extra_vars);
 	}
 
-	function setAttribute($attribute, $load_extra_vars=true)
+	function setAttribute($attribute, $load_extra_vars = true)
 	{
-		if(!$attribute->document_srl)
+		if (!$attribute->document_srl)
 		{
 			$this->document_srl = null;
 			return;
@@ -136,7 +136,7 @@ 
 		$this->adds($attribute);
 
 		// Tags
-		if($this->get('tags'))
+		if ($this->get('tags'))
 		{
 			$tag_list = explode(',', $this->get('tags'));
 			$tag_list = array_map('trim', $tag_list);
@@ -144,7 +144,7 @@ 
 		}
 
 		$oDocumentModel = getModel('document');
-		if($load_extra_vars)
+		if ($load_extra_vars)
 		{
 			$GLOBALS['XE_DOCUMENT_LIST'][$attribute->document_srl] = $this;
 			$oDocumentModel->setToAllDocumentExtraVars();
@@ -159,23 +159,23 @@ 
 
 	function isGranted()
 	{
-		if($_SESSION['own_document'][$this->document_srl]) return $this->grant_cache = true;
+		if ($_SESSION['own_document'][$this->document_srl]) return $this->grant_cache = true;
 
-		if($this->grant_cache !== null)
+		if ($this->grant_cache !== null)
 		{
 			return $this->grant_cache;
 		}
 
-		if(!Context::get('is_logged')) return $this->grant_cache = false;
+		if (!Context::get('is_logged')) return $this->grant_cache = false;
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin == 'Y') return $this->grant_cache = true;
+		if ($logged_info->is_admin == 'Y') return $this->grant_cache = true;
 
 		$oModuleModel = getModel('module');
 		$grant = $oModuleModel->getGrant($oModuleModel->getModuleInfoByModuleSrl($this->get('module_srl')), $logged_info);
-		if($grant->manager) return $this->grant_cache = true;
+		if ($grant->manager) return $this->grant_cache = true;
 
-		if($this->get('member_srl') && ($this->get('member_srl') == $logged_info->member_srl || $this->get('member_srl')*-1 == $logged_info->member_srl)) return $this->grant_cache = true;
+		if ($this->get('member_srl') && ($this->get('member_srl') == $logged_info->member_srl || $this->get('member_srl') * -1 == $logged_info->member_srl)) return $this->grant_cache = true;
 
 		return $this->grant_cache = false;
 	}
@@ -188,13 +188,13 @@ 
 
 	function isAccessible()
 	{
-		return $_SESSION['accessible'][$this->document_srl]==true?true:false;
+		return $_SESSION['accessible'][$this->document_srl] == true ? true : false;
 	}
 
 	function allowComment()
 	{
 		// init write, document is not exists. so allow comment status is true
-		if(!$this->isExists()) return true;
+		if (!$this->isExists()) return true;
 
 		return $this->get('comment_status') == 'ALLOW' ? true : false;
 	}
@@ -202,11 +202,11 @@ 
 	function allowTrackback()
 	{
 		static $allow_trackback_status = null;
-		if(is_null($allow_trackback_status))
+		if (is_null($allow_trackback_status))
 		{
 			
 			// Check the tarckback module exist
-			if(!getClass('trackback'))
+			if (!getClass('trackback'))
 			{
 				$allow_trackback_status = false;
 			}
@@ -216,20 +216,20 @@ 
 				$oModuleModel = getModel('module');
 				$trackback_config = $oModuleModel->getModuleConfig('trackback');
 				
-				if(!$trackback_config)
+				if (!$trackback_config)
 				{
 					$trackback_config = new stdClass();
 				}
 				
-				if(!isset($trackback_config->enable_trackback)) $trackback_config->enable_trackback = 'Y';
-				if($trackback_config->enable_trackback != 'Y') $allow_trackback_status = false;
+				if (!isset($trackback_config->enable_trackback)) $trackback_config->enable_trackback = 'Y';
+				if ($trackback_config->enable_trackback != 'Y') $allow_trackback_status = false;
 				else
 				{
 					$module_srl = $this->get('module_srl');
 					// Check settings of each module
 					$module_config = $oModuleModel->getModulePartConfig('trackback', $module_srl);
-					if($module_config->enable_trackback == 'N') $allow_trackback_status = false;
-					else if($this->get('allow_trackback')=='Y' || !$this->isExists()) $allow_trackback_status = true;
+					if ($module_config->enable_trackback == 'N') $allow_trackback_status = false;
+					else if ($this->get('allow_trackback') == 'Y' || !$this->isExists()) $allow_trackback_status = true;
 				}
 			}
 		}
@@ -238,14 +238,14 @@ 
 
 	function isLocked()
 	{
-		if(!$this->isExists()) return false;
+		if (!$this->isExists()) return false;
 
 		return $this->get('comment_status') == 'ALLOW' ? false : true;
 	}
 
 	function isEditable()
 	{
-		if($this->isGranted() || !$this->get('member_srl')) return true;
+		if ($this->isGranted() || !$this->get('member_srl')) return true;
 		return false;
 	}
 
@@ -262,13 +262,13 @@ 
 
 	function useNotify()
 	{
-		return $this->get('notify_message')=='Y' ? true : false;
+		return $this->get('notify_message') == 'Y' ? true : false;
 	}
 
 	function doCart()
 	{
-		if(!$this->document_srl) return false;
-		if($this->isCarted()) $this->removeCart();
+		if (!$this->document_srl) return false;
+		if ($this->isCarted()) $this->removeCart();
 		else $this->addCart();
 	}
 
@@ -295,18 +295,18 @@ 
 	 */
 	function notify($type, $content)
 	{
-		if(!$this->document_srl) return;
+		if (!$this->document_srl) return;
 		// return if it is not useNotify
-		if(!$this->useNotify()) return;
+		if (!$this->useNotify()) return;
 		// Pass if an author is not a logged-in user
-		if(!$this->get('member_srl')) return;
+		if (!$this->get('member_srl')) return;
 		// Return if the currently logged-in user is an author
 		$logged_info = Context::get('logged_info');
-		if($logged_info->member_srl == $this->get('member_srl')) return;
+		if ($logged_info->member_srl == $this->get('member_srl')) return;
 		// List variables
-		if($type) $title = "[".$type."] ";
+		if ($type) $title = "[".$type."] ";
 		$title .= cut_str(strip_tags($content), 10, '...');
-		$content = sprintf('%s<br /><br />from : <a href="%s" target="_blank">%s</a>',$content, getFullUrl('','document_srl',$this->document_srl), getFullUrl('','document_srl',$this->document_srl));
+		$content = sprintf('%s<br /><br />from : <a href="%s" target="_blank">%s</a>', $content, getFullUrl('', 'document_srl', $this->document_srl), getFullUrl('', 'document_srl', $this->document_srl));
 		$receiver_srl = $this->get('member_srl');
 		$sender_member_srl = $logged_info->member_srl;
 		// Send a message
@@ -321,26 +321,26 @@ 
 
 	function getIpAddress()
 	{
-		if($this->isGranted())
+		if ($this->isGranted())
 		{
 			return $this->get('ipaddress');
 		}
 
-		return '*' . strstr($this->get('ipaddress'), '.');
+		return '*'.strstr($this->get('ipaddress'), '.');
 	}
 
 	function isExistsHomepage()
 	{
-		if(trim($this->get('homepage'))) return true;
+		if (trim($this->get('homepage'))) return true;
 		return false;
 	}
 
 	function getHomepageUrl()
 	{
 		$url = trim($this->get('homepage'));
-		if(!$url) return;
+		if (!$url) return;
 
-		if(strncasecmp('http://', $url, 7) !== 0 && strncasecmp('https://', $url, 8) !== 0)  $url = 'http://' . $url;
+		if (strncasecmp('http://', $url, 7) !== 0 && strncasecmp('https://', $url, 8) !== 0)  $url = 'http://'.$url;
 
 		return $url;
 	}
@@ -370,52 +370,52 @@ 
 		return htmlspecialchars($this->get('last_updater'), ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 	}
 
-	function getTitleText($cut_size = 0, $tail='...')
+	function getTitleText($cut_size = 0, $tail = '...')
 	{
-		if(!$this->document_srl) return;
+		if (!$this->document_srl) return;
 
-		if($cut_size) $title = cut_str($this->get('title'), $cut_size, $tail);
+		if ($cut_size) $title = cut_str($this->get('title'), $cut_size, $tail);
 		else $title = $this->get('title');
 
 		return $title;
 	}
 
-	function getTitle($cut_size = 0, $tail='...')
+	function getTitle($cut_size = 0, $tail = '...')
 	{
-		if(!$this->document_srl) return;
+		if (!$this->document_srl) return;
 
 		$title = $this->getTitleText($cut_size, $tail);
 
 		$attrs = array();
 		$this->add('title_color', trim($this->get('title_color')));
-		if($this->get('title_bold')=='Y') $attrs[] = "font-weight:bold;";
-		if($this->get('title_color') && $this->get('title_color') != 'N') $attrs[] = "color:#".$this->get('title_color');
+		if ($this->get('title_bold') == 'Y') $attrs[] = "font-weight:bold;";
+		if ($this->get('title_color') && $this->get('title_color') != 'N') $attrs[] = "color:#".$this->get('title_color');
 
-		if(count($attrs)) return sprintf("<span style=\"%s\">%s</span>", implode(';',$attrs), htmlspecialchars($title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
+		if (count($attrs)) return sprintf("<span style=\"%s\">%s</span>", implode(';', $attrs), htmlspecialchars($title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 		else return htmlspecialchars($title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 	}
 
 	function getContentText($strlen = 0)
 	{
-		if(!$this->document_srl) return;
+		if (!$this->document_srl) return;
 
-		if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return Context::getLang('msg_is_secret');
+		if ($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return Context::getLang('msg_is_secret');
 
 		$result = $this->_checkAccessibleFromStatus();
-		if($result) $_SESSION['accessible'][$this->document_srl] = true;
+		if ($result) $_SESSION['accessible'][$this->document_srl] = true;
 
 		$content = $this->get('content');
 		$content = preg_replace_callback('/<(object|param|embed)[^>]*/is', array($this, '_checkAllowScriptAccess'), $content);
 		$content = preg_replace_callback('/<object[^>]*>/is', array($this, '_addAllowScriptAccess'), $content);
 
-		if($strlen) return cut_str(strip_tags($content),$strlen,'...');
+		if ($strlen) return cut_str(strip_tags($content), $strlen, '...');
 
 		return htmlspecialchars($content);
 	}
 
 	function _addAllowScriptAccess($m)
 	{
-		if($this->allowscriptaccessList[$this->allowscriptaccessKey] == 1)
+		if ($this->allowscriptaccessList[$this->allowscriptaccessKey] == 1)
 		{
 			$m[0] = $m[0].'<param name="allowscriptaccess" value="never"></param>';
 		}
@@ -425,26 +425,26 @@ 
 
 	function _checkAllowScriptAccess($m)
 	{
-		if($m[1] == 'object')
+		if ($m[1] == 'object')
 		{
 			$this->allowscriptaccessList[] = 1;
 		}
 
-		if($m[1] == 'param')
+		if ($m[1] == 'param')
 		{
-			if(stripos($m[0], 'allowscriptaccess'))
+			if (stripos($m[0], 'allowscriptaccess'))
 			{
 				$m[0] = '<param name="allowscriptaccess" value="never"';
-				if(substr($m[0], -1) == '/')
+				if (substr($m[0], -1) == '/')
 				{
 					$m[0] .= '/';
 				}
-				$this->allowscriptaccessList[count($this->allowscriptaccessList)-1]--;
+				$this->allowscriptaccessList[count($this->allowscriptaccessList) - 1]--;
 			}
 		}
-		else if($m[1] == 'embed')
+		else if ($m[1] == 'embed')
 		{
-			if(stripos($m[0], 'allowscriptaccess'))
+			if (stripos($m[0], 'allowscriptaccess'))
 			{
 				$m[0] = preg_replace('/always|samedomain/i', 'never', $m[0]);
 			}
@@ -458,24 +458,24 @@ 
 
 	function getContent($add_popup_menu = true, $add_content_info = true, $resource_realpath = false, $add_xe_content_class = true, $stripEmbedTagException = false)
 	{
-		if(!$this->document_srl) return;
+		if (!$this->document_srl) return;
 
-		if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return Context::getLang('msg_is_secret');
+		if ($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return Context::getLang('msg_is_secret');
 
 		$result = $this->_checkAccessibleFromStatus();
-		if($result) $_SESSION['accessible'][$this->document_srl] = true;
+		if ($result) $_SESSION['accessible'][$this->document_srl] = true;
 
 		$content = $this->get('content');
-		if(!$stripEmbedTagException) stripEmbedTagForAdmin($content, $this->get('member_srl'));
+		if (!$stripEmbedTagException) stripEmbedTagForAdmin($content, $this->get('member_srl'));
 
 		// Define a link if using a rewrite module
 		$oContext = &Context::getInstance();
-		if($oContext->allow_rewrite)
+		if ($oContext->allow_rewrite)
 		{
-			$content = preg_replace('/<a([ \t]+)href=("|\')\.\/\?/i',"<a href=\\2". Context::getRequestUri() ."?", $content);
+			$content = preg_replace('/<a([ \t]+)href=("|\')\.\/\?/i', "<a href=\\2".Context::getRequestUri()."?", $content);
 		}
 		// To display a pop-up menu
-		if($add_popup_menu)
+		if ($add_popup_menu)
 		{
 			$content = sprintf(
 				'%s<div class="document_popup_menu"><a href="#popup_menu_area" class="document_%d" onclick="return false">%s</a></div>',
@@ -484,10 +484,10 @@ 
 			);
 		}
 		// If additional content information is set
-		if($add_content_info)
+		if ($add_content_info)
 		{
 			$memberSrl = $this->get('member_srl');
-			if($memberSrl < 0)
+			if ($memberSrl < 0)
 			{
 				$memberSrl = 0;
 			}
@@ -503,12 +503,12 @@ 
 		}
 		else
 		{
-			if($add_xe_content_class) $content = sprintf('<div class="xe_content">%s</div>', $content);
+			if ($add_xe_content_class) $content = sprintf('<div class="xe_content">%s</div>', $content);
 		}
 		// Change the image path to a valid absolute path if resource_realpath is true
-		if($resource_realpath)
+		if ($resource_realpath)
 		{
-			$content = preg_replace_callback('/<img([^>]+)>/i',array($this,'replaceResourceRealPath'), $content);
+			$content = preg_replace_callback('/<img([^>]+)>/i', array($this, 'replaceResourceRealPath'), $content);
 		}
 
 		return $content;
@@ -557,7 +557,7 @@ 
 		$content = trim(cut_str($content, $str_size, $tail));
 
 		// Replace back < , <, "
-		$content = str_replace(array('<', '>', '"'),array('&lt;', '&gt;', '&quot;'), $content);
+		$content = str_replace(array('<', '>', '"'), array('&lt;', '&gt;', '&quot;'), $content);
 
 		return $content;
 	}
@@ -570,13 +570,13 @@ 
 	function getRegdateTime()
 	{
 		$regdate = $this->get('regdate');
-		$year = substr($regdate,0,4);
-		$month = substr($regdate,4,2);
-		$day = substr($regdate,6,2);
-		$hour = substr($regdate,8,2);
-		$min = substr($regdate,10,2);
-		$sec = substr($regdate,12,2);
-		return mktime($hour,$min,$sec,$month,$day,$year);
+		$year = substr($regdate, 0, 4);
+		$month = substr($regdate, 4, 2);
+		$day = substr($regdate, 6, 2);
+		$hour = substr($regdate, 8, 2);
+		$min = substr($regdate, 10, 2);
+		$sec = substr($regdate, 12, 2);
+		return mktime($hour, $min, $sec, $month, $day, $year);
 	}
 
 	function getRegdateGM()
@@ -586,7 +586,7 @@ 
 
 	function getRegdateDT()
 	{
-		return $this->getRegdate('Y-m-d').'T'.$this->getRegdate('H:i:s').substr($GLOBALS['_time_zone'],0,3).':'.substr($GLOBALS['_time_zone'],3,2);
+		return $this->getRegdate('Y-m-d').'T'.$this->getRegdate('H:i:s').substr($GLOBALS['_time_zone'], 0, 3).':'.substr($GLOBALS['_time_zone'], 3, 2);
 	}
 
 	function getUpdate($format = 'Y.m.d H:i:s')
@@ -596,13 +596,13 @@ 
 
 	function getUpdateTime()
 	{
-		$year = substr($this->get('last_update'),0,4);
-		$month = substr($this->get('last_update'),4,2);
-		$day = substr($this->get('last_update'),6,2);
-		$hour = substr($this->get('last_update'),8,2);
-		$min = substr($this->get('last_update'),10,2);
-		$sec = substr($this->get('last_update'),12,2);
-		return mktime($hour,$min,$sec,$month,$day,$year);
+		$year = substr($this->get('last_update'), 0, 4);
+		$month = substr($this->get('last_update'), 4, 2);
+		$day = substr($this->get('last_update'), 6, 2);
+		$hour = substr($this->get('last_update'), 8, 2);
+		$min = substr($this->get('last_update'), 10, 2);
+		$sec = substr($this->get('last_update'), 12, 2);
+		return mktime($hour, $min, $sec, $month, $day, $year);
 	}
 
 	function getUpdateGM()
@@ -612,21 +612,21 @@ 
 
 	function getUpdateDT()
 	{
-		return $this->getUpdate('Y-m-d').'T'.$this->getUpdate('H:i:s').substr($GLOBALS['_time_zone'],0,3).':'.substr($GLOBALS['_time_zone'],3,2);
+		return $this->getUpdate('Y-m-d').'T'.$this->getUpdate('H:i:s').substr($GLOBALS['_time_zone'], 0, 3).':'.substr($GLOBALS['_time_zone'], 3, 2);
 	}
 
 	function getPermanentUrl()
 	{
-		return getFullUrl('','document_srl',$this->get('document_srl'));
+		return getFullUrl('', 'document_srl', $this->get('document_srl'));
 	}
 
 	function getTrackbackUrl()
 	{
-		if(!$this->document_srl) return;
+		if (!$this->document_srl) return;
 
 		// Generate a key to prevent spams
 		$oTrackbackModel = getModel('trackback');
-		if($oTrackbackModel) return $oTrackbackModel->getTrackbackUrl($this->document_srl, $this->getDocumentMid());
+		if ($oTrackbackModel) return $oTrackbackModel->getTrackbackUrl($this->document_srl, $this->getDocumentMid());
 	}
 
 	/**
@@ -636,24 +636,24 @@ 
 	function updateReadedCount()
 	{
 		$oDocumentController = getController('document');
-		if($oDocumentController->updateReadedCount($this))
+		if ($oDocumentController->updateReadedCount($this))
 		{
 			$readed_count = $this->get('readed_count');
-			$this->add('readed_count', $readed_count+1);
+			$this->add('readed_count', $readed_count + 1);
 		}
 	}
 
 	function isExtraVarsExists()
 	{
-		if(!$this->get('module_srl')) return false;
+		if (!$this->get('module_srl')) return false;
 		$oDocumentModel = getModel('document');
 		$extra_keys = $oDocumentModel->getExtraKeys($this->get('module_srl'));
-		return count($extra_keys)?true:false;
+		return count($extra_keys) ? true : false;
 	}
 
 	function getExtraVars()
 	{
-		if(!$this->get('module_srl') || !$this->document_srl) return null;
+		if (!$this->get('module_srl') || !$this->document_srl) return null;
 
 		$oDocumentModel = getModel('document');
 		return $oDocumentModel->getExtraVars($this->get('module_srl'), $this->document_srl);
@@ -662,7 +662,7 @@ 
 	function getExtraValue($idx)
 	{
 		$extra_vars = $this->getExtraVars();
-		if(is_array($extra_vars) && array_key_exists($idx,$extra_vars))
+		if (is_array($extra_vars) && array_key_exists($idx, $extra_vars))
 		{
 			return $extra_vars[$idx]->getValue();
 		}
@@ -675,7 +675,7 @@ 
 	function getExtraValueHTML($idx)
 	{
 		$extra_vars = $this->getExtraVars();
-		if(is_array($extra_vars) && array_key_exists($idx,$extra_vars))
+		if (is_array($extra_vars) && array_key_exists($idx, $extra_vars))
 		{
 			return $extra_vars[$idx]->getValueHTML();
 		}
@@ -689,16 +689,16 @@ 
 	{
 		$extra_vars = $this->getExtraVars();
 
-		if($extra_vars)
+		if ($extra_vars)
 		{
 			// Handle extra variable(eid)
-			foreach($extra_vars as $idx => $key)
+			foreach ($extra_vars as $idx => $key)
 			{
 				$extra_eid[$key->eid] = $key;
 			}
 		}
 		
-		if(is_array($extra_eid) && array_key_exists($eid,$extra_eid))
+		if (is_array($extra_eid) && array_key_exists($eid, $extra_eid))
 		{
 			return $extra_eid[$eid]->getValue();
 		}
@@ -712,12 +712,12 @@ 
 	{
 		$extra_vars = $this->getExtraVars();
 		// Handle extra variable(eid)
-		foreach($extra_vars as $idx => $key)
+		foreach ($extra_vars as $idx => $key)
 		{
 			$extra_eid[$key->eid] = $key;
 		}
 		
-		if(is_array($extra_eid) && array_key_exists($eid,$extra_eid))
+		if (is_array($extra_eid) && array_key_exists($eid, $extra_eid))
 		{
 			return $extra_eid[$eid]->getValueHTML();
 		}
@@ -741,13 +741,13 @@ 
 
 	function getComments()
 	{
-		if(!$this->getCommentCount()) return;
-		if(!$this->isGranted() && $this->isSecret()) return;
+		if (!$this->getCommentCount()) return;
+		if (!$this->isGranted() && $this->isSecret()) return;
 		// cpage is a number of comment pages
 		$cpageStr = sprintf('%d_cpage', $this->document_srl);
 		$cpage = Context::get($cpageStr);
 
-		if(!$cpage)
+		if (!$cpage)
 		{
 			$cpage = Context::get('cpage');
 		}
@@ -755,19 +755,19 @@ 
 		// Get a list of comments
 		$oCommentModel = getModel('comment');
 		$output = $oCommentModel->getCommentList($this->document_srl, $cpage, $is_admin);
-		if(!$output->toBool() || !count($output->data)) return;
+		if (!$output->toBool() || !count($output->data)) return;
 		// Create commentItem object from a comment list
 		// If admin priviledge is granted on parent posts, you can read its child posts.
 		$accessible = array();
 		$comment_list = array();
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			$oCommentItem = new commentItem();
 			$oCommentItem->setAttribute($val);
 			// If permission is granted to the post, you can access it temporarily
-			if($oCommentItem->isGranted()) $accessible[$val->comment_srl] = true;
+			if ($oCommentItem->isGranted()) $accessible[$val->comment_srl] = true;
 			// If the comment is set to private and it belongs child post, it is allowable to read the comment for who has a admin privilege on its parent post
-			if($val->parent_srl>0 && $val->is_secret == 'Y' && !$oCommentItem->isAccessible() && $accessible[$val->parent_srl]===true)
+			if ($val->parent_srl > 0 && $val->is_secret == 'Y' && !$oCommentItem->isAccessible() && $accessible[$val->parent_srl] === true)
 			{
 				$oCommentItem->setAccessible();
 			}
@@ -776,7 +776,7 @@ 
 		// Variable setting to be displayed on the skin
 		Context::set($cpageStr, $output->page_navigation->cur_page);
 		Context::set('cpage', $output->page_navigation->cur_page);
-		if($output->total_page>1) $this->comment_page_navigation = $output->page_navigation;
+		if ($output->total_page > 1) $this->comment_page_navigation = $output->page_navigation;
 
 		return $comment_list;
 	}
@@ -788,9 +788,9 @@ 
 
 	function getTrackbacks()
 	{
-		if(!$this->document_srl) return;
+		if (!$this->document_srl) return;
 
-		if(!$this->allowTrackback() || !$this->get('trackback_count')) return;
+		if (!$this->allowTrackback() || !$this->get('trackback_count')) return;
 
 		$oTrackbackModel = getModel('trackback');
 		return $oTrackbackModel->getTrackbackList($this->document_srl, $is_admin);
@@ -798,47 +798,47 @@ 
 
 	function thumbnailExists($width = 80, $height = 0, $type = '')
 	{
-		if(!$this->document_srl) return false;
-		if(!$this->getThumbnail($width, $height, $type)) return false;
+		if (!$this->document_srl) return false;
+		if (!$this->getThumbnail($width, $height, $type)) return false;
 		return true;
 	}
 
 	function getThumbnail($width = 80, $height = 0, $thumbnail_type = '')
 	{
 		// Return false if the document doesn't exist
-		if(!$this->document_srl) return;
+		if (!$this->document_srl) return;
 
-		if($this->isSecret() && !$this->isGranted())
+		if ($this->isSecret() && !$this->isGranted())
 		{
 			return;
 		}
 
 		// If not specify its height, create a square
-		if(!$height) $height = $width;
+		if (!$height) $height = $width;
 
 		// Return false if neither attachement nor image files in the document
 		$content = $this->get('content');
-		if(!$this->get('uploaded_count'))
+		if (!$this->get('uploaded_count'))
 		{
-			if(!$content)
+			if (!$content)
 			{
 				$args = new stdClass();
 				$args->document_srl = $this->document_srl;
 				$output = executeQuery('document.getDocument', $args, array('content'));
-				if($output->toBool() && $output->data)
+				if ($output->toBool() && $output->data)
 				{
 					$content = $output->data->content;
 					$this->add('content', $content);
 				}
 			}
 
-			if(!preg_match("!<img!is", $content)) return;
+			if (!preg_match("!<img!is", $content)) return;
 		}
 		// Get thumbnai_type information from document module's configuration
-		if(!in_array($thumbnail_type, array('crop','ratio')))
+		if (!in_array($thumbnail_type, array('crop', 'ratio')))
 		{
 			$config = $GLOBALS['__document_config__'];
-			if(!$config)
+			if (!$config)
 			{
 				$oDocumentModel = getModel('document');
 				$config = $oDocumentModel->getDocumentConfig();
@@ -848,15 +848,15 @@ 
 		}
 
 		// Define thumbnail information
-		$thumbnail_path = sprintf('files/thumbnails/%s',getNumberingPath($this->document_srl, 3));
+		$thumbnail_path = sprintf('files/thumbnails/%s', getNumberingPath($this->document_srl, 3));
 		$thumbnail_file = sprintf('%s%dx%d.%s.jpg', $thumbnail_path, $width, $height, $thumbnail_type);
 		$thumbnail_lockfile = sprintf('%s%dx%d.%s.lock', $thumbnail_path, $width, $height, $thumbnail_type);
 		$thumbnail_url  = Context::getRequestUri().$thumbnail_file;
 
 		// Return false if thumbnail file exists and its size is 0. Otherwise, return its path
-		if(file_exists($thumbnail_file) || file_exists($thumbnail_lockfile))
+		if (file_exists($thumbnail_file) || file_exists($thumbnail_lockfile))
 		{
-			if(filesize($thumbnail_file) < 1)
+			if (filesize($thumbnail_file) < 1)
 			{
 				return FALSE;
 			}
@@ -874,64 +874,64 @@ 
 		$is_tmp_file = false;
 
 		// Find an iamge file among attached files if exists
-		if($this->hasUploadedFiles())
+		if ($this->hasUploadedFiles())
 		{
 			$file_list = $this->getUploadedFiles();
 
 			$first_image = null;
-			foreach($file_list as $file)
+			foreach ($file_list as $file)
 			{
-				if($file->direct_download !== 'Y') continue;
+				if ($file->direct_download !== 'Y') continue;
 
-				if($file->cover_image === 'Y' && file_exists($file->uploaded_filename))
+				if ($file->cover_image === 'Y' && file_exists($file->uploaded_filename))
 				{
 					$source_file = $file->uploaded_filename;
 					break;
 				}
 
-				if($first_image) continue;
+				if ($first_image) continue;
 
-				if(preg_match("/\.(jpe?g|png|gif|bmp)$/i", $file->source_filename))
+				if (preg_match("/\.(jpe?g|png|gif|bmp)$/i", $file->source_filename))
 				{
-					if(file_exists($file->uploaded_filename))
+					if (file_exists($file->uploaded_filename))
 					{
 						$first_image = $file->uploaded_filename;
 					}
 				}
 			}
 
-			if(!$source_file && $first_image)
+			if (!$source_file && $first_image)
 			{
 				$source_file = $first_image;
 			}
 		}
 		// If not exists, file an image file from the content
 		$is_tmp_file = false;
-		if(!$source_file)
+		if (!$source_file)
 		{
 			$random = new Password();
 
 			preg_match_all("!<img[^>]*src=(?:\"|\')([^\"\']*?)(?:\"|\')!is", $content, $matches, PREG_SET_ORDER);
 
-			foreach($matches as $target_image)
+			foreach ($matches as $target_image)
 			{
 				$target_src = trim($target_image[1]);
-				if(preg_match('/\/(common|modules|widgets|addons|layouts|m\.layouts)\//i', $target_src)) continue;
+				if (preg_match('/\/(common|modules|widgets|addons|layouts|m\.layouts)\//i', $target_src)) continue;
 
-				if(!preg_match('/^(http|https):\/\//i',$target_src))
+				if (!preg_match('/^(http|https):\/\//i', $target_src))
 				{
 					$target_src = Context::getRequestUri().$target_src;
 				}
 
 				$target_src = htmlspecialchars_decode($target_src);
 
-				$tmp_file = _XE_PATH_ . 'files/cache/tmp/' . $random->createSecureSalt(32, 'hex');
+				$tmp_file = _XE_PATH_.'files/cache/tmp/'.$random->createSecureSalt(32, 'hex');
 				FileHandler::getRemoteFile($target_src, $tmp_file);
-				if(!file_exists($tmp_file)) continue;
+				if (!file_exists($tmp_file)) continue;
 
 				$imageinfo = getimagesize($tmp_file);
 				list($_w, $_h) = $imageinfo;
-				if($imageinfo === false || ($_w < ($width * 0.3) && $_h < ($height * 0.3))) {
+				if ($imageinfo === false || ($_w < ($width * 0.3) && $_h < ($height * 0.3))) {
 					FileHandler::removeFile($tmp_file);
 					continue;
 				}
@@ -942,13 +942,13 @@ 
 			}
 		}
 
-		if($source_file)
+		if ($source_file)
 		{
 			$output_file = FileHandler::createImageFile($source_file, $thumbnail_file, $width, $height, 'jpg', $thumbnail_type);
 		}
 
 		// Remove source file if it was temporary
-		if($is_tmp_file)
+		if ($is_tmp_file)
 		{
 			FileHandler::removeFile($source_file);
 		}
@@ -957,14 +957,14 @@ 
 		FileHandler::removeFile($thumbnail_lockfile);
 
 		// Return the thumbnail path if it was successfully generated
-		if($output_file)
+		if ($output_file)
 		{
 			return $thumbnail_url;
 		}
 		// Create an empty file if thumbnail generation failed
 		else
 		{
-			FileHandler::writeFile($thumbnail_file, '','w');
+			FileHandler::writeFile($thumbnail_file, '', 'w');
 		}
 
 		return;
@@ -978,21 +978,21 @@ 
 	 */
 	function getExtraImages($time_interval = 43200)
 	{
-		if(!$this->document_srl) return;
+		if (!$this->document_srl) return;
 		// variables for icon list
 		$buffs = array();
 
 		$check_files = false;
 
 		// Check if secret post is
-		if($this->isSecret()) $buffs[] = "secret";
+		if ($this->isSecret()) $buffs[] = "secret";
 
 		// Set the latest time
-		$time_check = date("YmdHis", $_SERVER['REQUEST_TIME']-$time_interval);
+		$time_check = date("YmdHis", $_SERVER['REQUEST_TIME'] - $time_interval);
 
 		// Check new post
-		if($this->get('regdate')>$time_check) $buffs[] = "new";
-		else if($this->get('last_update')>$time_check) $buffs[] = "update";
+		if ($this->get('regdate') > $time_check) $buffs[] = "new";
+		else if ($this->get('last_update') > $time_check) $buffs[] = "update";
 
 		/*
 		   $content = $this->get('content');
@@ -1015,14 +1015,14 @@ 
 		 */
 
 		// Check the attachment
-		if($this->hasUploadedFiles()) $buffs[] = "file";
+		if ($this->hasUploadedFiles()) $buffs[] = "file";
 
 		return $buffs;
 	}
 
 	function getStatus()
 	{
-		if(!$this->get('status')) return $this->getDefaultStatus();
+		if (!$this->get('status')) return $this->getDefaultStatus();
 		return $this->get('status');
 	}
 
@@ -1033,15 +1033,15 @@ 
 	 */
 	function printExtraImages($time_check = 43200)
 	{
-		if(!$this->document_srl) return;
+		if (!$this->document_srl) return;
 		// Get the icon directory
-		$path = sprintf('%s%s',getUrl(), 'modules/document/tpl/icons/');
+		$path = sprintf('%s%s', getUrl(), 'modules/document/tpl/icons/');
 
 		$buffs = $this->getExtraImages($time_check);
-		if(!count($buffs)) return;
+		if (!count($buffs)) return;
 
 		$buff = array();
-		foreach($buffs as $key => $val)
+		foreach ($buffs as $key => $val)
 		{
 			$buff[] = sprintf('<img src="%s%s.gif" alt="%s" title="%s" style="margin-right:2px;" />', $path, $val, $val, $val);
 		}
@@ -1050,20 +1050,20 @@ 
 
 	function hasUploadedFiles()
 	{
-		if(!$this->document_srl) return;
+		if (!$this->document_srl) return;
 
-		if($this->isSecret() && !$this->isGranted()) return false;
-		return $this->get('uploaded_count')? true : false;
+		if ($this->isSecret() && !$this->isGranted()) return false;
+		return $this->get('uploaded_count') ? true : false;
 	}
 
 	function getUploadedFiles($sortIndex = 'file_srl')
 	{
-		if(!$this->document_srl) return;
+		if (!$this->document_srl) return;
 
-		if($this->isSecret() && !$this->isGranted()) return;
-		if(!$this->get('uploaded_count')) return;
+		if ($this->isSecret() && !$this->isGranted()) return;
+		if (!$this->get('uploaded_count')) return;
 
-		if(!$this->uploadedFiles[$sortIndex])
+		if (!$this->uploadedFiles[$sortIndex])
 		{
 			$oFileModel = getModel('file');
 			$this->uploadedFiles[$sortIndex] = $oFileModel->getFiles($this->document_srl, array(), $sortIndex, true);
@@ -1079,7 +1079,7 @@ 
 	function getEditor()
 	{
 		$module_srl = $this->get('module_srl');
-		if(!$module_srl) $module_srl = Context::get('module_srl');
+		if (!$module_srl) $module_srl = Context::get('module_srl');
 
 		$oEditorModel = getModel('editor');
 		return $oEditorModel->getModuleEditor('document', $module_srl, $this->document_srl, 'document_srl', 'content');
@@ -1094,7 +1094,7 @@ 
 	{
 		// Return false if not authorized, if a secret document, if the document is set not to allow any comment
 		if (!$this->allowComment()) return false;
-		if(!$this->isGranted() && $this->isSecret()) return false;
+		if (!$this->isGranted() && $this->isSecret()) return false;
 
 		return true;
 	}
@@ -1105,7 +1105,7 @@ 
 	 */
 	function getCommentEditor()
 	{
-		if(!$this->isEnableComment()) return;
+		if (!$this->isEnableComment()) return;
 
 		$oEditorModel = getModel('editor');
 		return $oEditorModel->getModuleEditor('comment', $this->get('module_srl'), $comment_srl, 'comment_srl', 'content');
@@ -1117,10 +1117,10 @@ 
 	 */
 	function getProfileImage()
 	{
-		if(!$this->isExists() || !$this->get('member_srl')) return;
+		if (!$this->isExists() || !$this->get('member_srl')) return;
 		$oMemberModel = getModel('member');
 		$profile_info = $oMemberModel->getProfileImage($this->get('member_srl'));
-		if(!$profile_info) return;
+		if (!$profile_info) return;
 
 		return $profile_info->src;
 	}
@@ -1132,21 +1132,21 @@ 
 	function getSignature()
 	{
 		// Pass if a document doesn't exist
-		if(!$this->isExists() || !$this->get('member_srl')) return;
+		if (!$this->isExists() || !$this->get('member_srl')) return;
 		// Get signature information
 		$oMemberModel = getModel('member');
 		$signature = $oMemberModel->getSignature($this->get('member_srl'));
 		// Check if a maximum height of signiture is set in the member module
-		if(!isset($GLOBALS['__member_signature_max_height']))
+		if (!isset($GLOBALS['__member_signature_max_height']))
 		{
 			$oModuleModel = getModel('module');
 			$member_config = $oModuleModel->getModuleConfig('member');
 			$GLOBALS['__member_signature_max_height'] = $member_config->signature_max_height;
 		}
-		if($signature)
+		if ($signature)
 		{
 			$max_signature_height = $GLOBALS['__member_signature_max_height'];
-			if($max_signature_height) $signature = sprintf('<div style="max-height:%dpx;overflow:auto;overflow-x:hidden;height:expression(this.scrollHeight > %d ? \'%dpx\': \'auto\')">%s</div>', $max_signature_height, $max_signature_height, $max_signature_height, $signature);
+			if ($max_signature_height) $signature = sprintf('<div style="max-height:%dpx;overflow:auto;overflow-x:hidden;height:expression(this.scrollHeight > %d ? \'%dpx\': \'auto\')">%s</div>', $max_signature_height, $max_signature_height, $max_signature_height, $signature);
 		}
 
 		return $signature;
@@ -1159,7 +1159,7 @@ 
 	 */
 	function replaceResourceRealPath($matches)
 	{
-		return preg_replace('/src=(["\']?)files/i','src=$1'.Context::getRequestUri().'files', $matches[0]);
+		return preg_replace('/src=(["\']?)files/i', 'src=$1'.Context::getRequestUri().'files', $matches[0]);
 	}
 
 	/**
@@ -1170,19 +1170,19 @@ 
 	function _checkAccessibleFromStatus()
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin == 'Y') return true;
+		if ($logged_info->is_admin == 'Y') return true;
 
 		$status = $this->get('status');
-		if(empty($status)) return false;
+		if (empty($status)) return false;
 
 		$oDocumentModel = getModel('document');
 		$configStatusList = $oDocumentModel->getStatusList();
 
-		if($status == $configStatusList['public'] || $status == $configStatusList['publish'])
+		if ($status == $configStatusList['public'] || $status == $configStatusList['publish'])
 			return true;
-		else if($status == $configStatusList['private'] || $status == $configStatusList['secret'])
+		else if ($status == $configStatusList['private'] || $status == $configStatusList['secret'])
 		{
-			if($this->get('member_srl') == $logged_info->member_srl)
+			if ($this->get('member_srl') == $logged_info->member_srl)
 				return true;
 		}
 		return false;

modules/document/document.controller.php

Spacing +367 added lines, -367 removed lines

@@ -24,19 +24,19 @@ 
 	 */
 	function procDocumentVoteUp()
 	{
-		if(!Context::get('is_logged')) return new Object(-1, 'msg_invalid_request');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_invalid_request');
 
 		$document_srl = Context::get('target_srl');
-		if(!$document_srl) return new Object(-1, 'msg_invalid_request');
+		if (!$document_srl) return new Object(-1, 'msg_invalid_request');
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
 		$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($document_config->use_vote_up=='N') return new Object(-1, 'msg_invalid_request');
+		$document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
+		if ($document_config->use_vote_up == 'N') return new Object(-1, 'msg_invalid_request');
 
 		$point = 1;
 		$output = $this->updateVotedCount($document_srl, $point);
@@ -69,19 +69,19 @@ 
 	 */
 	function procDocumentVoteDown()
 	{
-		if(!Context::get('is_logged')) return new Object(-1, 'msg_invalid_request');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_invalid_request');
 
 		$document_srl = Context::get('target_srl');
-		if(!$document_srl) return new Object(-1, 'msg_invalid_request');
+		if (!$document_srl) return new Object(-1, 'msg_invalid_request');
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
 		$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($document_config->use_vote_down=='N') return new Object(-1, 'msg_invalid_request');
+		$document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
+		if ($document_config->use_vote_down == 'N') return new Object(-1, 'msg_invalid_request');
 
 		$point = -1;
 		$output = $this->updateVotedCount($document_srl, $point);
@@ -95,10 +95,10 @@ 
 	 */
 	function procDocumentDeclare()
 	{
-		if(!Context::get('is_logged')) return new Object(-1, 'msg_invalid_request');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_invalid_request');
 
 		$document_srl = Context::get('target_srl');
-		if(!$document_srl) return new Object(-1, 'msg_invalid_request');
+		if (!$document_srl) return new Object(-1, 'msg_invalid_request');
 
 		return $this->declaredDocument($document_srl);
 	}
@@ -140,7 +140,7 @@ 
 		$args->history_srl = $history_srl;
 		$args->module_srl = $module_srl;
 		$args->document_srl = $document_srl;
-		if(!$args->history_srl && !$args->module_srl && !$args->document_srl) return;
+		if (!$args->history_srl && !$args->module_srl && !$args->document_srl) return;
 		executeQuery("document.deleteHistory", $args);
 	}
 
@@ -152,15 +152,15 @@ 
 	function triggerDeleteModuleDocuments(&$obj)
 	{
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new Object();
+		if (!$module_srl) return new Object();
 		// Delete the document
 		$oDocumentAdminController = getAdminController('document');
 		$output = $oDocumentAdminController->deleteModuleDocument($module_srl);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Delete the category
 		$oDocumentController = getController('document');
 		$output = $oDocumentController->deleteModuleCategory($module_srl);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Delete extra key and variable, because module deleted
 		$this->deleteDocumentExtraKeys($module_srl);
 
@@ -193,7 +193,7 @@ 
 	 */
 	function insertDocument($obj, $manual_inserted = false, $isRestore = false, $isLatest = true)
 	{
-		if(!$manual_inserted && !checkCSRF())
+		if (!$manual_inserted && !checkCSRF())
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -202,32 +202,32 @@ 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 		// List variables
-		if($obj->comment_status) $obj->commentStatus = $obj->comment_status;
-		if(!$obj->commentStatus) $obj->commentStatus = 'DENY';
-		if($obj->commentStatus == 'DENY') $this->_checkCommentStatusForOldVersion($obj);
-		if($obj->allow_trackback!='Y') $obj->allow_trackback = 'N';
-		if($obj->homepage) 
+		if ($obj->comment_status) $obj->commentStatus = $obj->comment_status;
+		if (!$obj->commentStatus) $obj->commentStatus = 'DENY';
+		if ($obj->commentStatus == 'DENY') $this->_checkCommentStatusForOldVersion($obj);
+		if ($obj->allow_trackback != 'Y') $obj->allow_trackback = 'N';
+		if ($obj->homepage) 
 		{
 			$obj->homepage = removeHackTag($obj->homepage);
-			if(!preg_match('/^[a-z]+:\/\//i',$obj->homepage))
+			if (!preg_match('/^[a-z]+:\/\//i', $obj->homepage))
 			{
 				$obj->homepage = 'http://'.$obj->homepage;
 			}
 		}
 		
-		if($obj->notify_message != 'Y') $obj->notify_message = 'N';
-		if(!$obj->email_address) $obj->email_address = '';
-		if(!$isRestore) $obj->ipaddress = $_SERVER['REMOTE_ADDR'];
+		if ($obj->notify_message != 'Y') $obj->notify_message = 'N';
+		if (!$obj->email_address) $obj->email_address = '';
+		if (!$isRestore) $obj->ipaddress = $_SERVER['REMOTE_ADDR'];
 
                 // can modify regdate only manager
                 $grant = Context::get('grant');
-		if(!$grant->manager)
+		if (!$grant->manager)
 		{
 			unset($obj->regdate);
 		}
 		
 		// Serialize the $extra_vars, check the extra_vars type, because duplicate serialized avoid
-		if(!is_string($obj->extra_vars)) $obj->extra_vars = serialize($obj->extra_vars);
+		if (!is_string($obj->extra_vars)) $obj->extra_vars = serialize($obj->extra_vars);
 		// Remove the columns for automatic saving
 		unset($obj->_saved_doc_srl);
 		unset($obj->_saved_doc_title);
@@ -235,34 +235,34 @@ 
 		unset($obj->_saved_doc_message);
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('document.insertDocument', 'before', $obj);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Register it if no given document_srl exists
-		if(!$obj->document_srl) $obj->document_srl = getNextSequence();
-		elseif(!$manual_inserted && !$isRestore && !checkUserSequence($obj->document_srl)) return new Object(-1, 'msg_not_permitted');
+		if (!$obj->document_srl) $obj->document_srl = getNextSequence();
+		elseif (!$manual_inserted && !$isRestore && !checkUserSequence($obj->document_srl)) return new Object(-1, 'msg_not_permitted');
 
 		$oDocumentModel = getModel('document');
 		// Set to 0 if the category_srl doesn't exist
-		if($obj->category_srl)
+		if ($obj->category_srl)
 		{
 			$category_list = $oDocumentModel->getCategoryList($obj->module_srl);
-			if(count($category_list) > 0 && !$category_list[$obj->category_srl]->grant)
+			if (count($category_list) > 0 && !$category_list[$obj->category_srl]->grant)
 			{
 				return new Object(-1, 'msg_not_permitted');
 			}
-			if(count($category_list) > 0 && !$category_list[$obj->category_srl]) $obj->category_srl = 0;
+			if (count($category_list) > 0 && !$category_list[$obj->category_srl]) $obj->category_srl = 0;
 		}
 		// Set the read counts and update order.
-		if(!$obj->readed_count) $obj->readed_count = 0;
-		if($isLatest) $obj->update_order = $obj->list_order = $obj->document_srl * -1;
+		if (!$obj->readed_count) $obj->readed_count = 0;
+		if ($isLatest) $obj->update_order = $obj->list_order = $obj->document_srl * -1;
 		else $obj->update_order = $obj->list_order;
 		// Check the status of password hash for manually inserting. Apply hashing for otherwise.
-		if($obj->password && !$obj->password_is_hashed)
+		if ($obj->password && !$obj->password_is_hashed)
 		{
 			$obj->password = getModel('member')->hashPassword($obj->password);
 		}
 		// Insert member's information only if the member is logged-in and not manually registered.
 		$logged_info = Context::get('logged_info');
-		if(Context::get('is_logged') && !$manual_inserted && !$isRestore)
+		if (Context::get('is_logged') && !$manual_inserted && !$isRestore)
 		{
 			$obj->member_srl = $logged_info->member_srl;
 
@@ -276,61 +276,61 @@ 
 		// If the tile is empty, extract string from the contents.
 		$obj->title = htmlspecialchars($obj->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		settype($obj->title, "string");
-		if($obj->title == '') $obj->title = cut_str(trim(strip_tags(nl2br($obj->content))),20,'...');
+		if ($obj->title == '') $obj->title = cut_str(trim(strip_tags(nl2br($obj->content))), 20, '...');
 		// If no tile extracted from the contents, leave it untitled.
-		if($obj->title == '') $obj->title = 'Untitled';
+		if ($obj->title == '') $obj->title = 'Untitled';
 		// Remove XE's own tags from the contents.
 		$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
-		if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
+		if (Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
 		{
-			if($obj->use_html != 'Y')
+			if ($obj->use_html != 'Y')
 			{
 				$obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 			}
 			$obj->content = nl2br($obj->content);
 		}
 		// Remove iframe and script if not a top adminisrator in the session.
-		if($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content);
+		if ($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content);
 		// An error appears if both log-in info and user name don't exist.
-		if(!$logged_info->member_srl && !$obj->nick_name) return new Object(-1,'msg_invalid_request');
+		if (!$logged_info->member_srl && !$obj->nick_name) return new Object(-1, 'msg_invalid_request');
 
 		$obj->lang_code = Context::getLangType();
 		// Insert data into the DB
-		if(!$obj->status) $this->_checkDocumentStatusForOldVersion($obj);
+		if (!$obj->status) $this->_checkDocumentStatusForOldVersion($obj);
 		$output = executeQuery('document.insertDocument', $obj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 		// Insert extra variables if the document successfully inserted.
 		$extra_keys = $oDocumentModel->getExtraKeys($obj->module_srl);
-		if(count($extra_keys))
+		if (count($extra_keys))
 		{
-			foreach($extra_keys as $idx => $extra_item)
+			foreach ($extra_keys as $idx => $extra_item)
 			{
 				$value = NULL;
-				if(isset($obj->{'extra_vars'.$idx}))
+				if (isset($obj->{'extra_vars'.$idx}))
 				{
 					$tmp = $obj->{'extra_vars'.$idx};
-					if(is_array($tmp))
+					if (is_array($tmp))
 						$value = implode('|@|', $tmp);
 					else
 						$value = trim($tmp);
 				}
-				else if(isset($obj->{$extra_item->name})) $value = trim($obj->{$extra_item->name});
-				if($value == NULL) continue;
+				else if (isset($obj->{$extra_item->name})) $value = trim($obj->{$extra_item->name});
+				if ($value == NULL) continue;
 
 				$this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, $idx, $value, $extra_item->eid);
 			}
 		}
 		// Update the category if the category_srl exists.
-		if($obj->category_srl) $this->updateCategoryCount($obj->module_srl, $obj->category_srl);
+		if ($obj->category_srl) $this->updateCategoryCount($obj->module_srl, $obj->category_srl);
 		// Call a trigger (after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$trigger_output = ModuleHandler::triggerCall('document.insertDocument', 'after', $obj);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -341,12 +341,12 @@ 
 		$oDB->commit();
 
 		// return
-		if(!$manual_inserted)
+		if (!$manual_inserted)
 		{
 			$this->addGrant($obj->document_srl);
 		}
-		$output->add('document_srl',$obj->document_srl);
-		$output->add('category_srl',$obj->category_srl);
+		$output->add('document_srl', $obj->document_srl);
+		$output->add('category_srl', $obj->category_srl);
 
 		return $output;
 	}
@@ -362,41 +362,41 @@ 
 	{
 		$logged_info = Context::get('logged_info');
 
-		if(!$manual_updated && !checkCSRF())
+		if (!$manual_updated && !checkCSRF())
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
-		if(!$source_obj->document_srl || !$obj->document_srl) return new Object(-1,'msg_invalied_request');
-		if(!$obj->status && $obj->is_secret == 'Y') $obj->status = 'SECRET';
-		if(!$obj->status) $obj->status = 'PUBLIC';
+		if (!$source_obj->document_srl || !$obj->document_srl) return new Object(-1, 'msg_invalied_request');
+		if (!$obj->status && $obj->is_secret == 'Y') $obj->status = 'SECRET';
+		if (!$obj->status) $obj->status = 'PUBLIC';
 
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('document.updateDocument', 'before', $obj);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// begin transaction
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 
 		$oModuleModel = getModel('module');
-		if(!$obj->module_srl) $obj->module_srl = $source_obj->get('module_srl');
+		if (!$obj->module_srl) $obj->module_srl = $source_obj->get('module_srl');
 		$module_srl = $obj->module_srl;
 		$document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
-		if(!$document_config)
+		if (!$document_config)
 		{
 			$document_config = new stdClass();
 		}
-		if(!isset($document_config->use_history)) $document_config->use_history = 'N';
+		if (!isset($document_config->use_history)) $document_config->use_history = 'N';
 		$bUseHistory = $document_config->use_history == 'Y' || $document_config->use_history == 'Trace';
 
-		if($bUseHistory)
+		if ($bUseHistory)
 		{
 			$args = new stdClass;
 			$args->history_srl = getNextSequence();
 			$args->document_srl = $obj->document_srl;
 			$args->module_srl = $module_srl;
-			if($document_config->use_history == 'Y') $args->content = $source_obj->get('content');
+			if ($document_config->use_history == 'Y') $args->content = $source_obj->get('content');
 			$args->nick_name = $source_obj->get('nick_name');
 			$args->member_srl = $source_obj->get('member_srl');
 			$args->regdate = $source_obj->get('last_update');
@@ -408,30 +408,30 @@ 
 			$obj->ipaddress = $source_obj->get('ipaddress');
 		}
 		// List variables
-		if($obj->comment_status) $obj->commentStatus = $obj->comment_status;
-		if(!$obj->commentStatus) $obj->commentStatus = 'DENY';
-		if($obj->commentStatus == 'DENY') $this->_checkCommentStatusForOldVersion($obj);
-		if($obj->allow_trackback!='Y') $obj->allow_trackback = 'N';
-		if($obj->homepage)
+		if ($obj->comment_status) $obj->commentStatus = $obj->comment_status;
+		if (!$obj->commentStatus) $obj->commentStatus = 'DENY';
+		if ($obj->commentStatus == 'DENY') $this->_checkCommentStatusForOldVersion($obj);
+		if ($obj->allow_trackback != 'Y') $obj->allow_trackback = 'N';
+		if ($obj->homepage)
 		{
 			$obj->homepage = removeHackTag($obj->homepage);
-			if(!preg_match('/^[a-z]+:\/\//i',$obj->homepage))
+			if (!preg_match('/^[a-z]+:\/\//i', $obj->homepage))
 			{
 				$obj->homepage = 'http://'.$obj->homepage;
 			}
 		}
 		
-		if($obj->notify_message != 'Y') $obj->notify_message = 'N';
+		if ($obj->notify_message != 'Y') $obj->notify_message = 'N';
 		
 		// can modify regdate only manager
                 $grant = Context::get('grant');
-		if(!$grant->manager)
+		if (!$grant->manager)
 		{
 			unset($obj->regdate);
 		}
 		
 		// Serialize the $extra_vars
-		if(!is_string($obj->extra_vars)) $obj->extra_vars = serialize($obj->extra_vars);
+		if (!is_string($obj->extra_vars)) $obj->extra_vars = serialize($obj->extra_vars);
 		// Remove the columns for automatic saving
 		unset($obj->_saved_doc_srl);
 		unset($obj->_saved_doc_title);
@@ -440,23 +440,23 @@ 
 
 		$oDocumentModel = getModel('document');
 		// Set the category_srl to 0 if the changed category is not exsiting.
-		if($source_obj->get('category_srl')!=$obj->category_srl)
+		if ($source_obj->get('category_srl') != $obj->category_srl)
 		{
 			$category_list = $oDocumentModel->getCategoryList($obj->module_srl);
-			if(!$category_list[$obj->category_srl]) $obj->category_srl = 0;
+			if (!$category_list[$obj->category_srl]) $obj->category_srl = 0;
 		}
 		// Change the update order
 		$obj->update_order = getNextSequence() * -1;
 		// Hash the password if it exists
-		if($obj->password)
+		if ($obj->password)
 		{
 			$obj->password = getModel('member')->hashPassword($obj->password);
 		}
 
 		// If an author is identical to the modifier or history is used, use the logged-in user's information.
-		if(Context::get('is_logged') && !$manual_updated)
+		if (Context::get('is_logged') && !$manual_updated)
 		{
-			if($source_obj->get('member_srl')==$logged_info->member_srl)
+			if ($source_obj->get('member_srl') == $logged_info->member_srl)
 			{
 				$obj->member_srl = $logged_info->member_srl;
 				$obj->user_name = htmlspecialchars_decode($logged_info->user_name);
@@ -467,7 +467,7 @@ 
 		}
 
 		// For the document written by logged-in user however no nick_name exists
-		if($source_obj->get('member_srl')&& !$obj->nick_name)
+		if ($source_obj->get('member_srl') && !$obj->nick_name)
 		{
 			$obj->member_srl = $source_obj->get('member_srl');
 			$obj->user_name = $source_obj->get('user_name');
@@ -478,24 +478,24 @@ 
 		// If the tile is empty, extract string from the contents.
 		$obj->title = htmlspecialchars($obj->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		settype($obj->title, "string");
-		if($obj->title == '') $obj->title = cut_str(strip_tags($obj->content),20,'...');
+		if ($obj->title == '') $obj->title = cut_str(strip_tags($obj->content), 20, '...');
 		// If no tile extracted from the contents, leave it untitled.
-		if($obj->title == '') $obj->title = 'Untitled';
+		if ($obj->title == '') $obj->title = 'Untitled';
 		// Remove XE's own tags from the contents.
 		$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
-		if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
+		if (Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
 		{
-			if($obj->use_html != 'Y')
+			if ($obj->use_html != 'Y')
 			{
 				$obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 			}
 			$obj->content = nl2br($obj->content);
 		}
 		// Change not extra vars but language code of the original document if document's lang_code is different from author's setting.
-		if($source_obj->get('lang_code') != Context::getLangType())
+		if ($source_obj->get('lang_code') != Context::getLangType())
 		{
 			// Change not extra vars but language code of the original document if document's lang_code doesn't exist.
-			if(!$source_obj->get('lang_code'))
+			if (!$source_obj->get('lang_code'))
 			{
 				$lang_code_args->document_srl = $source_obj->get('document_srl');
 				$lang_code_args->lang_code = Context::getLangType();
@@ -515,59 +515,59 @@ 
 			}
 		}
 		// Remove iframe and script if not a top adminisrator in the session.
-		if($logged_info->is_admin != 'Y')
+		if ($logged_info->is_admin != 'Y')
 		{
 			$obj->content = removeHackTag($obj->content);
 		}
 		// if temporary document, regdate is now setting
-		if($source_obj->get('status') == $this->getConfigStatus('temp')) $obj->regdate = date('YmdHis');
+		if ($source_obj->get('status') == $this->getConfigStatus('temp')) $obj->regdate = date('YmdHis');
 
 		// Insert data into the DB
 		$output = executeQuery('document.updateDocument', $obj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 		// Remove all extra variables
-		if(Context::get('act')!='procFileDelete')
+		if (Context::get('act') != 'procFileDelete')
 		{
 			$this->deleteDocumentExtraVars($source_obj->get('module_srl'), $obj->document_srl, null, Context::getLangType());
 			// Insert extra variables if the document successfully inserted.
 			$extra_keys = $oDocumentModel->getExtraKeys($obj->module_srl);
-			if(count($extra_keys))
+			if (count($extra_keys))
 			{
-				foreach($extra_keys as $idx => $extra_item)
+				foreach ($extra_keys as $idx => $extra_item)
 				{
 					$value = NULL;
-					if(isset($obj->{'extra_vars'.$idx}))
+					if (isset($obj->{'extra_vars'.$idx}))
 					{
 						$tmp = $obj->{'extra_vars'.$idx};
-						if(is_array($tmp))
+						if (is_array($tmp))
 							$value = implode('|@|', $tmp);
 						else
 							$value = trim($tmp);
 					}
-					else if(isset($obj->{$extra_item->name})) $value = trim($obj->{$extra_item->name});
-					if($value == NULL) continue;
+					else if (isset($obj->{$extra_item->name})) $value = trim($obj->{$extra_item->name});
+					if ($value == NULL) continue;
 					$this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, $idx, $value, $extra_item->eid);
 				}
 			}
 			// Inert extra vars for multi-language support of title and contents.
-			if($extra_content->title) $this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -1, $extra_content->title, 'title_'.Context::getLangType());
-			if($extra_content->content) $this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -2, $extra_content->content, 'content_'.Context::getLangType());
+			if ($extra_content->title) $this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -1, $extra_content->title, 'title_'.Context::getLangType());
+			if ($extra_content->content) $this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -2, $extra_content->content, 'content_'.Context::getLangType());
 		}
 		// Update the category if the category_srl exists.
-		if($source_obj->get('category_srl') != $obj->category_srl || $source_obj->get('module_srl') == $logged_info->member_srl)
+		if ($source_obj->get('category_srl') != $obj->category_srl || $source_obj->get('module_srl') == $logged_info->member_srl)
 		{
-			if($source_obj->get('category_srl') != $obj->category_srl) $this->updateCategoryCount($obj->module_srl, $source_obj->get('category_srl'));
-			if($obj->category_srl) $this->updateCategoryCount($obj->module_srl, $obj->category_srl);
+			if ($source_obj->get('category_srl') != $obj->category_srl) $this->updateCategoryCount($obj->module_srl, $source_obj->get('category_srl'));
+			if ($obj->category_srl) $this->updateCategoryCount($obj->module_srl, $obj->category_srl);
 		}
 		// Call a trigger (after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$trigger_output = ModuleHandler::triggerCall('document.updateDocument', 'after', $obj);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -577,15 +577,15 @@ 
 		// commit
 		$oDB->commit();
 		// Remove the thumbnail file
-		FileHandler::removeDir(sprintf('files/thumbnails/%s',getNumberingPath($obj->document_srl, 3)));
+		FileHandler::removeDir(sprintf('files/thumbnails/%s', getNumberingPath($obj->document_srl, 3)));
 
-		$output->add('document_srl',$obj->document_srl);
+		$output->add('document_srl', $obj->document_srl);
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			//remove document item from cache
-			$cache_key = 'document_item:'. getNumberingPath($obj->document_srl) . $obj->document_srl;
+			$cache_key = 'document_item:'.getNumberingPath($obj->document_srl).$obj->document_srl;
 			$oCacheHandler->delete($cache_key);
 		}
 
@@ -606,33 +606,33 @@ 
 		$trigger_obj = new stdClass();
 		$trigger_obj->document_srl = $document_srl;
 		$output = ModuleHandler::triggerCall('document.deleteDocument', 'before', $trigger_obj);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// begin transaction
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 
-		if(!$isEmptyTrash)
+		if (!$isEmptyTrash)
 		{
 			// get model object of the document
 			$oDocumentModel = getModel('document');
 			// Check if the documnet exists
 			$oDocument = $oDocumentModel->getDocument($document_srl, $is_admin);
 		}
-		else if($isEmptyTrash && $oDocument == null) return new Object(-1, 'document is not exists');
+		else if ($isEmptyTrash && $oDocument == null) return new Object(-1, 'document is not exists');
 
-		if(!$oDocument->isExists() || $oDocument->document_srl != $document_srl) return new Object(-1, 'msg_invalid_document');
+		if (!$oDocument->isExists() || $oDocument->document_srl != $document_srl) return new Object(-1, 'msg_invalid_document');
 		// Check if a permossion is granted
-		if(!$oDocument->isGranted()) return new Object(-1, 'msg_not_permitted');
+		if (!$oDocument->isGranted()) return new Object(-1, 'msg_not_permitted');
 
 		//if empty trash, document already deleted, therefore document not delete
 		$args = new stdClass();
 		$args->document_srl = $document_srl;
-		if(!$isEmptyTrash)
+		if (!$isEmptyTrash)
 		{
 			// Delete the document
 			$output = executeQuery('document.deleteDocument', $args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
@@ -643,7 +643,7 @@ 
 
 		$this->deleteDocumentHistory(null, $document_srl, null);
 		// Update category information if the category_srl exists.
-		if($oDocument->get('category_srl')) $this->updateCategoryCount($oDocument->get('module_srl'),$oDocument->get('category_srl'));
+		if ($oDocument->get('category_srl')) $this->updateCategoryCount($oDocument->get('module_srl'), $oDocument->get('category_srl'));
 		// Delete a declared list
 		executeQuery('document.deleteDeclared', $args);
 		// Delete extra variable
@@ -651,11 +651,11 @@ 
 
 		//this
 		// Call a trigger (after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$trigger_obj = $oDocument->getObjectVars();
 			$trigger_output = ModuleHandler::triggerCall('document.deleteDocument', 'after', $trigger_obj);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -667,16 +667,16 @@ 
 		$this->_deleteDocumentVotedLog($args);
 
 		// Remove the thumbnail file
-		FileHandler::removeDir(sprintf('files/thumbnails/%s',getNumberingPath($document_srl, 3)));
+		FileHandler::removeDir(sprintf('files/thumbnails/%s', getNumberingPath($document_srl, 3)));
 
 		// commit
 		$oDB->commit();
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$cache_key = 'document_item:'. getNumberingPath($document_srl) . $document_srl;
+			$cache_key = 'document_item:'.getNumberingPath($document_srl).$document_srl;
 			$oCacheHandler->delete($cache_key);
 		}
 
@@ -723,7 +723,7 @@ 
 	{
 		$trash_args = new stdClass();
 		// Get trash_srl if a given trash_srl doesn't exist
-		if(!$obj->trash_srl) $trash_args->trash_srl = getNextSequence();
+		if (!$obj->trash_srl) $trash_args->trash_srl = getNextSequence();
 		else $trash_args->trash_srl = $obj->trash_srl;
 		// Get its module_srl which the document belongs to
 		$oDocumentModel = getModel('document');
@@ -732,12 +732,12 @@ 
 		$trash_args->module_srl = $oDocument->get('module_srl');
 		$obj->module_srl = $oDocument->get('module_srl');
 		// Cannot throw data from the trash to the trash
-		if($trash_args->module_srl == 0) return false;
+		if ($trash_args->module_srl == 0) return false;
 		// Data setting
 		$trash_args->document_srl = $obj->document_srl;
 		$trash_args->description = $obj->description;
 		// Insert member's information only if the member is logged-in and not manually registered.
-		if(Context::get('is_logged')&&!$manual_inserted)
+		if (Context::get('is_logged') && !$manual_inserted)
 		{
 			$logged_info = Context::get('logged_info');
 			$trash_args->member_srl = $logged_info->member_srl;
@@ -773,14 +773,14 @@ 
 
 		$oTrashAdminController = getAdminController('trash');
 		$output = $oTrashAdminController->insertTrash($oTrashVO);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
 		$output = executeQuery('document.deleteDocument', $trash_args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -793,12 +793,12 @@ 
 		  }*/
 
 		// update category
-		if($oDocument->get('category_srl')) $this->updateCategoryCount($oDocument->get('module_srl'),$oDocument->get('category_srl'));
+		if ($oDocument->get('category_srl')) $this->updateCategoryCount($oDocument->get('module_srl'), $oDocument->get('category_srl'));
 
 		// remove thumbnails
-		FileHandler::removeDir(sprintf('files/thumbnails/%s',getNumberingPath($obj->document_srl, 3)));
+		FileHandler::removeDir(sprintf('files/thumbnails/%s', getNumberingPath($obj->document_srl, 3)));
 		// Set the attachment to be invalid state
-		if($oDocument->hasUploadedFiles())
+		if ($oDocument->hasUploadedFiles())
 		{
 			$args = new stdClass();
 			$args->upload_target_srl = $oDocument->document_srl;
@@ -806,10 +806,10 @@ 
 			executeQuery('file.updateFileValid', $args);
 		}
 		// Call a trigger (after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$trigger_output = ModuleHandler::triggerCall('document.moveDocumentToTrash', 'after', $obj);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -821,9 +821,9 @@ 
 
 		// Clear cache
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$cache_key = 'document_item:'. getNumberingPath($oDocument->document_srl) . $oDocument->document_srl;
+			$cache_key = 'document_item:'.getNumberingPath($oDocument->document_srl).$oDocument->document_srl;
 			$oCacheHandler->delete($cache_key);
 		}
 
@@ -838,7 +838,7 @@ 
 	function updateReadedCount(&$oDocument)
 	{
 		// Pass if Crawler access
-		if(isCrawler()) return false;
+		if (isCrawler()) return false;
 		
 		$document_srl = $oDocument->document_srl;
 		$member_srl = $oDocument->get('member_srl');
@@ -846,19 +846,19 @@ 
 
 		// Call a trigger when the read count is updated (before)
 		$trigger_output = ModuleHandler::triggerCall('document.updateReadedCount', 'before', $oDocument);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if (!$trigger_output->toBool()) return $trigger_output;
 
 		// Pass if read count is increaded on the session information
-		if($_SESSION['readed_document'][$document_srl]) return false;
+		if ($_SESSION['readed_document'][$document_srl]) return false;
 
 		// Pass if the author's IP address is as same as visitor's.
-		if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
+		if ($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
 		{
 			$_SESSION['readed_document'][$document_srl] = true;
 			return false;
 		}
 		// Pass ater registering sesscion if the author is a member and has same information as the currently logged-in user.
-		if($member_srl && $logged_info->member_srl == $member_srl)
+		if ($member_srl && $logged_info->member_srl == $member_srl)
 		{
 			$_SESSION['readed_document'][$document_srl] = true;
 			return false;
@@ -874,7 +874,7 @@ 
 
 		// Call a trigger when the read count is updated (after)
 		$trigger_output = ModuleHandler::triggerCall('document.updateReadedCount', 'after', $oDocument);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			$oDB->rollback();
 			return $trigger_output;
@@ -883,15 +883,15 @@ 
 		$oDB->commit();
 
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			//remove document item from cache
-			$cache_key = 'document_item:'. getNumberingPath($document_srl) . $document_srl;
+			$cache_key = 'document_item:'.getNumberingPath($document_srl).$document_srl;
 			$oCacheHandler->delete($cache_key);
 		}
 
 		// Register session
-		if(!$_SESSION['banned_document'][$document_srl]) 
+		if (!$_SESSION['banned_document'][$document_srl]) 
 		{
 			$_SESSION['readed_document'][$document_srl] = true;
 		}
@@ -914,21 +914,21 @@ 
 	 */
 	function insertDocumentExtraKey($module_srl, $var_idx, $var_name, $var_type, $var_is_required = 'N', $var_search = 'N', $var_default = '', $var_desc = '', $eid)
 	{
-		if(!$module_srl || !$var_idx || !$var_name || !$var_type || !$eid) return new Object(-1,'msg_invalid_request');
+		if (!$module_srl || !$var_idx || !$var_name || !$var_type || !$eid) return new Object(-1, 'msg_invalid_request');
 
 		$obj = new stdClass();
 		$obj->module_srl = $module_srl;
 		$obj->var_idx = $var_idx;
 		$obj->var_name = $var_name;
 		$obj->var_type = $var_type;
-		$obj->var_is_required = $var_is_required=='Y'?'Y':'N';
-		$obj->var_search = $var_search=='Y'?'Y':'N';
+		$obj->var_is_required = $var_is_required == 'Y' ? 'Y' : 'N';
+		$obj->var_search = $var_search == 'Y' ? 'Y' : 'N';
 		$obj->var_default = $var_default;
 		$obj->var_desc = $var_desc;
 		$obj->eid = $eid;
 
 		$output = executeQuery('document.getDocumentExtraKeys', $obj);
-		if(!$output->data)
+		if (!$output->data)
 		{
 			$output = executeQuery('document.insertDocumentExtraKey', $obj);
 		}
@@ -940,7 +940,7 @@ 
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$object_key = 'module_document_extra_keys:'.$module_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
@@ -958,42 +958,42 @@ 
 	 */
 	function deleteDocumentExtraKeys($module_srl, $var_idx = null)
 	{
-		if(!$module_srl) return new Object(-1,'msg_invalid_request');
+		if (!$module_srl) return new Object(-1, 'msg_invalid_request');
 		$obj = new stdClass();
 		$obj->module_srl = $module_srl;
-		if(!is_null($var_idx)) $obj->var_idx = $var_idx;
+		if (!is_null($var_idx)) $obj->var_idx = $var_idx;
 
 		$oDB = DB::getInstance();
 		$oDB->begin();
 
 		$output = $oDB->executeQuery('document.deleteDocumentExtraKeys', $obj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
-		if($var_idx != NULL)
+		if ($var_idx != NULL)
 		{
 			$output = $oDB->executeQuery('document.updateDocumentExtraKeyIdxOrder', $obj);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
 			}
 		}
 
-		$output =  executeQuery('document.deleteDocumentExtraVars', $obj);
-		if(!$output->toBool())
+		$output = executeQuery('document.deleteDocumentExtraVars', $obj);
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
-		if($var_idx != NULL)
+		if ($var_idx != NULL)
 		{
 			$output = $oDB->executeQuery('document.updateDocumentExtraVarIdxOrder', $obj);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
@@ -1003,7 +1003,7 @@ 
 		$oDB->commit();
 
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$object_key = 'module_document_extra_keys:'.$module_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
@@ -1025,8 +1025,8 @@ 
 	 */
 	function insertDocumentExtraVar($module_srl, $document_srl, $var_idx, $value, $eid = null, $lang_code = '')
 	{
-		if(!$module_srl || !$document_srl || !$var_idx || !isset($value)) return new Object(-1,'msg_invalid_request');
-		if(!$lang_code) $lang_code = Context::getLangType();
+		if (!$module_srl || !$document_srl || !$var_idx || !isset($value)) return new Object(-1, 'msg_invalid_request');
+		if (!$lang_code) $lang_code = Context::getLangType();
 
 		$obj = new stdClass;
 		$obj->module_srl = $module_srl;
@@ -1052,10 +1052,10 @@ 
 	{
 		$obj = new stdClass();
 		$obj->module_srl = $module_srl;
-		if(!is_null($document_srl)) $obj->document_srl = $document_srl;
-		if(!is_null($var_idx)) $obj->var_idx = $var_idx;
-		if(!is_null($lang_code)) $obj->lang_code = $lang_code;
-		if(!is_null($eid)) $obj->eid = $eid;
+		if (!is_null($document_srl)) $obj->document_srl = $document_srl;
+		if (!is_null($var_idx)) $obj->var_idx = $var_idx;
+		if (!is_null($lang_code)) $obj->lang_code = $lang_code;
+		if (!is_null($eid)) $obj->eid = $eid;
 		$output = executeQuery('document.deleteDocumentExtraVars', $obj);
 		return $output;
 	}
@@ -1069,10 +1069,10 @@ 
 	 */
 	function updateVotedCount($document_srl, $point = 1)
 	{
-		if($point > 0) $failed_voted = 'failed_voted';
+		if ($point > 0) $failed_voted = 'failed_voted';
 		else $failed_voted = 'failed_blamed';
 		// Return fail if session already has information about votes
-		if($_SESSION['voted_document'][$document_srl])
+		if ($_SESSION['voted_document'][$document_srl])
 		{
 			return new Object(-1, $failed_voted);
 		}
@@ -1080,7 +1080,7 @@ 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
 		// Pass if the author's IP address is as same as visitor's.
-		if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
+		if ($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
 		{
 			$_SESSION['voted_document'][$document_srl] = true;
 			return new Object(-1, $failed_voted);
@@ -1091,10 +1091,10 @@ 
 		$member_srl = $oMemberModel->getLoggedMemberSrl();
 
 		// Check if document's author is a member.
-		if($oDocument->get('member_srl'))
+		if ($oDocument->get('member_srl'))
 		{
 			// Pass after registering a session if author's information is same as the currently logged-in user's.
-			if($member_srl && $member_srl == abs($oDocument->get('member_srl')))
+			if ($member_srl && $member_srl == abs($oDocument->get('member_srl')))
 			{
 				$_SESSION['voted_document'][$document_srl] = true;
 				return new Object(-1, $failed_voted);
@@ -1103,7 +1103,7 @@ 
 
 		// Use member_srl for logged-in members and IP address for non-members.
 		$args = new stdClass;
-		if($member_srl)
+		if ($member_srl)
 		{
 			$args->member_srl = $member_srl;
 		}
@@ -1114,7 +1114,7 @@ 
 		$args->document_srl = $document_srl;
 		$output = executeQuery('document.getDocumentVotedLogInfo', $args);
 		// Pass after registering a session if log information has vote-up logs
-		if($output->data->count)
+		if ($output->data->count)
 		{
 			$_SESSION['voted_document'][$document_srl] = true;
 			return new Object(-1, $failed_voted);
@@ -1125,7 +1125,7 @@ 
 		$oDB->begin();
 
 		// Update the voted count
-		if($point < 0)
+		if ($point < 0)
 		{
 			$args->blamed_count = $oDocument->get('blamed_count') + $point;
 			$output = executeQuery('document.updateBlamedCount', $args);
@@ -1135,11 +1135,11 @@ 
 			$args->voted_count = $oDocument->get('voted_count') + $point;
 			$output = executeQuery('document.updateVotedCount', $args);
 		}
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Leave logs
 		$args->point = $point;
 		$output = executeQuery('document.insertDocumentVotedLog', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$obj = new stdClass;
 		$obj->member_srl = $oDocument->get('member_srl');
@@ -1150,7 +1150,7 @@ 
 		$obj->before_point = ($point < 0) ? $oDocument->get('blamed_count') : $oDocument->get('voted_count');
 		$obj->after_point = ($point < 0) ? $args->blamed_count : $args->voted_count;
 		$trigger_output = ModuleHandler::triggerCall('document.updateVotedCount', 'after', $obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			$oDB->rollback();
 			return $trigger_output;
@@ -1159,10 +1159,10 @@ 
 		$oDB->commit();
 
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			//remove document item from cache
-			$cache_key = 'document_item:'. getNumberingPath($document_srl) . $document_srl;
+			$cache_key = 'document_item:'.getNumberingPath($document_srl).$document_srl;
 			$oCacheHandler->delete($cache_key);
 		}
 
@@ -1171,7 +1171,7 @@ 
 
 		// Return result
 		$output = new Object();
-		if($point > 0)
+		if ($point > 0)
 		{
 			$output->setMessage('success_voted');
 			$output->add('voted_count', $obj->after_point);
@@ -1193,13 +1193,13 @@ 
 	function declaredDocument($document_srl)
 	{
 		// Fail if session information already has a reported document
-		if($_SESSION['declared_document'][$document_srl]) return new Object(-1, 'failed_declared');
+		if ($_SESSION['declared_document'][$document_srl]) return new Object(-1, 'failed_declared');
 
 		// Check if previously reported
 		$args = new stdClass();
 		$args->document_srl = $document_srl;
 		$output = executeQuery('document.getDeclaredDocument', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$declared_count = ($output->data->declared_count) ? $output->data->declared_count : 0;
 
@@ -1209,7 +1209,7 @@ 
 
 		// Call a trigger (before)
 		$trigger_output = ModuleHandler::triggerCall('document.declaredDocument', 'before', $trigger_obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			return $trigger_output;
 		}
@@ -1219,19 +1219,19 @@ 
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
 
 		// Pass if the author's IP address is as same as visitor's.
-		if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR']) {
+		if ($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR']) {
 			$_SESSION['declared_document'][$document_srl] = true;
 			return new Object(-1, 'failed_declared');
 		}
 
 		// Check if document's author is a member.
-		if($oDocument->get('member_srl'))
+		if ($oDocument->get('member_srl'))
 		{
 			// Create a member model object
 			$oMemberModel = getModel('member');
 			$member_srl = $oMemberModel->getLoggedMemberSrl();
 			// Pass after registering a session if author's information is same as the currently logged-in user's.
-			if($member_srl && $member_srl == abs($oDocument->get('member_srl')))
+			if ($member_srl && $member_srl == abs($oDocument->get('member_srl')))
 			{
 				$_SESSION['declared_document'][$document_srl] = true;
 				return new Object(-1, 'failed_declared');
@@ -1240,7 +1240,7 @@ 
 
 		// Use member_srl for logged-in members and IP address for non-members.
 		$args = new stdClass;
-		if($member_srl)
+		if ($member_srl)
 		{
 			$args->member_srl = $member_srl;
 		}
@@ -1253,7 +1253,7 @@ 
 		$output = executeQuery('document.getDocumentDeclaredLogInfo', $args);
 
 		// Pass after registering a sesson if reported/declared documents are in the logs.
-		if($output->data->count)
+		if ($output->data->count)
 		{
 			$_SESSION['declared_document'][$document_srl] = true;
 			return new Object(-1, 'failed_declared');
@@ -1264,23 +1264,23 @@ 
 		$oDB->begin();
 
 		// Add the declared document
-		if($declared_count > 0) $output = executeQuery('document.updateDeclaredDocument', $args);
+		if ($declared_count > 0) $output = executeQuery('document.updateDeclaredDocument', $args);
 		else $output = executeQuery('document.insertDeclaredDocument', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Leave logs
 		$output = executeQuery('document.insertDocumentDeclaredLog', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
-		$this->add('declared_count', $declared_count+1);
+		$this->add('declared_count', $declared_count + 1);
 
 		// Call a trigger (after)
 		$trigger_obj->declared_count = $declared_count + 1;
 		$trigger_output = ModuleHandler::triggerCall('document.declaredDocument', 'after', $trigger_obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			$oDB->rollback();
 			return $trigger_output;
@@ -1310,16 +1310,16 @@ 
 		$args->document_srl = $document_srl;
 		$args->comment_count = $comment_count;
 
-		if($comment_inserted)
+		if ($comment_inserted)
 		{
-			$args->update_order = -1*getNextSequence();
+			$args->update_order = -1 * getNextSequence();
 			$args->last_updater = $last_updater;
 
 			$oCacheHandler = CacheHandler::getInstance('object');
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				//remove document item from cache
-				$cache_key = 'document_item:'. getNumberingPath($document_srl) . $document_srl;
+				$cache_key = 'document_item:'.getNumberingPath($document_srl).$document_srl;
 				$oCacheHandler->delete($cache_key);
 			}
 		}
@@ -1340,10 +1340,10 @@ 
 		$args->trackback_count = $trackback_count;
 
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			//remove document item from cache
-			$cache_key = 'document_item:'. getNumberingPath($document_srl) . $document_srl;
+			$cache_key = 'document_item:'.getNumberingPath($document_srl).$document_srl;
 			$oCacheHandler->delete($cache_key);
 		}
 
@@ -1358,14 +1358,14 @@ 
 	function insertCategory($obj)
 	{
 		// Sort the order to display if a child category is added
-		if($obj->parent_srl)
+		if ($obj->parent_srl)
 		{
 			// Get its parent category
 			$oDocumentModel = getModel('document');
 			$parent_category = $oDocumentModel->getCategory($obj->parent_srl);
 			$obj->list_order = $parent_category->list_order;
-			$this->updateCategoryListOrder($parent_category->module_srl, $parent_category->list_order+1);
-			if(!$obj->category_srl) $obj->category_srl = getNextSequence();
+			$this->updateCategoryListOrder($parent_category->module_srl, $parent_category->list_order + 1);
+			if (!$obj->category_srl) $obj->category_srl = getNextSequence();
 		}
 		else
 		{
@@ -1373,7 +1373,7 @@ 
 		}
 
 		$output = executeQuery('document.insertCategory', $obj);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$output->add('category_srl', $obj->category_srl);
 			$this->makeCategoryFile($obj->module_srl);
@@ -1407,13 +1407,13 @@ 
 	{
 		// Create a document model object
 		$oDocumentModel = getModel('document');
-		if(!$document_count) $document_count = $oDocumentModel->getCategoryDocumentCount($module_srl,$category_srl);
+		if (!$document_count) $document_count = $oDocumentModel->getCategoryDocumentCount($module_srl, $category_srl);
 
 		$args = new stdClass;
 		$args->category_srl = $category_srl;
 		$args->document_count = $document_count;
 		$output = executeQuery('document.updateCategoryCount', $args);
-		if($output->toBool()) $this->makeCategoryFile($module_srl);
+		if ($output->toBool()) $this->makeCategoryFile($module_srl);
 
 		return $output;
 	}
@@ -1426,7 +1426,7 @@ 
 	function updateCategory($obj)
 	{
 		$output = executeQuery('document.updateCategory', $obj);
-		if($output->toBool()) $this->makeCategoryFile($obj->module_srl);
+		if ($output->toBool()) $this->makeCategoryFile($obj->module_srl);
 		return $output;
 	}
 
@@ -1443,32 +1443,32 @@ 
 		$category_info = $oDocumentModel->getCategory($category_srl);
 		// Display an error that the category cannot be deleted if it has a child
 		$output = executeQuery('document.getChildCategoryCount', $args);
-		if(!$output->toBool()) return $output;
-		if($output->data->count>0) return new Object(-1, 'msg_cannot_delete_for_child');
+		if (!$output->toBool()) return $output;
+		if ($output->data->count > 0) return new Object(-1, 'msg_cannot_delete_for_child');
 		// Delete a category information
 		$output = executeQuery('document.deleteCategory', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->makeCategoryFile($category_info->module_srl);
 		// remvove cache
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$page = 0;
-			while(true) {
+			while (true) {
 				$args = new stdClass();
 				$args->category_srl = $category_srl;
 				$args->list_count = 100;
 				$args->page = ++$page;
 				$output = executeQuery('document.getDocumentList', $args, array('document_srl'));
 
-				if($output->data == array())
+				if ($output->data == array())
 					break;
 
-				foreach($output->data as $val)
+				foreach ($output->data as $val)
 				{
 					//remove document item from cache
-					$cache_key = 'document_item:'. getNumberingPath($val->document_srl) . $val->document_srl;
+					$cache_key = 'document_item:'.getNumberingPath($val->document_srl).$val->document_srl;
 					$oCacheHandler->delete($cache_key);
 				}
 			}
@@ -1515,18 +1515,18 @@ 
 		// Seek a full list of categories
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
 		$category_srl_list = array_keys($category_list);
-		if(count($category_srl_list)<2) return new Object();
+		if (count($category_srl_list) < 2) return new Object();
 
 		$prev_category = NULL;
-		foreach($category_list as $key => $val)
+		foreach ($category_list as $key => $val)
 		{
-			if($key==$category_srl) break;
+			if ($key == $category_srl) break;
 			$prev_category = $val;
 		}
 		// Return if the previous category doesn't exist
-		if(!$prev_category) return new Object(-1,Context::getLang('msg_category_not_moved'));
+		if (!$prev_category) return new Object(-1, Context::getLang('msg_category_not_moved'));
 		// Return if the selected category is the top level
-		if($category_srl_list[0]==$category_srl) return new Object(-1,Context::getLang('msg_category_not_moved'));
+		if ($category_srl_list[0] == $category_srl) return new Object(-1, Context::getLang('msg_category_not_moved'));
 		// Information of the selected category
 		$cur_args = new stdClass;
 		$cur_args->category_srl = $category_srl;
@@ -1562,15 +1562,15 @@ 
 		// Seek a full list of categories
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
 		$category_srl_list = array_keys($category_list);
-		if(count($category_srl_list)<2) return new Object();
+		if (count($category_srl_list) < 2) return new Object();
 
-		for($i=0;$i<count($category_srl_list);$i++)
+		for ($i = 0; $i < count($category_srl_list); $i++)
 		{
-			if($category_srl_list[$i]==$category_srl) break;
+			if ($category_srl_list[$i] == $category_srl) break;
 		}
 
-		$next_category_srl = $category_srl_list[$i+1];
-		if(!$category_list[$next_category_srl]) return new Object(-1,Context::getLang('msg_category_not_moved'));
+		$next_category_srl = $category_srl_list[$i + 1];
+		if (!$category_list[$next_category_srl]) return new Object(-1, Context::getLang('msg_category_not_moved'));
 		$next_category = $category_list[$next_category_srl];
 		// Information of the selected category
 		$cur_args = new stdClass;
@@ -1597,7 +1597,7 @@ 
 	{
 		$oDocumentModel = getModel('document');
 		$extra_keys = $oDocumentModel->getExtraKeys($module_srl);
-		if(!count($extra_keys)) return;
+		if (!count($extra_keys)) return;
 
 		$js_code = array();
 		$js_code[] = '<script>//<![CDATA[';
@@ -1607,16 +1607,16 @@ 
 
 		$logged_info = Context::get('logged_info');
 
-		foreach($extra_keys as $idx => $val)
+		foreach ($extra_keys as $idx => $val)
 		{
 			$idx = $val->idx;
-			if($val->type == 'kr_zip')
+			if ($val->type == 'kr_zip')
 			{
 				$idx .= '[]';
 			}
 			$name = str_ireplace(array('<script', '</script'), array('<scr" + "ipt', '</scr" + "ipt'), $val->name);
 			$js_code[] = sprintf('validator.cast("ADD_MESSAGE", ["extra_vars%s","%s"]);', $idx, $name);
-			if($val->is_required == 'Y') $js_code[] = sprintf('validator.cast("ADD_EXTRA_FIELD", ["extra_vars%s", { required:true }]);', $idx);
+			if ($val->is_required == 'Y') $js_code[] = sprintf('validator.cast("ADD_EXTRA_FIELD", ["extra_vars%s", { required:true }]);', $idx);
 		}
 
 		$js_code[] = '})(jQuery);';
@@ -1634,12 +1634,12 @@ 
 	function procDocumentInsertCategory($args = null)
 	{
 		// List variables
-		if(!$args) $args = Context::gets('module_srl','category_srl','parent_srl','category_title','category_description','expand','group_srls','category_color','mid');
+		if (!$args) $args = Context::gets('module_srl', 'category_srl', 'parent_srl', 'category_title', 'category_description', 'expand', 'group_srls', 'category_color', 'mid');
 		$args->title = $args->category_title;
 		$args->description = $args->category_description;
 		$args->color = $args->category_color;
 
-		if(!$args->module_srl && $args->mid)
+		if (!$args->module_srl && $args->mid)
 		{
 			$mid = $args->mid;
 			unset($args->mid);
@@ -1650,28 +1650,28 @@ 
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList);
 		$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');
 
-		if($args->expand !="Y") $args->expand = "N";
-		if(!is_array($args->group_srls)) $args->group_srls = str_replace('|@|',',',$args->group_srls);
+		if ($args->expand != "Y") $args->expand = "N";
+		if (!is_array($args->group_srls)) $args->group_srls = str_replace('|@|', ',', $args->group_srls);
 		else $args->group_srls = implode(',', $args->group_srls);
-		$args->parent_srl = (int)$args->parent_srl;
+		$args->parent_srl = (int) $args->parent_srl;
 
 		$oDocumentModel = getModel('document');
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 		// Check if already exists
-		if($args->category_srl)
+		if ($args->category_srl)
 		{
 			$category_info = $oDocumentModel->getCategory($args->category_srl);
-			if($category_info->category_srl != $args->category_srl) $args->category_srl = null;
+			if ($category_info->category_srl != $args->category_srl) $args->category_srl = null;
 		}
 		// Update if exists
-		if($args->category_srl)
+		if ($args->category_srl)
 		{
 			$output = $this->updateCategory($args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
@@ -1681,7 +1681,7 @@ 
 		else
 		{
 			$output = $this->insertCategory($args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
@@ -1720,11 +1720,11 @@ 
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($source_category->module_srl, $columnList);
 		$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');
 
 		// First child of the parent_category_srl
 		$source_args = new stdClass;
-		if($parent_category_srl > 0 || ($parent_category_srl == 0 && $target_category_srl == 0))
+		if ($parent_category_srl > 0 || ($parent_category_srl == 0 && $target_category_srl == 0))
 		{
 			$parent_category = $oDocumentModel->getCategory($parent_category_srl);
 
@@ -1733,30 +1733,30 @@ 
 			$args->parent_srl = $parent_category_srl;
 			$output = executeQuery('document.getChildCategoryMinListOrder', $args);
 
-			if(!$output->toBool()) return $output;
-			$args->list_order = (int)$output->data->list_order;
-			if(!$args->list_order) $args->list_order = 0;
+			if (!$output->toBool()) return $output;
+			$args->list_order = (int) $output->data->list_order;
+			if (!$args->list_order) $args->list_order = 0;
 			$args->list_order--;
 
 			$source_args->category_srl = $source_category_srl;
 			$source_args->parent_srl = $parent_category_srl;
 			$source_args->list_order = $args->list_order;
 			$output = $this->updateCategory($source_args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 			// Sibling of the $target_category_srl
 		}
-		else if($target_category_srl > 0)
+		else if ($target_category_srl > 0)
 		{
 			$target_category = $oDocumentModel->getCategory($target_category_srl);
 			// Move all siblings of the $target_category down
-			$output = $this->updateCategoryListOrder($target_category->module_srl, $target_category->list_order+1);
-			if(!$output->toBool()) return $output;
+			$output = $this->updateCategoryListOrder($target_category->module_srl, $target_category->list_order + 1);
+			if (!$output->toBool()) return $output;
 
 			$source_args->category_srl = $source_category_srl;
 			$source_args->parent_srl = $target_category->parent_srl;
-			$source_args->list_order = $target_category->list_order+1;
+			$source_args->list_order = $target_category->list_order + 1;
 			$output = $this->updateCategory($source_args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 		// Re-generate the xml file
 		$xml_file = $this->makeCategoryFile($source_category->module_srl);
@@ -1772,7 +1772,7 @@ 
 	function procDocumentDeleteCategory()
 	{
 		// List variables
-		$args = Context::gets('module_srl','category_srl');
+		$args = Context::gets('module_srl', 'category_srl');
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -1781,17 +1781,17 @@ 
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList);
 		$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');
 
 		$oDocumentModel = getModel('document');
 		// Get original information
 		$category_info = $oDocumentModel->getCategory($args->category_srl);
-		if($category_info->parent_srl) $parent_srl = $category_info->parent_srl;
+		if ($category_info->parent_srl) $parent_srl = $category_info->parent_srl;
 		// Display an error that the category cannot be deleted if it has a child node
-		if($oDocumentModel->getCategoryChlidCount($args->category_srl)) return new Object(-1, 'msg_cannot_delete_for_child');
+		if ($oDocumentModel->getCategoryChlidCount($args->category_srl)) return new Object(-1, 'msg_cannot_delete_for_child');
 		// Remove from the DB
 		$output = $this->deleteCategory($args->category_srl);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -1822,11 +1822,11 @@ 
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
 		$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');
 
 		$xml_file = $this->makeCategoryFile($module_srl);
 		// Set return value
-		$this->add('xml_file',$xml_file);
+		$this->add('xml_file', $xml_file);
 	}
 
 	/**
@@ -1837,14 +1837,14 @@ 
 	function makeCategoryFile($module_srl)
 	{
 		// Return if there is no information you need for creating a cache file
-		if(!$module_srl) return false;
+		if (!$module_srl) return false;
 		// Get module information (to obtain mid)
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'mid', 'site_srl');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
 		$mid = $module_info->mid;
 
-		if(!is_dir('./files/cache/document_category')) FileHandler::makeDir('./files/cache/document_category');
+		if (!is_dir('./files/cache/document_category')) FileHandler::makeDir('./files/cache/document_category');
 		// Cache file's name
 		$xml_file = sprintf("./files/cache/document_category/%s.xml.php", $module_srl);
 		$php_file = sprintf("./files/cache/document_category/%s.php", $module_srl);
@@ -1856,17 +1856,17 @@ 
 
 		$category_list = $output->data;
 
-		if(!is_array($category_list)) $category_list = array($category_list);
+		if (!is_array($category_list)) $category_list = array($category_list);
 
 		$category_count = count($category_list);
-		for($i=0;$i<$category_count;$i++)
+		for ($i = 0; $i < $category_count; $i++)
 		{
 			$category_srl = $category_list[$i]->category_srl;
-			if(!preg_match('/^[0-9,]+$/', $category_list[$i]->group_srls)) $category_list[$i]->group_srls = '';
+			if (!preg_match('/^[0-9,]+$/', $category_list[$i]->group_srls)) $category_list[$i]->group_srls = '';
 			$list[$category_srl] = $category_list[$i];
 		}
 		// Create the xml file without node data if no data is obtained
-		if(!$list)
+		if (!$list)
 		{
 			$xml_buff = "<root />";
 			FileHandler::writeFile($xml_file, $xml_buff);
@@ -1874,12 +1874,12 @@ 
 			return $xml_file;
 		}
 		// Change to an array if only a single data is obtained
-		if(!is_array($list)) $list = array($list);
+		if (!is_array($list)) $list = array($list);
 		// Create a tree for loop
-		foreach($list as $category_srl => $node)
+		foreach ($list as $category_srl => $node)
 		{
 			$node->mid = $mid;
-			$parent_srl = (int)$node->parent_srl;
+			$parent_srl = (int) $node->parent_srl;
 			$tree[$parent_srl][$category_srl] = $node;
 		}
 		// A common header to set permissions and groups of the cache file
@@ -1953,13 +1953,13 @@ 
 	 */
 	function getXmlTree($source_node, $tree, $site_srl, &$xml_header_buff)
 	{
-		if(!$source_node) return;
+		if (!$source_node) return;
 
-		foreach($source_node as $category_srl => $node)
+		foreach ($source_node as $category_srl => $node)
 		{
 			$child_buff = "";
 			// Get data of the child nodes
-			if($category_srl && $tree[$category_srl]) $child_buff = $this->getXmlTree($tree[$category_srl], $tree, $site_srl, $xml_header_buff);
+			if ($category_srl && $tree[$category_srl]) $child_buff = $this->getXmlTree($tree[$category_srl], $tree, $site_srl, $xml_header_buff);
 			// List variables
 			$expand = $node->expand;
 			$group_srls = $node->group_srls;
@@ -1969,27 +1969,27 @@ 
 			$color = $node->color;
 			$description = $node->description;
 			// If node->group_srls value exists
-			if($group_srls) $group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s)))))',$group_srls);
+			if ($group_srls) $group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s)))))', $group_srls);
 			else $group_check_code = "true";
 
 			$title = $node->title;
 			$oModuleAdminModel = getAdminModel('module');
 
 			$langs = $oModuleAdminModel->getLangCode($site_srl, $title);
-			if(count($langs))
+			if (count($langs))
 			{
-				foreach($langs as $key => $val)
+				foreach ($langs as $key => $val)
 				{
-					$xml_header_buff .= sprintf('$_titles[%d]["%s"] = "%s"; ', $category_srl, $key, str_replace('"','\\"',htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)));
+					$xml_header_buff .= sprintf('$_titles[%d]["%s"] = "%s"; ', $category_srl, $key, str_replace('"', '\\"', htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)));
 				}
 			}
 
 			$langx = $oModuleAdminModel->getLangCode($site_srl, $description);
-			if(count($langx))
+			if (count($langx))
 			{
-				foreach($langx as $key => $val)
+				foreach ($langx as $key => $val)
 				{
-					$xml_header_buff .= sprintf('$_descriptions[%d]["%s"] = "%s"; ', $category_srl, $key, str_replace('"','\\"',htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)));
+					$xml_header_buff .= sprintf('$_descriptions[%d]["%s"] = "%s"; ', $category_srl, $key, str_replace('"', '\\"', htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)));
 				}
 			}
 
@@ -2002,7 +2002,7 @@ 
 				$category_srl,
 				$group_check_code,
 				$category_srl,
-				getUrl('','mid',$node->mid,'category',$category_srl),
+				getUrl('', 'mid', $node->mid, 'category', $category_srl),
 				$expand,
 				htmlspecialchars($color, ENT_COMPAT | ENT_HTML401, 'UTF-8', false),
 				$group_check_code,
@@ -2010,8 +2010,8 @@ 
 				$node->document_count
 			);
 
-			if($child_buff) $buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
-			else $buff .=  sprintf('<node %s />', $attribute);
+			if ($child_buff) $buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
+			else $buff .= sprintf('<node %s />', $attribute);
 		}
 		return $buff;
 	}
@@ -2030,13 +2030,13 @@ 
 	function getPhpCacheCode($source_node, $tree, $site_srl, &$php_header_buff)
 	{
 		$output = array("buff"=>"", "category_srl_list"=>array());
-		if(!$source_node) return $output;
+		if (!$source_node) return $output;
 
 		// Set to an arraty for looping and then generate php script codes to be included
-		foreach($source_node as $category_srl => $node)
+		foreach ($source_node as $category_srl => $node)
 		{
 			// Get data from child nodes first if exist.
-			if($category_srl && $tree[$category_srl]){
+			if ($category_srl && $tree[$category_srl]) {
 				$child_output = $this->getPhpCacheCode($tree[$category_srl], $tree, $site_srl, $php_header_buff);
 			} else {
 				$child_output = array("buff"=>"", "category_srl_list"=>array());
@@ -2047,14 +2047,14 @@ 
 			$output['category_srl_list'] = array_merge($output['category_srl_list'], $child_output['category_srl_list']);
 
 			// If node->group_srls value exists
-			if($node->group_srls) {
-				$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s)))))',$node->group_srls);
+			if ($node->group_srls) {
+				$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s)))))', $node->group_srls);
 			} else {
 				$group_check_code = "true";
 			}
 
 			// List variables
-			$selected = '"' . implode('","', $child_output['category_srl_list']) . '"';
+			$selected = '"'.implode('","', $child_output['category_srl_list']).'"';
 			$child_buff = $child_output['buff'];
 			$expand = $node->expand;
 
@@ -2063,32 +2063,32 @@ 
 			$oModuleAdminModel = getAdminModel('module');
 			$langs = $oModuleAdminModel->getLangCode($site_srl, $title);
 
-			if(count($langs))
+			if (count($langs))
 			{
-				foreach($langs as $key => $val)
+				foreach ($langs as $key => $val)
 				{
 					$val = htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 					$php_header_buff .= sprintf(
 						'$_titles[%d]["%s"] = "%s"; ',
 						$category_srl,
 						$key,
-						str_replace('"','\\"', $val)
+						str_replace('"', '\\"', $val)
 					);
 				}
 			}
 
 			$langx = $oModuleAdminModel->getLangCode($site_srl, $description);
 
-			if(count($langx))
+			if (count($langx))
 			{
-				foreach($langx as $key => $val)
+				foreach ($langx as $key => $val)
 				{
 					$val = htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 					$php_header_buff .= sprintf(
 						'$_descriptions[%d]["%s"] = "%s"; ',
 						$category_srl,
 						$key,
-						str_replace('"','\\"', $val)
+						str_replace('"', '\\"', $val)
 					);
 				}
 			}
@@ -2112,7 +2112,7 @@ 
 			);
 
 			// Generate buff data
-			$output['buff'] .=  sprintf('%s=>array(%s),', $node->category_srl, $attribute);
+			$output['buff'] .= sprintf('%s=>array(%s),', $node->category_srl, $attribute);
 		}
 
 		return $output;
@@ -2129,7 +2129,7 @@ 
 	function addDocumentPopupMenu($url, $str, $icon = '', $target = 'self')
 	{
 		$document_popup_menu_list = Context::get('document_popup_menu_list');
-		if(!is_array($document_popup_menu_list)) $document_popup_menu_list = array();
+		if (!is_array($document_popup_menu_list)) $document_popup_menu_list = array();
 
 		$obj = new stdClass();
 		$obj->url = $url;
@@ -2147,68 +2147,68 @@ 
 	 */
 	function procDocumentAddCart()
 	{
-		if(!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
 
 		// Get document_srl
-		$srls = explode(',',Context::get('srls'));
-		for($i = 0; $i < count($srls); $i++)
+		$srls = explode(',', Context::get('srls'));
+		for ($i = 0; $i < count($srls); $i++)
 		{
 			$srl = trim($srls[$i]);
 
-			if(!$srl) continue;
+			if (!$srl) continue;
 
 			$document_srls[] = $srl;
 		}
-		if(!count($document_srls)) return;
+		if (!count($document_srls)) return;
 
 		// Get module_srl of the documents
 		$args = new stdClass;
 		$args->list_count = count($document_srls);
-		$args->document_srls = implode(',',$document_srls);
+		$args->document_srls = implode(',', $document_srls);
 		$args->order_type = 'asc';
 		$output = executeQueryArray('document.getDocuments', $args);
-		if(!$output->data) return new Object();
+		if (!$output->data) return new Object();
 
 		unset($document_srls);
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			$document_srls[$val->module_srl][] = $val->document_srl;
 		}
-		if(!$document_srls || !count($document_srls)) return new Object();
+		if (!$document_srls || !count($document_srls)) return new Object();
 
 		// Check if each of module administrators exists. Top-level administator will have a permission to modify every document of all modules.(Even to modify temporarily saved or trashed documents)
 		$oModuleModel = getModel('module');
 		$module_srls = array_keys($document_srls);
-		for($i=0;$i<count($module_srls);$i++)
+		for ($i = 0; $i < count($module_srls); $i++)
 		{
 			$module_srl = $module_srls[$i];
 			$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
 			$logged_info = Context::get('logged_info');
-			if($logged_info->is_admin != 'Y')
+			if ($logged_info->is_admin != 'Y')
 			{
-				if(!$module_info)
+				if (!$module_info)
 				{
 					unset($document_srls[$module_srl]);
 					continue;
 				}
 				$grant = $oModuleModel->getGrant($module_info, $logged_info);
-				if(!$grant->manager)
+				if (!$grant->manager)
 				{
 					unset($document_srls[$module_srl]);
 					continue;
 				}
 			}
 		}
-		if(!count($document_srls)) return new Object();
+		if (!count($document_srls)) return new Object();
 
-		foreach($document_srls as $module_srl => $documents)
+		foreach ($document_srls as $module_srl => $documents)
 		{
 			$cnt = count($documents);
-			for($i=0;$i<$cnt;$i++)
+			for ($i = 0; $i < $cnt; $i++)
 			{
-				$document_srl = (int)trim($documents[$i]);
-				if(!$document_srls) continue;
-				if($_SESSION['document_management'][$document_srl]) unset($_SESSION['document_management'][$document_srl]);
+				$document_srl = (int) trim($documents[$i]);
+				if (!$document_srls) continue;
+				if ($_SESSION['document_management'][$document_srl]) unset($_SESSION['document_management'][$document_srl]);
 				else $_SESSION['document_management'][$document_srl] = true;
 			}
 		}
@@ -2221,9 +2221,9 @@ 
 	function procDocumentManageCheckedDocument()
 	{
 		@set_time_limit(0);
-		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
 
-		if(!checkCSRF())
+		if (!checkCSRF())
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -2231,44 +2231,44 @@ 
 		$type = Context::get('type');
 		$target_module = Context::get('target_module');
 		$module_srl = Context::get('module_srl');
-		if($target_module && !$module_srl) $module_srl = $target_module;
+		if ($target_module && !$module_srl) $module_srl = $target_module;
 		$category_srl = Context::get('target_category');
 		$message_content = Context::get('message_content');
-		if($message_content) $message_content = nl2br($message_content);
+		if ($message_content) $message_content = nl2br($message_content);
 
 		$cart = Context::get('cart');
-		if(!is_array($cart)) $document_srl_list = explode('|@|', $cart);
+		if (!is_array($cart)) $document_srl_list = explode('|@|', $cart);
 		else $document_srl_list = $cart;
 
 		$document_srl_count = count($document_srl_list);
 
 		$oDocumentModel = getModel('document');
 		$document_items = array();
-		foreach($document_srl_list as $document_srl)
+		foreach ($document_srl_list as $document_srl)
 		{
 			$oDocument = $oDocumentModel->getDocument($document_srl);
 			$document_items[] = $oDocument;
-			if(!$oDocument->isGranted()) return $this->stop('msg_not_permitted');
+			if (!$oDocument->isGranted()) return $this->stop('msg_not_permitted');
 		}
 
 		// Send a message
-		if($message_content)
+		if ($message_content)
 		{
 
 			$oCommunicationController = getController('communication');
 
 			$logged_info = Context::get('logged_info');
 
-			$title = cut_str($message_content,10,'...');
+			$title = cut_str($message_content, 10, '...');
 			$sender_member_srl = $logged_info->member_srl;
 
-			foreach($document_items as $oDocument)
+			foreach ($document_items as $oDocument)
 			{
-				if(!$oDocument->get('member_srl') || $oDocument->get('member_srl')==$sender_member_srl) continue;
+				if (!$oDocument->get('member_srl') || $oDocument->get('member_srl') == $sender_member_srl) continue;
 
-				if($type=='move') $purl = sprintf("<a href=\"%s\" onclick=\"window.open(this.href);return false;\">%s</a>", $oDocument->getPermanentUrl(), $oDocument->getPermanentUrl());
+				if ($type == 'move') $purl = sprintf("<a href=\"%s\" onclick=\"window.open(this.href);return false;\">%s</a>", $oDocument->getPermanentUrl(), $oDocument->getPermanentUrl());
 				else $purl = "";
-				$content = sprintf("<div>%s</div><hr />%s<div style=\"font-weight:bold\">%s</div>%s",$message_content, $purl, $oDocument->getTitleText(), $oDocument->getContent(false, false, false));
+				$content = sprintf("<div>%s</div><hr />%s<div style=\"font-weight:bold\">%s</div>%s", $message_content, $purl, $oDocument->getTitleText(), $oDocument->getContent(false, false, false));
 
 				$oCommunicationController->sendMessage($sender_member_srl, $oDocument->get('member_srl'), $title, $content, false);
 			}
@@ -2278,54 +2278,54 @@ 
 		$oSpamController->setAvoidLog();
 
 		$oDocumentAdminController = getAdminController('document');
-		if($type == 'move')
+		if ($type == 'move')
 		{
-			if(!$module_srl) return new Object(-1, 'fail_to_move');
+			if (!$module_srl) return new Object(-1, 'fail_to_move');
 
 			$output = $oDocumentAdminController->moveDocumentModule($document_srl_list, $module_srl, $category_srl);
-			if(!$output->toBool()) return new Object(-1, 'fail_to_move');
+			if (!$output->toBool()) return new Object(-1, 'fail_to_move');
 
 			$msg_code = 'success_moved';
 
 		}
-		else if($type == 'copy')
+		else if ($type == 'copy')
 		{
-			if(!$module_srl) return new Object(-1, 'fail_to_move');
+			if (!$module_srl) return new Object(-1, 'fail_to_move');
 
 			$output = $oDocumentAdminController->copyDocumentModule($document_srl_list, $module_srl, $category_srl);
-			if(!$output->toBool()) return new Object(-1, 'fail_to_move');
+			if (!$output->toBool()) return new Object(-1, 'fail_to_move');
 
 			$msg_code = 'success_copied';
 		}
-		else if($type =='delete')
+		else if ($type == 'delete')
 		{
 			$oDB = &DB::getInstance();
 			$oDB->begin();
-			for($i=0;$i<$document_srl_count;$i++)
+			for ($i = 0; $i < $document_srl_count; $i++)
 			{
 				$document_srl = $document_srl_list[$i];
 				$output = $this->deleteDocument($document_srl, true);
-				if(!$output->toBool()) return new Object(-1, 'fail_to_delete');
+				if (!$output->toBool()) return new Object(-1, 'fail_to_delete');
 			}
 			$oDB->commit();
 			$msg_code = 'success_deleted';
 		}
-		else if($type == 'trash')
+		else if ($type == 'trash')
 		{
 			$args = new stdClass();
 			$args->description = $message_content;
 
 			$oDB = &DB::getInstance();
 			$oDB->begin();
-			for($i=0;$i<$document_srl_count;$i++) {
+			for ($i = 0; $i < $document_srl_count; $i++) {
 				$args->document_srl = $document_srl_list[$i];
 				$output = $this->moveDocumentToTrash($args);
-				if(!$output || !$output->toBool()) return new Object(-1, 'fail_to_trash');
+				if (!$output || !$output->toBool()) return new Object(-1, 'fail_to_trash');
 			}
 			$oDB->commit();
 			$msg_code = 'success_trashed';
 		}
-		else if($type == 'cancelDeclare')
+		else if ($type == 'cancelDeclare')
 		{
 			$args->document_srl = $document_srl_list;
 			$output = executeQuery('document.deleteDeclaredDocuments', $args);
@@ -2347,27 +2347,27 @@ 
 	function procDocumentInsertModuleConfig()
 	{
 		$module_srl = Context::get('target_module_srl');
-		if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
+		if (preg_match('/^([0-9,]+)$/', $module_srl)) $module_srl = explode(',', $module_srl);
 		else $module_srl = array($module_srl);
 
 		$document_config = new stdClass();
 		$document_config->use_history = Context::get('use_history');
-		if(!$document_config->use_history) $document_config->use_history = 'N';
+		if (!$document_config->use_history) $document_config->use_history = 'N';
 
 		$document_config->use_vote_up = Context::get('use_vote_up');
-		if(!$document_config->use_vote_up) $document_config->use_vote_up = 'Y';
+		if (!$document_config->use_vote_up) $document_config->use_vote_up = 'Y';
 
 		$document_config->use_vote_down = Context::get('use_vote_down');
-		if(!$document_config->use_vote_down) $document_config->use_vote_down = 'Y';
+		if (!$document_config->use_vote_down) $document_config->use_vote_down = 'Y';
 
 		$document_config->use_status = Context::get('use_status');
 
 		$oModuleController = getController('module');
-		for($i=0;$i<count($module_srl);$i++)
+		for ($i = 0; $i < count($module_srl); $i++)
 		{
 			$srl = trim($module_srl[$i]);
-			if(!$srl) continue;
-			$output = $oModuleController->insertModulePartConfig('document',$srl,$document_config);
+			if (!$srl) continue;
+			$output = $oModuleController->insertModulePartConfig('document', $srl, $document_config);
 		}
 		$this->setError(-1);
 		$this->setMessage('success_updated', 'info');
@@ -2383,7 +2383,7 @@ 
 	function procDocumentTempSave()
 	{
 		// Check login information
-		if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
 		$module_info = Context::get('module_info');
 		$logged_info = Context::get('logged_info');
 
@@ -2395,7 +2395,7 @@ 
 		unset($obj->is_notice);
 
 		// Extract from beginning part of contents in the guestbook
-		if(!$obj->title)
+		if (!$obj->title)
 		{
 			$obj->title = cut_str(strip_tags($obj->content), 20, '...');
 		}
@@ -2406,13 +2406,13 @@ 
 		$oDocument = $oDocumentModel->getDocument($obj->document_srl, $this->grant->manager);
 
 		// Update if already exists
-		if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
+		if ($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
 		{
-			if($oDocument->get('module_srl') != $obj->module_srl)
+			if ($oDocument->get('module_srl') != $obj->module_srl)
 			{
 				return new Object(-1, 'msg_invalid_request');
 			}
-			if(!$oDocument->isGranted())
+			if (!$oDocument->isGranted())
 			{
 				return new Object(-1, 'msg_invalid_request');
 			}
@@ -2430,7 +2430,7 @@ 
 			$oDocument = $oDocumentModel->getDocument($obj->document_srl, $this->grant->manager);
 		}
 		// Set the attachment to be invalid state
-		if($oDocument->hasUploadedFiles())
+		if ($oDocument->hasUploadedFiles())
 		{
 			$args = new stdClass;
 			$args->upload_target_srl = $oDocument->document_srl;
@@ -2448,11 +2448,11 @@ 
 	 */
 	function procDocumentGetList()
 	{
-		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
 		$documentSrls = Context::get('document_srls');
-		if($documentSrls) $documentSrlList = explode(',', $documentSrls);
+		if ($documentSrls) $documentSrlList = explode(',', $documentSrls);
 
-		if(count($documentSrlList) > 0)
+		if (count($documentSrlList) > 0)
 		{
 			$oDocumentModel = getModel('document');
 			$columnList = array('document_srl', 'title', 'nick_name', 'status');
@@ -2476,10 +2476,10 @@ 
 	 */
 	function _checkCommentStatusForOldVersion(&$obj)
 	{
-		if(!isset($obj->allow_comment)) $obj->allow_comment = 'N';
-		if(!isset($obj->lock_comment)) $obj->lock_comment = 'N';
+		if (!isset($obj->allow_comment)) $obj->allow_comment = 'N';
+		if (!isset($obj->lock_comment)) $obj->lock_comment = 'N';
 
-		if($obj->allow_comment == 'Y' && $obj->lock_comment == 'N') $obj->commentStatus = 'ALLOW';
+		if ($obj->allow_comment == 'Y' && $obj->lock_comment == 'N') $obj->commentStatus = 'ALLOW';
 		else $obj->commentStatus = 'DENY';
 	}
 
@@ -2490,8 +2490,8 @@ 
 	 */
 	function _checkDocumentStatusForOldVersion(&$obj)
 	{
-		if(!$obj->status && $obj->is_secret == 'Y') $obj->status = $this->getConfigStatus('secret');
-		if(!$obj->status && $obj->is_secret != 'Y') $obj->status = $this->getConfigStatus('public');
+		if (!$obj->status && $obj->is_secret == 'Y') $obj->status = $this->getConfigStatus('secret');
+		if (!$obj->status && $obj->is_secret != 'Y') $obj->status = $this->getConfigStatus('public');
 	}
 
 	public function updateUploaedCount($documentSrlList)
@@ -2499,10 +2499,10 @@ 
 		$oDocumentModel = getModel('document');
 		$oFileModel = getModel('file');
 
-		if(is_array($documentSrlList))
+		if (is_array($documentSrlList))
 		{
 			$documentSrlList = array_unique($documentSrlList);
-			foreach($documentSrlList AS $key => $documentSrl)
+			foreach ($documentSrlList AS $key => $documentSrl)
 			{
 				$fileCount = $oFileModel->getFilesCount($documentSrl);
 				$args = new stdClass();
@@ -2523,14 +2523,14 @@ 
 		$oDocumentModel = getModel('document');
 		$documentExtraKeys = $oDocumentModel->getExtraKeys($obj->originModuleSrl);
 
-		if(is_array($documentExtraKeys) && is_array($obj->moduleSrlList))
+		if (is_array($documentExtraKeys) && is_array($obj->moduleSrlList))
 		{
-			$oDocumentController=getController('document');
-			foreach($obj->moduleSrlList AS $key=>$value)
+			$oDocumentController = getController('document');
+			foreach ($obj->moduleSrlList AS $key=>$value)
 			{
-				foreach($documentExtraKeys AS $extraItem)
+				foreach ($documentExtraKeys AS $extraItem)
 				{
-					$oDocumentController->insertDocumentExtraKey($value, $extraItem->idx, $extraItem->name, $extraItem->type, $extraItem->is_required , $extraItem->search , $extraItem->default , $extraItem->desc, $extraItem->eid) ;
+					$oDocumentController->insertDocumentExtraKey($value, $extraItem->idx, $extraItem->name, $extraItem->type, $extraItem->is_required, $extraItem->search, $extraItem->default, $extraItem->desc, $extraItem->eid);
 				}
 			}
 		}
@@ -2542,9 +2542,9 @@ 
 		$documentConfig = $oModuleModel->getModulePartConfig('document', $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('document', $moduleSrl, $documentConfig);
 			}

Braces +535 added lines, -216 removed lines

@@ -24,19 +24,27 @@ 
 	 */
 	function procDocumentVoteUp()
 	{
-		if(!Context::get('is_logged')) return new Object(-1, 'msg_invalid_request');
+		if(!Context::get('is_logged')) {
+			return new Object(-1, 'msg_invalid_request');
+		}
 
 		$document_srl = Context::get('target_srl');
-		if(!$document_srl) return new Object(-1, 'msg_invalid_request');
+		if(!$document_srl) {
+			return new Object(-1, 'msg_invalid_request');
+		}
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
 		$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($document_config->use_vote_up=='N') return new Object(-1, 'msg_invalid_request');
+		if($document_config->use_vote_up=='N') {
+			return new Object(-1, 'msg_invalid_request');
+		}
 
 		$point = 1;
 		$output = $this->updateVotedCount($document_srl, $point);
@@ -69,19 +77,27 @@ 
 	 */
 	function procDocumentVoteDown()
 	{
-		if(!Context::get('is_logged')) return new Object(-1, 'msg_invalid_request');
+		if(!Context::get('is_logged')) {
+			return new Object(-1, 'msg_invalid_request');
+		}
 
 		$document_srl = Context::get('target_srl');
-		if(!$document_srl) return new Object(-1, 'msg_invalid_request');
+		if(!$document_srl) {
+			return new Object(-1, 'msg_invalid_request');
+		}
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
 		$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($document_config->use_vote_down=='N') return new Object(-1, 'msg_invalid_request');
+		if($document_config->use_vote_down=='N') {
+			return new Object(-1, 'msg_invalid_request');
+		}
 
 		$point = -1;
 		$output = $this->updateVotedCount($document_srl, $point);
@@ -95,10 +111,14 @@ 
 	 */
 	function procDocumentDeclare()
 	{
-		if(!Context::get('is_logged')) return new Object(-1, 'msg_invalid_request');
+		if(!Context::get('is_logged')) {
+			return new Object(-1, 'msg_invalid_request');
+		}
 
 		$document_srl = Context::get('target_srl');
-		if(!$document_srl) return new Object(-1, 'msg_invalid_request');
+		if(!$document_srl) {
+			return new Object(-1, 'msg_invalid_request');
+		}
 
 		return $this->declaredDocument($document_srl);
 	}
@@ -140,7 +160,9 @@ 
 		$args->history_srl = $history_srl;
 		$args->module_srl = $module_srl;
 		$args->document_srl = $document_srl;
-		if(!$args->history_srl && !$args->module_srl && !$args->document_srl) return;
+		if(!$args->history_srl && !$args->module_srl && !$args->document_srl) {
+			return;
+		}
 		executeQuery("document.deleteHistory", $args);
 	}
 
@@ -152,15 +174,21 @@ 
 	function triggerDeleteModuleDocuments(&$obj)
 	{
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new Object();
+		if(!$module_srl) {
+			return new Object();
+		}
 		// Delete the document
 		$oDocumentAdminController = getAdminController('document');
 		$output = $oDocumentAdminController->deleteModuleDocument($module_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Delete the category
 		$oDocumentController = getController('document');
 		$output = $oDocumentController->deleteModuleCategory($module_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Delete extra key and variable, because module deleted
 		$this->deleteDocumentExtraKeys($module_srl);
 
@@ -202,10 +230,18 @@ 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 		// List variables
-		if($obj->comment_status) $obj->commentStatus = $obj->comment_status;
-		if(!$obj->commentStatus) $obj->commentStatus = 'DENY';
-		if($obj->commentStatus == 'DENY') $this->_checkCommentStatusForOldVersion($obj);
-		if($obj->allow_trackback!='Y') $obj->allow_trackback = 'N';
+		if($obj->comment_status) {
+			$obj->commentStatus = $obj->comment_status;
+		}
+		if(!$obj->commentStatus) {
+			$obj->commentStatus = 'DENY';
+		}
+		if($obj->commentStatus == 'DENY') {
+			$this->_checkCommentStatusForOldVersion($obj);
+		}
+		if($obj->allow_trackback!='Y') {
+			$obj->allow_trackback = 'N';
+		}
 		if($obj->homepage) 
 		{
 			$obj->homepage = removeHackTag($obj->homepage);
@@ -215,9 +251,15 @@ 
 			}
 		}
 		
-		if($obj->notify_message != 'Y') $obj->notify_message = 'N';
-		if(!$obj->email_address) $obj->email_address = '';
-		if(!$isRestore) $obj->ipaddress = $_SERVER['REMOTE_ADDR'];
+		if($obj->notify_message != 'Y') {
+			$obj->notify_message = 'N';
+		}
+		if(!$obj->email_address) {
+			$obj->email_address = '';
+		}
+		if(!$isRestore) {
+			$obj->ipaddress = $_SERVER['REMOTE_ADDR'];
+		}
 
                 // can modify regdate only manager
                 $grant = Context::get('grant');
@@ -227,7 +269,9 @@ 
 		}
 		
 		// Serialize the $extra_vars, check the extra_vars type, because duplicate serialized avoid
-		if(!is_string($obj->extra_vars)) $obj->extra_vars = serialize($obj->extra_vars);
+		if(!is_string($obj->extra_vars)) {
+			$obj->extra_vars = serialize($obj->extra_vars);
+		}
 		// Remove the columns for automatic saving
 		unset($obj->_saved_doc_srl);
 		unset($obj->_saved_doc_title);
@@ -235,10 +279,15 @@ 
 		unset($obj->_saved_doc_message);
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('document.insertDocument', 'before', $obj);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Register it if no given document_srl exists
-		if(!$obj->document_srl) $obj->document_srl = getNextSequence();
-		elseif(!$manual_inserted && !$isRestore && !checkUserSequence($obj->document_srl)) return new Object(-1, 'msg_not_permitted');
+		if(!$obj->document_srl) {
+			$obj->document_srl = getNextSequence();
+		} elseif(!$manual_inserted && !$isRestore && !checkUserSequence($obj->document_srl)) {
+			return new Object(-1, 'msg_not_permitted');
+		}
 
 		$oDocumentModel = getModel('document');
 		// Set to 0 if the category_srl doesn't exist
@@ -249,12 +298,19 @@ 
 			{
 				return new Object(-1, 'msg_not_permitted');
 			}
-			if(count($category_list) > 0 && !$category_list[$obj->category_srl]) $obj->category_srl = 0;
+			if(count($category_list) > 0 && !$category_list[$obj->category_srl]) {
+				$obj->category_srl = 0;
+			}
 		}
 		// Set the read counts and update order.
-		if(!$obj->readed_count) $obj->readed_count = 0;
-		if($isLatest) $obj->update_order = $obj->list_order = $obj->document_srl * -1;
-		else $obj->update_order = $obj->list_order;
+		if(!$obj->readed_count) {
+			$obj->readed_count = 0;
+		}
+		if($isLatest) {
+			$obj->update_order = $obj->list_order = $obj->document_srl * -1;
+		} else {
+			$obj->update_order = $obj->list_order;
+		}
 		// Check the status of password hash for manually inserting. Apply hashing for otherwise.
 		if($obj->password && !$obj->password_is_hashed)
 		{
@@ -276,9 +332,13 @@ 
 		// If the tile is empty, extract string from the contents.
 		$obj->title = htmlspecialchars($obj->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		settype($obj->title, "string");
-		if($obj->title == '') $obj->title = cut_str(trim(strip_tags(nl2br($obj->content))),20,'...');
+		if($obj->title == '') {
+			$obj->title = cut_str(trim(strip_tags(nl2br($obj->content))),20,'...');
+		}
 		// If no tile extracted from the contents, leave it untitled.
-		if($obj->title == '') $obj->title = 'Untitled';
+		if($obj->title == '') {
+			$obj->title = 'Untitled';
+		}
 		// Remove XE's own tags from the contents.
 		$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
 		if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
@@ -290,13 +350,19 @@ 
 			$obj->content = nl2br($obj->content);
 		}
 		// Remove iframe and script if not a top adminisrator in the session.
-		if($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content);
+		if($logged_info->is_admin != 'Y') {
+			$obj->content = removeHackTag($obj->content);
+		}
 		// An error appears if both log-in info and user name don't exist.
-		if(!$logged_info->member_srl && !$obj->nick_name) return new Object(-1,'msg_invalid_request');
+		if(!$logged_info->member_srl && !$obj->nick_name) {
+			return new Object(-1,'msg_invalid_request');
+		}
 
 		$obj->lang_code = Context::getLangType();
 		// Insert data into the DB
-		if(!$obj->status) $this->_checkDocumentStatusForOldVersion($obj);
+		if(!$obj->status) {
+			$this->_checkDocumentStatusForOldVersion($obj);
+		}
 		$output = executeQuery('document.insertDocument', $obj);
 		if(!$output->toBool())
 		{
@@ -313,19 +379,25 @@ 
 				if(isset($obj->{'extra_vars'.$idx}))
 				{
 					$tmp = $obj->{'extra_vars'.$idx};
-					if(is_array($tmp))
-						$value = implode('|@|', $tmp);
-					else
-						$value = trim($tmp);
+					if(is_array($tmp)) {
+											$value = implode('|@|', $tmp);
+					} else {
+											$value = trim($tmp);
+					}
+				} else if(isset($obj->{$extra_item->name})) {
+					$value = trim($obj->{$extra_item->name});
+				}
+				if($value == NULL) {
+					continue;
 				}
-				else if(isset($obj->{$extra_item->name})) $value = trim($obj->{$extra_item->name});
-				if($value == NULL) continue;
 
 				$this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, $idx, $value, $extra_item->eid);
 			}
 		}
 		// Update the category if the category_srl exists.
-		if($obj->category_srl) $this->updateCategoryCount($obj->module_srl, $obj->category_srl);
+		if($obj->category_srl) {
+			$this->updateCategoryCount($obj->module_srl, $obj->category_srl);
+		}
 		// Call a trigger (after)
 		if($output->toBool())
 		{
@@ -367,27 +439,39 @@ 
 			return new Object(-1, 'msg_invalid_request');
 		}
 
-		if(!$source_obj->document_srl || !$obj->document_srl) return new Object(-1,'msg_invalied_request');
-		if(!$obj->status && $obj->is_secret == 'Y') $obj->status = 'SECRET';
-		if(!$obj->status) $obj->status = 'PUBLIC';
+		if(!$source_obj->document_srl || !$obj->document_srl) {
+			return new Object(-1,'msg_invalied_request');
+		}
+		if(!$obj->status && $obj->is_secret == 'Y') {
+			$obj->status = 'SECRET';
+		}
+		if(!$obj->status) {
+			$obj->status = 'PUBLIC';
+		}
 
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('document.updateDocument', 'before', $obj);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// begin transaction
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 
 		$oModuleModel = getModel('module');
-		if(!$obj->module_srl) $obj->module_srl = $source_obj->get('module_srl');
+		if(!$obj->module_srl) {
+			$obj->module_srl = $source_obj->get('module_srl');
+		}
 		$module_srl = $obj->module_srl;
 		$document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
 		if(!$document_config)
 		{
 			$document_config = new stdClass();
 		}
-		if(!isset($document_config->use_history)) $document_config->use_history = 'N';
+		if(!isset($document_config->use_history)) {
+			$document_config->use_history = 'N';
+		}
 		$bUseHistory = $document_config->use_history == 'Y' || $document_config->use_history == 'Trace';
 
 		if($bUseHistory)
@@ -396,22 +480,31 @@ 
 			$args->history_srl = getNextSequence();
 			$args->document_srl = $obj->document_srl;
 			$args->module_srl = $module_srl;
-			if($document_config->use_history == 'Y') $args->content = $source_obj->get('content');
+			if($document_config->use_history == 'Y') {
+				$args->content = $source_obj->get('content');
+			}
 			$args->nick_name = $source_obj->get('nick_name');
 			$args->member_srl = $source_obj->get('member_srl');
 			$args->regdate = $source_obj->get('last_update');
 			$args->ipaddress = $source_obj->get('ipaddress');
 			$output = executeQuery("document.insertHistory", $args);
-		}
-		else
+		} else
 		{
 			$obj->ipaddress = $source_obj->get('ipaddress');
 		}
 		// List variables
-		if($obj->comment_status) $obj->commentStatus = $obj->comment_status;
-		if(!$obj->commentStatus) $obj->commentStatus = 'DENY';
-		if($obj->commentStatus == 'DENY') $this->_checkCommentStatusForOldVersion($obj);
-		if($obj->allow_trackback!='Y') $obj->allow_trackback = 'N';
+		if($obj->comment_status) {
+			$obj->commentStatus = $obj->comment_status;
+		}
+		if(!$obj->commentStatus) {
+			$obj->commentStatus = 'DENY';
+		}
+		if($obj->commentStatus == 'DENY') {
+			$this->_checkCommentStatusForOldVersion($obj);
+		}
+		if($obj->allow_trackback!='Y') {
+			$obj->allow_trackback = 'N';
+		}
 		if($obj->homepage)
 		{
 			$obj->homepage = removeHackTag($obj->homepage);
@@ -421,7 +514,9 @@ 
 			}
 		}
 		
-		if($obj->notify_message != 'Y') $obj->notify_message = 'N';
+		if($obj->notify_message != 'Y') {
+			$obj->notify_message = 'N';
+		}
 		
 		// can modify regdate only manager
                 $grant = Context::get('grant');
@@ -431,7 +526,9 @@ 
 		}
 		
 		// Serialize the $extra_vars
-		if(!is_string($obj->extra_vars)) $obj->extra_vars = serialize($obj->extra_vars);
+		if(!is_string($obj->extra_vars)) {
+			$obj->extra_vars = serialize($obj->extra_vars);
+		}
 		// Remove the columns for automatic saving
 		unset($obj->_saved_doc_srl);
 		unset($obj->_saved_doc_title);
@@ -443,7 +540,9 @@ 
 		if($source_obj->get('category_srl')!=$obj->category_srl)
 		{
 			$category_list = $oDocumentModel->getCategoryList($obj->module_srl);
-			if(!$category_list[$obj->category_srl]) $obj->category_srl = 0;
+			if(!$category_list[$obj->category_srl]) {
+				$obj->category_srl = 0;
+			}
 		}
 		// Change the update order
 		$obj->update_order = getNextSequence() * -1;
@@ -478,9 +577,13 @@ 
 		// If the tile is empty, extract string from the contents.
 		$obj->title = htmlspecialchars($obj->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		settype($obj->title, "string");
-		if($obj->title == '') $obj->title = cut_str(strip_tags($obj->content),20,'...');
+		if($obj->title == '') {
+			$obj->title = cut_str(strip_tags($obj->content),20,'...');
+		}
 		// If no tile extracted from the contents, leave it untitled.
-		if($obj->title == '') $obj->title = 'Untitled';
+		if($obj->title == '') {
+			$obj->title = 'Untitled';
+		}
 		// Remove XE's own tags from the contents.
 		$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
 		if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
@@ -500,8 +603,7 @@ 
 				$lang_code_args->document_srl = $source_obj->get('document_srl');
 				$lang_code_args->lang_code = Context::getLangType();
 				$output = executeQuery('document.updateDocumentsLangCode', $lang_code_args);
-			}
-			else
+			} else
 			{
 				$extra_content = new stdClass;
 				$extra_content->title = $obj->title;
@@ -520,7 +622,9 @@ 
 			$obj->content = removeHackTag($obj->content);
 		}
 		// if temporary document, regdate is now setting
-		if($source_obj->get('status') == $this->getConfigStatus('temp')) $obj->regdate = date('YmdHis');
+		if($source_obj->get('status') == $this->getConfigStatus('temp')) {
+			$obj->regdate = date('YmdHis');
+		}
 
 		// Insert data into the DB
 		$output = executeQuery('document.updateDocument', $obj);
@@ -543,25 +647,37 @@ 
 					if(isset($obj->{'extra_vars'.$idx}))
 					{
 						$tmp = $obj->{'extra_vars'.$idx};
-						if(is_array($tmp))
-							$value = implode('|@|', $tmp);
-						else
-							$value = trim($tmp);
+						if(is_array($tmp)) {
+													$value = implode('|@|', $tmp);
+						} else {
+													$value = trim($tmp);
+						}
+					} else if(isset($obj->{$extra_item->name})) {
+						$value = trim($obj->{$extra_item->name});
+					}
+					if($value == NULL) {
+						continue;
 					}
-					else if(isset($obj->{$extra_item->name})) $value = trim($obj->{$extra_item->name});
-					if($value == NULL) continue;
 					$this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, $idx, $value, $extra_item->eid);
 				}
 			}
 			// Inert extra vars for multi-language support of title and contents.
-			if($extra_content->title) $this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -1, $extra_content->title, 'title_'.Context::getLangType());
-			if($extra_content->content) $this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -2, $extra_content->content, 'content_'.Context::getLangType());
+			if($extra_content->title) {
+				$this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -1, $extra_content->title, 'title_'.Context::getLangType());
+			}
+			if($extra_content->content) {
+				$this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -2, $extra_content->content, 'content_'.Context::getLangType());
+			}
 		}
 		// Update the category if the category_srl exists.
 		if($source_obj->get('category_srl') != $obj->category_srl || $source_obj->get('module_srl') == $logged_info->member_srl)
 		{
-			if($source_obj->get('category_srl') != $obj->category_srl) $this->updateCategoryCount($obj->module_srl, $source_obj->get('category_srl'));
-			if($obj->category_srl) $this->updateCategoryCount($obj->module_srl, $obj->category_srl);
+			if($source_obj->get('category_srl') != $obj->category_srl) {
+				$this->updateCategoryCount($obj->module_srl, $source_obj->get('category_srl'));
+			}
+			if($obj->category_srl) {
+				$this->updateCategoryCount($obj->module_srl, $obj->category_srl);
+			}
 		}
 		// Call a trigger (after)
 		if($output->toBool())
@@ -606,7 +722,9 @@ 
 		$trigger_obj = new stdClass();
 		$trigger_obj->document_srl = $document_srl;
 		$output = ModuleHandler::triggerCall('document.deleteDocument', 'before', $trigger_obj);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// begin transaction
 		$oDB = &DB::getInstance();
@@ -618,12 +736,17 @@ 
 			$oDocumentModel = getModel('document');
 			// Check if the documnet exists
 			$oDocument = $oDocumentModel->getDocument($document_srl, $is_admin);
+		} else if($isEmptyTrash && $oDocument == null) {
+			return new Object(-1, 'document is not exists');
 		}
-		else if($isEmptyTrash && $oDocument == null) return new Object(-1, 'document is not exists');
 
-		if(!$oDocument->isExists() || $oDocument->document_srl != $document_srl) return new Object(-1, 'msg_invalid_document');
+		if(!$oDocument->isExists() || $oDocument->document_srl != $document_srl) {
+			return new Object(-1, 'msg_invalid_document');
+		}
 		// Check if a permossion is granted
-		if(!$oDocument->isGranted()) return new Object(-1, 'msg_not_permitted');
+		if(!$oDocument->isGranted()) {
+			return new Object(-1, 'msg_not_permitted');
+		}
 
 		//if empty trash, document already deleted, therefore document not delete
 		$args = new stdClass();
@@ -643,7 +766,9 @@ 
 
 		$this->deleteDocumentHistory(null, $document_srl, null);
 		// Update category information if the category_srl exists.
-		if($oDocument->get('category_srl')) $this->updateCategoryCount($oDocument->get('module_srl'),$oDocument->get('category_srl'));
+		if($oDocument->get('category_srl')) {
+			$this->updateCategoryCount($oDocument->get('module_srl'),$oDocument->get('category_srl'));
+		}
 		// Delete a declared list
 		executeQuery('document.deleteDeclared', $args);
 		// Delete extra variable
@@ -723,8 +848,11 @@ 
 	{
 		$trash_args = new stdClass();
 		// Get trash_srl if a given trash_srl doesn't exist
-		if(!$obj->trash_srl) $trash_args->trash_srl = getNextSequence();
-		else $trash_args->trash_srl = $obj->trash_srl;
+		if(!$obj->trash_srl) {
+			$trash_args->trash_srl = getNextSequence();
+		} else {
+			$trash_args->trash_srl = $obj->trash_srl;
+		}
 		// Get its module_srl which the document belongs to
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($obj->document_srl);
@@ -732,7 +860,9 @@ 
 		$trash_args->module_srl = $oDocument->get('module_srl');
 		$obj->module_srl = $oDocument->get('module_srl');
 		// Cannot throw data from the trash to the trash
-		if($trash_args->module_srl == 0) return false;
+		if($trash_args->module_srl == 0) {
+			return false;
+		}
 		// Data setting
 		$trash_args->document_srl = $obj->document_srl;
 		$trash_args->description = $obj->description;
@@ -793,7 +923,9 @@ 
 		  }*/
 
 		// update category
-		if($oDocument->get('category_srl')) $this->updateCategoryCount($oDocument->get('module_srl'),$oDocument->get('category_srl'));
+		if($oDocument->get('category_srl')) {
+			$this->updateCategoryCount($oDocument->get('module_srl'),$oDocument->get('category_srl'));
+		}
 
 		// remove thumbnails
 		FileHandler::removeDir(sprintf('files/thumbnails/%s',getNumberingPath($obj->document_srl, 3)));
@@ -838,7 +970,9 @@ 
 	function updateReadedCount(&$oDocument)
 	{
 		// Pass if Crawler access
-		if(isCrawler()) return false;
+		if(isCrawler()) {
+			return false;
+		}
 		
 		$document_srl = $oDocument->document_srl;
 		$member_srl = $oDocument->get('member_srl');
@@ -846,10 +980,14 @@ 
 
 		// Call a trigger when the read count is updated (before)
 		$trigger_output = ModuleHandler::triggerCall('document.updateReadedCount', 'before', $oDocument);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if(!$trigger_output->toBool()) {
+			return $trigger_output;
+		}
 
 		// Pass if read count is increaded on the session information
-		if($_SESSION['readed_document'][$document_srl]) return false;
+		if($_SESSION['readed_document'][$document_srl]) {
+			return false;
+		}
 
 		// Pass if the author's IP address is as same as visitor's.
 		if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
@@ -914,7 +1052,9 @@ 
 	 */
 	function insertDocumentExtraKey($module_srl, $var_idx, $var_name, $var_type, $var_is_required = 'N', $var_search = 'N', $var_default = '', $var_desc = '', $eid)
 	{
-		if(!$module_srl || !$var_idx || !$var_name || !$var_type || !$eid) return new Object(-1,'msg_invalid_request');
+		if(!$module_srl || !$var_idx || !$var_name || !$var_type || !$eid) {
+			return new Object(-1,'msg_invalid_request');
+		}
 
 		$obj = new stdClass();
 		$obj->module_srl = $module_srl;
@@ -931,8 +1071,7 @@ 
 		if(!$output->data)
 		{
 			$output = executeQuery('document.insertDocumentExtraKey', $obj);
-		}
-		else
+		} else
 		{
 			$output = executeQuery('document.updateDocumentExtraKey', $obj);
 			// Update the extra var(eid)
@@ -958,10 +1097,14 @@ 
 	 */
 	function deleteDocumentExtraKeys($module_srl, $var_idx = null)
 	{
-		if(!$module_srl) return new Object(-1,'msg_invalid_request');
+		if(!$module_srl) {
+			return new Object(-1,'msg_invalid_request');
+		}
 		$obj = new stdClass();
 		$obj->module_srl = $module_srl;
-		if(!is_null($var_idx)) $obj->var_idx = $var_idx;
+		if(!is_null($var_idx)) {
+			$obj->var_idx = $var_idx;
+		}
 
 		$oDB = DB::getInstance();
 		$oDB->begin();
@@ -1025,8 +1168,12 @@ 
 	 */
 	function insertDocumentExtraVar($module_srl, $document_srl, $var_idx, $value, $eid = null, $lang_code = '')
 	{
-		if(!$module_srl || !$document_srl || !$var_idx || !isset($value)) return new Object(-1,'msg_invalid_request');
-		if(!$lang_code) $lang_code = Context::getLangType();
+		if(!$module_srl || !$document_srl || !$var_idx || !isset($value)) {
+			return new Object(-1,'msg_invalid_request');
+		}
+		if(!$lang_code) {
+			$lang_code = Context::getLangType();
+		}
 
 		$obj = new stdClass;
 		$obj->module_srl = $module_srl;
@@ -1052,10 +1199,18 @@ 
 	{
 		$obj = new stdClass();
 		$obj->module_srl = $module_srl;
-		if(!is_null($document_srl)) $obj->document_srl = $document_srl;
-		if(!is_null($var_idx)) $obj->var_idx = $var_idx;
-		if(!is_null($lang_code)) $obj->lang_code = $lang_code;
-		if(!is_null($eid)) $obj->eid = $eid;
+		if(!is_null($document_srl)) {
+			$obj->document_srl = $document_srl;
+		}
+		if(!is_null($var_idx)) {
+			$obj->var_idx = $var_idx;
+		}
+		if(!is_null($lang_code)) {
+			$obj->lang_code = $lang_code;
+		}
+		if(!is_null($eid)) {
+			$obj->eid = $eid;
+		}
 		$output = executeQuery('document.deleteDocumentExtraVars', $obj);
 		return $output;
 	}
@@ -1069,8 +1224,11 @@ 
 	 */
 	function updateVotedCount($document_srl, $point = 1)
 	{
-		if($point > 0) $failed_voted = 'failed_voted';
-		else $failed_voted = 'failed_blamed';
+		if($point > 0) {
+			$failed_voted = 'failed_voted';
+		} else {
+			$failed_voted = 'failed_blamed';
+		}
 		// Return fail if session already has information about votes
 		if($_SESSION['voted_document'][$document_srl])
 		{
@@ -1106,8 +1264,7 @@ 
 		if($member_srl)
 		{
 			$args->member_srl = $member_srl;
-		}
-		else
+		} else
 		{
 			$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 		}
@@ -1129,17 +1286,20 @@ 
 		{
 			$args->blamed_count = $oDocument->get('blamed_count') + $point;
 			$output = executeQuery('document.updateBlamedCount', $args);
-		}
-		else
+		} else
 		{
 			$args->voted_count = $oDocument->get('voted_count') + $point;
 			$output = executeQuery('document.updateVotedCount', $args);
 		}
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Leave logs
 		$args->point = $point;
 		$output = executeQuery('document.insertDocumentVotedLog', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$obj = new stdClass;
 		$obj->member_srl = $oDocument->get('member_srl');
@@ -1175,8 +1335,7 @@ 
 		{
 			$output->setMessage('success_voted');
 			$output->add('voted_count', $obj->after_point);
-		}
-		else
+		} else
 		{
 			$output->setMessage('success_blamed');
 			$output->add('blamed_count', $obj->after_point);
@@ -1193,13 +1352,17 @@ 
 	function declaredDocument($document_srl)
 	{
 		// Fail if session information already has a reported document
-		if($_SESSION['declared_document'][$document_srl]) return new Object(-1, 'failed_declared');
+		if($_SESSION['declared_document'][$document_srl]) {
+			return new Object(-1, 'failed_declared');
+		}
 
 		// Check if previously reported
 		$args = new stdClass();
 		$args->document_srl = $document_srl;
 		$output = executeQuery('document.getDeclaredDocument', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$declared_count = ($output->data->declared_count) ? $output->data->declared_count : 0;
 
@@ -1243,8 +1406,7 @@ 
 		if($member_srl)
 		{
 			$args->member_srl = $member_srl;
-		}
-		else
+		} else
 		{
 			$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 		}
@@ -1264,9 +1426,14 @@ 
 		$oDB->begin();
 
 		// Add the declared document
-		if($declared_count > 0) $output = executeQuery('document.updateDeclaredDocument', $args);
-		else $output = executeQuery('document.insertDeclaredDocument', $args);
-		if(!$output->toBool()) return $output;
+		if($declared_count > 0) {
+			$output = executeQuery('document.updateDeclaredDocument', $args);
+		} else {
+			$output = executeQuery('document.insertDeclaredDocument', $args);
+		}
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Leave logs
 		$output = executeQuery('document.insertDocumentDeclaredLog', $args);
 		if(!$output->toBool())
@@ -1365,9 +1532,10 @@ 
 			$parent_category = $oDocumentModel->getCategory($obj->parent_srl);
 			$obj->list_order = $parent_category->list_order;
 			$this->updateCategoryListOrder($parent_category->module_srl, $parent_category->list_order+1);
-			if(!$obj->category_srl) $obj->category_srl = getNextSequence();
-		}
-		else
+			if(!$obj->category_srl) {
+				$obj->category_srl = getNextSequence();
+			}
+		} else
 		{
 			$obj->list_order = $obj->category_srl = getNextSequence();
 		}
@@ -1407,13 +1575,17 @@ 
 	{
 		// Create a document model object
 		$oDocumentModel = getModel('document');
-		if(!$document_count) $document_count = $oDocumentModel->getCategoryDocumentCount($module_srl,$category_srl);
+		if(!$document_count) {
+			$document_count = $oDocumentModel->getCategoryDocumentCount($module_srl,$category_srl);
+		}
 
 		$args = new stdClass;
 		$args->category_srl = $category_srl;
 		$args->document_count = $document_count;
 		$output = executeQuery('document.updateCategoryCount', $args);
-		if($output->toBool()) $this->makeCategoryFile($module_srl);
+		if($output->toBool()) {
+			$this->makeCategoryFile($module_srl);
+		}
 
 		return $output;
 	}
@@ -1426,7 +1598,9 @@ 
 	function updateCategory($obj)
 	{
 		$output = executeQuery('document.updateCategory', $obj);
-		if($output->toBool()) $this->makeCategoryFile($obj->module_srl);
+		if($output->toBool()) {
+			$this->makeCategoryFile($obj->module_srl);
+		}
 		return $output;
 	}
 
@@ -1443,11 +1617,17 @@ 
 		$category_info = $oDocumentModel->getCategory($category_srl);
 		// Display an error that the category cannot be deleted if it has a child
 		$output = executeQuery('document.getChildCategoryCount', $args);
-		if(!$output->toBool()) return $output;
-		if($output->data->count>0) return new Object(-1, 'msg_cannot_delete_for_child');
+		if(!$output->toBool()) {
+			return $output;
+		}
+		if($output->data->count>0) {
+			return new Object(-1, 'msg_cannot_delete_for_child');
+		}
 		// Delete a category information
 		$output = executeQuery('document.deleteCategory', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->makeCategoryFile($category_info->module_srl);
 		// remvove cache
@@ -1462,8 +1642,9 @@ 
 				$args->page = ++$page;
 				$output = executeQuery('document.getDocumentList', $args, array('document_srl'));
 
-				if($output->data == array())
-					break;
+				if($output->data == array()) {
+									break;
+				}
 
 				foreach($output->data as $val)
 				{
@@ -1515,18 +1696,26 @@ 
 		// Seek a full list of categories
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
 		$category_srl_list = array_keys($category_list);
-		if(count($category_srl_list)<2) return new Object();
+		if(count($category_srl_list)<2) {
+			return new Object();
+		}
 
 		$prev_category = NULL;
 		foreach($category_list as $key => $val)
 		{
-			if($key==$category_srl) break;
+			if($key==$category_srl) {
+				break;
+			}
 			$prev_category = $val;
 		}
 		// Return if the previous category doesn't exist
-		if(!$prev_category) return new Object(-1,Context::getLang('msg_category_not_moved'));
+		if(!$prev_category) {
+			return new Object(-1,Context::getLang('msg_category_not_moved'));
+		}
 		// Return if the selected category is the top level
-		if($category_srl_list[0]==$category_srl) return new Object(-1,Context::getLang('msg_category_not_moved'));
+		if($category_srl_list[0]==$category_srl) {
+			return new Object(-1,Context::getLang('msg_category_not_moved'));
+		}
 		// Information of the selected category
 		$cur_args = new stdClass;
 		$cur_args->category_srl = $category_srl;
@@ -1562,15 +1751,21 @@ 
 		// Seek a full list of categories
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
 		$category_srl_list = array_keys($category_list);
-		if(count($category_srl_list)<2) return new Object();
+		if(count($category_srl_list)<2) {
+			return new Object();
+		}
 
 		for($i=0;$i<count($category_srl_list);$i++)
 		{
-			if($category_srl_list[$i]==$category_srl) break;
+			if($category_srl_list[$i]==$category_srl) {
+				break;
+			}
 		}
 
 		$next_category_srl = $category_srl_list[$i+1];
-		if(!$category_list[$next_category_srl]) return new Object(-1,Context::getLang('msg_category_not_moved'));
+		if(!$category_list[$next_category_srl]) {
+			return new Object(-1,Context::getLang('msg_category_not_moved'));
+		}
 		$next_category = $category_list[$next_category_srl];
 		// Information of the selected category
 		$cur_args = new stdClass;
@@ -1597,7 +1792,9 @@ 
 	{
 		$oDocumentModel = getModel('document');
 		$extra_keys = $oDocumentModel->getExtraKeys($module_srl);
-		if(!count($extra_keys)) return;
+		if(!count($extra_keys)) {
+			return;
+		}
 
 		$js_code = array();
 		$js_code[] = '<script>//<![CDATA[';
@@ -1616,7 +1813,9 @@ 
 			}
 			$name = str_ireplace(array('<script', '</script'), array('<scr" + "ipt', '</scr" + "ipt'), $val->name);
 			$js_code[] = sprintf('validator.cast("ADD_MESSAGE", ["extra_vars%s","%s"]);', $idx, $name);
-			if($val->is_required == 'Y') $js_code[] = sprintf('validator.cast("ADD_EXTRA_FIELD", ["extra_vars%s", { required:true }]);', $idx);
+			if($val->is_required == 'Y') {
+				$js_code[] = sprintf('validator.cast("ADD_EXTRA_FIELD", ["extra_vars%s", { required:true }]);', $idx);
+			}
 		}
 
 		$js_code[] = '})(jQuery);';
@@ -1634,7 +1833,9 @@ 
 	function procDocumentInsertCategory($args = null)
 	{
 		// List variables
-		if(!$args) $args = Context::gets('module_srl','category_srl','parent_srl','category_title','category_description','expand','group_srls','category_color','mid');
+		if(!$args) {
+			$args = Context::gets('module_srl','category_srl','parent_srl','category_title','category_description','expand','group_srls','category_color','mid');
+		}
 		$args->title = $args->category_title;
 		$args->description = $args->category_description;
 		$args->color = $args->category_color;
@@ -1650,11 +1851,18 @@ 
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList);
 		$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');
+		}
 
-		if($args->expand !="Y") $args->expand = "N";
-		if(!is_array($args->group_srls)) $args->group_srls = str_replace('|@|',',',$args->group_srls);
-		else $args->group_srls = implode(',', $args->group_srls);
+		if($args->expand !="Y") {
+			$args->expand = "N";
+		}
+		if(!is_array($args->group_srls)) {
+			$args->group_srls = str_replace('|@|',',',$args->group_srls);
+		} else {
+			$args->group_srls = implode(',', $args->group_srls);
+		}
 		$args->parent_srl = (int)$args->parent_srl;
 
 		$oDocumentModel = getModel('document');
@@ -1665,7 +1873,9 @@ 
 		if($args->category_srl)
 		{
 			$category_info = $oDocumentModel->getCategory($args->category_srl);
-			if($category_info->category_srl != $args->category_srl) $args->category_srl = null;
+			if($category_info->category_srl != $args->category_srl) {
+				$args->category_srl = null;
+			}
 		}
 		// Update if exists
 		if($args->category_srl)
@@ -1677,8 +1887,7 @@ 
 				return $output;
 			}
 			// Insert if not exist
-		}
-		else
+		} else
 		{
 			$output = $this->insertCategory($args);
 			if(!$output->toBool())
@@ -1720,7 +1929,9 @@ 
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($source_category->module_srl, $columnList);
 		$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');
+		}
 
 		// First child of the parent_category_srl
 		$source_args = new stdClass;
@@ -1733,30 +1944,39 @@ 
 			$args->parent_srl = $parent_category_srl;
 			$output = executeQuery('document.getChildCategoryMinListOrder', $args);
 
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 			$args->list_order = (int)$output->data->list_order;
-			if(!$args->list_order) $args->list_order = 0;
+			if(!$args->list_order) {
+				$args->list_order = 0;
+			}
 			$args->list_order--;
 
 			$source_args->category_srl = $source_category_srl;
 			$source_args->parent_srl = $parent_category_srl;
 			$source_args->list_order = $args->list_order;
 			$output = $this->updateCategory($source_args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 			// Sibling of the $target_category_srl
-		}
-		else if($target_category_srl > 0)
+		} else if($target_category_srl > 0)
 		{
 			$target_category = $oDocumentModel->getCategory($target_category_srl);
 			// Move all siblings of the $target_category down
 			$output = $this->updateCategoryListOrder($target_category->module_srl, $target_category->list_order+1);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 
 			$source_args->category_srl = $source_category_srl;
 			$source_args->parent_srl = $target_category->parent_srl;
 			$source_args->list_order = $target_category->list_order+1;
 			$output = $this->updateCategory($source_args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 		// Re-generate the xml file
 		$xml_file = $this->makeCategoryFile($source_category->module_srl);
@@ -1781,14 +2001,20 @@ 
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList);
 		$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');
+		}
 
 		$oDocumentModel = getModel('document');
 		// Get original information
 		$category_info = $oDocumentModel->getCategory($args->category_srl);
-		if($category_info->parent_srl) $parent_srl = $category_info->parent_srl;
+		if($category_info->parent_srl) {
+			$parent_srl = $category_info->parent_srl;
+		}
 		// Display an error that the category cannot be deleted if it has a child node
-		if($oDocumentModel->getCategoryChlidCount($args->category_srl)) return new Object(-1, 'msg_cannot_delete_for_child');
+		if($oDocumentModel->getCategoryChlidCount($args->category_srl)) {
+			return new Object(-1, 'msg_cannot_delete_for_child');
+		}
 		// Remove from the DB
 		$output = $this->deleteCategory($args->category_srl);
 		if(!$output->toBool())
@@ -1822,7 +2048,9 @@ 
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
 		$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');
+		}
 
 		$xml_file = $this->makeCategoryFile($module_srl);
 		// Set return value
@@ -1837,14 +2065,18 @@ 
 	function makeCategoryFile($module_srl)
 	{
 		// Return if there is no information you need for creating a cache file
-		if(!$module_srl) return false;
+		if(!$module_srl) {
+			return false;
+		}
 		// Get module information (to obtain mid)
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'mid', 'site_srl');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
 		$mid = $module_info->mid;
 
-		if(!is_dir('./files/cache/document_category')) FileHandler::makeDir('./files/cache/document_category');
+		if(!is_dir('./files/cache/document_category')) {
+			FileHandler::makeDir('./files/cache/document_category');
+		}
 		// Cache file's name
 		$xml_file = sprintf("./files/cache/document_category/%s.xml.php", $module_srl);
 		$php_file = sprintf("./files/cache/document_category/%s.php", $module_srl);
@@ -1856,13 +2088,17 @@ 
 
 		$category_list = $output->data;
 
-		if(!is_array($category_list)) $category_list = array($category_list);
+		if(!is_array($category_list)) {
+			$category_list = array($category_list);
+		}
 
 		$category_count = count($category_list);
 		for($i=0;$i<$category_count;$i++)
 		{
 			$category_srl = $category_list[$i]->category_srl;
-			if(!preg_match('/^[0-9,]+$/', $category_list[$i]->group_srls)) $category_list[$i]->group_srls = '';
+			if(!preg_match('/^[0-9,]+$/', $category_list[$i]->group_srls)) {
+				$category_list[$i]->group_srls = '';
+			}
 			$list[$category_srl] = $category_list[$i];
 		}
 		// Create the xml file without node data if no data is obtained
@@ -1874,7 +2110,9 @@ 
 			return $xml_file;
 		}
 		// Change to an array if only a single data is obtained
-		if(!is_array($list)) $list = array($list);
+		if(!is_array($list)) {
+			$list = array($list);
+		}
 		// Create a tree for loop
 		foreach($list as $category_srl => $node)
 		{
@@ -1953,13 +2191,17 @@ 
 	 */
 	function getXmlTree($source_node, $tree, $site_srl, &$xml_header_buff)
 	{
-		if(!$source_node) return;
+		if(!$source_node) {
+			return;
+		}
 
 		foreach($source_node as $category_srl => $node)
 		{
 			$child_buff = "";
 			// Get data of the child nodes
-			if($category_srl && $tree[$category_srl]) $child_buff = $this->getXmlTree($tree[$category_srl], $tree, $site_srl, $xml_header_buff);
+			if($category_srl && $tree[$category_srl]) {
+				$child_buff = $this->getXmlTree($tree[$category_srl], $tree, $site_srl, $xml_header_buff);
+			}
 			// List variables
 			$expand = $node->expand;
 			$group_srls = $node->group_srls;
@@ -1969,8 +2211,11 @@ 
 			$color = $node->color;
 			$description = $node->description;
 			// If node->group_srls value exists
-			if($group_srls) $group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s)))))',$group_srls);
-			else $group_check_code = "true";
+			if($group_srls) {
+				$group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s)))))',$group_srls);
+			} else {
+				$group_check_code = "true";
+			}
 
 			$title = $node->title;
 			$oModuleAdminModel = getAdminModel('module');
@@ -2010,8 +2255,11 @@ 
 				$node->document_count
 			);
 
-			if($child_buff) $buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
-			else $buff .=  sprintf('<node %s />', $attribute);
+			if($child_buff) {
+				$buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
+			} else {
+				$buff .=  sprintf('<node %s />', $attribute);
+			}
 		}
 		return $buff;
 	}
@@ -2030,7 +2278,9 @@ 
 	function getPhpCacheCode($source_node, $tree, $site_srl, &$php_header_buff)
 	{
 		$output = array("buff"=>"", "category_srl_list"=>array());
-		if(!$source_node) return $output;
+		if(!$source_node) {
+			return $output;
+		}
 
 		// Set to an arraty for looping and then generate php script codes to be included
 		foreach($source_node as $category_srl => $node)
@@ -2129,7 +2379,9 @@ 
 	function addDocumentPopupMenu($url, $str, $icon = '', $target = 'self')
 	{
 		$document_popup_menu_list = Context::get('document_popup_menu_list');
-		if(!is_array($document_popup_menu_list)) $document_popup_menu_list = array();
+		if(!is_array($document_popup_menu_list)) {
+			$document_popup_menu_list = array();
+		}
 
 		$obj = new stdClass();
 		$obj->url = $url;
@@ -2147,7 +2399,9 @@ 
 	 */
 	function procDocumentAddCart()
 	{
-		if(!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new Object(-1, 'msg_not_permitted');
+		}
 
 		// Get document_srl
 		$srls = explode(',',Context::get('srls'));
@@ -2155,11 +2409,15 @@ 
 		{
 			$srl = trim($srls[$i]);
 
-			if(!$srl) continue;
+			if(!$srl) {
+				continue;
+			}
 
 			$document_srls[] = $srl;
 		}
-		if(!count($document_srls)) return;
+		if(!count($document_srls)) {
+			return;
+		}
 
 		// Get module_srl of the documents
 		$args = new stdClass;
@@ -2167,14 +2425,18 @@ 
 		$args->document_srls = implode(',',$document_srls);
 		$args->order_type = 'asc';
 		$output = executeQueryArray('document.getDocuments', $args);
-		if(!$output->data) return new Object();
+		if(!$output->data) {
+			return new Object();
+		}
 
 		unset($document_srls);
 		foreach($output->data as $key => $val)
 		{
 			$document_srls[$val->module_srl][] = $val->document_srl;
 		}
-		if(!$document_srls || !count($document_srls)) return new Object();
+		if(!$document_srls || !count($document_srls)) {
+			return new Object();
+		}
 
 		// Check if each of module administrators exists. Top-level administator will have a permission to modify every document of all modules.(Even to modify temporarily saved or trashed documents)
 		$oModuleModel = getModel('module');
@@ -2199,7 +2461,9 @@ 
 				}
 			}
 		}
-		if(!count($document_srls)) return new Object();
+		if(!count($document_srls)) {
+			return new Object();
+		}
 
 		foreach($document_srls as $module_srl => $documents)
 		{
@@ -2207,9 +2471,14 @@ 
 			for($i=0;$i<$cnt;$i++)
 			{
 				$document_srl = (int)trim($documents[$i]);
-				if(!$document_srls) continue;
-				if($_SESSION['document_management'][$document_srl]) unset($_SESSION['document_management'][$document_srl]);
-				else $_SESSION['document_management'][$document_srl] = true;
+				if(!$document_srls) {
+					continue;
+				}
+				if($_SESSION['document_management'][$document_srl]) {
+					unset($_SESSION['document_management'][$document_srl]);
+				} else {
+					$_SESSION['document_management'][$document_srl] = true;
+				}
 			}
 		}
 	}
@@ -2221,7 +2490,9 @@ 
 	function procDocumentManageCheckedDocument()
 	{
 		@set_time_limit(0);
-		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new Object(-1,'msg_not_permitted');
+		}
 
 		if(!checkCSRF())
 		{
@@ -2231,14 +2502,21 @@ 
 		$type = Context::get('type');
 		$target_module = Context::get('target_module');
 		$module_srl = Context::get('module_srl');
-		if($target_module && !$module_srl) $module_srl = $target_module;
+		if($target_module && !$module_srl) {
+			$module_srl = $target_module;
+		}
 		$category_srl = Context::get('target_category');
 		$message_content = Context::get('message_content');
-		if($message_content) $message_content = nl2br($message_content);
+		if($message_content) {
+			$message_content = nl2br($message_content);
+		}
 
 		$cart = Context::get('cart');
-		if(!is_array($cart)) $document_srl_list = explode('|@|', $cart);
-		else $document_srl_list = $cart;
+		if(!is_array($cart)) {
+			$document_srl_list = explode('|@|', $cart);
+		} else {
+			$document_srl_list = $cart;
+		}
 
 		$document_srl_count = count($document_srl_list);
 
@@ -2248,7 +2526,9 @@ 
 		{
 			$oDocument = $oDocumentModel->getDocument($document_srl);
 			$document_items[] = $oDocument;
-			if(!$oDocument->isGranted()) return $this->stop('msg_not_permitted');
+			if(!$oDocument->isGranted()) {
+				return $this->stop('msg_not_permitted');
+			}
 		}
 
 		// Send a message
@@ -2264,10 +2544,15 @@ 
 
 			foreach($document_items as $oDocument)
 			{
-				if(!$oDocument->get('member_srl') || $oDocument->get('member_srl')==$sender_member_srl) continue;
+				if(!$oDocument->get('member_srl') || $oDocument->get('member_srl')==$sender_member_srl) {
+					continue;
+				}
 
-				if($type=='move') $purl = sprintf("<a href=\"%s\" onclick=\"window.open(this.href);return false;\">%s</a>", $oDocument->getPermanentUrl(), $oDocument->getPermanentUrl());
-				else $purl = "";
+				if($type=='move') {
+					$purl = sprintf("<a href=\"%s\" onclick=\"window.open(this.href);return false;\">%s</a>", $oDocument->getPermanentUrl(), $oDocument->getPermanentUrl());
+				} else {
+					$purl = "";
+				}
 				$content = sprintf("<div>%s</div><hr />%s<div style=\"font-weight:bold\">%s</div>%s",$message_content, $purl, $oDocument->getTitleText(), $oDocument->getContent(false, false, false));
 
 				$oCommunicationController->sendMessage($sender_member_srl, $oDocument->get('member_srl'), $title, $content, false);
@@ -2280,24 +2565,30 @@ 
 		$oDocumentAdminController = getAdminController('document');
 		if($type == 'move')
 		{
-			if(!$module_srl) return new Object(-1, 'fail_to_move');
+			if(!$module_srl) {
+				return new Object(-1, 'fail_to_move');
+			}
 
 			$output = $oDocumentAdminController->moveDocumentModule($document_srl_list, $module_srl, $category_srl);
-			if(!$output->toBool()) return new Object(-1, 'fail_to_move');
+			if(!$output->toBool()) {
+				return new Object(-1, 'fail_to_move');
+			}
 
 			$msg_code = 'success_moved';
 
-		}
-		else if($type == 'copy')
+		} else if($type == 'copy')
 		{
-			if(!$module_srl) return new Object(-1, 'fail_to_move');
+			if(!$module_srl) {
+				return new Object(-1, 'fail_to_move');
+			}
 
 			$output = $oDocumentAdminController->copyDocumentModule($document_srl_list, $module_srl, $category_srl);
-			if(!$output->toBool()) return new Object(-1, 'fail_to_move');
+			if(!$output->toBool()) {
+				return new Object(-1, 'fail_to_move');
+			}
 
 			$msg_code = 'success_copied';
-		}
-		else if($type =='delete')
+		} else if($type =='delete')
 		{
 			$oDB = &DB::getInstance();
 			$oDB->begin();
@@ -2305,12 +2596,13 @@ 
 			{
 				$document_srl = $document_srl_list[$i];
 				$output = $this->deleteDocument($document_srl, true);
-				if(!$output->toBool()) return new Object(-1, 'fail_to_delete');
+				if(!$output->toBool()) {
+					return new Object(-1, 'fail_to_delete');
+				}
 			}
 			$oDB->commit();
 			$msg_code = 'success_deleted';
-		}
-		else if($type == 'trash')
+		} else if($type == 'trash')
 		{
 			$args = new stdClass();
 			$args->description = $message_content;
@@ -2320,12 +2612,13 @@ 
 			for($i=0;$i<$document_srl_count;$i++) {
 				$args->document_srl = $document_srl_list[$i];
 				$output = $this->moveDocumentToTrash($args);
-				if(!$output || !$output->toBool()) return new Object(-1, 'fail_to_trash');
+				if(!$output || !$output->toBool()) {
+					return new Object(-1, 'fail_to_trash');
+				}
 			}
 			$oDB->commit();
 			$msg_code = 'success_trashed';
-		}
-		else if($type == 'cancelDeclare')
+		} else if($type == 'cancelDeclare')
 		{
 			$args->document_srl = $document_srl_list;
 			$output = executeQuery('document.deleteDeclaredDocuments', $args);
@@ -2347,18 +2640,27 @@ 
 	function procDocumentInsertModuleConfig()
 	{
 		$module_srl = Context::get('target_module_srl');
-		if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
-		else $module_srl = array($module_srl);
+		if(preg_match('/^([0-9,]+)$/',$module_srl)) {
+			$module_srl = explode(',',$module_srl);
+		} else {
+			$module_srl = array($module_srl);
+		}
 
 		$document_config = new stdClass();
 		$document_config->use_history = Context::get('use_history');
-		if(!$document_config->use_history) $document_config->use_history = 'N';
+		if(!$document_config->use_history) {
+			$document_config->use_history = 'N';
+		}
 
 		$document_config->use_vote_up = Context::get('use_vote_up');
-		if(!$document_config->use_vote_up) $document_config->use_vote_up = 'Y';
+		if(!$document_config->use_vote_up) {
+			$document_config->use_vote_up = 'Y';
+		}
 
 		$document_config->use_vote_down = Context::get('use_vote_down');
-		if(!$document_config->use_vote_down) $document_config->use_vote_down = 'Y';
+		if(!$document_config->use_vote_down) {
+			$document_config->use_vote_down = 'Y';
+		}
 
 		$document_config->use_status = Context::get('use_status');
 
@@ -2366,7 +2668,9 @@ 
 		for($i=0;$i<count($module_srl);$i++)
 		{
 			$srl = trim($module_srl[$i]);
-			if(!$srl) continue;
+			if(!$srl) {
+				continue;
+			}
 			$output = $oModuleController->insertModulePartConfig('document',$srl,$document_config);
 		}
 		$this->setError(-1);
@@ -2383,7 +2687,9 @@ 
 	function procDocumentTempSave()
 	{
 		// Check login information
-		if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+		if(!Context::get('is_logged')) {
+			return new Object(-1, 'msg_not_logged');
+		}
 		$module_info = Context::get('module_info');
 		$logged_info = Context::get('logged_info');
 
@@ -2421,8 +2727,7 @@ 
 			$output = $oDocumentController->updateDocument($oDocument, $obj);
 			$msg_code = 'success_updated';
 			// Otherwise, get a new
-		}
-		else
+		} else
 		{
 			$output = $oDocumentController->insertDocument($obj);
 			$msg_code = 'success_registed';
@@ -2448,17 +2753,20 @@ 
 	 */
 	function procDocumentGetList()
 	{
-		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new Object(-1,'msg_not_permitted');
+		}
 		$documentSrls = Context::get('document_srls');
-		if($documentSrls) $documentSrlList = explode(',', $documentSrls);
+		if($documentSrls) {
+			$documentSrlList = explode(',', $documentSrls);
+		}
 
 		if(count($documentSrlList) > 0)
 		{
 			$oDocumentModel = getModel('document');
 			$columnList = array('document_srl', 'title', 'nick_name', 'status');
 			$documentList = $oDocumentModel->getDocuments($documentSrlList, $this->grant->is_admin, false, $columnList);
-		}
-		else
+		} else
 		{
 			global $lang;
 			$documentList = array();
@@ -2476,11 +2784,18 @@ 
 	 */
 	function _checkCommentStatusForOldVersion(&$obj)
 	{
-		if(!isset($obj->allow_comment)) $obj->allow_comment = 'N';
-		if(!isset($obj->lock_comment)) $obj->lock_comment = 'N';
+		if(!isset($obj->allow_comment)) {
+			$obj->allow_comment = 'N';
+		}
+		if(!isset($obj->lock_comment)) {
+			$obj->lock_comment = 'N';
+		}
 
-		if($obj->allow_comment == 'Y' && $obj->lock_comment == 'N') $obj->commentStatus = 'ALLOW';
-		else $obj->commentStatus = 'DENY';
+		if($obj->allow_comment == 'Y' && $obj->lock_comment == 'N') {
+			$obj->commentStatus = 'ALLOW';
+		} else {
+			$obj->commentStatus = 'DENY';
+		}
 	}
 
 	/**
@@ -2490,8 +2805,12 @@ 
 	 */
 	function _checkDocumentStatusForOldVersion(&$obj)
 	{
-		if(!$obj->status && $obj->is_secret == 'Y') $obj->status = $this->getConfigStatus('secret');
-		if(!$obj->status && $obj->is_secret != 'Y') $obj->status = $this->getConfigStatus('public');
+		if(!$obj->status && $obj->is_secret == 'Y') {
+			$obj->status = $this->getConfigStatus('secret');
+		}
+		if(!$obj->status && $obj->is_secret != 'Y') {
+			$obj->status = $this->getConfigStatus('public');
+		}
 	}
 
 	public function updateUploaedCount($documentSrlList)

modules/comment/comment.controller.php

Spacing +153 added lines, -153 removed lines

@@ -27,13 +27,13 @@ 
 	 */
 	function procCommentVoteUp()
 	{
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
 		$comment_srl = Context::get('target_srl');
-		if(!$comment_srl)
+		if (!$comment_srl)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -41,14 +41,14 @@ 
 		$oCommentModel = getModel('comment');
 		$oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE);
 		$module_srl = $oComment->get('module_srl');
-		if(!$module_srl)
+		if (!$module_srl)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
 		$oModuleModel = getModel('module');
 		$comment_config = $oModuleModel->getModulePartConfig('comment', $module_srl);
-		if($comment_config->use_vote_up == 'N')
+		if ($comment_config->use_vote_up == 'N')
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -65,13 +65,13 @@ 
 	 */
 	function procCommentVoteDown()
 	{
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
 		$comment_srl = Context::get('target_srl');
-		if(!$comment_srl)
+		if (!$comment_srl)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -79,14 +79,14 @@ 
 		$oCommentModel = getModel('comment');
 		$oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE);
 		$module_srl = $oComment->get('module_srl');
-		if(!$module_srl)
+		if (!$module_srl)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
 		$oModuleModel = getModel('module');
 		$comment_config = $oModuleModel->getModulePartConfig('comment', $module_srl);
-		if($comment_config->use_vote_down == 'N')
+		if ($comment_config->use_vote_down == 'N')
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -103,13 +103,13 @@ 
 	 */
 	function procCommentDeclare()
 	{
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
 		$comment_srl = Context::get('target_srl');
-		if(!$comment_srl)
+		if (!$comment_srl)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -124,7 +124,7 @@ 
 	function triggerDeleteDocumentComments(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl)
+		if (!$document_srl)
 		{
 			return new Object();
 		}
@@ -139,7 +139,7 @@ 
 	function triggerDeleteModuleComments(&$obj)
 	{
 		$module_srl = $obj->module_srl;
-		if(!$module_srl)
+		if (!$module_srl)
 		{
 			return new Object();
 		}
@@ -166,7 +166,7 @@ 
 	 */
 	function isModuleUsingPublishValidation($module_srl = NULL)
 	{
-		if($module_srl == NULL)
+		if ($module_srl == NULL)
 		{
 			return FALSE;
 		}
@@ -175,7 +175,7 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
 		$module_part_config = $oModuleModel->getModulePartConfig('comment', $module_info->module_srl);
 		$use_validation = FALSE;
-		if(isset($module_part_config->use_comment_validation) && $module_part_config->use_comment_validation == "Y")
+		if (isset($module_part_config->use_comment_validation) && $module_part_config->use_comment_validation == "Y")
 		{
 			$use_validation = TRUE;
 		}
@@ -190,12 +190,12 @@ 
 	 */
 	function insertComment($obj, $manual_inserted = FALSE)
 	{
-		if(!$manual_inserted && !checkCSRF())
+		if (!$manual_inserted && !checkCSRF())
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
-		if(!is_object($obj))
+		if (!is_object($obj))
 		{
 			$obj = new stdClass();
 		}
@@ -203,12 +203,12 @@ 
 		// check if comment's module is using comment validation and set the publish status to 0 (false)
 		// for inserting query, otherwise default is 1 (true - means comment is published)
 		$using_validation = $this->isModuleUsingPublishValidation($obj->module_srl);
-		if(!$manual_inserted)
+		if (!$manual_inserted)
 		{
-			if(Context::get('is_logged'))
+			if (Context::get('is_logged'))
 			{
 				$logged_info = Context::get('logged_info');
-				if($logged_info->is_admin == 'Y')
+				if ($logged_info->is_admin == 'Y')
 				{
 					$is_admin = TRUE;
 				}
@@ -223,13 +223,13 @@ 
 			$is_admin = FALSE;
 		}
 
-		if(!$using_validation)
+		if (!$using_validation)
 		{
 			$obj->status = 1;
 		}
 		else
 		{
-			if($is_admin)
+			if ($is_admin)
 			{
 				$obj->status = 1;
 			}
@@ -242,14 +242,14 @@ 
 
 		// call a trigger (before)
 		$output = ModuleHandler::triggerCall('comment.insertComment', 'before', $obj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
 		// check if a posting of the corresponding document_srl exists
 		$document_srl = $obj->document_srl;
-		if(!$document_srl)
+		if (!$document_srl)
 		{
 			return new Object(-1, 'msg_invalid_document');
 		}
@@ -258,36 +258,36 @@ 
 		$oDocumentModel = getModel('document');
 
 		// even for manual_inserted if password exists, hash it.
-		if($obj->password)
+		if ($obj->password)
 		{
 			$obj->password = getModel('member')->hashPassword($obj->password);
 		}
 
 		// get the original posting
-		if(!$manual_inserted)
+		if (!$manual_inserted)
 		{
 			$oDocument = $oDocumentModel->getDocument($document_srl);
 
-			if($document_srl != $oDocument->document_srl)
+			if ($document_srl != $oDocument->document_srl)
 			{
 				return new Object(-1, 'msg_invalid_document');
 			}
-			if($oDocument->isLocked())
+			if ($oDocument->isLocked())
 			{
 				return new Object(-1, 'msg_invalid_request');
 			}
 
-			if($obj->homepage)
+			if ($obj->homepage)
 			{
 				$obj->homepage = removeHackTag($obj->homepage);
-				if(!preg_match('/^[a-z]+:\/\//i',$obj->homepage))
+				if (!preg_match('/^[a-z]+:\/\//i', $obj->homepage))
 				{
 					$obj->homepage = 'http://'.$obj->homepage;
 				}
 			}
 
 			// input the member's information if logged-in
-			if(Context::get('is_logged'))
+			if (Context::get('is_logged'))
 			{
 				$logged_info = Context::get('logged_info');
 				$obj->member_srl = $logged_info->member_srl;
@@ -302,16 +302,16 @@ 
 		}
 
 		// error display if neither of log-in info and user name exist.
-		if(!$logged_info->member_srl && !$obj->nick_name)
+		if (!$logged_info->member_srl && !$obj->nick_name)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
-		if(!$obj->comment_srl)
+		if (!$obj->comment_srl)
 		{
 			$obj->comment_srl = getNextSequence();
 		}
-		elseif(!$is_admin && !$manual_inserted && !checkUserSequence($obj->comment_srl)) 
+		elseif (!$is_admin && !$manual_inserted && !checkUserSequence($obj->comment_srl)) 
 		{
 			return new Object(-1, 'msg_not_permitted');
 		}
@@ -322,32 +322,32 @@ 
 		// remove XE's own tags from the contents
 		$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
 
-		if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
+		if (Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
 		{
-			if($obj->use_html != 'Y')
+			if ($obj->use_html != 'Y')
 			{
 				$obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 			}
 			$obj->content = nl2br($obj->content);
 		}
 
-		if(!$obj->regdate)
+		if (!$obj->regdate)
 		{
 			$obj->regdate = date("YmdHis");
 		}
 
 		// remove iframe and script if not a top administrator on the session.
-		if($logged_info->is_admin != 'Y')
+		if ($logged_info->is_admin != 'Y')
 		{
 			$obj->content = removeHackTag($obj->content);
 		}
 
-		if(!$obj->notify_message)
+		if (!$obj->notify_message)
 		{
 			$obj->notify_message = 'N';
 		}
 
-		if(!$obj->is_secret)
+		if (!$obj->is_secret)
 		{
 			$obj->is_secret = 'N';
 		}
@@ -364,7 +364,7 @@ 
 		$list_args->regdate = $obj->regdate;
 
 		// If parent comment doesn't exist, set data directly
-		if(!$obj->parent_srl)
+		if (!$obj->parent_srl)
 		{
 			$list_args->head = $list_args->arrange = $obj->comment_srl;
 			$list_args->depth = 0;
@@ -378,7 +378,7 @@ 
 			$parent_output = executeQuery('comment.getCommentListItem', $parent_args);
 
 			// return if no parent comment exists
-			if(!$parent_output->toBool() || !$parent_output->data)
+			if (!$parent_output->toBool() || !$parent_output->data)
 			{
 				return;
 			}
@@ -389,7 +389,7 @@ 
 			$list_args->depth = $parent->depth + 1;
 
 			// if the depth of comments is less than 2, execute insert.
-			if($list_args->depth < 2)
+			if ($list_args->depth < 2)
 			{
 				$list_args->arrange = $obj->comment_srl;
 				// if the depth of comments is greater than 2, execute update.
@@ -403,7 +403,7 @@ 
 				$p_args->depth = $parent->depth;
 				$output = executeQuery('comment.getCommentParentNextSibling', $p_args);
 
-				if($output->data->arrange)
+				if ($output->data->arrange)
 				{
 					$list_args->arrange = $output->data->arrange;
 					$output = executeQuery('comment.updateCommentListArrange', $list_args);
@@ -416,14 +416,14 @@ 
 		}
 
 		$output = executeQuery('comment.insertCommentList', $list_args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
 		// insert comment
 		$output = executeQuery('comment.insertComment', $obj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -439,29 +439,29 @@ 
 		$oDocumentController = getController('document');
 
 		// Update the number of comments in the post
-		if(!$using_validation)
+		if (!$using_validation)
 		{
 			$output = $oDocumentController->updateCommentCount($document_srl, $comment_count, $obj->nick_name, TRUE);
 		}
 		else
 		{
-			if($is_admin)
+			if ($is_admin)
 			{
 				$output = $oDocumentController->updateCommentCount($document_srl, $comment_count, $obj->nick_name, TRUE);
 			}
 		}
 
 		// grant autority of the comment
-		if(!$manual_inserted)
+		if (!$manual_inserted)
 		{
 			$this->addGrant($obj->comment_srl);
 		}
 
 		// call a trigger(after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$trigger_output = ModuleHandler::triggerCall('comment.insertComment', 'after', $obj);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -471,16 +471,16 @@ 
 		// commit
 		$oDB->commit();
 
-		if(!$manual_inserted)
+		if (!$manual_inserted)
 		{
 			// send a message if notify_message option in enabled in the original article
 			$oDocument->notify(Context::getLang('comment'), $obj->content);
 
 			// send a message if notify_message option in enabled in the original comment
-			if($obj->parent_srl)
+			if ($obj->parent_srl)
 			{
 				$oParent = $oCommentModel->getComment($obj->parent_srl);
-				if($oParent->get('member_srl') != $oDocument->get('member_srl'))
+				if ($oParent->get('member_srl') != $oDocument->get('member_srl'))
 				{
 					$oParent->notify(Context::getLang('comment'), $obj->content);
 				}
@@ -508,7 +508,7 @@ 
 		$oDocument = $oDocumentModel->getDocument($obj->document_srl);
 
 		$oMemberModel = getModel("member");
-		if(isset($obj->member_srl) && !is_null($obj->member_srl))
+		if (isset($obj->member_srl) && !is_null($obj->member_srl))
 		{
 			$member_info = $oMemberModel->getMemberInfoByMemberSrl($obj->member_srl);
 		}
@@ -528,47 +528,47 @@ 
 		$module_info = $oModuleModel->getModuleInfoByDocumentSrl($obj->document_srl);
 
 		// If there is no problem to register comment then send an email to all admin were set in module admin panel
-		if($module_info->admin_mail && $member_info->is_admin != 'Y')
+		if ($module_info->admin_mail && $member_info->is_admin != 'Y')
 		{
 			$oMail = new Mail();
 			$oMail->setSender($obj->email_address, $obj->email_address);
-			$mail_title = "[XE - " . Context::get('mid') . "] A new comment was posted on document: \"" . $oDocument->getTitleText() . "\"";
+			$mail_title = "[XE - ".Context::get('mid')."] A new comment was posted on document: \"".$oDocument->getTitleText()."\"";
 			$oMail->setTitle($mail_title);
-			$url_comment = getFullUrl('','document_srl',$obj->document_srl).'#comment_'.$obj->comment_srl;
-			if($using_validation)
+			$url_comment = getFullUrl('', 'document_srl', $obj->document_srl).'#comment_'.$obj->comment_srl;
+			if ($using_validation)
 			{
 				$url_approve = getFullUrl('', 'module', 'admin', 'act', 'procCommentAdminChangePublishedStatusChecked', 'cart[]', $obj->comment_srl, 'will_publish', '1', 'search_target', 'is_published', 'search_keyword', 'N');
 				$url_trash = getFullUrl('', 'module', 'admin', 'act', 'procCommentAdminDeleteChecked', 'cart[]', $obj->comment_srl, 'search_target', 'is_trash', 'search_keyword', 'true');
 				$mail_content = "
-					A new comment on the document \"" . $oDocument->getTitleText() . "\" is waiting for your approval.
+					A new comment on the document \"" . $oDocument->getTitleText()."\" is waiting for your approval.
 					<br />
 					<br />
-					Author: " . $member_info->nick_name . "
-					<br />Author e-mail: " . $member_info->email_address . "
-					<br />From : <a href=\"" . $url_comment . "\">" . $url_comment . "</a>
+					Author: " . $member_info->nick_name."
+					<br />Author e-mail: " . $member_info->email_address."
+					<br />From : <a href=\"" . $url_comment."\">".$url_comment."</a>
 					<br />Comment:
-					<br />\"" . $obj->content . "\"
+					<br />\"" . $obj->content."\"
 					<br />Document:
-					<br />\"" . $oDocument->getContentText(). "\"
+					<br />\"" . $oDocument->getContentText()."\"
 					<br />
 					<br />
-					Approve it: <a href=\"" . $url_approve . "\">" . $url_approve . "</a>
-					<br />Trash it: <a href=\"" . $url_trash . "\">" . $url_trash . "</a>
-					<br />Currently " . $nr_comments_not_approved . " comments on \"" . Context::get('mid') . "\" module are waiting for approval. Please visit the moderation panel:
-					<br /><a href=\"" . getFullUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_target', 'module', 'search_keyword', $obj->module_srl) . "\">" . getFullUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_target', 'module', 'search_keyword', $obj->module_srl) . "</a>
+					Approve it: <a href=\"" . $url_approve."\">".$url_approve."</a>
+					<br />Trash it: <a href=\"" . $url_trash."\">".$url_trash."</a>
+					<br />Currently " . $nr_comments_not_approved." comments on \"".Context::get('mid')."\" module are waiting for approval. Please visit the moderation panel:
+					<br /><a href=\"" . getFullUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_target', 'module', 'search_keyword', $obj->module_srl)."\">".getFullUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_target', 'module', 'search_keyword', $obj->module_srl)."</a>
 					";
 				$oMail->setContent($mail_content);
 			}
 			else
 			{
 				$mail_content = "
-					Author: " . $member_info->nick_name . "
-					<br />Author e-mail: " . $member_info->email_address . "
-					<br />From : <a href=\"" . $url_comment . "\">" . $url_comment . "</a>
+					Author: " . $member_info->nick_name."
+					<br />Author e-mail: " . $member_info->email_address."
+					<br />From : <a href=\"" . $url_comment."\">".$url_comment."</a>
 					<br />Comment:
-					<br />\"" . $obj->content . "\"
+					<br />\"" . $obj->content."\"
 					<br />Document:
-					<br />\"" . $oDocument->getContentText(). "\"
+					<br />\"" . $oDocument->getContentText()."\"
 					";
 				$oMail->setContent($mail_content);
 
@@ -597,10 +597,10 @@ 
 			$target_mail = explode(',', $admins_emails);
 
 			// send email to all admins - START
-			for($i = 0; $i < count($target_mail); $i++)
+			for ($i = 0; $i < count($target_mail); $i++)
 			{
 				$email_address = trim($target_mail[$i]);
-				if(!$email_address)
+				if (!$email_address)
 				{
 					continue;
 				}
@@ -646,12 +646,12 @@ 
 	 */
 	function updateComment($obj, $is_admin = FALSE, $manual_updated = FALSE)
 	{
-		if(!$manual_updated && !checkCSRF())
+		if (!$manual_updated && !checkCSRF())
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
-		if(!is_object($obj))
+		if (!is_object($obj))
 		{
 			$obj = new stdClass();
 		}
@@ -660,7 +660,7 @@ 
 
 		// call a trigger (before)
 		$output = ModuleHandler::triggerCall('comment.updateComment', 'before', $obj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -670,7 +670,7 @@ 
 
 		// get the original data
 		$source_obj = $oCommentModel->getComment($obj->comment_srl);
-		if(!$source_obj->getMemberSrl())
+		if (!$source_obj->getMemberSrl())
 		{
 			$obj->member_srl = $source_obj->get('member_srl');
 			$obj->user_name = $source_obj->get('user_name');
@@ -680,30 +680,30 @@ 
 		}
 
 		// check if permission is granted
-		if(!$is_admin && !$source_obj->isGranted())
+		if (!$is_admin && !$source_obj->isGranted())
 		{
 			return new Object(-1, 'msg_not_permitted');
 		}
 
-		if($obj->password)
+		if ($obj->password)
 		{
 			$obj->password = getModel('member')->hashPassword($obj->password);
 		}
 
-		if($obj->homepage) 
+		if ($obj->homepage) 
 		{
 			$obj->homepage = removeHackTag($obj->homepage);
-			if(!preg_match('/^[a-z]+:\/\//i',$obj->homepage))
+			if (!preg_match('/^[a-z]+:\/\//i', $obj->homepage))
 			{
 				$obj->homepage = 'http://'.$obj->homepage;
 			}
 		}
 
 		// set modifier's information if logged-in and posting author and modifier are matched.
-		if(Context::get('is_logged'))
+		if (Context::get('is_logged'))
 		{
 			$logged_info = Context::get('logged_info');
-			if($source_obj->member_srl == $logged_info->member_srl)
+			if ($source_obj->member_srl == $logged_info->member_srl)
 			{
 				$obj->member_srl = $logged_info->member_srl;
 				$obj->user_name = $logged_info->user_name;
@@ -714,7 +714,7 @@ 
 		}
 
 		// if nick_name of the logged-in author doesn't exist
-		if($source_obj->get('member_srl') && !$obj->nick_name)
+		if ($source_obj->get('member_srl') && !$obj->nick_name)
 		{
 			$obj->member_srl = $source_obj->get('member_srl');
 			$obj->user_name = $source_obj->get('user_name');
@@ -723,7 +723,7 @@ 
 			$obj->homepage = $source_obj->get('homepage');
 		}
 
-		if(!$obj->content)
+		if (!$obj->content)
 		{
 			$obj->content = $source_obj->get('content');
 		}
@@ -731,9 +731,9 @@ 
 		// remove XE's wn tags from contents
 		$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
 
-		if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
+		if (Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
 		{
-			if($obj->use_html != 'Y')
+			if ($obj->use_html != 'Y')
 			{
 				$obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 			}
@@ -741,7 +741,7 @@ 
 		}
 
 		// remove iframe and script if not a top administrator on the session
-		if($logged_info->is_admin != 'Y')
+		if ($logged_info->is_admin != 'Y')
 		{
 			$obj->content = removeHackTag($obj->content);
 		}
@@ -752,17 +752,17 @@ 
 
 		// Update
 		$output = executeQuery('comment.updateComment', $obj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
 		// call a trigger (after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$trigger_output = ModuleHandler::triggerCall('comment.updateComment', 'after', $obj);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -791,7 +791,7 @@ 
 
 		// check if comment already exists
 		$comment = $oCommentModel->getComment($comment_srl);
-		if($comment->comment_srl != $comment_srl)
+		if ($comment->comment_srl != $comment_srl)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -800,28 +800,28 @@ 
 
 		// call a trigger (before)
 		$output = ModuleHandler::triggerCall('comment.deleteComment', 'before', $comment);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
 		// check if permission is granted
-		if(!$is_admin && !$comment->isGranted())
+		if (!$is_admin && !$comment->isGranted())
 		{
 			return new Object(-1, 'msg_not_permitted');
 		}
 
 		// check if child comment exists on the comment
 		$childs = $oCommentModel->getChildComments($comment_srl);
-		if(count($childs) > 0)
+		if (count($childs) > 0)
 		{
 			$deleteAllComment = TRUE;
-			if(!$is_admin)
+			if (!$is_admin)
 			{
 				$logged_info = Context::get('logged_info');
-				foreach($childs as $val)
+				foreach ($childs as $val)
 				{
-					if($val->member_srl != $logged_info->member_srl)
+					if ($val->member_srl != $logged_info->member_srl)
 					{
 						$deleteAllComment = FALSE;
 						break;
@@ -829,16 +829,16 @@ 
 				}
 			}
 
-			if(!$deleteAllComment)
+			if (!$deleteAllComment)
 			{
 				return new Object(-1, 'fail_to_delete_have_children');
 			}
 			else
 			{
-				foreach($childs as $val)
+				foreach ($childs as $val)
 				{
 					$output = $this->deleteComment($val->comment_srl, $is_admin, $isMoveToTrash);
-					if(!$output->toBool())
+					if (!$output->toBool())
 					{
 						return $output;
 					}
@@ -854,7 +854,7 @@ 
 		$args = new stdClass();
 		$args->comment_srl = $comment_srl;
 		$output = executeQuery('comment.deleteComment', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -866,14 +866,14 @@ 
 		$comment_count = $oCommentModel->getCommentCount($document_srl);
 
 		// only document is exists
-		if(isset($comment_count))
+		if (isset($comment_count))
 		{
 			// create the controller object of the document
 			$oDocumentController = getController('document');
 
 			// update comment count of the article posting
 			$output = $oDocumentController->updateCommentCount($document_srl, $comment_count, NULL, FALSE);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
@@ -881,11 +881,11 @@ 
 		}
 
 		// call a trigger (after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$comment->isMoveToTrash = $isMoveToTrash;
 			$trigger_output = ModuleHandler::triggerCall('comment.deleteComment', 'after', $comment);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -893,7 +893,7 @@ 
 			unset($comment->isMoveToTrash);
 		}
 
-		if(!$isMoveToTrash)
+		if (!$isMoveToTrash)
 		{
 			$this->_deleteDeclaredComments($args);
 			$this->_deleteVotedComments($args);
@@ -937,7 +937,7 @@ 
 		$oCommentModel = getModel('comment');
 
 		// check if permission is granted
-		if(is_object($obj))
+		if (is_object($obj))
 		{
 			$oDocument = new documentItem();
 			$oDocument->setAttribute($obj);
@@ -947,7 +947,7 @@ 
 			$oDocument = $oDocumentModel->getDocument($document_srl);
 		}
 
-		if(!$oDocument->isExists() || !$oDocument->isGranted())
+		if (!$oDocument->isExists() || !$oDocument->isGranted())
 		{
 			return new Object(-1, 'msg_not_permitted');
 		}
@@ -956,23 +956,23 @@ 
 		$args = new stdClass();
 		$args->document_srl = $document_srl;
 		$comments = executeQueryArray('comment.getAllComments', $args);
-		if($comments->data)
+		if ($comments->data)
 		{
 			$commentSrlList = array();
-			foreach($comments->data as $comment)
+			foreach ($comments->data as $comment)
 			{
 				$commentSrlList[] = $comment->comment_srl;
 
 				// call a trigger (before)
 				$output = ModuleHandler::triggerCall('comment.deleteComment', 'before', $comment);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					continue;
 				}
 
 				// call a trigger (after)
 				$output = ModuleHandler::triggerCall('comment.deleteComment', 'after', $comment);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					continue;
 				}
@@ -982,7 +982,7 @@ 
 		// delete the comment
 		$args->document_srl = $document_srl;
 		$output = executeQuery('comment.deleteComments', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -991,7 +991,7 @@ 
 		$output = executeQuery('comment.deleteCommentsList', $args);
 
 		//delete declared, declared_log, voted_log
-		if(is_array($commentSrlList) && count($commentSrlList) > 0)
+		if (is_array($commentSrlList) && count($commentSrlList) > 0)
 		{
 			$args = new stdClass();
 			$args->comment_srl = join(',', $commentSrlList);
@@ -1031,7 +1031,7 @@ 
 	 */
 	function updateVotedCount($comment_srl, $point = 1)
 	{
-		if($point > 0)
+		if ($point > 0)
 		{
 			$failed_voted = 'failed_voted';
 			$success_message = 'success_voted';
@@ -1043,7 +1043,7 @@ 
 		}
 
 		// invalid vote if vote info exists in the session info.
-		if($_SESSION['voted_comment'][$comment_srl])
+		if ($_SESSION['voted_comment'][$comment_srl])
 		{
 			return new Object(-1, $failed_voted);
 		}
@@ -1052,21 +1052,21 @@ 
 		$oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE);
 
 		// invalid vote if both ip addresses between author's and the current user are same.
-		if($oComment->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
+		if ($oComment->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
 		{
 			$_SESSION['voted_comment'][$comment_srl] = TRUE;
 			return new Object(-1, $failed_voted);
 		}
 
 		// if the comment author is a member
-		if($oComment->get('member_srl'))
+		if ($oComment->get('member_srl'))
 		{
 			// create the member model object
 			$oMemberModel = getModel('member');
 			$member_srl = $oMemberModel->getLoggedMemberSrl();
 
 			// session registered if the author information matches to the current logged-in user's.
-			if($member_srl && $member_srl == abs($oComment->get('member_srl')))
+			if ($member_srl && $member_srl == abs($oComment->get('member_srl')))
 			{
 				$_SESSION['voted_comment'][$comment_srl] = TRUE;
 				return new Object(-1, $failed_voted);
@@ -1076,7 +1076,7 @@ 
 		$args = new stdClass();
 
 		// If logged-in, use the member_srl. otherwise use the ipaddress.
-		if($member_srl)
+		if ($member_srl)
 		{
 			$args->member_srl = $member_srl;
 		}
@@ -1089,7 +1089,7 @@ 
 		$output = executeQuery('comment.getCommentVotedLogInfo', $args);
 
 		// session registered if log info contains recommendation vote log.
-		if($output->data->count)
+		if ($output->data->count)
 		{
 			$_SESSION['voted_comment'][$comment_srl] = TRUE;
 			return new Object(-1, $failed_voted);
@@ -1100,7 +1100,7 @@ 
 		$oDB->begin();
 
 		// update the number of votes
-		if($point < 0)
+		if ($point < 0)
 		{
 			$args->blamed_count = $oComment->get('blamed_count') + $point;
 			$output = executeQuery('comment.updateBlamedCount', $args);
@@ -1124,7 +1124,7 @@ 
 		$obj->before_point = ($point < 0) ? $oComment->get('blamed_count') : $oComment->get('voted_count');
 		$obj->after_point = ($point < 0) ? $args->blamed_count : $args->voted_count;
 		$trigger_output = ModuleHandler::triggerCall('comment.updateVotedCount', 'after', $obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			$oDB->rollback();
 			return $trigger_output;
@@ -1137,7 +1137,7 @@ 
 
 		// Return the result
 		$output = new Object(0, $success_message);
-		if($point > 0)
+		if ($point > 0)
 		{
 			$output->add('voted_count', $obj->after_point);
 		}
@@ -1157,7 +1157,7 @@ 
 	function declaredComment($comment_srl)
 	{
 		// Fail if session information already has a reported document
-		if($_SESSION['declared_comment'][$comment_srl])
+		if ($_SESSION['declared_comment'][$comment_srl])
 		{
 			return new Object(-1, 'failed_declared');
 		}
@@ -1166,7 +1166,7 @@ 
 		$args = new stdClass();
 		$args->comment_srl = $comment_srl;
 		$output = executeQuery('comment.getDeclaredComment', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -1178,7 +1178,7 @@ 
 
 		// Call a trigger (before)
 		$trigger_output = ModuleHandler::triggerCall('comment.declaredComment', 'before', $trigger_obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			return $trigger_output;
 		}
@@ -1188,21 +1188,21 @@ 
 		$oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE);
 
 		// failed if both ip addresses between author's and the current user are same.
-		if($oComment->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
+		if ($oComment->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
 		{
 			$_SESSION['declared_comment'][$comment_srl] = TRUE;
 			return new Object(-1, 'failed_declared');
 		}
 
 		// if the comment author is a member
-		if($oComment->get('member_srl'))
+		if ($oComment->get('member_srl'))
 		{
 			// create the member model object
 			$oMemberModel = getModel('member');
 			$member_srl = $oMemberModel->getLoggedMemberSrl();
 
 			// session registered if the author information matches to the current logged-in user's.
-			if($member_srl && $member_srl == abs($oComment->get('member_srl')))
+			if ($member_srl && $member_srl == abs($oComment->get('member_srl')))
 			{
 				$_SESSION['declared_comment'][$comment_srl] = TRUE;
 				return new Object(-1, 'failed_declared');
@@ -1210,7 +1210,7 @@ 
 		}
 
 		// If logged-in, use the member_srl. otherwise use the ipaddress.
-		if($member_srl)
+		if ($member_srl)
 		{
 			$args->member_srl = $member_srl;
 		}
@@ -1222,7 +1222,7 @@ 
 		$log_output = executeQuery('comment.getCommentDeclaredLogInfo', $args);
 
 		// session registered if log info contains report log.
-		if($log_output->data->count)
+		if ($log_output->data->count)
 		{
 			$_SESSION['declared_comment'][$comment_srl] = TRUE;
 			return new Object(-1, 'failed_declared');
@@ -1233,7 +1233,7 @@ 
 		$oDB->begin();
 
 		// execute insert
-		if($output->data->declared_count > 0)
+		if ($output->data->declared_count > 0)
 		{
 			$output = executeQuery('comment.updateDeclaredComment', $args);
 		}
@@ -1242,7 +1242,7 @@ 
 			$output = executeQuery('comment.insertDeclaredComment', $args);
 		}
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -1254,7 +1254,7 @@ 
 		// Call a trigger (after)
 		$trigger_obj->declared_count = $declared_count + 1;
 		$trigger_output = ModuleHandler::triggerCall('comment.declaredComment', 'after', $trigger_obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			$oDB->rollback();
 			return $trigger_output;
@@ -1279,7 +1279,7 @@ 
 	function addCommentPopupMenu($url, $str, $icon = '', $target = 'self')
 	{
 		$comment_popup_menu_list = Context::get('comment_popup_menu_list');
-		if(!is_array($comment_popup_menu_list))
+		if (!is_array($comment_popup_menu_list))
 		{
 			$comment_popup_menu_list = array();
 		}
@@ -1301,7 +1301,7 @@ 
 	function procCommentInsertModuleConfig()
 	{
 		$module_srl = Context::get('target_module_srl');
-		if(preg_match('/^([0-9,]+)$/', $module_srl))
+		if (preg_match('/^([0-9,]+)$/', $module_srl))
 		{
 			$module_srl = explode(',', $module_srl);
 		}
@@ -1312,33 +1312,33 @@ 
 
 		$comment_config = new stdClass();
 		$comment_config->comment_count = (int) Context::get('comment_count');
-		if(!$comment_config->comment_count)
+		if (!$comment_config->comment_count)
 		{
 			$comment_config->comment_count = 50;
 		}
 
 		$comment_config->use_vote_up = Context::get('use_vote_up');
-		if(!$comment_config->use_vote_up)
+		if (!$comment_config->use_vote_up)
 		{
 			$comment_config->use_vote_up = 'Y';
 		}
 
 		$comment_config->use_vote_down = Context::get('use_vote_down');
-		if(!$comment_config->use_vote_down)
+		if (!$comment_config->use_vote_down)
 		{
 			$comment_config->use_vote_down = 'Y';
 		}
 
 		$comment_config->use_comment_validation = Context::get('use_comment_validation');
-		if(!$comment_config->use_comment_validation)
+		if (!$comment_config->use_comment_validation)
 		{
 			$comment_config->use_comment_validation = 'N';
 		}
 
-		for($i = 0; $i < count($module_srl); $i++)
+		for ($i = 0; $i < count($module_srl); $i++)
 		{
 			$srl = trim($module_srl[$i]);
-			if(!$srl)
+			if (!$srl)
 			{
 				continue;
 			}
@@ -1372,25 +1372,25 @@ 
 	 */
 	function procCommentGetList()
 	{
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new Object(-1, 'msg_not_permitted');
 		}
 
 		$commentSrls = Context::get('comment_srls');
-		if($commentSrls)
+		if ($commentSrls)
 		{
 			$commentSrlList = explode(',', $commentSrls);
 		}
 
-		if(count($commentSrlList) > 0)
+		if (count($commentSrlList) > 0)
 		{
 			$oCommentModel = getModel('comment');
 			$commentList = $oCommentModel->getComments($commentSrlList);
 
-			if(is_array($commentList))
+			if (is_array($commentList))
 			{
-				foreach($commentList as $value)
+				foreach ($commentList as $value)
 				{
 					$value->content = strip_tags($value->content);
 				}
@@ -1415,9 +1415,9 @@ 
 		$commentConfig = $oModuleModel->getModulePartConfig('comment', $obj->originModuleSrl);
 
 		$oModuleController = getController('module');
-		if(is_array($obj->moduleSrlList))
+		if (is_array($obj->moduleSrlList))
 		{
-			foreach($obj->moduleSrlList as $moduleSrl)
+			foreach ($obj->moduleSrlList as $moduleSrl)
 			{
 				$oModuleController->insertModulePartConfig('comment', $moduleSrl, $commentConfig);
 			}

modules/board/board.controller.php

Spacing +74 added lines, -74 removed lines

@@ -23,11 +23,11 @@ 
 	function procBoardInsertDocument()
 	{
 		// check grant
-		if($this->module_info->module != "board")
+		if ($this->module_info->module != "board")
 		{
 			return new Object(-1, "msg_invalid_request");
 		}
-		if(!$this->grant->write_document)
+		if (!$this->grant->write_document)
 		{
 			return new Object(-1, 'msg_not_permitted');
 		}
@@ -36,29 +36,29 @@ 
 		// setup variables
 		$obj = Context::getRequestVars();
 		$obj->module_srl = $this->module_srl;
-		if($obj->is_notice!='Y'||!$this->grant->manager) $obj->is_notice = 'N';
+		if ($obj->is_notice != 'Y' || !$this->grant->manager) $obj->is_notice = 'N';
 		$obj->commentStatus = $obj->comment_status;
 
 		$oModuleModel = getModel('module');
 		$module_config = $oModuleModel->getModuleInfoByModuleSrl($obj->module_srl);
-		if($module_config->mobile_use_editor === 'Y')
+		if ($module_config->mobile_use_editor === 'Y')
 		{
-			if(!isset($obj->use_editor)) $obj->use_editor = 'Y';
-			if(!isset($obj->use_html)) $obj->use_html = 'Y';
+			if (!isset($obj->use_editor)) $obj->use_editor = 'Y';
+			if (!isset($obj->use_html)) $obj->use_html = 'Y';
 		}
 		else
 		{
-			if(!isset($obj->use_editor)) $obj->use_editor = 'N';
-			if(!isset($obj->use_html)) $obj->use_html = 'N';
+			if (!isset($obj->use_editor)) $obj->use_editor = 'N';
+			if (!isset($obj->use_html)) $obj->use_html = 'N';
 		}
 
 		settype($obj->title, "string");
-		if($obj->title == '') $obj->title = cut_str(trim(strip_tags(nl2br($obj->content))),20,'...');
+		if ($obj->title == '') $obj->title = cut_str(trim(strip_tags(nl2br($obj->content))), 20, '...');
 		//setup dpcument title tp 'Untitled'
-		if($obj->title == '') $obj->title = 'Untitled';
+		if ($obj->title == '') $obj->title = 'Untitled';
 
 		// unset document style if the user is not the document manager
-		if(!$this->grant->manager)
+		if (!$this->grant->manager)
 		{
 			unset($obj->title_color);
 			unset($obj->title_bold);
@@ -75,24 +75,24 @@ 
 
 		// update the document if it is existed
 		$is_update = false;
-		if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
+		if ($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
 		{
 			$is_update = true;
 		}
 
 		// if use anonymous is true
-		if($this->module_info->use_anonymous == 'Y')
+		if ($this->module_info->use_anonymous == 'Y')
 		{
 			$this->module_info->admin_mail = '';
 			$obj->notify_message = 'N';
-			if($is_update===false)
+			if ($is_update === false)
 			{
-				$obj->member_srl = -1*$logged_info->member_srl;
+				$obj->member_srl = -1 * $logged_info->member_srl;
 			}
 			$obj->email_address = $obj->homepage = $obj->user_id = '';
 			$obj->user_name = $obj->nick_name = 'anonymous';
 			$bAnonymous = true;
-			if($is_update===false)
+			if ($is_update === false)
 			{
 				$oDocument->add('member_srl', $obj->member_srl);
 			}
@@ -102,10 +102,10 @@ 
 			$bAnonymous = false;
 		}
 
-		if($obj->is_secret == 'Y' || strtoupper($obj->status == 'SECRET'))
+		if ($obj->is_secret == 'Y' || strtoupper($obj->status == 'SECRET'))
 		{
 			$use_status = explode('|@|', $this->module_info->use_status);
-			if(!is_array($use_status) || !in_array('SECRET', $use_status))
+			if (!is_array($use_status) || !in_array('SECRET', $use_status))
 			{
 				unset($obj->is_secret);
 				$obj->status = 'PUBLIC';
@@ -113,24 +113,24 @@ 
 		}
 
 		// update the document if it is existed
-		if($is_update)
+		if ($is_update)
 		{
-			if(!$oDocument->isGranted())
+			if (!$oDocument->isGranted())
 			{
-				return new Object(-1,'msg_not_permitted');
+				return new Object(-1, 'msg_not_permitted');
 			}
 
-			if($this->module_info->use_anonymous == 'Y') {
+			if ($this->module_info->use_anonymous == 'Y') {
 				$obj->member_srl = abs($oDocument->get('member_srl')) * -1;
 				$oDocument->add('member_srl', $obj->member_srl);
 			}
 
-			if($this->module_info->protect_content=="Y" && $oDocument->get('comment_count')>0 && $this->grant->manager==false)
+			if ($this->module_info->protect_content == "Y" && $oDocument->get('comment_count') > 0 && $this->grant->manager == false)
 			{
-				return new Object(-1,'msg_protect_content');
+				return new Object(-1, 'msg_protect_content');
 			}
 
-			if(!$this->grant->manager)
+			if (!$this->grant->manager)
 			{
 				// notice & document style same as before if not manager
 				$obj->is_notice = $oDocument->get('is_notice');
@@ -139,7 +139,7 @@ 
 			}
 			
 			// modify list_order if document status is temp
-			if($oDocument->get('status') == 'TEMP')
+			if ($oDocument->get('status') == 'TEMP')
 			{
 				$obj->last_update = $obj->regdate = date('YmdHis');
 				$obj->update_order = $obj->list_order = (getNextSequence() * -1);
@@ -155,21 +155,21 @@ 
 			$obj->document_srl = $output->get('document_srl');
 
 			// send an email to admin user
-			if($output->toBool() && $this->module_info->admin_mail)
+			if ($output->toBool() && $this->module_info->admin_mail)
 			{
 				$oModuleModel = getModel('module');
 				$member_config = $oModuleModel->getModuleConfig('member');
 				
 				$oMail = new Mail();
 				$oMail->setTitle($obj->title);
-				$oMail->setContent( sprintf("From : <a href=\"%s\">%s</a><br/>\r\n%s", getFullUrl('','document_srl',$obj->document_srl), getFullUrl('','document_srl',$obj->document_srl), $obj->content));
+				$oMail->setContent(sprintf("From : <a href=\"%s\">%s</a><br/>\r\n%s", getFullUrl('', 'document_srl', $obj->document_srl), getFullUrl('', 'document_srl', $obj->document_srl), $obj->content));
 				$oMail->setSender($obj->user_name ? $obj->user_name : 'anonymous', $obj->email_address ? $obj->email_address : $member_config->webmaster_email);
 
-				$target_mail = explode(',',$this->module_info->admin_mail);
-				for($i=0;$i<count($target_mail);$i++)
+				$target_mail = explode(',', $this->module_info->admin_mail);
+				for ($i = 0; $i < count($target_mail); $i++)
 				{
 					$email_address = trim($target_mail[$i]);
-					if(!$email_address) continue;
+					if (!$email_address) continue;
 					$oMail->setReceiptor($email_address, $email_address);
 					$oMail->send();
 				}
@@ -177,7 +177,7 @@ 
 		}
 
 		// if there is an error
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -187,7 +187,7 @@ 
 		$this->add('document_srl', $output->get('document_srl'));
 
 		// alert a message
-		if(Context::get('xeVirtualRequestMethod') !== 'xml')
+		if (Context::get('xeVirtualRequestMethod') !== 'xml')
 		{
 			$this->setMessage($msg_code);
 		}
@@ -202,7 +202,7 @@ 
 		$document_srl = Context::get('document_srl');
 
 		// if the document is not existed
-		if(!$document_srl)
+		if (!$document_srl)
 		{
 			return $this->doError('msg_invalid_document');
 		}
@@ -210,7 +210,7 @@ 
 		$oDocumentModel = &getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
 		// check protect content
-		if($this->module_info->protect_content=="Y" && $oDocument->get('comment_count')>0 && $this->grant->manager==false)
+		if ($this->module_info->protect_content == "Y" && $oDocument->get('comment_count') > 0 && $this->grant->manager == false)
 		{
 			return new Object(-1, 'msg_protect_content');
 		}
@@ -220,7 +220,7 @@ 
 
 		// delete the document
 		$output = $oDocumentController->deleteDocument($document_srl, $this->grant->manager);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -229,7 +229,7 @@ 
 		$this->setRedirectUrl(getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '', 'page', Context::get('page'), 'document_srl', ''));
 		$this->add('mid', Context::get('mid'));
 		$this->add('page', Context::get('page'));
-		if(Context::get('xeVirtualRequestMethod') !== 'xml')
+		if (Context::get('xeVirtualRequestMethod') !== 'xml')
 		{
 			$this->setMessage('success_deleted');
 		}
@@ -253,7 +253,7 @@ 
 	function procBoardInsertComment()
 	{
 		// check grant
-		if(!$this->grant->write_comment)
+		if (!$this->grant->write_comment)
 		{
 			return new Object(-1, 'msg_not_permitted');
 		}
@@ -263,13 +263,13 @@ 
 		$obj = Context::getRequestVars();
 		$obj->module_srl = $this->module_srl;
 
-		if(!$this->module_info->use_status) $this->module_info->use_status = 'PUBLIC';
-		if(!is_array($this->module_info->use_status))
+		if (!$this->module_info->use_status) $this->module_info->use_status = 'PUBLIC';
+		if (!is_array($this->module_info->use_status))
 		{
 			$this->module_info->use_status = explode('|@|', $this->module_info->use_status);
 		}
 
-		if(in_array('SECRET', $this->module_info->use_status))
+		if (in_array('SECRET', $this->module_info->use_status))
 		{
 			$this->module_info->secret = 'Y';
 		}
@@ -281,31 +281,31 @@ 
 
 		$oModuleModel = getModel('module');
 		$module_config = $oModuleModel->getModuleInfoByModuleSrl($obj->module_srl);
-		if($module_config->mobile_use_editor === 'Y')
+		if ($module_config->mobile_use_editor === 'Y')
 		{
-			if(!isset($obj->use_editor)) $obj->use_editor = 'Y';
-			if(!isset($obj->use_html)) $obj->use_html = 'Y';
+			if (!isset($obj->use_editor)) $obj->use_editor = 'Y';
+			if (!isset($obj->use_html)) $obj->use_html = 'Y';
 		}
 		else
 		{
-			if(!isset($obj->use_editor)) $obj->use_editor = 'N';
-			if(!isset($obj->use_html)) $obj->use_html = 'N';
+			if (!isset($obj->use_editor)) $obj->use_editor = 'N';
+			if (!isset($obj->use_html)) $obj->use_html = 'N';
 		}
 
 		// check if the doument is existed
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($obj->document_srl);
-		if(!$oDocument->isExists())
+		if (!$oDocument->isExists())
 		{
-			return new Object(-1,'msg_not_founded');
+			return new Object(-1, 'msg_not_founded');
 		}
 
 		// For anonymous use, remove writer's information and notifying information
-		if($this->module_info->use_anonymous == 'Y')
+		if ($this->module_info->use_anonymous == 'Y')
 		{
 			$this->module_info->admin_mail = '';
 			$obj->notify_message = 'N';
-			$obj->member_srl = -1*$logged_info->member_srl;
+			$obj->member_srl = -1 * $logged_info->member_srl;
 			$obj->email_address = $obj->homepage = $obj->user_id = '';
 			$obj->user_name = $obj->nick_name = 'anonymous';
 			$bAnonymous = true;
@@ -323,7 +323,7 @@ 
 
 		// check the comment is existed
 		// if the comment is not existed, then generate a new sequence
-		if(!$obj->comment_srl)
+		if (!$obj->comment_srl)
 		{
 			$obj->comment_srl = getNextSequence();
 		} else {
@@ -331,14 +331,14 @@ 
 		}
 
 		// if comment_srl is not existed, then insert the comment
-		if($comment->comment_srl != $obj->comment_srl)
+		if ($comment->comment_srl != $obj->comment_srl)
 		{
 
 			// parent_srl is existed
-			if($obj->parent_srl)
+			if ($obj->parent_srl)
 			{
 				$parent_comment = $oCommentModel->getComment($obj->parent_srl);
-				if(!$parent_comment->comment_srl)
+				if (!$parent_comment->comment_srl)
 				{
 					return new Object(-1, 'msg_invalid_request');
 				}
@@ -352,9 +352,9 @@ 
 		// update the comment if it is not existed
 		} else {
 			// check the grant
-			if(!$comment->isGranted())
+			if (!$comment->isGranted())
 			{
-				return new Object(-1,'msg_not_permitted');
+				return new Object(-1, 'msg_not_permitted');
 			}
 
 			$obj->parent_srl = $comment->parent_srl;
@@ -362,12 +362,12 @@ 
 			$comment_srl = $obj->comment_srl;
 		}
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
-		if(Context::get('xeVirtualRequestMethod') !== 'xml')
+		if (Context::get('xeVirtualRequestMethod') !== 'xml')
 		{
 			$this->setMessage('success_registed');
 		}
@@ -383,7 +383,7 @@ 
 	{
 		// get the comment_srl
 		$comment_srl = Context::get('comment_srl');
-		if(!$comment_srl)
+		if (!$comment_srl)
 		{
 			return $this->doError('msg_invalid_request');
 		}
@@ -392,7 +392,7 @@ 
 		$oCommentController = getController('comment');
 
 		$output = $oCommentController->deleteComment($comment_srl, $this->grant->manager);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -400,7 +400,7 @@ 
 		$this->add('mid', Context::get('mid'));
 		$this->add('page', Context::get('page'));
 		$this->add('document_srl', $output->get('document_srl'));
-		if(Context::get('xeVirtualRequestMethod') !== 'xml')
+		if (Context::get('xeVirtualRequestMethod') !== 'xml')
 		{
 			$this->setMessage('success_deleted');
 		}
@@ -416,10 +416,10 @@ 
 		// generate trackback module controller object
 		$oTrackbackController = getController('trackback');
 
-		if(!$oTrackbackController) return;
+		if (!$oTrackbackController) return;
 
 		$output = $oTrackbackController->deleteTrackback($trackback_srl, $this->grant->manager);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -427,7 +427,7 @@ 
 		$this->add('mid', Context::get('mid'));
 		$this->add('page', Context::get('page'));
 		$this->add('document_srl', $output->get('document_srl'));
-		if(Context::get('xeVirtualRequestMethod') !== 'xml')
+		if (Context::get('xeVirtualRequestMethod') !== 'xml')
 		{
 			$this->setMessage('success_deleted');
 		}
@@ -446,18 +446,18 @@ 
 		$oMemberModel = getModel('member');
 
 		// if the comment exists
-		if($comment_srl)
+		if ($comment_srl)
 		{
 			// get the comment information
 			$oCommentModel = getModel('comment');
 			$oComment = $oCommentModel->getComment($comment_srl);
-			if(!$oComment->isExists())
+			if (!$oComment->isExists())
 			{
 				return new Object(-1, 'msg_invalid_request');
 			}
 
 			// compare the comment password and the user input password
-			if(!$oMemberModel->isValidPassword($oComment->get('password'),$password))
+			if (!$oMemberModel->isValidPassword($oComment->get('password'), $password))
 			{
 				return new Object(-1, 'msg_invalid_password');
 			}
@@ -467,13 +467,13 @@ 
 			 // get the document information
 			$oDocumentModel = getModel('document');
 			$oDocument = $oDocumentModel->getDocument($document_srl);
-			if(!$oDocument->isExists())
+			if (!$oDocument->isExists())
 			{
 				return new Object(-1, 'msg_invalid_request');
 			}
 
 			// compare the document password and the user input password
-			if(!$oMemberModel->isValidPassword($oDocument->get('password'),$password))
+			if (!$oMemberModel->isValidPassword($oDocument->get('password'), $password))
 			{
 				return new Object(-1, 'msg_invalid_password');
 			}
@@ -490,7 +490,7 @@ 
 		$member_srl = Context::get('target_srl');
 		$mid = Context::get('cur_mid');
 
-		if(!$member_srl || !$mid)
+		if (!$member_srl || !$mid)
 		{
 			return new Object();
 		}
@@ -502,13 +502,13 @@ 
 		$columnList = array('module');
 		$cur_module_info = $oModuleModel->getModuleInfoByMid($mid, 0, $columnList);
 
-		if($cur_module_info->module != 'board')
+		if ($cur_module_info->module != 'board')
 		{
 			return new Object();
 		}
 
 		// get the member information
-		if($member_srl == $logged_info->member_srl)
+		if ($member_srl == $logged_info->member_srl)
 		{
 			$member_info = $logged_info;
 		} else {
@@ -516,13 +516,13 @@ 
 			$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
 		}
 
-		if(!$member_info->user_id)
+		if (!$member_info->user_id)
 		{
 			return new Object();
 		}
 
 		//search
-		$url = getUrl('','mid',$mid,'search_target','nick_name','search_keyword',$member_info->nick_name);
+		$url = getUrl('', 'mid', $mid, 'search_target', 'nick_name', 'search_keyword', $member_info->nick_name);
 		$oMemberController = getController('member');
 		$oMemberController->addMemberPopupMenu($url, 'cmd_view_own_document', '');
 

Braces +47 added lines, -24 removed lines

@@ -36,26 +36,39 @@ 
 		// setup variables
 		$obj = Context::getRequestVars();
 		$obj->module_srl = $this->module_srl;
-		if($obj->is_notice!='Y'||!$this->grant->manager) $obj->is_notice = 'N';
+		if($obj->is_notice!='Y'||!$this->grant->manager) {
+			$obj->is_notice = 'N';
+		}
 		$obj->commentStatus = $obj->comment_status;
 
 		$oModuleModel = getModel('module');
 		$module_config = $oModuleModel->getModuleInfoByModuleSrl($obj->module_srl);
 		if($module_config->mobile_use_editor === 'Y')
 		{
-			if(!isset($obj->use_editor)) $obj->use_editor = 'Y';
-			if(!isset($obj->use_html)) $obj->use_html = 'Y';
-		}
-		else
+			if(!isset($obj->use_editor)) {
+				$obj->use_editor = 'Y';
+			}
+			if(!isset($obj->use_html)) {
+				$obj->use_html = 'Y';
+			}
+		} else
 		{
-			if(!isset($obj->use_editor)) $obj->use_editor = 'N';
-			if(!isset($obj->use_html)) $obj->use_html = 'N';
+			if(!isset($obj->use_editor)) {
+				$obj->use_editor = 'N';
+			}
+			if(!isset($obj->use_html)) {
+				$obj->use_html = 'N';
+			}
 		}
 
 		settype($obj->title, "string");
-		if($obj->title == '') $obj->title = cut_str(trim(strip_tags(nl2br($obj->content))),20,'...');
+		if($obj->title == '') {
+			$obj->title = cut_str(trim(strip_tags(nl2br($obj->content))),20,'...');
+		}
 		//setup dpcument title tp 'Untitled'
-		if($obj->title == '') $obj->title = 'Untitled';
+		if($obj->title == '') {
+			$obj->title = 'Untitled';
+		}
 
 		// unset document style if the user is not the document manager
 		if(!$this->grant->manager)
@@ -96,8 +109,7 @@ 
 			{
 				$oDocument->add('member_srl', $obj->member_srl);
 			}
-		}
-		else
+		} else
 		{
 			$bAnonymous = false;
 		}
@@ -169,7 +181,9 @@ 
 				for($i=0;$i<count($target_mail);$i++)
 				{
 					$email_address = trim($target_mail[$i]);
-					if(!$email_address) continue;
+					if(!$email_address) {
+						continue;
+					}
 					$oMail->setReceiptor($email_address, $email_address);
 					$oMail->send();
 				}
@@ -263,7 +277,9 @@ 
 		$obj = Context::getRequestVars();
 		$obj->module_srl = $this->module_srl;
 
-		if(!$this->module_info->use_status) $this->module_info->use_status = 'PUBLIC';
+		if(!$this->module_info->use_status) {
+			$this->module_info->use_status = 'PUBLIC';
+		}
 		if(!is_array($this->module_info->use_status))
 		{
 			$this->module_info->use_status = explode('|@|', $this->module_info->use_status);
@@ -272,8 +288,7 @@ 
 		if(in_array('SECRET', $this->module_info->use_status))
 		{
 			$this->module_info->secret = 'Y';
-		}
-		else
+		} else
 		{
 			unset($obj->is_secret);
 			$this->module_info->secret = 'N';
@@ -283,13 +298,20 @@ 
 		$module_config = $oModuleModel->getModuleInfoByModuleSrl($obj->module_srl);
 		if($module_config->mobile_use_editor === 'Y')
 		{
-			if(!isset($obj->use_editor)) $obj->use_editor = 'Y';
-			if(!isset($obj->use_html)) $obj->use_html = 'Y';
-		}
-		else
+			if(!isset($obj->use_editor)) {
+				$obj->use_editor = 'Y';
+			}
+			if(!isset($obj->use_html)) {
+				$obj->use_html = 'Y';
+			}
+		} else
 		{
-			if(!isset($obj->use_editor)) $obj->use_editor = 'N';
-			if(!isset($obj->use_html)) $obj->use_html = 'N';
+			if(!isset($obj->use_editor)) {
+				$obj->use_editor = 'N';
+			}
+			if(!isset($obj->use_html)) {
+				$obj->use_html = 'N';
+			}
 		}
 
 		// check if the doument is existed
@@ -309,8 +331,7 @@ 
 			$obj->email_address = $obj->homepage = $obj->user_id = '';
 			$obj->user_name = $obj->nick_name = 'anonymous';
 			$bAnonymous = true;
-		}
-		else
+		} else
 		{
 			$bAnonymous = false;
 		}
@@ -416,7 +437,9 @@ 
 		// generate trackback module controller object
 		$oTrackbackController = getController('trackback');
 
-		if(!$oTrackbackController) return;
+		if(!$oTrackbackController) {
+			return;
+		}
 
 		$output = $oTrackbackController->deleteTrackback($trackback_srl, $this->grant->manager);
 		if(!$output->toBool())

modules/admin/admin.admin.model.php

Indentation +4 added lines, -4 removed lines

@@ -956,10 +956,10 @@
 
 		$file_exsit = FileHandler::readFile(_XE_PATH_ . 'files/attach/xeicon/' . $virtual_site . $iconname);
 		if(!$file_exsit && $default === true)
-        {
-            $icon_url = './modules/admin/tpl/img/' . $default_icon_name;
-        }
-        elseif($file_exsit)
+		{
+			$icon_url = './modules/admin/tpl/img/' . $default_icon_name;
+		}
+		elseif($file_exsit)
 		{
 			$default_url = Context::getDefaultUrl();
 			if($default_url && substr_compare($default_url, '/', -1) === 0) $default_url = substr($default_url, 0, -1);

Spacing +140 added lines, -140 removed lines

@@ -30,18 +30,18 @@ 
 	{
 		$ftp_info = Context::getRequestVars();
 
-		if(!$ftp_info->ftp_host)
+		if (!$ftp_info->ftp_host)
 		{
 			$ftp_info->ftp_host = "127.0.0.1";
 		}
 
-		if(!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
+		if (!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
 		{
 			$ftp_info->ftp_port = '22';
 		}
 
 		$connection = ssh2_connect($ftp_info->ftp_host, $ftp_info->ftp_port);
-		if(!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
+		if (!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
 		{
 			return new Object(-1, 'msg_ftp_invalid_auth_info');
 		}
@@ -58,29 +58,29 @@ 
 		$path_candidate = array();
 
 		$temp = '';
-		foreach($path_info as $path)
+		foreach ($path_info as $path)
 		{
-			$temp = '/' . $path . $temp;
+			$temp = '/'.$path.$temp;
 			$path_candidate[] = $temp;
 		}
 
 		// try
-		foreach($path_candidate as $path)
+		foreach ($path_candidate as $path)
 		{
 			// upload check file
-			if(!@ssh2_scp_send($connection, FileHandler::getRealPath('./files/cache/ftp_check'), $path . 'ftp_check.html'))
+			if (!@ssh2_scp_send($connection, FileHandler::getRealPath('./files/cache/ftp_check'), $path.'ftp_check.html'))
 			{
 				continue;
 			}
 
 			// get check file
-			$result = FileHandler::getRemoteResource(getNotencodedFullUrl() . 'ftp_check.html');
+			$result = FileHandler::getRemoteResource(getNotencodedFullUrl().'ftp_check.html');
 
 			// delete temp check file
-			@ssh2_sftp_unlink($sftp, $path . 'ftp_check.html');
+			@ssh2_sftp_unlink($sftp, $path.'ftp_check.html');
 
 			// found
-			if($result == $pin)
+			if ($result == $pin)
 			{
 				$found_path = $path;
 				break;
@@ -89,7 +89,7 @@ 
 
 		FileHandler::removeFile('./files/cache/ftp_check', $pin);
 
-		if($found_path)
+		if ($found_path)
 		{
 			$this->add('found_path', $found_path);
 		}
@@ -99,24 +99,24 @@ 
 	{
 		$ftp_info = Context::getRequestVars();
 
-		if(!$ftp_info->ftp_host)
+		if (!$ftp_info->ftp_host)
 		{
 			$ftp_info->ftp_host = "127.0.0.1";
 		}
 
-		if(!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
+		if (!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
 		{
 			$ftp_info->ftp_port = '22';
 		}
 
 		$connection = ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port);
-		if(!$connection)
+		if (!$connection)
 		{
 			return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
 		}
 
 		$login_result = @ftp_login($connection, $ftp_info->ftp_user, $ftp_info->ftp_password);
-		if(!$login_result)
+		if (!$login_result)
 		{
 			ftp_close($connection);
 			return new Object(-1, 'msg_ftp_invalid_auth_info');
@@ -133,29 +133,29 @@ 
 		$path_candidate = array();
 
 		$temp = '';
-		foreach($path_info as $path)
+		foreach ($path_info as $path)
 		{
-			$temp = '/' . $path . $temp;
+			$temp = '/'.$path.$temp;
 			$path_candidate[] = $temp;
 		}
 
 		// try
-		foreach($path_candidate as $path)
+		foreach ($path_candidate as $path)
 		{
 			// upload check file
-			if(!ftp_put($connection, $path . 'ftp_check.html', FileHandler::getRealPath('./files/cache/ftp_check'), FTP_BINARY))
+			if (!ftp_put($connection, $path.'ftp_check.html', FileHandler::getRealPath('./files/cache/ftp_check'), FTP_BINARY))
 			{
 				continue;
 			}
 
 			// get check file
-			$result = FileHandler::getRemoteResource(getNotencodedFullUrl() . 'ftp_check.html');
+			$result = FileHandler::getRemoteResource(getNotencodedFullUrl().'ftp_check.html');
 
 			// delete temp check file
-			ftp_delete($connection, $path . 'ftp_check.html');
+			ftp_delete($connection, $path.'ftp_check.html');
 
 			// found
-			if($result == $pin)
+			if ($result == $pin)
 			{
 				$found_path = $path;
 				break;
@@ -164,7 +164,7 @@ 
 
 		FileHandler::removeFile('./files/cache/ftp_check', $pin);
 
-		if($found_path)
+		if ($found_path)
 		{
 			$this->add('found_path', $found_path);
 		}
@@ -175,39 +175,39 @@ 
 	 */
 	function getAdminFTPPath()
 	{
-		Context::loadLang(_XE_PATH_ . 'modules/autoinstall/lang');
+		Context::loadLang(_XE_PATH_.'modules/autoinstall/lang');
 		@set_time_limit(5);
-		require_once(_XE_PATH_ . 'libs/ftp.class.php');
+		require_once(_XE_PATH_.'libs/ftp.class.php');
 
 		$ftp_info = Context::getRequestVars();
 
-		if(!$ftp_info->ftp_user || !$ftp_info->ftp_password)
+		if (!$ftp_info->ftp_user || !$ftp_info->ftp_password)
 		{
 			return new Object(1, 'msg_ftp_invalid_auth_info');
 		}
 
-		if(!$ftp_info->ftp_host)
+		if (!$ftp_info->ftp_host)
 		{
 			$ftp_info->ftp_host = '127.0.0.1';
 		}
 
-		if(!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
+		if (!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
 		{
 			$ftp_info->ftp_port = '21';
 		}
 
-		if($ftp_info->sftp == 'Y')
+		if ($ftp_info->sftp == 'Y')
 		{
-			if(!function_exists('ssh2_sftp'))
+			if (!function_exists('ssh2_sftp'))
 			{
 				return new Object(-1, 'disable_sftp_support');
 			}
 			return $this->getSFTPPath();
 		}
 
-		if($ftp_info->ftp_pasv == 'N')
+		if ($ftp_info->ftp_pasv == 'N')
 		{
-			if(function_exists('ftp_connect'))
+			if (function_exists('ftp_connect'))
 			{
 				return $this->getFTPPath();
 			}
@@ -215,12 +215,12 @@ 
 		}
 
 		$oFTP = new ftp();
-		if(!$oFTP->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
+		if (!$oFTP->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
 		{
 			return new Object(1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
 		}
 
-		if(!$oFTP->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
+		if (!$oFTP->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 		{
 			return new Object(1, 'msg_ftp_invalid_auth_info');
 		}
@@ -236,29 +236,29 @@ 
 		$path_candidate = array();
 
 		$temp = '';
-		foreach($path_info as $path)
+		foreach ($path_info as $path)
 		{
-			$temp = '/' . $path . $temp;
+			$temp = '/'.$path.$temp;
 			$path_candidate[] = $temp;
 		}
 
 		// try
-		foreach($path_candidate as $path)
+		foreach ($path_candidate as $path)
 		{
 			// upload check file
-			if(!$oFTP->ftp_put($path . 'ftp_check.html', FileHandler::getRealPath('./files/cache/ftp_check')))
+			if (!$oFTP->ftp_put($path.'ftp_check.html', FileHandler::getRealPath('./files/cache/ftp_check')))
 			{
 				continue;
 			}
 
 			// get check file
-			$result = FileHandler::getRemoteResource(getNotencodedFullUrl() . 'ftp_check.html');
+			$result = FileHandler::getRemoteResource(getNotencodedFullUrl().'ftp_check.html');
 
 			// delete temp check file
-			$oFTP->ftp_delete($path . 'ftp_check.html');
+			$oFTP->ftp_delete($path.'ftp_check.html');
 
 			// found
-			if($result == $pin)
+			if ($result == $pin)
 			{
 				$found_path = $path;
 				break;
@@ -267,7 +267,7 @@ 
 
 		FileHandler::removeFile('./files/cache/ftp_check', $pin);
 
-		if($found_path)
+		if ($found_path)
 		{
 			$this->add('found_path', $found_path);
 		}
@@ -280,27 +280,27 @@ 
 	function getSFTPList()
 	{
 		$ftp_info = Context::getRequestVars();
-		if(!$ftp_info->ftp_host)
+		if (!$ftp_info->ftp_host)
 		{
 			$ftp_info->ftp_host = "127.0.0.1";
 		}
 		$connection = ssh2_connect($ftp_info->ftp_host, $ftp_info->ftp_port);
-		if(!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
+		if (!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
 		{
 			return new Object(-1, 'msg_ftp_invalid_auth_info');
 		}
 
 		$sftp = ssh2_sftp($connection);
-		$curpwd = "ssh2.sftp://$sftp" . $this->pwd;
+		$curpwd = "ssh2.sftp://$sftp".$this->pwd;
 		$dh = @opendir($curpwd);
-		if(!$dh)
+		if (!$dh)
 		{
 			return new Object(-1, 'msg_ftp_invalid_path');
 		}
 		$list = array();
-		while(($file = readdir($dh)) !== FALSE)
+		while (($file = readdir($dh)) !== FALSE)
 		{
-			if(is_dir($curpwd . $file))
+			if (is_dir($curpwd.$file))
 			{
 				$file .= "/";
 			}
@@ -320,32 +320,32 @@ 
 	 */
 	function getAdminFTPList()
 	{
-		Context::loadLang(_XE_PATH_ . 'modules/autoinstall/lang');
+		Context::loadLang(_XE_PATH_.'modules/autoinstall/lang');
 		@set_time_limit(5);
 
-		require_once(_XE_PATH_ . 'libs/ftp.class.php');
+		require_once(_XE_PATH_.'libs/ftp.class.php');
 
 		$ftp_info = Context::getRequestVars();
-		if(!$ftp_info->ftp_user || !$ftp_info->ftp_password)
+		if (!$ftp_info->ftp_user || !$ftp_info->ftp_password)
 		{
 			return new Object(-1, 'msg_ftp_invalid_auth_info');
 		}
 
 		$this->pwd = $ftp_info->ftp_root_path;
 
-		if(!$ftp_info->ftp_host)
+		if (!$ftp_info->ftp_host)
 		{
 			$ftp_info->ftp_host = "127.0.0.1";
 		}
 
-		if(!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
+		if (!$ftp_info->ftp_port || !is_numeric($ftp_info->ftp_port))
 		{
 			$ftp_info->ftp_port = "21";
 		}
 
-		if($ftp_info->sftp == 'Y')
+		if ($ftp_info->sftp == 'Y')
 		{
-			if(!function_exists('ssh2_sftp'))
+			if (!function_exists('ssh2_sftp'))
 			{
 				return new Object(-1, 'disable_sftp_support');
 			}
@@ -353,9 +353,9 @@ 
 		}
 
 		$oFtp = new ftp();
-		if($oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
+		if ($oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
 		{
-			if($oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
+			if ($oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
 				$_list = $oFtp->ftp_rawlist($this->pwd);
 				$oFtp->ftp_quit();
@@ -367,17 +367,17 @@ 
 		}
 		$list = array();
 
-		if($_list)
+		if ($_list)
 		{
-			foreach($_list as $k => $v)
+			foreach ($_list as $k => $v)
 			{
 				$src = new stdClass();
 				$src->data = $v;
 				$res = Context::convertEncoding($src);
 				$v = $res->data;
-				if(strpos($v, 'd') === 0 || strpos($v, '<DIR>'))
+				if (strpos($v, 'd') === 0 || strpos($v, '<DIR>'))
 				{
-					$list[] = substr(strrchr($v, ' '), 1) . '/';
+					$list[] = substr(strrchr($v, ' '), 1).'/';
 				}
 			}
 		}
@@ -400,7 +400,7 @@ 
 			, 'module' => array('addon', 'admin', 'autoinstall', 'comment', 'communication', 'counter', 'document', 'editor', 'file', 'importer', 'install', 'integration_search', 'layout', 'member', 'menu', 'message', 'module', 'opage', 'page', 'point', 'poll', 'rss', 'session', 'spamfilter', 'tag', 'trackback', 'trash', 'widget')
 			, 'addon' => array('autolink', 'blogapi', 'captcha', 'counter', 'member_communication', 'member_extra_info', 'mobile', 'openid_delegation_id', 'point_level_icon', 'resize_image')
 			, 'layout' => array('default')
-			, 'widget' => array('content', 'language_select', 'login_info','mcontent')
+			, 'widget' => array('content', 'language_select', 'login_info', 'mcontent')
 			, 'widgetstyle' => array(),
 		);
 		$info = array();
@@ -420,86 +420,86 @@ 
 		$info['use_ssl'] = $db_info->use_ssl;
 		
 		$info['phpext'] = '';
-		foreach(get_loaded_extensions() as $ext)
+		foreach (get_loaded_extensions() as $ext)
 		{
 			$ext = strtolower($ext);
-			if(in_array($ext, $skip['ext']))
+			if (in_array($ext, $skip['ext']))
 			{
 				continue;
 			}
-			$info['phpext'] .= '|' . $ext;
+			$info['phpext'] .= '|'.$ext;
 		}
 		$info['phpext'] = substr($info['phpext'], 1);
 
 		$info['module'] = '';
 		$oModuleModel = getModel('module');
 		$module_list = $oModuleModel->getModuleList();
-		if($module_list) foreach($module_list as $module)
+		if ($module_list) foreach ($module_list as $module)
 		{
-			if(in_array($module->module, $skip['module']))
+			if (in_array($module->module, $skip['module']))
 			{
 				continue;
 			}
-			$info['module'] .= '|' . $module->module;
+			$info['module'] .= '|'.$module->module;
 		}
 		$info['module'] = substr($info['module'], 1);
 
 		$info['addon'] = '';
 		$oAddonAdminModel = getAdminModel('addon');
 		$addon_list = $oAddonAdminModel->getAddonList();
-		if($addon_list) foreach($addon_list as $addon)
+		if ($addon_list) foreach ($addon_list as $addon)
 		{
-			if(in_array($addon->addon, $skip['addon']))
+			if (in_array($addon->addon, $skip['addon']))
 			{
 				continue;
 			}
-			$info['addon'] .= '|' . $addon->addon;
+			$info['addon'] .= '|'.$addon->addon;
 		}
 		$info['addon'] = substr($info['addon'], 1);
 
 		$info['layout'] = "";
 		$oLayoutModel = getModel('layout');
 		$layout_list = $oLayoutModel->getDownloadedLayoutList();
-		if($layout_list) foreach($layout_list as $layout)
+		if ($layout_list) foreach ($layout_list as $layout)
 		{
-			if(in_array($layout->layout, $skip['layout']))
+			if (in_array($layout->layout, $skip['layout']))
 			{
 				continue;
 			}
-			$info['layout'] .= '|' . $layout->layout;
+			$info['layout'] .= '|'.$layout->layout;
 		}
 		$info['layout'] = substr($info['layout'], 1);
 
 		$info['widget'] = "";
 		$oWidgetModel = getModel('widget');
 		$widget_list = $oWidgetModel->getDownloadedWidgetList();
-		if($widget_list) foreach($widget_list as $widget)
+		if ($widget_list) foreach ($widget_list as $widget)
 		{
-			if(in_array($widget->widget, $skip['widget']))
+			if (in_array($widget->widget, $skip['widget']))
 			{
 				continue;
 			}
-			$info['widget'] .= '|' . $widget->widget;
+			$info['widget'] .= '|'.$widget->widget;
 		}
 		$info['widget'] = substr($info['widget'], 1);
 
 		$info['widgetstyle'] = "";
 		$oWidgetModel = getModel('widget');
 		$widgetstyle_list = $oWidgetModel->getDownloadedWidgetStyleList();
-		if($widgetstyle_list) foreach($widgetstyle_list as $widgetstyle)
+		if ($widgetstyle_list) foreach ($widgetstyle_list as $widgetstyle)
 		{
-			if(in_array($widgetstyle->widgetStyle, $skip['widgetstyle']))
+			if (in_array($widgetstyle->widgetStyle, $skip['widgetstyle']))
 			{
 				continue;
 			}
-			$info['widgetstyle'] .= '|' . $widgetstyle->widgetStyle;
+			$info['widgetstyle'] .= '|'.$widgetstyle->widgetStyle;
 		}
 		$info['widgetstyle'] = substr($info['widgetstyle'], 1);
 
 		$param = '';
-		foreach($info as $k => $v)
+		foreach ($info as $k => $v)
 		{
-			if($v)
+			if ($v)
 			{
 				$param .= sprintf('&%s=%s', $k, urlencode($v));
 			}
@@ -515,13 +515,13 @@ 
 	 */
 	function getThemeList()
 	{
-		$path = _XE_PATH_ . 'themes';
+		$path = _XE_PATH_.'themes';
 		$list = FileHandler::readDir($path);
 
 		$theme_info = array();
-		if(count($list) > 0)
+		if (count($list) > 0)
 		{
-			foreach($list as $val)
+			foreach ($list as $val)
 			{
 				$theme_info[$val] = $this->getThemeInfo($val);
 			}
@@ -538,20 +538,20 @@ 
 	 */
 	function getThemeInfo($theme_name, $layout_list = NULL)
 	{
-		if($GLOBALS['__ThemeInfo__'][$theme_name])
+		if ($GLOBALS['__ThemeInfo__'][$theme_name])
 		{
 			return $GLOBALS['__ThemeInfo__'][$theme_name];
 		}
 
-		$info_file = _XE_PATH_ . 'themes/' . $theme_name . '/conf/info.xml';
-		if(!file_exists($info_file))
+		$info_file = _XE_PATH_.'themes/'.$theme_name.'/conf/info.xml';
+		if (!file_exists($info_file))
 		{
 			return;
 		}
 
 		$oXmlParser = new XmlParser();
 		$_xml_obj = $oXmlParser->loadXmlFile($info_file);
-		if(!$_xml_obj->theme)
+		if (!$_xml_obj->theme)
 		{
 			return;
 		}
@@ -562,16 +562,16 @@ 
 		$theme_info = new stdClass();
 		$theme_info->name = $theme_name;
 		$theme_info->title = $xml_obj->title->body;
-		$thumbnail = './themes/' . $theme_name . '/thumbnail.png';
+		$thumbnail = './themes/'.$theme_name.'/thumbnail.png';
 		$theme_info->thumbnail = (FileHandler::exists($thumbnail)) ? $thumbnail : NULL;
 		$theme_info->version = $xml_obj->version->body;
 		$date_obj = new stdClass();
 		sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
 		$theme_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
 		$theme_info->description = $xml_obj->description->body;
-		$theme_info->path = './themes/' . $theme_name . '/';
+		$theme_info->path = './themes/'.$theme_name.'/';
 
-		if(!is_array($xml_obj->publisher))
+		if (!is_array($xml_obj->publisher))
 		{
 			$publisher_list = array();
 			$publisher_list[] = $xml_obj->publisher;
@@ -582,7 +582,7 @@ 
 		}
 
 		$theme_info->publisher = array();
-		foreach($publisher_list as $publisher)
+		foreach ($publisher_list as $publisher)
 		{
 			$publisher_obj = new stdClass();
 			$publisher_obj->name = $publisher->name->body;
@@ -595,10 +595,10 @@ 
 		$layout_path = $layout->directory->attrs->path;
 		$layout_parse = explode('/', $layout_path);
 		$layout_info = new stdClass();
-		switch($layout_parse[1])
+		switch ($layout_parse[1])
 		{
 			case 'themes' :
-					$layout_info->name = $theme_name . '|@|' . $layout_parse[count($layout_parse) - 1];
+					$layout_info->name = $theme_name.'|@|'.$layout_parse[count($layout_parse) - 1];
 					break;
 
 			case 'layouts' :
@@ -615,11 +615,11 @@ 
 		$oLayoutModel = getModel('layout');
 		$layout_info_list = array();
 		$layout_list = $oLayoutModel->getLayoutList($site_info->site_srl);
-		if($layout_list)
+		if ($layout_list)
 		{
-			foreach($layout_list as $val)
+			foreach ($layout_list as $val)
 			{
-				if($val->layout == $layout_info->name)
+				if ($val->layout == $layout_info->name)
 				{
 					$is_new_layout = FALSE;
 					$layout_info->layout_srl = $val->layout_srl;
@@ -628,7 +628,7 @@ 
 			}
 		}
 
-		if($is_new_layout)
+		if ($is_new_layout)
 		{
 			$site_module_info = Context::get('site_module_info');
 			$args = new stdClass();
@@ -646,7 +646,7 @@ 
 		$theme_info->layout_info = $layout_info;
 
 		$skin_infos = $xml_obj->skininfos;
-		if(is_array($skin_infos->skininfo))
+		if (is_array($skin_infos->skininfo))
 		{
 			$skin_list = $skin_infos->skininfo;
 		}
@@ -657,17 +657,17 @@ 
 
 		$oModuleModel = getModel('module');
 		$skins = array();
-		foreach($skin_list as $val)
+		foreach ($skin_list as $val)
 		{
 			$skin_info = new stdClass();
 			unset($skin_parse);
 			$skin_parse = explode('/', $val->directory->attrs->path);
-			switch($skin_parse[1])
+			switch ($skin_parse[1])
 			{
 				case 'themes' :
 						$is_theme = TRUE;
 						$module_name = $skin_parse[count($skin_parse) - 1];
-						$skin_info->name = $theme_name . '|@|' . $module_name;
+						$skin_info->name = $theme_name.'|@|'.$module_name;
 						break;
 
 				case 'modules' :
@@ -681,9 +681,9 @@ 
 			$skin_info->is_theme = $is_theme;
 			$skins[$module_name] = $skin_info;
 
-			if($is_theme)
+			if ($is_theme)
 			{
-				if(!$GLOBALS['__ThemeModuleSkin__'][$module_name])
+				if (!$GLOBALS['__ThemeModuleSkin__'][$module_name])
 				{
 					$GLOBALS['__ThemeModuleSkin__'][$module_name] = array();
 					$GLOBALS['__ThemeModuleSkin__'][$module_name]['skins'] = array();
@@ -705,7 +705,7 @@ 
 	 */
 	function getModulesSkinList()
 	{
-		if($GLOBALS['__ThemeModuleSkin__']['__IS_PARSE__'])
+		if ($GLOBALS['__ThemeModuleSkin__']['__IS_PARSE__'])
 		{
 			return $GLOBALS['__ThemeModuleSkin__'];
 		}
@@ -713,7 +713,7 @@ 
 		sort($searched_list);
 
 		$searched_count = count($searched_list);
-		if(!$searched_count)
+		if (!$searched_count)
 		{
 			return;
 		}
@@ -721,13 +721,13 @@ 
 		$exceptionModule = array('editor', 'poll', 'homepage', 'textyle');
 
 		$oModuleModel = getModel('module');
-		foreach($searched_list as $val)
+		foreach ($searched_list as $val)
 		{
-			$skin_list = $oModuleModel->getSkins(_XE_PATH_ . 'modules/' . $val);
+			$skin_list = $oModuleModel->getSkins(_XE_PATH_.'modules/'.$val);
 
-			if(is_array($skin_list) && count($skin_list) > 0 && !in_array($val, $exceptionModule))
+			if (is_array($skin_list) && count($skin_list) > 0 && !in_array($val, $exceptionModule))
 			{
-				if(!$GLOBALS['__ThemeModuleSkin__'][$val])
+				if (!$GLOBALS['__ThemeModuleSkin__'][$val])
 				{
 					$GLOBALS['__ThemeModuleSkin__'][$val] = array();
 					$moduleInfo = $oModuleModel->getModuleInfoXml($val);
@@ -752,22 +752,22 @@ 
 		$cacheFile = sprintf('./files/cache/menu/admin_lang/adminMenu.%s.lang.php', $currentLang);
 
 		// Update if no cache file exists or it is older than xml file
-		if(!is_readable($cacheFile))
+		if (!is_readable($cacheFile))
 		{
 			$lang = new stdClass();
 			$oModuleModel = getModel('module');
 			$installed_module_list = $oModuleModel->getModulesXmlInfo();
 
 			$this->gnbLangBuffer = '<?php $lang = new stdClass();';
-			foreach($installed_module_list AS $key => $value)
+			foreach ($installed_module_list AS $key => $value)
 			{
 				$moduleActionInfo = $oModuleModel->getModuleActionXml($value->module);
-				if(is_object($moduleActionInfo->menu))
+				if (is_object($moduleActionInfo->menu))
 				{
-					foreach($moduleActionInfo->menu AS $key2 => $value2)
+					foreach ($moduleActionInfo->menu AS $key2 => $value2)
 					{
 						$lang->menu_gnb_sub[$key2] = $value2->title;
-						$this->gnbLangBuffer .=sprintf('$lang->menu_gnb_sub[\'%s\'] = \'%s\';', $key2, $value2->title);
+						$this->gnbLangBuffer .= sprintf('$lang->menu_gnb_sub[\'%s\'] = \'%s\';', $key2, $value2->title);
 					}
 				}
 			}
@@ -793,19 +793,19 @@ 
 		$args = new stdClass();
 		$args->site_srl = $siteSrl;
 		$output = executeQueryArray('admin.getFavoriteList', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return new Object();
 		}
 
-		if($isGetModuleInfo && is_array($output->data))
+		if ($isGetModuleInfo && is_array($output->data))
 		{
 			$oModuleModel = getModel('module');
-			foreach($output->data AS $key => $value)
+			foreach ($output->data AS $key => $value)
 			{
 				$moduleInfo = $oModuleModel->getModuleInfoXml($value->module);
 				$output->data[$key]->admin_index_act = $moduleInfo->admin_index_act;
@@ -830,13 +830,13 @@ 
 		$args->site_srl = $siteSrl;
 		$args->module = $module;
 		$output = executeQuery('admin.getFavorite', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
 		$returnObject = new Object();
-		if($output->data)
+		if ($output->data)
 		{
 			$returnObject->add('result', TRUE);
 			$returnObject->add('favoriteSrl', $output->data->admin_favorite_srl);
@@ -855,7 +855,7 @@ 
 	 */
 	function getSiteAllList()
 	{
-		if(Context::get('domain'))
+		if (Context::get('domain'))
 		{
 			$domain = Context::get('domain');
 		}
@@ -872,7 +872,7 @@ 
 	function getAllSitesThatHaveModules($domain = NULL)
 	{
 		$args = new stdClass();
-		if($domain)
+		if ($domain)
 		{
 			$args->domain = $domain;
 		}
@@ -880,31 +880,31 @@ 
 
 		$siteList = array();
 		$output = executeQueryArray('admin.getSiteAllList', $args, $columnList);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$siteList = $output->data;
 		}
 
 		$oModuleModel = getModel('module');
-		foreach($siteList as $key => $value)
+		foreach ($siteList as $key => $value)
 		{
 			$args->site_srl = $value->site_srl;
 			$list = $oModuleModel->getModuleSrlList($args);
 
-			if(!is_array($list))
+			if (!is_array($list))
 			{
 				$list = array($list);
 			}
 
-			foreach($list as $k => $v)
+			foreach ($list as $k => $v)
 			{
-				if(!is_dir(_XE_PATH_ . 'modules/' . $v->module))
+				if (!is_dir(_XE_PATH_.'modules/'.$v->module))
 				{
 					unset($list[$k]);
 				}
 			}
 
-			if(!count($list))
+			if (!count($list))
 			{
 				unset($siteList[$key]);
 			}
@@ -921,13 +921,13 @@ 
 	{
 		$args = new stdClass();
 
-		if($date)
+		if ($date)
 		{
 			$args->regDate = date('Ymd', strtotime($date));
 		}
 
 		$output = executeQuery('admin.getSiteCountByDate', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return 0;
 		}
@@ -949,21 +949,21 @@ 
 	{
 		$site_info = Context::get('site_module_info');
 		$virtual_site = '';
-		if($site_info->site_srl) 
+		if ($site_info->site_srl) 
 		{
-			$virtual_site = $site_info->site_srl . '/';
+			$virtual_site = $site_info->site_srl.'/';
 		}
 
-		$file_exsit = FileHandler::readFile(_XE_PATH_ . 'files/attach/xeicon/' . $virtual_site . $iconname);
-		if(!$file_exsit && $default === true)
+		$file_exsit = FileHandler::readFile(_XE_PATH_.'files/attach/xeicon/'.$virtual_site.$iconname);
+		if (!$file_exsit && $default === true)
         {
-            $icon_url = './modules/admin/tpl/img/' . $default_icon_name;
+            $icon_url = './modules/admin/tpl/img/'.$default_icon_name;
         }
-        elseif($file_exsit)
+        elseif ($file_exsit)
 		{
 			$default_url = Context::getDefaultUrl();
-			if($default_url && substr_compare($default_url, '/', -1) === 0) $default_url = substr($default_url, 0, -1);
-			$icon_url = $default_url . '/files/attach/xeicon/' . $virtual_site . $iconname;
+			if ($default_url && substr_compare($default_url, '/', -1) === 0) $default_url = substr($default_url, 0, -1);
+			$icon_url = $default_url.'/files/attach/xeicon/'.$virtual_site.$iconname;
 		}
 		return $icon_url;
 	}

Braces +26 added lines, -22 removed lines

@@ -303,8 +303,7 @@ 
 			if(is_dir($curpwd . $file))
 			{
 				$file .= "/";
-			}
-			else
+			} else
 			{
 				continue;
 			}
@@ -359,8 +358,7 @@ 
 			{
 				$_list = $oFtp->ftp_rawlist($this->pwd);
 				$oFtp->ftp_quit();
-			}
-			else
+			} else
 			{
 				return new Object(-1, 'msg_ftp_invalid_auth_info');
 			}
@@ -380,8 +378,7 @@ 
 					$list[] = substr(strrchr($v, ' '), 1) . '/';
 				}
 			}
-		}
-		else
+		} else
 		{
 			return new Object(-1, 'msg_ftp_no_directory');
 		}
@@ -434,11 +431,13 @@ 
 		$info['module'] = '';
 		$oModuleModel = getModel('module');
 		$module_list = $oModuleModel->getModuleList();
-		if($module_list) foreach($module_list as $module)
+		if($module_list) {
+			foreach($module_list as $module)
 		{
 			if(in_array($module->module, $skip['module']))
 			{
 				continue;
+		}
 			}
 			$info['module'] .= '|' . $module->module;
 		}
@@ -447,11 +446,13 @@ 
 		$info['addon'] = '';
 		$oAddonAdminModel = getAdminModel('addon');
 		$addon_list = $oAddonAdminModel->getAddonList();
-		if($addon_list) foreach($addon_list as $addon)
+		if($addon_list) {
+			foreach($addon_list as $addon)
 		{
 			if(in_array($addon->addon, $skip['addon']))
 			{
 				continue;
+		}
 			}
 			$info['addon'] .= '|' . $addon->addon;
 		}
@@ -460,11 +461,13 @@ 
 		$info['layout'] = "";
 		$oLayoutModel = getModel('layout');
 		$layout_list = $oLayoutModel->getDownloadedLayoutList();
-		if($layout_list) foreach($layout_list as $layout)
+		if($layout_list) {
+			foreach($layout_list as $layout)
 		{
 			if(in_array($layout->layout, $skip['layout']))
 			{
 				continue;
+		}
 			}
 			$info['layout'] .= '|' . $layout->layout;
 		}
@@ -473,11 +476,13 @@ 
 		$info['widget'] = "";
 		$oWidgetModel = getModel('widget');
 		$widget_list = $oWidgetModel->getDownloadedWidgetList();
-		if($widget_list) foreach($widget_list as $widget)
+		if($widget_list) {
+			foreach($widget_list as $widget)
 		{
 			if(in_array($widget->widget, $skip['widget']))
 			{
 				continue;
+		}
 			}
 			$info['widget'] .= '|' . $widget->widget;
 		}
@@ -486,11 +491,13 @@ 
 		$info['widgetstyle'] = "";
 		$oWidgetModel = getModel('widget');
 		$widgetstyle_list = $oWidgetModel->getDownloadedWidgetStyleList();
-		if($widgetstyle_list) foreach($widgetstyle_list as $widgetstyle)
+		if($widgetstyle_list) {
+			foreach($widgetstyle_list as $widgetstyle)
 		{
 			if(in_array($widgetstyle->widgetStyle, $skip['widgetstyle']))
 			{
 				continue;
+		}
 			}
 			$info['widgetstyle'] .= '|' . $widgetstyle->widgetStyle;
 		}
@@ -575,8 +582,7 @@ 
 		{
 			$publisher_list = array();
 			$publisher_list[] = $xml_obj->publisher;
-		}
-		else
+		} else
 		{
 			$publisher_list = $xml_obj->publisher;
 		}
@@ -649,8 +655,7 @@ 
 		if(is_array($skin_infos->skininfo))
 		{
 			$skin_list = $skin_infos->skininfo;
-		}
-		else
+		} else
 		{
 			$skin_list = array($skin_infos->skininfo);
 		}
@@ -773,8 +778,7 @@ 
 			}
 			$this->gnbLangBuffer .= ' ?>';
 			FileHandler::writeFile($cacheFile, $this->gnbLangBuffer);
-		}
-		else
+		} else
 		{
 			include $cacheFile;
 		}
@@ -840,8 +844,7 @@ 
 		{
 			$returnObject->add('result', TRUE);
 			$returnObject->add('favoriteSrl', $output->data->admin_favorite_srl);
-		}
-		else
+		} else
 		{
 			$returnObject->add('result', FALSE);
 		}
@@ -958,11 +961,12 @@ 
 		if(!$file_exsit && $default === true)
         {
             $icon_url = './modules/admin/tpl/img/' . $default_icon_name;
-        }
-        elseif($file_exsit)
+        } elseif($file_exsit)
 		{
 			$default_url = Context::getDefaultUrl();
-			if($default_url && substr_compare($default_url, '/', -1) === 0) $default_url = substr($default_url, 0, -1);
+			if($default_url && substr_compare($default_url, '/', -1) === 0) {
+				$default_url = substr($default_url, 0, -1);
+			}
 			$icon_url = $default_url . '/files/attach/xeicon/' . $virtual_site . $iconname;
 		}
 		return $icon_url;

modules/install/install.controller.php

Spacing +117 added lines, -117 removed lines

@@ -17,7 +17,7 @@ 
 	function init()
 	{
 		// Error occurs if already installed
-		if($this->act !== 'procInstallLicenseAggrement' && Context::isInstalled())
+		if ($this->act !== 'procInstallLicenseAggrement' && Context::isInstalled())
 		{
 			$this->stop('msg_already_installed');
 		}
@@ -86,7 +86,7 @@ 
 	function _procDBSetting()
 	{
 		// Get DB-related variables
-		$con_string = Context::gets('db_type','db_port','db_hostname','db_userid','db_password','db_database','db_table_prefix');
+		$con_string = Context::gets('db_type', 'db_port', 'db_hostname', 'db_userid', 'db_password', 'db_database', 'db_table_prefix');
 
 		$db_info = new stdClass();
 		$db_info->master_db = get_object_vars($con_string);
@@ -101,13 +101,13 @@ 
 		// Check if available to connect to the DB
 		$oDB = &DB::getInstance();
 		$output = $oDB->getError();
-		if(!$output->toBool()) return $output;
-		if(!$oDB->isConnected()) return $oDB->getError();
+		if (!$output->toBool()) return $output;
+		if (!$oDB->isConnected()) return $oDB->getError();
 
 		// Create a db temp config file
-		if(!$this->makeDBConfigFile()) return new Object(-1, 'msg_install_failed');
+		if (!$this->makeDBConfigFile()) return new Object(-1, 'msg_install_failed');
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'act', 'dispInstallConfigForm');
 			header('location:'.$returnUrl);
@@ -121,13 +121,13 @@ 
 	function procConfigSetting()
 	{
 		// Get variables
-		$config_info = Context::gets('use_rewrite','time_zone');
-		if($config_info->use_rewrite!='Y') $config_info->use_rewrite = 'N';
+		$config_info = Context::gets('use_rewrite', 'time_zone');
+		if ($config_info->use_rewrite != 'Y') $config_info->use_rewrite = 'N';
 
 		// Create a db temp config file
-		if(!$this->makeEtcConfigFile($config_info)) return new Object(-1, 'msg_install_failed');
+		if (!$this->makeEtcConfigFile($config_info)) return new Object(-1, 'msg_install_failed');
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'act', 'dispInstallManagerForm');
 			header('location:'.$returnUrl);
@@ -141,7 +141,7 @@ 
 	function procInstall()
 	{
 		// Check if it is already installed
-		if(Context::isInstalled()) return new Object(-1, 'msg_already_installed');
+		if (Context::isInstalled()) return new Object(-1, 'msg_already_installed');
 
 		// Assign a temporary administrator when installing
 		$logged_info = new stdClass();
@@ -149,15 +149,15 @@ 
 		Context::set('logged_info', $logged_info);
 
 		// check install config
-		if(Context::get('install_config'))
+		if (Context::get('install_config'))
 		{
 			$db_info = $this->_makeDbInfoByInstallConfig();
 		}
 		// install by default XE UI
 		else
 		{
-			if(FileHandler::exists($this->db_tmp_config_file)) include $this->db_tmp_config_file;
-			if(FileHandler::exists($this->etc_tmp_config_file)) include $this->etc_tmp_config_file;
+			if (FileHandler::exists($this->db_tmp_config_file)) include $this->db_tmp_config_file;
+			if (FileHandler::exists($this->etc_tmp_config_file)) include $this->etc_tmp_config_file;
 		}
 
 		// Set DB type and information
@@ -165,30 +165,30 @@ 
 		// Create DB Instance
 		$oDB = &DB::getInstance();
 		// Check if available to connect to the DB
-		if(!$oDB->isConnected()) return $oDB->getError();
+		if (!$oDB->isConnected()) return $oDB->getError();
 
 		// Install all the modules
 		try {
 			$oDB->begin();
 			$this->installDownloadedModule();
 			$oDB->commit();
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			$oDB->rollback();
 			return new Object(-1, $e->getMessage());
 		}
 
 		// Create a config file
-		if(!$this->makeConfigFile()) return new Object(-1, 'msg_install_failed');
+		if (!$this->makeConfigFile()) return new Object(-1, 'msg_install_failed');
 
 		// load script
-		$scripts = FileHandler::readDir(_XE_PATH_ . 'modules/install/script', '/(\.php)$/');
-		if(count($scripts)>0)
+		$scripts = FileHandler::readDir(_XE_PATH_.'modules/install/script', '/(\.php)$/');
+		if (count($scripts) > 0)
 		{
 			sort($scripts);
-			foreach($scripts as $script)
+			foreach ($scripts as $script)
 			{
 				$script_path = FileHandler::getRealPath('./modules/install/script/');
-				$output = include($script_path . $script);
+				$output = include($script_path.$script);
 			}
 		}
 
@@ -201,7 +201,7 @@ 
 
 		unset($_SESSION['use_rewrite']);
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('');
 			header('location:'.$returnUrl);
@@ -231,7 +231,7 @@ 
 		$db_info->use_rewrite = Context::get('use_rewrite');
 		$db_info->time_zone = Context::get('time_zone');
 
-		if($_SERVER['HTTPS'] == 'on')
+		if ($_SERVER['HTTPS'] == 'on')
 		{
 			$https_port = (Context::get('https_port')) ? Context::get('https_port') : $_SERVER['SERVER_PORT'];
 			$https_port = (!$https_port != 443) ? $https_port : null;
@@ -241,8 +241,8 @@ 
 			$http_port = (Context::get('http_port')) ? Context::get('http_port') : $_SERVER['SERVER_PORT'];
 			$http_port = (!$http_port != 80) ? $http_port : null;
 		}
-		if($http_port) $db_info->http_port = $http_port;
-		if($https_port) $db_info->https_port = $https_port;
+		if ($http_port) $db_info->http_port = $http_port;
+		if ($https_port) $db_info->https_port = $https_port;
 
 		return $db_info;
 	}
@@ -252,57 +252,57 @@ 
 	 */
 	function procInstallFTP()
 	{
-		if(Context::isInstalled()) return new Object(-1, 'msg_already_installed');
-		$ftp_info = Context::gets('ftp_host', 'ftp_user','ftp_password','ftp_port','ftp_root_path');
-		$ftp_info->ftp_port = (int)$ftp_info->ftp_port;
-		if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
-		if(!$ftp_info->ftp_host) $ftp_info->ftp_host = '127.0.0.1';
-		if(!$ftp_info->ftp_root_path) $ftp_info->ftp_root_path = '/';
+		if (Context::isInstalled()) return new Object(-1, 'msg_already_installed');
+		$ftp_info = Context::gets('ftp_host', 'ftp_user', 'ftp_password', 'ftp_port', 'ftp_root_path');
+		$ftp_info->ftp_port = (int) $ftp_info->ftp_port;
+		if (!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
+		if (!$ftp_info->ftp_host) $ftp_info->ftp_host = '127.0.0.1';
+		if (!$ftp_info->ftp_root_path) $ftp_info->ftp_root_path = '/';
 
 		$buff = array('<?php if(!defined("__XE__")) exit();');
 		$buff[] = "\$ftp_info = new stdClass();";
-		foreach($ftp_info as $key => $val)
+		foreach ($ftp_info as $key => $val)
 		{
-			$buff[] = sprintf("\$ftp_info->%s='%s';", $key, str_replace("'","\\'",$val));
+			$buff[] = sprintf("\$ftp_info->%s='%s';", $key, str_replace("'", "\\'", $val));
 		}
 
 		// If safe_mode
-		if(ini_get('safe_mode'))
+		if (ini_get('safe_mode'))
 		{
-			if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new Object(-1,'msg_safe_mode_ftp_needed');
+			if (!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new Object(-1, 'msg_safe_mode_ftp_needed');
 
 			require_once(_XE_PATH_.'libs/ftp.class.php');
 			$oFtp = new ftp();
-			if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
+			if (!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
 
-			if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
+			if (!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
 				$oFtp->ftp_quit();
-				return new Object(-1,'msg_ftp_invalid_auth_info');
+				return new Object(-1, 'msg_ftp_invalid_auth_info');
 			}
 
-			if(!is_dir(_XE_PATH_.'files') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files'))
+			if (!is_dir(_XE_PATH_.'files') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files'))
 			{
 				$oFtp->ftp_quit();
-				return new Object(-1,'msg_ftp_mkdir_fail');
+				return new Object(-1, 'msg_ftp_mkdir_fail');
 			}
 
-			if(!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files'))
+			if (!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files'))
 			{
 				$oFtp->ftp_quit();
-				return new Object(-1,'msg_ftp_chmod_fail');
+				return new Object(-1, 'msg_ftp_chmod_fail');
 			}
 
-			if(!is_dir(_XE_PATH_.'files/config') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files/config'))
+			if (!is_dir(_XE_PATH_.'files/config') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files/config'))
 			{
 				$oFtp->ftp_quit();
-				return new Object(-1,'msg_ftp_mkdir_fail');
+				return new Object(-1, 'msg_ftp_mkdir_fail');
 			}
 
-			if(!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files/config'))
+			if (!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files/config'))
 			{
 				$oFtp->ftp_quit();
-				return new Object(-1,'msg_ftp_chmod_fail');
+				return new Object(-1, 'msg_ftp_chmod_fail');
 			}
 
 			$oFtp->ftp_quit();
@@ -313,31 +313,31 @@ 
 
 	function procInstallCheckFtp()
 	{
-		$ftp_info = Context::gets('ftp_user','ftp_password','ftp_port','sftp');
-		$ftp_info->ftp_port = (int)$ftp_info->ftp_port;
-		if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
-		if(!$ftp_info->sftp) $ftp_info->sftp = 'N';
+		$ftp_info = Context::gets('ftp_user', 'ftp_password', 'ftp_port', 'sftp');
+		$ftp_info->ftp_port = (int) $ftp_info->ftp_port;
+		if (!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
+		if (!$ftp_info->sftp) $ftp_info->sftp = 'N';
 
-		if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new Object(-1,'msg_safe_mode_ftp_needed');
+		if (!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new Object(-1, 'msg_safe_mode_ftp_needed');
 
-		if($ftp_info->sftp == 'Y')
+		if ($ftp_info->sftp == 'Y')
 		{
 			$connection = ssh2_connect('localhost', $ftp_info->ftp_port);
-			if(!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
+			if (!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
-				return new Object(-1,'msg_ftp_invalid_auth_info');
+				return new Object(-1, 'msg_ftp_invalid_auth_info');
 			}
 		}
 		else
 		{
 			require_once(_XE_PATH_.'libs/ftp.class.php');
 			$oFtp = new ftp();
-			if(!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost'));
+			if (!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost'));
 
-			if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
+			if (!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
 				$oFtp->ftp_quit();
-				return new Object(-1,'msg_ftp_invalid_auth_info');
+				return new Object(-1, 'msg_ftp_invalid_auth_info');
 			}
 			$oFtp->ftp_quit();
 		}
@@ -354,36 +354,36 @@ 
 		$checklist = array();
 		// 0. check your version of php (5.2.4 or higher)
 		$checklist['php_version'] = true;
-		if(version_compare(PHP_VERSION, __XE_MIN_PHP_VERSION__, '<'))
+		if (version_compare(PHP_VERSION, __XE_MIN_PHP_VERSION__, '<'))
 		{
 			$checklist['php_version'] = false;
 		}
 
-		if(version_compare(PHP_VERSION, __XE_RECOMMEND_PHP_VERSION__, '<'))
+		if (version_compare(PHP_VERSION, __XE_RECOMMEND_PHP_VERSION__, '<'))
 		{
 			Context::set('phpversion_warning', true);
 		}
 
 		// 1. Check permission
-		if(is_writable('./')||is_writable('./files')) $checklist['permission'] = true;
+		if (is_writable('./') || is_writable('./files')) $checklist['permission'] = true;
 		else $checklist['permission'] = false;
 		// 2. Check if xml_parser_create exists
-		if(function_exists('xml_parser_create')) $checklist['xml'] = true;
+		if (function_exists('xml_parser_create')) $checklist['xml'] = true;
 		else $checklist['xml'] = false;
 		// 3. Check if ini_get (session.auto_start) == 1
-		if(ini_get('session.auto_start')!=1) $checklist['session'] = true;
+		if (ini_get('session.auto_start') != 1) $checklist['session'] = true;
 		else $checklist['session'] = false;
 		// 4. Check if iconv exists
-		if(function_exists('iconv')) $checklist['iconv'] = true;
+		if (function_exists('iconv')) $checklist['iconv'] = true;
 		else $checklist['iconv'] = false;
 		// 5. Check gd(imagecreatefromgif function)
-		if(function_exists('imagecreatefromgif')) $checklist['gd'] = true;
+		if (function_exists('imagecreatefromgif')) $checklist['gd'] = true;
 		else $checklist['gd'] = false;
 		// 6. Check DB
-		if(DB::getEnableList()) $checklist['db'] = true;
+		if (DB::getEnableList()) $checklist['db'] = true;
 		else $checklist['db'] = false;
 
-		if(!$checklist['php_version'] || !$checklist['permission'] || !$checklist['xml'] || !$checklist['session'] || !$checklist['db']) $install_enable = false;
+		if (!$checklist['php_version'] || !$checklist['permission'] || !$checklist['xml'] || !$checklist['session'] || !$checklist['db']) $install_enable = false;
 		else $install_enable = true;
 
 		// Save the checked result to the Context
@@ -403,7 +403,7 @@ 
 
 		$license_agreement = ($vars->license_agreement == 'Y') ? true : false;
 
-		if($license_agreement)
+		if ($license_agreement)
 		{
 			$currentTime = $_SERVER['REQUEST_TIME'];
 			FileHandler::writeFile($this->flagLicenseAgreement, $currentTime);
@@ -414,7 +414,7 @@ 
 			return new Object(-1, 'msg_must_accept_license_agreement');
 		}
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'act', 'dispInstallCheckEnv');
 			$this->setRedirectUrl($returnUrl);
@@ -437,25 +437,25 @@ 
 		$hostname = $_SERVER['SERVER_NAME'];
 		$port = $_SERVER['SERVER_PORT'];
 		$str_port = '';
-		if($port)
+		if ($port)
 		{
-			$str_port = ':' . $port;
+			$str_port = ':'.$port;
 		}
 
 		$tmpPath = $_SERVER['DOCUMENT_ROOT'];
 
 		//if DIRECTORY_SEPARATOR is not /(IIS)
-		if(DIRECTORY_SEPARATOR !== '/')
+		if (DIRECTORY_SEPARATOR !== '/')
 		{
 			//change to slash for compare
 			$tmpPath = str_replace(DIRECTORY_SEPARATOR, '/', $_SERVER['DOCUMENT_ROOT']);
 		}
 
-		$query = "/JUST/CHECK/REWRITE/" . $checkFilePath;
+		$query = "/JUST/CHECK/REWRITE/".$checkFilePath;
 		$currentPath = str_replace($tmpPath, "", _XE_PATH_);
-		if($currentPath != "")
+		if ($currentPath != "")
 		{
-			$query = $currentPath . $query;
+			$query = $currentPath.$query;
 		}
 		$requestUrl = sprintf('%s://%s%s%s', $scheme, $hostname, $str_port, $query);
 		$requestConfig = array();
@@ -480,7 +480,7 @@ 
 			'./files/cache/template_compiled',
 		);
 
-		foreach($directory_list as $dir)
+		foreach ($directory_list as $dir)
 		{
 			FileHandler::makeDir($dir);
 		}
@@ -496,57 +496,57 @@ 
 		$oModuleModel = getModel('module');
 		// Create a table ny finding schemas/*.xml file in each module
 		$module_list = FileHandler::readDir('./modules/', NULL, false, true);
-		foreach($module_list as $module_path)
+		foreach ($module_list as $module_path)
 		{
 			// Get module name
-			$tmp_arr = explode('/',$module_path);
-			$module = $tmp_arr[count($tmp_arr)-1];
+			$tmp_arr = explode('/', $module_path);
+			$module = $tmp_arr[count($tmp_arr) - 1];
 
 			$xml_info = $oModuleModel->getModuleInfoXml($module);
-			if(!$xml_info) continue;
+			if (!$xml_info) continue;
 			$modules[$xml_info->category][] = $module;
 		}
 		// Install "module" module in advance
-		$this->installModule('module','./modules/module');
+		$this->installModule('module', './modules/module');
 		$oModule = getClass('module');
-		if($oModule->checkUpdate()) $oModule->moduleUpdate();
+		if ($oModule->checkUpdate()) $oModule->moduleUpdate();
 		// Determine the order of module installation depending on category
-		$install_step = array('system','content','member');
+		$install_step = array('system', 'content', 'member');
 		// Install all the remaining modules
-		foreach($install_step as $category)
+		foreach ($install_step as $category)
 		{
-			if(count($modules[$category]))
+			if (count($modules[$category]))
 			{
-				foreach($modules[$category] as $module)
+				foreach ($modules[$category] as $module)
 				{
-					if($module == 'module') continue;
+					if ($module == 'module') continue;
 					$this->installModule($module, sprintf('./modules/%s', $module));
 
 					$oModule = getClass($module);
-					if(is_object($oModule) && method_exists($oModule, 'checkUpdate'))
+					if (is_object($oModule) && method_exists($oModule, 'checkUpdate'))
 					{
-						if($oModule->checkUpdate()) $oModule->moduleUpdate();
+						if ($oModule->checkUpdate()) $oModule->moduleUpdate();
 					}
 				}
 				unset($modules[$category]);
 			}
 		}
 		// Install all the remaining modules
-		if(count($modules))
+		if (count($modules))
 		{
-			foreach($modules as $category => $module_list)
+			foreach ($modules as $category => $module_list)
 			{
-				if(count($module_list))
+				if (count($module_list))
 				{
-					foreach($module_list as $module)
+					foreach ($module_list as $module)
 					{
-						if($module == 'module') continue;
+						if ($module == 'module') continue;
 						$this->installModule($module, sprintf('./modules/%s', $module));
 
 						$oModule = getClass($module);
-						if($oModule && method_exists($oModule, 'checkUpdate') && method_exists($oModule, 'moduleUpdate'))
+						if ($oModule && method_exists($oModule, 'checkUpdate') && method_exists($oModule, 'moduleUpdate'))
 						{
-							if($oModule->checkUpdate()) $oModule->moduleUpdate();
+							if ($oModule->checkUpdate()) $oModule->moduleUpdate();
 						}
 					}
 				}
@@ -568,31 +568,31 @@ 
 		$schema_files = FileHandler::readDir($schema_dir, NULL, false, true);
 
 		$file_cnt = count($schema_files);
-		for($i=0;$i<$file_cnt;$i++)
+		for ($i = 0; $i < $file_cnt; $i++)
 		{
 			$file = trim($schema_files[$i]);
-			if(!$file || substr($file,-4)!='.xml') continue;
+			if (!$file || substr($file, -4) != '.xml') continue;
 			$output = $oDB->createTableByXmlFile($file);
-			if($output === false)
+			if ($output === false)
 				throw new Exception('msg_create_table_failed');
 		}
 		// Create a table and module instance and then execute install() method
 		unset($oModule);
 		$oModule = getClass($module);
-		if(method_exists($oModule, 'moduleInstall')) $oModule->moduleInstall();
+		if (method_exists($oModule, 'moduleInstall')) $oModule->moduleInstall();
 		return new Object();
 	}
 
 	function _getDBConfigFileContents($db_info)
 	{
-		if(substr($db_info->master_db['db_table_prefix'], -1) != '_')
+		if (substr($db_info->master_db['db_table_prefix'], -1) != '_')
 		{
 			$db_info->master_db['db_table_prefix'] .= '_';
 		}
 
-		foreach($db_info->slave_db as &$slave)
+		foreach ($db_info->slave_db as &$slave)
 		{
-			if(substr($slave['db_table_prefix'], -1) != '_')
+			if (substr($slave['db_table_prefix'], -1) != '_')
 			{
 				$slave['db_table_prefix'] .= '_';
 			}
@@ -600,7 +600,7 @@ 
 
 		$buff = array();
 		$buff[] = '<?php if(!defined("__XE__")) exit();';
-		$buff[] = '$db_info = (object)' . var_export(get_object_vars($db_info), TRUE) . ';';
+		$buff[] = '$db_info = (object)'.var_export(get_object_vars($db_info), TRUE).';';
 
 		return implode(PHP_EOL, $buff);
 	}
@@ -614,13 +614,13 @@ 
 		$db_tmp_config_file = $this->db_tmp_config_file;
 
 		$db_info = Context::getDBInfo();
-		if(!$db_info) return;
+		if (!$db_info) return;
 
 		$buff = $this->_getDBConfigFileContents($db_info);
 
 		FileHandler::writeFile($db_tmp_config_file, $buff);
 
-		if(@file_exists($db_tmp_config_file)) return true;
+		if (@file_exists($db_tmp_config_file)) return true;
 		return false;
 	}
 
@@ -633,14 +633,14 @@ 
 		$etc_tmp_config_file = $this->etc_tmp_config_file;
 
 		$buff = '<?php if(!defined("__XE__")) exit();'."\n";
-		foreach($config_info as $key => $val)
+		foreach ($config_info as $key => $val)
 		{
-			$buff .= sprintf("\$db_info->%s = '%s';\n", $key, str_replace("'","\\'",$val));
+			$buff .= sprintf("\$db_info->%s = '%s';\n", $key, str_replace("'", "\\'", $val));
 		}
 
 		FileHandler::writeFile($etc_tmp_config_file, $buff);
 
-		if(@file_exists($etc_tmp_config_file)) return true;
+		if (@file_exists($etc_tmp_config_file)) return true;
 		return false;
 	}
 
@@ -655,13 +655,13 @@ 
 			//if(file_exists($config_file)) return;
 
 			$db_info = Context::getDBInfo();
-			if(!$db_info) return;
+			if (!$db_info) return;
 
 			$buff = $this->_getDBConfigFileContents($db_info);
 
 			FileHandler::writeFile($config_file, $buff);
 
-			if(@file_exists($config_file))
+			if (@file_exists($config_file))
 			{
 				FileHandler::removeFile($this->db_tmp_config_file);
 				FileHandler::removeFile($this->etc_tmp_config_file);
@@ -676,7 +676,7 @@ 
 	function installByConfig($install_config_file)
 	{
 		include $install_config_file;
-		if(!is_array($auto_config)) return false;
+		if (!is_array($auto_config)) return false;
 
 		$auto_config['module'] = 'install';
 		$auto_config['act'] = 'procInstall';
@@ -684,22 +684,22 @@ 
 		$fstr = "<%s><![CDATA[%s]]></%s>\r\n";
 		$fheader = "POST %s HTTP/1.1\r\nHost: %s\r\nContent-Type: application/xml\r\nContent-Length: %s\r\n\r\n%s\r\n";
 		$body = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\r\n<methodCall>\r\n<params>\r\n";
-		foreach($auto_config as $k => $v)
+		foreach ($auto_config as $k => $v)
 		{
-			if(!in_array($k,array('host','port','path'))) $body .= sprintf($fstr,$k,$v,$k);
+			if (!in_array($k, array('host', 'port', 'path'))) $body .= sprintf($fstr, $k, $v, $k);
 		}
 		$body .= "</params>\r\n</methodCall>";
 
-		$header = sprintf($fheader,$auto_config['path'],$auto_config['host'],strlen($body),$body);
+		$header = sprintf($fheader, $auto_config['path'], $auto_config['host'], strlen($body), $body);
 		$fp = @fsockopen($auto_config['host'], $auto_config['port'], $errno, $errstr, 5);
 
-		if($fp)
+		if ($fp)
 		{
 			fputs($fp, $header);
-			while(!feof($fp))
+			while (!feof($fp))
 			{
 				$line = trim(fgets($fp, 4096));
-				if(strncmp('<error>', $line, 7) === 0)
+				if (strncmp('<error>', $line, 7) === 0)
 				{
 					fclose($fp);
 					return false;

Braces +149 added lines, -58 removed lines

@@ -101,11 +101,17 @@ 
 		// Check if available to connect to the DB
 		$oDB = &DB::getInstance();
 		$output = $oDB->getError();
-		if(!$output->toBool()) return $output;
-		if(!$oDB->isConnected()) return $oDB->getError();
+		if(!$output->toBool()) {
+			return $output;
+		}
+		if(!$oDB->isConnected()) {
+			return $oDB->getError();
+		}
 
 		// Create a db temp config file
-		if(!$this->makeDBConfigFile()) return new Object(-1, 'msg_install_failed');
+		if(!$this->makeDBConfigFile()) {
+			return new Object(-1, 'msg_install_failed');
+		}
 
 		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
 		{
@@ -122,10 +128,14 @@ 
 	{
 		// Get variables
 		$config_info = Context::gets('use_rewrite','time_zone');
-		if($config_info->use_rewrite!='Y') $config_info->use_rewrite = 'N';
+		if($config_info->use_rewrite!='Y') {
+			$config_info->use_rewrite = 'N';
+		}
 
 		// Create a db temp config file
-		if(!$this->makeEtcConfigFile($config_info)) return new Object(-1, 'msg_install_failed');
+		if(!$this->makeEtcConfigFile($config_info)) {
+			return new Object(-1, 'msg_install_failed');
+		}
 
 		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
 		{
@@ -141,7 +151,9 @@ 
 	function procInstall()
 	{
 		// Check if it is already installed
-		if(Context::isInstalled()) return new Object(-1, 'msg_already_installed');
+		if(Context::isInstalled()) {
+			return new Object(-1, 'msg_already_installed');
+		}
 
 		// Assign a temporary administrator when installing
 		$logged_info = new stdClass();
@@ -156,8 +168,12 @@ 
 		// install by default XE UI
 		else
 		{
-			if(FileHandler::exists($this->db_tmp_config_file)) include $this->db_tmp_config_file;
-			if(FileHandler::exists($this->etc_tmp_config_file)) include $this->etc_tmp_config_file;
+			if(FileHandler::exists($this->db_tmp_config_file)) {
+				include $this->db_tmp_config_file;
+			}
+			if(FileHandler::exists($this->etc_tmp_config_file)) {
+				include $this->etc_tmp_config_file;
+			}
 		}
 
 		// Set DB type and information
@@ -165,7 +181,9 @@ 
 		// Create DB Instance
 		$oDB = &DB::getInstance();
 		// Check if available to connect to the DB
-		if(!$oDB->isConnected()) return $oDB->getError();
+		if(!$oDB->isConnected()) {
+			return $oDB->getError();
+		}
 
 		// Install all the modules
 		try {
@@ -178,7 +196,9 @@ 
 		}
 
 		// Create a config file
-		if(!$this->makeConfigFile()) return new Object(-1, 'msg_install_failed');
+		if(!$this->makeConfigFile()) {
+			return new Object(-1, 'msg_install_failed');
+		}
 
 		// load script
 		$scripts = FileHandler::readDir(_XE_PATH_ . 'modules/install/script', '/(\.php)$/');
@@ -235,14 +255,17 @@ 
 		{
 			$https_port = (Context::get('https_port')) ? Context::get('https_port') : $_SERVER['SERVER_PORT'];
 			$https_port = (!$https_port != 443) ? $https_port : null;
-		}
-		else
+		} else
 		{
 			$http_port = (Context::get('http_port')) ? Context::get('http_port') : $_SERVER['SERVER_PORT'];
 			$http_port = (!$http_port != 80) ? $http_port : null;
 		}
-		if($http_port) $db_info->http_port = $http_port;
-		if($https_port) $db_info->https_port = $https_port;
+		if($http_port) {
+			$db_info->http_port = $http_port;
+		}
+		if($https_port) {
+			$db_info->https_port = $https_port;
+		}
 
 		return $db_info;
 	}
@@ -252,12 +275,20 @@ 
 	 */
 	function procInstallFTP()
 	{
-		if(Context::isInstalled()) return new Object(-1, 'msg_already_installed');
+		if(Context::isInstalled()) {
+			return new Object(-1, 'msg_already_installed');
+		}
 		$ftp_info = Context::gets('ftp_host', 'ftp_user','ftp_password','ftp_port','ftp_root_path');
 		$ftp_info->ftp_port = (int)$ftp_info->ftp_port;
-		if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
-		if(!$ftp_info->ftp_host) $ftp_info->ftp_host = '127.0.0.1';
-		if(!$ftp_info->ftp_root_path) $ftp_info->ftp_root_path = '/';
+		if(!$ftp_info->ftp_port) {
+			$ftp_info->ftp_port = 21;
+		}
+		if(!$ftp_info->ftp_host) {
+			$ftp_info->ftp_host = '127.0.0.1';
+		}
+		if(!$ftp_info->ftp_root_path) {
+			$ftp_info->ftp_root_path = '/';
+		}
 
 		$buff = array('<?php if(!defined("__XE__")) exit();');
 		$buff[] = "\$ftp_info = new stdClass();";
@@ -269,11 +300,15 @@ 
 		// If safe_mode
 		if(ini_get('safe_mode'))
 		{
-			if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new Object(-1,'msg_safe_mode_ftp_needed');
+			if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) {
+				return new Object(-1,'msg_safe_mode_ftp_needed');
+			}
 
 			require_once(_XE_PATH_.'libs/ftp.class.php');
 			$oFtp = new ftp();
-			if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
+			if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) {
+				return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
+			}
 
 			if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
@@ -315,10 +350,16 @@ 
 	{
 		$ftp_info = Context::gets('ftp_user','ftp_password','ftp_port','sftp');
 		$ftp_info->ftp_port = (int)$ftp_info->ftp_port;
-		if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
-		if(!$ftp_info->sftp) $ftp_info->sftp = 'N';
+		if(!$ftp_info->ftp_port) {
+			$ftp_info->ftp_port = 21;
+		}
+		if(!$ftp_info->sftp) {
+			$ftp_info->sftp = 'N';
+		}
 
-		if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new Object(-1,'msg_safe_mode_ftp_needed');
+		if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) {
+			return new Object(-1,'msg_safe_mode_ftp_needed');
+		}
 
 		if($ftp_info->sftp == 'Y')
 		{
@@ -327,12 +368,13 @@ 
 			{
 				return new Object(-1,'msg_ftp_invalid_auth_info');
 			}
-		}
-		else
+		} else
 		{
 			require_once(_XE_PATH_.'libs/ftp.class.php');
 			$oFtp = new ftp();
-			if(!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost'));
+			if(!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) {
+				return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost'));
+			}
 
 			if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
@@ -365,26 +407,47 @@ 
 		}
 
 		// 1. Check permission
-		if(is_writable('./')||is_writable('./files')) $checklist['permission'] = true;
-		else $checklist['permission'] = false;
+		if(is_writable('./')||is_writable('./files')) {
+			$checklist['permission'] = true;
+		} else {
+			$checklist['permission'] = false;
+		}
 		// 2. Check if xml_parser_create exists
-		if(function_exists('xml_parser_create')) $checklist['xml'] = true;
-		else $checklist['xml'] = false;
+		if(function_exists('xml_parser_create')) {
+			$checklist['xml'] = true;
+		} else {
+			$checklist['xml'] = false;
+		}
 		// 3. Check if ini_get (session.auto_start) == 1
-		if(ini_get('session.auto_start')!=1) $checklist['session'] = true;
-		else $checklist['session'] = false;
+		if(ini_get('session.auto_start')!=1) {
+			$checklist['session'] = true;
+		} else {
+			$checklist['session'] = false;
+		}
 		// 4. Check if iconv exists
-		if(function_exists('iconv')) $checklist['iconv'] = true;
-		else $checklist['iconv'] = false;
+		if(function_exists('iconv')) {
+			$checklist['iconv'] = true;
+		} else {
+			$checklist['iconv'] = false;
+		}
 		// 5. Check gd(imagecreatefromgif function)
-		if(function_exists('imagecreatefromgif')) $checklist['gd'] = true;
-		else $checklist['gd'] = false;
+		if(function_exists('imagecreatefromgif')) {
+			$checklist['gd'] = true;
+		} else {
+			$checklist['gd'] = false;
+		}
 		// 6. Check DB
-		if(DB::getEnableList()) $checklist['db'] = true;
-		else $checklist['db'] = false;
+		if(DB::getEnableList()) {
+			$checklist['db'] = true;
+		} else {
+			$checklist['db'] = false;
+		}
 
-		if(!$checklist['php_version'] || !$checklist['permission'] || !$checklist['xml'] || !$checklist['session'] || !$checklist['db']) $install_enable = false;
-		else $install_enable = true;
+		if(!$checklist['php_version'] || !$checklist['permission'] || !$checklist['xml'] || !$checklist['session'] || !$checklist['db']) {
+			$install_enable = false;
+		} else {
+			$install_enable = true;
+		}
 
 		// Save the checked result to the Context
 		Context::set('checklist', $checklist);
@@ -407,8 +470,7 @@ 
 		{
 			$currentTime = $_SERVER['REQUEST_TIME'];
 			FileHandler::writeFile($this->flagLicenseAgreement, $currentTime);
-		}
-		else
+		} else
 		{
 			FileHandler::removeFile($this->flagLicenseAgreement);
 			return new Object(-1, 'msg_must_accept_license_agreement');
@@ -503,13 +565,17 @@ 
 			$module = $tmp_arr[count($tmp_arr)-1];
 
 			$xml_info = $oModuleModel->getModuleInfoXml($module);
-			if(!$xml_info) continue;
+			if(!$xml_info) {
+				continue;
+			}
 			$modules[$xml_info->category][] = $module;
 		}
 		// Install "module" module in advance
 		$this->installModule('module','./modules/module');
 		$oModule = getClass('module');
-		if($oModule->checkUpdate()) $oModule->moduleUpdate();
+		if($oModule->checkUpdate()) {
+			$oModule->moduleUpdate();
+		}
 		// Determine the order of module installation depending on category
 		$install_step = array('system','content','member');
 		// Install all the remaining modules
@@ -519,13 +585,17 @@ 
 			{
 				foreach($modules[$category] as $module)
 				{
-					if($module == 'module') continue;
+					if($module == 'module') {
+						continue;
+					}
 					$this->installModule($module, sprintf('./modules/%s', $module));
 
 					$oModule = getClass($module);
 					if(is_object($oModule) && method_exists($oModule, 'checkUpdate'))
 					{
-						if($oModule->checkUpdate()) $oModule->moduleUpdate();
+						if($oModule->checkUpdate()) {
+							$oModule->moduleUpdate();
+						}
 					}
 				}
 				unset($modules[$category]);
@@ -540,13 +610,17 @@ 
 				{
 					foreach($module_list as $module)
 					{
-						if($module == 'module') continue;
+						if($module == 'module') {
+							continue;
+						}
 						$this->installModule($module, sprintf('./modules/%s', $module));
 
 						$oModule = getClass($module);
 						if($oModule && method_exists($oModule, 'checkUpdate') && method_exists($oModule, 'moduleUpdate'))
 						{
-							if($oModule->checkUpdate()) $oModule->moduleUpdate();
+							if($oModule->checkUpdate()) {
+								$oModule->moduleUpdate();
+							}
 						}
 					}
 				}
@@ -571,15 +645,20 @@ 
 		for($i=0;$i<$file_cnt;$i++)
 		{
 			$file = trim($schema_files[$i]);
-			if(!$file || substr($file,-4)!='.xml') continue;
+			if(!$file || substr($file,-4)!='.xml') {
+				continue;
+			}
 			$output = $oDB->createTableByXmlFile($file);
-			if($output === false)
-				throw new Exception('msg_create_table_failed');
+			if($output === false) {
+							throw new Exception('msg_create_table_failed');
+			}
 		}
 		// Create a table and module instance and then execute install() method
 		unset($oModule);
 		$oModule = getClass($module);
-		if(method_exists($oModule, 'moduleInstall')) $oModule->moduleInstall();
+		if(method_exists($oModule, 'moduleInstall')) {
+			$oModule->moduleInstall();
+		}
 		return new Object();
 	}
 
@@ -614,13 +693,17 @@ 
 		$db_tmp_config_file = $this->db_tmp_config_file;
 
 		$db_info = Context::getDBInfo();
-		if(!$db_info) return;
+		if(!$db_info) {
+			return;
+		}
 
 		$buff = $this->_getDBConfigFileContents($db_info);
 
 		FileHandler::writeFile($db_tmp_config_file, $buff);
 
-		if(@file_exists($db_tmp_config_file)) return true;
+		if(@file_exists($db_tmp_config_file)) {
+			return true;
+		}
 		return false;
 	}
 
@@ -640,7 +723,9 @@ 
 
 		FileHandler::writeFile($etc_tmp_config_file, $buff);
 
-		if(@file_exists($etc_tmp_config_file)) return true;
+		if(@file_exists($etc_tmp_config_file)) {
+			return true;
+		}
 		return false;
 	}
 
@@ -655,7 +740,9 @@ 
 			//if(file_exists($config_file)) return;
 
 			$db_info = Context::getDBInfo();
-			if(!$db_info) return;
+			if(!$db_info) {
+				return;
+			}
 
 			$buff = $this->_getDBConfigFileContents($db_info);
 
@@ -676,7 +763,9 @@ 
 	function installByConfig($install_config_file)
 	{
 		include $install_config_file;
-		if(!is_array($auto_config)) return false;
+		if(!is_array($auto_config)) {
+			return false;
+		}
 
 		$auto_config['module'] = 'install';
 		$auto_config['act'] = 'procInstall';
@@ -686,7 +775,9 @@ 
 		$body = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\r\n<methodCall>\r\n<params>\r\n";
 		foreach($auto_config as $k => $v)
 		{
-			if(!in_array($k,array('host','port','path'))) $body .= sprintf($fstr,$k,$v,$k);
+			if(!in_array($k,array('host','port','path'))) {
+				$body .= sprintf($fstr,$k,$v,$k);
+			}
 		}
 		$body .= "</params>\r\n</methodCall>";
 

classes/context/Context.class.php

Spacing +301 added lines, -301 removed lines

@@ -162,7 +162,7 @@ 
 	function &getInstance()
 	{
 		static $theInstance = null;
-		if(!$theInstance)
+		if (!$theInstance)
 		{
 			$theInstance = new Context();
 		}
@@ -182,10 +182,10 @@ 
 
 		// include ssl action cache file
 		$this->sslActionCacheFile = FileHandler::getRealPath($this->sslActionCacheFile);
-		if(is_readable($this->sslActionCacheFile))
+		if (is_readable($this->sslActionCacheFile))
 		{
 			require($this->sslActionCacheFile);
-			if(isset($sslActions))
+			if (isset($sslActions))
 			{
 				$this->ssl_actions = $sslActions;
 			}
@@ -201,12 +201,12 @@ 
 	function init()
 	{
 		// fix missing HTTP_RAW_POST_DATA in PHP 5.6 and above
-		if(!isset($GLOBALS['HTTP_RAW_POST_DATA']) && version_compare(PHP_VERSION, '5.6.0', '>=') === TRUE)
+		if (!isset($GLOBALS['HTTP_RAW_POST_DATA']) && version_compare(PHP_VERSION, '5.6.0', '>=') === TRUE)
 		{
 			$GLOBALS['HTTP_RAW_POST_DATA'] = file_get_contents("php://input");
 			
 			// If content is not XML JSON, unset
-			if(!preg_match('/^[\<\{\[]/', $GLOBALS['HTTP_RAW_POST_DATA']) && strpos($_SERVER['CONTENT_TYPE'], 'json') === FALSE && strpos($_SERVER['HTTP_CONTENT_TYPE'], 'json') === FALSE)
+			if (!preg_match('/^[\<\{\[]/', $GLOBALS['HTTP_RAW_POST_DATA']) && strpos($_SERVER['CONTENT_TYPE'], 'json') === FALSE && strpos($_SERVER['HTTP_CONTENT_TYPE'], 'json') === FALSE)
 			{
 				unset($GLOBALS['HTTP_RAW_POST_DATA']);
 			}
@@ -228,11 +228,11 @@ 
 		$this->_setUploadedArgument();
 
 		$this->loadDBInfo();
-		if($this->db_info->use_sitelock == 'Y')
+		if ($this->db_info->use_sitelock == 'Y')
 		{
-			if(is_array($this->db_info->sitelock_whitelist)) $whitelist = $this->db_info->sitelock_whitelist;
+			if (is_array($this->db_info->sitelock_whitelist)) $whitelist = $this->db_info->sitelock_whitelist;
 
-			if(!IpFilter::filter($whitelist))
+			if (!IpFilter::filter($whitelist))
 			{
 				$title = ($this->db_info->sitelock_title) ? $this->db_info->sitelock_title : 'Maintenance in progress...';
 				$message = $this->db_info->sitelock_message;
@@ -242,52 +242,52 @@ 
 				define('_XE_SITELOCK_MESSAGE_', $message);
 
 				header("HTTP/1.1 403 Forbidden");
-				if(FileHandler::exists(_XE_PATH_ . 'common/tpl/sitelock.user.html'))
+				if (FileHandler::exists(_XE_PATH_.'common/tpl/sitelock.user.html'))
 				{
-					include _XE_PATH_ . 'common/tpl/sitelock.user.html';
+					include _XE_PATH_.'common/tpl/sitelock.user.html';
 				}
 				else
 				{
-					include _XE_PATH_ . 'common/tpl/sitelock.html';
+					include _XE_PATH_.'common/tpl/sitelock.html';
 				}
 				exit;
 			}
 		}
 
 		// If XE is installed, get virtual site information
-		if(self::isInstalled())
+		if (self::isInstalled())
 		{
 			$oModuleModel = getModel('module');
 			$site_module_info = $oModuleModel->getDefaultMid();
 
-			if(!isset($site_module_info))
+			if (!isset($site_module_info))
 			{
 				$site_module_info = new stdClass();
 			}
 
 			// if site_srl of site_module_info is 0 (default site), compare the domain to default_url of db_config
-			if($site_module_info->site_srl == 0 && $site_module_info->domain != $this->db_info->default_url)
+			if ($site_module_info->site_srl == 0 && $site_module_info->domain != $this->db_info->default_url)
 			{
 				$site_module_info->domain = $this->db_info->default_url;
 			}
 
 			$this->set('site_module_info', $site_module_info);
-			if($site_module_info->site_srl && isSiteID($site_module_info->domain))
+			if ($site_module_info->site_srl && isSiteID($site_module_info->domain))
 			{
 				$this->set('vid', $site_module_info->domain, TRUE);
 			}
 
-			if(!isset($this->db_info))
+			if (!isset($this->db_info))
 			{
 				$this->db_info = new stdClass();
 			}
 
 			$this->db_info->lang_type = $site_module_info->default_language;
-			if(!$this->db_info->lang_type)
+			if (!$this->db_info->lang_type)
 			{
 				$this->db_info->lang_type = 'en';
 			}
-			if(!$this->db_info->use_db_session)
+			if (!$this->db_info->use_db_session)
 			{
 				$this->db_info->use_db_session = 'N';
 			}
@@ -297,30 +297,30 @@ 
 		$lang_supported = $this->loadLangSelected();
 
 		// Retrieve language type set in user's cookie
-		if($this->lang_type = $this->get('l'))
+		if ($this->lang_type = $this->get('l'))
 		{
-			if($_COOKIE['lang_type'] != $this->lang_type)
+			if ($_COOKIE['lang_type'] != $this->lang_type)
 			{
 				setcookie('lang_type', $this->lang_type, $_SERVER['REQUEST_TIME'] + 3600 * 24 * 1000);
 			}
 		}
-		elseif($_COOKIE['lang_type'])
+		elseif ($_COOKIE['lang_type'])
 		{
 			$this->lang_type = $_COOKIE['lang_type'];
 		}
 
 		// If it's not exists, follow default language type set in db_info
-		if(!$this->lang_type)
+		if (!$this->lang_type)
 		{
 			$this->lang_type = $this->db_info->lang_type;
 		}
 
 		// if still lang_type has not been set or has not-supported type , set as English.
-		if(!$this->lang_type)
+		if (!$this->lang_type)
 		{
 			$this->lang_type = 'en';
 		}
-		if(is_array($lang_supported) && !isset($lang_supported[$this->lang_type]))
+		if (is_array($lang_supported) && !isset($lang_supported[$this->lang_type]))
 		{
 			$this->lang_type = 'en';
 		}
@@ -329,10 +329,10 @@ 
 		$this->setLangType($this->lang_type);
 
 		// load module module's language file according to language setting
-		$this->loadLang(_XE_PATH_ . 'modules/module/lang');
+		$this->loadLang(_XE_PATH_.'modules/module/lang');
 
 		// set session handler
-		if(self::isInstalled() && $this->db_info->use_db_session == 'Y')
+		if (self::isInstalled() && $this->db_info->use_db_session == 'Y')
 		{
 			$oSessionModel = getModel('session');
 			$oSessionController = getController('session');
@@ -341,11 +341,11 @@ 
 			);
 		}
 
-		if($sess = $_POST[session_name()]) session_id($sess);
+		if ($sess = $_POST[session_name()]) session_id($sess);
 		session_start();
 
 		// set authentication information in Context and session
-		if(self::isInstalled())
+		if (self::isInstalled())
 		{
 			$oModuleModel = getModel('module');
 			$oModuleModel->loadModuleExtends();
@@ -353,15 +353,15 @@ 
 			$oMemberModel = getModel('member');
 			$oMemberController = getController('member');
 
-			if($oMemberController && $oMemberModel)
+			if ($oMemberController && $oMemberModel)
 			{
 				// if signed in, validate it.
-				if($oMemberModel->isLogged())
+				if ($oMemberModel->isLogged())
 				{
 					$oMemberController->setSessionInfo();
 				}
 				// check auto sign-in
-				elseif($_COOKIE['xeak'])
+				elseif ($_COOKIE['xeak'])
 				{
 					$oMemberController->doAutologin();
 				}
@@ -373,7 +373,7 @@ 
 
 		// load common language file
 		$this->lang = &$GLOBALS['lang'];
-		$this->loadLang(_XE_PATH_ . 'common/lang/');
+		$this->loadLang(_XE_PATH_.'common/lang/');
 
 		// check if using rewrite module
 		$this->allow_rewrite = ($this->db_info->use_rewrite == 'Y' ? TRUE : FALSE);
@@ -381,28 +381,28 @@ 
 		// set locations for javascript use
 		$url = array();
 		$current_url = self::getRequestUri();
-		if($_SERVER['REQUEST_METHOD'] == 'GET')
+		if ($_SERVER['REQUEST_METHOD'] == 'GET')
 		{
-			if($this->get_vars)
+			if ($this->get_vars)
 			{
 				$url = array();
-				foreach($this->get_vars as $key => $val)
+				foreach ($this->get_vars as $key => $val)
 				{
-					if(is_array($val) && count($val) > 0)
+					if (is_array($val) && count($val) > 0)
 					{
-						foreach($val as $k => $v)
+						foreach ($val as $k => $v)
 						{
-							$url[] = $key . '[' . $k . ']=' . urlencode($v);
+							$url[] = $key.'['.$k.']='.urlencode($v);
 						}
 					}
-					elseif($val)
+					elseif ($val)
 					{
-						$url[] = $key . '=' . urlencode($val);
+						$url[] = $key.'='.urlencode($val);
 					}
 				}
 
 				$current_url = self::getRequestUri();
-				if($url) $current_url .= '?' . join('&', $url);
+				if ($url) $current_url .= '?'.join('&', $url);
 			}
 			else
 			{
@@ -417,12 +417,12 @@ 
 		$this->set('current_url', $current_url);
 		$this->set('request_uri', self::getRequestUri());
 
-		if(strpos($current_url, 'xn--') !== FALSE)
+		if (strpos($current_url, 'xn--') !== FALSE)
 		{
 			$this->set('current_url', self::decodeIdna($current_url));
 		}
 
-		if(strpos(self::getRequestUri(), 'xn--') !== FALSE)
+		if (strpos(self::getRequestUri(), 'xn--') !== FALSE)
 		{
 			$this->set('request_uri', self::decodeIdna(self::getRequestUri()));
 		}
@@ -447,7 +447,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if(!$self->isInstalled())
+		if (!$self->isInstalled())
 		{
 			return;
 		}
@@ -455,7 +455,7 @@ 
 		include($self::getConfigFile());
 
 		// If master_db information does not exist, the config file needs to be updated
-		if(!isset($db_info->master_db))
+		if (!isset($db_info->master_db))
 		{
 			$db_info->master_db = array();
 			$db_info->master_db["db_type"] = $db_info->db_type;
@@ -473,7 +473,7 @@ 
 			$db_info->master_db["db_table_prefix"] = $db_info->db_table_prefix;
 			unset($db_info->db_table_prefix);
 
-			if(isset($db_info->master_db["db_table_prefix"]) && substr_compare($db_info->master_db["db_table_prefix"], '_', -1) !== 0)
+			if (isset($db_info->master_db["db_table_prefix"]) && substr_compare($db_info->master_db["db_table_prefix"], '_', -1) !== 0)
 			{
 				$db_info->master_db["db_table_prefix"] .= '_';
 			}
@@ -485,33 +485,33 @@ 
 			$oInstallController->makeConfigFile();
 		}
 
-		if(!$db_info->use_prepared_statements)
+		if (!$db_info->use_prepared_statements)
 		{
 			$db_info->use_prepared_statements = 'Y';
 		}
 
-		if(!$db_info->time_zone)
+		if (!$db_info->time_zone)
 			$db_info->time_zone = date('O');
 		$GLOBALS['_time_zone'] = $db_info->time_zone;
 
-		if($db_info->qmail_compatibility != 'Y')
+		if ($db_info->qmail_compatibility != 'Y')
 			$db_info->qmail_compatibility = 'N';
 		$GLOBALS['_qmail_compatibility'] = $db_info->qmail_compatibility;
 
-		if(!$db_info->use_db_session)
+		if (!$db_info->use_db_session)
 			$db_info->use_db_session = 'N';
-		if(!$db_info->use_ssl)
+		if (!$db_info->use_ssl)
 			$db_info->use_ssl = 'none';
 		$this->set('_use_ssl', $db_info->use_ssl);
 
 		$self->set('_http_port', ($db_info->http_port) ? $db_info->http_port : NULL);
 		$self->set('_https_port', ($db_info->https_port) ? $db_info->https_port : NULL);
 
-		if(!$db_info->sitelock_whitelist) {
+		if (!$db_info->sitelock_whitelist) {
 			$db_info->sitelock_whitelist = '127.0.0.1';
 		}
 
-		if(is_string($db_info->sitelock_whitelist)) {
+		if (is_string($db_info->sitelock_whitelist)) {
 			$db_info->sitelock_whitelist = explode(',', $db_info->sitelock_whitelist);
 		}
 
@@ -582,10 +582,10 @@ 
 	function loadLangSupported()
 	{
 		static $lang_supported = null;
-		if(!$lang_supported)
+		if (!$lang_supported)
 		{
-			$langs = file(_XE_PATH_ . 'common/lang/lang.info');
-			foreach($langs as $val)
+			$langs = file(_XE_PATH_.'common/lang/lang.info');
+			foreach ($langs as $val)
 			{
 				list($lang_prefix, $lang_text) = explode(',', $val);
 				$lang_text = trim($lang_text);
@@ -603,17 +603,17 @@ 
 	function loadLangSelected()
 	{
 		static $lang_selected = null;
-		if(!$lang_selected)
+		if (!$lang_selected)
 		{
-			$orig_lang_file = _XE_PATH_ . 'common/lang/lang.info';
-			$selected_lang_file = _XE_PATH_ . 'files/config/lang_selected.info';
-			if(!FileHandler::hasContent($selected_lang_file))
+			$orig_lang_file = _XE_PATH_.'common/lang/lang.info';
+			$selected_lang_file = _XE_PATH_.'files/config/lang_selected.info';
+			if (!FileHandler::hasContent($selected_lang_file))
 			{
-				$old_selected_lang_file = _XE_PATH_ . 'files/cache/lang_selected.info';
+				$old_selected_lang_file = _XE_PATH_.'files/cache/lang_selected.info';
 				FileHandler::moveFile($old_selected_lang_file, $selected_lang_file);
 			}
 
-			if(!FileHandler::hasContent($selected_lang_file))
+			if (!FileHandler::hasContent($selected_lang_file))
 			{
 				$buff = FileHandler::readFile($orig_lang_file);
 				FileHandler::writeFile($selected_lang_file, $buff);
@@ -622,7 +622,7 @@ 
 			else
 			{
 				$langs = file($selected_lang_file);
-				foreach($langs as $val)
+				foreach ($langs as $val)
 				{
 					list($lang_prefix, $lang_text) = explode(',', $val);
 					$lang_text = trim($lang_text);
@@ -641,56 +641,56 @@ 
 	function checkSSO()
 	{
 		// pass if it's not GET request or XE is not yet installed
-		if($this->db_info->use_sso != 'Y' || isCrawler())
+		if ($this->db_info->use_sso != 'Y' || isCrawler())
 		{
 			return TRUE;
 		}
 		$checkActList = array('rss' => 1, 'atom' => 1);
-		if(self::getRequestMethod() != 'GET' || !self::isInstalled() || isset($checkActList[self::get('act')]))
+		if (self::getRequestMethod() != 'GET' || !self::isInstalled() || isset($checkActList[self::get('act')]))
 		{
 			return TRUE;
 		}
 
 		// pass if default URL is not set
 		$default_url = trim($this->db_info->default_url);
-		if(!$default_url)
+		if (!$default_url)
 		{
 			return TRUE;
 		}
 
-		if(substr_compare($default_url, '/', -1) !== 0)
+		if (substr_compare($default_url, '/', -1) !== 0)
 		{
 			$default_url .= '/';
 		}
 
 		// for sites recieving SSO valdiation
-		if($default_url == self::getRequestUri())
+		if ($default_url == self::getRequestUri())
 		{
-			if(self::get('url'))
+			if (self::get('url'))
 			{
 				$url = base64_decode(self::get('url'));
 				$url_info = parse_url($url);
-				if(!Password::checkSignature($url, self::get('sig')))
+				if (!Password::checkSignature($url, self::get('sig')))
 				{
 					echo self::get('lang')->msg_invalid_request;
 					return false;
 				}
 
 				$oModuleModel = getModel('module');
-				$domain = $url_info['host'] . $url_info['path'];
-				if(substr_compare($domain, '/', -1) === 0) $domain = substr($domain, 0, -1);
+				$domain = $url_info['host'].$url_info['path'];
+				if (substr_compare($domain, '/', -1) === 0) $domain = substr($domain, 0, -1);
 				$site_info = $oModuleModel->getSiteInfoByDomain($domain);
 
-				if($site_info->site_srl)
+				if ($site_info->site_srl)
 				{
-				$url_info['query'].= ($url_info['query'] ? '&' : '') . 'SSOID=' . urlencode(session_id()) . '&sig=' . urlencode(Password::createSignature(session_id()));
-				$redirect_url = sprintf('%s://%s%s%s?%s', $url_info['scheme'], $url_info['host'], $url_info['port'] ? ':' . $url_info['port'] : '', $url_info['path'], $url_info['query']);
+				$url_info['query'] .= ($url_info['query'] ? '&' : '').'SSOID='.urlencode(session_id()).'&sig='.urlencode(Password::createSignature(session_id()));
+				$redirect_url = sprintf('%s://%s%s%s?%s', $url_info['scheme'], $url_info['host'], $url_info['port'] ? ':'.$url_info['port'] : '', $url_info['path'], $url_info['query']);
 				}
 				else
 				{
 					$redirect_url = $url;
 				}
-				header('location:' . $redirect_url);
+				header('location:'.$redirect_url);
 
 				return FALSE;
 			}
@@ -699,9 +699,9 @@ 
 		else
 		{
 			// result handling : set session_name()
-			if($session_name = self::get('SSOID'))
+			if ($session_name = self::get('SSOID'))
 			{
-				if(!Password::checkSignature($session_name, self::get('sig')))
+				if (!Password::checkSignature($session_name, self::get('sig')))
 				{
 					echo self::get('lang')->msg_invalid_request;
 					return false;
@@ -710,17 +710,17 @@ 
 				setcookie(session_name(), $session_name);
 
 				$url = preg_replace('/[\?\&]SSOID=.+$/', '', self::getRequestUrl());
-				header('location:' . $url);
+				header('location:'.$url);
 				return FALSE;
 				// send SSO request
 			}
-			else if(!self::get('SSOID') && $_COOKIE['sso'] != md5(self::getRequestUri()))
+			else if (!self::get('SSOID') && $_COOKIE['sso'] != md5(self::getRequestUri()))
 			{
 				setcookie('sso', md5(self::getRequestUri()));
 				$origin_url = self::getRequestUrl();
 				$origin_sig = Password::createSignature($origin_url);
 				$url = sprintf("%s?url=%s&sig=%s", $default_url, urlencode(base64_encode($origin_url)), urlencode($origin_sig));
-				header('location:' . $url);
+				header('location:'.$url);
 				return FALSE;
 			}
 		}
@@ -747,7 +747,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if(!$self->isFTPRegisted())
+		if (!$self->isFTPRegisted())
 		{
 			return null;
 		}
@@ -765,15 +765,15 @@ 
 	 */
 	function addBrowserTitle($site_title)
 	{
-		if(!$site_title)
+		if (!$site_title)
 		{
 			return;
 		}
 		$self = self::getInstance();
 
-		if($self->site_title)
+		if ($self->site_title)
 		{
-			$self->site_title .= ' - ' . $site_title;
+			$self->site_title .= ' - '.$site_title;
 		}
 		else
 		{
@@ -789,7 +789,7 @@ 
 	 */
 	function setBrowserTitle($site_title)
 	{
-		if(!$site_title)
+		if (!$site_title)
 		{
 			return;
 		}
@@ -821,7 +821,7 @@ 
 		$oModuleModel = getModel('module');
 		$moduleConfig = $oModuleModel->getModuleConfig('module');
 
-		if(isset($moduleConfig->siteTitle))
+		if (isset($moduleConfig->siteTitle))
 		{
 			return $moduleConfig->siteTitle;
 		}
@@ -848,30 +848,30 @@ 
 		global $lang;
 
 		$self = self::getInstance();
-		if(!$self->lang_type)
+		if (!$self->lang_type)
 		{
 			return;
 		}
-		if(!is_object($lang))
+		if (!is_object($lang))
 		{
 			$lang = new stdClass;
 		}
 
-		if(!($filename = $self->_loadXmlLang($path)))
+		if (!($filename = $self->_loadXmlLang($path)))
 		{
 			$filename = $self->_loadPhpLang($path);
 		}
 
-		if(!is_array($self->loaded_lang_files))
+		if (!is_array($self->loaded_lang_files))
 		{
 			$self->loaded_lang_files = array();
 		}
-		if(in_array($filename, $self->loaded_lang_files))
+		if (in_array($filename, $self->loaded_lang_files))
 		{
 			return;
 		}
 
-		if($filename && is_readable($filename))
+		if ($filename && is_readable($filename))
 		{
 			$self->loaded_lang_files[] = $filename;
 			include($filename);
@@ -892,24 +892,24 @@ 
 	{
 		global $lang;
 
-		if(!$path) return;
+		if (!$path) return;
 
-		$_path = 'eval://' . $path;
+		$_path = 'eval://'.$path;
 
-		if(in_array($_path, $this->loaded_lang_files))
+		if (in_array($_path, $this->loaded_lang_files))
 		{
 			return;
 		}
 
-		if(substr_compare($path, '/', -1) !== 0)
+		if (substr_compare($path, '/', -1) !== 0)
 		{
 			$path .= '/';
 		}
 
-		$oXmlLangParser = new XmlLangParser($path . 'lang.xml', $this->lang_type);
+		$oXmlLangParser = new XmlLangParser($path.'lang.xml', $this->lang_type);
 		$content = $oXmlLangParser->getCompileContent();
 
-		if($content)
+		if ($content)
 		{
 			$this->loaded_lang_files[] = $_path;
 			eval($content);
@@ -924,9 +924,9 @@ 
 	 */
 	function _loadXmlLang($path)
 	{
-		if(!$path) return;
+		if (!$path) return;
 
-		$oXmlLangParser = new XmlLangParser($path . ((substr_compare($path, '/', -1) !== 0) ? '/' : '') . 'lang.xml', $this->lang_type);
+		$oXmlLangParser = new XmlLangParser($path.((substr_compare($path, '/', -1) !== 0) ? '/' : '').'lang.xml', $this->lang_type);
 		return $oXmlLangParser->compile();
 	}
 
@@ -938,22 +938,22 @@ 
 	 */
 	function _loadPhpLang($path)
 	{
-		if(!$path) return;
+		if (!$path) return;
 
-		if(substr_compare($path, '/', -1) !== 0)
+		if (substr_compare($path, '/', -1) !== 0)
 		{
 			$path .= '/';
 		}
-		$path_tpl = $path . '%s.lang.php';
+		$path_tpl = $path.'%s.lang.php';
 		$file = sprintf($path_tpl, $this->lang_type);
 
 		$langs = array('ko', 'en'); // this will be configurable.
-		while(!is_readable($file) && $langs[0])
+		while (!is_readable($file) && $langs[0])
 		{
 			$file = sprintf($path_tpl, array_shift($langs));
 		}
 
-		if(!is_readable($file))
+		if (!is_readable($file))
 		{
 			return FALSE;
 		}
@@ -995,11 +995,11 @@ 
 	 */
 	function getLang($code)
 	{
-		if(!$code)
+		if (!$code)
 		{
 			return;
 		}
-		if($GLOBALS['lang']->{$code})
+		if ($GLOBALS['lang']->{$code})
 		{
 			return $GLOBALS['lang']->{$code};
 		}
@@ -1015,7 +1015,7 @@ 
 	 */
 	function setLang($code, $val)
 	{
-		if(!isset($GLOBALS['lang']))
+		if (!isset($GLOBALS['lang']))
 		{
 			$GLOBALS['lang'] = new stdClass();
 		}
@@ -1043,17 +1043,17 @@ 
 
 		$obj = clone $source_obj;
 
-		foreach($charset_list as $charset)
+		foreach ($charset_list as $charset)
 		{
-			array_walk($obj,'Context::checkConvertFlag',$charset);
+			array_walk($obj, 'Context::checkConvertFlag', $charset);
 			$flag = self::checkConvertFlag($flag = TRUE);
-			if($flag)
+			if ($flag)
 			{
-				if($charset == 'UTF-8')
+				if ($charset == 'UTF-8')
 				{
 					return $obj;
 				}
-				array_walk($obj,'Context::doConvertEncoding',$charset);
+				array_walk($obj, 'Context::doConvertEncoding', $charset);
 				return $obj;
 			}
 		}
@@ -1072,11 +1072,11 @@ 
 	function checkConvertFlag(&$val, $key = null, $charset = null)
 	{
 		static $flag = TRUE;
-		if($charset)
+		if ($charset)
 		{
-			if(is_array($val))
-				array_walk($val,'Context::checkConvertFlag',$charset);
-			else if($val && iconv($charset,$charset,$val)!=$val) $flag = FALSE;
+			if (is_array($val))
+				array_walk($val, 'Context::checkConvertFlag', $charset);
+			else if ($val && iconv($charset, $charset, $val) != $val) $flag = FALSE;
 			else $flag = FALSE;
 		}
 		else
@@ -1100,9 +1100,9 @@ 
 	{
 		if (is_array($val))
 		{
-			array_walk($val,'Context::doConvertEncoding',$charset);
+			array_walk($val, 'Context::doConvertEncoding', $charset);
 		}
-		else $val = iconv($charset,'UTF-8',$val);
+		else $val = iconv($charset, 'UTF-8', $val);
 	}
 
 	/**
@@ -1113,7 +1113,7 @@ 
 	 */
 	function convertEncodingStr($str)
 	{
-        if(!$str) return null;
+        if (!$str) return null;
 		$obj = new stdClass();
 		$obj->str = $str;
 		$obj = self::convertEncoding($obj);
@@ -1122,9 +1122,9 @@ 
 
 	function decodeIdna($domain)
 	{
-		if(strpos($domain, 'xn--') !== FALSE)
+		if (strpos($domain, 'xn--') !== FALSE)
 		{
-			require_once(_XE_PATH_ . 'libs/idna_convert/idna_convert.class.php');
+			require_once(_XE_PATH_.'libs/idna_convert/idna_convert.class.php');
 			$IDN = new idna_convert(array('idn_version' => 2008));
 			$domain = $IDN->decode($domain);
 		}
@@ -1155,7 +1155,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if($self->response_method)
+		if ($self->response_method)
 		{
 			return $self->response_method;
 		}
@@ -1195,7 +1195,7 @@ 
 		$this->_recursiveCheckVar($_SERVER['HTTP_HOST']);
 
 		$pattern = "/[\,\"\'\{\}\[\]\(\);$]/";
-		if(preg_match($pattern, $_SERVER['HTTP_HOST']))
+		if (preg_match($pattern, $_SERVER['HTTP_HOST']))
 		{
 			$this->isSuccessInit = FALSE;
 		}
@@ -1208,30 +1208,30 @@ 
 	 */
 	function _setRequestArgument()
 	{
-		if(!count($_REQUEST))
+		if (!count($_REQUEST))
 		{
 			return;
 		}
 
 		$requestMethod = $this->getRequestMethod();
-		foreach($_REQUEST as $key => $val)
+		foreach ($_REQUEST as $key => $val)
 		{
-			if($val === '' || self::get($key))
+			if ($val === '' || self::get($key))
 			{
 				continue;
 			}
 			$key = htmlentities($key);
 			$val = $this->_filterRequestVar($key, $val);
 
-			if($requestMethod == 'GET' && isset($_GET[$key]))
+			if ($requestMethod == 'GET' && isset($_GET[$key]))
 			{
 				$set_to_vars = TRUE;
 			}
-			elseif($requestMethod == 'POST' && isset($_POST[$key]))
+			elseif ($requestMethod == 'POST' && isset($_POST[$key]))
 			{
 				$set_to_vars = TRUE;
 			}
-			elseif($requestMethod == 'JS_CALLBACK' && (isset($_GET[$key]) || isset($_POST[$key])))
+			elseif ($requestMethod == 'JS_CALLBACK' && (isset($_GET[$key]) || isset($_POST[$key])))
 			{
 				$set_to_vars = TRUE;
 			}
@@ -1240,7 +1240,7 @@ 
 				$set_to_vars = FALSE;
 			}
 
-			if($set_to_vars)
+			if ($set_to_vars)
 			{
 				$this->_recursiveCheckVar($val);
 			}
@@ -1251,20 +1251,20 @@ 
 
 	function _recursiveCheckVar($val)
 	{
-		if(is_string($val))
+		if (is_string($val))
 		{
-			foreach($this->patterns as $pattern)
+			foreach ($this->patterns as $pattern)
 			{
-				if(preg_match($pattern, $val))
+				if (preg_match($pattern, $val))
 				{
 					$this->isSuccessInit = FALSE;
 					return;
 				}
 			}
 		}
-		else if(is_array($val))
+		else if (is_array($val))
 		{
-			foreach($val as $val2)
+			foreach ($val as $val2)
 			{
 				$this->_recursiveCheckVar($val2);
 			}
@@ -1278,7 +1278,7 @@ 
 	 */
 	function _setJSONRequestArgument()
 	{
-		if($this->getRequestMethod() != 'JSON')
+		if ($this->getRequestMethod() != 'JSON')
 		{
 			return;
 		}
@@ -1286,7 +1286,7 @@ 
 		$params = array();
 		parse_str($GLOBALS['HTTP_RAW_POST_DATA'], $params);
 
-		foreach($params as $key => $val)
+		foreach ($params as $key => $val)
 		{
 			$this->set($key, $this->_filterRequestVar($key, $val, 1), TRUE);
 		}
@@ -1299,13 +1299,13 @@ 
 	 */
 	function _setXmlRpcArgument()
 	{
-		if($this->getRequestMethod() != 'XMLRPC')
+		if ($this->getRequestMethod() != 'XMLRPC')
 		{
 			return;
 		}
 
 		$xml = $GLOBALS['HTTP_RAW_POST_DATA'];
-		if(Security::detectingXEE($xml))
+		if (Security::detectingXEE($xml))
 		{
 			header("HTTP/1.0 400 Bad Request");
 			exit;
@@ -1317,12 +1317,12 @@ 
 		$params = $xml_obj->methodcall->params;
 		unset($params->node_name, $params->attrs, $params->body);
 
-		if(!count(get_object_vars($params)))
+		if (!count(get_object_vars($params)))
 		{
 			return;
 		}
 
-		foreach($params as $key => $val)
+		foreach ($params as $key => $val)
 		{
 			$this->set($key, $this->_filterXmlVars($key, $val), TRUE);
 		}
@@ -1337,10 +1337,10 @@ 
 	 */
 	function _filterXmlVars($key, $val)
 	{
-		if(is_array($val))
+		if (is_array($val))
 		{
 			$stack = array();
-			foreach($val as $k => $v)
+			foreach ($val as $k => $v)
 			{
 				$stack[$k] = $this->_filterXmlVars($k, $v);
 			}
@@ -1350,20 +1350,20 @@ 
 
 		$body = $val->body;
 		unset($val->node_name, $val->attrs, $val->body);
-		if(!count(get_object_vars($val)))
+		if (!count(get_object_vars($val)))
 		{
 			return $this->_filterRequestVar($key, $body, 0);
 		}
 
 		$stack = new stdClass();
-		foreach($val as $k => $v)
+		foreach ($val as $k => $v)
 		{
 			$output = $this->_filterXmlVars($k, $v);
-			if(is_object($v) && $v->attrs->type == 'array')
+			if (is_object($v) && $v->attrs->type == 'array')
 			{
 				$output = array($output);
 			}
-			if($k == 'value' && (is_array($v) || $v->attrs->type == 'array'))
+			if ($k == 'value' && (is_array($v) || $v->attrs->type == 'array'))
 			{
 				return $output;
 			}
@@ -1371,7 +1371,7 @@ 
 			$stack->{$k} = $output;
 		}
 
-		if(!count(get_object_vars($stack)))
+		if (!count(get_object_vars($stack)))
 		{
 			return NULL;
 		}
@@ -1390,32 +1390,32 @@ 
 	 */
 	function _filterRequestVar($key, $val, $do_stripslashes = 1)
 	{
-		if(!($isArray = is_array($val)))
+		if (!($isArray = is_array($val)))
 		{
 			$val = array($val);
 		}
 
 		$result = array();
-		foreach($val as $k => $v)
+		foreach ($val as $k => $v)
 		{
 			$k = htmlentities($k);
-			if($key === 'page' || $key === 'cpage' || substr_compare($key, 'srl', -3) === 0)
+			if ($key === 'page' || $key === 'cpage' || substr_compare($key, 'srl', -3) === 0)
 			{
 				$result[$k] = !preg_match('/^[0-9,]+$/', $v) ? (int) $v : $v;
 			}
-			elseif($key === 'mid' || $key === 'search_keyword')
+			elseif ($key === 'mid' || $key === 'search_keyword')
 			{
 				$result[$k] = htmlspecialchars($v, ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
 			}
-			elseif($key === 'vid')
+			elseif ($key === 'vid')
 			{
 				$result[$k] = urlencode($v);
 			}
-			elseif($key === 'xe_validator_id')
+			elseif ($key === 'xe_validator_id')
 			{
 				$result[$k] = htmlspecialchars($v, ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
 			}
-			elseif(stripos($key, 'XE_VALIDATOR', 0) === 0)
+			elseif (stripos($key, 'XE_VALIDATOR', 0) === 0)
 			{
 				unset($result[$k]);
 			}
@@ -1423,7 +1423,7 @@ 
 			{
 				$result[$k] = $v;
 
-				if($do_stripslashes && version_compare(PHP_VERSION, '5.4.0', '<') && get_magic_quotes_gpc())
+				if ($do_stripslashes && version_compare(PHP_VERSION, '5.4.0', '<') && get_magic_quotes_gpc())
 				{
 					if (is_array($result[$k]))
 					{
@@ -1435,7 +1435,7 @@ 
 					}
 				}
 
-				if(is_array($result[$k]))
+				if (is_array($result[$k]))
 				{
 					array_walk_recursive($result[$k], function(&$val) { $val = trim($val); });
 				}
@@ -1467,17 +1467,17 @@ 
 	 */
 	function _setUploadedArgument()
 	{
-		if($_SERVER['REQUEST_METHOD'] != 'POST' || !$_FILES || (stripos($_SERVER['CONTENT_TYPE'], 'multipart/form-data') === FALSE && stripos($_SERVER['HTTP_CONTENT_TYPE'], 'multipart/form-data') === FALSE))
+		if ($_SERVER['REQUEST_METHOD'] != 'POST' || !$_FILES || (stripos($_SERVER['CONTENT_TYPE'], 'multipart/form-data') === FALSE && stripos($_SERVER['HTTP_CONTENT_TYPE'], 'multipart/form-data') === FALSE))
 		{
 			return;
 		}
 
-		foreach($_FILES as $key => $val)
+		foreach ($_FILES as $key => $val)
 		{
 			$tmp_name = $val['tmp_name'];
-			if(!is_array($tmp_name))
+			if (!is_array($tmp_name))
 			{
-				if(!$tmp_name || !is_uploaded_file($tmp_name))
+				if (!$tmp_name || !is_uploaded_file($tmp_name))
 				{
 					continue;
 				}
@@ -1490,9 +1490,9 @@ 
 				$files = array();
 				$count_files = count($tmp_name);
 
-				for($i = 0; $i < $count_files; $i++)
+				for ($i = 0; $i < $count_files; $i++)
 				{
-					if($val['size'][$i] > 0)
+					if ($val['size'][$i] > 0)
 					{
 						$file = array();
 						$file['name'] = $val['name'][$i];
@@ -1503,7 +1503,7 @@ 
 						$files[] = $file;
 					}
 				}
-				if($files) $this->set($key, $files, TRUE);
+				if ($files) $this->set($key, $files, TRUE);
 			}
 		}
 	}
@@ -1525,16 +1525,16 @@ 
 	function getRequestUrl()
 	{
 		static $url = null;
-		if(is_null($url))
+		if (is_null($url))
 		{
 			$url = self::getRequestUri();
-			if(count($_GET) > 0)
+			if (count($_GET) > 0)
 			{
-				foreach($_GET as $key => $val)
+				foreach ($_GET as $key => $val)
 				{
-					$vars[] = $key . '=' . ($val ? urlencode(self::convertEncodingStr($val)) : '');
+					$vars[] = $key.'='.($val ? urlencode(self::convertEncodingStr($val)) : '');
 				}
-				$url .= '?' . join('&', $vars);
+				$url .= '?'.join('&', $vars);
 			}
 		}
 		return $url;
@@ -1549,7 +1549,7 @@ 
 		$self = self::getInstance();
 		$js_callback_func = isset($_GET['xe_js_callback']) ? $_GET['xe_js_callback'] : $_POST['xe_js_callback'];
 
-		if(!preg_match('/^[a-z0-9\.]+$/i', $js_callback_func))
+		if (!preg_match('/^[a-z0-9\.]+$/i', $js_callback_func))
 		{
 			unset($js_callback_func);
 			unset($_GET['xe_js_callback']);
@@ -1577,22 +1577,22 @@ 
 		$self = self::getInstance();
 
 		// retrieve virtual site information
-		if(is_null($site_module_info))
+		if (is_null($site_module_info))
 		{
 			$site_module_info = self::get('site_module_info');
 		}
 
 		// If $domain is set, handle it (if $domain is vid type, remove $domain and handle with $vid)
-		if($domain && isSiteID($domain))
+		if ($domain && isSiteID($domain))
 		{
 			$vid = $domain;
 			$domain = '';
 		}
 
 		// If $domain, $vid are not set, use current site information
-		if(!$domain && !$vid)
+		if (!$domain && !$vid)
 		{
-			if($site_module_info->domain && isSiteID($site_module_info->domain))
+			if ($site_module_info->domain && isSiteID($site_module_info->domain))
 			{
 				$vid = $site_module_info->domain;
 			}
@@ -1603,21 +1603,21 @@ 
 		}
 
 		// if $domain is set, compare current URL. If they are same, remove the domain, otherwise link to the domain.
-		if($domain)
+		if ($domain)
 		{
 			$domain_info = parse_url($domain);
-			if(is_null($current_info))
+			if (is_null($current_info))
 			{
-				$current_info = parse_url(($_SERVER['HTTPS'] == 'on' ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'] . getScriptPath());
+				$current_info = parse_url(($_SERVER['HTTPS'] == 'on' ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'].getScriptPath());
 			}
-			if($domain_info['host'] . $domain_info['path'] == $current_info['host'] . $current_info['path'])
+			if ($domain_info['host'].$domain_info['path'] == $current_info['host'].$current_info['path'])
 			{
 				unset($domain);
 			}
 			else
 			{
 				$domain = preg_replace('/^(http|https):\/\//i', '', trim($domain));
-				if(substr_compare($domain, '/', -1) !== 0)
+				if (substr_compare($domain, '/', -1) !== 0)
 				{
 					$domain .= '/';
 				}
@@ -1627,10 +1627,10 @@ 
 		$get_vars = array();
 
 		// If there is no GET variables or first argument is '' to reset variables
-		if(!$self->get_vars || $args_list[0] == '')
+		if (!$self->get_vars || $args_list[0] == '')
 		{
 			// rearrange args_list
-			if(is_array($args_list) && $args_list[0] == '')
+			if (is_array($args_list) && $args_list[0] == '')
 			{
 				array_shift($args_list);
 			}
@@ -1642,13 +1642,13 @@ 
 		}
 
 		// arrange args_list
-		for($i = 0, $c = count($args_list); $i < $c; $i += 2)
+		for ($i = 0, $c = count($args_list); $i < $c; $i += 2)
 		{
 			$key = $args_list[$i];
 			$val = trim($args_list[$i + 1]);
 
 			// If value is not set, remove the key
-			if(!isset($val) || !strlen($val))
+			if (!isset($val) || !strlen($val))
 			{
 				unset($get_vars[$key]);
 				continue;
@@ -1659,7 +1659,7 @@ 
 
 		// remove vid, rnd
 		unset($get_vars['rnd']);
-		if($vid)
+		if ($vid)
 		{
 			$get_vars['vid'] = $vid;
 		}
@@ -1676,17 +1676,17 @@ 
 			'dispDocumentAdminManageDocument' => 'dispDocumentManageDocument',
 			'dispModuleAdminSelectList' => 'dispModuleSelectList'
 		);
-		if($act_alias[$act])
+		if ($act_alias[$act])
 		{
 			$get_vars['act'] = $act_alias[$act];
 		}
 
 		// organize URL
 		$query = '';
-		if(count($get_vars) > 0)
+		if (count($get_vars) > 0)
 		{
 			// if using rewrite mod
-			if($self->allow_rewrite)
+			if ($self->allow_rewrite)
 			{
 				$var_keys = array_keys($get_vars);
 				sort($var_keys);
@@ -1706,8 +1706,8 @@ 
 					'vid' => $vid,
 					'mid' => $mid,
 					'mid.vid' => "$vid/$mid",
-					'entry.mid' => "$mid/entry/" . $get_vars['entry'],
-					'entry.mid.vid' => "$vid/$mid/entry/" . $get_vars['entry'],
+					'entry.mid' => "$mid/entry/".$get_vars['entry'],
+					'entry.mid.vid' => "$vid/$mid/entry/".$get_vars['entry'],
 					'document_srl' => $srl,
 					'document_srl.mid' => "$mid/$srl",
 					'document_srl.vid' => "$vid/$srl",
@@ -1724,66 +1724,66 @@ 
 				$query = $target_map[$target];
 			}
 
-			if(!$query)
+			if (!$query)
 			{
 				$queries = array();
-				foreach($get_vars as $key => $val)
+				foreach ($get_vars as $key => $val)
 				{
-					if(is_array($val) && count($val) > 0)
+					if (is_array($val) && count($val) > 0)
 					{
-						foreach($val as $k => $v)
+						foreach ($val as $k => $v)
 						{
-							$queries[] = $key . '[' . $k . ']=' . urlencode($v);
+							$queries[] = $key.'['.$k.']='.urlencode($v);
 						}
 					}
-					elseif(!is_array($val))
+					elseif (!is_array($val))
 					{
-						$queries[] = $key . '=' . urlencode($val);
+						$queries[] = $key.'='.urlencode($val);
 					}
 				}
-				if(count($queries) > 0)
+				if (count($queries) > 0)
 				{
-					$query = 'index.php?' . join('&', $queries);
+					$query = 'index.php?'.join('&', $queries);
 				}
 			}
 		}
 
 		// If using SSL always
 		$_use_ssl = $self->get('_use_ssl');
-		if($_use_ssl == 'always')
+		if ($_use_ssl == 'always')
 		{
-			$query = $self->getRequestUri(ENFORCE_SSL, $domain) . $query;
+			$query = $self->getRequestUri(ENFORCE_SSL, $domain).$query;
 			// optional SSL use
 		}
-		elseif($_use_ssl == 'optional')
+		elseif ($_use_ssl == 'optional')
 		{
 			$ssl_mode = (($self->get('module') === 'admin') || ($get_vars['module'] === 'admin') || (isset($get_vars['act']) && $self->isExistsSSLAction($get_vars['act']))) ? ENFORCE_SSL : RELEASE_SSL;
-			$query = $self->getRequestUri($ssl_mode, $domain) . $query;
+			$query = $self->getRequestUri($ssl_mode, $domain).$query;
 			// no SSL
 		}
 		else
 		{
 			// currently on SSL but target is not based on SSL
-			if($_SERVER['HTTPS'] == 'on')
+			if ($_SERVER['HTTPS'] == 'on')
 			{
-				$query = $self->getRequestUri(ENFORCE_SSL, $domain) . $query;
+				$query = $self->getRequestUri(ENFORCE_SSL, $domain).$query;
 			}
-			else if($domain) // if $domain is set
+			else if ($domain) // if $domain is set
 			{
-				$query = $self->getRequestUri(FOLLOW_REQUEST_SSL, $domain) . $query;
+				$query = $self->getRequestUri(FOLLOW_REQUEST_SSL, $domain).$query;
 			}
 			else
 			{
-				$query = getScriptPath() . $query;
+				$query = getScriptPath().$query;
 			}
 		}
 
-		if(!$encode)
+		if (!$encode)
 		{
 			return $query;
 		}
 
-		if(!$autoEncode)
+		if (!$autoEncode)
 		{
 			return htmlspecialchars($query, ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
 		}
@@ -1792,16 +1792,16 @@ 
 		$encode_queries = array();
 		$parsedUrl = parse_url($query);
 		parse_str($parsedUrl['query'], $output);
-		foreach($output as $key => $value)
+		foreach ($output as $key => $value)
 		{
-			if(preg_match('/&([a-z]{2,}|#\d+);/', urldecode($value)))
+			if (preg_match('/&([a-z]{2,}|#\d+);/', urldecode($value)))
 			{
 				$value = urlencode(htmlspecialchars_decode(urldecode($value)));
 			}
-			$encode_queries[] = $key . '=' . $value;
+			$encode_queries[] = $key.'='.$value;
 		}
 
-		return htmlspecialchars($parsedUrl['path'] . '?' . join('&', $encode_queries), ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
+		return htmlspecialchars($parsedUrl['path'].'?'.join('&', $encode_queries), ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
 	}
 
 	/**
@@ -1816,17 +1816,17 @@ 
 		static $url = array();
 
 		// Check HTTP Request
-		if(!isset($_SERVER['SERVER_PROTOCOL']))
+		if (!isset($_SERVER['SERVER_PROTOCOL']))
 		{
 			return;
 		}
 
-		if(self::get('_use_ssl') == 'always')
+		if (self::get('_use_ssl') == 'always')
 		{
 			$ssl_mode = ENFORCE_SSL;
 		}
 
-		if($domain)
+		if ($domain)
 		{
 			$domain_key = md5($domain);
 		}
@@ -1835,14 +1835,14 @@ 
 			$domain_key = 'default';
 		}
 
-		if(isset($url[$ssl_mode][$domain_key]))
+		if (isset($url[$ssl_mode][$domain_key]))
 		{
 			return $url[$ssl_mode][$domain_key];
 		}
 
 		$current_use_ssl = ($_SERVER['HTTPS'] == 'on');
 
-		switch($ssl_mode)
+		switch ($ssl_mode)
 		{
 			case FOLLOW_REQUEST_SSL: $use_ssl = $current_use_ssl;
 				break;
@@ -1852,34 +1852,34 @@ 
 				break;
 		}
 
-		if($domain)
+		if ($domain)
 		{
 			$target_url = trim($domain);
-			if(substr_compare($target_url, '/', -1) !== 0)
+			if (substr_compare($target_url, '/', -1) !== 0)
 			{
-				$target_url.= '/';
+				$target_url .= '/';
 			}
 		}
 		else
 		{
-			$target_url = $_SERVER['HTTP_HOST'] . getScriptPath();
+			$target_url = $_SERVER['HTTP_HOST'].getScriptPath();
 		}
 
-		$url_info = parse_url('http://' . $target_url);
+		$url_info = parse_url('http://'.$target_url);
 
-		if($current_use_ssl != $use_ssl)
+		if ($current_use_ssl != $use_ssl)
 		{
 			unset($url_info['port']);
 		}
 
-		if($use_ssl)
+		if ($use_ssl)
 		{
 			$port = self::get('_https_port');
-			if($port && $port != 443)
+			if ($port && $port != 443)
 			{
 				$url_info['port'] = $port;
 			}
-			elseif($url_info['port'] == 443)
+			elseif ($url_info['port'] == 443)
 			{
 				unset($url_info['port']);
 			}
@@ -1887,17 +1887,17 @@ 
 		else
 		{
 			$port = self::get('_http_port');
-			if($port && $port != 80)
+			if ($port && $port != 80)
 			{
 				$url_info['port'] = $port;
 			}
-			elseif($url_info['port'] == 80)
+			elseif ($url_info['port'] == 80)
 			{
 				unset($url_info['port']);
 			}
 		}
 
-		$url[$ssl_mode][$domain_key] = sprintf('%s://%s%s%s', $use_ssl ? 'https' : $url_info['scheme'], $url_info['host'], $url_info['port'] && $url_info['port'] != 80 ? ':' . $url_info['port'] : '', $url_info['path']);
+		$url[$ssl_mode][$domain_key] = sprintf('%s://%s%s%s', $use_ssl ? 'https' : $url_info['scheme'], $url_info['host'], $url_info['port'] && $url_info['port'] != 80 ? ':'.$url_info['port'] : '', $url_info['path']);
 
 		return $url[$ssl_mode][$domain_key];
 	}
@@ -1914,16 +1914,16 @@ 
 	{
 		$self = self::getInstance();
 		$self->context->{$key} = $val;
-		if($set_to_get_vars === FALSE)
+		if ($set_to_get_vars === FALSE)
 		{
 			return;
 		}
-		if($val === NULL || $val === '')
+		if ($val === NULL || $val === '')
 		{
 			unset($self->get_vars->{$key});
 			return;
 		}
-		if($set_to_get_vars || $self->get_vars->{$key})
+		if ($set_to_get_vars || $self->get_vars->{$key})
 		{
 			$self->get_vars->{$key} = $val;
 		}
@@ -1939,7 +1939,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if(!isset($self->context->{$key}))
+		if (!isset($self->context->{$key}))
 		{
 			return null;
 		}
@@ -1954,7 +1954,7 @@ 
 	function gets()
 	{
 		$num_args = func_num_args();
-		if($num_args < 1)
+		if ($num_args < 1)
 		{
 			return;
 		}
@@ -1962,7 +1962,7 @@ 
 
 		$args_list = func_get_args();
 		$output = new stdClass();
-		foreach($args_list as $v)
+		foreach ($args_list as $v)
 		{
 			$output->{$v} = $self->get($v);
 		}
@@ -1988,7 +1988,7 @@ 
 	function getRequestVars()
 	{
 		$self = self::getInstance();
-		if($self->get_vars)
+		if ($self->get_vars)
 		{
 			return clone($self->get_vars);
 		}
@@ -2005,13 +2005,13 @@ 
 	{
 		$self = self::getInstance();
 
-		if(!is_readable($self->sslActionCacheFile))
+		if (!is_readable($self->sslActionCacheFile))
 		{
 			$buff = '<?php if(!defined("__XE__"))exit;';
 			FileHandler::writeFile($self->sslActionCacheFile, $buff);
 		}
 
-		if(!isset($self->ssl_actions[$action]))
+		if (!isset($self->ssl_actions[$action]))
 		{
 			$self->ssl_actions[$action] = 1;
 			$sslActionCacheString = sprintf('$sslActions[\'%s\'] = 1;', $action);
@@ -2029,16 +2029,16 @@ 
 	{
 		$self = self::getInstance();
 
-		if(!is_readable($self->sslActionCacheFile))
+		if (!is_readable($self->sslActionCacheFile))
 		{
 			unset($self->ssl_actions);
 			$buff = '<?php if(!defined("__XE__"))exit;';
 			FileHandler::writeFile($self->sslActionCacheFile, $buff);
 		}
 
-		foreach($action_array as $action)
+		foreach ($action_array as $action)
 		{
-			if(!isset($self->ssl_actions[$action]))
+			if (!isset($self->ssl_actions[$action]))
 			{
 				$self->ssl_actions[$action] = 1;
 				$sslActionCacheString = sprintf('$sslActions[\'%s\'] = 1;', $action);
@@ -2057,7 +2057,7 @@ 
 	{
 		$self = self::getInstance();
 
-		if($self->isExistsSSLAction($action))
+		if ($self->isExistsSSLAction($action))
 		{
 			$sslActionCacheString = sprintf('$sslActions[\'%s\'] = 1;', $action);
 			$buff = FileHandler::readFile($self->sslActionCacheFile);
@@ -2074,7 +2074,7 @@ 
 	function getSSLActions()
 	{
 		$self = self::getInstance();
-		if($self->getSslStatus() == 'optional')
+		if ($self->getSslStatus() == 'optional')
 		{
 			return $self->ssl_actions;
 		}
@@ -2101,12 +2101,12 @@ 
 	 */
 	function normalizeFilePath($file)
 	{
-		if($file{0} != '/' && $file{0} != '.' && strpos($file, '://') === FALSE)
+		if ($file{0} != '/' && $file{0} != '.' && strpos($file, '://') === FALSE)
 		{
-			$file = './' . $file;
+			$file = './'.$file;
 		}
 		$file = preg_replace('@/\./|(?<!:)\/\/@', '/', $file);
-		while(strpos($file, '/../') !== FALSE)
+		while (strpos($file, '/../') !== FALSE)
 		{
 			$file = preg_replace('/\/([^\/]+)\/\.\.\//s', '/', $file, 1);
 		}
@@ -2125,13 +2125,13 @@ 
 	{
 		$file = self::normalizeFilePath($file);
 		$script_path = getScriptPath();
-		if(strpos($file, './') === 0)
+		if (strpos($file, './') === 0)
 		{
-			$file = $script_path . substr($file, 2);
+			$file = $script_path.substr($file, 2);
 		}
-		elseif(strpos($file, '../') === 0)
+		elseif (strpos($file, '../') === 0)
 		{
-			$file = self::normalizeFilePath($script_path . $file);
+			$file = self::normalizeFilePath($script_path.$file);
 		}
 
 		return $file;
@@ -2201,12 +2201,12 @@ 
 	 */
 	function addJsFile($file, $optimized = FALSE, $targetie = '', $index = 0, $type = 'head', $isRuleset = FALSE, $autoPath = null)
 	{
-		if($isRuleset)
+		if ($isRuleset)
 		{
-			if(strpos($file, '#') !== FALSE)
+			if (strpos($file, '#') !== FALSE)
 			{
 				$file = str_replace('#', '', $file);
-				if(!is_readable($file))
+				if (!is_readable($file))
 				{
 					$file = $autoPath;
 				}
@@ -2271,9 +2271,9 @@ 
 		ksort($files);
 		$files = array_values($files);
 		$filenames = array();
-		for($i = 0, $c = count($files); $i < $c; ++$i)
+		for ($i = 0, $c = count($files); $i < $c; ++$i)
 		{
-			if(in_array($files[$i]['file'], $filenames))
+			if (in_array($files[$i]['file'], $filenames))
 			{
 				unset($files[$i]);
 			}
@@ -2358,14 +2358,14 @@ 
 	 */
 	function getJavascriptPluginInfo($pluginName)
 	{
-		if($plugin_name == 'ui.datepicker')
+		if ($plugin_name == 'ui.datepicker')
 		{
 			$plugin_name = 'ui';
 		}
 
-		$plugin_path = './common/js/plugins/' . $pluginName . '/';
-		$info_file = $plugin_path . 'plugin.load';
-		if(!is_readable($info_file))
+		$plugin_path = './common/js/plugins/'.$pluginName.'/';
+		$info_file = $plugin_path.'plugin.load';
+		if (!is_readable($info_file))
 		{
 			return;
 		}
@@ -2375,32 +2375,32 @@ 
 		$result->jsList = array();
 		$result->cssList = array();
 
-		foreach($list as $filename)
+		foreach ($list as $filename)
 		{
 			$filename = trim($filename);
-			if(!$filename)
+			if (!$filename)
 			{
 				continue;
 			}
 
-			if(strncasecmp('./', $filename, 2) === 0)
+			if (strncasecmp('./', $filename, 2) === 0)
 			{
 				$filename = substr($filename, 2);
 			}
 
-			if(substr_compare($filename, '.js', -3) === 0)
+			if (substr_compare($filename, '.js', -3) === 0)
 			{
-				$result->jsList[] = $plugin_path . $filename;
+				$result->jsList[] = $plugin_path.$filename;
 			}
-			elseif(substr_compare($filename, '.css', -4) === 0)
+			elseif (substr_compare($filename, '.css', -4) === 0)
 			{
-				$result->cssList[] = $plugin_path . $filename;
+				$result->cssList[] = $plugin_path.$filename;
 			}
 		}
 
-		if(is_dir($plugin_path . 'lang'))
+		if (is_dir($plugin_path.'lang'))
 		{
-			$result->langPath = $plugin_path . 'lang';
+			$result->langPath = $plugin_path.'lang';
 		}
 
 		return $result;
@@ -2416,50 +2416,50 @@ 
 		static $loaded_plugins = array();
 
 		$self = self::getInstance();
-		if($plugin_name == 'ui.datepicker')
+		if ($plugin_name == 'ui.datepicker')
 		{
 			$plugin_name = 'ui';
 		}
 
-		if($loaded_plugins[$plugin_name])
+		if ($loaded_plugins[$plugin_name])
 		{
 			return;
 		}
 		$loaded_plugins[$plugin_name] = TRUE;
 
-		$plugin_path = './common/js/plugins/' . $plugin_name . '/';
-		$info_file = $plugin_path . 'plugin.load';
-		if(!is_readable($info_file))
+		$plugin_path = './common/js/plugins/'.$plugin_name.'/';
+		$info_file = $plugin_path.'plugin.load';
+		if (!is_readable($info_file))
 		{
 			return;
 		}
 
 		$list = file($info_file);
-		foreach($list as $filename)
+		foreach ($list as $filename)
 		{
 			$filename = trim($filename);
-			if(!$filename)
+			if (!$filename)
 			{
 				continue;
 			}
 
-			if(strncasecmp('./', $filename, 2) === 0)
+			if (strncasecmp('./', $filename, 2) === 0)
 			{
 				$filename = substr($filename, 2);
 			}
-			if(substr_compare($filename, '.js', -3) === 0)
+			if (substr_compare($filename, '.js', -3) === 0)
 			{
-				$self->loadFile(array($plugin_path . $filename, 'body', '', 0), TRUE);
+				$self->loadFile(array($plugin_path.$filename, 'body', '', 0), TRUE);
 			}
-			if(substr_compare($filename, '.css', -4) === 0)
+			if (substr_compare($filename, '.css', -4) === 0)
 			{
-				$self->loadFile(array($plugin_path . $filename, 'all', '', 0), TRUE);
+				$self->loadFile(array($plugin_path.$filename, 'all', '', 0), TRUE);
 			}
 		}
 
-		if(is_dir($plugin_path . 'lang'))
+		if (is_dir($plugin_path.'lang'))
 		{
-			$self->loadLang($plugin_path . 'lang');
+			$self->loadLang($plugin_path.'lang');
 		}
 	}
 
@@ -2472,7 +2472,7 @@ 
 	function addHtmlHeader($header)
 	{
 		$self = self::getInstance();
-		$self->html_header .= "\n" . $header;
+		$self->html_header .= "\n".$header;
 	}
 
 	function clearHtmlHeader()
@@ -2524,7 +2524,7 @@ 
 	function addBodyHeader($header)
 	{
 		$self = self::getInstance();
-		$self->body_header .= "\n" . $header;
+		$self->body_header .= "\n".$header;
 	}
 
 	/**
@@ -2546,7 +2546,7 @@ 
 	function addHtmlFooter($footer)
 	{
 		$self = self::getInstance();
-		$self->html_footer .= ($self->Htmlfooter ? "\n" : '') . $footer;
+		$self->html_footer .= ($self->Htmlfooter ? "\n" : '').$footer;
 	}
 
 	/**
@@ -2567,7 +2567,7 @@ 
 	 */
 	function getConfigFile()
 	{
-		return _XE_PATH_ . 'files/config/db.config.php';
+		return _XE_PATH_.'files/config/db.config.php';
 	}
 
 	/**
@@ -2577,7 +2577,7 @@ 
 	 */
 	function getFTPConfigFile()
 	{
-		return _XE_PATH_ . 'files/config/ftp.config.php';
+		return _XE_PATH_.'files/config/ftp.config.php';
 	}
 
 	/**
@@ -2629,14 +2629,14 @@ 
 		$_path = explode('/', $path);
 		$_base = explode('/', $base_url);
 
-		if(!$_base[count($_base) - 1])
+		if (!$_base[count($_base) - 1])
 		{
 			array_pop($_base);
 		}
 
-		foreach($_xe as $idx => $dir)
+		foreach ($_xe as $idx => $dir)
 		{
-			if($_path[0] != $dir)
+			if ($_path[0] != $dir)
 			{
 				break;
 			}
@@ -2644,9 +2644,9 @@ 
 		}
 
 		$idx = count($_xe) - $idx - 1;
-		while($idx--)
+		while ($idx--)
 		{
-			if(count($_base) > 0)
+			if (count($_base) > 0)
 			{
 				array_shift($_base);
 			}
@@ -2656,13 +2656,13 @@ 
 			}
 		}
 
-		if(count($_base) > 0)
+		if (count($_base) > 0)
 		{
 			array_unshift($_path, join('/', $_base));
 		}
 
-		$path = '/' . join('/', $_path);
-		if(substr_compare($path, '/', -1) !== 0)
+		$path = '/'.join('/', $_path);
+		if (substr_compare($path, '/', -1) !== 0)
 		{
 			$path .= '/';
 		}
@@ -2677,13 +2677,13 @@ 
 	{
 		$self = self::getInstance();
 
-		if(!is_array($self->meta_tags))
+		if (!is_array($self->meta_tags))
 		{
 			$self->meta_tags = array();
 		}
 
 		$ret = array();
-		foreach($self->meta_tags as $key => $val)
+		foreach ($self->meta_tags as $key => $val)
 		{
 			list($name, $is_http_equiv) = explode("\t", $key);
 			$ret[] = array('name' => $name, 'is_http_equiv' => $is_http_equiv, 'content' => $val);
@@ -2703,7 +2703,7 @@ 
 	function addMetaTag($name, $content, $is_http_equiv = FALSE)
 	{
 		$self = self::getInstance();
-		$self->meta_tags[$name . "\t" . ($is_http_equiv ? '1' : '0')] = $content;
+		$self->meta_tags[$name."\t".($is_http_equiv ? '1' : '0')] = $content;
 	}
 
 }

Braces +90 added lines, -103 removed lines

@@ -230,7 +230,9 @@ 
 		$this->loadDBInfo();
 		if($this->db_info->use_sitelock == 'Y')
 		{
-			if(is_array($this->db_info->sitelock_whitelist)) $whitelist = $this->db_info->sitelock_whitelist;
+			if(is_array($this->db_info->sitelock_whitelist)) {
+				$whitelist = $this->db_info->sitelock_whitelist;
+			}
 
 			if(!IpFilter::filter($whitelist))
 			{
@@ -245,8 +247,7 @@ 
 				if(FileHandler::exists(_XE_PATH_ . 'common/tpl/sitelock.user.html'))
 				{
 					include _XE_PATH_ . 'common/tpl/sitelock.user.html';
-				}
-				else
+				} else
 				{
 					include _XE_PATH_ . 'common/tpl/sitelock.html';
 				}
@@ -303,8 +304,7 @@ 
 			{
 				setcookie('lang_type', $this->lang_type, $_SERVER['REQUEST_TIME'] + 3600 * 24 * 1000);
 			}
-		}
-		elseif($_COOKIE['lang_type'])
+		} elseif($_COOKIE['lang_type'])
 		{
 			$this->lang_type = $_COOKIE['lang_type'];
 		}
@@ -341,7 +341,9 @@ 
 			);
 		}
 
-		if($sess = $_POST[session_name()]) session_id($sess);
+		if($sess = $_POST[session_name()]) {
+			session_id($sess);
+		}
 		session_start();
 
 		// set authentication information in Context and session
@@ -394,22 +396,21 @@ 
 						{
 							$url[] = $key . '[' . $k . ']=' . urlencode($v);
 						}
-					}
-					elseif($val)
+					} elseif($val)
 					{
 						$url[] = $key . '=' . urlencode($val);
 					}
 				}
 
 				$current_url = self::getRequestUri();
-				if($url) $current_url .= '?' . join('&', $url);
-			}
-			else
+				if($url) {
+					$current_url .= '?' . join('&', $url);
+				}
+			} else
 			{
 				$current_url = $this->getUrl();
 			}
-		}
-		else
+		} else
 		{
 			$current_url = self::getRequestUri();
 		}
@@ -490,18 +491,22 @@ 
 			$db_info->use_prepared_statements = 'Y';
 		}
 
-		if(!$db_info->time_zone)
-			$db_info->time_zone = date('O');
+		if(!$db_info->time_zone) {
+					$db_info->time_zone = date('O');
+		}
 		$GLOBALS['_time_zone'] = $db_info->time_zone;
 
-		if($db_info->qmail_compatibility != 'Y')
-			$db_info->qmail_compatibility = 'N';
+		if($db_info->qmail_compatibility != 'Y') {
+					$db_info->qmail_compatibility = 'N';
+		}
 		$GLOBALS['_qmail_compatibility'] = $db_info->qmail_compatibility;
 
-		if(!$db_info->use_db_session)
-			$db_info->use_db_session = 'N';
-		if(!$db_info->use_ssl)
-			$db_info->use_ssl = 'none';
+		if(!$db_info->use_db_session) {
+					$db_info->use_db_session = 'N';
+		}
+		if(!$db_info->use_ssl) {
+					$db_info->use_ssl = 'none';
+		}
 		$this->set('_use_ssl', $db_info->use_ssl);
 
 		$self->set('_http_port', ($db_info->http_port) ? $db_info->http_port : NULL);
@@ -618,8 +623,7 @@ 
 				$buff = FileHandler::readFile($orig_lang_file);
 				FileHandler::writeFile($selected_lang_file, $buff);
 				$lang_selected = self::loadLangSupported();
-			}
-			else
+			} else
 			{
 				$langs = file($selected_lang_file);
 				foreach($langs as $val)
@@ -678,15 +682,16 @@ 
 
 				$oModuleModel = getModel('module');
 				$domain = $url_info['host'] . $url_info['path'];
-				if(substr_compare($domain, '/', -1) === 0) $domain = substr($domain, 0, -1);
+				if(substr_compare($domain, '/', -1) === 0) {
+					$domain = substr($domain, 0, -1);
+				}
 				$site_info = $oModuleModel->getSiteInfoByDomain($domain);
 
 				if($site_info->site_srl)
 				{
 				$url_info['query'].= ($url_info['query'] ? '&' : '') . 'SSOID=' . urlencode(session_id()) . '&sig=' . urlencode(Password::createSignature(session_id()));
 				$redirect_url = sprintf('%s://%s%s%s?%s', $url_info['scheme'], $url_info['host'], $url_info['port'] ? ':' . $url_info['port'] : '', $url_info['path'], $url_info['query']);
-				}
-				else
+				} else
 				{
 					$redirect_url = $url;
 				}
@@ -695,8 +700,7 @@ 
 				return FALSE;
 			}
 			// for sites requesting SSO validation
-		}
-		else
+		} else
 		{
 			// result handling : set session_name()
 			if($session_name = self::get('SSOID'))
@@ -713,8 +717,7 @@ 
 				header('location:' . $url);
 				return FALSE;
 				// send SSO request
-			}
-			else if(!self::get('SSOID') && $_COOKIE['sso'] != md5(self::getRequestUri()))
+			} else if(!self::get('SSOID') && $_COOKIE['sso'] != md5(self::getRequestUri()))
 			{
 				setcookie('sso', md5(self::getRequestUri()));
 				$origin_url = self::getRequestUrl();
@@ -774,8 +777,7 @@ 
 		if($self->site_title)
 		{
 			$self->site_title .= ' - ' . $site_title;
-		}
-		else
+		} else
 		{
 			$self->site_title = $site_title;
 		}
@@ -875,8 +877,7 @@ 
 		{
 			$self->loaded_lang_files[] = $filename;
 			include($filename);
-		}
-		else
+		} else
 		{
 			$self->_evalxmlLang($path);
 		}
@@ -892,7 +893,9 @@ 
 	{
 		global $lang;
 
-		if(!$path) return;
+		if(!$path) {
+			return;
+		}
 
 		$_path = 'eval://' . $path;
 
@@ -924,7 +927,9 @@ 
 	 */
 	function _loadXmlLang($path)
 	{
-		if(!$path) return;
+		if(!$path) {
+			return;
+		}
 
 		$oXmlLangParser = new XmlLangParser($path . ((substr_compare($path, '/', -1) !== 0) ? '/' : '') . 'lang.xml', $this->lang_type);
 		return $oXmlLangParser->compile();
@@ -938,7 +943,9 @@ 
 	 */
 	function _loadPhpLang($path)
 	{
-		if(!$path) return;
+		if(!$path) {
+			return;
+		}
 
 		if(substr_compare($path, '/', -1) !== 0)
 		{
@@ -1074,12 +1081,14 @@ 
 		static $flag = TRUE;
 		if($charset)
 		{
-			if(is_array($val))
-				array_walk($val,'Context::checkConvertFlag',$charset);
-			else if($val && iconv($charset,$charset,$val)!=$val) $flag = FALSE;
-			else $flag = FALSE;
-		}
-		else
+			if(is_array($val)) {
+							array_walk($val,'Context::checkConvertFlag',$charset);
+			} else if($val && iconv($charset,$charset,$val)!=$val) {
+				$flag = FALSE;
+			} else {
+				$flag = FALSE;
+			}
+		} else
 		{
 			$return = $flag;
 			$flag = TRUE;
@@ -1101,8 +1110,9 @@ 
 		if (is_array($val))
 		{
 			array_walk($val,'Context::doConvertEncoding',$charset);
+		} else {
+			$val = iconv($charset,'UTF-8',$val);
 		}
-		else $val = iconv($charset,'UTF-8',$val);
 	}
 
 	/**
@@ -1113,7 +1123,9 @@ 
 	 */
 	function convertEncodingStr($str)
 	{
-        if(!$str) return null;
+        if(!$str) {
+        	return null;
+        }
 		$obj = new stdClass();
 		$obj->str = $str;
 		$obj = self::convertEncoding($obj);
@@ -1226,16 +1238,13 @@ 
 			if($requestMethod == 'GET' && isset($_GET[$key]))
 			{
 				$set_to_vars = TRUE;
-			}
-			elseif($requestMethod == 'POST' && isset($_POST[$key]))
+			} elseif($requestMethod == 'POST' && isset($_POST[$key]))
 			{
 				$set_to_vars = TRUE;
-			}
-			elseif($requestMethod == 'JS_CALLBACK' && (isset($_GET[$key]) || isset($_POST[$key])))
+			} elseif($requestMethod == 'JS_CALLBACK' && (isset($_GET[$key]) || isset($_POST[$key])))
 			{
 				$set_to_vars = TRUE;
-			}
-			else
+			} else
 			{
 				$set_to_vars = FALSE;
 			}
@@ -1261,8 +1270,7 @@ 
 					return;
 				}
 			}
-		}
-		else if(is_array($val))
+		} else if(is_array($val))
 		{
 			foreach($val as $val2)
 			{
@@ -1402,24 +1410,19 @@ 
 			if($key === 'page' || $key === 'cpage' || substr_compare($key, 'srl', -3) === 0)
 			{
 				$result[$k] = !preg_match('/^[0-9,]+$/', $v) ? (int) $v : $v;
-			}
-			elseif($key === 'mid' || $key === 'search_keyword')
+			} elseif($key === 'mid' || $key === 'search_keyword')
 			{
 				$result[$k] = htmlspecialchars($v, ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
-			}
-			elseif($key === 'vid')
+			} elseif($key === 'vid')
 			{
 				$result[$k] = urlencode($v);
-			}
-			elseif($key === 'xe_validator_id')
+			} elseif($key === 'xe_validator_id')
 			{
 				$result[$k] = htmlspecialchars($v, ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
-			}
-			elseif(stripos($key, 'XE_VALIDATOR', 0) === 0)
+			} elseif(stripos($key, 'XE_VALIDATOR', 0) === 0)
 			{
 				unset($result[$k]);
-			}
-			else
+			} else
 			{
 				$result[$k] = $v;
 
@@ -1428,8 +1431,7 @@ 
 					if (is_array($result[$k]))
 					{
 						array_walk_recursive($result[$k], function(&$val) { $val = stripslashes($val); });
-					}
-					else
+					} else
 					{
 						$result[$k] = stripslashes($result[$k]);
 					}
@@ -1438,8 +1440,7 @@ 
 				if(is_array($result[$k]))
 				{
 					array_walk_recursive($result[$k], function(&$val) { $val = trim($val); });
-				}
-				else
+				} else
 				{
 					$result[$k] = trim($result[$k]);
 				}
@@ -1484,8 +1485,7 @@ 
 				$val['name'] = htmlspecialchars($val['name'], ENT_COMPAT | ENT_HTML401, 'UTF-8', FALSE);
 				$this->set($key, $val, TRUE);
 				$this->is_uploaded = TRUE;
-			}
-			else
+			} else
 			{
 				$files = array();
 				$count_files = count($tmp_name);
@@ -1503,7 +1503,9 @@ 
 						$files[] = $file;
 					}
 				}
-				if($files) $this->set($key, $files, TRUE);
+				if($files) {
+					$this->set($key, $files, TRUE);
+				}
 			}
 		}
 	}
@@ -1595,8 +1597,7 @@ 
 			if($site_module_info->domain && isSiteID($site_module_info->domain))
 			{
 				$vid = $site_module_info->domain;
-			}
-			else
+			} else
 			{
 				$domain = $site_module_info->domain;
 			}
@@ -1613,8 +1614,7 @@ 
 			if($domain_info['host'] . $domain_info['path'] == $current_info['host'] . $current_info['path'])
 			{
 				unset($domain);
-			}
-			else
+			} else
 			{
 				$domain = preg_replace('/^(http|https):\/\//i', '', trim($domain));
 				if(substr_compare($domain, '/', -1) !== 0)
@@ -1634,8 +1634,7 @@ 
 			{
 				array_shift($args_list);
 			}
-		}
-		else
+		} else
 		{
 			// Otherwise, make GET variables into array
 			$get_vars = get_object_vars($self->get_vars);
@@ -1662,8 +1661,7 @@ 
 		if($vid)
 		{
 			$get_vars['vid'] = $vid;
-		}
-		else
+		} else
 		{
 			unset($get_vars['vid']);
 		}
@@ -1735,8 +1733,7 @@ 
 						{
 							$queries[] = $key . '[' . $k . ']=' . urlencode($v);
 						}
-					}
-					elseif(!is_array($val))
+					} elseif(!is_array($val))
 					{
 						$queries[] = $key . '=' . urlencode($val);
 					}
@@ -1754,25 +1751,23 @@ 
 		{
 			$query = $self->getRequestUri(ENFORCE_SSL, $domain) . $query;
 			// optional SSL use
-		}
-		elseif($_use_ssl == 'optional')
+		} elseif($_use_ssl == 'optional')
 		{
 			$ssl_mode = (($self->get('module') === 'admin') || ($get_vars['module'] === 'admin') || (isset($get_vars['act']) && $self->isExistsSSLAction($get_vars['act']))) ? ENFORCE_SSL : RELEASE_SSL;
 			$query = $self->getRequestUri($ssl_mode, $domain) . $query;
 			// no SSL
-		}
-		else
+		} else
 		{
 			// currently on SSL but target is not based on SSL
 			if($_SERVER['HTTPS'] == 'on')
 			{
 				$query = $self->getRequestUri(ENFORCE_SSL, $domain) . $query;
-			}
-			else if($domain) // if $domain is set
+			} else if($domain) {
+				// if $domain is set
 			{
 				$query = $self->getRequestUri(FOLLOW_REQUEST_SSL, $domain) . $query;
 			}
-			else
+			} else
 			{
 				$query = getScriptPath() . $query;
 			}
@@ -1829,8 +1824,7 @@ 
 		if($domain)
 		{
 			$domain_key = md5($domain);
-		}
-		else
+		} else
 		{
 			$domain_key = 'default';
 		}
@@ -1859,8 +1853,7 @@ 
 			{
 				$target_url.= '/';
 			}
-		}
-		else
+		} else
 		{
 			$target_url = $_SERVER['HTTP_HOST'] . getScriptPath();
 		}
@@ -1878,20 +1871,17 @@ 
 			if($port && $port != 443)
 			{
 				$url_info['port'] = $port;
-			}
-			elseif($url_info['port'] == 443)
+			} elseif($url_info['port'] == 443)
 			{
 				unset($url_info['port']);
 			}
-		}
-		else
+		} else
 		{
 			$port = self::get('_http_port');
 			if($port && $port != 80)
 			{
 				$url_info['port'] = $port;
-			}
-			elseif($url_info['port'] == 80)
+			} elseif($url_info['port'] == 80)
 			{
 				unset($url_info['port']);
 			}
@@ -2128,8 +2118,7 @@ 
 		if(strpos($file, './') === 0)
 		{
 			$file = $script_path . substr($file, 2);
-		}
-		elseif(strpos($file, '../') === 0)
+		} elseif(strpos($file, '../') === 0)
 		{
 			$file = self::normalizeFilePath($script_path . $file);
 		}
@@ -2391,8 +2380,7 @@ 
 			if(substr_compare($filename, '.js', -3) === 0)
 			{
 				$result->jsList[] = $plugin_path . $filename;
-			}
-			elseif(substr_compare($filename, '.css', -4) === 0)
+			} elseif(substr_compare($filename, '.css', -4) === 0)
 			{
 				$result->cssList[] = $plugin_path . $filename;
 			}
@@ -2649,8 +2637,7 @@ 
 			if(count($_base) > 0)
 			{
 				array_shift($_base);
-			}
-			else
+			} else
 			{
 				array_unshift($_base, '..');
 			}