xpressengine / xe-core

classes/display/HTMLDisplayHandler.php

Spacing +52 added lines, -52 removed lines

@@ -19,9 +19,9 @@ 
 
 		$template_path = $oModule->getTemplatePath();
 
-		if(!is_dir($template_path))
+		if (!is_dir($template_path))
 		{
-			if($oModule->module_info->module == $oModule->module)
+			if ($oModule->module_info->module == $oModule->module)
 			{
 				$skin = $oModule->origin_module_info->skin;
 			}
@@ -30,17 +30,17 @@ 
 				$skin = $oModule->module_config->skin;
 			}
 
-			if(Context::get('module') != 'admin' && strpos(Context::get('act'), 'Admin') === false)
+			if (Context::get('module') != 'admin' && strpos(Context::get('act'), 'Admin') === false)
 			{
-				if($skin && is_string($skin))
+				if ($skin && is_string($skin))
 				{
 					$theme_skin = explode('|@|', $skin);
 					$template_path = $oModule->getTemplatePath();
-					if(count($theme_skin) == 2)
+					if (count($theme_skin) == 2)
 					{
 						$theme_path = sprintf('./themes/%s', $theme_skin[0]);
 						// FIXME $theme_path $theme_path $theme_path ??
-						if(substr($theme_path, 0, strlen($theme_path)) != $theme_path)
+						if (substr($theme_path, 0, strlen($theme_path)) != $theme_path)
 						{
 							$template_path = sprintf('%s/modules/%s/', $theme_path, $theme_skin[1]);
 						}
@@ -61,16 +61,16 @@ 
 		$output = $oTemplate->compile($template_path, $tpl_file);
 
 		// add .x div for adminitration pages
-		if(Context::getResponseMethod() == 'HTML')
+		if (Context::getResponseMethod() == 'HTML')
 		{
-			if(Context::get('module') != 'admin' && strpos(Context::get('act'), 'Admin') > 0 && Context::get('act') != 'dispPageAdminContentModify' && Context::get('act') != 'dispPageAdminMobileContentModify')
+			if (Context::get('module') != 'admin' && strpos(Context::get('act'), 'Admin') > 0 && Context::get('act') != 'dispPageAdminContentModify' && Context::get('act') != 'dispPageAdminMobileContentModify')
 			{
-				$output = '<div class="x">' . $output . '</div>';
+				$output = '<div class="x">'.$output.'</div>';
 			}
 
-			if(Context::get('layout') != 'none')
+			if (Context::get('layout') != 'none')
 			{
-				if(__DEBUG__ == 3)
+				if (__DEBUG__ == 3)
 				{
 					$start = getMicroTime();
 				}
@@ -88,11 +88,11 @@ 
 				$layout_srl = $layout_info->layout_srl;
 
 				// compile if connected to the layout
-				if($layout_srl > 0)
+				if ($layout_srl > 0)
 				{
 
 					// handle separately if the layout is faceoff
-					if($layout_info && $layout_info->type == 'faceoff')
+					if ($layout_info && $layout_info->type == 'faceoff')
 					{
 						$oLayoutModel->doActivateFaceOff($layout_info);
 						Context::set('layout_info', $layout_info);
@@ -101,16 +101,16 @@ 
 					// search if the changes CSS exists in the admin layout edit window
 					$edited_layout_css = $oLayoutModel->getUserLayoutCss($layout_srl);
 
-					if(FileHandler::exists($edited_layout_css))
+					if (FileHandler::exists($edited_layout_css))
 					{
 						Context::loadFile(array($edited_layout_css, 'all', '', 100));
 					}
 				}
-				if(!$layout_path)
+				if (!$layout_path)
 				{
 					$layout_path = './common/tpl';
 				}
-				if(!$layout_file)
+				if (!$layout_file)
 				{
 					$layout_file = 'default_layout';
 				}
@@ -118,7 +118,7 @@ 
 
 				// if popup_layout, remove admin bar.
 				$realLayoutPath = FileHandler::getRealPath($layout_path);
-				if(substr_compare($realLayoutPath, '/', -1) !== 0)
+				if (substr_compare($realLayoutPath, '/', -1) !== 0)
 				{
 					$realLayoutPath .= '/';
 				}
@@ -126,12 +126,12 @@ 
 				$pathInfo = pathinfo($layout_file);
 				$onlyLayoutFile = $pathInfo['filename'];
 
-				if(__DEBUG__ == 3)
+				if (__DEBUG__ == 3)
 				{
 					$GLOBALS['__layout_compile_elapsed__'] = getMicroTime() - $start;
 				}
 
-				if(stripos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE && (Context::get('_use_ssl') == 'optional' || Context::get('_use_ssl') == 'always'))
+				if (stripos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE && (Context::get('_use_ssl') == 'optional' || Context::get('_use_ssl') == 'always'))
 				{
 					Context::addHtmlFooter('<iframe id="xeTmpIframe" name="xeTmpIframe" style="width:1px;height:1px;position:absolute;top:-2px;left:-2px;"></iframe>');
 				}
@@ -147,12 +147,12 @@ 
 	 */
 	function prepareToPrint(&$output)
 	{
-		if(Context::getResponseMethod() != 'HTML')
+		if (Context::getResponseMethod() != 'HTML')
 		{
 			return;
 		}
 
-		if(__DEBUG__ == 3)
+		if (__DEBUG__ == 3)
 		{
 			$start = getMicroTime();
 		}
@@ -170,20 +170,20 @@ 
 		$output = preg_replace_callback('/<!--(#)?Meta:([a-z0-9\_\-\/\.\@\:]+)-->/is', array($this, '_transMeta'), $output);
 
 		// handles a relative path generated by using the rewrite module
-		if(Context::isAllowRewrite())
+		if (Context::isAllowRewrite())
 		{
 			$url = parse_url(Context::getRequestUri());
 			$real_path = $url['path'];
 
 			$pattern = '/src=("|\'){1}(?:\.\/)?((?:files\/(?:attach|cache|faceOff|member_extra_info|thumbnails)|addons|common|(?:m\.)?layouts|modules|widgets|widgetstyle)\/[^"\']+)("|\'){1}/s';
-			$output = preg_replace($pattern, 'src=$1' . $real_path . '$2$3', $output);
+			$output = preg_replace($pattern, 'src=$1'.$real_path.'$2$3', $output);
 
 			$pattern = '/href=("|\'){1}(\?[^"\']+)/s';
-			$output = preg_replace($pattern, 'href=$1' . $real_path . '$2', $output);
+			$output = preg_replace($pattern, 'href=$1'.$real_path.'$2', $output);
 
-			if(Context::get('vid'))
+			if (Context::get('vid'))
 			{
-				$pattern = '/\/' . Context::get('vid') . '\?([^=]+)=/is';
+				$pattern = '/\/'.Context::get('vid').'\?([^=]+)=/is';
 				$output = preg_replace($pattern, '/?$1=', $output);
 			}
 		}
@@ -191,18 +191,18 @@ 
 		// prevent the 2nd request due to url(none) of the background-image
 		$output = preg_replace('/url\((["\']?)none(["\']?)\)/is', 'none', $output);
 
-		if(is_array(Context::get('INPUT_ERROR')))
+		if (is_array(Context::get('INPUT_ERROR')))
 		{
 			$INPUT_ERROR = Context::get('INPUT_ERROR');
 			$keys = array_keys($INPUT_ERROR);
-			$keys = '(' . implode('|', $keys) . ')';
+			$keys = '('.implode('|', $keys).')';
 
-			$output = preg_replace_callback('@(<input)([^>]*?)\sname="' . $keys . '"([^>]*?)/?>@is', array(&$this, '_preserveValue'), $output);
-			$output = preg_replace_callback('@<select[^>]*\sname="' . $keys . '".+</select>@isU', array(&$this, '_preserveSelectValue'), $output);
-			$output = preg_replace_callback('@<textarea[^>]*\sname="' . $keys . '".+</textarea>@isU', array(&$this, '_preserveTextAreaValue'), $output);
+			$output = preg_replace_callback('@(<input)([^>]*?)\sname="'.$keys.'"([^>]*?)/?>@is', array(&$this, '_preserveValue'), $output);
+			$output = preg_replace_callback('@<select[^>]*\sname="'.$keys.'".+</select>@isU', array(&$this, '_preserveSelectValue'), $output);
+			$output = preg_replace_callback('@<textarea[^>]*\sname="'.$keys.'".+</textarea>@isU', array(&$this, '_preserveTextAreaValue'), $output);
 		}
 
-		if(__DEBUG__ == 3)
+		if (__DEBUG__ == 3)
 		{
 			$GLOBALS['__trans_content_elapsed__'] = getMicroTime() - $start;
 		}
@@ -220,7 +220,7 @@ 
 		// convert the final layout
 		Context::set('content', $output);
 		$oTemplate = TemplateHandler::getInstance();
-		if(Mobile::isFromMobilePhone())
+		if (Mobile::isFromMobilePhone())
 		{
 			$this->_loadMobileJSCSS();
 			$output = $oTemplate->compile('./common/tpl', 'mobile_layout');
@@ -245,16 +245,16 @@ 
 	{
 		$INPUT_ERROR = Context::get('INPUT_ERROR');
 
-		$str = $match[1] . $match[2] . ' name="' . $match[3] . '"' . $match[4];
+		$str = $match[1].$match[2].' name="'.$match[3].'"'.$match[4];
 
 		// get type
 		$type = 'text';
-		if(preg_match('/\stype="([a-z]+)"/i', $str, $m))
+		if (preg_match('/\stype="([a-z]+)"/i', $str, $m))
 		{
 			$type = strtolower($m[1]);
 		}
 
-		switch($type)
+		switch ($type)
 		{
 			case 'text':
 			case 'hidden':
@@ -272,7 +272,7 @@ 
 			case 'number':
 			case 'range':
 			case 'color':
-				$str = preg_replace('@\svalue="[^"]*?"@', ' ', $str) . ' value="' . htmlspecialchars($INPUT_ERROR[$match[3]], ENT_COMPAT | ENT_HTML401, 'UTF-8', false) . '"';
+				$str = preg_replace('@\svalue="[^"]*?"@', ' ', $str).' value="'.htmlspecialchars($INPUT_ERROR[$match[3]], ENT_COMPAT | ENT_HTML401, 'UTF-8', false).'"';
 				break;
 			case 'password':
 				$str = preg_replace('@\svalue="[^"]*?"@', ' ', $str);
@@ -280,14 +280,14 @@ 
 			case 'radio':
 			case 'checkbox':
 				$str = preg_replace('@\schecked(="[^"]*?")?@', ' ', $str);
-				if(@preg_match('@\s(?i:value)="' . $INPUT_ERROR[$match[3]] . '"@', $str))
+				if (@preg_match('@\s(?i:value)="'.$INPUT_ERROR[$match[3]].'"@', $str))
 				{
 					$str .= ' checked="checked"';
 				}
 				break;
 		}
 
-		return $str . ' />';
+		return $str.' />';
 	}
 
 	/**
@@ -304,14 +304,14 @@ 
 		preg_match_all('@<option[^>]*\svalue="([^"]*)".+</option>@isU', $matches[0], $m);
 
 		$key = array_search($INPUT_ERROR[$matches[1]], $m[1]);
-		if($key === FALSE)
+		if ($key === FALSE)
 		{
 			return $matches[0];
 		}
 
 		$m[0][$key] = preg_replace('@(\svalue=".*?")@is', '$1 selected="selected"', $m[0][$key]);
 
-		return $mm[0] . implode('', $m[0]) . '</select>';
+		return $mm[0].implode('', $m[0]).'</select>';
 	}
 
 	/**
@@ -323,7 +323,7 @@ 
 	{
 		$INPUT_ERROR = Context::get('INPUT_ERROR');
 		preg_match('@<textarea.*?>@is', $matches[0], $mm);
-		return $mm[0] . $INPUT_ERROR[$matches[1]] . '</textarea>';
+		return $mm[0].$INPUT_ERROR[$matches[1]].'</textarea>';
 	}
 
 	/**
@@ -334,7 +334,7 @@ 
 	 */
 	function _moveStyleToHeader($matches)
 	{
-		if(isset($matches[1]) && stristr($matches[1], 'scoped'))
+		if (isset($matches[1]) && stristr($matches[1], 'scoped'))
 		{
 			return $matches[0];
 		}
@@ -370,7 +370,7 @@ 
 	 */
 	function _transMeta($matches)
 	{
-		if($matches[1])
+		if ($matches[1])
 		{
 			return '';
 		}
@@ -387,7 +387,7 @@ 
 		$lang_type = Context::getLangType();
 
 		// add common JS/CSS files
-		if(__DEBUG__ || !__XE_VERSION_STABLE__)
+		if (__DEBUG__ || !__XE_VERSION_STABLE__)
 		{
 			$oContext->loadFile(array('./common/js/jquery-1.x.js', 'head', 'lt IE 9', -1110000), true);
 			$oContext->loadFile(array('./common/js/jquery.js', 'head', 'gte IE 9', -1100000), true);
@@ -400,7 +400,7 @@ 
 			$oContext->loadFile(array('./common/js/xml2json.js', 'head', '', -1000000), true);
 			$oContext->loadFile(array('./common/js/xml_handler.js', 'head', '', -1000000), true);
 			$oContext->loadFile(array('./common/js/xml_js_filter.js', 'head', '', -1000000), true);
-			if(!__DISABLE_DEFAULT_CSS__)
+			if (!__DISABLE_DEFAULT_CSS__)
 			{
 				$oContext->loadFile(array('./common/css/xe.css', '', '', -10000000), true);
 			}
@@ -415,7 +415,7 @@ 
 			$oContext->loadFile(array('./common/js/jquery.min.js', 'head', 'gte IE 9', -1100000), true);
 			$oContext->loadFile(array('./common/js/x.min.js', 'head', '', -1000000), true);
 			$oContext->loadFile(array('./common/js/xe.min.js', 'head', '', -1000000), true);
-			if(!__DISABLE_DEFAULT_CSS__)
+			if (!__DISABLE_DEFAULT_CSS__)
 			{
 				$oContext->loadFile(array('./common/css/xe.min.css', '', '', -10000000), true);
 			}
@@ -426,9 +426,9 @@ 
 		}
 
 		// for admin page, add admin css
-		if(Context::get('module') == 'admin' || strpos(Context::get('act'), 'Admin') > 0)
+		if (Context::get('module') == 'admin' || strpos(Context::get('act'), 'Admin') > 0)
 		{
-			if(__DEBUG__ || !__XE_VERSION_STABLE__)
+			if (__DEBUG__ || !__XE_VERSION_STABLE__)
 			{
 				$oContext->loadFile(array('./modules/admin/tpl/css/admin.css', '', '', 10), true);
 				$oContext->loadFile(array("./modules/admin/tpl/css/admin_{$lang_type}.css", '', '', 10), true);
@@ -460,7 +460,7 @@ 
 		$lang_type = Context::getLangType();
 
 		// add common JS/CSS files
-		if(__DEBUG__ || !__XE_VERSION_STABLE__)
+		if (__DEBUG__ || !__XE_VERSION_STABLE__)
 		{
 			$oContext->loadFile(array('./common/js/jquery.js', 'head', '', -1100000), true);
 			$oContext->loadFile(array('./common/js/modernizr.js', 'head', '', -1000000), true);
@@ -472,7 +472,7 @@ 
 			$oContext->loadFile(array('./common/js/xml2json.js', 'head', '', -1000000), true);
 			$oContext->loadFile(array('./common/js/xml_handler.js', 'head', '', -1000000), true);
 			$oContext->loadFile(array('./common/js/xml_js_filter.js', 'head', '', -1000000), true);
-			if(!__DISABLE_DEFAULT_CSS__)
+			if (!__DISABLE_DEFAULT_CSS__)
 			{
 				$oContext->loadFile(array('./common/css/xe.css', '', '', -10000000), true);
 				$oContext->loadFile(array('./common/css/mobile.css', '', '', -10000000), true);
@@ -488,7 +488,7 @@ 
 			$oContext->loadFile(array('./common/js/jquery.min.js', 'head', '', -1100000), true);
 			$oContext->loadFile(array('./common/js/x.min.js', 'head', '', -1000000), true);
 			$oContext->loadFile(array('./common/js/xe.min.js', 'head', '', -1000000), true);
-			if(!__DISABLE_DEFAULT_CSS__)
+			if (!__DISABLE_DEFAULT_CSS__)
 			{
 				$oContext->loadFile(array('./common/css/xe.min.css', '', '', -10000000), true);
 				$oContext->loadFile(array('./common/css/mobile.min.css', '', '', -10000000), true);

modules/file/file.controller.php

Spacing +168 added lines, -168 removed lines

@@ -29,30 +29,30 @@ 
 		$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');
-		$this->add('file_srl',$output->get('file_srl'));
-		$this->add('file_size',$output->get('file_size'));
-		$this->add('direct_download',$output->get('direct_download'));
-		$this->add('source_filename',$output->get('source_filename'));
-		$this->add('download_url',$output->get('uploaded_filename'));
-		$this->add('upload_target_srl',$output->get('upload_target_srl'));
-		if($output->error != '0') $this->stop($output->message);
+		$this->add('file_srl', $output->get('file_srl'));
+		$this->add('file_size', $output->get('file_size'));
+		$this->add('direct_download', $output->get('direct_download'));
+		$this->add('source_filename', $output->get('source_filename'));
+		$this->add('download_url', $output->get('uploaded_filename'));
+		$this->add('upload_target_srl', $output->get('upload_target_srl'));
+		if ($output->error != '0') $this->stop($output->message);
 	}
 
 	/**
@@ -67,24 +67,24 @@ 
 		$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)
+		if ($file_srl)
 		{
 			$oFileModel = getModel('file');
 			$logged_info = Context::get('logged_info');
 			$file_info = $oFileModel->getFile($file_srl);
 			$file_grant = $oFileModel->getFileGrant($file_info, $logged_info);
-			if($file_info->file_srl == $file_srl && $file_grant->is_deletable)
+			if ($file_info->file_srl == $file_srl && $file_grant->is_deletable)
 			{
 				$this->deleteFile($file_srl);
 			}
@@ -92,12 +92,12 @@ 
 
 		$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');
@@ -114,24 +114,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);
@@ -139,10 +139,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);
 	}
 
 	/**
@@ -180,7 +180,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');
@@ -189,26 +189,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;
@@ -216,21 +216,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;
@@ -240,49 +240,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');
 
 
 		// 다운로드 후 (가상)
@@ -295,7 +295,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();
 
@@ -306,18 +306,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');
@@ -326,34 +326,34 @@ 
 		$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)
 		{
-			if($is_android && preg_match('#\bwv\b|(?:Version|Browser)/\d+#', $_SERVER['HTTP_USER_AGENT']))
+			if ($is_android && preg_match('#\bwv\b|(?:Version|Browser)/\d+#', $_SERVER['HTTP_USER_AGENT']))
 			{
-				$filename_param = 'filename="' . $filename . '"';
+				$filename_param = 'filename="'.$filename.'"';
 			}
 			else
 			{
-				$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).'"';
 		}
-		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]);
@@ -361,21 +361,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
@@ -397,36 +397,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);
 		}
 	}
 
@@ -437,32 +437,32 @@ 
 	 */
 	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');
 
 		$oModuleModel = getModel('module');
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !== 'Y' && !$oModuleModel->isSiteAdmin($logged_info))
+		if ($logged_info->is_admin !== 'Y' && !$oModuleModel->isSiteAdmin($logged_info))
 		{
 			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;
 				}
 			}
@@ -484,7 +484,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);
@@ -501,10 +501,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();
 	}
@@ -518,7 +518,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;
@@ -533,7 +533,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);
@@ -551,10 +551,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();
 	}
@@ -568,9 +568,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;
@@ -585,7 +585,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);
@@ -598,9 +598,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();
 		}
@@ -660,36 +660,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');
 					}
@@ -698,63 +698,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|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|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);
@@ -762,10 +762,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
@@ -786,10 +786,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;
 
@@ -832,18 +832,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;
 			}
@@ -852,14 +852,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;
 			}
@@ -870,15 +870,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);
@@ -902,28 +902,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]);
 		}
