xpressengine / xe-core

modules/addon/addon.admin.controller.php

Braces +7 added lines, -14 removed lines

@@ -36,8 +36,7 @@ 
 		if($site_module_info->site_srl)
 		{
 			$site_srl = $site_module_info->site_srl;
-		}
-		else
+		} else
 		{
 			$site_srl = 0;
 		}
@@ -103,8 +102,7 @@ 
 			if(in_array($targetAddon, $pcOnList))
 			{
 				$args->is_used = 'Y';
-			}
-			else
+			} else
 			{
 				$args->is_used = 'N';
 			}
@@ -112,8 +110,7 @@ 
 			if(in_array($targetAddon, $mobileOnList))
 			{
 				$args->is_used_m = 'Y';
-			}
-			else
+			} else
 			{
 				$args->is_used_m = 'N';
 			}
@@ -121,8 +118,7 @@ 
 			if(in_array($targetAddon, $fixed))
 			{
 				$args->fixed = 'Y';
-			}
-			else
+			} else
 			{
 				$args->fixed = 'N';
 			}
@@ -147,8 +143,7 @@ 
 		if(Context::get('success_return_url'))
 		{
 			$this->setRedirectUrl(Context::get('success_return_url'));
-		}
-		else
+		} else
 		{
 			$this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAddonAdminIndex'));
 		}
@@ -256,8 +251,7 @@ 
 		if($type == "pc")
 		{
 			$args->is_used = 'Y';
-		}
-		else
+		} else
 		{
 			$args->is_used_m = "Y";
 		}
@@ -284,8 +278,7 @@ 
 		if($type == "pc")
 		{
 			$args->is_used = 'N';
-		}
-		else
+		} else
 		{
 			$args->is_used_m = 'N';
 		}

