Remove trailing whitespace

modules/install/install.admin.controller.php

@@ -43,16 +43,16 @@ class installAdminController extends install
 		{
 			throw new Rhymix\Framework\Exceptions\InvalidRequest;
 		}
-		
+
 		Rhymix\Framework\Session::close();
-		
+
 		$output = $oModule->moduleUpdate();
 		if($output instanceof BaseObject && !$output->toBool())
 		{
 			Rhymix\Framework\Session::start();
 			return $output;
 		}
-		
+
 		$oModuleController = getController('module');
 		$output = $oModuleController->registerActionForwardRoutes($module_name);
 		if($output instanceof BaseObject && !$output->toBool())
@@ -60,7 +60,7 @@ class installAdminController extends install
 			Rhymix\Framework\Session::start();
 			return $output;
 		}
-		
+
 		Rhymix\Framework\Session::start();
 		$this->setMessage('success_updated');
 	}

modules/install/install.class.php

@@ -12,7 +12,7 @@ class install extends ModuleObject
 	 */
 	function moduleInstall()
 	{
-		
+
 	}
 
 	/**
@@ -28,7 +28,7 @@ class install extends ModuleObject
 	 */
 	function moduleUpdate()
 	{
-		
+
 	}
 
 	/**

modules/install/install.controller.php

@@ -19,7 +19,7 @@ class installController extends install
 		{
 			throw new Rhymix\Framework\Exception('msg_already_installed');
 		}
-		
+
 		// Increase time limit.
 		@set_time_limit(0);
 	}
@@ -31,13 +31,13 @@ class installController extends install
 	{
 		// Get DB config variables.
 		$config = Context::gets('db_type', 'db_host', 'db_port', 'db_user', 'db_pass', 'db_database', 'db_prefix');
-		
+
 		// Disallow installation using the root account.
 		if (trim($config->db_user) === 'root' && !preg_match('/Development Server$/', $_SERVER['SERVER_SOFTWARE']))
 		{
 			return new BaseObject(-1, 'msg_dbroot_disallowed');
 		}
-		
+
 		// Create a temporary setting object.
 		Rhymix\Framework\Config::set('db.master', array(
 			'type' => $config->db_type,
@@ -48,7 +48,7 @@ class installController extends install
 			'database' => $config->db_database,
 			'prefix' => $config->db_prefix ? (rtrim($config->db_prefix, '_') . '_') : '',
 		));
-		
+
 		// Check connection to the DB.
 		$oDB = DB::getInstance();
 		$output = $oDB->getError();
@@ -56,7 +56,7 @@ class installController extends install
 		{
 			return $output;
 		}
-		
+
 		// Check MySQL server capabilities.
 		if(stripos($config->db_type, 'mysql') !== false)
 		{
@@ -70,12 +70,12 @@ class installController extends install
 					break;
 				}
 			}
-			
+
 			// Check if utf8mb4 is supported.
 			$oDB->charset = $oDB->getBestSupportedCharset();
 			$config->db_charset = $oDB->charset;
 		}
-		
+
 		// Check if tables already exist.
 		$table_check = array('documents', 'comments', 'modules', 'sites');
 		foreach ($table_check as $table_name)
@@ -85,10 +85,10 @@ class installController extends install
 				throw new Rhymix\Framework\Exception('msg_table_already_exists');
 			}
 		}
-		
+
 		// Save DB config in session.
 		$_SESSION['db_config'] = $config;
-		
+
 		// Continue the installation.
 		if(!in_array(Context::getRequestMethod(), array('XMLRPC','JSON')))
 		{
@@ -107,7 +107,7 @@ class installController extends install
 		{
 			throw new Rhymix\Framework\Exception('msg_already_installed');
 		}
-		
+
 		// Get install parameters.
 		$config = Rhymix\Framework\Config::getDefaults();
 		if ($install_config)
@@ -147,23 +147,23 @@ class installController extends install
 			$time_zone = Context::get('time_zone');
 			$user_info = Context::gets('email_address', 'password', 'nick_name', 'user_id');
 		}
-		
+
 		// Fix the database table prefix.
 		$config['db']['master']['prefix'] = rtrim($config['db']['master']['prefix'], '_');
 		if ($config['db']['master']['prefix'] !== '')
 		{
 			$config['db']['master']['prefix'] .= '_';
 		}
-		
+
 		// Create new crypto keys.
 		$config['crypto']['encryption_key'] = Rhymix\Framework\Security::getRandom(64, 'alnum');
 		$config['crypto']['authentication_key'] = Rhymix\Framework\Security::getRandom(64, 'alnum');
 		$config['crypto']['session_key'] = Rhymix\Framework\Security::getRandom(64, 'alnum');
-		
+
 		// Set the default language.
 		$config['locale']['default_lang'] = Context::getLangType();
 		$config['locale']['enabled_lang'] = array($config['locale']['default_lang']);
-		
+
 		// Set the default time zone.
 		if (strpos($time_zone, '/') !== false)
 		{
@@ -183,7 +183,7 @@ class installController extends install
 					$config['locale']['default_timezone'] = 'Etc/GMT' . ($user_timezone > 0 ? '-' : '+') . abs($user_timezone);
 			}
 		}
-		
+
 		// Set the internal time zone.
 		if ($config['locale']['default_timezone'] === 'Asia/Seoul')
 		{
@@ -197,24 +197,24 @@ class installController extends install
 		{
 			$config['locale']['internal_timezone'] = 0;
 		}
-		
+
 		// Set the default URL.
 		$config['url']['default'] = Context::getRequestUri();
-		
+
 		// Set the default umask.
 		$config['file']['umask'] = Rhymix\Framework\Storage::recommendUmask();
-		
+
 		// Load the new configuration.
 		Rhymix\Framework\Config::setAll($config);
 		Context::loadDBInfo($config);
-		
+
 		// Check DB.
 		$oDB = DB::getInstance();
 		if (!$oDB->isConnected())
 		{
 			return $oDB->getError();
 		}
-		
+
 		// Assign a temporary administrator while installing.
 		foreach ($user_info as $key => $val)
 		{
@@ -222,7 +222,7 @@ class installController extends install
 		}
 		$user_info->is_admin = 'Y';
 		Context::set('logged_info', $user_info);
-		
+
 		// Install all the modules.
 		try
 		{
@@ -235,7 +235,7 @@ class installController extends install
 			$oDB->rollback();
 			throw new Rhymix\Framework\Exception($e->getMessage());
 		}
-		
+
 		// Execute the install script.
 		$scripts = FileHandler::readDir(RX_BASEDIR . 'modules/install/script', '/(\.php)$/');
 		if(count($scripts))
@@ -247,7 +247,7 @@ class installController extends install
 				$output = include($script_path . $script);
 			}
 		}
-		
+
 		// Apply site lock.
 		if (Context::get('use_sitelock') === 'Y')
 		{
@@ -256,23 +256,23 @@ class installController extends install
 			Rhymix\Framework\Config::set('lock.message', 'This site is locked.');
 			Rhymix\Framework\Config::set('lock.allow', array('127.0.0.1', $user_ip_range));
 		}
-		
+
 		// Use APC cache if available.
 		if (function_exists('apcu_exists'))
 		{
 			Rhymix\Framework\Config::set('cache.type', 'apc');
 		}
-		
+
 		// Save the new configuration.
 		Rhymix\Framework\Config::save();
-		
+
 		// Unset temporary session variables.
 		unset($_SESSION['use_rewrite']);
 		unset($_SESSION['db_config']);
-		
+
 		// Redirect to the home page.
 		$this->setMessage('msg_install_completed');
-		
+
 		$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : RX_BASEURL;
 		$this->setRedirectUrl($returnUrl);
 		return new BaseObject();
@@ -315,13 +315,13 @@ class installController extends install
 		{
 			$checklist['permission'] = false;
 		}
-		
+
 		// Check session availability
 		$license_agreement_time = intval(trim(FileHandler::readFile($this->flagLicenseAgreement)));
 		if(isset($_SESSION['license_agreement']) && (!$license_agreement_time || ($license_agreement_time == $_SESSION['license_agreement'])))
 		{
 			$sess_autostart = intval(ini_get('session.auto_start'));
-			
+
 			if($sess_autostart === 0)
 			{
 				$checklist['session'] = true;
@@ -425,7 +425,7 @@ class installController extends install
 		{
 			throw new Rhymix\Framework\Exception('msg_must_accept_license_agreement');
 		}
-		
+
 		$license_agreement_time = time();
 		$_SESSION['license_agreement'] = $license_agreement_time;
 		FileHandler::writeFile($this->flagLicenseAgreement, $license_agreement_time . PHP_EOL);
@@ -465,13 +465,13 @@ class installController extends install
 		{
 			// Get module name
 			$module = basename($module_path);
-			
+
 			// Only install default modules at this time
 			if (!Context::isDefaultPlugin($module, 'module'))
 			{
 				continue;
 			}
-			
+
 			// Try to group modules by category
 			$xml_info = ModuleModel::getModuleInfoXml($module);
 			if (!$xml_info)
@@ -480,14 +480,14 @@ class installController extends install
 			}
 			$modules[$xml_info->category ?: 'other'][] = $module;
 		}
-		
+
 		// Install "module" module in advance
 		$this->installModule('module','./modules/module');
 		$this->updateModule('module');
-		
+
 		// Determine the order of module installation depending on category
 		$install_step = array('system','content','member');
-		
+
 		// Install all the remaining modules
 		foreach($install_step as $category)
 		{
@@ -502,7 +502,7 @@ class installController extends install
 				unset($modules[$category]);
 			}
 		}
-		
+
 		// Install all the remaining modules
 		if(count($modules))
 		{
@@ -544,16 +544,16 @@ class installController extends install
 			{
 				continue;
 			}
-			
+
 			$table_name = $matches[1];
 			if(isset($schema_sorted[$table_name]) || $oDB->isTableExists($table_name))
 			{
 				continue;
 			}
-			
+
 			$schema_sorted[$table_name] = $filename;
 		}
-		
+
 		$schema_sorted = Rhymix\Framework\Parsers\DBTableParser::resolveDependency($schema_sorted);
 		foreach ($schema_sorted as $table_name => $filename)
 		{
@@ -563,7 +563,7 @@ class installController extends install
 				throw new Exception(lang('msg_create_table_failed') . ': ' . $table_name . ': ' . $oDB->getError()->getMessage());
 			}
 		}
-		
+
 		// Create a table and module instance and then execute install() method
 		$oModule = ModuleModel::getModuleInstallClass($module);
 		if($oModule && method_exists($oModule, 'moduleInstall'))
@@ -572,10 +572,10 @@ class installController extends install
 		}
 		return new BaseObject();
 	}
-	
+
 	/**
 	 * Update a module if necessary.
-	 * 
+	 *
 	 * @param string $module
 	 * @return mixed
 	 */
