xpressengine / xe-core

modules/file/file.model.php

Doc Comments +3 added lines, -3 removed lines

@@ -113,7 +113,7 @@ 
 	 * Get file configurations
 	 *
 	 * @param int $module_srl If set this, returns specific module's configuration. Otherwise returns global configuration.
-	 * @return object Returns configuration.
+	 * @return stdClass Returns configuration.
 	 */
 	function getFileConfig($module_srl = null)
 	{
@@ -231,7 +231,7 @@ 
 	/**
 	 * Return configurations of the attachement (it automatically checks if an administrator is)
 	 *
-	 * @return object Returns a file configuration of current module. If user is admin, returns PHP's max file size and allow all file types.
+	 * @return stdClass Returns a file configuration of current module. If user is admin, returns PHP's max file size and allow all file types.
 	 */
 	function getUploadConfig()
 	{
@@ -285,7 +285,7 @@ 
 	 * Return file configuration of the module
 	 *
 	 * @param int $module_srl The sequence of module to get configuration
-	 * @return object
+	 * @return stdClass
 	 */
 	function getFileModuleConfig($module_srl)
 	{

Spacing +45 added lines, -45 removed lines

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

Braces +73 added lines, -28 removed lines

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

modules/importer/extract.class.php

Doc Comments +6 added lines

@@ -216,6 +216,7 @@ 
 
 	/**
 	 * Merge item
+	 * @param string $filename
 	 * @return void
 	 */
 	function mergeItems($filename)
@@ -310,6 +311,11 @@ 
 		return $this->key;
 	}
 
+	/**
+	 * @param string $str
+	 *
+	 * @return string
+	 */
 	function _addTagCRTail($str) {
 		$str = preg_replace('/<\/([^>]*)></i', "</$1>\r\n<", $str);
 		return $str;

Indentation +7 added lines, -7 removed lines

@@ -1,13 +1,13 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * extract class
- * Class to save each file by using tags in the large xml
- *
- * @author NAVER (developers@xpressengine.com)
- * @package /modules/importer
- * @version 0.1
- */
+	 * extract class
+	 * Class to save each file by using tags in the large xml
+	 *
+	 * @author NAVER (developers@xpressengine.com)
+	 * @package /modules/importer
+	 * @version 0.1
+	 */
 class extract
 {
 	/**

Spacing +43 added lines, -43 removed lines

@@ -99,16 +99,16 @@ 
 		$this->filename = $filename;
 
 		$this->startTag = $startTag;
-		if($endTag) $this->endTag = $endTag;
+		if ($endTag) $this->endTag = $endTag;
 		$this->itemStartTag = $itemTag;
 		$this->itemEndTag = $itemEndTag;
 
 		$this->key = md5($filename);
 
-		$this->cache_path = './files/cache/importer/'.$this->key;
-		$this->cache_index_file = $this->cache_path.'/index';
+		$this->cache_path = './files/cache/importer/' . $this->key;
+		$this->cache_index_file = $this->cache_path . '/index';
 
-		if(!is_dir($this->cache_path)) FileHandler::makeDir($this->cache_path);
+		if (!is_dir($this->cache_path)) FileHandler::makeDir($this->cache_path);
 
 		return $this->openFile();
 	}
@@ -120,55 +120,55 @@ 
 	function openFile()
 	{
 		FileHandler::removeFile($this->cache_index_file);
-		$this->index_fd = fopen($this->cache_index_file,"a");
+		$this->index_fd = fopen($this->cache_index_file, "a");
 		// If local file
-		if(strncasecmp('http://', $this->filename, 7) !== 0)
+		if (strncasecmp('http://', $this->filename, 7) !== 0)
 		{
-			if(!file_exists($this->filename)) return new Object(-1,'msg_no_xml_file');
-			$this->fd = fopen($this->filename,"r");
+			if (!file_exists($this->filename)) return new Object(-1, 'msg_no_xml_file');
+			$this->fd = fopen($this->filename, "r");
 			// If remote file
 		}
 		else
 		{
 			$url_info = parse_url($this->filename);
-			if(!$url_info['port']) $url_info['port'] = 80;
-			if(!$url_info['path']) $url_info['path'] = '/';
+			if (!$url_info['port']) $url_info['port'] = 80;
+			if (!$url_info['path']) $url_info['path'] = '/';
 
 			$this->fd = @fsockopen($url_info['host'], $url_info['port']);
-			if(!$this->fd) return new Object(-1,'msg_no_xml_file');
+			if (!$this->fd) return new Object(-1, 'msg_no_xml_file');
 			// If the file name contains Korean, do urlencode(iconv required)
 			$path = $url_info['path'];
-			if(preg_match('/[\xEA-\xED][\x80-\xFF]{2}/', $path)&&function_exists('iconv'))
+			if (preg_match('/[\xEA-\xED][\x80-\xFF]{2}/', $path) && function_exists('iconv'))
 			{
-				$path_list = explode('/',$path);
+				$path_list = explode('/', $path);
 				$cnt = count($path_list);
-				$filename = $path_list[$cnt-1];
-				$filename = urlencode(iconv("UTF-8","EUC-KR",$filename));
-				$path_list[$cnt-1] = $filename;
-				$path = implode('/',$path_list);
+				$filename = $path_list[$cnt - 1];
+				$filename = urlencode(iconv("UTF-8", "EUC-KR", $filename));
+				$path_list[$cnt - 1] = $filename;
+				$path = implode('/', $path_list);
 				$url_info['path'] = $path;
 			}
 
 			$header = sprintf("GET %s?%s HTTP/1.0\r\nHost: %s\r\nReferer: %s://%s\r\nConnection: Close\r\n\r\n", $url_info['path'], $url_info['query'], $url_info['host'], $url_info['scheme'], $url_info['host']);
 			@fwrite($this->fd, $header);
 			$buff = '';
-			while(!feof($this->fd))
+			while (!feof($this->fd))
 			{
 				$buff .= $str = fgets($this->fd, 1024);
-				if(!trim($str)) break;
+				if (!trim($str)) break;
 			}
-			if(preg_match('/404 Not Found/i',$buff)) return new Object(-1,'msg_no_xml_file');
+			if (preg_match('/404 Not Found/i', $buff)) return new Object(-1, 'msg_no_xml_file');
 		}
 
-		if($this->startTag)
+		if ($this->startTag)
 		{
-			while(!feof($this->fd))
+			while (!feof($this->fd))
 			{
 				$str = fgets($this->fd, 1024);
 				$pos = strpos($str, $this->startTag);
-				if($pos !== false)
+				if ($pos !== false)
 				{
-					$this->buff = substr($this->buff, $pos+strlen($this->startTag));
+					$this->buff = substr($this->buff, $pos + strlen($this->startTag));
 					$this->isStarted = true;
 					$this->isFinished = false;
 					break;
@@ -206,9 +206,9 @@ 
 	 */
 	function saveItems()
 	{
-		FileHandler::removeDir($this->cache_path.$this->key);
+		FileHandler::removeDir($this->cache_path . $this->key);
 		$this->index = 0;
-		while(!$this->isFinished())
+		while (!$this->isFinished())
 		{
 			$this->getItem();
 		}
@@ -224,14 +224,14 @@ 
 
 		$filename = sprintf('%s/%s', $this->cache_path, $filename);
 
-		$index_fd = fopen($this->cache_index_file,"r");
-		$fd = fopen($filename,'w');
+		$index_fd = fopen($this->cache_index_file, "r");
+		$fd = fopen($filename, 'w');
 
 		fwrite($fd, '<items>');
-		while(!feof($index_fd))
+		while (!feof($index_fd))
 		{
-			$target_file = trim(fgets($index_fd,1024));
-			if(!file_exists($target_file)) continue;
+			$target_file = trim(fgets($index_fd, 1024));
+			if (!file_exists($target_file)) continue;
 			$buff = FileHandler::readFile($target_file);
 			fwrite($fd, FileHandler::readFile($target_file));
 
@@ -247,21 +247,21 @@ 
 	 */
 	function getItem()
 	{
-		if($this->isFinished()) return;
+		if ($this->isFinished()) return;
 
-		while(!feof($this->fd))
+		while (!feof($this->fd))
 		{
 			$startPos = strpos($this->buff, $this->itemStartTag);
-			if($startPos !== false)
+			if ($startPos !== false)
 			{
 				$this->buff = substr($this->buff, $startPos);
-				$this->buff = preg_replace("/\>/",">\r\n",$this->buff,1);
+				$this->buff = preg_replace("/\>/", ">\r\n", $this->buff, 1);
 				break;
 			}
-			elseif($this->endTag)
+			elseif ($this->endTag)
 			{
 				$endPos = strpos($this->buff, $this->endTag);
-				if($endPos !== false)
+				if ($endPos !== false)
 				{
 					$this->closeFile();
 					return;
@@ -271,21 +271,21 @@ 
 		}
 
 		$startPos = strpos($this->buff, $this->itemStartTag);
-		if($startPos === false)
+		if ($startPos === false)
 		{
 			$this->closeFile();
 			return;
 		}
 
-		$filename = sprintf('%s/%s.xml',$this->cache_path, $this->index++);
-		fwrite($this->index_fd, $filename."\r\n");
+		$filename = sprintf('%s/%s.xml', $this->cache_path, $this->index++);
+		fwrite($this->index_fd, $filename . "\r\n");
 
-		$fd = fopen($filename,'w');
+		$fd = fopen($filename, 'w');
 
-		while(!feof($this->fd))
+		while (!feof($this->fd))
 		{
 			$endPos = strpos($this->buff, $this->itemEndTag);
-			if($endPos !== false)
+			if ($endPos !== false)
 			{
 				$endPos += strlen($this->itemEndTag);
 				$buff = substr($this->buff, 0, $endPos);

Braces +33 added lines, -16 removed lines

@@ -99,7 +99,9 @@ 
 		$this->filename = $filename;
 
 		$this->startTag = $startTag;
-		if($endTag) $this->endTag = $endTag;
+		if($endTag) {
+			$this->endTag = $endTag;
+		}
 		$this->itemStartTag = $itemTag;
 		$this->itemEndTag = $itemEndTag;
 
@@ -108,7 +110,9 @@ 
 		$this->cache_path = './files/cache/importer/'.$this->key;
 		$this->cache_index_file = $this->cache_path.'/index';
 
-		if(!is_dir($this->cache_path)) FileHandler::makeDir($this->cache_path);
+		if(!is_dir($this->cache_path)) {
+			FileHandler::makeDir($this->cache_path);
+		}
 
 		return $this->openFile();
 	}
@@ -124,18 +128,25 @@ 
 		// If local file
 		if(strncasecmp('http://', $this->filename, 7) !== 0)
 		{
-			if(!file_exists($this->filename)) return new Object(-1,'msg_no_xml_file');
+			if(!file_exists($this->filename)) {
+				return new Object(-1,'msg_no_xml_file');
+			}
 			$this->fd = fopen($this->filename,"r");
 			// If remote file
-		}
-		else
+		} else
 		{
 			$url_info = parse_url($this->filename);
-			if(!$url_info['port']) $url_info['port'] = 80;
-			if(!$url_info['path']) $url_info['path'] = '/';
+			if(!$url_info['port']) {
+				$url_info['port'] = 80;
+			}
+			if(!$url_info['path']) {
+				$url_info['path'] = '/';
+			}
 
 			$this->fd = @fsockopen($url_info['host'], $url_info['port']);
-			if(!$this->fd) return new Object(-1,'msg_no_xml_file');
+			if(!$this->fd) {
+				return new Object(-1,'msg_no_xml_file');
+			}
 			// If the file name contains Korean, do urlencode(iconv required)
 			$path = $url_info['path'];
 			if(preg_match('/[\xEA-\xED][\x80-\xFF]{2}/', $path)&&function_exists('iconv'))
@@ -155,9 +166,13 @@ 
 			while(!feof($this->fd))
 			{
 				$buff .= $str = fgets($this->fd, 1024);
-				if(!trim($str)) break;
+				if(!trim($str)) {
+					break;
+				}
+			}
+			if(preg_match('/404 Not Found/i',$buff)) {
+				return new Object(-1,'msg_no_xml_file');
 			}
-			if(preg_match('/404 Not Found/i',$buff)) return new Object(-1,'msg_no_xml_file');
 		}
 
 		if($this->startTag)
@@ -174,8 +189,7 @@ 
 					break;
 				}
 			}
-		}
-		else
+		} else
 		{
 			$this->isStarted = true;
 			$this->isFinished = false;
@@ -231,7 +245,9 @@ 
 		while(!feof($index_fd))
 		{
 			$target_file = trim(fgets($index_fd,1024));
-			if(!file_exists($target_file)) continue;
+			if(!file_exists($target_file)) {
+				continue;
+			}
 			$buff = FileHandler::readFile($target_file);
 			fwrite($fd, FileHandler::readFile($target_file));
 
@@ -247,7 +263,9 @@ 
 	 */
 	function getItem()
 	{
-		if($this->isFinished()) return;
+		if($this->isFinished()) {
+			return;
+		}
 
 		while(!feof($this->fd))
 		{
@@ -257,8 +275,7 @@ 
 				$this->buff = substr($this->buff, $startPos);
 				$this->buff = preg_replace("/\>/",">\r\n",$this->buff,1);
 				break;
-			}
-			elseif($this->endTag)
+			} elseif($this->endTag)
 			{
 				$endPos = strpos($this->buff, $this->endTag);
 				if($endPos !== false)

modules/importer/ttimport.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -450,7 +450,7 @@
 	 * @param int $upload_target_srl
 	 * @param array $files
 	 * @param string $buff
-	 * @return bool
+	 * @return null|boolean
 	 */
 	function importAttaches($fp, $module_srl, $upload_target_srl, &$files, $buff)
 	{

Spacing +142 added lines, -142 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);
+			$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("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp1|mp2|mp3|mp4|asf|wav|asx|mid|midi|asf|mov|moov|qt|rm|ram|ra|rmm|m4v)$/i", $file_obj->source_filename))
+		if (preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp1|mp2|mp3|mp4|asf|wav|asx|mid|midi|asf|mov|moov|qt|rm|ram|ra|rmm|m4v)$/i", $file_obj->source_filename))
 		{
-			$path = sprintf("./files/attach/images/%s/%s", $module_srl,getNumberingPath($upload_target_srl,3));
-			$filename = $path.$file_obj->source_filename;
+			$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,15 +603,15 @@ 
 	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">'.
-			'<param name="movie" value="http://flvs.daum.net/flvPlayer.swf?vid='.urlencode($key).'"/>'.
-			'<param name="allowScriptAccess" value="always"/>'.
-			'<param name="allowFullScreen" value="true"/>'.
-			'<param name="bgcolor" value="#000000"/>'.
-			'<embed src="http://flvs.daum.net/flvPlayer.swf?vid='.urlencode($key).'" width="100%" height="402" allowscriptaccess="always" allowfullscreen="true" type="application/x-shockwave-flash" bgcolor="#000000"/>'.
+			'<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">' .
+			'<param name="movie" value="http://flvs.daum.net/flvPlayer.swf?vid=' . urlencode($key) . '"/>' .
+			'<param name="allowScriptAccess" value="always"/>' .
+			'<param name="allowFullScreen" value="true"/>' .
+			'<param name="bgcolor" value="#000000"/>' .
+			'<embed src="http://flvs.daum.net/flvPlayer.swf?vid=' . urlencode($key) . '" width="100%" height="402" allowscriptaccess="always" allowfullscreen="true" type="application/x-shockwave-flash" bgcolor="#000000"/>' .
 			'</object>';
 	}
 
@@ -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;

Braces +153 added lines, -71 removed lines

@@ -40,7 +40,9 @@ 
 		$oDocumentModel = getModel('document');
 		$category_list = $category_titles = array();
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
-		if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
+		if(count($category_list)) {
+			foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
+		}
 		// First handle categorty information
 		$category_file = preg_replace('/index$/i', 'category.xml', $index_file);
 		if(file_exists($category_file))
@@ -58,15 +60,21 @@ 
 				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 +82,40 @@ 
 		}
 		$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");
 		// 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++)
 		{
-			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;
+			if(!$fp) {
+				continue;
+			}
 
 			$obj = null;
 			$obj->module_srl = $module_srl;
@@ -116,14 +136,17 @@ 
 					$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);
@@ -134,7 +157,9 @@ 
 			{
 				$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];
+				if($category_titles[$category]) {
+					$obj->category_srl = $category_titles[$category];
+				}
 			}
 
 			$obj->is_notice = 'N';
@@ -148,15 +173,21 @@ 
 			//$obj->allow_trackback = $xmlDoc->post->acceptTrackback->body=='1'?'Y':'N';
 			$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(!is_array($tag)) $tag = array($tag);
-				foreach($tag as $key => $val) $tmp_tags[] = $val->body;
+				if(!is_array($tag)) {
+					$tag = array($tag);
+				}
+				foreach($tag as $key => $val) {
+					$tmp_tags[] = $val->body;
+				}
 				$obj->tags = implode(',',$tmp_tags);
 			}
 
@@ -192,7 +223,9 @@ 
 			if($xmlDoc->post->trackback)
 			{
 				$trackbacks = $xmlDoc->post->trackback;
-				if(!is_array($trackbacks)) $trackbacks = array($trackbacks);
+				if(!is_array($trackbacks)) {
+					$trackbacks = array($trackbacks);
+				}
 				if(count($trackbacks))
 				{
 					foreach($trackbacks as $key => $val)
@@ -209,7 +242,9 @@ 
 						$tobj->ipaddress = $val->ip->body;
 						$tobj->list_order = -1*$tobj->trackback_srl;
 						$output = executeQuery('trackback.insertTrackback', $tobj);
-						if($output->toBool()) $obj->trackback_count++;
+						if($output->toBool()) {
+							$obj->trackback_count++;
+						}
 					}
 				}
 			}
@@ -218,21 +253,29 @@ 
 			if($xmlDoc->post->comment)
 			{
 				$comment = $xmlDoc->post->comment;
-				if(!is_array($comment)) $comment = array($comment);
+				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)
 					{
 						$child_comment = $val->comment;
-						if(!is_array($child_comment)) $child_comment = array($child_comment);
+						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++;
+							}
 						}
 					}
 				}