Spacing +28 added lines, -28 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-require_once(_XE_PATH_ . 'modules/addon/addon.controller.php');
+require_once(_XE_PATH_.'modules/addon/addon.controller.php');
 
 /**
  * Admin controller class of addon modules
@@ -33,7 +33,7 @@ 
 
 		$site_module_info = Context::get('site_module_info');
 
-		if($site_module_info->site_srl)
+		if ($site_module_info->site_srl)
 		{
 			$site_srl = $site_module_info->site_srl;
 		}
@@ -42,28 +42,28 @@ 
 			$site_srl = 0;
 		}
 
-		if(!$pcOnList)
+		if (!$pcOnList)
 		{
 			$pcOnList = array();
 		}
-		if(!$mobileOnList)
+		if (!$mobileOnList)
 		{
 			$mobileOnList = array();
 		}
-		if(!$fixed)
+		if (!$fixed)
 		{
 			$fixed = array();
 		}
 
-		if(!is_array($pcOnList))
+		if (!is_array($pcOnList))
 		{
 			$pcOnList = array($pcOnList);
 		}
-		if(!is_array($mobileOnList))
+		if (!is_array($mobileOnList))
 		{
 			$pcOnList = array($mobileOnList);
 		}
-		if(!is_array($fixed))
+		if (!is_array($fixed))
 		{
 			$pcOnList = array($fixed);
 		}
@@ -74,21 +74,21 @@ 
 
 		// get need update addon list
 		$updateList = array();
-		foreach($currentAddonList as $addon)
+		foreach ($currentAddonList as $addon)
 		{
-			if($addon->activated !== in_array($addon->addon_name, $pcOnList))
+			if ($addon->activated !== in_array($addon->addon_name, $pcOnList))
 			{
 				$updateList[] = $addon->addon_name;
 				continue;
 			}
 
-			if($addon->mactivated !== in_array($addon->addon_name, $mobileOnList))
+			if ($addon->mactivated !== in_array($addon->addon_name, $mobileOnList))
 			{
 				$updateList[] = $addon->addon_name;
 				continue;
 			}
 
-			if($addon->fixed !== in_array($addon->addon_name, $fixed))
+			if ($addon->fixed !== in_array($addon->addon_name, $fixed))
 			{
 				$updateList[] = $addon->addon_name;
 				continue;
@@ -96,11 +96,11 @@ 
 		}
 
 		// update
-		foreach($updateList as $targetAddon)
+		foreach ($updateList as $targetAddon)
 		{
 			$args = new stdClass();
 
-			if(in_array($targetAddon, $pcOnList))
+			if (in_array($targetAddon, $pcOnList))
 			{
 				$args->is_used = 'Y';
 			}
@@ -109,7 +109,7 @@ 
 				$args->is_used = 'N';
 			}
 
-			if(in_array($targetAddon, $mobileOnList))
+			if (in_array($targetAddon, $mobileOnList))
 			{
 				$args->is_used_m = 'Y';
 			}
@@ -118,7 +118,7 @@ 
 				$args->is_used_m = 'N';
 			}
 
-			if(in_array($targetAddon, $fixed))
+			if (in_array($targetAddon, $fixed))
 			{
 				$args->fixed = 'Y';
 			}
@@ -131,20 +131,20 @@ 
 			$args->site_srl = $site_srl;
 
 			$output = executeQuery('addon.updateSiteAddon', $args);
-			if(!$output->toBool())
+			if (!$output->toBool())
 			{
 				return $output;
 			}
 		}
 
-		if(count($updateList))
+		if (count($updateList))
 		{
 			$this->makeCacheFile($site_srl, 'pc', 'site');
 			$this->makeCacheFile($site_srl, 'mobile', 'site');
 		}
 
 		$this->setMessage('success_updated', 'info');
-		if(Context::get('success_return_url'))
+		if (Context::get('success_return_url'))
 		{
 			$this->setRedirectUrl(Context::get('success_return_url'));
 		}
@@ -167,14 +167,14 @@ 
 		// batahom addon values
 		$addon = Context::get('addon');
 		$type = Context::get('type');
-		if(!$type)
+		if (!$type)
 		{
 			$type = "pc";
 		}
-		if($addon)
+		if ($addon)
 		{
 			// If enabled Disables
-			if($oAddonModel->isActivatedAddon($addon, $site_module_info->site_srl, $type))
+			if ($oAddonModel->isActivatedAddon($addon, $site_module_info->site_srl, $type))
 			{
 				$this->doDeactivate($addon, $site_module_info->site_srl, $type);
 			}
@@ -207,7 +207,7 @@ 
 		$site_module_info = Context::get('site_module_info');
 
 		$output = $this->doSetup($addon_name, $args, $site_module_info->site_srl, 'site');
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -232,7 +232,7 @@ 
 		$args = new stdClass;
 		$args->addon = $addon;
 		$args->is_used = $isUsed;
-		if($gtype == 'global')
+		if ($gtype == 'global')
 		{
 			return executeQuery('addon.insertAddon', $args);
 		}
@@ -253,7 +253,7 @@ 
 	{
 		$args = new stdClass();
 		$args->addon = $addon;
-		if($type == "pc")
+		if ($type == "pc")
 		{
 			$args->is_used = 'Y';
 		}
@@ -261,7 +261,7 @@ 
 		{
 			$args->is_used_m = "Y";
 		}
-		if($gtype == 'global')
+		if ($gtype == 'global')
 		{
 			return executeQuery('addon.updateAddon', $args);
 		}
@@ -281,7 +281,7 @@ 
 	{
 		$args = new stdClass();
 		$args->addon = $addon;
-		if($type == "pc")
+		if ($type == "pc")
 		{
 			$args->is_used = 'N';
 		}
@@ -289,7 +289,7 @@ 
 		{
 			$args->is_used_m = 'N';
 		}
-		if($gtype == 'global')
+		if ($gtype == 'global')
 		{
 			return executeQuery('addon.updateAddon', $args);
 		}

modules/addon/addon.admin.view.php

Braces +1 added lines, -2 removed lines

@@ -83,8 +83,7 @@
 					$module_categories[$module->module_category_srl]->list[$module_srl] = $module;
 				}
 			}
-		}
-		else
+		} else
 		{
 			$module_categories = array();
 			$module_categories[0] = new stdClass();

Spacing +7 added lines, -7 removed lines

@@ -15,7 +15,7 @@ 
 	 */
 	function init()
 	{
-		$this->setTemplatePath($this->module_path . 'tpl');
+		$this->setTemplatePath($this->module_path.'tpl');
 	}
 
 	/**
@@ -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');

modules/admin/admin.class.php

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

Spacing +35 added lines, -35 removed lines

@@ -37,9 +37,9 @@ 
 		$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("admin_favorite", "type"))
+			if (!$oDB->isColumnExists("admin_favorite", "type"))
 			{
 				return TRUE;
 			}
@@ -60,9 +60,9 @@ 
 		$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("admin_favorite", "type"))
+			if (!$oDB->isColumnExists("admin_favorite", "type"))
 			{
 				$oAdminAdminModel = getAdminModel('admin');
 				$output = $oAdminAdminModel->getFavoriteList();
@@ -71,11 +71,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);
 					}
@@ -99,19 +99,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);
@@ -146,14 +146,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')
+			$args->name = '{$lang->menu_gnb[\''.$value.'\']}';
+			if ($value == 'dashboard')
 			{
 				$args->url = 'index.php?module=admin';
 			}
@@ -168,9 +168,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;
@@ -281,20 +281,20 @@ 
 		$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) . "'";
+					$gnbKey = "'".$this->_getGnbKey($value2)."'";
 
 					//insert menu item
 					$args->menu_item_srl = getNextSequence();
 					$args->parent_srl = $gnbDBList[$gnbKey];
-					$args->name = '{$lang->menu_gnb_sub[\'' . $value2 . '\']}';
-					$args->url = 'index.php?module=admin&act=' . $moduleActionInfo->menu->{$value2}->index;
+					$args->name = '{$lang->menu_gnb_sub[\''.$value2.'\']}';
+					$args->url = 'index.php?module=admin&act='.$moduleActionInfo->menu->{$value2}->index;
 					$args->listorder = -1 * $args->menu_item_srl;
 					$output = executeQuery('menu.insertMenuItem', $args);
 				}
@@ -315,7 +315,7 @@ 
 	 */
 	function _getGnbKey($menuName)
 	{
-		switch($menuName)
+		switch ($menuName)
 		{
 			case 'siteMap':
 			case 'siteDesign':
@@ -364,7 +364,7 @@ 
 	 */
 	function _getOldGnbKey($menuName)
 	{
-		switch($menuName)
+		switch ($menuName)
 		{
 			case 'siteMap':
 				return 'menu';
@@ -414,9 +414,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;
@@ -429,15 +429,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];
@@ -446,15 +446,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')
@@ -462,7 +462,7 @@ 
 							  $newParentItem = $newAdminParentMenuList['menu'];
 							  }
 							  else */
-							if($parentMenu[$menuItem->parent_srl] == 'extensions')
+							if ($parentMenu[$menuItem->parent_srl] == 'extensions')
 							{
 								$newParentItem = $newAdminParentMenuList['advanced'];
 							}
@@ -479,7 +479,7 @@ 
 					}
 				}
 
