Quick Search:

Mode

Context

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

Other Diffs

Ignore

Blank Lines Whitespace:

Diff

151
 
368
 
368
 
payment.php
_> 11 <?php
  22 /*
<> 3 -  $Id: payment.php 151 2005-08-02 14:33:25Z mattice $
   3+  $Id: payment.php 368 2005-12-22 16:27:23Z hpdl $
44 
  55   osCommerce, Open Source E-Commerce Solutions
  66   http://www.oscommerce.com
     
 !
1515 
  1616 // class constructor
  1717     function payment($module = '') {
<> 18 -      if (PHP_VERSION < 4.1) {
  19 -        global $_SERVER;
  20 -      }
  21 -
  22 -      global $osC_Session;
  23 -
2418       if (defined('MODULE_PAYMENT_INSTALLED') && tep_not_null(MODULE_PAYMENT_INSTALLED)) {
  2519         $this->modules = explode(';', MODULE_PAYMENT_INSTALLED);
  2620 
     
 !
3933         }
  4034 
  4135         for ($i=0, $n=sizeof($include_modules); $i<$n; $i++) {
<> 42 -          include(DIR_WS_LANGUAGES . $osC_Session->value('language') . '/modules/payment/' . $include_modules[$i]['file']);
  43 -          include(DIR_WS_MODULES . 'payment/' . $include_modules[$i]['file']);
   36+          include('includes/languages/' . $_SESSION['language'] . '/modules/payment/' . $include_modules[$i]['file']);
   37+          include('includes/modules/payment/' . $include_modules[$i]['file']);
4438 
  4539           $GLOBALS[$include_modules[$i]['class']] = new $include_modules[$i]['class'];
  4640         }
  4741 
  4842 // if there is only one payment method, select it as default because in
  4943 // checkout_confirmation.php the $payment variable is being assigned the
  5044 // $_POST['payment_mod_sel'] value which will be empty (no radio button selection possible)
<> 51 -        if ( (tep_count_payment_modules() == 1) && (!isset($GLOBALS[$osC_Session->value('payment')]) || (isset($GLOBALS[$osC_Session->value('payment')]) && !is_object($GLOBALS[$osC_Session->value('payment')]))) ) {
  52 -          $osC_Session->set('payment', $include_modules[0]['class']);
   45+        if ( (tep_count_payment_modules() == 1) && (!isset($GLOBALS[$_SESSION['payment']]) || (isset($GLOBALS[$_SESSION['payment']]) && !is_object($GLOBALS[$_SESSION['payment']]))) ) {
   46+          $_SESSION['payment'] = $include_modules[0]['class'];
5347         }
  5448 
  5549         if ( (tep_not_null($module)) && (in_array($module, $this->modules)) && (isset($GLOBALS[$module]->form_action_url)) ) {
     
 !
8074     function javascript_validation() {
  8175       $js = '';
  8276       if (is_array($this->modules)) {
<> 83 -        $js = '<script language="javascript"><!-- ' . "\n" .
   77+        $js = '<script type="text/javascript"><!-- ' . "\n" .
<_ 8478               'function check_form() {' . "\n" .
  8579               '  var error = 0;' . "\n" .
  8680               '  var error_message = "' . JS_ERROR . '";' . "\n" .