@@ -270,7 +313,9 @@ 
 						$args->document_srl = $obj->document_srl;
 						$args->tag = trim($tag_list[$i]);
 						$args->regdate = $obj->regdate;
-						if(!$args->tag) continue;
+						if(!$args->tag) {
+							continue;
+						}
 						$output = executeQuery('tag.insertTag', $args);
 					}
 				}
@@ -282,7 +327,9 @@ 
 
 		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))
@@ -293,7 +340,9 @@ 
 			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')
 				{
@@ -304,7 +353,9 @@ 
 						if($val->comment)
 						{
 							$child_comment = $val->comment;
-							if(!is_array($child_comment)) $child_comment = array($child_comment);
+							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);
@@ -313,8 +364,7 @@ 
 
 						$result = $this->insertTextyleGuestbookItem($val, $module_srl, $member_info,$textyle_guestbook_srl,0,$author_xml_id);
 					}
-				}
-				else
+				} else
 				{
 					foreach($comment as $key => $val)
 					{
@@ -328,13 +378,17 @@ 
 
 						// Extract a title form the bocy
 						$obj->title = cut_str(strip_tags($obj->content),20,'...');
-						if ($obj->title == '') $obj->title = 'Untitled';
+						if ($obj->title == '') {
+							$obj->title = 'Untitled';
+						}
 
 						$obj->commentStatus = 'ALLOW';
 						$obj->allow_trackback = 'N';
 						$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;
@@ -347,8 +401,7 @@ 
 							$obj->member_srl = $member_info->member_srl;
 							$obj->email_address = $member_info->email_address;
 							$obj->homepage = $member_info->homepage;
-						}
-						else
+						} else
 						{
 							$obj->password = $val->password->body;
 							$obj->nick_name = $val->commenter->name->body;
@@ -364,11 +417,15 @@ 
 						if($val->comment)
 						{
 							$child_comment = $val->comment;
-							if(!is_array($child_comment)) $child_comment = array($child_comment);
+							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++;
+								if($result !== false) {
+									$obj->comment_count++;
+								}
 							}
 						}
 
@@ -399,8 +456,7 @@ 
 		if($textyle_guestbook_srl>0)
 		{
 			$tobj->textyle_guestbook_srl = $textyle_guestbook_srl;
-		}
-		else
+		} else
 		{
 			$tobj->textyle_guestbook_srl = getNextSequence();
 		}
@@ -416,8 +472,7 @@ 
 			$tobj->member_srl = $member_info->member_srl;
 			$tobj->homepage = $member_info->homepage;
 			$tobj->email_address = $member_info->email_address;
-		}
-		else
+		} else
 		{
 			$tobj->password = $val->password->body;
 			$tobj->nick_name = $val->commenter->name->body;
@@ -431,15 +486,16 @@ 
 		{
 			$tobj->parent_srl = $parent_srl;
 			$tobj->list_order = $tobj->parent_srl * -1;
-		}
-		else
+		} else
 		{
 			$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;
 	}
 
@@ -465,7 +521,9 @@ 
 		{
 			$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>')
 			{
@@ -475,7 +533,9 @@ 
 
 			$buff .= $str;
 		}
-		if(!file_exists($file_obj->file)) return false;
+		if(!file_exists($file_obj->file)) {
+			return false;
+		}
 
 		$buff .= '</attachment>';
 
@@ -490,15 +550,16 @@ 
 			$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
+		} 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)));
 			$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
