xpressengine / xe-core

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

modules/board/board.class.php

Spacing +14 added lines, -14 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,14 +25,14 @@ 
 	 */
 	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);
 		}
-		if(!Context::isExistsSSLAction('dispTempSavedList') && Context::getSslStatus() == 'optional')
+		if (!Context::isExistsSSLAction('dispTempSavedList') && Context::getSslStatus() == 'optional')
 		{
 			Context::addSSLAction('dispTempSavedList');
 		}
@@ -54,7 +54,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';
@@ -63,7 +63,7 @@ 
 			$args->site_srl = 0;
 			$output = $oModuleController->insertModule($args);
 
-			if($output->toBool())
+			if ($output->toBool())
 			{
 				$module_srl = $output->get('module_srl');
 
@@ -87,13 +87,13 @@ 
 		$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))
 		{
 			// 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;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -109,16 +109,16 @@ 
 		$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))
 		{
 			// 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');
 			}
@@ -131,12 +131,12 @@ 
 	function moduleUninstall()
 	{
 		$output = executeQueryArray("board.getAllBoard");
-		if(!$output->data) return new BaseObject();
+		if (!$output->data) return new BaseObject();
 		@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')
 		{
@@ -90,10 +92,14 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// 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;
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -131,7 +137,9 @@ 
 	function moduleUninstall()
 	{
 		$output = executeQueryArray("board.getAllBoard");
-		if(!$output->data) return new BaseObject();
+		if(!$output->data) {
+			return new BaseObject();
+		}
 		@set_time_limit(0);
 
 		$oModuleController = getController('module');

modules/install/install.controller.php

Spacing +118 added lines, -118 removed lines

@@ -17,7 +17,7 @@ 
 	function init()
 	{
 		// Error occurs if already installed
-		if($this->act !== 'procInstallLicenseAggrement' && Context::isInstalled())
+		if ($this->act !== 'procInstallLicenseAggrement' && Context::isInstalled())
 		{
 			$this->stop('msg_already_installed');
 		}
@@ -86,7 +86,7 @@ 
 	function _procDBSetting()
 	{
 		// Get DB-related variables
-		$con_string = Context::gets('db_type','db_port','db_hostname','db_userid','db_password','db_database','db_table_prefix');
+		$con_string = Context::gets('db_type', 'db_port', 'db_hostname', 'db_userid', 'db_password', 'db_database', 'db_table_prefix');
 
 		$db_info = new stdClass();
 		$db_info->master_db = get_object_vars($con_string);
@@ -101,13 +101,13 @@ 
 		// Check if available to connect to the DB
 		$oDB = &DB::getInstance();
 		$output = $oDB->getError();
-		if(!$output->toBool()) return $output;
-		if(!$oDB->isConnected()) return $oDB->getError();
+		if (!$output->toBool()) return $output;
+		if (!$oDB->isConnected()) return $oDB->getError();
 
 		// Create a db temp config file
-		if(!$this->makeDBConfigFile()) return new BaseObject(-1, 'msg_install_failed');
+		if (!$this->makeDBConfigFile()) return new BaseObject(-1, 'msg_install_failed');
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'act', 'dispInstallConfigForm');
 			header('location:'.$returnUrl);
@@ -121,13 +121,13 @@ 
 	function procConfigSetting()
 	{
 		// Get variables
-		$config_info = Context::gets('use_rewrite','time_zone');
-		if($config_info->use_rewrite!='Y') $config_info->use_rewrite = 'N';
+		$config_info = Context::gets('use_rewrite', 'time_zone');
+		if ($config_info->use_rewrite != 'Y') $config_info->use_rewrite = 'N';
 
 		// Create a db temp config file
-		if(!$this->makeEtcConfigFile($config_info)) return new BaseObject(-1, 'msg_install_failed');
+		if (!$this->makeEtcConfigFile($config_info)) return new BaseObject(-1, 'msg_install_failed');
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'act', 'dispInstallManagerForm');
 			header('location:'.$returnUrl);
@@ -141,13 +141,13 @@ 
 	function procInstall()
 	{
 		// Check if it is already installed
-		if(Context::isInstalled()) return new BaseObject(-1, 'msg_already_installed');
+		if (Context::isInstalled()) return new BaseObject(-1, 'msg_already_installed');
 
 		Context::loadLang('modules/member/lang');
 		$oMemberModel = getModel('member');
 		$vars = Context::getRequestVars();
 
-		if(!$oMemberModel->checkPasswordStrength($vars->password, 'high'))
+		if (!$oMemberModel->checkPasswordStrength($vars->password, 'high'))
 		{
 			Context::loadLang('modules/member/lang');
 			$message = Context::getLang('about_password_strength');
@@ -160,15 +160,15 @@ 
 		Context::set('logged_info', $logged_info);
 
 		// check install config
-		if(Context::get('install_config'))
+		if (Context::get('install_config'))
 		{
 			$db_info = $this->_makeDbInfoByInstallConfig();
 		}
 		// install by default XE UI
 		else
 		{
-			if(FileHandler::exists($this->db_tmp_config_file)) include $this->db_tmp_config_file;
-			if(FileHandler::exists($this->etc_tmp_config_file)) include $this->etc_tmp_config_file;
+			if (FileHandler::exists($this->db_tmp_config_file)) include $this->db_tmp_config_file;
+			if (FileHandler::exists($this->etc_tmp_config_file)) include $this->etc_tmp_config_file;
 		}
 
 		// Set DB type and information
@@ -176,30 +176,30 @@ 
 		// Create DB Instance
 		$oDB = &DB::getInstance();
 		// Check if available to connect to the DB
-		if(!$oDB->isConnected()) return $oDB->getError();
+		if (!$oDB->isConnected()) return $oDB->getError();
 
 		// Install all the modules
 		try {
 			$oDB->begin();
 			$this->installDownloadedModule();
 			$oDB->commit();
-		} catch(Exception $e) {
+		} catch (Exception $e) {
 			$oDB->rollback();
 			return new BaseObject(-1, $e->getMessage());
 		}
 
 		// Create a config file
-		if(!$this->makeConfigFile()) return new BaseObject(-1, 'msg_install_failed');
+		if (!$this->makeConfigFile()) return new BaseObject(-1, 'msg_install_failed');
 
 		// load script
-		$scripts = FileHandler::readDir(_XE_PATH_ . 'modules/install/script', '/(\.php)$/');
-		if(count($scripts)>0)
+		$scripts = FileHandler::readDir(_XE_PATH_.'modules/install/script', '/(\.php)$/');
+		if (count($scripts) > 0)
 		{
 			sort($scripts);
-			foreach($scripts as $script)
+			foreach ($scripts as $script)
 			{
 				$script_path = FileHandler::getRealPath('./modules/install/script/');
-				$output = include($script_path . $script);
+				$output = include($script_path.$script);
 			}
 		}
 
@@ -212,7 +212,7 @@ 
 
 		unset($_SESSION['use_rewrite']);
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('');
 			header('location:'.$returnUrl);
@@ -242,7 +242,7 @@ 
 		$db_info->use_rewrite = Context::get('use_rewrite');
 		$db_info->time_zone = Context::get('time_zone');
 
-		if($_SERVER['HTTPS'] == 'on')
+		if ($_SERVER['HTTPS'] == 'on')
 		{
 			$https_port = (Context::get('https_port')) ? Context::get('https_port') : $_SERVER['SERVER_PORT'];
 			$https_port = (!$https_port != 443) ? $https_port : null;
@@ -252,8 +252,8 @@ 
 			$http_port = (Context::get('http_port')) ? Context::get('http_port') : $_SERVER['SERVER_PORT'];
 			$http_port = (!$http_port != 80) ? $http_port : null;
 		}
-		if($http_port) $db_info->http_port = $http_port;
-		if($https_port) $db_info->https_port = $https_port;
+		if ($http_port) $db_info->http_port = $http_port;
+		if ($https_port) $db_info->https_port = $https_port;
 
 		return $db_info;
 	}
@@ -263,57 +263,57 @@ 
 	 */
 	function procInstallFTP()
 	{
-		if(Context::isInstalled()) return new BaseObject(-1, 'msg_already_installed');
-		$ftp_info = Context::gets('ftp_host', 'ftp_user','ftp_password','ftp_port','ftp_root_path');
-		$ftp_info->ftp_port = (int)$ftp_info->ftp_port;
-		if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
-		if(!$ftp_info->ftp_host) $ftp_info->ftp_host = '127.0.0.1';
-		if(!$ftp_info->ftp_root_path) $ftp_info->ftp_root_path = '/';
+		if (Context::isInstalled()) return new BaseObject(-1, 'msg_already_installed');
+		$ftp_info = Context::gets('ftp_host', 'ftp_user', 'ftp_password', 'ftp_port', 'ftp_root_path');
+		$ftp_info->ftp_port = (int) $ftp_info->ftp_port;
+		if (!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
+		if (!$ftp_info->ftp_host) $ftp_info->ftp_host = '127.0.0.1';
+		if (!$ftp_info->ftp_root_path) $ftp_info->ftp_root_path = '/';
 
 		$buff = array('<?php if(!defined("__XE__")) exit();');
 		$buff[] = "\$ftp_info = new stdClass();";
-		foreach($ftp_info as $key => $val)
+		foreach ($ftp_info as $key => $val)
 		{
-			$buff[] = sprintf("\$ftp_info->%s='%s';", $key, str_replace("'","\\'",$val));
+			$buff[] = sprintf("\$ftp_info->%s='%s';", $key, str_replace("'", "\\'", $val));
 		}
 
 		// If safe_mode
-		if(ini_get('safe_mode'))
+		if (ini_get('safe_mode'))
 		{
-			if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new BaseObject(-1,'msg_safe_mode_ftp_needed');
+			if (!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new BaseObject(-1, 'msg_safe_mode_ftp_needed');
 
 			require_once(_XE_PATH_.'libs/ftp.class.php');
 			$oFtp = new ftp();
-			if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
+			if (!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
 
-			if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
+			if (!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
 				$oFtp->ftp_quit();
-				return new BaseObject(-1,'msg_ftp_invalid_auth_info');
+				return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 			}
 
-			if(!is_dir(_XE_PATH_.'files') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files'))
+			if (!is_dir(_XE_PATH_.'files') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files'))
 			{
 				$oFtp->ftp_quit();
-				return new BaseObject(-1,'msg_ftp_mkdir_fail');
+				return new BaseObject(-1, 'msg_ftp_mkdir_fail');
 			}
 
-			if(!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files'))
+			if (!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files'))
 			{
 				$oFtp->ftp_quit();
-				return new BaseObject(-1,'msg_ftp_chmod_fail');
+				return new BaseObject(-1, 'msg_ftp_chmod_fail');
 			}
 
-			if(!is_dir(_XE_PATH_.'files/config') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files/config'))
+			if (!is_dir(_XE_PATH_.'files/config') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files/config'))
 			{
 				$oFtp->ftp_quit();
-				return new BaseObject(-1,'msg_ftp_mkdir_fail');
+				return new BaseObject(-1, 'msg_ftp_mkdir_fail');
 			}
 
-			if(!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files/config'))
+			if (!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files/config'))
 			{
 				$oFtp->ftp_quit();
-				return new BaseObject(-1,'msg_ftp_chmod_fail');
+				return new BaseObject(-1, 'msg_ftp_chmod_fail');
 			}
 
 			$oFtp->ftp_quit();
@@ -324,31 +324,31 @@ 
 
 	function procInstallCheckFtp()
 	{
-		$ftp_info = Context::gets('ftp_user','ftp_password','ftp_port','sftp');
-		$ftp_info->ftp_port = (int)$ftp_info->ftp_port;
-		if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
-		if(!$ftp_info->sftp) $ftp_info->sftp = 'N';
+		$ftp_info = Context::gets('ftp_user', 'ftp_password', 'ftp_port', 'sftp');
+		$ftp_info->ftp_port = (int) $ftp_info->ftp_port;
+		if (!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
+		if (!$ftp_info->sftp) $ftp_info->sftp = 'N';
 
-		if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new BaseObject(-1,'msg_safe_mode_ftp_needed');
+		if (!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new BaseObject(-1, 'msg_safe_mode_ftp_needed');
 
-		if($ftp_info->sftp == 'Y')
+		if ($ftp_info->sftp == 'Y')
 		{
 			$connection = ssh2_connect('localhost', $ftp_info->ftp_port);
-			if(!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
+			if (!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
-				return new BaseObject(-1,'msg_ftp_invalid_auth_info');
+				return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 			}
 		}
 		else
 		{
 			require_once(_XE_PATH_.'libs/ftp.class.php');
 			$oFtp = new ftp();
-			if(!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost'));
+			if (!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost'));
 
-			if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
+			if (!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
 				$oFtp->ftp_quit();
-				return new BaseObject(-1,'msg_ftp_invalid_auth_info');
+				return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 			}
 			$oFtp->ftp_quit();
 		}
@@ -365,36 +365,36 @@ 
 		$checklist = array();
 		// 0. check your version of php (5.2.4 or higher)
 		$checklist['php_version'] = true;
-		if(version_compare(PHP_VERSION, __XE_MIN_PHP_VERSION__, '<'))
+		if (version_compare(PHP_VERSION, __XE_MIN_PHP_VERSION__, '<'))
 		{
 			$checklist['php_version'] = false;
 		}
 
-		if(version_compare(PHP_VERSION, __XE_RECOMMEND_PHP_VERSION__, '<'))
+		if (version_compare(PHP_VERSION, __XE_RECOMMEND_PHP_VERSION__, '<'))
 		{
 			Context::set('phpversion_warning', true);
 		}
 
 		// 1. Check permission
-		if(is_writable('./')||is_writable('./files')) $checklist['permission'] = true;
+		if (is_writable('./') || is_writable('./files')) $checklist['permission'] = true;
 		else $checklist['permission'] = false;
 		// 2. Check if xml_parser_create exists
-		if(function_exists('xml_parser_create')) $checklist['xml'] = true;
+		if (function_exists('xml_parser_create')) $checklist['xml'] = true;
 		else $checklist['xml'] = false;
 		// 3. Check if ini_get (session.auto_start) == 1
-		if(ini_get('session.auto_start')!=1) $checklist['session'] = true;
+		if (ini_get('session.auto_start') != 1) $checklist['session'] = true;
 		else $checklist['session'] = false;
 		// 4. Check if iconv exists
-		if(function_exists('iconv')) $checklist['iconv'] = true;
+		if (function_exists('iconv')) $checklist['iconv'] = true;
 		else $checklist['iconv'] = false;
 		// 5. Check gd(imagecreatefromgif function)
-		if(function_exists('imagecreatefromgif')) $checklist['gd'] = true;
+		if (function_exists('imagecreatefromgif')) $checklist['gd'] = true;
 		else $checklist['gd'] = false;
 		// 6. Check DB
-		if(DB::getEnableList()) $checklist['db'] = true;
+		if (DB::getEnableList()) $checklist['db'] = true;
 		else $checklist['db'] = false;
 
-		if(!$checklist['php_version'] || !$checklist['permission'] || !$checklist['xml'] || !$checklist['session'] || !$checklist['db']) $install_enable = false;
+		if (!$checklist['php_version'] || !$checklist['permission'] || !$checklist['xml'] || !$checklist['session'] || !$checklist['db']) $install_enable = false;
 		else $install_enable = true;
 
 		// Save the checked result to the Context
@@ -414,7 +414,7 @@ 
 
 		$license_agreement = ($vars->license_agreement == 'Y') ? true : false;
 
-		if($license_agreement)
+		if ($license_agreement)
 		{
 			$currentTime = $_SERVER['REQUEST_TIME'];
 			FileHandler::writeFile($this->flagLicenseAgreement, $currentTime);
@@ -425,7 +425,7 @@ 
 			return new BaseObject(-1, 'msg_must_accept_license_agreement');
 		}
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if (!in_array(Context::getRequestMethod(), array('XMLRPC', 'JSON')))
 		{
 			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'act', 'dispInstallCheckEnv');
 			$this->setRedirectUrl($returnUrl);
@@ -448,25 +448,25 @@ 
 		$hostname = $_SERVER['SERVER_NAME'];
 		$port = $_SERVER['SERVER_PORT'];
 		$str_port = '';
-		if($port)
+		if ($port)
 		{
-			$str_port = ':' . $port;
+			$str_port = ':'.$port;
 		}
 
 		$tmpPath = $_SERVER['DOCUMENT_ROOT'];
 
 		//if DIRECTORY_SEPARATOR is not /(IIS)
-		if(DIRECTORY_SEPARATOR !== '/')
+		if (DIRECTORY_SEPARATOR !== '/')
 		{
 			//change to slash for compare
 			$tmpPath = str_replace(DIRECTORY_SEPARATOR, '/', $_SERVER['DOCUMENT_ROOT']);
 		}
 
-		$query = "/JUST/CHECK/REWRITE/" . $checkFilePath;
+		$query = "/JUST/CHECK/REWRITE/".$checkFilePath;
 		$currentPath = str_replace($tmpPath, "", _XE_PATH_);
-		if($currentPath != "")
+		if ($currentPath != "")
 		{
-			$query = $currentPath . $query;
+			$query = $currentPath.$query;
 		}
 		$requestUrl = sprintf('%s://%s%s%s', $scheme, $hostname, $str_port, $query);
 		$requestConfig = array();
@@ -491,7 +491,7 @@ 
 			'./files/cache/template_compiled',
 		);
 
-		foreach($directory_list as $dir)
+		foreach ($directory_list as $dir)
 		{
 			FileHandler::makeDir($dir);
 		}
@@ -507,57 +507,57 @@ 
 		$oModuleModel = getModel('module');
 		// Create a table ny finding schemas/*.xml file in each module
 		$module_list = FileHandler::readDir('./modules/', NULL, false, true);
-		foreach($module_list as $module_path)
+		foreach ($module_list as $module_path)
 		{
 			// Get module name
-			$tmp_arr = explode('/',$module_path);
-			$module = $tmp_arr[count($tmp_arr)-1];
+			$tmp_arr = explode('/', $module_path);
+			$module = $tmp_arr[count($tmp_arr) - 1];
 
 			$xml_info = $oModuleModel->getModuleInfoXml($module);
-			if(!$xml_info) continue;
+			if (!$xml_info) continue;
 			$modules[$xml_info->category][] = $module;
 		}
 		// Install "module" module in advance
-		$this->installModule('module','./modules/module');
+		$this->installModule('module', './modules/module');
 		$oModule = getClass('module');
-		if($oModule->checkUpdate()) $oModule->moduleUpdate();
+		if ($oModule->checkUpdate()) $oModule->moduleUpdate();
 		// Determine the order of module installation depending on category
-		$install_step = array('system','content','member');
+		$install_step = array('system', 'content', 'member');
 		// Install all the remaining modules
-		foreach($install_step as $category)
+		foreach ($install_step as $category)
 		{
-			if(count($modules[$category]))
+			if (count($modules[$category]))
 			{
-				foreach($modules[$category] as $module)
+				foreach ($modules[$category] as $module)
 				{
-					if($module == 'module') continue;
+					if ($module == 'module') continue;
 					$this->installModule($module, sprintf('./modules/%s', $module));
 
 					$oModule = getClass($module);
-					if(is_object($oModule) && method_exists($oModule, 'checkUpdate'))
+					if (is_object($oModule) && method_exists($oModule, 'checkUpdate'))
 					{
-						if($oModule->checkUpdate()) $oModule->moduleUpdate();
+						if ($oModule->checkUpdate()) $oModule->moduleUpdate();
 					}
 				}
 				unset($modules[$category]);
 			}
 		}
 		// Install all the remaining modules
-		if(count($modules))
+		if (count($modules))
 		{
-			foreach($modules as $category => $module_list)
+			foreach ($modules as $category => $module_list)
 			{
-				if(count($module_list))
+				if (count($module_list))
 				{
-					foreach($module_list as $module)
+					foreach ($module_list as $module)
 					{
-						if($module == 'module') continue;
+						if ($module == 'module') continue;
 						$this->installModule($module, sprintf('./modules/%s', $module));
 
 						$oModule = getClass($module);
-						if($oModule && method_exists($oModule, 'checkUpdate') && method_exists($oModule, 'moduleUpdate'))
+						if ($oModule && method_exists($oModule, 'checkUpdate') && method_exists($oModule, 'moduleUpdate'))
 						{
-							if($oModule->checkUpdate()) $oModule->moduleUpdate();
+							if ($oModule->checkUpdate()) $oModule->moduleUpdate();
 						}
 					}
 				}
@@ -579,31 +579,31 @@ 
 		$schema_files = FileHandler::readDir($schema_dir, NULL, false, true);
 
 		$file_cnt = count($schema_files);
-		for($i=0;$i<$file_cnt;$i++)
+		for ($i = 0; $i < $file_cnt; $i++)
 		{
 			$file = trim($schema_files[$i]);
-			if(!$file || substr($file,-4)!='.xml') continue;
+			if (!$file || substr($file, -4) != '.xml') continue;
 			$output = $oDB->createTableByXmlFile($file);
-			if($output === false)
+			if ($output === false)
 				throw new Exception('msg_create_table_failed');
 		}
 		// Create a table and module instance and then execute install() method
 		unset($oModule);
 		$oModule = getClass($module);
-		if(method_exists($oModule, 'moduleInstall')) $oModule->moduleInstall();
+		if (method_exists($oModule, 'moduleInstall')) $oModule->moduleInstall();
 		return new BaseObject();
 	}
 
 	function _getDBConfigFileContents($db_info)
 	{
-		if(substr($db_info->master_db['db_table_prefix'], -1) != '_')
+		if (substr($db_info->master_db['db_table_prefix'], -1) != '_')
 		{
 			$db_info->master_db['db_table_prefix'] .= '_';
 		}
 
-		foreach($db_info->slave_db as &$slave)
+		foreach ($db_info->slave_db as &$slave)
 		{
-			if(substr($slave['db_table_prefix'], -1) != '_')
+			if (substr($slave['db_table_prefix'], -1) != '_')
 			{
 				$slave['db_table_prefix'] .= '_';
 			}
@@ -611,7 +611,7 @@ 
 
 		$buff = array();
 		$buff[] = '<?php if(!defined("__XE__")) exit();';
-		$buff[] = '$db_info = (object)' . var_export(get_object_vars($db_info), TRUE) . ';';
+		$buff[] = '$db_info = (object)'.var_export(get_object_vars($db_info), TRUE).';';
 
 		return implode(PHP_EOL, $buff);
 	}
@@ -625,13 +625,13 @@ 
 		$db_tmp_config_file = $this->db_tmp_config_file;
 
 		$db_info = Context::getDBInfo();
-		if(!$db_info) return;
+		if (!$db_info) return;
 
 		$buff = $this->_getDBConfigFileContents($db_info);
 
 		FileHandler::writeFile($db_tmp_config_file, $buff);
 
-		if(@file_exists($db_tmp_config_file)) return true;
+		if (@file_exists($db_tmp_config_file)) return true;
 		return false;
 	}
 
@@ -644,14 +644,14 @@ 
 		$etc_tmp_config_file = $this->etc_tmp_config_file;
 
 		$buff = '<?php if(!defined("__XE__")) exit();'."\n";
-		foreach($config_info as $key => $val)
+		foreach ($config_info as $key => $val)
 		{
-			$buff .= sprintf("\$db_info->%s = '%s';\n", $key, str_replace("'","\\'",$val));
+			$buff .= sprintf("\$db_info->%s = '%s';\n", $key, str_replace("'", "\\'", $val));
 		}
 
 		FileHandler::writeFile($etc_tmp_config_file, $buff);
 
-		if(@file_exists($etc_tmp_config_file)) return true;
+		if (@file_exists($etc_tmp_config_file)) return true;
 		return false;
 	}
 
@@ -666,13 +666,13 @@ 
 			//if(file_exists($config_file)) return;
 
 			$db_info = Context::getDBInfo();
-			if(!$db_info) return;
+			if (!$db_info) return;
 
 			$buff = $this->_getDBConfigFileContents($db_info);
 
 			FileHandler::writeFile($config_file, $buff);
 
-			if(@file_exists($config_file))
+			if (@file_exists($config_file))
 			{
 				FileHandler::removeFile($this->db_tmp_config_file);
 				FileHandler::removeFile($this->etc_tmp_config_file);
@@ -687,7 +687,7 @@ 
 	function installByConfig($install_config_file)
 	{
 		include $install_config_file;
-		if(!is_array($auto_config)) return false;
+		if (!is_array($auto_config)) return false;
 
 		$auto_config['module'] = 'install';
 		$auto_config['act'] = 'procInstall';
@@ -695,22 +695,22 @@ 
 		$fstr = "<%s><![CDATA[%s]]></%s>\r\n";
 		$fheader = "POST %s HTTP/1.1\r\nHost: %s\r\nContent-Type: application/xml\r\nContent-Length: %s\r\n\r\n%s\r\n";
 		$body = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\r\n<methodCall>\r\n<params>\r\n";
-		foreach($auto_config as $k => $v)
+		foreach ($auto_config as $k => $v)
 		{
-			if(!in_array($k,array('host','port','path'))) $body .= sprintf($fstr,$k,$v,$k);
+			if (!in_array($k, array('host', 'port', 'path'))) $body .= sprintf($fstr, $k, $v, $k);
 		}
 		$body .= "</params>\r\n</methodCall>";
 
-		$header = sprintf($fheader,$auto_config['path'],$auto_config['host'],strlen($body),$body);
+		$header = sprintf($fheader, $auto_config['path'], $auto_config['host'], strlen($body), $body);
 		$fp = @fsockopen($auto_config['host'], $auto_config['port'], $errno, $errstr, 5);
 
-		if($fp)
+		if ($fp)
 		{
 			fputs($fp, $header);
-			while(!feof($fp))
+			while (!feof($fp))
 			{
 				$line = trim(fgets($fp, 4096));
-				if(strncmp('<error>', $line, 7) === 0)
+				if (strncmp('<error>', $line, 7) === 0)
 				{
 					fclose($fp);
 					return false;

Braces +149 added lines, -58 removed lines

@@ -101,11 +101,17 @@ 
 		// Check if available to connect to the DB
 		$oDB = &DB::getInstance();
 		$output = $oDB->getError();
-		if(!$output->toBool()) return $output;
-		if(!$oDB->isConnected()) return $oDB->getError();
+		if(!$output->toBool()) {
+			return $output;
+		}
+		if(!$oDB->isConnected()) {
+			return $oDB->getError();
+		}
 
 		// Create a db temp config file
-		if(!$this->makeDBConfigFile()) return new BaseObject(-1, 'msg_install_failed');
+		if(!$this->makeDBConfigFile()) {
+			return new BaseObject(-1, 'msg_install_failed');
+		}
 
 		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
 		{
@@ -122,10 +128,14 @@ 
 	{
 		// Get variables
 		$config_info = Context::gets('use_rewrite','time_zone');
-		if($config_info->use_rewrite!='Y') $config_info->use_rewrite = 'N';
+		if($config_info->use_rewrite!='Y') {
+			$config_info->use_rewrite = 'N';
+		}
 
 		// Create a db temp config file
-		if(!$this->makeEtcConfigFile($config_info)) return new BaseObject(-1, 'msg_install_failed');
+		if(!$this->makeEtcConfigFile($config_info)) {
+			return new BaseObject(-1, 'msg_install_failed');
+		}
 
 		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
 		{
@@ -141,7 +151,9 @@ 
 	function procInstall()
 	{
 		// Check if it is already installed
-		if(Context::isInstalled()) return new BaseObject(-1, 'msg_already_installed');
+		if(Context::isInstalled()) {
+			return new BaseObject(-1, 'msg_already_installed');
+		}
 
 		Context::loadLang('modules/member/lang');
 		$oMemberModel = getModel('member');
@@ -167,8 +179,12 @@ 
 		// install by default XE UI
 		else
 		{
-			if(FileHandler::exists($this->db_tmp_config_file)) include $this->db_tmp_config_file;
-			if(FileHandler::exists($this->etc_tmp_config_file)) include $this->etc_tmp_config_file;
+			if(FileHandler::exists($this->db_tmp_config_file)) {
+				include $this->db_tmp_config_file;
+			}
+			if(FileHandler::exists($this->etc_tmp_config_file)) {
+				include $this->etc_tmp_config_file;
+			}
 		}
 
 		// Set DB type and information
@@ -176,7 +192,9 @@ 
 		// Create DB Instance
 		$oDB = &DB::getInstance();
 		// Check if available to connect to the DB
-		if(!$oDB->isConnected()) return $oDB->getError();
+		if(!$oDB->isConnected()) {
+			return $oDB->getError();
+		}
 
 		// Install all the modules
 		try {
@@ -189,7 +207,9 @@ 
 		}
 
 		// Create a config file
-		if(!$this->makeConfigFile()) return new BaseObject(-1, 'msg_install_failed');
+		if(!$this->makeConfigFile()) {
+			return new BaseObject(-1, 'msg_install_failed');
+		}
 
 		// load script
 		$scripts = FileHandler::readDir(_XE_PATH_ . 'modules/install/script', '/(\.php)$/');
@@ -246,14 +266,17 @@ 
 		{
 			$https_port = (Context::get('https_port')) ? Context::get('https_port') : $_SERVER['SERVER_PORT'];
 			$https_port = (!$https_port != 443) ? $https_port : null;
-		}
-		else
+		} else
 		{
 			$http_port = (Context::get('http_port')) ? Context::get('http_port') : $_SERVER['SERVER_PORT'];
 			$http_port = (!$http_port != 80) ? $http_port : null;
 		}
-		if($http_port) $db_info->http_port = $http_port;
-		if($https_port) $db_info->https_port = $https_port;
+		if($http_port) {
+			$db_info->http_port = $http_port;
+		}
+		if($https_port) {
+			$db_info->https_port = $https_port;
+		}
 
 		return $db_info;
 	}
@@ -263,12 +286,20 @@ 
 	 */
 	function procInstallFTP()
 	{
-		if(Context::isInstalled()) return new BaseObject(-1, 'msg_already_installed');
+		if(Context::isInstalled()) {
+			return new BaseObject(-1, 'msg_already_installed');
+		}
 		$ftp_info = Context::gets('ftp_host', 'ftp_user','ftp_password','ftp_port','ftp_root_path');
 		$ftp_info->ftp_port = (int)$ftp_info->ftp_port;
-		if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
-		if(!$ftp_info->ftp_host) $ftp_info->ftp_host = '127.0.0.1';
-		if(!$ftp_info->ftp_root_path) $ftp_info->ftp_root_path = '/';
+		if(!$ftp_info->ftp_port) {
+			$ftp_info->ftp_port = 21;
+		}
+		if(!$ftp_info->ftp_host) {
+			$ftp_info->ftp_host = '127.0.0.1';
+		}
+		if(!$ftp_info->ftp_root_path) {
+			$ftp_info->ftp_root_path = '/';
+		}
 
 		$buff = array('<?php if(!defined("__XE__")) exit();');
 		$buff[] = "\$ftp_info = new stdClass();";
@@ -280,11 +311,15 @@ 
 		// If safe_mode
 		if(ini_get('safe_mode'))
 		{
-			if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new BaseObject(-1,'msg_safe_mode_ftp_needed');
+			if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) {
+				return new BaseObject(-1,'msg_safe_mode_ftp_needed');
+			}
 
 			require_once(_XE_PATH_.'libs/ftp.class.php');
 			$oFtp = new ftp();
-			if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
+			if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) {
+				return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
+			}
 
 			if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
@@ -326,10 +361,16 @@ 
 	{
 		$ftp_info = Context::gets('ftp_user','ftp_password','ftp_port','sftp');
 		$ftp_info->ftp_port = (int)$ftp_info->ftp_port;
-		if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
-		if(!$ftp_info->sftp) $ftp_info->sftp = 'N';
+		if(!$ftp_info->ftp_port) {
+			$ftp_info->ftp_port = 21;
+		}
+		if(!$ftp_info->sftp) {
+			$ftp_info->sftp = 'N';
+		}
 
-		if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new BaseObject(-1,'msg_safe_mode_ftp_needed');
+		if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) {
+			return new BaseObject(-1,'msg_safe_mode_ftp_needed');
+		}
 
 		if($ftp_info->sftp == 'Y')
 		{
@@ -338,12 +379,13 @@ 
 			{
 				return new BaseObject(-1,'msg_ftp_invalid_auth_info');
 			}
-		}
-		else
+		} else
 		{
 			require_once(_XE_PATH_.'libs/ftp.class.php');
 			$oFtp = new ftp();
-			if(!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost'));
+			if(!$oFtp->ftp_connect('127.0.0.1', $ftp_info->ftp_port)) {
+				return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'localhost'));
+			}
 
 			if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
@@ -376,26 +418,47 @@ 
 		}
 
 		// 1. Check permission
-		if(is_writable('./')||is_writable('./files')) $checklist['permission'] = true;
-		else $checklist['permission'] = false;
+		if(is_writable('./')||is_writable('./files')) {
+			$checklist['permission'] = true;
+		} else {
+			$checklist['permission'] = false;
+		}
 		// 2. Check if xml_parser_create exists
-		if(function_exists('xml_parser_create')) $checklist['xml'] = true;
-		else $checklist['xml'] = false;
+		if(function_exists('xml_parser_create')) {
+			$checklist['xml'] = true;
+		} else {
+			$checklist['xml'] = false;
+		}
 		// 3. Check if ini_get (session.auto_start) == 1
-		if(ini_get('session.auto_start')!=1) $checklist['session'] = true;
-		else $checklist['session'] = false;
+		if(ini_get('session.auto_start')!=1) {
+			$checklist['session'] = true;
+		} else {
+			$checklist['session'] = false;
+		}
 		// 4. Check if iconv exists
-		if(function_exists('iconv')) $checklist['iconv'] = true;
-		else $checklist['iconv'] = false;
+		if(function_exists('iconv')) {
+			$checklist['iconv'] = true;
+		} else {
+			$checklist['iconv'] = false;
+		}
 		// 5. Check gd(imagecreatefromgif function)
-		if(function_exists('imagecreatefromgif')) $checklist['gd'] = true;
-		else $checklist['gd'] = false;
+		if(function_exists('imagecreatefromgif')) {
+			$checklist['gd'] = true;
+		} else {
+			$checklist['gd'] = false;
+		}
 		// 6. Check DB
-		if(DB::getEnableList()) $checklist['db'] = true;
-		else $checklist['db'] = false;
+		if(DB::getEnableList()) {
+			$checklist['db'] = true;
+		} else {
+			$checklist['db'] = false;
+		}
 
-		if(!$checklist['php_version'] || !$checklist['permission'] || !$checklist['xml'] || !$checklist['session'] || !$checklist['db']) $install_enable = false;
-		else $install_enable = true;
+		if(!$checklist['php_version'] || !$checklist['permission'] || !$checklist['xml'] || !$checklist['session'] || !$checklist['db']) {
+			$install_enable = false;
+		} else {
+			$install_enable = true;
+		}
 
 		// Save the checked result to the Context
 		Context::set('checklist', $checklist);
@@ -418,8 +481,7 @@ 
 		{
 			$currentTime = $_SERVER['REQUEST_TIME'];
 			FileHandler::writeFile($this->flagLicenseAgreement, $currentTime);
-		}
-		else
+		} else
 		{
 			FileHandler::removeFile($this->flagLicenseAgreement);
 			return new BaseObject(-1, 'msg_must_accept_license_agreement');
@@ -514,13 +576,17 @@ 
 			$module = $tmp_arr[count($tmp_arr)-1];
 
 			$xml_info = $oModuleModel->getModuleInfoXml($module);
-			if(!$xml_info) continue;
+			if(!$xml_info) {
+				continue;
+			}
 			$modules[$xml_info->category][] = $module;
 		}
 		// Install "module" module in advance
 		$this->installModule('module','./modules/module');
 		$oModule = getClass('module');
-		if($oModule->checkUpdate()) $oModule->moduleUpdate();
+		if($oModule->checkUpdate()) {
+			$oModule->moduleUpdate();
+		}
 		// Determine the order of module installation depending on category
 		$install_step = array('system','content','member');
 		// Install all the remaining modules
@@ -530,13 +596,17 @@ 
 			{
 				foreach($modules[$category] as $module)
 				{
-					if($module == 'module') continue;
+					if($module == 'module') {
+						continue;
+					}
 					$this->installModule($module, sprintf('./modules/%s', $module));
 
 					$oModule = getClass($module);
 					if(is_object($oModule) && method_exists($oModule, 'checkUpdate'))
 					{
-						if($oModule->checkUpdate()) $oModule->moduleUpdate();
+						if($oModule->checkUpdate()) {
+							$oModule->moduleUpdate();
+						}
 					}
 				}
 				unset($modules[$category]);
@@ -551,13 +621,17 @@ 
 				{
 					foreach($module_list as $module)
 					{
-						if($module == 'module') continue;
+						if($module == 'module') {
+							continue;
+						}
 						$this->installModule($module, sprintf('./modules/%s', $module));
 
 						$oModule = getClass($module);
 						if($oModule && method_exists($oModule, 'checkUpdate') && method_exists($oModule, 'moduleUpdate'))
 						{
-							if($oModule->checkUpdate()) $oModule->moduleUpdate();
+							if($oModule->checkUpdate()) {
+								$oModule->moduleUpdate();
+							}
 						}
 					}
 				}
@@ -582,15 +656,20 @@ 
 		for($i=0;$i<$file_cnt;$i++)
 		{
 			$file = trim($schema_files[$i]);
-			if(!$file || substr($file,-4)!='.xml') continue;
+			if(!$file || substr($file,-4)!='.xml') {
+				continue;
+			}
 			$output = $oDB->createTableByXmlFile($file);
-			if($output === false)
-				throw new Exception('msg_create_table_failed');
+			if($output === false) {
+							throw new Exception('msg_create_table_failed');
+			}
 		}
 		// Create a table and module instance and then execute install() method
 		unset($oModule);
 		$oModule = getClass($module);
-		if(method_exists($oModule, 'moduleInstall')) $oModule->moduleInstall();
+		if(method_exists($oModule, 'moduleInstall')) {
+			$oModule->moduleInstall();
+		}
 		return new BaseObject();
 	}
 
@@ -625,13 +704,17 @@ 
 		$db_tmp_config_file = $this->db_tmp_config_file;
 
 		$db_info = Context::getDBInfo();
-		if(!$db_info) return;
+		if(!$db_info) {
+			return;
+		}
 
 		$buff = $this->_getDBConfigFileContents($db_info);
 
 		FileHandler::writeFile($db_tmp_config_file, $buff);
 
-		if(@file_exists($db_tmp_config_file)) return true;
+		if(@file_exists($db_tmp_config_file)) {
+			return true;
+		}
 		return false;
 	}
 
@@ -651,7 +734,9 @@ 
 
 		FileHandler::writeFile($etc_tmp_config_file, $buff);
 
-		if(@file_exists($etc_tmp_config_file)) return true;
+		if(@file_exists($etc_tmp_config_file)) {
+			return true;
+		}
 		return false;
 	}
 
@@ -666,7 +751,9 @@ 
 			//if(file_exists($config_file)) return;
 
 			$db_info = Context::getDBInfo();
-			if(!$db_info) return;
+			if(!$db_info) {
+				return;
+			}
 
 			$buff = $this->_getDBConfigFileContents($db_info);
 
@@ -687,7 +774,9 @@ 
 	function installByConfig($install_config_file)
 	{
 		include $install_config_file;
-		if(!is_array($auto_config)) return false;
+		if(!is_array($auto_config)) {
+			return false;
+		}
 
 		$auto_config['module'] = 'install';
 		$auto_config['act'] = 'procInstall';
@@ -697,7 +786,9 @@ 
 		$body = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\r\n<methodCall>\r\n<params>\r\n";
 		foreach($auto_config as $k => $v)
 		{
-			if(!in_array($k,array('host','port','path'))) $body .= sprintf($fstr,$k,$v,$k);
+			if(!in_array($k,array('host','port','path'))) {
+				$body .= sprintf($fstr,$k,$v,$k);
+			}
 		}
 		$body .= "</params>\r\n</methodCall>";
 

modules/install/install.model.php

Spacing +22 added lines, -22 removed lines

@@ -6,28 +6,28 @@ 
 
 	function getSFTPList()
 	{
-		$ftp_info =  Context::getRequestVars();
-		if(!$ftp_info->ftp_host)
+		$ftp_info = Context::getRequestVars();
+		if (!$ftp_info->ftp_host)
 		{
 			$ftp_info->ftp_host = "127.0.0.1";
 		}
 
 		$connection = ssh2_connect($ftp_info->ftp_host, $ftp_info->ftp_port);
-		if(!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
+		if (!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
 		{
-			return new BaseObject(-1,'msg_ftp_invalid_auth_info');
+			return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 		}
 
 		$sftp = ssh2_sftp($connection);
 		$curpwd = "ssh2.sftp://$sftp".$this->pwd;
 		$dh = @opendir($curpwd);
-		if(!$dh) return new BaseObject(-1, 'msg_ftp_invalid_path');
+		if (!$dh) return new BaseObject(-1, 'msg_ftp_invalid_path');
 
 		$list = array();
-		while(($file = readdir($dh)) !== false)
+		while (($file = readdir($dh)) !== false)
 		{
-			if(!is_dir($curpwd.$file)) continue;
-			$list[] = $file . "/";
+			if (!is_dir($curpwd.$file)) continue;
+			$list[] = $file."/";
 		}
 		closedir($dh);
 		$this->add('list', $list);
@@ -35,33 +35,33 @@ 
 
 	function getInstallFTPList()
 	{
-		if(!($ftp_info = Context::getRequestVars()) || !$ftp_info->ftp_user || !$ftp_info->ftp_password) 
+		if (!($ftp_info = Context::getRequestVars()) || !$ftp_info->ftp_user || !$ftp_info->ftp_password) 
 		{
 			return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 		}
 		$this->pwd = $ftp_info->ftp_root_path;
-		if(!$ftp_info->ftp_host)
+		if (!$ftp_info->ftp_host)
 		{
 			$ftp_info->ftp_host = "127.0.0.1";
 		}
 
-		if($ftp_info->sftp == 'Y')
+		if ($ftp_info->sftp == 'Y')
 		{
 			return $this->getSFTPList();
 		}
 
 		$_list = NULL;
-		if(function_exists('ftp_connect'))
+		if (function_exists('ftp_connect'))
 		{
 			$connection = ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port);
-			if(!$connection) return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
-			if(! @ftp_login($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
+			if (!$connection) return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
+			if (!@ftp_login($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
 				ftp_close($connection);	
-				return new BaseObject(-1,'msg_ftp_invalid_auth_info');
+				return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 			}
 
-			if($ftp_info->ftp_pasv != "N") 
+			if ($ftp_info->ftp_pasv != "N") 
 			{
 				ftp_pasv($connection, true);
 			}
@@ -73,9 +73,9 @@ 
 		{
 			require_once(_XE_PATH_.'libs/ftp.class.php');
 			$oFtp = new ftp();
-			if($oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
+			if ($oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
 			{
-				if($oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
+				if ($oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))
 				{
 					$_list = $oFtp->ftp_rawlist($this->pwd);
 					$oFtp->ftp_quit();
@@ -83,21 +83,21 @@ 
 				else
 				{
 					$oFtp->ftp_quit();
-					return new BaseObject(-1,'msg_ftp_invalid_auth_info');
+					return new BaseObject(-1, 'msg_ftp_invalid_auth_info');
 				}
 			}
 		}
 
 		$list = array();
-		if($_list)
+		if ($_list)
 		{
-			foreach($_list as $k => $v)
+			foreach ($_list as $k => $v)
 			{
 				$src = new stdClass(); 
 				$src->data = $v;
 				$res = Context::convertEncoding($src);
 				$v = $res->data;
-				if(strpos($v,'d') === 0 || strpos($v, '<DIR>')) $list[] = substr(strrchr($v,' '),1) . '/';
+				if (strpos($v, 'd') === 0 || strpos($v, '<DIR>')) $list[] = substr(strrchr($v, ' '), 1).'/';
 			}
 		}
 		$this->add('list', $list);

Braces +14 added lines, -8 removed lines

@@ -21,12 +21,16 @@ 
 		$sftp = ssh2_sftp($connection);
 		$curpwd = "ssh2.sftp://$sftp".$this->pwd;
 		$dh = @opendir($curpwd);
-		if(!$dh) return new BaseObject(-1, 'msg_ftp_invalid_path');
+		if(!$dh) {
+			return new BaseObject(-1, 'msg_ftp_invalid_path');
+		}
 
 		$list = array();
 		while(($file = readdir($dh)) !== false)
 		{
-			if(!is_dir($curpwd.$file)) continue;
+			if(!is_dir($curpwd.$file)) {
+				continue;
+			}
 			$list[] = $file . "/";
 		}
 		closedir($dh);
@@ -54,7 +58,9 @@ 
 		if(function_exists('ftp_connect'))
 		{
 			$connection = ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port);
-			if(!$connection) return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
+			if(!$connection) {
+				return new BaseObject(-1, sprintf(Context::getLang('msg_ftp_not_connected'), 'host'));
+			}
 			if(! @ftp_login($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
 				ftp_close($connection);	
@@ -68,8 +74,7 @@ 
 
 			$_list = ftp_rawlist($connection, $this->pwd);
 			ftp_close($connection);	
-		}
-		else
+		} else
 		{
 			require_once(_XE_PATH_.'libs/ftp.class.php');
 			$oFtp = new ftp();
@@ -79,8 +84,7 @@ 
 				{
 					$_list = $oFtp->ftp_rawlist($this->pwd);
 					$oFtp->ftp_quit();
-				}
-				else
+				} else
 				{
 					$oFtp->ftp_quit();
 					return new BaseObject(-1,'msg_ftp_invalid_auth_info');
@@ -97,7 +101,9 @@ 
 				$src->data = $v;
 				$res = Context::convertEncoding($src);
 				$v = $res->data;
-				if(strpos($v,'d') === 0 || strpos($v, '<DIR>')) $list[] = substr(strrchr($v,' '),1) . '/';
+				if(strpos($v,'d') === 0 || strpos($v, '<DIR>')) {
+					$list[] = substr(strrchr($v,' '),1) . '/';
+				}
 			}
 		}
 		$this->add('list', $list);

modules/install/script/ko.install.php

Spacing +21 added lines, -21 removed lines

@@ -130,13 +130,13 @@ 
 function __makeMenu(&$list, $parent_srl)
 {
 	$oMenuAdminController = getAdminController('menu');
-	foreach($list as $idx => &$item)
+	foreach ($list as $idx => &$item)
 	{
 		Context::set('parent_srl', $parent_srl, TRUE);
 		Context::set('menu_name', $item['menu_name'], TRUE);
 		Context::set('module_type', $item['module_type'], TRUE);
 		Context::set('module_id', $item['module_id'], TRUE);
-		if($item['is_shortcut'] === 'Y')
+		if ($item['is_shortcut'] === 'Y')
 		{
 			Context::set('is_shortcut', $item['is_shortcut'], TRUE);
 			Context::set('shortcut_target', $item['shortcut_target'], TRUE);
@@ -148,23 +148,23 @@ 
 		}
 
 		$output = $oMenuAdminController->procMenuAdminInsertItem();
-		if($output instanceof BaseObject && !$output->toBool())
+		if ($output instanceof BaseObject && !$output->toBool())
 		{
 			return $output;
 		}
 		$menu_srl = $oMenuAdminController->get('menu_item_srl');
 		$item['menu_srl'] = $menu_srl;
 
-		if($item['list']) __makeMenu($item['list'], $menu_srl);
+		if ($item['list']) __makeMenu($item['list'], $menu_srl);
 	}
 }
 
 
 // 사이트맵 생성
-foreach($sitemap as $id => &$val)
+foreach ($sitemap as $id => &$val)
 {
 	$output = $oMenuAdminController->addMenu($val['title']);
-	if(!$output->toBool())
+	if (!$output->toBool())
 	{
 		return $output;
 	}
@@ -191,12 +191,12 @@ 
 
 $oLayoutAdminController = getAdminController('layout');
 $output = $oLayoutAdminController->insertLayout($args);
-if(!$output->toBool()) return $output;
+if (!$output->toBool()) return $output;
 
 // update Layout (PC)
 $args->extra_vars = serialize($extra_vars);
 $output = $oLayoutAdminController->updateLayout($args);
-if(!$output->toBool()) return $output;
+if (!$output->toBool()) return $output;
 
 //create mobile layout
 $mlayout_srl = $args->layout_srl = getNextSequence();
@@ -206,12 +206,12 @@ 
 $extra_vars->main_menu = $sitemap['GNB']['menu_srl'];
 
 $output = $oLayoutAdminController->insertLayout($args);
-if(!$output->toBool()) return $output;
+if (!$output->toBool()) return $output;
 
 // update mobile Layout
 $args->extra_vars = serialize($extra_vars);
 $output = $oLayoutAdminController->updateLayout($args);
-if(!$output->toBool()) return $output;
+if (!$output->toBool()) return $output;
 
 
 $siteDesignPath = _XE_PATH_.'files/site_design/';
@@ -224,7 +224,7 @@ 
 
 $moduleList = array('page', 'board', 'editor');
 $moutput = ModuleHandler::triggerCall('menu.getModuleListInSitemap', 'after', $moduleList);
-if($moutput->toBool())
+if ($moutput->toBool())
 {
 	$moduleList = array_unique($moduleList);
 }
@@ -234,10 +234,10 @@ 
 $designInfo->module = new stdClass();
 
 $oModuleModel = getModel('module'); /* @var $oModuleModel moduleModel */
-foreach($skinTypes as $key => $dir)
+foreach ($skinTypes as $key => $dir)
 {
 	$skinType = $key == 'skin' ? 'P' : 'M';
-	foreach($moduleList as $moduleName)
+	foreach ($moduleList as $moduleName)
 	{
 		$designInfo->module->{$moduleName} = new stdClass();
 		$designInfo->module->{$moduleName}->{$key} = $oModuleModel->getModuleDefaultSkin($moduleName, $skinType, 0, false);
@@ -271,17 +271,17 @@ 
 Context::set('version', __XE_VERSION__);
 $obj->title = 'Welcome XE';
 
-$obj->content = $oTemplateHandler->compile(_XE_PATH_ . 'modules/install/script/welcome_content', 'welcome_content_'.$lang);
+$obj->content = $oTemplateHandler->compile(_XE_PATH_.'modules/install/script/welcome_content', 'welcome_content_'.$lang);
 
 $output = $oDocumentController->insertDocument($obj, true);
-if(!$output->toBool()) return $output;
+if (!$output->toBool()) return $output;
 
 $document_srl = $output->get('document_srl');
 
 unset($obj->document_srl);
 $obj->title = 'Welcome mobile XE';
 $output = $oDocumentController->insertDocument($obj, true);
-if(!$output->toBool()) return $output;
+if (!$output->toBool()) return $output;
 
 // save PageWidget
 $oModuleController = getController('module'); /* @var $oModuleController moduleController */
@@ -290,7 +290,7 @@ 
 $module_info->content = '<img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="width: 100%; float: left;" body="" document_srl="'.$document_srl.'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0"  />';
 $module_info->mcontent = '<img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="width: 100%; float: left;" body="" document_srl="'.$mdocument_srl.'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0"  />';
 $output = $oModuleController->updateModule($module_info);
-if(!$output->toBool()) return $output;
+if (!$output->toBool()) return $output;
 
 // insertFirstModule
 $site_args = new stdClass();
@@ -304,14 +304,14 @@ 
 $xeicon_module_srl = $moduleInfo->module_srl;
 
 $xeicon_document_srl = array();
-for($i = 1; $i <=4; $i++)
+for ($i = 1; $i <= 4; $i++)
 {
 	unset($obj->document_srl);
 	$obj->title = "XEIcon ({$i})";
-	$obj->content = $oTemplateHandler->compile(_XE_PATH_ . 'modules/install/script/xeicon_content', 'xeicon_content_ko_' . $i);
+	$obj->content = $oTemplateHandler->compile(_XE_PATH_.'modules/install/script/xeicon_content', 'xeicon_content_ko_'.$i);
 
 	$output = $oDocumentController->insertDocument($obj, true);
-	if(!$output->toBool()) return $output;
+	if (!$output->toBool()) return $output;
 
 	$xeicon_document_srl[$i] = $output->get('document_srl');
 }
@@ -321,7 +321,7 @@ 
 $module_info = $oModuleModel->getModuleInfoByModuleSrl($xeicon_module_srl);
 $module_info->content = '<div widget="widgetBox" style="float:left;width:100%;" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" css_class="XEicon" ><div><div><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="'.$xeicon_document_srl[1].'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="'.$xeicon_document_srl[2].'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="'.$xeicon_document_srl[3].'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /><img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="float:left;padding:none;margin:none;width:100%;" document_srl="'.$xeicon_document_srl[4].'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0" /></div></div></div>';
 $output = $oModuleController->updateModule($module_info);
-if(!$output->toBool()) return $output;
+if (!$output->toBool()) return $output;
 
 
 // create menu cache

modules/document/document.class.php

Spacing +93 added lines, -93 removed lines

@@ -17,7 +17,7 @@ 
 	 * Search option to use in admin page
 	 * @var array
 	 */
-	var $search_option = array('title','content','title_content','user_name',); // /< Search options
+	var $search_option = array('title', 'content', 'title_content', 'user_name',); // /< Search options
 	/**
 	 * Status list
 	 * @var array
@@ -34,22 +34,22 @@ 
 		$oModuleController = getController('module');
 
 		$oDB = &DB::getInstance();
-		$oDB->addIndex("documents","idx_module_list_order", array("module_srl","list_order"));
-		$oDB->addIndex("documents","idx_module_update_order", array("module_srl","update_order"));
-		$oDB->addIndex("documents","idx_module_readed_count", array("module_srl","readed_count"));
-		$oDB->addIndex("documents","idx_module_voted_count", array("module_srl","voted_count"));
-		$oDB->addIndex("documents","idx_module_notice", array("module_srl","is_notice"));
-		$oDB->addIndex("documents","idx_module_document_srl", array("module_srl","document_srl"));
-		$oDB->addIndex("documents","idx_module_blamed_count", array("module_srl","blamed_count"));
-		$oDB->addIndex("document_aliases", "idx_module_title", array("module_srl","alias_title"), true);
-		$oDB->addIndex("document_extra_vars", "unique_extra_vars", array("module_srl","document_srl","var_idx","lang_code"), true);
+		$oDB->addIndex("documents", "idx_module_list_order", array("module_srl", "list_order"));
+		$oDB->addIndex("documents", "idx_module_update_order", array("module_srl", "update_order"));
+		$oDB->addIndex("documents", "idx_module_readed_count", array("module_srl", "readed_count"));
+		$oDB->addIndex("documents", "idx_module_voted_count", array("module_srl", "voted_count"));
+		$oDB->addIndex("documents", "idx_module_notice", array("module_srl", "is_notice"));
+		$oDB->addIndex("documents", "idx_module_document_srl", array("module_srl", "document_srl"));
+		$oDB->addIndex("documents", "idx_module_blamed_count", array("module_srl", "blamed_count"));
+		$oDB->addIndex("document_aliases", "idx_module_title", array("module_srl", "alias_title"), true);
+		$oDB->addIndex("document_extra_vars", "unique_extra_vars", array("module_srl", "document_srl", "var_idx", "lang_code"), true);
 		// 2007. 10. 17 Add a trigger to delete all posts together when the module is deleted
 		$oModuleController->insertTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after');
 
 		// 2009. 01. 29 Added a trigger for additional setup
 		$oModuleController->insertTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before');
 
-		if(!is_dir('./files/cache/tmp'))
+		if (!is_dir('./files/cache/tmp'))
 		{
 			FileHandler::makeDir('./files/cache/tmp');
 		}
@@ -67,71 +67,71 @@ 
 		$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))
 		{
 			// 2007. 7. 25: Add a column(notify_message) for notification
-			if(!$oDB->isColumnExists("documents","notify_message")) return true;
+			if (!$oDB->isColumnExists("documents", "notify_message")) return true;
 
 			// 2007. 8. 23: create a clustered index in the document table
-			if(!$oDB->isIndexExists("documents","idx_module_list_order")) return true;
-			if(!$oDB->isIndexExists("documents","idx_module_update_order")) return true;
-			if(!$oDB->isIndexExists("documents","idx_module_readed_count")) return true;
-			if(!$oDB->isIndexExists("documents","idx_module_voted_count")) return true;
+			if (!$oDB->isIndexExists("documents", "idx_module_list_order")) return true;
+			if (!$oDB->isIndexExists("documents", "idx_module_update_order")) return true;
+			if (!$oDB->isIndexExists("documents", "idx_module_readed_count")) return true;
+			if (!$oDB->isIndexExists("documents", "idx_module_voted_count")) return true;
 			// 2007. 10. 17 Add a trigger to delete all posts together when the module is deleted
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after')) return true;
+			if (!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after')) return true;
 			// 2007. 10. 25 add parent_srl, expand to the document category
-			if(!$oDB->isColumnExists("document_categories","parent_srl")) return true;
-			if(!$oDB->isColumnExists("document_categories","expand")) return true;
-			if(!$oDB->isColumnExists("document_categories","group_srls")) return true;
+			if (!$oDB->isColumnExists("document_categories", "parent_srl")) return true;
+			if (!$oDB->isColumnExists("document_categories", "expand")) return true;
+			if (!$oDB->isColumnExists("document_categories", "group_srls")) return true;
 			// 2007. 11. 20 create a composite index on the columns(module_srl + is_notice)
-			if(!$oDB->isIndexExists("documents","idx_module_notice")) return true;
+			if (!$oDB->isIndexExists("documents", "idx_module_notice")) return true;
 			// 2008. 02. 18 create a composite index on the columns(module_srl + document_srl) (checked by Manian))
-			if(!$oDB->isIndexExists("documents","idx_module_document_srl")) return true;
+			if (!$oDB->isIndexExists("documents", "idx_module_document_srl")) return true;
 
 			// 2007. 12. 03: Add if the colume(extra_vars) doesn't exist
-			if(!$oDB->isColumnExists("documents","extra_vars")) return true;
+			if (!$oDB->isColumnExists("documents", "extra_vars")) return true;
 			// 2008. 04. 23 Add a column(blamed_count)
-			if(!$oDB->isColumnExists("documents", "blamed_count")) return true;
-			if(!$oDB->isIndexExists("documents","idx_module_blamed_count")) return true;
-			if(!$oDB->isColumnExists("document_voted_log", "point")) return true;
+			if (!$oDB->isColumnExists("documents", "blamed_count")) return true;
+			if (!$oDB->isIndexExists("documents", "idx_module_blamed_count")) return true;
+			if (!$oDB->isColumnExists("document_voted_log", "point")) return true;
 			// 2008-12-15 Add a column(color)
-			if(!$oDB->isColumnExists("document_categories", "color")) return true;
+			if (!$oDB->isColumnExists("document_categories", "color")) return true;
 
 			/**
 			 * 2009. 01. 29: Add a column(lang_code) if not exist in the document_extra_vars table
 			 */
-			if(!$oDB->isColumnExists("document_extra_vars","lang_code")) return true;
+			if (!$oDB->isColumnExists("document_extra_vars", "lang_code")) return true;
 
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before')) return true;
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before')) return true;
 			// 2009. 03. 09 Add a column(lang_code) to the documnets table
-			if(!$oDB->isColumnExists("documents","lang_code")) return true;
+			if (!$oDB->isColumnExists("documents", "lang_code")) return true;
 			// 2009. 03. 11 check the index in the document_extra_vars table
-			if(!$oDB->isIndexExists("document_extra_vars", "unique_extra_vars")) return true;
+			if (!$oDB->isIndexExists("document_extra_vars", "unique_extra_vars")) return true;
 
 			// 2009. 03. 19: Add a column(eid) if not exist in the table
-			if(!$oDB->isColumnExists("document_extra_keys","eid")) return true;
-			if(!$oDB->isColumnExists("document_extra_vars","eid")) return true;
+			if (!$oDB->isColumnExists("document_extra_keys", "eid")) return true;
+			if (!$oDB->isColumnExists("document_extra_vars", "eid")) return true;
 
 			// 2011. 03. 30 Cubrid index Check the index in the document_extra_vars table
-			if(!$oDB->isIndexExists("document_extra_vars", "idx_document_list_order")) return true;
+			if (!$oDB->isIndexExists("document_extra_vars", "idx_document_list_order")) return true;
 
 			//2011. 04. 07 adding description column to document categories
-			if(!$oDB->isColumnExists("document_categories","description")) return true;
+			if (!$oDB->isColumnExists("document_categories", "description")) return true;
 
 			//2011. 05. 23 adding status column to document
-			if(!$oDB->isColumnExists('documents', 'status')) return true;
+			if (!$oDB->isColumnExists('documents', 'status')) return true;
 
 			//2011. 06. 07 check comment status update
-			if($oDB->isColumnExists('documents', 'allow_comment') || $oDB->isColumnExists('documents', 'lock_comment')) return true;
+			if ($oDB->isColumnExists('documents', 'allow_comment') || $oDB->isColumnExists('documents', 'lock_comment')) return true;
 
 			// 2011. 10. 25 status index check
-			if(!$oDB->isIndexExists("documents", "idx_module_status")) return true;
+			if (!$oDB->isIndexExists("documents", "idx_module_status")) return true;
 
 			// 2012. 02. 27 Add a trigger to copy extra keys when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after')) return true;
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after')) return true;
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModule', 'after')) return true;
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModule', 'after')) return true;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
@@ -149,101 +149,101 @@ 
 		$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))
 		{
 			// 2007. 7. 25: Add a column(notify_message) for notification
-			if(!$oDB->isColumnExists("documents","notify_message"))
+			if (!$oDB->isColumnExists("documents", "notify_message"))
 			{
-				$oDB->addColumn('documents',"notify_message","char",1);
+				$oDB->addColumn('documents', "notify_message", "char", 1);
 			}
 
 			// 2007. 8. 23: create a clustered index in the document table
-			if(!$oDB->isIndexExists("documents","idx_module_list_order"))
+			if (!$oDB->isIndexExists("documents", "idx_module_list_order"))
 			{
-				$oDB->addIndex("documents","idx_module_list_order", array("module_srl","list_order"));
+				$oDB->addIndex("documents", "idx_module_list_order", array("module_srl", "list_order"));
 			}
 
-			if(!$oDB->isIndexExists("documents","idx_module_update_order"))
+			if (!$oDB->isIndexExists("documents", "idx_module_update_order"))
 			{
-				$oDB->addIndex("documents","idx_module_update_order", array("module_srl","update_order"));
+				$oDB->addIndex("documents", "idx_module_update_order", array("module_srl", "update_order"));
 			}
 
-			if(!$oDB->isIndexExists("documents","idx_module_readed_count"))
+			if (!$oDB->isIndexExists("documents", "idx_module_readed_count"))
 			{
-				$oDB->addIndex("documents","idx_module_readed_count", array("module_srl","readed_count"));
+				$oDB->addIndex("documents", "idx_module_readed_count", array("module_srl", "readed_count"));
 			}
 
-			if(!$oDB->isIndexExists("documents","idx_module_voted_count"))
+			if (!$oDB->isIndexExists("documents", "idx_module_voted_count"))
 			{
-				$oDB->addIndex("documents","idx_module_voted_count", array("module_srl","voted_count"));
+				$oDB->addIndex("documents", "idx_module_voted_count", array("module_srl", "voted_count"));
 			}
 			// 2007. 10. 17 Add a trigger to delete all posts together when the module is deleted
-			if(!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after'))
+			if (!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after'))
 				$oModuleController->insertTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after');
 			// 2007. 10. 25 add columns(parent_srl, expand) 
-			if(!$oDB->isColumnExists("document_categories","parent_srl")) $oDB->addColumn('document_categories',"parent_srl","number",12,0);
-			if(!$oDB->isColumnExists("document_categories","expand")) $oDB->addColumn('document_categories',"expand","char",1,"N");
-			if(!$oDB->isColumnExists("document_categories","group_srls")) $oDB->addColumn('document_categories',"group_srls","text");
+			if (!$oDB->isColumnExists("document_categories", "parent_srl")) $oDB->addColumn('document_categories', "parent_srl", "number", 12, 0);
+			if (!$oDB->isColumnExists("document_categories", "expand")) $oDB->addColumn('document_categories', "expand", "char", 1, "N");
+			if (!$oDB->isColumnExists("document_categories", "group_srls")) $oDB->addColumn('document_categories', "group_srls", "text");
 			// 2007. 11. 20 create a composite index on the columns(module_srl + is_notice)
-			if(!$oDB->isIndexExists("documents","idx_module_notice")) $oDB->addIndex("documents","idx_module_notice", array("module_srl","is_notice"));
+			if (!$oDB->isIndexExists("documents", "idx_module_notice")) $oDB->addIndex("documents", "idx_module_notice", array("module_srl", "is_notice"));
 
 			// 2007. 12. 03: Add if the colume(extra_vars) doesn't exist
-			if(!$oDB->isColumnExists("documents","extra_vars")) $oDB->addColumn('documents','extra_vars','text');
+			if (!$oDB->isColumnExists("documents", "extra_vars")) $oDB->addColumn('documents', 'extra_vars', 'text');
 
 			// 2008. 02. 18 create a composite index on the columns(module_srl + document_srl) (checked by Manian))
-			if(!$oDB->isIndexExists("documents","idx_module_document_srl")) $oDB->addIndex("documents","idx_module_document_srl", array("module_srl","document_srl"));
+			if (!$oDB->isIndexExists("documents", "idx_module_document_srl")) $oDB->addIndex("documents", "idx_module_document_srl", array("module_srl", "document_srl"));
 			// 2008. 04. 23 Add a column(blamed count)
-			if(!$oDB->isColumnExists("documents", "blamed_count"))
+			if (!$oDB->isColumnExists("documents", "blamed_count"))
 			{
 				$oDB->addColumn('documents', 'blamed_count', 'number', 11, 0, true);
 				$oDB->addIndex('documents', 'idx_blamed_count', array('blamed_count'));
 			}
 
-			if(!$oDB->isIndexExists("documents","idx_module_blamed_count"))
+			if (!$oDB->isIndexExists("documents", "idx_module_blamed_count"))
 			{
 				$oDB->addIndex('documents', 'idx_module_blamed_count', array('module_srl', 'blamed_count'));
 			}
 
-			if(!$oDB->isColumnExists("document_voted_log", "point"))
+			if (!$oDB->isColumnExists("document_voted_log", "point"))
 				$oDB->addColumn('document_voted_log', 'point', 'number', 11, 0, true);
 
 
-			if(!$oDB->isColumnExists("document_categories","color")) $oDB->addColumn('document_categories',"color","char",7);
+			if (!$oDB->isColumnExists("document_categories", "color")) $oDB->addColumn('document_categories', "color", "char", 7);
 
 			// 2009. 01. 29: Add a column(lang_code) if not exist in the document_extra_vars table
-			if(!$oDB->isColumnExists("document_extra_vars","lang_code")) $oDB->addColumn('document_extra_vars',"lang_code","varchar",10);
+			if (!$oDB->isColumnExists("document_extra_vars", "lang_code")) $oDB->addColumn('document_extra_vars', "lang_code", "varchar", 10);
 
 			// 2009. 01. 29 Added a trigger for additional setup
-			if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before'))
+			if (!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before'))
 				$oModuleController->insertTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before');
 			// 2009. 03. 09 Add a column(lang_code) to the documnets table
-			if(!$oDB->isColumnExists("documents","lang_code"))
+			if (!$oDB->isColumnExists("documents", "lang_code"))
 			{
 				$db_info = Context::getDBInfo();
-				$oDB->addColumn('documents',"lang_code","varchar",10, $db_info->lang_code);
+				$oDB->addColumn('documents', "lang_code", "varchar", 10, $db_info->lang_code);
 				$obj->lang_code = $db_info->lang_type;
 				executeQuery('document.updateDocumentsLangCode', $obj);
 			}
 			// 2009. 03. 11 Check the index in the document_extra_vars table
-			if(!$oDB->isIndexExists("document_extra_vars", "unique_extra_vars"))
+			if (!$oDB->isIndexExists("document_extra_vars", "unique_extra_vars"))
 			{
-				$oDB->addIndex("document_extra_vars", "unique_extra_vars", array("module_srl","document_srl","var_idx","lang_code"), true);
+				$oDB->addIndex("document_extra_vars", "unique_extra_vars", array("module_srl", "document_srl", "var_idx", "lang_code"), true);
 			}
 
-			if($oDB->isIndexExists("document_extra_vars", "unique_module_vars"))
+			if ($oDB->isIndexExists("document_extra_vars", "unique_module_vars"))
 			{
 				$oDB->dropIndex("document_extra_vars", "unique_module_vars", true);
 			}
 
 			// 2009. 03. 19: Add a column(eid)
 			// 2009. 04. 12: Fixed the issue(#17922959) that changes another column values when adding eid column
-			if(!$oDB->isColumnExists("document_extra_keys","eid"))
+			if (!$oDB->isColumnExists("document_extra_keys", "eid"))
 			{
-				$oDB->addColumn("document_extra_keys","eid","varchar",40);
+				$oDB->addColumn("document_extra_keys", "eid", "varchar", 40);
 
 				$output = executeQuery('document.getGroupsExtraKeys', $obj);
-				if($output->toBool() && $output->data && count($output->data)) {
-					foreach($output->data as $extra_keys) {
+				if ($output->toBool() && $output->data && count($output->data)) {
+					foreach ($output->data as $extra_keys) {
 						$args->module_srl = $extra_keys->module_srl;
 						$args->var_idx = $extra_keys->idx;
 						$args->new_eid = "extra_vars".$extra_keys->idx;
@@ -252,14 +252,14 @@ 
 				}
 			}
 
-			if(!$oDB->isColumnExists("document_extra_vars","eid"))
+			if (!$oDB->isColumnExists("document_extra_vars", "eid"))
 			{
-				$oDB->addColumn("document_extra_vars","eid","varchar",40);
+				$oDB->addColumn("document_extra_vars", "eid", "varchar", 40);
 				$obj->var_idx = '-1,-2';
 				$output = executeQuery('document.getGroupsExtraVars', $obj);
-				if($output->toBool() && $output->data && count($output->data))
+				if ($output->toBool() && $output->data && count($output->data))
 				{
-					foreach($output->data as $extra_vars)
+					foreach ($output->data as $extra_vars)
 					{
 						$args->module_srl = $extra_vars->module_srl;
 						$args->var_idx = $extra_vars->idx;
@@ -270,16 +270,16 @@ 
 			}
 
 			// 2011. 03. 30 Cubrid index Check the index in the document_extra_vars table
-			if(!$oDB->isIndexExists("document_extra_vars", "idx_document_list_order"))
+			if (!$oDB->isIndexExists("document_extra_vars", "idx_document_list_order"))
 			{
-				$oDB->addIndex("document_extra_vars", "idx_document_list_order", array("document_srl","module_srl","var_idx"), false);
+				$oDB->addIndex("document_extra_vars", "idx_document_list_order", array("document_srl", "module_srl", "var_idx"), false);
 			}
 
 			//2011. 04. 07 adding description column to document categories
-			if(!$oDB->isColumnExists("document_categories","description")) $oDB->addColumn('document_categories',"description","varchar",200,0);
+			if (!$oDB->isColumnExists("document_categories", "description")) $oDB->addColumn('document_categories', "description", "varchar", 200, 0);
 
 			//2011. 05. 23 adding status column to document
-			if(!$oDB->isColumnExists('documents', 'status'))
+			if (!$oDB->isColumnExists('documents', 'status'))
 			{
 				$oDB->addColumn('documents', 'status', 'varchar', 20, 'PUBLIC');
 				$args->is_secret = 'Y';
@@ -287,11 +287,11 @@ 
 			}
 
 			// 2011. 09. 08 drop column document is_secret
-			if($oDB->isColumnExists('documents', 'status') && $oDB->isColumnExists('documents', 'is_secret'))
+			if ($oDB->isColumnExists('documents', 'status') && $oDB->isColumnExists('documents', 'is_secret'))
 				$oDB->dropColumn('documents', 'is_secret');
 
 			//2011. 06. 07 merge column, allow_comment and lock_comment
-			if($oDB->isColumnExists('documents', 'allow_comment') || $oDB->isColumnExists('documents', 'lock_comment'))
+			if ($oDB->isColumnExists('documents', 'allow_comment') || $oDB->isColumnExists('documents', 'lock_comment'))
 			{
 				$oDB->addColumn('documents', 'comment_status', 'varchar', 20, 'ALLOW');
 
@@ -313,23 +313,23 @@ 
 				$output = executeQuery('document.updateDocumentCommentStatus', $args);
 			}
 
-			if($oDB->isColumnExists('documents', 'allow_comment') && $oDB->isColumnExists('documents', 'comment_status'))
+			if ($oDB->isColumnExists('documents', 'allow_comment') && $oDB->isColumnExists('documents', 'comment_status'))
 				$oDB->dropColumn('documents', 'allow_comment');
 
-			if($oDB->isColumnExists('documents', 'lock_comment') && $oDB->isColumnExists('documents', 'comment_status'))
+			if ($oDB->isColumnExists('documents', 'lock_comment') && $oDB->isColumnExists('documents', 'comment_status'))
 				$oDB->dropColumn('documents', 'lock_comment');
 
-			if(!$oDB->isIndexExists("documents", "idx_module_status"))
-				$oDB->addIndex("documents", "idx_module_status", array("module_srl","status"));
+			if (!$oDB->isIndexExists("documents", "idx_module_status"))
+				$oDB->addIndex("documents", "idx_module_status", array("module_srl", "status"));
 
 			// 2012. 02. 27 Add a trigger to copy extra keys when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after'))
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after'))
 			{
 				$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModuleExtraKeys', 'after');
 			}
 
 			// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
-			if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModule', 'after'))
+			if (!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModule', 'after'))
 			{
 				$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModule', 'after');
 			}
@@ -337,7 +337,7 @@ 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		return new BaseObject(0,'success_updated');
+		return new BaseObject(0, 'success_updated');
 	}
 
 	/**
@@ -346,7 +346,7 @@ 
 	 */
 	function recompileCache()
 	{
-		if(!is_dir('./files/cache/tmp'))
+		if (!is_dir('./files/cache/tmp'))
 		{
 			FileHandler::makeDir('./files/cache/tmp');
 		}
@@ -376,7 +376,7 @@ 
 	 */
 	function getConfigStatus($key)
 	{
-		if(array_key_exists(strtolower($key), $this->statusList)) return $this->statusList[$key];
+		if (array_key_exists(strtolower($key), $this->statusList)) return $this->statusList[$key];
 		else $this->getDefaultStatus();
 	}
 }

modules/member/member.class.php

Spacing +103 added lines, -103 removed lines

@@ -20,13 +20,13 @@ 
 	 */
 	function member()
 	{
-		if(!Context::isInstalled()) return;
+		if (!Context::isInstalled()) return;
 
 		$oModuleModel = getModel('module');
 		$member_config = $oModuleModel->getModuleConfig('member');
 
 		// Set to use SSL upon actions related member join/information/password and so on. 2013.02.15
-		if(!Context::isExistsSSLAction('dispMemberModifyPassword') && Context::getSslStatus() == 'optional')
+		if (!Context::isExistsSSLAction('dispMemberModifyPassword') && Context::getSslStatus() == 'optional')
 		{
 			$ssl_actions = array('dispMemberModifyPassword', 'dispMemberSignUpForm', 'dispMemberModifyInfo', 'dispMemberModifyEmailAddress', 'dispMemberGetTempPassword', 'dispMemberResendAuthMail', 'dispMemberLoginForm', 'dispMemberFindAccount', 'dispMemberLeave', 'procMemberLogin', 'procMemberModifyPassword', 'procMemberInsert', 'procMemberModifyInfo', 'procMemberFindAccount', 'procMemberModifyEmailAddress', 'procMemberResendAuthMail', 'procMemberLeave'/*, 'getMemberMenu'*/, 'procMemberFindAccountByQuestion');
 			Context::addSSLActions($ssl_actions);
@@ -44,12 +44,12 @@ 
 		$oModuleController = getController('module');
 
 		$oDB = &DB::getInstance();
-		$oDB->addIndex("member_group","idx_site_title", array("site_srl","title"),true);
+		$oDB->addIndex("member_group", "idx_site_title", array("site_srl", "title"), true);
 
 		$oModuleModel = getModel('module');
 		$config = $oModuleModel->getModuleConfig('member');
 
-		if(empty($config))
+		if (empty($config))
 		{
 			$isNotInstall = true;
 			$config = new stdClass;
@@ -58,29 +58,29 @@ 
 		// Set the basic information
 		$config->enable_join = 'Y';
 		$config->enable_openid = 'N';
-		if(!$config->enable_auth_mail) $config->enable_auth_mail = 'N';
-		if(!$config->image_name) $config->image_name = 'Y';
-		if(!$config->image_mark) $config->image_mark = 'Y';
-		if(!$config->profile_image) $config->profile_image = 'Y';
-		if(!$config->image_name_max_width) $config->image_name_max_width = '90';
-		if(!$config->image_name_max_height) $config->image_name_max_height = '20';
-		if(!$config->image_mark_max_width) $config->image_mark_max_width = '20';
-		if(!$config->image_mark_max_height) $config->image_mark_max_height = '20';
-		if(!$config->profile_image_max_width) $config->profile_image_max_width = '90';
-		if(!$config->profile_image_max_height) $config->profile_image_max_height = '90';
-		if($config->group_image_mark!='Y') $config->group_image_mark = 'N';
-		if(!$config->password_strength) $config->password_strength = 'normal';
+		if (!$config->enable_auth_mail) $config->enable_auth_mail = 'N';
+		if (!$config->image_name) $config->image_name = 'Y';
+		if (!$config->image_mark) $config->image_mark = 'Y';
+		if (!$config->profile_image) $config->profile_image = 'Y';
+		if (!$config->image_name_max_width) $config->image_name_max_width = '90';
+		if (!$config->image_name_max_height) $config->image_name_max_height = '20';
+		if (!$config->image_mark_max_width) $config->image_mark_max_width = '20';
+		if (!$config->image_mark_max_height) $config->image_mark_max_height = '20';
+		if (!$config->profile_image_max_width) $config->profile_image_max_width = '90';
+		if (!$config->profile_image_max_height) $config->profile_image_max_height = '90';
+		if ($config->group_image_mark != 'Y') $config->group_image_mark = 'N';
+		if (!$config->password_strength) $config->password_strength = 'normal';
 		
-		if(!$config->password_hashing_algorithm)
+		if (!$config->password_hashing_algorithm)
 		{
 			$oPassword = new Password();
 			$config->password_hashing_algorithm = $oPassword->getBestAlgorithm();
 		}
-		if(!$config->password_hashing_work_factor)
+		if (!$config->password_hashing_work_factor)
 		{
 			$config->password_hashing_work_factor = 8;
 		}
-		if(!$config->password_hashing_auto_upgrade)
+		if (!$config->password_hashing_auto_upgrade)
 		{
 			$config->password_hashing_auto_upgrade = 'Y';
 		}
@@ -91,7 +91,7 @@ 
 		$oMemberController = getController('member');
 		$oMemberAdminController = getAdminController('member');
 
-		if(!$config->signupForm || !is_array($config->signupForm))
+		if (!$config->signupForm || !is_array($config->signupForm))
 		{
 			$identifier = $isNotInstall ? 'email_address' : 'user_id';
 
@@ -106,10 +106,10 @@ 
 			$oMemberAdminController->_createFindAccountByQuestion($config->identifier);
 		}
 		
-		$oModuleController->insertModuleConfig('member',$config);
+		$oModuleController->insertModuleConfig('member', $config);
 
 		$groups = $oMemberModel->getGroups();
-		if(!count($groups))
+		if (!count($groups))
 		{
 			// Set an administrator, regular member(group1), and associate member(group2)
 			$group_args = new stdClass;
@@ -135,10 +135,10 @@ 
 		$admin_args = new stdClass;
 		$admin_args->is_admin = 'Y';
 		$output = executeQuery('member.getMemberList', $admin_args);
-		if(!$output->data)
+		if (!$output->data)
 		{
-			$admin_info = Context::gets('password','nick_name','email_address', 'user_id');
-			if($admin_info->email_address)
+			$admin_info = Context::gets('password', 'nick_name', 'email_address', 'user_id');
+			if ($admin_info->email_address)
 			{
 				$admin_info->user_name = 'admin';
 				// Insert admin information
@@ -150,16 +150,16 @@ 
 		// Register denied ID(default + module name)
 		$oModuleModel = getModel('module');
 		$module_list = $oModuleModel->getModuleList();
-		foreach($module_list as $key => $val)
+		foreach ($module_list as $key => $val)
 		{
-			$oMemberAdminController->insertDeniedID($val->module,'');
+			$oMemberAdminController->insertDeniedID($val->module, '');
 		}
-		$oMemberAdminController->insertDeniedID('www','');
-		$oMemberAdminController->insertDeniedID('root','');
-		$oMemberAdminController->insertDeniedID('administrator','');
-		$oMemberAdminController->insertDeniedID('telnet','');
-		$oMemberAdminController->insertDeniedID('ftp','');
-		$oMemberAdminController->insertDeniedID('http','');
+		$oMemberAdminController->insertDeniedID('www', '');
+		$oMemberAdminController->insertDeniedID('root', '');
+		$oMemberAdminController->insertDeniedID('administrator', '');
+		$oMemberAdminController->insertDeniedID('telnet', '');
+		$oMemberAdminController->insertDeniedID('ftp', '');
+		$oMemberAdminController->insertDeniedID('http', '');
 		// Create cache directory to use in the member module
 		FileHandler::makeDir('./files/member_extra_info/image_name');
 		FileHandler::makeDir('./files/member_extra_info/image_mark');
@@ -184,76 +184,76 @@ 
 		$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))
 		{
 			// check member directory (11/08/2007 added)
-			if(!is_dir("./files/member_extra_info")) return true;
+			if (!is_dir("./files/member_extra_info")) return true;
 			// check member directory (22/10/2007 added)
-			if(!is_dir("./files/member_extra_info/profile_image")) return true;
+			if (!is_dir("./files/member_extra_info/profile_image")) return true;
 			// Add a column(is_register) to "member_auth_mail" table (22/04/2008)
 			$act = $oDB->isColumnExists("member_auth_mail", "is_register");
-			if(!$act) return true;
+			if (!$act) return true;
 			// Add a column(site_srl) to "member_group_member" table (11/15/2008)
-			if(!$oDB->isColumnExists("member_group_member", "site_srl")) return true;
-			if(!$oDB->isColumnExists("member_group", "site_srl")) return true;
-			if($oDB->isIndexExists("member_group","uni_member_group_title")) return true;
+			if (!$oDB->isColumnExists("member_group_member", "site_srl")) return true;
+			if (!$oDB->isColumnExists("member_group", "site_srl")) return true;
+			if ($oDB->isIndexExists("member_group", "uni_member_group_title")) return true;
 
 			// Add a column for list_order (05/18/2011)
-			if(!$oDB->isColumnExists("member_group", "list_order")) return true;
+			if (!$oDB->isColumnExists("member_group", "list_order")) return true;
 
 			// image_mark 추가 (2009. 02. 14)
-			if(!$oDB->isColumnExists("member_group", "image_mark")) return true;
+			if (!$oDB->isColumnExists("member_group", "image_mark")) return true;
 			// Add c column for password expiration date
-			if(!$oDB->isColumnExists("member", "change_password_date")) return true;
+			if (!$oDB->isColumnExists("member", "change_password_date")) return true;
 
 			// Add columns of question and answer to verify a password
-			if(!$oDB->isColumnExists("member", "find_account_question")) return true;
-			if(!$oDB->isColumnExists("member", "find_account_answer")) return true;
+			if (!$oDB->isColumnExists("member", "find_account_question")) return true;
+			if (!$oDB->isColumnExists("member", "find_account_answer")) return true;
 
-			if(!$oDB->isColumnExists("member", "list_order")) return true;
-			if(!$oDB->isIndexExists("member","idx_list_order")) return true;
+			if (!$oDB->isColumnExists("member", "list_order")) return true;
+			if (!$oDB->isIndexExists("member", "idx_list_order")) return true;
 
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('member');
 			// check signup form ordering info
-			if(!$config->signupForm) return true;
+			if (!$config->signupForm) return true;
 
-			foreach($config->signupForm as $form)
+			foreach ($config->signupForm as $form)
 			{
-				if($form->name === 'email_address' && $form->isPublic !== 'N')
+				if ($form->name === 'email_address' && $form->isPublic !== 'N')
 				{
 					return true;
 				}
 			}
 
 			// check agreement field exist
-			if($config->agreement) return true;
+			if ($config->agreement) return true;
 
-			if($config->skin)
+			if ($config->skin)
 			{
 				$config_parse = explode('.', $config->skin);
-				if(count($config_parse) > 1)
+				if (count($config_parse) > 1)
 				{
 					$template_path = sprintf('./themes/%s/modules/member/', $config_parse[0]);
-					if(is_dir($template_path)) return true;
+					if (is_dir($template_path)) return true;
 				}
 			}
 
 			// supprot multilanguage agreement.
-			if(is_readable('./files/member_extra_info/agreement.txt')) return true;
+			if (is_readable('./files/member_extra_info/agreement.txt')) return true;
 
 			// 2013. 11. 22 add menu when popup document menu called
-			if(!$oModuleModel->getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after')) return true;
-			if(!$oModuleModel->getTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after')) return true;
+			if (!$oModuleModel->getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after')) return true;
+			if (!$oModuleModel->getTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after')) return true;
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		if(!is_readable('./files/ruleset/insertMember.xml')) return true;
-		if(!is_readable('./files/ruleset/login.xml')) return true;
-		if(!is_readable('./files/ruleset/find_member_account_by_question.xml')) return true;
+		if (!is_readable('./files/ruleset/insertMember.xml')) return true;
+		if (!is_readable('./files/ruleset/login.xml')) return true;
+		if (!is_readable('./files/ruleset/find_member_account_by_question.xml')) return true;
 
-		if($oModuleModel->needUpdate('member.1.8.43.recreate_signup_ruleset')) return true;
+		if ($oModuleModel->needUpdate('member.1.8.43.recreate_signup_ruleset')) return true;
 
 		return false;
 	}
@@ -271,7 +271,7 @@ 
 		$oMemberAdminController = getAdminController('member');
 		$config = $oModuleModel->getModuleConfig('member');
 		$version_update_id = implode('.', array(__CLASS__, __XE_VERSION__, 'updated'));
-		if($oModuleModel->needUpdate($version_update_id))
+		if ($oModuleModel->needUpdate($version_update_id))
 		{
 			// Check member directory
 			FileHandler::makeDir('./files/member_extra_info/image_name');
@@ -279,74 +279,74 @@ 
 			FileHandler::makeDir('./files/member_extra_info/signature');
 			FileHandler::makeDir('./files/member_extra_info/profile_image');
 			// Add a column
-			if(!$oDB->isColumnExists("member_auth_mail", "is_register"))
+			if (!$oDB->isColumnExists("member_auth_mail", "is_register"))
 			{
 				$oDB->addColumn("member_auth_mail", "is_register", "char", 1, "N", true);
 			}
 			// Add a column(site_srl) to "member_group_member" table (11/15/2008)
-			if(!$oDB->isColumnExists("member_group_member", "site_srl"))
+			if (!$oDB->isColumnExists("member_group_member", "site_srl"))
 			{
 				$oDB->addColumn("member_group_member", "site_srl", "number", 11, 0, true);
 				$oDB->addIndex("member_group_member", "idx_site_srl", "site_srl", false);
 			}
-			if(!$oDB->isColumnExists("member_group", "site_srl"))
+			if (!$oDB->isColumnExists("member_group", "site_srl"))
 			{
 				$oDB->addColumn("member_group", "site_srl", "number", 11, 0, true);
-				$oDB->addIndex("member_group","idx_site_title", array("site_srl","title"),true);
+				$oDB->addIndex("member_group", "idx_site_title", array("site_srl", "title"), true);
 			}
-			if($oDB->isIndexExists("member_group","uni_member_group_title"))
+			if ($oDB->isIndexExists("member_group", "uni_member_group_title"))
 			{
-				$oDB->dropIndex("member_group","uni_member_group_title",true);
+				$oDB->dropIndex("member_group", "uni_member_group_title", true);
 			}
 
 			// Add a column(list_order) to "member_group" table (05/18/2011)
-			if(!$oDB->isColumnExists("member_group", "list_order"))
+			if (!$oDB->isColumnExists("member_group", "list_order"))
 			{
 				$oDB->addColumn("member_group", "list_order", "number", 11, '', true);
-				$oDB->addIndex("member_group","idx_list_order", "list_order",false);
+				$oDB->addIndex("member_group", "idx_list_order", "list_order", false);
 				$output = executeQuery('member.updateAllMemberGroupListOrder');
 			}
 			// Add a column for image_mark (02/14/2009)
-			if(!$oDB->isColumnExists("member_group", "image_mark"))
+			if (!$oDB->isColumnExists("member_group", "image_mark"))
 			{
 				$oDB->addColumn("member_group", "image_mark", "text");
 			}
 			// Add a column for password expiration date
-			if(!$oDB->isColumnExists("member", "change_password_date"))
+			if (!$oDB->isColumnExists("member", "change_password_date"))
 			{
 				$oDB->addColumn("member", "change_password_date", "date");
 				executeQuery('member.updateAllChangePasswordDate');
 			}
 
 			// Add columns of question and answer to verify a password
-			if(!$oDB->isColumnExists("member", "find_account_question"))
+			if (!$oDB->isColumnExists("member", "find_account_question"))
 			{
 				$oDB->addColumn("member", "find_account_question", "number", 11);
 			}
-			if(!$oDB->isColumnExists("member", "find_account_answer"))
+			if (!$oDB->isColumnExists("member", "find_account_answer"))
 			{
 				$oDB->addColumn("member", "find_account_answer", "varchar", 250);
 			}
 
-			if(!$oDB->isColumnExists("member", "list_order"))
+			if (!$oDB->isColumnExists("member", "list_order"))
 			{
 				$oDB->addColumn("member", "list_order", "number", 11);
 				@set_time_limit(0);
 				$args->list_order = 'member_srl';
-				executeQuery('member.updateMemberListOrderAll',$args);
+				executeQuery('member.updateMemberListOrderAll', $args);
 				executeQuery('member.updateMemberListOrderAll');
 			}
-			if(!$oDB->isIndexExists("member","idx_list_order"))
+			if (!$oDB->isIndexExists("member", "idx_list_order"))
 			{
-				$oDB->addIndex("member","idx_list_order", array("list_order"));
+				$oDB->addIndex("member", "idx_list_order", array("list_order"));
 			}
 
 			$config = $oModuleModel->getModuleConfig('member');
 
 			// check agreement value exist
-			if($config->agreement)
+			if ($config->agreement)
 			{
-				$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt';
+				$agreement_file = _XE_PATH_.'files/member_extra_info/agreement_'.Context::get('lang_type').'.txt';
 				$output = FileHandler::writeFile($agreement_file, $config->agreement);
 
 				$config->agreement = NULL;
@@ -354,7 +354,7 @@ 
 			}
 
 			// check signup form ordering info
-			if(!$config->signupForm || !is_array($config->signupForm))
+			if (!$config->signupForm || !is_array($config->signupForm))
 			{
 				$identifier = 'email_address';
 
@@ -365,9 +365,9 @@ 
 
 			// 회원정보에서 이메일 노출 제거
 			// @see https://github.com/xpressengine/xe-core/issues/2177
-			foreach($config->signupForm as $form)
+			foreach ($config->signupForm as $form)
 			{
-				if($form->name === 'email_address')
+				if ($form->name === 'email_address')
 				{
 					$form->isPublic = 'N';
 					break;
@@ -375,13 +375,13 @@ 
 			}
 			$oModuleController->updateModuleConfig('member', $config);
 
-			if($config->skin)
+			if ($config->skin)
 			{
 				$config_parse = explode('.', $config->skin);
 				if (count($config_parse) > 1)
 				{
 					$template_path = sprintf('./themes/%s/modules/member/', $config_parse[0]);
-					if(is_dir($template_path))
+					if (is_dir($template_path))
 					{
 						$config->skin = implode('|@|', $config_parse);
 						$oModuleController = getController('module');
@@ -391,15 +391,15 @@ 
 			}
 			
 			// 2013. 11. 22 add menu when popup document menu called
-			if(!$oModuleModel->getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after'))
+			if (!$oModuleModel->getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after'))
 				$oModuleController->insertTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after');
-			if(!$oModuleModel->getTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after'))
+			if (!$oModuleModel->getTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after'))
 				$oModuleController->insertTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after');
 
-			if(is_readable('./files/member_extra_info/agreement.txt'))
+			if (is_readable('./files/member_extra_info/agreement.txt'))
 			{
 				$source_file = _XE_PATH_.'files/member_extra_info/agreement.txt';
-				$target_file = _XE_PATH_.'files/member_extra_info/agreement_' . Context::get('lang_type') . '.txt';
+				$target_file = _XE_PATH_.'files/member_extra_info/agreement_'.Context::get('lang_type').'.txt';
 
 				FileHandler::rename($source_file, $target_file);
 			}
@@ -408,14 +408,14 @@ 
 		}
 
 		FileHandler::makeDir('./files/ruleset');
-		if(!is_readable('./files/ruleset/insertMember.xml'))
+		if (!is_readable('./files/ruleset/insertMember.xml'))
 			$oMemberAdminController->_createSignupRuleset($config->signupForm);
-		if(!is_readable('./files/ruleset/login.xml'))
+		if (!is_readable('./files/ruleset/login.xml'))
 			$oMemberAdminController->_createLoginRuleset($config->identifier);
-		if(!is_readable('./files/ruleset/find_member_account_by_question.xml'))
+		if (!is_readable('./files/ruleset/find_member_account_by_question.xml'))
 			$oMemberAdminController->_createFindAccountByQuestion($config->identifier);
 
-		if($oModuleModel->needUpdate('member.1.8.43.recreate_signup_ruleset'))
+		if ($oModuleModel->needUpdate('member.1.8.43.recreate_signup_ruleset'))
 		{
 			$oMemberAdminController->_createSignupRuleset($config->signupForm);
 			$oModuleController->insertUpdatedLog('member.1.8.43.recreate_signup_ruleset');
@@ -438,7 +438,7 @@ 
 	 */
 	function recordLoginError($error = 0, $message = 'success')
 	{
-		if($error == 0) return new BaseObject($error, $message);
+		if ($error == 0) return new BaseObject($error, $message);
 
 		// Create a member model object
 		$oMemberModel = getModel('member');
@@ -446,18 +446,18 @@ 
 
 		// Check if there is recoding table.
 		$oDB = &DB::getInstance();
-		if(!$oDB->isTableExists('member_login_count') || $config->enable_login_fail_report == 'N') return new BaseObject($error, $message);
+		if (!$oDB->isTableExists('member_login_count') || $config->enable_login_fail_report == 'N') return new BaseObject($error, $message);
 
 		$args = new stdClass();
 		$args->ipaddress = $_SERVER['REMOTE_ADDR'];
 
 		$output = executeQuery('member.getLoginCountByIp', $args);
-		if($output->data && $output->data->count)
+		if ($output->data && $output->data->count)
 		{
 			$last_update = strtotime($output->data->last_update);
-			$term = intval($_SERVER['REQUEST_TIME']-$last_update);
+			$term = intval($_SERVER['REQUEST_TIME'] - $last_update);
 			//update, if IP address access in a short time, update count. If not, make count 1.
-			if($term < $config->max_error_count_time)
+			if ($term < $config->max_error_count_time)
 			{
 				$args->count = $output->data->count + 1;
 			}
@@ -483,7 +483,7 @@ 
 	 */
 	function recordMemberLoginError($error = 0, $message = 'success', $args = NULL)
 	{
-		if($error == 0 || !$args->member_srl) return new BaseObject($error, $message);
+		if ($error == 0 || !$args->member_srl) return new BaseObject($error, $message);
 
 		// Create a member model object
 		$oMemberModel = getModel('member');
@@ -491,21 +491,21 @@ 
 
 		// Check if there is recoding table.
 		$oDB = &DB::getInstance();
-		if(!$oDB->isTableExists('member_count_history') || $config->enable_login_fail_report == 'N') return new BaseObject($error, $message);
+		if (!$oDB->isTableExists('member_count_history') || $config->enable_login_fail_report == 'N') return new BaseObject($error, $message);
 
 		$output = executeQuery('member.getLoginCountHistoryByMemberSrl', $args);
-		if($output->data && $output->data->content)
+		if ($output->data && $output->data->content)
 		{
 			//update
 			$content = unserialize($output->data->content);
-			$content[] = array($_SERVER['REMOTE_ADDR'],Context::getLang($message),$_SERVER['REQUEST_TIME']);
+			$content[] = array($_SERVER['REMOTE_ADDR'], Context::getLang($message), $_SERVER['REQUEST_TIME']);
 			$args->content = serialize($content);
 			$output = executeQuery('member.updateLoginCountHistoryByMemberSrl', $args);
 		}
 		else
 		{
 			//insert
-			$content[0] = array($_SERVER['REMOTE_ADDR'],Context::getLang($message),$_SERVER['REQUEST_TIME']);
+			$content[0] = array($_SERVER['REMOTE_ADDR'], Context::getLang($message), $_SERVER['REQUEST_TIME']);
 			$args->content = serialize($content);
 			$output = executeQuery('member.insertLoginCountHistoryByMemberSrl', $args);
 		}

Braces +138 added lines, -56 removed lines

@@ -20,7 +20,9 @@ 
 	 */
 	function member()
 	{
-		if(!Context::isInstalled()) return;
+		if(!Context::isInstalled()) {
+			return;
+		}
 
 		$oModuleModel = getModel('module');
 		$member_config = $oModuleModel->getModuleConfig('member');
@@ -58,18 +60,42 @@ 
 		// Set the basic information
 		$config->enable_join = 'Y';
 		$config->enable_openid = 'N';
-		if(!$config->enable_auth_mail) $config->enable_auth_mail = 'N';
-		if(!$config->image_name) $config->image_name = 'Y';
-		if(!$config->image_mark) $config->image_mark = 'Y';
-		if(!$config->profile_image) $config->profile_image = 'Y';
-		if(!$config->image_name_max_width) $config->image_name_max_width = '90';
-		if(!$config->image_name_max_height) $config->image_name_max_height = '20';
-		if(!$config->image_mark_max_width) $config->image_mark_max_width = '20';
-		if(!$config->image_mark_max_height) $config->image_mark_max_height = '20';
-		if(!$config->profile_image_max_width) $config->profile_image_max_width = '90';
-		if(!$config->profile_image_max_height) $config->profile_image_max_height = '90';
-		if($config->group_image_mark!='Y') $config->group_image_mark = 'N';
-		if(!$config->password_strength) $config->password_strength = 'normal';
+		if(!$config->enable_auth_mail) {
+			$config->enable_auth_mail = 'N';
+		}
+		if(!$config->image_name) {
+			$config->image_name = 'Y';
+		}
+		if(!$config->image_mark) {
+			$config->image_mark = 'Y';
+		}
+		if(!$config->profile_image) {
+			$config->profile_image = 'Y';
+		}
+		if(!$config->image_name_max_width) {
+			$config->image_name_max_width = '90';
+		}
+		if(!$config->image_name_max_height) {
+			$config->image_name_max_height = '20';
+		}
+		if(!$config->image_mark_max_width) {
+			$config->image_mark_max_width = '20';
+		}
+		if(!$config->image_mark_max_height) {
+			$config->image_mark_max_height = '20';
+		}
+		if(!$config->profile_image_max_width) {
+			$config->profile_image_max_width = '90';
+		}
+		if(!$config->profile_image_max_height) {
+			$config->profile_image_max_height = '90';
+		}
+		if($config->group_image_mark!='Y') {
+			$config->group_image_mark = 'N';
+		}
+		if(!$config->password_strength) {
+			$config->password_strength = 'normal';
+		}
 		
 		if(!$config->password_hashing_algorithm)
 		{
@@ -187,36 +213,64 @@ 
 		if($oModuleModel->needUpdate($version_update_id))
 		{
 			// check member directory (11/08/2007 added)
-			if(!is_dir("./files/member_extra_info")) return true;
+			if(!is_dir("./files/member_extra_info")) {
+				return true;
+			}
 			// check member directory (22/10/2007 added)
-			if(!is_dir("./files/member_extra_info/profile_image")) return true;
+			if(!is_dir("./files/member_extra_info/profile_image")) {
+				return true;
+			}
 			// Add a column(is_register) to "member_auth_mail" table (22/04/2008)
 			$act = $oDB->isColumnExists("member_auth_mail", "is_register");
-			if(!$act) return true;
+			if(!$act) {
+				return true;
+			}
 			// Add a column(site_srl) to "member_group_member" table (11/15/2008)
-			if(!$oDB->isColumnExists("member_group_member", "site_srl")) return true;
-			if(!$oDB->isColumnExists("member_group", "site_srl")) return true;
-			if($oDB->isIndexExists("member_group","uni_member_group_title")) return true;
+			if(!$oDB->isColumnExists("member_group_member", "site_srl")) {
+				return true;
+			}
+			if(!$oDB->isColumnExists("member_group", "site_srl")) {
+				return true;
+			}
+			if($oDB->isIndexExists("member_group","uni_member_group_title")) {
+				return true;
+			}
 
 			// Add a column for list_order (05/18/2011)
-			if(!$oDB->isColumnExists("member_group", "list_order")) return true;
+			if(!$oDB->isColumnExists("member_group", "list_order")) {
+				return true;
+			}
 
 			// image_mark 추가 (2009. 02. 14)
-			if(!$oDB->isColumnExists("member_group", "image_mark")) return true;
+			if(!$oDB->isColumnExists("member_group", "image_mark")) {
+				return true;
+			}
 			// Add c column for password expiration date
-			if(!$oDB->isColumnExists("member", "change_password_date")) return true;
+			if(!$oDB->isColumnExists("member", "change_password_date")) {
+				return true;
+			}
 
 			// Add columns of question and answer to verify a password
-			if(!$oDB->isColumnExists("member", "find_account_question")) return true;
-			if(!$oDB->isColumnExists("member", "find_account_answer")) return true;
+			if(!$oDB->isColumnExists("member", "find_account_question")) {
+				return true;
+			}
+			if(!$oDB->isColumnExists("member", "find_account_answer")) {
+				return true;
+			}
 
-			if(!$oDB->isColumnExists("member", "list_order")) return true;
-			if(!$oDB->isIndexExists("member","idx_list_order")) return true;
+			if(!$oDB->isColumnExists("member", "list_order")) {
+				return true;
+			}
+			if(!$oDB->isIndexExists("member","idx_list_order")) {
+				return true;
+			}
 
 			$oModuleModel = getModel('module');
 			$config = $oModuleModel->getModuleConfig('member');
 			// check signup form ordering info
-			if(!$config->signupForm) return true;
+			if(!$config->signupForm) {
+				return true;
+			}
 
 			foreach($config->signupForm as $form)
 			{
@@ -227,7 +281,9 @@ 
 			}
 
 			// check agreement field exist
-			if($config->agreement) return true;
+			if($config->agreement) {
+				return true;
+			}
 
 			if($config->skin)
 			{
@@ -235,25 +291,41 @@ 
 				if(count($config_parse) > 1)
 				{
 					$template_path = sprintf('./themes/%s/modules/member/', $config_parse[0]);
-					if(is_dir($template_path)) return true;
+					if(is_dir($template_path)) {
+						return true;
+					}
 				}
 			}
 
 			// supprot multilanguage agreement.
-			if(is_readable('./files/member_extra_info/agreement.txt')) return true;
+			if(is_readable('./files/member_extra_info/agreement.txt')) {
+				return true;
+			}
 
 			// 2013. 11. 22 add menu when popup document menu called
-			if(!$oModuleModel->getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after')) return true;
-			if(!$oModuleModel->getTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after')) return true;
+			if(!$oModuleModel->getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after')) {
+				return true;
+			}
+			if(!$oModuleModel->getTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after')) {
+				return true;
+			}
 
 			$oModuleController->insertUpdatedLog($version_update_id);
 		}
 
-		if(!is_readable('./files/ruleset/insertMember.xml')) return true;
-		if(!is_readable('./files/ruleset/login.xml')) return true;
-		if(!is_readable('./files/ruleset/find_member_account_by_question.xml')) return true;
+		if(!is_readable('./files/ruleset/insertMember.xml')) {
+			return true;
+		}
+		if(!is_readable('./files/ruleset/login.xml')) {
+			return true;
+		}
+		if(!is_readable('./files/ruleset/find_member_account_by_question.xml')) {
+			return true;
+		}
 
-		if($oModuleModel->needUpdate('member.1.8.43.recreate_signup_ruleset')) return true;
+		if($oModuleModel->needUpdate('member.1.8.43.recreate_signup_ruleset')) {
+			return true;
+		}
 
 		return false;
 	}
@@ -391,10 +463,12 @@ 
 			}
 			
 			// 2013. 11. 22 add menu when popup document menu called
-			if(!$oModuleModel->getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after'))
-				$oModuleController->insertTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after');
-			if(!$oModuleModel->getTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after'))
-				$oModuleController->insertTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after');
+			if(!$oModuleModel->getTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after')) {
+							$oModuleController->insertTrigger('document.getDocumentMenu', 'member', 'controller', 'triggerGetDocumentMenu', 'after');
+			}
+			if(!$oModuleModel->getTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after')) {
+							$oModuleController->insertTrigger('comment.getCommentMenu', 'member', 'controller', 'triggerGetCommentMenu', 'after');
+			}
 
 			if(is_readable('./files/member_extra_info/agreement.txt'))
 			{
@@ -408,12 +482,15 @@ 
 		}
 
 		FileHandler::makeDir('./files/ruleset');
-		if(!is_readable('./files/ruleset/insertMember.xml'))
-			$oMemberAdminController->_createSignupRuleset($config->signupForm);
-		if(!is_readable('./files/ruleset/login.xml'))
-			$oMemberAdminController->_createLoginRuleset($config->identifier);
-		if(!is_readable('./files/ruleset/find_member_account_by_question.xml'))
-			$oMemberAdminController->_createFindAccountByQuestion($config->identifier);
+		if(!is_readable('./files/ruleset/insertMember.xml')) {
+					$oMemberAdminController->_createSignupRuleset($config->signupForm);
+		}
+		if(!is_readable('./files/ruleset/login.xml')) {
+					$oMemberAdminController->_createLoginRuleset($config->identifier);
+		}
+		if(!is_readable('./files/ruleset/find_member_account_by_question.xml')) {
+					$oMemberAdminController->_createFindAccountByQuestion($config->identifier);
+		}
 
 		if($oModuleModel->needUpdate('member.1.8.43.recreate_signup_ruleset'))
 		{
@@ -438,7 +515,9 @@ 
 	 */
 	function recordLoginError($error = 0, $message = 'success')
 	{
-		if($error == 0) return new BaseObject($error, $message);
+		if($error == 0) {
+			return new BaseObject($error, $message);
+		}
 
 		// Create a member model object
 		$oMemberModel = getModel('member');
@@ -446,7 +525,9 @@ 
 
 		// Check if there is recoding table.
 		$oDB = &DB::getInstance();
-		if(!$oDB->isTableExists('member_login_count') || $config->enable_login_fail_report == 'N') return new BaseObject($error, $message);
+		if(!$oDB->isTableExists('member_login_count') || $config->enable_login_fail_report == 'N') {
+			return new BaseObject($error, $message);
+		}
 
 		$args = new stdClass();
 		$args->ipaddress = $_SERVER['REMOTE_ADDR'];
@@ -460,16 +541,14 @@ 
 			if($term < $config->max_error_count_time)
 			{
 				$args->count = $output->data->count + 1;
-			}
-			else
+			} else
 			{
 				$args->count = 1;
 			}
 			unset($oMemberModel);
 			unset($config);
 			$output = executeQuery('member.updateLoginCountByIp', $args);
-		}
-		else
+		} else
 		{
 			//insert
 			$args->count = 1;
@@ -483,7 +562,9 @@ 
 	 */
 	function recordMemberLoginError($error = 0, $message = 'success', $args = NULL)
 	{
-		if($error == 0 || !$args->member_srl) return new BaseObject($error, $message);
+		if($error == 0 || !$args->member_srl) {
+			return new BaseObject($error, $message);
+		}
 
 		// Create a member model object
 		$oMemberModel = getModel('member');
@@ -491,7 +572,9 @@ 
 
 		// Check if there is recoding table.
 		$oDB = &DB::getInstance();
-		if(!$oDB->isTableExists('member_count_history') || $config->enable_login_fail_report == 'N') return new BaseObject($error, $message);
+		if(!$oDB->isTableExists('member_count_history') || $config->enable_login_fail_report == 'N') {
+			return new BaseObject($error, $message);
+		}
 
 		$output = executeQuery('member.getLoginCountHistoryByMemberSrl', $args);
 		if($output->data && $output->data->content)
@@ -501,8 +584,7 @@ 
 			$content[] = array($_SERVER['REMOTE_ADDR'],Context::getLang($message),$_SERVER['REQUEST_TIME']);
 			$args->content = serialize($content);
 			$output = executeQuery('member.updateLoginCountHistoryByMemberSrl', $args);
-		}
-		else
+		} else
 		{
 			//insert
 			$content[0] = array($_SERVER['REMOTE_ADDR'],Context::getLang($message),$_SERVER['REQUEST_TIME']);

modules/spamfilter/spamfilter.controller.php

Spacing +45 added lines, -45 removed lines

@@ -27,39 +27,39 @@ 
 	 */
 	function triggerInsertDocument(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new BaseObject();
+		if ($_SESSION['avoid_log']) return new BaseObject();
 		// Check the login status, login information, and permission
 		$is_logged = Context::get('is_logged');
 		$logged_info = Context::get('logged_info');
 		$grant = Context::get('grant');
 		// In case logged in, check if it is an administrator
-		if($is_logged)
+		if ($is_logged)
 		{
-			if($logged_info->is_admin == 'Y') return new BaseObject();
-			if($grant->manager) return new BaseObject();
+			if ($logged_info->is_admin == 'Y') return new BaseObject();
+			if ($grant->manager) return new BaseObject();
 		}
 
 		$oFilterModel = getModel('spamfilter');
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check if there is a ban on the word
 		$text = '';
-		if($is_logged)
+		if ($is_logged)
 		{
-			$text = $obj->title . ' ' . $obj->content . ' ' . $obj->tags;
+			$text = $obj->title.' '.$obj->content.' '.$obj->tags;
 		}
 		else
 		{
-			$text = $obj->title . ' ' . $obj->content . ' ' . $obj->nick_name . ' ' . $obj->homepage . ' ' . $obj->tags;	
+			$text = $obj->title.' '.$obj->content.' '.$obj->nick_name.' '.$obj->homepage.' '.$obj->tags;	
 		}
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check the specified time beside the modificaiton time
-		if($obj->document_srl == 0)
+		if ($obj->document_srl == 0)
 		{
 			$output = $oFilterModel->checkLimited();
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 		// Save a log
 		$this->insertLog();
@@ -72,39 +72,39 @@ 
 	 */
 	function triggerInsertComment(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new BaseObject();
+		if ($_SESSION['avoid_log']) return new BaseObject();
 		// Check the login status, login information, and permission
 		$is_logged = Context::get('is_logged');
 		$logged_info = Context::get('logged_info');
 		$grant = Context::get('grant');
 		// In case logged in, check if it is an administrator
-		if($is_logged)
+		if ($is_logged)
 		{
-			if($logged_info->is_admin == 'Y') return new BaseObject();
-			if($grant->manager) return new BaseObject();
+			if ($logged_info->is_admin == 'Y') return new BaseObject();
+			if ($grant->manager) return new BaseObject();
 		}
 
 		$oFilterModel = getModel('spamfilter');
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check if there is a ban on the word
 		$text = '';
-		if($is_logged)
+		if ($is_logged)
 		{
 			$text = $obj->content;
 		}
 		else
 		{
-			$text = $obj->content . ' ' . $obj->nick_name . ' ' . $obj->homepage;	
+			$text = $obj->content.' '.$obj->nick_name.' '.$obj->homepage;	
 		}
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// If the specified time check is not modified
-		if(!$obj->__isupdate)
+		if (!$obj->__isupdate)
 		{
 			$output = $oFilterModel->checkLimited();
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 		unset($obj->__isupdate);
 		// Save a log
@@ -118,32 +118,32 @@ 
 	 */
 	function triggerInsertTrackback(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new BaseObject();
+		if ($_SESSION['avoid_log']) return new BaseObject();
 
 		$oFilterModel = getModel('spamfilter');
 		// Confirm if the trackbacks have been added more than once to your document
 		$output = $oFilterModel->isInsertedTrackback($obj->document_srl);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check if there is a ban on the word
-		$text = $obj->blog_name . ' ' . $obj->title . ' ' . $obj->excerpt . ' ' . $obj->url;
+		$text = $obj->blog_name.' '.$obj->title.' '.$obj->excerpt.' '.$obj->url;
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Start Filtering
 		$oTrackbackModel = getModel('trackback');
 		$oTrackbackController = getController('trackback');
 
-		list($ipA,$ipB,$ipC,$ipD) = explode('.',$_SERVER['REMOTE_ADDR']);
+		list($ipA, $ipB, $ipC, $ipD) = explode('.', $_SERVER['REMOTE_ADDR']);
 		$ipaddress = $ipA.'.'.$ipB.'.'.$ipC;
 		// In case the title and the blog name are indentical, investigate the IP address of the last 6 hours, delete and ban it.
-		if($obj->title == $obj->excerpt)
+		if ($obj->title == $obj->excerpt)
 		{
-			$oTrackbackController->deleteTrackbackSender(60*60*6, $ipaddress, $obj->url, $obj->blog_name, $obj->title, $obj->excerpt);
+			$oTrackbackController->deleteTrackbackSender(60 * 60 * 6, $ipaddress, $obj->url, $obj->blog_name, $obj->title, $obj->excerpt);
 			$this->insertIP($ipaddress.'.*', 'AUTO-DENIED : trackback.insertTrackback');
-			return new BaseObject(-1,'msg_alert_trackback_denied');
+			return new BaseObject(-1, 'msg_alert_trackback_denied');
 		}
 		// If trackbacks have been registered by one C-class IP address more than once for the last 30 minutes, ban the IP address and delete all the posts
 		/* 호스팅 환경을 감안하여 일단 이 부분은 동작하지 않도록 주석 처리
@@ -165,24 +165,24 @@ 
 	function insertIP($ipaddress_list, $description = null)
 	{
 		$regExr = "/^((\d{1,3}(?:.(\d{1,3}|\*)){3})\s*(\/\/(.*)\s*)?)*\s*$/";
-		if(!preg_match($regExr,$ipaddress_list)) return new BaseObject(-1, 'msg_invalid');
-		$ipaddress_list = str_replace("\r","",$ipaddress_list);
-		$ipaddress_list = explode("\n",$ipaddress_list);
-		foreach($ipaddress_list as $ipaddressValue)
+		if (!preg_match($regExr, $ipaddress_list)) return new BaseObject(-1, 'msg_invalid');
+		$ipaddress_list = str_replace("\r", "", $ipaddress_list);
+		$ipaddress_list = explode("\n", $ipaddress_list);
+		foreach ($ipaddress_list as $ipaddressValue)
 		{
 			$args = new stdClass();
-			preg_match("/(\d{1,3}(?:.(\d{1,3}|\*)){3})\s*(\/\/(.*)\s*)?/",$ipaddressValue,$matches);
-			if($ipaddress=trim($matches[1]))
+			preg_match("/(\d{1,3}(?:.(\d{1,3}|\*)){3})\s*(\/\/(.*)\s*)?/", $ipaddressValue, $matches);
+			if ($ipaddress = trim($matches[1]))
 			{
 				$args->ipaddress = $ipaddress;
-				if(!$description && $matches[4]) $args->description = $matches[4];
+				if (!$description && $matches[4]) $args->description = $matches[4];
 				else $args->description = $description;
 			}
 			$output = executeQuery('spamfilter.insertDeniedIP', $args);
-			if(!$output->toBool()) $fail_list .= $ipaddress.'<br/>';
+			if (!$output->toBool()) $fail_list .= $ipaddress.'<br/>';
 		}
 
-		$output->add('fail_list',$fail_list);
+		$output->add('fail_list', $fail_list);
 		return $output;
 	}
 
@@ -191,22 +191,22 @@ 
 	 */
 	function triggerSendMessage(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new BaseObject();
+		if ($_SESSION['avoid_log']) return new BaseObject();
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin == 'Y') return new BaseObject();
+		if ($logged_info->is_admin == 'Y') return new BaseObject();
 
 		$oFilterModel = getModel('spamfilter');
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check if there is a ban on the word
-		$text = $obj->title . ' ' . $obj->content;
+		$text = $obj->title.' '.$obj->content;
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Check the specified time
 		$output = $oFilterModel->checkLimited(TRUE);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Save a log
 		$this->insertLog();
 

Braces +76 added lines, -29 removed lines

@@ -27,7 +27,9 @@ 
 	 */
 	function triggerInsertDocument(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new BaseObject();
+		if($_SESSION['avoid_log']) {
+			return new BaseObject();
+		}
 		// Check the login status, login information, and permission
 		$is_logged = Context::get('is_logged');
 		$logged_info = Context::get('logged_info');
@@ -35,31 +37,40 @@ 
 		// In case logged in, check if it is an administrator
 		if($is_logged)
 		{
-			if($logged_info->is_admin == 'Y') return new BaseObject();
-			if($grant->manager) return new BaseObject();
+			if($logged_info->is_admin == 'Y') {
+				return new BaseObject();
+			}
+			if($grant->manager) {
+				return new BaseObject();
+			}
 		}
 
 		$oFilterModel = getModel('spamfilter');
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check if there is a ban on the word
 		$text = '';
 		if($is_logged)
 		{
 			$text = $obj->title . ' ' . $obj->content . ' ' . $obj->tags;
-		}
-		else
+		} else
 		{
 			$text = $obj->title . ' ' . $obj->content . ' ' . $obj->nick_name . ' ' . $obj->homepage . ' ' . $obj->tags;	
 		}
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check the specified time beside the modificaiton time
 		if($obj->document_srl == 0)
 		{
 			$output = $oFilterModel->checkLimited();
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 		// Save a log
 		$this->insertLog();
@@ -72,7 +83,9 @@ 
 	 */
 	function triggerInsertComment(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new BaseObject();
+		if($_SESSION['avoid_log']) {
+			return new BaseObject();
+		}
 		// Check the login status, login information, and permission
 		$is_logged = Context::get('is_logged');
 		$logged_info = Context::get('logged_info');
@@ -80,31 +93,40 @@ 
 		// In case logged in, check if it is an administrator
 		if($is_logged)
 		{
-			if($logged_info->is_admin == 'Y') return new BaseObject();
-			if($grant->manager) return new BaseObject();
+			if($logged_info->is_admin == 'Y') {
+				return new BaseObject();
+			}
+			if($grant->manager) {
+				return new BaseObject();
+			}
 		}
 
 		$oFilterModel = getModel('spamfilter');
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check if there is a ban on the word
 		$text = '';
 		if($is_logged)
 		{
 			$text = $obj->content;
-		}
-		else
+		} else
 		{
 			$text = $obj->content . ' ' . $obj->nick_name . ' ' . $obj->homepage;	
 		}
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// If the specified time check is not modified
 		if(!$obj->__isupdate)
 		{
 			$output = $oFilterModel->checkLimited();
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 		unset($obj->__isupdate);
 		// Save a log
@@ -118,20 +140,28 @@ 
 	 */
 	function triggerInsertTrackback(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new BaseObject();
+		if($_SESSION['avoid_log']) {
+			return new BaseObject();
+		}
 
 		$oFilterModel = getModel('spamfilter');
 		// Confirm if the trackbacks have been added more than once to your document
 		$output = $oFilterModel->isInsertedTrackback($obj->document_srl);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check if there is a ban on the word
 		$text = $obj->blog_name . ' ' . $obj->title . ' ' . $obj->excerpt . ' ' . $obj->url;
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Start Filtering
 		$oTrackbackModel = getModel('trackback');
 		$oTrackbackController = getController('trackback');
@@ -165,7 +195,9 @@ 
 	function insertIP($ipaddress_list, $description = null)
 	{
 		$regExr = "/^((\d{1,3}(?:.(\d{1,3}|\*)){3})\s*(\/\/(.*)\s*)?)*\s*$/";
-		if(!preg_match($regExr,$ipaddress_list)) return new BaseObject(-1, 'msg_invalid');
+		if(!preg_match($regExr,$ipaddress_list)) {
+			return new BaseObject(-1, 'msg_invalid');
+		}
 		$ipaddress_list = str_replace("\r","",$ipaddress_list);
 		$ipaddress_list = explode("\n",$ipaddress_list);
 		foreach($ipaddress_list as $ipaddressValue)
@@ -175,11 +207,16 @@ 
 			if($ipaddress=trim($matches[1]))
 			{
 				$args->ipaddress = $ipaddress;
-				if(!$description && $matches[4]) $args->description = $matches[4];
-				else $args->description = $description;
+				if(!$description && $matches[4]) {
+					$args->description = $matches[4];
+				} else {
+					$args->description = $description;
+				}
 			}
 			$output = executeQuery('spamfilter.insertDeniedIP', $args);
-			if(!$output->toBool()) $fail_list .= $ipaddress.'<br/>';
+			if(!$output->toBool()) {
+				$fail_list .= $ipaddress.'<br/>';
+			}
 		}
 
 		$output->add('fail_list',$fail_list);
@@ -191,22 +228,32 @@ 
 	 */
 	function triggerSendMessage(&$obj)
 	{
-		if($_SESSION['avoid_log']) return new BaseObject();
+		if($_SESSION['avoid_log']) {
+			return new BaseObject();
+		}
 
 		$logged_info = Context::get('logged_info');
-		if($logged_info->is_admin == 'Y') return new BaseObject();
+		if($logged_info->is_admin == 'Y') {
+			return new BaseObject();
+		}
 
 		$oFilterModel = getModel('spamfilter');
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check if there is a ban on the word
 		$text = $obj->title . ' ' . $obj->content;
 		$output = $oFilterModel->isDeniedWord($text);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Check the specified time
 		$output = $oFilterModel->checkLimited(TRUE);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Save a log
 		$this->insertLog();
 

modules/spamfilter/spamfilter.model.php

Spacing +21 added lines, -21 removed lines

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

Braces +31 added lines, -12 removed lines

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