xpressengine / xe-core

modules/rss/rss.admin.controller.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +21 added lines, -21 removed lines

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

Braces +24 added lines, -11 removed lines

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

modules/widget/widget.controller.php

Doc Comments +4 added lines

@@ -697,6 +697,9 @@ 
 		return $GLOBALS['_xe_loaded_widgets_'][$widget];
 	}
 
+	/**
+	 * @param boolean $javascript_mode
+	 */
 	function compileWidgetStyle($widgetStyle,$widget,$widget_content_body, $args, $javascript_mode)
 	{
 		if(!$widgetStyle) return $widget_content_body;
@@ -737,6 +740,7 @@ 
 
 	/**
 	 * @brief request parameters and variables sort through the information widget
+	 * @param BaseObject $request_vars
 	 */
 	function arrangeWidgetVars($widget, $request_vars, &$vars)
 	{

Spacing +131 added lines, -131 removed lines

@@ -34,13 +34,13 @@ 
 		$oModuleModel = getModel('module');
 		$skin_info = $oModuleModel->loadSkinInfo($path, $skin);
 
-		for($i=0;$i<count($skin_info->colorset);$i++)
+		for ($i = 0; $i < count($skin_info->colorset); $i++)
 		{
 			$colorset = sprintf('%s|@|%s', $skin_info->colorset[$i]->name, $skin_info->colorset[$i]->title);
 			$colorset_list[] = $colorset;
 		}
 
-		if(count($colorset_list)) $colorsets = implode("\n", $colorset_list);
+		if (count($colorset_list)) $colorsets = implode("\n", $colorset_list);
 		$this->add('colorset_list', $colorsets);
 	}
 
@@ -50,12 +50,12 @@ 
 	function procWidgetGenerateCode()
 	{
 		$widget = Context::get('selected_widget');
-		if(!$widget) return new BaseObject(-1,'msg_invalid_request');
-		if(!Context::get('skin')) return new BaseObject(-1,Context::getLang('msg_widget_skin_is_null'));
+		if (!$widget) return new BaseObject(-1, 'msg_invalid_request');
+		if (!Context::get('skin')) return new BaseObject(-1, Context::getLang('msg_widget_skin_is_null'));
 
 		$attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars);
 
-		$widget_code = sprintf('<img class="zbxe_widget_output" widget="%s" %s />', $widget, implode(' ',$attribute));
+		$widget_code = sprintf('<img class="zbxe_widget_output" widget="%s" %s />', $widget, implode(' ', $attribute));
 		// Code output
 		$this->add('widget_code', $widget_code);
 	}
@@ -66,9 +66,9 @@ 
 	function procWidgetGenerateCodeInPage()
 	{
 		$widget = Context::get('selected_widget');
-		if(!$widget) return new BaseObject(-1,'msg_invalid_request');
+		if (!$widget) return new BaseObject(-1, 'msg_invalid_request');
 
-		if(!in_array($widget,array('widgetBox','widgetContent')) && !Context::get('skin')) return new BaseObject(-1,Context::getLang('msg_widget_skin_is_null'));
+		if (!in_array($widget, array('widgetBox', 'widgetContent')) && !Context::get('skin')) return new BaseObject(-1, Context::getLang('msg_widget_skin_is_null'));
 
 		$attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars);
 		// Wanted results
@@ -107,26 +107,26 @@ 
 		$err = 0;
 		$oLayoutModel = getModel('layout');
 		$layout_info = $oLayoutModel->getLayout($module_srl);
-		if(!$layout_info || $layout_info->type != 'faceoff') $err++;
+		if (!$layout_info || $layout_info->type != 'faceoff') $err++;
 
 		// Destination Information Wanted page module
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'module');
 		$page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
-		if(!$page_info->module_srl || $page_info->module != 'page') $err++;
+		if (!$page_info->module_srl || $page_info->module != 'page') $err++;
 
-		if($err > 1) return new BaseObject(-1,'msg_invalid_request');
+		if ($err > 1) return new BaseObject(-1, 'msg_invalid_request');
 
 		// Check permissions
 		$logged_info = Context::get('logged_info');
-		if(!$logged_info->member_srl)
+		if (!$logged_info->member_srl)
 		{
-			return new BaseObject(-1,'msg_not_permitted');
+			return new BaseObject(-1, 'msg_not_permitted');
 		}
 		$module_grant = $oModuleModel->getGrant($page_info, $logged_info);
-		if(!$module_grant->manager)
+		if (!$module_grant->manager)
 		{
-			return new BaseObject(-1,'msg_not_permitted');
+			return new BaseObject(-1, 'msg_not_permitted');
 		}
 
 		// Enter post
@@ -139,7 +139,7 @@ 
 		$obj->document_srl = $document_srl;
 
 		$oDocument = $oDocumentModel->getDocument($obj->document_srl);
-		if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
+		if ($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
 		{
 			$output = $oDocumentController->updateDocument($oDocument, $obj);
 		}
@@ -150,7 +150,7 @@ 
 		}
 
 		// Stop when an error occurs
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// Return results
 		$this->add('document_srl', $obj->document_srl);
@@ -169,29 +169,29 @@ 
 		$oDocumentAdminController = getAdminController('document');
 
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists()) return new BaseObject(-1,'msg_invalid_request');
+		if (!$oDocument->isExists()) return new BaseObject(-1, 'msg_invalid_request');
 		$module_srl = $oDocument->get('module_srl');
 
 		// Destination Information Wanted page module
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'module');
 		$page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
-		if(!$page_info->module_srl || $page_info->module != 'page') return new BaseObject(-1,'msg_invalid_request');
+		if (!$page_info->module_srl || $page_info->module != 'page') return new BaseObject(-1, 'msg_invalid_request');
 
 		// Check permissions
 		$logged_info = Context::get('logged_info');
-		if(!$logged_info->member_srl)
+		if (!$logged_info->member_srl)
 		{
-			return new BaseObject(-1,'msg_not_permitted');
+			return new BaseObject(-1, 'msg_not_permitted');
 		}
 		$module_grant = $oModuleModel->getGrant($page_info, $logged_info);
-		if(!$module_grant->manager)
+		if (!$module_grant->manager)
 		{
-			return new BaseObject(-1,'msg_not_permitted');
+			return new BaseObject(-1, 'msg_not_permitted');
 		}
 
-		$output = $oDocumentAdminController->copyDocumentModule(array($oDocument->get('document_srl')), $oDocument->get('module_srl'),0);
-		if(!$output->toBool()) return $output;
+		$output = $oDocumentAdminController->copyDocumentModule(array($oDocument->get('document_srl')), $oDocument->get('module_srl'), 0);
+		if (!$output->toBool()) return $output;
 
 		// Return results
 		$copied_srls = $output->get('copied_srls');
@@ -210,28 +210,28 @@ 
 		$oDocumentController = getController('document');
 
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists()) return new BaseObject();
+		if (!$oDocument->isExists()) return new BaseObject();
 		$module_srl = $oDocument->get('module_srl');
 
 		// Destination Information Wanted page module
 		$oModuleModel = getModel('module');
 		$page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-		if(!$page_info->module_srl || $page_info->module != 'page') return new BaseObject(-1,'msg_invalid_request');
+		if (!$page_info->module_srl || $page_info->module != 'page') return new BaseObject(-1, 'msg_invalid_request');
 
 		// Check permissions
 		$logged_info = Context::get('logged_info');
-		if(!$logged_info->member_srl)
+		if (!$logged_info->member_srl)
 		{
 			return new BaseObject(-1, 'msg_not_permitted');
 		}
 		$module_grant = $oModuleModel->getGrant($page_info, $logged_info);
-		if(!$module_grant->manager)
+		if (!$module_grant->manager)
 		{
 			return new BaseObject(-1, 'msg_not_permitted');
 		}
 
 		$output = $oDocumentController->deleteDocument($oDocument->get('document_srl'));
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 	}
 
 	/**
@@ -248,7 +248,7 @@ 
 	 */
 	function triggerWidgetCompile(&$content)
 	{
-		if(Context::getResponseMethod()!='HTML') return new BaseObject();
+		if (Context::getResponseMethod() != 'HTML') return new BaseObject();
 		$content = $this->transWidgetCode($content, $this->layout_javascript_mode);
 		return new BaseObject();
 	}
@@ -264,9 +264,9 @@ 
 		// Check whether to include information about editing
 		$this->javascript_mode = $javascript_mode;
 		// Widget code box change
-		$content = preg_replace_callback('!<div([^\>]*)widget=([^\>]*?)\><div><div>((<img.*?>)*)!is', array($this,'transWidgetBox'), $content);
+		$content = preg_replace_callback('!<div([^\>]*)widget=([^\>]*?)\><div><div>((<img.*?>)*)!is', array($this, 'transWidgetBox'), $content);
 		// Widget code information byeogyeong
-		$content = preg_replace_callback('!<img([^\>]*)widget=([^\>]*?)\>!is', array($this,'transWidget'), $content);
+		$content = preg_replace_callback('!<img([^\>]*)widget=([^\>]*?)\>!is', array($this, 'transWidget'), $content);
 
 		return $content;
 	}
@@ -281,11 +281,11 @@ 
 		$oXmlParser = new XmlParser();
 		$xml_doc = $oXmlParser->parse(trim($buff));
 
-		if($xml_doc->img) $vars = $xml_doc->img->attrs;
+		if ($xml_doc->img) $vars = $xml_doc->img->attrs;
 		else $vars = $xml_doc->attrs;
 
 		$widget = $vars->widget;
-		if(!$widget) return $matches[0];
+		if (!$widget) return $matches[0];
 		unset($vars->widget);
 
 		return $this->execute($widget, $vars, $this->javascript_mode);
