[TEP-COMMIT] [CVS catalog] updates for the new service modules

Commit in catalog/catalog/includes on MAIN

footer.php +2 -4 1.28 -> 1.29

header.php +6 -44 1.44 -> 1.45

+8 -48

2 modified files

updates for the new service modules

----------

catalog /catalog /includes

footer.php 1.28 -> 1.29

diff -u -r1.28 -r1.29
--- footer.php 2004/04/08 02:20:20 1.28
+++ footer.php 2004/04/13 08:08:41 1.29
@@ -9,13 +9,11 @@

Released under the GNU General Public License
*/

-
- require(DIR_WS_INCLUDES . 'counter.php');

?>
<table border="0" width="100%" cellspacing="0" cellpadding="1">
<tr class="footer">
<td class="footer">&nbsp;&nbsp;<?php echo strftime(DATE_FORMAT_LONG); ?>&nbsp;&nbsp;</td>

- <td align="right" class="footer">&nbsp;&nbsp;<?php echo $counter_now . ' ' . FOOTER_TEXT_REQUESTS_SINCE . ' ' . $counter_startdate_formatted; ?>&nbsp;&nbsp;</td>

+ <td align="right" class="footer">&nbsp;&nbsp;<?php if ($messageStack->size('counter')) echo $messageStack->outputPlain('counter'); ?>&nbsp;&nbsp;</td>

</tr>
</table>
<br>

@@ -45,7 +43,7 @@

</tr>
</table>
<?php

- if ($banner = tep_banner_exists('dynamic', '468x50')) {

+ if ($osC_Services->isStarted('banner') && ($banner = tep_banner_exists('dynamic', '468x50'))) {

?>
<br>
<table border="0" width="100%" cellspacing="0" cellpadding="0">

----------

catalog /catalog /includes

header.php 1.44 -> 1.45

diff -u -r1.44 -r1.45
--- header.php 2004/02/16 07:16:57 1.44
+++ header.php 2004/04/13 08:08:41 1.45
@@ -5,52 +5,10 @@

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
*/

-
-// check if the 'install' directory exists, and warn of its existence
- if (WARN_INSTALL_EXISTENCE == 'true') {
- if (file_exists(dirname($_SERVER['SCRIPT_FILENAME']) . '/install')) {
- $messageStack->add('header', WARNING_INSTALL_DIRECTORY_EXISTS, 'warning');
- }
- }
-
-// check if the configure.php file is writeable
- if (WARN_CONFIG_WRITEABLE == 'true') {
- if ( (file_exists(dirname($_SERVER['SCRIPT_FILENAME']) . '/includes/configure.php')) && (is_writeable(dirname($_SERVER['SCRIPT_FILENAME']) . '/includes/configure.php')) ) {
- $messageStack->add('header', WARNING_CONFIG_FILE_WRITEABLE, 'warning');
- }
- }
-
-// check if the session folder is writeable
- if (WARN_SESSION_DIRECTORY_NOT_WRITEABLE == 'true') {
- if (STORE_SESSIONS == '') {
- if (!is_dir($osC_Session->save_path)) {
- $messageStack->add('header', WARNING_SESSION_DIRECTORY_NON_EXISTENT, 'warning');
- } elseif (!is_writeable($osC_Session->save_path)) {
- $messageStack->add('header', WARNING_SESSION_DIRECTORY_NOT_WRITEABLE, 'warning');
- }
- }
- }
-
-// check session.auto_start is disabled
- if ( (function_exists('ini_get')) && (WARN_SESSION_AUTO_START == 'true') ) {
- if (ini_get('session.auto_start') == '1') {
- $messageStack->add('header', WARNING_SESSION_AUTO_START, 'warning');
- }
- }
-
- if ( (WARN_DOWNLOAD_DIRECTORY_NOT_READABLE == 'true') && (DOWNLOAD_ENABLED == 'true') ) {
- if (!is_dir(DIR_FS_DOWNLOAD)) {
- $messageStack->add('header', WARNING_DOWNLOAD_DIRECTORY_NON_EXISTENT, 'warning');
- }
- }
-
- if ($messageStack->size('header') > 0) {
- echo $messageStack->output('header');
- }

?>
<table border="0" width="100%" cellspacing="0" cellpadding="0">
<tr class="header">

@@ -60,7 +18,11 @@

</table>
<table border="0" width="100%" cellspacing="0" cellpadding="1">
<tr class="headerNavigation">

- <td class="headerNavigation">&nbsp;&nbsp;<?php echo $breadcrumb->trail(' &raquo; '); ?></td>

+<?php
+ if ($osC_Services->isStarted('breadcrumb')) {
+ echo ' <td class="headerNavigation">&nbsp;&nbsp;' . $breadcrumb->trail(' &raquo; ') . '</td>' . "\n";
+ }
+?>

<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>

CVSspam 0.2.8

-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click