xpressengine / xe-core

modules/communication/communication.class.php

Spacing +11 added lines, -11 removed lines

@@ -29,17 +29,17 @@ 
 		$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))
 		{
 			$config = $oModuleModel->getModuleConfig('message');
 
-			if($config->skin)
+			if ($config->skin)
 			{
 				$config_parse = explode('.', $config->skin);
-				if(count($config_parse) > 1)
+				if (count($config_parse) > 1)
 				{
 					$template_path = sprintf('./themes/%s/modules/communication/', $config_parse[0]);
-					if(is_dir($template_path))
+					if (is_dir($template_path))
 					{
 						return TRUE;
 					}
@@ -49,7 +49,7 @@ 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		if(!is_dir("./files/member_extra_info/new_message_flags"))
+		if (!is_dir("./files/member_extra_info/new_message_flags"))
 		{
 			return TRUE;
 		}
@@ -66,21 +66,21 @@ 
 		$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))
 		{
 			$config = $oModuleModel->getModuleConfig('message');
-			if(!is_object($config))
+			if (!is_object($config))
 			{
 				$config = new stdClass();
 			}
 
-			if($config->skin)
+			if ($config->skin)
 			{
 				$config_parse = explode('.', $config->skin);
-				if(count($config_parse) > 1)
+				if (count($config_parse) > 1)
 				{
 					$template_path = sprintf('./themes/%s/modules/communication/', $config_parse[0]);
-					if(is_dir($template_path))
+					if (is_dir($template_path))
 					{
 						$config->skin = implode('|@|', $config_parse);
 						$oModuleController = getController('module');
@@ -92,7 +92,7 @@ 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		if(!is_dir("./files/member_extra_info/new_message_flags"))
+		if (!is_dir("./files/member_extra_info/new_message_flags"))
 		{
 			FileHandler::makeDir('./files/member_extra_info/new_message_flags');
 		}

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

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

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 BaseObject(0,'success_updated');
+		return new BaseObject(0, 'success_updated');
 	}
 
 	/**

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/file/file.class.php

Spacing +34 added lines, -34 removed lines

@@ -57,32 +57,32 @@ 
 		$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 Create a trigger to insert, update, delete documents and comments
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before')) return true;
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before')) return true;
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after')) return true;
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before')) return true;
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after')) return true;
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before')) return true;
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after')) return true;
-			if(!$oModuleModel->getTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after')) return true;
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before')) return true;
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after')) return true;
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before')) return true;
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after')) return true;
+			if (!$oModuleModel->getTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after')) return true;
+			if (!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before')) return true;
+			if (!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after')) return true;
+			if (!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before')) return true;
+			if (!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after')) return true;
+			if (!$oModuleModel->getTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after')) return true;
 			// 2009. 6. 9 Delete all the attachements when auto-saved document is deleted
-			if(!$oModuleModel->getTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after')) return true;
+			if (!$oModuleModel->getTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after')) return true;
 			// 2007. 10. 17 Create a trigger to delete all the attachements when the module is deleted
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after')) return true;
+			if (!$oModuleModel->getTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after')) return true;
 			// 2007. 10. 19 Call a trigger to set up the file permissions before displaying
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before')) return true;
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before')) return true;
 			// A column to determine a target type
-			if(!$oDB->isColumnExists('files', 'upload_target_type')) return true;
+			if (!$oDB->isColumnExists('files', 'upload_target_type')) return true;
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'file', 'controller', 'triggerCopyModule', 'after')) return true;
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'file', 'controller', 'triggerCopyModule', 'after')) return true;
 
-			if(!$oDB->isColumnExists('files', 'cover_image')) return true;
+			if (!$oDB->isColumnExists('files', 'cover_image')) return true;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -101,57 +101,57 @@ 
 		$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 Create a trigger to insert, update, delete documents and comments
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before'))
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before'))
 				$oModuleController->insertTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before');
 
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after'))
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after'))
 				$oModuleController->insertTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after');
 
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before'))
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before'))
 				$oModuleController->insertTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before');
 
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after'))
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after'))
 				$oModuleController->insertTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after');
 
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after'))
+			if (!$oModuleModel->getTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after'))
 				$oModuleController->insertTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after');
 
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before'))
+			if (!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before'))
 				$oModuleController->insertTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before');
 
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after'))
+			if (!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after'))
 				$oModuleController->insertTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after');
 
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before'))
+			if (!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before'))
 				$oModuleController->insertTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before');
 
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after'))
+			if (!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after'))
 				$oModuleController->insertTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after');
 
-			if(!$oModuleModel->getTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after'))
+			if (!$oModuleModel->getTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after'))
 				$oModuleController->insertTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after');
 			// 2009. 6. 9 Delete all the attachements when auto-saved document is deleted
-			if(!$oModuleModel->getTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after'))
+			if (!$oModuleModel->getTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after'))
 				$oModuleController->insertTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after');
 			// 2007. 10. 17 Create a trigger to delete all the attachements when the module is deleted
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after'))
+			if (!$oModuleModel->getTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after'))
 				$oModuleController->insertTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after');
 			// 2007. 10. 19 Call a trigger to set up the file permissions before displaying
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before'))
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before'))
 				$oModuleController->insertTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before');
 			// A column to determine a target type
-			if(!$oDB->isColumnExists('files', 'upload_target_type')) $oDB->addColumn('files', 'upload_target_type', 'char', '3');
+			if (!$oDB->isColumnExists('files', 'upload_target_type')) $oDB->addColumn('files', 'upload_target_type', 'char', '3');
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'file', 'controller', 'triggerCopyModule', 'after'))
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'file', 'controller', 'triggerCopyModule', 'after'))
 			{
 				$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'file', 'controller', 'triggerCopyModule', 'after');
 			}
 
-			if(!$oDB->isColumnExists('files', 'cover_image')) $oDB->addColumn('files', 'cover_image', 'char', '1', 'N');
+			if (!$oDB->isColumnExists('files', 'cover_image')) $oDB->addColumn('files', 'cover_image', 'char', '1', 'N');
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}

Braces +93 added lines, -44 removed lines

@@ -60,29 +60,61 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007. 10. 17 Create a trigger to insert, update, delete documents and comments
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before')) return true;
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before')) return true;
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after')) return true;
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before')) return true;
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after')) return true;
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before')) return true;
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after')) return true;
-			if(!$oModuleModel->getTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after')) return true;
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after')) {
+				return true;
+			}
 			// 2009. 6. 9 Delete all the attachements when auto-saved document is deleted
-			if(!$oModuleModel->getTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after')) return true;
+			if(!$oModuleModel->getTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after')) {
+				return true;
+			}
 			// 2007. 10. 17 Create a trigger to delete all the attachements when the module is deleted
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after')) return true;
+			if(!$oModuleModel->getTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after')) {
+				return true;
+			}
 			// 2007. 10. 19 Call a trigger to set up the file permissions before displaying
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before')) return true;
+			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before')) {
+				return true;
+			}
 			// A column to determine a target type
-			if(!$oDB->isColumnExists('files', 'upload_target_type')) return true;
+			if(!$oDB->isColumnExists('files', 'upload_target_type')) {
+				return true;
+			}
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'file', 'controller', 'triggerCopyModule', 'after')) return true;
+			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'file', 'controller', 'triggerCopyModule', 'after')) {
+				return true;
+			}
 
-			if(!$oDB->isColumnExists('files', 'cover_image')) return true;
+			if(!$oDB->isColumnExists('files', 'cover_image')) {
+				return true;
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -104,46 +136,61 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007. 10. 17 Create a trigger to insert, update, delete documents and comments
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before'))
-				$oModuleController->insertTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before');
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before')) {
+							$oModuleController->insertTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before');
+			}
 
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after'))
-				$oModuleController->insertTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after');
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after')) {
+							$oModuleController->insertTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after');
+			}
 
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before'))
-				$oModuleController->insertTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before');
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before')) {
+							$oModuleController->insertTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before');
+			}
 
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after'))
-				$oModuleController->insertTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after');
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after')) {
+							$oModuleController->insertTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after');
+			}
 
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after'))
-				$oModuleController->insertTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after');
+			if(!$oModuleModel->getTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after')) {
+							$oModuleController->insertTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after');
+			}
 
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before'))
-				$oModuleController->insertTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before');
+			if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before')) {
+							$oModuleController->insertTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before');
+			}
 
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after'))
-				$oModuleController->insertTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after');
+			if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after')) {
+							$oModuleController->insertTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after');
+			}
 
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before'))
-				$oModuleController->insertTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before');
+			if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before')) {
+							$oModuleController->insertTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before');
+			}
 
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after'))
-				$oModuleController->insertTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after');
+			if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after')) {
+							$oModuleController->insertTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after');
+			}
 
-			if(!$oModuleModel->getTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after'))
-				$oModuleController->insertTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after');
+			if(!$oModuleModel->getTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after')) {
+							$oModuleController->insertTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after');
+			}
 			// 2009. 6. 9 Delete all the attachements when auto-saved document is deleted
-			if(!$oModuleModel->getTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after'))
-				$oModuleController->insertTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after');
+			if(!$oModuleModel->getTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after')) {
+							$oModuleController->insertTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after');
+			}
 			// 2007. 10. 17 Create a trigger to delete all the attachements when the module is deleted
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after'))
-				$oModuleController->insertTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after');
+			if(!$oModuleModel->getTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after')) {
+							$oModuleController->insertTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after');
+			}
 			// 2007. 10. 19 Call a trigger to set up the file permissions before displaying
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before'))
-				$oModuleController->insertTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before');
+			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before')) {
+							$oModuleController->insertTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before');
+			}
 			// A column to determine a target type
-			if(!$oDB->isColumnExists('files', 'upload_target_type')) $oDB->addColumn('files', 'upload_target_type', 'char', '3');
+			if(!$oDB->isColumnExists('files', 'upload_target_type')) {
+				$oDB->addColumn('files', 'upload_target_type', 'char', '3');
+			}
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
 			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'file', 'controller', 'triggerCopyModule', 'after'))
@@ -151,7 +198,9 @@ 
 				$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'file', 'controller', 'triggerCopyModule', 'after');
 			}
 
-			if(!$oDB->isColumnExists('files', 'cover_image')) $oDB->addColumn('files', 'cover_image', 'char', '1', 'N');
+			if(!$oDB->isColumnExists('files', 'cover_image')) {
+				$oDB->addColumn('files', 'cover_image', 'char', '1', 'N');
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}

modules/spamfilter/spamfilter.class.php

Braces +36 added lines, -15 removed lines

@@ -39,22 +39,40 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007.12.7 The triggers which try to perform spam filtering when new posts/comments/trackbacks are registered
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')) return true;
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before')) return true;
-			if(!$oModuleModel->getTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before')) return true;
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before')) {
+				return true;
+			}
 			// 2008-12-17 Add a spamfilter for post modification actions
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before')) return true;
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')) return true;
+			if(!$oModuleModel->getTrigger('comment.updateComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')) {
+				return true;
+			}
 			// 2013-11-14 The trigger which try to perform spam filtering when new message are registered
-			if(!$oModuleModel->getTrigger('communication.sendMessage', 'spamfilter', 'controller', 'triggerSendMessage', 'before')) return true;
+			if(!$oModuleModel->getTrigger('communication.sendMessage', 'spamfilter', 'controller', 'triggerSendMessage', 'before')) {
+				return true;
+			}
 
 			/**
 			 * Add the hit count field (hit)
 			 */
-			if(!$oDB->isColumnExists('spamfilter_denied_word', 'hit')) return true;
-			if(!$oDB->isColumnExists('spamfilter_denied_word', 'latest_hit')) return true;
+			if(!$oDB->isColumnExists('spamfilter_denied_word', 'hit')) {
+				return true;
+			}
+			if(!$oDB->isColumnExists('spamfilter_denied_word', 'latest_hit')) {
+				return true;
+			}
 
-			if(!$oDB->isColumnExists('spamfilter_denied_ip', 'description')) return true;
+			if(!$oDB->isColumnExists('spamfilter_denied_ip', 'description')) {
+				return true;
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -74,12 +92,15 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007.12.7 The triggers which try to perform spam filtering when new posts/comments/trackbacks are registered
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before'))
-				$oModuleController->insertTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before');
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before'))
-				$oModuleController->insertTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before');
-			if(!$oModuleModel->getTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before'))
-				$oModuleController->insertTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before');
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')) {
+							$oModuleController->insertTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before');
+			}
+			if(!$oModuleModel->getTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before')) {
+							$oModuleController->insertTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before');
+			}
+			if(!$oModuleModel->getTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before')) {
+							$oModuleController->insertTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before');
+			}
 			// 2008-12-17 Add a spamfilter for post modification actions
 			if(!$oModuleModel->getTrigger('comment.updateComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before'))
 			{

Spacing +26 added lines, -26 removed lines

@@ -36,25 +36,25 @@ 
 		$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.12.7 The triggers which try to perform spam filtering when new posts/comments/trackbacks are registered
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')) return true;
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before')) return true;
-			if(!$oModuleModel->getTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before')) return true;
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')) return true;
+			if (!$oModuleModel->getTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before')) return true;
+			if (!$oModuleModel->getTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before')) return true;
 			// 2008-12-17 Add a spamfilter for post modification actions
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before')) return true;
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')) return true;
+			if (!$oModuleModel->getTrigger('comment.updateComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before')) return true;
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')) return true;
 			// 2013-11-14 The trigger which try to perform spam filtering when new message are registered
-			if(!$oModuleModel->getTrigger('communication.sendMessage', 'spamfilter', 'controller', 'triggerSendMessage', 'before')) return true;
+			if (!$oModuleModel->getTrigger('communication.sendMessage', 'spamfilter', 'controller', 'triggerSendMessage', 'before')) return true;
 
 			/**
 			 * Add the hit count field (hit)
 			 */
-			if(!$oDB->isColumnExists('spamfilter_denied_word', 'hit')) return true;
-			if(!$oDB->isColumnExists('spamfilter_denied_word', 'latest_hit')) return true;
+			if (!$oDB->isColumnExists('spamfilter_denied_word', 'hit')) return true;
+			if (!$oDB->isColumnExists('spamfilter_denied_word', 'latest_hit')) return true;
 
-			if(!$oDB->isColumnExists('spamfilter_denied_ip', 'description')) return true;
+			if (!$oDB->isColumnExists('spamfilter_denied_ip', 'description')) return true;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -71,27 +71,27 @@ 
 		$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.12.7 The triggers which try to perform spam filtering when new posts/comments/trackbacks are registered
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before'))
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before'))
 				$oModuleController->insertTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before');
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before'))
+			if (!$oModuleModel->getTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before'))
 				$oModuleController->insertTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before');
-			if(!$oModuleModel->getTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before'))
+			if (!$oModuleModel->getTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before'))
 				$oModuleController->insertTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before');
 			// 2008-12-17 Add a spamfilter for post modification actions
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before'))
+			if (!$oModuleModel->getTrigger('comment.updateComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before'))
 			{
 				$oModuleController->insertTrigger('comment.updateComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before');
 			}
 			// 2008-12-17 Add a spamfilter for post modification actions
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before'))
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before'))
 			{
 				$oModuleController->insertTrigger('document.updateDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before');
 			}
 			// 2013-11-14 The trigger which try to perform spam filtering when new message are registered
-			if(!$oModuleModel->getTrigger('communication.sendMessage', 'spamfilter', 'controller', 'triggerSendMessage', 'before'))
+			if (!$oModuleModel->getTrigger('communication.sendMessage', 'spamfilter', 'controller', 'triggerSendMessage', 'before'))
 			{
 				$oModuleController->insertTrigger('communication.sendMessage', 'spamfilter', 'controller', 'triggerSendMessage', 'before');
 			}
@@ -99,26 +99,26 @@ 
 			/**
 			 * Add the hit count field (hit)
 			 */
-			if(!$oDB->isColumnExists('spamfilter_denied_word', 'hit'))
+			if (!$oDB->isColumnExists('spamfilter_denied_word', 'hit'))
 			{
-				$oDB->addColumn('spamfilter_denied_word','hit','number',12,0,true);
-				$oDB->addIndex('spamfilter_denied_word','idx_hit', 'hit');
+				$oDB->addColumn('spamfilter_denied_word', 'hit', 'number', 12, 0, true);
+				$oDB->addIndex('spamfilter_denied_word', 'idx_hit', 'hit');
 			}
-			if(!$oDB->isColumnExists('spamfilter_denied_word', 'latest_hit'))
+			if (!$oDB->isColumnExists('spamfilter_denied_word', 'latest_hit'))
 			{
-				$oDB->addColumn('spamfilter_denied_word','latest_hit','date');
-				$oDB->addIndex('spamfilter_denied_word','idx_latest_hit', 'latest_hit');
+				$oDB->addColumn('spamfilter_denied_word', 'latest_hit', 'date');
+				$oDB->addIndex('spamfilter_denied_word', 'idx_latest_hit', 'latest_hit');
 			}
 
-			if(!$oDB->isColumnExists('spamfilter_denied_ip', 'description'))
+			if (!$oDB->isColumnExists('spamfilter_denied_ip', 'description'))
 			{
-				$oDB->addColumn('spamfilter_denied_ip','description','varchar', 250);
+				$oDB->addColumn('spamfilter_denied_ip', 'description', 'varchar', 250);
 			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		return new BaseObject(0,'success_updated');
+		return new BaseObject(0, 'success_updated');
 	}
 
 	/**

modules/tag/tag.class.php

Spacing +18 added lines, -18 removed lines

@@ -15,7 +15,7 @@ 
 		$oModuleController = getController('module');
 		$oDB = &DB::getInstance();
 
-		$oDB->addIndex("tags","idx_tag", array("document_srl","tag"));
+		$oDB->addIndex("tags", "idx_tag", array("document_srl", "tag"));
 		// 2007. 10. 17 document.insertDocument, updateDocument, deleteDocument trigger property for
 		$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
 		$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
@@ -37,18 +37,18 @@ 
 		$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 trigger registration, if registered upset
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) return true;
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
+			if (!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) return true;
 			// 2007. 10. 17 modules are deleted when you delete all registered triggers that add tag
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after')) return true;
+			if (!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after')) return true;
 			// tag in the index column of the table tag
-			if(!$oDB->isIndexExists("tags","idx_tag")) return true;
+			if (!$oDB->isIndexExists("tags", "idx_tag")) return true;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -65,29 +65,29 @@ 
 		$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 document.insertDocument, updateDocument, deleteDocument trigger property for
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before'))
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before'))
 				$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
 
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after'))
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after'))
 				$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
 
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before'))
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before'))
 				$oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
 
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after'))
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after'))
 				$oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
 
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after'))
+			if (!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after'))
 				$oModuleController->insertTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after');
 			// 2007. 10. 17 modules are deleted when you delete all registered triggers that add tag
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after'))
+			if (!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after'))
 				$oModuleController->insertTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after');
 			// tag in the index column of the table tag
-			if(!$oDB->isIndexExists("tags","idx_tag"))
-				$oDB->addIndex("tags","idx_tag", array("document_srl","tag"));
+			if (!$oDB->isIndexExists("tags", "idx_tag"))
+				$oDB->addIndex("tags", "idx_tag", array("document_srl", "tag"));
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}

Braces +42 added lines, -21 removed lines

@@ -40,15 +40,29 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007. 10. 17 trigger registration, if registered upset
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) return true;
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) {
+				return true;
+			}
 			// 2007. 10. 17 modules are deleted when you delete all registered triggers that add tag
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after')) return true;
+			if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after')) {
+				return true;
+			}
 			// tag in the index column of the table tag
-			if(!$oDB->isIndexExists("tags","idx_tag")) return true;
+			if(!$oDB->isIndexExists("tags","idx_tag")) {
+				return true;
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -68,26 +82,33 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007. 10. 17 document.insertDocument, updateDocument, deleteDocument trigger property for
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before'))
-				$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) {
+							$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
+			}
 
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after'))
-				$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) {
+							$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
+			}
 
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before'))
-				$oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) {
+							$oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
+			}
 
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after'))
-				$oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) {
+							$oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
+			}
 
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after'))
-				$oModuleController->insertTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after');
+			if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) {
+							$oModuleController->insertTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after');
+			}
 			// 2007. 10. 17 modules are deleted when you delete all registered triggers that add tag
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after'))
-				$oModuleController->insertTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after');
+			if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after')) {
+							$oModuleController->insertTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after');
+			}
 			// tag in the index column of the table tag
-			if(!$oDB->isIndexExists("tags","idx_tag"))
-				$oDB->addIndex("tags","idx_tag", array("document_srl","tag"));
+			if(!$oDB->isIndexExists("tags","idx_tag")) {
+							$oDB->addIndex("tags","idx_tag", array("document_srl","tag"));
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}

modules/layout/layout.class.php

Spacing +22 added lines, -22 removed lines

@@ -29,30 +29,30 @@ 
 		$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 Add site_srl to layout table
-			if(!$oDB->isColumnExists('layouts', 'site_srl')) return true;
+			if (!$oDB->isColumnExists('layouts', 'site_srl')) return true;
 			// 2009. 02. 26 Move the previous layout for faceoff
 			$files = FileHandler::readDir('./files/cache/layout');
-			for($i=0,$c=count($files);$i<$c;$i++)
+			for ($i = 0, $c = count($files); $i < $c; $i++)
 			{
 				$filename = $files[$i];
-				if(preg_match('/([0-9]+)\.html/i',$filename)) return true;
+				if (preg_match('/([0-9]+)\.html/i', $filename)) return true;
 			}
 
-			if(!$oDB->isColumnExists('layouts', 'layout_type')) return true;
+			if (!$oDB->isColumnExists('layouts', 'layout_type')) return true;
 
 			$args = new stdClass();
 			$args->layout = '.';
 			$output = executeQueryArray('layout.getLayoutDotList', $args);
-			if($output->data && count($output->data) > 0)
+			if ($output->data && count($output->data) > 0)
 			{
-				foreach($output->data as $layout)
+				foreach ($output->data as $layout)
 				{
 					$layout_path = explode('.', $layout->layout);
-					if(count($layout_path) != 2) continue;
-					if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/layouts/%s', $layout_path[0], $layout_path[1]))) return true;
+					if (count($layout_path) != 2) continue;
+					if (is_dir(sprintf(_XE_PATH_.'themes/%s/layouts/%s', $layout_path[0], $layout_path[1]))) return true;
 				}
 			}
 
@@ -74,39 +74,39 @@ 
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
 		{
 			// 2009. 02. 11 Add site_srl to menu table
-			if(!$oDB->isColumnExists('layouts', 'site_srl'))
+			if (!$oDB->isColumnExists('layouts', 'site_srl'))
 			{
-				$oDB->addColumn('layouts','site_srl','number',11,0,true);
+				$oDB->addColumn('layouts', 'site_srl', 'number', 11, 0, true);
 			}
 			// 2009. 02. 26 Move the previous layout for faceoff
 			$oLayoutModel = getModel('layout');
 			$files = FileHandler::readDir('./files/cache/layout');
-			for($i=0,$c=count($files);$i<$c;$i++)
+			for ($i = 0, $c = count($files); $i < $c; $i++)
 			{
 				$filename = $files[$i];
-				if(!preg_match('/([0-9]+)\.html/i',$filename,$match)) continue;
+				if (!preg_match('/([0-9]+)\.html/i', $filename, $match)) continue;
 				$layout_srl = $match[1];
-				if(!$layout_srl) continue;
+				if (!$layout_srl) continue;
 				$path = $oLayoutModel->getUserLayoutPath($layout_srl);
-				if(!is_dir($path)) FileHandler::makeDir($path);
+				if (!is_dir($path)) FileHandler::makeDir($path);
 				FileHandler::copyFile('./files/cache/layout/'.$filename, $path.'layout.html');
 				@unlink('./files/cache/layout/'.$filename);
 			}
 
-			if(!$oDB->isColumnExists('layouts', 'layout_type'))
+			if (!$oDB->isColumnExists('layouts', 'layout_type'))
 			{
-				$oDB->addColumn('layouts','layout_type','char',1,'P',true);
+				$oDB->addColumn('layouts', 'layout_type', 'char', 1, 'P', true);
 			}
 
 			$args->layout = '.';
 			$output = executeQueryArray('layout.getLayoutDotList', $args);
-			if($output->data && count($output->data) > 0)
+			if ($output->data && count($output->data) > 0)
 			{
-				foreach($output->data as $layout)
+				foreach ($output->data as $layout)
 				{
 					$layout_path = explode('.', $layout->layout);
-					if(count($layout_path) != 2) continue;
-					if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/layouts/%s', $layout_path[0], $layout_path[1])))
+					if (count($layout_path) != 2) continue;
+					if (is_dir(sprintf(_XE_PATH_.'themes/%s/layouts/%s', $layout_path[0], $layout_path[1])))
 					{
 						$args->layout = implode('|@|', $layout_path);
 						$args->layout_srl = $layout->layout_srl;
@@ -127,7 +127,7 @@ 
 	function recompileCache()
 	{
 		$path = './files/cache/layout';
-		if(!is_dir($path))
+		if (!is_dir($path))
 		{
 			FileHandler::makeDir($path);
 			return;

Braces +27 added lines, -9 removed lines

@@ -32,16 +32,22 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2009. 02. 11 Add site_srl to layout table
-			if(!$oDB->isColumnExists('layouts', 'site_srl')) return true;
+			if(!$oDB->isColumnExists('layouts', 'site_srl')) {
+				return true;
+			}
 			// 2009. 02. 26 Move the previous layout for faceoff
 			$files = FileHandler::readDir('./files/cache/layout');
 			for($i=0,$c=count($files);$i<$c;$i++)
 			{
 				$filename = $files[$i];
-				if(preg_match('/([0-9]+)\.html/i',$filename)) return true;
+				if(preg_match('/([0-9]+)\.html/i',$filename)) {
+					return true;
+				}
 			}
 
-			if(!$oDB->isColumnExists('layouts', 'layout_type')) return true;
+			if(!$oDB->isColumnExists('layouts', 'layout_type')) {
+				return true;
+			}
 
 			$args = new stdClass();
 			$args->layout = '.';
@@ -51,8 +57,12 @@ 
 				foreach($output->data as $layout)
 				{
 					$layout_path = explode('.', $layout->layout);
-					if(count($layout_path) != 2) continue;
-					if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/layouts/%s', $layout_path[0], $layout_path[1]))) return true;
+					if(count($layout_path) != 2) {
+						continue;
+					}
+					if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/layouts/%s', $layout_path[0], $layout_path[1]))) {
+						return true;
+					}
 				}
 			}
 
@@ -84,11 +94,17 @@ 
 			for($i=0,$c=count($files);$i<$c;$i++)
 			{
 				$filename = $files[$i];
-				if(!preg_match('/([0-9]+)\.html/i',$filename,$match)) continue;
+				if(!preg_match('/([0-9]+)\.html/i',$filename,$match)) {
+					continue;
+				}
 				$layout_srl = $match[1];
-				if(!$layout_srl) continue;
+				if(!$layout_srl) {
+					continue;
+				}
 				$path = $oLayoutModel->getUserLayoutPath($layout_srl);
-				if(!is_dir($path)) FileHandler::makeDir($path);
+				if(!is_dir($path)) {
+					FileHandler::makeDir($path);
+				}
 				FileHandler::copyFile('./files/cache/layout/'.$filename, $path.'layout.html');
 				@unlink('./files/cache/layout/'.$filename);
 			}
@@ -105,7 +121,9 @@ 
 				foreach($output->data as $layout)
 				{
 					$layout_path = explode('.', $layout->layout);
-					if(count($layout_path) != 2) continue;
+					if(count($layout_path) != 2) {
+						continue;
+					}
 					if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/layouts/%s', $layout_path[0], $layout_path[1])))
 					{
 						$args->layout = implode('|@|', $layout_path);

modules/rss/rss.class.php

Spacing +12 added lines, -12 removed lines

@@ -38,19 +38,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))
 		{
 			// Add the Action forward for atom
-			if(!$oModuleModel->getActionForward('atom')) return true;
+			if (!$oModuleModel->getActionForward('atom')) return true;
 			// 2007. 10. Add a trigger for participating additional configurations of the service module
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before')) return true;
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before')) return true;
 			// 2007. 10. 19 Call the trigger to set RSS URL before outputing
-			if(!$oModuleModel->getTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after')) return true;
+			if (!$oModuleModel->getTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after')) return true;
 
-			if($oModuleModel->getTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before')) return true;
+			if ($oModuleModel->getTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before')) return true;
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'rss', 'controller', 'triggerCopyModule', 'after')) return true;
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'rss', 'controller', 'triggerCopyModule', 'after')) return true;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -68,22 +68,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))
 		{
 			// Add atom act
-			if(!$oModuleModel->getActionForward('atom'))
+			if (!$oModuleModel->getActionForward('atom'))
 				$oModuleController->insertActionForward('rss', 'view', 'atom');
 			// 2007. 10. An additional set of 18 to participate in a service module, add a trigger
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before'))
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before'))
 				$oModuleController->insertTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before');
 			// 2007. 10. 19 outputs the trigger before you call to set up rss url
-			if(!$oModuleModel->getTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after'))
+			if (!$oModuleModel->getTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after'))
 				$oModuleController->insertTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after');
-			if($oModuleModel->getTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before'))
+			if ($oModuleModel->getTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before'))
 				$oModuleController->deleteTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before');
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'rss', 'controller', 'triggerCopyModule', 'after'))
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'rss', 'controller', 'triggerCopyModule', 'after'))
 			{
 				$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'rss', 'controller', 'triggerCopyModule', 'after');
 			}

Braces +27 added lines, -13 removed lines

@@ -41,16 +41,26 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// Add the Action forward for atom
-			if(!$oModuleModel->getActionForward('atom')) return true;
+			if(!$oModuleModel->getActionForward('atom')) {
+				return true;
+			}
 			// 2007. 10. Add a trigger for participating additional configurations of the service module
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before')) return true;
+			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before')) {
+				return true;
+			}
 			// 2007. 10. 19 Call the trigger to set RSS URL before outputing
-			if(!$oModuleModel->getTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after')) return true;
+			if(!$oModuleModel->getTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after')) {
+				return true;
+			}
 
-			if($oModuleModel->getTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before')) return true;
+			if($oModuleModel->getTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before')) {
+				return true;
+			}
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'rss', 'controller', 'triggerCopyModule', 'after')) return true;
+			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'rss', 'controller', 'triggerCopyModule', 'after')) {
+				return true;
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -71,16 +81,20 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// Add atom act
-			if(!$oModuleModel->getActionForward('atom'))
-				$oModuleController->insertActionForward('rss', 'view', 'atom');
+			if(!$oModuleModel->getActionForward('atom')) {
+							$oModuleController->insertActionForward('rss', 'view', 'atom');
+			}
 			// 2007. 10. An additional set of 18 to participate in a service module, add a trigger
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before'))
-				$oModuleController->insertTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before');
+			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before')) {
+							$oModuleController->insertTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before');
+			}
 			// 2007. 10. 19 outputs the trigger before you call to set up rss url
-			if(!$oModuleModel->getTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after'))
-				$oModuleController->insertTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after');
-			if($oModuleModel->getTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before'))
-				$oModuleController->deleteTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before');
+			if(!$oModuleModel->getTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after')) {
+							$oModuleController->insertTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after');
+			}
+			if($oModuleModel->getTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before')) {
+							$oModuleController->deleteTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before');
+			}
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied
 			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'rss', 'controller', 'triggerCopyModule', 'after'))