[TEP-COMMIT] [CVS catalog] remove redundant file
hpdl-OfajU3CKLf1/[email protected] 30 Mar 2005 00:12:05 -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</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt><span id="removed">shopping_cart.php</span></tt></td><td></td><td></td><td nowrap="nowrap"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/shopping_cart.php?rev=1.77&content-type=text/vnd.viewcvs-markup">1.77</a> removed</td></tr>
</table>
<pre class="comment">
remove redundant file
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname" id="removed"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog">catalog</a>/<a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog">catalog</a><br /></span>
<div class="fileheader" id="removed"><big><b>shopping_cart.php</b></big> <small id="info">removed after <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/shopping_cart.php?rev=1.77&content-type=text/vnd.viewcvs-markup">1.77</a></small></div>
<pre class="diff"><small id="info">diff -N shopping_cart.php
--- /tmp/cvsAAAzsai2a Wed Mar 30 02:12:02 2005
+++ /dev/null Wed Mar 30 02:11:57 2005
@@ -1,247 +0,0 @@
</small></pre><pre class="diff" id="removed">-<?php
-/*
- $Id$
-
- osCommerce, Open Source E-Commerce Solutions
- http://www.oscommerce.com
-
- Copyright (c) 2005 osCommerce
-
- Released under the GNU General Public License
-*/
-
- require("includes/application_top.php");
-
- require(DIR_WS_LANGUAGES . $osC_Session->value('language') . '/' . FILENAME_SHOPPING_CART);
-
- $breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_SHOPPING_CART));
-?>
-<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html <?php echo HTML_PARAMS; ?>>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET; ?>">
-<title><?php echo TITLE; ?></title>
-<base href="<?php echo (($request_type == 'SSL') ? HTTPS_SERVER : HTTP_SERVER) . DIR_WS_CATALOG; ?>">
-<link rel="stylesheet" type="text/css" href="stylesheet.css">
-</head>
-<body marginwidth="0" marginheight="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0">
-<!-- header //-->
-<?php require(DIR_WS_INCLUDES . 'header.php'); ?>
-<!-- header_eof //-->
-
-<!-- body //-->
-<table border="0" width="100%" cellspacing="3" cellpadding="3">
- <tr>
- <td width="<?php echo BOX_WIDTH; ?>" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="0" cellpadding="2">
-<!-- left_navigation //-->
-<?php require(DIR_WS_INCLUDES . 'column_left.php'); ?>
-<!-- left_navigation_eof //-->
- </table></td>
-<!-- body_text //-->
- <td width="100%" valign="top"><?php echo tep_draw_form('cart_quantity', tep_href_link(FILENAME_SHOPPING_CART, 'action=update_product')); ?><table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td><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_cart.gif', HEADING_TITLE, HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
-<?php
- if ($cart->count_contents() > 0) {
-?>
- <tr>
- <td>
-<?php
- $info_box_contents = array();
- $info_box_contents[0][] = array('align' => 'center',
- 'params' => 'class="productListing-heading"',
- 'text' => TABLE_HEADING_REMOVE);
-
- $info_box_contents[0][] = array('params' => 'class="productListing-heading"',
- 'text' => TABLE_HEADING_PRODUCTS);
-
- $info_box_contents[0][] = array('align' => 'center',
- 'params' => 'class="productListing-heading"',
- 'text' => TABLE_HEADING_QUANTITY);
-
- $info_box_contents[0][] = array('align' => 'right',
- 'params' => 'class="productListing-heading"',
- 'text' => TABLE_HEADING_TOTAL);
-
- $any_out_of_stock = 0;
- $products = $cart->get_products();
- for ($i=0, $n=sizeof($products); $i<$n; $i++) {
-// Push all attributes information in an array
- if (isset($products[$i]['attributes']) && is_array($products[$i]['attributes'])) {
- while (list($option, $value) = each($products[$i]['attributes'])) {
- echo osc_draw_hidden_field('id[' . $products[$i]['id'] . '][' . $option . ']', $value);
-
- $Qattributes = $osC_Database->query('select popt.products_options_name, poval.products_options_values_name, pa.options_values_price, pa.price_prefix from :table_products_options popt, :table_products_options_values poval, :table_products_attributes pa where pa.products_id = :products_id and pa.options_id = :options_id and pa.options_id = popt.products_options_id and pa.options_values_id = :options_values_id and pa.options_values_id = poval.products_options_values_id and popt.language_id = :language_id and poval.language_id = :language_id');
- $Qattributes->bindTable(':table_products_options', TABLE_PRODUCTS_OPTIONS);
- $Qattributes->bindTable(':table_products_options_values', TABLE_PRODUCTS_OPTIONS_VALUES);
- $Qattributes->bindTable(':table_products_attributes', TABLE_PRODUCTS_ATTRIBUTES);
- $Qattributes->bindInt(':products_id', $products[$i]['id']);
- $Qattributes->bindInt(':options_id', $option);
- $Qattributes->bindInt(':options_values_id', $value);
- $Qattributes->bindInt(':language_id', $osC_Session->value('languages_id'));
- $Qattributes->bindInt(':language_id', $osC_Session->value('languages_id'));
- $Qattributes->execute();
-
- $products[$i][$option]['products_options_name'] = $Qattributes->value('products_options_name');
- $products[$i][$option]['options_values_id'] = $value;
- $products[$i][$option]['products_options_values_name'] = $Qattributes->value('products_options_values_name');
- $products[$i][$option]['options_values_price'] = $Qattributes->value('options_values_price');
- $products[$i][$option]['price_prefix'] = $Qattributes->value('price_prefix');
- }
- }
- }
-
- for ($i=0, $n=sizeof($products); $i<$n; $i++) {
- if (($i/2) == floor($i/2)) {
- $info_box_contents[] = array('params' => 'class="productListing-even"');
- } else {
- $info_box_contents[] = array('params' => 'class="productListing-odd"');
- }
-
- $cur_row = sizeof($info_box_contents) - 1;
-
- $info_box_contents[$cur_row][] = array('align' => 'center',
- 'params' => 'class="productListing-data" valign="top"',
- 'text' => osc_draw_checkbox_field('cart_delete[]', $products[$i]['id']));
-
- $products_name = '<table border="0" cellspacing="2" cellpadding="2">' .
- ' <tr>' .
- ' <td class="productListing-data" align="center"><a href="' . tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $products[$i]['id']) . '">' . tep_image(DIR_WS_IMAGES . $products[$i]['image'], $products[$i]['name'], SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT) . '</a></td>' .
- ' <td class="productListing-data" valign="top"><a href="' . tep_href_link(FILENAME_PRODUCT_INFO, 'products_id=' . $products[$i]['id']) . '"><b>' . $products[$i]['name'] . '</b></a>';
-
- if (STOCK_CHECK == 'true') {
- $stock_check = tep_check_stock($products[$i]['id'], $products[$i]['quantity']);
- if (tep_not_null($stock_check)) {
- $any_out_of_stock = 1;
-
- $products_name .= $stock_check;
- }
- }
-
- if (isset($products[$i]['attributes']) && is_array($products[$i]['attributes'])) {
- reset($products[$i]['attributes']);
- while (list($option, $value) = each($products[$i]['attributes'])) {
- $products_name .= '<br><small><i> - ' . $products[$i][$option]['products_options_name'] . ' ' . $products[$i][$option]['products_options_values_name'] . '</i></small>';
- }
- }
-
- $products_name .= ' </td>' .
- ' </tr>' .
- '</table>';
-
- $info_box_contents[$cur_row][] = array('params' => 'class="productListing-data"',
- 'text' => $products_name);
-
- $info_box_contents[$cur_row][] = array('align' => 'center',
- 'params' => 'class="productListing-data" valign="top"',
- 'text' => osc_draw_input_field('cart_quantity[]', $products[$i]['quantity'], 'size="4"') . osc_draw_hidden_field('products_id[]', $products[$i]['id']));
-
- $info_box_contents[$cur_row][] = array('align' => 'right',
- 'params' => 'class="productListing-data" valign="top"',
- 'text' => '<b>' . $osC_Currencies->displayPrice($products[$i]['final_price'], $products[$i]['tax_class_id'], $products[$i]['quantity']) . '</b>');
- }
-
- new productListingBox($info_box_contents);
-?>
- </td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
- <tr>
- <td align="right" class="main"><b><?php echo SUB_TITLE_SUB_TOTAL; ?> <?php echo $osC_Currencies->format($cart->show_total()); ?></b></td>
- </tr>
-<?php
- if ($any_out_of_stock == 1) {
- if (STOCK_ALLOW_CHECKOUT == 'true') {
-?>
- <tr>
- <td class="stockWarning" align="center"><br><?php echo OUT_OF_STOCK_CAN_CHECKOUT; ?></td>
- </tr>
-<?php
- } else {
-?>
- <tr>
- <td class="stockWarning" align="center"><br><?php echo OUT_OF_STOCK_CANT_CHECKOUT; ?></td>
- </tr>
-<?php
- }
- }
-?>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </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 width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td class="main"><?php echo tep_image_submit('button_update_cart.gif', IMAGE_BUTTON_UPDATE_CART); ?></td>
-<?php
- $back = sizeof($navigation->path)-2;
- if (isset($navigation->path[$back])) {
-?>
- <td class="main"><?php echo '<a href="' . tep_href_link($navigation->path[$back]['page'], tep_array_to_string($navigation->path[$back]['get'], array('action')), $navigation->path[$back]['mode']) . '">' . tep_image_button('button_continue_shopping.gif', IMAGE_BUTTON_CONTINUE_SHOPPING) . '</a>'; ?></td>
-<?php
- }
-?>
- <td align="right" class="main"><?php echo '<a href="' . tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL') . '">' . tep_image_button('button_checkout.gif', IMAGE_BUTTON_CHECKOUT) . '</a>'; ?></td>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
-<?php
- } else {
-?>
- <tr>
- <td align="center" class="main"><?php new infoBox(array(array('text' => TEXT_CART_EMPTY))); ?></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </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 width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td align="right" class="main"><?php echo '<a href="' . tep_href_link(FILENAME_DEFAULT) . '">' . tep_image_button('button_continue.gif', IMAGE_BUTTON_CONTINUE) . '</a>'; ?></td>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
-<?php
- }
-?>
- </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>
- </tr>
-</table>
-<!-- body_eof //-->
-
-<!-- footer //-->
-<?php require(DIR_WS_INCLUDES . 'footer.php'); ?>
-<!-- footer_eof //-->
-<br>
-</body>
-</html>
-<?php require(DIR_WS_INCLUDES . 'application_bottom.php'); ?>
<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