osCommerce Online Merchant v2.2 RC1 Upgrade Notes

The following upgrade guide is based on the osCommerce 2.2 Milestone 2 Update 060817 release. If you have not yet updated to this release please review its upgrade guide in the extras directory (update-20060817.txt) before applying these changes.

The following changes should be performed in order on your installation to upgrade it to osCommerce Online Merchant v2.2 RC1. Please note that the following changes are only the recommended changes to make and does not include the new Administration Tool login routine or the Administration Tool index page summary modules that are available with new installations. This is to avoid a conflict with existing Administration Tool securing mechanisms already in place.

[BUGFIX] Caching of the Manufacturers Box
[IMPROVEMENT] Database Backup
[IMPROVEMENT] Input Fields on Checkout Confirmation Page
[IMPROVEMENT] register_globals Compatibility for PHP 4.3+ Servers
[BUGFIX] Currency Case-Sensitivity
[BUGFIX] Invoice and Packing Slip Billing Address
[IMPROVEMENT] Configuration -> Minimum Values Settings
[BUGFIX] Compatibility Array Index
[IMPROVEMENT] MySQL Database Connection Identifier Link
[BUGFIX] Product Sorting SQL Injection Vulnerability
[BUGFIX] Product Price Calculations
[BUGFIX] Country Name on the Order History Page
[BUGFIX] Shopping Cart Product Quantity as Integer Value
[IMPROVEMENT] Maximum Order Product Quantities [+SQL]
[IMPROVEMENT] Accepting State Names
[BUGFIX] Load the Order Total Modules Before Loading the Payment Modules
[BUGFIX] Payment Module Selection
[BUGFIX] Category Image Removal
[BUGFIX] Add the Session ID to GET Based Forms
[BUGFIX] Fix Typo on the Products New Page
[BUGFIX] Process the Order Total Modules Earlier on the Checkout Confirmation Page
[BUGFIX] PHP < 4.1 Compatibility Update
[BUGFIX] Strip Additional Slashes When Editing Reviews
[IMPROVEMENT] New Public Title for Payment Modules
[IMPROVEMENT] Navigation History Parameter Filter
[IMPROVEMENT] Increase Configuration Key and Title Database Field Sizes [SQL]
[BUGFIX] Strip Additional Slashes When Editing Files Through the File Manager

[BUGFIX] Caching of the Manufacturers Box

Fix a spelling mistake preventing the manufacturers box being cached.

Affected Files
catalog/includes/functions/cache.php

File: catalog/includes/functions/cache.php

