xpressengine / xe-core

modules/document/document.class.php

Spacing +93 added lines, -93 removed lines

@@ -17,7 +17,7 @@ 
 	 * Search option to use in admin page
 	 * @var array
 	 */
-	var $search_option = array('title','content','title_content','user_name',); // /< Search options
+	var $search_option = array('title', 'content', 'title_content', 'user_name',); // /< Search options
 	/**
 	 * Status list
 	 * @var array
@@ -34,22 +34,22 @@ 
 		$oModuleController = getController('module');
 
 		$oDB = &DB::getInstance();
-		$oDB->addIndex("documents","idx_module_list_order", array("module_srl","list_order"));
-		$oDB->addIndex("documents","idx_module_update_order", array("module_srl","update_order"));
-		$oDB->addIndex("documents","idx_module_readed_count", array("module_srl","readed_count"));
-		$oDB->addIndex("documents","idx_module_voted_count", array("module_srl","voted_count"));
-		$oDB->addIndex("documents","idx_module_notice", array("module_srl","is_notice"));
-		$oDB->addIndex("documents","idx_module_document_srl", array("module_srl","document_srl"));
-		$oDB->addIndex("documents","idx_module_blamed_count", array("module_srl","blamed_count"));
-		$oDB->addIndex("document_aliases", "idx_module_title", array("module_srl","alias_title"), true);
-		$oDB->addIndex("document_extra_vars", "unique_extra_vars", array("module_srl","document_srl","var_idx","lang_code"), true);
+		$oDB->addIndex("documents", "idx_module_list_order", array("module_srl", "list_order"));
+		$oDB->addIndex("documents", "idx_module_update_order", array("module_srl", "update_order"));
+		$oDB->addIndex("documents", "idx_module_readed_count", array("module_srl", "readed_count"));
+		$oDB->addIndex("documents", "idx_module_voted_count", array("module_srl", "voted_count"));
+		$oDB->addIndex("documents", "idx_module_notice", array("module_srl", "is_notice"));
+		$oDB->addIndex("documents", "idx_module_document_srl", array("module_srl", "document_srl"));
+		$oDB->addIndex("documents", "idx_module_blamed_count", array("module_srl", "blamed_count"));
+		$oDB->addIndex("document_aliases", "idx_module_title", array("module_srl", "alias_title"), true);
+		$oDB->addIndex("document_extra_vars", "unique_extra_vars", array("module_srl", "document_srl", "var_idx", "lang_code"), true);
 		// 2007. 10. 17 Add a trigger to delete all posts together when the module is deleted
 		$oModuleController->insertTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after');
 
 		// 2009. 01. 29 Added a trigger for additional setup
 		$oModuleController->insertTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before');
 
-		if(!is_dir('./files/cache/tmp'))
+		if (!is_dir('./files/cache/tmp'))
 		{
 			FileHandler::makeDir('./files/cache/tmp');
 		}
@@ -67,71 +67,71 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007. 7. 25: Add a column(notify_message) for notification
-			if(!$oDB->isColumnExists("documents","notify_message")) return true;
+			if (!$oDB->isColumnExists("documents", "notify_message")) return true;
 
 			// 2007. 8. 23: create a clustered index in the document table
-			if(!$oDB->isIndexExists("documents","idx_module_list_order")) return true;
-			if(!$oDB->isIndexExists("documents","idx_module_update_order")) return true;
-			if(!$oDB->isIndexExists("documents","idx_module_readed_count")) return true;
-			if(!$oDB->isIndexExists("documents","idx_module_voted_count")) return true;
+			if (!$oDB->isIndexExists("documents", "idx_module_list_order")) return true;
+			if (!$oDB->isIndexExists("documents", "idx_module_update_order")) return true;
+			if (!$oDB->isIndexExists("documents", "idx_module_readed_count")) return true;
+			if (!$oDB->isIndexExists("documents", "idx_module_voted_count")) return true;
 			// 2007. 10. 17 Add a trigger to delete all posts together when the module is deleted
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after')) return true;
+			if (!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after')) return true;
 			// 2007. 10. 25 add parent_srl, expand to the document category
-			if(!$oDB->isColumnExists("document_categories","parent_srl")) return true;
-			if(!$oDB->isColumnExists("document_categories","expand")) return true;
-			if(!$oDB->isColumnExists("document_categories","group_srls")) return true;
+			if (!$oDB->isColumnExists("document_categories", "parent_srl")) return true;
+			if (!$oDB->isColumnExists("document_categories", "expand")) return true;
+			if (!$oDB->isColumnExists("document_categories", "group_srls")) return true;
 			// 2007. 11. 20 create a composite index on the columns(module_srl + is_notice)
-			if(!$oDB->isIndexExists("documents","idx_module_notice")) return true;
+			if (!$oDB->isIndexExists("documents", "idx_module_notice")) return true;
 			// 2008. 02. 18 create a composite index on the columns(module_srl + document_srl) (checked by Manian))
-			if(!$oDB->isIndexExists("documents","idx_module_document_srl")) return true;
+			if (!$oDB->isIndexExists("documents", "idx_module_document_srl")) return true;
 
 			// 2007. 12. 03: Add if the colume(extra_vars) doesn't exist
-			if(!$oDB->isColumnExists("documents","extra_vars")) return true;
+			if (!$oDB->isColumnExists("documents", "extra_vars")) return true;
 			// 2008. 04. 23 Add a column(blamed_count)
-			if(!$oDB->isColumnExists("documents", "blamed_count")) return true;
-			if(!$oDB->isIndexExists("documents","idx_module_blamed_count")) return true;
-			if(!$oDB->isColumnExists("document_voted_log", "point")) return true;
+			if (!$oDB->isColumnExists("documents", "blamed_count")) return true;
+			if (!$oDB->isIndexExists("documents", "idx_module_blamed_count")) return true;
+			if (!$oDB->isColumnExists("document_voted_log", "point")) return true;
 			// 2008-12-15 Add a column(color)
-			if(!$oDB->isColumnExists("document_categories", "color")) return true;
+			if (!$oDB->isColumnExists("document_categories", "color")) return true;
 
 			/**
 			 * 2009. 01. 29: Add a column(lang_code) if not exist in the document_extra_vars table
 			 */
-			if(!$oDB->isColumnExists("document_extra_vars","lang_code")) return true;
+			if (!$oDB->isColumnExists("document_extra_vars", "lang_code")) return true;
 
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before')) return true;
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before')) return true;
 			// 2009. 03. 09 Add a column(lang_code) to the documnets table
-			if(!$oDB->isColumnExists("documents","lang_code")) return true;
+			if (!$oDB->isColumnExists("documents", "lang_code")) return true;
 			// 2009. 03. 11 check the index in the document_extra_vars table
-			if(!$oDB->isIndexExists("document_extra_vars", "unique_extra_vars")) return true;
+			if (!$oDB->isIndexExists("document_extra_vars", "unique_extra_vars")) return true;
 
 			// 2009. 03. 19: Add a column(eid) if not exist in the table
-			if(!$oDB->isColumnExists("document_extra_keys","eid")) return true;
-			if(!$oDB->isColumnExists("document_extra_vars","eid")) return true;
+			if (!$oDB->isColumnExists("document_extra_keys", "eid")) return true;
+			if (!$oDB->isColumnExists("document_extra_vars", "eid")) return true;
 
 			// 2011. 03. 30 Cubrid index Check the index in the document_extra_vars table
-			if(!$oDB->isIndexExists("document_extra_vars", "idx_document_list_order")) return true;
+			if (!$oDB->isIndexExists("document_extra_vars", "idx_document_list_order")) return true;
 
 			//2011. 04. 07 adding description column to document categories
-			if(!$oDB->isColumnExists("document_categories","description")) return true;
+			if (!$oDB->isColumnExists("document_categories", "description")) return true;
 
 			//2011. 05. 23 adding status column to document
-			if(!$oDB->isColumnExists('documents', 'status')) return true;
+			if (!$oDB->isColumnExists('documents', 'status')) return true;
 
 			//2011. 06. 07 check comment status update
-			if($oDB->isColumnExists('documents', 'allow_comment') || $oDB->isColumnExists('documents', 'lock_comment')) return true;
+			if ($oDB->isColumnExists('documents', 'allow_comment') || $oDB->isColumnExists('documents', 'lock_comment')) return true;
 
 			// 2011. 10. 25 status index check
-			if(!$oDB->isIndexExists("documents", "idx_module_status")) return true;
+			if (!$oDB->isIndexExists("documents", "idx_module_status")) return true;
 
 			// 2012. 02. 27 Add a trigger to copy extra keys when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after')) return true;
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after')) return true;
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModule', 'after')) return true;
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModule', 'after')) return true;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -149,101 +149,101 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007. 7. 25: Add a column(notify_message) for notification
-			if(!$oDB->isColumnExists("documents","notify_message"))
+			if (!$oDB->isColumnExists("documents", "notify_message"))
 			{
-				$oDB->addColumn('documents',"notify_message","char",1);
+				$oDB->addColumn('documents', "notify_message", "char", 1);
 			}
 
 			// 2007. 8. 23: create a clustered index in the document table
-			if(!$oDB->isIndexExists("documents","idx_module_list_order"))
+			if (!$oDB->isIndexExists("documents", "idx_module_list_order"))
 			{
-				$oDB->addIndex("documents","idx_module_list_order", array("module_srl","list_order"));
+				$oDB->addIndex("documents", "idx_module_list_order", array("module_srl", "list_order"));
 			}
 
-			if(!$oDB->isIndexExists("documents","idx_module_update_order"))
+			if (!$oDB->isIndexExists("documents", "idx_module_update_order"))
 			{
-				$oDB->addIndex("documents","idx_module_update_order", array("module_srl","update_order"));
+				$oDB->addIndex("documents", "idx_module_update_order", array("module_srl", "update_order"));
 			}
 
-			if(!$oDB->isIndexExists("documents","idx_module_readed_count"))
+			if (!$oDB->isIndexExists("documents", "idx_module_readed_count"))
 			{
-				$oDB->addIndex("documents","idx_module_readed_count", array("module_srl","readed_count"));
+				$oDB->addIndex("documents", "idx_module_readed_count", array("module_srl", "readed_count"));
 			}
 
-			if(!$oDB->isIndexExists("documents","idx_module_voted_count"))
+			if (!$oDB->isIndexExists("documents", "idx_module_voted_count"))
 			{
-				$oDB->addIndex("documents","idx_module_voted_count", array("module_srl","voted_count"));
+				$oDB->addIndex("documents", "idx_module_voted_count", array("module_srl", "voted_count"));
 			}
 			// 2007. 10. 17 Add a trigger to delete all posts together when the module is deleted
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after'))
+			if (!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after'))
 				$oModuleController->insertTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after');
 			// 2007. 10. 25 add columns(parent_srl, expand) 
-			if(!$oDB->isColumnExists("document_categories","parent_srl")) $oDB->addColumn('document_categories',"parent_srl","number",12,0);
-			if(!$oDB->isColumnExists("document_categories","expand")) $oDB->addColumn('document_categories',"expand","char",1,"N");
-			if(!$oDB->isColumnExists("document_categories","group_srls")) $oDB->addColumn('document_categories',"group_srls","text");
+			if (!$oDB->isColumnExists("document_categories", "parent_srl")) $oDB->addColumn('document_categories', "parent_srl", "number", 12, 0);
+			if (!$oDB->isColumnExists("document_categories", "expand")) $oDB->addColumn('document_categories', "expand", "char", 1, "N");
+			if (!$oDB->isColumnExists("document_categories", "group_srls")) $oDB->addColumn('document_categories', "group_srls", "text");
 			// 2007. 11. 20 create a composite index on the columns(module_srl + is_notice)
-			if(!$oDB->isIndexExists("documents","idx_module_notice")) $oDB->addIndex("documents","idx_module_notice", array("module_srl","is_notice"));
+			if (!$oDB->isIndexExists("documents", "idx_module_notice")) $oDB->addIndex("documents", "idx_module_notice", array("module_srl", "is_notice"));
 
 			// 2007. 12. 03: Add if the colume(extra_vars) doesn't exist
-			if(!$oDB->isColumnExists("documents","extra_vars")) $oDB->addColumn('documents','extra_vars','text');
+			if (!$oDB->isColumnExists("documents", "extra_vars")) $oDB->addColumn('documents', 'extra_vars', 'text');
 
 			// 2008. 02. 18 create a composite index on the columns(module_srl + document_srl) (checked by Manian))
-			if(!$oDB->isIndexExists("documents","idx_module_document_srl")) $oDB->addIndex("documents","idx_module_document_srl", array("module_srl","document_srl"));
+			if (!$oDB->isIndexExists("documents", "idx_module_document_srl")) $oDB->addIndex("documents", "idx_module_document_srl", array("module_srl", "document_srl"));
 			// 2008. 04. 23 Add a column(blamed count)
-			if(!$oDB->isColumnExists("documents", "blamed_count"))
+			if (!$oDB->isColumnExists("documents", "blamed_count"))
 			{
 				$oDB->addColumn('documents', 'blamed_count', 'number', 11, 0, true);
 				$oDB->addIndex('documents', 'idx_blamed_count', array('blamed_count'));
 			}
 
-			if(!$oDB->isIndexExists("documents","idx_module_blamed_count"))
+			if (!$oDB->isIndexExists("documents", "idx_module_blamed_count"))
 			{
 				$oDB->addIndex('documents', 'idx_module_blamed_count', array('module_srl', 'blamed_count'));
 			}
 
-			if(!$oDB->isColumnExists("document_voted_log", "point"))
+			if (!$oDB->isColumnExists("document_voted_log", "point"))
 				$oDB->addColumn('document_voted_log', 'point', 'number', 11, 0, true);
 
 
-			if(!$oDB->isColumnExists("document_categories","color")) $oDB->addColumn('document_categories',"color","char",7);
+			if (!$oDB->isColumnExists("document_categories", "color")) $oDB->addColumn('document_categories', "color", "char", 7);
 
 			// 2009. 01. 29: Add a column(lang_code) if not exist in the document_extra_vars table
-			if(!$oDB->isColumnExists("document_extra_vars","lang_code")) $oDB->addColumn('document_extra_vars',"lang_code","varchar",10);
+			if (!$oDB->isColumnExists("document_extra_vars", "lang_code")) $oDB->addColumn('document_extra_vars', "lang_code", "varchar", 10);
 
 			// 2009. 01. 29 Added a trigger for additional setup
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before'))
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before'))
 				$oModuleController->insertTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before');
 			// 2009. 03. 09 Add a column(lang_code) to the documnets table
-			if(!$oDB->isColumnExists("documents","lang_code"))
+			if (!$oDB->isColumnExists("documents", "lang_code"))
 			{
 				$db_info = Context::getDBInfo();
-				$oDB->addColumn('documents',"lang_code","varchar",10, $db_info->lang_code);
+				$oDB->addColumn('documents', "lang_code", "varchar", 10, $db_info->lang_code);
 				$obj->lang_code = $db_info->lang_type;
 				executeQuery('document.updateDocumentsLangCode', $obj);
 			}
 			// 2009. 03. 11 Check the index in the document_extra_vars table
-			if(!$oDB->isIndexExists("document_extra_vars", "unique_extra_vars"))
+			if (!$oDB->isIndexExists("document_extra_vars", "unique_extra_vars"))
 			{
-				$oDB->addIndex("document_extra_vars", "unique_extra_vars", array("module_srl","document_srl","var_idx","lang_code"), true);
+				$oDB->addIndex("document_extra_vars", "unique_extra_vars", array("module_srl", "document_srl", "var_idx", "lang_code"), true);
 			}
 
-			if($oDB->isIndexExists("document_extra_vars", "unique_module_vars"))
+			if ($oDB->isIndexExists("document_extra_vars", "unique_module_vars"))
 			{
 				$oDB->dropIndex("document_extra_vars", "unique_module_vars", true);
 			}
 
 			// 2009. 03. 19: Add a column(eid)
 			// 2009. 04. 12: Fixed the issue(#17922959) that changes another column values when adding eid column
-			if(!$oDB->isColumnExists("document_extra_keys","eid"))
+			if (!$oDB->isColumnExists("document_extra_keys", "eid"))
 			{
-				$oDB->addColumn("document_extra_keys","eid","varchar",40);
+				$oDB->addColumn("document_extra_keys", "eid", "varchar", 40);
 
 				$output = executeQuery('document.getGroupsExtraKeys', $obj);
-				if($output->toBool() && $output->data && count($output->data)) {
-					foreach($output->data as $extra_keys) {
+				if ($output->toBool() && $output->data && count($output->data)) {
+					foreach ($output->data as $extra_keys) {
 						$args->module_srl = $extra_keys->module_srl;
 						$args->var_idx = $extra_keys->idx;
 						$args->new_eid = "extra_vars".$extra_keys->idx;
@@ -252,14 +252,14 @@ 
 				}
 			}
 
-			if(!$oDB->isColumnExists("document_extra_vars","eid"))
+			if (!$oDB->isColumnExists("document_extra_vars", "eid"))
 			{
-				$oDB->addColumn("document_extra_vars","eid","varchar",40);
+				$oDB->addColumn("document_extra_vars", "eid", "varchar", 40);
 				$obj->var_idx = '-1,-2';
 				$output = executeQuery('document.getGroupsExtraVars', $obj);
-				if($output->toBool() && $output->data && count($output->data))
+				if ($output->toBool() && $output->data && count($output->data))
 				{
-					foreach($output->data as $extra_vars)
+					foreach ($output->data as $extra_vars)
 					{
 						$args->module_srl = $extra_vars->module_srl;
 						$args->var_idx = $extra_vars->idx;
@@ -270,16 +270,16 @@ 
 			}
 
 			// 2011. 03. 30 Cubrid index Check the index in the document_extra_vars table
-			if(!$oDB->isIndexExists("document_extra_vars", "idx_document_list_order"))
+			if (!$oDB->isIndexExists("document_extra_vars", "idx_document_list_order"))
 			{
-				$oDB->addIndex("document_extra_vars", "idx_document_list_order", array("document_srl","module_srl","var_idx"), false);
+				$oDB->addIndex("document_extra_vars", "idx_document_list_order", array("document_srl", "module_srl", "var_idx"), false);
 			}
 
 			//2011. 04. 07 adding description column to document categories
-			if(!$oDB->isColumnExists("document_categories","description")) $oDB->addColumn('document_categories',"description","varchar",200,0);
+			if (!$oDB->isColumnExists("document_categories", "description")) $oDB->addColumn('document_categories', "description", "varchar", 200, 0);
 
 			//2011. 05. 23 adding status column to document
-			if(!$oDB->isColumnExists('documents', 'status'))
+			if (!$oDB->isColumnExists('documents', 'status'))
 			{
 				$oDB->addColumn('documents', 'status', 'varchar', 20, 'PUBLIC');
 				$args->is_secret = 'Y';
@@ -287,11 +287,11 @@ 
 			}
 
 			// 2011. 09. 08 drop column document is_secret
-			if($oDB->isColumnExists('documents', 'status') && $oDB->isColumnExists('documents', 'is_secret'))
+			if ($oDB->isColumnExists('documents', 'status') && $oDB->isColumnExists('documents', 'is_secret'))
 				$oDB->dropColumn('documents', 'is_secret');
 
 			//2011. 06. 07 merge column, allow_comment and lock_comment
-			if($oDB->isColumnExists('documents', 'allow_comment') || $oDB->isColumnExists('documents', 'lock_comment'))
+			if ($oDB->isColumnExists('documents', 'allow_comment') || $oDB->isColumnExists('documents', 'lock_comment'))
 			{
 				$oDB->addColumn('documents', 'comment_status', 'varchar', 20, 'ALLOW');
 
@@ -313,23 +313,23 @@ 
 				$output = executeQuery('document.updateDocumentCommentStatus', $args);
 			}
 
-			if($oDB->isColumnExists('documents', 'allow_comment') && $oDB->isColumnExists('documents', 'comment_status'))
+			if ($oDB->isColumnExists('documents', 'allow_comment') && $oDB->isColumnExists('documents', 'comment_status'))
 				$oDB->dropColumn('documents', 'allow_comment');
 
-			if($oDB->isColumnExists('documents', 'lock_comment') && $oDB->isColumnExists('documents', 'comment_status'))
+			if ($oDB->isColumnExists('documents', 'lock_comment') && $oDB->isColumnExists('documents', 'comment_status'))
 				$oDB->dropColumn('documents', 'lock_comment');
 
-			if(!$oDB->isIndexExists("documents", "idx_module_status"))
-				$oDB->addIndex("documents", "idx_module_status", array("module_srl","status"));
+			if (!$oDB->isIndexExists("documents", "idx_module_status"))
+				$oDB->addIndex("documents", "idx_module_status", array("module_srl", "status"));
 
 			// 2012. 02. 27 Add a trigger to copy extra keys when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after'))
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after'))
 			{
 				$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after');
 			}
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModule', 'after'))
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModule', 'after'))
 			{
 				$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModule', 'after');
 			}
@@ -337,7 +337,7 @@ 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		return new Object(0,'success_updated');
+		return new Object(0, 'success_updated');
 	}
 
 	/**
@@ -346,7 +346,7 @@ 
 	 */
 	function recompileCache()
 	{
-		if(!is_dir('./files/cache/tmp'))
+		if (!is_dir('./files/cache/tmp'))
 		{
 			FileHandler::makeDir('./files/cache/tmp');
 		}
@@ -376,7 +376,7 @@ 
 	 */
 	function getConfigStatus($key)
 	{
-		if(array_key_exists(strtolower($key), $this->statusList)) return $this->statusList[$key];
+		if (array_key_exists(strtolower($key), $this->statusList)) return $this->statusList[$key];
 		else $this->getDefaultStatus();
 	}
 }

Braces +140 added lines, -54 removed lines

@@ -70,68 +70,126 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007. 7. 25: Add a column(notify_message) for notification
-			if(!$oDB->isColumnExists("documents","notify_message")) return true;
+			if(!$oDB->isColumnExists("documents","notify_message")) {
+				return true;
+			}
 
 			// 2007. 8. 23: create a clustered index in the document table
-			if(!$oDB->isIndexExists("documents","idx_module_list_order")) return true;
-			if(!$oDB->isIndexExists("documents","idx_module_update_order")) return true;
-			if(!$oDB->isIndexExists("documents","idx_module_readed_count")) return true;
-			if(!$oDB->isIndexExists("documents","idx_module_voted_count")) return true;
+			if(!$oDB->isIndexExists("documents","idx_module_list_order")) {
+				return true;
+			}
+			if(!$oDB->isIndexExists("documents","idx_module_update_order")) {
+				return true;
+			}
+			if(!$oDB->isIndexExists("documents","idx_module_readed_count")) {
+				return true;
+			}
+			if(!$oDB->isIndexExists("documents","idx_module_voted_count")) {
+				return true;
+			}
 			// 2007. 10. 17 Add a trigger to delete all posts together when the module is deleted
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after')) return true;
+			if(!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after')) {
+				return true;
+			}
 			// 2007. 10. 25 add parent_srl, expand to the document category
-			if(!$oDB->isColumnExists("document_categories","parent_srl")) return true;
-			if(!$oDB->isColumnExists("document_categories","expand")) return true;
-			if(!$oDB->isColumnExists("document_categories","group_srls")) return true;
+			if(!$oDB->isColumnExists("document_categories","parent_srl")) {
+				return true;
+			}
+			if(!$oDB->isColumnExists("document_categories","expand")) {
+				return true;
+			}
+			if(!$oDB->isColumnExists("document_categories","group_srls")) {
+				return true;
+			}
 			// 2007. 11. 20 create a composite index on the columns(module_srl + is_notice)
-			if(!$oDB->isIndexExists("documents","idx_module_notice")) return true;
+			if(!$oDB->isIndexExists("documents","idx_module_notice")) {
+				return true;
+			}
 			// 2008. 02. 18 create a composite index on the columns(module_srl + document_srl) (checked by Manian))
-			if(!$oDB->isIndexExists("documents","idx_module_document_srl")) return true;
+			if(!$oDB->isIndexExists("documents","idx_module_document_srl")) {
+				return true;
+			}
 
 			// 2007. 12. 03: Add if the colume(extra_vars) doesn't exist
-			if(!$oDB->isColumnExists("documents","extra_vars")) return true;
+			if(!$oDB->isColumnExists("documents","extra_vars")) {
+				return true;
+			}
 			// 2008. 04. 23 Add a column(blamed_count)
-			if(!$oDB->isColumnExists("documents", "blamed_count")) return true;
-			if(!$oDB->isIndexExists("documents","idx_module_blamed_count")) return true;
-			if(!$oDB->isColumnExists("document_voted_log", "point")) return true;
+			if(!$oDB->isColumnExists("documents", "blamed_count")) {
+				return true;
+			}
+			if(!$oDB->isIndexExists("documents","idx_module_blamed_count")) {
+				return true;
+			}
+			if(!$oDB->isColumnExists("document_voted_log", "point")) {
+				return true;
+			}
 			// 2008-12-15 Add a column(color)
-			if(!$oDB->isColumnExists("document_categories", "color")) return true;
+			if(!$oDB->isColumnExists("document_categories", "color")) {
+				return true;
+			}
 
 			/**
 			 * 2009. 01. 29: Add a column(lang_code) if not exist in the document_extra_vars table
 			 */
-			if(!$oDB->isColumnExists("document_extra_vars","lang_code")) return true;
+			if(!$oDB->isColumnExists("document_extra_vars","lang_code")) {
+				return true;
+			}
 
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before')) return true;
+			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before')) {
+				return true;
+			}
 			// 2009. 03. 09 Add a column(lang_code) to the documnets table
-			if(!$oDB->isColumnExists("documents","lang_code")) return true;
+			if(!$oDB->isColumnExists("documents","lang_code")) {
+				return true;
+			}
 			// 2009. 03. 11 check the index in the document_extra_vars table
-			if(!$oDB->isIndexExists("document_extra_vars", "unique_extra_vars")) return true;
+			if(!$oDB->isIndexExists("document_extra_vars", "unique_extra_vars")) {
+				return true;
+			}
 
 			// 2009. 03. 19: Add a column(eid) if not exist in the table
-			if(!$oDB->isColumnExists("document_extra_keys","eid")) return true;
-			if(!$oDB->isColumnExists("document_extra_vars","eid")) return true;
+			if(!$oDB->isColumnExists("document_extra_keys","eid")) {
+				return true;
+			}
+			if(!$oDB->isColumnExists("document_extra_vars","eid")) {
+				return true;
+			}
 
 			// 2011. 03. 30 Cubrid index Check the index in the document_extra_vars table
-			if(!$oDB->isIndexExists("document_extra_vars", "idx_document_list_order")) return true;
+			if(!$oDB->isIndexExists("document_extra_vars", "idx_document_list_order")) {
+				return true;
+			}
 
 			//2011. 04. 07 adding description column to document categories
-			if(!$oDB->isColumnExists("document_categories","description")) return true;
+			if(!$oDB->isColumnExists("document_categories","description")) {
+				return true;
+			}
 
 			//2011. 05. 23 adding status column to document
-			if(!$oDB->isColumnExists('documents', 'status')) return true;
+			if(!$oDB->isColumnExists('documents', 'status')) {
+				return true;
+			}
 
 			//2011. 06. 07 check comment status update
-			if($oDB->isColumnExists('documents', 'allow_comment') || $oDB->isColumnExists('documents', 'lock_comment')) return true;
+			if($oDB->isColumnExists('documents', 'allow_comment') || $oDB->isColumnExists('documents', 'lock_comment')) {
+				return true;
+			}
 
 			// 2011. 10. 25 status index check
-			if(!$oDB->isIndexExists("documents", "idx_module_status")) return true;
+			if(!$oDB->isIndexExists("documents", "idx_module_status")) {
+				return true;
+			}
 
 			// 2012. 02. 27 Add a trigger to copy extra keys when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after')) return true;
+			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after')) {
+				return true;
+			}
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModule', 'after')) return true;
+			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModule', 'after')) {
+				return true;
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -178,20 +236,33 @@ 
 				$oDB->addIndex("documents","idx_module_voted_count", array("module_srl","voted_count"));
 			}
 			// 2007. 10. 17 Add a trigger to delete all posts together when the module is deleted
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after'))
-				$oModuleController->insertTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after');
+			if(!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after')) {
+							$oModuleController->insertTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after');
+			}
 			// 2007. 10. 25 add columns(parent_srl, expand) 
-			if(!$oDB->isColumnExists("document_categories","parent_srl")) $oDB->addColumn('document_categories',"parent_srl","number",12,0);
-			if(!$oDB->isColumnExists("document_categories","expand")) $oDB->addColumn('document_categories',"expand","char",1,"N");
-			if(!$oDB->isColumnExists("document_categories","group_srls")) $oDB->addColumn('document_categories',"group_srls","text");
+			if(!$oDB->isColumnExists("document_categories","parent_srl")) {
+				$oDB->addColumn('document_categories',"parent_srl","number",12,0);
+			}
+			if(!$oDB->isColumnExists("document_categories","expand")) {
+				$oDB->addColumn('document_categories',"expand","char",1,"N");
+			}
+			if(!$oDB->isColumnExists("document_categories","group_srls")) {
+				$oDB->addColumn('document_categories',"group_srls","text");
+			}
 			// 2007. 11. 20 create a composite index on the columns(module_srl + is_notice)
-			if(!$oDB->isIndexExists("documents","idx_module_notice")) $oDB->addIndex("documents","idx_module_notice", array("module_srl","is_notice"));
+			if(!$oDB->isIndexExists("documents","idx_module_notice")) {
+				$oDB->addIndex("documents","idx_module_notice", array("module_srl","is_notice"));
+			}
 
 			// 2007. 12. 03: Add if the colume(extra_vars) doesn't exist
-			if(!$oDB->isColumnExists("documents","extra_vars")) $oDB->addColumn('documents','extra_vars','text');
+			if(!$oDB->isColumnExists("documents","extra_vars")) {
+				$oDB->addColumn('documents','extra_vars','text');
+			}
 
 			// 2008. 02. 18 create a composite index on the columns(module_srl + document_srl) (checked by Manian))
-			if(!$oDB->isIndexExists("documents","idx_module_document_srl")) $oDB->addIndex("documents","idx_module_document_srl", array("module_srl","document_srl"));
+			if(!$oDB->isIndexExists("documents","idx_module_document_srl")) {
+				$oDB->addIndex("documents","idx_module_document_srl", array("module_srl","document_srl"));
+			}
 			// 2008. 04. 23 Add a column(blamed count)
 			if(!$oDB->isColumnExists("documents", "blamed_count"))
 			{
@@ -204,18 +275,24 @@ 
 				$oDB->addIndex('documents', 'idx_module_blamed_count', array('module_srl', 'blamed_count'));
 			}
 
-			if(!$oDB->isColumnExists("document_voted_log", "point"))
-				$oDB->addColumn('document_voted_log', 'point', 'number', 11, 0, true);
+			if(!$oDB->isColumnExists("document_voted_log", "point")) {
+							$oDB->addColumn('document_voted_log', 'point', 'number', 11, 0, true);
+			}
 
 
-			if(!$oDB->isColumnExists("document_categories","color")) $oDB->addColumn('document_categories',"color","char",7);
+			if(!$oDB->isColumnExists("document_categories","color")) {
+				$oDB->addColumn('document_categories',"color","char",7);
+			}
 
 			// 2009. 01. 29: Add a column(lang_code) if not exist in the document_extra_vars table
-			if(!$oDB->isColumnExists("document_extra_vars","lang_code")) $oDB->addColumn('document_extra_vars',"lang_code","varchar",10);
+			if(!$oDB->isColumnExists("document_extra_vars","lang_code")) {
+				$oDB->addColumn('document_extra_vars',"lang_code","varchar",10);
+			}
 
 			// 2009. 01. 29 Added a trigger for additional setup
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before'))
-				$oModuleController->insertTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before');
+			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before')) {
+							$oModuleController->insertTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before');
+			}
 			// 2009. 03. 09 Add a column(lang_code) to the documnets table
 			if(!$oDB->isColumnExists("documents","lang_code"))
 			{
@@ -276,7 +353,9 @@ 
 			}
 
 			//2011. 04. 07 adding description column to document categories
-			if(!$oDB->isColumnExists("document_categories","description")) $oDB->addColumn('document_categories',"description","varchar",200,0);
+			if(!$oDB->isColumnExists("document_categories","description")) {
+				$oDB->addColumn('document_categories',"description","varchar",200,0);
+			}
 
 			//2011. 05. 23 adding status column to document
 			if(!$oDB->isColumnExists('documents', 'status'))
@@ -287,8 +366,9 @@ 
 			}
 
 			// 2011. 09. 08 drop column document is_secret
