[TEP-COMMIT] [CVS catalog] use the new database class
hpdl-OfajU3CKLf1/[email protected] 24 Feb 2005 01:49:02 -0000
| Newsgroups | gmane.comp.web.oscommerce.cvs |
|---|---|
| Message-ID | <[email protected]> |
<html>
<head>
<style><!--
body {background-color:#ffffff;}
.file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
.pathname {font-family:monospace; float:right;}
.fileheader {margin-bottom:.5em;}
.diff {margin:0;}
.tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
.tasklist ul {margin-top:0;margin-bottom:0;}
tr.alt {background-color:#eeeeee}
#added {background-color:#ddffdd;}
#addedchars {background-color:#99ff99;font-weight:bolder;}
tr.alt #added {background-color:#ccf7cc;}
#removed {background-color:#ffdddd;}
#removedchars {background-color:#ff9999;font-weight:bolder;}
tr.alt #removed {background-color:#f7cccc;}
#info {color:#888888;}
#context {background-color:#eeeeee;}
td {padding-left:.3em;padding-right:.3em;}
tr.head {border-bottom-width:1px;border-bottom-style:solid;}
tr.head td {padding:0;padding-top:.2em;}
.task {background-color:#ffff00;}
.comment {padding:4px;border:1px dashed #000000;background-color:#ffffdd}
.error {color:red;}
hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="4">Commit in <b><tt>catalog/catalog/includes/modules</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt><a href="#file1">downloads.php</a></tt></td><td align="right" id="added">+29</td><td align="right" id="removed">-18</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/downloads.php?rev=1.5&content-type=text/vnd.viewcvs-markup">1.5</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/downloads.php.diff?r1=1.5&r2=1.6">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/downloads.php?rev=1.6&content-type=text/vnd.viewcvs-markup">1.6</a></td></tr>
<tr class="alt"><td><tt><a href="#file2">product_listing.php</a></tt></td><td align="right" id="added">+29</td><td align="right" id="removed">-23</td><td nowrap="nowrap" align="center"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/product_listing.php?rev=1.48&content-type=text/vnd.viewcvs-markup">1.48</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/product_listing.php.diff?r1=1.48&r2=1.49">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/product_listing.php?rev=1.49&content-type=text/vnd.viewcvs-markup">1.49</a></td></tr>
<tr><td></td><td align="right" id="added">+58</td><td align="right" id="removed">-41</td><td></td></tr>
</table>
<small id="info">2 modified files</small><br />
<pre class="comment">
use the new database class
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes">includes</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules">modules</a><br /></span>
<div class="fileheader"><big><b>downloads.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/downloads.php?rev=1.5&content-type=text/vnd.viewcvs-markup">1.5</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/downloads.php.diff?r1=1.5&r2=1.6">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/downloads.php?rev=1.6&content-type=text/vnd.viewcvs-markup">1.6</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.5 -r1.6
--- downloads.php 2004/04/13 08:00:26 1.5
+++ downloads.php 2005/02/24 01:49:00 1.6
@@ -5,26 +5,35 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">3</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff" id="removed">-?>
-<!-- downloads //-->
-<?php
</pre><pre class="diff" id="added">+
</pre><pre class="diff" id="context"> if (!strstr($_SERVER['PHP_SELF'], FILENAME_ACCOUNT_HISTORY_INFO)) {
// Get last order id for checkout_success
</pre><pre class="diff" id="removed">- $orders_query = tep_db_query("select orders_id from " . TABLE_ORDERS . " where customers_id = '" . (int)$osC_Customer->id . "' order by orders_id desc limit 1");
- $orders = tep_db_fetch_array($orders_query);
- $last_order = $orders['orders_id'];
</pre><pre class="diff" id="added">+ $Qorder = $osC_Database->query('select orders_id from :table_orders where customers_id = :customers_id order by orders_id desc limit 1');
+ $Qorder->bindTable(':table_orders', TABLE_ORDERS);
+ $Qorder->bindInt(':customers_id', $osC_Customer->id);
+ $Qorder->execute();
+
+ $last_order = $Qorders->valueInt('orders_id');
</pre><pre class="diff" id="context"> } else {
</pre><pre class="diff" id="removed">- $last_order = $_GET['order_id'];
</pre><pre class="diff" id="added">+ $last_order = <span id="addedchars">(int)</span>$_GET['order_id'];
</pre><pre class="diff" id="context"> }
// Now get all downloadable products in that order
</pre><pre class="diff" id="removed">- $downloads_query = tep_db_query("select date_format(o.date_purchased, '%Y-%m-%d') as date_purchased_day, opd.download_maxdays, op.products_name, opd.orders_products_download_id, opd.orders_products_filename, opd.download_count, opd.download_maxdays from " . TABLE_ORDERS . " o, " . TABLE_ORDERS_PRODUCTS . " op, " . TABLE_ORDERS_PRODUCTS_DOWNLOAD . " opd where o.customers_id = '" . (int)$osC_Customer->id . "' and o.orders_id = '" . (int)$last_order . "' and o.orders_id = op.orders_id and op.orders_products_id = opd.orders_products_id and opd.orders_products_filename != ''");
- if (tep_db_num_rows($downloads_query) > 0) {
</pre><pre class="diff" id="added">+ $Qdownloads = $osC_Database->query('select date_format(o.date_purchased, "%Y-%m-%d") as date_purchased_day, opd.download_maxdays, op.products_name, opd.orders_products_download_id, opd.orders_products_filename, opd.download_count, opd.download_maxdays from :table_orders o, :table_orders_products op, :table_orders_products_downloads opd where o.customers_id = :customers_id and o.orders_id = :orders_id and o.orders_id = op.orders_id and op.orders_products_id = opd.orders_products_id and opd.orders_products_filename != ""');
+ $Qdownloads->bindTable(':table_orders', TABLE_ORDERS);
+ $Qdownloads->bindTable(':table_orders_products', TABLE_ORDERS_PRODUCTS);
+ $Qdownloads->bindTable(':table_orders_products_downloads', TABLE_ORDERS_PRODUCTS_DOWNLOADS);
+ $Qdownloads->bindInt(':customers_id', $osC_Customer->id);
+ $Qdownloads->bindInt(':orders_id', $last_order);
+ $Qdownloads->execute();
+
+ if ($Qdownloads->numberOfRows() > 0) {
</pre><pre class="diff" id="context"> ?>
</pre><pre class="diff" id="added">+<!-- downloads //-->
</pre><pre class="diff" id="context"> <tr>
<td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
</tr>
</pre><pre class="diff"><small id="info">@@ -38,10 +47,10 @@
</small></pre><pre class="diff" id="context"> <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
<!-- list of products -->
<?php
</pre><pre class="diff" id="removed">- while ($downloads = tep_db_fetch_array($downloads_query)) {
</pre><pre class="diff" id="added">+ while ($Qdownloads->next()) {
</pre><pre class="diff" id="context"> // MySQL 3.22 does not have INTERVAL
</pre><pre class="diff" id="removed">- list($dt_year, $dt_month, $dt_day) = explode('-', $downloads['date_purchased_day']);
- $download_timestamp = mktime(23, 59, 59, $dt_month, $dt_day + $downloads['download_maxdays'], $dt_year);
</pre><pre class="diff" id="added">+ list($dt_year, $dt_month, $dt_day) = explode('-', $Qdownloads->value('date_purchased_day'));
+ $download_timestamp = mktime(23, 59, 59, $dt_month, $dt_day + $Qdownloads->value('download_maxdays'), $dt_year);
</pre><pre class="diff" id="context"> $download_expiry = date('Y-m-d H:i:s', $download_timestamp);
?>
<tr class="infoBoxContents">
</pre><pre class="diff"><small id="info">@@ -52,16 +61,16 @@
</small></pre><pre class="diff" id="context"> // - The file is present in the DOWNLOAD directory, AND EITHER
// - No expiry date is enforced (maxdays == 0), OR
// - The expiry date is not reached
</pre><pre class="diff" id="removed">- if ( ($downloads['download_count'] > 0) && (file_exists(DIR_FS_DOWNLOAD . $downloads['orders_products_filename'])) && ( ($downloads['download_maxdays'] == 0) || ($download_timestamp > time())) ) {
- echo ' <td class="main"><a href="' . tep_href_link(FILENAME_DOWNLOAD, 'order=' . $last_order . '&id=' . $downloads['orders_products_download_id']) . '">' . $downloads['products_name'] . '</a></td>' . "\n";
</pre><pre class="diff" id="added">+ if ( ($Qdownloads->valueInt('download_count') > 0) && (file_exists(DIR_FS_DOWNLOAD . $Qdownloads->value('orders_products_filename'))) && ( ($Qdownloads->value('download_maxdays') == 0) || ($download_timestamp > time())) ) {
+ echo ' <td class="main"><a href="' . tep_href_link(FILENAME_DOWNLOAD, 'order=' . $last_order . '&id=' . $Qdownloads->valueInt('orders_products_download_id')) . '">' . $Qdownloads->value('products_name') . '</a></td>' . "\n";
</pre><pre class="diff" id="context"> } else {
</pre><pre class="diff" id="removed">- echo ' <td class="main">' . $<span id="removedchars">downloads['products_name']</span> . '</td>' . "\n";
</pre><pre class="diff" id="added">+ echo ' <td class="main">' . $<span id="addedchars">Qdownloads->value('products_name')</span> . '</td>' . "\n";
</pre><pre class="diff" id="context"> }
?>
<!-- right box -->
<?php
echo ' <td class="main">' . TABLE_HEADING_DOWNLOAD_DATE . tep_date_long($download_expiry) . '</td>' . "\n" .
</pre><pre class="diff" id="removed">- ' <td class="main" align="right">' . $<span id="removedchars">downloads['download_count']</span> . TABLE_HEADING_DOWNLOAD_COUNT . '</td>' . "\n" .
</pre><pre class="diff" id="added">+ ' <td class="main" align="right">' . $<span id="addedchars">Qdownloads->valueInt('download_count')</span> . TABLE_HEADING_DOWNLOAD_COUNT . '</td>' . "\n" .
</pre><pre class="diff" id="context"> ' </tr>' . "\n";
}
?>
</pre><pre class="diff"><small id="info">@@ -79,6 +88,8 @@
</small></pre><pre class="diff" id="context"> </tr>
<?php
}
</pre><pre class="diff" id="removed">- }
</pre><pre class="diff" id="context"> ?>
<!-- downloads_eof //-->
</pre><pre class="diff" id="added">+<?php
+ }
+?>
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes">includes</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules">modules</a><br /></span>
<div class="fileheader"><big><b>product_listing.php</b></big> <small id="info"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/product_listing.php?rev=1.48&content-type=text/vnd.viewcvs-markup">1.48</a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/product_listing.php.diff?r1=1.48&r2=1.49">-></a> <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/includes/modules/product_listing.php?rev=1.49&content-type=text/vnd.viewcvs-markup">1.49</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.48 -r1.49
--- product_listing.php 2004/04/15 16:05:39 1.48
+++ product_listing.php 2005/02/24 01:49:00 1.49
@@ -5,19 +5,25 @@
</small></pre><pre class="diff" id="context"> osCommerce, Open Source E-Commerce Solutions
http://www.oscommerce.com
</pre><pre class="diff" id="removed">- Copyright (c) 200<span id="removedchars">3</span> osCommerce
</pre><pre class="diff" id="added">+ Copyright (c) 200<span id="addedchars">5</span> osCommerce
</pre><pre class="diff" id="context">
Released under the GNU General Public License
*/
</pre><pre class="diff" id="removed">- $listing_split = new splitPageResults($listing_sql, MAX_DISPLAY_SEARCH_RESULTS, 'p.products_id');
</pre><pre class="diff" id="added">+ if (!isset($_GET['page']) || (isset($_GET['page']) && !is_numeric($_GET['page']))) {
+ $_GET['page'] = 1;
+ }
+
+ $Qlisting = $osC_Database->query($listing_sql);
+ $Qlisting->setBatchLimit($_GET['page'], MAX_DISPLAY_SEARCH_RESULTS, 'p.products_id');
+ $Qlisting->execute();
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="removed">- if ( ($<span id="removedchars">listing_split->number_of_rows</span> > 0) && ( (PREV_NEXT_BAR_LOCATION == '1') || (PREV_NEXT_BAR_LOCATION == '3') ) ) {
</pre><pre class="diff" id="added">+ if ( ($<span id="addedchars">Qlisting->numberOfRows()</span> > 0) && ( (PREV_NEXT_BAR_LOCATION == '1') || (PREV_NEXT_BAR_LOCATION == '3') ) ) {
</pre><pre class="diff" id="context"> ?>
<table border="0" width="100%" cellspacing="0" cellpadding="2">
<tr>
</pre><pre class="diff" id="removed">- <td class="smallText"><?php echo $listing_split->display_count(TEXT_DISPLAY_NUMBER_OF_PRODUCTS); ?></td>
- <td class="smallText" align="right"><?php echo TEXT_RESULT_PAGE . ' ' . $listing_split->display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info', 'x', 'y'))); ?></td>
</pre><pre class="diff" id="added">+ <td class="smallText"><?php echo $Qlisting->displayBatchLinksTotal(TEXT_DISPLAY_NUMBER_OF_PRODUCTS); ?></td>
+ <td class="smallText" align="right"><?php echo $Qlisting->displayBatchLinksPullDown('page', tep_get_all_get_params(array('page', 'info', 'x', 'y'))); ?></td>
</pre><pre class="diff" id="context"> </tr>
</table>
<?php
</pre><pre class="diff"><small id="info">@@ -70,10 +76,10 @@
</small></pre><pre class="diff" id="context"> 'text' => '&nbsp;' . $lc_text . '&nbsp;');
}
</pre><pre class="diff" id="removed">- if ($listing_split->number_of_rows > 0) {
</pre><pre class="diff" id="added">+ if ($Qlisting->numberOfRows() > 0) {
</pre><pre class="diff" id="context"> $rows = 0;
</pre><pre class="diff" id="removed">- $listing_query = tep_db_query($listing_split->sql_query);
- while ($listing = tep_db_fetch_array($listing_query)) {
</pre><pre class="diff" id="added">+
+ while ($Qlisting->next()) {
</pre><pre class="diff" id="context"> $rows++;
if (($rows/2) == floor($rows/2)) {
</pre><pre class="diff"><small id="info">@@ -90,47 +96,47 @@
</small></pre><pre class="diff" id="context"> switch ($column_list[$col]) {
case 'PRODUCT_LIST_MODEL':
$lc_align = '';
</pre><pre class="diff" id="removed">- $lc_text = '&nbsp;' . $listing['products_model'] . '&nbsp;';
</pre><pre class="diff" id="added">+ $lc_text = '&nbsp;' . $Qlisting->value('products_model') . '&nbsp;';
</pre><pre class="diff" id="context"> break;
case 'PRODUCT_LIST_NAME':
$lc_align = '';
if (isset($_GET['manufacturers_id'])) {
</pre><pre class="diff" id="removed">- $lc_text = '<a href="' . tep_href_link(FILENAME_PRODUCT_INFO, 'manufacturers_id=' . $_GET['manufacturers_id'] . '&products_id=' . $<span id="removedchars">listing['products_id']) . '">' . $listing['products_name']</span> . '</a>';
</pre><pre class="diff" id="added">+ $lc_text = '<a href="' . tep_href_link(FILENAME_PRODUCT_INFO, 'manufacturers_id=' . $_GET['manufacturers_id'] . '&products_id=' . $<span id="addedchars">Qlisting->valueInt('products_id')) . '">' . $Qlisting->value('products_name')</span> . '</a>';
</pre><pre class="diff" id="context"> } else {
</pre><pre class="diff" id="removed">- $lc_text = '&nbsp;<a href="' . tep_href_link(FILENAME_PRODUCT_INFO, ($cPath ? 'cPath=' . $cPath . '&' : '') . 'products_id=' . $<span id="removedchars">listing['products_id']) . '">' . $listing['products_name']</span> . '</a>&nbsp;';
</pre><pre class="diff" id="added">+ $lc_text = '&nbsp;<a href="' . tep_href_link(FILENAME_PRODUCT_INFO, ($cPath ? 'cPath=' . $cPath . '&' : '') . 'products_id=' . $<span id="addedchars">Qlisting->valueInt('products_id')) . '">' . $Qlisting->value('products_name')</span> . '</a>&nbsp;';
</pre><pre class="diff" id="context"> }
break;
case 'PRODUCT_LIST_MANUFACTURER':
$lc_align = '';
</pre><pre class="diff" id="removed">- $lc_text = '&nbsp;<a href="' . tep_href_link(FILENAME_DEFAULT, 'manufacturers_id=' . $listing['manufacturers_id']) . '">' . $listing['manufacturers_name'] . '</a>&nbsp;';
</pre><pre class="diff" id="added">+ $lc_text = '&nbsp;<a href="' . tep_href_link(FILENAME_DEFAULT, 'manufacturers_id=' . $Qlisting->valueInt('manufacturers_id')) . '">' . $Qlisting->valueInt('manufacturers_name') . '</a>&nbsp;';
</pre><pre class="diff" id="context"> break;
case 'PRODUCT_LIST_PRICE':
$lc_align = 'right';
</pre><pre class="diff" id="removed">- if (tep_not_null($listing['specials_new_products_price'])) {
- $lc_text = '&nbsp;<s>' . $osC_Currencies->displayPrice($listing['products_price'], $listing['products_tax_class_id']) . '</s>&nbsp;&nbsp;<span class="productSpecialPrice">' . $osC_Currencies->displayPrice($listing['specials_new_products_price'], $listing['products_tax_class_id']) . '</span>&nbsp;';
</pre><pre class="diff" id="added">+ if (tep_not_null($Qlisting->value('specials_new_products_price'))) {
+ $lc_text = '&nbsp;<s>' . $osC_Currencies->displayPrice($Qlisting->value('products_price'), $Qlisting->valueInt('products_tax_class_id')) . '</s>&nbsp;&nbsp;<span class="productSpecialPrice">' . $osC_Currencies->displayPrice($Qlisting->value('specials_new_products_price'), $Qlisting->valueInt('products_tax_class_id')) . '</span>&nbsp;';
</pre><pre class="diff" id="context"> } else {
</pre><pre class="diff" id="removed">- $lc_text = '&nbsp;' . $osC_Currencies->displayPrice($listing['products_price'], $listing['products_tax_class_id']) . '&nbsp;';
</pre><pre class="diff" id="added">+ $lc_text = '&nbsp;' . $osC_Currencies->displayPrice($Qlisting->value('products_price'), $Qlisting->valueInt('products_tax_class_id')) . '&nbsp;';
</pre><pre class="diff" id="context"> }
break;
case 'PRODUCT_LIST_QUANTITY':
$lc_align = 'right';
</pre><pre class="diff" id="removed">- $lc_text = '&nbsp;' . $listing['products_quantity'] . '&nbsp;';
</pre><pre class="diff" id="added">+ $lc_text = '&nbsp;' . $Qlisting->valueInt('products_quantity') . '&nbsp;';
</pre><pre class="diff" id="context"> break;
case 'PRODUCT_LIST_WEIGHT':
$lc_align = 'right';
</pre><pre class="diff" id="removed">- $lc_text = '&nbsp;' . $osC_Weight->display($listing['products_weight'], $listing['products_weight_class']) . '&nbsp;';
</pre><pre class="diff" id="added">+ $lc_text = '&nbsp;' . $osC_Weight->display($Qlisting->value('products_weight'), $Qlisting->value('products_weight_class')) . '&nbsp;';
</pre><pre class="diff" id="context"> break;
case 'PRODUCT_LIST_IMAGE':
$lc_align = 'center';
if (isset($_GET['manufacturers_id'])) {
</pre><pre class="diff" id="removed">- $lc_text = '<a href="' . tep_href_link(FILENAME_PRODUCT_INFO, 'manufacturers_id=' . $_GET['manufacturers_id'] . '&products_id=' . $listing['products_id']) . '">' . tep_image(DIR_WS_IMAGES . $listing['products_image'], $listing['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . '</a>';
</pre><pre class="diff" id="added">+ $lc_text = '<a href="' . tep_href_link(FILENAME_PRODUCT_INFO, 'manufacturers_id=' . $_GET['manufacturers_id'] . '&products_id=' . $Qlisting->valueInt('products_id')) . '">' . tep_image(DIR_WS_IMAGES . $Qlisting->value('products_image'), $Qlisting->value('products_name'), SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . '</a>';
</pre><pre class="diff" id="context"> } else {
</pre><pre class="diff" id="removed">- $lc_text = '&nbsp;<a href="' . tep_href_link(FILENAME_PRODUCT_INFO, ($cPath ? 'cPath=' . $cPath . '&' : '') . 'products_id=' . $listing['products_id']) . '">' . tep_image(DIR_WS_IMAGES . $listing['products_image'], $listing['products_name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . '</a>&nbsp;';
</pre><pre class="diff" id="added">+ $lc_text = '&nbsp;<a href="' . tep_href_link(FILENAME_PRODUCT_INFO, ($cPath ? 'cPath=' . $cPath . '&' : '') . 'products_id=' . $Qlisting->valueInt('products_id')) . '">' . tep_image(DIR_WS_IMAGES . $Qlisting->value('products_image'), $Qlisting->value('products_name'), SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . '</a>&nbsp;';
</pre><pre class="diff" id="context"> }
break;
case 'PRODUCT_LIST_BUY_NOW':
$lc_align = 'center';
</pre><pre class="diff" id="removed">- $lc_text = '<a href="' . tep_href_link(basename($_SERVER['PHP_SELF']), tep_get_all_get_params(array('action')) . 'action=buy_now&products_id=' . $<span id="removedchars">listing['products_id']</span>) . '">' . tep_image_button('button_buy_now.gif', IMAGE_BUTTON_BUY_NOW) . '</a>&nbsp;';
</pre><pre class="diff" id="added">+ $lc_text = '<a href="' . tep_href_link(basename($_SERVER['PHP_SELF']), tep_get_all_get_params(array('action')) . 'action=buy_now&products_id=' . $<span id="addedchars">Qlisting->valueInt('products_id')</span>) . '">' . tep_image_button('button_buy_now.gif', IMAGE_BUTTON_BUY_NOW) . '</a>&nbsp;';
</pre><pre class="diff" id="context"> break;
}
</pre><pre class="diff"><small id="info">@@ -151,12 +157,12 @@
</small></pre><pre class="diff" id="context"> new productListingBox($list_box_contents);
}
</pre><pre class="diff" id="removed">- if ( ($<span id="removedchars">listing_split->number_of_rows</span> > 0) && ((PREV_NEXT_BAR_LOCATION == '2') || (PREV_NEXT_BAR_LOCATION == '3')) ) {
</pre><pre class="diff" id="added">+ if ( ($<span id="addedchars">Qlisting->numberOfRows()</span> > 0) && ((PREV_NEXT_BAR_LOCATION == '2') || (PREV_NEXT_BAR_LOCATION == '3')) ) {
</pre><pre class="diff" id="context"> ?>
<table border="0" width="100%" cellspacing="0" cellpadding="2">
<tr>
</pre><pre class="diff" id="removed">- <td class="smallText"><?php echo $listing_split->display_count(TEXT_DISPLAY_NUMBER_OF_PRODUCTS); ?></td>
- <td class="smallText" align="right"><?php echo TEXT_RESULT_PAGE . ' ' . $listing_split->display_links(MAX_DISPLAY_PAGE_LINKS, tep_get_all_get_params(array('page', 'info', 'x', 'y'))); ?></td>
</pre><pre class="diff" id="added">+ <td class="smallText"><?php echo $Qlisting->displayBatchLinksTotal(TEXT_DISPLAY_NUMBER_OF_PRODUCTS); ?></td>
+ <td class="smallText" align="right"><?php echo $Qlisting->displayBatchLinksPullDown('page', tep_get_all_get_params(array('page', 'info', 'x', 'y'))); ?></td>
</pre><pre class="diff" id="context"> </tr>
</table>
<?php
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -> email">CVSspam</a> 0.2.9</small></center>
</body></html>
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click