119	function tep_cache_manufacturers_box($auto_expire = false, $refresh = false) {	=	119	function tep_cache_manufacturers_box($auto_expire = false, $refresh = false) {
120	global $HTTP_GET_VARS, $language;		120	global $HTTP_GET_VARS, $language;
121			121
122	$cache_output = '';		122	$cache_output = '';
123			123
124	$manufacturers_id = '';		124	$manufacturers_id = '';
125	if (isset($HTTP_GET_VARS['manufactuers_id']) && is_numeric($HTTP_GET_VARS['manufacturers_id'])) {	<>	125	if (isset($HTTP_GET_VARS['manufacturers_id']) && is_numeric($HTTP_GET_VARS['manufacturers_id'])) {
126	$manufacturers_id = $HTTP_GET_VARS['manufacturers_id'];	=	126	$manufacturers_id = $HTTP_GET_VARS['manufacturers_id'];
127	}		127	}
128			128
129	if (($refresh == true) \|\| !read_cache($cache_output, 'manufacturers_box-' . $language . '.cache' . $manufacturers_id, $auto_expire)) {		129	if (($refresh == true) \|\| !read_cache($cache_output, 'manufacturers_box-' . $language . '.cache' . $manufacturers_id, $auto_expire)) {
130	ob_start();		130	ob_start();
131	include(DIR_WS_BOXES . 'manufacturers.php');		131	include(DIR_WS_BOXES . 'manufacturers.php');

[IMPROVEMENT] Database Backup

Don't store the session and whos online database tables in the database backups.

Affected Files
catalog/admin/backup.php

File: catalog/admin/backup.php

           $keys_query = tep_db_query("show keys from " . $table);
           while ($keys = tep_db_fetch_array($keys_query)) {
             $kname = $keys['Key_name'];
             if (!isset($index[$kname])) {
               $index[$kname] = array('unique' => !$keys['Non_unique'],
+                                     'fulltext' => ($keys['Index_type'] == 'FULLTEXT' ? '1' : '0'),
                                      'columns' => array());
             }
             $index[$kname]['columns'][] = $keys['Column_name'];
           }
             $schema .= ',' . "\n";
             $columns = implode($info['columns'], ', ');
             if ($kname == 'PRIMARY') {
               $schema .= '  PRIMARY KEY (' . $columns . ')';
+            } elseif ( $info['fulltext'] == '1' ) {
+              $schema .= '  FULLTEXT ' . $kname . ' (' . $columns . ')';
             } elseif ($info['unique']) {
               $schema .= '  UNIQUE ' . $kname . ' (' . $columns . ')';
             } else {
               $schema .= '  KEY ' . $kname . ' (' . $columns . ')';
             }
           }
           $schema .= "\n" . ');' . "\n\n";
           fputs($fp, $schema);
 // dump the data
+          if ( ($table != TABLE_SESSIONS ) && ($table != TABLE_WHOS_ONLINE) ) {
-          $rows_query = tep_db_query("select " . implode(',', $table_list) . " from " . $table);
+            $rows_query = tep_db_query("select " . implode(',', $table_list) . " from " . $table);
-          while ($rows = tep_db_fetch_array($rows_query)) {
+            while ($rows = tep_db_fetch_array($rows_query)) {
-            $schema = 'insert into ' . $table . ' (' . implode(', ', $table_list) . ') values (';
+              $schema = 'insert into ' . $table . ' (' . implode(', ', $table_list) . ') values (';
-            reset($table_list);
+              reset($table_list);
-            while (list(,$i) = each($table_list)) {
+              while (list(,$i) = each($table_list)) {
-              if (!isset($rows[$i])) {
+                if (!isset($rows[$i])) {
-                $schema .= 'NULL, ';
+                  $schema .= 'NULL, ';
-              } elseif (tep_not_null($rows[$i])) {
+                } elseif (tep_not_null($rows[$i])) {
-                $row = addslashes($rows[$i]);
+                  $row = addslashes($rows[$i]);
-                $row = ereg_replace("\n#", "\n".'\#', $row);
+                  $row = ereg_replace("\n#", "\n".'\#', $row);
-                $schema .= '\'' . $row . '\', ';
+                  $schema .= '\'' . $row . '\', ';
-              } else {
+                } else {
-                $schema .= '\'\', ';
+                  $schema .= '\'\', ';
+                }
               }
+              $schema = ereg_replace(', $', '', $schema) . ');' . "\n";
+              fputs($fp, $schema);
             }
-            $schema = ereg_replace(', $', '', $schema) . ');' . "\n";
-            fputs($fp, $schema);
           }
         }
         fclose($fp);
         if (isset($HTTP_POST_VARS['download']) && ($HTTP_POST_VARS['download'] == 'yes')) {
           tep_db_query("drop table if exists address_book, address_format, banners, banners_history, categories, categories_description, configuration, configuration_group, counter, counter_history, countries, currencies, customers, customers_basket, customers_basket_attributes, customers_info, languages, manufacturers, manufacturers_info, orders, orders_products, orders_status, orders_status_history, orders_products_attributes, orders_products_download, products, products_attributes, products_attributes_download, prodcts_description, products_options, products_options_values, products_options_values_to_products_options, products_to_categories, reviews, reviews_description, sessions, specials, tax_class, tax_rates, geo_zones, whos_online, zones, zones_to_geo_zones");
           for ($i=0, $n=sizeof($sql_array); $i<$n; $i++) {
             tep_db_query($sql_array[$i]);
           }
+          tep_session_close();
+          tep_db_query("delete from " . TABLE_WHOS_ONLINE);
+          tep_db_query("delete from " . TABLE_SESSIONS);
           tep_db_query("delete from " . TABLE_CONFIGURATION . " where configuration_key = 'DB_LAST_RESTORE'");
           tep_db_query("insert into " . TABLE_CONFIGURATION . " values ('', 'Last Database Restore', 'DB_LAST_RESTORE', '" . $read_from . "', 'Last database restore file', '6', '', '', now(), '', '')");
           if (isset($remove_raw) && ($remove_raw == true)) {
             unlink($restore_from);
           }

[IMPROVEMENT] Input Fields on Checkout Confirmation Page

Allow payment modules to display input fields on the checkout confirmation page. This is for PCI conformance where the credit card number can be directly passed to the payment gateway.

Affected Files
catalog/checkout_confirmation.php

File: catalog/checkout_confirmation.php

 <?php require(DIR_WS_INCLUDES . 'column_left.php'); ?>
 <!-- left_navigation_eof //-->
     </table></td>
 <!-- body_text //-->
     <td width="100%" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="0">
       <tr>
+        <td>
+<?php
+  if (isset($$payment->form_action_url)) {
+    $form_action_url = $$payment->form_action_url;
+  } else {
+    $form_action_url = tep_href_link(FILENAME_CHECKOUT_PROCESS, '', 'SSL');
+  }
+  echo tep_draw_form('checkout_confirmation', $form_action_url, 'post');
+?>
-        <td><table border="0" width="100%" cellspacing="0" cellpadding="0">
+        <table border="0" width="100%" cellspacing="0" cellpadding="0">
           <tr>
             <td class="pageHeading"><?php echo HEADING_TITLE; ?></td>
             <td class="pageHeading" align="right"><?php echo tep_image(DIR_WS_IMAGES . 'table_background_confirmation.gif', HEADING_TITLE, HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td>
           </tr>
         </table></td>
       </tr>
 ?>
       <tr>
         <td><table border="0" width="100%" cellspacing="0" cellpadding="0">
           <tr>
             <td align="right" class="main">
 <?php
-  if (isset($$payment->form_action_url)) {
-    $form_action_url = $$payment->form_action_url;
-  } else {
-    $form_action_url = tep_href_link(FILENAME_CHECKOUT_PROCESS, '', 'SSL');
-  }
-  echo tep_draw_form('checkout_confirmation', $form_action_url, 'post');
   if (is_array($payment_modules->modules)) {
     echo $payment_modules->process_button();
   }
-  echo tep_image_submit('button_confirm_order.gif', IMAGE_BUTTON_CONFIRM_ORDER) . '</form>' . "\n";
+  echo tep_image_submit('button_confirm_order.gif', IMAGE_BUTTON_CONFIRM_ORDER) . "\n";
 ?>
             </td>
           </tr>
         </table></td>
       </tr>
       <tr>
             <td align="center" width="25%" class="checkoutBarFrom"><?php echo '<a href="' . tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL') . '" class="checkoutBarFrom">' . CHECKOUT_BAR_PAYMENT . '</a>'; ?></td>
             <td align="center" width="25%" class="checkoutBarCurrent"><?php echo CHECKOUT_BAR_CONFIRMATION; ?></td>
             <td align="center" width="25%" class="checkoutBarTo"><?php echo CHECKOUT_BAR_FINISHED; ?></td>
           </tr>
         </table></td>
       </tr>
-    </table></td>
+    </table></form></td>
 <!-- body_text_eof //-->
     <td width="<?php echo BOX_WIDTH; ?>" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="0" cellpadding="2">
 <!-- right_navigation //-->
 <?php require(DIR_WS_INCLUDES . 'column_right.php'); ?>
 <!-- right_navigation_eof //-->
     </table></td>

[IMPROVEMENT] register_globals Compatibility for PHP 4.3+ Servers

Add a register_globals compatibility layer for PHP 4.3+ servers.

Affected Files
catalog/includes/application_top.php
catalog/includes/functions/compatibility.php
catalog/includes/functions/sessions.php
catalog/includes/functions/html_output.php
catalog/includes/classes/order.php
catalog/includes/modules/address_book_details.php
catalog/checkout_payment.php
catalog/admin/includes/application_top.php
catalog/admin/includes/functions/compatibility.php
catalog/admin/includes/functions/sessions.php
catalog/admin/includes/functions/html_output.php
catalog/admin/includes/classes/upload.php
catalog/admin/file_manager.php

File: catalog/includes/application_top.php

 // start the timer for the page parse time log
   define('PAGE_PARSE_START_TIME', microtime());
 // set the level of error reporting
   error_reporting(E_ALL & ~E_NOTICE);
-// check if register_globals is enabled.
+// check support for register_globals
-// since this is a temporary measure this message is hardcoded. The requirement will be removed before 2.2 is finalized.
+  if (function_exists('ini_get') && (ini_get('register_globals') == false) && (PHP_VERSION < 4.3) ) {
-  if (function_exists('ini_get')) {
+    exit('Server Requirement Error: register_globals is disabled in your PHP configuration. This can be enabled in your php.ini configuration file or in the .htaccess file in your catalog directory. Please use PHP 4.3+ if register_globals cannot be enabled on the server.');
-    ini_get('register_globals') or exit('Server Requirement Error: register_globals is disabled in your PHP configuration. This can be enabled in your php.ini configuration file or in the .htaccess file in your catalog directory.');
   }
 // Set the local configuration parameters - mainly for developers
   if (file_exists('includes/local/configure.php')) include('includes/local/configure.php');
 // include server parameters
       header('Location: install/index.php');
     }
   }
 // define the project version
   define('PROJECT_VERSION', 'osCommerce 2.2-MS2');
+// some code to solve compatibility issues
+  require(DIR_WS_FUNCTIONS . 'compatibility.php');
 // set the type of request (secure or not)
   $request_type = (getenv('HTTPS') == 'on') ? 'SSL' : 'NONSSL';
 // set php_self in the local scope
   if (!isset($PHP_SELF)) $PHP_SELF = $HTTP_SERVER_VARS['PHP_SELF'];
 // include shopping cart class
   require(DIR_WS_CLASSES . 'shopping_cart.php');
 // include navigation history class
   require(DIR_WS_CLASSES . 'navigation_history.php');
-// some code to solve compatibility issues
-  require(DIR_WS_FUNCTIONS . 'compatibility.php');
 // check if sessions are supported, otherwise use the php3 compatible session class
   if (!function_exists('session_start')) {
     define('PHP_SESSION_NAME', 'osCsid');
     define('PHP_SESSION_PATH', $cookie_path);
     define('PHP_SESSION_DOMAIN', $cookie_domain);
     define('PHP_SESSION_SAVE_PATH', SESSION_WRITE_DIRECTORY);
       tep_session_start();
       $session_started = true;
     }
   } else {
     tep_session_start();
     $session_started = true;
+  }
+  if ( ($session_started == true) && (PHP_VERSION >= 4.3) && function_exists('ini_get') && (ini_get('register_globals') == false) ) {
+    extract($_SESSION, EXTR_OVERWRITE+EXTR_REFS);
   }
 // set SID once, even if empty
   $SID = (defined('SID') ? SID : '');
 // verify the ssl_session_id if the feature is enabled

File: catalog/includes/functions/compatibility.php

 /*
   $Id: compatibility.php,v 1.19 2003/04/09 16:12:54 project3000 Exp $
   osCommerce, Open Source E-Commerce Solutions
   http://www.oscommerce.com
-  Copyright (c) 2006 osCommerce
+  Copyright (c) 2007 osCommerce
   Released under the GNU General Public License
-  Modified by Marco Canini, <m.canini@libero.it>
-  - Fixed a bug with arrays in $HTTP_xxx_VARS
 */
 ////
 // Recursively handle magic_quotes_gpc turned off.
 // This is due to the possibility of have an array in
 // $HTTP_xxx_VARS
       } else {
         $ar[$key] = addslashes($value);
       }
     }
   }
-// $HTTP_xxx_VARS are always set on php4
+  if (PHP_VERSION >= 4.1) {
+    $HTTP_GET_VARS =& $_GET;
+    $HTTP_POST_VARS =& $_POST;
+    $HTTP_COOKIE_VARS =& $_COOKIE;
+    $HTTP_SESSION_VARS =& $_SESSION;
+    $HTTP_POST_FILES =& $_FILES;
+    $HTTP_SERVER_VARS =& $_SERVER;
+  } else {
-  if (!is_array($HTTP_GET_VARS)) $HTTP_GET_VARS = array();
+    if (!is_array($HTTP_GET_VARS)) $HTTP_GET_VARS = array();
-  if (!is_array($HTTP_POST_VARS)) $HTTP_POST_VARS = array();
+    if (!is_array($HTTP_POST_VARS)) $HTTP_POST_VARS = array();
-  if (!is_array($HTTP_COOKIE_VARS)) $HTTP_COOKIE_VARS = array();
+    if (!is_array($HTTP_COOKIE_VARS)) $HTTP_COOKIE_VARS = array();
+  }
 // handle magic_quotes_gpc turned off.
   if (!get_magic_quotes_gpc()) {
     do_magic_quotes_gpc($HTTP_GET_VARS);
     do_magic_quotes_gpc($HTTP_POST_VARS);
     do_magic_quotes_gpc($HTTP_COOKIE_VARS);

File: catalog/includes/functions/sessions.php

98	}	=	98	}
99			99
100	function tep_session_register($variable) {		100	function tep_session_register($variable) {
101	global $session_started;		101	global $session_started;
102			102
103	if ($session_started == true) {		103	if ($session_started == true) {
		<>	104	if (PHP_VERSION < 4.3) {
104	return session_register($variable);		105	return session_register($variable);
105	} else {		106	} else {
			107	$_SESSION[$variable] = (isset($GLOBALS[$variable])) ? $GLOBALS[$variable] : null;
			108
			109	$GLOBALS[$variable] =& $_SESSION[$variable];
106	return false;		110	}
107	}	=	111	}
		-+	112
			113	return false;
108	}	=	114	}
109			115
110	function tep_session_is_registered($variable) {		116	function tep_session_is_registered($variable) {
		<>	117	if (PHP_VERSION < 4.3) {
111	return session_is_registered($variable);		118	return session_is_registered($variable);
			119	} else {
			120	return isset($_SESSION[$variable]);
			121	}
112	}	=	122	}
113			123
114	function tep_session_unregister($variable) {		124	function tep_session_unregister($variable) {
		<>	125	if (PHP_VERSION < 4.3) {
115	return session_unregister($variable);		126	return session_unregister($variable);
			127	} else {
			128	unset($_SESSION[$variable]);
			129	}
116	}	=	130	}
117			131
118	function tep_session_id($sessid = '') {		132	function tep_session_id($sessid = '') {
119	if (!empty($sessid)) {		133	if (!empty($sessid)) {
120	return session_id($sessid);		134	return session_id($sessid);
121	} else {		135	} else {

File: catalog/includes/functions/html_output.php

     return $form;
   }
 ////
 // Output a form input field
   function tep_draw_input_field($name, $value = '', $parameters = '', $type = 'text', $reinsert_value = true) {
+    global $HTTP_GET_VARS, $HTTP_POST_VARS;
     $field = '<input type="' . tep_output_string($type) . '" name="' . tep_output_string($name) . '"';
-    if ( (isset($GLOBALS[$name])) && ($reinsert_value == true) ) {
+    if ( ($reinsert_value == true) && ( (isset($HTTP_GET_VARS[$name]) && is_string($HTTP_GET_VARS[$name])) || (isset($HTTP_POST_VARS[$name]) && is_string($HTTP_POST_VARS[$name])) ) ) {
-      $field .= ' value="' . tep_output_string(stripslashes($GLOBALS[$name])) . '"';
+      if (isset($HTTP_GET_VARS[$name]) && is_string($HTTP_GET_VARS[$name])) {
+        $value = stripslashes($HTTP_GET_VARS[$name]);
+      } elseif (isset($HTTP_POST_VARS[$name]) && is_string($HTTP_POST_VARS[$name])) {
+        $value = stripslashes($HTTP_POST_VARS[$name]);
+      }
+    }
-    } elseif (tep_not_null($value)) {
+    if (tep_not_null($value)) {
       $field .= ' value="' . tep_output_string($value) . '"';
     }
     if (tep_not_null($parameters)) $field .= ' ' . $parameters;
     $field .= '>';
     return tep_draw_input_field($name, $value, $parameters, 'password', false);
   }
 ////
 // Output a selection field - alias function for tep_draw_checkbox_field() and tep_draw_radio_field()
   function tep_draw_selection_field($name, $type, $value = '', $checked = false, $parameters = '') {
+    global $HTTP_GET_VARS, $HTTP_POST_VARS;
     $selection = '<input type="' . tep_output_string($type) . '" name="' . tep_output_string($name) . '"';
     if (tep_not_null($value)) $selection .= ' value="' . tep_output_string($value) . '"';
-    if ( ($checked == true) || ( isset($GLOBALS[$name]) && is_string($GLOBALS[$name]) && ( ($GLOBALS[$name] == 'on') || (isset($value) && (stripslashes($GLOBALS[$name]) == $value)) ) ) ) {
+    if ( ($checked == true) || (isset($HTTP_GET_VARS[$name]) && is_string($HTTP_GET_VARS[$name]) && (($HTTP_GET_VARS[$name] == 'on') || (stripslashes($HTTP_GET_VARS[$name]) == $value))) || (isset($HTTP_POST_VARS[$name]) && is_string($HTTP_POST_VARS[$name]) && (($HTTP_POST_VARS[$name] == 'on') || (stripslashes($HTTP_POST_VARS[$name]) == $value))) ) {
       $selection .= ' CHECKED';
     }
     if (tep_not_null($parameters)) $selection .= ' ' . $parameters;
     $selection .= '>';
     return tep_draw_selection_field($name, 'radio', $value, $checked, $parameters);
   }
 ////
 // Output a form textarea field
   function tep_draw_textarea_field($name, $wrap, $width, $height, $text = '', $parameters = '', $reinsert_value = true) {
+    global $HTTP_GET_VARS, $HTTP_POST_VARS;
     $field = '<textarea name="' . tep_output_string($name) . '" wrap="' . tep_output_string($wrap) . '" cols="' . tep_output_string($width) . '" rows="' . tep_output_string($height) . '"';
     if (tep_not_null($parameters)) $field .= ' ' . $parameters;
     $field .= '>';
-    if ( (isset($GLOBALS[$name])) && ($reinsert_value == true) ) {
+    if ( ($reinsert_value == true) && ( (isset($HTTP_GET_VARS[$name]) && is_string($HTTP_GET_VARS[$name])) || (isset($HTTP_POST_VARS[$name]) && is_string($HTTP_POST_VARS[$name])) ) ) {
+      if (isset($HTTP_GET_VARS[$name]) && is_string($HTTP_GET_VARS[$name])) {
-      $field .= tep_output_string_protected(stripslashes($GLOBALS[$name]));
+        $field .= tep_output_string_protected(stripslashes($HTTP_GET_VARS[$name]));
+      } elseif (isset($HTTP_POST_VARS[$name]) && is_string($HTTP_POST_VARS[$name])) {
+        $field .= tep_output_string_protected(stripslashes($HTTP_POST_VARS[$name]));
+      }
     } elseif (tep_not_null($text)) {
       $field .= tep_output_string_protected($text);
     }
     $field .= '</textarea>';
     return $field;
   }
 ////
 // Output a form hidden field
   function tep_draw_hidden_field($name, $value = '', $parameters = '') {
+    global $HTTP_GET_VARS, $HTTP_POST_VARS;
     $field = '<input type="hidden" name="' . tep_output_string($name) . '"';
     if (tep_not_null($value)) {
       $field .= ' value="' . tep_output_string($value) . '"';
-    } elseif (isset($GLOBALS[$name])) {
+    } elseif ( (isset($HTTP_GET_VARS[$name]) && is_string($HTTP_GET_VARS[$name])) || (isset($HTTP_POST_VARS[$name]) && is_string($HTTP_POST_VARS[$name])) ) {
+      if ( (isset($HTTP_GET_VARS[$name]) && is_string($HTTP_GET_VARS[$name])) ) {
-      $field .= ' value="' . tep_output_string(stripslashes($GLOBALS[$name])) . '"';
+        $field .= ' value="' . tep_output_string(stripslashes($HTTP_GET_VARS[$name])) . '"';
+      } elseif ( (isset($HTTP_POST_VARS[$name]) && is_string($HTTP_POST_VARS[$name])) ) {
+        $field .= ' value="' . tep_output_string(stripslashes($HTTP_POST_VARS[$name])) . '"';
+      }
     }
     if (tep_not_null($parameters)) $field .= ' ' . $parameters;
     $field .= '>';
     }
   }
 ////
 // Output a form pull down menu
   function tep_draw_pull_down_menu($name, $values, $default = '', $parameters = '', $required = false) {
+    global $HTTP_GET_VARS, $HTTP_POST_VARS;
     $field = '<select name="' . tep_output_string($name) . '"';
     if (tep_not_null($parameters)) $field .= ' ' . $parameters;
     $field .= '>';
-    if (empty($default) && isset($GLOBALS[$name])) $default = stripslashes($GLOBALS[$name]);
+    if (empty($default) && ( (isset($HTTP_GET_VARS[$name]) && is_string($HTTP_GET_VARS[$name])) || (isset($HTTP_POST_VARS[$name]) && is_string($HTTP_POST_VARS[$name])) ) ) {
+      if (isset($HTTP_GET_VARS[$name]) && is_string($HTTP_GET_VARS[$name])) {
+        $default = stripslashes($HTTP_GET_VARS[$name]);
+      } elseif (isset($HTTP_POST_VARS[$name]) && is_string($HTTP_POST_VARS[$name])) {
+        $default = stripslashes($HTTP_POST_VARS[$name]);
+      }
+    }
     for ($i=0, $n=sizeof($values); $i<$n; $i++) {
       $field .= '<option value="' . tep_output_string($values[$i]['id']) . '"';
       if ($default == $values[$i]['id']) {
         $field .= ' SELECTED';
       }

File: catalog/includes/classes/order.php

128		=	128
129	$index++;		129	$index++;
130	}		130	}
131	}		131	}
132			132
133	function cart() {		133	function cart() {
134	global $customer_id, $sendto, $billto, $cart, $languages_id, $currency, $currencies, $shipping, $payment;	<>	134	global $HTTP_POST_VARS, $customer_id, $sendto, $billto, $cart, $languages_id, $currency, $currencies, $shipping, $payment, $comments;
135		=	135
136	$this->content_type = $cart->get_content_type();		136	$this->content_type = $cart->get_content_type();
137			137
138	$customer_address_query = tep_db_query("select c.customers_firstname, c.customers_lastname, c.customers_telephone, c.customers_email_address, ab.entry_company, ab.entry_street_address, ab.entry_suburb, ab.entry_postcode, ab.entry_city, ab.entry_zone_id, z.zone_name, co.countries_id, co.countries_name, co.countries_iso_code_2, co.countries_iso_code_3, co.address_format_id, ab.entry_state from " . TABLE_CUSTOMERS . " c, " . TABLE_ADDRESS_BOOK . " ab left join " . TABLE_ZONES . " z on (ab.entry_zone_id = z.zone_id) left join " . TABLE_COUNTRIES . " co on (ab.entry_country_id = co.countries_id) where c.customers_id = '" . (int)$customer_id . "' and ab.customers_id = '" . (int)$customer_id . "' and c.customers_default_address_id = ab.address_book_id");		138	$customer_address_query = tep_db_query("select c.customers_firstname, c.customers_lastname, c.customers_telephone, c.customers_email_address, ab.entry_company, ab.entry_street_address, ab.entry_suburb, ab.entry_postcode, ab.entry_city, ab.entry_zone_id, z.zone_name, co.countries_id, co.countries_name, co.countries_iso_code_2, co.countries_iso_code_3, co.address_format_id, ab.entry_state from " . TABLE_CUSTOMERS . " c, " . TABLE_ADDRESS_BOOK . " ab left join " . TABLE_ZONES . " z on (ab.entry_zone_id = z.zone_id) left join " . TABLE_COUNTRIES . " co on (ab.entry_country_id = co.countries_id) where c.customers_id = '" . (int)$customer_id . "' and ab.customers_id = '" . (int)$customer_id . "' and c.customers_default_address_id = ab.address_book_id");
139	$customer_address = tep_db_fetch_array($customer_address_query);		139	$customer_address = tep_db_fetch_array($customer_address_query);
140			140

148	$tax_address = tep_db_fetch_array($tax_address_query);	=	148	$tax_address = tep_db_fetch_array($tax_address_query);
149			149
150	$this->info = array('order_status' => DEFAULT_ORDERS_STATUS_ID,		150	$this->info = array('order_status' => DEFAULT_ORDERS_STATUS_ID,
151	'currency' => $currency,		151	'currency' => $currency,
152	'currency_value' => $currencies->currencies[$currency]['value'],		152	'currency_value' => $currencies->currencies[$currency]['value'],
153	'payment_method' => $payment,		153	'payment_method' => $payment,
154	'cc_type' => (isset($GLOBALS['cc_type']) ? $GLOBALS['cc_type'] : ''),	<>	154	'cc_type' => (isset($HTTP_POST_VARS['cc_type']) ? $HTTP_POST_VARS['cc_type'] : ''),
155	'cc_owner' => (isset($GLOBALS['cc_owner']) ? $GLOBALS['cc_owner'] : ''),		155	'cc_owner' => (isset($HTTP_POST_VARS['cc_owner']) ? $HTTP_POST_VARS['cc_owner'] : ''),
156	'cc_number' => (isset($GLOBALS['cc_number']) ? $GLOBALS['cc_number'] : ''),		156	'cc_number' => (isset($HTTP_POST_VARS['cc_number']) ? $HTTP_POST_VARS['cc_number'] : ''),
157	'cc_expires' => (isset($GLOBALS['cc_expires']) ? $GLOBALS['cc_expires'] : ''),		157	'cc_expires' => (isset($HTTP_POST_VARS['cc_expires']) ? $HTTP_POST_VARS['cc_expires'] : ''),
158	'shipping_method' => $shipping['title'],	=	158	'shipping_method' => $shipping['title'],
159	'shipping_cost' => $shipping['cost'],		159	'shipping_cost' => $shipping['cost'],
160	'subtotal' => 0,		160	'subtotal' => 0,
161	'tax' => 0,		161	'tax' => 0,
162	'tax_groups' => array(),		162	'tax_groups' => array(),
163	'comments' => (isset($GLOBALS['comments']) ? $GLOBALS['comments'] : ''));	<>	163	'comments' => (tep_session_is_registered('comments') && !empty($comments) ? $comments : ''));
164		=	164
165	if (isset($GLOBALS[$payment]) && is_object($GLOBALS[$payment])) {		165	if (isset($GLOBALS[$payment]) && is_object($GLOBALS[$payment])) {
166	$this->info['payment_method'] = $GLOBALS[$payment]->title;		166	$this->info['payment_method'] = $GLOBALS[$payment]->title;
167			167
168	if ( isset($GLOBALS[$payment]->order_status) && is_numeric($GLOBALS[$payment]->order_status) && ($GLOBALS[$payment]->order_status > 0) ) {		168	if ( isset($GLOBALS[$payment]->order_status) && is_numeric($GLOBALS[$payment]->order_status) && ($GLOBALS[$payment]->order_status > 0) ) {
169	$this->info['order_status'] = $GLOBALS[$payment]->order_status;		169	$this->info['order_status'] = $GLOBALS[$payment]->order_status;

File: catalog/includes/modules/address_book_details.php

24	<tr>	=	24	<tr>
25	<td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">		25	<td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
26	<tr class="infoBoxContents">		26	<tr class="infoBoxContents">
27	<td><table border="0" cellspacing="2" cellpadding="2">		27	<td><table border="0" cellspacing="2" cellpadding="2">
28	<?php		28	<?php
29	if (ACCOUNT_GENDER == 'true') {		29	if (ACCOUNT_GENDER == 'true') {
		-+	30	$male = $female = false;
30	if (isset($gender)) {	=	31	if (isset($gender)) {
31	$male = ($gender == 'm') ? true : false;		32	$male = ($gender == 'm') ? true : false;
32	} else {	<>	33	$female = !$male;
			34	} elseif (isset($entry['entry_gender'])) {
33	$male = ($entry['entry_gender'] == 'm') ? true : false;	=	35	$male = ($entry['entry_gender'] == 'm') ? true : false;
		-+	36	$female = !$male;
34	}	=	37	}
35	$female = !$male;	+-
36	?>	=	38	?>
37	<tr>		39	<tr>
38	<td class="main"><?php echo ENTRY_GENDER; ?></td>		40	<td class="main"><?php echo ENTRY_GENDER; ?></td>
39	<td class="main"><?php echo tep_draw_radio_field('gender', 'm', $male) . '  ' . MALE . '  ' . tep_draw_radio_field('gender', 'f', $female) . '  ' . FEMALE . ' ' . (tep_not_null(ENTRY_GENDER_TEXT) ? '<span class="inputRequirement">' . ENTRY_GENDER_TEXT . '</span>': ''); ?></td>		41	<td class="main"><?php echo tep_draw_radio_field('gender', 'm', $male) . '  ' . MALE . '  ' . tep_draw_radio_field('gender', 'f', $female) . '  ' . FEMALE . ' ' . (tep_not_null(ENTRY_GENDER_TEXT) ? '<span class="inputRequirement">' . ENTRY_GENDER_TEXT . '</span>': ''); ?></td>
40	</tr>		42	</tr>
41	<?php		43	<?php

File: catalog/checkout_payment.php

   }
   require(DIR_WS_CLASSES . 'order.php');
   $order = new order;
   if (!tep_session_is_registered('comments')) tep_session_register('comments');
+  if (isset($HTTP_POST_VARS['comments']) && tep_not_null($HTTP_POST_VARS['comments'])) {
+    $comments = tep_db_prepare_input($HTTP_POST_VARS['comments']);
+  }
   $total_weight = $cart->show_weight();
   $total_count = $cart->count_contents();
 // load all enabled payment modules
   require(DIR_WS_CLASSES . 'payment.php');
       </tr>
       <tr>
         <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
           <tr class="infoBoxContents">
             <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
               <tr>
-                <td><?php echo tep_draw_textarea_field('comments', 'soft', '60', '5'); ?></td>
+                <td><?php echo tep_draw_textarea_field('comments', 'soft', '60', '5', $comments); ?></td>
               </tr>
             </table></td>
           </tr>
         </table></td>
       </tr>
       <tr>

File: catalog/admin/includes/application_top.php

 // Start the clock for the page parse time log
   define('PAGE_PARSE_START_TIME', microtime());
 // Set the level of error reporting
   error_reporting(E_ALL & ~E_NOTICE);
-// Check if register_globals is enabled.
+// check support for register_globals
-// Since this is a temporary measure this message is hardcoded. The requirement will be removed before 2.2 is finalized.
+  if (function_exists('ini_get') && (ini_get('register_globals') == false) && (PHP_VERSION < 4.3) ) {
-  if (function_exists('ini_get')) {
+    exit('Server Requirement Error: register_globals is disabled in your PHP configuration. This can be enabled in your php.ini configuration file or in the .htaccess file in your catalog directory. Please use PHP 4.3+ if register_globals cannot be enabled on the server.');
-    ini_get('register_globals') or exit('Server Requirement Error: register_globals is disabled in your PHP configuration. This can be enabled in your php.ini configuration file or in the .htaccess file in your catalog directory.');
   }
 // Set the local configuration parameters - mainly for developers
   if (file_exists('includes/local/configure.php')) include('includes/local/configure.php');
 // Include application configuration parameters
   require('includes/configure.php');
 // Define the project version
   define('PROJECT_VERSION', 'osCommerce 2.2-MS2');
+// some code to solve compatibility issues
+  require(DIR_WS_FUNCTIONS . 'compatibility.php');
 // set php_self in the local scope
   $PHP_SELF = (isset($HTTP_SERVER_VARS['PHP_SELF']) ? $HTTP_SERVER_VARS['PHP_SELF'] : $HTTP_SERVER_VARS['SCRIPT_NAME']);
 // Used in the "Backup Manager" to compress backups
   define('LOCAL_EXE_GZIP', '/usr/bin/gzip');
 // initialize the logger class
   require(DIR_WS_CLASSES . 'logger.php');
 // include shopping cart class
   require(DIR_WS_CLASSES . 'shopping_cart.php');
-// some code to solve compatibility issues
-  require(DIR_WS_FUNCTIONS . 'compatibility.php');
 // check to see if php implemented session management functions - if not, include php3/php4 compatible session class
   if (!function_exists('session_start')) {
     define('PHP_SESSION_NAME', 'osCAdminID');
     define('PHP_SESSION_PATH', '/');
     define('PHP_SESSION_SAVE_PATH', SESSION_WRITE_DIRECTORY);
     ini_set('session.cookie_lifetime', '0');
     ini_set('session.cookie_path', DIR_WS_ADMIN);
   }
 // lets start our session
   tep_session_start();
+  if ( (PHP_VERSION >= 4.3) && function_exists('ini_get') && (ini_get('register_globals') == false) ) {
+    extract($_SESSION, EXTR_OVERWRITE+EXTR_REFS);
+  }
 // set the language
   if (!tep_session_is_registered('language') || isset($HTTP_GET_VARS['language'])) {
     if (!tep_session_is_registered('language')) {
       tep_session_register('language');
       tep_session_register('languages_id');

File: catalog/admin/includes/functions/compatibility.php

       } else {
         $ar[$key] = addslashes($value);
       }
     }
   }
-// $HTTP_xxx_VARS are always set on php4
+  if (PHP_VERSION >= 4.1) {
+    $HTTP_GET_VARS =& $_GET;
+    $HTTP_POST_VARS =& $_POST;
+    $HTTP_COOKIE_VARS =& $_COOKIE;
+    $HTTP_SESSION_VARS =& $_SESSION;
+    $HTTP_POST_FILES =& $_FILES;
+    $HTTP_SERVER_VARS =& $_SERVER;
+  } else {
-  if (!is_array($HTTP_GET_VARS)) $HTTP_GET_VARS = array();
+    if (!is_array($HTTP_GET_VARS)) $HTTP_GET_VARS = array();
-  if (!is_array($HTTP_POST_VARS)) $HTTP_POST_VARS = array();
+    if (!is_array($HTTP_POST_VARS)) $HTTP_POST_VARS = array();
-  if (!is_array($HTTP_COOKIE_VARS)) $HTTP_COOKIE_VARS = array();
+    if (!is_array($HTTP_COOKIE_VARS)) $HTTP_COOKIE_VARS = array();
+  }
 // handle magic_quotes_gpc turned off.
   if (!get_magic_quotes_gpc()) {
     do_magic_quotes_gpc($HTTP_GET_VARS);
     do_magic_quotes_gpc($HTTP_POST_VARS);
     do_magic_quotes_gpc($HTTP_COOKIE_VARS);

File: catalog/admin/includes/functions/sessions.php

     function _sess_close() {
       return true;
     }
     function _sess_read($key) {
-      $qid = tep_db_query("select value from " . TABLE_SESSIONS . " where sesskey = '" . tep_db_input($key) . "' and expiry > '" . time() . "'");
+      $value_query = tep_db_query("select value from " . TABLE_SESSIONS . " where sesskey = '" . tep_db_input($key) . "' and expiry > '" . time() . "'");
+      $value = tep_db_fetch_array($value_query);
-      $value = tep_db_fetch_array($qid);
-      if ($value['value']) {
+      if (isset($value['value'])) {
         return $value['value'];
       }
       return false;
     }
     function _sess_write($key, $val) {
       global $SESS_LIFE;
       $expiry = time() + $SESS_LIFE;
       $value = $val;
-      $qid = tep_db_query("select count(*) as total from " . TABLE_SESSIONS . " where sesskey = '" . tep_db_input($key) . "'");
+      $check_query = tep_db_query("select count(*) as total from " . TABLE_SESSIONS . " where sesskey = '" . tep_db_input($key) . "'");
-      $total = tep_db_fetch_array($qid);
+      $check = tep_db_fetch_array($check_query);
-      if ($total['total'] > 0) {
+      if ($check['total'] > 0) {
         return tep_db_query("update " . TABLE_SESSIONS . " set expiry = '" . tep_db_input($expiry) . "', value = '" . tep_db_input($value) . "' where sesskey = '" . tep_db_input($key) . "'");
       } else {
         return tep_db_query("insert into " . TABLE_SESSIONS . " values ('" . tep_db_input($key) . "', '" . tep_db_input($expiry) . "', '" . tep_db_input($value) . "')");
       }
     }
     }
     session_set_save_handler('_sess_open', '_sess_close', '_sess_read', '_sess_write', '_sess_destroy', '_sess_gc');
   }
   function tep_session_start() {
+    global $HTTP_GET_VARS, $HTTP_POST_VARS, $HTTP_COOKIE_VARS;
+    $sane_session_id = true;
+    if (isset($HTTP_GET_VARS[tep_session_name()])) {
+      if (preg_match('/^[a-zA-Z0-9]+$/', $HTTP_GET_VARS[tep_session_name()]) == false) {
+        unset($HTTP_GET_VARS[tep_session_name()]);
+        $sane_session_id = false;
+      }
+    } elseif (isset($HTTP_POST_VARS[tep_session_name()])) {
+      if (preg_match('/^[a-zA-Z0-9]+$/', $HTTP_POST_VARS[tep_session_name()]) == false) {
+        unset($HTTP_POST_VARS[tep_session_name()]);
+        $sane_session_id = false;
+      }
+    } elseif (isset($HTTP_COOKIE_VARS[tep_session_name()])) {
+      if (preg_match('/^[a-zA-Z0-9]+$/', $HTTP_COOKIE_VARS[tep_session_name()]) == false) {
+        $session_data = session_get_cookie_params();
+        setcookie(tep_session_name(), '', time()-42000, $session_data['path'], $session_data['domain']);
+        $sane_session_id = false;
+      }
+    }
+    if ($sane_session_id == false) {
+      tep_redirect(tep_href_link(FILENAME_DEFAULT, '', 'NONSSL', false));
+    }
     return session_start();
   }
   function tep_session_register($variable) {
+    if (PHP_VERSION < 4.3) {
-    return session_register($variable);
+      return session_register($variable);
+    } else {
+      if (isset($GLOBALS[$variable])) {
+        $_SESSION[$variable] =& $GLOBALS[$variable];
+      } else {
+        $_SESSION[$variable] = null;
+      }
+      $GLOBALS[$variable] =& $_SESSION[$variable];
+    }
+    return false;
   }
   function tep_session_is_registered($variable) {
+    if (PHP_VERSION < 4.3) {
-    return session_is_registered($variable);
+      return session_is_registered($variable);
+    } else {
+      return isset($_SESSION[$variable]);
+    }
   }
   function tep_session_unregister($variable) {
+    if (PHP_VERSION < 4.3) {
-    return session_unregister($variable);
+      return session_unregister($variable);
+    } else {
+      unset($_SESSION[$variable]);
+    }
   }
   function tep_session_id($sessid = '') {
     if ($sessid != '') {
       return session_id($sessid);
     } else {
     } else {
       return session_name();
     }
   }
   function tep_session_close() {
+    if (PHP_VERSION >= '4.0.4') {
+      return session_write_close();
-    if (function_exists('session_close')) {
+    } elseif (function_exists('session_close')) {
       return session_close();
     }
   }
   function tep_session_destroy() {
     return session_destroy();

File: catalog/admin/includes/functions/html_output.php

     return $form;
   }
 ////
 // Output a form input field
   function tep_draw_input_field($name, $value = '', $parameters = '', $required = false, $type = 'text', $reinsert_value = true) {
+    global $HTTP_GET_VARS, $HTTP_POST_VARS;
     $field = '<input type="' . tep_output_string($type) . '" name="' . tep_output_string($name) . '"';
-    if (isset($GLOBALS[$name]) && ($reinsert_value == true) && is_string($GLOBALS[$name])) {
+    if ( ($reinsert_value == true) && ( (isset($HTTP_GET_VARS[$name]) && is_string($HTTP_GET_VARS[$name])) || (isset($HTTP_POST_VARS[$name]) && is_string($HTTP_POST_VARS[$name])) ) ) {
-      $field .= ' value="' . tep_output_string(stripslashes($GLOBALS[$name])) . '"';
+      if (isset($HTTP_GET_VARS[$name]) && is_string($HTTP_GET_VARS[$name])) {
+        $value = stripslashes($HTTP_GET_VARS[$name]);
+      } elseif (isset($HTTP_POST_VARS[$name]) && is_string($HTTP_POST_VARS[$name])) {
+        $value = stripslashes($HTTP_POST_VARS[$name]);
+      }
+    }
-    } elseif (tep_not_null($value)) {
+    if (tep_not_null($value)) {
       $field .= ' value="' . tep_output_string($value) . '"';
     }
     if (tep_not_null($parameters)) $field .= ' ' . $parameters;
     $field .= '>';
     return $field;
   }
 ////
 // Output a selection field - alias function for tep_draw_checkbox_field() and tep_draw_radio_field()
   function tep_draw_selection_field($name, $type, $value = '', $checked = false, $compare = '') {
+    global $HTTP_GET_VARS, $HTTP_POST_VARS;
     $selection = '<input type="' . tep_output_string($type) . '" name="' . tep_output_string($name) . '"';
     if (tep_not_null($value)) $selection .= ' value="' . tep_output_string($value) . '"';
-    if ( ($checked == true) || (isset($GLOBALS[$name]) && is_string($GLOBALS[$name]) && ($GLOBALS[$name] == 'on')) || (isset($value) && isset($GLOBALS[$name]) && (stripslashes($GLOBALS[$name]) == $value)) || (tep_not_null($value) && tep_not_null($compare) && ($value == $compare)) ) {
+    if ( ($checked == true) || (isset($HTTP_GET_VARS[$name]) && is_string($HTTP_GET_VARS[$name]) && (($HTTP_GET_VARS[$name] == 'on') || (stripslashes($HTTP_GET_VARS[$name]) == $value))) || (isset($HTTP_POST_VARS[$name]) && is_string($HTTP_POST_VARS[$name]) && (($HTTP_POST_VARS[$name] == 'on') || (stripslashes($HTTP_POST_VARS[$name]) == $value))) || (tep_not_null($compare) && ($value == $compare)) ) {
       $selection .= ' CHECKED';
     }
     $selection .= '>';
     return $selection;
     return tep_draw_selection_field($name, 'radio', $value, $checked, $compare);
   }
 ////
 // Output a form textarea field
   function tep_draw_textarea_field($name, $wrap, $width, $height, $text = '', $parameters = '', $reinsert_value = true) {
+    global $HTTP_GET_VARS, $HTTP_POST_VARS;
     $field = '<textarea name="' . tep_output_string($name) . '" wrap="' . tep_output_string($wrap) . '" cols="' . tep_output_string($width) . '" rows="' . tep_output_string($height) . '"';
     if (tep_not_null($parameters)) $field .= ' ' . $parameters;
     $field .= '>';
-    if ( (isset($GLOBALS[$name])) && ($reinsert_value == true) ) {
+    if ( ($reinsert_value == true) && ( (isset($HTTP_GET_VARS[$name]) && is_string($HTTP_GET_VARS[$name])) || (isset($HTTP_POST_VARS[$name]) && is_string($HTTP_POST_VARS[$name])) ) ) {
+      if (isset($HTTP_GET_VARS[$name]) && is_string($HTTP_GET_VARS[$name])) {
-      $field .= tep_output_string_protected(stripslashes($GLOBALS[$name]));
+        $field .= tep_output_string_protected(stripslashes($HTTP_GET_VARS[$name]));
+      } elseif (isset($HTTP_POST_VARS[$name]) && is_string($HTTP_POST_VARS[$name])) {
+        $field .= tep_output_string_protected(stripslashes($HTTP_POST_VARS[$name]));
+      }
     } elseif (tep_not_null($text)) {
       $field .= tep_output_string_protected($text);
     }
     $field .= '</textarea>';
     return $field;
   }
 ////
 // Output a form hidden field
   function tep_draw_hidden_field($name, $value = '', $parameters = '') {
+    global $HTTP_GET_VARS, $HTTP_POST_VARS;
     $field = '<input type="hidden" name="' . tep_output_string($name) . '"';
     if (tep_not_null($value)) {
       $field .= ' value="' . tep_output_string($value) . '"';
-    } elseif (isset($GLOBALS[$name]) && is_string($GLOBALS[$name])) {
+    } elseif ( (isset($HTTP_GET_VARS[$name]) && is_string($HTTP_GET_VARS[$name])) || (isset($HTTP_POST_VARS[$name]) && is_string($HTTP_POST_VARS[$name])) ) {
+      if ( (isset($HTTP_GET_VARS[$name]) && is_string($HTTP_GET_VARS[$name])) ) {
-      $field .= ' value="' . tep_output_string(stripslashes($GLOBALS[$name])) . '"';
+        $field .= ' value="' . tep_output_string(stripslashes($HTTP_GET_VARS[$name])) . '"';
+      } elseif ( (isset($HTTP_POST_VARS[$name]) && is_string($HTTP_POST_VARS[$name])) ) {
+        $field .= ' value="' . tep_output_string(stripslashes($HTTP_POST_VARS[$name])) . '"';
+      }
     }
     if (tep_not_null($parameters)) $field .= ' ' . $parameters;
     $field .= '>';
     return $field;
   }
 ////
 // Output a form pull down menu
   function tep_draw_pull_down_menu($name, $values, $default = '', $parameters = '', $required = false) {
+    global $HTTP_GET_VARS, $HTTP_POST_VARS;
     $field = '<select name="' . tep_output_string($name) . '"';
     if (tep_not_null($parameters)) $field .= ' ' . $parameters;
     $field .= '>';
-    if (empty($default) && isset($GLOBALS[$name])) $default = stripslashes($GLOBALS[$name]);
+    if (empty($default) && ( (isset($HTTP_GET_VARS[$name]) && is_string($HTTP_GET_VARS[$name])) || (isset($HTTP_POST_VARS[$name]) && is_string($HTTP_POST_VARS[$name])) ) ) {
+      if (isset($HTTP_GET_VARS[$name]) && is_string($HTTP_GET_VARS[$name])) {
+        $default = stripslashes($HTTP_GET_VARS[$name]);
+      } elseif (isset($HTTP_POST_VARS[$name]) && is_string($HTTP_POST_VARS[$name])) {
+        $default = stripslashes($HTTP_POST_VARS[$name]);
+      }
+    }
     for ($i=0, $n=sizeof($values); $i<$n; $i++) {
       $field .= '<option value="' . tep_output_string($values[$i]['id']) . '"';
       if ($default == $values[$i]['id']) {
         $field .= ' SELECTED';
       }

File: catalog/admin/includes/classes/upload.php

30	return false;	=	30	return false;
31	}		31	}
32	}		32	}
33	}		33	}
34			34
35	function parse() {		35	function parse() {
36	global $messageStack;	<>	36	global $HTTP_POST_FILES, $messageStack;
37		=	37
		-+	38	$file = array();
			39
38	if (isset($_FILES[$this->file])) {	=	40	if (isset($_FILES[$this->file])) {
39	$file = array('name' => $_FILES[$this->file]['name'],		41	$file = array('name' => $_FILES[$this->file]['name'],
40	'type' => $_FILES[$this->file]['type'],		42	'type' => $_FILES[$this->file]['type'],
41	'size' => $_FILES[$this->file]['size'],		43	'size' => $_FILES[$this->file]['size'],
42	'tmp_name' => $_FILES[$this->file]['tmp_name']);		44	'tmp_name' => $_FILES[$this->file]['tmp_name']);
43	} elseif (isset($GLOBALS['HTTP_POST_FILES'][$this->file])) {	<>	45	} elseif (isset($HTTP_POST_FILES[$this->file])) {
44	global $HTTP_POST_FILES;
45
46	$file = array('name' => $HTTP_POST_FILES[$this->file]['name'],	=	46	$file = array('name' => $HTTP_POST_FILES[$this->file]['name'],
47	'type' => $HTTP_POST_FILES[$this->file]['type'],		47	'type' => $HTTP_POST_FILES[$this->file]['type'],
48	'size' => $HTTP_POST_FILES[$this->file]['size'],		48	'size' => $HTTP_POST_FILES[$this->file]['size'],
49	'tmp_name' => $HTTP_POST_FILES[$this->file]['tmp_name']);		49	'tmp_name' => $HTTP_POST_FILES[$this->file]['tmp_name']);
50	} else {	+-
51	$file = array('name' => (isset($GLOBALS[$this->file . '_name']) ? $GLOBALS[$this->file . '_name'] : ''),
52	'type' => (isset($GLOBALS[$this->file . '_type']) ? $GLOBALS[$this->file . '_type'] : ''),
53	'size' => (isset($GLOBALS[$this->file . '_size']) ? $GLOBALS[$this->file . '_size'] : ''),
54	'tmp_name' => (isset($GLOBALS[$this->file]) ? $GLOBALS[$this->file] : ''));
55	}	=	50	}
56			51
57	if ( tep_not_null($file['tmp_name']) && ($file['tmp_name'] != 'none') && is_uploaded_file($file['tmp_name']) ) {		52	if ( tep_not_null($file['tmp_name']) && ($file['tmp_name'] != 'none') && is_uploaded_file($file['tmp_name']) ) {
58	if (sizeof($this->extensions) > 0) {		53	if (sizeof($this->extensions) > 0) {
59	if (!in_array(strtolower(substr($file['name'], strrpos($file['name'], '.')+1)), $this->extensions)) {		54	if (!in_array(strtolower(substr($file['name'], strrpos($file['name'], '.')+1)), $this->extensions)) {
60	if ($this->message_location == 'direct') {		55	if ($this->message_location == 'direct') {

File: catalog/admin/file_manager.php

53	fclose($fp);	=	53	fclose($fp);
54	tep_redirect(tep_href_link(FILENAME_FILE_MANAGER, 'info=' . urlencode($HTTP_POST_VARS['filename'])));		54	tep_redirect(tep_href_link(FILENAME_FILE_MANAGER, 'info=' . urlencode($HTTP_POST_VARS['filename'])));
55	}		55	}
56	break;		56	break;
57	case 'processuploads':		57	case 'processuploads':
58	for ($i=1; $i<6; $i++) {		58	for ($i=1; $i<6; $i++) {
59	if (isset($GLOBALS['file_' . $i]) && tep_not_null($GLOBALS['file_' . $i])) {	<>	59	if (is_uploaded_file($HTTP_POST_FILES['file_' . $i]['tmp_name'])) {
60	new upload('file_' . $i, $current_path);	=	60	new upload('file_' . $i, $current_path);
61	}		61	}
62	}		62	}
63			63
64	tep_redirect(tep_href_link(FILENAME_FILE_MANAGER));		64	tep_redirect(tep_href_link(FILENAME_FILE_MANAGER));
65	break;		65	break;

[BUGFIX] Currency Case-Sensitivity

Use the currency code from the currencies database table instead of the value checked on to make sure the currency is valid.

Affected Files
catalog/includes/application_top.php
catalog/includes/functions/general.php

File: catalog/includes/application_top.php

288	require(DIR_WS_LANGUAGES . $language . '.php');	=	288	require(DIR_WS_LANGUAGES . $language . '.php');
289			289
290	// currency		290	// currency
291	if (!tep_session_is_registered('currency') \|\| isset($HTTP_GET_VARS['currency']) \|\| ( (USE_DEFAULT_LANGUAGE_CURRENCY == 'true') && (LANGUAGE_CURRENCY != $currency) ) ) {		291	if (!tep_session_is_registered('currency') \|\| isset($HTTP_GET_VARS['currency']) \|\| ( (USE_DEFAULT_LANGUAGE_CURRENCY == 'true') && (LANGUAGE_CURRENCY != $currency) ) ) {
292	if (!tep_session_is_registered('currency')) tep_session_register('currency');		292	if (!tep_session_is_registered('currency')) tep_session_register('currency');
293			293
294	if (isset($HTTP_GET_VARS['currency'])) {	<>	294	if (isset($HTTP_GET_VARS['currency']) && $currencies->is_set($HTTP_GET_VARS['currency'])) {
295	if (!$currency = tep_currency_exists($HTTP_GET_VARS['currency'])) $currency = (USE_DEFAULT_LANGUAGE_CURRENCY == 'true') ? LANGUAGE_CURRENCY : DEFAULT_CURRENCY;		295	$currency = $HTTP_GET_VARS['currency'];
296	} else {	=	296	} else {
297	$currency = (USE_DEFAULT_LANGUAGE_CURRENCY == 'true') ? LANGUAGE_CURRENCY : DEFAULT_CURRENCY;		297	$currency = (USE_DEFAULT_LANGUAGE_CURRENCY == 'true') ? LANGUAGE_CURRENCY : DEFAULT_CURRENCY;
298	}		298	}
299	}		299	}
300			300
301	// navigation history		301	// navigation history

File: catalog/includes/functions/general.php

 ////
 // Checks to see if the currency code exists as a currency
 // TABLES: currencies
   function tep_currency_exists($code) {
     $code = tep_db_prepare_input($code);
-    $currency_code = tep_db_query("select currencies_id from " . TABLE_CURRENCIES . " where code = '" . tep_db_input($code) . "'");
+    $currency_query = tep_db_query("select code from " . TABLE_CURRENCIES . " where code = '" . tep_db_input($code) . "' limit 1");
-    if (tep_db_num_rows($currency_code)) {
+    if (tep_db_num_rows($currency_query)) {
+      $currency = tep_db_fetch_array($currency_query);
-      return $code;
+      return $currency['code'];
     } else {
       return false;
     }
   }
   function tep_string_to_int($string) {

[BUGFIX] Invoice and Packing Slip Billing Address

Correct the display of the billing address on the invoice and packing slip pages.

Affected Files
catalog/admin/invoice.php
catalog/admin/packingslip.php

File: catalog/admin/invoice.php

48	<tr>	=	48	<tr>
49	<td valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="2">		49	<td valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="2">
50	<tr>		50	<tr>
51	<td class="main"><b><?php echo ENTRY_SOLD_TO; ?></b></td>		51	<td class="main"><b><?php echo ENTRY_SOLD_TO; ?></b></td>
52	</tr>		52	</tr>
53	<tr>		53	<tr>
54	<td class="main"><?php echo tep_address_format($order->customer['format_id'], $order->customer, 1, '', '<br>'); ?></td>	<>	54	<td class="main"><?php echo tep_address_format($order->customer['format_id'], $order->billing, 1, '', '<br>'); ?></td>
55	</tr>	=	55	</tr>
56	<tr>		56	<tr>
57	<td><?php echo tep_draw_separator('pixel_trans.gif', '1', '5'); ?></td>		57	<td><?php echo tep_draw_separator('pixel_trans.gif', '1', '5'); ?></td>
58	</tr>		58	</tr>
59	<tr>		59	<tr>
60	<td class="main"><?php echo $order->customer['telephone']; ?></td>		60	<td class="main"><?php echo $order->customer['telephone']; ?></td>

File: catalog/admin/packingslip.php

47	<tr>	=	47	<tr>
48	<td valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="2">		48	<td valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="2">
49	<tr>		49	<tr>
50	<td class="main"><b><?php echo ENTRY_SOLD_TO; ?></b></td>		50	<td class="main"><b><?php echo ENTRY_SOLD_TO; ?></b></td>
51	</tr>		51	</tr>
52	<tr>		52	<tr>
53	<td class="main"><?php echo tep_address_format($order->customer['format_id'], $order->customer, 1, '', '<br>'); ?></td>	<>	53	<td class="main"><?php echo tep_address_format($order->customer['format_id'], $order->billing, 1, '', '<br>'); ?></td>
54	</tr>	=	54	</tr>
55	<tr>		55	<tr>
56	<td><?php echo tep_draw_separator('pixel_trans.gif', '1', '5'); ?></td>		56	<td><?php echo tep_draw_separator('pixel_trans.gif', '1', '5'); ?></td>
57	</tr>		57	</tr>
58	<tr>		58	<tr>
59	<td class="main"><?php echo $order->customer['telephone']; ?></td>		59	<td class="main"><?php echo $order->customer['telephone']; ?></td>

[IMPROVEMENT] Configuration -> Minimum Values Settings

Respect the Configuration -> Minimum Values settings when editing a customer on the Administration Tool.

Affected Files
catalog/includes/form_check.js.php
catalog/admin/customers.php

File: catalog/includes/form_check.js.php

File: catalog/admin/customers.php

123	$entry_zone_id = $zone_values['zone_id'];	=	123	$entry_zone_id = $zone_values['zone_id'];
124	} else {		124	} else {
125	$error = true;		125	$error = true;
126	$entry_state_error = true;		126	$entry_state_error = true;
127	}		127	}
128	} else {		128	} else {
129	if ($entry_state == false) {	<>	129	if (strlen($entry_state) < ENTRY_STATE_MIN_LENGTH) {
130	$error = true;	=	130	$error = true;
131	$entry_state_error = true;		131	$entry_state_error = true;
132	}		132	}
133	}		133	}
134	}		134	}
135	}		135	}

258	} else {	=	258	} else {
259	error_message = error_message + "<?php echo JS_GENDER; ?>";		259	error_message = error_message + "<?php echo JS_GENDER; ?>";
260	error = 1;		260	error = 1;
261	}		261	}
262	<?php } ?>		262	<?php } ?>
263			263
264	if (customers_firstname == "" \|\| customers_firstname.length < <?php echo ENTRY_FIRST_NAME_MIN_LENGTH; ?>) {	<>	264	if (customers_firstname.length < <?php echo ENTRY_FIRST_NAME_MIN_LENGTH; ?>) {
265	error_message = error_message + "<?php echo JS_FIRST_NAME; ?>";	=	265	error_message = error_message + "<?php echo JS_FIRST_NAME; ?>";
266	error = 1;		266	error = 1;
267	}		267	}
268			268
269	if (customers_lastname == "" \|\| customers_lastname.length < <?php echo ENTRY_LAST_NAME_MIN_LENGTH; ?>) {	<>	269	if (customers_lastname.length < <?php echo ENTRY_LAST_NAME_MIN_LENGTH; ?>) {
270	error_message = error_message + "<?php echo JS_LAST_NAME; ?>";	=	270	error_message = error_message + "<?php echo JS_LAST_NAME; ?>";
271	error = 1;		271	error = 1;
272	}		272	}
273			273
274	<?php if (ACCOUNT_DOB == 'true') { ?>		274	<?php if (ACCOUNT_DOB == 'true') { ?>
275	if (customers_dob == "" \|\| customers_dob.length < <?php echo ENTRY_DOB_MIN_LENGTH; ?>) {	<>	275	if (customers_dob.length < <?php echo ENTRY_DOB_MIN_LENGTH; ?>) {
276	error_message = error_message + "<?php echo JS_DOB; ?>";	=	276	error_message = error_message + "<?php echo JS_DOB; ?>";
277	error = 1;		277	error = 1;
278	}		278	}
279	<?php } ?>		279	<?php } ?>
280			280
281	if (customers_email_address == "" \|\| customers_email_address.length < <?php echo ENTRY_EMAIL_ADDRESS_MIN_LENGTH; ?>) {	<>	281	if (customers_email_address.length < <?php echo ENTRY_EMAIL_ADDRESS_MIN_LENGTH; ?>) {
282	error_message = error_message + "<?php echo JS_EMAIL_ADDRESS; ?>";	=	282	error_message = error_message + "<?php echo JS_EMAIL_ADDRESS; ?>";
283	error = 1;		283	error = 1;
284	}		284	}
285			285
286	if (entry_street_address == "" \|\| entry_street_address.length < <?php echo ENTRY_STREET_ADDRESS_MIN_LENGTH; ?>) {	<>	286	if (entry_street_address.length < <?php echo ENTRY_STREET_ADDRESS_MIN_LENGTH; ?>) {
287	error_message = error_message + "<?php echo JS_ADDRESS; ?>";	=	287	error_message = error_message + "<?php echo JS_ADDRESS; ?>";
288	error = 1;		288	error = 1;
289	}		289	}
290			290
291	if (entry_postcode == "" \|\| entry_postcode.length < <?php echo ENTRY_POSTCODE_MIN_LENGTH; ?>) {	<>	291	if (entry_postcode.length < <?php echo ENTRY_POSTCODE_MIN_LENGTH; ?>) {
292	error_message = error_message + "<?php echo JS_POST_CODE; ?>";	=	292	error_message = error_message + "<?php echo JS_POST_CODE; ?>";
293	error = 1;		293	error = 1;
294	}		294	}
295			295
296	if (entry_city == "" \|\| entry_city.length < <?php echo ENTRY_CITY_MIN_LENGTH; ?>) {	<>	296	if (entry_city.length < <?php echo ENTRY_CITY_MIN_LENGTH; ?>) {
297	error_message = error_message + "<?php echo JS_CITY; ?>";	=	297	error_message = error_message + "<?php echo JS_CITY; ?>";
298	error = 1;		298	error = 1;
299	}		299	}
300			300
301	<?php		301	<?php
302	if (ACCOUNT_STATE == 'true') {		302	if (ACCOUNT_STATE == 'true') {
303	?>		303	?>
304	if (document.customers.elements['entry_state'].type != "hidden") {		304	if (document.customers.elements['entry_state'].type != "hidden") {
305	if (document.customers.entry_state.value == '' \|\| document.customers.entry_state.value.length < <?php echo ENTRY_STATE_MIN_LENGTH; ?> ) {	<>	305	if (document.customers.entry_state.value.length < <?php echo ENTRY_STATE_MIN_LENGTH; ?>) {
306	error_message = error_message + "<?php echo JS_STATE; ?>";	=	306	error_message = error_message + "<?php echo JS_STATE; ?>";
307	error = 1;		307	error = 1;
308	}		308	}
309	}		309	}
310	<?php		310	<?php
311	}		311	}

315	if (document.customers.entry_country_id.value == 0) {	=	315	if (document.customers.entry_country_id.value == 0) {
316	error_message = error_message + "<?php echo JS_COUNTRY; ?>";		316	error_message = error_message + "<?php echo JS_COUNTRY; ?>";
317	error = 1;		317	error = 1;
318	}		318	}
319	}		319	}
320			320
321	if (customers_telephone == "" \|\| customers_telephone.length < <?php echo ENTRY_TELEPHONE_MIN_LENGTH; ?>) {	<>	321	if (customers_telephone.length < <?php echo ENTRY_TELEPHONE_MIN_LENGTH; ?>) {
322	error_message = error_message + "<?php echo JS_TELEPHONE; ?>";	=	322	error_message = error_message + "<?php echo JS_TELEPHONE; ?>";
323	error = 1;		323	error = 1;
324	}		324	}
325			325
326	if (error == 1) {		326	if (error == 1) {
327	alert(error_message);		327	alert(error_message);

[BUGFIX] Compatibility Array Index

Reset compatibility array indexes when working through its elements.

Affected Files
catalog/includes/functions/compatibility.php
catalog/admin/includes/functions/compatibility.php

File: catalog/includes/functions/compatibility.php

 // This is due to the possibility of have an array in
 // $HTTP_xxx_VARS
 // Ie, products attributes
   function do_magic_quotes_gpc(&$ar) {
     if (!is_array($ar)) return false;
+    reset($ar);
     while (list($key, $value) = each($ar)) {
       if (is_array($ar[$key])) {
         do_magic_quotes_gpc($ar[$key]);
       } else {
         $ar[$key] = addslashes($value);
       }
     }
+    reset($ar);
   }
   if (PHP_VERSION >= 4.1) {
     $HTTP_GET_VARS =& $_GET;
     $HTTP_POST_VARS =& $_POST;
     $HTTP_COOKIE_VARS =& $_COOKIE;

File: catalog/admin/includes/functions/compatibility.php

 // This is due to the possibility of have an array in
 // $HTTP_xxx_VARS
 // Ie, products attributes
   function do_magic_quotes_gpc(&$ar) {
     if (!is_array($ar)) return false;
+    reset($ar);
     while (list($key, $value) = each($ar)) {
       if (is_array($ar[$key])) {
         do_magic_quotes_gpc($ar[$key]);
       } else {
         $ar[$key] = addslashes($value);
       }
     }
+    reset($ar);
   }
   if (PHP_VERSION >= 4.1) {
     $HTTP_GET_VARS =& $_GET;
     $HTTP_POST_VARS =& $_POST;
     $HTTP_COOKIE_VARS =& $_COOKIE;

[IMPROVEMENT] MySQL Database Connection Identifier Link

Pass the MySQL connection identifier link to the mysql_insert_id() function.

Affected Files
catalog/includes/functions/database.php
catalog/admin/includes/functions/database.php

File: catalog/includes/functions/database.php

   }
   function tep_db_data_seek($db_query, $row_number) {
     return mysql_data_seek($db_query, $row_number);
   }
-  function tep_db_insert_id() {
+  function tep_db_insert_id($link = 'db_link') {
+    global $$link;
-    return mysql_insert_id();
+    return mysql_insert_id($$link);
   }
   function tep_db_free_result($db_query) {
     return mysql_free_result($db_query);
   }

File: catalog/admin/includes/functions/database.php

   }
   function tep_db_data_seek($db_query, $row_number) {
     return mysql_data_seek($db_query, $row_number);
   }
-  function tep_db_insert_id() {
+  function tep_db_insert_id($link = 'db_link') {
+    global $$link;
-    return mysql_insert_id();
+    return mysql_insert_id($$link);
   }
   function tep_db_free_result($db_query) {
     return mysql_free_result($db_query);
   }

[BUGFIX] Product Sorting SQL Injection Vulnerability

Fix an SQL injection vulnerability when sorting products on the index listing.

Affected Files
catalog/index.php

File: catalog/index.php

185	} else {	=	185	} else {
186	// We show them all		186	// We show them all
187	$listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, p.products_price, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, IF(s.status, s.specials_new_products_price, p.products_price) as final_price from " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS . " p left join " . TABLE_MANUFACTURERS . " m on p.manufacturers_id = m.manufacturers_id left join " . TABLE_SPECIALS . " s on p.products_id = s.products_id, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c where p.products_status = '1' and p.products_id = p2c.products_id and pd.products_id = p2c.products_id and pd.language_id = '" . (int)$languages_id . "' and p2c.categories_id = '" . (int)$current_category_id . "'";		187	$listing_sql = "select " . $select_column_list . " p.products_id, p.manufacturers_id, p.products_price, p.products_tax_class_id, IF(s.status, s.specials_new_products_price, NULL) as specials_new_products_price, IF(s.status, s.specials_new_products_price, p.products_price) as final_price from " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS . " p left join " . TABLE_MANUFACTURERS . " m on p.manufacturers_id = m.manufacturers_id left join " . TABLE_SPECIALS . " s on p.products_id = s.products_id, " . TABLE_PRODUCTS_TO_CATEGORIES . " p2c where p.products_status = '1' and p.products_id = p2c.products_id and pd.products_id = p2c.products_id and pd.language_id = '" . (int)$languages_id . "' and p2c.categories_id = '" . (int)$current_category_id . "'";
188	}		188	}
189	}		189	}
190			190
191	if ( (!isset($HTTP_GET_VARS['sort'])) \|\| (!ereg('[1-8][ad]', $HTTP_GET_VARS['sort'])) \|\| (substr($HTTP_GET_VARS['sort'], 0, 1) > sizeof($column_list)) ) {	<>	191	if ( (!isset($HTTP_GET_VARS['sort'])) \|\| (!ereg('^[1-8][ad]$', $HTTP_GET_VARS['sort'])) \|\| (substr($HTTP_GET_VARS['sort'], 0, 1) > sizeof($column_list)) ) {
192	for ($i=0, $n=sizeof($column_list); $i<$n; $i++) {	=	192	for ($i=0, $n=sizeof($column_list); $i<$n; $i++) {
193	if ($column_list[$i] == 'PRODUCT_LIST_NAME') {		193	if ($column_list[$i] == 'PRODUCT_LIST_NAME') {
194	$HTTP_GET_VARS['sort'] = $i+1 . 'a';		194	$HTTP_GET_VARS['sort'] = $i+1 . 'a';
195	$listing_sql .= " order by pd.products_name";		195	$listing_sql .= " order by pd.products_name";
196	break;		196	break;
197	}		197	}
198	}		198	}
199	} else {		199	} else {
200	$sort_col = substr($HTTP_GET_VARS['sort'], 0 , 1);		200	$sort_col = substr($HTTP_GET_VARS['sort'], 0 , 1);
201	$sort_order = substr($HTTP_GET_VARS['sort'], 1);		201	$sort_order = substr($HTTP_GET_VARS['sort'], 1);
202	$listing_sql .= ' order by ';	<>	202
203	switch ($column_list[$sort_col-1]) {	=	203	switch ($column_list[$sort_col-1]) {
204	case 'PRODUCT_LIST_MODEL':		204	case 'PRODUCT_LIST_MODEL':
205	$listing_sql .= "p.products_model " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";	<>	205	$listing_sql .= " order by p.products_model " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
206	break;	=	206	break;
207	case 'PRODUCT_LIST_NAME':		207	case 'PRODUCT_LIST_NAME':
208	$listing_sql .= "pd.products_name " . ($sort_order == 'd' ? 'desc' : '');	<>	208	$listing_sql .= " order by pd.products_name " . ($sort_order == 'd' ? 'desc' : '');
209	break;	=	209	break;
210	case 'PRODUCT_LIST_MANUFACTURER':		210	case 'PRODUCT_LIST_MANUFACTURER':
211	$listing_sql .= "m.manufacturers_name " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";	<>	211	$listing_sql .= " order by m.manufacturers_name " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
212	break;	=	212	break;
213	case 'PRODUCT_LIST_QUANTITY':		213	case 'PRODUCT_LIST_QUANTITY':
214	$listing_sql .= "p.products_quantity " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";	<>	214	$listing_sql .= " order by p.products_quantity " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
215	break;	=	215	break;
216	case 'PRODUCT_LIST_IMAGE':		216	case 'PRODUCT_LIST_IMAGE':
217	$listing_sql .= "pd.products_name";	<>	217	$listing_sql .= " order by pd.products_name";
218	break;	=	218	break;
219	case 'PRODUCT_LIST_WEIGHT':		219	case 'PRODUCT_LIST_WEIGHT':
220	$listing_sql .= "p.products_weight " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";	<>	220	$listing_sql .= " order by p.products_weight " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
221	break;	=	221	break;
222	case 'PRODUCT_LIST_PRICE':		222	case 'PRODUCT_LIST_PRICE':
223	$listing_sql .= "final_price " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";	<>	223	$listing_sql .= " order by final_price " . ($sort_order == 'd' ? 'desc' : '') . ", pd.products_name";
224	break;	=	224	break;
225	}		225	}
226	}		226	}
227	?>		227	?>
228	<td width="100%" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="0">		228	<td width="100%" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="0">
229	<tr>		229	<tr>

[BUGFIX] Product Price Calculations

Don't calculate product prices with tax by rounding the net value as this brings down the default precision of 4 to the decimal places of the selected currency.

Affected Files
catalog/includes/classes/currencies.php
catalog/includes/classes/order.php
catalog/includes/classes/shopping_cart.php
catalog/includes/functions/general.php
catalog/admin/includes/classes/currencies.php
catalog/admin/includes/functions/general.php
catalog/admin/orders.php
catalog/admin/invoice.php

File: catalog/includes/classes/currencies.php

         $format_string = $this->currencies[$currency_type]['symbol_left'] . number_format(tep_round($number, $this->currencies[$currency_type]['decimal_places']), $this->currencies[$currency_type]['decimal_places'], $this->currencies[$currency_type]['decimal_point'], $this->currencies[$currency_type]['thousands_point']) . $this->currencies[$currency_type]['symbol_right'];
       }
       return $format_string;
     }
+    function calculate_price($products_price, $products_tax, $quantity = 1) {
+      global $currency;
+      return tep_round(tep_add_tax($products_price, $products_tax), $this->currencies[$currency]['decimal_places']) * $quantity;
+    }
     function is_set($code) {
       if (isset($this->currencies[$code]) && tep_not_null($this->currencies[$code])) {
         return true;
       } else {
         return false;
       }
     function get_decimal_places($code) {
       return $this->currencies[$code]['decimal_places'];
     }
     function display_price($products_price, $products_tax, $quantity = 1) {
-      return $this->format(tep_add_tax($products_price, $products_tax) * $quantity);
+      return $this->format($this->calculate_price($products_price, $products_tax, $quantity));
     }
   }
 ?>

File: catalog/includes/classes/order.php

238	'price' => $attributes['options_values_price']);	=	238	'price' => $attributes['options_values_price']);
239			239
240	$subindex++;		240	$subindex++;
241	}		241	}
242	}		242	}
243			243
244	$shown_price = tep_add_tax($this->products[$index]['final_price'], $this->products[$index]['tax']) * $this->products[$index]['qty'];	<>	244	$shown_price = $currencies->calculate_price($this->products[$index]['final_price'], $this->products[$index]['tax'], $this->products[$index]['qty']);
245	$this->info['subtotal'] += $shown_price;	=	245	$this->info['subtotal'] += $shown_price;
246			246
247	$products_tax = $this->products[$index]['tax'];		247	$products_tax = $this->products[$index]['tax'];
248	$products_tax_description = $this->products[$index]['tax_description'];		248	$products_tax_description = $this->products[$index]['tax_description'];
249	if (DISPLAY_PRICE_WITH_TAX == 'true') {		249	if (DISPLAY_PRICE_WITH_TAX == 'true') {
250	$this->info['tax'] += $shown_price - ($shown_price / (($products_tax < 10) ? "1.0" . str_replace('.', '', $products_tax) : "1." . str_replace('.', '', $products_tax)));		250	$this->info['tax'] += $shown_price - ($shown_price / (($products_tax < 10) ? "1.0" . str_replace('.', '', $products_tax) : "1." . str_replace('.', '', $products_tax)));

File: catalog/includes/classes/shopping_cart.php

       if (is_array($this->contents)) {
         reset($this->contents);
         while (list($products_id, ) = each($this->contents)) {
           $qty = $this->contents[$products_id]['qty'];
           $product_query = tep_db_query("select products_id from " . TABLE_CUSTOMERS_BASKET . " where customers_id = '" . (int)$customer_id . "' and products_id = '" . tep_db_input($products_id) . "'");
           if (!tep_db_num_rows($product_query)) {
-            tep_db_query("insert into " . TABLE_CUSTOMERS_BASKET . " (customers_id, products_id, customers_basket_quantity, customers_basket_date_added) values ('" . (int)$customer_id . "', '" . tep_db_input($products_id) . "', '" . $qty . "', '" . date('Ymd') . "')");
+            tep_db_query("insert into " . TABLE_CUSTOMERS_BASKET . " (customers_id, products_id, customers_basket_quantity, customers_basket_date_added) values ('" . (int)$customer_id . "', '" . tep_db_input($products_id) . "', '" . tep_db_input($qty) . "', '" . date('Ymd') . "')");
             if (isset($this->contents[$products_id]['attributes'])) {
               reset($this->contents[$products_id]['attributes']);
               while (list($option, $value) = each($this->contents[$products_id]['attributes'])) {
                 tep_db_query("insert into " . TABLE_CUSTOMERS_BASKET_ATTRIBUTES . " (customers_id, products_id, products_options_id, products_options_value_id) values ('" . (int)$customer_id . "', '" . tep_db_input($products_id) . "', '" . (int)$option . "', '" . (int)$value . "')");
               }
             }
           } else {
-            tep_db_query("update " . TABLE_CUSTOMERS_BASKET . " set customers_basket_quantity = '" . $qty . "' where customers_id = '" . (int)$customer_id . "' and products_id = '" . tep_db_input($products_id) . "'");
+            tep_db_query("update " . TABLE_CUSTOMERS_BASKET . " set customers_basket_quantity = '" . tep_db_input($qty) . "' where customers_id = '" . (int)$customer_id . "' and products_id = '" . tep_db_input($products_id) . "'");
           }
         }
       }
 // reset per-session cart contents, but not the database contents
       $this->reset(false);
       }
       return substr($product_id_list, 2);
     }
     function calculate() {
+      global $currencies;
       $this->total = 0;
       $this->weight = 0;
       if (!is_array($this->contents)) return 0;
       reset($this->contents);
       while (list($products_id, ) = each($this->contents)) {
           $specials_query = tep_db_query("select specials_new_products_price from " . TABLE_SPECIALS . " where products_id = '" . (int)$prid . "' and status = '1'");
           if (tep_db_num_rows ($specials_query)) {
             $specials = tep_db_fetch_array($specials_query);
             $products_price = $specials['specials_new_products_price'];
           }
-          $this->total += tep_add_tax($products_price, $products_tax) * $qty;
+          $this->total += $currencies->calculate_price($products_price, $products_tax, $qty);
           $this->weight += ($qty * $products_weight);
         }
 // attributes price
         if (isset($this->contents[$products_id]['attributes'])) {
           reset($this->contents[$products_id]['attributes']);
           while (list($option, $value) = each($this->contents[$products_id]['attributes'])) {
             $attribute_price_query = tep_db_query("select options_values_price, price_prefix from " . TABLE_PRODUCTS_ATTRIBUTES . " where products_id = '" . (int)$prid . "' and options_id = '" . (int)$option . "' and options_values_id = '" . (int)$value . "'");
             $attribute_price = tep_db_fetch_array($attribute_price_query);
             if ($attribute_price['price_prefix'] == '+') {
-              $this->total += $qty * tep_add_tax($attribute_price['options_values_price'], $products_tax);
+              $this->total += $currencies->calculate_price($attribute_price['options_values_price'], $products_tax, $qty);
             } else {
-              $this->total -= $qty * tep_add_tax($attribute_price['options_values_price'], $products_tax);
+              $this->total -= $currencies->calculate_price($attribute_price['options_values_price'], $products_tax, $qty);
             }
           }
         }
       }
     }

