xpressengine / xe-core

modules/file/file.view.php

Spacing +3 added lines, -3 removed lines

@@ -26,12 +26,12 @@ 
 		$current_module_srl = Context::get('module_srl');
 		$current_module_srls = Context::get('module_srls');
 
-		if(!$current_module_srl && !$current_module_srls)
+		if (!$current_module_srl && !$current_module_srls)
 		{
 			// Get information of the current module
 			$current_module_info = Context::get('current_module_info');
 			$current_module_srl = $current_module_info->module_srl;
-			if(!$current_module_srl) return new Object();
+			if (!$current_module_srl) return new Object();
 		}
 		// Get file configurations of the module
 		$oFileModel = getModel('file');
@@ -44,7 +44,7 @@ 
 		Context::set('group_list', $group_list);
 		// Set a template file
 		$oTemplate = &TemplateHandler::getInstance();
-		$tpl = $oTemplate->compile($this->module_path.'tpl', 'file_module_config');
+		$tpl = $oTemplate->compile($this->module_path . 'tpl', 'file_module_config');
 		$obj .= $tpl;
 
 		return new Object();

Braces +3 added lines, -1 removed lines

@@ -30,7 +30,9 @@
 		{
 			$current_module_info = Context::get('current_module_info');
 			$current_module_srl = $current_module_info->module_srl;
-			if(!$current_module_srl) return new Object();
+			if(!$current_module_srl) {
+				return new Object();
+			}
 		}
 		// Get the configuration information
 		$oModuleModel = getModel('module');

modules/importer/importer.admin.controller.php

Spacing +227 added lines, -227 removed lines

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

Braces +256 added lines, -111 removed lines

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