@@ -296,13 +296,13 @@ 
 	 */
 	function transWidgetBox($matches)
 	{
-		$buff = preg_replace('/<div><div>(.*)$/i','</div>',$matches[0]);
+		$buff = preg_replace('/<div><div>(.*)$/i', '</div>', $matches[0]);
 		$oXmlParser = new XmlParser();
 		$xml_doc = $oXmlParser->parse($buff);
 
 		$vars = $xml_doc->div->attrs;
 		$widget = $vars->widget;
-		if(!$widget) return $matches[0];
+		if (!$widget) return $matches[0];
 		unset($vars->widget);
 
 		$vars->widgetbox_content = $matches[3];
@@ -323,28 +323,28 @@ 
 		$oXmlParser = new XmlParser();
 
 		$cnt = count($matches[1]);
-		for($i=0;$i<$cnt;$i++)
+		for ($i = 0; $i < $cnt; $i++)
 		{
 			$buff = $matches[0][$i];
 			$xml_doc = $oXmlParser->parse(trim($buff));
 
 			$args = $xml_doc->img->attrs;
-			if(!$args) continue;
+			if (!$args) continue;
 			// If you are not caching path
 			$widget = $args->widget;
 			$sequence = $args->widget_sequence;
 			$cache = $args->widget_cache;
-			if(!$sequence || !$cache) continue;
+			if (!$sequence || !$cache) continue;
 
-			if(count($args))
+			if (count($args))
 			{
-				foreach($args as $k => $v) $args->{$k} = urldecode($v);
+				foreach ($args as $k => $v) $args->{$k} = urldecode($v);
 			}
 			// If the cache file for each language widget regeneration
-			foreach($lang_list as $lang_type => $val)
+			foreach ($lang_list as $lang_type => $val)
 			{
 				$cache_file = sprintf('%s%d.%s.cache', $this->cache_path, $sequence, $lang_type);
-				if(!file_exists($cache_file)) continue;
+				if (!file_exists($cache_file)) continue;
 				$this->getCache($widget, $args, $lang_type, true);
 			}
 		}
@@ -356,7 +356,7 @@ 
 	function getCache($widget, $args, $lang_type = null, $ignore_cache = false)
 	{
 		// If the specified language specifies the current language
-		if(!$lang_type) $lang_type = Context::getLangType();
+		if (!$lang_type) $lang_type = Context::getLangType();
 		// widget, the cache number and cache values are set
 		$widget_sequence = $args->widget_sequence;
 		$widget_cache = $args->widget_cache;
@@ -364,10 +364,10 @@ 
 		/**
 		 * Even if the cache number and value of the cache and return it to extract data
 		 */
-		if(!$ignore_cache && (!$widget_cache || !$widget_sequence))
+		if (!$ignore_cache && (!$widget_cache || !$widget_sequence))
 		{
 			$oWidget = $this->getWidgetObject($widget);
-			if(!$oWidget || !method_exists($oWidget, 'proc')) return;
+			if (!$oWidget || !method_exists($oWidget, 'proc')) return;
 
 			$widget_content = $oWidget->proc($args);
 			$oModuleController = getController('module');
@@ -376,15 +376,15 @@ 
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('template');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$key = 'widget_cache:' . $widget_sequence;
+			$key = 'widget_cache:'.$widget_sequence;
 
 			$cache_body = $oCacheHandler->get($key);
 			$cache_body = preg_replace('@<\!--#Meta:@', '<!--Meta:', $cache_body);
 		}
 
-		if($cache_body)
+		if ($cache_body)
 		{
 			return $cache_body;
 		}
@@ -397,11 +397,11 @@ 
 			// Wanted cache file
 			$cache_file = sprintf('%s%d.%s.cache', $this->cache_path, $widget_sequence, $lang_type);
 			// If the file exists in the cache, the file validation
-			if(!$ignore_cache && file_exists($cache_file))
+			if (!$ignore_cache && file_exists($cache_file))
 			{
 				$filemtime = filemtime($cache_file);
 				// Should be modified compared to the time of the cache or in the future if creating more than widget.controller.php file a return value of the cache
-				if($filemtime + $widget_cache * 60 > $_SERVER['REQUEST_TIME'] && $filemtime > filemtime(_XE_PATH_.'modules/widget/widget.controller.php'))
+				if ($filemtime + $widget_cache * 60 > $_SERVER['REQUEST_TIME'] && $filemtime > filemtime(_XE_PATH_.'modules/widget/widget.controller.php'))
 				{
 					$cache_body = FileHandler::readFile($cache_file);
 					$cache_body = preg_replace('@<\!--#Meta:@', '<!--Meta:', $cache_body);
@@ -410,18 +410,18 @@ 
 				}
 			}
 			// cache update and cache renewal of the file mtime
-			if(!$oCacheHandler->isSupport())
+			if (!$oCacheHandler->isSupport())
 			{
 			touch($cache_file);
 			}
 
 			$oWidget = $this->getWidgetObject($widget);
-			if(!$oWidget || !method_exists($oWidget,'proc')) return;
+			if (!$oWidget || !method_exists($oWidget, 'proc')) return;
 
 			$widget_content = $oWidget->proc($args);
 			$oModuleController = getController('module');
 			$oModuleController->replaceDefinedLangCode($widget_content);
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$oCacheHandler->put($key, $widget_content, $widget_cache * 60);
 			}
@@ -443,16 +443,16 @@ 
 	function execute($widget, $args, $javascript_mode = false, $escaped = true)
 	{
 		// Save for debug run-time widget
-		if(__DEBUG__==3) $start = getMicroTime();
+		if (__DEBUG__ == 3) $start = getMicroTime();
 		$before = microtime(true);
 		// urldecode the value of args haejum
 		$object_vars = get_object_vars($args);
-		if(count($object_vars))
+		if (count($object_vars))
 		{
-			foreach($object_vars as $key => $val)
+			foreach ($object_vars as $key => $val)
 			{
-				if(in_array($key, array('widgetbox_content','body','class','style','widget_sequence','widget','widget_padding_left','widget_padding_top','widget_padding_bottom','widget_padding_right','widgetstyle','document_srl'))) continue;
-				if($escaped) $args->{$key} = utf8RawUrlDecode($val);
+				if (in_array($key, array('widgetbox_content', 'body', 'class', 'style', 'widget_sequence', 'widget', 'widget_padding_left', 'widget_padding_top', 'widget_padding_bottom', 'widget_padding_right', 'widgetstyle', 'document_srl'))) continue;
+				if ($escaped) $args->{$key} = utf8RawUrlDecode($val);
 			}
 		}
 
@@ -461,14 +461,14 @@ 
 		 * Widgets widgetContent/widgetBox Wanted If you are not content
 		 */
 		$widget_content = '';
-		if($widget != 'widgetContent' && $widget != 'widgetBox')
+		if ($widget != 'widgetContent' && $widget != 'widgetBox')
 		{
-			if(!is_dir(sprintf(_XE_PATH_.'widgets/%s/',$widget))) return;
+			if (!is_dir(sprintf(_XE_PATH_.'widgets/%s/', $widget))) return;
 			// Hold the contents of the widget parameter
 			$widget_content = $this->getCache($widget, $args);
 		}
 
-		if($widget == 'widgetBox')
+		if ($widget == 'widgetBox')
 		{
 			$widgetbox_content = $args->widgetbox_content;
 		}
@@ -477,7 +477,7 @@ 
 		 * Wanted specified by the administrator of the widget style
 		 */
 		// Sometimes the wrong code, background-image: url (none) can be heard but none in this case, the request for the url so unconditionally Removed
-		$style = preg_replace('/url\((.+)(\/?)none\)/is','', $args->style);
+		$style = preg_replace('/url\((.+)(\/?)none\)/is', '', $args->style);
 		// Find a style statement that based on the internal margin dropping pre-change
 		$widget_padding_left = $args->widget_padding_left;
 		$widget_padding_right = $args->widget_padding_right;
@@ -493,18 +493,18 @@ 
 		$widget_content_body = '';
 		$widget_content_footer = '';
 		// If general call is given on page styles should return immediately dreamin '
-		if(!$javascript_mode)
+		if (!$javascript_mode)
 		{
-			if($args->id) $args->id = ' id="'.$args->id.'" ';
-			switch($widget)
+			if ($args->id) $args->id = ' id="'.$args->id.'" ';
+			switch ($widget)
 			{
 				// If a direct orthogonal addition information
 				case 'widgetContent' :
-					if($args->document_srl)
+					if ($args->document_srl)
 					{
 						$oDocumentModel = getModel('document');
 						$oDocument = $oDocumentModel->getDocument($args->document_srl);
-						$body = $oDocument->getContent(false,false,false, false);
+						$body = $oDocument->getContent(false, false, false, false);
 					}
 					else
 					{
@@ -514,21 +514,21 @@ 
 					$oEditorController = getController('editor');
 					$body = $oEditorController->transComponent($body);
 
-					$widget_content_header = sprintf('<div class="xe_content xe-widget-wrapper ' . $args->css_class . '" %sstyle="%s"><div style="%s">', $args->id, $style,  $inner_style);
+					$widget_content_header = sprintf('<div class="xe_content xe-widget-wrapper '.$args->css_class.'" %sstyle="%s"><div style="%s">', $args->id, $style, $inner_style);
 					$widget_content_body = $body;
 					$widget_content_footer = '</div></div>';
 
 					break;
 					// If the widget box; it could
 				case 'widgetBox' :
-					$widget_content_header = sprintf('<div class="xe-widget-wrapper ' . $args->css_class . '" %sstyle="%s;"><div style="%s"><div>', $args->id, $style,  $inner_style);
+					$widget_content_header = sprintf('<div class="xe-widget-wrapper '.$args->css_class.'" %sstyle="%s;"><div style="%s"><div>', $args->id, $style, $inner_style);
 					$widget_content_body = $widgetbox_content;
 
 					break;
 					// If the General wijetil
 				default :
-					$widget_content_header = sprintf('<div class="xe-widget-wrapper ' . $args->css_class . '" %sstyle="%s">',$args->id,$style);
-					$widget_content_body = sprintf('<div style="*zoom:1;%s">%s</div>', $inner_style,$widget_content);
+					$widget_content_header = sprintf('<div class="xe-widget-wrapper '.$args->css_class.'" %sstyle="%s">', $args->id, $style);
+					$widget_content_body = sprintf('<div style="*zoom:1;%s">%s</div>', $inner_style, $widget_content);
 					$widget_content_footer = '</div>';
 					break;
 			}
@@ -536,15 +536,15 @@ 
 		}
 		else
 		{
-			switch($widget)
+			switch ($widget)
 			{
 				// If a direct orthogonal addition information
 				case 'widgetContent' :
-					if($args->document_srl)
+					if ($args->document_srl)
 					{
 						$oDocumentModel = getModel('document');
 						$oDocument = $oDocumentModel->getDocument($args->document_srl);
-						$body = $oDocument->getContent(false,false,false);
+						$body = $oDocument->getContent(false, false, false);
 					}
 					else
 					{
@@ -552,12 +552,12 @@ 
 					}
 					// by args
 					$attribute = array();
-					if($args)
+					if ($args)
 					{
-						foreach($args as $key => $val)
+						foreach ($args as $key => $val)
 						{
-							if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget','widgetstyle','document_srl'))) continue;
-							if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val);
+							if (in_array($key, array('class', 'style', 'widget_padding_top', 'widget_padding_right', 'widget_padding_bottom', 'widget_padding_left', 'widget', 'widgetstyle', 'document_srl'))) continue;
+							if (strpos($val, '|@|') > 0) $val = str_replace('|@|', ',', $val);
 							$attribute[] = sprintf('%s="%s"', $key, htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 						}
 					}
@@ -565,44 +565,44 @@ 
 					$oWidgetController = getController('widget');
 
 					$widget_content_header = sprintf(
-						'<div class="xe_content widgetOutput ' . $args->css_class . '" widgetstyle="%s" style="%s" widget_padding_left="%s" widget_padding_right="%s" widget_padding_top="%s" widget_padding_bottom="%s" widget="widgetContent" document_srl="%d" %s>'.
+						'<div class="xe_content widgetOutput '.$args->css_class.'" widgetstyle="%s" style="%s" widget_padding_left="%s" widget_padding_right="%s" widget_padding_top="%s" widget_padding_bottom="%s" widget="widgetContent" document_srl="%d" %s>'.
 						'<div class="widgetResize"></div>'.
 						'<div class="widgetResizeLeft"></div>'.
 						'<div class="widgetBorder">'.
-						'<div style="%s">',$args->widgetstyle,
+						'<div style="%s">', $args->widgetstyle,
 						$style,
 						$args->widget_padding_left, $args->widget_padding_right, $args->widget_padding_top, $args->widget_padding_bottom,
 						$args->document_srl,
-						implode(' ',$attribute),
+						implode(' ', $attribute),
 						$inner_style);
 
 					$widget_content_body = $body;
 					$widget_content_footer = sprintf('</div>'.
 						'</div>'.
 						'<div class="widgetContent" style="display:none;width:1px;height:1px;overflow:hidden;">%s</div>'.
-						'</div>',base64_encode($body));
+						'</div>', base64_encode($body));
 
 					break;
 					// If the widget box; it could
 				case 'widgetBox' :
 					// by args
 					$attribute = array();
-					if($args)
+					if ($args)
 					{
-						foreach($args as $key => $val)
+						foreach ($args as $key => $val)
 						{
-							if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget','widgetstyle','document_srl'))) continue;
-							if(!is_numeric($val) && (!is_string($val) || strlen($val)==0)) continue;
-							if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val);
+							if (in_array($key, array('class', 'style', 'widget_padding_top', 'widget_padding_right', 'widget_padding_bottom', 'widget_padding_left', 'widget', 'widgetstyle', 'document_srl'))) continue;
+							if (!is_numeric($val) && (!is_string($val) || strlen($val) == 0)) continue;
+							if (strpos($val, '|@|') > 0) $val = str_replace('|@|', ',', $val);
 							$attribute[] = sprintf('%s="%s"', $key, htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 						}
 					}
 
 					$widget_content_header = sprintf(
-						'<div class="widgetOutput ' . $args->css_class . '" widgetstyle="%s" widget="widgetBox" style="%s;" widget_padding_top="%s" widget_padding_right="%s" widget_padding_bottom="%s" widget_padding_left="%s" %s >'.
+						'<div class="widgetOutput '.$args->css_class.'" widgetstyle="%s" widget="widgetBox" style="%s;" widget_padding_top="%s" widget_padding_right="%s" widget_padding_bottom="%s" widget_padding_left="%s" %s >'.
 						'<div class="widgetBoxResize"></div>'.
 						'<div class="widgetBoxResizeLeft"></div>'.
-						'<div class="widgetBoxBorder"><div class="nullWidget" style="%s">',$args->widgetstyle,$style, $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left,implode(' ',$attribute),$inner_style);
+						'<div class="widgetBoxBorder"><div class="nullWidget" style="%s">', $args->widgetstyle, $style, $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left, implode(' ', $attribute), $inner_style);
 
 					$widget_content_body = $widgetbox_content;
 
@@ -611,26 +611,26 @@ 
 				default :
 					// by args
 					$attribute = array();
-					if($args)
+					if ($args)
 					{
-						$allowed_key = array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget');
-						foreach($args as $key => $val)
+						$allowed_key = array('class', 'style', 'widget_padding_top', 'widget_padding_right', 'widget_padding_bottom', 'widget_padding_left', 'widget');
+						foreach ($args as $key => $val)
 						{
-							if(in_array($key, $allowed_key)) continue;
-							if(!is_numeric($val) && (!is_string($val) || strlen($val)==0)) continue;
-							if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val);
+							if (in_array($key, $allowed_key)) continue;
+							if (!is_numeric($val) && (!is_string($val) || strlen($val) == 0)) continue;
+							if (strpos($val, '|@|') > 0) $val = str_replace('|@|', ',', $val);
 							$attribute[] = sprintf('%s="%s"', $key, htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 						}
 					}
 
-					$widget_content_header = sprintf('<div class="widgetOutput ' . $args->css_class . '" widgetstyle="%s" style="%s" widget_padding_top="%s" widget_padding_right="%s" widget_padding_bottom="%s" widget_padding_left="%s" widget="%s" %s >'.
+					$widget_content_header = sprintf('<div class="widgetOutput '.$args->css_class.'" widgetstyle="%s" style="%s" widget_padding_top="%s" widget_padding_right="%s" widget_padding_bottom="%s" widget_padding_left="%s" widget="%s" %s >'.
 						'<div class="widgetResize"></div>'.
 						'<div class="widgetResizeLeft"></div>'.
-						'<div class="widgetBorder">',$args->widgetstyle,$style,
+						'<div class="widgetBorder">', $args->widgetstyle, $style,
 						$widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left,
-						$widget, implode(' ',$attribute));
+						$widget, implode(' ', $attribute));
 
-					$widget_content_body = sprintf('<div style="%s">%s</div>',$inner_style, $widget_content);
+					$widget_content_body = sprintf('<div style="%s">%s</div>', $inner_style, $widget_content);
 
 					$widget_content_footer = '</div></div>';
 
@@ -638,11 +638,11 @@ 
 			}
 		}
 		// Compile the widget style.
-		if($args->widgetstyle) $widget_content_body = $this->compileWidgetStyle($args->widgetstyle,$widget, $widget_content_body, $args, $javascript_mode);
+		if ($args->widgetstyle) $widget_content_body = $this->compileWidgetStyle($args->widgetstyle, $widget, $widget_content_body, $args, $javascript_mode);
 
-		$output = $widget_content_header . $widget_content_body . $widget_content_footer;
+		$output = $widget_content_header.$widget_content_body.$widget_content_footer;
 		// Debug widget creation time information added to the results
-		if(__DEBUG__==3) $GLOBALS['__widget_excute_elapsed__'] += getMicroTime() - $start;
+		if (__DEBUG__ == 3) $GLOBALS['__widget_excute_elapsed__'] += getMicroTime() - $start;
 
 		$after = microtime(true);
 
@@ -663,32 +663,32 @@ 
 	 */
 	function getWidgetObject($widget)
 	{
-		if(!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $widget))
+		if (!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $widget))
 		{
 			return Context::getLang('msg_invalid_request');
 		}
 
-		if(!$GLOBALS['_xe_loaded_widgets_'][$widget])
+		if (!$GLOBALS['_xe_loaded_widgets_'][$widget])
 		{
 			// Finding the location of a widget
 			$oWidgetModel = getModel('widget');
 			$path = $oWidgetModel->getWidgetPath($widget);
 			// If you do not find the class file error output widget (html output)
 			$class_file = sprintf('%s%s.class.php', $path, $widget);
-			if(!file_exists($class_file)) return sprintf(Context::getLang('msg_widget_is_not_exists'), $widget);
+			if (!file_exists($class_file)) return sprintf(Context::getLang('msg_widget_is_not_exists'), $widget);
 			// Widget classes include
 			require_once($class_file);
 
 			// Creating Objects
-			if(!class_exists($widget, false))
+			if (!class_exists($widget, false))
 			{
 				return sprintf(Context::getLang('msg_widget_object_is_null'), $widget);
 			}
 
 			$oWidget = new $widget();
-			if(!is_object($oWidget)) return sprintf(Context::getLang('msg_widget_object_is_null'), $widget);
+			if (!is_object($oWidget)) return sprintf(Context::getLang('msg_widget_object_is_null'), $widget);
 
-			if(!method_exists($oWidget, 'proc')) return sprintf(Context::getLang('msg_widget_proc_is_null'), $widget);
+			if (!method_exists($oWidget, 'proc')) return sprintf(Context::getLang('msg_widget_proc_is_null'), $widget);
 
 			$oWidget->widget_path = $path;
 
@@ -697,29 +697,29 @@ 
 		return $GLOBALS['_xe_loaded_widgets_'][$widget];
 	}
 