@@ -590,10 +590,10 @@ class installController extends install
 			}
 		}
 	}
-	
+
 	/**
 	 * Placeholder for third-party apps that try to manipulate system configuration.
-	 * 
+	 *
 	 * @return void
 	 */
 	public function makeConfigFile()

modules/install/install.model.php

@@ -35,7 +35,7 @@ class installModel extends install
 
 	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 $this->setError('msg_ftp_invalid_auth_info');
 		}
@@ -57,17 +57,17 @@ class installModel extends install
 			if(!$connection) return $this->setError(sprintf(lang('msg_ftp_not_connected'), 'host'));
 			if(! @ftp_login($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
 			{
-				ftp_close($connection);	
+				ftp_close($connection);
 				return $this->setError('msg_ftp_invalid_auth_info');
 			}
 
-			if($ftp_info->ftp_pasv != "N") 
+			if($ftp_info->ftp_pasv != "N")
 			{
 				ftp_pasv($connection, true);
 			}
 
 			$_list = ftp_rawlist($connection, $this->pwd);
-			ftp_close($connection);	
+			ftp_close($connection);
 		}
 		else
 		{
@@ -92,7 +92,7 @@ class installModel extends install
 		{
 			foreach($_list as $k => $v)
 			{
-				$src = new stdClass(); 
+				$src = new stdClass();
 				$src->data = $v;
 				$res = Context::convertEncoding($src);
 				$v = $res->data;

modules/install/install.view.php

@@ -21,13 +21,13 @@ class installView extends install
 		{
 			throw new Rhymix\Framework\Exception('msg_already_installed');
 		}
-		
+
 		// Set the browser title.
 		Context::setBrowserTitle(lang('introduce_title'));
-		
+
 		// Specify the template path.
 		$this->setTemplatePath($this->module_path.'tpl');
-		
+
 		// Check the environment.
 		$oInstallController = getController('install');
 		self::$checkEnv = $oInstallController->checkInstallEnv();
@@ -46,7 +46,7 @@ class installView extends install
 		if (file_exists(RX_BASEDIR . 'config/install.config.php'))
 		{
 			include RX_BASEDIR . 'config/install.config.php';
-			
+
 			if (isset($install_config) && is_array($install_config))
 			{
 				$oInstallController = getController('install');
@@ -61,7 +61,7 @@ class installView extends install
 				}
 			}
 		}
-		
+
 		// Otherwise, display the license agreement screen.
 		Context::set('lang_type', Context::getLangType());
 		$this->setTemplateFile('license_agreement');
@@ -75,7 +75,7 @@ class installView extends install
 		// Create a temporary file for mod_rewrite check.
 		self::$rewriteCheckString = Rhymix\Framework\Security::getRandom(32);
 		FileHandler::writeFile(RX_BASEDIR . self::$rewriteCheckFilePath, self::$rewriteCheckString);
-		
+
 		// Check if the web server is nginx.
 		Context::set('use_nginx', stripos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false);
 		$this->setTemplateFile('check_env');
@@ -91,16 +91,16 @@ class installView extends install
 		{
 			return $this->dispInstallCheckEnv();
 		}
-		
+
 		// Delete mod_rewrite check file
 		FileHandler::removeFile(RX_BASEDIR . self::$rewriteCheckFilePath);
-		
+
 		// Save mod_rewrite check status.
 		if(Context::get('rewrite') === 'Y')
 		{
 			Context::set('use_rewrite', $_SESSION['use_rewrite'] = 'Y');
 		}
-		
+
 		Context::set('error_return_url', getNotEncodedUrl('', 'act', Context::get('act')));
 		$this->setTemplateFile('db_config');
 	}
@@ -115,19 +115,19 @@ class installView extends install
 		{
 			return $this->dispInstallCheckEnv();
 		}
-		
+
 		// Get list of time zones.
 		Context::set('timezones', Rhymix\Framework\DateTime::getTimezoneList());
-		
+
 		// Automatically select a time zone for the user.
 		Context::set('selected_timezone', $this->detectUserTimeZone());
-		
+
 		// Always use SSL if installing via SSL.
 		Context::set('use_ssl', RX_SSL ? 'always' : 'none');
 		Context::set('sitelock_ip_range', $this->detectUserIPRange());
 		$this->setTemplateFile('other_config');
 	}
-	
+
 	/**
 	 * Detect the IP range of the user.
 	 */
@@ -148,7 +148,7 @@ class installView extends install
 			return RX_CLIENT_IP;
 		}
 	}
-	
+
 	/**
 	 * Detect best time zone for the user.
 	 */