diff --git a/application/utils.inc.php b/application/utils.inc.php index 7a73b44f4..c9c2e5a7b 100644 --- a/application/utils.inc.php +++ b/application/utils.inc.php @@ -196,7 +196,7 @@ class utils } else { - $retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options"=>array("regexp"=>'/^[A-Za-z0-9_=-]*$/'))); // the '=' equal character is used in serialized filters + $retValue = filter_var($value, FILTER_VALIDATE_REGEXP, array("options"=>array("regexp"=>'/^[ A-Za-z0-9_=-]*$/'))); // the '=' equal character is used in serialized filters } break; diff --git a/setup/ajax.dataloader.php b/setup/ajax.dataloader.php index 8d0c72e88..f8168f08c 100644 --- a/setup/ajax.dataloader.php +++ b/setup/ajax.dataloader.php @@ -141,7 +141,7 @@ try SetupWebPage::log_info("Update Database Schema."); InitDataModel(TMP_CONFIG_FILE, true); // load data model and connect to the database $sMode = Utils::ReadParam('mode', 'install'); - $sSelectedModules = Utils::ReadParam('selected_modules', ''); + $sSelectedModules = Utils::ReadParam('selected_modules', '', false, 'raw_data'); $aSelectedModules = explode(',', $sSelectedModules); if(!CreateDatabaseStructure(MetaModel::GetConfig(), $aSelectedModules, $sMode)) { @@ -153,7 +153,7 @@ try case 'after_db_create': SetupWebPage::log_info('After Database Creation'); $sMode = Utils::ReadParam('mode', 'install'); - $sSelectedModules = Utils::ReadParam('selected_modules', ''); + $sSelectedModules = Utils::ReadParam('selected_modules', '', false, 'raw_data'); $aSelectedModules = explode(',', $sSelectedModules); InitDataModel(TMP_CONFIG_FILE, true); // load data model and connect to the database @@ -186,8 +186,8 @@ try if($sMode == 'install') { // Create the admin user only in case of installation - $sAdminUser = Utils::ReadParam('auth_user', ''); - $sAdminPwd = Utils::ReadParam('auth_pwd', ''); + $sAdminUser = Utils::ReadParam('auth_user', '', false, 'raw_data'); + $sAdminPwd = Utils::ReadParam('auth_pwd', '', false, 'raw_data'); $sLanguage = Utils::ReadParam('language', ''); if (!CreateAdminAccount(MetaModel::GetConfig(), $sAdminUser, $sAdminPwd, $sLanguage)) { @@ -201,7 +201,7 @@ try break; case 'load_data': // Load data files - $sFileName = Utils::ReadParam('file', ''); + $sFileName = Utils::ReadParam('file', '', false, 'raw_data'); $sSessionStatus = Utils::ReadParam('session_status', ''); $iPercent = (integer)Utils::ReadParam('percent', 0); SetupWebPage::log_info("Loading file: $sFileName");