@@ -515,8 +576,11 @@ 
 		{
 			$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 +596,13 @@ 
 	function getTmpFilename()
 	{
 		$path = "./files/cache/importer";
-		if(!is_dir($path)) FileHandler::makeDir($path);
+		if(!is_dir($path)) {
+			FileHandler::makeDir($path);
+		}
 		$filename = sprintf("%s/%d", $path, rand(11111111,99999999));
-		if(file_exists($filename)) $filename .= rand(111,999);
+		if(file_exists($filename)) {
+			$filename .= rand(111,999);
+		}
 		return $filename;
 	}
 
@@ -553,7 +621,9 @@ 
 		{
 			$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,7 +642,9 @@ 
 	function _replaceTTAttach($matches)
 	{
 		$name = $matches[2];
-		if(!$name) return $matches[0];
+		if(!$name) {
+			return $matches[0];
+		}
 
 		$obj = $this->files[$name];
 		// If multimedia file is,
@@ -583,14 +655,12 @@ 
 			{
 				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
+			} else
 			{
 				return sprintf('<img src="./common/img/blank.gif" editor_component="multimedia_link" multimedia_src="%s" width="400" height="320" style="display:block;width:400px;height:320px;border:2px dotted #4371B9;background:url(./modules/editor/components/multimedia_link/tpl/multimedia_link_component.gif) no-repeat center;" auto_start="false" alt="" />', $obj->url);
 			}
 			// If binary file is
-		}
-		else
+		} else
 		{
 			return sprintf('<a href="%s">%s</a>', $obj->url, $obj->source_filename);
 		}
@@ -603,7 +673,9 @@ 
 	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">'.
@@ -645,8 +717,7 @@ 
 			$tobj->member_srl = $member_info->member_srl;
 			$tobj->homepage = $member_info->homepage;
 			$tobj->email_address = $member_info->email_address;
-		}
-		else
+		} else
 		{
 			$tobj->password = $val->password->body;
 			$tobj->nick_name = $val->commenter->name->body;
@@ -670,24 +741,28 @@ 
 			$list_args->head = $list_args->arrange = $tobj->comment_srl;
 			$list_args->depth = 0;
 			// Get parent_srl if parent comment exists
-		}
-		else
+		} else
 		{
 			// Get parent_srl
 			$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;
-			else
+			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;
+				}
 			}
 		}
 
