xpressengine / xe-core

modules/rss/rss.class.php

Spacing +10 added lines, -10 removed lines

@@ -35,16 +35,16 @@ 
 	{
 		$oModuleModel = getModel('module');
 		// 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;
 
 		return false;
 	}
@@ -59,19 +59,19 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		// 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

@@ -35,16 +35,26 @@ 
 	{
 		$oModuleModel = getModel('module');
 		// 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;
+		}
 
 		return false;
 	}
@@ -59,16 +69,20 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		// 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/rss/rss.controller.php

Braces +4 added lines, -3 removed lines

@@ -37,7 +37,9 @@ 
 			$current_module_srl = $current_module_info->module_srl;
 		}
 
-		if(!$current_module_srl) return new Object();
+		if(!$current_module_srl) {
+			return new Object();
+		}
 		// Imported rss settings of the selected module
 		$oRssModel = getModel('rss');
 		$rss_config = $oRssModel->getRssModuleConfig($current_module_srl);
@@ -55,8 +57,7 @@ 
 				$request_uri = Context::getRequestUri();
 				Context::set('general_rss_url', $request_uri.'rss');
 				Context::set('general_atom_url', $request_uri.'atom');
-			}
-			else
+			} else
 			{
 				Context::set('general_rss_url', getUrl('','module','rss','act','rss'));
 				Context::set('general_atom_url', getUrl('','module','rss','act','atom'));

Spacing +10 added lines, -10 removed lines

@@ -28,29 +28,29 @@ 
 		$current_module_srl = Context::get('module_srl');
 		$site_module_info = Context::get('site_module_info');
 
-		if(is_array($current_module_srl))
+		if (is_array($current_module_srl))
 		{
 			unset($current_module_srl);
 		}
-		if(!$current_module_srl) {
+		if (!$current_module_srl) {
 			$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();
 		// Imported rss settings of the selected module
 		$oRssModel = getModel('rss');
 		$rss_config = $oRssModel->getRssModuleConfig($current_module_srl);
 
-		if($rss_config->open_rss != 'N')
+		if ($rss_config->open_rss != 'N')
 		{
 			Context::set('rss_url', $oRssModel->getModuleFeedUrl(Context::get('vid'), Context::get('mid'), 'rss'));
 			Context::set('atom_url', $oRssModel->getModuleFeedUrl(Context::get('vid'), Context::get('mid'), 'atom'));
 		}
 
-		if(Context::isInstalled() && $site_module_info->mid == Context::get('mid') && $total_config->use_total_feed != 'N')
+		if (Context::isInstalled() && $site_module_info->mid == Context::get('mid') && $total_config->use_total_feed != 'N')
 		{
-			if(Context::isAllowRewrite() && !Context::get('vid'))
+			if (Context::isAllowRewrite() && !Context::get('vid'))
 			{
 				$request_uri = Context::getRequestUri();
 				Context::set('general_rss_url', $request_uri.'rss');
@@ -58,8 +58,8 @@ 
 			}
 			else
 			{
-				Context::set('general_rss_url', getUrl('','module','rss','act','rss'));
-				Context::set('general_atom_url', getUrl('','module','rss','act','atom'));
+				Context::set('general_rss_url', getUrl('', 'module', 'rss', 'act', 'rss'));
+				Context::set('general_atom_url', getUrl('', 'module', 'rss', 'act', 'atom'));
 			}
 		}
 
@@ -72,9 +72,9 @@ 
 		$rssConfig = $oModuleModel->getModulePartConfig('rss', $obj->originModuleSrl);
 
 		$oModuleController = getController('module');
-		if(is_array($obj->moduleSrlList))
+		if (is_array($obj->moduleSrlList))
 		{
-			foreach($obj->moduleSrlList AS $key=>$moduleSrl)
+			foreach ($obj->moduleSrlList AS $key=>$moduleSrl)
 			{
 				$oModuleController->insertModulePartConfig('rss', $moduleSrl, $rssConfig);
 			}

modules/rss/rss.model.php

Spacing +4 added lines, -4 removed lines

@@ -18,13 +18,13 @@ 
 	 */
 	function getModuleFeedUrl($vid, $mid, $format = 'rss', $absolute_url = false)
 	{
-		if($absolute_url)
+		if ($absolute_url)
 		{
-			return getFullUrl('','vid',$vid, 'mid',$mid, 'act',$format);
+			return getFullUrl('', 'vid', $vid, 'mid', $mid, 'act', $format);
 		}
 		else
 		{
-			return getUrl('','vid',$vid, 'mid',$mid, 'act',$format);
+			return getUrl('', 'vid', $vid, 'mid', $mid, 'act', $format);
 		}
 	}
 
@@ -39,7 +39,7 @@ 
 		// Get the configurations of the rss module
 		$oModuleModel = getModel('module');
 		$module_rss_config = $oModuleModel->getModulePartConfig('rss', $module_srl);
-		if(!$module_rss_config)
+		if (!$module_rss_config)
 		{
 			$module_rss_config = new stdClass();
 			$module_rss_config->open_rss = 'N';

Braces +1 added lines, -2 removed lines

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

modules/rss/rss.view.php

Braces +43 added lines, -21 removed lines

@@ -53,8 +53,7 @@ 
 					$open_rss_config[$module_srl] = $config->open_rss;
 				}
 				// If mid is not selected, then get all
-			}
-			else
+			} else
 			{
 				if($total_config->use_total_feed != 'N')
 				{
@@ -73,7 +72,9 @@ 
 				}
 			}
 
-			if(!count($module_srls) && !$add_description) return $this->dispError();
+			if(!count($module_srls) && !$add_description) {
+				return $this->dispError();
+			}
 
 			$info = new stdClass;
 			$args = new stdClass;
@@ -87,12 +88,24 @@ 
 				$args->search_keyword = 'N';
 				$args->page = (int)Context::get('page');
 				$args->list_count = 15;
-				if($total_config->feed_document_count) $args->list_count = $total_config->feed_document_count;
-				if(!$args->page || $args->page < 1) $args->page = 1;
-				if($start_date || $start_date != 0) $args->start_date = $start_date;
-				if($end_date || $end_date != 0) $args->end_date = $end_date;
-				if($start_date == 0) unset($start_date);
-				if($end_date == 0) unset($end_date);
+				if($total_config->feed_document_count) {
+					$args->list_count = $total_config->feed_document_count;
+				}
+				if(!$args->page || $args->page < 1) {
+					$args->page = 1;
+				}
+				if($start_date || $start_date != 0) {
+					$args->start_date = $start_date;
+				}
+				if($end_date || $end_date != 0) {
+					$args->end_date = $end_date;
+				}
+				if($start_date == 0) {
+					unset($start_date);
+				}
+				if($end_date == 0) {
+					unset($end_date);
+				}
 
 				$args->sort_index = 'list_order'; 
 				$args->order_type = 'asc';
@@ -108,8 +121,7 @@ 
 					if($config->feed_description)
 					{
 						$info->description = str_replace('\'', '&apos;', htmlspecialchars($config->feed_description, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
-					}
-					else
+					} else
 					{
 						$info->description = str_replace('\'', '&apos;', htmlspecialchars($this->module_info->description, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 					}
@@ -125,9 +137,11 @@ 
 
 		if(!$info->title)
 		{
-			if($rss_title) $info->title = $rss_title;
-			else if($total_config->feed_title) $info->title = $total_config->feed_title;
-			else
+			if($rss_title) {
+				$info->title = $rss_title;
+			} else if($total_config->feed_title) {
+				$info->title = $total_config->feed_title;
+			} else
 			{
 				$site_module_info = Context::get('site_module_info');
 				$info->title = $site_module_info->browser_title;
@@ -139,15 +153,18 @@ 
 			$info->link = Context::getRequestUri();
 			$info->feed_copyright = str_replace('\'', '&apos;', htmlspecialchars($total_config->feed_copyright, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 		}
-		if($add_description) $info->description .= "\r\n".$add_description;
+		if($add_description) {
+			$info->description .= "\r\n".$add_description;
+		}
 
-		if($total_config->image) $info->image = Context::getRequestUri().str_replace('\'', '&apos;', htmlspecialchars($total_config->image, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
+		if($total_config->image) {
+			$info->image = Context::getRequestUri().str_replace('\'', '&apos;', htmlspecialchars($total_config->image, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
+		}
 		switch(Context::get('format'))
 		{
 			case 'atom':
 				$info->date = date('Y-m-d\TH:i:sP');
-				if($mid) { $info->id = getUrl('','mid',$mid,'act','atom','page',Context::get('page'),'start_date',Context::get('start_date'),'end_date',Context::get('end_date')); }
-				else { $info->id = getUrl('','module','rss','act','atom','page',Context::get('page'),'start_date',Context::get('start_date'),'end_date',Context::get('end_date')); }
+				if($mid) { $info->id = getUrl('','mid',$mid,'act','atom','page',Context::get('page'),'start_date',Context::get('start_date'),'end_date',Context::get('end_date')); } else { $info->id = getUrl('','module','rss','act','atom','page',Context::get('page'),'start_date',Context::get('start_date'),'end_date',Context::get('end_date')); }
 				break;
 			case 'rss1.0':
 				$info->date = date('Y-m-d\TH:i:sP');
@@ -157,8 +174,11 @@ 
 				break;
 		}
 
-		if($_SERVER['HTTPS']=='on') $proctcl = 'https://';
-		else $proctcl = 'http://';
+		if($_SERVER['HTTPS']=='on') {
+			$proctcl = 'https://';
+		} else {
+			$proctcl = 'http://';
+		}
 
 		$temp_link = explode('/', $info->link);
 		if($temp_link[0]=='' && $info->link)
@@ -248,7 +268,9 @@ 
 			// Get information of the selected module
 			$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 teh RSS configurations for the selected module
 		$oRssModel = getModel('rss');

Spacing +39 added lines, -39 removed lines

@@ -30,24 +30,24 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		// Get the content and information for the current requested module if the method is not called from another module
-		if(!$document_list)
+		if (!$document_list)
 		{
 			$site_module_info = Context::get('site_module_info');
 			$site_srl = $site_module_info->site_srl;
 			$mid = Context::get('mid'); // The target module id, if absent, then all
-			$start_date = (int)Context::get('start_date');
-			$end_date = (int)Context::get('end_date');
+			$start_date = (int) Context::get('start_date');
+			$end_date = (int) Context::get('end_date');
 
 			$module_srls = array();
 			$rss_config = array();
 			$total_config = '';
 			$total_config = $oModuleModel->getModuleConfig('rss');
 			// If one is specified, extract only for this mid
-			if($mid)
+			if ($mid)
 			{
 				$module_srl = $this->module_info->module_srl;
 				$config = $oModuleModel->getModulePartConfig('rss', $module_srl);
-				if($config->open_rss && $config->open_rss != 'N')
+				if ($config->open_rss && $config->open_rss != 'N')
 				{
 					$module_srls[] = $module_srl; 
 					$open_rss_config[$module_srl] = $config->open_rss;
@@ -56,14 +56,14 @@ 
 			}
 			else
 			{
-				if($total_config->use_total_feed != 'N')
+				if ($total_config->use_total_feed != 'N')
 				{
 					$rss_config = $oModuleModel->getModulePartConfigs('rss', $site_srl);
-					if($rss_config)
+					if ($rss_config)
 					{
-						foreach($rss_config as $module_srl => $config)
+						foreach ($rss_config as $module_srl => $config)
 						{
-							if($config && $config->open_rss != 'N' && $config->open_total_feed != 'T_N')
+							if ($config && $config->open_rss != 'N' && $config->open_total_feed != 'T_N')
 							{
 								$module_srls[] = $module_srl;
 								$open_rss_config[$module_srl] = $config->open_rss;
@@ -73,39 +73,39 @@ 
 				}
 			}
 
-			if(!count($module_srls) && !$add_description) return $this->dispError();
+			if (!count($module_srls) && !$add_description) return $this->dispError();
 
 			$info = new stdClass;
 			$args = new stdClass;
 
-			if($module_srls)
+			if ($module_srls)
 			{
-				$args->module_srl = implode(',',$module_srls);
+				$args->module_srl = implode(',', $module_srls);
 				//$module_list = $oModuleModel->getMidList($args);	//perhaps module_list varialbles not use
 
 				$args->search_target = 'is_secret';
 				$args->search_keyword = 'N';
-				$args->page = (int)Context::get('page');
+				$args->page = (int) Context::get('page');
 				$args->list_count = 15;
-				if($total_config->feed_document_count) $args->list_count = $total_config->feed_document_count;
-				if(!$args->page || $args->page < 1) $args->page = 1;
-				if($start_date || $start_date != 0) $args->start_date = $start_date;
-				if($end_date || $end_date != 0) $args->end_date = $end_date;
-				if($start_date == 0) unset($start_date);
-				if($end_date == 0) unset($end_date);
+				if ($total_config->feed_document_count) $args->list_count = $total_config->feed_document_count;
+				if (!$args->page || $args->page < 1) $args->page = 1;
+				if ($start_date || $start_date != 0) $args->start_date = $start_date;
+				if ($end_date || $end_date != 0) $args->end_date = $end_date;
+				if ($start_date == 0) unset($start_date);
+				if ($end_date == 0) unset($end_date);
 
 				$args->sort_index = 'list_order'; 
 				$args->order_type = 'asc';
 				$output = $oDocumentModel->getDocumentList($args);
 				$document_list = $output->data;
 				// Extract the feed title and information with Context::getBrowserTitle
-				if($mid)
+				if ($mid)
 				{
 					$info->title = Context::getBrowserTitle();
 					$oModuleController->replaceDefinedLangCode($info->title);
 
-					$info->title = str_replace('\'', '&apos;',$info->title);
-					if($config->feed_description)
+					$info->title = str_replace('\'', '&apos;', $info->title);
+					if ($config->feed_description)
 					{
 						$info->description = str_replace('\'', '&apos;', htmlspecialchars($config->feed_description, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 					}
@@ -113,9 +113,9 @@ 
 					{
 						$info->description = str_replace('\'', '&apos;', htmlspecialchars($this->module_info->description, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 					}
-					$info->link = getUrl('','mid',$mid);
+					$info->link = getUrl('', 'mid', $mid);
 					$info->feed_copyright = str_replace('\'', '&apos;', htmlspecialchars($feed_config->feed_copyright, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
-					if(!$info->feed_copyright)
+					if (!$info->feed_copyright)
 					{
 						$info->feed_copyright = str_replace('\'', '&apos;', htmlspecialchars($total_config->feed_copyright, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 					}
@@ -123,10 +123,10 @@ 
 			}
 		}
 
-		if(!$info->title)
+		if (!$info->title)
 		{
-			if($rss_title) $info->title = $rss_title;
-			else if($total_config->feed_title) $info->title = $total_config->feed_title;
+			if ($rss_title) $info->title = $rss_title;
+			else if ($total_config->feed_title) $info->title = $total_config->feed_title;
 			else
 			{
 				$site_module_info = Context::get('site_module_info');
@@ -139,15 +139,15 @@ 
 			$info->link = Context::getRequestUri();
 			$info->feed_copyright = str_replace('\'', '&apos;', htmlspecialchars($total_config->feed_copyright, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
 		}
-		if($add_description) $info->description .= "\r\n".$add_description;
+		if ($add_description) $info->description .= "\r\n".$add_description;
 
-		if($total_config->image) $info->image = Context::getRequestUri().str_replace('\'', '&apos;', htmlspecialchars($total_config->image, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
-		switch(Context::get('format'))
+		if ($total_config->image) $info->image = Context::getRequestUri().str_replace('\'', '&apos;', htmlspecialchars($total_config->image, ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
+		switch (Context::get('format'))
 		{
 			case 'atom':
 				$info->date = date('Y-m-d\TH:i:sP');
-				if($mid) { $info->id = getUrl('','mid',$mid,'act','atom','page',Context::get('page'),'start_date',Context::get('start_date'),'end_date',Context::get('end_date')); }
-				else { $info->id = getUrl('','module','rss','act','atom','page',Context::get('page'),'start_date',Context::get('start_date'),'end_date',Context::get('end_date')); }
+				if ($mid) { $info->id = getUrl('', 'mid', $mid, 'act', 'atom', 'page', Context::get('page'), 'start_date', Context::get('start_date'), 'end_date', Context::get('end_date')); }
+				else { $info->id = getUrl('', 'module', 'rss', 'act', 'atom', 'page', Context::get('page'), 'start_date', Context::get('start_date'), 'end_date', Context::get('end_date')); }
 				break;
 			case 'rss1.0':
 				$info->date = date('Y-m-d\TH:i:sP');
@@ -157,22 +157,22 @@ 
 				break;
 		}
 
-		if($_SERVER['HTTPS']=='on') $proctcl = 'https://';
+		if ($_SERVER['HTTPS'] == 'on') $proctcl = 'https://';
 		else $proctcl = 'http://';
 
 		$temp_link = explode('/', $info->link);
-		if($temp_link[0]=='' && $info->link)
+		if ($temp_link[0] == '' && $info->link)
 		{
 			$info->link = $proctcl.$_SERVER['HTTP_HOST'].$info->link;
 		}
 
 		$temp_id = explode('/', $info->id);
-		if($temp_id[0]=='' && $info->id)
+		if ($temp_id[0] == '' && $info->id)
 		{
 			$info->id = $proctcl.$_SERVER['HTTP_HOST'].$info->id;
 		}
 
-		$info->language = str_replace('jp','ja',Context::getLangType());
+		$info->language = str_replace('jp', 'ja', Context::getLangType());
 		// Set the variables used in the RSS output
 		Context::set('info', $info);
 		Context::set('feed_config', $config);
@@ -228,7 +228,7 @@ 
 	function dispError()
 	{
 		// Prepare the output message
-		$this->rss(null, null, Context::getLang('msg_rss_is_disabled') );
+		$this->rss(null, null, Context::getLang('msg_rss_is_disabled'));
 	}
 
 	/**
@@ -243,12 +243,12 @@ 
 		$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)
 		{
 			// Get information of the selected module
 			$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 teh RSS configurations for the selected module
 		$oRssModel = getModel('rss');

modules/session/session.admin.controller.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 		$oSessionController = getController('session');
 		$oSessionController->gc(0);
 
-		$this->add('result',Context::getLang('session_cleared'));
+		$this->add('result', Context::getLang('session_cleared'));
 	}
 }
 /* End of file session.admin.controller.php */

modules/session/session.class.php

Braces +30 added lines, -10 removed lines

@@ -15,7 +15,9 @@ 
 
 	function session()
 	{
-		if(Context::isInstalled()) $this->session_started= true;
+		if(Context::isInstalled()) {
+			$this->session_started= true;
+		}
 	}
 
 	/**
@@ -35,9 +37,15 @@ 
 	function checkUpdate()
 	{
 		$oDB = &DB::getInstance();
-		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;
+		}
 		return false;
 	}
 
@@ -49,11 +57,17 @@ 
 		$oDB = &DB::getInstance();
 		$oModuleModel = getModel('module');
 
-		if(!$oDB->isTableExists('session')) $oDB->createTableByXmlFile($this->module_path.'schemas/session.xml');
+		if(!$oDB->isTableExists('session')) {
+			$oDB->createTableByXmlFile($this->module_path.'schemas/session.xml');
+		}
 
-		if(!$oDB->isColumnExists("session","cur_mid")) $oDB->addColumn('session',"cur_mid","varchar",128);
+		if(!$oDB->isColumnExists("session","cur_mid")) {
+			$oDB->addColumn('session',"cur_mid","varchar",128);
+		}
 
-		if(!$oDB->isIndexExists("session","idx_session_update_mid")) $oDB->addIndex("session","idx_session_update_mid", array("member_srl","last_update","cur_mid"));
+		if(!$oDB->isIndexExists("session","idx_session_update_mid")) {
+			$oDB->addIndex("session","idx_session_update_mid", array("member_srl","last_update","cur_mid"));
+		}
 	}
 
 	/**
@@ -62,7 +76,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;
 	}
 
@@ -71,10 +87,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 +13 added lines, -13 removed lines

@@ -15,7 +15,7 @@ 
 
 	function session()
 	{
-		if(Context::isInstalled()) $this->session_started= true;
+		if (Context::isInstalled()) $this->session_started = true;
 	}
 
 	/**
@@ -24,7 +24,7 @@ 
 	function moduleInstall()
 	{
 		$oDB = &DB::getInstance();
-		$oDB->addIndex("session","idx_session_update_mid", array("member_srl","last_update","cur_mid"));
+		$oDB->addIndex("session", "idx_session_update_mid", array("member_srl", "last_update", "cur_mid"));
 
 		return new Object();
 	}
@@ -35,9 +35,9 @@ 
 	function checkUpdate()
 	{
 		$oDB = &DB::getInstance();
-		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;
 		return false;
 	}
 
@@ -49,11 +49,11 @@ 
 		$oDB = &DB::getInstance();
 		$oModuleModel = getModel('module');
 
-		if(!$oDB->isTableExists('session')) $oDB->createTableByXmlFile($this->module_path.'schemas/session.xml');
+		if (!$oDB->isTableExists('session')) $oDB->createTableByXmlFile($this->module_path.'schemas/session.xml');
 
-		if(!$oDB->isColumnExists("session","cur_mid")) $oDB->addColumn('session',"cur_mid","varchar",128);
+		if (!$oDB->isColumnExists("session", "cur_mid")) $oDB->addColumn('session', "cur_mid", "varchar", 128);
 
-		if(!$oDB->isIndexExists("session","idx_session_update_mid")) $oDB->addIndex("session","idx_session_update_mid", array("member_srl","last_update","cur_mid"));
+		if (!$oDB->isIndexExists("session", "idx_session_update_mid")) $oDB->addIndex("session", "idx_session_update_mid", array("member_srl", "last_update", "cur_mid"));
 	}
 
 	/**
@@ -61,8 +61,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;
 	}
 
@@ -71,11 +71,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/session/session.controller.php

Spacing +7 added lines, -7 removed lines

@@ -26,7 +26,7 @@ 
 
 	function write($session_key, $val)
 	{
-		if(!$session_key || !$this->session_started) return;
+		if (!$session_key || !$this->session_started) return;
 
 		$args = new stdClass;
 		$args->session_key = $session_key;
@@ -35,7 +35,7 @@ 
 		$session_info = $output->data;
 
 		//if ip has changed delete the session from db
-		if($session_info->session_key == $session_key && $session_info->ipaddress != $_SERVER['REMOTE_ADDR'])
+		if ($session_info->session_key == $session_key && $session_info->ipaddress != $_SERVER['REMOTE_ADDR'])
 		{
 			executeQuery('session.deleteSession', $args);
 
@@ -46,13 +46,13 @@ 
 		$args->val = $val;
 		$args->cur_mid = Context::get('mid');
 
-		if(!$args->cur_mid)
+		if (!$args->cur_mid)
 		{
 			$module_info = Context::get('current_module_info');
 			$args->cur_mid = $module_info->mid;
 		}
 
-		if(Context::get('is_logged'))
+		if (Context::get('is_logged'))
 		{
 			$logged_info = Context::get('logged_info');
 			$args->member_srl = $logged_info->member_srl;
@@ -65,7 +65,7 @@ 
 		$args->last_update = date("YmdHis", $_SERVER['REQUEST_TIME']);
 
 		//put session into db
-		if($session_info->session_key)
+		if ($session_info->session_key)
 		{
 			$output = executeQuery('session.updateSession', $args);
 		}
@@ -79,7 +79,7 @@ 
 
 	function destroy($session_key)
 	{
-		if(!$session_key || !$this->session_started) return;
+		if (!$session_key || !$this->session_started) return;
 
 		//remove session from db
 		$args = new stdClass();
@@ -91,7 +91,7 @@ 
 
 	function gc($maxlifetime)
 	{
-		if(!$this->session_started) return;
+		if (!$this->session_started) return;
 
 		executeQuery('session.gcSession');
 		return true;

Braces +11 added lines, -7 removed lines

@@ -26,7 +26,9 @@ 
 
 	function write($session_key, $val)
 	{
-		if(!$session_key || !$this->session_started) return;
+		if(!$session_key || !$this->session_started) {
+			return;
+		}
 
 		$args = new stdClass;
 		$args->session_key = $session_key;
@@ -56,8 +58,7 @@ 
 		{
 			$logged_info = Context::get('logged_info');
 			$args->member_srl = $logged_info->member_srl;
-		}
-		else
+		} else
 		{
 			$args->member_srl = 0;
 		}
@@ -68,8 +69,7 @@ 
 		if($session_info->session_key)
 		{
 			$output = executeQuery('session.updateSession', $args);
-		}
-		else
+		} else
 		{
 			$output = executeQuery('session.insertSession', $args);
 		}
@@ -79,7 +79,9 @@ 
 
 	function destroy($session_key)
 	{
-		if(!$session_key || !$this->session_started) return;
+		if(!$session_key || !$this->session_started) {
+			return;
+		}
 
 		//remove session from db
 		$args = new stdClass();
@@ -91,7 +93,9 @@ 
 
 	function gc($maxlifetime)
 	{
-		if(!$this->session_started) return;
+		if(!$this->session_started) {
+			return;
+		}
 
 		executeQuery('session.gcSession');
 		return true;

modules/session/session.model.php

Braces +27 added lines, -9 removed lines

@@ -21,7 +21,9 @@ 
 
 	function read($session_key)
 	{
-		if(!$session_key || !$this->session_started) return;
+		if(!$session_key || !$this->session_started) {
+			return;
+		}
 
 		$args = new stdClass();
 		$args->session_key = $session_key;
@@ -32,8 +34,12 @@ 
 		if(!$output->toBool())
 		{
 			$oDB = DB::getInstance();
-			if(!$oDB->isTableExists('session')) $oDB->createTableByXmlFile($this->module_path.'schemas/session.xml');
-			if(!$oDB->isColumnExists("session", "cur_mid")) $oDB->addColumn('session',"cur_mid","varchar",128);
+			if(!$oDB->isTableExists('session')) {
+				$oDB->createTableByXmlFile($this->module_path.'schemas/session.xml');
+			}
+			if(!$oDB->isColumnExists("session", "cur_mid")) {
+				$oDB->addColumn('session',"cur_mid","varchar",128);
+			}
 			$output = executeQuery('session.getSession', $args);
 		}
 
@@ -41,7 +47,9 @@ 
 		if(!isset($output->data->cur_mid))
 		{
 			$oDB = DB::getInstance();
-			if(!$oDB->isColumnExists("session", "cur_mid")) $oDB->addColumn('session',"cur_mid","varchar",128);
+			if(!$oDB->isColumnExists("session", "cur_mid")) {
+				$oDB->addColumn('session',"cur_mid","varchar",128);
+			}
 		}
 
 		return $output->data->val;
@@ -62,13 +70,21 @@ 
 			$site_module_info = Context::get('site_module_info');
 			$args->site_srl = (int)$site_module_info->site_srl;
 		}
-		if(!$args->list_count) $args->list_count = 20;
-		if(!$args->page) $args->page = 1;
-		if(!$args->period_time) $args->period_time = 3;
+		if(!$args->list_count) {
+			$args->list_count = 20;
+		}
+		if(!$args->page) {
+			$args->page = 1;
+		}
+		if(!$args->period_time) {
+			$args->period_time = 3;
+		}
 		$args->last_update = date("YmdHis", $_SERVER['REQUEST_TIME'] - $args->period_time*60);
 
 		$output = executeQueryArray('session.getLoggedMembers', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$member_srls = array();
 		$member_keys = array();
@@ -91,7 +107,9 @@ 
 			}
 		}
 
-		if(!count($member_srls)) return $output;
+		if(!count($member_srls)) {
+			return $output;
+		}
 
 		$member_args->member_srl = implode(',',$member_srls);
 		$member_output = executeQueryArray('member.getMembers', $member_args);

Spacing +21 added lines, -21 removed lines

@@ -21,7 +21,7 @@ 
 
 	function read($session_key)
 	{
-		if(!$session_key || !$this->session_started) return;
+		if (!$session_key || !$this->session_started) return;
 
 		$args = new stdClass();
 		$args->session_key = $session_key;
@@ -29,19 +29,19 @@ 
 		$output = executeQuery('session.getSession', $args, $columnList);
 
 		// Confirm there is a table created if read error occurs
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB = DB::getInstance();
-			if(!$oDB->isTableExists('session')) $oDB->createTableByXmlFile($this->module_path.'schemas/session.xml');
-			if(!$oDB->isColumnExists("session", "cur_mid")) $oDB->addColumn('session',"cur_mid","varchar",128);
+			if (!$oDB->isTableExists('session')) $oDB->createTableByXmlFile($this->module_path.'schemas/session.xml');
+			if (!$oDB->isColumnExists("session", "cur_mid")) $oDB->addColumn('session', "cur_mid", "varchar", 128);
 			$output = executeQuery('session.getSession', $args);
 		}
 
 		// Check if there is a table created in case there is no "cur_mid" value in the sessions information
-		if(!isset($output->data->cur_mid))
+		if (!isset($output->data->cur_mid))
 		{
 			$oDB = DB::getInstance();
-			if(!$oDB->isColumnExists("session", "cur_mid")) $oDB->addColumn('session',"cur_mid","varchar",128);
+			if (!$oDB->isColumnExists("session", "cur_mid")) $oDB->addColumn('session', "cur_mid", "varchar", 128);
 		}
 
 		return $output->data->val;
@@ -57,47 +57,47 @@ 
 	 */
 	function getLoggedMembers($args)
 	{
-		if(!$args->site_srl)
+		if (!$args->site_srl)
 		{
 			$site_module_info = Context::get('site_module_info');
-			$args->site_srl = (int)$site_module_info->site_srl;
+			$args->site_srl = (int) $site_module_info->site_srl;
 		}
-		if(!$args->list_count) $args->list_count = 20;
-		if(!$args->page) $args->page = 1;
-		if(!$args->period_time) $args->period_time = 3;
-		$args->last_update = date("YmdHis", $_SERVER['REQUEST_TIME'] - $args->period_time*60);
+		if (!$args->list_count) $args->list_count = 20;
+		if (!$args->page) $args->page = 1;
+		if (!$args->period_time) $args->period_time = 3;
+		$args->last_update = date("YmdHis", $_SERVER['REQUEST_TIME'] - $args->period_time * 60);
 
 		$output = executeQueryArray('session.getLoggedMembers', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		$member_srls = array();
 		$member_keys = array();
-		if(count($output->data))
+		if (count($output->data))
 		{
-			foreach($output->data as $key => $val)
+			foreach ($output->data as $key => $val)
 			{
 				$member_srls[$key] = $val->member_srl;
 				$member_keys[$val->member_srl] = $key;
 			}
 		}
 
-		if(Context::get('is_logged'))
+		if (Context::get('is_logged'))
 		{
 			$logged_info = Context::get('logged_info');
-			if(!in_array($logged_info->member_srl, $member_srls))
+			if (!in_array($logged_info->member_srl, $member_srls))
 			{
 				$member_srls[0] = $logged_info->member_srl;
 				$member_keys[$logged_info->member_srl] = 0;
 			}
 		}
 
-		if(!count($member_srls)) return $output;
+		if (!count($member_srls)) return $output;
 
-		$member_args->member_srl = implode(',',$member_srls);
+		$member_args->member_srl = implode(',', $member_srls);
 		$member_output = executeQueryArray('member.getMembers', $member_args);
-		if($member_output->data)
+		if ($member_output->data)
 		{
-			foreach($member_output->data as $key => $val)
+			foreach ($member_output->data as $key => $val)
 			{
 				$output->data[$member_keys[$val->member_srl]] = $val;
 			}

modules/spamfilter/spamfilter.class.php

Spacing +24 added lines, -24 removed lines

@@ -35,22 +35,22 @@ 
 		$oDB = &DB::getInstance();
 		$oModuleModel = getModel('module');
 		// 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;
 
 		return false;
 	}
@@ -64,24 +64,24 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		// 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');
 		}
@@ -89,23 +89,23 @@ 
 		/**
 		 * 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);
 		}
 
-		return new Object(0,'success_updated');
+		return new Object(0, 'success_updated');
 	}
 
 	/**

Braces +36 added lines, -15 removed lines

@@ -35,22 +35,40 @@ 
 		$oDB = &DB::getInstance();
 		$oModuleModel = getModel('module');
 		// 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;
+		}
 
 		return false;
 	}
@@ -64,12 +82,15 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		// 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'))
 		{