xpressengine / xe-core

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 +33 added lines, -33 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')
+			$args->name = '{$lang->menu_gnb[\''.$value.'\']}';
+			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,20 +265,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);
 				}
@@ -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);
 			}

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

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'), $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,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'), $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;
+		$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.class.php

Spacing +11 added lines, -11 removed lines

@@ -9,7 +9,7 @@ 
 
 class board extends ModuleObject
 {
-	var $search_option = array('title_content','title','content','comment','user_name','nick_name','user_id','tag'); ///< 검색 옵션
+	var $search_option = array('title_content', 'title', 'content', 'comment', 'user_name', 'nick_name', 'user_id', 'tag'); ///< 검색 옵션
 
 	var $order_target = array('list_order', 'update_order', 'regdate', 'voted_count', 'blamed_count', 'readed_count', 'comment_count', 'title', 'nick_name', 'user_name', 'user_id'); // 정렬 옵션
 
@@ -25,9 +25,9 @@ 
 	 */
 	function board()
 	{
-		if(!Context::isInstalled()) return;
+		if (!Context::isInstalled()) return;
 
-		if(!Context::isExistsSSLAction('dispBoardWrite') && Context::getSslStatus() == 'optional')
+		if (!Context::isExistsSSLAction('dispBoardWrite') && Context::getSslStatus() == 'optional')
 		{
 			$ssl_actions = array('dispBoardWrite', 'dispBoardWriteComment', 'dispBoardReplyComment', 'dispBoardModifyComment', 'dispBoardDelete', 'dispBoardDeleteComment', 'procBoardInsertDocument', 'procBoardDeleteDocument', 'procBoardInsertComment', 'procBoardDeleteComment', 'procBoardVerificationPassword');
 			Context::addSSLActions($ssl_actions);
@@ -50,7 +50,7 @@ 
 		$args = new stdClass;
 		$args->site_srl = 0;
 		$output = executeQuery('module.getSite', $args);
-		if(!$output->data->index_module_srl)
+		if (!$output->data->index_module_srl)
 		{
 			$args->mid = 'board';
 			$args->module = 'board';
@@ -59,7 +59,7 @@ 
 			$args->site_srl = 0;
 			$output = $oModuleController->insertModule($args);
 
-			if($output->toBool())
+			if ($output->toBool())
 			{
 				$module_srl = $output->get('module_srl');
 
@@ -83,10 +83,10 @@ 
 		$oModuleModel = getModel('module');
 
 		// 2007. 10. 17 get the member menu trigger
-		if(!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after')) return true;
+		if (!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after')) return true;
 
 		// 2011. 09. 20 when add new menu in sitemap, custom menu add
-		if(!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after')) return true;
+		if (!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after')) return true;
 		return false;
 	}
 
@@ -99,13 +99,13 @@ 
 		$oModuleController = getController('module');
 
 		// 2007. 10. 17  check the member menu trigger, if it is not existed then insert
-		if(!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after'))
+		if (!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after'))
 		{
 			$oModuleController->insertTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after');
 		}
 
 		// 2011. 09. 20 when add new menu in sitemap, custom menu add
-		if(!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after'))
+		if (!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after'))
 		{
 			$oModuleController->insertTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after');
 		}
@@ -116,12 +116,12 @@ 
 	function moduleUninstall()
 	{
 		$output = executeQueryArray("board.getAllBoard");
-		if(!$output->data) return new Object();
+		if (!$output->data) return new Object();
 		@set_time_limit(0);
 
 		$oModuleController = getController('module');
 
-		foreach($output->data as $board)
+		foreach ($output->data as $board)
 		{
 			$oModuleController->deleteModule($board->module_srl);
 		}

Braces +12 added lines, -4 removed lines

@@ -25,7 +25,9 @@ 
 	 */
 	function board()
 	{
-		if(!Context::isInstalled()) return;
+		if(!Context::isInstalled()) {
+			return;
+		}
 
 		if(!Context::isExistsSSLAction('dispBoardWrite') && Context::getSslStatus() == 'optional')
 		{
@@ -83,10 +85,14 @@ 
 		$oModuleModel = getModel('module');
 
 		// 2007. 10. 17 get the member menu trigger
-		if(!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after')) return true;
+		if(!$oModuleModel->getTrigger('member.getMemberMenu', 'board', 'controller', 'triggerMemberMenu', 'after')) {
+			return true;
+		}
 
 		// 2011. 09. 20 when add new menu in sitemap, custom menu add
-		if(!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after')) return true;
+		if(!$oModuleModel->getTrigger('menu.getModuleListInSitemap', 'board', 'model', 'triggerModuleListInSitemap', 'after')) {
+			return true;
+		}
 		return false;
 	}
 
@@ -116,7 +122,9 @@ 
 	function moduleUninstall()
 	{
 		$output = executeQueryArray("board.getAllBoard");
-		if(!$output->data) return new Object();
+		if(!$output->data) {
+			return new Object();
+		}
 		@set_time_limit(0);
 
 		$oModuleController = getController('module');

modules/board/board.controller.php

Braces +21 added lines, -12 removed lines

@@ -36,13 +36,19 @@ 
 		// setup variables
 		$obj = Context::getRequestVars();
 		$obj->module_srl = $this->module_srl;
-		if($obj->is_notice!='Y'||!$this->grant->manager) $obj->is_notice = 'N';
+		if($obj->is_notice!='Y'||!$this->grant->manager) {
+			$obj->is_notice = 'N';
+		}
 		$obj->commentStatus = $obj->comment_status;
 
 		settype($obj->title, "string");
-		if($obj->title == '') $obj->title = cut_str(trim(strip_tags(nl2br($obj->content))),20,'...');
+		if($obj->title == '') {
+			$obj->title = cut_str(trim(strip_tags(nl2br($obj->content))),20,'...');
+		}
 		//setup dpcument title tp 'Untitled'
-		if($obj->title == '') $obj->title = 'Untitled';
+		if($obj->title == '') {
+			$obj->title = 'Untitled';
+		}
 
 		// unset document style if the user is not the document manager
 		if(!$this->grant->manager)
@@ -83,8 +89,7 @@ 
 			{
 				$oDocument->add('member_srl', $obj->member_srl);
 			}
-		}
-		else
+		} else
 		{
 			$bAnonymous = false;
 		}
@@ -148,7 +153,9 @@ 
 				for($i=0;$i<count($target_mail);$i++)
 				{
 					$email_address = trim($target_mail[$i]);
-					if(!$email_address) continue;
+					if(!$email_address) {
+						continue;
+					}
 					$oMail->setReceiptor($email_address, $email_address);
 					$oMail->send();
 				}
@@ -236,7 +243,9 @@ 
 		$obj = Context::getRequestVars();
 		$obj->module_srl = $this->module_srl;
 
-		if(!$this->module_info->use_status) $this->module_info->use_status = 'PUBLIC';
+		if(!$this->module_info->use_status) {
+			$this->module_info->use_status = 'PUBLIC';
+		}
 		if(!is_array($this->module_info->use_status))
 		{
 			$this->module_info->use_status = explode('|@|', $this->module_info->use_status);
@@ -245,8 +254,7 @@ 
 		if(in_array('SECRET', $this->module_info->use_status))
 		{
 			$this->module_info->secret = 'Y';
-		}
-		else
+		} else
 		{
 			unset($obj->is_secret);
 			$this->module_info->secret = 'N';
@@ -269,8 +277,7 @@ 
 			$obj->email_address = $obj->homepage = $obj->user_id = '';
 			$obj->user_name = $obj->nick_name = 'anonymous';
 			$bAnonymous = true;
-		}
-		else
+		} else
 		{
 			$bAnonymous = false;
 		}
@@ -370,7 +377,9 @@ 
 		// generate trackback module controller object
 		$oTrackbackController = getController('trackback');
 
-		if(!$oTrackbackController) return;
+		if(!$oTrackbackController) {
+			return;
+		}
 
 		$output = $oTrackbackController->deleteTrackback($trackback_srl, $this->grant->manager);
 		if(!$output->toBool())

Spacing +64 added lines, -64 removed lines

@@ -23,11 +23,11 @@ 
 	function procBoardInsertDocument()
 	{
 		// check grant
-		if($this->module_info->module != "board")
+		if ($this->module_info->module != "board")
 		{
 			return new Object(-1, "msg_invalid_request");
 		}
-		if(!$this->grant->write_document)
+		if (!$this->grant->write_document)
 		{
 			return new Object(-1, 'msg_not_permitted');
 		}
@@ -36,16 +36,16 @@ 
 		// setup variables
 		$obj = Context::getRequestVars();
 		$obj->module_srl = $this->module_srl;
-		if($obj->is_notice!='Y'||!$this->grant->manager) $obj->is_notice = 'N';
+		if ($obj->is_notice != 'Y' || !$this->grant->manager) $obj->is_notice = 'N';
 		$obj->commentStatus = $obj->comment_status;
 
 		settype($obj->title, "string");
-		if($obj->title == '') $obj->title = cut_str(trim(strip_tags(nl2br($obj->content))),20,'...');
+		if ($obj->title == '') $obj->title = cut_str(trim(strip_tags(nl2br($obj->content))), 20, '...');
 		//setup dpcument title tp 'Untitled'
-		if($obj->title == '') $obj->title = 'Untitled';
+		if ($obj->title == '') $obj->title = 'Untitled';
 
 		// unset document style if the user is not the document manager
-		if(!$this->grant->manager)
+		if (!$this->grant->manager)
 		{
 			unset($obj->title_color);
 			unset($obj->title_bold);
@@ -62,24 +62,24 @@ 
 
 		// update the document if it is existed
 		$is_update = false;
-		if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
+		if ($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl)
 		{
 			$is_update = true;
 		}
 
 		// if use anonymous is true
-		if($this->module_info->use_anonymous == 'Y')
+		if ($this->module_info->use_anonymous == 'Y')
 		{
 			$this->module_info->admin_mail = '';
 			$obj->notify_message = 'N';
-			if($is_update===false)
+			if ($is_update === false)
 			{
-				$obj->member_srl = -1*$logged_info->member_srl;
+				$obj->member_srl = -1 * $logged_info->member_srl;
 			}
 			$obj->email_address = $obj->homepage = $obj->user_id = '';
 			$obj->user_name = $obj->nick_name = 'anonymous';
 			$bAnonymous = true;
-			if($is_update===false)
+			if ($is_update === false)
 			{
 				$oDocument->add('member_srl', $obj->member_srl);
 			}
@@ -89,10 +89,10 @@ 
 			$bAnonymous = false;
 		}
 
-		if($obj->is_secret == 'Y' || strtoupper($obj->status == 'SECRET'))
+		if ($obj->is_secret == 'Y' || strtoupper($obj->status == 'SECRET'))
 		{
 			$use_status = explode('|@|', $this->module_info->use_status);
-			if(!is_array($use_status) || !in_array('SECRET', $use_status))
+			if (!is_array($use_status) || !in_array('SECRET', $use_status))
 			{
 				unset($obj->is_secret);
 				$obj->status = 'PUBLIC';
@@ -100,24 +100,24 @@ 
 		}
 
 		// update the document if it is existed
-		if($is_update)
+		if ($is_update)
 		{
-			if(!$oDocument->isGranted())
+			if (!$oDocument->isGranted())
 			{
-				return new Object(-1,'msg_not_permitted');
+				return new Object(-1, 'msg_not_permitted');
 			}
 
-			if($this->module_info->use_anonymous == 'Y') {
+			if ($this->module_info->use_anonymous == 'Y') {
 				$obj->member_srl = abs($oDocument->get('member_srl')) * -1;
 				$oDocument->add('member_srl', $obj->member_srl);
 			}
 
-			if($this->module_info->protect_content=="Y" && $oDocument->get('comment_count')>0 && $this->grant->manager==false)
+			if ($this->module_info->protect_content == "Y" && $oDocument->get('comment_count') > 0 && $this->grant->manager == false)
 			{
-				return new Object(-1,'msg_protect_content');
+				return new Object(-1, 'msg_protect_content');
 			}
 
-			if(!$this->grant->manager)
+			if (!$this->grant->manager)
 			{
 				// notice & document style same as before if not manager
 				$obj->is_notice = $oDocument->get('is_notice');
@@ -126,7 +126,7 @@ 
 			}
 			
 			// modify list_order if document status is temp
-			if($oDocument->get('status') == 'TEMP')
+			if ($oDocument->get('status') == 'TEMP')
 			{
 				$obj->last_update = $obj->regdate = date('YmdHis');
 				$obj->update_order = $obj->list_order = (getNextSequence() * -1);
@@ -142,18 +142,18 @@ 
 			$obj->document_srl = $output->get('document_srl');
 
 			// send an email to admin user
-			if($output->toBool() && $this->module_info->admin_mail)
+			if ($output->toBool() && $this->module_info->admin_mail)
 			{
 				$oMail = new Mail();
 				$oMail->setTitle($obj->title);
-				$oMail->setContent( sprintf("From : <a href=\"%s\">%s</a><br/>\r\n%s", getFullUrl('','document_srl',$obj->document_srl), getFullUrl('','document_srl',$obj->document_srl), $obj->content));
+				$oMail->setContent(sprintf("From : <a href=\"%s\">%s</a><br/>\r\n%s", getFullUrl('', 'document_srl', $obj->document_srl), getFullUrl('', 'document_srl', $obj->document_srl), $obj->content));
 				$oMail->setSender($obj->user_name, $obj->email_address);
 
-				$target_mail = explode(',',$this->module_info->admin_mail);
-				for($i=0;$i<count($target_mail);$i++)
+				$target_mail = explode(',', $this->module_info->admin_mail);
+				for ($i = 0; $i < count($target_mail); $i++)
 				{
 					$email_address = trim($target_mail[$i]);
-					if(!$email_address) continue;
+					if (!$email_address) continue;
 					$oMail->setReceiptor($email_address, $email_address);
 					$oMail->send();
 				}
@@ -161,7 +161,7 @@ 
 		}
 
 		// if there is an error
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -171,7 +171,7 @@ 
 		$this->add('document_srl', $output->get('document_srl'));
 
 		// alert a message
-		if(Context::get('xeVirtualRequestMethod') !== 'xml')
+		if (Context::get('xeVirtualRequestMethod') !== 'xml')
 		{
 			$this->setMessage($msg_code);
 		}
@@ -186,7 +186,7 @@ 
 		$document_srl = Context::get('document_srl');
 
 		// if the document is not existed
-		if(!$document_srl)
+		if (!$document_srl)
 		{
 			return $this->doError('msg_invalid_document');
 		}
@@ -194,7 +194,7 @@ 
 		$oDocumentModel = &getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl);
 		// check protect content
-		if($this->module_info->protect_content=="Y" && $oDocument->get('comment_count')>0 && $this->grant->manager==false)
+		if ($this->module_info->protect_content == "Y" && $oDocument->get('comment_count') > 0 && $this->grant->manager == false)
 		{
 			return new Object(-1, 'msg_protect_content');
 		}
@@ -204,7 +204,7 @@ 
 
 		// delete the document
 		$output = $oDocumentController->deleteDocument($document_srl, $this->grant->manager);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -213,7 +213,7 @@ 
 		$this->setRedirectUrl(getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '', 'page', Context::get('page'), 'document_srl', ''));
 		$this->add('mid', Context::get('mid'));
 		$this->add('page', Context::get('page'));
-		if(Context::get('xeVirtualRequestMethod') !== 'xml')
+		if (Context::get('xeVirtualRequestMethod') !== 'xml')
 		{
 			$this->setMessage('success_deleted');
 		}
@@ -237,7 +237,7 @@ 
 	function procBoardInsertComment()
 	{
 		// check grant
-		if(!$this->grant->write_comment)
+		if (!$this->grant->write_comment)
 		{
 			return new Object(-1, 'msg_not_permitted');
 		}
@@ -247,13 +247,13 @@ 
 		$obj = Context::getRequestVars();
 		$obj->module_srl = $this->module_srl;
 
-		if(!$this->module_info->use_status) $this->module_info->use_status = 'PUBLIC';
-		if(!is_array($this->module_info->use_status))
+		if (!$this->module_info->use_status) $this->module_info->use_status = 'PUBLIC';
+		if (!is_array($this->module_info->use_status))
 		{
 			$this->module_info->use_status = explode('|@|', $this->module_info->use_status);
 		}
 
-		if(in_array('SECRET', $this->module_info->use_status))
+		if (in_array('SECRET', $this->module_info->use_status))
 		{
 			$this->module_info->secret = 'Y';
 		}
@@ -266,17 +266,17 @@ 
 		// check if the doument is existed
 		$oDocumentModel = getModel('document');
 		$oDocument = $oDocumentModel->getDocument($obj->document_srl);
-		if(!$oDocument->isExists())
+		if (!$oDocument->isExists())
 		{
-			return new Object(-1,'msg_not_founded');
+			return new Object(-1, 'msg_not_founded');
 		}
 
 		// For anonymous use, remove writer's information and notifying information
-		if($this->module_info->use_anonymous == 'Y')
+		if ($this->module_info->use_anonymous == 'Y')
 		{
 			$this->module_info->admin_mail = '';
 			$obj->notify_message = 'N';
-			$obj->member_srl = -1*$logged_info->member_srl;
+			$obj->member_srl = -1 * $logged_info->member_srl;
 			$obj->email_address = $obj->homepage = $obj->user_id = '';
 			$obj->user_name = $obj->nick_name = 'anonymous';
 			$bAnonymous = true;
@@ -294,7 +294,7 @@ 
 
 		// check the comment is existed
 		// if the comment is not existed, then generate a new sequence
-		if(!$obj->comment_srl)
+		if (!$obj->comment_srl)
 		{
 			$obj->comment_srl = getNextSequence();
 		} else {
@@ -302,14 +302,14 @@ 
 		}
 
 		// if comment_srl is not existed, then insert the comment
-		if($comment->comment_srl != $obj->comment_srl)
+		if ($comment->comment_srl != $obj->comment_srl)
 		{
 
 			// parent_srl is existed
-			if($obj->parent_srl)
+			if ($obj->parent_srl)
 			{
 				$parent_comment = $oCommentModel->getComment($obj->parent_srl);
-				if(!$parent_comment->comment_srl)
+				if (!$parent_comment->comment_srl)
 				{
 					return new Object(-1, 'msg_invalid_request');
 				}
@@ -323,9 +323,9 @@ 
 		// update the comment if it is not existed
 		} else {
 			// check the grant
-			if(!$comment->isGranted())
+			if (!$comment->isGranted())
 			{
-				return new Object(-1,'msg_not_permitted');
+				return new Object(-1, 'msg_not_permitted');
 			}
 
 			$obj->parent_srl = $comment->parent_srl;
@@ -333,12 +333,12 @@ 
 			$comment_srl = $obj->comment_srl;
 		}
 
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
 
-		if(Context::get('xeVirtualRequestMethod') !== 'xml')
+		if (Context::get('xeVirtualRequestMethod') !== 'xml')
 		{
 			$this->setMessage('success_registed');
 		}
@@ -354,7 +354,7 @@ 
 	{
 		// get the comment_srl
 		$comment_srl = Context::get('comment_srl');
-		if(!$comment_srl)
+		if (!$comment_srl)
 		{
 			return $this->doError('msg_invalid_request');
 		}
@@ -363,7 +363,7 @@ 
 		$oCommentController = getController('comment');
 
 		$output = $oCommentController->deleteComment($comment_srl, $this->grant->manager);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -371,7 +371,7 @@ 
 		$this->add('mid', Context::get('mid'));
 		$this->add('page', Context::get('page'));
 		$this->add('document_srl', $output->get('document_srl'));
-		if(Context::get('xeVirtualRequestMethod') !== 'xml')
+		if (Context::get('xeVirtualRequestMethod') !== 'xml')
 		{
 			$this->setMessage('success_deleted');
 		}
@@ -387,10 +387,10 @@ 
 		// generate trackback module controller object
 		$oTrackbackController = getController('trackback');
 
-		if(!$oTrackbackController) return;
+		if (!$oTrackbackController) return;
 
 		$output = $oTrackbackController->deleteTrackback($trackback_srl, $this->grant->manager);
-		if(!$output->toBool())
+		if (!$output->toBool())
 		{
 			return $output;
 		}
@@ -398,7 +398,7 @@ 
 		$this->add('mid', Context::get('mid'));
 		$this->add('page', Context::get('page'));
 		$this->add('document_srl', $output->get('document_srl'));
-		if(Context::get('xeVirtualRequestMethod') !== 'xml')
+		if (Context::get('xeVirtualRequestMethod') !== 'xml')
 		{
 			$this->setMessage('success_deleted');
 		}
@@ -417,18 +417,18 @@ 
 		$oMemberModel = getModel('member');
 
 		// if the comment exists
-		if($comment_srl)
+		if ($comment_srl)
 		{
 			// get the comment information
 			$oCommentModel = getModel('comment');
 			$oComment = $oCommentModel->getComment($comment_srl);
-			if(!$oComment->isExists())
+			if (!$oComment->isExists())
 			{
 				return new Object(-1, 'msg_invalid_request');
 			}
 
 			// compare the comment password and the user input password
-			if(!$oMemberModel->isValidPassword($oComment->get('password'),$password))
+			if (!$oMemberModel->isValidPassword($oComment->get('password'), $password))
 			{
 				return new Object(-1, 'msg_invalid_password');
 			}
@@ -438,13 +438,13 @@ 
 			 // get the document information
 			$oDocumentModel = getModel('document');
 			$oDocument = $oDocumentModel->getDocument($document_srl);
-			if(!$oDocument->isExists())
+			if (!$oDocument->isExists())
 			{
 				return new Object(-1, 'msg_invalid_request');
 			}
 
 			// compare the document password and the user input password
-			if(!$oMemberModel->isValidPassword($oDocument->get('password'),$password))
+			if (!$oMemberModel->isValidPassword($oDocument->get('password'), $password))
 			{
 				return new Object(-1, 'msg_invalid_password');
 			}
@@ -461,7 +461,7 @@ 
 		$member_srl = Context::get('target_srl');
 		$mid = Context::get('cur_mid');
 
-		if(!$member_srl || !$mid)
+		if (!$member_srl || !$mid)
 		{
 			return new Object();
 		}
@@ -473,13 +473,13 @@ 
 		$columnList = array('module');
 		$cur_module_info = $oModuleModel->getModuleInfoByMid($mid, 0, $columnList);
 
-		if($cur_module_info->module != 'board')
+		if ($cur_module_info->module != 'board')
 		{
 			return new Object();
 		}
 
 		// get the member information
-		if($member_srl == $logged_info->member_srl)
+		if ($member_srl == $logged_info->member_srl)
 		{
 			$member_info = $logged_info;
 		} else {
@@ -487,13 +487,13 @@ 
 			$member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
 		}
 
-		if(!$member_info->user_id)
+		if (!$member_info->user_id)
 		{
 			return new Object();
 		}
 
 		//search
-		$url = getUrl('','mid',$mid,'search_target','nick_name','search_keyword',$member_info->nick_name);
+		$url = getUrl('', 'mid', $mid, 'search_target', 'nick_name', 'search_keyword', $member_info->nick_name);
 		$oMemberController = getController('member');
 		$oMemberController->addMemberPopupMenu($url, 'cmd_view_own_document', '');
 

modules/board/board.mobile.php

Braces +24 added lines, -13 removed lines

@@ -10,12 +10,24 @@ 
 		$oSecurity = new Security();

 		$oSecurity->encodeHTML('document_srl', 'comment_srl', 'vid', 'mid', 'page', 'category', 'search_target', 'search_keyword', 'sort_index', 'order_type', 'trackback_srl');

 

-		if($this->module_info->list_count) $this->list_count = $this->module_info->list_count;

-		if($this->module_info->mobile_list_count) $this->list_count = $this->module_info->mobile_list_count;

-		if($this->module_info->search_list_count) $this->search_list_count = $this->module_info->search_list_count;

-		if($this->module_info->mobile_search_list_count) $this->list_count = $this->module_info->mobile_search_list_count;

-		if($this->module_info->page_count) $this->page_count = $this->module_info->page_count;

-		if($this->module_info->mobile_page_count) $this->page_count = $this->module_info->mobile_page_count;

+		if($this->module_info->list_count) {
+			$this->list_count = $this->module_info->list_count;
+		}
+		if($this->module_info->mobile_list_count) {
+			$this->list_count = $this->module_info->mobile_list_count;
+		}
+		if($this->module_info->search_list_count) {
+			$this->search_list_count = $this->module_info->search_list_count;
+		}
+		if($this->module_info->mobile_search_list_count) {
+			$this->list_count = $this->module_info->mobile_search_list_count;
+		}
+		if($this->module_info->page_count) {
+			$this->page_count = $this->module_info->page_count;
+		}
+		if($this->module_info->mobile_page_count) {
+			$this->page_count = $this->module_info->mobile_page_count;
+		}
 		$this->except_notice = $this->module_info->except_notice == 'N' ? false : true;

 

 		// $this->_getStatusNameListecret option backward compatibility

@@ -34,18 +46,15 @@ 
 			if($this->module_info->hide_category)

 			{

 				$this->module_info->use_category = ($this->module_info->hide_category == 'Y') ? 'N' : 'Y';

-			}

-			else if($this->module_info->use_category)

+			} else if($this->module_info->use_category)

 			{

 				$this->module_info->hide_category = ($this->module_info->use_category == 'Y') ? 'N' : 'Y';

-			}

-			else

+			} else

 			{

 				$this->module_info->hide_category = 'N';

 				$this->module_info->use_category = 'Y';

 			}

-		}

-		else

+		} else

 		{

 			$this->module_info->hide_category = 'Y';

 			$this->module_info->use_category = 'N';

@@ -58,7 +67,9 @@ 
 		if($this->module_info->consultation == 'Y' && !$this->grant->manager)

 		{

 			$this->consultation = true;

-			if(!Context::get('is_logged')) $this->grant->list = $this->grant->write_document = $this->grant->write_comment = $this->grant->view = false;

+			if(!Context::get('is_logged')) {
+				$this->grant->list = $this->grant->write_document = $this->grant->write_comment = $this->grant->view = false;
+			}
 		} else {

 			$this->consultation = false;

 		}

Spacing +19 added lines, -19 removed lines

@@ -10,32 +10,32 @@ 
 		$oSecurity = new Security();

 		$oSecurity->encodeHTML('document_srl', 'comment_srl', 'vid', 'mid', 'page', 'category', 'search_target', 'search_keyword', 'sort_index', 'order_type', 'trackback_srl');

 

-		if($this->module_info->list_count) $this->list_count = $this->module_info->list_count;

-		if($this->module_info->mobile_list_count) $this->list_count = $this->module_info->mobile_list_count;

-		if($this->module_info->search_list_count) $this->search_list_count = $this->module_info->search_list_count;

-		if($this->module_info->mobile_search_list_count) $this->list_count = $this->module_info->mobile_search_list_count;

-		if($this->module_info->page_count) $this->page_count = $this->module_info->page_count;

-		if($this->module_info->mobile_page_count) $this->page_count = $this->module_info->mobile_page_count;

+		if ($this->module_info->list_count) $this->list_count = $this->module_info->list_count;

+		if ($this->module_info->mobile_list_count) $this->list_count = $this->module_info->mobile_list_count;

+		if ($this->module_info->search_list_count) $this->search_list_count = $this->module_info->search_list_count;

+		if ($this->module_info->mobile_search_list_count) $this->list_count = $this->module_info->mobile_search_list_count;

+		if ($this->module_info->page_count) $this->page_count = $this->module_info->page_count;

+		if ($this->module_info->mobile_page_count) $this->page_count = $this->module_info->mobile_page_count;

 		$this->except_notice = $this->module_info->except_notice == 'N' ? false : true;

 

 		// $this->_getStatusNameListecret option backward compatibility

 		$oDocumentModel = getModel('document');

 

 		$statusList = $this->_getStatusNameList($oDocumentModel);

-		if(isset($statusList['SECRET']))

+		if (isset($statusList['SECRET']))

 		{

 			$this->module_info->secret = 'Y';

 		}

 

 		// use_category <=1.5.x, hide_category >=1.7.x

 		$count_category = count($oDocumentModel->getCategoryList($this->module_info->module_srl));

-		if($count_category)

+		if ($count_category)

 		{

-			if($this->module_info->hide_category)

+			if ($this->module_info->hide_category)

 			{

 				$this->module_info->use_category = ($this->module_info->hide_category == 'Y') ? 'N' : 'Y';

 			}

-			else if($this->module_info->use_category)

+			else if ($this->module_info->use_category)

 			{

 				$this->module_info->hide_category = ($this->module_info->use_category == 'Y') ? 'N' : 'Y';

 			}

@@ -55,10 +55,10 @@ 
 		 * check the consultation function, if the user is admin then swich off consultation function

 		 * if the user is not logged, then disppear write document/write comment./ view document

 		 **/

-		if($this->module_info->consultation == 'Y' && !$this->grant->manager)

+		if ($this->module_info->consultation == 'Y' && !$this->grant->manager)

 		{

 			$this->consultation = true;

-			if(!Context::get('is_logged')) $this->grant->list = $this->grant->write_document = $this->grant->write_comment = $this->grant->view = false;

+			if (!Context::get('is_logged')) $this->grant->list = $this->grant->write_document = $this->grant->write_comment = $this->grant->view = false;

 		} else {

 			$this->consultation = false;

 		}

@@ -67,11 +67,11 @@ 
 		$extra_keys = $oDocumentModel->getExtraKeys($this->module_info->module_srl);

 		Context::set('extra_keys', $extra_keys);

 

-		$template_path = sprintf("%sm.skins/%s/",$this->module_path, $this->module_info->mskin);

-		if(!is_dir($template_path)||!$this->module_info->mskin)

+		$template_path = sprintf("%sm.skins/%s/", $this->module_path, $this->module_info->mskin);

+		if (!is_dir($template_path) || !$this->module_info->mskin)

 		{

 			$this->module_info->mskin = 'default';

-			$template_path = sprintf("%sm.skins/%s/",$this->module_path, $this->module_info->mskin);

+			$template_path = sprintf("%sm.skins/%s/", $this->module_path, $this->module_info->mskin);

 		}

 		$this->setTemplatePath($template_path);

 		Context::addJsFilter($this->module_path.'tpl/filter', 'input_password.xml');

@@ -87,13 +87,13 @@ 
 	function getBoardCommentPage()

 	{

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

-		$oDocumentModel =& getModel('document');

-		if(!$document_srl)

+		$oDocumentModel = & getModel('document');

+		if (!$document_srl)

 		{

 			return new Object(-1, "msg_invalid_request");

 		}

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

-		if(!$oDocument->isExists())

+		if (!$oDocument->isExists())

 		{

 			return new Object(-1, "msg_invalid_request");

 		}

@@ -106,7 +106,7 @@ 
 	function dispBoardMessage($msg_code)

 	{

 		$msg = Context::getLang($msg_code);

-		$oMessageObject = &ModuleHandler::getModuleInstance('message','mobile');

+		$oMessageObject = &ModuleHandler::getModuleInstance('message', 'mobile');

 		$oMessageObject->setError(-1);

 		$oMessageObject->setMessage($msg);

 		$oMessageObject->dispMessage();