File: catalog/includes/functions/general.php

352	}	=	352	}
353	}		353	}
354			354
355	////		355	////
356	// Add tax to a products price		356	// Add tax to a products price
357	function tep_add_tax($price, $tax) {		357	function tep_add_tax($price, $tax) {
358	global $currencies;	+-
359
360	if ( (DISPLAY_PRICE_WITH_TAX == 'true') && ($tax > 0) ) {	=	358	if ( (DISPLAY_PRICE_WITH_TAX == 'true') && ($tax > 0) ) {
361	return tep_round($price, $currencies->currencies[DEFAULT_CURRENCY]['decimal_places']) + tep_calculate_tax($price, $tax);	<>	359	return $price + tep_calculate_tax($price, $tax);
362	} else {	=	360	} else {
363	return tep_round($price, $currencies->currencies[DEFAULT_CURRENCY]['decimal_places']);	<>	361	return $price;
364	}	=	362	}
365	}		363	}
366			364
367	// Calculates Tax rounding the result		365	// Calculates Tax rounding the result
368	function tep_calculate_tax($price, $tax) {		366	function tep_calculate_tax($price, $tax) {
369	global $currencies;	<>	367	return $price * $tax / 100;
370
371	return tep_round($price * $tax / 100, $currencies->currencies[DEFAULT_CURRENCY]['decimal_places']);
372	}	=	368	}
373			369
374	////		370	////
375	// Return the number of products in a category		371	// Return the number of products in a category
376	// TABLES: products, products_to_categories, categories		372	// TABLES: products, products_to_categories, categories
377	function tep_count_products_in_category($category_id, $include_inactive = false) {		373	function tep_count_products_in_category($category_id, $include_inactive = false) {

File: catalog/admin/includes/classes/currencies.php

49	}	=	49	}
50			50
51	function get_value($code) {		51	function get_value($code) {
52	return $this->currencies[$code]['value'];		52	return $this->currencies[$code]['value'];
53	}		53	}
54			54
55	function display_price($products_price, $products_tax, $quantity = 1) {	<>	55	function display_price($products_price, $products_tax, $quantity = 1, $currency_type = DEFAULT_CURRENCY) {
56	return $this->format(tep_add_tax($products_price, $products_tax) * $quantity);		56	return $this->format(tep_round(tep_add_tax($products_price, $products_tax), $this->currencies[$currency_type]['decimal_places']) * $quantity);
57	}	=	57	}
58	}		58	}
59	?>		59	?>

