[TEP-COMMIT] CVS: catalog/catalog/includes column_left.php,1.15,1.16 footer.php,1.26,1.27 header.php,1.43,1.44

Update of /pack/cvsroots/oscommerce/catalog/catalog/includes
In directory sunsite.dk:/tmp/cvs-serv13857/includes

Modified Files:
	column_left.php footer.php header.php 
Log Message:
the caching is now done at the database query level

remove error_message and info_message which has been replaced with the
messageStack


Index: column_left.php
===================================================================
RCS file: /pack/cvsroots/oscommerce/catalog/catalog/includes/column_left.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- column_left.php	2003/07/01 14:34:54	1.15
+++ column_left.php	2004/02/16 07:16:57	1.16
@@ -5,23 +5,13 @@
   osCommerce, Open Source E-Commerce Solutions
   http://www.oscommerce.com
 
-  Copyright (c) 2003 osCommerce
+  Copyright (c) 2004 osCommerce
 
   Released under the GNU General Public License
 */
-
-  if ((USE_CACHE == 'true') && empty($SID)) {
-    echo tep_cache_categories_box();
-  } else {
-    include(DIR_WS_BOXES . 'categories.php');
-  }
 
-  if ((USE_CACHE == 'true') && empty($SID)) {
-    echo tep_cache_manufacturers_box();
-  } else {
-    include(DIR_WS_BOXES . 'manufacturers.php');
-  }
-
+  require(DIR_WS_BOXES . 'categories.php');
+  require(DIR_WS_BOXES . 'manufacturers.php');
   require(DIR_WS_BOXES . 'whats_new.php');
   require(DIR_WS_BOXES . 'search.php');
   require(DIR_WS_BOXES . 'information.php');

Index: footer.php
===================================================================
RCS file: /pack/cvsroots/oscommerce/catalog/catalog/includes/footer.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- footer.php	2003/02/10 22:30:54	1.26
+++ footer.php	2004/02/16 07:16:57	1.27
@@ -5,7 +5,7 @@
   osCommerce, Open Source E-Commerce Solutions
   http://www.oscommerce.com
 
-  Copyright (c) 2003 osCommerce
+  Copyright (c) 2004 osCommerce
 
   Released under the GNU General Public License
 */

Index: header.php
===================================================================
RCS file: /pack/cvsroots/oscommerce/catalog/catalog/includes/header.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- header.php	2003/11/17 17:35:04	1.43
+++ header.php	2004/02/16 07:16:57	1.44
@@ -64,24 +64,3 @@
     <td align="right" class="headerNavigation"><?php if ($osC_Customer->isLoggedOn()) { echo '<a href="' . tep_href_link(FILENAME_LOGOFF, '', 'SSL') . '" class="headerNavigation">' . HEADER_TITLE_LOGOFF . '</a> &nbsp;|&nbsp; '; } echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, '', 'SSL') . '" class="headerNavigation">' . HEADER_TITLE_MY_ACCOUNT . '</a> &nbsp;|&nbsp; <a href="' . tep_href_link(FILENAME_SHOPPING_CART) . '" class="headerNavigation">' . HEADER_TITLE_CART_CONTENTS . '</a> &nbsp;|&nbsp; <a href="' . tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL') . '" class="headerNavigation">' . HEADER_TITLE_CHECKOUT . '</a>'; ?>&nbsp;&nbsp;</td>
   </tr>
 </table>
-<?php
-  if (isset($_GET['error_message']) && tep_not_null($_GET['error_message'])) {
-?>
-<table border="0" width="100%" cellspacing="0" cellpadding="2">
-  <tr class="headerError">
-    <td class="headerError"><?php echo htmlspecialchars(urldecode($_GET['error_message'])); ?></td>
-  </tr>
-</table>
-<?php
-  }
-
-  if (isset($_GET['info_message']) && tep_not_null($_GET['info_message'])) {
-?>
-<table border="0" width="100%" cellspacing="0" cellpadding="2">
-  <tr class="headerInfo">
-    <td class="headerInfo"><?php echo htmlspecialchars($_GET['info_message']); ?></td>
-  </tr>
-</table>
-<?php
-  }
-?>



-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click