-				if($isUserAddedMenuMoved)
+				if ($isUserAddedMenuMoved)
 				{
 					$oMenuAdminController->makeXmlFile($newAdminmenuSrl);
 				}
@@ -488,9 +488,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);
 			}

modules/autoinstall/autoinstall.lib.php

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

Spacing +122 added lines, -122 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /* Copyright (C) NAVER <http://www.navercorp.com> */
 
-require_once(_XE_PATH_ . 'libs/ftp.class.php');
+require_once(_XE_PATH_.'libs/ftp.class.php');
 
 /**
  * Module installer
@@ -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,19 +116,19 @@ 
 	 */
 	function _download()
 	{
-		if($this->package->path == ".")
+		if ($this->package->path == ".")
 		{
-			$this->download_file = $this->temp_dir . "xe.tar";
+			$this->download_file = $this->temp_dir."xe.tar";
 			$this->target_path = "";
 			$this->download_path = $this->temp_dir;
 		}
 		else
 		{
 			$subpath = trim(substr($this->package->path, 2), '/');
-			$this->download_file = $this->temp_dir . $subpath . ".tar";
+			$this->download_file = $this->temp_dir.$subpath.".tar";
 			$subpatharr = explode("/", $subpath);
 			array_pop($subpatharr);
-			$this->download_path = $this->temp_dir . implode("/", $subpatharr);
+			$this->download_path = $this->temp_dir.implode("/", $subpatharr);
 			$this->target_path = implode("/", $subpatharr);
 		}
 
@@ -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;
@@ -249,18 +249,18 @@ 
 	 */
 	function _unPack()
 	{
-		require_once(_XE_PATH_ . 'libs/tar.class.php');
+		require_once(_XE_PATH_.'libs/tar.class.php');
 
 		$oTar = new tar();
 		$oTar->openTAR($this->download_file);
 
 		$_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']);
+				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)))
+			$file_path = $path."/".$file;
+			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;
+		$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;
+		$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,36 +445,36 @@ 
 	 */
 	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;
+		$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);
+				$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);
 				}
 
-				ssh2_scp_send($this->connection, FileHandler::getRealPath($this->download_path . "/" . $org_file), $target_dir . "/" . $file);
+				ssh2_scp_send($this->connection, FileHandler::getRealPath($this->download_path."/".$org_file), $target_dir."/".$file);
 			}
 		}
 		return new Object();
@@ -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'), '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,15 +558,15 @@ 
 	 */
 	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;
+		$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);
+			return new Object(-1, "failed to delete file ".$path);
 		}
 		return new Object();
 	}
@@ -579,15 +579,15 @@ 
 	 */
 	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;
+		$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);
+			return new Object(-1, "failed to delete directory ".$path);
 		}
 		return new Object();
 	}
