[Multishop-devel] osc_m2/catalog/admin orders.php,1.2,1.3

[Piero T. <tr...@us...>]

Update of /cvsroot/multishop/osc_m2/catalog/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20031

Modified Files:
	orders.php 
Log Message:
update to oscommerce-20051113

Index: orders.php
===================================================================
RCS file: /cvsroot/multishop/osc_m2/catalog/admin/orders.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** orders.php	2 Dec 2005 00:38:24 -0000	1.2
--- orders.php	4 Dec 2005 10:41:46 -0000	1.3
***************
*** 8,13 ****
    Copyright (c) 2003 osCommerce
  
-   Changed by Piero Trono (c) 2005 for http://php-multishop.com
- 
    Released under the GNU General Public License
  */
--- 8,11 ----
***************
*** 357,361 ****
        $cID = tep_db_prepare_input($HTTP_GET_VARS['cID']);
        $orders_query_raw = "select o.orders_id, o.customers_name, o.customers_id, o.payment_method, o.date_purchased, o.last_modified, o.currency, o.currency_value, s.orders_status_name, ot.text as order_total from " . TABLE_ORDERS . " o left join " . TABLE_ORDERS_TOTAL . " ot on (o.orders_id = ot.orders_id), " . TABLE_ORDERS_STATUS . " s where o.customers_id = '" . (int)$cID . "' and o.orders_status = s.orders_status_id and s.language_id = '" . (int)$languages_id . "' and ot.class = 'ot_total' order by orders_id DESC";
!     } elseif (isset($HTTP_GET_VARS['status']) && $HTTP_GET_VARS['status']>0) {
        $status = tep_db_prepare_input($HTTP_GET_VARS['status']);
        $orders_query_raw = "select o.orders_id, o.customers_name, o.payment_method, o.date_purchased, o.last_modified, o.currency, o.currency_value, s.orders_status_name, ot.text as order_total from " . TABLE_ORDERS . " o left join " . TABLE_ORDERS_TOTAL . " ot on (o.orders_id = ot.orders_id), " . TABLE_ORDERS_STATUS . " s where o.orders_status = s.orders_status_id and s.language_id = '" . (int)$languages_id . "' and s.orders_status_id = '" . (int)$status . "' and ot.class = 'ot_total' order by o.orders_id DESC";
--- 355,359 ----
        $cID = tep_db_prepare_input($HTTP_GET_VARS['cID']);
        $orders_query_raw = "select o.orders_id, o.customers_name, o.customers_id, o.payment_method, o.date_purchased, o.last_modified, o.currency, o.currency_value, s.orders_status_name, ot.text as order_total from " . TABLE_ORDERS . " o left join " . TABLE_ORDERS_TOTAL . " ot on (o.orders_id = ot.orders_id), " . TABLE_ORDERS_STATUS . " s where o.customers_id = '" . (int)$cID . "' and o.orders_status = s.orders_status_id and s.language_id = '" . (int)$languages_id . "' and ot.class = 'ot_total' order by orders_id DESC";
!     } elseif (isset($HTTP_GET_VARS['status']) && is_numeric($HTTP_GET_VARS['status']) && ($HTTP_GET_VARS['status'] > 0)) {
        $status = tep_db_prepare_input($HTTP_GET_VARS['status']);
        $orders_query_raw = "select o.orders_id, o.customers_name, o.payment_method, o.date_purchased, o.last_modified, o.currency, o.currency_value, s.orders_status_name, ot.text as order_total from " . TABLE_ORDERS . " o left join " . TABLE_ORDERS_TOTAL . " ot on (o.orders_id = ot.orders_id), " . TABLE_ORDERS_STATUS . " s where o.orders_status = s.orders_status_id and s.language_id = '" . (int)$languages_id . "' and s.orders_status_id = '" . (int)$status . "' and ot.class = 'ot_total' order by o.orders_id DESC";