Quick Search:

Mode

Context

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

Other Diffs

Ignore

Blank Lines Whitespace:

Diff

5
 
6
 
6
 
account.php
_> 11 <?php
  22 /*
<> 3 -  $Id: account.php 5 2005-01-31 01:40:15Z hpdl $
   3+  $Id: account.php 6 2005-02-23 15:07:33Z hpdl $
44 
  55   osCommerce, Open Source E-Commerce Solutions
  66   http://www.oscommerce.com
  77 
<> 8 -  Copyright (c) 2003 osCommerce
   8+  Copyright (c) 2005 osCommerce
99 
  1010   Released under the GNU General Public License
  1111 */
     
 !
9595                 <td class="main" align="center" valign="top" width="130"><?php echo '<b>' . OVERVIEW_PREVIOUS_ORDERS . '</b><br>' . tep_image(DIR_WS_IMAGES . 'arrow_south_east.gif'); ?></td>
  9696                 <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
  9797 <?php
<> 98 -    $orders_query = tep_db_query("select o.orders_id, o.date_purchased, o.delivery_name, o.delivery_country, o.billing_name, o.billing_country, ot.text as order_total, s.orders_status_name from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_TOTAL . " ot, " . TABLE_ORDERS_STATUS . " s where o.customers_id = '" . (int)$osC_Customer->id . "' and o.orders_id = ot.orders_id and ot.class = 'ot_total' and o.orders_status = s.orders_status_id and s.language_id = '" . (int)$osC_Session->value('languages_id') . "' order by orders_id desc limit 3");
  99 -    while ($orders = tep_db_fetch_array($orders_query)) {
  100 -      if (tep_not_null($orders['delivery_name'])) {
  101 -        $order_name = $orders['delivery_name'];
  102 -        $order_country = $orders['delivery_country'];
   98+    $Qorders = $osC_Database->query('select o.orders_id, o.date_purchased, o.delivery_name, o.delivery_country, o.billing_name, o.billing_country, ot.text as order_total, s.orders_status_name from :table_orders o, :table_orders_total ot, :table_orders_status s where o.customers_id = :customers_id and o.orders_id = ot.orders_id and ot.class = :class and o.orders_status = s.orders_status_id and s.language_id = :language_id order by orders_id desc limit 3');
   99+    $Qorders->bindTable(':table_orders', TABLE_ORDERS);
   100+    $Qorders->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL);
   101+    $Qorders->bindTable(':table_orders_status', TABLE_ORDERS_STATUS);
   102+    $Qorders->bindInt(':customers_id', $osC_Customer->id);
   103+    $Qorders->bindValue(':class', 'ot_total');
   104+    $Qorders->bindInt(':language_id', $osC_Session->value('languages_id'));
   105+    $Qorders->execute();
   106+
   107+    while ($Qorders->next()) {
   108+      if (tep_not_null($Qorders->value('delivery_name'))) {
   109+        $order_name = $Qorders->value('delivery_name');
   110+        $order_country = $Qorders->value('delivery_country');
103111       } else {
<> 104 -        $order_name = $orders['billing_name'];
  105 -        $order_country = $orders['billing_country'];
   112+        $order_name = $Qorders->value('billing_name');
   113+        $order_country = $Qorders->value('billing_country');
106114       }
  107115 ?>
<> 108 -                  <tr class="moduleRow" onMouseOver="rowOverEffect(this)" onMouseOut="rowOutEffect(this)" onClick="document.location.href='<?php echo tep_href_link(FILENAME_ACCOUNT_HISTORY_INFO, 'order_id=' . $orders['orders_id'], 'SSL'); ?>'">
  109 -                    <td class="main" width="80"><?php echo tep_date_short($orders['date_purchased']); ?></td>
  110 -                    <td class="main"><?php echo '#' . $orders['orders_id']; ?></td>
   116+                  <tr class="moduleRow" onMouseOver="rowOverEffect(this)" onMouseOut="rowOutEffect(this)" onClick="document.location.href='<?php echo tep_href_link(FILENAME_ACCOUNT_HISTORY_INFO, 'order_id=' . $Qorders->valueInt('orders_id'), 'SSL'); ?>'">
   117+                    <td class="main" width="80"><?php echo tep_date_short($Qorders->value('date_purchased')); ?></td>
   118+                    <td class="main"><?php echo '#' . $Qorders->valueInt('orders_id'); ?></td>
111119                     <td class="main"><?php echo tep_output_string_protected($order_name) . ', ' . $order_country; ?></td>
<> 112 -                    <td class="main"><?php echo $orders['orders_status_name']; ?></td>
  113 -                    <td class="main" align="right"><?php echo $orders['order_total']; ?></td>
  114 -                    <td class="main" align="right"><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT_HISTORY_INFO, 'order_id=' . $orders['orders_id'], 'SSL') . '">' . tep_image_button('small_view.gif', SMALL_IMAGE_BUTTON_VIEW) . '</a>'; ?></td>
   120+                    <td class="main"><?php echo $Qorders->value('orders_status_name'); ?></td>
   121+                    <td class="main" align="right"><?php echo $Qorders->value('order_total'); ?></td>
   122+                    <td class="main" align="right"><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT_HISTORY_INFO, 'order_id=' . $Qorders->valueInt('orders_id'), 'SSL') . '">' . tep_image_button('small_view.gif', SMALL_IMAGE_BUTTON_VIEW) . '</a>'; ?></td>
<_ 115123                   </tr>
  116124 <?php
  117125     }