@@ -610,73 +610,73 @@ 
 	 */
 	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;
+		$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);
 				}
-				$path = FileHandler::getRealPath("./" . $this->target_path . "/" . $file);
-				$path_list = explode('/', dirname($this->target_path . "/" . $file));
+				$path = FileHandler::getRealPath("./".$this->target_path."/".$file);
+				$path_list = explode('/', dirname($this->target_path."/".$file));
 
 				$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)))
+					$real_path .= $path_list[$i]."/";
+					$ftp_path .= $path_list[$i]."/";
+					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'), '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;
+		$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;
+		$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,50 +815,50 @@ 
 	 */
 	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;
 		}
 
 		$oFtp = &$this->oFtp;
-		$target_dir = $this->ftp_info->ftp_root_path . $this->target_path;
+		$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);
-				$path_list = explode('/', dirname($this->target_path . "/" . $file));
+				$path = FileHandler::getRealPath("./".$this->target_path."/".$file);
+				$path_list = explode('/', dirname($this->target_path."/".$file));
 
 				$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)))
+					$real_path .= $path_list[$i]."/";
+					$ftp_path .= $path_list[$i]."/";
+					if (!file_exists(FileHandler::getRealPath($real_path)))
 					{
 						$oFtp->ftp_mkdir($ftp_path);
-						$oFtp->ftp_site("CHMOD 755 " . $ftp_path);
+						$oFtp->ftp_site("CHMOD 755 ".$ftp_path);
 					}
 				}
-				$oFtp->ftp_put($target_dir . '/' . $file, FileHandler::getRealPath($this->download_path . "/" . $org_file));
+				$oFtp->ftp_put($target_dir.'/'.$file, FileHandler::getRealPath($this->download_path."/".$org_file));
 			}
 		}
 
@@ -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,38 +952,38 @@ 
 	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);
 				}
-				$path = FileHandler::getRealPath("./" . $this->target_path . "/" . $file);
-				$path_list = explode('/', dirname($this->target_path . "/" . $file));
+				$path = FileHandler::getRealPath("./".$this->target_path."/".$file);
+				$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)))
+					$real_path .= $path_list[$i]."/";
+					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));
 			}
 		}
 

modules/autoinstall/autoinstall.model.php

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

Spacing +38 added lines, -38 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);
+			$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();
 		}

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')));
 		}

modules/board/board.admin.view.php

Spacing +29 added lines, -29 removed lines