@@ -941,23 +941,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("/\.(asf|asf|asx|avi|flv|gif|jpeg|jpg|m4a|m4v|mid|midi|moov|mov|mp1|mp2|mp3|mp4|mpeg|mpg|ogg|png|qt|ra|ram|rm|rmm|wav|webm|webp|wma|wmv)$/i", $file_info->source_filename))
+			if (preg_match("/\.(asf|asf|asx|avi|flv|gif|jpeg|jpg|m4a|m4v|mid|midi|moov|mov|mp1|mp2|mp3|mp4|mpeg|mpg|ogg|png|qt|ra|ram|rm|rmm|wav|webm|webp|wma|wmv)$/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
@@ -967,7 +967,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
@@ -987,18 +987,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;
 
@@ -1007,18 +1007,18 @@ 
 		
 		$args->cover_image = 'N';
 		$output = executeQuery('file.updateClearCoverImage', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 				$oDB->rollback();
 				return $output;
 		}
 
-		if($file_info->cover_image != 'Y')
+		if ($file_info->cover_image != 'Y')
 		{
 
 			$args->cover_image = 'Y';
 			$output = executeQuery('file.updateCoverImage', $args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
@@ -1028,7 +1028,7 @@ 
 
 		$oDB->commit();
 
-		$this->add('is_cover',$args->cover_image);
+		$this->add('is_cover', $args->cover_image);
 
 		// 썸네일 삭제
 		$thumbnail_path = sprintf('files/thumbnails/%s', getNumberingPath($upload_target_srl, 3));
@@ -1054,9 +1054,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);
 			}

classes/frontendfile/FrontEndFileHandler.class.php

Spacing +55 added lines, -55 removed lines

@@ -54,7 +54,7 @@ 
 	 */
 	function isSsl()
 	{
-		if(!is_null(self::$isSSL))
+		if (!is_null(self::$isSSL))
 		{
 			return self::$isSSL;
 		}
@@ -88,30 +88,30 @@ 
 	 * */
 	function loadFile($args)
 	{
-		if(!is_array($args))
+		if (!is_array($args))
 		{
 			$args = array($args);
 		}
 		$file = $this->getFileInfo($args[0], $args[2], $args[1]);
 
 		$availableExtension = array('css' => 1, 'js' => 1);
-		if(!isset($availableExtension[$file->fileExtension]))
+		if (!isset($availableExtension[$file->fileExtension]))
 		{
 			return;
 		}
 
 		$file->index = (int) $args[3];
 
-		if($file->fileExtension == 'css')
+		if ($file->fileExtension == 'css')
 		{
 			$map = &$this->cssMap;
 			$mapIndex = &$this->cssMapIndex;
 
 			$this->_arrangeCssIndex($pathInfo['dirname'], $file);
 		}
-		else if($file->fileExtension == 'js')
+		else if ($file->fileExtension == 'js')
 		{
-			if($args[1] == 'body')
+			if ($args[1] == 'body')
 			{
 				$map = &$this->jsBodyMap;
 				$mapIndex = &$this->jsBodyMapIndex;
@@ -124,7 +124,7 @@ 
 		}
 
 		(is_null($file->index)) ? $file->index = 0 : $file->index = $file->index;
-		if(!isset($mapIndex[$file->key]) || $mapIndex[$file->key] > $file->index)
+		if (!isset($mapIndex[$file->key]) || $mapIndex[$file->key] > $file->index)
 		{
 			$this->unloadFile($args[0], $args[2], $args[1]);
 			$map[$file->index][$file->key] = $file;
@@ -144,14 +144,14 @@ 
 	{
 		static $existsInfo = array();
 
-		if(isset($existsInfo[$existsKey]))
+		if (isset($existsInfo[$existsKey]))
 		{
 			return $existsInfo[$existsKey];
 		}
 
 		$fileName = preg_replace('/(?:[\/]{3,})(.*)/', '//$1', $fileName);
 		$url_info = parse_url($fileName);
-		$pathInfo = pathinfo(str_replace('?' . $url_info['query'], '', $fileName));
+		$pathInfo = pathinfo(str_replace('?'.$url_info['query'], '', $fileName));
 
 		$file = new stdClass();
 		$file->fileName = basename($url_info['path']);
@@ -164,14 +164,14 @@ 
 		$file->keyName = implode('.', array($file->fileNameNoExt, $file->fileExtension));
 		$file->cdnPath = $this->_normalizeFilePath($pathInfo['dirname']);
 
-		if(!$file->external)
+		if (!$file->external)
 		{
-			if(!__DEBUG__ && __XE_VERSION_STABLE__)
+			if (!__DEBUG__ && __XE_VERSION_STABLE__)
 			{
 				// if no debug mode, load minifed file
 				$minifiedFileName = implode('.', array($file->fileNameNoExt, 'min', $file->fileExtension));
 				$minifiedRealPath = implode('/', array($file->fileRealPath, $minifiedFileName));
-				if(file_exists($minifiedRealPath))
+				if (file_exists($minifiedRealPath))
 				{
 					$file->fileName = $minifiedFileName;
 				}
@@ -179,7 +179,7 @@ 
 			else
 			{
 				// Remove .min
-				if(file_exists(implode('/', array($file->fileRealPath, $file->keyName))))
+				if (file_exists(implode('/', array($file->fileRealPath, $file->keyName))))
 				{
 					$file->fileName = $file->keyName;
 				}
@@ -188,18 +188,18 @@ 
 
 		$file->targetIe = $targetIe;
 
-		if($file->fileExtension == 'css')
+		if ($file->fileExtension == 'css')
 		{
 			$file->media = $media;
-			if(!$file->media)
+			if (!$file->media)
 			{
 				$file->media = 'all';
 			}
-			$file->key = $file->filePath . $file->keyName . "\t" . $file->targetIe . "\t" . $file->media;
+			$file->key = $file->filePath.$file->keyName."\t".$file->targetIe."\t".$file->media;
 		}
-		else if($file->fileExtension == 'js')
+		else if ($file->fileExtension == 'js')
 		{
-			$file->key = $file->filePath . $file->keyName . "\t" . $file->targetIe;
+			$file->key = $file->filePath.$file->keyName."\t".$file->targetIe;
 		}
 
 		return $file;
@@ -217,9 +217,9 @@ 
 	{
 		$file = $this->getFileInfo($fileName, $targetIe, $media);
 
-		if($file->fileExtension == 'css')
+		if ($file->fileExtension == 'css')
 		{
-			if(isset($this->cssMapIndex[$file->key]))
+			if (isset($this->cssMapIndex[$file->key]))
 			{
 				$index = $this->cssMapIndex[$file->key];
 				unset($this->cssMap[$index][$file->key], $this->cssMapIndex[$file->key]);
@@ -227,12 +227,12 @@ 
 		}
 		else
 		{
-			if(isset($this->jsHeadMapIndex[$file->key]))
+			if (isset($this->jsHeadMapIndex[$file->key]))
 			{
 				$index = $this->jsHeadMapIndex[$file->key];
 				unset($this->jsHeadMap[$index][$file->key], $this->jsHeadMapIndex[$file->key]);
 			}
-			if(isset($this->jsBodyMapIndex[$file->key]))
+			if (isset($this->jsBodyMapIndex[$file->key]))
 			{
 				$index = $this->jsBodyMapIndex[$file->key];
 				unset($this->jsBodyMap[$index][$file->key], $this->jsBodyMapIndex[$file->key]);
@@ -248,13 +248,13 @@ 
 	 */
 	function unloadAllFiles($type = 'all')
 	{
-		if($type == 'css' || $type == 'all')
+		if ($type == 'css' || $type == 'all')
 		{
 			$this->cssMap = array();
 			$this->cssMapIndex = array();
 		}
 
-		if($type == 'js' || $type == 'all')
+		if ($type == 'js' || $type == 'all')
 		{
 			$this->jsHeadMap = array();
 			$this->jsBodyMap = array();
@@ -276,23 +276,23 @@ 
 		$this->_sortMap($map, $mapIndex);
 
 		$result = array();
-		foreach($map as $indexedMap)
+		foreach ($map as $indexedMap)
 		{
-			foreach($indexedMap as $file)
+			foreach ($indexedMap as $file)
 			{
 				$query = '';
-				if(!$file->external && is_readable($file->cdnPath . '/' . $file->fileName))
+				if (!$file->external && is_readable($file->cdnPath.'/'.$file->fileName))
 				{
-					$query = date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName));
+					$query = date('YmdHis', filemtime($file->cdnPath.'/'.$file->fileName));
 				}
-				if($file->query)
+				if ($file->query)
 				{
-					if($query) $query .= '&';
+					if ($query) $query .= '&';
 					$query .= $file->query;
 				}
-				$query = ($query) ? '?' . $query : '';
+				$query = ($query) ? '?'.$query : '';
 
-				$fullFilePath = $file->filePath . '/' . $file->fileName . $query;
+				$fullFilePath = $file->filePath.'/'.$file->fileName.$query;
 				$result[] = array(
 					'file' => $fullFilePath,
 					'media' => $file->media,
@@ -313,9 +313,9 @@ 
 	function getJsFileList($type = 'head')
 	{
 		$ignore = array('modernizr.js', 'common.js', 'js_app.js', 'xml2json.js', 'xml_handler.js', 'xml_js_filter.js');
-		$pathCommonJs = getScriptPath() . 'common/js';
+		$pathCommonJs = getScriptPath().'common/js';
 
-		if($type == 'head')
+		if ($type == 'head')
 		{
 			$map = &$this->jsHeadMap;
 			$mapIndex = &$this->jsHeadMapIndex;
@@ -329,31 +329,31 @@ 
 		$this->_sortMap($map, $mapIndex);
 
 		$result = array();
-		foreach($map as $indexedMap)
+		foreach ($map as $indexedMap)
 		{
-			foreach($indexedMap as $file)
+			foreach ($indexedMap as $file)
 			{
-				if((!__DEBUG__ && __XE_VERSION_STABLE__) && $file->filePath === $pathCommonJs)
+				if ((!__DEBUG__ && __XE_VERSION_STABLE__) && $file->filePath === $pathCommonJs)
 				{
-					if(in_array($file->fileName, $ignore))
+					if (in_array($file->fileName, $ignore))
 					{
 						continue;
 					}
 				}
 
 				$query = '';
-				if(!$file->external && is_readable($file->cdnPath . '/' . $file->fileName))
+				if (!$file->external && is_readable($file->cdnPath.'/'.$file->fileName))
 				{
-					$query = date('YmdHis', filemtime($file->cdnPath . '/' . $file->fileName));
+					$query = date('YmdHis', filemtime($file->cdnPath.'/'.$file->fileName));
 				}
-				if($file->query)
+				if ($file->query)
 				{
-					if($query) $query .= '&';
+					if ($query) $query .= '&';
 					$query .= $file->query;
 				}
-				$query = ($query) ? '?' . $query : '';
+				$query = ($query) ? '?'.$query : '';
 
-				$fullFilePath = $file->filePath . '/' . $file->fileName . $query;
+				$fullFilePath = $file->filePath.'/'.$file->fileName.$query;
 				$result[] = array(
 					'file' => $fullFilePath,
 					'targetie' => $file->targetIe
@@ -384,18 +384,18 @@ 
 	 */
 	function _normalizeFilePath($path)
 	{
-		if(strpos($path, '://') === FALSE && $path{0} != '/' && $path{0} != '.')
+		if (strpos($path, '://') === FALSE && $path{0} != '/' && $path{0} != '.')
 		{
-			$path = './' . $path;
+			$path = './'.$path;
 		}
-		elseif(!strncmp($path, '//', 2))
+		elseif (!strncmp($path, '//', 2))
 		{
 			return preg_replace('#^//+#', '//', $path);
 		}
 
 		$path = preg_replace('@/\./|(?<!:)\/\/@', '/', $path);
 
-		while(strpos($path, '/../'))
+		while (strpos($path, '/../'))
 		{
 			$path = preg_replace('/\/([^\/]+)\/\.\.\//s', '/', $path, 1);
 		}
@@ -414,20 +414,20 @@ 
 		$path = $this->_normalizeFilePath($path);
 		$script_path = getScriptPath();
 
-		if(strpos($path, './') === 0)
+		if (strpos($path, './') === 0)
 		{
-			if($script_path == '/' || $script_path == '\\')
+			if ($script_path == '/' || $script_path == '\\')
 			{
-				$path = '/' . substr($path, 2);
+				$path = '/'.substr($path, 2);
 			}
 			else
 			{
-				$path = $script_path . substr($path, 2);
+				$path = $script_path.substr($path, 2);
 			}
 		}
-		else if(strpos($file, '../') === 0)
+		else if (strpos($file, '../') === 0)
 		{
-			$path = $this->_normalizeFilePath($script_path . $path);
+			$path = $this->_normalizeFilePath($script_path.$path);
 		}
 
 		return $path;
@@ -442,7 +442,7 @@ 
 	 */
 	function _arrangeCssIndex($dirName, &$file)
 	{
-		if($file->index !== 0)
+		if ($file->index !== 0)
 		{
 			return;
 		}

modules/integration_search/integration_search.model.php

Spacing +33 added lines, -33 removed lines

@@ -28,12 +28,12 @@ 
 	 *
 	 * @return Object output document list
 	 */
-	function getDocuments($target, $module_srls_list, $search_target, $search_keyword, $page=1, $list_count = 20)
+	function getDocuments($target, $module_srls_list, $search_target, $search_keyword, $page = 1, $list_count = 20)
 	{
-		if(is_array($module_srls_list)) $module_srls_list = implode(',',$module_srls_list);
+		if (is_array($module_srls_list)) $module_srls_list = implode(',', $module_srls_list);
 
 		$args = new stdClass();
-		if($target == 'exclude')
+		if ($target == 'exclude')
 		{
 			$module_srls_list .= ',0'; // exclude 'trash'
 			if ($module_srls_list{0} == ',') $module_srls_list = substr($module_srls_list, 1);
@@ -53,7 +53,7 @@ 
 		$args->sort_index = 'list_order';
 		$args->order_type = 'asc';
 		$args->statusList = array('PUBLIC');
-		if(!$args->module_srl) unset($args->module_srl);
+		if (!$args->module_srl) unset($args->module_srl);
 		// Get a list of documents
 		$oDocumentModel = getModel('document');
 
@@ -71,22 +71,22 @@ 
 	 *
 	 * @return Object output comment list
 	 */
-	function getComments($target, $module_srls_list, $search_keyword, $page=1, $list_count = 20)
+	function getComments($target, $module_srls_list, $search_keyword, $page = 1, $list_count = 20)
 	{
 		$args = new stdClass();
 
-		if(is_array($module_srls_list))
+		if (is_array($module_srls_list))
 		{
-			if (count($module_srls_list) > 0) $module_srls = implode(',',$module_srls_list);
+			if (count($module_srls_list) > 0) $module_srls = implode(',', $module_srls_list);
 		}
 		else
 		{
-			if($module_srls_list)
+			if ($module_srls_list)
 			{
 				$module_srls = $module_srls_list;
 			}
 		}
-		if($target == 'exclude') $args->exclude_module_srl = $module_srls;
+		if ($target == 'exclude') $args->exclude_module_srl = $module_srls;
 		else $args->module_srl = $module_srls;
 
 		$args->page = $page;
@@ -99,7 +99,7 @@ 
 		// Get a list of documents
 		$oCommentModel = getModel('comment');
 		$output = $oCommentModel->getTotalCommentList($args);
-		if(!$output->toBool()|| !$output->data) return $output;
+		if (!$output->toBool() || !$output->data) return $output;
 		return $output;
 	}
 
@@ -115,15 +115,15 @@ 
 	 *
 	 * @return Object output trackback list
 	 */
-	function getTrackbacks($target, $module_srls_list, $search_target = "title", $search_keyword, $page=1, $list_count = 20)
+	function getTrackbacks($target, $module_srls_list, $search_target = "title", $search_keyword, $page = 1, $list_count = 20)
 	{
 		$oTrackbackModel = getAdminModel('trackback');
-		if(!$oTrackbackModel) return new Object();
+		if (!$oTrackbackModel) return new Object();
 		$args = new stdClass();
 
-		if(is_array($module_srls_list)) $module_srls = implode(',',$module_srls_list);
+		if (is_array($module_srls_list)) $module_srls = implode(',', $module_srls_list);
 		else $module_srls = $module_srls_list;
-		if($target == 'exclude') $args->exclude_module_srl = $module_srls;
+		if ($target == 'exclude') $args->exclude_module_srl = $module_srls;
 		else $args->module_srl = $module_srls;
 		$args->page = $page;
 		$args->list_count = $list_count;
@@ -134,7 +134,7 @@ 
 		$args->order_type = 'asc';
 		// Get a list of documents
 		$output = $oTrackbackModel->getTotalTrackbackList($args);
-		if(!$output->toBool()|| !$output->data) return $output;
+		if (!$output->toBool() || !$output->data) return $output;
 		return $output;
 	}
 
@@ -154,9 +154,9 @@ 
 	{
 		$args = new stdClass();
 
-		if(is_array($module_srls_list)) $module_srls = implode(',',$module_srls_list);
+		if (is_array($module_srls_list)) $module_srls = implode(',', $module_srls_list);
 		else $module_srls = $module_srls_list;
-		if($target == 'exclude') $args->exclude_module_srl = $module_srls;
+		if ($target == 'exclude') $args->exclude_module_srl = $module_srls;
 		else $args->module_srl = $module_srls;
 		$args->page = $page;
 		$args->list_count = $list_count;
@@ -166,32 +166,32 @@ 
 		$args->sort_index = 'files.file_srl';
 		$args->order_type = 'desc';
 		$args->isvalid = 'Y';
-		$args->direct_download = $direct_download=='Y'?'Y':'N';
+		$args->direct_download = $direct_download == 'Y' ? 'Y' : 'N';
 		// Get a list of documents
 		$oFileAdminModel = getAdminModel('file');
 		$output = $oFileAdminModel->getFileList($args);
-		if(!$output->toBool() || !$output->data) return $output;
+		if (!$output->toBool() || !$output->data) return $output;
 
 		$list = array();
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			$obj = new stdClass;
 			$obj->filename = $val->source_filename;
 			$obj->download_count = $val->download_count;
-			if(substr($val->download_url,0,2)=='./') $val->download_url = substr($val->download_url,2);
+			if (substr($val->download_url, 0, 2) == './') $val->download_url = substr($val->download_url, 2);
 			$obj->download_url = Context::getRequestUri().$val->download_url;
 			$obj->target_srl = $val->upload_target_srl;
 			$obj->file_size = $val->file_size;
 			// Images
-			if(preg_match('/\.(jpg|jpeg|gif|png)$/i', $val->source_filename))
+			if (preg_match('/\.(jpg|jpeg|gif|png)$/i', $val->source_filename))
 			{
 				$obj->type = 'image';
 
-				$thumbnail_path = sprintf('files/thumbnails/%s',getNumberingPath($val->file_srl, 3));
-				if(!is_dir($thumbnail_path)) FileHandler::makeDir($thumbnail_path);
+				$thumbnail_path = sprintf('files/thumbnails/%s', getNumberingPath($val->file_srl, 3));
+				if (!is_dir($thumbnail_path)) FileHandler::makeDir($thumbnail_path);
 				$thumbnail_file = sprintf('%s%dx%d.%s.jpg', $thumbnail_path, 120, 120, 'crop');
 				$thumbnail_url  = Context::getRequestUri().$thumbnail_file;
-				if(!file_exists($thumbnail_file)) FileHandler::createImageFile($val->uploaded_filename, $thumbnail_file, 120, 120, 'jpg', 'crop');
+				if (!file_exists($thumbnail_file)) FileHandler::createImageFile($val->uploaded_filename, $thumbnail_file, 120, 120, 'jpg', 'crop');
 				$obj->src = sprintf('<img src="%s" alt="%s" width="%d" height="%d" />', $thumbnail_url, htmlspecialchars($obj->filename, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), 120, 120);
 			}
 			else
@@ -207,11 +207,11 @@ 
 
 		$oDocumentModel = getModel('document');
 		$document_list = $oDocumentModel->getDocuments($target_list);
-		if($document_list) foreach($document_list as $key => $val)
+		if ($document_list) foreach ($document_list as $key => $val)
 		{
-			foreach($output->data as $k => $v)
+			foreach ($output->data as $k => $v)
 			{
-				if($v->target_srl== $val->document_srl)
+				if ($v->target_srl == $val->document_srl)
 				{
 					$output->data[$k]->url = $val->getPermanentUrl();
 					$output->data[$k]->regdate = $val->getRegdate("Y-m-d H:i");
@@ -222,11 +222,11 @@ 
 
 		$oCommentModel = getModel('comment');
 		$comment_list = $oCommentModel->getComments($target_list);
-		if($comment_list) foreach($comment_list as $key => $val)
+		if ($comment_list) foreach ($comment_list as $key => $val)
 		{
-			foreach($output->data as $k => $v)
+			foreach ($output->data as $k => $v)
 			{
-				if($v->target_srl== $val->comment_srl)
+				if ($v->target_srl == $val->comment_srl)
 				{
 					$output->data[$k]->url = $val->getPermanentUrl();
 					$output->data[$k]->regdate = $val->getRegdate("Y-m-d H:i");
@@ -249,7 +249,7 @@ 
 	 *
 	 * @return Object
 	 */
-	function getImages($target, $module_srls_list, $search_keyword, $page=1, $list_count = 20)
+	function getImages($target, $module_srls_list, $search_keyword, $page = 1, $list_count = 20)
 	{
 		return $this->_getFiles($target, $module_srls_list, $search_keyword, $page, $list_count);
 	}
@@ -265,7 +265,7 @@ 
 	 *
 	 * @return Object
 	 */
-	function getFiles($target, $module_srls_list, $search_keyword, $page=1, $list_count = 20)
+	function getFiles($target, $module_srls_list, $search_keyword, $page = 1, $list_count = 20)
 	{
 		return $this->_getFiles($target, $module_srls_list, $search_keyword, $page, $list_count, 'N');
 	}

Braces +67 added lines, -29 removed lines

@@ -30,16 +30,19 @@ 
 	 */
 	function getDocuments($target, $module_srls_list, $search_target, $search_keyword, $page=1, $list_count = 20)
 	{
-		if(is_array($module_srls_list)) $module_srls_list = implode(',',$module_srls_list);
+		if(is_array($module_srls_list)) {
+			$module_srls_list = implode(',',$module_srls_list);
+		}
 
 		$args = new stdClass();
 		if($target == 'exclude')
 		{
 			$module_srls_list .= ',0'; // exclude 'trash'
-			if ($module_srls_list{0} == ',') $module_srls_list = substr($module_srls_list, 1);
+			if ($module_srls_list{0} == ',') {
+				$module_srls_list = substr($module_srls_list, 1);
+			}
 			$args->exclude_module_srl = $module_srls_list;
-		}
-		else
+		} else
 		{
 			$args->module_srl = $module_srls_list;
 			$args->exclude_module_srl = '0'; // exclude 'trash'
@@ -53,7 +56,9 @@ 
 		$args->sort_index = 'list_order';
 		$args->order_type = 'asc';
 		$args->statusList = array('PUBLIC');
-		if(!$args->module_srl) unset($args->module_srl);
+		if(!$args->module_srl) {
+			unset($args->module_srl);
+		}
 		// Get a list of documents
 		$oDocumentModel = getModel('document');
 
@@ -77,17 +82,21 @@ 
 
 		if(is_array($module_srls_list))
 		{
-			if (count($module_srls_list) > 0) $module_srls = implode(',',$module_srls_list);
-		}
-		else
+			if (count($module_srls_list) > 0) {
+				$module_srls = implode(',',$module_srls_list);
+			}
+		} else
 		{
 			if($module_srls_list)
 			{
 				$module_srls = $module_srls_list;
 			}
 		}
-		if($target == 'exclude') $args->exclude_module_srl = $module_srls;
-		else $args->module_srl = $module_srls;
+		if($target == 'exclude') {
+			$args->exclude_module_srl = $module_srls;
+		} else {
+			$args->module_srl = $module_srls;
+		}
 
 		$args->page = $page;
 		$args->list_count = $list_count;
@@ -99,7 +108,9 @@ 
 		// Get a list of documents
 		$oCommentModel = getModel('comment');
 		$output = $oCommentModel->getTotalCommentList($args);
-		if(!$output->toBool()|| !$output->data) return $output;
+		if(!$output->toBool()|| !$output->data) {
+			return $output;
+		}
 		return $output;
 	}
 
@@ -118,13 +129,21 @@ 
 	function getTrackbacks($target, $module_srls_list, $search_target = "title", $search_keyword, $page=1, $list_count = 20)
 	{
 		$oTrackbackModel = getAdminModel('trackback');
-		if(!$oTrackbackModel) return new Object();
+		if(!$oTrackbackModel) {
+			return new Object();
+		}
 		$args = new stdClass();
 
-		if(is_array($module_srls_list)) $module_srls = implode(',',$module_srls_list);
-		else $module_srls = $module_srls_list;
-		if($target == 'exclude') $args->exclude_module_srl = $module_srls;
-		else $args->module_srl = $module_srls;
+		if(is_array($module_srls_list)) {
+			$module_srls = implode(',',$module_srls_list);
+		} else {
+			$module_srls = $module_srls_list;
+		}
+		if($target == 'exclude') {
+			$args->exclude_module_srl = $module_srls;
+		} else {
+			$args->module_srl = $module_srls;
+		}
 		$args->page = $page;
 		$args->list_count = $list_count;
 		$args->page_count = 10;
@@ -134,7 +153,9 @@ 
 		$args->order_type = 'asc';
 		// Get a list of documents
 		$output = $oTrackbackModel->getTotalTrackbackList($args);
-		if(!$output->toBool()|| !$output->data) return $output;
+		if(!$output->toBool()|| !$output->data) {
+			return $output;
+		}
 		return $output;
 	}
 
@@ -154,10 +175,16 @@ 
 	{
 		$args = new stdClass();
 
-		if(is_array($module_srls_list)) $module_srls = implode(',',$module_srls_list);
-		else $module_srls = $module_srls_list;
-		if($target == 'exclude') $args->exclude_module_srl = $module_srls;
-		else $args->module_srl = $module_srls;
+		if(is_array($module_srls_list)) {
+			$module_srls = implode(',',$module_srls_list);
+		} else {
+			$module_srls = $module_srls_list;
+		}
+		if($target == 'exclude') {
+			$args->exclude_module_srl = $module_srls;
+		} else {
+			$args->module_srl = $module_srls;
+		}
 		$args->page = $page;
 		$args->list_count = $list_count;
 		$args->page_count = 10;
@@ -170,7 +197,9 @@ 
 		// Get a list of documents
 		$oFileAdminModel = getAdminModel('file');
 		$output = $oFileAdminModel->getFileList($args);
-		if(!$output->toBool() || !$output->data) return $output;
+		if(!$output->toBool() || !$output->data) {
+			return $output;
+		}
 
 		$list = array();
 		foreach($output->data as $key => $val)
@@ -178,7 +207,9 @@ 
 			$obj = new stdClass;
 			$obj->filename = $val->source_filename;
 			$obj->download_count = $val->download_count;
-			if(substr($val->download_url,0,2)=='./') $val->download_url = substr($val->download_url,2);
+			if(substr($val->download_url,0,2)=='./') {
+				$val->download_url = substr($val->download_url,2);
+			}
 			$obj->download_url = Context::getRequestUri().$val->download_url;
 			$obj->target_srl = $val->upload_target_srl;
 			$obj->file_size = $val->file_size;
@@ -188,13 +219,16 @@ 
 				$obj->type = 'image';
 
 				$thumbnail_path = sprintf('files/thumbnails/%s',getNumberingPath($val->file_srl, 3));
-				if(!is_dir($thumbnail_path)) FileHandler::makeDir($thumbnail_path);
+				if(!is_dir($thumbnail_path)) {
+					FileHandler::makeDir($thumbnail_path);
+				}
 				$thumbnail_file = sprintf('%s%dx%d.%s.jpg', $thumbnail_path, 120, 120, 'crop');
 				$thumbnail_url  = Context::getRequestUri().$thumbnail_file;
-				if(!file_exists($thumbnail_file)) FileHandler::createImageFile($val->uploaded_filename, $thumbnail_file, 120, 120, 'jpg', 'crop');
+				if(!file_exists($thumbnail_file)) {
+					FileHandler::createImageFile($val->uploaded_filename, $thumbnail_file, 120, 120, 'jpg', 'crop');
+				}
 				$obj->src = sprintf('<img src="%s" alt="%s" width="%d" height="%d" />', $thumbnail_url, htmlspecialchars($obj->filename, ENT_COMPAT | ENT_HTML401, 'UTF-8', false), 120, 120);
-			}
-			else
+			} else
 			{
 				$obj->type = 'binary';
 				$obj->src = '';
@@ -207,13 +241,15 @@ 
 
 		$oDocumentModel = getModel('document');
 		$document_list = $oDocumentModel->getDocuments($target_list);
-		if($document_list) foreach($document_list as $key => $val)
+		if($document_list) {
+			foreach($document_list as $key => $val)
 		{
 			foreach($output->data as $k => $v)
 			{
 				if($v->target_srl== $val->document_srl)
 				{
 					$output->data[$k]->url = $val->getPermanentUrl();
+		}
 					$output->data[$k]->regdate = $val->getRegdate("Y-m-d H:i");
 					$output->data[$k]->nick_name = $val->getNickName();
 				}
@@ -222,13 +258,15 @@ 
 
 		$oCommentModel = getModel('comment');
 		$comment_list = $oCommentModel->getComments($target_list);
-		if($comment_list) foreach($comment_list as $key => $val)
+		if($comment_list) {
+			foreach($comment_list as $key => $val)
 		{
 			foreach($output->data as $k => $v)
 			{
 				if($v->target_srl== $val->comment_srl)
 				{
 					$output->data[$k]->url = $val->getPermanentUrl();
+		}
 					$output->data[$k]->regdate = $val->getRegdate("Y-m-d H:i");
 					$output->data[$k]->nick_name = $val->getNickName();
 				}

modules/rss/rss.admin.controller.php

Spacing +21 added lines, -21 removed lines

@@ -27,41 +27,41 @@ 
 		$total_config = $oModuleModel->getModuleConfig('rss');
 
 		$config_vars = Context::getRequestVars();
-		$config_vars->feed_document_count = (int)$config_vars->feed_document_count;
+		$config_vars->feed_document_count = (int) $config_vars->feed_document_count;
 
-		if(!$config_vars->use_total_feed) $alt_message = 'msg_invalid_request';
-		if(!in_array($config_vars->use_total_feed, array('Y','N'))) $config_vars->open_rss = 'Y';
+		if (!$config_vars->use_total_feed) $alt_message = 'msg_invalid_request';
+		if (!in_array($config_vars->use_total_feed, array('Y', 'N'))) $config_vars->open_rss = 'Y';
 
-		if($config_vars->image || $config_vars->del_image)
+		if ($config_vars->image || $config_vars->del_image)
 		{
 			$image_obj = $config_vars->image;
 			$config_vars->image = $total_config->image;
 			// Get a variable for the delete request
-			if($config_vars->del_image == 'Y' || $image_obj)
+			if ($config_vars->del_image == 'Y' || $image_obj)
 			{
 				FileHandler::removeFile($config_vars->image);
 				$config_vars->image = '';
 				$total_config->image = '';
 			}
 			// Ignore if the file is not the one which has been successfully uploaded
-			if($image_obj['tmp_name'] && is_uploaded_file($image_obj['tmp_name']) && checkUploadedFile($image_obj['tmp_name']))
+			if ($image_obj['tmp_name'] && is_uploaded_file($image_obj['tmp_name']) && checkUploadedFile($image_obj['tmp_name']))
 			{
 				// Ignore if the file is not an image
 				$image_obj['name'] = Context::convertEncodingStr($image_obj['name']);
 
-				if(!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name'])) $alt_message = 'msg_rss_invalid_image_format';
+				if (!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name'])) $alt_message = 'msg_rss_invalid_image_format';
 				else
 				{
 					// Upload the file to a path
 					$path = './files/attach/images/rss/';
 					// Create a directory
-					if(!FileHandler::makeDir($path)) $alt_message = 'msg_error_occured';
+					if (!FileHandler::makeDir($path)) $alt_message = 'msg_error_occured';
 					else
 					{
 						$filename = $path.$image_obj['name'];
 
 						// Move the file
-						if(!move_uploaded_file($image_obj['tmp_name'], $filename)) $alt_message = 'msg_error_occured';
+						if (!move_uploaded_file($image_obj['tmp_name'], $filename)) $alt_message = 'msg_error_occured';
 						else
 						{
 							$config_vars->image = $filename;
@@ -70,11 +70,11 @@ 
 				}
 			}
 		}
-		if(!$config_vars->image && $config_vars->del_image != 'Y') $config_vars->image = $total_config->image;
+		if (!$config_vars->image && $config_vars->del_image != 'Y') $config_vars->image = $total_config->image;
 
 		$output = $this->setFeedConfig($config_vars);
 
-		if(!$alt_message) $alt_message = 'success_updated';
+		if (!$alt_message) $alt_message = 'success_updated';
 
 		$alt_message = Context::getLang($alt_message);
 		$this->setMessage($alt_message, 'info');
@@ -96,7 +96,7 @@ 
 		$originConfig = $oModuleModel->getModuleConfig('rss');
 
 		// Get a variable for the delete request
-		if($delImage == 'Y')
+		if ($delImage == 'Y')
 		{
 			FileHandler::removeFile($originConfig->image);
 
@@ -122,7 +122,7 @@ 
 		$feedCopyrightList = $config_vars->feed_copyright;
 		$targetModuleSrl = $config_vars->target_module_srl;
 
-		if($targetModuleSrl && !is_array($openRssList))
+		if ($targetModuleSrl && !is_array($openRssList))
 		{
 			$openRssList = array($targetModuleSrl => $openRssList);
 			$openTotalFeedList = array($targetModuleSrl => $openTotalFeedList);
@@ -130,16 +130,16 @@ 
 			$feedCopyrightList = array($targetModuleSrl => $feedCopyrightList);
 		}
 
-		if(is_array($openRssList))
+		if (is_array($openRssList))
 		{
-			foreach($openRssList AS $module_srl=>$open_rss)
+			foreach ($openRssList AS $module_srl=>$open_rss)
 			{
-				if(!$module_srl || !$open_rss)
+				if (!$module_srl || !$open_rss)
 				{
 					return new Object(-1, 'msg_invalid_request');
 				}
 
-				if(!in_array($open_rss, array('Y','H','N'))) $open_rss = 'N';
+				if (!in_array($open_rss, array('Y', 'H', 'N'))) $open_rss = 'N';
 
 				$this->setRssModuleConfig($module_srl, $open_rss, $openTotalFeedList[$module_srl], $feedDescriptionList[$module_srl], $feedCopyrightList[$module_srl]);
 			}
@@ -161,7 +161,7 @@ 
 	function setFeedConfig($config)
 	{
 		$oModuleController = getController('module');
-		$oModuleController->insertModuleConfig('rss',$config);
+		$oModuleController->insertModuleConfig('rss', $config);
 		return new Object();
 	}
 
@@ -181,9 +181,9 @@ 
 		$config = new stdClass;
 		$config->open_rss = $open_rss;
 		$config->open_total_feed = $open_total_feed;
-		if($feed_description != 'N') { $config->feed_description = $feed_description; }
-		if($feed_copyright != 'N') { $config->feed_copyright = $feed_copyright; }
-		$oModuleController->insertModulePartConfig('rss',$module_srl,$config);
+		if ($feed_description != 'N') { $config->feed_description = $feed_description; }
+		if ($feed_copyright != 'N') { $config->feed_copyright = $feed_copyright; }
+		$oModuleController->insertModulePartConfig('rss', $module_srl, $config);
 		return new Object();
 	}
 }

Braces +24 added lines, -11 removed lines

@@ -29,8 +29,12 @@ 
 		$config_vars = Context::getRequestVars();
 		$config_vars->feed_document_count = (int)$config_vars->feed_document_count;
 
-		if(!$config_vars->use_total_feed) $alt_message = 'msg_invalid_request';
-		if(!in_array($config_vars->use_total_feed, array('Y','N'))) $config_vars->open_rss = 'Y';
+		if(!$config_vars->use_total_feed) {
+			$alt_message = 'msg_invalid_request';
+		}
+		if(!in_array($config_vars->use_total_feed, array('Y','N'))) {
+			$config_vars->open_rss = 'Y';
+		}
 
 		if($config_vars->image || $config_vars->del_image)
 		{
@@ -49,20 +53,23 @@ 
 				// Ignore if the file is not an image
 				$image_obj['name'] = Context::convertEncodingStr($image_obj['name']);
 
-				if(!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name'])) $alt_message = 'msg_rss_invalid_image_format';
-				else
+				if(!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name'])) {
+					$alt_message = 'msg_rss_invalid_image_format';
+				} else
 				{
 					// Upload the file to a path
 					$path = './files/attach/images/rss/';
 					// Create a directory
-					if(!FileHandler::makeDir($path)) $alt_message = 'msg_error_occured';
-					else
+					if(!FileHandler::makeDir($path)) {
+						$alt_message = 'msg_error_occured';
+					} else
 					{
 						$filename = $path.$image_obj['name'];
 
 						// Move the file
-						if(!move_uploaded_file($image_obj['tmp_name'], $filename)) $alt_message = 'msg_error_occured';
-						else
+						if(!move_uploaded_file($image_obj['tmp_name'], $filename)) {
+							$alt_message = 'msg_error_occured';
+						} else
 						{
 							$config_vars->image = $filename;
 						}
@@ -70,11 +77,15 @@ 
 				}
 			}
 		}
-		if(!$config_vars->image && $config_vars->del_image != 'Y') $config_vars->image = $total_config->image;
+		if(!$config_vars->image && $config_vars->del_image != 'Y') {
+			$config_vars->image = $total_config->image;
+		}
 
 		$output = $this->setFeedConfig($config_vars);
 
-		if(!$alt_message) $alt_message = 'success_updated';
+		if(!$alt_message) {
+			$alt_message = 'success_updated';
+		}
 
 		$alt_message = Context::getLang($alt_message);
 		$this->setMessage($alt_message, 'info');
@@ -139,7 +150,9 @@ 
 					return new Object(-1, 'msg_invalid_request');
 				}
 
-				if(!in_array($open_rss, array('Y','H','N'))) $open_rss = 'N';
+				if(!in_array($open_rss, array('Y','H','N'))) {
+					$open_rss = 'N';
+				}
 
 				$this->setRssModuleConfig($module_srl, $open_rss, $openTotalFeedList[$module_srl], $feedDescriptionList[$module_srl], $feedCopyrightList[$module_srl]);
 			}

modules/layout/layout.admin.controller.php

Spacing +144 added lines, -144 removed lines

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

modules/layout/layout.model.php

Spacing +151 added lines, -151 removed lines

@@ -31,21 +31,21 @@ 
 	 * @param array $columnList
 	 * @return array layout lists in site
 	 */
-	function getLayoutList($site_srl = 0, $layout_type="P", $columnList = array())
+	function getLayoutList($site_srl = 0, $layout_type = "P", $columnList = array())
 	{
-		if(!$site_srl)
+		if (!$site_srl)
 		{
 			$site_module_info = Context::get('site_module_info');
-			$site_srl = (int)$site_module_info->site_srl;
+			$site_srl = (int) $site_module_info->site_srl;
 		}
 		$args = new stdClass();
 		$args->site_srl = $site_srl;
 		$args->layout_type = $layout_type;
 		$output = executeQueryArray('layout.getLayoutList', $args, $columnList);
 
-		foreach($output->data as $no => &$val)
+		foreach ($output->data as $no => &$val)
 		{
-			if(!$this->isExistsLayoutFile($val->layout, $layout_type))
+			if (!$this->isExistsLayoutFile($val->layout, $layout_type))
 			{
 				unset($output->data[$no]);
 			}
@@ -53,7 +53,7 @@ 
 
 		$oLayoutAdminModel = getAdminModel('layout');
 		$siteDefaultLayoutSrl = $oLayoutAdminModel->getSiteDefaultLayout($layout_type, $site_srl);
-		if($siteDefaultLayoutSrl)
+		if ($siteDefaultLayoutSrl)
 		{
 			$siteDefaultLayoutInfo = $this->getlayout($siteDefaultLayoutSrl);
 			$newLayout = sprintf('%s, %s', $siteDefaultLayoutInfo->title, $siteDefaultLayoutInfo->layout);
@@ -80,24 +80,24 @@ 
 		$layoutList = $this->getLayoutInstanceList($siteSrl, $layoutType);
 		$thumbs = array();
 
-		foreach($layoutList as $key => $val)
+		foreach ($layoutList as $key => $val)
 		{
-			if($thumbs[$val->layouts])
+			if ($thumbs[$val->layouts])
 			{
 				$val->thumbnail = $thumbs[$val->layouts];
 				continue;
 			}
 
 			$token = explode('|@|', $val->layout);
-			if(count($token) == 2)
+			if (count($token) == 2)
 			{
-				$thumbnailPath = sprintf('./themes/%s/layouts/%s/thumbnail.png' , $token[0], $token[1]);
+				$thumbnailPath = sprintf('./themes/%s/layouts/%s/thumbnail.png', $token[0], $token[1]);
 			}
 			else
 			{
-				$thumbnailPath = sprintf('./layouts/%s/thumbnail.png' , $val->layout);
+				$thumbnailPath = sprintf('./layouts/%s/thumbnail.png', $val->layout);
 			}
-			if(is_readable($thumbnailPath))
+			if (is_readable($thumbnailPath))
 			{
 				$val->thumbnail = $thumbnailPath;
 			}
@@ -123,7 +123,7 @@ 
 		if (!$siteSrl)
 		{
 			$siteModuleInfo = Context::get('site_module_info');
-			$siteSrl = (int)$siteModuleInfo->site_srl;
+			$siteSrl = (int) $siteModuleInfo->site_srl;
 		}
 		$args = new stdClass();
 		$args->site_srl = $siteSrl;
@@ -133,11 +133,11 @@ 
 
 		// Create instance name list
 		$instanceList = array();
-		if(is_array($output->data))
+		if (is_array($output->data))
 		{
-			foreach($output->data as $no => $iInfo)
+			foreach ($output->data as $no => $iInfo)
 			{
-				if($this->isExistsLayoutFile($iInfo->layout, $layoutType))
+				if ($this->isExistsLayoutFile($iInfo->layout, $layoutType))
 				{
 					$instanceList[] = $iInfo->layout;
 				}
@@ -152,18 +152,18 @@ 
 		$downloadedList = array();
 		$titleList = array();
 		$_downloadedList = $this->getDownloadedLayoutList($layoutType);
-		if(is_array($_downloadedList))
+		if (is_array($_downloadedList))
 		{
-			foreach($_downloadedList as $dLayoutInfo)
+			foreach ($_downloadedList as $dLayoutInfo)
 			{
 				$downloadedList[$dLayoutInfo->layout] = $dLayoutInfo->layout;
 				$titleList[$dLayoutInfo->layout] = $dLayoutInfo->title;
 			}
 		}
 
-		if($layout)
+		if ($layout)
 		{
-			if(count($instanceList) < 1 && $downloadedList[$layout])
+			if (count($instanceList) < 1 && $downloadedList[$layout])
 			{
 				$insertArgs = new stdClass();
 				$insertArgs->site_srl = $siteSrl;
@@ -181,7 +181,7 @@ 
 		{
 			// Get downloaded name list have no instance
 			$noInstanceList = array_diff($downloadedList, $instanceList);
-			foreach($noInstanceList as $layoutName)
+			foreach ($noInstanceList as $layoutName)
 			{
 				$insertArgs = new stdClass();
 				$insertArgs->site_srl = $siteSrl;
@@ -197,15 +197,15 @@ 
 		}
 
 		// If create layout instance, reload instance list
-		if($isCreateInstance)
+		if ($isCreateInstance)
 		{
 			$output = executeQueryArray('layout.getLayoutList', $args, $columnList);
 
-			if(is_array($output->data))
+			if (is_array($output->data))
 			{
-				foreach($output->data as $no => $iInfo)
+				foreach ($output->data as $no => $iInfo)
 				{
-					if(!$this->isExistsLayoutFile($iInfo->layout, $layoutType))
+					if (!$this->isExistsLayoutFile($iInfo->layout, $layoutType))
 					{
 						unset($output->data[$no]);
 					}
@@ -226,28 +226,28 @@ 
 	function isExistsLayoutFile($layout, $layoutType)
 	{
 		//TODO If remove a support themes, remove this codes also.
-		if($layoutType == 'P')
+		if ($layoutType == 'P')
 		{
-			$pathPrefix = _XE_PATH_ . 'layouts/';
-			$themePathFormat = _XE_PATH_ . 'themes/%s/layouts/%s';
+			$pathPrefix = _XE_PATH_.'layouts/';
+			$themePathFormat = _XE_PATH_.'themes/%s/layouts/%s';
 		}
 		else
 		{
-			$pathPrefix = _XE_PATH_ . 'm.layouts/';
-			$themePathFormat = _XE_PATH_ . 'themes/%s/m.layouts/%s';
+			$pathPrefix = _XE_PATH_.'m.layouts/';
+			$themePathFormat = _XE_PATH_.'themes/%s/m.layouts/%s';
 		}
 
-		if(strpos($layout, '|@|') !== FALSE)
+		if (strpos($layout, '|@|') !== FALSE)
 		{
 			list($themeName, $layoutName) = explode('|@|', $layout);
 			$path = sprintf($themePathFormat, $themeName, $layoutName);
 		}
 		else
 		{
-			$path = $pathPrefix . $layout;
+			$path = $pathPrefix.$layout;
 		}
 
-		return is_readable($path . '/layout.html');
+		return is_readable($path.'/layout.html');
 	}
 
 	/**
@@ -262,7 +262,7 @@ 
 		$args = new stdClass();
 		$args->layout_srl = $layout_srl;
 		$output = executeQuery('layout.getLayout', $args);
-		if(!$output->data) return;
+		if (!$output->data) return;
 
 		// Return xml file informaton after listing up the layout and extra_vars
 		$layout_info = $this->getLayoutInfo($layout, $output->data, $output->data->layout_type);
@@ -275,7 +275,7 @@ 
 		$args = new stdClass();
 		$args->layout_srl = $layout_srl;
 		$output = executeQuery('layout.getLayout', $args, $columnList);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return;
 		}
@@ -292,15 +292,15 @@ 
 	function getLayoutPath($layout_name = "", $layout_type = "P")
 	{
 		$layout_parse = explode('|@|', $layout_name);
-		if(count($layout_parse) > 1)
+		if (count($layout_parse) > 1)
 		{
 			$class_path = './themes/'.$layout_parse[0].'/layouts/'.$layout_parse[1].'/';
 		}
-		else if($layout_name == 'faceoff')
+		else if ($layout_name == 'faceoff')
 		{
 			$class_path = './modules/layout/faceoff/';
 		}
-		else if($layout_type == "M")
+		else if ($layout_type == "M")
 		{
 			$class_path = sprintf("./m.layouts/%s/", $layout_name);
 		}
@@ -308,7 +308,7 @@ 
 		{
 			$class_path = sprintf('./layouts/%s/', $layout_name);
 		}
-		if(is_dir($class_path)) return $class_path;
+		if (is_dir($class_path)) return $class_path;
 		return "";
 	}
 
@@ -326,24 +326,24 @@ 
 		// Get a list of downloaded layout and installed layout
 		$searched_list = $this->_getInstalledLayoutDirectories($layout_type);
 		$searched_count = count($searched_list);
-		if(!$searched_count) return;
+		if (!$searched_count) return;
 
 		// natcasesort($searched_list);
 		// Return information for looping searched list of layouts
 		$list = array();
-		for($i=0;$i<$searched_count;$i++)
+		for ($i = 0; $i < $searched_count; $i++)
 		{
 			// Name of the layout
 			$layout = $searched_list[$i];
 			// Get information of the layout
 			$layout_info = $this->getLayoutInfo($layout, null, $layout_type);
 
-			if(!$layout_info)
+			if (!$layout_info)
 			{
 				continue;
 			}
 
-			if($withAutoinstallInfo)
+			if ($withAutoinstallInfo)
 			{
 				// get easyinstall remove url
 				$packageSrl = $oAutoinstallModel->getPackageSrlByPath($layout_info->path);
@@ -354,7 +354,7 @@ 
 				$layout_info->need_update = $package[$packageSrl]->need_update;
 
 				// get easyinstall update url
-				if($layout_info->need_update)
+				if ($layout_info->need_update)
 				{
 					$layout_info->update_url = $oAutoinstallModel->getUpdateUrlByPackageSrl($packageSrl);
 				}
@@ -371,12 +371,12 @@ 
 	 */
 	function sortLayoutByTitle($a, $b)
 	{
-		if(!$a->title)
+		if (!$a->title)
 		{
 			$a->title = $a->layout;
 		}
 
-		if(!$b->title)
+		if (!$b->title)
 		{
 			$b->title = $b->layout;
 		}
@@ -384,7 +384,7 @@ 
 		$aTitle = strtolower($a->title);
 		$bTitle = strtolower($b->title);
 
-		if($aTitle == $bTitle)
+		if ($aTitle == $bTitle)
 		{
 			return 0;
 		}
@@ -410,7 +410,7 @@ 
 	 */
 	function _getInstalledLayoutDirectories($layoutType = 'P')
 	{
-		if($layoutType == 'M')
+		if ($layoutType == 'M')
 		{
 			$directory = './m.layouts';
 			$globalValueKey = 'MOBILE_LAYOUT_DIRECTOIES';
@@ -421,7 +421,7 @@ 
 			$globalValueKey = 'PC_LAYOUT_DIRECTORIES';
 		}
 
-		if($GLOBALS[$globalValueKey]) return $GLOBALS[$globalValueKey];
+		if ($GLOBALS[$globalValueKey]) return $GLOBALS[$globalValueKey];
 
 		$searchedList = FileHandler::readDir($directory);
 		if (!$searchedList) $searchedList = array();
@@ -440,7 +440,7 @@ 
 	 */
 	function getLayoutInfo($layout, $info = null, $layout_type = "P")
 	{
-		if($info)
+		if ($info)
 		{
 			$layout_title = $info->title;
 			$layout = $info->layout;
@@ -448,35 +448,35 @@ 
 			$site_srl = $info->site_srl;
 			$vars = unserialize($info->extra_vars);
 
-			if($info->module_srl)
+			if ($info->module_srl)
 			{
-				$layout_path = preg_replace('/([a-zA-Z0-9\_\.]+)(\.html)$/','',$info->layout_path);
+				$layout_path = preg_replace('/([a-zA-Z0-9\_\.]+)(\.html)$/', '', $info->layout_path);
 				$xml_file = sprintf('%sskin.xml', $layout_path);
 			}
 		}
 
 		// Get a path of the requested module. Return if not exists.
-		if(!$layout_path) $layout_path = $this->getLayoutPath($layout, $layout_type);
-		if(!is_dir($layout_path)) return;
+		if (!$layout_path) $layout_path = $this->getLayoutPath($layout, $layout_type);
+		if (!is_dir($layout_path)) return;
 
 		// Read the xml file for module skin information
-		if(!$xml_file) $xml_file = sprintf("%sconf/info.xml", $layout_path);
-		if(!file_exists($xml_file))
+		if (!$xml_file) $xml_file = sprintf("%sconf/info.xml", $layout_path);
+		if (!file_exists($xml_file))
 		{
 			$layout_info = new stdClass;
 			$layout_info->title = $layout;
 			$layout_info->layout = $layout;
 			$layout_info->path = $layout_path;
 			$layout_info->layout_title = $layout_title;
-			if(!$layout_info->layout_type)
+			if (!$layout_info->layout_type)
 			{
-				$layout_info->layout_type =  $layout_type;
+				$layout_info->layout_type = $layout_type;
 			}
 			return $layout_info;
 		}
 
 		// Include the cache file if it is valid and then return $layout_info variable
-		if(!$layout_srl)
+		if (!$layout_srl)
 		{
 			$cache_file = $this->getLayoutCache($layout, Context::getLangType(), $layout_type);
 		}
@@ -485,22 +485,22 @@ 
 			$cache_file = $this->getUserLayoutCache($layout_srl, Context::getLangType());
 		}
 
-		if(file_exists($cache_file)&&filemtime($cache_file)>filemtime($xml_file))
+		if (file_exists($cache_file) && filemtime($cache_file) > filemtime($xml_file))
 		{
 			include($cache_file);
 
-			if($layout_info->extra_var && $vars)
+			if ($layout_info->extra_var && $vars)
 			{
-				foreach($vars as $key => $value)
+				foreach ($vars as $key => $value)
 				{
-					if(!$layout_info->extra_var->{$key} && !$layout_info->{$key})
+					if (!$layout_info->extra_var->{$key} && !$layout_info->{$key})
 					{
 						$layout_info->{$key} = $value;
 					}
 				}
 			}
 
-			if(!$layout_info->title)
+			if (!$layout_info->title)
 			{
 				$layout_info->title = $layout;
 			}
@@ -511,16 +511,16 @@ 
 		$oXmlParser = new XmlParser();
 		$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
 
-		if($tmp_xml_obj->layout) $xml_obj = $tmp_xml_obj->layout;
-		elseif($tmp_xml_obj->skin) $xml_obj = $tmp_xml_obj->skin;
+		if ($tmp_xml_obj->layout) $xml_obj = $tmp_xml_obj->layout;
+		elseif ($tmp_xml_obj->skin) $xml_obj = $tmp_xml_obj->skin;
 
-		if(!$xml_obj) return;
+		if (!$xml_obj) return;
 
 		$buff = array();
 		$buff[] = '$layout_info = new stdClass;';
 		$buff[] = sprintf('$layout_info->site_srl = "%s";', $site_srl);
 
-		if($xml_obj->version && $xml_obj->attrs->version == '0.2')
+		if ($xml_obj->version && $xml_obj->attrs->version == '0.2')
 		{
 			// Layout title, version and other information
 			sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
@@ -540,11 +540,11 @@ 
 			$buff[] = sprintf('$layout_info->layout_type = "%s";', $layout_type);
 
 			// Author information
-			if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
+			if (!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
 			else $author_list = $xml_obj->author;
 
 			$buff[] = '$layout_info->author = array();';
-			for($i=0, $c=count($author_list); $i<$c; $i++)
+			for ($i = 0, $c = count($author_list); $i < $c; $i++)
 			{
 				$buff[] = sprintf('$layout_info->author[%d] = new stdClass;', $i);
 				$buff[] = sprintf('$layout_info->author[%d]->name = "%s";', $i, $author_list[$i]->name->body);
@@ -554,22 +554,22 @@ 
 
 			// Extra vars (user defined variables to use in a template)
 			$extra_var_groups = $xml_obj->extra_vars->group;
-			if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-			if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+			if (!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+			if (!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
 
 			$buff[] = '$layout_info->extra_var = new stdClass;';
 			$extra_var_count = 0;
-			foreach($extra_var_groups as $group)
+			foreach ($extra_var_groups as $group)
 			{
 				$extra_vars = $group->var;
-				if($extra_vars)
+				if ($extra_vars)
 				{
-					if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
+					if (!is_array($extra_vars)) $extra_vars = array($extra_vars);
 
 					$count = count($extra_vars);
 					$extra_var_count += $count;
 					
-					for($i=0;$i<$count;$i++)
+					for ($i = 0; $i < $count; $i++)
 					{
 						unset($var, $options);
 						$var = $extra_vars[$i];
@@ -580,26 +580,26 @@ 
 						$buff[] = sprintf('$layout_info->extra_var->%s->title = "%s";', $name, $var->title->body);
 						$buff[] = sprintf('$layout_info->extra_var->%s->type = "%s";', $name, $var->attrs->type);
 						$buff[] = sprintf('$layout_info->extra_var->%s->value = $vars->%s;', $name, $name);
-						$buff[] = sprintf('$layout_info->extra_var->%s->description = "%s";', $name, str_replace('"','\"',$var->description->body));
+						$buff[] = sprintf('$layout_info->extra_var->%s->description = "%s";', $name, str_replace('"', '\"', $var->description->body));
 
 						$options = $var->options;
-						if(!$options) continue;
-						if(!is_array($options)) $options = array($options);
+						if (!$options) continue;
+						if (!is_array($options)) $options = array($options);
 
 						$buff[] = sprintf('$layout_info->extra_var->%s->options = array();', $var->attrs->name);
 						$options_count = count($options);
 						$thumbnail_exist = false;
-						for($j=0; $j < $options_count; $j++)
+						for ($j = 0; $j < $options_count; $j++)
 						{
 							$buff[] = sprintf('$layout_info->extra_var->%s->options["%s"] = new stdClass;', $var->attrs->name, $options[$j]->attrs->value);
 							$thumbnail = $options[$j]->attrs->src;
-							if($thumbnail)
+							if ($thumbnail)
 							{
 								$thumbnail = $layout_path.$thumbnail;
-								if(file_exists($thumbnail))
+								if (file_exists($thumbnail))
 								{
 									$buff[] = sprintf('$layout_info->extra_var->%s->options["%s"]->thumbnail = "%s";', $var->attrs->name, $options[$j]->attrs->value, $thumbnail);
-									if(!$thumbnail_exist)
+									if (!$thumbnail_exist)
 									{
 										$buff[] = sprintf('$layout_info->extra_var->%s->thumbnail_exist = true;', $var->attrs->name);
 										$thumbnail_exist = true;
@@ -613,26 +613,26 @@ 
 			}
 			$buff[] = sprintf('$layout_info->extra_var_count = "%s";', $extra_var_count);
 			// Menu
-			if($xml_obj->menus->menu)
+			if ($xml_obj->menus->menu)
 			{
 				$menus = $xml_obj->menus->menu;
-				if(!is_array($menus)) $menus = array($menus);
+				if (!is_array($menus)) $menus = array($menus);
 
 				$menu_count = count($menus);
 				$buff[] = sprintf('$layout_info->menu_count = "%s";', $menu_count);
 				$buff[] = '$layout_info->menu = new stdClass;';
-				for($i=0;$i<$menu_count;$i++)
+				for ($i = 0; $i < $menu_count; $i++)
 				{
 					$name = $menus[$i]->attrs->name;
-					if($menus[$i]->attrs->default == "true") $buff[] = sprintf('$layout_info->default_menu = "%s";', $name);
+					if ($menus[$i]->attrs->default == "true") $buff[] = sprintf('$layout_info->default_menu = "%s";', $name);
 					$buff[] = sprintf('$layout_info->menu->%s = new stdClass;', $name);
-					$buff[] = sprintf('$layout_info->menu->%s->name = "%s";',$name, $menus[$i]->attrs->name);
-					$buff[] = sprintf('$layout_info->menu->%s->title = "%s";',$name, $menus[$i]->title->body);
-					$buff[] = sprintf('$layout_info->menu->%s->maxdepth = "%s";',$name, $menus[$i]->attrs->maxdepth);
+					$buff[] = sprintf('$layout_info->menu->%s->name = "%s";', $name, $menus[$i]->attrs->name);
+					$buff[] = sprintf('$layout_info->menu->%s->title = "%s";', $name, $menus[$i]->title->body);
+					$buff[] = sprintf('$layout_info->menu->%s->maxdepth = "%s";', $name, $menus[$i]->attrs->maxdepth);
 
 					$buff[] = sprintf('$layout_info->menu->%s->menu_srl = $vars->%s;', $name, $name);
-					$buff[] = sprintf('$layout_info->menu->%s->xml_file = "./files/cache/menu/".$vars->%s.".xml.php";',$name, $name);
-					$buff[] = sprintf('$layout_info->menu->%s->php_file = "./files/cache/menu/".$vars->%s.".php";',$name, $name);
+					$buff[] = sprintf('$layout_info->menu->%s->xml_file = "./files/cache/menu/".$vars->%s.".xml.php";', $name, $name);
+					$buff[] = sprintf('$layout_info->menu->%s->php_file = "./files/cache/menu/".$vars->%s.".php";', $name, $name);
 				}
 			}
 		}
@@ -655,19 +655,19 @@ 
 			$buff[] = sprintf('$layout_info->author[0]->homepage = "%s";', $xml_obj->author->attrs->link);
 			// Extra vars (user defined variables to use in a template)
 			$extra_var_groups = $xml_obj->extra_vars->group;
-			if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-			if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
-			foreach($extra_var_groups as $group)
+			if (!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+			if (!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+			foreach ($extra_var_groups as $group)
 			{
 				$extra_vars = $group->var;
-				if($extra_vars)
+				if ($extra_vars)
 				{
-					if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
+					if (!is_array($extra_vars)) $extra_vars = array($extra_vars);
 
 					$extra_var_count = count($extra_vars);
 
 					$buff[] = sprintf('$layout_info->extra_var_count = "%s";', $extra_var_count);
-					for($i=0;$i<$extra_var_count;$i++)
+					for ($i = 0; $i < $extra_var_count; $i++)
 					{
 						unset($var, $options);
 						$var = $extra_vars[$i];
@@ -677,14 +677,14 @@ 
 						$buff[] = sprintf('$layout_info->extra_var->%s->title = "%s";', $name, $var->title->body);
 						$buff[] = sprintf('$layout_info->extra_var->%s->type = "%s";', $name, $var->attrs->type);
 						$buff[] = sprintf('$layout_info->extra_var->%s->value = $vars->%s;', $name, $name);
-						$buff[] = sprintf('$layout_info->extra_var->%s->description = "%s";', $name, str_replace('"','\"',$var->description->body));
+						$buff[] = sprintf('$layout_info->extra_var->%s->description = "%s";', $name, str_replace('"', '\"', $var->description->body));
 
 						$options = $var->options;
-						if(!$options) continue;
+						if (!$options) continue;
 
-						if(!is_array($options)) $options = array($options);
+						if (!is_array($options)) $options = array($options);
 						$options_count = count($options);
-						for($j=0;$j<$options_count;$j++)
+						for ($j = 0; $j < $options_count; $j++)
 						{
 							$buff[] = sprintf('$layout_info->extra_var->%s->options["%s"]->val = "%s";', $var->attrs->name, $options[$j]->value->body, $options[$j]->title->body);
 						}
@@ -692,23 +692,23 @@ 
 				}
 			}
 			// Menu
-			if($xml_obj->menus->menu)
+			if ($xml_obj->menus->menu)
 			{
 				$menus = $xml_obj->menus->menu;
-				if(!is_array($menus)) $menus = array($menus);
+				if (!is_array($menus)) $menus = array($menus);
 
 				$menu_count = count($menus);
 				$buff[] = sprintf('$layout_info->menu_count = "%s";', $menu_count);
-				for($i=0;$i<$menu_count;$i++)
+				for ($i = 0; $i < $menu_count; $i++)
 				{
 					$name = $menus[$i]->attrs->name;
-					if($menus[$i]->attrs->default == "true") $buff[] = sprintf('$layout_info->default_menu = "%s";', $name);
-					$buff[] = sprintf('$layout_info->menu->%s->name = "%s";',$name, $name);
-					$buff[] = sprintf('$layout_info->menu->%s->title = "%s";',$name, $menus[$i]->title->body);
-					$buff[] = sprintf('$layout_info->menu->%s->maxdepth = "%s";',$name, $menus[$i]->maxdepth->body);
+					if ($menus[$i]->attrs->default == "true") $buff[] = sprintf('$layout_info->default_menu = "%s";', $name);
+					$buff[] = sprintf('$layout_info->menu->%s->name = "%s";', $name, $name);
+					$buff[] = sprintf('$layout_info->menu->%s->title = "%s";', $name, $menus[$i]->title->body);
+					$buff[] = sprintf('$layout_info->menu->%s->maxdepth = "%s";', $name, $menus[$i]->maxdepth->body);
 					$buff[] = sprintf('$layout_info->menu->%s->menu_srl = $vars->%s;', $name, $name);
-					$buff[] = sprintf('$layout_info->menu->%s->xml_file = "./files/cache/menu/".$vars->%s.".xml.php";',$name, $name);
-					$buff[] = sprintf('$layout_info->menu->%s->php_file = "./files/cache/menu/".$vars->%s.".php";',$name, $name);
+					$buff[] = sprintf('$layout_info->menu->%s->xml_file = "./files/cache/menu/".$vars->%s.".xml.php";', $name, $name);
+					$buff[] = sprintf('$layout_info->menu->%s->php_file = "./files/cache/menu/".$vars->%s.".php";', $name, $name);
 				}
 			}
 		}
@@ -718,15 +718,15 @@ 
 		$layout_config = $oModuleModel->getModulePartConfig('layout', $layout_srl);
 		$header_script = trim($layout_config->header_script);
 
-		if($header_script)
+		if ($header_script)
 		{
-			$buff[] = sprintf(' $layout_info->header_script = "%s"; ', str_replace(array('$','"'),array('\$','\\"'),$header_script));
+			$buff[] = sprintf(' $layout_info->header_script = "%s"; ', str_replace(array('$', '"'), array('\$', '\\"'), $header_script));
 		}
 
-		FileHandler::writeFile($cache_file, '<?php if(!defined("__XE__")) exit(); ' . join(PHP_EOL, $buff));
-		if(FileHandler::exists($cache_file)) include($cache_file);
+		FileHandler::writeFile($cache_file, '<?php if(!defined("__XE__")) exit(); '.join(PHP_EOL, $buff));
+		if (FileHandler::exists($cache_file)) include($cache_file);
 
-		if(!$layout_info->title)
+		if (!$layout_info->title)
 		{
 			$layout_info->title = $layout;
 		}
@@ -750,12 +750,12 @@ 
 	 * @param string $layout_name
 	 * @return array
 	 */
-	function getUserLayoutIniConfig($layout_srl, $layout_name=null)
+	function getUserLayoutIniConfig($layout_srl, $layout_name = null)
 	{
 		$file = $this->getUserLayoutIni($layout_srl);
-		if($layout_name && FileHandler::exists($file) === FALSE)
+		if ($layout_name && FileHandler::exists($file) === FALSE)
 		{
-			FileHandler::copyFile($this->getDefaultLayoutIni($layout_name),$this->getUserLayoutIni($layout_srl));
+			FileHandler::copyFile($this->getDefaultLayoutIni($layout_name), $this->getUserLayoutIni($layout_srl));
 		}
 
 		return FileHandler::readIniFile($file);
@@ -768,7 +768,7 @@ 
 	 */
 	function getUserLayoutPath($layout_srl)
 	{
-		return sprintf("./files/faceOff/%s", getNumberingPath($layout_srl,3));
+		return sprintf("./files/faceOff/%s", getNumberingPath($layout_srl, 3));
 	}
 
 	/**
@@ -778,7 +778,7 @@ 
 	 */
 	function getUserLayoutImagePath($layout_srl)
 	{
-		return $this->getUserLayoutPath($layout_srl). 'images/';
+		return $this->getUserLayoutPath($layout_srl).'images/';
 	}
 
 	/**
@@ -788,7 +788,7 @@ 
 	 */
 	function getUserLayoutCss($layout_srl)
 	{
-		return $this->getUserLayoutPath($layout_srl). 'layout.css';
+		return $this->getUserLayoutPath($layout_srl).'layout.css';
 	}
 
 	/**
@@ -798,7 +798,7 @@ 
 	 */
 	function getUserLayoutFaceOffCss($layout_srl)
 	{
-		if($this->useUserLayoutTemp == 'temp') return;
+		if ($this->useUserLayoutTemp == 'temp') return;
 		return $this->_getUserLayoutFaceOffCss($layout_srl);
 	}
 
@@ -809,7 +809,7 @@ 
 	 */
 	function _getUserLayoutFaceOffCss($layout_srl)
 	{
-		return $this->getUserLayoutPath($layout_srl). 'faceoff.css';
+		return $this->getUserLayoutPath($layout_srl).'faceoff.css';
 	}
 
 	/**
@@ -819,7 +819,7 @@ 
 	 */
 	function getUserLayoutTempFaceOffCss($layout_srl)
 	{
-		return $this->getUserLayoutPath($layout_srl). 'tmp.faceoff.css';
+		return $this->getUserLayoutPath($layout_srl).'tmp.faceoff.css';
 	}
 
 	/**
@@ -829,11 +829,11 @@ 
 	 */
 	function getUserLayoutHtml($layout_srl)
 	{
-		$src = $this->getUserLayoutPath($layout_srl). 'layout.html';
-		if($this->useUserLayoutTemp == 'temp')
+		$src = $this->getUserLayoutPath($layout_srl).'layout.html';
+		if ($this->useUserLayoutTemp == 'temp')
 		{
 			$temp = $this->getUserLayoutTempHtml($layout_srl);
-			if(FileHandler::exists($temp) === FALSE) FileHandler::copyFile($src,$temp);
+			if (FileHandler::exists($temp) === FALSE) FileHandler::copyFile($src, $temp);
 			return $temp;
 		}
 
@@ -847,7 +847,7 @@ 
 	 */
 	function getUserLayoutTempHtml($layout_srl)
 	{
-		return $this->getUserLayoutPath($layout_srl). 'tmp.layout.html';
+		return $this->getUserLayoutPath($layout_srl).'tmp.layout.html';
 	}
 
 	/**
@@ -857,11 +857,11 @@ 
 	 */
 	function getUserLayoutIni($layout_srl)
 	{
-		$src = $this->getUserLayoutPath($layout_srl). 'layout.ini';
-		if($this->useUserLayoutTemp == 'temp')
+		$src = $this->getUserLayoutPath($layout_srl).'layout.ini';
+		if ($this->useUserLayoutTemp == 'temp')
 		{
 			$temp = $this->getUserLayoutTempIni($layout_srl);
-			if(!file_exists(FileHandler::getRealPath($temp))) FileHandler::copyFile($src,$temp);
+			if (!file_exists(FileHandler::getRealPath($temp))) FileHandler::copyFile($src, $temp);
 			return $temp;
 		}
 
@@ -875,7 +875,7 @@ 
 	 */
 	function getUserLayoutTempIni($layout_srl)
 	{
-		return $this->getUserLayoutPath($layout_srl). 'tmp.layout.ini';
+		return $this->getUserLayoutPath($layout_srl).'tmp.layout.ini';
 	}
 
 	/**
@@ -885,9 +885,9 @@ 
 	 * @param string $lang_type
 	 * @return string
 	 */
-	function getUserLayoutCache($layout_srl,$lang_type)
+	function getUserLayoutCache($layout_srl, $lang_type)
 	{
-		return $this->getUserLayoutPath($layout_srl). "{$lang_type}.cache.php";
+		return $this->getUserLayoutPath($layout_srl)."{$lang_type}.cache.php";
 	}
 
 	/**
@@ -896,15 +896,15 @@ 
 	 * @param string $lang_type
 	 * @return string
 	 */
-	function getLayoutCache($layout_name,$lang_type,$layout_type='P')
+	function getLayoutCache($layout_name, $lang_type, $layout_type = 'P')
 	{
-		if($layout_type=='P')
+		if ($layout_type == 'P')
 		{
-			return sprintf("%sfiles/cache/layout/%s.%s.cache.php", _XE_PATH_, $layout_name,$lang_type);
+			return sprintf("%sfiles/cache/layout/%s.%s.cache.php", _XE_PATH_, $layout_name, $lang_type);
 		}
 		else
 		{
-			return sprintf("%sfiles/cache/layout/m.%s.%s.cache.php", _XE_PATH_, $layout_name,$lang_type);
+			return sprintf("%sfiles/cache/layout/m.%s.%s.cache.php", _XE_PATH_, $layout_name, $lang_type);
 		}
 	}
 
@@ -915,7 +915,7 @@ 
 	 */
 	function getDefaultLayoutIni($layout_name)
 	{
-		return $this->getDefaultLayoutPath($layout_name). 'layout.ini';
+		return $this->getDefaultLayoutPath($layout_name).'layout.ini';
 	}
 
 	/**
@@ -925,7 +925,7 @@ 
 	 */
 	function getDefaultLayoutHtml($layout_name)
 	{
-		return $this->getDefaultLayoutPath($layout_name). 'layout.html';
+		return $this->getDefaultLayoutPath($layout_name).'layout.html';
 	}
 
 	/**
@@ -935,7 +935,7 @@ 
 	 */
 	function getDefaultLayoutCss($layout_name)
 	{
-		return $this->getDefaultLayoutPath($layout_name). 'css/layout.css';
+		return $this->getDefaultLayoutPath($layout_name).'css/layout.css';
 	}
 
 	/**
@@ -964,7 +964,7 @@ 
 	 * @param string $flag (default 'temp')
 	 * @return void
 	 */
-	function setUseUserLayoutTemp($flag='temp')
+	function setUseUserLayoutTemp($flag = 'temp')
 	{
 		$this->useUserLayoutTemp = $flag;
 	}
@@ -998,11 +998,11 @@ 
 		);
 
 		$image_path = $this->getUserLayoutImagePath($layout_srl);
-		$image_list = FileHandler::readDir($image_path,'/(.*(?:jpg|jpeg|gif|bmp|png)$)/i');
+		$image_list = FileHandler::readDir($image_path, '/(.*(?:jpg|jpeg|gif|bmp|png)$)/i');
 
-		foreach($image_list as $image)
+		foreach ($image_list as $image)
 		{
-			$file_list[] = 'images/' . $image;
+			$file_list[] = 'images/'.$image;
 		}
 		return $file_list;
 	}
@@ -1020,20 +1020,20 @@ 
 		Context::addCSSFile($this->getDefaultLayoutCss($layout_info->layout));
 		// CSS generated in the layout manager
 		$faceoff_layout_css = $this->getUserLayoutFaceOffCss($layout_info->layout_srl);
-		if($faceoff_layout_css) Context::addCSSFile($faceoff_layout_css);
+		if ($faceoff_layout_css) Context::addCSSFile($faceoff_layout_css);
 		// CSS output for the widget
 		Context::loadFile($this->module_path.'/tpl/css/widget.css', true);
-		if($layout_info->extra_var->colorset->value == 'black') Context::loadFile($this->module_path.'/tpl/css/widget@black.css', true);
+		if ($layout_info->extra_var->colorset->value == 'black') Context::loadFile($this->module_path.'/tpl/css/widget@black.css', true);
 		else Context::loadFile($this->module_path.'/tpl/css/widget@white.css', true);
 		// Different page displayed upon user's permission
 		$logged_info = Context::get('logged_info');
 		// Display edit button for faceoff layout
-		if(Context::get('module')!='admin' && strpos(Context::get('act'),'Admin')===false && ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin))
+		if (Context::get('module') != 'admin' && strpos(Context::get('act'), 'Admin') === false && ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin))
 		{
-			Context::addHtmlFooter('<div class="faceOffManager" style="height: 23px; position: fixed; right: 3px; top: 3px;"><a href="'.getUrl('','mid',Context::get('mid'),'act','dispLayoutAdminLayoutModify','delete_tmp','Y').'">'.Context::getLang('cmd_layout_edit').'</a></div>');
+			Context::addHtmlFooter('<div class="faceOffManager" style="height: 23px; position: fixed; right: 3px; top: 3px;"><a href="'.getUrl('', 'mid', Context::get('mid'), 'act', 'dispLayoutAdminLayoutModify', 'delete_tmp', 'Y').'">'.Context::getLang('cmd_layout_edit').'</a></div>');
 		}
 		// Display menu when editing the faceOff page
-		if(Context::get('act')=='dispLayoutAdminLayoutModify' && ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin))
+		if (Context::get('act') == 'dispLayoutAdminLayoutModify' && ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin))
 		{
 			$oTemplate = &TemplateHandler::getInstance();
 			Context::addBodyHeader($oTemplate->compile($this->module_path.'/tpl', 'faceoff_layout_menu'));

modules/importer/ttimport.class.php

Spacing +134 added lines, -134 removed lines

@@ -31,7 +31,7 @@ 
 	 * @param string $module_name
 	 * @return int
 	 */
-	function importModule($key, $cur, $index_file, $unit_count, $module_srl, $guestbook_module_srl, $user_id, $module_name=null)
+	function importModule($key, $cur, $index_file, $unit_count, $module_srl, $guestbook_module_srl, $user_id, $module_name = null)
 	{
 		// Pre-create the objects needed
 		$this->oXmlParser = new XmlParser();
@@ -40,33 +40,33 @@ 
 		$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;
 		// First handle categorty information
 		$category_file = preg_replace('/index$/i', 'category.xml', $index_file);
-		if(file_exists($category_file))
+		if (file_exists($category_file))
 		{
 			// Create the xmlParser object
 			$xmlDoc = $this->oXmlParser->loadXmlFile($category_file);
 			// List category information
-			if($xmlDoc->categories->category)
+			if ($xmlDoc->categories->category)
 			{
 				$categories = array();
 				$idx = 0;
 				$this->arrangeCategory($xmlDoc->categories, $categories, $idx, 0);
 
 				$match_sequence = array();
-				foreach($categories as $k => $v)
+				foreach ($categories as $k => $v)
 				{
 					$category = $v->name;
-					if(!$category || $category_titles[$category]) continue;
+					if (!$category || $category_titles[$category]) continue;
 
 					$obj = null;
 					$obj->title = $category;
 					$obj->module_srl = $module_srl; 
-					if($v->parent) $obj->parent_srl = $match_sequence[$v->parent];
+					if ($v->parent) $obj->parent_srl = $match_sequence[$v->parent];
 					$output = $oDocumentController->insertCategory($obj);
 
-					if($output->toBool()) $match_sequence[$v->sequence] = $category_titles[$category] = $output->get('category_srl');
+					if ($output->toBool()) $match_sequence[$v->sequence] = $category_titles[$category] = $output->get('category_srl');
 				}
 				$oDocumentController->makeCategoryFile($module_srl);
 			}
@@ -74,28 +74,28 @@ 
 		}
 		$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;
 		// Get administrator information
 		$oMemberModel = getModel('member');
 		$member_info = $oMemberModel->getMemberInfoByUserID($user_id);
 		$author_xml_id = 0;
 
-		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 codition meets
-		for($idx=$cur;$idx<$cur+$unit_count;$idx++)
+		for ($idx = $cur; $idx < $cur + $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;
 			// Start importing data
-			$fp = fopen($target_file,"r");
-			if(!$fp) continue;
+			$fp = fopen($target_file, "r");
+			if (!$fp) continue;
 
 			$obj = null;
 			$obj->module_srl = $module_srl;
@@ -107,57 +107,57 @@ 
 			$started = false;
 			$buff = null;
 			// Start importing from the body data
-			while(!feof($fp))
+			while (!feof($fp))
 			{
 				$str = fgets($fp, 1024);
 				// Prepare an item
-				if(substr($str,0,5) == '<post')
+				if (substr($str, 0, 5) == '<post')
 				{
 					$started = true;
 					continue;
 					// Import the attachment
 				}
-				else if(substr($str,0,12) == '<attachment ')
+				else if (substr($str, 0, 12) == '<attachment ')
 				{
-					if($this->importAttaches($fp, $module_srl, $obj->document_srl, $files, $str)) $obj->uploaded_count++;
+					if ($this->importAttaches($fp, $module_srl, $obj->document_srl, $files, $str)) $obj->uploaded_count++;
 					continue;
 				}
 
-				if($started) $buff .= $str;
+				if ($started) $buff .= $str;
 			}
 
 			$xmlDoc = $this->oXmlParser->parse('<post>'.$buff);
 
 			$author_xml_id = $xmlDoc->post->author->body;
 
-			if($xmlDoc->post->category->body)
+			if ($xmlDoc->post->category->body)
 			{
-				$tmp_arr = explode('/',$xmlDoc->post->category->body);
-				$category = trim($tmp_arr[count($tmp_arr)-1]);
-				if($category_titles[$category]) $obj->category_srl = $category_titles[$category];
+				$tmp_arr = explode('/', $xmlDoc->post->category->body);
+				$category = trim($tmp_arr[count($tmp_arr) - 1]);
+				if ($category_titles[$category]) $obj->category_srl = $category_titles[$category];
 			}
 
 			$obj->is_notice = 'N';
-			$obj->status = in_array($xmlDoc->post->visibility->body, array('public','syndicated'))?$oDocumentModel->getConfigStatus('public'):$oDocumentModel->getConfigStatus('secret');
+			$obj->status = in_array($xmlDoc->post->visibility->body, array('public', 'syndicated')) ? $oDocumentModel->getConfigStatus('public') : $oDocumentModel->getConfigStatus('secret');
 			$obj->title = $xmlDoc->post->title->body;
 			$obj->content = $xmlDoc->post->content->body;
 			$obj->password = md5($xmlDoc->post->password->body);
-			$obj->commentStatus = $xmlDoc->post->acceptcomment->body=='1'?'ALLOW':'DENY';
-			$obj->allow_trackback = $xmlDoc->post->accepttrackback->body=='1'?'Y':'N';
+			$obj->commentStatus = $xmlDoc->post->acceptcomment->body == '1' ? 'ALLOW' : 'DENY';
+			$obj->allow_trackback = $xmlDoc->post->accepttrackback->body == '1' ? 'Y' : 'N';
 			//$obj->allow_comment = $xmlDoc->post->acceptComment->body=='1'?'Y':'N';
 			//$obj->allow_trackback = $xmlDoc->post->acceptTrackback->body=='1'?'Y':'N';
-			$obj->regdate = date("YmdHis",$xmlDoc->post->published->body);
+			$obj->regdate = date("YmdHis", $xmlDoc->post->published->body);
 			$obj->last_update = date("YmdHis", $xmlDoc->post->modified->body);
-			if(!$obj->last_update) $obj->last_update = $obj->regdate;
+			if (!$obj->last_update) $obj->last_update = $obj->regdate;
 
 			$tag = null;
 			$tmp_tags = null;
 			$tag = $xmlDoc->post->tag;
-			if($tag)
+			if ($tag)
 			{
-				if(!is_array($tag)) $tag = array($tag);
-				foreach($tag as $key => $val) $tmp_tags[] = $val->body;
-				$obj->tags = implode(',',$tmp_tags);
+				if (!is_array($tag)) $tag = array($tag);
+				foreach ($tag as $key => $val) $tmp_tags[] = $val->body;
+				$obj->tags = implode(',', $tmp_tags);
 			}
 
 			$obj->readed_count = 0;
@@ -169,33 +169,33 @@ 
 			$obj->email_address = $member_info->email_address;
 			$obj->homepage = $member_info->homepage;
 			$obj->ipaddress = $_REMOTE['SERVER_ADDR'];
-			$obj->list_order = $obj->update_order = $obj->document_srl*-1;
+			$obj->list_order = $obj->update_order = $obj->document_srl * -1;
 			$obj->notify_message = 'N';
 			// Change content information (attachment)
-			$obj->content = str_replace('[##_ATTACH_PATH_##]/','',$obj->content);
-			if(count($files))
+			$obj->content = str_replace('[##_ATTACH_PATH_##]/', '', $obj->content);
+			if (count($files))
 			{
-				foreach($files as $key => $val) {
-					$obj->content = preg_replace('/(src|href)\=(["\']?)'.preg_quote($key).'(["\']?)/i','$1="'.$val->url.'"',$obj->content);
+				foreach ($files as $key => $val) {
+					$obj->content = preg_replace('/(src|href)\=(["\']?)'.preg_quote($key).'(["\']?)/i', '$1="'.$val->url.'"', $obj->content);
 				}
 			}
 
 			$obj->content = preg_replace_callback('!\[##_Movie\|([^\|]*)\|(.*?)_##\]!is', array($this, '_replaceTTMovie'), $obj->content);
 
-			if(count($files))
+			if (count($files))
 			{
 				$this->files = $files;
 				$obj->content = preg_replace_callback('!\[##_([a-z0-9]+)\|([^\|]*)\|([^\|]*)\|(.*?)_##\]!is', array($this, '_replaceTTAttach'), $obj->content);
 			}
 			// Trackback inserted
 			$obj->trackback_count = 0;
-			if($xmlDoc->post->trackback)
+			if ($xmlDoc->post->trackback)
 			{
 				$trackbacks = $xmlDoc->post->trackback;
-				if(!is_array($trackbacks)) $trackbacks = array($trackbacks);
-				if(count($trackbacks))
+				if (!is_array($trackbacks)) $trackbacks = array($trackbacks);
+				if (count($trackbacks))
 				{
-					foreach($trackbacks as $key => $val)
+					foreach ($trackbacks as $key => $val)
 					{
 						$tobj = null;
 						$tobj->trackback_srl = getNextSequence();
@@ -205,40 +205,40 @@ 
 						$tobj->title = $val->title->body;
 						$tobj->blog_name = $val->site->body;
 						$tobj->excerpt = $val->excerpt->body;
-						$tobj->regdate = date("YmdHis",$val->received->body);
+						$tobj->regdate = date("YmdHis", $val->received->body);
 						$tobj->ipaddress = $val->ip->body;
-						$tobj->list_order = -1*$tobj->trackback_srl;
+						$tobj->list_order = -1 * $tobj->trackback_srl;
 						$output = executeQuery('trackback.insertTrackback', $tobj);
-						if($output->toBool()) $obj->trackback_count++;
+						if ($output->toBool()) $obj->trackback_count++;
 					}
 				}
 			}
 			// Comment
 			$obj->comment_count = 0;
-			if($xmlDoc->post->comment)
+			if ($xmlDoc->post->comment)
 			{
 				$comment = $xmlDoc->post->comment;
-				if(!is_array($comment)) $comment = array($comment);
-				foreach($comment as $key => $val)
+				if (!is_array($comment)) $comment = array($comment);
+				foreach ($comment as $key => $val)
 				{
 					$parent_srl = $this->insertComment($val, $module_srl, $obj->document_srl, $member_info, 0, $author_xml_id);
-					if($parent_srl === false) continue;
+					if ($parent_srl === false) continue;
 
 					$obj->comment_count++;
-					if($val->comment)
+					if ($val->comment)
 					{
 						$child_comment = $val->comment;
-						if(!is_array($child_comment)) $child_comment = array($child_comment);
-						foreach($child_comment as $k => $v)
+						if (!is_array($child_comment)) $child_comment = array($child_comment);
+						foreach ($child_comment as $k => $v)
 						{
 							$result = $this->insertComment($v, $module_srl, $obj->document_srl, $member_info, $parent_srl, $author_xml_id);
-							if($result !== false) $obj->comment_count++;
+							if ($result !== false) $obj->comment_count++;
 						}
 					}
 				}
 			}
 
-			if($module_name == 'textyle')
+			if ($module_name == 'textyle')
 			{
 				$args->document_srl = $obj->document_srl;
 				$args->module_srl = $obj->module_srl;
@@ -247,7 +247,7 @@ 
 				// Visibility value of published state
 				$status_published = array('public', 'syndicated');
 				// Save state if not published
-				if(!in_array($xmlDoc->post->visibility->body, $status_published))
+				if (!in_array($xmlDoc->post->visibility->body, $status_published))
 				{
 					$obj->module_srl = $member_info->member_srl; 
 				}
@@ -255,14 +255,14 @@ 
 			// Document
 			$output = executeQuery('document.insertDocument', $obj);
 
-			if($output->toBool())
+			if ($output->toBool())
 			{
 				// Tags
-				if($obj->tags)
+				if ($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();
@@ -270,7 +270,7 @@ 
 						$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);
 					}
 				}
@@ -282,63 +282,63 @@ 
 
 		fclose($f);
 
-		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);
 		// Guestbook information
 		$guestbook_file = preg_replace('/index$/i', 'guestbook.xml', $index_file);
-		if(file_exists($guestbook_file))
+		if (file_exists($guestbook_file))
 		{
 			// Create the xmlParser object
 			$xmlDoc = $this->oXmlParser->loadXmlFile($guestbook_file);
 			// Handle guest book information
-			if($guestbook_module_srl && $xmlDoc->guestbook->comment)
+			if ($guestbook_module_srl && $xmlDoc->guestbook->comment)
 			{
 				$comment = $xmlDoc->guestbook->comment;
-				if(!is_array($comment)) $comment = array($comment);
+				if (!is_array($comment)) $comment = array($comment);
 
-				if($module_name =='textyle')
+				if ($module_name == 'textyle')
 				{
-					foreach($comment as $key => $val)
+					foreach ($comment as $key => $val)
 					{
-						$textyle_guestbook_srl  = getNextSequence();
+						$textyle_guestbook_srl = getNextSequence();
 
-						if($val->comment)
+						if ($val->comment)
 						{
 							$child_comment = $val->comment;
-							if(!is_array($child_comment)) $child_comment = array($child_comment);
-							foreach($child_comment as $k => $v)
+							if (!is_array($child_comment)) $child_comment = array($child_comment);
+							foreach ($child_comment as $k => $v)
 							{
-								$result = $this->insertTextyleGuestbookItem($v, $module_srl, $member_info,0,$textyle_guestbook_srl,$author_xml_id);
+								$result = $this->insertTextyleGuestbookItem($v, $module_srl, $member_info, 0, $textyle_guestbook_srl, $author_xml_id);
 							}
 						}
 
-						$result = $this->insertTextyleGuestbookItem($val, $module_srl, $member_info,$textyle_guestbook_srl,0,$author_xml_id);
+						$result = $this->insertTextyleGuestbookItem($val, $module_srl, $member_info, $textyle_guestbook_srl, 0, $author_xml_id);
 					}
 				}
 				else
 				{
-					foreach($comment as $key => $val)
+					foreach ($comment as $key => $val)
 					{
 						$obj = null;
 						$obj->module_srl = $guestbook_module_srl;
 						$obj->document_srl = getNextSequence();
 						$obj->uploaded_count = 0;
 						$obj->is_notice = 'N';
-						$obj->status = $val->secret->body=='1'?$oDocumentModel->getConfigStatus('secret'):$oDocumentModel->getConfigStatus('public');
+						$obj->status = $val->secret->body == '1' ? $oDocumentModel->getConfigStatus('secret') : $oDocumentModel->getConfigStatus('public');
 						$obj->content = nl2br($val->content->body);
 
 						// Extract a title form the bocy
-						$obj->title = cut_str(strip_tags($obj->content),20,'...');
+						$obj->title = cut_str(strip_tags($obj->content), 20, '...');
 						if ($obj->title == '') $obj->title = 'Untitled';
 
 						$obj->commentStatus = 'ALLOW';
 						$obj->allow_trackback = 'N';
-						$obj->regdate = date("YmdHis",$val->written->body);
+						$obj->regdate = date("YmdHis", $val->written->body);
 						$obj->last_update = date("YmdHis", $val->written->body);
-						if(!$obj->last_update) $obj->last_update = $obj->regdate;
+						if (!$obj->last_update) $obj->last_update = $obj->regdate;
 						$obj->tags = '';
 						$obj->readed_count = 0;
 						$obj->voted_count = 0;
-						if($author_xml_id && $val->commenter->attrs->id == $author_xml_id)
+						if ($author_xml_id && $val->commenter->attrs->id == $author_xml_id)
 						{
 							$obj->password = '';
 							$obj->nick_name = $member_info->nick_name;
@@ -356,19 +356,19 @@ 
 							$homepage = $val->commenter->homepage->body;
 						}
 						$obj->ipaddress = $val->commenter->ip->body;
-						$obj->list_order = $obj->update_order = $obj->document_srl*-1;
+						$obj->list_order = $obj->update_order = $obj->document_srl * -1;
 						$obj->notify_message = 'N';
 						$obj->trackback_count = 0;
 
 						$obj->comment_count = 0;
-						if($val->comment)
+						if ($val->comment)
 						{
 							$child_comment = $val->comment;
-							if(!is_array($child_comment)) $child_comment = array($child_comment);
-							foreach($child_comment as $k => $v)
+							if (!is_array($child_comment)) $child_comment = array($child_comment);
+							foreach ($child_comment as $k => $v)
 							{
-								$result = $this->insertComment($v, $module_srl, $obj->document_srl, $member_info, 0,$author_xml_id);
-								if($result !== false) $obj->comment_count++;
+								$result = $this->insertComment($v, $module_srl, $obj->document_srl, $member_info, 0, $author_xml_id);
+								if ($result !== false) $obj->comment_count++;
 							}
 						}
 
@@ -380,7 +380,7 @@ 
 			FileHandler::removeFile($guestbook_file);
 		}
 
-		return $idx-1;
+		return $idx - 1;
 	}
 
 	/**
@@ -393,10 +393,10 @@ 
 	 * @param int $author_xml_id
 	 * @return int|bool
 	 */
-	function insertTextyleGuestbookItem($val, $module_srl, $member_info, $textyle_guestbook_srl,$parent_srl = 0, $author_xml_id=null)
+	function insertTextyleGuestbookItem($val, $module_srl, $member_info, $textyle_guestbook_srl, $parent_srl = 0, $author_xml_id = null)
 	{
 		$tobj = null;
-		if($textyle_guestbook_srl>0)
+		if ($textyle_guestbook_srl > 0)
 		{
 			$tobj->textyle_guestbook_srl = $textyle_guestbook_srl;
 		}
@@ -405,9 +405,9 @@ 
 			$tobj->textyle_guestbook_srl = getNextSequence();
 		}
 		$tobj->module_srl = $module_srl;
-		$tobj->is_secret = $val->secret->body=='1'?1:-1;
+		$tobj->is_secret = $val->secret->body == '1' ? 1 : -1;
 		$tobj->content = nl2br($val->content->body);
-		if($author_xml_id && $val->commenter->attrs->id == $author_xml_id)
+		if ($author_xml_id && $val->commenter->attrs->id == $author_xml_id)
 		{
 			$tobj->password = '';
 			$tobj->nick_name = $member_info->nick_name;
@@ -424,22 +424,22 @@ 
 			$tobj->homepage = $val->commenter->homepage->body;
 			$tobj->member_srl = 0;
 		}
-		$tobj->last_update = $tobj->regdate = date("YmdHis",$val->written->body);
+		$tobj->last_update = $tobj->regdate = date("YmdHis", $val->written->body);
 		$tobj->ipaddress = $val->commenter->ip->body;
 
-		if($parent_srl>0)
+		if ($parent_srl > 0)
 		{
 			$tobj->parent_srl = $parent_srl;
 			$tobj->list_order = $tobj->parent_srl * -1;
 		}
 		else
 		{
-			$tobj->list_order = $tobj->textyle_guestbook_srl*-1;
+			$tobj->list_order = $tobj->textyle_guestbook_srl * -1;
 		}
 
 		$output = executeQuery('textyle.insertTextyleGuestbook', $tobj);
 
-		if($output->toBool()) return $tobj->textyle_guestbook_srl;
+		if ($output->toBool()) return $tobj->textyle_guestbook_srl;
 		return false;
 	}
 
@@ -456,18 +456,18 @@ 
 	{
 		$uploaded_count = 0;
 
-		$file_obj  = null;
+		$file_obj = null;
 		$file_obj->file_srl = getNextSequence();
 		$file_obj->upload_target_srl = $upload_target_srl;
 		$file_obj->module_srl = $module_srl;
 
-		while(!feof($fp))
+		while (!feof($fp))
 		{
 			$str = fgets($fp, 1024);
 			// If it ends with </attaches>, break
-			if(trim($str) == '</attachment>') break;
+			if (trim($str) == '</attachment>') break;
 			// If it starts with <file>, handle the attachement in the xml file
-			if(substr($str, 0, 9)=='<content>')
+			if (substr($str, 0, 9) == '<content>')
 			{
 				$file_obj->file = $this->saveTemporaryFile($fp, $str);
 				continue;
@@ -475,7 +475,7 @@ 
 
 			$buff .= $str;
 		}
-		if(!file_exists($file_obj->file)) return false;
+		if (!file_exists($file_obj->file)) return false;
 
 		$buff .= '</attachment>';
 
@@ -485,20 +485,20 @@ 
 		$file_obj->download_count = $xmlDoc->attachment->downloads->body;
 		$name = $xmlDoc->attachment->name->body;
 		// Set upload path by checking if the attachement is an image or other kind of file
-		if(preg_match("/\.(asf|asf|asx|avi|flv|gif|jpeg|jpg|m4a|m4v|mid|midi|moov|mov|mp1|mp2|mp3|mp4|mpeg|mpg|ogg|png|qt|ra|ram|rm|rmm|wav|webm|webp|wma|wmv)$/i", $file_obj->source_filename))
+		if (preg_match("/\.(asf|asf|asx|avi|flv|gif|jpeg|jpg|m4a|m4v|mid|midi|moov|mov|mp1|mp2|mp3|mp4|mpeg|mpg|ogg|png|qt|ra|ram|rm|rmm|wav|webm|webp|wma|wmv)$/i", $file_obj->source_filename))
 		{
-			$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));
 			$filename = $path.$file_obj->source_filename;
 			$file_obj->direct_download = 'Y';
 		}
 		else
 		{
-			$path = sprintf("./files/attach/binaries/%s/%s", $module_srl, getNumberingPath($upload_target_srl,3));
-			$filename = $path.md5(crypt(rand(1000000,900000), rand(0,100)));
+			$path = sprintf("./files/attach/binaries/%s/%s", $module_srl, getNumberingPath($upload_target_srl, 3));
+			$filename = $path.md5(crypt(rand(1000000, 900000), rand(0, 100)));
 			$file_obj->direct_download = 'N';
 		}
 		// Create a directory
-		if(!FileHandler::makeDir($path)) return;
+		if (!FileHandler::makeDir($path)) return;
 
 		FileHandler::rename($file_obj->file, $filename);
 		// Insert to the DB
@@ -507,16 +507,16 @@ 
 		$file_obj->file_size = filesize($filename);
 		$file_obj->comment = NULL;
 		$file_obj->member_srl = 0;
-		$file_obj->sid = md5(rand(rand(1111111,4444444),rand(4444445,9999999)));
+		$file_obj->sid = md5(rand(rand(1111111, 4444444), rand(4444445, 9999999)));
 		$file_obj->isvalid = 'Y';
 		$output = executeQuery('file.insertFile', $file_obj);
 
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$uploaded_count++;
 			$tmp_obj = null;
-			if($file_obj->direct_download == 'Y') $files[$name]->url = $file_obj->uploaded_filename; 
-			else $files[$name]->url = getUrl('','module','file','act','procFileDownload','file_srl',$file_obj->file_srl,'sid',$file_obj->sid);
+			if ($file_obj->direct_download == 'Y') $files[$name]->url = $file_obj->uploaded_filename; 
+			else $files[$name]->url = getUrl('', 'module', 'file', 'act', 'procFileDownload', 'file_srl', $file_obj->file_srl, 'sid', $file_obj->sid);
 			$files[$name]->direct_download = $file_obj->direct_download;
 			$files[$name]->source_filename = $file_obj->source_filename;
 			return true;
@@ -532,9 +532,9 @@ 
 	function getTmpFilename()
 	{
 		$path = "./files/cache/importer";
-		if(!is_dir($path)) FileHandler::makeDir($path);
-		$filename = sprintf("%s/%d", $path, rand(11111111,99999999));
-		if(file_exists($filename)) $filename .= rand(111,999);
+		if (!is_dir($path)) FileHandler::makeDir($path);
+		$filename = sprintf("%s/%d", $path, rand(11111111, 99999999));
+		if (file_exists($filename)) $filename .= rand(111, 999);
 		return $filename;
 	}
 
@@ -549,11 +549,11 @@ 
 		$temp_filename = $this->getTmpFilename();
 		$buff = substr($buff, 9);
 
-		while(!feof($fp))
+		while (!feof($fp))
 		{
 			$str = trim(fgets($fp, 1024));
 			$buff .= $str;
-			if(substr($str, -10) == '</content>') break;
+			if (substr($str, -10) == '</content>') break;
 		}
 
 		$buff = substr($buff, 0, -10);
@@ -572,16 +572,16 @@ 
 	function _replaceTTAttach($matches)
 	{
 		$name = $matches[2];
-		if(!$name) return $matches[0];
+		if (!$name) return $matches[0];
 
 		$obj = $this->files[$name];
 		// If multimedia file is,
-		if($obj->direct_download == 'Y')
+		if ($obj->direct_download == 'Y')
 		{
 			// If image file is
-			if(preg_match('/\.(jpg|gif|jpeg|png)$/i', $obj->source_filename))
+			if (preg_match('/\.(jpg|gif|jpeg|png)$/i', $obj->source_filename))
 			{
-				return sprintf('<img editor_component="image_link" src="%s" alt="%s" />', $obj->url, str_replace('"','\\"',$matches[4]));
+				return sprintf('<img editor_component="image_link" src="%s" alt="%s" />', $obj->url, str_replace('"', '\\"', $matches[4]));
 				// If other multimedia file but image is, 
 			}
 			else
@@ -603,7 +603,7 @@ 
 	function _replaceTTMovie($matches)
 	{
 		$key = $matches[1];
-		if(!$key) return $matches[0];
+		if (!$key) return $matches[0];
 
 		return 
 			'<object type="application/x-shockwave-flash" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0" width="100%" height="402">'.
@@ -631,12 +631,12 @@ 
 		$tobj->comment_srl = getNextSequence();
 		$tobj->module_srl = $module_srl;
 		$tobj->document_srl = $document_srl;
-		$tobj->is_secret = $val->secret->body=='1'?'Y':'N';
+		$tobj->is_secret = $val->secret->body == '1' ? 'Y' : 'N';
 		$tobj->notify_message = 'N';
 		$tobj->content = nl2br($val->content->body);
 		$tobj->voted_count = 0;
 		$tobj->status = 1;
-		if($author_xml_id && $val->commenter->attrs->id == $author_xml_id)
+		if ($author_xml_id && $val->commenter->attrs->id == $author_xml_id)
 		{
 			$tobj->password = '';
 			$tobj->nick_name = $member_info->nick_name;
@@ -653,9 +653,9 @@ 
 			$tobj->homepage = $val->commenter->homepage->body;
 			$tobj->member_srl = 0;
 		}
-		$tobj->last_update = $tobj->regdate = date("YmdHis",$val->written->body);
+		$tobj->last_update = $tobj->regdate = date("YmdHis", $val->written->body);
 		$tobj->ipaddress = $val->commenter->ip->body;
-		$tobj->list_order = $tobj->comment_srl*-1;
+		$tobj->list_order = $tobj->comment_srl * -1;
 		$tobj->sequence = $sequence;
 		$tobj->parent_srl = $parent_srl;
 		// Comment list first
@@ -665,7 +665,7 @@ 
 		$list_args->module_srl = $tobj->module_srl;
 		$list_args->regdate = $tobj->regdate;
 		// Set data directly if parent comment doesn't exist
-		if(!$tobj->parent_srl)
+		if (!$tobj->parent_srl)
 		{
 			$list_args->head = $list_args->arrange = $tobj->comment_srl;
 			$list_args->depth = 0;
@@ -677,25 +677,25 @@ 
 			$parent_args->comment_srl = $tobj->parent_srl;
 			$parent_output = executeQuery('comment.getCommentListItem', $parent_args);
 			// Return if parent comment doesn't exist
-			if(!$parent_output->toBool() || !$parent_output->data) return false;
+			if (!$parent_output->toBool() || !$parent_output->data) return false;
 			$parent = $parent_output->data;
 
 			$list_args->head = $parent->head;
-			$list_args->depth = $parent->depth+1;
-			if($list_args->depth<2) $list_args->arrange = $tobj->comment_srl;
+			$list_args->depth = $parent->depth + 1;
+			if ($list_args->depth < 2) $list_args->arrange = $tobj->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', $tobj);
-			if($output->toBool()) return $tobj->comment_srl;
+			if ($output->toBool()) return $tobj->comment_srl;
 		}
 		return false;
 	}
@@ -710,10 +710,10 @@ 
 	 */
 	function arrangeCategory($obj, &$category, &$idx, $parent = 0)
 	{
-		if(!$obj->category) return;
-		if(!is_array($obj->category)) $c = array($obj->category);
+		if (!$obj->category) return;
+		if (!is_array($obj->category)) $c = array($obj->category);
 		else $c = $obj->category;
-		foreach($c as $val)
+		foreach ($c as $val)
 		{
 			$idx++;
 			$priority = $val->priority->body;

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|flv|mp[1-4]|as[fx]|wav|midi?|moo?v|qt|r[am]{1,2}|m4v)$/i", $file_obj->source_filename))
+					if (preg_match("/\.(jpe?g|gif|png|wm[va]|mpe?g|avi|flv|mp[1-4]|as[fx]|wav|midi?|moo?v|qt|r[am]{1,2}|m4v)$/i", $file_obj->source_filename))
 					{
 						// Immediately remove the direct file if it has any kind of extensions for hacking
 						$file_obj->source_filename = preg_replace('/\.(php|phtm|phar|html?|cgi|pl|exe|jsp|asp|inc)/i', '$0-x', $file_obj->source_filename);
@@ -1065,14 +1065,14 @@ 
 
 						$path = sprintf("./files/attach/images/%s/%s", $module_srl, getNumberingPath($upload_target_srl, 3));
 
-						$ext = substr(strrchr($file_obj->source_filename,'.'),1);
+						$ext = substr(strrchr($file_obj->source_filename, '.'), 1);
 						$_filename = $random->createSecureSalt(32, 'hex').'.'.$ext;
 						$filename  = $path.$_filename;
 
 						$idx = 1;
-						while(file_exists($filename))
+						while (file_exists($filename))
 						{
-							$filename = $path.preg_replace('/\.([a-z0-9]+)$/i','_'.$idx.'.$1', $_filename);
+							$filename = $path.preg_replace('/\.([a-z0-9]+)$/i', '_'.$idx.'.$1', $_filename);
 							$idx++;
 						}
 
@@ -1080,14 +1080,14 @@ 
 					}
 					else
 					{
-						$path = sprintf("./files/attach/binaries/%s/%s", $module_srl, getNumberingPath($upload_target_srl,3));
+						$path = sprintf("./files/attach/binaries/%s/%s", $module_srl, getNumberingPath($upload_target_srl, 3));
 						$filename = $path.$random->createSecureSalt(32, 'hex');
 						$file_obj->direct_download = 'N';
 					}
 					// Create a directory
-					if(!FileHandler::makeDir($path)) continue;
+					if (!FileHandler::makeDir($path)) continue;
 
-					if(strncmp('./files/cache/importer/', $file_obj->file, 23) === 0)
+					if (strncmp('./files/cache/importer/', $file_obj->file, 23) === 0)
 					{
 						FileHandler::rename($file_obj->file, $filename);
 					}
@@ -1098,7 +1098,7 @@ 
 
 					// Insert the file to the DB
 					unset($file_obj->file);
-					if(file_exists($filename))
+					if (file_exists($filename))
 					{
 						$file_obj->uploaded_filename = $filename;
 						$file_obj->file_size = filesize($filename);
@@ -1108,13 +1108,13 @@ 
 						$file_obj->isvalid = 'Y';
 						$output = executeQuery('file.insertFile', $file_obj);
 
-						if($output->toBool())
+						if ($output->toBool())
 						{
 							$uploaded_count++;
 							$tmp_obj = null;
 							$tmp_obj->source_filename = $file_obj->source_filename;
-							if($file_obj->direct_download == 'Y') $files[$file_obj->source_filename] = $file_obj->uploaded_filename;
-							else $files[$file_obj->source_filename] = getUrl('','module','file','act','procFileDownload','file_srl',$file_obj->file_srl,'sid',$file_obj->sid);
+							if ($file_obj->direct_download == 'Y') $files[$file_obj->source_filename] = $file_obj->uploaded_filename;
+							else $files[$file_obj->source_filename] = getUrl('', 'module', 'file', 'act', 'procFileDownload', 'file_srl', $file_obj->file_srl, 'sid', $file_obj->sid);
 						}
 					}
 				}
@@ -1131,8 +1131,8 @@ 
 	{
 		$path = "./files/cache/importer";
 		FileHandler::makeDir($path);
-		$filename = sprintf("%s/%d", $path, rand(11111111,99999999));
-		if(file_exists($filename)) $filename .= rand(111,999);
+		$filename = sprintf("%s/%d", $path, rand(11111111, 99999999));
+		if (file_exists($filename)) $filename .= rand(111, 999);
 		return $filename;
 	}
 
@@ -1147,14 +1147,14 @@ 
 		$f = fopen($temp_filename, "w");
 
 		$buff = '';
-		while(!feof($fp))
+		while (!feof($fp))
 		{
 			$str = trim(fgets($fp, 1024));
-			if(trim($str) == '</file>') break;
+			if (trim($str) == '</file>') break;
 
 			$buff .= $str;
 
-			if(substr($buff,-7)=='</buff>')
+			if (substr($buff, -7) == '</buff>')
 			{
 				fwrite($f, base64_decode(substr($buff, 6, -7)));
 				$buff = '';
@@ -1173,23 +1173,23 @@ 
 	function importExtraVars($fp)
 	{
 		$buff = null;
-		while(!feof($fp))
+		while (!feof($fp))
 		{
 			$buff .= $str = trim(fgets($fp, 1024));
-			if(trim($str) == '</extra_vars>') break;
+			if (trim($str) == '</extra_vars>') break;
 		}
-		if(!$buff) return array();
+		if (!$buff) return array();
 
 		$buff = '<extra_vars>'.$buff;
 		$oXmlParser = new XmlParser();
 		$xmlDoc = $this->oXmlParser->parse($buff);
-		if(!count($xmlDoc->extra_vars->key)) return array();
+		if (!count($xmlDoc->extra_vars->key)) return array();
 
 		$index = 1;
-		foreach($xmlDoc->extra_vars->key as $k => $v)
+		foreach ($xmlDoc->extra_vars->key as $k => $v)
 		{
 			unset($vobj);
-			if($v->var_idx)
+			if ($v->var_idx)
 			{
 				$vobj->var_idx = base64_decode($v->var_idx->body);
 				$vobj->lang_code = base64_decode($v->lang_code->body);
@@ -1197,7 +1197,7 @@ 
 				$vobj->eid = base64_decode($v->eid->body);
 
 			}
-			else if($v->body)
+			else if ($v->body)
 			{
 				$vobj->var_idx = $index;
 				$vobj->lang_code = Context::getLangType();