File: catalog/admin/includes/functions/general.php

1130	return round($value, $precision);	=	1130	return round($value, $precision);
1131	}		1131	}
1132	}		1132	}
1133			1133
1134	////		1134	////
1135	// Add tax to a products price		1135	// Add tax to a products price
1136	function tep_add_tax($price, $tax) {	<>	1136	function tep_add_tax($price, $tax, $override = false) {
1137	global $currencies;		1137	if ( ( (DISPLAY_PRICE_WITH_TAX == 'true') \|\| ($override == true) ) && ($tax > 0) ) {
1138			1138	return $price + tep_calculate_tax($price, $tax);
1139	if (DISPLAY_PRICE_WITH_TAX == 'true') {
1140	return tep_round($price, $currencies->currencies[DEFAULT_CURRENCY]['decimal_places']) + tep_calculate_tax($price, $tax);
1141	} else {	=	1139	} else {
1142	return tep_round($price, $currencies->currencies[DEFAULT_CURRENCY]['decimal_places']);	<>	1140	return $price;
1143	}	=	1141	}
1144	}		1142	}
1145			1143
1146	// Calculates Tax rounding the result		1144	// Calculates Tax rounding the result
1147	function tep_calculate_tax($price, $tax) {		1145	function tep_calculate_tax($price, $tax) {
1148	global $currencies;	<>	1146	return $price * $tax / 100;
1149
1150	return tep_round($price * $tax / 100, $currencies->currencies[DEFAULT_CURRENCY]['decimal_places']);
1151	}	=	1147	}
1152			1148
1153	////		1149	////
1154	// Returns the tax rate for a zone / class		1150	// Returns the tax rate for a zone / class
1155	// TABLES: tax_rates, zones_to_geo_zones		1151	// TABLES: tax_rates, zones_to_geo_zones
1156	function tep_get_tax_rate($class_id, $country_id = -1, $zone_id = -1) {		1152	function tep_get_tax_rate($class_id, $country_id = -1, $zone_id = -1) {

File: catalog/admin/orders.php

231	}	=	231	}
232			232
233	echo ' </td>' . "\n" .		233	echo ' </td>' . "\n" .
234	' <td class="dataTableContent" valign="top">' . $order->products[$i]['model'] . '</td>' . "\n" .		234	' <td class="dataTableContent" valign="top">' . $order->products[$i]['model'] . '</td>' . "\n" .
235	' <td class="dataTableContent" align="right" valign="top">' . tep_display_tax_value($order->products[$i]['tax']) . '%</td>' . "\n" .		235	' <td class="dataTableContent" align="right" valign="top">' . tep_display_tax_value($order->products[$i]['tax']) . '%</td>' . "\n" .
236	' <td class="dataTableContent" align="right" valign="top"><b>' . $currencies->format($order->products[$i]['final_price'], true, $order->info['currency'], $order->info['currency_value']) . '</b></td>' . "\n" .		236	' <td class="dataTableContent" align="right" valign="top"><b>' . $currencies->format($order->products[$i]['final_price'], true, $order->info['currency'], $order->info['currency_value']) . '</b></td>' . "\n" .
237	' <td class="dataTableContent" align="right" valign="top"><b>' . $currencies->format(tep_add_tax($order->products[$i]['final_price'], $order->products[$i]['tax']), true, $order->info['currency'], $order->info['currency_value']) . '</b></td>' . "\n" .	<>	237	' <td class="dataTableContent" align="right" valign="top"><b>' . $currencies->format(tep_add_tax($order->products[$i]['final_price'], $order->products[$i]['tax'], true), true, $order->info['currency'], $order->info['currency_value']) . '</b></td>' . "\n" .
238	' <td class="dataTableContent" align="right" valign="top"><b>' . $currencies->format($order->products[$i]['final_price'] * $order->products[$i]['qty'], true, $order->info['currency'], $order->info['currency_value']) . '</b></td>' . "\n" .	=	238	' <td class="dataTableContent" align="right" valign="top"><b>' . $currencies->format($order->products[$i]['final_price'] * $order->products[$i]['qty'], true, $order->info['currency'], $order->info['currency_value']) . '</b></td>' . "\n" .
239	' <td class="dataTableContent" align="right" valign="top"><b>' . $currencies->format(tep_add_tax($order->products[$i]['final_price'], $order->products[$i]['tax']) * $order->products[$i]['qty'], true, $order->info['currency'], $order->info['currency_value']) . '</b></td>' . "\n";	<>	239	' <td class="dataTableContent" align="right" valign="top"><b>' . $currencies->format(tep_add_tax($order->products[$i]['final_price'], $order->products[$i]['tax'], true) * $order->products[$i]['qty'], true, $order->info['currency'], $order->info['currency_value']) . '</b></td>' . "\n";
240	echo ' </tr>' . "\n";	=	240	echo ' </tr>' . "\n";
241	}		241	}
242	?>		242	?>
243	<tr>		243	<tr>
244	<td align="right" colspan="8"><table border="0" cellspacing="0" cellpadding="2">		244	<td align="right" colspan="8"><table border="0" cellspacing="0" cellpadding="2">
245	<?php		245	<?php

