From 665958c2b9997923b67d1e39b984130cd8c6ade9 Mon Sep 17 00:00:00 2001 From: skodak Date: Mon, 20 Nov 2006 13:34:06 +0000 Subject: [PATCH] PARAM_PATH can be used only for relative paths, there is no parameter type for absolute paths that would be compatible with win32 - use PARAM_RAW for now, add file_exists validation later MDL-7617 --- admin/settings/security.php | 4 ++-- admin/settings/server.php | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/admin/settings/security.php b/admin/settings/security.php index ac17493f22..3d0d25044f 100644 --- a/admin/settings/security.php +++ b/admin/settings/security.php @@ -90,8 +90,8 @@ $ADMIN->add('security', $temp); // "antivirus" settingpage $temp = new admin_settingpage('antivirus', get_string('antivirus', 'admin')); $temp->add(new admin_setting_configcheckbox('runclamonupload', get_string('runclamavonupload', 'admin'), get_string('configrunclamavonupload', 'admin'), 0)); -$temp->add(new admin_setting_configtext('pathtoclam', get_string('pathtoclam', 'admin'), get_string('configpathtoclam', 'admin'), '', PARAM_PATH)); -$temp->add(new admin_setting_configtext('quarantinedir', get_string('quarantinedir', 'admin'), get_string('configquarantinedir', 'admin'), '', PARAM_PATH)); +$temp->add(new admin_setting_configtext('pathtoclam', get_string('pathtoclam', 'admin'), get_string('configpathtoclam', 'admin'), '', PARAM_RAW)); // TODO: add path validation +$temp->add(new admin_setting_configtext('quarantinedir', get_string('quarantinedir', 'admin'), get_string('configquarantinedir', 'admin'), '', PARAM_RAW)); // TODO: add path validation $temp->add(new admin_setting_configselect('clamfailureonupload', get_string('clamfailureonupload', 'admin'), get_string('configclamfailureonupload', 'admin'), 'donothing', array('donothing' => get_string('configclamdonothing', 'admin'), 'actlikevirus' => get_string('configclamactlikevirus', 'admin')))); $ADMIN->add('security', $temp); diff --git a/admin/settings/server.php b/admin/settings/server.php index dab850f24a..e32b4b8d4d 100644 --- a/admin/settings/server.php +++ b/admin/settings/server.php @@ -7,10 +7,10 @@ $temp = new admin_settingpage('systempaths', get_string('systempaths','admin')); $temp->add(new admin_setting_configselect('gdversion', get_string('gdversion','admin'), get_string('configgdversion', 'admin'), check_gd_version(), array('0' => get_string('gdnot'), '1' => get_string('gd1'), '2' => get_string('gd2')))); -$temp->add(new admin_setting_configtext('zip', get_string('pathtozip','admin'), get_string('configzip', 'admin'), '', PARAM_PATH)); -$temp->add(new admin_setting_configtext('unzip', get_string('pathtounzip','admin'), get_string('configunzip', 'admin'), '', PARAM_PATH)); -$temp->add(new admin_setting_configtext('pathtodu', get_string('pathtodu', 'admin'), get_string('configpathtodu', 'admin'), '', PARAM_PATH)); -$temp->add(new admin_setting_configtext('aspellpath', get_string('aspellpath', 'admin'), get_string('edhelpaspellpath'), '', PARAM_PATH)); +$temp->add(new admin_setting_configtext('zip', get_string('pathtozip','admin'), get_string('configzip', 'admin'), '', PARAM_RAW)); // TODO: add path validation +$temp->add(new admin_setting_configtext('unzip', get_string('pathtounzip','admin'), get_string('configunzip', 'admin'), '', PARAM_RAW)); // TODO: add path validation +$temp->add(new admin_setting_configtext('pathtodu', get_string('pathtodu', 'admin'), get_string('configpathtodu', 'admin'), '', PARAM_RAW)); // TODO: add path validation +$temp->add(new admin_setting_configtext('aspellpath', get_string('aspellpath', 'admin'), get_string('edhelpaspellpath'), '', PARAM_RAW)); // TODO: add path validation $ADMIN->add('server', $temp, 0); -- 2.39.5