[TEP-COMMIT] [CVS catalog] remove redundant files
hpdl-OfajU3CKLf1/[email protected] 29 Mar 2005 23:41:04 -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">account_edit.php</span></tt></td><td></td><td></td><td nowrap="nowrap"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/account_edit.php?rev=1.68&content-type=text/vnd.viewcvs-markup">1.68</a> removed</td></tr>
<tr class="alt"><td><tt><span id="removed">account_history.php</span></tt></td><td></td><td></td><td nowrap="nowrap"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/account_history.php?rev=1.65&content-type=text/vnd.viewcvs-markup">1.65</a> removed</td></tr>
<tr><td><tt><span id="removed">account_history_info.php</span></tt></td><td></td><td></td><td nowrap="nowrap"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/account_history_info.php?rev=1.103&content-type=text/vnd.viewcvs-markup">1.103</a> removed</td></tr>
<tr class="alt"><td><tt><span id="removed">account_newsletters.php</span></tt></td><td></td><td></td><td nowrap="nowrap"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/account_newsletters.php?rev=1.8&content-type=text/vnd.viewcvs-markup">1.8</a> removed</td></tr>
<tr><td><tt><span id="removed">account_notifications.php</span></tt></td><td></td><td></td><td nowrap="nowrap"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/account_notifications.php?rev=1.6&content-type=text/vnd.viewcvs-markup">1.6</a> removed</td></tr>
<tr class="alt"><td><tt><span id="removed">account_password.php</span></tt></td><td></td><td></td><td nowrap="nowrap"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/account_password.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a> removed</td></tr>
<tr><td><tt><span id="removed">address_book.php</span></tt></td><td></td><td></td><td nowrap="nowrap"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/address_book.php?rev=1.61&content-type=text/vnd.viewcvs-markup">1.61</a> removed</td></tr>
<tr class="alt"><td><tt><span id="removed">address_book_process.php</span></tt></td><td></td><td></td><td nowrap="nowrap"><a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/address_book_process.php?rev=1.84&content-type=text/vnd.viewcvs-markup">1.84</a> removed</td></tr>
</table>
<small id="info">8 removed files</small><br />
<pre class="comment">
remove redundant files
</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>account_edit.php</b></big> <small id="info">removed after <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/account_edit.php?rev=1.68&content-type=text/vnd.viewcvs-markup">1.68</a></small></div>
<pre class="diff"><small id="info">diff -N account_edit.php
--- /tmp/cvsAAAEraOpG Wed Mar 30 01:40:54 2005
+++ /dev/null Wed Mar 30 01:40:48 2005
@@ -1,245 +0,0 @@
</small></pre><pre class="diff" id="removed">-<?php
-/*
- $Id$
-
- osCommerce, Open Source E-Commerce Solutions
- http://www.oscommerce.com
-
- Copyright (c) 2004 osCommerce
-
- Released under the GNU General Public License
-*/
-
- require('includes/application_top.php');
-
- if ($osC_Customer->isLoggedOn() == false) {
- $navigation->set_snapshot();
-
- tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
- }
-
-// needs to be included earlier to set the success message in the messageStack
- require(DIR_WS_LANGUAGES . $osC_Session->value('language') . '/' . FILENAME_ACCOUNT_EDIT);
-
- if (isset($_POST['action']) && ($_POST['action'] == 'process')) {
- if (ACCOUNT_GENDER > 0) {
- if (!isset($_POST['gender']) || (($_POST['gender'] != 'm') && ($_POST['gender'] != 'f'))) {
- $messageStack->add('account_edit', ENTRY_GENDER_ERROR);
- }
- }
-
- if (!isset($_POST['firstname']) || (strlen(trim($_POST['firstname'])) < ACCOUNT_FIRST_NAME)) {
- $messageStack->add('account_edit', ENTRY_FIRST_NAME_ERROR);
- }
-
- if (!isset($_POST['lastname']) || (strlen(trim($_POST['lastname'])) < ACCOUNT_LAST_NAME)) {
- $messageStack->add('account_edit', ENTRY_LAST_NAME_ERROR);
- }
-
- if (ACCOUNT_DATE_OF_BIRTH > -1) {
- if (isset($_POST['dob_days']) && isset($_POST['dob_months']) && isset($_POST['dob_years']) && checkdate($_POST['dob_months'], $_POST['dob_days'], $_POST['dob_years'])) {
- $dob = mktime(0, 0, 0, $_POST['dob_months'], $_POST['dob_days'], $_POST['dob_years']);
- } else {
- $messageStack->add('account_edit', ENTRY_DATE_OF_BIRTH_ERROR);
- }
- }
-
- if (!isset($_POST['email_address']) || (strlen(trim($_POST['email_address'])) < ACCOUNT_EMAIL_ADDRESS)) {
- $messageStack->add('account_edit', ENTRY_EMAIL_ADDRESS_ERROR);
- } else {
- if (tep_validate_email($_POST['email_address']) == false) {
- $messageStack->add('account_edit', ENTRY_EMAIL_ADDRESS_CHECK_ERROR);
- } else {
- $Qcheck = $osC_Database->query('select customers_id from :table_customers where customers_email_address = :customers_email_address and customers_id != :customers_id limit 1');
- $Qcheck->bindRaw(':table_customers', TABLE_CUSTOMERS);
- $Qcheck->bindValue(':customers_email_address', trim($_POST['email_address']));
- $Qcheck->bindInt(':customers_id', $osC_Customer->id);
- $Qcheck->execute();
-
- if ($Qcheck->numberOfRows() > 0) {
- $messageStack->add('account_edit', ENTRY_EMAIL_ADDRESS_ERROR_EXISTS);
- }
-
- $Qcheck->freeResult();
- }
- }
-
- if ($messageStack->size('account_edit') === 0) {
- $Qcustomer = $osC_Database->query('update :table_customers set customers_gender = :customers_gender, customers_firstname = :customers_firstname, customers_lastname = :customers_lastname, customers_email_address = :customers_email_address, customers_dob = :customers_dob where customers_id = :customers_id');
- $Qcustomer->bindRaw(':table_customers', TABLE_CUSTOMERS);
- $Qcustomer->bindValue(':customers_gender', (((ACCOUNT_GENDER > -1) && isset($_POST['gender']) && (($_POST['gender'] == 'm') || ($_POST['gender'] == 'f'))) ? $_POST['gender'] : ''));
- $Qcustomer->bindValue(':customers_firstname', trim($_POST['firstname']));
- $Qcustomer->bindValue(':customers_lastname', trim($_POST['lastname']));
- $Qcustomer->bindValue(':customers_email_address', trim($_POST['email_address']));
- $Qcustomer->bindValue(':customers_dob', ((ACCOUNT_DATE_OF_BIRTH > -1) ? date('Ymd', $dob) : ''));
- $Qcustomer->bindInt(':customers_id', $osC_Customer->id);
- $Qcustomer->execute();
-
- $Qupdate = $osC_Database->query('update :table_customers_info set customers_info_date_account_last_modified = now() where customers_info_id = :customers_info_id');
- $Qupdate->bindRaw(':table_customers_info', TABLE_CUSTOMERS_INFO);
- $Qupdate->bindInt(':customers_info_id', $osC_Customer->id);
- $Qupdate->execute();
-
-// reset the session variables
- if (ACCOUNT_GENDER > -1) {
- $osC_Customer->setGender($_POST['gender']);
- }
- $osC_Customer->setFirstName(trim($_POST['firstname']));
- $osC_Customer->setLastName(trim($_POST['lastname']));
- $osC_Customer->setFullName();
- $osC_Customer->setEmailAddress(trim($_POST['email_address']));
-
- $messageStack->add_session('account', SUCCESS_ACCOUNT_UPDATED, 'success');
-
- tep_redirect(tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
- }
- }
-
- $Qaccount = $osC_Database->query('select customers_gender, customers_firstname, customers_lastname, unix_timestamp(customers_dob) as customers_dob, customers_email_address from :table_customers where customers_id = :customers_id');
- $Qaccount->bindRaw(':table_customers', TABLE_CUSTOMERS);
- $Qaccount->bindInt(':customers_id', $osC_Customer->id);
- $Qaccount->execute();
-
- $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
- $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link(FILENAME_ACCOUNT_EDIT, '', 'SSL'));
-?>
-<!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">
-<?php require('includes/form_check.js.php'); ?>
-<script language="javascript" src="includes/general.js"></script>
-</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('account_edit', tep_href_link(FILENAME_ACCOUNT_EDIT, '', 'SSL'), 'post', 'onSubmit="return check_form(account_edit);"') . osc_draw_hidden_field('action', 'process'); ?><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_account.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 ($messageStack->size('account_edit') > 0) {
-?>
- <tr>
- <td><?php echo $messageStack->output('account_edit'); ?></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
-<?php
- }
-?>
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main"><b><?php echo MY_ACCOUNT_TITLE; ?></b></td>
- <td class="inputRequirement" align="right"><?php echo FORM_REQUIRED_INFORMATION; ?></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td><table border="0" cellspacing="2" cellpadding="2">
-<?php
- if (ACCOUNT_GENDER > -1) {
- $gender_array = array(array('id' => 'm', 'text' => MALE),
- array('id' => 'f', 'text' => FEMALE));
-?>
- <tr>
- <td class="main"><?php echo ENTRY_GENDER; ?></td>
- <td class="main"><?php echo osc_draw_radio_field('gender', $gender_array, $Qaccount->value('customers_gender'), '', (ACCOUNT_GENDER > 0)); ?></td>
- </tr>
-<?php
- }
-?>
- <tr>
- <td class="main"><?php echo ENTRY_FIRST_NAME; ?></td>
- <td class="main"><?php echo osc_draw_input_field('firstname', $Qaccount->value('customers_firstname'), '', true); ?></td>
- </tr>
- <tr>
- <td class="main"><?php echo ENTRY_LAST_NAME; ?></td>
- <td class="main"><?php echo osc_draw_input_field('lastname', $Qaccount->value('customers_lastname'), '', true); ?></td>
- </tr>
-<?php
- if (ACCOUNT_DATE_OF_BIRTH > -1) {
-?>
- <tr>
- <td class="main"><?php echo ENTRY_DATE_OF_BIRTH; ?></td>
- <td class="main"><?php echo tep_draw_date_pull_down_menu('dob', $Qaccount->value('customers_dob'), false, true, true, date('Y')-1901, -5) . '&nbsp;<span class="inputRequirement">*</span>'; ?></td>
- </tr>
-<?php
- }
-?>
- <tr>
- <td colspan="2"><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
- <tr>
- <td class="main"><?php echo ENTRY_EMAIL_ADDRESS; ?></td>
- <td class="main"><?php echo osc_draw_input_field('email_address', $Qaccount->value('customers_email_address'), '', true); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- </table></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><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, '', 'SSL') . '">' . tep_image_button('button_back.gif', IMAGE_BUTTON_BACK) . '</a>'; ?></td>
- <td align="right"><?php echo tep_image_submit('button_continue.gif', IMAGE_BUTTON_CONTINUE); ?></td>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- </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'); ?>
<hr /><a name="file2" /><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>account_history.php</b></big> <small id="info">removed after <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/account_history.php?rev=1.65&content-type=text/vnd.viewcvs-markup">1.65</a></small></div>
<pre class="diff"><small id="info">diff -N account_history.php
--- /tmp/cvsAAAKtaWpG Wed Mar 30 01:40:54 2005
+++ /dev/null Wed Mar 30 01:40:48 2005
@@ -1,181 +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');
-
- if ($osC_Customer->isLoggedOn() == false) {
- $navigation->set_snapshot();
-
- tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
- }
-
- if (!isset($_GET['page']) || (isset($_GET['page']) && !is_numeric($_GET['page']))) {
- $_GET['page'] = 1;
- }
-
- require(DIR_WS_LANGUAGES . $osC_Session->value('language') . '/' . FILENAME_ACCOUNT_HISTORY);
-
- $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
- $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link(FILENAME_ACCOUNT_HISTORY, '', 'SSL'));
-?>
-<!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"><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_history.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>
- <tr>
- <td>
-<?php
- $orders_total = tep_count_customer_orders();
-
- if ($orders_total > 0) {
- $Qhistory = $osC_Database->query('select o.orders_id, o.date_purchased, o.delivery_name, o.billing_name, 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');
- $Qhistory->bindTable(':table_orders', TABLE_ORDERS);
- $Qhistory->bindTable(':table_orders_total', TABLE_ORDERS_TOTAL);
- $Qhistory->bindTable(':table_orders_status', TABLE_ORDERS_STATUS);
- $Qhistory->bindInt(':customers_id', $osC_Customer->id);
- $Qhistory->bindValue(':class', 'ot_total');
- $Qhistory->bindInt(':language_id', $osC_Session->value('languages_id'));
- $Qhistory->setBatchLimit($_GET['page'], MAX_DISPLAY_ORDER_HISTORY);
- $Qhistory->execute();
-
- while ($Qhistory->next()) {
- $Qproducts = $osC_Database->query('select count(*) as count from :table_orders_products where orders_id = :orders_id');
- $Qproducts->bindTable(':table_orders_products', TABLE_ORDERS_PRODUCTS);
- $Qproducts->bindInt(':orders_id', $Qhistory->valueInt('orders_id'));
- $Qproducts->execute();
-
- if (tep_not_null($Qhistory->value('delivery_name'))) {
- $order_type = TEXT_ORDER_SHIPPED_TO;
- $order_name = $Qhistory->value('delivery_name');
- } else {
- $order_type = TEXT_ORDER_BILLED_TO;
- $order_name = $Qhistory->value('billing_name');
- }
-?>
- <table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main"><?php echo '<b>' . TEXT_ORDER_NUMBER . '</b> ' . $Qhistory->valueInt('orders_id'); ?></td>
- <td class="main" align="right"><?php echo '<b>' . TEXT_ORDER_STATUS . '</b> ' . $Qhistory->value('orders_status_name'); ?></td>
- </tr>
- </table>
- <table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td><table border="0" width="100%" cellspacing="2" cellpadding="4">
- <tr>
- <td class="main" width="50%" valign="top"><?php echo '<b>' . TEXT_ORDER_DATE . '</b> ' . tep_date_long($Qhistory->value('date_purchased')) . '<br><b>' . $order_type . '</b> ' . tep_output_string_protected($order_name); ?></td>
- <td class="main" width="30%" valign="top"><?php echo '<b>' . TEXT_ORDER_PRODUCTS . '</b> ' . $Qproducts->valueInt('count') . '<br><b>' . TEXT_ORDER_COST . '</b> ' . strip_tags($Qhistory->value('order_total')); ?></td>
- <td class="main" width="20%"><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT_HISTORY_INFO, (isset($_GET['page']) ? 'page=' . $_GET['page'] . '&' : '') . 'order_id=' . $Qhistory->valueInt('orders_id'), 'SSL') . '">' . tep_image_button('small_view.gif', SMALL_IMAGE_BUTTON_VIEW) . '</a>'; ?></td>
- </tr>
- </table></td>
- </tr>
- </table>
- <table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
- </table>
-<?php
- }
- } else {
-?>
- <table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td><table border="0" width="100%" cellspacing="2" cellpadding="4">
- <tr>
- <td class="main"><?php echo TEXT_NO_PURCHASES; ?></td>
- </tr>
- </table></td>
- </tr>
- </table>
-<?php
- }
-?>
- </td>
- </tr>
-<?php
- if ($orders_total > 0) {
-?>
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td class="smallText" valign="top"><?php echo $Qhistory->displayBatchLinksTotal(TEXT_DISPLAY_NUMBER_OF_ORDERS); ?></td>
- <td class="smallText" align="right"><?php echo $Qhistory->displayBatchLinksPullDown(); ?></td>
- </tr>
- </table></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><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, '', 'SSL') . '">' . tep_image_button('button_back.gif', IMAGE_BUTTON_BACK) . '</a>'; ?></td>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- </table></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'); ?>
<hr /><a name="file3" /><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>account_history_info.php</b></big> <small id="info">removed after <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/account_history_info.php?rev=1.103&content-type=text/vnd.viewcvs-markup">1.103</a></small></div>
<pre class="diff"><small id="info">diff -N account_history_info.php
--- /tmp/cvsAAA7AaGqG Wed Mar 30 01:40:54 2005
+++ /dev/null Wed Mar 30 01:40:48 2005
@@ -1,272 +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');
-
- if ($osC_Customer->isLoggedOn() == false) {
- $navigation->set_snapshot();
-
- tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
- }
-
- if (!isset($_GET['order_id']) || (isset($_GET['order_id']) && !is_numeric($_GET['order_id']))) {
- tep_redirect(tep_href_link(FILENAME_ACCOUNT_HISTORY, '', 'SSL'));
- }
-
- $Qcheck = $osC_Database->query('select customers_id from :table_orders where orders_id = :orders_id');
- $Qcheck->bindTable(':table_orders', TABLE_ORDERS);
- $Qcheck->bindInt(':orders_id', $_GET['order_id']);
- $Qcheck->execute();
-
- if ($Qcheck->valueInt('customers_id') != $osC_Customer->id) {
- tep_redirect(tep_href_link(FILENAME_ACCOUNT_HISTORY, '', 'SSL'));
- }
-
- require(DIR_WS_LANGUAGES . $osC_Session->value('language') . '/' . FILENAME_ACCOUNT_HISTORY_INFO);
-
- $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
- $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link(FILENAME_ACCOUNT_HISTORY, '', 'SSL'));
- $breadcrumb->add(sprintf(NAVBAR_TITLE_3, $_GET['order_id']), tep_href_link(FILENAME_ACCOUNT_HISTORY_INFO, 'order_id=' . $_GET['order_id'], 'SSL'));
-
- require(DIR_WS_CLASSES . 'order.php');
- $order = new order($_GET['order_id']);
-?>
-<!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"><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_history.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>
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main" colspan="2"><b><?php echo sprintf(HEADING_ORDER_NUMBER, $_GET['order_id']) . ' <small>(' . $order->info['orders_status'] . ')</small>'; ?></b></td>
- </tr>
- <tr>
- <td class="smallText"><?php echo HEADING_ORDER_DATE . ' ' . tep_date_long($order->info['date_purchased']); ?></td>
- <td class="smallText" align="right"><?php echo HEADING_ORDER_TOTAL . ' ' . $order->info['total']; ?></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
-<?php
- if ($order->delivery != false) {
-?>
- <td width="30%" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main"><b><?php echo HEADING_DELIVERY_ADDRESS; ?></b></td>
- </tr>
- <tr>
- <td class="main"><?php echo tep_address_format($order->delivery['format_id'], $order->delivery, 1, ' ', '<br>'); ?></td>
- </tr>
-<?php
- if (tep_not_null($order->info['shipping_method'])) {
-?>
- <tr>
- <td class="main"><b><?php echo HEADING_SHIPPING_METHOD; ?></b></td>
- </tr>
- <tr>
- <td class="main"><?php echo $order->info['shipping_method']; ?></td>
- </tr>
-<?php
- }
-?>
- </table></td>
-<?php
- }
-?>
- <td width="<?php echo (($order->delivery != false) ? '70%' : '100%'); ?>" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
-<?php
- if (sizeof($order->info['tax_groups']) > 1) {
-?>
- <tr>
- <td class="main" colspan="2"><b><?php echo HEADING_PRODUCTS; ?></b></td>
- <td class="smallText" align="right"><b><?php echo HEADING_TAX; ?></b></td>
- <td class="smallText" align="right"><b><?php echo HEADING_TOTAL; ?></b></td>
- </tr>
-<?php
- } else {
-?>
- <tr>
- <td class="main" colspan="3"><b><?php echo HEADING_PRODUCTS; ?></b></td>
- </tr>
-<?php
- }
-
- for ($i=0, $n=sizeof($order->products); $i<$n; $i++) {
- echo ' <tr>' . "\n" .
- ' <td class="main" align="right" valign="top" width="30">' . $order->products[$i]['qty'] . '&nbsp;x</td>' . "\n" .
- ' <td class="main" valign="top">' . $order->products[$i]['name'];
-
- if ( (isset($order->products[$i]['attributes'])) && (sizeof($order->products[$i]['attributes']) > 0) ) {
- for ($j=0, $n2=sizeof($order->products[$i]['attributes']); $j<$n2; $j++) {
- echo '<br><nobr><small>&nbsp;<i> - ' . $order->products[$i]['attributes'][$j]['option'] . ': ' . $order->products[$i]['attributes'][$j]['value'] . '</i></small></nobr>';
- }
- }
-
- echo '</td>' . "\n";
-
- if (sizeof($order->info['tax_groups']) > 1) {
- echo ' <td class="main" valign="top" align="right">' . tep_display_tax_value($order->products[$i]['tax']) . '%</td>' . "\n";
- }
-
- echo ' <td class="main" align="right" valign="top">' . $osC_Currencies->format(tep_add_tax($order->products[$i]['final_price'], $order->products[$i]['tax']) * $order->products[$i]['qty'], $order->info['currency'], $order->info['currency_value']) . '</td>' . "\n" .
- ' </tr>' . "\n";
- }
-?>
- </table></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
- <tr>
- <td class="main"><b><?php echo HEADING_BILLING_INFORMATION; ?></b></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 width="30%" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main"><b><?php echo HEADING_BILLING_ADDRESS; ?></b></td>
- </tr>
- <tr>
- <td class="main"><?php echo tep_address_format($order->billing['format_id'], $order->billing, 1, ' ', '<br>'); ?></td>
- </tr>
- <tr>
- <td class="main"><b><?php echo HEADING_PAYMENT_METHOD; ?></b></td>
- </tr>
- <tr>
- <td class="main"><?php echo $order->info['payment_method']; ?></td>
- </tr>
- </table></td>
- <td width="70%" valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="2">
-<?php
- for ($i=0, $n=sizeof($order->totals); $i<$n; $i++) {
- echo ' <tr>' . "\n" .
- ' <td class="main" align="right" width="100%">' . $order->totals[$i]['title'] . '</td>' . "\n" .
- ' <td class="main" align="right">' . $order->totals[$i]['text'] . '</td>' . "\n" .
- ' </tr>' . "\n";
- }
-?>
- </table></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
- <tr>
- <td class="main"><b><?php echo HEADING_ORDER_HISTORY; ?></b></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 valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="2">
-<?php
- $Qstatus = $osC_Database->query('select os.orders_status_name, osh.date_added, osh.comments from :table_orders_status os, :table_orders_status_history osh where osh.orders_id = :orders_id and osh.orders_status_id = os.orders_status_id and os.language_id = :language_id order by osh.date_added');
- $Qstatus->bindTable(':table_orders_status', TABLE_ORDERS_STATUS);
- $Qstatus->bindTable(':table_orders_status_history', TABLE_ORDERS_STATUS_HISTORY);
- $Qstatus->bindInt(':orders_id', $_GET['order_id']);
- $Qstatus->bindInt(':language_id', $osC_Session->value('languages_id'));
- $Qstatus->execute();
-
- while ($Qstatus->next()) {
- echo ' <tr>' . "\n" .
- ' <td class="main" valign="top" width="70">' . tep_date_short($Qstatus->value('date_added')) . '</td>' . "\n" .
- ' <td class="main" valign="top" width="70">' . $Qstatus->value('orders_status_name') . '</td>' . "\n" .
- ' <td class="main" valign="top">' . (tep_not_null($Qstatus->valueProtected('comments')) ? nl2br($Qstatus->valueProtected('comments')) : '&nbsp;') . '</td>' . "\n" .
- ' </tr>' . "\n";
- }
-?>
- </table></td>
- </tr>
- </table></td>
- </tr>
-<?php
- if (DOWNLOAD_ENABLED == 'true') include(DIR_WS_MODULES . 'downloads.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><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT_HISTORY, tep_get_all_get_params(array('order_id')), 'SSL') . '">' . tep_image_button('button_back.gif', IMAGE_BUTTON_BACK) . '</a>'; ?></td>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- </table></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'); ?>
<hr /><a name="file4" /><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>account_newsletters.php</b></big> <small id="info">removed after <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/account_newsletters.php?rev=1.8&content-type=text/vnd.viewcvs-markup">1.8</a></small></div>
<pre class="diff"><small id="info">diff -N account_newsletters.php
--- /tmp/cvsAAAOBaWqG Wed Mar 30 01:40:54 2005
+++ /dev/null Wed Mar 30 01:40:48 2005
@@ -1,168 +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');
-
- if ($osC_Customer->isLoggedOn() == false) {
- $navigation->set_snapshot();
-
- tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
- }
-
-// needs to be included earlier to set the success message in the messageStack
- require(DIR_WS_LANGUAGES . $osC_Session->value('language') . '/' . FILENAME_ACCOUNT_NEWSLETTERS);
-
- $Qnewsletter = $osC_Database->query('select customers_newsletter from :table_customers where customers_id = :customers_id');
- $Qnewsletter->bindTable(':table_customers', TABLE_CUSTOMERS);
- $Qnewsletter->bindInt(':customers_id', $osC_Customer->id);
- $Qnewsletter->execute();
-
- if (isset($_POST['action']) && ($_POST['action'] == 'process')) {
- if (isset($_POST['newsletter_general']) && is_numeric($_POST['newsletter_general'])) {
- $newsletter_general = $_POST['newsletter_general'];
- } else {
- $newsletter_general = '0';
- }
-
- if ($newsletter_general != $Qnewsletter->valueInt('customers_newsletter')) {
- $newsletter_general = (($Qnewsletter->value('customers_newsletter') == '1') ? '0' : '1');
-
- $Qupdate = $osC_Database->query('update :table_customers set customers_newsletter = :customers_newsletter where customers_id = :customers_id');
- $Qupdate->bindTable(':table_customers', TABLE_CUSTOMERS);
- $Qupdate->bindInt(':customers_newsletter', $newsletter_general);
- $Qupdate->bindInt(':customers_id', $osC_Customer->id);
- $Qupdate->execute();
-
- if ($Qupdate->affectedRows() === 1) {
- $messageStack->add_session('account', SUCCESS_NEWSLETTER_UPDATED, 'success');
- }
- }
-
- tep_redirect(tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
- }
-
- $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
- $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link(FILENAME_ACCOUNT_NEWSLETTERS, '', 'SSL'));
-?>
-<!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">
-<script language="javascript"><!--
-function rowOverEffect(object) {
- if (object.className == 'moduleRow') object.className = 'moduleRowOver';
-}
-
-function rowOutEffect(object) {
- if (object.className == 'moduleRowOver') object.className = 'moduleRow';
-}
-
-function checkBox(object) {
- document.account_newsletter.elements[object].checked = !document.account_newsletter.elements[object].checked;
-}
-//--></script>
-</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('account_newsletter', tep_href_link(FILENAME_ACCOUNT_NEWSLETTERS, '', 'SSL')) . osc_draw_hidden_field('action', 'process'); ?><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_account.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>
- <tr>
- <td class="main"><b><?php echo MY_NEWSLETTERS_TITLE; ?></b></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><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr class="moduleRow" onmouseover="rowOverEffect(this)" onmouseout="rowOutEffect(this)" onclick="checkBox('newsletter_general')">
- <td class="main"><?php echo osc_draw_checkbox_field('newsletter_general', '1', $Qnewsletter->value('customers_newsletter'), 'onclick="checkBox(\'newsletter_general\')"'); ?></td>
- <td class="main"><b><?php echo MY_NEWSLETTERS_GENERAL_NEWSLETTER; ?></b></td>
- </tr>
- <tr>
- <td class="main">&nbsp;</td>
- <td><table border="0" cellspacing="0" cellpadding="2">
- <tr>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td class="main"><?php echo MY_NEWSLETTERS_GENERAL_NEWSLETTER_DESCRIPTION; ?></td>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></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><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, '', 'SSL') . '">' . tep_image_button('button_back.gif', IMAGE_BUTTON_BACK) . '</a>'; ?></td>
- <td align="right"><?php echo tep_image_submit('button_continue.gif', IMAGE_BUTTON_CONTINUE); ?></td>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- </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'); ?>
<hr /><a name="file5" /><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>account_notifications.php</b></big> <small id="info">removed after <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/account_notifications.php?rev=1.6&content-type=text/vnd.viewcvs-markup">1.6</a></small></div>
<pre class="diff"><small id="info">diff -N account_notifications.php
--- /tmp/cvsAAAjCa4qG Wed Mar 30 01:40:54 2005
+++ /dev/null Wed Mar 30 01:40:48 2005
@@ -1,295 +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');
-
- if ($osC_Customer->isLoggedOn() == false) {
- $navigation->set_snapshot();
-
- tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
- }
-
-// needs to be included earlier to set the success message in the messageStack
- require(DIR_WS_LANGUAGES . $osC_Session->value('language') . '/' . FILENAME_ACCOUNT_NOTIFICATIONS);
-
- $Qglobal = $osC_Database->query('select global_product_notifications from :table_customers_info where customers_info_id = :customers_info_id');
- $Qglobal->bindTable(':table_customers_info', TABLE_CUSTOMERS_INFO);
- $Qglobal->bindInt(':customers_info_id', $osC_Customer->id);
- $Qglobal->execute();
-
- if (isset($_POST['action']) && ($_POST['action'] == 'process')) {
- $updated = false;
-
- if (isset($_POST['product_global']) && is_numeric($_POST['product_global'])) {
- $product_global = $_POST['product_global'];
- } else {
- $product_global = '0';
- }
-
- if (isset($_POST['products'])) {
- (array)$products = $_POST['products'];
- } else {
- $products = array();
- }
-
- if ($product_global != $Qglobal->valueInt('global_product_notifications')) {
- $product_global = (($Qglobal->valueInt('global_product_notifications') == '1') ? '0' : '1');
-
- $Qupdate = $osC_Database->query('update :table_customers_info set global_product_notifications = :global_product_notifications where customers_info_id = :customers_info_id');
- $Qupdate->bindTable(':table_customers_info', TABLE_CUSTOMERS_INFO);
- $Qupdate->bindInt(':global_product_notifications', $product_global);
- $Qupdate->bindInt(':customers_info_id', $osC_Customer->id);
- $Qupdate->execute();
-
- if ($Qupdate->affectedRows() == 1) {
- $updated = true;
- }
- } elseif (sizeof($products) > 0) {
- $products_parsed = tep_array_filter($products, 'is_numeric');
-
- if (sizeof($products_parsed) > 0) {
- $Qcheck = $osC_Database->query('select count(*) as total from :table_products_notifications where customers_id = :customers_id and products_id not in :products_id');
- $Qcheck->bindTable(':table_products_notifications', TABLE_PRODUCTS_NOTIFICATIONS);
- $Qcheck->bindInt(':customers_id', $osC_Customer->id);
- $Qcheck->bindRaw(':products_id', '(' . implode(',', $products_parsed) . ')');
- $Qcheck->execute();
-
- if ($Qcheck->valueInt('total') > 0) {
- $Qdelete = $osC_Database->query('delete from :table_products_notifications where customers_id = :customers_id and products_id not in :products_id');
- $Qdelete->bindTable(':table_products_notifications', TABLE_PRODUCTS_NOTIFICATIONS);
- $Qdelete->bindInt(':customers_id', $osC_Customer->id);
- $Qdelete->bindRaw(':products_id', '(' . implode(',', $products_parsed) . ')');
- $Qdelete->execute();
-
- if ($Qdelete->affectedRows() > 0) {
- $updated = true;
- }
- }
- }
- } else {
- $Qcheck = $osC_Database->query('select count(*) as total from :table_products_notifications where customers_id = :customers_id');
- $Qcheck->bindTable(':table_products_notifications', TABLE_PRODUCTS_NOTIFICATIONS);
- $Qcheck->bindInt(':customers_id', $osC_Customer->id);
- $Qcheck->execute();
-
- if ($Qcheck->valueInt('total') > 0) {
- $Qdelete = $osC_Database->query('delete from :table_products_notifications where customers_id = :customers_id');
- $Qdelete->bindTable(':table_products_notifications', TABLE_PRODUCTS_NOTIFICATIONS);
- $Qdelete->bindInt(':customers_id', $osC_Customer->id);
- $Qdelete->execute();
-
- if ($Qdelete->affectedRows() > 0) {
- $updated = true;
- }
- }
- }
-
- if ($updated === true) {
- $messageStack->add_session('account', SUCCESS_NOTIFICATIONS_UPDATED, 'success');
- }
-
- tep_redirect(tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
- }
-
- $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
- $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link(FILENAME_ACCOUNT_NOTIFICATIONS, '', 'SSL'));
-?>
-<!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">
-<script language="javascript"><!--
-function rowOverEffect(object) {
- if (object.className == 'moduleRow') object.className = 'moduleRowOver';
-}
-
-function rowOutEffect(object) {
- if (object.className == 'moduleRowOver') object.className = 'moduleRow';
-}
-
-function checkBox(object) {
- document.account_notifications.elements[object].checked = !document.account_notifications.elements[object].checked;
-}
-//--></script>
-</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('account_notifications', tep_href_link(FILENAME_ACCOUNT_NOTIFICATIONS, '', 'SSL')) . osc_draw_hidden_field('action', 'process'); ?><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_account.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>
- <tr>
- <td class="main"><b><?php echo MY_NOTIFICATIONS_TITLE; ?></b></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><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td class="main"><?php echo MY_NOTIFICATIONS_DESCRIPTION; ?></td>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
- <tr>
- <td class="main"><b><?php echo GLOBAL_NOTIFICATIONS_TITLE; ?></b></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><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr class="moduleRow" onmouseover="rowOverEffect(this)" onmouseout="rowOutEffect(this)" onclick="checkBox('product_global')">
- <td class="main" width="30"><?php echo osc_draw_checkbox_field('product_global', '1', $Qglobal->valueInt('global_product_notifications'), 'onclick="checkBox(\'product_global\')"'); ?></td>
- <td class="main"><b><?php echo GLOBAL_NOTIFICATIONS_TITLE; ?></b></td>
- </tr>
- <tr>
- <td width="30">&nbsp;</td>
- <td class="main"><?php echo GLOBAL_NOTIFICATIONS_DESCRIPTION; ?></td>
- </tr>
- </table></td>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
-<?php
- if ($Qglobal->valueInt('global_product_notifications') != '1') {
-?>
- <tr>
- <td class="main"><b><?php echo NOTIFICATIONS_TITLE; ?></b></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><table border="0" width="100%" cellspacing="0" cellpadding="2">
-<?php
- $Qcheck = $osC_Database->query('select count(*) as total from :table_products_notifications where customers_id = :customers_id');
- $Qcheck->bindTable(':table_products_notifications', TABLE_PRODUCTS_NOTIFICATIONS);
- $Qcheck->bindInt(':customers_id', $osC_Customer->id);
- $Qcheck->execute();
-
- if ($Qcheck->valueInt('total') > 0) {
-?>
- <tr>
- <td class="main" colspan="2"><?php echo NOTIFICATIONS_DESCRIPTION; ?></td>
- </tr>
-<?php
- $counter = 0;
-
- $Qproducts = $osC_Database->query('select pd.products_id, pd.products_name from :table_products_description pd, :table_products_notifications pn where pn.customers_id = :customers_id and pn.products_id = pd.products_id and pd.language_id = :language_id order by pd.products_name');
- $Qproducts->bindTable(':table_products_description', TABLE_PRODUCTS_DESCRIPTION);
- $Qproducts->bindTable(':table_products_notifications', TABLE_PRODUCTS_NOTIFICATIONS);
- $Qproducts->bindInt(':customers_id', $osC_Customer->id);
- $Qproducts->bindInt(':language_id', $osC_Session->value('languages_id'));
- $Qproducts->execute();
-
- while ($Qproducts->next()) {
-?>
- <tr class="moduleRow" onmouseover="rowOverEffect(this)" onmouseout="rowOutEffect(this)" onclick="checkBox('products[<?php echo $counter; ?>]')">
- <td class="main" width="30"><?php echo osc_draw_checkbox_field('products[' . $counter . ']', $Qproducts->valueInt('products_id'), true, 'onclick="checkBox(\'products[' . $counter . ']\')"'); ?></td>
- <td class="main"><b><?php echo $Qproducts->value('products_name'); ?></b></td>
- </tr>
-<?php
- $counter++;
- }
- } else {
-?>
- <tr>
- <td class="main"><?php echo NOTIFICATIONS_NON_EXISTING; ?></td>
- </tr>
-<?php
- }
-?>
- </table></td>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
-<?php
- }
-?>
- <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><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, '', 'SSL') . '">' . tep_image_button('button_back.gif', IMAGE_BUTTON_BACK) . '</a>'; ?></td>
- <td align="right"><?php echo tep_image_submit('button_continue.gif', IMAGE_BUTTON_CONTINUE); ?></td>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- </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'); ?>
<hr /><a name="file6" /><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>account_password.php</b></big> <small id="info">removed after <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/account_password.php?rev=1.3&content-type=text/vnd.viewcvs-markup">1.3</a></small></div>
<pre class="diff"><small id="info">diff -N account_password.php
--- /tmp/cvsAAAVCaarG Wed Mar 30 01:40:54 2005
+++ /dev/null Wed Mar 30 01:40:48 2005
@@ -1,179 +0,0 @@
</small></pre><pre class="diff" id="removed">-<?php
-/*
- $Id$
-
- osCommerce, Open Source E-Commerce Solutions
- http://www.oscommerce.com
-
- Copyright (c) 2004 osCommerce
-
- Released under the GNU General Public License
-*/
-
- require('includes/application_top.php');
-
- if ($osC_Customer->isLoggedOn() == false) {
- $navigation->set_snapshot();
-
- tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
- }
-
-// needs to be included earlier to set the success message in the messageStack
- require(DIR_WS_LANGUAGES . $osC_Session->value('language') . '/' . FILENAME_ACCOUNT_PASSWORD);
-
- if (isset($_POST['action']) && ($_POST['action'] == 'process')) {
- if (!isset($_POST['password_current']) || (strlen(trim($_POST['password_current'])) < ACCOUNT_PASSWORD)) {
- $messageStack->add('account_password', ENTRY_PASSWORD_CURRENT_ERROR);
- } elseif (!isset($_POST['password_new']) || (strlen(trim($_POST['password_new'])) < ACCOUNT_PASSWORD)) {
- $messageStack->add('account_password', ENTRY_PASSWORD_NEW_ERROR);
- } elseif (!isset($_POST['password_confirmation']) || (trim($_POST['password_new']) != trim($_POST['password_confirmation']))) {
- $messageStack->add('account_password', ENTRY_PASSWORD_NEW_ERROR_NOT_MATCHING);
- }
-
- if ($messageStack->size('account_password') === 0) {
- $Qcheck = $osC_Database->query('select customers_password from :table_customers where customers_id = :customers_id');
- $Qcheck->bindRaw(':table_customers', TABLE_CUSTOMERS);
- $Qcheck->bindInt(':customers_id', $osC_Customer->id);
- $Qcheck->execute();
-
- if (tep_validate_password(trim($_POST['password_current']), $Qcheck->value('customers_password'))) {
- $Qupdate = $osC_Database->query('update :table_customers set customers_password = :customers_password where customers_id = :customers_id');
- $Qupdate->bindRaw(':table_customers', TABLE_CUSTOMERS);
- $Qupdate->bindValue(':customers_password', tep_encrypt_password(trim($_POST['password_new'])));
- $Qupdate->bindInt(':customers_id', $osC_Customer->id);
- $Qupdate->execute();
-
- $Qupdate = $osC_Database->query('update :table_customers_info set customers_info_date_account_last_modified = now() where customers_info_id = :customers_info_id');
- $Qupdate->bindRaw(':table_customers_info', TABLE_CUSTOMERS_INFO);
- $Qupdate->bindInt(':customers_info_id', $osC_Customer->id);
- $Qupdate->execute();
-
- $messageStack->add_session('account', SUCCESS_PASSWORD_UPDATED, 'success');
-
- tep_redirect(tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
- } else {
- $messageStack->add('account_password', ERROR_CURRENT_PASSWORD_NOT_MATCHING);
- }
- }
- }
-
- $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
- $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link(FILENAME_ACCOUNT_PASSWORD, '', 'SSL'));
-?>
-<!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">
-<?php require('includes/form_check.js.php'); ?>
-</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('account_password', tep_href_link(FILENAME_ACCOUNT_PASSWORD, '', 'SSL'), 'post', 'onSubmit="return check_form(account_password);"') . osc_draw_hidden_field('action', 'process'); ?><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_account.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 ($messageStack->size('account_password') > 0) {
-?>
- <tr>
- <td><?php echo $messageStack->output('account_password'); ?></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
-<?php
- }
-?>
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main"><b><?php echo MY_PASSWORD_TITLE; ?></b></td>
- <td class="inputRequirement" align="right"><?php echo FORM_REQUIRED_INFORMATION; ?></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td><table border="0" cellspacing="2" cellpadding="2">
- <tr>
- <td class="main"><?php echo ENTRY_PASSWORD_CURRENT; ?></td>
- <td class="main"><?php echo osc_draw_password_field('password_current', '', '', true); ?></td>
- </tr>
- <tr>
- <td colspan="2"><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
- <tr>
- <td class="main"><?php echo ENTRY_PASSWORD_NEW; ?></td>
- <td class="main"><?php echo osc_draw_password_field('password_new', '', '', true); ?></td>
- </tr>
- <tr>
- <td class="main"><?php echo ENTRY_PASSWORD_CONFIRMATION; ?></td>
- <td class="main"><?php echo osc_draw_password_field('password_confirmation', '', '', true); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- </table></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><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, '', 'SSL') . '">' . tep_image_button('button_back.gif', IMAGE_BUTTON_BACK) . '</a>'; ?></td>
- <td align="right"><?php echo tep_image_submit('button_continue.gif', IMAGE_BUTTON_CONTINUE); ?></td>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- </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'); ?>
<hr /><a name="file7" /><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>address_book.php</b></big> <small id="info">removed after <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/address_book.php?rev=1.61&content-type=text/vnd.viewcvs-markup">1.61</a></small></div>
<pre class="diff"><small id="info">diff -N address_book.php
--- /tmp/cvsAAArDairG Wed Mar 30 01:40:54 2005
+++ /dev/null Wed Mar 30 01:40:48 2005
@@ -1,201 +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');
-
- if ($osC_Customer->isLoggedOn() === false) {
- $navigation->set_snapshot();
-
- tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
- }
-
- if ($osC_Customer->hasDefaultAddress() === false) {
- $navigation->set_snapshot(array('page' => FILENAME_ACCOUNT, 'mode' => 'SSL'));
-
- tep_redirect(tep_href_link(FILENAME_ADDRESS_BOOK_PROCESS, '', 'SSL'));
- }
-
- require(DIR_WS_LANGUAGES . $osC_Session->value('language') . '/' . FILENAME_ADDRESS_BOOK);
-
- $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
- $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link(FILENAME_ADDRESS_BOOK, '', 'SSL'));
-?>
-<!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">
-<script language="javascript"><!--
-function rowOverEffect(object) {
- if (object.className == 'moduleRow') object.className = 'moduleRowOver';
-}
-
-function rowOutEffect(object) {
- if (object.className == 'moduleRowOver') object.className = 'moduleRow';
-}
-//--></script>
-</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"><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_address_book.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 ($messageStack->size('addressbook') > 0) {
-?>
- <tr>
- <td><?php echo $messageStack->output('addressbook'); ?></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
-<?php
- }
-?>
- <tr>
- <td class="main"><b><?php echo PRIMARY_ADDRESS_TITLE; ?></b></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><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td class="main" width="50%" valign="top"><?php echo PRIMARY_ADDRESS_DESCRIPTION; ?></td>
- <td align="right" width="50%" valign="top"><table border="0" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main" align="center" valign="top"><b><?php echo PRIMARY_ADDRESS_TITLE; ?></b><br><?php echo tep_image(DIR_WS_IMAGES . 'arrow_south_east.gif'); ?></td>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td class="main" valign="top"><?php echo tep_address_label($osC_Customer->id, $osC_Customer->default_address_id, true, ' ', '<br>'); ?></td>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
- <tr>
- <td class="main"><b><?php echo ADDRESS_BOOK_TITLE; ?></b></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">
-<?php
- $Qaddresses = $osC_Database->query('select address_book_id, entry_firstname as firstname, entry_lastname as lastname, entry_company as company, entry_street_address as street_address, entry_suburb as suburb, entry_city as city, entry_postcode as postcode, entry_state as state, entry_zone_id as zone_id, entry_country_id as country_id from :table_address_book where customers_id = :customers_id order by firstname, lastname');
- $Qaddresses->bindTable(':table_address_book', TABLE_ADDRESS_BOOK);
- $Qaddresses->bindInt(':customers_id', $osC_Customer->id);
- $Qaddresses->execute();
-
- while ($Qaddresses->next()) {
- $format_id = tep_get_address_format_id($Qaddresses->valueInt('country_id'));
-?>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr class="moduleRow" onmouseover="rowOverEffect(this)" onmouseout="rowOutEffect(this)" onClick="document.location.href='<?php echo tep_href_link(FILENAME_ADDRESS_BOOK_PROCESS, 'edit=' . $Qaddresses->valueInt('address_book_id'), 'SSL'); ?>'">
- <td class="main"><b><?php echo $Qaddresses->valueProtected('firstname') . ' ' . $Qaddresses->valueProtected('lastname'); ?></b><?php if ($Qaddresses->valueInt('address_book_id') == $osC_Customer->default_address_id) echo '&nbsp;<small><i>' . PRIMARY_ADDRESS . '</i></small>'; ?></td>
- <td class="main" align="right"><?php echo '<a href="' . tep_href_link(FILENAME_ADDRESS_BOOK_PROCESS, 'edit=' . $Qaddresses->valueInt('address_book_id'), 'SSL') . '">' . tep_image_button('small_edit.gif', SMALL_IMAGE_BUTTON_EDIT) . '</a> <a href="' . tep_href_link(FILENAME_ADDRESS_BOOK_PROCESS, 'delete=' . $Qaddresses->valueInt('address_book_id'), 'SSL') . '">' . tep_image_button('small_delete.gif', SMALL_IMAGE_BUTTON_DELETE) . '</a>'; ?></td>
- </tr>
- <tr>
- <td colspan="2"><table border="0" 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_address_format($format_id, $Qaddresses->toArray(), true, ' ', '<br>'); ?></td>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
-<?php
- }
-?>
- </table></td>
- </tr>
- </table></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 class="smallText"><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT, '', 'SSL') . '">' . tep_image_button('button_back.gif', IMAGE_BUTTON_BACK) . '</a>'; ?></td>
-<?php
- if (tep_count_customer_address_book_entries() < MAX_ADDRESS_BOOK_ENTRIES) {
-?>
- <td class="smallText" align="right"><?php echo '<a href="' . tep_href_link(FILENAME_ADDRESS_BOOK_PROCESS, '', 'SSL') . '">' . tep_image_button('button_add_address.gif', IMAGE_BUTTON_ADD_ADDRESS) . '</a>'; ?></td>
-<?php
- }
-?>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
- <tr>
- <td class="smallText"><?php echo sprintf(TEXT_MAXIMUM_ENTRIES, MAX_ADDRESS_BOOK_ENTRIES); ?></td>
- </tr>
- </table></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'); ?>
<hr /><a name="file8" /><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>address_book_process.php</b></big> <small id="info">removed after <a href="http://cvs.oscommerce.com/viewcvs.cgi/catalog/catalog/address_book_process.php?rev=1.84&content-type=text/vnd.viewcvs-markup">1.84</a></small></div>
<pre class="diff"><small id="info">diff -N address_book_process.php
--- /tmp/cvsAAA3FaqrG Wed Mar 30 01:40:55 2005
+++ /dev/null Wed Mar 30 01:40:48 2005
@@ -1,421 +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');
-
- if ($osC_Customer->isLoggedOn() == false) {
- $navigation->set_snapshot();
-
- tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
- }
-
-// needs to be included earlier to set the success message in the messageStack
- require(DIR_WS_LANGUAGES . $osC_Session->value('language') . '/' . FILENAME_ADDRESS_BOOK_PROCESS);
-
- if (isset($_GET['action']) && ($_GET['action'] == 'deleteconfirm') && isset($_GET['delete']) && is_numeric($_GET['delete'])) {
- $Qdelete = $osC_Database->query('delete from :table_address_book where address_book_id = :address_book_id and customers_id = :customers_id');
- $Qdelete->bindTable(':table_address_book', TABLE_ADDRESS_BOOK);
- $Qdelete->bindInt(':address_book_id', $_GET['delete']);
- $Qdelete->bindInt(':customers_id', $osC_Customer->id);
- $Qdelete->execute();
-
- if ($Qdelete->affectedRows() === 1) {
- $messageStack->add_session('addressbook', SUCCESS_ADDRESS_BOOK_ENTRY_DELETED, 'success');
- }
-
- tep_redirect(tep_href_link(FILENAME_ADDRESS_BOOK, '', 'SSL'));
- }
-
-// error checking when updating or adding an entry
- if (isset($_POST['action']) && (($_POST['action'] == 'process') || ($_POST['action'] == 'update'))) {
- if (ACCOUNT_GENDER > 0) {
- if (!isset($_POST['gender']) || (($_POST['gender'] != 'm') && ($_POST['gender'] != 'f'))) {
- $messageStack->add('addressbook', ENTRY_GENDER_ERROR);
- }
- }
-
- if (!isset($_POST['firstname']) || (strlen(trim($_POST['firstname'])) < ACCOUNT_FIRST_NAME)) {
- $messageStack->add('addressbook', ENTRY_FIRST_NAME_ERROR);
- }
-
- if (!isset($_POST['lastname']) || (strlen(trim($_POST['lastname'])) < ACCOUNT_LAST_NAME)) {
- $messageStack->add('addressbook', ENTRY_LAST_NAME_ERROR);
- }
-
- if (ACCOUNT_COMPANY > 0) {
- if (!isset($_POST['company']) || (strlen(trim($_POST['company'])) < ACCOUNT_COMPANY)) {
- $messageStack->add('addressbook', ENTRY_COMPANY_ERROR);
- }
- }
-
- if (!isset($_POST['street_address']) || (strlen(trim($_POST['street_address'])) < ACCOUNT_STREET_ADDRESS)) {
- $messageStack->add('addressbook', ENTRY_STREET_ADDRESS_ERROR);
- }
-
- if (ACCOUNT_SUBURB > 0) {
- if (!isset($_POST['suburb']) || (strlen(trim($_POST['suburb'])) < ACCOUNT_SUBURB)) {
- $messageStack->add('addressbook', ENTRY_SUBURB_ERROR);
- }
- }
-
- if (!isset($_POST['postcode']) || (strlen(trim($_POST['postcode'])) < ACCOUNT_POST_CODE)) {
- $messageStack->add('addressbook', ENTRY_POST_CODE_ERROR);
- }
-
- if (!isset($_POST['city']) || (strlen(trim($_POST['city'])) < ACCOUNT_CITY)) {
- $messageStack->add('addressbook', ENTRY_CITY_ERROR);
- }
-
- if (ACCOUNT_STATE > 0) {
- $zone_id = 0;
-
- $Qcheck = $osC_Database->query('select zone_id from :table_zones where zone_country_id = :zone_country_id limit 1');
- $Qcheck->bindRaw(':table_zones', TABLE_ZONES);
- $Qcheck->bindValue(':zone_country_id', $_POST['country']);
- $Qcheck->execute();
-
- $entry_state_has_zones = ($Qcheck->numberOfRows() > 0);
-
- $Qcheck->freeResult();
-
- if ($entry_state_has_zones === true) {
- $Qzone = $osC_Database->query('select zone_id from :table_zones where zone_country_id = :zone_country_id and zone_code like :zone_code');
- $Qzone->bindRaw(':table_zones', TABLE_ZONES);
- $Qzone->bindValue(':zone_country_id', $_POST['country']);
- $Qzone->bindValue(':zone_code', trim($_POST['state']));
- $Qzone->execute();
-
- if ($Qzone->numberOfRows() === 1) {
- $zone_id = $Qzone->valueInt('zone_id');
- } else {
- $Qzone = $osC_Database->query('select zone_id from :table_zones where zone_country_id = :zone_country_id and zone_name like :zone_name');
- $Qzone->bindRaw(':table_zones', TABLE_ZONES);
- $Qzone->bindValue(':zone_country_id', $_POST['country']);
- $Qzone->bindValue(':zone_name', trim($_POST['state']) . '%');
- $Qzone->execute();
-
- if ($Qzone->numberOfRows() === 1) {
- $zone_id = $Qzone->valueInt('zone_id');
- } else {
- $messageStack->add('addressbook', ENTRY_STATE_ERROR_SELECT);
- }
- }
-
- $Qzone->freeResult();
- } else {
- if (strlen(trim($_POST['state'])) < ACCOUNT_STATE) {
- $messageStack->add('addressbook', ENTRY_STATE_ERROR);
- }
- }
- }
-
- if ( (is_numeric($_POST['country']) === false) || ($_POST['country'] < 1) ) {
- $messageStack->add('addressbook', ENTRY_COUNTRY_ERROR);
- }
-
- if (ACCOUNT_TELEPHONE > 0) {
- if (!isset($_POST['telephone']) || (strlen(trim($_POST['telephone'])) < ACCOUNT_TELEPHONE)) {
- $messageStack->add('addressbook', ENTRY_TELEPHONE_NUMBER_ERROR);
- }
- }
-
- if (ACCOUNT_FAX > 0) {
- if (!isset($_POST['fax']) || (strlen(trim($_POST['fax'])) < ACCOUNT_FAX)) {
- $messageStack->add('addressbook', ENTRY_FAX_NUMBER_ERROR);
- }
- }
-
- if ($messageStack->size('addressbook') === 0) {
- if ($_POST['action'] == 'update') {
- $Qab = $osC_Database->query('update :table_address_book set customers_id = :customers_id, entry_gender = :entry_gender, entry_company = :entry_company, entry_firstname = :entry_firstname, entry_lastname = :entry_lastname, entry_street_address = :entry_street_address, entry_suburb = :entry_suburb, entry_postcode = :entry_postcode, entry_city = :entry_city, entry_state = :entry_state, entry_country_id = :entry_country_id, entry_zone_id = :entry_zone_id, entry_telephone = :entry_telephone, entry_fax = :entry_fax where address_book_id = :address_book_id and customers_id = :customers_id');
- $Qab->bindInt(':address_book_id', $_GET['edit']);
- $Qab->bindInt(':customers_id', $osC_Customer->id);
- } else {
- $Qab = $osC_Database->query('insert into :table_address_book (customers_id, entry_gender, entry_company, entry_firstname, entry_lastname, entry_street_address, entry_suburb, entry_postcode, entry_city, entry_state, entry_country_id, entry_zone_id, entry_telephone, entry_fax) values (:customers_id, :entry_gender, :entry_company, :entry_firstname, :entry_lastname, :entry_street_address, :entry_suburb, :entry_postcode, :entry_city, :entry_state, :entry_country_id, :entry_zone_id, :entry_telephone, :entry_fax)');
- }
- $Qab->bindRaw(':table_address_book', TABLE_ADDRESS_BOOK);
- $Qab->bindInt(':customers_id', $osC_Customer->id);
- $Qab->bindValue(':entry_gender', (((ACCOUNT_GENDER > -1) && isset($_POST['gender']) && (($_POST['gender'] == 'm') || ($_POST['gender'] == 'f'))) ? $_POST['gender'] : ''));
- $Qab->bindValue(':entry_company', ((ACCOUNT_COMPANY > -1) ? trim($_POST['company']) : ''));
- $Qab->bindValue(':entry_firstname', trim($_POST['firstname']));
- $Qab->bindValue(':entry_lastname', trim($_POST['lastname']));
- $Qab->bindValue(':entry_street_address', trim($_POST['street_address']));
- $Qab->bindValue(':entry_suburb', ((ACCOUNT_SUBURB > -1) ? trim($_POST['suburb']) : ''));
- $Qab->bindValue(':entry_postcode', trim($_POST['postcode']));
- $Qab->bindValue(':entry_city', trim($_POST['city']));
- $Qab->bindValue(':entry_state', ((ACCOUNT_STATE > -1) ? (($zone_id > 0) ? '' : trim($_POST['state'])) : ''));
- $Qab->bindInt(':entry_country_id', $_POST['country']);
- $Qab->bindInt(':entry_zone_id', ((ACCOUNT_STATE > -1) ? (($zone_id > 0) ? $zone_id : 0) : ''));
- $Qab->bindValue(':entry_telephone', ((ACCOUNT_TELEPHONE > -1) ? trim($_POST['telephone']) : ''));
- $Qab->bindValue(':entry_fax', ((ACCOUNT_FAX > -1) ? trim($_POST['fax']) : ''));
- $Qab->execute();
-
- if ( ($osC_Customer->hasDefaultAddress() === false) || (isset($_POST['primary']) && ($_POST['primary'] == 'on')) ) {
- if ($_POST['action'] == 'update') {
- $default_address_id = $_GET['edit'];
- } else {
- $default_address_id = $osC_Database->nextID();
- }
-
- $Qupdate = $osC_Database->query('update :table_customers set customers_default_address_id = :customers_default_address_id where customers_id = :customers_id');
- $Qupdate->bindRaw(':table_customers', TABLE_CUSTOMERS);
- $Qupdate->bindInt(':customers_default_address_id', $default_address_id);
- $Qupdate->bindInt(':customers_id', $osC_Customer->id);
- $Qupdate->execute();
-
- if ($Qupdate->affectedRows() === 1) {
- $osC_Customer->setCountryID($_POST['country']);
- $osC_Customer->setZoneID(($zone_id > 0) ? (int)$zone_id : '0');
- $osC_Customer->setDefaultAddressID($default_address_id);
- }
- }
-
- $messageStack->add_session('addressbook', SUCCESS_ADDRESS_BOOK_ENTRY_UPDATED, 'success');
-
- tep_redirect(tep_href_link(FILENAME_ADDRESS_BOOK, '', 'SSL'));
- }
- }
-
- if (isset($_GET['edit']) && is_numeric($_GET['edit'])) {
- $Qentry = $osC_Database->query('select entry_gender, entry_company, entry_firstname, entry_lastname, entry_street_address, entry_suburb, entry_postcode, entry_city, entry_state, entry_zone_id, entry_country_id, entry_telephone, entry_fax from :table_address_book where customers_id = :customers_id and address_book_id = :address_book_id');
- $Qentry->bindTable(':table_address_book', TABLE_ADDRESS_BOOK);
- $Qentry->bindInt(':customers_id', $osC_Customer->id);
- $Qentry->bindInt(':address_book_id', $_GET['edit']);
- $Qentry->execute();
-
- if ($Qentry->numberOfRows() < 1) {
- $messageStack->add_session('addressbook', ERROR_NONEXISTING_ADDRESS_BOOK_ENTRY);
-
- tep_redirect(tep_href_link(FILENAME_ADDRESS_BOOK, '', 'SSL'));
- }
-
- $entry = $Qentry->toArray();
- } elseif (isset($_GET['delete']) && is_numeric($_GET['delete'])) {
- if ($_GET['delete'] == $osC_Customer->default_address_id) {
- $messageStack->add_session('addressbook', WARNING_PRIMARY_ADDRESS_DELETION, 'warning');
-
- tep_redirect(tep_href_link(FILENAME_ADDRESS_BOOK, '', 'SSL'));
- } else {
- $Qcheck = $osC_Database->query('select count(*) as total from :table_address_book where address_book_id = :address_book_id and customers_id = :customers_id');
- $Qcheck->bindTable(':table_address_book', TABLE_ADDRESS_BOOK);
- $Qcheck->bindInt(':address_book_id', $_GET['delete']);
- $Qcheck->bindInt(':customers_id', $osC_Customer->id);
- $Qcheck->execute();
-
- if ($Qcheck->valueInt('total') < 1) {
- $messageStack->add_session('addressbook', ERROR_NONEXISTING_ADDRESS_BOOK_ENTRY);
-
- tep_redirect(tep_href_link(FILENAME_ADDRESS_BOOK, '', 'SSL'));
- }
- }
- } else {
- $entry = array();
- }
-
- if (!isset($_GET['delete']) && !isset($_GET['edit'])) {
- if (tep_count_customer_address_book_entries() >= MAX_ADDRESS_BOOK_ENTRIES) {
- $messageStack->add_session('addressbook', ERROR_ADDRESS_BOOK_FULL);
-
- tep_redirect(tep_href_link(FILENAME_ADDRESS_BOOK, '', 'SSL'));
- }
- }
-
- $breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
- $breadcrumb->add(NAVBAR_TITLE_2, tep_href_link(FILENAME_ADDRESS_BOOK, '', 'SSL'));
-
- if (isset($_GET['edit']) && is_numeric($_GET['edit'])) {
- $breadcrumb->add(NAVBAR_TITLE_MODIFY_ENTRY, tep_href_link(FILENAME_ADDRESS_BOOK_PROCESS, 'edit=' . $_GET['edit'], 'SSL'));
- } elseif (isset($_GET['delete']) && is_numeric($_GET['delete'])) {
- $breadcrumb->add(NAVBAR_TITLE_DELETE_ENTRY, tep_href_link(FILENAME_ADDRESS_BOOK_PROCESS, 'delete=' . $_GET['delete'], 'SSL'));
- } else {
- $breadcrumb->add(NAVBAR_TITLE_ADD_ENTRY, tep_href_link(FILENAME_ADDRESS_BOOK_PROCESS, '', 'SSL'));
- }
-?>
-<!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">
-<?php
- if (!isset($_GET['delete'])) {
- include('includes/form_check.js.php');
- }
-?>
-</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 if (!isset($_GET['delete'])) echo tep_draw_form('addressbook', tep_href_link(FILENAME_ADDRESS_BOOK_PROCESS, (isset($_GET['edit']) ? 'edit=' . $_GET['edit'] : ''), 'SSL'), 'post', 'onSubmit="return check_form(addressbook);"'); ?><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 if (isset($_GET['edit'])) { echo HEADING_TITLE_MODIFY_ENTRY; } elseif (isset($_GET['delete'])) { echo HEADING_TITLE_DELETE_ENTRY; } else { echo HEADING_TITLE_ADD_ENTRY; } ?></td>
- <td class="pageHeading" align="right"><?php echo tep_image(DIR_WS_IMAGES . 'table_background_address_book.gif', (isset($_GET['edit']) ? HEADING_TITLE_MODIFY_ENTRY : HEADING_TITLE_ADD_ENTRY), 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 ($messageStack->size('addressbook') > 0) {
-?>
- <tr>
- <td><?php echo $messageStack->output('addressbook'); ?></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
-<?php
- }
-
- if (isset($_GET['delete'])) {
-?>
- <tr>
- <td class="main"><b><?php echo DELETE_ADDRESS_TITLE; ?></b></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><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td class="main" width="50%" valign="top"><?php echo DELETE_ADDRESS_DESCRIPTION; ?></td>
- <td align="right" width="50%" valign="top"><table border="0" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main" align="center" valign="top"><b><?php echo SELECTED_ADDRESS; ?></b><br><?php echo tep_image(DIR_WS_IMAGES . 'arrow_south_east.gif'); ?></td>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- <td class="main" valign="top"><?php echo tep_address_label($osC_Customer->id, $_GET['delete'], true, ' ', '<br>'); ?></td>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- </table></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><?php echo '<a href="' . tep_href_link(FILENAME_ADDRESS_BOOK, '', 'SSL') . '">' . tep_image_button('button_back.gif', IMAGE_BUTTON_BACK) . '</a>'; ?></td>
- <td align="right"><?php echo '<a href="' . tep_href_link(FILENAME_ADDRESS_BOOK_PROCESS, 'delete=' . $_GET['delete'] . '&action=deleteconfirm', 'SSL') . '">' . tep_image_button('button_delete.gif', IMAGE_BUTTON_DELETE) . '</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><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
- <tr>
- <td class="main"><b><?php echo NEW_ADDRESS_TITLE; ?></b></td>
- <td class="inputRequirement" align="right"><?php echo FORM_REQUIRED_INFORMATION; ?></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="1" cellpadding="2" class="infoBox">
- <tr class="infoBoxContents">
- <td><?php include(DIR_WS_MODULES . 'address_book_details.php'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '100%', '10'); ?></td>
- </tr>
-<?php
- if (isset($_GET['edit']) && is_numeric($_GET['edit'])) {
-?>
- <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><?php echo '<a href="' . tep_href_link(FILENAME_ADDRESS_BOOK, '', 'SSL') . '">' . tep_image_button('button_back.gif', IMAGE_BUTTON_BACK) . '</a>'; ?></td>
- <td align="right"><?php echo osc_draw_hidden_field('action', 'update') . osc_draw_hidden_field('edit', $_GET['edit']) . tep_image_submit('button_update.gif', IMAGE_BUTTON_UPDATE); ?></td>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
-<?php
- } else {
- if (sizeof($navigation->snapshot) > 0) {
- $back_link = tep_href_link($navigation->snapshot['page'], tep_array_to_string($navigation->snapshot['get'], array($osC_Session->name)), $navigation->snapshot['mode']);
- } else {
- $back_link = tep_href_link(FILENAME_ADDRESS_BOOK, '', 'SSL');
- }
-?>
- <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><?php echo '<a href="' . $back_link . '">' . tep_image_button('button_back.gif', IMAGE_BUTTON_BACK) . '</a>'; ?></td>
- <td align="right"><?php echo osc_draw_hidden_field('action', 'process') . tep_image_submit('button_continue.gif', IMAGE_BUTTON_CONTINUE); ?></td>
- <td width="10"><?php echo tep_draw_separator('pixel_trans.gif', '10', '1'); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </tr>
-<?php
- }
- }
-?>
- </table><?php if (!isset($_GET['delete'])) echo '</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