/ - Diff - pfSense - pfSense bugtracker

« Previous | Next »

Revision 5c87b716

Added by Stephen Beaver about 9 years ago

ID 5c87b716f3dec6b93eef72ee7ebb57c304518e87
Parent 40f00b73
Child 106d4586

Merge pull request #2808 from NOYB/Firewall_/_Aliases_-_Remove_Personalizations

(cherry picked from commit e8ea99014a38450ae28d58a6daf0cc60a33ff1e0)

+    }
     if (is_subsystem_dirty('aliases')) {
     	print_apply_box(gettext("The alias list has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect."));
     	print_apply_box(gettext("The alias list has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect."));
+    }
     display_top_tabs($tab_array);
-...
     	<div class="infoblock">
     		<?php print_info_box(gettext('Aliases act as placeholders for real hosts, networks or ports. They can be used to minimize the number ' .
     			'of changes that have to be made if a host, network or port changes. <br />' .
     			'You can enter the name of an alias instead of the host, network or port where indicated. The alias will be resolved according to the list above.' . '<br />' .
     			'If an alias cannot be resolved (e.g. because you deleted it), the corresponding element (e.g. filter/NAT/shaper rule) will be considered invalid and skipped.'), 'info', false); ?>
     			'The name of an alias can be entered instead of the host, network or port where indicated. The alias will be resolved according to the list above.' . '<br />' .
     			'If an alias cannot be resolved (e.g. because it was deleted), the corresponding element (e.g. filter/NAT/shaper rule) will be considered invalid and skipped.'), 'info', false); ?>
     	</div>
     </div>

     			$alias['url'] = $_POST['address0'];
     			$alias['updatefreq'] = $_POST['address_subnet0'] ? $_POST['address_subnet0'] : 7;
     			if (!is_URL($alias['url']) || empty($alias['url'])) {
     				$input_errors[] = gettext("You must provide a valid URL.");
     				$input_errors[] = gettext("A valid URL must be provided.");
     			} elseif (!process_alias_urltable($alias['name'], $alias['url'], 0, true, true)) {
     				$input_errors[] = gettext("Unable to fetch usable data from URL") . " " . htmlspecialchars($alias['url']);
+    			}
-...
     					$address = parse_aliases_file("{$temp_filename}/aliases", $_POST['type'], 5000);
     					if ($address == null) {
     						/* nothing was found */
     						$input_errors[] = sprintf(gettext("You must provide a valid URL. Could not fetch usable data from '%s'."), $_POST['address' . $x]);
     						$input_errors[] = sprintf(gettext("A valid URL must be provided. Could not fetch usable data from '%s'."), $_POST['address' . $x]);
+    					}
     					mwexec("/bin/rm -rf " . escapeshellarg($temp_filename));
     				} else {
-...
     $special_cidr_usage_text = gettext("The value after the \"/\" is the update frequency in days.");
     $help = array(
     	'network' => gettext("Networks are specified in CIDR format. Select the CIDR mask that pertains to each entry. /32 specifies a single IPv4 host, /128 specifies a single IPv6 host, /24 specifies 255.255.255.0, /64 specifies a normal IPv6 network, etc. Hostnames (FQDNs) may also be specified, using a /32 mask for IPv4 or /128 for IPv6. You may also enter an IP range such as 192.168.1.1-192.168.1.254 and a list of CIDR networks will be derived to fill the range."),
     	'host' => gettext("Enter as many hosts as you would like. Hosts must be specified by their IP address or fully qualified domain name (FQDN). FQDN hostnames are periodically re-resolved and updated. If multiple IPs are returned by a DNS query, all are used. You may also enter an IP range such as 192.168.1.1-192.168.1.10 or a small subnet such as 192.168.1.16/28 and a list of individual IP addresses will be generated."),
     	'port' => gettext("Enter as many ports as you wish. Port ranges can be expressed by separating with a colon."),
     	'url' => gettext("Enter as many URLs as you wish. After saving we will download the URL and import the items into the alias. Use only with small sets of IP addresses (less than 3000)."),
     	'url_ports' => gettext("Enter as many URLs as you wish. After saving we will download the URL and import the items into the alias. Use only with small sets of Ports (less than 3000)."),
     	'urltable' => gettext("Enter a single URL containing a large number of IPs and/or Subnets. After saving we will download the URL and create a table file containing these addresses. This will work with large numbers of addresses (30,000+) or small numbers.") .
     	'network' => gettext("Networks are specified in CIDR format. Select the CIDR mask that pertains to each entry. /32 specifies a single IPv4 host, /128 specifies a single IPv6 host, /24 specifies 255.255.255.0, /64 specifies a normal IPv6 network, etc. Hostnames (FQDNs) may also be specified, using a /32 mask for IPv4 or /128 for IPv6. An IP range such as 192.168.1.1-192.168.1.254 may also be entered and a list of CIDR networks will be derived to fill the range."),
     	'host' => gettext("Enter as many hosts as desired. Hosts must be specified by their IP address or fully qualified domain name (FQDN). FQDN hostnames are periodically re-resolved and updated. If multiple IPs are returned by a DNS query, all are used. An IP range such as 192.168.1.1-192.168.1.10 or a small subnet such as 192.168.1.16/28 may also be entered and a list of individual IP addresses will be generated."),
     	'port' => gettext("Enter as many ports as desired. Port ranges can be expressed by separating with a colon."),
     	'url' => gettext("Enter as many URLs as desired. After saving, the URLs will be downloaded and the items imported into the alias. Use only with small sets of IP addresses (less than 3000)."),
     	'url_ports' => gettext("Enter as many URLs as desired. After saving, the URLs will be downloaded and the items imported into the alias. Use only with small sets of Ports (less than 3000)."),
     	'urltable' => gettext("Enter a single URL containing a large number of IPs and/or Subnets. After saving, the URLs will be downloaded and a table file containing these addresses will be created. This will work with large numbers of addresses (30,000+) or small numbers.") .
     		"<br /><b>" . $special_cidr_usage_text . "</b>",
     	'urltable_ports' => gettext("Enter a single URL containing a list of Port numbers and/or Port ranges. After saving we will download the URL.") .
     	'urltable_ports' => gettext("Enter a single URL containing a list of Port numbers and/or Port ranges. After saving, the URL will be downloaded.") .
     		"<br /><b>" . $special_cidr_usage_text . "</b>",
     );
-...
     	'Description',
     	'text',
     	$pconfig['descr']
     ))->setHelp('You may enter a description here for your reference (not parsed).');
     ))->setHelp('A description may be entered here for administrative reference (not parsed).');
     $section->addInput(new Form_Select(
     	'type',

     	'Description',
     	'text',
     	$_POST['descr']
     ))->setHelp('You may enter a description here for your reference (not '.
     	'parsed).');
     ))->setHelp('A description may be entered here for administrative reference (not parsed).');
     $section->addInput(new Form_Textarea(
     	'aliasimport',

Also available in: Unified diff

Project

General

Profile

pfSense

Revision 5c87b716

Added by Stephen Beaver about 9 years ago