Doc Comments +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
 	/**
 	 * RSS Module configurations
 	 *
-	 * @return void
+	 * @return Object|null
 	 */
 	function procRssAdminInsertModuleConfig()
 	{

modules/importer/importer.admin.view.php

Indentation +7 added lines, -7 removed lines

@@ -1,13 +1,13 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * importerAdminView class
- * admin view class of the importer module 
- *
- * @author NAVER (developers@xpressengine.com)
- * @package /modules/importer
- * @version 0.1
- */
+	 * importerAdminView class
+	 * admin view class of the importer module 
+	 *
+	 * @author NAVER (developers@xpressengine.com)
+	 * @package /modules/importer
+	 * @version 0.1
+	 */
 class importerAdminView extends importer
 {
 	/**

Spacing +4 added lines, -4 removed lines

@@ -25,10 +25,10 @@ 
 	 */
 	function dispImporterAdminContent()
 	{
-		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplatePath($this->module_path . 'tpl');
 
 		$source_type = Context::get('source_type');
-		switch($source_type)
+		switch ($source_type)
 		{
 			case 'member' : 
 				$template_filename = "member";
@@ -67,9 +67,9 @@ 
 	 */
 	function dispImporterAdminImportForm()
 	{
-		$oDocumentModel = getModel('document');	//for document lang use in this page
+		$oDocumentModel = getModel('document'); //for document lang use in this page
 
-		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplatePath($this->module_path . 'tpl');
 		$this->setTemplateFile('index');
 	}
 

modules/install/install.model.php

Spacing +23 added lines, -23 removed lines

@@ -6,27 +6,27 @@ 
 
 	function getSFTPList()
 	{
-		$ftp_info =  Context::getRequestVars();
-		if(!$ftp_info->ftp_host)
+		$ftp_info = Context::getRequestVars();
+		if (!$ftp_info->ftp_host)
 		{
 			$ftp_info->ftp_host = "127.0.0.1";
 		}
 
 		$connection = ssh2_connect($ftp_info->ftp_host, $ftp_info->ftp_port);
-		if(!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
+		if (!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
 		{
-			return new Object(-1,'msg_ftp_invalid_auth_info');
+			return new Object(-1, 'msg_ftp_invalid_auth_info');
 		}
 
 		$sftp = ssh2_sftp($connection);
-		$curpwd = "ssh2.sftp://$sftp".$this->pwd;
+		$curpwd = "ssh2.sftp://$sftp" . $this->pwd;
 		$dh = @opendir($curpwd);
-		if(!$dh) return new Object(-1, 'msg_ftp_invalid_path');
+		if (!$dh) return new Object(-1, 'msg_ftp_invalid_path');
 
 		$list = array();
-		while(($file = readdir($dh)) !== false)
+		while (($file = readdir($dh)) !== false)
 		{
-			if(!is_dir($curpwd.$file)) continue;
+			if (!is_dir($curpwd . $file)) continue;
 			$list[] = $file . "/";
 		}
 		closedir($dh);
@@ -35,33 +35,33 @@ 
 
 	function getInstallFTPList()
 	{
-		if(!($ftp_info = Context::getRequestVars()) || !$ftp_info->ftp_user || !$ftp_info->ftp_password) 
+		if (!($ftp_info = Context::getRequestVars()) || !$ftp_info->ftp_user || !$ftp_info->ftp_password) 
 		{
 			return new Object(-1, 'msg_ftp_invalid_auth_info');
 		}
 		$this->pwd = $ftp_info->ftp_root_path;
-		if(!$ftp_info->ftp_host)
+		if (!$ftp_info->ftp_host)
 		{
 			$ftp_info->ftp_host = "127.0.0.1";
 		}
 
-		if($ftp_info->sftp == 'Y')
+		if ($ftp_info->sftp == 'Y')
 		{
 			return $this->getSFTPList();
 		}
 
 		$_list = NULL;
-		if(function_exists('ftp_connect'))
+		if (function_exists('ftp_connect'))
 		{
 			$connection = ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port);
-			if(!$connection) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_info->ftp_host));
-			if(! @ftp_login($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
+			if (!$connection) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_info->ftp_host));
+			if (!@ftp_login($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
 				ftp_close($connection);	
-				return new Object(-1,'msg_ftp_invalid_auth_info');
+				return new Object(-1, 'msg_ftp_invalid_auth_info');
 			}
 
-			if($ftp_info->ftp_pasv != "N") 
+			if ($ftp_info->ftp_pasv != "N") 
 			{
 				ftp_pasv($connection, true);
 			}
@@ -71,11 +71,11 @@ 
 		}
 		else
 		{
-			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))
+			if ($oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
 			{
-				if($oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
+				if ($oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 				{
 					$_list = $oFtp->ftp_rawlist($this->pwd);
 					$oFtp->ftp_quit();
@@ -83,21 +83,21 @@ 
 				else
 				{
 					$oFtp->ftp_quit();
-					return new Object(-1,'msg_ftp_invalid_auth_info');
+					return new Object(-1, 'msg_ftp_invalid_auth_info');
 				}
 			}
 		}
 
 		$list = array();
-		if($_list)
+		if ($_list)
 		{
-			foreach($_list as $k => $v)
+			foreach ($_list as $k => $v)
 			{
 				$src = new stdClass(); 
 				$src->data = $v;
 				$res = Context::convertEncoding($src);
 				$v = $res->data;
-				if(strpos($v,'d') === 0 || strpos($v, '<DIR>')) $list[] = substr(strrchr($v,' '),1) . '/';
+				if (strpos($v, 'd') === 0 || strpos($v, '<DIR>')) $list[] = substr(strrchr($v, ' '), 1) . '/';
 			}
 		}
 		$this->add('list', $list);

Braces +14 added lines, -8 removed lines

@@ -21,12 +21,16 @@ 
 		$sftp = ssh2_sftp($connection);
 		$curpwd = "ssh2.sftp://$sftp".$this->pwd;
 		$dh = @opendir($curpwd);
-		if(!$dh) return new Object(-1, 'msg_ftp_invalid_path');
+		if(!$dh) {
+			return new Object(-1, 'msg_ftp_invalid_path');
+		}
 
 		$list = array();
 		while(($file = readdir($dh)) !== false)
 		{
-			if(!is_dir($curpwd.$file)) continue;
+			if(!is_dir($curpwd.$file)) {
+				continue;
+			}
 			$list[] = $file . "/";
 		}
 		closedir($dh);
@@ -54,7 +58,9 @@ 
 		if(function_exists('ftp_connect'))
 		{
 			$connection = ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port);
-			if(!$connection) return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_info->ftp_host));
+			if(!$connection) {
+				return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_info->ftp_host));
+			}
 			if(! @ftp_login($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
 				ftp_close($connection);	
@@ -68,8 +74,7 @@ 
 
 			$_list = ftp_rawlist($connection, $this->pwd);
 			ftp_close($connection);	
-		}
-		else
+		} else
 		{
 			require_once(_XE_PATH_.'libs/ftp.class.php');
 			$oFtp = new ftp();
@@ -79,8 +84,7 @@ 
 				{
 					$_list = $oFtp->ftp_rawlist($this->pwd);
 					$oFtp->ftp_quit();
-				}
-				else
+				} else
 				{
 					$oFtp->ftp_quit();
 					return new Object(-1,'msg_ftp_invalid_auth_info');
@@ -97,7 +101,9 @@ 
 				$src->data = $v;
 				$res = Context::convertEncoding($src);
 				$v = $res->data;
-				if(strpos($v,'d') === 0 || strpos($v, '<DIR>')) $list[] = substr(strrchr($v,' '),1) . '/';
+				if(strpos($v,'d') === 0 || strpos($v, '<DIR>')) {
+					$list[] = substr(strrchr($v,' '),1) . '/';
+				}
 			}
 		}
 		$this->add('list', $list);

modules/install/install.view.php

Indentation +4 added lines, -4 removed lines

@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 /**
- * @class  installView
- * @author NAVER (developers@xpressengine.com)
- * @brief View class of install module
- */
+	 * @class  installView
+	 * @author NAVER (developers@xpressengine.com)
+	 * @brief View class of install module
+	 */
 class installView extends install
 {
 	var $install_enable = false;

Spacing +26 added lines, -26 removed lines

@@ -17,14 +17,14 @@ 
 		// Set browser title
 		Context::setBrowserTitle(Context::getLang('introduce_title'));
 		// Specify the template path
-		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplatePath($this->module_path . 'tpl');
 		// Error occurs if already installed
-		if(Context::isInstalled()) return $this->stop('msg_already_installed');
+		if (Context::isInstalled()) return $this->stop('msg_already_installed');
 		// Install a controller
 		$oInstallController = getController('install');
 		$this->install_enable = $oInstallController->checkInstallEnv();
 		// If the environment is installable, execute installController::makeDefaultDirectory()
-		if($this->install_enable) $oInstallController->makeDefaultDirectory();
+		if ($this->install_enable) $oInstallController->makeDefaultDirectory();
 	}
 
 	/**
@@ -33,7 +33,7 @@ 
 	function dispInstallIntroduce()
 	{
 		$install_config_file = FileHandler::getRealPath('./config/install.config.php');
-		if(file_exists($install_config_file))
+		if (file_exists($install_config_file))
 		{
 			/**
 			 * If './config/install.config.php' file created  and write array shown in the example below, XE installed using config file.
@@ -57,12 +57,12 @@ 
 			  );
 			 */
 			include $install_config_file;
-			if(is_array($install_config))
+			if (is_array($install_config))
 			{
-				foreach($install_config as $k => $v) 
+				foreach ($install_config as $k => $v) 
 				{
-					$v = ($k == 'db_table_prefix') ? $v.'_' : $v;
-					Context::set($k,$v,true);
+					$v = ($k == 'db_table_prefix') ? $v . '_' : $v;
+					Context::set($k, $v, true);
 				}
 				unset($GLOBALS['__DB__']);
 				Context::set('install_config', true, true);
@@ -101,7 +101,7 @@ 
 		Context::set('use_rewrite', $useRewrite); 
 
 		// nginx 체크, rewrite 사용법 안내
-		if($useRewrite == 'N' && stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false) Context::set('use_nginx', 'Y');
+		if ($useRewrite == 'N' && stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false) Context::set('use_nginx', 'Y');
 		
 		$this->setTemplateFile('check_env');
 	}
@@ -112,9 +112,9 @@ 
 	function dispInstallSelectDB()
 	{
 		// Display check_env if it is not installable
-		if(!$this->install_enable) return $this->dispInstallCheckEnv();
+		if (!$this->install_enable) return $this->dispInstallCheckEnv();
 		// Enter ftp information
-		if(ini_get('safe_mode') && !Context::isFTPRegisted())
+		if (ini_get('safe_mode') && !Context::isFTPRegisted())
 		{
 			Context::set('progressMenu', '3');
 			$this->setTemplateFile('ftp');
@@ -123,11 +123,11 @@ 
 		{
 			$defaultDatabase = 'mysqli';
 			$disableList = DB::getDisableList();
-			if(is_array($disableList))
+			if (is_array($disableList))
 			{
-				foreach($disableList AS $key=>$value)
+				foreach ($disableList AS $key=>$value)
 				{
-					if($value->db_type == $defaultDatabase)
+					if ($value->db_type == $defaultDatabase)
 					{
 						$defaultDatabase = 'mysql';
 						break;
@@ -147,9 +147,9 @@ 
 	function dispInstallDBForm()
 	{
 		// Display check_env if not installable
-		if(!$this->install_enable) return $this->dispInstallCheckEnv();
+		if (!$this->install_enable) return $this->dispInstallCheckEnv();
 		// Return to the start-up screen if db_type is not specified
-		if(!Context::get('db_type')) return $this->dispInstallSelectDB();
+		if (!Context::get('db_type')) return $this->dispInstallSelectDB();
 
 		// Output the file, disp_db_info_form.html
 		$tpl_filename = sprintf('form.%s', Context::get('db_type'));
@@ -158,14 +158,14 @@ 
 		Context::set('title', $title);
 
 		$error_return_url = getNotEncodedUrl('', 'act', Context::get('act'), 'db_type', Context::get('db_type'));
-		if($_SERVER['HTTPS'] == 'on')
+		if ($_SERVER['HTTPS'] == 'on')
 		{
 			// Error occured when using https protocol at "ModuleHandler::init() '
 			$parsedUrl = parse_url($error_return_url);
 			$error_return_url = '';
-			if(isset($parsedUrl['path'])) $error_return_url .= $parsedUrl['path'];
-			if(isset($parsedUrl['query'])) $error_return_url .= '?' . $parsedUrl['query'];
-			if(isset($parsedUrl['fragment'])) $error_return_url .= '?' . $parsedUrl['fragment'];
+			if (isset($parsedUrl['path'])) $error_return_url .= $parsedUrl['path'];
+			if (isset($parsedUrl['query'])) $error_return_url .= '?' . $parsedUrl['query'];
+			if (isset($parsedUrl['fragment'])) $error_return_url .= '?' . $parsedUrl['fragment'];
 		}
 		Context::set('error_return_url', $error_return_url);
 
@@ -178,9 +178,9 @@ 
 	function dispInstallConfigForm()
 	{
 		// Display check_env if not installable
-		if(!$this->install_enable) return $this->dispInstallCheckEnv();
+		if (!$this->install_enable) return $this->dispInstallCheckEnv();
 
-		include _XE_PATH_.'files/config/tmpDB.config.php';
+		include _XE_PATH_ . 'files/config/tmpDB.config.php';
 
 		Context::set('use_rewrite', $_SESSION['use_rewrite']); 
 		Context::set('time_zone', $GLOBALS['time_zone']);
@@ -190,15 +190,15 @@ 
 
 	function useRewriteModule()
 	{
-		if(function_exists('apache_get_modules') && in_array('mod_rewrite',apache_get_modules()))
+		if (function_exists('apache_get_modules') && in_array('mod_rewrite', apache_get_modules()))
 		{
 			return true;
 		}
 
-		require_once(_XE_PATH_.'classes/httprequest/XEHttpRequest.class.php');
+		require_once(_XE_PATH_ . 'classes/httprequest/XEHttpRequest.class.php');
 		$httpRequest = new XEHttpRequest($_SERVER['HTTP_HOST'], $_SERVER['SERVER_PORT']);
 		$xeInstallPath = substr($_SERVER['REQUEST_URI'], 0, strpos($_SERVER['REQUEST_URI'], 'index.php', 1));
-		$output = $httpRequest->send($xeInstallPath.'modules/install/conf/info.xml');
+		$output = $httpRequest->send($xeInstallPath . 'modules/install/conf/info.xml');
 
 		return (strpos($output->body, '<?xml') !== 0);
 	}
@@ -209,7 +209,7 @@ 
 	function dispInstallManagerForm()
 	{
 		// Display check_env if not installable
-		if(!$this->install_enable)
+		if (!$this->install_enable)
 		{
 			return $this->dispInstallCheckEnv();
 		}

Braces +34 added lines, -13 removed lines

@@ -19,12 +19,16 @@ 
 		// Specify the template path
 		$this->setTemplatePath($this->module_path.'tpl');
 		// Error occurs if already installed
-		if(Context::isInstalled()) return $this->stop('msg_already_installed');
+		if(Context::isInstalled()) {
+			return $this->stop('msg_already_installed');
+		}
 		// Install a controller
 		$oInstallController = getController('install');
 		$this->install_enable = $oInstallController->checkInstallEnv();
 		// If the environment is installable, execute installController::makeDefaultDirectory()
-		if($this->install_enable) $oInstallController->makeDefaultDirectory();
+		if($this->install_enable) {
+			$oInstallController->makeDefaultDirectory();
+		}
 	}
 
 	/**
@@ -68,7 +72,9 @@ 
 				Context::set('install_config', true, true);
 				$oInstallController = getController('install');
 				$output = $oInstallController->procInstall();
-				if (!$output->toBool()) return $output;
+				if (!$output->toBool()) {
+					return $output;
+				}
 				header("location: ./");
 				Context::close();
 				exit;
@@ -101,7 +107,9 @@ 
 		Context::set('use_rewrite', $useRewrite); 
 
 		// nginx 체크, rewrite 사용법 안내
-		if($useRewrite == 'N' && stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false) Context::set('use_nginx', 'Y');
+		if($useRewrite == 'N' && stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false) {
+			Context::set('use_nginx', 'Y');
+		}
 		
 		$this->setTemplateFile('check_env');
 	}
@@ -112,14 +120,15 @@ 
 	function dispInstallSelectDB()
 	{
 		// Display check_env if it is not installable
-		if(!$this->install_enable) return $this->dispInstallCheckEnv();
+		if(!$this->install_enable) {
+			return $this->dispInstallCheckEnv();
+		}
 		// Enter ftp information
 		if(ini_get('safe_mode') && !Context::isFTPRegisted())
 		{
 			Context::set('progressMenu', '3');
 			$this->setTemplateFile('ftp');
-		}
-		else
+		} else
 		{
 			$defaultDatabase = 'mysqli';
 			$disableList = DB::getDisableList();
@@ -147,9 +156,13 @@ 
 	function dispInstallDBForm()
 	{
 		// Display check_env if not installable
-		if(!$this->install_enable) return $this->dispInstallCheckEnv();
+		if(!$this->install_enable) {
+			return $this->dispInstallCheckEnv();
+		}
 		// Return to the start-up screen if db_type is not specified
-		if(!Context::get('db_type')) return $this->dispInstallSelectDB();
+		if(!Context::get('db_type')) {
+			return $this->dispInstallSelectDB();
+		}
 
 		// Output the file, disp_db_info_form.html
 		$tpl_filename = sprintf('form.%s', Context::get('db_type'));
@@ -163,9 +176,15 @@ 
 			// Error occured when using https protocol at "ModuleHandler::init() '
 			$parsedUrl = parse_url($error_return_url);
 			$error_return_url = '';
-			if(isset($parsedUrl['path'])) $error_return_url .= $parsedUrl['path'];
-			if(isset($parsedUrl['query'])) $error_return_url .= '?' . $parsedUrl['query'];
-			if(isset($parsedUrl['fragment'])) $error_return_url .= '?' . $parsedUrl['fragment'];
+			if(isset($parsedUrl['path'])) {
+				$error_return_url .= $parsedUrl['path'];
+			}
+			if(isset($parsedUrl['query'])) {
+				$error_return_url .= '?' . $parsedUrl['query'];
+			}
+			if(isset($parsedUrl['fragment'])) {
+				$error_return_url .= '?' . $parsedUrl['fragment'];
+			}
 		}
 		Context::set('error_return_url', $error_return_url);
 
@@ -178,7 +197,9 @@ 
 	function dispInstallConfigForm()
 	{
 		// Display check_env if not installable
-		if(!$this->install_enable) return $this->dispInstallCheckEnv();
+		if(!$this->install_enable) {
+			return $this->dispInstallCheckEnv();
+		}
 
 		include _XE_PATH_.'files/config/tmpDB.config.php';
 

modules/install/script/ko.install.php

Spacing +24 added lines, -24 removed lines

@@ -130,13 +130,13 @@ 
 function __makeMenu(&$list, $parent_srl)
 {
 	$oMenuAdminController = getAdminController('menu');
-	foreach($list as $idx => &$item)
+	foreach ($list as $idx => &$item)
 	{
 		Context::set('parent_srl', $parent_srl, TRUE);
 		Context::set('menu_name', $item['menu_name'], TRUE);
 		Context::set('module_type', $item['module_type'], TRUE);
 		Context::set('module_id', $item['module_id'], TRUE);
-		if($item['is_shortcut'] === 'Y')
+		if ($item['is_shortcut'] === 'Y')
 		{
 			Context::set('is_shortcut', $item['is_shortcut'], TRUE);
 			Context::set('shortcut_target', $item['shortcut_target'], TRUE);
@@ -148,23 +148,23 @@ 
 		}
 
 		$output = $oMenuAdminController->procMenuAdminInsertItem();
-		if($output instanceof Object && !$output->toBool())
+		if ($output instanceof Object && !$output->toBool())
 		{
 			return $output;
 		}
 		$menu_srl = $oMenuAdminController->get('menu_item_srl');
 		$item['menu_srl'] = $menu_srl;
 
-		if($item['list']) __makeMenu($item['list'], $menu_srl);
+		if ($item['list']) __makeMenu($item['list'], $menu_srl);
 	}
 }
 
 
 // 사이트맵 생성
-foreach($sitemap as $id => &$val)
+foreach ($sitemap as $id => &$val)
 {
 	$output = $oMenuAdminController->addMenu($val['title']);
-	if(!$output->toBool())
+	if (!$output->toBool())
 	{
 		return $output;
 	}
@@ -191,12 +191,12 @@ 
 
 $oLayoutAdminController = getAdminController('layout');
 $output = $oLayoutAdminController->insertLayout($args);
-if(!$output->toBool()) return $output;
+if (!$output->toBool()) return $output;
 
 // update Layout (PC)
 $args->extra_vars = serialize($extra_vars);
 $output = $oLayoutAdminController->updateLayout($args);
-if(!$output->toBool()) return $output;
+if (!$output->toBool()) return $output;
 
 //create mobile layout
 $mlayout_srl = $args->layout_srl = getNextSequence();
@@ -206,15 +206,15 @@ 
 $extra_vars->main_menu = $sitemap['GNB']['menu_srl'];
 
 $output = $oLayoutAdminController->insertLayout($args);
-if(!$output->toBool()) return $output;
+if (!$output->toBool()) return $output;
 
 // update mobile Layout
 $args->extra_vars = serialize($extra_vars);
 $output = $oLayoutAdminController->updateLayout($args);
-if(!$output->toBool()) return $output;
+if (!$output->toBool()) return $output;
 
 
-$siteDesignPath = _XE_PATH_.'files/site_design/';
+$siteDesignPath = _XE_PATH_ . 'files/site_design/';
 FileHandler::makeDir($siteDesignPath);
 
 
@@ -224,7 +224,7 @@ 
 
 $moduleList = array('page', 'board', 'editor');
 $moutput = ModuleHandler::triggerCall('menu.getModuleListInSitemap', 'after', $moduleList);
-if($moutput->toBool())
+if ($moutput->toBool())
 {
 	$moduleList = array_unique($moduleList);
 }
@@ -234,10 +234,10 @@ 
 $designInfo->module = new stdClass();
 
 $oModuleModel = getModel('module'); /* @var $oModuleModel moduleModel */
-foreach($skinTypes as $key => $dir)
+foreach ($skinTypes as $key => $dir)
 {
 	$skinType = $key == 'skin' ? 'P' : 'M';
-	foreach($moduleList as $moduleName)
+	foreach ($moduleList as $moduleName)
 	{
 		$designInfo->module->{$moduleName} = new stdClass();
 		$designInfo->module->{$moduleName}->{$key} = $oModuleModel->getModuleDefaultSkin($moduleName, $skinType, 0, false);
@@ -271,26 +271,26 @@ 
 Context::set('version', __XE_VERSION__);
 $obj->title = 'Welcome XE';
 
-$obj->content = $oTemplateHandler->compile(_XE_PATH_ . 'modules/install/script/welcome_content', 'welcome_content_'.$lang);
+$obj->content = $oTemplateHandler->compile(_XE_PATH_ . 'modules/install/script/welcome_content', 'welcome_content_' . $lang);
 
 $output = $oDocumentController->insertDocument($obj, true);
-if(!$output->toBool()) return $output;
+if (!$output->toBool()) return $output;
 
 $document_srl = $output->get('document_srl');
 
 unset($obj->document_srl);
 $obj->title = 'Welcome mobile XE';
 $output = $oDocumentController->insertDocument($obj, true);
-if(!$output->toBool()) return $output;
+if (!$output->toBool()) return $output;
 
 // save PageWidget
 $oModuleController = getController('module'); /* @var $oModuleController moduleController */
 $mdocument_srl = $output->get('document_srl');
 $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-$module_info->content = '<img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="width: 100%; float: left;" body="" document_srl="'.$document_srl.'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0"  />';
-$module_info->mcontent = '<img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="width: 100%; float: left;" body="" document_srl="'.$mdocument_srl.'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0"  />';
+$module_info->content = '<img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="width: 100%; float: left;" body="" document_srl="' . $document_srl . '" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0"  />';
+$module_info->mcontent = '<img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="width: 100%; float: left;" body="" document_srl="' . $mdocument_srl . '" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0"  />';
 $output = $oModuleController->updateModule($module_info);
-if(!$output->toBool()) return $output;
+if (!$output->toBool()) return $output;
 
 // insertFirstModule
 $site_args = new stdClass();
@@ -304,14 +304,14 @@ 
 $xeicon_module_srl = $moduleInfo->module_srl;
 
 $xeicon_document_srl = array();
-for($i = 1; $i <=4; $i++)
+for ($i = 1; $i <= 4; $i++)
 {
 	unset($obj->document_srl);
 	$obj->title = "XEIcon ({$i})";
 	$obj->content = $oTemplateHandler->compile(_XE_PATH_ . 'modules/install/script/xeicon_content', 'xeicon_content_ko_' . $i);
 
 	$output = $oDocumentController->insertDocument($obj, true);
-	if(!$output->toBool()) return $output;
+	if (!$output->toBool()) return $output;
 
 	$xeicon_document_srl[$i] = $output->get('document_srl');
 }
@@ -319,9 +319,9 @@ 
 // save PageWidget
 $oModuleController = getController('module'); /* @var $oModuleController moduleController */
 $module_info = $oModuleModel->getModuleInfoByModuleSrl($xeicon_module_srl);
-$module_info->content = '<div widget="widgetBox" style="float:left;width:100%;" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" css_class="XEicon" ><div><div><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="'.$xeicon_document_srl[1].'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="'.$xeicon_document_srl[2].'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="'.$xeicon_document_srl[3].'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="'.$xeicon_document_srl[4].'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /></div></div></div>';
+$module_info->content = '<div widget="widgetBox" style="float:left;width:100%;" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" css_class="XEicon" ><div><div><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="' . $xeicon_document_srl[1] . '" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="' . $xeicon_document_srl[2] . '" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="' . $xeicon_document_srl[3] . '" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="' . $xeicon_document_srl[4] . '" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /></div></div></div>';
 $output = $oModuleController->updateModule($module_info);
-if(!$output->toBool()) return $output;
+if (!$output->toBool()) return $output;
 
 
 // create menu cache

Braces +31 added lines, -12 removed lines

@@ -140,8 +140,7 @@ 
 		{
 			Context::set('is_shortcut', $item['is_shortcut'], TRUE);
 			Context::set('shortcut_target', $item['shortcut_target'], TRUE);
-		}
-		else
+		} else
 		{
 			Context::set('is_shortcut', 'N', TRUE);
 			Context::set('shortcut_target', null, TRUE);
@@ -155,7 +154,9 @@ 
 		$menu_srl = $oMenuAdminController->get('menu_item_srl');
 		$item['menu_srl'] = $menu_srl;
 
-		if($item['list']) __makeMenu($item['list'], $menu_srl);
+		if($item['list']) {
+			__makeMenu($item['list'], $menu_srl);
+		}
 	}
 }
 
@@ -191,12 +192,16 @@ 
 
 $oLayoutAdminController = getAdminController('layout');
 $output = $oLayoutAdminController->insertLayout($args);
-if(!$output->toBool()) return $output;
+if(!$output->toBool()) {
+	return $output;
+}
 
 // update Layout (PC)
 $args->extra_vars = serialize($extra_vars);
 $output = $oLayoutAdminController->updateLayout($args);
-if(!$output->toBool()) return $output;
+if(!$output->toBool()) {
+	return $output;
+}
 
 //create mobile layout
 $mlayout_srl = $args->layout_srl = getNextSequence();
@@ -206,12 +211,16 @@ 
 $extra_vars->main_menu = $sitemap['GNB']['menu_srl'];
 
 $output = $oLayoutAdminController->insertLayout($args);
-if(!$output->toBool()) return $output;
+if(!$output->toBool()) {
+	return $output;
+}
 
 // update mobile Layout
 $args->extra_vars = serialize($extra_vars);
 $output = $oLayoutAdminController->updateLayout($args);
-if(!$output->toBool()) return $output;
+if(!$output->toBool()) {
+	return $output;
+}
 
 
 $siteDesignPath = _XE_PATH_.'files/site_design/';
@@ -274,14 +283,18 @@ 
 $obj->content = $oTemplateHandler->compile(_XE_PATH_ . 'modules/install/script/welcome_content', 'welcome_content_'.$lang);
 
 $output = $oDocumentController->insertDocument($obj, true);
-if(!$output->toBool()) return $output;
+if(!$output->toBool()) {
+	return $output;
+}
 
 $document_srl = $output->get('document_srl');
 
 unset($obj->document_srl);
 $obj->title = 'Welcome mobile XE';
 $output = $oDocumentController->insertDocument($obj, true);
-if(!$output->toBool()) return $output;
+if(!$output->toBool()) {
+	return $output;
+}
 
 // save PageWidget
 $oModuleController = getController('module'); /* @var $oModuleController moduleController */
@@ -290,7 +303,9 @@ 
 $module_info->content = '<img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="width: 100%; float: left;" body="" document_srl="'.$document_srl.'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0"  />';
 $module_info->mcontent = '<img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="width: 100%; float: left;" body="" document_srl="'.$mdocument_srl.'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0"  />';
 $output = $oModuleController->updateModule($module_info);
-if(!$output->toBool()) return $output;
+if(!$output->toBool()) {
+	return $output;
+}
 
 // insertFirstModule
 $site_args = new stdClass();
@@ -311,7 +326,9 @@ 
 	$obj->content = $oTemplateHandler->compile(_XE_PATH_ . 'modules/install/script/xeicon_content', 'xeicon_content_ko_' . $i);
 
 	$output = $oDocumentController->insertDocument($obj, true);
-	if(!$output->toBool()) return $output;
+	if(!$output->toBool()) {
+		return $output;
+	}
 
 	$xeicon_document_srl[$i] = $output->get('document_srl');
 }
@@ -321,7 +338,9 @@ 
 $module_info = $oModuleModel->getModuleInfoByModuleSrl($xeicon_module_srl);
 $module_info->content = '<div widget="widgetBox" style="float:left;width:100%;" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" css_class="XEicon" ><div><div><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="'.$xeicon_document_srl[1].'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="'.$xeicon_document_srl[2].'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="'.$xeicon_document_srl[3].'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="'.$xeicon_document_srl[4].'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /></div></div></div>';
 $output = $oModuleController->updateModule($module_info);
-if(!$output->toBool()) return $output;
+if(!$output->toBool()) {
+	return $output;
+}
 
 
 // create menu cache

modules/integration_search/integration_search.admin.controller.php

Spacing +15 added lines, -15 removed lines

@@ -31,11 +31,11 @@ 
 		$args->skin = Context::get('skin');
 		$args->target = Context::get('target');
 		$args->target_module_srl = Context::get('target_module_srl');
-		if(!$args->target_module_srl) $args->target_module_srl = '';
+		if (!$args->target_module_srl) $args->target_module_srl = '';
 		$args->skin_vars = $config->skin_vars;
 
 		$oModuleController = getController('module');
-		$output = $oModuleController->insertModuleConfig('integration_search',$args);
+		$output = $oModuleController->insertModuleConfig('integration_search', $args);
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent');
 		return $this->setRedirectUrl($returnUrl, $output);
@@ -63,35 +63,35 @@ 
 		unset($obj->module_srl);
 		unset($obj->page);
 		// Separately handle if the extra_vars is an image type in the original skin_info
-		if($skin_info->extra_vars)
+		if ($skin_info->extra_vars)
 		{
-			foreach($skin_info->extra_vars as $vars)
+			foreach ($skin_info->extra_vars as $vars)
 			{
-				if($vars->type!='image') continue;
+				if ($vars->type != 'image') continue;
 
 				$image_obj = $obj->{$vars->name};
 				// Get a variable on a request to delete
-				$del_var = $obj->{"del_".$vars->name};
-				unset($obj->{"del_".$vars->name});
-				if($del_var == 'Y')
+				$del_var = $obj->{"del_" . $vars->name};
+				unset($obj->{"del_" . $vars->name});
+				if ($del_var == 'Y')
 				{
 					FileHandler::removeFile($module_info->{$vars->name});
 					continue;
 				}
 				// Use the previous data if not uploaded
-				if(!$image_obj['tmp_name'])
+				if (!$image_obj['tmp_name'])
 				{
 					$obj->{$vars->name} = $module_info->{$vars->name};
 					continue;
 				}
 				// Ignore if the file is not successfully uploaded, and check uploaded file
-				if(!is_uploaded_file($image_obj['tmp_name']) || !checkUploadedFile($image_obj['tmp_name']))
+				if (!is_uploaded_file($image_obj['tmp_name']) || !checkUploadedFile($image_obj['tmp_name']))
 				{
 					unset($obj->{$vars->name});
 					continue;
 				}
 				// Ignore if the file is not an image
-				if(!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name']))
+				if (!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name']))
 				{
 					unset($obj->{$vars->name});
 					continue;
@@ -99,11 +99,11 @@ 
 				// Upload the file to a path
 				$path = sprintf("./files/attach/images/%s/", $module_srl);
 				// Create a directory
-				if(!FileHandler::makeDir($path)) return false;
+				if (!FileHandler::makeDir($path)) return false;
 
-				$filename = $path.$image_obj['name'];
+				$filename = $path . $image_obj['name'];
 				// Move the file
-				if(!move_uploaded_file($image_obj['tmp_name'], $filename))
+				if (!move_uploaded_file($image_obj['tmp_name'], $filename))
 				{
 					unset($obj->{$vars->name});
 					continue;
@@ -117,7 +117,7 @@ 
 		$args->skin_vars = serialize($obj);
 
 		$oModuleController = getController('module');
-		$output = $oModuleController->insertModuleConfig('integration_search',$args);
+		$output = $oModuleController->insertModuleConfig('integration_search', $args);
 
 		$this->setMessage('success_updated', 'info');
 

Braces +9 added lines, -3 removed lines

@@ -31,7 +31,9 @@ 
 		$args->skin = Context::get('skin');
 		$args->target = Context::get('target');
 		$args->target_module_srl = Context::get('target_module_srl');
-		if(!$args->target_module_srl) $args->target_module_srl = '';
+		if(!$args->target_module_srl) {
+			$args->target_module_srl = '';
+		}
 		$args->skin_vars = $config->skin_vars;
 
 		$oModuleController = getController('module');
@@ -67,7 +69,9 @@ 
 		{
 			foreach($skin_info->extra_vars as $vars)
 			{
-				if($vars->type!='image') continue;
+				if($vars->type!='image') {
+					continue;
+				}
 
 				$image_obj = $obj->{$vars->name};
 				// Get a variable on a request to delete
@@ -99,7 +103,9 @@ 
 				// Upload the file to a path
 				$path = sprintf("./files/attach/images/%s/", $module_srl);
 				// Create a directory
-				if(!FileHandler::makeDir($path)) return false;
+				if(!FileHandler::makeDir($path)) {
+					return false;
+				}
 
 				$filename = $path.$image_obj['name'];
 				// Move the file

Indentation +4 added lines, -4 removed lines

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

modules/integration_search/integration_search.admin.view.php

Indentation +4 added lines, -4 removed lines

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

Spacing +8 added lines, -8 removed lines

@@ -24,9 +24,9 @@ 
 		// Get configurations (using module model object)
 		$oModuleModel = getModel('module');
 		$this->config = $oModuleModel->getModuleConfig('integration_search');
-		Context::set('config',$this->config);
+		Context::set('config', $this->config);
 
-		$this->setTemplatePath($this->module_path."/tpl/");
+		$this->setTemplatePath($this->module_path . "/tpl/");
 	}
 
 	/**
@@ -39,7 +39,7 @@ 
 		// Get a list of skins(themes)
 		$oModuleModel = getModel('module');
 		$skin_list = $oModuleModel->getSkins($this->module_path);
-		Context::set('skin_list',$skin_list);
+		Context::set('skin_list', $skin_list);
 		// Get a list of module categories
 		$module_categories = $oModuleModel->getModuleCategories();
 		// Generated mid Wanted list
@@ -63,7 +63,7 @@ 
 		$security->encodeHTML('skin_list..title');
 
 		// Sample Code
-		Context::set('sample_code', htmlspecialchars('<form action="{getUrl()}" method="get"><input type="hidden" name="vid" value="{$vid}" /><input type="hidden" name="mid" value="{$mid}" /><input type="hidden" name="act" value="IS" /><input type="text" name="is_keyword"  value="{$is_keyword}" /><input class="btn" type="submit" value="{$lang->cmd_search}" /></form>', ENT_COMPAT | ENT_HTML401, 'UTF-8', false) );
+		Context::set('sample_code', htmlspecialchars('<form action="{getUrl()}" method="get"><input type="hidden" name="vid" value="{$vid}" /><input type="hidden" name="mid" value="{$mid}" /><input type="hidden" name="act" value="IS" /><input type="text" name="is_keyword"  value="{$is_keyword}" /><input class="btn" type="submit" value="{$lang->cmd_search}" /></form>', ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 
 		$this->setTemplateFile("index");
 	}
@@ -79,15 +79,15 @@ 
 		$skin_info = $oModuleModel->loadSkinInfo($this->module_path, $this->config->skin);
 		$skin_vars = unserialize($this->config->skin_vars);
 		// value for skin_info extra_vars
-		if(count($skin_info->extra_vars))
+		if (count($skin_info->extra_vars))
 		{
-			foreach($skin_info->extra_vars as $key => $val)
+			foreach ($skin_info->extra_vars as $key => $val)
 			{
 				$name = $val->name;
 				$type = $val->type;
 				$value = $skin_vars->{$name};
-				if($type=="checkbox"&&!$value) $value = array();
-				$skin_info->extra_vars[$key]->value= $value;
+				if ($type == "checkbox" && !$value) $value = array();
+				$skin_info->extra_vars[$key]->value = $value;
 			}
 		}
 		Context::set('skin_info', $skin_info);

Braces +3 added lines, -1 removed lines

@@ -86,7 +86,9 @@
 				$name = $val->name;
 				$type = $val->type;
 				$value = $skin_vars->{$name};
-				if($type=="checkbox"&&!$value) $value = array();
+				if($type=="checkbox"&&!$value) {
+					$value = array();
+				}
 				$skin_info->extra_vars[$key]->value= $value;
 			}
 		}

modules/integration_search/integration_search.class.php

Spacing +6 added lines, -6 removed lines

@@ -31,13 +31,13 @@ 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('integration_search');
 
-		if($config->skin)
+		if ($config->skin)
 		{
 			$config_parse = explode('.', $config->skin);
-			if(count($config_parse) > 1)
+			if (count($config_parse) > 1)
 			{
 				$template_path = sprintf('./themes/%s/modules/integration_search/', $config_parse[0]);
-				if(is_dir($template_path)) return true;
+				if (is_dir($template_path)) return true;
 			}
 		}
 		return false;
@@ -53,13 +53,13 @@ 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('message');
 
-		if($config->skin)
+		if ($config->skin)
 		{
 			$config_parse = explode('.', $config->skin);
-			if(count($config_parse) > 1)
+			if (count($config_parse) > 1)
 			{
 				$template_path = sprintf('./themes/%s/modules/integration_search/', $config_parse[0]);
-				if(is_dir($template_path))
+				if (is_dir($template_path))
 				{
 					$config->skin = implode('|@|', $config_parse);
 					$oModuleController = getController('module');

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
 {
 	/**

Braces +3 added lines, -1 removed lines

@@ -29,7 +29,9 @@
 			if (count($config_parse) > 1)
 			{
 				$template_path = sprintf('./themes/%s/modules/message/', $config_parse[0]);
-				if(is_dir($template_path)) return true;
+				if(is_dir($template_path)) {
+					return true;
+				}
 			}
 		}
 		return false;