@@ -695,7 +770,9 @@ 
 		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,9 +787,14 @@ 
 	 */
 	function arrangeCategory($obj, &$category, &$idx, $parent = 0)
 	{
-		if(!$obj->category) return;
-		if(!is_array($obj->category)) $c = array($obj->category);
-		else $c = $obj->category;
+		if(!$obj->category) {
+			return;
+		}
+		if(!is_array($obj->category)) {
+			$c = array($obj->category);
+		} else {
+			$c = $obj->category;
+		}
 		foreach($c as $val)
 		{
 			$idx++;

modules/install/install.admin.controller.php

Doc Comments +12 added lines

@@ -294,6 +294,7 @@ 
 
 	/**
 	 * @brief Supported languages (was procInstallAdminSaveLangSelected)
+	 * @param string $selected_lang
 	 */
 	function saveLangSelected($selected_lang)
 	{
@@ -311,6 +312,10 @@ 
 	}
 
 	/* 썸내일 보여주기 방식 변경.*/
+
+	/**
+	 * @param stdClass $config
+	 */
 	function setModulesConfig($config)
 	{
 		$args = new stdClass();
@@ -331,6 +336,10 @@ 
 		return $output;
 	}
 
+	/**
+	 * @param string $icon
+	 * @param string $iconname
+	 */
 	private function saveIconTmp($icon, $iconname)
 	{
 
@@ -377,6 +386,9 @@ 
 		return $relative_filename;
 	}
 
+	/**
+	 * @param string $iconname
+	 */
 	private function updateIcon($iconname, $deleteIcon = false) {
 
 		$site_info = Context::get('site_module_info');

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * @class  installAdminController
- * @author NAVER (developers@xpressengine.com)
- * @brief admin controller class of the install module
- */
+	 * @class  installAdminController
+	 * @author NAVER (developers@xpressengine.com)
+	 * @brief admin controller class of the install module
+	 */
 class installAdminController extends install
 {
 	/**

Spacing +74 added lines, -74 removed lines

@@ -20,10 +20,10 @@ 
 	function procInstallAdminInstall()
 	{
 		$module_name = Context::get('module_name');
-		if(!$module_name) return new object(-1, 'invalid_request');
+		if (!$module_name) return new object(-1, 'invalid_request');
 
 		$oInstallController = getController('install');
-		$oInstallController->installModule($module_name, './modules/'.$module_name);
+		$oInstallController->installModule($module_name, './modules/' . $module_name);
 
 		$this->setMessage('success_installed');
 	}
@@ -35,10 +35,10 @@ 
 	{
 		@set_time_limit(0);
 		$module_name = Context::get('module_name');
-		if(!$module_name) return new object(-1, 'invalid_request');
+		if (!$module_name) return new object(-1, 'invalid_request');
 
 		$oModule = getModule($module_name, 'class');
-		if($oModule) $output = $oModule->moduleUpdate();
+		if ($oModule) $output = $oModule->moduleUpdate();
 		else $output = new Object(-1, 'invalid_request');
 
 		return $output;
@@ -53,25 +53,25 @@ 
 
 		$admin_ip_list = Context::get('admin_ip_list');
 
-		if($admin_ip_list)
+		if ($admin_ip_list)
 		{
-			$admin_ip_list = preg_replace("/[\r|\n|\r\n]+/",",",$admin_ip_list);
-			$admin_ip_list = preg_replace("/\s+/","",$admin_ip_list);
-			if(preg_match('/(<\?|<\?php|\?>)/xsm', $admin_ip_list))
+			$admin_ip_list = preg_replace("/[\r|\n|\r\n]+/", ",", $admin_ip_list);
+			$admin_ip_list = preg_replace("/\s+/", "", $admin_ip_list);
+			if (preg_match('/(<\?|<\?php|\?>)/xsm', $admin_ip_list))
 			{
 				$admin_ip_list = '';
 			}
 			$admin_ip_list .= ',127.0.0.1,' . $_SERVER['REMOTE_ADDR'];
-			$admin_ip_list = explode(',',trim($admin_ip_list, ','));
+			$admin_ip_list = explode(',', trim($admin_ip_list, ','));
 			$admin_ip_list = array_unique($admin_ip_list);
-			if(!IpFilter::validate($admin_ip_list)) {
+			if (!IpFilter::validate($admin_ip_list)) {
 				return new Object(-1, 'msg_invalid_ip');
 			}
 		}
 		
 		$default_url = Context::get('default_url');
-		if($default_url && strncasecmp('http://', $default_url, 7) !== 0 && strncasecmp('https://', $default_url, 8) !== 0) $default_url = 'http://'.$default_url;
-		if($default_url && substr($default_url, -1) !== '/') $default_url = $default_url.'/';
+		if ($default_url && strncasecmp('http://', $default_url, 7) !== 0 && strncasecmp('https://', $default_url, 8) !== 0) $default_url = 'http://' . $default_url;
+		if ($default_url && substr($default_url, -1) !== '/') $default_url = $default_url . '/';
 
 		/* convert NON Alphabet URL to punycode URL - Alphabet URL will not be changed */
 		require_once(_XE_PATH_ . 'libs/idna_convert/idna_convert.class.php');
@@ -79,25 +79,25 @@ 
 		$default_url = $IDN->encode($default_url);
 
 		$use_ssl = Context::get('use_ssl');
-		if(!$use_ssl) $use_ssl = 'none';
+		if (!$use_ssl) $use_ssl = 'none';
 
 		$http_port = Context::get('http_port');
 		$https_port = Context::get('https_port');
 
 		$use_rewrite = Context::get('use_rewrite');
-		if($use_rewrite!='Y') $use_rewrite = 'N';
+		if ($use_rewrite != 'Y') $use_rewrite = 'N';
 
 		$use_sso = Context::get('use_sso');
-		if($use_sso !='Y') $use_sso = 'N';
+		if ($use_sso != 'Y') $use_sso = 'N';
 
 		$use_db_session = Context::get('use_db_session');
-		if($use_db_session!='Y') $use_db_session = 'N';
+		if ($use_db_session != 'Y') $use_db_session = 'N';
 
 		$qmail_compatibility = Context::get('qmail_compatibility');
-		if($qmail_compatibility!='Y') $qmail_compatibility = 'N';
+		if ($qmail_compatibility != 'Y') $qmail_compatibility = 'N';
 
 		$use_html5 = Context::get('use_html5');
-		if(!$use_html5) $use_html5 = 'N';
+		if (!$use_html5) $use_html5 = 'N';
 
 		$db_info->default_url = $default_url;
 		$db_info->qmail_compatibility = $qmail_compatibility;
@@ -108,23 +108,23 @@ 
 		$db_info->use_html5 = $use_html5;
 		$db_info->admin_ip_list = $admin_ip_list;
 
-		if($http_port) $db_info->http_port = (int) $http_port;
-		else if($db_info->http_port) unset($db_info->http_port);
+		if ($http_port) $db_info->http_port = (int) $http_port;
+		else if ($db_info->http_port) unset($db_info->http_port);
 
-		if($https_port) $db_info->https_port = (int) $https_port;
-		else if($db_info->https_port) unset($db_info->https_port);
+		if ($https_port) $db_info->https_port = (int) $https_port;
+		else if ($db_info->https_port) unset($db_info->https_port);
 
 		unset($db_info->lang_type);
 
 		$oInstallController = getController('install');
-		if(!$oInstallController->makeConfigFile())
+		if (!$oInstallController->makeConfigFile())
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 		else
 		{
 			Context::setDBInfo($db_info);
-			if($default_url)
+			if ($default_url)
 			{
 				$site_args = new stdClass;
 				$site_args->site_srl = 0;
@@ -138,7 +138,7 @@ 
 
 	function procInstallAdminUpdateIndexModule()
 	{
-		if(!Context::get('index_module_srl') || !Context::get('menu_item_srl'))
+		if (!Context::get('index_module_srl') || !Context::get('menu_item_srl'))
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -157,12 +157,12 @@ 
 		// update homeSitemap.php cache file
 		$oMenuAdminController = getAdminController('menu');
 		$homeMenuCacheFile = $oMenuAdminController->getHomeMenuCacheFile();
-		if(file_exists($homeMenuCacheFile))
+		if (file_exists($homeMenuCacheFile))
 		{
 			include($homeMenuCacheFile);
 		}
 
-		if(!$homeMenuSrl || $homeMenuSrl != $output->menu_srl)
+		if (!$homeMenuSrl || $homeMenuSrl != $output->menu_srl)
 		{
 			$oMenuAdminController->makeHomemenuCacheFile($output->menu_srl);
 		}
@@ -173,8 +173,8 @@ 
 	function procInstallAdminRemoveFTPInfo()
 	{
 		$ftp_config_file = Context::getFTPConfigFile();
-		if(file_exists($ftp_config_file)) unlink($ftp_config_file);
-		if($_SESSION['ftp_password']) unset($_SESSION['ftp_password']);
+		if (file_exists($ftp_config_file)) unlink($ftp_config_file);
+		if ($_SESSION['ftp_password']) unset($_SESSION['ftp_password']);
 		$this->setMessage('success_deleted');
 	}
 
@@ -185,38 +185,38 @@ 
 		$ftp_info->ftp_port = Context::get('ftp_port');
 		$ftp_info->ftp_host = Context::get('ftp_host');
 		$ftp_info->ftp_pasv = Context::get('ftp_pasv');
-		if(!$ftp_info->ftp_pasv) $ftp_info->ftp_pasv = "N";
+		if (!$ftp_info->ftp_pasv) $ftp_info->ftp_pasv = "N";
 		$ftp_info->sftp = Context::get('sftp');
 
 		$ftp_root_path = Context::get('ftp_root_path');
-		if(substr($ftp_root_path, strlen($ftp_root_path)-1) == "/")
+		if (substr($ftp_root_path, strlen($ftp_root_path) - 1) == "/")
 		{
 			$ftp_info->ftp_root_path = $ftp_root_path;
 		}
 		else
 		{
-			$ftp_info->ftp_root_path = $ftp_root_path.'/';
+			$ftp_info->ftp_root_path = $ftp_root_path . '/';
 		}
 
-		if(ini_get('safe_mode'))
+		if (ini_get('safe_mode'))
 		{
 			$ftp_info->ftp_password = Context::get('ftp_password');
 		}
 
-		$buff = '<?php if(!defined("__XE__")) exit();'."\n\$ftp_info = new stdClass;\n";
-		foreach($ftp_info as $key => $val)
+		$buff = '<?php if(!defined("__XE__")) exit();' . "\n\$ftp_info = new stdClass;\n";
+		foreach ($ftp_info as $key => $val)
 		{
-			if(!$val) continue;
-			if(preg_match('/(<\?|<\?php|\?>|fputs|fopen|fwrite|fgets|fread|file_get_contents|file_put_contents|exec|proc_open|popen|passthru|show_source|phpinfo|system|\/\*|\*\/|chr\()/xsm', preg_replace('/\s/', '', $val)))
+			if (!$val) continue;
+			if (preg_match('/(<\?|<\?php|\?>|fputs|fopen|fwrite|fgets|fread|file_get_contents|file_put_contents|exec|proc_open|popen|passthru|show_source|phpinfo|system|\/\*|\*\/|chr\()/xsm', preg_replace('/\s/', '', $val)))
 			{
 				continue;
 			}
-			$buff .= sprintf("\$ftp_info->%s = '%s';\n", $key, str_replace("'","\\'",$val));
+			$buff .= sprintf("\$ftp_info->%s = '%s';\n", $key, str_replace("'", "\\'", $val));
 		}
 		$buff .= "?>";
 		$config_file = Context::getFTPConfigFile();
 		FileHandler::WriteFile($config_file, $buff);
-		if($_SESSION['ftp_password']) unset($_SESSION['ftp_password']);
+		if ($_SESSION['ftp_password']) unset($_SESSION['ftp_password']);
 
 		$this->setMessage('success_updated');
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminConfigFtp');
@@ -226,7 +226,7 @@ 
 	function procInstallAdminConfig()
 	{
 		$use_mobile_view = Context::get('use_mobile_view');
-		if($use_mobile_view!='Y') $use_mobile_view = 'N';
+		if ($use_mobile_view != 'Y') $use_mobile_view = 'N';
 
 		$time_zone = Context::get('time_zone');
 
@@ -237,15 +237,15 @@ 
 		unset($db_info->lang_type);
 		Context::setDBInfo($db_info);
 		$oInstallController = getController('install');
-		if(!$oInstallController->makeConfigFile())
+		if (!$oInstallController->makeConfigFile())
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
 		$site_args = new stdClass();
 		$site_args->site_srl = 0;
-		$site_args->index_module_srl = Context::get('index_module_srl');//
-		$site_args->default_language = Context::get('change_lang_type');//
+		$site_args->index_module_srl = Context::get('index_module_srl'); //
+		$site_args->default_language = Context::get('change_lang_type'); //
 		$oModuleController = getController('module');
 		$oModuleController->updateSite($site_args);
 
@@ -257,8 +257,8 @@ 
 		$deleteFavicon = Context::get('is_delete_favicon');
 		$deleteMobicon = Context::get('is_delete_mobicon');
 
-		$this->updateIcon('favicon.ico',$deleteFavicon);
-		$this->updateIcon('mobicon.png',$deleteMobicon);
+		$this->updateIcon('favicon.ico', $deleteFavicon);
+		$this->updateIcon('mobicon.png', $deleteMobicon);
 
 		//모듈 설정 저장(썸네일, 풋터스크립트)
 		$config = new stdClass();
@@ -271,25 +271,25 @@ 
 	}
 
 	public function procInstallAdminConfigIconUpload() {
-		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplatePath($this->module_path . 'tpl');
 		$this->setTemplateFile("after_upload_config_image.html");
 
 		$favicon = Context::get('favicon');
 		$mobicon = Context::get('mobicon');
-		if(!$favicon && !$mobicon) {
+		if (!$favicon && !$mobicon) {
 			Context::set('msg', Context::getLang("msg_invalid_format"));
 			return;
 		}
-		if($favicon) {
+		if ($favicon) {
 			$name = 'favicon';
-			$tmpFileName = $this->saveIconTmp($favicon,'favicon.ico');
+			$tmpFileName = $this->saveIconTmp($favicon, 'favicon.ico');
 		} else {
 			$name = 'mobicon';
-			$tmpFileName = $this->saveIconTmp($mobicon,'mobicon.png');
+			$tmpFileName = $this->saveIconTmp($mobicon, 'mobicon.png');
 		}
 
 		Context::set('name', $name);
-		Context::set('tmpFileName', $tmpFileName.'?'.$_SERVER['REQUEST_TIME']);
+		Context::set('tmpFileName', $tmpFileName . '?' . $_SERVER['REQUEST_TIME']);
 	}
 
 	/**
@@ -301,12 +301,12 @@ 
 
 		$lang_supported = Context::loadLangSupported();
 		$buff = null;
-		for($i=0;$i<count($langs);$i++)
+		for ($i = 0; $i < count($langs); $i++)
 		{
 			$buff .= sprintf("%s,%s\n", $langs[$i], $lang_supported[$langs[$i]]);
 
 		}
-		FileHandler::writeFile(_XE_PATH_.'files/config/lang_selected.info', trim($buff));
+		FileHandler::writeFile(_XE_PATH_ . 'files/config/lang_selected.info', trim($buff));
 		//$this->setMessage('success_updated');
 	}
 
@@ -315,18 +315,18 @@ 
 	{
 		$args = new stdClass();
 
-		if(!$config->thumbnail_type || $config->thumbnail_type != 'ratio' ) $args->thumbnail_type = 'crop';
+		if (!$config->thumbnail_type || $config->thumbnail_type != 'ratio') $args->thumbnail_type = 'crop';
 		else $args->thumbnail_type = 'ratio';
 
 		$oModuleController = getController('module');
-		$oModuleController->insertModuleConfig('document',$args);
+		$oModuleController->insertModuleConfig('document', $args);
 
 		unset($args);
 
 		$args = new stdClass;
 		$args->htmlFooter = $config->htmlFooter;
 		$args->siteTitle = $config->siteTitle;
-		$oModuleController->updateModuleConfig('module',$args);
+		$oModuleController->updateModuleConfig('module', $args);
 
 		return $output;
 	}
@@ -336,32 +336,32 @@ 
 
 		$site_info = Context::get('site_module_info');
 		$virtual_site = '';
-		if($site_info->site_srl) 
+		if ($site_info->site_srl) 
 		{
 			$virtual_site = $site_info->site_srl . '/';
 		}
 
 		$target_file = $icon['tmp_name'];
 		$type = $icon['type'];
-		$relative_filename = 'files/attach/xeicon/'.$virtual_site.'tmp/'.$iconname;
-		$target_filename = _XE_PATH_.$relative_filename;
+		$relative_filename = 'files/attach/xeicon/' . $virtual_site . 'tmp/' . $iconname;
+		$target_filename = _XE_PATH_ . $relative_filename;
 
 		list($width, $height, $type_no, $attrs) = @getimagesize($target_file);
-		if($iconname == 'favicon.ico')
+		if ($iconname == 'favicon.ico')
 		{
-			if(!preg_match('/^.*(x-icon|\.icon)$/i',$type)) {
-				Context::set('msg', '*.ico '.Context::getLang('msg_possible_only_file'));
+			if (!preg_match('/^.*(x-icon|\.icon)$/i', $type)) {
+				Context::set('msg', '*.ico ' . Context::getLang('msg_possible_only_file'));
 				return;
 			}
 		}
-		else if($iconname == 'mobicon.png')
+		else if ($iconname == 'mobicon.png')
 		{
-			if(!preg_match('/^.*(png).*$/',$type)) {
-				Context::set('msg', '*.png '.Context::getLang('msg_possible_only_file'));
+			if (!preg_match('/^.*(png).*$/', $type)) {
+				Context::set('msg', '*.png ' . Context::getLang('msg_possible_only_file'));
 				return;
 			}
-			if(!(($height == '57' && $width == '57') || ($height == '114' && $width == '114'))) {
-				Context::set('msg', Context::getLang('msg_invalid_format').' (size : 57x57, 114x114)');
+			if (!(($height == '57' && $width == '57') || ($height == '114' && $width == '114'))) {
+				Context::set('msg', Context::getLang('msg_invalid_format') . ' (size : 57x57, 114x114)');
 				return;
 			}
 		}
@@ -381,21 +381,21 @@ 
 
 		$site_info = Context::get('site_module_info');
 		$virtual_site = '';
-		if($site_info->site_srl) 
+		if ($site_info->site_srl) 
 		{
 			$virtual_site = $site_info->site_srl . '/';
 		}
 
-		$image_filepath = _XE_PATH_.'files/attach/xeicon/' . $virtual_site;
+		$image_filepath = _XE_PATH_ . 'files/attach/xeicon/' . $virtual_site;
 
-		if($deleteIcon) {
-			FileHandler::removeFile($image_filepath.$iconname);
+		if ($deleteIcon) {
+			FileHandler::removeFile($image_filepath . $iconname);
 			return;
 		}
 
-		$tmpicon_filepath = $image_filepath.'tmp/'.$iconname;
-		$icon_filepath = $image_filepath.$iconname;
-		if(file_exists($tmpicon_filepath))
+		$tmpicon_filepath = $image_filepath . 'tmp/' . $iconname;
+		$icon_filepath = $image_filepath . $iconname;
+		if (file_exists($tmpicon_filepath))
 		{
 			FileHandler::moveFile($tmpicon_filepath, $icon_filepath);
 		}

Braces +72 added lines, -32 removed lines

@@ -20,7 +20,9 @@ 
 	function procInstallAdminInstall()
 	{
 		$module_name = Context::get('module_name');
-		if(!$module_name) return new object(-1, 'invalid_request');
+		if(!$module_name) {
+			return new object(-1, 'invalid_request');
+		}
 
 		$oInstallController = getController('install');
 		$oInstallController->installModule($module_name, './modules/'.$module_name);
@@ -35,11 +37,16 @@ 
 	{
 		@set_time_limit(0);
 		$module_name = Context::get('module_name');
-		if(!$module_name) return new object(-1, 'invalid_request');
+		if(!$module_name) {
+			return new object(-1, 'invalid_request');
+		}
 
 		$oModule = getModule($module_name, 'class');
-		if($oModule) $output = $oModule->moduleUpdate();
-		else $output = new Object(-1, 'invalid_request');
+		if($oModule) {
+			$output = $oModule->moduleUpdate();
+		} else {
+			$output = new Object(-1, 'invalid_request');
+		}
 
 		return $output;
 	}
@@ -70,8 +77,12 @@ 
 		}
 		
 		$default_url = Context::get('default_url');
-		if($default_url && strncasecmp('http://', $default_url, 7) !== 0 && strncasecmp('https://', $default_url, 8) !== 0) $default_url = 'http://'.$default_url;
-		if($default_url && substr($default_url, -1) !== '/') $default_url = $default_url.'/';
+		if($default_url && strncasecmp('http://', $default_url, 7) !== 0 && strncasecmp('https://', $default_url, 8) !== 0) {
+			$default_url = 'http://'.$default_url;
+		}
+		if($default_url && substr($default_url, -1) !== '/') {
+			$default_url = $default_url.'/';
+		}
 
 		/* convert NON Alphabet URL to punycode URL - Alphabet URL will not be changed */
 		require_once(_XE_PATH_ . 'libs/idna_convert/idna_convert.class.php');
@@ -79,25 +90,37 @@ 
 		$default_url = $IDN->encode($default_url);
 
 		$use_ssl = Context::get('use_ssl');
-		if(!$use_ssl) $use_ssl = 'none';
+		if(!$use_ssl) {
+			$use_ssl = 'none';
+		}
 
 		$http_port = Context::get('http_port');
 		$https_port = Context::get('https_port');
 
 		$use_rewrite = Context::get('use_rewrite');
-		if($use_rewrite!='Y') $use_rewrite = 'N';
+		if($use_rewrite!='Y') {
+			$use_rewrite = 'N';
+		}
 
 		$use_sso = Context::get('use_sso');
-		if($use_sso !='Y') $use_sso = 'N';
+		if($use_sso !='Y') {
+			$use_sso = 'N';
+		}
 
 		$use_db_session = Context::get('use_db_session');
-		if($use_db_session!='Y') $use_db_session = 'N';
+		if($use_db_session!='Y') {
+			$use_db_session = 'N';
+		}
 
 		$qmail_compatibility = Context::get('qmail_compatibility');
-		if($qmail_compatibility!='Y') $qmail_compatibility = 'N';
+		if($qmail_compatibility!='Y') {
+			$qmail_compatibility = 'N';
+		}
 
 		$use_html5 = Context::get('use_html5');
-		if(!$use_html5) $use_html5 = 'N';
+		if(!$use_html5) {
+			$use_html5 = 'N';
+		}
 
 		$db_info->default_url = $default_url;
 		$db_info->qmail_compatibility = $qmail_compatibility;
@@ -108,11 +131,17 @@ 
 		$db_info->use_html5 = $use_html5;
 		$db_info->admin_ip_list = $admin_ip_list;
 
-		if($http_port) $db_info->http_port = (int) $http_port;
-		else if($db_info->http_port) unset($db_info->http_port);
+		if($http_port) {
+			$db_info->http_port = (int) $http_port;
+		} else if($db_info->http_port) {
+			unset($db_info->http_port);
+		}
 
-		if($https_port) $db_info->https_port = (int) $https_port;
-		else if($db_info->https_port) unset($db_info->https_port);
+		if($https_port) {
+			$db_info->https_port = (int) $https_port;
+		} else if($db_info->https_port) {
+			unset($db_info->https_port);
+		}
 
 		unset($db_info->lang_type);
 
@@ -120,8 +149,7 @@ 
 		if(!$oInstallController->makeConfigFile())
 		{
 			return new Object(-1, 'msg_invalid_request');
-		}
-		else
+		} else
 		{
 			Context::setDBInfo($db_info);
 			if($default_url)
@@ -173,8 +201,12 @@ 
 	function procInstallAdminRemoveFTPInfo()
 	{
 		$ftp_config_file = Context::getFTPConfigFile();
-		if(file_exists($ftp_config_file)) unlink($ftp_config_file);
-		if($_SESSION['ftp_password']) unset($_SESSION['ftp_password']);
+		if(file_exists($ftp_config_file)) {
+			unlink($ftp_config_file);
+		}
+		if($_SESSION['ftp_password']) {
+			unset($_SESSION['ftp_password']);
+		}
 		$this->setMessage('success_deleted');
 	}
 
@@ -185,15 +217,16 @@ 
 		$ftp_info->ftp_port = Context::get('ftp_port');
 		$ftp_info->ftp_host = Context::get('ftp_host');
 		$ftp_info->ftp_pasv = Context::get('ftp_pasv');
-		if(!$ftp_info->ftp_pasv) $ftp_info->ftp_pasv = "N";
+		if(!$ftp_info->ftp_pasv) {
+			$ftp_info->ftp_pasv = "N";
+		}
 		$ftp_info->sftp = Context::get('sftp');
 
 		$ftp_root_path = Context::get('ftp_root_path');
 		if(substr($ftp_root_path, strlen($ftp_root_path)-1) == "/")
 		{
 			$ftp_info->ftp_root_path = $ftp_root_path;
-		}
-		else
+		} else
 		{
 			$ftp_info->ftp_root_path = $ftp_root_path.'/';
 		}
@@ -206,7 +239,9 @@ 
 		$buff = '<?php if(!defined("__XE__")) exit();'."\n\$ftp_info = new stdClass;\n";
 		foreach($ftp_info as $key => $val)
 		{
-			if(!$val) continue;
+			if(!$val) {
+				continue;
+			}
 			if(preg_match('/(<\?|<\?php|\?>|fputs|fopen|fwrite|fgets|fread|file_get_contents|file_put_contents|exec|proc_open|popen|passthru|show_source|phpinfo|system|\/\*|\*\/|chr\()/xsm', preg_replace('/\s/', '', $val)))
 			{
 				continue;
@@ -216,7 +251,9 @@ 
 		$buff .= "?>";
 		$config_file = Context::getFTPConfigFile();
 		FileHandler::WriteFile($config_file, $buff);
-		if($_SESSION['ftp_password']) unset($_SESSION['ftp_password']);
+		if($_SESSION['ftp_password']) {
+			unset($_SESSION['ftp_password']);
+		}
 
 		$this->setMessage('success_updated');
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminConfigFtp');
@@ -226,7 +263,9 @@ 
 	function procInstallAdminConfig()
 	{
 		$use_mobile_view = Context::get('use_mobile_view');
-		if($use_mobile_view!='Y') $use_mobile_view = 'N';
+		if($use_mobile_view!='Y') {
+			$use_mobile_view = 'N';
+		}
 
 		$time_zone = Context::get('time_zone');
 
@@ -315,8 +354,11 @@ 
 	{
 		$args = new stdClass();
 
-		if(!$config->thumbnail_type || $config->thumbnail_type != 'ratio' ) $args->thumbnail_type = 'crop';
-		else $args->thumbnail_type = 'ratio';
+		if(!$config->thumbnail_type || $config->thumbnail_type != 'ratio' ) {
+			$args->thumbnail_type = 'crop';
+		} else {
+			$args->thumbnail_type = 'ratio';
+		}
 
 		$oModuleController = getController('module');
 		$oModuleController->insertModuleConfig('document',$args);
@@ -353,8 +395,7 @@ 
 				Context::set('msg', '*.ico '.Context::getLang('msg_possible_only_file'));
 				return;
 			}
-		}
-		else if($iconname == 'mobicon.png')
+		} else if($iconname == 'mobicon.png')
 		{
 			if(!preg_match('/^.*(png).*$/',$type)) {
 				Context::set('msg', '*.png '.Context::getLang('msg_possible_only_file'));
@@ -364,8 +405,7 @@ 
 				Context::set('msg', Context::getLang('msg_invalid_format').' (size : 57x57, 114x114)');
 				return;
 			}
-		}
-		else
+		} else
 		{
 			Context::set('msg', Context::getLang('msg_invalid_format'));
 			return;

modules/install/install.controller.php

Doc Comments +2 added lines

@@ -545,6 +545,7 @@ 
 
 	/**
 	 * @brief Install an each module
+	 * @param string $module_path
 	 */
 	function installModule($module, $module_path)
 	{
@@ -614,6 +615,7 @@ 
 	/**
 	 * @brief Create etc config file
 	 * Create the config file when all settings are completed
+	 * @param stdClass $config_info
 	 */
 	function makeEtcConfigFile($config_info)
 	{

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * @class  installController
- * @author NAVER (developers@xpressengine.com)
- * @brief install module of the Controller class
- */
+	 * @class  installController
+	 * @author NAVER (developers@xpressengine.com)
+	 * @brief install module of the Controller class
+	 */
 class installController extends install
 {
 	var $db_tmp_config_file = '';
@@ -413,7 +413,7 @@ 
 	 * make a file to files/config and check url approach by ".htaccess" rules
 	 *
 	 * @return bool
-	*/
+	 */
 	function checkRewriteUsable() {
 		$checkString = "isApproached";
 		$checkFilePath = 'files/config/tmpRewriteCheck.txt';

Spacing +118 added lines, -118 removed lines

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

Braces +142 added lines, -54 removed lines

@@ -101,11 +101,17 @@ 
 		// Check if available to connect to the DB
 		$oDB = &DB::getInstance();
 		$output = $oDB->getError();
-		if(!$output->toBool()) return $output;
-		if(!$oDB->isConnected()) return $oDB->getError();
+		if(!$output->toBool()) {
+			return $output;
+		}
+		if(!$oDB->isConnected()) {
+			return $oDB->getError();
+		}
 
 		// Create a db temp config file
-		if(!$this->makeDBConfigFile()) return new Object(-1, 'msg_install_failed');
+		if(!$this->makeDBConfigFile()) {
+			return new Object(-1, 'msg_install_failed');
+		}
 
 		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
 		{
@@ -122,10 +128,14 @@ 
 	{
 		// Get variables
 		$config_info = Context::gets('use_rewrite','time_zone');
-		if($config_info->use_rewrite!='Y') $config_info->use_rewrite = 'N';
+		if($config_info->use_rewrite!='Y') {
+			$config_info->use_rewrite = 'N';
+		}
 
 		// Create a db temp config file
-		if(!$this->makeEtcConfigFile($config_info)) return new Object(-1, 'msg_install_failed');
+		if(!$this->makeEtcConfigFile($config_info)) {
+			return new Object(-1, 'msg_install_failed');
+		}
 
 		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
 		{
@@ -141,7 +151,9 @@ 
 	function procInstall()
 	{
 		// Check if it is already installed
-		if(Context::isInstalled()) return new Object(-1, 'msg_already_installed');
+		if(Context::isInstalled()) {
+			return new Object(-1, 'msg_already_installed');
+		}
 
 		// Assign a temporary administrator when installing
 		$logged_info = new stdClass();
@@ -156,8 +168,12 @@ 
 		// install by default XE UI
 		else
 		{
-			if(FileHandler::exists($this->db_tmp_config_file)) include $this->db_tmp_config_file;
-			if(FileHandler::exists($this->etc_tmp_config_file)) include $this->etc_tmp_config_file;
+			if(FileHandler::exists($this->db_tmp_config_file)) {
+				include $this->db_tmp_config_file;
+			}
+			if(FileHandler::exists($this->etc_tmp_config_file)) {
+				include $this->etc_tmp_config_file;
+			}
 		}
 
 		// Set DB type and information
@@ -165,7 +181,9 @@ 
 		// Create DB Instance
 		$oDB = &DB::getInstance();
 		// Check if available to connect to the DB
-		if(!$oDB->isConnected()) return $oDB->getError();
+		if(!$oDB->isConnected()) {
+			return $oDB->getError();
+		}
 
 		// Install all the modules
 		try {
@@ -178,7 +196,9 @@ 
 		}
 
 		// Create a config file
-		if(!$this->makeConfigFile()) return new Object(-1, 'msg_install_failed');
+		if(!$this->makeConfigFile()) {
+			return new Object(-1, 'msg_install_failed');
+		}
 
 		// load script
 		$scripts = FileHandler::readDir(_XE_PATH_ . 'modules/install/script', '/(\.php)$/');
@@ -239,12 +259,20 @@ 
 	 */
 	function procInstallFTP()
 	{
-		if(Context::isInstalled()) return new Object(-1, 'msg_already_installed');
+		if(Context::isInstalled()) {
+			return new Object(-1, 'msg_already_installed');
+		}
 		$ftp_info = Context::gets('ftp_host', 'ftp_user','ftp_password','ftp_port','ftp_root_path');
 		$ftp_info->ftp_port = (int)$ftp_info->ftp_port;
-		if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
-		if(!$ftp_info->ftp_host) $ftp_info->ftp_host = '127.0.0.1';
-		if(!$ftp_info->ftp_root_path) $ftp_info->ftp_root_path = '/';
+		if(!$ftp_info->ftp_port) {
+			$ftp_info->ftp_port = 21;
+		}
+		if(!$ftp_info->ftp_host) {
+			$ftp_info->ftp_host = '127.0.0.1';
+		}
+		if(!$ftp_info->ftp_root_path) {
+			$ftp_info->ftp_root_path = '/';
+		}
 
 		$buff = array('<?php if(!defined("__XE__")) exit();');
 		$buff[] = "\$ftp_info = new stdClass();";
@@ -256,11 +284,15 @@ 
 		// If safe_mode
 		if(ini_get('safe_mode'))
 		{
-			if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new Object(-1,'msg_safe_mode_ftp_needed');
+			if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) {
+				return new Object(-1,'msg_safe_mode_ftp_needed');
+			}
 
 			require_once(_XE_PATH_.'libs/ftp.class.php');
 			$oFtp = new ftp();
-			if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_info->ftp_host));
+			if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) {
+				return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_info->ftp_host));
+			}
 
 			if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
@@ -302,10 +334,16 @@ 
 	{
 		$ftp_info = Context::gets('ftp_user','ftp_password','ftp_port','sftp');
 		$ftp_info->ftp_port = (int)$ftp_info->ftp_port;
-		if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
-		if(!$ftp_info->sftp) $ftp_info->sftp = 'N';
+		if(!$ftp_info->ftp_port) {
+			$ftp_info->ftp_port = 21;
+		}
+		if(!$ftp_info->sftp) {
+			$ftp_info->sftp = 'N';
+		}
 
-		if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new Object(-1,'msg_safe_mode_ftp_needed');
+		if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) {
+			return new Object(-1,'msg_safe_mode_ftp_needed');
+		}
 
 		if($ftp_info->sftp == 'Y')
 		{
@@ -314,12 +352,13 @@ 
 			{
 				return new Object(-1,'msg_ftp_invalid_auth_info');
 			}
-		}
-		else
+		} else
 		{
 			require_once(_XE_PATH_.'libs/ftp.class.php');
 			$oFtp = new ftp();
-			if(!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost'));
+			if(!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) {
+				return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost'));
+			}
 
 			if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
@@ -352,26 +391,47 @@ 
 		}
 
 		// 1. Check permission
-		if(is_writable('./')||is_writable('./files')) $checklist['permission'] = true;
-		else $checklist['permission'] = false;
+		if(is_writable('./')||is_writable('./files')) {
+			$checklist['permission'] = true;
+		} else {
+			$checklist['permission'] = false;
+		}
 		// 2. Check if xml_parser_create exists
-		if(function_exists('xml_parser_create')) $checklist['xml'] = true;
-		else $checklist['xml'] = false;
+		if(function_exists('xml_parser_create')) {
+			$checklist['xml'] = true;
+		} else {
+			$checklist['xml'] = false;
+		}
 		// 3. Check if ini_get (session.auto_start) == 1
-		if(ini_get('session.auto_start')!=1) $checklist['session'] = true;
-		else $checklist['session'] = false;
+		if(ini_get('session.auto_start')!=1) {
+			$checklist['session'] = true;
+		} else {
+			$checklist['session'] = false;
+		}
 		// 4. Check if iconv exists
-		if(function_exists('iconv')) $checklist['iconv'] = true;
-		else $checklist['iconv'] = false;
+		if(function_exists('iconv')) {
+			$checklist['iconv'] = true;
+		} else {
+			$checklist['iconv'] = false;
+		}
 		// 5. Check gd(imagecreatefromgif function)
-		if(function_exists('imagecreatefromgif')) $checklist['gd'] = true;
-		else $checklist['gd'] = false;
+		if(function_exists('imagecreatefromgif')) {
+			$checklist['gd'] = true;
+		} else {
+			$checklist['gd'] = false;
+		}
 		// 6. Check DB
-		if(DB::getEnableList()) $checklist['db'] = true;
-		else $checklist['db'] = false;
+		if(DB::getEnableList()) {
+			$checklist['db'] = true;
+		} else {
+			$checklist['db'] = false;
+		}
 
-		if(!$checklist['php_version'] || !$checklist['permission'] || !$checklist['xml'] || !$checklist['session'] || !$checklist['db']) $install_enable = false;
-		else $install_enable = true;
+		if(!$checklist['php_version'] || !$checklist['permission'] || !$checklist['xml'] || !$checklist['session'] || !$checklist['db']) {
+			$install_enable = false;
+		} else {
+			$install_enable = true;
+		}
 
 		// Save the checked result to the Context
 		Context::set('checklist', $checklist);
@@ -394,8 +454,7 @@ 
 		{
 			$currentTime = $_SERVER['REQUEST_TIME'];
 			FileHandler::writeFile($this->flagLicenseAgreement, $currentTime);
-		}
-		else
+		} else
 		{
 			FileHandler::removeFile($this->flagLicenseAgreement);
 			return new Object(-1, 'msg_must_accept_license_agreement');
@@ -490,13 +549,17 @@ 
 			$module = $tmp_arr[count($tmp_arr)-1];
 
 			$xml_info = $oModuleModel->getModuleInfoXml($module);
-			if(!$xml_info) continue;
+			if(!$xml_info) {
+				continue;
+			}
 			$modules[$xml_info->category][] = $module;
 		}
 		// Install "module" module in advance
 		$this->installModule('module','./modules/module');
 		$oModule = getClass('module');
-		if($oModule->checkUpdate()) $oModule->moduleUpdate();
+		if($oModule->checkUpdate()) {
+			$oModule->moduleUpdate();
+		}
 		// Determine the order of module installation depending on category
 		$install_step = array('system','content','member');
 		// Install all the remaining modules
@@ -506,13 +569,17 @@ 
 			{
 				foreach($modules[$category] as $module)
 				{
-					if($module == 'module') continue;
+					if($module == 'module') {
+						continue;
+					}
 					$this->installModule($module, sprintf('./modules/%s', $module));
 
 					$oModule = getClass($module);
 					if(is_object($oModule) && method_exists($oModule, 'checkUpdate'))
 					{
-						if($oModule->checkUpdate()) $oModule->moduleUpdate();
+						if($oModule->checkUpdate()) {
+							$oModule->moduleUpdate();
+						}
 					}
 				}
 				unset($modules[$category]);
@@ -527,13 +594,17 @@ 
 				{
 					foreach($module_list as $module)
 					{
-						if($module == 'module') continue;
+						if($module == 'module') {
+							continue;
+						}
 						$this->installModule($module, sprintf('./modules/%s', $module));
 
 						$oModule = getClass($module);
 						if($oModule && method_exists($oModule, 'checkUpdate') && method_exists($oModule, 'moduleUpdate'))
 						{
-							if($oModule->checkUpdate()) $oModule->moduleUpdate();
+							if($oModule->checkUpdate()) {
+								$oModule->moduleUpdate();
+							}
 						}
 					}
 				}
@@ -558,15 +629,20 @@ 
 		for($i=0;$i<$file_cnt;$i++)
 		{
 			$file = trim($schema_files[$i]);
-			if(!$file || substr($file,-4)!='.xml') continue;
+			if(!$file || substr($file,-4)!='.xml') {
+				continue;
+			}
 			$output = $oDB->createTableByXmlFile($file);
-			if($output === false)
-				throw new Exception('msg_create_table_failed');
+			if($output === false) {
+							throw new Exception('msg_create_table_failed');
+			}
 		}
 		// Create a table and module instance and then execute install() method
 		unset($oModule);
 		$oModule = getClass($module);
-		if(method_exists($oModule, 'moduleInstall')) $oModule->moduleInstall();
+		if(method_exists($oModule, 'moduleInstall')) {
+			$oModule->moduleInstall();
+		}
 		return new Object();
 	}
 
@@ -601,13 +677,17 @@ 
 		$db_tmp_config_file = $this->db_tmp_config_file;
 
 		$db_info = Context::getDbInfo();
-		if(!$db_info) return;
+		if(!$db_info) {
+			return;
+		}
 
 		$buff = $this->_getDBConfigFileContents($db_info);
 
 		FileHandler::writeFile($db_tmp_config_file, $buff);
 
-		if(@file_exists($db_tmp_config_file)) return true;
+		if(@file_exists($db_tmp_config_file)) {
+			return true;
+		}
 		return false;
 	}
 
@@ -627,7 +707,9 @@ 
 
 		FileHandler::writeFile($etc_tmp_config_file, $buff);
 
-		if(@file_exists($etc_tmp_config_file)) return true;
+		if(@file_exists($etc_tmp_config_file)) {
+			return true;
+		}
 		return false;
 	}
 
@@ -642,7 +724,9 @@ 
 			//if(file_exists($config_file)) return;
 
 			$db_info = Context::getDbInfo();
-			if(!$db_info) return;
+			if(!$db_info) {
+				return;
+			}
 
 			$buff = $this->_getDBConfigFileContents($db_info);
 
@@ -663,7 +747,9 @@ 
 	function installByConfig($install_config_file)
 	{
 		include $install_config_file;
-		if(!is_array($auto_config)) return false;
+		if(!is_array($auto_config)) {
+			return false;
+		}
 
 		$auto_config['module'] = 'install';
 		$auto_config['act'] = 'procInstall';
@@ -673,7 +759,9 @@ 
 		$body = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\r\n<methodCall>\r\n<params>\r\n";
 		foreach($auto_config as $k => $v)
 		{
-			if(!in_array($k,array('host','port','path'))) $body .= sprintf($fstr,$k,$v,$k);
+			if(!in_array($k,array('host','port','path'))) {
+				$body .= sprintf($fstr,$k,$v,$k);
+			}
 		}
 		$body .= "</params>\r\n</methodCall>";
 

modules/integration_search/integration_search.view.php

Doc Comments +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 	/**
 	 * Search Result
 	 *
-	 * @return Object
+	 * @return Object|null
 	 */
 	function IS()
 	{

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * The view class of the integration_search module
- *
- * @author NAVER (developers@xpressengine.com)
- */
+	 * The view class of the integration_search module
+	 *
+	 * @author NAVER (developers@xpressengine.com)
+	 */
 class integration_searchView extends integration_search
 {
 	/**

Spacing +14 added lines, -14 removed lines

@@ -39,11 +39,11 @@ 
 		$logged_info = Context::get('logged_info');
 
 		// Check permissions
-		if(!$this->grant->access) return new Object(-1,'msg_not_permitted');
+		if (!$this->grant->access) return new Object(-1, 'msg_not_permitted');
 
 		$config = $oModuleModel->getModuleConfig('integration_search');
-		if(!$config) $config = new stdClass;
-		if(!$config->skin)
+		if (!$config) $config = new stdClass;
+		if (!$config->skin)
 		{
 			$config->skin = 'default';
 			$template_path = sprintf('%sskins/%s', $this->module_path, $config->skin);
@@ -67,16 +67,16 @@ 
 		Context::set('module_info', $skin_vars);
 
 		$target = $config->target;
-		if(!$target) $target = 'include';
+		if (!$target) $target = 'include';
 
-		if(empty($config->target_module_srl))
+		if (empty($config->target_module_srl))
 			$module_srl_list = array();
 		else
-			$module_srl_list = explode(',',$config->target_module_srl);
+			$module_srl_list = explode(',', $config->target_module_srl);
 
 		// https://github.com/xpressengine/xe-core/issues/1522
 		// 검색 대상을 지정하지 않았을 때 검색 제한
-		if($target === 'include' && !count($module_srl_list))
+		if ($target === 'include' && !count($module_srl_list))
 		{
 			$oMessageObject = ModuleHandler::getModuleInstance('message');
 			$oMessageObject->setError(-1);
@@ -90,19 +90,19 @@ 
 		// Set a variable for search keyword
 		$is_keyword = Context::get('is_keyword');
 		// Set page variables
-		$page = (int)Context::get('page');
-		if(!$page) $page = 1;
+		$page = (int) Context::get('page');
+		if (!$page) $page = 1;
 		// Search by search tab
 		$where = Context::get('where');
 		// Create integration search model object
-		if($is_keyword)
+		if ($is_keyword)
 		{
 			$oIS = getModel('integration_search');
-			switch($where)
+			switch ($where)
 			{
 				case 'document' :
 					$search_target = Context::get('search_target');
-					if(!in_array($search_target, array('title','content','title_content','tag'))) $search_target = 'title';
+					if (!in_array($search_target, array('title', 'content', 'title_content', 'tag'))) $search_target = 'title';
 					Context::set('search_target', $search_target);
 
 					$output = $oIS->getDocuments($target, $module_srl_list, $search_target, $is_keyword, $page, 10);
@@ -116,7 +116,7 @@ 
 					break;
 				case 'trackback' :
 					$search_target = Context::get('search_target');
-					if(!in_array($search_target, array('title','url','blog_name','excerpt'))) $search_target = 'title';
+					if (!in_array($search_target, array('title', 'url', 'blog_name', 'excerpt'))) $search_target = 'title';
 					Context::set('search_target', $search_target);
 
 					$output = $oIS->getTrackbacks($target, $module_srl_list, $search_target, $is_keyword, $page, 10);
@@ -124,7 +124,7 @@ 
 					$this->setTemplateFile("trackback", $page);
 					break;
 				case 'multimedia' :
-					$output = $oIS->getImages($target, $module_srl_list, $is_keyword, $page,20);
+					$output = $oIS->getImages($target, $module_srl_list, $is_keyword, $page, 20);
 					Context::set('output', $output);
 					$this->setTemplateFile("multimedia", $page);
 					break;

Braces +26 added lines, -16 removed lines

@@ -39,24 +39,26 @@ 
 		$logged_info = Context::get('logged_info');
 
 		// Check permissions
-		if(!$this->grant->access) return new Object(-1,'msg_not_permitted');
+		if(!$this->grant->access) {
+			return new Object(-1,'msg_not_permitted');
+		}
 
 		$config = $oModuleModel->getModuleConfig('integration_search');
-		if(!$config) $config = new stdClass;
+		if(!$config) {
+			$config = new stdClass;
+		}
 		if(!$config->skin)
 		{
 			$config->skin = 'default';
 			$template_path = sprintf('%sskins/%s', $this->module_path, $config->skin);
-		}
-		else
+		} else
 		{
 			//check theme
 			$config_parse = explode('|@|', $config->skin);
 			if (count($config_parse) > 1)
 			{
 				$template_path = sprintf('./themes/%s/modules/integration_search/', $config_parse[0]);
-			}
-			else
+			} else
 			{
 				$template_path = sprintf('%sskins/%s', $this->module_path, $config->skin);
 			}
@@ -67,12 +69,15 @@ 
 		Context::set('module_info', $skin_vars);
 
 		$target = $config->target;
-		if(!$target) $target = 'include';
+		if(!$target) {
+			$target = 'include';
+		}
 
-		if(empty($config->target_module_srl))
-			$module_srl_list = array();
-		else
-			$module_srl_list = explode(',',$config->target_module_srl);
+		if(empty($config->target_module_srl)) {
+					$module_srl_list = array();
+		} else {
+					$module_srl_list = explode(',',$config->target_module_srl);
+		}
 
 		// https://github.com/xpressengine/xe-core/issues/1522
 		// 검색 대상을 지정하지 않았을 때 검색 제한
@@ -91,7 +96,9 @@ 
 		$is_keyword = Context::get('is_keyword');
 		// Set page variables
 		$page = (int)Context::get('page');
-		if(!$page) $page = 1;
+		if(!$page) {
+			$page = 1;
+		}
 		// Search by search tab
 		$where = Context::get('where');
 		// Create integration search model object
@@ -102,7 +109,9 @@ 
 			{
 				case 'document' :
 					$search_target = Context::get('search_target');
-					if(!in_array($search_target, array('title','content','title_content','tag'))) $search_target = 'title';
+					if(!in_array($search_target, array('title','content','title_content','tag'))) {
+						$search_target = 'title';
+					}
 					Context::set('search_target', $search_target);
 
 					$output = $oIS->getDocuments($target, $module_srl_list, $search_target, $is_keyword, $page, 10);
@@ -116,7 +125,9 @@ 
 					break;
 				case 'trackback' :
 					$search_target = Context::get('search_target');
-					if(!in_array($search_target, array('title','url','blog_name','excerpt'))) $search_target = 'title';
+					if(!in_array($search_target, array('title','url','blog_name','excerpt'))) {
+						$search_target = 'title';
+					}
 					Context::set('search_target', $search_target);
 
 					$output = $oIS->getTrackbacks($target, $module_srl_list, $search_target, $is_keyword, $page, 10);
@@ -144,8 +155,7 @@ 
 					$this->setTemplateFile("index", $page);
 					break;
 			}
-		}
-		else
+		} else
 		{
 			$this->setTemplateFile("no_keywords");
 		}

modules/layout/layout.admin.controller.php

Doc Comments +8 added lines, -8 removed lines

@@ -338,7 +338,7 @@ 
 
 	/**
 	 * Adding Layout Code
-	 * @return void|Object (void : success, Object : fail)
+	 * @return Object|null (void : success, Object : fail)
 	 */
 	function procLayoutAdminCodeUpdate()
 	{
@@ -371,7 +371,7 @@ 
 
 	/**
 	 * Reset layout code
-	 * @return void|Object (void : success, Object : fail)
+	 * @return Object|null (void : success, Object : fail)
 	 */
 	function procLayoutAdminCodeReset()
 	{
@@ -420,7 +420,7 @@ 
 	/**
 	 * insert image into user layout
 	 * @param int $layout_srl
-	 * @param object $source file data
+	 * @param string $source file data
 	 * @return boolean (true : success, false : fail)
 	 */
 	function insertUserLayoutImage($layout_srl,$source)
@@ -475,7 +475,7 @@ 
 	 * Save layout configuration
 	 * save in "ini" format for faceoff
 	 * @deprecated
-	 * @return void|Object (void : success, Object : fail)
+	 * @return Object|null (void : success, Object : fail)
 	 */
 	function procLayoutAdminUserValueInsert()
 	{
@@ -544,7 +544,7 @@ 
 	/**
 	 * Add the widget code for faceoff into user layout file
 	 * @param int $layout_srl
-	 * @param object $arg
+	 * @param null|stdClass $arg
 	 * @param string $content
 	 * @return string
 	 */
@@ -586,7 +586,7 @@ 
 
 	/**
 	 * export user layout
-	 * @return void
+	 * @return Object|null
 	 */
 	function procLayoutAdminUserLayoutExport()
 	{
@@ -682,7 +682,7 @@ 
 	/**
 	 * faceoff import
 	 * @deprecated
-	 * @return void
+	 * @return ModuleObject|null
 	 */
 	function procLayoutAdminUserLayoutImport()
 	{
@@ -843,7 +843,7 @@ 
 	/**
 	 * Layout file copy
 	 * @param $sourceLayoutSrl origin layout number
-	 * @param $targetLayoutSrl origin layout number
+	 * @param integer $targetLayoutSrl origin layout number
 	 * @return void
 	 */
 	function _copyLayoutFile($sourceLayoutSrl, $targetLayoutSrl)

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * @class  layoutAdminController
- * @author NAVER (developers@xpressengine.com)
- * admin controller class of the layout module
- */
+	 * @class  layoutAdminController
+	 * @author NAVER (developers@xpressengine.com)
+	 * admin controller class of the layout module
+	 */
 class layoutAdminController extends layout
 {
 	/**

Spacing +135 added lines, -135 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,9 +70,9 @@ 
 	{
 		$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');
+			$this->importLayout($layout_srl, $this->module_path . 'tpl/faceOff_sample.tar');
 			// Remove a directory
 		}
 		else
@@ -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,14 +404,14 @@ 
 	 */
 	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');
+		$this->setTemplatePath($this->module_path . 'tpl');
 		$this->setTemplateFile("top_refresh.html");
 
 		$this->setRedirectUrl(Context::get('error_return_url'));
@@ -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,7 +463,7 @@ 
 	 * @param string $filename
 	 * @return void
 	 */
-	function removeUserLayoutImage($layout_srl,$filename)
+	function removeUserLayoutImage($layout_srl, $filename)
 	{
 		$oLayoutModel = getModel('layout');
 		$path = $oLayoutModel->getUserLayoutImagePath($layout_srl);
@@ -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,9 +591,9 @@ 
 	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');
+		require_once(_XE_PATH_ . 'libs/tar.class.php');
 		$oLayoutModel = getModel('layout');
 
 		// Copy files to temp path
@@ -606,21 +606,21 @@ 
 		$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;
 			$content = FileHandler::readFile($file);
 			$pattern = '/(http:\/\/[^ ]+)?(\.\/)?' . str_replace('/', '\/', (str_replace('./', '', $file_path))) . '/';
-			if(basename($file) == 'faceoff.css' || basename($file) == 'layout.css')
+			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);
 			}
@@ -658,7 +658,7 @@ 
 		$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';
@@ -667,7 +667,7 @@ 
 		header("Content-Type: application/x-compressed");
 		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,20 +689,20 @@ 
 		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');
+		$this->importLayout($layout_srl, $user_layout_path . 'faceoff.tar');
 
 		$this->setRedirectUrl(Context::get('error_return_url'));
 	}
@@ -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());
+			$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,13 +831,13 @@ 
 	{
 		$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);
 		}
 
-		return $randomString.substr($time, -4);
+		return $randomString . substr($time, -4);
 	}
 
 	/**
@@ -857,14 +857,14 @@ 
 		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')
+				FileHandler::copyFile($sourceLayoutPath . $file, $targetLayoutPath . $file);
+				if ($file == 'layout.html' || $file == 'layout.css')
 				{
-					$this->_changeFilepathInSource($targetLayoutPath.$file, $sourceImagePath, $targetImagePath);
+					$this->_changeFilepathInSource($targetLayoutPath . $file, $sourceImagePath, $targetImagePath);
 				}
 			}
 		}
@@ -893,23 +893,23 @@ 
 		$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);
 		}
 
-		require_once(_XE_PATH_.'libs/tar.class.php');
+		require_once(_XE_PATH_ . 'libs/tar.class.php');
 		$image_path = $oLayoutModel->getUserLayoutImagePath($layout_srl);
 		FileHandler::makeDir($image_path);
 		$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);
@@ -924,16 +924,16 @@ 
 		$name = Context::get('name');
 		$img = Context::get('img');
 
-		$this->setTemplatePath($this->module_path.'tpl');
+		$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|swf)$/i', $img['name']))
+		if (!preg_match('/\.(jpg|jpeg|gif|png|swf)$/i', $img['name']))
 		{
 			Context::set('msg', Context::getLang('msg_layout_image_target'));
 			return;
@@ -941,18 +941,18 @@ 
 
 		$path = sprintf('./files/attach/images/%s/', $layoutSrl);
 		$tmpPath = $path . 'tmp/';
-		if(!FileHandler::makeDir($tmpPath))
+		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;
+		$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;
@@ -971,15 +971,15 @@ 
 		$layoutSrl = Context::get('layout_srl');
 		$name = Context::get('name');
 
-		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplatePath($this->module_path . 'tpl');
 		$this->setTemplateFile("after_delete_config_image.html");
 
 		$oModel = getModel('layout');
 		$layoutInfo = $oModel->getLayout($layoutSrl);
 
-		if($layoutInfo->extra_var_count)
+		if ($layoutInfo->extra_var_count)
 		{
-			foreach($layoutInfo->extra_var as $varId => $val)
+			foreach ($layoutInfo->extra_var as $varId => $val)
 			{
 				$newLayoutInfo->{$varId} = $val->value;
 			}
@@ -990,7 +990,7 @@ 
 		$args->layout_srl = $layoutSrl;
 		$args->extra_vars = serialize($newLayoutInfo);
 		$output = $this->updateLayout($args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			Context::set('msg', Context::getLang($output->getMessage()));
 			return $output;

Braces +94 added lines, -42 removed lines

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

modules/layout/layout.admin.model.php

Doc Comments +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 
 	/**
 	 * get layout setting view.
-	 * @return void
+	 * @return string|null
 	 */
 	public function getLayoutAdminSetInfoView()
 	{

Spacing +22 added lines, -22 removed lines

@@ -25,24 +25,24 @@ 
 		Context::set('is_sitemap', '1');
 		$script = '<script src="./modules/layout/tpl/js/layout_modify.js"></script>';
 		$oTemplate = TemplateHandler::getInstance();
-		$html = $oTemplate->compile($this->module_path.'tpl/', 'layout_info_view');
+		$html = $oTemplate->compile($this->module_path . 'tpl/', 'layout_info_view');
 
 		preg_match_all('/<!--#JSPLUGIN:(.*)-->/', $html, $m);
 		$pluginList = $m[1];
 
-		foreach($pluginList as $plugin)
+		foreach ($pluginList as $plugin)
 		{
 			$info = Context::getJavascriptPluginInfo($plugin);
-			if(!$info)
+			if (!$info)
 			{
 				continue;
 			}
 
-			foreach($info->jsList as $js)
+			foreach ($info->jsList as $js)
 			{
 				$script .= sprintf('<script src="%s"></script>', $js);
 			}
-			foreach($info->cssList as $css)
+			foreach ($info->cssList as $css)
 			{
 				$csss .= sprintf('<link rel="stylesheet" href="%s" />', $css);
 			}
@@ -50,7 +50,7 @@ 
 
 		$this->add('html', $csss . $script . $html);
 
-		if($isReturn)
+		if ($isReturn)
 		{
 			return $this->get('html');
 		}
@@ -65,7 +65,7 @@ 
 		$layout_info = $oLayoutModel->getLayout($layout_srl);
 
 		// Error appears if there is no layout information is registered
-		if(!$layout_info)
+		if (!$layout_info)
 		{
 			return $this->stop('msg_invalid_request');
 		}
@@ -82,14 +82,14 @@ 
 		$layout_info = $security->encodeHTML('.', 'author..', 'extra_var..');
 
 		$layout_info->description = nl2br(trim($layout_info->description));
-		if(!is_object($layout_info->extra_var))
+		if (!is_object($layout_info->extra_var))
 		{
 			$layout_info->extra_var = new StdClass();
 		}
 
-		foreach($layout_info->extra_var as $var_name => $val)
+		foreach ($layout_info->extra_var as $var_name => $val)
 		{
-			if(isset($layout_info->{$var_name}->description))
+			if (isset($layout_info->{$var_name}->description))
 			{
 				$layout_info->{$var_name}->description = nl2br(trim($val->description));
 			}
@@ -105,27 +105,27 @@ 
 		$oLayoutModel = getModel('layout');
 		$layout_info = $oLayoutModel->getLayout($layout_srl);
 		// Error appears if there is no layout information is registered
-		if(!$layout_info)
+		if (!$layout_info)
 		{
 			return $this->dispLayoutAdminInstalledList();
 		}
 
 		// Get Layout Code
-		if($oLayoutModel->useDefaultLayout($layout_info->layout_srl))
+		if ($oLayoutModel->useDefaultLayout($layout_info->layout_srl))
 		{
-			$layout_file  = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout);
-			$layout_css_file  = $oLayoutModel->getDefaultLayoutCss($layout_info->layout);
+			$layout_file = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout);
+			$layout_css_file = $oLayoutModel->getDefaultLayoutCss($layout_info->layout);
 		}
 		else
 		{
 			$layout_file = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
 			$layout_css_file = $oLayoutModel->getUserLayoutCss($layout_info->layout_srl);
 
-			if(!file_exists($layout_file)) $layout_file = $layout_info->path . 'layout.html';
-			if(!file_exists($layout_css_file)) $layout_css_file = $layout_info->path . 'layout.css';
+			if (!file_exists($layout_file)) $layout_file = $layout_info->path . 'layout.html';
+			if (!file_exists($layout_css_file)) $layout_css_file = $layout_info->path . 'layout.css';
 		}
 
-		if(file_exists($layout_css_file))
+		if (file_exists($layout_css_file))
 		{
 			$layout_code_css = FileHandler::readFile($layout_css_file);
 			Context::set('layout_code_css', $layout_code_css);
@@ -159,9 +159,9 @@ 
 
 		$script = '<script src="./modules/layout/tpl/js/layout_admin_set_html.js"></script>';
 		$oTemplate = &TemplateHandler::getInstance();
-		$html = $oTemplate->compile($this->module_path.'tpl/', 'layout_html_css_view');
+		$html = $oTemplate->compile($this->module_path . 'tpl/', 'layout_html_css_view');
 
-		$this->add('html', $script.$html);
+		$this->add('html', $script . $html);
 	}
 
 	public function getLayoutAdminSiteDefaultLayout()
@@ -182,9 +182,9 @@ 
 	{
 		$target = ($viewType == 'M') ? 'mlayout_srl' : 'layout_srl';
 		$designInfoFile = sprintf(_XE_PATH_ . 'files/site_design/design_%s.php', $siteSrl);
-		if(FileHandler::exists($designInfoFile)) include($designInfoFile);
+		if (FileHandler::exists($designInfoFile)) include($designInfoFile);
 
-		if(!$designInfo || !$designInfo->{$target})
+		if (!$designInfo || !$designInfo->{$target})
 		{
 			return 0;
 		}
@@ -192,7 +192,7 @@ 
 		$oModel = getModel('layout');
 		$layout_info = $oModel->getLayout($designInfo->{$target});
 
-		if(!$layout_info)
+		if (!$layout_info)
 		{
 			return 0;
 		}

Braces +10 added lines, -5 removed lines

@@ -115,14 +115,17 @@ 
 		{
 			$layout_file  = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout);
 			$layout_css_file  = $oLayoutModel->getDefaultLayoutCss($layout_info->layout);
-		}
-		else
+		} else
 		{
 			$layout_file = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
 			$layout_css_file = $oLayoutModel->getUserLayoutCss($layout_info->layout_srl);
 
-			if(!file_exists($layout_file)) $layout_file = $layout_info->path . 'layout.html';
-			if(!file_exists($layout_css_file)) $layout_css_file = $layout_info->path . 'layout.css';
+			if(!file_exists($layout_file)) {
+				$layout_file = $layout_info->path . 'layout.html';
+			}
+			if(!file_exists($layout_css_file)) {
+				$layout_css_file = $layout_info->path . 'layout.css';
+			}
 		}
 
 		if(file_exists($layout_css_file))
@@ -182,7 +185,9 @@ 
 	{
 		$target = ($viewType == 'M') ? 'mlayout_srl' : 'layout_srl';
 		$designInfoFile = sprintf(_XE_PATH_ . 'files/site_design/design_%s.php', $siteSrl);
-		if(FileHandler::exists($designInfoFile)) include($designInfoFile);
+		if(FileHandler::exists($designInfoFile)) {
+			include($designInfoFile);
+		}
 
 		if(!$designInfo || !$designInfo->{$target})
 		{

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * @class  layoutAdminView
- * @author NAVER (developers@xpressengine.com)
- * admin view class of the layout module
- */
+	 * @class  layoutAdminView
+	 * @author NAVER (developers@xpressengine.com)
+	 * admin view class of the layout module
+	 */
 class layoutAdminView extends layout
 {
 	/**

modules/layout/layout.admin.view.php

Doc Comments +3 added lines, -3 removed lines

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

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * @class  layoutAdminView
- * @author NAVER (developers@xpressengine.com)
- * admin view class of the layout module
- */
+	 * @class  layoutAdminView
+	 * @author NAVER (developers@xpressengine.com)
+	 * admin view class of the layout module
+	 */
 class layoutAdminView extends layout
 {
 	/**

Spacing +48 added lines, -48 removed lines

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

Braces +55 added lines, -21 removed lines

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