xpressengine / xe-core

modules/spamfilter/spamfilter.model.php

Spacing +21 added lines, -21 removed lines

@@ -31,10 +31,10 @@ 
 	{
 		$args = new stdClass();
 		$args->sort_index = "regdate";
-		$args->page = Context::get('page')?Context::get('page'):1;
+		$args->page = Context::get('page') ?Context::get('page') : 1;
 		$output = executeQuery('spamfilter.getDeniedIPList', $args);
-		if(!$output->data) return;
-		if(!is_array($output->data)) return array($output->data);
+		if (!$output->data) return;
+		if (!is_array($output->data)) return array($output->data);
 		return $output->data;
 	}
 
@@ -46,13 +46,13 @@ 
 		$ipaddress = $_SERVER['REMOTE_ADDR'];
 
 		$ip_list = $this->getDeniedIPList();
-		if(!count($ip_list)) return new BaseObject();
+		if (!count($ip_list)) return new BaseObject();
 
 		$count = count($ip_list);
-		for($i=0;$i<$count;$i++)
+		for ($i = 0; $i < $count; $i++)
 		{
-			$ip = str_replace('.', '\.', str_replace('*','(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)',$ip_list[$i]->ipaddress));
-			if(preg_match('/^'.$ip.'$/', $ipaddress, $matches)) return new BaseObject(-1,'msg_alert_registered_denied_ip');
+			$ip = str_replace('.', '\.', str_replace('*', '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)', $ip_list[$i]->ipaddress));
+			if (preg_match('/^'.$ip.'$/', $ipaddress, $matches)) return new BaseObject(-1, 'msg_alert_registered_denied_ip');
 		}
 
 		return new BaseObject();
@@ -66,8 +66,8 @@ 
 		$args = new stdClass();
 		$args->sort_index = "hit";
 		$output = executeQuery('spamfilter.getDeniedWordList', $args);
-		if(!$output->data) return;
-		if(!is_array($output->data)) return array($output->data);
+		if (!$output->data) return;
+		if (!is_array($output->data)) return array($output->data);
 		return $output->data;
 	}
 
