xpressengine / xe-core

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;

classes/cache/CacheFile.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
 	/**
 	 * Return whether support or not support cache
 	 *
-	 * @return true
+	 * @return boolean
 	 */
 	function isSupport()
 	{
@@ -164,7 +164,7 @@ 
 	/**
 	 * Truncate all existing variables at the cache
 	 *
-	 * @return bool Returns true on success or false on failure.
+	 * @return boolean|null Returns true on success or false on failure.
 	 */
 	function truncate()
 	{

Spacing +10 added lines, -10 removed lines

@@ -23,7 +23,7 @@ 
 	 */
 	function getInstance()
 	{
-		if(!$GLOBALS['__CacheFile__'])
+		if (!$GLOBALS['__CacheFile__'])
 		{
 			$GLOBALS['__CacheFile__'] = new CacheFile();
 		}
@@ -37,7 +37,7 @@ 
 	 */
 	function __construct()
 	{
-		$this->cache_dir = _XE_PATH_ . $this->cache_dir;
+		$this->cache_dir = _XE_PATH_.$this->cache_dir;
 		FileHandler::makeDir($this->cache_dir);
 	}
 
@@ -49,7 +49,7 @@ 
 	 */
 	function getCacheFileName($key)
 	{
-		return $this->cache_dir . str_replace(':', DIRECTORY_SEPARATOR, $key) . '.php';
+		return $this->cache_dir.str_replace(':', DIRECTORY_SEPARATOR, $key).'.php';
 	}
 
 	/**
@@ -76,9 +76,9 @@ 
 		$content = array();
 		$content[] = '<?php';
 		$content[] = 'if(!defined(\'__XE__\')) { exit(); }';
-		$content[] = 'return \'' . addslashes(serialize($obj)) . '\';';
+		$content[] = 'return \''.addslashes(serialize($obj)).'\';';
 		FileHandler::writeFile($cache_file, implode(PHP_EOL, $content));
-		if(function_exists('opcache_invalidate'))
+		if (function_exists('opcache_invalidate'))
 		{
 			@opcache_invalidate($cache_file, true);
 		}
@@ -95,9 +95,9 @@ 
 	{
 		$cache_file = $this->getCacheFileName($key);
 
-		if(file_exists($cache_file))
+		if (file_exists($cache_file))
 		{
-			if($modified_time > 0 && filemtime($cache_file) < $modified_time)
+			if ($modified_time > 0 && filemtime($cache_file) < $modified_time)
 			{
 				FileHandler::removeFile($cache_file);
 				return false;
@@ -118,12 +118,12 @@ 
 	 */
 	function get($key, $modified_time = 0)
 	{
-		if(!$cache_file = FileHandler::exists($this->getCacheFileName($key)))
+		if (!$cache_file = FileHandler::exists($this->getCacheFileName($key)))
 		{
 			return false;
 		}
 
-		if($modified_time > 0 && filemtime($cache_file) < $modified_time)
+		if ($modified_time > 0 && filemtime($cache_file) < $modified_time)
 		{
 			FileHandler::removeFile($cache_file);
 			return false;
@@ -143,7 +143,7 @@ 
 	function _delete($_key)
 	{
 		$cache_file = $this->getCacheFileName($_key);
-		if(function_exists('opcache_invalidate'))
+		if (function_exists('opcache_invalidate'))
 		{
 			@opcache_invalidate($cache_file, true);
 		}

classes/cache/CacheMemcache.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	 *
 	 * Do not use this directly. You can use getInstance() instead.
 	 * @param string $url url of memcache
-	 * @return void
+	 * @return false|null
 	 */
 	function __construct($url)
 	{

classes/db/queryparts/condition/Condition.class.php

Doc Comments +3 added lines

@@ -97,6 +97,9 @@
 		return $this->pipe . ' ' . $this->getConditionPart($this->_value);
 	}
 
+	/**
+	 * @param string $pipe
+	 */
 	function setPipe($pipe)
 	{
 		$this->pipe = $pipe;

Spacing +33 added lines, -33 removed lines

@@ -61,13 +61,13 @@ 
 	 */
 	function toString($withValue = true)
 	{
-		if(!isset($this->_value_to_string))
+		if (!isset($this->_value_to_string))
 		{
-			if(!$this->show())
+			if (!$this->show())
 			{
 				$this->_value_to_string = '';
 			}
-			else if($withValue)
+			else if ($withValue)
 			{
 				$this->_value_to_string = $this->toStringWithValue();
 			}
@@ -85,7 +85,7 @@ 
 	 */
 	function toStringWithoutValue()
 	{
-		return $this->pipe . ' ' . $this->getConditionPart($this->_value);
+		return $this->pipe.' '.$this->getConditionPart($this->_value);
 	}
 
 	/**
@@ -94,7 +94,7 @@ 
 	 */
 	function toStringWithValue()
 	{
-		return $this->pipe . ' ' . $this->getConditionPart($this->_value);
+		return $this->pipe.' '.$this->getConditionPart($this->_value);
 	}
 
 	function setPipe($pipe)
@@ -107,16 +107,16 @@ 
 	 */
 	function show()
 	{
-		if(!isset($this->_show))
+		if (!isset($this->_show))
 		{
-			if(is_array($this->_value) && count($this->_value) === 1 && $this->_value[0] === '')
+			if (is_array($this->_value) && count($this->_value) === 1 && $this->_value[0] === '')
 			{
 				$this->_show = false;
 			}
 			else
 			{
 				$this->_show = true;
-				switch($this->operation)
+				switch ($this->operation)
 				{
 					case 'equal' :
 					case 'more' :
@@ -138,30 +138,30 @@ 
 					case 'not':
 					case 'notequal' :
 						// if variable is not set or is not string or number, return
-						if(!isset($this->_value))
+						if (!isset($this->_value))
 						{
 							$this->_show = false;
 							break;
 						}
-						if($this->_value === '')
+						if ($this->_value === '')
 						{
 							$this->_show = false;
 							break;
 						}
 						$tmpArray = array('string' => 1, 'integer' => 1);
-						if(!isset($tmpArray[gettype($this->_value)]))
+						if (!isset($tmpArray[gettype($this->_value)]))
 						{
 							$this->_show = false;
 							break;
 						}
 						break;
 					case 'between' :
-						if(!is_array($this->_value))
+						if (!is_array($this->_value))
 						{
 							$this->_show = false;
 							break;
 						}
-						if(count($this->_value) != 2)
+						if (count($this->_value) != 2)
 						{
 							$this->_show = false;
 							break;
@@ -188,67 +188,67 @@ 
 		$name = $this->column_name;
 		$operation = $this->operation;
 
-		switch($operation)
+		switch ($operation)
 		{
 			case 'equal' :
-				return $name . ' = ' . $value;
+				return $name.' = '.$value;
 				break;
 			case 'more' :
-				return $name . ' >= ' . $value;
+				return $name.' >= '.$value;
 				break;
 			case 'excess' :
-				return $name . ' > ' . $value;
+				return $name.' > '.$value;
 				break;
 			case 'less' :
-				return $name . ' <= ' . $value;
+				return $name.' <= '.$value;
 				break;
 			case 'below' :
-				return $name . ' < ' . $value;
+				return $name.' < '.$value;
 				break;
 			case 'like_tail' :
 			case 'like_prefix' :
 			case 'like' :
-				if(defined('__CUBRID_VERSION__')
+				if (defined('__CUBRID_VERSION__')
 						&& __CUBRID_VERSION__ >= '8.4.1')
-					return $name . ' rlike ' . $value;
+					return $name.' rlike '.$value;
 				else
-					return $name . ' like ' . $value;
+					return $name.' like '.$value;
 				break;
 			case 'notlike_tail' :
 			case 'notlike_prefix' :
 			case 'notlike' :
-				return $name . ' not like ' . $value;
+				return $name.' not like '.$value;
 				break;
 			case 'in' :
-				return $name . ' in ' . $value;
+				return $name.' in '.$value;
 				break;
 			case 'notin' :
 			case 'not_in' :
-				return $name . ' not in ' . $value;
+				return $name.' not in '.$value;
 				break;
 			case 'notequal' :
-				return $name . ' <> ' . $value;
+				return $name.' <> '.$value;
 				break;
 			case 'notnull' :
-				return $name . ' is not null';
+				return $name.' is not null';
 				break;
 			case 'null' :
-				return $name . ' is null';
+				return $name.' is null';
 				break;
 			case 'and' :
-				return $name . ' & ' . $value;
+				return $name.' & '.$value;
 				break;
 			case 'or' :
-				return $name . ' | ' . $value;
+				return $name.' | '.$value;
 				break;
 			case 'xor' :
-				return $name . ' ^ ' . $value;
+				return $name.' ^ '.$value;
 				break;
 			case 'not' :
-				return $name . ' ~ ' . $value;
+				return $name.' ~ '.$value;
 				break;
 			case 'between' :
-				return $name . ' between ' . $value[0] . ' and ' . $value[1];
+				return $name.' between '.$value[0].' and '.$value[1];
 				break;
 		}
 	}

Braces +8 added lines, -10 removed lines

@@ -66,12 +66,10 @@ 
 			if(!$this->show())
 			{
 				$this->_value_to_string = '';
-			}
-			else if($withValue)
+			} else if($withValue)
 			{
 				$this->_value_to_string = $this->toStringWithValue();
-			}
-			else
+			} else
 			{
 				$this->_value_to_string = $this->toStringWithoutValue();
 			}
@@ -112,8 +110,7 @@ 
 			if(is_array($this->_value) && count($this->_value) === 1 && $this->_value[0] === '')
 			{
 				$this->_show = false;
-			}
-			else
+			} else
 			{
 				$this->_show = true;
 				switch($this->operation)
@@ -209,10 +206,11 @@ 
 			case 'like_prefix' :
 			case 'like' :
 				if(defined('__CUBRID_VERSION__')
-						&& __CUBRID_VERSION__ >= '8.4.1')
-					return $name . ' rlike ' . $value;
-				else
-					return $name . ' like ' . $value;
+						&& __CUBRID_VERSION__ >= '8.4.1') {
+									return $name . ' rlike ' . $value;
+				} else {
+									return $name . ' like ' . $value;
+				}
 				break;
 			case 'notlike_tail' :
 			case 'notlike_prefix' :

classes/db/queryparts/condition/ConditionWithoutArgument.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -12,10 +12,10 @@
 	/**
 	 * constructor
 	 * @param string $column_name
-	 * @param mixed $argument
+	 * @param integer $argument
 	 * @param string $operation
 	 * @param string $pipe
-	 * @return void
+	 * @return boolean
 	 */
 	function __construct($column_name, $argument, $operation, $pipe = "")
 	{

Spacing +3 added lines, -3 removed lines

@@ -21,13 +21,13 @@
 	{
 		parent::__construct($column_name, $argument, $operation, $pipe);
 		$tmpArray = array('in' => 1, 'notin' => 1, 'not_in' => 1);
-		if(isset($tmpArray[$operation]))
+		if (isset($tmpArray[$operation]))
 		{
-			if(is_array($argument))
+			if (is_array($argument))
 			{
 				$argument = implode($argument, ',');
 			}
-			$this->_value = '(' . $argument . ')';
+			$this->_value = '('.$argument.')';
 		}
 		else
 		{

Braces +1 added lines, -2 removed lines

@@ -28,8 +28,7 @@
 				$argument = implode($argument, ',');
 			}
 			$this->_value = '(' . $argument . ')';
-		}
-		else
+		} else
 		{
 			$this->_value = $argument;
 		}

classes/db/queryparts/expression/UpdateExpression.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 	/**
 	 * constructor
 	 * @param string $column_name
-	 * @param object $argument
+	 * @param Argument $argument
 	 * @return void
 	 */
 	function __construct($column_name, $argument)

Spacing +8 added lines, -8 removed lines

@@ -35,7 +35,7 @@ 
 	 */
 	function getExpression($with_value = true)
 	{
-		if($with_value)
+		if ($with_value)
 		{
 			return $this->getExpressionWithValue();
 		}
@@ -50,7 +50,7 @@ 
 	{
 		$value = $this->argument->getValue();
 		$operation = $this->argument->getColumnOperation();
-		if(isset($operation))
+		if (isset($operation))
 		{
 			return "$this->column_name = $this->column_name $operation $value";
 		}
@@ -65,7 +65,7 @@ 
 	function getExpressionWithoutValue()
 	{
 		$operation = $this->argument->getColumnOperation();
-		if(isset($operation))
+		if (isset($operation))
 		{
 			return "$this->column_name = $this->column_name $operation ?";
 		}
@@ -76,21 +76,21 @@ 
 	{
 		// TODO Escape value according to column type instead of variable type
 		$value = $this->argument->getValue();
-		if(!is_numeric($value))
+		if (!is_numeric($value))
 		{
-			return "'" . $value . "'";
+			return "'".$value."'";
 		}
 		return $value;
 	}
 
 	function show()
 	{
-		if(!$this->argument)
+		if (!$this->argument)
 		{
 			return false;
 		}
 		$value = $this->argument->getValue();
-		if(!isset($value))
+		if (!isset($value))
 		{
 			return false;
 		}
@@ -104,7 +104,7 @@ 
 
 	function getArguments()
 	{
-		if($this->argument)
+		if ($this->argument)
 		{
 			return array($this->argument);
 		}

Braces +1 added lines, -2 removed lines

@@ -107,8 +107,7 @@
 		if($this->argument)
 		{
 			return array($this->argument);
-		}
-		else
+		} else
 		{
 			return array();
 		}

classes/mail/Mail.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
 	/**
 	 * Constructor function
 	 *
-	 * @return void
+	 * @return string
 	 */
 	function __construct()
 	{

classes/xml/xmlquery/argument/ConditionArgument.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -116,7 +116,7 @@
 	 * In this case, the column type is retrieved according to argument
 	 * value type (using the PHP function is_numeric).
 	 *
-	 * @return type string
+	 * @return string string
 	 */
 	function getType()
 	{

Spacing +20 added lines, -20 removed lines

@@ -26,7 +26,7 @@ 
 	function __construct($name, $value, $operation)
 	{
 		$operationList = array('in' => 1, 'notin' => 1, 'not_in' => 1, 'between' => 1);
-		if(isset($value) && isset($operationList[$operation]) && !is_array($value) && $value != '')
+		if (isset($value) && isset($operationList[$operation]) && !is_array($value) && $value != '')
 		{
 			$value = str_replace(' ', '', $value);
 			$value = str_replace('\'', '', $value);
@@ -42,7 +42,7 @@ 
 	 */
 	function createConditionValue()
 	{
-		if(!isset($this->value))
+		if (!isset($this->value))
 		{
 			return;
 		}
@@ -50,56 +50,56 @@ 
 		$operation = $this->operation;
 		$value = $this->value;
 
-		switch($operation)
+		switch ($operation)
 		{
 			case 'like_prefix' :
-				if(defined('__CUBRID_VERSION__') && __CUBRID_VERSION__ >= '8.4.1')
+				if (defined('__CUBRID_VERSION__') && __CUBRID_VERSION__ >= '8.4.1')
 				{
-					$this->value = '^' . str_replace('%', '(.*)', preg_quote($value));
+					$this->value = '^'.str_replace('%', '(.*)', preg_quote($value));
 				}
 				else
 				{
-					$this->value = $value . '%';
+					$this->value = $value.'%';
 				}
 				break;
 			case 'like_tail' :
-				if(defined('__CUBRID_VERSION__') && __CUBRID_VERSION__ >= '8.4.1')
+				if (defined('__CUBRID_VERSION__') && __CUBRID_VERSION__ >= '8.4.1')
 				{
-					$this->value = str_replace('%', '(.*)', preg_quote($value)) . '$';
+					$this->value = str_replace('%', '(.*)', preg_quote($value)).'$';
 				}
 				else
 				{
-					$this->value = '%' . $value;
+					$this->value = '%'.$value;
 				}
 				break;
 			case 'like' :
-				if(defined('__CUBRID_VERSION__') && __CUBRID_VERSION__ >= '8.4.1')
+				if (defined('__CUBRID_VERSION__') && __CUBRID_VERSION__ >= '8.4.1')
 				{
 					$this->value = str_replace('%', '(.*)', preg_quote($value));
 				}
 				else
 				{
-					$this->value = '%' . $value . '%';
+					$this->value = '%'.$value.'%';
 				}
 				break;
 			case 'notlike' :
-				$this->value = '%' . $value . '%';
+				$this->value = '%'.$value.'%';
 				break;
 			case 'notlike_prefix' :
-				$this->value = $value . '%';
+				$this->value = $value.'%';
 				break;
 			case 'notlike_tail' :
-				$this->value = '%' . $value;
+				$this->value = '%'.$value;
 				break;
 			case 'in':
-				if(!is_array($value))
+				if (!is_array($value))
 				{
 					$this->value = array($value);
 				}
 				break;
 			case 'notin':
 			case 'not_in':
-				if(!is_array($value))
+				if (!is_array($value))
 				{
 					$this->value = array($value);
 				}
@@ -120,11 +120,11 @@ 
 	 */
 	function getType()
 	{
-		if($this->type)
+		if ($this->type)
 		{
 			return $this->type;
 		}
-		else if(!is_numeric($this->value))
+		else if (!is_numeric($this->value))
 		{
 			return 'varchar';
 		}
@@ -136,11 +136,11 @@ 
 
 	function setColumnType($column_type)
 	{
-		if(!isset($this->value))
+		if (!isset($this->value))
 		{
 			return;
 		}
-		if($column_type === '')
+		if ($column_type === '')
 		{
 			return;
 		}

Braces +5 added lines, -10 removed lines

@@ -56,8 +56,7 @@ 
 				if(defined('__CUBRID_VERSION__') && __CUBRID_VERSION__ >= '8.4.1')
 				{
 					$this->value = '^' . str_replace('%', '(.*)', preg_quote($value));
-				}
-				else
+				} else
 				{
 					$this->value = $value . '%';
 				}
@@ -66,8 +65,7 @@ 
 				if(defined('__CUBRID_VERSION__') && __CUBRID_VERSION__ >= '8.4.1')
 				{
 					$this->value = str_replace('%', '(.*)', preg_quote($value)) . '$';
-				}
-				else
+				} else
 				{
 					$this->value = '%' . $value;
 				}
@@ -76,8 +74,7 @@ 
 				if(defined('__CUBRID_VERSION__') && __CUBRID_VERSION__ >= '8.4.1')
 				{
 					$this->value = str_replace('%', '(.*)', preg_quote($value));
-				}
-				else
+				} else
 				{
 					$this->value = '%' . $value . '%';
 				}
@@ -123,12 +120,10 @@ 
 		if($this->type)
 		{
 			return $this->type;
-		}
-		else if(!is_numeric($this->value))
+		} else if(!is_numeric($this->value))
 		{
 			return 'varchar';
-		}
-		else
+		} else
 		{
 			return '';
 		}

classes/xml/xmlquery/QueryParser.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 	 *
 	 * @param object $query XML object obtained after reading the XML Query file
 	 * @param bool $isSubQuery
-	 * @return void
+	 * @return string
 	 */
 	function __construct($query = NULL, $isSubQuery = FALSE)
 	{

Spacing +12 added lines, -12 removed lines

@@ -32,7 +32,7 @@ 
 	 */
 	function __construct($query = NULL, $isSubQuery = FALSE)
 	{
-		if($query)
+		if ($query)
 		{
 			$this->queryTag = new QueryTag($query, $isSubQuery);
 		}
@@ -54,17 +54,17 @@ 
 		$module = '';
 
 		$id_args = explode('.', $query_id);
-		if(count($id_args) == 2)
+		if (count($id_args) == 2)
 		{
 			$target = 'modules';
 			$module = $id_args[0];
 			$id = $id_args[1];
 		}
-		else if(count($id_args) == 3)
+		else if (count($id_args) == 3)
 		{
 			$target = $id_args[0];
 			$targetList = array('modules' => 1, 'addons' => 1, 'widgets' => 1);
-			if(!isset($targetList[$target]))
+			if (!isset($targetList[$target]))
 			{
 				return;
 			}
@@ -74,33 +74,33 @@ 
 
 		// get column properties from the table
 		$table_file = sprintf('%s%s/%s/schemas/%s.xml', _XE_PATH_, 'modules', $module, $table_name);
-		if(!file_exists($table_file))
+		if (!file_exists($table_file))
 		{
-			$searched_list = FileHandler::readDir(_XE_PATH_ . 'modules');
+			$searched_list = FileHandler::readDir(_XE_PATH_.'modules');
 			$searched_count = count($searched_list);
-			for($i = 0; $i < $searched_count; $i++)
+			for ($i = 0; $i < $searched_count; $i++)
 			{
 				$table_file = sprintf('%s%s/%s/schemas/%s.xml', _XE_PATH_, 'modules', $searched_list[$i], $table_name);
-				if(file_exists($table_file))
+				if (file_exists($table_file))
 				{
 					break;
 				}
 			}
 		}
 
-		if(file_exists($table_file))
+		if (file_exists($table_file))
 		{
 			$table_xml = FileHandler::readFile($table_file);
 			$xml_parser = new XmlParser();
 			$table_obj = $xml_parser->parse($table_xml);
-			if($table_obj->table)
+			if ($table_obj->table)
 			{
-				if(isset($table_obj->table->column) && !is_array($table_obj->table->column))
+				if (isset($table_obj->table->column) && !is_array($table_obj->table->column))
 				{
 					$table_obj->table->column = array($table_obj->table->column);
 				}
 
-				foreach($table_obj->table->column as $k => $v)
+				foreach ($table_obj->table->column as $k => $v)
 				{
 					$column_type[$v->attrs->name] = $v->attrs->type;
 				}

Braces +1 added lines, -2 removed lines

@@ -59,8 +59,7 @@
 			$target = 'modules';
 			$module = $id_args[0];
 			$id = $id_args[1];
-		}
-		else if(count($id_args) == 3)
+		} else if(count($id_args) == 3)
 		{
 			$target = $id_args[0];
 			$targetList = array('modules' => 1, 'addons' => 1, 'widgets' => 1);