-			if($oDB->isColumnExists('documents', 'status') && $oDB->isColumnExists('documents', 'is_secret'))
-				$oDB->dropColumn('documents', 'is_secret');
+			if($oDB->isColumnExists('documents', 'status') && $oDB->isColumnExists('documents', 'is_secret')) {
+							$oDB->dropColumn('documents', 'is_secret');
+			}
 
 			//2011. 06. 07 merge column, allow_comment and lock_comment
 			if($oDB->isColumnExists('documents', 'allow_comment') || $oDB->isColumnExists('documents', 'lock_comment'))
@@ -313,14 +393,17 @@ 
 				$output = executeQuery('document.updateDocumentCommentStatus', $args);
 			}
 
-			if($oDB->isColumnExists('documents', 'allow_comment') && $oDB->isColumnExists('documents', 'comment_status'))
-				$oDB->dropColumn('documents', 'allow_comment');
+			if($oDB->isColumnExists('documents', 'allow_comment') && $oDB->isColumnExists('documents', 'comment_status')) {
+							$oDB->dropColumn('documents', 'allow_comment');
+			}
 
-			if($oDB->isColumnExists('documents', 'lock_comment') && $oDB->isColumnExists('documents', 'comment_status'))
-				$oDB->dropColumn('documents', 'lock_comment');
+			if($oDB->isColumnExists('documents', 'lock_comment') && $oDB->isColumnExists('documents', 'comment_status')) {
+							$oDB->dropColumn('documents', 'lock_comment');
+			}
 
-			if(!$oDB->isIndexExists("documents", "idx_module_status"))
-				$oDB->addIndex("documents", "idx_module_status", array("module_srl","status"));
+			if(!$oDB->isIndexExists("documents", "idx_module_status")) {
+							$oDB->addIndex("documents", "idx_module_status", array("module_srl","status"));
+			}
 
 			// 2012. 02. 27 Add a trigger to copy extra keys when the module is copied 
 			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after'))
@@ -376,8 +459,11 @@ 
 	 */
 	function getConfigStatus($key)
 	{
-		if(array_key_exists(strtolower($key), $this->statusList)) return $this->statusList[$key];
-		else $this->getDefaultStatus();
+		if(array_key_exists(strtolower($key), $this->statusList)) {
+			return $this->statusList[$key];
+		} else {
+			$this->getDefaultStatus();
+		}
 	}
 }
 /* End of file document.class.php */

modules/board/board.class.php

Spacing +14 added lines, -14 removed lines