File: catalog/admin/invoice.php

114	}	=	114	}
115			115
116	echo ' </td>' . "\n" .		116	echo ' </td>' . "\n" .
117	' <td class="dataTableContent" valign="top">' . $order->products[$i]['model'] . '</td>' . "\n";		117	' <td class="dataTableContent" valign="top">' . $order->products[$i]['model'] . '</td>' . "\n";
118	echo ' <td class="dataTableContent" align="right" valign="top">' . tep_display_tax_value($order->products[$i]['tax']) . '%</td>' . "\n" .		118	echo ' <td class="dataTableContent" align="right" valign="top">' . tep_display_tax_value($order->products[$i]['tax']) . '%</td>' . "\n" .
119	' <td class="dataTableContent" align="right" valign="top"><b>' . $currencies->format($order->products[$i]['final_price'], true, $order->info['currency'], $order->info['currency_value']) . '</b></td>' . "\n" .		119	' <td class="dataTableContent" align="right" valign="top"><b>' . $currencies->format($order->products[$i]['final_price'], true, $order->info['currency'], $order->info['currency_value']) . '</b></td>' . "\n" .
120	' <td class="dataTableContent" align="right" valign="top"><b>' . $currencies->format(tep_add_tax($order->products[$i]['final_price'], $order->products[$i]['tax']), true, $order->info['currency'], $order->info['currency_value']) . '</b></td>' . "\n" .	<>	120	' <td class="dataTableContent" align="right" valign="top"><b>' . $currencies->format(tep_add_tax($order->products[$i]['final_price'], $order->products[$i]['tax'], true), true, $order->info['currency'], $order->info['currency_value']) . '</b></td>' . "\n" .
121	' <td class="dataTableContent" align="right" valign="top"><b>' . $currencies->format($order->products[$i]['final_price'] * $order->products[$i]['qty'], true, $order->info['currency'], $order->info['currency_value']) . '</b></td>' . "\n" .	=	121	' <td class="dataTableContent" align="right" valign="top"><b>' . $currencies->format($order->products[$i]['final_price'] * $order->products[$i]['qty'], true, $order->info['currency'], $order->info['currency_value']) . '</b></td>' . "\n" .
122	' <td class="dataTableContent" align="right" valign="top"><b>' . $currencies->format(tep_add_tax($order->products[$i]['final_price'], $order->products[$i]['tax']) * $order->products[$i]['qty'], true, $order->info['currency'], $order->info['currency_value']) . '</b></td>' . "\n";	<>	122	' <td class="dataTableContent" align="right" valign="top"><b>' . $currencies->format(tep_add_tax($order->products[$i]['final_price'], $order->products[$i]['tax'], true) * $order->products[$i]['qty'], true, $order->info['currency'], $order->info['currency_value']) . '</b></td>' . "\n";
123	echo ' </tr>' . "\n";	=	123	echo ' </tr>' . "\n";
124	}		124	}
125	?>		125	?>
126	<tr>		126	<tr>
127	<td align="right" colspan="8"><table border="0" cellspacing="0" cellpadding="2">		127	<td align="right" colspan="8"><table border="0" cellspacing="0" cellpadding="2">
128	<?php		128	<?php

