Quick Search:

Mode

Context

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

Other Diffs

Ignore

Blank Lines Whitespace:

Diff

421
 
422
 
422
 
shipping.php
_> 11 <?php
  22 /*
<> 3 -  $Id: shipping.php 421 2006-02-08 17:53:17Z hpdl $
   3+  $Id: shipping.php 422 2006-02-09 13:36:08Z hpdl $
44 
  55   osCommerce, Open Source E-Commerce Solutions
  66   http://www.oscommerce.com
     
 !
5050           include('includes/modules/shipping/' . $module['file']);
  5151 
  5252           $GLOBALS[$module['class']] = new $module['class'];
<>  53+          $GLOBALS[$module['class']]->prepare();
5354         }
  5455       }
  5556     }
     
 !
7576 
  7677         $include_quotes = array();
  7778 
<> 78 -        foreach ($this->_modules as $value) {
  79 -          $class = substr($value, 0, strrpos($value, '.'));
  80 -          if (tep_not_null($module)) {
  81 -            if ( ($module == $class) && ($GLOBALS[$class]->enabled) ) {
   79+        if (defined('MODULE_SHIPPING_FREE_STATUS') && (MODULE_SHIPPING_FREE_STATUS == 'True') && ($GLOBALS['free']->enabled)) {
   80+          $include_quotes[] = 'free';
   81+        } else {
   82+          foreach ($this->_modules as $value) {
   83+            $class = substr($value, 0, strrpos($value, '.'));
   84+
   85+            if (tep_not_null($module)) {
   86+              if ( ($module == $class) && ($GLOBALS[$class]->enabled) ) {
   87+                $include_quotes[] = $class;
   88+              }
   89+            } elseif ($GLOBALS[$class]->enabled) {
8290               $include_quotes[] = $class;
  8391             }
<> 84 -          } elseif ($GLOBALS[$class]->enabled) {
  85 -            $include_quotes[] = $class;
8692           }
  8793         }
  8894 
     
 !
100106       return !empty($this->_quotes);
  101107     }
  102108 
<>  109+    function numberOfQuotes() {
   110+      $total_quotes = 0;
   111+
   112+      foreach ($this->_quotes as $quotes) {
   113+        $total_quotes += sizeof($quotes['methods']);
   114+      }
   115+
   116+      return $total_quotes;
   117+    }
   118+
<_ 103119     function getQuotes($method = '', $module = '') {
  104120       if ( (empty($method) === false) && (empty($module) === false) ) {
  105121         foreach ($this->_quotes as $quote) {