Index: uc_store/countries/afghanistan_4_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/afghanistan_4_1.cif,v
retrieving revision 1.2.2.4
diff -u -r1.2.2.4 afghanistan_4_1.cif
--- uc_store/countries/afghanistan_4_1.cif	3 Nov 2008 21:33:50 -0000	1.2.2.4
+++ uc_store/countries/afghanistan_4_1.cif	11 Jul 2009 20:49:48 -0000
@@ -12,39 +12,44 @@
 
   // Make the entries in the zones table.  Use %d for the zone_id and the
   // VALUES = Parent Country ID, Zone Abbreviation, Zone Name
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-      ."(4, 'BDS', 'Badakhshan'),"
-      ."(4, 'BDG', 'Badghis'),"
-      ."(4, 'BGL', 'Baghlan'),"
-      ."(4, 'BAL', 'Balkh'),"
-      ."(4, 'BAM', 'Bamian'),"
-      ."(4, 'FRA', 'Farah'),"
-      ."(4, 'FYB', 'Faryab'),"
-      ."(4, 'GHA', 'Ghazni'),"
-      ."(4, 'GHO', 'Ghowr'),"
-      ."(4, 'HEL', 'Helmand'),"
-      ."(4, 'HER', 'Herat'),"
-      ."(4, 'JOW', 'Jowzjan'),"
-      ."(4, 'KAB', 'Kabul'),"
-      ."(4, 'KAN', 'Kandahar'),"
-      ."(4, 'KAP', 'Kapisa'),"
-      ."(4, 'KHO', 'Khost'),"
-      ."(4, 'KNR', 'Konar'),"
-      ."(4, 'KDZ', 'Kondoz'),"
-      ."(4, 'LAG', 'Laghman'),"
-      ."(4, 'LOW', 'Lowgar'),"
-      ."(4, 'NAN', 'Nangrahar'),"
-      ."(4, 'NIM', 'Nimruz'),"
-      ."(4, 'NUR', 'Nurestan'),"
-      ."(4, 'ORU', 'Oruzgan'),"
-      ."(4, 'PIA', 'Paktia'),"
-      ."(4, 'PKA', 'Paktika'),"
-      ."(4, 'PAR', 'Parwan'),"
-      ."(4, 'SAM', 'Samangan'),"
-      ."(4, 'SAR', 'Sar-e Pol'),"
-      ."(4, 'TAK', 'Takhar'),"
-      ."(4, 'WAR', 'Wardak'),"
-      ."(4, 'ZAB', 'Zabol')");
+  $zones = array(
+    array(4, 'BDS', 'Badakhshan'),
+    array(4, 'BDG', 'Badghis'),
+    array(4, 'BGL', 'Baghlan'),
+    array(4, 'BAL', 'Balkh'),
+    array(4, 'BAM', 'Bamian'),
+    array(4, 'FRA', 'Farah'),
+    array(4, 'FYB', 'Faryab'),
+    array(4, 'GHA', 'Ghazni'),
+    array(4, 'GHO', 'Ghowr'),
+    array(4, 'HEL', 'Helmand'),
+    array(4, 'HER', 'Herat'),
+    array(4, 'JOW', 'Jowzjan'),
+    array(4, 'KAB', 'Kabul'),
+    array(4, 'KAN', 'Kandahar'),
+    array(4, 'KAP', 'Kapisa'),
+    array(4, 'KHO', 'Khost'),
+    array(4, 'KNR', 'Konar'),
+    array(4, 'KDZ', 'Kondoz'),
+    array(4, 'LAG', 'Laghman'),
+    array(4, 'LOW', 'Lowgar'),
+    array(4, 'NAN', 'Nangrahar'),
+    array(4, 'NIM', 'Nimruz'),
+    array(4, 'NUR', 'Nurestan'),
+    array(4, 'ORU', 'Oruzgan'),
+    array(4, 'PIA', 'Paktia'),
+    array(4, 'PKA', 'Paktika'),
+    array(4, 'PAR', 'Parwan'),
+    array(4, 'SAM', 'Samangan'),
+    array(4, 'SAR', 'Sar-e Pol'),
+    array(4, 'TAK', 'Takhar'),
+    array(4, 'WAR', 'Wardak'),
+    array(4, 'ZAB', 'Zabol'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.  Documentation on address formats
Index: uc_store/countries/andorra_20_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/andorra_20_1.cif,v
retrieving revision 1.2.2.5
diff -u -r1.2.2.5 andorra_20_1.cif
--- uc_store/countries/andorra_20_1.cif	7 Nov 2008 21:13:24 -0000	1.2.2.5
+++ uc_store/countries/andorra_20_1.cif	11 Jul 2009 20:49:48 -0000
@@ -13,14 +13,19 @@
   db_query("INSERT INTO {uc_countries} VALUES (20, 'Andorra', 'AD', 'AND', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(20, 'CA', 'Canillo'),"
-          ."(20, 'EN', 'Encamp'),"
-          ."(20, 'MA', 'La Massana'),"
-          ."(20, 'OR', 'Ordino'),"
-          ."(20, 'JL', 'Sant Julià de Lòria'),"
-          ."(20, 'AN', 'Andorra La Vella'),"
-          ."(20, 'EE', 'Escaldes Engordany')");
+  $zones = array(
+    array(20, 'CA', 'Canillo'),
+    array(20, 'EN', 'Encamp'),
+    array(20, 'MA', 'La Massana'),
+    array(20, 'OR', 'Ordino'),
+    array(20, 'JL', 'Sant Julià de Lòria'),
+    array(20, 'AN', 'Andorra La Vella'),
+    array(20, 'EE', 'Escaldes Engordany'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.
Index: uc_store/countries/antigua_barbuda_28_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/Attic/antigua_barbuda_28_1.cif,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 antigua_barbuda_28_1.cif
--- uc_store/countries/antigua_barbuda_28_1.cif	7 Nov 2008 21:13:24 -0000	1.1.2.1
+++ uc_store/countries/antigua_barbuda_28_1.cif	11 Jul 2009 20:49:48 -0000
@@ -4,15 +4,20 @@
 function antigua_barbuda_install() {
   db_query("INSERT INTO {uc_countries} VALUES (28, 'Antigua and Barbuda', 'AG', 'ATG', 1)");
 
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(28, 'GE', 'St. George'),"
-          ."(28, 'JO', 'St. John'),"
-          ."(28, 'MA', 'St. Mary'),"
-          ."(28, 'PA', 'St. Paul'),"
-          ."(28, 'PE', 'St. Peter'),"
-          ."(28, 'BB', 'Barbuda'),"
-          ."(28, 'RD', 'Redonda'),"
-          ."(28, 'PH', 'St. Philip')");
+  $zones = array(
+    array(28, 'GE', 'St. George'),
+    array(28, 'JO', 'St. John'),
+    array(28, 'MA', 'St. Mary'),
+    array(28, 'PA', 'St. Paul'),
+    array(28, 'PE', 'St. Peter'),
+    array(28, 'BB', 'Barbuda'),
+    array(28, 'RD', 'Redonda'),
+    array(28, 'PH', 'St. Philip'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   uc_set_address_format(28, "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_code !postal_code\r\n!country_name_if");
 }
Index: uc_store/countries/argentina_32_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/argentina_32_1.cif,v
retrieving revision 1.2.2.5
diff -u -r1.2.2.5 argentina_32_1.cif
--- uc_store/countries/argentina_32_1.cif	7 Nov 2008 21:13:24 -0000	1.2.2.5
+++ uc_store/countries/argentina_32_1.cif	11 Jul 2009 20:49:48 -0000
@@ -6,31 +6,36 @@
   db_query("INSERT INTO {uc_countries} VALUES (32, 'Argentina', 'AR', 'ARG', 1)");
 
   // VALUES = %d for ID, Parent Country ID, Zone Abbreviation, Zone Name
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-      ."(32, 'A', 'Salta'),"
-      ."(32, 'B', 'Buenos Aires Province'),"
-      ."(32, 'C', 'Capital Federal'),"
-      ."(32, 'D', 'San Luis'),"
-      ."(32, 'E', 'Entre Ríos'),"
-      ."(32, 'F', 'La Rioja'),"
-      ."(32, 'G', 'Santiago del Estero'),"
-      ."(32, 'H', 'Chaco'),"
-      ."(32, 'J', 'San Juan'),"
-      ."(32, 'K', 'Catamarca'),"
-      ."(32, 'L', 'La Pampa'),"
-      ."(32, 'M', 'Mendoza'),"
-      ."(32, 'N', 'Misiones'),"
-      ."(32, 'P', 'Formosa'),"
-      ."(32, 'Q', 'Neuquén'),"
-      ."(32, 'R', 'Río Negro'),"
-      ."(32, 'S', 'Santa Fe'),"
-      ."(32, 'T', 'Tucumán'),"
-      ."(32, 'U', 'Chubut'),"
-      ."(32, 'V', 'Tierra del Fuego'),"
-      ."(32, 'W', 'Corrientes'),"
-      ."(32, 'X', 'Córdoba'),"
-      ."(32, 'Y', 'Jujuy'),"
-      ."(32, 'Z', 'Santa Cruz')");
+  $zones = array(
+    array(32, 'A', 'Salta'),
+    array(32, 'B', 'Buenos Aires Province'),
+    array(32, 'C', 'Capital Federal'),
+    array(32, 'D', 'San Luis'),
+    array(32, 'E', 'Entre Ríos'),
+    array(32, 'F', 'La Rioja'),
+    array(32, 'G', 'Santiago del Estero'),
+    array(32, 'H', 'Chaco'),
+    array(32, 'J', 'San Juan'),
+    array(32, 'K', 'Catamarca'),
+    array(32, 'L', 'La Pampa'),
+    array(32, 'M', 'Mendoza'),
+    array(32, 'N', 'Misiones'),
+    array(32, 'P', 'Formosa'),
+    array(32, 'Q', 'Neuquén'),
+    array(32, 'R', 'Río Negro'),
+    array(32, 'S', 'Santa Fe'),
+    array(32, 'T', 'Tucumán'),
+    array(32, 'U', 'Chubut'),
+    array(32, 'V', 'Tierra del Fuego'),
+    array(32, 'W', 'Corrientes'),
+    array(32, 'X', 'Córdoba'),
+    array(32, 'Y', 'Jujuy'),
+    array(32, 'Z', 'Santa Cruz'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   uc_set_address_format(32, "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
               ."\r\n!postal_code !zone_name\r\n!country_name");
Index: uc_store/countries/australia_36_2.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/australia_36_2.cif,v
retrieving revision 1.2.2.4
diff -u -r1.2.2.4 australia_36_2.cif
--- uc_store/countries/australia_36_2.cif	3 Nov 2008 21:33:50 -0000	1.2.2.4
+++ uc_store/countries/australia_36_2.cif	11 Jul 2009 20:49:48 -0000
@@ -11,15 +11,20 @@
   db_query("INSERT INTO {uc_countries} VALUES (036, 'Australia', 'AU', 'AUS', 2)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(036, 'NSW', 'New South Wales'),"
-          ."(036, 'QLD', 'Queensland'),"
-          ."(036, 'SA', 'South Australia'),"
-          ."(036, 'TAS', 'Tasmania'),"
-          ."(036, 'VIC', 'Victoria'),"
-          ."(036, 'WA', 'Western Australia'),"
-          ."(036, 'NT', 'Northern Territory'),"
-          ."(036, 'ACT', 'Australian Capital Territory')");
+  $zones = array(
+    array(036, 'NSW', 'New South Wales'),
+    array(036, 'QLD', 'Queensland'),
+    array(036, 'SA', 'South Australia'),
+    array(036, 'TAS', 'Tasmania'),
+    array(036, 'VIC', 'Victoria'),
+    array(036, 'WA', 'Western Australia'),
+    array(036, 'NT', 'Northern Territory'),
+    array(036, 'ACT', 'Australian Capital Territory'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.  Documentation on address formats
Index: uc_store/countries/austria_40_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/austria_40_1.cif,v
retrieving revision 1.3.2.4
diff -u -r1.3.2.4 austria_40_1.cif
--- uc_store/countries/austria_40_1.cif	3 Nov 2008 21:33:50 -0000	1.3.2.4
+++ uc_store/countries/austria_40_1.cif	11 Jul 2009 20:49:48 -0000
@@ -11,16 +11,21 @@
   db_query("INSERT INTO {uc_countries} VALUES (040, 'Austria', 'AT', 'AUT', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(040, 'BUR', 'Burgenland'),"
-          ."(040, 'KAR', 'Kärnten'),"
-          ."(040, 'NOS', 'Niederöesterreich'),"
-          ."(040, 'OOS', 'Oberöesterreich'),"
-          ."(040, 'SAL', 'Salzburg'),"
-          ."(040, 'STE', 'Steiermark'),"
-          ."(040, 'TIR', 'Tirol'),"
-          ."(040, 'VOR', 'Vorarlberg'),"
-          ."(040, 'WIE', 'Wien')");
+  $zones = array(
+    array(040, 'BUR', 'Burgenland'),
+    array(040, 'KAR', 'Kärnten'),
+    array(040, 'NOS', 'Niederöesterreich'),
+    array(040, 'OOS', 'Oberöesterreich'),
+    array(040, 'SAL', 'Salzburg'),
+    array(040, 'STE', 'Steiermark'),
+    array(040, 'TIR', 'Tirol'),
+    array(040, 'VOR', 'Vorarlberg'),
+    array(040, 'WIE', 'Wien'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.  Documentation on address formats
Index: uc_store/countries/belgium_56_2.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/Attic/belgium_56_2.cif,v
retrieving revision 1.1.2.6
diff -u -r1.1.2.6 belgium_56_2.cif
--- uc_store/countries/belgium_56_2.cif	29 Apr 2009 12:32:49 -0000	1.1.2.6
+++ uc_store/countries/belgium_56_2.cif	11 Jul 2009 20:49:48 -0000
@@ -5,18 +5,19 @@
   db_query("INSERT INTO {uc_countries} VALUES (56, 'Belgium', 'BE', 'BEL', 2)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(56, 'VWV', 'West-Vlaanderen'),"
-          ."(56, 'VOV', 'Oost-Vlaanderen'),"
-          ."(56, 'VAN', 'Antwerpen'),"
-          ."(56, 'VLI', 'Limburg'),"
-          ."(56, 'VBR', 'Vlaams-Brabant'),"
-          ."(56, 'BRU', 'Brussel/Bruxelles'),"
-          ."(56, 'WBW', 'Brabant-Wallon'),"
-          ."(56, 'WLG', 'Liège'),"
-          ."(56, 'WHT', 'Hainaut'),"
-          ."(56, 'WNA', 'Namur'),"
-          ."(56, 'WLX', 'Luxembourg')" );
+  $zones = array(
+    array(56, 'VWV', 'West-Vlaanderen'),
+    array(56, 'VOV', 'Oost-Vlaanderen'),
+    array(56, 'VAN', 'Antwerpen'),
+    array(56, 'VLI', 'Limburg'),
+    array(56, 'VBR', 'Vlaams-Brabant'),
+    array(56, 'BRU', 'Brussel/Bruxelles'),
+    array(56, 'WBW', 'Brabant-Wallon'),
+    array(56, 'WLG', 'Liège'),
+    array(56, 'WHT', 'Hainaut'),
+    array(56, 'WNA', 'Namur'),
+    array(56, 'WLX', 'Luxembourg'),
+  );
 
   uc_set_address_format(56, "!company\n!first_name !last_name\n!street\n!postal_code !city\n!country_name_if");
 }
Index: uc_store/countries/bermuda_60_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/Attic/bermuda_60_1.cif,v
retrieving revision 1.1.4.2
diff -u -r1.1.4.2 bermuda_60_1.cif
--- uc_store/countries/bermuda_60_1.cif	7 Nov 2008 21:13:24 -0000	1.1.4.2
+++ uc_store/countries/bermuda_60_1.cif	11 Jul 2009 20:49:48 -0000
@@ -14,18 +14,23 @@
   // function uc_get_zone_ids($num) as the second argument for db_query() where
   // $num is the number of zones in the INSERT query.
   // VALUES = %d for ID, Parent Country ID, Zone Abbreviation, Zone Name
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(60, 'DEV', 'Devonshire'),"
-          ."(60, 'HAM', 'Hamilton'),"
-          ."(60, 'HA', 'Hamilton Municipality'),"
-          ."(60, 'PAG', 'Paget'),"
-          ."(60, 'PEM', 'Pembroke'),"
-          ."(60, 'SG', 'Saint George Municipality'),"
-          ."(60, 'SGE', 'Saint Georges'),"
-          ."(60, 'SAN', 'Sandys'),"
-          ."(60, 'SMI', 'Smiths'),"
-          ."(60, 'SOU', 'Southampton'),"
-          ."(60, 'WAR', 'Warwick')");
+  $zones = array(
+    array(60, 'DEV', 'Devonshire'),
+    array(60, 'HAM', 'Hamilton'),
+    array(60, 'HA', 'Hamilton Municipality'),
+    array(60, 'PAG', 'Paget'),
+    array(60, 'PEM', 'Pembroke'),
+    array(60, 'SG', 'Saint George Municipality'),
+    array(60, 'SGE', 'Saint Georges'),
+    array(60, 'SAN', 'Sandys'),
+    array(60, 'SMI', 'Smiths'),
+    array(60, 'SOU', 'Southampton'),
+    array(60, 'WAR', 'Warwick'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.  Documentation on address formats
Index: uc_store/countries/brazil_76_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/brazil_76_1.cif,v
retrieving revision 1.4.2.1
diff -u -r1.4.2.1 brazil_76_1.cif
--- uc_store/countries/brazil_76_1.cif	3 Nov 2008 21:33:50 -0000	1.4.2.1
+++ uc_store/countries/brazil_76_1.cif	11 Jul 2009 20:49:48 -0000
@@ -6,34 +6,39 @@
   db_query("INSERT INTO {uc_countries} VALUES (076, 'Brazil', 'BR', 'BRA', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-    ."(76, 'AC', 'Acre'),"
-    ."(76, 'AL', 'Alagoas'),"
-    ."(76, 'AP', 'Amapá'),"
-    ."(76, 'AM', 'Amazonas'),"
-    ."(76, 'BA', 'Bahia'),"
-    ."(76, 'CE', 'Ceará'),"
-    ."(76, 'DF', 'Distrito Federal'),"
-    ."(76, 'ES', 'Espírito Santo'),"
-    ."(76, 'GO', 'Goiás'),"
-    ."(76, 'MA', 'Maranhão'),"
-    ."(76, 'MT', 'Mato Grosso'),"
-    ."(76, 'MS', 'Mato Grosso do Sul'),"
-    ."(76, 'MG', 'Minas Gerais'),"
-    ."(76, 'PA', 'Pará'),"
-    ."(76, 'PB', 'Paraíba'),"
-    ."(76, 'PR', 'Paraná'),"
-    ."(76, 'PE', 'Pernambuco'),"
-    ."(76, 'PI', 'Piauí'),"
-    ."(76, 'RJ', 'Rio de Janeiro'),"
-    ."(76, 'RN', 'Rio Grande do Norte'),"
-    ."(76, 'RS', 'Rio Grande do Sul'),"
-    ."(76, 'RO', 'Rondônia'),"
-    ."(76, 'RR', 'Roraima'),"
-    ."(76, 'SC', 'Santa Catarina'),"
-    ."(76, 'SP', 'São Paulo'),"
-    ."(76, 'SE', 'Sergipe'),"
-    ."(76, 'TO', 'Tocantins')");
+  $zones = array(
+    array(76, 'AC', 'Acre'),
+    array(76, 'AL', 'Alagoas'),
+    array(76, 'AP', 'Amapá'),
+    array(76, 'AM', 'Amazonas'),
+    array(76, 'BA', 'Bahia'),
+    array(76, 'CE', 'Ceará'),
+    array(76, 'DF', 'Distrito Federal'),
+    array(76, 'ES', 'Espírito Santo'),
+    array(76, 'GO', 'Goiás'),
+    array(76, 'MA', 'Maranhão'),
+    array(76, 'MT', 'Mato Grosso'),
+    array(76, 'MS', 'Mato Grosso do Sul'),
+    array(76, 'MG', 'Minas Gerais'),
+    array(76, 'PA', 'Pará'),
+    array(76, 'PB', 'Paraíba'),
+    array(76, 'PR', 'Paraná'),
+    array(76, 'PE', 'Pernambuco'),
+    array(76, 'PI', 'Piauí'),
+    array(76, 'RJ', 'Rio de Janeiro'),
+    array(76, 'RN', 'Rio Grande do Norte'),
+    array(76, 'RS', 'Rio Grande do Sul'),
+    array(76, 'RO', 'Rondônia'),
+    array(76, 'RR', 'Roraima'),
+    array(76, 'SC', 'Santa Catarina'),
+    array(76, 'SP', 'São Paulo'),
+    array(76, 'SE', 'Sergipe'),
+    array(76, 'TO', 'Tocantins'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   uc_set_address_format(76, "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
                            ."\r\n!city, !postal_code\r\n!zone_name, !country_name");
Index: uc_store/countries/canada_124_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/canada_124_1.cif,v
retrieving revision 1.5.2.1
diff -u -r1.5.2.1 canada_124_1.cif
--- uc_store/countries/canada_124_1.cif	3 Nov 2008 21:33:50 -0000	1.5.2.1
+++ uc_store/countries/canada_124_1.cif	11 Jul 2009 20:49:48 -0000
@@ -6,20 +6,25 @@
   db_query("INSERT INTO {uc_countries} VALUES (124, 'Canada', 'CA', 'CAN', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(124, 'AB', 'Alberta'),"
-          ."(124, 'BC', 'British Columbia'),"
-          ."(124, 'MB', 'Manitoba'),"
-          ."(124, 'NF', 'Newfoundland'),"
-          ."(124, 'NB', 'New Brunswick'),"
-          ."(124, 'NS', 'Nova Scotia'),"
-          ."(124, 'NT', 'Northwest Territories'),"
-          ."(124, 'NU', 'Nunavut'),"
-          ."(124, 'ON', 'Ontario'),"
-          ."(124, 'PE', 'Prince Edward Island'),"
-          ."(124, 'QC', 'Quebec'),"
-          ."(124, 'SK', 'Saskatchewan'),"
-          ."(124, 'YT', 'Yukon Territory')");
+  $zones = array(
+    array(124, 'AB', 'Alberta'),
+    array(124, 'BC', 'British Columbia'),
+    array(124, 'MB', 'Manitoba'),
+    array(124, 'NF', 'Newfoundland'),
+    array(124, 'NB', 'New Brunswick'),
+    array(124, 'NS', 'Nova Scotia'),
+    array(124, 'NT', 'Northwest Territories'),
+    array(124, 'NU', 'Nunavut'),
+    array(124, 'ON', 'Ontario'),
+    array(124, 'PE', 'Prince Edward Island'),
+    array(124, 'QC', 'Quebec'),
+    array(124, 'SK', 'Saskatchewan'),
+    array(124, 'YT', 'Yukon Territory'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   variable_set('uc_address_format_124',
                "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
Index: uc_store/countries/chile_152_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/chile_152_1.cif,v
retrieving revision 1.4.4.1
diff -u -r1.4.4.1 chile_152_1.cif
--- uc_store/countries/chile_152_1.cif	3 Nov 2008 21:33:50 -0000	1.4.4.1
+++ uc_store/countries/chile_152_1.cif	11 Jul 2009 20:49:48 -0000
@@ -6,22 +6,27 @@
   db_query("INSERT INTO {uc_countries} VALUES (152, 'Chile', 'CL', 'CHL', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(152, 'TA', 'Tarapaca'),"
-          ."(152, 'AN', 'Antofagasta'),"
-          ."(152, 'AT', 'Atacama'),"
-          ."(152, 'CO', 'Coquimbo'),"
-          ."(152, 'VA', 'Valparaiso'),"
-          ."(152, 'OH', 'Ohiggins'),"
-          ."(152, 'MA', 'Maule'),"
-          ."(152, 'BI', 'Biobio'),"
-          ."(152, 'AR', 'Araucania'),"
-          ."(152, 'LA', 'Lagos'),"
-          ."(152, 'AI', 'Aisen'),"
-          ."(152, 'MA', 'Magallanes'),"
-          ."(152, 'RM', 'Metropolitana'),"
-          ."(152, 'Ri', 'Rios'),"
-          ."(152, 'AR', 'Arica')");
+  $zones = array(
+    array(152, 'TA', 'Tarapaca'),
+    array(152, 'AN', 'Antofagasta'),
+    array(152, 'AT', 'Atacama'),
+    array(152, 'CO', 'Coquimbo'),
+    array(152, 'VA', 'Valparaiso'),
+    array(152, 'OH', 'Ohiggins'),
+    array(152, 'MA', 'Maule'),
+    array(152, 'BI', 'Biobio'),
+    array(152, 'AR', 'Araucania'),
+    array(152, 'LA', 'Lagos'),
+    array(152, 'AI', 'Aisen'),
+    array(152, 'MA', 'Magallanes'),
+    array(152, 'RM', 'Metropolitana'),
+    array(152, 'Ri', 'Rios'),
+    array(152, 'AR', 'Arica'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   uc_set_address_format(152, "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
                            ."\r\n!city, !postal_code\r\n!zone_name, !country_name");
Index: uc_store/countries/china_156_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/Attic/china_156_1.cif,v
retrieving revision 1.1.4.3
diff -u -r1.1.4.3 china_156_1.cif
--- uc_store/countries/china_156_1.cif	7 Nov 2008 21:13:24 -0000	1.1.4.3
+++ uc_store/countries/china_156_1.cif	11 Jul 2009 20:49:48 -0000
@@ -14,41 +14,46 @@
   // function uc_get_zone_ids($num) as the second argument for db_query() where
   // $num is the number of zones in the INSERT query.
   // VALUES = %d for ID, Parent Country ID, Zone Abbreviation, Zone Name
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(156, '京', '北京'),"
-          ."(156, '沪', '上海'),"
-          ."(156, '津', '天津'),"
-          ."(156, '渝', '重庆'),"
-          ."(156, '冀', '河北'),"
-          ."(156, '豫', '河南'),"
-          ."(156, '鄂', '湖北'),"
-          ."(156, '湘', '湖南'),"
-          ."(156, '苏', '江苏'),"
-          ."(156, '赣', '江西'),"
-          ."(156, '辽', '辽宁'),"
-          ."(156, '吉', '吉林'),"
-          ."(156, '黑', '黑龙江'),"
-          ."(156, '陕', '陕西'),"
-          ."(156, '鲁', '山东'),"
-          ."(156, '晋', '山西'),"
-          ."(156, '川', '四川'),"
-          ."(156, '青', '青海'),"
-          ."(156, '皖', '安徽'),"
-          ."(156, '琼', '海南'),"
-          ."(156, '粤', '广东'),"
-          ."(156, '桂', '广西'),"
-          ."(156, '贵', '贵州'),"
-          ."(156, '浙', '浙江'),"
-          ."(156, '闽', '福建'),"
-          ."(156, '甘', '甘肃'),"
-          ."(156, '云', '云南'),"
-          ."(156, '蒙', '内蒙古'),"
-          ."(156, '宁', '宁夏'),"
-          ."(156, '新', '新疆'),"
-          ."(156, '藏', '西藏'),"
-          ."(156, '港', '香港'),"
-          ."(156, '澳', '澳门'),"
-          ."(156, '台', '台湾');");
+  $zones = array(
+    array(156, '京', '北京'),
+    array(156, '沪', '上海'),
+    array(156, '津', '天津'),
+    array(156, '渝', '重庆'),
+    array(156, '冀', '河北'),
+    array(156, '豫', '河南'),
+    array(156, '鄂', '湖北'),
+    array(156, '湘', '湖南'),
+    array(156, '苏', '江苏'),
+    array(156, '赣', '江西'),
+    array(156, '辽', '辽宁'),
+    array(156, '吉', '吉林'),
+    array(156, '黑', '黑龙江'),
+    array(156, '陕', '陕西'),
+    array(156, '鲁', '山东'),
+    array(156, '晋', '山西'),
+    array(156, '川', '四川'),
+    array(156, '青', '青海'),
+    array(156, '皖', '安徽'),
+    array(156, '琼', '海南'),
+    array(156, '粤', '广东'),
+    array(156, '桂', '广西'),
+    array(156, '贵', '贵州'),
+    array(156, '浙', '浙江'),
+    array(156, '闽', '福建'),
+    array(156, '甘', '甘肃'),
+    array(156, '云', '云南'),
+    array(156, '蒙', '内蒙古'),
+    array(156, '宁', '宁夏'),
+    array(156, '新', '新疆'),
+    array(156, '藏', '西藏'),
+    array(156, '港', '香港'),
+    array(156, '澳', '澳门'),
+    array(156, '台', '台湾'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   uc_set_address_format(156,
     "!company\r\n!last_name !first_name\r\n!street1\r\n!street2\r\n"
Index: uc_store/countries/costa_rica_188_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/costa_rica_188_1.cif,v
retrieving revision 1.2.2.4
diff -u -r1.2.2.4 costa_rica_188_1.cif
--- uc_store/countries/costa_rica_188_1.cif	3 Nov 2008 21:33:50 -0000	1.2.2.4
+++ uc_store/countries/costa_rica_188_1.cif	11 Jul 2009 20:49:48 -0000
@@ -11,14 +11,19 @@
   db_query("INSERT INTO {uc_countries} VALUES (188, 'Costa Rica', 'CR', 'CRA', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-    ."(188, 'AL','Alajuela'),"
-    ."(188, 'CA','Cartago'),"
-    ."(188, 'GU','Guanacaste'),"
-    ."(188, 'HE','Heredia'),"
-    ."(188, 'LI','Limón'),"
-    ."(188, 'PU','Puntarenas'),"
-    ."(188, 'SJ','San José')");
+  $zones = array(
+    array(188, 'AL','Alajuela'),
+    array(188, 'CA','Cartago'),
+    array(188, 'GU','Guanacaste'),
+    array(188, 'HE','Heredia'),
+    array(188, 'LI','Limón'),
+    array(188, 'PU','Puntarenas'),
+    array(188, 'SJ','San José'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.  Documentation on address formats
Index: uc_store/countries/croatia_191_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/croatia_191_1.cif,v
retrieving revision 1.2.2.4
diff -u -r1.2.2.4 croatia_191_1.cif
--- uc_store/countries/croatia_191_1.cif	3 Nov 2008 21:33:50 -0000	1.2.2.4
+++ uc_store/countries/croatia_191_1.cif	11 Jul 2009 20:49:48 -0000
@@ -6,28 +6,33 @@
   db_query("INSERT INTO {uc_countries} VALUES (191, 'Croatia', 'HR', 'HRV', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-      ."(191, '01', 'Zagreb county'),"
-      ."(191, '02', 'Krapina-Zagorje county'),"
-      ."(191, '03', 'Sisak-Moslavina county'),"
-      ."(191, '04', 'Karlovac county'),"
-      ."(191, '05', 'Varaždin county'),"
-      ."(191, '06', 'Koprivnica-Križevci county'),"
-      ."(191, '07', 'Bjelovar-Bilogora county'),"
-      ."(191, '08', 'Primorje-Gorski Kotar county'),"
-      ."(191, '09', 'Lika-Senj county'),"
-      ."(191, '10', 'Virovitica-Podravina county'),"
-      ."(191, '11', 'Požega-Slavonia county'),"
-      ."(191, '12', 'Brod-Posavina county'),"
-      ."(191, '13', 'Zadar county'),"
-      ."(191, '14', 'Osijek-Baranja county'),"
-      ."(191, '15', 'Šibenik-Knin county'),"
-      ."(191, '16', 'Vukovar-Srijem county'),"
-      ."(191, '17', 'Split-Dalmatia county'),"
-      ."(191, '18', 'Istria county'),"
-      ."(191, '19', 'Dubrovnik-Neretva county'),"
-      ."(191, '20', 'Međimurje county'),"
-      ."(191, '21', 'Zagreb')");
+  $zones = array(
+    array(191, '01', 'Zagreb county'),
+    array(191, '02', 'Krapina-Zagorje county'),
+    array(191, '03', 'Sisak-Moslavina county'),
+    array(191, '04', 'Karlovac county'),
+    array(191, '05', 'Varaždin county'),
+    array(191, '06', 'Koprivnica-Križevci county'),
+    array(191, '07', 'Bjelovar-Bilogora county'),
+    array(191, '08', 'Primorje-Gorski Kotar county'),
+    array(191, '09', 'Lika-Senj county'),
+    array(191, '10', 'Virovitica-Podravina county'),
+    array(191, '11', 'Požega-Slavonia county'),
+    array(191, '12', 'Brod-Posavina county'),
+    array(191, '13', 'Zadar county'),
+    array(191, '14', 'Osijek-Baranja county'),
+    array(191, '15', 'Šibenik-Knin county'),
+    array(191, '16', 'Vukovar-Srijem county'),
+    array(191, '17', 'Split-Dalmatia county'),
+    array(191, '18', 'Istria county'),
+    array(191, '19', 'Dubrovnik-Neretva county'),
+    array(191, '20', 'Međimurje county'),
+    array(191, '21', 'Zagreb'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   uc_set_address_format(191, "!company\r\n!first_name !last_name\r\n!street1 !street2"
               ."\r\n!postal_code !zone_name\r\n!country_name");
Index: uc_store/countries/czech_203_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/czech_203_1.cif,v
retrieving revision 1.2.2.4
diff -u -r1.2.2.4 czech_203_1.cif
--- uc_store/countries/czech_203_1.cif	3 Nov 2008 21:33:50 -0000	1.2.2.4
+++ uc_store/countries/czech_203_1.cif	11 Jul 2009 20:49:48 -0000
@@ -6,21 +6,26 @@
   db_query("INSERT INTO {uc_countries} VALUES (203, 'Czech Republic', 'CZ', 'CZE', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(203, 'PHA', 'Praha'),"
-          ."(203, 'STC', 'Středočeský kraj'),"
-          ."(203, 'JHC', 'Jihočeský kraj'),"
-          ."(203, 'PLK', 'Plzeňský kraj'),"
-          ."(203, 'KVK', 'Karlovarský kraj'),"
-          ."(203, 'ULK', 'Ústecký kraj'),"
-          ."(203, 'LBK', 'Liberecký kraj'),"
-          ."(203, 'HKK', 'Královéhradecký kraj'),"
-          ."(203, 'PAK', 'Pardubický kraj'),"
-          ."(203, 'VYS', 'Vysočina'),"
-          ."(203, 'JHM', 'Jihomoravský kraj'),"
-          ."(203, 'OLK', 'Olomoucký kraj'),"
-          ."(203, 'ZLK', 'Zlínský kraj'),"
-          ."(203, 'MSK', 'Moravskoslezský kraj')");
+  $zones = array(
+    array(203, 'PHA', 'Praha'),
+    array(203, 'STC', 'Středočeský kraj'),
+    array(203, 'JHC', 'Jihočeský kraj'),
+    array(203, 'PLK', 'Plzeňský kraj'),
+    array(203, 'KVK', 'Karlovarský kraj'),
+    array(203, 'ULK', 'Ústecký kraj'),
+    array(203, 'LBK', 'Liberecký kraj'),
+    array(203, 'HKK', 'Královéhradecký kraj'),
+    array(203, 'PAK', 'Pardubický kraj'),
+    array(203, 'VYS', 'Vysočina'),
+    array(203, 'JHM', 'Jihomoravský kraj'),
+    array(203, 'OLK', 'Olomoucký kraj'),
+    array(203, 'ZLK', 'Zlínský kraj'),
+    array(203, 'MSK', 'Moravskoslezský kraj'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   uc_set_address_format(203,
     "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
Index: uc_store/countries/dominican_republic_214_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/dominican_republic_214_1.cif,v
retrieving revision 1.2.2.5
diff -u -r1.2.2.5 dominican_republic_214_1.cif
--- uc_store/countries/dominican_republic_214_1.cif	3 Nov 2008 21:33:50 -0000	1.2.2.5
+++ uc_store/countries/dominican_republic_214_1.cif	11 Jul 2009 20:49:48 -0000
@@ -11,39 +11,44 @@
   db_query("INSERT INTO {uc_countries} VALUES (214, 'Dominican Republic', 'DO', 'DOM', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(214, 'DN', 'Distrito Nacional'),"
-          ."(214, 'AZ', 'Azua'),"
-          ."(214, 'BC', 'Baoruco'),"
-          ."(214, 'BH', 'Barahona'),"
-          ."(214, 'DJ', 'Dajabon'),"
-          ."(214, 'DU', 'Duarte'),"
-          ."(214, 'EL', 'Elias Pina'),"
-          ."(214, 'SY', 'El Seybo'),"
-          ."(214, 'ET', 'Espaillat'),"
-          ."(214, 'HM', 'Hato Mayor'),"
-          ."(214, 'IN', 'Independencia'),"
-          ."(214, 'AL', 'La Altagracia'),"
-          ."(214, 'RO', 'La Romana'),"
-          ."(214, 'VE', 'La Vega'),"
-          ."(214, 'MT', 'Maria Trinidad Sanchez'),"
-          ."(214, 'MN', 'Monsenor Nouel'),"
-          ."(214, 'MC', 'Monte Cristi'),"
-          ."(214, 'MP', 'Monte Plata'),"
-          ."(214, 'PD', 'Pedernales'),"
-          ."(214, 'PR', 'Peravia (Bani)'),"
-          ."(214, 'PP', 'Puerto Plata'),"
-          ."(214, 'SL', 'Salcedo'),"
-          ."(214, 'SM', 'Samana'),"
-          ."(214, 'SH', 'Sanchez Ramirez'),"
-          ."(214, 'SC', 'San Cristobal'),"
-          ."(214, 'JO', 'San Jose de Ocoa'),"
-          ."(214, 'SJ', 'San Juan'),"
-          ."(214, 'PM', 'San Pedro de Macoris'),"
-          ."(214, 'SA', 'Santiago'),"
-          ."(214, 'ST', 'Santiago Rodriguez'),"
-          ."(214, 'SD', 'Santo Domingo'),"
-          ."(214, 'VA', 'Valverde')");
+  $zones = array(
+    array(214, 'DN', 'Distrito Nacional'),
+    array(214, 'AZ', 'Azua'),
+    array(214, 'BC', 'Baoruco'),
+    array(214, 'BH', 'Barahona'),
+    array(214, 'DJ', 'Dajabon'),
+    array(214, 'DU', 'Duarte'),
+    array(214, 'EL', 'Elias Pina'),
+    array(214, 'SY', 'El Seybo'),
+    array(214, 'ET', 'Espaillat'),
+    array(214, 'HM', 'Hato Mayor'),
+    array(214, 'IN', 'Independencia'),
+    array(214, 'AL', 'La Altagracia'),
+    array(214, 'RO', 'La Romana'),
+    array(214, 'VE', 'La Vega'),
+    array(214, 'MT', 'Maria Trinidad Sanchez'),
+    array(214, 'MN', 'Monsenor Nouel'),
+    array(214, 'MC', 'Monte Cristi'),
+    array(214, 'MP', 'Monte Plata'),
+    array(214, 'PD', 'Pedernales'),
+    array(214, 'PR', 'Peravia (Bani)'),
+    array(214, 'PP', 'Puerto Plata'),
+    array(214, 'SL', 'Salcedo'),
+    array(214, 'SM', 'Samana'),
+    array(214, 'SH', 'Sanchez Ramirez'),
+    array(214, 'SC', 'San Cristobal'),
+    array(214, 'JO', 'San Jose de Ocoa'),
+    array(214, 'SJ', 'San Juan'),
+    array(214, 'PM', 'San Pedro de Macoris'),
+    array(214, 'SA', 'Santiago'),
+    array(214, 'ST', 'Santiago Rodriguez'),
+    array(214, 'SD', 'Santo Domingo'),
+    array(214, 'VA', 'Valverde'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.  Documentation on address formats
Index: uc_store/countries/egypt_818_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/egypt_818_1.cif,v
retrieving revision 1.2.2.4
diff -u -r1.2.2.4 egypt_818_1.cif
--- uc_store/countries/egypt_818_1.cif	3 Nov 2008 21:33:50 -0000	1.2.2.4
+++ uc_store/countries/egypt_818_1.cif	11 Jul 2009 20:49:48 -0000
@@ -10,34 +10,39 @@
   db_query("INSERT INTO {uc_countries} VALUES (818, 'Egypt', 'EG', 'EGY', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(818, 'MUH', 'مرسى مطروح'),"
-          ."(818, 'ALX', 'الاسكندرية'),"
-          ."(818, 'WAD', 'الوادي الجديد'),"
-          ."(818, 'GZ', 'الجيزة'),"
-          ."(818, 'FYM', 'الفيوم'),"
-          ."(818, 'BNS', 'بني سويف'),"
-          ."(818, 'MN', 'المنيا'),"
-          ."(818, 'AST', 'اسيوط'),"
-          ."(818, 'SHG', 'سوهاج'),"
-          ."(818, 'ASN', 'اسوان'),"
-          ."(818, 'SIN', 'شمال سيناء'),"
-          ."(818, 'JS', 'جنوب سيناء'),"
-          ."(818, 'MNF', 'المنوفية'),"
-          ."(818, 'BA', 'البحر الاحمر'),"
-          ."(818, 'SHR', 'الشرقية'),"
-          ."(818, 'KB', 'القليوبية'),"
-          ."(818, 'IS', 'الاسماعيلية'),"
-          ."(818, 'SUZ', 'السويس'),"
-          ."(818, 'BH', 'البحيرة'),"
-          ."(818, 'GH', 'الغربية'),"
-          ."(818, 'KFS', 'كفر الشيخ'),"
-          ."(818, 'DK', 'الدقهلية'),"
-          ."(818, 'UQ', 'الاقصر'),"
-          ."(818, 'PTS', 'بور سعيد'),"
-          ."(818, 'DT', 'دمياط'),"
-          ."(818, 'KN', 'قنا'),"
-          ."(818, 'CAI', 'القاهرة')");
+  $zones = array(
+    array(818, 'MUH', 'مرسى مطروح'),
+    array(818, 'ALX', 'الاسكندرية'),
+    array(818, 'WAD', 'الوادي الجديد'),
+    array(818, 'GZ', 'الجيزة'),
+    array(818, 'FYM', 'الفيوم'),
+    array(818, 'BNS', 'بني سويف'),
+    array(818, 'MN', 'المنيا'),
+    array(818, 'AST', 'اسيوط'),
+    array(818, 'SHG', 'سوهاج'),
+    array(818, 'ASN', 'اسوان'),
+    array(818, 'SIN', 'شمال سيناء'),
+    array(818, 'JS', 'جنوب سيناء'),
+    array(818, 'MNF', 'المنوفية'),
+    array(818, 'BA', 'البحر الاحمر'),
+    array(818, 'SHR', 'الشرقية'),
+    array(818, 'KB', 'القليوبية'),
+    array(818, 'IS', 'الاسماعيلية'),
+    array(818, 'SUZ', 'السويس'),
+    array(818, 'BH', 'البحيرة'),
+    array(818, 'GH', 'الغربية'),
+    array(818, 'KFS', 'كفر الشيخ'),
+    array(818, 'DK', 'الدقهلية'),
+    array(818, 'UQ', 'الاقصر'),
+    array(818, 'PTS', 'بور سعيد'),
+    array(818, 'DT', 'دمياط'),
+    array(818, 'KN', 'قنا'),
+    array(818, 'CAI', 'القاهرة'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.  Documentation on address formats
Index: uc_store/countries/france_250_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/france_250_1.cif,v
retrieving revision 1.5.2.1
diff -u -r1.5.2.1 france_250_1.cif
--- uc_store/countries/france_250_1.cif	3 Nov 2008 21:33:50 -0000	1.5.2.1
+++ uc_store/countries/france_250_1.cif	11 Jul 2009 20:49:48 -0000
@@ -5,109 +5,114 @@
   db_query("INSERT INTO {uc_countries} VALUES ('250', 'France', 'FR', 'FRA', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-    ."(250, 'FR-01', 'Ain'),"
-    ."(250, 'FR-02', 'Aisne'),"
-    ."(250, 'FR-03', 'Allier'),"
-    ."(250, 'FR-04', 'Alpes-de-Haute-Provence'),"
-    ."(250, 'FR-05', 'Hautes-Alpes'),"
-    ."(250, 'FR-06', 'Alpes-Maritimes'),"
-    ."(250, 'FR-07', 'Ardèche'),"
-    ."(250, 'FR-08', 'Ardennes'),"
-    ."(250, 'FR-09', 'Ariège'),"
-    ."(250, 'FR-10', 'Aube'),"
-    ."(250, 'FR-11', 'Aude'),"
-    ."(250, 'FR-12', 'Aveyron'),"
-    ."(250, 'FR-13', 'Bouches-du-Rhône'),"
-    ."(250, 'FR-14', 'Calvados'),"
-    ."(250, 'FR-15', 'Cantal'),"
-    ."(250, 'FR-16', 'Charente'),"
-    ."(250, 'FR-17', 'Charente-Maritime'),"
-    ."(250, 'FR-18', 'Cher'),"
-    ."(250, 'FR-19', 'Corrèze'),"
-    ."(250, 'FR-21', 'Côte-d\'Or'),"
-    ."(250, 'FR-22', 'Côtes-d\'Armor'),"
-    ."(250, 'FR-23', 'Creuse'),"
-    ."(250, 'FR-24', 'Dordogne'),"
-    ."(250, 'FR-25', 'Doubs'),"
-    ."(250, 'FR-26', 'Drôme'),"
-    ."(250, 'FR-27', 'Eure'),"
-    ."(250, 'FR-28', 'Eure-et-Loir'),"
-    ."(250, 'FR-29', 'Finistère'),"
-    ."(250, 'FR-2A', 'Corse-du-Sud'),"
-    ."(250, 'FR-2B', 'Haute-Corse'),"
-    ."(250, 'FR-30', 'Gard'),"
-    ."(250, 'FR-31', 'Haute-Garonne'),"
-    ."(250, 'FR-32', 'Gers'),"
-    ."(250, 'FR-33', 'Gironde'),"
-    ."(250, 'FR-34', 'Hérault'),"
-    ."(250, 'FR-35', 'Ille-et-Vilaine'),"
-    ."(250, 'FR-36', 'Indre'),"
-    ."(250, 'FR-37', 'Indre-et-Loire'),"
-    ."(250, 'FR-38', 'Isère'),"
-    ."(250, 'FR-39', 'Jura'),"
-    ."(250, 'FR-40', 'Landes'),"
-    ."(250, 'FR-41', 'Loir-et-Cher'),"
-    ."(250, 'FR-42', 'Loire'),"
-    ."(250, 'FR-43', 'Haute-Loire'),"
-    ."(250, 'FR-44', 'Loire-Atlantique'),"
-    ."(250, 'FR-45', 'Loiret'),"
-    ."(250, 'FR-46', 'Lot'),"
-    ."(250, 'FR-47', 'Lot-et-Garonne'),"
-    ."(250, 'FR-48', 'Lozère'),"
-    ."(250, 'FR-49', 'Maine-et-Loire'),"
-    ."(250, 'FR-50', 'Manche'),"
-    ."(250, 'FR-51', 'Marne'),"
-    ."(250, 'FR-52', 'Haute-Marne'),"
-    ."(250, 'FR-53', 'Mayenne'),"
-    ."(250, 'FR-54', 'Meurthe-et-Moselle'),"
-    ."(250, 'FR-55', 'Meuse'),"
-    ."(250, 'FR-56', 'Morbihan'),"
-    ."(250, 'FR-57', 'Moselle'),"
-    ."(250, 'FR-58', 'Nièvre'),"
-    ."(250, 'FR-59', 'Nord'),"
-    ."(250, 'FR-60', 'Oise'),"
-    ."(250, 'FR-61', 'Orne'),"
-    ."(250, 'FR-62', 'Pas-de-Calais'),"
-    ."(250, 'FR-63', 'Puy-de-Dôme'),"
-    ."(250, 'FR-64', 'Pyrénées-Atlantiques'),"
-    ."(250, 'FR-65', 'Hautes-Pyrénées'),"
-    ."(250, 'FR-66', 'Pyrénées-Orientales'),"
-    ."(250, 'FR-67', 'Bas-Rhin'),"
-    ."(250, 'FR-68', 'Haut-Rhin'),"
-    ."(250, 'FR-69', 'Rhône'),"
-    ."(250, 'FR-70', 'Haute-Saône'),"
-    ."(250, 'FR-71', 'Saône-et-Loire'),"
-    ."(250, 'FR-72', 'Sarthe'),"
-    ."(250, 'FR-73', 'Savoie'),"
-    ."(250, 'FR-74', 'Haute-Savoie'),"
-    ."(250, 'FR-75', 'Paris'),"
-    ."(250, 'FR-76', 'Seine-Maritime'),"
-    ."(250, 'FR-77', 'Seine-et-Marne'),"
-    ."(250, 'FR-78', 'Yvelines'),"
-    ."(250, 'FR-79', 'Deux-Sèvres'),"
-    ."(250, 'FR-80', 'Somme'),"
-    ."(250, 'FR-81', 'Tarn'),"
-    ."(250, 'FR-82', 'Tarn-et-Garonne'),"
-    ."(250, 'FR-83', 'Var'),"
-    ."(250, 'FR-84', 'Vaucluse'),"
-    ."(250, 'FR-85', 'Vendée'),"
-    ."(250, 'FR-86', 'Vienne'),"
-    ."(250, 'FR-87', 'Haute-Vienne'),"
-    ."(250, 'FR-88', 'Vosges'),"
-    ."(250, 'FR-89', 'Yonne'),"
-    ."(250, 'FR-90', 'Territoire de Belfort'),"
-    ."(250, 'FR-91', 'Essonne'),"
-    ."(250, 'FR-92', 'Hauts-de-Seine'),"
-    ."(250, 'FR-93', 'Seine-Saint-Denis'),"
-    ."(250, 'FR-94', 'Val-de-Marne'),"
-    ."(250, 'FR-95', 'Val-d\'Oise'),"
-    ."(250, 'FR-NC', 'New Caledonia'),"
-    ."(250, 'FR-PF', 'French Polynesia'),"
-    ."(250, 'FR-PM', 'Saint-Pierre and Miquelon'),"
-    ."(250, 'FR-TF', 'French Southern Territories'),"
-    ."(250, 'FR-YT', 'Mayotte'),"
-    ."(250, 'FR-WF', 'Wallis and Futuna')");
+  $zones = array(
+    array(250, 'FR-01', 'Ain'),
+    array(250, 'FR-02', 'Aisne'),
+    array(250, 'FR-03', 'Allier'),
+    array(250, 'FR-04', 'Alpes-de-Haute-Provence'),
+    array(250, 'FR-05', 'Hautes-Alpes'),
+    array(250, 'FR-06', 'Alpes-Maritimes'),
+    array(250, 'FR-07', 'Ardèche'),
+    array(250, 'FR-08', 'Ardennes'),
+    array(250, 'FR-09', 'Ariège'),
+    array(250, 'FR-10', 'Aube'),
+    array(250, 'FR-11', 'Aude'),
+    array(250, 'FR-12', 'Aveyron'),
+    array(250, 'FR-13', 'Bouches-du-Rhône'),
+    array(250, 'FR-14', 'Calvados'),
+    array(250, 'FR-15', 'Cantal'),
+    array(250, 'FR-16', 'Charente'),
+    array(250, 'FR-17', 'Charente-Maritime'),
+    array(250, 'FR-18', 'Cher'),
+    array(250, 'FR-19', 'Corrèze'),
+    array(250, 'FR-21', 'Côte-d\'Or'),
+    array(250, 'FR-22', 'Côtes-d\'Armor'),
+    array(250, 'FR-23', 'Creuse'),
+    array(250, 'FR-24', 'Dordogne'),
+    array(250, 'FR-25', 'Doubs'),
+    array(250, 'FR-26', 'Drôme'),
+    array(250, 'FR-27', 'Eure'),
+    array(250, 'FR-28', 'Eure-et-Loir'),
+    array(250, 'FR-29', 'Finistère'),
+    array(250, 'FR-2A', 'Corse-du-Sud'),
+    array(250, 'FR-2B', 'Haute-Corse'),
+    array(250, 'FR-30', 'Gard'),
+    array(250, 'FR-31', 'Haute-Garonne'),
+    array(250, 'FR-32', 'Gers'),
+    array(250, 'FR-33', 'Gironde'),
+    array(250, 'FR-34', 'Hérault'),
+    array(250, 'FR-35', 'Ille-et-Vilaine'),
+    array(250, 'FR-36', 'Indre'),
+    array(250, 'FR-37', 'Indre-et-Loire'),
+    array(250, 'FR-38', 'Isère'),
+    array(250, 'FR-39', 'Jura'),
+    array(250, 'FR-40', 'Landes'),
+    array(250, 'FR-41', 'Loir-et-Cher'),
+    array(250, 'FR-42', 'Loire'),
+    array(250, 'FR-43', 'Haute-Loire'),
+    array(250, 'FR-44', 'Loire-Atlantique'),
+    array(250, 'FR-45', 'Loiret'),
+    array(250, 'FR-46', 'Lot'),
+    array(250, 'FR-47', 'Lot-et-Garonne'),
+    array(250, 'FR-48', 'Lozère'),
+    array(250, 'FR-49', 'Maine-et-Loire'),
+    array(250, 'FR-50', 'Manche'),
+    array(250, 'FR-51', 'Marne'),
+    array(250, 'FR-52', 'Haute-Marne'),
+    array(250, 'FR-53', 'Mayenne'),
+    array(250, 'FR-54', 'Meurthe-et-Moselle'),
+    array(250, 'FR-55', 'Meuse'),
+    array(250, 'FR-56', 'Morbihan'),
+    array(250, 'FR-57', 'Moselle'),
+    array(250, 'FR-58', 'Nièvre'),
+    array(250, 'FR-59', 'Nord'),
+    array(250, 'FR-60', 'Oise'),
+    array(250, 'FR-61', 'Orne'),
+    array(250, 'FR-62', 'Pas-de-Calais'),
+    array(250, 'FR-63', 'Puy-de-Dôme'),
+    array(250, 'FR-64', 'Pyrénées-Atlantiques'),
+    array(250, 'FR-65', 'Hautes-Pyrénées'),
+    array(250, 'FR-66', 'Pyrénées-Orientales'),
+    array(250, 'FR-67', 'Bas-Rhin'),
+    array(250, 'FR-68', 'Haut-Rhin'),
+    array(250, 'FR-69', 'Rhône'),
+    array(250, 'FR-70', 'Haute-Saône'),
+    array(250, 'FR-71', 'Saône-et-Loire'),
+    array(250, 'FR-72', 'Sarthe'),
+    array(250, 'FR-73', 'Savoie'),
+    array(250, 'FR-74', 'Haute-Savoie'),
+    array(250, 'FR-75', 'Paris'),
+    array(250, 'FR-76', 'Seine-Maritime'),
+    array(250, 'FR-77', 'Seine-et-Marne'),
+    array(250, 'FR-78', 'Yvelines'),
+    array(250, 'FR-79', 'Deux-Sèvres'),
+    array(250, 'FR-80', 'Somme'),
+    array(250, 'FR-81', 'Tarn'),
+    array(250, 'FR-82', 'Tarn-et-Garonne'),
+    array(250, 'FR-83', 'Var'),
+    array(250, 'FR-84', 'Vaucluse'),
+    array(250, 'FR-85', 'Vendée'),
+    array(250, 'FR-86', 'Vienne'),
+    array(250, 'FR-87', 'Haute-Vienne'),
+    array(250, 'FR-88', 'Vosges'),
+    array(250, 'FR-89', 'Yonne'),
+    array(250, 'FR-90', 'Territoire de Belfort'),
+    array(250, 'FR-91', 'Essonne'),
+    array(250, 'FR-92', 'Hauts-de-Seine'),
+    array(250, 'FR-93', 'Seine-Saint-Denis'),
+    array(250, 'FR-94', 'Val-de-Marne'),
+    array(250, 'FR-95', 'Val-d\'Oise'),
+    array(250, 'FR-NC', 'New Caledonia'),
+    array(250, 'FR-PF', 'French Polynesia'),
+    array(250, 'FR-PM', 'Saint-Pierre and Miquelon'),
+    array(250, 'FR-TF', 'French Southern Territories'),
+    array(250, 'FR-YT', 'Mayotte'),
+    array(250, 'FR-WF', 'Wallis and Futuna'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   uc_set_address_format(250, "!company\n!first_name !last_name\n!street1\n!street2\n!postal_code !city\n!country_name_if");
 }
Index: uc_store/countries/germany_276_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/germany_276_1.cif,v
retrieving revision 1.4.4.1
diff -u -r1.4.4.1 germany_276_1.cif
--- uc_store/countries/germany_276_1.cif	3 Nov 2008 21:33:50 -0000	1.4.4.1
+++ uc_store/countries/germany_276_1.cif	11 Jul 2009 20:49:48 -0000
@@ -5,23 +5,28 @@
   db_query("INSERT INTO {uc_countries} VALUES ('276', 'Germany', 'DE', 'DEU', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(276, 'BAW', 'Baden-Württemberg'),"
-          ."(276, 'BAY', 'Bayern'),"
-          ."(276, 'BER', 'Berlin'),"
-          ."(276, 'BRG', 'Brandenburg'),"
-          ."(276, 'BRE', 'Bremen'),"
-          ."(276, 'HAM', 'Hamburg'),"
-          ."(276, 'HES', 'Hessen'),"
-          ."(276, 'MEC', 'Mecklenburg-Vorpommern'),"
-          ."(276, 'NDS', 'Niedersachsen'),"
-          ."(276, 'NRW', 'Nordrhein-Westfalen'),"
-          ."(276, 'RHE', 'Rheinland-Pfalz'),"
-          ."(276, 'SAR', 'Saarland'),"
-          ."(276, 'SAS', 'Sachsen'),"
-          ."(276, 'SAC', 'Sachsen-Anhalt'),"
-          ."(276, 'SCN', 'Schleswig-Holstein'),"
-          ."(276, 'THE', 'Thüringen')");
+  $zones = array(
+    array(276, 'BAW', 'Baden-Württemberg'),
+    array(276, 'BAY', 'Bayern'),
+    array(276, 'BER', 'Berlin'),
+    array(276, 'BRG', 'Brandenburg'),
+    array(276, 'BRE', 'Bremen'),
+    array(276, 'HAM', 'Hamburg'),
+    array(276, 'HES', 'Hessen'),
+    array(276, 'MEC', 'Mecklenburg-Vorpommern'),
+    array(276, 'NDS', 'Niedersachsen'),
+    array(276, 'NRW', 'Nordrhein-Westfalen'),
+    array(276, 'RHE', 'Rheinland-Pfalz'),
+    array(276, 'SAR', 'Saarland'),
+    array(276, 'SAS', 'Sachsen'),
+    array(276, 'SAC', 'Sachsen-Anhalt'),
+    array(276, 'SCN', 'Schleswig-Holstein'),
+    array(276, 'THE', 'Thüringen'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   uc_set_address_format(276, "!company\n!first_name !last_name\n!street1\n!street2\n!postal_code !city\n!country_name_if");
 }
Index: uc_store/countries/greece_300_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/greece_300_1.cif,v
retrieving revision 1.2.2.4
diff -u -r1.2.2.4 greece_300_1.cif
--- uc_store/countries/greece_300_1.cif	3 Nov 2008 21:33:50 -0000	1.2.2.4
+++ uc_store/countries/greece_300_1.cif	11 Jul 2009 20:49:48 -0000
@@ -11,58 +11,63 @@
   db_query("INSERT INTO {uc_countries} VALUES (300, 'Ελλάδα', 'GR', 'GRC', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-      ."(300, 'ATT', 'Αττική'),"
-      ."(300, 'AIT', 'Αιτωλοακαρνανία'),"
-      ."(300, 'ARG', 'Αργολίδα'),"
-      ."(300, 'ARK', 'Αρκαδία'),"
-      ."(300, 'ART', 'Άρτα'),"
-      ."(300, 'AHA', 'Αχαϊα'),"
-      ."(300, 'BOI', 'Βοιωτία'),"
-      ."(300, 'GRE', 'Γρεβενά'),"
-      ."(300, 'DRA', 'Δράμα'),"
-      ."(300, 'DOD', 'Δωδεκάνησα'),"
-      ."(300, 'EVR', 'Έβρος'),"
-      ."(300, 'EVI', 'Εύβοια'),"
-      ."(300, 'EVT', 'Ευρυτανία'),"
-      ."(300, 'ZAK', 'Ζάκυνθος'),"
-      ."(300, 'ILI', 'Ηλεία'),"
-      ."(300, 'HMA', 'Ημαθία'),"
-      ."(300, 'HRA', 'Ηράκλειο'),"
-      ."(300, 'THP', 'Θεσπρωτία'),"
-      ."(300, 'THE', 'Θεσσαλονίκη'),"
-      ."(300, 'IOA', 'Ιωάννινα'),"
-      ."(300, 'KAV', 'Καβάλα'),"
-      ."(300, 'KAR', 'Καρδίτσα'),"
-      ."(300, 'KAS', 'Καστοριά'),"
-      ."(300, 'KER', 'Κέρκυρα'),"
-      ."(300, 'KEF', 'Κεφαλληνία'),"
-      ."(300, 'KIL', 'Κιλκίς'),"
-      ."(300, 'KOZ', 'Κοζάνη'),"
-      ."(300, 'KOR', 'Κορινθία'),"
-      ."(300, 'KYK', 'Κυκλάδες'),"
-      ."(300, 'LAK', 'Λακωνία'),"
-      ."(300, 'LAR', 'Λάρισα'),"
-      ."(300, 'LAS', 'Λασίθι'),"
-      ."(300, 'LES', 'Λέσβος'),"
-      ."(300, 'LEF', 'Λευκάδα'),"
-      ."(300, 'MAG', 'Μαγνησία'),"
-      ."(300, 'ΜES', 'Μεσσηνία'),"
-      ."(300, 'XAN', 'Ξάνθη'),"
-      ."(300, 'PEL', 'Πέλλα'),"
-      ."(300, 'PIE', 'Πιερία'),"
-      ."(300, 'PRE', 'Πρέβεζα'),"
-      ."(300, 'RET', 'Ρέθυμνο'),"
-      ."(300, 'ROD', 'Ροδόπη'),"
-      ."(300, 'SAM', 'Σάμος'),"
-      ."(300, 'SER', 'Σέρρες'),"
-      ."(300, 'TRI', 'Τρίκαλα'),"
-      ."(300, 'FTH', 'Φθιώτιδα'),"
-      ."(300, 'FLO', 'Φλώρινα'),"
-      ."(300, 'FOK', 'Φωκίδα'),"
-      ."(300, 'HAL', 'Χαλκιδική'),"
-      ."(300, 'HAN', 'Χανιά'),"
-      ."(300, 'HIO', 'Χίος')");
+  $zones = array(
+    array(300, 'ATT', 'Αττική'),
+    array(300, 'AIT', 'Αιτωλοακαρνανία'),
+    array(300, 'ARG', 'Αργολίδα'),
+    array(300, 'ARK', 'Αρκαδία'),
+    array(300, 'ART', 'Άρτα'),
+    array(300, 'AHA', 'Αχαϊα'),
+    array(300, 'BOI', 'Βοιωτία'),
+    array(300, 'GRE', 'Γρεβενά'),
+    array(300, 'DRA', 'Δράμα'),
+    array(300, 'DOD', 'Δωδεκάνησα'),
+    array(300, 'EVR', 'Έβρος'),
+    array(300, 'EVI', 'Εύβοια'),
+    array(300, 'EVT', 'Ευρυτανία'),
+    array(300, 'ZAK', 'Ζάκυνθος'),
+    array(300, 'ILI', 'Ηλεία'),
+    array(300, 'HMA', 'Ημαθία'),
+    array(300, 'HRA', 'Ηράκλειο'),
+    array(300, 'THP', 'Θεσπρωτία'),
+    array(300, 'THE', 'Θεσσαλονίκη'),
+    array(300, 'IOA', 'Ιωάννινα'),
+    array(300, 'KAV', 'Καβάλα'),
+    array(300, 'KAR', 'Καρδίτσα'),
+    array(300, 'KAS', 'Καστοριά'),
+    array(300, 'KER', 'Κέρκυρα'),
+    array(300, 'KEF', 'Κεφαλληνία'),
+    array(300, 'KIL', 'Κιλκίς'),
+    array(300, 'KOZ', 'Κοζάνη'),
+    array(300, 'KOR', 'Κορινθία'),
+    array(300, 'KYK', 'Κυκλάδες'),
+    array(300, 'LAK', 'Λακωνία'),
+    array(300, 'LAR', 'Λάρισα'),
+    array(300, 'LAS', 'Λασίθι'),
+    array(300, 'LES', 'Λέσβος'),
+    array(300, 'LEF', 'Λευκάδα'),
+    array(300, 'MAG', 'Μαγνησία'),
+    array(300, 'ΜES', 'Μεσσηνία'),
+    array(300, 'XAN', 'Ξάνθη'),
+    array(300, 'PEL', 'Πέλλα'),
+    array(300, 'PIE', 'Πιερία'),
+    array(300, 'PRE', 'Πρέβεζα'),
+    array(300, 'RET', 'Ρέθυμνο'),
+    array(300, 'ROD', 'Ροδόπη'),
+    array(300, 'SAM', 'Σάμος'),
+    array(300, 'SER', 'Σέρρες'),
+    array(300, 'TRI', 'Τρίκαλα'),
+    array(300, 'FTH', 'Φθιώτιδα'),
+    array(300, 'FLO', 'Φλώρινα'),
+    array(300, 'FOK', 'Φωκίδα'),
+    array(300, 'HAL', 'Χαλκιδική'),
+    array(300, 'HAN', 'Χανιά'),
+    array(300, 'HIO', 'Χίος'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.
Index: uc_store/countries/greenland_304_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/Attic/greenland_304_1.cif,v
retrieving revision 1.1.4.3
diff -u -r1.1.4.3 greenland_304_1.cif
--- uc_store/countries/greenland_304_1.cif	7 Nov 2008 21:13:24 -0000	1.1.4.3
+++ uc_store/countries/greenland_304_1.cif	11 Jul 2009 20:49:48 -0000
@@ -14,39 +14,44 @@
   // function uc_get_zone_ids($num) as the second argument for db_query() where
   // $num is the number of zones in the INSERT query.
   // VALUES = %d for ID, Parent Country ID, Zone Abbreviation, Zone Name
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(304, 'NK', 'Nuuk'),"
-          ."(304, 'NQ', 'Nuussuaq'),"
-          ."(304, 'KQ', 'Kangerlussuaq'),"
-          ."(304, 'ST', 'Sisimiut'),"
-          ."(304, 'MQ', 'Maniitsoq'),"
-          ."(304, 'TQ', 'Tasiilaq'),"
-          ."(304, 'KK', 'Kulusuk'),"
-          ."(304, 'AP', 'Alluitsup Paa'),"
-          ."(304, 'QQ', 'Qaqortoq'),"
-          ."(304, 'NA', 'Narsaq'),"
-          ."(304, 'NK', 'Nanortalik'),"
-          ."(304, 'NR', 'Narsarsuaq'),"
-          ."(304, 'IQ', 'Ikerasassuaq'),"
-          ."(304, 'KT', 'Kangilinnguit'),"
-          ."(304, 'AK', 'Arsuk'),"
-          ."(304, 'PT', 'Paamiut'),"
-          ."(304, 'AT', 'Aasiaat'),"
-          ."(304, 'QT', 'Qasigiannguit'),"
-          ."(304, 'IL', 'Ilulissat'),"
-          ."(304, 'QE', 'Qeqertarsuaq'),"
-          ."(304, 'KA', 'Kangaatsiaq'),"
-          ."(304, 'UM', 'Uummannaq'),"
-          ."(304, 'UP', 'Upernavik'),"
-          ."(304, 'QA', 'Qaarsut'),"
-          ."(304, 'PT', 'Pituffik'),"
-          ."(304, 'QN', 'Qaanaaq'),"
-          ."(304, 'SN', 'Station Nord'),"
-          ."(304, 'IT', 'Ittoqqortoormiit'),"
-          ."(304, 'MV', 'Mestersvig'),"
-          ."(304, 'DH', 'Danmarkshavn'),"
-          ."(304, 'CP', 'Constable Pynt'),"
-          ."(304, 'SS', 'Slædepatruljen Sirius');");
+  $zones = array(
+    array(304, 'NK', 'Nuuk'),
+    array(304, 'NQ', 'Nuussuaq'),
+    array(304, 'KQ', 'Kangerlussuaq'),
+    array(304, 'ST', 'Sisimiut'),
+    array(304, 'MQ', 'Maniitsoq'),
+    array(304, 'TQ', 'Tasiilaq'),
+    array(304, 'KK', 'Kulusuk'),
+    array(304, 'AP', 'Alluitsup Paa'),
+    array(304, 'QQ', 'Qaqortoq'),
+    array(304, 'NA', 'Narsaq'),
+    array(304, 'NK', 'Nanortalik'),
+    array(304, 'NR', 'Narsarsuaq'),
+    array(304, 'IQ', 'Ikerasassuaq'),
+    array(304, 'KT', 'Kangilinnguit'),
+    array(304, 'AK', 'Arsuk'),
+    array(304, 'PT', 'Paamiut'),
+    array(304, 'AT', 'Aasiaat'),
+    array(304, 'QT', 'Qasigiannguit'),
+    array(304, 'IL', 'Ilulissat'),
+    array(304, 'QE', 'Qeqertarsuaq'),
+    array(304, 'KA', 'Kangaatsiaq'),
+    array(304, 'UM', 'Uummannaq'),
+    array(304, 'UP', 'Upernavik'),
+    array(304, 'QA', 'Qaarsut'),
+    array(304, 'PT', 'Pituffik'),
+    array(304, 'QN', 'Qaanaaq'),
+    array(304, 'SN', 'Station Nord'),
+    array(304, 'IT', 'Ittoqqortoormiit'),
+    array(304, 'MV', 'Mestersvig'),
+    array(304, 'DH', 'Danmarkshavn'),
+    array(304, 'CP', 'Constable Pynt'),
+    array(304, 'SS', 'Slædepatruljen Sirius'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.  Documentation on address formats
Index: uc_store/countries/hong_kong_344_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/hong_kong_344_1.cif,v
retrieving revision 1.2.2.4
diff -u -r1.2.2.4 hong_kong_344_1.cif
--- uc_store/countries/hong_kong_344_1.cif	3 Nov 2008 21:33:50 -0000	1.2.2.4
+++ uc_store/countries/hong_kong_344_1.cif	11 Jul 2009 20:49:48 -0000
@@ -5,9 +5,14 @@
   db_query("INSERT INTO {uc_countries} VALUES (344, 'Hong Kong', 'HK', 'HKG', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(344, 'HK', 'Hong Kong'),"
-          ."(344, 'NT', 'New Territories')");
+  $zones = array(
+    array(344, 'HK', 'Hong Kong'),
+    array(344, 'NT', 'New Territories'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   uc_set_address_format(344,
     "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
Index: uc_store/countries/hungary_348_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/hungary_348_1.cif,v
retrieving revision 1.2.2.4
diff -u -r1.2.2.4 hungary_348_1.cif
--- uc_store/countries/hungary_348_1.cif	3 Nov 2008 21:33:50 -0000	1.2.2.4
+++ uc_store/countries/hungary_348_1.cif	11 Jul 2009 20:49:48 -0000
@@ -9,27 +9,32 @@
   db_query("INSERT INTO {uc_countries} VALUES (348, 'Hungary', 'HU', 'HUN', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(348, 'BUD', 'Budapest'),"
-          ."(348, 'BAR', 'Baranya'),"
-          ."(348, 'BKK', 'Bács-Kiskun'),"
-          ."(348, 'BÉK', 'Békés'),"
-          ."(348, 'BAZ', 'Borsod-Abaúj-Zemplén'),"
-          ."(348, 'CSO', 'Csongrád'),"
-          ."(348, 'FEJ', 'Fejér'),"
-          ."(348, 'GYS', 'Gyõr-Sopron'),"
-          ."(348, 'HAB', 'Hajdú-Bihar'),"
-          ."(348, 'HEV', 'Heves'),"
-          ."(348, 'JNS', 'Jász-Nagykun-Szolnok'),"
-          ."(348, 'KOE', 'Komárom-Esztergom'),"
-          ."(348, 'NOG', 'Nógrád'),"
-          ."(348, 'PES', 'Pest'),"
-          ."(348, 'SOM', 'Somogy'),"
-          ."(348, 'SSB', 'Szabolcs-Szatmár-Bereg'),"
-          ."(348, 'TOL', 'Tolna'),"
-          ."(348, 'VAS', 'Vas'),"
-          ."(348, 'VES', 'Veszprém'),"
-          ."(348, 'ZAL', 'Zala')");
+  $zones = array(
+    array(348, 'BUD', 'Budapest'),
+    array(348, 'BAR', 'Baranya'),
+    array(348, 'BKK', 'Bács-Kiskun'),
+    array(348, 'BÉK', 'Békés'),
+    array(348, 'BAZ', 'Borsod-Abaúj-Zemplén'),
+    array(348, 'CSO', 'Csongrád'),
+    array(348, 'FEJ', 'Fejér'),
+    array(348, 'GYS', 'Gyõr-Sopron'),
+    array(348, 'HAB', 'Hajdú-Bihar'),
+    array(348, 'HEV', 'Heves'),
+    array(348, 'JNS', 'Jász-Nagykun-Szolnok'),
+    array(348, 'KOE', 'Komárom-Esztergom'),
+    array(348, 'NOG', 'Nógrád'),
+    array(348, 'PES', 'Pest'),
+    array(348, 'SOM', 'Somogy'),
+    array(348, 'SSB', 'Szabolcs-Szatmár-Bereg'),
+    array(348, 'TOL', 'Tolna'),
+    array(348, 'VAS', 'Vas'),
+    array(348, 'VES', 'Veszprém'),
+    array(348, 'ZAL', 'Zala'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   uc_set_address_format(348,
     "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
Index: uc_store/countries/india_356_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/india_356_1.cif,v
retrieving revision 1.2.2.4
diff -u -r1.2.2.4 india_356_1.cif
--- uc_store/countries/india_356_1.cif	3 Nov 2008 21:33:50 -0000	1.2.2.4
+++ uc_store/countries/india_356_1.cif	11 Jul 2009 20:49:48 -0000
@@ -11,40 +11,45 @@
   db_query("INSERT INTO {uc_countries} VALUES ('356', 'India', 'IN', 'IND', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-      ."(356, 'AP', 'Andhra Pradesh'),"
-      ."(356, 'AR', 'Arunachal Pradesh'),"
-      ."(356, 'AS', 'Assam'),"
-      ."(356, 'BR', 'Bihar'),"
-      ."(356, 'CG', 'Chattisgarh'),"
-      ."(356, 'GA', 'Goa'),"
-      ."(356, 'GJ', 'Gujarat'),"
-      ."(356, 'HR', 'Haryana'),"
-      ."(356, 'HP', 'Himachal Pradesh'),"
-      ."(356, 'JK', 'Jammu & Kashmir'),"
-      ."(356, 'JH', 'Jharkhand'),"
-      ."(356, 'KA', 'Karnataka'),"
-      ."(356, 'KL', 'Kerala'),"
-      ."(356, 'MP', 'Madhya Pradesh'),"
-      ."(356, 'MH', 'Maharashtra'),"
-      ."(356, 'MN', 'Manipur'),"
-      ."(356, 'ML', 'Meghalaya'),"
-      ."(356, 'MZ', 'Mizoram'),"
-      ."(356, 'NL', 'Nagaland'),"
-      ."(356, 'OR', 'Orissa'),"
-      ."(356, 'PB', 'Punjab'),"
-      ."(356, 'RJ', 'Rajasthan'),"
-      ."(356, 'SK', 'Sikkim'),"
-      ."(356, 'TN', 'Tamil Nadu'),"
-      ."(356, 'TR', 'Tripura'),"
-      ."(356, 'UA', 'Uttarakhand'),"
-      ."(356, 'UP', 'Uttar Pradesh'),"
-      ."(356, 'WB', 'West Bengal'),"
-      ."(356, 'AN', 'Andaman & Nicobar'),"
-      ."(356, 'CH', 'Chandigarh'),"
-      ."(356, 'DN', 'Dadra and Nagar Haveli'),"
-      ."(356, 'DD', 'Daman & Diu'),"
-      ."(356, 'DL', 'Delhi')");
+  $zones = array(
+    array(356, 'AP', 'Andhra Pradesh'),
+    array(356, 'AR', 'Arunachal Pradesh'),
+    array(356, 'AS', 'Assam'),
+    array(356, 'BR', 'Bihar'),
+    array(356, 'CG', 'Chattisgarh'),
+    array(356, 'GA', 'Goa'),
+    array(356, 'GJ', 'Gujarat'),
+    array(356, 'HR', 'Haryana'),
+    array(356, 'HP', 'Himachal Pradesh'),
+    array(356, 'JK', 'Jammu & Kashmir'),
+    array(356, 'JH', 'Jharkhand'),
+    array(356, 'KA', 'Karnataka'),
+    array(356, 'KL', 'Kerala'),
+    array(356, 'MP', 'Madhya Pradesh'),
+    array(356, 'MH', 'Maharashtra'),
+    array(356, 'MN', 'Manipur'),
+    array(356, 'ML', 'Meghalaya'),
+    array(356, 'MZ', 'Mizoram'),
+    array(356, 'NL', 'Nagaland'),
+    array(356, 'OR', 'Orissa'),
+    array(356, 'PB', 'Punjab'),
+    array(356, 'RJ', 'Rajasthan'),
+    array(356, 'SK', 'Sikkim'),
+    array(356, 'TN', 'Tamil Nadu'),
+    array(356, 'TR', 'Tripura'),
+    array(356, 'UA', 'Uttarakhand'),
+    array(356, 'UP', 'Uttar Pradesh'),
+    array(356, 'WB', 'West Bengal'),
+    array(356, 'AN', 'Andaman & Nicobar'),
+    array(356, 'CH', 'Chandigarh'),
+    array(356, 'DN', 'Dadra and Nagar Haveli'),
+    array(356, 'DD', 'Daman & Diu'),
+    array(356, 'DL', 'Delhi'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.  Documentation on address formats
Index: uc_store/countries/indonesia_360_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/indonesia_360_1.cif,v
retrieving revision 1.2.2.4
diff -u -r1.2.2.4 indonesia_360_1.cif
--- uc_store/countries/indonesia_360_1.cif	3 Nov 2008 21:33:50 -0000	1.2.2.4
+++ uc_store/countries/indonesia_360_1.cif	11 Jul 2009 20:49:48 -0000
@@ -5,40 +5,45 @@
   db_query("INSERT INTO {uc_countries} VALUES (360, 'Indonesia', 'ID', 'IDN', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(360,'NAD','Nanggroe Aceh Darussalam'),"
-          ."(360,'Sumut','Sumatera Utara'),"
-          ."(360,'Sumbar','Sumatera Barat'),"
-          ."(360,'Riau','Riau'),"
-          ."(360,'Jambi','Jambi'),"
-          ."(360,'Sumsel','Sumatera Selatan'),"
-          ."(360,'Bengkulu','Bengkulu'),"
-          ."(360,'Lampung','Lampung'),"
-          ."(360,'Babel','Kepulauan Bangka Belitung'),"
-          ."(360,'Kepri','Kepulauan Riau'),"
-          ."(360,'DKI','DKI Jakarta'),"
-          ."(360,'Jabar','Jawa Barat'),"
-          ."(360,'Jateng','Jawa Tengah'),"
-          ."(360,'DIY','Daista Yogyakarta'),"
-          ."(360,'Jatim','Jawa Timur'),"
-          ."(360,'Banten','Banten'),"
-          ."(360,'Bali','Bali'),"
-          ."(360,'NTB','Nusa Tenggara Barat'),"
-          ."(360,'NTT','Nusa Tenggara Timur'),"
-          ."(360,'Kalbar','Kalimantan Barat'),"
-          ."(360,'Kalteng','Kalimantan Tengah'),"
-          ."(360,'Kalsel','Kalimantan Selatan'),"
-          ."(360,'Kaltim','Kalimantan Timur'),"
-          ."(360,'Sulut','Sulawesi Utara'),"
-          ."(360,'Sulteng','Sulawesi Tengah'),"
-          ."(360,'Sulsel','Sulawesi Selatan'),"
-          ."(360,'Sultra','Sulawesi Tenggara'),"
-          ."(360,'Gorontalo','Gorontalo'),"
-          ."(360,'Sulbar','Sulawesi Barat'),"
-          ."(360,'Maluku','Maluku'),"
-          ."(360,'Malut','Maluku Utara'),"
-          ."(360,'Papua','Papua'),"
-          ."(360,'Irjabar','Irian Jaya Barat')");
+  $zones = array(
+    array(360,'NAD','Nanggroe Aceh Darussalam'),
+    array(360,'Sumut','Sumatera Utara'),
+    array(360,'Sumbar','Sumatera Barat'),
+    array(360,'Riau','Riau'),
+    array(360,'Jambi','Jambi'),
+    array(360,'Sumsel','Sumatera Selatan'),
+    array(360,'Bengkulu','Bengkulu'),
+    array(360,'Lampung','Lampung'),
+    array(360,'Babel','Kepulauan Bangka Belitung'),
+    array(360,'Kepri','Kepulauan Riau'),
+    array(360,'DKI','DKI Jakarta'),
+    array(360,'Jabar','Jawa Barat'),
+    array(360,'Jateng','Jawa Tengah'),
+    array(360,'DIY','Daista Yogyakarta'),
+    array(360,'Jatim','Jawa Timur'),
+    array(360,'Banten','Banten'),
+    array(360,'Bali','Bali'),
+    array(360,'NTB','Nusa Tenggara Barat'),
+    array(360,'NTT','Nusa Tenggara Timur'),
+    array(360,'Kalbar','Kalimantan Barat'),
+    array(360,'Kalteng','Kalimantan Tengah'),
+    array(360,'Kalsel','Kalimantan Selatan'),
+    array(360,'Kaltim','Kalimantan Timur'),
+    array(360,'Sulut','Sulawesi Utara'),
+    array(360,'Sulteng','Sulawesi Tengah'),
+    array(360,'Sulsel','Sulawesi Selatan'),
+    array(360,'Sultra','Sulawesi Tenggara'),
+    array(360,'Gorontalo','Gorontalo'),
+    array(360,'Sulbar','Sulawesi Barat'),
+    array(360,'Maluku','Maluku'),
+    array(360,'Malut','Maluku Utara'),
+    array(360,'Papua','Papua'),
+    array(360,'Irjabar','Irian Jaya Barat'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   variable_set('uc_address_format_360',
                "!company\n!first_name !last_name\n!street1\n!street2\n!city !postal_code \n!country_name_if");
Index: uc_store/countries/iran_364_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/iran_364_1.cif,v
retrieving revision 1.3.4.1
diff -u -r1.3.4.1 iran_364_1.cif
--- uc_store/countries/iran_364_1.cif	3 Nov 2008 21:33:50 -0000	1.3.4.1
+++ uc_store/countries/iran_364_1.cif	11 Jul 2009 20:49:48 -0000
@@ -8,37 +8,42 @@
   db_query("INSERT INTO {uc_countries} VALUES (364, 'ایران', 'IR', 'IRI', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(364,'AS','آذربایجان شرقی'),"
-          ."(364,'AG','آذربایجان غربی'),"
-          ."(364,'AR','اردبیل'),"
-          ."(364,'ES','اصفهان'),"
-          ."(364,'IL','ایلام'),"
-          ."(364,'BU','بوشهر'),"
-          ."(364,'TH','تهران'),"
-          ."(364,'CB','چهار محال بختیاری'),"
-          ."(364,'KH','خراسان جنوبی'),"
-          ."(364,'KH','خراسان رضوی'),"
-          ."(364,'KH','خراسان شمالی'),"
-          ."(364,'KZ','خوزستان'),"
-          ."(364,'ZN','زنجان'),"
-          ."(364,'SB','سیستان و بلوچستان'),"
-          ."(364,'SM','سمنان'),"
-          ."(364,'FR','فارس'),"
-          ."(364,'QZ','قزوین'),"
-          ."(364,'QM','قم'),"
-          ."(364,'KD','کردستان'),"
-          ."(364,'KR','کرمان'),"
-          ."(364,'KS','کرمانشاه'),"
-          ."(364,'KB','کهگیلویه و بویر احمد'),"
-          ."(364,'GL','گیلان'),"
-          ."(364,'GS','گلستان'),"
-          ."(364,'LR','لرستان'),"
-          ."(364,'MZ','مازندران'),"
-          ."(364,'MR','مرکزی'),"
-          ."(364,'HR','هرمزگان'),"
-          ."(364,'HM','همدان'),"
-          ."(364,'YZ','یزد')");
+  $zones = array(
+    array(364,'AS','آذربایجان شرقی'),
+    array(364,'AG','آذربایجان غربی'),
+    array(364,'AR','اردبیل'),
+    array(364,'ES','اصفهان'),
+    array(364,'IL','ایلام'),
+    array(364,'BU','بوشهر'),
+    array(364,'TH','تهران'),
+    array(364,'CB','چهار محال بختیاری'),
+    array(364,'KH','خراسان جنوبی'),
+    array(364,'KH','خراسان رضوی'),
+    array(364,'KH','خراسان شمالی'),
+    array(364,'KZ','خوزستان'),
+    array(364,'ZN','زنجان'),
+    array(364,'SB','سیستان و بلوچستان'),
+    array(364,'SM','سمنان'),
+    array(364,'FR','فارس'),
+    array(364,'QZ','قزوین'),
+    array(364,'QM','قم'),
+    array(364,'KD','کردستان'),
+    array(364,'KR','کرمان'),
+    array(364,'KS','کرمانشاه'),
+    array(364,'KB','کهگیلویه و بویر احمد'),
+    array(364,'GL','گیلان'),
+    array(364,'GS','گلستان'),
+    array(364,'LR','لرستان'),
+    array(364,'MZ','مازندران'),
+    array(364,'MR','مرکزی'),
+    array(364,'HR','هرمزگان'),
+    array(364,'HM','همدان'),
+    array(364,'YZ','یزد'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   uc_set_address_format(364,
     "!first_name !last_name\r\n"
Index: uc_store/countries/ireland_372_2.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/Attic/ireland_372_2.cif,v
retrieving revision 1.1.2.6
diff -u -r1.1.2.6 ireland_372_2.cif
--- uc_store/countries/ireland_372_2.cif	29 Apr 2009 12:32:49 -0000	1.1.2.6
+++ uc_store/countries/ireland_372_2.cif	11 Jul 2009 20:49:48 -0000
@@ -11,33 +11,38 @@
   db_query("INSERT INTO {uc_countries} VALUES ('372', 'Ireland', 'IE', 'IRL', 2)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(372, 'CARLOW', 'Co. Carlow'),"
-          ."(372, 'CAVAN', 'Co. Cavan'),"
-          ."(372, 'CLARE', 'Co. Clare'),"
-          ."(372, 'CORK', 'Co. Cork'),"
-          ."(372, 'DONEGAL', 'Co. Donegal'),"
-          ."(372, 'DUBLIN', 'Co. Dublin'),"
-          ."(372, 'GALWAY', 'Co. Galway'),"
-          ."(372, 'KERRY', 'Co. Kerry'),"
-          ."(372, 'KILDARE', 'Co. Kildare'),"
-          ."(372, 'KILKENNY', 'Co. Kilkenny'),"
-          ."(372, 'LAOIS', 'Co. Laois'),"
-          ."(372, 'LEITRIM', 'Co. Leitrim'),"
-          ."(372, 'LIMERICK', 'Co. Limerick'),"
-          ."(372, 'LONGFORD', 'Co. Longford'),"
-          ."(372, 'LOUTH', 'Co. Louth'),"
-          ."(372, 'MAYO', 'Co. Mayo'),"
-          ."(372, 'MEATH', 'Co. Meath'),"
-          ."(372, 'MONAGHAN', 'Co. Monaghan'),"
-          ."(372, 'OFFALY', 'Co. Offaly'),"
-          ."(372, 'ROSCOMMON', 'Co. Roscommon'),"
-          ."(372, 'SLIGO', 'Co. Sligo'),"
-          ."(372, 'TIPPERARY', 'Co. Tipperary'),"
-          ."(372, 'WATERFORD', 'Co. Waterford'),"
-          ."(372, 'WESTMEATH', 'Co. Westmeath'),"
-          ."(372, 'WEXFORD', 'Co. Wexford'),"
-          ."(372, 'WICKLOW', 'Co. Wicklow')");
+  $zones = array(
+    array(372, 'CARLOW', 'Co. Carlow'),
+    array(372, 'CAVAN', 'Co. Cavan'),
+    array(372, 'CLARE', 'Co. Clare'),
+    array(372, 'CORK', 'Co. Cork'),
+    array(372, 'DONEGAL', 'Co. Donegal'),
+    array(372, 'DUBLIN', 'Co. Dublin'),
+    array(372, 'GALWAY', 'Co. Galway'),
+    array(372, 'KERRY', 'Co. Kerry'),
+    array(372, 'KILDARE', 'Co. Kildare'),
+    array(372, 'KILKENNY', 'Co. Kilkenny'),
+    array(372, 'LAOIS', 'Co. Laois'),
+    array(372, 'LEITRIM', 'Co. Leitrim'),
+    array(372, 'LIMERICK', 'Co. Limerick'),
+    array(372, 'LONGFORD', 'Co. Longford'),
+    array(372, 'LOUTH', 'Co. Louth'),
+    array(372, 'MAYO', 'Co. Mayo'),
+    array(372, 'MEATH', 'Co. Meath'),
+    array(372, 'MONAGHAN', 'Co. Monaghan'),
+    array(372, 'OFFALY', 'Co. Offaly'),
+    array(372, 'ROSCOMMON', 'Co. Roscommon'),
+    array(372, 'SLIGO', 'Co. Sligo'),
+    array(372, 'TIPPERARY', 'Co. Tipperary'),
+    array(372, 'WATERFORD', 'Co. Waterford'),
+    array(372, 'WESTMEATH', 'Co. Westmeath'),
+    array(372, 'WEXFORD', 'Co. Wexford'),
+    array(372, 'WICKLOW', 'Co. Wicklow'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   uc_set_address_format(372,
     "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
Index: uc_store/countries/israel_376_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/israel_376_1.cif,v
retrieving revision 1.2.2.4
diff -u -r1.2.2.4 israel_376_1.cif
--- uc_store/countries/israel_376_1.cif	3 Nov 2008 21:33:50 -0000	1.2.2.4
+++ uc_store/countries/israel_376_1.cif	11 Jul 2009 20:49:48 -0000
@@ -11,18 +11,23 @@
   db_query("INSERT INTO {uc_countries} VALUES (376, 'Israel', 'IL', 'ISR', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(376, 'BS', 'Be''er Sheva'),"
-          ."(376, 'BH', 'Bika''at Hayarden'),"
-          ."(376, 'EA', 'Eilat and Arava'),"
-          ."(376, 'GA', 'Galil'),"
-          ."(376, 'HA', 'Haifa'),"
-          ."(376, 'JM', 'Jehuda Mountains'),"
-          ."(376, 'JE', 'Jerusalem'),"
-          ."(376, 'NE', 'Negev'),"
-          ."(376, 'SE', 'Semaria'),"
-          ."(376, 'SH', 'Sharon'),"
-          ."(376, 'TA', 'Tel Aviv (Gosh Dan)')");
+  $zones = array(
+    array(376, 'BS', "Be'er Sheva"),
+    array(376, 'BH', "Bika'at Hayarden"),
+    array(376, 'EA', 'Eilat and Arava'),
+    array(376, 'GA', 'Galil'),
+    array(376, 'HA', 'Haifa'),
+    array(376, 'JM', 'Jehuda Mountains'),
+    array(376, 'JE', 'Jerusalem'),
+    array(376, 'NE', 'Negev'),
+    array(376, 'SE', 'Semaria'),
+    array(376, 'SH', 'Sharon'),
+    array(376, 'TA', 'Tel Aviv (Gosh Dan)'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.  Documentation on address formats
Index: uc_store/countries/italy_380_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/italy_380_1.cif,v
retrieving revision 1.5.2.1
diff -u -r1.5.2.1 italy_380_1.cif
--- uc_store/countries/italy_380_1.cif	3 Nov 2008 21:33:50 -0000	1.5.2.1
+++ uc_store/countries/italy_380_1.cif	11 Jul 2009 20:49:48 -0000
@@ -12,112 +12,117 @@
   db_query("INSERT INTO {uc_countries} VALUES (380, 'Italy', 'IT', 'ITA', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(380, 'AG', 'Agrigento'),"
-          ."(380, 'AL', 'Alessandria'),"
-          ."(380, 'AN', 'Ancona'),"
-          ."(380, 'AO', 'Aosta'),"
-          ."(380, 'AP', 'Ascoli Piceno'),"
-          ."(380, 'AQ', 'L\'Aquila'),"
-          ."(380, 'AR', 'Arezzo'),"
-          ."(380, 'AT', 'Asti'),"
-          ."(380, 'AV', 'Avellino'),"
-          ."(380, 'BA', 'Bari'),"
-          ."(380, 'BG', 'Bergamo'),"
-          ."(380, 'BI', 'Biella'),"
-          ."(380, 'BL', 'Belluno'),"
-          ."(380, 'BN', 'Benevento'),"
-          ."(380, 'BO', 'Bologna'),"
-          ."(380, 'BR', 'Brindisi'),"
-          ."(380, 'BS', 'Brescia'),"
-          ."(380, 'BZ', 'Bolzano'),"
-          ."(380, 'CA', 'Cagliari'),"
-          ."(380, 'CB', 'Campobasso'),"
-          ."(380, 'CE', 'Caserta'),"
-          ."(380, 'CH', 'Chieti'),"
-          ."(380, 'CL', 'Caltanissetta'),"
-          ."(380, 'CN', 'Cuneo'),"
-          ."(380, 'CO', 'Como'),"
-          ."(380, 'CR', 'Cremona'),"
-          ."(380, 'CS', 'Cosenza'),"
-          ."(380, 'CT', 'Catania'),"
-          ."(380, 'CZ', 'Catanzaro'),"
-          ."(380, 'EN', 'Enna'),"
-          ."(380, 'FE', 'Ferrara'),"
-          ."(380, 'FG', 'Foggia'),"
-          ."(380, 'FI', 'Firenze'),"
-          ."(380, 'FC', 'Forlì-Cesena'),"
-          ."(380, 'FR', 'Frosinone'),"
-          ."(380, 'GE', 'Genova'),"
-          ."(380, 'GO', 'Gorizia'),"
-          ."(380, 'GR', 'Grosseto'),"
-          ."(380, 'IM', 'Imperia'),"
-          ."(380, 'IS', 'Isernia'),"
-          ."(380, 'KR', 'Crotone'),"
-          ."(380, 'LC', 'Lecco'),"
-          ."(380, 'LE', 'Lecce'),"
-          ."(380, 'LI', 'Livorno'),"
-          ."(380, 'LO', 'Lodi'),"
-          ."(380, 'LT', 'Latina'),"
-          ."(380, 'LU', 'Lucca'),"
-          ."(380, 'MC', 'Macerata'),"
-          ."(380, 'ME', 'Messina'),"
-          ."(380, 'MI', 'Milano'),"
-          ."(380, 'MN', 'Mantova'),"
-          ."(380, 'MO', 'Modena'),"
-          ."(380, 'MS', 'Massa Carrara'),"
-          ."(380, 'MT', 'Matera'),"
-          ."(380, 'NA', 'Napoli'),"
-          ."(380, 'NO', 'Novara'),"
-          ."(380, 'NU', 'Nuoro'),"
-          ."(380, 'OR', 'Oristano'),"
-          ."(380, 'PA', 'Palermo'),"
-          ."(380, 'PC', 'Piacenza'),"
-          ."(380, 'PD', 'Padova'),"
-          ."(380, 'PE', 'Pescara'),"
-          ."(380, 'PG', 'Perugia'),"
-          ."(380, 'PI', 'Pisa'),"
-          ."(380, 'PN', 'Pordenone'),"
-          ."(380, 'PO', 'Prato'),"
-          ."(380, 'PR', 'Parma'),"
-          ."(380, 'PU', 'Pesaro Urbino'),"
-          ."(380, 'PT', 'Pistoia'),"
-          ."(380, 'PV', 'Pavia'),"
-          ."(380, 'PZ', 'Potenza'),"
-          ."(380, 'RA', 'Ravenna'),"
-          ."(380, 'RC', 'Reggio Calabria'),"
-          ."(380, 'RE', 'Reggio Emilia'),"
-          ."(380, 'RG', 'Ragusa'),"
-          ."(380, 'RI', 'Rieti'),"
-          ."(380, 'RM', 'Roma'),"
-          ."(380, 'RN', 'Rimini'),"
-          ."(380, 'RO', 'Rovigo'),"
-          ."(380, 'SA', 'Salerno'),"
-          ."(380, 'SI', 'Siena'),"
-          ."(380, 'SO', 'Sondrio'),"
-          ."(380, 'SP', 'La Spezia'),"
-          ."(380, 'SR', 'Siracusa'),"
-          ."(380, 'SS', 'Sassari'),"
-          ."(380, 'SV', 'Savona'),"
-          ."(380, 'TA', 'Taranto'),"
-          ."(380, 'TE', 'Teramo'),"
-          ."(380, 'TN', 'Trento'),"
-          ."(380, 'TO', 'Torino'),"
-          ."(380, 'TP', 'Trapani'),"
-          ."(380, 'TR', 'Terni'),"
-          ."(380, 'TS', 'Trieste'),"
-          ."(380, 'TV', 'Treviso'),"
-          ."(380, 'UD', 'Udine'),"
-          ."(380, 'VA', 'Varese'),"
-          ."(380, 'VB', 'Verbania'),"
-          ."(380, 'VC', 'Vercelli'),"
-          ."(380, 'VE', 'Venezia'),"
-          ."(380, 'VI', 'Vicenza'),"
-          ."(380, 'VR', 'Verona'),"
-          ."(380, 'VT', 'Viterbo'),"
-          ."(380, 'VV', 'Vibo-Valentia'),"
-          ."(380, 'RSM', 'Rep San Marino'),"
-          ."(380, 'CTV', 'Città del Vaticano')");
+  $zones = array(
+    array(380, 'AG', 'Agrigento'),
+    array(380, 'AL', 'Alessandria'),
+    array(380, 'AN', 'Ancona'),
+    array(380, 'AO', 'Aosta'),
+    array(380, 'AP', 'Ascoli Piceno'),
+    array(380, 'AQ', 'L\'Aquila'),
+    array(380, 'AR', 'Arezzo'),
+    array(380, 'AT', 'Asti'),
+    array(380, 'AV', 'Avellino'),
+    array(380, 'BA', 'Bari'),
+    array(380, 'BG', 'Bergamo'),
+    array(380, 'BI', 'Biella'),
+    array(380, 'BL', 'Belluno'),
+    array(380, 'BN', 'Benevento'),
+    array(380, 'BO', 'Bologna'),
+    array(380, 'BR', 'Brindisi'),
+    array(380, 'BS', 'Brescia'),
+    array(380, 'BZ', 'Bolzano'),
+    array(380, 'CA', 'Cagliari'),
+    array(380, 'CB', 'Campobasso'),
+    array(380, 'CE', 'Caserta'),
+    array(380, 'CH', 'Chieti'),
+    array(380, 'CL', 'Caltanissetta'),
+    array(380, 'CN', 'Cuneo'),
+    array(380, 'CO', 'Como'),
+    array(380, 'CR', 'Cremona'),
+    array(380, 'CS', 'Cosenza'),
+    array(380, 'CT', 'Catania'),
+    array(380, 'CZ', 'Catanzaro'),
+    array(380, 'EN', 'Enna'),
+    array(380, 'FE', 'Ferrara'),
+    array(380, 'FG', 'Foggia'),
+    array(380, 'FI', 'Firenze'),
+    array(380, 'FC', 'Forlì-Cesena'),
+    array(380, 'FR', 'Frosinone'),
+    array(380, 'GE', 'Genova'),
+    array(380, 'GO', 'Gorizia'),
+    array(380, 'GR', 'Grosseto'),
+    array(380, 'IM', 'Imperia'),
+    array(380, 'IS', 'Isernia'),
+    array(380, 'KR', 'Crotone'),
+    array(380, 'LC', 'Lecco'),
+    array(380, 'LE', 'Lecce'),
+    array(380, 'LI', 'Livorno'),
+    array(380, 'LO', 'Lodi'),
+    array(380, 'LT', 'Latina'),
+    array(380, 'LU', 'Lucca'),
+    array(380, 'MC', 'Macerata'),
+    array(380, 'ME', 'Messina'),
+    array(380, 'MI', 'Milano'),
+    array(380, 'MN', 'Mantova'),
+    array(380, 'MO', 'Modena'),
+    array(380, 'MS', 'Massa Carrara'),
+    array(380, 'MT', 'Matera'),
+    array(380, 'NA', 'Napoli'),
+    array(380, 'NO', 'Novara'),
+    array(380, 'NU', 'Nuoro'),
+    array(380, 'OR', 'Oristano'),
+    array(380, 'PA', 'Palermo'),
+    array(380, 'PC', 'Piacenza'),
+    array(380, 'PD', 'Padova'),
+    array(380, 'PE', 'Pescara'),
+    array(380, 'PG', 'Perugia'),
+    array(380, 'PI', 'Pisa'),
+    array(380, 'PN', 'Pordenone'),
+    array(380, 'PO', 'Prato'),
+    array(380, 'PR', 'Parma'),
+    array(380, 'PU', 'Pesaro Urbino'),
+    array(380, 'PT', 'Pistoia'),
+    array(380, 'PV', 'Pavia'),
+    array(380, 'PZ', 'Potenza'),
+    array(380, 'RA', 'Ravenna'),
+    array(380, 'RC', 'Reggio Calabria'),
+    array(380, 'RE', 'Reggio Emilia'),
+    array(380, 'RG', 'Ragusa'),
+    array(380, 'RI', 'Rieti'),
+    array(380, 'RM', 'Roma'),
+    array(380, 'RN', 'Rimini'),
+    array(380, 'RO', 'Rovigo'),
+    array(380, 'SA', 'Salerno'),
+    array(380, 'SI', 'Siena'),
+    array(380, 'SO', 'Sondrio'),
+    array(380, 'SP', 'La Spezia'),
+    array(380, 'SR', 'Siracusa'),
+    array(380, 'SS', 'Sassari'),
+    array(380, 'SV', 'Savona'),
+    array(380, 'TA', 'Taranto'),
+    array(380, 'TE', 'Teramo'),
+    array(380, 'TN', 'Trento'),
+    array(380, 'TO', 'Torino'),
+    array(380, 'TP', 'Trapani'),
+    array(380, 'TR', 'Terni'),
+    array(380, 'TS', 'Trieste'),
+    array(380, 'TV', 'Treviso'),
+    array(380, 'UD', 'Udine'),
+    array(380, 'VA', 'Varese'),
+    array(380, 'VB', 'Verbania'),
+    array(380, 'VC', 'Vercelli'),
+    array(380, 'VE', 'Venezia'),
+    array(380, 'VI', 'Vicenza'),
+    array(380, 'VR', 'Verona'),
+    array(380, 'VT', 'Viterbo'),
+    array(380, 'VV', 'Vibo-Valentia'),
+    array(380, 'RSM', 'Rep San Marino'),
+    array(380, 'CTV', 'Città del Vaticano'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
 
   // Use uc_set_address_format() with the country ID as the first argument and
Index: uc_store/countries/japan_392_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/japan_392_1.cif,v
retrieving revision 1.3.4.1
diff -u -r1.3.4.1 japan_392_1.cif
--- uc_store/countries/japan_392_1.cif	3 Nov 2008 21:33:50 -0000	1.3.4.1
+++ uc_store/countries/japan_392_1.cif	11 Jul 2009 20:49:48 -0000
@@ -11,54 +11,59 @@
   db_query("INSERT INTO {uc_countries} VALUES (392, 'Japan', 'JP', 'JPN', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(392, '01', '北海道'),"
-          ."(392, '02', '青森県'),"
-          ."(392, '03', '岩手県'),"
-          ."(392, '04', '宮城県'),"
-          ."(392, '05', '秋田県'),"
-          ."(392, '06', '山形県'),"
-          ."(392, '07', '福島県'),"
-          ."(392, '08', '茨城県'),"
-          ."(392, '09', '栃木県'),"
-          ."(392, '10', '群馬県'),"
-          ."(392, '11', '埼玉県'),"
-          ."(392, '12', '千葉県'),"
-          ."(392, '13', '東京都'),"
-          ."(392, '14', '神奈川県'),"
-          ."(392, '15', '新潟県'),"
-          ."(392, '16', '富山県'),"
-          ."(392, '17', '石川県'),"
-          ."(392, '18', '福井県'),"
-          ."(392, '19', '山梨県'),"
-          ."(392, '20', '長野県'),"
-          ."(392, '21', '岐阜県'),"
-          ."(392, '22', '静岡県'),"
-          ."(392, '23', '愛知県'),"
-          ."(392, '24', '三重県'),"
-          ."(392, '25', '滋賀県'),"
-          ."(392, '26', '京都府'),"
-          ."(392, '27', '大阪府'),"
-          ."(392, '28', '兵庫県'),"
-          ."(392, '29', '奈良県'),"
-          ."(392, '30', '和歌山県'),"
-          ."(392, '31', '鳥取県'),"
-          ."(392, '32', '島根県'),"
-          ."(392, '33', '岡山県'),"
-          ."(392, '34', '広島県'),"
-          ."(392, '35', '山口県'),"
-          ."(392, '36', '徳島県'),"
-          ."(392, '37', '香川県'),"
-          ."(392, '38', '愛媛県'),"
-          ."(392, '39', '高知県'),"
-          ."(392, '40', '福岡県'),"
-          ."(392, '41', '佐賀県'),"
-          ."(392, '42', '長崎県'),"
-          ."(392, '43', '熊本県'),"
-          ."(392, '44', '大分県'),"
-          ."(392, '45', '宮崎県'),"
-          ."(392, '46', '鹿児島県'),"
-          ."(392, '47', '沖縄県')");
+  $zones = array(
+    array(392, '01', '北海道'),
+    array(392, '02', '青森県'),
+    array(392, '03', '岩手県'),
+    array(392, '04', '宮城県'),
+    array(392, '05', '秋田県'),
+    array(392, '06', '山形県'),
+    array(392, '07', '福島県'),
+    array(392, '08', '茨城県'),
+    array(392, '09', '栃木県'),
+    array(392, '10', '群馬県'),
+    array(392, '11', '埼玉県'),
+    array(392, '12', '千葉県'),
+    array(392, '13', '東京都'),
+    array(392, '14', '神奈川県'),
+    array(392, '15', '新潟県'),
+    array(392, '16', '富山県'),
+    array(392, '17', '石川県'),
+    array(392, '18', '福井県'),
+    array(392, '19', '山梨県'),
+    array(392, '20', '長野県'),
+    array(392, '21', '岐阜県'),
+    array(392, '22', '静岡県'),
+    array(392, '23', '愛知県'),
+    array(392, '24', '三重県'),
+    array(392, '25', '滋賀県'),
+    array(392, '26', '京都府'),
+    array(392, '27', '大阪府'),
+    array(392, '28', '兵庫県'),
+    array(392, '29', '奈良県'),
+    array(392, '30', '和歌山県'),
+    array(392, '31', '鳥取県'),
+    array(392, '32', '島根県'),
+    array(392, '33', '岡山県'),
+    array(392, '34', '広島県'),
+    array(392, '35', '山口県'),
+    array(392, '36', '徳島県'),
+    array(392, '37', '香川県'),
+    array(392, '38', '愛媛県'),
+    array(392, '39', '高知県'),
+    array(392, '40', '福岡県'),
+    array(392, '41', '佐賀県'),
+    array(392, '42', '長崎県'),
+    array(392, '43', '熊本県'),
+    array(392, '44', '大分県'),
+    array(392, '45', '宮崎県'),
+    array(392, '46', '鹿児島県'),
+    array(392, '47', '沖縄県'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   uc_set_address_format(392,
     "!postal_code\r\n!zone_name!city\r\n!street1\r\n!street2\r\n"
Index: uc_store/countries/kazakhstan_398_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/Attic/kazakhstan_398_1.cif,v
retrieving revision 1.1.4.3
diff -u -r1.1.4.3 kazakhstan_398_1.cif
--- uc_store/countries/kazakhstan_398_1.cif	7 Nov 2008 21:13:24 -0000	1.1.4.3
+++ uc_store/countries/kazakhstan_398_1.cif	11 Jul 2009 20:49:48 -0000
@@ -4,23 +4,28 @@
 function kazakhstan_install() {
   db_query("INSERT INTO {uc_countries} VALUES (398, 'Kazakhstan', 'KZ', 'KAZ', 1)");
 
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(398, 'ALA', 'Алматы'),"
-          ."(398, 'TSE', 'Астана'),"
-          ."(398, 'AKM', 'Акмолинская область'),"
-          ."(398, 'AKT', 'Актюбинская область'),"
-          ."(398, 'ALM', 'Алматинская область'),"
-          ."(398, 'ATR', 'Атырауская область'),"
-          ."(398, 'EKZ', 'Восточно-Казахстанская область'),"
-          ."(398, 'DZH', 'Жамбылская область'),"
-          ."(398, 'WKZ', 'Западно-Казахстанская область'),"
-          ."(398, 'KAR', 'Карагандинская область'),"
-          ."(398, 'KOR', 'Кызылординская область'),"
-          ."(398, 'KUS', 'Костанайская область'),"
-          ."(398, 'MAN', 'Мангистауская область'),"
-          ."(398, 'PVL', 'Павлодарская область'),"
-          ."(398, 'NKZ', 'Северо-Казахстанская область'),"
-          ."(398, 'SKZ', 'Южно-Казахстанская область');");
+  $zones = array(
+    array(398, 'ALA', 'Алматы'),
+    array(398, 'TSE', 'Астана'),
+    array(398, 'AKM', 'Акмолинская область'),
+    array(398, 'AKT', 'Актюбинская область'),
+    array(398, 'ALM', 'Алматинская область'),
+    array(398, 'ATR', 'Атырауская область'),
+    array(398, 'EKZ', 'Восточно-Казахстанская область'),
+    array(398, 'DZH', 'Жамбылская область'),
+    array(398, 'WKZ', 'Западно-Казахстанская область'),
+    array(398, 'KAR', 'Карагандинская область'),
+    array(398, 'KOR', 'Кызылординская область'),
+    array(398, 'KUS', 'Костанайская область'),
+    array(398, 'MAN', 'Мангистауская область'),
+    array(398, 'PVL', 'Павлодарская область'),
+    array(398, 'NKZ', 'Северо-Казахстанская область'),
+    array(398, 'SKZ', 'Южно-Казахстанская область'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   uc_set_address_format(398, "!company\n!first_name !last_name\n!street1\n!street2\n!postal_code !city\n!country_name_if");
 }
Index: uc_store/countries/korea_republic_of_410_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/korea_republic_of_410_1.cif,v
retrieving revision 1.2.2.5
diff -u -r1.2.2.5 korea_republic_of_410_1.cif
--- uc_store/countries/korea_republic_of_410_1.cif	3 Nov 2008 21:33:50 -0000	1.2.2.5
+++ uc_store/countries/korea_republic_of_410_1.cif	11 Jul 2009 20:49:48 -0000
@@ -11,22 +11,27 @@
   db_query("INSERT INTO {uc_countries} VALUES (410, 'Korea, Republic of', 'KR', 'KOR', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(410, 'CO', 'Ch''ungch''ong-bukto'),"
-          ."(410, 'CH', 'Ch''ungch''ong-namdo'),"
-          ."(410, 'CD', 'Cheju-do'),"
-          ."(410, 'CB', 'Cholla-bukto'),"
-          ."(410, 'CN', 'Cholla-namdo'),"
-          ."(410, 'IG', 'Inch''on-gwangyoksi'),"
-          ."(410, 'KA', 'Kangwon-do'),"
-          ."(410, 'KG', 'Kwangju-gwangyoksi'),"
-          ."(410, 'KD', 'Kyonggi-do'),"
-          ."(410, 'KB', 'Kyongsang-bukto'),"
-          ."(410, 'KN', 'Kyongsang-namdo'),"
-          ."(410, 'PG', 'Pusan-gwangyoksi'),"
-          ."(410, 'SO', 'Soul-t''ukpyolsi'),"
-          ."(410, 'TA', 'Taegu-gwangyoksi'),"
-          ."(410, 'TG', 'Taejon-gwangyoksi')");
+  $zones = array(
+    array(410, 'CO', "Ch'ungch'ong-bukto"),
+    array(410, 'CH', "Ch'ungch'ong-namdo"),
+    array(410, 'CD', 'Cheju-do'),
+    array(410, 'CB', 'Cholla-bukto'),
+    array(410, 'CN', 'Cholla-namdo'),
+    array(410, 'IG', "Inch'on-gwangyoksi"),
+    array(410, 'KA', 'Kangwon-do'),
+    array(410, 'KG', 'Kwangju-gwangyoksi'),
+    array(410, 'KD', 'Kyonggi-do'),
+    array(410, 'KB', 'Kyongsang-bukto'),
+    array(410, 'KN', 'Kyongsang-namdo'),
+    array(410, 'PG', 'Pusan-gwangyoksi'),
+    array(410, 'SO', "Soul-t'ukpyolsi"),
+    array(410, 'TA', 'Taegu-gwangyoksi'),
+    array(410, 'TG', 'Taejon-gwangyoksi'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.  Documentation on address formats
Index: uc_store/countries/latvia_428_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/latvia_428_1.cif,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 latvia_428_1.cif
--- uc_store/countries/latvia_428_1.cif	3 Nov 2008 21:33:50 -0000	1.1.2.1
+++ uc_store/countries/latvia_428_1.cif	11 Jul 2009 20:49:48 -0000
@@ -11,40 +11,45 @@
   db_query("INSERT INTO {uc_countries} VALUES (428, 'Latvija', 'LV', 'LVA', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-      ."(428, 'AI', 'Aizkraukles rajons'),"
-      ."(428, 'AL', 'Alūksnes rajons'),"
-      ."(428, 'BL', 'Balvu rajons'),"
-      ."(428, 'BU', 'Bauskas rajons'),"
-      ."(428, 'CE', 'Cēsu rajons'),"
-      ."(428, 'DGV', 'Daugavpils pilsēta'),"
-      ."(428, 'DA', 'Daugavpils rajons'),"
-      ."(428, 'DO', 'Dobeles rajons'),"
-      ."(428, 'GU', 'Gulbenes rajons'),"
-      ."(428, 'JK', 'Jēkabpils rajons'),"
-      ."(428, 'JEL', 'Jelgavas pilsēta'),"
-      ."(428, 'JL', 'Jelgavas rajons'),"
-      ."(428, 'JUR', 'Jūrmalas pilsēta'),"
-      ."(428, 'KR', 'Krāslavas rajons'),"
-      ."(428, 'KU', 'Kuldīgas rajons'),"
-      ."(428, 'LPX', 'Liepājas pilsēta'),"
-      ."(428, 'LE', 'Liepājas rajons'),"
-      ."(428, 'LM', 'Limbažu rajons'),"
-      ."(428, 'LU', 'Ludzas rajons'),"
-      ."(428, 'MA', 'Madonas rajons'),"
-      ."(428, 'OG', 'Ogres rajons'),"
-      ."(428, 'PR', 'Preiļu rajons'),"
-      ."(428, 'REZ', 'Rēzeknes pilsēta'),"
-      ."(428, 'RE', 'Rēzeknes rajons'),"
-      ."(428, 'RIX', 'Rīgas pilsēta'),"
-      ."(428, 'RI', 'Rīgas rajons'),"
-      ."(428, 'SA', 'Saldus rajons'),"
-      ."(428, 'TA', 'Talsu rajons'),"
-      ."(428, 'TU', 'Tukuma rajons'),"
-      ."(428, 'VK', 'Valkas rajons'),"
-      ."(428, 'VM', 'Valmieras rajons'),"
-      ."(428, 'VEN', 'Ventspils pilsēta'),"
-      ."(428, 'VE', 'Ventspils rajons')");
+  $zones = array(
+    array(428, 'AI', 'Aizkraukles rajons'),
+    array(428, 'AL', 'Alūksnes rajons'),
+    array(428, 'BL', 'Balvu rajons'),
+    array(428, 'BU', 'Bauskas rajons'),
+    array(428, 'CE', 'Cēsu rajons'),
+    array(428, 'DGV', 'Daugavpils pilsēta'),
+    array(428, 'DA', 'Daugavpils rajons'),
+    array(428, 'DO', 'Dobeles rajons'),
+    array(428, 'GU', 'Gulbenes rajons'),
+    array(428, 'JK', 'Jēkabpils rajons'),
+    array(428, 'JEL', 'Jelgavas pilsēta'),
+    array(428, 'JL', 'Jelgavas rajons'),
+    array(428, 'JUR', 'Jūrmalas pilsēta'),
+    array(428, 'KR', 'Krāslavas rajons'),
+    array(428, 'KU', 'Kuldīgas rajons'),
+    array(428, 'LPX', 'Liepājas pilsēta'),
+    array(428, 'LE', 'Liepājas rajons'),
+    array(428, 'LM', 'Limbažu rajons'),
+    array(428, 'LU', 'Ludzas rajons'),
+    array(428, 'MA', 'Madonas rajons'),
+    array(428, 'OG', 'Ogres rajons'),
+    array(428, 'PR', 'Preiļu rajons'),
+    array(428, 'REZ', 'Rēzeknes pilsēta'),
+    array(428, 'RE', 'Rēzeknes rajons'),
+    array(428, 'RIX', 'Rīgas pilsēta'),
+    array(428, 'RI', 'Rīgas rajons'),
+    array(428, 'SA', 'Saldus rajons'),
+    array(428, 'TA', 'Talsu rajons'),
+    array(428, 'TU', 'Tukuma rajons'),
+    array(428, 'VK', 'Valkas rajons'),
+    array(428, 'VM', 'Valmieras rajons'),
+    array(428, 'VEN', 'Ventspils pilsēta'),
+    array(428, 'VE', 'Ventspils rajons'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.
Index: uc_store/countries/lithuania_440_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/Attic/lithuania_440_1.cif,v
retrieving revision 1.1.4.3
diff -u -r1.1.4.3 lithuania_440_1.cif
--- uc_store/countries/lithuania_440_1.cif	7 Nov 2008 21:13:24 -0000	1.1.4.3
+++ uc_store/countries/lithuania_440_1.cif	11 Jul 2009 20:49:48 -0000
@@ -14,50 +14,55 @@
   // function uc_get_zone_ids($num) as the second argument for db_query() where
   // $num is the number of zones in the INSERT query.
   // VALUES = %d for ID, Parent Country ID, Zone Abbreviation, Zone Name
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-    ."(440, 'AK', 'Akmenės rajonas'),"
-    ."(440, 'AL', 'Alytaus rajonas'),"
-    ."(440, 'AN', 'Anykščių rajonas'),"
-    ."(440, 'BIR', 'Biržų rajonas'),"
-    ."(440, 'IG', 'Ignalinos rajonas'),"
-    ."(440, 'JON', 'Jonavos rajonas'),"
-    ."(440, 'JO', 'Joniškio rajonas'),"
-    ."(440, 'JUR', 'Jurbarko rajonas'),"
-    ."(440, 'KAI', 'Kaišiadorių rajonas'),"
-    ."(440, 'KA', 'Kauno rajonas'),"
-    ."(440, 'KE', 'Kėdainių rajonas'),"
-    ."(440, 'KEL', 'Kelmės rajonas'),"
-    ."(440, 'KLA', 'Klaipėdos rajonas'),"
-    ."(440, 'KR', 'Kretingos rajonas'),"
-    ."(440, 'KU', 'Kupiškio rajonas'),"
-    ."(440, 'LA', 'Lazdijų rajonas'),"
-    ."(440, 'MA', 'Mažeikių rajonas'),"
-    ."(440, 'MO', 'Molėtų rajonas'),"
-    ."(440, 'PA', 'Pakruojo rajonas'),"
-    ."(440, 'PAN', 'Panevėžio rajonas'),"
-    ."(440, 'PAS', 'Pasvalio rajonas'),"
-    ."(440, 'PLU', 'Plungės rajonas'),"
-    ."(440, 'PR', 'Prienų rajonas'),"
-    ."(440, 'RA', 'Radviliškio rajonas'),"
-    ."(440, 'RAS', 'Raseinių rajonas'),"
-    ."(440, 'RO', 'Rokiškio rajonas'),"
-    ."(440, 'SK', 'Skuodo rajonas'),"
-    ."(440, 'SA', 'Šakių rajonas'),"
-    ."(440, 'SAL', 'Šalčininkų rajonas'),"
-    ."(440, 'SIA', 'Šiaulių rajonas'),"
-    ."(440, 'SI', 'Šilalės rajonas'),"
-    ."(440, 'SIL', 'Šilutės rajonas'),"
-    ."(440, 'SIR', 'Širvintų rajonas'),"
-    ."(440, 'SV', 'Švenčionių rajonas'),"
-    ."(440, 'TA', 'Tauragės rajonas'),"
-    ."(440, 'TE', 'Telšių rajonas'),"
-    ."(440, 'TR', 'Trakų rajonas'),"
-    ."(440, 'UK', 'Ukmergės rajonas'),"
-    ."(440, 'UT', 'Utenos rajonas'),"
-    ."(440, 'VA', 'Varėnos rajonas'),"
-    ."(440, 'VI', 'Vilkaviškio rajonas'),"
-    ."(440, 'VIL', 'Vilniaus rajonas'),"
-    ."(440, 'ZAR', 'Zarasų rajonas');");
+  $zones = array(
+    array(440, 'AK', 'Akmenės rajonas'),
+    array(440, 'AL', 'Alytaus rajonas'),
+    array(440, 'AN', 'Anykščių rajonas'),
+    array(440, 'BIR', 'Biržų rajonas'),
+    array(440, 'IG', 'Ignalinos rajonas'),
+    array(440, 'JON', 'Jonavos rajonas'),
+    array(440, 'JO', 'Joniškio rajonas'),
+    array(440, 'JUR', 'Jurbarko rajonas'),
+    array(440, 'KAI', 'Kaišiadorių rajonas'),
+    array(440, 'KA', 'Kauno rajonas'),
+    array(440, 'KE', 'Kėdainių rajonas'),
+    array(440, 'KEL', 'Kelmės rajonas'),
+    array(440, 'KLA', 'Klaipėdos rajonas'),
+    array(440, 'KR', 'Kretingos rajonas'),
+    array(440, 'KU', 'Kupiškio rajonas'),
+    array(440, 'LA', 'Lazdijų rajonas'),
+    array(440, 'MA', 'Mažeikių rajonas'),
+    array(440, 'MO', 'Molėtų rajonas'),
+    array(440, 'PA', 'Pakruojo rajonas'),
+    array(440, 'PAN', 'Panevėžio rajonas'),
+    array(440, 'PAS', 'Pasvalio rajonas'),
+    array(440, 'PLU', 'Plungės rajonas'),
+    array(440, 'PR', 'Prienų rajonas'),
+    array(440, 'RA', 'Radviliškio rajonas'),
+    array(440, 'RAS', 'Raseinių rajonas'),
+    array(440, 'RO', 'Rokiškio rajonas'),
+    array(440, 'SK', 'Skuodo rajonas'),
+    array(440, 'SA', 'Šakių rajonas'),
+    array(440, 'SAL', 'Šalčininkų rajonas'),
+    array(440, 'SIA', 'Šiaulių rajonas'),
+    array(440, 'SI', 'Šilalės rajonas'),
+    array(440, 'SIL', 'Šilutės rajonas'),
+    array(440, 'SIR', 'Širvintų rajonas'),
+    array(440, 'SV', 'Švenčionių rajonas'),
+    array(440, 'TA', 'Tauragės rajonas'),
+    array(440, 'TE', 'Telšių rajonas'),
+    array(440, 'TR', 'Trakų rajonas'),
+    array(440, 'UK', 'Ukmergės rajonas'),
+    array(440, 'UT', 'Utenos rajonas'),
+    array(440, 'VA', 'Varėnos rajonas'),
+    array(440, 'VI', 'Vilkaviškio rajonas'),
+    array(440, 'VIL', 'Vilniaus rajonas'),
+    array(440, 'ZAR', 'Zarasų rajonas'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.
Index: uc_store/countries/malaysia_458_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/Attic/malaysia_458_1.cif,v
retrieving revision 1.1.4.4
diff -u -r1.1.4.4 malaysia_458_1.cif
--- uc_store/countries/malaysia_458_1.cif	4 Feb 2009 13:44:33 -0000	1.1.4.4
+++ uc_store/countries/malaysia_458_1.cif	11 Jul 2009 20:49:48 -0000
@@ -6,23 +6,28 @@
   db_query("INSERT INTO {uc_countries} VALUES (458, 'Malaysia', 'MY', 'MYS', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(458, 'JHR', 'Johor'),"
-          ."(458, 'KDH', 'Kedah'),"
-          ."(458, 'KTN', 'Kelantan'),"
-          ."(458, 'MLK', 'Melaka'),"
-          ."(458, 'NSN', 'Negeri Sembilan'),"
-          ."(458, 'PHG', 'Pahang'),"
-          ."(458, 'PNG', 'Pulau Pinang'),"
-          ."(458, 'PRK', 'Perak'),"
-          ."(458, 'PLS', 'Perlis'),"
-          ."(458, 'SGR', 'Selangor'),"
-          ."(458, 'TRG', 'Terengganu'),"
-          ."(458, 'SBH', 'Sabah'),"
-          ."(458, 'SRW', 'Sarawak'),"
-          ."(458, 'KUL', 'Kuala Lumpur'),"
-          ."(458, 'LBN', 'Labuan'),"
-          ."(458, 'PJY', 'Putrajaya');");
+  $zones = array(
+    array(458, 'JHR', 'Johor'),
+    array(458, 'KDH', 'Kedah'),
+    array(458, 'KTN', 'Kelantan'),
+    array(458, 'MLK', 'Melaka'),
+    array(458, 'NSN', 'Negeri Sembilan'),
+    array(458, 'PHG', 'Pahang'),
+    array(458, 'PNG', 'Pulau Pinang'),
+    array(458, 'PRK', 'Perak'),
+    array(458, 'PLS', 'Perlis'),
+    array(458, 'SGR', 'Selangor'),
+    array(458, 'TRG', 'Terengganu'),
+    array(458, 'SBH', 'Sabah'),
+    array(458, 'SRW', 'Sarawak'),
+    array(458, 'KUL', 'Kuala Lumpur'),
+    array(458, 'LBN', 'Labuan'),
+    array(458, 'PJY', 'Putrajaya'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   uc_set_address_format(458,
                "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
Index: uc_store/countries/mexico_484_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/mexico_484_1.cif,v
retrieving revision 1.2.2.4
diff -u -r1.2.2.4 mexico_484_1.cif
--- uc_store/countries/mexico_484_1.cif	3 Nov 2008 21:33:50 -0000	1.2.2.4
+++ uc_store/countries/mexico_484_1.cif	11 Jul 2009 20:49:48 -0000
@@ -11,39 +11,44 @@
   db_query("INSERT INTO {uc_countries} VALUES ('484', 'Mexico', 'MX', 'MEX', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-    ."(484, 'AGS','Aguascalientes'),"
-    ."(484, 'BC','Baja California'),"
-    ."(484, 'BCS','Baja California Sur'),"
-    ."(484, 'CAM','Campeche'),"
-    ."(484, 'CHIS','Chiapas'),"
-    ."(484, 'CHI','Chihuahua'),"
-    ."(484, 'COAH','Coahuila'),"
-    ."(484, 'COL','Colima'),"
-    ."(484, 'DF','Distrito Federal'),"
-    ."(484, 'DGO','Durango'),"
-    ."(484, 'GTO','Guanajuato'),"
-    ."(484, 'GRO','Guerrero'),"
-    ."(484, 'HGO','Hidalgo'),"
-    ."(484, 'JAL','Jalisco'),"
-    ."(484, 'ME','México'),"
-    ."(484, 'MICH','Michoacán'),"
-    ."(484, 'MOR','Morelos'),"
-    ."(484, 'NAY','Nayarit'),"
-    ."(484, 'NL','Nuevo León'),"
-    ."(484, 'OAX','Oaxaca'),"
-    ."(484, 'PUE','Puebla'),"
-    ."(484, 'QUE','Querétaro'),"
-    ."(484, 'QR','Quintana Roo'),"
-    ."(484, 'SLP','San Luis Potosi'),"
-    ."(484, 'SIN','Sinaloa'),"
-    ."(484, 'SON','Sonora'),"
-    ."(484, 'TAB','Tabasco'),"
-    ."(484, 'TAM','Tamaulipas'),"
-    ."(484, 'TLA','Tlaxcala'),"
-    ."(484, 'VER','Veracruz'),"
-    ."(484, 'YUC','Yucatán'),"
-    ."(484, 'ZAC','Zacatecas')");
+  $zones = array(
+    array(484, 'AGS','Aguascalientes'),
+    array(484, 'BC','Baja California'),
+    array(484, 'BCS','Baja California Sur'),
+    array(484, 'CAM','Campeche'),
+    array(484, 'CHIS','Chiapas'),
+    array(484, 'CHI','Chihuahua'),
+    array(484, 'COAH','Coahuila'),
+    array(484, 'COL','Colima'),
+    array(484, 'DF','Distrito Federal'),
+    array(484, 'DGO','Durango'),
+    array(484, 'GTO','Guanajuato'),
+    array(484, 'GRO','Guerrero'),
+    array(484, 'HGO','Hidalgo'),
+    array(484, 'JAL','Jalisco'),
+    array(484, 'ME','México'),
+    array(484, 'MICH','Michoacán'),
+    array(484, 'MOR','Morelos'),
+    array(484, 'NAY','Nayarit'),
+    array(484, 'NL','Nuevo León'),
+    array(484, 'OAX','Oaxaca'),
+    array(484, 'PUE','Puebla'),
+    array(484, 'QUE','Querétaro'),
+    array(484, 'QR','Quintana Roo'),
+    array(484, 'SLP','San Luis Potosi'),
+    array(484, 'SIN','Sinaloa'),
+    array(484, 'SON','Sonora'),
+    array(484, 'TAB','Tabasco'),
+    array(484, 'TAM','Tamaulipas'),
+    array(484, 'TLA','Tlaxcala'),
+    array(484, 'VER','Veracruz'),
+    array(484, 'YUC','Yucatán'),
+    array(484, 'ZAC','Zacatecas'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.  Documentation on address formats
Index: uc_store/countries/mozambique_508_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/Attic/mozambique_508_1.cif,v
retrieving revision 1.1.4.3
diff -u -r1.1.4.3 mozambique_508_1.cif
--- uc_store/countries/mozambique_508_1.cif	7 Nov 2008 21:13:24 -0000	1.1.4.3
+++ uc_store/countries/mozambique_508_1.cif	11 Jul 2009 20:49:48 -0000
@@ -10,17 +10,22 @@
   // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
   db_query("INSERT INTO {uc_countries} VALUES (508, 'Mozambique', 'MZ', 'MOZ', 1)");
 
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(508, 'POL', 'Cabo Delgado'),"
-          ."(508, 'VJB', 'Gaza'),"
-          ."(508, 'INH', 'Inhambane'),"
-          ."(508, 'CHI', 'Manica'),"
-          ."(508, 'MPM', 'Maputo'),"
-          ."(508, 'APL', 'Nampula'),"
-          ."(508, 'VXC', 'Niassa'),"
-          ."(508, 'BEW', 'Sofala'),"
-          ."(508, 'TCV', 'Tete'),"
-          ."(508, 'UEL', 'Zambezia');");
+  $zones = array(
+    array(508, 'POL', 'Cabo Delgado'),
+    array(508, 'VJB', 'Gaza'),
+    array(508, 'INH', 'Inhambane'),
+    array(508, 'CHI', 'Manica'),
+    array(508, 'MPM', 'Maputo'),
+    array(508, 'APL', 'Nampula'),
+    array(508, 'VXC', 'Niassa'),
+    array(508, 'BEW', 'Sofala'),
+    array(508, 'TCV', 'Tete'),
+    array(508, 'UEL', 'Zambezia'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   uc_set_address_format(508, "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_name\r\n!country_name");
 }
Index: uc_store/countries/netherlands_528_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/netherlands_528_1.cif,v
retrieving revision 1.5.4.1
diff -u -r1.5.4.1 netherlands_528_1.cif
--- uc_store/countries/netherlands_528_1.cif	3 Nov 2008 21:33:50 -0000	1.5.4.1
+++ uc_store/countries/netherlands_528_1.cif	11 Jul 2009 20:49:49 -0000
@@ -5,19 +5,24 @@
   db_query("INSERT INTO {uc_countries} VALUES ('528', 'Netherlands', 'NL', 'NLD', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(528, 'ZHL', 'Zuid-Holland'),"
-          ."(528, 'NHL', 'Noord-Holland'),"
-          ."(528, 'NBR', 'Noord-Brabant'),"
-          ."(528, 'GLD', 'Gelderland'),"
-          ."(528, 'UTR', 'Utrecht'),"
-          ."(528, 'LIM', 'Limburg'),"
-          ."(528, 'OVE', 'Overijssel'),"
-          ."(528, 'FRL', 'Friesland'),"
-          ."(528, 'GRO', 'Groningen'),"
-          ."(528, 'DRE', 'Drenthe'),"
-          ."(528, 'ZLD', 'Zeeland'),"
-          ."(528, 'FLD', 'Flevoland')");
+  $zones = array(
+    array(528, 'ZHL', 'Zuid-Holland'),
+    array(528, 'NHL', 'Noord-Holland'),
+    array(528, 'NBR', 'Noord-Brabant'),
+    array(528, 'GLD', 'Gelderland'),
+    array(528, 'UTR', 'Utrecht'),
+    array(528, 'LIM', 'Limburg'),
+    array(528, 'OVE', 'Overijssel'),
+    array(528, 'FRL', 'Friesland'),
+    array(528, 'GRO', 'Groningen'),
+    array(528, 'DRE', 'Drenthe'),
+    array(528, 'ZLD', 'Zeeland'),
+    array(528, 'FLD', 'Flevoland'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   uc_set_address_format(528, "!company\n!first_name !last_name\n!street1\n!street2\n!postal_code !city\n!country_name_if");
 }
Index: uc_store/countries/new_zealand_554_3.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/new_zealand_554_3.cif,v
retrieving revision 1.1.2.5
diff -u -r1.1.2.5 new_zealand_554_3.cif
--- uc_store/countries/new_zealand_554_3.cif	7 Nov 2008 21:13:24 -0000	1.1.2.5
+++ uc_store/countries/new_zealand_554_3.cif	11 Jul 2009 20:49:49 -0000
@@ -5,26 +5,31 @@
   db_query("INSERT INTO {uc_countries} VALUES (554, 'New Zealand', 'NZ', 'NZL', 3)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(554, 'AUK', 'Auckland'),"
-          ."(554, 'BOP', 'Bay of Plenty'),"
-          ."(554, 'CAN', 'Canterbury'),"
-          ."(554, 'COR', 'Coromandel'),"
-          ."(554, 'GIS', 'Gisborne'),"
-          ."(554, 'FIO', 'Fiordland'),"
-          ."(554, 'HKB', \"Hawke's Bay\"),"
-          ."(554, 'MBH', 'Marlborough'),"
-          ."(554, 'MWT', 'Manawatu-Wanganui'),"
-          ."(554, 'MCM', 'Mt Cook-Mackenzie'),"
-          ."(554, 'NSN', 'Nelson'),"
-          ."(554, 'NTL', 'Northland'),"
-          ."(554, 'OTA', 'Otago'),"
-          ."(554, 'STL', 'Southland'),"
-          ."(554, 'TKI', 'Taranaki'),"
-          ."(554, 'WGN', 'Wellington'),"
-          ."(554, 'WKO', 'Waikato'),"
-          ."(554, 'WAI', 'Wairarapa'),"
-          ."(554, 'WTC', 'West Coast')");
+  $zones = array(
+    array(554, 'AUK', 'Auckland'),
+    array(554, 'BOP', 'Bay of Plenty'),
+    array(554, 'CAN', 'Canterbury'),
+    array(554, 'COR', 'Coromandel'),
+    array(554, 'GIS', 'Gisborne'),
+    array(554, 'FIO', 'Fiordland'),
+    array(554, 'HKB', "Hawke's Bay"),
+    array(554, 'MBH', 'Marlborough'),
+    array(554, 'MWT', 'Manawatu-Wanganui'),
+    array(554, 'MCM', 'Mt Cook-Mackenzie'),
+    array(554, 'NSN', 'Nelson'),
+    array(554, 'NTL', 'Northland'),
+    array(554, 'OTA', 'Otago'),
+    array(554, 'STL', 'Southland'),
+    array(554, 'TKI', 'Taranaki'),
+    array(554, 'WGN', 'Wellington'),
+    array(554, 'WKO', 'Waikato'),
+    array(554, 'WAI', 'Wairarapa'),
+    array(554, 'WTC', 'West Coast'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   uc_set_address_format(554, "!first_name !last_name\r\n!company\r\n!street1\r\n!street2"
                             ."\r\n!city !postal_code\r\n!country_name_if");
@@ -33,26 +38,31 @@
 function new_zealand_update($version) {
   switch ($version) {
     case 2:
-      db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-              ."(554, 'AUK', 'Auckland'),"
-              ."(554, 'BOP', 'Bay of Plenty'),"
-              ."(554, 'CAN', 'Canterbury'),"
-              ."(554, 'COR', 'Coromandel'),"
-              ."(554, 'GIS', 'Gisborne'),"
-              ."(554, 'FIO', 'Fiordland'),"
-              ."(554, 'HKB', \"Hawke's Bay\"),"
-              ."(554, 'MBH', 'Marlborough'),"
-              ."(554, 'MWT', 'Manawatu-Wanganui'),"
-              ."(554, 'MCM', 'Mt Cook-Mackenzie'),"
-              ."(554, 'NSN', 'Nelson'),"
-              ."(554, 'NTL', 'Northland'),"
-              ."(554, 'OTA', 'Otago'),"
-              ."(554, 'STL', 'Southland'),"
-              ."(554, 'TKI', 'Taranaki'),"
-              ."(554, 'WGN', 'Wellington'),"
-              ."(554, 'WKO', 'Waikato'),"
-              ."(554, 'WAI', 'Wairarapa'),"
-              ."(554, 'WTC', 'West Coast')");
+      $zones = array(
+        array(554, 'AUK', 'Auckland'),
+        array(554, 'BOP', 'Bay of Plenty'),
+        array(554, 'CAN', 'Canterbury'),
+        array(554, 'COR', 'Coromandel'),
+        array(554, 'GIS', 'Gisborne'),
+        array(554, 'FIO', 'Fiordland'),
+        array(554, 'HKB', "Hawke's Bay"),
+        array(554, 'MBH', 'Marlborough'),
+        array(554, 'MWT', 'Manawatu-Wanganui'),
+        array(554, 'MCM', 'Mt Cook-Mackenzie'),
+        array(554, 'NSN', 'Nelson'),
+        array(554, 'NTL', 'Northland'),
+        array(554, 'OTA', 'Otago'),
+        array(554, 'STL', 'Southland'),
+        array(554, 'TKI', 'Taranaki'),
+        array(554, 'WGN', 'Wellington'),
+        array(554, 'WKO', 'Waikato'),
+        array(554, 'WAI', 'Wairarapa'),
+        array(554, 'WTC', 'West Coast'),
+      );
+
+      foreach ($zones as $zone) {
+        db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+      }
       break;
     case 3:
       db_query("UPDATE {uc_zones} SET zone_name = 'Wairarapa' WHERE zone_name = 'Wairprarapa'");
Index: uc_store/countries/nigeria_566_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/Attic/nigeria_566_1.cif,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 nigeria_566_1.cif
--- uc_store/countries/nigeria_566_1.cif	8 Jul 2009 12:56:50 -0000	1.1.2.1
+++ uc_store/countries/nigeria_566_1.cif	11 Jul 2009 20:49:49 -0000
@@ -4,44 +4,49 @@
   db_query("INSERT INTO {uc_countries} VALUES ('566', 'Nigeria', 'NG', 'NGA', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-      ."(566, 'AB', 'Abia'),"
-      ."(566, 'AD', 'Adamawa'),"
-      ."(566, 'AK', 'Akwa Ibom'),"
-      ."(566, 'AN', 'Anambra'),"
-      ."(566, 'BA', 'Bauchi'),"
-      ."(566, 'BY', 'Bayelsa'),"
-      ."(566, 'BN', 'Benue'),"
-      ."(566, 'BO', 'Borno'),"
-      ."(566, 'CR', 'Cross River'),"
-      ."(566, 'DT', 'Delta'),"
-      ."(566, 'EB', 'Ebonyi'),"
-      ."(566, 'ED', 'Edo'),"
-      ."(566, 'EK', 'Ekiti'),"
-      ."(566, 'EN', 'Enugu'),"
-      ."(566, 'FC', 'FCT - Abuja'),"
-      ."(566, 'GB', 'Gombe'),"
-      ."(566, 'IM', 'Imo'),"
-      ."(566, 'JG', 'Jigawa'),"
-      ."(566, 'KD', 'Kaduna'),"
-      ."(566, 'KN', 'Kano'),"
-      ."(566, 'KT', 'Katsina'),"
-      ."(566, 'KB', 'Kebbi'),"
-      ."(566, 'KG', 'Kogi'),"
-      ."(566, 'KW', 'Kwara'),"
-      ."(566, 'LA', 'Lagos'),"
-      ."(566, 'NS', 'Nassarawa'),"
-      ."(566, 'NG', 'Niger'),"
-      ."(566, 'OG', 'Ogun'),"
-      ."(566, 'ON', 'Ondo'),"
-      ."(566, 'OS', 'Osun'),"
-      ."(566, 'OY', 'Oyo'),"
-      ."(566, 'PL', 'Plateau'),"
-      ."(566, 'RV', 'Rivers'),"
-      ."(566, 'SO', 'Sokoto'),"
-      ."(566, 'TB', 'Taraba'),"
-      ."(566, 'YB', 'Yobe'),"
-      ."(566, 'ZM', 'Zamfara')");
+  $zones = array(
+    array(566, 'AB', 'Abia'),
+    array(566, 'AD', 'Adamawa'),
+    array(566, 'AK', 'Akwa Ibom'),
+    array(566, 'AN', 'Anambra'),
+    array(566, 'BA', 'Bauchi'),
+    array(566, 'BY', 'Bayelsa'),
+    array(566, 'BN', 'Benue'),
+    array(566, 'BO', 'Borno'),
+    array(566, 'CR', 'Cross River'),
+    array(566, 'DT', 'Delta'),
+    array(566, 'EB', 'Ebonyi'),
+    array(566, 'ED', 'Edo'),
+    array(566, 'EK', 'Ekiti'),
+    array(566, 'EN', 'Enugu'),
+    array(566, 'FC', 'FCT - Abuja'),
+    array(566, 'GB', 'Gombe'),
+    array(566, 'IM', 'Imo'),
+    array(566, 'JG', 'Jigawa'),
+    array(566, 'KD', 'Kaduna'),
+    array(566, 'KN', 'Kano'),
+    array(566, 'KT', 'Katsina'),
+    array(566, 'KB', 'Kebbi'),
+    array(566, 'KG', 'Kogi'),
+    array(566, 'KW', 'Kwara'),
+    array(566, 'LA', 'Lagos'),
+    array(566, 'NS', 'Nassarawa'),
+    array(566, 'NG', 'Niger'),
+    array(566, 'OG', 'Ogun'),
+    array(566, 'ON', 'Ondo'),
+    array(566, 'OS', 'Osun'),
+    array(566, 'OY', 'Oyo'),
+    array(566, 'PL', 'Plateau'),
+    array(566, 'RV', 'Rivers'),
+    array(566, 'SO', 'Sokoto'),
+    array(566, 'TB', 'Taraba'),
+    array(566, 'YB', 'Yobe'),
+    array(566, 'ZM', 'Zamfara'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
    variable_set('uc_address_format_566',
     "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
Index: uc_store/countries/norway_578_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/norway_578_1.cif,v
retrieving revision 1.3.4.1
diff -u -r1.3.4.1 norway_578_1.cif
--- uc_store/countries/norway_578_1.cif	3 Nov 2008 21:33:50 -0000	1.3.4.1
+++ uc_store/countries/norway_578_1.cif	11 Jul 2009 20:49:49 -0000
@@ -11,27 +11,32 @@
   db_query("INSERT INTO {uc_countries} VALUES (578, 'Norway', 'NO', 'NOR', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-      ."(578, 'AK', 'Akershus'),"
-      ."(578, 'AA', 'Aust-Agder'),"
-      ."(578, 'BU', 'Buskerud'),"
-      ."(578, 'FM', 'Finnmark'),"
-      ."(578, 'HM', 'Hedmark'),"
-      ."(578, 'HL', 'Hordaland'),"
-      ."(578, 'MR', 'More og Romdal'),"
-      ."(578, 'NT', 'Nord-Trondelag'),"
-      ."(578, 'NL', 'Nordland'),"
-      ."(578, 'OF', 'Ostfold'),"
-      ."(578, 'OP', 'Oppland'),"
-      ."(578, 'OL', 'Oslo'),"
-      ."(578, 'RL', 'Rogaland'),"
-      ."(578, 'ST', 'Sor-Trondelag'),"
-      ."(578, 'SJ', 'Sogn og Fjordane'),"
-      ."(578, 'SV', 'Svalbard'),"
-      ."(578, 'TM', 'Telemark'),"
-      ."(578, 'TR', 'Troms'),"
-      ."(578, 'VA', 'Vest-Agder'),"
-      ."(578, 'VF', 'Vestfold')");
+  $zones = array(
+    array(578, 'AK', 'Akershus'),
+    array(578, 'AA', 'Aust-Agder'),
+    array(578, 'BU', 'Buskerud'),
+    array(578, 'FM', 'Finnmark'),
+    array(578, 'HM', 'Hedmark'),
+    array(578, 'HL', 'Hordaland'),
+    array(578, 'MR', 'More og Romdal'),
+    array(578, 'NT', 'Nord-Trondelag'),
+    array(578, 'NL', 'Nordland'),
+    array(578, 'OF', 'Ostfold'),
+    array(578, 'OP', 'Oppland'),
+    array(578, 'OL', 'Oslo'),
+    array(578, 'RL', 'Rogaland'),
+    array(578, 'ST', 'Sor-Trondelag'),
+    array(578, 'SJ', 'Sogn og Fjordane'),
+    array(578, 'SV', 'Svalbard'),
+    array(578, 'TM', 'Telemark'),
+    array(578, 'TR', 'Troms'),
+    array(578, 'VA', 'Vest-Agder'),
+    array(578, 'VF', 'Vestfold'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.  Documentation on address formats
Index: uc_store/countries/peru_604_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/peru_604_1.cif,v
retrieving revision 1.2.2.4
diff -u -r1.2.2.4 peru_604_1.cif
--- uc_store/countries/peru_604_1.cif	3 Nov 2008 21:33:50 -0000	1.2.2.4
+++ uc_store/countries/peru_604_1.cif	11 Jul 2009 20:49:49 -0000
@@ -7,32 +7,37 @@
   db_query("INSERT INTO {uc_countries} VALUES (604, 'Perú', 'PE', 'PER', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(604, 'AMA', 'Amazonas'),"
-          ."(604, 'ANC', 'Ancash'),"
-          ."(604, 'APU', 'Apurímac'),"
-          ."(604, 'ARE', 'Arequipa'),"
-          ."(604, 'AYA', 'Ayacucho'),"
-          ."(604, 'CAJ', 'Cajamarca'),"
-          ."(604, 'CAL', 'Callao'),"
-          ."(604, 'CUS', 'Cusco'),"
-          ."(604, 'HUV', 'Huancavelica'),"
-          ."(604, 'HUC', 'Huánuco'),"
-          ."(604, 'ICA', 'Ica'),"
-          ."(604, 'JUN', 'Junín'),"
-          ."(604, 'LAL', 'La Libertad'),"
-          ."(604, 'LAM', 'Lambayeque'),"
-          ."(604, 'LIM', 'Lima'),"
-          ."(604, 'LOR', 'Loreto'),"
-          ."(604, 'MDD', 'Madre de Dios'),"
-          ."(604, 'MOQ', 'Moquegua'),"
-          ."(604, 'PAS', 'Pasco'),"
-          ."(604, 'PIU', 'Piura'),"
-          ."(604, 'PUN', 'Puno'),"
-          ."(604, 'SAM', 'San Martín'),"
-          ."(604, 'TAC', 'Tacna'),"
-          ."(604, 'TUM', 'Tumbes'),"
-          ."(604, 'UCA', 'Ucayali')");
+  $zones = array(
+    array(604, 'AMA', 'Amazonas'),
+    array(604, 'ANC', 'Ancash'),
+    array(604, 'APU', 'Apurímac'),
+    array(604, 'ARE', 'Arequipa'),
+    array(604, 'AYA', 'Ayacucho'),
+    array(604, 'CAJ', 'Cajamarca'),
+    array(604, 'CAL', 'Callao'),
+    array(604, 'CUS', 'Cusco'),
+    array(604, 'HUV', 'Huancavelica'),
+    array(604, 'HUC', 'Huánuco'),
+    array(604, 'ICA', 'Ica'),
+    array(604, 'JUN', 'Junín'),
+    array(604, 'LAL', 'La Libertad'),
+    array(604, 'LAM', 'Lambayeque'),
+    array(604, 'LIM', 'Lima'),
+    array(604, 'LOR', 'Loreto'),
+    array(604, 'MDD', 'Madre de Dios'),
+    array(604, 'MOQ', 'Moquegua'),
+    array(604, 'PAS', 'Pasco'),
+    array(604, 'PIU', 'Piura'),
+    array(604, 'PUN', 'Puno'),
+    array(604, 'SAM', 'San Martín'),
+    array(604, 'TAC', 'Tacna'),
+    array(604, 'TUM', 'Tumbes'),
+    array(604, 'UCA', 'Ucayali'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.  Documentation on address formats
Index: uc_store/countries/philippines_608_2.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/philippines_608_2.cif,v
retrieving revision 1.3.4.1
diff -u -r1.3.4.1 philippines_608_2.cif
--- uc_store/countries/philippines_608_2.cif	3 Nov 2008 21:33:50 -0000	1.3.4.1
+++ uc_store/countries/philippines_608_2.cif	11 Jul 2009 20:49:49 -0000
@@ -33,89 +33,94 @@
   db_query("INSERT INTO {uc_countries} VALUES ('608', 'Philippines', 'PH', 'PHL', 2)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-      . "(608,'ABR','Abra'),"
-      . "(608,'ANO','Agusan del Norte'),"
-      . "(608,'ASU','Agusan del Sur'),"
-      . "(608,'AKL','Aklan'),"
-      . "(608,'ALB','Albay'),"
-      . "(608,'ANT','Antique'),"
-      . "(608,'APY','Apayao'),"
-      . "(608,'AUR','Aurora'),"
-      . "(608,'BAS','Basilan'),"
-      . "(608,'BTA','Bataan'),"
-      . "(608,'BTE','Batanes'),"
-      . "(608,'BTG','Batangas'),"
-      . "(608,'BEN','Benguet'),"
-      . "(608,'BLR','Biliran'),"
-      . "(608,'BOL','Bohol'),"
-      . "(608,'BUK','Bukidnon'),"
-      . "(608,'BUL','Bulacan'),"
-      . "(608,'CAG','Cagayan'),"
-      . "(608,'CNO','Camarines Norte'),"
-      . "(608,'CSU','Camarines Sur'),"
-      . "(608,'CAM','Camiguin'),"
-      . "(608,'CAP','Capiz'),"
-      . "(608,'CAT','Catanduanes'),"
-      . "(608,'CAV','Cavite'),"
-      . "(608,'CEB','Cebu'),"
-      . "(608,'CMP','Compostela Valley'),"
-      . "(608,'DNO','Davao del Norte'),"
-      . "(608,'DSU','Davao del Sur'),"
-      . "(608,'DOR','Davao Oriental'),"
-      . "(608,'DGI','Dinagat Islands'),"
-      . "(608,'ESA','Eastern Samar'),"
-      . "(608,'GUI','Guimaras'),"
-      . "(608,'IFU','Ifugao'),"
-      . "(608,'INO','Ilocos Norte'),"
-      . "(608,'ISU','Ilocos Sur'),"
-      . "(608,'ILO','Iloilo'),"
-      . "(608,'ISA','Isabela'),"
-      . "(608,'KAL','Kalinga'),"
-      . "(608,'LAG','Laguna'),"
-      . "(608,'LNO','Lanao del Norte'),"
-      . "(608,'LSU','Lanao del Sur'),"
-      . "(608,'UNI','La Union'),"
-      . "(608,'LEY','Leyte'),"
-      . "(608,'MAG','Maguindanao'),"
-      . "(608,'MRN','Marinduque'),"
-      . "(608,'MSB','Masbate'),"
-      . "(608,'MLA','Metro Manila'),"
-      . "(608,'MIC','Mindoro Occidental'),"
-      . "(608,'MIR','Mindoro Oriental'),"
-      . "(608,'MSC','Misamis Occidental'),"
-      . "(608,'MOR','Misamis Oriental'),"
-      . "(608,'MOP','Mountain Province'),"
-      . "(608,'NOC','Negros Occidental'),"
-      . "(608,'NOR','Negros Oriental'),"
-      . "(608,'NCT','North Cotabato'),"
-      . "(608,'NSM','Northern Samar'),"
-      . "(608,'NEC','Nueva Ecija'),"
-      . "(608,'NVZ','Nueva Vizcaya'),"
-      . "(608,'PLW','Palawan'),"
-      . "(608,'PMP','Pampanga'),"
-      . "(608,'PNG','Pangasinan'),"
-      . "(608,'QZN','Quezon'),"
-      . "(608,'QRN','Quirino'),"
-      . "(608,'RIZ','Rizal'),"
-      . "(608,'ROM','Romblon'),"
-      . "(608,'SMR','Samar'),"
-      . "(608,'SRG','Sarangani'),"
-      . "(608,'SHK','Shariff Kabunsuan'),"
-      . "(608,'SQJ','Siquijor'),"
-      . "(608,'SRS','Sorsogon'),"
-      . "(608,'SCO','South Cotabato'),"
-      . "(608,'SLE','Southern Leyte'),"
-      . "(608,'SKU','Sultan Kudarat'),"
-      . "(608,'SLU','Sulu'),"
-      . "(608,'SNO','Surigao del Norte'),"
-      . "(608,'SSU','Surigao del Sur'),"
-      . "(608,'TAR','Tarlac'),"
-      . "(608,'TAW','Tawi-Tawi'),"
-      . "(608,'ZBL','Zambales'),"
-      . "(608,'ZNO','Zamboanga del Norte'),"
-      . "(608,'ZSU','Zamboanga del Sur'),"
-      . "(608,'ZSI','Zamboanga Sibugay')");
+  $zones = array(
+    array(608,'ABR','Abra'),
+    array(608,'ANO','Agusan del Norte'),
+    array(608,'ASU','Agusan del Sur'),
+    array(608,'AKL','Aklan'),
+    array(608,'ALB','Albay'),
+    array(608,'ANT','Antique'),
+    array(608,'APY','Apayao'),
+    array(608,'AUR','Aurora'),
+    array(608,'BAS','Basilan'),
+    array(608,'BTA','Bataan'),
+    array(608,'BTE','Batanes'),
+    array(608,'BTG','Batangas'),
+    array(608,'BEN','Benguet'),
+    array(608,'BLR','Biliran'),
+    array(608,'BOL','Bohol'),
+    array(608,'BUK','Bukidnon'),
+    array(608,'BUL','Bulacan'),
+    array(608,'CAG','Cagayan'),
+    array(608,'CNO','Camarines Norte'),
+    array(608,'CSU','Camarines Sur'),
+    array(608,'CAM','Camiguin'),
+    array(608,'CAP','Capiz'),
+    array(608,'CAT','Catanduanes'),
+    array(608,'CAV','Cavite'),
+    array(608,'CEB','Cebu'),
+    array(608,'CMP','Compostela Valley'),
+    array(608,'DNO','Davao del Norte'),
+    array(608,'DSU','Davao del Sur'),
+    array(608,'DOR','Davao Oriental'),
+    array(608,'DGI','Dinagat Islands'),
+    array(608,'ESA','Eastern Samar'),
+    array(608,'GUI','Guimaras'),
+    array(608,'IFU','Ifugao'),
+    array(608,'INO','Ilocos Norte'),
+    array(608,'ISU','Ilocos Sur'),
+    array(608,'ILO','Iloilo'),
+    array(608,'ISA','Isabela'),
+    array(608,'KAL','Kalinga'),
+    array(608,'LAG','Laguna'),
+    array(608,'LNO','Lanao del Norte'),
+    array(608,'LSU','Lanao del Sur'),
+    array(608,'UNI','La Union'),
+    array(608,'LEY','Leyte'),
+    array(608,'MAG','Maguindanao'),
+    array(608,'MRN','Marinduque'),
+    array(608,'MSB','Masbate'),
+    array(608,'MLA','Metro Manila'),
+    array(608,'MIC','Mindoro Occidental'),
+    array(608,'MIR','Mindoro Oriental'),
+    array(608,'MSC','Misamis Occidental'),
+    array(608,'MOR','Misamis Oriental'),
+    array(608,'MOP','Mountain Province'),
+    array(608,'NOC','Negros Occidental'),
+    array(608,'NOR','Negros Oriental'),
+    array(608,'NCT','North Cotabato'),
+    array(608,'NSM','Northern Samar'),
+    array(608,'NEC','Nueva Ecija'),
+    array(608,'NVZ','Nueva Vizcaya'),
+    array(608,'PLW','Palawan'),
+    array(608,'PMP','Pampanga'),
+    array(608,'PNG','Pangasinan'),
+    array(608,'QZN','Quezon'),
+    array(608,'QRN','Quirino'),
+    array(608,'RIZ','Rizal'),
+    array(608,'ROM','Romblon'),
+    array(608,'SMR','Samar'),
+    array(608,'SRG','Sarangani'),
+    array(608,'SHK','Shariff Kabunsuan'),
+    array(608,'SQJ','Siquijor'),
+    array(608,'SRS','Sorsogon'),
+    array(608,'SCO','South Cotabato'),
+    array(608,'SLE','Southern Leyte'),
+    array(608,'SKU','Sultan Kudarat'),
+    array(608,'SLU','Sulu'),
+    array(608,'SNO','Surigao del Norte'),
+    array(608,'SSU','Surigao del Sur'),
+    array(608,'TAR','Tarlac'),
+    array(608,'TAW','Tawi-Tawi'),
+    array(608,'ZBL','Zambales'),
+    array(608,'ZNO','Zamboanga del Norte'),
+    array(608,'ZSU','Zamboanga del Sur'),
+    array(608,'ZSI','Zamboanga Sibugay'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.  Documentation on address formats
Index: uc_store/countries/poland_616_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/poland_616_1.cif,v
retrieving revision 1.4.4.1
diff -u -r1.4.4.1 poland_616_1.cif
--- uc_store/countries/poland_616_1.cif	3 Nov 2008 21:33:50 -0000	1.4.4.1
+++ uc_store/countries/poland_616_1.cif	11 Jul 2009 20:49:49 -0000
@@ -5,23 +5,28 @@
   db_query("INSERT INTO {uc_countries} VALUES ('616', 'Poland', 'PL', 'POL', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(616, 'DO', 'Dolnośląskie'),"
-          ."(616, 'KP', 'Kujawsko-Pomorskie'),"
-          ."(616, 'LO', 'Łódzkie'),"
-          ."(616, 'LL', 'Lubelskie'),"
-          ."(616, 'LU', 'Lubuskie'),"
-          ."(616, 'ML', 'Małopolskie'),"
-          ."(616, 'MZ', 'Mazowieckie'),"
-          ."(616, 'OP', 'Opolskie'),"
-          ."(616, 'PP', 'Podkarpackie'),"
-          ."(616, 'PL', 'Podlaskie'),"
-          ."(616, 'PM', 'Pomorskie'),"
-          ."(616, 'SL', 'Śląskie'),"
-          ."(616, 'SW', 'Świętokrzyskie'),"
-          ."(616, 'WM', 'Warmińsko-Mazurskie'),"
-          ."(616, 'WP', 'Wielkopolskie'),"
-          ."(616, 'ZA', 'Zachodniopomorskie')");
+  $zones = array(
+    array(616, 'DO', 'Dolnośląskie'),
+    array(616, 'KP', 'Kujawsko-Pomorskie'),
+    array(616, 'LO', 'Łódzkie'),
+    array(616, 'LL', 'Lubelskie'),
+    array(616, 'LU', 'Lubuskie'),
+    array(616, 'ML', 'Małopolskie'),
+    array(616, 'MZ', 'Mazowieckie'),
+    array(616, 'OP', 'Opolskie'),
+    array(616, 'PP', 'Podkarpackie'),
+    array(616, 'PL', 'Podlaskie'),
+    array(616, 'PM', 'Pomorskie'),
+    array(616, 'SL', 'Śląskie'),
+    array(616, 'SW', 'Świętokrzyskie'),
+    array(616, 'WM', 'Warmińsko-Mazurskie'),
+    array(616, 'WP', 'Wielkopolskie'),
+    array(616, 'ZA', 'Zachodniopomorskie'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // waiting for documentation to make any changes with below
   uc_set_address_format(616, "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_code !postal_code\r\n!country_name_if");
Index: uc_store/countries/portugal_620_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/portugal_620_1.cif,v
retrieving revision 1.2.2.4
diff -u -r1.2.2.4 portugal_620_1.cif
--- uc_store/countries/portugal_620_1.cif	3 Nov 2008 21:33:50 -0000	1.2.2.4
+++ uc_store/countries/portugal_620_1.cif	11 Jul 2009 20:49:49 -0000
@@ -14,27 +14,32 @@
   // function uc_get_zone_ids($num) as the second argument for db_query() where
   // $num is the number of zones in the INSERT query.
   // VALUES = %d for ID, Parent Country ID, Zone Abbreviation, Zone Name
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(620, 'AVE', 'Aveiro'),"
-          ."(620, 'BEJ', 'Beja'),"
-          ."(620, 'BRA', 'Braga'),"
-          ."(620, 'BGA', 'Bragança'),"
-          ."(620, 'CAB', 'Castelo Branco'),"
-          ."(620, 'COI', 'Coimbra'),"
-          ."(620, 'EVO', 'Évora'),"
-          ."(620, 'FAR', 'Faro'),"
-          ."(620, 'GUA', 'Guarda'),"
-          ."(620, 'LEI', 'Leiria'),"
-          ."(620, 'LIS', 'Lisboa'),"
-          ."(620, 'PTL', 'Portalegre'),"
-          ."(620, 'POR', 'Porto'),"
-          ."(620, 'STR', 'Santarém'),"
-          ."(620, 'SET', 'Setúbal'),"
-          ."(620, 'VIC', 'Viana do Castelo'),"
-          ."(620, 'VIR', 'Vila Real'),"
-          ."(620, 'VIS', 'Viseu'),"
-          ."(620, 'ACO', 'Reg. Autónoma Açores'),"
-          ."(620, 'MAD', 'Reg. Autónoma Madeira')");
+  $zones = array(
+    array(620, 'AVE', 'Aveiro'),
+    array(620, 'BEJ', 'Beja'),
+    array(620, 'BRA', 'Braga'),
+    array(620, 'BGA', 'Bragança'),
+    array(620, 'CAB', 'Castelo Branco'),
+    array(620, 'COI', 'Coimbra'),
+    array(620, 'EVO', 'Évora'),
+    array(620, 'FAR', 'Faro'),
+    array(620, 'GUA', 'Guarda'),
+    array(620, 'LEI', 'Leiria'),
+    array(620, 'LIS', 'Lisboa'),
+    array(620, 'PTL', 'Portalegre'),
+    array(620, 'POR', 'Porto'),
+    array(620, 'STR', 'Santarém'),
+    array(620, 'SET', 'Setúbal'),
+    array(620, 'VIC', 'Viana do Castelo'),
+    array(620, 'VIR', 'Vila Real'),
+    array(620, 'VIS', 'Viseu'),
+    array(620, 'ACO', 'Reg. Autónoma Açores'),
+    array(620, 'MAD', 'Reg. Autónoma Madeira'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.
Index: uc_store/countries/romania_642_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/romania_642_1.cif,v
retrieving revision 1.4.4.1
diff -u -r1.4.4.1 romania_642_1.cif
--- uc_store/countries/romania_642_1.cif	3 Nov 2008 21:33:50 -0000	1.4.4.1
+++ uc_store/countries/romania_642_1.cif	11 Jul 2009 20:49:49 -0000
@@ -6,49 +6,54 @@
   db_query("INSERT INTO {uc_countries} VALUES (642, 'Romania', 'RO', 'ROM', 1)");
 
   // VALUES = %d for ID, Parent Country ID, Zone Abbreviation, Zone Name
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-      ."(642, 'AB', 'Alba'),"
-      ."(642, 'AR', 'Arad'),"
-      ."(642, 'AG', 'Arges'),"
-      ."(642, 'BC', 'Bacau'),"
-      ."(642, 'BH', 'Bihor'),"
-      ."(642, 'BN', 'Bistrita-Nasaud'),"
-      ."(642, 'BT', 'Botosani'),"
-      ."(642, 'BV', 'Brasov'),"
-      ."(642, 'BR', 'Braila'),"
-      ."(642, 'B', 'Bucuresti'),"
-      ."(642, 'BZ', 'Buzau'),"
-      ."(642, 'CS', 'Caras-Severin'),"
-      ."(642, 'CL', 'Calarasi'),"
-      ."(642, 'CJ', 'Cluj'),"
-      ."(642, 'CT', 'Constanta'),"
-      ."(642, 'CV', 'Covasna'),"
-      ."(642, 'DB', 'Dimbovita'),"
-      ."(642, 'DJ', 'Dolj'),"
-      ."(642, 'GL', 'Galati'),"
-      ."(642, 'GR', 'Giurgiu'),"
-      ."(642, 'GJ', 'Gorj'),"
-      ."(642, 'HR', 'Harghita'),"
-      ."(642, 'HD', 'Hunedoara'),"
-      ."(642, 'IL', 'Ialomita'),"
-      ."(642, 'IS', 'Iasi'),"
-      ."(642, 'IF', 'Ilfov'),"
-      ."(642, 'MM', 'Maramures'),"
-      ."(642, 'MH', 'Mehedinti'),"
-      ."(642, 'MS', 'Mures'),"
-      ."(642, 'NT', 'Neamt'),"
-      ."(642, 'OT', 'Olt'),"
-      ."(642, 'PH', 'Prahova'),"
-      ."(642, 'SM', 'Satu-Mare'),"
-      ."(642, 'SJ', 'Salaj'),"
-      ."(642, 'SB', 'Sibiu'),"
-      ."(642, 'SV', 'Suceava'),"
-      ."(642, 'TR', 'Teleorman'),"
-      ."(642, 'TM', 'Timis'),"
-      ."(642, 'TL', 'Tulcea'),"
-      ."(642, 'VS', 'Vaslui'),"
-      ."(642, 'VL', 'Valcea'),"
-      ."(642, 'VN', 'Vrancea')");
+  $zones = array(
+    array(642, 'AB', 'Alba'),
+    array(642, 'AR', 'Arad'),
+    array(642, 'AG', 'Arges'),
+    array(642, 'BC', 'Bacau'),
+    array(642, 'BH', 'Bihor'),
+    array(642, 'BN', 'Bistrita-Nasaud'),
+    array(642, 'BT', 'Botosani'),
+    array(642, 'BV', 'Brasov'),
+    array(642, 'BR', 'Braila'),
+    array(642, 'B', 'Bucuresti'),
+    array(642, 'BZ', 'Buzau'),
+    array(642, 'CS', 'Caras-Severin'),
+    array(642, 'CL', 'Calarasi'),
+    array(642, 'CJ', 'Cluj'),
+    array(642, 'CT', 'Constanta'),
+    array(642, 'CV', 'Covasna'),
+    array(642, 'DB', 'Dimbovita'),
+    array(642, 'DJ', 'Dolj'),
+    array(642, 'GL', 'Galati'),
+    array(642, 'GR', 'Giurgiu'),
+    array(642, 'GJ', 'Gorj'),
+    array(642, 'HR', 'Harghita'),
+    array(642, 'HD', 'Hunedoara'),
+    array(642, 'IL', 'Ialomita'),
+    array(642, 'IS', 'Iasi'),
+    array(642, 'IF', 'Ilfov'),
+    array(642, 'MM', 'Maramures'),
+    array(642, 'MH', 'Mehedinti'),
+    array(642, 'MS', 'Mures'),
+    array(642, 'NT', 'Neamt'),
+    array(642, 'OT', 'Olt'),
+    array(642, 'PH', 'Prahova'),
+    array(642, 'SM', 'Satu-Mare'),
+    array(642, 'SJ', 'Salaj'),
+    array(642, 'SB', 'Sibiu'),
+    array(642, 'SV', 'Suceava'),
+    array(642, 'TR', 'Teleorman'),
+    array(642, 'TM', 'Timis'),
+    array(642, 'TL', 'Tulcea'),
+    array(642, 'VS', 'Vaslui'),
+    array(642, 'VL', 'Valcea'),
+    array(642, 'VN', 'Vrancea'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   variable_set('uc_address_format_642',
                "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
Index: uc_store/countries/russia_643_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/russia_643_1.cif,v
retrieving revision 1.4.4.1
diff -u -r1.4.4.1 russia_643_1.cif
--- uc_store/countries/russia_643_1.cif	3 Nov 2008 21:33:50 -0000	1.4.4.1
+++ uc_store/countries/russia_643_1.cif	11 Jul 2009 20:49:49 -0000
@@ -5,93 +5,98 @@
   db_query("INSERT INTO {uc_countries} VALUES ('643', 'Russia', 'RU', 'RUS', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(643, 'AD', 'Республика Адыгея'),"
-          ."(643, 'AL', 'Республика Алтай'),"
-          ."(643, 'BA', 'Республика Башкортостан'),"
-          ."(643, 'BU', 'Республика Бурятия'),"
-          ."(643, 'DA', 'Республика Дагестан'),"
-          ."(643, 'IN', 'Республика Ингушетия'),"
-          ."(643, 'KB', 'Кабардино-Балкарская Республика'),"
-          ."(643, 'KL', 'Республика Калмыкия'),"
-          ."(643, 'KC', 'Карачаево-Черкесская республика'),"
-          ."(643, 'KR', 'Республика Карелия'),"
-          ."(643, 'KO', 'Республика Коми'),"
-          ."(643, 'ME', 'Республика Марий Эл'),"
-          ."(643, 'MO', 'Республика Мордовия'),"
-          ."(643, 'SA', 'Республика Саха (Якутия)'),"
-          ."(643, 'SE', 'Республика Северная Осетия-Алания'),"
-          ."(643, 'TA', 'Республика Татарстан'),"
-          ."(643, 'TY', 'Республика Тыва'),"
-          ."(643, 'UD', 'Удмуртская Республика'),"
-          ."(643, 'KK', 'Республика Хакасия'),"
-          ."(643, 'CE', 'Чеченская республика'),"
-          ."(643, 'CU', 'Чувашская Республика'),"
-          ."(643, 'ALT', 'Алтайский край'),"
-          ."(643, 'KDA', 'Краснодарский край'),"
-          ."(643, 'KIA', 'Красноярский край'),"
-          ."(643, 'PER', 'Пермский край'),"
-          ."(643, 'PRI', 'Приморский край'),"
-          ."(643, 'STA', 'Ставропольский край'),"
-          ."(643, 'KHA', 'Хабаровский край'),"
-          ."(643, 'AMU', 'Амурская область'),"
-          ."(643, 'ARK', 'Архангельская область'),"
-          ."(643, 'AST', 'Астраханская область'),"
-          ."(643, 'BEL', 'Белгородская область'),"
-          ."(643, 'BRY', 'Брянская область'),"
-          ."(643, 'VLA', 'Владимирская область'),"
-          ."(643, 'VGG', 'Волгоградская область'),"
-          ."(643, 'VLG', 'Вологодская область'),"
-          ."(643, 'VOR', 'Воронежская область'),"
-          ."(643, 'IVA', 'Ивановская область'),"
-          ."(643, 'IRK', 'Иркутская область'),"
-          ."(643, 'KGD', 'Калининградская область'),"
-          ."(643, 'KLU', 'Калужская область'),"
-          ."(643, 'KAM', 'Камчатская область'),"
-          ."(643, 'KEM', 'Кемеровская область'),"
-          ."(643, 'KIR', 'Кировская область'),"
-          ."(643, 'KOS', 'Костромская область'),"
-          ."(643, 'KGN', 'Курганская область'),"
-          ."(643, 'KRS', 'Курская область'),"
-          ."(643, 'LEN', 'Ленинградская область'),"
-          ."(643, 'LIP', 'Липецкая область'),"
-          ."(643, 'MAG', 'Магаданская область'),"
-          ."(643, 'MOS', 'Московская область'),"
-          ."(643, 'MUR', 'Мурманская область'),"
-          ."(643, 'NIZ', 'Нижегородская область'),"
-          ."(643, 'NGR', 'Новгородская область'),"
-          ."(643, 'NVS', 'Новосибирская область'),"
-          ."(643, 'OMS', 'Омская область'),"
-          ."(643, 'ORE', 'Оренбургская область'),"
-          ."(643, 'ORL', 'Орловская область'),"
-          ."(643, 'PNZ', 'Пензенская область'),"
-          ."(643, 'PSK', 'Псковская область'),"
-          ."(643, 'ROS', 'Ростовская область'),"
-          ."(643, 'RYA', 'Рязанская область'),"
-          ."(643, 'SAM', 'Самарская область'),"
-          ."(643, 'SAR', 'Саратовская область'),"
-          ."(643, 'SAK', 'Сахалинская область'),"
-          ."(643, 'SVE', 'Свердловская область'),"
-          ."(643, 'SMO', 'Смоленская область'),"
-          ."(643, 'TAM', 'Тамбовская область'),"
-          ."(643, 'TVE', 'Тверская область'),"
-          ."(643, 'TOM', 'Томская область'),"
-          ."(643, 'TUL', 'Тульская область'),"
-          ."(643, 'TYU', 'Тюменская область'),"
-          ."(643, 'ULY', 'Ульяновская область'),"
-          ."(643, 'CHE', 'Челябинская область'),"
-          ."(643, 'CHI', 'Читинская область'),"
-          ."(643, 'YAR', 'Ярославская область'),"
-          ."(643, 'MOW', 'Москва'),"
-          ."(643, 'SPE', 'Санкт-Петербург'),"
-          ."(643, 'YEV', 'Еврейская автономная область'),"
-          ."(643, 'AGB', 'Агинский Бурятский автономный округ'),"
-          ."(643, 'KOR', 'Корякский автономный округ'),"
-          ."(643, 'NEN', 'Ненецкий автономный округ'),"
-          ."(643, 'UOB', 'Усть-Ордынский Бурятский автономный округ'),"
-          ."(643, 'KHM', 'Ханты-Мансийский автономный округ - Югра'),"
-          ."(643, 'CHU', 'Чукотский автономный округ'),"
-          ."(643, 'YAN', 'Ямало-Ненецкий автономный округ')");
+  $zones = array(
+    array(643, 'AD', 'Республика Адыгея'),
+    array(643, 'AL', 'Республика Алтай'),
+    array(643, 'BA', 'Республика Башкортостан'),
+    array(643, 'BU', 'Республика Бурятия'),
+    array(643, 'DA', 'Республика Дагестан'),
+    array(643, 'IN', 'Республика Ингушетия'),
+    array(643, 'KB', 'Кабардино-Балкарская Республика'),
+    array(643, 'KL', 'Республика Калмыкия'),
+    array(643, 'KC', 'Карачаево-Черкесская республика'),
+    array(643, 'KR', 'Республика Карелия'),
+    array(643, 'KO', 'Республика Коми'),
+    array(643, 'ME', 'Республика Марий Эл'),
+    array(643, 'MO', 'Республика Мордовия'),
+    array(643, 'SA', 'Республика Саха (Якутия)'),
+    array(643, 'SE', 'Республика Северная Осетия-Алания'),
+    array(643, 'TA', 'Республика Татарстан'),
+    array(643, 'TY', 'Республика Тыва'),
+    array(643, 'UD', 'Удмуртская Республика'),
+    array(643, 'KK', 'Республика Хакасия'),
+    array(643, 'CE', 'Чеченская республика'),
+    array(643, 'CU', 'Чувашская Республика'),
+    array(643, 'ALT', 'Алтайский край'),
+    array(643, 'KDA', 'Краснодарский край'),
+    array(643, 'KIA', 'Красноярский край'),
+    array(643, 'PER', 'Пермский край'),
+    array(643, 'PRI', 'Приморский край'),
+    array(643, 'STA', 'Ставропольский край'),
+    array(643, 'KHA', 'Хабаровский край'),
+    array(643, 'AMU', 'Амурская область'),
+    array(643, 'ARK', 'Архангельская область'),
+    array(643, 'AST', 'Астраханская область'),
+    array(643, 'BEL', 'Белгородская область'),
+    array(643, 'BRY', 'Брянская область'),
+    array(643, 'VLA', 'Владимирская область'),
+    array(643, 'VGG', 'Волгоградская область'),
+    array(643, 'VLG', 'Вологодская область'),
+    array(643, 'VOR', 'Воронежская область'),
+    array(643, 'IVA', 'Ивановская область'),
+    array(643, 'IRK', 'Иркутская область'),
+    array(643, 'KGD', 'Калининградская область'),
+    array(643, 'KLU', 'Калужская область'),
+    array(643, 'KAM', 'Камчатская область'),
+    array(643, 'KEM', 'Кемеровская область'),
+    array(643, 'KIR', 'Кировская область'),
+    array(643, 'KOS', 'Костромская область'),
+    array(643, 'KGN', 'Курганская область'),
+    array(643, 'KRS', 'Курская область'),
+    array(643, 'LEN', 'Ленинградская область'),
+    array(643, 'LIP', 'Липецкая область'),
+    array(643, 'MAG', 'Магаданская область'),
+    array(643, 'MOS', 'Московская область'),
+    array(643, 'MUR', 'Мурманская область'),
+    array(643, 'NIZ', 'Нижегородская область'),
+    array(643, 'NGR', 'Новгородская область'),
+    array(643, 'NVS', 'Новосибирская область'),
+    array(643, 'OMS', 'Омская область'),
+    array(643, 'ORE', 'Оренбургская область'),
+    array(643, 'ORL', 'Орловская область'),
+    array(643, 'PNZ', 'Пензенская область'),
+    array(643, 'PSK', 'Псковская область'),
+    array(643, 'ROS', 'Ростовская область'),
+    array(643, 'RYA', 'Рязанская область'),
+    array(643, 'SAM', 'Самарская область'),
+    array(643, 'SAR', 'Саратовская область'),
+    array(643, 'SAK', 'Сахалинская область'),
+    array(643, 'SVE', 'Свердловская область'),
+    array(643, 'SMO', 'Смоленская область'),
+    array(643, 'TAM', 'Тамбовская область'),
+    array(643, 'TVE', 'Тверская область'),
+    array(643, 'TOM', 'Томская область'),
+    array(643, 'TUL', 'Тульская область'),
+    array(643, 'TYU', 'Тюменская область'),
+    array(643, 'ULY', 'Ульяновская область'),
+    array(643, 'CHE', 'Челябинская область'),
+    array(643, 'CHI', 'Читинская область'),
+    array(643, 'YAR', 'Ярославская область'),
+    array(643, 'MOW', 'Москва'),
+    array(643, 'SPE', 'Санкт-Петербург'),
+    array(643, 'YEV', 'Еврейская автономная область'),
+    array(643, 'AGB', 'Агинский Бурятский автономный округ'),
+    array(643, 'KOR', 'Корякский автономный округ'),
+    array(643, 'NEN', 'Ненецкий автономный округ'),
+    array(643, 'UOB', 'Усть-Ордынский Бурятский автономный округ'),
+    array(643, 'KHM', 'Ханты-Мансийский автономный округ - Югра'),
+    array(643, 'CHU', 'Чукотский автономный округ'),
+    array(643, 'YAN', 'Ямало-Ненецкий автономный округ'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   uc_set_address_format(643, "!company\n!first_name !last_name\n!street1\n!street2\n!postal_code !city\n!country_name_if");
 }
Index: uc_store/countries/saint_lucia_662_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/saint_lucia_662_1.cif,v
retrieving revision 1.2.2.5
diff -u -r1.2.2.5 saint_lucia_662_1.cif
--- uc_store/countries/saint_lucia_662_1.cif	3 Nov 2008 21:33:50 -0000	1.2.2.5
+++ uc_store/countries/saint_lucia_662_1.cif	11 Jul 2009 20:49:49 -0000
@@ -11,18 +11,23 @@
   db_query("INSERT INTO {uc_countries} VALUES (662, 'Saint Lucia', 'LC', 'LCA', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(662, 'AR', 'Anse-la-Raye'),"
-          ."(662, 'CA', 'Castries'),"
-          ."(662, 'CH', 'Choiseul'),"
-          ."(662, 'DA', 'Dauphin'),"
-          ."(662, 'DE', 'Dennery'),"
-          ."(662, 'GI', 'Gros-Islet'),"
-          ."(662, 'LA', 'Laborie'),"
-          ."(662, 'MI', 'Micoud'),"
-          ."(662, 'PR', 'Praslin'),"
-          ."(662, 'SO', 'Soufriere'),"
-          ."(662, 'VF', 'Vieux-Fort')");
+  $zones = array(
+    array(662, 'AR', 'Anse-la-Raye'),
+    array(662, 'CA', 'Castries'),
+    array(662, 'CH', 'Choiseul'),
+    array(662, 'DA', 'Dauphin'),
+    array(662, 'DE', 'Dennery'),
+    array(662, 'GI', 'Gros-Islet'),
+    array(662, 'LA', 'Laborie'),
+    array(662, 'MI', 'Micoud'),
+    array(662, 'PR', 'Praslin'),
+    array(662, 'SO', 'Soufriere'),
+    array(662, 'VF', 'Vieux-Fort'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.  Documentation on address formats
Index: uc_store/countries/slovak_703_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/Attic/slovak_703_1.cif,v
retrieving revision 1.1.4.2
diff -u -r1.1.4.2 slovak_703_1.cif
--- uc_store/countries/slovak_703_1.cif	7 Nov 2008 21:13:24 -0000	1.1.4.2
+++ uc_store/countries/slovak_703_1.cif	11 Jul 2009 20:49:49 -0000
@@ -23,15 +23,20 @@
   //  SK-TC Trenčín Region
   //  SK-ZI Žilina Region
 
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(703, 'SK-BC', 'Banskobystrický kraj'),"
-          ."(703, 'SK-BL', 'Bratislavský kraj'),"
-          ."(703, 'SK-KI', 'Košický kraj'),"
-          ."(703, 'SK-NJ', 'Nitriansky kraj'),"
-          ."(703, 'SK-PV', 'Prešovský kraj'),"
-          ."(703, 'SK-TA', 'Trenčiansky kraj'),"
-          ."(703, 'SK-TC', 'Trnavský kraj'),"
-          ."(703, 'SK-ZI', 'Žilinský kraj')");
+  $zones = array(
+    array(703, 'SK-BC', 'Banskobystrický kraj'),
+    array(703, 'SK-BL', 'Bratislavský kraj'),
+    array(703, 'SK-KI', 'Košický kraj'),
+    array(703, 'SK-NJ', 'Nitriansky kraj'),
+    array(703, 'SK-PV', 'Prešovský kraj'),
+    array(703, 'SK-TA', 'Trenčiansky kraj'),
+    array(703, 'SK-TC', 'Trnavský kraj'),
+    array(703, 'SK-ZI', 'Žilinský kraj'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   uc_set_address_format(703,
     "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
Index: uc_store/countries/south_africa_710_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/south_africa_710_1.cif,v
retrieving revision 1.4.4.1
diff -u -r1.4.4.1 south_africa_710_1.cif
--- uc_store/countries/south_africa_710_1.cif	3 Nov 2008 21:33:50 -0000	1.4.4.1
+++ uc_store/countries/south_africa_710_1.cif	11 Jul 2009 20:49:49 -0000
@@ -11,16 +11,21 @@
   db_query("INSERT INTO {uc_countries} VALUES (710, 'South Africa', 'ZA', 'ZAF', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(710, 'EC', 'Eastern Cape'),"
-          ."(710, 'FS', 'Free State'),"
-          ."(710, 'GT', 'Gauteng'),"
-          ."(710, 'KZN', 'KwaZulu-Natal'),"
-          ."(710, 'LP', 'Limpopo'),"
-          ."(710, 'MP', 'Mpumalanga'),"
-          ."(710, 'NC', 'Northern Cape'),"
-          ."(710, 'NW', 'North West'),"
-          ."(710, 'WC', 'Western Cape')");
+  $zones = array(
+    array(710, 'EC', 'Eastern Cape'),
+    array(710, 'FS', 'Free State'),
+    array(710, 'GT', 'Gauteng'),
+    array(710, 'KZN', 'KwaZulu-Natal'),
+    array(710, 'LP', 'Limpopo'),
+    array(710, 'MP', 'Mpumalanga'),
+    array(710, 'NC', 'Northern Cape'),
+    array(710, 'NW', 'North West'),
+    array(710, 'WC', 'Western Cape'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.  Documentation on address formats
Index: uc_store/countries/spain_724_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/spain_724_1.cif,v
retrieving revision 1.3.4.1
diff -u -r1.3.4.1 spain_724_1.cif
--- uc_store/countries/spain_724_1.cif	3 Nov 2008 21:33:50 -0000	1.3.4.1
+++ uc_store/countries/spain_724_1.cif	11 Jul 2009 20:49:49 -0000
@@ -11,59 +11,64 @@
   db_query("INSERT INTO {uc_countries} VALUES ('724', 'Spain', 'ES', 'ESP', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-      ."(724, 'CA','A Coruña'),"
-      ."(724, 'AL','Álava'),"
-      ."(724, 'AB','Albacete'),"
-      ."(724, 'AC','Alicante'),"
-      ."(724, 'AM','Almería'),"
-      ."(724, 'AS','Asturias'),"
-      ."(724, 'AV','Ávila'),"
-      ."(724, 'BJ','Badajoz'),"
-      ."(724, 'IB','Baleares'),"
-      ."(724, 'BA','Barcelona'),"
-      ."(724, 'BU','Burgos'),"
-      ."(724, 'CC','Cáceres'),"
-      ."(724, 'CZ','Cádiz'),"
-      ."(724, 'CT','Cantabria'),"
-      ."(724, 'CL','Castellón'),"
-      ."(724, 'CE','Ceuta'),"
-      ."(724, 'CR','Ciudad Real'),"
-      ."(724, 'CD','Córdoba'),"
-      ."(724, 'CU','Cuenca'),"
-      ."(724, 'GI','Girona'),"
-      ."(724, 'GD','Granada'),"
-      ."(724, 'GJ','Guadalajara'),"
-      ."(724, 'GP','Guipúzcoa'),"
-      ."(724, 'HL','Huelva'),"
-      ."(724, 'HS','Huesca'),"
-      ."(724, 'JN','Jaén'),"
-      ."(724, 'RJ','La Rioja'),"
-      ."(724, 'PM','Las Palmas'),"
-      ."(724, 'LE','León'),"
-      ."(724, 'LL','Lleida'),"
-      ."(724, 'LG','Lugo'),"
-      ."(724, 'MD','Madrid'),"
-      ."(724, 'MA','Málaga'),"
-      ."(724, 'ML','Melilla'),"
-      ."(724, 'MU','Murcia'),"
-      ."(724, 'NV','Navarra'),"
-      ."(724, 'OU','Ourense'),"
-      ."(724, 'PL','Palencia'),"
-      ."(724, 'PO','Pontevedra'),"
-      ."(724, 'SL','Salamanca'),"
-      ."(724, 'SC','Santa Cruz de Tenerife'),"
-      ."(724, 'SG','Segovia'),"
-      ."(724, 'SV','Sevilla'),"
-      ."(724, 'SO','Soria'),"
-      ."(724, 'TA','Tarragona'),"
-      ."(724, 'TE','Teruel'),"
-      ."(724, 'TO','Toledo'),"
-      ."(724, 'VC','Valencia'),"
-      ."(724, 'VD','Valladolid'),"
-      ."(724, 'VZ','Vizcaya'),"
-      ."(724, 'ZM','Zamora'),"
-      ."(724, 'ZR','Zaragoza')");
+  $zones = array(
+    array(724, 'CA','A Coruña'),
+    array(724, 'AL','Álava'),
+    array(724, 'AB','Albacete'),
+    array(724, 'AC','Alicante'),
+    array(724, 'AM','Almería'),
+    array(724, 'AS','Asturias'),
+    array(724, 'AV','Ávila'),
+    array(724, 'BJ','Badajoz'),
+    array(724, 'IB','Baleares'),
+    array(724, 'BA','Barcelona'),
+    array(724, 'BU','Burgos'),
+    array(724, 'CC','Cáceres'),
+    array(724, 'CZ','Cádiz'),
+    array(724, 'CT','Cantabria'),
+    array(724, 'CL','Castellón'),
+    array(724, 'CE','Ceuta'),
+    array(724, 'CR','Ciudad Real'),
+    array(724, 'CD','Córdoba'),
+    array(724, 'CU','Cuenca'),
+    array(724, 'GI','Girona'),
+    array(724, 'GD','Granada'),
+    array(724, 'GJ','Guadalajara'),
+    array(724, 'GP','Guipúzcoa'),
+    array(724, 'HL','Huelva'),
+    array(724, 'HS','Huesca'),
+    array(724, 'JN','Jaén'),
+    array(724, 'RJ','La Rioja'),
+    array(724, 'PM','Las Palmas'),
+    array(724, 'LE','León'),
+    array(724, 'LL','Lleida'),
+    array(724, 'LG','Lugo'),
+    array(724, 'MD','Madrid'),
+    array(724, 'MA','Málaga'),
+    array(724, 'ML','Melilla'),
+    array(724, 'MU','Murcia'),
+    array(724, 'NV','Navarra'),
+    array(724, 'OU','Ourense'),
+    array(724, 'PL','Palencia'),
+    array(724, 'PO','Pontevedra'),
+    array(724, 'SL','Salamanca'),
+    array(724, 'SC','Santa Cruz de Tenerife'),
+    array(724, 'SG','Segovia'),
+    array(724, 'SV','Sevilla'),
+    array(724, 'SO','Soria'),
+    array(724, 'TA','Tarragona'),
+    array(724, 'TE','Teruel'),
+    array(724, 'TO','Toledo'),
+    array(724, 'VC','Valencia'),
+    array(724, 'VD','Valladolid'),
+    array(724, 'VZ','Vizcaya'),
+    array(724, 'ZM','Zamora'),
+    array(724, 'ZR','Zaragoza'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.  Documentation on address formats
Index: uc_store/countries/sweden_752_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/sweden_752_1.cif,v
retrieving revision 1.4.4.1
diff -u -r1.4.4.1 sweden_752_1.cif
--- uc_store/countries/sweden_752_1.cif	3 Nov 2008 21:33:50 -0000	1.4.4.1
+++ uc_store/countries/sweden_752_1.cif	11 Jul 2009 20:49:49 -0000
@@ -11,28 +11,33 @@
   db_query("INSERT INTO {uc_countries} VALUES ('752', 'Sweden', 'SE', 'SWE', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(752, 'BL', 'Blekinge'),"
-          ."(752, 'DA', 'Dalarna'),"
-          ."(752, 'GA', 'Gavleborg'),"
-          ."(752, 'GO', 'Gotland'),"
-          ."(752, 'HA', 'Halland'),"
-          ."(752, 'JA', 'Jamtland'),"
-          ."(752, 'JO', 'Jonkoping'),"
-          ."(752, 'KA', 'Kalmar'),"
-          ."(752, 'KR', 'Kronoberg'),"
-          ."(752, 'NO', 'Norrbotten'),"
-          ."(752, 'OR', 'Orebro'),"
-          ."(752, 'OS', 'Ostergotland'),"
-          ."(752, 'SK', 'Skane'),"
-          ."(752, 'SO', 'Sodermanland'),"
-          ."(752, 'ST', 'Stockholm'),"
-          ."(752, 'UP', 'Uppsala'),"
-          ."(752, 'VL', 'Varmland'),"
-          ."(752, 'VB', 'Vasterbotten'),"
-          ."(752, 'VN', 'Vasternorrland'),"
-          ."(752, 'VM', 'Vastmanland'),"
-          ."(752, 'VG', 'Vastra Gotaland')");
+  $zones = array(
+    array(752, 'BL', 'Blekinge'),
+    array(752, 'DA', 'Dalarna'),
+    array(752, 'GA', 'Gavleborg'),
+    array(752, 'GO', 'Gotland'),
+    array(752, 'HA', 'Halland'),
+    array(752, 'JA', 'Jamtland'),
+    array(752, 'JO', 'Jonkoping'),
+    array(752, 'KA', 'Kalmar'),
+    array(752, 'KR', 'Kronoberg'),
+    array(752, 'NO', 'Norrbotten'),
+    array(752, 'OR', 'Orebro'),
+    array(752, 'OS', 'Ostergotland'),
+    array(752, 'SK', 'Skane'),
+    array(752, 'SO', 'Sodermanland'),
+    array(752, 'ST', 'Stockholm'),
+    array(752, 'UP', 'Uppsala'),
+    array(752, 'VL', 'Varmland'),
+    array(752, 'VB', 'Vasterbotten'),
+    array(752, 'VN', 'Vasternorrland'),
+    array(752, 'VM', 'Vastmanland'),
+    array(752, 'VG', 'Vastra Gotaland'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.  Documentation on address formats
Index: uc_store/countries/switzerland_756_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/switzerland_756_1.cif,v
retrieving revision 1.4.4.1
diff -u -r1.4.4.1 switzerland_756_1.cif
--- uc_store/countries/switzerland_756_1.cif	3 Nov 2008 21:33:50 -0000	1.4.4.1
+++ uc_store/countries/switzerland_756_1.cif	11 Jul 2009 20:49:49 -0000
@@ -11,33 +11,38 @@
   db_query("INSERT INTO {uc_countries} VALUES ('756', 'Switzerland', 'CH', 'CHE', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(756, 'AG', 'Aargau'),"
-          ."(756, 'AI', 'Appenzell Innerrhoden'),"
-          ."(756, 'AR', 'Appenzell Ausserrhoden'),"
-          ."(756, 'BS', 'Basel-Stadt'),"
-          ."(756, 'BL', 'Basel-Landschaft'),"
-          ."(756, 'BE', 'Bern'),"
-          ."(756, 'FR', 'Fribourg'),"
-          ."(756, 'GE', 'Geneva'),"
-          ."(756, 'GL', 'Glarus'),"
-          ."(756, 'GR', 'Graubünden'),"
-          ."(756, 'JU', 'Jura'),"
-          ."(756, 'LU', 'Luzern'),"
-          ."(756, 'NE', 'Neuchâtel'),"
-          ."(756, 'NW', 'Nidwalden'),"
-          ."(756, 'OW', 'Obwalden'),"
-          ."(756, 'SH', 'Schaffhausen'),"
-          ."(756, 'SZ', 'Schwyz'),"
-          ."(756, 'SO', 'Solothurn'),"
-          ."(756, 'SG', 'St. Gallen'),"
-          ."(756, 'TG', 'Thurgau'),"
-          ."(756, 'TI', 'Ticino'),"
-          ."(756, 'UR', 'Uri'),"
-          ."(756, 'VS', 'Valais'),"
-          ."(756, 'VD', 'Vaud'),"
-          ."(756, 'ZG', 'Zug'),"
-          ."(756, 'ZH', 'Zürich')");
+  $zones = array(
+    array(756, 'AG', 'Aargau'),
+    array(756, 'AI', 'Appenzell Innerrhoden'),
+    array(756, 'AR', 'Appenzell Ausserrhoden'),
+    array(756, 'BS', 'Basel-Stadt'),
+    array(756, 'BL', 'Basel-Landschaft'),
+    array(756, 'BE', 'Bern'),
+    array(756, 'FR', 'Fribourg'),
+    array(756, 'GE', 'Geneva'),
+    array(756, 'GL', 'Glarus'),
+    array(756, 'GR', 'Graubünden'),
+    array(756, 'JU', 'Jura'),
+    array(756, 'LU', 'Luzern'),
+    array(756, 'NE', 'Neuchâtel'),
+    array(756, 'NW', 'Nidwalden'),
+    array(756, 'OW', 'Obwalden'),
+    array(756, 'SH', 'Schaffhausen'),
+    array(756, 'SZ', 'Schwyz'),
+    array(756, 'SO', 'Solothurn'),
+    array(756, 'SG', 'St. Gallen'),
+    array(756, 'TG', 'Thurgau'),
+    array(756, 'TI', 'Ticino'),
+    array(756, 'UR', 'Uri'),
+    array(756, 'VS', 'Valais'),
+    array(756, 'VD', 'Vaud'),
+    array(756, 'ZG', 'Zug'),
+    array(756, 'ZH', 'Zürich'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.  Documentation on address formats
Index: uc_store/countries/taiwan_158_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/taiwan_158_1.cif,v
retrieving revision 1.2.2.4
diff -u -r1.2.2.4 taiwan_158_1.cif
--- uc_store/countries/taiwan_158_1.cif	3 Nov 2008 21:33:50 -0000	1.2.2.4
+++ uc_store/countries/taiwan_158_1.cif	11 Jul 2009 20:49:49 -0000
@@ -11,59 +11,64 @@
   db_query("INSERT INTO {uc_countries} VALUES (158, 'Taiwan', 'TW', 'TWN', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(158, '01', 'ChangHua County'),"
-          ."(158, '02', 'ChiaYi City'),"
-          ."(158, '03', 'ChiaYi County'),"
-          ."(158, '04', 'HsinChu City'),"
-          ."(158, '05', 'HsinChu County'),"
-          ."(158, '06', 'HuaLien County'),"
-          ."(158, '07', 'KaoHsiung City'),"
-          ."(158, '08', 'KaoHsiung County'),"
-          ."(158, '09', 'KeeLung City '),"
-          ."(158, '10', 'KinMen County'),"
-          ."(158, '11', 'LienChiang County'),"
-          ."(158, '12', 'MiaoLi County'),"
-          ."(158, '13', 'NanHai'),"
-          ."(158, '14', 'NanTou County'),"
-          ."(158, '15', 'PengHu County'),"
-          ."(158, '16', 'PingTung County'),"
-          ."(158, '17', 'TaiChung City'),"
-          ."(158, '18', 'TaiChung County'),"
-          ."(158, '19', 'TaiNan City'),"
-          ."(158, '20', 'TaiNan County'),"
-          ."(158, '21', 'Taipei City'),"
-          ."(158, '22', 'Taipei County'),"
-          ."(158, '23', 'TaiTung County'),"
-          ."(158, '24', 'TaoYuan County'),"
-          ."(158, '25', 'Yilan County'),"
-          ."(158, '26', 'YunLin County'),"
-          ."(158, '27', '南投縣'),"
-          ."(158, '28', '南海諸島'),"
-          ."(158, '29', '嘉義市'),"
-          ."(158, '30', '嘉義縣'),"
-          ."(158, '31', '基隆市'),"
-          ."(158, '32', '宜蘭縣'),"
-          ."(158, '33', '屏東縣'),"
-          ."(158, '34', '彰化縣'),"
-          ."(158, '35', '新竹市'),"
-          ."(158, '36', '新竹縣'),"
-          ."(158, '37', '桃園縣'),"
-          ."(158, '38', '澎湖縣'),"
-          ."(158, '39', '臺中市'),"
-          ."(158, '40', '臺中縣'),"
-          ."(158, '41', '臺北市'),"
-          ."(158, '42', '臺北縣'),"
-          ."(158, '43', '臺南市'),"
-          ."(158, '44', '臺南縣'),"
-          ."(158, '45', '臺東縣'),"
-          ."(158, '46', '花蓮縣'),"
-          ."(158, '47', '苗栗縣'),"
-          ."(158, '48', '連江縣'),"
-          ."(158, '49', '金門縣'),"
-          ."(158, '50', '雲林縣'),"
-          ."(158, '51', '高雄市'),"
-          ."(158, '52', '高雄縣')");
+  $zones = array(
+    array(158, '01', 'ChangHua County'),
+    array(158, '02', 'ChiaYi City'),
+    array(158, '03', 'ChiaYi County'),
+    array(158, '04', 'HsinChu City'),
+    array(158, '05', 'HsinChu County'),
+    array(158, '06', 'HuaLien County'),
+    array(158, '07', 'KaoHsiung City'),
+    array(158, '08', 'KaoHsiung County'),
+    array(158, '09', 'KeeLung City '),
+    array(158, '10', 'KinMen County'),
+    array(158, '11', 'LienChiang County'),
+    array(158, '12', 'MiaoLi County'),
+    array(158, '13', 'NanHai'),
+    array(158, '14', 'NanTou County'),
+    array(158, '15', 'PengHu County'),
+    array(158, '16', 'PingTung County'),
+    array(158, '17', 'TaiChung City'),
+    array(158, '18', 'TaiChung County'),
+    array(158, '19', 'TaiNan City'),
+    array(158, '20', 'TaiNan County'),
+    array(158, '21', 'Taipei City'),
+    array(158, '22', 'Taipei County'),
+    array(158, '23', 'TaiTung County'),
+    array(158, '24', 'TaoYuan County'),
+    array(158, '25', 'Yilan County'),
+    array(158, '26', 'YunLin County'),
+    array(158, '27', '南投縣'),
+    array(158, '28', '南海諸島'),
+    array(158, '29', '嘉義市'),
+    array(158, '30', '嘉義縣'),
+    array(158, '31', '基隆市'),
+    array(158, '32', '宜蘭縣'),
+    array(158, '33', '屏東縣'),
+    array(158, '34', '彰化縣'),
+    array(158, '35', '新竹市'),
+    array(158, '36', '新竹縣'),
+    array(158, '37', '桃園縣'),
+    array(158, '38', '澎湖縣'),
+    array(158, '39', '臺中市'),
+    array(158, '40', '臺中縣'),
+    array(158, '41', '臺北市'),
+    array(158, '42', '臺北縣'),
+    array(158, '43', '臺南市'),
+    array(158, '44', '臺南縣'),
+    array(158, '45', '臺東縣'),
+    array(158, '46', '花蓮縣'),
+    array(158, '47', '苗栗縣'),
+    array(158, '48', '連江縣'),
+    array(158, '49', '金門縣'),
+    array(158, '50', '雲林縣'),
+    array(158, '51', '高雄市'),
+    array(158, '52', '高雄縣'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   uc_set_address_format(158,
     "!company\r\n!last_name !first_name\r\n!street1\r\n!street2\r\n"
Index: uc_store/countries/thailand_764_2.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/Attic/thailand_764_2.cif,v
retrieving revision 1.1.4.2
diff -u -r1.1.4.2 thailand_764_2.cif
--- uc_store/countries/thailand_764_2.cif	8 Jul 2009 12:56:50 -0000	1.1.4.2
+++ uc_store/countries/thailand_764_2.cif	11 Jul 2009 20:49:49 -0000
@@ -11,83 +11,88 @@
   db_query("INSERT INTO {uc_countries} VALUES (764, 'Thailand', 'TH', 'THA', 2)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-      ."(764, '1', 'กรุงเทพมหานคร'),"
-      ."(764, '2', 'นนทบุรี'),"
-      ."(764, '3', 'สมุทรปราการ'),"
-      ."(764, '4', 'ปทุมธานี'),"
-      ."(764, '5', 'ภูเก็ต'),"
-      ."(764, '6', 'สมุทรสาคร'),"
-      ."(764, '7', 'สมุทรสงคราม'),"
-      ."(764, '8', 'นครปฐม'),"
-      ."(764, '9', 'ปัตตานี'),"
-      ."(764, '10', 'พระนครศรีอยุธยา'),"
-      ."(764, '11', 'อ่างทอง'),"
-      ."(764, '12', 'ชลบุรี'),"
-      ."(764, '13', 'สิงห์บุรี'),"
-      ."(764, '14', 'สงขลา'),"
-      ."(764, '15', 'มหาสารคาม'),"
-      ."(764, '16', 'สระบุรี'),"
-      ."(764, '17', 'สุรินทร์'),"
-      ."(764, '18', 'ระยอง'),"
-      ."(764, '19', 'ศรีสะเกษ'),"
-      ."(764, '20', 'ขอนแก่น'),"
-      ."(764, '21', 'ราชบุรี'),"
-      ."(764, '22', 'นราธิวาส'),"
-      ."(764, '23', 'ร้อยเอ็ด'),"
-      ."(764, '24', 'สุพรรณบุรี'),"
-      ."(764, '25', 'นครศรีธรรมราช'),"
-      ."(764, '26', 'บุรีรัมย์'),"
-      ."(764, '27', 'พัทลุง'),"
-      ."(764, '28', 'กาฬสินธุ์'),"
-      ."(764, '29', 'ชัยนาท'),"
-      ."(764, '30', 'อุดรธานี'),"
-      ."(764, '31', 'ยโสธร'),"
-      ."(764, '32', 'หนองบัวลำภู'),"
-      ."(764, '33', 'นครพนม'),"
-      ."(764, '34', 'นครราชสีมา'),"
-      ."(764, '35', 'ตรัง'),"
-      ."(764, '36', 'ฉะเชิงเทรา'),"
-      ."(764, '37', 'หนองคาย'),"
-      ."(764, '38', 'พิจิตร'),"
-      ."(764, '39', 'ลพบุรี'),"
-      ."(764, '40', 'นครนายก'),"
-      ."(764, '41', 'อำนาจเจริญ'),"
-      ."(764, '42', 'สกลนคร'),"
-      ."(764, '43', 'สตูล'),"
-      ."(764, '44', 'อุบลราชธานี'),"
-      ."(764, '45', 'นครสวรรค์'),"
-      ."(764, '46', 'เชียงราย'),"
-      ."(764, '47', 'ยะลา'),"
-      ."(764, '48', 'ปราจีนบุรี'),"
-      ."(764, '49', 'สุโขทัย'),"
-      ."(764, '50', 'ลำพูน'),"
-      ."(764, '51', 'ชัยภูมิ'),"
-      ."(764, '52', 'กระบี่'),"
-      ."(764, '53', 'กำแพงเพชร'),"
-      ."(764, '54', 'เชียงใหม่'),"
-      ."(764, '55', 'ชุมพร'),"
-      ."(764, '56', 'จันทบุรี'),"
-      ."(764, '57', 'เพชรบูรณ์'),"
-      ."(764, '58', 'ตราด'),"
-      ."(764, '59', 'พิษณุโลก'),"
-      ."(764, '60', 'ประจวบคีรีขันธ์'),"
-      ."(764, '61', 'มุกดาหาร'),"
-      ."(764, '62', 'พะเยา'),"
-      ."(764, '63', 'สุราษฎร์ธานี'),"
-      ."(764, '64', 'สระแก้ว'),"
-      ."(764, '65', 'เพชรบุรี'),"
-      ."(764, '66', 'แพร่'),"
-      ."(764, '67', 'ลำปาง'),"
-      ."(764, '68', 'อุตรดิตถ์'),"
-      ."(764, '69', 'พังงา'),"
-      ."(764, '70', 'ระนอง'),"
-      ."(764, '71', 'เลย'),"
-      ."(764, '72', 'อุทัยธานี'),"
-      ."(764, '73', 'กาญจนบุรี'),"
-      ."(764, '74', 'น่าน'),"
-      ."(764, '75', 'ตาก'),"
-      ."(764, '76', 'แม่ฮ่องสอน')");
+  $zones = array(
+    array(764, '1', 'กรุงเทพมหานคร'),
+    array(764, '2', 'นนทบุรี'),
+    array(764, '3', 'สมุทรปราการ'),
+    array(764, '4', 'ปทุมธานี'),
+    array(764, '5', 'ภูเก็ต'),
+    array(764, '6', 'สมุทรสาคร'),
+    array(764, '7', 'สมุทรสงคราม'),
+    array(764, '8', 'นครปฐม'),
+    array(764, '9', 'ปัตตานี'),
+    array(764, '10', 'พระนครศรีอยุธยา'),
+    array(764, '11', 'อ่างทอง'),
+    array(764, '12', 'ชลบุรี'),
+    array(764, '13', 'สิงห์บุรี'),
+    array(764, '14', 'สงขลา'),
+    array(764, '15', 'มหาสารคาม'),
+    array(764, '16', 'สระบุรี'),
+    array(764, '17', 'สุรินทร์'),
+    array(764, '18', 'ระยอง'),
+    array(764, '19', 'ศรีสะเกษ'),
+    array(764, '20', 'ขอนแก่น'),
+    array(764, '21', 'ราชบุรี'),
+    array(764, '22', 'นราธิวาส'),
+    array(764, '23', 'ร้อยเอ็ด'),
+    array(764, '24', 'สุพรรณบุรี'),
+    array(764, '25', 'นครศรีธรรมราช'),
+    array(764, '26', 'บุรีรัมย์'),
+    array(764, '27', 'พัทลุง'),
+    array(764, '28', 'กาฬสินธุ์'),
+    array(764, '29', 'ชัยนาท'),
+    array(764, '30', 'อุดรธานี'),
+    array(764, '31', 'ยโสธร'),
+    array(764, '32', 'หนองบัวลำภู'),
+    array(764, '33', 'นครพนม'),
+    array(764, '34', 'นครราชสีมา'),
+    array(764, '35', 'ตรัง'),
+    array(764, '36', 'ฉะเชิงเทรา'),
+    array(764, '37', 'หนองคาย'),
+    array(764, '38', 'พิจิตร'),
+    array(764, '39', 'ลพบุรี'),
+    array(764, '40', 'นครนายก'),
+    array(764, '41', 'อำนาจเจริญ'),
+    array(764, '42', 'สกลนคร'),
+    array(764, '43', 'สตูล'),
+    array(764, '44', 'อุบลราชธานี'),
+    array(764, '45', 'นครสวรรค์'),
+    array(764, '46', 'เชียงราย'),
+    array(764, '47', 'ยะลา'),
+    array(764, '48', 'ปราจีนบุรี'),
+    array(764, '49', 'สุโขทัย'),
+    array(764, '50', 'ลำพูน'),
+    array(764, '51', 'ชัยภูมิ'),
+    array(764, '52', 'กระบี่'),
+    array(764, '53', 'กำแพงเพชร'),
+    array(764, '54', 'เชียงใหม่'),
+    array(764, '55', 'ชุมพร'),
+    array(764, '56', 'จันทบุรี'),
+    array(764, '57', 'เพชรบูรณ์'),
+    array(764, '58', 'ตราด'),
+    array(764, '59', 'พิษณุโลก'),
+    array(764, '60', 'ประจวบคีรีขันธ์'),
+    array(764, '61', 'มุกดาหาร'),
+    array(764, '62', 'พะเยา'),
+    array(764, '63', 'สุราษฎร์ธานี'),
+    array(764, '64', 'สระแก้ว'),
+    array(764, '65', 'เพชรบุรี'),
+    array(764, '66', 'แพร่'),
+    array(764, '67', 'ลำปาง'),
+    array(764, '68', 'อุตรดิตถ์'),
+    array(764, '69', 'พังงา'),
+    array(764, '70', 'ระนอง'),
+    array(764, '71', 'เลย'),
+    array(764, '72', 'อุทัยธานี'),
+    array(764, '73', 'กาญจนบุรี'),
+    array(764, '74', 'น่าน'),
+    array(764, '75', 'ตาก'),
+    array(764, '76', 'แม่ฮ่องสอน'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.  Documentation on address formats
Index: uc_store/countries/ukraine_804_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/ukraine_804_1.cif,v
retrieving revision 1.2.2.4
diff -u -r1.2.2.4 ukraine_804_1.cif
--- uc_store/countries/ukraine_804_1.cif	3 Nov 2008 21:33:50 -0000	1.2.2.4
+++ uc_store/countries/ukraine_804_1.cif	11 Jul 2009 20:49:49 -0000
@@ -5,31 +5,36 @@
   db_query("INSERT INTO {uc_countries} VALUES ('804', 'Україна', 'UA', 'UKR', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(804, 'VN', 'Вінницька область'),"
-          ."(804, 'LT', 'Волинська область'),"
-          ."(804, 'DP', 'Дніпропетровська область'),"
-          ."(804, 'DN', 'Донецька область'),"
-          ."(804, 'ZT', 'Житомирська область'),"
-          ."(804, 'UZ', 'Закарпатська область'),"
-          ."(804, 'ZP', 'Запорізька область'),"
-          ."(804, 'IF', 'Івано-Франківська область'),"
-          ."(804, 'KV', 'Київська область'),"
-          ."(804, 'KR', 'Кіровоградська область'),"
-          ."(804, 'LG', 'Луганська область'),"
-          ."(804, 'LV', 'Львівська область'),"
-          ."(804, 'MK', 'Миколаївська область'),"
-          ."(804, 'OD', 'Одеська область'),"
-          ."(804, 'PL', 'Полтавська область'),"
-          ."(804, 'RV', 'Рівненська область'),"
-          ."(804, 'SM', 'Сумська область'),"
-          ."(804, 'TE', 'Тернопільська область'),"
-          ."(804, 'KH', 'Харківська область'),"
-          ."(804, 'KS', 'Херсонська область'),"
-          ."(804, 'KM', 'Хмельницька область'),"
-          ."(804, 'CK', 'Черкаська область'),"
-          ."(804, 'CN', 'Чернігівська область'),"
-          ."(804, 'CV', 'Чернівецька область')");
+  $zones = array(
+    array(804, 'VN', 'Вінницька область'),
+    array(804, 'LT', 'Волинська область'),
+    array(804, 'DP', 'Дніпропетровська область'),
+    array(804, 'DN', 'Донецька область'),
+    array(804, 'ZT', 'Житомирська область'),
+    array(804, 'UZ', 'Закарпатська область'),
+    array(804, 'ZP', 'Запорізька область'),
+    array(804, 'IF', 'Івано-Франківська область'),
+    array(804, 'KV', 'Київська область'),
+    array(804, 'KR', 'Кіровоградська область'),
+    array(804, 'LG', 'Луганська область'),
+    array(804, 'LV', 'Львівська область'),
+    array(804, 'MK', 'Миколаївська область'),
+    array(804, 'OD', 'Одеська область'),
+    array(804, 'PL', 'Полтавська область'),
+    array(804, 'RV', 'Рівненська область'),
+    array(804, 'SM', 'Сумська область'),
+    array(804, 'TE', 'Тернопільська область'),
+    array(804, 'KH', 'Харківська область'),
+    array(804, 'KS', 'Херсонська область'),
+    array(804, 'KM', 'Хмельницька область'),
+    array(804, 'CK', 'Черкаська область'),
+    array(804, 'CN', 'Чернігівська область'),
+    array(804, 'CV', 'Чернівецька область'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   uc_set_address_format(804, "!country_name\n!zone_name\n!city\n!postal_code\n!street1\n!street2\n!company\n!first_name !last_name");
 }
Index: uc_store/countries/united_arab_emirates_784_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/united_arab_emirates_784_1.cif,v
retrieving revision 1.2.2.4
diff -u -r1.2.2.4 united_arab_emirates_784_1.cif
--- uc_store/countries/united_arab_emirates_784_1.cif	3 Nov 2008 21:33:50 -0000	1.2.2.4
+++ uc_store/countries/united_arab_emirates_784_1.cif	11 Jul 2009 20:49:49 -0000
@@ -6,13 +6,18 @@
   db_query("INSERT INTO {uc_countries} VALUES (784, 'United Arab Emirates', 'AE', 'ARE', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(784, 'DXB', 'Dubai'),"
-          ."(784, 'SHJ', 'Sharjah'),"
-          ."(784, 'ABU', 'Abu dhabi'),"
-          ."(784, 'UAQ', 'UM Al Quwain'),"
-          ."(784, 'FUJ', 'Fujairah'),"
-          ."(784, 'Ala', 'Al Ain')");
+  $zones = array(
+    array(784, 'DXB', 'Dubai'),
+    array(784, 'SHJ', 'Sharjah'),
+    array(784, 'ABU', 'Abu dhabi'),
+    array(784, 'UAQ', 'UM Al Quwain'),
+    array(784, 'FUJ', 'Fujairah'),
+    array(784, 'Ala', 'Al Ain'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   uc_set_address_format(784,
     "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
Index: uc_store/countries/united_kingdom_826_2.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/Attic/united_kingdom_826_2.cif,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 united_kingdom_826_2.cif
--- uc_store/countries/united_kingdom_826_2.cif	28 May 2009 20:49:21 -0000	1.1.2.1
+++ uc_store/countries/united_kingdom_826_2.cif	11 Jul 2009 20:49:49 -0000
@@ -11,119 +11,123 @@
   db_query("INSERT INTO {uc_countries} VALUES ('826', 'United Kingdom', 'GB', 'GBR', 2)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(826, 'ABN', 'Aberdeen'),"
-          ."(826, 'ABNS', 'Aberdeenshire'),"
-          ."(826, 'ANG', 'Anglesey'),"
-          ."(826, 'AGS', 'Angus'),"
-          ."(826, 'ARY', 'Argyll and Bute'),"
-          ."(826, 'AVON', 'Avon'),"
-          ."(826, 'BEDS', 'Bedfordshire'),"
-          ."(826, 'BERKS', 'Berkshire'),"
-          ."(826, 'BLA', 'Blaenau Gwent'),"
-          ."(826, 'BRI', 'Bridgend'),"
-          ."(826, 'BSTL', 'Bristol'),"
-          ."(826, 'BUCKS', 'Buckinghamshire'),"
-          ."(826, 'CAE', 'Caerphilly'),"
-          ."(826, 'CAMBS', 'Cambridgeshire'),"
-          ."(826, 'CDF', 'Cardiff'),"
-          ."(826, 'CARM', 'Carmarthenshire'),"
-          ."(826, 'CDGN', 'Ceredigion'),"
-          ."(826, 'CHES', 'Cheshire'),"
-          ."(826, 'CLACK', 'Clackmannanshire'),"
-          ."(826, 'CLVD', 'Cleveland'),"
-          ."(826, 'CON', 'Conwy'),"
-          ."(826, 'CORN', 'Cornwall'),"
-          ."(826, 'COAN', 'County Antrim'),"
-          ."(826, 'COAR', 'County Armagh'),"
-          ."(826, 'CODN', 'County Down'),"
-          ."(826, 'COFE', 'County Fermanagh'),"
-          ."(826, 'COLO', 'County Londonderry'),"
-          ."(826, 'COTY', 'County Tyrone'),"
-          ."(826, 'CMA', 'Cumbria'),"
-          ."(826, 'DNBG', 'Denbighshire'),"
-          ."(826, 'DERBY', 'Derbyshire'),"
-          ."(826, 'DVN', 'Devon'),"
-          ."(826, 'DOR', 'Dorset'),"
-          ."(826, 'DGL', 'Dumfries and Galloway'),"
-          ."(826, 'DUND', 'Dundee'),"
-          ."(826, 'DHM', 'Durham'),"
-          ."(826, 'ARYE', 'East Ayrshire'),"
-          ."(826, 'DUNBE', 'East Dunbartonshire'),"
-          ."(826, 'LOTE', 'East Lothian'),"
-          ."(826, 'RENE', 'East Renfrewshire'),"
-          ."(826, 'ERYS', 'East Riding of Yorkshire'),"
-          ."(826, 'SXE', 'East Sussex'),"
-          ."(826, 'EDIN', 'Edinburgh'),"
-          ."(826, 'ESX', 'Essex'),"
-          ."(826, 'FALK', 'Falkirk'),"
-          ."(826, 'FFE', 'Fife'),"
-          ."(826, 'FLINT', 'Flintshire'),"
-          ."(826, 'GLAS', 'Glasgow'),"
-          ."(826, 'GLOS', 'Gloucestershire'),"
-          ."(826, 'MAN', 'Greater Manchester'),"
-          ."(826, 'GDD', 'Gwynedd'),"
-          ."(826, 'HANTS', 'Hampshire'),"
-          ."(826, 'HWR', 'Herefordshire'),"
-          ."(826, 'HERTS', 'Hertfordshire'),"
-          ."(826, 'HLD', 'Highlands'),"
-          ."(826, 'IVER', 'Inverclyde'),"
-          ."(826, 'IOW', 'Isle of Wight'),"
-          ."(826, 'IOS', 'Isles of Scilly'),"
-          ."(826, 'KNT', 'Kent'),"
-          ."(826, 'LANCS', 'Lancashire'),"
-          ."(826, 'LEICS', 'Leicestershire'),"
-          ."(826, 'LINCS', 'Lincolnshire'),"
-          ."(826, 'LDN', 'London'),"
-          ."(826, 'MSY', 'Merseyside'),"
-          ."(826, 'MERT', 'Merthyr Tydfil'),"
-          ."(826, 'MIDDX', 'Middlesex'),"
-          ."(826, 'MLOT', 'Midlothian'),"
-          ."(826, 'MMOUTH', 'Monmouthshire'),"
-          ."(826, 'MORAY', 'Moray'),"
-          ."(826, 'NPRTAL', 'Neath Port Talbot'),"
-          ."(826, 'NEWPT', 'Newport'),"
-          ."(826, 'NOR', 'Norfolk'),"
-          ."(826, 'ARYN', 'North Ayrshire'),"
-          ."(826, 'LANN', 'North Lanarkshire'),"
-          ."(826, 'YSN', 'North Yorkshire'),"
-          ."(826, 'NHM', 'Northamptonshire'),"
-          ."(826, 'NLD', 'Northumberland'),"
-          ."(826, 'NOT', 'Nottinghamshire'),"
-          ."(826, 'ORK', 'Orkney Islands'),"
-          ."(826, 'OFE', 'Oxfordshire'),"
-          ."(826, 'PEM', 'Pembrokeshire'),"
-          ."(826, 'PERTH', 'Perth and Kinross'),"
-          ."(826, 'PWS', 'Powys'),"
-          ."(826, 'REN', 'Renfrewshire'),"
-          ."(826, 'RHON', 'Rhondda Cynon Taff'),"
-          ."(826, 'RUT', 'Rutland'),"
-          ."(826, 'BOR', 'Scottish Borders'),"
-          ."(826, 'SHET', 'Shetland Islands'),"
-          ."(826, 'SPE', 'Shropshire'),"
-          ."(826, 'SOM', 'Somerset'),"
-          ."(826, 'ARYS', 'South Ayrshire'),"
-          ."(826, 'LANS', 'South Lanarkshire'),"
-          ."(826, 'YSS', 'South Yorkshire'),"
-          ."(826, 'SFD', 'Staffordshire'),"
-          ."(826, 'STIR', 'Stirling'),"
-          ."(826, 'SFK', 'Suffolk'),"
-          ."(826, 'SRY', 'Surrey'),"
-          ."(826, 'SWAN', 'Swansea'),"
-          ."(826, 'TORF', 'Torfaen'),"
-          ."(826, 'TWR', 'Tyne and Wear'),"
-          ."(826, 'VGLAM', 'Vale of Glamorgan'),"
-          ."(826, 'WARKS', 'Warwickshire'),"
-          ."(826, 'WDUN', 'West Dunbartonshire'),"
-          ."(826, 'WLOT', 'West Lothian'),"
-          ."(826, 'WMD', 'West Midlands'),"
-          ."(826, 'SXW', 'West Sussex'),"
-          ."(826, 'YSW', 'West Yorkshire'),"
-          ."(826, 'WIL', 'Western Isles'),"
-          ."(826, 'WLT', 'Wiltshire'),"
-          ."(826, 'WORCS', 'Worcestershire'),"
-          ."(826, 'WRX', 'Wrexham')"
-        );
+  $zones = array(
+    array(826, 'ABN', 'Aberdeen'),
+    array(826, 'ABNS', 'Aberdeenshire'),
+    array(826, 'ANG', 'Anglesey'),
+    array(826, 'AGS', 'Angus'),
+    array(826, 'ARY', 'Argyll and Bute'),
+    array(826, 'AVON', 'Avon'),
+    array(826, 'BEDS', 'Bedfordshire'),
+    array(826, 'BERKS', 'Berkshire'),
+    array(826, 'BLA', 'Blaenau Gwent'),
+    array(826, 'BRI', 'Bridgend'),
+    array(826, 'BSTL', 'Bristol'),
+    array(826, 'BUCKS', 'Buckinghamshire'),
+    array(826, 'CAE', 'Caerphilly'),
+    array(826, 'CAMBS', 'Cambridgeshire'),
+    array(826, 'CDF', 'Cardiff'),
+    array(826, 'CARM', 'Carmarthenshire'),
+    array(826, 'CDGN', 'Ceredigion'),
+    array(826, 'CHES', 'Cheshire'),
+    array(826, 'CLACK', 'Clackmannanshire'),
+    array(826, 'CLVD', 'Cleveland'),
+    array(826, 'CON', 'Conwy'),
+    array(826, 'CORN', 'Cornwall'),
+    array(826, 'COAN', 'County Antrim'),
+    array(826, 'COAR', 'County Armagh'),
+    array(826, 'CODN', 'County Down'),
+    array(826, 'COFE', 'County Fermanagh'),
+    array(826, 'COLO', 'County Londonderry'),
+    array(826, 'COTY', 'County Tyrone'),
+    array(826, 'CMA', 'Cumbria'),
+    array(826, 'DNBG', 'Denbighshire'),
+    array(826, 'DERBY', 'Derbyshire'),
+    array(826, 'DVN', 'Devon'),
+    array(826, 'DOR', 'Dorset'),
+    array(826, 'DGL', 'Dumfries and Galloway'),
+    array(826, 'DUND', 'Dundee'),
+    array(826, 'DHM', 'Durham'),
+    array(826, 'ARYE', 'East Ayrshire'),
+    array(826, 'DUNBE', 'East Dunbartonshire'),
+    array(826, 'LOTE', 'East Lothian'),
+    array(826, 'RENE', 'East Renfrewshire'),
+    array(826, 'ERYS', 'East Riding of Yorkshire'),
+    array(826, 'SXE', 'East Sussex'),
+    array(826, 'EDIN', 'Edinburgh'),
+    array(826, 'ESX', 'Essex'),
+    array(826, 'FALK', 'Falkirk'),
+    array(826, 'FFE', 'Fife'),
+    array(826, 'FLINT', 'Flintshire'),
+    array(826, 'GLAS', 'Glasgow'),
+    array(826, 'GLOS', 'Gloucestershire'),
+    array(826, 'MAN', 'Greater Manchester'),
+    array(826, 'GDD', 'Gwynedd'),
+    array(826, 'HANTS', 'Hampshire'),
+    array(826, 'HWR', 'Herefordshire'),
+    array(826, 'HERTS', 'Hertfordshire'),
+    array(826, 'HLD', 'Highlands'),
+    array(826, 'IVER', 'Inverclyde'),
+    array(826, 'IOW', 'Isle of Wight'),
+    array(826, 'IOS', 'Isles of Scilly'),
+    array(826, 'KNT', 'Kent'),
+    array(826, 'LANCS', 'Lancashire'),
+    array(826, 'LEICS', 'Leicestershire'),
+    array(826, 'LINCS', 'Lincolnshire'),
+    array(826, 'LDN', 'London'),
+    array(826, 'MSY', 'Merseyside'),
+    array(826, 'MERT', 'Merthyr Tydfil'),
+    array(826, 'MIDDX', 'Middlesex'),
+    array(826, 'MLOT', 'Midlothian'),
+    array(826, 'MMOUTH', 'Monmouthshire'),
+    array(826, 'MORAY', 'Moray'),
+    array(826, 'NPRTAL', 'Neath Port Talbot'),
+    array(826, 'NEWPT', 'Newport'),
+    array(826, 'NOR', 'Norfolk'),
+    array(826, 'ARYN', 'North Ayrshire'),
+    array(826, 'LANN', 'North Lanarkshire'),
+    array(826, 'YSN', 'North Yorkshire'),
+    array(826, 'NHM', 'Northamptonshire'),
+    array(826, 'NLD', 'Northumberland'),
+    array(826, 'NOT', 'Nottinghamshire'),
+    array(826, 'ORK', 'Orkney Islands'),
+    array(826, 'OFE', 'Oxfordshire'),
+    array(826, 'PEM', 'Pembrokeshire'),
+    array(826, 'PERTH', 'Perth and Kinross'),
+    array(826, 'PWS', 'Powys'),
+    array(826, 'REN', 'Renfrewshire'),
+    array(826, 'RHON', 'Rhondda Cynon Taff'),
+    array(826, 'RUT', 'Rutland'),
+    array(826, 'BOR', 'Scottish Borders'),
+    array(826, 'SHET', 'Shetland Islands'),
+    array(826, 'SPE', 'Shropshire'),
+    array(826, 'SOM', 'Somerset'),
+    array(826, 'ARYS', 'South Ayrshire'),
+    array(826, 'LANS', 'South Lanarkshire'),
+    array(826, 'YSS', 'South Yorkshire'),
+    array(826, 'SFD', 'Staffordshire'),
+    array(826, 'STIR', 'Stirling'),
+    array(826, 'SFK', 'Suffolk'),
+    array(826, 'SRY', 'Surrey'),
+    array(826, 'SWAN', 'Swansea'),
+    array(826, 'TORF', 'Torfaen'),
+    array(826, 'TWR', 'Tyne and Wear'),
+    array(826, 'VGLAM', 'Vale of Glamorgan'),
+    array(826, 'WARKS', 'Warwickshire'),
+    array(826, 'WDUN', 'West Dunbartonshire'),
+    array(826, 'WLOT', 'West Lothian'),
+    array(826, 'WMD', 'West Midlands'),
+    array(826, 'SXW', 'West Sussex'),
+    array(826, 'YSW', 'West Yorkshire'),
+    array(826, 'WIL', 'Western Isles'),
+    array(826, 'WLT', 'Wiltshire'),
+    array(826, 'WORCS', 'Worcestershire'),
+    array(826, 'WRX', 'Wrexham')
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.  Documentation on address formats
@@ -142,17 +146,22 @@
 function united_kingdom_update($version) {
   switch ($version) {
     case 2:
-      db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-              ."(826, 'AVON', 'Avon'),"
-              ."(826, 'COAN', 'County Antrim'),"
-              ."(826, 'COAR', 'County Armagh'),"
-              ."(826, 'CODN', 'County Down'),"
-              ."(826, 'COFE', 'County Fermanagh'),"
-              ."(826, 'COLO', 'County Londonderry'),"
-              ."(826, 'COTY', 'County Tyrone'),"
-              ."(826, 'CLVD', 'Cleveland'),"
-              ."(826, 'IOS', 'Isles of Scilly'),"
-              ."(826, 'MIDDX', 'Middlesex')");
+      $zones = array(
+        array(826, 'AVON', 'Avon'),
+        array(826, 'COAN', 'County Antrim'),
+        array(826, 'COAR', 'County Armagh'),
+        array(826, 'CODN', 'County Down'),
+        array(826, 'COFE', 'County Fermanagh'),
+        array(826, 'COLO', 'County Londonderry'),
+        array(826, 'COTY', 'County Tyrone'),
+        array(826, 'CLVD', 'Cleveland'),
+        array(826, 'IOS', 'Isles of Scilly'),
+        array(826, 'MIDDX', 'Middlesex'),
+      );
+
+      foreach ($zones as $zone) {
+        db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+      }
 
       db_query("UPDATE {uc_zones} SET zone_name = 'Greater Manchester' WHERE zone_country_id = 826 AND zone_name = 'Manchester'");
 
Index: uc_store/countries/united_states_840_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/united_states_840_1.cif,v
retrieving revision 1.5.2.1
diff -u -r1.5.2.1 united_states_840_1.cif
--- uc_store/countries/united_states_840_1.cif	3 Nov 2008 21:33:50 -0000	1.5.2.1
+++ uc_store/countries/united_states_840_1.cif	11 Jul 2009 20:49:49 -0000
@@ -6,72 +6,77 @@
   db_query("INSERT INTO {uc_countries} VALUES (840, 'United States', 'US', 'USA', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(840, 'AL', 'Alabama'),"
-          ."(840, 'AK', 'Alaska'),"
-          ."(840, 'AS', 'American Samoa'),"
-          ."(840, 'AZ', 'Arizona'),"
-          ."(840, 'AR', 'Arkansas'),"
-          ."(840, 'AF', 'Armed Forces Africa'),"
-          ."(840, 'AA', 'Armed Forces Americas'),"
-          ."(840, 'AC', 'Armed Forces Canada'),"
-          ."(840, 'AE', 'Armed Forces Europe'),"
-          ."(840, 'AM', 'Armed Forces Middle East'),"
-          ."(840, 'AP', 'Armed Forces Pacific'),"
-          ."(840, 'CA', 'California'),"
-          ."(840, 'CO', 'Colorado'),"
-          ."(840, 'CT', 'Connecticut'),"
-          ."(840, 'DE', 'Delaware'),"
-          ."(840, 'DC', 'District of Columbia'),"
-          ."(840, 'FM', 'Federated States Of Micronesia'),"
-          ."(840, 'FL', 'Florida'),"
-          ."(840, 'GA', 'Georgia'),"
-          ."(840, 'GU', 'Guam'),"
-          ."(840, 'HI', 'Hawaii'),"
-          ."(840, 'ID', 'Idaho'),"
-          ."(840, 'IL', 'Illinois'),"
-          ."(840, 'IN', 'Indiana'),"
-          ."(840, 'IA', 'Iowa'),"
-          ."(840, 'KS', 'Kansas'),"
-          ."(840, 'KY', 'Kentucky'),"
-          ."(840, 'LA', 'Louisiana'),"
-          ."(840, 'ME', 'Maine'),"
-          ."(840, 'MH', 'Marshall Islands'),"
-          ."(840, 'MD', 'Maryland'),"
-          ."(840, 'MA', 'Massachusetts'),"
-          ."(840, 'MI', 'Michigan'),"
-          ."(840, 'MN', 'Minnesota'),"
-          ."(840, 'MS', 'Mississippi'),"
-          ."(840, 'MO', 'Missouri'),"
-          ."(840, 'MT', 'Montana'),"
-          ."(840, 'NE', 'Nebraska'),"
-          ."(840, 'NV', 'Nevada'),"
-          ."(840, 'NH', 'New Hampshire'),"
-          ."(840, 'NJ', 'New Jersey'),"
-          ."(840, 'NM', 'New Mexico'),"
-          ."(840, 'NY', 'New York'),"
-          ."(840, 'NC', 'North Carolina'),"
-          ."(840, 'ND', 'North Dakota'),"
-          ."(840, 'MP', 'Northern Mariana Islands'),"
-          ."(840, 'OH', 'Ohio'),"
-          ."(840, 'OK', 'Oklahoma'),"
-          ."(840, 'OR', 'Oregon'),"
-          ."(840, 'PW', 'Palau'),"
-          ."(840, 'PA', 'Pennsylvania'),"
-          ."(840, 'PR', 'Puerto Rico'),"
-          ."(840, 'RI', 'Rhode Island'),"
-          ."(840, 'SC', 'South Carolina'),"
-          ."(840, 'SD', 'South Dakota'),"
-          ."(840, 'TN', 'Tennessee'),"
-          ."(840, 'TX', 'Texas'),"
-          ."(840, 'UT', 'Utah'),"
-          ."(840, 'VT', 'Vermont'),"
-          ."(840, 'VI', 'Virgin Islands'),"
-          ."(840, 'VA', 'Virginia'),"
-          ."(840, 'WA', 'Washington'),"
-          ."(840, 'WV', 'West Virginia'),"
-          ."(840, 'WI', 'Wisconsin'),"
-          ."(840, 'WY', 'Wyoming')");
+  $zones = array(
+    array(840, 'AL', 'Alabama'),
+    array(840, 'AK', 'Alaska'),
+    array(840, 'AS', 'American Samoa'),
+    array(840, 'AZ', 'Arizona'),
+    array(840, 'AR', 'Arkansas'),
+    array(840, 'AF', 'Armed Forces Africa'),
+    array(840, 'AA', 'Armed Forces Americas'),
+    array(840, 'AC', 'Armed Forces Canada'),
+    array(840, 'AE', 'Armed Forces Europe'),
+    array(840, 'AM', 'Armed Forces Middle East'),
+    array(840, 'AP', 'Armed Forces Pacific'),
+    array(840, 'CA', 'California'),
+    array(840, 'CO', 'Colorado'),
+    array(840, 'CT', 'Connecticut'),
+    array(840, 'DE', 'Delaware'),
+    array(840, 'DC', 'District of Columbia'),
+    array(840, 'FM', 'Federated States Of Micronesia'),
+    array(840, 'FL', 'Florida'),
+    array(840, 'GA', 'Georgia'),
+    array(840, 'GU', 'Guam'),
+    array(840, 'HI', 'Hawaii'),
+    array(840, 'ID', 'Idaho'),
+    array(840, 'IL', 'Illinois'),
+    array(840, 'IN', 'Indiana'),
+    array(840, 'IA', 'Iowa'),
+    array(840, 'KS', 'Kansas'),
+    array(840, 'KY', 'Kentucky'),
+    array(840, 'LA', 'Louisiana'),
+    array(840, 'ME', 'Maine'),
+    array(840, 'MH', 'Marshall Islands'),
+    array(840, 'MD', 'Maryland'),
+    array(840, 'MA', 'Massachusetts'),
+    array(840, 'MI', 'Michigan'),
+    array(840, 'MN', 'Minnesota'),
+    array(840, 'MS', 'Mississippi'),
+    array(840, 'MO', 'Missouri'),
+    array(840, 'MT', 'Montana'),
+    array(840, 'NE', 'Nebraska'),
+    array(840, 'NV', 'Nevada'),
+    array(840, 'NH', 'New Hampshire'),
+    array(840, 'NJ', 'New Jersey'),
+    array(840, 'NM', 'New Mexico'),
+    array(840, 'NY', 'New York'),
+    array(840, 'NC', 'North Carolina'),
+    array(840, 'ND', 'North Dakota'),
+    array(840, 'MP', 'Northern Mariana Islands'),
+    array(840, 'OH', 'Ohio'),
+    array(840, 'OK', 'Oklahoma'),
+    array(840, 'OR', 'Oregon'),
+    array(840, 'PW', 'Palau'),
+    array(840, 'PA', 'Pennsylvania'),
+    array(840, 'PR', 'Puerto Rico'),
+    array(840, 'RI', 'Rhode Island'),
+    array(840, 'SC', 'South Carolina'),
+    array(840, 'SD', 'South Dakota'),
+    array(840, 'TN', 'Tennessee'),
+    array(840, 'TX', 'Texas'),
+    array(840, 'UT', 'Utah'),
+    array(840, 'VT', 'Vermont'),
+    array(840, 'VI', 'Virgin Islands'),
+    array(840, 'VA', 'Virginia'),
+    array(840, 'WA', 'Washington'),
+    array(840, 'WV', 'West Virginia'),
+    array(840, 'WI', 'Wisconsin'),
+    array(840, 'WY', 'Wyoming'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   variable_set('uc_address_format_840',
                "!company\r\n!first_name !last_name\r\n!street1\r\n!street2"
Index: uc_store/countries/venezuela_862_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/venezuela_862_1.cif,v
retrieving revision 1.2.2.4
diff -u -r1.2.2.4 venezuela_862_1.cif
--- uc_store/countries/venezuela_862_1.cif	3 Nov 2008 21:33:50 -0000	1.2.2.4
+++ uc_store/countries/venezuela_862_1.cif	11 Jul 2009 20:49:49 -0000
@@ -11,32 +11,37 @@
   db_query("INSERT INTO {uc_countries} VALUES (862, 'Venezuela', 'VE', 'VEN', 1)");
 
   // Make the entries in the zones table.
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(862, 'AM', 'Amazonas'),"
-          ."(862, 'AN', 'Anzoátegui'),"
-          ."(862, 'AP', 'Apure'),"
-          ."(862, 'AR', 'Aragua'),"
-          ."(862, 'BA', 'Barinas'),"
-          ."(862, 'BO', 'Bolívar'),"
-          ."(862, 'CA', 'Carabobo'),"
-          ."(862, 'CO', 'Cojedes'),"
-          ."(862, 'DA', 'Delta Amacuro'),"
-          ."(862, 'DF', 'Dependencias Federales'),"
-          ."(862, 'DC', 'Distrito Capital'),"
-          ."(862, 'FA', 'Falcón'),"
-          ."(862, 'GU', 'Guárico'),"
-          ."(862, 'LA', 'Lara'),"
-          ."(862, 'ME', 'Mérida'),"
-          ."(862, 'MI', 'Miranda'),"
-          ."(862, 'MO', 'Monagas'),"
-          ."(862, 'NE', 'Nueva Esparta'),"
-          ."(862, 'PO', 'Portuguesa'),"
-          ."(862, 'SU', 'Sucre'),"
-          ."(862, 'TA', 'Táchira'),"
-          ."(862, 'TR', 'Trujillo'),"
-          ."(862, 'VA', 'Vargas'),"
-          ."(862, 'YA', 'Yaracuy'),"
-          ."(862, 'ZU', 'Zulia')");
+  $zones = array(
+    array(862, 'AM', 'Amazonas'),
+    array(862, 'AN', 'Anzoátegui'),
+    array(862, 'AP', 'Apure'),
+    array(862, 'AR', 'Aragua'),
+    array(862, 'BA', 'Barinas'),
+    array(862, 'BO', 'Bolívar'),
+    array(862, 'CA', 'Carabobo'),
+    array(862, 'CO', 'Cojedes'),
+    array(862, 'DA', 'Delta Amacuro'),
+    array(862, 'DF', 'Dependencias Federales'),
+    array(862, 'DC', 'Distrito Capital'),
+    array(862, 'FA', 'Falcón'),
+    array(862, 'GU', 'Guárico'),
+    array(862, 'LA', 'Lara'),
+    array(862, 'ME', 'Mérida'),
+    array(862, 'MI', 'Miranda'),
+    array(862, 'MO', 'Monagas'),
+    array(862, 'NE', 'Nueva Esparta'),
+    array(862, 'PO', 'Portuguesa'),
+    array(862, 'SU', 'Sucre'),
+    array(862, 'TA', 'Táchira'),
+    array(862, 'TR', 'Trujillo'),
+    array(862, 'VA', 'Vargas'),
+    array(862, 'YA', 'Yaracuy'),
+    array(862, 'ZU', 'Zulia'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.  Documentation on address formats
Index: uc_store/countries/vietnam_704_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/Attic/vietnam_704_1.cif,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 vietnam_704_1.cif
--- uc_store/countries/vietnam_704_1.cif	7 Nov 2008 21:13:24 -0000	1.1.2.1
+++ uc_store/countries/vietnam_704_1.cif	11 Jul 2009 20:49:49 -0000
@@ -5,71 +5,76 @@
   // VALUES = Country ID, Country Name, 2-digit Code, 3-digit Code, File Version
   db_query("INSERT INTO {uc_countries} VALUES (704, 'Vietnam', 'VN', 'VNM', 1)");
 
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-     ."(704, 'AG', 'An Giang'),"
-     ."(704, 'BV', 'Ba Ria-Vung Tau'),"
-     ."(704, 'BK', 'Bac Can'),"
-     ."(704, 'BG', 'Bac Giang'),"
-     ."(704, 'BL', 'Bac Lieu'),"
-     ."(704, 'BN', 'Bac Ninh'),"
-     ."(704, 'BR', 'Ben Tre'),"
-     ."(704, 'BD', 'Binh Dinh'),"
-     ."(704, 'BI', 'Binh Duong'),"
-     ."(704, 'BP', 'Binh Phuoc'),"
-     ."(704, 'BU', 'Binh Thuan'),"
-     ."(704, 'CM', 'Ca Mau'),"
-     ."(704, 'CN', 'Can Tho'),"
-     ."(704, 'CB', 'Cao Bang'),"
-     ."(704, 'DA', 'Da Nang'),"
-     ."(704, 'DC', 'Dac Lac'),"
-     ."(704, 'DO', 'Dac Nong'),"
-     ."(704, 'DB', 'Dien Bien'),"
-     ."(704, 'DN', 'Dong Nai'),"
-     ."(704, 'DT', 'Dong Thap'),"
-     ."(704, 'GL', 'Gia Lai'),"
-     ."(704, 'HG', 'Ha Giang'),"
-     ."(704, 'HM', 'Ha Nam'),"
-     ."(704, 'HA', 'Ha Tay'),"
-     ."(704, 'HT', 'Ha Tinh'),"
-     ."(704, 'HD', 'Hai Duong'),"
-     ."(704, 'HP', 'Haiphong'),"
-     ."(704, 'HN', 'Hanoi'),"
-     ."(704, 'HU', 'Hau Giang'),"
-     ."(704, 'HC', 'Ho Chi Minh'),"
-     ."(704, 'HO', 'Hoa Binh'),"
-     ."(704, 'HY', 'Hung Yen'),"
-     ."(704, 'KH', 'Khanh Hoa'),"
-     ."(704, 'KG', 'Kien Giang'),"
-     ."(704, 'KT', 'Kon Tum'),"
-     ."(704, 'LI', 'Lai Chau'),"
-     ."(704, 'LD', 'Lam Dong'),"
-     ."(704, 'LS', 'Lang Son'),"
-     ."(704, 'LO', 'Lao Cai'),"
-     ."(704, 'LA', 'Long An'),"
-     ."(704, 'ND', 'Nam Dinh'),"
-     ."(704, 'NA', 'Nghe An'),"
-     ."(704, 'NB', 'Ninh Binh'),"
-     ."(704, 'NT', 'Ninh Thuan'),"
-     ."(704, 'PT', 'Phu Tho'),"
-     ."(704, 'PY', 'Phu Yen'),"
-     ."(704, 'QB', 'Quang Binh'),"
-     ."(704, 'QM', 'Quang Nam'),"
-     ."(704, 'QG', 'Quang Ngai'),"
-     ."(704, 'QN', 'Quang Ninh'),"
-     ."(704, 'QT', 'Quang Tri'),"
-     ."(704, 'ST', 'Soc Trang'),"
-     ."(704, 'SL', 'Son La'),"
-     ."(704, 'TN', 'Tay Ninh'),"
-     ."(704, 'TB', 'Thai Binh'),"
-     ."(704, 'TY', 'Thai Nguyen'),"
-     ."(704, 'TH', 'Thanh Hoa'),"
-     ."(704, 'TT', 'Thua Thien-Hue'),"
-     ."(704, 'TG', 'Tien Giang'),"
-     ."(704, 'TV', 'Tra Vinh'),"
-     ."(704, 'TQ', 'Tuyen Quang'),"
-     ."(704, 'VL', 'Vinh Long'),"
-     ."(704, 'VC', 'Vinh Phuc'),"
-     ."(704, 'YB', 'Yen Bai')");
+  $zones = array(
+    array(704, 'AG', 'An Giang'),
+    array(704, 'BV', 'Ba Ria-Vung Tau'),
+    array(704, 'BK', 'Bac Can'),
+    array(704, 'BG', 'Bac Giang'),
+    array(704, 'BL', 'Bac Lieu'),
+    array(704, 'BN', 'Bac Ninh'),
+    array(704, 'BR', 'Ben Tre'),
+    array(704, 'BD', 'Binh Dinh'),
+    array(704, 'BI', 'Binh Duong'),
+    array(704, 'BP', 'Binh Phuoc'),
+    array(704, 'BU', 'Binh Thuan'),
+    array(704, 'CM', 'Ca Mau'),
+    array(704, 'CN', 'Can Tho'),
+    array(704, 'CB', 'Cao Bang'),
+    array(704, 'DA', 'Da Nang'),
+    array(704, 'DC', 'Dac Lac'),
+    array(704, 'DO', 'Dac Nong'),
+    array(704, 'DB', 'Dien Bien'),
+    array(704, 'DN', 'Dong Nai'),
+    array(704, 'DT', 'Dong Thap'),
+    array(704, 'GL', 'Gia Lai'),
+    array(704, 'HG', 'Ha Giang'),
+    array(704, 'HM', 'Ha Nam'),
+    array(704, 'HA', 'Ha Tay'),
+    array(704, 'HT', 'Ha Tinh'),
+    array(704, 'HD', 'Hai Duong'),
+    array(704, 'HP', 'Haiphong'),
+    array(704, 'HN', 'Hanoi'),
+    array(704, 'HU', 'Hau Giang'),
+    array(704, 'HC', 'Ho Chi Minh'),
+    array(704, 'HO', 'Hoa Binh'),
+    array(704, 'HY', 'Hung Yen'),
+    array(704, 'KH', 'Khanh Hoa'),
+    array(704, 'KG', 'Kien Giang'),
+    array(704, 'KT', 'Kon Tum'),
+    array(704, 'LI', 'Lai Chau'),
+    array(704, 'LD', 'Lam Dong'),
+    array(704, 'LS', 'Lang Son'),
+    array(704, 'LO', 'Lao Cai'),
+    array(704, 'LA', 'Long An'),
+    array(704, 'ND', 'Nam Dinh'),
+    array(704, 'NA', 'Nghe An'),
+    array(704, 'NB', 'Ninh Binh'),
+    array(704, 'NT', 'Ninh Thuan'),
+    array(704, 'PT', 'Phu Tho'),
+    array(704, 'PY', 'Phu Yen'),
+    array(704, 'QB', 'Quang Binh'),
+    array(704, 'QM', 'Quang Nam'),
+    array(704, 'QG', 'Quang Ngai'),
+    array(704, 'QN', 'Quang Ninh'),
+    array(704, 'QT', 'Quang Tri'),
+    array(704, 'ST', 'Soc Trang'),
+    array(704, 'SL', 'Son La'),
+    array(704, 'TN', 'Tay Ninh'),
+    array(704, 'TB', 'Thai Binh'),
+    array(704, 'TY', 'Thai Nguyen'),
+    array(704, 'TH', 'Thanh Hoa'),
+    array(704, 'TT', 'Thua Thien-Hue'),
+    array(704, 'TG', 'Tien Giang'),
+    array(704, 'TV', 'Tra Vinh'),
+    array(704, 'TQ', 'Tuyen Quang'),
+    array(704, 'VL', 'Vinh Long'),
+    array(704, 'VC', 'Vinh Phuc'),
+    array(704, 'YB', 'Yen Bai'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   uc_set_address_format(704, "!company\r\n!first_name !last_name\r\n!street1\r\n!street2\r\n!city, !zone_code !postal_code\r\n!country_name_if");
 }
Index: uc_store/countries/zimbabwe_716_1.cif
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ubercart/uc_store/countries/Attic/zimbabwe_716_1.cif,v
retrieving revision 1.1.4.3
diff -u -r1.1.4.3 zimbabwe_716_1.cif
--- uc_store/countries/zimbabwe_716_1.cif	7 Nov 2008 21:13:24 -0000	1.1.4.3
+++ uc_store/countries/zimbabwe_716_1.cif	11 Jul 2009 20:49:49 -0000
@@ -14,17 +14,22 @@
   // function uc_get_zone_ids($num) as the second argument for db_query() where
   // $num is the number of zones in the INSERT query.
   // VALUES = %d for ID, Parent Country ID, Zone Abbreviation, Zone Name
-  db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES "
-          ."(716, 'BW', 'Bulawayo'),"
-          ."(716, 'HR', 'Harare'),"
-          ."(716, 'MC', 'Manicaland'),"
-          ."(716, 'MSC', 'Mashonaland Central'),"
-          ."(716, 'MSE', 'Mashonaland East'),"
-          ."(716, 'MSW', 'Mashonaland West'),"
-          ."(716, 'MV', 'Masvingo'),"
-          ."(716, 'MBN', 'Matabeleland North'),"
-          ."(716, 'MBS', 'Matabeleland South'),"
-          ."(716, 'ML', 'Midlands');");
+  $zones = array(
+    array(716, 'BW', 'Bulawayo'),
+    array(716, 'HR', 'Harare'),
+    array(716, 'MC', 'Manicaland'),
+    array(716, 'MSC', 'Mashonaland Central'),
+    array(716, 'MSE', 'Mashonaland East'),
+    array(716, 'MSW', 'Mashonaland West'),
+    array(716, 'MV', 'Masvingo'),
+    array(716, 'MBN', 'Matabeleland North'),
+    array(716, 'MBS', 'Matabeleland South'),
+    array(716, 'ML', 'Midlands'),
+  );
+
+  foreach ($zones as $zone) {
+    db_query("INSERT INTO {uc_zones} (zone_country_id, zone_code, zone_name) VALUES (%d, '%s', '%s')", $zone);
+  }
 
   // Use uc_set_address_format() with the country ID as the first argument and
   // an address format string as the second.  Documentation on address formats