xpressengine / xe-core

modules/document/document.admin.controller.php

Doc Comments +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
 
 	/**
 	 * Remove the selected docs from admin page
-	 * @return void
+	 * @return ModuleObject|null
 	 */
 	function procDocumentAdminDeleteChecked()
 	{
@@ -869,8 +869,8 @@ 
 	/**
 	 * Restore document from trash module, called by trash module
 	 * This method is passived
-	 * @param object|array $originObject
-	 * @return object
+	 * @param string $originObject
+	 * @return BaseObject
 	 */
 	function restoreTrash($originObject)
 	{

Spacing +127 added lines, -127 removed lines

@@ -27,21 +27,21 @@ 
 	{
 		// error appears if no doc is selected
 		$cart = Context::get('cart');
-		if(!$cart) return $this->stop('msg_cart_is_null');
-		$document_srl_list= explode('|@|', $cart);
+		if (!$cart) return $this->stop('msg_cart_is_null');
+		$document_srl_list = explode('|@|', $cart);
 		$document_count = count($document_srl_list);
-		if(!$document_count) return $this->stop('msg_cart_is_null');
+		if (!$document_count) return $this->stop('msg_cart_is_null');
 		// Delete a doc
 		$oDocumentController = getController('document');
-		for($i=0;$i<$document_count;$i++)
+		for ($i = 0; $i < $document_count; $i++)
 		{
 			$document_srl = trim($document_srl_list[$i]);
-			if(!$document_srl) continue;
+			if (!$document_srl) continue;
 
 			$oDocumentController->deleteDocument($document_srl, true);
 		}
 
-		$this->setMessage(sprintf(Context::getLang('msg_checked_document_is_deleted'), $document_count) );
+		$this->setMessage(sprintf(Context::getLang('msg_checked_document_is_deleted'), $document_count));
 	}
 
 	/**
@@ -53,7 +53,7 @@ 
 	 */
 	function moveDocumentModule($document_srl_list, $module_srl, $category_srl)
 	{
-		if(!count($document_srl_list)) return;
+		if (!count($document_srl_list)) return;
 
 		$oDocumentModel = getModel('document');
 		$oDocumentController = getController('document');
@@ -62,22 +62,22 @@ 
 		$oDB->begin();
 
 		$triggerObj = new stdClass();
-		$triggerObj->document_srls = implode(',',$document_srl_list);
+		$triggerObj->document_srls = implode(',', $document_srl_list);
 		$triggerObj->module_srl = $module_srl;
 		$triggerObj->category_srl = $category_srl;
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('document.moveDocumentModule', 'before', $triggerObj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
-		for($i=count($document_srl_list)-1;$i>=0;$i--)
+		for ($i = count($document_srl_list) - 1; $i >= 0; $i--)
 		{
 			$document_srl = $document_srl_list[$i];
 			$oDocument = $oDocumentModel->getDocument($document_srl);
-			if(!$oDocument->isExists()) continue;
+			if (!$oDocument->isExists()) continue;
 
 			$source_category_srl = $oDocument->get('category_srl');
 
@@ -90,27 +90,27 @@ 
 			$obj->content = $output_ori->data->content;
 
 			// Move the attached file if the target module is different
-			if($module_srl != $obj->module_srl && $oDocument->hasUploadedFiles())
+			if ($module_srl != $obj->module_srl && $oDocument->hasUploadedFiles())
 			{
 				$oFileController = getController('file');
 
 				$files = $oDocument->getUploadedFiles();
 				$delete_file_srls = array();
-				if(is_array($files))
+				if (is_array($files))
 				{
-					foreach($files as $val)
+					foreach ($files as $val)
 					{
 						$file_info = array();
 						$file_info['tmp_name'] = $val->uploaded_filename;
 						$file_info['name'] = $val->source_filename;
 						$inserted_file = $oFileController->insertFile($file_info, $module_srl, $obj->document_srl, $val->download_count, true);
-						if($inserted_file && $inserted_file->toBool())
+						if ($inserted_file && $inserted_file->toBool())
 						{
 							// for image/video files
-							if($val->direct_download == 'Y')
+							if ($val->direct_download == 'Y')
 							{
-								$source_filename = substr($val->uploaded_filename,2);
-								$target_filename = substr($inserted_file->get('uploaded_filename'),2);
+								$source_filename = substr($val->uploaded_filename, 2);
+								$target_filename = substr($inserted_file->get('uploaded_filename'), 2);
 								$obj->content = str_replace($source_filename, $target_filename, $obj->content);
 								// For binary files
 							}
@@ -129,7 +129,7 @@ 
 				$oFileController->setFilesValid($obj->document_srl);
 			}
 
-			if($module_srl != $obj->module_srl)
+			if ($module_srl != $obj->module_srl)
 			{
 				$oDocumentController->deleteDocumentAliasByDocument($obj->document_srl);
 			}
@@ -137,48 +137,48 @@ 
 			$obj->module_srl = $module_srl;
 			$obj->category_srl = $category_srl;
 			$output = executeQuery('document.updateDocumentModule', $obj);
-			if(!$output->toBool()) {
+			if (!$output->toBool()) {
 				$oDB->rollback();
 				return $output;
 			}
 
 			//Move a module of the extra vars
 			$output = executeQuery('document.moveDocumentExtraVars', $obj);
-			if(!$output->toBool()) {
+			if (!$output->toBool()) {
 				$oDB->rollback();
 				return $output;
 			}
 			// Set 0 if a new category doesn't exist after catergory change
-			if($source_category_srl != $category_srl)
+			if ($source_category_srl != $category_srl)
 			{
-				if($source_category_srl) $oDocumentController->updateCategoryCount($oDocument->get('module_srl'), $source_category_srl);
-				if($category_srl) $oDocumentController->updateCategoryCount($module_srl, $category_srl);
+				if ($source_category_srl) $oDocumentController->updateCategoryCount($oDocument->get('module_srl'), $source_category_srl);
+				if ($category_srl) $oDocumentController->updateCategoryCount($module_srl, $category_srl);
 			}
 		}
 
 		$args = new stdClass();
-		$args->document_srls = implode(',',$document_srl_list);
+		$args->document_srls = implode(',', $document_srl_list);
 		$args->module_srl = $module_srl;
 		// move the comment
 		$output = executeQuery('comment.updateCommentModule', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
 		$output = executeQuery('comment.updateCommentListModule', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 		
 		// move the trackback
-		if(getClass('trackback'))
+		if (getClass('trackback'))
 		{
 			$output = executeQuery('trackback.updateTrackbackModule', $args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
@@ -187,14 +187,14 @@ 
 
 		// Tags
 		$output = executeQuery('tag.updateTagModule', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('document.moveDocumentModule', 'after', $triggerObj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -203,11 +203,11 @@ 
 		$oDB->commit();
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			foreach($document_srl_list as $document_srl)
+			foreach ($document_srl_list as $document_srl)
 			{
-				$cache_key_item = 'document_item:'. getNumberingPath($document_srl) . $document_srl;
+				$cache_key_item = 'document_item:'.getNumberingPath($document_srl).$document_srl;
 				$oCacheHandler->delete($cache_key_item);
 			}
 		}
@@ -223,7 +223,7 @@ 
 	 */
 	function copyDocumentModule($document_srl_list, $module_srl, $category_srl)
 	{
-		if(count($document_srl_list) < 1) return;
+		if (count($document_srl_list) < 1) return;
 
 		$oDocumentModel = getModel('document');
 		$oDocumentController = getController('document');
@@ -234,12 +234,12 @@ 
 		$oDB->begin();
 
 		$triggerObj = new stdClass();
-		$triggerObj->document_srls = implode(',',$document_srl_list);
+		$triggerObj->document_srls = implode(',', $document_srl_list);
 		$triggerObj->module_srl = $module_srl;
 		$triggerObj->category_srl = $category_srl;
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('document.copyDocumentModule', 'before', $triggerObj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -247,11 +247,11 @@ 
 
 		$extraVarsList = $oDocumentModel->getDocumentExtraVarsFromDB($document_srl_list);
 		$extraVarsListByDocumentSrl = array();
-		if(is_array($extraVarsList->data))
+		if (is_array($extraVarsList->data))
 		{
-			foreach($extraVarsList->data as $value)
+			foreach ($extraVarsList->data as $value)
 			{
-				if(!isset($extraVarsListByDocumentSrl[$value->document_srl]))
+				if (!isset($extraVarsListByDocumentSrl[$value->document_srl]))
 				{
 					$extraVarsListByDocumentSrl[$value->document_srl] = array();
 				}
@@ -260,22 +260,22 @@ 
 			}
 		}
 
-		for($i=count($document_srl_list)-1;$i>=0;$i--)
+		for ($i = count($document_srl_list) - 1; $i >= 0; $i--)
 		{
 			$document_srl = $document_srl_list[$i];
 			$oDocument = $oDocumentModel->getDocument($document_srl);
-			if(!$oDocument->isExists()) continue;
+			if (!$oDocument->isExists()) continue;
 
 			$obj = $oDocument->getObjectVars();
 
 			$extraVars = $extraVarsListByDocumentSrl[$document_srl];
-			if($module_srl == $obj->module_srl)
+			if ($module_srl == $obj->module_srl)
 			{
-				if(is_array($extraVars))
+				if (is_array($extraVars))
 				{
-					foreach($extraVars as $extraItem)
+					foreach ($extraVars as $extraItem)
 					{
-						if($extraItem->var_idx >= 0) $obj->{'extra_vars'.$extraItem->var_idx} = $extraItem->value;
+						if ($extraItem->var_idx >= 0) $obj->{'extra_vars'.$extraItem->var_idx} = $extraItem->value;
 					}
 				}
 			}
@@ -287,10 +287,10 @@ 
 			$obj->trackback_count = 0;
 
 			// Pre-register the attachment
-			if($oDocument->hasUploadedFiles())
+			if ($oDocument->hasUploadedFiles())
 			{
 				$files = $oDocument->getUploadedFiles();
-				foreach($files as $val)
+				foreach ($files as $val)
 				{
 					$file_info = array();
 					$file_info['tmp_name'] = $val->uploaded_filename;
@@ -298,10 +298,10 @@ 
 					$oFileController = getController('file');
 					$inserted_file = $oFileController->insertFile($file_info, $module_srl, $obj->document_srl, 0, true);
 					// if image/video files
-					if($val->direct_download == 'Y')
+					if ($val->direct_download == 'Y')
 					{
-						$source_filename = substr($val->uploaded_filename,2);
-						$target_filename = substr($inserted_file->get('uploaded_filename'),2);
+						$source_filename = substr($val->uploaded_filename, 2);
+						$target_filename = substr($inserted_file->get('uploaded_filename'), 2);
 						$obj->content = str_replace($source_filename, $target_filename, $obj->content);
 						// If binary file
 					}
@@ -315,23 +315,23 @@ 
 
 			// Write a post
 			$output = $oDocumentController->insertDocument($obj, true, true);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
 			}
 
 			// copy multi language contents
-			if(is_array($extraVars))
+			if (is_array($extraVars))
 			{
-				foreach($extraVars as $value)
+				foreach ($extraVars as $value)
 				{
-					if($value->idx >= 0 && $value->lang_code == Context::getLangType())
+					if ($value->idx >= 0 && $value->lang_code == Context::getLangType())
 					{
 						continue;
 					}
 
-					if( $value->var_idx < 0 || ($module_srl == $value->module_srl && $value->var_idx >= 0) )
+					if ($value->var_idx < 0 || ($module_srl == $value->module_srl && $value->var_idx >= 0))
 					{
 						$oDocumentController->insertDocumentExtraVar($value->module_srl, $obj->document_srl, $value->var_idx, $value->value, $value->eid, $value->lang_code);
 					}
@@ -339,26 +339,26 @@ 
 			}
 
 			// Move the comments
-			if($oDocument->getCommentCount())
+			if ($oDocument->getCommentCount())
 			{
 				$oCommentModel = getModel('comment');
 				$comment_output = $oCommentModel->getCommentList($document_srl, 0, true, 99999999);
 				$comments = $comment_output->data;
-				if(count($comments) > 0)
+				if (count($comments) > 0)
 				{
 					$oCommentController = getController('comment');
 					$success_count = 0;
 					$p_comment_srl = array();
-					foreach($comments as $comment_obj)
+					foreach ($comments as $comment_obj)
 					{
 						$comment_srl = getNextSequence();
 						$p_comment_srl[$comment_obj->comment_srl] = $comment_srl;
 
 						// Pre-register the attachment
-						if($comment_obj->uploaded_count)
+						if ($comment_obj->uploaded_count)
 						{
 							$files = $oFileModel->getFiles($comment_obj->comment_srl, true);
-							foreach($files as $val)
+							foreach ($files as $val)
 							{
 								$file_info = array();
 								$file_info['tmp_name'] = $val->uploaded_filename;
@@ -366,10 +366,10 @@ 
 								$oFileController = getController('file');
 								$inserted_file = $oFileController->insertFile($file_info, $module_srl, $comment_srl, 0, true);
 								// if image/video files
-								if($val->direct_download == 'Y')
+								if ($val->direct_download == 'Y')
 								{
-									$source_filename = substr($val->uploaded_filename,2);
-									$target_filename = substr($inserted_file->get('uploaded_filename'),2);
+									$source_filename = substr($val->uploaded_filename, 2);
+									$target_filename = substr($inserted_file->get('uploaded_filename'), 2);
 									$comment_obj->content = str_replace($source_filename, $target_filename, $comment_obj->content);
 									// If binary file
 								}
@@ -385,10 +385,10 @@ 
 						$comment_obj->document_srl = $obj->document_srl;
 						$comment_obj->comment_srl = $comment_srl;
 
-						if($comment_obj->parent_srl) $comment_obj->parent_srl = $p_comment_srl[$comment_obj->parent_srl];
+						if ($comment_obj->parent_srl) $comment_obj->parent_srl = $p_comment_srl[$comment_obj->parent_srl];
 
 						$output = $oCommentController->insertComment($comment_obj, true);
-						if($output->toBool()) $success_count ++;
+						if ($output->toBool()) $success_count++;
 					}
 					$oDocumentController->updateCommentCount($obj->document_srl, $success_count, $comment_obj->nick_name, true);
 				}
@@ -396,19 +396,19 @@ 
 
 			// Move the trackbacks
 			$oTrackbackModel = getModel('trackback');
-			if($oTrackbackModel && $oDocument->getTrackbackCount())
+			if ($oTrackbackModel && $oDocument->getTrackbackCount())
 			{
 				$trackbacks = $oTrackbackModel->getTrackbackList($oDocument->document_srl);
-				if(count($trackbacks))
+				if (count($trackbacks))
 				{
 					$success_count = 0;
-					foreach($trackbacks as $trackback_obj)
+					foreach ($trackbacks as $trackback_obj)
 					{
 						$trackback_obj->trackback_srl = getNextSequence();
 						$trackback_obj->module_srl = $obj->module_srl;
 						$trackback_obj->document_srl = $obj->document_srl;
 						$output = executeQuery('trackback.insertTrackback', $trackback_obj);
-						if($output->toBool()) $success_count++;
+						if ($output->toBool()) $success_count++;
 					}
 					// Update the number of trackbacks
 					$oDocumentController->updateTrackbackCount($obj->document_srl, $success_count);
@@ -421,7 +421,7 @@ 
 		// Call a trigger (before)
 		$triggerObj->copied_srls = $copied_srls;
 		$output = ModuleHandler::triggerCall('document.copyDocumentModule', 'after', $triggerObj);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -448,7 +448,7 @@ 
 		$document_list = $oDocumentModel->getDocumentList($args);
 		$documents = $document_list->data;
 		$output = executeQuery('document.deleteModuleDocument', $args);
-		if(is_array($documents))
+		if (is_array($documents))
 		{
 			foreach ($documents as $oDocument)
 			{
@@ -457,13 +457,13 @@ 
 		}
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			if(is_array($document_srl_list))
+			if (is_array($document_srl_list))
 			{
-				foreach($document_srl_list as $document_srl)
+				foreach ($document_srl_list as $document_srl)
 				{
-					$cache_key_item = 'document_item:'. getNumberingPath($document_srl) . $document_srl;
+					$cache_key_item = 'document_item:'.getNumberingPath($document_srl).$document_srl;
 					$oCacheHandler->delete($cache_key_item);
 				}
 			}
@@ -482,8 +482,8 @@ 
 		$config = getModel('document')->getDocumentConfig();
 		$config->icons = Context::get('icons');
 		$config->micons = Context::get('micons');
-		$output = $oModuleController->insertModuleConfig('document',$config);
-		if(!$output->toBool())
+		$output = $oModuleController->insertModuleConfig('document', $config);
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -502,11 +502,11 @@ 
 	{
 		$document_srl = trim(Context::get('document_srl'));
 
-		if($document_srl)
+		if ($document_srl)
 		{
 			$args->document_srl = $document_srl;
 			$output = executeQuery('document.deleteDeclaredDocuments', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 	}
 
@@ -516,7 +516,7 @@ 
 	 */
 	function procDocumentAdminDeleteAllThumbnail()
 	{
-		$temp_cache_dir = './files/thumbnails_' . $_SERVER['REQUEST_TIME'];
+		$temp_cache_dir = './files/thumbnails_'.$_SERVER['REQUEST_TIME'];
 		FileHandler::rename('./files/thumbnails', $temp_cache_dir);
 		FileHandler::makeDir('./files/thumbnails');
 
@@ -532,12 +532,12 @@ 
 	function deleteThumbnailFile($path)
 	{
 		$directory = dir($path);
-		while($entry = $directory->read()) {
+		while ($entry = $directory->read()) {
 			if ($entry != "." && $entry != "..") {
 				if (is_dir($path."/".$entry)) {
 					$this->deleteThumbnailFile($path."/".$entry);
 				} else {
-					if(!preg_match('/^thumbnail_([^\.]*)\.jpg$/i',$entry)) continue;
+					if (!preg_match('/^thumbnail_([^\.]*)\.jpg$/i', $entry)) continue;
 					FileHandler::removeFile($path.'/'.$entry);
 				}
 			}
@@ -562,13 +562,13 @@ 
 		$eid = Context::get('eid');
 		$obj = new stdClass();
 
-		if(!$module_srl || !$name || !$eid) return new BaseObject(-1,'msg_invalid_request');
+		if (!$module_srl || !$name || !$eid) return new BaseObject(-1, 'msg_invalid_request');
 		// set the max value if idx is not specified
-		if(!$var_idx)
+		if (!$var_idx)
 		{
 			$obj->module_srl = $module_srl;
 			$output = executeQuery('document.getDocumentMaxExtraKeyIdx', $obj);
-			$var_idx = $output->data->var_idx+1;
+			$var_idx = $output->data->var_idx + 1;
 		}
 
 		// Check if the module name already exists
@@ -576,7 +576,7 @@ 
 		$obj->var_idx = $var_idx;
 		$obj->eid = $eid;
 		$output = executeQuery('document.isExistsExtraKey', $obj);
-		if(!$output->toBool() || $output->data->count)
+		if (!$output->toBool() || $output->data->count)
 		{
 			return new BaseObject(-1, 'msg_extra_name_exists');
 		}
@@ -584,7 +584,7 @@ 
 		// insert or update
 		$oDocumentController = getController('document');
 		$output = $oDocumentController->insertDocumentExtraKey($module_srl, $var_idx, $name, $type, $is_required, $search, $default, $desc, $eid);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->setMessage('success_registed');
 
@@ -600,11 +600,11 @@ 
 	{
 		$module_srl = Context::get('module_srl');
 		$var_idx = Context::get('var_idx');
-		if(!$module_srl || !$var_idx) return new BaseObject(-1,'msg_invalid_request');
+		if (!$module_srl || !$var_idx) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oDocumentController = getController('document');
 		$output = $oDocumentController->deleteDocumentExtraKeys($module_srl, $var_idx);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->setMessage('success_deleted');
 	}
@@ -619,19 +619,19 @@ 
 		$module_srl = Context::get('module_srl');
 		$var_idx = Context::get('var_idx');
 
-		if(!$type || !$module_srl || !$var_idx) return new BaseObject(-1,'msg_invalid_request');
+		if (!$type || !$module_srl || !$var_idx) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oModuleModel = getModel('module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-		if(!$module_info->module_srl) return new BaseObject(-1,'msg_invalid_request');
+		if (!$module_info->module_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oDocumentModel = getModel('document');
 		$extra_keys = $oDocumentModel->getExtraKeys($module_srl);
-		if(!$extra_keys[$var_idx]) return new BaseObject(-1,'msg_invalid_request');
+		if (!$extra_keys[$var_idx]) return new BaseObject(-1, 'msg_invalid_request');
 
-		if($type == 'up') $new_idx = $var_idx-1;
-		else $new_idx = $var_idx+1;
-		if($new_idx<1) return new BaseObject(-1,'msg_invalid_request');
+		if ($type == 'up') $new_idx = $var_idx - 1;
+		else $new_idx = $var_idx + 1;
+		if ($new_idx < 1) return new BaseObject(-1, 'msg_invalid_request');
 
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
@@ -642,16 +642,16 @@ 
 		unset($args);
 
 		// update immediately if there is no idx to change
-		if(!$extra_keys[$new_idx])
+		if (!$extra_keys[$new_idx])
 		{
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$args->var_idx = $var_idx;
 			$args->new_idx = $new_idx;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 			// replace if exists
 		}
 		else
@@ -661,27 +661,27 @@ 
 			$args->var_idx = $new_idx;
 			$args->new_idx = -10000;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 
 			$args->var_idx = $var_idx;
 			$args->new_idx = $new_idx;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 
 			$args->var_idx = -10000;
 			$args->new_idx = $var_idx;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 
 		$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);
@@ -695,9 +695,9 @@ 
 	 */
 	function procDocumentAdminInsertAlias()
 	{
-		$args = Context::gets('module_srl','document_srl', 'alias_title');
+		$args = Context::gets('module_srl', 'document_srl', 'alias_title');
 		$alias_srl = Context::get('alias_srl');
-		if(!$alias_srl)
+		if (!$alias_srl)
 		{
 			$args->alias_srl = getNextSequence();
 			$query = "document.insertAlias";
@@ -740,7 +740,7 @@ 
 		$oDocumentModel = getModel('document');
 		$oDocumentController = getController('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
-		if(!$oDocument->isGranted()) return $this->stop('msg_not_permitted');
+		if (!$oDocument->isGranted()) return $this->stop('msg_not_permitted');
 	
 		$oModuleModel = getModel('module');
 		$module_info = $oModuleModel->getModuleInfoByDocumentSrl($document_srl);
@@ -752,31 +752,31 @@ 
 		$oDocumentController->moveDocumentToTrash($args);
 
 		$returnUrl = Context::get('success_return_url');
-		if(!$returnUrl)	
+		if (!$returnUrl)	
 		{
 			$arrUrl = parse_url(Context::get('cur_url'));
 			$query = "";
 
-			if($arrUrl['query'])
+			if ($arrUrl['query'])
 			{
 				parse_str($arrUrl['query'], $arrQuery);
 
 				// set query
-				if(isset($arrQuery['document_srl']))
+				if (isset($arrQuery['document_srl']))
 					unset($arrQuery['document_srl']);
 
 				$searchArgs = new stdClass;
-				foreach($arrQuery as $key=>$val)
+				foreach ($arrQuery as $key=>$val)
 				{
 					$searchArgs->{$key} = $val;
 				}
 
-				if(!isset($searchArgs->sort_index))
+				if (!isset($searchArgs->sort_index))
 					$searchArgs->sort_index = $module_info->order_target;
 
-				foreach($module_info as $key=>$val)
+				foreach ($module_info as $key=>$val)
 				{
-					if(!isset($searchArgs->{$key}))
+					if (!isset($searchArgs->{$key}))
 						$searchArgs->{$key} = $val;
 				}
 
@@ -784,20 +784,20 @@ 
 				$output = $oDocumentModel->getDocumentList($searchArgs, $module_info->except_notice, TRUE, array('document_srl'));
 
 				$cur_page = 1;
-				if(isset($arrQuery['page'])) {
-					$cur_page = (int)$arrQuery['page'];
+				if (isset($arrQuery['page'])) {
+					$cur_page = (int) $arrQuery['page'];
 				}
 
 
-				if($cur_page>1 && count($output->data) == 0)
+				if ($cur_page > 1 && count($output->data) == 0)
 					$arrQuery['page'] = $cur_page - 1;
 
 				$query = "?";
-				foreach($arrQuery as $key=>$val)
+				foreach ($arrQuery as $key=>$val)
 					$query .= sprintf("%s=%s&", $key, $val);
 				$query = substr($query, 0, -1);
 			}
-			$returnUrl = $arrUrl['path'] . $query;
+			$returnUrl = $arrUrl['path'].$query;
 		}
 
 		$this->add('redirect_url', $returnUrl);
@@ -874,7 +874,7 @@ 
 	 */
 	function restoreTrash($originObject)
 	{
-		if(is_array($originObject)) $originObject = (object)$originObject;
+		if (is_array($originObject)) $originObject = (object) $originObject;
 
 		$oDocumentController = getController('document');
 		$oDocumentModel = getModel('document');
@@ -884,12 +884,12 @@ 
 
 		//DB restore
 		$output = $oDocumentController->insertDocument($originObject, false, true, false);
-		if(!$output->toBool()) return new BaseObject(-1, $output->getMessage());
+		if (!$output->toBool()) return new BaseObject(-1, $output->getMessage());
 
 		//FILE restore
 		$oDocument = $oDocumentModel->getDocument($originObject->document_srl);
 		// If the post was not temorarily saved, set the attachment's status to be valid
-		if($oDocument->hasUploadedFiles() && $originObject->member_srl != $originObject->module_srl)
+		if ($oDocument->hasUploadedFiles() && $originObject->member_srl != $originObject->module_srl)
 		{
 			$args = new stdClass();
 			$args->upload_target_srl = $oDocument->document_srl;
@@ -898,10 +898,10 @@ 
 		}
 
 		// call a trigger (after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$trigger_output = ModuleHandler::triggerCall('document.restoreTrash', 'after', $originObject);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -922,7 +922,7 @@ 
 	function emptyTrash($originObject)
 	{
 		$originObject = unserialize($originObject);
-		if(is_array($originObject)) $originObject = (object) $originObject;
+		if (is_array($originObject)) $originObject = (object) $originObject;
 
 		$oDocument = new documentItem();
 		$oDocument->setAttribute($originObject);

Braces +136 added lines, -59 removed lines

@@ -27,16 +27,22 @@ 
 	{
 		// error appears if no doc is selected
 		$cart = Context::get('cart');
-		if(!$cart) return $this->stop('msg_cart_is_null');
+		if(!$cart) {
+			return $this->stop('msg_cart_is_null');
+		}
 		$document_srl_list= explode('|@|', $cart);
 		$document_count = count($document_srl_list);
-		if(!$document_count) return $this->stop('msg_cart_is_null');
+		if(!$document_count) {
+			return $this->stop('msg_cart_is_null');
+		}
 		// Delete a doc
 		$oDocumentController = getController('document');
 		for($i=0;$i<$document_count;$i++)
 		{
 			$document_srl = trim($document_srl_list[$i]);
-			if(!$document_srl) continue;
+			if(!$document_srl) {
+				continue;
+			}
 
 			$oDocumentController->deleteDocument($document_srl, true);
 		}
@@ -53,7 +59,9 @@ 
 	 */
 	function moveDocumentModule($document_srl_list, $module_srl, $category_srl)
 	{
-		if(!count($document_srl_list)) return;
+		if(!count($document_srl_list)) {
+			return;
+		}
 
 		$oDocumentModel = getModel('document');
 		$oDocumentController = getController('document');
@@ -77,7 +85,9 @@ 
 		{
 			$document_srl = $document_srl_list[$i];
 			$oDocument = $oDocumentModel->getDocument($document_srl);
-			if(!$oDocument->isExists()) continue;
+			if(!$oDocument->isExists()) {
+				continue;
+			}
 
 			$source_category_srl = $oDocument->get('category_srl');
 
@@ -113,8 +123,7 @@ 
 								$target_filename = substr($inserted_file->get('uploaded_filename'),2);
 								$obj->content = str_replace($source_filename, $target_filename, $obj->content);
 								// For binary files
-							}
-							else
+							} else
 							{
 								$obj->content = str_replace('file_srl='.$val->file_srl, 'file_srl='.$inserted_file->get('file_srl'), $obj->content);
 								$obj->content = str_replace('sid='.$val->sid, 'sid='.$inserted_file->get('sid'), $obj->content);
@@ -151,8 +160,12 @@ 
 			// Set 0 if a new category doesn't exist after catergory change
 			if($source_category_srl != $category_srl)
 			{
-				if($source_category_srl) $oDocumentController->updateCategoryCount($oDocument->get('module_srl'), $source_category_srl);
-				if($category_srl) $oDocumentController->updateCategoryCount($module_srl, $category_srl);
+				if($source_category_srl) {
+					$oDocumentController->updateCategoryCount($oDocument->get('module_srl'), $source_category_srl);
+				}
+				if($category_srl) {
+					$oDocumentController->updateCategoryCount($module_srl, $category_srl);
+				}
 			}
 		}
 
@@ -223,7 +236,9 @@ 
 	 */
 	function copyDocumentModule($document_srl_list, $module_srl, $category_srl)
 	{
-		if(count($document_srl_list) < 1) return;
+		if(count($document_srl_list) < 1) {
+			return;
+		}
 
 		$oDocumentModel = getModel('document');
 		$oDocumentController = getController('document');
@@ -264,7 +279,9 @@ 
 		{
 			$document_srl = $document_srl_list[$i];
 			$oDocument = $oDocumentModel->getDocument($document_srl);
-			if(!$oDocument->isExists()) continue;
+			if(!$oDocument->isExists()) {
+				continue;
+			}
 
 			$obj = $oDocument->getObjectVars();
 
@@ -275,7 +292,9 @@ 
 				{
 					foreach($extraVars as $extraItem)
 					{
-						if($extraItem->var_idx >= 0) $obj->{'extra_vars'.$extraItem->var_idx} = $extraItem->value;
+						if($extraItem->var_idx >= 0) {
+							$obj->{'extra_vars'.$extraItem->var_idx} = $extraItem->value;
+						}
 					}
 				}
 			}
@@ -304,8 +323,7 @@ 
 						$target_filename = substr($inserted_file->get('uploaded_filename'),2);
 						$obj->content = str_replace($source_filename, $target_filename, $obj->content);
 						// If binary file
-					}
-					else
+					} else
 					{
 						$obj->content = str_replace('file_srl='.$val->file_srl, 'file_srl='.$inserted_file->get('file_srl'), $obj->content);
 						$obj->content = str_replace('sid='.$val->sid, 'sid='.$inserted_file->get('sid'), $obj->content);
@@ -372,8 +390,7 @@ 
 									$target_filename = substr($inserted_file->get('uploaded_filename'),2);
 									$comment_obj->content = str_replace($source_filename, $target_filename, $comment_obj->content);
 									// If binary file
-								}
-								else
+								} else
 								{
 									$comment_obj->content = str_replace('file_srl='.$val->file_srl, 'file_srl='.$inserted_file->get('file_srl'), $comment_obj->content);
 									$comment_obj->content = str_replace('sid='.$val->sid, 'sid='.$inserted_file->get('sid'), $comment_obj->content);
@@ -385,10 +402,14 @@ 
 						$comment_obj->document_srl = $obj->document_srl;
 						$comment_obj->comment_srl = $comment_srl;
 
-						if($comment_obj->parent_srl) $comment_obj->parent_srl = $p_comment_srl[$comment_obj->parent_srl];
+						if($comment_obj->parent_srl) {
+							$comment_obj->parent_srl = $p_comment_srl[$comment_obj->parent_srl];
+						}
 
 						$output = $oCommentController->insertComment($comment_obj, true);
-						if($output->toBool()) $success_count ++;
+						if($output->toBool()) {
+							$success_count ++;
+						}
 					}
 					$oDocumentController->updateCommentCount($obj->document_srl, $success_count, $comment_obj->nick_name, true);
 				}
@@ -408,7 +429,9 @@ 
 						$trackback_obj->module_srl = $obj->module_srl;
 						$trackback_obj->document_srl = $obj->document_srl;
 						$output = executeQuery('trackback.insertTrackback', $trackback_obj);
-						if($output->toBool()) $success_count++;
+						if($output->toBool()) {
+							$success_count++;
+						}
 					}
 					// Update the number of trackbacks
 					$oDocumentController->updateTrackbackCount($obj->document_srl, $success_count);
@@ -506,7 +529,9 @@ 
 		{
 			$args->document_srl = $document_srl;
 			$output = executeQuery('document.deleteDeclaredDocuments', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 	}
 
@@ -537,7 +562,9 @@ 
 				if (is_dir($path."/".$entry)) {
 					$this->deleteThumbnailFile($path."/".$entry);
 				} else {
-					if(!preg_match('/^thumbnail_([^\.]*)\.jpg$/i',$entry)) continue;
+					if(!preg_match('/^thumbnail_([^\.]*)\.jpg$/i',$entry)) {
+						continue;
+					}
 					FileHandler::removeFile($path.'/'.$entry);
 				}
 			}
@@ -562,7 +589,9 @@ 
 		$eid = Context::get('eid');
 		$obj = new stdClass();
 
-		if(!$module_srl || !$name || !$eid) return new BaseObject(-1,'msg_invalid_request');
+		if(!$module_srl || !$name || !$eid) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 		// set the max value if idx is not specified
 		if(!$var_idx)
 		{
@@ -584,7 +613,9 @@ 
 		// insert or update
 		$oDocumentController = getController('document');
 		$output = $oDocumentController->insertDocumentExtraKey($module_srl, $var_idx, $name, $type, $is_required, $search, $default, $desc, $eid);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->setMessage('success_registed');
 
@@ -600,11 +631,15 @@ 
 	{
 		$module_srl = Context::get('module_srl');
 		$var_idx = Context::get('var_idx');
-		if(!$module_srl || !$var_idx) return new BaseObject(-1,'msg_invalid_request');
+		if(!$module_srl || !$var_idx) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$oDocumentController = getController('document');
 		$output = $oDocumentController->deleteDocumentExtraKeys($module_srl, $var_idx);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->setMessage('success_deleted');
 	}
@@ -619,26 +654,41 @@ 
 		$module_srl = Context::get('module_srl');
 		$var_idx = Context::get('var_idx');
 
-		if(!$type || !$module_srl || !$var_idx) return new BaseObject(-1,'msg_invalid_request');
+		if(!$type || !$module_srl || !$var_idx) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$oModuleModel = getModel('module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-		if(!$module_info->module_srl) return new BaseObject(-1,'msg_invalid_request');
+		if(!$module_info->module_srl) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$oDocumentModel = getModel('document');
 		$extra_keys = $oDocumentModel->getExtraKeys($module_srl);
-		if(!$extra_keys[$var_idx]) return new BaseObject(-1,'msg_invalid_request');
+		if(!$extra_keys[$var_idx]) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
-		if($type == 'up') $new_idx = $var_idx-1;
-		else $new_idx = $var_idx+1;
-		if($new_idx<1) return new BaseObject(-1,'msg_invalid_request');
+		if($type == 'up') {
+			$new_idx = $var_idx-1;
+		} else {
+			$new_idx = $var_idx+1;
+		}
+		if($new_idx<1) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 		$args->var_idx = $new_idx;
 		$output = executeQuery('document.getDocumentExtraKeys', $args);
-		if (!$output->toBool()) return $output;
-		if (!$output->data) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$output->toBool()) {
+			return $output;
+		}
+		if (!$output->data) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 		unset($args);
 
 		// update immediately if there is no idx to change
@@ -649,35 +699,50 @@ 
 			$args->var_idx = $var_idx;
 			$args->new_idx = $new_idx;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 			// replace if exists
-		}
-		else
+		} else
 		{
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$args->var_idx = $new_idx;
 			$args->new_idx = -10000;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 
 			$args->var_idx = $var_idx;
 			$args->new_idx = $new_idx;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 
 			$args->var_idx = -10000;
 			$args->new_idx = $var_idx;
 			$output = executeQuery('document.updateDocumentExtraKeyIdx', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 			$output = executeQuery('document.updateDocumentExtraVarIdx', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
@@ -701,8 +766,7 @@ 
 		{
 			$args->alias_srl = getNextSequence();
 			$query = "document.insertAlias";
-		}
-		else
+		} else
 		{
 			$args->alias_srl = $alias_srl;
 			$query = "document.updateAlias";
@@ -740,7 +804,9 @@ 
 		$oDocumentModel = getModel('document');
 		$oDocumentController = getController('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
-		if(!$oDocument->isGranted()) return $this->stop('msg_not_permitted');
+		if(!$oDocument->isGranted()) {
+			return $this->stop('msg_not_permitted');
+		}
 	
 		$oModuleModel = getModel('module');
 		$module_info = $oModuleModel->getModuleInfoByDocumentSrl($document_srl);
@@ -762,8 +828,9 @@ 
 				parse_str($arrUrl['query'], $arrQuery);
 
 				// set query
-				if(isset($arrQuery['document_srl']))
-					unset($arrQuery['document_srl']);
+				if(isset($arrQuery['document_srl'])) {
+									unset($arrQuery['document_srl']);
+				}
 
 				$searchArgs = new stdClass;
 				foreach($arrQuery as $key=>$val)
@@ -771,13 +838,15 @@ 
 					$searchArgs->{$key} = $val;
 				}
 
-				if(!isset($searchArgs->sort_index))
-					$searchArgs->sort_index = $module_info->order_target;
+				if(!isset($searchArgs->sort_index)) {
+									$searchArgs->sort_index = $module_info->order_target;
+				}
 
 				foreach($module_info as $key=>$val)
 				{
-					if(!isset($searchArgs->{$key}))
-						$searchArgs->{$key} = $val;
+					if(!isset($searchArgs->{$key})) {
+											$searchArgs->{$key} = $val;
+					}
 				}
 
 				$oDocumentModel = getModel('document');
@@ -789,12 +858,14 @@ 
 				}
 
 
-				if($cur_page>1 && count($output->data) == 0)
-					$arrQuery['page'] = $cur_page - 1;
+				if($cur_page>1 && count($output->data) == 0) {
+									$arrQuery['page'] = $cur_page - 1;
+				}
 
 				$query = "?";
-				foreach($arrQuery as $key=>$val)
-					$query .= sprintf("%s=%s&", $key, $val);
+				foreach($arrQuery as $key=>$val) {
+									$query .= sprintf("%s=%s&", $key, $val);
+				}
 				$query = substr($query, 0, -1);
 			}
 			$returnUrl = $arrUrl['path'] . $query;
@@ -874,7 +945,9 @@ 
 	 */
 	function restoreTrash($originObject)
 	{
-		if(is_array($originObject)) $originObject = (object)$originObject;
+		if(is_array($originObject)) {
+			$originObject = (object)$originObject;
+		}
 
 		$oDocumentController = getController('document');
 		$oDocumentModel = getModel('document');
@@ -884,7 +957,9 @@ 
 
 		//DB restore
 		$output = $oDocumentController->insertDocument($originObject, false, true, false);
-		if(!$output->toBool()) return new BaseObject(-1, $output->getMessage());
+		if(!$output->toBool()) {
+			return new BaseObject(-1, $output->getMessage());
+		}
 
 		//FILE restore
 		$oDocument = $oDocumentModel->getDocument($originObject->document_srl);
@@ -922,7 +997,9 @@ 
 	function emptyTrash($originObject)
 	{
 		$originObject = unserialize($originObject);
-		if(is_array($originObject)) $originObject = (object) $originObject;
+		if(is_array($originObject)) {
+			$originObject = (object) $originObject;
+		}
 
 		$oDocument = new documentItem();
 		$oDocument->setAttribute($originObject);

modules/document/document.controller.php

Doc Comments +2 added lines, -2 removed lines

@@ -716,7 +716,7 @@ 
 
 	/**
 	 * Move the doc into the trash
-	 * @param object $obj
+	 * @param stdClass $obj
 	 * @return object
 	 */
 	function moveDocumentToTrash($obj)
@@ -1811,7 +1811,7 @@ 
 	 * Occasionally the xml file is not generated after menu is configued on the admin page \n
 	 * The administrator can manually update the file in this case \n
 	 * Although the issue is not currently reproduced, it is unnecessay to remove.
-	 * @return void
+	 * @return BaseObject|null
 	 */
 	function procDocumentMakeXmlFile()
 	{

Braces +535 added lines, -216 removed lines

@@ -24,19 +24,27 @@ 
 	 */
 	function procDocumentVoteUp()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_invalid_request');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$document_srl = Context::get('target_srl');
-		if(!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$document_srl) {
+			return new BaseObject(-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 BaseObject(-1, 'msg_invalid_request');
+		if(!$module_srl) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$oModuleModel = getModel('module');
 		$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
-		if($document_config->use_vote_up=='N') return new BaseObject(-1, 'msg_invalid_request');
+		if($document_config->use_vote_up=='N') {
+			return new BaseObject(-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 BaseObject(-1, 'msg_invalid_request');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$document_srl = Context::get('target_srl');
-		if(!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$document_srl) {
+			return new BaseObject(-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 BaseObject(-1, 'msg_invalid_request');
+		if(!$module_srl) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$oModuleModel = getModel('module');
 		$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
-		if($document_config->use_vote_down=='N') return new BaseObject(-1, 'msg_invalid_request');
+		if($document_config->use_vote_down=='N') {
+			return new BaseObject(-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 BaseObject(-1, 'msg_invalid_request');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$document_srl = Context::get('target_srl');
-		if(!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$document_srl) {
+			return new BaseObject(-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 BaseObject();
+		if(!$module_srl) {
+			return new BaseObject();
+		}
 		// 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 BaseObject(-1, 'msg_not_permitted');
+		if(!$obj->document_srl) {
+			$obj->document_srl = getNextSequence();
+		} elseif(!$manual_inserted && !$isRestore && !checkUserSequence($obj->document_srl)) {
+			return new BaseObject(-1, 'msg_not_permitted');
+		}
 
 		$oDocumentModel = getModel('document');
 		// Set to 0 if the category_srl doesn't exist
@@ -249,12 +298,19 @@ 
 			{
 				return new BaseObject(-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 BaseObject(-1,'msg_invalid_request');
+		if(!$logged_info->member_srl && !$obj->nick_name) {
+			return new BaseObject(-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 BaseObject(-1, 'msg_invalid_request');
 		}
 
-		if(!$source_obj->document_srl || !$obj->document_srl) return new BaseObject(-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 BaseObject(-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 BaseObject(-1, 'document is not exists');
 		}
-		else if($isEmptyTrash && $oDocument == null) return new BaseObject(-1, 'document is not exists');
 
-		if(!$oDocument->isExists() || $oDocument->document_srl != $document_srl) return new BaseObject(-1, 'msg_invalid_document');
+		if(!$oDocument->isExists() || $oDocument->document_srl != $document_srl) {
+			return new BaseObject(-1, 'msg_invalid_document');
+		}
 		// Check if a permossion is granted
-		if(!$oDocument->isGranted()) return new BaseObject(-1, 'msg_not_permitted');
+		if(!$oDocument->isGranted()) {
+			return new BaseObject(-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 BaseObject(-1,'msg_invalid_request');
+		if(!$module_srl || !$var_idx || !$var_name || !$var_type || !$eid) {
+			return new BaseObject(-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 BaseObject(-1,'msg_invalid_request');
+		if(!$module_srl) {
+			return new BaseObject(-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 BaseObject(-1,'msg_invalid_request');
-		if(!$lang_code) $lang_code = Context::getLangType();
+		if(!$module_srl || !$document_srl || !$var_idx || !isset($value)) {
+			return new BaseObject(-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 BaseObject(-1, 'failed_declared');
+		if($_SESSION['declared_document'][$document_srl]) {
+			return new BaseObject(-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 BaseObject(-1, 'msg_cannot_delete_for_child');
+		if(!$output->toBool()) {
+			return $output;
+		}
+		if($output->data->count>0) {
+			return new BaseObject(-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 BaseObject();
+		if(count($category_srl_list)<2) {
+			return new BaseObject();
+		}
 
 		$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 BaseObject(-1,Context::getLang('msg_category_not_moved'));
+		if(!$prev_category) {
+			return new BaseObject(-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 BaseObject(-1,Context::getLang('msg_category_not_moved'));
+		if($category_srl_list[0]==$category_srl) {
+			return new BaseObject(-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 BaseObject();
+		if(count($category_srl_list)<2) {
+			return new BaseObject();
+		}
 
 		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 BaseObject(-1,Context::getLang('msg_category_not_moved'));
+		if(!$category_list[$next_category_srl]) {
+			return new BaseObject(-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 BaseObject(-1,'msg_not_permitted');
+		if(!$grant->manager) {
+			return new BaseObject(-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 BaseObject(-1,'msg_not_permitted');
+		if(!$grant->manager) {
+			return new BaseObject(-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 BaseObject(-1,'msg_not_permitted');
+		if(!$grant->manager) {
+			return new BaseObject(-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 BaseObject(-1, 'msg_cannot_delete_for_child');
+		if($oDocumentModel->getCategoryChlidCount($args->category_srl)) {
+			return new BaseObject(-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 BaseObject(-1,'msg_not_permitted');
+		if(!$grant->manager) {
+			return new BaseObject(-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 BaseObject(-1, 'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-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 BaseObject();
+		if(!$output->data) {
+			return new BaseObject();
+		}
 
 		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 BaseObject();
+		if(!$document_srls || !count($document_srls)) {
+			return new BaseObject();
+		}
 
 		// 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 BaseObject();
+		if(!count($document_srls)) {
+			return new BaseObject();
+		}
 
 		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 BaseObject(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-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\" target=\"_blank\">%s</a>", $oDocument->getPermanentUrl(), $oDocument->getPermanentUrl());
-				else $purl = "";
+				if($type=='move') {
+					$purl = sprintf("<a href=\"%s\" target=\"_blank\">%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 BaseObject(-1, 'fail_to_move');
+			if(!$module_srl) {
+				return new BaseObject(-1, 'fail_to_move');
+			}
 
 			$output = $oDocumentAdminController->moveDocumentModule($document_srl_list, $module_srl, $category_srl);
-			if(!$output->toBool()) return new BaseObject(-1, 'fail_to_move');
+			if(!$output->toBool()) {
+				return new BaseObject(-1, 'fail_to_move');
+			}
 
 			$msg_code = 'success_moved';
 
-		}
-		else if($type == 'copy')
+		} else if($type == 'copy')
 		{
-			if(!$module_srl) return new BaseObject(-1, 'fail_to_move');
+			if(!$module_srl) {
+				return new BaseObject(-1, 'fail_to_move');
+			}
 
 			$output = $oDocumentAdminController->copyDocumentModule($document_srl_list, $module_srl, $category_srl);
-			if(!$output->toBool()) return new BaseObject(-1, 'fail_to_move');
+			if(!$output->toBool()) {
+				return new BaseObject(-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 BaseObject(-1, 'fail_to_delete');
+				if(!$output->toBool()) {
+					return new BaseObject(-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 BaseObject(-1, 'fail_to_trash');
+				if(!$output || !$output->toBool()) {
+					return new BaseObject(-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 BaseObject(-1, 'msg_not_logged');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-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 BaseObject(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-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)

Spacing +367 added lines, -367 removed lines

@@ -24,19 +24,19 @@ 
 	 */
 	function procDocumentVoteUp()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_invalid_request');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_invalid_request');
 
 		$document_srl = Context::get('target_srl');
-		if(!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$document_srl) return new BaseObject(-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 BaseObject(-1, 'msg_invalid_request');
+		if (!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oModuleModel = getModel('module');
-		$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
-		if($document_config->use_vote_up=='N') return new BaseObject(-1, 'msg_invalid_request');
+		$document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
+		if ($document_config->use_vote_up == 'N') return new BaseObject(-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 BaseObject(-1, 'msg_invalid_request');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_invalid_request');
 
 		$document_srl = Context::get('target_srl');
-		if(!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$document_srl) return new BaseObject(-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 BaseObject(-1, 'msg_invalid_request');
+		if (!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oModuleModel = getModel('module');
-		$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
-		if($document_config->use_vote_down=='N') return new BaseObject(-1, 'msg_invalid_request');
+		$document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
+		if ($document_config->use_vote_down == 'N') return new BaseObject(-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 BaseObject(-1, 'msg_invalid_request');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_invalid_request');
 
 		$document_srl = Context::get('target_srl');
-		if(!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$document_srl) return new BaseObject(-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 BaseObject();
+		if (!$module_srl) return new BaseObject();
 		// 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 BaseObject(-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 BaseObject(-1, 'msg_not_permitted');
+		if (!$obj->document_srl) $obj->document_srl = getNextSequence();
+		elseif (!$manual_inserted && !$isRestore && !checkUserSequence($obj->document_srl)) return new BaseObject(-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 BaseObject(-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 BaseObject(-1,'msg_invalid_request');
+		if (!$logged_info->member_srl && !$obj->nick_name) return new BaseObject(-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 BaseObject(-1, 'msg_invalid_request');
 		}
 
-		if(!$source_obj->document_srl || !$obj->document_srl) return new BaseObject(-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 BaseObject(-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 BaseObject(-1, 'document is not exists');
+		else if ($isEmptyTrash && $oDocument == null) return new BaseObject(-1, 'document is not exists');
 
-		if(!$oDocument->isExists() || $oDocument->document_srl != $document_srl) return new BaseObject(-1, 'msg_invalid_document');
+		if (!$oDocument->isExists() || $oDocument->document_srl != $document_srl) return new BaseObject(-1, 'msg_invalid_document');
 		// Check if a permossion is granted
-		if(!$oDocument->isGranted()) return new BaseObject(-1, 'msg_not_permitted');
+		if (!$oDocument->isGranted()) return new BaseObject(-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 BaseObject(-1,'msg_invalid_request');
+		if (!$module_srl || !$var_idx || !$var_name || !$var_type || !$eid) return new BaseObject(-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 BaseObject(-1,'msg_invalid_request');
+		if (!$module_srl) return new BaseObject(-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 BaseObject(-1,'msg_invalid_request');
-		if(!$lang_code) $lang_code = Context::getLangType();
+		if (!$module_srl || !$document_srl || !$var_idx || !isset($value)) return new BaseObject(-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 BaseObject(-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 BaseObject(-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 BaseObject(-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 BaseObject(-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 BaseObject();
-		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 BaseObject(-1, 'failed_declared');
+		if ($_SESSION['declared_document'][$document_srl]) return new BaseObject(-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 BaseObject(-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 BaseObject(-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 BaseObject(-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 BaseObject(-1, 'msg_cannot_delete_for_child');
+		if (!$output->toBool()) return $output;
+		if ($output->data->count > 0) return new BaseObject(-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 BaseObject();
+		if (count($category_srl_list) < 2) return new BaseObject();
 
 		$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 BaseObject(-1,Context::getLang('msg_category_not_moved'));
+		if (!$prev_category) return new BaseObject(-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 BaseObject(-1,Context::getLang('msg_category_not_moved'));
+		if ($category_srl_list[0] == $category_srl) return new BaseObject(-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 BaseObject();
+		if (count($category_srl_list) < 2) return new BaseObject();
 
-		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 BaseObject(-1,Context::getLang('msg_category_not_moved'));
+		$next_category_srl = $category_srl_list[$i + 1];
+		if (!$category_list[$next_category_srl]) return new BaseObject(-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 BaseObject(-1,'msg_not_permitted');
+		if (!$grant->manager) return new BaseObject(-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 BaseObject(-1,'msg_not_permitted');
+		if (!$grant->manager) return new BaseObject(-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 BaseObject(-1,'msg_not_permitted');
+		if (!$grant->manager) return new BaseObject(-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 BaseObject(-1, 'msg_cannot_delete_for_child');
+		if ($oDocumentModel->getCategoryChlidCount($args->category_srl)) return new BaseObject(-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 BaseObject(-1,'msg_not_permitted');
+		if (!$grant->manager) return new BaseObject(-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, var_export(str_replace('"','\\"',htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)), true));
+					$xml_header_buff .= sprintf('$_titles[%d]["%s"] = %s; ', $category_srl, $key, var_export(str_replace('"', '\\"', htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)), true));
 				}
 			}
 
 			$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, var_export(str_replace('"','\\"',htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)), true));
+					$xml_header_buff .= sprintf('$_descriptions[%d]["%s"] = %s; ', $category_srl, $key, var_export(str_replace('"', '\\"', htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)), true));
 				}
 			}
 
@@ -2002,7 +2002,7 @@ 
 				$category_srl,
 				$group_check_code,
 				$category_srl,
-				var_export(getUrl('','mid',$node->mid,'category',$category_srl), true),
+				var_export(getUrl('', 'mid', $node->mid, 'category', $category_srl), true),
 				var_export($expand, true),
 				var_export($color, true),
 				$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,
-						var_export(str_replace('"','\\"', $val), true)
+						var_export(str_replace('"', '\\"', $val), true)
 					);
 				}
 			}
 
 			$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,
-						var_export(str_replace('"','\\"', $val), true)
+						var_export(str_replace('"', '\\"', $val), true)
 					);
 				}
 			}
@@ -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 BaseObject(-1, 'msg_not_permitted');
+		if (!Context::get('is_logged')) return new BaseObject(-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 BaseObject();
+		if (!$output->data) return new BaseObject();
 
 		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 BaseObject();
+		if (!$document_srls || !count($document_srls)) return new BaseObject();
 
 		// 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 BaseObject();
+		if (!count($document_srls)) return new BaseObject();
 
-		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 BaseObject(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
 
-		if(!checkCSRF())
+		if (!checkCSRF())
 		{
 			return new BaseObject(-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\" target=\"_blank\">%s</a>", $oDocument->getPermanentUrl(), $oDocument->getPermanentUrl());
+				if ($type == 'move') $purl = sprintf("<a href=\"%s\" target=\"_blank\">%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 BaseObject(-1, 'fail_to_move');
+			if (!$module_srl) return new BaseObject(-1, 'fail_to_move');
 
 			$output = $oDocumentAdminController->moveDocumentModule($document_srl_list, $module_srl, $category_srl);
-			if(!$output->toBool()) return new BaseObject(-1, 'fail_to_move');
+			if (!$output->toBool()) return new BaseObject(-1, 'fail_to_move');
 
 			$msg_code = 'success_moved';
 
 		}
-		else if($type == 'copy')
+		else if ($type == 'copy')
 		{
-			if(!$module_srl) return new BaseObject(-1, 'fail_to_move');
+			if (!$module_srl) return new BaseObject(-1, 'fail_to_move');
 
 			$output = $oDocumentAdminController->copyDocumentModule($document_srl_list, $module_srl, $category_srl);
-			if(!$output->toBool()) return new BaseObject(-1, 'fail_to_move');
+			if (!$output->toBool()) return new BaseObject(-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 BaseObject(-1, 'fail_to_delete');
+				if (!$output->toBool()) return new BaseObject(-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 BaseObject(-1, 'fail_to_trash');
+				if (!$output || !$output->toBool()) return new BaseObject(-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 BaseObject(-1, 'msg_not_logged');
+		if (!Context::get('is_logged')) return new BaseObject(-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 BaseObject(-1, 'msg_invalid_request');
 			}
-			if(!$oDocument->isGranted())
+			if (!$oDocument->isGranted())
 			{
 				return new BaseObject(-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 BaseObject(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new BaseObject(-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);
 			}

modules/document/document.model.php

Doc Comments +2 added lines, -2 removed lines

@@ -496,7 +496,7 @@ 
 	/**
 	 * Show pop-up menu of the selected posts
 	 * Printing, scrap, recommendations and negative, reported the Add Features
-	 * @return void
+	 * @return BaseObject|null
 	 */
 	function getDocumentMenu()
 	{
@@ -1266,7 +1266,7 @@ 
 	 * Setting sort index
 	 * @param object $obj
 	 * @param bool $load_extra_vars
-	 * @return object
+	 * @return stdClass
 	 */
 	function _setSortIndex($obj, $load_extra_vars)
 	{

Spacing +234 added lines, -234 removed lines

@@ -37,7 +37,7 @@ 
 	 */
 	function getDocumentExtraVarsFromDB($documentSrls)
 	{
-		if(!is_array($documentSrls) || count($documentSrls) == 0)
+		if (!is_array($documentSrls) || count($documentSrls) == 0)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -58,52 +58,52 @@ 
 		$_document_list = &$GLOBALS['XE_DOCUMENT_LIST'];
 
 		// XE XE_DOCUMENT_LIST all documents that the object referred to the global variable settings
-		if(count($_document_list) <= 0) return;
+		if (count($_document_list) <= 0) return;
 
 		// Find all called the document object variable has been set extension
 		$document_srls = array();
-		foreach($_document_list as $key => $val)
+		foreach ($_document_list as $key => $val)
 		{
-			if(!$val->document_srl || $checked_documents[$val->document_srl]) continue;
+			if (!$val->document_srl || $checked_documents[$val->document_srl]) continue;
 			$checked_documents[$val->document_srl] = true;
 			$document_srls[] = $val->document_srl;
 		}
 		// If the document number, return detected
-		if(!count($document_srls)) return;
+		if (!count($document_srls)) return;
 		// Expand variables mijijeongdoen article about a current visitor to the extension of the language code, the search variable
 		//$obj->document_srl = implode(',',$document_srls);
 		$output = $this->getDocumentExtraVarsFromDB($document_srls);
-		if($output->toBool() && $output->data)
+		if ($output->toBool() && $output->data)
 		{
-			foreach($output->data as $key => $val)
+			foreach ($output->data as $key => $val)
 			{
-				if(!isset($val->value)) continue;
-				if(!$extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0]) $extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0] = trim($val->value);
+				if (!isset($val->value)) continue;
+				if (!$extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0]) $extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0] = trim($val->value);
 				$extra_vars[$val->document_srl][$val->var_idx][$val->lang_code] = trim($val->value);
 			}
 		}
 
 		$user_lang_code = Context::getLangType();
-		for($i=0,$c=count($document_srls);$i<$c;$i++)
+		for ($i = 0, $c = count($document_srls); $i < $c; $i++)
 		{
 			$document_srl = $document_srls[$i];
 			unset($vars);
 
-			if(!$_document_list[$document_srl] || !is_object($_document_list[$document_srl]) || !$_document_list[$document_srl]->isExists()) continue;
+			if (!$_document_list[$document_srl] || !is_object($_document_list[$document_srl]) || !$_document_list[$document_srl]->isExists()) continue;
 			$module_srl = $_document_list[$document_srl]->get('module_srl');
 			$extra_keys = $this->getExtraKeys($module_srl);
 			$vars = $extra_vars[$document_srl];
 			$document_lang_code = $_document_list[$document_srl]->get('lang_code');
 			// Expand the variable processing
-			if(count($extra_keys))
+			if (count($extra_keys))
 			{
-				foreach($extra_keys as $idx => $key)
+				foreach ($extra_keys as $idx => $key)
 				{
 					$extra_keys[$idx] = clone($key);
 					$val = $vars[$idx];
-					if(isset($val[$user_lang_code])) $v = $val[$user_lang_code];
-					else if(isset($val[$document_lang_code])) $v = $val[$document_lang_code];
-					else if(isset($val[0])) $v = $val[0];
+					if (isset($val[$user_lang_code])) $v = $val[$user_lang_code];
+					else if (isset($val[$document_lang_code])) $v = $val[$document_lang_code];
+					else if (isset($val[0])) $v = $val[0];
 					else $v = null;
 					$extra_keys[$idx]->value = $v;
 				}
@@ -113,11 +113,11 @@ 
 			$evars = new ExtraVar($module_srl);
 			$evars->setExtraVarKeys($extra_keys);
 			// Title Processing
-			if($vars[-1][$user_lang_code]) $_document_list[$document_srl]->add('title',$vars[-1][$user_lang_code]);
+			if ($vars[-1][$user_lang_code]) $_document_list[$document_srl]->add('title', $vars[-1][$user_lang_code]);
 			// Information processing
-			if($vars[-2][$user_lang_code]) $_document_list[$document_srl]->add('content',$vars[-2][$user_lang_code]);
+			if ($vars[-2][$user_lang_code]) $_document_list[$document_srl]->add('content', $vars[-2][$user_lang_code]);
 
-			if($vars[-1][$user_lang_code] || $vars[-2][$user_lang_code])
+			if ($vars[-1][$user_lang_code] || $vars[-2][$user_lang_code])
 			{
 				unset($checked_documents[$document_srl]);
 			}
@@ -134,17 +134,17 @@ 
 	 * @param array $columnList
 	 * @return documentItem
 	 */
-	function getDocument($document_srl=0, $is_admin = false, $load_extra_vars=true, $columnList = array())
+	function getDocument($document_srl = 0, $is_admin = false, $load_extra_vars = true, $columnList = array())
 	{
-		if(!$document_srl) return new documentItem();
+		if (!$document_srl) return new documentItem();
 
-		if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
+		if (!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 		{
 			$oDocument = new documentItem($document_srl, $load_extra_vars, $columnList);
 			$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
-			if($load_extra_vars) $this->setToAllDocumentExtraVars();
+			if ($load_extra_vars) $this->setToAllDocumentExtraVars();
 		}
-		if($is_admin) $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->setGrant();
+		if ($is_admin) $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->setGrant();
 
 		return $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
 	}
@@ -157,12 +157,12 @@ 
 	 * @param array $columnList
 	 * @return array value type is documentItem
 	 */
-	function getDocuments($document_srls, $is_admin = false, $load_extra_vars=true, $columnList = array())
+	function getDocuments($document_srls, $is_admin = false, $load_extra_vars = true, $columnList = array())
 	{
-		if(is_array($document_srls))
+		if (is_array($document_srls))
 		{
 			$list_count = count($document_srls);
-			$document_srls = implode(',',$document_srls);
+			$document_srls = implode(',', $document_srls);
 		}
 		else
 		{
@@ -175,33 +175,33 @@ 
 
 		$output = executeQuery('document.getDocuments', $args, $columnList);
 		$document_list = $output->data;
-		if(!$document_list) return;
-		if(!is_array($document_list)) $document_list = array($document_list);
+		if (!$document_list) return;
+		if (!is_array($document_list)) $document_list = array($document_list);
 
 		$document_count = count($document_list);
-		foreach($document_list as $key => $attribute)
+		foreach ($document_list as $key => $attribute)
 		{
 			$document_srl = $attribute->document_srl;
-			if(!$document_srl) continue;
+			if (!$document_srl) continue;
 
-			if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
+			if (!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 			{
 				$oDocument = null;
 				$oDocument = new documentItem();
 				$oDocument->setAttribute($attribute, false);
-				if($is_admin) $oDocument->setGrant();
+				if ($is_admin) $oDocument->setGrant();
 				$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
 			}
 
 			$result[$attribute->document_srl] = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
 		}
 
-		if($load_extra_vars) $this->setToAllDocumentExtraVars();
+		if ($load_extra_vars) $this->setToAllDocumentExtraVars();
 
 		$output = null;
-		if(count($result))
+		if (count($result))
 		{
-			foreach($result as $document_srl => $val)
+			foreach ($result as $document_srl => $val)
 			{
 				$output[$document_srl] = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
 			}
@@ -218,7 +218,7 @@ 
 	 * @param array $columnList
 	 * @return BaseObject
 	 */
-	function getDocumentList($obj, $except_notice = false, $load_extra_vars=true, $columnList = array())
+	function getDocumentList($obj, $except_notice = false, $load_extra_vars = true, $columnList = array())
 	{
 		$sort_check = $this->_setSortIndex($obj, $load_extra_vars);
 		$obj->sort_index = $sort_check->sort_index;
@@ -228,7 +228,7 @@ 
 		// Call trigger (before)
 		// This trigger can be used to set an alternative output using a different search method
 		$output = ModuleHandler::triggerCall('document.getDocumentList', 'before', $obj);
-		if($output instanceof BaseObject && !$output->toBool())
+		if ($output instanceof BaseObject && !$output->toBool())
 		{
 			return $output;
 		}
@@ -245,10 +245,10 @@ 
 			$output = $obj->use_alternate_output;
 			unset($obj->use_alternate_output);
 		}
-		elseif ($sort_check->isExtraVars && substr_count($obj->search_target,'extra_vars'))
+		elseif ($sort_check->isExtraVars && substr_count($obj->search_target, 'extra_vars'))
 		{
 			$query_id = 'document.getDocumentListWithinExtraVarsExtraSort';
-			$args->sort_index = str_replace('documents.','',$args->sort_index);
+			$args->sort_index = str_replace('documents.', '', $args->sort_index);
 			$output = executeQueryArray($query_id, $args);
 		}
 		elseif ($sort_check->isExtraVars)
@@ -260,16 +260,16 @@ 
 			// document.getDocumentList query execution
 			// Query_id if you have a group by clause getDocumentListWithinTag getDocumentListWithinComment or used again to perform the query because
 			$groupByQuery = array('document.getDocumentListWithinComment' => 1, 'document.getDocumentListWithinTag' => 1, 'document.getDocumentListWithinExtraVars' => 1);
-			if(isset($groupByQuery[$query_id]))
+			if (isset($groupByQuery[$query_id]))
 			{
 				$group_args = clone($args);
 				$group_args->sort_index = 'documents.'.$args->sort_index;
 				$output = executeQueryArray($query_id, $group_args);
-				if(!$output->toBool()||!count($output->data)) return $output;
+				if (!$output->toBool() || !count($output->data)) return $output;
 
-				foreach($output->data as $key => $val)
+				foreach ($output->data as $key => $val)
 				{
-					if($val->document_srl) $target_srls[] = $val->document_srl;
+					if ($val->document_srl) $target_srls[] = $val->document_srl;
 				}
 
 				$page_navigation = $output->page_navigation;
@@ -277,7 +277,7 @@ 
 				$virtual_number = $keys[0];
 
 				$target_args = new stdClass();
-				$target_args->document_srls = implode(',',$target_srls);
+				$target_args->document_srls = implode(',', $target_srls);
 				$target_args->list_order = $args->sort_index;
 				$target_args->order_type = $args->order_type;
 				$target_args->list_count = $args->list_count;
@@ -294,35 +294,35 @@ 
 			}
 		}
 		// Return if no result or an error occurs
-		if(!$output->toBool()||!count($output->data)) return $output;
+		if (!$output->toBool() || !count($output->data)) return $output;
 		$idx = 0;
 		$data = $output->data;
 		unset($output->data);
 
-		if(!isset($virtual_number))
+		if (!isset($virtual_number))
 		{
 			$keys = array_keys($data);
 			$virtual_number = $keys[0];
 		}
 
-		if($except_notice)
+		if ($except_notice)
 		{
-			foreach($data as $key => $attribute)
+			foreach ($data as $key => $attribute)
 			{
-				if($attribute->is_notice == 'Y') $virtual_number --;
+				if ($attribute->is_notice == 'Y') $virtual_number--;
 			}
 		}
 
-		foreach($data as $key => $attribute)
+		foreach ($data as $key => $attribute)
 		{
-			if($except_notice && $attribute->is_notice == 'Y') continue;
+			if ($except_notice && $attribute->is_notice == 'Y') continue;
 			$document_srl = $attribute->document_srl;
-			if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
+			if (!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 			{
 				$oDocument = null;
 				$oDocument = new documentItem();
 				$oDocument->setAttribute($attribute, false);
-				if($is_admin) $oDocument->setGrant();
+				if ($is_admin) $oDocument->setGrant();
 				$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
 			}
 
@@ -330,11 +330,11 @@ 
 			$virtual_number--;
 		}
 
-		if($load_extra_vars) $this->setToAllDocumentExtraVars();
+		if ($load_extra_vars) $this->setToAllDocumentExtraVars();
 
-		if(count($output->data))
+		if (count($output->data))
 		{
-			foreach($output->data as $number => $document)
+			foreach ($output->data as $number => $document)
 			{
 				$output->data[$number] = $GLOBALS['XE_DOCUMENT_LIST'][$document->document_srl];
 			}
@@ -356,16 +356,16 @@ 
 	{
 		$args = new stdClass();
 		$args->module_srl = $obj->module_srl;
-		$args->category_srl= $obj->category_srl;
+		$args->category_srl = $obj->category_srl;
 		$output = executeQueryArray('document.getNoticeList', $args, $columnList);
-		if(!$output->toBool()||!$output->data) return;
+		if (!$output->toBool() || !$output->data) return;
 
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			$document_srl = $val->document_srl;
-			if(!$document_srl) continue;
+			if (!$document_srl) continue;
 
-			if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
+			if (!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 			{
 				$oDocument = null;
 				$oDocument = new documentItem();
@@ -376,7 +376,7 @@ 
 		}
 		$this->setToAllDocumentExtraVars();
 
-		foreach($result->data as $document_srl => $val)
+		foreach ($result->data as $document_srl => $val)
 		{
 			$result->data[$document_srl] = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
 		}
@@ -392,20 +392,20 @@ 
 	 */
 	function getExtraKeys($module_srl)
 	{
-		if(!isset($GLOBALS['XE_EXTRA_KEYS'][$module_srl]))
+		if (!isset($GLOBALS['XE_EXTRA_KEYS'][$module_srl]))
 		{
 			$keys = false;
 			$oCacheHandler = CacheHandler::getInstance('object', null, true);
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
-				$object_key = 'module_document_extra_keys:' . $module_srl;
+				$object_key = 'module_document_extra_keys:'.$module_srl;
 				$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 				$keys = $oCacheHandler->get($cache_key);
 			}
 
 			$oExtraVar = ExtraVar::getInstance($module_srl);
 
-			if($keys === false)
+			if ($keys === false)
 			{
 				$obj = new stdClass();
 				$obj->module_srl = $module_srl;
@@ -415,13 +415,13 @@ 
 
 				// correcting index order
 				$isFixed = FALSE;
-				if(is_array($output->data))
+				if (is_array($output->data))
 				{
 					$prevIdx = 0;
-					foreach($output->data as $no => $value)
+					foreach ($output->data as $no => $value)
 					{
 						// case first
-						if($prevIdx == 0 && $value->idx != 1)
+						if ($prevIdx == 0 && $value->idx != 1)
 						{
 							$args = new stdClass();
 							$args->module_srl = $module_srl;
@@ -435,7 +435,7 @@ 
 						}
 
 						// case others
-						if($prevIdx > 0 && $prevIdx + 1 != $value->idx)
+						if ($prevIdx > 0 && $prevIdx + 1 != $value->idx)
 						{
 							$args = new stdClass();
 							$args->module_srl = $module_srl;
@@ -452,16 +452,16 @@ 
 					}
 				}
 
-				if($isFixed)
+				if ($isFixed)
 				{
 					$output = executeQueryArray('document.getDocumentExtraKeys', $obj);
 				}
 
 				$oExtraVar->setExtraVarKeys($output->data);
 				$keys = $oExtraVar->getExtraVars();
-				if(!$keys) $keys = array();
+				if (!$keys) $keys = array();
 
-				if($oCacheHandler->isSupport())
+				if ($oCacheHandler->isSupport())
 				{
 					$oCacheHandler->put($cache_key, $keys);
 				}
@@ -482,14 +482,14 @@ 
 	 */
 	function getExtraVars($module_srl, $document_srl)
 	{
-		if(!isset($GLOBALS['XE_EXTRA_VARS'][$document_srl]))
+		if (!isset($GLOBALS['XE_EXTRA_VARS'][$document_srl]))
 		{
 			// Extended to extract the values of variables set
 			$oDocument = $this->getDocument($document_srl, false);
 			$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
 			$this->setToAllDocumentExtraVars();
 		}
-		if(is_array($GLOBALS['XE_EXTRA_VARS'][$document_srl])) ksort($GLOBALS['XE_EXTRA_VARS'][$document_srl]);
+		if (is_array($GLOBALS['XE_EXTRA_VARS'][$document_srl])) ksort($GLOBALS['XE_EXTRA_VARS'][$document_srl]);
 		return $GLOBALS['XE_EXTRA_VARS'][$document_srl];
 	}
 
@@ -512,71 +512,71 @@ 
 
 		$oDocumentController = getController('document');
 		// Members must be a possible feature
-		if($logged_info->member_srl)
+		if ($logged_info->member_srl)
 		{
 			$oDocumentModel = getModel('document');
 			$columnList = array('document_srl', 'module_srl', 'member_srl', 'ipaddress');
 			$oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList);
 			$module_srl = $oDocument->get('module_srl');
 			$member_srl = $oDocument->get('member_srl');
-			if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
+			if (!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 			$oModuleModel = getModel('module');
-			$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
-			if($document_config->use_vote_up!='N' && $member_srl!=$logged_info->member_srl)
+			$document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
+			if ($document_config->use_vote_up != 'N' && $member_srl != $logged_info->member_srl)
 			{
 				// Add a Referral Button
 				$url = sprintf("doCallModuleAction('document','procDocumentVoteUp','%s')", $document_srl);
-				$oDocumentController->addDocumentPopupMenu($url,'cmd_vote','','javascript');
+				$oDocumentController->addDocumentPopupMenu($url, 'cmd_vote', '', 'javascript');
 			}
 
-			if($document_config->use_vote_down!='N' && $member_srl!=$logged_info->member_srl)
+			if ($document_config->use_vote_down != 'N' && $member_srl != $logged_info->member_srl)
 			{
 				// Add button to negative
-				$url= sprintf("doCallModuleAction('document','procDocumentVoteDown','%s')", $document_srl);
-				$oDocumentController->addDocumentPopupMenu($url,'cmd_vote_down','','javascript');
+				$url = sprintf("doCallModuleAction('document','procDocumentVoteDown','%s')", $document_srl);
+				$oDocumentController->addDocumentPopupMenu($url, 'cmd_vote_down', '', 'javascript');
 			}
 
 			// Adding Report
 			$url = sprintf("doCallModuleAction('document','procDocumentDeclare','%s')", $document_srl);
-			$oDocumentController->addDocumentPopupMenu($url,'cmd_declare','','javascript');
+			$oDocumentController->addDocumentPopupMenu($url, 'cmd_declare', '', 'javascript');
 
 			// Add Bookmark button
 			$url = sprintf("doCallModuleAction('member','procMemberScrapDocument','%s')", $document_srl);
-			$oDocumentController->addDocumentPopupMenu($url,'cmd_scrap','','javascript');
+			$oDocumentController->addDocumentPopupMenu($url, 'cmd_scrap', '', 'javascript');
 		}
 		// Add print button
-		$url = getUrl('','module','document','act','dispDocumentPrint','document_srl',$document_srl);
-		$oDocumentController->addDocumentPopupMenu($url,'cmd_print','','printDocument');
+		$url = getUrl('', 'module', 'document', 'act', 'dispDocumentPrint', 'document_srl', $document_srl);
+		$oDocumentController->addDocumentPopupMenu($url, 'cmd_print', '', 'printDocument');
 		// Call a trigger (after)
 		ModuleHandler::triggerCall('document.getDocumentMenu', 'after', $menu_list);
-		if($this->grant->manager)
+		if ($this->grant->manager)
 		{
 			$str_confirm = Context::getLang('confirm_move');
 			$url = sprintf("if(!confirm('%s')) return; var params = new Array(); params['document_srl']='%s'; params['mid']=current_mid;params['cur_url']=current_url; exec_xml('document', 'procDocumentAdminMoveToTrash', params)", $str_confirm, $document_srl);
-			$oDocumentController->addDocumentPopupMenu($url,'cmd_trash','','javascript');
+			$oDocumentController->addDocumentPopupMenu($url, 'cmd_trash', '', 'javascript');
 		}
 
 		// If you are managing to find posts by ip
-		if($logged_info->is_admin == 'Y')
+		if ($logged_info->is_admin == 'Y')
 		{
 			$oDocumentModel = getModel('document');
-			$oDocument = $oDocumentModel->getDocument($document_srl);	//before setting document recycle
+			$oDocument = $oDocumentModel->getDocument($document_srl); //before setting document recycle
 
-			if($oDocument->isExists())
+			if ($oDocument->isExists())
 			{
 				// Find a post equivalent to ip address
-				$url = getUrl('','module','admin','act','dispDocumentAdminList','search_target','ipaddress','search_keyword',$oDocument->getIpAddress());
-				$oDocumentController->addDocumentPopupMenu($url,'cmd_search_by_ipaddress',$icon_path,'TraceByIpaddress');
+				$url = getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList', 'search_target', 'ipaddress', 'search_keyword', $oDocument->getIpAddress());
+				$oDocumentController->addDocumentPopupMenu($url, 'cmd_search_by_ipaddress', $icon_path, 'TraceByIpaddress');
 
 				$url = sprintf("var params = new Array(); params['ipaddress_list']='%s'; exec_xml('spamfilter', 'procSpamfilterAdminInsertDeniedIP', params, completeCallModuleAction)", $oDocument->getIpAddress());
-				$oDocumentController->addDocumentPopupMenu($url,'cmd_add_ip_to_spamfilter','','javascript');
+				$oDocumentController->addDocumentPopupMenu($url, 'cmd_add_ip_to_spamfilter', '', 'javascript');
 			}
 		}
 		// Changing the language of pop-up menu
 		$menus = Context::get('document_popup_menu_list');
 		$menus_count = count($menus);
-		for($i=0;$i<$menus_count;$i++)
+		for ($i = 0; $i < $menus_count; $i++)
 		{
 			$menus[$i]->str = Context::getLang($menus[$i]->str);
 		}
@@ -592,13 +592,13 @@ 
 	 */
 	function getDocumentCount($module_srl, $search_obj = NULL)
 	{
-		if(is_null($search_obj)) $search_obj = new stdClass();
+		if (is_null($search_obj)) $search_obj = new stdClass();
 		$search_obj->module_srl = $module_srl;
 
 		$output = executeQuery('document.getDocumentCount', $search_obj);
 		// Return total number of
 		$total_count = $output->data->count;
-		return (int)$total_count;
+		return (int) $total_count;
 	}
 
 	/**
@@ -609,7 +609,7 @@ 
 	function getDocumentCountByGroupStatus($search_obj = NULL)
 	{
 		$output = executeQuery('document.getDocumentCountByGroupStatus', $search_obj);
-		if(!$output->toBool()) return array();
+		if (!$output->toBool()) return array();
 
 		return $output->data;
 	}
@@ -628,7 +628,7 @@ 
 		$output = executeQuery('document.getDocumentExtraVarsCount', $args);
 		// Return total number of
 		$total_count = $output->data->count;
-		return (int)$total_count;
+		return (int) $total_count;
 	}
 
 	/**
@@ -645,29 +645,29 @@ 
 
 		$this->_setSearchOption($opt, $args, $query_id, $use_division);
 
-		if($sort_check->isExtraVars)
+		if ($sort_check->isExtraVars)
 		{
 			return 1;
 		}
 		else
 		{
-			if($sort_check->sort_index === 'list_order' || $sort_check->sort_index === 'update_order')
+			if ($sort_check->sort_index === 'list_order' || $sort_check->sort_index === 'update_order')
 			{
-				if($args->order_type === 'desc')
+				if ($args->order_type === 'desc')
 				{
-					$args->{'rev_' . $sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
+					$args->{'rev_'.$sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
 				}
 				else
 				{
 					$args->{$sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
 				}
 			}
-			elseif($sort_check->sort_index === 'regdate')
+			elseif ($sort_check->sort_index === 'regdate')
 			{
 
-				if($args->order_type === 'asc')
+				if ($args->order_type === 'asc')
 				{
-					$args->{'rev_' . $sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
+					$args->{'rev_'.$sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
 				}
 				else
 				{
@@ -682,9 +682,9 @@ 
 		}
 
 		// Guhanhu total number of the article search page
-		$output = executeQuery($query_id . 'Page', $args);
+		$output = executeQuery($query_id.'Page', $args);
 		$count = $output->data->count;
-		$page = (int)(($count-1)/$opt->list_count)+1;
+		$page = (int) (($count - 1) / $opt->list_count) + 1;
 		return $page;
 	}
 
@@ -696,16 +696,16 @@ 
 	 */
 	function getCategory($category_srl, $columnList = array())
 	{
-		$args =new stdClass();
+		$args = new stdClass();
 		$args->category_srl = $category_srl;
 		$output = executeQuery('document.getCategory', $args, $columnList);
 
 		$node = $output->data;
-		if(!$node) return;
+		if (!$node) return;
 
-		if($node->group_srls)
+		if ($node->group_srls)
 		{
-			$group_srls = explode(',',$node->group_srls);
+			$group_srls = explode(',', $node->group_srls);
 			unset($node->group_srls);
 			$node->group_srls = $group_srls;
 		}
@@ -726,8 +726,8 @@ 
 	{
 		$args = new stdClass();
 		$args->category_srl = $category_srl;
-		$output = executeQuery('document.getChildCategoryCount',$args);
-		if($output->data->count > 0) return true;
+		$output = executeQuery('document.getChildCategoryCount', $args);
+		if ($output->data->count > 0) return true;
 		return false;
 	}
 
@@ -743,10 +743,10 @@ 
 		// Category of the target module file swollen
 		$filename = sprintf("%sfiles/cache/document_category/%s.php", _XE_PATH_, $module_srl);
 		// If the target file to the cache file regeneration category
-		if(!file_exists($filename))
+		if (!file_exists($filename))
 		{
 			$oDocumentController = getController('document');
-			if(!$oDocumentController->makeCategoryFile($module_srl)) return array();
+			if (!$oDocumentController->makeCategoryFile($module_srl)) return array();
 		}
 
 		include($filename);
@@ -766,10 +766,10 @@ 
 	 */
 	function _arrangeCategory(&$document_category, $list, $depth)
 	{
-		if(!count($list)) return;
+		if (!count($list)) return;
 		$idx = 0;
 		$list_order = array();
-		foreach($list as $key => $val)
+		foreach ($list as $key => $val)
 		{
 			$obj = new stdClass;
 			$obj->mid = $val['mid'];
@@ -778,7 +778,7 @@ 
 			$obj->parent_srl = $val['parent_srl'];
 			$obj->title = $obj->text = $val['text'];
 			$obj->description = $val['description'];
-			$obj->expand = $val['expand']=='Y'?true:false;
+			$obj->expand = $val['expand'] == 'Y' ?true:false;
 			$obj->color = $val['color'];
 			$obj->document_count = $val['document_count'];
 			$obj->depth = $depth;
@@ -786,26 +786,26 @@ 
 			$obj->childs = array();
 			$obj->grant = $val['grant'];
 
-			if(Context::get('mid') == $obj->mid && Context::get('category') == $obj->category_srl) $selected = true;
+			if (Context::get('mid') == $obj->mid && Context::get('category') == $obj->category_srl) $selected = true;
 			else $selected = false;
 
 			$obj->selected = $selected;
 
 			$list_order[$idx++] = $obj->category_srl;
 			// If you have a parent category of child nodes apply data
-			if($obj->parent_srl)
+			if ($obj->parent_srl)
 			{
 				$parent_srl = $obj->parent_srl;
 				$document_count = $obj->document_count;
 				$expand = $obj->expand;
-				if($selected) $expand = true;
+				if ($selected) $expand = true;
 
-				while($parent_srl)
+				while ($parent_srl)
 				{
 					$document_category[$parent_srl]->document_count += $document_count;
 					$document_category[$parent_srl]->childs[] = $obj->category_srl;
 					$document_category[$parent_srl]->child_count = count($document_category[$parent_srl]->childs);
-					if($expand) $document_category[$parent_srl]->expand = $expand;
+					if ($expand) $document_category[$parent_srl]->expand = $expand;
 
 					$parent_srl = $document_category[$parent_srl]->parent_srl;
 				}
@@ -813,10 +813,10 @@ 
 
 			$document_category[$key] = $obj;
 
-			if(count($val['list'])) $this->_arrangeCategory($document_category, $val['list'], $depth+1);
+			if (count($val['list'])) $this->_arrangeCategory($document_category, $val['list'], $depth + 1);
 		}
 		$document_category[$list_order[0]]->first = true;
-		$document_category[$list_order[count($list_order)-1]]->last = true;
+		$document_category[$list_order[count($list_order) - 1]]->last = true;
 	}
 
 	/**
@@ -831,7 +831,7 @@ 
 		$args->module_srl = $module_srl;
 		$args->category_srl = $category_srl;
 		$output = executeQuery('document.getCategoryDocumentCount', $args);
-		return (int)$output->data->count;
+		return (int) $output->data->count;
 	}
 
 	/**
@@ -841,8 +841,8 @@ 
 	 */
 	function getCategoryXmlFile($module_srl)
 	{
-		$xml_file = sprintf('files/cache/document_category/%s.xml.php',$module_srl);
-		if(!file_exists($xml_file))
+		$xml_file = sprintf('files/cache/document_category/%s.xml.php', $module_srl);
+		if (!file_exists($xml_file))
 		{
 			$oDocumentController = getController('document');
 			$oDocumentController->makeCategoryFile($module_srl);
@@ -857,8 +857,8 @@ 
 	 */
 	function getCategoryPhpFile($module_srl)
 	{
-		$php_file = sprintf('files/cache/document_category/%s.php',$module_srl);
-		if(!file_exists($php_file))
+		$php_file = sprintf('files/cache/document_category/%s.php', $module_srl);
+		if (!file_exists($php_file))
 		{
 			$oDocumentController = getController('document');
 			$oDocumentController->makeCategoryFile($module_srl);
@@ -873,7 +873,7 @@ 
 	 */
 	function getMonthlyArchivedList($obj)
 	{
-		if($obj->mid)
+		if ($obj->mid)
 		{
 			$oModuleModel = getModel('module');
 			$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
@@ -881,13 +881,13 @@ 
 		}
 		// Module_srl passed the array may be a check whether the array
 		$args = new stdClass;
-		if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
+		if (is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
 		else $args->module_srl = $obj->module_srl;
 
 		$output = executeQuery('document.getMonthlyArchivedList', $args);
-		if(!$output->toBool()||!$output->data) return $output;
+		if (!$output->toBool() || !$output->data) return $output;
 
-		if(!is_array($output->data)) $output->data = array($output->data);
+		if (!is_array($output->data)) $output->data = array($output->data);
 
 		return $output;
 	}
@@ -899,7 +899,7 @@ 
 	 */
 	function getDailyArchivedList($obj)
 	{
-		if($obj->mid)
+		if ($obj->mid)
 		{
 			$oModuleModel = getModel('module');
 			$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
@@ -907,14 +907,14 @@ 
 		}
 		// Module_srl passed the array may be a check whether the array
 		$args = new stdClass;
-		if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
+		if (is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
 		else $args->module_srl = $obj->module_srl;
 		$args->regdate = $obj->regdate;
 
 		$output = executeQuery('document.getDailyArchivedList', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		if(!is_array($output->data)) $output->data = array($output->data);
+		if (!is_array($output->data)) $output->data = array($output->data);
 
 		return $output;
 	}
@@ -925,17 +925,17 @@ 
 	 */
 	function getDocumentCategories()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
 		$module_srl = Context::get('module_srl');
-		$categories= $this->getCategoryList($module_srl);
+		$categories = $this->getCategoryList($module_srl);
 		$lang = Context::get('lang');
 		// No additional category
 		$output = "0,0,{$lang->none_category}\n";
-		if($categories)
+		if ($categories)
 		{
-			foreach($categories as $category_srl => $category)
+			foreach ($categories as $category_srl => $category)
 			{
-				$output .= sprintf("%d,%d,%s\n",$category_srl, $category->depth,$category->title);
+				$output .= sprintf("%d,%d,%s\n", $category_srl, $category->depth, $category->title);
 			}
 		}
 		$this->add('categories', $output);
@@ -947,7 +947,7 @@ 
 	 */
 	function getDocumentConfig()
 	{
-		if($this->documentConfig === NULL)
+		if ($this->documentConfig === NULL)
 		{
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('document');
@@ -1020,11 +1020,11 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
 		// Check permissions
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
-		if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
+		if (!$grant->manager) return new BaseObject(-1, 'msg_not_permitted');
 
 		$category_srl = Context::get('category_srl');
 		$category_info = $this->getCategory($category_srl);
-		if(!$category_info)
+		if (!$category_info)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -1040,14 +1040,14 @@ 
 	 */
 	function getDocumentSrlByAlias($mid, $alias)
 	{
-		if(!$mid || !$alias) return null;
+		if (!$mid || !$alias) return null;
 		$site_module_info = Context::get('site_module_info');
 		$args = new stdClass;
 		$args->mid = $mid;
 		$args->alias_title = $alias;
 		$args->site_srl = $site_module_info->site_srl;
 		$output = executeQuery('document.getDocumentSrlByAlias', $args);
-		if(!$output->data) return null;
+		if (!$output->data) return null;
 		else return $output->data->document_srl;
 	}
 
@@ -1059,15 +1059,15 @@ 
 	 */
 	function getDocumentSrlByTitle($module_srl, $title)
 	{
-		if(!$module_srl || !$title) return null;
+		if (!$module_srl || !$title) return null;
 		$args = new stdClass;
 		$args->module_srl = $module_srl;
 		$args->title = $title;
 		$output = executeQuery('document.getDocumentSrlByTitle', $args);
-		if(!$output->data) return null;
+		if (!$output->data) return null;
 		else
 		{
-			if(is_array($output->data)) return $output->data[0]->document_srl;
+			if (is_array($output->data)) return $output->data[0]->document_srl;
 			return $output->data->document_srl;
 		}
 	}
@@ -1079,12 +1079,12 @@ 
 	 */
 	function getAlias($document_srl)
 	{
-		if(!$document_srl) return null;
+		if (!$document_srl) return null;
 		$args = new stdClass;
 		$args->document_srl = $document_srl;
 		$output = executeQueryArray('document.getAliases', $args);
 
-		if(!$output->data) return null;
+		if (!$output->data) return null;
 		else return $output->data[0]->alias_title;
 	}
 
@@ -1127,32 +1127,32 @@ 
 	{
 		// Variable check
 		$args = new stdClass;
-		$args->category_srl = $obj->category_srl?$obj->category_srl:null;
+		$args->category_srl = $obj->category_srl ? $obj->category_srl : null;
 		$args->sort_index = $obj->sort_index;
-		$args->order_type = $obj->order_type?$obj->order_type:'desc';
-		$args->page = $obj->page?$obj->page:1;
-		$args->list_count = $obj->list_count?$obj->list_count:20;
-		$args->page_count = $obj->page_count?$obj->page_count:10;
+		$args->order_type = $obj->order_type ? $obj->order_type : 'desc';
+		$args->page = $obj->page ? $obj->page : 1;
+		$args->list_count = $obj->list_count ? $obj->list_count : 20;
+		$args->page_count = $obj->page_count ? $obj->page_count : 10;
 		// Search options
 		$search_target = $obj->search_target;
 		$search_keyword = $obj->search_keyword;
-		if($search_target && $search_keyword)
+		if ($search_target && $search_keyword)
 		{
-			switch($search_target)
+			switch ($search_target)
 			{
 				case 'title' :
 				case 'content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->{"s_".$search_target} = $search_keyword;
 					$use_division = true;
 					break;
 				case 'title_content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_title = $search_keyword;
 					$args->s_content = $search_keyword;
 					break;
 				case 'user_id' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_user_id = $search_keyword;
 					$args->sort_index = 'documents.'.$args->sort_index;
 					break;
@@ -1160,13 +1160,13 @@ 
 				case 'nick_name' :
 				case 'email_address' :
 				case 'homepage' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->{"s_".$search_target} = $search_keyword;
 					break;
 				case 'is_notice' :
 				case 'is_secret' :
-					if($search_keyword=='N') $args->statusList = array($this->getConfigStatus('public'));
-					elseif($search_keyword=='Y') $args->statusList = array($this->getConfigStatus('secret'));
+					if ($search_keyword == 'N') $args->statusList = array($this->getConfigStatus('public'));
+					elseif ($search_keyword == 'Y') $args->statusList = array($this->getConfigStatus('secret'));
 					break;
 				case 'member_srl' :
 				case 'readed_count' :
@@ -1175,7 +1175,7 @@ 
 				case 'comment_count' :
 				case 'trackback_count' :
 				case 'uploaded_count' :
-					$args->{"s_".$search_target} = (int)$search_keyword;
+					$args->{"s_".$search_target} = (int) $search_keyword;
 					break;
 				case 'regdate' :
 				case 'last_update' :
@@ -1187,9 +1187,9 @@ 
 		}
 
 		$output = executeQueryArray('document.getTrashList', $args);
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $key => $attribute)
+			foreach ($output->data as $key => $attribute)
 			{
 				$oDocument = null;
 				$oDocument = new documentItem();
@@ -1208,46 +1208,46 @@ 
 	{
 		$args = new stdClass;
 		$document_srl = Context::get('document_srl');
-		if(!$document_srl) return new BaseObject(-1,'msg_invalid_request');
+		if (!$document_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		$point = Context::get('point');
-		if($point != -1) $point = 1;
+		if ($point != -1) $point = 1;
 
 		$oDocumentModel = getModel('document');
 		$columnList = array('document_srl', 'module_srl');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList);
 		$module_srl = $oDocument->get('module_srl');
-		if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oModuleModel = getModel('module');
-		$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
-		if($point == -1)
+		$document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
+		if ($point == -1)
 		{
-			if($document_config->use_vote_down!='S') return new BaseObject(-1, 'msg_invalid_request');
+			if ($document_config->use_vote_down != 'S') return new BaseObject(-1, 'msg_invalid_request');
 			$args->below_point = 0;
 		}
 		else
 		{
-			if($document_config->use_vote_up!='S') return new BaseObject(-1, 'msg_invalid_request');
+			if ($document_config->use_vote_up != 'S') return new BaseObject(-1, 'msg_invalid_request');
 			$args->more_point = 0;
 		}
 
 		$args->document_srl = $document_srl;
 
-		$output = executeQueryArray('document.getVotedMemberList',$args);
-		if(!$output->toBool()) return $output;
+		$output = executeQueryArray('document.getVotedMemberList', $args);
+		if (!$output->toBool()) return $output;
 
 		$oMemberModel = getModel('member');
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $k => $d)
+			foreach ($output->data as $k => $d)
 			{
 				$profile_image = $oMemberModel->getProfileImage($d->member_srl);
 				$output->data[$k]->src = $profile_image->src;
 			}
 		}
 
-		$this->add('voted_member_list',$output->data);
+		$this->add('voted_member_list', $output->data);
 	}
 
 	/**
@@ -1257,7 +1257,7 @@ 
 	function getStatusNameList()
 	{
 		global $lang;
-		if(!isset($lang->status_name_list))
+		if (!isset($lang->status_name_list))
 			return array_flip($this->getStatusList());
 		else return $lang->status_name_list;
 	}
@@ -1272,7 +1272,7 @@ 
 	{
 		$sortIndex = $obj->sort_index;
 		$isExtraVars = false;
-		if(!in_array($sortIndex, array('list_order','regdate','last_update','update_order','readed_count','voted_count','blamed_count','comment_count','trackback_count','uploaded_count','title','category_srl')))
+		if (!in_array($sortIndex, array('list_order', 'regdate', 'last_update', 'update_order', 'readed_count', 'voted_count', 'blamed_count', 'comment_count', 'trackback_count', 'uploaded_count', 'title', 'category_srl')))
 		{
 			// get module_srl extra_vars list
 			if ($load_extra_vars)
@@ -1287,11 +1287,11 @@ 
 				else
 				{
 					$check_array = array();
-					foreach($extra_output->data as $val)
+					foreach ($extra_output->data as $val)
 					{
 						$check_array[] = $val->eid;
 					}
-					if(!in_array($sortIndex, $check_array)) $sortIndex = 'list_order';
+					if (!in_array($sortIndex, $check_array)) $sortIndex = 'list_order';
 					else $isExtraVars = true;
 				}
 			}
@@ -1319,13 +1319,13 @@ 
 	{
 		// Variable check
 		$args = new stdClass();
-		$args->category_srl = $searchOpt->category_srl?$searchOpt->category_srl:null;
+		$args->category_srl = $searchOpt->category_srl ? $searchOpt->category_srl : null;
 		$args->order_type = $searchOpt->order_type;
-		$args->page = $searchOpt->page?$searchOpt->page:1;
-		$args->list_count = $searchOpt->list_count?$searchOpt->list_count:20;
-		$args->page_count = $searchOpt->page_count?$searchOpt->page_count:10;
-		$args->start_date = $searchOpt->start_date?$searchOpt->start_date:null;
-		$args->end_date = $searchOpt->end_date?$searchOpt->end_date:null;
+		$args->page = $searchOpt->page ? $searchOpt->page : 1;
+		$args->list_count = $searchOpt->list_count ? $searchOpt->list_count : 20;
+		$args->page_count = $searchOpt->page_count ? $searchOpt->page_count : 10;
+		$args->start_date = $searchOpt->start_date ? $searchOpt->start_date : null;
+		$args->end_date = $searchOpt->end_date ? $searchOpt->end_date : null;
 		$args->member_srl = $searchOpt->member_srl;
 
 		$logged_info = Context::get('logged_info');
@@ -1334,10 +1334,10 @@ 
 
 		// Check the target and sequence alignment
 		$orderType = array('desc' => 1, 'asc' => 1);
-		if(!isset($orderType[$args->order_type])) $args->order_type = 'asc';
+		if (!isset($orderType[$args->order_type])) $args->order_type = 'asc';
 
 		// If that came across mid module_srl instead of a direct module_srl guhaejum
-		if($searchOpt->mid)
+		if ($searchOpt->mid)
 		{
 			$oModuleModel = getModel('module');
 			$args->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
@@ -1345,30 +1345,30 @@ 
 		}
 
 		// Module_srl passed the array may be a check whether the array
-		if(is_array($searchOpt->module_srl)) $args->module_srl = implode(',', $searchOpt->module_srl);
+		if (is_array($searchOpt->module_srl)) $args->module_srl = implode(',', $searchOpt->module_srl);
 		else $args->module_srl = $searchOpt->module_srl;
 
 		// Except for the test module_srl
-		if(is_array($searchOpt->exclude_module_srl)) $args->exclude_module_srl = implode(',', $searchOpt->exclude_module_srl);
+		if (is_array($searchOpt->exclude_module_srl)) $args->exclude_module_srl = implode(',', $searchOpt->exclude_module_srl);
 		else $args->exclude_module_srl = $searchOpt->exclude_module_srl;
 
 		// only admin document list, temp document showing
-		if($searchOpt->statusList) $args->statusList = $searchOpt->statusList;
+		if ($searchOpt->statusList) $args->statusList = $searchOpt->statusList;
 		else
 		{
-			if($logged_info->is_admin == 'Y' && !$searchOpt->module_srl)
+			if ($logged_info->is_admin == 'Y' && !$searchOpt->module_srl)
 				$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'), $this->getConfigStatus('temp'));
 			else
 				$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'));
 		}
 
 		// Category is selected, further sub-categories until all conditions
-		if($args->category_srl)
+		if ($args->category_srl)
 		{
 			$category_list = $this->getCategoryList($args->module_srl);
 			$category_info = $category_list[$args->category_srl];
 			$category_info->childs[] = $args->category_srl;
-			$args->category_srl = implode(',',$category_info->childs);
+			$args->category_srl = implode(',', $category_info->childs);
 		}
 
 		// Used to specify the default query id (based on several search options to query id modified)
@@ -1381,24 +1381,24 @@ 
 		$search_target = $searchOpt->search_target;
 		$search_keyword = $searchOpt->search_keyword;
 
-		if($search_target && $search_keyword)
+		if ($search_target && $search_keyword)
 		{
-			switch($search_target)
+			switch ($search_target)
 			{
 				case 'title' :
 				case 'content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->{"s_".$search_target} = $search_keyword;
 					$use_division = true;
 					break;
 				case 'title_content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_title = $search_keyword;
 					$args->s_content = $search_keyword;
 					$use_division = true;
 					break;
 				case 'user_id' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_user_id = $search_keyword;
 					$args->sort_index = 'documents.'.$args->sort_index;
 					break;
@@ -1406,18 +1406,18 @@ 
 				case 'nick_name' :
 				case 'email_address' :
 				case 'homepage' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->{"s_".$search_target} = $search_keyword;
 					break;
 				case 'is_notice' :
-					if($search_keyword=='N') $args->{"s_".$search_target} = 'N';
-					elseif($search_keyword=='Y') $args->{"s_".$search_target} = 'Y';
+					if ($search_keyword == 'N') $args->{"s_".$search_target} = 'N';
+					elseif ($search_keyword == 'Y') $args->{"s_".$search_target} = 'Y';
 					else $args->{"s_".$search_target} = '';
 					break;
 				case 'is_secret' :
-					if($search_keyword=='N') $args->statusList = array($this->getConfigStatus('public'));
-					elseif($search_keyword=='Y') $args->statusList = array($this->getConfigStatus('secret'));
-					elseif($search_keyword=='temp') $args->statusList = array($this->getConfigStatus('temp'));
+					if ($search_keyword == 'N') $args->statusList = array($this->getConfigStatus('public'));
+					elseif ($search_keyword == 'Y') $args->statusList = array($this->getConfigStatus('secret'));
+					elseif ($search_keyword == 'temp') $args->statusList = array($this->getConfigStatus('temp'));
 					break;
 				case 'member_srl' :
 				case 'readed_count' :
@@ -1425,10 +1425,10 @@ 
 				case 'comment_count' :
 				case 'trackback_count' :
 				case 'uploaded_count' :
-					$args->{"s_".$search_target} = (int)$search_keyword;
+					$args->{"s_".$search_target} = (int) $search_keyword;
 					break;
 				case 'blamed_count' :
-					$args->{"s_".$search_target} = (int)$search_keyword * -1;
+					$args->{"s_".$search_target} = (int) $search_keyword * -1;
 					break;
 				case 'regdate' :
 				case 'last_update' :
@@ -1441,7 +1441,7 @@ 
 					$use_division = true;
 					break;
 				case 'tag' :
-					$args->s_tags = str_replace(' ','%',$search_keyword);
+					$args->s_tags = str_replace(' ', '%', $search_keyword);
 					$query_id = 'document.getDocumentListWithinTag';
 					break;
 				case 'extra_vars':
@@ -1449,9 +1449,9 @@ 
 					$query_id = 'document.getDocumentListWithinExtraVars';
 					break;
 				default :
-					if(strpos($search_target,'extra_vars')!==false) {
+					if (strpos($search_target, 'extra_vars') !== false) {
 						$args->var_idx = substr($search_target, strlen('extra_vars'));
-						$args->var_value = str_replace(' ','%',$search_keyword);
+						$args->var_value = str_replace(' ', '%', $search_keyword);
 						$args->sort_index = 'documents.'.$args->sort_index;
 						$query_id = 'document.getDocumentListWithExtraVars';
 					}
@@ -1468,18 +1468,18 @@ 
 			/**
 			 * list_order asc sort of division that can be used only when
 			 */
-			if($args->sort_index != 'list_order' || $args->order_type != 'asc') $use_division = false;
+			if ($args->sort_index != 'list_order' || $args->order_type != 'asc') $use_division = false;
 
 			/**
 			 * If it is true, use_division changed to use the document division
 			 */
-			if($use_division)
+			if ($use_division)
 			{
 				// Division begins
-				$division = (int)Context::get('division');
+				$division = (int) Context::get('division');
 
 				// order by list_order and (module_srl===0 or module_srl may count), therefore case table full scan
-				if($args->sort_index == 'list_order' && ($args->exclude_module_srl === '0' || count(explode(',', $args->module_srl)) > 5))
+				if ($args->sort_index == 'list_order' && ($args->exclude_module_srl === '0' || count(explode(',', $args->module_srl)) > 5))
 				{
 					$listSqlID = 'document.getDocumentListUseIndex';
 					$divisionSqlID = 'document.getDocumentDivisionUseIndex';
@@ -1491,7 +1491,7 @@ 
 				}
 
 				// If you do not value the best division top
-				if(!$division)
+				if (!$division)
 				{
 					$division_args = new stdClass();
 					$division_args->module_srl = $args->module_srl;
@@ -1502,7 +1502,7 @@ 
 					$division_args->statusList = $args->statusList;
 
 					$output = executeQuery($divisionSqlID, $division_args, array('list_order'));
-					if($output->data)
+					if ($output->data)
 					{
 						$item = array_pop($output->data);
 						$division = $item->list_order;
@@ -1511,10 +1511,10 @@ 
 				}
 
 				// The last division
-				$last_division = (int)Context::get('last_division');
+				$last_division = (int) Context::get('last_division');
 
 				// Division after division from the 5000 value of the specified Wanted
-				if(!$last_division)
+				if (!$last_division)
 				{
 					$last_division_args = new stdClass();
 					$last_division_args->module_srl = $args->module_srl;
@@ -1526,7 +1526,7 @@ 
 					$last_division_args->page = 5001;
 
 					$output = executeQuery($divisionSqlID, $last_division_args, array('list_order'));
-					if($output->data)
+					if ($output->data)
 					{
 						$item = array_pop($output->data);
 						$last_division = $item->list_order;
@@ -1534,14 +1534,14 @@ 
 				}
 
 				// Make sure that after last_division article
-				if($last_division)
+				if ($last_division)
 				{
 					$last_division_args = new stdClass();
 					$last_division_args->module_srl = $args->module_srl;
 					$last_division_args->exclude_module_srl = $args->exclude_module_srl;
 					$last_division_args->list_order = $last_division;
 					$output = executeQuery('document.getDocumentDivisionCount', $last_division_args);
-					if($output->data->count<1) $last_division = null;
+					if ($output->data->count < 1) $last_division = null;
 				}
 
 				$args->division = $division;
@@ -1574,7 +1574,7 @@ 
 	 * @param int $count
 	 * @return object
 	 */
-	function getDocumentListByMemberSrl($member_srl, $columnList = array(), $page = 0, $is_admin = FALSE, $count = 0 )
+	function getDocumentListByMemberSrl($member_srl, $columnList = array(), $page = 0, $is_admin = FALSE, $count = 0)
 	{
 		$args = new stdClass();
 		$args->member_srl = $member_srl;
@@ -1582,8 +1582,8 @@ 
 		$output = executeQuery('document.getDocumentListByMemberSrl', $args, $columnList);
 		$document_list = $output->data;
 
-		if(!$document_list) return array();
-		if(!is_array($document_list)) $document_list = array($document_list);
+		if (!$document_list) return array();
+		if (!is_array($document_list)) $document_list = array($document_list);
 
 		return $document_list;
 	}
@@ -1595,7 +1595,7 @@ 
 	function getDocumentExtraImagePath()
 	{
 		$documentConfig = getModel('document')->getDocumentConfig();
-		if(Mobile::isFromMobilePhone())
+		if (Mobile::isFromMobilePhone())
 		{
 			$iconSkin = $documentConfig->micons;
 		}
@@ -1603,7 +1603,7 @@ 
 		{
 			$iconSkin = $documentConfig->icons;
 		}
-		$path = sprintf('%s%s',getUrl(), "modules/document/tpl/icons/$iconSkin/");
+		$path = sprintf('%s%s', getUrl(), "modules/document/tpl/icons/$iconSkin/");
 
 		return $path;
 	}

Braces +300 added lines, -139 removed lines

@@ -58,18 +58,24 @@ 
 		$_document_list = &$GLOBALS['XE_DOCUMENT_LIST'];
 
 		// XE XE_DOCUMENT_LIST all documents that the object referred to the global variable settings
-		if(count($_document_list) <= 0) return;
+		if(count($_document_list) <= 0) {
+			return;
+		}
 
 		// Find all called the document object variable has been set extension
 		$document_srls = array();
 		foreach($_document_list as $key => $val)
 		{
-			if(!$val->document_srl || $checked_documents[$val->document_srl]) continue;
+			if(!$val->document_srl || $checked_documents[$val->document_srl]) {
+				continue;
+			}
 			$checked_documents[$val->document_srl] = true;
 			$document_srls[] = $val->document_srl;
 		}
 		// If the document number, return detected
-		if(!count($document_srls)) return;
+		if(!count($document_srls)) {
+			return;
+		}
 		// Expand variables mijijeongdoen article about a current visitor to the extension of the language code, the search variable
 		//$obj->document_srl = implode(',',$document_srls);
 		$output = $this->getDocumentExtraVarsFromDB($document_srls);
@@ -77,8 +83,12 @@ 
 		{
 			foreach($output->data as $key => $val)
 			{
-				if(!isset($val->value)) continue;
-				if(!$extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0]) $extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0] = trim($val->value);
+				if(!isset($val->value)) {
+					continue;
+				}
+				if(!$extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0]) {
+					$extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0] = trim($val->value);
+				}
 				$extra_vars[$val->document_srl][$val->var_idx][$val->lang_code] = trim($val->value);
 			}
 		}
@@ -89,7 +99,9 @@ 
 			$document_srl = $document_srls[$i];
 			unset($vars);
 
-			if(!$_document_list[$document_srl] || !is_object($_document_list[$document_srl]) || !$_document_list[$document_srl]->isExists()) continue;
+			if(!$_document_list[$document_srl] || !is_object($_document_list[$document_srl]) || !$_document_list[$document_srl]->isExists()) {
+				continue;
+			}
 			$module_srl = $_document_list[$document_srl]->get('module_srl');
 			$extra_keys = $this->getExtraKeys($module_srl);
 			$vars = $extra_vars[$document_srl];
@@ -101,10 +113,15 @@ 
 				{
 					$extra_keys[$idx] = clone($key);
 					$val = $vars[$idx];
-					if(isset($val[$user_lang_code])) $v = $val[$user_lang_code];
-					else if(isset($val[$document_lang_code])) $v = $val[$document_lang_code];
-					else if(isset($val[0])) $v = $val[0];
-					else $v = null;
+					if(isset($val[$user_lang_code])) {
+						$v = $val[$user_lang_code];
+					} else if(isset($val[$document_lang_code])) {
+						$v = $val[$document_lang_code];
+					} else if(isset($val[0])) {
+						$v = $val[0];
+					} else {
+						$v = null;
+					}
 					$extra_keys[$idx]->value = $v;
 				}
 			}
@@ -113,9 +130,13 @@ 
 			$evars = new ExtraVar($module_srl);
 			$evars->setExtraVarKeys($extra_keys);
 			// Title Processing
-			if($vars[-1][$user_lang_code]) $_document_list[$document_srl]->add('title',$vars[-1][$user_lang_code]);
+			if($vars[-1][$user_lang_code]) {
+				$_document_list[$document_srl]->add('title',$vars[-1][$user_lang_code]);
+			}
 			// Information processing
-			if($vars[-2][$user_lang_code]) $_document_list[$document_srl]->add('content',$vars[-2][$user_lang_code]);
+			if($vars[-2][$user_lang_code]) {
+				$_document_list[$document_srl]->add('content',$vars[-2][$user_lang_code]);
+			}
 
 			if($vars[-1][$user_lang_code] || $vars[-2][$user_lang_code])
 			{
@@ -136,15 +157,21 @@ 
 	 */
 	function getDocument($document_srl=0, $is_admin = false, $load_extra_vars=true, $columnList = array())
 	{
-		if(!$document_srl) return new documentItem();
+		if(!$document_srl) {
+			return new documentItem();
+		}
 
 		if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 		{
 			$oDocument = new documentItem($document_srl, $load_extra_vars, $columnList);
 			$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
-			if($load_extra_vars) $this->setToAllDocumentExtraVars();
+			if($load_extra_vars) {
+				$this->setToAllDocumentExtraVars();
+			}
+		}
+		if($is_admin) {
+			$GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->setGrant();
 		}
-		if($is_admin) $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->setGrant();
 
 		return $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
 	}
@@ -163,8 +190,7 @@ 
 		{
 			$list_count = count($document_srls);
 			$document_srls = implode(',',$document_srls);
-		}
-		else
+		} else
 		{
 			$list_count = 1;
 		}
@@ -175,28 +201,38 @@ 
 
 		$output = executeQuery('document.getDocuments', $args, $columnList);
 		$document_list = $output->data;
-		if(!$document_list) return;
-		if(!is_array($document_list)) $document_list = array($document_list);
+		if(!$document_list) {
+			return;
+		}
+		if(!is_array($document_list)) {
+			$document_list = array($document_list);
+		}
 
 		$document_count = count($document_list);
 		foreach($document_list as $key => $attribute)
 		{
 			$document_srl = $attribute->document_srl;
-			if(!$document_srl) continue;
+			if(!$document_srl) {
+				continue;
+			}
 
 			if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 			{
 				$oDocument = null;
 				$oDocument = new documentItem();
 				$oDocument->setAttribute($attribute, false);
-				if($is_admin) $oDocument->setGrant();
+				if($is_admin) {
+					$oDocument->setGrant();
+				}
 				$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
 			}
 
 			$result[$attribute->document_srl] = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
 		}
 
-		if($load_extra_vars) $this->setToAllDocumentExtraVars();
+		if($load_extra_vars) {
+			$this->setToAllDocumentExtraVars();
+		}
 
 		$output = null;
 		if(count($result))
@@ -244,18 +280,15 @@ 
 		{
 			$output = $obj->use_alternate_output;
 			unset($obj->use_alternate_output);
-		}
-		elseif ($sort_check->isExtraVars && substr_count($obj->search_target,'extra_vars'))
+		} elseif ($sort_check->isExtraVars && substr_count($obj->search_target,'extra_vars'))
 		{
 			$query_id = 'document.getDocumentListWithinExtraVarsExtraSort';
 			$args->sort_index = str_replace('documents.','',$args->sort_index);
 			$output = executeQueryArray($query_id, $args);
-		}
-		elseif ($sort_check->isExtraVars)
+		} elseif ($sort_check->isExtraVars)
 		{
 			$output = executeQueryArray($query_id, $args);
-		}
-		else
+		} else
 		{
 			// document.getDocumentList query execution
 			// Query_id if you have a group by clause getDocumentListWithinTag getDocumentListWithinComment or used again to perform the query because
@@ -265,11 +298,15 @@ 
 				$group_args = clone($args);
 				$group_args->sort_index = 'documents.'.$args->sort_index;
 				$output = executeQueryArray($query_id, $group_args);
-				if(!$output->toBool()||!count($output->data)) return $output;
+				if(!$output->toBool()||!count($output->data)) {
+					return $output;
+				}
 
 				foreach($output->data as $key => $val)
 				{
-					if($val->document_srl) $target_srls[] = $val->document_srl;
+					if($val->document_srl) {
+						$target_srls[] = $val->document_srl;
+					}
 				}
 
 				$page_navigation = $output->page_navigation;
@@ -287,14 +324,15 @@ 
 				$output->total_count = $page_navigation->total_count;
 				$output->total_page = $page_navigation->total_page;
 				$output->page = $page_navigation->cur_page;
-			}
-			else
+			} else
 			{
 				$output = executeQueryArray($query_id, $args, $columnList);
 			}
 		}
 		// Return if no result or an error occurs
-		if(!$output->toBool()||!count($output->data)) return $output;
+		if(!$output->toBool()||!count($output->data)) {
+			return $output;
+		}
 		$idx = 0;
 		$data = $output->data;
 		unset($output->data);
@@ -309,20 +347,26 @@ 
 		{
 			foreach($data as $key => $attribute)
 			{
-				if($attribute->is_notice == 'Y') $virtual_number --;
+				if($attribute->is_notice == 'Y') {
+					$virtual_number --;
+				}
 			}
 		}
 
 		foreach($data as $key => $attribute)
 		{
-			if($except_notice && $attribute->is_notice == 'Y') continue;
+			if($except_notice && $attribute->is_notice == 'Y') {
+				continue;
+			}
 			$document_srl = $attribute->document_srl;
 			if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 			{
 				$oDocument = null;
 				$oDocument = new documentItem();
 				$oDocument->setAttribute($attribute, false);
-				if($is_admin) $oDocument->setGrant();
+				if($is_admin) {
+					$oDocument->setGrant();
+				}
 				$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
 			}
 
@@ -330,7 +374,9 @@ 
 			$virtual_number--;
 		}
 
-		if($load_extra_vars) $this->setToAllDocumentExtraVars();
+		if($load_extra_vars) {
+			$this->setToAllDocumentExtraVars();
+		}
 
 		if(count($output->data))
 		{
@@ -358,12 +404,16 @@ 
 		$args->module_srl = $obj->module_srl;
 		$args->category_srl= $obj->category_srl;
 		$output = executeQueryArray('document.getNoticeList', $args, $columnList);
-		if(!$output->toBool()||!$output->data) return;
+		if(!$output->toBool()||!$output->data) {
+			return;
+		}
 
 		foreach($output->data as $key => $val)
 		{
 			$document_srl = $val->document_srl;
-			if(!$document_srl) continue;
+			if(!$document_srl) {
+				continue;
+			}
 
 			if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl])
 			{
@@ -459,7 +509,9 @@ 
 
 				$oExtraVar->setExtraVarKeys($output->data);
 				$keys = $oExtraVar->getExtraVars();
-				if(!$keys) $keys = array();
+				if(!$keys) {
+					$keys = array();
+				}
 
 				if($oCacheHandler->isSupport())
 				{
@@ -489,7 +541,9 @@ 
 			$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
 			$this->setToAllDocumentExtraVars();
 		}
-		if(is_array($GLOBALS['XE_EXTRA_VARS'][$document_srl])) ksort($GLOBALS['XE_EXTRA_VARS'][$document_srl]);
+		if(is_array($GLOBALS['XE_EXTRA_VARS'][$document_srl])) {
+			ksort($GLOBALS['XE_EXTRA_VARS'][$document_srl]);
+		}
 		return $GLOBALS['XE_EXTRA_VARS'][$document_srl];
 	}
 
@@ -519,7 +573,9 @@ 
 			$oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList);
 			$module_srl = $oDocument->get('module_srl');
 			$member_srl = $oDocument->get('member_srl');
-			if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
+			if(!$module_srl) {
+				return new BaseObject(-1, 'msg_invalid_request');
+			}
 
 			$oModuleModel = getModel('module');
 			$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
@@ -592,7 +648,9 @@ 
 	 */
 	function getDocumentCount($module_srl, $search_obj = NULL)
 	{
-		if(is_null($search_obj)) $search_obj = new stdClass();
+		if(is_null($search_obj)) {
+			$search_obj = new stdClass();
+		}
 		$search_obj->module_srl = $module_srl;
 
 		$output = executeQuery('document.getDocumentCount', $search_obj);
@@ -609,7 +667,9 @@ 
 	function getDocumentCountByGroupStatus($search_obj = NULL)
 	{
 		$output = executeQuery('document.getDocumentCountByGroupStatus', $search_obj);
-		if(!$output->toBool()) return array();
+		if(!$output->toBool()) {
+			return array();
+		}
 
 		return $output->data;
 	}
@@ -648,34 +708,29 @@ 
 		if($sort_check->isExtraVars)
 		{
 			return 1;
-		}
-		else
+		} else
 		{
 			if($sort_check->sort_index === 'list_order' || $sort_check->sort_index === 'update_order')
 			{
 				if($args->order_type === 'desc')
 				{
 					$args->{'rev_' . $sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
-				}
-				else
+				} else
 				{
 					$args->{$sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
 				}
-			}
-			elseif($sort_check->sort_index === 'regdate')
+			} elseif($sort_check->sort_index === 'regdate')
 			{
 
 				if($args->order_type === 'asc')
 				{
 					$args->{'rev_' . $sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
-				}
-				else
+				} else
 				{
 					$args->{$sort_check->sort_index} = $oDocument->get($sort_check->sort_index);
 				}
 
-			}
-			else
+			} else
 			{
 				return 1;
 			}
@@ -701,15 +756,16 @@ 
 		$output = executeQuery('document.getCategory', $args, $columnList);
 
 		$node = $output->data;
-		if(!$node) return;
+		if(!$node) {
+			return;
+		}
 
 		if($node->group_srls)
 		{
 			$group_srls = explode(',',$node->group_srls);
 			unset($node->group_srls);
 			$node->group_srls = $group_srls;
-		}
-		else
+		} else
 		{
 			unset($node->group_srls);
 			$node->group_srls = array();
@@ -727,7 +783,9 @@ 
 		$args = new stdClass();
 		$args->category_srl = $category_srl;
 		$output = executeQuery('document.getChildCategoryCount',$args);
-		if($output->data->count > 0) return true;
+		if($output->data->count > 0) {
+			return true;
+		}
 		return false;
 	}
 
@@ -746,7 +804,9 @@ 
 		if(!file_exists($filename))
 		{
 			$oDocumentController = getController('document');
-			if(!$oDocumentController->makeCategoryFile($module_srl)) return array();
+			if(!$oDocumentController->makeCategoryFile($module_srl)) {
+				return array();
+			}
 		}
 
 		include($filename);
@@ -766,7 +826,9 @@ 
 	 */
 	function _arrangeCategory(&$document_category, $list, $depth)
 	{
-		if(!count($list)) return;
+		if(!count($list)) {
+			return;
+		}
 		$idx = 0;
 		$list_order = array();
 		foreach($list as $key => $val)
@@ -786,8 +848,11 @@ 
 			$obj->childs = array();
 			$obj->grant = $val['grant'];
 
-			if(Context::get('mid') == $obj->mid && Context::get('category') == $obj->category_srl) $selected = true;
-			else $selected = false;
+			if(Context::get('mid') == $obj->mid && Context::get('category') == $obj->category_srl) {
+				$selected = true;
+			} else {
+				$selected = false;
+			}
 
 			$obj->selected = $selected;
 
@@ -798,14 +863,18 @@ 
 				$parent_srl = $obj->parent_srl;
 				$document_count = $obj->document_count;
 				$expand = $obj->expand;
-				if($selected) $expand = true;
+				if($selected) {
+					$expand = true;
+				}
 
 				while($parent_srl)
 				{
 					$document_category[$parent_srl]->document_count += $document_count;
 					$document_category[$parent_srl]->childs[] = $obj->category_srl;
 					$document_category[$parent_srl]->child_count = count($document_category[$parent_srl]->childs);
-					if($expand) $document_category[$parent_srl]->expand = $expand;
+					if($expand) {
+						$document_category[$parent_srl]->expand = $expand;
+					}
 
 					$parent_srl = $document_category[$parent_srl]->parent_srl;
 				}
@@ -813,7 +882,9 @@ 
 
 			$document_category[$key] = $obj;
 
-			if(count($val['list'])) $this->_arrangeCategory($document_category, $val['list'], $depth+1);
+			if(count($val['list'])) {
+				$this->_arrangeCategory($document_category, $val['list'], $depth+1);
+			}
 		}
 		$document_category[$list_order[0]]->first = true;
 		$document_category[$list_order[count($list_order)-1]]->last = true;
@@ -881,13 +952,20 @@ 
 		}
 		// Module_srl passed the array may be a check whether the array
 		$args = new stdClass;
-		if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
-		else $args->module_srl = $obj->module_srl;
+		if(is_array($obj->module_srl)) {
+			$args->module_srl = implode(',', $obj->module_srl);
+		} else {
+			$args->module_srl = $obj->module_srl;
+		}
 
 		$output = executeQuery('document.getMonthlyArchivedList', $args);
-		if(!$output->toBool()||!$output->data) return $output;
+		if(!$output->toBool()||!$output->data) {
+			return $output;
+		}
 
-		if(!is_array($output->data)) $output->data = array($output->data);
+		if(!is_array($output->data)) {
+			$output->data = array($output->data);
+		}
 
 		return $output;
 	}
@@ -907,14 +985,21 @@ 
 		}
 		// Module_srl passed the array may be a check whether the array
 		$args = new stdClass;
-		if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
-		else $args->module_srl = $obj->module_srl;
+		if(is_array($obj->module_srl)) {
+			$args->module_srl = implode(',', $obj->module_srl);
+		} else {
+			$args->module_srl = $obj->module_srl;
+		}
 		$args->regdate = $obj->regdate;
 
 		$output = executeQuery('document.getDailyArchivedList', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
-		if(!is_array($output->data)) $output->data = array($output->data);
+		if(!is_array($output->data)) {
+			$output->data = array($output->data);
+		}
 
 		return $output;
 	}
@@ -925,7 +1010,9 @@ 
 	 */
 	function getDocumentCategories()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 		$module_srl = Context::get('module_srl');
 		$categories= $this->getCategoryList($module_srl);
 		$lang = Context::get('lang');
@@ -1020,7 +1107,9 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
 		// Check permissions
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
-		if(!$grant->manager) return new BaseObject(-1,'msg_not_permitted');
+		if(!$grant->manager) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 
 		$category_srl = Context::get('category_srl');
 		$category_info = $this->getCategory($category_srl);
@@ -1040,15 +1129,20 @@ 
 	 */
 	function getDocumentSrlByAlias($mid, $alias)
 	{
-		if(!$mid || !$alias) return null;
+		if(!$mid || !$alias) {
+			return null;
+		}
 		$site_module_info = Context::get('site_module_info');
 		$args = new stdClass;
 		$args->mid = $mid;
 		$args->alias_title = $alias;
 		$args->site_srl = $site_module_info->site_srl;
 		$output = executeQuery('document.getDocumentSrlByAlias', $args);
-		if(!$output->data) return null;
-		else return $output->data->document_srl;
+		if(!$output->data) {
+			return null;
+		} else {
+			return $output->data->document_srl;
+		}
 	}
 
 	/**
@@ -1059,15 +1153,20 @@ 
 	 */
 	function getDocumentSrlByTitle($module_srl, $title)
 	{
-		if(!$module_srl || !$title) return null;
+		if(!$module_srl || !$title) {
+			return null;
+		}
 		$args = new stdClass;
 		$args->module_srl = $module_srl;
 		$args->title = $title;
 		$output = executeQuery('document.getDocumentSrlByTitle', $args);
-		if(!$output->data) return null;
-		else
+		if(!$output->data) {
+			return null;
+		} else
 		{
-			if(is_array($output->data)) return $output->data[0]->document_srl;
+			if(is_array($output->data)) {
+				return $output->data[0]->document_srl;
+			}
 			return $output->data->document_srl;
 		}
 	}
@@ -1079,13 +1178,18 @@ 
 	 */
 	function getAlias($document_srl)
 	{
-		if(!$document_srl) return null;
+		if(!$document_srl) {
+			return null;
+		}
 		$args = new stdClass;
 		$args->document_srl = $document_srl;
 		$output = executeQueryArray('document.getAliases', $args);
 
-		if(!$output->data) return null;
-		else return $output->data[0]->alias_title;
+		if(!$output->data) {
+			return null;
+		} else {
+			return $output->data[0]->alias_title;
+		}
 	}
 
 	/**
@@ -1142,17 +1246,23 @@ 
 			{
 				case 'title' :
 				case 'content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->{"s_".$search_target} = $search_keyword;
 					$use_division = true;
 					break;
 				case 'title_content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_title = $search_keyword;
 					$args->s_content = $search_keyword;
 					break;
 				case 'user_id' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_user_id = $search_keyword;
 					$args->sort_index = 'documents.'.$args->sort_index;
 					break;
@@ -1160,13 +1270,18 @@ 
 				case 'nick_name' :
 				case 'email_address' :
 				case 'homepage' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->{"s_".$search_target} = $search_keyword;
 					break;
 				case 'is_notice' :
 				case 'is_secret' :
-					if($search_keyword=='N') $args->statusList = array($this->getConfigStatus('public'));
-					elseif($search_keyword=='Y') $args->statusList = array($this->getConfigStatus('secret'));
+					if($search_keyword=='N') {
+						$args->statusList = array($this->getConfigStatus('public'));
+					} elseif($search_keyword=='Y') {
+						$args->statusList = array($this->getConfigStatus('secret'));
+					}
 					break;
 				case 'member_srl' :
 				case 'readed_count' :
@@ -1208,34 +1323,45 @@ 
 	{
 		$args = new stdClass;
 		$document_srl = Context::get('document_srl');
-		if(!$document_srl) return new BaseObject(-1,'msg_invalid_request');
+		if(!$document_srl) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$point = Context::get('point');
-		if($point != -1) $point = 1;
+		if($point != -1) {
+			$point = 1;
+		}
 
 		$oDocumentModel = getModel('document');
 		$columnList = array('document_srl', 'module_srl');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList);
 		$module_srl = $oDocument->get('module_srl');
-		if(!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$module_srl) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$oModuleModel = getModel('module');
 		$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
 		if($point == -1)
 		{
-			if($document_config->use_vote_down!='S') return new BaseObject(-1, 'msg_invalid_request');
+			if($document_config->use_vote_down!='S') {
+				return new BaseObject(-1, 'msg_invalid_request');
+			}
 			$args->below_point = 0;
-		}
-		else
+		} else
 		{
-			if($document_config->use_vote_up!='S') return new BaseObject(-1, 'msg_invalid_request');
+			if($document_config->use_vote_up!='S') {
+				return new BaseObject(-1, 'msg_invalid_request');
+			}
 			$args->more_point = 0;
 		}
 
 		$args->document_srl = $document_srl;
 
 		$output = executeQueryArray('document.getVotedMemberList',$args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$oMemberModel = getModel('member');
 		if($output->data)
@@ -1257,9 +1383,11 @@ 
 	function getStatusNameList()
 	{
 		global $lang;
-		if(!isset($lang->status_name_list))
-			return array_flip($this->getStatusList());
-		else return $lang->status_name_list;
+		if(!isset($lang->status_name_list)) {
+					return array_flip($this->getStatusList());
+		} else {
+			return $lang->status_name_list;
+		}
 	}
 
 	/**
@@ -1283,20 +1411,22 @@ 
 				if (!$extra_output->data || !$extra_output->toBool())
 				{
 					$sortIndex = 'list_order';
-				}
-				else
+				} else
 				{
 					$check_array = array();
 					foreach($extra_output->data as $val)
 					{
 						$check_array[] = $val->eid;
 					}
-					if(!in_array($sortIndex, $check_array)) $sortIndex = 'list_order';
-					else $isExtraVars = true;
+					if(!in_array($sortIndex, $check_array)) {
+						$sortIndex = 'list_order';
+					} else {
+						$isExtraVars = true;
+					}
 				}
+			} else {
+							$sortIndex = 'list_order';
 			}
-			else
-				$sortIndex = 'list_order';
 		}
 		$returnObj = new stdClass();
 		$returnObj->sort_index = $sortIndex;
@@ -1334,7 +1464,9 @@ 
 
 		// Check the target and sequence alignment
 		$orderType = array('desc' => 1, 'asc' => 1);
-		if(!isset($orderType[$args->order_type])) $args->order_type = 'asc';
+		if(!isset($orderType[$args->order_type])) {
+			$args->order_type = 'asc';
+		}
 
 		// If that came across mid module_srl instead of a direct module_srl guhaejum
 		if($searchOpt->mid)
@@ -1345,21 +1477,29 @@ 
 		}
 
 		// Module_srl passed the array may be a check whether the array
-		if(is_array($searchOpt->module_srl)) $args->module_srl = implode(',', $searchOpt->module_srl);
-		else $args->module_srl = $searchOpt->module_srl;
+		if(is_array($searchOpt->module_srl)) {
+			$args->module_srl = implode(',', $searchOpt->module_srl);
+		} else {
+			$args->module_srl = $searchOpt->module_srl;
+		}
 
 		// Except for the test module_srl
-		if(is_array($searchOpt->exclude_module_srl)) $args->exclude_module_srl = implode(',', $searchOpt->exclude_module_srl);
-		else $args->exclude_module_srl = $searchOpt->exclude_module_srl;
+		if(is_array($searchOpt->exclude_module_srl)) {
+			$args->exclude_module_srl = implode(',', $searchOpt->exclude_module_srl);
+		} else {
+			$args->exclude_module_srl = $searchOpt->exclude_module_srl;
+		}
 
 		// only admin document list, temp document showing
-		if($searchOpt->statusList) $args->statusList = $searchOpt->statusList;
-		else
+		if($searchOpt->statusList) {
+			$args->statusList = $searchOpt->statusList;
+		} else
 		{
-			if($logged_info->is_admin == 'Y' && !$searchOpt->module_srl)
-				$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'), $this->getConfigStatus('temp'));
-			else
-				$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'));
+			if($logged_info->is_admin == 'Y' && !$searchOpt->module_srl) {
+							$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'), $this->getConfigStatus('temp'));
+			} else {
+							$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'));
+			}
 		}
 
 		// Category is selected, further sub-categories until all conditions
@@ -1387,18 +1527,24 @@ 
 			{
 				case 'title' :
 				case 'content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->{"s_".$search_target} = $search_keyword;
 					$use_division = true;
 					break;
 				case 'title_content' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_title = $search_keyword;
 					$args->s_content = $search_keyword;
 					$use_division = true;
 					break;
 				case 'user_id' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_user_id = $search_keyword;
 					$args->sort_index = 'documents.'.$args->sort_index;
 					break;
@@ -1406,18 +1552,28 @@ 
 				case 'nick_name' :
 				case 'email_address' :
 				case 'homepage' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->{"s_".$search_target} = $search_keyword;
 					break;
 				case 'is_notice' :
-					if($search_keyword=='N') $args->{"s_".$search_target} = 'N';
-					elseif($search_keyword=='Y') $args->{"s_".$search_target} = 'Y';
-					else $args->{"s_".$search_target} = '';
+					if($search_keyword=='N') {
+						$args->{"s_".$search_target} = 'N';
+					} elseif($search_keyword=='Y') {
+						$args->{"s_".$search_target} = 'Y';
+					} else {
+						$args->{"s_".$search_target} = '';
+					}
 					break;
 				case 'is_secret' :
-					if($search_keyword=='N') $args->statusList = array($this->getConfigStatus('public'));
-					elseif($search_keyword=='Y') $args->statusList = array($this->getConfigStatus('secret'));
-					elseif($search_keyword=='temp') $args->statusList = array($this->getConfigStatus('temp'));
+					if($search_keyword=='N') {
+						$args->statusList = array($this->getConfigStatus('public'));
+					} elseif($search_keyword=='Y') {
+						$args->statusList = array($this->getConfigStatus('secret'));
+					} elseif($search_keyword=='temp') {
+						$args->statusList = array($this->getConfigStatus('temp'));
+					}
 					break;
 				case 'member_srl' :
 				case 'readed_count' :
@@ -1462,13 +1618,14 @@ 
 		if ($searchOpt->isExtraVars)
 		{
 			$query_id = 'document.getDocumentListExtraSort';
-		}
-		else
+		} else
 		{
 			/**
 			 * list_order asc sort of division that can be used only when
 			 */
-			if($args->sort_index != 'list_order' || $args->order_type != 'asc') $use_division = false;
+			if($args->sort_index != 'list_order' || $args->order_type != 'asc') {
+				$use_division = false;
+			}
 
 			/**
 			 * If it is true, use_division changed to use the document division
@@ -1483,8 +1640,7 @@ 
 				{
 					$listSqlID = 'document.getDocumentListUseIndex';
 					$divisionSqlID = 'document.getDocumentDivisionUseIndex';
-				}
-				else
+				} else
 				{
 					$listSqlID = 'document.getDocumentList';
 					$divisionSqlID = 'document.getDocumentDivision';
@@ -1541,7 +1697,9 @@ 
 					$last_division_args->exclude_module_srl = $args->exclude_module_srl;
 					$last_division_args->list_order = $last_division;
 					$output = executeQuery('document.getDocumentDivisionCount', $last_division_args);
-					if($output->data->count<1) $last_division = null;
+					if($output->data->count<1) {
+						$last_division = null;
+					}
 				}
 
 				$args->division = $division;
@@ -1582,8 +1740,12 @@ 
 		$output = executeQuery('document.getDocumentListByMemberSrl', $args, $columnList);
 		$document_list = $output->data;
 
-		if(!$document_list) return array();
-		if(!is_array($document_list)) $document_list = array($document_list);
+		if(!$document_list) {
+			return array();
+		}
+		if(!is_array($document_list)) {
+			$document_list = array($document_list);
+		}
 
 		return $document_list;
 	}
@@ -1598,8 +1760,7 @@ 
 		if(Mobile::isFromMobilePhone())
 		{
 			$iconSkin = $documentConfig->micons;
-		}
-		else
+		} else
 		{
 			$iconSkin = $documentConfig->icons;
 		}

modules/document/document.view.php

Doc Comments +2 added lines, -2 removed lines

@@ -52,7 +52,7 @@ 
 
 	/**
 	 * Preview
-	 * @return void
+	 * @return BaseObject|null
 	 */
 	function dispDocumentPreview()
 	{
@@ -155,7 +155,7 @@ 
 
 	/**
 	 * Document temp saved list
-	 * @return void
+	 * @return ModuleObject|null
 	 */
 	function dispTempSavedList()
 	{

Spacing +22 added lines, -22 removed lines

@@ -36,16 +36,16 @@ 
 		$oDocumentModel = getModel('document');
 		// Creates an object for displaying the selected document
 		$oDocument = $oDocumentModel->getDocument($document_srl, $this->grant->manager);
-		if(!$oDocument->isExists()) return new BaseObject(-1,'msg_invalid_request');
+		if (!$oDocument->isExists()) return new BaseObject(-1, 'msg_invalid_request');
 		// Check permissions
-		if(!$oDocument->isAccessible()) return new BaseObject(-1,'msg_not_permitted');
+		if (!$oDocument->isAccessible()) return new BaseObject(-1, 'msg_not_permitted');
 		// Information setting module
 		//Context::set('module_info', $module_info);	//module_info not use in UI
 		// Browser title settings
 		Context::setBrowserTitle($oDocument->getTitleText());
 		Context::set('oDocument', $oDocument);
 
-		Context::set('layout','none');
+		Context::set('layout', 'none');
 		$this->setTemplatePath($this->module_path.'tpl');
 		$this->setTemplateFile('print_page');
 	}
@@ -56,12 +56,12 @@ 
 	 */
 	function dispDocumentPreview()
 	{
-		if(!checkCSRF())
+		if (!checkCSRF())
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		} 
 
-		if(Context::get('logged_info')->is_admin != 'Y')
+		if (Context::get('logged_info')->is_admin != 'Y')
 		{
 			Context::set('content', removeHackTag(Context::get('content')));
 		}
@@ -78,19 +78,19 @@ 
 	 */
 	function dispDocumentManageDocument()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
 		// Taken from a list of selected sessions
 		$flag_list = $_SESSION['document_management'];
-		if(count($flag_list))
+		if (count($flag_list))
 		{
-			foreach($flag_list as $key => $val)
+			foreach ($flag_list as $key => $val)
 			{
-				if(!is_bool($val)) continue;
+				if (!is_bool($val)) continue;
 				$document_srl_list[] = $key;
 			}
 		}
 
-		if(count($document_srl_list))
+		if (count($document_srl_list))
 		{
 			$oDocumentModel = getModel('document');
 			$document_list = $oDocumentModel->getDocuments($document_srl_list, $this->grant->is_admin);
@@ -99,13 +99,13 @@ 
 
 		$oModuleModel = getModel('module');
 		// The combination of module categories list and the list of modules
-		if(count($module_list)>1) Context::set('module_list', $module_categories);
+		if (count($module_list) > 1) Context::set('module_list', $module_categories);
 
-		$module_srl=Context::get('module_srl');
-		Context::set('module_srl',$module_srl);
+		$module_srl = Context::get('module_srl');
+		Context::set('module_srl', $module_srl);
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-		Context::set('mid',$module_info->mid);
-		Context::set('browser_title',$module_info->browser_title);
+		Context::set('mid', $module_info->mid);
+		Context::set('browser_title', $module_info->browser_title);
 
 		// Select Pop-up layout
 		$this->setLayoutPath('./common/tpl');
@@ -126,24 +126,24 @@ 
 		$current_module_srl = Context::get('module_srl');
 		$current_module_srls = Context::get('module_srls');
 
-		if(!$current_module_srl && !$current_module_srls)
+		if (!$current_module_srl && !$current_module_srls)
 		{
 			// Get information of the current module
 			$current_module_info = Context::get('current_module_info');
 			$current_module_srl = $current_module_info->module_srl;
-			if(!$current_module_srl) return new BaseObject();
+			if (!$current_module_srl) return new BaseObject();
 		}
 
 		$oModuleModel = getModel('module');
-		if($current_module_srl)
+		if ($current_module_srl)
 		{
 			$document_config = $oModuleModel->getModulePartConfig('document', $current_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';
 		Context::set('document_config', $document_config);
 
 		$oTemplate = &TemplateHandler::getInstance();
@@ -163,13 +163,13 @@ 
 
 		$oMemberModel = getModel('member');
 		// A message appears if the user is not logged-in
-		if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
+		if (!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
 		// Get the saved document (module_srl is set to member_srl instead)
 		$logged_info = Context::get('logged_info');
 		$args = new stdClass();
 		$args->member_srl = $logged_info->member_srl;
 		$args->statusList = array($this->getConfigStatus('temp'));
-		$args->page = (int)Context::get('page');
+		$args->page = (int) Context::get('page');
 		$args->list_count = 10;
 
 		$oDocumentModel = getModel('document');

Braces +24 added lines, -8 removed lines

@@ -36,9 +36,13 @@ 
 		$oDocumentModel = getModel('document');
 		// Creates an object for displaying the selected document
 		$oDocument = $oDocumentModel->getDocument($document_srl, $this->grant->manager);
-		if(!$oDocument->isExists()) return new BaseObject(-1,'msg_invalid_request');
+		if(!$oDocument->isExists()) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 		// Check permissions
-		if(!$oDocument->isAccessible()) return new BaseObject(-1,'msg_not_permitted');
+		if(!$oDocument->isAccessible()) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 		// Information setting module
 		//Context::set('module_info', $module_info);	//module_info not use in UI
 		// Browser title settings
@@ -78,14 +82,18 @@ 
 	 */
 	function dispDocumentManageDocument()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 		// Taken from a list of selected sessions
 		$flag_list = $_SESSION['document_management'];
 		if(count($flag_list))
 		{
 			foreach($flag_list as $key => $val)
 			{
-				if(!is_bool($val)) continue;
+				if(!is_bool($val)) {
+					continue;
+				}
 				$document_srl_list[] = $key;
 			}
 		}
@@ -99,7 +107,9 @@ 
 
 		$oModuleModel = getModel('module');
 		// The combination of module categories list and the list of modules
-		if(count($module_list)>1) Context::set('module_list', $module_categories);
+		if(count($module_list)>1) {
+			Context::set('module_list', $module_categories);
+		}
 
 		$module_srl=Context::get('module_srl');
 		Context::set('module_srl',$module_srl);
@@ -131,7 +141,9 @@ 
 			// Get information of the current module
 			$current_module_info = Context::get('current_module_info');
 			$current_module_srl = $current_module_info->module_srl;
-			if(!$current_module_srl) return new BaseObject();
+			if(!$current_module_srl) {
+				return new BaseObject();
+			}
 		}
 
 		$oModuleModel = getModel('module');
@@ -143,7 +155,9 @@ 
 		{
 			$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';
+		}
 		Context::set('document_config', $document_config);
 
 		$oTemplate = &TemplateHandler::getInstance();
@@ -163,7 +177,9 @@ 
 
 		$oMemberModel = getModel('member');
 		// A message appears if the user is not logged-in
-		if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
+		if(!$oMemberModel->isLogged()) {
+			return $this->stop('msg_not_logged');
+		}
 		// Get the saved document (module_srl is set to member_srl instead)
 		$logged_info = Context::get('logged_info');
 		$args = new stdClass();

modules/file/file.admin.controller.php

Doc Comments +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
 	/**
 	 * Delete selected files from the administrator page
 	 *
-	 * @return BaseObject
+	 * @return ModuleObject|null
 	 */
 	function procFileAdminDeleteChecked()
 	{
@@ -110,7 +110,7 @@ 
 	/**
 	 * Add file information for each module
 	 *
-	 * @return void
+	 * @return BaseObject|null
 	 */
 	function procFileAdminInsertModuleConfig()
 	{

Spacing +24 added lines, -24 removed lines

@@ -26,29 +26,29 @@ 
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 		$columnList = array('file_srl', 'uploaded_filename');
-		$output = executeQueryArray('file.getModuleFiles',$args, $columnList);
-		if(!$output) return $output;
+		$output = executeQueryArray('file.getModuleFiles', $args, $columnList);
+		if (!$output) return $output;
 		$files = $output->data;
 		// Remove from the DB
 		$args->module_srl = $module_srl;
 		$output = executeQuery('file.deleteModuleFiles', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Remove the file
-		FileHandler::removeDir( sprintf("./files/attach/images/%s/", $module_srl) ) ;
-		FileHandler::removeDir( sprintf("./files/attach/binaries/%s/", $module_srl) );
+		FileHandler::removeDir(sprintf("./files/attach/images/%s/", $module_srl));
+		FileHandler::removeDir(sprintf("./files/attach/binaries/%s/", $module_srl));
 		// Remove the file list obtained from the DB
 		$path = array();
 		$cnt = count($files);
-		for($i=0;$i<$cnt;$i++)
+		for ($i = 0; $i < $cnt; $i++)
 		{
 			$uploaded_filename = $files[$i]->uploaded_filename;
 			FileHandler::removeFile($uploaded_filename);
 
 			$path_info = pathinfo($uploaded_filename);
-			if(!in_array($path_info['dirname'], $path)) $path[] = $path_info['dirname'];
+			if (!in_array($path_info['dirname'], $path)) $path[] = $path_info['dirname'];
 		}
 		// Remove a file directory of the document
-		for($i=0;$i<count($path);$i++) FileHandler::removeBlankDir($path[$i]);
+		for ($i = 0; $i < count($path); $i++) FileHandler::removeBlankDir($path[$i]);
 
 		return $output;
 	}
@@ -62,23 +62,23 @@ 
 	{
 		// An error appears if no document is selected
 		$cart = Context::get('cart');
-		if(!$cart) return $this->stop('msg_file_cart_is_null');
-		if(!is_array($cart)) $file_srl_list= explode('|@|', $cart);
+		if (!$cart) return $this->stop('msg_file_cart_is_null');
+		if (!is_array($cart)) $file_srl_list = explode('|@|', $cart);
 		else $file_srl_list = $cart;
 		$file_count = count($file_srl_list);
-		if(!$file_count) return $this->stop('msg_file_cart_is_null');
+		if (!$file_count) return $this->stop('msg_file_cart_is_null');
 
 		$oFileController = getController('file');
 		// Delete the post
-		for($i=0;$i<$file_count;$i++)
+		for ($i = 0; $i < $file_count; $i++)
 		{
 			$file_srl = trim($file_srl_list[$i]);
-			if(!$file_srl) continue;
+			if (!$file_srl) continue;
 
 			$oFileController->deleteFile($file_srl);
 		}
 
-		$this->setMessage( sprintf(Context::getLang('msg_checked_file_is_deleted'), $file_count) );
+		$this->setMessage(sprintf(Context::getLang('msg_checked_file_is_deleted'), $file_count));
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispFileAdminList');
 		$this->setRedirectUrl($returnUrl);
@@ -101,7 +101,7 @@ 
 		$config->allow_outlink_site = Context::get('allow_outlink_site');
 		// Create module Controller object
 		$oModuleController = getController('module');
-		$output = $oModuleController->insertModuleConfig('file',$config);
+		$output = $oModuleController->insertModuleConfig('file', $config);
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispFileAdminConfig');
 		return $this->setRedirectUrl($returnUrl, $output);
@@ -117,7 +117,7 @@ 
 		// Get variables
 		$module_srl = Context::get('target_module_srl');
 		// In order to configure multiple modules at once
-		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);
 
 		$download_grant = Context::get('download_grant');
@@ -130,7 +130,7 @@ 
 		$file_config->allowed_attach_size = Context::get('allowed_attach_size');
 		$file_config->allowed_filetypes = str_replace(' ', '', Context::get('allowed_filetypes'));
 
-		if(!is_array($download_grant)) $file_config->download_grant = explode('|@|',$download_grant);
+		if (!is_array($download_grant)) $file_config->download_grant = explode('|@|', $download_grant);
 		else $file_config->download_grant = $download_grant;
 
 		//관리자가 허용한 첨부파일의 사이즈가 php.ini의 값보다 큰지 확인하기 - by ovclas
@@ -140,15 +140,15 @@ 
 		$iniUploadMaxSize = FileHandler::returnbytes(ini_get('upload_max_filesize'));
 		$iniMinSzie = min($iniPostMaxSize, $iniUploadMaxSize);
 
-		if($userFileAllowSize > $iniMinSzie || $userAttachAllowSize > $iniMinSzie)
+		if ($userFileAllowSize > $iniMinSzie || $userAttachAllowSize > $iniMinSzie)
 			return new BaseObject(-1, 'input size over than config in php.ini');
 
 		$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;
-			$oModuleController->insertModulePartConfig('file',$srl,$file_config);
+			if (!$srl) continue;
+			$oModuleController->insertModulePartConfig('file', $srl, $file_config);
 		}
 
 		$this->setError(-1);
@@ -165,16 +165,16 @@ 
 	 */
 	function procFileAdminAddCart()
 	{
-		$file_srl = (int)Context::get('file_srl');
+		$file_srl = (int) Context::get('file_srl');
 		//$fileSrlList = array(500, 502);
 
 		$oFileModel = getModel('file');
 		$output = $oFileModel->getFile($file_srl);
 		//$output = $oFileModel->getFile($fileSrlList);
 
-		if($output->file_srl)
+		if ($output->file_srl)
 		{
-			if($_SESSION['file_management'][$output->file_srl]) unset($_SESSION['file_management'][$output->file_srl]);
+			if ($_SESSION['file_management'][$output->file_srl]) unset($_SESSION['file_management'][$output->file_srl]);
 			else $_SESSION['file_management'][$output->file_srl] = true;
 		}
 	}

Braces +47 added lines, -18 removed lines

@@ -27,12 +27,16 @@ 
 		$args->module_srl = $module_srl;
 		$columnList = array('file_srl', 'uploaded_filename');
 		$output = executeQueryArray('file.getModuleFiles',$args, $columnList);
-		if(!$output) return $output;
+		if(!$output) {
+			return $output;
+		}
 		$files = $output->data;
 		// Remove from the DB
 		$args->module_srl = $module_srl;
 		$output = executeQuery('file.deleteModuleFiles', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Remove the file
 		FileHandler::removeDir( sprintf("./files/attach/images/%s/", $module_srl) ) ;
 		FileHandler::removeDir( sprintf("./files/attach/binaries/%s/", $module_srl) );
@@ -45,10 +49,14 @@ 
 			FileHandler::removeFile($uploaded_filename);
 
 			$path_info = pathinfo($uploaded_filename);
-			if(!in_array($path_info['dirname'], $path)) $path[] = $path_info['dirname'];
+			if(!in_array($path_info['dirname'], $path)) {
+				$path[] = $path_info['dirname'];
+			}
 		}
 		// Remove a file directory of the document
-		for($i=0;$i<count($path);$i++) FileHandler::removeBlankDir($path[$i]);
+		for($i=0;$i<count($path);$i++) {
+			FileHandler::removeBlankDir($path[$i]);
+		}
 
 		return $output;
 	}
@@ -62,18 +70,27 @@ 
 	{
 		// An error appears if no document is selected
 		$cart = Context::get('cart');
-		if(!$cart) return $this->stop('msg_file_cart_is_null');
-		if(!is_array($cart)) $file_srl_list= explode('|@|', $cart);
-		else $file_srl_list = $cart;
+		if(!$cart) {
+			return $this->stop('msg_file_cart_is_null');
+		}
+		if(!is_array($cart)) {
+			$file_srl_list= explode('|@|', $cart);
+		} else {
+			$file_srl_list = $cart;
+		}
 		$file_count = count($file_srl_list);
-		if(!$file_count) return $this->stop('msg_file_cart_is_null');
+		if(!$file_count) {
+			return $this->stop('msg_file_cart_is_null');
+		}
 
 		$oFileController = getController('file');
 		// Delete the post
 		for($i=0;$i<$file_count;$i++)
 		{
 			$file_srl = trim($file_srl_list[$i]);
-			if(!$file_srl) continue;
+			if(!$file_srl) {
+				continue;
+			}
 
 			$oFileController->deleteFile($file_srl);
 		}
@@ -117,8 +134,11 @@ 
 		// Get variables
 		$module_srl = Context::get('target_module_srl');
 		// In order to configure multiple modules at once
-		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);
+		}
 
 		$download_grant = Context::get('download_grant');
 
@@ -130,8 +150,11 @@ 
 		$file_config->allowed_attach_size = Context::get('allowed_attach_size');
 		$file_config->allowed_filetypes = str_replace(' ', '', Context::get('allowed_filetypes'));
 
-		if(!is_array($download_grant)) $file_config->download_grant = explode('|@|',$download_grant);
-		else $file_config->download_grant = $download_grant;
+		if(!is_array($download_grant)) {
+			$file_config->download_grant = explode('|@|',$download_grant);
+		} else {
+			$file_config->download_grant = $download_grant;
+		}
 
 		//관리자가 허용한 첨부파일의 사이즈가 php.ini의 값보다 큰지 확인하기 - by ovclas
 		$userFileAllowSize = FileHandler::returnbytes($file_config->allowed_filesize.'M');
@@ -140,14 +163,17 @@ 
 		$iniUploadMaxSize = FileHandler::returnbytes(ini_get('upload_max_filesize'));
 		$iniMinSzie = min($iniPostMaxSize, $iniUploadMaxSize);
 
-		if($userFileAllowSize > $iniMinSzie || $userAttachAllowSize > $iniMinSzie)
-			return new BaseObject(-1, 'input size over than config in php.ini');
+		if($userFileAllowSize > $iniMinSzie || $userAttachAllowSize > $iniMinSzie) {
+					return new BaseObject(-1, 'input size over than config in php.ini');
+		}
 
 		$oModuleController = getController('module');
 		for($i=0;$i<count($module_srl);$i++)
 		{
 			$srl = trim($module_srl[$i]);
-			if(!$srl) continue;
+			if(!$srl) {
+				continue;
+			}
 			$oModuleController->insertModulePartConfig('file',$srl,$file_config);
 		}
 
@@ -174,8 +200,11 @@ 
 
 		if($output->file_srl)
 		{
-			if($_SESSION['file_management'][$output->file_srl]) unset($_SESSION['file_management'][$output->file_srl]);
-			else $_SESSION['file_management'][$output->file_srl] = true;
+			if($_SESSION['file_management'][$output->file_srl]) {
+				unset($_SESSION['file_management'][$output->file_srl]);
+			} else {
+				$_SESSION['file_management'][$output->file_srl] = true;
+			}
 		}
 	}
 }

modules/file/file.model.php

Doc Comments +4 added lines, -4 removed lines

@@ -20,7 +20,7 @@ 
 	 * It is used when a file list of the upload_target_srl is requested for creating/updating a document.
 	 * Attempt to replace with sever-side session if upload_target_srl is not yet determined
 	 *
-	 * @return void
+	 * @return BaseObject|null
 	 */
 	function getFileList()
 	{
@@ -146,7 +146,7 @@ 
 	 * Get file configurations
 	 *
 	 * @param int $module_srl If set this, returns specific module's configuration. Otherwise returns global configuration.
-	 * @return object Returns configuration.
+	 * @return stdClass Returns configuration.
 	 */
 	function getFileConfig($module_srl = null)
 	{
@@ -276,7 +276,7 @@ 
 	/**
 	 * Return configurations of the attachement (it automatically checks if an administrator is)
 	 *
-	 * @return object Returns a file configuration of current module. If user is admin, returns PHP's max file size and allow all file types.
+	 * @return stdClass Returns a file configuration of current module. If user is admin, returns PHP's max file size and allow all file types.
 	 */
 	function getUploadConfig()
 	{
@@ -330,7 +330,7 @@ 
 	 * Return file configuration of the module
 	 *
 	 * @param int $module_srl The sequence of module to get configuration
-	 * @return object
+	 * @return stdClass
 	 */
 	function getFileModuleConfig($module_srl)
 	{

Spacing +55 added lines, -55 removed lines

@@ -29,9 +29,9 @@ 
 		$mid = Context::get('mid');
 		$editor_sequence = Context::get('editor_sequence');
 		$upload_target_srl = Context::get('upload_target_srl');
-		if(!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		if (!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
 
-		if($upload_target_srl)
+		if ($upload_target_srl)
 		{
 			$oDocumentModel = getModel('document');
 			$oCommentModel = getModel('comment');
@@ -40,10 +40,10 @@ 
 			$oDocument = $oDocumentModel->getDocument($upload_target_srl);
 
 			// comment 권한 확인
-			if(!$oDocument->isExists())
+			if (!$oDocument->isExists())
 			{
 				$oComment = $oCommentModel->getComment($upload_target_srl);
-				if($oComment->isExists() && $oComment->isSecret() && !$oComment->isGranted())
+				if ($oComment->isExists() && $oComment->isSecret() && !$oComment->isGranted())
 				{
 					return new BaseObject(-1, 'msg_not_permitted');
 				}
@@ -52,34 +52,34 @@ 
 			}
 
 			// document 권한 확인
-			if($oDocument->isExists() && $oDocument->isSecret() && !$oDocument->isGranted())
+			if ($oDocument->isExists() && $oDocument->isSecret() && !$oDocument->isGranted())
 			{
 				return new BaseObject(-1, 'msg_not_permitted');
 			}
 
 			// 모듈 권한 확인
-			if($oDocument->isExists())
+			if ($oDocument->isExists())
 			{
 				$grant = $oModuleModel->getGrant($oModuleModel->getModuleInfoByModuleSrl($oDocument->get('module_srl')), $logged_info);
-				if(!$grant->access)
+				if (!$grant->access)
 				{
 					return new BaseObject(-1, 'msg_not_permitted');
 				}
 			}
 
 			$tmp_files = $this->getFiles($upload_target_srl);
-			if(!$tmp_files) $tmp_files = array();
+			if (!$tmp_files) $tmp_files = array();
 
-			foreach($tmp_files as $file_info)
+			foreach ($tmp_files as $file_info)
 			{
-				if(!$file_info->file_srl) continue;
+				if (!$file_info->file_srl) continue;
 
 				$obj = new stdClass;
 				$obj->file_srl = $file_info->file_srl;
 				$obj->source_filename = $file_info->source_filename;
 				$obj->file_size = $file_info->file_size;
 				$obj->disp_file_size = FileHandler::filesize($file_info->file_size);
-				if($file_info->direct_download=='N') $obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid, $file_info->module_srl);
+				if ($file_info->direct_download == 'N') $obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid, $file_info->module_srl);
 				else $obj->download_url = str_replace('./', '', $file_info->uploaded_filename);
 				$obj->direct_download = $file_info->direct_download;
 				$obj->cover_image = ($file_info->cover_image === 'Y') ? true : false;
@@ -99,17 +99,17 @@ 
 		//$config = $oModuleModel->getModuleInfoByMid($mid);	//perhaps config varialbles not used
 
 		$file_config = $this->getUploadConfig();
-		$left_size = $file_config->allowed_attach_size*1024*1024 - $attached_size;
+		$left_size = $file_config->allowed_attach_size * 1024 * 1024 - $attached_size;
 		// Settings of required information
 		$attached_size = FileHandler::filesize($attached_size);
-		$allowed_attach_size = FileHandler::filesize($file_config->allowed_attach_size*1024*1024);
-		$allowed_filesize = FileHandler::filesize($file_config->allowed_filesize*1024*1024);
+		$allowed_attach_size = FileHandler::filesize($file_config->allowed_attach_size * 1024 * 1024);
+		$allowed_filesize = FileHandler::filesize($file_config->allowed_filesize * 1024 * 1024);
 		$allowed_filetypes = $file_config->allowed_filetypes;
-		$this->add("files",$files);
-		$this->add("editor_sequence",$editor_sequence);
-		$this->add("upload_target_srl",$upload_target_srl);
-		$this->add("upload_status",$upload_status);
-		$this->add("left_size",$left_size);
+		$this->add("files", $files);
+		$this->add("editor_sequence", $editor_sequence);
+		$this->add("upload_target_srl", $upload_target_srl);
+		$this->add("upload_status", $upload_status);
+		$this->add("left_size", $left_size);
 		$this->add('attached_size', $attached_size);
 		$this->add('allowed_attach_size', $allowed_attach_size);
 		$this->add('allowed_filesize', $allowed_filesize);
@@ -127,7 +127,7 @@ 
 		$args = new stdClass();
 		$args->upload_target_srl = $upload_target_srl;
 		$output = executeQuery('file.getFilesCount', $args);
-		return (int)$output->data->count;
+		return (int) $output->data->count;
 	}
 
 	/**
@@ -137,7 +137,7 @@ 
 	 * @param string $sid
 	 * @return string Returns a url
 	 */
-	function getDownloadUrl($file_srl, $sid, $module_srl="")
+	function getDownloadUrl($file_srl, $sid, $module_srl = "")
 	{
 		return sprintf('?module=%s&act=%s&file_srl=%s&sid=%s&module_srl=%s', 'file', 'procFileDownload', $file_srl, $sid, $module_srl);
 	}
@@ -155,12 +155,12 @@ 
 
 		$file_module_config = $oModuleModel->getModuleConfig('file');
 
-		if($module_srl) $file_config = $oModuleModel->getModulePartConfig('file',$module_srl);
-		if(!$file_config) $file_config = $file_module_config;
+		if ($module_srl) $file_config = $oModuleModel->getModulePartConfig('file', $module_srl);
+		if (!$file_config) $file_config = $file_module_config;
 
 		$config = new stdClass();
 
-		if($file_config)
+		if ($file_config)
 		{
 			$config->allowed_filesize = $file_config->allowed_filesize;
 			$config->allowed_attach_size = $file_config->allowed_attach_size;
@@ -171,31 +171,31 @@ 
 			$config->allow_outlink_format = $file_config->allow_outlink_format;
 		}
 		// Property for all files comes first than each property
-		if(!$config->allowed_filesize) $config->allowed_filesize = $file_module_config->allowed_filesize;
-		if(!$config->allowed_attach_size) $config->allowed_attach_size = $file_module_config->allowed_attach_size;
-		if(!$config->allowed_filetypes) $config->allowed_filetypes = $file_module_config->allowed_filetypes;
-		if(!$config->allow_outlink) $config->allow_outlink = $file_module_config->allow_outlink;
-		if(!$config->allow_outlink_site) $config->allow_outlink_site = $file_module_config->allow_outlink_site;
-		if(!$config->allow_outlink_format) $config->allow_outlink_format = $file_module_config->allow_outlink_format;
-		if(!$config->download_grant) $config->download_grant = $file_module_config->download_grant;
+		if (!$config->allowed_filesize) $config->allowed_filesize = $file_module_config->allowed_filesize;
+		if (!$config->allowed_attach_size) $config->allowed_attach_size = $file_module_config->allowed_attach_size;
+		if (!$config->allowed_filetypes) $config->allowed_filetypes = $file_module_config->allowed_filetypes;
+		if (!$config->allow_outlink) $config->allow_outlink = $file_module_config->allow_outlink;
+		if (!$config->allow_outlink_site) $config->allow_outlink_site = $file_module_config->allow_outlink_site;
+		if (!$config->allow_outlink_format) $config->allow_outlink_format = $file_module_config->allow_outlink_format;
+		if (!$config->download_grant) $config->download_grant = $file_module_config->download_grant;
 		// Default setting if not exists
-		if(!$config->allowed_filesize) $config->allowed_filesize = '2';
-		if(!$config->allowed_attach_size) $config->allowed_attach_size = '3';
-		if(!$config->allowed_filetypes) $config->allowed_filetypes = '*.*';
-		if(!$config->allow_outlink) $config->allow_outlink = 'Y';
-		if(!$config->download_grant) $config->download_grant = array();
+		if (!$config->allowed_filesize) $config->allowed_filesize = '2';
+		if (!$config->allowed_attach_size) $config->allowed_attach_size = '3';
+		if (!$config->allowed_filetypes) $config->allowed_filetypes = '*.*';
+		if (!$config->allow_outlink) $config->allow_outlink = 'Y';
+		if (!$config->download_grant) $config->download_grant = array();
 
 		$size = ini_get('upload_max_filesize');
 		$unit = strtolower($size[strlen($size) - 1]);
-		$size = (float)$size;
-		if($unit == 'g') $size *= 1024;
-		if($unit == 'k') $size /= 1024;
+		$size = (float) $size;
+		if ($unit == 'g') $size *= 1024;
+		if ($unit == 'k') $size /= 1024;
 
-		if($config->allowed_filesize > $size) 
+		if ($config->allowed_filesize > $size) 
 		{	
 			$config->allowed_filesize = $size;
 		}
-		if($config->allowed_attach_size > $size) 
+		if ($config->allowed_attach_size > $size) 
 		{
 			$config->allowed_attach_size = $size;
 		}
@@ -215,10 +215,10 @@ 
 		$args = new stdClass();
 		$args->file_srl = $file_srl;
 		$output = executeQueryArray('file.getFile', $args, $columnList);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// old version compatibility
-		if(count($output->data) == 1)
+		if (count($output->data) == 1)
 		{
 			$file = $output->data[0];
 			$file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl);
@@ -229,9 +229,9 @@ 
 		{
 			$fileList = array();
 
-			if(is_array($output->data))
+			if (is_array($output->data))
 			{
-				foreach($output->data as $key=>$value)
+				foreach ($output->data as $key=>$value)
 				{
 					$file = $value;
 					$file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid, $file->module_srl);
@@ -255,13 +255,13 @@ 
 		$args = new stdClass();
 		$args->upload_target_srl = $upload_target_srl;
 		$args->sort_index = $sortIndex;
-		if($ckValid) $args->isvalid = 'Y';
+		if ($ckValid) $args->isvalid = 'Y';
 		$output = executeQueryArray('file.getFiles', $args, $columnList);
-		if(!$output->data) return;
+		if (!$output->data) return;
 
 		$file_list = $output->data;
 
-		if($file_list && !is_array($file_list)) $file_list = array($file_list);
+		if ($file_list && !is_array($file_list)) $file_list = array($file_list);
 
 		foreach ($file_list as &$file)
 		{
@@ -284,14 +284,14 @@ 
 
 		$module_srl = Context::get('module_srl');
 		// Get the current module if module_srl doesn't exist
-		if(!$module_srl)
+		if (!$module_srl)
 		{
 			$current_module_info = Context::get('current_module_info');
 			$module_srl = $current_module_info->module_srl;
 		}
 		$file_config = $this->getFileConfig($module_srl);
 
-		if($logged_info->is_admin == 'Y')
+		if ($logged_info->is_admin == 'Y')
 		{
 			$iniPostMaxSize = FileHandler::returnbytes(ini_get('post_max_size'));
 			$iniUploadMaxSize = FileHandler::returnbytes(ini_get('upload_max_filesize'));
@@ -317,9 +317,9 @@ 
 			'%s : %s/ %s<br /> %s : %s (%s : %s)',
 			Context::getLang('allowed_attach_size'),
 			FileHandler::filesize($attached_size),
-			FileHandler::filesize($file_config->allowed_attach_size*1024*1024),
+			FileHandler::filesize($file_config->allowed_attach_size * 1024 * 1024),
 			Context::getLang('allowed_filesize'),
-			FileHandler::filesize($file_config->allowed_filesize*1024*1024),
+			FileHandler::filesize($file_config->allowed_filesize * 1024 * 1024),
 			Context::getLang('allowed_filetypes'),
 			$file_config->allowed_filetypes
 		);
@@ -346,9 +346,9 @@ 
 	 */
 	function getFileGrant($file_info, $member_info)
 	{
-		if(!$file_info) return null;
+		if (!$file_info) return null;
 
-		if($_SESSION['__XE_UPLOADING_FILES_INFO__'][$file_info->file_srl])
+		if ($_SESSION['__XE_UPLOADING_FILES_INFO__'][$file_info->file_srl])
 		{
 			$file_grant->is_deletable = true;
 			return $file_grant;
@@ -359,7 +359,7 @@ 
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($file_info->upload_target_srl);
-		if($oDocument->isExists()) $document_grant = $oDocument->isGranted();
+		if ($oDocument->isExists()) $document_grant = $oDocument->isGranted();
 
 		$file_grant->is_deletable = ($document_grant || $member_info->is_admin == 'Y' || $member_info->member_srl == $file_info->member_srl || $grant->manager);
 

modules/importer/importer.admin.controller.php

Doc Comments +1 added lines, -1 removed lines

@@ -276,7 +276,7 @@
 
 	/**
 	 * Migrate data after completing xml file extraction
-	 * @return void
+	 * @return BaseObject|null
 	 */
 	function procImporterAdminImport()
 	{

Spacing +217 added lines, -217 removed lines

@@ -43,19 +43,19 @@ 
 		$filename = Context::get('filename');
 		$isExists = 'false';
 
-		if(strncasecmp('http://', $filename, 7) === 0)
+		if (strncasecmp('http://', $filename, 7) === 0)
 		{
-			if(ini_get('allow_url_fopen'))
+			if (ini_get('allow_url_fopen'))
 			{
 				$fp = @fopen($filename, "r");
-				if($fp)
+				if ($fp)
 				{
 					$str = fgets($fp, 100);
-					if(strlen($str) > 0)
+					if (strlen($str) > 0)
 					{
 						$isExists = 'true';
 						$type = 'XML';
-						if(stristr($str, 'tattertools')) $type = 'TTXML';
+						if (stristr($str, 'tattertools')) $type = 'TTXML';
 
 						$this->add('type', $type);
 					}
@@ -72,16 +72,16 @@ 
 		{
 			$realPath = FileHandler::getRealPath($filename);
 
-			if(file_exists($realPath) && is_file($realPath)) $isExists = 'true';
+			if (file_exists($realPath) && is_file($realPath)) $isExists = 'true';
 			$this->add('exists', $isExists);
 
-			if($isExists == 'true')
+			if ($isExists == 'true')
 			{
 				$type = 'XML';
 
 				$fp = fopen($realPath, "r");
 				$str = fgets($fp, 100);
-				if(stristr($str, 'tattertools')) $type = 'TTXML';
+				if (stristr($str, 'tattertools')) $type = 'TTXML';
 				fclose($fp);
 
 				$this->add('type', $type);
@@ -107,16 +107,16 @@ 
 
 		/* DBMS가 CUBRID인 경우 MySQL과 동일한 방법으로는 문서 및 댓글에 대한 사용자 정보를 동기화 할 수 없으므로 예외 처리 합니다.
 		   CUBRID를 사용하지 않는 경우에만 보편적인 기존 질의문을 사용합니다. */
-		$db_info = Context::getDBInfo ();
-		if($db_info->db_type != "cubrid")
+		$db_info = Context::getDBInfo();
+		if ($db_info->db_type != "cubrid")
 		{
 			$output = executeQuery('importer.updateDocumentSync'.$postFix);
 			$output = executeQuery('importer.updateCommentSync'.$postFix);
 		}
 		else
 		{
-			$output = executeQueryArray ('importer.getDocumentMemberSrlWithUserID'.$postFix);
-			if(is_array ($output->data) && count ($output->data))
+			$output = executeQueryArray('importer.getDocumentMemberSrlWithUserID'.$postFix);
+			if (is_array($output->data) && count($output->data))
 			{
 				$success_count = 0;
 				$error_count = 0;
@@ -125,8 +125,8 @@ 
 				{
 					$args->user_id = $val->user_id;
 					$args->member_srl = $val->member_srl;
-					$tmp = executeQuery ('importer.updateDocumentSyncForCUBRID'.$postFix, $args);
-					if($tmp->toBool () === true)
+					$tmp = executeQuery('importer.updateDocumentSyncForCUBRID'.$postFix, $args);
+					if ($tmp->toBool() === true)
 					{
 						$success_count++;
 					}
@@ -138,8 +138,8 @@ 
 				}
 			} // documents section
 
-			$output = executeQueryArray ('importer.getCommentMemberSrlWithUserID'.$postFix);
-			if(is_array ($output->data) && count ($output->data))
+			$output = executeQueryArray('importer.getCommentMemberSrlWithUserID'.$postFix);
+			if (is_array($output->data) && count($output->data))
 			{
 				$success_count = 0;
 				$error_count = 0;
@@ -148,8 +148,8 @@ 
 				{
 					$args->user_id = $val->user_id;
 					$args->member_srl = $val->member_srl;
-					$tmp = executeQuery ('importer.updateCommentSyncForCUBRID'.$postFix, $args);
-					if($tmp->toBool () === true)
+					$tmp = executeQuery('importer.updateCommentSyncForCUBRID'.$postFix, $args);
+					if ($tmp->toBool() === true)
 					{
 						$success_count++;
 					}
@@ -178,15 +178,15 @@ 
 		// Extract and cache information from the xml file
 		$oExtract = new extract();
 
-		switch($type)
+		switch ($type)
 		{
 			case 'member' :
-				$output = $oExtract->set($xml_file,'<members ', '</members>', '<member>', '</member>');
-				if($output->toBool()) $oExtract->saveItems();
+				$output = $oExtract->set($xml_file, '<members ', '</members>', '<member>', '</member>');
+				if ($output->toBool()) $oExtract->saveItems();
 				break;
 			case 'message' :
-				$output = $oExtract->set($xml_file,'<messages ', '</messages>', '<message>','</message>');
-				if($output->toBool()) $oExtract->saveItems();
+				$output = $oExtract->set($xml_file, '<messages ', '</messages>', '<message>', '</message>');
+				if ($output->toBool()) $oExtract->saveItems();
 				break;
 			case 'ttxml' :
 				// Category information
@@ -199,12 +199,12 @@ 
 					while (!feof($oExtract->fd))
 					{
 						$str = fgets($oExtract->fd, 1024);
-						if(strstr($str, '<category>'))
+						if (strstr($str, '<category>'))
 						{
 							$started = true;
 							$str = strstr($str, '<category>');
 						}
-						if(substr($str,0,strlen('<post ')) == '<post ') break;
+						if (substr($str, 0, strlen('<post ')) == '<post ') break;
 						if ($started) $buff .= $str;
 					}
 					$buff = '<categories>'.$buff.'</categories>';
@@ -214,22 +214,22 @@ 
 
 					// Guestbook information
 					$output = $oExtract->set($xml_file, '', '', '', '');
-					if($output->toBool())
+					if ($output->toBool())
 					{
 						$started = false;
 						$buff = '';
 						while (!feof($oExtract->fd))
 						{
 							$str = fgets($oExtract->fd, 1024);
-							if(strstr($str, '<guestbook>'))
+							if (strstr($str, '<guestbook>'))
 							{
 								$started = true;
 								$str = strstr($str, '<guestbook>');
 							}
-							if($started)
+							if ($started)
 							{
 								$pos = strpos($str, '</guestbook>');
-								if($pos !== false)
+								if ($pos !== false)
 								{
 									$buff .= substr($str, 0, $pos + strlen('</guestbook>'));
 									break;
@@ -241,37 +241,37 @@ 
 						$guestbook_filename = sprintf('%s/%s', $oExtract->cache_path, 'guestbook.xml');
 						FileHandler::writeFile($guestbook_filename, $buff);
 						// Individual items
-						$output = $oExtract->set($xml_file,'<blog', '</blog>', '<post ', '</post>');
-						if($output->toBool()) $oExtract->saveItems();
+						$output = $oExtract->set($xml_file, '<blog', '</blog>', '<post ', '</post>');
+						if ($output->toBool()) $oExtract->saveItems();
 					}
 				}
 				break;
 			default :
 				// First get category information
-				$output = $oExtract->set($xml_file,'<categories>', '</categories>', '<category','</category>');
-				if($output->toBool())
+				$output = $oExtract->set($xml_file, '<categories>', '</categories>', '<category', '</category>');
+				if ($output->toBool())
 				{
 					$oExtract->mergeItems('category.xml');
 					// Get each item
-					$output = $oExtract->set($xml_file,'<posts ', '</posts>', '<post>', '</post>');
-					if($output->toBool()) $oExtract->saveItems();
+					$output = $oExtract->set($xml_file, '<posts ', '</posts>', '<post>', '</post>');
+					if ($output->toBool()) $oExtract->saveItems();
 				}
 				break;
 		}
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
-			$this->add('error',0);
-			$this->add('status',-1);
+			$this->add('error', 0);
+			$this->add('status', -1);
 			$this->setMessage($output->getMessage());
 			return;
 		}
 		// Notify that all data completely extracted
-		$this->add('type',$type);
-		$this->add('total',$oExtract->getTotalCount());
-		$this->add('cur',0);
+		$this->add('type', $type);
+		$this->add('total', $oExtract->getTotalCount());
+		$this->add('cur', 0);
 		$this->add('key', $oExtract->getKey());
-		$this->add('status',0);
+		$this->add('status', 0);
 	}
 
 	/**
@@ -291,19 +291,19 @@ 
 		$this->unit_count = Context::get('unit_count');
 		// Check if an index file exists
 		$index_file = './files/cache/importer/'.$key.'/index';
-		if(!file_exists($index_file)) return new BaseObject(-1, 'msg_invalid_xml_file');
+		if (!file_exists($index_file)) return new BaseObject(-1, 'msg_invalid_xml_file');
 
-		switch($type)
+		switch ($type)
 		{
 			case 'ttxml' :
-				if(!$target_module) return new BaseObject(-1,'msg_invalid_request');
+				if (!$target_module) return new BaseObject(-1, 'msg_invalid_request');
 
 				$oModuleModel = getModel('module');
 				$columnList = array('module_srl', 'module');
 				$target_module_info = $oModuleModel->getModuleInfoByModuleSrl($target_module, $columnList);
 
-				$ttimporter = FileHandler::exists(_XE_PATH_ . 'modules/importer/ttimport.class.php');
-				if($ttimporter) require_once($ttimporter);
+				$ttimporter = FileHandler::exists(_XE_PATH_.'modules/importer/ttimport.class.php');
+				if ($ttimporter) require_once($ttimporter);
 
 				$oTT = new ttimport();
 				$cur = $oTT->importModule($key, $cur, $index_file, $this->unit_count, $target_module, $guestbook_target_module, $user_id, $target_module_info->module);
@@ -316,23 +316,23 @@ 
 				break;
 			case 'module' :
 				// Check if the target module exists
-				if(!$target_module) return new BaseObject(-1,'msg_invalid_request');
+				if (!$target_module) return new BaseObject(-1, 'msg_invalid_request');
 				$cur = $this->importModule($key, $cur, $index_file, $target_module);
 				break;
 		}
 		// Notify that all data completely extracted
-		$this->add('type',$type);
-		$this->add('total',$total);
-		$this->add('cur',$cur);
+		$this->add('type', $type);
+		$this->add('total', $total);
+		$this->add('cur', $cur);
 		$this->add('key', $key);
 		$this->add('target_module', $target_module);
 		// When completing, success message appears and remove the cache files
-		if($total <= $cur)
+		if ($total <= $cur)
 		{
-			$this->setMessage( sprintf(Context::getLang('msg_import_finished'), $cur, $total) );
+			$this->setMessage(sprintf(Context::getLang('msg_import_finished'), $cur, $total));
 			FileHandler::removeDir('./files/cache/importer/'.$key);
 		}
-		else $this->setMessage( sprintf(Context::getLang('msg_importing'), $total, $cur) );
+		else $this->setMessage(sprintf(Context::getLang('msg_importing'), $total, $cur));
 	}
 
 	/**
@@ -344,7 +344,7 @@ 
 	 */
 	function importMember($key, $cur, $index_file)
 	{
-		if(!$cur) $cur = 0;
+		if (!$cur) $cur = 0;
 		// Create the xmlParser object
 		$oXmlParser = new XmlParser();
 		// Create objects for importing member information
@@ -357,30 +357,30 @@ 
 		$oModuleModel = getModel('module');
 		$member_config = $oModuleModel->getModuleConfig('member');
 		// Open an index file
-		$f = fopen($index_file,"r");
+		$f = fopen($index_file, "r");
 		// Pass if already read
-		for($i=0;$i<$cur;$i++) fgets($f, 1024);
+		for ($i = 0; $i < $cur; $i++) fgets($f, 1024);
 		// Read by each line until the condition meets
-		for($idx=$cur;$idx<$cur+$this->unit_count;$idx++)
+		for ($idx = $cur; $idx < $cur + $this->unit_count; $idx++)
 		{
-			if(feof($f)) break;
+			if (feof($f)) break;
 			// Find a given location
 			$target_file = trim(fgets($f, 1024));
 			// Load and parse the file
 			$xmlObj = $oXmlParser->loadXmlFile($target_file);
 			FileHandler::removeFile($target_file);
-			if(!$xmlObj) continue;
+			if (!$xmlObj) continue;
 			// List Objects
 			$obj = new stdClass();
 			$obj->user_id = base64_decode($xmlObj->member->user_id->body);
 			$obj->password = base64_decode($xmlObj->member->password->body);
 			$obj->user_name = base64_decode($xmlObj->member->user_name->body);
 			$obj->nick_name = base64_decode($xmlObj->member->nick_name->body);
-			if(!$obj->user_name) $obj->user_name = $obj->nick_name;
+			if (!$obj->user_name) $obj->user_name = $obj->nick_name;
 			$obj->email = base64_decode($xmlObj->member->email->body);
 			$obj->homepage = base64_decode($xmlObj->member->homepage->body);
 			$obj->blog = base64_decode($xmlObj->member->blog->body);
-			$obj->birthday = substr(base64_decode($xmlObj->member->birthday->body),0,8);
+			$obj->birthday = substr(base64_decode($xmlObj->member->birthday->body), 0, 8);
 			$obj->allow_mailing = base64_decode($xmlObj->member->allow_mailing->body);
 			$obj->point = base64_decode($xmlObj->member->point->body);
 			$obj->image_nickname = base64_decode($xmlObj->member->image_nickname->buff->body);
@@ -390,26 +390,26 @@ 
 			$obj->regdate = base64_decode($xmlObj->member->regdate->body);
 			$obj->last_login = base64_decode($xmlObj->member->last_login->body);
 
-			if($xmlObj->member->extra_vars)
+			if ($xmlObj->member->extra_vars)
 			{
-				foreach($xmlObj->member->extra_vars as $key => $val)
+				foreach ($xmlObj->member->extra_vars as $key => $val)
 				{
-					if(in_array($key, array('node_name','attrs','body'))) continue;
+					if (in_array($key, array('node_name', 'attrs', 'body'))) continue;
 					$obj->extra_vars->{$key} = base64_decode($val->body);
 				}
 			}
 			// Create url for homepage and blog
-			if($obj->homepage && strncasecmp('http://', $obj->homepage, 7) !== 0 && strncasecmp('https://', $obj->homepage, 8) !== 0) $obj->homepage = 'http://'.$obj->homepage;
+			if ($obj->homepage && strncasecmp('http://', $obj->homepage, 7) !== 0 && strncasecmp('https://', $obj->homepage, 8) !== 0) $obj->homepage = 'http://'.$obj->homepage;
 			// email address column
 			$obj->email_address = $obj->email;
 			list($obj->email_id, $obj->email_host) = explode('@', $obj->email);
 			// Set the mailing option
-			if($obj->allow_mailing!='Y') $obj->allow_mailing = 'N';
+			if ($obj->allow_mailing != 'Y') $obj->allow_mailing = 'N';
 			// Set the message option
 			$obj->allow_message = 'Y';
-			if(!in_array($obj->allow_message, array('Y','N','F'))) $obj->allow_message= 'Y';
+			if (!in_array($obj->allow_message, array('Y', 'N', 'F'))) $obj->allow_message = 'Y';
 			// Get member-join date if the last login time is not found
-			if(!$obj->last_login) $obj->last_login = $obj->regdate;
+			if (!$obj->last_login) $obj->last_login = $obj->regdate;
 			// Get a member_srl
 			$obj->member_srl = getNextSequence();
 			$obj->list_order = -1 * $obj->member_srl;
@@ -421,63 +421,63 @@ 
 			$nick_args = new stdClass;
 			$nick_args->nick_name = $obj->nick_name;
 			$nick_output = executeQuery('member.getMemberSrl', $nick_args);
-			if(!$nick_output->toBool()) $obj->nick_name .= '_'.$obj->member_srl;
+			if (!$nick_output->toBool()) $obj->nick_name .= '_'.$obj->member_srl;
 			// Add a member
 			$output = executeQuery('member.insertMember', $obj);
 
-			if($output->toBool() && !($obj->password))
+			if ($output->toBool() && !($obj->password))
 			{
 				// Send a mail telling the user to reset his password.
 				$oMail = new Mail();
-				$oMail->setTitle("Password update for your " . getFullSiteUrl() . " account");
-				$webmaster_name = $member_config->webmaster_name?$member_config->webmaster_name:'Webmaster';
+				$oMail->setTitle("Password update for your ".getFullSiteUrl()." account");
+				$webmaster_name = $member_config->webmaster_name ? $member_config->webmaster_name : 'Webmaster';
 				$oMail->setContent("Dear $obj->user_name, <br /><br />
 						We recently migrated our phpBB forum to XpressEngine. Since you password was encrypted we could not migrate it too, so please reset it by following this link:
-						<a href='" . getFullSiteUrl() . "/?act=dispMemberFindAccount' >" . getFullSiteUrl() . "?act=dispMemberFindAccount</a>. You need to enter you email address and hit the 'Find account' button. You will then receive an email with a new, generated password that you can change after login. <br /><br />
+						<a href='".getFullSiteUrl()."/?act=dispMemberFindAccount' >".getFullSiteUrl()."?act=dispMemberFindAccount</a>. You need to enter you email address and hit the 'Find account' button. You will then receive an email with a new, generated password that you can change after login. <br /><br />
 
 						Thank you for your understanding,<br />
 						{$webmaster_name}"
 				);
 				$oMail->setSender($webmaster_name, $member_config->webmaster_email);
-				$oMail->setReceiptor( $obj->user_name, $obj->email);
+				$oMail->setReceiptor($obj->user_name, $obj->email);
 				$oMail->send();
 			}
 
 			// add group join/image name-mark-signiture and so on if a new member successfully added
-			if($output->toBool())
+			if ($output->toBool())
 			{
 				// Join to the default group
 				$obj->group_srl = $default_group_srl;
-				executeQuery('member.addMemberToGroup',$obj);
+				executeQuery('member.addMemberToGroup', $obj);
 				// Image name
-				if($obj->image_nickname)
+				if ($obj->image_nickname)
 				{
 					$target_path = sprintf('files/member_extra_info/image_name/%s/', getNumberingPath($obj->member_srl));
 					$target_filename = sprintf('%s%d.gif', $target_path, $obj->member_srl);
 					FileHandler::writeFile($target_filename, $obj->image_nickname);
 				}
 				// Image mark
-				if($obj->image_mark && file_exists($obj->image_mark))
+				if ($obj->image_mark && file_exists($obj->image_mark))
 				{
 					$target_path = sprintf('files/member_extra_info/image_mark/%s/', getNumberingPath($obj->member_srl));
 					$target_filename = sprintf('%s%d.gif', $target_path, $obj->member_srl);
 					FileHandler::writeFile($target_filename, $obj->image_mark);
 				}
 				// Profile image
-				if($obj->profile_image)
+				if ($obj->profile_image)
 				{
 					$target_path = sprintf('files/member_extra_info/profile_image/%s/', getNumberingPath($obj->member_srl));
 					$target_filename = sprintf('%s%d.gif', $target_path, $obj->member_srl);
 					FileHandler::writeFile($target_filename, $obj->profile_image);
 				}
 				// Signiture
-				if($obj->signature)
+				if ($obj->signature)
 				{
 					$signature = removeHackTag($obj->signature);
 					$signature_buff = sprintf('<?php if(!defined("__XE__")) exit();?>%s', $signature);
 
 					$target_path = sprintf('files/member_extra_info/signature/%s/', getNumberingPath($obj->member_srl));
-					if(!is_dir($target_path)) FileHandler::makeDir($target_path);
+					if (!is_dir($target_path)) FileHandler::makeDir($target_path);
 					$target_filename = sprintf('%s%d.signature.php', $target_path, $obj->member_srl);
 
 					FileHandler::writeFile($target_filename, $signature_buff);
@@ -487,7 +487,7 @@ 
 
 		fclose($f);
 
-		return $idx-1;
+		return $idx - 1;
 	}
 
 	/**
@@ -499,58 +499,58 @@ 
 	 */
 	function importMessage($key, $cur, $index_file)
 	{
-		if(!$cur) $cur = 0;
+		if (!$cur) $cur = 0;
 		// Create the xmlParser object
 		$oXmlParser = new XmlParser();
 		// Open an index file
-		$f = fopen($index_file,"r");
+		$f = fopen($index_file, "r");
 		// Pass if already read
-		for($i=0;$i<$cur;$i++) fgets($f, 1024);
+		for ($i = 0; $i < $cur; $i++) fgets($f, 1024);
 		// Read each line until the condition meets
-		for($idx=$cur;$idx<$cur+$this->unit_count;$idx++)
+		for ($idx = $cur; $idx < $cur + $this->unit_count; $idx++)
 		{
-			if(feof($f)) break;
+			if (feof($f)) break;
 			// Find a location
 			$target_file = trim(fgets($f, 1024));
 			// Load and parse the file
 			$xmlObj = $oXmlParser->loadXmlFile($target_file);
 			FileHandler::removeFile($target_file);
-			if(!$xmlObj) continue;
+			if (!$xmlObj) continue;
 			// List objects
 			$obj = null;
 			$obj->receiver = base64_decode($xmlObj->message->receiver->body);
 			$obj->sender = base64_decode($xmlObj->message->sender->body);
 			$obj->title = base64_decode($xmlObj->message->title->body);
 			$obj->content = base64_decode($xmlObj->message->content->body);
-			$obj->readed = base64_decode($xmlObj->message->readed->body)=='Y'?'Y':'N';
+			$obj->readed = base64_decode($xmlObj->message->readed->body) == 'Y' ? 'Y' : 'N';
 			$obj->regdate = base64_decode($xmlObj->message->regdate->body);
 			$obj->readed_date = base64_decode($xmlObj->message->readed_date->body);
 			// Get member_srl of sender/recipient (If not exists, pass)
-			if(!$obj->sender) continue;
+			if (!$obj->sender) continue;
 			$sender_args->user_id = $obj->sender;
-			$sender_output = executeQuery('member.getMemberInfo',$sender_args);
+			$sender_output = executeQuery('member.getMemberInfo', $sender_args);
 			$sender_srl = $sender_output->data->member_srl;
-			if(!$sender_srl)
+			if (!$sender_srl)
 			{
 				unset($sender_args);
 				$sender_args->email_address = $obj->sender;
-				$sender_output = executeQuery('member.getMemberInfoByEmailAddress',$sender_args);
+				$sender_output = executeQuery('member.getMemberInfoByEmailAddress', $sender_args);
 				$sender_srl = $sender_output->data->member_srl;
 			}
-			if(!$sender_srl) continue;
+			if (!$sender_srl) continue;
 
 			$receiver_args->user_id = $obj->receiver;
-			if(!$obj->receiver) continue;
-			$receiver_output = executeQuery('member.getMemberInfo',$receiver_args);
+			if (!$obj->receiver) continue;
+			$receiver_output = executeQuery('member.getMemberInfo', $receiver_args);
 			$receiver_srl = $receiver_output->data->member_srl;
-			if(!$receiver_srl)
+			if (!$receiver_srl)
 			{
 				unset($receiver_args);
 				$receiver_args->email_address = $obj->receiver;
-				$receiver_output = executeQuery('member.getMemberInfoByEmailAddress',$receiver_args);
+				$receiver_output = executeQuery('member.getMemberInfoByEmailAddress', $receiver_args);
 				$receiver_srl = $receiver_output->data->member_srl;
 			}
-			if(!$receiver_srl) continue;
+			if (!$receiver_srl) continue;
 			// Message to save into sender's message box
 			$sender_args->sender_srl = $sender_srl;
 			$sender_args->receiver_srl = $receiver_srl;
@@ -565,13 +565,13 @@ 
 			$sender_args->list_order = $sender_args->message_srl * -1;
 
 			$output = executeQuery('communication.sendMessage', $sender_args);
-			if($output->toBool())
+			if ($output->toBool())
 			{
 				// Message to save into recipient's massage box
 				$receiver_args->message_srl = $sender_args->related_srl;
-				$receiver_args->list_order = $sender_args->related_srl*-1;
+				$receiver_args->list_order = $sender_args->related_srl * -1;
 				$receiver_args->sender_srl = $sender_srl;
-				if(!$receiver_args->sender_srl) $receiver_args->sender_srl = $receiver_srl;
+				if (!$receiver_args->sender_srl) $receiver_args->sender_srl = $receiver_srl;
 				$receiver_args->receiver_srl = $receiver_srl;
 				$receiver_args->message_type = 'R';
 				$receiver_args->title = $obj->title;
@@ -585,7 +585,7 @@ 
 
 		fclose($f);
 
-		return $idx-1;
+		return $idx - 1;
 	}
 
 	/**
@@ -605,10 +605,10 @@ 
 		$oDocumentModel = getModel('document');
 		$category_list = $category_titles = array();
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
-		if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
+		if (count($category_list)) foreach ($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
 		// Extract category information
 		$category_file = preg_replace('/index$/i', 'category.xml', $index_file);
-		if(file_exists($category_file))
+		if (file_exists($category_file))
 		{
 			$buff = FileHandler::readFile($category_file);
 
@@ -616,14 +616,14 @@ 
 			$xmlDoc = $this->oXmlParser->loadXmlFile($category_file);
 
 			$categories = $xmlDoc->items->category;
-			if($categories)
+			if ($categories)
 			{
-				if(!is_array($categories)) $categories = array($categories);
+				if (!is_array($categories)) $categories = array($categories);
 				$match_sequence = array();
-				foreach($categories as $k => $v)
+				foreach ($categories as $k => $v)
 				{
 					$category = trim(base64_decode($v->body));
-					if(!$category || $category_titles[$category]) continue;
+					if (!$category || $category_titles[$category]) continue;
 
 					$sequence = $v->attrs->sequence;
 					$parent = $v->attrs->parent;
@@ -631,10 +631,10 @@ 
 					$obj = null;
 					$obj->title = $category;
 					$obj->module_srl = $module_srl;
-					if($parent) $obj->parent_srl = $match_sequence[$parent];
+					if ($parent) $obj->parent_srl = $match_sequence[$parent];
 
 					$output = $oDocumentController->insertCategory($obj);
-					if($output->toBool()) $match_sequence[$sequence] = $output->get('category_srl');
+					if ($output->toBool()) $match_sequence[$sequence] = $output->get('category_srl');
 				}
 				$oDocumentController = getController('document');
 				$oDocumentController->makeCategoryFile($module_srl);
@@ -644,31 +644,31 @@ 
 
 		$category_list = $category_titles = array();
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
-		if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
+		if (count($category_list)) foreach ($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
 
 		$ek_args->module_srl = $module_srl;
 		$output = executeQueryArray('document.getDocumentExtraKeys', $ek_args);
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $key => $val) $extra_keys[$val->eid] = true;
+			foreach ($output->data as $key => $val) $extra_keys[$val->eid] = true;
 		}
 
-		if(!$cur) $cur = 0;
+		if (!$cur) $cur = 0;
 		// Open an index file
-		$f = fopen($index_file,"r");
+		$f = fopen($index_file, "r");
 		// Pass if already read
-		for($i=0;$i<$cur;$i++) fgets($f, 1024);
+		for ($i = 0; $i < $cur; $i++) fgets($f, 1024);
 		// Read each line until the condition meets
-		for($idx=$cur;$idx<$cur+$this->unit_count;$idx++)
+		for ($idx = $cur; $idx < $cur + $this->unit_count; $idx++)
 		{
-			if(feof($f)) break;
+			if (feof($f)) break;
 			// Find a location
 			$target_file = trim(fgets($f, 1024));
 
-			if(!file_exists($target_file)) continue;
+			if (!file_exists($target_file)) continue;
 			// Importing data from now on
-			$fp = fopen($target_file,"r");
-			if(!$fp) continue;
+			$fp = fopen($target_file, "r");
+			if (!$fp) continue;
 
 			$obj = new stdClass;
 			$obj->module_srl = $module_srl;
@@ -680,51 +680,51 @@ 
 			$started = false;
 			$buff = array();
 			// Start from the body data
-			while(!feof($fp))
+			while (!feof($fp))
 			{
 				$str = fgets($fp, 1024);
 				// Prepare an item
-				if(trim($str) == '<post>')
+				if (trim($str) == '<post>')
 				{
 					$started = true;
 					// Trackback inserted
 				}
-				else if(substr($str,0,11) == '<trackbacks')
+				else if (substr($str, 0, 11) == '<trackbacks')
 				{
 					$obj->trackback_count = $this->importTrackbacks($fp, $module_srl, $obj->document_srl);
 					continue;
 					// Comments inserted
 				}
-				else if(substr($str,0,9) == '<comments')
+				else if (substr($str, 0, 9) == '<comments')
 				{
 					$obj->comment_count = $this->importComments($fp, $module_srl, $obj->document_srl);
 					continue;
 					// Attachment inserted
 				}
-				else if(substr($str,0,9) == '<attaches')
+				else if (substr($str, 0, 9) == '<attaches')
 				{
 					$obj->uploaded_count = $this->importAttaches($fp, $module_srl, $obj->document_srl, $files);
 					continue;
 					// When starting extra variabls
 				}
-				elseif(trim($str) == '<extra_vars>')
+				elseif (trim($str) == '<extra_vars>')
 				{
 					$extra_vars = $this->importExtraVars($fp);
 					continue;
 				}
 
-				if($started) $buff[] = $str;
+				if ($started) $buff[] = $str;
 			}
 
 			$xmlDoc = $this->oXmlParser->parse(implode('', $buff));
 
 			$category = base64_decode($xmlDoc->post->category->body);
-			if($category_titles[$category]) $obj->category_srl = $category_titles[$category];
+			if ($category_titles[$category]) $obj->category_srl = $category_titles[$category];
 
 			$obj->member_srl = 0;
 
-			$obj->is_notice = base64_decode($xmlDoc->post->is_notice->body)=='Y'?'Y':'N';
-			$obj->status = base64_decode($xmlDoc->post->is_secret->body)=='Y'?$oDocumentModel->getConfigStatus('secret'):$oDocumentModel->getConfigStatus('public');
+			$obj->is_notice = base64_decode($xmlDoc->post->is_notice->body) == 'Y' ? 'Y' : 'N';
+			$obj->status = base64_decode($xmlDoc->post->is_secret->body) == 'Y' ? $oDocumentModel->getConfigStatus('secret') : $oDocumentModel->getConfigStatus('public');
 			$obj->title = base64_decode($xmlDoc->post->title->body);
 			$obj->content = base64_decode($xmlDoc->post->content->body);
 			$obj->readed_count = base64_decode($xmlDoc->post->readed_count->body);
@@ -733,39 +733,39 @@ 
 			$obj->password = base64_decode($xmlDoc->post->password->body);
 			$obj->user_name = base64_decode($xmlDoc->post->user_name->body);
 			$obj->nick_name = base64_decode($xmlDoc->post->nick_name->body);
-			if(!$obj->user_name) $obj->user_name = $obj->nick_name;
+			if (!$obj->user_name) $obj->user_name = $obj->nick_name;
 			$obj->user_id = base64_decode($xmlDoc->post->user_id->body);
 			$obj->email_address = base64_decode($xmlDoc->post->email->body);
 			$obj->homepage = base64_decode($xmlDoc->post->homepage->body);
-			if($obj->homepage && strncasecmp('http://', $obj->homepage, 7) !== 0 && strncasecmp('https://', $obj->homepage, 8) !== 0) $obj->homepage = 'http://'.$obj->homepage;
+			if ($obj->homepage && strncasecmp('http://', $obj->homepage, 7) !== 0 && strncasecmp('https://', $obj->homepage, 8) !== 0) $obj->homepage = 'http://'.$obj->homepage;
 			$obj->tags = base64_decode($xmlDoc->post->tags->body);
 			$obj->regdate = base64_decode($xmlDoc->post->regdate->body);
 			$obj->last_update = base64_decode($xmlDoc->post->update->body);
 			$obj->last_updater = base64_decode($xmlDoc->post->last_updater->body);
-			if(!$obj->last_update) $obj->last_update = $obj->regdate;
+			if (!$obj->last_update) $obj->last_update = $obj->regdate;
 			$obj->ipaddress = base64_decode($xmlDoc->post->ipaddress->body);
-			$obj->list_order = $obj->update_order = $obj->document_srl*-1;
-			$obj->commentStatus = base64_decode($xmlDoc->post->allow_comment->body)!='N'?'ALLOW':'DENY';
-			$obj->allow_trackback = base64_decode($xmlDoc->post->allow_trackback->body)!='N'?'Y':'N';
+			$obj->list_order = $obj->update_order = $obj->document_srl * -1;
+			$obj->commentStatus = base64_decode($xmlDoc->post->allow_comment->body) != 'N' ? 'ALLOW' : 'DENY';
+			$obj->allow_trackback = base64_decode($xmlDoc->post->allow_trackback->body) != 'N' ? 'Y' : 'N';
 			$obj->notify_message = base64_decode($xmlDoc->post->is_notice->body);
 			// Change content information (attachment)
-			if(count($files))
+			if (count($files))
 			{
-				foreach($files as $key => $val)
+				foreach ($files as $key => $val)
 				{
-					$obj->content = preg_replace('/(src|href)\=(["\']?)'.preg_quote($key).'(["\']?)/i','$1="'.$val.'"',$obj->content);
-					$obj->content = preg_replace('/(["\']?).\/files\/(.+)\/'.preg_quote($key).'([^"\']+)(["\']?)/i','"'.$val.'"',$obj->content);
-					$obj->content = preg_replace('/(["\']?)files\/(.+)\/'.preg_quote($key).'([^"\']+)(["\']?)/i','"'.$val.'"',$obj->content);
+					$obj->content = preg_replace('/(src|href)\=(["\']?)'.preg_quote($key).'(["\']?)/i', '$1="'.$val.'"', $obj->content);
+					$obj->content = preg_replace('/(["\']?).\/files\/(.+)\/'.preg_quote($key).'([^"\']+)(["\']?)/i', '"'.$val.'"', $obj->content);
+					$obj->content = preg_replace('/(["\']?)files\/(.+)\/'.preg_quote($key).'([^"\']+)(["\']?)/i', '"'.$val.'"', $obj->content);
 				}
 			}
 
 			$output = executeQuery('document.insertDocument', $obj);
 
-			if($output->toBool() && $obj->tags)
+			if ($output->toBool() && $obj->tags)
 			{
-				$tag_list = explode(',',$obj->tags);
+				$tag_list = explode(',', $obj->tags);
 				$tag_count = count($tag_list);
-				for($i=0;$i<$tag_count;$i++)
+				for ($i = 0; $i < $tag_count; $i++)
 				{
 					$args = new stdClass;
 					$args->tag_srl = getNextSequence();
@@ -773,17 +773,17 @@ 
 					$args->document_srl = $obj->document_srl;
 					$args->tag = trim($tag_list[$i]);
 					$args->regdate = $obj->regdate;
-					if(!$args->tag) continue;
+					if (!$args->tag) continue;
 					$output = executeQuery('tag.insertTag', $args);
 				}
 
 			}
 			// Add extra variables
-			if(count($extra_vars))
+			if (count($extra_vars))
 			{
-				foreach($extra_vars as $key => $val)
+				foreach ($extra_vars as $key => $val)
 				{
-					if(!$val->value) continue;
+					if (!$val->value) continue;
 					unset($e_args);
 					$e_args->module_srl = $module_srl;
 					$e_args->document_srl = $obj->document_srl;
@@ -792,7 +792,7 @@ 
 					$e_args->lang_code = $val->lang_code;
 					$e_args->eid = $val->eid;
 					// Create a key for extra vars if not exists (except vars for title and content)
-					if(!preg_match('/^(title|content)_(.+)$/i',$e_args->eid) && !$extra_keys[$e_args->eid])
+					if (!preg_match('/^(title|content)_(.+)$/i', $e_args->eid) && !$extra_keys[$e_args->eid])
 					{
 						unset($ek_args);
 						$ek_args->module_srl = $module_srl;
@@ -816,9 +816,9 @@ 
 
 		fclose($f);
 		// Sync category counts
-		if(count($category_list)) foreach($category_list as $key => $val) $oDocumentController->updateCategoryCount($module_srl, $val->category_srl);
+		if (count($category_list)) foreach ($category_list as $key => $val) $oDocumentController->updateCategoryCount($module_srl, $val->category_srl);
 
-		return $idx-1;
+		return $idx - 1;
 	}
 
 	/**
@@ -834,17 +834,17 @@ 
 		$buff = null;
 		$cnt = 0;
 
-		while(!feof($fp))
+		while (!feof($fp))
 		{
 			$str = fgets($fp, 1024);
 			// If </trackbacks> is, break
-			if(trim($str) == '</trackbacks>') break;
+			if (trim($str) == '</trackbacks>') break;
 			// If <trackback>, start importing
-			if(trim($str) == '<trackback>') $started = true;
+			if (trim($str) == '<trackback>') $started = true;
 
-			if($started) $buff .= $str;
+			if ($started) $buff .= $str;
 			// If </trackback>, insert to the DB
-			if(trim($str) == '</trackback>')
+			if (trim($str) == '</trackback>')
 			{
 				$xmlDoc = $this->oXmlParser->parse($buff);
 
@@ -858,9 +858,9 @@ 
 				$obj->excerpt = base64_decode($xmlDoc->trackback->excerpt->body);
 				$obj->regdate = base64_decode($xmlDoc->trackback->regdate->body);
 				$obj->ipaddress = base64_decode($xmlDoc->trackback->ipaddress->body);
-				$obj->list_order = -1*$obj->trackback_srl;
+				$obj->list_order = -1 * $obj->trackback_srl;
 				$output = executeQuery('trackback.insertTrackback', $obj);
-				if($output->toBool()) $cnt++;
+				if ($output->toBool()) $cnt++;
 
 				$buff = null;
 				$started = false;
@@ -884,13 +884,13 @@ 
 
 		$sequences = array();
 
-		while(!feof($fp))
+		while (!feof($fp))
 		{
 			$str = fgets($fp, 1024);
 			// If </comments> is, break
-			if(trim($str) == '</comments>') break;
+			if (trim($str) == '</comments>') break;
 			// If <comment> is, start importing
-			if(trim($str) == '<comment>')
+			if (trim($str) == '<comment>')
 			{
 				$started = true;
 				$obj = new stdClass;
@@ -898,15 +898,15 @@ 
 				$files = array();
 			}
 			// If <attaches is, start importing attachments
-			if(substr($str,0,9) == '<attaches')
+			if (substr($str, 0, 9) == '<attaches')
 			{
 				$obj->uploaded_count = $this->importAttaches($fp, $module_srl, $obj->comment_srl, $files);
 				continue;
 			}
 
-			if($started) $buff .= $str;
+			if ($started) $buff .= $str;
 			// If </comment> is, insert to the DB
-			if(trim($str) == '</comment>')
+			if (trim($str) == '</comment>')
 			{
 				$xmlDoc = $this->oXmlParser->parse($buff);
 
@@ -916,35 +916,35 @@ 
 
 				$obj->module_srl = $module_srl;
 
-				if($parent) $obj->parent_srl = $sequences[$parent];
+				if ($parent) $obj->parent_srl = $sequences[$parent];
 				else $obj->parent_srl = 0;
 
 				$obj->document_srl = $document_srl;
-				$obj->is_secret = base64_decode($xmlDoc->comment->is_secret->body)=='Y'?'Y':'N';
-				$obj->notify_message = base64_decode($xmlDoc->comment->notify_message->body)=='Y'?'Y':'N';
+				$obj->is_secret = base64_decode($xmlDoc->comment->is_secret->body) == 'Y' ? 'Y' : 'N';
+				$obj->notify_message = base64_decode($xmlDoc->comment->notify_message->body) == 'Y' ? 'Y' : 'N';
 				$obj->content = base64_decode($xmlDoc->comment->content->body);
 				$obj->voted_count = base64_decode($xmlDoc->comment->voted_count->body);
 				$obj->blamed_count = base64_decode($xmlDoc->comment->blamed_count->body);
 				$obj->password = base64_decode($xmlDoc->comment->password->body);
-				$obj->user_name =base64_decode($xmlDoc->comment->user_name->body);
+				$obj->user_name = base64_decode($xmlDoc->comment->user_name->body);
 				$obj->nick_name = base64_decode($xmlDoc->comment->nick_name->body);
-				if(!$obj->user_name) $obj->user_name = $obj->nick_name;
+				if (!$obj->user_name) $obj->user_name = $obj->nick_name;
 				$obj->user_id = base64_decode($xmlDoc->comment->user_id->body);
 				$obj->member_srl = 0;
 				$obj->email_address = base64_decode($xmlDoc->comment->email->body);
 				$obj->homepage = base64_decode($xmlDoc->comment->homepage->body);
 				$obj->regdate = base64_decode($xmlDoc->comment->regdate->body);
 				$obj->last_update = base64_decode($xmlDoc->comment->update->body);
-				if(!$obj->last_update) $obj->last_update = $obj->regdate;
+				if (!$obj->last_update) $obj->last_update = $obj->regdate;
 				$obj->ipaddress = base64_decode($xmlDoc->comment->ipaddress->body);
-				$obj->status = base64_decode($xmlDoc->comment->status->body)==''?'1':base64_decode($xmlDoc->comment->status->body);
-				$obj->list_order = $obj->comment_srl*-1;
+				$obj->status = base64_decode($xmlDoc->comment->status->body) == '' ? '1' : base64_decode($xmlDoc->comment->status->body);
+				$obj->list_order = $obj->comment_srl * -1;
 				// Change content information (attachment)
-				if(count($files))
+				if (count($files))
 				{
-					foreach($files as $key => $val)
+					foreach ($files as $key => $val)
 					{
-						$obj->content = preg_replace('/(src|href)\=(["\']?)'.preg_quote($key).'(["\']?)/i','$1="'.$val.'"',$obj->content);
+						$obj->content = preg_replace('/(src|href)\=(["\']?)'.preg_quote($key).'(["\']?)/i', '$1="'.$val.'"', $obj->content);
 					}
 				}
 				// Comment list first
@@ -954,7 +954,7 @@ 
 				$list_args->module_srl = $obj->module_srl;
 				$list_args->regdate = $obj->regdate;
 				// Set data directly if parent comment doesn't exist
-				if(!$obj->parent_srl)
+				if (!$obj->parent_srl)
 				{
 					$list_args->head = $list_args->arrange = $obj->comment_srl;
 					$list_args->depth = 0;
@@ -966,25 +966,25 @@ 
 					$parent_args->comment_srl = $obj->parent_srl;
 					$parent_output = executeQuery('comment.getCommentListItem', $parent_args);
 					// Return if parent comment doesn't exist
-					if(!$parent_output->toBool() || !$parent_output->data) continue;
+					if (!$parent_output->toBool() || !$parent_output->data) continue;
 					$parent = $parent_output->data;
 
 					$list_args->head = $parent->head;
-					$list_args->depth = $parent->depth+1;
-					if($list_args->depth<2) $list_args->arrange = $obj->comment_srl;
+					$list_args->depth = $parent->depth + 1;
+					if ($list_args->depth < 2) $list_args->arrange = $obj->comment_srl;
 					else
 					{
 						$list_args->arrange = $parent->arrange;
 						$output = executeQuery('comment.updateCommentListArrange', $list_args);
-						if(!$output->toBool()) return $output;
+						if (!$output->toBool()) return $output;
 					}
 				}
 
 				$output = executeQuery('comment.insertCommentList', $list_args);
-				if($output->toBool())
+				if ($output->toBool())
 				{
 					$output = executeQuery('comment.insertComment', $obj);
-					if($output->toBool()) $cnt++;
+					if ($output->toBool()) $cnt++;
 				}
 
 				$buff = null;
@@ -1010,13 +1010,13 @@ 
 		$buff = null;
 
 		$file_obj = new stdClass;
-		while(!feof($fp))
+		while (!feof($fp))
 		{
 			$str = trim(fgets($fp, 1024));
 			// If it ends with </attaches>, break
-			if(trim($str) == '</attaches>') break;
+			if (trim($str) == '</attaches>') break;
 			// If it starts with <attach>, collect attachments
-			if(trim($str) == '<attach>')
+			if (trim($str) == '<attach>')
 			{
 				$file_obj->file_srl = getNextSequence();
 				$file_obj->upload_target_srl = $upload_target_srl;
@@ -1026,26 +1026,26 @@ 
 				$buff = null;
 				// If it starts with <file>, handle the attachement in xml file
 			}
-			else if(trim($str) == '<file>')
+			else if (trim($str) == '<file>')
 			{
 				$file_obj->file = $this->saveTemporaryFile($fp);
 				continue;
 			}
 
-			if($started) $buff .= $str;
+			if ($started) $buff .= $str;
 			// If it ends with </attach>, handle attachements
-			if(trim($str) == '</attach>')
+			if (trim($str) == '</attach>')
 			{
 				$xmlDoc = $this->oXmlParser->parse($buff.$str);
 
 				$file_obj->source_filename = base64_decode($xmlDoc->attach->filename->body);
 				$file_obj->download_count = base64_decode($xmlDoc->attach->download_count->body);
 
-				if(!$file_obj->file)
+				if (!$file_obj->file)
 				{
 					$url = base64_decode($xmlDoc->attach->url->body);
 					$path = base64_decode($xmlDoc->attach->path->body);
-					if($path && file_exists($path)) $file_obj->file = $path;
+					if ($path && file_exists($path)) $file_obj->file = $path;
 					else
 					{
 						$file_obj->file = $this->getTmpFilename();
@@ -1053,11 +1053,11 @@ 
 					}
 				}
 
-				if(file_exists($file_obj->file))
+				if (file_exists($file_obj->file))
 				{
 					$random = new Password();
 					// Set upload path by checking if the attachement is an image or other kind of file
-					if(preg_match("/\.(jpe?g|gif|png|wm[va]|mpe?g|avi|flv|mp[1-4]|as[fx]|wav|midi?|moo?v|qt|r[am]{1,2}|m4v)$/i", $file_obj->source_filename))
+					if (preg_match("/\.(jpe?g|gif|png|wm[va]|mpe?g|avi|flv|mp[1-4]|as[fx]|wav|midi?|moo?v|qt|r[am]{1,2}|m4v)$/i", $file_obj->source_filename))
 					{
 						// Immediately remove the direct file if it has any kind of extensions for hacking
 						$file_obj->source_filename = preg_replace('/\.(php|phtm|phar|html?|cgi|pl|exe|jsp|asp|inc)/i', '$0-x', $file_obj->source_filename);
@@ -1065,14 +1065,14 @@ 
 
 						$path = sprintf("./files/attach/images/%s/%s", $module_srl, getNumberingPath($upload_target_srl, 3));
 
-						$ext = substr(strrchr($file_obj->source_filename,'.'),1);
+						$ext = substr(strrchr($file_obj->source_filename, '.'), 1);
 						$_filename = $random->createSecureSalt(32, 'hex').'.'.$ext;
 						$filename  = $path.$_filename;
 
 						$idx = 1;
-						while(file_exists($filename))
+						while (file_exists($filename))
 						{
-							$filename = $path.preg_replace('/\.([a-z0-9]+)$/i','_'.$idx.'.$1', $_filename);
+							$filename = $path.preg_replace('/\.([a-z0-9]+)$/i', '_'.$idx.'.$1', $_filename);
 							$idx++;
 						}
 
@@ -1080,14 +1080,14 @@ 
 					}
 					else
 					{
-						$path = sprintf("./files/attach/binaries/%s/%s", $module_srl, getNumberingPath($upload_target_srl,3));
+						$path = sprintf("./files/attach/binaries/%s/%s", $module_srl, getNumberingPath($upload_target_srl, 3));
 						$filename = $path.$random->createSecureSalt(32, 'hex');
 						$file_obj->direct_download = 'N';
 					}
 					// Create a directory
-					if(!FileHandler::makeDir($path)) continue;
+					if (!FileHandler::makeDir($path)) continue;
 
-					if(strncmp('./files/cache/importer/', $file_obj->file, 23) === 0)
+					if (strncmp('./files/cache/importer/', $file_obj->file, 23) === 0)
 					{
 						FileHandler::rename($file_obj->file, $filename);
 					}
@@ -1098,7 +1098,7 @@ 
 
 					// Insert the file to the DB
 					unset($file_obj->file);
-					if(file_exists($filename))
+					if (file_exists($filename))
 					{
 						$file_obj->uploaded_filename = $filename;
 						$file_obj->file_size = filesize($filename);
@@ -1108,13 +1108,13 @@ 
 						$file_obj->isvalid = 'Y';
 						$output = executeQuery('file.insertFile', $file_obj);
 
-						if($output->toBool())
+						if ($output->toBool())
 						{
 							$uploaded_count++;
 							$tmp_obj = null;
 							$tmp_obj->source_filename = $file_obj->source_filename;
-							if($file_obj->direct_download == 'Y') $files[$file_obj->source_filename] = $file_obj->uploaded_filename;
-							else $files[$file_obj->source_filename] = getUrl('','module','file','act','procFileDownload','file_srl',$file_obj->file_srl,'sid',$file_obj->sid);
+							if ($file_obj->direct_download == 'Y') $files[$file_obj->source_filename] = $file_obj->uploaded_filename;
+							else $files[$file_obj->source_filename] = getUrl('', 'module', 'file', 'act', 'procFileDownload', 'file_srl', $file_obj->file_srl, 'sid', $file_obj->sid);
 						}
 					}
 				}
@@ -1131,8 +1131,8 @@ 
 	{
 		$path = "./files/cache/importer";
 		FileHandler::makeDir($path);
-		$filename = sprintf("%s/%d", $path, rand(11111111,99999999));
-		if(file_exists($filename)) $filename .= rand(111,999);
+		$filename = sprintf("%s/%d", $path, rand(11111111, 99999999));
+		if (file_exists($filename)) $filename .= rand(111, 999);
 		return $filename;
 	}
 
@@ -1147,14 +1147,14 @@ 
 		$f = fopen($temp_filename, "w");
 
 		$buff = '';
-		while(!feof($fp))
+		while (!feof($fp))
 		{
 			$str = trim(fgets($fp, 1024));
-			if(trim($str) == '</file>') break;
+			if (trim($str) == '</file>') break;
 
 			$buff .= $str;
 
-			if(substr($buff,-7)=='</buff>')
+			if (substr($buff, -7) == '</buff>')
 			{
 				fwrite($f, base64_decode(substr($buff, 6, -7)));
 				$buff = '';
@@ -1173,23 +1173,23 @@ 
 	function importExtraVars($fp)
 	{
 		$buff = null;
-		while(!feof($fp))
+		while (!feof($fp))
 		{
 			$buff .= $str = trim(fgets($fp, 1024));
-			if(trim($str) == '</extra_vars>') break;
+			if (trim($str) == '</extra_vars>') break;
 		}
-		if(!$buff) return array();
+		if (!$buff) return array();
 
 		$buff = '<extra_vars>'.$buff;
 		$oXmlParser = new XmlParser();
 		$xmlDoc = $this->oXmlParser->parse($buff);
-		if(!count($xmlDoc->extra_vars->key)) return array();
+		if (!count($xmlDoc->extra_vars->key)) return array();
 
 		$index = 1;
-		foreach($xmlDoc->extra_vars->key as $k => $v)
+		foreach ($xmlDoc->extra_vars->key as $k => $v)
 		{
 			unset($vobj);
-			if($v->var_idx)
+			if ($v->var_idx)
 			{
 				$vobj->var_idx = base64_decode($v->var_idx->body);
 				$vobj->lang_code = base64_decode($v->lang_code->body);
@@ -1197,7 +1197,7 @@ 
 				$vobj->eid = base64_decode($v->eid->body);
 
 			}
-			else if($v->body)
+			else if ($v->body)
 			{
 				$vobj->var_idx = $index;
 				$vobj->lang_code = Context::getLangType();

Braces +256 added lines, -111 removed lines

@@ -55,24 +55,29 @@ 
 					{
 						$isExists = 'true';
 						$type = 'XML';
-						if(stristr($str, 'tattertools')) $type = 'TTXML';
+						if(stristr($str, 'tattertools')) {
+							$type = 'TTXML';
+						}
 
 						$this->add('type', $type);
 					}
 					fclose($fp);
 					$resultMessage = $lang->found_xml_file;
+				} else {
+					$resultMessage = $lang->cannot_url_file;
 				}
-				else $resultMessage = $lang->cannot_url_file;
+			} else {
+				$resultMessage = $lang->cannot_allow_fopen_in_phpini;
 			}
-			else $resultMessage = $lang->cannot_allow_fopen_in_phpini;
 
 			$this->add('exists', $isExists);
-		}
-		else
+		} else
 		{
 			$realPath = FileHandler::getRealPath($filename);
 
-			if(file_exists($realPath) && is_file($realPath)) $isExists = 'true';
+			if(file_exists($realPath) && is_file($realPath)) {
+				$isExists = 'true';
+			}
 			$this->add('exists', $isExists);
 
 			if($isExists == 'true')
@@ -81,13 +86,16 @@ 
 
 				$fp = fopen($realPath, "r");
 				$str = fgets($fp, 100);
-				if(stristr($str, 'tattertools')) $type = 'TTXML';
+				if(stristr($str, 'tattertools')) {
+					$type = 'TTXML';
+				}
 				fclose($fp);
 
 				$this->add('type', $type);
 				$resultMessage = $lang->found_xml_file;
+			} else {
+				$resultMessage = $lang->not_found_xml_file;
 			}
-			else $resultMessage = $lang->not_found_xml_file;
 		}
 		$this->add('result_message', $resultMessage);
 	}
@@ -112,8 +120,7 @@ 
 		{
 			$output = executeQuery('importer.updateDocumentSync'.$postFix);
 			$output = executeQuery('importer.updateCommentSync'.$postFix);
-		}
-		else
+		} else
 		{
 			$output = executeQueryArray ('importer.getDocumentMemberSrlWithUserID'.$postFix);
 			if(is_array ($output->data) && count ($output->data))
@@ -129,8 +136,7 @@ 
 					if($tmp->toBool () === true)
 					{
 						$success_count++;
-					}
-					else
+					} else
 					{
 						$error_count++;
 					}
@@ -152,8 +158,7 @@ 
 					if($tmp->toBool () === true)
 					{
 						$success_count++;
-					}
-					else
+					} else
 					{
 						$error_count++;
 					}
@@ -182,11 +187,15 @@ 
 		{
 			case 'member' :
 				$output = $oExtract->set($xml_file,'<members ', '</members>', '<member>', '</member>');
-				if($output->toBool()) $oExtract->saveItems();
+				if($output->toBool()) {
+					$oExtract->saveItems();
+				}
 				break;
 			case 'message' :
 				$output = $oExtract->set($xml_file,'<messages ', '</messages>', '<message>','</message>');
-				if($output->toBool()) $oExtract->saveItems();
+				if($output->toBool()) {
+					$oExtract->saveItems();
+				}
 				break;
 			case 'ttxml' :
 				// Category information
@@ -204,8 +213,12 @@ 
 							$started = true;
 							$str = strstr($str, '<category>');
 						}
-						if(substr($str,0,strlen('<post ')) == '<post ') break;
-						if ($started) $buff .= $str;
+						if(substr($str,0,strlen('<post ')) == '<post ') {
+							break;
+						}
+						if ($started) {
+							$buff .= $str;
+						}
 					}
 					$buff = '<categories>'.$buff.'</categories>';
 					$oExtract->closeFile();
@@ -242,7 +255,9 @@ 
 						FileHandler::writeFile($guestbook_filename, $buff);
 						// Individual items
 						$output = $oExtract->set($xml_file,'<blog', '</blog>', '<post ', '</post>');
-						if($output->toBool()) $oExtract->saveItems();
+						if($output->toBool()) {
+							$oExtract->saveItems();
+						}
 					}
 				}
 				break;
@@ -254,7 +269,9 @@ 
 					$oExtract->mergeItems('category.xml');
 					// Get each item
 					$output = $oExtract->set($xml_file,'<posts ', '</posts>', '<post>', '</post>');
-					if($output->toBool()) $oExtract->saveItems();
+					if($output->toBool()) {
+						$oExtract->saveItems();
+					}
 				}
 				break;
 		}
@@ -291,19 +308,25 @@ 
 		$this->unit_count = Context::get('unit_count');
 		// Check if an index file exists
 		$index_file = './files/cache/importer/'.$key.'/index';
-		if(!file_exists($index_file)) return new BaseObject(-1, 'msg_invalid_xml_file');
+		if(!file_exists($index_file)) {
+			return new BaseObject(-1, 'msg_invalid_xml_file');
+		}
 
 		switch($type)
 		{
 			case 'ttxml' :
-				if(!$target_module) return new BaseObject(-1,'msg_invalid_request');
+				if(!$target_module) {
+					return new BaseObject(-1,'msg_invalid_request');
+				}
 
 				$oModuleModel = getModel('module');
 				$columnList = array('module_srl', 'module');
 				$target_module_info = $oModuleModel->getModuleInfoByModuleSrl($target_module, $columnList);
 
 				$ttimporter = FileHandler::exists(_XE_PATH_ . 'modules/importer/ttimport.class.php');
-				if($ttimporter) require_once($ttimporter);
+				if($ttimporter) {
+					require_once($ttimporter);
+				}
 
 				$oTT = new ttimport();
 				$cur = $oTT->importModule($key, $cur, $index_file, $this->unit_count, $target_module, $guestbook_target_module, $user_id, $target_module_info->module);
@@ -316,7 +339,9 @@ 
 				break;
 			case 'module' :
 				// Check if the target module exists
-				if(!$target_module) return new BaseObject(-1,'msg_invalid_request');
+				if(!$target_module) {
+					return new BaseObject(-1,'msg_invalid_request');
+				}
 				$cur = $this->importModule($key, $cur, $index_file, $target_module);
 				break;
 		}
@@ -331,8 +356,9 @@ 
 		{
 			$this->setMessage( sprintf(Context::getLang('msg_import_finished'), $cur, $total) );
 			FileHandler::removeDir('./files/cache/importer/'.$key);
+		} else {
+			$this->setMessage( sprintf(Context::getLang('msg_importing'), $total, $cur) );
 		}
-		else $this->setMessage( sprintf(Context::getLang('msg_importing'), $total, $cur) );
 	}
 
 	/**
@@ -344,7 +370,9 @@ 
 	 */
 	function importMember($key, $cur, $index_file)
 	{
-		if(!$cur) $cur = 0;
+		if(!$cur) {
+			$cur = 0;
+		}
 		// Create the xmlParser object
 		$oXmlParser = new XmlParser();
 		// Create objects for importing member information
@@ -359,24 +387,32 @@ 
 		// Open an index file
 		$f = fopen($index_file,"r");
 		// Pass if already read
-		for($i=0;$i<$cur;$i++) fgets($f, 1024);
+		for($i=0;$i<$cur;$i++) {
+			fgets($f, 1024);
+		}
 		// Read by each line until the condition meets
 		for($idx=$cur;$idx<$cur+$this->unit_count;$idx++)
 		{
-			if(feof($f)) break;
+			if(feof($f)) {
+				break;
+			}
 			// Find a given location
 			$target_file = trim(fgets($f, 1024));
 			// Load and parse the file
 			$xmlObj = $oXmlParser->loadXmlFile($target_file);
 			FileHandler::removeFile($target_file);
-			if(!$xmlObj) continue;
+			if(!$xmlObj) {
+				continue;
+			}
 			// List Objects
 			$obj = new stdClass();
 			$obj->user_id = base64_decode($xmlObj->member->user_id->body);
 			$obj->password = base64_decode($xmlObj->member->password->body);
 			$obj->user_name = base64_decode($xmlObj->member->user_name->body);
 			$obj->nick_name = base64_decode($xmlObj->member->nick_name->body);
-			if(!$obj->user_name) $obj->user_name = $obj->nick_name;
+			if(!$obj->user_name) {
+				$obj->user_name = $obj->nick_name;
+			}
 			$obj->email = base64_decode($xmlObj->member->email->body);
 			$obj->homepage = base64_decode($xmlObj->member->homepage->body);
 			$obj->blog = base64_decode($xmlObj->member->blog->body);
@@ -394,22 +430,32 @@ 
 			{
 				foreach($xmlObj->member->extra_vars as $key => $val)
 				{
-					if(in_array($key, array('node_name','attrs','body'))) continue;
+					if(in_array($key, array('node_name','attrs','body'))) {
+						continue;
+					}
 					$obj->extra_vars->{$key} = base64_decode($val->body);
 				}
 			}
 			// Create url for homepage and blog
-			if($obj->homepage && strncasecmp('http://', $obj->homepage, 7) !== 0 && strncasecmp('https://', $obj->homepage, 8) !== 0) $obj->homepage = 'http://'.$obj->homepage;
+			if($obj->homepage && strncasecmp('http://', $obj->homepage, 7) !== 0 && strncasecmp('https://', $obj->homepage, 8) !== 0) {
+				$obj->homepage = 'http://'.$obj->homepage;
+			}
 			// email address column
 			$obj->email_address = $obj->email;
 			list($obj->email_id, $obj->email_host) = explode('@', $obj->email);
 			// Set the mailing option
-			if($obj->allow_mailing!='Y') $obj->allow_mailing = 'N';
+			if($obj->allow_mailing!='Y') {
+				$obj->allow_mailing = 'N';
+			}
 			// Set the message option
 			$obj->allow_message = 'Y';
-			if(!in_array($obj->allow_message, array('Y','N','F'))) $obj->allow_message= 'Y';
+			if(!in_array($obj->allow_message, array('Y','N','F'))) {
+				$obj->allow_message= 'Y';
+			}
 			// Get member-join date if the last login time is not found
-			if(!$obj->last_login) $obj->last_login = $obj->regdate;
+			if(!$obj->last_login) {
+				$obj->last_login = $obj->regdate;
+			}
 			// Get a member_srl
 			$obj->member_srl = getNextSequence();
 			$obj->list_order = -1 * $obj->member_srl;
@@ -421,7 +467,9 @@ 
 			$nick_args = new stdClass;
 			$nick_args->nick_name = $obj->nick_name;
 			$nick_output = executeQuery('member.getMemberSrl', $nick_args);
-			if(!$nick_output->toBool()) $obj->nick_name .= '_'.$obj->member_srl;
+			if(!$nick_output->toBool()) {
+				$obj->nick_name .= '_'.$obj->member_srl;
+			}
 			// Add a member
 			$output = executeQuery('member.insertMember', $obj);
 
@@ -477,7 +525,9 @@ 
 					$signature_buff = sprintf('<?php if(!defined("__XE__")) exit();?>%s', $signature);
 
 					$target_path = sprintf('files/member_extra_info/signature/%s/', getNumberingPath($obj->member_srl));
-					if(!is_dir($target_path)) FileHandler::makeDir($target_path);
+					if(!is_dir($target_path)) {
+						FileHandler::makeDir($target_path);
+					}
 					$target_filename = sprintf('%s%d.signature.php', $target_path, $obj->member_srl);
 
 					FileHandler::writeFile($target_filename, $signature_buff);
@@ -499,23 +549,31 @@ 
 	 */
 	function importMessage($key, $cur, $index_file)
 	{
-		if(!$cur) $cur = 0;
+		if(!$cur) {
+			$cur = 0;
+		}
 		// Create the xmlParser object
 		$oXmlParser = new XmlParser();
 		// Open an index file
 		$f = fopen($index_file,"r");
 		// Pass if already read
-		for($i=0;$i<$cur;$i++) fgets($f, 1024);
+		for($i=0;$i<$cur;$i++) {
+			fgets($f, 1024);
+		}
 		// Read each line until the condition meets
 		for($idx=$cur;$idx<$cur+$this->unit_count;$idx++)
 		{
-			if(feof($f)) break;
+			if(feof($f)) {
+				break;
+			}
 			// Find a location
 			$target_file = trim(fgets($f, 1024));
 			// Load and parse the file
 			$xmlObj = $oXmlParser->loadXmlFile($target_file);
 			FileHandler::removeFile($target_file);
-			if(!$xmlObj) continue;
+			if(!$xmlObj) {
+				continue;
+			}
 			// List objects
 			$obj = null;
 			$obj->receiver = base64_decode($xmlObj->message->receiver->body);
@@ -526,7 +584,9 @@ 
 			$obj->regdate = base64_decode($xmlObj->message->regdate->body);
 			$obj->readed_date = base64_decode($xmlObj->message->readed_date->body);
 			// Get member_srl of sender/recipient (If not exists, pass)
-			if(!$obj->sender) continue;
+			if(!$obj->sender) {
+				continue;
+			}
 			$sender_args->user_id = $obj->sender;
 			$sender_output = executeQuery('member.getMemberInfo',$sender_args);
 			$sender_srl = $sender_output->data->member_srl;
@@ -537,10 +597,14 @@ 
 				$sender_output = executeQuery('member.getMemberInfoByEmailAddress',$sender_args);
 				$sender_srl = $sender_output->data->member_srl;
 			}
-			if(!$sender_srl) continue;
+			if(!$sender_srl) {
+				continue;
+			}
 
 			$receiver_args->user_id = $obj->receiver;
-			if(!$obj->receiver) continue;
+			if(!$obj->receiver) {
+				continue;
+			}
 			$receiver_output = executeQuery('member.getMemberInfo',$receiver_args);
 			$receiver_srl = $receiver_output->data->member_srl;
 			if(!$receiver_srl)
@@ -550,7 +614,9 @@ 
 				$receiver_output = executeQuery('member.getMemberInfoByEmailAddress',$receiver_args);
 				$receiver_srl = $receiver_output->data->member_srl;
 			}
-			if(!$receiver_srl) continue;
+			if(!$receiver_srl) {
+				continue;
+			}
 			// Message to save into sender's message box
 			$sender_args->sender_srl = $sender_srl;
 			$sender_args->receiver_srl = $receiver_srl;
@@ -571,7 +637,9 @@ 
 				$receiver_args->message_srl = $sender_args->related_srl;
 				$receiver_args->list_order = $sender_args->related_srl*-1;
 				$receiver_args->sender_srl = $sender_srl;
-				if(!$receiver_args->sender_srl) $receiver_args->sender_srl = $receiver_srl;
+				if(!$receiver_args->sender_srl) {
+					$receiver_args->sender_srl = $receiver_srl;
+				}
 				$receiver_args->receiver_srl = $receiver_srl;
 				$receiver_args->message_type = 'R';
 				$receiver_args->title = $obj->title;
@@ -605,7 +673,9 @@ 
 		$oDocumentModel = getModel('document');
 		$category_list = $category_titles = array();
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
-		if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
+		if(count($category_list)) {
+			foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
+		}
 		// Extract category information
 		$category_file = preg_replace('/index$/i', 'category.xml', $index_file);
 		if(file_exists($category_file))
@@ -618,12 +688,16 @@ 
 			$categories = $xmlDoc->items->category;
 			if($categories)
 			{
-				if(!is_array($categories)) $categories = array($categories);
+				if(!is_array($categories)) {
+					$categories = array($categories);
+				}
 				$match_sequence = array();
 				foreach($categories as $k => $v)
 				{
 					$category = trim(base64_decode($v->body));
-					if(!$category || $category_titles[$category]) continue;
+					if(!$category || $category_titles[$category]) {
+						continue;
+					}
 
 					$sequence = $v->attrs->sequence;
 					$parent = $v->attrs->parent;
@@ -631,10 +705,14 @@ 
 					$obj = null;
 					$obj->title = $category;
 					$obj->module_srl = $module_srl;
-					if($parent) $obj->parent_srl = $match_sequence[$parent];
+					if($parent) {
+						$obj->parent_srl = $match_sequence[$parent];
+					}
 
 					$output = $oDocumentController->insertCategory($obj);
-					if($output->toBool()) $match_sequence[$sequence] = $output->get('category_srl');
+					if($output->toBool()) {
+						$match_sequence[$sequence] = $output->get('category_srl');
+					}
 				}
 				$oDocumentController = getController('document');
 				$oDocumentController->makeCategoryFile($module_srl);
@@ -644,31 +722,45 @@ 
 
 		$category_list = $category_titles = array();
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
-		if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
+		if(count($category_list)) {
+			foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
+		}
 
 		$ek_args->module_srl = $module_srl;
 		$output = executeQueryArray('document.getDocumentExtraKeys', $ek_args);
 		if($output->data)
 		{
-			foreach($output->data as $key => $val) $extra_keys[$val->eid] = true;
+			foreach($output->data as $key => $val) {
+				$extra_keys[$val->eid] = true;
+			}
 		}
 
-		if(!$cur) $cur = 0;
+		if(!$cur) {
+			$cur = 0;
+		}
 		// Open an index file
 		$f = fopen($index_file,"r");
 		// Pass if already read
-		for($i=0;$i<$cur;$i++) fgets($f, 1024);
+		for($i=0;$i<$cur;$i++) {
+			fgets($f, 1024);
+		}
 		// Read each line until the condition meets
 		for($idx=$cur;$idx<$cur+$this->unit_count;$idx++)
 		{
-			if(feof($f)) break;
+			if(feof($f)) {
+				break;
+			}
 			// Find a location
 			$target_file = trim(fgets($f, 1024));
 
-			if(!file_exists($target_file)) continue;
+			if(!file_exists($target_file)) {
+				continue;
+			}
 			// Importing data from now on
 			$fp = fopen($target_file,"r");
-			if(!$fp) continue;
+			if(!$fp) {
+				continue;
+			}
 
 			$obj = new stdClass;
 			$obj->module_srl = $module_srl;
@@ -688,38 +780,38 @@ 
 				{
 					$started = true;
 					// Trackback inserted
-				}
-				else if(substr($str,0,11) == '<trackbacks')
+				} else if(substr($str,0,11) == '<trackbacks')
 				{
 					$obj->trackback_count = $this->importTrackbacks($fp, $module_srl, $obj->document_srl);
 					continue;
 					// Comments inserted
-				}
-				else if(substr($str,0,9) == '<comments')
+				} else if(substr($str,0,9) == '<comments')
 				{
 					$obj->comment_count = $this->importComments($fp, $module_srl, $obj->document_srl);
 					continue;
 					// Attachment inserted
-				}
-				else if(substr($str,0,9) == '<attaches')
+				} else if(substr($str,0,9) == '<attaches')
 				{
 					$obj->uploaded_count = $this->importAttaches($fp, $module_srl, $obj->document_srl, $files);
 					continue;
 					// When starting extra variabls
-				}
-				elseif(trim($str) == '<extra_vars>')
+				} elseif(trim($str) == '<extra_vars>')
 				{
 					$extra_vars = $this->importExtraVars($fp);
 					continue;
 				}
 
-				if($started) $buff[] = $str;
+				if($started) {
+					$buff[] = $str;
+				}
 			}
 
 			$xmlDoc = $this->oXmlParser->parse(implode('', $buff));
 
 			$category = base64_decode($xmlDoc->post->category->body);
-			if($category_titles[$category]) $obj->category_srl = $category_titles[$category];
+			if($category_titles[$category]) {
+				$obj->category_srl = $category_titles[$category];
+			}
 
 			$obj->member_srl = 0;
 
@@ -733,16 +825,22 @@ 
 			$obj->password = base64_decode($xmlDoc->post->password->body);
 			$obj->user_name = base64_decode($xmlDoc->post->user_name->body);
 			$obj->nick_name = base64_decode($xmlDoc->post->nick_name->body);
-			if(!$obj->user_name) $obj->user_name = $obj->nick_name;
+			if(!$obj->user_name) {
+				$obj->user_name = $obj->nick_name;
+			}
 			$obj->user_id = base64_decode($xmlDoc->post->user_id->body);
 			$obj->email_address = base64_decode($xmlDoc->post->email->body);
 			$obj->homepage = base64_decode($xmlDoc->post->homepage->body);
-			if($obj->homepage && strncasecmp('http://', $obj->homepage, 7) !== 0 && strncasecmp('https://', $obj->homepage, 8) !== 0) $obj->homepage = 'http://'.$obj->homepage;
+			if($obj->homepage && strncasecmp('http://', $obj->homepage, 7) !== 0 && strncasecmp('https://', $obj->homepage, 8) !== 0) {
+				$obj->homepage = 'http://'.$obj->homepage;
+			}
 			$obj->tags = base64_decode($xmlDoc->post->tags->body);
 			$obj->regdate = base64_decode($xmlDoc->post->regdate->body);
 			$obj->last_update = base64_decode($xmlDoc->post->update->body);
 			$obj->last_updater = base64_decode($xmlDoc->post->last_updater->body);
-			if(!$obj->last_update) $obj->last_update = $obj->regdate;
+			if(!$obj->last_update) {
+				$obj->last_update = $obj->regdate;
+			}
 			$obj->ipaddress = base64_decode($xmlDoc->post->ipaddress->body);
 			$obj->list_order = $obj->update_order = $obj->document_srl*-1;
 			$obj->commentStatus = base64_decode($xmlDoc->post->allow_comment->body)!='N'?'ALLOW':'DENY';
@@ -773,7 +871,9 @@ 
 					$args->document_srl = $obj->document_srl;
 					$args->tag = trim($tag_list[$i]);
 					$args->regdate = $obj->regdate;
-					if(!$args->tag) continue;
+					if(!$args->tag) {
+						continue;
+					}
 					$output = executeQuery('tag.insertTag', $args);
 				}
 
@@ -783,7 +883,9 @@ 
 			{
 				foreach($extra_vars as $key => $val)
 				{
-					if(!$val->value) continue;
+					if(!$val->value) {
+						continue;
+					}
 					unset($e_args);
 					$e_args->module_srl = $module_srl;
 					$e_args->document_srl = $obj->document_srl;
@@ -816,7 +918,9 @@ 
 
 		fclose($f);
 		// Sync category counts
-		if(count($category_list)) foreach($category_list as $key => $val) $oDocumentController->updateCategoryCount($module_srl, $val->category_srl);
+		if(count($category_list)) {
+			foreach($category_list as $key => $val) $oDocumentController->updateCategoryCount($module_srl, $val->category_srl);
+		}
 
 		return $idx-1;
 	}
@@ -838,11 +942,17 @@ 
 		{
 			$str = fgets($fp, 1024);
 			// If </trackbacks> is, break
-			if(trim($str) == '</trackbacks>') break;
+			if(trim($str) == '</trackbacks>') {
+				break;
+			}
 			// If <trackback>, start importing
-			if(trim($str) == '<trackback>') $started = true;
+			if(trim($str) == '<trackback>') {
+				$started = true;
+			}
 
-			if($started) $buff .= $str;
+			if($started) {
+				$buff .= $str;
+			}
 			// If </trackback>, insert to the DB
 			if(trim($str) == '</trackback>')
 			{
@@ -860,7 +970,9 @@ 
 				$obj->ipaddress = base64_decode($xmlDoc->trackback->ipaddress->body);
 				$obj->list_order = -1*$obj->trackback_srl;
 				$output = executeQuery('trackback.insertTrackback', $obj);
-				if($output->toBool()) $cnt++;
+				if($output->toBool()) {
+					$cnt++;
+				}
 
 				$buff = null;
 				$started = false;
@@ -888,7 +1000,9 @@ 
 		{
 			$str = fgets($fp, 1024);
 			// If </comments> is, break
-			if(trim($str) == '</comments>') break;
+			if(trim($str) == '</comments>') {
+				break;
+			}
 			// If <comment> is, start importing
 			if(trim($str) == '<comment>')
 			{
@@ -904,7 +1018,9 @@ 
 				continue;
 			}
 
-			if($started) $buff .= $str;
+			if($started) {
+				$buff .= $str;
+			}
 			// If </comment> is, insert to the DB
 			if(trim($str) == '</comment>')
 			{
@@ -916,8 +1032,11 @@ 
 
 				$obj->module_srl = $module_srl;
 
-				if($parent) $obj->parent_srl = $sequences[$parent];
-				else $obj->parent_srl = 0;
+				if($parent) {
+					$obj->parent_srl = $sequences[$parent];
+				} else {
+					$obj->parent_srl = 0;
+				}
 
 				$obj->document_srl = $document_srl;
 				$obj->is_secret = base64_decode($xmlDoc->comment->is_secret->body)=='Y'?'Y':'N';
@@ -928,14 +1047,18 @@ 
 				$obj->password = base64_decode($xmlDoc->comment->password->body);
 				$obj->user_name =base64_decode($xmlDoc->comment->user_name->body);
 				$obj->nick_name = base64_decode($xmlDoc->comment->nick_name->body);
-				if(!$obj->user_name) $obj->user_name = $obj->nick_name;
+				if(!$obj->user_name) {
+					$obj->user_name = $obj->nick_name;
+				}
 				$obj->user_id = base64_decode($xmlDoc->comment->user_id->body);
 				$obj->member_srl = 0;
 				$obj->email_address = base64_decode($xmlDoc->comment->email->body);
 				$obj->homepage = base64_decode($xmlDoc->comment->homepage->body);
 				$obj->regdate = base64_decode($xmlDoc->comment->regdate->body);
 				$obj->last_update = base64_decode($xmlDoc->comment->update->body);
-				if(!$obj->last_update) $obj->last_update = $obj->regdate;
+				if(!$obj->last_update) {
+					$obj->last_update = $obj->regdate;
+				}
 				$obj->ipaddress = base64_decode($xmlDoc->comment->ipaddress->body);
 				$obj->status = base64_decode($xmlDoc->comment->status->body)==''?'1':base64_decode($xmlDoc->comment->status->body);
 				$obj->list_order = $obj->comment_srl*-1;
@@ -959,24 +1082,28 @@ 
 					$list_args->head = $list_args->arrange = $obj->comment_srl;
 					$list_args->depth = 0;
 					// Get parent_srl if parent comment exists
-				}
-				else
+				} else
 				{
 					// Get parent comment infomation
 					$parent_args->comment_srl = $obj->parent_srl;
 					$parent_output = executeQuery('comment.getCommentListItem', $parent_args);
 					// Return if parent comment doesn't exist
-					if(!$parent_output->toBool() || !$parent_output->data) continue;
+					if(!$parent_output->toBool() || !$parent_output->data) {
+						continue;
+					}
 					$parent = $parent_output->data;
 
 					$list_args->head = $parent->head;
 					$list_args->depth = $parent->depth+1;
-					if($list_args->depth<2) $list_args->arrange = $obj->comment_srl;
-					else
+					if($list_args->depth<2) {
+						$list_args->arrange = $obj->comment_srl;
+					} else
 					{
 						$list_args->arrange = $parent->arrange;
 						$output = executeQuery('comment.updateCommentListArrange', $list_args);
-						if(!$output->toBool()) return $output;
+						if(!$output->toBool()) {
+							return $output;
+						}
 					}
 				}
 
@@ -984,7 +1111,9 @@ 
 				if($output->toBool())
 				{
 					$output = executeQuery('comment.insertComment', $obj);
-					if($output->toBool()) $cnt++;
+					if($output->toBool()) {
+						$cnt++;
+					}
 				}
 
 				$buff = null;
@@ -1014,7 +1143,9 @@ 
 		{
 			$str = trim(fgets($fp, 1024));
 			// If it ends with </attaches>, break
-			if(trim($str) == '</attaches>') break;
+			if(trim($str) == '</attaches>') {
+				break;
+			}
 			// If it starts with <attach>, collect attachments
 			if(trim($str) == '<attach>')
 			{
@@ -1025,14 +1156,15 @@ 
 				$started = true;
 				$buff = null;
 				// If it starts with <file>, handle the attachement in xml file
-			}
-			else if(trim($str) == '<file>')
+			} else if(trim($str) == '<file>')
 			{
 				$file_obj->file = $this->saveTemporaryFile($fp);
 				continue;
 			}
 
-			if($started) $buff .= $str;
+			if($started) {
+				$buff .= $str;
+			}
 			// If it ends with </attach>, handle attachements
 			if(trim($str) == '</attach>')
 			{
@@ -1045,8 +1177,9 @@ 
 				{
 					$url = base64_decode($xmlDoc->attach->url->body);
 					$path = base64_decode($xmlDoc->attach->path->body);
-					if($path && file_exists($path)) $file_obj->file = $path;
-					else
+					if($path && file_exists($path)) {
+						$file_obj->file = $path;
+					} else
 					{
 						$file_obj->file = $this->getTmpFilename();
 						FileHandler::getRemoteFile($url, $file_obj->file);
@@ -1077,21 +1210,21 @@ 
 						}
 
 						$file_obj->direct_download = 'Y';
-					}
-					else
+					} else
 					{
 						$path = sprintf("./files/attach/binaries/%s/%s", $module_srl, getNumberingPath($upload_target_srl,3));
 						$filename = $path.$random->createSecureSalt(32, 'hex');
 						$file_obj->direct_download = 'N';
 					}
 					// Create a directory
-					if(!FileHandler::makeDir($path)) continue;
+					if(!FileHandler::makeDir($path)) {
+						continue;
+					}
 
 					if(strncmp('./files/cache/importer/', $file_obj->file, 23) === 0)
 					{
 						FileHandler::rename($file_obj->file, $filename);
-					}
-					else
+					} else
 					{
 						copy($file_obj->file, $filename);
 					}
@@ -1113,8 +1246,11 @@ 
 							$uploaded_count++;
 							$tmp_obj = null;
 							$tmp_obj->source_filename = $file_obj->source_filename;
-							if($file_obj->direct_download == 'Y') $files[$file_obj->source_filename] = $file_obj->uploaded_filename;
-							else $files[$file_obj->source_filename] = getUrl('','module','file','act','procFileDownload','file_srl',$file_obj->file_srl,'sid',$file_obj->sid);
+							if($file_obj->direct_download == 'Y') {
+								$files[$file_obj->source_filename] = $file_obj->uploaded_filename;
+							} else {
+								$files[$file_obj->source_filename] = getUrl('','module','file','act','procFileDownload','file_srl',$file_obj->file_srl,'sid',$file_obj->sid);
+							}
 						}
 					}
 				}
@@ -1132,7 +1268,9 @@ 
 		$path = "./files/cache/importer";
 		FileHandler::makeDir($path);
 		$filename = sprintf("%s/%d", $path, rand(11111111,99999999));
-		if(file_exists($filename)) $filename .= rand(111,999);
+		if(file_exists($filename)) {
+			$filename .= rand(111,999);
+		}
 		return $filename;
 	}
 
@@ -1150,7 +1288,9 @@ 
 		while(!feof($fp))
 		{
 			$str = trim(fgets($fp, 1024));
-			if(trim($str) == '</file>') break;
+			if(trim($str) == '</file>') {
+				break;
+			}
 
 			$buff .= $str;
 
@@ -1176,14 +1316,20 @@ 
 		while(!feof($fp))
 		{
 			$buff .= $str = trim(fgets($fp, 1024));
-			if(trim($str) == '</extra_vars>') break;
+			if(trim($str) == '</extra_vars>') {
+				break;
+			}
+		}
+		if(!$buff) {
+			return array();
 		}
-		if(!$buff) return array();
 
 		$buff = '<extra_vars>'.$buff;
 		$oXmlParser = new XmlParser();
 		$xmlDoc = $this->oXmlParser->parse($buff);
-		if(!count($xmlDoc->extra_vars->key)) return array();
+		if(!count($xmlDoc->extra_vars->key)) {
+			return array();
+		}
 
 		$index = 1;
 		foreach($xmlDoc->extra_vars->key as $k => $v)
@@ -1196,8 +1342,7 @@ 
 				$vobj->value = base64_decode($v->value->body);
 				$vobj->eid = base64_decode($v->eid->body);
 
-			}
-			else if($v->body)
+			} else if($v->body)
 			{
 				$vobj->var_idx = $index;
 				$vobj->lang_code = Context::getLangType();

modules/layout/layout.admin.controller.php

Doc Comments +6 added lines, -6 removed lines

@@ -420,7 +420,7 @@ 
 	/**
 	 * insert image into user layout
 	 * @param int $layout_srl
-	 * @param object $source file data
+	 * @param string $source file data
 	 * @return boolean (true : success, false : fail)
 	 */
 	function insertUserLayoutImage($layout_srl,$source)
@@ -544,7 +544,7 @@ 
 	/**
 	 * Add the widget code for faceoff into user layout file
 	 * @param int $layout_srl
-	 * @param object $arg
+	 * @param null|stdClass $arg
 	 * @param string $content
 	 * @return string
 	 */
@@ -586,7 +586,7 @@ 
 
 	/**
 	 * export user layout
-	 * @return void
+	 * @return BaseObject|null
 	 */
 	function procLayoutAdminUserLayoutExport()
 	{
@@ -682,7 +682,7 @@ 
 	/**
 	 * faceoff import
 	 * @deprecated
-	 * @return void
+	 * @return ModuleObject|null
 	 */
 	function procLayoutAdminUserLayoutImport()
 	{
@@ -709,7 +709,7 @@ 
 
 	/**
 	 * layout copy
-	 * @return void
+	 * @return BaseObject|null
 	 */
 	function procLayoutAdminCopyLayout()
 	{
@@ -843,7 +843,7 @@ 
 	/**
 	 * Layout file copy
 	 * @param $sourceLayoutSrl origin layout number
-	 * @param $targetLayoutSrl origin layout number
+	 * @param integer $targetLayoutSrl origin layout number
 	 * @return void
 	 */
 	function _copyLayoutFile($sourceLayoutSrl, $targetLayoutSrl)

Spacing +144 added lines, -144 removed lines

@@ -23,20 +23,20 @@ 
 	 */
 	function procLayoutAdminInsert()
 	{
-		if(Context::get('layout') == 'faceoff') return $this->stop('not supported');
+		if (Context::get('layout') == 'faceoff') return $this->stop('not supported');
 
 		// Get information to create a layout
 		$site_module_info = Context::get('site_module_info');
-		$args->site_srl = (int)$site_module_info->site_srl;
+		$args->site_srl = (int) $site_module_info->site_srl;
 		$args->layout_srl = getNextSequence();
 		$args->layout = Context::get('layout');
 		$args->title = Context::get('title');
 		$args->layout_type = Context::get('_layout_type');
-		if(!$args->layout_type) $args->layout_type = "P";
+		if (!$args->layout_type) $args->layout_type = "P";
 
 		// Insert into the DB
 		$output = $this->insertLayout($args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// initiate if it is faceoff layout
 		$this->initLayout($args->layout_srl, $args->layout);
@@ -70,7 +70,7 @@ 
 	{
 		$oLayoutModel = getModel('layout');
 		// Import a sample layout if it is faceoff
-		if($oLayoutModel->useDefaultLayout($layout_name))
+		if ($oLayoutModel->useDefaultLayout($layout_name))
 		{
 			$this->importLayout($layout_srl, $this->module_path.'tpl/faceOff_sample.tar');
 			// Remove a directory
@@ -101,25 +101,25 @@ 
 		$is_sitemap = $extra_vars->is_sitemap;
 		unset($extra_vars->is_sitemap);
 
-		$args = Context::gets('layout_srl','title');
+		$args = Context::gets('layout_srl', 'title');
 		// Get layout information
 		$oLayoutModel = getModel('layout');
 		$oMenuAdminModel = getAdminModel('menu');
 		$layout_info = $oLayoutModel->getLayout($args->layout_srl);
 
-		if($layout_info->menu)
+		if ($layout_info->menu)
 		{
 			$menus = get_object_vars($layout_info->menu);
 		}
-		if(count($menus))
+		if (count($menus))
 		{
-			foreach($menus as $menu_id => $val)
+			foreach ($menus as $menu_id => $val)
 			{
 				$menu_srl = Context::get($menu_id);
-				if(!$menu_srl) continue;
+				if (!$menu_srl) continue;
 
 				// if menu is -1, get default menu in site
-				if($menu_srl == -1)
+				if ($menu_srl == -1)
 				{
 					$oModuleModel = getModel('module');
 					$start_module = $oModuleModel->getSiteInfo(0, $columnList);
@@ -127,7 +127,7 @@ 
 					$tmpArgs->url = $start_module->mid;
 					$tmpArgs->site_srl = 0;
 					$output = executeQuery('menu.getMenuItemByUrl', $tmpArgs);
-					if(!$output->toBool())
+					if (!$output->toBool())
 					{
 						return new BaseObject(-1, 'fail_to_update');
 					}
@@ -143,31 +143,31 @@ 
 				$apply_layout = Context::get('apply_layout');
 				$apply_mobile_view = Context::get('apply_mobile_view');
 
-				if($apply_layout=='Y' || $apply_mobile_view=='Y')
+				if ($apply_layout == 'Y' || $apply_mobile_view == 'Y')
 				{
 					$menu_args = new stdClass();
 					$menu_args->menu_srl = $menu_srl;
 					$menu_args->site_srl = $layout_info->site_srl;
 					$output = executeQueryArray('layout.getLayoutModules', $menu_args);
-					if($output->data)
+					if ($output->data)
 					{
 						$modules = array();
-						for($i=0;$i<count($output->data);$i++)
+						for ($i = 0; $i < count($output->data); $i++)
 						{
 							$modules[] = $output->data[$i]->module_srl;
 						}
 
-						if(count($modules))
+						if (count($modules))
 						{
 							$update_args = new stdClass();
-							$update_args->module_srls = implode(',',$modules);
-							if($apply_layout == "Y")
+							$update_args->module_srls = implode(',', $modules);
+							if ($apply_layout == "Y")
 							{
 								$update_args->layout_srl = $args->layout_srl;
 							}
-							if($layout_info->layout_type == "M")
+							if ($layout_info->layout_type == "M")
 							{
-								if(Context::get('apply_mobile_view') == "Y")
+								if (Context::get('apply_mobile_view') == "Y")
 								{
 									$update_args->use_mobile = "Y";
 								}
@@ -179,7 +179,7 @@ 
 							}
 
 							$oCacheHandler = CacheHandler::getInstance('object', null, true);
-							if($oCacheHandler->isSupport())
+							if ($oCacheHandler->isSupport())
 							{
 								$oCacheHandler->invalidateGroupKey('site_and_module');
 							}
@@ -191,21 +191,21 @@ 
 
 		$tmpDir = sprintf('./files/attach/images/%s/tmp', $args->layout_srl);
 		// Separately handle if a type of extra_vars is an image
-		if($layout_info->extra_var)
+		if ($layout_info->extra_var)
 		{
-			foreach($layout_info->extra_var as $name => $vars)
+			foreach ($layout_info->extra_var as $name => $vars)
 			{
-				if($vars->type!='image') continue;
+				if ($vars->type != 'image') continue;
 
 				$fileName = $extra_vars->{$name};
-				if($vars->value == $fileName)
+				if ($vars->value == $fileName)
 				{
 					continue;
 				}
 
 				FileHandler::removeFile($vars->value);
 
-				if(!$fileName)
+				if (!$fileName)
 				{
 					continue;
 				}
@@ -213,7 +213,7 @@ 
 				$pathInfo = pathinfo($fileName);
 				$tmpFileName = sprintf('%s/tmp/%s', $pathInfo['dirname'], $pathInfo['basename']);
 
-				if(!FileHandler::moveFile($tmpFileName, $fileName))
+				if (!FileHandler::moveFile($tmpFileName, $fileName))
 				{
 					unset($extra_vars->{$name});
 				}
@@ -225,21 +225,21 @@ 
 		$oModuleController = getController('module');
 		$layout_config = new stdClass();
 		$layout_config->header_script = Context::get('header_script');
-		$oModuleController->insertModulePartConfig('layout',$args->layout_srl,$layout_config);
+		$oModuleController->insertModulePartConfig('layout', $args->layout_srl, $layout_config);
 		// Save a title of the menu
 		$extra_vars->menu_name_list = $menu_name_list;
 		// Variable setting for DB insert
 		$args->extra_vars = serialize($extra_vars);
 
 		$output = $this->updateLayout($args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
 		FileHandler::removeDir($tmpDir);
 
-		if(!$is_sitemap)
+		if (!$is_sitemap)
 		{
 			return $this->setRedirectUrl(Context::get('error_return_url'), $output);
 		}
@@ -258,7 +258,7 @@ 
 	 */
 	function updateLayout($args) {
 		$output = executeQuery('layout.updateLayout', $args);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$oLayoutModel = getModel('layout');
 			$cache_file = $oLayoutModel->getUserLayoutCache($args->layout_srl, Context::getLangType());
@@ -289,13 +289,13 @@ 
 	{
 		$oLayoutModel = getModel('layout');
 
-		if($force)
+		if ($force)
 		{
 			$layoutInfo = $oLayoutModel->getLayout($layout_srl);
-			if($layoutInfo)
+			if ($layoutInfo)
 			{
 				$layoutList = $oLayoutModel->getLayoutInstanceList($layoutInfo->site_srl, $layoutInfo->layout_type, $layoutInfo->layout, array('layout_srl', 'layout'));
-				if(count($layoutList) <= 1)
+				if (count($layoutList) <= 1)
 				{
 					// uninstall package
 					$path = $layoutInfo->path;
@@ -304,7 +304,7 @@ 
 					$packageSrl = $oAutoinstallModel->getPackageSrlByPath($path);
 					$oAutoinstallAdminController = getAdminController('autoinstall');
 
-					if($packageSrl)
+					if ($packageSrl)
 					{
 						$output = $oAutoinstallAdminController->uninstallPackageByPackageSrl($packageSrl);
 					}
@@ -313,7 +313,7 @@ 
 						$output = $oAutoinstallAdminController->uninstallPackageByPath($path);
 					}
 
-					if(!$output->toBool())
+					if (!$output->toBool())
 					{
 						return new BaseObject(-1, $output->message);
 					}
@@ -331,9 +331,9 @@ 
 		$args->layout_srl = $layout_srl;
 		$output = executeQuery("layout.deleteLayout", $args);
 
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		return new BaseObject(0,'success_deleted');
+		return new BaseObject(0, 'success_deleted');
 	}
 
 	/**
@@ -353,7 +353,7 @@ 
 		$code_css   = Context::get('code_css');
 		$is_post    = ($_SERVER['REQUEST_METHOD'] == 'POST');
 
-		if(!$layout_srl || !$code || !$is_post)
+		if (!$layout_srl || !$code || !$is_post)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -376,7 +376,7 @@ 
 	function procLayoutAdminCodeReset()
 	{
 		$layout_srl = Context::get('layout_srl');
-		if(!$layout_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$layout_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		// delete user layout file
 		$oLayoutModel = getModel('layout');
@@ -386,7 +386,7 @@ 
 		$info = $oLayoutModel->getLayout($layout_srl);
 
 		// if face off delete, tmp file
-		if($oLayoutModel->useDefaultLayout($info->layout))
+		if ($oLayoutModel->useDefaultLayout($info->layout))
 		{
 			$this->deleteUserLayoutTempFile($layout_srl);
 			$faceoff_css = $oLayoutModel->getUserLayoutFaceOffCss($layout_srl);
@@ -404,11 +404,11 @@ 
 	 */
 	function procLayoutAdminUserImageUpload()
 	{
-		if(!Context::isUploaded()) exit();
+		if (!Context::isUploaded()) exit();
 
 		$image = Context::get('user_layout_image');
 		$layout_srl = Context::get('layout_srl');
-		if(!is_uploaded_file($image['tmp_name'])) exit();
+		if (!is_uploaded_file($image['tmp_name'])) exit();
 
 		$this->insertUserLayoutImage($layout_srl, $image);
 		$this->setTemplatePath($this->module_path.'tpl');
@@ -423,24 +423,24 @@ 
 	 * @param object $source file data
 	 * @return boolean (true : success, false : fail)
 	 */
-	function insertUserLayoutImage($layout_srl,$source)
+	function insertUserLayoutImage($layout_srl, $source)
 	{
 		$oLayoutModel = getModel('layout');
 		$path = $oLayoutModel->getUserLayoutImagePath($layout_srl);
-		if(!is_dir($path)) FileHandler::makeDir($path);
+		if (!is_dir($path)) FileHandler::makeDir($path);
 
 		$filename = strtolower($source['name']);
-		if($filename != urlencode($filename))
+		if ($filename != urlencode($filename))
 		{
-			$ext = substr(strrchr($filename,'.'),1);
+			$ext = substr(strrchr($filename, '.'), 1);
 			$filename = sprintf('%s.%s', md5($filename), $ext);
 		}
 
 		// Check uploaded file
-		if(!checkUploadedFile($source['tmp_name'])) return false;
+		if (!checkUploadedFile($source['tmp_name'])) return false;
 		
-		if(file_exists($path .'/'. $filename)) @unlink($path . $filename);
-		if(!move_uploaded_file($source['tmp_name'], $path . $filename )) return false;
+		if (file_exists($path.'/'.$filename)) @unlink($path.$filename);
+		if (!move_uploaded_file($source['tmp_name'], $path.$filename)) return false;
 		return true;
 	}
 
@@ -452,7 +452,7 @@ 
 	{
 		$filename = Context::get('filename');
 		$layout_srl = Context::get('layout_srl');
-		$this->removeUserLayoutImage($layout_srl,$filename);
+		$this->removeUserLayoutImage($layout_srl, $filename);
 		$this->setMessage('success_deleted');
 		$this->setRedirectUrl(Context::get('error_return_url'));
 	}
@@ -463,11 +463,11 @@ 
 	 * @param string $filename
 	 * @return void
 	 */
-	function removeUserLayoutImage($layout_srl,$filename)
+	function removeUserLayoutImage($layout_srl, $filename)
 	{
 		$oLayoutModel = getModel('layout');
 		$path = $oLayoutModel->getUserLayoutImagePath($layout_srl);
-		@unlink($path . $filename);
+		@unlink($path.$filename);
 	}
 
 	// deprecated
@@ -482,19 +482,19 @@ 
 		$oModuleModel = getModel('module');
 
 		$mid = Context::get('mid');
-		if(!$mid) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$mid) return new BaseObject(-1, 'msg_invalid_request');
 
 		$site_module_info = Context::get('site_module_info');
 		$columnList = array('layout_srl');
 		$module_info = $oModuleModel->getModuleInfoByMid($mid, $site_module_info->site_srl, $columnList);
 		$layout_srl = $module_info->layout_srl;
-		if(!$layout_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$layout_srl) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oLayoutModel = getModel('layout');
 
 		// save tmp?
 		$temp = Context::get('saveTemp');
-		if($temp =='Y')
+		if ($temp == 'Y')
 		{
 			$oLayoutModel->setUseUserLayoutTemp();
 		}
@@ -504,28 +504,28 @@ 
 			$this->deleteUserLayoutTempFile($layout_srl);
 		}
 
-		$this->add('saveTemp',$temp);
+		$this->add('saveTemp', $temp);
 
 		// write user layout
-		$extension_obj = Context::gets('e1','e2','neck','knee');
+		$extension_obj = Context::gets('e1', 'e2', 'neck', 'knee');
 
 		$file = $oLayoutModel->getUserLayoutHtml($layout_srl);
 		$content = FileHandler::readFile($file);
-		$content = $this->addExtension($layout_srl,$extension_obj,$content);
-		FileHandler::writeFile($file,$content);
+		$content = $this->addExtension($layout_srl, $extension_obj, $content);
+		FileHandler::writeFile($file, $content);
 
 		// write faceoff.css
 		$css = stripslashes(Context::get('css'));
 
 		$css_file = $oLayoutModel->getUserLayoutFaceOffCss($layout_srl);
-		FileHandler::writeFile($css_file,$css);
+		FileHandler::writeFile($css_file, $css);
 
 		// write ini
-		$obj = Context::gets('type','align','column');
-		$obj = (array)$obj;
+		$obj = Context::gets('type', 'align', 'column');
+		$obj = (array) $obj;
 		$src = $oLayoutModel->getUserLayoutIniConfig($layout_srl);
-		foreach($obj as $key => $val) $src[$key] = $val;
-		$this->insertUserLayoutValue($layout_srl,$src);
+		foreach ($obj as $key => $val) $src[$key] = $val;
+		$this->insertUserLayoutValue($layout_srl, $src);
 	}
 
 	/**
@@ -534,7 +534,7 @@ 
 	 * @param object $arr layout ini
 	 * @return void
 	 */
-	function insertUserLayoutValue($layout_srl,$arr)
+	function insertUserLayoutValue($layout_srl, $arr)
 	{
 		$oLayoutModel = getModel('layout');
 		$file = $oLayoutModel->getUserLayoutIni($layout_srl);
@@ -548,24 +548,24 @@ 
 	 * @param string $content
 	 * @return string
 	 */
-	function addExtension($layout_srl,$arg,$content)
+	function addExtension($layout_srl, $arg, $content)
 	{
 		$oLayoutModel = getModel('layout');
 		$reg = '/(<\!\-\- start\-e1 \-\->)(.*)(<\!\-\- end\-e1 \-\->)/i';
-		$extension_content =  '\1' .stripslashes($arg->e1) . '\3';
-		$content = preg_replace($reg,$extension_content,$content);
+		$extension_content = '\1'.stripslashes($arg->e1).'\3';
+		$content = preg_replace($reg, $extension_content, $content);
 
 		$reg = '/(<\!\-\- start\-e2 \-\->)(.*)(<\!\-\- end\-e2 \-\->)/i';
-		$extension_content =  '\1' .stripslashes($arg->e2) . '\3';
-		$content = preg_replace($reg,$extension_content,$content);
+		$extension_content = '\1'.stripslashes($arg->e2).'\3';
+		$content = preg_replace($reg, $extension_content, $content);
 
 		$reg = '/(<\!\-\- start\-neck \-\->)(.*)(<\!\-\- end\-neck \-\->)/i';
-		$extension_content =  '\1' .stripslashes($arg->neck) . '\3';
-		$content = preg_replace($reg,$extension_content,$content);
+		$extension_content = '\1'.stripslashes($arg->neck).'\3';
+		$content = preg_replace($reg, $extension_content, $content);
 
 		$reg = '/(<\!\-\- start\-knee \-\->)(.*)(<\!\-\- end\-knee \-\->)/i';
-		$extension_content =  '\1' .stripslashes($arg->knee) . '\3';
-		$content = preg_replace($reg,$extension_content,$content);
+		$extension_content = '\1'.stripslashes($arg->knee).'\3';
+		$content = preg_replace($reg, $extension_content, $content);
 		return $content;
 	}
 
@@ -578,7 +578,7 @@ 
 	{
 		$oLayoutModel = getModel('layout');
 		$file_list = $oLayoutModel->getUserLayoutTempFileList($layout_srl);
-		foreach($file_list as $key => $file)
+		foreach ($file_list as $key => $file)
 		{
 			FileHandler::removeFile($file);
 		}
@@ -591,7 +591,7 @@ 
 	function procLayoutAdminUserLayoutExport()
 	{
 		$layout_srl = Context::get('layout_srl');
-		if(!$layout_srl) return new BaseObject('-1','msg_invalid_request');
+		if (!$layout_srl) return new BaseObject('-1', 'msg_invalid_request');
 
 		require_once(_XE_PATH_.'libs/tar.class.php');
 		$oLayoutModel = getModel('layout');
@@ -606,30 +606,30 @@ 
 		$file_list = $oLayoutModel->getUserLayoutFileList($layout_srl);
 		unset($file_list[2]);
 
-		foreach($file_list as $file)
+		foreach ($file_list as $file)
 		{
-			if(strncasecmp('images', $file, 6) === 0) continue;
+			if (strncasecmp('images', $file, 6) === 0) continue;
 
 			// replace path
-			$file = $target_path . $file;
+			$file = $target_path.$file;
 			$content = FileHandler::readFile($file);
-			$pattern = '/(http:\/\/[^ ]+)?(\.\/)?' . str_replace('/', '\/', (str_replace('./', '', $file_path))) . '/';
-			if(basename($file) == 'faceoff.css' || basename($file) == 'layout.css')
+			$pattern = '/(http:\/\/[^ ]+)?(\.\/)?'.str_replace('/', '\/', (str_replace('./', '', $file_path))).'/';
+			if (basename($file) == 'faceoff.css' || basename($file) == 'layout.css')
 				$content = preg_replace($pattern, '../', $content);
 			else
 				$content = preg_replace($pattern, './', $content);
 
 			// replace ini config
-			foreach($ini_config as $key => $value)
+			foreach ($ini_config as $key => $value)
 			{
-				$content = str_replace('{$layout_info->faceoff_ini_config[\'' . $key . '\']}', $value, $content);
+				$content = str_replace('{$layout_info->faceoff_ini_config[\''.$key.'\']}', $value, $content);
 			}
 
 			FileHandler::writeFile($file, $content);
 		}
 
 		// make info.xml
-		$info_file = $target_path . 'conf/info.xml';
+		$info_file = $target_path.'conf/info.xml';
 		FileHandler::copyFile('./modules/layout/faceoff/conf/info.xml', $info_file);
 		$content = FileHandler::readFile($info_file);
 		$content = str_replace('type="faceoff"', '', $content);
@@ -637,19 +637,19 @@ 
 		$file_list[] = 'conf/info.xml';
 
 		// make css file
-		$css_file = $target_path . 'css/layout.css';
+		$css_file = $target_path.'css/layout.css';
 		FileHandler::copyFile('./modules/layout/faceoff/css/layout.css', $css_file);
 		$content = FileHandler::readFile('./modules/layout/tpl/css/widget.css');
-		FileHandler::writeFile($css_file, "\n" . $content, 'a');
-		$content = FileHandler::readFile($target_path . 'faceoff.css');
-		FileHandler::writeFile($css_file, "\n" . $content, 'a');
-		$content = FileHandler::readFile($target_path . 'layout.css');
-		FileHandler::writeFile($css_file, "\n" . $content, 'a');
+		FileHandler::writeFile($css_file, "\n".$content, 'a');
+		$content = FileHandler::readFile($target_path.'faceoff.css');
+		FileHandler::writeFile($css_file, "\n".$content, 'a');
+		$content = FileHandler::readFile($target_path.'layout.css');
+		FileHandler::writeFile($css_file, "\n".$content, 'a');
 
 		// css load
-		$content = FileHandler::readFile($target_path . 'layout.html');
-		$content = "<load target=\"css/layout.css\" />\n" . $content;
-		FileHandler::writeFile($target_path . 'layout.html', $content);
+		$content = FileHandler::readFile($target_path.'layout.html');
+		$content = "<load target=\"css/layout.css\" />\n".$content;
+		FileHandler::writeFile($target_path.'layout.html', $content);
 		unset($file_list[3]);
 		unset($file_list[1]);
 		$file_list[] = 'css/layout.css';
@@ -658,16 +658,16 @@ 
 		$tar = new tar();
 		$user_layout_path = FileHandler::getRealPath($oLayoutModel->getUserLayoutPath(0));
 		chdir($user_layout_path);
-		foreach($file_list as $key => $file) $tar->addFile($file);
+		foreach ($file_list as $key => $file) $tar->addFile($file);
 
 		$stream = $tar->toTarStream();
-		$filename = 'faceoff_' . date('YmdHis') . '.tar';
+		$filename = 'faceoff_'.date('YmdHis').'.tar';
 		header("Cache-Control: ");
 		header("Pragma: ");
 		header("Content-Type: application/x-compressed");
-		header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+		header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 		//            header("Content-Length: " .strlen($stream)); ?? why??
-		header('Content-Disposition: attachment; filename="'. $filename .'"');
+		header('Content-Disposition: attachment; filename="'.$filename.'"');
 		header("Content-Transfer-Encoding: binary\n");
 		echo $stream;
 		// Close Context and then exit
@@ -689,18 +689,18 @@ 
 		return $this->stop('not supported');
 
 		// check upload
-		if(!Context::isUploaded()) exit();
+		if (!Context::isUploaded()) exit();
 		$file = Context::get('file');
-		if(!is_uploaded_file($file['tmp_name']) || !checkUploadedFile($file['tmp_name'])) exit();
+		if (!is_uploaded_file($file['tmp_name']) || !checkUploadedFile($file['tmp_name'])) exit();
 
-		if(substr_compare($file['name'], '.tar', -4) !== 0) exit();
+		if (substr_compare($file['name'], '.tar', -4) !== 0) exit();
 
 		$layout_srl = Context::get('layout_srl');
-		if(!$layout_srl) exit();
+		if (!$layout_srl) exit();
 
 		$oLayoutModel = getModel('layout');
 		$user_layout_path = FileHandler::getRealPath($oLayoutModel->getUserLayoutPath($layout_srl));
-		if(!move_uploaded_file($file['tmp_name'], $user_layout_path . 'faceoff.tar')) exit();
+		if (!move_uploaded_file($file['tmp_name'], $user_layout_path.'faceoff.tar')) exit();
 
 		$this->importLayout($layout_srl, $user_layout_path.'faceoff.tar');
 
@@ -714,12 +714,12 @@ 
 	function procLayoutAdminCopyLayout()
 	{
 		$sourceArgs = Context::getRequestVars();
-		if($sourceArgs->layout == 'faceoff')
+		if ($sourceArgs->layout == 'faceoff')
 		{
 			return $this->stop('not supported');
 		}
 
-		if(!$sourceArgs->layout_srl)
+		if (!$sourceArgs->layout_srl)
 		{
 			return $this->stop('msg_empty_origin_layout');
 		}
@@ -727,12 +727,12 @@ 
 		$oLayoutModel = getModel('layout');
 		$layout = $oLayoutModel->getLayout($sourceArgs->layout_srl);
 
-		if(!$sourceArgs->title)
+		if (!$sourceArgs->title)
 		{
 			$sourceArgs->title = array($layout->title.'_'.$this->_makeRandomMid());
 		}
 
-		if(!is_array($sourceArgs->title) || count($sourceArgs->title) == 0)
+		if (!is_array($sourceArgs->title) || count($sourceArgs->title) == 0)
 		{
 			return $this->stop('msg_empty_target_layout');
 		}
@@ -742,11 +742,11 @@ 
 		$args->extra_vars = $output->extra_vars;
 		$extra_vars = unserialize($args->extra_vars);
 		
-		if($layout->extra_var_count) {
+		if ($layout->extra_var_count) {
 			$reg = "/^.\/files\/attach\/images\/([0-9]+)\/(.*)/";
-			if($extra_vars) foreach($extra_vars as $key => $val) {
-				if($layout->extra_var->{$key}->type == 'image') {
-					if(!preg_match($reg,$val,$matches)) continue;
+			if ($extra_vars) foreach ($extra_vars as $key => $val) {
+				if ($layout->extra_var->{$key}->type == 'image') {
+					if (!preg_match($reg, $val, $matches)) continue;
 					$image_list[$key]->filename = $matches[2];
 					$image_list[$key]->old_file = $val;
 				}
@@ -758,19 +758,19 @@ 
 		$layout_config->header_script = $extra_vars->header_script;
 
 		// Get information to create a layout
-		$args->site_srl = (int)$layout->site_srl;
+		$args->site_srl = (int) $layout->site_srl;
 		$args->layout = $layout->layout;
 		$args->layout_type = $layout->layout_type;
-		if(!$args->layout_type) $args->layout_type = "P";
+		if (!$args->layout_type) $args->layout_type = "P";
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 
-		if(is_array($sourceArgs->title))
+		if (is_array($sourceArgs->title))
 		{
-			foreach($sourceArgs->title AS $key=>$value)
+			foreach ($sourceArgs->title AS $key=>$value)
 			{
-				if(!trim($value))
+				if (!trim($value))
 				{
 					continue;
 				}
@@ -778,9 +778,9 @@ 
 				$args->layout_srl = getNextSequence();
 				$args->title = $value;
 
-				if(is_array($image_list)) {
-					foreach($image_list as $key=>$val) {
-						$new_file = sprintf("./files/attach/images/%s/%s", $args->layout_srl,$val->filename);
+				if (is_array($image_list)) {
+					foreach ($image_list as $key=>$val) {
+						$new_file = sprintf("./files/attach/images/%s/%s", $args->layout_srl, $val->filename);
 						FileHandler::copyFile($val->old_file, $new_file);
 						$extra_vars->{$key} = $new_file;
 					}
@@ -792,7 +792,7 @@ 
 
 				// Insert into the DB
 				$output = $this->insertLayout($args);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					$oDB->rollback();
 					return $output;
@@ -815,7 +815,7 @@ 
 		$oDB->commit();
 
 		$this->setMessage('success_registed');
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON'))) {
 			global $lang;
 			htmlHeader();
 			alertScript($lang->success_registed);
@@ -831,9 +831,9 @@ 
 	{
 		$time = $_SERVER['REQUEST_TIME'];
 		$randomString = "";
-		for($i=0;$i<4;$i++)
+		for ($i = 0; $i < 4; $i++)
 		{
-			$doc = rand()%26+65;
+			$doc = rand() % 26 + 65;
 			$randomString .= chr($doc);
 		}
 
@@ -857,12 +857,12 @@ 
 		FileHandler::makeDir($targetImagePath);
 
 		$sourceFileList = $oLayoutModel->getUserLayoutFileList($sourceLayoutSrl);
-		foreach($sourceFileList as $key => $file)
+		foreach ($sourceFileList as $key => $file)
 		{
-			if(is_readable($sourceLayoutPath.$file))
+			if (is_readable($sourceLayoutPath.$file))
 			{
 				FileHandler::copyFile($sourceLayoutPath.$file, $targetLayoutPath.$file);
-				if($file == 'layout.html' || $file == 'layout.css')
+				if ($file == 'layout.html' || $file == 'layout.css')
 				{
 					$this->_changeFilepathInSource($targetLayoutPath.$file, $sourceImagePath, $targetImagePath);
 				}
@@ -893,9 +893,9 @@ 
 		$oLayoutModel = getModel('layout');
 		$user_layout_path = FileHandler::getRealPath($oLayoutModel->getUserLayoutPath($layout_srl));
 		$file_list = $oLayoutModel->getUserLayoutFileList($layout_srl);
-		foreach($file_list as $key => $file)
+		foreach ($file_list as $key => $file)
 		{
-			FileHandler::removeFile($user_layout_path . $file);
+			FileHandler::removeFile($user_layout_path.$file);
 		}
 
 		require_once(_XE_PATH_.'libs/tar.class.php');
@@ -904,12 +904,12 @@ 
 		$tar = new tar();
 		$tar->openTAR($source_file);
 		// If layout.ini file does not exist
-		if(!$tar->getFile('layout.ini')) return;
+		if (!$tar->getFile('layout.ini')) return;
 
-		$replace_path = getNumberingPath($layout_srl,3);
-		foreach($tar->files as $key => $info)
+		$replace_path = getNumberingPath($layout_srl, 3);
+		foreach ($tar->files as $key => $info)
 		{
-			FileHandler::writeFile($user_layout_path . $info['name'],str_replace('__LAYOUT_PATH__',$replace_path,$info['file']));
+			FileHandler::writeFile($user_layout_path.$info['name'], str_replace('__LAYOUT_PATH__', $replace_path, $info['file']));
 		}
 		// Remove uploaded file
 		FileHandler::removeFile($source_file);
@@ -927,32 +927,32 @@ 
 		$this->setTemplatePath($this->module_path.'tpl');
 		$this->setTemplateFile("after_upload_config_image.html");
 
-		if(!$img['tmp_name'] || !is_uploaded_file($img['tmp_name']) || !checkUploadedFile($img['tmp_name']))
+		if (!$img['tmp_name'] || !is_uploaded_file($img['tmp_name']) || !checkUploadedFile($img['tmp_name']))
 		{
 			Context::set('msg', Context::getLang('upload failed'));
 			return;
 		}
 
-		if(!preg_match('/\.(jpg|jpeg|gif|png)$/i', $img['name']))
+		if (!preg_match('/\.(jpg|jpeg|gif|png)$/i', $img['name']))
 		{
 			Context::set('msg', Context::getLang('msg_layout_image_target'));
 			return;
 		}
 
 		$path = sprintf('./files/attach/images/%s/', $layoutSrl);
-		$tmpPath = $path . 'tmp/';
-		if(!FileHandler::makeDir($tmpPath))
+		$tmpPath = $path.'tmp/';
+		if (!FileHandler::makeDir($tmpPath))
 		{
 			Context::set('msg', Context::getLang('make directory failed'));
 			return;
 		}
 
-		$ext = substr(strrchr($img['name'],'.'),1);
-		$_fileName = md5(crypt(rand(1000000,900000), rand(0,100))).'.'.$ext;
-		$fileName = $path . $_fileName;
-		$tmpFileName = $tmpPath . $_fileName;
+		$ext = substr(strrchr($img['name'], '.'), 1);
+		$_fileName = md5(crypt(rand(1000000, 900000), rand(0, 100))).'.'.$ext;
+		$fileName = $path.$_fileName;
+		$tmpFileName = $tmpPath.$_fileName;
 
-		if(!move_uploaded_file($img['tmp_name'], $tmpFileName))
+		if (!move_uploaded_file($img['tmp_name'], $tmpFileName))
 		{
 			Context::set('msg', Context::getLang('move file failed'));
 			return;
@@ -977,9 +977,9 @@ 
 		$oModel = getModel('layout');
 		$layoutInfo = $oModel->getLayout($layoutSrl);
 
-		if($layoutInfo->extra_var_count)
+		if ($layoutInfo->extra_var_count)
 		{
-			foreach($layoutInfo->extra_var as $varId => $val)
+			foreach ($layoutInfo->extra_var as $varId => $val)
 			{
 				$newLayoutInfo->{$varId} = $val->value;
 			}
@@ -990,7 +990,7 @@ 
 		$args->layout_srl = $layoutSrl;
 		$args->extra_vars = serialize($newLayoutInfo);
 		$output = $this->updateLayout($args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			Context::set('msg', Context::getLang($output->getMessage()));
 			return $output;

Braces +94 added lines, -42 removed lines

@@ -23,7 +23,9 @@ 
 	 */
 	function procLayoutAdminInsert()
 	{
-		if(Context::get('layout') == 'faceoff') return $this->stop('not supported');
+		if(Context::get('layout') == 'faceoff') {
+			return $this->stop('not supported');
+		}
 
 		// Get information to create a layout
 		$site_module_info = Context::get('site_module_info');
@@ -32,11 +34,15 @@ 
 		$args->layout = Context::get('layout');
 		$args->title = Context::get('title');
 		$args->layout_type = Context::get('_layout_type');
-		if(!$args->layout_type) $args->layout_type = "P";
+		if(!$args->layout_type) {
+			$args->layout_type = "P";
+		}
 
 		// Insert into the DB
 		$output = $this->insertLayout($args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// initiate if it is faceoff layout
 		$this->initLayout($args->layout_srl, $args->layout);
@@ -44,7 +50,9 @@ 
 		// update layout info
 		Context::set('layout_srl', $args->layout_srl);
 		$output = $this->procLayoutAdminUpdate();
-		if (!$output->toBool()) return $output;
+		if (!$output->toBool()) {
+			return $output;
+		}
 
 		return $this->setRedirectUrl(Context::get('success_return_url'), $output);
 	}
@@ -74,8 +82,7 @@ 
 		{
 			$this->importLayout($layout_srl, $this->module_path.'tpl/faceOff_sample.tar');
 			// Remove a directory
-		}
-		else
+		} else
 		{
 			FileHandler::removeDir($oLayoutModel->getUserLayoutPath($layout_srl));
 		}
@@ -116,7 +123,9 @@ 
 			foreach($menus as $menu_id => $val)
 			{
 				$menu_srl = Context::get($menu_id);
-				if(!$menu_srl) continue;
+				if(!$menu_srl) {
+					continue;
+				}
 
 				// if menu is -1, get default menu in site
 				if($menu_srl == -1)
@@ -172,8 +181,7 @@ 
 									$update_args->use_mobile = "Y";
 								}
 								$output = executeQuery('layout.updateModuleMLayout', $update_args);
-							}
-							else
+							} else
 							{
 								$output = executeQuery('layout.updateModuleLayout', $update_args);
 							}
@@ -195,7 +203,9 @@ 
 		{
 			foreach($layout_info->extra_var as $name => $vars)
 			{
-				if($vars->type!='image') continue;
+				if($vars->type!='image') {
+					continue;
+				}
 
 				$fileName = $extra_vars->{$name};
 				if($vars->value == $fileName)
@@ -242,8 +252,7 @@ 
 		if(!$is_sitemap)
 		{
 			return $this->setRedirectUrl(Context::get('error_return_url'), $output);
-		}
-		else
+		} else
 		{
 			$context = Context::getInstance();
 			$context->setRequestMethod('JSON');
@@ -307,8 +316,7 @@ 
 					if($packageSrl)
 					{
 						$output = $oAutoinstallAdminController->uninstallPackageByPackageSrl($packageSrl);
-					}
-					else
+					} else
 					{
 						$output = $oAutoinstallAdminController->uninstallPackageByPath($path);
 					}
@@ -331,7 +339,9 @@ 
 		$args->layout_srl = $layout_srl;
 		$output = executeQuery("layout.deleteLayout", $args);
 
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		return new BaseObject(0,'success_deleted');
 	}
@@ -376,7 +386,9 @@ 
 	function procLayoutAdminCodeReset()
 	{
 		$layout_srl = Context::get('layout_srl');
-		if(!$layout_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$layout_srl) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		// delete user layout file
 		$oLayoutModel = getModel('layout');
@@ -404,11 +416,15 @@ 
 	 */
 	function procLayoutAdminUserImageUpload()
 	{
-		if(!Context::isUploaded()) exit();
+		if(!Context::isUploaded()) {
+			exit();
+		}
 
 		$image = Context::get('user_layout_image');
 		$layout_srl = Context::get('layout_srl');
-		if(!is_uploaded_file($image['tmp_name'])) exit();
+		if(!is_uploaded_file($image['tmp_name'])) {
+			exit();
+		}
 
 		$this->insertUserLayoutImage($layout_srl, $image);
 		$this->setTemplatePath($this->module_path.'tpl');
@@ -427,7 +443,9 @@ 
 	{
 		$oLayoutModel = getModel('layout');
 		$path = $oLayoutModel->getUserLayoutImagePath($layout_srl);
-		if(!is_dir($path)) FileHandler::makeDir($path);
+		if(!is_dir($path)) {
+			FileHandler::makeDir($path);
+		}
 
 		$filename = strtolower($source['name']);
 		if($filename != urlencode($filename))
@@ -437,10 +455,16 @@ 
 		}
 
 		// Check uploaded file
-		if(!checkUploadedFile($source['tmp_name'])) return false;
+		if(!checkUploadedFile($source['tmp_name'])) {
+			return false;
+		}
 		
-		if(file_exists($path .'/'. $filename)) @unlink($path . $filename);
-		if(!move_uploaded_file($source['tmp_name'], $path . $filename )) return false;
+		if(file_exists($path .'/'. $filename)) {
+			@unlink($path . $filename);
+		}
+		if(!move_uploaded_file($source['tmp_name'], $path . $filename )) {
+			return false;
+		}
 		return true;
 	}
 
@@ -482,13 +506,17 @@ 
 		$oModuleModel = getModel('module');
 
 		$mid = Context::get('mid');
-		if(!$mid) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$mid) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$site_module_info = Context::get('site_module_info');
 		$columnList = array('layout_srl');
 		$module_info = $oModuleModel->getModuleInfoByMid($mid, $site_module_info->site_srl, $columnList);
 		$layout_srl = $module_info->layout_srl;
-		if(!$layout_srl) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$layout_srl) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$oLayoutModel = getModel('layout');
 
@@ -497,8 +525,7 @@ 
 		if($temp =='Y')
 		{
 			$oLayoutModel->setUseUserLayoutTemp();
-		}
-		else
+		} else
 		{
 			// delete temp files
 			$this->deleteUserLayoutTempFile($layout_srl);
@@ -524,7 +551,9 @@ 
 		$obj = Context::gets('type','align','column');
 		$obj = (array)$obj;
 		$src = $oLayoutModel->getUserLayoutIniConfig($layout_srl);
-		foreach($obj as $key => $val) $src[$key] = $val;
+		foreach($obj as $key => $val) {
+			$src[$key] = $val;
+		}
 		$this->insertUserLayoutValue($layout_srl,$src);
 	}
 
@@ -591,7 +620,9 @@ 
 	function procLayoutAdminUserLayoutExport()
 	{
 		$layout_srl = Context::get('layout_srl');
-		if(!$layout_srl) return new BaseObject('-1','msg_invalid_request');
+		if(!$layout_srl) {
+			return new BaseObject('-1','msg_invalid_request');
+		}
 
 		require_once(_XE_PATH_.'libs/tar.class.php');
 		$oLayoutModel = getModel('layout');
@@ -608,16 +639,19 @@ 
 
 		foreach($file_list as $file)
 		{
-			if(strncasecmp('images', $file, 6) === 0) continue;
+			if(strncasecmp('images', $file, 6) === 0) {
+				continue;
+			}
 
 			// replace path
 			$file = $target_path . $file;
 			$content = FileHandler::readFile($file);
 			$pattern = '/(http:\/\/[^ ]+)?(\.\/)?' . str_replace('/', '\/', (str_replace('./', '', $file_path))) . '/';
-			if(basename($file) == 'faceoff.css' || basename($file) == 'layout.css')
-				$content = preg_replace($pattern, '../', $content);
-			else
-				$content = preg_replace($pattern, './', $content);
+			if(basename($file) == 'faceoff.css' || basename($file) == 'layout.css') {
+							$content = preg_replace($pattern, '../', $content);
+			} else {
+							$content = preg_replace($pattern, './', $content);
+			}
 
 			// replace ini config
 			foreach($ini_config as $key => $value)
@@ -658,7 +692,9 @@ 
 		$tar = new tar();
 		$user_layout_path = FileHandler::getRealPath($oLayoutModel->getUserLayoutPath(0));
 		chdir($user_layout_path);
-		foreach($file_list as $key => $file) $tar->addFile($file);
+		foreach($file_list as $key => $file) {
+			$tar->addFile($file);
+		}
 
 		$stream = $tar->toTarStream();
 		$filename = 'faceoff_' . date('YmdHis') . '.tar';
@@ -689,18 +725,28 @@ 
 		return $this->stop('not supported');
 
 		// check upload
-		if(!Context::isUploaded()) exit();
+		if(!Context::isUploaded()) {
+			exit();
+		}
 		$file = Context::get('file');
-		if(!is_uploaded_file($file['tmp_name']) || !checkUploadedFile($file['tmp_name'])) exit();
+		if(!is_uploaded_file($file['tmp_name']) || !checkUploadedFile($file['tmp_name'])) {
+			exit();
+		}
 
-		if(substr_compare($file['name'], '.tar', -4) !== 0) exit();
+		if(substr_compare($file['name'], '.tar', -4) !== 0) {
+			exit();
+		}
 
 		$layout_srl = Context::get('layout_srl');
-		if(!$layout_srl) exit();
+		if(!$layout_srl) {
+			exit();
+		}
 
 		$oLayoutModel = getModel('layout');
 		$user_layout_path = FileHandler::getRealPath($oLayoutModel->getUserLayoutPath($layout_srl));
-		if(!move_uploaded_file($file['tmp_name'], $user_layout_path . 'faceoff.tar')) exit();
+		if(!move_uploaded_file($file['tmp_name'], $user_layout_path . 'faceoff.tar')) {
+			exit();
+		}
 
 		$this->importLayout($layout_srl, $user_layout_path.'faceoff.tar');
 
@@ -744,9 +790,11 @@ 
 		
 		if($layout->extra_var_count) {
 			$reg = "/^.\/files\/attach\/images\/([0-9]+)\/(.*)/";
-			if($extra_vars) foreach($extra_vars as $key => $val) {
+			if($extra_vars) {
+				foreach($extra_vars as $key => $val) {
 				if($layout->extra_var->{$key}->type == 'image') {
 					if(!preg_match($reg,$val,$matches)) continue;
+			}
 					$image_list[$key]->filename = $matches[2];
 					$image_list[$key]->old_file = $val;
 				}
@@ -761,7 +809,9 @@ 
 		$args->site_srl = (int)$layout->site_srl;
 		$args->layout = $layout->layout;
 		$args->layout_type = $layout->layout_type;
-		if(!$args->layout_type) $args->layout_type = "P";
+		if(!$args->layout_type) {
+			$args->layout_type = "P";
+		}
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -904,7 +954,9 @@ 
 		$tar = new tar();
 		$tar->openTAR($source_file);
 		// If layout.ini file does not exist
-		if(!$tar->getFile('layout.ini')) return;
+		if(!$tar->getFile('layout.ini')) {
+			return;
+		}
 
 		$replace_path = getNumberingPath($layout_srl,3);
 		foreach($tar->files as $key => $info)

modules/layout/layout.admin.view.php

Doc Comments +2 added lines, -2 removed lines

@@ -132,7 +132,7 @@ 
 
 	/**
 	 * Display list of pc layout instance
-	 * @return void|BaseObject (void : success, BaseObject : fail)
+	 * @return ModuleObject|null (void : success, BaseObject : fail)
 	 */
 	function dispLayoutAdminInstanceList()
 	{
@@ -161,7 +161,7 @@ 
 	/**
 	 * Layout setting page
 	 * Once select a layout with empty value in the DB, then adjust values
-	 * @return void|BaseObject (void : success, BaseObject : fail)
+	 * @return ModuleObject|null (void : success, BaseObject : fail)
 	 */
 	function dispLayoutAdminInsert()
 	{

Spacing +45 added lines, -45 removed lines

@@ -28,20 +28,20 @@ 
 		// Set a layout list
 		$oLayoutModel = getModel('layout');
 		$layout_list = $oLayoutModel->getDownloadedLayoutList($type, true);
-		if(!is_array($layout_list))
+		if (!is_array($layout_list))
 		{
 			$layout_list = array();
 		}
 
-		if($type == 'P')
+		if ($type == 'P')
 		{
 			// get Theme layout
 			$oAdminModel = getAdminModel('admin');
 			$themeList = $oAdminModel->getThemeList();
 			$themeLayoutList = array();
-			foreach($themeList as $themeInfo)
+			foreach ($themeList as $themeInfo)
 			{
-				if(strpos($themeInfo->layout_info->name, '.') === false) continue;
+				if (strpos($themeInfo->layout_info->name, '.') === false) continue;
 				$themeLayoutList[] = $oLayoutModel->getLayoutInfo($themeInfo->layout_info->name, null, 'P');
 			}
 			$layout_list = array_merge($layout_list, $themeLayoutList);
@@ -59,9 +59,9 @@ 
 
 		//Security
 		$security = new Security();
-		$security->encodeHTML('layout_list..layout','layout_list..title');
+		$security->encodeHTML('layout_list..layout', 'layout_list..title');
 
-		foreach($layout_list as $no => $layout_info)
+		foreach ($layout_list as $no => $layout_info)
 		{
 			$layout_list[$no]->description = nl2br(trim($layout_info->description));
 		}
@@ -76,7 +76,7 @@ 
 	{
 		$type = Context::get('type');
 
-		if(!in_array($type, array('P', 'M'))) $type = 'P';
+		if (!in_array($type, array('P', 'M'))) $type = 'P';
 
 		$oLayoutModel = getModel('layout');
 
@@ -89,9 +89,9 @@ 
 		$_layout_list = $oLayoutModel->getLayoutInstanceList(0, $type, null, $columnList);
 
 		$layout_list = array();
-		foreach($_layout_list as $item)
+		foreach ($_layout_list as $item)
 		{
-			if(!$layout_list[$item->layout])
+			if (!$layout_list[$item->layout])
 			{
 				$layout_list[$item->layout] = array();
 				$layout_info = $oLayoutModel->getLayoutInfo($item->layout, null, $type);
@@ -122,7 +122,7 @@ 
 		$aTitle = strtolower($a['title']);
 		$bTitle = strtolower($b['title']);
 
-		if($aTitle == $bTitle)
+		if ($aTitle == $bTitle)
 		{
 			return 0;
 		}
@@ -139,12 +139,12 @@ 
 		$type = Context::get('type');
 		$layout = Context::get('layout');
 
-		if(!in_array($type, array('P', 'M'))) $type = 'P';
-		if(!$layout) return $this->stop('msg_invalid_request');
+		if (!in_array($type, array('P', 'M'))) $type = 'P';
+		if (!$layout) return $this->stop('msg_invalid_request');
 
 		$oLayoutModel = getModel('layout');
 		$layout_info = $oLayoutModel->getLayoutInfo($layout, null, $type);
-		if(!$layout_info) return $this->stop('msg_invalid_request');
+		if (!$layout_info) return $this->stop('msg_invalid_request');
 
 		Context::set('layout_info', $layout_info);
 
@@ -167,18 +167,18 @@ 
 	{
 		$oModel = getModel('layout');
 		$type = Context::get('type');
-		if(!in_array($type, array('P', 'M'))) $type = 'P';
+		if (!in_array($type, array('P', 'M'))) $type = 'P';
 
 		//Security
 		$security = new Security();
-		$security->encodeHTML('layout_list..layout','layout_list..title');
+		$security->encodeHTML('layout_list..layout', 'layout_list..title');
 
 		// Get layout info
 		$layout = Context::get('layout');
-		if($layout == 'faceoff') return $this->stop('not supported');
+		if ($layout == 'faceoff') return $this->stop('not supported');
 
 		$layout_info = $oModel->getLayoutInfo($layout, null, $type);
-		if(!$layout_info) return $this->stop('msg_invalid_request');
+		if (!$layout_info) return $this->stop('msg_invalid_request');
 
 		// get Menu list
 		$oMenuAdminModel = getAdminModel('menu');
@@ -192,10 +192,10 @@ 
 		$layout_info = $security->encodeHTML('.', 'author..', 'extra_var..', 'extra_var....');
 
 		$layout_info->description = nl2br(trim($layout_info->description));
-		if(!is_object($layout_info->extra_var)) $layout_info->extra_var = new StdClass();
-		foreach($layout_info->extra_var as $var_name => $val)
+		if (!is_object($layout_info->extra_var)) $layout_info->extra_var = new StdClass();
+		foreach ($layout_info->extra_var as $var_name => $val)
 		{
-			if(isset($layout_info->{$var_name}->description))
+			if (isset($layout_info->{$var_name}->description))
 				$layout_info->{$var_name}->description = nl2br(trim($val->description));
 		}
 		Context::set('selected_layout', $layout_info);
@@ -234,24 +234,24 @@ 
 		$oLayoutModel = getModel('layout');
 		$layout_info = $oLayoutModel->getLayout($layout_srl);
 		// Error appears if there is no layout information is registered
-		if(!$layout_info) return $this->dispLayoutAdminInstalledList();
+		if (!$layout_info) return $this->dispLayoutAdminInstalledList();
 
 		// Get Layout Code
-		if($oLayoutModel->useDefaultLayout($layout_info->layout_srl))
+		if ($oLayoutModel->useDefaultLayout($layout_info->layout_srl))
 		{
-			$layout_file  = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout);
-			$layout_css_file  = $oLayoutModel->getDefaultLayoutCss($layout_info->layout);
+			$layout_file = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout);
+			$layout_css_file = $oLayoutModel->getDefaultLayoutCss($layout_info->layout);
 		}
 		else
 		{
 			$layout_file = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
 			$layout_css_file = $oLayoutModel->getUserLayoutCss($layout_info->layout_srl);
 
-			if(!file_exists($layout_file)) $layout_file = $layout_info->path . 'layout.html';
-			if(!file_exists($layout_css_file)) $layout_css_file = $layout_info->path . 'layout.css';
+			if (!file_exists($layout_file)) $layout_file = $layout_info->path.'layout.html';
+			if (!file_exists($layout_css_file)) $layout_css_file = $layout_info->path.'layout.css';
 		}
 
-		if(file_exists($layout_css_file))
+		if (file_exists($layout_css_file))
 		{
 			$layout_code_css = FileHandler::readFile($layout_css_file);
 			Context::set('layout_code_css', $layout_code_css);
@@ -295,30 +295,30 @@ 
 		$layout_srl = Context::get('layout_srl');
 		$code = Context::get('code');
 		$code_css = Context::get('code_css');
-		if(!$layout_srl || !$code) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$layout_srl || !$code) return new BaseObject(-1, 'msg_invalid_request');
 		// Get the layout information
 		$oLayoutModel = getModel('layout');
 		$layout_info = $oLayoutModel->getLayout($layout_srl);
-		if(!$layout_info) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$layout_info) return new BaseObject(-1, 'msg_invalid_request');
 		// Separately handle the layout if its type is faceoff
-		if($layout_info && $layout_info->type == 'faceoff') $oLayoutModel->doActivateFaceOff($layout_info);
+		if ($layout_info && $layout_info->type == 'faceoff') $oLayoutModel->doActivateFaceOff($layout_info);
 		// Apply CSS directly
 		Context::addHtmlHeader("<style type=\"text/css\" charset=\"UTF-8\">".$code_css."</style>");
 		// Set names and values of extra_vars to $layout_info
-		if($layout_info->extra_var_count)
+		if ($layout_info->extra_var_count)
 		{
-			foreach($layout_info->extra_var as $var_id => $val)
+			foreach ($layout_info->extra_var as $var_id => $val)
 			{
 				$layout_info->{$var_id} = $val->value;
 			}
 		}
 		// menu in layout information becomes an argument for Context:: set
-		if($layout_info->menu_count)
+		if ($layout_info->menu_count)
 		{
-			foreach($layout_info->menu as $menu_id => $menu)
+			foreach ($layout_info->menu as $menu_id => $menu)
 			{
 				$menu->php_file = FileHandler::getRealPath($menu->php_file);
-				if(FileHandler::exists($menu->php_file)) include($menu->php_file);
+				if (FileHandler::exists($menu->php_file)) include($menu->php_file);
 				Context::set($menu_id, $menu);
 			}
 		}
@@ -336,7 +336,7 @@ 
 		$layout_file = 'layout';
 
 		$layout_tpl = $oTemplate->compile($layout_path, $layout_file, $edited_layout_file);
-		Context::set('layout','none');
+		Context::set('layout', 'none');
 		// Convert widgets and others
 		$oContext = &Context::getInstance();
 		Context::set('layout_tpl', $layout_tpl);
@@ -359,7 +359,7 @@ 
 		// Remove the remaining tmp files because of temporarily saving
 		// This part needs to be modified
 		$delete_tmp = Context::get('delete_tmp');
-		if($delete_tmp =='Y')
+		if ($delete_tmp == 'Y')
 		{
 			$oLayoutAdminController = getAdminController('layout');
 			$oLayoutAdminController->deleteUserLayoutTempFile($layout_srl);
@@ -373,24 +373,24 @@ 
 
 		$css = FileHandler::readFile($faceoffcss);
 		$match = null;
-		preg_match_all('/([^\{]+)\{([^\}]*)\}/is',$css,$match);
-		for($i=0,$c=count($match[1]);$i<$c;$i++)
+		preg_match_all('/([^\{]+)\{([^\}]*)\}/is', $css, $match);
+		for ($i = 0, $c = count($match[1]); $i < $c; $i++)
 		{
 			$name = trim($match[1][$i]);
 			$css = trim($match[2][$i]);
-			if(!$css) continue;
-			$css = str_replace('./images/',Context::getRequestUri().$oLayoutModel->getUserLayoutImagePath($layout_srl),$css);
-			$style[] .= sprintf('"%s":"%s"',$name,$css);
+			if (!$css) continue;
+			$css = str_replace('./images/', Context::getRequestUri().$oLayoutModel->getUserLayoutImagePath($layout_srl), $css);
+			$style[] .= sprintf('"%s":"%s"', $name, $css);
 		}
 
-		if(count($style))
+		if (count($style))
 		{
-			$script = '<script type="text/javascript"> var faceOffStyle = {'.implode(',',$style).'}; </script>';
+			$script = '<script type="text/javascript"> var faceOffStyle = {'.implode(',', $style).'}; </script>';
 			Context::addHtmlHeader($script);
 		}
 
 		$oTemplate = &TemplateHandler::getInstance();
-		Context::set('content', $oTemplate->compile($this->module_path.'tpl','about_faceoff'));
+		Context::set('content', $oTemplate->compile($this->module_path.'tpl', 'about_faceoff'));
 		// Change widget codes in Javascript mode
 		$oWidgetController = getController('widget');
 		$oWidgetController->setWidgetCodeInJavascriptMode();

Braces +55 added lines, -21 removed lines

@@ -41,7 +41,9 @@ 
 			$themeLayoutList = array();
 			foreach($themeList as $themeInfo)
 			{
-				if(strpos($themeInfo->layout_info->name, '.') === false) continue;
+				if(strpos($themeInfo->layout_info->name, '.') === false) {
+					continue;
+				}
 				$themeLayoutList[] = $oLayoutModel->getLayoutInfo($themeInfo->layout_info->name, null, 'P');
 			}
 			$layout_list = array_merge($layout_list, $themeLayoutList);
@@ -76,7 +78,9 @@ 
 	{
 		$type = Context::get('type');
 
-		if(!in_array($type, array('P', 'M'))) $type = 'P';
+		if(!in_array($type, array('P', 'M'))) {
+			$type = 'P';
+		}
 
 		$oLayoutModel = getModel('layout');
 
@@ -139,12 +143,18 @@ 
 		$type = Context::get('type');
 		$layout = Context::get('layout');
 
-		if(!in_array($type, array('P', 'M'))) $type = 'P';
-		if(!$layout) return $this->stop('msg_invalid_request');
+		if(!in_array($type, array('P', 'M'))) {
+			$type = 'P';
+		}
+		if(!$layout) {
+			return $this->stop('msg_invalid_request');
+		}
 
 		$oLayoutModel = getModel('layout');
 		$layout_info = $oLayoutModel->getLayoutInfo($layout, null, $type);
-		if(!$layout_info) return $this->stop('msg_invalid_request');
+		if(!$layout_info) {
+			return $this->stop('msg_invalid_request');
+		}
 
 		Context::set('layout_info', $layout_info);
 
@@ -167,7 +177,9 @@ 
 	{
 		$oModel = getModel('layout');
 		$type = Context::get('type');
-		if(!in_array($type, array('P', 'M'))) $type = 'P';
+		if(!in_array($type, array('P', 'M'))) {
+			$type = 'P';
+		}
 
 		//Security
 		$security = new Security();
@@ -175,10 +187,14 @@ 
 
 		// Get layout info
 		$layout = Context::get('layout');
-		if($layout == 'faceoff') return $this->stop('not supported');
+		if($layout == 'faceoff') {
+			return $this->stop('not supported');
+		}
 
 		$layout_info = $oModel->getLayoutInfo($layout, null, $type);
-		if(!$layout_info) return $this->stop('msg_invalid_request');
+		if(!$layout_info) {
+			return $this->stop('msg_invalid_request');
+		}
 
 		// get Menu list
 		$oMenuAdminModel = getAdminModel('menu');
@@ -192,11 +208,14 @@ 
 		$layout_info = $security->encodeHTML('.', 'author..', 'extra_var..', 'extra_var....');
 
 		$layout_info->description = nl2br(trim($layout_info->description));
-		if(!is_object($layout_info->extra_var)) $layout_info->extra_var = new StdClass();
+		if(!is_object($layout_info->extra_var)) {
+			$layout_info->extra_var = new StdClass();
+		}
 		foreach($layout_info->extra_var as $var_name => $val)
 		{
-			if(isset($layout_info->{$var_name}->description))
-				$layout_info->{$var_name}->description = nl2br(trim($val->description));
+			if(isset($layout_info->{$var_name}->description)) {
+							$layout_info->{$var_name}->description = nl2br(trim($val->description));
+			}
 		}
 		Context::set('selected_layout', $layout_info);
 
@@ -234,21 +253,26 @@ 
 		$oLayoutModel = getModel('layout');
 		$layout_info = $oLayoutModel->getLayout($layout_srl);
 		// Error appears if there is no layout information is registered
-		if(!$layout_info) return $this->dispLayoutAdminInstalledList();
+		if(!$layout_info) {
+			return $this->dispLayoutAdminInstalledList();
+		}
 
 		// Get Layout Code
 		if($oLayoutModel->useDefaultLayout($layout_info->layout_srl))
 		{
 			$layout_file  = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout);
 			$layout_css_file  = $oLayoutModel->getDefaultLayoutCss($layout_info->layout);
-		}
-		else
+		} else
 		{
 			$layout_file = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
 			$layout_css_file = $oLayoutModel->getUserLayoutCss($layout_info->layout_srl);
 
-			if(!file_exists($layout_file)) $layout_file = $layout_info->path . 'layout.html';
-			if(!file_exists($layout_css_file)) $layout_css_file = $layout_info->path . 'layout.css';
+			if(!file_exists($layout_file)) {
+				$layout_file = $layout_info->path . 'layout.html';
+			}
+			if(!file_exists($layout_css_file)) {
+				$layout_css_file = $layout_info->path . 'layout.css';
+			}
 		}
 
 		if(file_exists($layout_css_file))
@@ -295,13 +319,19 @@ 
 		$layout_srl = Context::get('layout_srl');
 		$code = Context::get('code');
 		$code_css = Context::get('code_css');
-		if(!$layout_srl || !$code) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$layout_srl || !$code) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 		// Get the layout information
 		$oLayoutModel = getModel('layout');
 		$layout_info = $oLayoutModel->getLayout($layout_srl);
-		if(!$layout_info) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$layout_info) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 		// Separately handle the layout if its type is faceoff
-		if($layout_info && $layout_info->type == 'faceoff') $oLayoutModel->doActivateFaceOff($layout_info);
+		if($layout_info && $layout_info->type == 'faceoff') {
+			$oLayoutModel->doActivateFaceOff($layout_info);
+		}
 		// Apply CSS directly
 		Context::addHtmlHeader("<style type=\"text/css\" charset=\"UTF-8\">".$code_css."</style>");
 		// Set names and values of extra_vars to $layout_info
@@ -318,7 +348,9 @@ 
 			foreach($layout_info->menu as $menu_id => $menu)
 			{
 				$menu->php_file = FileHandler::getRealPath($menu->php_file);
-				if(FileHandler::exists($menu->php_file)) include($menu->php_file);
+				if(FileHandler::exists($menu->php_file)) {
+					include($menu->php_file);
+				}
 				Context::set($menu_id, $menu);
 			}
 		}
@@ -378,7 +410,9 @@ 
 		{
 			$name = trim($match[1][$i]);
 			$css = trim($match[2][$i]);
-			if(!$css) continue;
+			if(!$css) {
+				continue;
+			}
 			$css = str_replace('./images/',Context::getRequestUri().$oLayoutModel->getUserLayoutImagePath($layout_srl),$css);
 			$style[] .= sprintf('"%s":"%s"',$name,$css);
 		}