* Move indvidual xml subnet items to its own widget

* Move indvidual xml time zones items to its own widget

2 files changed, 45 insertions, 1900 deletions

diff --git a/usr/local/www/wizard.php b/usr/local/www/wizard.php
index 2700c90..4371eb4 100755
--- a/usr/local/www/wizard.php
+++ b/usr/local/www/wizard.php
@@ -50,7 +50,7 @@ if($xml == "") {
 	print_info_box_np("ERROR:  Could not open " . $xml . ".");
 	die;
 } else {
-	if (file_exists("{$g['www_path']}/wizards/{$xml}")) 
+	if (file_exists("{$g['www_path']}/wizards/{$xml}"))
 		$pkg = parse_xml_config_pkg("{$g['www_path']}/wizards/" . $xml, "pfsensewizard");
 	else {
 		print_info_box_np("ERROR:  Could not open " . $xml . ".");
@@ -62,6 +62,10 @@ $title          = $pkg['step'][$stepid]['title'];
 $description    = $pkg['step'][$stepid]['description'];
 $totalsteps     = $pkg['totalsteps'];
 
+exec('/usr/bin/tar -tzf /usr/share/zoneinfo.tgz', $timezonelist);
+$timezonelist = array_filter($timezonelist, 'is_timezone');
+sort($timezonelist);
+
 if($pkg['step'][$stepid]['stepsubmitbeforesave']) {
 		eval($pkg['step'][$stepid]['stepsubmitbeforesave']);
 }
@@ -252,6 +256,39 @@ function FieldValidate(userinput, regexp, message)
 		    } else if ($field['type'] == "listtopic") {
 			echo "<td>&nbsp;</td><tr>";
 			echo "<tr><td colspan=\"2\" class=\"listtopic\">" . $field['name'] . "<br></td>\n";
+		    } else if ($field['type'] == "subnet_select") {
+			if(!$field['dontdisplayname']) {
+				echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
+				echo fixup_string($field['name']);
+				echo ":</td>";
+			}
+			if(!$field['dontcombinecells'])
+				echo "<td class=\"vtable\">";
+			echo "<select name='{$name}'>\n";
+			for($x=1; $x<33; $x++) {
+				$CHECKED = "";
+				if($value == $x) $CHECKED = " SELECTED";
+				if($x <> 31)
+					echo "<option value='{$x}' {$CHECKED}>{$x}</option>\n";
+			}
+			echo "</select>\n";
+		    } else if ($field['type'] == "timezone_select") {
+			if(!$field['dontdisplayname']) {
+				echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
+				echo fixup_string($field['name']);
+				echo ":</td>";
+			}
+			if(!$field['dontcombinecells'])
+				echo "<td class=\"vtable\">";
+			echo "<select name='{$name}'>\n";
+			foreach ($timezonelist as $tz) {
+				$SELECTED = "";
+				if ($value == $tz) $SELECTED = " SELECTED";
+				echo "<option value='" . htmlspecialchars($tz) . "' {$SELECTED}>";
+				echo htmlspecialchars($tz);
+				echo "</option>\n";
+			}
+			echo "</select>\n";
 		    } else if ($field['type'] == "checkbox") {
 			if(!$field['dontdisplayname']) {
 				echo "<td width=\"22%\" align=\"right\" class=\"vncellreq\">\n";
@@ -376,5 +413,8 @@ function fixup_string($string) {
 	return $newstring;
 }
 
-?>
+function is_timezone($elt) {
+	return !preg_match("/\/$/", $elt);
+}
 
+?>
\ No newline at end of file
diff --git a/usr/local/www/wizards/setup_wizard.xml b/usr/local/www/wizards/setup_wizard.xml
index ae214e6..625f335 100644
--- a/usr/local/www/wizards/setup_wizard.xml
+++ b/usr/local/www/wizards/setup_wizard.xml
@@ -71,1650 +71,8 @@
 		</field>
 		<field>
 			<name>Timezone</name>
-			<type>select</type>
+			<type>timezone_select</type>
 			<bindstofield>system->timezone</bindstofield>
-			<options>
-				<option>
-						<name>Africa/Abidjan</name>
-						<value>Africa/Abidjan</value>
-				</option>
-				<option>
-						<name>Africa/Accra</name>
-						<value>Africa/Accra</value>
-				</option>
-				<option>
-						<name>Africa/Addis_Ababa</name>
-						<value>Africa/Addis_Ababa</value>
-				</option>
-				<option>
-						<name>Africa/Algiers</name>
-						<value>Africa/Algiers</value>
-				</option>
-				<option>
-						<name>Africa/Asmera</name>
-						<value>Africa/Asmera</value>
-				</option>
-				<option>
-						<name>Africa/Bamako</name>
-						<value>Africa/Bamako</value>
-				</option>
-				<option>
-						<name>Africa/Bangui</name>
-						<value>Africa/Bangui</value>
-				</option>
-				<option>
-						<name>Africa/Banjul</name>
-						<value>Africa/Banjul</value>
-				</option>
-				<option>
-						<name>Africa/Bissau</name>
-						<value>Africa/Bissau</value>
-				</option>
-				<option>
-						<name>Africa/Blantyre</name>
-						<value>Africa/Blantyre</value>
-				</option>
-				<option>
-						<name>Africa/Brazzaville</name>
-						<value>Africa/Brazzaville</value>
-				</option>
-				<option>
-						<name>Africa/Bujumbura</name>
-						<value>Africa/Bujumbura</value>
-				</option>
-				<option>
-						<name>Africa/Cairo</name>
-						<value>Africa/Cairo</value>
-				</option>
-				<option>
-						<name>Africa/Casablanca</name>
-						<value>Africa/Casablanca</value>
-				</option>
-				<option>
-						<name>Africa/Ceuta</name>
-						<value>Africa/Ceuta</value>
-				</option>
-				<option>
-						<name>Africa/Conakry</name>
-						<value>Africa/Conakry</value>
-				</option>
-				<option>
-						<name>Africa/Dakar</name>
-						<value>Africa/Dakar</value>
-				</option>
-				<option>
-						<name>Africa/Dar_es_Salaam</name>
-						<value>Africa/Dar_es_Salaam</value>
-				</option>
-				<option>
-						<name>Africa/Djibouti</name>
-						<value>Africa/Djibouti</value>
-				</option>
-				<option>
-						<name>Africa/Douala</name>
-						<value>Africa/Douala</value>
-				</option>
-				<option>
-						<name>Africa/El_Aaiun</name>
-						<value>Africa/El_Aaiun</value>
-				</option>
-				<option>
-						<name>Africa/Freetown</name>
-						<value>Africa/Freetown</value>
-				</option>
-				<option>
-						<name>Africa/Gaborone</name>
-						<value>Africa/Gaborone</value>
-				</option>
-				<option>
-						<name>Africa/Harare</name>
-						<value>Africa/Harare</value>
-				</option>
-				<option>
-						<name>Africa/Johannesburg</name>
-						<value>Africa/Johannesburg</value>
-				</option>
-				<option>
-						<name>Africa/Kampala</name>
-						<value>Africa/Kampala</value>
-				</option>
-				<option>
-						<name>Africa/Khartoum</name>
-						<value>Africa/Khartoum</value>
-				</option>
-				<option>
-						<name>Africa/Kigali</name>
-						<value>Africa/Kigali</value>
-				</option>
-				<option>
-						<name>Africa/Kinshasa</name>
-						<value>Africa/Kinshasa</value>
-				</option>
-				<option>
-						<name>Africa/Lagos</name>
-						<value>Africa/Lagos</value>
-				</option>
-				<option>
-						<name>Africa/Libreville</name>
-						<value>Africa/Libreville</value>
-				</option>
-				<option>
-						<name>Africa/Lome</name>
-						<value>Africa/Lome</value>
-				</option>
-				<option>
-						<name>Africa/Luanda</name>
-						<value>Africa/Luanda</value>
-				</option>
-				<option>
-						<name>Africa/Lubumbashi</name>
-						<value>Africa/Lubumbashi</value>
-				</option>
-				<option>
-						<name>Africa/Lusaka</name>
-						<value>Africa/Lusaka</value>
-				</option>
-				<option>
-						<name>Africa/Malabo</name>
-						<value>Africa/Malabo</value>
-				</option>
-				<option>
-						<name>Africa/Maputo</name>
-						<value>Africa/Maputo</value>
-				</option>
-				<option>
-						<name>Africa/Maseru</name>
-						<value>Africa/Maseru</value>
-				</option>
-				<option>
-						<name>Africa/Mbabane</name>
-						<value>Africa/Mbabane</value>
-				</option>
-				<option>
-						<name>Africa/Mogadishu</name>
-						<value>Africa/Mogadishu</value>
-				</option>
-				<option>
-						<name>Africa/Monrovia</name>
-						<value>Africa/Monrovia</value>
-				</option>
-				<option>
-						<name>Africa/Nairobi</name>
-						<value>Africa/Nairobi</value>
-				</option>
-				<option>
-						<name>Africa/Ndjamena</name>
-						<value>Africa/Ndjamena</value>
-				</option>
-				<option>
-						<name>Africa/Niamey</name>
-						<value>Africa/Niamey</value>
-				</option>
-				<option>
-						<name>Africa/Nouakchott</name>
-						<value>Africa/Nouakchott</value>
-				</option>
-				<option>
-						<name>Africa/Ouagadougou</name>
-						<value>Africa/Ouagadougou</value>
-				</option>
-				<option>
-						<name>Africa/Porto-Novo</name>
-						<value>Africa/Porto-Novo</value>
-				</option>
-				<option>
-						<name>Africa/Sao_Tome</name>
-						<value>Africa/Sao_Tome</value>
-				</option>
-				<option>
-						<name>Africa/Timbuktu</name>
-						<value>Africa/Timbuktu</value>
-				</option>
-				<option>
-						<name>Africa/Tripoli</name>
-						<value>Africa/Tripoli</value>
-				</option>
-				<option>
-						<name>Africa/Tunis</name>
-						<value>Africa/Tunis</value>
-				</option>
-				<option>
-						<name>Africa/Windhoek</name>
-						<value>Africa/Windhoek</value>
-				</option>
-				<option>
-						<name>America/Adak</name>
-						<value>America/Adak</value>
-				</option>
-				<option>
-						<name>America/Anchorage</name>
-						<value>America/Anchorage</value>
-				</option>
-				<option>
-						<name>America/Anguilla</name>
-						<value>America/Anguilla</value>
-				</option>
-				<option>
-						<name>America/Antigua</name>
-						<value>America/Antigua</value>
-				</option>
-				<option>
-						<name>America/Araguaina</name>
-						<value>America/Araguaina</value>
-				</option>
-				<option>
-						<name>America/Aruba</name>
-						<value>America/Aruba</value>
-				</option>
-				<option>
-						<name>America/Asuncion</name>
-						<value>America/Asuncion</value>
-				</option>
-				<option>
-						<name>America/Barbados</name>
-						<value>America/Barbados</value>
-				</option>
-				<option>
-						<name>America/Belem</name>
-						<value>America/Belem</value>
-				</option>
-				<option>
-						<name>America/Belize</name>
-						<value>America/Belize</value>
-				</option>
-				<option>
-						<name>America/Boa_Vista</name>
-						<value>America/Boa_Vista</value>
-				</option>
-				<option>
-						<name>America/Bogota</name>
-						<value>America/Bogota</value>
-				</option>
-				<option>
-						<name>America/Boise</name>
-						<value>America/Boise</value>
-				</option>
-				<option>
-						<name>America/Buenos_Aires</name>
-						<value>America/Buenos_Aires</value>
-				</option>
-				<option>
-						<name>America/Cambridge_Bay</name>
-						<value>America/Cambridge_Bay</value>
-				</option>
-				<option>
-						<name>America/Cancun</name>
-						<value>America/Cancun</value>
-				</option>
-				<option>
-						<name>America/Caracas</name>
-						<value>America/Caracas</value>
-				</option>
-				<option>
-						<name>America/Catamarca</name>
-						<value>America/Catamarca</value>
-				</option>
-				<option>
-						<name>America/Cayenne</name>
-						<value>America/Cayenne</value>
-				</option>
-				<option>
-						<name>America/Cayman</name>
-						<value>America/Cayman</value>
-				</option>
-				<option>
-						<name>America/Chicago</name>
-						<value>America/Chicago</value>
-				</option>
-				<option>
-						<name>America/Chihuahua</name>
-						<value>America/Chihuahua</value>
-				</option>
-				<option>
-						<name>America/Cordoba</name>
-						<value>America/Cordoba</value>
-				</option>
-				<option>
-						<name>America/Costa_Rica</name>
-						<value>America/Costa_Rica</value>
-				</option>
-				<option>
-						<name>America/Cuiaba</name>
-						<value>America/Cuiaba</value>
-				</option>
-				<option>
-						<name>America/Curacao</name>
-						<value>America/Curacao</value>
-				</option>
-				<option>
-						<name>America/Danmarkshavn</name>
-						<value>America/Danmarkshavn</value>
-				</option>
-				<option>
-						<name>America/Dawson</name>
-						<value>America/Dawson</value>
-				</option>
-				<option>
-						<name>America/Dawson_Creek</name>
-						<value>America/Dawson_Creek</value>
-				</option>
-				<option>
-						<name>America/Denver</name>
-						<value>America/Denver</value>
-				</option>
-				<option>
-						<name>America/Detroit</name>
-						<value>America/Detroit</value>
-				</option>
-				<option>
-						<name>America/Dominica</name>
-						<value>America/Dominica</value>
-				</option>
-				<option>
-						<name>America/Edmonton</name>
-						<value>America/Edmonton</value>
-				</option>
-				<option>
-						<name>America/Eirunepe</name>
-						<value>America/Eirunepe</value>
-				</option>
-				<option>
-						<name>America/El_Salvador</name>
-						<value>America/El_Salvador</value>
-				</option>
-				<option>
-						<name>America/Fortaleza</name>
-						<value>America/Fortaleza</value>
-				</option>
-				<option>
-						<name>America/Glace_Bay</name>
-						<value>America/Glace_Bay</value>
-				</option>
-				<option>
-						<name>America/Godthab</name>
-						<value>America/Godthab</value>
-				</option>
-				<option>
-						<name>America/Goose_Bay</name>
-						<value>America/Goose_Bay</value>
-				</option>
-				<option>
-						<name>America/Grand_Turk</name>
-						<value>America/Grand_Turk</value>
-				</option>
-				<option>
-						<name>America/Grenada</name>
-						<value>America/Grenada</value>
-				</option>
-				<option>
-						<name>America/Guadeloupe</name>
-						<value>America/Guadeloupe</value>
-				</option>
-				<option>
-						<name>America/Guatemala</name>
-						<value>America/Guatemala</value>
-				</option>
-				<option>
-						<name>America/Guayaquil</name>
-						<value>America/Guayaquil</value>
-				</option>
-				<option>
-						<name>America/Guyana</name>
-						<value>America/Guyana</value>
-				</option>
-				<option>
-						<name>America/Halifax</name>
-						<value>America/Halifax</value>
-				</option>
-				<option>
-						<name>America/Havana</name>
-						<value>America/Havana</value>
-				</option>
-				<option>
-						<name>America/Hermosillo</name>
-						<value>America/Hermosillo</value>
-				</option>
-				<option>
-						<name>America/Indiana/Indianapolis</name>
-						<value>America/Indiana/Indianapolis</value>
-				</option>
-				<option>
-						<name>America/Indiana/Knox</name>
-						<value>America/Indiana/Knox</value>
-				</option>
-				<option>
-						<name>America/Indiana/Marengo</name>
-						<value>America/Indiana/Marengo</value>
-				</option>
-				<option>
-						<name>America/Indiana/Vevay</name>
-						<value>America/Indiana/Vevay</value>
-				</option>
-				<option>
-						<name>America/Indianapolis</name>
-						<value>America/Indianapolis</value>
-				</option>
-				<option>
-						<name>America/Inuvik</name>
-						<value>America/Inuvik</value>
-				</option>
-				<option>
-						<name>America/Iqaluit</name>
-						<value>America/Iqaluit</value>
-				</option>
-				<option>
-						<name>America/Jamaica</name>
-						<value>America/Jamaica</value>
-				</option>
-				<option>
-						<name>America/Jujuy</name>
-						<value>America/Jujuy</value>
-				</option>
-				<option>
-						<name>America/Juneau</name>
-						<value>America/Juneau</value>
-				</option>
-				<option>
-						<name>America/Kentucky/Louisville</name>
-						<value>America/Kentucky/Louisville</value>
-				</option>
-				<option>
-						<name>America/Kentucky/Monticello</name>
-						<value>America/Kentucky/Monticello</value>
-				</option>
-				<option>
-						<name>America/La_Paz</name>
-						<value>America/La_Paz</value>
-				</option>
-				<option>
-						<name>America/Lima</name>
-						<value>America/Lima</value>
-				</option>
-				<option>
-						<name>America/Los_Angeles</name>
-						<value>America/Los_Angeles</value>
-				</option>
-				<option>
-						<name>America/Louisville</name>
-						<value>America/Louisville</value>
-				</option>
-				<option>
-						<name>America/Maceio</name>
-						<value>America/Maceio</value>
-				</option>
-				<option>
-						<name>America/Managua</name>
-						<value>America/Managua</value>
-				</option>
-				<option>
-						<name>America/Manaus</name>
-						<value>America/Manaus</value>
-				</option>
-				<option>
-						<name>America/Martinique</name>
-						<value>America/Martinique</value>
-				</option>
-				<option>
-						<name>America/Mazatlan</name>
-						<value>America/Mazatlan</value>
-				</option>
-				<option>
-						<name>America/Mendoza</name>
-						<value>America/Mendoza</value>
-				</option>
-				<option>
-						<name>America/Menominee</name>
-						<value>America/Menominee</value>
-				</option>
-				<option>
-						<name>America/Merida</name>
-						<value>America/Merida</value>
-				</option>
-				<option>
-						<name>America/Mexico_City</name>
-						<value>America/Mexico_City</value>
-				</option>
-				<option>
-						<name>America/Miquelon</name>
-						<value>America/Miquelon</value>
-				</option>
-				<option>
-						<name>America/Monterrey</name>
-						<value>America/Monterrey</value>
-				</option>
-				<option>
-						<name>America/Montevideo</name>
-						<value>America/Montevideo</value>
-				</option>
-				<option>
-						<name>America/Montreal</name>
-						<value>America/Montreal</value>
-				</option>
-				<option>
-						<name>America/Montserrat</name>
-						<value>America/Montserrat</value>
-				</option>
-				<option>
-						<name>America/Nassau</name>
-						<value>America/Nassau</value>
-				</option>
-				<option>
-						<name>America/New_York</name>
-						<value>America/New_York</value>
-				</option>
-				<option>
-						<name>America/Nipigon</name>
-						<value>America/Nipigon</value>
-				</option>
-				<option>
-						<name>America/Nome</name>
-						<value>America/Nome</value>
-				</option>
-				<option>
-						<name>America/Noronha</name>
-						<value>America/Noronha</value>
-				</option>
-				<option>
-						<name>America/North_Dakota/Center</name>
-						<value>America/North_Dakota/Center</value>
-				</option>
-				<option>
-						<name>America/Panama</name>
-						<value>America/Panama</value>
-				</option>
-				<option>
-						<name>America/Pangnirtung</name>
-						<value>America/Pangnirtung</value>
-				</option>
-				<option>
-						<name>America/Paramaribo</name>
-						<value>America/Paramaribo</value>
-				</option>
-				<option>
-						<name>America/Phoenix</name>
-						<value>America/Phoenix</value>
-				</option>
-				<option>
-						<name>America/Port-au-Prince</name>
-						<value>America/Port-au-Prince</value>
-				</option>
-				<option>
-						<name>America/Port_of_Spain</name>
-						<value>America/Port_of_Spain</value>
-				</option>
-				<option>
-						<name>America/Porto_Velho</name>
-						<value>America/Porto_Velho</value>
-				</option>
-				<option>
-						<name>America/Puerto_Rico</name>
-						<value>America/Puerto_Rico</value>
-				</option>
-				<option>
-						<name>America/Rainy_River</name>
-						<value>America/Rainy_River</value>
-				</option>
-				<option>
-						<name>America/Rankin_Inlet</name>
-						<value>America/Rankin_Inlet</value>
-				</option>
-				<option>
-						<name>America/Recife</name>
-						<value>America/Recife</value>
-				</option>
-				<option>
-						<name>America/Regina</name>
-						<value>America/Regina</value>
-				</option>
-				<option>
-						<name>America/Rio_Branco</name>
-						<value>America/Rio_Branco</value>
-				</option>
-				<option>
-						<name>America/Santiago</name>
-						<value>America/Santiago</value>
-				</option>
-				<option>
-						<name>America/Santo_Domingo</name>
-						<value>America/Santo_Domingo</value>
-				</option>
-				<option>
-						<name>America/Sao_Paulo</name>
-						<value>America/Sao_Paulo</value>
-				</option>
-				<option>
-						<name>America/Scoresbysund</name>
-						<value>America/Scoresbysund</value>
-				</option>
-				<option>
-						<name>America/Shiprock</name>
-						<value>America/Shiprock</value>
-				</option>
-				<option>
-						<name>America/St_Johns</name>
-						<value>America/St_Johns</value>
-				</option>
-				<option>
-						<name>America/St_Kitts</name>
-						<value>America/St_Kitts</value>
-				</option>
-				<option>
-						<name>America/St_Lucia</name>
-						<value>America/St_Lucia</value>
-				</option>
-				<option>
-						<name>America/St_Thomas</name>
-						<value>America/St_Thomas</value>
-				</option>
-				<option>
-						<name>America/St_Vincent</name>
-						<value>America/St_Vincent</value>
-				</option>
-				<option>
-						<name>America/Swift_Current</name>
-						<value>America/Swift_Current</value>
-				</option>
-				<option>
-						<name>America/Tegucigalpa</name>
-						<value>America/Tegucigalpa</value>
-				</option>
-				<option>
-						<name>America/Thule</name>
-						<value>America/Thule</value>
-				</option>
-				<option>
-						<name>America/Thunder_Bay</name>
-						<value>America/Thunder_Bay</value>
-				</option>
-				<option>
-						<name>America/Tijuana</name>
-						<value>America/Tijuana</value>
-				</option>
-				<option>
-						<name>America/Tortola</name>
-						<value>America/Tortola</value>
-				</option>
-				<option>
-						<name>America/Vancouver</name>
-						<value>America/Vancouver</value>
-				</option>
-				<option>
-						<name>America/Whitehorse</name>
-						<value>America/Whitehorse</value>
-				</option>
-				<option>
-						<name>America/Winnipeg</name>
-						<value>America/Winnipeg</value>
-				</option>
-				<option>
-						<name>America/Yakutat</name>
-						<value>America/Yakutat</value>
-				</option>
-				<option>
-						<name>America/Yellowknife</name>
-						<value>America/Yellowknife</value>
-				</option>
-				<option>
-						<name>Antarctica/Casey</name>
-						<value>Antarctica/Casey</value>
-				</option>
-				<option>
-						<name>Antarctica/Davis</name>
-						<value>Antarctica/Davis</value>
-				</option>
-				<option>
-						<name>Antarctica/DumontDUrville</name>
-						<value>Antarctica/DumontDUrville</value>
-				</option>
-				<option>
-						<name>Antarctica/Mawson</name>
-						<value>Antarctica/Mawson</value>
-				</option>
-				<option>
-						<name>Antarctica/McMurdo</name>
-						<value>Antarctica/McMurdo</value>
-				</option>
-				<option>
-						<name>Antarctica/Palmer</name>
-						<value>Antarctica/Palmer</value>
-				</option>
-				<option>
-						<name>Antarctica/South_Pole</name>
-						<value>Antarctica/South_Pole</value>
-				</option>
-				<option>
-						<name>Antarctica/Syowa</name>
-						<value>Antarctica/Syowa</value>
-				</option>
-				<option>
-						<name>Antarctica/Vostok</name>
-						<value>Antarctica/Vostok</value>
-				</option>
-				<option>
-						<name>Arctic/Longyearbyen</name>
-						<value>Arctic/Longyearbyen</value>
-				</option>
-				<option>
-						<name>Asia/Aden</name>
-						<value>Asia/Aden</value>
-				</option>
-				<option>
-						<name>Asia/Almaty</name>
-						<value>Asia/Almaty</value>
-				</option>
-				<option>
-						<name>Asia/Amman</name>
-						<value>Asia/Amman</value>
-				</option>
-				<option>
-						<name>Asia/Anadyr</name>
-						<value>Asia/Anadyr</value>
-				</option>
-				<option>
-						<name>Asia/Aqtau</name>
-						<value>Asia/Aqtau</value>
-				</option>
-				<option>
-						<name>Asia/Aqtobe</name>
-						<value>Asia/Aqtobe</value>
-				</option>
-				<option>
-						<name>Asia/Ashgabat</name>
-						<value>Asia/Ashgabat</value>
-				</option>
-				<option>
-						<name>Asia/Baghdad</name>
-						<value>Asia/Baghdad</value>
-				</option>
-				<option>
-						<name>Asia/Bahrain</name>
-						<value>Asia/Bahrain</value>
-				</option>
-				<option>
-						<name>Asia/Baku</name>
-						<value>Asia/Baku</value>
-				</option>
-				<option>
-						<name>Asia/Bangkok</name>
-						<value>Asia/Bangkok</value>
-				</option>
-				<option>
-						<name>Asia/Beirut</name>
-						<value>Asia/Beirut</value>
-				</option>
-				<option>
-						<name>Asia/Bishkek</name>
-						<value>Asia/Bishkek</value>
-				</option>
-				<option>
-						<name>Asia/Brunei</name>
-						<value>Asia/Brunei</value>
-				</option>
-				<option>
-						<name>Asia/Calcutta</name>
-						<value>Asia/Calcutta</value>
-				</option>
-				<option>
-						<name>Asia/Choibalsan</name>
-						<value>Asia/Choibalsan</value>
-				</option>
-				<option>
-						<name>Asia/Chongqing</name>
-						<value>Asia/Chongqing</value>
-				</option>
-				<option>
-						<name>Asia/Colombo</name>
-						<value>Asia/Colombo</value>
-				</option>
-				<option>
-						<name>Asia/Damascus</name>
-						<value>Asia/Damascus</value>
-				</option>
-				<option>
-						<name>Asia/Dhaka</name>
-						<value>Asia/Dhaka</value>
-				</option>
-				<option>
-						<name>Asia/Dili</name>
-						<value>Asia/Dili</value>
-				</option>
-				<option>
-						<name>Asia/Dubai</name>
-						<value>Asia/Dubai</value>
-				</option>
-				<option>
-						<name>Asia/Dushanbe</name>
-						<value>Asia/Dushanbe</value>
-				</option>
-				<option>
-						<name>Asia/Gaza</name>
-						<value>Asia/Gaza</value>
-				</option>
-				<option>
-						<name>Asia/Harbin</name>
-						<value>Asia/Harbin</value>
-				</option>
-				<option>
-						<name>Asia/Hong_Kong</name>
-						<value>Asia/Hong_Kong</value>
-				</option>
-				<option>
-						<name>Asia/Hovd</name>
-						<value>Asia/Hovd</value>
-				</option>
-				<option>
-						<name>Asia/Irkutsk</name>
-						<value>Asia/Irkutsk</value>
-				</option>
-				<option>
-						<name>Asia/Istanbul</name>
-						<value>Asia/Istanbul</value>
-				</option>
-				<option>
-						<name>Asia/Jakarta</name>
-						<value>Asia/Jakarta</value>
-				</option>
-				<option>
-						<name>Asia/Jayapura</name>
-						<value>Asia/Jayapura</value>
-				</option>
-				<option>
-						<name>Asia/Jerusalem</name>
-						<value>Asia/Jerusalem</value>
-				</option>
-				<option>
-						<name>Asia/Kabul</name>
-						<value>Asia/Kabul</value>
-				</option>
-				<option>
-						<name>Asia/Kamchatka</name>
-						<value>Asia/Kamchatka</value>
-				</option>
-				<option>
-						<name>Asia/Karachi</name>
-						<value>Asia/Karachi</value>
-				</option>
-				<option>
-						<name>Asia/Kashgar</name>
-						<value>Asia/Kashgar</value>
-				</option>
-				<option>
-						<name>Asia/Katmandu</name>
-						<value>Asia/Katmandu</value>
-				</option>
-				<option>
-						<name>Asia/Krasnoyarsk</name>
-						<value>Asia/Krasnoyarsk</value>
-				</option>
-				<option>
-						<name>Asia/Kuala_Lumpur</name>
-						<value>Asia/Kuala_Lumpur</value>
-				</option>
-				<option>
-						<name>Asia/Kuching</name>
-						<value>Asia/Kuching</value>
-				</option>
-				<option>
-						<name>Asia/Kuwait</name>
-						<value>Asia/Kuwait</value>
-				</option>
-				<option>
-						<name>Asia/Macau</name>
-						<value>Asia/Macau</value>
-				</option>
-				<option>
-						<name>Asia/Magadan</name>
-						<value>Asia/Magadan</value>
-				</option>
-				<option>
-						<name>Asia/Makassar</name>
-						<value>Asia/Makassar</value>
-				</option>
-				<option>
-						<name>Asia/Manila</name>
-						<value>Asia/Manila</value>
-				</option>
-				<option>
-						<name>Asia/Muscat</name>
-						<value>Asia/Muscat</value>
-				</option>
-				<option>
-						<name>Asia/Nicosia</name>
-						<value>Asia/Nicosia</value>
-				</option>
-				<option>
-						<name>Asia/Novosibirsk</name>
-						<value>Asia/Novosibirsk</value>
-				</option>
-				<option>
-						<name>Asia/Omsk</name>
-						<value>Asia/Omsk</value>
-				</option>
-				<option>
-						<name>Asia/Oral</name>
-						<value>Asia/Oral</value>
-				</option>
-				<option>
-						<name>Asia/Phnom_Penh</name>
-						<value>Asia/Phnom_Penh</value>
-				</option>
-				<option>
-						<name>Asia/Pontianak</name>
-						<value>Asia/Pontianak</value>
-				</option>
-				<option>
-						<name>Asia/Pyongyang</name>
-						<value>Asia/Pyongyang</value>
-				</option>
-				<option>
-						<name>Asia/Qatar</name>
-						<value>Asia/Qatar</value>
-				</option>
-				<option>
-						<name>Asia/Qyzylorda</name>
-						<value>Asia/Qyzylorda</value>
-				</option>
-				<option>
-						<name>Asia/Rangoon</name>
-						<value>Asia/Rangoon</value>
-				</option>
-				<option>
-						<name>Asia/Riyadh</name>
-						<value>Asia/Riyadh</value>
-				</option>
-				<option>
-						<name>Asia/Saigon</name>
-						<value>Asia/Saigon</value>
-				</option>
-				<option>
-						<name>Asia/Sakhalin</name>
-						<value>Asia/Sakhalin</value>
-				</option>
-				<option>
-						<name>Asia/Samarkand</name>
-						<value>Asia/Samarkand</value>
-				</option>
-				<option>
-						<name>Asia/Seoul</name>
-						<value>Asia/Seoul</value>
-				</option>
-				<option>
-						<name>Asia/Shanghai</name>
-						<value>Asia/Shanghai</value>
-				</option>
-				<option>
-						<name>Asia/Singapore</name>
-						<value>Asia/Singapore</value>
-				</option>
-				<option>
-						<name>Asia/Taipei</name>
-						<value>Asia/Taipei</value>
-				</option>
-				<option>
-						<name>Asia/Tashkent</name>
-						<value>Asia/Tashkent</value>
-				</option>
-				<option>
-						<name>Asia/Tbilisi</name>
-						<value>Asia/Tbilisi</value>
-				</option>
-				<option>
-						<name>Asia/Tehran</name>
-						<value>Asia/Tehran</value>
-				</option>
-				<option>
-						<name>Asia/Thimphu</name>
-						<value>Asia/Thimphu</value>
-				</option>
-				<option>
-						<name>Asia/Tokyo</name>
-						<value>Asia/Tokyo</value>
-				</option>
-				<option>
-						<name>Asia/Ulaanbaatar</name>
-						<value>Asia/Ulaanbaatar</value>
-				</option>
-				<option>
-						<name>Asia/Urumqi</name>
-						<value>Asia/Urumqi</value>
-				</option>
-				<option>
-						<name>Asia/Vientiane</name>
-						<value>Asia/Vientiane</value>
-				</option>
-				<option>
-						<name>Asia/Vladivostok</name>
-						<value>Asia/Vladivostok</value>
-				</option>
-				<option>
-						<name>Asia/Yakutsk</name>
-						<value>Asia/Yakutsk</value>
-				</option>
-				<option>
-						<name>Asia/Yekaterinburg</name>
-						<value>Asia/Yekaterinburg</value>
-				</option>
-				<option>
-						<name>Asia/Yerevan</name>
-						<value>Asia/Yerevan</value>
-				</option>
-				<option>
-						<name>Atlantic/Azores</name>
-						<value>Atlantic/Azores</value>
-				</option>
-				<option>
-						<name>Atlantic/Bermuda</name>
-						<value>Atlantic/Bermuda</value>
-				</option>
-				<option>
-						<name>Atlantic/Canary</name>
-						<value>Atlantic/Canary</value>
-				</option>
-				<option>
-						<name>Atlantic/Cape_Verde</name>
-						<value>Atlantic/Cape_Verde</value>
-				</option>
-				<option>
-						<name>Atlantic/Faeroe</name>
-						<value>Atlantic/Faeroe</value>
-				</option>
-				<option>
-						<name>Atlantic/Jan_Mayen</name>
-						<value>Atlantic/Jan_Mayen</value>
-				</option>
-				<option>
-						<name>Atlantic/Madeira</name>
-						<value>Atlantic/Madeira</value>
-				</option>
-				<option>
-						<name>Atlantic/Reykjavik</name>
-						<value>Atlantic/Reykjavik</value>
-				</option>
-				<option>
-						<name>Atlantic/South_Georgia</name>
-						<value>Atlantic/South_Georgia</value>
-				</option>
-				<option>
-						<name>Atlantic/St_Helena</name>
-						<value>Atlantic/St_Helena</value>
-				</option>
-				<option>
-						<name>Atlantic/Stanley</name>
-						<value>Atlantic/Stanley</value>
-				</option>
-				<option>
-						<name>Australia/Adelaide</name>
-						<value>Australia/Adelaide</value>
-				</option>
-				<option>
-						<name>Australia/Brisbane</name>
-						<value>Australia/Brisbane</value>
-				</option>
-				<option>
-						<name>Australia/Broken_Hill</name>
-						<value>Australia/Broken_Hill</value>
-				</option>
-				<option>
-						<name>Australia/Darwin</name>
-						<value>Australia/Darwin</value>
-				</option>
-				<option>
-						<name>Australia/Hobart</name>
-						<value>Australia/Hobart</value>
-				</option>
-				<option>
-						<name>Australia/Lindeman</name>
-						<value>Australia/Lindeman</value>
-				</option>
-				<option>
-						<name>Australia/Lord_Howe</name>
-						<value>Australia/Lord_Howe</value>
-				</option>
-				<option>
-						<name>Australia/Melbourne</name>
-						<value>Australia/Melbourne</value>
-				</option>
-				<option>
-						<name>Australia/Perth</name>
-						<value>Australia/Perth</value>
-				</option>
-				<option>
-						<name>Australia/Sydney</name>
-						<value>Australia/Sydney</value>
-				</option>
-				<option>
-						<name>CET</name>
-						<value>CET</value>
-				</option>
-				<option>
-						<name>CST6CDT</name>
-						<value>CST6CDT</value>
-				</option>
-				<option>
-						<name>EET</name>
-						<value>EET</value>
-				</option>
-				<option>
-						<name>EST</name>
-						<value>EST</value>
-				</option>
-				<option>
-						<name>EST5EDT</name>
-						<value>EST5EDT</value>
-				</option>
-				<option>
-						<name>Etc/GMT</name>
-						<value>Etc/GMT</value>
-				</option>
-				<option>
-						<name>Etc/GMT+0</name>
-						<value>Etc/GMT+0</value>
-				</option>
-				<option>
-						<name>Etc/GMT+1</name>
-						<value>Etc/GMT+1</value>
-				</option>
-				<option>
-						<name>Etc/GMT+10</name>
-						<value>Etc/GMT+10</value>
-				</option>
-				<option>
-						<name>Etc/GMT+11</name>
-						<value>Etc/GMT+11</value>
-				</option>
-				<option>
-						<name>Etc/GMT+12</name>
-						<value>Etc/GMT+12</value>
-				</option>
-				<option>
-						<name>Etc/GMT+2</name>
-						<value>Etc/GMT+2</value>
-				</option>
-				<option>
-						<name>Etc/GMT+3</name>
-						<value>Etc/GMT+3</value>
-				</option>
-				<option>
-						<name>Etc/GMT+4</name>
-						<value>Etc/GMT+4</value>
-				</option>
-				<option>
-						<name>Etc/GMT+5</name>
-						<value>Etc/GMT+5</value>
-				</option>
-				<option>
-						<name>Etc/GMT+6</name>
-						<value>Etc/GMT+6</value>
-				</option>
-				<option>
-						<name>Etc/GMT+7</name>
-						<value>Etc/GMT+7</value>
-				</option>
-				<option>
-						<name>Etc/GMT+8</name>
-						<value>Etc/GMT+8</value>
-				</option>
-				<option>
-						<name>Etc/GMT+9</name>
-						<value>Etc/GMT+9</value>
-				</option>
-				<option>
-						<name>Etc/GMT-0</name>
-						<value>Etc/GMT-0</value>
-				</option>
-				<option>
-						<name>Etc/GMT-1</name>
-						<value>Etc/GMT-1</value>
-				</option>
-				<option>
-						<name>Etc/GMT-10</name>
-						<value>Etc/GMT-10</value>
-				</option>
-				<option>
-						<name>Etc/GMT-11</name>
-						<value>Etc/GMT-11</value>
-				</option>
-				<option>
-						<name>Etc/GMT-12</name>
-						<value>Etc/GMT-12</value>
-				</option>
-				<option>
-						<name>Etc/GMT-13</name>
-						<value>Etc/GMT-13</value>
-				</option>
-				<option>
-						<name>Etc/GMT-14</name>
-						<value>Etc/GMT-14</value>
-				</option>
-				<option>
-						<name>Etc/GMT-2</name>
-						<value>Etc/GMT-2</value>
-				</option>
-				<option>
-						<name>Etc/GMT-3</name>
-						<value>Etc/GMT-3</value>
-				</option>
-				<option>
-						<name>Etc/GMT-4</name>
-						<value>Etc/GMT-4</value>
-				</option>
-				<option>
-						<name>Etc/GMT-5</name>
-						<value>Etc/GMT-5</value>
-				</option>
-				<option>
-						<name>Etc/GMT-6</name>
-						<value>Etc/GMT-6</value>
-				</option>
-				<option>
-						<name>Etc/GMT-7</name>
-						<value>Etc/GMT-7</value>
-				</option>
-				<option>
-						<name>Etc/GMT-8</name>
-						<value>Etc/GMT-8</value>
-				</option>
-				<option>
-						<name>Etc/GMT-9</name>
-						<value>Etc/GMT-9</value>
-				</option>
-				<option>
-						<name>Etc/GMT0</name>
-						<value>Etc/GMT0</value>
-				</option>
-				<option>
-						<name>Etc/Greenwich</name>
-						<value>Etc/Greenwich</value>
-				</option>
-				<option>
-						<name>Etc/UCT</name>
-						<value>Etc/UCT</value>
-				</option>
-				<option>
-						<name>Etc/UTC</name>
-						<value>Etc/UTC</value>
-				</option>
-				<option>
-						<name>Etc/Universal</name>
-						<value>Etc/Universal</value>
-				</option>
-				<option>
-						<name>Etc/Zulu</name>
-						<value>Etc/Zulu</value>
-				</option>
-				<option>
-						<name>Europe/Amsterdam</name>
-						<value>Europe/Amsterdam</value>
-				</option>
-				<option>
-						<name>Europe/Andorra</name>
-						<value>Europe/Andorra</value>
-				</option>
-				<option>
-						<name>Europe/Athens</name>
-						<value>Europe/Athens</value>
-				</option>
-				<option>
-						<name>Europe/Belfast</name>
-						<value>Europe/Belfast</value>
-				</option>
-				<option>
-						<name>Europe/Belgrade</name>
-						<value>Europe/Belgrade</value>
-				</option>
-				<option>
-						<name>Europe/Berlin</name>
-						<value>Europe/Berlin</value>
-				</option>
-				<option>
-						<name>Europe/Bratislava</name>
-						<value>Europe/Bratislava</value>
-				</option>
-				<option>
-						<name>Europe/Brussels</name>
-						<value>Europe/Brussels</value>
-				</option>
-				<option>
-						<name>Europe/Bucharest</name>
-						<value>Europe/Bucharest</value>
-				</option>
-				<option>
-						<name>Europe/Budapest</name>
-						<value>Europe/Budapest</value>
-				</option>
-				<option>
-						<name>Europe/Chisinau</name>
-						<value>Europe/Chisinau</value>
-				</option>
-				<option>
-						<name>Europe/Copenhagen</name>
-						<value>Europe/Copenhagen</value>
-				</option>
-				<option>
-						<name>Europe/Dublin</name>
-						<value>Europe/Dublin</value>
-				</option>
-				<option>
-						<name>Europe/Gibraltar</name>
-						<value>Europe/Gibraltar</value>
-				</option>
-				<option>
-						<name>Europe/Helsinki</name>
-						<value>Europe/Helsinki</value>
-				</option>
-				<option>
-						<name>Europe/Istanbul</name>
-						<value>Europe/Istanbul</value>
-				</option>
-				<option>
-						<name>Europe/Kaliningrad</name>
-						<value>Europe/Kaliningrad</value>
-				</option>
-				<option>
-						<name>Europe/Kiev</name>
-						<value>Europe/Kiev</value>
-				</option>
-				<option>
-						<name>Europe/Lisbon</name>
-						<value>Europe/Lisbon</value>
-				</option>
-				<option>
-						<name>Europe/Ljubljana</name>
-						<value>Europe/Ljubljana</value>
-				</option>
-				<option>
-						<name>Europe/London</name>
-						<value>Europe/London</value>
-				</option>
-				<option>
-						<name>Europe/Luxembourg</name>
-						<value>Europe/Luxembourg</value>
-				</option>
-				<option>
-						<name>Europe/Madrid</name>
-						<value>Europe/Madrid</value>
-				</option>
-				<option>
-						<name>Europe/Malta</name>
-						<value>Europe/Malta</value>
-				</option>
-				<option>
-						<name>Europe/Minsk</name>
-						<value>Europe/Minsk</value>
-				</option>
-				<option>
-						<name>Europe/Monaco</name>
-						<value>Europe/Monaco</value>
-				</option>
-				<option>
-						<name>Europe/Moscow</name>
-						<value>Europe/Moscow</value>
-				</option>
-				<option>
-						<name>Europe/Nicosia</name>
-						<value>Europe/Nicosia</value>
-				</option>
-				<option>
-						<name>Europe/Oslo</name>
-						<value>Europe/Oslo</value>
-				</option>
-				<option>
-						<name>Europe/Paris</name>
-						<value>Europe/Paris</value>
-				</option>
-				<option>
-						<name>Europe/Prague</name>
-						<value>Europe/Prague</value>
-				</option>
-				<option>
-						<name>Europe/Riga</name>
-						<value>Europe/Riga</value>
-				</option>
-				<option>
-						<name>Europe/Rome</name>
-						<value>Europe/Rome</value>
-				</option>
-				<option>
-						<name>Europe/Samara</name>
-						<value>Europe/Samara</value>
-				</option>
-				<option>
-						<name>Europe/San_Marino</name>
-						<value>Europe/San_Marino</value>
-				</option>
-				<option>
-						<name>Europe/Sarajevo</name>
-						<value>Europe/Sarajevo</value>
-				</option>
-				<option>
-						<name>Europe/Simferopol</name>
-						<value>Europe/Simferopol</value>
-				</option>
-				<option>
-						<name>Europe/Skopje</name>
-						<value>Europe/Skopje</value>
-				</option>
-				<option>
-						<name>Europe/Sofia</name>
-						<value>Europe/Sofia</value>
-				</option>
-				<option>
-						<name>Europe/Stockholm</name>
-						<value>Europe/Stockholm</value>
-				</option>
-				<option>
-						<name>Europe/Tallinn</name>
-						<value>Europe/Tallinn</value>
-				</option>
-				<option>
-						<name>Europe/Tirane</name>
-						<value>Europe/Tirane</value>
-				</option>
-				<option>
-						<name>Europe/Uzhgorod</name>
-						<value>Europe/Uzhgorod</value>
-				</option>
-				<option>
-						<name>Europe/Vaduz</name>
-						<value>Europe/Vaduz</value>
-				</option>
-				<option>
-						<name>Europe/Vatican</name>
-						<value>Europe/Vatican</value>
-				</option>
-				<option>
-						<name>Europe/Vienna</name>
-						<value>Europe/Vienna</value>
-				</option>
-				<option>
-						<name>Europe/Vilnius</name>
-						<value>Europe/Vilnius</value>
-				</option>
-				<option>
-						<name>Europe/Warsaw</name>
-						<value>Europe/Warsaw</value>
-				</option>
-				<option>
-						<name>Europe/Zagreb</name>
-						<value>Europe/Zagreb</value>
-				</option>
-				<option>
-						<name>Europe/Zaporozhye</name>
-						<value>Europe/Zaporozhye</value>
-				</option>
-				<option>
-						<name>Europe/Zurich</name>
-						<value>Europe/Zurich</value>
-				</option>
-				<option>
-						<name>GMT</name>
-						<value>GMT</value>
-				</option>
-				<option>
-						<name>HST</name>
-						<value>HST</value>
-				</option>
-				<option>
-						<name>Indian/Antananarivo</name>
-						<value>Indian/Antananarivo</value>
-				</option>
-				<option>
-						<name>Indian/Chagos</name>
-						<value>Indian/Chagos</value>
-				</option>
-				<option>
-						<name>Indian/Christmas</name>
-						<value>Indian/Christmas</value>
-				</option>
-				<option>
-						<name>Indian/Cocos</name>
-						<value>Indian/Cocos</value>
-				</option>
-				<option>
-						<name>Indian/Comoro</name>
-						<value>Indian/Comoro</value>
-				</option>
-				<option>
-						<name>Indian/Kerguelen</name>
-						<value>Indian/Kerguelen</value>
-				</option>
-				<option>
-						<name>Indian/Mahe</name>
-						<value>Indian/Mahe</value>
-				</option>
-				<option>
-						<name>Indian/Maldives</name>
-						<value>Indian/Maldives</value>
-				</option>
-				<option>
-						<name>Indian/Mauritius</name>
-						<value>Indian/Mauritius</value>
-				</option>
-				<option>
-						<name>Indian/Mayotte</name>
-						<value>Indian/Mayotte</value>
-				</option>
-				<option>
-						<name>Indian/Reunion</name>
-						<value>Indian/Reunion</value>
-				</option>
-				<option>
-						<name>MET</name>
-						<value>MET</value>
-				</option>
-				<option>
-						<name>MST</name>
-						<value>MST</value>
-				</option>
-				<option>
-						<name>MST7MDT</name>
-						<value>MST7MDT</value>
-				</option>
-				<option>
-						<name>PST8PDT</name>
-						<value>PST8PDT</value>
-				</option>
-				<option>
-						<name>Pacific/Apia</name>
-						<value>Pacific/Apia</value>
-				</option>
-				<option>
-						<name>Pacific/Auckland</name>
-						<value>Pacific/Auckland</value>
-				</option>
-				<option>
-						<name>Pacific/Chatham</name>
-						<value>Pacific/Chatham</value>
-				</option>
-				<option>
-						<name>Pacific/Easter</name>
-						<value>Pacific/Easter</value>
-				</option>
-				<option>
-						<name>Pacific/Efate</name>
-						<value>Pacific/Efate</value>
-				</option>
-				<option>
-						<name>Pacific/Enderbury</name>
-						<value>Pacific/Enderbury</value>
-				</option>
-				<option>
-						<name>Pacific/Fakaofo</name>
-						<value>Pacific/Fakaofo</value>
-				</option>
-				<option>
-						<name>Pacific/Fiji</name>
-						<value>Pacific/Fiji</value>
-				</option>
-				<option>
-						<name>Pacific/Funafuti</name>
-						<value>Pacific/Funafuti</value>
-				</option>
-				<option>
-						<name>Pacific/Galapagos</name>
-						<value>Pacific/Galapagos</value>
-				</option>
-				<option>
-						<name>Pacific/Gambier</name>
-						<value>Pacific/Gambier</value>
-				</option>
-				<option>
-						<name>Pacific/Guadalcanal</name>
-						<value>Pacific/Guadalcanal</value>
-				</option>
-				<option>
-						<name>Pacific/Guam</name>
-						<value>Pacific/Guam</value>
-				</option>
-				<option>
-						<name>Pacific/Honolulu</name>
-						<value>Pacific/Honolulu</value>
-				</option>
-				<option>
-						<name>Pacific/Johnston</name>
-						<value>Pacific/Johnston</value>
-				</option>
-				<option>
-						<name>Pacific/Kiritimati</name>
-						<value>Pacific/Kiritimati</value>
-				</option>
-				<option>
-						<name>Pacific/Kosrae</name>
-						<value>Pacific/Kosrae</value>
-				</option>
-				<option>
-						<name>Pacific/Kwajalein</name>
-						<value>Pacific/Kwajalein</value>
-				</option>
-				<option>
-						<name>Pacific/Majuro</name>
-						<value>Pacific/Majuro</value>
-				</option>
-				<option>
-						<name>Pacific/Marquesas</name>
-						<value>Pacific/Marquesas</value>
-				</option>
-				<option>
-						<name>Pacific/Midway</name>
-						<value>Pacific/Midway</value>
-				</option>
-				<option>
-						<name>Pacific/Nauru</name>
-						<value>Pacific/Nauru</value>
-				</option>
-				<option>
-						<name>Pacific/Niue</name>
-						<value>Pacific/Niue</value>
-				</option>
-				<option>
-						<name>Pacific/Norfolk</name>
-						<value>Pacific/Norfolk</value>
-				</option>
-				<option>
-						<name>Pacific/Noumea</name>
-						<value>Pacific/Noumea</value>
-				</option>
-			</options>
 		</field>
 		<field>
 			<name>Next</name>
@@ -1816,133 +174,7 @@
 			<dontcombinecells>true</dontcombinecells>
 			<name>Subnet Mask</name>
 			<bindstofield>interfaces->wan->subnet</bindstofield>
-			<type>select</type>
-			<options>
-				<option>
-						<name>1</name>
-						<value>1</value>
-				</option>
-				<option>
-						<name>2</name>
-						<value>2</value>
-				</option>
-				<option>
-						<name>3</name>
-						<value>3</value>
-				</option>
-				<option>
-						<name>4</name>
-						<value>4</value>
-				</option>
-				<option>
-						<name>5</name>
-						<value>5</value>
-				</option>
-				<option>
-						<name>6</name>
-						<value>6</value>
-				</option>
-				<option>
-						<name>7</name>
-						<value>7</value>
-				</option>
-				<option>
-						<name>8</name>
-						<value>8</value>
-				</option>
-				<option>
-						<name>9</name>
-						<value>9</value>
-				</option>
-				<option>
-						<name>10</name>
-						<value>10</value>
-				</option>
-				<option>
-						<name>11</name>
-						<value>11</value>
-				</option>
-				<option>
-						<name>12</name>
-						<value>12</value>
-				</option>
-				<option>
-						<name>13</name>
-						<value>13</value>
-				</option>
-				<option>
-						<name>14</name>
-						<value>14</value>
-				</option>
-				<option>
-						<name>15</name>
-						<value>15</value>
-				</option>
-				<option>
-						<name>16</name>
-						<value>16</value>
-				</option>
-				<option>
-						<name>17</name>
-						<value>17</value>
-				</option>
-				<option>
-						<name>18</name>
-						<value>18</value>
-				</option>
-				<option>
-						<name>19</name>
-						<value>19</value>
-				</option>
-				<option>
-						<name>20</name>
-						<value>20</value>
-				</option>
-				<option>
-						<name>21</name>
-						<value>21</value>
-				</option>
-				<option>
-						<name>22</name>
-						<value>22</value>
-				</option>
-				<option>
-						<name>23</name>
-						<value>23</value>
-				</option>
-				<option>
-						<name>24</name>
-						<value>24</value>
-				</option>
-				<option>
-						<name>25</name>
-						<value>25</value>
-				</option>
-				<option>
-						<name>26</name>
-						<value>26</value>
-				</option>
-				<option>
-						<name>27</name>
-						<value>27</value>
-				</option>
-				<option>
-						<name>28</name>
-						<value>28</value>
-				</option>
-				<option>
-						<name>29</name>
-						<value>29</value>
-				</option>
-				<option>
-						<name>30</name>
-						<value>30</value>
-				</option>
-				<option>
-						<name>32</name>
-						<value>32</value>
-				</option>
-			</options>
+			<type>subnet_select</type>
 		</field>
 		<field>
 			<name>Gateway</name>
@@ -2063,134 +295,7 @@
 			<dontcombinecells>true</dontcombinecells>
 			<name>pptplocalsubnet</name>
 			<bindstofield>pptp->subnet</bindstofield>
-			<type>select</type>
-			<options>
-				<option>
-						<name>1</name>
-						<value>1</value>
-				</option>
-				<option>
-						<name>2</name>
-						<value>2</value>
-				</option>
-				<option>
-						<name>3</name>
-						<value>3</value>
-				</option>
-				<option>
-						<name>4</name>
-						<value>4</value>
-				</option>
-				<option>
-						<name>5</name>
-						<value>5</value>
-				</option>
-				<option>
-						<name>6</name>
-						<value>6</value>
-				</option>
-				<option>
-						<name>7</name>
-						<value>7</value>
-				</option>
-				<option>
-						<name>8</name>
-						<value>8</value>
-				</option>
-				<option>
-						<name>9</name>
-						<value>9</value>
-				</option>
-				<option>
-						<name>10</name>
-						<value>10</value>
-				</option>
-				<option>
-						<name>11</name>
-						<value>11</value>
-				</option>
-				<option>
-						<name>12</name>
-						<value>12</value>
-				</option>
-				<option>
-						<name>13</name>
-						<value>13</value>
-				</option>
-				<option>
-						<name>14</name>
-						<value>14</value>
-				</option>
-				<option>
-						<name>15</name>
-						<value>15</value>
-				</option>
-				<option>
-						<name>16</name>
-						<value>16</value>
-				</option>
-				<option>
-						<name>17</name>
-						<value>17</value>
-				</option>
-				<option>
-						<name>18</name>
-						<value>18</value>
-				</option>
-				<option>
-						<name>19</name>
-						<value>19</value>
-				</option>
-				<option>
-						<name>20</name>
-						<value>20</value>
-				</option>
-				<option>
-						<name>21</name>
-						<value>21</value>
-				</option>
-				<option>
-						<name>22</name>
-						<value>22</value>
-				</option>
-				<option>
-						<name>23</name>
-						<value>23</value>
-				</option>
-				<option>
-						<name>24</name>
-						<value>24</value>
-				</option>
-				<option>
-						<name>25</name>
-						<value>25</value>
-				</option>
-				<option>
-						<name>26</name>
-						<value>26</value>
-				</option>
-				<option>
-						<name>27</name>
-						<value>27</value>
-				</option>
-				<option>
-						<name>28</name>
-						<value>28</value>
-				</option>
-				<option>
-						<name>29</name>
-						<value>29</value>
-				</option>
-				<option>
-						<name>30</name>
-						<value>30</value>
-				</option>
-				<option>
-						<name>32</name>
-						<value>32</value>
-				</option>
-			</options>
-
+			<type>subnet_select</type>
 		</field>
 		<field>
 			<name>PPTP Remote IP Address</name>