xpressengine / xe-core

modules/spamfilter/spamfilter.admin.controller.php

Spacing +23 added lines, -23 removed lines

@@ -17,15 +17,15 @@ 
 	function procSpamfilterAdminInsertConfig()
 	{
 		// Get the default information
-		$argsConfig = Context::gets('limits','check_trackback');
+		$argsConfig = Context::gets('limits', 'check_trackback');
 		$flag = Context::get('flag');
 		//interval, limit_count
-		if($argsConfig->check_trackback!='Y') $argsConfig->check_trackback = 'N';
-		if($argsConfig->limits!='Y') $argsConfig->limits = 'N';
+		if ($argsConfig->check_trackback != 'Y') $argsConfig->check_trackback = 'N';
+		if ($argsConfig->limits != 'Y') $argsConfig->limits = 'N';
 		// Create and insert the module Controller object
 		$oModuleController = getController('module');
-		$moduleConfigOutput = $oModuleController->insertModuleConfig('spamfilter',$argsConfig);
-		if(!$moduleConfigOutput->toBool()) return $moduleConfigOutput;
+		$moduleConfigOutput = $oModuleController->insertModuleConfig('spamfilter', $argsConfig);
+		if (!$moduleConfigOutput->toBool()) return $moduleConfigOutput;
 
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminConfigBlock');
 		$this->setRedirectUrl($returnUrl);
@@ -36,12 +36,12 @@ 
 		//스팸IP  추가
 		$ipaddress_list = Context::get('ipaddress_list');
 		$oSpamfilterController = getController('spamfilter');
-		if($ipaddress_list)
+		if ($ipaddress_list)
 		{
 			$output = $oSpamfilterController->insertIP($ipaddress_list);
-			if(!$output->toBool() && !$output->get('fail_list')) return $output;
+			if (!$output->toBool() && !$output->get('fail_list')) return $output;
 
-			if($output->get('fail_list')) $message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'),$output->get('fail_list')).'</em>';
+			if ($output->get('fail_list')) $message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'), $output->get('fail_list')).'</em>';
 			$this->setMessage(Context::getLang('success_registed').$message_fail);
 		}
 
@@ -54,12 +54,12 @@ 
 	{
 		//스팸 키워드 추가
 		$word_list = Context::get('word_list');
-		if($word_list)
+		if ($word_list)
 		{
 			$output = $this->insertWord($word_list);
-			if(!$output->toBool() && !$output->get('fail_list')) return $output;
+			if (!$output->toBool() && !$output->get('fail_list')) return $output;
 
-			if($output->get('fail_list')) $message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'),$output->get('fail_list')).'</em>';
+			if ($output->get('fail_list')) $message_fail = '<em>'.sprintf(Context::getLang('msg_faillist'), $output->get('fail_list')).'</em>';
 			$this->setMessage(Context::getLang('success_registed').$message_fail);
 		}
 
@@ -73,7 +73,7 @@ 
 	function procSpamfilterAdminDeleteDeniedIP()
 	{
 		$ipAddressList = Context::get('ipaddress');
-		if($ipAddressList) $this->deleteIP($ipAddressList);
+		if ($ipAddressList) $this->deleteIP($ipAddressList);
 
 		$this->setMessage(Context::getLang('success_deleted'));
 
@@ -91,7 +91,7 @@ 
 
 		$this->setMessage(Context::getLang('success_deleted'));
 
-		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminDeniedWordList','active','word');
+		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminDeniedWordList', 'active', 'word');
 		return $this->setRedirectUrl($returnUrl);
 	}
 
@@ -101,7 +101,7 @@ 
 	 */
 	function deleteIP($ipaddress)
 	{
-		if(!$ipaddress) return;
+		if (!$ipaddress) return;
 
 		$args = new stdClass;
 		$args->ipaddress = $ipaddress;
@@ -115,26 +115,26 @@ 
 	function insertWord($word_list)
 	{
 
-		$word_list = str_replace("\r","",$word_list);
-		$word_list = explode("\n",$word_list);
+		$word_list = str_replace("\r", "", $word_list);
+		$word_list = explode("\n", $word_list);
 
-		foreach($word_list as $word)
+		foreach ($word_list as $word)
 		{
-			if(!preg_match("/^(.{2,40}[\r\n]+)*.{2,40}$/", $word))
+			if (!preg_match("/^(.{2,40}[\r\n]+)*.{2,40}$/", $word))
 			{
 				return new BaseObject(-1, 'msg_invalid');
 			}
 		}
 
 		$fail_word = '';
-		foreach($word_list as $word)
+		foreach ($word_list as $word)
 		{
 			$args = new stdClass;
-			if(trim($word)) $args->word = $word;
+			if (trim($word)) $args->word = $word;
 			$output = executeQuery('spamfilter.insertDeniedWord', $args);
-			if(!$output->toBool()) $fail_word .= $word.'<br />';
+			if (!$output->toBool()) $fail_word .= $word.'<br />';
 		}
-		$output->add('fail_list',$fail_word);
+		$output->add('fail_list', $fail_word);
 		return $output;
 	}
 
@@ -144,7 +144,7 @@ 
 	 */
 	function deleteWord($word)
 	{
-		if(!$word) return;
+		if (!$word) return;
 		$args = new stdClass;
 		$args->word = $word;
 		return executeQuery('spamfilter.deleteDeniedWord', $args);

modules/module/module.class.php

Spacing +111 added lines, -111 removed lines

@@ -16,8 +16,8 @@ 
 		$oModuleController = getController('module');
 
 		$oDB = &DB::getInstance();
-		$oDB->addIndex("modules","idx_site_mid", array("site_srl","mid"), true);
-		$oDB->addIndex('sites','unique_domain',array('domain'),true);
+		$oDB->addIndex("modules", "idx_site_mid", array("site_srl", "mid"), true);
+		$oDB->addIndex('sites', 'unique_domain', array('domain'), true);
 		// Create a directory to use in the module module
 		FileHandler::makeDir('./files/cache/module_info');
 		FileHandler::makeDir('./files/cache/triggers');
@@ -27,21 +27,21 @@ 
 		$args = new stdClass;
 		$args->site_srl = 0;
 		$output = $oDB->executeQuery('module.getSite', $args);
-		if(!$output->data || !$output->data->index_module_srl)
+		if (!$output->data || !$output->data->index_module_srl)
 		{
 			$db_info = Context::getDBInfo();
 			$domain = Context::getDefaultUrl();
 			$url_info = parse_url($domain);
-			$domain = $url_info['host'].( (!empty($url_info['port'])&&$url_info['port']!=80)?':'.$url_info['port']:'').$url_info['path'];
+			$domain = $url_info['host'].((!empty($url_info['port']) && $url_info['port'] != 80) ? ':'.$url_info['port'] : '').$url_info['path'];
 
 			$site_args = new stdClass;
 			$site_args->site_srl = 0;
-			$site_args->index_module_srl  = 0;
+			$site_args->index_module_srl = 0;
 			$site_args->domain = $domain;
 			$site_args->default_language = $db_info->lang_type;
 
 			$output = executeQuery('module.insertSite', $site_args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 
 		return new BaseObject();
@@ -56,66 +56,66 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2008. 10. 27 Add multi-index in the table, the module_part_config
-			if(!$oDB->isIndexExists("module_part_config","idx_module_part_config")) return true;
+			if (!$oDB->isIndexExists("module_part_config", "idx_module_part_config")) return true;
 			// 2008. 11. 13 Delete unique constraint on mid in modules. Add site_srl and then create unique index on site_srl and mid
-			if(!$oDB->isIndexExists('modules',"idx_site_mid")) return true;
+			if (!$oDB->isIndexExists('modules', "idx_site_mid")) return true;
 			// Move permissions/skin information of all modules to the table, grants.
-			if($oDB->isColumnExists('modules', 'grants')) return true;
+			if ($oDB->isColumnExists('modules', 'grants')) return true;
 			// Move permissions/skin information of all modules to the table, grants.
-			if(!$oDB->isColumnExists('sites', 'default_language')) return true;
+			if (!$oDB->isColumnExists('sites', 'default_language')) return true;
 			// Delete extra_vars* column
-			for($i=1;$i<=20;$i++)
+			for ($i = 1; $i <= 20; $i++)
 			{
-				if($oDB->isColumnExists("documents","extra_vars".$i)) return true;
+				if ($oDB->isColumnExists("documents", "extra_vars".$i)) return true;
 			}
 			// Insert site information to the table, sites
 			$args = new stdClass();
 			$args->site_srl = 0;
 			$output = $oDB->executeQuery('module.getSite', $args);
-			if(!$output->data) return true;
+			if (!$output->data) return true;
 
 			// If domain index is defined on the table, sites
-			if($oDB->isIndexExists('sites', 'idx_domain')) return true;
-			if(!$oDB->isIndexExists('sites','unique_domain')) return true;
+			if ($oDB->isIndexExists('sites', 'idx_domain')) return true;
+			if (!$oDB->isIndexExists('sites', 'unique_domain')) return true;
 
-			if(!$oDB->isColumnExists("modules", "use_mobile")) return true;
-			if(!$oDB->isColumnExists("modules", "mlayout_srl")) return true;
-			if(!$oDB->isColumnExists("modules", "mcontent")) return true;
-			if(!$oDB->isColumnExists("modules", "mskin")) return true;
+			if (!$oDB->isColumnExists("modules", "use_mobile")) return true;
+			if (!$oDB->isColumnExists("modules", "mlayout_srl")) return true;
+			if (!$oDB->isColumnExists("modules", "mcontent")) return true;
+			if (!$oDB->isColumnExists("modules", "mskin")) return true;
 
 			// check fix skin
-			if(!$oDB->isColumnExists("modules", "is_skin_fix")) return true;
+			if (!$oDB->isColumnExists("modules", "is_skin_fix")) return true;
 
-			if(!$oDB->isColumnExists("module_config", "site_srl")) return true;
+			if (!$oDB->isColumnExists("module_config", "site_srl")) return true;
 
 			$args->skin = '.';
 			$output = executeQueryArray('module.getModuleSkinDotList', $args);
-			if($output->data && count($output->data) > 0)
+			if ($output->data && count($output->data) > 0)
 			{
-				foreach($output->data as $item)
+				foreach ($output->data as $item)
 				{
 					$skin_path = explode('.', $item->skin);
-					if(count($skin_path) != 2) continue;
-					if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/modules/%s', $skin_path[0], $skin_path[1]))) return true;
+					if (count($skin_path) != 2) continue;
+					if (is_dir(sprintf(_XE_PATH_.'themes/%s/modules/%s', $skin_path[0], $skin_path[1]))) return true;
 				}
 			}
 
 			// XE 1.7
 
 			// check fix mskin
-			if(!$oDB->isColumnExists("modules", "is_mskin_fix")) return true;
+			if (!$oDB->isColumnExists("modules", "is_mskin_fix")) return true;
 
 			$oModuleModel = getModel('module');
 			$moduleConfig = $oModuleModel->getModuleConfig('module');
-			if(!$moduleConfig->isUpdateFixedValue) return true;
+			if (!$moduleConfig->isUpdateFixedValue) return true;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		if(!is_dir('./files/ruleset')) return true;
+		if (!is_dir('./files/ruleset')) return true;
 
 		return false;
 	}
@@ -129,22 +129,22 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2008. 10. 27 module_part_config Add a multi-index to the table and check all information of module_configg
-			if(!$oDB->isIndexExists("module_part_config","idx_module_part_config"))
+			if (!$oDB->isIndexExists("module_part_config", "idx_module_part_config"))
 			{
 				$oModuleModel = getModel('module');
 				$oModuleController = getController('module');
 				$modules = $oModuleModel->getModuleList();
-				foreach($modules as $key => $module_info)
+				foreach ($modules as $key => $module_info)
 				{
 					$module = $module_info->module;
-					if(!in_array($module, array('point','trackback','layout','rss','file','comment','editor'))) continue;
+					if (!in_array($module, array('point', 'trackback', 'layout', 'rss', 'file', 'comment', 'editor'))) continue;
 					$config = $oModuleModel->getModuleConfig($module);
 
 					$module_config = null;
-					switch($module)
+					switch ($module)
 					{
 						case 'point' :
 							$module_config = $config->module_point;
@@ -157,21 +157,21 @@ 
 						case 'editor' :
 							$module_config = $config->module_config;
 							unset($config->module_config);
-							if(is_array($module_config) && count($module_config))
+							if (is_array($module_config) && count($module_config))
 							{
-								foreach($module_config as $key => $val)
+								foreach ($module_config as $key => $val)
 								{
-									if(isset($module_config[$key]->module_srl)) unset($module_config[$key]->module_srl);
+									if (isset($module_config[$key]->module_srl)) unset($module_config[$key]->module_srl);
 								}
 							}
 							break;
 						case 'layout' :
 							$tmp = $config->header_script;
-							if(is_array($tmp) && count($tmp))
+							if (is_array($tmp) && count($tmp))
 							{
-								foreach($tmp as $k => $v)
+								foreach ($tmp as $k => $v)
 								{
-									if(!$v && !trim($v)) continue;
+									if (!$v && !trim($v)) continue;
 									$module_config[$k]->header_script = $v;
 								}
 							}
@@ -181,29 +181,29 @@ 
 
 					$oModuleController->insertModuleConfig($module, $config);
 
-					if(is_array($module_config) && count($module_config))
+					if (is_array($module_config) && count($module_config))
 					{
-						foreach($module_config as $module_srl => $module_part_config)
+						foreach ($module_config as $module_srl => $module_part_config)
 						{
-							$oModuleController->insertModulePartConfig($module,$module_srl,$module_part_config);
+							$oModuleController->insertModulePartConfig($module, $module_srl, $module_part_config);
 						}
 					}
 				}
-				$oDB->addIndex("module_part_config","idx_module_part_config", array("module","module_srl"));
+				$oDB->addIndex("module_part_config", "idx_module_part_config", array("module", "module_srl"));
 			}
 			// 2008. 11. 13 drop index(unique_mid). Add a column and index on site_srl and mid columns
-			if(!$oDB->isIndexExists('modules',"idx_site_mid"))
+			if (!$oDB->isIndexExists('modules', "idx_site_mid"))
 			{
-				$oDB->dropIndex("modules","unique_mid",true);
-				$oDB->addColumn('modules','site_srl','number',11,0,true);
-				$oDB->addIndex("modules","idx_site_mid", array("site_srl","mid"),true);
+				$oDB->dropIndex("modules", "unique_mid", true);
+				$oDB->addColumn('modules', 'site_srl', 'number', 11, 0, true);
+				$oDB->addIndex("modules", "idx_site_mid", array("site_srl", "mid"), true);
 			}
 			// document extra vars
-			if(!$oDB->isTableExists('document_extra_vars')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_vars.xml');
+			if (!$oDB->isTableExists('document_extra_vars')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_vars.xml');
 
-			if(!$oDB->isTableExists('document_extra_keys')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_keys.xml');
+			if (!$oDB->isTableExists('document_extra_keys')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_keys.xml');
 			// Move permission, skin info, extection info, admin ID of all modules to the table, grants
-			if($oDB->isColumnExists('modules', 'grants'))
+			if ($oDB->isColumnExists('modules', 'grants'))
 			{
 				$oModuleController = getController('module');
 				$oDocumentController = getController('document');
@@ -211,26 +211,26 @@ 
 				$lang_code = Context::getLangType();
 				// Get module_info of all modules
 				$output = executeQueryArray('module.getModuleInfos');
-				if(count($output->data))
+				if (count($output->data))
 				{
-					foreach($output->data as $module_info)
+					foreach ($output->data as $module_info)
 					{
 						// Separate information about permission granted to the module, extra vars, skin vars, super-admin's authority
 						$module_srl = trim($module_info->module_srl);
 						// grant an authority
 						$grants = unserialize($module_info->grants);
-						if($grants) $oModuleController->insertModuleGrants($module_srl, $grants);
+						if ($grants) $oModuleController->insertModuleGrants($module_srl, $grants);
 						// Insert skin vars
 						$skin_vars = unserialize($module_info->skin_vars);
-						if($skin_vars) $oModuleController->insertModuleSkinVars($module_srl, $skin_vars);
+						if ($skin_vars) $oModuleController->insertModuleSkinVars($module_srl, $skin_vars);
 						// Insert super admin's ID
 						$admin_id = trim($module_info->admin_id);
-						if($admin_id && $admin_id != 'Array')
+						if ($admin_id && $admin_id != 'Array')
 						{
-							$admin_ids = explode(',',$admin_id);
-							if(count($admin_id))
+							$admin_ids = explode(',', $admin_id);
+							if (count($admin_id))
 							{
-								foreach($admin_ids as $admin_id)
+								foreach ($admin_ids as $admin_id)
 								{
 									$oModuleController->insertAdminId($module_srl, $admin_id);
 								}
@@ -239,20 +239,20 @@ 
 						// Save extra configurations for each module(column data which doesn't exist in the defaut modules)
 						$extra_vars = unserialize($module_info->extra_vars);
 						$document_extra_keys = null;
-						if($extra_vars->extra_vars && count($extra_vars->extra_vars))
+						if ($extra_vars->extra_vars && count($extra_vars->extra_vars))
 						{
 							$document_extra_keys = $extra_vars->extra_vars;
 							unset($extra_vars->extra_vars);
 						}
-						if($extra_vars) $oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
+						if ($extra_vars) $oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
 
 						/**
 						 * Move document extra vars(it should have conducted in the documents module however extra vars in modules table should be listed up in this module)
 						 */
 						// Insert extra vars if planet module is
-						if($module_info->module == 'planet')
+						if ($module_info->module == 'planet')
 						{
-							if(!$document_extra_keys || !is_array($document_extra_keys)) $document_extra_keys = array();
+							if (!$document_extra_keys || !is_array($document_extra_keys)) $document_extra_keys = array();
 							$planet_extra_keys->name = 'postscript';
 							$planet_extra_keys->type = 'text';
 							$planet_extra_keys->is_required = 'N';
@@ -262,9 +262,9 @@ 
 							$document_extra_keys[20] = $planet_extra_keys;
 						}
 						// Register keys for document extra vars
-						if(count($document_extra_keys))
+						if (count($document_extra_keys))
 						{
-							foreach($document_extra_keys as $var_idx => $val)
+							foreach ($document_extra_keys as $var_idx => $val)
 							{
 								$oDocumentController->insertDocumentExtraKey($module_srl, $var_idx, $val->name, $val->type, $val->is_required, $val->search, $val->default, $val->desc, 'extra_vars'.$var_idx);
 							}
@@ -272,7 +272,7 @@ 
 							$oDocumentModel = getModel('document');
 							$total_count = $oDocumentModel->getDocumentCount($module_srl);
 
-							if($total_count > 0)
+							if ($total_count > 0)
 							{
 								$per_page = 100;
 								$total_pages = (int) (($total_count - 1) / $per_page) + 1;
@@ -283,19 +283,19 @@ 
 								$doc_args->sort_index = 'list_order';
 								$doc_args->order_type = 'asc';
 
-								for($doc_args->page = 1; $doc_args->page <= $total_pages; $doc_args->page++)
+								for ($doc_args->page = 1; $doc_args->page <= $total_pages; $doc_args->page++)
 								{
 									$output = executeQueryArray('document.getDocumentList', $doc_args);
 
-									if($output->toBool() && $output->data && count($output->data))
+									if ($output->toBool() && $output->data && count($output->data))
 									{
 										foreach ($output->data as $document)
 										{
-											if(!$document) continue;
+											if (!$document) continue;
 											foreach ($document as $key => $var)
 											{
 												if (strpos($key, 'extra_vars') !== 0 || !trim($var) || $var == 'N;') continue;
-												$var_idx = str_replace('extra_vars','',$key);
+												$var_idx = str_replace('extra_vars', '', $key);
 												$oDocumentController->insertDocumentExtraVar($module_srl, $document->document_srl, $var_idx, $var, 'extra_vars'.$var_idx, $lang_code);
 											}
 										}
@@ -311,96 +311,96 @@ 
 						executeQuery('module.updateModule', $module_info);
 
 						$oCacheHandler = CacheHandler::getInstance('object', null, true);
-						if($oCacheHandler->isSupport())
+						if ($oCacheHandler->isSupport())
 						{
 							$oCacheHandler->invalidateGroupKey('site_and_module');
 						}
 					}
 				}
 				// Various column drop
-				$oDB->dropColumn('modules','grants');
-				$oDB->dropColumn('modules','admin_id');
-				$oDB->dropColumn('modules','skin_vars');
-				$oDB->dropColumn('modules','extra_vars');
+				$oDB->dropColumn('modules', 'grants');
+				$oDB->dropColumn('modules', 'admin_id');
+				$oDB->dropColumn('modules', 'skin_vars');
+				$oDB->dropColumn('modules', 'extra_vars');
 			}
 			// Rights of all modules/skins transferring the information into a table Update grants
-			if(!$oDB->isColumnExists('sites', 'default_language'))
+			if (!$oDB->isColumnExists('sites', 'default_language'))
 			{
-				$oDB->addColumn('sites','default_language','varchar',255,0,false);
+				$oDB->addColumn('sites', 'default_language', 'varchar', 255, 0, false);
 			}
 			// extra_vars * Remove Column
-			for($i=1;$i<=20;$i++)
+			for ($i = 1; $i <= 20; $i++)
 			{
-				if(!$oDB->isColumnExists("documents","extra_vars".$i)) continue;
-				$oDB->dropColumn('documents','extra_vars'.$i);
+				if (!$oDB->isColumnExists("documents", "extra_vars".$i)) continue;
+				$oDB->dropColumn('documents', 'extra_vars'.$i);
 			}
 
 			// Enter the main site information sites on the table
 			$args = new stdClass;
 			$args->site_srl = 0;
 			$output = $oDB->executeQuery('module.getSite', $args);
-			if(!$output->data)
+			if (!$output->data)
 			{
 				// Basic mid, language Wanted
 				$mid_output = $oDB->executeQuery('module.getDefaultMidInfo', $args);
 				$db_info = Context::getDBInfo();
 				$domain = Context::getDefaultUrl();
 				$url_info = parse_url($domain);
-				$domain = $url_info['host'].( (!empty($url_info['port'])&&$url_info['port']!=80)?':'.$url_info['port']:'').$url_info['path'];
+				$domain = $url_info['host'].((!empty($url_info['port']) && $url_info['port'] != 80) ? ':'.$url_info['port'] : '').$url_info['path'];
 				$site_args->site_srl = 0;
-				$site_args->index_module_srl  = $mid_output->data->module_srl;
+				$site_args->index_module_srl = $mid_output->data->module_srl;
 				$site_args->domain = $domain;
 				$site_args->default_language = $db_info->lang_type;
 
 				$output = executeQuery('module.insertSite', $site_args);
-				if(!$output->toBool()) return $output;
+				if (!$output->toBool()) return $output;
 			}
 
-			if($oDB->isIndexExists('sites','idx_domain'))
+			if ($oDB->isIndexExists('sites', 'idx_domain'))
 			{
-				$oDB->dropIndex('sites','idx_domain');
+				$oDB->dropIndex('sites', 'idx_domain');
 			}
-			if(!$oDB->isIndexExists('sites','unique_domain'))
+			if (!$oDB->isIndexExists('sites', 'unique_domain'))
 			{
 				$this->updateForUniqueSiteDomain();
-				$oDB->addIndex('sites','unique_domain',array('domain'),true);
+				$oDB->addIndex('sites', 'unique_domain', array('domain'), true);
 			}
 
-			if(!$oDB->isColumnExists("modules", "use_mobile"))
+			if (!$oDB->isColumnExists("modules", "use_mobile"))
 			{
-				$oDB->addColumn('modules','use_mobile','char',1,'N');
+				$oDB->addColumn('modules', 'use_mobile', 'char', 1, 'N');
 			}
-			if(!$oDB->isColumnExists("modules", "mlayout_srl"))
+			if (!$oDB->isColumnExists("modules", "mlayout_srl"))
 			{
-				$oDB->addColumn('modules','mlayout_srl','number',11, 0);
+				$oDB->addColumn('modules', 'mlayout_srl', 'number', 11, 0);
 			}
-			if(!$oDB->isColumnExists("modules", "mcontent"))
+			if (!$oDB->isColumnExists("modules", "mcontent"))
 			{
-				$oDB->addColumn('modules','mcontent','bigtext');
+				$oDB->addColumn('modules', 'mcontent', 'bigtext');
 			}
-			if(!$oDB->isColumnExists("modules", "mskin"))
+			if (!$oDB->isColumnExists("modules", "mskin"))
 			{
-				$oDB->addColumn('modules','mskin','varchar',250);
+				$oDB->addColumn('modules', 'mskin', 'varchar', 250);
 			}
-			if(!$oDB->isColumnExists("modules", "is_skin_fix"))
+			if (!$oDB->isColumnExists("modules", "is_skin_fix"))
 			{
 				$oDB->addColumn('modules', 'is_skin_fix', 'char', 1, 'N');
 				$output = executeQuery('module.updateSkinFixModules');
 			}
-			if(!$oDB->isColumnExists("module_config", "site_srl"))
+			if (!$oDB->isColumnExists("module_config", "site_srl"))
 			{
 				$oDB->addColumn('module_config', 'site_srl', 'number', 11, 0, true);
 			}
 
 			$args->skin = '.';
 			$output = executeQueryArray('module.getModuleSkinDotList', $args);
-			if($output->data && count($output->data) > 0)
+			if ($output->data && count($output->data) > 0)
 			{
-				foreach($output->data as $item)
+				foreach ($output->data as $item)
 				{
 					$skin_path = explode('.', $item->skin);
-					if(count($skin_path) != 2) continue;
-					if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/modules/%s', $skin_path[0], $skin_path[1])))
+					if (count($skin_path) != 2) continue;
+					if (is_dir(sprintf(_XE_PATH_.'themes/%s/modules/%s', $skin_path[0], $skin_path[1])))
 					{
 						unset($args);
 						$args->skin = $item->skin;
@@ -411,7 +411,7 @@ 
 			}
 
 			// XE 1.7
-			if(!$oDB->isColumnExists("modules", "is_mskin_fix"))
+			if (!$oDB->isColumnExists("modules", "is_mskin_fix"))
 			{
 				$oDB->addColumn('modules', 'is_mskin_fix', 'char', 1, 'N');
 				$output = executeQuery('module.updateMobileSkinFixModules');
@@ -419,13 +419,13 @@ 
 
 			$oModuleModel = getModel('module');
 			$moduleConfig = $oModuleModel->getModuleConfig('module');
-			if(!$moduleConfig->isUpdateFixedValue)
+			if (!$moduleConfig->isUpdateFixedValue)
 			{
 				$output = executeQuery('module.updateSkinFixModules');
 				$output = executeQuery('module.updateMobileSkinFixModules');
 
 				$oModuleController = getController('module');
-				if(!$moduleConfig) $moduleConfig = new stdClass;
+				if (!$moduleConfig) $moduleConfig = new stdClass;
 				$moduleConfig->isUpdateFixedValue = TRUE;
 				$output = $oModuleController->updateModuleConfig('module', $moduleConfig);
 			}
@@ -433,7 +433,7 @@ 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		if(!is_dir('./files/ruleset')) FileHandler::makeDir('./files/ruleset');
+		if (!is_dir('./files/ruleset')) FileHandler::makeDir('./files/ruleset');
 
 		return new BaseObject(0, 'success_updated');
 	}
@@ -441,18 +441,18 @@ 
 	function updateForUniqueSiteDomain()
 	{
 		$output = executeQueryArray("module.getNonuniqueDomains");
-		if(!$output->data) return;
-		foreach($output->data as $data)
+		if (!$output->data) return;
+		foreach ($output->data as $data)
 		{
-			if($data->count == 1) continue;
+			if ($data->count == 1) continue;
 			$domain = $data->domain;
 			$args = new stdClass;
 			$args->domain = $domain;
 			$output2 = executeQueryArray("module.getSiteByDomain", $args);
 			$bFirst = true;
-			foreach($output2->data as $site)
+			foreach ($output2->data as $site)
 			{
-				if($bFirst)
+				if ($bFirst)
 				{
 					$bFirst = false;
 					continue;

Braces +114 added lines, -38 removed lines

@@ -41,7 +41,9 @@ 
 			$site_args->default_language = $db_info->lang_type;
 
 			$output = executeQuery('module.insertSite', $site_args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 
 		return new BaseObject();
@@ -59,37 +61,65 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// 2008. 10. 27 Add multi-index in the table, the module_part_config
-			if(!$oDB->isIndexExists("module_part_config","idx_module_part_config")) return true;
+			if(!$oDB->isIndexExists("module_part_config","idx_module_part_config")) {
+				return true;
+			}
 			// 2008. 11. 13 Delete unique constraint on mid in modules. Add site_srl and then create unique index on site_srl and mid
-			if(!$oDB->isIndexExists('modules',"idx_site_mid")) return true;
+			if(!$oDB->isIndexExists('modules',"idx_site_mid")) {
+				return true;
+			}
 			// Move permissions/skin information of all modules to the table, grants.
-			if($oDB->isColumnExists('modules', 'grants')) return true;
+			if($oDB->isColumnExists('modules', 'grants')) {
+				return true;
+			}
 			// Move permissions/skin information of all modules to the table, grants.
-			if(!$oDB->isColumnExists('sites', 'default_language')) return true;
+			if(!$oDB->isColumnExists('sites', 'default_language')) {
+				return true;
+			}
 			// Delete extra_vars* column
 			for($i=1;$i<=20;$i++)
 			{
-				if($oDB->isColumnExists("documents","extra_vars".$i)) return true;
+				if($oDB->isColumnExists("documents","extra_vars".$i)) {
+					return true;
+				}
 			}
 			// Insert site information to the table, sites
 			$args = new stdClass();
 			$args->site_srl = 0;
 			$output = $oDB->executeQuery('module.getSite', $args);
-			if(!$output->data) return true;
+			if(!$output->data) {
+				return true;
+			}
 
 			// If domain index is defined on the table, sites
-			if($oDB->isIndexExists('sites', 'idx_domain')) return true;
-			if(!$oDB->isIndexExists('sites','unique_domain')) return true;
+			if($oDB->isIndexExists('sites', 'idx_domain')) {
+				return true;
+			}
+			if(!$oDB->isIndexExists('sites','unique_domain')) {
+				return true;
+			}
 
-			if(!$oDB->isColumnExists("modules", "use_mobile")) return true;
-			if(!$oDB->isColumnExists("modules", "mlayout_srl")) return true;
-			if(!$oDB->isColumnExists("modules", "mcontent")) return true;
-			if(!$oDB->isColumnExists("modules", "mskin")) return true;
+			if(!$oDB->isColumnExists("modules", "use_mobile")) {
+				return true;
+			}
+			if(!$oDB->isColumnExists("modules", "mlayout_srl")) {
+				return true;
+			}
+			if(!$oDB->isColumnExists("modules", "mcontent")) {
+				return true;
+			}
+			if(!$oDB->isColumnExists("modules", "mskin")) {
+				return true;
+			}
 
 			// check fix skin
-			if(!$oDB->isColumnExists("modules", "is_skin_fix")) return true;
+			if(!$oDB->isColumnExists("modules", "is_skin_fix")) {
+				return true;
+			}
 
-			if(!$oDB->isColumnExists("module_config", "site_srl")) return true;
+			if(!$oDB->isColumnExists("module_config", "site_srl")) {
+				return true;
+			}
 
 			$args->skin = '.';
 			$output = executeQueryArray('module.getModuleSkinDotList', $args);
@@ -98,24 +128,34 @@ 
 				foreach($output->data as $item)
 				{
 					$skin_path = explode('.', $item->skin);
-					if(count($skin_path) != 2) continue;
-					if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/modules/%s', $skin_path[0], $skin_path[1]))) return true;
+					if(count($skin_path) != 2) {
+						continue;
+					}
+					if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/modules/%s', $skin_path[0], $skin_path[1]))) {
+						return true;
+					}
 				}
 			}
 
 			// XE 1.7
 
 			// check fix mskin
-			if(!$oDB->isColumnExists("modules", "is_mskin_fix")) return true;
+			if(!$oDB->isColumnExists("modules", "is_mskin_fix")) {
+				return true;
+			}
 
 			$oModuleModel = getModel('module');
 			$moduleConfig = $oModuleModel->getModuleConfig('module');
-			if(!$moduleConfig->isUpdateFixedValue) return true;
+			if(!$moduleConfig->isUpdateFixedValue) {
+				return true;
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		if(!is_dir('./files/ruleset')) return true;
+		if(!is_dir('./files/ruleset')) {
+			return true;
+		}
 
 		return false;
 	}
@@ -140,7 +180,9 @@ 
 				foreach($modules as $key => $module_info)
 				{
 					$module = $module_info->module;
-					if(!in_array($module, array('point','trackback','layout','rss','file','comment','editor'))) continue;
+					if(!in_array($module, array('point','trackback','layout','rss','file','comment','editor'))) {
+						continue;
+					}
 					$config = $oModuleModel->getModuleConfig($module);
 
 					$module_config = null;
@@ -161,7 +203,9 @@ 
 							{
 								foreach($module_config as $key => $val)
 								{
-									if(isset($module_config[$key]->module_srl)) unset($module_config[$key]->module_srl);
+									if(isset($module_config[$key]->module_srl)) {
+										unset($module_config[$key]->module_srl);
+									}
 								}
 							}
 							break;
@@ -171,7 +215,9 @@ 
 							{
 								foreach($tmp as $k => $v)
 								{
-									if(!$v && !trim($v)) continue;
+									if(!$v && !trim($v)) {
+										continue;
+									}
 									$module_config[$k]->header_script = $v;
 								}
 							}
@@ -199,9 +245,13 @@ 
 				$oDB->addIndex("modules","idx_site_mid", array("site_srl","mid"),true);
 			}
 			// document extra vars
-			if(!$oDB->isTableExists('document_extra_vars')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_vars.xml');
+			if(!$oDB->isTableExists('document_extra_vars')) {
+				$oDB->createTableByXmlFile('./modules/document/schemas/document_extra_vars.xml');
+			}
 
-			if(!$oDB->isTableExists('document_extra_keys')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_keys.xml');
+			if(!$oDB->isTableExists('document_extra_keys')) {
+				$oDB->createTableByXmlFile('./modules/document/schemas/document_extra_keys.xml');
+			}
 			// Move permission, skin info, extection info, admin ID of all modules to the table, grants
 			if($oDB->isColumnExists('modules', 'grants'))
 			{
@@ -219,10 +269,14 @@ 
 						$module_srl = trim($module_info->module_srl);
 						// grant an authority
 						$grants = unserialize($module_info->grants);
-						if($grants) $oModuleController->insertModuleGrants($module_srl, $grants);
+						if($grants) {
+							$oModuleController->insertModuleGrants($module_srl, $grants);
+						}
 						// Insert skin vars
 						$skin_vars = unserialize($module_info->skin_vars);
-						if($skin_vars) $oModuleController->insertModuleSkinVars($module_srl, $skin_vars);
+						if($skin_vars) {
+							$oModuleController->insertModuleSkinVars($module_srl, $skin_vars);
+						}
 						// Insert super admin's ID
 						$admin_id = trim($module_info->admin_id);
 						if($admin_id && $admin_id != 'Array')
@@ -244,7 +298,9 @@ 
 							$document_extra_keys = $extra_vars->extra_vars;
 							unset($extra_vars->extra_vars);
 						}
-						if($extra_vars) $oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
+						if($extra_vars) {
+							$oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
+						}
 
 						/**
 						 * Move document extra vars(it should have conducted in the documents module however extra vars in modules table should be listed up in this module)
@@ -252,7 +308,9 @@ 
 						// Insert extra vars if planet module is
 						if($module_info->module == 'planet')
 						{
-							if(!$document_extra_keys || !is_array($document_extra_keys)) $document_extra_keys = array();
+							if(!$document_extra_keys || !is_array($document_extra_keys)) {
+								$document_extra_keys = array();
+							}
 							$planet_extra_keys->name = 'postscript';
 							$planet_extra_keys->type = 'text';
 							$planet_extra_keys->is_required = 'N';
@@ -291,10 +349,14 @@ 
 									{
 										foreach ($output->data as $document)
 										{
-											if(!$document) continue;
+											if(!$document) {
+												continue;
+											}
 											foreach ($document as $key => $var)
 											{
-												if (strpos($key, 'extra_vars') !== 0 || !trim($var) || $var == 'N;') continue;
+												if (strpos($key, 'extra_vars') !== 0 || !trim($var) || $var == 'N;') {
+													continue;
+												}
 												$var_idx = str_replace('extra_vars','',$key);
 												$oDocumentController->insertDocumentExtraVar($module_srl, $document->document_srl, $var_idx, $var, 'extra_vars'.$var_idx, $lang_code);
 											}
@@ -331,7 +393,9 @@ 
 			// extra_vars * Remove Column
 			for($i=1;$i<=20;$i++)
 			{
-				if(!$oDB->isColumnExists("documents","extra_vars".$i)) continue;
+				if(!$oDB->isColumnExists("documents","extra_vars".$i)) {
+					continue;
+				}
 				$oDB->dropColumn('documents','extra_vars'.$i);
 			}
 
@@ -353,7 +417,9 @@ 
 				$site_args->default_language = $db_info->lang_type;
 
 				$output = executeQuery('module.insertSite', $site_args);
-				if(!$output->toBool()) return $output;
+				if(!$output->toBool()) {
+					return $output;
+				}
 			}
 
 			if($oDB->isIndexExists('sites','idx_domain'))
@@ -399,7 +465,9 @@ 
 				foreach($output->data as $item)
 				{
 					$skin_path = explode('.', $item->skin);
-					if(count($skin_path) != 2) continue;
+					if(count($skin_path) != 2) {
+						continue;
+					}
 					if(is_dir(sprintf(_XE_PATH_ . 'themes/%s/modules/%s', $skin_path[0], $skin_path[1])))
 					{
 						unset($args);
@@ -425,7 +493,9 @@ 
 				$output = executeQuery('module.updateMobileSkinFixModules');
 
 				$oModuleController = getController('module');
-				if(!$moduleConfig) $moduleConfig = new stdClass;
+				if(!$moduleConfig) {
+					$moduleConfig = new stdClass;
+				}
 				$moduleConfig->isUpdateFixedValue = TRUE;
 				$output = $oModuleController->updateModuleConfig('module', $moduleConfig);
 			}
@@ -433,7 +503,9 @@ 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		if(!is_dir('./files/ruleset')) FileHandler::makeDir('./files/ruleset');
+		if(!is_dir('./files/ruleset')) {
+			FileHandler::makeDir('./files/ruleset');
+		}
 
 		return new BaseObject(0, 'success_updated');
 	}
@@ -441,10 +513,14 @@ 
 	function updateForUniqueSiteDomain()
 	{
 		$output = executeQueryArray("module.getNonuniqueDomains");
-		if(!$output->data) return;
+		if(!$output->data) {
+			return;
+		}
 		foreach($output->data as $data)
 		{
-			if($data->count == 1) continue;
+			if($data->count == 1) {
+				continue;
+			}
 			$domain = $data->domain;
 			$args = new stdClass;
 			$args->domain = $domain;

modules/module/module.view.php

Spacing +19 added lines, -19 removed lines

@@ -25,14 +25,14 @@ 
 		$skin = Context::get('skin');
 		// Get modules/skin information
 		$module_path = sprintf("./modules/%s/", $selected_module);
-		if(!is_dir($module_path)) $this->stop("msg_invalid_request");
+		if (!is_dir($module_path)) $this->stop("msg_invalid_request");
 
 		$skin_info_xml = sprintf("%sskins/%s/skin.xml", $module_path, $skin);
-		if(!file_exists($skin_info_xml)) $this->stop("msg_invalid_request");
+		if (!file_exists($skin_info_xml)) $this->stop("msg_invalid_request");
 
 		$oModuleModel = getModel('module');
 		$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin);
-		Context::set('skin_info',$skin_info);
+		Context::set('skin_info', $skin_info);
 
 		$this->setLayoutFile("popup_layout");
 		$this->setTemplateFile("skin_info");
@@ -43,7 +43,7 @@ 
 	 */
 	function dispModuleSelectList()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
 
 		$oModuleModel = getModel('module');
 		$logged_info = Context::get('logged_info');
@@ -57,17 +57,17 @@ 
 
 		$args = new stdClass();
 		$module_category_exists = false;
-		if($logged_info->is_admin == 'Y' && $site_keyword)
+		if ($logged_info->is_admin == 'Y' && $site_keyword)
 		{
 			$args->site_keyword = $site_keyword;
 		}
 		else
 		{
-			$args->site_srl = (int)$site_module_info->site_srl;
+			$args->site_srl = (int) $site_module_info->site_srl;
 			Context::set('site_keyword', null);
 		}
 
-		if($logged_info->is_admin == 'Y')
+		if ($logged_info->is_admin == 'Y')
 		{
 			$module_category_exists = true;
 		}
@@ -75,14 +75,14 @@ 
 		// Get a list of modules at the site
 		$mid_list = array();
 		$output = executeQueryArray('module.getSiteModules', $args);
-		if(!$output->data) $output->data = array();
+		if (!$output->data) $output->data = array();
 
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			$module = trim($val->module);
-			if(!$module) continue;
+			if (!$module) continue;
 
-			if(!$oModuleModel->getGrant($val, $logged_info)->access)
+			if (!$oModuleModel->getGrant($val, $logged_info)->access)
 			{
 				continue;
 			}
@@ -93,8 +93,8 @@ 
 			$obj->browser_title = $val->browser_title;
 			$mid_list[$module]->list[$category][$val->mid] = $obj;
 
-			if(!$selected_module) $selected_module = $module;
-			if(!$mid_list[$module]->title)
+			if (!$selected_module) $selected_module = $module;
+			if (!$mid_list[$module]->title)
 			{
 				$xml_info = $oModuleModel->getModuleInfoXml($module);
 				$mid_list[$module]->title = $xml_info->title;
@@ -117,15 +117,15 @@ 
 	function dispModuleFileBox()
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new BaseObject(-1, 'msg_not_permitted');
+		if ($logged_info->is_admin != 'Y' && !$logged_info->is_site_admin) return new BaseObject(-1, 'msg_not_permitted');
 
 		$input_name = Context::get('input');
-		if(!preg_match('/^[a-z0-9_]+$/i', $input_name))
+		if (!preg_match('/^[a-z0-9_]+$/i', $input_name))
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
-		if(!$input_name) return new BaseObject(-1, 'msg_not_permitted');
+		if (!$input_name) return new BaseObject(-1, 'msg_not_permitted');
 
 		$addscript = sprintf('<script>//<![CDATA[
 				var selected_filebox_input_name = "%s";
@@ -137,7 +137,7 @@ 
 		Context::set('filebox_list', $output->data);
 
 		$filter = Context::get('filter');
-		if($filter) Context::set('arrfilter',explode(',',$filter));
+		if ($filter) Context::set('arrfilter', explode(',', $filter));
 
 		Context::set('page_navigation', $output->page_navigation);
 		$this->setLayoutFile('popup_layout');
@@ -148,10 +148,10 @@ 
 	function dispModuleFileBoxAdd()
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new BaseObject(-1, 'msg_not_permitted');
+		if ($logged_info->is_admin != 'Y' && !$logged_info->is_site_admin) return new BaseObject(-1, 'msg_not_permitted');
 
 		$filter = Context::get('filter');
-		if($filter) Context::set('arrfilter',explode(',',$filter));
+		if ($filter) Context::set('arrfilter', explode(',', $filter));
 
 		$this->setLayoutFile('popup_layout');
 		$this->setTemplateFile('filebox_add');

Braces +34 added lines, -13 removed lines

@@ -25,10 +25,14 @@ 
 		$skin = Context::get('skin');
 		// Get modules/skin information
 		$module_path = sprintf("./modules/%s/", $selected_module);
-		if(!is_dir($module_path)) $this->stop("msg_invalid_request");
+		if(!is_dir($module_path)) {
+			$this->stop("msg_invalid_request");
+		}
 
 		$skin_info_xml = sprintf("%sskins/%s/skin.xml", $module_path, $skin);
-		if(!file_exists($skin_info_xml)) $this->stop("msg_invalid_request");
+		if(!file_exists($skin_info_xml)) {
+			$this->stop("msg_invalid_request");
+		}
 
 		$oModuleModel = getModel('module');
 		$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin);
@@ -43,7 +47,9 @@ 
 	 */
 	function dispModuleSelectList()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1, 'msg_not_permitted');
+		}
 
 		$oModuleModel = getModel('module');
 		$logged_info = Context::get('logged_info');
@@ -60,8 +66,7 @@ 
 		if($logged_info->is_admin == 'Y' && $site_keyword)
 		{
 			$args->site_keyword = $site_keyword;
-		}
-		else
+		} else
 		{
 			$args->site_srl = (int)$site_module_info->site_srl;
 			Context::set('site_keyword', null);
@@ -75,12 +80,16 @@ 
 		// Get a list of modules at the site
 		$mid_list = array();
 		$output = executeQueryArray('module.getSiteModules', $args);
-		if(!$output->data) $output->data = array();
+		if(!$output->data) {
+			$output->data = array();
+		}
 
 		foreach($output->data as $key => $val)
 		{
 			$module = trim($val->module);
-			if(!$module) continue;
+			if(!$module) {
+				continue;
+			}
 
 			if(!$oModuleModel->getGrant($val, $logged_info)->access)
 			{
@@ -93,7 +102,9 @@ 
 			$obj->browser_title = $val->browser_title;
 			$mid_list[$module]->list[$category][$val->mid] = $obj;
 
-			if(!$selected_module) $selected_module = $module;
+			if(!$selected_module) {
+				$selected_module = $module;
+			}
 			if(!$mid_list[$module]->title)
 			{
 				$xml_info = $oModuleModel->getModuleInfoXml($module);
@@ -117,7 +128,9 @@ 
 	function dispModuleFileBox()
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new BaseObject(-1, 'msg_not_permitted');
+		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) {
+			return new BaseObject(-1, 'msg_not_permitted');
+		}
 
 		$input_name = Context::get('input');
 		if(!preg_match('/^[a-z0-9_]+$/i', $input_name))
@@ -125,7 +138,9 @@ 
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
-		if(!$input_name) return new BaseObject(-1, 'msg_not_permitted');
+		if(!$input_name) {
+			return new BaseObject(-1, 'msg_not_permitted');
+		}
 
 		$addscript = sprintf('<script>//<![CDATA[
 				var selected_filebox_input_name = "%s";
@@ -137,7 +152,9 @@ 
 		Context::set('filebox_list', $output->data);
 
 		$filter = Context::get('filter');
-		if($filter) Context::set('arrfilter',explode(',',$filter));
+		if($filter) {
+			Context::set('arrfilter',explode(',',$filter));
+		}
 
 		Context::set('page_navigation', $output->page_navigation);
 		$this->setLayoutFile('popup_layout');
@@ -148,10 +165,14 @@ 
 	function dispModuleFileBoxAdd()
 	{
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new BaseObject(-1, 'msg_not_permitted');
+		if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) {
+			return new BaseObject(-1, 'msg_not_permitted');
+		}
 
 		$filter = Context::get('filter');
-		if($filter) Context::set('arrfilter',explode(',',$filter));
+		if($filter) {
+			Context::set('arrfilter',explode(',',$filter));
+		}
 
 		$this->setLayoutFile('popup_layout');
 		$this->setTemplateFile('filebox_add');

modules/module/module.admin.view.php

Spacing +23 added lines, -23 removed lines

@@ -35,9 +35,9 @@ 
 		$oAutoinstallModel = getModel('autoinstall');
 
 		$module_list = $oModuleModel->getModuleList();
-		if(is_array($module_list))
+		if (is_array($module_list))
 		{
-			foreach($module_list as $key => $val)
+			foreach ($module_list as $key => $val)
 			{
 				$module_list[$key]->delete_url = $oAutoinstallModel->getRemoveUrlByPath($val->path);
 
@@ -47,7 +47,7 @@ 
 				$module_list[$key]->need_autoinstall_update = $package[$packageSrl]->need_update;
 
 				// get easyinstall update url
-				if($module_list[$key]->need_autoinstall_update == 'Y')
+				if ($module_list[$key]->need_autoinstall_update == 'Y')
 				{
 					$module_list[$key]->update_url = $oAutoinstallModel->getUpdateUrlByPackageSrl($packageSrl);
 				}
@@ -58,9 +58,9 @@ 
 
 		$favoriteList = $output->get('favoriteList');
 		$favoriteModuleList = array();
-		if($favoriteList)
+		if ($favoriteList)
 		{
-			foreach($favoriteList as $favorite => $favorite_info)
+			foreach ($favoriteList as $favorite => $favorite_info)
 			{
 				$favoriteModuleList[] = $favorite_info->module;
 			}
@@ -110,9 +110,9 @@ 
 		//Security
 		$security = new Security();
 
-		if($module_category_srl)
+		if ($module_category_srl)
 		{
-			$selected_category  = $oModuleModel->getModuleCategory($module_category_srl);
+			$selected_category = $oModuleModel->getModuleCategory($module_category_srl);
 			Context::set('selected_category', $selected_category);
 
 			//Security
@@ -164,15 +164,15 @@ 
 	{
 		$module_srls = Context::get('module_srls');
 
-		$modules = explode(',',$module_srls);
-		if(!count($modules)) if(!$module_srls) return new BaseObject(-1,'msg_invalid_request');
+		$modules = explode(',', $module_srls);
+		if (!count($modules)) if (!$module_srls) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($modules[0], $columnList);
 		// Get a skin list of the module
-		$skin_list = $oModuleModel->getSkins(_XE_PATH_ . 'modules/'.$module_info->module);
-		Context::set('skin_list',$skin_list);
+		$skin_list = $oModuleModel->getSkins(_XE_PATH_.'modules/'.$module_info->module);
+		Context::set('skin_list', $skin_list);
 		// Get a layout list
 		$oLayoutModel = getModel('layout');
 		$layout_list = $oLayoutModel->getLayoutList();
@@ -182,7 +182,7 @@ 
 		Context::set('module_category', $module_category);
 
 		$security = new Security();
-		$security->encodeHTML('layout_list..title','layout_list..layout');
+		$security->encodeHTML('layout_list..title', 'layout_list..layout');
 		$security->encodeHTML('skin_list....');
 		$security->encodeHTML('module_category...');
 
@@ -200,8 +200,8 @@ 
 	{
 		$module_srls = Context::get('module_srls');
 
-		$modules = explode(',',$module_srls);
-		if(!count($modules)) if(!$module_srls) return new BaseObject(-1,'msg_invalid_request');
+		$modules = explode(',', $module_srls);
+		if (!count($modules)) if (!$module_srls) return new BaseObject(-1, 'msg_invalid_request');
 		// pre-define variables because you can get contents from other module (call by reference)
 		$content = '';
 		// Call a trigger for additional settings
@@ -223,8 +223,8 @@ 
 	{
 		$module_srls = Context::get('module_srls');
 
-		$modules = explode(',',$module_srls);
-		if(!count($modules)) if(!$module_srls) return new BaseObject(-1,'msg_invalid_request');
+		$modules = explode(',', $module_srls);
+		if (!count($modules)) if (!$module_srls) return new BaseObject(-1, 'msg_invalid_request');
 
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'module', 'site_srl');
@@ -234,12 +234,12 @@ 
 		// Grant virtual permissions for access and manager
 		$grant_list->access->title = Context::getLang('grant_access');
 		$grant_list->access->default = 'guest';
-		if(count($source_grant_list))
+		if (count($source_grant_list))
 		{
-			foreach($source_grant_list as $key => $val)
+			foreach ($source_grant_list as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if (!$val->default) $val->default = 'guest';
+				if ($val->default == 'root') $val->default = 'manager';
 				$grant_list->{$key} = $val;
 			}
 		}
@@ -268,7 +268,7 @@ 
 		// Get the language file of the current site
 		$site_module_info = Context::get('site_module_info');
 		$args = new stdClass();
-		$args->site_srl = (int)$site_module_info->site_srl;
+		$args->site_srl = (int) $site_module_info->site_srl;
 		$args->langCode = Context::get('lang_type');
 		$args->page = Context::get('page'); // /< Page
 		$args->list_count = 30; // /< the number of posts to display on a single page
@@ -287,7 +287,7 @@ 
 		Context::set('lang_code_list', $output->data);
 		Context::set('page_navigation', $output->page_navigation);
 
-		if(Context::get('module') != 'admin')
+		if (Context::get('module') != 'admin')
 		{
 			$this->setLayoutPath('./common/tpl');
 			$this->setLayoutFile('popup_layout');
@@ -301,7 +301,7 @@ 
 		$oModuleModel = getModel('module');
 		$output = $oModuleModel->getModuleFileBoxList();
 		$page = Context::get('page');
-		$page = $page?$page:1;
+		$page = $page ? $page : 1;
 		Context::set('filebox_list', $output->data);
 		Context::set('page_navigation', $output->page_navigation);
 		Context::set('page', $page);

Braces +16 added lines, -7 removed lines

@@ -121,8 +121,7 @@ 
 			// Set a template file
 			$this->setTemplateFile('category_update_form');
 			// If not selected, display a list of categories
-		}
-		else
+		} else
 		{
 			$category_list = $oModuleModel->getModuleCategories();
 			Context::set('category_list', $category_list);
@@ -165,7 +164,9 @@ 
 		$module_srls = Context::get('module_srls');
 
 		$modules = explode(',',$module_srls);
-		if(!count($modules)) if(!$module_srls) return new BaseObject(-1,'msg_invalid_request');
+		if(!count($modules)) {
+			if(!$module_srls) return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'module');
@@ -201,7 +202,9 @@ 
 		$module_srls = Context::get('module_srls');
 
 		$modules = explode(',',$module_srls);
-		if(!count($modules)) if(!$module_srls) return new BaseObject(-1,'msg_invalid_request');
+		if(!count($modules)) {
+			if(!$module_srls) return new BaseObject(-1,'msg_invalid_request');
+		}
 		// pre-define variables because you can get contents from other module (call by reference)
 		$content = '';
 		// Call a trigger for additional settings
@@ -224,7 +227,9 @@ 
 		$module_srls = Context::get('module_srls');
 
 		$modules = explode(',',$module_srls);
-		if(!count($modules)) if(!$module_srls) return new BaseObject(-1,'msg_invalid_request');
+		if(!count($modules)) {
+			if(!$module_srls) return new BaseObject(-1,'msg_invalid_request');
+		}
 
 		$oModuleModel = getModel('module');
 		$columnList = array('module_srl', 'module', 'site_srl');
@@ -238,8 +243,12 @@ 
 		{
 			foreach($source_grant_list as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if(!$val->default) {
+					$val->default = 'guest';
+				}
+				if($val->default == 'root') {
+					$val->default = 'manager';
+				}
 				$grant_list->{$key} = $val;
 			}
 		}

modules/module/module.admin.model.php

Spacing +84 added lines, -84 removed lines

@@ -26,16 +26,16 @@ 
 		$args = new stdClass;
 		$args->module_srls = Context::get('module_srls');
 		$output = executeQueryArray('module.getModulesInfo', $args);
-		if(!$output->toBool() || !$output->data) return new BaseObject();
+		if (!$output->toBool() || !$output->data) return new BaseObject();
 
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			$info_xml = $oModuleModel->getModuleInfoXml($val->module);
 			$oModuleController->replaceDefinedLangCode($val->browser_title);
-			$list[$val->module_srl] = array('module_srl'=>$val->module_srl,'mid'=>$val->mid,'browser_title'=>$val->browser_title, 'module_name' => $info_xml->title);
+			$list[$val->module_srl] = array('module_srl'=>$val->module_srl, 'mid'=>$val->mid, 'browser_title'=>$val->browser_title, 'module_name' => $info_xml->title);
 		}
-		$modules = explode(',',$args->module_srls);
-		for($i=0;$i<count($modules);$i++)
+		$modules = explode(',', $args->module_srls);
+		for ($i = 0; $i < count($modules); $i++)
 		{
 			$module_list[$modules[$i]] = $list[$modules[$i]];
 		}
@@ -49,7 +49,7 @@ 
 		$args->list_count = 20;
 		$args->page_count = 10;
 		$output = executeQueryArray('module.getModuleMidList', $args);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		ModuleModel::syncModuleToSite($output->data);
 
@@ -58,12 +58,12 @@ 
 
 	function getSelectedManageHTML($grantList, $tabChoice = array(), $modulePath = NULL)
 	{
-		if($modulePath)
+		if ($modulePath)
 		{
 			// get the skins path
 			$oModuleModel = getModel('module');
 			$skin_list = $oModuleModel->getSkins($modulePath);
-			Context::set('skin_list',$skin_list);
+			Context::set('skin_list', $skin_list);
 
 			$mskin_list = $oModuleModel->getSkins($modulePath, "m.skins");
 			Context::set('mskin_list', $mskin_list);
@@ -74,7 +74,7 @@ 
 		$layout_list = $oLayoutModel->getLayoutList();
 		Context::set('layout_list', $layout_list);
 
-		$mobile_layout_list = $oLayoutModel->getLayoutList(0,"M");
+		$mobile_layout_list = $oLayoutModel->getLayoutList(0, "M");
 		Context::set('mlayout_list', $mobile_layout_list);
 
 		$security = new Security();
@@ -83,21 +83,21 @@ 
 		$security->encodeHTML('skin_list..title');
 		$security->encodeHTML('mskin_list..title');
 
-		$grant_list =new stdClass();
+		$grant_list = new stdClass();
 		// Grant virtual permission for access and manager
-		if(!$grantList)
+		if (!$grantList)
 		{
-			$grantList =new stdClass();
+			$grantList = new stdClass();
 		}
 		$grantList->access = new stdClass();
 		$grantList->access->title = Context::getLang('grant_access');
 		$grantList->access->default = 'guest';
-		if(count($grantList))
+		if (count($grantList))
 		{
-			foreach($grantList as $key => $val)
+			foreach ($grantList as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if (!$val->default) $val->default = 'guest';
+				if ($val->default == 'root') $val->default = 'manager';
 				$grant_list->{$key} = $val;
 			}
 		}
@@ -119,7 +119,7 @@ 
 		$output = ModuleHandler::triggerCall('module.dispAdditionSetup', 'after', $content);
 		Context::set('setup_content', $content);
 
-		if(count($tabChoice) == 0)
+		if (count($tabChoice) == 0)
 		{
 			$tabChoice = array('tab1'=>1, 'tab2'=>1, 'tab3'=>1);
 		}
@@ -136,7 +136,7 @@ 
 	 */
 	function getModuleGrantHTML($module_srl, $source_grant_list)
 	{
-		if(!$module_srl)
+		if (!$module_srl)
 		{
 			return;
 		}
@@ -154,12 +154,12 @@ 
 		$grant_list->access = new stdClass();
 		$grant_list->access->title = Context::getLang('grant_access');
 		$grant_list->access->default = 'guest';
-		if(count($source_grant_list))
+		if (count($source_grant_list))
 		{
-			foreach($source_grant_list as $key => $val)
+			foreach ($source_grant_list as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if (!$val->default) $val->default = 'guest';
+				if ($val->default == 'root') $val->default = 'manager';
 				$grant_list->{$key} = $val;
 			}
 		}
@@ -172,14 +172,14 @@ 
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 		$output = executeQueryArray('module.getModuleGrants', $args);
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $val)
+			foreach ($output->data as $val)
 			{
-				if($val->group_srl == 0) $default_grant[$val->name] = 'all';
-				else if($val->group_srl == -1) $default_grant[$val->name] = 'member';
-				else if($val->group_srl == -2) $default_grant[$val->name] = 'site';
-				else if($val->group_srl == -3) $default_grant[$val->name] = 'manager';
+				if ($val->group_srl == 0) $default_grant[$val->name] = 'all';
+				else if ($val->group_srl == -1) $default_grant[$val->name] = 'member';
+				else if ($val->group_srl == -2) $default_grant[$val->name] = 'site';
+				else if ($val->group_srl == -3) $default_grant[$val->name] = 'manager';
 				else
 				{
 					$selected_group[$val->name][] = $val->group_srl;
@@ -213,12 +213,12 @@ 
 	{
 		$targetModule = Context::get('target_module');
 		$moduleSrl = Context::get('module_srl');
-		if(!$targetModule || !$moduleSrl)
+		if (!$targetModule || !$moduleSrl)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
-		if($targetModule == '_SHORTCUT')
+		if ($targetModule == '_SHORTCUT')
 		{
 			return new BaseObject(0);
 		}
@@ -231,12 +231,12 @@ 
 		$grantList->access = new stdClass();
 		$grantList->access->title = Context::getLang('grant_access');
 		$grantList->access->default = 'guest';
-		if(count($xmlInfo->grant))
+		if (count($xmlInfo->grant))
 		{
-			foreach($xmlInfo->grant as $key => $val)
+			foreach ($xmlInfo->grant as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if (!$val->default) $val->default = 'guest';
+				if ($val->default == 'root') $val->default = 'manager';
 				$grantList->{$key} = $val;
 			}
 		}
@@ -249,14 +249,14 @@ 
 		$args = new stdClass();
 		$args->module_srl = $moduleSrl;
 		$output = executeQueryArray('module.getModuleGrants', $args);
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $val)
+			foreach ($output->data as $val)
 			{
-				if($val->group_srl == 0) $defaultGrant->{$val->name} = 'all';
-				else if($val->group_srl == -1) $defaultGrant->{$val->name} = 'member';
-				else if($val->group_srl == -2) $defaultGrant->{$val->name} = 'site';
-				else if($val->group_srl == -3) $defaultGrant->{$val->name} = 'manager';
+				if ($val->group_srl == 0) $defaultGrant->{$val->name} = 'all';
+				else if ($val->group_srl == -1) $defaultGrant->{$val->name} = 'member';
+				else if ($val->group_srl == -2) $defaultGrant->{$val->name} = 'site';
+				else if ($val->group_srl == -3) $defaultGrant->{$val->name} = 'manager';
 				else
 				{
 					$selectedGroup->{$val->name}[] = $val->group_srl;
@@ -265,15 +265,15 @@ 
 			}
 		}
 
-		if(is_object($grantList))
+		if (is_object($grantList))
 		{
-			foreach($grantList AS $key=>$value)
+			foreach ($grantList AS $key=>$value)
 			{
-				if(isset($defaultGrant->{$key}))
+				if (isset($defaultGrant->{$key}))
 				{
 					$grantList->{$key}->grant = $defaultGrant->{$key};
 				}
-				if(isset($selectedGroup->{$key}))
+				if (isset($selectedGroup->{$key}))
 				{
 					$grantList->{$key}->group_srls = $selectedGroup->{$key};
 				}
@@ -315,11 +315,11 @@ 
 
 		$oModuleModel = getModel('module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-		if(!$module_info) return;
+		if (!$module_info) return;
 
-		if($mode === 'P')
+		if ($mode === 'P')
 		{
-			if($module_info->is_skin_fix == 'N')
+			if ($module_info->is_skin_fix == 'N')
 			{
 				$skin = $oModuleModel->getModuleDefaultSkin($module_info->module, 'P', $module_info->site_srl);
 			}
@@ -330,7 +330,7 @@ 
 		}
 		else
 		{
-			if($module_info->is_mskin_fix == 'N')
+			if ($module_info->is_mskin_fix == 'N')
 			{
 				$skin = $oModuleModel->getModuleDefaultSkin($module_info->module, 'M', $module_info->site_srl);
 			}
@@ -343,7 +343,7 @@ 
 		$module_path = './modules/'.$module_info->module;
 
 		// Get XML information of the skin and skin sinformation set in DB
-		if($mode === 'P')
+		if ($mode === 'P')
 		{
 			$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin);
 			$skin_vars = $oModuleModel->getModuleSkinVars($module_srl);
@@ -354,25 +354,25 @@ 
 			$skin_vars = $oModuleModel->getModuleMobileSkinVars($module_srl);
 		}
 
-		if(count($skin_info->extra_vars)) 
+		if (count($skin_info->extra_vars)) 
 		{
-			foreach($skin_info->extra_vars as $key => $val) 
+			foreach ($skin_info->extra_vars as $key => $val) 
 			{
 				$group = $val->group;
 				$name = $val->name;
 				$type = $val->type;
-				if($skin_vars[$name]) 
+				if ($skin_vars[$name]) 
 				{
 					$value = $skin_vars[$name]->value;
 				}
 				else $value = '';
-				if($type=="checkbox")
+				if ($type == "checkbox")
 				{
-					$value = $value?unserialize($value):array();
+					$value = $value ?unserialize($value) : array();
 				}
 
 				$value = empty($value) ? $val->default : $value;
-				$skin_info->extra_vars[$key]->value= $value;
+				$skin_info->extra_vars[$key]->value = $value;
 			}
 		}
 
@@ -398,7 +398,7 @@ 
 	 */
 	function getLangCode($site_srl, $name, $isFullLanguage = FALSE)
 	{
-		if($isFullLanguage)
+		if ($isFullLanguage)
 		{
 			$lang_supported = Context::loadLangSupported();
 		}
@@ -407,15 +407,15 @@ 
 			$lang_supported = Context::get('lang_supported');
 		}
 
-		if(substr($name,0,12)=='$user_lang->')
+		if (substr($name, 0, 12) == '$user_lang->')
 		{
 			$args = new stdClass();
-			$args->site_srl = (int)$site_srl;
-			$args->name = substr($name,12);
+			$args->site_srl = (int) $site_srl;
+			$args->name = substr($name, 12);
 			$output = executeQueryArray('module.getLang', $args);
-			if($output->data)
+			if ($output->data)
 			{
-				foreach($output->data as $key => $val)
+				foreach ($output->data as $key => $val)
 				{
 					$selected_lang[$val->lang_code] = $val->value;
 				}
@@ -424,24 +424,24 @@ 
 		else
 		{
 			$tmp = unserialize($name);
-			if($tmp)
+			if ($tmp)
 			{
 				$selected_lang = array();
 				$rand_name = $tmp[Context::getLangType()];
-				if(!$rand_name) $rand_name = array_shift($tmp);
-				if(is_array($lang_supported))
+				if (!$rand_name) $rand_name = array_shift($tmp);
+				if (is_array($lang_supported))
 				{
-					foreach($lang_supported as $key => $val)
-						$selected_lang[$key] = $tmp[$key]?$tmp[$key]:$rand_name;
+					foreach ($lang_supported as $key => $val)
+						$selected_lang[$key] = $tmp[$key] ? $tmp[$key] : $rand_name;
 				}
 			}
 		}
 
 		$output = array();
-		if(is_array($lang_supported))
+		if (is_array($lang_supported))
 		{
-			foreach($lang_supported as $key => $val)
-				$output[$key] = $selected_lang[$key]?$selected_lang[$key]:$name;
+			foreach ($lang_supported as $key => $val)
+				$output[$key] = $selected_lang[$key] ? $selected_lang[$key] : $name;
 		}
 		return $output;
 	}
@@ -452,7 +452,7 @@ 
 	function getModuleAdminLangCode()
 	{
 		$name = Context::get('name');
-		if(!$name) return new BaseObject(-1,'msg_invalid_request');
+		if (!$name) return new BaseObject(-1, 'msg_invalid_request');
 		$site_module_info = Context::get('site_module_info');
 		$this->add('name', $name);
 		$output = $this->getLangCode($site_module_info->site_srl, '$user_lang->'.$name);
@@ -465,7 +465,7 @@ 
 	function getModuleAdminLangListByName()
 	{
 		$args = Context::getRequestVars();
-		if(!$args->site_srl) $args->site_srl = 0;
+		if (!$args->site_srl) $args->site_srl = 0;
 
 		$columnList = array('lang_code', 'name', 'value');
 
@@ -473,7 +473,7 @@ 
 
 		$args->langName = preg_replace('/^\$user_lang->/', '', $args->lang_name);
 		$output = executeQueryArray('module.getLangListByName', $args, $columnList);
-		if($output->toBool()) $langList = $output->data;
+		if ($output->toBool()) $langList = $output->data;
 
 		$this->add('lang_list', $langList);
 		$this->add('lang_name', $args->langName);
@@ -485,23 +485,23 @@ 
 	function getModuleAdminLangListByValue()
 	{
 		$args = Context::getRequestVars();
-		if(!$args->site_srl) $args->site_srl = 0;
+		if (!$args->site_srl) $args->site_srl = 0;
 
 		$langList = array();
 
 		// search value
 		$output = executeQueryArray('module.getLangNameByValue', $args);
-		if($output->toBool() && is_array($output->data))
+		if ($output->toBool() && is_array($output->data))
 		{
 			unset($args->value);
 
-			foreach($output->data as $data)
+			foreach ($output->data as $data)
 			{
 				$args->langName = $data->name;
 				$columnList = array('lang_code', 'name', 'value');
 				$outputByName = executeQueryArray('module.getLangListByName', $args, $columnList);
 
-				if($outputByName->toBool())
+				if ($outputByName->toBool())
 				{
 					$langList = array_merge($langList, $outputByName->data);
 				}
@@ -517,7 +517,7 @@ 
 	function getLangListByLangcode($args)
 	{
 		$output = executeQueryArray('module.getLangListByLangcode', $args);
-		if(!$output->toBool()) return array();
+		if (!$output->toBool()) return array();
 
 		return $output;
 	}
@@ -528,7 +528,7 @@ 
 	function getModuleAdminMultilingualHtml()
 	{
 		$oTemplate = TemplateHandler::getInstance();
-		$tpl = $oTemplate->compile(_XE_PATH_ . 'modules/module/tpl', 'multilingual_v17.html');
+		$tpl = $oTemplate->compile(_XE_PATH_.'modules/module/tpl', 'multilingual_v17.html');
 
 		$this->add('html', $tpl);
 	}
@@ -540,7 +540,7 @@ 
 	{
 		$site_module_info = Context::get('site_module_info');
 		$args = new stdClass();
-		$args->site_srl = (int)$site_module_info->site_srl;
+		$args->site_srl = (int) $site_module_info->site_srl;
 		$args->langCode = Context::get('lang_code');
 		$args->page = Context::get('page');
 		$args->sort_index = 'name';
@@ -550,7 +550,7 @@ 
 		$args->list_count = Context::get('list_count');
 		$args->page_count = 5;
 
-		if(!$args->langCode)
+		if (!$args->langCode)
 		{
 			$args->langCode = Context::get('lang_type');
 		}
@@ -567,7 +567,7 @@ 
 		$oSecurity->encodeHTML('lang_code_list..');
 
 		$oTemplate = TemplateHandler::getInstance();
-		$tpl = $oTemplate->compile(_XE_PATH_ . 'modules/module/tpl', 'multilingual_v17_list.html');
+		$tpl = $oTemplate->compile(_XE_PATH_.'modules/module/tpl', 'multilingual_v17_list.html');
 
 		$this->add('html', $tpl);
 	}
@@ -577,9 +577,9 @@ 
 	 */
 	function getModuleAdminModuleSearcherHtml()
 	{
-		Context::loadLang(_XE_PATH_ . 'modules/admin/lang');
+		Context::loadLang(_XE_PATH_.'modules/admin/lang');
 		$oTemplate = TemplateHandler::getInstance();
-		$tpl = $oTemplate->compile(_XE_PATH_ . 'modules/module/tpl', 'module_searcher_v17.html');
+		$tpl = $oTemplate->compile(_XE_PATH_.'modules/module/tpl', 'module_searcher_v17.html');
 
 		$this->add('html', $tpl);
 	}
@@ -589,7 +589,7 @@ 
 	 */
 	function getModuleAdminModuleInfo()
 	{
-		if(Context::get('search_module_srl'))
+		if (Context::get('search_module_srl'))
 		{
 			$module_srl = Context::get('search_module_srl');
 		}

Braces +78 added lines, -44 removed lines

@@ -26,7 +26,9 @@ 
 		$args = new stdClass;
 		$args->module_srls = Context::get('module_srls');
 		$output = executeQueryArray('module.getModulesInfo', $args);
-		if(!$output->toBool() || !$output->data) return new BaseObject();
+		if(!$output->toBool() || !$output->data) {
+			return new BaseObject();
+		}
 
 		foreach($output->data as $key => $val)
 		{
@@ -49,7 +51,9 @@ 
 		$args->list_count = 20;
 		$args->page_count = 10;
 		$output = executeQueryArray('module.getModuleMidList', $args);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		ModuleModel::syncModuleToSite($output->data);
 
@@ -96,8 +100,12 @@ 
 		{
 			foreach($grantList as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if(!$val->default) {
+					$val->default = 'guest';
+				}
+				if($val->default == 'root') {
+					$val->default = 'manager';
+				}
 				$grant_list->{$key} = $val;
 			}
 		}
@@ -158,8 +166,12 @@ 
 		{
 			foreach($source_grant_list as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if(!$val->default) {
+					$val->default = 'guest';
+				}
+				if($val->default == 'root') {
+					$val->default = 'manager';
+				}
 				$grant_list->{$key} = $val;
 			}
 		}
@@ -176,11 +188,15 @@ 
 		{
 			foreach($output->data as $val)
 			{
-				if($val->group_srl == 0) $default_grant[$val->name] = 'all';
-				else if($val->group_srl == -1) $default_grant[$val->name] = 'member';
-				else if($val->group_srl == -2) $default_grant[$val->name] = 'site';
-				else if($val->group_srl == -3) $default_grant[$val->name] = 'manager';
-				else
+				if($val->group_srl == 0) {
+					$default_grant[$val->name] = 'all';
+				} else if($val->group_srl == -1) {
+					$default_grant[$val->name] = 'member';
+				} else if($val->group_srl == -2) {
+					$default_grant[$val->name] = 'site';
+				} else if($val->group_srl == -3) {
+					$default_grant[$val->name] = 'manager';
+				} else
 				{
 					$selected_group[$val->name][] = $val->group_srl;
 					$default_grant[$val->name] = 'group';
@@ -235,8 +251,12 @@ 
 		{
 			foreach($xmlInfo->grant as $key => $val)
 			{
-				if(!$val->default) $val->default = 'guest';
-				if($val->default == 'root') $val->default = 'manager';
+				if(!$val->default) {
+					$val->default = 'guest';
+				}
+				if($val->default == 'root') {
+					$val->default = 'manager';
+				}
 				$grantList->{$key} = $val;
 			}
 		}
@@ -253,11 +273,15 @@ 
 		{
 			foreach($output->data as $val)
 			{
-				if($val->group_srl == 0) $defaultGrant->{$val->name} = 'all';
-				else if($val->group_srl == -1) $defaultGrant->{$val->name} = 'member';
-				else if($val->group_srl == -2) $defaultGrant->{$val->name} = 'site';
-				else if($val->group_srl == -3) $defaultGrant->{$val->name} = 'manager';
-				else
+				if($val->group_srl == 0) {
+					$defaultGrant->{$val->name} = 'all';
+				} else if($val->group_srl == -1) {
+					$defaultGrant->{$val->name} = 'member';
+				} else if($val->group_srl == -2) {
+					$defaultGrant->{$val->name} = 'site';
+				} else if($val->group_srl == -3) {
+					$defaultGrant->{$val->name} = 'manager';
+				} else
 				{
 					$selectedGroup->{$val->name}[] = $val->group_srl;
 					$defaultGrant->{$val->name} = 'group';
@@ -315,26 +339,25 @@ 
 
 		$oModuleModel = getModel('module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-		if(!$module_info) return;
+		if(!$module_info) {
+			return;
+		}
 
 		if($mode === 'P')
 		{
 			if($module_info->is_skin_fix == 'N')
 			{
 				$skin = $oModuleModel->getModuleDefaultSkin($module_info->module, 'P', $module_info->site_srl);
-			}
-			else
+			} else
 			{
 				$skin = $module_info->skin;
 			}
-		}
-		else
+		} else
 		{
 			if($module_info->is_mskin_fix == 'N')
 			{
 				$skin = $oModuleModel->getModuleDefaultSkin($module_info->module, 'M', $module_info->site_srl);
-			}
-			else
+			} else
 			{
 				$skin = $module_info->mskin;
 			}
@@ -347,8 +370,7 @@ 
 		{
 			$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin);
 			$skin_vars = $oModuleModel->getModuleSkinVars($module_srl);
-		}
-		else
+		} else
 		{
 			$skin_info = $oModuleModel->loadSkinInfo($module_path, $skin, 'm.skins');
 			$skin_vars = $oModuleModel->getModuleMobileSkinVars($module_srl);
@@ -364,8 +386,9 @@ 
 				if($skin_vars[$name]) 
 				{
 					$value = $skin_vars[$name]->value;
+				} else {
+					$value = '';
 				}
-				else $value = '';
 				if($type=="checkbox")
 				{
 					$value = $value?unserialize($value):array();
@@ -401,8 +424,7 @@ 
 		if($isFullLanguage)
 		{
 			$lang_supported = Context::loadLangSupported();
-		}
-		else
+		} else
 		{
 			$lang_supported = Context::get('lang_supported');
 		}
@@ -420,19 +442,21 @@ 
 					$selected_lang[$val->lang_code] = $val->value;
 				}
 			}
-		}
-		else
+		} else
 		{
 			$tmp = unserialize($name);
 			if($tmp)
 			{
 				$selected_lang = array();
 				$rand_name = $tmp[Context::getLangType()];
-				if(!$rand_name) $rand_name = array_shift($tmp);
+				if(!$rand_name) {
+					$rand_name = array_shift($tmp);
+				}
 				if(is_array($lang_supported))
 				{
-					foreach($lang_supported as $key => $val)
-						$selected_lang[$key] = $tmp[$key]?$tmp[$key]:$rand_name;
+					foreach($lang_supported as $key => $val) {
+											$selected_lang[$key] = $tmp[$key]?$tmp[$key]:$rand_name;
+					}
 				}
 			}
 		}
@@ -440,8 +464,9 @@ 
 		$output = array();
 		if(is_array($lang_supported))
 		{
-			foreach($lang_supported as $key => $val)
-				$output[$key] = $selected_lang[$key]?$selected_lang[$key]:$name;
+			foreach($lang_supported as $key => $val) {
+							$output[$key] = $selected_lang[$key]?$selected_lang[$key]:$name;
+			}
 		}
 		return $output;
 	}
@@ -452,7 +477,9 @@ 
 	function getModuleAdminLangCode()
 	{
 		$name = Context::get('name');
-		if(!$name) return new BaseObject(-1,'msg_invalid_request');
+		if(!$name) {
+			return new BaseObject(-1,'msg_invalid_request');
+		}
 		$site_module_info = Context::get('site_module_info');
 		$this->add('name', $name);
 		$output = $this->getLangCode($site_module_info->site_srl, '$user_lang->'.$name);
@@ -465,7 +492,9 @@ 
 	function getModuleAdminLangListByName()
 	{
 		$args = Context::getRequestVars();
-		if(!$args->site_srl) $args->site_srl = 0;
+		if(!$args->site_srl) {
+			$args->site_srl = 0;
+		}
 
 		$columnList = array('lang_code', 'name', 'value');
 
@@ -473,7 +502,9 @@ 
 
 		$args->langName = preg_replace('/^\$user_lang->/', '', $args->lang_name);
 		$output = executeQueryArray('module.getLangListByName', $args, $columnList);
-		if($output->toBool()) $langList = $output->data;
+		if($output->toBool()) {
+			$langList = $output->data;
+		}
 
 		$this->add('lang_list', $langList);
 		$this->add('lang_name', $args->langName);
@@ -485,7 +516,9 @@ 
 	function getModuleAdminLangListByValue()
 	{
 		$args = Context::getRequestVars();
-		if(!$args->site_srl) $args->site_srl = 0;
+		if(!$args->site_srl) {
+			$args->site_srl = 0;
+		}
 
 		$langList = array();
 
@@ -517,7 +550,9 @@ 
 	function getLangListByLangcode($args)
 	{
 		$output = executeQueryArray('module.getLangListByLangcode', $args);
-		if(!$output->toBool()) return array();
+		if(!$output->toBool()) {
+			return array();
+		}
 
 		return $output;
 	}
@@ -592,8 +627,7 @@ 
 		if(Context::get('search_module_srl'))
 		{
 			$module_srl = Context::get('search_module_srl');
-		}
-		else
+		} else
 		{
 			$module_srl = Context::get('module_srl');
 		}

modules/comment/comment.model.php

Spacing +97 added lines, -97 removed lines

@@ -43,7 +43,7 @@ 
 		$oCommentController = getController('comment');
 
 		// feature that only member can do
-		if($logged_info->member_srl)
+		if ($logged_info->member_srl)
 		{
 			$oCommentModel = getModel('comment');
 			$columnList = array('comment_srl', 'module_srl', 'member_srl', 'ipaddress');
@@ -54,14 +54,14 @@ 
 			$oModuleModel = getModel('module');
 			$comment_config = $oModuleModel->getModulePartConfig('document', $module_srl);
 
-			if($comment_config->use_vote_up != 'N' && $member_srl != $logged_info->member_srl)
+			if ($comment_config->use_vote_up != 'N' && $member_srl != $logged_info->member_srl)
 			{
 				// Add a vote-up button for positive feedback
 				$url = sprintf("doCallModuleAction('comment','procCommentVoteUp','%s')", $comment_srl);
 				$oCommentController->addCommentPopupMenu($url, 'cmd_vote', '', 'javascript');
 			}
 
-			if($comment_config->use_vote_down != 'N' && $member_srl != $logged_info->member_srl)
+			if ($comment_config->use_vote_down != 'N' && $member_srl != $logged_info->member_srl)
 			{
 				// Add a vote-down button for negative feedback
 				$url = sprintf("doCallModuleAction('comment','procCommentVoteDown','%s')", $comment_srl);
@@ -76,20 +76,20 @@ 
 		// call a trigger (after)
 		ModuleHandler::triggerCall('comment.getCommentMenu', 'after', $menu_list);
 
-		if($this->grant->manager){
+		if ($this->grant->manager) {
 			$str_confirm = Context::getLang('confirm_move');
 			$url = sprintf("if(!confirm('%s')) return; var params = new Array(); params['comment_srl']='%s'; params['mid']=current_mid;params['cur_url']=current_url; exec_xml('comment', 'procCommentAdminMoveToTrash', params)", $str_confirm, $comment_srl);
-			$oCommentController->addCommentPopupMenu($url,'cmd_trash','','javascript');
+			$oCommentController->addCommentPopupMenu($url, 'cmd_trash', '', 'javascript');
 
 		}
 
 		// find a comment by IP matching if an administrator.
-		if($logged_info->is_admin == 'Y')
+		if ($logged_info->is_admin == 'Y')
 		{
 			$oCommentModel = getModel('comment');
 			$oComment = $oCommentModel->getComment($comment_srl);
 
-			if($oComment->isExists())
+			if ($oComment->isExists())
 			{
 				// Find a post of the corresponding ip address
 				$url = getUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_target', 'ipaddress', 'search_keyword', $oComment->getIpAddress());
@@ -104,7 +104,7 @@ 
 		$menus = Context::get('comment_popup_menu_list');
 		$menus_count = count($menus);
 
-		for($i = 0; $i < $menus_count; $i++)
+		for ($i = 0; $i < $menus_count; $i++)
 		{
 			$menus[$i]->str = Context::getLang($menus[$i]->str);
 		}
@@ -160,7 +160,7 @@ 
 	function getComment($comment_srl = 0, $is_admin = FALSE, $columnList = array())
 	{
 		$oComment = new commentItem($comment_srl, $columnList);
-		if($is_admin)
+		if ($is_admin)
 		{
 			$oComment->setGrant();
 		}
@@ -176,7 +176,7 @@ 
 	 */
 	function getComments($comment_srl_list, $columnList = array())
 	{
-		if(is_array($comment_srl_list))
+		if (is_array($comment_srl_list))
 		{
 			$comment_srls = implode(',', $comment_srl_list);
 		}
@@ -185,25 +185,25 @@ 
 		$args = new stdClass();
 		$args->comment_srls = $comment_srls;
 		$output = executeQuery('comment.getComments', $args, $columnList);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return;
 		}
 
 		$comment_list = $output->data;
-		if(!$comment_list)
+		if (!$comment_list)
 		{
 			return;
 		}
-		if(!is_array($comment_list))
+		if (!is_array($comment_list))
 		{
 			$comment_list = array($comment_list);
 		}
 
 		$comment_count = count($comment_list);
-		foreach($comment_list as $key => $attribute)
+		foreach ($comment_list as $key => $attribute)
 		{
-			if(!$attribute->comment_srl)
+			if (!$attribute->comment_srl)
 			{
 				continue;
 			}
@@ -211,7 +211,7 @@ 
 			$oComment = NULL;
 			$oComment = new commentItem();
 			$oComment->setAttribute($attribute);
-			if($is_admin)
+			if ($is_admin)
 			{
 				$oComment->setGrant();
 			}
@@ -238,7 +238,7 @@ 
 		$oDocument = $oDocumentModel->getDocument($document_srl, FALSE, TRUE, $columnList);
 
 		// return if no doc exists.
-		if(!$oDocument->isExists())
+		if (!$oDocument->isExists())
 		{
 			return;
 		}
@@ -250,7 +250,7 @@ 
 		$oCommentController = getController('comment');
 
 		$using_validation = $oCommentController->isModuleUsingPublishValidation($module_srl);
-		if($using_validation)
+		if ($using_validation)
 		{
 			$args->status = 1;
 		}
@@ -269,18 +269,18 @@ 
 	 */
 	function getCommentCountByDate($date = '', $moduleSrlList = array())
 	{
-		if($date)
+		if ($date)
 		{
 			$args->regDate = date('Ymd', strtotime($date));
 		}
 
-		if(count($moduleSrlList) > 0)
+		if (count($moduleSrlList) > 0)
 		{
 			$args->module_srl = $moduleSrlList;
 		}
 
 		$output = executeQuery('comment.getCommentCount', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return 0;
 		}
@@ -299,19 +299,19 @@ 
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 
-		if(is_null($published))
+		if (is_null($published))
 		{
 			// check if module is using comment validation system
 			$oCommentController = getController("comment");
 			$is_using_validation = $oCommentController->isModuleUsingPublishValidation($module_srl);
-			if($is_using_validation)
+			if ($is_using_validation)
 			{
 				$args->status = 1;
 			}
 		}
 		else
 		{
-			if($published)
+			if ($published)
 			{
 				$args->status = 1;
 			}
@@ -363,12 +363,12 @@ 
 	{
 		$args = new stdClass();
 
-		if(!is_object($obj))
+		if (!is_object($obj))
 		{
 			$obj = new stdClass();
 		}
 
-		if($obj->mid)
+		if ($obj->mid)
 		{
 			$oModuleModel = getModel('module');
 			$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
@@ -376,7 +376,7 @@ 
 		}
 
 		// check if module_srl is an arrary.
-		if(is_array($obj->module_srl))
+		if (is_array($obj->module_srl))
 		{
 			$args->module_srl = implode(',', $obj->module_srl);
 		}
@@ -388,14 +388,14 @@ 
 		$args->document_srl = $obj->document_srl;
 		$args->list_count = $obj->list_count;
 
-		if(strpos($args->module_srl, ",") === false)
+		if (strpos($args->module_srl, ",") === false)
 		{
-			if($args->module_srl)
+			if ($args->module_srl)
 			{
 				// check if module is using comment validation system
 				$oCommentController = getController("comment");
 				$is_using_validation = $oCommentController->isModuleUsingPublishValidation($obj->module_srl);
-				if($is_using_validation)
+				if ($is_using_validation)
 				{
 					$args->status = 1;
 				}
@@ -404,24 +404,24 @@ 
 
 		$output = executeQuery('comment.getNewestCommentList', $args, $columnList);
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
 		$comment_list = $output->data;
-		if($comment_list)
+		if ($comment_list)
 		{
-			if(!is_array($comment_list))
+			if (!is_array($comment_list))
 			{
 				$comment_list = array($comment_list);
 			}
 
 			$comment_count = count($comment_list);
 
-			foreach($comment_list as $key => $attribute)
+			foreach ($comment_list as $key => $attribute)
 			{
-				if(!$attribute->comment_srl)
+				if (!$attribute->comment_srl)
 				{
 					continue;
 				}
@@ -448,7 +448,7 @@ 
 	 */
 	function getCommentList($document_srl, $page = 0, $is_admin = FALSE, $count = 0)
 	{
-		if(!isset($document_srl))
+		if (!isset($document_srl))
 		{
 			return;
 		}
@@ -459,13 +459,13 @@ 
 		$oDocument = $oDocumentModel->getDocument($document_srl, FALSE, TRUE, $columnList);
 
 		// return if no doc exists.
-		if(!$oDocument->isExists())
+		if (!$oDocument->isExists())
 		{
 			return;
 		}
 
 		// return if no comment exists
-		if($oDocument->getCommentCount() < 1)
+		if ($oDocument->getCommentCount() < 1)
 		{
 			return;
 		}
@@ -473,11 +473,11 @@ 
 		// get a list of comments
 		$module_srl = $oDocument->get('module_srl');
 
-		if(!$count)
+		if (!$count)
 		{
 			$comment_config = $this->getCommentConfig($module_srl);
 			$comment_count = $comment_config->comment_count;
-			if(!$comment_count)
+			if (!$comment_count)
 			{
 				$comment_count = 50;
 			}
@@ -488,9 +488,9 @@ 
 		}
 
 		// get a very last page if no page exists
-		if(!$page)
+		if (!$page)
 		{
-			$page = (int) ( ($oDocument->getCommentCount() - 1) / $comment_count) + 1;
+			$page = (int) (($oDocument->getCommentCount() - 1) / $comment_count) + 1;
 		}
 
 		// get a list of comments
@@ -503,7 +503,7 @@ 
 		//check if module is using validation system
 		$oCommentController = getController('comment');
 		$using_validation = $oCommentController->isModuleUsingPublishValidation($module_srl);
-		if($using_validation)
+		if ($using_validation)
 		{
 			$args->status = 1;
 		}
@@ -511,17 +511,17 @@ 
 		$output = executeQueryArray('comment.getCommentPageList', $args);
 
 		// return if an error occurs in the query results
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return;
 		}
 
 		// insert data into CommentPageList table if the number of results is different from stored comments
-		if(!$output->data)
+		if (!$output->data)
 		{
 			$this->fixCommentList($oDocument->get('module_srl'), $document_srl);
 			$output = executeQueryArray('comment.getCommentPageList', $args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return;
 			}
@@ -540,9 +540,9 @@ 
 	function fixCommentList($module_srl, $document_srl)
 	{
 		// create a lock file to prevent repeated work when performing a batch job
-		$lock_file = "./files/cache/tmp/lock." . $document_srl;
+		$lock_file = "./files/cache/tmp/lock.".$document_srl;
 
-		if(file_exists($lock_file) && filemtime($lock_file) + 60 * 60 * 10 < $_SERVER['REQUEST_TIME'])
+		if (file_exists($lock_file) && filemtime($lock_file) + 60 * 60 * 10 < $_SERVER['REQUEST_TIME'])
 		{
 			return;
 		}
@@ -554,13 +554,13 @@ 
 		$args->document_srl = $document_srl;
 		$args->list_order = 'list_order';
 		$output = executeQuery('comment.getCommentList', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
 		$source_list = $output->data;
-		if(!is_array($source_list))
+		if (!is_array($source_list))
 		{
 			$source_list = array($source_list);
 		}
@@ -576,11 +576,11 @@ 
 		$logged_info = Context::get('logged_info');
 
 		// generate a hierarchical structure of comments for loop
-		for($i = $comment_count - 1; $i >= 0; $i--)
+		for ($i = $comment_count - 1; $i >= 0; $i--)
 		{
 			$comment_srl = $source_list[$i]->comment_srl;
 			$parent_srl = $source_list[$i]->parent_srl;
-			if(!$comment_srl)
+			if (!$comment_srl)
 			{
 				continue;
 			}
@@ -588,7 +588,7 @@ 
 			// generate a list
 			$list[$comment_srl] = $source_list[$i];
 
-			if($parent_srl)
+			if ($parent_srl)
 			{
 				$list[$parent_srl]->child[] = &$list[$comment_srl];
 			}
@@ -600,9 +600,9 @@ 
 		$this->_arrangeComment($comment_list, $root->child, 0, NULL);
 
 		// insert values to the database
-		if(count($comment_list))
+		if (count($comment_list))
 		{
-			foreach($comment_list as $comment_srl => $item)
+			foreach ($comment_list as $comment_srl => $item)
 			{
 				$comment_args = new stdClass();
 				$comment_args->comment_srl = $comment_srl;
@@ -631,14 +631,14 @@ 
 	 */
 	function _arrangeComment(&$comment_list, $list, $depth, $parent = NULL)
 	{
-		if(!count($list))
+		if (!count($list))
 		{
 			return;
 		}
 
-		foreach($list as $key => $val)
+		foreach ($list as $key => $val)
 		{
-			if($parent)
+			if ($parent)
 			{
 				$val->head = $parent->head;
 			}
@@ -649,7 +649,7 @@ 
 
 			$val->arrange = count($comment_list) + 1;
 
-			if($val->child)
+			if ($val->child)
 			{
 				$val->depth = $depth;
 				$comment_list[$val->comment_srl] = $val;
@@ -686,7 +686,7 @@ 
 		// check if module is using comment validation system
 		$oCommentController = getController("comment");
 		$is_using_validation = $oCommentController->isModuleUsingPublishValidation($obj->module_srl);
-		if($is_using_validation)
+		if ($is_using_validation)
 		{
 			$args->s_is_published = 1;
 		}
@@ -694,12 +694,12 @@ 
 		// Search options
 		$search_target = $obj->search_target ? $obj->search_target : trim(Context::get('search_target'));
 		$search_keyword = $obj->search_keyword ? $obj->search_keyword : trim(Context::get('search_keyword'));
-		if($search_target && $search_keyword)
+		if ($search_target && $search_keyword)
 		{
-			switch($search_target)
+			switch ($search_target)
 			{
 				case 'content' :
-					if($search_keyword)
+					if ($search_keyword)
 					{
 						$search_keyword = str_replace(' ', '%', $search_keyword);
 					}
@@ -708,7 +708,7 @@ 
 					break;
 
 				case 'user_id' :
-					if($search_keyword)
+					if ($search_keyword)
 					{
 						$search_keyword = str_replace(' ', '%', $search_keyword);
 					}
@@ -719,7 +719,7 @@ 
 					break;
 
 				case 'user_name' :
-					if($search_keyword)
+					if ($search_keyword)
 					{
 						$search_keyword = str_replace(' ', '%', $search_keyword);
 					}
@@ -728,7 +728,7 @@ 
 					break;
 
 				case 'nick_name' :
-					if($search_keyword)
+					if ($search_keyword)
 					{
 						$search_keyword = str_replace(' ', '%', $search_keyword);
 					}
@@ -737,7 +737,7 @@ 
 					break;
 
 				case 'email_address' :
-					if($search_keyword)
+					if ($search_keyword)
 					{
 						$search_keyword = str_replace(' ', '%', $search_keyword);
 					}
@@ -746,7 +746,7 @@ 
 					break;
 
 				case 'homepage' :
-					if($search_keyword)
+					if ($search_keyword)
 					{
 						$search_keyword = str_replace(' ', '%', $search_keyword);
 					}
@@ -771,12 +771,12 @@ 
 					break;
 
 				case 'is_published' :
-					if($search_keyword == 'Y')
+					if ($search_keyword == 'Y')
 					{
 						$args->s_is_published = 1;
 					}
 
-					if($search_keyword == 'N')
+					if ($search_keyword == 'N')
 					{
 						$args->s_is_published = 0;
 					}
@@ -788,7 +788,7 @@ 
 					break;
 
 				case 'member_srl' :
-					$args->{"s_" . $search_target} = (int) $search_keyword;
+					$args->{"s_".$search_target} = (int) $search_keyword;
 					break;
 			}
 		}
@@ -797,12 +797,12 @@ 
 		$output = executeQueryArray($query_id, $args, $columnList);
 
 		// return when no result or error occurance
-		if(!$output->toBool() || !count($output->data))
+		if (!$output->toBool() || !count($output->data))
 		{
 			return $output;
 		}
 
-		foreach($output->data as $key => $val)
+		foreach ($output->data as $key => $val)
 		{
 			unset($_oComment);
 			$_oComment = new CommentItem(0);
@@ -831,12 +831,12 @@ 
 		$search_target = $obj->search_target ? $obj->search_target : trim(Context::get('search_target'));
 		$search_keyword = $obj->search_keyword ? $obj->search_keyword : trim(Context::get('search_keyword'));
 
-		if($search_target && $search_keyword)
+		if ($search_target && $search_keyword)
 		{
-			switch($search_target)
+			switch ($search_target)
 			{
 				case 'content' :
-					if($search_keyword)
+					if ($search_keyword)
 					{
 						$search_keyword = str_replace(' ', '%', $search_keyword);
 					}
@@ -845,7 +845,7 @@ 
 					break;
 
 				case 'user_id' :
-					if($search_keyword)
+					if ($search_keyword)
 					{
 						$search_keyword = str_replace(' ', '%', $search_keyword);
 					}
@@ -855,7 +855,7 @@ 
 					break;
 
 				case 'user_name' :
-					if($search_keyword)
+					if ($search_keyword)
 					{
 						$search_keyword = str_replace(' ', '%', $search_keyword);
 					}
@@ -864,7 +864,7 @@ 
 					break;
 
 				case 'nick_name' :
-					if($search_keyword)
+					if ($search_keyword)
 					{
 						$search_keyword = str_replace(' ', '%', $search_keyword);
 					}
@@ -873,7 +873,7 @@ 
 					break;
 
 				case 'email_address' :
-					if($search_keyword)
+					if ($search_keyword)
 					{
 						$search_keyword = str_replace(' ', '%', $search_keyword);
 					}
@@ -882,7 +882,7 @@ 
 					break;
 
 				case 'homepage' :
-					if($search_keyword)
+					if ($search_keyword)
 					{
 						$search_keyword = str_replace(' ', '%', $search_keyword);
 					}
@@ -907,7 +907,7 @@ 
 					break;
 
 				case 'member_srl' :
-					$args->{"s_" . $search_target} = (int) $search_keyword;
+					$args->{"s_".$search_target} = (int) $search_keyword;
 					break;
 			}
 		}
@@ -915,7 +915,7 @@ 
 		$output = executeQueryArray($query_id, $args);
 
 		// return when no result or error occurance
-		if(!$output->toBool() || !count($output->data))
+		if (!$output->toBool() || !count($output->data))
 		{
 			return $output;
 		}
@@ -932,12 +932,12 @@ 
 	{
 		$oModuleModel = getModel('module');
 		$comment_config = $oModuleModel->getModulePartConfig('comment', $module_srl);
-		if(!is_object($comment_config))
+		if (!is_object($comment_config))
 		{
 			$comment_config = new stdClass();
 		}
 
-		if(!isset($comment_config->comment_count))
+		if (!isset($comment_config->comment_count))
 		{
 			$comment_config->comment_count = 50;
 		}
@@ -952,13 +952,13 @@ 
 	function getCommentVotedMemberList()
 	{
 		$comment_srl = Context::get('comment_srl');
-		if(!$comment_srl)
+		if (!$comment_srl)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
 		$point = Context::get('point');
-		if($point != -1)
+		if ($point != -1)
 		{
 			$point = 1;
 		}
@@ -966,7 +966,7 @@ 
 		$oCommentModel = getModel('comment');
 		$oComment = $oCommentModel->getComment($comment_srl, FALSE, FALSE);
 		$module_srl = $oComment->get('module_srl');
-		if(!$module_srl)
+		if (!$module_srl)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -976,9 +976,9 @@ 
 
 		$args = new stdClass();
 
-		if($point == -1)
+		if ($point == -1)
 		{
-			if($comment_config->use_vote_down != 'S')
+			if ($comment_config->use_vote_down != 'S')
 			{
 				return new BaseObject(-1, 'msg_invalid_request');
 			}
@@ -987,7 +987,7 @@ 
 		}
 		else
 		{
-			if($comment_config->use_vote_up != 'S')
+			if ($comment_config->use_vote_up != 'S')
 			{
 				return new BaseObject(-1, 'msg_invalid_request');
 			}
@@ -997,15 +997,15 @@ 
 
 		$args->comment_srl = $comment_srl;
 		$output = executeQueryArray('comment.getVotedMemberList', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
 		$oMemberModel = getModel('member');
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $k => $d)
+			foreach ($output->data as $k => $d)
 			{
 				$profile_image = $oMemberModel->getProfileImage($d->member_srl);
 				$output->data[$k]->src = $profile_image->src;
@@ -1023,7 +1023,7 @@ 
 	{
 		global $lang;
 
-		if(!isset($lang->secret_name_list))
+		if (!isset($lang->secret_name_list))
 		{
 			return array('Y' => 'Secret', 'N' => 'Public');
 		}
@@ -1064,8 +1064,8 @@ 
 		$output = executeQuery('comment.getCommentListByMemberSrl', $args, $columnList);
 		$comment_list = $output->data;
 
-		if(!$comment_list) return array();
-		if(!is_array($comment_list)) $comment_list = array($comment_list);
+		if (!$comment_list) return array();
+		if (!is_array($comment_list)) $comment_list = array($comment_list);
 
 		return $comment_list;
 

modules/comment/comment.admin.controller.php

Spacing +42 added lines, -42 removed lines

@@ -29,7 +29,7 @@ 
 	{
 		// Error display if none is selected
 		$cart = Context::get('cart');
-		if(!is_array($cart))
+		if (!is_array($cart))
 		{
 			$comment_srl_list = explode('|@|', $cart);
 		}
@@ -54,11 +54,11 @@ 
 
 		// Error display if none is selected
 		$cart = Context::get('cart');
-		if(!$cart)
+		if (!$cart)
 		{
 			return $this->stop('msg_cart_is_null');
 		}
-		if(!is_array($cart))
+		if (!is_array($cart))
 		{
 			$comment_srl_list = explode('|@|', $cart);
 		}
@@ -71,7 +71,7 @@ 
 		$args->status = $will_publish;
 		$args->comment_srls_list = $comment_srl_list;
 		$output = executeQuery('comment.updatePublishedStatus', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -90,16 +90,16 @@ 
 			//$oMemberModule = getModel("member");
 			//$logged_info = $oMemberModule->getMemberInfoByMemberSrl($logged_member_srl);
 			$new_status = ($will_publish) ? "published" : "unpublished";
-			foreach($comment_srl_list as $comment_srl)
+			foreach ($comment_srl_list as $comment_srl)
 			{
 				// check if comment already exists
 				$comment = $oCommentModel->getComment($comment_srl);
-				if($comment->comment_srl != $comment_srl)
+				if ($comment->comment_srl != $comment_srl)
 				{
 					return new BaseObject(-1, 'msg_invalid_request');
 				}
 				$document_srl = $comment->document_srl;
-				if(!in_array($document_srl, $updated_documents_arr))
+				if (!in_array($document_srl, $updated_documents_arr))
 				{
 					$updated_documents_arr[] = $document_srl;
 					// update the number of comments
@@ -117,13 +117,13 @@ 
 					// send email to comment's author, all admins and thread(document) subscribers - START
 					// -------------------------------------------------------
 					$oMail = new Mail();
-					$mail_title = "[XE - " . $module_info->mid . "] comment(s) status changed to " . $new_status . " on document: \"" . $oDocument->getTitleText() . "\"";
+					$mail_title = "[XE - ".$module_info->mid."] comment(s) status changed to ".$new_status." on document: \"".$oDocument->getTitleText()."\"";
 					$oMail->setTitle($mail_title);
 					$mail_content = "
-						The comment #" . $comment_srl . " on document \"" . $oDocument->getTitleText() . "\" has been " . $new_status . " by admin of <strong><i>" . strtoupper($module_info->mid) . "</i></strong> module.
+						The comment #" . $comment_srl." on document \"".$oDocument->getTitleText()."\" has been ".$new_status." by admin of <strong><i>".strtoupper($module_info->mid)."</i></strong> module.
 						<br />
 						<br />Comment content:
-						" . $comment->content . "
+						" . $comment->content."
 						<br />
 						";
 					$oMail->setContent($mail_content);
@@ -145,17 +145,17 @@ 
 					*/
 					//mail to author of thread - STOP
 					//mail to all emails set for administrators - START
-					if($module_info->admin_mail)
+					if ($module_info->admin_mail)
 					{
 						$target_mail = explode(',', $module_info->admin_mail);
-						for($i = 0; $i < count($target_mail); $i++)
+						for ($i = 0; $i < count($target_mail); $i++)
 						{
 							$email_address = trim($target_mail[$i]);
-							if(!$email_address)
+							if (!$email_address)
 							{
 								continue;
 							}
-							if($author_email != $email_address)
+							if ($author_email != $email_address)
 							{
 								$oMail->setReceiptor($email_address, $email_address);
 								$oMail->send();
@@ -173,12 +173,12 @@ 
 
 		// for message send - start
 		$message_content = Context::get('message_content');
-		if($message_content)
+		if ($message_content)
 		{
 			$message_content = nl2br($message_content);
 		}
 
-		if($message_content)
+		if ($message_content)
 		{
 			$this->_sendMessageForComment($message_content, $comment_srl_list);
 		}
@@ -195,11 +195,11 @@ 
 
 		// Error display if none is selected
 		$cart = Context::get('cart');
-		if(!$cart)
+		if (!$cart)
 		{
 			return $this->stop('msg_cart_is_null');
 		}
-		if(!is_array($cart))
+		if (!is_array($cart))
 		{
 			$comment_srl_list = explode('|@|', $cart);
 		}
@@ -208,7 +208,7 @@ 
 			$comment_srl_list = $cart;
 		}
 		$comment_count = count($comment_srl_list);
-		if(!$comment_count)
+		if (!$comment_count)
 		{
 			return $this->stop('msg_cart_is_null');
 		}
@@ -220,34 +220,34 @@ 
 
 		// for message send - start
 		$message_content = Context::get('message_content');
-		if($message_content)
+		if ($message_content)
 		{
 			$message_content = nl2br($message_content);
 		}
 
-		if($message_content)
+		if ($message_content)
 		{
 			$this->_sendMessageForComment($message_content, $comment_srl_list);
 		}
 		// for message send - end
 		// comment into trash
-		if($isTrash == 'true')
+		if ($isTrash == 'true')
 		{
 			$this->_moveCommentToTrash($comment_srl_list, $oCommentController, $oDB, $message_content);
 		}
 
 		$deleted_count = 0;
 		// Delete the comment posting
-		for($i = 0; $i < $comment_count; $i++)
+		for ($i = 0; $i < $comment_count; $i++)
 		{
 			$comment_srl = trim($comment_srl_list[$i]);
-			if(!$comment_srl)
+			if (!$comment_srl)
 			{
 				continue;
 			}
 
 			$output = $oCommentController->deleteComment($comment_srl, TRUE, $isTrash);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
@@ -259,7 +259,7 @@ 
 		$oDB->commit();
 
 		$msgCode = '';
-		if($isTrash == 'true')
+		if ($isTrash == 'true')
 		{
 			$msgCode = 'success_trashed';
 		}
@@ -290,12 +290,12 @@ 
 		$sender_member_srl = $logged_info->member_srl;
 
 		$comment_count = count($comment_srl_list);
-		for($i = 0; $i < $comment_count; $i++)
+		for ($i = 0; $i < $comment_count; $i++)
 		{
 			$comment_srl = $comment_srl_list[$i];
 			$oComment = $oCommentModel->getComment($comment_srl, TRUE);
 
-			if(!$oComment->get('member_srl') || $oComment->get('member_srl') == $sender_member_srl)
+			if (!$oComment->get('member_srl') || $oComment->get('member_srl') == $sender_member_srl)
 			{
 				continue;
 			}
@@ -312,16 +312,16 @@ 
 	 */
 	function _moveCommentToTrash($commentSrlList, &$oCommentController, &$oDB, $message_content = NULL)
 	{
-		require_once(_XE_PATH_ . 'modules/trash/model/TrashVO.php');
+		require_once(_XE_PATH_.'modules/trash/model/TrashVO.php');
 
-		if(is_array($commentSrlList))
+		if (is_array($commentSrlList))
 		{
 			$logged_info = Context::get('logged_info');
 			$oCommentModel = getModel('comment');
 			$commentItemList = $oCommentModel->getComments($commentSrlList);
 			$oTrashAdminController = getAdminController('trash');
 
-			foreach($commentItemList AS $key => $oComment)
+			foreach ($commentItemList AS $key => $oComment)
 			{
 				$oTrashVO = new TrashVO();
 				$oTrashVO->setTrashSrl(getNextSequence());
@@ -331,7 +331,7 @@ 
 				$oTrashVO->setDescription($message_content);
 
 				$output = $oTrashAdminController->insertTrash($oTrashVO);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					$oDB->rollback();
 					return $output;
@@ -355,7 +355,7 @@ 
 		$oCommentController = getController('comment');
 		$oComment = $oCommentModel->getComment($comment_srl, false);
 
-		if(!$oComment->isGranted()) return $this->stop('msg_not_permitted');
+		if (!$oComment->isGranted()) return $this->stop('msg_not_permitted');
 
 		$message_content = "";
 		$this->_moveCommentToTrash(array($comment_srl), $oCommentController, $oDB, $message_content);
@@ -377,12 +377,12 @@ 
 	{
 		$comment_srl = trim(Context::get('comment_srl'));
 
-		if($comment_srl)
+		if ($comment_srl)
 		{
 			$args = new stdClass();
 			$args->comment_srl = $comment_srl;
 			$output = executeQuery('comment.deleteDeclaredComments', $args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return $output;
 			}
@@ -403,11 +403,11 @@ 
 
 		$output = $oCommentModel->getComments($commentSrlList);
 
-		if(is_array($output))
+		if (is_array($output))
 		{
-			foreach($output AS $key => $value)
+			foreach ($output AS $key => $value)
 			{
-				if($_SESSION['comment_management'][$key])
+				if ($_SESSION['comment_management'][$key])
 				{
 					unset($_SESSION['comment_management'][$key]);
 				}
@@ -428,7 +428,7 @@ 
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 		$output = executeQuery('comment.deleteModuleComments', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -437,7 +437,7 @@ 
 
 		//remove from cache
 		$oCacheHandler = CacheHandler::getInstance('object');
-		if($oCacheHandler->isSupport())
+		if ($oCacheHandler->isSupport())
 		{
 			// Invalidate newest comments. Per document cache is invalidated inside document admin controller.
 			$oCacheHandler->invalidateGroupKey('newestCommentsList');
@@ -452,7 +452,7 @@ 
 	 */
 	function restoreTrash($originObject)
 	{
-		if(is_array($originObject))
+		if (is_array($originObject))
 		{
 			$originObject = (object) $originObject;
 		}
@@ -485,7 +485,7 @@ 
 	function emptyTrash($originObject)
 	{
 		$originObject = unserialize($originObject);
-		if(is_array($originObject))
+		if (is_array($originObject))
 		{
 			$originObject = (object) $originObject;
 		}

modules/communication/communication.controller.php

Spacing +76 added lines, -76 removed lines

@@ -23,7 +23,7 @@ 
 	 */
 	function procCommunicationUpdateAllowMessage()
 	{
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new BaseObject(-1, 'msg_not_logged');
 		}
@@ -31,7 +31,7 @@ 
 		$args = new stdClass();
 		$args->allow_message = Context::get('allow_message');
 
-		if(!in_array($args->allow_message, array('Y', 'N', 'F')))
+		if (!in_array($args->allow_message, array('Y', 'N', 'F')))
 		{
 			$args->allow_message = 'Y';
 		}
@@ -53,7 +53,7 @@ 
 	function procCommunicationSendMessage()
 	{
 		// Check login information
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new BaseObject(-1, 'msg_not_logged');
 		}
@@ -62,25 +62,25 @@ 
 
 		// Check variables
 		$receiver_srl = Context::get('receiver_srl');
-		if(!$receiver_srl)
+		if (!$receiver_srl)
 		{
 			return new BaseObject(-1, 'msg_not_exists_member');
 		}
 
 		$title = trim(Context::get('title'));
-		if(!$title)
+		if (!$title)
 		{
 			return new BaseObject(-1, 'msg_title_is_null');
 		}
 
 		$content = trim(Context::get('content'));
-		if(!$content)
+		if (!$content)
 		{
 			return new BaseObject(-1, 'msg_content_is_null');
 		}
 
 		$send_mail = Context::get('send_mail');
-		if($send_mail != 'Y')
+		if ($send_mail != 'Y')
 		{
 			$send_mail = 'N';
 		}
@@ -90,28 +90,28 @@ 
 		$oCommunicationModel = getModel('communication');
 		$config = $oCommunicationModel->getConfig();
 
-		if(!$oCommunicationModel->checkGrant($config->grant_write))
+		if (!$oCommunicationModel->checkGrant($config->grant_write))
 		{
 			return new BaseObject(-1, 'msg_not_permitted');
 		}
 
 		$receiver_member_info = $oMemberModel->getMemberInfoByMemberSrl($receiver_srl);
-		if($receiver_member_info->member_srl != $receiver_srl)
+		if ($receiver_member_info->member_srl != $receiver_srl)
 		{
 			return new BaseObject(-1, 'msg_not_exists_member');
 		}
 
 		// check whether to allow to receive the message(pass if a top-administrator)
-		if($logged_info->is_admin != 'Y')
+		if ($logged_info->is_admin != 'Y')
 		{
-			if($receiver_member_info->allow_message == 'F')
+			if ($receiver_member_info->allow_message == 'F')
 			{
-				if(!$oCommunicationModel->isFriend($receiver_member_info->member_srl))
+				if (!$oCommunicationModel->isFriend($receiver_member_info->member_srl))
 				{
 					return new BaseObject(-1, 'msg_allow_message_to_friend');
 				}
 			}
-			else if($receiver_member_info->allow_message == 'N')
+			else if ($receiver_member_info->allow_message == 'N')
 			{
 				return new BaseObject(-1, 'msg_disallow_message');
 			}
@@ -120,13 +120,13 @@ 
 		// send a message
 		$output = $this->sendMessage($logged_info->member_srl, $receiver_srl, $title, $content);
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
 		// send an e-mail
-		if($send_mail == 'Y')
+		if ($send_mail == 'Y')
 		{
 			$view_url = Context::getRequestUri();
 			$content = sprintf("%s<br /><br />From : <a href=\"%s\" target=\"_blank\">%s</a>", $content, $view_url, $view_url);
@@ -138,9 +138,9 @@ 
 			$oMail->send();
 		}
 
-		if(!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
-			if(Context::get('is_popup') != 'Y')
+			if (Context::get('is_popup') != 'Y')
 			{
 				global $lang;
 				htmlHeader();
@@ -153,7 +153,7 @@ 
 			else
 			{
 				$this->setMessage('success_sended');
-				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('','act', 'dispCommunicationMessages', 'message_type', 'S', 'receiver_srl', $receiver_srl, 'message_srl', '');
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'act', 'dispCommunicationMessages', 'message_type', 'S', 'receiver_srl', $receiver_srl, 'message_srl', '');
 				$this->setRedirectUrl($returnUrl);
 			}
 		}
@@ -197,7 +197,7 @@ 
 		$receiver_args->related_srl = 0;
 		$receiver_args->list_order = $related_srl * -1;
 		$receiver_args->sender_srl = $sender_srl;
-		if(!$receiver_args->sender_srl)
+		if (!$receiver_args->sender_srl)
 		{
 			$receiver_args->sender_srl = $receiver_srl;
 		}
@@ -218,7 +218,7 @@ 
 		$trigger_obj->content = $content;
 		$trigger_obj->sender_log = $sender_log;
 		$triggerOutput = ModuleHandler::triggerCall('communication.sendMessage', 'before', $trigger_obj);
-		if(!$triggerOutput->toBool())
+		if (!$triggerOutput->toBool())
 		{
 			return $triggerOutput;
 		}
@@ -227,10 +227,10 @@ 
 		$oDB->begin();
 
 		// messages to save in the sendor's message box
-		if($sender_srl && $sender_log)
+		if ($sender_srl && $sender_log)
 		{
 			$output = executeQuery('communication.sendMessage', $sender_args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				$oDB->rollback();
 				return $output;
@@ -239,7 +239,7 @@ 
 
 		// messages to save in the receiver's message box
 		$output = executeQuery('communication.sendMessage', $receiver_args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			$oDB->rollback();
 			return $output;
@@ -247,14 +247,14 @@ 
 
 		// Call a trigger (after)
 		$trigger_output = ModuleHandler::triggerCall('communication.sendMessage', 'after', $trigger_obj);
-		if(!$trigger_output->toBool())
+		if (!$trigger_output->toBool())
 		{
 			$oDB->rollback();
 			return $trigger_output;
 		}
 
 		// create a flag that message is sent (in file format) 
-		$flag_path = './files/member_extra_info/new_message_flags/' . getNumberingPath($receiver_srl);
+		$flag_path = './files/member_extra_info/new_message_flags/'.getNumberingPath($receiver_srl);
 		FileHandler::makeDir($flag_path);
 		$flag_file = sprintf('%s%s', $flag_path, $receiver_srl);
 		$flag_count = FileHandler::readFile($flag_file);
@@ -272,7 +272,7 @@ 
 	function procCommunicationStoreMessage()
 	{
 		// Check login information
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new BaseObject(-1, 'msg_not_logged');
 		}
@@ -280,7 +280,7 @@ 
 
 		// Check variable
 		$message_srl = Context::get('message_srl');
-		if(!$message_srl)
+		if (!$message_srl)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -288,7 +288,7 @@ 
 		// get the message
 		$oCommunicationModel = getModel('communication');
 		$message = $oCommunicationModel->getSelectedMessage($message_srl);
-		if(!$message || $message->message_type != 'R')
+		if (!$message || $message->message_type != 'R')
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -297,7 +297,7 @@ 
 		$args->message_srl = $message_srl;
 		$args->receiver_srl = $logged_info->member_srl;
 		$output = executeQuery('communication.setMessageStored', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -312,7 +312,7 @@ 
 	function procCommunicationDeleteMessage()
 	{
 		// Check login information
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new BaseObject(-1, 'msg_not_logged');
 		}
@@ -322,7 +322,7 @@ 
 
 		// Check the variable
 		$message_srl = Context::get('message_srl');
-		if(!$message_srl)
+		if (!$message_srl)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -330,23 +330,23 @@ 
 		// Get the message
 		$oCommunicationModel = getModel('communication');
 		$message = $oCommunicationModel->getSelectedMessage($message_srl);
-		if(!$message)
+		if (!$message)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
 		// Check the grant
-		switch($message->message_type)
+		switch ($message->message_type)
 		{
 			case 'S':
-				if($message->sender_srl != $member_srl)
+				if ($message->sender_srl != $member_srl)
 				{
 					return new BaseObject(-1, 'msg_invalid_request');
 				}
 				break;
 
 			case 'R':
-				if($message->receiver_srl != $member_srl)
+				if ($message->receiver_srl != $member_srl)
 				{
 					return new BaseObject(-1, 'msg_invalid_request');
 				}
@@ -357,7 +357,7 @@ 
 		$args = new stdClass();
 		$args->message_srl = $message_srl;
 		$output = executeQuery('communication.deleteMessage', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -372,7 +372,7 @@ 
 	function procCommunicationDeleteMessages()
 	{
 		// Check login information
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new BaseObject(-1, 'msg_not_logged');
 		}
@@ -381,41 +381,41 @@ 
 		$member_srl = $logged_info->member_srl;
 
 		// check variables
-		if(!Context::get('message_srl_list'))
+		if (!Context::get('message_srl_list'))
 		{
 			return new BaseObject(-1, 'msg_cart_is_null');
 		}
 
 		$message_srl_list = Context::get('message_srl_list');
-		if(!is_array($message_srl_list))
+		if (!is_array($message_srl_list))
 		{
 			$message_srl_list = explode('|@|', trim($message_srl_list));
 		}
 
-		if(!count($message_srl_list))
+		if (!count($message_srl_list))
 		{
 			return new BaseObject(-1, 'msg_cart_is_null');
 		}
 
 		$message_type = Context::get('message_type');
-		if(!$message_type || !in_array($message_type, array('R', 'S', 'T')))
+		if (!$message_type || !in_array($message_type, array('R', 'S', 'T')))
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
 		$message_count = count($message_srl_list);
 		$target = array();
-		for($i = 0; $i < $message_count; $i++)
+		for ($i = 0; $i < $message_count; $i++)
 		{
 			$message_srl = (int) trim($message_srl_list[$i]);
-			if(!$message_srl)
+			if (!$message_srl)
 			{
 				continue;
 			}
 
 			$target[] = $message_srl;
 		}
-		if(!count($target))
+		if (!count($target))
 		{
 			return new BaseObject(-1, 'msg_cart_is_null');
 		}
@@ -425,7 +425,7 @@ 
 		$args->message_srls = implode(',', $target);
 		$args->message_type = $message_type;
 
-		if($message_type == 'S')
+		if ($message_type == 'S')
 		{
 			$args->sender_srl = $member_srl;
 		}
@@ -435,7 +435,7 @@ 
 		}
 
 		$output = executeQuery('communication.deleteMessages', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -453,7 +453,7 @@ 
 	function procCommunicationAddFriend()
 	{
 		// Check login information
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new BaseObject(-1, 'msg_not_logged');
 		}
@@ -461,7 +461,7 @@ 
 		$logged_info = Context::get('logged_info');
 
 		$target_srl = (int) trim(Context::get('target_srl'));
-		if(!$target_srl)
+		if (!$target_srl)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
@@ -474,7 +474,7 @@ 
 		$args->member_srl = $logged_info->member_srl;
 		$args->target_srl = $target_srl;
 		$output = executeQuery('communication.addFriend', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -482,7 +482,7 @@ 
 		$this->add('member_srl', $target_srl);
 		$this->setMessage('success_registed');
 
-		if(!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			global $lang;
 			htmlHeader();
@@ -501,7 +501,7 @@ 
 	function procCommunicationMoveFriend()
 	{
 		// Check login information
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new BaseObject(-1, 'msg_not_logged');
 		}
@@ -510,27 +510,27 @@ 
 
 		// Check variables
 		$friend_srl_list = Context::get('friend_srl_list');
-		if(!$friend_srl_list)
+		if (!$friend_srl_list)
 		{
 			return new BaseObject(-1, 'msg_cart_is_null');
 		}
 
-		if(!is_array($friend_srl_list))
+		if (!is_array($friend_srl_list))
 		{
 			$friend_srl_list = explode('|@|', $friend_srl_list);
 		}
 
-		if(!count($friend_srl_list))
+		if (!count($friend_srl_list))
 		{
 			return new BaseObject(-1, 'msg_cart_is_null');
 		}
 
 		$friend_count = count($friend_srl_list);
 		$target = array();
-		for($i = 0; $i < $friend_count; $i++)
+		for ($i = 0; $i < $friend_count; $i++)
 		{
 			$friend_srl = (int) trim($friend_srl_list[$i]);
-			if(!$friend_srl)
+			if (!$friend_srl)
 			{
 				continue;
 			}
@@ -538,7 +538,7 @@ 
 			$target[] = $friend_srl;
 		}
 
-		if(!count($target))
+		if (!count($target))
 		{
 			return new BaseObject(-1, 'msg_cart_is_null');
 		}
@@ -550,7 +550,7 @@ 
 		$args->friend_group_srl = Context::get('target_friend_group_srl');
 
 		$output = executeQuery('communication.moveFriend', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -568,7 +568,7 @@ 
 	function procCommunicationDeleteFriend()
 	{
 		// Check login information
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new BaseObject(-1, 'msg_not_logged');
 		}
@@ -579,12 +579,12 @@ 
 		// Check variables
 		$friend_srl_list = Context::get('friend_srl_list');
 
-		if(!is_array($friend_srl_list))
+		if (!is_array($friend_srl_list))
 		{
 			$friend_srl_list = explode('|@|', $friend_srl_list);
 		}
 
-		if(!count($friend_srl_list))
+		if (!count($friend_srl_list))
 		{
 			return new BaseObject(-1, 'msg_cart_is_null');
 		}
@@ -592,10 +592,10 @@ 
 		$friend_count = count($friend_srl_list);
 		$target = array();
 
-		for($i = 0; $i < $friend_count; $i++)
+		for ($i = 0; $i < $friend_count; $i++)
 		{
 			$friend_srl = (int) trim($friend_srl_list[$i]);
-			if(!$friend_srl)
+			if (!$friend_srl)
 			{
 				continue;
 			}
@@ -603,7 +603,7 @@ 
 			$target[] = $friend_srl;
 		}
 
-		if(!count($target))
+		if (!count($target))
 		{
 			return new BaseObject(-1, 'msg_cart_is_null');
 		}
@@ -613,7 +613,7 @@ 
 		$args->friend_srls = implode(',', $target);
 		$args->member_srl = $logged_info->member_srl;
 		$output = executeQuery('communication.deleteFriend', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -631,7 +631,7 @@ 
 	function procCommunicationAddFriendGroup()
 	{
 		// Check login information
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new BaseObject(-1, 'msg_not_logged');
 		}
@@ -645,13 +645,13 @@ 
 		$args->title = Context::get('title');
 		$args->title = htmlspecialchars($args->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 
-		if(!$args->title)
+		if (!$args->title)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
 		// modify if friend_group_srl exists.
-		if($args->friend_group_srl)
+		if ($args->friend_group_srl)
 		{
 			$output = executeQuery('communication.renameFriendGroup', $args);
 			$msg_code = 'success_updated';
@@ -663,9 +663,9 @@ 
 			$msg_code = 'success_registed';
 		}
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
-			if(!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
+			if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 			{
 				global $lang;
 				htmlHeader();
@@ -682,7 +682,7 @@ 
 		}
 		else
 		{
-			if(!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
+			if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 			{
 				global $lang;
 				htmlHeader();
@@ -707,7 +707,7 @@ 
 	function procCommunicationRenameFriendGroup()
 	{
 		// Check login information
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new BaseObject(-1, 'msg_not_logged');
 		}
@@ -721,13 +721,13 @@ 
 		$args->title = Context::get('title');
 		$args->title = htmlspecialchars($args->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 
-		if(!$args->title)
+		if (!$args->title)
 		{
 			return new BaseObject(-1, 'msg_invalid_request');
 		}
 
 		$output = executeQuery('communication.renameFriendGroup', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -742,7 +742,7 @@ 
 	function procCommunicationDeleteFriendGroup()
 	{
 		// Check login information
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new BaseObject(-1, 'msg_not_logged');
 		}
@@ -754,7 +754,7 @@ 
 		$args->friend_group_srl = Context::get('friend_group_srl');
 		$args->member_srl = $logged_info->member_srl;
 		$output = executeQuery('communication.deleteFriendGroup', $args);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}

Braces +7 added lines, -14 removed lines

@@ -110,8 +110,7 @@ 
 				{
 					return new BaseObject(-1, 'msg_allow_message_to_friend');
 				}
-			}
-			else if($receiver_member_info->allow_message == 'N')
+			} else if($receiver_member_info->allow_message == 'N')
 			{
 				return new BaseObject(-1, 'msg_disallow_message');
 			}
@@ -149,8 +148,7 @@ 
 				htmlFooter();
 				Context::close();
 				exit;
-			}
-			else
+			} else
 			{
 				$this->setMessage('success_sended');
 				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('','act', 'dispCommunicationMessages', 'message_type', 'S', 'receiver_srl', $receiver_srl, 'message_srl', '');
@@ -428,8 +426,7 @@ 
 		if($message_type == 'S')
 		{
 			$args->sender_srl = $member_srl;
-		}
-		else
+		} else
 		{
 			$args->receiver_srl = $member_srl;
 		}
@@ -656,8 +653,7 @@ 
 			$output = executeQuery('communication.renameFriendGroup', $args);
 			$msg_code = 'success_updated';
 			// add if not exists
-		}
-		else
+		} else
 		{
 			$output = executeQuery('communication.addFriendGroup', $args);
 			$msg_code = 'success_registed';
@@ -674,13 +670,11 @@ 
 				htmlFooter();
 				Context::close();
 				exit;
-			}
-			else
+			} else
 			{
 				return $output;
 			}
-		}
-		else
+		} else
 		{
 			if(!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 			{
@@ -692,8 +686,7 @@ 
 				htmlFooter();
 				Context::close();
 				exit;
-			}
-			else
+			} else
 			{
 				$this->setMessage($msg_code);
 			}

modules/trash/trash.admin.controller.php

Spacing +31 added lines, -31 removed lines

@@ -17,7 +17,7 @@ 
 	 */
 	function insertTrash($obj)
 	{
-		if(!Context::get('is_logged'))
+		if (!Context::get('is_logged'))
 		{
 			return new BaseObject(-1, 'msg_not_permitted');
 		}
@@ -27,8 +27,8 @@ 
 		$oTrashVO = new TrashVO();
 		$oTrashVO = &$obj;
 
-		if(!$oTrashVO->getTrashSrl()) $oTrashVO->setTrashSrl(getNextSequence());
-		if(!is_string($oTrashVO->getSerializedObject())) $oTrashVO->setSerializedObject(serialize($oTrashVO->getSerializedObject()));
+		if (!$oTrashVO->getTrashSrl()) $oTrashVO->setTrashSrl(getNextSequence());
+		if (!is_string($oTrashVO->getSerializedObject())) $oTrashVO->setSerializedObject(serialize($oTrashVO->getSerializedObject()));
 		$oTrashVO->setIpaddress($_SERVER['REMOTE_ADDR']);
 		$oTrashVO->setRemoverSrl($logged_info->member_srl);
 		$oTrashVO->setRegdate(date('YmdHis'));
@@ -49,17 +49,17 @@ 
 		$tmpTrashSrls = Context::get('cart');
 
 		$trashSrls = array();
-		if($isAll != 'true')
+		if ($isAll != 'true')
 		{
-			if(is_array($tmpTrashSrls)) $trashSrls = $tmpTrashSrls;
+			if (is_array($tmpTrashSrls)) $trashSrls = $tmpTrashSrls;
 			else $trashSrls = explode('|@|', $tmpTrashSrls);
 		}
 
 		//module relation data delete...
 		$output = $this->_relationDataDelete($isAll, $trashSrls);
-		if(!$output->toBool()) return new BaseObject(-1, $output->message);
+		if (!$output->toBool()) return new BaseObject(-1, $output->message);
 
-		if(!$this->_emptyTrash($trashSrls)) return new BaseObject(-1, $lang->fail_empty);
+		if (!$this->_emptyTrash($trashSrls)) return new BaseObject(-1, $lang->fail_empty);
 
 		$this->setMessage('success_deleted', 'info');
 
@@ -76,17 +76,17 @@ 
 	function _relationDataDelete($isAll, &$trashSrls)
 	{
 		$oTrashModel = getModel('trash');
-		if($isAll == 'true')
+		if ($isAll == 'true')
 		{
 			$output = $oTrashModel->getTrashAllList(array());
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return new BaseObject(-1, $output->message);
 			}
 
-			if(is_array($output->data))
+			if (is_array($output->data))
 			{
-				foreach($output->data as $value)
+				foreach ($output->data as $value)
 				{
 					$trashSrls[] = $value->getTrashSrl();
 				}
@@ -97,29 +97,29 @@ 
 			$args = new stdClass();
 			$args->trashSrl = $trashSrls;
 			$output = $oTrashModel->getTrashList($args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return new BaseObject(-1, $output->message);
 			}
 		}
 
-		if(is_array($output->data))
+		if (is_array($output->data))
 		{
-			foreach($output->data as $oTrashVO)
+			foreach ($output->data as $oTrashVO)
 			{
 				//class file check
 				$classPath = ModuleHandler::getModulePath($oTrashVO->getOriginModule());
-				if(!is_dir(FileHandler::getRealPath($classPath))) return new BaseObject(-1, 'not exist restore module directory');
+				if (!is_dir(FileHandler::getRealPath($classPath))) return new BaseObject(-1, 'not exist restore module directory');
 
 				$classFile = sprintf('%s%s.admin.controller.php', $classPath, $oTrashVO->getOriginModule());
 				$classFile = FileHandler::getRealPath($classFile);
-				if(!file_exists($classFile)) return new BaseObject(-1, 'not exist restore module class file');
+				if (!file_exists($classFile)) return new BaseObject(-1, 'not exist restore module class file');
 
 				$oAdminController = getAdminController($oTrashVO->getOriginModule());
-				if(!method_exists($oAdminController, 'emptyTrash')) return new BaseObject(-1, 'not exist restore method in module class file');
+				if (!method_exists($oAdminController, 'emptyTrash')) return new BaseObject(-1, 'not exist restore method in module class file');
 
 				$output2 = $oAdminController->emptyTrash($oTrashVO->getSerializedObject());
-				if(!$output2->toBool()) return new BaseObject(-1, $output2->message);
+				if (!$output2->toBool()) return new BaseObject(-1, $output2->message);
 			}
 		}
 		return new BaseObject(0, $lang->success_deleted);
@@ -134,33 +134,33 @@ 
 		global $lang;
 		$trashSrlList = Context::get('cart');
 
-		if(is_array($trashSrlList))
+		if (is_array($trashSrlList))
 		{
 			// begin transaction
 			$oDB = &DB::getInstance();
 			$oDB->begin();
 			// eache restore method call in each classfile
-			foreach($trashSrlList as $value)
+			foreach ($trashSrlList as $value)
 			{
 				$oTrashModel = getModel('trash');
 				$output = $oTrashModel->getTrash($value);
-				if(!$output->toBool()) return new BaseObject(-1, $output->message);
+				if (!$output->toBool()) return new BaseObject(-1, $output->message);
 
 				//class file check
 				$classPath = ModuleHandler::getModulePath($output->data->getOriginModule());
-				if(!is_dir(FileHandler::getRealPath($classPath))) return new BaseObject(-1, 'not exist restore module directory');
+				if (!is_dir(FileHandler::getRealPath($classPath))) return new BaseObject(-1, 'not exist restore module directory');
 
 				$classFile = sprintf('%s%s.admin.controller.php', $classPath, $output->data->getOriginModule());
 				$classFile = FileHandler::getRealPath($classFile);
-				if(!file_exists($classFile)) return new BaseObject(-1, 'not exist restore module class file');
+				if (!file_exists($classFile)) return new BaseObject(-1, 'not exist restore module class file');
 
 				$oAdminController = getAdminController($output->data->getOriginModule());
-				if(!method_exists($oAdminController, 'restoreTrash')) return new BaseObject(-1, 'not exist restore method in module class file');
+				if (!method_exists($oAdminController, 'restoreTrash')) return new BaseObject(-1, 'not exist restore method in module class file');
 
 				$originObject = unserialize($output->data->getSerializedObject());
 				$output = $oAdminController->restoreTrash($originObject);
 
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					$oDB->rollback();
 					return new BaseObject(-1, $output->message);
@@ -168,7 +168,7 @@ 
 			}
 
 			// restore object delete in trash box
-			if(!$this->_emptyTrash($trashSrlList)) {
+			if (!$this->_emptyTrash($trashSrlList)) {
 				$oDB->rollback();
 				return new BaseObject(-1, $lang->fail_empty);
 			}
@@ -187,11 +187,11 @@ 
 	 */
 	function procTrashAdminGetList()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if (!Context::get('is_logged')) return new BaseObject(-1, 'msg_not_permitted');
 		$trashSrls = Context::get('trash_srls');
-		if($trashSrls) $trashSrlList = explode(',', $trashSrls);
+		if ($trashSrls) $trashSrlList = explode(',', $trashSrls);
 
-		if(count($trashSrlList) > 0)
+		if (count($trashSrlList) > 0)
 		{
 			$oTrashModel = getModel('trash');
 			$args = new stdClass();
@@ -218,11 +218,11 @@ 
 	 */
 	function _emptyTrash($trashSrls)
 	{
-		if(!is_array($trashSrls)) return false;
+		if (!is_array($trashSrls)) return false;
 		$args = new stdClass();
 		$args->trashSrls = $trashSrls;
 		$output = executeQuery('trash.deleteTrash', $args);
-		if(!$output->toBool()) return false;
+		if (!$output->toBool()) return false;
 
 		return true;
 	}

Braces +55 added lines, -22 removed lines

@@ -27,8 +27,12 @@ 
 		$oTrashVO = new TrashVO();
 		$oTrashVO = &$obj;
 
-		if(!$oTrashVO->getTrashSrl()) $oTrashVO->setTrashSrl(getNextSequence());
-		if(!is_string($oTrashVO->getSerializedObject())) $oTrashVO->setSerializedObject(serialize($oTrashVO->getSerializedObject()));
+		if(!$oTrashVO->getTrashSrl()) {
+			$oTrashVO->setTrashSrl(getNextSequence());
+		}
+		if(!is_string($oTrashVO->getSerializedObject())) {
+			$oTrashVO->setSerializedObject(serialize($oTrashVO->getSerializedObject()));
+		}
 		$oTrashVO->setIpaddress($_SERVER['REMOTE_ADDR']);
 		$oTrashVO->setRemoverSrl($logged_info->member_srl);
 		$oTrashVO->setRegdate(date('YmdHis'));
@@ -51,15 +55,22 @@ 
 		$trashSrls = array();
 		if($isAll != 'true')
 		{
-			if(is_array($tmpTrashSrls)) $trashSrls = $tmpTrashSrls;
-			else $trashSrls = explode('|@|', $tmpTrashSrls);
+			if(is_array($tmpTrashSrls)) {
+				$trashSrls = $tmpTrashSrls;
+			} else {
+				$trashSrls = explode('|@|', $tmpTrashSrls);
+			}
 		}
 
 		//module relation data delete...
 		$output = $this->_relationDataDelete($isAll, $trashSrls);
-		if(!$output->toBool()) return new BaseObject(-1, $output->message);
+		if(!$output->toBool()) {
+			return new BaseObject(-1, $output->message);
+		}
 
-		if(!$this->_emptyTrash($trashSrls)) return new BaseObject(-1, $lang->fail_empty);
+		if(!$this->_emptyTrash($trashSrls)) {
+			return new BaseObject(-1, $lang->fail_empty);
+		}
 
 		$this->setMessage('success_deleted', 'info');
 
@@ -91,8 +102,7 @@ 
 					$trashSrls[] = $value->getTrashSrl();
 				}
 			}
-		}
-		else
+		} else
 		{
 			$args = new stdClass();
 			$args->trashSrl = $trashSrls;
@@ -109,17 +119,25 @@ 
 			{
 				//class file check
 				$classPath = ModuleHandler::getModulePath($oTrashVO->getOriginModule());
-				if(!is_dir(FileHandler::getRealPath($classPath))) return new BaseObject(-1, 'not exist restore module directory');
+				if(!is_dir(FileHandler::getRealPath($classPath))) {
+					return new BaseObject(-1, 'not exist restore module directory');
+				}
 
 				$classFile = sprintf('%s%s.admin.controller.php', $classPath, $oTrashVO->getOriginModule());
 				$classFile = FileHandler::getRealPath($classFile);
-				if(!file_exists($classFile)) return new BaseObject(-1, 'not exist restore module class file');
+				if(!file_exists($classFile)) {
+					return new BaseObject(-1, 'not exist restore module class file');
+				}
 
 				$oAdminController = getAdminController($oTrashVO->getOriginModule());
-				if(!method_exists($oAdminController, 'emptyTrash')) return new BaseObject(-1, 'not exist restore method in module class file');
+				if(!method_exists($oAdminController, 'emptyTrash')) {
+					return new BaseObject(-1, 'not exist restore method in module class file');
+				}
 
 				$output2 = $oAdminController->emptyTrash($oTrashVO->getSerializedObject());
-				if(!$output2->toBool()) return new BaseObject(-1, $output2->message);
+				if(!$output2->toBool()) {
+					return new BaseObject(-1, $output2->message);
+				}
 			}
 		}
 		return new BaseObject(0, $lang->success_deleted);
@@ -144,18 +162,26 @@ 
 			{
 				$oTrashModel = getModel('trash');
 				$output = $oTrashModel->getTrash($value);
-				if(!$output->toBool()) return new BaseObject(-1, $output->message);
+				if(!$output->toBool()) {
+					return new BaseObject(-1, $output->message);
+				}
 
 				//class file check
 				$classPath = ModuleHandler::getModulePath($output->data->getOriginModule());
-				if(!is_dir(FileHandler::getRealPath($classPath))) return new BaseObject(-1, 'not exist restore module directory');
+				if(!is_dir(FileHandler::getRealPath($classPath))) {
+					return new BaseObject(-1, 'not exist restore module directory');
+				}
 
 				$classFile = sprintf('%s%s.admin.controller.php', $classPath, $output->data->getOriginModule());
 				$classFile = FileHandler::getRealPath($classFile);
-				if(!file_exists($classFile)) return new BaseObject(-1, 'not exist restore module class file');
+				if(!file_exists($classFile)) {
+					return new BaseObject(-1, 'not exist restore module class file');
+				}
 
 				$oAdminController = getAdminController($output->data->getOriginModule());
-				if(!method_exists($oAdminController, 'restoreTrash')) return new BaseObject(-1, 'not exist restore method in module class file');
+				if(!method_exists($oAdminController, 'restoreTrash')) {
+					return new BaseObject(-1, 'not exist restore method in module class file');
+				}
 
 				$originObject = unserialize($output->data->getSerializedObject());
 				$output = $oAdminController->restoreTrash($originObject);
@@ -187,9 +213,13 @@ 
 	 */
 	function procTrashAdminGetList()
 	{
-		if(!Context::get('is_logged')) return new BaseObject(-1,'msg_not_permitted');
+		if(!Context::get('is_logged')) {
+			return new BaseObject(-1,'msg_not_permitted');
+		}
 		$trashSrls = Context::get('trash_srls');
-		if($trashSrls) $trashSrlList = explode(',', $trashSrls);
+		if($trashSrls) {
+			$trashSrlList = explode(',', $trashSrls);
+		}
 
 		if(count($trashSrlList) > 0)
 		{
@@ -198,8 +228,7 @@ 
 			$args->trashSrl = $trashSrlList;
 			$output = $oTrashModel->getTrashList($args);
 			$trashList = $output->data;
-		}
-		else
+		} else
 		{
 			global $lang;
 			$trashList = array();
@@ -218,11 +247,15 @@ 
 	 */
 	function _emptyTrash($trashSrls)
 	{
-		if(!is_array($trashSrls)) return false;
+		if(!is_array($trashSrls)) {
+			return false;
+		}
 		$args = new stdClass();
 		$args->trashSrls = $trashSrls;
 		$output = executeQuery('trash.deleteTrash', $args);
-		if(!$output->toBool()) return false;
+		if(!$output->toBool()) {
+			return false;
+		}
 
 		return true;
 	}