xpressengine / xe-core

modules/session/session.class.php

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).'}';
 	}
 

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 BaseObject();
 	}
@@ -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).'}';
 	}
 
 	/**

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'))

modules/poll/poll.class.php

Spacing +14 added lines, -14 removed lines

@@ -37,15 +37,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))
 		{
 			// 2007.10.17 When deleting posts/comments delete the poll as well
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after')) return true;
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after')) return true;
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after')) return true;
-			if(!$oModuleModel->getTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after')) return true;
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after')) return true;
+			if (!$oModuleModel->getTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after')) return true;
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after')) return true;
+			if (!$oModuleModel->getTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after')) return true;
+			if (!$oModuleModel->getTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after')) return true;
+			if (!$oModuleModel->getTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after')) return true;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -61,21 +61,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))
 		{
 			// 2007.10.17 When deleting posts/comments delete the poll as well
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after'))
+			if (!$oModuleModel->getTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after'))
 				$oModuleController->insertTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after');
-			if(!$oModuleModel->getTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after'))
+			if (!$oModuleModel->getTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after'))
 				$oModuleController->insertTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after');
 			// 2008.04.22 A poll connection to add posts/comments
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after'))
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after'))
 				$oModuleController->insertTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after');
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after'))
+			if (!$oModuleModel->getTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after'))
 				$oModuleController->insertTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after');
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after'))
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after'))
 				$oModuleController->insertTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after');
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after'))
+			if (!$oModuleModel->getTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after'))
 				$oModuleController->insertTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after');
 
 			$oModuleController->insertUpdatedLog($version_update_id);

Braces +36 added lines, -18 removed lines

@@ -40,12 +40,24 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007.10.17 When deleting posts/comments delete the poll as well
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after')) return true;
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after')) return true;
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after')) return true;
-			if(!$oModuleModel->getTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after')) return true;
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after')) {
+				return true;
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -64,19 +76,25 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2007.10.17 When deleting posts/comments delete the poll as well
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after'))
-				$oModuleController->insertTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after');
-			if(!$oModuleModel->getTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after'))
-				$oModuleController->insertTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after');
+			if(!$oModuleModel->getTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after')) {
+							$oModuleController->insertTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after');
+			}
+			if(!$oModuleModel->getTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after')) {
+							$oModuleController->insertTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after');
+			}
 			// 2008.04.22 A poll connection to add posts/comments
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after'))
-				$oModuleController->insertTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after');
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after'))
-				$oModuleController->insertTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after');
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after'))
-				$oModuleController->insertTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after');
-			if(!$oModuleModel->getTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after'))
-				$oModuleController->insertTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after');
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after')) {
+							$oModuleController->insertTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after');
+			}
+			if(!$oModuleModel->getTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after')) {
+							$oModuleController->insertTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after');
+			}
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after')) {
+							$oModuleController->insertTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after');
+			}
+			if(!$oModuleModel->getTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after')) {
+							$oModuleController->insertTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after');
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}

modules/autoinstall/autoinstall.class.php

Spacing +16 added lines, -16 removed lines

@@ -17,13 +17,13 @@ 
 	function generate(&$params)
 	{
 		$xmlDoc = '<?xml version="1.0" encoding="utf-8" ?><methodCall><params>';
-		if(!is_array($params))
+		if (!is_array($params))
 		{
 			return NULL;
 		}
 
 		$params["module"] = "resourceapi";
-		foreach($params as $key => $val)
+		foreach ($params as $key => $val)
 		{
 			$xmlDoc .= sprintf("<%s><![CDATA[%s]]></%s>", $key, $val, $key);
 		}
@@ -41,7 +41,7 @@ 
 	{
 		$body = XmlGenerater::generate($params);
 		$buff = FileHandler::getRemoteResource(_XE_DOWNLOAD_SERVER_, $body, 3, "POST", "application/xml");
-		if(!$buff)
+		if (!$buff)
 		{
 			return;
 		}
@@ -74,7 +74,7 @@ 
 	{
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('autoinstall');
-		if($config->downloadServer != _XE_DOWNLOAD_SERVER_)
+		if ($config->downloadServer != _XE_DOWNLOAD_SERVER_)
 		{
 			$this->stop('msg_not_match_server');
 		}
@@ -105,34 +105,34 @@ 
 		$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(!FileHandler::exists('./modules/autoinstall/schemas/autoinstall_installed_packages.xml')
+			if (!FileHandler::exists('./modules/autoinstall/schemas/autoinstall_installed_packages.xml')
 				&& $oDB->isTableExists("autoinstall_installed_packages"))
 			{
 				return TRUE;
 			}
-			if(!FileHandler::exists('./modules/autoinstall/schemas/autoinstall_remote_categories.xml')
+			if (!FileHandler::exists('./modules/autoinstall/schemas/autoinstall_remote_categories.xml')
 				&& $oDB->isTableExists("autoinstall_remote_categories"))
 			{
 				return TRUE;
 			}
 
 			// 2011.08.08 add column 'list_order' in ai_remote_categories
-			if(!$oDB->isColumnExists('ai_remote_categories', 'list_order'))
+			if (!$oDB->isColumnExists('ai_remote_categories', 'list_order'))
 			{
 				return TRUE;
 			}
 
 			// 2011.08.08 set _XE_DOWNLOAD_SERVER_ at module config
 			$config = $oModuleModel->getModuleConfig('autoinstall');
-			if(!isset($config->downloadServer))
+			if (!isset($config->downloadServer))
 			{
 				return TRUE;
 			}
 
 			// 2012.11.12 add column 'have_instance' in autoinstall_packages
-			if(!$oDB->isColumnExists('autoinstall_packages', 'have_instance'))
+			if (!$oDB->isColumnExists('autoinstall_packages', 'have_instance'))
 			{
 				return TRUE;
 			}
@@ -154,21 +154,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))
 		{
-			if(!FileHandler::exists('./modules/autoinstall/schemas/autoinstall_installed_packages.xml')
+			if (!FileHandler::exists('./modules/autoinstall/schemas/autoinstall_installed_packages.xml')
 				&& $oDB->isTableExists("autoinstall_installed_packages"))
 			{
 				$oDB->dropTable("autoinstall_installed_packages");
 			}
-			if(!FileHandler::exists('./modules/autoinstall/schemas/autoinstall_remote_categories.xml')
+			if (!FileHandler::exists('./modules/autoinstall/schemas/autoinstall_remote_categories.xml')
 				&& $oDB->isTableExists("autoinstall_remote_categories"))
 			{
 				$oDB->dropTable("autoinstall_remote_categories");
 			}
 
 			// 2011.08.08 add column 'list_order' in 'ai_remote_categories
-			if(!$oDB->isColumnExists('ai_remote_categories', 'list_order'))
+			if (!$oDB->isColumnExists('ai_remote_categories', 'list_order'))
 			{
 				$oDB->addColumn('ai_remote_categories', 'list_order', 'number', 11, NULL, TRUE);
 				$oDB->addIndex('ai_remote_categories', 'idx_list_order', array('list_order'));
@@ -176,14 +176,14 @@ 
 
 			// 2011. 08. 08 set _XE_DOWNLOAD_SERVER_ at module config
 			$config = $oModuleModel->getModuleConfig('autoinstall');
-			if(!isset($config->downloadServer))
+			if (!isset($config->downloadServer))
 			{
 				$config->downloadServer = _XE_DOWNLOAD_SERVER_;
 				$oModuleController->insertModuleConfig('autoinstall', $config);
 			}
 
 			// 2012.11.12 add column 'have_instance' in autoinstall_packages
-			if(!$oDB->isColumnExists('autoinstall_packages', 'have_instance'))
+			if (!$oDB->isColumnExists('autoinstall_packages', 'have_instance'))
 			{
 				$oDB->addColumn('autoinstall_packages', 'have_instance', 'char', '1', 'N', TRUE);
 			}

modules/integration_search/integration_search.class.php

Spacing +8 added lines, -8 removed lines

@@ -31,17 +31,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('integration_search');
 
-			if($config->skin)
+			if ($config->skin)
 			{
 				$config_parse = explode('.', $config->skin);
-				if(count($config_parse) > 1)
+				if (count($config_parse) > 1)
 				{
 					$template_path = sprintf('./themes/%s/modules/integration_search/', $config_parse[0]);
-					if(is_dir($template_path)) return true;
+					if (is_dir($template_path)) return true;
 				}
 			}
 
@@ -61,17 +61,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/integration_search/', $config_parse[0]);
-					if(is_dir($template_path))
+					if (is_dir($template_path))
 					{
 						$config->skin = implode('|@|', $config_parse);
 						$oModuleController = getController('module');

Braces +3 added lines, -1 removed lines

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