@@ -77,17 +77,17 @@ 
 	function isDeniedWord($text)
 	{
 		$word_list = $this->getDeniedWordList();
-		if(!count($word_list)) return new BaseObject();
+		if (!count($word_list)) return new BaseObject();
 
 		$count = count($word_list);
-		for($i=0;$i<$count;$i++)
+		for ($i = 0; $i < $count; $i++)
 		{
 			$word = $word_list[$i]->word;
-			if(preg_match('/'.preg_quote($word,'/').'/is', $text))
+			if (preg_match('/'.preg_quote($word, '/').'/is', $text))
 			{
 				$args->word = $word;
 				$output = executeQuery('spamfilter.updateDeniedWordHit', $args);
-				return new BaseObject(-1,sprintf(Context::getLang('msg_alert_denied_word'), $word));
+				return new BaseObject(-1, sprintf(Context::getLang('msg_alert_denied_word'), $word));
 			}
 		}
 
@@ -101,7 +101,7 @@ 
 	{
 		$config = $this->getConfig();
 
-		if($config->limits != 'Y') return new BaseObject(); 
+		if ($config->limits != 'Y') return new BaseObject(); 
 		$limit_count = '3';
 		$interval = '10';
 
@@ -109,16 +109,16 @@ 
 
 		$ipaddress = $_SERVER['REMOTE_ADDR'];
 		// Ban the IP address if the interval is exceeded
-		if($count>=$limit_count)
+		if ($count >= $limit_count)
 		{
 			$oSpamFilterController = getController('spamfilter');
 			$oSpamFilterController->insertIP($ipaddress, 'AUTO-DENIED : Over limit');
 			return new BaseObject(-1, 'msg_alert_registered_denied_ip');
 		}
 		// If the number of limited posts is not reached, keep creating.
-		if($count)
+		if ($count)
 		{
-			if($isMessage)
+			if ($isMessage)
 			{
 				$message = sprintf(Context::getLang('msg_alert_limited_message_by_config'), $interval);
 			}
@@ -142,7 +142,7 @@ 
 	{
 		$oTrackbackModel = getModel('trackback');
 		$count = $oTrackbackModel->getTrackbackCountByIPAddress($document_srl, $_SERVER['REMOTE_ADDR']);
-		if($count>0) return new BaseObject(-1, 'msg_alert_trackback_denied');
+		if ($count > 0) return new BaseObject(-1, 'msg_alert_trackback_denied');
 
 		return new BaseObject();
 	}
@@ -150,12 +150,12 @@ 
 	/**
 	 * @brief Return the number of logs recorded within the interval for the specified IPaddress
 	 */
-	function getLogCount($time = 60, $ipaddress='')
+	function getLogCount($time = 60, $ipaddress = '')
 	{
-		if(!$ipaddress) $ipaddress = $_SERVER['REMOTE_ADDR'];
+		if (!$ipaddress) $ipaddress = $_SERVER['REMOTE_ADDR'];
 
 		$args->ipaddress = $ipaddress;
-		$args->regdate = date("YmdHis", $_SERVER['REQUEST_TIME']-$time);
+		$args->regdate = date("YmdHis", $_SERVER['REQUEST_TIME'] - $time);
 		$output = executeQuery('spamfilter.getLogCount', $args);
 		$count = $output->data->count;
 		return $count;

Braces +31 added lines, -12 removed lines

@@ -33,8 +33,12 @@ 
 		$args->sort_index = "regdate";
 		$args->page = Context::get('page')?Context::get('page'):1;
 		$output = executeQuery('spamfilter.getDeniedIPList', $args);
-		if(!$output->data) return;
-		if(!is_array($output->data)) return array($output->data);
+		if(!$output->data) {
+			return;
+		}
+		if(!is_array($output->data)) {
+			return array($output->data);
+		}
 		return $output->data;
 	}
 
@@ -46,13 +50,17 @@ 
 		$ipaddress = $_SERVER['REMOTE_ADDR'];
 
 		$ip_list = $this->getDeniedIPList();
-		if(!count($ip_list)) return new BaseObject();
+		if(!count($ip_list)) {
+			return new BaseObject();
+		}
 
 		$count = count($ip_list);
 		for($i=0;$i<$count;$i++)
 		{
 			$ip = str_replace('.', '\.', str_replace('*','(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)',$ip_list[$i]->ipaddress));
-			if(preg_match('/^'.$ip.'$/', $ipaddress, $matches)) return new BaseObject(-1,'msg_alert_registered_denied_ip');
+			if(preg_match('/^'.$ip.'$/', $ipaddress, $matches)) {
+				return new BaseObject(-1,'msg_alert_registered_denied_ip');
+			}
 		}
 
 		return new BaseObject();
@@ -66,8 +74,12 @@ 
 		$args = new stdClass();
 		$args->sort_index = "hit";
 		$output = executeQuery('spamfilter.getDeniedWordList', $args);
-		if(!$output->data) return;
-		if(!is_array($output->data)) return array($output->data);
+		if(!$output->data) {
+			return;
+		}
+		if(!is_array($output->data)) {
+			return array($output->data);
+		}
 		return $output->data;
 	}
 
@@ -77,7 +89,9 @@ 
 	function isDeniedWord($text)
 	{
 		$word_list = $this->getDeniedWordList();
-		if(!count($word_list)) return new BaseObject();
+		if(!count($word_list)) {
+			return new BaseObject();
+		}
 
 		$count = count($word_list);
 		for($i=0;$i<$count;$i++)
@@ -101,7 +115,9 @@ 
 	{
 		$config = $this->getConfig();
 
-		if($config->limits != 'Y') return new BaseObject(); 
+		if($config->limits != 'Y') {
+			return new BaseObject();
+		}
 		$limit_count = '3';
 		$interval = '10';
 
@@ -121,8 +137,7 @@ 
 			if($isMessage)
 			{
 				$message = sprintf(Context::getLang('msg_alert_limited_message_by_config'), $interval);
-			}
-			else
+			} else
 			{
 				$message = sprintf(Context::getLang('msg_alert_limited_by_config'), $interval);
 			}
@@ -142,7 +157,9 @@ 
 	{
 		$oTrackbackModel = getModel('trackback');
 		$count = $oTrackbackModel->getTrackbackCountByIPAddress($document_srl, $_SERVER['REMOTE_ADDR']);
-		if($count>0) return new BaseObject(-1, 'msg_alert_trackback_denied');
+		if($count>0) {
+			return new BaseObject(-1, 'msg_alert_trackback_denied');
+		}
 
 		return new BaseObject();
 	}
@@ -152,7 +169,9 @@ 
 	 */
 	function getLogCount($time = 60, $ipaddress='')
 	{
-		if(!$ipaddress) $ipaddress = $_SERVER['REMOTE_ADDR'];
+		if(!$ipaddress) {
+			$ipaddress = $_SERVER['REMOTE_ADDR'];
+		}
 
 		$args->ipaddress = $ipaddress;
 		$args->regdate = date("YmdHis", $_SERVER['REQUEST_TIME']-$time);

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/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;
 	}

modules/trash/trash.admin.view.php

Spacing +11 added lines, -11 removed lines

@@ -17,7 +17,7 @@ 
 	function init()
 	{
 		// 템플릿 경로 지정 (board의 경우 tpl에 관리자용 템플릿 모아놓음)
-		$template_path = sprintf("%stpl/",$this->module_path);
+		$template_path = sprintf("%stpl/", $this->module_path);
 		$this->setTemplatePath($template_path);
 	}
 
@@ -51,20 +51,20 @@ 
 		$oModuleModel = getModel('module');
 		$module_list = array();
 		$mod_srls = array();
-		foreach($output->data as $oTrashVO)
+		foreach ($output->data as $oTrashVO)
 		{
 			$mod_srls[] = $oTrashVO->unserializedObject['module_srl'];
 		}
 		$mod_srls = array_unique($mod_srls);
 		// Module List
 		$mod_srls_count = count($mod_srls);
-		if($mod_srls_count)
+		if ($mod_srls_count)
 		{
 			$columnList = array('module_srl', 'mid', 'browser_title');
 			$module_output = $oModuleModel->getModulesInfo($mod_srls, $columnList);
-			if($module_output && is_array($module_output))
+			if ($module_output && is_array($module_output))
 			{
-				foreach($module_output as $module)
+				foreach ($module_output as $module)
 				{
 					$module_list[$module->module_srl] = $module;
 				}
@@ -86,13 +86,13 @@ 
 
 		$oTrashModel = getModel('trash');
 		$output = $oTrashModel->getTrash($trash_srl);
-		if(!$output->data->getTrashSrl()) return new BaseObject(-1, 'msg_invalid_request');
+		if (!$output->data->getTrashSrl()) return new BaseObject(-1, 'msg_invalid_request');
 
 		$originObject = unserialize($output->data->getSerializedObject());
-		if(is_array($originObject)) $originObject = (object)$originObject;
+		if (is_array($originObject)) $originObject = (object) $originObject;
 
-		Context::set('oTrashVO',$output->data);
-		Context::set('oOrigin',$originObject);
+		Context::set('oTrashVO', $output->data);
+		Context::set('oOrigin', $originObject);
 
 		$oMemberModel = &getModel('member');
 		$remover_info = $oMemberModel->getMemberInfoByMemberSrl($output->data->getRemoverSrl());
@@ -102,11 +102,11 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($originObject->module_srl);
 		Context::set('module_info', $module_info);
 
-		if($originObject) {
+		if ($originObject) {
 			$args_extra->module_srl = $originObject->module_srl;
 			$args_extra->document_srl = $originObject->document_srl;
 			$output_extra = executeQueryArray('trash.getDocumentExtraVars', $args_extra);				
-			Context::set('oOriginExtraVars',$output_extra->data);
+			Context::set('oOriginExtraVars', $output_extra->data);
 		}
 		$this->setTemplateFile('trash_view');
 	}

Braces +6 added lines, -2 removed lines

@@ -86,10 +86,14 @@
 
 		$oTrashModel = getModel('trash');
 		$output = $oTrashModel->getTrash($trash_srl);
-		if(!$output->data->getTrashSrl()) return new BaseObject(-1, 'msg_invalid_request');
+		if(!$output->data->getTrashSrl()) {
+			return new BaseObject(-1, 'msg_invalid_request');
+		}
 
 		$originObject = unserialize($output->data->getSerializedObject());
-		if(is_array($originObject)) $originObject = (object)$originObject;
+		if(is_array($originObject)) {
+			$originObject = (object)$originObject;
+		}
 
 		Context::set('oTrashVO',$output->data);
 		Context::set('oOrigin',$originObject);

modules/trash/trash.class.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 		//$oDB = &DB::getInstance();
 		//$oModuleModel = getModel('module');
 
-		return new BaseObject(0,'success_updated');
+		return new BaseObject(0, 'success_updated');
 	}
 }
 /* End of file trash.class.php */

classes/cache/CacheMemcache.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	 *
 	 * Do not use this directly. You can use getInstance() instead.
 	 * @param string $url url of memcache
-	 * @return void
+	 * @return false|null
 	 */
 	function CacheMemcache($url)
 	{

Spacing +14 added lines, -14 removed lines

@@ -23,7 +23,7 @@ 
 	 */
 	function getInstance($url)
 	{
-		if(!$GLOBALS['__CacheMemcache__'])
+		if (!$GLOBALS['__CacheMemcache__'])
 		{
 			$GLOBALS['__CacheMemcache__'] = new CacheMemcache($url);
 		}
@@ -41,12 +41,12 @@ 
 	{
 		//$config['url'] = array('memcache://localhost:11211');
 		$config['url'] = is_array($url) ? $url : array($url);
-		if(class_exists('Memcached'))
+		if (class_exists('Memcached'))
 		{
 			$this->Memcache = new Memcached;
 			$this->SelectedExtension = 'Memcached';
 		}
-		elseif(class_exists('Memcache'))
+		elseif (class_exists('Memcache'))
 		{
 			$this->Memcache = new Memcache;
 			$this->SelectedExtension = 'Memcache';
@@ -56,7 +56,7 @@ 
 			return false;
 		}
 
-		foreach($config['url'] as $url)
+		foreach ($config['url'] as $url)
 		{
 			$info = parse_url($url);
 			$this->Memcache->addServer($info['host'], $info['port']);
@@ -70,15 +70,15 @@ 
 	 */
 	function isSupport()
 	{
-		if(isset($GLOBALS['XE_MEMCACHE_SUPPORT']))
+		if (isset($GLOBALS['XE_MEMCACHE_SUPPORT']))
 		{
 			return $GLOBALS['XE_MEMCACHE_SUPPORT'];
 		}
-		if($this->SelectedExtension === 'Memcached')
+		if ($this->SelectedExtension === 'Memcached')
 		{
 			return $GLOBALS['XE_MEMCACHE_SUPPORT'] = $this->Memcache->set('xe', 'xe', 1); 
 		}
-		elseif($this->SelectedExtension === 'Memcache')
+		elseif ($this->SelectedExtension === 'Memcache')
 		{
 			return $GLOBALS['XE_MEMCACHE_SUPPORT'] = $this->Memcache->set('xe', 'xe', MEMCACHE_COMPRESSED, 1); 
 		}
@@ -96,7 +96,7 @@ 
 	 */
 	function getKey($key)
 	{
-		return md5(_XE_PATH_ . $key);
+		return md5(_XE_PATH_.$key);
 	}
 
 	/**
@@ -118,11 +118,11 @@ 
 	 */
 	function put($key, $buff, $valid_time = 0)
 	{
-		if($valid_time == 0)
+		if ($valid_time == 0)
 		{
 			$valid_time = $this->valid_time;
 		}
-		if($this->SelectedExtension === 'Memcached')
+		if ($this->SelectedExtension === 'Memcached')
 		{
 			return $this->Memcache->set($this->getKey($key), array($_SERVER['REQUEST_TIME'], $buff), $valid_time);
 		}
@@ -145,13 +145,13 @@ 
 		$_key = $this->getKey($key);
 
 		$obj = $this->Memcache->get($_key);
-		if(!$obj || !is_array($obj))
+		if (!$obj || !is_array($obj))
 		{
 			return false;
 		}
 		unset($obj[1]);
 
-		if($modified_time > 0 && $modified_time > $obj[0])
+		if ($modified_time > 0 && $modified_time > $obj[0])
 		{
 			$this->_delete($_key);
 			return false;
@@ -174,12 +174,12 @@ 
 	{
 		$_key = $this->getKey($key);
 		$obj = $this->Memcache->get($_key);
-		if(!$obj || !is_array($obj))
+		if (!$obj || !is_array($obj))
 		{
 			return false;
 		}
 
-		if($modified_time > 0 && $modified_time > $obj[0])
+		if ($modified_time > 0 && $modified_time > $obj[0])
 		{
 			$this->_delete($_key);
 			return false;

Braces +5 added lines, -10 removed lines

@@ -45,13 +45,11 @@ 
 		{
 			$this->Memcache = new Memcached;
 			$this->SelectedExtension = 'Memcached';
-		}
-		elseif(class_exists('Memcache'))
+		} elseif(class_exists('Memcache'))
 		{
 			$this->Memcache = new Memcache;
 			$this->SelectedExtension = 'Memcache';
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -77,12 +75,10 @@ 
 		if($this->SelectedExtension === 'Memcached')
 		{
 			return $GLOBALS['XE_MEMCACHE_SUPPORT'] = $this->Memcache->set('xe', 'xe', 1); 
-		}
-		elseif($this->SelectedExtension === 'Memcache')
+		} elseif($this->SelectedExtension === 'Memcache')
 		{
 			return $GLOBALS['XE_MEMCACHE_SUPPORT'] = $this->Memcache->set('xe', 'xe', MEMCACHE_COMPRESSED, 1); 
-		}
-		else
+		} else
 		{
 			return $GLOBALS['XE_MEMCACHE_SUPPORT'] = false;
 		}
@@ -125,8 +121,7 @@ 
 		if($this->SelectedExtension === 'Memcached')
 		{
 			return $this->Memcache->set($this->getKey($key), array($_SERVER['REQUEST_TIME'], $buff), $valid_time);
-		}
-		else
+		} else
 		{
 			return $this->Memcache->set($this->getKey($key), array($_SERVER['REQUEST_TIME'], $buff), MEMCACHE_COMPRESSED, $valid_time);
 		}

modules/addon/addon.class.php

Spacing +10 added lines, -10 removed lines

@@ -37,19 +37,19 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
-			if(!$oDB->isColumnExists("addons", "is_used_m"))
+			if (!$oDB->isColumnExists("addons", "is_used_m"))
 			{
 				return TRUE;
 			}
-			if(!$oDB->isColumnExists("addons_site", "is_used_m"))
+			if (!$oDB->isColumnExists("addons_site", "is_used_m"))
 			{
 				return TRUE;
 			}
 
 			// 2011. 7. 29. add is_fixed column
-			if(!$oDB->isColumnExists('addons', 'is_fixed'))
+			if (!$oDB->isColumnExists('addons', 'is_fixed'))
 			{
 				return TRUE;
 			}
@@ -72,27 +72,27 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
-			if(!$oDB->isColumnExists("addons", "is_used_m"))
+			if (!$oDB->isColumnExists("addons", "is_used_m"))
 			{
 				$oDB->addColumn("addons", "is_used_m", "char", 1, "N", TRUE);
 			}
-			if(!$oDB->isColumnExists("addons_site", "is_used_m"))
+			if (!$oDB->isColumnExists("addons_site", "is_used_m"))
 			{
 				$oDB->addColumn("addons_site", "is_used_m", "char", 1, "N", TRUE);
 			}
 
 			// 2011. 7. 29. add is_fixed column
-			if(!$oDB->isColumnExists('addons', 'is_fixed'))
+			if (!$oDB->isColumnExists('addons', 'is_fixed'))
 			{
 				$oDB->addColumn('addons', 'is_fixed', 'char', 1, 'N', TRUE);
 
 				// move addon info to addon_site table
 				$output = executeQueryArray('addon.getAddons');
-				if($output->data)
+				if ($output->data)
 				{
-					foreach($output->data as $row)
+					foreach ($output->data as $row)
 					{
 						$args = new stdClass();
 						$args->site_srl = 0;