[BUGFIX] Country Name on the Order History Page

Fix the display of the country name on the order history page.

Affected Files
catalog/includes/classes/order.php

File: catalog/includes/classes/order.php

[BUGFIX] Shopping Cart Product Quantity as Integer Value

The product quantity is added to the database shopping cart table as an integer so the value in the shopping cart session should also be treated as an integer.

Affected Files
catalog/includes/classes/shopping_cart.php

File: catalog/includes/classes/shopping_cart.php

103	tep_session_register('new_products_id_in_cart');	=	103	tep_session_register('new_products_id_in_cart');
104	}		104	}
105			105
106	if ($this->in_cart($products_id_string)) {		106	if ($this->in_cart($products_id_string)) {
107	$this->update_quantity($products_id_string, $qty, $attributes);		107	$this->update_quantity($products_id_string, $qty, $attributes);
108	} else {		108	} else {
109	$this->contents[$products_id_string] = array('qty' => $qty);	<>	109	$this->contents[$products_id_string] = array('qty' => (int)$qty);
110	// insert into database	=	110	// insert into database
111	if (tep_session_is_registered('customer_id')) tep_db_query("insert into " . TABLE_CUSTOMERS_BASKET . " (customers_id, products_id, customers_basket_quantity, customers_basket_date_added) values ('" . (int)$customer_id . "', '" . tep_db_input($products_id_string) . "', '" . (int)$qty . "', '" . date('Ymd') . "')");		111	if (tep_session_is_registered('customer_id')) tep_db_query("insert into " . TABLE_CUSTOMERS_BASKET . " (customers_id, products_id, customers_basket_quantity, customers_basket_date_added) values ('" . (int)$customer_id . "', '" . tep_db_input($products_id_string) . "', '" . (int)$qty . "', '" . date('Ymd') . "')");
112			112
113	if (is_array($attributes)) {		113	if (is_array($attributes)) {
114	reset($attributes);		114	reset($attributes);
115	while (list($option, $value) = each($attributes)) {		115	while (list($option, $value) = each($attributes)) {

144	break;	=	144	break;
145	}		145	}
146	}		146	}
147	}		147	}
148			148
149	if (is_numeric($products_id) && isset($this->contents[$products_id_string]) && is_numeric($quantity) && ($attributes_pass_check == true)) {		149	if (is_numeric($products_id) && isset($this->contents[$products_id_string]) && is_numeric($quantity) && ($attributes_pass_check == true)) {
150	$this->contents[$products_id_string] = array('qty' => $quantity);	<>	150	$this->contents[$products_id_string] = array('qty' => (int)$quantity);
151	// update database	=	151	// update database
152	if (tep_session_is_registered('customer_id')) tep_db_query("update " . TABLE_CUSTOMERS_BASKET . " set customers_basket_quantity = '" . (int)$quantity . "' where customers_id = '" . (int)$customer_id . "' and products_id = '" . tep_db_input($products_id_string) . "'");		152	if (tep_session_is_registered('customer_id')) tep_db_query("update " . TABLE_CUSTOMERS_BASKET . " set customers_basket_quantity = '" . (int)$quantity . "' where customers_id = '" . (int)$customer_id . "' and products_id = '" . tep_db_input($products_id_string) . "'");
153			153
154	if (is_array($attributes)) {		154	if (is_array($attributes)) {
155	reset($attributes);		155	reset($attributes);
156	while (list($option, $value) = each($attributes)) {		156	while (list($option, $value) = each($attributes)) {

[IMPROVEMENT] Maximum Order Product Quantities [+SQL]

Add a new configuration parameter to control the maximum quantity number a product can be ordered (default 99).

Database Changes to Perform:
INSERT INTO configuration (configuration_title, configuration_key, configuration_value, configuration_description, configuration_group_id, sort_order, date_added) VALUES ('Product Quantities In Shopping Cart', 'MAX_QTY_IN_CART', '99', 'Maximum number of product quantities that can be added to the shopping cart (0 for no limit)', '3', '19', now());

Affected Files
catalog/includes/classes/shopping_cart.php

File: catalog/includes/classes/shopping_cart.php

     function add_cart($products_id, $qty = '1', $attributes = '', $notify = true) {
       global $new_products_id_in_cart, $customer_id;
       $products_id_string = tep_get_uprid($products_id, $attributes);
       $products_id = tep_get_prid($products_id_string);
+      if (defined('MAX_QTY_IN_CART') && (MAX_QTY_IN_CART > 0) && ((int)$qty > MAX_QTY_IN_CART)) {
+        $qty = MAX_QTY_IN_CART;
+      }
       $attributes_pass_check = true;
       if (is_array($attributes)) {
         reset($attributes);
         while (list($option, $value) = each($attributes)) {
           if (!is_numeric($option) || !is_numeric($value)) {
     function update_quantity($products_id, $quantity = '', $attributes = '') {
       global $customer_id;
       $products_id_string = tep_get_uprid($products_id, $attributes);
       $products_id = tep_get_prid($products_id_string);
+      if (defined('MAX_QTY_IN_CART') && (MAX_QTY_IN_CART > 0) && ((int)$quantity > MAX_QTY_IN_CART)) {
+        $quantity = MAX_QTY_IN_CART;
+      }
       $attributes_pass_check = true;
       if (is_array($attributes)) {
         reset($attributes);
         while (list($option, $value) = each($attributes)) {

[IMPROVEMENT] Accepting State Names

Improve the logic of accepting state names.

Affected Files
catalog/address_book_process.php
catalog/checkout_payment_address.php
catalog/checkout_shipping_address.php
catalog/create_account.php

File: catalog/address_book_process.php

99	if (ACCOUNT_STATE == 'true') {	=	99	if (ACCOUNT_STATE == 'true') {
100	$zone_id = 0;		100	$zone_id = 0;
101	$check_query = tep_db_query("select count(*) as total from " . TABLE_ZONES . " where zone_country_id = '" . (int)$country . "'");		101	$check_query = tep_db_query("select count(*) as total from " . TABLE_ZONES . " where zone_country_id = '" . (int)$country . "'");
102	$check = tep_db_fetch_array($check_query);		102	$check = tep_db_fetch_array($check_query);
103	$entry_state_has_zones = ($check['total'] > 0);		103	$entry_state_has_zones = ($check['total'] > 0);
104	if ($entry_state_has_zones == true) {		104	if ($entry_state_has_zones == true) {
105	$zone_query = tep_db_query("select distinct zone_id from " . TABLE_ZONES . " where zone_country_id = '" . (int)$country . "' and (zone_name like '" . tep_db_input($state) . "%' or zone_code like '%" . tep_db_input($state) . "%')");	<>	105	$zone_query = tep_db_query("select distinct zone_id from " . TABLE_ZONES . " where zone_country_id = '" . (int)$country . "' and (zone_name = '" . tep_db_input($state) . "' or zone_code = '" . tep_db_input($state) . "')");
106	if (tep_db_num_rows($zone_query) == 1) {	=	106	if (tep_db_num_rows($zone_query) == 1) {
107	$zone = tep_db_fetch_array($zone_query);		107	$zone = tep_db_fetch_array($zone_query);
108	$zone_id = $zone['zone_id'];		108	$zone_id = $zone['zone_id'];
109	} else {		109	} else {
110	$error = true;		110	$error = true;
111			111

File: catalog/checkout_payment_address.php

92	if (ACCOUNT_STATE == 'true') {	=	92	if (ACCOUNT_STATE == 'true') {
93	$zone_id = 0;		93	$zone_id = 0;
94	$check_query = tep_db_query("select count(*) as total from " . TABLE_ZONES . " where zone_country_id = '" . (int)$country . "'");		94	$check_query = tep_db_query("select count(*) as total from " . TABLE_ZONES . " where zone_country_id = '" . (int)$country . "'");
95	$check = tep_db_fetch_array($check_query);		95	$check = tep_db_fetch_array($check_query);
96	$entry_state_has_zones = ($check['total'] > 0);		96	$entry_state_has_zones = ($check['total'] > 0);
97	if ($entry_state_has_zones == true) {		97	if ($entry_state_has_zones == true) {
98	$zone_query = tep_db_query("select distinct zone_id from " . TABLE_ZONES . " where zone_country_id = '" . (int)$country . "' and (zone_name like '" . tep_db_input($state) . "%' or zone_code like '%" . tep_db_input($state) . "%')");	<>	98	$zone_query = tep_db_query("select distinct zone_id from " . TABLE_ZONES . " where zone_country_id = '" . (int)$country . "' and (zone_name = '" . tep_db_input($state) . "' or zone_code = '" . tep_db_input($state) . "')");
99	if (tep_db_num_rows($zone_query) == 1) {	=	99	if (tep_db_num_rows($zone_query) == 1) {
100	$zone = tep_db_fetch_array($zone_query);		100	$zone = tep_db_fetch_array($zone_query);
101	$zone_id = $zone['zone_id'];		101	$zone_id = $zone['zone_id'];
102	} else {		102	} else {
103	$error = true;		103	$error = true;
104			104

File: catalog/checkout_shipping_address.php

105	if (ACCOUNT_STATE == 'true') {	=	105	if (ACCOUNT_STATE == 'true') {
106	$zone_id = 0;		106	$zone_id = 0;
107	$check_query = tep_db_query("select count(*) as total from " . TABLE_ZONES . " where zone_country_id = '" . (int)$country . "'");		107	$check_query = tep_db_query("select count(*) as total from " . TABLE_ZONES . " where zone_country_id = '" . (int)$country . "'");
108	$check = tep_db_fetch_array($check_query);		108	$check = tep_db_fetch_array($check_query);
109	$entry_state_has_zones = ($check['total'] > 0);		109	$entry_state_has_zones = ($check['total'] > 0);
110	if ($entry_state_has_zones == true) {		110	if ($entry_state_has_zones == true) {
111	$zone_query = tep_db_query("select distinct zone_id from " . TABLE_ZONES . " where zone_country_id = '" . (int)$country . "' and (zone_name like '" . tep_db_input($state) . "%' or zone_code like '%" . tep_db_input($state) . "%')");	<>	111	$zone_query = tep_db_query("select distinct zone_id from " . TABLE_ZONES . " where zone_country_id = '" . (int)$country . "' and (zone_name = '" . tep_db_input($state) . "' or zone_code = '" . tep_db_input($state) . "')");
112	if (tep_db_num_rows($zone_query) == 1) {	=	112	if (tep_db_num_rows($zone_query) == 1) {
113	$zone = tep_db_fetch_array($zone_query);		113	$zone = tep_db_fetch_array($zone_query);
114	$zone_id = $zone['zone_id'];		114	$zone_id = $zone['zone_id'];
115	} else {		115	} else {
116	$error = true;		116	$error = true;
117			117

File: catalog/create_account.php

129	if (ACCOUNT_STATE == 'true') {	=	129	if (ACCOUNT_STATE == 'true') {
130	$zone_id = 0;		130	$zone_id = 0;
131	$check_query = tep_db_query("select count(*) as total from " . TABLE_ZONES . " where zone_country_id = '" . (int)$country . "'");		131	$check_query = tep_db_query("select count(*) as total from " . TABLE_ZONES . " where zone_country_id = '" . (int)$country . "'");
132	$check = tep_db_fetch_array($check_query);		132	$check = tep_db_fetch_array($check_query);
133	$entry_state_has_zones = ($check['total'] > 0);		133	$entry_state_has_zones = ($check['total'] > 0);
134	if ($entry_state_has_zones == true) {		134	if ($entry_state_has_zones == true) {
135	$zone_query = tep_db_query("select distinct zone_id from " . TABLE_ZONES . " where zone_country_id = '" . (int)$country . "' and (zone_name like '" . tep_db_input($state) . "%' or zone_code like '%" . tep_db_input($state) . "%')");	<>	135	$zone_query = tep_db_query("select distinct zone_id from " . TABLE_ZONES . " where zone_country_id = '" . (int)$country . "' and (zone_name = '" . tep_db_input($state) . "' or zone_code = '" . tep_db_input($state) . "')");
136	if (tep_db_num_rows($zone_query) == 1) {	=	136	if (tep_db_num_rows($zone_query) == 1) {
137	$zone = tep_db_fetch_array($zone_query);		137	$zone = tep_db_fetch_array($zone_query);
138	$zone_id = $zone['zone_id'];		138	$zone_id = $zone['zone_id'];
139	} else {		139	} else {
140	$error = true;		140	$error = true;
141			141

[BUGFIX] Load the Order Total Modules Before Loading the Payment Modules

The order total modules should be loaded before the payment modules so the payment modules have access to the order total values.

Affected Files
catalog/checkout_process.php

File: catalog/checkout_process.php

   require(DIR_WS_CLASSES . 'shipping.php');
   $shipping_modules = new shipping($shipping);
   require(DIR_WS_CLASSES . 'order.php');
   $order = new order;
-// load the before_process function from the payment modules
-  $payment_modules->before_process();
   require(DIR_WS_CLASSES . 'order_total.php');
   $order_total_modules = new order_total;
   $order_totals = $order_total_modules->process();
+// load the before_process function from the payment modules
+  $payment_modules->before_process();
   $sql_data_array = array('customers_id' => $customer_id,
                           'customers_name' => $order->customer['firstname'] . ' ' . $order->customer['lastname'],
                           'customers_company' => $order->customer['company'],
                           'customers_street_address' => $order->customer['street_address'],
                           'customers_suburb' => $order->customer['suburb'],

[BUGFIX] Payment Module Selection

Pass the selected module code to its radio button to have it selected by default if a payment method has already been selected.

Affected Files
catalog/checkout_payment.php

File: catalog/checkout_payment.php

255	?>	=	255	?>
256	<td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>		256	<td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
257	<td class="main" colspan="3"><b><?php echo $selection[$i]['module']; ?></b></td>		257	<td class="main" colspan="3"><b><?php echo $selection[$i]['module']; ?></b></td>
258	<td class="main" align="right">		258	<td class="main" align="right">
259	<?php		259	<?php
260	if (sizeof($selection) > 1) {		260	if (sizeof($selection) > 1) {
261	echo tep_draw_radio_field('payment', $selection[$i]['id']);	<>	261	echo tep_draw_radio_field('payment', $selection[$i]['id'], ($selection[$i]['id'] == $payment));
262	} else {	=	262	} else {
263	echo tep_draw_hidden_field('payment', $selection[$i]['id']);		263	echo tep_draw_hidden_field('payment', $selection[$i]['id']);
264	}		264	}
265	?>		265	?>
266	</td>		266	</td>
267	<td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>		267

17	var error_message = "";	=	17	var error_message = "";
18			18
19	function check_input(field_name, field_size, message) {		19	function check_input(field_name, field_size, message) {
20	if (form.elements[field_name] && (form.elements[field_name].type != "hidden")) {		20	if (form.elements[field_name] && (form.elements[field_name].type != "hidden")) {
21	var field_value = form.elements[field_name].value;		21	var field_value = form.elements[field_name].value;
22			22
23	if (field_value == '' \|\| field_value.length < field_size) {	<>	23	if (field_value.length < field_size) {
24	error_message = error_message + "* " + message + "\n";	=	24	error_message = error_message + "* " + message + "\n";
25	error = true;		25	error = true;
26	}		26	}
27	}		27	}
28	}		28	}
29			29

60		=	60
61	function check_password(field_name_1, field_name_2, field_size, message_1, message_2) {		61	function check_password(field_name_1, field_name_2, field_size, message_1, message_2) {
62	if (form.elements[field_name_1] && (form.elements[field_name_1].type != "hidden")) {		62	if (form.elements[field_name_1] && (form.elements[field_name_1].type != "hidden")) {
63	var password = form.elements[field_name_1].value;		63	var password = form.elements[field_name_1].value;
64	var confirmation = form.elements[field_name_2].value;		64	var confirmation = form.elements[field_name_2].value;
65			65
66	if (password == '' \|\| password.length < field_size) {	<>	66	if (password.length < field_size) {
67	error_message = error_message + "* " + message_1 + "\n";	=	67	error_message = error_message + "* " + message_1 + "\n";
68	error = true;		68	error = true;
69	} else if (password != confirmation) {		69	} else if (password != confirmation) {
70	error_message = error_message + "* " + message_2 + "\n";		70	error_message = error_message + "* " + message_2 + "\n";
71	error = true;		71	error = true;
72	}		72	}

76	function check_password_new(field_name_1, field_name_2, field_name_3, field_size, message_1, message_2, message_3) {	=	76	function check_password_new(field_name_1, field_name_2, field_name_3, field_size, message_1, message_2, message_3) {
77	if (form.elements[field_name_1] && (form.elements[field_name_1].type != "hidden")) {		77	if (form.elements[field_name_1] && (form.elements[field_name_1].type != "hidden")) {
78	var password_current = form.elements[field_name_1].value;		78	var password_current = form.elements[field_name_1].value;
79	var password_new = form.elements[field_name_2].value;		79	var password_new = form.elements[field_name_2].value;
80	var password_confirmation = form.elements[field_name_3].value;		80	var password_confirmation = form.elements[field_name_3].value;
81			81
82	if (password_current == '' \|\| password_current.length < field_size) {	<>	82	if (password_current.length < field_size) {
83	error_message = error_message + "* " + message_1 + "\n";	=	83	error_message = error_message + "* " + message_1 + "\n";
84	error = true;		84	error = true;
85	} else if (password_new == '' \|\| password_new.length < field_size) {	<>	85	} else if (password_new.length < field_size) {
86	error_message = error_message + "* " + message_2 + "\n";	=	86	error_message = error_message + "* " + message_2 + "\n";
87	error = true;		87	error = true;
88	} else if (password_new != password_confirmation) {		88	} else if (password_new != password_confirmation) {
89	error_message = error_message + "* " + message_3 + "\n";		89	error_message = error_message + "* " + message_3 + "\n";
90	error = true;		90	error = true;
91	}		91	}

68	'company' => $order['customers_company'],	=	68	'company' => $order['customers_company'],
69	'street_address' => $order['customers_street_address'],		69	'street_address' => $order['customers_street_address'],
70	'suburb' => $order['customers_suburb'],		70	'suburb' => $order['customers_suburb'],
71	'city' => $order['customers_city'],		71	'city' => $order['customers_city'],
72	'postcode' => $order['customers_postcode'],		72	'postcode' => $order['customers_postcode'],
73	'state' => $order['customers_state'],		73	'state' => $order['customers_state'],
74	'country' => $order['customers_country'],	<>	74	'country' => array('title' => $order['customers_country']),
75	'format_id' => $order['customers_address_format_id'],	=	75	'format_id' => $order['customers_address_format_id'],
76	'telephone' => $order['customers_telephone'],		76	'telephone' => $order['customers_telephone'],
77	'email_address' => $order['customers_email_address']);		77	'email_address' => $order['customers_email_address']);
78			78
79	$this->delivery = array('name' => $order['delivery_name'],		79	$this->delivery = array('name' => $order['delivery_name'],
80	'company' => $order['delivery_company'],		80	'company' => $order['delivery_company'],
81	'street_address' => $order['delivery_street_address'],		81	'street_address' => $order['delivery_street_address'],
82	'suburb' => $order['delivery_suburb'],		82	'suburb' => $order['delivery_suburb'],
83	'city' => $order['delivery_city'],		83	'city' => $order['delivery_city'],
84	'postcode' => $order['delivery_postcode'],		84	'postcode' => $order['delivery_postcode'],
85	'state' => $order['delivery_state'],		85	'state' => $order['delivery_state'],
86	'country' => $order['delivery_country'],	<>	86	'country' => array('title' => $order['delivery_country']),
87	'format_id' => $order['delivery_address_format_id']);	=	87	'format_id' => $order['delivery_address_format_id']);
88			88
89	if (empty($this->delivery['name']) && empty($this->delivery['street_address'])) {		89	if (empty($this->delivery['name']) && empty($this->delivery['street_address'])) {
90	$this->delivery = false;		90	$this->delivery = false;
91	}		91	}
92			92

94	'company' => $order['billing_company'],	=	94	'company' => $order['billing_company'],
95	'street_address' => $order['billing_street_address'],		95	'street_address' => $order['billing_street_address'],
96	'suburb' => $order['billing_suburb'],		96	'suburb' => $order['billing_suburb'],
97	'city' => $order['billing_city'],		97	'city' => $order['billing_city'],
98	'postcode' => $order['billing_postcode'],		98	'postcode' => $order['billing_postcode'],
99	'state' => $order['billing_state'],		99	'state' => $order['billing_state'],
100	'country' => $order['billing_country'],	<>	100	'country' => array('title' => $order['billing_country']),
101	'format_id' => $order['billing_address_format_id']);	=	101	'format_id' => $order['billing_address_format_id']);
102			102
103	$index = 0;		103	$index = 0;
104	$orders_products_query = tep_db_query("select orders_products_id, products_id, products_name, products_model, products_price, products_tax, products_quantity, final_price from " . TABLE_ORDERS_PRODUCTS . " where orders_id = '" . (int)$order_id . "'");		104	$orders_products_query = tep_db_query("select orders_products_id, products_id, products_name, products_model, products_price, products_tax, products_quantity, final_price from " . TABLE_ORDERS_PRODUCTS . " where orders_id = '" . (int)$order_id . "'");
105	while ($orders_products = tep_db_fetch_array($orders_products_query)) {		105	while ($orders_products = tep_db_fetch_array($orders_products_query)) {
106	$this->products[$index] = array('qty' => $orders_products['products_quantity'],		106	$this->products[$index] = array('qty' => $orders_products['products_quantity'],