@@ -17,7 +17,7 @@ 
 	function init() {
 		// check module_srl is existed or not
 		$module_srl = Context::get('module_srl');
-		if(!$module_srl && $this->module_srl) {
+		if (!$module_srl && $this->module_srl) {
 			$module_srl = $this->module_srl;
 			Context::set('module_srl', $module_srl);
 		}
@@ -26,20 +26,20 @@ 
 		$oModuleModel = getModel('module');
 
 		// get the module infomation based on the module_srl
-		if($module_srl) {
+		if ($module_srl) {
 			$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-			if(!$module_info) {
-				Context::set('module_srl','');
+			if (!$module_info) {
+				Context::set('module_srl', '');
 				$this->act = 'list';
 			} else {
 				ModuleModel::syncModuleToSite($module_info);
 				$this->module_info = $module_info;
 				$this->module_info->use_status = explode('|@|', $module_info->use_status);
-				Context::set('module_info',$module_info);
+				Context::set('module_info', $module_info);
 			}
 		}
 
-		if($module_info && $module_info->module != 'board') return $this->stop("msg_invalid_request");
+		if ($module_info && $module_info->module != 'board') return $this->stop("msg_invalid_request");
 
 		// get the module category list
 		$module_category = $oModuleModel->getModuleCategories();
@@ -50,11 +50,11 @@ 
 		$security->encodeHTML('module_category..');
 
 		// setup template path (board admin panel templates is resided in the tpl folder)
-		$template_path = sprintf("%stpl/",$this->module_path);
+		$template_path = sprintf("%stpl/", $this->module_path);
 		$this->setTemplatePath($template_path);
 
 		// install order (sorting) options
-		foreach($this->order_target as $key) $order_target[$key] = Context::getLang($key);
+		foreach ($this->order_target as $key) $order_target[$key] = Context::getLang($key);
 		$order_target['list_order'] = Context::getLang('document_srl');
 		$order_target['update_order'] = Context::getLang('last_update');
 		Context::set('order_target', $order_target);
@@ -75,7 +75,7 @@ 
 		$search_target = Context::get('search_target');
 		$search_keyword = Context::get('search_keyword');
 
-		switch ($search_target){
+		switch ($search_target) {
 			case 'mid':
 				$args->s_mid = $search_keyword;
 				break;
@@ -90,7 +90,7 @@ 
 		// get the skins path
 		$oModuleModel = getModel('module');
 		$skin_list = $oModuleModel->getSkins($this->module_path);
-		Context::set('skin_list',$skin_list);
+		Context::set('skin_list', $skin_list);
 
 		$mskin_list = $oModuleModel->getSkins($this->module_path, "m.skins");
 		Context::set('mskin_list', $mskin_list);
@@ -100,7 +100,7 @@ 
 		$layout_list = $oLayoutModel->getLayoutList();
 		Context::set('layout_list', $layout_list);
 
-		$mobile_layout_list = $oLayoutModel->getLayoutList(0,"M");
+		$mobile_layout_list = $oLayoutModel->getLayoutList(0, "M");
 		Context::set('mlayout_list', $mobile_layout_list);
 
 		$oModuleAdminModel = getAdminModel('module');
@@ -115,10 +115,10 @@ 
 		Context::set('page_navigation', $output->page_navigation);
 
 		$security = new Security();
-		$security->encodeHTML('board_list..browser_title','board_list..mid');
-		$security->encodeHTML('skin_list..title','mskin_list..title');
-		$security->encodeHTML('layout_list..title','layout_list..layout');
-		$security->encodeHTML('mlayout_list..title','mlayout_list..layout');
+		$security->encodeHTML('board_list..browser_title', 'board_list..mid');
+		$security->encodeHTML('skin_list..title', 'mskin_list..title');
+		$security->encodeHTML('layout_list..title', 'layout_list..layout');
+		$security->encodeHTML('mlayout_list..title', 'mlayout_list..layout');
 
 		// 템플릿 파일 지정
 		$this->setTemplateFile('index');
@@ -135,14 +135,14 @@ 
 	 * @brief display the module insert form
 	 **/
 	function dispBoardAdminInsertBoard() {
-		if(!in_array($this->module_info->module, array('admin', 'board','blog','guestbook'))) {
+		if (!in_array($this->module_info->module, array('admin', 'board', 'blog', 'guestbook'))) {
 			return $this->alertMessage('msg_invalid_request');
 		}
 
 		// get the skins list
 		$oModuleModel = getModel('module');
 		$skin_list = $oModuleModel->getSkins($this->module_path);
-		Context::set('skin_list',$skin_list);
+		Context::set('skin_list', $skin_list);
 
 		$mskin_list = $oModuleModel->getSkins($this->module_path, "m.skins");
 		Context::set('mskin_list', $mskin_list);
@@ -152,13 +152,13 @@ 
 		$layout_list = $oLayoutModel->getLayoutList();
 		Context::set('layout_list', $layout_list);
 
-		$mobile_layout_list = $oLayoutModel->getLayoutList(0,"M");
+		$mobile_layout_list = $oLayoutModel->getLayoutList(0, "M");
 		Context::set('mlayout_list', $mobile_layout_list);
 
 		$security = new Security();
-		$security->encodeHTML('skin_list..title','mskin_list..title');
-		$security->encodeHTML('layout_list..title','layout_list..layout');
-		$security->encodeHTML('mlayout_list..title','mlayout_list..layout');
+		$security->encodeHTML('skin_list..title', 'mskin_list..title');
+		$security->encodeHTML('layout_list..title', 'layout_list..layout');
+		$security->encodeHTML('mlayout_list..title', 'mlayout_list..layout');
 
 		// get document status list
 		$oDocumentModel = getModel('document');
@@ -177,14 +177,14 @@ 
 		// setup extra_order_target
 		$module_extra_vars = $oDocumentModel->getExtraKeys($this->module_info->module_srl);
 		$extra_order_target = array();
-		foreach($module_extra_vars as $oExtraItem)
+		foreach ($module_extra_vars as $oExtraItem)
 		{
 			$extra_order_target[$oExtraItem->eid] = $oExtraItem->name;
 		}
 		Context::set('extra_order_target', $extra_order_target);
 
 		$security = new Security();
-		$security->encodeHTML('extra_vars..name','list_config..name');
+		$security->encodeHTML('extra_vars..name', 'list_config..name');
 
 		// set the template file
 		$this->setTemplateFile('board_insert');
@@ -212,8 +212,8 @@ 
 	 * @brief display the board mdoule delete page
 	 **/
 	function dispBoardAdminDeleteBoard() {
-		if(!Context::get('module_srl')) return $this->dispBoardAdminContent();
-		if(!in_array($this->module_info->module, array('admin', 'board','blog','guestbook'))) {
+		if (!Context::get('module_srl')) return $this->dispBoardAdminContent();
+		if (!in_array($this->module_info->module, array('admin', 'board', 'blog', 'guestbook'))) {
 			return $this->alertMessage('msg_invalid_request');
 		}
 
@@ -223,10 +223,10 @@ 
 		$document_count = $oDocumentModel->getDocumentCount($module_info->module_srl);
 		$module_info->document_count = $document_count;
 
-		Context::set('module_info',$module_info);
+		Context::set('module_info', $module_info);
 
 		$security = new Security();
-		$security->encodeHTML('module_info..mid','module_info..module','module_info..document_count');
+		$security->encodeHTML('module_info..mid', 'module_info..module', 'module_info..document_count');
 
 		// setup the template file
 		$this->setTemplateFile('board_delete');
@@ -295,7 +295,7 @@ 
 	 * @brief board module message
 	 **/
 	function alertMessage($message) {
-		$script =  sprintf('<script> xAddEventListener(window,"load", function() { alert("%s"); } );</script>', Context::getLang($message));
-		Context::addHtmlHeader( $script );
+		$script = sprintf('<script> xAddEventListener(window,"load", function() { alert("%s"); } );</script>', Context::getLang($message));
+		Context::addHtmlHeader($script);
 	}
 }

Braces +9 added lines, -3 removed lines

@@ -39,7 +39,9 @@ 
 			}
 		}
 
-		if($module_info && $module_info->module != 'board') return $this->stop("msg_invalid_request");
+		if($module_info && $module_info->module != 'board') {
+			return $this->stop("msg_invalid_request");
+		}
 
 		// get the module category list
 		$module_category = $oModuleModel->getModuleCategories();
@@ -54,7 +56,9 @@ 
 		$this->setTemplatePath($template_path);
 
 		// install order (sorting) options
-		foreach($this->order_target as $key) $order_target[$key] = Context::getLang($key);
+		foreach($this->order_target as $key) {
+			$order_target[$key] = Context::getLang($key);
+		}
 		$order_target['list_order'] = Context::getLang('document_srl');
 		$order_target['update_order'] = Context::getLang('last_update');
 		Context::set('order_target', $order_target);
@@ -212,7 +216,9 @@ 
 	 * @brief display the board mdoule delete page
 	 **/
 	function dispBoardAdminDeleteBoard() {
-		if(!Context::get('module_srl')) return $this->dispBoardAdminContent();
+		if(!Context::get('module_srl')) {
+			return $this->dispBoardAdminContent();
+		}
 		if(!in_array($this->module_info->module, array('admin', 'board','blog','guestbook'))) {
 			return $this->alertMessage('msg_invalid_request');
 		}

modules/board/board.model.php

Braces +2 added lines, -4 removed lines

@@ -40,13 +40,11 @@
 				if($inserted_extra_vars[$key])

 				{

 					$output['extra_vars'.$key] = $inserted_extra_vars[$key];

-				}

-				else

+				} else

 				{

 					continue;

 				}

-			}

-			else

+			} else

 			{

 				$output[$key] = new ExtraItem($module_srl, -1, Context::getLang($key), $key, 'N', 'N', 'N', null);

 			}

Spacing +9 added lines, -9 removed lines

@@ -25,19 +25,19 @@ 
 

 		// get the list config value, if it is not exitsted then setup the default value

 		$list_config = $oModuleModel->getModulePartConfig('board', $module_srl);

-		if(!$list_config || count($list_config) <= 0)

+		if (!$list_config || count($list_config) <= 0)

 		{

-			$list_config = array( 'no', 'title', 'nick_name','regdate','readed_count');

+			$list_config = array('no', 'title', 'nick_name', 'regdate', 'readed_count');

 		}

 

 		// get the extra variables

 		$inserted_extra_vars = $oDocumentModel->getExtraKeys($module_srl);

 

-		foreach($list_config as $key)

+		foreach ($list_config as $key)

 		{

-			if(preg_match('/^([0-9]+)$/',$key))

+			if (preg_match('/^([0-9]+)$/', $key))

 			{

-				if($inserted_extra_vars[$key])

+				if ($inserted_extra_vars[$key])

 				{

 					$output['extra_vars'.$key] = $inserted_extra_vars[$key];

 				}

@@ -60,9 +60,9 @@ 
 	function getDefaultListConfig($module_srl)

 	{

 		// add virtual srl, title, registered date, update date, nickname, ID, name, readed count, voted count etc.

-		$virtual_vars = array( 'no', 'title', 'regdate', 'last_update', 'last_post', 'nick_name',

+		$virtual_vars = array('no', 'title', 'regdate', 'last_update', 'last_post', 'nick_name',

 				'user_id', 'user_name', 'readed_count', 'voted_count', 'blamed_count', 'thumbnail', 'summary', 'comment_status');

-		foreach($virtual_vars as $key)

+		foreach ($virtual_vars as $key)

 		{

 			$extra_vars[$key] = new ExtraItem($module_srl, -1, Context::getLang($key), $key, 'N', 'N', 'N', null);

 		}

@@ -71,9 +71,9 @@ 
 		$oDocumentModel = getModel('document');

 		$inserted_extra_vars = $oDocumentModel->getExtraKeys($module_srl);

 

-		if(count($inserted_extra_vars))

+		if (count($inserted_extra_vars))

 		{

-			foreach($inserted_extra_vars as $obj)

+			foreach ($inserted_extra_vars as $obj)

 			{

 				$extra_vars['extra_vars'.$obj->idx] = $obj;

 			}

modules/board/board.wap.php

Braces +9 added lines, -3 removed lines

@@ -54,7 +54,9 @@ 
 							$oComment = new commentItem();

 							$oComment->setAttribute($val);

 

-							if(!$oComment->isAccessible()) continue;

+							if(!$oComment->isAccessible()) {
+								continue;
+							}
 

 							$content .= "<b>".$oComment->getNickName()."</b> (".$oComment->getRegdate("Y-m-d").")<br>\r\n".$oComment->getContent(false,false)."<br>\r\n";

 						}

@@ -110,7 +112,9 @@ 
 				$obj['href'] = $val->getPermanentUrl();

 

 				$title = htmlspecialchars($val->getTitleText());

-				if($val->getCommentCount()) $title .= ' ['.$val->getCommentCount().']';

+				if($val->getCommentCount()) {
+					$title .= ' ['.$val->getCommentCount().']';
+				}
 				$obj['link'] = $obj['text'] = '['.$val->getNickName().'] '.$title;

 				$childs[] = $obj;

 			}

@@ -119,7 +123,9 @@ 
 

 		$totalPage = $page_navigation->last_page;

 		$page = (int)Context::get('page');

-		if(!$page) $page = 1;

+		if(!$page) {
+			$page = 1;
+		}
 

 		// next/prevUrl specification

 		if($page > 1)

Spacing +28 added lines, -28 removed lines

@@ -15,7 +15,7 @@ 
 	function procWAP(&$oMobile)

 	{

 		// check grant

-		if(!$this->grant->list || $this->module_info->consultation == 'Y')

+		if (!$this->grant->list || $this->module_info->consultation == 'Y')

 		{

 			return $oMobile->setContent(Context::getLang('msg_not_permitted'));

 		}

@@ -25,13 +25,13 @@ 
 

 		// if the doument is existed

 		$document_srl = Context::get('document_srl');

-		if($document_srl)

+		if ($document_srl)

 		{

 			$oDocument = $oDocumentModel->getDocument($document_srl);

-			if($oDocument->isExists())

+			if ($oDocument->isExists())

 			{

 				// check the grant

-				if(!$this->grant->view)

+				if (!$this->grant->view)

 				{

 					return $oMobile->setContent(Context::getLang('msg_not_permitted'));

 				}

@@ -40,48 +40,48 @@ 
 				Context::setBrowserTitle($oDocument->getTitleText());

 

 				// if the act is display comment list

-				if($this->act=='dispBoardContentCommentList')

+				if ($this->act == 'dispBoardContentCommentList')

 				{

 

 					$oCommentModel = getModel('comment');

 					$output = $oCommentModel->getCommentList($oDocument->document_srl, 0, false, $oDocument->getCommentCount());

 

 					$content = '';

-					if(count($output->data))

+					if (count($output->data))

 					{

-						foreach($output->data as $key => $val)

+						foreach ($output->data as $key => $val)

 						{

 							$oComment = new commentItem();

 							$oComment->setAttribute($val);

 

-							if(!$oComment->isAccessible()) continue;

+							if (!$oComment->isAccessible()) continue;

 

-							$content .= "<b>".$oComment->getNickName()."</b> (".$oComment->getRegdate("Y-m-d").")<br>\r\n".$oComment->getContent(false,false)."<br>\r\n";

+							$content .= "<b>".$oComment->getNickName()."</b> (".$oComment->getRegdate("Y-m-d").")<br>\r\n".$oComment->getContent(false, false)."<br>\r\n";

 						}

 					}

 

 					// setup mobile contents

-					$oMobile->setContent( $content );

+					$oMobile->setContent($content);

 

 					// setup upper URL

-					$oMobile->setUpperUrl( getUrl('act',''), Context::getLang('cmd_go_upper') );

+					$oMobile->setUpperUrl(getUrl('act', ''), Context::getLang('cmd_go_upper'));

 

 				// display the document if the act is not display the comment list

 				} else {

 

 					// setup contents (strip all html tags)

-					$content = strip_tags(str_replace('<p>','<br>&nbsp;&nbsp;&nbsp;',$oDocument->getContent(false,false,false)),'<br><b><i><u><em><small><strong><big>');

+					$content = strip_tags(str_replace('<p>', '<br>&nbsp;&nbsp;&nbsp;', $oDocument->getContent(false, false, false)), '<br><b><i><u><em><small><strong><big>');

 

 

 					// setup content information(include the comments link)

-					$content = Context::getLang('replies').' : <a href="'.getUrl('act','dispBoardContentCommentList').'">'.$oDocument->getCommentCount().'</a><br>'."\r\n".$content;

+					$content = Context::getLang('replies').' : <a href="'.getUrl('act', 'dispBoardContentCommentList').'">'.$oDocument->getCommentCount().'</a><br>'."\r\n".$content;

 					$content = '<b>'.$oDocument->getNickName().'</b> ('.$oDocument->getRegdate("Y-m-d").")<br>\r\n".$content;

 

 					// setup mobile contents

-					$oMobile->setContent( $content );

+					$oMobile->setContent($content);

 

 					// setup upper URL

-					$oMobile->setUpperUrl( getUrl('document_srl',''), Context::getLang('cmd_list') );

+					$oMobile->setUpperUrl(getUrl('document_srl', ''), Context::getLang('cmd_list'));

 

 				}

 

@@ -92,25 +92,25 @@ 
 		// board index

 		$args = new stdClass;

 		$args->module_srl = $this->module_srl;

-		$args->page = Context::get('page');;

+		$args->page = Context::get('page'); ;

 		$args->list_count = 9;

-		$args->sort_index = $this->module_info->order_target?$this->module_info->order_target:'list_order';

-		$args->order_type = $this->module_info->order_type?$this->module_info->order_type:'asc';

+		$args->sort_index = $this->module_info->order_target ? $this->module_info->order_target : 'list_order';

+		$args->order_type = $this->module_info->order_type ? $this->module_info->order_type : 'asc';

 		$output = $oDocumentModel->getDocumentList($args, $this->except_notice);

 		$document_list = $output->data;

 		$page_navigation = $output->page_navigation;

 

 		$childs = array();

-		if($document_list && count($document_list))

+		if ($document_list && count($document_list))

 		{

-			foreach($document_list as $key => $val)

+			foreach ($document_list as $key => $val)

 			{

-				$href = getUrl('mid',$_GET['mid'],'document_srl',$val->document_srl);

+				$href = getUrl('mid', $_GET['mid'], 'document_srl', $val->document_srl);

 				$obj = null;

 				$obj['href'] = $val->getPermanentUrl();

 

 				$title = htmlspecialchars($val->getTitleText());

-				if($val->getCommentCount()) $title .= ' ['.$val->getCommentCount().']';

+				if ($val->getCommentCount()) $title .= ' ['.$val->getCommentCount().']';

 				$obj['link'] = $obj['text'] = '['.$val->getNickName().'] '.$title;

 				$childs[] = $obj;

 			}

@@ -118,18 +118,18 @@ 
 		}

 

 		$totalPage = $page_navigation->last_page;

-		$page = (int)Context::get('page');

-		if(!$page) $page = 1;

+		$page = (int) Context::get('page');

+		if (!$page) $page = 1;

 

 		// next/prevUrl specification

-		if($page > 1)

+		if ($page > 1)

 		{

-			$oMobile->setPrevUrl(getUrl('mid',$_GET['mid'],'page',$page-1), sprintf('%s (%d/%d)', Context::getLang('cmd_prev'), $page-1, $totalPage));

+			$oMobile->setPrevUrl(getUrl('mid', $_GET['mid'], 'page', $page - 1), sprintf('%s (%d/%d)', Context::getLang('cmd_prev'), $page - 1, $totalPage));

 		}

 

-		if($page < $totalPage)

+		if ($page < $totalPage)

 		{

-			$oMobile->setNextUrl(getUrl('mid',$_GET['mid'],'page',$page+1), sprintf('%s (%d/%d)', Context::getLang('cmd_next'), $page+1, $totalPage));

+			$oMobile->setNextUrl(getUrl('mid', $_GET['mid'], 'page', $page + 1), sprintf('%s (%d/%d)', Context::getLang('cmd_next'), $page + 1, $totalPage));

 		}

 

 		$oMobile->mobilePage = $page;