-	function compileWidgetStyle($widgetStyle,$widget,$widget_content_body, $args, $javascript_mode)
+	function compileWidgetStyle($widgetStyle, $widget, $widget_content_body, $args, $javascript_mode)
 	{
-		if(!$widgetStyle) return $widget_content_body;
+		if (!$widgetStyle) return $widget_content_body;
 
 		$oWidgetModel = getModel('widget');
 		// Bring extra_var widget style tie
 		$widgetstyle_info = $oWidgetModel->getWidgetStyleInfo($widgetStyle);
-		if(!$widgetstyle_info) return $widget_content_body;
+		if (!$widgetstyle_info) return $widget_content_body;
 
 		$widgetstyle_extra_var = new stdClass();
 		$widgetstyle_extra_var_key = get_object_vars($widgetstyle_info);
-		if(count($widgetstyle_extra_var_key['extra_var']))
+		if (count($widgetstyle_extra_var_key['extra_var']))
 		{
-			foreach($widgetstyle_extra_var_key['extra_var'] as $key => $val)
+			foreach ($widgetstyle_extra_var_key['extra_var'] as $key => $val)
 			{
-				$widgetstyle_extra_var->{$key} =  $args->{$key};
+				$widgetstyle_extra_var->{$key} = $args->{$key};
 			}
 		}
 		Context::set('widgetstyle_extra_var', $widgetstyle_extra_var);
 		// #18994272 오타를 수정했으나 하위 호환성을 위해 남겨둠 - deprecated
 		Context::set('widgetstyle_extar_var', $widgetstyle_extra_var);
 
-		if($javascript_mode && $widget=='widgetBox')
+		if ($javascript_mode && $widget == 'widgetBox')
 		{
 			Context::set('widget_content', '<div class="widget_inner">'.$widget_content_body.'</div>');
 		}
@@ -743,7 +743,7 @@ 
 		$oWidgetModel = getModel('widget');
 		$widget_info = $oWidgetModel->getWidgetInfo($widget);
 
-		if(!$vars)
+		if (!$vars)
 		{
 			$vars = new stdClass();
 		}
@@ -754,31 +754,31 @@ 
 
 		$vars->skin = trim($request_vars->skin);
 		$vars->colorset = trim($request_vars->colorset);
-		$vars->widget_sequence = (int)($request_vars->widget_sequence);
-		$vars->widget_cache = (int)($request_vars->widget_cache);
+		$vars->widget_sequence = (int) ($request_vars->widget_sequence);
+		$vars->widget_cache = (int) ($request_vars->widget_cache);
 		$vars->style = trim($request_vars->style);
 		$vars->widget_padding_left = trim($request_vars->widget_padding_left);
 		$vars->widget_padding_right = trim($request_vars->widget_padding_right);
 		$vars->widget_padding_top = trim($request_vars->widget_padding_top);
 		$vars->widget_padding_bottom = trim($request_vars->widget_padding_bottom);
-		$vars->document_srl= trim($request_vars->document_srl);
+		$vars->document_srl = trim($request_vars->document_srl);
 
-		if(count($widget_info->extra_var))
+		if (count($widget_info->extra_var))
 		{
-			foreach($widget_info->extra_var as $key=>$val)
+			foreach ($widget_info->extra_var as $key=>$val)
 			{
 				$vars->{$key} = trim($request_vars->{$key});
 			}
 		}
 		// If the widget style
-		if($request_vars->widgetstyle)
+		if ($request_vars->widgetstyle)
 		{
 			$widgetStyle_info = $oWidgetModel->getWidgetStyleInfo($request_vars->widgetstyle);
-			if(count($widgetStyle_info->extra_var))
+			if (count($widgetStyle_info->extra_var))
 			{
-				foreach($widgetStyle_info->extra_var as $key=>$val)
+				foreach ($widgetStyle_info->extra_var as $key=>$val)
 				{
-					if($val->type =='color' || $val->type =='text' || $val->type =='select' || $val->type =='filebox' || $val->type == 'textarea')
+					if ($val->type == 'color' || $val->type == 'text' || $val->type == 'select' || $val->type == 'filebox' || $val->type == 'textarea')
 					{
 						$vars->{$key} = trim($request_vars->{$key});
 					}
@@ -786,23 +786,23 @@ 
 			}
 		}
 
-		if($vars->widget_sequence)
+		if ($vars->widget_sequence)
 		{
 			$cache_file = sprintf('%s%d.%s.cache', $this->cache_path, $vars->widget_sequence, Context::getLangType());
 			FileHandler::removeFile($cache_file);
 		}
 
-		if($vars->widget_cache>0) $vars->widget_sequence = getNextSequence();
+		if ($vars->widget_cache > 0) $vars->widget_sequence = getNextSequence();
 
 		$attribute = array();
-		foreach($vars as $key => $val)
+		foreach ($vars as $key => $val)
 		{
-			if(!$val)
+			if (!$val)
 			{
 				unset($vars->{$key});
 				continue;
 			}
-			if(strpos($val,'|@|') > 0) $val = str_replace('|@|', ',', $val);
+			if (strpos($val, '|@|') > 0) $val = str_replace('|@|', ',', $val);
 			$vars->{$key} = Context::convertEncodingStr($val);
 			$attribute[] = sprintf('%s="%s"', $key, htmlspecialchars(Context::convertEncodingStr($val), ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 		}

Braces +153 added lines, -63 removed lines

@@ -40,7 +40,9 @@ 
 			$colorset_list[] = $colorset;
 		}
 
-		if(count($colorset_list)) $colorsets = implode("\n", $colorset_list);
+		if(count($colorset_list)) {
+			$colorsets = implode("\n", $colorset_list);
+		}
 		$this->add('colorset_list', $colorsets);
 	}
 
@@ -50,8 +52,12 @@ 
 	function procWidgetGenerateCode()
 	{
 		$widget = Context::get('selected_widget');
-		if(!$widget) return new BaseObject(-1,'msg_invalid_request');
-		if(!Context::get('skin')) return new BaseObject(-1,Context::getLang('msg_widget_skin_is_null'));
+		if(!$widget) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
+		if(!Context::get('skin')) {
+			return new BaseObject(-1,Context::getLang('msg_widget_skin_is_null'));
+		}
 
 		$attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars);
 
@@ -66,9 +72,13 @@ 
 	function procWidgetGenerateCodeInPage()
 	{
 		$widget = Context::get('selected_widget');
-		if(!$widget) return new BaseObject(-1,'msg_invalid_request');
+		if(!$widget) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
-		if(!in_array($widget,array('widgetBox','widgetContent')) && !Context::get('skin')) return new BaseObject(-1,Context::getLang('msg_widget_skin_is_null'));
+		if(!in_array($widget,array('widgetBox','widgetContent')) && !Context::get('skin')) {
+			return new BaseObject(-1,Context::getLang('msg_widget_skin_is_null'));
+		}
 
 		$attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars);
 		// Wanted results
@@ -107,15 +117,21 @@ 
 		$err = 0;
 		$oLayoutModel = getModel('layout');
 		$layout_info = $oLayoutModel->getLayout($module_srl);
-		if(!$layout_info || $layout_info->type != 'faceoff') $err++;
+		if(!$layout_info || $layout_info->type != 'faceoff') {
+			$err++;
+		}
 
 		// Destination Information Wanted page module
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'module');
 		$page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
-		if(!$page_info->module_srl || $page_info->module != 'page') $err++;
+		if(!$page_info->module_srl || $page_info->module != 'page') {
+			$err++;
+		}
 
-		if($err > 1) return new BaseObject(-1,'msg_invalid_request');
+		if($err > 1) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		// Check permissions
 		$logged_info = Context::get('logged_info');
@@ -142,15 +158,16 @@ 
 		if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
 		{
 			$output = $oDocumentController->updateDocument($oDocument, $obj);
-		}
-		else
+		} else
 		{
 			$output = $oDocumentController->insertDocument($obj);
 			$obj->document_srl = $output->get('document_srl');
 		}
 
 		// Stop when an error occurs
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// Return results
 		$this->add('document_srl', $obj->document_srl);
@@ -169,14 +186,18 @@ 
 		$oDocumentAdminController = getAdminController('document');
 
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists()) return new BaseObject(-1,'msg_invalid_request');
+		if(!$oDocument->isExists()) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 		$module_srl = $oDocument->get('module_srl');
 
 		// Destination Information Wanted page module
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'module');
 		$page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
-		if(!$page_info->module_srl || $page_info->module != 'page') return new BaseObject(-1,'msg_invalid_request');
+		if(!$page_info->module_srl || $page_info->module != 'page') {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		// Check permissions
 		$logged_info = Context::get('logged_info');
@@ -191,7 +212,9 @@ 
 		}
 
 		$output = $oDocumentAdminController->copyDocumentModule(array($oDocument->get('document_srl')), $oDocument->get('module_srl'),0);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// Return results
 		$copied_srls = $output->get('copied_srls');
@@ -210,13 +233,17 @@ 
 		$oDocumentController = getController('document');
 
 		$oDocument = $oDocumentModel->getDocument($document_srl);
-		if(!$oDocument->isExists()) return new BaseObject();
+		if(!$oDocument->isExists()) {
+			return new BaseObject();
+		}
 		$module_srl = $oDocument->get('module_srl');
 
 		// Destination Information Wanted page module
 		$oModuleModel = getModel('module');
 		$page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-		if(!$page_info->module_srl || $page_info->module != 'page') return new BaseObject(-1,'msg_invalid_request');
+		if(!$page_info->module_srl || $page_info->module != 'page') {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		// Check permissions
 		$logged_info = Context::get('logged_info');
@@ -231,7 +258,9 @@ 
 		}
 
 		$output = $oDocumentController->deleteDocument($oDocument->get('document_srl'));
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 	}
 
 	/**
@@ -248,7 +277,9 @@ 
 	 */
 	function triggerWidgetCompile(&$content)
 	{
-		if(Context::getResponseMethod()!='HTML') return new BaseObject();
+		if(Context::getResponseMethod()!='HTML') {
+			return new BaseObject();
+		}
 		$content = $this->transWidgetCode($content, $this->layout_javascript_mode);
 		return new BaseObject();
 	}
@@ -281,11 +312,16 @@ 
 		$oXmlParser = new XmlParser();
 		$xml_doc = $oXmlParser->parse(trim($buff));
 
-		if($xml_doc->img) $vars = $xml_doc->img->attrs;
-		else $vars = $xml_doc->attrs;
+		if($xml_doc->img) {
+			$vars = $xml_doc->img->attrs;
+		} else {
+			$vars = $xml_doc->attrs;
+		}
 
 		$widget = $vars->widget;
-		if(!$widget) return $matches[0];
+		if(!$widget) {
+			return $matches[0];
+		}
 		unset($vars->widget);
 
 		return $this->execute($widget, $vars, $this->javascript_mode);
@@ -302,7 +338,9 @@ 
 
 		$vars = $xml_doc->div->attrs;
 		$widget = $vars->widget;
-		if(!$widget) return $matches[0];
+		if(!$widget) {
+			return $matches[0];
+		}
 		unset($vars->widget);
 
 		$vars->widgetbox_content = $matches[3];
@@ -329,22 +367,30 @@ 
 			$xml_doc = $oXmlParser->parse(trim($buff));
 
 			$args = $xml_doc->img->attrs;
-			if(!$args) continue;
+			if(!$args) {
+				continue;
+			}
 			// If you are not caching path
 			$widget = $args->widget;
 			$sequence = $args->widget_sequence;
 			$cache = $args->widget_cache;
-			if(!$sequence || !$cache) continue;
+			if(!$sequence || !$cache) {
+				continue;
+			}
 
 			if(count($args))
 			{
-				foreach($args as $k => $v) $args->{$k} = urldecode($v);
+				foreach($args as $k => $v) {
+					$args->{$k} = urldecode($v);
+				}
 			}
 			// If the cache file for each language widget regeneration
 			foreach($lang_list as $lang_type => $val)
 			{
 				$cache_file = sprintf('%s%d.%s.cache', $this->cache_path, $sequence, $lang_type);
-				if(!file_exists($cache_file)) continue;
+				if(!file_exists($cache_file)) {
+					continue;
+				}
 				$this->getCache($widget, $args, $lang_type, true);
 			}
 		}
