Quick Search:

Mode

Context

Displaying 3 lines of context. None | Less | More | Full

Other Diffs

Ignore

Blank Lines Whitespace:

Diff

831
 
1076
 
1076
 
address.php
_> 185185       return $Qzone->value('zone_code');
  186186     }
  187187 
<> 188 -    function getCountryZones($id) {
   188+    function getZones($id = null) {
189189       global $osC_Database;
  190190 
  191191       $zones_array = array();
  192192 
<> 193 -      $Qzones = $osC_Database->query('select zone_id, zone_name from :table_zones where zone_country_id = :zone_country_id order by zone_name');
   193+      $Qzones = $osC_Database->query('select z.zone_id, z.zone_country_id, z.zone_name, c.countries_name from :table_zones z, :table_countries c where');
   194+
   195+      if (!empty($id)) {
   196+        $Qzones->appendQuery('z.zone_country_id = :zone_country_id and');
   197+        $Qzones->bindInt(':zone_country_id', $id);
   198+      }
   199+
   200+      $Qzones->appendQuery('z.zone_country_id = c.countries_id order by c.countries_name, z.zone_name');
   201+      $Qzones->bindTable(':table_countries', TABLE_COUNTRIES);
194202       $Qzones->bindTable(':table_zones', TABLE_ZONES);
<> 195 -      $Qzones->bindInt(':zone_country_id', $id);
196203       $Qzones->execute();
  197204 
  198205       while ($Qzones->next()) {
  199206         $zones_array[] = array('id' => $Qzones->valueInt('zone_id'),
<> 200 -                               'name' => $Qzones->value('zone_name'));
   207+                               'name' => $Qzones->value('zone_name'),
   208+                               'country_id' => $Qzones->valueInt('zone_country_id'),
   209+                               'country_name' => $Qzones->value('countries_name'));
<_ 201210       }
  202211 
  203212       return $zones_array;