xpressengine / xe-core

modules/file/file.controller.php

Spacing +156 added lines, -156 removed lines

@@ -29,24 +29,24 @@ 
 		$file_info = $_FILES['Filedata'];
 
 		// An error appears if not a normally uploaded file
-		if(!is_uploaded_file($file_info['tmp_name'])) exit();
+		if (!is_uploaded_file($file_info['tmp_name'])) exit();
 
 		// Basic variables setting
 		$oFileModel = getModel('file');
 		$editor_sequence = Context::get('editor_sequence');
 		$upload_target_srl = intval(Context::get('uploadTargetSrl'));
-		if(!$upload_target_srl) $upload_target_srl = intval(Context::get('upload_target_srl'));
+		if (!$upload_target_srl) $upload_target_srl = intval(Context::get('upload_target_srl'));
 		$module_srl = $this->module_srl;
 		// Exit a session if there is neither upload permission nor information
-		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
+		if (!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
 		// Extract from session information if upload_target_srl is not specified
-		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;
 		// Create if upload_target_srl is not defined in the session information
-		if(!$upload_target_srl) $_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
+		if (!$upload_target_srl) $_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
 
 		$output = $this->insertFile($file_info, $module_srl, $upload_target_srl);
 		Context::setResponseMethod('JSON');
-		if($output->error != '0') $this->stop($output->message);
+		if ($output->error != '0') $this->stop($output->message);
 	}
 
 	/**
@@ -61,26 +61,26 @@ 
 		$callback = Context::get('callback');
 		$module_srl = $this->module_srl;
 		$upload_target_srl = intval(Context::get('uploadTargetSrl'));
-		if(!$upload_target_srl) $upload_target_srl = intval(Context::get('upload_target_srl'));
+		if (!$upload_target_srl) $upload_target_srl = intval(Context::get('upload_target_srl'));
 
 		// Exit a session if there is neither upload permission nor information
-		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
+		if (!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
 		// Extract from session information if upload_target_srl is not specified
-		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;
 		// Create if upload_target_srl is not defined in the session information
-		if(!$upload_target_srl) $_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
+		if (!$upload_target_srl) $_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
 		// Delete and then attempt to re-upload if file_srl is requested
 		$file_srl = Context::get('file_srl');
-		if($file_srl) $this->deleteFile($file_srl);
+		if ($file_srl) $this->deleteFile($file_srl);
 
 		$file_info = Context::get('Filedata');
 		// An error appears if not a normally uploaded file
-		if(is_uploaded_file($file_info['tmp_name'])) {
+		if (is_uploaded_file($file_info['tmp_name'])) {
 			$output = $this->insertFile($file_info, $module_srl, $upload_target_srl);
-			Context::set('uploaded_fileinfo',$output);
+			Context::set('uploaded_fileinfo', $output);
 		}
 
-		Context::set('layout','none');
+		Context::set('layout', 'none');
 
 		$this->setTemplatePath($this->module_path.'tpl');
 		$this->setTemplateFile('iframe');
@@ -97,24 +97,24 @@ 
 		$width = Context::get('width');
 		$height = Context::get('height');
 
-		if(!$file_srl || !$width)
+		if (!$file_srl || !$width)
 		{
-			return new Object(-1,'msg_invalid_request');
+			return new Object(-1, 'msg_invalid_request');
 		}
 
 		$oFileModel = getModel('file');
 		$fileInfo = $oFileModel->getFile($file_srl);
-		if(!$fileInfo || $fileInfo->direct_download != 'Y')
+		if (!$fileInfo || $fileInfo->direct_download != 'Y')
 		{
-			return new Object(-1,'msg_invalid_request');
+			return new Object(-1, 'msg_invalid_request');
 		}
 
 		$source_src = $fileInfo->uploaded_filename;
-		$output_src = $source_src . '.resized' . strrchr($source_src,'.');
+		$output_src = $source_src.'.resized'.strrchr($source_src, '.');
 
-		if(!$height) $height = $width-1;
+		if (!$height) $height = $width - 1;
 
-		if(FileHandler::createImageFile($source_src,$output_src,$width,$height,'','ratio'))
+		if (FileHandler::createImageFile($source_src, $output_src, $width, $height, '', 'ratio'))
 		{
 			$output = new stdClass();
 			$output->info = getimagesize($output_src);
@@ -122,10 +122,10 @@ 
 		}
 		else
 		{
-			return new Object(-1,'msg_invalid_request');
+			return new Object(-1, 'msg_invalid_request');
 		}
 
-		$this->add('resized_info',$output);
+		$this->add('resized_info', $output);
 	}
 
 	/**
@@ -163,7 +163,7 @@ 
 	{
 		$oFileModel = getModel('file');
 
-		if(isset($this->grant->access) && $this->grant->access !== true) return new Object(-1, 'msg_not_permitted');
+		if (isset($this->grant->access) && $this->grant->access !== true) return new Object(-1, 'msg_not_permitted');
 
 		$file_srl = Context::get('file_srl');
 		$sid = Context::get('sid');
@@ -172,26 +172,26 @@ 
 		$columnList = array('file_srl', 'sid', 'isvalid', 'source_filename', 'module_srl', 'uploaded_filename', 'file_size', 'member_srl', 'upload_target_srl', 'upload_target_type');
 		$file_obj = $oFileModel->getFile($file_srl, $columnList);
 		// If the requested file information is incorrect, an error that file cannot be found appears
-		if($file_obj->file_srl!=$file_srl || $file_obj->sid!=$sid) return $this->stop('msg_file_not_found');
+		if ($file_obj->file_srl != $file_srl || $file_obj->sid != $sid) return $this->stop('msg_file_not_found');
 		// Notify that file download is not allowed when standing-by(Only a top-administrator is permitted)
-		if($logged_info->is_admin != 'Y' && $file_obj->isvalid!='Y') return $this->stop('msg_not_permitted_download');
+		if ($logged_info->is_admin != 'Y' && $file_obj->isvalid != 'Y') return $this->stop('msg_not_permitted_download');
 		// File name
 		$filename = $file_obj->source_filename;
 		$file_module_config = $oFileModel->getFileModuleConfig($file_obj->module_srl);
 		// Not allow the file outlink
-		if($file_module_config->allow_outlink == 'N')
+		if ($file_module_config->allow_outlink == 'N')
 		{
 			// Handles extension to allow outlink
-			if($file_module_config->allow_outlink_format)
+			if ($file_module_config->allow_outlink_format)
 			{
 				$allow_outlink_format_array = array();
 				$allow_outlink_format_array = explode(',', $file_module_config->allow_outlink_format);
-				if(!is_array($allow_outlink_format_array)) $allow_outlink_format_array[0] = $file_module_config->allow_outlink_format;
+				if (!is_array($allow_outlink_format_array)) $allow_outlink_format_array[0] = $file_module_config->allow_outlink_format;
 
-				foreach($allow_outlink_format_array as $val)
+				foreach ($allow_outlink_format_array as $val)
 				{
 					$val = trim($val);
-					if(preg_match("/\.{$val}$/i", $filename))
+					if (preg_match("/\.{$val}$/i", $filename))
 					{
 						$file_module_config->allow_outlink = 'Y';
 						break;
@@ -199,21 +199,21 @@ 
 				}
 			}
 			// Sites that outlink is allowed
-			if($file_module_config->allow_outlink != 'Y')
+			if ($file_module_config->allow_outlink != 'Y')
 			{
 				$referer = parse_url($_SERVER["HTTP_REFERER"]);
-				if($referer['host'] != $_SERVER['HTTP_HOST'])
+				if ($referer['host'] != $_SERVER['HTTP_HOST'])
 				{
-					if($file_module_config->allow_outlink_site)
+					if ($file_module_config->allow_outlink_site)
 					{
 						$allow_outlink_site_array = array();
 						$allow_outlink_site_array = explode("\n", $file_module_config->allow_outlink_site);
-						if(!is_array($allow_outlink_site_array)) $allow_outlink_site_array[0] = $file_module_config->allow_outlink_site;
+						if (!is_array($allow_outlink_site_array)) $allow_outlink_site_array[0] = $file_module_config->allow_outlink_site;
 
-						foreach($allow_outlink_site_array as $val)
+						foreach ($allow_outlink_site_array as $val)
 						{
 							$site = parse_url(trim($val));
-							if($site['host'] == $referer['host'])
+							if ($site['host'] == $referer['host'])
 							{
 								$file_module_config->allow_outlink = 'Y';
 								break;
@@ -223,49 +223,49 @@ 
 				}
 				else $file_module_config->allow_outlink = 'Y';
 			}
-			if($file_module_config->allow_outlink != 'Y') return $this->stop('msg_not_allowed_outlink');
+			if ($file_module_config->allow_outlink != 'Y') return $this->stop('msg_not_allowed_outlink');
 		}
 
 		// Check if a permission for file download is granted
 		$downloadGrantCount = 0;
-		if(is_array($file_module_config->download_grant))
+		if (is_array($file_module_config->download_grant))
 		{
-			foreach($file_module_config->download_grant AS $value)
-				if($value) $downloadGrantCount++;
+			foreach ($file_module_config->download_grant AS $value)
+				if ($value) $downloadGrantCount++;
 		}
 
-		if(is_array($file_module_config->download_grant) && $downloadGrantCount>0)
+		if (is_array($file_module_config->download_grant) && $downloadGrantCount > 0)
 		{
-			if(!Context::get('is_logged')) return $this->stop('msg_not_permitted_download');
+			if (!Context::get('is_logged')) return $this->stop('msg_not_permitted_download');
 			$logged_info = Context::get('logged_info');
-			if($logged_info->is_admin != 'Y')
+			if ($logged_info->is_admin != 'Y')
 			{
-				$oModuleModel =& getModel('module');
+				$oModuleModel = & getModel('module');
 				$columnList = array('module_srl', 'site_srl');
 				$module_info = $oModuleModel->getModuleInfoByModuleSrl($file_obj->module_srl, $columnList);
 
-				if(!$oModuleModel->isSiteAdmin($logged_info, $module_info->site_srl))
+				if (!$oModuleModel->isSiteAdmin($logged_info, $module_info->site_srl))
 				{
-					$oMemberModel =& getModel('member');
+					$oMemberModel = & getModel('member');
 					$member_groups = $oMemberModel->getMemberGroups($logged_info->member_srl, $module_info->site_srl);
 
 					$is_permitted = false;
-					for($i=0;$i<count($file_module_config->download_grant);$i++)
+					for ($i = 0; $i < count($file_module_config->download_grant); $i++)
 					{
 						$group_srl = $file_module_config->download_grant[$i];
-						if($member_groups[$group_srl])
+						if ($member_groups[$group_srl])
 						{
 							$is_permitted = true;
 							break;
 						}
 					}
-					if(!$is_permitted) return $this->stop('msg_not_permitted_download');
+					if (!$is_permitted) return $this->stop('msg_not_permitted_download');
 				}
 			}
 		}
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('file.downloadFile', 'before', $file_obj);
-		if(!$output->toBool()) return $this->stop(($output->message)?$output->message:'msg_not_permitted_download');
+		if (!$output->toBool()) return $this->stop(($output->message) ? $output->message : 'msg_not_permitted_download');
 
 
 		// 다운로드 후 (가상)
@@ -278,7 +278,7 @@ 
 
 		$random = new Password();
 		$file_key = $_SESSION['__XE_FILE_KEY__'][$file_srl] = $random->createSecureSalt(32, 'hex');
-		header('Location: '.getNotEncodedUrl('', 'act', 'procFileOutput','file_srl',$file_srl,'file_key',$file_key));
+		header('Location: '.getNotEncodedUrl('', 'act', 'procFileOutput', 'file_srl', $file_srl, 'file_key', $file_key));
 		Context::close();
 		exit();
 
@@ -289,18 +289,18 @@ 
 		$oFileModel = getModel('file');
 		$file_srl = Context::get('file_srl');
 		$file_key = Context::get('file_key');
-		if(strstr($_SERVER['HTTP_USER_AGENT'], "Android")) $is_android = true;
+		if (strstr($_SERVER['HTTP_USER_AGENT'], "Android")) $is_android = true;
 
-		if($is_android && $_SESSION['__XE_FILE_KEY_AND__'][$file_srl]) $session_key = '__XE_FILE_KEY_AND__';
+		if ($is_android && $_SESSION['__XE_FILE_KEY_AND__'][$file_srl]) $session_key = '__XE_FILE_KEY_AND__';
 		else $session_key = '__XE_FILE_KEY__';
 		$columnList = array('source_filename', 'uploaded_filename', 'file_size');
 		$file_obj = $oFileModel->getFile($file_srl, $columnList);
 
 		$uploaded_filename = $file_obj->uploaded_filename;
 
-		if(!file_exists($uploaded_filename)) return $this->stop('msg_file_not_found');
+		if (!file_exists($uploaded_filename)) return $this->stop('msg_file_not_found');
 
-		if(!$file_key || $_SESSION[$session_key][$file_srl] != $file_key)
+		if (!$file_key || $_SESSION[$session_key][$file_srl] != $file_key)
 		{
 			unset($_SESSION[$session_key][$file_srl]);
 			return $this->stop('msg_invalid_request');
@@ -308,28 +308,28 @@ 
 
 		$file_size = $file_obj->file_size;
 		$filename = $file_obj->source_filename;
-				if(preg_match('#(?:Chrome|Edge)/(\d+)\.#', $_SERVER['HTTP_USER_AGENT'], $matches) && $matches[1] >= 11)
+				if (preg_match('#(?:Chrome|Edge)/(\d+)\.#', $_SERVER['HTTP_USER_AGENT'], $matches) && $matches[1] >= 11)
 		{
-			$filename_param = "filename*=UTF-8''" . rawurlencode($filename) . '; filename="' . rawurlencode($filename) . '"';
+			$filename_param = "filename*=UTF-8''".rawurlencode($filename).'; filename="'.rawurlencode($filename).'"';
 		}
-		elseif(preg_match('#(?:Firefox|Safari|Trident)/(\d+)\.#', $_SERVER['HTTP_USER_AGENT'], $matches) && $matches[1] >= 6)
+		elseif (preg_match('#(?:Firefox|Safari|Trident)/(\d+)\.#', $_SERVER['HTTP_USER_AGENT'], $matches) && $matches[1] >= 6)
 		{
-			$filename_param = "filename*=UTF-8''" . rawurlencode($filename) . '; filename="' . rawurlencode($filename) . '"';
+			$filename_param = "filename*=UTF-8''".rawurlencode($filename).'; filename="'.rawurlencode($filename).'"';
 		}
 		// Filename encoding for browsers that do not support RFC 5987
-		elseif(strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE)
+		elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE)
 		{
 			$filename = rawurlencode($filename);
-			$filename_param = 'filename="' . preg_replace('/\./', '%2e', $filename, substr_count($filename, '.') - 1) . '"';
+			$filename_param = 'filename="'.preg_replace('/\./', '%2e', $filename, substr_count($filename, '.') - 1).'"';
 		}
 		else
 		{
-			$filename_param = 'filename="' . $filename . '"';
+			$filename_param = 'filename="'.$filename.'"';
 		}
 
-		if($is_android)
+		if ($is_android)
 		{
-			if($_SESSION['__XE_FILE_KEY__'][$file_srl]) $_SESSION['__XE_FILE_KEY_AND__'][$file_srl] = $file_key;
+			if ($_SESSION['__XE_FILE_KEY__'][$file_srl]) $_SESSION['__XE_FILE_KEY_AND__'][$file_srl] = $file_key;
 		}
 
 		unset($_SESSION[$session_key][$file_srl]);
@@ -337,21 +337,21 @@ 
 		Context::close();
 
 		$fp = fopen($uploaded_filename, 'rb');
-		if(!$fp) return $this->stop('msg_file_not_found');
+		if (!$fp) return $this->stop('msg_file_not_found');
 
 		header("Cache-Control: ");
 		header("Pragma: ");
 		header("Content-Type: application/octet-stream");
-		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: " .(string)($file_size));
-		header('Content-Disposition: attachment; ' . $filename_param);
+		header("Content-Length: ".(string) ($file_size));
+		header('Content-Disposition: attachment; '.$filename_param);
 		header("Content-Transfer-Encoding: binary\n");
 
 		// if file size is lager than 10MB, use fread function (#18675748)
-		if(filesize($uploaded_filename) > 1024 * 1024)
+		if (filesize($uploaded_filename) > 1024 * 1024)
 		{
-			while(!feof($fp)) echo fread($fp, 1024);
+			while (!feof($fp)) echo fread($fp, 1024);
 			fclose($fp);
 		}
 		else
@@ -373,36 +373,36 @@ 
 		$editor_sequence = Context::get('editor_sequence');
 		$file_srl = Context::get('file_srl');
 		$file_srls = Context::get('file_srls');
-		if($file_srls) $file_srl = $file_srls;
+		if ($file_srls) $file_srl = $file_srls;
 		// Exit a session if there is neither upload permission nor information
-		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
+		if (!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
 
 		$upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
 
 		$logged_info = Context::get('logged_info');
 		$oFileModel = getModel('file');
 
-		$srls = explode(',',$file_srl);
-		if(!count($srls)) return;
+		$srls = explode(',', $file_srl);
+		if (!count($srls)) return;
 
-		for($i=0;$i<count($srls);$i++)
+		for ($i = 0; $i < count($srls); $i++)
 		{
-			$srl = (int)$srls[$i];
-			if(!$srl) continue;
+			$srl = (int) $srls[$i];
+			if (!$srl) continue;
 
 			$args = new stdClass;
 			$args->file_srl = $srl;
 			$output = executeQuery('file.getFile', $args);
-			if(!$output->toBool()) continue;
+			if (!$output->toBool()) continue;
 
 			$file_info = $output->data;
-			if(!$file_info) continue;
+			if (!$file_info) continue;
 
 			$file_grant = $oFileModel->getFileGrant($file_info, $logged_info);
 
-			if(!$file_grant->is_deletable) continue;
+			if (!$file_grant->is_deletable) continue;
 
-			if($upload_target_srl && $file_srl) $output = $this->deleteFile($file_srl);
+			if ($upload_target_srl && $file_srl) $output = $this->deleteFile($file_srl);
 		}
 	}
 
@@ -413,23 +413,23 @@ 
 	 */
 	function procFileGetList()
 	{
-		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
 		$fileSrls = Context::get('file_srls');
-		if($fileSrls) $fileSrlList = explode(',', $fileSrls);
+		if ($fileSrls) $fileSrlList = explode(',', $fileSrls);
 
 		global $lang;
-		if(count($fileSrlList) > 0)
+		if (count($fileSrlList) > 0)
 		{
 			$oFileModel = getModel('file');
 			$fileList = $oFileModel->getFile($fileSrlList);
-			if(!is_array($fileList)) $fileList = array($fileList);
+			if (!is_array($fileList)) $fileList = array($fileList);
 
-			if(is_array($fileList))
+			if (is_array($fileList))
 			{
-				foreach($fileList AS $key=>$value)
+				foreach ($fileList AS $key=>$value)
 				{
 					$value->human_file_size = FileHandler::filesize($value->file_size);
-					if($value->isvalid=='Y') $value->validName = $lang->is_valid;
+					if ($value->isvalid == 'Y') $value->validName = $lang->is_valid;
 					else $value->validName = $lang->is_stand_by;
 				}
 			}
@@ -451,7 +451,7 @@ 
 	function triggerCheckAttached(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new Object();
+		if (!$document_srl) return new Object();
 		// Get numbers of attachments
 		$oFileModel = getModel('file');
 		$obj->uploaded_count = $oFileModel->getFilesCount($document_srl);
@@ -468,10 +468,10 @@ 
 	function triggerAttachFiles(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new Object();
+		if (!$document_srl) return new Object();
 
 		$output = $this->setFilesValid($document_srl);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		return new Object();
 	}
@@ -485,7 +485,7 @@ 
 	function triggerDeleteAttached(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new Object();
+		if (!$document_srl) return new Object();
 
 		$output = $this->deleteFiles($document_srl);
 		return $output;
@@ -500,7 +500,7 @@ 
 	function triggerCommentCheckAttached(&$obj)
 	{
 		$comment_srl = $obj->comment_srl;
-		if(!$comment_srl) return new Object();
+		if (!$comment_srl) return new Object();
 		// Get numbers of attachments
 		$oFileModel = getModel('file');
 		$obj->uploaded_count = $oFileModel->getFilesCount($comment_srl);
@@ -518,10 +518,10 @@ 
 	{
 		$comment_srl = $obj->comment_srl;
 		$uploaded_count = $obj->uploaded_count;
-		if(!$comment_srl || !$uploaded_count) return new Object();
+		if (!$comment_srl || !$uploaded_count) return new Object();
 
 		$output = $this->setFilesValid($comment_srl);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		return new Object();
 	}
@@ -535,9 +535,9 @@ 
 	function triggerCommentDeleteAttached(&$obj)
 	{
 		$comment_srl = $obj->comment_srl;
-		if(!$comment_srl) return new Object();
+		if (!$comment_srl) return new Object();
 
-		if($obj->isMoveToTrash) return new Object();
+		if ($obj->isMoveToTrash) return new Object();
 
 		$output = $this->deleteFiles($comment_srl);
 		return $output;
@@ -552,7 +552,7 @@ 
 	function triggerDeleteModuleFiles(&$obj)
 	{
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new Object();
+		if (!$module_srl) return new Object();
 
 		$oFileController = getAdminController('file');
 		return $oFileController->deleteModuleFiles($module_srl);
@@ -565,9 +565,9 @@ 
 	 * @param int $upload_target_srl
 	 * @return void
 	 */
-	function setUploadInfo($editor_sequence, $upload_target_srl=0)
+	function setUploadInfo($editor_sequence, $upload_target_srl = 0)
 	{
-		if(!isset($_SESSION['upload_info'][$editor_sequence]))
+		if (!isset($_SESSION['upload_info'][$editor_sequence]))
 		{
 			$_SESSION['upload_info'][$editor_sequence] = new stdClass();
 		}
@@ -627,36 +627,36 @@ 
 		$trigger_obj->module_srl = $module_srl;
 		$trigger_obj->upload_target_srl = $upload_target_srl;
 		$output = ModuleHandler::triggerCall('file.insertFile', 'before', $trigger_obj);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// A workaround for Firefox upload bug
-		if(preg_match('/^=\?UTF-8\?B\?(.+)\?=$/i', $file_info['name'], $match))
+		if (preg_match('/^=\?UTF-8\?B\?(.+)\?=$/i', $file_info['name'], $match))
 		{
 			$file_info['name'] = base64_decode(strtr($match[1], ':', '/'));
 		}
 
-		if(!$manual_insert)
+		if (!$manual_insert)
 		{
 			// Get the file configurations
 			$logged_info = Context::get('logged_info');
-			if($logged_info->is_admin != 'Y')
+			if ($logged_info->is_admin != 'Y')
 			{
 				$oFileModel = getModel('file');
 				$config = $oFileModel->getFileConfig($module_srl);
 
 				// check file type
-				if(isset($config->allowed_filetypes) && $config->allowed_filetypes !== '*.*')
+				if (isset($config->allowed_filetypes) && $config->allowed_filetypes !== '*.*')
 				{
 					$filetypes = explode(';', $config->allowed_filetypes);
 					$ext = array();
-					foreach($filetypes as $item) {
+					foreach ($filetypes as $item) {
 						$item = explode('.', $item);
 						$ext[] = strtolower($item[1]);
 					}
 					$uploaded_ext = explode('.', $file_info['name']);
 					$uploaded_ext = strtolower(array_pop($uploaded_ext));
 
-					if(!in_array($uploaded_ext, $ext))
+					if (!in_array($uploaded_ext, $ext))
 					{
 						return $this->stop('msg_not_allowed_filetype');
 					}
@@ -665,63 +665,63 @@ 
 				$allowed_filesize = $config->allowed_filesize * 1024 * 1024;
 				$allowed_attach_size = $config->allowed_attach_size * 1024 * 1024;
 				// An error appears if file size exceeds a limit
-				if($allowed_filesize < filesize($file_info['tmp_name'])) return new Object(-1, 'msg_exceeds_limit_size');
+				if ($allowed_filesize < filesize($file_info['tmp_name'])) return new Object(-1, 'msg_exceeds_limit_size');
 				// Get total file size of all attachements (from DB)
 				$size_args = new stdClass;
 				$size_args->upload_target_srl = $upload_target_srl;
 				$output = executeQuery('file.getAttachedFileSize', $size_args);
-				$attached_size = (int)$output->data->attached_size + filesize($file_info['tmp_name']);
-				if($attached_size > $allowed_attach_size) return new Object(-1, 'msg_exceeds_limit_size');
+				$attached_size = (int) $output->data->attached_size + filesize($file_info['tmp_name']);
+				if ($attached_size > $allowed_attach_size) return new Object(-1, 'msg_exceeds_limit_size');
 			}
 		}
 
 		// https://github.com/xpressengine/xe-core/issues/1713
-		$file_info['name'] = preg_replace('/\.(php|phtm|phar|html?|cgi|pl|exe|jsp|asp|inc)/i', '$0-x',$file_info['name']);
+		$file_info['name'] = preg_replace('/\.(php|phtm|phar|html?|cgi|pl|exe|jsp|asp|inc)/i', '$0-x', $file_info['name']);
 		$file_info['name'] = removeHackTag($file_info['name']);
-		$file_info['name'] = str_replace(array('<','>'),array('%3C','%3E'),$file_info['name']);
+		$file_info['name'] = str_replace(array('<', '>'), array('%3C', '%3E'), $file_info['name']);
 
 		// Get random number generator
 		$random = new Password();
 
 		// Set upload path by checking if the attachement is an image or other kinds of file
-		if(preg_match("/\.(jpe?g|gif|png|wm[va]|mpe?g|avi|swf|flv|mp[1-4]|as[fx]|wav|midi?|moo?v|qt|r[am]{1,2}|m4v)$/i", $file_info['name']))
+		if (preg_match("/\.(jpe?g|gif|png|wm[va]|mpe?g|avi|swf|flv|mp[1-4]|as[fx]|wav|midi?|moo?v|qt|r[am]{1,2}|m4v)$/i", $file_info['name']))
 		{
-			$path = sprintf("./files/attach/images/%s/%s", $module_srl,getNumberingPath($upload_target_srl,3));
+			$path = sprintf("./files/attach/images/%s/%s", $module_srl, getNumberingPath($upload_target_srl, 3));
 
 			// special character to '_'
 			// change to random file name. because window php bug. window php is not recognize unicode character file name - by cherryfilter
-			$ext = substr(strrchr($file_info['name'],'.'),1);
+			$ext = substr(strrchr($file_info['name'], '.'), 1);
 			//$_filename = preg_replace('/[#$&*?+%"\']/', '_', $file_info['name']);
 			$_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++;
 			}
 			$direct_download = 'Y';
 		}
 		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');
 			$direct_download = 'N';
 		}
 		// Create a directory
-		if(!FileHandler::makeDir($path)) return new Object(-1,'msg_not_permitted_create');
+		if (!FileHandler::makeDir($path)) return new Object(-1, 'msg_not_permitted_create');
 
 		// Check uploaded file
-		if(!checkUploadedFile($file_info['tmp_name']))  return new Object(-1,'msg_file_upload_error');
+		if (!checkUploadedFile($file_info['tmp_name']))  return new Object(-1, 'msg_file_upload_error');
 
 		// Get random number generator
 		$random = new Password();
 		
 		// Move the file
-		if($manual_insert)
+		if ($manual_insert)
 		{
 			@copy($file_info['tmp_name'], $filename);
-			if(!file_exists($filename))
+			if (!file_exists($filename))
 			{
 				$filename = $path.$random->createSecureSalt(32, 'hex').'.'.$ext;
 				@copy($file_info['tmp_name'], $filename);
@@ -729,10 +729,10 @@ 
 		}
 		else
 		{
-			if(!@move_uploaded_file($file_info['tmp_name'], $filename))
+			if (!@move_uploaded_file($file_info['tmp_name'], $filename))
 			{
 				$filename = $path.$random->createSecureSalt(32, 'hex').'.'.$ext;
-				if(!@move_uploaded_file($file_info['tmp_name'], $filename))  return new Object(-1,'msg_file_upload_error');
+				if (!@move_uploaded_file($file_info['tmp_name'], $filename))  return new Object(-1, 'msg_file_upload_error');
 			}
 		}
 		// Get member information
@@ -753,10 +753,10 @@ 
 		$args->sid = $random->createSecureSalt(32, 'hex');
 
 		$output = executeQuery('file.insertFile', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Call a trigger (after)
 		$trigger_output = ModuleHandler::triggerCall('file.insertFile', 'after', $args);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if (!$trigger_output->toBool()) return $trigger_output;
 
 		$_SESSION['__XE_UPLOADING_FILES_INFO__'][$args->file_srl] = true;
 
@@ -799,18 +799,18 @@ 
 	 */
 	function deleteFile($file_srl)
 	{
-		if(!$file_srl) return;
+		if (!$file_srl) return;
 
 		$srls = (is_array($file_srl)) ? $file_srl : explode(',', $file_srl);
-		if(!count($srls)) return;
+		if (!count($srls)) return;
 
 		$oDocumentController = getController('document');
 		$documentSrlList = array();
 
-		foreach($srls as $srl)
+		foreach ($srls as $srl)
 		{
-			$srl = (int)$srl;
-			if(!$srl) 
+			$srl = (int) $srl;
+			if (!$srl) 
 			{
 				continue;
 			}
@@ -819,14 +819,14 @@ 
 			$args->file_srl = $srl;
 			$output = executeQuery('file.getFile', $args);
 
-			if(!$output->toBool() || !$output->data) 
+			if (!$output->toBool() || !$output->data) 
 			{
 				continue;
 			}
 
 			$file_info = $output->data;
 
-			if($file_info->upload_target_srl)
+			if ($file_info->upload_target_srl)
 			{
 				$documentSrlList[] = $file_info->upload_target_srl;
 			}
@@ -837,15 +837,15 @@ 
 			// Call a trigger (before)
 			$trigger_obj = $output->data;
 			$output = ModuleHandler::triggerCall('file.deleteFile', 'before', $trigger_obj);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 
 			// Remove from the DB
 			$output = executeQuery('file.deleteFile', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 
 			// Call a trigger (after)
 			$trigger_output = ModuleHandler::triggerCall('file.deleteFile', 'after', $trigger_obj);
-			if(!$trigger_output->toBool()) return $trigger_output;
+			if (!$trigger_output->toBool()) return $trigger_output;
 
 			// If successfully deleted, remove the file
 			FileHandler::removeFile($uploaded_filename);
@@ -869,28 +869,28 @@ 
 		$columnList = array('file_srl', 'uploaded_filename', 'module_srl');
 		$file_list = $oFileModel->getFiles($upload_target_srl, $columnList);
 		// Success returned if no attachement exists
-		if(!is_array($file_list)||!count($file_list)) return new Object();
+		if (!is_array($file_list) || !count($file_list)) return new Object();
 
 		// Delete the file
 		$path = array();
 		$file_count = count($file_list);
-		for($i=0;$i<$file_count;$i++)
+		for ($i = 0; $i < $file_count; $i++)
 		{
 			$this->deleteFile($file_list[$i]->file_srl);
 
 			$uploaded_filename = $file_list[$i]->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 from the DB
 		$args = new stdClass();
 		$args->upload_target_srl = $upload_target_srl;
 		$output = executeQuery('file.deleteFiles', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		
 		// Remove a file directory of the document
-		for($i=0, $c=count($path); $i<$c; $i++)
+		for ($i = 0, $c = count($path); $i < $c; $i++)
 		{
 			FileHandler::removeBlankDir($path[$i]);
 		}
@@ -908,23 +908,23 @@ 
 	 */
 	function moveFile($source_srl, $target_module_srl, $target_srl)
 	{
-		if($source_srl == $target_srl) return;
+		if ($source_srl == $target_srl) return;
 
 		$oFileModel = getModel('file');
 		$file_list = $oFileModel->getFiles($source_srl);
-		if(!$file_list) return;
+		if (!$file_list) return;
 
 		$file_count = count($file_list);
 
-		for($i=0;$i<$file_count;$i++)
+		for ($i = 0; $i < $file_count; $i++)
 		{
 			unset($file_info);
 			$file_info = $file_list[$i];
 			$old_file = $file_info->uploaded_filename;
 			// Determine the file path by checking if the file is an image or other kinds
-			if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp1|mp2|mp3|mp4|asf|wav|asx|mid|midi|asf|mov|moov|qt|rm|ram|ra|rmm|m4v)$/i", $file_info->source_filename))
+			if (preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp1|mp2|mp3|mp4|asf|wav|asx|mid|midi|asf|mov|moov|qt|rm|ram|ra|rmm|m4v)$/i", $file_info->source_filename))
 			{
-				$path = sprintf("./files/attach/images/%s/%s/", $target_module_srl,$target_srl);
+				$path = sprintf("./files/attach/images/%s/%s/", $target_module_srl, $target_srl);
 				$new_file = $path.$file_info->source_filename;
 			}
 			else
@@ -934,7 +934,7 @@ 
 				$new_file = $path.$random->createSecureSalt(32, 'hex');
 			}
 			// Pass if a target document to move is same
-			if($old_file == $new_file) continue;
+			if ($old_file == $new_file) continue;
 			// Create a directory
 			FileHandler::makeDir($path);
 			// Move the file
@@ -954,18 +954,18 @@ 
 		$vars = Context::getRequestVars();
 		$logged_info = Context::get('logged_info');
 
-		if(!$vars->editor_sequence) return new Object(-1, 'msg_invalid_request');
+		if (!$vars->editor_sequence) return new Object(-1, 'msg_invalid_request');
 
 		$upload_target_srl = $_SESSION['upload_info'][$vars->editor_sequence]->upload_target_srl;
 
 		$oFileModel = getModel('file');
 		$file_info = $oFileModel->getFile($vars->file_srl);
 
-		if(!$file_info) return new Object(-1, 'msg_not_founded');
+		if (!$file_info) return new Object(-1, 'msg_not_founded');
 
-		if(!$this->manager && !$file_info->member_srl === $logged_info->member_srl) return new Object(-1, 'msg_not_permitted');
+		if (!$this->manager && !$file_info->member_srl === $logged_info->member_srl) return new Object(-1, 'msg_not_permitted');
 
-		$args =  new stdClass();
+		$args = new stdClass();
 		$args->file_srl = $vars->file_srl;
 		$args->upload_target_srl = $upload_target_srl;
 
@@ -974,7 +974,7 @@ 
 
 		$args->cover_image = 'N';
 		$output = executeQuery('file.updateClearCoverImage', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -982,7 +982,7 @@ 
 
 		$args->cover_image = 'Y';
 		$output = executeQuery('file.updateCoverImage', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -1014,9 +1014,9 @@ 
 		$fileConfig = $oModuleModel->getModulePartConfig('file', $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('file', $moduleSrl, $fileConfig);
 			}

Braces +230 added lines, -92 removed lines

@@ -29,24 +29,36 @@ 
 		$file_info = $_FILES['Filedata'];
 
 		// An error appears if not a normally uploaded file
-		if(!is_uploaded_file($file_info['tmp_name'])) exit();
+		if(!is_uploaded_file($file_info['tmp_name'])) {
+			exit();
+		}
 
 		// Basic variables setting
 		$oFileModel = getModel('file');
 		$editor_sequence = Context::get('editor_sequence');
 		$upload_target_srl = intval(Context::get('uploadTargetSrl'));
-		if(!$upload_target_srl) $upload_target_srl = intval(Context::get('upload_target_srl'));
+		if(!$upload_target_srl) {
+			$upload_target_srl = intval(Context::get('upload_target_srl'));
+		}
 		$module_srl = $this->module_srl;
 		// Exit a session if there is neither upload permission nor information
-		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
+		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) {
+			exit();
+		}
 		// Extract from session information if upload_target_srl is not specified
-		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;
+		}
 		// Create if upload_target_srl is not defined in the session information
-		if(!$upload_target_srl) $_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
+		if(!$upload_target_srl) {
+			$_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
+		}
 
 		$output = $this->insertFile($file_info, $module_srl, $upload_target_srl);
 		Context::setResponseMethod('JSON');
-		if($output->error != '0') $this->stop($output->message);
+		if($output->error != '0') {
+			$this->stop($output->message);
+		}
 	}
 
 	/**
@@ -61,17 +73,27 @@ 
 		$callback = Context::get('callback');
 		$module_srl = $this->module_srl;
 		$upload_target_srl = intval(Context::get('uploadTargetSrl'));
-		if(!$upload_target_srl) $upload_target_srl = intval(Context::get('upload_target_srl'));
+		if(!$upload_target_srl) {
+			$upload_target_srl = intval(Context::get('upload_target_srl'));
+		}
 
 		// Exit a session if there is neither upload permission nor information
-		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
+		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) {
+			exit();
+		}
 		// Extract from session information if upload_target_srl is not specified
-		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;
+		}
 		// Create if upload_target_srl is not defined in the session information
-		if(!$upload_target_srl) $_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
+		if(!$upload_target_srl) {
+			$_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
+		}
 		// Delete and then attempt to re-upload if file_srl is requested
 		$file_srl = Context::get('file_srl');
-		if($file_srl) $this->deleteFile($file_srl);
+		if($file_srl) {
+			$this->deleteFile($file_srl);
+		}
 
 		$file_info = Context::get('Filedata');
 		// An error appears if not a normally uploaded file
@@ -112,15 +134,16 @@ 
 		$source_src = $fileInfo->uploaded_filename;
 		$output_src = $source_src . '.resized' . strrchr($source_src,'.');
 
-		if(!$height) $height = $width-1;
+		if(!$height) {
+			$height = $width-1;
+		}
 
 		if(FileHandler::createImageFile($source_src,$output_src,$width,$height,'','ratio'))
 		{
 			$output = new stdClass();
 			$output->info = getimagesize($output_src);
 			$output->src = $output_src;
-		}
-		else
+		} else
 		{
 			return new Object(-1,'msg_invalid_request');
 		}
@@ -163,7 +186,9 @@ 
 	{
 		$oFileModel = getModel('file');
 
-		if(isset($this->grant->access) && $this->grant->access !== true) return new Object(-1, 'msg_not_permitted');
+		if(isset($this->grant->access) && $this->grant->access !== true) {
+			return new Object(-1, 'msg_not_permitted');
+		}
 
 		$file_srl = Context::get('file_srl');
 		$sid = Context::get('sid');
@@ -172,9 +197,13 @@ 
 		$columnList = array('file_srl', 'sid', 'isvalid', 'source_filename', 'module_srl', 'uploaded_filename', 'file_size', 'member_srl', 'upload_target_srl', 'upload_target_type');
 		$file_obj = $oFileModel->getFile($file_srl, $columnList);
 		// If the requested file information is incorrect, an error that file cannot be found appears
-		if($file_obj->file_srl!=$file_srl || $file_obj->sid!=$sid) return $this->stop('msg_file_not_found');
+		if($file_obj->file_srl!=$file_srl || $file_obj->sid!=$sid) {
+			return $this->stop('msg_file_not_found');
+		}
 		// Notify that file download is not allowed when standing-by(Only a top-administrator is permitted)
-		if($logged_info->is_admin != 'Y' && $file_obj->isvalid!='Y') return $this->stop('msg_not_permitted_download');
+		if($logged_info->is_admin != 'Y' && $file_obj->isvalid!='Y') {
+			return $this->stop('msg_not_permitted_download');
+		}
 		// File name
 		$filename = $file_obj->source_filename;
 		$file_module_config = $oFileModel->getFileModuleConfig($file_obj->module_srl);
@@ -186,7 +215,9 @@ 
 			{
 				$allow_outlink_format_array = array();
 				$allow_outlink_format_array = explode(',', $file_module_config->allow_outlink_format);
-				if(!is_array($allow_outlink_format_array)) $allow_outlink_format_array[0] = $file_module_config->allow_outlink_format;
+				if(!is_array($allow_outlink_format_array)) {
+					$allow_outlink_format_array[0] = $file_module_config->allow_outlink_format;
+				}
 
 				foreach($allow_outlink_format_array as $val)
 				{
@@ -208,7 +239,9 @@ 
 					{
 						$allow_outlink_site_array = array();
 						$allow_outlink_site_array = explode("\n", $file_module_config->allow_outlink_site);
-						if(!is_array($allow_outlink_site_array)) $allow_outlink_site_array[0] = $file_module_config->allow_outlink_site;
+						if(!is_array($allow_outlink_site_array)) {
+							$allow_outlink_site_array[0] = $file_module_config->allow_outlink_site;
+						}
 
 						foreach($allow_outlink_site_array as $val)
 						{
@@ -220,23 +253,29 @@ 
 							}
 						}
 					}
+				} else {
+					$file_module_config->allow_outlink = 'Y';
 				}
-				else $file_module_config->allow_outlink = 'Y';
 			}
-			if($file_module_config->allow_outlink != 'Y') return $this->stop('msg_not_allowed_outlink');
+			if($file_module_config->allow_outlink != 'Y') {
+				return $this->stop('msg_not_allowed_outlink');
+			}
 		}
 
 		// Check if a permission for file download is granted
 		$downloadGrantCount = 0;
 		if(is_array($file_module_config->download_grant))
 		{
-			foreach($file_module_config->download_grant AS $value)
-				if($value) $downloadGrantCount++;
+			foreach($file_module_config->download_grant AS $value) {
+							if($value) $downloadGrantCount++;
+			}
 		}
 
 		if(is_array($file_module_config->download_grant) && $downloadGrantCount>0)
 		{
-			if(!Context::get('is_logged')) return $this->stop('msg_not_permitted_download');
+			if(!Context::get('is_logged')) {
+				return $this->stop('msg_not_permitted_download');
+			}
 			$logged_info = Context::get('logged_info');
 			if($logged_info->is_admin != 'Y')
 			{
@@ -259,13 +298,17 @@ 
 							break;
 						}
 					}
-					if(!$is_permitted) return $this->stop('msg_not_permitted_download');
+					if(!$is_permitted) {
+						return $this->stop('msg_not_permitted_download');
+					}
 				}
 			}
 		}
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('file.downloadFile', 'before', $file_obj);
-		if(!$output->toBool()) return $this->stop(($output->message)?$output->message:'msg_not_permitted_download');
+		if(!$output->toBool()) {
+			return $this->stop(($output->message)?$output->message:'msg_not_permitted_download');
+		}
 
 
 		// 다운로드 후 (가상)
@@ -289,16 +332,23 @@ 
 		$oFileModel = getModel('file');
 		$file_srl = Context::get('file_srl');
 		$file_key = Context::get('file_key');
-		if(strstr($_SERVER['HTTP_USER_AGENT'], "Android")) $is_android = true;
+		if(strstr($_SERVER['HTTP_USER_AGENT'], "Android")) {
+			$is_android = true;
+		}
 
-		if($is_android && $_SESSION['__XE_FILE_KEY_AND__'][$file_srl]) $session_key = '__XE_FILE_KEY_AND__';
-		else $session_key = '__XE_FILE_KEY__';
+		if($is_android && $_SESSION['__XE_FILE_KEY_AND__'][$file_srl]) {
+			$session_key = '__XE_FILE_KEY_AND__';
+		} else {
+			$session_key = '__XE_FILE_KEY__';
+		}
 		$columnList = array('source_filename', 'uploaded_filename', 'file_size');
 		$file_obj = $oFileModel->getFile($file_srl, $columnList);
 
 		$uploaded_filename = $file_obj->uploaded_filename;
 
-		if(!file_exists($uploaded_filename)) return $this->stop('msg_file_not_found');
+		if(!file_exists($uploaded_filename)) {
+			return $this->stop('msg_file_not_found');
+		}
 
 		if(!$file_key || $_SESSION[$session_key][$file_srl] != $file_key)
 		{
@@ -311,8 +361,7 @@ 
 				if(preg_match('#(?:Chrome|Edge)/(\d+)\.#', $_SERVER['HTTP_USER_AGENT'], $matches) && $matches[1] >= 11)
 		{
 			$filename_param = "filename*=UTF-8''" . rawurlencode($filename) . '; filename="' . rawurlencode($filename) . '"';
-		}
-		elseif(preg_match('#(?:Firefox|Safari|Trident)/(\d+)\.#', $_SERVER['HTTP_USER_AGENT'], $matches) && $matches[1] >= 6)
+		} elseif(preg_match('#(?:Firefox|Safari|Trident)/(\d+)\.#', $_SERVER['HTTP_USER_AGENT'], $matches) && $matches[1] >= 6)
 		{
 			$filename_param = "filename*=UTF-8''" . rawurlencode($filename) . '; filename="' . rawurlencode($filename) . '"';
 		}
@@ -321,15 +370,16 @@ 
 		{
 			$filename = rawurlencode($filename);
 			$filename_param = 'filename="' . preg_replace('/\./', '%2e', $filename, substr_count($filename, '.') - 1) . '"';
-		}
-		else
+		} else
 		{
 			$filename_param = 'filename="' . $filename . '"';
 		}
 
 		if($is_android)
 		{
-			if($_SESSION['__XE_FILE_KEY__'][$file_srl]) $_SESSION['__XE_FILE_KEY_AND__'][$file_srl] = $file_key;
+			if($_SESSION['__XE_FILE_KEY__'][$file_srl]) {
+				$_SESSION['__XE_FILE_KEY_AND__'][$file_srl] = $file_key;
+			}
 		}
 
 		unset($_SESSION[$session_key][$file_srl]);
@@ -337,7 +387,9 @@ 
 		Context::close();
 
 		$fp = fopen($uploaded_filename, 'rb');
-		if(!$fp) return $this->stop('msg_file_not_found');
+		if(!$fp) {
+			return $this->stop('msg_file_not_found');
+		}
 
 		header("Cache-Control: ");
 		header("Pragma: ");
@@ -351,10 +403,11 @@ 
 		// if file size is lager than 10MB, use fread function (#18675748)
 		if(filesize($uploaded_filename) > 1024 * 1024)
 		{
-			while(!feof($fp)) echo fread($fp, 1024);
+			while(!feof($fp)) {
+				echo fread($fp, 1024);
+			}
 			fclose($fp);
-		}
-		else
+		} else
 		{
 			fpassthru($fp);
 		}
@@ -373,9 +426,13 @@ 
 		$editor_sequence = Context::get('editor_sequence');
 		$file_srl = Context::get('file_srl');
 		$file_srls = Context::get('file_srls');
-		if($file_srls) $file_srl = $file_srls;
+		if($file_srls) {
+			$file_srl = $file_srls;
+		}
 		// Exit a session if there is neither upload permission nor information
-		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
+		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) {
+			exit();
+		}
 
 		$upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
 
@@ -383,26 +440,38 @@ 
 		$oFileModel = getModel('file');
 
 		$srls = explode(',',$file_srl);
-		if(!count($srls)) return;
+		if(!count($srls)) {
+			return;
+		}
 
 		for($i=0;$i<count($srls);$i++)
 		{
 			$srl = (int)$srls[$i];
-			if(!$srl) continue;
+			if(!$srl) {
+				continue;
+			}
 
 			$args = new stdClass;
 			$args->file_srl = $srl;
 			$output = executeQuery('file.getFile', $args);
-			if(!$output->toBool()) continue;
+			if(!$output->toBool()) {
+				continue;
+			}
 
 			$file_info = $output->data;
-			if(!$file_info) continue;
+			if(!$file_info) {
+				continue;
+			}
 
 			$file_grant = $oFileModel->getFileGrant($file_info, $logged_info);
 
-			if(!$file_grant->is_deletable) continue;
+			if(!$file_grant->is_deletable) {
+				continue;
+			}
 
-			if($upload_target_srl && $file_srl) $output = $this->deleteFile($file_srl);
+			if($upload_target_srl && $file_srl) {
+				$output = $this->deleteFile($file_srl);
+			}
 		}
 	}
 
@@ -413,28 +482,36 @@ 
 	 */
 	function procFileGetList()
 	{
-		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new Object(-1,'msg_not_permitted');
+		}
 		$fileSrls = Context::get('file_srls');
-		if($fileSrls) $fileSrlList = explode(',', $fileSrls);
+		if($fileSrls) {
+			$fileSrlList = explode(',', $fileSrls);
+		}
 
 		global $lang;
 		if(count($fileSrlList) > 0)
 		{
 			$oFileModel = getModel('file');
 			$fileList = $oFileModel->getFile($fileSrlList);
-			if(!is_array($fileList)) $fileList = array($fileList);
+			if(!is_array($fileList)) {
+				$fileList = array($fileList);
+			}
 
 			if(is_array($fileList))
 			{
 				foreach($fileList AS $key=>$value)
 				{
 					$value->human_file_size = FileHandler::filesize($value->file_size);
-					if($value->isvalid=='Y') $value->validName = $lang->is_valid;
-					else $value->validName = $lang->is_stand_by;
+					if($value->isvalid=='Y') {
+						$value->validName = $lang->is_valid;
+					} else {
+						$value->validName = $lang->is_stand_by;
+					}
 				}
 			}
-		}
-		else
+		} else
 		{
 			$fileList = array();
 			$this->setMessage($lang->no_files);
@@ -451,7 +528,9 @@ 
 	function triggerCheckAttached(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new Object();
+		if(!$document_srl) {
+			return new Object();
+		}
 		// Get numbers of attachments
 		$oFileModel = getModel('file');
 		$obj->uploaded_count = $oFileModel->getFilesCount($document_srl);
@@ -468,10 +547,14 @@ 
 	function triggerAttachFiles(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new Object();
+		if(!$document_srl) {
+			return new Object();
+		}
 
 		$output = $this->setFilesValid($document_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		return new Object();
 	}
@@ -485,7 +568,9 @@ 
 	function triggerDeleteAttached(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new Object();
+		if(!$document_srl) {
+			return new Object();
+		}
 
 		$output = $this->deleteFiles($document_srl);
 		return $output;
@@ -500,7 +585,9 @@ 
 	function triggerCommentCheckAttached(&$obj)
 	{
 		$comment_srl = $obj->comment_srl;
-		if(!$comment_srl) return new Object();
+		if(!$comment_srl) {
+			return new Object();
+		}
 		// Get numbers of attachments
 		$oFileModel = getModel('file');
 		$obj->uploaded_count = $oFileModel->getFilesCount($comment_srl);
@@ -518,10 +605,14 @@ 
 	{
 		$comment_srl = $obj->comment_srl;
 		$uploaded_count = $obj->uploaded_count;
-		if(!$comment_srl || !$uploaded_count) return new Object();
+		if(!$comment_srl || !$uploaded_count) {
+			return new Object();
+		}
 
 		$output = $this->setFilesValid($comment_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		return new Object();
 	}
@@ -535,9 +626,13 @@ 
 	function triggerCommentDeleteAttached(&$obj)
 	{
 		$comment_srl = $obj->comment_srl;
-		if(!$comment_srl) return new Object();
+		if(!$comment_srl) {
+			return new Object();
+		}
 
-		if($obj->isMoveToTrash) return new Object();
+		if($obj->isMoveToTrash) {
+			return new Object();
+		}
 
 		$output = $this->deleteFiles($comment_srl);
 		return $output;
@@ -552,7 +647,9 @@ 
 	function triggerDeleteModuleFiles(&$obj)
 	{
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new Object();
+		if(!$module_srl) {
+			return new Object();
+		}
 
 		$oFileController = getAdminController('file');
 		return $oFileController->deleteModuleFiles($module_srl);
@@ -627,7 +724,9 @@ 
 		$trigger_obj->module_srl = $module_srl;
 		$trigger_obj->upload_target_srl = $upload_target_srl;
 		$output = ModuleHandler::triggerCall('file.insertFile', 'before', $trigger_obj);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// A workaround for Firefox upload bug
 		if(preg_match('/^=\?UTF-8\?B\?(.+)\?=$/i', $file_info['name'], $match))
@@ -665,13 +764,17 @@ 
 				$allowed_filesize = $config->allowed_filesize * 1024 * 1024;
 				$allowed_attach_size = $config->allowed_attach_size * 1024 * 1024;
 				// An error appears if file size exceeds a limit
-				if($allowed_filesize < filesize($file_info['tmp_name'])) return new Object(-1, 'msg_exceeds_limit_size');
+				if($allowed_filesize < filesize($file_info['tmp_name'])) {
+					return new Object(-1, 'msg_exceeds_limit_size');
+				}
 				// Get total file size of all attachements (from DB)
 				$size_args = new stdClass;
 				$size_args->upload_target_srl = $upload_target_srl;
 				$output = executeQuery('file.getAttachedFileSize', $size_args);
 				$attached_size = (int)$output->data->attached_size + filesize($file_info['tmp_name']);
-				if($attached_size > $allowed_attach_size) return new Object(-1, 'msg_exceeds_limit_size');
+				if($attached_size > $allowed_attach_size) {
+					return new Object(-1, 'msg_exceeds_limit_size');
+				}
 			}
 		}
 
@@ -701,18 +804,21 @@ 
 				$idx++;
 			}
 			$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');
 			$direct_download = 'N';
 		}
 		// Create a directory
-		if(!FileHandler::makeDir($path)) return new Object(-1,'msg_not_permitted_create');
+		if(!FileHandler::makeDir($path)) {
+			return new Object(-1,'msg_not_permitted_create');
+		}
 
 		// Check uploaded file
-		if(!checkUploadedFile($file_info['tmp_name']))  return new Object(-1,'msg_file_upload_error');
+		if(!checkUploadedFile($file_info['tmp_name'])) {
+			return new Object(-1,'msg_file_upload_error');
+		}
 
 		// Get random number generator
 		$random = new Password();
@@ -726,13 +832,14 @@ 
 				$filename = $path.$random->createSecureSalt(32, 'hex').'.'.$ext;
 				@copy($file_info['tmp_name'], $filename);
 			}
-		}
-		else
+		} else
 		{
 			if(!@move_uploaded_file($file_info['tmp_name'], $filename))
 			{
 				$filename = $path.$random->createSecureSalt(32, 'hex').'.'.$ext;
-				if(!@move_uploaded_file($file_info['tmp_name'], $filename))  return new Object(-1,'msg_file_upload_error');
+				if(!@move_uploaded_file($file_info['tmp_name'], $filename)) {
+					return new Object(-1,'msg_file_upload_error');
+				}
 			}
 		}
 		// Get member information
@@ -753,10 +860,14 @@ 
 		$args->sid = $random->createSecureSalt(32, 'hex');
 
 		$output = executeQuery('file.insertFile', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Call a trigger (after)
 		$trigger_output = ModuleHandler::triggerCall('file.insertFile', 'after', $args);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if(!$trigger_output->toBool()) {
+			return $trigger_output;
+		}
 
 		$_SESSION['__XE_UPLOADING_FILES_INFO__'][$args->file_srl] = true;
 
@@ -799,10 +910,14 @@ 
 	 */
 	function deleteFile($file_srl)
 	{
-		if(!$file_srl) return;
+		if(!$file_srl) {
+			return;
+		}
 
 		$srls = (is_array($file_srl)) ? $file_srl : explode(',', $file_srl);
-		if(!count($srls)) return;
+		if(!count($srls)) {
+			return;
+		}
 
 		$oDocumentController = getController('document');
 		$documentSrlList = array();
@@ -837,15 +952,21 @@ 
 			// Call a trigger (before)
 			$trigger_obj = $output->data;
 			$output = ModuleHandler::triggerCall('file.deleteFile', 'before', $trigger_obj);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 
 			// Remove from the DB
 			$output = executeQuery('file.deleteFile', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 
 			// Call a trigger (after)
 			$trigger_output = ModuleHandler::triggerCall('file.deleteFile', 'after', $trigger_obj);
-			if(!$trigger_output->toBool()) return $trigger_output;
+			if(!$trigger_output->toBool()) {
+				return $trigger_output;
+			}
 
 			// If successfully deleted, remove the file
 			FileHandler::removeFile($uploaded_filename);
@@ -869,7 +990,9 @@ 
 		$columnList = array('file_srl', 'uploaded_filename', 'module_srl');
 		$file_list = $oFileModel->getFiles($upload_target_srl, $columnList);
 		// Success returned if no attachement exists
-		if(!is_array($file_list)||!count($file_list)) return new Object();
+		if(!is_array($file_list)||!count($file_list)) {
+			return new Object();
+		}
 
 		// Delete the file
 		$path = array();
@@ -880,14 +1003,18 @@ 
 
 			$uploaded_filename = $file_list[$i]->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 from the DB
 		$args = new stdClass();
 		$args->upload_target_srl = $upload_target_srl;
 		$output = executeQuery('file.deleteFiles', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		
 		// Remove a file directory of the document
 		for($i=0, $c=count($path); $i<$c; $i++)
@@ -908,11 +1035,15 @@ 
 	 */
 	function moveFile($source_srl, $target_module_srl, $target_srl)
 	{
-		if($source_srl == $target_srl) return;
+		if($source_srl == $target_srl) {
+			return;
+		}
 
 		$oFileModel = getModel('file');
 		$file_list = $oFileModel->getFiles($source_srl);
-		if(!$file_list) return;
+		if(!$file_list) {
+			return;
+		}
 
 		$file_count = count($file_list);
 
@@ -926,15 +1057,16 @@ 
 			{
 				$path = sprintf("./files/attach/images/%s/%s/", $target_module_srl,$target_srl);
 				$new_file = $path.$file_info->source_filename;
-			}
-			else
+			} else
 			{
 				$path = sprintf("./files/attach/binaries/%s/%s/", $target_module_srl, $target_srl);
 				$random = new Password();
 				$new_file = $path.$random->createSecureSalt(32, 'hex');
 			}
 			// Pass if a target document to move is same
-			if($old_file == $new_file) continue;
+			if($old_file == $new_file) {
+				continue;
+			}
 			// Create a directory
 			FileHandler::makeDir($path);
 			// Move the file
@@ -954,16 +1086,22 @@ 
 		$vars = Context::getRequestVars();
 		$logged_info = Context::get('logged_info');
 
-		if(!$vars->editor_sequence) return new Object(-1, 'msg_invalid_request');
+		if(!$vars->editor_sequence) {
+			return new Object(-1, 'msg_invalid_request');
+		}
 
 		$upload_target_srl = $_SESSION['upload_info'][$vars->editor_sequence]->upload_target_srl;
 
 		$oFileModel = getModel('file');
 		$file_info = $oFileModel->getFile($vars->file_srl);
 
-		if(!$file_info) return new Object(-1, 'msg_not_founded');
+		if(!$file_info) {
+			return new Object(-1, 'msg_not_founded');
+		}
 
-		if(!$this->manager && !$file_info->member_srl === $logged_info->member_srl) return new Object(-1, 'msg_not_permitted');
+		if(!$this->manager && !$file_info->member_srl === $logged_info->member_srl) {
+			return new Object(-1, 'msg_not_permitted');
+		}
 
 		$args =  new stdClass();
 		$args->file_srl = $vars->file_srl;

modules/member/member.controller.php

Spacing +442 added lines, -442 removed lines

@@ -34,25 +34,25 @@ 
 	 */
 	function procMemberLogin($user_id = null, $password = null, $keep_signed = null)
 	{
-		if(!$user_id && !$password && Context::getRequestMethod() == 'GET')
+		if (!$user_id && !$password && Context::getRequestMethod() == 'GET')
 		{
 			$this->setRedirectUrl(getNotEncodedUrl(''));
 			return new Object(-1, 'null_user_id');
 		}
 
 		// Variables
-		if(!$user_id) $user_id = Context::get('user_id');
+		if (!$user_id) $user_id = Context::get('user_id');
 		$user_id = trim($user_id);
 
-		if(!$password) $password = Context::get('password');
+		if (!$password) $password = Context::get('password');
 		$password = trim($password);
 
-		if(!$keep_signed) $keep_signed = Context::get('keep_signed');
+		if (!$keep_signed) $keep_signed = Context::get('keep_signed');
 		// Return an error when id and password doesn't exist
-		if(!$user_id) return new Object(-1,'null_user_id');
-		if(!$password) return new Object(-1,'null_password');
+		if (!$user_id) return new Object(-1, 'null_user_id');
+		if (!$password) return new Object(-1, 'null_password');
 
-		$output = $this->doLogin($user_id, $password, $keep_signed=='Y'?true:false);
+		$output = $this->doLogin($user_id, $password, $keep_signed == 'Y' ? true : false);
 		if (!$output->toBool()) return $output;
 
 		$oModuleModel = getModel('module');
@@ -62,13 +62,13 @@ 
 		$limit_date = $config->change_password_date;
 
 		// Check if change_password_date is set
-		if($limit_date > 0)
+		if ($limit_date > 0)
 		{
 			$oMemberModel = getModel('member');
-			if($this->memberInfo->change_password_date < date ('YmdHis', strtotime ('-' . $limit_date . ' day')))
+			if ($this->memberInfo->change_password_date < date('YmdHis', strtotime('-'.$limit_date.' day')))
 			{
 				$msg = sprintf(Context::getLang('msg_change_password_date'), $limit_date);
-				return $this->setRedirectUrl(getNotEncodedUrl('','vid',Context::get('vid'),'mid',Context::get('mid'),'act','dispMemberModifyPassword'), new Object(-1, $msg));
+				return $this->setRedirectUrl(getNotEncodedUrl('', 'vid', Context::get('vid'), 'mid', Context::get('mid'), 'act', 'dispMemberModifyPassword'), new Object(-1, $msg));
 			}
 		}
 
@@ -77,7 +77,7 @@ 
 		$args->member_srl = $this->memberInfo->member_srl;
 		executeQuery('member.deleteAuthMail', $args);
 
-		if(!$config->after_login_url)
+		if (!$config->after_login_url)
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
 		}
@@ -98,18 +98,18 @@ 
 		// Call a trigger before log-out (before)
 		$logged_info = Context::get('logged_info');
 		$trigger_output = ModuleHandler::triggerCall('member.doLogout', 'before', $logged_info);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if (!$trigger_output->toBool()) return $trigger_output;
 		// Destroy session information
 		$this->destroySessionInfo();
 		// Call a trigger after log-out (after)
 		$trigger_output = ModuleHandler::triggerCall('member.doLogout', 'after', $logged_info);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if (!$trigger_output->toBool()) return $trigger_output;
 
 		$output = new Object();
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
-		if($config->after_logout_url)
+		if ($config->after_logout_url)
 			$output->redirect_url = $config->after_logout_url;
 
 		$this->_clearMemberCache($logged_info->member_srl);
@@ -125,12 +125,12 @@ 
 	function procMemberScrapDocument()
 	{
 		// Check login information
-		if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
 		$logged_info = Context::get('logged_info');
 
-		$document_srl = (int)Context::get('document_srl');
-		if(!$document_srl) $document_srl = (int)Context::get('target_srl');
-		if(!$document_srl) return new Object(-1,'msg_invalid_request');
+		$document_srl = (int) Context::get('document_srl');
+		if (!$document_srl) $document_srl = (int) Context::get('target_srl');
+		if (!$document_srl) return new Object(-1, 'msg_invalid_request');
 		// Get document
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
@@ -145,10 +145,10 @@ 
 		$args->title = $oDocument->get('title');
 		// Check if already scrapped
 		$output = executeQuery('member.getScrapDocument', $args);
-		if($output->data->count) return new Object(-1, 'msg_alreay_scrapped');
+		if ($output->data->count) return new Object(-1, 'msg_alreay_scrapped');
 		// Insert
 		$output = executeQuery('member.addScrapDocument', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->setError(-1);
 		$this->setMessage('success_registed');
@@ -162,11 +162,11 @@ 
 	function procMemberDeleteScrap()
 	{
 		// Check login information
-		if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
 		$logged_info = Context::get('logged_info');
 
-		$document_srl = (int)Context::get('document_srl');
-		if(!$document_srl) return new Object(-1,'msg_invalid_request');
+		$document_srl = (int) Context::get('document_srl');
+		if (!$document_srl) return new Object(-1, 'msg_invalid_request');
 		// Variables
 		$args = new stdClass;
 		$args->member_srl = $logged_info->member_srl;
@@ -192,11 +192,11 @@ 
 	function procMemberDeleteSavedDocument()
 	{
 		// Check login information
-		if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
 		$logged_info = Context::get('logged_info');
 
-		$document_srl = (int)Context::get('document_srl');
-		if(!$document_srl) return new Object(-1,'msg_invalid_request');
+		$document_srl = (int) Context::get('document_srl');
+		if (!$document_srl) return new Object(-1, 'msg_invalid_request');
 		// Variables
 		$oDocumentController = getController('document');
 		$oDocumentController->deleteDocument($document_srl, true);
@@ -211,37 +211,37 @@ 
 	{
 		$name = Context::get('name');
 		$value = Context::get('value');
-		if(!$value) return;
+		if (!$value) return;
 
 		$oMemberModel = getModel('member');
 		// Check if logged-in
 		$logged_info = Context::get('logged_info');
 
 
-		switch($name)
+		switch ($name)
 		{
 			case 'user_id' :
 				// Check denied ID
-				if($oMemberModel->isDeniedID($value)) return new Object(0,'denied_user_id');
+				if ($oMemberModel->isDeniedID($value)) return new Object(0, 'denied_user_id');
 				// Check if duplicated
 				$member_srl = $oMemberModel->getMemberSrlByUserID($value);
-				if($member_srl && $logged_info->member_srl != $member_srl ) return new Object(0,'msg_exists_user_id');
+				if ($member_srl && $logged_info->member_srl != $member_srl) return new Object(0, 'msg_exists_user_id');
 				break;
 			case 'nick_name' :
 				// Check denied ID
-				if($oMemberModel->isDeniedNickName($value))
+				if ($oMemberModel->isDeniedNickName($value))
 				{
-					return new Object(0,'denied_nick_name');
+					return new Object(0, 'denied_nick_name');
 				}
 				// Check if duplicated
 				$member_srl = $oMemberModel->getMemberSrlByNickName($value);
-				if($member_srl && $logged_info->member_srl != $member_srl ) return new Object(0,'msg_exists_nick_name');
+				if ($member_srl && $logged_info->member_srl != $member_srl) return new Object(0, 'msg_exists_nick_name');
 
 				break;
 			case 'email_address' :
 				// Check if duplicated
 				$member_srl = $oMemberModel->getMemberSrlByEmailAddress($value);
-				if($member_srl && $logged_info->member_srl != $member_srl ) return new Object(0,'msg_exists_email_address');
+				if ($member_srl && $logged_info->member_srl != $member_srl) return new Object(0, 'msg_exists_email_address');
 				break;
 		}
 	}
@@ -253,25 +253,25 @@ 
 	 */
 	function procMemberInsert()
 	{
-		if (Context::getRequestMethod () == "GET") return new Object (-1, "msg_invalid_request");
-		$oMemberModel = &getModel ('member');
+		if (Context::getRequestMethod() == "GET") return new Object(-1, "msg_invalid_request");
+		$oMemberModel = &getModel('member');
 		$config = $oMemberModel->getMemberConfig();
 
 		// call a trigger (before)
-		$trigger_output = ModuleHandler::triggerCall ('member.procMemberInsert', 'before', $config);
-		if(!$trigger_output->toBool ()) return $trigger_output;
+		$trigger_output = ModuleHandler::triggerCall('member.procMemberInsert', 'before', $config);
+		if (!$trigger_output->toBool()) return $trigger_output;
 		// Check if an administrator allows a membership
-		if($config->enable_join != 'Y') return $this->stop ('msg_signup_disabled');
+		if ($config->enable_join != 'Y') return $this->stop('msg_signup_disabled');
 		// Check if the user accept the license terms (only if terms exist)
-		if($config->agreement && Context::get('accept_agreement')!='Y') return $this->stop('msg_accept_agreement');
+		if ($config->agreement && Context::get('accept_agreement') != 'Y') return $this->stop('msg_accept_agreement');
 
 		// Extract the necessary information in advance
 		$getVars = array();
-		if($config->signupForm)
+		if ($config->signupForm)
 		{
-			foreach($config->signupForm as $formInfo)
+			foreach ($config->signupForm as $formInfo)
 			{
-				if($formInfo->isDefaultForm && ($formInfo->isUse || $formInfo->required || $formInfo->mustRequired))
+				if ($formInfo->isDefaultForm && ($formInfo->isUse || $formInfo->required || $formInfo->mustRequired))
 				{
 					$getVars[] = $formInfo->name;
 				}
@@ -279,22 +279,22 @@ 
 		}
 
 		$args = new stdClass;
-		foreach($getVars as $val)
+		foreach ($getVars as $val)
 		{
 			$args->{$val} = Context::get($val);
-			if($val == 'birthday') $args->birthday_ui = Context::get('birthday_ui');
+			if ($val == 'birthday') $args->birthday_ui = Context::get('birthday_ui');
 		}
 		$args->birthday = intval(strtr($args->birthday, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
-		if(!$args->birthday && $args->birthday_ui) $args->birthday = intval(strtr($args->birthday_ui, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
+		if (!$args->birthday && $args->birthday_ui) $args->birthday = intval(strtr($args->birthday_ui, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
 
 		$args->find_account_answer = Context::get('find_account_answer');
 		$args->allow_mailing = Context::get('allow_mailing');
 		$args->allow_message = Context::get('allow_message');
 
-		if($args->password1) $args->password = $args->password1;
+		if ($args->password1) $args->password = $args->password1;
 
 		// check password strength
-		if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
+		if (!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
 		{
 			$message = Context::getLang('about_password_strength');
 			return new Object(-1, $message[$config->password_strength]);
@@ -320,58 +320,58 @@ 
 		unset($all_args->secret_text);
 
 		// Set the user state as "denied" when using mail authentication
-		if($config->enable_confirm == 'Y') $args->denied = 'Y';
+		if ($config->enable_confirm == 'Y') $args->denied = 'Y';
 		// Add extra vars after excluding necessary information from all the requested arguments
 		$extra_vars = delObjectVars($all_args, $args);
 		$args->extra_vars = serialize($extra_vars);
 
 		// remove whitespace
 		$checkInfos = array('user_id', 'user_name', 'nick_name', 'email_address');
-		foreach($checkInfos as $val)
+		foreach ($checkInfos as $val)
 		{
-			if(isset($args->{$val}))
+			if (isset($args->{$val}))
 			{
 				$args->{$val} = preg_replace('/[\pZ\pC]+/u', '', $args->{$val});
 			}
 		}
 		$output = $this->insertMember($args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// insert ProfileImage, ImageName, ImageMark
 		$profile_image = $_FILES['profile_image'];
-		if(is_uploaded_file($profile_image['tmp_name']))
+		if (is_uploaded_file($profile_image['tmp_name']))
 		{
 			$this->insertProfileImage($args->member_srl, $profile_image['tmp_name']);
 		}
 
 		$image_mark = $_FILES['image_mark'];
-		if(is_uploaded_file($image_mark['tmp_name']))
+		if (is_uploaded_file($image_mark['tmp_name']))
 		{
 			$this->insertImageMark($args->member_srl, $image_mark['tmp_name']);
 		}
 
 		$image_name = $_FILES['image_name'];
-		if(is_uploaded_file($image_name['tmp_name']))
+		if (is_uploaded_file($image_name['tmp_name']))
 		{
 			$this->insertImageName($args->member_srl, $image_name['tmp_name']);
 		}
 
 		// If a virtual site, join the site
 		$site_module_info = Context::get('site_module_info');
-		if($site_module_info->site_srl > 0)
+		if ($site_module_info->site_srl > 0)
 		{
 			$columnList = array('site_srl', 'group_srl');
 			$default_group = $oMemberModel->getDefaultGroup($site_module_info->site_srl, $columnList);
-			if($default_group->group_srl)
+			if ($default_group->group_srl)
 			{
 				$this->addMemberToGroup($args->member_srl, $default_group->group_srl, $site_module_info->site_srl);
 			}
 
 		}
 		// Log-in
-		if($config->enable_confirm != 'Y')
+		if ($config->enable_confirm != 'Y')
 		{
-			if($config->identifier == 'email_address')
+			if ($config->identifier == 'email_address')
 			{
 				$output = $this->doLogin($args->email_address);
 			}
@@ -379,8 +379,8 @@ 
 			{
 				$output = $this->doLogin($args->user_id);
 			}
-			if(!$output->toBool()) {
-				if($output->error == -9)
+			if (!$output->toBool()) {
+				if ($output->error == -9)
 					$output->error = -11;
 				return $this->setRedirectUrl(getUrl('', 'act', 'dispMemberLoginForm'), $output);
 			}
@@ -388,8 +388,8 @@ 
 
 		// Results
 		$this->add('member_srl', $args->member_srl);
-		if($config->redirect_url) $this->add('redirect_url', $config->redirect_url);
-		if($config->enable_confirm == 'Y')
+		if ($config->redirect_url) $this->add('redirect_url', $config->redirect_url);
+		if ($config->enable_confirm == 'Y')
 		{
 			$msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $args->email_address);
 			$this->setMessage($msg);
@@ -398,19 +398,19 @@ 
 		else $this->setMessage('success_registed');
 		// Call a trigger (after)
 		$trigger_output = ModuleHandler::triggerCall('member.procMemberInsert', 'after', $config);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if (!$trigger_output->toBool()) return $trigger_output;
 
-		if($config->redirect_url)
+		if ($config->redirect_url)
 		{
 			$returnUrl = $config->redirect_url;
 		}
 		else
 		{
-			if(Context::get('success_return_url'))
+			if (Context::get('success_return_url'))
 			{
 				$returnUrl = Context::get('success_return_url');
 			}
-			else if($_COOKIE['XE_REDIRECT_URL'])
+			else if ($_COOKIE['XE_REDIRECT_URL'])
 			{
 				$returnUrl = $_COOKIE['XE_REDIRECT_URL'];
 				setcookie("XE_REDIRECT_URL", '', 1);
@@ -424,26 +424,26 @@ 
 
 	function procMemberModifyInfoBefore()
 	{
-		if($_SESSION['rechecked_password_step'] != 'INPUT_PASSWORD')
+		if ($_SESSION['rechecked_password_step'] != 'INPUT_PASSWORD')
 		{
 			return $this->stop('msg_invalid_request');
 		}
 
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return $this->stop('msg_not_logged');
 		}
 
 		$password = Context::get('password');
 
-		if(!$password)
+		if (!$password)
 		{
 			return $this->stop('msg_invalid_request');
 		}
 
 		$oMemberModel = getModel('member');
 
-		if(!$this->memberInfo->password)
+		if (!$this->memberInfo->password)
 		{
 			// Get information of logged-in user
 			$logged_info = Context::get('logged_info');
@@ -454,14 +454,14 @@ 
 			$this->memberInfo->password = $memberInfo->password;
 		}
 		// Verify the current password
-		if(!$oMemberModel->isValidPassword($this->memberInfo->password, $password))
+		if (!$oMemberModel->isValidPassword($this->memberInfo->password, $password))
 		{
 			return new Object(-1, 'invalid_password');
 		}
 
 		$_SESSION['rechecked_password_step'] = 'VALIDATE_PASSWORD';
 
-		if(Context::get('success_return_url'))
+		if (Context::get('success_return_url'))
 		{
 			$redirectUrl = Context::get('success_return_url');
 		}
@@ -479,26 +479,26 @@ 
 	 */
 	function procMemberModifyInfo()
 	{
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return $this->stop('msg_not_logged');
 		}
 
-		if($_SESSION['rechecked_password_step'] != 'INPUT_DATA')
+		if ($_SESSION['rechecked_password_step'] != 'INPUT_DATA')
 		{
 			return $this->stop('msg_invalid_request');
 		}
 		unset($_SESSION['rechecked_password_step']);
 
 		// Extract the necessary information in advance
-		$oMemberModel = &getModel ('member');
-		$config = $oMemberModel->getMemberConfig ();
-		$getVars = array('find_account_answer','allow_mailing','allow_message');
-		if($config->signupForm)
+		$oMemberModel = &getModel('member');
+		$config = $oMemberModel->getMemberConfig();
+		$getVars = array('find_account_answer', 'allow_mailing', 'allow_message');
+		if ($config->signupForm)
 		{
-			foreach($config->signupForm as $formInfo)
+			foreach ($config->signupForm as $formInfo)
 			{
-				if($formInfo->isDefaultForm && ($formInfo->isUse || $formInfo->required || $formInfo->mustRequired))
+				if ($formInfo->isDefaultForm && ($formInfo->isUse || $formInfo->required || $formInfo->mustRequired))
 				{
 					$getVars[] = $formInfo->name;
 				}
@@ -506,16 +506,16 @@ 
 		}
 
 		$args = new stdClass;
-		foreach($getVars as $val)
+		foreach ($getVars as $val)
 		{
 			$args->{$val} = Context::get($val);
-			if($val == 'birthday') $args->birthday_ui = Context::get('birthday_ui');
+			if ($val == 'birthday') $args->birthday_ui = Context::get('birthday_ui');
 		}
 		// Login Information
 		$logged_info = Context::get('logged_info');
 		$args->member_srl = $logged_info->member_srl;
 		$args->birthday = intval(strtr($args->birthday, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
-		if(!$args->birthday && $args->birthday_ui) $args->birthday = intval(strtr($args->birthday_ui, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
+		if (!$args->birthday && $args->birthday_ui) $args->birthday = intval(strtr($args->birthday_ui, array('-'=>'', '/'=>'', '.'=>'', ' '=>'')));
 		// Remove some unnecessary variables from all the vars
 		$all_args = Context::getRequestVars();
 		unset($all_args->module);
@@ -539,9 +539,9 @@ 
 
 		// remove whitespace
 		$checkInfos = array('user_id', 'user_name', 'nick_name', 'email_address');
-		foreach($checkInfos as $val)
+		foreach ($checkInfos as $val)
 		{
-			if(isset($args->{$val}))
+			if (isset($args->{$val}))
 			{
 				$args->{$val} = preg_replace('/[\pZ\pC]+/u', '', $args->{$val});
 			}
@@ -549,22 +549,22 @@ 
 
 		// Execute insert or update depending on the value of member_srl
 		$output = $this->updateMember($args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$profile_image = $_FILES['profile_image'];
-		if(is_uploaded_file($profile_image['tmp_name']))
+		if (is_uploaded_file($profile_image['tmp_name']))
 		{
 			$this->insertProfileImage($args->member_srl, $profile_image['tmp_name']);
 		}
 
 		$image_mark = $_FILES['image_mark'];
-		if(is_uploaded_file($image_mark['tmp_name']))
+		if (is_uploaded_file($image_mark['tmp_name']))
 		{
 			$this->insertImageMark($args->member_srl, $image_mark['tmp_name']);
 		}
 
 		$image_name = $_FILES['image_name'];
-		if(is_uploaded_file($image_name['tmp_name']))
+		if (is_uploaded_file($image_name['tmp_name']))
 		{
 			$this->insertImageName($args->member_srl, $image_name['tmp_name']);
 		}
@@ -579,7 +579,7 @@ 
 
 		// Call a trigger after successfully log-in (after)
 		$trigger_output = ModuleHandler::triggerCall('member.procMemberModifyInfo', 'after', $this->memberInfo);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if (!$trigger_output->toBool()) return $trigger_output;
 
 		$this->setSessionInfo();
 		// Return result
@@ -600,7 +600,7 @@ 
 	 */
 	function procMemberModifyPassword()
 	{
-		if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
+		if (!Context::get('is_logged')) return $this->stop('msg_not_logged');
 		// Extract the necessary information in advance
 		$current_password = trim(Context::get('current_password'));
 		$password = trim(Context::get('password1'));
@@ -614,17 +614,17 @@ 
 
 		$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
 		// Verify the cuttent password
-		if(!$oMemberModel->isValidPassword($member_info->password, $current_password, $member_srl)) return new Object(-1, 'invalid_password');
+		if (!$oMemberModel->isValidPassword($member_info->password, $current_password, $member_srl)) return new Object(-1, 'invalid_password');
 
 		// Check if a new password is as same as the previous password
-		if($current_password == $password) return new Object(-1, 'invalid_new_password');
+		if ($current_password == $password) return new Object(-1, 'invalid_new_password');
 
 		// Execute insert or update depending on the value of member_srl
 		$args = new stdClass;
 		$args->member_srl = $member_srl;
 		$args->password = $password;
 		$output = $this->updateMemberPassword($args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->add('member_srl', $args->member_srl);
 		$this->setMessage('success_updated');
@@ -640,7 +640,7 @@ 
 	 */
 	function procMemberLeave()
 	{
-		if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
+		if (!Context::get('is_logged')) return $this->stop('msg_not_logged');
 		// Extract the necessary information in advance
 		$password = trim(Context::get('password'));
 		// Get information of logged-in user
@@ -649,17 +649,17 @@ 
 		// Create a member model object
 		$oMemberModel = getModel('member');
 		// Get information of member_srl
-		if(!$this->memberInfo->password)
+		if (!$this->memberInfo->password)
 		{
 			$columnList = array('member_srl', 'password');
 			$memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
 			$this->memberInfo->password = $memberInfo->password;
 		}
 		// Verify the cuttent password
-		if(!$oMemberModel->isValidPassword($this->memberInfo->password, $password)) return new Object(-1, 'invalid_password');
+		if (!$oMemberModel->isValidPassword($this->memberInfo->password, $password)) return new Object(-1, 'invalid_password');
 
 		$output = $this->deleteMember($member_srl);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Destroy all session information
 		$this->destroySessionInfo();
 		// Return success message
@@ -678,17 +678,17 @@ 
 	{
 		// Check if the file is successfully uploaded
 		$file = $_FILES['profile_image'];
-		if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_profile_image');
+		if (!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_profile_image');
 		// Ignore if member_srl is invalid or doesn't exist.
 		$member_srl = Context::get('member_srl');
-		if(!$member_srl) return $this->stop('msg_not_uploaded_profile_image');
+		if (!$member_srl) return $this->stop('msg_not_uploaded_profile_image');
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_profile_image');
+		if ($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_profile_image');
 		// Return if member module is set not to use an image name or the user is not an administrator ;
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
-		if($logged_info->is_admin != 'Y' && $config->profile_image != 'Y') return $this->stop('msg_not_uploaded_profile_image');
+		if ($logged_info->is_admin != 'Y' && $config->profile_image != 'Y') return $this->stop('msg_not_uploaded_profile_image');
 
 		$this->insertProfileImage($member_srl, $file['tmp_name']);
 		// Page refresh
@@ -710,25 +710,25 @@ 
 	{
 
 		// Check uploaded file
-		if(!checkUploadedFile($target_file)) return;
+		if (!checkUploadedFile($target_file)) return;
 
 		$oMemberModel = getModel('member');
 		$config = $oMemberModel->getMemberConfig();
 
 		// Get an image size
 		$max_width = $config->profile_image_max_width;
-		if(!$max_width) $max_width = "90";
+		if (!$max_width) $max_width = "90";
 		$max_height = $config->profile_image_max_height;
-		if(!$max_height) $max_height = "90";
+		if (!$max_height) $max_height = "90";
 		// Get a target path to save
 		$target_path = sprintf('files/member_extra_info/profile_image/%s', getNumberingPath($member_srl));
 		FileHandler::makeDir($target_path);
 
 		// Get file information
 		list($width, $height, $type, $attrs) = @getimagesize($target_file);
-		if(IMAGETYPE_PNG == $type) $ext = 'png';
-		elseif(IMAGETYPE_JPEG == $type) $ext = 'jpg';
-		elseif(IMAGETYPE_GIF == $type) $ext = 'gif';
+		if (IMAGETYPE_PNG == $type) $ext = 'png';
+		elseif (IMAGETYPE_JPEG == $type) $ext = 'jpg';
+		elseif (IMAGETYPE_GIF == $type) $ext = 'gif';
 		else
 		{
 			return;
@@ -738,7 +738,7 @@ 
 
 		$target_filename = sprintf('%s%d.%s', $target_path, $member_srl, $ext);
 		// Convert if the image size is larger than a given size or if the format is not a gif
-		if(($width > $max_width || $height > $max_height ) && $type != 1)
+		if (($width > $max_width || $height > $max_height) && $type != 1)
 		{
 			FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, $ext);
 		}
@@ -757,17 +757,17 @@ 
 	{
 		// Check if the file is successfully uploaded
 		$file = $_FILES['image_name'];
-		if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_image_name');
+		if (!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_image_name');
 		// Ignore if member_srl is invalid or doesn't exist.
 		$member_srl = Context::get('member_srl');
-		if(!$member_srl) return $this->stop('msg_not_uploaded_image_name');
+		if (!$member_srl) return $this->stop('msg_not_uploaded_image_name');
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_name');
+		if ($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_name');
 		// Return if member module is set not to use an image name or the user is not an administrator ;
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
-		if($logged_info->is_admin != 'Y' && $config->image_name != 'Y') return $this->stop('msg_not_uploaded_image_name');
+		if ($logged_info->is_admin != 'Y' && $config->image_name != 'Y') return $this->stop('msg_not_uploaded_image_name');
 
 		$this->insertImageName($member_srl, $file['tmp_name']);
 		// Page refresh
@@ -788,15 +788,15 @@ 
 	function insertImageName($member_srl, $target_file)
 	{
 		// Check uploaded file
-		if(!checkUploadedFile($target_file)) return;
+		if (!checkUploadedFile($target_file)) return;
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
 		// Get an image size
 		$max_width = $config->image_name_max_width;
-		if(!$max_width) $max_width = "90";
+		if (!$max_width) $max_width = "90";
 		$max_height = $config->image_name_max_height;
-		if(!$max_height) $max_height = "20";
+		if (!$max_height) $max_height = "20";
 		// Get a target path to save
 		$target_path = sprintf('files/member_extra_info/image_name/%s/', getNumberingPath($member_srl));
 		FileHandler::makeDir($target_path);
@@ -805,7 +805,7 @@ 
 		// Get file information
 		list($width, $height, $type, $attrs) = @getimagesize($target_file);
 		// Convert if the image size is larger than a given size or if the format is not a gif
-		if($width > $max_width || $height > $max_height || $type!=1) FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, 'gif');
+		if ($width > $max_width || $height > $max_height || $type != 1) FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, 'gif');
 		else @copy($target_file, $target_filename);
 	}
 
@@ -817,20 +817,20 @@ 
 	function procMemberDeleteProfileImage($_memberSrl = 0)
 	{
 		$member_srl = ($_memberSrl) ? $_memberSrl : Context::get('member_srl');
-		if(!$member_srl)
+		if (!$member_srl)
 		{
-			return new Object(0,'success');
+			return new Object(0, 'success');
 		}
 
 		$logged_info = Context::get('logged_info');
 
-		if($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
+		if ($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
 		{
 			$oMemberModel = getModel('member');
 			$profile_image = $oMemberModel->getProfileImage($member_srl);
 			FileHandler::removeFile($profile_image->file);
 		}
-		return new Object(0,'success');
+		return new Object(0, 'success');
 	}
 
 	/**
@@ -841,20 +841,20 @@ 
 	function procMemberDeleteImageName($_memberSrl = 0)
 	{
 		$member_srl = ($_memberSrl) ? $_memberSrl : Context::get('member_srl');
-		if(!$member_srl)
+		if (!$member_srl)
 		{
-			return new Object(0,'success');
+			return new Object(0, 'success');
 		}
 
 		$logged_info = Context::get('logged_info');
 
-		if($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
+		if ($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
 		{
 			$oMemberModel = getModel('member');
 			$image_name = $oMemberModel->getImageName($member_srl);
 			FileHandler::removeFile($image_name->file);
 		}
-		return new Object(0,'success');
+		return new Object(0, 'success');
 	}
 
 	/**
@@ -866,17 +866,17 @@ 
 	{
 		// Check if the file is successfully uploaded
 		$file = $_FILES['image_mark'];
-		if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_image_mark');
+		if (!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_image_mark');
 		// Ignore if member_srl is invalid or doesn't exist.
 		$member_srl = Context::get('member_srl');
-		if(!$member_srl) return $this->stop('msg_not_uploaded_image_mark');
+		if (!$member_srl) return $this->stop('msg_not_uploaded_image_mark');
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_mark');
+		if ($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_mark');
 		// Membership in the images mark the module using the ban was set by an administrator or return;
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
-		if($logged_info->is_admin != 'Y' && $config->image_mark != 'Y') return $this->stop('msg_not_uploaded_image_mark');
+		if ($logged_info->is_admin != 'Y' && $config->image_mark != 'Y') return $this->stop('msg_not_uploaded_image_mark');
 
 		$this->insertImageMark($member_srl, $file['tmp_name']);
 		// Page refresh
@@ -897,15 +897,15 @@ 
 	function insertImageMark($member_srl, $target_file)
 	{
 		// Check uploaded file
-		if(!checkUploadedFile($target_file)) return;
+		if (!checkUploadedFile($target_file)) return;
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
 		// Get an image size
 		$max_width = $config->image_mark_max_width;
-		if(!$max_width) $max_width = "20";
+		if (!$max_width) $max_width = "20";
 		$max_height = $config->image_mark_max_height;
-		if(!$max_height) $max_height = "20";
+		if (!$max_height) $max_height = "20";
 
 		$target_path = sprintf('files/member_extra_info/image_mark/%s/', getNumberingPath($member_srl));
 		FileHandler::makeDir($target_path);
@@ -914,7 +914,7 @@ 
 		// Get file information
 		list($width, $height, $type, $attrs) = @getimagesize($target_file);
 
-		if($width > $max_width || $height > $max_height || $type!=1) FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, 'gif');
+		if ($width > $max_width || $height > $max_height || $type != 1) FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, 'gif');
 		else @copy($target_file, $target_filename);
 	}
 
@@ -926,20 +926,20 @@ 
 	function procMemberDeleteImageMark($_memberSrl = 0)
 	{
 		$member_srl = ($_memberSrl) ? $_memberSrl : Context::get('member_srl');
-		if(!$member_srl)
+		if (!$member_srl)
 		{
-			return new Object(0,'success');
+			return new Object(0, 'success');
 		}
 
 		$logged_info = Context::get('logged_info');
 
-		if($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
+		if ($logged_info && ($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl))
 		{
 			$oMemberModel = getModel('member');
 			$image_mark = $oMemberModel->getImageMark($member_srl);
 			FileHandler::removeFile($image_mark->file);
 		}
-		return new Object(0,'success');
+		return new Object(0, 'success');
 	}
 
 	/**
@@ -950,26 +950,26 @@ 
 	function procMemberFindAccount()
 	{
 		$email_address = Context::get('email_address');
-		if(!$email_address) return new Object(-1, 'msg_invalid_request');
+		if (!$email_address) return new Object(-1, 'msg_invalid_request');
 
 		$oMemberModel = getModel('member');
 		$oModuleModel = getModel('module');
 
 		// Check if a member having the same email address exists
 		$member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
-		if(!$member_srl) return new Object(-1, 'msg_email_not_exists');
+		if (!$member_srl) return new Object(-1, 'msg_email_not_exists');
 
 		// Get information of the member
 		$columnList = array('denied', 'member_srl', 'user_id', 'user_name', 'email_address', 'nick_name');
 		$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
 
 		// Check if possible to find member's ID and password
-		if($member_info->denied == 'Y')
+		if ($member_info->denied == 'Y')
 		{
 			$chk_args = new stdClass;
 			$chk_args->member_srl = $member_info->member_srl;
 			$output = executeQuery('member.chkAuthMail', $chk_args);
-			if($output->toBool() && $output->data->count != '0') return new Object(-1, 'msg_user_not_confirmed');
+			if ($output->toBool() && $output->data->count != '0') return new Object(-1, 'msg_user_not_confirmed');
 		}
 
 		// Insert data into the authentication DB
@@ -982,19 +982,19 @@ 
 		$args->is_register = 'N';
 
 		$output = executeQuery('member.insertAuthMail', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Get content of the email to send a member
 		Context::set('auth_args', $args);
 
 		$member_config = $oModuleModel->getModuleConfig('member');
 		$memberInfo = array();
 		global $lang;
-		if(is_array($member_config->signupForm))
+		if (is_array($member_config->signupForm))
 		{
-			$exceptForm=array('password', 'find_account_question');
-			foreach($member_config->signupForm as $form)
+			$exceptForm = array('password', 'find_account_question');
+			foreach ($member_config->signupForm as $form)
 			{
-				if(!in_array($form->name, $exceptForm) && $form->isDefaultForm && ($form->required || $form->mustRequired))
+				if (!in_array($form->name, $exceptForm) && $form->isDefaultForm && ($form->required || $form->mustRequired))
 				{
 					$memberInfo[$lang->{$form->name}] = $member_info->{$form->name};
 				}
@@ -1009,15 +1009,15 @@ 
 		}
 		Context::set('memberInfo', $memberInfo);
 
-		if(!$member_config->skin) $member_config->skin = "default";
-		if(!$member_config->colorset) $member_config->colorset = "white";
+		if (!$member_config->skin) $member_config->skin = "default";
+		if (!$member_config->colorset) $member_config->colorset = "white";
 
 		Context::set('member_config', $member_config);
 
 		$tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
-		if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+		if (!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
 
-		$find_url = getFullUrl ('', 'module', 'member', 'act', 'procMemberAuthAccount', 'member_srl', $member_info->member_srl, 'auth_key', $args->auth_key);
+		$find_url = getFullUrl('', 'module', 'member', 'act', 'procMemberAuthAccount', 'member_srl', $member_info->member_srl, 'auth_key', $args->auth_key);
 		Context::set('find_url', $find_url);
 
 		$oTemplate = &TemplateHandler::getInstance();
@@ -1027,19 +1027,19 @@ 
 		$member_config = $oModuleModel->getModuleConfig('member');
 		// Send a mail
 		$oMail = new Mail();
-		$oMail->setTitle( Context::getLang('msg_find_account_title') );
+		$oMail->setTitle(Context::getLang('msg_find_account_title'));
 		$oMail->setContent($content);
-		$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
-		$oMail->setReceiptor( $member_info->user_name, $member_info->email_address );
+		$oMail->setSender($member_config->webmaster_name ? $member_config->webmaster_name : 'webmaster', $member_config->webmaster_email);
+		$oMail->setReceiptor($member_info->user_name, $member_info->email_address);
 		$oMail->send();
 		// Return message
 		$msg = sprintf(Context::getLang('msg_auth_mail_sent'), $member_info->email_address);
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberFindAccount');
 			$this->setRedirectUrl($returnUrl);
 		}
-		return new Object(0,$msg);
+		return new Object(0, $msg);
 	}
 
 	/**
@@ -1057,28 +1057,28 @@ 
 		$find_account_question = trim(Context::get('find_account_question'));
 		$find_account_answer = trim(Context::get('find_account_answer'));
 
-		if(($config->identifier == 'user_id' && !$user_id) || !$email_address || !$find_account_question || !$find_account_answer) return new Object(-1, 'msg_invalid_request');
+		if (($config->identifier == 'user_id' && !$user_id) || !$email_address || !$find_account_question || !$find_account_answer) return new Object(-1, 'msg_invalid_request');
 
 		$oModuleModel = getModel('module');
 		// Check if a member having the same email address exists
 		$member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
-		if(!$member_srl) return new Object(-1, 'msg_email_not_exists');
+		if (!$member_srl) return new Object(-1, 'msg_email_not_exists');
 		// Get information of the member
 		$columnList = array('member_srl', 'find_account_question', 'find_account_answer');
 		$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
 
 		// Display a message if no answer is entered
-		if(!$member_info->find_account_question || !$member_info->find_account_answer) return new Object(-1, 'msg_question_not_exists');
+		if (!$member_info->find_account_question || !$member_info->find_account_answer) return new Object(-1, 'msg_question_not_exists');
 
-		if(trim($member_info->find_account_question) != $find_account_question || trim($member_info->find_account_answer) != $find_account_answer) return new Object(-1, 'msg_answer_not_matches');
+		if (trim($member_info->find_account_question) != $find_account_question || trim($member_info->find_account_answer) != $find_account_answer) return new Object(-1, 'msg_answer_not_matches');
 
-		if($config->identifier == 'email_address')
+		if ($config->identifier == 'email_address')
 		{
 			$user_id = $email_address;
 		}
 
 		// Update to a temporary password and set change_password_date to 1
-		$oPassword =  new Password();
+		$oPassword = new Password();
 		$temp_password = $oPassword->createTemporaryPassword(8);
 
 		$args = new stdClass();
@@ -1086,11 +1086,11 @@ 
 		$args->password = $temp_password;
 		$args->change_password_date = '1';
 		$output = $this->updateMemberPassword($args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		$_SESSION['xe_temp_password_' . $user_id] = $temp_password;
+		$_SESSION['xe_temp_password_'.$user_id] = $temp_password;
 
-		$this->add('user_id',$user_id);
+		$this->add('user_id', $user_id);
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
 		$this->setRedirectUrl($returnUrl.'&user_id='.$user_id);
@@ -1110,7 +1110,7 @@ 
 		$member_srl = Context::get('member_srl');
 		$auth_key = Context::get('auth_key');
 
-		if(!$member_srl || !$auth_key)
+		if (!$member_srl || !$auth_key)
 		{
 			return $this->stop('msg_invalid_request');
 		}
@@ -1121,9 +1121,9 @@ 
 		$args->auth_key = $auth_key;
 		$output = executeQuery('member.getAuthMail', $args);
 
-		if(!$output->toBool() || $output->data->auth_key != $auth_key)
+		if (!$output->toBool() || $output->data->auth_key != $auth_key)
 		{
-			if(strlen($output->data->auth_key) !== strlen($auth_key))
+			if (strlen($output->data->auth_key) !== strlen($auth_key))
 			{
 				executeQuery('member.deleteAuthMail', $args);
 			}
@@ -1131,7 +1131,7 @@ 
 			return $this->stop('msg_invalid_auth_key');
 		}
 
-		if(ztime($output->data->regdate) < $_SERVER['REQUEST_TIME'] + zgap() - 86400)
+		if (ztime($output->data->regdate) < $_SERVER['REQUEST_TIME'] + zgap() - 86400)
 		{
 			executeQuery('member.deleteAuthMail', $args);
 			return $this->stop('msg_invalid_auth_key');
@@ -1140,7 +1140,7 @@ 
 		$args->password = $output->data->new_password;
 
 		// If credentials are correct, change the password to a new one
-		if($output->data->is_register == 'Y')
+		if ($output->data->is_register == 'Y')
 		{
 			$args->denied = 'N';
 		}
@@ -1153,13 +1153,13 @@ 
 		$is_register = $output->data->is_register;
 
 		$output = executeQuery('member.updateMemberPassword', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $this->stop($output->getMessage());
 		}
 
 		// Remove all values having the member_srl from authentication table
-		executeQuery('member.deleteAuthMail',$args);
+		executeQuery('member.deleteAuthMail', $args);
 
 		$this->_clearMemberCache($args->member_srl);
 
@@ -1178,33 +1178,33 @@ 
 	{
 		// Get an email_address
 		$email_address = Context::get('email_address');
-		if(!$email_address) return new Object(-1, 'msg_invalid_request');
+		if (!$email_address) return new Object(-1, 'msg_invalid_request');
 		// Log test by using email_address
 		$oMemberModel = getModel('member');
 
 		$args = new stdClass;
 		$args->email_address = $email_address;
 		$memberSrl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
-		if(!$memberSrl) return new Object(-1, 'msg_not_exists_member');
+		if (!$memberSrl) return new Object(-1, 'msg_not_exists_member');
 
 		$columnList = array('member_srl', 'user_id', 'user_name', 'nick_name', 'email_address');
 		$member_info = $oMemberModel->getMemberInfoByMemberSrl($memberSrl, 0, $columnList);
 
 		$oModuleModel = getModel('module');
 		$member_config = $oModuleModel->getModuleConfig('member');
-		if(!$member_config->skin) $member_config->skin = "default";
-		if(!$member_config->colorset) $member_config->colorset = "white";
+		if (!$member_config->skin) $member_config->skin = "default";
+		if (!$member_config->colorset) $member_config->colorset = "white";
 
 		// Check if a authentication mail has been sent previously
 		$chk_args = new stdClass;
 		$chk_args->member_srl = $member_info->member_srl;
 		$output = executeQuery('member.chkAuthMail', $chk_args);
-		if($output->toBool() && $output->data->count == '0') return new Object(-1, 'msg_invalid_request');
+		if ($output->toBool() && $output->data->count == '0') return new Object(-1, 'msg_invalid_request');
 
 		$auth_args = new stdClass;
 		$auth_args->member_srl = $member_info->member_srl;
 		$output = executeQueryArray('member.getAuthMailInfo', $auth_args);
-		if(!$output->data || !$output->data[0]->auth_key)  return new Object(-1, 'msg_invalid_request');
+		if (!$output->data || !$output->data[0]->auth_key)  return new Object(-1, 'msg_invalid_request');
 		$auth_info = $output->data[0];
 
 		// Update the regdate of authmail entry
@@ -1215,12 +1215,12 @@ 
 
 		$memberInfo = array();
 		global $lang;
-		if(is_array($member_config->signupForm))
+		if (is_array($member_config->signupForm))
 		{
-			$exceptForm=array('password', 'find_account_question');
-			foreach($member_config->signupForm as $form)
+			$exceptForm = array('password', 'find_account_question');
+			foreach ($member_config->signupForm as $form)
 			{
-				if(!in_array($form->name, $exceptForm) && $form->isDefaultForm && ($form->required || $form->mustRequired))
+				if (!in_array($form->name, $exceptForm) && $form->isDefaultForm && ($form->required || $form->mustRequired))
 				{
 					$memberInfo[$lang->{$form->name}] = $member_info->{$form->name};
 				}
@@ -1239,19 +1239,19 @@ 
 		Context::set('member_config', $member_config);
 
 		$tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
-		if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+		if (!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
 
-		$auth_url = getFullUrl('','module','member','act','procMemberAuthAccount','member_srl',$member_info->member_srl, 'auth_key',$auth_info->auth_key);
+		$auth_url = getFullUrl('', 'module', 'member', 'act', 'procMemberAuthAccount', 'member_srl', $member_info->member_srl, 'auth_key', $auth_info->auth_key);
 		Context::set('auth_url', $auth_url);
 
 		$oTemplate = &TemplateHandler::getInstance();
 		$content = $oTemplate->compile($tpl_path, 'confirm_member_account_mail');
 		// Send a mail
 		$oMail = new Mail();
-		$oMail->setTitle( Context::getLang('msg_confirm_account_title') );
+		$oMail->setTitle(Context::getLang('msg_confirm_account_title'));
 		$oMail->setContent($content);
-		$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
-		$oMail->setReceiptor( $args->user_name, $args->email_address );
+		$oMail->setSender($member_config->webmaster_name ? $member_config->webmaster_name : 'webmaster', $member_config->webmaster_email);
+		$oMail->setReceiptor($args->user_name, $args->email_address);
 		$oMail->send();
 
 		$msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $args->email_address);
@@ -1266,23 +1266,23 @@ 
 		$memberInfo = $_SESSION['auth_member_info'];
 		unset($_SESSION['auth_member_info']);
 
-		if(!$memberInfo)
+		if (!$memberInfo)
 		{
 			return $this->stop('msg_invalid_request');
 		}
 
 		$newEmail = Context::get('email_address');
 
-		if(!$newEmail)
+		if (!$newEmail)
 		{
 			return $this->stop('msg_invalid_request');
 		}
 
 		$oMemberModel = getModel('member');
 		$member_srl = $oMemberModel->getMemberSrlByEmailAddress($newEmail);
-		if($member_srl)
+		if ($member_srl)
 		{
-			return new Object(-1,'msg_exists_email_address');
+			return new Object(-1, 'msg_exists_email_address');
 		}
 
 		// remove all key by member_srl
@@ -1290,7 +1290,7 @@ 
 		$args->member_srl = $memberInfo->member_srl;
 		$output = executeQuery('member.deleteAuthMail', $args);
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -1300,7 +1300,7 @@ 
 		list($args->email_id, $args->email_host) = explode('@', $newEmail);
 
 		$output = executeQuery('member.updateMemberEmailAddress', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $this->stop($output->getMessage());
 		}
@@ -1317,7 +1317,7 @@ 
 		$auth_args->is_register = 'Y';
 
 		$output = executeQuery('member.insertAuthMail', $auth_args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$memberInfo->email_address = $newEmail;
 
@@ -1341,12 +1341,12 @@ 
 		$memberInfo = array();
 
 		global $lang;
-		if(is_array($member_config->signupForm))
+		if (is_array($member_config->signupForm))
 		{
-			$exceptForm=array('password', 'find_account_question');
-			foreach($member_config->signupForm as $form)
+			$exceptForm = array('password', 'find_account_question');
+			foreach ($member_config->signupForm as $form)
 			{
-				if(!in_array($form->name, $exceptForm) && $form->isDefaultForm && ($form->required || $form->mustRequired))
+				if (!in_array($form->name, $exceptForm) && $form->isDefaultForm && ($form->required || $form->mustRequired))
 				{
 					$memberInfo[$lang->{$form->name}] = $member_info->{$form->name};
 				}
@@ -1361,25 +1361,25 @@ 
 		}
 		Context::set('memberInfo', $memberInfo);
 
-		if(!$member_config->skin) $member_config->skin = "default";
-		if(!$member_config->colorset) $member_config->colorset = "white";
+		if (!$member_config->skin) $member_config->skin = "default";
+		if (!$member_config->colorset) $member_config->colorset = "white";
 
 		Context::set('member_config', $member_config);
 
 		$tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
-		if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+		if (!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
 
-		$auth_url = getFullUrl('','module','member','act','procMemberAuthAccount','member_srl',$member_info->member_srl, 'auth_key',$auth_args->auth_key);
+		$auth_url = getFullUrl('', 'module', 'member', 'act', 'procMemberAuthAccount', 'member_srl', $member_info->member_srl, 'auth_key', $auth_args->auth_key);
 		Context::set('auth_url', $auth_url);
 
 		$oTemplate = &TemplateHandler::getInstance();
 		$content = $oTemplate->compile($tpl_path, 'confirm_member_account_mail');
 		// Send a mail
 		$oMail = new Mail();
-		$oMail->setTitle( Context::getLang('msg_confirm_account_title') );
+		$oMail->setTitle(Context::getLang('msg_confirm_account_title'));
 		$oMail->setContent($content);
-		$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
-		$oMail->setReceiptor( $member_info->user_name, $member_info->email_address );
+		$oMail->setSender($member_config->webmaster_name ? $member_config->webmaster_name : 'webmaster', $member_config->webmaster_email);
+		$oMail->setReceiptor($member_info->user_name, $member_info->email_address);
 		$oMail->send();
 	}
 
@@ -1392,7 +1392,7 @@ 
 	{
 		$site_module_info = Context::get('site_module_info');
 		$logged_info = Context::get('logged_info');
-		if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) return new Object(-1,'msg_invalid_request');
+		if (!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list)) return new Object(-1, 'msg_invalid_request');
 
 		$oMemberModel = getModel('member');
 		$columnList = array('site_srl', 'group_srl', 'title');
@@ -1411,13 +1411,13 @@ 
 	{
 		$site_module_info = Context::get('site_module_info');
 		$logged_info = Context::get('logged_info');
-		if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) return new Object(-1,'msg_invalid_request');
+		if (!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list)) return new Object(-1, 'msg_invalid_request');
 
 		$args = new stdClass;
-		$args->site_srl= $site_module_info->site_srl;
+		$args->site_srl = $site_module_info->site_srl;
 		$args->member_srl = $logged_info->member_srl;
 		$output = executeQuery('member.deleteMembersGroup', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		$this->setMessage('success_deleted');
 		$this->_clearMemberCache($args->member_srl, $site_module_info->site_srl);
 	}
@@ -1431,25 +1431,25 @@ 
 	 */
 	function setMemberConfig($args)
 	{
-		if(!$args->skin) $args->skin = "default";
-		if(!$args->colorset) $args->colorset = "white";
-		if(!$args->editor_skin) $args->editor_skin= "ckeditor";
-		if(!$args->editor_colorset) $args->editor_colorset = "moono";
-		if($args->enable_join!='Y') $args->enable_join = 'N';
-		$args->enable_openid= 'N';
-		if($args->profile_image !='Y') $args->profile_image = 'N';
-		if($args->image_name!='Y') $args->image_name = 'N';
-		if($args->image_mark!='Y') $args->image_mark = 'N';
-		if($args->group_image_mark!='Y') $args->group_image_mark = 'N';
-		if(!trim(strip_tags($args->agreement))) $args->agreement = null;
-		$args->limit_day = (int)$args->limit_day;
+		if (!$args->skin) $args->skin = "default";
+		if (!$args->colorset) $args->colorset = "white";
+		if (!$args->editor_skin) $args->editor_skin = "ckeditor";
+		if (!$args->editor_colorset) $args->editor_colorset = "moono";
+		if ($args->enable_join != 'Y') $args->enable_join = 'N';
+		$args->enable_openid = 'N';
+		if ($args->profile_image != 'Y') $args->profile_image = 'N';
+		if ($args->image_name != 'Y') $args->image_name = 'N';
+		if ($args->image_mark != 'Y') $args->image_mark = 'N';
+		if ($args->group_image_mark != 'Y') $args->group_image_mark = 'N';
+		if (!trim(strip_tags($args->agreement))) $args->agreement = null;
+		$args->limit_day = (int) $args->limit_day;
 
 		$agreement = trim($args->agreement);
 		unset($args->agreement);
 
 		$oModuleController = getController('module');
-		$output = $oModuleController->insertModuleConfig('member',$args);
-		if(!$output->toBool()) return $output;
+		$output = $oModuleController->insertModuleConfig('member', $args);
+		if (!$output->toBool()) return $output;
 
 		$agreement_file = _XE_PATH_.'files/member_extra_info/agreement.txt';
 		FileHandler::writeFile($agreement_file, $agreement);
@@ -1470,11 +1470,11 @@ 
 		$signature = trim(removeHackTag($signature));
 		$signature = preg_replace('/<(\/?)(embed|object|param)/is', '&lt;$1$2', $signature);
 
-		$check_signature = trim(str_replace(array('&nbsp;',"\n","\r"),'',strip_tags($signature,'<img><object>')));
+		$check_signature = trim(str_replace(array('&nbsp;', "\n", "\r"), '', strip_tags($signature, '<img><object>')));
 		$path = sprintf('files/member_extra_info/signature/%s/', getNumberingPath($member_srl));
 		$filename = sprintf('%s%d.signature.php', $path, $member_srl);
 
-		if(!$check_signature) return FileHandler::removeFile($filename);
+		if (!$check_signature) return FileHandler::removeFile($filename);
 
 		$buff = sprintf('<?php if(!defined("__XE__")) exit();?>%s', $signature);
 		FileHandler::makeDir($path);
@@ -1503,15 +1503,15 @@ 
 	 *
 	 * @return Object
 	 */
-	function addMemberToGroup($member_srl, $group_srl, $site_srl=0)
+	function addMemberToGroup($member_srl, $group_srl, $site_srl = 0)
 	{
 		$args = new stdClass();
 		$args->member_srl = $member_srl;
 		$args->group_srl = $group_srl;
-		if($site_srl) $args->site_srl = $site_srl;
+		if ($site_srl) $args->site_srl = $site_srl;
 
 		// Add
-		$output = executeQuery('member.addMemberToGroup',$args);
+		$output = executeQuery('member.addMemberToGroup', $args);
 		$output2 = ModuleHandler::triggerCall('member.addMemberToGroup', 'after', $args);
 
 		$this->_clearMemberCache($member_srl, $site_srl);
@@ -1531,18 +1531,18 @@ 
 	{
 		$obj = new stdClass;
 		$obj->site_srl = $args->site_srl;
-		$obj->member_srl = implode(',',$args->member_srl);
+		$obj->member_srl = implode(',', $args->member_srl);
 
 		$output = executeQueryArray('member.getMembersGroup', $obj);
-		if($output->data) foreach($output->data as $key => $val) $date[$val->member_srl] = $val->regdate;
+		if ($output->data) foreach ($output->data as $key => $val) $date[$val->member_srl] = $val->regdate;
 
 		$output = executeQuery('member.deleteMembersGroup', $obj);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$inserted_members = array();
-		foreach($args->member_srl as $key => $val)
+		foreach ($args->member_srl as $key => $val)
 		{
-			if($inserted_members[$val]) continue;
+			if ($inserted_members[$val]) continue;
 			$inserted_members[$val] = true;
 
 			unset($obj);
@@ -1552,7 +1552,7 @@ 
 			$obj->site_srl = $args->site_srl;
 			$obj->regdate = $date[$obj->member_srl];
 			$output = executeQuery('member.addMemberToGroup', $obj);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 
 			$this->_clearMemberCache($obj->member_srl, $args->site_srl);
 		}
@@ -1574,9 +1574,9 @@ 
 		// Get information of the key
 		$output = executeQuery('member.getAutologin', $args);
 		// If no information exists, delete a cookie
-		if(!$output->toBool() || !$output->data)
+		if (!$output->toBool() || !$output->data)
 		{
-			setCookie('xeak',null,$_SERVER['REQUEST_TIME']+60*60*24*365, '/');
+			setCookie('xeak', null, $_SERVER['REQUEST_TIME'] + 60 * 60 * 24 * 365, '/');
 			return;
 		}
 
@@ -1586,9 +1586,9 @@ 
 		$user_id = ($config->identifier == 'user_id') ? $output->data->user_id : $output->data->email_address;
 		$password = $output->data->password;
 
-		if(!$user_id || !$password)
+		if (!$user_id || !$password)
 		{
-			setCookie('xeak',null,$_SERVER['REQUEST_TIME']+60*60*24*365, '/');
+			setCookie('xeak', null, $_SERVER['REQUEST_TIME'] + 60 * 60 * 24 * 365, '/');
 			return;
 		}
 
@@ -1598,7 +1598,7 @@ 
 		$check_key = strtolower($user_id).$password.$_SERVER['HTTP_USER_AGENT'];
 		$check_key = substr(hash_hmac('sha256', $check_key, substr($args->autologin_key, 0, 32)), 0, 32);
 
-		if($check_key === substr($args->autologin_key, 32))
+		if ($check_key === substr($args->autologin_key, 32))
 		{
 			// Check change_password_date
 			$oModuleModel = getModel('module');
@@ -1606,12 +1606,12 @@ 
 			$limit_date = $member_config->change_password_date;
 
 			// Check if change_password_date is set
-			if($limit_date > 0)
+			if ($limit_date > 0)
 			{
 				$oMemberModel = getModel('member');
 				$columnList = array('member_srl', 'change_password_date');
 
-				if($config->identifier == 'user_id')
+				if ($config->identifier == 'user_id')
 				{
 					$member_info = $oMemberModel->getMemberInfoByUserID($user_id, $columnList);
 				}
@@ -1620,7 +1620,7 @@ 
 					$member_info = $oMemberModel->getMemberInfoByEmailAddress($user_id, $columnList);
 				}
 
-				if($member_info->change_password_date >= date('YmdHis', strtotime('-'.$limit_date.' day')) ){
+				if ($member_info->change_password_date >= date('YmdHis', strtotime('-'.$limit_date.' day'))) {
 					$do_auto_login = true;
 				}
 
@@ -1631,14 +1631,14 @@ 
 			}
 		}
 
-		if($do_auto_login)
+		if ($do_auto_login)
 		{
 			$output = $this->doLogin($user_id);
 		}
 		else
 		{
 			executeQuery('member.deleteAutologin', $args);
-			setCookie('xeak',null,$_SERVER['REQUEST_TIME']+60*60*24*365, '/');
+			setCookie('xeak', null, $_SERVER['REQUEST_TIME'] + 60 * 60 * 24 * 365, '/');
 		}
 	}
 
@@ -1654,13 +1654,13 @@ 
 	function doLogin($user_id, $password = '', $keep_signed = false)
 	{
 		$user_id = strtolower($user_id);
-		if(!$user_id) return new Object(-1, 'null_user_id');
+		if (!$user_id) return new Object(-1, 'null_user_id');
 		// Call a trigger before log-in (before)
 		$trigger_obj = new stdClass();
 		$trigger_obj->user_id = $user_id;
 		$trigger_obj->password = $password;
 		$trigger_output = ModuleHandler::triggerCall('member.doLogin', 'before', $trigger_obj);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if (!$trigger_output->toBool()) return $trigger_output;
 		// Create a member model object
 		$oMemberModel = getModel('member');
 
@@ -1670,12 +1670,12 @@ 
 		$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 
 		// check identifier
-		if($config->identifier == 'email_address')
+		if ($config->identifier == 'email_address')
 		{
 			// Get user_id information
 			$this->memberInfo = $oMemberModel->getMemberInfoByEmailAddress($user_id);
 			// Set an invalid user if no value returned
-			if(!$user_id || strtolower($this->memberInfo->email_address) != strtolower($user_id)) return $this->recordLoginError(-1, 'invalid_email_address');
+			if (!$user_id || strtolower($this->memberInfo->email_address) != strtolower($user_id)) return $this->recordLoginError(-1, 'invalid_email_address');
 
 		}
 		else
@@ -1683,24 +1683,24 @@ 
 			// Get user_id information
 			$this->memberInfo = $oMemberModel->getMemberInfoByUserID($user_id);
 			// Set an invalid user if no value returned
-			if(!$user_id || strtolower($this->memberInfo->user_id) != strtolower($user_id)) return $this->recordLoginError(-1, 'invalid_user_id');
+			if (!$user_id || strtolower($this->memberInfo->user_id) != strtolower($user_id)) return $this->recordLoginError(-1, 'invalid_user_id');
 		}
 
 		$output = executeQuery('member.getLoginCountByIp', $args);
 		$errorCount = $output->data->count;
-		if($errorCount >= $config->max_error_count)
+		if ($errorCount >= $config->max_error_count)
 		{
 			$last_update = strtotime($output->data->last_update);
-			$term = intval($_SERVER['REQUEST_TIME']-$last_update);
-			if($term < $config->max_error_count_time)
+			$term = intval($_SERVER['REQUEST_TIME'] - $last_update);
+			if ($term < $config->max_error_count_time)
 			{
 				$term = $config->max_error_count_time - $term;
-				if($term < 60) $term = intval($term).Context::getLang('unit_sec');
-				elseif(60 <= $term && $term < 3600) $term = intval($term/60).Context::getLang('unit_min');
-				elseif(3600 <= $term && $term < 86400) $term = intval($term/3600).Context::getLang('unit_hour');
-				else $term = intval($term/86400).Context::getLang('unit_day');
+				if ($term < 60) $term = intval($term).Context::getLang('unit_sec');
+				elseif (60 <= $term && $term < 3600) $term = intval($term / 60).Context::getLang('unit_min');
+				elseif (3600 <= $term && $term < 86400) $term = intval($term / 3600).Context::getLang('unit_hour');
+				else $term = intval($term / 86400).Context::getLang('unit_day');
 
-				return new Object(-1, sprintf(Context::getLang('excess_ip_access_count'),$term));
+				return new Object(-1, sprintf(Context::getLang('excess_ip_access_count'), $term));
 			}
 			else
 			{
@@ -1710,13 +1710,13 @@ 
 		}
 
 		// Password Check
-		if($password && !$oMemberModel->isValidPassword($this->memberInfo->password, $password, $this->memberInfo->member_srl))
+		if ($password && !$oMemberModel->isValidPassword($this->memberInfo->password, $password, $this->memberInfo->member_srl))
 		{
-			return $this->recordMemberLoginError(-1, 'invalid_password',$this->memberInfo);
+			return $this->recordMemberLoginError(-1, 'invalid_password', $this->memberInfo);
 		}
 
 		// If denied == 'Y', notify
-		if($this->memberInfo->denied == 'Y')
+		if ($this->memberInfo->denied == 'Y')
 		{
 			$args->member_srl = $this->memberInfo->member_srl;
 			$output = executeQuery('member.chkAuthMail', $args);
@@ -1724,12 +1724,12 @@ 
 			{
 				$_SESSION['auth_member_srl'] = $this->memberInfo->member_srl;
 				$redirectUrl = getUrl('', 'act', 'dispMemberResendAuthMail');
-				return $this->setRedirectUrl($redirectUrl, new Object(-1,'msg_user_not_confirmed'));
+				return $this->setRedirectUrl($redirectUrl, new Object(-1, 'msg_user_not_confirmed'));
 			}
-			return new Object(-1,'msg_user_denied');
+			return new Object(-1, 'msg_user_denied');
 		}
 		// Notify if denied_date is less than the current time
-		if($this->memberInfo->limit_date && substr($this->memberInfo->limit_date,0,8) >= date("Ymd")) return new Object(-9,sprintf(Context::getLang('msg_user_limited'),zdate($this->memberInfo->limit_date,"Y-m-d")));
+		if ($this->memberInfo->limit_date && substr($this->memberInfo->limit_date, 0, 8) >= date("Ymd")) return new Object(-9, sprintf(Context::getLang('msg_user_limited'), zdate($this->memberInfo->limit_date, "Y-m-d")));
 		// Update the latest login time
 		$args->member_srl = $this->memberInfo->member_srl;
 		$output = executeQuery('member.updateLastLogin', $args);
@@ -1739,36 +1739,36 @@ 
 
 		// Check if there is recoding table.
 		$oDB = &DB::getInstance();
-		if($oDB->isTableExists('member_count_history') && $config->enable_login_fail_report != 'N')
+		if ($oDB->isTableExists('member_count_history') && $config->enable_login_fail_report != 'N')
 		{
 			// check if there is login fail records.
 			$output = executeQuery('member.getLoginCountHistoryByMemberSrl', $args);
-			if($output->data && $output->data->content)
+			if ($output->data && $output->data->content)
 			{
 				$title = Context::getLang('login_fail_report');
 				$message = '<ul>';
 				$content = unserialize($output->data->content);
-				if(count($content) > $config->max_error_count)
+				if (count($content) > $config->max_error_count)
 				{
-					foreach($content as $val)
+					foreach ($content as $val)
 					{
-						$message .= '<li>'.Context::getLang('regdate').': '.date('Y-m-d h:i:sa',$val[2]).'<ul><li>'.Context::getLang('ipaddress').': '.$val[0].'</li><li>'.Context::getLang('message').': '.$val[1].'</li></ul></li>';
+						$message .= '<li>'.Context::getLang('regdate').': '.date('Y-m-d h:i:sa', $val[2]).'<ul><li>'.Context::getLang('ipaddress').': '.$val[0].'</li><li>'.Context::getLang('message').': '.$val[1].'</li></ul></li>';
 					}
 					$message .= '</ul>';
-					$content = sprintf(Context::getLang('login_fail_report_contents'),$message,date('Y-m-d h:i:sa'));
+					$content = sprintf(Context::getLang('login_fail_report_contents'), $message, date('Y-m-d h:i:sa'));
 
 					//send message
 					$oCommunicationController = getController('communication');
 					$oCommunicationController->sendMessage($args->member_srl, $args->member_srl, $title, $content, true);
 
-					if($this->memberInfo->email_address && $this->memberInfo->allow_mailing == 'Y')
+					if ($this->memberInfo->email_address && $this->memberInfo->allow_mailing == 'Y')
 					{
 						$view_url = Context::getRequestUri();
-						$content = sprintf("%s<hr /><p>From: <a href=\"%s\" target=\"_blank\">%s</a><br />To: %s(%s)</p>",$content, $view_url, $view_url, $this->memberInfo->nick_name, $this->memberInfo->email_id);
+						$content = sprintf("%s<hr /><p>From: <a href=\"%s\" target=\"_blank\">%s</a><br />To: %s(%s)</p>", $content, $view_url, $view_url, $this->memberInfo->nick_name, $this->memberInfo->email_id);
 						$oMail = new Mail();
 						$oMail->setTitle($title);
 						$oMail->setContent($content);
-						$oMail->setSender($config->webmaster_name?$config->webmaster_name:'webmaster', $config->webmaster_email);
+						$oMail->setSender($config->webmaster_name ? $config->webmaster_name : 'webmaster', $config->webmaster_email);
 						$oMail->setReceiptor($this->memberInfo->email_id.'('.$this->memberInfo->nick_name.')', $this->memberInfo->email_address);
 						$oMail->send();
 					}
@@ -1778,9 +1778,9 @@ 
 		}
 		// Call a trigger after successfully log-in (after)
 		$trigger_output = ModuleHandler::triggerCall('member.doLogin', 'after', $this->memberInfo);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if (!$trigger_output->toBool()) return $trigger_output;
 		// When user checked to use auto-login
-		if($keep_signed)
+		if ($keep_signed)
 		{
 			// Key generate for auto login
 			$oPassword = new Password();
@@ -1792,12 +1792,12 @@ 
 			$autologin_args->member_srl = $this->memberInfo->member_srl;
 			executeQuery('member.deleteAutologin', $autologin_args);
 			$autologin_output = executeQuery('member.insertAutologin', $autologin_args);
-			if($autologin_output->toBool()) setCookie('xeak',$autologin_args->autologin_key, $_SERVER['REQUEST_TIME']+31536000, '/');
+			if ($autologin_output->toBool()) setCookie('xeak', $autologin_args->autologin_key, $_SERVER['REQUEST_TIME'] + 31536000, '/');
 		}
-		if($this->memberInfo->is_admin == 'Y')
+		if ($this->memberInfo->is_admin == 'Y')
 		{
 			$oMemberAdminModel = getAdminModel('member');
-			if(!$oMemberAdminModel->getMemberAdminIPCheck())
+			if (!$oMemberAdminModel->getMemberAdminIPCheck())
 			{
 				$_SESSION['denied_admin'] = 'Y';
 			}
@@ -1815,18 +1815,18 @@ 
 	{
 		$oMemberModel = getModel('member');
 		// If your information came through the current session information to extract information from the users
-		if(!$this->memberInfo && $_SESSION['member_srl'] && $oMemberModel->isLogged() )
+		if (!$this->memberInfo && $_SESSION['member_srl'] && $oMemberModel->isLogged())
 		{
 			$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($_SESSION['member_srl']);
 			// If you do not destroy the session Profile
-			if($this->memberInfo->member_srl != $_SESSION['member_srl'])
+			if ($this->memberInfo->member_srl != $_SESSION['member_srl'])
 			{
 				$this->destroySessionInfo();
 				return;
 			}
 		}
 		// Stop using the session id is destroyed
-		if($this->memberInfo->denied=='Y')
+		if ($this->memberInfo->denied == 'Y')
 		{
 			$this->destroySessionInfo();
 			return;
@@ -1856,10 +1856,10 @@ 
 		Context::set('logged_info', $this->memberInfo);
 
 		// Only the menu configuration of the user (such as an add-on to the menu can be changed)
-		$this->addMemberMenu( 'dispMemberInfo', 'cmd_view_member_info');
-		$this->addMemberMenu( 'dispMemberScrappedDocument', 'cmd_view_scrapped_document');
-		$this->addMemberMenu( 'dispMemberSavedDocument', 'cmd_view_saved_document');
-		$this->addMemberMenu( 'dispMemberOwnDocument', 'cmd_view_own_document');
+		$this->addMemberMenu('dispMemberInfo', 'cmd_view_member_info');
+		$this->addMemberMenu('dispMemberScrappedDocument', 'cmd_view_scrapped_document');
+		$this->addMemberMenu('dispMemberSavedDocument', 'cmd_view_saved_document');
+		$this->addMemberMenu('dispMemberOwnDocument', 'cmd_view_own_document');
 	}
 
 	/**
@@ -1881,7 +1881,7 @@ 
 	function addMemberPopupMenu($url, $str, $icon = '', $target = 'self')
 	{
 		$member_popup_menu_list = Context::get('member_popup_menu_list');
-		if(!is_array($member_popup_menu_list)) $member_popup_menu_list = array();
+		if (!is_array($member_popup_menu_list)) $member_popup_menu_list = array();
 
 		$obj = new stdClass;
 		$obj->url = $url;
@@ -1900,33 +1900,33 @@ 
 	{
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('member.insertMember', 'before', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Terms and Conditions portion of the information set up by members reaffirmed
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
 
 		$logged_info = Context::get('logged_info');
 		// If the date of the temporary restrictions limit further information on the date of
-		if($config->limit_day) $args->limit_date = date("YmdHis", $_SERVER['REQUEST_TIME']+$config->limit_day*60*60*24);
+		if ($config->limit_day) $args->limit_date = date("YmdHis", $_SERVER['REQUEST_TIME'] + $config->limit_day * 60 * 60 * 24);
 
 		$args->member_srl = getNextSequence();
 		$args->list_order = -1 * $args->member_srl;
 
 		// Execute insert or update depending on the value of member_srl
-		if(!$args->user_id) $args->user_id = 't'.$args->member_srl;
+		if (!$args->user_id) $args->user_id = 't'.$args->member_srl;
 		// Enter the user's identity changed to lowercase
 		else $args->user_id = strtolower($args->user_id);
-		if(!$args->user_name) $args->user_name = $args->member_srl;
-		if(!$args->nick_name) $args->nick_name = $args->member_srl;
+		if (!$args->user_name) $args->user_name = $args->member_srl;
+		if (!$args->nick_name) $args->nick_name = $args->member_srl;
 
 		// Control of essential parameters
-		if($args->allow_mailing!='Y') $args->allow_mailing = 'N';
-		if($args->denied!='Y') $args->denied = 'N';
-		$args->allow_message= 'Y';
+		if ($args->allow_mailing != 'Y') $args->allow_mailing = 'N';
+		if ($args->denied != 'Y') $args->denied = 'N';
+		$args->allow_message = 'Y';
 
-		if($logged_info->is_admin == 'Y')
+		if ($logged_info->is_admin == 'Y')
 		{
-			if($args->is_admin!='Y') $args->is_admin = 'N';
+			if ($args->is_admin != 'Y') $args->is_admin = 'N';
 		}
 		else
 		{
@@ -1941,88 +1941,88 @@ 
 		$args->nick_name = htmlspecialchars($args->nick_name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		$args->homepage = htmlspecialchars($args->homepage, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		$args->blog = htmlspecialchars($args->blog, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
-		if($args->homepage && !preg_match("/^[a-z]+:\/\//i",$args->homepage)) $args->homepage = 'http://'.$args->homepage;
-		if($args->blog && !preg_match("/^[a-z]+:\/\//i",$args->blog)) $args->blog = 'http://'.$args->blog;
+		if ($args->homepage && !preg_match("/^[a-z]+:\/\//i", $args->homepage)) $args->homepage = 'http://'.$args->homepage;
+		if ($args->blog && !preg_match("/^[a-z]+:\/\//i", $args->blog)) $args->blog = 'http://'.$args->blog;
 
 		// Create a model object
 		$oMemberModel = getModel('member');
 
 		// Check password strength
-		if($args->password && !$password_is_hashed)
+		if ($args->password && !$password_is_hashed)
 		{
-			if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
+			if (!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
 			{
 				$message = Context::getLang('about_password_strength');
 				return new Object(-1, $message[$config->password_strength]);
 			}
 			$args->password = $oMemberModel->hashPassword($args->password);
 		}
-		elseif(!$args->password)
+		elseif (!$args->password)
 		{
 			unset($args->password);
 		}
 
 		// Check if ID is prohibited
-		if($oMemberModel->isDeniedID($args->user_id))
+		if ($oMemberModel->isDeniedID($args->user_id))
 		{
-			return new Object(-1,'denied_user_id');
+			return new Object(-1, 'denied_user_id');
 		}
 
 		// Check if ID is duplicate
 		$member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id);
-		if($member_srl)
+		if ($member_srl)
 		{
-			return new Object(-1,'msg_exists_user_id');
+			return new Object(-1, 'msg_exists_user_id');
 		}
 
 		// Check if nickname is prohibited
-		if($oMemberModel->isDeniedNickName($args->nick_name))
+		if ($oMemberModel->isDeniedNickName($args->nick_name))
 		{
-			return new Object(-1,'denied_nick_name');
+			return new Object(-1, 'denied_nick_name');
 		}
 
 		// Check if nickname is duplicate
 		$member_srl = $oMemberModel->getMemberSrlByNickName($args->nick_name);
-		if($member_srl)
+		if ($member_srl)
 		{
-			return new Object(-1,'msg_exists_nick_name');
+			return new Object(-1, 'msg_exists_nick_name');
 		}
 
 		// Check if email address is duplicate
 		$member_srl = $oMemberModel->getMemberSrlByEmailAddress($args->email_address);
-		if($member_srl)
+		if ($member_srl)
 		{
-			return new Object(-1,'msg_exists_email_address');
+			return new Object(-1, 'msg_exists_email_address');
 		}
 
 		// Insert data into the DB
 		$args->list_order = -1 * $args->member_srl;
 
-		if(!$args->user_id) $args->user_id = 't'.$args->member_srl;
-		if(!$args->user_name) $args->user_name = $args->member_srl;
+		if (!$args->user_id) $args->user_id = 't'.$args->member_srl;
+		if (!$args->user_name) $args->user_name = $args->member_srl;
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 
 		$output = executeQuery('member.insertMember', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
-		if(is_array($args->group_srl_list)) $group_srl_list = $args->group_srl_list;
+		if (is_array($args->group_srl_list)) $group_srl_list = $args->group_srl_list;
 		else $group_srl_list = explode('|@|', $args->group_srl_list);
 		// If no value is entered the default group, the value of group registration
-		if(!$args->group_srl_list)
+		if (!$args->group_srl_list)
 		{
 			$columnList = array('site_srl', 'group_srl');
 			$default_group = $oMemberModel->getDefaultGroup(0, $columnList);
-			if($default_group)
+			if ($default_group)
 			{
 				// Add to the default group
-				$output = $this->addMemberToGroup($args->member_srl,$default_group->group_srl);
-				if(!$output->toBool())
+				$output = $this->addMemberToGroup($args->member_srl, $default_group->group_srl);
+				if (!$output->toBool())
 				{
 					$oDB->rollback();
 					return $output;
@@ -2032,11 +2032,11 @@ 
 		}
 		else
 		{
-			for($i=0;$i<count($group_srl_list);$i++)
+			for ($i = 0; $i < count($group_srl_list); $i++)
 			{
-				$output = $this->addMemberToGroup($args->member_srl,$group_srl_list[$i]);
+				$output = $this->addMemberToGroup($args->member_srl, $group_srl_list[$i]);
 
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					$oDB->rollback();
 					return $output;
@@ -2046,7 +2046,7 @@ 
 
 		$member_config = $oModuleModel->getModuleConfig('member');
 		// When using email authentication mode (when you subscribed members denied a) certified mail sent
-		if($args->denied == 'Y')
+		if ($args->denied == 'Y')
 		{
 			// Insert data into the authentication DB
 			$oPassword = new Password();
@@ -2058,7 +2058,7 @@ 
 			$auth_args->is_register = 'Y';
 
 			$output = executeQuery('member.insertAuthMail', $auth_args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
@@ -2066,10 +2066,10 @@ 
 			$this->_sendAuthMail($auth_args, $args);
 		}
 		// Call a trigger (after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$trigger_output = ModuleHandler::triggerCall('member.insertMember', 'after', $args);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -2091,41 +2091,41 @@ 
 	{
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('member.updateMember', 'before', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Create a model object
 		$oMemberModel = getModel('member');
 
 		$logged_info = Context::get('logged_info');
 		// Get what you want to modify the original information
-		if(!$this->memberInfo) $this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
+		if (!$this->memberInfo) $this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
 		// Control of essential parameters
-		if($args->allow_mailing!='Y') $args->allow_mailing = 'N';
-		if($args->allow_message && !in_array($args->allow_message, array('Y','N','F'))) $args->allow_message = 'Y';
+		if ($args->allow_mailing != 'Y') $args->allow_mailing = 'N';
+		if ($args->allow_message && !in_array($args->allow_message, array('Y', 'N', 'F'))) $args->allow_message = 'Y';
 
-		if($logged_info->is_admin == 'Y')
+		if ($logged_info->is_admin == 'Y')
 		{
-			if($args->denied!='Y') $args->denied = 'N';
-			if($args->is_admin!='Y' && $logged_info->member_srl != $args->member_srl) $args->is_admin = 'N';
+			if ($args->denied != 'Y') $args->denied = 'N';
+			if ($args->is_admin != 'Y' && $logged_info->member_srl != $args->member_srl) $args->is_admin = 'N';
 		}
 		else
 		{
 			unset($args->is_admin);
-			if($is_admin == false)
+			if ($is_admin == false)
 				unset($args->denied);
-			if($logged_info->member_srl != $args->member_srl && $is_admin == false)
+			if ($logged_info->member_srl != $args->member_srl && $is_admin == false)
 			{
 				return $this->stop('msg_invalid_request');
 			}
 		}
 
 		// Sanitize user ID, username, nickname, homepage, blog
-		if($args->user_id) $args->user_id = htmlspecialchars($args->user_id, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
+		if ($args->user_id) $args->user_id = htmlspecialchars($args->user_id, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		$args->user_name = htmlspecialchars($args->user_name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		$args->nick_name = htmlspecialchars($args->nick_name, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		$args->homepage = htmlspecialchars($args->homepage, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 		$args->blog = htmlspecialchars($args->blog, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
-		if($args->homepage && !preg_match("/^[a-z]+:\/\//is",$args->homepage)) $args->homepage = 'http://'.$args->homepage;
-		if($args->blog && !preg_match("/^[a-z]+:\/\//is",$args->blog)) $args->blog = 'http://'.$args->blog;
+		if ($args->homepage && !preg_match("/^[a-z]+:\/\//is", $args->homepage)) $args->homepage = 'http://'.$args->homepage;
+		if ($args->blog && !preg_match("/^[a-z]+:\/\//is", $args->blog)) $args->blog = 'http://'.$args->blog;
 
 		// check member identifier form
 		$config = $oMemberModel->getMemberConfig();
@@ -2134,56 +2134,56 @@ 
 		$orgMemberInfo = $output->data;
 
 		// Check if email address or user ID is duplicate
-		if($config->identifier == 'email_address')
+		if ($config->identifier == 'email_address')
 		{
 			$member_srl = $oMemberModel->getMemberSrlByEmailAddress($args->email_address);
-			if($member_srl && $args->member_srl != $member_srl)
+			if ($member_srl && $args->member_srl != $member_srl)
 			{
-				return new Object(-1,'msg_exists_email_address');
+				return new Object(-1, 'msg_exists_email_address');
 			}
 			$args->email_address = $orgMemberInfo->email_address;
 		}
 		else
 		{
 			$member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id);
-			if($member_srl && $args->member_srl != $member_srl)
+			if ($member_srl && $args->member_srl != $member_srl)
 			{
-				return new Object(-1,'msg_exists_user_id');
+				return new Object(-1, 'msg_exists_user_id');
 			}
 
 			$args->user_id = $orgMemberInfo->user_id;
 		}
 
-		if($logged_info->is_admin !== 'Y')
+		if ($logged_info->is_admin !== 'Y')
 		{
 			// Check if ID is prohibited
-			if($args->user_id && $oMemberModel->isDeniedID($args->user_id))
+			if ($args->user_id && $oMemberModel->isDeniedID($args->user_id))
 			{
-				return new Object(-1,'denied_user_id');
+				return new Object(-1, 'denied_user_id');
 			}
 
 			// Check if nickname is prohibited
-			if($args->nick_name && $oMemberModel->isDeniedNickName($args->nick_name))
+			if ($args->nick_name && $oMemberModel->isDeniedNickName($args->nick_name))
 			{
 				return new Object(-1, 'denied_nick_name');
 			}
 		}
 
 		// Check if ID is duplicate
-		if($args->user_id)
+		if ($args->user_id)
 		{
 			$member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id);
-			if($member_srl && $args->member_srl != $member_srl)
+			if ($member_srl && $args->member_srl != $member_srl)
 			{
-				return new Object(-1,'msg_exists_user_id');
+				return new Object(-1, 'msg_exists_user_id');
 			}
 		}
 
 		// Check if nickname is duplicate
 		$member_srl = $oMemberModel->getMemberSrlByNickName($args->nick_name);
- 		if($member_srl && $args->member_srl != $member_srl)
+ 		if ($member_srl && $args->member_srl != $member_srl)
  		{
- 			return new Object(-1,'msg_exists_nick_name');
+ 			return new Object(-1, 'msg_exists_nick_name');
  		}
 
 		list($args->email_id, $args->email_host) = explode('@', $args->email_address);
@@ -2192,9 +2192,9 @@ 
 		$oDB->begin();
 
 		// Check password strength
-		if($args->password)
+		if ($args->password)
 		{
-			if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
+			if (!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
 			{
 				$message = Context::getLang('about_password_strength');
 				return new Object(-1, $message[$config->password_strength]);
@@ -2206,40 +2206,40 @@ 
 			$args->password = $orgMemberInfo->password;
 		}
 		
-		if(!$args->user_name) $args->user_name = $orgMemberInfo->user_name;
-		if(!$args->user_id) $args->user_id = $orgMemberInfo->user_id;
-		if(!$args->nick_name) $args->nick_name = $orgMemberInfo->nick_name;
-		if(!$args->description) $args->description = '';
-		if(!$args->birthday) $args->birthday = '';
+		if (!$args->user_name) $args->user_name = $orgMemberInfo->user_name;
+		if (!$args->user_id) $args->user_id = $orgMemberInfo->user_id;
+		if (!$args->nick_name) $args->nick_name = $orgMemberInfo->nick_name;
+		if (!$args->description) $args->description = '';
+		if (!$args->birthday) $args->birthday = '';
 
 		$output = executeQuery('member.updateMember', $args);
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
-		if($args->group_srl_list)
+		if ($args->group_srl_list)
 		{
-			if(is_array($args->group_srl_list)) $group_srl_list = $args->group_srl_list;
+			if (is_array($args->group_srl_list)) $group_srl_list = $args->group_srl_list;
 			else $group_srl_list = explode('|@|', $args->group_srl_list);
 			// If the group information, group information changes
-			if(count($group_srl_list) > 0)
+			if (count($group_srl_list) > 0)
 			{
 				$args->site_srl = 0;
 				// One of its members to delete all the group
 				$output = executeQuery('member.deleteMemberGroupMember', $args);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					$oDB->rollback();
 					return $output;
 				}
 				// Enter one of the loop a
-				for($i=0;$i<count($group_srl_list);$i++)
+				for ($i = 0; $i < count($group_srl_list); $i++)
 				{
-					$output = $this->addMemberToGroup($args->member_srl,$group_srl_list[$i]);
-					if(!$output->toBool())
+					$output = $this->addMemberToGroup($args->member_srl, $group_srl_list[$i]);
+					if (!$output->toBool())
 					{
 						$oDB->rollback();
 						return $output;
@@ -2251,9 +2251,9 @@ 
 			}
 		}
 		// Call a trigger (after)
-		if($output->toBool()) {
+		if ($output->toBool()) {
 			$trigger_output = ModuleHandler::triggerCall('member.updateMember', 'after', $args);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -2266,7 +2266,7 @@ 
 		$this->_clearMemberCache($args->member_srl, $args->site_srl);
 
 		// Save Session
-		if(!$this->memberInfo) $this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
+		if (!$this->memberInfo) $this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
 		$logged_info = Context::get('logged_info');
 
 		$output->add('member_srl', $args->member_srl);
@@ -2278,14 +2278,14 @@ 
 	 */
 	function updateMemberPassword($args)
 	{
-		if($args->password)
+		if ($args->password)
 		{
 
 			// check password strength
 			$oMemberModel = getModel('member');
 			$config = $oMemberModel->getMemberConfig();
 
-			if(!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
+			if (!$oMemberModel->checkPasswordStrength($args->password, $config->password_strength))
 			{
 				$message = Context::getLang('about_password_strength');
 				return new Object(-1, $message[$config->password_strength]);
@@ -2293,13 +2293,13 @@ 
 
 			$args->password = $oMemberModel->hashPassword($args->password);
 		}
-		else if($args->hashed_password)
+		else if ($args->hashed_password)
 		{
 			$args->password = $args->hashed_password;
 		}
 
 		$output = executeQuery('member.updateMemberPassword', $args);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$result = executeQuery('member.updateChangePasswordDate', $args);
 		}
@@ -2318,18 +2318,18 @@ 
 		$trigger_obj = new stdClass();
 		$trigger_obj->member_srl = $member_srl;
 		$output = ModuleHandler::triggerCall('member.deleteMember', 'before', $trigger_obj);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Create a model object
 		$oMemberModel = getModel('member');
 		// Bringing the user's information
-		if(!$this->memberInfo || $this->memberInfo->member_srl != $member_srl || !isset($this->memberInfo->is_admin))
+		if (!$this->memberInfo || $this->memberInfo->member_srl != $member_srl || !isset($this->memberInfo->is_admin))
 		{
 			$columnList = array('member_srl', 'is_admin');
 			$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
 		}
-		if(!$this->memberInfo) return new Object(-1, 'msg_not_exists_member');
+		if (!$this->memberInfo) return new Object(-1, 'msg_not_exists_member');
 		// If managers can not be deleted
-		if($this->memberInfo->is_admin == 'Y') return new Object(-1, 'msg_cannot_delete_admin');
+		if ($this->memberInfo->is_admin == 'Y') return new Object(-1, 'msg_cannot_delete_admin');
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -2338,7 +2338,7 @@ 
 		$args->member_srl = $member_srl;
 		// Delete the entries in member_auth_mail
 		$output = executeQuery('member.deleteAuthMail', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -2353,23 +2353,23 @@ 
 		 */
 		// Delete the entries in member_group_member
 		$output = executeQuery('member.deleteMemberGroupMember', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 		// member removed from the table
 		$output = executeQuery('member.deleteMember', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 		// Call a trigger (after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$trigger_output = ModuleHandler::triggerCall('member.deleteMember', 'after', $trigger_obj);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -2393,23 +2393,23 @@ 
 	 */
 	function destroySessionInfo()
 	{
-		if(!$_SESSION || !is_array($_SESSION)) return;
+		if (!$_SESSION || !is_array($_SESSION)) return;
 
 		$memberInfo = Context::get('logged_info');
 		$memberSrl = $memberInfo->member_srl;
 
-		foreach($_SESSION as $key => $val)
+		foreach ($_SESSION as $key => $val)
 		{
 			$_SESSION[$key] = '';
 		}
 
 		session_destroy();
-		setcookie(session_name(), '', $_SERVER['REQUEST_TIME']-42000, '/');
-		setcookie('sso','',$_SERVER['REQUEST_TIME']-42000, '/');
-		setcookie('xeak','',$_SERVER['REQUEST_TIME']-42000, '/');
+		setcookie(session_name(), '', $_SERVER['REQUEST_TIME'] - 42000, '/');
+		setcookie('sso', '', $_SERVER['REQUEST_TIME'] - 42000, '/');
+		setcookie('xeak', '', $_SERVER['REQUEST_TIME'] - 42000, '/');
 		setcookie('xe_logged', 'false', $_SERVER['REQUEST_TIME'] - 42000, '/');
 
-		if($memberSrl || $_COOKIE['xeak'])
+		if ($memberSrl || $_COOKIE['xeak'])
 		{
 			$args = new stdClass();
 			$args->member_srl = $memberSrl;
@@ -2425,22 +2425,22 @@ 
 		$pointGroup = $pointModuleConfig->point_group;
 
 		$levelGroup = array();
-		if(is_array($pointGroup) && count($pointGroup)>0)
+		if (is_array($pointGroup) && count($pointGroup) > 0)
 		{
 			$levelGroup = array_flip($pointGroup);
 			ksort($levelGroup);
 		}
 		$maxLevel = 0;
 		$resultGroup = array_intersect($levelGroup, $groupSrlList);
-		if(count($resultGroup) > 0)
+		if (count($resultGroup) > 0)
 			$maxLevel = max(array_flip($resultGroup));
 
-		if($maxLevel > 0)
+		if ($maxLevel > 0)
 		{
 			$oPointModel = getModel('point');
 			$originPoint = $oPointModel->getPoint($memberSrl);
 
-			if($pointModuleConfig->level_step[$maxLevel] > $originPoint)
+			if ($pointModuleConfig->level_step[$maxLevel] > $originPoint)
 			{
 				$oPointController = getController('point');
 				$oPointController->setPoint($memberSrl, $pointModuleConfig->level_step[$maxLevel], 'update');
@@ -2450,18 +2450,18 @@ 
 
 	function procMemberModifyEmailAddress()
 	{
-		if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
+		if (!Context::get('is_logged')) return $this->stop('msg_not_logged');
 
 		$member_info = Context::get('logged_info');
 		$newEmail = Context::get('email_address');
 
-		if(!$newEmail) return $this->stop('msg_invalid_request');
+		if (!$newEmail) return $this->stop('msg_invalid_request');
 
 		$oMemberModel = getModel('member');
 		$member_srl = $oMemberModel->getMemberSrlByEmailAddress($newEmail);
-		if($member_srl) return new Object(-1,'msg_exists_email_address');
+		if ($member_srl) return new Object(-1, 'msg_exists_email_address');
 
-		if($_SESSION['rechecked_password_step'] != 'INPUT_DATA')
+		if ($_SESSION['rechecked_password_step'] != 'INPUT_DATA')
 		{
 			return $this->stop('msg_invalid_request');
 		}
@@ -2477,7 +2477,7 @@ 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 		$output = executeQuery('member.insertAuthMail', $auth_args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -2487,7 +2487,7 @@ 
 		$member_config = $oModuleModel->getModuleConfig('member');
 
 		$tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
-		if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+		if (!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
 
 		global $lang;
 
@@ -2499,17 +2499,17 @@ 
 
 		Context::set('newEmail', $newEmail);
 
-		$auth_url = getFullUrl('','module','member','act','procMemberAuthEmailAddress','member_srl',$member_info->member_srl, 'auth_key',$auth_args->auth_key);
+		$auth_url = getFullUrl('', 'module', 'member', 'act', 'procMemberAuthEmailAddress', 'member_srl', $member_info->member_srl, 'auth_key', $auth_args->auth_key);
 		Context::set('auth_url', $auth_url);
 
 		$oTemplate = &TemplateHandler::getInstance();
 		$content = $oTemplate->compile($tpl_path, 'confirm_member_new_email');
 
 		$oMail = new Mail();
-		$oMail->setTitle( Context::getLang('title_modify_email_address') );
+		$oMail->setTitle(Context::getLang('title_modify_email_address'));
 		$oMail->setContent($content);
-		$oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
-		$oMail->setReceiptor( $member_info->nick_name, $newEmail );
+		$oMail->setSender($member_config->webmaster_name ? $member_config->webmaster_name : 'webmaster', $member_config->webmaster_email);
+		$oMail->setReceiptor($member_info->nick_name, $newEmail);
 		$result = $oMail->send();
 
 		$msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $newEmail);
@@ -2523,16 +2523,16 @@ 
 	{
 		$member_srl = Context::get('member_srl');
 		$auth_key = Context::get('auth_key');
-		if(!$member_srl || !$auth_key) return $this->stop('msg_invalid_request');
+		if (!$member_srl || !$auth_key) return $this->stop('msg_invalid_request');
 
 		// Test logs for finding password by user_id and authkey
 		$args = new stdClass;
 		$args->member_srl = $member_srl;
 		$args->auth_key = $auth_key;
 		$output = executeQuery('member.getAuthMail', $args);
-		if(!$output->toBool() || $output->data->auth_key != $auth_key)
+		if (!$output->toBool() || $output->data->auth_key != $auth_key)
 		{
-			if(strlen($output->data->auth_key) !== strlen($auth_key)) executeQuery('member.deleteAuthChangeEmailAddress', $args);
+			if (strlen($output->data->auth_key) !== strlen($auth_key)) executeQuery('member.deleteAuthChangeEmailAddress', $args);
 			return $this->stop('msg_invalid_modify_email_auth_key');
 		}
 
@@ -2541,10 +2541,10 @@ 
 		list($args->email_id, $args->email_host) = explode('@', $newEmail);
 
 		$output = executeQuery('member.updateMemberEmailAddress', $args);
-		if(!$output->toBool()) return $this->stop($output->getMessage());
+		if (!$output->toBool()) return $this->stop($output->getMessage());
 
 		// Remove all values having the member_srl and new_password equal to 'XE_change_emaill_address' from authentication table
-		executeQuery('member.deleteAuthChangeEmailAddress',$args);
+		executeQuery('member.deleteAuthChangeEmailAddress', $args);
 
 		$this->_clearMemberCache($args->member_srl);
 
@@ -2562,7 +2562,7 @@ 
 	**/
 	function triggerGetDocumentMenu(&$menu_list)
 	{
-		if(!Context::get('is_logged')) return new Object();
+		if (!Context::get('is_logged')) return new Object();
 
 		$logged_info = Context::get('logged_info');
 		$document_srl = Context::get('target_srl');
@@ -2573,12 +2573,12 @@ 
 		$member_srl = $oDocument->get('member_srl');
 		$module_srl = $oDocument->get('module_srl');
 
-		if(!$member_srl) return new Object();
-		if($oDocumentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return new Object();
+		if (!$member_srl) return new Object();
+		if ($oDocumentModel->grant->manager != 1 || $member_srl == $logged_info->member_srl) return new Object();
 
 		$oDocumentController = getController('document');
-		$url = getUrl('','module','member','act','dispMemberSpammer','member_srl',$member_srl,'module_srl',$module_srl);
-		$oDocumentController->addDocumentPopupMenu($url,'cmd_spammer','','popup');
+		$url = getUrl('', 'module', 'member', 'act', 'dispMemberSpammer', 'member_srl', $member_srl, 'module_srl', $module_srl);
+		$oDocumentController->addDocumentPopupMenu($url, 'cmd_spammer', '', 'popup');
 
 		return new Object();
 	}
@@ -2592,7 +2592,7 @@ 
 	**/
 	function triggerGetCommentMenu(&$menu_list)
 	{
-		if(!Context::get('is_logged')) return new Object();
+		if (!Context::get('is_logged')) return new Object();
 
 		$logged_info = Context::get('logged_info');
 		$comment_srl = Context::get('target_srl');
@@ -2603,12 +2603,12 @@ 
 		$module_srl = $oComment->get('module_srl');
 		$member_srl = $oComment->get('member_srl');
 
-		if(!$member_srl) return new Object();
-		if($oCommentModel->grant->manager != 1 || $member_srl==$logged_info->member_srl) return new Object();
+		if (!$member_srl) return new Object();
+		if ($oCommentModel->grant->manager != 1 || $member_srl == $logged_info->member_srl) return new Object();
 
 		$oCommentController = getController('comment');
-		$url = getUrl('','module','member','act','dispMemberSpammer','member_srl',$member_srl,'module_srl',$module_srl);
-		$oCommentController->addCommentPopupMenu($url,'cmd_spammer','','popup');
+		$url = getUrl('', 'module', 'member', 'act', 'dispMemberSpammer', 'member_srl', $member_srl, 'module_srl', $module_srl);
+		$oCommentController->addCommentPopupMenu($url, 'cmd_spammer', '', 'popup');
 
 		return new Object();
 	}
@@ -2620,7 +2620,7 @@ 
 	**/
 	function procMemberSpammerManage()
 	{
-		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
 
 		$logged_info = Context::get('logged_info');
 		$member_srl = Context::get('member_srl');
@@ -2628,7 +2628,7 @@ 
 		$cnt_loop = Context::get('cnt_loop');
 		$proc_type = Context::get('proc_type');
 		$isMoveToTrash = true;
-		if($proc_type == "delete")
+		if ($proc_type == "delete")
 			$isMoveToTrash = false;
 
 		// check grant
@@ -2637,7 +2637,7 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, $logged_info);
 
-		if(!$grant->manager) return new Object(-1,'msg_not_permitted');
+		if (!$grant->manager) return new Object(-1, 'msg_not_permitted');
 
 		$proc_msg = "";
 
@@ -2646,10 +2646,10 @@ 
 
 		// delete or trash destination
 		// proc member
-		if($cnt_loop == 1)
+		if ($cnt_loop == 1)
 			$this->_spammerMember($member_srl);
 		// proc document and comment
-		elseif($cnt_loop>1)
+		elseif ($cnt_loop > 1)
 			$this->_spammerDocuments($member_srl, $isMoveToTrash);
 
 		// get destination count
@@ -2658,11 +2658,11 @@ 
 
 		$total_count = Context::get('total_count');
 		$remain_count = $cnt_document + $cnt_comment;
-		if($cnt_loop == 1) $total_count = $remain_count;
+		if ($cnt_loop == 1) $total_count = $remain_count;
 
 		// get progress percent
-		if($total_count > 0)
-			$progress = intval( ( ( $total_count - $remain_count ) / $total_count ) * 100 );
+		if ($total_count > 0)
+			$progress = intval((($total_count - $remain_count) / $total_count) * 100);
 		else
 			$progress = 100;
 
@@ -2686,7 +2686,7 @@ 
 	**/
 	private function _spammerMember($member_srl) {
 		$logged_info = Context::get('logged_info');
-		$spam_description = trim( Context::get('spam_description') );
+		$spam_description = trim(Context::get('spam_description'));
 
 		$oMemberModel = getModel('member');
 		$columnList = array('member_srl', 'email_address', 'user_id', 'nick_name', 'description');
@@ -2705,10 +2705,10 @@ 
 		$args->user_id = $member_info->user_id;
 		$args->nick_name = $member_info->nick_name;
 		$args->denied = "Y";
-		$args->description = trim( $member_info->description );
-		if( $args->description != "" ) $args->description .= "\n";	// add new line
+		$args->description = trim($member_info->description);
+		if ($args->description != "") $args->description .= "\n"; // add new line
 
-		$args->description .= Context::getLang('cmd_spammer') . "[" . date("Y-m-d H:i:s") . " from:" . $logged_info->user_id . " info:" . $spam_description . " docuemnts count:" . $total_count . "]";
+		$args->description .= Context::getLang('cmd_spammer')."[".date("Y-m-d H:i:s")." from:".$logged_info->user_id." info:".$spam_description." docuemnts count:".$total_count."]";
 
 		$output = $this->updateMember($args, true);
 
@@ -2737,21 +2737,21 @@ 
 		// 1. proc comment, 2. proc document
 		$cnt_comment = $oCommentModel->getCommentCountByMemberSrl($member_srl);
 		$cnt_document = $oDocumentModel->getDocumentCountByMemberSrl($member_srl);
-		if($cnt_comment > 0)
+		if ($cnt_comment > 0)
 		{
 			$columnList = array();
 			$commentList = $oCommentModel->getCommentListByMemberSrl($member_srl, $columnList, 0, false, $getContentsCount);
-			if($commentList) {
-				foreach($commentList as $v) {
+			if ($commentList) {
+				foreach ($commentList as $v) {
 					$oCommentController->deleteComment($v->comment_srl, true, $isMoveToTrash);
 				}
 			}
-		} elseif($cnt_document > 0) {
+		} elseif ($cnt_document > 0) {
 			$columnList = array();
 			$documentList = $oDocumentModel->getDocumentListByMemberSrl($member_srl, $columnList, 0, false, $getContentsCount);
-			if($documentList) {
-				foreach($documentList as $v) {
-					if($isMoveToTrash) $oDocumentController->moveDocumentToTrash($v);
+			if ($documentList) {
+				foreach ($documentList as $v) {
+					if ($isMoveToTrash) $oDocumentController->moveDocumentToTrash($v);
 					else $oDocumentController->deleteDocument($v->document_srl);
 				}
 			}
@@ -2763,24 +2763,24 @@ 
 	function _clearMemberCache($member_srl, $site_srl = 0)
 	{
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$object_key = 'member_groups:' . getNumberingPath($member_srl) . $member_srl . '_' . $site_srl;
+			$object_key = 'member_groups:'.getNumberingPath($member_srl).$member_srl.'_'.$site_srl;
 			$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
 			$oCacheHandler->delete($cache_key);
 
-			if($site_srl !== 0)
+			if ($site_srl !== 0)
 			{
-				$object_key = 'member_groups:' . getNumberingPath($member_srl) . $member_srl . '_0';
+				$object_key = 'member_groups:'.getNumberingPath($member_srl).$member_srl.'_0';
 				$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
 				$oCacheHandler->delete($cache_key);
 			}
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$object_key = 'member_info:' . getNumberingPath($member_srl) . $member_srl;
+			$object_key = 'member_info:'.getNumberingPath($member_srl).$member_srl;
 			$cache_key = $oCacheHandler->getGroupKey('member', $object_key);
 			$oCacheHandler->delete($cache_key);
 		}

modules/document/document.class.php

Spacing +91 added lines, -91 removed lines

@@ -17,7 +17,7 @@ 
 	 * Search option to use in admin page
 	 * @var array
 	 */
-	var $search_option = array('title','content','title_content','user_name',); // /< Search options
+	var $search_option = array('title', 'content', 'title_content', 'user_name',); // /< Search options
 	/**
 	 * Status list
 	 * @var array
@@ -34,22 +34,22 @@ 
 		$oModuleController = getController('module');
 
 		$oDB = &DB::getInstance();
-		$oDB->addIndex("documents","idx_module_list_order", array("module_srl","list_order"));
-		$oDB->addIndex("documents","idx_module_update_order", array("module_srl","update_order"));
-		$oDB->addIndex("documents","idx_module_readed_count", array("module_srl","readed_count"));
-		$oDB->addIndex("documents","idx_module_voted_count", array("module_srl","voted_count"));
-		$oDB->addIndex("documents","idx_module_notice", array("module_srl","is_notice"));
-		$oDB->addIndex("documents","idx_module_document_srl", array("module_srl","document_srl"));
-		$oDB->addIndex("documents","idx_module_blamed_count", array("module_srl","blamed_count"));
-		$oDB->addIndex("document_aliases", "idx_module_title", array("module_srl","alias_title"), true);
-		$oDB->addIndex("document_extra_vars", "unique_extra_vars", array("module_srl","document_srl","var_idx","lang_code"), true);
+		$oDB->addIndex("documents", "idx_module_list_order", array("module_srl", "list_order"));
+		$oDB->addIndex("documents", "idx_module_update_order", array("module_srl", "update_order"));
+		$oDB->addIndex("documents", "idx_module_readed_count", array("module_srl", "readed_count"));
+		$oDB->addIndex("documents", "idx_module_voted_count", array("module_srl", "voted_count"));
+		$oDB->addIndex("documents", "idx_module_notice", array("module_srl", "is_notice"));
+		$oDB->addIndex("documents", "idx_module_document_srl", array("module_srl", "document_srl"));
+		$oDB->addIndex("documents", "idx_module_blamed_count", array("module_srl", "blamed_count"));
+		$oDB->addIndex("document_aliases", "idx_module_title", array("module_srl", "alias_title"), true);
+		$oDB->addIndex("document_extra_vars", "unique_extra_vars", array("module_srl", "document_srl", "var_idx", "lang_code"), true);
 		// 2007. 10. 17 Add a trigger to delete all posts together when the module is deleted
 		$oModuleController->insertTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after');
 
 		// 2009. 01. 29 Added a trigger for additional setup
 		$oModuleController->insertTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before');
 
-		if(!is_dir('./files/cache/tmp'))
+		if (!is_dir('./files/cache/tmp'))
 		{
 			FileHandler::makeDir('./files/cache/tmp');
 		}
@@ -66,68 +66,68 @@ 
 		$oModuleModel = getModel('module');
 
 		// 2007. 7. 25: Add a column(notify_message) for notification
-		if(!$oDB->isColumnExists("documents","notify_message")) return true;
+		if (!$oDB->isColumnExists("documents", "notify_message")) return true;
 
 		// 2007. 8. 23: create a clustered index in the document table
-		if(!$oDB->isIndexExists("documents","idx_module_list_order")) return true;
-		if(!$oDB->isIndexExists("documents","idx_module_update_order")) return true;
-		if(!$oDB->isIndexExists("documents","idx_module_readed_count")) return true;
-		if(!$oDB->isIndexExists("documents","idx_module_voted_count")) return true;
+		if (!$oDB->isIndexExists("documents", "idx_module_list_order")) return true;
+		if (!$oDB->isIndexExists("documents", "idx_module_update_order")) return true;
+		if (!$oDB->isIndexExists("documents", "idx_module_readed_count")) return true;
+		if (!$oDB->isIndexExists("documents", "idx_module_voted_count")) return true;
 		// 2007. 10. 17 Add a trigger to delete all posts together when the module is deleted
-		if(!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after')) return true;
+		if (!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after')) return true;
 		// 2007. 10. 25 add parent_srl, expand to the document category
-		if(!$oDB->isColumnExists("document_categories","parent_srl")) return true;
-		if(!$oDB->isColumnExists("document_categories","expand")) return true;
-		if(!$oDB->isColumnExists("document_categories","group_srls")) return true;
+		if (!$oDB->isColumnExists("document_categories", "parent_srl")) return true;
+		if (!$oDB->isColumnExists("document_categories", "expand")) return true;
+		if (!$oDB->isColumnExists("document_categories", "group_srls")) return true;
 		// 2007. 11. 20 create a composite index on the columns(module_srl + is_notice)
-		if(!$oDB->isIndexExists("documents","idx_module_notice")) return true;
+		if (!$oDB->isIndexExists("documents", "idx_module_notice")) return true;
 		// 2008. 02. 18 create a composite index on the columns(module_srl + document_srl) (checked by Manian))
-		if(!$oDB->isIndexExists("documents","idx_module_document_srl")) return true;
+		if (!$oDB->isIndexExists("documents", "idx_module_document_srl")) return true;
 
 		// 2007. 12. 03: Add if the colume(extra_vars) doesn't exist
-		if(!$oDB->isColumnExists("documents","extra_vars")) return true;
+		if (!$oDB->isColumnExists("documents", "extra_vars")) return true;
 		// 2008. 04. 23 Add a column(blamed_count)
-		if(!$oDB->isColumnExists("documents", "blamed_count")) return true;
-		if(!$oDB->isIndexExists("documents","idx_module_blamed_count")) return true;
-		if(!$oDB->isColumnExists("document_voted_log", "point")) return true;
+		if (!$oDB->isColumnExists("documents", "blamed_count")) return true;
+		if (!$oDB->isIndexExists("documents", "idx_module_blamed_count")) return true;
+		if (!$oDB->isColumnExists("document_voted_log", "point")) return true;
 		// 2008-12-15 Add a column(color)
-		if(!$oDB->isColumnExists("document_categories", "color")) return true;
+		if (!$oDB->isColumnExists("document_categories", "color")) return true;
 
 		/**
 		 * 2009. 01. 29: Add a column(lang_code) if not exist in the document_extra_vars table
 		 */
-		if(!$oDB->isColumnExists("document_extra_vars","lang_code")) return true;
+		if (!$oDB->isColumnExists("document_extra_vars", "lang_code")) return true;
 
-		if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before')) return true;
+		if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before')) return true;
 		// 2009. 03. 09 Add a column(lang_code) to the documnets table
-		if(!$oDB->isColumnExists("documents","lang_code")) return true;
+		if (!$oDB->isColumnExists("documents", "lang_code")) return true;
 		// 2009. 03. 11 check the index in the document_extra_vars table
-		if(!$oDB->isIndexExists("document_extra_vars", "unique_extra_vars")) return true;
+		if (!$oDB->isIndexExists("document_extra_vars", "unique_extra_vars")) return true;
 
 		// 2009. 03. 19: Add a column(eid) if not exist in the table
-		if(!$oDB->isColumnExists("document_extra_keys","eid")) return true;
-		if(!$oDB->isColumnExists("document_extra_vars","eid")) return true;
+		if (!$oDB->isColumnExists("document_extra_keys", "eid")) return true;
+		if (!$oDB->isColumnExists("document_extra_vars", "eid")) return true;
 
 		// 2011. 03. 30 Cubrid index Check the index in the document_extra_vars table
-		if(!$oDB->isIndexExists("document_extra_vars", "idx_document_list_order")) return true;
+		if (!$oDB->isIndexExists("document_extra_vars", "idx_document_list_order")) return true;
 
 		//2011. 04. 07 adding description column to document categories
-		if(!$oDB->isColumnExists("document_categories","description")) return true;
+		if (!$oDB->isColumnExists("document_categories", "description")) return true;
 
 		//2011. 05. 23 adding status column to document
-		if(!$oDB->isColumnExists('documents', 'status')) return true;
+		if (!$oDB->isColumnExists('documents', 'status')) return true;
 
 		//2011. 06. 07 check comment status update
-		if($oDB->isColumnExists('documents', 'allow_comment') || $oDB->isColumnExists('documents', 'lock_comment')) return true;
+		if ($oDB->isColumnExists('documents', 'allow_comment') || $oDB->isColumnExists('documents', 'lock_comment')) return true;
 
 		// 2011. 10. 25 status index check
-		if(!$oDB->isIndexExists("documents", "idx_module_status")) return true;
+		if (!$oDB->isIndexExists("documents", "idx_module_status")) return true;
 
 		// 2012. 02. 27 Add a trigger to copy extra keys when the module is copied 
-		if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after')) return true;
+		if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after')) return true;
 
 		// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-		if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModule', 'after')) return true;
+		if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModule', 'after')) return true;
 
 		return false;
 	}
@@ -143,98 +143,98 @@ 
 		$oModuleController = getController('module');
 
 		// 2007. 7. 25: Add a column(notify_message) for notification
-		if(!$oDB->isColumnExists("documents","notify_message"))
+		if (!$oDB->isColumnExists("documents", "notify_message"))
 		{
-			$oDB->addColumn('documents',"notify_message","char",1);
+			$oDB->addColumn('documents', "notify_message", "char", 1);
 		}
 
 		// 2007. 8. 23: create a clustered index in the document table
-		if(!$oDB->isIndexExists("documents","idx_module_list_order"))
+		if (!$oDB->isIndexExists("documents", "idx_module_list_order"))
 		{
-			$oDB->addIndex("documents","idx_module_list_order", array("module_srl","list_order"));
+			$oDB->addIndex("documents", "idx_module_list_order", array("module_srl", "list_order"));
 		}
 
-		if(!$oDB->isIndexExists("documents","idx_module_update_order"))
+		if (!$oDB->isIndexExists("documents", "idx_module_update_order"))
 		{
-			$oDB->addIndex("documents","idx_module_update_order", array("module_srl","update_order"));
+			$oDB->addIndex("documents", "idx_module_update_order", array("module_srl", "update_order"));
 		}
 
-		if(!$oDB->isIndexExists("documents","idx_module_readed_count"))
+		if (!$oDB->isIndexExists("documents", "idx_module_readed_count"))
 		{
-			$oDB->addIndex("documents","idx_module_readed_count", array("module_srl","readed_count"));
+			$oDB->addIndex("documents", "idx_module_readed_count", array("module_srl", "readed_count"));
 		}
 
-		if(!$oDB->isIndexExists("documents","idx_module_voted_count"))
+		if (!$oDB->isIndexExists("documents", "idx_module_voted_count"))
 		{
-			$oDB->addIndex("documents","idx_module_voted_count", array("module_srl","voted_count"));
+			$oDB->addIndex("documents", "idx_module_voted_count", array("module_srl", "voted_count"));
 		}
 		// 2007. 10. 17 Add a trigger to delete all posts together when the module is deleted
-		if(!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after'))
+		if (!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after'))
 			$oModuleController->insertTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after');
 		// 2007. 10. 25 add columns(parent_srl, expand) 
-		if(!$oDB->isColumnExists("document_categories","parent_srl")) $oDB->addColumn('document_categories',"parent_srl","number",12,0);
-		if(!$oDB->isColumnExists("document_categories","expand")) $oDB->addColumn('document_categories',"expand","char",1,"N");
-		if(!$oDB->isColumnExists("document_categories","group_srls")) $oDB->addColumn('document_categories',"group_srls","text");
+		if (!$oDB->isColumnExists("document_categories", "parent_srl")) $oDB->addColumn('document_categories', "parent_srl", "number", 12, 0);
+		if (!$oDB->isColumnExists("document_categories", "expand")) $oDB->addColumn('document_categories', "expand", "char", 1, "N");
+		if (!$oDB->isColumnExists("document_categories", "group_srls")) $oDB->addColumn('document_categories', "group_srls", "text");
 		// 2007. 11. 20 create a composite index on the columns(module_srl + is_notice)
-		if(!$oDB->isIndexExists("documents","idx_module_notice")) $oDB->addIndex("documents","idx_module_notice", array("module_srl","is_notice"));
+		if (!$oDB->isIndexExists("documents", "idx_module_notice")) $oDB->addIndex("documents", "idx_module_notice", array("module_srl", "is_notice"));
 
 		// 2007. 12. 03: Add if the colume(extra_vars) doesn't exist
-		if(!$oDB->isColumnExists("documents","extra_vars")) $oDB->addColumn('documents','extra_vars','text');
+		if (!$oDB->isColumnExists("documents", "extra_vars")) $oDB->addColumn('documents', 'extra_vars', 'text');
 
 		// 2008. 02. 18 create a composite index on the columns(module_srl + document_srl) (checked by Manian))
-		if(!$oDB->isIndexExists("documents","idx_module_document_srl")) $oDB->addIndex("documents","idx_module_document_srl", array("module_srl","document_srl"));
+		if (!$oDB->isIndexExists("documents", "idx_module_document_srl")) $oDB->addIndex("documents", "idx_module_document_srl", array("module_srl", "document_srl"));
 		// 2008. 04. 23 Add a column(blamed count)
-		if(!$oDB->isColumnExists("documents", "blamed_count"))
+		if (!$oDB->isColumnExists("documents", "blamed_count"))
 		{
 			$oDB->addColumn('documents', 'blamed_count', 'number', 11, 0, true);
 			$oDB->addIndex('documents', 'idx_blamed_count', array('blamed_count'));
 		}
 
-		if(!$oDB->isIndexExists("documents","idx_module_blamed_count"))
+		if (!$oDB->isIndexExists("documents", "idx_module_blamed_count"))
 		{
 			$oDB->addIndex('documents', 'idx_module_blamed_count', array('module_srl', 'blamed_count'));
 		}
 
-		if(!$oDB->isColumnExists("document_voted_log", "point"))
+		if (!$oDB->isColumnExists("document_voted_log", "point"))
 			$oDB->addColumn('document_voted_log', 'point', 'number', 11, 0, true);
 
 
-		if(!$oDB->isColumnExists("document_categories","color")) $oDB->addColumn('document_categories',"color","char",7);
+		if (!$oDB->isColumnExists("document_categories", "color")) $oDB->addColumn('document_categories', "color", "char", 7);
 
 		// 2009. 01. 29: Add a column(lang_code) if not exist in the document_extra_vars table
-		if(!$oDB->isColumnExists("document_extra_vars","lang_code")) $oDB->addColumn('document_extra_vars',"lang_code","varchar",10);
+		if (!$oDB->isColumnExists("document_extra_vars", "lang_code")) $oDB->addColumn('document_extra_vars', "lang_code", "varchar", 10);
 
 		// 2009. 01. 29 Added a trigger for additional setup
-		if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before'))
+		if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before'))
 			$oModuleController->insertTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before');
 		// 2009. 03. 09 Add a column(lang_code) to the documnets table
-		if(!$oDB->isColumnExists("documents","lang_code"))
+		if (!$oDB->isColumnExists("documents", "lang_code"))
 		{
 			$db_info = Context::getDBInfo();
-			$oDB->addColumn('documents',"lang_code","varchar",10, $db_info->lang_code);
+			$oDB->addColumn('documents', "lang_code", "varchar", 10, $db_info->lang_code);
 			$obj->lang_code = $db_info->lang_type;
 			executeQuery('document.updateDocumentsLangCode', $obj);
 		}
 		// 2009. 03. 11 Check the index in the document_extra_vars table
-		if(!$oDB->isIndexExists("document_extra_vars", "unique_extra_vars"))
+		if (!$oDB->isIndexExists("document_extra_vars", "unique_extra_vars"))
 		{
-			$oDB->addIndex("document_extra_vars", "unique_extra_vars", array("module_srl","document_srl","var_idx","lang_code"), true);
+			$oDB->addIndex("document_extra_vars", "unique_extra_vars", array("module_srl", "document_srl", "var_idx", "lang_code"), true);
 		}
 
-		if($oDB->isIndexExists("document_extra_vars", "unique_module_vars"))
+		if ($oDB->isIndexExists("document_extra_vars", "unique_module_vars"))
 		{
 			$oDB->dropIndex("document_extra_vars", "unique_module_vars", true);
 		}
 
 		// 2009. 03. 19: Add a column(eid)
 		// 2009. 04. 12: Fixed the issue(#17922959) that changes another column values when adding eid column
-		if(!$oDB->isColumnExists("document_extra_keys","eid"))
+		if (!$oDB->isColumnExists("document_extra_keys", "eid"))
 		{
-			$oDB->addColumn("document_extra_keys","eid","varchar",40);
+			$oDB->addColumn("document_extra_keys", "eid", "varchar", 40);
 
 			$output = executeQuery('document.getGroupsExtraKeys', $obj);
-			if($output->toBool() && $output->data && count($output->data)) {
-				foreach($output->data as $extra_keys) {
+			if ($output->toBool() && $output->data && count($output->data)) {
+				foreach ($output->data as $extra_keys) {
 					$args->module_srl = $extra_keys->module_srl;
 					$args->var_idx = $extra_keys->idx;
 					$args->new_eid = "extra_vars".$extra_keys->idx;
@@ -243,14 +243,14 @@ 
 			}
 		}
 
-		if(!$oDB->isColumnExists("document_extra_vars","eid"))
+		if (!$oDB->isColumnExists("document_extra_vars", "eid"))
 		{
-			$oDB->addColumn("document_extra_vars","eid","varchar",40);
+			$oDB->addColumn("document_extra_vars", "eid", "varchar", 40);
 			$obj->var_idx = '-1,-2';
 			$output = executeQuery('document.getGroupsExtraVars', $obj);
-			if($output->toBool() && $output->data && count($output->data))
+			if ($output->toBool() && $output->data && count($output->data))
 			{
-				foreach($output->data as $extra_vars)
+				foreach ($output->data as $extra_vars)
 				{
 					$args->module_srl = $extra_vars->module_srl;
 					$args->var_idx = $extra_vars->idx;
@@ -261,16 +261,16 @@ 
 		}
 
 		// 2011. 03. 30 Cubrid index Check the index in the document_extra_vars table
-		if(!$oDB->isIndexExists("document_extra_vars", "idx_document_list_order"))
+		if (!$oDB->isIndexExists("document_extra_vars", "idx_document_list_order"))
 		{
-			$oDB->addIndex("document_extra_vars", "idx_document_list_order", array("document_srl","module_srl","var_idx"), false);
+			$oDB->addIndex("document_extra_vars", "idx_document_list_order", array("document_srl", "module_srl", "var_idx"), false);
 		}
 
 		//2011. 04. 07 adding description column to document categories
-		if(!$oDB->isColumnExists("document_categories","description")) $oDB->addColumn('document_categories',"description","varchar",200,0);
+		if (!$oDB->isColumnExists("document_categories", "description")) $oDB->addColumn('document_categories', "description", "varchar", 200, 0);
 
 		//2011. 05. 23 adding status column to document
-		if(!$oDB->isColumnExists('documents', 'status'))
+		if (!$oDB->isColumnExists('documents', 'status'))
 		{
 			$oDB->addColumn('documents', 'status', 'varchar', 20, 'PUBLIC');
 			$args->is_secret = 'Y';
@@ -278,11 +278,11 @@ 
 		}
 
 		// 2011. 09. 08 drop column document is_secret
-		if($oDB->isColumnExists('documents', 'status') && $oDB->isColumnExists('documents', 'is_secret'))
+		if ($oDB->isColumnExists('documents', 'status') && $oDB->isColumnExists('documents', 'is_secret'))
 			$oDB->dropColumn('documents', 'is_secret');
 
 		//2011. 06. 07 merge column, allow_comment and lock_comment
-		if($oDB->isColumnExists('documents', 'allow_comment') || $oDB->isColumnExists('documents', 'lock_comment'))
+		if ($oDB->isColumnExists('documents', 'allow_comment') || $oDB->isColumnExists('documents', 'lock_comment'))
 		{
 			$oDB->addColumn('documents', 'comment_status', 'varchar', 20, 'ALLOW');
 
@@ -304,28 +304,28 @@ 
 			$output = executeQuery('document.updateDocumentCommentStatus', $args);
 		}
 
-		if($oDB->isColumnExists('documents', 'allow_comment') && $oDB->isColumnExists('documents', 'comment_status'))
+		if ($oDB->isColumnExists('documents', 'allow_comment') && $oDB->isColumnExists('documents', 'comment_status'))
 			$oDB->dropColumn('documents', 'allow_comment');
 
-		if($oDB->isColumnExists('documents', 'lock_comment') && $oDB->isColumnExists('documents', 'comment_status'))
+		if ($oDB->isColumnExists('documents', 'lock_comment') && $oDB->isColumnExists('documents', 'comment_status'))
 			$oDB->dropColumn('documents', 'lock_comment');
 
-		if(!$oDB->isIndexExists("documents", "idx_module_status"))
-			$oDB->addIndex("documents", "idx_module_status", array("module_srl","status"));
+		if (!$oDB->isIndexExists("documents", "idx_module_status"))
+			$oDB->addIndex("documents", "idx_module_status", array("module_srl", "status"));
 
 		// 2012. 02. 27 Add a trigger to copy extra keys when the module is copied 
-		if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after'))
+		if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after'))
 		{
 			$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after');
 		}
 
 		// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-		if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModule', 'after'))
+		if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModule', 'after'))
 		{
 			$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModule', 'after');
 		}
 
-		return new Object(0,'success_updated');
+		return new Object(0, 'success_updated');
 	}
 
 	/**
@@ -334,7 +334,7 @@ 
 	 */
 	function recompileCache()
 	{
-		if(!is_dir('./files/cache/tmp'))
+		if (!is_dir('./files/cache/tmp'))
 		{
 			FileHandler::makeDir('./files/cache/tmp');
 		}
@@ -364,7 +364,7 @@ 
 	 */
 	function getConfigStatus($key)
 	{
-		if(array_key_exists(strtolower($key), $this->statusList)) return $this->statusList[$key];
+		if (array_key_exists(strtolower($key), $this->statusList)) return $this->statusList[$key];
 		else $this->getDefaultStatus();
 	}
 }

modules/comment/comment.class.php

Spacing +25 added lines, -25 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-require_once(_XE_PATH_ . 'modules/comment/comment.item.php');
+require_once(_XE_PATH_.'modules/comment/comment.item.php');
 
 /**
  * comment
@@ -36,7 +36,7 @@ 
 		// 2008. 02. 22 add comment setting when a new module added
 		$oModuleController->insertTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before');
 
-		if(!is_dir('./files/cache/tmp'))
+		if (!is_dir('./files/cache/tmp'))
 		{
 			FileHandler::makeDir('./files/cache/tmp');
 		}
@@ -53,55 +53,55 @@ 
 		$oDB = DB::getInstance();
 		$oModuleModel = getModel('module');
 		// 2007. 10. 17 add a trigger to delete comments together with posting deleted
-		if(!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after'))
+		if (!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after'))
 		{
 			return TRUE;
 		}
 		// 2007. 10. 17 add a trigger to delete all of comments together with module deleted
-		if(!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after'))
+		if (!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after'))
 		{
 			return TRUE;
 		}
 		// 2007. 10. 23 add a column for recommendation votes or notification of the comments
-		if(!$oDB->isColumnExists("comments", "voted_count"))
+		if (!$oDB->isColumnExists("comments", "voted_count"))
 		{
 			return TRUE;
 		}
-		if(!$oDB->isColumnExists("comments", "notify_message"))
+		if (!$oDB->isColumnExists("comments", "notify_message"))
 		{
 			return TRUE;
 		}
 		// 2008. 02. 22 add comment setting when a new module added
-		if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before'))
+		if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before'))
 		{
 			return TRUE;
 		}
 		// 2008. 05. 14 add a column for blamed count
-		if(!$oDB->isColumnExists("comments", "blamed_count"))
+		if (!$oDB->isColumnExists("comments", "blamed_count"))
 		{
 			return TRUE;
 		}
-		if(!$oDB->isColumnExists("comment_voted_log", "point"))
+		if (!$oDB->isColumnExists("comment_voted_log", "point"))
 		{
 			return TRUE;
 		}
 
-		if(!$oDB->isIndexExists("comments", "idx_module_list_order"))
+		if (!$oDB->isIndexExists("comments", "idx_module_list_order"))
 		{
 			return TRUE;
 		}
 		//2012. 02. 24 add comment published status column and index
-		if(!$oDB->isColumnExists("comments", "status"))
+		if (!$oDB->isColumnExists("comments", "status"))
 		{
 			return TRUE;
 		}
-		if(!$oDB->isIndexExists("comments", "idx_status"))
+		if (!$oDB->isIndexExists("comments", "idx_status"))
 		{
 			return TRUE;
 		}
 
 		// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-		if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after'))
+		if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after'))
 		{
 			return TRUE;
 		}
@@ -119,43 +119,43 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		// 2007. 10. 17 add a trigger to delete comments together with posting deleted
-		if(!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after'))
+		if (!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after'))
 		{
 			$oModuleController->insertTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after');
 		}
 		// 2007. 10. 17 add a trigger to delete all of comments together with module deleted
-		if(!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after'))
+		if (!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after'))
 		{
 			$oModuleController->insertTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after');
 		}
 		// 2007. 10. 23 add a column for recommendation votes or notification of the comments
-		if(!$oDB->isColumnExists("comments", "voted_count"))
+		if (!$oDB->isColumnExists("comments", "voted_count"))
 		{
 			$oDB->addColumn("comments", "voted_count", "number", "11");
 			$oDB->addIndex("comments", "idx_voted_count", array("voted_count"));
 		}
 
-		if(!$oDB->isColumnExists("comments", "notify_message"))
+		if (!$oDB->isColumnExists("comments", "notify_message"))
 		{
 			$oDB->addColumn("comments", "notify_message", "char", "1");
 		}
 		// 2008. 02. 22 add comment setting when a new module added
-		if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before'))
+		if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before'))
 		{
 			$oModuleController->insertTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before');
 		}
 		// 2008. 05. 14 add a column for blamed count
-		if(!$oDB->isColumnExists("comments", "blamed_count"))
+		if (!$oDB->isColumnExists("comments", "blamed_count"))
 		{
 			$oDB->addColumn('comments', 'blamed_count', 'number', 11, 0, TRUE);
 			$oDB->addIndex('comments', 'idx_blamed_count', array('blamed_count'));
 		}
-		if(!$oDB->isColumnExists("comment_voted_log", "point"))
+		if (!$oDB->isColumnExists("comment_voted_log", "point"))
 		{
 			$oDB->addColumn('comment_voted_log', 'point', 'number', 11, 0, TRUE);
 		}
 
-		if(!$oDB->isIndexExists("comments", "idx_module_list_order"))
+		if (!$oDB->isIndexExists("comments", "idx_module_list_order"))
 		{
 			$oDB->addIndex(
 					"comments", "idx_module_list_order", array("module_srl", "list_order"), TRUE
@@ -163,11 +163,11 @@ 
 		}
 
 		//2012. 02. 24 add comment published status column and index
-		if(!$oDB->isColumnExists("comments", "status"))
+		if (!$oDB->isColumnExists("comments", "status"))
 		{
 			$oDB->addColumn("comments", "status", "number", 1, 1, TRUE);
 		}
-		if(!$oDB->isIndexExists("comments", "idx_status"))
+		if (!$oDB->isIndexExists("comments", "idx_status"))
 		{
 			$oDB->addIndex(
 					"comments", "idx_status", array("status", "comment_srl", "module_srl", "document_srl"), TRUE
@@ -175,7 +175,7 @@ 
 		}
 
 		// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-		if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after'))
+		if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after'))
 		{
 			$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after');
 		}
@@ -189,7 +189,7 @@ 
 	 */
 	function recompileCache()
 	{
-		if(!is_dir('./files/cache/tmp'))
+		if (!is_dir('./files/cache/tmp'))
 		{
 			FileHandler::makeDir('./files/cache/tmp');
 		}

classes/file/FileHandler.class.php

Spacing +122 added lines, -122 removed lines

@@ -17,9 +17,9 @@ 
 	 */
 	function getRealPath($source)
 	{
-		if(strlen($source) >= 2 && substr_compare($source, './', 0, 2) === 0)
+		if (strlen($source) >= 2 && substr_compare($source, './', 0, 2) === 0)
 		{
-			return _XE_PATH_ . substr($source, 2);
+			return _XE_PATH_.substr($source, 2);
 		}
 
 		return $source;
@@ -40,7 +40,7 @@ 
 	{
 		$source_dir = self::getRealPath($source_dir);
 		$target_dir = self::getRealPath($target_dir);
-		if(!is_dir($source_dir))
+		if (!is_dir($source_dir))
 		{
 			return FALSE;
 		}
@@ -48,44 +48,44 @@ 
 		// generate when no target exists
 		self::makeDir($target_dir);
 
-		if(substr($source_dir, -1) != DIRECTORY_SEPARATOR)
+		if (substr($source_dir, -1) != DIRECTORY_SEPARATOR)
 		{
 			$source_dir .= DIRECTORY_SEPARATOR;
 		}
 
-		if(substr($target_dir, -1) != DIRECTORY_SEPARATOR)
+		if (substr($target_dir, -1) != DIRECTORY_SEPARATOR)
 		{
 			$target_dir .= DIRECTORY_SEPARATOR;
 		}
 
 		$oDir = dir($source_dir);
-		while($file = $oDir->read())
+		while ($file = $oDir->read())
 		{
-			if($file{0} == '.')
+			if ($file{0} == '.')
 			{
 				continue;
 			}
 
-			if($filter && preg_match($filter, $file))
+			if ($filter && preg_match($filter, $file))
 			{
 				continue;
 			}
 
-			if(is_dir($source_dir . $file))
+			if (is_dir($source_dir.$file))
 			{
-				self::copyDir($source_dir . $file, $target_dir . $file, $type);
+				self::copyDir($source_dir.$file, $target_dir.$file, $type);
 			}
 			else
 			{
-				if($type == 'force')
+				if ($type == 'force')
 				{
-					@unlink($target_dir . $file);
+					@unlink($target_dir.$file);
 				}
 				else
 				{
-					if(!file_exists($target_dir . $file))
+					if (!file_exists($target_dir.$file))
 					{
-						@copy($source_dir . $file, $target_dir . $file);
+						@copy($source_dir.$file, $target_dir.$file);
 					}
 				}
 			}
@@ -110,12 +110,12 @@ 
 
 		self::makeDir($target_dir);
 
-		if($force == 'Y')
+		if ($force == 'Y')
 		{
-			@unlink($target_dir . DIRECTORY_SEPARATOR . $target);
+			@unlink($target_dir.DIRECTORY_SEPARATOR.$target);
 		}
 
-		@copy($source, $target_dir . DIRECTORY_SEPARATOR . $target);
+		@copy($source, $target_dir.DIRECTORY_SEPARATOR.$target);
 	}
 
 	/**
@@ -126,7 +126,7 @@ 
 	 */
 	function readFile($filename)
 	{
-		if(($filename = self::exists($filename)) === FALSE || filesize($filename) < 1)
+		if (($filename = self::exists($filename)) === FALSE || filesize($filename) < 1)
 		{
 			return;
 		}
@@ -149,12 +149,12 @@ 
 		self::makeDir($pathinfo['dirname']);
 
 		$flags = 0;
-		if(strtolower($mode) == 'a')
+		if (strtolower($mode) == 'a')
 		{
 			$flags = FILE_APPEND;
 		}
 
-		@file_put_contents($filename, $buff, $flags|LOCK_EX);
+		@file_put_contents($filename, $buff, $flags | LOCK_EX);
 		@chmod($filename, 0644);
 	}
 
@@ -192,7 +192,7 @@ 
 	 */
 	function moveFile($source, $target)
 	{
-		if(($source = self::exists($source)) !== FALSE)
+		if (($source = self::exists($source)) !== FALSE)
 		{
 			self::removeFile($target);
 			return self::rename($source, $target);
@@ -230,35 +230,35 @@ 
 		$path = self::getRealPath($path);
 		$output = array();
 
-		if(substr($path, -1) != '/')
+		if (substr($path, -1) != '/')
 		{
 			$path .= '/';
 		}
 
-		if(!is_dir($path))
+		if (!is_dir($path))
 		{
 			return $output;
 		}
 
 		$files = scandir($path);
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
-			if($file{0} == '.' || ($filter && !preg_match($filter, $file)))
+			if ($file{0} == '.' || ($filter && !preg_match($filter, $file)))
 			{
 				continue;
 			}
 
-			if($to_lower)
+			if ($to_lower)
 			{
 				$file = strtolower($file);
 			}
 
-			if($filter)
+			if ($filter)
 			{
 				$file = preg_replace($filter, '$1', $file);
 			}
 
-			if($concat_prefix)
+			if ($concat_prefix)
 			{
 				$file = sprintf('%s%s', str_replace(_XE_PATH_, '', $path), $file);
 			}
@@ -279,12 +279,12 @@ 
 	 */
 	function makeDir($path_string)
 	{
-		if(self::exists($path_string) !== FALSE)
+		if (self::exists($path_string) !== FALSE)
 		{
 			return TRUE;
 		}
 
-		if(!ini_get('safe_mode'))
+		if (!ini_get('safe_mode'))
 		{
 			@mkdir($path_string, 0755, TRUE);
 			@chmod($path_string, 0755);
@@ -295,35 +295,35 @@ 
 			static $oFtp = NULL;
 
 			$ftp_info = Context::getFTPInfo();
-			if($oFtp == NULL)
+			if ($oFtp == NULL)
 			{
-				if(!Context::isFTPRegisted())
+				if (!Context::isFTPRegisted())
 				{
 					return;
 				}
 
-				require_once(_XE_PATH_ . 'libs/ftp.class.php');
+				require_once(_XE_PATH_.'libs/ftp.class.php');
 				$oFtp = new ftp();
-				if(!$ftp_info->ftp_host)
+				if (!$ftp_info->ftp_host)
 				{
 					$ftp_info->ftp_host = "127.0.0.1";
 				}
-				if(!$ftp_info->ftp_port)
+				if (!$ftp_info->ftp_port)
 				{
 					$ftp_info->ftp_port = 21;
 				}
-				if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
+				if (!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
 				{
 					return;
 				}
-				if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
+				if (!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 				{
 					$oFtp->ftp_quit();
 					return;
 				}
 			}
 
-			if(!($ftp_path = $ftp_info->ftp_root_path))
+			if (!($ftp_path = $ftp_info->ftp_root_path))
 			{
 				$ftp_path = DIRECTORY_SEPARATOR;
 			}
@@ -332,19 +332,19 @@ 
 			$path_list = explode(DIRECTORY_SEPARATOR, $path_string);
 
 			$path = _XE_PATH_;
-			for($i = 0, $c = count($path_list); $i < $c; $i++)
+			for ($i = 0, $c = count($path_list); $i < $c; $i++)
 			{
-				if(!$path_list[$i])
+				if (!$path_list[$i])
 				{
 					continue;
 				}
 
-				$path .= $path_list[$i] . DIRECTORY_SEPARATOR;
-				$ftp_path .= $path_list[$i] . DIRECTORY_SEPARATOR;
-				if(!is_dir($path))
+				$path .= $path_list[$i].DIRECTORY_SEPARATOR;
+				$ftp_path .= $path_list[$i].DIRECTORY_SEPARATOR;
+				if (!is_dir($path))
 				{
 					$oFtp->ftp_mkdir($ftp_path);
-					$oFtp->ftp_site("CHMOD 777 " . $ftp_path);
+					$oFtp->ftp_site("CHMOD 777 ".$ftp_path);
 				}
 			}
 		}
@@ -360,23 +360,23 @@ 
 	 */
 	function removeDir($path)
 	{
-		if(($path = self::isDir($path)) === FALSE)
+		if (($path = self::isDir($path)) === FALSE)
 		{
 			return;
 		}
 
-		if(self::isDir($path))
+		if (self::isDir($path))
 		{
 			$files = array_diff(scandir($path), array('..', '.'));
 
-			foreach($files as $file)
+			foreach ($files as $file)
 			{
-				if(($target = self::getRealPath($path . DIRECTORY_SEPARATOR . $file)) === FALSE)
+				if (($target = self::getRealPath($path.DIRECTORY_SEPARATOR.$file)) === FALSE)
 				{
 					continue;
 				}
 
-				if(is_dir($target))
+				if (is_dir($target))
 				{
 					self::removeDir($target);
 				}
@@ -401,22 +401,22 @@ 
 	 */
 	function removeBlankDir($path)
 	{
-		if(($path = self::isDir($path)) === FALSE)
+		if (($path = self::isDir($path)) === FALSE)
 		{
 			return;
 		}
 
 		$files = array_diff(scandir($path), array('..', '.'));
 
-		if(count($files) < 1)
+		if (count($files) < 1)
 		{
 			rmdir($path);
 			return;
 		}
 
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
-			if(($target = self::isDir($path . DIRECTORY_SEPARATOR . $file)) === FALSE)
+			if (($target = self::isDir($path.DIRECTORY_SEPARATOR.$file)) === FALSE)
 			{
 				continue;
 			}
@@ -435,23 +435,23 @@ 
 	 */
 	function removeFilesInDir($path)
 	{
-		if(($path = self::getRealPath($path)) === FALSE)
+		if (($path = self::getRealPath($path)) === FALSE)
 		{
 			return;
 		}
 
-		if(is_dir($path))
+		if (is_dir($path))
 		{
 			$files = array_diff(scandir($path), array('..', '.'));
 
-			foreach($files as $file)
+			foreach ($files as $file)
 			{
-				if(($target = self::getRealPath($path . DIRECTORY_SEPARATOR . $file)) === FALSE)
+				if (($target = self::getRealPath($path.DIRECTORY_SEPARATOR.$file)) === FALSE)
 				{
 					continue;
 				}
 
-				if(is_dir($target))
+				if (is_dir($target))
 				{
 					self::removeFilesInDir($target);
 				}
@@ -463,7 +463,7 @@ 
 		}
 		else
 		{
-			if(self::exists($path)) unlink($path);
+			if (self::exists($path)) unlink($path);
 		}
 
 	}
@@ -477,22 +477,22 @@ 
 	 */
 	function filesize($size)
 	{
-		if(!$size)
+		if (!$size)
 		{
 			return '0Byte';
 		}
 
-		if($size === 1)
+		if ($size === 1)
 		{
 			return '1Byte';
 		}
 
-		if($size < 1024)
+		if ($size < 1024)
 		{
-			return $size . 'Bytes';
+			return $size.'Bytes';
 		}
 
-		if($size >= 1024 && $size < 1024 * 1024)
+		if ($size >= 1024 && $size < 1024 * 1024)
 		{
 			return sprintf("%0.1fKB", $size / 1024);
 		}
@@ -517,7 +517,7 @@ 
 	 */
 	function getRemoteResource($url, $body = null, $timeout = 3, $method = 'GET', $content_type = null, $headers = array(), $cookies = array(), $post_data = array(), $request_config = array())
 	{
-		require_once(_XE_PATH_ . 'libs/idna_convert/idna_convert.class.php');
+		require_once(_XE_PATH_.'libs/idna_convert/idna_convert.class.php');
 		$IDN = new idna_convert(array('idn_version' => 2008));
 		$url = $IDN->encode($url);
 
@@ -527,7 +527,7 @@ 
 			require_once('HTTP/Request.php');
 
 			$parsed_url = parse_url(__PROXY_SERVER__);
-			if($parsed_url["host"])
+			if ($parsed_url["host"])
 			{
 				$oRequest = new HTTP_Request(__PROXY_SERVER__);
 				$oRequest->setMethod('POST');
@@ -537,49 +537,49 @@ 
 			{
 				$oRequest = new HTTP_Request($url);
 
-				if(count($request_config) && method_exists($oRequest, 'setConfig'))
+				if (count($request_config) && method_exists($oRequest, 'setConfig'))
 				{
-					foreach($request_config as $key=>$val)
+					foreach ($request_config as $key=>$val)
 					{
 						$oRequest->setConfig($key, $val);
 					}
 				}
 
-				if(count($headers) > 0)
+				if (count($headers) > 0)
 				{
-					foreach($headers as $key => $val)
+					foreach ($headers as $key => $val)
 					{
 						$oRequest->addHeader($key, $val);
 					}
 				}
-				if($cookies[$host])
+				if ($cookies[$host])
 				{
-					foreach($cookies[$host] as $key => $val)
+					foreach ($cookies[$host] as $key => $val)
 					{
 						$oRequest->addCookie($key, $val);
 					}
 				}
-				if(count($post_data) > 0)
+				if (count($post_data) > 0)
 				{
-					foreach($post_data as $key => $val)
+					foreach ($post_data as $key => $val)
 					{
 						$oRequest->addPostData($key, $val);
 					}
 				}
-				if(!$content_type)
+				if (!$content_type)
 					$oRequest->addHeader('Content-Type', 'text/html');
 				else
 					$oRequest->addHeader('Content-Type', $content_type);
 				$oRequest->setMethod($method);
-				if($body)
+				if ($body)
 					$oRequest->setBody($body);
 			}
 			
-			if(method_exists($oRequest, 'setConfig'))
+			if (method_exists($oRequest, 'setConfig'))
 			{
 				$oRequest->setConfig('timeout', $timeout);
 			}
-			elseif(property_exists($oRequest, '_timeout'))
+			elseif (property_exists($oRequest, '_timeout'))
 			{
 				$oRequest->_timeout = $timeout;
 			}
@@ -589,25 +589,25 @@ 
 			$code = $oRequest->getResponseCode();
 			$header = $oRequest->getResponseHeader();
 			$response = $oRequest->getResponseBody();
-			if($c = $oRequest->getResponseCookies())
+			if ($c = $oRequest->getResponseCookies())
 			{
-				foreach($c as $k => $v)
+				foreach ($c as $k => $v)
 				{
 					$cookies[$host][$v['name']] = $v['value'];
 				}
 			}
 
-			if($code > 300 && $code < 399 && $header['location'])
+			if ($code > 300 && $code < 399 && $header['location'])
 			{
 				return self::getRemoteResource($header['location'], $body, $timeout, $method, $content_type, $headers, $cookies, $post_data);
 			}
 
-			if($code != 200)
+			if ($code != 200)
 				return;
 
 			return $response;
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			return NULL;
 		}
@@ -627,7 +627,7 @@ 
 	 */
 	function getRemoteFile($url, $target_filename, $body = null, $timeout = 3, $method = 'GET', $content_type = null, $headers = array(), $cookies = array(), $post_data = array(), $request_config = array())
 	{
-		if(!($body = self::getRemoteResource($url, $body, $timeout, $method, $content_type, $headers,$cookies,$post_data,$request_config)))
+		if (!($body = self::getRemoteResource($url, $body, $timeout, $method, $content_type, $headers, $cookies, $post_data, $request_config)))
 		{
 			return FALSE;
 		}
@@ -646,7 +646,7 @@ 
 	function returnBytes($val)
 	{
 		$unit = strtoupper(substr($val, -1));
-		$val = (float)$val;
+		$val = (float) $val;
 
 		switch ($unit)
 		{
@@ -669,13 +669,13 @@ 
 		$K64 = 65536;
 		$TWEAKFACTOR = 2.0;
 		$channels = $imageInfo['channels'];
-		if(!$channels)
+		if (!$channels)
 		{
 			$channels = 6; //for png
 		}
-		$memoryNeeded = round(($imageInfo[0] * $imageInfo[1] * $imageInfo['bits'] * $channels / 8 + $K64 ) * $TWEAKFACTOR);
+		$memoryNeeded = round(($imageInfo[0] * $imageInfo[1] * $imageInfo['bits'] * $channels / 8 + $K64) * $TWEAKFACTOR);
 		$availableMemory = self::returnBytes(ini_get('memory_limit')) - memory_get_usage();
-		if($availableMemory < $memoryNeeded)
+		if ($availableMemory < $memoryNeeded)
 		{
 			return FALSE;
 		}
@@ -702,30 +702,30 @@ 
 		}
 
 		$target_file = self::getRealPath($target_file);
-		if(!$resize_width)
+		if (!$resize_width)
 		{
 			$resize_width = 100;
 		}
 
-		if(!$resize_height)
+		if (!$resize_height)
 		{
 			$resize_height = $resize_width;
 		}
 
 		// retrieve source image's information
 		$imageInfo = getimagesize($source_file);
-		if(!self::checkMemoryLoadImage($imageInfo))
+		if (!self::checkMemoryLoadImage($imageInfo))
 		{
 			return FALSE;
 		}
 
 		list($width, $height, $type, $attrs) = $imageInfo;
-		if($width < 1 || $height < 1)
+		if ($width < 1 || $height < 1)
 		{
 			return;
 		}
 
-		switch($type)
+		switch ($type)
 		{
 			case '1' :
 				$type = 'gif';
@@ -743,7 +743,7 @@ 
 				return;
 		}
 
-		if(!$target_type)
+		if (!$target_type)
 		{
 			$target_type = $type;
 		}
@@ -754,7 +754,7 @@ 
 		$height_per = ($resize_height > 0 && $height >= $resize_height) ? $resize_height / $height : 1;
 
 		$per = NULL;
-		if($thumbnail_type == 'ratio')
+		if ($thumbnail_type == 'ratio')
 		{
 			$per = ($width_per > $height_per) ? $height_per : $width_per;
 			$resize_width = $width * $per;
@@ -767,16 +767,16 @@ 
 
 		// create temporary image with target size
 		$thumb = NULL;
-		if(function_exists('imagecreateTRUEcolor'))
+		if (function_exists('imagecreateTRUEcolor'))
 		{
 			$thumb = imagecreateTRUEcolor($resize_width, $resize_height);
 		}
-		else if(function_exists('imagecreate'))
+		else if (function_exists('imagecreate'))
 		{
 			$thumb = imagecreate($resize_width, $resize_height);
 		}
 
-		if(!$thumb)
+		if (!$thumb)
 		{
 			return FALSE;
 		}
@@ -785,37 +785,37 @@ 
 
 		// create temporary image having original type
 		$source = NULL;
-		switch($type)
+		switch ($type)
 		{
 			case 'gif' :
-				if(function_exists('imagecreatefromgif'))
+				if (function_exists('imagecreatefromgif'))
 				{
 					$source = @imagecreatefromgif($source_file);
 				}
 				break;
 			case 'jpeg' :
 			case 'jpg' :
-				if(function_exists('imagecreatefromjpeg'))
+				if (function_exists('imagecreatefromjpeg'))
 				{
 					$source = @imagecreatefromjpeg($source_file);
 				}
 				break;
 			case 'png' :
-				if(function_exists('imagecreatefrompng'))
+				if (function_exists('imagecreatefrompng'))
 				{
 					$source = @imagecreatefrompng($source_file);
 				}
 				break;
 			case 'wbmp' :
 			case 'bmp' :
-				if(function_exists('imagecreatefromwbmp'))
+				if (function_exists('imagecreatefromwbmp'))
 				{
 					$source = @imagecreatefromwbmp($source_file);
 				}
 				break;
 		}
 
-		if(!$source)
+		if (!$source)
 		{
 			imagedestroy($thumb);
 			return FALSE;
@@ -827,13 +827,13 @@ 
 
 		$x = 0;
 		$y = 0;
-		if($thumbnail_type == 'crop')
+		if ($thumbnail_type == 'crop')
 		{
 			$x = (int) ($resize_width / 2 - $new_width / 2);
 			$y = (int) ($resize_height / 2 - $new_height / 2);
 		}
 
-		if(function_exists('imagecopyresampled'))
+		if (function_exists('imagecopyresampled'))
 		{
 			imagecopyresampled($thumb, $source, $x, $y, 0, 0, $new_width, $new_height, $width, $height);
 		}
@@ -847,30 +847,30 @@ 
 
 		// write into the file
 		$output = NULL;
-		switch($target_type)
+		switch ($target_type)
 		{
 			case 'gif' :
-				if(function_exists('imagegif'))
+				if (function_exists('imagegif'))
 				{
 					$output = imagegif($thumb, $target_file);
 				}
 				break;
 			case 'jpeg' :
 			case 'jpg' :
-				if(function_exists('imagejpeg'))
+				if (function_exists('imagejpeg'))
 				{
 					$output = imagejpeg($thumb, $target_file, 100);
 				}
 				break;
 			case 'png' :
-				if(function_exists('imagepng'))
+				if (function_exists('imagepng'))
 				{
 					$output = imagepng($thumb, $target_file, 9);
 				}
 				break;
 			case 'wbmp' :
 			case 'bmp' :
-				if(function_exists('imagewbmp'))
+				if (function_exists('imagewbmp'))
 				{
 					$output = imagewbmp($thumb, $target_file, 100);
 				}
@@ -880,7 +880,7 @@ 
 		imagedestroy($thumb);
 		imagedestroy($source);
 
-		if(!$output)
+		if (!$output)
 		{
 			return FALSE;
 		}
@@ -898,12 +898,12 @@ 
 	 */
 	function readIniFile($filename)
 	{
-		if(($filename = self::exists($filename)) === FALSE)
+		if (($filename = self::exists($filename)) === FALSE)
 		{
 			return FALSE;
 		}
 		$arr = parse_ini_file($filename, TRUE);
-		if(is_array($arr) && count($arr) > 0)
+		if (is_array($arr) && count($arr) > 0)
 		{
 			return $arr;
 		}
@@ -929,7 +929,7 @@ 
 	 */
 	function writeIniFile($filename, $arr)
 	{
-		if(!is_array($arr) || count($arr) == 0)
+		if (!is_array($arr) || count($arr) == 0)
 		{
 			return FALSE;
 		}
@@ -946,19 +946,19 @@ 
 	function _makeIniBuff($arr)
 	{
 		$return = array();
-		foreach($arr as $key => $val)
+		foreach ($arr as $key => $val)
 		{
 			// section
-			if(is_array($val))
+			if (is_array($val))
 			{
 				$return[] = sprintf("[%s]", $key);
-				foreach($val as $k => $v)
+				foreach ($val as $k => $v)
 				{
 					$return[] = sprintf("%s=\"%s\"", $k, $v);
 				}
 				// value
 			}
-			else if(is_object($val))
+			else if (is_object($val))
 			{
 				continue;
 			}
@@ -1033,15 +1033,15 @@ 
 	function isWritableDir($path)
 	{
 		$path = self::getRealPath($path);
-		if(is_dir($path)==FALSE)
+		if (is_dir($path) == FALSE)
 		{
 			return FALSE;
 		}
 
-		$checkFile = $path . '/_CheckWritableDir';
+		$checkFile = $path.'/_CheckWritableDir';
 
 		$fp = fopen($checkFile, 'w');
-		if(!is_resource($fp))
+		if (!is_resource($fp))
 		{
 			return FALSE;
 		}

modules/importer/importer.admin.controller.php

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 Object(-1, 'msg_invalid_xml_file');
+		if (!file_exists($index_file)) return new Object(-1, 'msg_invalid_xml_file');
 
-		switch($type)
+		switch ($type)
 		{
 			case 'ttxml' :
-				if(!$target_module) return new Object(-1,'msg_invalid_request');
+				if (!$target_module) return new Object(-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 Object(-1,'msg_invalid_request');
+				if (!$target_module) return new Object(-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 = null;
 			$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|swf|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|swf|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();

config/func.inc.php

Spacing +175 added lines, -175 removed lines

@@ -6,13 +6,13 @@ 
  *
  * @author NAVER (developers@xpressengine.com)
  */
-if(!defined('__XE__'))
+if (!defined('__XE__'))
 {
 	exit();
 }
 
 // define an empty function to avoid errors when iconv function doesn't exist
-if(!function_exists('iconv'))
+if (!function_exists('iconv'))
 {
 	eval('
 		function iconv($in_charset, $out_charset, $str)
@@ -220,7 +220,7 @@ 
 {
 	$oDB = DB::getInstance();
 	$output = $oDB->executeQuery($query_id, $args, $arg_columns);
-	if(!is_array($output->data) && count($output->data) > 0)
+	if (!is_array($output->data) && count($output->data) > 0)
 	{
 		$output->data = array($output->data);
 	}
@@ -250,7 +250,7 @@ 
 function setUserSequence($seq)
 {
 	$arr_seq = array();
-	if(isset($_SESSION['seq']))
+	if (isset($_SESSION['seq']))
 	{
 		$arr_seq = $_SESSION['seq'];
 	}
@@ -266,11 +266,11 @@ 
  */
 function checkUserSequence($seq)
 {
-	if(!isset($_SESSION['seq']))
+	if (!isset($_SESSION['seq']))
 	{
 		return false;
 	}
-	if(!in_array($seq, $_SESSION['seq']))
+	if (!in_array($seq, $_SESSION['seq']))
 	{
 		return false;
 	}
@@ -296,7 +296,7 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 
-	if($num_args)
+	if ($num_args)
 		$url = Context::getUrl($num_args, $args_list);
 	else
 		$url = Context::getRequestUri();
@@ -315,7 +315,7 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 
-	if($num_args)
+	if ($num_args)
 	{
 		$url = Context::getUrl($num_args, $args_list, NULL, FALSE);
 	}
@@ -338,7 +338,7 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 
-	if($num_args)
+	if ($num_args)
 	{
 		$url = Context::getUrl($num_args, $args_list, NULL, TRUE, TRUE);
 	}
@@ -360,16 +360,16 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 	$request_uri = Context::getRequestUri();
-	if(!$num_args)
+	if (!$num_args)
 	{
 		return $request_uri;
 	}
 
 	$url = Context::getUrl($num_args, $args_list);
-	if(strncasecmp('http', $url, 4) !== 0)
+	if (strncasecmp('http', $url, 4) !== 0)
 	{
 		preg_match('/^(http|https):\/\/([^\/]+)\//', $request_uri, $match);
-		return substr($match[0], 0, -1) . $url;
+		return substr($match[0], 0, -1).$url;
 	}
 	return $url;
 }
@@ -384,17 +384,17 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 	$request_uri = Context::getRequestUri();
-	if(!$num_args)
+	if (!$num_args)
 	{
 		return $request_uri;
 	}
 
 	$url = Context::getUrl($num_args, $args_list, NULL, FALSE);
-	if(strncasecmp('http', $url, 4) !== 0)
+	if (strncasecmp('http', $url, 4) !== 0)
 	{
 		preg_match('/^(http|https):\/\/([^\/]+)\//', $request_uri, $match);
 		$url = Context::getUrl($num_args, $args_list, NULL, FALSE);
-		return substr($match[0], 0, -1) . $url;
+		return substr($match[0], 0, -1).$url;
 	}
 	return $url;
 }
@@ -410,7 +410,7 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 
-	if(!$num_args)
+	if (!$num_args)
 	{
 		return Context::getRequestUri();
 	}
@@ -432,7 +432,7 @@ 
 	$num_args = func_num_args();
 	$args_list = func_get_args();
 
-	if(!$num_args)
+	if (!$num_args)
 	{
 		return Context::getRequestUri();
 	}
@@ -454,7 +454,7 @@ 
 	$args_list = func_get_args();
 
 	$request_uri = Context::getRequestUri();
-	if(!$num_args)
+	if (!$num_args)
 	{
 		return $request_uri;
 	}
@@ -463,10 +463,10 @@ 
 	$num_args = count($args_list);
 
 	$url = Context::getUrl($num_args, $args_list, $domain);
-	if(strncasecmp('http', $url, 4) !== 0)
+	if (strncasecmp('http', $url, 4) !== 0)
 	{
 		preg_match('/^(http|https):\/\/([^\/]+)\//', $request_uri, $match);
-		return substr($match[0], 0, -1) . $url;
+		return substr($match[0], 0, -1).$url;
 	}
 	return $url;
 }
@@ -479,7 +479,7 @@ 
 function getCurrentPageUrl()
 {
 	$protocol = $_SERVER['HTTPS'] == 'on' ? 'https://' : 'http://';
-	$url = $protocol . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+	$url = $protocol.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
 	return htmlspecialchars($url, ENT_COMPAT, 'UTF-8', FALSE);
 }
 
@@ -504,12 +504,12 @@ 
  */
 function cut_str($string, $cut_size = 0, $tail = '...')
 {
-	if($cut_size < 1 || !$string)
+	if ($cut_size < 1 || !$string)
 	{
 		return $string;
 	}
 
-	if($GLOBALS['use_mb_strimwidth'] || function_exists('mb_strimwidth'))
+	if ($GLOBALS['use_mb_strimwidth'] || function_exists('mb_strimwidth'))
 	{
 		$GLOBALS['use_mb_strimwidth'] = TRUE;
 		return mb_strimwidth($string, 0, $cut_size + 4, $tail, 'utf-8');
@@ -523,16 +523,16 @@ 
 	$char_count = 0;
 
 	$idx = 0;
-	while($idx < $string_length && $char_count < $cut_size && $char_width <= $max_width)
+	while ($idx < $string_length && $char_count < $cut_size && $char_width <= $max_width)
 	{
 		$c = ord(substr($string, $idx, 1));
 		$char_count++;
-		if($c < 128)
+		if ($c < 128)
 		{
 			$char_width += (int) $chars[$c - 32];
 			$idx++;
 		}
-		else if(191 < $c && $c < 224)
+		else if (191 < $c && $c < 224)
 		{
 			$char_width += $chars[4];
 			$idx += 2;
@@ -545,7 +545,7 @@ 
 	}
 
 	$output = substr($string, 0, $idx);
-	if(strlen($output) < $string_length)
+	if (strlen($output) < $string_length)
 	{
 		$output .= $tail;
 	}
@@ -561,7 +561,7 @@ 
 function zgap()
 {
 	$time_zone = $GLOBALS['_time_zone'];
-	if($time_zone < 0)
+	if ($time_zone < 0)
 	{
 		$to = -1;
 	}
@@ -574,7 +574,7 @@ 
 	$t_min = substr($time_zone, 3, 2) * $to;
 
 	$server_time_zone = date("O");
-	if($server_time_zone < 0)
+	if ($server_time_zone < 0)
 	{
 		$so = -1;
 	}
@@ -601,7 +601,7 @@ 
  */
 function ztime($str)
 {
-	if(!$str)
+	if (!$str)
 	{
 		return;
 	}
@@ -612,7 +612,7 @@ 
 	$year = (int) substr($str, 0, 4);
 	$month = (int) substr($str, 4, 2);
 	$day = (int) substr($str, 6, 2);
-	if(strlen($str) <= 8)
+	if (strlen($str) <= 8)
 	{
 		$gap = 0;
 	}
@@ -636,19 +636,19 @@ 
 	$gap = $_SERVER['REQUEST_TIME'] + zgap() - ztime($date);
 
 	$lang_time_gap = Context::getLang('time_gap');
-	if($gap < 60)
+	if ($gap < 60)
 	{
 		$buff = sprintf($lang_time_gap['min'], (int) ($gap / 60) + 1);
 	}
-	elseif($gap < 60 * 60)
+	elseif ($gap < 60 * 60)
 	{
 		$buff = sprintf($lang_time_gap['mins'], (int) ($gap / 60) + 1);
 	}
-	elseif($gap < 60 * 60 * 2)
+	elseif ($gap < 60 * 60 * 2)
 	{
 		$buff = sprintf($lang_time_gap['hour'], (int) ($gap / 60 / 60) + 1);
 	}
-	elseif($gap < 60 * 60 * 24)
+	elseif ($gap < 60 * 60 * 24)
 	{
 		$buff = sprintf($lang_time_gap['hours'], (int) ($gap / 60 / 60) + 1);
 	}
@@ -685,40 +685,40 @@ 
 function zdate($str, $format = 'Y-m-d H:i:s', $conversion = TRUE)
 {
 	// return null if no target time is specified
-	if(!$str)
+	if (!$str)
 	{
 		return;
 	}
 	// convert the date format according to the language
-	if($conversion == TRUE)
+	if ($conversion == TRUE)
 	{
-		switch(Context::getLangType())
+		switch (Context::getLangType())
 		{
 			case 'en' :
 			case 'es' :
-				if($format == 'Y-m-d')
+				if ($format == 'Y-m-d')
 				{
 					$format = 'M d, Y';
 				}
-				elseif($format == 'Y-m-d H:i:s')
+				elseif ($format == 'Y-m-d H:i:s')
 				{
 					$format = 'M d, Y H:i:s';
 				}
-				elseif($format == 'Y-m-d H:i')
+				elseif ($format == 'Y-m-d H:i')
 				{
 					$format = 'M d, Y H:i';
 				}
 				break;
 			case 'vi' :
-				if($format == 'Y-m-d')
+				if ($format == 'Y-m-d')
 				{
 					$format = 'd-m-Y';
 				}
-				elseif($format == 'Y-m-d H:i:s')
+				elseif ($format == 'Y-m-d H:i:s')
 				{
 					$format = 'H:i:s d-m-Y';
 				}
-				elseif($format == 'Y-m-d H:i')
+				elseif ($format == 'Y-m-d H:i')
 				{
 					$format = 'H:i d-m-Y';
 				}
@@ -727,7 +727,7 @@ 
 	}
 
 	// If year value is less than 1970, handle it separately.
-	if((int) substr($str, 0, 4) < 1970)
+	if ((int) substr($str, 0, 4) < 1970)
 	{
 		$hour = (int) substr($str, 8, 2);
 		$min = (int) substr($str, 10, 2);
@@ -777,9 +777,9 @@ 
 function getEncodeEmailAddress($email)
 {
 	$return = '';
-	for($i = 0, $c = strlen($email); $i < $c; $i++)
+	for ($i = 0, $c = strlen($email); $i < $c; $i++)
 	{
-		$return .= '&#' . (rand(0, 1) == 0 ? ord($email[$i]) : 'X' . dechex(ord($email[$i]))) . ';';
+		$return .= '&#'.(rand(0, 1) == 0 ? ord($email[$i]) : 'X'.dechex(ord($email[$i]))).';';
 	}
 	return $return;
 }
@@ -800,25 +800,25 @@ 
 	static $debug_file;
 	static $debug_file_exist;
 
-	if(!(__DEBUG__ & 1))
+	if (!(__DEBUG__ & 1))
 	{
 		return;
 	}
 
 	static $firephp;
 	$bt = debug_backtrace();
-	if(is_array($bt))
+	if (is_array($bt))
 	{
 		$bt_debug_print = array_shift($bt);
 		$bt_called_function = array_shift($bt);
 	}
 	$file_name = str_replace(_XE_PATH_, '', $bt_debug_print['file']);
 	$line_num = $bt_debug_print['line'];
-	$function = $bt_called_function['class'] . $bt_called_function['type'] . $bt_called_function['function'];
+	$function = $bt_called_function['class'].$bt_called_function['type'].$bt_called_function['function'];
 
-	if(__DEBUG_OUTPUT__ == 2 && version_compare(PHP_VERSION, '6.0.0') === -1)
+	if (__DEBUG_OUTPUT__ == 2 && version_compare(PHP_VERSION, '6.0.0') === -1)
 	{
-		if(!isset($firephp))
+		if (!isset($firephp))
 		{
 			$firephp = FirePHP::getInstance(TRUE);
 		}
@@ -827,16 +827,16 @@ 
 		$label = sprintf('[%s:%d] %s() (Memory usage: current=%s, peak=%s)', $file_name, $line_num, $function, FileHandler::filesize(memory_get_usage()), FileHandler::filesize(memory_get_peak_usage()));
 
 		// Check a FirePHP option
-		if($display_option === 'TABLE')
+		if ($display_option === 'TABLE')
 		{
 			$label = $display_option;
 		}
-		if($display_option === 'ERROR')
+		if ($display_option === 'ERROR')
 		{
 			$type = $display_option;
 		}
 		// Check if the IP specified by __DEBUG_PROTECT__ option is same as the access IP.
-		if(__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
+		if (__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 		{
 			$debug_output = 'The IP address is not allowed. Change the value of __DEBUG_PROTECT_IP__ into your IP address in config/config.user.inc.php or config/config.inc.php';
 			$label = NULL;
@@ -846,18 +846,18 @@ 
 	}
 	else
 	{
-		if(__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
+		if (__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR'])
 		{
 			return;
 		}
 
 		$print = array();
-		if($debug_file_exist === NULL) $print[] = '<?php exit() ?>';
+		if ($debug_file_exist === NULL) $print[] = '<?php exit() ?>';
 
-		if(!$debug_file) $debug_file =  _XE_PATH_ . 'files/' . $file;
-		if(!$debug_file_exist) $debug_file_exist = file_exists($debug_file);
+		if (!$debug_file) $debug_file = _XE_PATH_.'files/'.$file;
+		if (!$debug_file_exist) $debug_file_exist = file_exists($debug_file);
 
-		if($display_option === TRUE || $display_option === 'ERROR')
+		if ($display_option === TRUE || $display_option === 'ERROR')
 		{
 			$print[] = str_repeat('=', 80);
 		}
@@ -865,10 +865,10 @@ 
 		$print[] = sprintf("[%s %s:%d] %s() - mem(%s)", date('Y-m-d H:i:s'), $file_name, $line_num, $function, FileHandler::filesize(memory_get_usage()));
 
 		$type = gettype($debug_output);
-		if(!in_array($type, array('array', 'object', 'resource')))
+		if (!in_array($type, array('array', 'object', 'resource')))
 		{
-			if($display_option === 'ERROR') $print[] = 'ERROR : ' . var_export($debug_output, TRUE);
-			else $print[] = $type . '(' . var_export($debug_output, TRUE) . ')';
+			if ($display_option === 'ERROR') $print[] = 'ERROR : '.var_export($debug_output, TRUE);
+			else $print[] = $type.'('.var_export($debug_output, TRUE).')';
 			$print[] = PHP_EOL.PHP_EOL;
 		}
 		else
@@ -877,7 +877,7 @@ 
 			$print[] = PHP_EOL;
 		}
 
-		@file_put_contents($debug_file, implode(PHP_EOL, $print), FILE_APPEND|LOCK_EX);
+		@file_put_contents($debug_file, implode(PHP_EOL, $print), FILE_APPEND | LOCK_EX);
 	}
 }
 
@@ -888,7 +888,7 @@ 
  */
 function writeSlowlog($type, $elapsed_time, $obj)
 {
-	if(!__LOG_SLOW_TRIGGER__ && !__LOG_SLOW_ADDON__ && !__LOG_SLOW_WIDGET__ && !__LOG_SLOW_QUERY__) return;
+	if (!__LOG_SLOW_TRIGGER__ && !__LOG_SLOW_ADDON__ && !__LOG_SLOW_WIDGET__ && !__LOG_SLOW_QUERY__) return;
 
 	static $log_filename = array(
 		'query' => 'files/_slowlog_query.php',
@@ -898,47 +898,47 @@ 
 	);
 	$write_file = true;
 
-	$log_file = _XE_PATH_ . $log_filename[$type];
+	$log_file = _XE_PATH_.$log_filename[$type];
 
 	$buff = array();
 	$buff[] = '<?php exit(); ?>';
 	$buff[] = date('c');
 
-	if($type == 'trigger' && __LOG_SLOW_TRIGGER__ > 0 && $elapsed_time > __LOG_SLOW_TRIGGER__)
+	if ($type == 'trigger' && __LOG_SLOW_TRIGGER__ > 0 && $elapsed_time > __LOG_SLOW_TRIGGER__)
 	{
-		$buff[] = "\tCaller : " . $obj->caller;
-		$buff[] = "\tCalled : " . $obj->called;
+		$buff[] = "\tCaller : ".$obj->caller;
+		$buff[] = "\tCalled : ".$obj->called;
 	}
-	else if($type == 'addon' && __LOG_SLOW_ADDON__ > 0 && $elapsed_time > __LOG_SLOW_ADDON__)
+	else if ($type == 'addon' && __LOG_SLOW_ADDON__ > 0 && $elapsed_time > __LOG_SLOW_ADDON__)
 	{
-		$buff[] = "\tAddon : " . $obj->called;
-		$buff[] = "\tCalled position : " . $obj->caller;
+		$buff[] = "\tAddon : ".$obj->called;
+		$buff[] = "\tCalled position : ".$obj->caller;
 	}
-	else if($type == 'widget' && __LOG_SLOW_WIDGET__ > 0 && $elapsed_time > __LOG_SLOW_WIDGET__)
+	else if ($type == 'widget' && __LOG_SLOW_WIDGET__ > 0 && $elapsed_time > __LOG_SLOW_WIDGET__)
 	{
-		$buff[] = "\tWidget : " . $obj->called;
+		$buff[] = "\tWidget : ".$obj->called;
 	}
-	else if($type == 'query' && __LOG_SLOW_QUERY__ > 0 && $elapsed_time > __LOG_SLOW_QUERY__)
+	else if ($type == 'query' && __LOG_SLOW_QUERY__ > 0 && $elapsed_time > __LOG_SLOW_QUERY__)
 	{
 
 		$buff[] = $obj->query;
-		$buff[] = "\tQuery ID   : " . $obj->query_id;
-		$buff[] = "\tCaller     : " . $obj->caller;
-		$buff[] = "\tConnection : " . $obj->connection;
+		$buff[] = "\tQuery ID   : ".$obj->query_id;
+		$buff[] = "\tCaller     : ".$obj->caller;
+		$buff[] = "\tConnection : ".$obj->connection;
 	}
 	else
 	{
 		$write_file = false;
 	}
 
-	if($write_file)
+	if ($write_file)
 	{
 		$buff[] = sprintf("\t%0.6f sec", $elapsed_time);
-		$buff[] = PHP_EOL . PHP_EOL;
+		$buff[] = PHP_EOL.PHP_EOL;
 		file_put_contents($log_file, implode(PHP_EOL, $buff), FILE_APPEND);
 	}
 
-	if($type != 'query')
+	if ($type != 'query')
 	{
 		$trigger_args = $obj;
 		$trigger_args->_log_type = $type;
@@ -978,11 +978,11 @@ 
  */
 function delObjectVars($target_obj, $del_obj)
 {
-	if(!is_object($target_obj))
+	if (!is_object($target_obj))
 	{
 		return;
 	}
-	if(!is_object($del_obj))
+	if (!is_object($del_obj))
 	{
 		return;
 	}
@@ -992,7 +992,7 @@ 
 
 	$target = array_keys($target_vars);
 	$del = array_keys($del_vars);
-	if(!count($target) || !count($del))
+	if (!count($target) || !count($del))
 	{
 		return $target_obj;
 	}
@@ -1000,10 +1000,10 @@ 
 	$return_obj = new stdClass();
 
 	$target_count = count($target);
-	for($i = 0; $i < $target_count; $i++)
+	for ($i = 0; $i < $target_count; $i++)
 	{
 		$target_key = $target[$i];
-		if(!in_array($target_key, $del))
+		if (!in_array($target_key, $del))
 		{
 			$return_obj->{$target_key} = $target_obj->{$target_key};
 		}
@@ -1016,10 +1016,10 @@ 
 {
 	$del_vars = array('error_return_url', 'success_return_url', 'ruleset', 'xe_validator_id');
 
-	foreach($del_vars as $var)
+	foreach ($del_vars as $var)
 	{
-		if(is_array($vars)) unset($vars[$var]);
-		else if(is_object($vars)) unset($vars->$var);
+		if (is_array($vars)) unset($vars[$var]);
+		else if (is_object($vars)) unset($vars->$var);
 	}
 
 	return $vars;
@@ -1036,12 +1036,12 @@ 
  */
 function handleError($errno, $errstr, $file, $line)
 {
-	if(!__DEBUG__)
+	if (!__DEBUG__)
 	{
 		return;
 	}
 	$errors = array(E_USER_ERROR, E_ERROR, E_PARSE);
-	if(!in_array($errno, $errors))
+	if (!in_array($errno, $errors))
 	{
 		return;
 	}
@@ -1061,8 +1061,8 @@ 
 function getNumberingPath($no, $size = 3)
 {
 	$mod = pow(10, $size);
-	$output = sprintf('%0' . $size . 'd/', $no % $mod);
-	if($no >= $mod)
+	$output = sprintf('%0'.$size.'d/', $no % $mod);
+	if ($no >= $mod)
 	{
 		$output .= getNumberingPath((int) $no / $mod, $size);
 	}
@@ -1082,7 +1082,7 @@ 
 
 function purifierHtml(&$content)
 {
-	require_once(_XE_PATH_ . 'classes/security/Purifier.class.php');
+	require_once(_XE_PATH_.'classes/security/Purifier.class.php');
 	$oPurifier = Purifier::getInstance();
 	$oPurifier->purify($content);
 }
@@ -1095,7 +1095,7 @@ 
  */
 function removeHackTag($content)
 {
-	require_once(_XE_PATH_ . 'classes/security/EmbedFilter.class.php');
+	require_once(_XE_PATH_.'classes/security/EmbedFilter.class.php');
 	$oEmbedFilter = EmbedFilter::getInstance();
 	$oEmbedFilter->check($content);
 
@@ -1137,7 +1137,7 @@ 
  */
 function checkUploadedFile($file)
 {
-	require_once(_XE_PATH_ . 'classes/security/UploadFileFilter.class.php');
+	require_once(_XE_PATH_.'classes/security/UploadFileFilter.class.php');
 	return UploadFileFilter::check($file);
 }
 
@@ -1151,13 +1151,13 @@ 
 {
 	$content = preg_replace('@<(/?)xmp.*?>@i', '<\1xmp>', $content);
 
-	if(($start_xmp = strrpos($content, '<xmp>')) !== FALSE)
+	if (($start_xmp = strrpos($content, '<xmp>')) !== FALSE)
 	{
-		if(($close_xmp = strrpos($content, '</xmp>')) === FALSE)
+		if (($close_xmp = strrpos($content, '</xmp>')) === FALSE)
 		{
 			$content .= '</xmp>';
 		}
-		else if($close_xmp < $start_xmp)
+		else if ($close_xmp < $start_xmp)
 		{
 			$content .= '</xmp>';
 		}
@@ -1177,33 +1177,33 @@ 
 	$tag = strtolower($match[2]);
 
 	// xmp tag ?뺣━
-	if($tag == 'xmp')
+	if ($tag == 'xmp')
 	{
 		return "<{$match[1]}xmp>";
 	}
-	if($match[1])
+	if ($match[1])
 	{
 		return $match[0];
 	}
-	if($match[4])
+	if ($match[4])
 	{
-		$match[4] = ' ' . $match[4];
+		$match[4] = ' '.$match[4];
 	}
 
 	$attrs = array();
-	if(preg_match_all('/([\w:-]+)\s*=(?:\s*(["\']))?(?(2)(.*?)\2|([^ ]+))/s', $match[3], $m))
+	if (preg_match_all('/([\w:-]+)\s*=(?:\s*(["\']))?(?(2)(.*?)\2|([^ ]+))/s', $match[3], $m))
 	{
-		foreach($m[1] as $idx => $name)
+		foreach ($m[1] as $idx => $name)
 		{
-			if(strlen($name) >= 2 && substr_compare($name, 'on', 0, 2) === 0)
+			if (strlen($name) >= 2 && substr_compare($name, 'on', 0, 2) === 0)
 			{
 				continue;
 			}
 
-			$val = preg_replace_callback('/&#(?:x([a-fA-F0-9]+)|0*(\d+));/', function($n) {return chr($n[1] ? ('0x00' . $n[1]) : ($n[2] + 0)); }, $m[3][$idx] . $m[4][$idx]);
+			$val = preg_replace_callback('/&#(?:x([a-fA-F0-9]+)|0*(\d+));/', function($n) {return chr($n[1] ? ('0x00'.$n[1]) : ($n[2] + 0)); }, $m[3][$idx].$m[4][$idx]);
 			$val = preg_replace('/^\s+|[\t\n\r]+/', '', $val);
 
-			if(preg_match('/^[a-z]+script:/i', $val))
+			if (preg_match('/^[a-z]+script:/i', $val))
 			{
 				continue;
 			}
@@ -1214,60 +1214,60 @@ 
 
 	$filter_arrts = array('style', 'src', 'href');
 
-	if($tag === 'object') array_push($filter_arrts, 'data');
-	if($tag === 'param') array_push($filter_arrts, 'value');
+	if ($tag === 'object') array_push($filter_arrts, 'data');
+	if ($tag === 'param') array_push($filter_arrts, 'value');
 
-	foreach($filter_arrts as $attr)
+	foreach ($filter_arrts as $attr)
 	{
-		if(!isset($attrs[$attr])) continue;
+		if (!isset($attrs[$attr])) continue;
 
 		$attr_value = rawurldecode($attrs[$attr]);
 		$attr_value = htmlspecialchars_decode($attr_value, ENT_COMPAT);
 		$attr_value = preg_replace('/\s+|[\t\n\r]+/', '', $attr_value);
-		if(preg_match('@(\?|&|;)(act=(\w+))@i', $attr_value, $m) && $m[3] !== 'procFileDownload')
+		if (preg_match('@(\?|&|;)(act=(\w+))@i', $attr_value, $m) && $m[3] !== 'procFileDownload')
 		{
 			unset($attrs[$attr]);
 		}
 	}
 
-	if(isset($attrs['style']) && preg_match('@(?:/\*|\*/|\n|:\s*expression\s*\()@i', $attrs['style']))
+	if (isset($attrs['style']) && preg_match('@(?:/\*|\*/|\n|:\s*expression\s*\()@i', $attrs['style']))
 	{
 		unset($attrs['style']);
 	}
 
 	$attr = array();
-	foreach($attrs as $name => $val)
+	foreach ($attrs as $name => $val)
 	{
-		if($tag == 'object' || $tag == 'embed' || $tag == 'a')
+		if ($tag == 'object' || $tag == 'embed' || $tag == 'a')
 		{
 			$attribute = strtolower(trim($name));
-			if($attribute == 'data' || $attribute == 'src' || $attribute == 'href')
+			if ($attribute == 'data' || $attribute == 'src' || $attribute == 'href')
 			{
-				if(stripos($val, 'data:') === 0)
+				if (stripos($val, 'data:') === 0)
 				{
 					continue;
 				}
 			}
 		}
 
-		if($tag == 'img')
+		if ($tag == 'img')
 		{
 			$attribute = strtolower(trim($name));
-			if(stripos($val, 'data:') === 0)
+			if (stripos($val, 'data:') === 0)
 			{
 				continue;
 			}
 		}
 		$val = str_replace('"', '&quot;', $val);
-		$attr[] = $name . "=\"{$val}\"";
+		$attr[] = $name."=\"{$val}\"";
 	}
-	$attr = count($attr) ? ' ' . implode(' ', $attr) : '';
+	$attr = count($attr) ? ' '.implode(' ', $attr) : '';
 
 	return "<{$match[1]}{$tag}{$attr}{$match[4]}>";
 }
 
 // convert hexa value to RGB
-if(!function_exists('hexrgb'))
+if (!function_exists('hexrgb'))
 {
 
 	/**
@@ -1303,9 +1303,9 @@ 
 
 	settype($password, "string");
 
-	for($i = 0; $i < strlen($password); $i++)
+	for ($i = 0; $i < strlen($password); $i++)
 	{
-		if($password[$i] == ' ' || $password[$i] == '\t')
+		if ($password[$i] == ' ' || $password[$i] == '\t')
 		{
 			continue;
 		}
@@ -1317,11 +1317,11 @@ 
 	$result1 = sprintf("%08lx", $nr & ((1 << 31) - 1));
 	$result2 = sprintf("%08lx", $nr2 & ((1 << 31) - 1));
 
-	if($result1 == '80000000')
+	if ($result1 == '80000000')
 	{
 		$nr += 0x80000000;
 	}
-	if($result2 == '80000000')
+	if ($result2 == '80000000')
 	{
 		$nr2 += 0x80000000;
 	}
@@ -1337,7 +1337,7 @@ 
 function getScriptPath()
 {
 	static $url = NULL;
-	if($url == NULL)
+	if ($url == NULL)
 	{
 		$url = str_ireplace('/tools/', '/', preg_replace('/index.php$/i', '', str_replace('\\', '/', $_SERVER['SCRIPT_NAME'])));
 	}
@@ -1367,14 +1367,14 @@ 
 	$decodedStr = '';
 	$pos = 0;
 	$len = strlen($source);
-	while($pos < $len)
+	while ($pos < $len)
 	{
 		$charAt = substr($source, $pos, 1);
-		if($charAt == '%')
+		if ($charAt == '%')
 		{
 			$pos++;
 			$charAt = substr($source, $pos, 1);
-			if($charAt == 'u')
+			if ($charAt == 'u')
 			{
 				// we got a unicode character
 				$pos++;
@@ -1408,21 +1408,21 @@ 
  */
 function _code2utf($num)
 {
-	if($num < 128)
+	if ($num < 128)
 	{
 		return chr($num);
 	}
-	if($num < 2048)
+	if ($num < 2048)
 	{
-		return chr(($num >> 6) + 192) . chr(($num & 63) + 128);
+		return chr(($num >> 6) + 192).chr(($num & 63) + 128);
 	}
-	if($num < 65536)
+	if ($num < 65536)
 	{
-		return chr(($num >> 12) + 224) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+		return chr(($num >> 12) + 224).chr((($num >> 6) & 63) + 128).chr(($num & 63) + 128);
 	}
-	if($num < 2097152)
+	if ($num < 2097152)
 	{
-		return chr(($num >> 18) + 240) . chr((($num >> 12) & 63) + 128) . chr((($num >> 6) & 63) + 128) . chr(($num & 63) + 128);
+		return chr(($num >> 18) + 240).chr((($num >> 12) & 63) + 128).chr((($num >> 6) & 63) + 128).chr(($num & 63) + 128);
 	}
 	return '';
 }
@@ -1437,7 +1437,7 @@ 
  */
 function detectUTF8($string, $return_convert = FALSE, $urldecode = TRUE)
 {
-	if($urldecode)
+	if ($urldecode)
 	{
 		$string = urldecode($string);
 	}
@@ -1445,12 +1445,12 @@ 
 	$sample = iconv('utf-8', 'utf-8', $string);
 	$is_utf8 = (md5($sample) === md5($string));
 
-	if(!$urldecode)
+	if (!$urldecode)
 	{
 		$string = urldecode($string);
 	}
 
-	if($return_convert)
+	if ($return_convert)
 	{
 		return ($is_utf8) ? $string : iconv('euc-kr', 'utf-8', $string);
 	}
@@ -1466,7 +1466,7 @@ 
  */
 function json_encode2($data)
 {
-	switch(gettype($data))
+	switch (gettype($data))
 	{
 		case 'boolean':
 			return $data ? 'true' : 'false';
@@ -1474,15 +1474,15 @@ 
 		case 'double':
 			return $data;
 		case 'string':
-			return '"' . strtr($data, array('\\' => '\\\\', '"' => '\\"')) . '"';
+			return '"'.strtr($data, array('\\' => '\\\\', '"' => '\\"')).'"';
 		case 'object':
 			$data = get_object_vars($data);
 		case 'array':
 			$rel = FALSE; // relative array?
 			$key = array_keys($data);
-			foreach($key as $v)
+			foreach ($key as $v)
 			{
-				if(!is_int($v))
+				if (!is_int($v))
 				{
 					$rel = TRUE;
 					break;
@@ -1490,12 +1490,12 @@ 
 			}
 
 			$arr = array();
-			foreach($data as $k => $v)
+			foreach ($data as $k => $v)
 			{
-				$arr[] = ($rel ? '"' . strtr($k, array('\\' => '\\\\', '"' => '\\"')) . '":' : '') . json_encode2($v);
+				$arr[] = ($rel ? '"'.strtr($k, array('\\' => '\\\\', '"' => '\\"')).'":' : '').json_encode2($v);
 			}
 
-			return $rel ? '{' . join(',', $arr) . '}' : '[' . join(',', $arr) . ']';
+			return $rel ? '{'.join(',', $arr).'}' : '['.join(',', $arr).']';
 		default:
 			return '""';
 	}
@@ -1509,7 +1509,7 @@ 
  */
 function isCrawler($agent = NULL)
 {
-	if(!$agent)
+	if (!$agent)
 	{
 		$agent = $_SERVER['HTTP_USER_AGENT'];
 	}
@@ -1519,9 +1519,9 @@ 
 		/*'211.245.21.110-211.245.21.119' mixsh is closed */
 	);
 
-	foreach($check_agent as $str)
+	foreach ($check_agent as $str)
 	{
-		if(stristr($agent, $str) != FALSE)
+		if (stristr($agent, $str) != FALSE)
 		{
 			return TRUE;
 		}
@@ -1539,7 +1539,7 @@ 
  */
 function stripEmbedTagForAdmin(&$content, $writer_member_srl)
 {
-	if(!Context::get('is_logged'))
+	if (!Context::get('is_logged'))
 	{
 		return;
 	}
@@ -1547,18 +1547,18 @@ 
 	$oModuleModel = getModel('module');
 	$logged_info = Context::get('logged_info');
 
-	if($writer_member_srl != $logged_info->member_srl && ($logged_info->is_admin == "Y" || $oModuleModel->isSiteAdmin($logged_info)))
+	if ($writer_member_srl != $logged_info->member_srl && ($logged_info->is_admin == "Y" || $oModuleModel->isSiteAdmin($logged_info)))
 	{
-		if($writer_member_srl)
+		if ($writer_member_srl)
 		{
 			$oMemberModel = getModel('member');
 			$member_info = $oMemberModel->getMemberInfoByMemberSrl($writer_member_srl);
-			if($member_info->is_admin == "Y")
+			if ($member_info->is_admin == "Y")
 			{
 				return;
 			}
 		}
-		$security_msg = "<div style='border: 1px solid #DDD; background: #FAFAFA; text-align:center; margin: 1em 0;'><p style='margin: 1em;'>" . Context::getLang('security_warning_embed') . "</p></div>";
+		$security_msg = "<div style='border: 1px solid #DDD; background: #FAFAFA; text-align:center; margin: 1em 0;'><p style='margin: 1em;'>".Context::getLang('security_warning_embed')."</p></div>";
 		$content = preg_replace('/<object[^>]+>(.*?<\/object>)?/is', $security_msg, $content);
 		$content = preg_replace('/<embed[^>]+>(\s*<\/embed>)?/is', $security_msg, $content);
 		$content = preg_replace('/<img[^>]+editor_component="multimedia_link"[^>]*>(\s*<\/img>)?/is', $security_msg, $content);
@@ -1574,19 +1574,19 @@ 
  */
 function requirePear()
 {
-	if(version_compare(PHP_VERSION, "5.3.0") < 0)
+	if (version_compare(PHP_VERSION, "5.3.0") < 0)
 	{
-		set_include_path(_XE_PATH_ . "libs/PEAR" . PATH_SEPARATOR . get_include_path());
+		set_include_path(_XE_PATH_."libs/PEAR".PATH_SEPARATOR.get_include_path());
 	}
 	else
 	{
-		set_include_path(_XE_PATH_ . "libs/PEAR.1.9.5" . PATH_SEPARATOR . get_include_path());
+		set_include_path(_XE_PATH_."libs/PEAR.1.9.5".PATH_SEPARATOR.get_include_path());
 	}
 }
 
 function checkCSRF()
 {
-	if($_SERVER['REQUEST_METHOD'] != 'POST')
+	if ($_SERVER['REQUEST_METHOD'] != 'POST')
 	{
 		return FALSE;
 	}
@@ -1594,9 +1594,9 @@ 
 	$default_url = Context::getDefaultUrl();
 	$referer = $_SERVER["HTTP_REFERER"];
 
-	if(strpos($default_url, 'xn--') !== FALSE && strpos($referer, 'xn--') === FALSE)
+	if (strpos($default_url, 'xn--') !== FALSE && strpos($referer, 'xn--') === FALSE)
 	{
-		require_once(_XE_PATH_ . 'libs/idna_convert/idna_convert.class.php');
+		require_once(_XE_PATH_.'libs/idna_convert/idna_convert.class.php');
 		$IDN = new idna_convert(array('idn_version' => 2008));
 		$referer = $IDN->encode($referer);
 	}
@@ -1607,9 +1607,9 @@ 
 	$oModuleModel = getModel('module');
 	$siteModuleInfo = $oModuleModel->getDefaultMid();
 
-	if($siteModuleInfo->site_srl == 0)
+	if ($siteModuleInfo->site_srl == 0)
 	{
-		if($default_url['host'] !== $referer['host'])
+		if ($default_url['host'] !== $referer['host'])
 		{
 			return FALSE;
 		}
@@ -1617,7 +1617,7 @@ 
 	else
 	{
 		$virtualSiteInfo = $oModuleModel->getSiteInfo($siteModuleInfo->site_srl);
-		if(strtolower($virtualSiteInfo->domain) != strtolower(Context::get('vid')) && !strstr(strtolower($virtualSiteInfo->domain), strtolower($referer['host'])))
+		if (strtolower($virtualSiteInfo->domain) != strtolower(Context::get('vid')) && !strstr(strtolower($virtualSiteInfo->domain), strtolower($referer['host'])))
 		{
 			return FALSE;
 		}
@@ -1633,15 +1633,15 @@ 
  */
 function recurciveExposureCheck(&$menu)
 {
-	if(is_array($menu))
+	if (is_array($menu))
 	{
-		foreach($menu AS $key=>$value)
+		foreach ($menu AS $key=>$value)
 		{
-			if(!$value['isShow'])
+			if (!$value['isShow'])
 			{
 				unset($menu[$key]);
 			}
-			if(is_array($value['list']) && count($value['list']) > 0)
+			if (is_array($value['list']) && count($value['list']) > 0)
 			{
 				recurciveExposureCheck($menu[$key]['list']);
 			}
@@ -1651,14 +1651,14 @@ 
 
 function changeValueInUrl($key, $requestKey, $dbKey, $urlName = 'success_return_url')
 {
-	if($requestKey != $dbKey)
+	if ($requestKey != $dbKey)
 	{
 		$arrayUrl = parse_url(Context::get('success_return_url'));
-		if($arrayUrl['query'])
+		if ($arrayUrl['query'])
 		{
 			parse_str($arrayUrl['query'], $parsedStr);
 
-			if(isset($parsedStr[$key]))
+			if (isset($parsedStr[$key]))
 			{
 				$parsedStr[$key] = $requestKey;
 				$successReturnUrl .= $arrayUrl['path'].'?'.http_build_query($parsedStr);
@@ -1701,14 +1701,14 @@ 
  */
 function alertScript($msg)
 {
-	if(!$msg)
+	if (!$msg)
 	{
 		return;
 	}
 
 	echo '<script type="text/javascript">
 //<![CDATA[
-alert("' . $msg . '");
+alert("' . $msg.'");
 //]]>
 </script>';
 }
@@ -1739,7 +1739,7 @@ 
 
 	echo '<script type="text/javascript">
 //<![CDATA[
-' . $reloadScript . '
+' . $reloadScript.'
 //]]>
 </script>';
 }

modules/document/document.item.php

Spacing +180 added lines, -180 removed lines

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

Braces +276 added lines, -113 removed lines

@@ -74,7 +74,9 @@ 
 	 */
 	function _loadFromDB($load_extra_vars = true)
 	{
-		if(!$this->document_srl) return;
+		if(!$this->document_srl) {
+			return;
+		}
 
 		$document_item = false;
 		$cache_put = false;
@@ -106,8 +108,7 @@ 
 			{
 				$oCacheHandler->put($cache_key, $document_item);
 			}
-		}
-		else
+		} else
 		{
 			$document_item->readed_count = $output->data->readed_count;
 			$document_item->voted_count = $output->data->voted_count;
@@ -154,18 +155,28 @@ 
 
 	function isGranted()
 	{
-		if($_SESSION['own_document'][$this->document_srl]) return true;
+		if($_SESSION['own_document'][$this->document_srl]) {
+			return true;
+		}
 
-		if(!Context::get('is_logged')) return false;
+		if(!Context::get('is_logged')) {
+			return false;
+		}
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin == 'Y') return true;
+		if($logged_info->is_admin == 'Y') {
+			return true;
+		}
 
 		$oModuleModel = getModel('module');
 		$grant = $oModuleModel->getGrant($oModuleModel->getModuleInfoByModuleSrl($this->get('module_srl')), $logged_info);
-		if($grant->manager) return true;
+		if($grant->manager) {
+			return true;
+		}
 
-		if($this->get('member_srl') && ($this->get('member_srl') == $logged_info->member_srl || $this->get('member_srl')*-1 == $logged_info->member_srl)) return true;
+		if($this->get('member_srl') && ($this->get('member_srl') == $logged_info->member_srl || $this->get('member_srl')*-1 == $logged_info->member_srl)) {
+			return true;
+		}
 
 		return false;
 	}
@@ -183,7 +194,9 @@ 
 	function allowComment()
 	{
 		// init write, document is not exists. so allow comment status is true
-		if(!$this->isExists()) return true;
+		if(!$this->isExists()) {
+			return true;
+		}
 
 		return $this->get('comment_status') == 'ALLOW' ? true : false;
 	}
@@ -198,8 +211,7 @@ 
 			if(!getClass('trackback'))
 			{
 				$allow_trackback_status = false;
-			}
-			else
+			} else
 			{
 				// If the trackback module is configured to be disabled, do not allow. Otherwise, check the setting of each module.
 				$oModuleModel = getModel('module');
@@ -210,15 +222,21 @@ 
 					$trackback_config = new stdClass();
 				}
 				
-				if(!isset($trackback_config->enable_trackback)) $trackback_config->enable_trackback = 'Y';
-				if($trackback_config->enable_trackback != 'Y') $allow_trackback_status = false;
-				else
+				if(!isset($trackback_config->enable_trackback)) {
+					$trackback_config->enable_trackback = 'Y';
+				}
+				if($trackback_config->enable_trackback != 'Y') {
+					$allow_trackback_status = false;
+				} else
 				{
 					$module_srl = $this->get('module_srl');
 					// Check settings of each module
 					$module_config = $oModuleModel->getModulePartConfig('trackback', $module_srl);
-					if($module_config->enable_trackback == 'N') $allow_trackback_status = false;
-					else if($this->get('allow_trackback')=='Y' || !$this->isExists()) $allow_trackback_status = true;
+					if($module_config->enable_trackback == 'N') {
+						$allow_trackback_status = false;
+					} else if($this->get('allow_trackback')=='Y' || !$this->isExists()) {
+						$allow_trackback_status = true;
+					}
 				}
 			}
 		}
@@ -227,14 +245,18 @@ 
 
 	function isLocked()
 	{
-		if(!$this->isExists()) return false;
+		if(!$this->isExists()) {
+			return false;
+		}
 
 		return $this->get('comment_status') == 'ALLOW' ? false : true;
 	}
 
 	function isEditable()
 	{
-		if($this->isGranted() || !$this->get('member_srl')) return true;
+		if($this->isGranted() || !$this->get('member_srl')) {
+			return true;
+		}
 		return false;
 	}
 
@@ -256,9 +278,14 @@ 
 
 	function doCart()
 	{
-		if(!$this->document_srl) return false;
-		if($this->isCarted()) $this->removeCart();
-		else $this->addCart();
+		if(!$this->document_srl) {
+			return false;
+		}
+		if($this->isCarted()) {
+			$this->removeCart();
+		} else {
+			$this->addCart();
+		}
 	}
 
 	function addCart()
@@ -284,16 +311,26 @@ 
 	 */
 	function notify($type, $content)
 	{
-		if(!$this->document_srl) return;
+		if(!$this->document_srl) {
+			return;
+		}
 		// return if it is not useNotify
-		if(!$this->useNotify()) return;
+		if(!$this->useNotify()) {
+			return;
+		}
 		// Pass if an author is not a logged-in user
-		if(!$this->get('member_srl')) return;
+		if(!$this->get('member_srl')) {
+			return;
+		}
 		// Return if the currently logged-in user is an author
 		$logged_info = Context::get('logged_info');
-		if($logged_info->member_srl == $this->get('member_srl')) return;
+		if($logged_info->member_srl == $this->get('member_srl')) {
+			return;
+		}
 		// List variables
-		if($type) $title = "[".$type."] ";
+		if($type) {
+			$title = "[".$type."] ";
+		}
 		$title .= cut_str(strip_tags($content), 10, '...');
 		$content = sprintf('%s<br /><br />from : <a href="%s" target="_blank">%s</a>',$content, getFullUrl('','document_srl',$this->document_srl), getFullUrl('','document_srl',$this->document_srl));
 		$receiver_srl = $this->get('member_srl');
@@ -320,16 +357,22 @@ 
 
 	function isExistsHomepage()
 	{
-		if(trim($this->get('homepage'))) return true;
+		if(trim($this->get('homepage'))) {
+			return true;
+		}
 		return false;
 	}
 
 	function getHomepageUrl()
 	{
 		$url = trim($this->get('homepage'));
-		if(!$url) return;
+		if(!$url) {
+			return;
+		}
 
-		if(strncasecmp('http://', $url, 7) !== 0 && strncasecmp('https://', $url, 8) !== 0)  $url = 'http://' . $url;
+		if(strncasecmp('http://', $url, 7) !== 0 && strncasecmp('https://', $url, 8) !== 0) {
+			$url = 'http://' . $url;
+		}
 
 		return $url;
 	}
@@ -361,43 +404,65 @@ 
 
 	function getTitleText($cut_size = 0, $tail='...')
 	{
-		if(!$this->document_srl) return;
+		if(!$this->document_srl) {
+			return;
+		}
 
-		if($cut_size) $title = cut_str($this->get('title'), $cut_size, $tail);
-		else $title = $this->get('title');
+		if($cut_size) {
+			$title = cut_str($this->get('title'), $cut_size, $tail);
+		} else {
+			$title = $this->get('title');
+		}
 
 		return $title;
 	}
 
 	function getTitle($cut_size = 0, $tail='...')
 	{
-		if(!$this->document_srl) return;
+		if(!$this->document_srl) {
+			return;
+		}
 
 		$title = $this->getTitleText($cut_size, $tail);
 
 		$attrs = array();
 		$this->add('title_color', trim($this->get('title_color')));
-		if($this->get('title_bold')=='Y') $attrs[] = "font-weight:bold;";
-		if($this->get('title_color') && $this->get('title_color') != 'N') $attrs[] = "color:#".$this->get('title_color');
+		if($this->get('title_bold')=='Y') {
+			$attrs[] = "font-weight:bold;";
+		}
+		if($this->get('title_color') && $this->get('title_color') != 'N') {
+			$attrs[] = "color:#".$this->get('title_color');
+		}
 
-		if(count($attrs)) return sprintf("<span style=\"%s\">%s</span>", implode(';',$attrs), htmlspecialchars($title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
-		else return htmlspecialchars($title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
+		if(count($attrs)) {
+			return sprintf("<span style=\"%s\">%s</span>", implode(';',$attrs), htmlspecialchars($title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
+		} else {
+			return htmlspecialchars($title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
+		}
 	}
 
 	function getContentText($strlen = 0)
 	{
-		if(!$this->document_srl) return;
+		if(!$this->document_srl) {
+			return;
+		}
 
-		if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return Context::getLang('msg_is_secret');
+		if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) {
+			return Context::getLang('msg_is_secret');
+		}
 
 		$result = $this->_checkAccessibleFromStatus();
-		if($result) $_SESSION['accessible'][$this->document_srl] = true;
+		if($result) {
+			$_SESSION['accessible'][$this->document_srl] = true;
+		}
 
 		$content = $this->get('content');
 		$content = preg_replace_callback('/<(object|param|embed)[^>]*/is', array($this, '_checkAllowScriptAccess'), $content);
 		$content = preg_replace_callback('/<object[^>]*>/is', array($this, '_addAllowScriptAccess'), $content);
 
-		if($strlen) return cut_str(strip_tags($content),$strlen,'...');
+		if($strlen) {
+			return cut_str(strip_tags($content),$strlen,'...');
+		}
 
 		return htmlspecialchars($content);
 	}
@@ -430,14 +495,12 @@ 
 				}
 				$this->allowscriptaccessList[count($this->allowscriptaccessList)-1]--;
 			}
-		}
-		else if($m[1] == 'embed')
+		} else if($m[1] == 'embed')
 		{
 			if(stripos($m[0], 'allowscriptaccess'))
 			{
 				$m[0] = preg_replace('/always|samedomain/i', 'never', $m[0]);
-			}
-			else
+			} else
 			{
 				$m[0] = preg_replace('/\<embed/i', '<embed allowscriptaccess="never"', $m[0]);
 			}
@@ -447,15 +510,23 @@ 
 
 	function getContent($add_popup_menu = true, $add_content_info = true, $resource_realpath = false, $add_xe_content_class = true, $stripEmbedTagException = false)
 	{
-		if(!$this->document_srl) return;
+		if(!$this->document_srl) {
+			return;
+		}
 
-		if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return Context::getLang('msg_is_secret');
+		if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) {
+			return Context::getLang('msg_is_secret');
+		}
 
 		$result = $this->_checkAccessibleFromStatus();
-		if($result) $_SESSION['accessible'][$this->document_srl] = true;
+		if($result) {
+			$_SESSION['accessible'][$this->document_srl] = true;
+		}
 
 		$content = $this->get('content');
-		if(!$stripEmbedTagException) stripEmbedTagForAdmin($content, $this->get('member_srl'));
+		if(!$stripEmbedTagException) {
+			stripEmbedTagForAdmin($content, $this->get('member_srl'));
+		}
 
 		// Define a link if using a rewrite module
 		$oContext = &Context::getInstance();
@@ -489,10 +560,11 @@ 
 				$this->document_srl, $memberSrl
 			);
 			// Add xe_content class although accessing content is not required
-		}
-		else
+		} else
 		{
-			if($add_xe_content_class) $content = sprintf('<div class="xe_content">%s</div>', $content);
+			if($add_xe_content_class) {
+				$content = sprintf('<div class="xe_content">%s</div>', $content);
+			}
 		}
 		// Change the image path to a valid absolute path if resource_realpath is true
 		if($resource_realpath)
@@ -611,11 +683,15 @@ 
 
 	function getTrackbackUrl()
 	{
-		if(!$this->document_srl) return;
+		if(!$this->document_srl) {
+			return;
+		}
 
 		// Generate a key to prevent spams
 		$oTrackbackModel = getModel('trackback');
-		if($oTrackbackModel) return $oTrackbackModel->getTrackbackUrl($this->document_srl, $this->getDocumentMid());
+		if($oTrackbackModel) {
+			return $oTrackbackModel->getTrackbackUrl($this->document_srl, $this->getDocumentMid());
+		}
 	}
 
 	/**
@@ -634,7 +710,9 @@ 
 
 	function isExtraVarsExists()
 	{
-		if(!$this->get('module_srl')) return false;
+		if(!$this->get('module_srl')) {
+			return false;
+		}
 		$oDocumentModel = getModel('document');
 		$extra_keys = $oDocumentModel->getExtraKeys($this->get('module_srl'));
 		return count($extra_keys)?true:false;
@@ -642,7 +720,9 @@ 
 
 	function getExtraVars()
 	{
-		if(!$this->get('module_srl') || !$this->document_srl) return null;
+		if(!$this->get('module_srl') || !$this->document_srl) {
+			return null;
+		}
 
 		$oDocumentModel = getModel('document');
 		return $oDocumentModel->getExtraVars($this->get('module_srl'), $this->document_srl);
@@ -654,8 +734,7 @@ 
 		if(is_array($extra_vars) && array_key_exists($idx,$extra_vars))
 		{
 			return $extra_vars[$idx]->getValue();
-		}
-		else
+		} else
 		{
 			return '';
 		}
@@ -667,8 +746,7 @@ 
 		if(is_array($extra_vars) && array_key_exists($idx,$extra_vars))
 		{
 			return $extra_vars[$idx]->getValueHTML();
-		}
-		else
+		} else
 		{
 			return '';
 		}
@@ -690,8 +768,7 @@ 
 		if(is_array($extra_eid) && array_key_exists($eid,$extra_eid))
 		{
 			return $extra_eid[$eid]->getValue();
-		}
-		else
+		} else
 		{
 			return '';
 		}
@@ -709,8 +786,7 @@ 
 		if(is_array($extra_eid) && array_key_exists($eid,$extra_eid))
 		{
 			return $extra_eid[$eid]->getValueHTML();
-		}
-		else
+		} else
 		{
 			return '';
 		}
@@ -730,8 +806,12 @@ 
 
 	function getComments()
 	{
-		if(!$this->getCommentCount()) return;
-		if(!$this->isGranted() && $this->isSecret()) return;
+		if(!$this->getCommentCount()) {
+			return;
+		}
+		if(!$this->isGranted() && $this->isSecret()) {
+			return;
+		}
 		// cpage is a number of comment pages
 		$cpageStr = sprintf('%d_cpage', $this->document_srl);
 		$cpage = Context::get($cpageStr);
@@ -744,7 +824,9 @@ 
 		// Get a list of comments
 		$oCommentModel = getModel('comment');
 		$output = $oCommentModel->getCommentList($this->document_srl, $cpage, $is_admin);
-		if(!$output->toBool() || !count($output->data)) return;
+		if(!$output->toBool() || !count($output->data)) {
+			return;
+		}
 		// Create commentItem object from a comment list
 		// If admin priviledge is granted on parent posts, you can read its child posts.
 		$accessible = array();
@@ -754,7 +836,9 @@ 
 			$oCommentItem = new commentItem();
 			$oCommentItem->setAttribute($val);
 			// If permission is granted to the post, you can access it temporarily
-			if($oCommentItem->isGranted()) $accessible[$val->comment_srl] = true;
+			if($oCommentItem->isGranted()) {
+				$accessible[$val->comment_srl] = true;
+			}
 			// If the comment is set to private and it belongs child post, it is allowable to read the comment for who has a admin privilege on its parent post
 			if($val->parent_srl>0 && $val->is_secret == 'Y' && !$oCommentItem->isAccessible() && $accessible[$val->parent_srl]===true)
 			{
@@ -765,7 +849,9 @@ 
 		// Variable setting to be displayed on the skin
 		Context::set($cpageStr, $output->page_navigation->cur_page);
 		Context::set('cpage', $output->page_navigation->cur_page);
-		if($output->total_page>1) $this->comment_page_navigation = $output->page_navigation;
+		if($output->total_page>1) {
+			$this->comment_page_navigation = $output->page_navigation;
+		}
 
 		return $comment_list;
 	}
@@ -777,9 +863,13 @@ 
 
 	function getTrackbacks()
 	{
-		if(!$this->document_srl) return;
+		if(!$this->document_srl) {
+			return;
+		}
 
-		if(!$this->allowTrackback() || !$this->get('trackback_count')) return;
+		if(!$this->allowTrackback() || !$this->get('trackback_count')) {
+			return;
+		}
 
 		$oTrackbackModel = getModel('trackback');
 		return $oTrackbackModel->getTrackbackList($this->document_srl, $is_admin);
@@ -787,15 +877,21 @@ 
 
 	function thumbnailExists($width = 80, $height = 0, $type = '')
 	{
-		if(!$this->document_srl) return false;
-		if(!$this->getThumbnail($width, $height, $type)) return false;
+		if(!$this->document_srl) {
+			return false;
+		}
+		if(!$this->getThumbnail($width, $height, $type)) {
+			return false;
+		}
 		return true;
 	}
 
 	function getThumbnail($width = 80, $height = 0, $thumbnail_type = '')
 	{
 		// Return false if the document doesn't exist
-		if(!$this->document_srl) return;
+		if(!$this->document_srl) {
+			return;
+		}
 
 		if($this->isSecret() && !$this->isGranted())
 		{
@@ -803,7 +899,9 @@ 
 		}
 
 		// If not specify its height, create a square
-		if(!$height) $height = $width;
+		if(!$height) {
+			$height = $width;
+		}
 
 		// Return false if neither attachement nor image files in the document
 		$content = $this->get('content');
@@ -821,7 +919,9 @@ 
 				}
 			}
 
-			if(!preg_match("!<img!is", $content)) return;
+			if(!preg_match("!<img!is", $content)) {
+				return;
+			}
 		}
 		// Get thumbnai_type information from document module's configuration
 		if(!in_array($thumbnail_type, array('crop','ratio')))
@@ -842,8 +942,11 @@ 
 		// Return false if thumbnail file exists and its size is 0. Otherwise, return its path
 		if(file_exists($thumbnail_file))
 		{
-			if(filesize($thumbnail_file)<1) return false;
-			else return $thumbnail_url;
+			if(filesize($thumbnail_file)<1) {
+				return false;
+			} else {
+				return $thumbnail_url;
+			}
 		}
 
 		// Target File
@@ -858,7 +961,9 @@ 
 			$first_image = null;
 			foreach($file_list as $file)
 			{
-				if($file->direct_download !== 'Y') continue;
+				if($file->direct_download !== 'Y') {
+					continue;
+				}
 
 				if($file->cover_image === 'Y' && file_exists($file->uploaded_filename))
 				{
@@ -866,7 +971,9 @@ 
 					break;
 				}
 
-				if($first_image) continue;
+				if($first_image) {
+					continue;
+				}
 
 				if(preg_match("/\.(jpe?g|png|gif|bmp)$/i", $file->source_filename))
 				{
@@ -893,7 +1000,9 @@ 
 			foreach($matches as $target_image)
 			{
 				$target_src = trim($target_image[1]);
-				if(preg_match('/\/(common|modules|widgets|addons|layouts|m\.layouts)\//i', $target_src)) continue;
+				if(preg_match('/\/(common|modules|widgets|addons|layouts|m\.layouts)\//i', $target_src)) {
+					continue;
+				}
 
 				if(!preg_match('/^(http|https):\/\//i',$target_src))
 				{
@@ -904,7 +1013,9 @@ 
 
 				$tmp_file = _XE_PATH_ . 'files/cache/tmp/' . $random->createSecureSalt(32, 'hex');
 				FileHandler::getRemoteFile($target_src, $tmp_file);
-				if(!file_exists($tmp_file)) continue;
+				if(!file_exists($tmp_file)) {
+					continue;
+				}
 
 				$imageinfo = getimagesize($tmp_file);
 				list($_w, $_h) = $imageinfo;
@@ -923,11 +1034,17 @@ 
 		{
 			$output = FileHandler::createImageFile($source_file, $thumbnail_file, $width, $height, 'jpg', $thumbnail_type);
 		}
-		if($is_tmp_file) FileHandler::removeFile($source_file);
+		if($is_tmp_file) {
+			FileHandler::removeFile($source_file);
+		}
 		// Return its path if a thumbnail is successfully genetated
-		if($output) return $thumbnail_url;
+		if($output) {
+			return $thumbnail_url;
+		}
 		// Create an empty file not to re-generate the thumbnail
-		else FileHandler::writeFile($thumbnail_file, '','w');
+		else {
+			FileHandler::writeFile($thumbnail_file, '','w');
+		}
 
 		return;
 	}
@@ -940,21 +1057,28 @@ 
 	 */
 	function getExtraImages($time_interval = 43200)
 	{
-		if(!$this->document_srl) return;
+		if(!$this->document_srl) {
+			return;
+		}
 		// variables for icon list
 		$buffs = array();
 
 		$check_files = false;
 
 		// Check if secret post is
-		if($this->isSecret()) $buffs[] = "secret";
+		if($this->isSecret()) {
+			$buffs[] = "secret";
+		}
 
 		// Set the latest time
 		$time_check = date("YmdHis", $_SERVER['REQUEST_TIME']-$time_interval);
 
 		// Check new post
-		if($this->get('regdate')>$time_check) $buffs[] = "new";
-		else if($this->get('last_update')>$time_check) $buffs[] = "update";
+		if($this->get('regdate')>$time_check) {
+			$buffs[] = "new";
+		} else if($this->get('last_update')>$time_check) {
+			$buffs[] = "update";
+		}
 
 		/*
 		   $content = $this->get('content');
@@ -977,14 +1101,18 @@ 
 		 */
 
 		// Check the attachment
-		if($this->hasUploadedFiles()) $buffs[] = "file";
+		if($this->hasUploadedFiles()) {
+			$buffs[] = "file";
+		}
 
 		return $buffs;
 	}
 
 	function getStatus()
 	{
-		if(!$this->get('status')) return $this->getDefaultStatus();
+		if(!$this->get('status')) {
+			return $this->getDefaultStatus();
+		}
 		return $this->get('status');
 	}
 
@@ -995,12 +1123,16 @@ 
 	 */
 	function printExtraImages($time_check = 43200)
 	{
-		if(!$this->document_srl) return;
+		if(!$this->document_srl) {
+			return;
+		}
 		// Get the icon directory
 		$path = sprintf('%s%s',getUrl(), 'modules/document/tpl/icons/');
 
 		$buffs = $this->getExtraImages($time_check);
-		if(!count($buffs)) return;
+		if(!count($buffs)) {
+			return;
+		}
 
 		$buff = array();
 		foreach($buffs as $key => $val)
@@ -1012,18 +1144,28 @@ 
 
 	function hasUploadedFiles()
 	{
-		if(!$this->document_srl) return;
+		if(!$this->document_srl) {
+			return;
+		}
 
-		if($this->isSecret() && !$this->isGranted()) return false;
+		if($this->isSecret() && !$this->isGranted()) {
+			return false;
+		}
 		return $this->get('uploaded_count')? true : false;
 	}
 
 	function getUploadedFiles($sortIndex = 'file_srl')
 	{
-		if(!$this->document_srl) return;
+		if(!$this->document_srl) {
+			return;
+		}
 
-		if($this->isSecret() && !$this->isGranted()) return;
-		if(!$this->get('uploaded_count')) return;
+		if($this->isSecret() && !$this->isGranted()) {
+			return;
+		}
+		if(!$this->get('uploaded_count')) {
+			return;
+		}
 
 		if(!$this->uploadedFiles[$sortIndex])
 		{
@@ -1041,7 +1183,9 @@ 
 	function getEditor()
 	{
 		$module_srl = $this->get('module_srl');
-		if(!$module_srl) $module_srl = Context::get('module_srl');
+		if(!$module_srl) {
+			$module_srl = Context::get('module_srl');
+		}
 
 		$oEditorModel = getModel('editor');
 		return $oEditorModel->getModuleEditor('document', $module_srl, $this->document_srl, 'document_srl', 'content');
@@ -1055,8 +1199,12 @@ 
 	function isEnableComment()
 	{
 		// Return false if not authorized, if a secret document, if the document is set not to allow any comment
-		if (!$this->allowComment()) return false;
-		if(!$this->isGranted() && $this->isSecret()) return false;
+		if (!$this->allowComment()) {
+			return false;
+		}
+		if(!$this->isGranted() && $this->isSecret()) {
+			return false;
+		}
 
 		return true;
 	}
@@ -1067,7 +1215,9 @@ 
 	 */
 	function getCommentEditor()
 	{
-		if(!$this->isEnableComment()) return;
+		if(!$this->isEnableComment()) {
+			return;
+		}
 
 		$oEditorModel = getModel('editor');
 		return $oEditorModel->getModuleEditor('comment', $this->get('module_srl'), $comment_srl, 'comment_srl', 'content');
@@ -1079,10 +1229,14 @@ 
 	 */
 	function getProfileImage()
 	{
-		if(!$this->isExists() || !$this->get('member_srl')) return;
+		if(!$this->isExists() || !$this->get('member_srl')) {
+			return;
+		}
 		$oMemberModel = getModel('member');
 		$profile_info = $oMemberModel->getProfileImage($this->get('member_srl'));
-		if(!$profile_info) return;
+		if(!$profile_info) {
+			return;
+		}
 
 		return $profile_info->src;
 	}
@@ -1094,7 +1248,9 @@ 
 	function getSignature()
 	{
 		// Pass if a document doesn't exist
-		if(!$this->isExists() || !$this->get('member_srl')) return;
+		if(!$this->isExists() || !$this->get('member_srl')) {
+			return;
+		}
 		// Get signature information
 		$oMemberModel = getModel('member');
 		$signature = $oMemberModel->getSignature($this->get('member_srl'));
@@ -1108,7 +1264,9 @@ 
 		if($signature)
 		{
 			$max_signature_height = $GLOBALS['__member_signature_max_height'];
-			if($max_signature_height) $signature = sprintf('<div style="max-height:%dpx;overflow:auto;overflow-x:hidden;height:expression(this.scrollHeight > %d ? \'%dpx\': \'auto\')">%s</div>', $max_signature_height, $max_signature_height, $max_signature_height, $signature);
+			if($max_signature_height) {
+				$signature = sprintf('<div style="max-height:%dpx;overflow:auto;overflow-x:hidden;height:expression(this.scrollHeight > %d ? \'%dpx\': \'auto\')">%s</div>', $max_signature_height, $max_signature_height, $max_signature_height, $signature);
+			}
 		}
 
 		return $signature;
@@ -1132,20 +1290,25 @@ 
 	function _checkAccessibleFromStatus()
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin == 'Y') return true;
+		if($logged_info->is_admin == 'Y') {
+			return true;
+		}
 
 		$status = $this->get('status');
-		if(empty($status)) return false;
+		if(empty($status)) {
+			return false;
+		}
 
 		$oDocumentModel = getModel('document');
 		$configStatusList = $oDocumentModel->getStatusList();
 
-		if($status == $configStatusList['public'] || $status == $configStatusList['publish'])
-			return true;
-		else if($status == $configStatusList['private'] || $status == $configStatusList['secret'])
+		if($status == $configStatusList['public'] || $status == $configStatusList['publish']) {
+					return true;
+		} else if($status == $configStatusList['private'] || $status == $configStatusList['secret'])
 		{
-			if($this->get('member_srl') == $logged_info->member_srl)
-				return true;
+			if($this->get('member_srl') == $logged_info->member_srl) {
+							return true;
+			}
 		}
 		return false;
 	}

modules/comment/comment.item.php

Spacing +72 added lines, -72 removed lines

@@ -49,7 +49,7 @@ 
 	 */
 	function _loadFromDB()
 	{
-		if(!$this->comment_srl)
+		if (!$this->comment_srl)
 		{
 			return;
 		}
@@ -67,7 +67,7 @@ 
 	 */
 	function setAttribute($attribute)
 	{
-		if(!$attribute->comment_srl)
+		if (!$attribute->comment_srl)
 		{
 			$this->comment_srl = NULL;
 			return;
@@ -77,9 +77,9 @@ 
 		$this->adds($attribute);
 
 		// define vars on the object for backward compatibility of skins
-		if(count($attribute))
+		if (count($attribute))
 		{
-			foreach($attribute as $key => $val)
+			foreach ($attribute as $key => $val)
 			{
 				$this->{$key} = $val;
 			}
@@ -93,29 +93,29 @@ 
 
 	function isGranted()
 	{
-		if($_SESSION['own_comment'][$this->comment_srl])
+		if ($_SESSION['own_comment'][$this->comment_srl])
 		{
 			return TRUE;
 		}
 
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return FALSE;
 		}
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin == 'Y')
+		if ($logged_info->is_admin == 'Y')
 		{
 			return TRUE;
 		}
 
 		$grant = Context::get('grant');
-		if($grant->manager)
+		if ($grant->manager)
 		{
 			return TRUE;
 		}
 
-		if($this->get('member_srl') && ($this->get('member_srl') == $logged_info->member_srl || $this->get('member_srl') * -1 == $logged_info->member_srl))
+		if ($this->get('member_srl') && ($this->get('member_srl') == $logged_info->member_srl || $this->get('member_srl') * -1 == $logged_info->member_srl))
 		{
 			return TRUE;
 		}
@@ -136,7 +136,7 @@ 
 
 	function isEditable()
 	{
-		if($this->isGranted() || !$this->get('member_srl'))
+		if ($this->isGranted() || !$this->get('member_srl'))
 		{
 			return TRUE;
 		}
@@ -150,12 +150,12 @@ 
 
 	function isAccessible()
 	{
-		if($_SESSION['accessibled_comment'][$this->comment_srl])
+		if ($_SESSION['accessibled_comment'][$this->comment_srl])
 		{
 			return TRUE;
 		}
 
-		if($this->isGranted() || !$this->isSecret())
+		if ($this->isGranted() || !$this->isSecret())
 		{
 			$this->setAccessible();
 			return TRUE;
@@ -163,7 +163,7 @@ 
 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($this->get('document_srl'));
-		if($oDocument->isGranted())
+		if ($oDocument->isGranted())
 		{
 			$this->setAccessible();
 			return TRUE;
@@ -184,20 +184,20 @@ 
 	function notify($type, $content)
 	{
 		// return if not useNotify
-		if(!$this->useNotify())
+		if (!$this->useNotify())
 		{
 			return;
 		}
 
 		// pass if the author is not logged-in user 
-		if(!$this->get('member_srl'))
+		if (!$this->get('member_srl'))
 		{
 			return;
 		}
 
 		// return if the currently logged-in user is an author of the comment.
 		$logged_info = Context::get('logged_info');
-		if($logged_info->member_srl == $this->get('member_srl'))
+		if ($logged_info->member_srl == $this->get('member_srl'))
 		{
 			return;
 		}
@@ -207,9 +207,9 @@ 
 		$oDocument = $oDocumentModel->getDocument($this->get('document_srl'));
 
 		// Variables
-		if($type)
+		if ($type)
 		{
-			$title = "[" . $type . "] ";
+			$title = "[".$type."] ";
 		}
 
 		$title .= cut_str(strip_tags($content), 30, '...');
@@ -224,17 +224,17 @@ 
 
 	function getIpAddress()
 	{
-		if($this->isGranted())
+		if ($this->isGranted())
 		{
 			return $this->get('ipaddress');
 		}
 
-		return '*' . strstr($this->get('ipaddress'), '.');
+		return '*'.strstr($this->get('ipaddress'), '.');
 	}
 
 	function isExistsHomepage()
 	{
-		if(trim($this->get('homepage')))
+		if (trim($this->get('homepage')))
 		{
 			return TRUE;
 		}
@@ -245,14 +245,14 @@ 
 	function getHomepageUrl()
 	{
 		$url = trim($this->get('homepage'));
-		if(!$url)
+		if (!$url)
 		{
 			return;
 		}
 
-		if(strncasecmp('http://', $url, 7) !== 0)
+		if (strncasecmp('http://', $url, 7) !== 0)
 		{
-			$url = "http://" . $url;
+			$url = "http://".$url;
 		}
 
 		return htmlspecialchars($url, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
@@ -284,14 +284,14 @@ 
 	 */
 	function getContentText($strlen = 0)
 	{
-		if($this->isSecret() && !$this->isAccessible())
+		if ($this->isSecret() && !$this->isAccessible())
 		{
 			return Context::getLang('msg_is_secret');
 		}
 
 		$content = $this->get('content');
 
-		if($strlen)
+		if ($strlen)
 		{
 			return cut_str(strip_tags($content), $strlen, '...');
 		}
@@ -305,7 +305,7 @@ 
 	 */
 	function getContent($add_popup_menu = TRUE, $add_content_info = TRUE, $add_xe_content_class = TRUE)
 	{
-		if($this->isSecret() && !$this->isAccessible())
+		if ($this->isSecret() && !$this->isAccessible())
 		{
 			return Context::getLang('msg_is_secret');
 		}
@@ -314,7 +314,7 @@ 
 		stripEmbedTagForAdmin($content, $this->get('member_srl'));
 
 		// when displaying the comment on the pop-up menu
-		if($add_popup_menu && Context::get('is_logged'))
+		if ($add_popup_menu && Context::get('is_logged'))
 		{
 			$content = sprintf(
 					'%s<div class="comment_popup_menu"><a href="#popup_menu_area" class="comment_%d" onclick="return false">%s</a></div>', $content, $this->comment_srl, Context::getLang('cmd_comment_do')
@@ -322,10 +322,10 @@ 
 		}
 
 		// if additional information which can access contents is set
-		if($add_content_info)
+		if ($add_content_info)
 		{
 			$memberSrl = $this->get('member_srl');
-			if($memberSrl < 0)
+			if ($memberSrl < 0)
 			{
 				$memberSrl = 0;
 			}
@@ -336,7 +336,7 @@ 
 		}
 		else
 		{
-			if($add_xe_content_class)
+			if ($add_xe_content_class)
 			{
 				$content = sprintf('<div class="xe_content">%s</div>', $content);
 			}
@@ -396,7 +396,7 @@ 
 
 	function getRegdateGM()
 	{
-		return $this->getRegdate('D, d M Y H:i:s') . ' ' . $GLOBALS['_time_zone'];
+		return $this->getRegdate('D, d M Y H:i:s').' '.$GLOBALS['_time_zone'];
 	}
 
 	function getUpdate($format = 'Y.m.d H:i:s')
@@ -406,7 +406,7 @@ 
 
 	function getPermanentUrl()
 	{
-		return getFullUrl('', 'document_srl', $this->get('document_srl')) . '#comment_' . $this->get('comment_srl');
+		return getFullUrl('', 'document_srl', $this->get('document_srl')).'#comment_'.$this->get('comment_srl');
 	}
 
 	function getUpdateTime()
@@ -427,7 +427,7 @@ 
 
 	function hasUploadedFiles()
 	{
-		if(($this->isSecret() && !$this->isAccessible()) && !$this->isGranted())
+		if (($this->isSecret() && !$this->isAccessible()) && !$this->isGranted())
 		{
 			return FALSE;
 		}
@@ -436,12 +436,12 @@ 
 
 	function getUploadedFiles()
 	{
-		if(($this->isSecret() && !$this->isAccessible()) && !$this->isGranted())
+		if (($this->isSecret() && !$this->isAccessible()) && !$this->isGranted())
 		{
 			return;
 		}
 
-		if(!$this->get('uploaded_count'))
+		if (!$this->get('uploaded_count'))
 		{
 			return;
 		}
@@ -458,7 +458,7 @@ 
 	function getEditor()
 	{
 		$module_srl = $this->get('module_srl');
-		if(!$module_srl)
+		if (!$module_srl)
 		{
 			$module_srl = Context::get('module_srl');
 		}
@@ -472,13 +472,13 @@ 
 	 */
 	function getProfileImage()
 	{
-		if(!$this->isExists() || !$this->get('member_srl'))
+		if (!$this->isExists() || !$this->get('member_srl'))
 		{
 			return;
 		}
 		$oMemberModel = getModel('member');
 		$profile_info = $oMemberModel->getProfileImage($this->get('member_srl'));
-		if(!$profile_info)
+		if (!$profile_info)
 		{
 			return;
 		}
@@ -493,7 +493,7 @@ 
 	function getSignature()
 	{
 		// pass if the posting not exists.
-		if(!$this->isExists() || !$this->get('member_srl'))
+		if (!$this->isExists() || !$this->get('member_srl'))
 		{
 			return;
 		}
@@ -503,7 +503,7 @@ 
 		$signature = $oMemberModel->getSignature($this->get('member_srl'));
 
 		// check if max height of the signiture is specified on the member module
-		if(!isset($GLOBALS['__member_signature_max_height']))
+		if (!isset($GLOBALS['__member_signature_max_height']))
 		{
 			$oModuleModel = getModel('module');
 			$member_config = $oModuleModel->getModuleConfig('member');
@@ -512,7 +512,7 @@ 
 
 		$max_signature_height = $GLOBALS['__member_signature_max_height'];
 
-		if($max_signature_height)
+		if ($max_signature_height)
 		{
 			$signature = sprintf('<div style="max-height:%dpx;overflow:auto;overflow-x:hidden;height:expression(this.scrollHeight > %d ? \'%dpx\': \'auto\')">%s</div>', $max_signature_height, $max_signature_height, $max_signature_height, $signature);
 		}
@@ -522,12 +522,12 @@ 
 
 	function thumbnailExists($width = 80, $height = 0, $type = '')
 	{
-		if(!$this->comment_srl)
+		if (!$this->comment_srl)
 		{
 			return FALSE;
 		}
 
-		if(!$this->getThumbnail($width, $height, $type))
+		if (!$this->getThumbnail($width, $height, $type))
 		{
 			return FALSE;
 		}
@@ -538,42 +538,42 @@ 
 	function getThumbnail($width = 80, $height = 0, $thumbnail_type = '')
 	{
 		// return false if no doc exists
-		if(!$this->comment_srl)
+		if (!$this->comment_srl)
 		{
 			return;
 		}
 
-		if($this->isSecret() && !$this->isGranted())
+		if ($this->isSecret() && !$this->isGranted())
 		{
 			return;
 		}
 
 		// If signiture height setting is omitted, create a square
-		if(!$height)
+		if (!$height)
 		{
 			$height = $width;
 		}
 
 		$content = $this->get('content');
-		if(!$this->hasUploadedFiles())
+		if (!$this->hasUploadedFiles())
 		{
-			if(!$content)
+			if (!$content)
 			{
 				$args = new stdClass();
 				$args->comment_srl = $this->comment_srl;
 				$output = executeQuery('document.getComment', $args, array('content'));
-				if($output->toBool() && $output->data)
+				if ($output->toBool() && $output->data)
 				{
 					$content = $output->data->content;
 					$this->add('content', $content);
 				}
 			}
 
-			if(!preg_match("!<img!is", $content)) return;
+			if (!preg_match("!<img!is", $content)) return;
 		}
 
 		// get thumbail generation info on the doc module configuration.
-		if(!in_array($thumbnail_type, array('crop', 'ratio')))
+		if (!in_array($thumbnail_type, array('crop', 'ratio')))
 		{
 			$thumbnail_type = 'crop';
 		}
@@ -581,12 +581,12 @@ 
 		// Define thumbnail information
 		$thumbnail_path = sprintf('files/thumbnails/%s', getNumberingPath($this->comment_srl, 3));
 		$thumbnail_file = sprintf('%s%dx%d.%s.jpg', $thumbnail_path, $width, $height, $thumbnail_type);
-		$thumbnail_url = Context::getRequestUri() . $thumbnail_file;
+		$thumbnail_url = Context::getRequestUri().$thumbnail_file;
 
 		// return false if a size of existing thumbnail file is 0. otherwise return the file path
-		if(file_exists($thumbnail_file))
+		if (file_exists($thumbnail_file))
 		{
-			if(filesize($thumbnail_file) < 1)
+			if (filesize($thumbnail_file) < 1)
 			{
 				return FALSE;
 			}
@@ -601,33 +601,33 @@ 
 		$is_tmp_file = FALSE;
 
 		// find an image file among attached files
-		if($this->hasUploadedFiles())
+		if ($this->hasUploadedFiles())
 		{
 			$file_list = $this->getUploadedFiles();
 
 			$first_image = null;
-			foreach($file_list as $file)
+			foreach ($file_list as $file)
 			{
-				if($file->direct_download !== 'Y') continue;
+				if ($file->direct_download !== 'Y') continue;
 
-				if($file->cover_image === 'Y' && file_exists($file->uploaded_filename))
+				if ($file->cover_image === 'Y' && file_exists($file->uploaded_filename))
 				{
 					$source_file = $file->uploaded_filename;
 					break;
 				}
 
-				if($first_image) continue;
+				if ($first_image) continue;
 
-				if(preg_match("/\.(jpe?g|png|gif|bmp)$/i", $file->source_filename))
+				if (preg_match("/\.(jpe?g|png|gif|bmp)$/i", $file->source_filename))
 				{
-					if(file_exists($file->uploaded_filename))
+					if (file_exists($file->uploaded_filename))
 					{
 						$first_image = $file->uploaded_filename;
 					}
 				}
 			}
 
-			if(!$source_file && $first_image)
+			if (!$source_file && $first_image)
 			{
 				$source_file = $first_image;
 			}
@@ -635,31 +635,31 @@ 
 
 		// get an image file from the doc content if no file attached. 
 		$is_tmp_file = false;
-		if(!$source_file)
+		if (!$source_file)
 		{
 			$random = new Password();
 
 			preg_match_all("!<img[^>]*src=(?:\"|\')([^\"\']*?)(?:\"|\')!is", $content, $matches, PREG_SET_ORDER);
 
-			foreach($matches as $target_image)
+			foreach ($matches as $target_image)
 			{
 				$target_src = trim($target_image[1]);
-				if(preg_match('/\/(common|modules|widgets|addons|layouts|m\.layouts)\//i', $target_src)) continue;
+				if (preg_match('/\/(common|modules|widgets|addons|layouts|m\.layouts)\//i', $target_src)) continue;
 
-				if(!preg_match('/^(http|https):\/\//i',$target_src))
+				if (!preg_match('/^(http|https):\/\//i', $target_src))
 				{
 					$target_src = Context::getRequestUri().$target_src;
 				}
 
 				$target_src = htmlspecialchars_decode($target_src);
 
-				$tmp_file = _XE_PATH_ . 'files/cache/tmp/' . $random->createSecureSalt(32, 'hex');
+				$tmp_file = _XE_PATH_.'files/cache/tmp/'.$random->createSecureSalt(32, 'hex');
 				FileHandler::getRemoteFile($target_src, $tmp_file);
-				if(!file_exists($tmp_file)) continue;
+				if (!file_exists($tmp_file)) continue;
 
 				$imageinfo = getimagesize($tmp_file);
 				list($_w, $_h) = $imageinfo;
-				if($imageinfo === false || ($_w < ($width * 0.3) && $_h < ($height * 0.3))) {
+				if ($imageinfo === false || ($_w < ($width * 0.3) && $_h < ($height * 0.3))) {
 					FileHandler::removeFile($tmp_file);
 					continue;
 				}
@@ -672,13 +672,13 @@ 
 
 		$output = FileHandler::createImageFile($source_file, $thumbnail_file, $width, $height, 'jpg', $thumbnail_type);
 
-		if($is_tmp_file)
+		if ($is_tmp_file)
 		{
 			FileHandler::removeFile($source_file);
 		}
 
 		// return the thumbnail path if successfully generated.
-		if($output)
+		if ($output)
 		{
 			return $thumbnail_url;
 		}

Braces +17 added lines, -9 removed lines

@@ -333,8 +333,7 @@ 
 					'<!--BeforeComment(%d,%d)--><div class="comment_%d_%d xe_content">%s</div><!--AfterComment(%d,%d)-->', $this->comment_srl, $memberSrl, $this->comment_srl, $memberSrl, $content, $this->comment_srl, $memberSrl
 			);
 			// xe_content class name should be specified although content access is not necessary.
-		}
-		else
+		} else
 		{
 			if($add_xe_content_class)
 			{
@@ -569,7 +568,9 @@ 
 				}
 			}
 
-			if(!preg_match("!<img!is", $content)) return;
+			if(!preg_match("!<img!is", $content)) {
+				return;
+			}
 		}
 
 		// get thumbail generation info on the doc module configuration.
@@ -589,8 +590,7 @@ 
 			if(filesize($thumbnail_file) < 1)
 			{
 				return FALSE;
-			}
-			else
+			} else
 			{
 				return $thumbnail_url;
 			}
@@ -608,7 +608,9 @@ 
 			$first_image = null;
 			foreach($file_list as $file)
 			{
-				if($file->direct_download !== 'Y') continue;
+				if($file->direct_download !== 'Y') {
+					continue;
+				}
 
 				if($file->cover_image === 'Y' && file_exists($file->uploaded_filename))
 				{
@@ -616,7 +618,9 @@ 
 					break;
 				}
 
-				if($first_image) continue;
+				if($first_image) {
+					continue;
+				}
 
 				if(preg_match("/\.(jpe?g|png|gif|bmp)$/i", $file->source_filename))
 				{
@@ -644,7 +648,9 @@ 
 			foreach($matches as $target_image)
 			{
 				$target_src = trim($target_image[1]);
-				if(preg_match('/\/(common|modules|widgets|addons|layouts|m\.layouts)\//i', $target_src)) continue;
+				if(preg_match('/\/(common|modules|widgets|addons|layouts|m\.layouts)\//i', $target_src)) {
+					continue;
+				}
 
 				if(!preg_match('/^(http|https):\/\//i',$target_src))
 				{
@@ -655,7 +661,9 @@ 
 
 				$tmp_file = _XE_PATH_ . 'files/cache/tmp/' . $random->createSecureSalt(32, 'hex');
 				FileHandler::getRemoteFile($target_src, $tmp_file);
-				if(!file_exists($tmp_file)) continue;
+				if(!file_exists($tmp_file)) {
+					continue;
+				}
 
 				$imageinfo = getimagesize($tmp_file);
 				list($_w, $_h) = $imageinfo;