@@ -356,7 +402,9 @@ 
 	function getCache($widget, $args, $lang_type = null, $ignore_cache = false)
 	{
 		// If the specified language specifies the current language
-		if(!$lang_type) $lang_type = Context::getLangType();
+		if(!$lang_type) {
+			$lang_type = Context::getLangType();
+		}
 		// widget, the cache number and cache values are set
 		$widget_sequence = $args->widget_sequence;
 		$widget_cache = $args->widget_cache;
@@ -367,7 +415,9 @@ 
 		if(!$ignore_cache && (!$widget_cache || !$widget_sequence))
 		{
 			$oWidget = $this->getWidgetObject($widget);
-			if(!$oWidget || !method_exists($oWidget, 'proc')) return;
+			if(!$oWidget || !method_exists($oWidget, 'proc')) {
+				return;
+			}
 
 			$widget_content = $oWidget->proc($args);
 			$oModuleController = getController('module');
@@ -387,8 +437,7 @@ 
 		if($cache_body)
 		{
 			return $cache_body;
-		}
-		else
+		} else
 		{
 			/**
 			 * Cache number and cache values are set so that the cache file should call
@@ -416,7 +465,9 @@ 
 			}
 
 			$oWidget = $this->getWidgetObject($widget);
-			if(!$oWidget || !method_exists($oWidget,'proc')) return;
+			if(!$oWidget || !method_exists($oWidget,'proc')) {
+				return;
+			}
 
 			$widget_content = $oWidget->proc($args);
 			$oModuleController = getController('module');
@@ -424,8 +475,7 @@ 
 			if($oCacheHandler->isSupport())
 			{
 				$oCacheHandler->put($key, $widget_content, $widget_cache * 60);
-			}
-			else
+			} else
 			{
 				FileHandler::writeFile($cache_file, $widget_content);
 			}
@@ -443,7 +493,9 @@ 
 	function execute($widget, $args, $javascript_mode = false, $escaped = true)
 	{
 		// Save for debug run-time widget
-		if(__DEBUG__==3) $start = getMicroTime();
+		if(__DEBUG__==3) {
+			$start = getMicroTime();
+		}
 		$before = microtime(true);
 		// urldecode the value of args haejum
 		$object_vars = get_object_vars($args);
@@ -451,8 +503,12 @@ 
 		{
 			foreach($object_vars as $key => $val)
 			{
-				if(in_array($key, array('widgetbox_content','body','class','style','widget_sequence','widget','widget_padding_left','widget_padding_top','widget_padding_bottom','widget_padding_right','widgetstyle','document_srl'))) continue;
-				if($escaped) $args->{$key} = utf8RawUrlDecode($val);
+				if(in_array($key, array('widgetbox_content','body','class','style','widget_sequence','widget','widget_padding_left','widget_padding_top','widget_padding_bottom','widget_padding_right','widgetstyle','document_srl'))) {
+					continue;
+				}
+				if($escaped) {
+					$args->{$key} = utf8RawUrlDecode($val);
+				}
 			}
 		}
 
@@ -463,7 +519,9 @@ 
 		$widget_content = '';
 		if($widget != 'widgetContent' && $widget != 'widgetBox')
 		{
-			if(!is_dir(sprintf(_XE_PATH_.'widgets/%s/',$widget))) return;
+			if(!is_dir(sprintf(_XE_PATH_.'widgets/%s/',$widget))) {
+				return;
+			}
 			// Hold the contents of the widget parameter
 			$widget_content = $this->getCache($widget, $args);
 		}
@@ -495,7 +553,9 @@ 
 		// If general call is given on page styles should return immediately dreamin '
 		if(!$javascript_mode)
 		{
-			if($args->id) $args->id = ' id="'.$args->id.'" ';
+			if($args->id) {
+				$args->id = ' id="'.$args->id.'" ';
+			}
 			switch($widget)
 			{
 				// If a direct orthogonal addition information
@@ -505,8 +565,7 @@ 
 						$oDocumentModel = getModel('document');
 						$oDocument = $oDocumentModel->getDocument($args->document_srl);
 						$body = $oDocument->getContent(false,false,false, false);
-					}
-					else
+					} else
 					{
 						$body = base64_decode($args->body);
 					}
@@ -533,8 +592,7 @@ 
 					break;
 			}
 			// Edit page is called when a widget if you add the code for handling
-		}
-		else
+		} else
 		{
 			switch($widget)
 			{
@@ -545,8 +603,7 @@ 
 						$oDocumentModel = getModel('document');
 						$oDocument = $oDocumentModel->getDocument($args->document_srl);
 						$body = $oDocument->getContent(false,false,false);
-					}
-					else
+					} else
 					{
 						$body = base64_decode($args->body);
 					}
@@ -556,8 +613,12 @@ 
 					{
 						foreach($args as $key => $val)
 						{
-							if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget','widgetstyle','document_srl'))) continue;
-							if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val);
+							if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget','widgetstyle','document_srl'))) {
+								continue;
+							}
+							if(strpos($val,'|@|')>0) {
+								$val = str_replace('|@|',',',$val);
+							}
 							$attribute[] = sprintf('%s="%s"', $key, htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 						}
 					}
@@ -591,9 +652,15 @@ 
 					{
 						foreach($args as $key => $val)
 						{
-							if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget','widgetstyle','document_srl'))) continue;
-							if(!is_numeric($val) && (!is_string($val) || strlen($val)==0)) continue;
-							if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val);
+							if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget','widgetstyle','document_srl'))) {
+								continue;
+							}
+							if(!is_numeric($val) && (!is_string($val) || strlen($val)==0)) {
+								continue;
+							}
+							if(strpos($val,'|@|')>0) {
+								$val = str_replace('|@|',',',$val);
+							}
 							$attribute[] = sprintf('%s="%s"', $key, htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 						}
 					}
@@ -616,9 +683,15 @@ 
 						$allowed_key = array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget');
 						foreach($args as $key => $val)
 						{
-							if(in_array($key, $allowed_key)) continue;
-							if(!is_numeric($val) && (!is_string($val) || strlen($val)==0)) continue;
-							if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val);
+							if(in_array($key, $allowed_key)) {
+								continue;
+							}
+							if(!is_numeric($val) && (!is_string($val) || strlen($val)==0)) {
+								continue;
+							}
+							if(strpos($val,'|@|')>0) {
+								$val = str_replace('|@|',',',$val);
+							}
 							$attribute[] = sprintf('%s="%s"', $key, htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 						}
 					}
@@ -638,11 +711,15 @@ 
 			}
 		}
 		// Compile the widget style.
-		if($args->widgetstyle) $widget_content_body = $this->compileWidgetStyle($args->widgetstyle,$widget, $widget_content_body, $args, $javascript_mode);
+		if($args->widgetstyle) {
+			$widget_content_body = $this->compileWidgetStyle($args->widgetstyle,$widget, $widget_content_body, $args, $javascript_mode);
+		}
 
 		$output = $widget_content_header . $widget_content_body . $widget_content_footer;
 		// Debug widget creation time information added to the results
-		if(__DEBUG__==3) $GLOBALS['__widget_excute_elapsed__'] += getMicroTime() - $start;
+		if(__DEBUG__==3) {
+			$GLOBALS['__widget_excute_elapsed__'] += getMicroTime() - $start;
+		}
 
 		$after = microtime(true);
 
@@ -675,7 +752,9 @@ 
 			$path = $oWidgetModel->getWidgetPath($widget);
 			// If you do not find the class file error output widget (html output)
 			$class_file = sprintf('%s%s.class.php', $path, $widget);
-			if(!file_exists($class_file)) return sprintf(Context::getLang('msg_widget_is_not_exists'), $widget);
+			if(!file_exists($class_file)) {
+				return sprintf(Context::getLang('msg_widget_is_not_exists'), $widget);
+			}
 			// Widget classes include
 			require_once($class_file);
 
@@ -686,9 +765,13 @@ 
 			}
 
 			$oWidget = new $widget();
-			if(!is_object($oWidget)) return sprintf(Context::getLang('msg_widget_object_is_null'), $widget);
+			if(!is_object($oWidget)) {
+				return sprintf(Context::getLang('msg_widget_object_is_null'), $widget);
+			}
 
-			if(!method_exists($oWidget, 'proc')) return sprintf(Context::getLang('msg_widget_proc_is_null'), $widget);
+			if(!method_exists($oWidget, 'proc')) {
+				return sprintf(Context::getLang('msg_widget_proc_is_null'), $widget);
+			}
 
 			$oWidget->widget_path = $path;
 
@@ -699,12 +782,16 @@ 
 
 	function compileWidgetStyle($widgetStyle,$widget,$widget_content_body, $args, $javascript_mode)
 	{
-		if(!$widgetStyle) return $widget_content_body;
+		if(!$widgetStyle) {
+			return $widget_content_body;
+		}
 
 		$oWidgetModel = getModel('widget');
 		// Bring extra_var widget style tie
 		$widgetstyle_info = $oWidgetModel->getWidgetStyleInfo($widgetStyle);
-		if(!$widgetstyle_info) return $widget_content_body;
+		if(!$widgetstyle_info) {
+			return $widget_content_body;
+		}
 
 		$widgetstyle_extra_var = new stdClass();
 		$widgetstyle_extra_var_key = get_object_vars($widgetstyle_info);
@@ -722,8 +809,7 @@ 
 		if($javascript_mode && $widget=='widgetBox')
 		{
 			Context::set('widget_content', '<div class="widget_inner">'.$widget_content_body.'</div>');
-		}
-		else
+		} else
 		{
 			Context::set('widget_content', $widget_content_body);
 		}
@@ -792,7 +878,9 @@ 
 			FileHandler::removeFile($cache_file);
 		}
 
-		if($vars->widget_cache>0) $vars->widget_sequence = getNextSequence();
+		if($vars->widget_cache>0) {
+			$vars->widget_sequence = getNextSequence();
+		}
 
 		$attribute = array();
 		foreach($vars as $key => $val)
@@ -802,7 +890,9 @@ 
 				unset($vars->{$key});
 				continue;
 			}
-			if(strpos($val,'|@|') > 0) $val = str_replace('|@|', ',', $val);
+			if(strpos($val,'|@|') > 0) {
+				$val = str_replace('|@|', ',', $val);
+			}
 			$vars->{$key} = Context::convertEncodingStr($val);
 			$attribute[] = sprintf('%s="%s"', $key, htmlspecialchars(Context::convertEncodingStr($val), ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 		}

modules/integration_search/integration_search.view.php

Spacing +14 added lines, -14 removed lines

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

Braces +26 added lines, -16 removed lines

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

modules/integration_search/integration_search.model.php

Spacing +33 added lines, -33 removed lines

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

Braces +67 added lines, -29 removed lines

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

modules/autoinstall/autoinstall.lib.php

Braces +6 added lines, -12 removed lines

@@ -121,8 +121,7 @@ 
 			$this->download_file = $this->temp_dir . "xe.tar";
 			$this->target_path = "";
 			$this->download_path = $this->temp_dir;
-		}
-		else
+		} else
 		{
 			$subpath = trim(substr($this->package->path, 2), '/');
 			$this->download_file = $this->temp_dir . $subpath . ".tar";
@@ -297,8 +296,7 @@ 
 				{
 					return $output;
 				}
-			}
-			else
+			} else
 			{
 				$output = $this->_removeFile($file_path);
 				if(!$output->toBool())
@@ -370,8 +368,7 @@ 
 		if($this->ftp_info->ftp_host)
 		{
 			$ftp_host = $this->ftp_info->ftp_host;
-		}
-		else
+		} else
 		{
 			$ftp_host = "127.0.0.1";
 		}
@@ -523,8 +520,7 @@ 
 		if($this->ftp_info->ftp_host)
 		{
 			$ftp_host = $this->ftp_info->ftp_host;
-		}
-		else
+		} else
 		{
 			$ftp_host = "127.0.0.1";
 		}
@@ -673,8 +669,7 @@ 
 								{
 									return new BaseObject(-1, "msg_permission_adjust_failed");
 								}
-							}
-							else
+							} else
 							{
 								if(!ftp_site($this->connection, "CHMOD 755 " . $ftp_path))
 								{
@@ -736,8 +731,7 @@ 
 		if($this->ftp_info->ftp_host)
 		{
 			$ftp_host = $this->ftp_info->ftp_host;
-		}
-		else
+		} else
 		{
 			$ftp_host = "127.0.0.1";
 		}

Spacing +122 added lines, -122 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-require_once(_XE_PATH_ . 'libs/ftp.class.php');
+require_once(_XE_PATH_.'libs/ftp.class.php');
 
 /**
  * Module installer
@@ -78,17 +78,17 @@ 
 	{
 		$oModel = getModel('autoinstall');
 		$type = $oModel->getTypeFromPath($this->package->path);
-		if($type == "module")
+		if ($type == "module")
 		{
 			$output = $this->uninstallModule();
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return $output;
 			}
 		}
 
 		$output = $this->_connect();
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -116,19 +116,19 @@ 
 	 */
 	function _download()
 	{
-		if($this->package->path == ".")
+		if ($this->package->path == ".")
 		{
-			$this->download_file = $this->temp_dir . "xe.tar";
+			$this->download_file = $this->temp_dir."xe.tar";
 			$this->target_path = "";
 			$this->download_path = $this->temp_dir;
 		}
 		else
 		{
 			$subpath = trim(substr($this->package->path, 2), '/');
-			$this->download_file = $this->temp_dir . $subpath . ".tar";
+			$this->download_file = $this->temp_dir.$subpath.".tar";
 			$subpatharr = explode("/", $subpath);
 			array_pop($subpatharr);
-			$this->download_path = $this->temp_dir . implode("/", $subpatharr);
+			$this->download_path = $this->temp_dir.implode("/", $subpatharr);
 			$this->target_path = implode("/", $subpatharr);
 		}
 
@@ -152,17 +152,17 @@ 
 		$path_array = explode("/", $this->package->path);
 		$target_name = array_pop($path_array);
 		$oModule = getModule($target_name, "class");
-		if(!$oModule)
+		if (!$oModule)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
-		if(!method_exists($oModule, "moduleUninstall"))
+		if (!method_exists($oModule, "moduleUninstall"))
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
 		$output = $oModule->moduleUninstall();
-		if(is_subclass_of($output, 'BaseObject') && !$output->toBool())
+		if (is_subclass_of($output, 'BaseObject') && !$output->toBool())
 		{
 			return $output;
 		}
@@ -170,9 +170,9 @@ 
 		$schema_dir = sprintf('%s/schemas/', $this->package->path);
 		$schema_files = FileHandler::readDir($schema_dir);
 		$oDB = DB::getInstance();
-		if(is_array($schema_files))
+		if (is_array($schema_files))
 		{
-			foreach($schema_files as $file)
+			foreach ($schema_files as $file)
 			{
 				$filename_arr = explode(".", $file);
 				$filename = array_shift($filename_arr);
@@ -192,26 +192,26 @@ 
 	function installModule()
 	{
 		$path = $this->package->path;
-		if($path != ".")
+		if ($path != ".")
 		{
 			$path_array = explode("/", $path);
 			$target_name = array_pop($path_array);
 			$type = substr(array_pop($path_array), 0, -1);
 		}
 
-		if($type == "module")
+		if ($type == "module")
 		{
 			$oModuleModel = getModel('module');
 			$oInstallController = getController('install');
 			$module_path = ModuleHandler::getModulePath($target_name);
-			if($oModuleModel->checkNeedInstall($target_name))
+			if ($oModuleModel->checkNeedInstall($target_name))
 			{
 				$oInstallController->installModule($target_name, $module_path);
 			}
-			if($oModuleModel->checkNeedUpdate($target_name))
+			if ($oModuleModel->checkNeedUpdate($target_name))
 			{
 				$oModule = getModule($target_name, 'class');
-				if(method_exists($oModule, 'moduleUpdate'))
+				if (method_exists($oModule, 'moduleUpdate'))
 				{
 					$oModule->moduleUpdate();
 				}
@@ -231,7 +231,7 @@ 
 		$this->_download();
 		$file_list = $this->_unPack();
 		$output = $this->_copyDir($file_list);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			FileHandler::removeDir($this->temp_dir);
 			return $output;
@@ -249,18 +249,18 @@ 
 	 */
 	function _unPack()
 	{
-		require_once(_XE_PATH_ . 'libs/tar.class.php');
+		require_once(_XE_PATH_.'libs/tar.class.php');
 
 		$oTar = new tar();
 		$oTar->openTAR($this->download_file);
 
 		$_files = $oTar->files;
 		$file_list = array();
-		if(is_array($_files))
+		if (is_array($_files))
 		{
-			foreach($_files as $key => $info)
+			foreach ($_files as $key => $info)
 			{
-				FileHandler::writeFile($this->download_path . "/" . $info['name'], $info['file']);
+				FileHandler::writeFile($this->download_path."/".$info['name'], $info['file']);
 				$file_list[] = $info['name'];
 			}
 		}
@@ -278,22 +278,22 @@ 
 		$real_path = FileHandler::getRealPath($path);
 		$oDir = dir($path);
 		$files = array();
-		while($file = $oDir->read())
+		while ($file = $oDir->read())
 		{
-			if($file == "." || $file == "..")
+			if ($file == "." || $file == "..")
 			{
 				continue;
 			}
 			$files[] = $file;
 		}
 
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
-			$file_path = $path . "/" . $file;
-			if(is_dir(FileHandler::getRealPath($file_path)))
+			$file_path = $path."/".$file;
+			if (is_dir(FileHandler::getRealPath($file_path)))
 			{
 				$output = $this->_removeDir($file_path);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					return $output;
 				}
@@ -301,7 +301,7 @@ 
 			else
 			{
 				$output = $this->_removeFile($file_path);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					return $output;
 				}
@@ -357,17 +357,17 @@ 
 	 */
 	function _connect()
 	{
-		if(!function_exists('ssh2_connect'))
+		if (!function_exists('ssh2_connect'))
 		{
 			return new BaseObject(-1, 'msg_sftp_not_supported');
 		}
 
-		if(!$this->ftp_info->ftp_user || !$this->ftp_info->sftp || $this->ftp_info->sftp != 'Y')
+		if (!$this->ftp_info->ftp_user || !$this->ftp_info->sftp || $this->ftp_info->sftp != 'Y')
 		{
 			return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 		}
 
-		if($this->ftp_info->ftp_host)
+		if ($this->ftp_info->ftp_host)
 		{
 			$ftp_host = $this->ftp_info->ftp_host;
 		}
@@ -376,7 +376,7 @@ 
 			$ftp_host = "127.0.0.1";
 		}
 		$this->connection = ssh2_connect($ftp_host, $this->ftp_info->ftp_port);
-		if(!@ssh2_auth_password($this->connection, $this->ftp_info->ftp_user, $this->ftp_password))
+		if (!@ssh2_auth_password($this->connection, $this->ftp_info->ftp_user, $this->ftp_password))
 		{
 			return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 		}
@@ -403,13 +403,13 @@ 
 	 */
 	function _removeFile($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
-		$target_path = $this->ftp_info->ftp_root_path . $path;
+		$target_path = $this->ftp_info->ftp_root_path.$path;
 
-		if(!@ssh2_sftp_unlink($this->sftp, $target_path))
+		if (!@ssh2_sftp_unlink($this->sftp, $target_path))
 		{
 			return new BaseObject(-1, sprintf(Context::getLang('msg_delete_file_failed'), $path));
 		}
@@ -424,13 +424,13 @@ 
 	 */
 	function _removeDir_real($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
-		$target_path = $this->ftp_info->ftp_root_path . $path;
+		$target_path = $this->ftp_info->ftp_root_path.$path;
 
-		if(!@ssh2_sftp_rmdir($this->sftp, $target_path))
+		if (!@ssh2_sftp_rmdir($this->sftp, $target_path))
 		{
 			return new BaseObject(-1, sprintf(Context::getLang('msg_delete_dir_failed'), $path));
 		}
@@ -445,37 +445,37 @@ 
 	 */
 	function _copyDir(&$file_list)
 	{
-		if(!$this->ftp_password)
+		if (!$this->ftp_password)
 		{
 			return new BaseObject(-1, 'msg_ftp_password_input');
 		}
 
 		$output = $this->_connect();
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
-		$target_dir = $this->ftp_info->ftp_root_path . $this->target_path;
+		$target_dir = $this->ftp_info->ftp_root_path.$this->target_path;
 		$copied = array();
 
-		if(is_array($file_list))
+		if (is_array($file_list))
 		{
-			foreach($file_list as $k => $file)
+			foreach ($file_list as $k => $file)
 			{
 				$org_file = $file;
-				if($this->package->path == ".")
+				if ($this->package->path == ".")
 				{
 					$file = substr($file, 3);
 				}
-				$path = FileHandler::getRealPath("./" . $this->target_path . "/" . $file);
-				$pathname = dirname($target_dir . "/" . $file);
+				$path = FileHandler::getRealPath("./".$this->target_path."/".$file);
+				$pathname = dirname($target_dir."/".$file);
 
-				if(!file_exists(FileHandler::getRealPath($real_path)))
+				if (!file_exists(FileHandler::getRealPath($real_path)))
 				{
 					ssh2_sftp_mkdir($this->sftp, $pathname, 0755, TRUE);
 				}
 
-				ssh2_scp_send($this->connection, FileHandler::getRealPath($this->download_path . "/" . $org_file), $target_dir . "/" . $file);
+				ssh2_scp_send($this->connection, FileHandler::getRealPath($this->download_path."/".$org_file), $target_dir."/".$file);
 				$copied[] = $path;
 			}
 		}
@@ -526,7 +526,7 @@ 
 	 */
 	function _connect()
 	{
-		if($this->ftp_info->ftp_host)
+		if ($this->ftp_info->ftp_host)
 		{
 			$ftp_host = $this->ftp_info->ftp_host;
 		}
@@ -536,20 +536,20 @@ 
 		}
 
 		$this->connection = ftp_connect($ftp_host, $this->ftp_info->ftp_port);
-		if(!$this->connection)
+		if (!$this->connection)
 		{
 			return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
 		}
 
 		$login_result = @ftp_login($this->connection, $this->ftp_info->ftp_user, $this->ftp_password);
-		if(!$login_result)
+		if (!$login_result)
 		{
 			$this->_close();
 			return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 		}
 
 		$_SESSION['ftp_password'] = $this->ftp_password;
-		if($this->ftp_info->ftp_pasv != "N")
+		if ($this->ftp_info->ftp_pasv != "N")
 		{
 			ftp_pasv($this->connection, TRUE);
 		}
@@ -564,15 +564,15 @@ 
 	 */
 	function _removeFile($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
-		$target_path = $this->ftp_info->ftp_root_path . $path;
+		$target_path = $this->ftp_info->ftp_root_path.$path;
 
-		if(!@ftp_delete($this->connection, $target_path))
+		if (!@ftp_delete($this->connection, $target_path))
 		{
-			return new BaseObject(-1, "failed to delete file " . $path);
+			return new BaseObject(-1, "failed to delete file ".$path);
 		}
 		return new BaseObject();
 	}
@@ -585,15 +585,15 @@ 
 	 */
 	function _removeDir_real($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
-		$target_path = $this->ftp_info->ftp_root_path . $path;
+		$target_path = $this->ftp_info->ftp_root_path.$path;
 
-		if(!@ftp_rmdir($this->connection, $target_path))
+		if (!@ftp_rmdir($this->connection, $target_path))
 		{
-			return new BaseObject(-1, "failed to delete directory " . $path);
+			return new BaseObject(-1, "failed to delete directory ".$path);
 		}
 		return new BaseObject();
 	}
@@ -616,74 +616,74 @@ 
 	 */
 	function _copyDir(&$file_list)
 	{
-		if(!$this->ftp_password)
+		if (!$this->ftp_password)
 		{
 			return new BaseObject(-1, 'msg_ftp_password_input');
 		}
 
 		$output = $this->_connect();
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
-		if(!$this->target_path)
+		if (!$this->target_path)
 		{
 			$this->target_path = '.';
 		}
-		if(substr($this->download_path, -1) == '/')
+		if (substr($this->download_path, -1) == '/')
 		{
 			$this->download_path = substr($this->download_path, 0, -1);
 		}
-		$target_dir = $this->ftp_info->ftp_root_path . $this->target_path;
+		$target_dir = $this->ftp_info->ftp_root_path.$this->target_path;
 		$copied = array();
 
-		if(is_array($file_list))
+		if (is_array($file_list))
 		{
-			foreach($file_list as $k => $file)
+			foreach ($file_list as $k => $file)
 			{
-				if(!$file)
+				if (!$file)
 				{
 					continue;
 				}
 				$org_file = $file;
-				if($this->package->path == ".")
+				if ($this->package->path == ".")
 				{
 					$file = substr($file, 3);
 				}
-				$path = FileHandler::getRealPath("./" . $this->target_path . "/" . $file);
-				$path_list = explode('/', dirname($this->target_path . "/" . $file));
+				$path = FileHandler::getRealPath("./".$this->target_path."/".$file);
+				$path_list = explode('/', dirname($this->target_path."/".$file));
 
 				$real_path = "./";
 				$ftp_path = $this->ftp_info->ftp_root_path;
 
-				for($i = 0; $i < count($path_list); $i++)
+				for ($i = 0; $i < count($path_list); $i++)
 				{
-					if($path_list == "")
+					if ($path_list == "")
 					{
 						continue;
 					}
-					$real_path .= $path_list[$i] . "/";
-					$ftp_path .= $path_list[$i] . "/";
-					if(!file_exists(FileHandler::getRealPath($real_path)))
+					$real_path .= $path_list[$i]."/";
+					$ftp_path .= $path_list[$i]."/";
+					if (!file_exists(FileHandler::getRealPath($real_path)))
 					{
-						if(!@ftp_mkdir($this->connection, $ftp_path))
+						if (!@ftp_mkdir($this->connection, $ftp_path))
 						{
 							return new BaseObject(-1, "msg_make_directory_failed");
 						}
 
-						if(strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')
+						if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')
 						{
-							if(function_exists('ftp_chmod'))
+							if (function_exists('ftp_chmod'))
 							{
-								if(!ftp_chmod($this->connection, 0755, $ftp_path))
+								if (!ftp_chmod($this->connection, 0755, $ftp_path))
 								{
 									return new BaseObject(-1, "msg_permission_adjust_failed");
 								}
 							}
 							else
 							{
-								if(!ftp_site($this->connection, "CHMOD 755 " . $ftp_path))
+								if (!ftp_site($this->connection, "CHMOD 755 ".$ftp_path))
 								{
 									return new BaseObject(-1, "msg_permission_adjust_failed");
 								}
@@ -691,7 +691,7 @@ 
 						}
 					}
 				}
-				if(!ftp_put($this->connection, $target_dir . '/' . $file, FileHandler::getRealPath($this->download_path . "/" . $org_file), FTP_BINARY))
+				if (!ftp_put($this->connection, $target_dir.'/'.$file, FileHandler::getRealPath($this->download_path."/".$org_file), FTP_BINARY))
 				{
 					return new BaseObject(-1, "msg_ftp_upload_failed");
 				}
@@ -745,7 +745,7 @@ 
 	 */
 	function _connect()
 	{
-		if($this->ftp_info->ftp_host)
+		if ($this->ftp_info->ftp_host)
 		{
 			$ftp_host = $this->ftp_info->ftp_host;
 		}
@@ -755,11 +755,11 @@ 
 		}
 
 		$this->oFtp = new ftp();
-		if(!$this->oFtp->ftp_connect($ftp_host, $this->ftp_info->ftp_port))
+		if (!$this->oFtp->ftp_connect($ftp_host, $this->ftp_info->ftp_port))
 		{
 			return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
 		}
-		if(!$this->oFtp->ftp_login($this->ftp_info->ftp_user, $this->ftp_password))
+		if (!$this->oFtp->ftp_login($this->ftp_info->ftp_user, $this->ftp_password))
 		{
 			$this->_close();
 			return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
@@ -776,13 +776,13 @@ 
 	 */
 	function _removeFile($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
-		$target_path = $this->ftp_info->ftp_root_path . $path;
+		$target_path = $this->ftp_info->ftp_root_path.$path;
 
-		if(!$this->oFtp->ftp_delete($target_path))
+		if (!$this->oFtp->ftp_delete($target_path))
 		{
 			return new BaseObject(-1, sprintf(Context::getLang('msg_delete_file_failed'), $path));
 		}
@@ -796,13 +796,13 @@ 
 	 */
 	function _removeDir_real($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
-		$target_path = $this->ftp_info->ftp_root_path . $path;
+		$target_path = $this->ftp_info->ftp_root_path.$path;
 
-		if(!$this->oFtp->ftp_rmdir($target_path))
+		if (!$this->oFtp->ftp_rmdir($target_path))
 		{
 			return new BaseObject(-1, sprintf(Context::getLang('msg_delete_dir_failed'), $path));
 		}
@@ -827,52 +827,52 @@ 
 	 */
 	function _copyDir(&$file_list)
 	{
-		if(!$this->ftp_password)
+		if (!$this->ftp_password)
 		{
 			return new BaseObject(-1, 'msg_ftp_password_input');
 		}
 
 		$output = $this->_connect();
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
 		$oFtp = &$this->oFtp;
-		$target_dir = $this->ftp_info->ftp_root_path . $this->target_path;
+		$target_dir = $this->ftp_info->ftp_root_path.$this->target_path;
 
 		$copied = array();
 
-		if(is_array($file_list))
+		if (is_array($file_list))
 		{
-			foreach($file_list as $k => $file)
+			foreach ($file_list as $k => $file)
 			{
 				$org_file = $file;
-				if($this->package->path == ".")
+				if ($this->package->path == ".")
 				{
 					$file = substr($file, 3);
 				}
-				$path = FileHandler::getRealPath("./" . $this->target_path . "/" . $file);
-				$path_list = explode('/', dirname($this->target_path . "/" . $file));
+				$path = FileHandler::getRealPath("./".$this->target_path."/".$file);
+				$path_list = explode('/', dirname($this->target_path."/".$file));
 
 				$real_path = "./";
 				$ftp_path = $this->ftp_info->ftp_root_path;
 
-				for($i = 0; $i < count($path_list); $i++)
+				for ($i = 0; $i < count($path_list); $i++)
 				{
-					if($path_list == "")
+					if ($path_list == "")
 					{
 						continue;
 					}
-					$real_path .= $path_list[$i] . "/";
-					$ftp_path .= $path_list[$i] . "/";
-					if(!file_exists(FileHandler::getRealPath($real_path)))
+					$real_path .= $path_list[$i]."/";
+					$ftp_path .= $path_list[$i]."/";
+					if (!file_exists(FileHandler::getRealPath($real_path)))
 					{
 						$oFtp->ftp_mkdir($ftp_path);
-						$oFtp->ftp_site("CHMOD 755 " . $ftp_path);
+						$oFtp->ftp_site("CHMOD 755 ".$ftp_path);
 					}
 				}
-				$oFtp->ftp_put($target_dir . '/' . $file, FileHandler::getRealPath($this->download_path . "/" . $org_file));
+				$oFtp->ftp_put($target_dir.'/'.$file, FileHandler::getRealPath($this->download_path."/".$org_file));
 				$copied[] = $path;
 			}
 		}
@@ -921,13 +921,13 @@ 
 	 */
 	function _removeFile($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
 		$target_path = FileHandler::getRealPath($path);
 
-		if(!FileHandler::removeFile($target_path))
+		if (!FileHandler::removeFile($target_path))
 		{
 			return new BaseObject(-1, sprintf(Context::getLang('msg_delete_file_failed'), $path));
 		}
@@ -941,7 +941,7 @@ 
 	 */
 	function _removeDir_real($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
@@ -970,39 +970,39 @@ 
 	function _copyDir(&$file_list)
 	{
 		$output = $this->_connect();
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 		$target_dir = $this->target_path;
 		$copied = array();
 
-		if(is_array($file_list))
+		if (is_array($file_list))
 		{
-			foreach($file_list as $k => $file)
+			foreach ($file_list as $k => $file)
 			{
 				$org_file = $file;
-				if($this->package->path == ".")
+				if ($this->package->path == ".")
 				{
 					$file = substr($file, 3);
 				}
-				$path = FileHandler::getRealPath("./" . $this->target_path . "/" . $file);
-				$path_list = explode('/', dirname($this->target_path . "/" . $file));
+				$path = FileHandler::getRealPath("./".$this->target_path."/".$file);
+				$path_list = explode('/', dirname($this->target_path."/".$file));
 				$real_path = "./";
 
-				for($i = 0; $i < count($path_list); $i++)
+				for ($i = 0; $i < count($path_list); $i++)
 				{
-					if($path_list == "")
+					if ($path_list == "")
 					{
 						continue;
 					}
-					$real_path .= $path_list[$i] . "/";
-					if(!file_exists(FileHandler::getRealPath($real_path)))
+					$real_path .= $path_list[$i]."/";
+					if (!file_exists(FileHandler::getRealPath($real_path)))
 					{
 						FileHandler::makeDir($real_path);
 					}
 				}
-				FileHandler::copyFile( FileHandler::getRealPath($this->download_path . "/" . $org_file), FileHandler::getRealPath("./" . $target_dir . '/' . $file));
+				FileHandler::copyFile(FileHandler::getRealPath($this->download_path."/".$org_file), FileHandler::getRealPath("./".$target_dir.'/'.$file));
 				$copied[] = $path;
 			}
 		}

modules/page/page.admin.controller.php

Spacing +44 added lines, -44 removed lines

@@ -25,24 +25,24 @@ 
 		// Set board module
 		$args = Context::getRequestVars();
 		$args->module = 'page';
-		$args->mid = $args->page_name;	//because if mid is empty in context, set start page mid
+		$args->mid = $args->page_name; //because if mid is empty in context, set start page mid
 		$args->path = (!$args->path) ? '' : $args->path;
 		$args->mpath = (!$args->mpath) ? '' : $args->mpath;
 		unset($args->page_name);
 
-		if($args->use_mobile != 'Y') $args->use_mobile = '';
+		if ($args->use_mobile != 'Y') $args->use_mobile = '';
 		// Check if an original module exists by using module_srl
-		if($args->module_srl)
+		if ($args->module_srl)
 		{
 			$columnList = array('module_srl');
 			$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList);
-			if($module_info->module_srl != $args->module_srl)
+			if ($module_info->module_srl != $args->module_srl)
 			{
 				unset($args->module_srl);
 			}
 			else
 			{
-				foreach($args as $key=>$val)
+				foreach ($args as $key=>$val)
 				{
 					$module_info->{$key} = $val;
 				}
@@ -75,7 +75,7 @@ 
 				}
 		}
 		// Insert/update depending on module_srl
-		if(!$args->module_srl)
+		if (!$args->module_srl)
 		{
 			$output = $oModuleController->insertModule($args);
 			$msg_code = 'success_registed';
@@ -86,10 +86,10 @@ 
 			$msg_code = 'success_updated';
 		}
 
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$this->add("page", Context::get('page'));
-		$this->add('module_srl',$output->get('module_srl'));
+		$this->add('module_srl', $output->get('module_srl'));
 		$this->setMessage($msg_code);
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'module_srl', $output->get('module_srl'), 'act', 'dispPageAdminInfo');
@@ -106,16 +106,16 @@ 
 
 	function putDocumentsInPageToArray($target, &$array)
 	{
-		if(!$target) return;
+		if (!$target) return;
 		preg_match_all('!<img hasContent="true" ([^>]+)!is', $target, $matches);
 		$pattern = '!document_srl="(\d+)"!';
-		foreach($matches[1] as $match)
+		foreach ($matches[1] as $match)
 		{
 			$match2 = null;
 			preg_match($pattern, $match, $match2);
-			if(count($match2))
+			if (count($match2))
 			{
-				$array[(int)$match2[1]] = 1;
+				$array[(int) $match2[1]] = 1;
 			}
 		}
 	}
@@ -127,20 +127,20 @@ 
 	{
 		$module_srl = Context::get('module_srl');
 		$content = Context::get('content');
-		if(!$module_srl) return new BaseObject(-1,'msg_invalid_request');
+		if (!$module_srl) return new BaseObject(-1, 'msg_invalid_request');
 		$mcontent = Context::get('mcontent');
 		$type = Context::get('type');
 		// Guhaeom won information page
 		$oModuleModel = getModel('module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-		if($type == "mobile")
+		if ($type == "mobile")
 		{
-			if(!$mcontent) $mcontent = '';
+			if (!$mcontent) $mcontent = '';
 			$module_info->mcontent = $mcontent;
 		}
 		else
 		{
-			if(!isset($content)) $content ='';
+			if (!isset($content)) $content = '';
 			$module_info->content = $content;
 		}
 
@@ -154,11 +154,11 @@ 
 		$obj->module_srl = $module_srl;
 		$obj->list_count = 99999999;
 		$output = $oDocumentModel->getDocumentList($obj);
-		if(count($output->data))
+		if (count($output->data))
 		{
-			foreach($output->data as $document)
+			foreach ($output->data as $document)
 			{
-				if($document_srls[$document->document_srl]) continue;
+				if ($document_srls[$document->document_srl]) continue;
 				$oDocumentController->deleteDocument($document->document_srl, true);
 			}
 		}
@@ -166,7 +166,7 @@ 
 		$oModuleController = getController('module');
 		// Save
 		$output = $oModuleController->updateModule($module_info);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// On the page, change the validity status of the attached file
 		$oFileController = getController('file');
 		$oFileController->setFilesValid($module_info->module_srl);
@@ -189,10 +189,10 @@ 
 		// Get an original
 		$oModuleController = getController('module');
 		$output = $oModuleController->deleteModule($module_srl);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		$this->add('module','page');
-		$this->add('page',Context::get('page'));
+		$this->add('module', 'page');
+		$this->add('page', Context::get('page'));
 		$this->setMessage('success_deleted');
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPageAdminContent');
@@ -208,7 +208,7 @@ 
 		$args = Context::getRequestVars();
 		// Insert by creating the module Controller object
 		$oModuleController = getController('module');
-		$output = $oModuleController->insertModuleConfig('page',$args);
+		$output = $oModuleController->insertModuleConfig('page', $args);
 		return $output;
 	}
 
@@ -239,7 +239,7 @@ 
 		$file_srl = Context::get('file_srl');
 		// Create the controller object file class
 		$oFileController = getController('file');
-		if($file_srl) $output = $oFileController->deleteFile($file_srl, $this->grant->manager);
+		if ($file_srl) $output = $oFileController->deleteFile($file_srl, $this->grant->manager);
 		// Attachment to the output of the list, java script
 		$oFileController->printUploadedFileList($upload_target_srl);
 	}
@@ -251,7 +251,7 @@ 
 	{
 		$module_srl = Context::get('module_srl');
 
-		if(!$module_srl) return;
+		if (!$module_srl) return;
 
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'content');
@@ -263,29 +263,29 @@ 
 		$oWidgetController = getController('widget');
 		$oWidgetController->recompileWidget($content);
 
-		if($module_info->page_type == 'WIDGET')
+		if ($module_info->page_type == 'WIDGET')
 		{
-			$path = _XE_PATH_ . 'files/cache/page/';
-			$cache_files = FileHandler::readDir($path, '/^' . $module_info->module_srl . '\./');
-			foreach($cache_files as $file_name)
+			$path = _XE_PATH_.'files/cache/page/';
+			$cache_files = FileHandler::readDir($path, '/^'.$module_info->module_srl.'\./');
+			foreach ($cache_files as $file_name)
 			{
-				FileHandler::removeFile($path . $module_info->module_srl . '.' . $file_name);
+				FileHandler::removeFile($path.$module_info->module_srl.'.'.$file_name);
 			}
 		}
-		else if($module_info->page_type == 'OUTSIDE')
+		else if ($module_info->page_type == 'OUTSIDE')
 		{
-			$path = _XE_PATH_ . 'files/cache/page/';
-			$cache_files = FileHandler::readDir($path, '/^' . $module_info->module_srl . './');
-			foreach($cache_files as $file_name)
+			$path = _XE_PATH_.'files/cache/page/';
+			$cache_files = FileHandler::readDir($path, '/^'.$module_info->module_srl.'./');
+			foreach ($cache_files as $file_name)
 			{
-				FileHandler::removeFile($path . $module_info->module_srl . '.' . $file_name);
+				FileHandler::removeFile($path.$module_info->module_srl.'.'.$file_name);
 			}
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$object_key = 'mid_info:' . $module_info->module_srl;
+			$object_key = 'mid_info:'.$module_info->module_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 			$oCacheHandler->delete($cache_key);
 		}
@@ -301,7 +301,7 @@ 
 		$oModuleModel = getModel('module');
 		$grant = $oModuleModel->getGrant($this->module_info, $logged_info);
 
-		if(!$grant->manager)
+		if (!$grant->manager)
 		{
 			return new BaseObject(-1, 'msg_not_permitted');
 		}
@@ -311,9 +311,9 @@ 
 		$obj->is_notice = 'N';
 
 		settype($obj->title, "string");
-		if($obj->title == '') $obj->title = cut_str(strip_tags($obj->content),20,'...');
+		if ($obj->title == '') $obj->title = cut_str(strip_tags($obj->content), 20, '...');
 		//그래도 없으면 Untitled
-		if($obj->title == '') $obj->title = 'Untitled';
+		if ($obj->title == '') $obj->title = 'Untitled';
 
 		$document_srl = $obj->document_srl;
 
@@ -324,7 +324,7 @@ 
 		$target = ($obj->ismobile == 'Y') ? 'mdocument_srl' : 'document_srl';
 
 		// 이미 존재하는 경우 수정
-		if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl) 
+		if ($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl) 
 		{
 			$output = $oDocumentController->updateDocument($oDocument, $obj);
 			$msg_code = 'success_updated';
@@ -337,7 +337,7 @@ 
 			$document_srl = $output->get('document_srl');
 		}
 
-		if(!isset($this->module_info->{$target}) || (isset($this->module_info->{$target}) && $this->module_info->{$target} !== $document_srl))
+		if (!isset($this->module_info->{$target}) || (isset($this->module_info->{$target}) && $this->module_info->{$target} !== $document_srl))
 		{
 			$oModuleController = getController('module');
 			$this->module_info->{$target} = $document_srl;
@@ -345,7 +345,7 @@ 
 		}
 
 		// 오류 발생시 멈춤
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// 결과를 리턴
 		$this->add('mid', Context::get('mid'));

Braces +47 added lines, -24 removed lines

@@ -30,7 +30,9 @@ 
 		$args->mpath = (!$args->mpath) ? '' : $args->mpath;
 		unset($args->page_name);
 
-		if($args->use_mobile != 'Y') $args->use_mobile = '';
+		if($args->use_mobile != 'Y') {
+			$args->use_mobile = '';
+		}
 		// Check if an original module exists by using module_srl
 		if($args->module_srl)
 		{
@@ -39,8 +41,7 @@ 
 			if($module_info->module_srl != $args->module_srl)
 			{
 				unset($args->module_srl);
-			}
-			else
+			} else
 			{
 				foreach($args as $key=>$val)
 				{
@@ -79,14 +80,15 @@ 
 		{
 			$output = $oModuleController->insertModule($args);
 			$msg_code = 'success_registed';
-		}
-		else
+		} else
 		{
 			$output = $oModuleController->updateModule($args);
 			$msg_code = 'success_updated';
 		}
 
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->add("page", Context::get('page'));
 		$this->add('module_srl',$output->get('module_srl'));
@@ -106,7 +108,9 @@ 
 
 	function putDocumentsInPageToArray($target, &$array)
 	{
-		if(!$target) return;
+		if(!$target) {
+			return;
+		}
 		preg_match_all('!<img hasContent="true" ([^>]+)!is', $target, $matches);
 		$pattern = '!document_srl="(\d+)"!';
 		foreach($matches[1] as $match)
@@ -127,7 +131,9 @@ 
 	{
 		$module_srl = Context::get('module_srl');
 		$content = Context::get('content');
-		if(!$module_srl) return new BaseObject(-1,'msg_invalid_request');
+		if(!$module_srl) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 		$mcontent = Context::get('mcontent');
 		$type = Context::get('type');
 		// Guhaeom won information page
@@ -135,12 +141,15 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
 		if($type == "mobile")
 		{
-			if(!$mcontent) $mcontent = '';
+			if(!$mcontent) {
+				$mcontent = '';
+			}
 			$module_info->mcontent = $mcontent;
-		}
-		else
+		} else
 		{
-			if(!isset($content)) $content ='';
+			if(!isset($content)) {
+				$content ='';
+			}
 			$module_info->content = $content;
 		}
 
@@ -158,7 +167,9 @@ 
 		{
 			foreach($output->data as $document)
 			{
-				if($document_srls[$document->document_srl]) continue;
+				if($document_srls[$document->document_srl]) {
+					continue;
+				}
 				$oDocumentController->deleteDocument($document->document_srl, true);
 			}
 		}
@@ -166,7 +177,9 @@ 
 		$oModuleController = getController('module');
 		// Save
 		$output = $oModuleController->updateModule($module_info);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// On the page, change the validity status of the attached file
 		$oFileController = getController('file');
 		$oFileController->setFilesValid($module_info->module_srl);
@@ -189,7 +202,9 @@ 
 		// Get an original
 		$oModuleController = getController('module');
 		$output = $oModuleController->deleteModule($module_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->add('module','page');
 		$this->add('page',Context::get('page'));
@@ -239,7 +254,9 @@ 
 		$file_srl = Context::get('file_srl');
 		// Create the controller object file class
 		$oFileController = getController('file');
-		if($file_srl) $output = $oFileController->deleteFile($file_srl, $this->grant->manager);
+		if($file_srl) {
+			$output = $oFileController->deleteFile($file_srl, $this->grant->manager);
+		}
 		// Attachment to the output of the list, java script
 		$oFileController->printUploadedFileList($upload_target_srl);
 	}
@@ -251,7 +268,9 @@ 
 	{
 		$module_srl = Context::get('module_srl');
 
-		if(!$module_srl) return;
+		if(!$module_srl) {
+			return;
+		}
 
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'content');
@@ -271,8 +290,7 @@ 
 			{
 				FileHandler::removeFile($path . $module_info->module_srl . '.' . $file_name);
 			}
-		}
-		else if($module_info->page_type == 'OUTSIDE')
+		} else if($module_info->page_type == 'OUTSIDE')
 		{
 			$path = _XE_PATH_ . 'files/cache/page/';
 			$cache_files = FileHandler::readDir($path, '/^' . $module_info->module_srl . './');
@@ -311,9 +329,13 @@ 
 		$obj->is_notice = 'N';
 
 		settype($obj->title, "string");
-		if($obj->title == '') $obj->title = cut_str(strip_tags($obj->content),20,'...');
+		if($obj->title == '') {
+			$obj->title = cut_str(strip_tags($obj->content),20,'...');
+		}
 		//그래도 없으면 Untitled
-		if($obj->title == '') $obj->title = 'Untitled';
+		if($obj->title == '') {
+			$obj->title = 'Untitled';
+		}
 
 		$document_srl = $obj->document_srl;
 
@@ -328,8 +350,7 @@ 
 		{
 			$output = $oDocumentController->updateDocument($oDocument, $obj);
 			$msg_code = 'success_updated';
-		}
-		else
+		} else
 		{
 			// 그렇지 않으면 신규 등록
 			$output = $oDocumentController->insertDocument($obj, $bAnonymous);
@@ -345,7 +366,9 @@ 
 		}
 
 		// 오류 발생시 멈춤
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// 결과를 리턴
 		$this->add('mid', Context::get('mid'));

modules/page/page.mobile.php

Spacing +16 added lines, -16 removed lines

@@ -9,18 +9,18 @@ 
 		// Get a template path (page in the administrative template tpl putting together)
 		$this->setTemplatePath($this->module_path.'tpl');
 
-		switch($this->module_info->page_type)
+		switch ($this->module_info->page_type)
 		{
 			case 'WIDGET' :
 				{
 					$this->cache_file = sprintf("%sfiles/cache/page/%d.%s.%s.m.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getLangType(), Context::getSslStatus());
-					$this->interval = (int)($this->module_info->page_caching_interval);
+					$this->interval = (int) ($this->module_info->page_caching_interval);
 					break;
 				}
 			case 'OUTSIDE' :
 				{
 					$this->cache_file = sprintf("./files/cache/opage/%d.%s.m.cache.php", $this->module_info->module_srl, Context::getSslStatus()); 
-					$this->interval = (int)($this->module_info->page_caching_interval);
+					$this->interval = (int) ($this->module_info->page_caching_interval);
 					$this->path = $this->module_info->mpath;
 					break;
 				}
@@ -30,10 +30,10 @@ 
 	function dispPageIndex()
 	{
 		// Variables used in the template Context:: set()
-		if($this->module_srl) Context::set('module_srl',$this->module_srl);
+		if ($this->module_srl) Context::set('module_srl', $this->module_srl);
 
 		$page_type_name = strtolower($this->module_info->page_type);
-		$method = '_get' . ucfirst($page_type_name) . 'Content';
+		$method = '_get'.ucfirst($page_type_name).'Content';
 		if (method_exists($this, $method)) $page_content = $this->{$method}();
 		else return new BaseObject(-1, sprintf('%s method is not exists', $method));
 
@@ -46,13 +46,13 @@ 
 	function _getWidgetContent()
 	{
 		// Arrange a widget ryeolro
-		if($this->module_info->mcontent)
+		if ($this->module_info->mcontent)
 		{
 			$cache_file = sprintf("%sfiles/cache/page/%d.%s.m.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getLangType());
-			$interval = (int)($this->module_info->page_caching_interval);
-			if($interval>0)
+			$interval = (int) ($this->module_info->page_caching_interval);
+			if ($interval > 0)
 			{
-				if(!file_exists($cache_file) || filesize($cache_file) < 1)
+				if (!file_exists($cache_file) || filesize($cache_file) < 1)
 				{
 					$mtime = 0;
 				}
@@ -61,7 +61,7 @@ 
 					$mtime = filemtime($cache_file);
 				}
 
-				if($mtime + $interval*60 > $_SERVER['REQUEST_TIME']) 
+				if ($mtime + $interval * 60 > $_SERVER['REQUEST_TIME']) 
 				{
 					$page_content = FileHandler::readFile($cache_file); 
 					$page_content = preg_replace('@<\!--#Meta:@', '<!--Meta:', $page_content);
@@ -75,7 +75,7 @@ 
 			} 
 			else 
 			{
-				if(file_exists($cache_file))
+				if (file_exists($cache_file))
 				{
 					FileHandler::removeFile($cache_file);
 				}
@@ -97,13 +97,13 @@ 
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument(0, true);
 
-		if($this->module_info->mdocument_srl)
+		if ($this->module_info->mdocument_srl)
 		{
 			$document_srl = $this->module_info->mdocument_srl;
 			$oDocument->setDocument($document_srl);
 			Context::set('document_srl', $document_srl);
 		}
-		if(!$oDocument->isExists())
+		if (!$oDocument->isExists())
 		{
 			$document_srl = $this->module_info->document_srl;
 			$oDocument->setDocument($document_srl);
@@ -111,7 +111,7 @@ 
 		}
 		Context::set('oDocument', $oDocument);
 
-		if($this->module_info->mskin)
+		if ($this->module_info->mskin)
 		{
 			$templatePath = (sprintf($this->module_path.'m.skins/%s', $this->module_info->mskin));
 		}
@@ -128,9 +128,9 @@ 
 	function _getOutsideContent()
 	{
 		// check if it is http or internal file
-		if($this->path)
+		if ($this->path)
 		{
-			if(preg_match("/^([a-z]+):\/\//i",$this->path)) $content = $this->getHtmlPage($this->path, $this->interval, $this->cache_file);
+			if (preg_match("/^([a-z]+):\/\//i", $this->path)) $content = $this->getHtmlPage($this->path, $this->interval, $this->cache_file);
 			else $content = $this->executeFile($this->path, $this->interval, $this->cache_file);
 		}
 

Braces +18 added lines, -15 removed lines

@@ -30,12 +30,17 @@ 
 	function dispPageIndex()
 	{
 		// Variables used in the template Context:: set()
-		if($this->module_srl) Context::set('module_srl',$this->module_srl);
+		if($this->module_srl) {
+			Context::set('module_srl',$this->module_srl);
+		}
 
 		$page_type_name = strtolower($this->module_info->page_type);
 		$method = '_get' . ucfirst($page_type_name) . 'Content';
-		if (method_exists($this, $method)) $page_content = $this->{$method}();
-		else return new BaseObject(-1, sprintf('%s method is not exists', $method));
+		if (method_exists($this, $method)) {
+			$page_content = $this->{$method}();
+		} else {
+			return new BaseObject(-1, sprintf('%s method is not exists', $method));
+		}
 
 		Context::set('module_info', $this->module_info);
 		Context::set('page_content', $page_content);
@@ -55,8 +60,7 @@ 
 				if(!file_exists($cache_file) || filesize($cache_file) < 1)
 				{
 					$mtime = 0;
-				}
-				else
+				} else
 				{
 					$mtime = filemtime($cache_file);
 				}
@@ -65,15 +69,13 @@ 
 				{
 					$page_content = FileHandler::readFile($cache_file); 
 					$page_content = preg_replace('@<\!--#Meta:@', '<!--Meta:', $page_content);
-				} 
-				else 
+				} else 
 				{
 					$oWidgetController = getController('widget');
 					$page_content = $oWidgetController->transWidgetCode($this->module_info->mcontent);
 					FileHandler::writeFile($cache_file, $page_content);
 				}
-			} 
-			else 
+			} else 
 			{
 				if(file_exists($cache_file))
 				{
@@ -81,8 +83,7 @@ 
 				}
 				$page_content = $this->module_info->mcontent;
 			}
-		}
-		else
+		} else
 		{
 			$page_content = $this->module_info->content;
 		}
@@ -114,8 +115,7 @@ 
 		if($this->module_info->mskin)
 		{
 			$templatePath = (sprintf($this->module_path.'m.skins/%s', $this->module_info->mskin));
-		}
-		else
+		} else
 		{
 			$templatePath = ($this->module_path.'m.skins/default');
 		}
@@ -130,8 +130,11 @@ 
 		// check if it is http or internal file
 		if($this->path)
 		{
-			if(preg_match("/^([a-z]+):\/\//i",$this->path)) $content = $this->getHtmlPage($this->path, $this->interval, $this->cache_file);
-			else $content = $this->executeFile($this->path, $this->interval, $this->cache_file);
+			if(preg_match("/^([a-z]+):\/\//i",$this->path)) {
+				$content = $this->getHtmlPage($this->path, $this->interval, $this->cache_file);
+			} else {
+				$content = $this->executeFile($this->path, $this->interval, $this->cache_file);
+			}
 		}
 
 		return $content;

modules/file/file.view.php

Spacing +2 added lines, -2 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 BaseObject();
+			if (!$current_module_srl) return new BaseObject();
 		}
 		// Get file configurations of the module
 		$oFileModel = getModel('file');

Braces +3 added lines, -1 removed lines

@@ -31,7 +31,9 @@
 			// Get information of the current module
 			$current_module_info = Context::get('current_module_info');
 			$current_module_srl = $current_module_info->module_srl;
-			if(!$current_module_srl) return new BaseObject();
+			if(!$current_module_srl) {
+				return new BaseObject();
+			}
 		}
 		// Get file configurations of the module
 		$oFileModel = getModel('file');

modules/file/file.controller.php

Spacing +168 added lines, -168 removed lines

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

Braces +229 added lines, -95 removed lines

@@ -29,20 +29,30 @@ 
 		$file_info = $_FILES['Filedata'];
 
 		// An error appears if not a normally uploaded file
-		if(!is_uploaded_file($file_info['tmp_name'])) exit();
+		if(!is_uploaded_file($file_info['tmp_name'])) {
+			exit();
+		}
 
 		// Basic variables setting
 		$oFileModel = getModel('file');
 		$editor_sequence = Context::get('editor_sequence');
 		$upload_target_srl = intval(Context::get('uploadTargetSrl'));
-		if(!$upload_target_srl) $upload_target_srl = intval(Context::get('upload_target_srl'));
+		if(!$upload_target_srl) {
+			$upload_target_srl = intval(Context::get('upload_target_srl'));
+		}
 		$module_srl = $this->module_srl;
 		// Exit a session if there is neither upload permission nor information
-		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
+		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) {
+			exit();
+		}
 		// Extract from session information if upload_target_srl is not specified
-		if(!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		if(!$upload_target_srl) {
+			$upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		}
 		// Create if upload_target_srl is not defined in the session information
-		if(!$upload_target_srl) $_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
+		if(!$upload_target_srl) {
+			$_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
+		}
 
 		$output = $this->insertFile($file_info, $module_srl, $upload_target_srl);
 		Context::setResponseMethod('JSON');
@@ -52,7 +62,9 @@ 
 		$this->add('source_filename',$output->get('source_filename'));
 		$this->add('download_url',$output->get('uploaded_filename'));
 		$this->add('upload_target_srl',$output->get('upload_target_srl'));
-		if($output->error != '0') $this->stop($output->message);
+		if($output->error != '0') {
+			$this->stop($output->message);
+		}
 	}
 
 	/**
@@ -67,14 +79,22 @@ 
 		$callback = Context::get('callback');
 		$module_srl = $this->module_srl;
 		$upload_target_srl = intval(Context::get('uploadTargetSrl'));
-		if(!$upload_target_srl) $upload_target_srl = intval(Context::get('upload_target_srl'));
+		if(!$upload_target_srl) {
+			$upload_target_srl = intval(Context::get('upload_target_srl'));
+		}
 
 		// Exit a session if there is neither upload permission nor information
-		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
+		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) {
+			exit();
+		}
 		// Extract from session information if upload_target_srl is not specified
-		if(!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		if(!$upload_target_srl) {
+			$upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+		}
 		// Create if upload_target_srl is not defined in the session information
-		if(!$upload_target_srl) $_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
+		if(!$upload_target_srl) {
+			$_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
+		}
 
 		// Delete and then attempt to re-upload if file_srl is requested
 		$file_srl = Context::get('file_srl');
@@ -129,15 +149,16 @@ 
 		$source_src = $fileInfo->uploaded_filename;
 		$output_src = $source_src . '.resized' . strrchr($source_src,'.');
 
-		if(!$height) $height = $width-1;
+		if(!$height) {
+			$height = $width-1;
+		}
 
 		if(FileHandler::createImageFile($source_src,$output_src,$width,$height,'','ratio'))
 		{
 			$output = new stdClass();
 			$output->info = getimagesize($output_src);
 			$output->src = $output_src;
-		}
-		else
+		} else
 		{
 			return new BaseObject(-1,'msg_invalid_request');
 		}
@@ -180,7 +201,9 @@ 
 	{
 		$oFileModel = getModel('file');
 
-		if(isset($this->grant->access) && $this->grant->access !== true) return new BaseObject(-1, 'msg_not_permitted');
+		if(isset($this->grant->access) && $this->grant->access !== true) {
+			return new BaseObject(-1, 'msg_not_permitted');
+		}
 
 		$file_srl = Context::get('file_srl');
 		$sid = Context::get('sid');
@@ -189,9 +212,13 @@ 
 		$columnList = array('file_srl', 'sid', 'isvalid', 'source_filename', 'module_srl', 'uploaded_filename', 'file_size', 'member_srl', 'upload_target_srl', 'upload_target_type');
 		$file_obj = $oFileModel->getFile($file_srl, $columnList);
 		// If the requested file information is incorrect, an error that file cannot be found appears
-		if($file_obj->file_srl!=$file_srl || $file_obj->sid!=$sid) return $this->stop('msg_file_not_found');
+		if($file_obj->file_srl!=$file_srl || $file_obj->sid!=$sid) {
+			return $this->stop('msg_file_not_found');
+		}
 		// Notify that file download is not allowed when standing-by(Only a top-administrator is permitted)
-		if($logged_info->is_admin != 'Y' && $file_obj->isvalid!='Y') return $this->stop('msg_not_permitted_download');
+		if($logged_info->is_admin != 'Y' && $file_obj->isvalid!='Y') {
+			return $this->stop('msg_not_permitted_download');
+		}
 		// File name
 		$filename = $file_obj->source_filename;
 		$file_module_config = $oFileModel->getFileModuleConfig($file_obj->module_srl);
@@ -203,7 +230,9 @@ 
 			{
 				$allow_outlink_format_array = array();
 				$allow_outlink_format_array = explode(',', $file_module_config->allow_outlink_format);
-				if(!is_array($allow_outlink_format_array)) $allow_outlink_format_array[0] = $file_module_config->allow_outlink_format;
+				if(!is_array($allow_outlink_format_array)) {
+					$allow_outlink_format_array[0] = $file_module_config->allow_outlink_format;
+				}
 
 				foreach($allow_outlink_format_array as $val)
 				{
@@ -225,7 +254,9 @@ 
 					{
 						$allow_outlink_site_array = array();
 						$allow_outlink_site_array = explode("\n", $file_module_config->allow_outlink_site);
-						if(!is_array($allow_outlink_site_array)) $allow_outlink_site_array[0] = $file_module_config->allow_outlink_site;
+						if(!is_array($allow_outlink_site_array)) {
+							$allow_outlink_site_array[0] = $file_module_config->allow_outlink_site;
+						}
 
 						foreach($allow_outlink_site_array as $val)
 						{
@@ -237,23 +268,29 @@ 
 							}
 						}
 					}
+				} else {
+					$file_module_config->allow_outlink = 'Y';
 				}
-				else $file_module_config->allow_outlink = 'Y';
 			}
-			if($file_module_config->allow_outlink != 'Y') return $this->stop('msg_not_allowed_outlink');
+			if($file_module_config->allow_outlink != 'Y') {
+				return $this->stop('msg_not_allowed_outlink');
+			}
 		}
 
 		// Check if a permission for file download is granted
 		$downloadGrantCount = 0;
 		if(is_array($file_module_config->download_grant))
 		{
-			foreach($file_module_config->download_grant AS $value)
-				if($value) $downloadGrantCount++;
+			foreach($file_module_config->download_grant AS $value) {
+							if($value) $downloadGrantCount++;
+			}
 		}
 
 		if(is_array($file_module_config->download_grant) && $downloadGrantCount>0)
 		{
-			if(!Context::get('is_logged')) return $this->stop('msg_not_permitted_download');
+			if(!Context::get('is_logged')) {
+				return $this->stop('msg_not_permitted_download');
+			}
 			$logged_info = Context::get('logged_info');
 			if($logged_info->is_admin != 'Y')
 			{
@@ -276,13 +313,17 @@ 
 							break;
 						}
 					}
-					if(!$is_permitted) return $this->stop('msg_not_permitted_download');
+					if(!$is_permitted) {
+						return $this->stop('msg_not_permitted_download');
+					}
 				}
 			}
 		}
 		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('file.downloadFile', 'before', $file_obj);
-		if(!$output->toBool()) return $this->stop(($output->message)?$output->message:'msg_not_permitted_download');
+		if(!$output->toBool()) {
+			return $this->stop(($output->message)?$output->message:'msg_not_permitted_download');
+		}
 
 
 		// 다운로드 후 (가상)
@@ -306,16 +347,23 @@ 
 		$oFileModel = getModel('file');
 		$file_srl = Context::get('file_srl');
 		$file_key = Context::get('file_key');
-		if(strstr($_SERVER['HTTP_USER_AGENT'], "Android")) $is_android = true;
+		if(strstr($_SERVER['HTTP_USER_AGENT'], "Android")) {
+			$is_android = true;
+		}
 
-		if($is_android && $_SESSION['__XE_FILE_KEY_AND__'][$file_srl]) $session_key = '__XE_FILE_KEY_AND__';
-		else $session_key = '__XE_FILE_KEY__';
+		if($is_android && $_SESSION['__XE_FILE_KEY_AND__'][$file_srl]) {
+			$session_key = '__XE_FILE_KEY_AND__';
+		} else {
+			$session_key = '__XE_FILE_KEY__';
+		}
 		$columnList = array('source_filename', 'uploaded_filename', 'file_size');
 		$file_obj = $oFileModel->getFile($file_srl, $columnList);
 
 		$uploaded_filename = $file_obj->uploaded_filename;
 
-		if(!file_exists($uploaded_filename)) return $this->stop('msg_file_not_found');
+		if(!file_exists($uploaded_filename)) {
+			return $this->stop('msg_file_not_found');
+		}
 
 		if(!$file_key || $_SESSION[$session_key][$file_srl] != $file_key)
 		{
@@ -331,29 +379,27 @@ 
 			if($is_android && preg_match('#\bwv\b|(?:Version|Browser)/\d+#', $_SERVER['HTTP_USER_AGENT']))
 			{
 				$filename_param = 'filename="' . $filename . '"';
-			}
-			else
+			} else
 			{
 				$filename_param = "filename*=UTF-8''" . rawurlencode($filename) . '; filename="' . rawurlencode($filename) . '"';
 			}
-		}
-		elseif(preg_match('#(?:Firefox|Safari|Trident)/(\d+)\.#', $_SERVER['HTTP_USER_AGENT'], $matches) && $matches[1] >= 6)
+		} elseif(preg_match('#(?:Firefox|Safari|Trident)/(\d+)\.#', $_SERVER['HTTP_USER_AGENT'], $matches) && $matches[1] >= 6)
 		{
 			$filename_param = "filename*=UTF-8''" . rawurlencode($filename) . '; filename="' . rawurlencode($filename) . '"';
-		}
-		elseif(strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE)
+		} elseif(strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== FALSE)
 		{
 			$filename = rawurlencode($filename);
 			$filename_param = 'filename="' . preg_replace('/\./', '%2e', $filename, substr_count($filename, '.') - 1) . '"';
-		}
-		else
+		} else
 		{
 			$filename_param = 'filename="' . $filename . '"';
 		}
 
 		if($is_android)
 		{
-			if($_SESSION['__XE_FILE_KEY__'][$file_srl]) $_SESSION['__XE_FILE_KEY_AND__'][$file_srl] = $file_key;
+			if($_SESSION['__XE_FILE_KEY__'][$file_srl]) {
+				$_SESSION['__XE_FILE_KEY_AND__'][$file_srl] = $file_key;
+			}
 		}
 
 		unset($_SESSION[$session_key][$file_srl]);
@@ -361,7 +407,9 @@ 
 		Context::close();
 
 		$fp = fopen($uploaded_filename, 'rb');
-		if(!$fp) return $this->stop('msg_file_not_found');
+		if(!$fp) {
+			return $this->stop('msg_file_not_found');
+		}
 
 		header("Cache-Control: ");
 		header("Pragma: ");
@@ -375,10 +423,11 @@ 
 		// if file size is lager than 10MB, use fread function (#18675748)
 		if($file_size > 1024 * 1024)
 		{
-			while(!feof($fp)) echo fread($fp, 1024);
+			while(!feof($fp)) {
+				echo fread($fp, 1024);
+			}
 			fclose($fp);
-		}
-		else
+		} else
 		{
 			fpassthru($fp);
 		}
@@ -397,9 +446,13 @@ 
 		$editor_sequence = Context::get('editor_sequence');
 		$file_srl = Context::get('file_srl');
 		$file_srls = Context::get('file_srls');
-		if($file_srls) $file_srl = $file_srls;
+		if($file_srls) {
+			$file_srl = $file_srls;
+		}
 		// Exit a session if there is neither upload permission nor information
-		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
+		if(!$_SESSION['upload_info'][$editor_sequence]->enabled) {
+			exit();
+		}
 
 		$upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
 
@@ -407,26 +460,38 @@ 
 		$oFileModel = getModel('file');
 
 		$srls = explode(',',$file_srl);
-		if(!count($srls)) return;
+		if(!count($srls)) {
+			return;
+		}
 
 		for($i=0;$i<count($srls);$i++)
 		{
 			$srl = (int)$srls[$i];
-			if(!$srl) continue;
+			if(!$srl) {
+				continue;
+			}
 
 			$args = new stdClass;
 			$args->file_srl = $srl;
 			$output = executeQuery('file.getFile', $args);
-			if(!$output->toBool()) continue;
+			if(!$output->toBool()) {
+				continue;
+			}
 
 			$file_info = $output->data;
-			if(!$file_info) continue;
+			if(!$file_info) {
+				continue;
+			}
 
 			$file_grant = $oFileModel->getFileGrant($file_info, $logged_info);
 
-			if(!$file_grant->is_deletable) continue;
+			if(!$file_grant->is_deletable) {
+				continue;
+			}
 
-			if($upload_target_srl && $file_srl) $output = $this->deleteFile($file_srl);
+			if($upload_target_srl && $file_srl) {
+				$output = $this->deleteFile($file_srl);
+			}
 		}
 	}
 
@@ -437,7 +502,9 @@ 
 	 */
 	function procFileGetList()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 
 		$oModuleModel = getModel('module');
 
@@ -448,26 +515,32 @@ 
 		}
 
 		$fileSrls = Context::get('file_srls');
-		if($fileSrls) $fileSrlList = explode(',', $fileSrls);
+		if($fileSrls) {
+			$fileSrlList = explode(',', $fileSrls);
+		}
 
 		global $lang;
 		if(count($fileSrlList) > 0)
 		{
 			$oFileModel = getModel('file');
 			$fileList = $oFileModel->getFile($fileSrlList);
-			if(!is_array($fileList)) $fileList = array($fileList);
+			if(!is_array($fileList)) {
+				$fileList = array($fileList);
+			}
 
 			if(is_array($fileList))
 			{
 				foreach($fileList AS $key=>$value)
 				{
 					$value->human_file_size = FileHandler::filesize($value->file_size);
-					if($value->isvalid=='Y') $value->validName = $lang->is_valid;
-					else $value->validName = $lang->is_stand_by;
+					if($value->isvalid=='Y') {
+						$value->validName = $lang->is_valid;
+					} else {
+						$value->validName = $lang->is_stand_by;
+					}
 				}
 			}
-		}
-		else
+		} else
 		{
 			$fileList = array();
 			$this->setMessage($lang->no_files);
@@ -484,7 +557,9 @@ 
 	function triggerCheckAttached(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new BaseObject();
+		if(!$document_srl) {
+			return new BaseObject();
+		}
 		// Get numbers of attachments
 		$oFileModel = getModel('file');
 		$obj->uploaded_count = $oFileModel->getFilesCount($document_srl);
@@ -501,10 +576,14 @@ 
 	function triggerAttachFiles(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new BaseObject();
+		if(!$document_srl) {
+			return new BaseObject();
+		}
 
 		$output = $this->setFilesValid($document_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		return new BaseObject();
 	}
@@ -518,7 +597,9 @@ 
 	function triggerDeleteAttached(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new BaseObject();
+		if(!$document_srl) {
+			return new BaseObject();
+		}
 
 		$output = $this->deleteFiles($document_srl);
 		return $output;
@@ -533,7 +614,9 @@ 
 	function triggerCommentCheckAttached(&$obj)
 	{
 		$comment_srl = $obj->comment_srl;
-		if(!$comment_srl) return new BaseObject();
+		if(!$comment_srl) {
+			return new BaseObject();
+		}
 		// Get numbers of attachments
 		$oFileModel = getModel('file');
 		$obj->uploaded_count = $oFileModel->getFilesCount($comment_srl);
@@ -551,10 +634,14 @@ 
 	{
 		$comment_srl = $obj->comment_srl;
 		$uploaded_count = $obj->uploaded_count;
-		if(!$comment_srl || !$uploaded_count) return new BaseObject();
+		if(!$comment_srl || !$uploaded_count) {
+			return new BaseObject();
+		}
 
 		$output = $this->setFilesValid($comment_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		return new BaseObject();
 	}
@@ -568,9 +655,13 @@ 
 	function triggerCommentDeleteAttached(&$obj)
 	{
 		$comment_srl = $obj->comment_srl;
-		if(!$comment_srl) return new BaseObject();
+		if(!$comment_srl) {
+			return new BaseObject();
+		}
 
-		if($obj->isMoveToTrash) return new BaseObject();
+		if($obj->isMoveToTrash) {
+			return new BaseObject();
+		}
 
 		$output = $this->deleteFiles($comment_srl);
 		return $output;
@@ -585,7 +676,9 @@ 
 	function triggerDeleteModuleFiles(&$obj)
 	{
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new BaseObject();
+		if(!$module_srl) {
+			return new BaseObject();
+		}
 
 		$oFileController = getAdminController('file');
 		return $oFileController->deleteModuleFiles($module_srl);
@@ -660,7 +753,9 @@ 
 		$trigger_obj->module_srl = $module_srl;
 		$trigger_obj->upload_target_srl = $upload_target_srl;
 		$output = ModuleHandler::triggerCall('file.insertFile', 'before', $trigger_obj);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// A workaround for Firefox upload bug
 		if(preg_match('/^=\?UTF-8\?B\?(.+)\?=$/i', $file_info['name'], $match))
@@ -698,13 +793,17 @@ 
 				$allowed_filesize = $config->allowed_filesize * 1024 * 1024;
 				$allowed_attach_size = $config->allowed_attach_size * 1024 * 1024;
 				// An error appears if file size exceeds a limit
-				if($allowed_filesize < filesize($file_info['tmp_name'])) return new BaseObject(-1, 'msg_exceeds_limit_size');
+				if($allowed_filesize < filesize($file_info['tmp_name'])) {
+					return new BaseObject(-1, 'msg_exceeds_limit_size');
+				}
 				// Get total file size of all attachements (from DB)
 				$size_args = new stdClass;
 				$size_args->upload_target_srl = $upload_target_srl;
 				$output = executeQuery('file.getAttachedFileSize', $size_args);
 				$attached_size = (int)$output->data->attached_size + filesize($file_info['tmp_name']);
-				if($attached_size > $allowed_attach_size) return new BaseObject(-1, 'msg_exceeds_limit_size');
+				if($attached_size > $allowed_attach_size) {
+					return new BaseObject(-1, 'msg_exceeds_limit_size');
+				}
 			}
 		}
 
@@ -734,18 +833,21 @@ 
 				$idx++;
 			}
 			$direct_download = 'Y';
-		}
-		else
+		} else
 		{
 			$path = sprintf("./files/attach/binaries/%s/%s", $module_srl, getNumberingPath($upload_target_srl,3));
 			$filename = $path.$random->createSecureSalt(32, 'hex');
 			$direct_download = 'N';
 		}
 		// Create a directory
-		if(!FileHandler::makeDir($path)) return new BaseObject(-1,'msg_not_permitted_create');
+		if(!FileHandler::makeDir($path)) {
+			return new BaseObject(-1,'msg_not_permitted_create');
+		}
 
 		// Check uploaded file
-		if(!checkUploadedFile($file_info['tmp_name']))  return new BaseObject(-1,'msg_file_upload_error');
+		if(!checkUploadedFile($file_info['tmp_name'])) {
+			return new BaseObject(-1,'msg_file_upload_error');
+		}
 
 		// Get random number generator
 		$random = new Password();
@@ -759,13 +861,14 @@ 
 				$filename = $path.$random->createSecureSalt(32, 'hex').'.'.$ext;
 				@copy($file_info['tmp_name'], $filename);
 			}
-		}
-		else
+		} else
 		{
 			if(!@move_uploaded_file($file_info['tmp_name'], $filename))
 			{
 				$filename = $path.$random->createSecureSalt(32, 'hex').'.'.$ext;
-				if(!@move_uploaded_file($file_info['tmp_name'], $filename))  return new BaseObject(-1,'msg_file_upload_error');
+				if(!@move_uploaded_file($file_info['tmp_name'], $filename)) {
+					return new BaseObject(-1,'msg_file_upload_error');
+				}
 			}
 		}
 		// Get member information
@@ -786,10 +889,14 @@ 
 		$args->sid = $random->createSecureSalt(32, 'hex');
 
 		$output = executeQuery('file.insertFile', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Call a trigger (after)
 		$trigger_output = ModuleHandler::triggerCall('file.insertFile', 'after', $args);
-		if(!$trigger_output->toBool()) return $trigger_output;
+		if(!$trigger_output->toBool()) {
+			return $trigger_output;
+		}
 
 		$_SESSION['__XE_UPLOADING_FILES_INFO__'][$args->file_srl] = true;
 
@@ -832,10 +939,14 @@ 
 	 */
 	function deleteFile($file_srl)
 	{
-		if(!$file_srl) return;
+		if(!$file_srl) {
+			return;
+		}
 
 		$srls = (is_array($file_srl)) ? $file_srl : explode(',', $file_srl);
-		if(!count($srls)) return;
+		if(!count($srls)) {
+			return;
+		}
 
 		$oDocumentController = getController('document');
 		$documentSrlList = array();
@@ -870,15 +981,21 @@ 
 			// Call a trigger (before)
 			$trigger_obj = $output->data;
 			$output = ModuleHandler::triggerCall('file.deleteFile', 'before', $trigger_obj);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 
 			// Remove from the DB
 			$output = executeQuery('file.deleteFile', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 
 			// Call a trigger (after)
 			$trigger_output = ModuleHandler::triggerCall('file.deleteFile', 'after', $trigger_obj);
-			if(!$trigger_output->toBool()) return $trigger_output;
+			if(!$trigger_output->toBool()) {
+				return $trigger_output;
+			}
 
 			// If successfully deleted, remove the file
 			FileHandler::removeFile($uploaded_filename);
@@ -902,7 +1019,9 @@ 
 		$columnList = array('file_srl', 'uploaded_filename', 'module_srl');
 		$file_list = $oFileModel->getFiles($upload_target_srl, $columnList);
 		// Success returned if no attachement exists
-		if(!is_array($file_list)||!count($file_list)) return new BaseObject();
+		if(!is_array($file_list)||!count($file_list)) {
+			return new BaseObject();
+		}
 
 		// Delete the file
 		$path = array();
@@ -913,14 +1032,18 @@ 
 
 			$uploaded_filename = $file_list[$i]->uploaded_filename;
 			$path_info = pathinfo($uploaded_filename);
-			if(!in_array($path_info['dirname'], $path)) $path[] = $path_info['dirname'];
+			if(!in_array($path_info['dirname'], $path)) {
+				$path[] = $path_info['dirname'];
+			}
 		}
 
 		// Remove from the DB
 		$args = new stdClass();
 		$args->upload_target_srl = $upload_target_srl;
 		$output = executeQuery('file.deleteFiles', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		
 		// Remove a file directory of the document
 		for($i=0, $c=count($path); $i<$c; $i++)
@@ -941,11 +1064,15 @@ 
 	 */
 	function moveFile($source_srl, $target_module_srl, $target_srl)
 	{
-		if($source_srl == $target_srl) return;
+		if($source_srl == $target_srl) {
+			return;
+		}
 
 		$oFileModel = getModel('file');
 		$file_list = $oFileModel->getFiles($source_srl);
-		if(!$file_list) return;
+		if(!$file_list) {
+			return;
+		}
 
 		$file_count = count($file_list);
  
@@ -959,15 +1086,16 @@ 
 			{
 				$path = sprintf("./files/attach/images/%s/%s/", $target_module_srl,$target_srl);
 				$new_file = $path.$file_info->source_filename;
-			}
-			else
+			} else
 			{
 				$path = sprintf("./files/attach/binaries/%s/%s/", $target_module_srl, $target_srl);
 				$random = new Password();
 				$new_file = $path.$random->createSecureSalt(32, 'hex');
 			}
 			// Pass if a target document to move is same
-			if($old_file == $new_file) continue;
+			if($old_file == $new_file) {
+				continue;
+			}
 			// Create a directory
 			FileHandler::makeDir($path);
 			// Move the file
@@ -987,16 +1115,22 @@ 
 		$vars = Context::getRequestVars();
 		$logged_info = Context::get('logged_info');
 
-		if(!$vars->editor_sequence) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$vars->editor_sequence) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$upload_target_srl = $_SESSION['upload_info'][$vars->editor_sequence]->upload_target_srl;
 
 		$oFileModel = getModel('file');
 		$file_info = $oFileModel->getFile($vars->file_srl);
 
-		if(!$file_info) return new BaseObject(-1, 'msg_not_founded');
+		if(!$file_info) {
+			return new BaseObject(-1, 'msg_not_founded');
+		}
 
-		if(!$this->manager && !$file_info->member_srl === $logged_info->member_srl) return new BaseObject(-1, 'msg_not_permitted');
+		if(!$this->manager && !$file_info->member_srl === $logged_info->member_srl) {
+			return new BaseObject(-1, 'msg_not_permitted');
+		}
 
 		$args =  new stdClass();
 		$args->file_srl = $vars->file_srl;