xpressengine / xe-core

modules/message/message.admin.controller.php

Indentation +4 added lines, -4 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -23,8 +23,8 @@
 		$args = Context::gets('skin', 'mskin', 'colorset', 'mcolorset');
 		// Create a module Controller object
 		$oModuleController = getController('module');
-		$output = $oModuleController->insertModuleConfig('message',$args);
-		if(!$output->toBool()) return $output;
+		$output = $oModuleController->insertModuleConfig('message', $args);
+		if (!$output->toBool()) return $output;
 
 		$this->setMessage('success_updated');
 

Braces +3 added lines, -1 removed lines

@@ -24,7 +24,9 @@
 		// Create a module Controller object
 		$oModuleController = getController('module');
 		$output = $oModuleController->insertModuleConfig('message',$args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->setMessage('success_updated');
 

modules/message/message.admin.model.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
-class messageAdminModel extends message{
+class messageAdminModel extends message {
 	public function getMessageAdminColorset()
 	{
 		$skin = Context::get('skin');
@@ -8,7 +8,7 @@ 
 		Context::set('type', $type);
 		$dir = $type == 'P' ? 'skins' : 'm.skins';
 
-		if(!$skin)
+		if (!$skin)
 		{
 			$tpl = '';
 		}
@@ -22,7 +22,7 @@ 
 			Context::set('config', $config);
 
 			$oTemplate = TemplateHandler::getInstance();
-			$tpl = $oTemplate->compile($this->module_path.'tpl', 'colorset_list');
+			$tpl = $oTemplate->compile($this->module_path . 'tpl', 'colorset_list');
 		}
 
 		$this->add('tpl', $tpl);

Braces +1 added lines, -2 removed lines

@@ -21,8 +21,7 @@
 		if($absolute_url)
 		{
 			return getFullUrl('','vid',$vid, 'mid',$mid, 'act',$format);
-		}
-		else
+		} else
 		{
 			return getUrl('','vid',$vid, 'mid',$mid, 'act',$format);
 		}

modules/message/message.admin.view.php

Indentation +4 added lines, -4 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -30,10 +30,10 @@
 
 		// Get configurations (using module model object)
 		$config = $oModuleModel->getModuleConfig('message');
-		Context::set('config',$config);
+		Context::set('config', $config);
 
 		// Set a template file
-		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplatePath($this->module_path . 'tpl');
 
 		//Security
 		$security = new Security();

modules/message/message.class.php

Indentation +4 added lines, -4 removed lines

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

Spacing +4 added lines, -4 removed lines

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

Braces +3 added lines, -1 removed lines

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

modules/message/message.mobile.php

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
-require_once(_XE_PATH_.'modules/message/message.view.php');
+require_once(_XE_PATH_ . 'modules/message/message.view.php');
 class messageMobile extends messageView
 {
 	/**
@@ -18,8 +18,8 @@ 
 		// Get configurations (using module model object)
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('message');
-		if(!is_object($config)) $config = new stdClass;
-		if(!$config->mskin) $config->mskin = 'default';
+		if (!is_object($config)) $config = new stdClass;
+		if (!$config->mskin) $config->mskin = 'default';
 		// Set the template path
 		$template_path = sprintf('%sm.skins/%s', $this->module_path, $config->mskin);
 		// Get the member configuration
@@ -28,11 +28,11 @@ 
 		Context::set('member_config', $member_config);
 		// Set a flag to check if the https connection is made when using SSL and create https url 
 		$ssl_mode = false;
-		if($member_config->enable_ssl == 'Y')
+		if ($member_config->enable_ssl == 'Y')
 		{
-			if(strncasecmp('https://', Context::getRequestUri(), 8) === 0) $ssl_mode = true;
+			if (strncasecmp('https://', Context::getRequestUri(), 8) === 0) $ssl_mode = true;
 		}
-		Context::set('ssl_mode',$ssl_mode);
+		Context::set('ssl_mode', $ssl_mode);
 
 		Context::set('system_message', nl2br($this->getMessage()));
 

Braces +9 added lines, -3 removed lines

@@ -18,8 +18,12 @@ 
 		// Get configurations (using module model object)
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('message');
-		if(!is_object($config)) $config = new stdClass;
-		if(!$config->mskin) $config->mskin = 'default';
+		if(!is_object($config)) {
+			$config = new stdClass;
+		}
+		if(!$config->mskin) {
+			$config->mskin = 'default';
+		}
 		// Set the template path
 		$template_path = sprintf('%sm.skins/%s', $this->module_path, $config->mskin);
 		// Get the member configuration
@@ -30,7 +34,9 @@ 
 		$ssl_mode = false;
 		if($member_config->enable_ssl == 'Y')
 		{
-			if(strncasecmp('https://', Context::getRequestUri(), 8) === 0) $ssl_mode = true;
+			if(strncasecmp('https://', Context::getRequestUri(), 8) === 0) {
+				$ssl_mode = true;
+			}
 		}
 		Context::set('ssl_mode',$ssl_mode);
 

modules/message/message.view.php

Indentation +4 added lines, -4 removed lines

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

Spacing +5 added lines, -5 removed lines

@@ -23,12 +23,12 @@ 
 		$oModuleModel = getModel('module');
 		$this->module_config = $config = $oModuleModel->getModuleConfig('message', $this->module_info->site_srl);
 
-		if(!$config)
+		if (!$config)
 		{
 			$config = new stdClass();
 		}
 
-		if(!$config->skin)
+		if (!$config->skin)
 		{
 			$config->skin = 'xedition';
 			$template_path = sprintf('%sskins/%s', $this->module_path, $config->skin);
@@ -54,11 +54,11 @@ 
 		Context::set('member_config', $member_config);
 		// Set a flag to check if the https connection is made when using SSL and create https url
 		$ssl_mode = false;
-		if($member_config->enable_ssl == 'Y')
+		if ($member_config->enable_ssl == 'Y')
 		{
-			if(strncasecmp('https://', Context::getRequestUri(), 8) === 0) $ssl_mode = true;
+			if (strncasecmp('https://', Context::getRequestUri(), 8) === 0) $ssl_mode = true;
 		}
-		Context::set('ssl_mode',$ssl_mode);
+		Context::set('ssl_mode', $ssl_mode);
 
 		Context::set('system_message', nl2br($this->getMessage()));
 

Braces +5 added lines, -5 removed lines

@@ -32,16 +32,14 @@ 
 		{
 			$config->skin = 'xedition';
 			$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/message/', $config_parse[0]);
-			}
-			else
+			} else
 			{
 				$template_path = sprintf('%sskins/%s', $this->module_path, $config->skin);
 			}
@@ -56,7 +54,9 @@ 
 		$ssl_mode = false;
 		if($member_config->enable_ssl == 'Y')
 		{
-			if(strncasecmp('https://', Context::getRequestUri(), 8) === 0) $ssl_mode = true;
+			if(strncasecmp('https://', Context::getRequestUri(), 8) === 0) {
+				$ssl_mode = true;
+			}
 		}
 		Context::set('ssl_mode',$ssl_mode);
 

modules/module/module.admin.view.php

Indentation +4 added lines, -4 removed lines

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

Spacing +24 added lines, -24 removed lines

@@ -13,7 +13,7 @@ 
 	function init()
 	{
 		// Set the template path
-		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplatePath($this->module_path . 'tpl');
 	}
 
 	/**
@@ -35,9 +35,9 @@ 
 		$oAutoinstallModel = getModel('autoinstall');
 
 		$module_list = $oModuleModel->getModuleList();
-		if(is_array($module_list))
+		if (is_array($module_list))
 		{
-			foreach($module_list as $key => $val)
+			foreach ($module_list as $key => $val)
 			{
 				$module_list[$key]->delete_url = $oAutoinstallModel->getRemoveUrlByPath($val->path);
 
@@ -47,7 +47,7 @@ 
 				$module_list[$key]->need_autoinstall_update = $package[$packageSrl]->need_update;
 
 				// get easyinstall update url
-				if($module_list[$key]->need_autoinstall_update == 'Y')
+				if ($module_list[$key]->need_autoinstall_update == 'Y')
 				{
 					$module_list[$key]->update_url = $oAutoinstallModel->getUpdateUrlByPackageSrl($packageSrl);
 				}
@@ -58,9 +58,9 @@ 
 
 		$favoriteList = $output->get('favoriteList');
 		$favoriteModuleList = array();
-		if($favoriteList)
+		if ($favoriteList)
 		{
-			foreach($favoriteList as $favorite => $favorite_info)
+			foreach ($favoriteList as $favorite => $favorite_info)
 			{
 				$favoriteModuleList[] = $favorite_info->module;
 			}
@@ -110,9 +110,9 @@ 
 		//Security
 		$security = new Security();
 
-		if($module_category_srl)
+		if ($module_category_srl)
 		{
-			$selected_category  = $oModuleModel->getModuleCategory($module_category_srl);
+			$selected_category = $oModuleModel->getModuleCategory($module_category_srl);
 			Context::set('selected_category', $selected_category);
 
 			//Security
@@ -164,15 +164,15 @@ 
 	{
 		$module_srls = Context::get('module_srls');
 
-		$modules = explode(',',$module_srls);
-		if(!count($modules)) if(!$module_srls) return new Object(-1,'msg_invalid_request');
+		$modules = explode(',', $module_srls);
+		if (!count($modules)) if (!$module_srls) return new Object(-1, 'msg_invalid_request');
 
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($modules[0], $columnList);
 		// Get a skin list of the module
-		$skin_list = $oModuleModel->getSkins(_XE_PATH_ . 'modules/'.$module_info->module);
-		Context::set('skin_list',$skin_list);
+		$skin_list = $oModuleModel->getSkins(_XE_PATH_ . 'modules/' . $module_info->module);
+		Context::set('skin_list', $skin_list);
 		// Get a layout list
 		$oLayoutModel = getModel('layout');
 		$layout_list = $oLayoutModel->getLayoutList();
@@ -182,7 +182,7 @@ 
 		Context::set('module_category', $module_category);
 
 		$security = new Security();
-		$security->encodeHTML('layout_list..title','layout_list..layout');
+		$security->encodeHTML('layout_list..title', 'layout_list..layout');
 		$security->encodeHTML('skin_list....');
 		$security->encodeHTML('module_category...');
 
@@ -200,8 +200,8 @@ 
 	{
 		$module_srls = Context::get('module_srls');
 
-		$modules = explode(',',$module_srls);
-		if(!count($modules)) if(!$module_srls) return new Object(-1,'msg_invalid_request');
+		$modules = explode(',', $module_srls);
+		if (!count($modules)) if (!$module_srls) return new Object(-1, 'msg_invalid_request');
 		// pre-define variables because you can get contents from other module (call by reference)
 		$content = '';
 		// Call a trigger for additional settings
@@ -223,8 +223,8 @@ 
 	{
 		$module_srls = Context::get('module_srls');
 
-		$modules = explode(',',$module_srls);
-		if(!count($modules)) if(!$module_srls) return new Object(-1,'msg_invalid_request');
+		$modules = explode(',', $module_srls);
+		if (!count($modules)) if (!$module_srls) return new Object(-1, 'msg_invalid_request');
 
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'module', 'site_srl');
@@ -234,12 +234,12 @@ 
 		// Grant virtual permissions for access and manager
 		$grant_list->access->title = Context::getLang('grant_access');
 		$grant_list->access->default = 'guest';
-		if(count($source_grant_list))
+		if (count($source_grant_list))
 		{
-			foreach($source_grant_list as $key => $val)
+			foreach ($source_grant_list as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if (!$val->default) $val->default = 'guest';
+				if ($val->default == 'root') $val->default = 'manager';
 				$grant_list->{$key} = $val;
 			}
 		}
@@ -268,7 +268,7 @@ 
 		// Get the language file of the current site
 		$site_module_info = Context::get('site_module_info');
 		$args = new stdClass();
-		$args->site_srl = (int)$site_module_info->site_srl;
+		$args->site_srl = (int) $site_module_info->site_srl;
 		$args->langCode = Context::get('lang_type');
 		$args->page = Context::get('page'); // /< Page
 		$args->list_count = 30; // /< the number of posts to display on a single page
@@ -287,7 +287,7 @@ 
 		Context::set('lang_code_list', $output->data);
 		Context::set('page_navigation', $output->page_navigation);
 
-		if(Context::get('module') != 'admin')
+		if (Context::get('module') != 'admin')
 		{
 			$this->setLayoutPath('./common/tpl');
 			$this->setLayoutFile('popup_layout');
@@ -301,7 +301,7 @@ 
 		$oModuleModel = getModel('module');
 		$output = $oModuleModel->getModuleFileBoxList();
 		$page = Context::get('page');
-		$page = $page?$page:1;
+		$page = $page ? $page : 1;
 		Context::set('filebox_list', $output->data);
 		Context::set('page_navigation', $output->page_navigation);
 		Context::set('page', $page);

Braces +16 added lines, -7 removed lines

@@ -121,8 +121,7 @@ 
 			// Set a template file
 			$this->setTemplateFile('category_update_form');
 			// If not selected, display a list of categories
-		}
-		else
+		} else
 		{
 			$category_list = $oModuleModel->getModuleCategories();
 			Context::set('category_list', $category_list);
@@ -165,7 +164,9 @@ 
 		$module_srls = Context::get('module_srls');
 
 		$modules = explode(',',$module_srls);
-		if(!count($modules)) if(!$module_srls) return new Object(-1,'msg_invalid_request');
+		if(!count($modules)) {
+			if(!$module_srls) return new Object(-1,'msg_invalid_request');
+		}
 
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'module');
@@ -201,7 +202,9 @@ 
 		$module_srls = Context::get('module_srls');
 
 		$modules = explode(',',$module_srls);
-		if(!count($modules)) if(!$module_srls) return new Object(-1,'msg_invalid_request');
+		if(!count($modules)) {
+			if(!$module_srls) return new Object(-1,'msg_invalid_request');
+		}
 		// pre-define variables because you can get contents from other module (call by reference)
 		$content = '';
 		// Call a trigger for additional settings
@@ -224,7 +227,9 @@ 
 		$module_srls = Context::get('module_srls');
 
 		$modules = explode(',',$module_srls);
-		if(!count($modules)) if(!$module_srls) return new Object(-1,'msg_invalid_request');
+		if(!count($modules)) {
+			if(!$module_srls) return new Object(-1,'msg_invalid_request');
+		}
 
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'module', 'site_srl');
@@ -238,8 +243,12 @@ 
 		{
 			foreach($source_grant_list as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if(!$val->default) {
+					$val->default = 'guest';
+				}
+				if($val->default == 'root') {
+					$val->default = 'manager';
+				}
 				$grant_list->{$key} = $val;
 			}
 		}

modules/module/module.class.php

Indentation +4 added lines, -4 removed lines

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

Spacing +110 added lines, -110 removed lines

@@ -16,8 +16,8 @@ 
 		$oModuleController = getController('module');
 
 		$oDB = &DB::getInstance();
-		$oDB->addIndex("modules","idx_site_mid", array("site_srl","mid"), true);
-		$oDB->addIndex('sites','unique_domain',array('domain'),true);
+		$oDB->addIndex("modules", "idx_site_mid", array("site_srl", "mid"), true);
+		$oDB->addIndex('sites', 'unique_domain', array('domain'), true);
 		// Create a directory to use in the module module
 		FileHandler::makeDir('./files/cache/module_info');
 		FileHandler::makeDir('./files/cache/triggers');
@@ -27,21 +27,21 @@ 
 		$args = new stdClass;
 		$args->site_srl = 0;
 		$output = $oDB->executeQuery('module.getSite', $args);
-		if(!$output->data || !$output->data->index_module_srl)
+		if (!$output->data || !$output->data->index_module_srl)
 		{
 			$db_info = Context::getDBInfo();
 			$domain = Context::getDefaultUrl();
 			$url_info = parse_url($domain);
-			$domain = $url_info['host'].( (!empty($url_info['port'])&&$url_info['port']!=80)?':'.$url_info['port']:'').$url_info['path'];
+			$domain = $url_info['host'] . ((!empty($url_info['port']) && $url_info['port'] != 80) ? ':' . $url_info['port'] : '') . $url_info['path'];
 
 			$site_args = new stdClass;
 			$site_args->site_srl = 0;
-			$site_args->index_module_srl  = 0;
+			$site_args->index_module_srl = 0;
 			$site_args->domain = $domain;
 			$site_args->default_language = $db_info->lang_type;
 
 			$output = executeQuery('module.insertSite', $site_args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 
 		return new Object();
@@ -54,60 +54,60 @@ 
 	{
 		$oDB = &DB::getInstance();
 		// 2008. 10. 27 Add multi-index in the table, the module_part_config
-		if(!$oDB->isIndexExists("module_part_config","idx_module_part_config")) return true;
+		if (!$oDB->isIndexExists("module_part_config", "idx_module_part_config")) return true;
 		// 2008. 11. 13 Delete unique constraint on mid in modules. Add site_srl and then create unique index on site_srl and mid
-		if(!$oDB->isIndexExists('modules',"idx_site_mid")) return true;
+		if (!$oDB->isIndexExists('modules', "idx_site_mid")) return true;
 		// Move permissions/skin information of all modules to the table, grants.
-		if($oDB->isColumnExists('modules', 'grants')) return true;
+		if ($oDB->isColumnExists('modules', 'grants')) return true;
 		// Move permissions/skin information of all modules to the table, grants.
-		if(!$oDB->isColumnExists('sites', 'default_language')) return true;
+		if (!$oDB->isColumnExists('sites', 'default_language')) return true;
 		// Delete extra_vars* column
-		for($i=1;$i<=20;$i++)
+		for ($i = 1; $i <= 20; $i++)
 		{
-			if($oDB->isColumnExists("documents","extra_vars".$i)) return true;
+			if ($oDB->isColumnExists("documents", "extra_vars" . $i)) return true;
 		}
 		// Insert site information to the table, sites
 		$args = new stdClass();
 		$args->site_srl = 0;
 		$output = $oDB->executeQuery('module.getSite', $args);
-		if(!$output->data) return true;
+		if (!$output->data) return true;
 
 		// If domain index is defined on the table, sites
-		if($oDB->isIndexExists('sites', 'idx_domain')) return true;
-		if(!$oDB->isIndexExists('sites','unique_domain')) return true;
+		if ($oDB->isIndexExists('sites', 'idx_domain')) return true;
+		if (!$oDB->isIndexExists('sites', 'unique_domain')) return true;
 
-		if(!$oDB->isColumnExists("modules", "use_mobile")) return true;
-		if(!$oDB->isColumnExists("modules", "mlayout_srl")) return true;
-		if(!$oDB->isColumnExists("modules", "mcontent")) return true;
-		if(!$oDB->isColumnExists("modules", "mskin")) return true;
+		if (!$oDB->isColumnExists("modules", "use_mobile")) return true;
+		if (!$oDB->isColumnExists("modules", "mlayout_srl")) return true;
+		if (!$oDB->isColumnExists("modules", "mcontent")) return true;
+		if (!$oDB->isColumnExists("modules", "mskin")) return true;
 
 		// check fix skin
-		if(!$oDB->isColumnExists("modules", "is_skin_fix")) return true;
+		if (!$oDB->isColumnExists("modules", "is_skin_fix")) return true;
 
-		if(!$oDB->isColumnExists("module_config", "site_srl")) return true;
+		if (!$oDB->isColumnExists("module_config", "site_srl")) return true;
 
-		if(!is_dir('./files/ruleset')) return true;
+		if (!is_dir('./files/ruleset')) return true;
 
 		$args->skin = '.';
 		$output = executeQueryArray('module.getModuleSkinDotList', $args);
-		if($output->data && count($output->data) > 0)
+		if ($output->data && count($output->data) > 0)
 		{
-			foreach($output->data as $item)
+			foreach ($output->data as $item)
 			{
 				$skin_path = explode('.', $item->skin);
-				if(count($skin_path) != 2) continue;
-				if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/modules/%s', $skin_path[0], $skin_path[1]))) return true;
+				if (count($skin_path) != 2) continue;
+				if (is_dir(sprintf(_XE_PATH_ . 'themes/%s/modules/%s', $skin_path[0], $skin_path[1]))) return true;
 			}
 		}
 
 		// XE 1.7
 
 		// check fix mskin
-		if(!$oDB->isColumnExists("modules", "is_mskin_fix")) return true;
+		if (!$oDB->isColumnExists("modules", "is_mskin_fix")) return true;
 
 		$oModuleModel = getModel('module');
 		$moduleConfig = $oModuleModel->getModuleConfig('module');
-		if(!$moduleConfig->isUpdateFixedValue) return true;
+		if (!$moduleConfig->isUpdateFixedValue) return true;
 	}
 
 	/**
@@ -117,19 +117,19 @@ 
 	{
 		$oDB = &DB::getInstance();
 		// 2008. 10. 27 module_part_config Add a multi-index to the table and check all information of module_configg
-		if(!$oDB->isIndexExists("module_part_config","idx_module_part_config"))
+		if (!$oDB->isIndexExists("module_part_config", "idx_module_part_config"))
 		{
 			$oModuleModel = getModel('module');
 			$oModuleController = getController('module');
 			$modules = $oModuleModel->getModuleList();
-			foreach($modules as $key => $module_info)
+			foreach ($modules as $key => $module_info)
 			{
 				$module = $module_info->module;
-				if(!in_array($module, array('point','trackback','layout','rss','file','comment','editor'))) continue;
+				if (!in_array($module, array('point', 'trackback', 'layout', 'rss', 'file', 'comment', 'editor'))) continue;
 				$config = $oModuleModel->getModuleConfig($module);
 
 				$module_config = null;
-				switch($module)
+				switch ($module)
 				{
 					case 'point' :
 						$module_config = $config->module_point;
@@ -142,21 +142,21 @@ 
 					case 'editor' :
 						$module_config = $config->module_config;
 						unset($config->module_config);
-						if(is_array($module_config) && count($module_config))
+						if (is_array($module_config) && count($module_config))
 						{
-							foreach($module_config as $key => $val)
+							foreach ($module_config as $key => $val)
 							{
-								if(isset($module_config[$key]->module_srl)) unset($module_config[$key]->module_srl);
+								if (isset($module_config[$key]->module_srl)) unset($module_config[$key]->module_srl);
 							}
 						}
 						break;
 					case 'layout' :
 						$tmp = $config->header_script;
-						if(is_array($tmp) && count($tmp))
+						if (is_array($tmp) && count($tmp))
 						{
-							foreach($tmp as $k => $v)
+							foreach ($tmp as $k => $v)
 							{
-								if(!$v && !trim($v)) continue;
+								if (!$v && !trim($v)) continue;
 								$module_config[$k]->header_script = $v;
 							}
 						}
@@ -166,29 +166,29 @@ 
 
 				$oModuleController->insertModuleConfig($module, $config);
 
-				if(is_array($module_config) && count($module_config))
+				if (is_array($module_config) && count($module_config))
 				{
-					foreach($module_config as $module_srl => $module_part_config)
+					foreach ($module_config as $module_srl => $module_part_config)
 					{
-						$oModuleController->insertModulePartConfig($module,$module_srl,$module_part_config);
+						$oModuleController->insertModulePartConfig($module, $module_srl, $module_part_config);
 					}
 				}
 			}
-			$oDB->addIndex("module_part_config","idx_module_part_config", array("module","module_srl"));
+			$oDB->addIndex("module_part_config", "idx_module_part_config", array("module", "module_srl"));
 		}
 		// 2008. 11. 13 drop index(unique_mid). Add a column and index on site_srl and mid columns
-		if(!$oDB->isIndexExists('modules',"idx_site_mid"))
+		if (!$oDB->isIndexExists('modules', "idx_site_mid"))
 		{
-			$oDB->dropIndex("modules","unique_mid",true);
-			$oDB->addColumn('modules','site_srl','number',11,0,true);
-			$oDB->addIndex("modules","idx_site_mid", array("site_srl","mid"),true);
+			$oDB->dropIndex("modules", "unique_mid", true);
+			$oDB->addColumn('modules', 'site_srl', 'number', 11, 0, true);
+			$oDB->addIndex("modules", "idx_site_mid", array("site_srl", "mid"), true);
 		}
 		// document extra vars
-		if(!$oDB->isTableExists('document_extra_vars')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_vars.xml');
+		if (!$oDB->isTableExists('document_extra_vars')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_vars.xml');
 
-		if(!$oDB->isTableExists('document_extra_keys')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_keys.xml');
+		if (!$oDB->isTableExists('document_extra_keys')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_keys.xml');
 		// Move permission, skin info, extection info, admin ID of all modules to the table, grants
-		if($oDB->isColumnExists('modules', 'grants'))
+		if ($oDB->isColumnExists('modules', 'grants'))
 		{
 			$oModuleController = getController('module');
 			$oDocumentController = getController('document');
@@ -196,26 +196,26 @@ 
 			$lang_code = Context::getLangType();
 			// Get module_info of all modules
 			$output = executeQueryArray('module.getModuleInfos');
-			if(count($output->data))
+			if (count($output->data))
 			{
-				foreach($output->data as $module_info)
+				foreach ($output->data as $module_info)
 				{
 					// Separate information about permission granted to the module, extra vars, skin vars, super-admin's authority
 					$module_srl = trim($module_info->module_srl);
 					// grant an authority
 					$grants = unserialize($module_info->grants);
-					if($grants) $oModuleController->insertModuleGrants($module_srl, $grants);
+					if ($grants) $oModuleController->insertModuleGrants($module_srl, $grants);
 					// Insert skin vars
 					$skin_vars = unserialize($module_info->skin_vars);
-					if($skin_vars) $oModuleController->insertModuleSkinVars($module_srl, $skin_vars);
+					if ($skin_vars) $oModuleController->insertModuleSkinVars($module_srl, $skin_vars);
 					// Insert super admin's ID
 					$admin_id = trim($module_info->admin_id);
-					if($admin_id && $admin_id != 'Array')
+					if ($admin_id && $admin_id != 'Array')
 					{
-						$admin_ids = explode(',',$admin_id);
-						if(count($admin_id))
+						$admin_ids = explode(',', $admin_id);
+						if (count($admin_id))
 						{
-							foreach($admin_ids as $admin_id)
+							foreach ($admin_ids as $admin_id)
 							{
 								$oModuleController->insertAdminId($module_srl, $admin_id);
 							}
@@ -224,20 +224,20 @@ 
 					// Save extra configurations for each module(column data which doesn't exist in the defaut modules)
 					$extra_vars = unserialize($module_info->extra_vars);
 					$document_extra_keys = null;
-					if($extra_vars->extra_vars && count($extra_vars->extra_vars))
+					if ($extra_vars->extra_vars && count($extra_vars->extra_vars))
 					{
 						$document_extra_keys = $extra_vars->extra_vars;
 						unset($extra_vars->extra_vars);
 					}
-					if($extra_vars) $oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
+					if ($extra_vars) $oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
 
 					/**
 					 * Move document extra vars(it should have conducted in the documents module however extra vars in modules table should be listed up in this module)
 					 */
 					// Insert extra vars if planet module is
-					if($module_info->module == 'planet')
+					if ($module_info->module == 'planet')
 					{
-						if(!$document_extra_keys || !is_array($document_extra_keys)) $document_extra_keys = array();
+						if (!$document_extra_keys || !is_array($document_extra_keys)) $document_extra_keys = array();
 						$planet_extra_keys->name = 'postscript';
 						$planet_extra_keys->type = 'text';
 						$planet_extra_keys->is_required = 'N';
@@ -247,17 +247,17 @@ 
 						$document_extra_keys[20] = $planet_extra_keys;
 					}
 					// Register keys for document extra vars
-					if(count($document_extra_keys))
+					if (count($document_extra_keys))
 					{
-						foreach($document_extra_keys as $var_idx => $val)
+						foreach ($document_extra_keys as $var_idx => $val)
 						{
-							$oDocumentController->insertDocumentExtraKey($module_srl, $var_idx, $val->name, $val->type, $val->is_required, $val->search, $val->default, $val->desc, 'extra_vars'.$var_idx);
+							$oDocumentController->insertDocumentExtraKey($module_srl, $var_idx, $val->name, $val->type, $val->is_required, $val->search, $val->default, $val->desc, 'extra_vars' . $var_idx);
 						}
 						// 2009-04-14 Fixed a bug that only 100 extra vars are moved
 						$oDocumentModel = getModel('document');
 						$total_count = $oDocumentModel->getDocumentCount($module_srl);
 
-						if($total_count > 0)
+						if ($total_count > 0)
 						{
 							$per_page = 100;
 							$total_pages = (int) (($total_count - 1) / $per_page) + 1;
@@ -268,20 +268,20 @@ 
 							$doc_args->sort_index = 'list_order';
 							$doc_args->order_type = 'asc';
 
-							for($doc_args->page = 1; $doc_args->page <= $total_pages; $doc_args->page++)
+							for ($doc_args->page = 1; $doc_args->page <= $total_pages; $doc_args->page++)
 							{
 								$output = executeQueryArray('document.getDocumentList', $doc_args);
 
-								if($output->toBool() && $output->data && count($output->data))
+								if ($output->toBool() && $output->data && count($output->data))
 								{
 									foreach ($output->data as $document)
 									{
-										if(!$document) continue;
+										if (!$document) continue;
 										foreach ($document as $key => $var)
 										{
 											if (strpos($key, 'extra_vars') !== 0 || !trim($var) || $var == 'N;') continue;
-											$var_idx = str_replace('extra_vars','',$key);
-											$oDocumentController->insertDocumentExtraVar($module_srl, $document->document_srl, $var_idx, $var, 'extra_vars'.$var_idx, $lang_code);
+											$var_idx = str_replace('extra_vars', '', $key);
+											$oDocumentController->insertDocumentExtraVar($module_srl, $document->document_srl, $var_idx, $var, 'extra_vars' . $var_idx, $lang_code);
 										}
 									}
 								}
@@ -296,83 +296,83 @@ 
 					executeQuery('module.updateModule', $module_info);
 
 					$oCacheHandler = CacheHandler::getInstance('object', null, true);
-					if($oCacheHandler->isSupport())
+					if ($oCacheHandler->isSupport())
 					{
 						$oCacheHandler->invalidateGroupKey('site_and_module');
 					}
 				}
 			}
 			// Various column drop
-			$oDB->dropColumn('modules','grants');
-			$oDB->dropColumn('modules','admin_id');
-			$oDB->dropColumn('modules','skin_vars');
-			$oDB->dropColumn('modules','extra_vars');
+			$oDB->dropColumn('modules', 'grants');
+			$oDB->dropColumn('modules', 'admin_id');
+			$oDB->dropColumn('modules', 'skin_vars');
+			$oDB->dropColumn('modules', 'extra_vars');
 		}
 		// Rights of all modules/skins transferring the information into a table Update grants
-		if(!$oDB->isColumnExists('sites', 'default_language'))
+		if (!$oDB->isColumnExists('sites', 'default_language'))
 		{
-			$oDB->addColumn('sites','default_language','varchar',255,0,false);
+			$oDB->addColumn('sites', 'default_language', 'varchar', 255, 0, false);
 		}
 		// extra_vars * Remove Column
-		for($i=1;$i<=20;$i++)
+		for ($i = 1; $i <= 20; $i++)
 		{
-			if(!$oDB->isColumnExists("documents","extra_vars".$i)) continue;
-			$oDB->dropColumn('documents','extra_vars'.$i);
+			if (!$oDB->isColumnExists("documents", "extra_vars" . $i)) continue;
+			$oDB->dropColumn('documents', 'extra_vars' . $i);
 		}
 
 		// Enter the main site information sites on the table
 		$args = new stdClass;
 		$args->site_srl = 0;
 		$output = $oDB->executeQuery('module.getSite', $args);
-		if(!$output->data)
+		if (!$output->data)
 		{
 			// Basic mid, language Wanted
 			$mid_output = $oDB->executeQuery('module.getDefaultMidInfo', $args);
 			$db_info = Context::getDBInfo();
 			$domain = Context::getDefaultUrl();
 			$url_info = parse_url($domain);
-			$domain = $url_info['host'].( (!empty($url_info['port'])&&$url_info['port']!=80)?':'.$url_info['port']:'').$url_info['path'];
+			$domain = $url_info['host'] . ((!empty($url_info['port']) && $url_info['port'] != 80) ? ':' . $url_info['port'] : '') . $url_info['path'];
 			$site_args->site_srl = 0;
-			$site_args->index_module_srl  = $mid_output->data->module_srl;
+			$site_args->index_module_srl = $mid_output->data->module_srl;
 			$site_args->domain = $domain;
 			$site_args->default_language = $db_info->lang_type;
 
 			$output = executeQuery('module.insertSite', $site_args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 
-		if($oDB->isIndexExists('sites','idx_domain'))
+		if ($oDB->isIndexExists('sites', 'idx_domain'))
 		{
-			$oDB->dropIndex('sites','idx_domain');
+			$oDB->dropIndex('sites', 'idx_domain');
 		}
-		if(!$oDB->isIndexExists('sites','unique_domain'))
+		if (!$oDB->isIndexExists('sites', 'unique_domain'))
 		{
 			$this->updateForUniqueSiteDomain();
-			$oDB->addIndex('sites','unique_domain',array('domain'),true);
+			$oDB->addIndex('sites', 'unique_domain', array('domain'), true);
 		}
 
-		if(!$oDB->isColumnExists("modules", "use_mobile"))
+		if (!$oDB->isColumnExists("modules", "use_mobile"))
 		{
-			$oDB->addColumn('modules','use_mobile','char',1,'N');
+			$oDB->addColumn('modules', 'use_mobile', 'char', 1, 'N');
 		}
-		if(!$oDB->isColumnExists("modules", "mlayout_srl"))
+		if (!$oDB->isColumnExists("modules", "mlayout_srl"))
 		{
-			$oDB->addColumn('modules','mlayout_srl','number',11, 0);
+			$oDB->addColumn('modules', 'mlayout_srl', 'number', 11, 0);
 		}
-		if(!$oDB->isColumnExists("modules", "mcontent"))
+		if (!$oDB->isColumnExists("modules", "mcontent"))
 		{
-			$oDB->addColumn('modules','mcontent','bigtext');
+			$oDB->addColumn('modules', 'mcontent', 'bigtext');
 		}
-		if(!$oDB->isColumnExists("modules", "mskin"))
+		if (!$oDB->isColumnExists("modules", "mskin"))
 		{
-			$oDB->addColumn('modules','mskin','varchar',250);
+			$oDB->addColumn('modules', 'mskin', 'varchar', 250);
 		}
-		if(!$oDB->isColumnExists("modules", "is_skin_fix"))
+		if (!$oDB->isColumnExists("modules", "is_skin_fix"))
 		{
 			$oDB->addColumn('modules', 'is_skin_fix', 'char', 1, 'N');
 			$output = executeQuery('module.updateSkinFixModules');
 		}
-		if(!$oDB->isColumnExists("module_config", "site_srl"))
+		if (!$oDB->isColumnExists("module_config", "site_srl"))
 		{
 			$oDB->addColumn('module_config', 'site_srl', 'number', 11, 0, true);
 		}
@@ -380,13 +380,13 @@ 
 
 		$args->skin = '.';
 		$output = executeQueryArray('module.getModuleSkinDotList', $args);
-		if($output->data && count($output->data) > 0)
+		if ($output->data && count($output->data) > 0)
 		{
-			foreach($output->data as $item)
+			foreach ($output->data as $item)
 			{
 				$skin_path = explode('.', $item->skin);
-				if(count($skin_path) != 2) continue;
-				if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/modules/%s', $skin_path[0], $skin_path[1])))
+				if (count($skin_path) != 2) continue;
+				if (is_dir(sprintf(_XE_PATH_ . 'themes/%s/modules/%s', $skin_path[0], $skin_path[1])))
 				{
 					unset($args);
 					$args->skin = $item->skin;
@@ -397,7 +397,7 @@ 
 		}
 
 		// XE 1.7
-		if(!$oDB->isColumnExists("modules", "is_mskin_fix"))
+		if (!$oDB->isColumnExists("modules", "is_mskin_fix"))
 		{
 			$oDB->addColumn('modules', 'is_mskin_fix', 'char', 1, 'N');
 			$output = executeQuery('module.updateMobileSkinFixModules');
@@ -405,13 +405,13 @@ 
 
 		$oModuleModel = getModel('module');
 		$moduleConfig = $oModuleModel->getModuleConfig('module');
-		if(!$moduleConfig->isUpdateFixedValue)
+		if (!$moduleConfig->isUpdateFixedValue)
 		{
 			$output = executeQuery('module.updateSkinFixModules');
 			$output = executeQuery('module.updateMobileSkinFixModules');
 
 			$oModuleController = getController('module');
-			if(!$moduleConfig) $moduleConfig = new stdClass;
+			if (!$moduleConfig) $moduleConfig = new stdClass;
 			$moduleConfig->isUpdateFixedValue = TRUE;
 			$output = $oModuleController->updateModuleConfig('module', $moduleConfig);
 		}
@@ -422,18 +422,18 @@ 
 	function updateForUniqueSiteDomain()
 	{
 		$output = executeQueryArray("module.getNonuniqueDomains");
-		if(!$output->data) return;
-		foreach($output->data as $data)
+		if (!$output->data) return;
+		foreach ($output->data as $data)
 		{
-			if($data->count == 1) continue;
+			if ($data->count == 1) continue;
 			$domain = $data->domain;
 			$args = new stdClass;
 			$args->domain = $domain;
 			$output2 = executeQueryArray("module.getSiteByDomain", $args);
 			$bFirst = true;
-			foreach($output2->data as $site)
+			foreach ($output2->data as $site)
 			{
-				if($bFirst)
+				if ($bFirst)
 				{
 					$bFirst = false;
 					continue;

Braces +111 added lines, -37 removed lines

@@ -41,7 +41,9 @@ 
 			$site_args->default_language = $db_info->lang_type;
 
 			$output = executeQuery('module.insertSite', $site_args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 
 		return new Object();
@@ -54,39 +56,69 @@ 
 	{
 		$oDB = &DB::getInstance();
 		// 2008. 10. 27 Add multi-index in the table, the module_part_config
-		if(!$oDB->isIndexExists("module_part_config","idx_module_part_config")) return true;
+		if(!$oDB->isIndexExists("module_part_config","idx_module_part_config")) {
+			return true;
+		}
 		// 2008. 11. 13 Delete unique constraint on mid in modules. Add site_srl and then create unique index on site_srl and mid
-		if(!$oDB->isIndexExists('modules',"idx_site_mid")) return true;
+		if(!$oDB->isIndexExists('modules',"idx_site_mid")) {
+			return true;
+		}
 		// Move permissions/skin information of all modules to the table, grants.
-		if($oDB->isColumnExists('modules', 'grants')) return true;
+		if($oDB->isColumnExists('modules', 'grants')) {
+			return true;
+		}
 		// Move permissions/skin information of all modules to the table, grants.
-		if(!$oDB->isColumnExists('sites', 'default_language')) return true;
+		if(!$oDB->isColumnExists('sites', 'default_language')) {
+			return true;
+		}
 		// Delete extra_vars* column
 		for($i=1;$i<=20;$i++)
 		{
-			if($oDB->isColumnExists("documents","extra_vars".$i)) return true;
+			if($oDB->isColumnExists("documents","extra_vars".$i)) {
+				return true;
+			}
 		}
 		// Insert site information to the table, sites
 		$args = new stdClass();
 		$args->site_srl = 0;
 		$output = $oDB->executeQuery('module.getSite', $args);
-		if(!$output->data) return true;
+		if(!$output->data) {
+			return true;
+		}
 
 		// If domain index is defined on the table, sites
-		if($oDB->isIndexExists('sites', 'idx_domain')) return true;
-		if(!$oDB->isIndexExists('sites','unique_domain')) return true;
+		if($oDB->isIndexExists('sites', 'idx_domain')) {
+			return true;
+		}
+		if(!$oDB->isIndexExists('sites','unique_domain')) {
+			return true;
+		}
 
-		if(!$oDB->isColumnExists("modules", "use_mobile")) return true;
-		if(!$oDB->isColumnExists("modules", "mlayout_srl")) return true;
-		if(!$oDB->isColumnExists("modules", "mcontent")) return true;
-		if(!$oDB->isColumnExists("modules", "mskin")) return true;
+		if(!$oDB->isColumnExists("modules", "use_mobile")) {
+			return true;
+		}
+		if(!$oDB->isColumnExists("modules", "mlayout_srl")) {
+			return true;
+		}
+		if(!$oDB->isColumnExists("modules", "mcontent")) {
+			return true;
+		}
+		if(!$oDB->isColumnExists("modules", "mskin")) {
+			return true;
+		}
 
 		// check fix skin
-		if(!$oDB->isColumnExists("modules", "is_skin_fix")) return true;
+		if(!$oDB->isColumnExists("modules", "is_skin_fix")) {
+			return true;
+		}
 
-		if(!$oDB->isColumnExists("module_config", "site_srl")) return true;
+		if(!$oDB->isColumnExists("module_config", "site_srl")) {
+			return true;
+		}
 
-		if(!is_dir('./files/ruleset')) return true;
+		if(!is_dir('./files/ruleset')) {
+			return true;
+		}
 
 		$args->skin = '.';
 		$output = executeQueryArray('module.getModuleSkinDotList', $args);
@@ -95,19 +127,27 @@ 
 			foreach($output->data as $item)
 			{
 				$skin_path = explode('.', $item->skin);
-				if(count($skin_path) != 2) continue;
-				if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/modules/%s', $skin_path[0], $skin_path[1]))) return true;
+				if(count($skin_path) != 2) {
+					continue;
+				}
+				if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/modules/%s', $skin_path[0], $skin_path[1]))) {
+					return true;
+				}
 			}
 		}
 
 		// XE 1.7
 
 		// check fix mskin
-		if(!$oDB->isColumnExists("modules", "is_mskin_fix")) return true;
+		if(!$oDB->isColumnExists("modules", "is_mskin_fix")) {
+			return true;
+		}
 
 		$oModuleModel = getModel('module');
 		$moduleConfig = $oModuleModel->getModuleConfig('module');
-		if(!$moduleConfig->isUpdateFixedValue) return true;
+		if(!$moduleConfig->isUpdateFixedValue) {
+			return true;
+		}
 	}
 
 	/**
@@ -125,7 +165,9 @@ 
 			foreach($modules as $key => $module_info)
 			{
 				$module = $module_info->module;
-				if(!in_array($module, array('point','trackback','layout','rss','file','comment','editor'))) continue;
+				if(!in_array($module, array('point','trackback','layout','rss','file','comment','editor'))) {
+					continue;
+				}
 				$config = $oModuleModel->getModuleConfig($module);
 
 				$module_config = null;
@@ -146,7 +188,9 @@ 
 						{
 							foreach($module_config as $key => $val)
 							{
-								if(isset($module_config[$key]->module_srl)) unset($module_config[$key]->module_srl);
+								if(isset($module_config[$key]->module_srl)) {
+									unset($module_config[$key]->module_srl);
+								}
 							}
 						}
 						break;
@@ -156,7 +200,9 @@ 
 						{
 							foreach($tmp as $k => $v)
 							{
-								if(!$v && !trim($v)) continue;
+								if(!$v && !trim($v)) {
+									continue;
+								}
 								$module_config[$k]->header_script = $v;
 							}
 						}
@@ -184,9 +230,13 @@ 
 			$oDB->addIndex("modules","idx_site_mid", array("site_srl","mid"),true);
 		}
 		// document extra vars
-		if(!$oDB->isTableExists('document_extra_vars')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_vars.xml');
+		if(!$oDB->isTableExists('document_extra_vars')) {
+			$oDB->createTableByXmlFile('./modules/document/schemas/document_extra_vars.xml');
+		}
 
-		if(!$oDB->isTableExists('document_extra_keys')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_keys.xml');
+		if(!$oDB->isTableExists('document_extra_keys')) {
+			$oDB->createTableByXmlFile('./modules/document/schemas/document_extra_keys.xml');
+		}
 		// Move permission, skin info, extection info, admin ID of all modules to the table, grants
 		if($oDB->isColumnExists('modules', 'grants'))
 		{
@@ -204,10 +254,14 @@ 
 					$module_srl = trim($module_info->module_srl);
 					// grant an authority
 					$grants = unserialize($module_info->grants);
-					if($grants) $oModuleController->insertModuleGrants($module_srl, $grants);
+					if($grants) {
+						$oModuleController->insertModuleGrants($module_srl, $grants);
+					}
 					// Insert skin vars
 					$skin_vars = unserialize($module_info->skin_vars);
-					if($skin_vars) $oModuleController->insertModuleSkinVars($module_srl, $skin_vars);
+					if($skin_vars) {
+						$oModuleController->insertModuleSkinVars($module_srl, $skin_vars);
+					}
 					// Insert super admin's ID
 					$admin_id = trim($module_info->admin_id);
 					if($admin_id && $admin_id != 'Array')
@@ -229,7 +283,9 @@ 
 						$document_extra_keys = $extra_vars->extra_vars;
 						unset($extra_vars->extra_vars);
 					}
-					if($extra_vars) $oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
+					if($extra_vars) {
+						$oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
+					}
 
 					/**
 					 * Move document extra vars(it should have conducted in the documents module however extra vars in modules table should be listed up in this module)
@@ -237,7 +293,9 @@ 
 					// Insert extra vars if planet module is
 					if($module_info->module == 'planet')
 					{
-						if(!$document_extra_keys || !is_array($document_extra_keys)) $document_extra_keys = array();
+						if(!$document_extra_keys || !is_array($document_extra_keys)) {
+							$document_extra_keys = array();
+						}
 						$planet_extra_keys->name = 'postscript';
 						$planet_extra_keys->type = 'text';
 						$planet_extra_keys->is_required = 'N';
@@ -276,10 +334,14 @@ 
 								{
 									foreach ($output->data as $document)
 									{
-										if(!$document) continue;
+										if(!$document) {
+											continue;
+										}
 										foreach ($document as $key => $var)
 										{
-											if (strpos($key, 'extra_vars') !== 0 || !trim($var) || $var == 'N;') continue;
+											if (strpos($key, 'extra_vars') !== 0 || !trim($var) || $var == 'N;') {
+												continue;
+											}
 											$var_idx = str_replace('extra_vars','',$key);
 											$oDocumentController->insertDocumentExtraVar($module_srl, $document->document_srl, $var_idx, $var, 'extra_vars'.$var_idx, $lang_code);
 										}
@@ -316,7 +378,9 @@ 
 		// extra_vars * Remove Column
 		for($i=1;$i<=20;$i++)
 		{
-			if(!$oDB->isColumnExists("documents","extra_vars".$i)) continue;
+			if(!$oDB->isColumnExists("documents","extra_vars".$i)) {
+				continue;
+			}
 			$oDB->dropColumn('documents','extra_vars'.$i);
 		}
 
@@ -338,7 +402,9 @@ 
 			$site_args->default_language = $db_info->lang_type;
 
 			$output = executeQuery('module.insertSite', $site_args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 
 		if($oDB->isIndexExists('sites','idx_domain'))
@@ -385,7 +451,9 @@ 
 			foreach($output->data as $item)
 			{
 				$skin_path = explode('.', $item->skin);
-				if(count($skin_path) != 2) continue;
+				if(count($skin_path) != 2) {
+					continue;
+				}
 				if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/modules/%s', $skin_path[0], $skin_path[1])))
 				{
 					unset($args);
@@ -411,7 +479,9 @@ 
 			$output = executeQuery('module.updateMobileSkinFixModules');
 
 			$oModuleController = getController('module');
-			if(!$moduleConfig) $moduleConfig = new stdClass;
+			if(!$moduleConfig) {
+				$moduleConfig = new stdClass;
+			}
 			$moduleConfig->isUpdateFixedValue = TRUE;
 			$output = $oModuleController->updateModuleConfig('module', $moduleConfig);
 		}
@@ -422,10 +492,14 @@ 
 	function updateForUniqueSiteDomain()
 	{
 		$output = executeQueryArray("module.getNonuniqueDomains");
-		if(!$output->data) return;
+		if(!$output->data) {
+			return;
+		}
 		foreach($output->data as $data)
 		{
-			if($data->count == 1) continue;
+			if($data->count == 1) {
+				continue;
+			}
 			$domain = $data->domain;
 			$args = new stdClass;
 			$args->domain = $domain;

modules/module/module.mobile.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 {
 	function dispModuleChangeLang()
 	{
-		$this->setTemplatePath(sprintf("%stpl/",$this->module_path));
+		$this->setTemplatePath(sprintf("%stpl/", $this->module_path));
 		$this->setTemplateFile('lang.html');
 	}
 }