Quick Search:

Mode

Context

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

Other Diffs

Ignore

Blank Lines Whitespace:

Diff

432
  
434
  
434
  
payment.php
_> 11 <?php
  22 /*
<> 3 -  $Id: payment.php 432 2006-02-15 07:41:34Z hpdl $
   3+  $Id: payment.php 434 2006-02-15 20:49:45Z hpdl $
44 
  55   osCommerce, Open Source E-Commerce Solutions
  66   http://www.oscommerce.com
      
 !
 
…
1111 */
  1212 
  1313   class osC_Payment {
<> 14 -    var $modules, $selected_module;
   14+    var $selected_module;
1515 
<> 16 -    var $_group = 'payment';
   16+    var $_modules = array(),
   17+        $_group = 'payment';
1718 
  1819 // class constructor
  1920     function osC_Payment($module = '') {
      
 !
 
…
2526       $Qmodules->execute();
  2627 
  2728       while ($Qmodules->next()) {
<> 28 -        $this->modules[] = $Qmodules->value('code');
   29+        $this->_modules[] = $Qmodules->value('code');
2930       }
  3031 
  3132       $Qmodules->freeResult();
  3233 
<> 33 -      if (empty($this->modules) === false) {
  34 -        if ((empty($module) === false) && in_array($module, $this->modules)) {
  35 -          $this->modules = array($module);
   34+      if (empty($this->_modules) === false) {
   35+        if ((empty($module) === false) && in_array($module, $this->_modules)) {
   36+          $this->_modules = array($module);
3637           $this->selected_module = 'osC_Payment_' . $module;
  3738         }
  3839 
  3940         $osC_Language->load('modules-payment');
  4041 
<> 41 -        foreach ($this->modules as $modules) {
   42+        foreach ($this->_modules as $modules) {
4243           include('includes/modules/payment/' . $modules . '.' . substr(basename(__FILE__), (strrpos(basename(__FILE__), '.')+1)));
  4344 
  4445           $module_class = 'osC_Payment_' . $modules;
  4546 
  4647           $GLOBALS[$module_class] = new $module_class();
  4748         }
  4849 
<> 49 -        usort($this->modules, array('osC_Payment', '_usortModules'));
   50+        usort($this->_modules, array('osC_Payment', '_usortModules'));
5051 
<> 51 -        if ( (tep_not_null($module)) && (in_array($module, $this->modules)) && (isset($GLOBALS['osC_Payment_' . $module]->form_action_url)) ) {
   52+        if ( (tep_not_null($module)) && (in_array($module, $this->_modules)) && (isset($GLOBALS['osC_Payment_' . $module]->form_action_url)) ) {
5253           $this->form_action_url = $GLOBALS['osC_Payment_' . $module]->form_action_url;
  5354         }
  5455       }
      
 !
 
…
8485    section. This should be looked into again post 2.2.
  8586 */
  8687     function update_status() {
<> 87 -      if (is_array($this->modules)) {
   88+      if (is_array($this->_modules)) {
8889         if (isset($GLOBALS[$this->selected_module]) && is_object($GLOBALS[$this->selected_module])) {
  8990           if (method_exists($GLOBALS[$this->selected_module], 'update_status')) {
  9091             $GLOBALS[$this->selected_module]->update_status();
      
 !
 
…
9798       global $osC_Language;
  9899 
  99100       $js = '';
<> 100 -      if (is_array($this->modules)) {
   101+      if (is_array($this->_modules)) {
101102         $js = '<script type="text/javascript"><!-- ' . "\n" .
  102103               'function check_form() {' . "\n" .
  103104               '  var error = 0;' . "\n" .
      
 !
 
…
115116               '    payment_value = document.checkout_payment.payment.value;' . "\n" .
  116117               '  }' . "\n\n";
  117118 
<> 118 -        foreach ($this->modules as $module) {
   119+        foreach ($this->_modules as $module) {
119120           if ($GLOBALS['osC_Payment_' . $module]->getStatus() === true) {
  120121             $js .= $GLOBALS['osC_Payment_' . $module]->javascript_validation();
  121122           }
      
 !
 
…
141142     function selection() {
  142143       $selection_array = array();
  143144 
<> 144 -      foreach ($this->modules as $module) {
   145+      foreach ($this->_modules as $module) {
145146         if ($GLOBALS['osC_Payment_' . $module]->getStatus() === true) {
  146147           $selection = $GLOBALS['osC_Payment_' . $module]->selection();
  147148           if (is_array($selection)) $selection_array[] = $selection;
      
 !
 
…
152153     }
  153154 
  154155     function pre_confirmation_check() {
<> 155 -      if (is_array($this->modules)) {
   156+      if (is_array($this->_modules)) {
156157         if (is_object($GLOBALS[$this->selected_module]) && ($GLOBALS[$this->selected_module]->getStatus() === true) ) {
  157158           $GLOBALS[$this->selected_module]->pre_confirmation_check();
  158159         }
  159160       }
  160161     }
  161162 
  162163     function confirmation() {
<> 163 -      if (is_array($this->modules)) {
   164+      if (is_array($this->_modules)) {
164165         if (is_object($GLOBALS[$this->selected_module]) && ($GLOBALS[$this->selected_module]->getStatus() === true) ) {
  165166           return $GLOBALS[$this->selected_module]->confirmation();
  166167         }
  167168       }
  168169     }
  169170 
  170171     function process_button() {
<> 171 -      if (is_array($this->modules)) {
   172+      if (is_array($this->_modules)) {
172173         if (is_object($GLOBALS[$this->selected_module]) && ($GLOBALS[$this->selected_module]->getStatus() === true) ) {
  173174           return $GLOBALS[$this->selected_module]->process_button();
  174175         }
  175176       }
  176177     }
  177178 
  178179     function before_process() {
<> 179 -      if (is_array($this->modules)) {
   180+      if (is_array($this->_modules)) {
180181         if (is_object($GLOBALS[$this->selected_module]) && ($GLOBALS[$this->selected_module]->getStatus() === true) ) {
  181182           return $GLOBALS[$this->selected_module]->before_process();
  182183         }
  183184       }
  184185     }
  185186 
  186187     function after_process() {
<> 187 -      if (is_array($this->modules)) {
   188+      if (is_array($this->_modules)) {
188189         if (is_object($GLOBALS[$this->selected_module]) && ($GLOBALS[$this->selected_module]->getStatus() === true) ) {
  189190           return $GLOBALS[$this->selected_module]->after_process();
  190191         }
  191192       }
  192193     }
  193194 
  194195     function get_error() {
<> 195 -      if (is_array($this->modules)) {
   196+      if (is_array($this->_modules)) {
196197         if (is_object($GLOBALS[$this->selected_module]) && ($GLOBALS[$this->selected_module]->getStatus() === true) ) {
  197198           return $GLOBALS[$this->selected_module]->get_error();
  198199         }
  199200       }
  200201     }
  201202 
<>  203+    function hasActionURL() {
   204+      if (is_array($this->_modules)) {
   205+        if (is_object($GLOBALS[$this->selected_module]) && ($GLOBALS[$this->selected_module]->getStatus() === true) ) {
   206+          if (isset($GLOBALS[$this->selected_module]->form_action_url) && (empty($GLOBALS[$this->selected_module]->form_action_url) === false)) {
   207+            return true;
   208+          }
   209+        }
   210+      }
   211+
   212+      return false;
   213+    }
   214+
   215+    function getActionURL() {
   216+      return $GLOBALS[$this->selected_module]->form_action_url;
   217+    }
   218+
202219     function hasActive() {
  203220       static $has_active;
  204221 
  205222       if (isset($has_active) === false) {
  206223         $has_active = false;
  207224 
<> 208 -        foreach ($this->modules as $module) {
   225+        foreach ($this->_modules as $module) {
209226           if ($GLOBALS['osC_Payment_' . $module]->getStatus() === true) {
  210227             $has_active = true;
  211228             break;
      
 !
 
…
222239       if (isset($active) === false) {
  223240         $active = 0;
  224241 
<> 225 -        foreach ($this->modules as $module) {
   242+        foreach ($this->_modules as $module) {
<_ 226243           if ($GLOBALS['osC_Payment_' . $module]->getStatus() === true) {
  227244             $active++;
  228245           }