@@ -9,7 +9,7 @@ 
 
 class board extends ModuleObject
 {
-	var $search_option = array('title_content','title','content','comment','user_name','nick_name','user_id','tag'); ///< 검색 옵션
+	var $search_option = array('title_content', 'title', 'content', 'comment', 'user_name', 'nick_name', 'user_id', 'tag'); ///< 검색 옵션
 
 	var $order_target = array('list_order', 'update_order', 'regdate', 'voted_count', 'blamed_count', 'readed_count', 'comment_count', 'title', 'nick_name', 'user_name', 'user_id'); // 정렬 옵션
 
@@ -25,14 +25,14 @@ 
 	 */
 	function board()
 	{
-		if(!Context::isInstalled()) return;
+		if (!Context::isInstalled()) return;
 
-		if(!Context::isExistsSSLAction('dispBoardWrite') && Context::getSslStatus() == 'optional')
+		if (!Context::isExistsSSLAction('dispBoardWrite') && Context::getSslStatus() == 'optional')
 		{
 			$ssl_actions = array('dispBoardWrite', 'dispBoardWriteComment', 'dispBoardReplyComment', 'dispBoardModifyComment', 'dispBoardDelete', 'dispBoardDeleteComment', 'procBoardInsertDocument', 'procBoardDeleteDocument', 'procBoardInsertComment', 'procBoardDeleteComment', 'procBoardVerificationPassword');
 			Context::addSSLActions($ssl_actions);
 		}
-		if(!Context::isExistsSSLAction('dispTempSavedList') && Context::getSslStatus() == 'optional')
+		if (!Context::isExistsSSLAction('dispTempSavedList') && Context::getSslStatus() == 'optional')
 		{
 			Context::addSSLAction('dispTempSavedList');
 		}
@@ -54,7 +54,7 @@ 
 		$args = new stdClass;
 		$args->site_srl = 0;
 		$output = executeQuery('module.getSite', $args);
-		if(!$output->data->index_module_srl)
+		if (!$output->data->index_module_srl)
 		{
 			$args->mid = 'board';
 			$args->module = 'board';
@@ -63,7 +63,7 @@ 
 			$args->site_srl = 0;
 			$output = $oModuleController->insertModule($args);
 
-			if($output->toBool())
+			if ($output->toBool())
 			{
 				$module_srl = $output->get('module_srl');
 
@@ -87,13 +87,13 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007. 10. 17 get the member menu trigger
-			if(!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after')) return true;
+			if (!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after')) return true;
 
 			// 2011. 09. 20 when add new menu in sitemap, custom menu add
-			if(!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after')) return true;
+			if (!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after')) return true;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -109,16 +109,16 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007. 10. 17  check the member menu trigger, if it is not existed then insert
-			if(!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after'))
+			if (!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after'))
 			{
 				$oModuleController->insertTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after');
 			}
 
 			// 2011. 09. 20 when add new menu in sitemap, custom menu add
-			if(!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after'))
+			if (!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after'))
 			{
 				$oModuleController->insertTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after');
 			}
@@ -131,12 +131,12 @@ 
 	function moduleUninstall()
 	{
 		$output = executeQueryArray("board.getAllBoard");
-		if(!$output->data) return new Object();
+		if (!$output->data) return new Object();
 		@set_time_limit(0);
 
 		$oModuleController = getController('module');
 
-		foreach($output->data as $board)
+		foreach ($output->data as $board)
 		{
 			$oModuleController->deleteModule($board->module_srl);
 		}

Braces +12 added lines, -4 removed lines

@@ -25,7 +25,9 @@ 
 	 */
 	function board()
 	{
-		if(!Context::isInstalled()) return;
+		if(!Context::isInstalled()) {
+			return;
+		}
 
 		if(!Context::isExistsSSLAction('dispBoardWrite') && Context::getSslStatus() == 'optional')
 		{
@@ -90,10 +92,14 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007. 10. 17 get the member menu trigger
-			if(!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after')) return true;
+			if(!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after')) {
+				return true;
+			}
 
 			// 2011. 09. 20 when add new menu in sitemap, custom menu add
-			if(!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after')) return true;
+			if(!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after')) {
+				return true;
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -131,7 +137,9 @@ 
 	function moduleUninstall()
 	{
 		$output = executeQueryArray("board.getAllBoard");
-		if(!$output->data) return new Object();
+		if(!$output->data) {
+			return new Object();
+		}
 		@set_time_limit(0);
 
 		$oModuleController = getController('module');

modules/counter/counter.class.php

Spacing +6 added lines, -6 removed lines

@@ -38,14 +38,14 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
-			if(!$oDB->isColumnExists('counter_log', 'site_srl'))
+			if (!$oDB->isColumnExists('counter_log', 'site_srl'))
 			{
 				return TRUE;
 			}
 
-			if(!$oDB->isIndexExists('counter_log', 'idx_site_counter_log'))
+			if (!$oDB->isIndexExists('counter_log', 'idx_site_counter_log'))
 			{
 				return TRUE;
 			}
@@ -69,14 +69,14 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
-			if(!$oDB->isColumnExists('counter_log', 'site_srl'))
+			if (!$oDB->isColumnExists('counter_log', 'site_srl'))
 			{
 				$oDB->addColumn('counter_log', 'site_srl', 'number', 11, 0, TRUE);
 			}
 
-			if(!$oDB->isIndexExists('counter_log', 'idx_site_counter_log'))
+			if (!$oDB->isIndexExists('counter_log', 'idx_site_counter_log'))
 			{
 				$oDB->addIndex('counter_log', 'idx_site_counter_log', array('site_srl', 'ipaddress'), FALSE);
 			}

modules/page/page.class.php

Spacing +14 added lines, -14 removed lines

@@ -26,13 +26,13 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			$output = executeQuery('page.pageTypeOpageCheck');
-			if($output->toBool() && $output->data) return true;
+			if ($output->toBool() && $output->data) return true;
 
 			$output = executeQuery('page.pageTypeNullCheck');
-			if($output->toBool() && $output->data) return true;
+			if ($output->toBool() && $output->data) return true;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -48,44 +48,44 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			$args = new stdClass;
 			// opage module instance update
 			$output = executeQueryArray('page.pageTypeOpageCheck');
-			if($output->toBool() && count($output->data) > 0)
+			if ($output->toBool() && count($output->data) > 0)
 			{
-				foreach($output->data as $val)
+				foreach ($output->data as $val)
 				{
 					$args->module_srl = $val->module_srl;
 					$args->name = 'page_type';
-					$args->value= 'OUTSIDE';
+					$args->value = 'OUTSIDE';
 					$in_out = executeQuery('page.insertPageType', $args);
 				}
 				$output = executeQuery('page.updateAllOpage');
-				if(!$output->toBool()) return $output;
+				if (!$output->toBool()) return $output;
 			}
 
 			// old page module instance update
 			$output = executeQueryArray('page.pageTypeNullCheck');
 			$skin_update_srls = array();
-			if($output->toBool() && $output->data)
+			if ($output->toBool() && $output->data)
 			{
-				foreach($output->data as $val)
+				foreach ($output->data as $val)
 				{
 					$args->module_srl = $val->module_srl;
 					$args->name = 'page_type';
-					$args->value= 'WIDGET';
+					$args->value = 'WIDGET';
 					$in_out = executeQuery('page.insertPageType', $args);
 
 					$skin_update_srls[] = $val->module_srl;
 				}
 			}
 
-			if(count($skin_update_srls)>0)
+			if (count($skin_update_srls) > 0)
 			{
 				$skin_args = new stdClass;
-				$skin_args->module_srls = implode(',',$skin_update_srls);
+				$skin_args->module_srls = implode(',', $skin_update_srls);
 				$skin_args->is_skin_fix = "Y";
 				$ouput = executeQuery('page.updateSkinFix', $skin_args);
 			}
@@ -93,7 +93,7 @@ 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		return new Object(0,'success_updated');
+		return new Object(0, 'success_updated');
 	}
 
 	/**

Braces +9 added lines, -3 removed lines

@@ -29,10 +29,14 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			$output = executeQuery('page.pageTypeOpageCheck');
-			if($output->toBool() && $output->data) return true;
+			if($output->toBool() && $output->data) {
+				return true;
+			}
 
 			$output = executeQuery('page.pageTypeNullCheck');
-			if($output->toBool() && $output->data) return true;
+			if($output->toBool() && $output->data) {
+				return true;
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -63,7 +67,9 @@ 
 					$in_out = executeQuery('page.insertPageType', $args);
 				}
 				$output = executeQuery('page.updateAllOpage');
-				if(!$output->toBool()) return $output;
+				if(!$output->toBool()) {
+					return $output;
+				}
 			}
 
 			// old page module instance update

modules/module/module.class.php

Spacing +111 added lines, -111 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();
@@ -56,66 +56,66 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 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;
 
 			$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;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		if(!is_dir('./files/ruleset')) return true;
+		if (!is_dir('./files/ruleset')) return true;
 
 		return false;
 	}
@@ -129,22 +129,22 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 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;
@@ -157,21 +157,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;
 								}
 							}
@@ -181,29 +181,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');
@@ -211,26 +211,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);
 								}
@@ -239,20 +239,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';
@@ -262,9 +262,9 @@ 
 							$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);
 							}
@@ -272,7 +272,7 @@ 
 							$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;
@@ -283,19 +283,19 @@ 
 								$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);
+												$var_idx = str_replace('extra_vars', '', $key);
 												$oDocumentController->insertDocumentExtraVar($module_srl, $document->document_srl, $var_idx, $var, 'extra_vars'.$var_idx, $lang_code);
 											}
 										}
@@ -311,96 +311,96 @@ 
 						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);
 			}
 
 			$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;
@@ -411,7 +411,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');
@@ -419,13 +419,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);
 			}
@@ -433,7 +433,7 @@ 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		if(!is_dir('./files/ruleset')) FileHandler::makeDir('./files/ruleset');
+		if (!is_dir('./files/ruleset')) FileHandler::makeDir('./files/ruleset');
 
 		return new Object(0, 'success_updated');
 	}
@@ -441,18 +441,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 +114 added lines, -38 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();
@@ -59,37 +61,65 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// 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;
+			}
 
 			$args->skin = '.';
 			$output = executeQueryArray('module.getModuleSkinDotList', $args);
@@ -98,24 +128,34 @@ 
 				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;
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		if(!is_dir('./files/ruleset')) return true;
+		if(!is_dir('./files/ruleset')) {
+			return true;
+		}
 
 		return false;
 	}
@@ -140,7 +180,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;
@@ -161,7 +203,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;
@@ -171,7 +215,9 @@ 
 							{
 								foreach($tmp as $k => $v)
 								{
-									if(!$v && !trim($v)) continue;
+									if(!$v && !trim($v)) {
+										continue;
+									}
 									$module_config[$k]->header_script = $v;
 								}
 							}
@@ -199,9 +245,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'))
 			{
@@ -219,10 +269,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')
@@ -244,7 +298,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)
@@ -252,7 +308,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';
@@ -291,10 +349,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);
 											}
@@ -331,7 +393,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);
 			}
 
@@ -353,7 +417,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'))
@@ -399,7 +465,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);
@@ -425,7 +493,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);
 			}
@@ -433,7 +503,9 @@ 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		if(!is_dir('./files/ruleset')) FileHandler::makeDir('./files/ruleset');
+		if(!is_dir('./files/ruleset')) {
+			FileHandler::makeDir('./files/ruleset');
+		}
 
 		return new Object(0, 'success_updated');
 	}
@@ -441,10 +513,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.controller.php

Spacing +161 added lines, -161 removed lines

@@ -29,7 +29,7 @@ 
 		$output = executeQuery('module.insertActionForward', $args);
 
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$cache_key = 'action_forward';
 			$oCacheHandler->delete($cache_key);
@@ -51,7 +51,7 @@ 
 		$output = executeQuery('module.deleteActionForward', $args);
 
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$cache_key = 'action_forward';
 			$oCacheHandler->delete($cache_key);
@@ -75,12 +75,12 @@ 
 		$args->called_position = $called_position;
 
 		$output = executeQuery('module.insertTrigger', $args);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			//remove from cache
 			$GLOBALS['__triggers__'] = NULL;
 			$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$cache_key = 'triggers';
 				$oCacheHandler->delete($cache_key);
@@ -104,12 +104,12 @@ 
 		$args->called_position = $called_position;
 
 		$output = executeQuery('module.deleteTrigger', $args);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			//remove from cache
 			$GLOBALS['__triggers__'] = NULL;
 			$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$cache_key = 'triggers';
 				$oCacheHandler->delete($cache_key);
@@ -129,12 +129,12 @@ 
 		$args->module = $module;
 
 		$output = executeQuery('module.deleteModuleTriggers', $args);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			//remove from cache
 			$GLOBALS['__triggers__'] = NULL;
 			$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$cache_key = 'triggers';
 				$oCacheHandler->delete($cache_key);
@@ -148,11 +148,11 @@ 
 	 * @brief Add module extend
 	 *
 	 */
-	function insertModuleExtend($parent_module, $extend_module, $type, $kind='')
+	function insertModuleExtend($parent_module, $extend_module, $type, $kind = '')
 	{
-		if($kind != 'admin') $kind = '';
-		if(!in_array($type,array('model','controller','view','api','mobile'))) return false;
-		if(in_array($parent_module, array('module','addon','widget','layout'))) return false;
+		if ($kind != 'admin') $kind = '';
+		if (!in_array($type, array('model', 'controller', 'view', 'api', 'mobile'))) return false;
+		if (in_array($parent_module, array('module', 'addon', 'widget', 'layout'))) return false;
 
 		$cache_file = './files/config/module_extend.php';
 		FileHandler::removeFile($cache_file);
@@ -164,7 +164,7 @@ 
 		$args->kind = $kind;
 
 		$output = executeQuery('module.getModuleExtendCount', $args);
-		if($output->data->count>0) return false;
+		if ($output->data->count > 0) return false;
 
 		$output = executeQuery('module.insertModuleExtend', $args);
 		return $output;
@@ -174,7 +174,7 @@ 
 	 * @brief Delete module extend
 	 *
 	 */
-	function deleteModuleExtend($parent_module, $extend_module, $type, $kind='')
+	function deleteModuleExtend($parent_module, $extend_module, $type, $kind = '')
 	{
 		$cache_file = './files/config/module_extend.php';
 		FileHandler::removeFile($cache_file);
@@ -199,9 +199,9 @@ 
 		$oModuleModel = getModel('module');
 		$origin_config = $oModuleModel->getModuleConfig($module, $site_srl);
 
-		if(!$origin_config) $origin_config = new stdClass;
+		if (!$origin_config) $origin_config = new stdClass;
 
-		foreach($config as $key => $val)
+		foreach ($config as $key => $val)
 		{
 			$origin_config->{$key} = $val;
 		}
@@ -215,19 +215,19 @@ 
 	 */
 	function insertModuleConfig($module, $config, $site_srl = 0)
 	{
-		$args =new stdClass();
+		$args = new stdClass();
 		$args->module = $module;
 		$args->config = serialize($config);
 		$args->site_srl = $site_srl;
 
 		$output = executeQuery('module.deleteModuleConfig', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output = executeQuery('module.insertModuleConfig', $args);
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -246,13 +246,13 @@ 
 		$args->config = serialize($config);
 
 		$output = executeQuery('module.deleteModulePartConfig', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output = executeQuery('module.insertModulePartConfig', $args);
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -265,10 +265,10 @@ 
 	 */
 	function insertSite($domain, $index_module_srl)
 	{
-		if(isSiteID($domain))
+		if (isSiteID($domain))
 		{
 			$oModuleModel = getModel('module');
-			if($oModuleModel->isIDExists($domain, 0)) return new Object(-1,'msg_already_registed_vid');
+			if ($oModuleModel->isIDExists($domain, 0)) return new Object(-1, 'msg_already_registed_vid');
 		}
 		else
 		{
@@ -284,10 +284,10 @@ 
 		$columnList = array('modules.site_srl');
 		$oModuleModel = getModel('module');
 		$output = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList);
-		if($output) return new Object(-1,'msg_already_registed_vid');
+		if ($output) return new Object(-1, 'msg_already_registed_vid');
 
 		$output = executeQuery('module.insertSite', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output->add('site_srl', $args->site_srl);
 		return $output;
@@ -302,32 +302,32 @@ 
 		$columnList = array('sites.site_srl', 'sites.domain');
 		$site_info = $oModuleModel->getSiteInfo($args->site_srl, $columnList);
 
-		if(!$args->domain && $site_info->site_srl == $args->site_srl)
+		if (!$args->domain && $site_info->site_srl == $args->site_srl)
 		{
 			$args->domain = $site_info->domain;
 		}
 
-		if($site_info->domain != $args->domain)
+		if ($site_info->domain != $args->domain)
 		{
 			$info = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList);
-			if($info->site_srl && $info->site_srl != $args->site_srl) return new Object(-1,'msg_already_registed_domain');
-			if(isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) return new Object(-1,'msg_already_registed_vid');
+			if ($info->site_srl && $info->site_srl != $args->site_srl) return new Object(-1, 'msg_already_registed_domain');
+			if (isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) return new Object(-1, 'msg_already_registed_vid');
 
-			if($args->domain && !isSiteID($args->domain))
+			if ($args->domain && !isSiteID($args->domain))
 			{
 				$args->domain = (strlen($args->domain) >= 1 && substr_compare($args->domain, '/', -1) === 0) ? substr($args->domain, 0, -1) : $args->domain;
 			}
 		}
 		$output = executeQuery('module.updateSite', $args);
 		//clear cache for default mid
-		if($args->site_srl == 0) $vid='';
-		else $vid=$args->domain;
+		if ($args->site_srl == 0) $vid = '';
+		else $vid = $args->domain;
 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->index_module_srl);
 		$mid = $module_info->mid;
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -345,7 +345,7 @@ 
 		unset($args->act);
 		unset($args->page);
 		// Test mid value
-		if(!preg_match("/^[a-z][a-z0-9_]+$/i", $args->mid)) return new Object(-1, 'msg_limit_mid');
+		if (!preg_match("/^[a-z][a-z0-9_]+$/i", $args->mid)) return new Object(-1, 'msg_limit_mid');
 		// Test variables (separate basic vars and other vars in modules)
 		$extra_vars = clone($args);
 		unset($extra_vars->module_srl);
@@ -379,7 +379,7 @@ 
 	 */
 	function insertModule($args)
 	{
-		if(isset($args->isMenuCreate))
+		if (isset($args->isMenuCreate))
 		{
 			$isMenuCreate = $args->isMenuCreate;
 		}
@@ -389,11 +389,11 @@ 
 		}
 
 		$output = $this->arrangeModuleInfo($args, $extra_vars);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check whether the module name already exists
-		if(!$args->site_srl) $args->site_srl = 0;
+		if (!$args->site_srl) $args->site_srl = 0;
 		$oModuleModel = getModel('module');
-		if($oModuleModel->isIDExists($args->mid, $args->site_srl)) return new Object(-1, 'msg_module_name_exists');
+		if ($oModuleModel->isIDExists($args->mid, $args->site_srl)) return new Object(-1, 'msg_module_name_exists');
 
 		// begin transaction
 		$oDB = &DB::getInstance();
@@ -404,16 +404,16 @@ 
 		$skin_vars = new stdClass();
 		$skin_vars->colorset = $skin_info->colorset[0]->name;
 		// Arrange variables and then execute a query
-		if(!$args->module_srl) $args->module_srl = getNextSequence();
+		if (!$args->module_srl) $args->module_srl = getNextSequence();
 
 		// default value
-		if($args->skin == '/USE_DEFAULT/')
+		if ($args->skin == '/USE_DEFAULT/')
 		{
 			$args->is_skin_fix = 'N';
 		}
 		else
 		{
-			if(isset($args->is_skin_fix))
+			if (isset($args->is_skin_fix))
 			{
 				$args->is_skin_fix = ($args->is_skin_fix != 'Y') ? 'N' : 'Y';
 			}
@@ -423,13 +423,13 @@ 
 			}
 		}
 
-		if($args->mskin == '/USE_DEFAULT/')
+		if ($args->mskin == '/USE_DEFAULT/')
 		{
 			$args->is_mskin_fix = 'N';
 		}
 		else
 		{
-			if(isset($args->is_mskin_fix))
+			if (isset($args->is_mskin_fix))
 			{
 				$args->is_mskin_fix = ($args->is_mskin_fix != 'Y') ? 'N' : 'Y';
 			}
@@ -443,14 +443,14 @@ 
 
 		$args->browser_title = strip_tags($args->browser_title);
 
-		if($isMenuCreate == TRUE)
+		if ($isMenuCreate == TRUE)
 		{
 			$menuArgs = new stdClass;
 			$menuArgs->menu_srl = $args->menu_srl;
 			$menuOutput = executeQuery('menu.getMenu', $menuArgs);
 
 			// if menu is not created, create menu also. and does not supported that in virtual site.
-			if(!$menuOutput->data && !$args->site_srl)
+			if (!$menuOutput->data && !$args->site_srl)
 			{
 				$oMenuAdminModel = getAdminModel('menu');
 
@@ -468,7 +468,7 @@ 
 				$menuArgs->listorder = $args->menu_item_srl * -1;
 
 				$menuItemOutput = executeQuery('menu.insertMenuItem', $menuArgs);
-				if(!$menuItemOutput->toBool())
+				if (!$menuItemOutput->toBool())
 				{
 					$oDB->rollback();
 					return $menuItemOutput;
@@ -481,7 +481,7 @@ 
 		// Insert a module
 		$args->menu_srl = $menuArgs->menu_srl;
 		$output = executeQuery('module.insertModule', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -493,12 +493,12 @@ 
 		$oDB->commit();
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
 
-		$output->add('module_srl',$args->module_srl);
+		$output->add('module_srl', $args->module_srl);
 		return $output;
 	}
 
@@ -508,7 +508,7 @@ 
 	function updateModule($args)
 	{
 		$output = $this->arrangeModuleInfo($args, $extra_vars);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// begin transaction
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -517,29 +517,29 @@ 
 		$columnList = array('module_srl', 'site_srl', 'browser_title', 'mid');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
 
-		if(!$args->site_srl || !$args->browser_title)
+		if (!$args->site_srl || !$args->browser_title)
 		{
-			if(!$args->site_srl) $args->site_srl = (int)$module_info->site_srl;
-			if(!$args->browser_title) $args->browser_title = $module_info->browser_title;
+			if (!$args->site_srl) $args->site_srl = (int) $module_info->site_srl;
+			if (!$args->browser_title) $args->browser_title = $module_info->browser_title;
 		}
 
 		$args->browser_title = strip_tags($args->browser_title);
 
 		$output = executeQuery('module.isExistsModuleName', $args);
-		if(!$output->toBool() || $output->data->count)
+		if (!$output->toBool() || $output->data->count)
 		{
 			$oDB->rollback();
 			return new Object(-1, 'msg_module_name_exists');
 		}
 
 		// default value
-		if($args->skin == '/USE_DEFAULT/')
+		if ($args->skin == '/USE_DEFAULT/')
 		{
 			$args->is_skin_fix = 'N';
 		}
 		else
 		{
-			if(isset($args->is_skin_fix))
+			if (isset($args->is_skin_fix))
 			{
 				$args->is_skin_fix = ($args->is_skin_fix != 'Y') ? 'N' : 'Y';
 			}
@@ -549,13 +549,13 @@ 
 			}
 		}
 
-		if($args->mskin == '/USE_DEFAULT/')
+		if ($args->mskin == '/USE_DEFAULT/')
 		{
 			$args->is_mskin_fix = 'N';
 		}
 		else
 		{
-			if(isset($args->is_mskin_fix))
+			if (isset($args->is_mskin_fix))
 			{
 				$args->is_mskin_fix = ($args->is_mskin_fix != 'Y') ? 'N' : 'Y';
 			}
@@ -565,7 +565,7 @@ 
 			}
 		}
 		$output = executeQuery('module.updateModule', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -575,15 +575,15 @@ 
 		$menuArgs->url = $module_info->mid;
 		$menuArgs->site_srl = $module_info->site_srl;
 		$menuOutput = executeQueryArray('menu.getMenuItemByUrl', $menuArgs);
-		if($menuOutput->data && count($menuOutput->data))
+		if ($menuOutput->data && count($menuOutput->data))
 		{
 			$oMenuAdminController = getAdminController('menu');
-			foreach($menuOutput->data as $itemInfo)
+			foreach ($menuOutput->data as $itemInfo)
 			{
 				$itemInfo->url = $args->mid;
 
 				$updateMenuItemOutput = $oMenuAdminController->updateMenuItem($itemInfo);
-				if(!$updateMenuItemOutput->toBool())
+				if (!$updateMenuItemOutput->toBool())
 				{
 					$oDB->rollback();
 					return $updateMenuItemOutput;
@@ -592,7 +592,7 @@ 
 		}
 
 		// if mid changed, change mid of success_return_url to new mid
-		if($module_info->mid != $args->mid && Context::get('success_return_url'))
+		if ($module_info->mid != $args->mid && Context::get('success_return_url'))
 		{
 			changeValueInUrl('mid', $args->mid, $module_info->mid);
 		}
@@ -602,11 +602,11 @@ 
 
 		$oDB->commit();
 
-		$output->add('module_srl',$args->module_srl);
+		$output->add('module_srl', $args->module_srl);
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -625,7 +625,7 @@ 
 		$args->update_id = $update_id;
 		$output = executeQuery('module.insertModuleUpdateLog', $args);
 
-		if(!!$output->error) return false;
+		if (!!$output->error) return false;
 
 		return true;
 	}
@@ -640,11 +640,11 @@ 
 		$args->site_srl = $site_srl;
 		$args->layout_srl = $layout_srl;
 		$output = executeQuery('module.updateModuleSite', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -659,7 +659,7 @@ 
 	 */
 	function deleteModule($module_srl, $site_srl = 0)
 	{
-		if(!$module_srl) return new Object(-1,'msg_invalid_request');
+		if (!$module_srl) return new Object(-1, 'msg_invalid_request');
 
 		$site_module_info = Context::get('site_module_info');
 
@@ -669,7 +669,7 @@ 
 		$args = new stdClass();
 		$args->url = $output->mid;
 		$args->is_shortcut = 'N';
-		if(!$site_srl) $args->site_srl = $site_module_info->site_srl;
+		if (!$site_srl) $args->site_srl = $site_module_info->site_srl;
 		else $args->site_srl = $site_srl;
 
 		unset($output);
@@ -678,9 +678,9 @@ 
 		$menuOutput = $oMenuAdminModel->getMenuList($args);
 
 		// get menu_srl by site_srl
-		if(is_array($menuOutput->data))
+		if (is_array($menuOutput->data))
 		{
-			foreach($menuOutput->data AS $key=>$value)
+			foreach ($menuOutput->data AS $key=>$value)
 			{
 				$args->menu_srl = $value->menu_srl;
 				break;
@@ -689,7 +689,7 @@ 
 
 		$output = executeQuery('menu.getMenuItemByUrl', $args);
 		// menu delete
-		if($output->data)
+		if ($output->data)
 		{
 			unset($args);
 			$args = new stdClass;
@@ -700,7 +700,7 @@ 
 			$oMenuAdminController = getAdminController('menu');
 			$output = $oMenuAdminController->deleteItem($args);
 
-			if($output->isSuccess)
+			if ($output->isSuccess)
 			{
 				return new Object(0, 'success_deleted');
 			}
@@ -722,19 +722,19 @@ 
 	 */
 	public function onlyDeleteModule($module_srl)
 	{
-		if(!$module_srl) return new Object(-1,'msg_invalid_request');
+		if (!$module_srl) return new Object(-1, 'msg_invalid_request');
 
 		// check start module
 		$oModuleModel = getModel('module');
 		$columnList = array('sites.index_module_srl');
 		$start_module = $oModuleModel->getSiteInfo(0, $columnList);
-		if($module_srl == $start_module->index_module_srl) return new Object(-1, 'msg_cannot_delete_startmodule');
+		if ($module_srl == $start_module->index_module_srl) return new Object(-1, 'msg_cannot_delete_startmodule');
 
 		// Call a trigger (before)
 		$trigger_obj = new stdClass();
 		$trigger_obj->module_srl = $module_srl;
 		$output = ModuleHandler::triggerCall('module.deleteModule', 'before', $trigger_obj);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// begin transaction
 		$oDB = &DB::getInstance();
@@ -744,7 +744,7 @@ 
 		$args->module_srl = $module_srl;
 		// Delete module information from the DB
 		$output = executeQuery('module.deleteModule', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -758,10 +758,10 @@ 
 		// Remove the module manager
 		$this->deleteAdminId($module_srl);
 		// Call a trigger (after)
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$trigger_output = ModuleHandler::triggerCall('module.deleteModule', 'after', $trigger_obj);
-			if(!$trigger_output->toBool())
+			if (!$trigger_output->toBool())
 			{
 				$oDB->rollback();
 				return $trigger_output;
@@ -773,7 +773,7 @@ 
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -795,10 +795,10 @@ 
 	function clearDefaultModule()
 	{
 		$output = executeQuery('module.clearDefaultModule');
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -814,7 +814,7 @@ 
 		$output = executeQuery('module.updateModuleMenu', $args);
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -827,15 +827,15 @@ 
 	 */
 	function updateModuleLayout($layout_srl, $menu_srl_list)
 	{
-		if(!count($menu_srl_list)) return;
+		if (!count($menu_srl_list)) return;
 
 		$args = new stdClass;
 		$args->layout_srl = $layout_srl;
-		$args->menu_srls = implode(',',$menu_srl_list);
+		$args->menu_srls = implode(',', $menu_srl_list);
 		$output = executeQuery('module.updateModuleLayout', $args);
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}
@@ -854,37 +854,37 @@ 
 
 		$output = executeQuery('module.deleteSiteAdmin', $args);
 
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Get user id of an administrator
-		if(!is_array($arr_admins) || !count($arr_admins)) return new Object();
-		foreach($arr_admins as $key => $user_id)
+		if (!is_array($arr_admins) || !count($arr_admins)) return new Object();
+		foreach ($arr_admins as $key => $user_id)
 		{
-			if(!trim($user_id)) continue;
+			if (!trim($user_id)) continue;
 			$admins[] = trim($user_id);
 		}
-		if(!count($admins)) return new Object();
+		if (!count($admins)) return new Object();
 
 		$oMemberModel = getModel('member');
 		$member_config = $oMemberModel->getMemberConfig();
-		if($member_config->identifier == 'email_address')
+		if ($member_config->identifier == 'email_address')
 		{
-			$args->email_address = '\''.implode('\',\'',$admins).'\'';
+			$args->email_address = '\''.implode('\',\'', $admins).'\'';
 		}
 		else
 		{
-			$args->user_ids = '\''.implode('\',\'',$admins).'\'';
+			$args->user_ids = '\''.implode('\',\'', $admins).'\'';
 		}
 		$output = executeQueryArray('module.getAdminSrls', $args);
-		if(!$output->toBool()||!$output->data) return $output;
+		if (!$output->toBool() || !$output->data) return $output;
 
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			unset($args);
 			$args = new stdClass;
 			$args->site_srl = $site_srl;
 			$args->member_srl = $val->member_srl;
 			$output = executeQueryArray('module.insertSiteAdmin', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 		return new Object();
 	}
@@ -897,12 +897,12 @@ 
 		$oMemberModel = getModel('member');
 		$member_config = $oMemberModel->getMemberConfig();
 
-		if($member_config->identifier == 'email_address')
+		if ($member_config->identifier == 'email_address')
 			$member_info = $oMemberModel->getMemberInfoByEmailAddress($admin_id);
 		else
 			$member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
 
-		if(!$member_info->member_srl) return;
+		if (!$member_info->member_srl) return;
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 		$args->member_srl = $member_info->member_srl;
@@ -917,11 +917,11 @@ 
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 
-		if($admin_id)
+		if ($admin_id)
 		{
 			$oMemberModel = getModel('member');
 			$member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
-			if($member_info->member_srl) $args->member_srl = $member_info->member_srl;
+			if ($member_info->member_srl) $args->member_srl = $member_info->member_srl;
 		}
 		return executeQuery('module.deleteAdminId', $args);
 	}
@@ -958,18 +958,18 @@ 
 		$oDB->begin();
 
 		$output = $this->_deleteModuleSkinVars($module_srl, $mode);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
 		getDestroyXeVars($obj);
-		if(!$obj || !count($obj)) return new Object();
+		if (!$obj || !count($obj)) return new Object();
 
 		$args = new stdClass;
 		$args->module_srl = $module_srl;
-		foreach($obj as $key => $val)
+		foreach ($obj as $key => $val)
 		{
 			// #17927989 For an old board which used the old blog module
 			// it often saved menu item(stdClass) on the skin info column
@@ -980,9 +980,9 @@ 
 
 			$args->name = trim($key);
 			$args->value = trim($val);
-			if(!$args->name || !$args->value) continue;
+			if (!$args->name || !$args->value) continue;
 
-			if($mode === 'P')
+			if ($mode === 'P')
 			{
 				$output = executeQuery('module.insertModuleSkinVars', $args);
 			}
@@ -990,7 +990,7 @@ 
 			{
 				$output = executeQuery('module.insertModuleMobileSkinVars', $args);
 			}
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return $output;
 				$oDB->rollback();
@@ -1029,7 +1029,7 @@ 
 		$args->module_srl = $module_srl;
 		$mode = $mode === 'P' ? 'P' : 'M';
 
-		if($mode === 'P')
+		if ($mode === 'P')
 		{
 			$object_key = 'module_skin_vars:'.$module_srl;
 			$query = 'module.deleteModuleSkinVars';
@@ -1043,7 +1043,7 @@ 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
 		$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->delete($cache_key);
 		}
@@ -1058,22 +1058,22 @@ 
 	{
 		$this->deleteModuleExtraVars($module_srl);
 		getDestroyXeVars($obj);
-		if(!$obj || !count($obj)) return;
+		if (!$obj || !count($obj)) return;
 
-		foreach($obj as $key => $val)
+		foreach ($obj as $key => $val)
 		{
-			if(is_object($val) || is_array($val)) continue;
+			if (is_object($val) || is_array($val)) continue;
 
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$args->name = trim($key);
 			$args->value = trim($val);
-			if(!$args->name || !$args->value) continue;
+			if (!$args->name || !$args->value) continue;
 			$output = executeQuery('module.insertModuleExtraVars', $args);
 		}
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$object_key = 'module_extra_vars:'.$module_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
@@ -1092,7 +1092,7 @@ 
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$object_key = 'module_extra_vars:'.$module_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
@@ -1108,19 +1108,19 @@ 
 	function insertModuleGrants($module_srl, $obj)
 	{
 		$this->deleteModuleGrants($module_srl);
-		if(!$obj || !count($obj)) return;
+		if (!$obj || !count($obj)) return;
 
-		foreach($obj as $name => $val)
+		foreach ($obj as $name => $val)
 		{
-			if(!$val || !count($val)) continue;
+			if (!$val || !count($val)) continue;
 
-			foreach($val as $group_srl)
+			foreach ($val as $group_srl)
 			{
 				$args = new stdClass();
 				$args->module_srl = $module_srl;
 				$args->name = $name;
 				$args->group_srl = trim($group_srl);
-				if(!$args->name || !$args->group_srl) continue;
+				if (!$args->name || !$args->group_srl) continue;
 				executeQuery('module.insertModuleGrant', $args);
 			}
 		}
@@ -1141,9 +1141,9 @@ 
 	 */
 	function replaceDefinedLangCode(&$output, $isReplaceLangCode = true)
 	{
-		if($isReplaceLangCode)
+		if ($isReplaceLangCode)
 		{
-			$output = preg_replace_callback('!\$user_lang->([a-z0-9\_]+)!is', array($this,'_replaceLangCode'), $output);
+			$output = preg_replace_callback('!\$user_lang->([a-z0-9\_]+)!is', array($this, '_replaceLangCode'), $output);
 		}
 	}
 
@@ -1151,27 +1151,27 @@ 
 	{
 		static $lang = null;
 
-		if(is_null($lang))
+		if (is_null($lang))
 		{
 			$site_module_info = Context::get('site_module_info');
-			if(!$site_module_info)
+			if (!$site_module_info)
 			{
 				$oModuleModel = getModel('module');
 				$site_module_info = $oModuleModel->getDefaultMid();
 				Context::set('site_module_info', $site_module_info);
 			}
 			$cache_file = sprintf('%sfiles/cache/lang_defined/%d.%s.php', _XE_PATH_, $site_module_info->site_srl, Context::getLangType());
-			if(!file_exists($cache_file))
+			if (!file_exists($cache_file))
 			{
 				$oModuleAdminController = getAdminController('module');
 				$oModuleAdminController->makeCacheDefinedLangCode($site_module_info->site_srl);
 			}
 
-			if(file_exists($cache_file))
+			if (file_exists($cache_file))
 			{
-				$moduleAdminControllerMtime = filemtime(_XE_PATH_ . 'modules/module/module.admin.controller.php');
+				$moduleAdminControllerMtime = filemtime(_XE_PATH_.'modules/module/module.admin.controller.php');
 				$cacheFileMtime = filemtime($cache_file);
-				if($cacheFileMtime < $moduleAdminControllerMtime)
+				if ($cacheFileMtime < $moduleAdminControllerMtime)
 				{
 					$oModuleAdminController = getAdminController('module');
 					$oModuleAdminController->makeCacheDefinedLangCode($site_module_info->site_srl);
@@ -1180,9 +1180,9 @@ 
 				require_once($cache_file);
 			}
 		}
-		if(!Context::get($matches[1]) && $lang[$matches[1]]) return $lang[$matches[1]];
+		if (!Context::get($matches[1]) && $lang[$matches[1]]) return $lang[$matches[1]];
 
-		return str_replace('$user_lang->','',$matches[0]);
+		return str_replace('$user_lang->', '', $matches[0]);
 	}
 
 
@@ -1195,17 +1195,17 @@ 
 		if ($ajax) Context::setRequestMethod('JSON');
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
+		if ($logged_info->is_admin != 'Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
 
-		$vars = Context::gets('addfile','filter');
+		$vars = Context::gets('addfile', 'filter');
 		$attributeNames = Context::get('attribute_name');
 		$attributeValues = Context::get('attribute_value');
-		if(is_array($attributeNames) && is_array($attributeValues) && count($attributeNames) == count($attributeValues))
+		if (is_array($attributeNames) && is_array($attributeValues) && count($attributeNames) == count($attributeValues))
 		{
 			$attributes = array();
-			foreach($attributeNames as $no => $name)
+			foreach ($attributeNames as $no => $name)
 			{
-				if(empty($name))
+				if (empty($name))
 				{
 					continue;
 				}
@@ -1217,16 +1217,16 @@ 
 		$vars->comment = $attributes;
 		$module_filebox_srl = Context::get('module_filebox_srl');
 
-		$ext = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
+		$ext = strtolower(substr(strrchr($vars->addfile['name'], '.'), 1));
 		$vars->ext = $ext;
-		if($vars->filter) $filter = explode(',',$vars->filter);
-		else $filter = array('jpg','jpeg','gif','png');
-		if(!in_array($ext,$filter)) return new Object(-1, 'msg_error_occured');
+		if ($vars->filter) $filter = explode(',', $vars->filter);
+		else $filter = array('jpg', 'jpeg', 'gif', 'png');
+		if (!in_array($ext, $filter)) return new Object(-1, 'msg_error_occured');
 
 		$vars->member_srl = $logged_info->member_srl;
 
 		// update
-		if($module_filebox_srl > 0)
+		if ($module_filebox_srl > 0)
 		{
 			$vars->module_filebox_srl = $module_filebox_srl;
 			$output = $this->updateModuleFileBox($vars);
@@ -1234,10 +1234,10 @@ 
 		// insert
 		else
 		{
-			if(!Context::isUploaded()) return new Object(-1, 'msg_error_occured');
+			if (!Context::isUploaded()) return new Object(-1, 'msg_error_occured');
 			$addfile = Context::get('addfile');
-			if(!is_uploaded_file($addfile['tmp_name'])) return new Object(-1, 'msg_error_occured');
-			if($vars->addfile['error'] != 0) return new Object(-1, 'msg_error_occured');
+			if (!is_uploaded_file($addfile['tmp_name'])) return new Object(-1, 'msg_error_occured');
+			if ($vars->addfile['error'] != 0) return new Object(-1, 'msg_error_occured');
 			$output = $this->insertModuleFileBox($vars);
 		}
 
@@ -1251,7 +1251,7 @@ 
 		}
 		else
 		{
-			if($output) $this->add('save_filename', $output->get('save_filename'));
+			if ($output) $this->add('save_filename', $output->get('save_filename'));
 			else $this->add('save_filename', '');
 		}
 	}
@@ -1263,7 +1263,7 @@ 
 	{
 		$args = new stdClass;
 		// have file
-		if($vars->addfile['tmp_name'] && is_uploaded_file($vars->addfile['tmp_name']))
+		if ($vars->addfile['tmp_name'] && is_uploaded_file($vars->addfile['tmp_name']))
 		{
 			$oModuleModel = getModel('module');
 			$output = $oModuleModel->getModuleFileBox($vars->module_filebox_srl);
@@ -1272,18 +1272,18 @@ 
 			$path = $oModuleModel->getModuleFileBoxPath($vars->module_filebox_srl);
 			FileHandler::makeDir($path);
 
-			$save_filename = sprintf('%s%s.%s',$path, $vars->module_filebox_srl, $ext);
+			$save_filename = sprintf('%s%s.%s', $path, $vars->module_filebox_srl, $ext);
 			$tmp = $vars->addfile['tmp_name'];
 
 			// Check uploaded file
-			if(!checkUploadedFile($tmp)) return false;
+			if (!checkUploadedFile($tmp)) return false;
 
-			if(!@move_uploaded_file($tmp, $save_filename))
+			if (!@move_uploaded_file($tmp, $save_filename))
 			{
 				return false;
 			}
 
-			$args->fileextension = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
+			$args->fileextension = strtolower(substr(strrchr($vars->addfile['name'], '.'), 1));
 			$args->filename = $save_filename;
 			$args->filesize = $vars->addfile['size'];
 		}
@@ -1309,14 +1309,14 @@ 
 		$oModuleModel = getModel('module');
 		$path = $oModuleModel->getModuleFileBoxPath($vars->module_filebox_srl);
 		FileHandler::makeDir($path);
-		$save_filename = sprintf('%s%s.%s',$path, $vars->module_filebox_srl, $vars->ext);
+		$save_filename = sprintf('%s%s.%s', $path, $vars->module_filebox_srl, $vars->ext);
 		$tmp = $vars->addfile['tmp_name'];
 
 		// Check uploaded file
-		if(!checkUploadedFile($tmp)) return false;
+		if (!checkUploadedFile($tmp)) return false;
 
 		// upload
-		if(!@move_uploaded_file($tmp, $save_filename))
+		if (!@move_uploaded_file($tmp, $save_filename))
 		{
 			return false;
 		}
@@ -1327,7 +1327,7 @@ 
 		$args->member_srl = $vars->member_srl;
 		$args->comment = $vars->comment;
 		$args->filename = $save_filename;
-		$args->fileextension = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
+		$args->fileextension = strtolower(substr(strrchr($vars->addfile['name'], '.'), 1));
 		$args->filesize = $vars->addfile['size'];
 
 		$output = executeQuery('module.insertModuleFileBox', $args);
@@ -1342,14 +1342,14 @@ 
 	function procModuleFileBoxDelete()
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
+		if ($logged_info->is_admin != 'Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
 
 		$module_filebox_srl = Context::get('module_filebox_srl');
-		if(!$module_filebox_srl) return new Object(-1, 'msg_invalid_request');
+		if (!$module_filebox_srl) return new Object(-1, 'msg_invalid_request');
 		$vars = new stdClass();
 		$vars->module_filebox_srl = $module_filebox_srl;
 		$output = $this->deleteModuleFileBox($vars);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 	}
 
 	function deleteModuleFileBox($vars)
@@ -1372,11 +1372,11 @@ 
 		$this->unlockTimeoutPassed();
 		$args = new stdClass;
 		$args->lock_name = $lock_name;
-		if(!$timeout) $timeout = 60;
+		if (!$timeout) $timeout = 60;
 		$args->deadline = date("YmdHis", $_SERVER['REQUEST_TIME'] + $timeout);
-		if($member_srl) $args->member_srl = $member_srl;
+		if ($member_srl) $args->member_srl = $member_srl;
 		$output = executeQuery('module.insertLock', $args);
-		if($output->toBool())
+		if ($output->toBool())
 		{
 			$output->add('lock_name', $lock_name);
 			$output->add('deadline', $args->deadline);
@@ -1405,7 +1405,7 @@ 
 		$output = executeQuery('module.updateModuleInSites', $args);
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$oCacheHandler->invalidateGroupKey('site_and_module');
 		}

Braces +220 added lines, -102 removed lines

@@ -150,9 +150,15 @@ 
 	 */
 	function insertModuleExtend($parent_module, $extend_module, $type, $kind='')
 	{
-		if($kind != 'admin') $kind = '';
-		if(!in_array($type,array('model','controller','view','api','mobile'))) return false;
-		if(in_array($parent_module, array('module','addon','widget','layout'))) return false;
+		if($kind != 'admin') {
+			$kind = '';
+		}
+		if(!in_array($type,array('model','controller','view','api','mobile'))) {
+			return false;
+		}
+		if(in_array($parent_module, array('module','addon','widget','layout'))) {
+			return false;
+		}
 
 		$cache_file = './files/config/module_extend.php';
 		FileHandler::removeFile($cache_file);
@@ -164,7 +170,9 @@ 
 		$args->kind = $kind;
 
 		$output = executeQuery('module.getModuleExtendCount', $args);
-		if($output->data->count>0) return false;
+		if($output->data->count>0) {
+			return false;
+		}
 
 		$output = executeQuery('module.insertModuleExtend', $args);
 		return $output;
@@ -199,7 +207,9 @@ 
 		$oModuleModel = getModel('module');
 		$origin_config = $oModuleModel->getModuleConfig($module, $site_srl);
 
-		if(!$origin_config) $origin_config = new stdClass;
+		if(!$origin_config) {
+			$origin_config = new stdClass;
+		}
 
 		foreach($config as $key => $val)
 		{
@@ -221,7 +231,9 @@ 
 		$args->site_srl = $site_srl;
 
 		$output = executeQuery('module.deleteModuleConfig', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$output = executeQuery('module.insertModuleConfig', $args);
 
@@ -246,7 +258,9 @@ 
 		$args->config = serialize($config);
 
 		$output = executeQuery('module.deleteModulePartConfig', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$output = executeQuery('module.insertModulePartConfig', $args);
 
@@ -268,9 +282,10 @@ 
 		if(isSiteID($domain))
 		{
 			$oModuleModel = getModel('module');
-			if($oModuleModel->isIDExists($domain, 0)) return new Object(-1,'msg_already_registed_vid');
-		}
-		else
+			if($oModuleModel->isIDExists($domain, 0)) {
+				return new Object(-1,'msg_already_registed_vid');
+			}
+		} else
 		{
 			$domain = strtolower($domain);
 		}
@@ -284,10 +299,14 @@ 
 		$columnList = array('modules.site_srl');
 		$oModuleModel = getModel('module');
 		$output = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList);
-		if($output) return new Object(-1,'msg_already_registed_vid');
+		if($output) {
+			return new Object(-1,'msg_already_registed_vid');
+		}
 
 		$output = executeQuery('module.insertSite', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$output->add('site_srl', $args->site_srl);
 		return $output;
@@ -310,8 +329,12 @@ 
 		if($site_info->domain != $args->domain)
 		{
 			$info = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList);
-			if($info->site_srl && $info->site_srl != $args->site_srl) return new Object(-1,'msg_already_registed_domain');
-			if(isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) return new Object(-1,'msg_already_registed_vid');
+			if($info->site_srl && $info->site_srl != $args->site_srl) {
+				return new Object(-1,'msg_already_registed_domain');
+			}
+			if(isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) {
+				return new Object(-1,'msg_already_registed_vid');
+			}
 
 			if($args->domain && !isSiteID($args->domain))
 			{
@@ -320,8 +343,11 @@ 
 		}
 		$output = executeQuery('module.updateSite', $args);
 		//clear cache for default mid
-		if($args->site_srl == 0) $vid='';
-		else $vid=$args->domain;
+		if($args->site_srl == 0) {
+			$vid='';
+		} else {
+			$vid=$args->domain;
+		}
 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->index_module_srl);
 		$mid = $module_info->mid;
@@ -345,7 +371,9 @@ 
 		unset($args->act);
 		unset($args->page);
 		// Test mid value
-		if(!preg_match("/^[a-z][a-z0-9_]+$/i", $args->mid)) return new Object(-1, 'msg_limit_mid');
+		if(!preg_match("/^[a-z][a-z0-9_]+$/i", $args->mid)) {
+			return new Object(-1, 'msg_limit_mid');
+		}
 		// Test variables (separate basic vars and other vars in modules)
 		$extra_vars = clone($args);
 		unset($extra_vars->module_srl);
@@ -382,18 +410,23 @@ 
 		if(isset($args->isMenuCreate))
 		{
 			$isMenuCreate = $args->isMenuCreate;
-		}
-		else
+		} else
 		{
 			$isMenuCreate = TRUE;
 		}
 
 		$output = $this->arrangeModuleInfo($args, $extra_vars);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check whether the module name already exists
-		if(!$args->site_srl) $args->site_srl = 0;
+		if(!$args->site_srl) {
+			$args->site_srl = 0;
+		}
 		$oModuleModel = getModel('module');
-		if($oModuleModel->isIDExists($args->mid, $args->site_srl)) return new Object(-1, 'msg_module_name_exists');
+		if($oModuleModel->isIDExists($args->mid, $args->site_srl)) {
+			return new Object(-1, 'msg_module_name_exists');
+		}
 
 		// begin transaction
 		$oDB = &DB::getInstance();
@@ -404,20 +437,20 @@ 
 		$skin_vars = new stdClass();
 		$skin_vars->colorset = $skin_info->colorset[0]->name;
 		// Arrange variables and then execute a query
-		if(!$args->module_srl) $args->module_srl = getNextSequence();
+		if(!$args->module_srl) {
+			$args->module_srl = getNextSequence();
+		}
 
 		// default value
 		if($args->skin == '/USE_DEFAULT/')
 		{
 			$args->is_skin_fix = 'N';
-		}
-		else
+		} else
 		{
 			if(isset($args->is_skin_fix))
 			{
 				$args->is_skin_fix = ($args->is_skin_fix != 'Y') ? 'N' : 'Y';
-			}
-			else
+			} else
 			{
 				$args->is_skin_fix = 'Y';
 			}
@@ -426,14 +459,12 @@ 
 		if($args->mskin == '/USE_DEFAULT/')
 		{
 			$args->is_mskin_fix = 'N';
-		}
-		else
+		} else
 		{
 			if(isset($args->is_mskin_fix))
 			{
 				$args->is_mskin_fix = ($args->is_mskin_fix != 'Y') ? 'N' : 'Y';
-			}
-			else
+			} else
 			{
 				$args->is_mskin_fix = 'Y';
 			}
@@ -508,7 +539,9 @@ 
 	function updateModule($args)
 	{
 		$output = $this->arrangeModuleInfo($args, $extra_vars);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// begin transaction
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -519,8 +552,12 @@ 
 
 		if(!$args->site_srl || !$args->browser_title)
 		{
-			if(!$args->site_srl) $args->site_srl = (int)$module_info->site_srl;
-			if(!$args->browser_title) $args->browser_title = $module_info->browser_title;
+			if(!$args->site_srl) {
+				$args->site_srl = (int)$module_info->site_srl;
+			}
+			if(!$args->browser_title) {
+				$args->browser_title = $module_info->browser_title;
+			}
 		}
 
 		$args->browser_title = strip_tags($args->browser_title);
@@ -536,14 +573,12 @@ 
 		if($args->skin == '/USE_DEFAULT/')
 		{
 			$args->is_skin_fix = 'N';
-		}
-		else
+		} else
 		{
 			if(isset($args->is_skin_fix))
 			{
 				$args->is_skin_fix = ($args->is_skin_fix != 'Y') ? 'N' : 'Y';
-			}
-			else
+			} else
 			{
 				$args->is_skin_fix = 'Y';
 			}
@@ -552,14 +587,12 @@ 
 		if($args->mskin == '/USE_DEFAULT/')
 		{
 			$args->is_mskin_fix = 'N';
-		}
-		else
+		} else
 		{
 			if(isset($args->is_mskin_fix))
 			{
 				$args->is_mskin_fix = ($args->is_mskin_fix != 'Y') ? 'N' : 'Y';
-			}
-			else
+			} else
 			{
 				$args->is_mskin_fix = 'Y';
 			}
@@ -625,7 +658,9 @@ 
 		$args->update_id = $update_id;
 		$output = executeQuery('module.insertModuleUpdateLog', $args);
 
-		if(!!$output->error) return false;
+		if(!!$output->error) {
+			return false;
+		}
 
 		return true;
 	}
@@ -640,7 +675,9 @@ 
 		$args->site_srl = $site_srl;
 		$args->layout_srl = $layout_srl;
 		$output = executeQuery('module.updateModuleSite', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
@@ -659,7 +696,9 @@ 
 	 */
 	function deleteModule($module_srl, $site_srl = 0)
 	{
-		if(!$module_srl) return new Object(-1,'msg_invalid_request');
+		if(!$module_srl) {
+			return new Object(-1,'msg_invalid_request');
+		}
 
 		$site_module_info = Context::get('site_module_info');
 
@@ -669,8 +708,11 @@ 
 		$args = new stdClass();
 		$args->url = $output->mid;
 		$args->is_shortcut = 'N';
-		if(!$site_srl) $args->site_srl = $site_module_info->site_srl;
-		else $args->site_srl = $site_srl;
+		if(!$site_srl) {
+			$args->site_srl = $site_module_info->site_srl;
+		} else {
+			$args->site_srl = $site_srl;
+		}
 
 		unset($output);
 
@@ -703,8 +745,7 @@ 
 			if($output->isSuccess)
 			{
 				return new Object(0, 'success_deleted');
-			}
-			else
+			} else
 			{
 				return new Object($output->error, $output->message);
 			}
@@ -722,19 +763,25 @@ 
 	 */
 	public function onlyDeleteModule($module_srl)
 	{
-		if(!$module_srl) return new Object(-1,'msg_invalid_request');
+		if(!$module_srl) {
+			return new Object(-1,'msg_invalid_request');
+		}
 
 		// check start module
 		$oModuleModel = getModel('module');
 		$columnList = array('sites.index_module_srl');
 		$start_module = $oModuleModel->getSiteInfo(0, $columnList);
-		if($module_srl == $start_module->index_module_srl) return new Object(-1, 'msg_cannot_delete_startmodule');
+		if($module_srl == $start_module->index_module_srl) {
+			return new Object(-1, 'msg_cannot_delete_startmodule');
+		}
 
 		// Call a trigger (before)
 		$trigger_obj = new stdClass();
 		$trigger_obj->module_srl = $module_srl;
 		$output = ModuleHandler::triggerCall('module.deleteModule', 'before', $trigger_obj);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// begin transaction
 		$oDB = &DB::getInstance();
@@ -795,7 +842,9 @@ 
 	function clearDefaultModule()
 	{
 		$output = executeQuery('module.clearDefaultModule');
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
 		if($oCacheHandler->isSupport())
@@ -827,7 +876,9 @@ 
 	 */
 	function updateModuleLayout($layout_srl, $menu_srl_list)
 	{
-		if(!count($menu_srl_list)) return;
+		if(!count($menu_srl_list)) {
+			return;
+		}
 
 		$args = new stdClass;
 		$args->layout_srl = $layout_srl;
@@ -854,28 +905,37 @@ 
 
 		$output = executeQuery('module.deleteSiteAdmin', $args);
 
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Get user id of an administrator
-		if(!is_array($arr_admins) || !count($arr_admins)) return new Object();
+		if(!is_array($arr_admins) || !count($arr_admins)) {
+			return new Object();
+		}
 		foreach($arr_admins as $key => $user_id)
 		{
-			if(!trim($user_id)) continue;
+			if(!trim($user_id)) {
+				continue;
+			}
 			$admins[] = trim($user_id);
 		}
-		if(!count($admins)) return new Object();
+		if(!count($admins)) {
+			return new Object();
+		}
 
 		$oMemberModel = getModel('member');
 		$member_config = $oMemberModel->getMemberConfig();
 		if($member_config->identifier == 'email_address')
 		{
 			$args->email_address = '\''.implode('\',\'',$admins).'\'';
-		}
-		else
+		} else
 		{
 			$args->user_ids = '\''.implode('\',\'',$admins).'\'';
 		}
 		$output = executeQueryArray('module.getAdminSrls', $args);
-		if(!$output->toBool()||!$output->data) return $output;
+		if(!$output->toBool()||!$output->data) {
+			return $output;
+		}
 
 		foreach($output->data as $key => $val)
 		{
@@ -884,7 +944,9 @@ 
 			$args->site_srl = $site_srl;
 			$args->member_srl = $val->member_srl;
 			$output = executeQueryArray('module.insertSiteAdmin', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 		return new Object();
 	}
@@ -897,12 +959,15 @@ 
 		$oMemberModel = getModel('member');
 		$member_config = $oMemberModel->getMemberConfig();
 
-		if($member_config->identifier == 'email_address')
-			$member_info = $oMemberModel->getMemberInfoByEmailAddress($admin_id);
-		else
-			$member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
+		if($member_config->identifier == 'email_address') {
+					$member_info = $oMemberModel->getMemberInfoByEmailAddress($admin_id);
+		} else {
+					$member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
+		}
 
-		if(!$member_info->member_srl) return;
+		if(!$member_info->member_srl) {
+			return;
+		}
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 		$args->member_srl = $member_info->member_srl;
@@ -921,7 +986,9 @@ 
 		{
 			$oMemberModel = getModel('member');
 			$member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
-			if($member_info->member_srl) $args->member_srl = $member_info->member_srl;
+			if($member_info->member_srl) {
+				$args->member_srl = $member_info->member_srl;
+			}
 		}
 		return executeQuery('module.deleteAdminId', $args);
 	}
@@ -965,7 +1032,9 @@ 
 		}
 
 		getDestroyXeVars($obj);
-		if(!$obj || !count($obj)) return new Object();
+		if(!$obj || !count($obj)) {
+			return new Object();
+		}
 
 		$args = new stdClass;
 		$args->module_srl = $module_srl;
@@ -975,18 +1044,23 @@ 
 			// it often saved menu item(stdClass) on the skin info column
 			// When updating the module on XE core 1.2.0 later versions, it occurs an error
 			// fixed the error
-			if (is_object($val)) continue;
-			if (is_array($val)) $val = serialize($val);
+			if (is_object($val)) {
+				continue;
+			}
+			if (is_array($val)) {
+				$val = serialize($val);
+			}
 
 			$args->name = trim($key);
 			$args->value = trim($val);
-			if(!$args->name || !$args->value) continue;
+			if(!$args->name || !$args->value) {
+				continue;
+			}
 
 			if($mode === 'P')
 			{
 				$output = executeQuery('module.insertModuleSkinVars', $args);
-			}
-			else
+			} else
 			{
 				$output = executeQuery('module.insertModuleMobileSkinVars', $args);
 			}
@@ -1033,8 +1107,7 @@ 
 		{
 			$object_key = 'module_skin_vars:'.$module_srl;
 			$query = 'module.deleteModuleSkinVars';
-		}
-		else
+		} else
 		{
 			$object_key = 'module_mobile_skin_vars:'.$module_srl;
 			$query = 'module.deleteModuleMobileSkinVars';
@@ -1058,17 +1131,23 @@ 
 	{
 		$this->deleteModuleExtraVars($module_srl);
 		getDestroyXeVars($obj);
-		if(!$obj || !count($obj)) return;
+		if(!$obj || !count($obj)) {
+			return;
+		}
 
 		foreach($obj as $key => $val)
 		{
-			if(is_object($val) || is_array($val)) continue;
+			if(is_object($val) || is_array($val)) {
+				continue;
+			}
 
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$args->name = trim($key);
 			$args->value = trim($val);
-			if(!$args->name || !$args->value) continue;
+			if(!$args->name || !$args->value) {
+				continue;
+			}
 			$output = executeQuery('module.insertModuleExtraVars', $args);
 		}
 
@@ -1108,11 +1187,15 @@ 
 	function insertModuleGrants($module_srl, $obj)
 	{
 		$this->deleteModuleGrants($module_srl);
-		if(!$obj || !count($obj)) return;
+		if(!$obj || !count($obj)) {
+			return;
+		}
 
 		foreach($obj as $name => $val)
 		{
-			if(!$val || !count($val)) continue;
+			if(!$val || !count($val)) {
+				continue;
+			}
 
 			foreach($val as $group_srl)
 			{
@@ -1120,7 +1203,9 @@ 
 				$args->module_srl = $module_srl;
 				$args->name = $name;
 				$args->group_srl = trim($group_srl);
-				if(!$args->name || !$args->group_srl) continue;
+				if(!$args->name || !$args->group_srl) {
+					continue;
+				}
 				executeQuery('module.insertModuleGrant', $args);
 			}
 		}
@@ -1180,7 +1265,9 @@ 
 				require_once($cache_file);
 			}
 		}
-		if(!Context::get($matches[1]) && $lang[$matches[1]]) return $lang[$matches[1]];
+		if(!Context::get($matches[1]) && $lang[$matches[1]]) {
+			return $lang[$matches[1]];
+		}
 
 		return str_replace('$user_lang->','',$matches[0]);
 	}
@@ -1192,10 +1279,14 @@ 
 	function procModuleFileBoxAdd()
 	{
 		$ajax = Context::get('ajax');
-		if ($ajax) Context::setRequestMethod('JSON');
+		if ($ajax) {
+			Context::setRequestMethod('JSON');
+		}
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
+		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) {
+			return new Object(-1, 'msg_not_permitted');
+		}
 
 		$vars = Context::gets('addfile','filter');
 		$attributeNames = Context::get('attribute_name');
@@ -1219,9 +1310,14 @@ 
 
 		$ext = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
 		$vars->ext = $ext;
-		if($vars->filter) $filter = explode(',',$vars->filter);
-		else $filter = array('jpg','jpeg','gif','png');
-		if(!in_array($ext,$filter)) return new Object(-1, 'msg_error_occured');
+		if($vars->filter) {
+			$filter = explode(',',$vars->filter);
+		} else {
+			$filter = array('jpg','jpeg','gif','png');
+		}
+		if(!in_array($ext,$filter)) {
+			return new Object(-1, 'msg_error_occured');
+		}
 
 		$vars->member_srl = $logged_info->member_srl;
 
@@ -1234,10 +1330,16 @@ 
 		// insert
 		else
 		{
-			if(!Context::isUploaded()) return new Object(-1, 'msg_error_occured');
+			if(!Context::isUploaded()) {
+				return new Object(-1, 'msg_error_occured');
+			}
 			$addfile = Context::get('addfile');
-			if(!is_uploaded_file($addfile['tmp_name'])) return new Object(-1, 'msg_error_occured');
-			if($vars->addfile['error'] != 0) return new Object(-1, 'msg_error_occured');
+			if(!is_uploaded_file($addfile['tmp_name'])) {
+				return new Object(-1, 'msg_error_occured');
+			}
+			if($vars->addfile['error'] != 0) {
+				return new Object(-1, 'msg_error_occured');
+			}
 			$output = $this->insertModuleFileBox($vars);
 		}
 
@@ -1248,11 +1350,13 @@ 
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminFileBox');
 			$this->setRedirectUrl($returnUrl);
 			return;
-		}
-		else
+		} else
 		{
-			if($output) $this->add('save_filename', $output->get('save_filename'));
-			else $this->add('save_filename', '');
+			if($output) {
+				$this->add('save_filename', $output->get('save_filename'));
+			} else {
+				$this->add('save_filename', '');
+			}
 		}
 	}
 
@@ -1276,7 +1380,9 @@ 
 			$tmp = $vars->addfile['tmp_name'];
 
 			// Check uploaded file
-			if(!checkUploadedFile($tmp)) return false;
+			if(!checkUploadedFile($tmp)) {
+				return false;
+			}
 
 			if(!@move_uploaded_file($tmp, $save_filename))
 			{
@@ -1313,7 +1419,9 @@ 
 		$tmp = $vars->addfile['tmp_name'];
 
 		// Check uploaded file
-		if(!checkUploadedFile($tmp)) return false;
+		if(!checkUploadedFile($tmp)) {
+			return false;
+		}
 
 		// upload
 		if(!@move_uploaded_file($tmp, $save_filename))
@@ -1342,14 +1450,20 @@ 
 	function procModuleFileBoxDelete()
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
+		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) {
+			return new Object(-1, 'msg_not_permitted');
+		}
 
 		$module_filebox_srl = Context::get('module_filebox_srl');
-		if(!$module_filebox_srl) return new Object(-1, 'msg_invalid_request');
+		if(!$module_filebox_srl) {
+			return new Object(-1, 'msg_invalid_request');
+		}
 		$vars = new stdClass();
 		$vars->module_filebox_srl = $module_filebox_srl;
 		$output = $this->deleteModuleFileBox($vars);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 	}
 
 	function deleteModuleFileBox($vars)
@@ -1372,9 +1486,13 @@ 
 		$this->unlockTimeoutPassed();
 		$args = new stdClass;
 		$args->lock_name = $lock_name;
-		if(!$timeout) $timeout = 60;
+		if(!$timeout) {
+			$timeout = 60;
+		}
 		$args->deadline = date("YmdHis", $_SERVER['REQUEST_TIME'] + $timeout);
-		if($member_srl) $args->member_srl = $member_srl;
+		if($member_srl) {
+			$args->member_srl = $member_srl;
+		}
 		$output = executeQuery('module.insertLock', $args);
 		if($output->toBool())
 		{

modules/module/module.model.php

Spacing +369 added lines, -369 removed lines

@@ -19,26 +19,26 @@ 
 	 */
 	function isIDExists($id, $site_srl = 0)
 	{
-		if(!preg_match('/^[a-z]{1}([a-z0-9_]+)$/i',$id)) return true;
+		if (!preg_match('/^[a-z]{1}([a-z0-9_]+)$/i', $id)) return true;
 		// directory and rss/atom/api reserved checking, etc.
 		$dirs = FileHandler::readDir(_XE_PATH_);
 		$dirs[] = 'rss';
 		$dirs[] = 'atom';
 		$dirs[] = 'api';
-		if(in_array($id, $dirs)) return true;
+		if (in_array($id, $dirs)) return true;
 		// mid test
 		$args = new stdClass();
 		$args->mid = $id;
 		$args->site_srl = $site_srl;
 		$output = executeQuery('module.isExistsModuleName', $args);
-		if($output->data->count) return true;
+		if ($output->data->count) return true;
 		// vid test (check mid != vid if site_srl=0, which means it is not a virtual site)
-		if(!$site_srl)
+		if (!$site_srl)
 		{
 			$site_args = new stdClass();
 			$site_args->domain = $id;
 			$output = executeQuery('module.isExistsSiteDomain', $site_args);
-			if($output->data->count) return true;
+			if ($output->data->count) return true;
 		}
 
 		return false;
@@ -82,10 +82,10 @@ 
 	function getDefaultMid()
 	{
 		$default_url = Context::getDefaultUrl();
-		if($default_url && substr_compare($default_url, '/', -1) === 0) $default_url = substr($default_url, 0, -1);
+		if ($default_url && substr_compare($default_url, '/', -1) === 0) $default_url = substr($default_url, 0, -1);
 
 		$request_url = Context::getRequestUri();
-		if($request_url && substr_compare($request_url, '/', -1) === 0) $request_url = substr($request_url, 0, -1);
+		if ($request_url && substr_compare($request_url, '/', -1) === 0) $request_url = substr($request_url, 0, -1);
 
 		$default_url_parse = parse_url($default_url);
 		$request_url_parse = parse_url($request_url);
@@ -95,20 +95,20 @@ 
 		// Set up
 		$domain = '';
 		$site_info = NULL;
-		if($default_url && $default_url_parse['host'] != $request_url_parse['host'])
+		if ($default_url && $default_url_parse['host'] != $request_url_parse['host'])
 		{
 			$hostname = $request_url_parse['host'];
 			$path = $request_url_parse['path'];
 			$port = $request_url_parse['port'];
-			if(strlen($path) >= 1 && substr_compare($path, '/', -1) === 0) $path = substr($path, 0, -1);
+			if (strlen($path) >= 1 && substr_compare($path, '/', -1) === 0) $path = substr($path, 0, -1);
 
-			$domain = sprintf('%s%s%s', $hostname, $port && ($port != 80 )? ':'.$port  : '', $path);
+			$domain = sprintf('%s%s%s', $hostname, $port && ($port != 80) ? ':'.$port : '', $path);
 		}
 
-		if($domain === '')
+		if ($domain === '')
 		{
-			if(!$vid) $vid = $mid;
-			if($vid)
+			if (!$vid) $vid = $mid;
+			if ($vid)
 			{
 				$domain = $vid;
 			}
@@ -116,89 +116,89 @@ 
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
 		// If domain is set, look for subsite
-		if($domain !== '')
+		if ($domain !== '')
 		{
 			$site_info = false;
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
-				$object_key = 'site_info:' . md5($domain);
+				$object_key = 'site_info:'.md5($domain);
 				$domain_cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 				$site_info = $oCacheHandler->get($domain_cache_key);
 			}
 
-			if($site_info === false)
+			if ($site_info === false)
 			{
 				$args = new stdClass();
 				$args->domain = $domain;
 				$output = executeQuery('module.getSiteInfoByDomain', $args);
 				$site_info = $output->data;
 
-				if($oCacheHandler->isSupport()) $oCacheHandler->put($domain_cache_key, $site_info);
+				if ($oCacheHandler->isSupport()) $oCacheHandler->put($domain_cache_key, $site_info);
 			}
 
-			if($site_info && $vid)
+			if ($site_info && $vid)
 			{
 				Context::set('vid', $site_info->domain, true);
-				if(strtolower($mid)==strtolower($site_info->domain)) Context::set('mid', $site_info->mid,true);
+				if (strtolower($mid) == strtolower($site_info->domain)) Context::set('mid', $site_info->mid, true);
 			}
-			if(!$site_info || !$site_info->domain) { $domain = ''; unset($site_info); }
+			if (!$site_info || !$site_info->domain) { $domain = ''; unset($site_info); }
 		}
 
 		// If no virtual website was found, get default website
-		if($domain === '')
+		if ($domain === '')
 		{
 			$site_info = false;
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$object_key = 'default_site';
 				$default_site_cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 				$site_info = $oCacheHandler->get($default_site_cache_key);
 			}
 
-			if($site_info === false)
+			if ($site_info === false)
 			{
 				$args = new stdClass();
 				$args->site_srl = 0;
 				$output = executeQuery('module.getSiteInfo', $args);
 				// Update the related informaion if there is no default site info
-				if(!$output->data)
+				if (!$output->data)
 				{
 					// Create a table if sites table doesn't exist
 					$oDB = &DB::getInstance();
-					if(!$oDB->isTableExists('sites')) $oDB->createTableByXmlFile(_XE_PATH_.'modules/module/schemas/sites.xml');
-					if(!$oDB->isTableExists('sites')) return;
+					if (!$oDB->isTableExists('sites')) $oDB->createTableByXmlFile(_XE_PATH_.'modules/module/schemas/sites.xml');
+					if (!$oDB->isTableExists('sites')) return;
 
 					// Get mid, language
 					$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 = new stdClass;
 					$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;
 
-					if($output->data && !$output->data->index_module_srl)
+					if ($output->data && !$output->data->index_module_srl)
 					{
 						$output = executeQuery('module.updateSite', $site_args);
 					}
 					else
 					{
 						$output = executeQuery('module.insertSite', $site_args);
-						if(!$output->toBool()) return $output;
+						if (!$output->toBool()) return $output;
 					}
 					$output = executeQuery('module.getSiteInfo', $args);
 				}
 				$site_info = $output->data;
-				if($oCacheHandler->isSupport()) $oCacheHandler->put($default_site_cache_key, $site_info);
+				if ($oCacheHandler->isSupport()) $oCacheHandler->put($default_site_cache_key, $site_info);
 			}
 		}
 
-		if(!$site_info->module_srl) return $site_info;
-		if(is_array($site_info) && $site_info->data[0]) $site_info = $site_info[0];
+		if (!$site_info->module_srl) return $site_info;
+		if (is_array($site_info) && $site_info->data[0]) $site_info = $site_info[0];
 		return $this->addModuleExtraVars($site_info);
 	}
 
@@ -207,48 +207,48 @@ 
 	 */
 	function getModuleInfoByMid($mid, $site_srl = 0, $columnList = array())
 	{
-		if(!$mid || ($mid && !preg_match("/^[a-z][a-z0-9_]+$/i", $mid)))
+		if (!$mid || ($mid && !preg_match("/^[a-z][a-z0-9_]+$/i", $mid)))
 		{
 			return;
 		}
 
 		$args = new stdClass();
 		$args->mid = $mid;
-		$args->site_srl = (int)$site_srl;
+		$args->site_srl = (int) $site_srl;
 
 		$module_srl = false;
 		$module_info = false;
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$object_key = 'module_srl:'.$mid.'_'.$site_srl;
 			$module_srl_cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 			$module_srl = $oCacheHandler->get($module_srl_cache_key);
-			if($module_srl)
+			if ($module_srl)
 			{
-				$object_key = 'mid_info:' . $module_srl;
+				$object_key = 'mid_info:'.$module_srl;
 				$module_info_cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 				$module_info = $oCacheHandler->get($module_info_cache_key);
 			}
 		}
 
-		if($module_info === false)
+		if ($module_info === false)
 		{
 			$output = executeQuery('module.getMidInfo', $args);
 			$module_info = $output->data;
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$oCacheHandler->put($module_srl_cache_key, $module_info->module_srl);
 
-				$object_key = 'mid_info:' . $module_info->module_srl;
+				$object_key = 'mid_info:'.$module_info->module_srl;
 				$module_info_cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 				$oCacheHandler->put($module_info_cache_key, $module_info);
 			}
 		}
 
 		$this->applyDefaultSkin($module_info);
-		if(!$module_info->module_srl && $module_info->data[0]) $module_info = $module_info->data[0];
+		if (!$module_info->module_srl && $module_info->data[0]) $module_info = $module_info->data[0];
 		return $this->addModuleExtraVars($module_info);
 	}
 
@@ -264,7 +264,7 @@ 
 		$menuItemSrl = Context::get('menu_item_srl');
 		$menuItemSrl = (!$menuItemSrl) ? $menu_item_srl : $menuItemSrl;
 
-		if(!$menuItemSrl)
+		if (!$menuItemSrl)
 		{
 			$this->stop(-1, 'msg_invalid_request');
 			return;
@@ -273,7 +273,7 @@ 
 		$args = new stdClass();
 		$args->menu_item_srl = $menuItemSrl;
 		$output = executeQuery('module.getModuleInfoByMenuItemSrl', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -297,12 +297,12 @@ 
 		$layoutInfoMobile = $layoutSrlMobile ? $oLayoutModel->getLayoutRawData($layoutSrlMobile, array('title')) : NULL;
 		$skinInfoPc = $this->loadSkinInfo(Modulehandler::getModulePath($moduleInfo->module), $skinNamePc);
 		$skinInfoMobile = $this->loadSkinInfo(Modulehandler::getModulePath($moduleInfo->module), $skinNameMobile, 'm.skins');
-		if(!$skinInfoPc)
+		if (!$skinInfoPc)
 		{
 			$skinInfoPc = new stdClass();
 			$skinInfoPc->title = $skinNamePc;
 		}
-		if(!$skinInfoMobile)
+		if (!$skinInfoMobile)
 		{
 			$skinInfoMobile = new stdClass();
 			$skinInfoMobile->title = $skinNameMobile;
@@ -321,23 +321,23 @@ 
 		$mid_info = false;
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$object_key = 'module_srl:'.$mid.'_'.$site_srl;
 			$module_srl_cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 			$module_srl = $oCacheHandler->get($module_srl_cache_key);
-			if($module_srl)
+			if ($module_srl)
 			{
-				$object_key = 'mid_info:' . $module_srl;
+				$object_key = 'mid_info:'.$module_srl;
 				$module_info_cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 				$mid_info = $oCacheHandler->get($module_info_cache_key);
 			}
 
-			if($mid_info === false)
+			if ($mid_info === false)
 			{
 				$oCacheHandler->put($module_srl_cache_key, $output->data->module_srl);
 
-				$object_key = 'mid_info:' . $output->data->module_srl;
+				$object_key = 'mid_info:'.$output->data->module_srl;
 				$module_info_cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 				$oCacheHandler->put($module_info_cache_key, $moduleInfo);
 			}
@@ -350,7 +350,7 @@ 
 
 		$moduleInfo = $this->addModuleExtraVars($moduleInfo);
 
-		if($moduleInfo->module == 'page' && $moduleInfo->page_type != 'ARTICLE')
+		if ($moduleInfo->module == 'page' && $moduleInfo->page_type != 'ARTICLE')
 		{
 			unset($moduleInfo->skin);
 			unset($moduleInfo->mskin);
@@ -369,32 +369,32 @@ 
 		$mid_info = false;
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$object_key = 'mid_info:' . $module_srl;
+			$object_key = 'mid_info:'.$module_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 			$mid_info = $oCacheHandler->get($cache_key);
 		}
 
-		if($mid_info === false)
+		if ($mid_info === false)
 		{
 			// Get data
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$output = executeQuery('module.getMidInfo', $args);
-			if(!$output->toBool()) return;
+			if (!$output->toBool()) return;
 
 			$mid_info = $output->data;
 			$this->applyDefaultSkin($mid_info);
-			if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $mid_info);
+			if ($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $mid_info);
 		}
 
-		if($mid_info && count($columnList))
+		if ($mid_info && count($columnList))
 		{
 			$module_info = new stdClass();
-			foreach($mid_info as $key => $item)
+			foreach ($mid_info as $key => $item)
 			{
-				if(in_array($key, $columnList))
+				if (in_array($key, $columnList))
 				{
 					$module_info->$key = $item;
 				}
@@ -403,7 +403,7 @@ 
 		else $module_info = $mid_info;
 
 		$oModuleController = getController('module');
-		if(isset($module_info->browser_title)) $oModuleController->replaceDefinedLangCode($module_info->browser_title);
+		if (isset($module_info->browser_title)) $oModuleController->replaceDefinedLangCode($module_info->browser_title);
 
 		$this->applyDefaultSkin($module_info);
 		return $this->addModuleExtraVars($module_info);
@@ -416,12 +416,12 @@ 
 	 */
 	private function applyDefaultSkin(&$moduleInfo)
 	{
-		if($moduleInfo->is_skin_fix == 'N')
+		if ($moduleInfo->is_skin_fix == 'N')
 		{
 			$moduleInfo->skin = '/USE_DEFAULT/';
 		}
 
-		if($moduleInfo->is_mskin_fix == 'N')
+		if ($moduleInfo->is_mskin_fix == 'N')
 		{
 			$moduleInfo->mskin = '/USE_DEFAULT/';
 		}
@@ -439,7 +439,7 @@ 
 		$count = count($output->data);
 
 		$modules = array();
-		for($i=0;$i<$count;$i++)
+		for ($i = 0; $i < $count; $i++)
 		{
 			$modules[] = $output->data[$i];
 		}
@@ -451,11 +451,11 @@ 
 	 */
 	function getModulesInfo($module_srls, $columnList = array())
 	{
-		if(is_array($module_srls)) $module_srls = implode(',',$module_srls);
+		if (is_array($module_srls)) $module_srls = implode(',', $module_srls);
 		$args = new stdClass();
 		$args->module_srls = $module_srls;
 		$output = executeQueryArray('module.getModulesInfo', $args, $columnList);
-		if(!$output->toBool()) return;
+		if (!$output->toBool()) return;
 		return $this->addModuleExtraVars($output->data);
 	}
 
@@ -465,31 +465,31 @@ 
 	function addModuleExtraVars($module_info)
 	{
 		// Process although one or more module informaion is requested
-		if(!is_array($module_info)) $target_module_info = array($module_info);
+		if (!is_array($module_info)) $target_module_info = array($module_info);
 		else $target_module_info = $module_info;
 		// Get module_srl
 		$module_srls = array();
-		foreach($target_module_info as $key => $val)
+		foreach ($target_module_info as $key => $val)
 		{
 			$module_srl = $val->module_srl;
-			if(!$module_srl) continue;
+			if (!$module_srl) continue;
 			$module_srls[] = $val->module_srl;
 		}
 		// Extract extra information of the module and skin
 		$extra_vars = $this->getModuleExtraVars($module_srls);
-		if(!count($module_srls) || !count($extra_vars)) return $module_info;
+		if (!count($module_srls) || !count($extra_vars)) return $module_info;
 
-		foreach($target_module_info as $key => $val)
+		foreach ($target_module_info as $key => $val)
 		{
-			if(!$extra_vars[$val->module_srl] || !count($extra_vars[$val->module_srl])) continue;
-			foreach($extra_vars[$val->module_srl] as $k => $v)
+			if (!$extra_vars[$val->module_srl] || !count($extra_vars[$val->module_srl])) continue;
+			foreach ($extra_vars[$val->module_srl] as $k => $v)
 			{
-				if($target_module_info[$key]->{$k}) continue;
+				if ($target_module_info[$key]->{$k}) continue;
 				$target_module_info[$key]->{$k} = $v;
 			}
 		}
 
-		if(is_array($module_info)) return $target_module_info;
+		if (is_array($module_info)) return $target_module_info;
 		return $target_module_info[0];
 	}
 
@@ -500,37 +500,37 @@ 
 	{
 		$list = false;
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			if(count($args) === 1 && isset($args->site_srl))
+			if (count($args) === 1 && isset($args->site_srl))
 			{
-				$object_key = 'module:mid_list_' . $args->site_srl;
+				$object_key = 'module:mid_list_'.$args->site_srl;
 				$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 				$list = $oCacheHandler->get($cache_key);
 			}
 		}
 
-		if($list === false)
+		if ($list === false)
 		{
-			if($oCacheHandler->isSupport() && count($args) === 1 && isset($args->site_srl))
+			if ($oCacheHandler->isSupport() && count($args) === 1 && isset($args->site_srl))
 			{
 				$columnList = array();
 			}
 
 			$output = executeQuery('module.getMidList', $args, $columnList);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 			$list = $output->data;
 
-			if($oCacheHandler->isSupport() && count($args) === 1 && isset($args->site_srl))
+			if ($oCacheHandler->isSupport() && count($args) === 1 && isset($args->site_srl))
 			{
 				$oCacheHandler->put($cache_key, $list);
 			}
 		}
-		if(!$list) return;
+		if (!$list) return;
 
-		if(!is_array($list)) $list = array($list);
+		if (!is_array($list)) $list = array($list);
 
-		foreach($list as $val)
+		foreach ($list as $val)
 		{
 			$mid_list[$val->mid] = $val;
 		}
@@ -544,10 +544,10 @@ 
 	function getModuleSrlList($args = null, $columnList = array())
 	{
 		$output = executeQueryArray('module.getMidList', $args, $columnList);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$list = $output->data;
-		if(!$list) return;
+		if (!$list) return;
 
 		return $list;
 	}
@@ -557,22 +557,22 @@ 
 	 */
 	function getModuleSrlByMid($mid)
 	{
-		if($mid && !is_array($mid)) $mid = explode(',',$mid);
-		if(is_array($mid)) $mid = "'".implode("','",$mid)."'";
+		if ($mid && !is_array($mid)) $mid = explode(',', $mid);
+		if (is_array($mid)) $mid = "'".implode("','", $mid)."'";
 
 		$site_module_info = Context::get('site_module_info');
 
 		$args = new stdClass;
 		$args->mid = $mid;
-		if($site_module_info) $args->site_srl = $site_module_info->site_srl;
+		if ($site_module_info) $args->site_srl = $site_module_info->site_srl;
 		$output = executeQuery('module.getModuleSrlByMid', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$list = $output->data;
-		if(!$list) return;
-		if(!is_array($list)) $list = array($list);
+		if (!$list) return;
+		if (!is_array($list)) $list = array($list);
 
-		foreach($list as $key => $val)
+		foreach ($list as $key => $val)
 		{
 			$module_srl_list[] = $val->module_srl;
 		}
@@ -588,33 +588,33 @@ 
 		$action_forward = false;
 		// cache controll
 		$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$cache_key = 'action_forward';
 			$action_forward = $oCacheHandler->get($cache_key);
 		}
 
 		// retrieve and caching all registered action_forward
-		if($action_forward === false)
+		if ($action_forward === false)
 		{
 			$args = new stdClass();
-			$output = executeQueryArray('module.getActionForward',$args);
-			if(!$output->toBool()) return new stdClass;
-			if(!$output->data) $output->data = array();
+			$output = executeQueryArray('module.getActionForward', $args);
+			if (!$output->toBool()) return new stdClass;
+			if (!$output->data) $output->data = array();
 
 			$action_forward = array();
-			foreach($output->data as $item)
+			foreach ($output->data as $item)
 			{
 				$action_forward[$item->act] = $item;
 			}
 
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$oCacheHandler->put($cache_key, $action_forward);
 			}
 		}
 
-		if($action_forward[$act])
+		if ($action_forward[$act])
 		{
 			return $action_forward[$act];
 		}
@@ -629,25 +629,25 @@ 
 	 */
 	function getTriggers($trigger_name, $called_position)
 	{
-		if(is_null($GLOBALS['__triggers__']))
+		if (is_null($GLOBALS['__triggers__']))
 		{
 			$triggers = FALSE;
 			$oCacheHandler = CacheHandler::getInstance('object', NULL, TRUE);
-			if($oCacheHandler->isSupport())
+			if ($oCacheHandler->isSupport())
 			{
 				$cache_key = 'triggers';
 				$triggers = $oCacheHandler->get($cache_key);
 			}
-			if($triggers === FALSE)
+			if ($triggers === FALSE)
 			{
 				$output = executeQueryArray('module.getTriggers');
 				$triggers = $output->data;
-				if($output->toBool() && $oCacheHandler->isSupport())
+				if ($output->toBool() && $oCacheHandler->isSupport())
 				{
 					$oCacheHandler->put($cache_key, $triggers);
 				}
 			}
-			foreach($triggers as $item)
+			foreach ($triggers as $item)
 			{
 				$GLOBALS['__triggers__'][$item->trigger_name][$item->called_position][] = $item;
 			}
@@ -663,11 +663,11 @@ 
 	{
 		$triggers = $this->getTriggers($trigger_name, $called_position);
 
-		if($triggers && is_array($triggers))
+		if ($triggers && is_array($triggers))
 		{
-			foreach($triggers as $item)
+			foreach ($triggers as $item)
 			{
-				if($item->module == $module && $item->type == $type && $item->called_method == $called_method)
+				if ($item->module == $module && $item->type == $type && $item->called_method == $called_method)
 				{
 					return $item;
 				}
@@ -680,12 +680,12 @@ 
 	/**
 	 * @brief Get module extend
 	 */
-	function getModuleExtend($parent_module, $type, $kind='')
+	function getModuleExtend($parent_module, $type, $kind = '')
 	{
 		$key = $parent_module.'.'.$kind.'.'.$type;
 
 		$module_extend_info = $this->loadModuleExtends();
-		if(array_key_exists($key, $module_extend_info))
+		if (array_key_exists($key, $module_extend_info))
 		{
 			return $module_extend_info[$key];
 		}
@@ -701,29 +701,29 @@ 
 		$cache_file = './files/config/module_extend.php';
 		$cache_file = FileHandler::getRealPath($cache_file);
 
-		if(!isset($GLOBALS['__MODULE_EXTEND__']))
+		if (!isset($GLOBALS['__MODULE_EXTEND__']))
 		{
 			// check pre install
-			if(file_exists(FileHandler::getRealPath('./files')) && !file_exists($cache_file))
+			if (file_exists(FileHandler::getRealPath('./files')) && !file_exists($cache_file))
 			{
 				$arr = array();
 				$output = executeQueryArray('module.getModuleExtend');
-				if($output->data)
+				if ($output->data)
 				{
-					foreach($output->data as $v)
+					foreach ($output->data as $v)
 					{
 						$arr[] = sprintf("'%s.%s.%s' => '%s'", $v->parent_module, $v->kind, $v->type, $v->extend_module);
 					}
 				}
 
 				$str = '<?PHP return array(%s); ?>';
-				$str = sprintf($str, join(',',$arr));
+				$str = sprintf($str, join(',', $arr));
 
 				FileHandler::writeFile($cache_file, $str);
 			}
 
 
-			if(file_exists($cache_file))
+			if (file_exists($cache_file))
 			{
 				$GLOBALS['__MODULE_EXTEND__'] = include($cache_file);
 			}
@@ -743,20 +743,20 @@ 
 	{
 		// Get a path of the requested module. Return if not exists.
 		$module_path = ModuleHandler::getModulePath($module);
-		if(!$module_path) return;
+		if (!$module_path) return;
 		// Read the xml file for module skin information
 		$xml_file = sprintf("%s/conf/info.xml", $module_path);
-		if(!file_exists($xml_file)) return;
+		if (!file_exists($xml_file)) return;
 
 		$oXmlParser = new XmlParser();
 		$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
 		$xml_obj = $tmp_xml_obj->module;
 
-		if(!$xml_obj) return;
+		if (!$xml_obj) return;
 
 		// Module Information
 		$module_info = new stdClass();
-		if($xml_obj->version && $xml_obj->attrs->version == '0.2')
+		if ($xml_obj->version && $xml_obj->attrs->version == '0.2')
 		{
 			// module format 0.2
 			$module_info->title = $xml_obj->title->body;
@@ -764,16 +764,16 @@ 
 			$module_info->version = $xml_obj->version->body;
 			$module_info->homepage = $xml_obj->link->body;
 			$module_info->category = $xml_obj->category->body;
-			if(!$module_info->category) $module_info->category = 'service';
+			if (!$module_info->category) $module_info->category = 'service';
 			sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
 			$module_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
 			$module_info->license = $xml_obj->license->body;
 			$module_info->license_link = $xml_obj->license->attrs->link;
 
-			if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
+			if (!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
 			else $author_list = $xml_obj->author;
 
-			foreach($author_list as $author)
+			foreach ($author_list as $author)
 			{
 				$author_obj = new stdClass();
 				$author_obj->name = $author->name->body;
@@ -789,7 +789,7 @@ 
 			$module_info->description = $xml_obj->author->description->body;
 			$module_info->version = $xml_obj->attrs->version;
 			$module_info->category = $xml_obj->attrs->category;
-			if(!$module_info->category) $module_info->category = 'service';
+			if (!$module_info->category) $module_info->category = 'service';
 			sscanf($xml_obj->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d);
 			$module_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
 			$author_obj = new stdClass();
@@ -818,17 +818,17 @@ 
 	{
 		// Get a path of the requested module. Return if not exists.
 		$class_path = ModuleHandler::getModulePath($module);
-		if(!$class_path) return;
+		if (!$class_path) return;
 
 		// Check if module.xml exists in the path. Return if not exist
 		$xml_file = sprintf("%sconf/module.xml", $class_path);
-		if(!file_exists($xml_file)) return;
+		if (!file_exists($xml_file)) return;
 
 		// Check if cached file exists
-		$cache_file = sprintf(_XE_PATH_ . "files/cache/module_info/%s.%s.%s.php", $module, Context::getLangType(), __XE_VERSION__);
+		$cache_file = sprintf(_XE_PATH_."files/cache/module_info/%s.%s.%s.php", $module, Context::getLangType(), __XE_VERSION__);
 
 		// Update if no cache file exists or it is older than xml file
-		if(!file_exists($cache_file) || filemtime($cache_file) < filemtime($xml_file) || $re_cache)
+		if (!file_exists($cache_file) || filemtime($cache_file) < filemtime($xml_file) || $re_cache)
 		{
 			$info = new stdClass();
 			$buff = array(); // /< Set buff variable to use in the cache file
@@ -841,7 +841,7 @@ 
 
 			$xml_obj = XmlParser::loadXmlFile($xml_file); // /< Read xml file and convert it to xml object
 
-			if(!count($xml_obj->module)) return; // /< Error occurs if module tag doesn't included in the xml
+			if (!count($xml_obj->module)) return; // /< Error occurs if module tag doesn't included in the xml
 
 			$grants = $xml_obj->module->grants->grant; // /< Permission information
 			$permissions = $xml_obj->module->permissions->permission; // /<  Acting permission
@@ -851,17 +851,17 @@ 
 			$default_index = $admin_index = '';
 
 			// Arrange permission information
-			if($grants)
+			if ($grants)
 			{
-				if(is_array($grants)) $grant_list = $grants;
+				if (is_array($grants)) $grant_list = $grants;
 				else $grant_list[] = $grants;
 
 				$info->grant = new stdClass();
 				$buff[] = '$info->grant = new stdClass;';
-				foreach($grant_list as $grant)
+				foreach ($grant_list as $grant)
 				{
 					$name = $grant->attrs->name;
-					$default = $grant->attrs->default?$grant->attrs->default:'guest';
+					$default = $grant->attrs->default ? $grant->attrs->default : 'guest';
 					$title = $grant->title->body;
 
 					$info->grant->{$name} = new stdClass();
@@ -874,15 +874,15 @@ 
 				}
 			}
 			// Permissions to grant
-			if($permissions)
+			if ($permissions)
 			{
-				if(is_array($permissions)) $permission_list = $permissions;
+				if (is_array($permissions)) $permission_list = $permissions;
 				else $permission_list[] = $permissions;
 
 				$buff[] = '$info->permission = new stdClass;';
 
 				$info->permission = new stdClass();
-				foreach($permission_list as $permission)
+				foreach ($permission_list as $permission)
 				{
 					$action = $permission->attrs->action;
 					$target = $permission->attrs->target;
@@ -893,14 +893,14 @@ 
 				}
 			}
 			// for admin menus
-			if($menus)
+			if ($menus)
 			{
-				if(is_array($menus)) $menu_list = $menus;
+				if (is_array($menus)) $menu_list = $menus;
 				else $menu_list[] = $menus;
 
 				$buff[] = '$info->menu = new stdClass;';
 				$info->menu = new stdClass();
-				foreach($menu_list as $menu)
+				foreach ($menu_list as $menu)
 				{
 					$menu_name = $menu->attrs->name;
 					$menu_title = is_array($menu->title) ? $menu->title[0]->body : $menu->title->body;
@@ -918,23 +918,23 @@ 
 			}
 
 			// actions
-			if($actions)
+			if ($actions)
 			{
-				if(is_array($actions)) $action_list = $actions;
+				if (is_array($actions)) $action_list = $actions;
 				else $action_list[] = $actions;
 
 				$buff[] = '$info->action = new stdClass;';
 				$info->action = new stdClass();
-				foreach($action_list as $action)
+				foreach ($action_list as $action)
 				{
 					$name = $action->attrs->name;
 
 					$type = $action->attrs->type;
-					$grant = $action->attrs->grant?$action->attrs->grant:'guest';
-					$standalone = $action->attrs->standalone=='false'?'false':'true';
-					$ruleset = $action->attrs->ruleset?$action->attrs->ruleset:'';
-					$method = $action->attrs->method?$action->attrs->method:'';
-					$check_csrf = $action->attrs->check_csrf=='false'?'false':'true';
+					$grant = $action->attrs->grant ? $action->attrs->grant : 'guest';
+					$standalone = $action->attrs->standalone == 'false' ? 'false' : 'true';
+					$ruleset = $action->attrs->ruleset ? $action->attrs->ruleset : '';
+					$method = $action->attrs->method ? $action->attrs->method : '';
+					$check_csrf = $action->attrs->check_csrf == 'false' ? 'false' : 'true';
 
 					$index = $action->attrs->index;
 					$admin_index = $action->attrs->admin_index;
@@ -949,14 +949,14 @@ 
 					$info->action->{$name}->ruleset = $ruleset;
 					$info->action->{$name}->method = $method;
 					$info->action->{$name}->check_csrf = $check_csrf;
-					if($action->attrs->menu_name)
+					if ($action->attrs->menu_name)
 					{
-						if($menu_index == 'true')
+						if ($menu_index == 'true')
 						{
 							$info->menu->{$action->attrs->menu_name}->index = $name;
 							$buff[] = sprintf('$info->menu->%s->index=\'%s\';', $action->attrs->menu_name, $name);
 						}
-						if(is_array($info->menu->{$action->attrs->menu_name}->acts))
+						if (is_array($info->menu->{$action->attrs->menu_name}->acts))
 						{
 							$info->menu->{$action->attrs->menu_name}->acts[] = $name;
 							$currentKey = array_search($name, $info->menu->{$action->attrs->menu_name}->acts);
@@ -974,22 +974,22 @@ 
 					$buff[] = sprintf('$info->action->%s->method=\'%s\';', $name, $method);
 					$buff[] = sprintf('$info->action->%s->check_csrf=\'%s\';', $name, $check_csrf);
 
-					if($index=='true')
+					if ($index == 'true')
 					{
 						$default_index_act = $name;
 						$info->default_index_act = $name;
 					}
-					if($admin_index=='true')
+					if ($admin_index == 'true')
 					{
 						$admin_index_act = $name;
 						$info->admin_index_act = $name;
 					}
-					if($setup_index=='true')
+					if ($setup_index == 'true')
 					{
 						$setup_index_act = $name;
 						$info->setup_index_act = $name;
 					}
-					if($simple_setup_index=='true')
+					if ($simple_setup_index == 'true')
 					{
 						$simple_setup_index_act = $name;
 						$info->simple_setup_index_act = $name;
@@ -1010,7 +1010,7 @@ 
 			return $info;
 		}
 
-		if(file_exists($cache_file)) return include($cache_file);
+		if (file_exists($cache_file)) return include($cache_file);
 	}
 
 	/**
@@ -1021,7 +1021,7 @@ 
 	{
 		$module = Context::get('module_type');
 
-		if($module == 'ARTICLE')
+		if ($module == 'ARTICLE')
 		{
 			$module = 'page';
 		}
@@ -1041,26 +1041,26 @@ 
 	 */
 	function getSkins($path, $dir = 'skins')
 	{
-		if(substr($path, -1) == '/')
+		if (substr($path, -1) == '/')
 		{
 			$path = substr($path, 0, -1);
 		}
 
 		$skin_path = sprintf("%s/%s/", $path, $dir);
 		$list = FileHandler::readDir($skin_path);
-		if(!count($list)) return;
+		if (!count($list)) return;
 
 		natcasesort($list);
 
-		foreach($list as $skin_name)
+		foreach ($list as $skin_name)
 		{
-			if(!is_dir($skin_path . $skin_name))
+			if (!is_dir($skin_path.$skin_name))
 			{
 				continue;
 			}
 			unset($skin_info);
 			$skin_info = $this->loadSkinInfo($path, $skin_name, $dir);
-			if(!$skin_info)
+			if (!$skin_info)
 			{
 				$skin_info = new stdClass();
 				$skin_info->title = $skin_name;
@@ -1073,15 +1073,15 @@ 
 		$tmpPath = trim($tmpPath);
 		$module = array_pop(explode(' ', $tmpPath));
 
-		if($dir == 'skins')
+		if ($dir == 'skins')
 		{
 			$oAdminModel = getAdminModel('admin');
 			$themesInfo = $oAdminModel->getThemeList();
 
-			foreach($themesInfo as $themeName => $info)
+			foreach ($themesInfo as $themeName => $info)
 			{
 				$skinInfos = $info->skin_infos;
-				if(isset($skinInfos[$module]) && $skinInfos[$module]->is_theme)
+				if (isset($skinInfos[$module]) && $skinInfos[$module]->is_theme)
 				{
 					$themeSkinInfo = $GLOBALS['__ThemeModuleSkin__'][$module]['skins'][$skinInfos[$module]->name];
 					$skin_list[$skinInfos[$module]->name] = $themeSkinInfo;
@@ -1093,13 +1093,13 @@ 
 		$oMenuAdminModel = getAdminModel('menu');
 		$installedMenuTypes = $oMenuAdminModel->getModuleListInSitemap($siteInfo->site_srl);
 		$moduleName = $module;
-		if($moduleName === 'page')
+		if ($moduleName === 'page')
 		{
 			$moduleName = 'ARTICLE';
 		}
-		if(array_key_exists($moduleName, $installedMenuTypes))
+		if (array_key_exists($moduleName, $installedMenuTypes))
 		{
-			if($dir == 'skins')
+			if ($dir == 'skins')
 			{
 				$type = 'P';
 			}
@@ -1109,12 +1109,12 @@ 
 			}
 			$defaultSkinName = $this->getModuleDefaultSkin($module, $type, $site_info->site_srl);
 
-			if(isset($defaultSkinName))
+			if (isset($defaultSkinName))
 			{
 				$defaultSkinInfo = $this->loadSkinInfo($path, $defaultSkinName, $dir);
 
 				$useDefault = new stdClass();
-				$useDefault->title = Context::getLang('use_site_default_skin') . ' (' . $defaultSkinInfo->title . ')';
+				$useDefault->title = Context::getLang('use_site_default_skin').' ('.$defaultSkinInfo->title.')';
 
 				$useDefaultList['/USE_DEFAULT/'] = $useDefault;
 
@@ -1131,20 +1131,20 @@ 
 	function loadSkinInfo($path, $skin, $dir = 'skins')
 	{
 		// Read xml file having skin information
-		if(substr($path,-1)!='/') $path .= '/';
+		if (substr($path, -1) != '/') $path .= '/';
 		$skin_xml_file = sprintf("%s%s/%s/skin.xml", $path, $dir, $skin);
-		if(!file_exists($skin_xml_file)) return;
+		if (!file_exists($skin_xml_file)) return;
 		// Create XmlParser object
 		$oXmlParser = new XmlParser();
 		$_xml_obj = $oXmlParser->loadXmlFile($skin_xml_file);
 		// Return if no skin information is
-		if(!$_xml_obj->skin) return;
+		if (!$_xml_obj->skin) return;
 		$xml_obj = $_xml_obj->skin;
 		// Skin Name
 		$skin_info = new stdClass();
 		$skin_info->title = $xml_obj->title->body;
 		// Author information
-		if($xml_obj->version && $xml_obj->attrs->version == '0.2')
+		if ($xml_obj->version && $xml_obj->attrs->version == '0.2')
 		{
 			// skin format v0.2
 			sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
@@ -1155,10 +1155,10 @@ 
 			$skin_info->license_link = $xml_obj->license->attrs->link;
 			$skin_info->description = $xml_obj->description->body;
 
-			if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
+			if (!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
 			else $author_list = $xml_obj->author;
 
-			foreach($author_list as $author)
+			foreach ($author_list as $author)
 			{
 				$author_obj = new stdClass();
 				$author_obj->name = $author->name->body;
@@ -1167,25 +1167,25 @@ 
 				$skin_info->author[] = $author_obj;
 			}
 			// List extra vars
-			if($xml_obj->extra_vars)
+			if ($xml_obj->extra_vars)
 			{
 				$extra_var_groups = $xml_obj->extra_vars->group;
-				if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-				if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+				if (!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+				if (!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
 
-				foreach($extra_var_groups as $group)
+				foreach ($extra_var_groups as $group)
 				{
 					$extra_vars = $group->var;
-					if(!$extra_vars)
+					if (!$extra_vars)
 					{
 						continue;
 					}
-					if(!is_array($group->var)) $extra_vars = array($group->var);
+					if (!is_array($group->var)) $extra_vars = array($group->var);
 
-					foreach($extra_vars as $key => $val)
+					foreach ($extra_vars as $key => $val)
 					{
 						$obj = new stdClass();
-						if(!$val->attrs->type) { $val->attrs->type = 'text'; }
+						if (!$val->attrs->type) { $val->attrs->type = 'text'; }
 
 						$obj->group = $group->title->body;
 						$obj->name = $val->attrs->name;
@@ -1194,14 +1194,14 @@ 
 						$obj->description = $val->description->body;
 						$obj->value = $extra_vals->{$obj->name};
 						$obj->default = $val->attrs->default;
-						if(strpos($obj->value, '|@|') != false) { $obj->value = explode('|@|', $obj->value); }
-						if($obj->type == 'mid_list' && !is_array($obj->value)) { $obj->value = array($obj->value); }
+						if (strpos($obj->value, '|@|') != false) { $obj->value = explode('|@|', $obj->value); }
+						if ($obj->type == 'mid_list' && !is_array($obj->value)) { $obj->value = array($obj->value); }
 						// Get an option list from 'select'type
-						if(is_array($val->options))
+						if (is_array($val->options))
 						{
 							$option_count = count($val->options);
 
-							for($i = 0; $i < $option_count; $i++)
+							for ($i = 0; $i < $option_count; $i++)
 							{
 								$obj->options[$i] = new stdClass();
 								$obj->options[$i]->title = $val->options[$i]->title->body;
@@ -1238,18 +1238,18 @@ 
 			$skin_info->author[0]->homepage = $xml_obj->maker->attrs->link;
 			// Variables used in the skin
 			$extra_var_groups = $xml_obj->extra_vars->group;
-			if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-			if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+			if (!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+			if (!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
 
-			foreach($extra_var_groups as $group)
+			foreach ($extra_var_groups as $group)
 			{
 				$extra_vars = $group->var;
 
-				if($extra_vars)
+				if ($extra_vars)
 				{
-					if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
+					if (!is_array($extra_vars)) $extra_vars = array($extra_vars);
 
-					foreach($extra_vars as $var)
+					foreach ($extra_vars as $var)
 					{
 						unset($obj);
 						unset($options);
@@ -1260,11 +1260,11 @@ 
 						$title = $var->title->body;
 						$description = $var->description->body;
 						// Get an option list from 'select'type.
-						if(is_array($var->default))
+						if (is_array($var->default))
 						{
 							$option_count = count($var->default);
 
-							for($i = 0; $i < $option_count; $i++)
+							for ($i = 0; $i < $option_count; $i++)
 							{
 								$options[$i]->title = $var->default[$i]->body;
 								$options[$i]->value = $var->default[$i]->body;
@@ -1298,19 +1298,19 @@ 
 
 		// colorset
 		$colorset = $xml_obj->colorset->color;
-		if($colorset)
+		if ($colorset)
 		{
-			if(!is_array($colorset)) $colorset = array($colorset);
+			if (!is_array($colorset)) $colorset = array($colorset);
 
-			foreach($colorset as $color)
+			foreach ($colorset as $color)
 			{
 				$name = $color->attrs->name;
 				$title = $color->title->body;
 				$screenshot = $color->attrs->src;
-				if($screenshot)
+				if ($screenshot)
 				{
 					$screenshot = sprintf("%s%s/%s/%s", $path, $dir, $skin, $screenshot);
-					if(!file_exists($screenshot)) $screenshot = "";
+					if (!file_exists($screenshot)) $screenshot = "";
 				}
 				else $screenshot = "";
 
@@ -1322,19 +1322,19 @@ 
 			}
 		}
 		// Menu type (settings for layout)
-		if($xml_obj->menus->menu)
+		if ($xml_obj->menus->menu)
 		{
 			$menus = $xml_obj->menus->menu;
-			if(!is_array($menus)) $menus = array($menus);
+			if (!is_array($menus)) $menus = array($menus);
 
 			$menu_count = count($menus);
 			$skin_info->menu_count = $menu_count;
-			for($i=0;$i<$menu_count;$i++)
+			for ($i = 0; $i < $menu_count; $i++)
 			{
 				unset($obj);
 
 				$obj->name = $menus[$i]->attrs->name;
-				if($menus[$i]->attrs->default == "true") $obj->default = true;
+				if ($menus[$i]->attrs->default == "true") $obj->default = true;
 				$obj->title = $menus[$i]->title->body;
 				$obj->maxdepth = $menus[$i]->maxdepth->body;
 
@@ -1343,7 +1343,7 @@ 
 		}
 
 		$thumbnail = sprintf("%s%s/%s/thumbnail.png", $path, $dir, $skin);
-		$skin_info->thumbnail = (file_exists($thumbnail))?$thumbnail:null;
+		$skin_info->thumbnail = (file_exists($thumbnail)) ? $thumbnail : null;
 		return $skin_info;
 	}
 
@@ -1354,7 +1354,7 @@ 
 	{
 		$args = new stdClass;
 		$args->site_srl = $site_srl;
-		if(!is_null($module)) $args->module = $module;
+		if (!is_null($module)) $args->module = $module;
 		$output = executeQuery('module.getModuleCount', $args);
 		return $output->data->count;
 	}
@@ -1368,26 +1368,26 @@ 
 		$config = false;
 		// cache controll
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			$object_key = 'module_config:' . $module . '_' . $site_srl;
+			$object_key = 'module_config:'.$module.'_'.$site_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 			$config = $oCacheHandler->get($cache_key);
 		}
 
-		if($config === false)
+		if ($config === false)
 		{
-			if(!$GLOBALS['__ModuleConfig__'][$site_srl][$module])
+			if (!$GLOBALS['__ModuleConfig__'][$site_srl][$module])
 			{
 				$args = new stdClass();
 				$args->module = $module;
 				$args->site_srl = $site_srl;
 				$output = executeQuery('module.getModuleConfig', $args);
-				if($output->data->config) $config = unserialize($output->data->config);
+				if ($output->data->config) $config = unserialize($output->data->config);
 				else $config = null;
 
 				//insert in cache
-				if($oCacheHandler->isSupport())
+				if ($oCacheHandler->isSupport())
 				{
 					$oCacheHandler->put($cache_key, $config);
 				}
@@ -1408,26 +1408,26 @@ 
 		$config = false;
 		// cache controll
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$object_key = 'module_part_config:'.$module.'_'.$module_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 			$config = $oCacheHandler->get($cache_key);
 		}
 
-		if($config === false)
+		if ($config === false)
 		{
-			if(!isset($GLOBALS['__ModulePartConfig__'][$module][$module_srl]))
+			if (!isset($GLOBALS['__ModulePartConfig__'][$module][$module_srl]))
 			{
 				$args = new stdClass();
 				$args->module = $module;
 				$args->module_srl = $module_srl;
 				$output = executeQuery('module.getModulePartConfig', $args);
-				if($output->data->config) $config = unserialize($output->data->config);
+				if ($output->data->config) $config = unserialize($output->data->config);
 				else $config = null;
 
 				//insert in cache
-				if($oCacheHandler->isSupport())
+				if ($oCacheHandler->isSupport())
 				{
 					$oCacheHandler->put($cache_key, $config);
 				}
@@ -1446,11 +1446,11 @@ 
 	{
 		$args = new stdClass();
 		$args->module = $module;
-		if($site_srl) $args->site_srl = $site_srl;
+		if ($site_srl) $args->site_srl = $site_srl;
 		$output = executeQueryArray('module.getModulePartConfigs', $args);
-		if(!$output->toBool() || !$output->data) return array();
+		if (!$output->toBool() || !$output->data) return array();
 
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			$result[$val->module_srl] = unserialize($val->config);
 		}
@@ -1466,12 +1466,12 @@ 
 		$args->moduleCategorySrl = $moduleCategorySrl;
 		// Get data from the DB
 		$output = executeQuery('module.getModuleCategories', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		$list = $output->data;
-		if(!$list) return;
-		if(!is_array($list)) $list = array($list);
+		if (!$list) return;
+		if (!is_array($list)) $list = array($list);
 
-		foreach($list as $val)
+		foreach ($list as $val)
 		{
 			$category_list[$val->module_category_srl] = $val;
 		}
@@ -1487,7 +1487,7 @@ 
 		$args = new stdClass;
 		$args->module_category_srl = $module_category_srl;
 		$output = executeQuery('module.getModuleCategory', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		return $output->data;
 	}
 
@@ -1499,10 +1499,10 @@ 
 		// Get a list of downloaded and installed modules
 		$searched_list = FileHandler::readDir('./modules');
 		$searched_count = count($searched_list);
-		if(!$searched_count) return;
+		if (!$searched_count) return;
 		sort($searched_list);
 
-		for($i=0;$i<$searched_count;$i++)
+		for ($i = 0; $i < $searched_count; $i++)
 		{
 			// Module name
 			$module_name = $searched_list[$i];
@@ -1512,7 +1512,7 @@ 
 			$info = $this->getModuleInfoXml($module_name);
 			unset($obj);
 
-			if(!isset($info)) continue;
+			if (!isset($info)) continue;
 			$info->module = $module_name;
 			$info->created_table_count = $created_table_count;
 			$info->table_count = $table_count;
@@ -1529,19 +1529,19 @@ 
 		$info = null;
 
 		$moduledir = ModuleHandler::getModulePath($module_name);
-		if(file_exists(FileHandler::getRealPath($moduledir."schemas")))
+		if (file_exists(FileHandler::getRealPath($moduledir."schemas")))
 		{
 			$tmp_files = FileHandler::readDir($moduledir."schemas", '/(\.xml)$/');
 			$table_count = count($tmp_files);
 			// Check if the table is created
 			$created_table_count = 0;
-			for($j=0;$j<count($tmp_files);$j++)
+			for ($j = 0; $j < count($tmp_files); $j++)
 			{
-				list($table_name) = explode(".",$tmp_files[$j]);
-				if($oDB->isTableExists($table_name)) $created_table_count ++;
+				list($table_name) = explode(".", $tmp_files[$j]);
+				if ($oDB->isTableExists($table_name)) $created_table_count++;
 			}
 			// Check if DB is installed
-			if($table_count > $created_table_count) return true;
+			if ($table_count > $created_table_count) return true;
 			else return false;
 		}
 		return false;
@@ -1551,7 +1551,7 @@ 
 	{
 		// Check if it is upgraded to module.class.php on each module
 		$oDummy = getModule($module_name, 'class');
-		if($oDummy && method_exists($oDummy, "checkUpdate"))
+		if ($oDummy && method_exists($oDummy, "checkUpdate"))
 		{
 			return $oDummy->checkUpdate();
 		}
@@ -1565,15 +1565,15 @@ 
 	 */
 	public function needUpdate($update_id)
 	{
-		if(!is_array($update_id)) $update_id = array($update_id);
+		if (!is_array($update_id)) $update_id = array($update_id);
 
 		$args = new stdClass();
 		$args->update_id = implode(',', $update_id);
 		$output = executeQueryArray('module.getModuleUpdateLog', $args);
 
-		if(!!$output->error) return false;
-		if(!$output->data) $output->data = array();
-		if(count($update_id) === count($output->data)) return false;
+		if (!!$output->error) return false;
+		if (!$output->data) $output->data = array();
+		if (count($update_id) === count($output->data)) return false;
 
 		return true;
 	}
@@ -1590,31 +1590,31 @@ 
 		sort($searched_list);
 
 		$searched_count = count($searched_list);
-		if(!$searched_count) return;
+		if (!$searched_count) return;
 
-		for($i=0;$i<$searched_count;$i++)
+		for ($i = 0; $i < $searched_count; $i++)
 		{
 			// module name
 			$module_name = $searched_list[$i];
 
 			$path = ModuleHandler::getModulePath($module_name);
-			if(!is_dir(FileHandler::getRealPath($path))) continue;
+			if (!is_dir(FileHandler::getRealPath($path))) continue;
 
 			// Get the number of xml files to create a table in schemas
 			$tmp_files = FileHandler::readDir($path.'schemas', '/(\.xml)$/');
 			$table_count = count($tmp_files);
 			// Check if the table is created
 			$created_table_count = 0;
-			for($j=0;$j<$table_count;$j++)
+			for ($j = 0; $j < $table_count; $j++)
 			{
-				list($table_name) = explode('.',$tmp_files[$j]);
-				if($oDB->isTableExists($table_name)) $created_table_count ++;
+				list($table_name) = explode('.', $tmp_files[$j]);
+				if ($oDB->isTableExists($table_name)) $created_table_count++;
 			}
 			// Get information of the module
 			$info = NULL;
 			$info = $this->getModuleInfoXml($module_name);
 
-			if(!$info) continue;
+			if (!$info) continue;
 
 			$info->module = $module_name;
 			$info->category = $info->category;
@@ -1623,12 +1623,12 @@ 
 			$info->path = $path;
 			$info->admin_index_act = $info->admin_index_act;
 			// Check if DB is installed
-			if($table_count > $created_table_count) $info->need_install = true;
+			if ($table_count > $created_table_count) $info->need_install = true;
 			else $info->need_install = false;
 			// Check if it is upgraded to module.class.php on each module
 			$oDummy = null;
 			$oDummy = getModule($module_name, 'class');
-			if($oDummy && method_exists($oDummy, "checkUpdate"))
+			if ($oDummy && method_exists($oDummy, "checkUpdate"))
 			{
 				$info->need_update = $oDummy->checkUpdate();
 			}
@@ -1649,15 +1649,15 @@ 
 	 */
 	function syncModuleToSite(&$data)
 	{
-		if(!$data) return;
+		if (!$data) return;
 
-		if(is_array($data))
+		if (is_array($data))
 		{
-			foreach($data as $key => $val)
+			foreach ($data as $key => $val)
 			{
 				$module_srls[] = $val->module_srl;
 			}
-			if(!count($module_srls)) return;
+			if (!count($module_srls)) return;
 		}
 		else
 		{
@@ -1665,17 +1665,17 @@ 
 		}
 
 		$args = new stdClass();
-		$args->module_srls = implode(',',$module_srls);
+		$args->module_srls = implode(',', $module_srls);
 		$output = executeQueryArray('module.getModuleSites', $args);
-		if(!$output->data) return array();
-		foreach($output->data as $key => $val)
+		if (!$output->data) return array();
+		foreach ($output->data as $key => $val)
 		{
 			$modules[$val->module_srl] = $val;
 		}
 
-		if(is_array($data))
+		if (is_array($data))
 		{
-			foreach($data as $key => $val)
+			foreach ($data as $key => $val)
 			{
 				$data[$key]->domain = $modules[$val->module_srl]->domain;
 			}
@@ -1691,14 +1691,14 @@ 
 	 */
 	function isSiteAdmin($member_info, $site_srl = null)
 	{
-		if(!$member_info->member_srl) return false;
-		if($member_info->is_admin == 'Y') return true;
+		if (!$member_info->member_srl) return false;
+		if ($member_info->is_admin == 'Y') return true;
 
 		$args = new stdClass();
-		if(!isset($site_srl))
+		if (!isset($site_srl))
 		{
 			$site_module_info = Context::get('site_module_info');
-			if(!$site_module_info) return;
+			if (!$site_module_info) return;
 			$args->site_srl = $site_module_info->site_srl;
 		}
 		else
@@ -1708,7 +1708,7 @@ 
 
 		$args->member_srl = $member_info->member_srl;
 		$output = executeQuery('module.isSiteAdmin', $args);
-		if($output->data->member_srl == $args->member_srl) return true;
+		if ($output->data->member_srl == $args->member_srl) return true;
 		return false;
 	}
 
@@ -1731,7 +1731,7 @@ 
 		$obj = new stdClass();
 		$obj->module_srl = $module_srl;
 		$output = executeQueryArray('module.getAdminID', $obj);
-		if(!$output->toBool() || !$output->data) return;
+		if (!$output->toBool() || !$output->data) return;
 
 		return $output->data;
 	}
@@ -1744,20 +1744,20 @@ 
 	{
 		$extra_vars = array();
 		$get_module_srls = array();
-		if(!is_array($list_module_srl)) $list_module_srl = array($list_module_srl);
+		if (!is_array($list_module_srl)) $list_module_srl = array($list_module_srl);
 
 		$vars = false;
 		// cache controll
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
-			foreach($list_module_srl as $module_srl)
+			foreach ($list_module_srl as $module_srl)
 			{
 				$object_key = 'module_extra_vars:'.$module_srl;
 				$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 				$vars = $oCacheHandler->get($cache_key);
 
-				if($vars)
+				if ($vars)
 				{
 					$extra_vars[$module_srl] = $vars;
 				}
@@ -1772,35 +1772,35 @@ 
 			$get_module_srls = $list_module_srl;
 		}
 
-		if(count($get_module_srls) > 0)
+		if (count($get_module_srls) > 0)
 		{
 			$args = new stdClass();
 			$args->module_srl = implode(',', $get_module_srls);
 			$output = executeQueryArray('module.getModuleExtraVars', $args);
 
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return;
 			}
 
-			if(!$output->data)
+			if (!$output->data)
 			{
-				foreach($get_module_srls as $module_srl)
+				foreach ($get_module_srls as $module_srl)
 				{
 					$extra_vars[$module_srl] = new stdClass;
 				}
 			}
-			foreach($output->data as $key => $val)
+			foreach ($output->data as $key => $val)
 			{
-				if(in_array($val->name, array('mid','module')) || $val->value == 'Array') continue;
+				if (in_array($val->name, array('mid', 'module')) || $val->value == 'Array') continue;
 
-				if(!isset($extra_vars[$val->module_srl]))
+				if (!isset($extra_vars[$val->module_srl]))
 				{
 					$extra_vars[$val->module_srl] = new stdClass();
 				}
 				$extra_vars[$val->module_srl]->{$val->name} = $val->value;
 
-				if($oCacheHandler->isSupport())
+				if ($oCacheHandler->isSupport())
 				{
 					$object_key = 'module_extra_vars:'.$val->module_srl;
 					$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
@@ -1819,27 +1819,27 @@ 
 	{
 		$skin_vars = false;
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$object_key = 'module_skin_vars:'.$module_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 			$skin_vars = $oCacheHandler->get($cache_key);
 		}
 
-		if($skin_vars === false)
+		if ($skin_vars === false)
 		{
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
-			$output = executeQueryArray('module.getModuleSkinVars',$args);
-			if(!$output->toBool()) return;
+			$output = executeQueryArray('module.getModuleSkinVars', $args);
+			if (!$output->toBool()) return;
 
 			$skin_vars = array();
-			foreach($output->data as $vars)
+			foreach ($output->data as $vars)
 			{
 				$skin_vars[$vars->name] = $vars;
 			}
 
-			if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $skin_vars);
+			if ($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $skin_vars);
 		}
 
 		return $skin_vars;
@@ -1851,32 +1851,32 @@ 
 	function getModuleDefaultSkin($module_name, $skin_type = 'P', $site_srl = 0, $updateCache = true)
 	{
 		$target = ($skin_type == 'M') ? 'mskin' : 'skin';
-		if(!$site_srl) $site_srl = 0;
+		if (!$site_srl) $site_srl = 0;
 
 		$designInfoFile = sprintf(_XE_PATH_.'files/site_design/design_%s.php', $site_srl);
-		if(is_readable($designInfoFile))
+		if (is_readable($designInfoFile))
 		{
 			include($designInfoFile);
 
 			$skinName = $designInfo->module->{$module_name}->{$target};
 		}
-		if(!$skinName)
+		if (!$skinName)
 		{
 			$dir = ($skin_type == 'M') ? 'm.skins/' : 'skins/';
 			$moduleSkinPath = ModuleHandler::getModulePath($module_name).$dir;
 
-			if(is_dir($moduleSkinPath.'default'))
+			if (is_dir($moduleSkinPath.'default'))
 			{
 				$skinName = 'default';
 			}
-			else if(is_dir($moduleSkinPath.'xe_default'))
+			else if (is_dir($moduleSkinPath.'xe_default'))
 			{
 				$skinName = 'xe_default';
 			}
 			else
 			{
 				$skins = FileHandler::readDir($moduleSkinPath);
-				if(count($skins) > 0)
+				if (count($skins) > 0)
 				{
 					$skinName = $skins[0];
 				}
@@ -1886,9 +1886,9 @@ 
 				}
 			}
 
-			if($updateCache && $skinName)
+			if ($updateCache && $skinName)
 			{
-				if(!isset($designInfo->module->{$module_name})) $designInfo->module->{$module_name} = new stdClass();
+				if (!isset($designInfo->module->{$module_name})) $designInfo->module->{$module_name} = new stdClass();
 				$designInfo->module->{$module_name}->{$target} = $skinName;
 
 				$oAdminController = getAdminController('admin');
@@ -1904,10 +1904,10 @@ 
 	 */
 	function syncSkinInfoToModuleInfo(&$module_info)
 	{
-		if(!$module_info->module_srl) return;
+		if (!$module_info->module_srl) return;
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if(Mobile::isFromMobilePhone())
+		if (Mobile::isFromMobilePhone())
 		{
 			$skin_vars = $this->getModuleMobileSkinVars($module_info->module_srl);
 		}
@@ -1916,11 +1916,11 @@ 
 			$skin_vars = $this->getModuleSkinVars($module_info->module_srl);
 		}
 
-		if(!$skin_vars) return;
+		if (!$skin_vars) return;
 
-		foreach($skin_vars as $name => $val)
+		foreach ($skin_vars as $name => $val)
 		{
-			if(isset($module_info->{$name})) continue;
+			if (isset($module_info->{$name})) continue;
 			$module_info->{$name} = $val->value;
 		}
 	}
@@ -1934,27 +1934,27 @@ 
 	{
 		$skin_vars = false;
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$object_key = 'module_mobile_skin_vars:'.$module_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 			$skin_vars = $oCacheHandler->get($cache_key);
 		}
 
-		if($skin_vars === false)
+		if ($skin_vars === false)
 		{
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
-			$output = executeQueryArray('module.getModuleMobileSkinVars',$args);
-			if(!$output->toBool() || !$output->data) return;
+			$output = executeQueryArray('module.getModuleMobileSkinVars', $args);
+			if (!$output->toBool() || !$output->data) return;
 
 			$skin_vars = array();
-			foreach($output->data as $vars)
+			foreach ($output->data as $vars)
 			{
 				$skin_vars[$vars->name] = $vars;
 			}
 
-			if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $skin_vars);
+			if ($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $skin_vars);
 		}
 
 		return $skin_vars;
@@ -1966,32 +1966,32 @@ 
 	 */
 	function syncMobileSkinInfoToModuleInfo(&$module_info)
 	{
-		if(!$module_info->module_srl) return;
+		if (!$module_info->module_srl) return;
 		$skin_vars = false;
 		// cache controll
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			$object_key = 'module_mobile_skin_vars:'.$module_info->module_srl;
 			$cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 			$skin_vars = $oCacheHandler->get($cache_key);
 		}
-		if($skin_vars === false)
+		if ($skin_vars === false)
 		{
 			$args = new stdClass;
 			$args->module_srl = $module_info->module_srl;
-			$output = executeQueryArray('module.getModuleMobileSkinVars',$args);
-			if(!$output->toBool()) return;
+			$output = executeQueryArray('module.getModuleMobileSkinVars', $args);
+			if (!$output->toBool()) return;
 			$skin_vars = $output->data;
 
 			//insert in cache
-			if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $skin_vars);
+			if ($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $skin_vars);
 		}
-		if(!$skin_vars) return;
+		if (!$skin_vars) return;
 
-		foreach($output->data as $val)
+		foreach ($output->data as $val)
 		{
-			if(isset($module_info->{$val->name})) continue;
+			if (isset($module_info->{$val->name})) continue;
 			$module_info->{$val->name} = $val->value;
 		}
 	}
@@ -2003,7 +2003,7 @@ 
 	{
 		$grant = new stdClass();
 
-		if(!$xml_info)
+		if (!$xml_info)
 		{
 			$module = $module_info->module;
 			$xml_info = $this->getModuleActionXml($module);
@@ -2011,9 +2011,9 @@ 
 		// Set variables to grant group permission
 		$module_srl = $module_info->module_srl;
 		$grant_info = $xml_info->grant;
-		if($member_info->member_srl)
+		if ($member_info->member_srl)
 		{
-			if(is_array($member_info->group_list)) $group_list = array_keys($member_info->group_list);
+			if (is_array($member_info->group_list)) $group_list = array_keys($member_info->group_list);
 			else $group_list = array();
 		}
 		else
@@ -2021,10 +2021,10 @@ 
 			$group_list = array();
 		}
 		// If module_srl doesn't exist(if unable to set permissions)
-		if(!$module_srl)
+		if (!$module_srl)
 		{
 			$grant->access = true;
-			if($this->isSiteAdmin($member_info, $module_info->site_srl))
+			if ($this->isSiteAdmin($member_info, $module_info->site_srl))
 			{
 				$grant->access = $grant->manager = $grant->is_site_admin = true;
 			}
@@ -2035,23 +2035,23 @@ 
 		{
 			// If module_srl exists
 			// Get a type of granted permission
-			$grant->access = $grant->manager = $grant->is_site_admin = ($member_info->is_admin=='Y'||$this->isSiteAdmin($member_info, $module_info->site_srl))?true:false;
+			$grant->access = $grant->manager = $grant->is_site_admin = ($member_info->is_admin == 'Y' || $this->isSiteAdmin($member_info, $module_info->site_srl)) ? true : false;
 			$grant->is_admin = ($member_info->is_admin == 'Y') ? true : false;
 			// If a just logged-in member is, check if the member is a module administrator
-			if(!$grant->manager && $member_info->member_srl)
+			if (!$grant->manager && $member_info->member_srl)
 			{
 				$args = new stdClass();
 				$args->module_srl = $module_srl;
 				$args->member_srl = $member_info->member_srl;
-				$output = executeQuery('module.getModuleAdmin',$args);
-				if($output->data && $output->data->member_srl == $member_info->member_srl) $grant->manager = true;
+				$output = executeQuery('module.getModuleAdmin', $args);
+				if ($output->data && $output->data->member_srl == $member_info->member_srl) $grant->manager = true;
 			}
 			// If not an administrator, get information from the DB and grant manager privilege.
-			if(!$grant->manager)
+			if (!$grant->manager)
 			{
 				$args = new stdClass();
 				// If planet, get permission settings from the planet home
-				if($module_info->module == 'planet')
+				if ($module_info->module == 'planet')
 				{
 					$output = executeQueryArray('module.getPlanetGrants', $args);
 				}
@@ -2064,42 +2064,42 @@ 
 
 				$grant_exists = $granted = array();
 
-				if($output->data)
+				if ($output->data)
 				{
 					// Arrange names and groups who has privileges
-					foreach($output->data as $val)
+					foreach ($output->data as $val)
 					{
 						$grant_exists[$val->name] = true;
-						if($granted[$val->name]) continue;
+						if ($granted[$val->name]) continue;
 						// Log-in member only
-						if($val->group_srl == -1)
+						if ($val->group_srl == -1)
 						{
 							$granted[$val->name] = true;
-							if($member_info->member_srl) $grant->{$val->name} = true;
+							if ($member_info->member_srl) $grant->{$val->name} = true;
 							// Site-joined member only
 						}
-						elseif($val->group_srl == -2)
+						elseif ($val->group_srl == -2)
 						{
 							$granted[$val->name] = true;
 							// Do not grant any permission for non-logged member
-							if(!$member_info->member_srl) $grant->{$val->name} = false;
+							if (!$member_info->member_srl) $grant->{$val->name} = false;
 							// Log-in member
 							else
 							{
 								$site_module_info = Context::get('site_module_info');
 								// Permission granted if no information of the currently connected site exists
-								if(!$site_module_info->site_srl) $grant->{$val->name} = true;
+								if (!$site_module_info->site_srl) $grant->{$val->name} = true;
 								// Permission is not granted if information of the currently connected site exists
-								elseif(count($group_list)) $grant->{$val->name} = true;
+								elseif (count($group_list)) $grant->{$val->name} = true;
 							}
 							// All of non-logged members
 						}
-						elseif($val->group_srl == -3)
+						elseif ($val->group_srl == -3)
 						{
 							$granted[$val->name] = true;
 							$grant->{$val->name} = ($grant->is_admin || $grant->is_site_admin);
 						}
-						elseif($val->group_srl == 0)
+						elseif ($val->group_srl == 0)
 						{
 							$granted[$val->name] = true;
 							$grant->{$val->name} = true;
@@ -2107,7 +2107,7 @@ 
 						}
 						else
 						{
-							if($group_list && count($group_list) && in_array($val->group_srl, $group_list))
+							if ($group_list && count($group_list) && in_array($val->group_srl, $group_list))
 							{
 								$grant->{$val->name} = true;
 								$granted[$val->name] = true;
@@ -2116,29 +2116,29 @@ 
 					}
 				}
 				// Separate processing for the virtual group access
-				if(!$grant_exists['access']) $grant->access = true;
-				if(count($grant_info))
+				if (!$grant_exists['access']) $grant->access = true;
+				if (count($grant_info))
 				{
-					foreach($grant_info as  $grant_name => $grant_item)
+					foreach ($grant_info as  $grant_name => $grant_item)
 					{
-						if($grant_exists[$grant_name]) continue;
-						switch($grant_item->default)
+						if ($grant_exists[$grant_name]) continue;
+						switch ($grant_item->default)
 						{
 							case 'guest' :
 								$grant->{$grant_name} = true;
 								break;
 							case 'member' :
-								if($member_info->member_srl) $grant->{$grant_name} = true;
+								if ($member_info->member_srl) $grant->{$grant_name} = true;
 								else $grant->{$grant_name} = false;
 								break;
 							case 'site' :
 								$site_module_info = Context::get('site_module_info');
-								if($member_info->member_srl && (($site_module_info->site_srl && count($group_list)) || !$site_module_info->site_srl)) $grant->{$grant_name} = true;
+								if ($member_info->member_srl && (($site_module_info->site_srl && count($group_list)) || !$site_module_info->site_srl)) $grant->{$grant_name} = true;
 								else $grant->{$grant_name} = false;
 								break;
 							case 'manager' :
 							case 'root' :
-								if($member_info->is_admin == 'Y') $grant->{$grant_name} = true;
+								if ($member_info->is_admin == 'Y') $grant->{$grant_name} = true;
 								else $grant->{$grant_name} = false;
 								break;
 						}
@@ -2146,12 +2146,12 @@ 
 				}
 			}
 			// Set true to grant all privileges if an administrator is
-			if($grant->manager)
+			if ($grant->manager)
 			{
 				$grant->access = true;
-				if(count($grant_info))
+				if (count($grant_info))
 				{
-					foreach($grant_info as $key => $val)
+					foreach ($grant_info as $key => $val)
 					{
 						$grant->{$key} = true;
 					}
@@ -2183,27 +2183,27 @@ 
 
 	function unserializeAttributes($module_filebox_list)
 	{
-		if(is_array($module_filebox_list->data))
+		if (is_array($module_filebox_list->data))
 		{
-			foreach($module_filebox_list->data as &$item)
+			foreach ($module_filebox_list->data as &$item)
 			{
-				if(empty($item->comment))
+				if (empty($item->comment))
 				{
 					continue;
 				}
 
 				$attributes = explode(';', $item->comment);
-				foreach($attributes as $attribute)
+				foreach ($attributes as $attribute)
 				{
 					$values = explode(':', $attribute);
-					if((count($values) % 2) ==1)
+					if ((count($values) % 2) == 1)
 					{
-						for($i=2;$i<count($values);$i++)
+						for ($i = 2; $i < count($values); $i++)
 						{
-							$values[1].=":".$values[$i];
+							$values[1] .= ":".$values[$i];
 						}
 					}
-					$atts[$values[0]]=$values[1];
+					$atts[$values[0]] = $values[1];
 				}
 				$item->attributes = $atts;
 				unset($atts);
@@ -2215,16 +2215,16 @@ 
 	function getFileBoxListHtml()
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
+		if ($logged_info->is_admin != 'Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
 		$link = parse_url($_SERVER["HTTP_REFERER"]);
-		$link_params = explode('&',$link['query']);
+		$link_params = explode('&', $link['query']);
 		foreach ($link_params as $param)
 		{
-			$param = explode("=",$param);
-			if($param[0] == 'selected_widget') $selected_widget = $param[1];
+			$param = explode("=", $param);
+			if ($param[0] == 'selected_widget') $selected_widget = $param[1];
 		}
 		$oWidgetModel = getModel('widget');
-		if($selected_widget) $widget_info = $oWidgetModel->getWidgetInfo($selected_widget);
+		if ($selected_widget) $widget_info = $oWidgetModel->getWidgetInfo($selected_widget);
 		Context::set('allow_multiple', $widget_info->extra_var->images->allow_multiple);
 
 		$oModuleModel = getModel('module');
@@ -2240,24 +2240,24 @@ 
 		$security->encodeHTML('filebox_list..comment', 'filebox_list..attributes.');
 
 		$oTemplate = &TemplateHandler::getInstance();
-		$html = $oTemplate->compile(_XE_PATH_ . 'modules/module/tpl/', 'filebox_list_html');
+		$html = $oTemplate->compile(_XE_PATH_.'modules/module/tpl/', 'filebox_list_html');
 
 		$this->add('html', $html);
 	}
 
 	function getModuleFileBoxPath($module_filebox_srl)
 	{
-		return sprintf("./files/attach/filebox/%s",getNumberingPath($module_filebox_srl,3));
+		return sprintf("./files/attach/filebox/%s", getNumberingPath($module_filebox_srl, 3));
 	}
 
 	/**
 	 * @brief Return ruleset cache file path
 	 * @param module, act
 	 */
-	function getValidatorFilePath($module, $ruleset, $mid=null)
+	function getValidatorFilePath($module, $ruleset, $mid = null)
 	{
 		// load dynamic ruleset xml file
-		if(strpos($ruleset, '@') !== false)
+		if (strpos($ruleset, '@') !== false)
 		{
 			$rulsetFile = str_replace('@', '', $ruleset);
 			$xml_file = sprintf('./files/ruleset/%s.xml', $rulsetFile);
@@ -2267,20 +2267,20 @@ 
 		{
 			$rulsetFile = str_replace('#', '', $ruleset).'.'.$mid;
 			$xml_file = sprintf('./files/ruleset/%s.xml', $rulsetFile);
-			if(is_readable($xml_file))
+			if (is_readable($xml_file))
 				return FileHandler::getRealPath($xml_file);
-			else{
+			else {
 				$ruleset = str_replace('#', '', $ruleset);
 			}
 
 		}
 		// Get a path of the requested module. Return if not exists.
 		$class_path = ModuleHandler::getModulePath($module);
-		if(!$class_path) return;
+		if (!$class_path) return;
 
 		// Check if module.xml exists in the path. Return if not exist
 		$xml_file = sprintf("%sruleset/%s.xml", $class_path, $ruleset);
-		if(!file_exists($xml_file)) return;
+		if (!file_exists($xml_file)) return;
 
 		return $xml_file;
 	}
@@ -2292,7 +2292,7 @@ 
 		$requestVars = Context::getRequestVars();
 
 		$args = new stdClass;
-		$args->site_srl = (int)$requestVars->site_srl;
+		$args->site_srl = (int) $requestVars->site_srl;
 		$args->page = 1; // /< Page
 		$args->list_count = 100; // /< the number of posts to display on a single page
 		$args->page_count = 5; // /< the number of pages that appear in the page navigation
@@ -2304,9 +2304,9 @@ 
 
 		$list = array();
 
-		if($output->toBool())
+		if ($output->toBool())
 		{
-			foreach((array)$output->data as $code_info)
+			foreach ((array) $output->data as $code_info)
 			{
 				unset($codeInfo);
 				$codeInfo = array('name'=>'$user_lang->'.$code_info->name, 'value'=>$code_info->value);

Braces +470 added lines, -209 removed lines

@@ -19,26 +19,34 @@ 
 	 */
 	function isIDExists($id, $site_srl = 0)
 	{
-		if(!preg_match('/^[a-z]{1}([a-z0-9_]+)$/i',$id)) return true;
+		if(!preg_match('/^[a-z]{1}([a-z0-9_]+)$/i',$id)) {
+			return true;
+		}
 		// directory and rss/atom/api reserved checking, etc.
 		$dirs = FileHandler::readDir(_XE_PATH_);
 		$dirs[] = 'rss';
 		$dirs[] = 'atom';
 		$dirs[] = 'api';
-		if(in_array($id, $dirs)) return true;
+		if(in_array($id, $dirs)) {
+			return true;
+		}
 		// mid test
 		$args = new stdClass();
 		$args->mid = $id;
 		$args->site_srl = $site_srl;
 		$output = executeQuery('module.isExistsModuleName', $args);
-		if($output->data->count) return true;
+		if($output->data->count) {
+			return true;
+		}
 		// vid test (check mid != vid if site_srl=0, which means it is not a virtual site)
 		if(!$site_srl)
 		{
 			$site_args = new stdClass();
 			$site_args->domain = $id;
 			$output = executeQuery('module.isExistsSiteDomain', $site_args);
-			if($output->data->count) return true;
+			if($output->data->count) {
+				return true;
+			}
 		}
 
 		return false;
@@ -82,10 +90,14 @@ 
 	function getDefaultMid()
 	{
 		$default_url = Context::getDefaultUrl();
-		if($default_url && substr_compare($default_url, '/', -1) === 0) $default_url = substr($default_url, 0, -1);
+		if($default_url && substr_compare($default_url, '/', -1) === 0) {
+			$default_url = substr($default_url, 0, -1);
+		}
 
 		$request_url = Context::getRequestUri();
-		if($request_url && substr_compare($request_url, '/', -1) === 0) $request_url = substr($request_url, 0, -1);
+		if($request_url && substr_compare($request_url, '/', -1) === 0) {
+			$request_url = substr($request_url, 0, -1);
+		}
 
 		$default_url_parse = parse_url($default_url);
 		$request_url_parse = parse_url($request_url);
@@ -100,14 +112,18 @@ 
 			$hostname = $request_url_parse['host'];
 			$path = $request_url_parse['path'];
 			$port = $request_url_parse['port'];
-			if(strlen($path) >= 1 && substr_compare($path, '/', -1) === 0) $path = substr($path, 0, -1);
+			if(strlen($path) >= 1 && substr_compare($path, '/', -1) === 0) {
+				$path = substr($path, 0, -1);
+			}
 
 			$domain = sprintf('%s%s%s', $hostname, $port && ($port != 80 )? ':'.$port  : '', $path);
 		}
 
 		if($domain === '')
 		{
-			if(!$vid) $vid = $mid;
+			if(!$vid) {
+				$vid = $mid;
+			}
 			if($vid)
 			{
 				$domain = $vid;
@@ -133,13 +149,17 @@ 
 				$output = executeQuery('module.getSiteInfoByDomain', $args);
 				$site_info = $output->data;
 
-				if($oCacheHandler->isSupport()) $oCacheHandler->put($domain_cache_key, $site_info);
+				if($oCacheHandler->isSupport()) {
+					$oCacheHandler->put($domain_cache_key, $site_info);
+				}
 			}
 
 			if($site_info && $vid)
 			{
 				Context::set('vid', $site_info->domain, true);
-				if(strtolower($mid)==strtolower($site_info->domain)) Context::set('mid', $site_info->mid,true);
+				if(strtolower($mid)==strtolower($site_info->domain)) {
+					Context::set('mid', $site_info->mid,true);
+				}
 			}
 			if(!$site_info || !$site_info->domain) { $domain = ''; unset($site_info); }
 		}
@@ -165,8 +185,12 @@ 
 				{
 					// Create a table if sites table doesn't exist
 					$oDB = &DB::getInstance();
-					if(!$oDB->isTableExists('sites')) $oDB->createTableByXmlFile(_XE_PATH_.'modules/module/schemas/sites.xml');
-					if(!$oDB->isTableExists('sites')) return;
+					if(!$oDB->isTableExists('sites')) {
+						$oDB->createTableByXmlFile(_XE_PATH_.'modules/module/schemas/sites.xml');
+					}
+					if(!$oDB->isTableExists('sites')) {
+						return;
+					}
 
 					// Get mid, language
 					$mid_output = $oDB->executeQuery('module.getDefaultMidInfo', $args);
@@ -184,21 +208,28 @@ 
 					if($output->data && !$output->data->index_module_srl)
 					{
 						$output = executeQuery('module.updateSite', $site_args);
-					}
-					else
+					} else
 					{
 						$output = executeQuery('module.insertSite', $site_args);
-						if(!$output->toBool()) return $output;
+						if(!$output->toBool()) {
+							return $output;
+						}
 					}
 					$output = executeQuery('module.getSiteInfo', $args);
 				}
 				$site_info = $output->data;
-				if($oCacheHandler->isSupport()) $oCacheHandler->put($default_site_cache_key, $site_info);
+				if($oCacheHandler->isSupport()) {
+					$oCacheHandler->put($default_site_cache_key, $site_info);
+				}
 			}
 		}
 
-		if(!$site_info->module_srl) return $site_info;
-		if(is_array($site_info) && $site_info->data[0]) $site_info = $site_info[0];
+		if(!$site_info->module_srl) {
+			return $site_info;
+		}
+		if(is_array($site_info) && $site_info->data[0]) {
+			$site_info = $site_info[0];
+		}
 		return $this->addModuleExtraVars($site_info);
 	}
 
@@ -248,7 +279,9 @@ 
 		}
 
 		$this->applyDefaultSkin($module_info);
-		if(!$module_info->module_srl && $module_info->data[0]) $module_info = $module_info->data[0];
+		if(!$module_info->module_srl && $module_info->data[0]) {
+			$module_info = $module_info->data[0];
+		}
 		return $this->addModuleExtraVars($module_info);
 	}
 
@@ -340,8 +373,7 @@ 
 				$object_key = 'mid_info:' . $output->data->module_srl;
 				$module_info_cache_key = $oCacheHandler->getGroupKey('site_and_module', $object_key);
 				$oCacheHandler->put($module_info_cache_key, $moduleInfo);
-			}
-			else
+			} else
 			{
 				$mid_info->designSettings = $moduleInfo->designSettings;
 				$moduleInfo = $mid_info;
@@ -382,11 +414,15 @@ 
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$output = executeQuery('module.getMidInfo', $args);
-			if(!$output->toBool()) return;
+			if(!$output->toBool()) {
+				return;
+			}
 
 			$mid_info = $output->data;
 			$this->applyDefaultSkin($mid_info);
-			if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $mid_info);
+			if($oCacheHandler->isSupport()) {
+				$oCacheHandler->put($cache_key, $mid_info);
+			}
 		}
 
 		if($mid_info && count($columnList))
@@ -399,11 +435,14 @@ 
 					$module_info->$key = $item;
 				}
 			}
+		} else {
+			$module_info = $mid_info;
 		}
-		else $module_info = $mid_info;
 
 		$oModuleController = getController('module');
-		if(isset($module_info->browser_title)) $oModuleController->replaceDefinedLangCode($module_info->browser_title);
+		if(isset($module_info->browser_title)) {
+			$oModuleController->replaceDefinedLangCode($module_info->browser_title);
+		}
 
 		$this->applyDefaultSkin($module_info);
 		return $this->addModuleExtraVars($module_info);
@@ -451,11 +490,15 @@ 
 	 */
 	function getModulesInfo($module_srls, $columnList = array())
 	{
-		if(is_array($module_srls)) $module_srls = implode(',',$module_srls);
+		if(is_array($module_srls)) {
+			$module_srls = implode(',',$module_srls);
+		}
 		$args = new stdClass();
 		$args->module_srls = $module_srls;
 		$output = executeQueryArray('module.getModulesInfo', $args, $columnList);
-		if(!$output->toBool()) return;
+		if(!$output->toBool()) {
+			return;
+		}
 		return $this->addModuleExtraVars($output->data);
 	}
 
@@ -465,31 +508,44 @@ 
 	function addModuleExtraVars($module_info)
 	{
 		// Process although one or more module informaion is requested
-		if(!is_array($module_info)) $target_module_info = array($module_info);
-		else $target_module_info = $module_info;
+		if(!is_array($module_info)) {
+			$target_module_info = array($module_info);
+		} else {
+			$target_module_info = $module_info;
+		}
 		// Get module_srl
 		$module_srls = array();
 		foreach($target_module_info as $key => $val)
 		{
 			$module_srl = $val->module_srl;
-			if(!$module_srl) continue;
+			if(!$module_srl) {
+				continue;
+			}
 			$module_srls[] = $val->module_srl;
 		}
 		// Extract extra information of the module and skin
 		$extra_vars = $this->getModuleExtraVars($module_srls);
-		if(!count($module_srls) || !count($extra_vars)) return $module_info;
+		if(!count($module_srls) || !count($extra_vars)) {
+			return $module_info;
+		}
 
 		foreach($target_module_info as $key => $val)
 		{
-			if(!$extra_vars[$val->module_srl] || !count($extra_vars[$val->module_srl])) continue;
+			if(!$extra_vars[$val->module_srl] || !count($extra_vars[$val->module_srl])) {
+				continue;
+			}
 			foreach($extra_vars[$val->module_srl] as $k => $v)
 			{
-				if($target_module_info[$key]->{$k}) continue;
+				if($target_module_info[$key]->{$k}) {
+					continue;
+				}
 				$target_module_info[$key]->{$k} = $v;
 			}
 		}
 
-		if(is_array($module_info)) return $target_module_info;
+		if(is_array($module_info)) {
+			return $target_module_info;
+		}
 		return $target_module_info[0];
 	}
 
@@ -518,7 +574,9 @@ 
 			}
 
 			$output = executeQuery('module.getMidList', $args, $columnList);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 			$list = $output->data;
 
 			if($oCacheHandler->isSupport() && count($args) === 1 && isset($args->site_srl))
@@ -526,9 +584,13 @@ 
 				$oCacheHandler->put($cache_key, $list);
 			}
 		}
-		if(!$list) return;
+		if(!$list) {
+			return;
+		}
 
-		if(!is_array($list)) $list = array($list);
+		if(!is_array($list)) {
+			$list = array($list);
+		}
 
 		foreach($list as $val)
 		{
@@ -544,10 +606,14 @@ 
 	function getModuleSrlList($args = null, $columnList = array())
 	{
 		$output = executeQueryArray('module.getMidList', $args, $columnList);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$list = $output->data;
-		if(!$list) return;
+		if(!$list) {
+			return;
+		}
 
 		return $list;
 	}
@@ -557,20 +623,32 @@ 
 	 */
 	function getModuleSrlByMid($mid)
 	{
-		if($mid && !is_array($mid)) $mid = explode(',',$mid);
-		if(is_array($mid)) $mid = "'".implode("','",$mid)."'";
+		if($mid && !is_array($mid)) {
+			$mid = explode(',',$mid);
+		}
+		if(is_array($mid)) {
+			$mid = "'".implode("','",$mid)."'";
+		}
 
 		$site_module_info = Context::get('site_module_info');
 
 		$args = new stdClass;
 		$args->mid = $mid;
-		if($site_module_info) $args->site_srl = $site_module_info->site_srl;
+		if($site_module_info) {
+			$args->site_srl = $site_module_info->site_srl;
+		}
 		$output = executeQuery('module.getModuleSrlByMid', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$list = $output->data;
-		if(!$list) return;
-		if(!is_array($list)) $list = array($list);
+		if(!$list) {
+			return;
+		}
+		if(!is_array($list)) {
+			$list = array($list);
+		}
 
 		foreach($list as $key => $val)
 		{
@@ -599,8 +677,12 @@ 
 		{
 			$args = new stdClass();
 			$output = executeQueryArray('module.getActionForward',$args);
-			if(!$output->toBool()) return new stdClass;
-			if(!$output->data) $output->data = array();
+			if(!$output->toBool()) {
+				return new stdClass;
+			}
+			if(!$output->data) {
+				$output->data = array();
+			}
 
 			$action_forward = array();
 			foreach($output->data as $item)
@@ -617,8 +699,7 @@ 
 		if($action_forward[$act])
 		{
 			return $action_forward[$act];
-		}
-		else
+		} else
 		{
 			return new stdClass();
 		}
@@ -726,8 +807,7 @@ 
 			if(file_exists($cache_file))
 			{
 				$GLOBALS['__MODULE_EXTEND__'] = include($cache_file);
-			}
-			else
+			} else
 			{
 				$GLOBALS['__MODULE_EXTEND__'] = array();
 			}
@@ -743,16 +823,22 @@ 
 	{
 		// Get a path of the requested module. Return if not exists.
 		$module_path = ModuleHandler::getModulePath($module);
-		if(!$module_path) return;
+		if(!$module_path) {
+			return;
+		}
 		// Read the xml file for module skin information
 		$xml_file = sprintf("%s/conf/info.xml", $module_path);
-		if(!file_exists($xml_file)) return;
+		if(!file_exists($xml_file)) {
+			return;
+		}
 
 		$oXmlParser = new XmlParser();
 		$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
 		$xml_obj = $tmp_xml_obj->module;
 
-		if(!$xml_obj) return;
+		if(!$xml_obj) {
+			return;
+		}
 
 		// Module Information
 		$module_info = new stdClass();
@@ -764,14 +850,19 @@ 
 			$module_info->version = $xml_obj->version->body;
 			$module_info->homepage = $xml_obj->link->body;
 			$module_info->category = $xml_obj->category->body;
-			if(!$module_info->category) $module_info->category = 'service';
+			if(!$module_info->category) {
+				$module_info->category = 'service';
+			}
 			sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
 			$module_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
 			$module_info->license = $xml_obj->license->body;
 			$module_info->license_link = $xml_obj->license->attrs->link;
 
-			if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
-			else $author_list = $xml_obj->author;
+			if(!is_array($xml_obj->author)) {
+				$author_list[] = $xml_obj->author;
+			} else {
+				$author_list = $xml_obj->author;
+			}
 
 			foreach($author_list as $author)
 			{
@@ -781,15 +872,16 @@ 
 				$author_obj->homepage = $author->attrs->link;
 				$module_info->author[] = $author_obj;
 			}
-		}
-		else
+		} else
 		{
 			// module format 0.1
 			$module_info->title = $xml_obj->title->body;
 			$module_info->description = $xml_obj->author->description->body;
 			$module_info->version = $xml_obj->attrs->version;
 			$module_info->category = $xml_obj->attrs->category;
-			if(!$module_info->category) $module_info->category = 'service';
+			if(!$module_info->category) {
+				$module_info->category = 'service';
+			}
 			sscanf($xml_obj->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d);
 			$module_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
 			$author_obj = new stdClass();
@@ -818,11 +910,15 @@ 
 	{
 		// Get a path of the requested module. Return if not exists.
 		$class_path = ModuleHandler::getModulePath($module);
-		if(!$class_path) return;
+		if(!$class_path) {
+			return;
+		}
 
 		// Check if module.xml exists in the path. Return if not exist
 		$xml_file = sprintf("%sconf/module.xml", $class_path);
-		if(!file_exists($xml_file)) return;
+		if(!file_exists($xml_file)) {
+			return;
+		}
 
 		// Check if cached file exists
 		$cache_file = sprintf(_XE_PATH_ . "files/cache/module_info/%s.%s.%s.php", $module, Context::getLangType(), __XE_VERSION__);
@@ -841,7 +937,10 @@ 
 
 			$xml_obj = XmlParser::loadXmlFile($xml_file); // /< Read xml file and convert it to xml object
 
-			if(!count($xml_obj->module)) return; // /< Error occurs if module tag doesn't included in the xml
+			if(!count($xml_obj->module)) {
+				return;
+			}
+			// /< Error occurs if module tag doesn't included in the xml
 
 			$grants = $xml_obj->module->grants->grant; // /< Permission information
 			$permissions = $xml_obj->module->permissions->permission; // /<  Acting permission
@@ -853,8 +952,11 @@ 
 			// Arrange permission information
 			if($grants)
 			{
-				if(is_array($grants)) $grant_list = $grants;
-				else $grant_list[] = $grants;
+				if(is_array($grants)) {
+					$grant_list = $grants;
+				} else {
+					$grant_list[] = $grants;
+				}
 
 				$info->grant = new stdClass();
 				$buff[] = '$info->grant = new stdClass;';
@@ -876,8 +978,11 @@ 
 			// Permissions to grant
 			if($permissions)
 			{
-				if(is_array($permissions)) $permission_list = $permissions;
-				else $permission_list[] = $permissions;
+				if(is_array($permissions)) {
+					$permission_list = $permissions;
+				} else {
+					$permission_list[] = $permissions;
+				}
 
 				$buff[] = '$info->permission = new stdClass;';
 
@@ -895,8 +1000,11 @@ 
 			// for admin menus
 			if($menus)
 			{
-				if(is_array($menus)) $menu_list = $menus;
-				else $menu_list[] = $menus;
+				if(is_array($menus)) {
+					$menu_list = $menus;
+				} else {
+					$menu_list[] = $menus;
+				}
 
 				$buff[] = '$info->menu = new stdClass;';
 				$info->menu = new stdClass();
@@ -920,8 +1028,11 @@ 
 			// actions
 			if($actions)
 			{
-				if(is_array($actions)) $action_list = $actions;
-				else $action_list[] = $actions;
+				if(is_array($actions)) {
+					$action_list = $actions;
+				} else {
+					$action_list[] = $actions;
+				}
 
 				$buff[] = '$info->action = new stdClass;';
 				$info->action = new stdClass();
@@ -1010,7 +1121,9 @@ 
 			return $info;
 		}
 
-		if(file_exists($cache_file)) return include($cache_file);
+		if(file_exists($cache_file)) {
+			return include($cache_file);
+		}
 	}
 
 	/**
@@ -1048,7 +1161,9 @@ 
 
 		$skin_path = sprintf("%s/%s/", $path, $dir);
 		$list = FileHandler::readDir($skin_path);
-		if(!count($list)) return;
+		if(!count($list)) {
+			return;
+		}
 
 		natcasesort($list);
 
@@ -1102,8 +1217,7 @@ 
 			if($dir == 'skins')
 			{
 				$type = 'P';
-			}
-			else
+			} else
 			{
 				$type = 'M';
 			}
@@ -1131,14 +1245,20 @@ 
 	function loadSkinInfo($path, $skin, $dir = 'skins')
 	{
 		// Read xml file having skin information
-		if(substr($path,-1)!='/') $path .= '/';
+		if(substr($path,-1)!='/') {
+			$path .= '/';
+		}
 		$skin_xml_file = sprintf("%s%s/%s/skin.xml", $path, $dir, $skin);
-		if(!file_exists($skin_xml_file)) return;
+		if(!file_exists($skin_xml_file)) {
+			return;
+		}
 		// Create XmlParser object
 		$oXmlParser = new XmlParser();
 		$_xml_obj = $oXmlParser->loadXmlFile($skin_xml_file);
 		// Return if no skin information is
-		if(!$_xml_obj->skin) return;
+		if(!$_xml_obj->skin) {
+			return;
+		}
 		$xml_obj = $_xml_obj->skin;
 		// Skin Name
 		$skin_info = new stdClass();
@@ -1155,8 +1275,11 @@ 
 			$skin_info->license_link = $xml_obj->license->attrs->link;
 			$skin_info->description = $xml_obj->description->body;
 
-			if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
-			else $author_list = $xml_obj->author;
+			if(!is_array($xml_obj->author)) {
+				$author_list[] = $xml_obj->author;
+			} else {
+				$author_list = $xml_obj->author;
+			}
 
 			foreach($author_list as $author)
 			{
@@ -1170,8 +1293,12 @@ 
 			if($xml_obj->extra_vars)
 			{
 				$extra_var_groups = $xml_obj->extra_vars->group;
-				if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-				if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+				if(!$extra_var_groups) {
+					$extra_var_groups = $xml_obj->extra_vars;
+				}
+				if(!is_array($extra_var_groups)) {
+					$extra_var_groups = array($extra_var_groups);
+				}
 
 				foreach($extra_var_groups as $group)
 				{
@@ -1180,7 +1307,9 @@ 
 					{
 						continue;
 					}
-					if(!is_array($group->var)) $extra_vars = array($group->var);
+					if(!is_array($group->var)) {
+						$extra_vars = array($group->var);
+					}
 
 					foreach($extra_vars as $key => $val)
 					{
@@ -1207,8 +1336,7 @@ 
 								$obj->options[$i]->title = $val->options[$i]->title->body;
 								$obj->options[$i]->value = $val->options[$i]->attrs->value;
 							}
-						}
-						else
+						} else
 						{
 							$obj->options[0] = new stdClass();
 							$obj->options[0]->title = $val->options->title->body;
@@ -1219,8 +1347,7 @@ 
 					}
 				}
 			}
-		}
-		else
+		} else
 		{
 			// skin format v0.1
 			sscanf($xml_obj->maker->attrs->date, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
@@ -1238,8 +1365,12 @@ 
 			$skin_info->author[0]->homepage = $xml_obj->maker->attrs->link;
 			// Variables used in the skin
 			$extra_var_groups = $xml_obj->extra_vars->group;
-			if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-			if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+			if(!$extra_var_groups) {
+				$extra_var_groups = $xml_obj->extra_vars;
+			}
+			if(!is_array($extra_var_groups)) {
+				$extra_var_groups = array($extra_var_groups);
+			}
 
 			foreach($extra_var_groups as $group)
 			{
@@ -1247,7 +1378,9 @@ 
 
 				if($extra_vars)
 				{
-					if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
+					if(!is_array($extra_vars)) {
+						$extra_vars = array($extra_vars);
+					}
 
 					foreach($extra_vars as $var)
 					{
@@ -1269,8 +1402,7 @@ 
 								$options[$i]->title = $var->default[$i]->body;
 								$options[$i]->value = $var->default[$i]->body;
 							}
-						}
-						else
+						} else
 						{
 							$options[0]->title = $var->default->body;
 							$options[0]->value = $var->default->body;
@@ -1300,7 +1432,9 @@ 
 		$colorset = $xml_obj->colorset->color;
 		if($colorset)
 		{
-			if(!is_array($colorset)) $colorset = array($colorset);
+			if(!is_array($colorset)) {
+				$colorset = array($colorset);
+			}
 
 			foreach($colorset as $color)
 			{
@@ -1310,9 +1444,12 @@ 
 				if($screenshot)
 				{
 					$screenshot = sprintf("%s%s/%s/%s", $path, $dir, $skin, $screenshot);
-					if(!file_exists($screenshot)) $screenshot = "";
+					if(!file_exists($screenshot)) {
+						$screenshot = "";
+					}
+				} else {
+					$screenshot = "";
 				}
-				else $screenshot = "";
 
 				$obj = new stdClass();
 				$obj->name = $name;
@@ -1325,7 +1462,9 @@ 
 		if($xml_obj->menus->menu)
 		{
 			$menus = $xml_obj->menus->menu;
-			if(!is_array($menus)) $menus = array($menus);
+			if(!is_array($menus)) {
+				$menus = array($menus);
+			}
 
 			$menu_count = count($menus);
 			$skin_info->menu_count = $menu_count;
@@ -1334,7 +1473,9 @@ 
 				unset($obj);
 
 				$obj->name = $menus[$i]->attrs->name;
-				if($menus[$i]->attrs->default == "true") $obj->default = true;
+				if($menus[$i]->attrs->default == "true") {
+					$obj->default = true;
+				}
 				$obj->title = $menus[$i]->title->body;
 				$obj->maxdepth = $menus[$i]->maxdepth->body;
 
@@ -1354,7 +1495,9 @@ 
 	{
 		$args = new stdClass;
 		$args->site_srl = $site_srl;
-		if(!is_null($module)) $args->module = $module;
+		if(!is_null($module)) {
+			$args->module = $module;
+		}
 		$output = executeQuery('module.getModuleCount', $args);
 		return $output->data->count;
 	}
@@ -1383,8 +1526,11 @@ 
 				$args->module = $module;
 				$args->site_srl = $site_srl;
 				$output = executeQuery('module.getModuleConfig', $args);
-				if($output->data->config) $config = unserialize($output->data->config);
-				else $config = null;
+				if($output->data->config) {
+					$config = unserialize($output->data->config);
+				} else {
+					$config = null;
+				}
 
 				//insert in cache
 				if($oCacheHandler->isSupport())
@@ -1423,8 +1569,11 @@ 
 				$args->module = $module;
 				$args->module_srl = $module_srl;
 				$output = executeQuery('module.getModulePartConfig', $args);
-				if($output->data->config) $config = unserialize($output->data->config);
-				else $config = null;
+				if($output->data->config) {
+					$config = unserialize($output->data->config);
+				} else {
+					$config = null;
+				}
 
 				//insert in cache
 				if($oCacheHandler->isSupport())
@@ -1446,9 +1595,13 @@ 
 	{
 		$args = new stdClass();
 		$args->module = $module;
-		if($site_srl) $args->site_srl = $site_srl;
+		if($site_srl) {
+			$args->site_srl = $site_srl;
+		}
 		$output = executeQueryArray('module.getModulePartConfigs', $args);
-		if(!$output->toBool() || !$output->data) return array();
+		if(!$output->toBool() || !$output->data) {
+			return array();
+		}
 
 		foreach($output->data as $key => $val)
 		{
@@ -1466,10 +1619,16 @@ 
 		$args->moduleCategorySrl = $moduleCategorySrl;
 		// Get data from the DB
 		$output = executeQuery('module.getModuleCategories', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		$list = $output->data;
-		if(!$list) return;
-		if(!is_array($list)) $list = array($list);
+		if(!$list) {
+			return;
+		}
+		if(!is_array($list)) {
+			$list = array($list);
+		}
 
 		foreach($list as $val)
 		{
@@ -1487,7 +1646,9 @@ 
 		$args = new stdClass;
 		$args->module_category_srl = $module_category_srl;
 		$output = executeQuery('module.getModuleCategory', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		return $output->data;
 	}
 
@@ -1499,7 +1660,9 @@ 
 		// Get a list of downloaded and installed modules
 		$searched_list = FileHandler::readDir('./modules');
 		$searched_count = count($searched_list);
-		if(!$searched_count) return;
+		if(!$searched_count) {
+			return;
+		}
 		sort($searched_list);
 
 		for($i=0;$i<$searched_count;$i++)
@@ -1512,7 +1675,9 @@ 
 			$info = $this->getModuleInfoXml($module_name);
 			unset($obj);
 
-			if(!isset($info)) continue;
+			if(!isset($info)) {
+				continue;
+			}
 			$info->module = $module_name;
 			$info->created_table_count = $created_table_count;
 			$info->table_count = $table_count;
@@ -1538,11 +1703,16 @@ 
 			for($j=0;$j<count($tmp_files);$j++)
 			{
 				list($table_name) = explode(".",$tmp_files[$j]);
-				if($oDB->isTableExists($table_name)) $created_table_count ++;
+				if($oDB->isTableExists($table_name)) {
+					$created_table_count ++;
+				}
 			}
 			// Check if DB is installed
-			if($table_count > $created_table_count) return true;
-			else return false;
+			if($table_count > $created_table_count) {
+				return true;
+			} else {
+				return false;
+			}
 		}
 		return false;
 	}
@@ -1565,15 +1735,23 @@ 
 	 */
 	public function needUpdate($update_id)
 	{
-		if(!is_array($update_id)) $update_id = array($update_id);
+		if(!is_array($update_id)) {
+			$update_id = array($update_id);
+		}
 
 		$args = new stdClass();
 		$args->update_id = implode(',', $update_id);
 		$output = executeQueryArray('module.getModuleUpdateLog', $args);
 
-		if(!!$output->error) return false;
-		if(!$output->data) $output->data = array();
-		if(count($update_id) === count($output->data)) return false;
+		if(!!$output->error) {
+			return false;
+		}
+		if(!$output->data) {
+			$output->data = array();
+		}
+		if(count($update_id) === count($output->data)) {
+			return false;
+		}
 
 		return true;
 	}
@@ -1590,7 +1768,9 @@ 
 		sort($searched_list);
 
 		$searched_count = count($searched_list);
-		if(!$searched_count) return;
+		if(!$searched_count) {
+			return;
+		}
 
 		for($i=0;$i<$searched_count;$i++)
 		{
@@ -1598,7 +1778,9 @@ 
 			$module_name = $searched_list[$i];
 
 			$path = ModuleHandler::getModulePath($module_name);
-			if(!is_dir(FileHandler::getRealPath($path))) continue;
+			if(!is_dir(FileHandler::getRealPath($path))) {
+				continue;
+			}
 
 			// Get the number of xml files to create a table in schemas
 			$tmp_files = FileHandler::readDir($path.'schemas', '/(\.xml)$/');
@@ -1608,13 +1790,17 @@ 
 			for($j=0;$j<$table_count;$j++)
 			{
 				list($table_name) = explode('.',$tmp_files[$j]);
-				if($oDB->isTableExists($table_name)) $created_table_count ++;
+				if($oDB->isTableExists($table_name)) {
+					$created_table_count ++;
+				}
 			}
 			// Get information of the module
 			$info = NULL;
 			$info = $this->getModuleInfoXml($module_name);
 
-			if(!$info) continue;
+			if(!$info) {
+				continue;
+			}
 
 			$info->module = $module_name;
 			$info->category = $info->category;
@@ -1623,16 +1809,18 @@ 
 			$info->path = $path;
 			$info->admin_index_act = $info->admin_index_act;
 			// Check if DB is installed
-			if($table_count > $created_table_count) $info->need_install = true;
-			else $info->need_install = false;
+			if($table_count > $created_table_count) {
+				$info->need_install = true;
+			} else {
+				$info->need_install = false;
+			}
 			// Check if it is upgraded to module.class.php on each module
 			$oDummy = null;
 			$oDummy = getModule($module_name, 'class');
 			if($oDummy && method_exists($oDummy, "checkUpdate"))
 			{
 				$info->need_update = $oDummy->checkUpdate();
-			}
-			else
+			} else
 			{
 				continue;
 			}
@@ -1649,7 +1837,9 @@ 
 	 */
 	function syncModuleToSite(&$data)
 	{
-		if(!$data) return;
+		if(!$data) {
+			return;
+		}
 
 		if(is_array($data))
 		{
@@ -1657,9 +1847,10 @@ 
 			{
 				$module_srls[] = $val->module_srl;
 			}
-			if(!count($module_srls)) return;
-		}
-		else
+			if(!count($module_srls)) {
+				return;
+			}
+		} else
 		{
 			$module_srls[] = $data->module_srl;
 		}
@@ -1667,7 +1858,9 @@ 
 		$args = new stdClass();
 		$args->module_srls = implode(',',$module_srls);
 		$output = executeQueryArray('module.getModuleSites', $args);
-		if(!$output->data) return array();
+		if(!$output->data) {
+			return array();
+		}
 		foreach($output->data as $key => $val)
 		{
 			$modules[$val->module_srl] = $val;
@@ -1679,8 +1872,7 @@ 
 			{
 				$data[$key]->domain = $modules[$val->module_srl]->domain;
 			}
-		}
-		else
+		} else
 		{
 			$data->domain = $modules[$data->module_srl]->domain;
 		}
@@ -1691,24 +1883,31 @@ 
 	 */
 	function isSiteAdmin($member_info, $site_srl = null)
 	{
-		if(!$member_info->member_srl) return false;
-		if($member_info->is_admin == 'Y') return true;
+		if(!$member_info->member_srl) {
+			return false;
+		}
+		if($member_info->is_admin == 'Y') {
+			return true;
+		}
 
 		$args = new stdClass();
 		if(!isset($site_srl))
 		{
 			$site_module_info = Context::get('site_module_info');
-			if(!$site_module_info) return;
+			if(!$site_module_info) {
+				return;
+			}
 			$args->site_srl = $site_module_info->site_srl;
-		}
-		else
+		} else
 		{
 			$args->site_srl = $site_srl;
 		}
 
 		$args->member_srl = $member_info->member_srl;
 		$output = executeQuery('module.isSiteAdmin', $args);
-		if($output->data->member_srl == $args->member_srl) return true;
+		if($output->data->member_srl == $args->member_srl) {
+			return true;
+		}
 		return false;
 	}
 
@@ -1731,7 +1930,9 @@ 
 		$obj = new stdClass();
 		$obj->module_srl = $module_srl;
 		$output = executeQueryArray('module.getAdminID', $obj);
-		if(!$output->toBool() || !$output->data) return;
+		if(!$output->toBool() || !$output->data) {
+			return;
+		}
 
 		return $output->data;
 	}
@@ -1744,7 +1945,9 @@ 
 	{
 		$extra_vars = array();
 		$get_module_srls = array();
-		if(!is_array($list_module_srl)) $list_module_srl = array($list_module_srl);
+		if(!is_array($list_module_srl)) {
+			$list_module_srl = array($list_module_srl);
+		}
 
 		$vars = false;
 		// cache controll
@@ -1760,14 +1963,12 @@ 
 				if($vars)
 				{
 					$extra_vars[$module_srl] = $vars;
-				}
-				else
+				} else
 				{
 					$get_module_srls[] = $module_srl;
 				}
 			}
-		}
-		else
+		} else
 		{
 			$get_module_srls = $list_module_srl;
 		}
@@ -1792,7 +1993,9 @@ 
 			}
 			foreach($output->data as $key => $val)
 			{
-				if(in_array($val->name, array('mid','module')) || $val->value == 'Array') continue;
+				if(in_array($val->name, array('mid','module')) || $val->value == 'Array') {
+					continue;
+				}
 
 				if(!isset($extra_vars[$val->module_srl]))
 				{
@@ -1831,7 +2034,9 @@ 
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$output = executeQueryArray('module.getModuleSkinVars',$args);
-			if(!$output->toBool()) return;
+			if(!$output->toBool()) {
+				return;
+			}
 
 			$skin_vars = array();
 			foreach($output->data as $vars)
@@ -1839,7 +2044,9 @@ 
 				$skin_vars[$vars->name] = $vars;
 			}
 
-			if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $skin_vars);
+			if($oCacheHandler->isSupport()) {
+				$oCacheHandler->put($cache_key, $skin_vars);
+			}
 		}
 
 		return $skin_vars;
@@ -1851,7 +2058,9 @@ 
 	function getModuleDefaultSkin($module_name, $skin_type = 'P', $site_srl = 0, $updateCache = true)
 	{
 		$target = ($skin_type == 'M') ? 'mskin' : 'skin';
-		if(!$site_srl) $site_srl = 0;
+		if(!$site_srl) {
+			$site_srl = 0;
+		}
 
 		$designInfoFile = sprintf(_XE_PATH_.'files/site_design/design_%s.php', $site_srl);
 		if(is_readable($designInfoFile))
@@ -1868,19 +2077,16 @@ 
 			if(is_dir($moduleSkinPath.'default'))
 			{
 				$skinName = 'default';
-			}
-			else if(is_dir($moduleSkinPath.'xe_default'))
+			} else if(is_dir($moduleSkinPath.'xe_default'))
 			{
 				$skinName = 'xe_default';
-			}
-			else
+			} else
 			{
 				$skins = FileHandler::readDir($moduleSkinPath);
 				if(count($skins) > 0)
 				{
 					$skinName = $skins[0];
-				}
-				else
+				} else
 				{
 					$skinName = NULL;
 				}
@@ -1888,7 +2094,9 @@ 
 
 			if($updateCache && $skinName)
 			{
-				if(!isset($designInfo->module->{$module_name})) $designInfo->module->{$module_name} = new stdClass();
+				if(!isset($designInfo->module->{$module_name})) {
+					$designInfo->module->{$module_name} = new stdClass();
+				}
 				$designInfo->module->{$module_name}->{$target} = $skinName;
 
 				$oAdminController = getAdminController('admin');
@@ -1904,23 +2112,28 @@ 
 	 */
 	function syncSkinInfoToModuleInfo(&$module_info)
 	{
-		if(!$module_info->module_srl) return;
+		if(!$module_info->module_srl) {
+			return;
+		}
 
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
 		if(Mobile::isFromMobilePhone())
 		{
 			$skin_vars = $this->getModuleMobileSkinVars($module_info->module_srl);
-		}
-		else
+		} else
 		{
 			$skin_vars = $this->getModuleSkinVars($module_info->module_srl);
 		}
 
-		if(!$skin_vars) return;
+		if(!$skin_vars) {
+			return;
+		}
 
 		foreach($skin_vars as $name => $val)
 		{
-			if(isset($module_info->{$name})) continue;
+			if(isset($module_info->{$name})) {
+				continue;
+			}
 			$module_info->{$name} = $val->value;
 		}
 	}
@@ -1946,7 +2159,9 @@ 
 			$args = new stdClass();
 			$args->module_srl = $module_srl;
 			$output = executeQueryArray('module.getModuleMobileSkinVars',$args);
-			if(!$output->toBool() || !$output->data) return;
+			if(!$output->toBool() || !$output->data) {
+				return;
+			}
 
 			$skin_vars = array();
 			foreach($output->data as $vars)
@@ -1954,7 +2169,9 @@ 
 				$skin_vars[$vars->name] = $vars;
 			}
 
-			if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $skin_vars);
+			if($oCacheHandler->isSupport()) {
+				$oCacheHandler->put($cache_key, $skin_vars);
+			}
 		}
 
 		return $skin_vars;
@@ -1966,7 +2183,9 @@ 
 	 */
 	function syncMobileSkinInfoToModuleInfo(&$module_info)
 	{
-		if(!$module_info->module_srl) return;
+		if(!$module_info->module_srl) {
+			return;
+		}
 		$skin_vars = false;
 		// cache controll
 		$oCacheHandler = CacheHandler::getInstance('object', null, true);
@@ -1981,17 +2200,25 @@ 
 			$args = new stdClass;
 			$args->module_srl = $module_info->module_srl;
 			$output = executeQueryArray('module.getModuleMobileSkinVars',$args);
-			if(!$output->toBool()) return;
+			if(!$output->toBool()) {
+				return;
+			}
 			$skin_vars = $output->data;
 
 			//insert in cache
-			if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $skin_vars);
+			if($oCacheHandler->isSupport()) {
+				$oCacheHandler->put($cache_key, $skin_vars);
+			}
+		}
+		if(!$skin_vars) {
+			return;
 		}
-		if(!$skin_vars) return;
 
 		foreach($output->data as $val)
 		{
-			if(isset($module_info->{$val->name})) continue;
+			if(isset($module_info->{$val->name})) {
+				continue;
+			}
 			$module_info->{$val->name} = $val->value;
 		}
 	}
@@ -2013,10 +2240,12 @@ 
 		$grant_info = $xml_info->grant;
 		if($member_info->member_srl)
 		{
-			if(is_array($member_info->group_list)) $group_list = array_keys($member_info->group_list);
-			else $group_list = array();
-		}
-		else
+			if(is_array($member_info->group_list)) {
+				$group_list = array_keys($member_info->group_list);
+			} else {
+				$group_list = array();
+			}
+		} else
 		{
 			$group_list = array();
 		}
@@ -2030,8 +2259,7 @@ 
 			}
 
 			$grant->is_admin = $grant->manager = ($member_info->is_admin == 'Y') ? true : false;
-		}
-		else
+		} else
 		{
 			// If module_srl exists
 			// Get a type of granted permission
@@ -2044,7 +2272,9 @@ 
 				$args->module_srl = $module_srl;
 				$args->member_srl = $member_info->member_srl;
 				$output = executeQuery('module.getModuleAdmin',$args);
-				if($output->data && $output->data->member_srl == $member_info->member_srl) $grant->manager = true;
+				if($output->data && $output->data->member_srl == $member_info->member_srl) {
+					$grant->manager = true;
+				}
 			}
 			// If not an administrator, get information from the DB and grant manager privilege.
 			if(!$grant->manager)
@@ -2054,8 +2284,7 @@ 
 				if($module_info->module == 'planet')
 				{
 					$output = executeQueryArray('module.getPlanetGrants', $args);
-				}
-				else
+				} else
 				{
 					$args = new stdClass;
 					$args->module_srl = $module_srl;
@@ -2070,42 +2299,48 @@ 
 					foreach($output->data as $val)
 					{
 						$grant_exists[$val->name] = true;
-						if($granted[$val->name]) continue;
+						if($granted[$val->name]) {
+							continue;
+						}
 						// Log-in member only
 						if($val->group_srl == -1)
 						{
 							$granted[$val->name] = true;
-							if($member_info->member_srl) $grant->{$val->name} = true;
+							if($member_info->member_srl) {
+								$grant->{$val->name} = true;
+							}
 							// Site-joined member only
-						}
-						elseif($val->group_srl == -2)
+						} elseif($val->group_srl == -2)
 						{
 							$granted[$val->name] = true;
 							// Do not grant any permission for non-logged member
-							if(!$member_info->member_srl) $grant->{$val->name} = false;
+							if(!$member_info->member_srl) {
+								$grant->{$val->name} = false;
+							}
 							// Log-in member
 							else
 							{
 								$site_module_info = Context::get('site_module_info');
 								// Permission granted if no information of the currently connected site exists
-								if(!$site_module_info->site_srl) $grant->{$val->name} = true;
+								if(!$site_module_info->site_srl) {
+									$grant->{$val->name} = true;
+								}
 								// Permission is not granted if information of the currently connected site exists
-								elseif(count($group_list)) $grant->{$val->name} = true;
+								elseif(count($group_list)) {
+									$grant->{$val->name} = true;
+								}
 							}
 							// All of non-logged members
-						}
-						elseif($val->group_srl == -3)
+						} elseif($val->group_srl == -3)
 						{
 							$granted[$val->name] = true;
 							$grant->{$val->name} = ($grant->is_admin || $grant->is_site_admin);
-						}
-						elseif($val->group_srl == 0)
+						} elseif($val->group_srl == 0)
 						{
 							$granted[$val->name] = true;
 							$grant->{$val->name} = true;
 							// If a target is a group
-						}
-						else
+						} else
 						{
 							if($group_list && count($group_list) && in_array($val->group_srl, $group_list))
 							{
@@ -2116,30 +2351,43 @@ 
 					}
 				}
 				// Separate processing for the virtual group access
-				if(!$grant_exists['access']) $grant->access = true;
+				if(!$grant_exists['access']) {
+					$grant->access = true;
+				}
 				if(count($grant_info))
 				{
 					foreach($grant_info as  $grant_name => $grant_item)
 					{
-						if($grant_exists[$grant_name]) continue;
+						if($grant_exists[$grant_name]) {
+							continue;
+						}
 						switch($grant_item->default)
 						{
 							case 'guest' :
 								$grant->{$grant_name} = true;
 								break;
 							case 'member' :
-								if($member_info->member_srl) $grant->{$grant_name} = true;
-								else $grant->{$grant_name} = false;
+								if($member_info->member_srl) {
+									$grant->{$grant_name} = true;
+								} else {
+									$grant->{$grant_name} = false;
+								}
 								break;
 							case 'site' :
 								$site_module_info = Context::get('site_module_info');
-								if($member_info->member_srl && (($site_module_info->site_srl && count($group_list)) || !$site_module_info->site_srl)) $grant->{$grant_name} = true;
-								else $grant->{$grant_name} = false;
+								if($member_info->member_srl && (($site_module_info->site_srl && count($group_list)) || !$site_module_info->site_srl)) {
+									$grant->{$grant_name} = true;
+								} else {
+									$grant->{$grant_name} = false;
+								}
 								break;
 							case 'manager' :
 							case 'root' :
-								if($member_info->is_admin == 'Y') $grant->{$grant_name} = true;
-								else $grant->{$grant_name} = false;
+								if($member_info->is_admin == 'Y') {
+									$grant->{$grant_name} = true;
+								} else {
+									$grant->{$grant_name} = false;
+								}
 								break;
 						}
 					}
@@ -2215,16 +2463,22 @@ 
 	function getFileBoxListHtml()
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
+		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) {
+			return new Object(-1, 'msg_not_permitted');
+		}
 		$link = parse_url($_SERVER["HTTP_REFERER"]);
 		$link_params = explode('&',$link['query']);
 		foreach ($link_params as $param)
 		{
 			$param = explode("=",$param);
-			if($param[0] == 'selected_widget') $selected_widget = $param[1];
+			if($param[0] == 'selected_widget') {
+				$selected_widget = $param[1];
+			}
 		}
 		$oWidgetModel = getModel('widget');
-		if($selected_widget) $widget_info = $oWidgetModel->getWidgetInfo($selected_widget);
+		if($selected_widget) {
+			$widget_info = $oWidgetModel->getWidgetInfo($selected_widget);
+		}
 		Context::set('allow_multiple', $widget_info->extra_var->images->allow_multiple);
 
 		$oModuleModel = getModel('module');
@@ -2232,7 +2486,9 @@ 
 		Context::set('filebox_list', $output->data);
 
 		$page = Context::get('page');
-		if (!$page) $page = 1;
+		if (!$page) {
+			$page = 1;
+		}
 		Context::set('page', $page);
 		Context::set('page_navigation', $output->page_navigation);
 
@@ -2262,25 +2518,28 @@ 
 			$rulsetFile = str_replace('@', '', $ruleset);
 			$xml_file = sprintf('./files/ruleset/%s.xml', $rulsetFile);
 			return FileHandler::getRealPath($xml_file);
-		}
-		else if (strpos($ruleset, '#') !== false)
+		} else if (strpos($ruleset, '#') !== false)
 		{
 			$rulsetFile = str_replace('#', '', $ruleset).'.'.$mid;
 			$xml_file = sprintf('./files/ruleset/%s.xml', $rulsetFile);
-			if(is_readable($xml_file))
-				return FileHandler::getRealPath($xml_file);
-			else{
+			if(is_readable($xml_file)) {
+							return FileHandler::getRealPath($xml_file);
+			} else{
 				$ruleset = str_replace('#', '', $ruleset);
 			}
 
 		}
 		// Get a path of the requested module. Return if not exists.
 		$class_path = ModuleHandler::getModulePath($module);
-		if(!$class_path) return;
+		if(!$class_path) {
+			return;
+		}
 
 		// Check if module.xml exists in the path. Return if not exist
 		$xml_file = sprintf("%sruleset/%s.xml", $class_path, $ruleset);
-		if(!file_exists($xml_file)) return;
+		if(!file_exists($xml_file)) {
+			return;
+		}
 
 		return $xml_file;
 	}
@@ -2330,7 +2589,9 @@ 
 	function getLangByLangcode()
 	{
 		$langCode = Context::get('langCode');
-		if (!$langCode) return;
+		if (!$langCode) {
+			return;
+		}
 
 		$oModuleController = getController('module');
 		$oModuleController->replaceDefinedLangCode($langCode);

modules/menu/menu.class.php

Spacing +36 added lines, -36 removed lines

@@ -32,15 +32,15 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2009. 02. 11 menu added to the table site_srl
-			if(!$oDB->isColumnExists('menu', 'site_srl')) return true;
+			if (!$oDB->isColumnExists('menu', 'site_srl')) return true;
 
 			// 2012. 02. 01 title index check
-			if(!$oDB->isIndexExists("menu", "idx_title")) return true;
+			if (!$oDB->isIndexExists("menu", "idx_title")) return true;
 
-			if(!$oDB->isColumnExists('menu_item', 'is_shortcut'))
+			if (!$oDB->isColumnExists('menu_item', 'is_shortcut'))
 			{
 				return TRUE;
 			}
@@ -49,10 +49,10 @@ 
 			$args = new stdClass();
 			$args->title = array("Temporary menu");
 			$temp_menus = executeQueryArray('menu.getMenuByTitle', $args);
-			if($temp_menus->toBool() && count($temp_menus->data)) return true;
+			if ($temp_menus->toBool() && count($temp_menus->data)) return true;
 
 			// 2015. 06. 15 add column desc
-			if(!$oDB->isColumnExists('menu_item', 'desc'))
+			if (!$oDB->isColumnExists('menu_item', 'desc'))
 			{
 				return true;
 			}
@@ -72,28 +72,28 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2009. 02. 11 menu added to the table site_srl
-			if(!$oDB->isColumnExists('menu', 'site_srl'))
+			if (!$oDB->isColumnExists('menu', 'site_srl'))
 			{
-				$oDB->addColumn('menu','site_srl','number',11,0,true);
+				$oDB->addColumn('menu', 'site_srl', 'number', 11, 0, true);
 			}
 
 			// 2012. 02. 01 title index check
-			if(!$oDB->isIndexExists("menu","idx_title"))
+			if (!$oDB->isIndexExists("menu", "idx_title"))
 			{
 				$oDB->addIndex('menu', 'idx_title', array('title'));
 			}
 
 			// 2015. 06. 15 add column desc
-			if(!$oDB->isColumnExists('menu_item', 'desc'))
+			if (!$oDB->isColumnExists('menu_item', 'desc'))
 			{
-				$oDB->addColumn('menu_item', 'desc','varchar',250,"",true);
+				$oDB->addColumn('menu_item', 'desc', 'varchar', 250, "", true);
 			}
 
 			// 1.7(maserati) shortcut column add and mirgration
-			if(!$oDB->isColumnExists('menu_item', 'is_shortcut'))
+			if (!$oDB->isColumnExists('menu_item', 'is_shortcut'))
 			{
 				$oDB->addColumn('menu_item', 'is_shortcut', 'char', 1, 'N');
 
@@ -101,27 +101,27 @@ 
 				$oMenuAdminModel = getAdminModel('menu');
 				$output = $oMenuAdminModel->getMenus();
 
-				if(is_array($output))
+				if (is_array($output))
 				{
 					$menuItemUniqueList = array();
 					$menuItemAllList = array();
-					foreach($output  AS $key=>$value)
+					foreach ($output  AS $key=>$value)
 					{
 						unset($args);
 						$args->menu_srl = $value->menu_srl;
 						$output2 = executeQueryArray('menu.getMenuItems', $args);
-						if(is_array($output2->data))
+						if (is_array($output2->data))
 						{
-							foreach($output2->data AS $key2=>$value2)
+							foreach ($output2->data AS $key2=>$value2)
 							{
 								$menuItemAllList[$value2->menu_item_srl] = $value2->url;
-								if(!in_array($value2->url, $menuItemUniqueList))
+								if (!in_array($value2->url, $menuItemUniqueList))
 								{
 									$menuItemUniqueList[$value2->menu_item_srl] = $value2->url;
 								}
 
 								// if url is empty, change type to shortcurt
-								if($value2->is_shortcut == 'N' && (!$value2->url || strncasecmp('http', $value2->url, 4) === 0))
+								if ($value2->is_shortcut == 'N' && (!$value2->url || strncasecmp('http', $value2->url, 4) === 0))
 								{
 									$value2->is_shortcut = 'Y';
 									$output3 = executeQuery('menu.updateMenuItem', $value2);
@@ -133,29 +133,29 @@ 
 					$oModuleModel = getModel('module');
 					// if duplicate reference, change type to shortcut
 					$shortcutItemList = array_diff_assoc($menuItemAllList, $menuItemUniqueList);
-					foreach($output AS $key=>$value)
+					foreach ($output AS $key=>$value)
 					{
 						unset($args);
 						$args->menu_srl = $value->menu_srl;
 						$output2 = executeQueryArray('menu.getMenuItems', $args);
-						if(is_array($output2->data))
+						if (is_array($output2->data))
 						{
-							foreach($output2->data AS $key2=>$value2)
+							foreach ($output2->data AS $key2=>$value2)
 							{
-								if(!empty($value2->url) && strncasecmp('http', $value2->url, 4) !== 0)
+								if (!empty($value2->url) && strncasecmp('http', $value2->url, 4) !== 0)
 								{
 									$moduleInfo = $oModuleModel->getModuleInfoByMid($value2->url);
-									if(!$moduleInfo->module_srl)
+									if (!$moduleInfo->module_srl)
 									{
 										$value2->url = Context::getDefaultUrl();
-										if(!$value2->url) $value2->url = '#';
+										if (!$value2->url) $value2->url = '#';
 										$value2->is_shortcut = 'Y';
 
 										$updateOutput = executeQuery('menu.updateMenuItem', $value2);
 									}
 								}
 
-								if($shortcutItemList[$value2->menu_item_srl])
+								if ($shortcutItemList[$value2->menu_item_srl])
 								{
 									$value2->is_shortcut = 'Y';
 									$output3 = executeQuery('menu.updateMenuItem', $value2);
@@ -175,16 +175,16 @@ 
 			$temp_menus = executeQueryArray('menu.getMenuByTitle', $args);
 
 			$args = new stdClass();
-			if($temp_menus->toBool() && count($temp_menus->data))
+			if ($temp_menus->toBool() && count($temp_menus->data))
 			{
 				$oMenuAdminController = getAdminController('menu');
-				foreach($temp_menus->data as $menu)
+				foreach ($temp_menus->data as $menu)
 				{
 					$args->current_menu_srl = $menu->menu_srl;
 					$args->menu_srl = $oMenuAdminController->getUnlinkedMenu();
 					$output3 = executeQuery('menu.updateMenuItems', $args);
 
-					if($output3->toBool())
+					if ($output3->toBool())
 					{
 						// delete
 						$oMenuAdminController->deleteMenu($menu->menu_srl);
@@ -219,23 +219,23 @@ 
 		// Wanted list of all the blog module
 		$output = executeQueryArray("menu.getMenus");
 		$list = $output->data;
-		if(!count($list)) return;
+		if (!count($list)) return;
 		// The menu module is used in the re-create all the menu list
-		foreach($list as $menu_item)
+		foreach ($list as $menu_item)
 		{
 			$menu_srl = $menu_item->menu_srl;
 			$oMenuAdminController->makeXmlFile($menu_srl);
 
 			// for homeSitemap.php regenrate
-			if(!$homeMenuSrl)
+			if (!$homeMenuSrl)
 			{
 				$menuItemList = $oMenuAdminModel->getMenuItems($menu_srl);
 
-				if(is_array($menuItemList->data))
+				if (is_array($menuItemList->data))
 				{
-					foreach($menuItemList->data AS $key=>$value)
+					foreach ($menuItemList->data AS $key=>$value)
 					{
-						if($homeModuleMid == $value->url)
+						if ($homeModuleMid == $value->url)
 						{
 							$homeMenuSrl = $menu_srl;
 							break;
@@ -245,7 +245,7 @@ 
 			}
 		}
 
-		if($homeMenuSrl)
+		if ($homeMenuSrl)
 		{
 			$oMenuAdminController->makeHomemenuCacheFile($homeMenuSrl);
 		}

Braces +15 added lines, -5 removed lines

@@ -35,10 +35,14 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2009. 02. 11 menu added to the table site_srl
-			if(!$oDB->isColumnExists('menu', 'site_srl')) return true;
+			if(!$oDB->isColumnExists('menu', 'site_srl')) {
+				return true;
+			}
 
 			// 2012. 02. 01 title index check
-			if(!$oDB->isIndexExists("menu", "idx_title")) return true;
+			if(!$oDB->isIndexExists("menu", "idx_title")) {
+				return true;
+			}
 
 			if(!$oDB->isColumnExists('menu_item', 'is_shortcut'))
 			{
@@ -49,7 +53,9 @@ 
 			$args = new stdClass();
 			$args->title = array("Temporary menu");
 			$temp_menus = executeQueryArray('menu.getMenuByTitle', $args);
-			if($temp_menus->toBool() && count($temp_menus->data)) return true;
+			if($temp_menus->toBool() && count($temp_menus->data)) {
+				return true;
+			}
 
 			// 2015. 06. 15 add column desc
 			if(!$oDB->isColumnExists('menu_item', 'desc'))
@@ -148,7 +154,9 @@ 
 									if(!$moduleInfo->module_srl)
 									{
 										$value2->url = Context::getDefaultUrl();
-										if(!$value2->url) $value2->url = '#';
+										if(!$value2->url) {
+											$value2->url = '#';
+										}
 										$value2->is_shortcut = 'Y';
 
 										$updateOutput = executeQuery('menu.updateMenuItem', $value2);
@@ -219,7 +227,9 @@ 
 		// Wanted list of all the blog module
 		$output = executeQueryArray("menu.getMenus");
 		$list = $output->data;
-		if(!count($list)) return;
+		if(!count($list)) {
+			return;
+		}
 		// The menu module is used in the re-create all the menu list
 		foreach($list as $menu_item)
 		{

modules/session/session.class.php

Spacing +17 added lines, -17 removed lines

@@ -15,7 +15,7 @@ 
 
 	function session()
 	{
-		if(Context::isInstalled()) $this->session_started= true;
+		if (Context::isInstalled()) $this->session_started = true;
 	}
 
 	/**
@@ -24,7 +24,7 @@ 
 	function moduleInstall()
 	{
 		$oDB = &DB::getInstance();
-		$oDB->addIndex("session","idx_session_update_mid", array("member_srl","last_update","cur_mid"));
+		$oDB->addIndex("session", "idx_session_update_mid", array("member_srl", "last_update", "cur_mid"));
 
 		return new Object();
 	}
@@ -38,11 +38,11 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
-			if(!$oDB->isTableExists('session')) return true;
-			if(!$oDB->isColumnExists("session","cur_mid")) return true;
-			if(!$oDB->isIndexExists("session","idx_session_update_mid")) return true;
+			if (!$oDB->isTableExists('session')) return true;
+			if (!$oDB->isColumnExists("session", "cur_mid")) return true;
+			if (!$oDB->isIndexExists("session", "idx_session_update_mid")) return true;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -59,19 +59,19 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
-			if(!$oDB->isTableExists('session'))
+			if (!$oDB->isTableExists('session'))
 			{
 				$oDB->createTableByXmlFile($this->module_path.'schemas/session.xml');
 			}
-			if(!$oDB->isColumnExists("session","cur_mid"))
+			if (!$oDB->isColumnExists("session", "cur_mid"))
 			{
-				$oDB->addColumn('session',"cur_mid","varchar",128);
+				$oDB->addColumn('session', "cur_mid", "varchar", 128);
 			}
-			if(!$oDB->isIndexExists("session","idx_session_update_mid"))
+			if (!$oDB->isIndexExists("session", "idx_session_update_mid"))
 			{
-				$oDB->addIndex("session","idx_session_update_mid", array("member_srl","last_update","cur_mid"));
+				$oDB->addIndex("session", "idx_session_update_mid", array("member_srl", "last_update", "cur_mid"));
 			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
@@ -85,8 +85,8 @@ 
 	 */
 	function unSerializeSession($val)
 	{
-		$vars = preg_split('/([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff^|]*)\|/', $val,-1,PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
-		for($i=0; $vars[$i]; $i++) $result[$vars[$i++]] = unserialize($vars[$i]);
+		$vars = preg_split('/([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff^|]*)\|/', $val, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+		for ($i = 0; $vars[$i]; $i++) $result[$vars[$i++]] = unserialize($vars[$i]);
 		return $result;
 	}
 
@@ -95,11 +95,11 @@ 
 	 */
 	function serializeSession($data)
 	{
-		if(!count($data)) return;
+		if (!count($data)) return;
 
 		$str = '';
-		foreach($data as $key => $val) $str .= $key.'|'.serialize($val);
-		return substr($str, 0, strlen($str)-1).'}';
+		foreach ($data as $key => $val) $str .= $key.'|'.serialize($val);
+		return substr($str, 0, strlen($str) - 1).'}';
 	}
 
 	/**

Braces +21 added lines, -7 removed lines

@@ -15,7 +15,9 @@ 
 
 	function session()
 	{
-		if(Context::isInstalled()) $this->session_started= true;
+		if(Context::isInstalled()) {
+			$this->session_started= true;
+		}
 	}
 
 	/**
@@ -40,9 +42,15 @@ 
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
 		if($oModuleModel->needUpdate($version_update_id))
 		{
-			if(!$oDB->isTableExists('session')) return true;
-			if(!$oDB->isColumnExists("session","cur_mid")) return true;
-			if(!$oDB->isIndexExists("session","idx_session_update_mid")) return true;
+			if(!$oDB->isTableExists('session')) {
+				return true;
+			}
+			if(!$oDB->isColumnExists("session","cur_mid")) {
+				return true;
+			}
+			if(!$oDB->isIndexExists("session","idx_session_update_mid")) {
+				return true;
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -86,7 +94,9 @@ 
 	function unSerializeSession($val)
 	{
 		$vars = preg_split('/([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff^|]*)\|/', $val,-1,PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
-		for($i=0; $vars[$i]; $i++) $result[$vars[$i++]] = unserialize($vars[$i]);
+		for($i=0; $vars[$i]; $i++) {
+			$result[$vars[$i++]] = unserialize($vars[$i]);
+		}
 		return $result;
 	}
 
@@ -95,10 +105,14 @@ 
 	 */
 	function serializeSession($data)
 	{
-		if(!count($data)) return;
+		if(!count($data)) {
+			return;
+		}
 
 		$str = '';
-		foreach($data as $key => $val) $str .= $key.'|'.serialize($val);
+		foreach($data as $key => $val) {
+			$str .= $key.'|'.serialize($val);
+		}
 		return substr($str, 0, strlen($str)-1).'}';
 	}