Project

General

Profile

« Previous | Next » 

Revision f56a60e7

Added by Jim Pingle about 13 years ago

Fix input validation and import test.

View differences:

etc/inc/system.inc
1121 1121
	$ntpcfg .= "driftfile {$driftfile}\n";
1122 1122

  
1123 1123
	if (empty($config['ntpd']['interface']))
1124
		if (empty($config['openntpd']['config']['interface']))
1124
		if (!empty($config['installedpackages']['openntpd']['config'][0]['interface']))
1125 1125
			$interfaces = explode(",", $config['installedpackages']['openntpd']['config'][0]['interface']);
1126 1126
		else
1127 1127
			$interfaces = array();
usr/local/www/services_ntpd.php
40 40
require("guiconfig.inc");
41 41

  
42 42
if (empty($config['ntpd']['interface']))
43
	if (empty($config['openntpd']['config']['interface'])) {
44
		$pconfig['interface'] = explode(",", $config['installedpackages']['openntpd']['config'][0]['interface']);
43
		if (!empty($config['installedpackages']['openntpd']['config'][0]['interface']))
44
			$interfaces = explode(",", $config['installedpackages']['openntpd']['config'][0]['interface']);
45 45
		unset($config['installedpackages']['openntpd']);
46 46
	} else
47 47
		$pconfig['interface'] = array();
......
53 53
	unset($input_errors);
54 54
	$pconfig = $_POST;
55 55

  
56
	/* input validation */
57
	$reqdfields = explode(" ", "interface");
58
	$reqdfieldsn = array(gettext("Interface"));
59

  
60
	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
61

  
62 56
	if (!$input_errors) {
63
		$config['ntpd']['interface'] = implode(",", $_POST['interface']);
57
		if (is_array($_POST['interface']))
58
			$config['ntpd']['interface'] = implode(",", $_POST['interface']);
59
		elseif (isset($config['ntpd']['interface']))
60
			unset($config['ntpd']['interface']);
64 61

  
65 62
		write_config("Updated NTP Server Settings");
66 63

  

Also available in: Unified diff