xpressengine / xe-core

modules/page/page.wap.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 	function procWAP(&$oMobile)
 	{
 		// Check permissions
-		if(!$this->grant->access) return $oMobile->setContent(Context::getLang('msg_not_permitted'));
+		if (!$this->grant->access) return $oMobile->setContent(Context::getLang('msg_not_permitted'));
 		// The contents of the widget chuchulham
 		$oWidgetController = getController('widget');
 		$content = $oWidgetController->transWidgetCode($this->module_info->content);

Braces +3 added lines, -1 removed lines

@@ -15,7 +15,9 @@
 	function procWAP(&$oMobile)
 	{
 		// Check permissions
-		if(!$this->grant->access) return $oMobile->setContent(Context::getLang('msg_not_permitted'));
+		if(!$this->grant->access) {
+			return $oMobile->setContent(Context::getLang('msg_not_permitted'));
+		}
 		// The contents of the widget chuchulham
 		$oWidgetController = getController('widget');
 		$content = $oWidgetController->transWidgetCode($this->module_info->content);

modules/point/point.class.php

Spacing +35 added lines, -35 removed lines

@@ -24,9 +24,9 @@ 
 		$config->able_module = 'N';
 		$config->max_level = 30;
 		// Per-level score
-		for($i=1;$i<=30;$i++)
+		for ($i = 1; $i <= 30; $i++)
 		{
-			$config->level_step[$i] = pow($i,2)*90;
+			$config->level_step[$i] = pow($i, 2) * 90;
 		}
 		// Points for registration
 		$config->signup_point = 10;
@@ -84,29 +84,29 @@ 
 
 		$config = $oModuleModel->getModuleConfig('point');
 		// check if module is abled
-		if($config->able_module != 'N')
+		if ($config->able_module != 'N')
 		{
 			// Add a trigger for registration/insert document/insert comment/upload a file/download
-			if(!$oModuleModel->getTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before')) return true;
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after')) return true;
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after')) return true;
-			if(!$oModuleModel->getTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after')) return true;
-			if(!$oModuleModel->getTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after')) return true;
-			if(!$oModuleModel->getTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after')) return true;
-			if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before')) return true;
-			if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after')) return true;
-			if(!$oModuleModel->getTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after')) return true;
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) return true;
+			if (!$oModuleModel->getTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after')) return true;
+			if (!$oModuleModel->getTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after')) return true;
+			if (!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before')) return true;
+			if (!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after')) return true;
+			if (!$oModuleModel->getTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after')) return true;
+			if (!$oModuleModel->getTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after')) return true;
+			if (!$oModuleModel->getTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after')) return true;
+			if (!$oModuleModel->getTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after')) return true;
+			if (!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before')) return true;
+			if (!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after')) return true;
+			if (!$oModuleModel->getTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after')) return true;
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after')) return true;
+			if (!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) return true;
 			// Add a trigger for voting up and down 2008.05.13 haneul
-			if(!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after')) return true;
+			if (!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after')) return true;
 			// Add a trigger for using points for permanent saving of a temporarily saved document 2009.05.19 zero
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before')) return true;
+			if (!$oModuleModel->getTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before')) return true;
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'point', 'controller', 'triggerCopyModule', 'after')) return true;
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'point', 'controller', 'triggerCopyModule', 'after')) return true;
 		}
 
 		return false;
@@ -121,40 +121,40 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		// Add a trigger for registration/insert document/insert comment/upload a file/download
-		if(!$oModuleModel->getTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after')) 
+		if (!$oModuleModel->getTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after')) 
 			$oModuleController->insertTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after');
-		if(!$oModuleModel->getTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after')) 
+		if (!$oModuleModel->getTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after')) 
 			$oModuleController->insertTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after');
-		if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before')) 
+		if (!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before')) 
 			$oModuleController->insertTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before');
-		if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after')) 
+		if (!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after')) 
 			$oModuleController->insertTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after');
-		if(!$oModuleModel->getTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after')) 
+		if (!$oModuleModel->getTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after')) 
 			$oModuleController->insertTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after');
-		if(!$oModuleModel->getTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after')) 
+		if (!$oModuleModel->getTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after')) 
 			$oModuleController->insertTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after');
-		if(!$oModuleModel->getTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after')) 
+		if (!$oModuleModel->getTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after')) 
 			$oModuleController->insertTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after');
-		if(!$oModuleModel->getTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after')) 
+		if (!$oModuleModel->getTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after')) 
 			$oModuleController->insertTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after');
-		if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before')) 
+		if (!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before')) 
 			$oModuleController->insertTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before');
-		if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after')) 
+		if (!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after')) 
 			$oModuleController->insertTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after');
-		if(!$oModuleModel->getTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after'))
+		if (!$oModuleModel->getTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after'))
 			$oModuleController->insertTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after');
-		if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after')) 
+		if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after')) 
 			$oModuleController->insertTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after');
-		if(!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) 
+		if (!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) 
 			$oModuleController->insertTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after');
 		// Add a trigger for voting up and down 2008.05.13 haneul
-		if(!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after'))
+		if (!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after'))
 			$oModuleController->insertTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after');
 		// Add a trigger for using points for permanent saving of a temporarily saved document 2009.05.19 zero
-		if(!$oModuleModel->getTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before')) 
+		if (!$oModuleModel->getTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before')) 
 			$oModuleController->insertTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before');
 		// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-		if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'point', 'controller', 'triggerCopyModule', 'after'))
+		if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'point', 'controller', 'triggerCopyModule', 'after'))
 		{
 			$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'point', 'controller', 'triggerCopyModule', 'after');
 		}

Braces +93 added lines, -46 removed lines

@@ -87,26 +87,58 @@ 
 		if($config->able_module != 'N')
 		{
 			// Add a trigger for registration/insert document/insert comment/upload a file/download
-			if(!$oModuleModel->getTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before')) return true;
-			if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after')) return true;
-			if(!$oModuleModel->getTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after')) return true;
-			if(!$oModuleModel->getTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after')) return true;
-			if(!$oModuleModel->getTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after')) return true;
-			if(!$oModuleModel->getTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after')) return true;
-			if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before')) return true;
-			if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after')) return true;
-			if(!$oModuleModel->getTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after')) return true;
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after')) return true;
-			if(!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) return true;
+			if(!$oModuleModel->getTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) {
+				return true;
+			}
 			// Add a trigger for voting up and down 2008.05.13 haneul
-			if(!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after')) return true;
+			if(!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after')) {
+				return true;
+			}
 			// Add a trigger for using points for permanent saving of a temporarily saved document 2009.05.19 zero
-			if(!$oModuleModel->getTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before')) return true;
+			if(!$oModuleModel->getTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before')) {
+				return true;
+			}
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'point', 'controller', 'triggerCopyModule', 'after')) return true;
+			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'point', 'controller', 'triggerCopyModule', 'after')) {
+				return true;
+			}
 		}
 
 		return false;
@@ -121,38 +153,53 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		// Add a trigger for registration/insert document/insert comment/upload a file/download
-		if(!$oModuleModel->getTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after')) 
-			$oModuleController->insertTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after');
-		if(!$oModuleModel->getTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after')) 
-			$oModuleController->insertTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after');
-		if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before')) 
-			$oModuleController->insertTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before');
-		if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after')) 
-			$oModuleController->insertTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after');
-		if(!$oModuleModel->getTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after')) 
-			$oModuleController->insertTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after');
-		if(!$oModuleModel->getTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after')) 
-			$oModuleController->insertTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after');
-		if(!$oModuleModel->getTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after')) 
-			$oModuleController->insertTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after');
-		if(!$oModuleModel->getTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after')) 
-			$oModuleController->insertTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after');
-		if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before')) 
-			$oModuleController->insertTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before');
-		if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after')) 
-			$oModuleController->insertTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after');
-		if(!$oModuleModel->getTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after'))
-			$oModuleController->insertTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after');
-		if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after')) 
-			$oModuleController->insertTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after');
-		if(!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) 
-			$oModuleController->insertTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after');
+		if(!$oModuleModel->getTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after')) {
+					$oModuleController->insertTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after');
+		}
+		if(!$oModuleModel->getTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after')) {
+					$oModuleController->insertTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after');
+		}
+		if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before')) {
+					$oModuleController->insertTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before');
+		}
+		if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after')) {
+					$oModuleController->insertTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after');
+		}
+		if(!$oModuleModel->getTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after')) {
+					$oModuleController->insertTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after');
+		}
+		if(!$oModuleModel->getTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after')) {
+					$oModuleController->insertTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after');
+		}
+		if(!$oModuleModel->getTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after')) {
+					$oModuleController->insertTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after');
+		}
+		if(!$oModuleModel->getTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after')) {
+					$oModuleController->insertTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after');
+		}
+		if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before')) {
+					$oModuleController->insertTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before');
+		}
+		if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after')) {
+					$oModuleController->insertTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after');
+		}
+		if(!$oModuleModel->getTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after')) {
+					$oModuleController->insertTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after');
+		}
+		if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after')) {
+					$oModuleController->insertTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after');
+		}
+		if(!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) {
+					$oModuleController->insertTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after');
+		}
 		// Add a trigger for voting up and down 2008.05.13 haneul
-		if(!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after'))
-			$oModuleController->insertTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after');
+		if(!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after')) {
+					$oModuleController->insertTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after');
+		}
 		// Add a trigger for using points for permanent saving of a temporarily saved document 2009.05.19 zero
-		if(!$oModuleModel->getTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before')) 
-			$oModuleController->insertTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before');
+		if(!$oModuleModel->getTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before')) {
+					$oModuleController->insertTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before');
+		}
 		// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
 		if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'point', 'controller', 'triggerCopyModule', 'after'))
 		{

modules/point/point.model.php

Braces +34 added lines, -15 removed lines

@@ -24,15 +24,18 @@ 
 		$member_srl = abs($member_srl);
 
 		// Get from instance memory
-		if($this->pointList[$member_srl]) return true;
+		if($this->pointList[$member_srl]) {
+			return true;
+		}
 
 		// Get from file cache
 		$path = sprintf(_XE_PATH_ . 'files/member_extra_info/point/%s',getNumberingPath($member_srl));
 		$cache_filename = sprintf('%s%d.cache.txt', $path, $member_srl);
 		if(file_exists($cache_filename))
 		{
-			if(!$this->pointList[$member_srl])
-				$this->pointList[$member_srl] = trim(FileHandler::readFile($cache_filename));
+			if(!$this->pointList[$member_srl]) {
+							$this->pointList[$member_srl] = trim(FileHandler::readFile($cache_filename));
+			}
 			return true;
 		}
 
@@ -60,14 +63,17 @@ 
 		$member_srl = abs($member_srl);
 
 		// Get from instance memory
-		if(!$from_db && $this->pointList[$member_srl]) return $this->pointList[$member_srl];
+		if(!$from_db && $this->pointList[$member_srl]) {
+			return $this->pointList[$member_srl];
+		}
 
 		// Get from file cache
 		$path = sprintf(_XE_PATH_ . 'files/member_extra_info/point/%s',getNumberingPath($member_srl));
 		$cache_filename = sprintf('%s%d.cache.txt', $path, $member_srl);
 
-		if(!$from_db && file_exists($cache_filename))
-			return $this->pointList[$member_srl] = trim(FileHandler::readFile($cache_filename));
+		if(!$from_db && file_exists($cache_filename)) {
+					return $this->pointList[$member_srl] = trim(FileHandler::readFile($cache_filename));
+		}
 
 		// Get from the DB
 		$args =new stdClass();
@@ -78,7 +84,9 @@ 
 		{
 			$point = (int)$output->data->point;
 			$this->pointList[$member_srl] = $point;
-			if(!is_dir($path)) FileHandler::makeDir($path);
+			if(!is_dir($path)) {
+				FileHandler::makeDir($path);
+			}
 			FileHandler::writeFile($cache_filename, $point);
 			return $point;
 		}
@@ -91,7 +99,9 @@ 
 	function getLevel($point, $level_step)
 	{
 		$level_count = count($level_step);
-		for($level=0;$level<=$level_count;$level++) if($point < $level_step[$level]) break;
+		for($level=0;$level<=$level_count;$level++) {
+			if($point < $level_step[$level]) break;
+		}
 		$level --;
 		return $level;
 	}
@@ -100,7 +110,9 @@ 
 	{
 		$member_srls = Context::get('member_srls');
 		$member_srls = explode(',',$member_srls);
-		if(count($member_srls)==0) return;
+		if(count($member_srls)==0) {
+			return;
+		}
 		array_unique($member_srls);
 
 		$oModuleModel = getModel('module');
@@ -144,19 +156,27 @@ 
 			switch($search_target)
 			{
 				case 'user_id' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_user_id = $search_keyword;
 					break;
 				case 'user_name' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_user_name = $search_keyword;
 					break;
 				case 'nick_name' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_nick_name = $search_keyword;
 					break;
 				case 'email_address' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_email_address = $search_keyword;
 					break;
 				case 'regdate' :
@@ -174,8 +194,7 @@ 
 		if($args->selected_group_srl)
 		{
 			$query_id = 'point.getMemberListWithinGroup';
-		}
-		else
+		} else
 		{
 			$query_id = 'point.getMemberList';
 		}

Spacing +34 added lines, -34 removed lines

@@ -24,28 +24,28 @@ 
 		$member_srl = abs($member_srl);
 
 		// Get from instance memory
-		if($this->pointList[$member_srl]) return true;
+		if ($this->pointList[$member_srl]) return true;
 
 		// Get from file cache
-		$path = sprintf(_XE_PATH_ . 'files/member_extra_info/point/%s',getNumberingPath($member_srl));
+		$path = sprintf(_XE_PATH_.'files/member_extra_info/point/%s', getNumberingPath($member_srl));
 		$cache_filename = sprintf('%s%d.cache.txt', $path, $member_srl);
-		if(file_exists($cache_filename))
+		if (file_exists($cache_filename))
 		{
-			if(!$this->pointList[$member_srl])
+			if (!$this->pointList[$member_srl])
 				$this->pointList[$member_srl] = trim(FileHandler::readFile($cache_filename));
 			return true;
 		}
 
-		$args =new stdClass();
+		$args = new stdClass();
 		$args->member_srl = $member_srl;
 		$output = executeQuery('point.getPoint', $args);
-		if($output->data->member_srl == $member_srl)
+		if ($output->data->member_srl == $member_srl)
 		{
-			if(!$this->pointList[$member_srl])
+			if (!$this->pointList[$member_srl])
 			{
-				$this->pointList[$member_srl] = (int)$output->data->point;
+				$this->pointList[$member_srl] = (int) $output->data->point;
 				FileHandler::makeDir($path);
-				FileHandler::writeFile($cache_filename, (int)$output->data->point);
+				FileHandler::writeFile($cache_filename, (int) $output->data->point);
 			}
 			return true;
 		}
@@ -60,25 +60,25 @@ 
 		$member_srl = abs($member_srl);
 
 		// Get from instance memory
-		if(!$from_db && $this->pointList[$member_srl]) return $this->pointList[$member_srl];
+		if (!$from_db && $this->pointList[$member_srl]) return $this->pointList[$member_srl];
 
 		// Get from file cache
-		$path = sprintf(_XE_PATH_ . 'files/member_extra_info/point/%s',getNumberingPath($member_srl));
+		$path = sprintf(_XE_PATH_.'files/member_extra_info/point/%s', getNumberingPath($member_srl));
 		$cache_filename = sprintf('%s%d.cache.txt', $path, $member_srl);
 
-		if(!$from_db && file_exists($cache_filename))
+		if (!$from_db && file_exists($cache_filename))
 			return $this->pointList[$member_srl] = trim(FileHandler::readFile($cache_filename));
 
 		// Get from the DB
-		$args =new stdClass();
+		$args = new stdClass();
 		$args->member_srl = $member_srl;
 		$output = executeQuery('point.getPoint', $args);
 
-		if(isset($output->data->member_srl))
+		if (isset($output->data->member_srl))
 		{
-			$point = (int)$output->data->point;
+			$point = (int) $output->data->point;
 			$this->pointList[$member_srl] = $point;
-			if(!is_dir($path)) FileHandler::makeDir($path);
+			if (!is_dir($path)) FileHandler::makeDir($path);
 			FileHandler::writeFile($cache_filename, $point);
 			return $point;
 		}
@@ -91,23 +91,23 @@ 
 	function getLevel($point, $level_step)
 	{
 		$level_count = count($level_step);
-		for($level=0;$level<=$level_count;$level++) if($point < $level_step[$level]) break;
-		$level --;
+		for ($level = 0; $level <= $level_count; $level++) if ($point < $level_step[$level]) break;
+		$level--;
 		return $level;
 	}
 
 	function getMembersPointInfo()
 	{
 		$member_srls = Context::get('member_srls');
-		$member_srls = explode(',',$member_srls);
-		if(count($member_srls)==0) return;
+		$member_srls = explode(',', $member_srls);
+		if (count($member_srls) == 0) return;
 		array_unique($member_srls);
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
 
 		$info = array();
-		foreach($member_srls as $v)
+		foreach ($member_srls as $v)
 		{
 			$obj = new stdClass;
 			$obj->point = $this->getPoint($v);
@@ -116,7 +116,7 @@ 
 			$info[] = $obj;
 		}
 
-		$this->add('point_info',$info);
+		$this->add('point_info', $info);
 	}
 
 
@@ -126,37 +126,37 @@ 
 	function getMemberList($args = null, $columnList = array())
 	{
 		// Arrange the search options
-		$args->is_admin = Context::get('is_admin')=='Y'?'Y':'';
-		$args->is_denied = Context::get('is_denied')=='Y'?'Y':'';
+		$args->is_admin = Context::get('is_admin') == 'Y' ? 'Y' : '';
+		$args->is_denied = Context::get('is_denied') == 'Y' ? 'Y' : '';
 		$args->selected_group_srl = Context::get('selected_group_srl');
 
 		$search_target = trim(Context::get('search_target'));
 		$search_keyword = trim(Context::get('search_keyword'));
 
 		// if search keyword is emtpy, show all list
-		if(!$search_keyword)
+		if (!$search_keyword)
 		{
 			unset($args->is_admin, $args->is_denied, $args->selected_group_srl, $search_target);
 		}
 
-		if($search_target && $search_keyword)
+		if ($search_target && $search_keyword)
 		{
-			switch($search_target)
+			switch ($search_target)
 			{
 				case 'user_id' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_user_id = $search_keyword;
 					break;
 				case 'user_name' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_user_name = $search_keyword;
 					break;
 				case 'nick_name' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_nick_name = $search_keyword;
 					break;
 				case 'email_address' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
 					$args->s_email_address = $search_keyword;
 					break;
 				case 'regdate' :
@@ -171,7 +171,7 @@ 
 			}
 		}
 		// If there is a selected_group_srl, change the "query id" (for table join)
-		if($args->selected_group_srl)
+		if ($args->selected_group_srl)
 		{
 			$query_id = 'point.getMemberListWithinGroup';
 		}
@@ -182,12 +182,12 @@ 
 
 		$output = executeQuery($query_id, $args, $columnList);
 
-		if($output->total_count)
+		if ($output->total_count)
 		{
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('point');
 
-			foreach($output->data as $key => $val)
+			foreach ($output->data as $key => $val)
 			{
 				$output->data[$key]->level = $this->getLevel($val->point, $config->level_step);
 			}

modules/point/point.view.php

Braces +3 added lines, -1 removed lines

@@ -30,7 +30,9 @@
 		{
 			$current_module_info = Context::get('current_module_info');
 			$current_module_srl = $current_module_info->module_srl;
-			if(!$current_module_srl) return new Object();
+			if(!$current_module_srl) {
+				return new Object();
+			}
 		}
 		// Get the configuration information
 		$oModuleModel = getModel('module');

Spacing +4 added lines, -4 removed lines

@@ -26,20 +26,20 @@
 		$current_module_srl = Context::get('module_srl');
 		$current_module_srls = Context::get('module_srls');
 
-		if(!$current_module_srl && !$current_module_srls)
+		if (!$current_module_srl && !$current_module_srls)
 		{
 			$current_module_info = Context::get('current_module_info');
 			$current_module_srl = $current_module_info->module_srl;
-			if(!$current_module_srl) return new Object();
+			if (!$current_module_srl) return new Object();
 		}
 		// Get the configuration information
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('point');
 
-		if($current_module_srl)
+		if ($current_module_srl)
 		{
 			$module_config = $oModuleModel->getModulePartConfig('point', $current_module_srl);
-			if(!$module_config)
+			if (!$module_config)
 			{
 				$module_config['insert_document'] = $config->insert_document;
 				$module_config['insert_comment'] = $config->insert_comment;

modules/poll/poll.admin.model.php

Spacing +5 added lines, -5 removed lines

@@ -20,7 +20,7 @@ 
 	function getPollList($args)
 	{
 		$output = executeQueryArray('poll.getPollList', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		//if($output->data && !is_array($output->data)) $output->data = array($output->data);
 		return $output;
@@ -32,7 +32,7 @@ 
 	function getPollListWithMember($args)
 	{
 		$output = executeQueryArray('poll.getPollListWithMember', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		return $output;
 	}
@@ -50,14 +50,14 @@ 
 
 		$oDocument = $oDocumentModel->getDocument($upload_target_srl);
 
-		if(!$oDocument->isExists()) $oComment = $oCommentModel->getComment($upload_target_srl);
+		if (!$oDocument->isExists()) $oComment = $oCommentModel->getComment($upload_target_srl);
 
-		if($oComment && $oComment->isExists())
+		if ($oComment && $oComment->isExists())
 		{
 			$this->add('document_srl', $oComment->get('document_srl'));
 			$this->add('comment_srl', $oComment->get('comment_srl'));
 		}
-		elseif($oDocument->isExists())
+		elseif ($oDocument->isExists())
 		{
 			$this->add('document_srl', $oDocument->get('document_srl'));
 		}

Braces +12 added lines, -6 removed lines

@@ -20,7 +20,9 @@ 
 	function getPollList($args)
 	{
 		$output = executeQueryArray('poll.getPollList', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		//if($output->data && !is_array($output->data)) $output->data = array($output->data);
 		return $output;
@@ -32,7 +34,9 @@ 
 	function getPollListWithMember($args)
 	{
 		$output = executeQueryArray('poll.getPollListWithMember', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		return $output;
 	}
@@ -50,18 +54,20 @@ 
 
 		$oDocument = $oDocumentModel->getDocument($upload_target_srl);
 
-		if(!$oDocument->isExists()) $oComment = $oCommentModel->getComment($upload_target_srl);
+		if(!$oDocument->isExists()) {
+			$oComment = $oCommentModel->getComment($upload_target_srl);
+		}
 
 		if($oComment && $oComment->isExists())
 		{
 			$this->add('document_srl', $oComment->get('document_srl'));
 			$this->add('comment_srl', $oComment->get('comment_srl'));
-		}
-		elseif($oDocument->isExists())
+		} elseif($oDocument->isExists())
 		{
 			$this->add('document_srl', $oDocument->get('document_srl'));
+		} else {
+			return new Object(-1, 'msg_not_founded');
 		}
-		else return new Object(-1, 'msg_not_founded');
 	}
 }
 /* End of file poll.admin.model.php */

modules/poll/poll.admin.view.php

Braces +18 added lines, -7 removed lines

@@ -29,7 +29,9 @@ 
 			switch($search_target)
 			{
 				case 'title' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+					if($search_keyword) {
+						$search_keyword = str_replace(' ','%',$search_keyword);
+					}
 					$args->s_title= $search_keyword;
 					break;
 				case 'regdate' :
@@ -62,17 +64,22 @@ 
 
 			$oDocumentModel = getModel('document');
 			$targetDocumentOutput = $oDocumentModel->getDocuments($uploadTargetSrlList);
-			if(!is_array($targetDocumentOutput)) $targetDocumentOutput = array();
+			if(!is_array($targetDocumentOutput)) {
+				$targetDocumentOutput = array();
+			}
 
 			$oCommentModel = getModel('comment');
 			$columnList = array('comment_srl', 'document_srl');
 			$targetCommentOutput = $oCommentModel->getComments($uploadTargetSrlList, $columnList);
-			if(!is_array($targetCommentOutput)) $targetCommentOutput = array();
+			if(!is_array($targetCommentOutput)) {
+				$targetCommentOutput = array();
+			}
 
 			foreach($output->data as $value)
 			{
-				if(array_key_exists($value->upload_target_srl, $targetDocumentOutput))
-					$value->document_srl = $value->upload_target_srl;
+				if(array_key_exists($value->upload_target_srl, $targetDocumentOutput)) {
+									$value->document_srl = $value->upload_target_srl;
+				}
 
 				if(array_key_exists($value->upload_target_srl, $targetCommentOutput))
 				{
@@ -110,7 +117,9 @@ 
 		$skin_list = $oModuleModel->getSkins($this->module_path);
 		Context::set('skin_list', $skin_list);
 
-		if(!$skin_list[$config->skin]) $config->skin = "default";
+		if(!$skin_list[$config->skin]) {
+			$config->skin = "default";
+		}
 		// Set the skin colorset once the configurations is completed
 		Context::set('colorset_list', $skin_list[$config->skin]->colorset);
 
@@ -137,7 +146,9 @@ 
 		$args->poll_index_srl = Context::get('poll_index_srl');
 
 		$output = executeQuery('poll.getPoll', $args);
-		if(!$output->data) return $this->stop('msg_poll_not_exists');
+		if(!$output->data) {
+			return $this->stop('msg_poll_not_exists');
+		}
 
 		$poll = new stdClass();
 		$poll->stop_date = $output->data->stop_date;

Spacing +18 added lines, -18 removed lines

@@ -24,19 +24,19 @@ 
 		$search_keyword = trim(Context::get('search_keyword'));
 
 		$args = new stdClass();
-		if($search_target && $search_keyword)
+		if ($search_target && $search_keyword)
 		{
-			switch($search_target)
+			switch ($search_target)
 			{
 				case 'title' :
-					if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-					$args->s_title= $search_keyword;
+					if ($search_keyword) $search_keyword = str_replace(' ', '%', $search_keyword);
+					$args->s_title = $search_keyword;
 					break;
 				case 'regdate' :
 					$args->s_regdate = $search_keyword;
 					break;
 				case 'ipaddress' :
-					$args->s_ipaddress= $search_keyword;
+					$args->s_ipaddress = $search_keyword;
 					break;
 			}
 		}
@@ -52,29 +52,29 @@ 
 		$output = $oPollAdminModel->getPollListWithMember($args);
 
 		// check poll type. document or comment
-		if(is_array($output->data))
+		if (is_array($output->data))
 		{
 			$uploadTargetSrlList = array();
-			foreach($output->data as $value)
+			foreach ($output->data as $value)
 			{
 				$uploadTargetSrlList[] = $value->upload_target_srl;
 			}
 
 			$oDocumentModel = getModel('document');
 			$targetDocumentOutput = $oDocumentModel->getDocuments($uploadTargetSrlList);
-			if(!is_array($targetDocumentOutput)) $targetDocumentOutput = array();
+			if (!is_array($targetDocumentOutput)) $targetDocumentOutput = array();
 
 			$oCommentModel = getModel('comment');
 			$columnList = array('comment_srl', 'document_srl');
 			$targetCommentOutput = $oCommentModel->getComments($uploadTargetSrlList, $columnList);
-			if(!is_array($targetCommentOutput)) $targetCommentOutput = array();
+			if (!is_array($targetCommentOutput)) $targetCommentOutput = array();
 
-			foreach($output->data as $value)
+			foreach ($output->data as $value)
 			{
-				if(array_key_exists($value->upload_target_srl, $targetDocumentOutput))
+				if (array_key_exists($value->upload_target_srl, $targetDocumentOutput))
 					$value->document_srl = $value->upload_target_srl;
 
-				if(array_key_exists($value->upload_target_srl, $targetCommentOutput))
+				if (array_key_exists($value->upload_target_srl, $targetCommentOutput))
 				{
 					$value->comment_srl = $value->upload_target_srl;
 					$value->document_srl = $targetCommentOutput[$value->comment_srl]->document_srl;
@@ -110,14 +110,14 @@ 
 		$skin_list = $oModuleModel->getSkins($this->module_path);
 		Context::set('skin_list', $skin_list);
 
-		if(!$skin_list[$config->skin]) $config->skin = "default";
+		if (!$skin_list[$config->skin]) $config->skin = "default";
 		// Set the skin colorset once the configurations is completed
 		Context::set('colorset_list', $skin_list[$config->skin]->colorset);
 
 		$security = new Security();
 		$security->encodeHTML('config..');
 		$security->encodeHTML('skin_list..title');
-		$security->encodeHTML('colorset_list..name','colorset_list..title');
+		$security->encodeHTML('colorset_list..name', 'colorset_list..title');
 
 		// Set a template
 		$this->setTemplatePath($this->module_path.'tpl');
@@ -137,14 +137,14 @@ 
 		$args->poll_index_srl = Context::get('poll_index_srl');
 
 		$output = executeQuery('poll.getPoll', $args);
-		if(!$output->data) return $this->stop('msg_poll_not_exists');
+		if (!$output->data) return $this->stop('msg_poll_not_exists');
 
 		$poll = new stdClass();
 		$poll->stop_date = $output->data->stop_date;
 		$poll->poll_count = $output->data->poll_count;
 
 		$output = executeQuery('poll.getPollTitle', $args);
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return $this->stop('msg_poll_not_exists');
 		}
@@ -155,14 +155,14 @@ 
 		$tmp->poll_count = $output->data->poll_count;
 
 		$output = executeQuery('poll.getPollItem', $args);
-		foreach($output->data as $val)
+		foreach ($output->data as $val)
 		{
 			$tmp->item[] = $val;
 		}
 
 		$poll->poll_srl = $poll_srl;
 
-		Context::set('poll',$poll);
+		Context::set('poll', $poll);
 		// Configure the skin and the colorset for the default configuration
 		$oModuleModel = getModel('module');
 		$poll_config = $oModuleModel->getModuleConfig('poll');

modules/poll/poll.class.php

Spacing +12 added lines, -12 removed lines

@@ -39,12 +39,12 @@ 
 	{
 		$oModuleModel = getModel('module');
 		// 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;
 
 		return false;
 	}
@@ -57,18 +57,18 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		// 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');
 
 		return new Object(0, 'success_updated');

Braces +36 added lines, -18 removed lines

@@ -39,12 +39,24 @@ 
 	{
 		$oModuleModel = getModel('module');
 		// 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;
+		}
 
 		return false;
 	}
@@ -57,19 +69,25 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		// 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');
+		}
 
 		return new Object(0, 'success_updated');
 	}

modules/poll/poll.controller.php

Braces +75 added lines, -27 removed lines

@@ -96,7 +96,9 @@ 
 			}
 		}
 
-		if(!count($args->poll)) return new Object(-1, 'cmd_null_item');
+		if(!count($args->poll)) {
+			return new Object(-1, 'cmd_null_item');
+		}
 
 		$args->stop_date = $stop_date;
 
@@ -175,15 +177,21 @@ 
 		for($i=0;$i<count($tmp_item_srls);$i++)
 		{
 			$srl = (int)trim($tmp_item_srls[$i]);
-			if(!$srl) continue;
+			if(!$srl) {
+				continue;
+			}
 			$item_srls[] = $srl;
 		}
 
 		// If there is no response item, display an error
-		if(!count($item_srls)) return new Object(-1, 'msg_check_poll_item');
+		if(!count($item_srls)) {
+			return new Object(-1, 'msg_check_poll_item');
+		}
 		// Make sure is the poll has already been taken
 		$oPollModel = getModel('poll');
-		if($oPollModel->isPolled($poll_srl)) return new Object(-1, 'msg_already_poll');
+		if($oPollModel->isPolled($poll_srl)) {
+			return new Object(-1, 'msg_already_poll');
+		}
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -225,7 +233,9 @@ 
 		$oDB->commit();
 
 		$skin = Context::get('skin');
-		if(!$skin || !is_dir(_XE_PATH_ . 'modules/poll/skins/'.$skin)) $skin = 'default';
+		if(!$skin || !is_dir(_XE_PATH_ . 'modules/poll/skins/'.$skin)) {
+			$skin = 'default';
+		}
 		// Get tpl
 		$tpl = $oPollModel->getPollHtml($poll_srl, '', $skin);
 
@@ -245,7 +255,9 @@ 
 		$poll_srl = Context::get('poll_srl');
 
 		$skin = Context::get('skin');
-		if(!$skin || !is_dir(_XE_PATH_ . 'modules/poll/skins/'.$skin)) $skin = 'default';
+		if(!$skin || !is_dir(_XE_PATH_ . 'modules/poll/skins/'.$skin)) {
+			$skin = 'default';
+		}
 
 		$oPollModel = getModel('poll');
 		$tpl = $oPollModel->getPollResultHtml($poll_srl, $skin);
@@ -259,9 +271,13 @@ 
 	 */
 	function procPollGetList()
 	{
-		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new Object(-1,'msg_not_permitted');
+		}
 		$pollSrls = Context::get('poll_srls');
-		if($pollSrls) $pollSrlList = explode(',', $pollSrls);
+		if($pollSrls) {
+			$pollSrlList = explode(',', $pollSrls);
+		}
 
 		global $lang;
 		if(count($pollSrlList) > 0)
@@ -276,12 +292,14 @@ 
 			{
 				foreach($pollList AS $key=>$value)
 				{
-					if($value->checkcount == 1) $value->checkName = $lang->single_check;
-					else $value->checkName = $lang->multi_check;
+					if($value->checkcount == 1) {
+						$value->checkName = $lang->single_check;
+					} else {
+						$value->checkName = $lang->multi_check;
+					}
 				}
 			}
-		}
-		else
+		} else
 		{
 			$pollList = array();
 			$this->setMessage($lang->no_documents);
@@ -332,29 +350,43 @@ 
 	function triggerDeleteDocumentPoll(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new Object();
+		if(!$document_srl) {
+			return new Object();
+		}
 		// Get the poll
 		$args = new stdClass();
 		$args->upload_target_srl = $document_srl;
 		$output = executeQuery('poll.getPollByTargetSrl', $args);
-		if(!$output->data) return new Object();
+		if(!$output->data) {
+			return new Object();
+		}
 
 		$poll_srl = $output->data->poll_srl;
-		if(!$poll_srl) return new Object();
+		if(!$poll_srl) {
+			return new Object();
+		}
 
 		$args->poll_srl = $poll_srl;
 
 		$output = executeQuery('poll.deletePoll', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$output = executeQuery('poll.deletePollItem', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$output = executeQuery('poll.deletePollTitle', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$output = executeQuery('poll.deletePollLog', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		return new Object();
 	}
@@ -365,29 +397,43 @@ 
 	function triggerDeleteCommentPoll(&$obj)
 	{
 		$comment_srl = $obj->comment_srl;
-		if(!$comment_srl) return new Object();
+		if(!$comment_srl) {
+			return new Object();
+		}
 		// Get the poll
 		$args = new stdClass();
 		$args->upload_target_srl = $comment_srl;
 		$output = executeQuery('poll.getPollByTargetSrl', $args);
-		if(!$output->data) return new Object();
+		if(!$output->data) {
+			return new Object();
+		}
 
 		$poll_srl = $output->data->poll_srl;
-		if(!$poll_srl) return new Object();
+		if(!$poll_srl) {
+			return new Object();
+		}
 
 		$args->poll_srl = $poll_srl;
 
 		$output = executeQuery('poll.deletePoll', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$output = executeQuery('poll.deletePollItem', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$output = executeQuery('poll.deletePollTitle', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$output = executeQuery('poll.deletePollLog', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		return new Object();
 	}
@@ -407,7 +453,9 @@ 
 			$output = executeQuery('poll.getPoll', $args);
 			$poll = $output->data;
 
-			if($poll->upload_target_srl) continue;
+			if($poll->upload_target_srl) {
+				continue;
+			}
 
 			$args->upload_target_srl = $upload_target_srl;
 			$output = executeQuery('poll.updatePollTarget', $args);

Spacing +59 added lines, -59 removed lines

@@ -20,9 +20,9 @@ 
 	function procPollInsert()
 	{
 		$stop_date = Context::get('stop_date');
-		if($stop_date < date('Ymd'))
+		if ($stop_date < date('Ymd'))
 		{
-			$stop_date = date('YmdHis', $_SERVER['REQUEST_TIME']+60*60*24*365);
+			$stop_date = date('YmdHis', $_SERVER['REQUEST_TIME'] + 60 * 60 * 24 * 365);
 		}
 
 		$logged_info = Context::get('logged_info');
@@ -34,9 +34,9 @@ 
 		unset($vars->error_return_url);
 		unset($vars->stop_date);
 
-		foreach($vars as $key => $val)
+		foreach ($vars as $key => $val)
 		{
-			if(stripos($key, 'tidx'))
+			if (stripos($key, 'tidx'))
 			{
 				continue;
 			}
@@ -44,32 +44,32 @@ 
 			$tmp_arr = explode('_', $key);
 
 			$poll_index = $tmp_arr[1];
-			if(!$poll_index)
+			if (!$poll_index)
 			{
 				continue;
 			}
 
-			if(!trim($val))
+			if (!trim($val))
 			{
 				continue;
 			}
 
-			if($tmp_args[$poll_index] == NULL)
+			if ($tmp_args[$poll_index] == NULL)
 			{
 				$tmp_args[$poll_index] = new stdClass;
 			}
 
-			if(!is_array($tmp_args[$poll_index]->item))
+			if (!is_array($tmp_args[$poll_index]->item))
 			{
 				$tmp_args[$poll_index]->item = array();
 			}
 
-			if($logged_info->is_admin != 'Y')
+			if ($logged_info->is_admin != 'Y')
 			{
 				$val = htmlspecialchars($val, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 			}
 
-			switch($tmp_arr[0])
+			switch ($tmp_arr[0])
 			{
 				case 'title':
 					$tmp_args[$poll_index]->title = $val;
@@ -83,26 +83,26 @@ 
 			}
 		}
 
-		foreach($tmp_args as $key => $val)
+		foreach ($tmp_args as $key => $val)
 		{
-			if(!$val->checkcount)
+			if (!$val->checkcount)
 			{
 				$val->checkcount = 1;
 			}
 
-			if($val->title && count($val->item))
+			if ($val->title && count($val->item))
 			{
 				$args->poll[] = $val;
 			}
 		}
 
-		if(!count($args->poll)) return new Object(-1, 'cmd_null_item');
+		if (!count($args->poll)) return new Object(-1, 'cmd_null_item');
 
 		$args->stop_date = $stop_date;
 
 		// Configure the variables
 		$poll_srl = getNextSequence();
-		$member_srl = $logged_info->member_srl?$logged_info->member_srl:0;
+		$member_srl = $logged_info->member_srl ? $logged_info->member_srl : 0;
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -111,18 +111,18 @@ 
 		$poll_args = new stdClass;
 		$poll_args->poll_srl = $poll_srl;
 		$poll_args->member_srl = $member_srl;
-		$poll_args->list_order = $poll_srl*-1;
+		$poll_args->list_order = $poll_srl * -1;
 		$poll_args->stop_date = $args->stop_date;
 		$poll_args->poll_count = 0;
 		$output = executeQuery('poll.insertPoll', $poll_args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 
 		// Individual poll registration
-		foreach($args->poll as $key => $val)
+		foreach ($args->poll as $key => $val)
 		{
 			$title_args = new stdClass;
 			$title_args->poll_srl = $poll_srl;
@@ -134,14 +134,14 @@ 
 			$title_args->member_srl = $member_srl;
 			$title_args->upload_target_srl = $upload_target_srl;
 			$output = executeQuery('poll.insertPollTitle', $title_args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
 			}
 
 			// Add the individual survey items
-			foreach($val->item as $k => $v)
+			foreach ($val->item as $k => $v)
 			{
 				$item_args = new stdClass;
 				$item_args->poll_srl = $poll_srl;
@@ -150,7 +150,7 @@ 
 				$item_args->poll_count = 0;
 				$item_args->upload_target_srl = $upload_target_srl;
 				$output = executeQuery('poll.insertPollItem', $item_args);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					$oDB->rollback();
 					return $output;
@@ -171,19 +171,19 @@ 
 	{
 		$poll_srl = Context::get('poll_srl');
 		$poll_srl_indexes = Context::get('poll_srl_indexes');
-		$tmp_item_srls = explode(',',$poll_srl_indexes);
-		for($i=0;$i<count($tmp_item_srls);$i++)
+		$tmp_item_srls = explode(',', $poll_srl_indexes);
+		for ($i = 0; $i < count($tmp_item_srls); $i++)
 		{
-			$srl = (int)trim($tmp_item_srls[$i]);
-			if(!$srl) continue;
+			$srl = (int) trim($tmp_item_srls[$i]);
+			if (!$srl) continue;
 			$item_srls[] = $srl;
 		}
 
 		// If there is no response item, display an error
-		if(!count($item_srls)) return new Object(-1, 'msg_check_poll_item');
+		if (!count($item_srls)) return new Object(-1, 'msg_check_poll_item');
 		// Make sure is the poll has already been taken
 		$oPollModel = getModel('poll');
-		if($oPollModel->isPolled($poll_srl)) return new Object(-1, 'msg_already_poll');
+		if ($oPollModel->isPolled($poll_srl)) return new Object(-1, 'msg_already_poll');
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
@@ -193,15 +193,15 @@ 
 		// Update all poll responses related to the post
 		$output = executeQuery('poll.updatePoll', $args);
 		$output = executeQuery('poll.updatePollTitle', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
 		}
 		// Record each polls selected items
-		$args->poll_item_srl = implode(',',$item_srls);
+		$args->poll_item_srl = implode(',', $item_srls);
 		$output = executeQuery('poll.updatePollItems', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -211,12 +211,12 @@ 
 		$log_args->poll_srl = $poll_srl;
 
 		$logged_info = Context::get('logged_info');
-		$member_srl = $logged_info->member_srl?$logged_info->member_srl:0;
+		$member_srl = $logged_info->member_srl ? $logged_info->member_srl : 0;
 
 		$log_args->member_srl = $member_srl;
 		$log_args->ipaddress = $_SERVER['REMOTE_ADDR'];
 		$output = executeQuery('poll.insertPollLog', $log_args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -225,12 +225,12 @@ 
 		$oDB->commit();
 
 		$skin = Context::get('skin');
-		if(!$skin || !is_dir(_XE_PATH_ . 'modules/poll/skins/'.$skin)) $skin = 'default';
+		if (!$skin || !is_dir(_XE_PATH_.'modules/poll/skins/'.$skin)) $skin = 'default';
 		// Get tpl
 		$tpl = $oPollModel->getPollHtml($poll_srl, '', $skin);
 
 		$this->add('poll_srl', $poll_srl);
-		$this->add('tpl',$tpl);
+		$this->add('tpl', $tpl);
 		$this->setMessage('success_poll');
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPollAdminConfig');
@@ -245,13 +245,13 @@ 
 		$poll_srl = Context::get('poll_srl');
 
 		$skin = Context::get('skin');
-		if(!$skin || !is_dir(_XE_PATH_ . 'modules/poll/skins/'.$skin)) $skin = 'default';
+		if (!$skin || !is_dir(_XE_PATH_.'modules/poll/skins/'.$skin)) $skin = 'default';
 
 		$oPollModel = getModel('poll');
 		$tpl = $oPollModel->getPollResultHtml($poll_srl, $skin);
 
 		$this->add('poll_srl', $poll_srl);
-		$this->add('tpl',$tpl);
+		$this->add('tpl', $tpl);
 	}
 
 	/**
@@ -259,12 +259,12 @@ 
 	 */
 	function procPollGetList()
 	{
-		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
 		$pollSrls = Context::get('poll_srls');
-		if($pollSrls) $pollSrlList = explode(',', $pollSrls);
+		if ($pollSrls) $pollSrlList = explode(',', $pollSrls);
 
 		global $lang;
-		if(count($pollSrlList) > 0)
+		if (count($pollSrlList) > 0)
 		{
 			$oPollAdminModel = getAdminModel('poll');
 			$args = new stdClass;
@@ -272,11 +272,11 @@ 
 			$output = $oPollAdminModel->getPollListWithMember($args);
 			$pollList = $output->data;
 
-			if(is_array($pollList))
+			if (is_array($pollList))
 			{
-				foreach($pollList AS $key=>$value)
+				foreach ($pollList AS $key=>$value)
 				{
-					if($value->checkcount == 1) $value->checkName = $lang->single_check;
+					if ($value->checkcount == 1) $value->checkName = $lang->single_check;
 					else $value->checkName = $lang->multi_check;
 				}
 			}
@@ -332,29 +332,29 @@ 
 	function triggerDeleteDocumentPoll(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new Object();
+		if (!$document_srl) return new Object();
 		// Get the poll
 		$args = new stdClass();
 		$args->upload_target_srl = $document_srl;
 		$output = executeQuery('poll.getPollByTargetSrl', $args);
-		if(!$output->data) return new Object();
+		if (!$output->data) return new Object();
 
 		$poll_srl = $output->data->poll_srl;
-		if(!$poll_srl) return new Object();
+		if (!$poll_srl) return new Object();
 
 		$args->poll_srl = $poll_srl;
 
 		$output = executeQuery('poll.deletePoll', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output = executeQuery('poll.deletePollItem', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output = executeQuery('poll.deletePollTitle', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output = executeQuery('poll.deletePollLog', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		return new Object();
 	}
@@ -365,29 +365,29 @@ 
 	function triggerDeleteCommentPoll(&$obj)
 	{
 		$comment_srl = $obj->comment_srl;
-		if(!$comment_srl) return new Object();
+		if (!$comment_srl) return new Object();
 		// Get the poll
 		$args = new stdClass();
 		$args->upload_target_srl = $comment_srl;
 		$output = executeQuery('poll.getPollByTargetSrl', $args);
-		if(!$output->data) return new Object();
+		if (!$output->data) return new Object();
 
 		$poll_srl = $output->data->poll_srl;
-		if(!$poll_srl) return new Object();
+		if (!$poll_srl) return new Object();
 
 		$args->poll_srl = $poll_srl;
 
 		$output = executeQuery('poll.deletePoll', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output = executeQuery('poll.deletePollItem', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output = executeQuery('poll.deletePollTitle', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$output = executeQuery('poll.deletePollLog', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		return new Object();
 	}
@@ -397,8 +397,8 @@ 
 	 */
 	function syncPoll($upload_target_srl, $content)
 	{
-		$match_cnt = preg_match_all('!<img([^\>]*)poll_srl=(["\']?)([0-9]*)(["\']?)([^\>]*?)\>!is',$content, $matches);
-		for($i=0;$i<$match_cnt;$i++)
+		$match_cnt = preg_match_all('!<img([^\>]*)poll_srl=(["\']?)([0-9]*)(["\']?)([^\>]*?)\>!is', $content, $matches);
+		for ($i = 0; $i < $match_cnt; $i++)
 		{
 			$poll_srl = $matches[3][$i];
 
@@ -407,7 +407,7 @@ 
 			$output = executeQuery('poll.getPoll', $args);
 			$poll = $output->data;
 
-			if($poll->upload_target_srl) continue;
+			if ($poll->upload_target_srl) continue;
 
 			$args->upload_target_srl = $upload_target_srl;
 			$output = executeQuery('poll.updatePollTarget', $args);

modules/poll/poll.model.php

Spacing +21 added lines, -21 removed lines

@@ -22,7 +22,7 @@ 
 		$args = new stdClass;
 		$args->poll_srl = $poll_srl;
 
-		if(Context::get('is_logged'))
+		if (Context::get('is_logged'))
 		{
 			$logged_info = Context::get('logged_info');
 			$args->member_srl = $logged_info->member_srl;
@@ -32,7 +32,7 @@ 
 			$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 		}
 		$output = executeQuery('poll.getPollLog', $args);
-		if($output->data->count) return true;
+		if ($output->data->count) return true;
 		return false;
 	}
 
@@ -47,20 +47,20 @@ 
 		// Get the information related to the survey
 		$columnList = array('poll_count', 'stop_date');
 		$output = executeQuery('poll.getPoll', $args, $columnList);
-		if(!$output->data) return '';
+		if (!$output->data) return '';
 
 		$poll = new stdClass;
 		$poll->style = $style;
-		$poll->poll_count = (int)$output->data->poll_count;
+		$poll->poll_count = (int) $output->data->poll_count;
 		$poll->stop_date = $output->data->stop_date;
 
 		$columnList = array('poll_index_srl', 'title', 'checkcount', 'poll_count');
 		$output = executeQuery('poll.getPollTitle', $args, $columnList);
-		if(!$output->data) return;
-		if(!is_array($output->data)) $output->data = array($output->data);
+		if (!$output->data) return;
+		if (!is_array($output->data)) $output->data = array($output->data);
 
 		$poll->poll = array();
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			$poll->poll[$val->poll_index_srl] = new stdClass;
 			$poll->poll[$val->poll_index_srl]->title = $val->title;
@@ -69,16 +69,16 @@ 
 		}
 
 		$output = executeQuery('poll.getPollItem', $args);
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			$poll->poll[$val->poll_index_srl]->item[] = $val;
 		}
 
 		$poll->poll_srl = $poll_srl;
 		// Only ongoing poll results
-		if($poll->stop_date >= date("Ymd"))
+		if ($poll->stop_date >= date("Ymd"))
 		{
-			if($this->isPolled($poll_srl)) $tpl_file = "result";
+			if ($this->isPolled($poll_srl)) $tpl_file = "result";
 			else $tpl_file = "form";
 		}
 		else
@@ -86,8 +86,8 @@ 
 			$tpl_file = "result";
 		}
 
-		Context::set('poll',$poll);
-		Context::set('skin',$skin);
+		Context::set('poll', $poll);
+		Context::set('skin', $skin);
 		// The skin for the default configurations, and the colorset configurations
 		$tpl_path = sprintf("%sskins/%s/", $this->module_path, $skin);
 
@@ -104,20 +104,20 @@ 
 		$args->poll_srl = $poll_srl;
 		// Get the information related to the survey
 		$output = executeQuery('poll.getPoll', $args);
-		if(!$output->data) return '';
+		if (!$output->data) return '';
 
 		$poll = new stdClass;
 		$poll->style = $style;
-		$poll->poll_count = (int)$output->data->poll_count;
+		$poll->poll_count = (int) $output->data->poll_count;
 		$poll->stop_date = $output->data->stop_date;
 
 		$columnList = array('poll_index_srl', 'title', 'checkcount', 'poll_count');
 		$output = executeQuery('poll.getPollTitle', $args, $columnList);
-		if(!$output->data) return;
-		if(!is_array($output->data)) $output->data = array($output->data);
+		if (!$output->data) return;
+		if (!is_array($output->data)) $output->data = array($output->data);
 
 		$poll->poll = array();
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			$poll->poll[$val->poll_index_srl] = new stdClass;
 			$poll->poll[$val->poll_index_srl]->title = $val->title;
@@ -126,7 +126,7 @@ 
 		}
 
 		$output = executeQuery('poll.getPollItem', $args);
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			$poll->poll[$val->poll_index_srl]->item[] = $val;
 		}
@@ -135,7 +135,7 @@ 
 
 		$tpl_file = "result";
 
-		Context::set('poll',$poll);
+		Context::set('poll', $poll);
 		// The skin for the default configurations, and the colorset configurations
 		$tpl_path = sprintf("%sskins/%s/", $this->module_path, $skin);
 
@@ -152,13 +152,13 @@ 
 		$oModuleModel = getModel('module');
 		$skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
 
-		for($i=0;$i<count($skin_info->colorset);$i++)
+		for ($i = 0; $i < count($skin_info->colorset); $i++)
 		{
 			$colorset = sprintf('%s|@|%s', $skin_info->colorset[$i]->name, $skin_info->colorset[$i]->title);
 			$colorset_list[] = $colorset;
 		}
 
-		if(count($colorset_list)) $colorsets = implode("\n", $colorset_list);
+		if (count($colorset_list)) $colorsets = implode("\n", $colorset_list);
 		$this->add('colorset_list', $colorsets);
 	}
 }

Braces +31 added lines, -14 removed lines

@@ -26,13 +26,14 @@ 
 		{
 			$logged_info = Context::get('logged_info');
 			$args->member_srl = $logged_info->member_srl;
-		}
-		else
+		} else
 		{
 			$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 		}
 		$output = executeQuery('poll.getPollLog', $args);
-		if($output->data->count) return true;
+		if($output->data->count) {
+			return true;
+		}
 		return false;
 	}
 
@@ -47,7 +48,9 @@ 
 		// Get the information related to the survey
 		$columnList = array('poll_count', 'stop_date');
 		$output = executeQuery('poll.getPoll', $args, $columnList);
-		if(!$output->data) return '';
+		if(!$output->data) {
+			return '';
+		}
 
 		$poll = new stdClass;
 		$poll->style = $style;
@@ -56,8 +59,12 @@ 
 
 		$columnList = array('poll_index_srl', 'title', 'checkcount', 'poll_count');
 		$output = executeQuery('poll.getPollTitle', $args, $columnList);
-		if(!$output->data) return;
-		if(!is_array($output->data)) $output->data = array($output->data);
+		if(!$output->data) {
+			return;
+		}
+		if(!is_array($output->data)) {
+			$output->data = array($output->data);
+		}
 
 		$poll->poll = array();
 		foreach($output->data as $key => $val)
@@ -78,10 +85,12 @@ 
 		// Only ongoing poll results
 		if($poll->stop_date >= date("Ymd"))
 		{
-			if($this->isPolled($poll_srl)) $tpl_file = "result";
-			else $tpl_file = "form";
-		}
-		else
+			if($this->isPolled($poll_srl)) {
+				$tpl_file = "result";
+			} else {
+				$tpl_file = "form";
+			}
+		} else
 		{
 			$tpl_file = "result";
 		}
@@ -104,7 +113,9 @@ 
 		$args->poll_srl = $poll_srl;
 		// Get the information related to the survey
 		$output = executeQuery('poll.getPoll', $args);
-		if(!$output->data) return '';
+		if(!$output->data) {
+			return '';
+		}
 
 		$poll = new stdClass;
 		$poll->style = $style;
@@ -113,8 +124,12 @@ 
 
 		$columnList = array('poll_index_srl', 'title', 'checkcount', 'poll_count');
 		$output = executeQuery('poll.getPollTitle', $args, $columnList);
-		if(!$output->data) return;
-		if(!is_array($output->data)) $output->data = array($output->data);
+		if(!$output->data) {
+			return;
+		}
+		if(!is_array($output->data)) {
+			$output->data = array($output->data);
+		}
 
 		$poll->poll = array();
 		foreach($output->data as $key => $val)
@@ -158,7 +173,9 @@ 
 			$colorset_list[] = $colorset;
 		}
 
-		if(count($colorset_list)) $colorsets = implode("\n", $colorset_list);
+		if(count($colorset_list)) {
+			$colorsets = implode("\n", $colorset_list);
+		}
 		$this->add('colorset_list', $colorsets);
 	}
 }