xpressengine / xe-core

modules/addon/addon.admin.view.php

Spacing +6 added lines, -6 removed lines

@@ -34,7 +34,7 @@ 
 		$security = new Security($addon_list);
 		$addon_list = $security->encodeHTML('..', '..author..');
 
-		foreach($addon_list as $no => $addon_info)
+		foreach ($addon_list as $no => $addon_info)
 		{
 			$addon_list[$no]->description = nl2br(trim($addon_info->description));
 		}
@@ -64,21 +64,21 @@ 
 		$oModuleAdminModel = getAdminModel('module');
 
 		$args = new stdClass();
-		if($site_module_info->site_srl)
+		if ($site_module_info->site_srl)
 		{
 			$args->site_srl = $site_module_info->site_srl;
 		}
 		$columnList = array('module_srl', 'module_category_srl', 'mid', 'browser_title');
 		$mid_list = $oModuleModel->getMidList($args, $columnList);
 		// module_category and module combination
-		if(!$site_module_info->site_srl)
+		if (!$site_module_info->site_srl)
 		{
 			// Get a list of module categories
 			$module_categories = $oModuleModel->getModuleCategories();
 
-			if(is_array($mid_list))
+			if (is_array($mid_list))
 			{
-				foreach($mid_list as $module_srl => $module)
+				foreach ($mid_list as $module_srl => $module)
 				{
 					$module_categories[$module->module_category_srl]->list[$module_srl] = $module;
 				}
@@ -96,7 +96,7 @@ 
 		// Template specifies the path and file
 		$this->setTemplateFile('setup_addon');
 
-		if(Context::get('module') != 'admin')
+		if (Context::get('module') != 'admin')
 		{
 			$this->setLayoutPath('./common/tpl');
 			$this->setLayoutFile('popup_layout');

Braces +1 added lines, -2 removed lines

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

modules/addon/addon.class.php

Spacing +8 added lines, -8 removed lines

@@ -38,17 +38,17 @@ 
 	function checkUpdate()
 	{
 		$oDB = DB::getInstance();
-		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;
 		}
@@ -64,25 +64,25 @@ 
 	function moduleUpdate()
 	{
 		$oDB = DB::getInstance();
-		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;

modules/addon/addon.controller.php

Spacing +12 added lines, -12 removed lines

@@ -26,7 +26,7 @@ 
 	function getCacheFilePath($type = "pc")
 	{
 		static $addon_file;
-		if(isset($addon_file))
+		if (isset($addon_file))
 		{
 			return $addon_file;
 		}
@@ -37,7 +37,7 @@ 
 		$addon_path = _XE_PATH_ . 'files/cache/addons/';
 		$addon_file = $addon_path . $site_srl . $type . '.acivated_addons.cache.php';
 
-		if($this->addon_file_called)
+		if ($this->addon_file_called)
 		{
 			return $addon_file;
 		}
@@ -46,7 +46,7 @@ 
 
 		FileHandler::makeDir($addon_path);
 
-		if(!file_exists($addon_file))
+		if (!file_exists($addon_file))
 		{
 			$this->makeCacheFile($site_srl, $type);
 		}
@@ -82,9 +82,9 @@ 
 		$buff = array('<?php if(!defined("__XE__")) exit();', '$_m = Context::get(\'mid\');');
 		$oAddonModel = getAdminModel('addon');
 		$addon_list = $oAddonModel->getInsertedAddons($site_srl, $gtype);
-		foreach($addon_list as $addon => $val)
+		foreach ($addon_list as $addon => $val)
 		{
-			if($val->addon == "smartphone"
+			if ($val->addon == "smartphone"
 				|| ($type == "pc" && $val->is_used != 'Y') 
 				|| ($type == "mobile" && $val->is_used_m != 'Y') 
 				|| ($gtype == 'global' && $val->is_fixed != 'Y')
@@ -95,7 +95,7 @@ 
 
 			$extra_vars = unserialize($val->extra_vars);
 			$mid_list = $extra_vars->mid_list;
-			if(!is_array($mid_list) || count($mid_list) < 1)
+			if (!is_array($mid_list) || count($mid_list) < 1)
 			{
 				$mid_list = NULL;
 			}
@@ -103,9 +103,9 @@ 
 			$buff[] = '$before_time = microtime(true);';
 			$buff[] = '$rm = \'' . $extra_vars->xe_run_method . "';";
 			$buff[] = '$ml = array(';
-			if($mid_list)
+			if ($mid_list)
 			{
-				foreach($mid_list as $mid)
+				foreach ($mid_list as $mid)
 				{
 					$buff[] = "'$mid' => 1,";
 				}
@@ -113,7 +113,7 @@ 
 			$buff[] = ');';
 			$buff[] = sprintf('$addon_file = \'./addons/%s/%s.addon.php\';', $addon, $addon);
 
-			if($val->extra_vars)
+			if ($val->extra_vars)
 			{
 				unset($extra_vars);
 				$extra_vars = base64_encode($val->extra_vars);
@@ -152,7 +152,7 @@ 
 	 */
 	function doSetup($addon, $extra_vars, $site_srl = 0, $gtype = 'site')
 	{
-		if(!is_array($extra_vars->mid_list))
+		if (!is_array($extra_vars->mid_list))
 		{
 			unset($extra_vars->mid_list);
 		}
@@ -160,7 +160,7 @@ 
 		$args = new stdClass();
 		$args->addon = $addon;
 		$args->extra_vars = serialize($extra_vars);
-		if($gtype == 'global')
+		if ($gtype == 'global')
 		{
 			return executeQuery('addon.updateAddon', $args);
 		}
@@ -178,7 +178,7 @@ 
 	{
 		$addon_path = _XE_PATH_ . 'files/cache/addons/';
 		$addon_file = $addon_path . $site_srl . '.acivated_addons.cache.php';
-		if(file_exists($addon_file))
+		if (file_exists($addon_file))
 		{
 			FileHandler::removeFile($addon_file);
 		}

modules/admin/admin.admin.view.php

Spacing +69 added lines, -69 removed lines

@@ -28,7 +28,7 @@ 
 	{
 		$db_info = Context::getDBInfo();
 
-		if(strpos($db_info->default_url, 'xn--') !== FALSE)
+		if (strpos($db_info->default_url, 'xn--') !== FALSE)
 		{
 			$xe_default_url = Context::decodeIdna($db_info->default_url);
 		}
@@ -48,7 +48,7 @@ 
 		// forbit access if the user is not an administrator
 		$oMemberModel = getModel('member');
 		$logged_info = $oMemberModel->getLoggedInfo();
-		if($logged_info->is_admin != 'Y')
+		if ($logged_info->is_admin != 'Y')
 		{
 			return $this->stop("msg_is_not_administrator");
 		}
@@ -74,11 +74,11 @@ 
 		Context::set('use_db_session', $db_info->use_db_session == 'N' ? 'N' : 'Y');
 		Context::set('use_mobile_view', $db_info->use_mobile_view == 'Y' ? 'Y' : 'N');
 		Context::set('use_ssl', $db_info->use_ssl ? $db_info->use_ssl : "none");
-		if($db_info->http_port)
+		if ($db_info->http_port)
 		{
 			Context::set('http_port', $db_info->http_port);
 		}
-		if($db_info->https_port)
+		if ($db_info->https_port)
 		{
 			Context::set('https_port', $db_info->https_port);
 		}
@@ -94,7 +94,7 @@ 
 	function checkEasyinstall()
 	{
 		$lastTime = (int) FileHandler::readFile($this->easyinstallCheckFile);
-		if($lastTime > $_SERVER['REQUEST_TIME'] - 60 * 60 * 24 * 30)
+		if ($lastTime > $_SERVER['REQUEST_TIME'] - 60 * 60 * 24 * 30)
 		{
 			return;
 		}
@@ -108,14 +108,14 @@ 
 		$lUpdateDoc = $xml_lUpdate->parse($buff);
 		$updateDate = $lUpdateDoc->response->updatedate->body;
 
-		if(!$updateDate)
+		if (!$updateDate)
 		{
 			$this->_markingCheckEasyinstall();
 			return;
 		}
 
 		$item = $oAutoinstallModel->getLatestPackage();
-		if(!$item || $item->updatedate < $updateDate)
+		if (!$item || $item->updatedate < $updateDate)
 		{
 			$oController = getAdminController('autoinstall');
 			$oController->_updateinfo();
@@ -144,7 +144,7 @@ 
 
 		// Check is_shortcut column
 		$oDB = DB::getInstance();
-		if(!$oDB->isColumnExists('menu_item', 'is_shortcut'))
+		if (!$oDB->isColumnExists('menu_item', 'is_shortcut'))
 		{
 			return;
 		}
@@ -162,9 +162,9 @@ 
 		$currentAct = Context::get('act');
 		$subMenuTitle = '';
 
-		foreach((array) $moduleActionInfo->menu as $key => $value)
+		foreach ((array) $moduleActionInfo->menu as $key => $value)
 		{
-			if(isset($value->acts) && is_array($value->acts) && in_array($currentAct, $value->acts))
+			if (isset($value->acts) && is_array($value->acts) && in_array($currentAct, $value->acts))
 			{
 				$subMenuTitle = $value->title;
 				break;
@@ -173,21 +173,21 @@ 
 		// get current menu's srl(=parentSrl)
 		$parentSrl = 0;
 		$oMenuAdminConroller = getAdminController('menu');
-		foreach((array) $menu->list as $parentKey => $parentMenu)
+		foreach ((array) $menu->list as $parentKey => $parentMenu)
 		{
-			if(!is_array($parentMenu['list']) || !count($parentMenu['list']))
+			if (!is_array($parentMenu['list']) || !count($parentMenu['list']))
 			{
 				continue;
 			}
-			if($parentMenu['href'] == '#' && count($parentMenu['list']))
+			if ($parentMenu['href'] == '#' && count($parentMenu['list']))
 			{
 				$firstChild = current($parentMenu['list']);
 				$menu->list[$parentKey]['href'] = $firstChild['href'];
 			}
 
-			foreach($parentMenu['list'] as $childKey => $childMenu)
+			foreach ($parentMenu['list'] as $childKey => $childMenu)
 			{
-				if($subMenuTitle == $childMenu['text'] && $parentSrl == 0)
+				if ($subMenuTitle == $childMenu['text'] && $parentSrl == 0)
 				{
 					$parentSrl = $childMenu['parent_srl'];
 				}
@@ -211,7 +211,7 @@ 
 		// move from index method, because use in admin footer
 		$newest_news_url = sprintf("http://news.xpressengine.com/%s/news.php?version=%s&package=%s", _XE_LOCATION_, __XE_VERSION__, _XE_PACKAGE_);
 		$cache_file = sprintf("%sfiles/cache/newest_news.%s.cache.php", _XE_PATH_, _XE_LOCATION_);
-		if(!file_exists($cache_file) || filemtime($cache_file) + 60 * 60 < $_SERVER['REQUEST_TIME'])
+		if (!file_exists($cache_file) || filemtime($cache_file) + 60 * 60 < $_SERVER['REQUEST_TIME'])
 		{
 			// Considering if data cannot be retrieved due to network problem, modify filemtime to prevent trying to reload again when refreshing administration page
 			// Ensure to access the administration page even though news cannot be displayed
@@ -219,20 +219,20 @@ 
 			FileHandler::getRemoteFile($newest_news_url, $cache_file, null, 1, 'GET', 'text/html', array('REQUESTURL' => getFullUrl('')));
 		}
 
-		if(file_exists($cache_file))
+		if (file_exists($cache_file))
 		{
 			$oXml = new XmlParser();
 			$buff = $oXml->parse(FileHandler::readFile($cache_file));
 
 			$item = $buff->zbxe_news->item;
-			if($item)
+			if ($item)
 			{
-				if(!is_array($item))
+				if (!is_array($item))
 				{
 					$item = array($item);
 				}
 
-				foreach($item as $key => $val)
+				foreach ($item as $key => $val)
 				{
 					$obj = new stdClass();
 					$obj->title = $val->body;
@@ -241,7 +241,7 @@ 
 					$news[] = $obj;
 				}
 				Context::set('news', $news);
-				if(isset($news) && is_array($news))
+				if (isset($news) && is_array($news))
 				{
 					Context::set('latestVersion', array_shift($news));
 				}
@@ -264,7 +264,7 @@ 
 	function dispAdminIndex()
 	{
 		$db_info = Context::getDBInfo();
-		Context::set('db_info',$db_info);
+		Context::set('db_info', $db_info);
 
 		// Get statistics
 		$args = new stdClass();
@@ -301,9 +301,9 @@ 
 		$args = new stdClass();
 		$args->list_count = 5;
 		$output = $oCommentModel->getNewestCommentList($args, $columnList);
-		if(is_array($output))
+		if (is_array($output))
 		{
-			foreach($output AS $key => $value)
+			foreach ($output AS $key => $value)
 			{
 				$value->content = strip_tags($value->content);
 			}
@@ -314,17 +314,17 @@ 
 		// Get list of modules
 		$oModuleModel = getModel('module');
 		$module_list = $oModuleModel->getModuleList();
-		if(is_array($module_list))
+		if (is_array($module_list))
 		{
 			$needUpdate = FALSE;
 			$addTables = FALSE;
-			foreach($module_list AS $key => $value)
+			foreach ($module_list AS $key => $value)
 			{
-				if($value->need_install)
+				if ($value->need_install)
 				{
 					$addTables = TRUE;
 				}
-				if($value->need_update)
+				if ($value->need_update)
 				{
 					$needUpdate = TRUE;
 				}
@@ -335,12 +335,12 @@ 
 		$oAutoinstallAdminModel = getAdminModel('autoinstall');
 		$needUpdateList = $oAutoinstallAdminModel->getNeedUpdateList();
 
-		if(is_array($needUpdateList))
+		if (is_array($needUpdateList))
 		{
-			foreach($needUpdateList AS $key => $value)
+			foreach ($needUpdateList AS $key => $value)
 			{
 				$helpUrl = './admin/help/index.html#';
-				switch($value->type)
+				switch ($value->type)
 				{
 					case 'addon':
 						$helpUrl .= 'UMAN_terminology_addon';
@@ -367,8 +367,8 @@ 
 
 		$site_module_info = Context::get('site_module_info');
 		$oAddonAdminModel = getAdminModel('addon');
-		$counterAddonActivated = $oAddonAdminModel->isActivatedAddon('counter', $site_module_info->site_srl );
-		if(!$counterAddonActivated)
+		$counterAddonActivated = $oAddonAdminModel->isActivatedAddon('counter', $site_module_info->site_srl);
+		if (!$counterAddonActivated)
 		{
 			$columnList = array('member_srl', 'nick_name', 'user_name', 'user_id', 'email_address');
 			$args = new stdClass;
@@ -393,7 +393,7 @@ 
 		$mainVersion = join('.', array_slice(explode('.', __XE_VERSION__), 0, 2));
 		$path = FileHandler::getRealPath('./files/env/' . $mainVersion);
 		$isEnviromentGatheringAgreement = FALSE;
-		if(file_exists($path))
+		if (file_exists($path))
 		{
 			$isEnviromentGatheringAgreement = TRUE;
 		}
@@ -403,7 +403,7 @@ 
 		$isLicenseAgreement = FALSE;
 		$path = FileHandler::getRealPath('./files/env/license_agreement');
 		$isLicenseAgreement = FALSE;
-		if(file_exists($path))
+		if (file_exists($path))
 		{
 			$isLicenseAgreement = TRUE;
 		}
@@ -425,7 +425,7 @@ 
 
 		Context::set('selected_lang', $db_info->lang_type);
 
-		if(strpos($db_info->default_url, 'xn--') !== FALSE)
+		if (strpos($db_info->default_url, 'xn--') !== FALSE)
 		{
 			$db_info->default_url = Context::decodeIdna($db_info->default_url);
 		}
@@ -434,9 +434,9 @@ 
 
 		// site lock
 		Context::set('IP', $_SERVER['REMOTE_ADDR']);
-		if(!$db_info->sitelock_title) $db_info->sitelock_title = 'Maintenance in progress...';
-		if(!in_array('127.0.0.1', $db_info->sitelock_whitelist)) $db_info->sitelock_whitelist[] = '127.0.0.1';
-		if(!in_array($_SERVER['REMOTE_ADDR'], $db_info->sitelock_whitelist)) $db_info->sitelock_whitelist[] = $_SERVER['REMOTE_ADDR'];
+		if (!$db_info->sitelock_title) $db_info->sitelock_title = 'Maintenance in progress...';
+		if (!in_array('127.0.0.1', $db_info->sitelock_whitelist)) $db_info->sitelock_whitelist[] = '127.0.0.1';
+		if (!in_array($_SERVER['REMOTE_ADDR'], $db_info->sitelock_whitelist)) $db_info->sitelock_whitelist[] = $_SERVER['REMOTE_ADDR'];
 		$db_info->sitelock_whitelist = array_unique($db_info->sitelock_whitelist);
 		Context::set('remote_addr', $_SERVER['REMOTE_ADDR']);
 		Context::set('use_sitelock', $db_info->use_sitelock);
@@ -447,7 +447,7 @@ 
 		Context::set('sitelock_whitelist', $whitelist);
 
 
-		if($db_info->admin_ip_list) $admin_ip_list = implode("\r\n", $db_info->admin_ip_list);
+		if ($db_info->admin_ip_list) $admin_ip_list = implode("\r\n", $db_info->admin_ip_list);
 		else $admin_ip_list = '';
 		Context::set('admin_ip_list', $admin_ip_list);
 
@@ -456,8 +456,8 @@ 
 		$oAdminModel = getAdminModel('admin');
 		$favicon_url = $oAdminModel->getFaviconUrl();
 		$mobicon_url = $oAdminModel->getMobileIconUrl();
-		Context::set('favicon_url', $favicon_url.'?'.$_SERVER['REQUEST_TIME']);
-		Context::set('mobicon_url', $mobicon_url.'?'.$_SERVER['REQUEST_TIME']);
+		Context::set('favicon_url', $favicon_url . '?' . $_SERVER['REQUEST_TIME']);
+		Context::set('mobicon_url', $mobicon_url . '?' . $_SERVER['REQUEST_TIME']);
 
 		$oDocumentModel = getModel('document');
 		$config = $oDocumentModel->getDocumentConfig();
@@ -529,7 +529,7 @@ 
 	 */
 	function showSendEnv()
 	{
-		if(Context::getResponseMethod() != 'HTML')
+		if (Context::getResponseMethod() != 'HTML')
 		{
 			return;
 		}
@@ -539,7 +539,7 @@ 
 		$install_env = $path . 'install';
 		$mainVersion = join('.', array_slice(explode('.', __XE_VERSION__), 0, 2));
 
-		if(file_exists(FileHandler::getRealPath($install_env)))
+		if (file_exists(FileHandler::getRealPath($install_env)))
 		{
 			$oAdminAdminModel = getAdminModel('admin');
 			$params = $oAdminAdminModel->getEnv('INSTALL');
@@ -548,9 +548,9 @@ 
 
 			FileHandler::writeFile($path . $mainVersion, '1');
 		}
-		else if(isset($_SESSION['enviroment_gather']) && !file_exists(FileHandler::getRealPath($path . $mainVersion)))
+		else if (isset($_SESSION['enviroment_gather']) && !file_exists(FileHandler::getRealPath($path . $mainVersion)))
 		{
-			if($_SESSION['enviroment_gather'] == 'Y')
+			if ($_SESSION['enviroment_gather'] == 'Y')
 			{
 				$oAdminAdminModel = getAdminModel('admin');
 				$params = $oAdminAdminModel->getEnv();
@@ -576,64 +576,64 @@ 
 		$tmp = explode("&", $envInfo);
 		$arrInfo = array();
 		$xe_check_env = array();
-		foreach($tmp as $value) {
+		foreach ($tmp as $value) {
 			$arr = explode("=", $value);
-			if($arr[0]=="type") {
+			if ($arr[0] == "type") {
 				continue;
-			}elseif($arr[0]=="phpext" ) {
+			}elseif ($arr[0] == "phpext") {
 				$str = urldecode($arr[1]);
-				$xe_check_env[$arr[0]]= str_replace("|", ", ", $str);
-			} elseif($arr[0]=="module" ) {
+				$xe_check_env[$arr[0]] = str_replace("|", ", ", $str);
+			} elseif ($arr[0] == "module") {
 				$str = urldecode($arr[1]);
 				$arrModuleName = explode("|", $str);
 				$oModuleModel = getModel("module");
 				$mInfo = array();
-				foreach($arrModuleName as $moduleName) {
+				foreach ($arrModuleName as $moduleName) {
 					$moduleInfo = $oModuleModel->getModuleInfoXml($moduleName);
 					$mInfo[] = "{$moduleName}({$moduleInfo->version})";
 				}
-				$xe_check_env[$arr[0]]= join(", ", $mInfo);
-			} elseif($arr[0]=="addon") {
+				$xe_check_env[$arr[0]] = join(", ", $mInfo);
+			} elseif ($arr[0] == "addon") {
 				$str = urldecode($arr[1]);
 				$arrAddonName = explode("|", $str);
 				$oAddonModel = getAdminModel("addon");
 				$mInfo = array();
-				foreach($arrAddonName as $addonName) {
+				foreach ($arrAddonName as $addonName) {
 					$addonInfo = $oAddonModel->getAddonInfoXml($addonName);
 					$mInfo[] = "{$addonName}({$addonInfo->version})";
 				}
-				$xe_check_env[$arr[0]]= join(", ", $mInfo);
-			} elseif($arr[0]=="widget") {
+				$xe_check_env[$arr[0]] = join(", ", $mInfo);
+			} elseif ($arr[0] == "widget") {
 				$str = urldecode($arr[1]);
 				$arrWidgetName = explode("|", $str);
 				$oWidgetModel = getModel("widget");
 				$mInfo = array();
-				foreach($arrWidgetName as $widgetName) {
+				foreach ($arrWidgetName as $widgetName) {
 					$widgetInfo = $oWidgetModel->getWidgetInfo($widgetName);
 					$mInfo[] = "{$widgetName}({$widgetInfo->version})";
 				}
-				$xe_check_env[$arr[0]]= join(", ", $mInfo);
-			} elseif($arr[0]=="widgetstyle") {
+				$xe_check_env[$arr[0]] = join(", ", $mInfo);
+			} elseif ($arr[0] == "widgetstyle") {
 				$str = urldecode($arr[1]);
 				$arrWidgetstyleName = explode("|", $str);
 				$oWidgetModel = getModel("widget");
 				$mInfo = array();
-				foreach($arrWidgetstyleName as $widgetstyleName) {
+				foreach ($arrWidgetstyleName as $widgetstyleName) {
 					$widgetstyleInfo = $oWidgetModel->getWidgetStyleInfo($widgetstyleName);
 					$mInfo[] = "{$widgetstyleName}({$widgetstyleInfo->version})";
 				}
-				$xe_check_env[$arr[0]]= join(", ", $mInfo);
+				$xe_check_env[$arr[0]] = join(", ", $mInfo);
 
-			} elseif($arr[0]=="layout") {
+			} elseif ($arr[0] == "layout") {
 				$str = urldecode($arr[1]);
 				$arrLayoutName = explode("|", $str);
 				$oLayoutModel = getModel("layout");
 				$mInfo = array();
-				foreach($arrLayoutName as $layoutName) {
+				foreach ($arrLayoutName as $layoutName) {
 					$layoutInfo = $oLayoutModel->getLayoutInfo($layoutName);
 					$mInfo[] = "{$layoutName}({$layoutInfo->version})";
 				}
-				$xe_check_env[$arr[0]]= join(", ", $mInfo);
+				$xe_check_env[$arr[0]] = join(", ", $mInfo);
 			} else {
 				$xe_check_env[$arr[0]] = urldecode($arr[1]);
 			}
@@ -648,14 +648,14 @@ 
 		$info['PHP_Core'] = $php_core;
 
 		$str_info = "[XE Server Environment " . date("Y-m-d") . "]\n\n";
-		$str_info .= "realpath : ".realpath('./')."\n";
-		foreach( $info as $key=>$value )
+		$str_info .= "realpath : " . realpath('./') . "\n";
+		foreach ($info as $key=>$value)
 		{
-			if( is_array( $value ) == false ) {
+			if (is_array($value) == false) {
 				$str_info .= "{$key} : {$value}\n";
 			} else {
 				//$str_info .= "\n{$key} \n";
-				foreach( $value as $key2=>$value2 )
+				foreach ($value as $key2=>$value2)
 					$str_info .= "{$key2} : {$value2}\n";
 			}
 		}

Braces +20 added lines, -12 removed lines

@@ -31,8 +31,7 @@ 
 		if(strpos($db_info->default_url, 'xn--') !== FALSE)
 		{
 			$xe_default_url = Context::decodeIdna($db_info->default_url);
-		}
-		else
+		} else
 		{
 			$xe_default_url = $db_info->default_url;
 		}
@@ -434,9 +433,15 @@ 
 
 		// site lock
 		Context::set('IP', $_SERVER['REMOTE_ADDR']);
-		if(!$db_info->sitelock_title) $db_info->sitelock_title = 'Maintenance in progress...';
-		if(!in_array('127.0.0.1', $db_info->sitelock_whitelist)) $db_info->sitelock_whitelist[] = '127.0.0.1';
-		if(!in_array($_SERVER['REMOTE_ADDR'], $db_info->sitelock_whitelist)) $db_info->sitelock_whitelist[] = $_SERVER['REMOTE_ADDR'];
+		if(!$db_info->sitelock_title) {
+			$db_info->sitelock_title = 'Maintenance in progress...';
+		}
+		if(!in_array('127.0.0.1', $db_info->sitelock_whitelist)) {
+			$db_info->sitelock_whitelist[] = '127.0.0.1';
+		}
+		if(!in_array($_SERVER['REMOTE_ADDR'], $db_info->sitelock_whitelist)) {
+			$db_info->sitelock_whitelist[] = $_SERVER['REMOTE_ADDR'];
+		}
 		$db_info->sitelock_whitelist = array_unique($db_info->sitelock_whitelist);
 		Context::set('remote_addr', $_SERVER['REMOTE_ADDR']);
 		Context::set('use_sitelock', $db_info->use_sitelock);
@@ -447,8 +452,11 @@ 
 		Context::set('sitelock_whitelist', $whitelist);
 
 
-		if($db_info->admin_ip_list) $admin_ip_list = implode("\r\n", $db_info->admin_ip_list);
-		else $admin_ip_list = '';
+		if($db_info->admin_ip_list) {
+			$admin_ip_list = implode("\r\n", $db_info->admin_ip_list);
+		} else {
+			$admin_ip_list = '';
+		}
 		Context::set('admin_ip_list', $admin_ip_list);
 
 		Context::set('lang_selected', Context::loadLangSelected());
@@ -547,8 +555,7 @@ 
 			Context::addHtmlFooter($img);
 
 			FileHandler::writeFile($path . $mainVersion, '1');
-		}
-		else if(isset($_SESSION['enviroment_gather']) && !file_exists(FileHandler::getRealPath($path . $mainVersion)))
+		} else if(isset($_SESSION['enviroment_gather']) && !file_exists(FileHandler::getRealPath($path . $mainVersion)))
 		{
 			if($_SESSION['enviroment_gather'] == 'Y')
 			{
@@ -580,7 +587,7 @@ 
 			$arr = explode("=", $value);
 			if($arr[0]=="type") {
 				continue;
-			}elseif($arr[0]=="phpext" ) {
+			} elseif($arr[0]=="phpext" ) {
 				$str = urldecode($arr[1]);
 				$xe_check_env[$arr[0]]= str_replace("|", ", ", $str);
 			} elseif($arr[0]=="module" ) {
@@ -655,8 +662,9 @@ 
 				$str_info .= "{$key} : {$value}\n";
 			} else {
 				//$str_info .= "\n{$key} \n";
-				foreach( $value as $key2=>$value2 )
-					$str_info .= "{$key2} : {$value2}\n";
+				foreach( $value as $key2=>$value2 ) {
+									$str_info .= "{$key2} : {$value2}\n";
+				}
 			}
 		}
 

Doc Comments +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 	/**
 	 * Initialization
-	 * @return void
+	 * @return ModuleObject|null
 	 */
 	function init()
 	{

Indentation +1 added lines, -1 removed lines

@@ -1284,7 +1284,7 @@
 	/**
 	 * Delete cached group data
 	 * @return void
-	*/
+	 */
 	function _deleteMemberGroupCache($site_srl = 0)
 	{
 		//remove from cache

modules/admin/admin.class.php

Spacing +29 added lines, -29 removed lines

@@ -34,7 +34,7 @@ 
 	function checkUpdate()
 	{
 		$oDB = DB::getInstance();
-		if(!$oDB->isColumnExists("admin_favorite", "type"))
+		if (!$oDB->isColumnExists("admin_favorite", "type"))
 		{
 			return TRUE;
 		}
@@ -49,7 +49,7 @@ 
 	function moduleUpdate()
 	{
 		$oDB = DB::getInstance();
-		if(!$oDB->isColumnExists("admin_favorite", "type"))
+		if (!$oDB->isColumnExists("admin_favorite", "type"))
 		{
 			$oAdminAdminModel = getAdminModel('admin');
 			$output = $oAdminAdminModel->getFavoriteList();
@@ -58,11 +58,11 @@ 
 			$oDB->dropColumn('admin_favorite', 'admin_favorite_srl');
 			$oDB->addColumn('admin_favorite', "admin_favorite_srl", "number", 11, 0);
 			$oDB->addColumn('admin_favorite', "type", "varchar", 30, 'module');
-			if(is_array($favoriteList))
+			if (is_array($favoriteList))
 			{
 				$oAdminAdminController = getAdminController('admin');
 				$oAdminAdminController->_deleteAllFavorite();
-				foreach($favoriteList AS $key => $value)
+				foreach ($favoriteList AS $key => $value)
 				{
 					$oAdminAdminController->_insertFavorite($value->site_srl, $value->module);
 				}
@@ -83,19 +83,19 @@ 
 	public function checkAdminMenu()
 	{
 		// for admin menu
-		if(Context::isInstalled())
+		if (Context::isInstalled())
 		{
 			$oMenuAdminModel = getAdminModel('menu');
 			$output = $oMenuAdminModel->getMenuByTitle($this->adminMenuName);
 
-			if(!$output->menu_srl)
+			if (!$output->menu_srl)
 			{
 				$this->createXeAdminMenu();
 				$output = $oMenuAdminModel->getMenuByTitle($this->adminMenuName);
 			}
 			else
 			{
-				if(!is_readable(FileHandler::getRealPath($output->php_file)))
+				if (!is_readable(FileHandler::getRealPath($output->php_file)))
 				{
 					$oMenuAdminController = getAdminController('menu');
 					$oMenuAdminController->makeXmlFile($output->menu_srl);
@@ -130,14 +130,14 @@ 
 
 		// gnb item create
 		$gnbList = array('dashboard', 'menu', 'user', 'content', 'configuration', 'advanced');
-		foreach($gnbList AS $key => $value)
+		foreach ($gnbList AS $key => $value)
 		{
 			//insert menu item
 			$args = new stdClass();
 			$args->menu_srl = $menuSrl;
 			$args->menu_item_srl = getNextSequence();
 			$args->name = '{$lang->menu_gnb[\'' . $value . '\']}';
-			if($value == 'dashboard')
+			if ($value == 'dashboard')
 			{
 				$args->url = 'index.php?module=admin';
 			}
@@ -152,9 +152,9 @@ 
 		$oMenuAdminModel = getAdminModel('menu');
 		$columnList = array('menu_item_srl', 'name');
 		$output = $oMenuAdminModel->getMenuItems($menuSrl, 0, $columnList);
-		if(is_array($output->data))
+		if (is_array($output->data))
 		{
-			foreach($output->data AS $key => $value)
+			foreach ($output->data AS $key => $value)
 			{
 				preg_match('/\{\$lang->menu_gnb\[(.*?)\]\}/i', $value->name, $m);
 				$gnbDBList[$m[1]] = $value->menu_item_srl;
@@ -265,12 +265,12 @@ 
 		$args->group_srls = $adminGroupSrl;
 		$oModuleModel = getModel('module');
 
-		foreach($gnbModuleList AS $key => $value)
+		foreach ($gnbModuleList AS $key => $value)
 		{
-			if(is_array($value['subMenu']))
+			if (is_array($value['subMenu']))
 			{
 				$moduleActionInfo = $oModuleModel->getModuleActionXml($value['module']);
-				foreach($value['subMenu'] AS $key2 => $value2)
+				foreach ($value['subMenu'] AS $key2 => $value2)
 				{
 					$gnbKey = "'" . $this->_getGnbKey($value2) . "'";
 
@@ -299,7 +299,7 @@ 
 	 */
 	function _getGnbKey($menuName)
 	{
-		switch($menuName)
+		switch ($menuName)
 		{
 			case 'siteMap':
 			case 'siteDesign':
@@ -348,7 +348,7 @@ 
 	 */
 	function _getOldGnbKey($menuName)
 	{
-		switch($menuName)
+		switch ($menuName)
 		{
 			case 'siteMap':
 				return 'menu';
@@ -398,9 +398,9 @@ 
 		$newAdminmenuSrl = $output->menu_srl;
 		$output = $oMenuAdminModel->getMenuItems($newAdminmenuSrl, 0);
 		$newAdminParentMenuList = array();
-		if(is_array($output->data))
+		if (is_array($output->data))
 		{
-			foreach($output->data AS $key => $value)
+			foreach ($output->data AS $key => $value)
 			{
 				$tmp = explode('\'', $value->name);
 				$newAdminParentMenuList[$tmp[1]] = $value;
@@ -413,15 +413,15 @@ 
 		$menuSrl = $output->menu_srl;
 
 		$oMenuAdminController = getAdminController('menu');
-		if($menuSrl)
+		if ($menuSrl)
 		{
 			$output = $oMenuAdminModel->getMenuItems($menuSrl);
-			if(is_array($output->data))
+			if (is_array($output->data))
 			{
 				$parentMenu = array();
-				foreach($output->data AS $key => $menuItem)
+				foreach ($output->data AS $key => $menuItem)
 				{
-					if($menuItem->parent_srl == 0)
+					if ($menuItem->parent_srl == 0)
 					{
 						$tmp = explode('\'', $menuItem->name);
 						$parentMenuKey = $tmp[1];
@@ -430,15 +430,15 @@ 
 				}
 
 				$isUserAddedMenuMoved = FALSE;
-				foreach($output->data AS $key => $menuItem)
+				foreach ($output->data AS $key => $menuItem)
 				{
-					if($menuItem->parent_srl != 0)
+					if ($menuItem->parent_srl != 0)
 					{
 						$tmp = explode('\'', $menuItem->name);
 						$menuKey = $tmp[1];
 
 						$result = $this->_getOldGnbKey($menuKey);
-						if($result == 'user_added_menu')
+						if ($result == 'user_added_menu')
 						{
 							// theme menu use not anymore
 							/* if($parentMenu[$menuItem->parent_srl] == 'theme')
@@ -446,7 +446,7 @@ 
 							  $newParentItem = $newAdminParentMenuList['menu'];
 							  }
 							  else */
-							if($parentMenu[$menuItem->parent_srl] == 'extensions')
+							if ($parentMenu[$menuItem->parent_srl] == 'extensions')
 							{
 								$newParentItem = $newAdminParentMenuList['advanced'];
 							}
@@ -463,7 +463,7 @@ 
 					}
 				}
 
-				if($isUserAddedMenuMoved)
+				if ($isUserAddedMenuMoved)
 				{
 					$oMenuAdminController->makeXmlFile($newAdminmenuSrl);
 				}
@@ -472,9 +472,9 @@ 
 
 		// all old admin menu delete
 		$output = $oMenuAdminModel->getMenuListByTitle('__XE_ADMIN__');
-		if(is_array($output))
+		if (is_array($output))
 		{
-			foreach($output AS $key=>$value)
+			foreach ($output AS $key=>$value)
 			{
 				$oMenuAdminController->deleteMenu($value->menu_srl);
 			}

Braces +3 added lines, -6 removed lines

@@ -92,8 +92,7 @@ 
 			{
 				$this->createXeAdminMenu();
 				$output = $oMenuAdminModel->getMenuByTitle($this->adminMenuName);
-			}
-			else
+			} else
 			{
 				if(!is_readable(FileHandler::getRealPath($output->php_file)))
 				{
@@ -140,8 +139,7 @@ 
 			if($value == 'dashboard')
 			{
 				$args->url = 'index.php?module=admin';
-			}
-			else
+			} else
 			{
 				$args->url = '#';
 			}
@@ -449,8 +447,7 @@ 
 							if($parentMenu[$menuItem->parent_srl] == 'extensions')
 							{
 								$newParentItem = $newAdminParentMenuList['advanced'];
-							}
-							else
+							} else
 							{
 								$newParentItem = $newAdminParentMenuList[$parentMenu[$menuItem->parent_srl]];
 							}

modules/autoinstall/autoinstall.class.php

Spacing +14 added lines, -14 removed lines

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

modules/autoinstall/autoinstall.lib.php

Spacing +88 added lines, -88 removed lines

@@ -78,17 +78,17 @@ 
 	{
 		$oModel = getModel('autoinstall');
 		$type = $oModel->getTypeFromPath($this->package->path);
-		if($type == "module")
+		if ($type == "module")
 		{
 			$output = $this->uninstallModule();
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return $output;
 			}
 		}
 
 		$output = $this->_connect();
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -116,7 +116,7 @@ 
 	 */
 	function _download()
 	{
-		if($this->package->path == ".")
+		if ($this->package->path == ".")
 		{
 			$this->download_file = $this->temp_dir . "xe.tar";
 			$this->target_path = "";
@@ -152,17 +152,17 @@ 
 		$path_array = explode("/", $this->package->path);
 		$target_name = array_pop($path_array);
 		$oModule = getModule($target_name, "class");
-		if(!$oModule)
+		if (!$oModule)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
-		if(!method_exists($oModule, "moduleUninstall"))
+		if (!method_exists($oModule, "moduleUninstall"))
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
 
 		$output = $oModule->moduleUninstall();
-		if(is_subclass_of($output, 'Object') && !$output->toBool())
+		if (is_subclass_of($output, 'Object') && !$output->toBool())
 		{
 			return $output;
 		}
@@ -170,9 +170,9 @@ 
 		$schema_dir = sprintf('%s/schemas/', $this->package->path);
 		$schema_files = FileHandler::readDir($schema_dir);
 		$oDB = DB::getInstance();
-		if(is_array($schema_files))
+		if (is_array($schema_files))
 		{
-			foreach($schema_files as $file)
+			foreach ($schema_files as $file)
 			{
 				$filename_arr = explode(".", $file);
 				$filename = array_shift($filename_arr);
@@ -192,26 +192,26 @@ 
 	function installModule()
 	{
 		$path = $this->package->path;
-		if($path != ".")
+		if ($path != ".")
 		{
 			$path_array = explode("/", $path);
 			$target_name = array_pop($path_array);
 			$type = substr(array_pop($path_array), 0, -1);
 		}
 
-		if($type == "module")
+		if ($type == "module")
 		{
 			$oModuleModel = getModel('module');
 			$oInstallController = getController('install');
 			$module_path = ModuleHandler::getModulePath($target_name);
-			if($oModuleModel->checkNeedInstall($target_name))
+			if ($oModuleModel->checkNeedInstall($target_name))
 			{
 				$oInstallController->installModule($target_name, $module_path);
 			}
-			if($oModuleModel->checkNeedUpdate($target_name))
+			if ($oModuleModel->checkNeedUpdate($target_name))
 			{
 				$oModule = getModule($target_name, 'class');
-				if(method_exists($oModule, 'moduleUpdate'))
+				if (method_exists($oModule, 'moduleUpdate'))
 				{
 					$oModule->moduleUpdate();
 				}
@@ -231,7 +231,7 @@ 
 		$this->_download();
 		$file_list = $this->_unPack();
 		$output = $this->_copyDir($file_list);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			FileHandler::removeDir($this->temp_dir);
 			return $output;
@@ -256,9 +256,9 @@ 
 
 		$_files = $oTar->files;
 		$file_list = array();
-		if(is_array($_files))
+		if (is_array($_files))
 		{
-			foreach($_files as $key => $info)
+			foreach ($_files as $key => $info)
 			{
 				FileHandler::writeFile($this->download_path . "/" . $info['name'], $info['file']);
 				$file_list[] = $info['name'];
@@ -278,22 +278,22 @@ 
 		$real_path = FileHandler::getRealPath($path);
 		$oDir = dir($path);
 		$files = array();
-		while($file = $oDir->read())
+		while ($file = $oDir->read())
 		{
-			if($file == "." || $file == "..")
+			if ($file == "." || $file == "..")
 			{
 				continue;
 			}
 			$files[] = $file;
 		}
 
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
 			$file_path = $path . "/" . $file;
-			if(is_dir(FileHandler::getRealPath($file_path)))
+			if (is_dir(FileHandler::getRealPath($file_path)))
 			{
 				$output = $this->_removeDir($file_path);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					return $output;
 				}
@@ -301,7 +301,7 @@ 
 			else
 			{
 				$output = $this->_removeFile($file_path);
-				if(!$output->toBool())
+				if (!$output->toBool())
 				{
 					return $output;
 				}
@@ -357,17 +357,17 @@ 
 	 */
 	function _connect()
 	{
-		if(!function_exists('ssh2_connect'))
+		if (!function_exists('ssh2_connect'))
 		{
 			return new Object(-1, 'msg_sftp_not_supported');
 		}
 
-		if(!$this->ftp_info->ftp_user || !$this->ftp_info->sftp || $this->ftp_info->sftp != 'Y')
+		if (!$this->ftp_info->ftp_user || !$this->ftp_info->sftp || $this->ftp_info->sftp != 'Y')
 		{
 			return new Object(-1, 'msg_ftp_invalid_auth_info');
 		}
 
-		if($this->ftp_info->ftp_host)
+		if ($this->ftp_info->ftp_host)
 		{
 			$ftp_host = $this->ftp_info->ftp_host;
 		}
@@ -376,7 +376,7 @@ 
 			$ftp_host = "127.0.0.1";
 		}
 		$this->connection = ssh2_connect($ftp_host, $this->ftp_info->ftp_port);
-		if(!@ssh2_auth_password($this->connection, $this->ftp_info->ftp_user, $this->ftp_password))
+		if (!@ssh2_auth_password($this->connection, $this->ftp_info->ftp_user, $this->ftp_password))
 		{
 			return new Object(-1, 'msg_ftp_invalid_auth_info');
 		}
@@ -403,13 +403,13 @@ 
 	 */
 	function _removeFile($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
 		$target_path = $this->ftp_info->ftp_root_path . $path;
 
-		if(!@ssh2_sftp_unlink($this->sftp, $target_path))
+		if (!@ssh2_sftp_unlink($this->sftp, $target_path))
 		{
 			return new Object(-1, sprintf(Context::getLang('msg_delete_file_failed'), $path));
 		}
@@ -424,13 +424,13 @@ 
 	 */
 	function _removeDir_real($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
 		$target_path = $this->ftp_info->ftp_root_path . $path;
 
-		if(!@ssh2_sftp_rmdir($this->sftp, $target_path))
+		if (!@ssh2_sftp_rmdir($this->sftp, $target_path))
 		{
 			return new Object(-1, sprintf(Context::getLang('msg_delete_dir_failed'), $path));
 		}
@@ -445,31 +445,31 @@ 
 	 */
 	function _copyDir(&$file_list)
 	{
-		if(!$this->ftp_password)
+		if (!$this->ftp_password)
 		{
 			return new Object(-1, 'msg_ftp_password_input');
 		}
 
 		$output = $this->_connect();
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 		$target_dir = $this->ftp_info->ftp_root_path . $this->target_path;
 
-		if(is_array($file_list))
+		if (is_array($file_list))
 		{
-			foreach($file_list as $k => $file)
+			foreach ($file_list as $k => $file)
 			{
 				$org_file = $file;
-				if($this->package->path == ".")
+				if ($this->package->path == ".")
 				{
 					$file = substr($file, 3);
 				}
 				$path = FileHandler::getRealPath("./" . $this->target_path . "/" . $file);
 				$pathname = dirname($target_dir . "/" . $file);
 
-				if(!file_exists(FileHandler::getRealPath($real_path)))
+				if (!file_exists(FileHandler::getRealPath($real_path)))
 				{
 					ssh2_sftp_mkdir($this->sftp, $pathname, 0755, TRUE);
 				}
@@ -520,7 +520,7 @@ 
 	 */
 	function _connect()
 	{
-		if($this->ftp_info->ftp_host)
+		if ($this->ftp_info->ftp_host)
 		{
 			$ftp_host = $this->ftp_info->ftp_host;
 		}
@@ -530,20 +530,20 @@ 
 		}
 
 		$this->connection = ftp_connect($ftp_host, $this->ftp_info->ftp_port);
-		if(!$this->connection)
+		if (!$this->connection)
 		{
 			return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_host));
 		}
 
 		$login_result = @ftp_login($this->connection, $this->ftp_info->ftp_user, $this->ftp_password);
-		if(!$login_result)
+		if (!$login_result)
 		{
 			$this->_close();
 			return new Object(-1, 'msg_ftp_invalid_auth_info');
 		}
 
 		$_SESSION['ftp_password'] = $this->ftp_password;
-		if($this->ftp_info->ftp_pasv != "N")
+		if ($this->ftp_info->ftp_pasv != "N")
 		{
 			ftp_pasv($this->connection, TRUE);
 		}
@@ -558,13 +558,13 @@ 
 	 */
 	function _removeFile($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
 		$target_path = $this->ftp_info->ftp_root_path . $path;
 
-		if(!@ftp_delete($this->connection, $target_path))
+		if (!@ftp_delete($this->connection, $target_path))
 		{
 			return new Object(-1, "failed to delete file " . $path);
 		}
@@ -579,13 +579,13 @@ 
 	 */
 	function _removeDir_real($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
 		$target_path = $this->ftp_info->ftp_root_path . $path;
 
-		if(!@ftp_rmdir($this->connection, $target_path))
+		if (!@ftp_rmdir($this->connection, $target_path))
 		{
 			return new Object(-1, "failed to delete directory " . $path);
 		}
@@ -610,37 +610,37 @@ 
 	 */
 	function _copyDir(&$file_list)
 	{
-		if(!$this->ftp_password)
+		if (!$this->ftp_password)
 		{
 			return new Object(-1, 'msg_ftp_password_input');
 		}
 
 		$output = $this->_connect();
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
-		if(!$this->target_path)
+		if (!$this->target_path)
 		{
 			$this->target_path = '.';
 		}
-		if(substr($this->download_path, -1) == '/')
+		if (substr($this->download_path, -1) == '/')
 		{
 			$this->download_path = substr($this->download_path, 0, -1);
 		}
 		$target_dir = $this->ftp_info->ftp_root_path . $this->target_path;
 
-		if(is_array($file_list))
+		if (is_array($file_list))
 		{
-			foreach($file_list as $k => $file)
+			foreach ($file_list as $k => $file)
 			{
-				if(!$file)
+				if (!$file)
 				{
 					continue;
 				}
 				$org_file = $file;
-				if($this->package->path == ".")
+				if ($this->package->path == ".")
 				{
 					$file = substr($file, 3);
 				}
@@ -650,33 +650,33 @@ 
 				$real_path = "./";
 				$ftp_path = $this->ftp_info->ftp_root_path;
 
-				for($i = 0; $i < count($path_list); $i++)
+				for ($i = 0; $i < count($path_list); $i++)
 				{
-					if($path_list == "")
+					if ($path_list == "")
 					{
 						continue;
 					}
 					$real_path .= $path_list[$i] . "/";
 					$ftp_path .= $path_list[$i] . "/";
-					if(!file_exists(FileHandler::getRealPath($real_path)))
+					if (!file_exists(FileHandler::getRealPath($real_path)))
 					{
-						if(!@ftp_mkdir($this->connection, $ftp_path))
+						if (!@ftp_mkdir($this->connection, $ftp_path))
 						{
 							return new Object(-1, "msg_make_directory_failed");
 						}
 
-						if(strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')
+						if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN')
 						{
-							if(function_exists('ftp_chmod'))
+							if (function_exists('ftp_chmod'))
 							{
-								if(!ftp_chmod($this->connection, 0755, $ftp_path))
+								if (!ftp_chmod($this->connection, 0755, $ftp_path))
 								{
 									return new Object(-1, "msg_permission_adjust_failed");
 								}
 							}
 							else
 							{
-								if(!ftp_site($this->connection, "CHMOD 755 " . $ftp_path))
+								if (!ftp_site($this->connection, "CHMOD 755 " . $ftp_path))
 								{
 									return new Object(-1, "msg_permission_adjust_failed");
 								}
@@ -684,7 +684,7 @@ 
 						}
 					}
 				}
-				if(!ftp_put($this->connection, $target_dir . '/' . $file, FileHandler::getRealPath($this->download_path . "/" . $org_file), FTP_BINARY))
+				if (!ftp_put($this->connection, $target_dir . '/' . $file, FileHandler::getRealPath($this->download_path . "/" . $org_file), FTP_BINARY))
 				{
 					return new Object(-1, "msg_ftp_upload_failed");
 				}
@@ -733,7 +733,7 @@ 
 	 */
 	function _connect()
 	{
-		if($this->ftp_info->ftp_host)
+		if ($this->ftp_info->ftp_host)
 		{
 			$ftp_host = $this->ftp_info->ftp_host;
 		}
@@ -743,11 +743,11 @@ 
 		}
 
 		$this->oFtp = new ftp();
-		if(!$this->oFtp->ftp_connect($ftp_host, $this->ftp_info->ftp_port))
+		if (!$this->oFtp->ftp_connect($ftp_host, $this->ftp_info->ftp_port))
 		{
 			return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_host));
 		}
-		if(!$this->oFtp->ftp_login($this->ftp_info->ftp_user, $this->ftp_password))
+		if (!$this->oFtp->ftp_login($this->ftp_info->ftp_user, $this->ftp_password))
 		{
 			$this->_close();
 			return new Object(-1, 'msg_ftp_invalid_auth_info');
@@ -764,13 +764,13 @@ 
 	 */
 	function _removeFile($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
 		$target_path = $this->ftp_info->ftp_root_path . $path;
 
-		if(!$this->oFtp->ftp_delete($target_path))
+		if (!$this->oFtp->ftp_delete($target_path))
 		{
 			return new Object(-1, sprintf(Context::getLang('msg_delete_file_failed'), $path));
 		}
@@ -784,13 +784,13 @@ 
 	 */
 	function _removeDir_real($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
 		$target_path = $this->ftp_info->ftp_root_path . $path;
 
-		if(!$this->oFtp->ftp_rmdir($target_path))
+		if (!$this->oFtp->ftp_rmdir($target_path))
 		{
 			return new Object(-1, sprintf(Context::getLang('msg_delete_dir_failed'), $path));
 		}
@@ -815,13 +815,13 @@ 
 	 */
 	function _copyDir(&$file_list)
 	{
-		if(!$this->ftp_password)
+		if (!$this->ftp_password)
 		{
 			return new Object(-1, 'msg_ftp_password_input');
 		}
 
 		$output = $this->_connect();
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -829,12 +829,12 @@ 
 		$oFtp = &$this->oFtp;
 		$target_dir = $this->ftp_info->ftp_root_path . $this->target_path;
 
-		if(is_array($file_list))
+		if (is_array($file_list))
 		{
-			foreach($file_list as $k => $file)
+			foreach ($file_list as $k => $file)
 			{
 				$org_file = $file;
-				if($this->package->path == ".")
+				if ($this->package->path == ".")
 				{
 					$file = substr($file, 3);
 				}
@@ -844,15 +844,15 @@ 
 				$real_path = "./";
 				$ftp_path = $this->ftp_info->ftp_root_path;
 
-				for($i = 0; $i < count($path_list); $i++)
+				for ($i = 0; $i < count($path_list); $i++)
 				{
-					if($path_list == "")
+					if ($path_list == "")
 					{
 						continue;
 					}
 					$real_path .= $path_list[$i] . "/";
 					$ftp_path .= $path_list[$i] . "/";
-					if(!file_exists(FileHandler::getRealPath($real_path)))
+					if (!file_exists(FileHandler::getRealPath($real_path)))
 					{
 						$oFtp->ftp_mkdir($ftp_path);
 						$oFtp->ftp_site("CHMOD 755 " . $ftp_path);
@@ -903,13 +903,13 @@ 
 	 */
 	function _removeFile($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
 		$target_path = FileHandler::getRealPath($path);
 
-		if(!FileHandler::removeFile($target_path))
+		if (!FileHandler::removeFile($target_path))
 		{
 			return new Object(-1, sprintf(Context::getLang('msg_delete_file_failed'), $path));
 		}
@@ -923,7 +923,7 @@ 
 	 */
 	function _removeDir_real($path)
 	{
-		if(substr($path, 0, 2) == "./")
+		if (substr($path, 0, 2) == "./")
 		{
 			$path = substr($path, 2);
 		}
@@ -952,18 +952,18 @@ 
 	function _copyDir(&$file_list)
 	{
 		$output = $this->_connect();
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 		$target_dir = $this->target_path;
 
-		if(is_array($file_list))
+		if (is_array($file_list))
 		{
-			foreach($file_list as $k => $file)
+			foreach ($file_list as $k => $file)
 			{
 				$org_file = $file;
-				if($this->package->path == ".")
+				if ($this->package->path == ".")
 				{
 					$file = substr($file, 3);
 				}
@@ -971,19 +971,19 @@ 
 				$path_list = explode('/', dirname($this->target_path . "/" . $file));
 				$real_path = "./";
 
-				for($i = 0; $i < count($path_list); $i++)
+				for ($i = 0; $i < count($path_list); $i++)
 				{
-					if($path_list == "")
+					if ($path_list == "")
 					{
 						continue;
 					}
 					$real_path .= $path_list[$i] . "/";
-					if(!file_exists(FileHandler::getRealPath($real_path)))
+					if (!file_exists(FileHandler::getRealPath($real_path)))
 					{
 						FileHandler::makeDir($real_path);
 					}
 				}
-				FileHandler::copyFile( FileHandler::getRealPath($this->download_path . "/" . $org_file), FileHandler::getRealPath("./" . $target_dir . '/' . $file));
+				FileHandler::copyFile(FileHandler::getRealPath($this->download_path . "/" . $org_file), FileHandler::getRealPath("./" . $target_dir . '/' . $file));
 			}
 		}
 

Braces +6 added lines, -12 removed lines

@@ -121,8 +121,7 @@ 
 			$this->download_file = $this->temp_dir . "xe.tar";
 			$this->target_path = "";
 			$this->download_path = $this->temp_dir;
-		}
-		else
+		} else
 		{
 			$subpath = trim(substr($this->package->path, 2), '/');
 			$this->download_file = $this->temp_dir . $subpath . ".tar";
@@ -297,8 +296,7 @@ 
 				{
 					return $output;
 				}
-			}
-			else
+			} else
 			{
 				$output = $this->_removeFile($file_path);
 				if(!$output->toBool())
@@ -370,8 +368,7 @@ 
 		if($this->ftp_info->ftp_host)
 		{
 			$ftp_host = $this->ftp_info->ftp_host;
-		}
-		else
+		} else
 		{
 			$ftp_host = "127.0.0.1";
 		}
@@ -523,8 +520,7 @@ 
 		if($this->ftp_info->ftp_host)
 		{
 			$ftp_host = $this->ftp_info->ftp_host;
-		}
-		else
+		} else
 		{
 			$ftp_host = "127.0.0.1";
 		}
@@ -673,8 +669,7 @@ 
 								{
 									return new Object(-1, "msg_permission_adjust_failed");
 								}
-							}
-							else
+							} else
 							{
 								if(!ftp_site($this->connection, "CHMOD 755 " . $ftp_path))
 								{
@@ -736,8 +731,7 @@ 
 		if($this->ftp_info->ftp_host)
 		{
 			$ftp_host = $this->ftp_info->ftp_host;
-		}
-		else
+		} else
 		{
 			$ftp_host = "127.0.0.1";
 		}

modules/autoinstall/autoinstall.model.php

Spacing +37 added lines, -37 removed lines

@@ -19,7 +19,7 @@ 
 		$args = new stdClass();
 		$args->category_srl = $category_srl;
 		$output = executeQueryArray("autoinstall.getCategory", $args);
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return null;
 		}
@@ -34,7 +34,7 @@ 
 	function getPackages()
 	{
 		$output = executeQueryArray("autoinstall.getPackages");
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return array();
 		}
@@ -52,7 +52,7 @@ 
 		$args = new stdClass();
 		$args->package_srl = $package_srl;
 		$output = executeQueryArray("autoinstall.getInstalledPackage", $args);
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return null;
 		}
@@ -70,7 +70,7 @@ 
 		$args = new stdClass();
 		$args->package_srl = $package_srl;
 		$output = executeQueryArray("autoinstall.getPackage", $args);
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return null;
 		}
@@ -85,22 +85,22 @@ 
 	function getCategoryList()
 	{
 		$output = executeQueryArray("autoinstall.getCategories");
-		if(!$output->toBool() || !$output->data)
+		if (!$output->toBool() || !$output->data)
 		{
 			return array();
 		}
 
 		$categoryList = array();
-		foreach($output->data as $category)
+		foreach ($output->data as $category)
 		{
 			$category->children = array();
 			$categoryList[$category->category_srl] = $category;
 		}
 
 		$depth0 = array();
-		foreach($categoryList as $key => $category)
+		foreach ($categoryList as $key => $category)
 		{
-			if($category->parent_srl)
+			if ($category->parent_srl)
 			{
 				$categoryList[$category->parent_srl]->children[] = & $categoryList[$key];
 			}
@@ -110,7 +110,7 @@ 
 			}
 		}
 		$resultList = array();
-		foreach($depth0 as $category_srl)
+		foreach ($depth0 as $category_srl)
 		{
 			$this->setDepth($categoryList[$category_srl], 0, $categoryList, $resultList);
 		}
@@ -128,7 +128,7 @@ 
 		$args = new stdClass();
 		$args->category_srl = $category_srl;
 		$output = executeQuery("autoinstall.getPackageCount", $args);
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return 0;
 		}
@@ -143,7 +143,7 @@ 
 	function getInstalledPackageCount()
 	{
 		$output = executeQuery("autoinstall.getInstalledPackageCount");
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return 0;
 		}
@@ -164,11 +164,11 @@ 
 		$resultList[$item->category_srl] = &$item;
 		$item->depth = $depth;
 		$siblingList = $item->category_srl;
-		foreach($item->children as $child)
+		foreach ($item->children as $child)
 		{
 			$siblingList .= "," . $this->setDepth($list[$child->category_srl], $depth + 1, $list, $resultList);
 		}
-		if(count($item->children) < 1)
+		if (count($item->children) < 1)
 		{
 			$item->nPackages = $this->getPackageCount($item->category_srl);
 		}
@@ -184,7 +184,7 @@ 
 	function getLatestPackage()
 	{
 		$output = executeQueryArray("autoinstall.getLatestPackage");
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return null;
 		}
@@ -203,11 +203,11 @@ 
 		$args->package_list = $package_list;
 		$output = executeQueryArray("autoinstall.getInstalledPackages", $args);
 		$result = array();
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return $result;
 		}
-		foreach($output->data as $value)
+		foreach ($output->data as $value)
 		{
 			$result[$value->package_srl] = $value;
 		}
@@ -226,15 +226,15 @@ 
 		$args->page = $page;
 		$args->list_count = 10;
 		$args->page_count = 5;
-		if(Context::getDBType() == 'mssql')
+		if (Context::getDBType() == 'mssql')
 		{
 			$args->sort_index = 'package_srl';
 		}
 		$output = executeQueryArray("autoinstall.getInstalledPackageList", $args);
 		$res = array();
-		if($output->data)
+		if ($output->data)
 		{
-			foreach($output->data as $val)
+			foreach ($output->data as $val)
 			{
 				$res[$val->package_srl] = $val;
 			}
@@ -251,19 +251,19 @@ 
 	 */
 	function getTypeFromPath($path)
 	{
-		if(!$path)
+		if (!$path)
 		{
 			return NULL;
 		}
 
-		if($path == ".")
+		if ($path == ".")
 		{
 			return "core";
 		}
 
 		$path_array = explode("/", $path);
 		$target_name = array_pop($path_array);
-		if(!$target_name)
+		if (!$target_name)
 		{
 			$target_name = array_pop($path_array);
 		}
@@ -280,7 +280,7 @@ 
 	function getConfigFilePath($type)
 	{
 		$config_file = NULL;
-		switch($type)
+		switch ($type)
 		{
 			case "m.layout":
 			case "module":
@@ -317,11 +317,11 @@ 
 		$path_array = explode("/", $path);
 		$target_name = array_pop($path_array);
 		$oModule = getModule($target_name, "class");
-		if(!$oModule)
+		if (!$oModule)
 		{
 			return FALSE;
 		}
-		if(method_exists($oModule, "moduleUninstall"))
+		if (method_exists($oModule, "moduleUninstall"))
 		{
 			return TRUE;
 		}
@@ -339,17 +339,17 @@ 
 	 */
 	function getPackageSrlByPath($path)
 	{
-		if(!$path)
+		if (!$path)
 		{
 			return;
 		}
 
-		if(substr($path, -1) == '/')
+		if (substr($path, -1) == '/')
 		{
 			$path = substr($path, 0, strlen($path) - 1);
 		}
 
-		if(!$GLOBLAS['XE_AUTOINSTALL_PACKAGE_SRL_BY_PATH'][$path])
+		if (!$GLOBLAS['XE_AUTOINSTALL_PACKAGE_SRL_BY_PATH'][$path])
 		{
 			$args = new stdClass();
 			$args->path = $path;
@@ -370,12 +370,12 @@ 
 	function getRemoveUrlByPackageSrl($packageSrl)
 	{
 		$ftp_info = Context::getFTPInfo();
-		if(!$ftp_info->ftp_root_path)
+		if (!$ftp_info->ftp_root_path)
 		{
 			return;
 		}
 
-		if(!$packageSrl)
+		if (!$packageSrl)
 		{
 			return;
 		}
@@ -391,19 +391,19 @@ 
 	 */
 	function getRemoveUrlByPath($path)
 	{
-		if(!$path)
+		if (!$path)
 		{
 			return;
 		}
 
 		$ftp_info = Context::getFTPInfo();
-		if(!$ftp_info->ftp_root_path)
+		if (!$ftp_info->ftp_root_path)
 		{
 			return;
 		}
 
 		$packageSrl = $this->getPackageSrlByPath($path);
-		if(!$packageSrl)
+		if (!$packageSrl)
 		{
 			return;
 		}
@@ -419,7 +419,7 @@ 
 	 */
 	function getUpdateUrlByPackageSrl($packageSrl)
 	{
-		if(!$packageSrl)
+		if (!$packageSrl)
 		{
 			return;
 		}
@@ -435,13 +435,13 @@ 
 	 */
 	function getUpdateUrlByPath($path)
 	{
-		if(!$path)
+		if (!$path)
 		{
 			return;
 		}
 
 		$packageSrl = $this->getPackageSrlByPath($path);
-		if(!$packageSrl)
+		if (!$packageSrl)
 		{
 			return;
 		}
@@ -452,7 +452,7 @@ 
 	function getHaveInstance($columnList = array())
 	{
 		$output = executeQueryArray('autoinstall.getHaveInstance', NULL, $columnList);
-		if(!$output->data)
+		if (!$output->data)
 		{
 			return array();
 		}

Braces +2 added lines, -4 removed lines

@@ -103,8 +103,7 @@ 
 			if($category->parent_srl)
 			{
 				$categoryList[$category->parent_srl]->children[] = & $categoryList[$key];
-			}
-			else
+			} else
 			{
 				$depth0[] = $key;
 			}
@@ -324,8 +323,7 @@ 
 		if(method_exists($oModule, "moduleUninstall"))
 		{
 			return TRUE;
-		}
-		else
+		} else
 		{
 			return FALSE;
 		}

modules/board/board.admin.controller.php

Spacing +32 added lines, -32 removed lines

@@ -27,37 +27,37 @@ 
 		$args = Context::getRequestVars();
 		$args->module = 'board';
 		$args->mid = $args->board_name;
-		if(is_array($args->use_status)) $args->use_status = implode('|@|', $args->use_status);
+		if (is_array($args->use_status)) $args->use_status = implode('|@|', $args->use_status);
 		unset($args->board_name);
 
 		// setup extra_order_target
 		$extra_order_target = array();
-		if($args->module_srl)
+		if ($args->module_srl)
 		{
 			$oDocumentModel = getModel('document');
 			$module_extra_vars = $oDocumentModel->getExtraKeys($args->module_srl);
-			foreach($module_extra_vars as $oExtraItem)
+			foreach ($module_extra_vars as $oExtraItem)
 			{
 				$extra_order_target[$oExtraItem->eid] = $oExtraItem->name;
 			}
 		}
 
 		// setup other variables
-		if($args->except_notice != 'Y') $args->except_notice = 'N';
-		if($args->use_anonymous != 'Y') $args->use_anonymous = 'N';
-		if($args->consultation != 'Y') $args->consultation = 'N';
-		if($args->protect_content!= 'Y') $args->protect_content = 'N';
-		if(!in_array($args->order_target,$this->order_target) && !array_key_exists($args->order_target, $extra_order_target)) $args->order_target = 'list_order';
-		if(!in_array($args->order_type, array('asc', 'desc'))) $args->order_type = 'asc';
+		if ($args->except_notice != 'Y') $args->except_notice = 'N';
+		if ($args->use_anonymous != 'Y') $args->use_anonymous = 'N';
+		if ($args->consultation != 'Y') $args->consultation = 'N';
+		if ($args->protect_content != 'Y') $args->protect_content = 'N';
+		if (!in_array($args->order_target, $this->order_target) && !array_key_exists($args->order_target, $extra_order_target)) $args->order_target = 'list_order';
+		if (!in_array($args->order_type, array('asc', 'desc'))) $args->order_type = 'asc';
 
 		// if there is an existed module
-		if($args->module_srl) {
+		if ($args->module_srl) {
 			$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
-			if($module_info->module_srl != $args->module_srl) unset($args->module_srl);
+			if ($module_info->module_srl != $args->module_srl) unset($args->module_srl);
 		}
 
 		// insert/update the board module based on module_srl
-		if(!$args->module_srl) {
+		if (!$args->module_srl) {
 			$args->hide_category = 'N';
 			$output = $oModuleController->insertModule($args);
 			$msg_code = 'success_registed';
@@ -67,18 +67,18 @@ 
 			$msg_code = 'success_updated';
 		}
 
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// setup list config
-		$list = explode(',',Context::get('list'));
-		if(count($list))
+		$list = explode(',', Context::get('list'));
+		if (count($list))
 		{
 			$list_arr = array();
-			foreach($list as $val)
+			foreach ($list as $val)
 			{
 				$val = trim($val);
-				if(!$val) continue;
-				if(substr($val,0,10)=='extra_vars') $val = substr($val,10);
+				if (!$val) continue;
+				if (substr($val, 0, 10) == 'extra_vars') $val = substr($val, 10);
 				$list_arr[] = $val;
 			}
 			$oModuleController = getController('module');
@@ -86,10 +86,10 @@ 
 		}
 
 		$this->setMessage($msg_code);
-		if (Context::get('success_return_url')){
+		if (Context::get('success_return_url')) {
 			changeValueInUrl('mid', $args->mid, $module_info->mid);
 			$this->setRedirectUrl(Context::get('success_return_url'));
-		}else{
+		} else {
 			$this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminBoardInfo', 'module_srl', $output->get('module_srl')));
 		}
 	}
@@ -105,17 +105,17 @@ 
 		// for board info
 		$args->module = 'board';
 		$args->mid = $args->board_name;
-		if(is_array($args->use_status))
+		if (is_array($args->use_status))
 		{
 			$args->use_status = implode('|@|', $args->use_status);
 		}
 		unset($args->board_name);
 
-		if(!in_array($args->order_target, $this->order_target))
+		if (!in_array($args->order_target, $this->order_target))
 		{
 			$args->order_target = 'list_order';
 		}
-		if(!in_array($args->order_type, array('asc', 'desc')))
+		if (!in_array($args->order_type, array('asc', 'desc')))
 		{
 			$args->order_type = 'asc';
 		}
@@ -125,13 +125,13 @@ 
 
 		// for grant info, Register Admin ID
 		$oModuleController->deleteAdminId($args->module_srl);
-		if($args->admin_member)
+		if ($args->admin_member)
 		{
-			$admin_members = explode(',',$args->admin_member);
-			for($i=0;$i<count($admin_members);$i++)
+			$admin_members = explode(',', $args->admin_member);
+			for ($i = 0; $i < count($admin_members); $i++)
 			{
 				$admin_id = trim($admin_members[$i]);
-				if(!$admin_id) continue;
+				if (!$admin_id) continue;
 				$oModuleController->insertAdminId($args->module_srl, $admin_id);
 			}
 		}
@@ -146,10 +146,10 @@ 
 		// get the current module
 		$oModuleController = getController('module');
 		$output = $oModuleController->deleteModule($module_srl);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
-		$this->add('module','board');
-		$this->add('page',Context::get('page'));
+		$this->add('module', 'board');
+		$this->add('page', Context::get('page'));
 		$this->setMessage('success_deleted');
 	}
 
@@ -160,7 +160,7 @@ 
 
 		$oModuleModel = getModel('module');
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-		if($module_info->mid != $mid)
+		if ($module_info->mid != $mid)
 		{
 			return new Object(-1, 'msg_invalid_request');
 		}
@@ -168,7 +168,7 @@ 
 		$module_info->hide_category = Context::get('hide_category') == 'Y' ? 'Y' : 'N';
 		$oModuleController = getController('module'); /* @var $oModuleController moduleController */
 		$output = $oModuleController->updateModule($module_info);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}

Braces +41 added lines, -16 removed lines

@@ -27,7 +27,9 @@ 
 		$args = Context::getRequestVars();
 		$args->module = 'board';
 		$args->mid = $args->board_name;
-		if(is_array($args->use_status)) $args->use_status = implode('|@|', $args->use_status);
+		if(is_array($args->use_status)) {
+			$args->use_status = implode('|@|', $args->use_status);
+		}
 		unset($args->board_name);
 
 		// setup extra_order_target
@@ -43,17 +45,31 @@ 
 		}
 
 		// setup other variables
-		if($args->except_notice != 'Y') $args->except_notice = 'N';
-		if($args->use_anonymous != 'Y') $args->use_anonymous = 'N';
-		if($args->consultation != 'Y') $args->consultation = 'N';
-		if($args->protect_content!= 'Y') $args->protect_content = 'N';
-		if(!in_array($args->order_target,$this->order_target) && !array_key_exists($args->order_target, $extra_order_target)) $args->order_target = 'list_order';
-		if(!in_array($args->order_type, array('asc', 'desc'))) $args->order_type = 'asc';
+		if($args->except_notice != 'Y') {
+			$args->except_notice = 'N';
+		}
+		if($args->use_anonymous != 'Y') {
+			$args->use_anonymous = 'N';
+		}
+		if($args->consultation != 'Y') {
+			$args->consultation = 'N';
+		}
+		if($args->protect_content!= 'Y') {
+			$args->protect_content = 'N';
+		}
+		if(!in_array($args->order_target,$this->order_target) && !array_key_exists($args->order_target, $extra_order_target)) {
+			$args->order_target = 'list_order';
+		}
+		if(!in_array($args->order_type, array('asc', 'desc'))) {
+			$args->order_type = 'asc';
+		}
 
 		// if there is an existed module
 		if($args->module_srl) {
 			$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
-			if($module_info->module_srl != $args->module_srl) unset($args->module_srl);
+			if($module_info->module_srl != $args->module_srl) {
+				unset($args->module_srl);
+			}
 		}
 
 		// insert/update the board module based on module_srl
@@ -67,7 +83,9 @@ 
 			$msg_code = 'success_updated';
 		}
 
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// setup list config
 		$list = explode(',',Context::get('list'));
@@ -77,8 +95,12 @@ 
 			foreach($list as $val)
 			{
 				$val = trim($val);
-				if(!$val) continue;
-				if(substr($val,0,10)=='extra_vars') $val = substr($val,10);
+				if(!$val) {
+					continue;
+				}
+				if(substr($val,0,10)=='extra_vars') {
+					$val = substr($val,10);
+				}
 				$list_arr[] = $val;
 			}
 			$oModuleController = getController('module');
@@ -89,7 +111,7 @@ 
 		if (Context::get('success_return_url')){
 			changeValueInUrl('mid', $args->mid, $module_info->mid);
 			$this->setRedirectUrl(Context::get('success_return_url'));
-		}else{
+		} else{
 			$this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminBoardInfo', 'module_srl', $output->get('module_srl')));
 		}
 	}
@@ -131,7 +153,9 @@ 
 			for($i=0;$i<count($admin_members);$i++)
 			{
 				$admin_id = trim($admin_members[$i]);
-				if(!$admin_id) continue;
+				if(!$admin_id) {
+					continue;
+				}
 				$oModuleController->insertAdminId($args->module_srl, $admin_id);
 			}
 		}
@@ -146,7 +170,9 @@ 
 		// get the current module
 		$oModuleController = getController('module');
 		$output = $oModuleController->deleteModule($module_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		$this->add('module','board');
 		$this->add('page',Context::get('page'));
@@ -177,8 +203,7 @@ 
 		if (Context::get('success_return_url'))
 		{
 			$this->setRedirectUrl(Context::get('success_return_url'));
-		}
-		else
+		} else
 		{
 			$this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminCategoryInfo', 'module_srl', $output->get('module_srl')));
 		}