[TEP-COMMIT] CVS: catalog/catalog account.php,1.61,1.62 account_edit.php,1.65,1.66 account_history.php,1.63,1.64 account_history_info.php,1.100,1.101 account_newsletters.php,1.3,1.4 account_notifications.php,1.2,1.3 account_password.php,1.1,1.2
Harald Ponce de Leon <[email protected]>
| Newsgroups | gmane.comp.web.oscommerce.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/tep/catalog/catalog
In directory sc8-pr-cvs1:/tmp/cvs-serv1308
Modified Files:
account.php account_edit.php account_history.php
account_history_info.php account_newsletters.php
account_notifications.php account_password.php
Log Message:
use the new classes and super global variables
Index: account.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/account.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- account.php 9 Jun 2003 23:03:52 -0000 1.61
+++ account.php 17 Nov 2003 20:45:28 -0000 1.62
@@ -12,12 +12,13 @@
require('includes/application_top.php');
- if (!tep_session_is_registered('customer_id')) {
+ if ($osC_Customer->isLoggedOn() == false) {
$navigation->set_snapshot();
+
tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
}
- require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_ACCOUNT);
+ require(DIR_WS_LANGUAGES . $osC_Session->value('language') . '/' . FILENAME_ACCOUNT);
$breadcrumb->add(NAVBAR_TITLE, tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
?>
@@ -94,7 +95,7 @@
<td class="main" align="center" valign="top" width="130"><?php echo '<b>' . OVERVIEW_PREVIOUS_ORDERS . '</b><br>' . tep_image(DIR_WS_IMAGES . 'arrow_south_east.gif'); ?></td>
<td><table border="0" width="100%" cellspacing="0" cellpadding="2">
<?php
- $orders_query = tep_db_query("select o.orders_id, o.date_purchased, o.delivery_name, o.delivery_country, o.billing_name, o.billing_country, 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 = '" . (int)$customer_id . "' and o.orders_id = ot.orders_id and ot.class = 'ot_total' and o.orders_status = s.orders_status_id and s.language_id = '" . (int)$languages_id . "' order by orders_id desc limit 3");
+ $orders_query = tep_db_query("select o.orders_id, o.date_purchased, o.delivery_name, o.delivery_country, o.billing_name, o.billing_country, 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 = '" . (int)$osC_Customer->id . "' and o.orders_id = ot.orders_id and ot.class = 'ot_total' and o.orders_status = s.orders_status_id and s.language_id = '" . (int)$osC_Session->value('languages_id') . "' order by orders_id desc limit 3");
while ($orders = tep_db_fetch_array($orders_query)) {
if (tep_not_null($orders['delivery_name'])) {
$order_name = $orders['delivery_name'];
Index: account_edit.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/account_edit.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- account_edit.php 9 Jun 2003 23:03:52 -0000 1.65
+++ account_edit.php 17 Nov 2003 20:45:28 -0000 1.66
@@ -12,22 +12,23 @@
require('includes/application_top.php');
- if (!tep_session_is_registered('customer_id')) {
+ 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 . $language . '/' . FILENAME_ACCOUNT_EDIT);
+ require(DIR_WS_LANGUAGES . $osC_Session->value('language') . '/' . FILENAME_ACCOUNT_EDIT);
- if (isset($HTTP_POST_VARS['action']) && ($HTTP_POST_VARS['action'] == 'process')) {
- if (ACCOUNT_GENDER == 'true') $gender = tep_db_prepare_input($HTTP_POST_VARS['gender']);
- $firstname = tep_db_prepare_input($HTTP_POST_VARS['firstname']);
- $lastname = tep_db_prepare_input($HTTP_POST_VARS['lastname']);
- if (ACCOUNT_DOB == 'true') $dob = tep_db_prepare_input($HTTP_POST_VARS['dob']);
- $email_address = tep_db_prepare_input($HTTP_POST_VARS['email_address']);
- $telephone = tep_db_prepare_input($HTTP_POST_VARS['telephone']);
- $fax = tep_db_prepare_input($HTTP_POST_VARS['fax']);
+ if (isset($_POST['action']) && ($_POST['action'] == 'process')) {
+ if (ACCOUNT_GENDER == 'true') $gender = tep_db_prepare_input($_POST['gender']);
+ $firstname = tep_db_prepare_input($_POST['firstname']);
+ $lastname = tep_db_prepare_input($_POST['lastname']);
+ if (ACCOUNT_DOB == 'true') $dob = tep_db_prepare_input($_POST['dob']);
+ $email_address = tep_db_prepare_input($_POST['email_address']);
+ $telephone = tep_db_prepare_input($_POST['telephone']);
+ $fax = tep_db_prepare_input($_POST['fax']);
$error = false;
@@ -71,7 +72,7 @@
$messageStack->add('account_edit', ENTRY_EMAIL_ADDRESS_CHECK_ERROR);
}
- $check_email_query = tep_db_query("select count(*) as total from " . TABLE_CUSTOMERS . " where customers_email_address = '" . tep_db_input($email_address) . "' and customers_id != '" . (int)$customer_id . "'");
+ $check_email_query = tep_db_query("select count(*) as total from " . TABLE_CUSTOMERS . " where customers_email_address = '" . tep_db_input($email_address) . "' and customers_id != '" . (int)$osC_Customer->id . "'");
$check_email = tep_db_fetch_array($check_email_query);
if ($check_email['total'] > 0) {
$error = true;
@@ -95,17 +96,21 @@
if (ACCOUNT_GENDER == 'true') $sql_data_array['customers_gender'] = $gender;
if (ACCOUNT_DOB == 'true') $sql_data_array['customers_dob'] = tep_date_raw($dob);
- tep_db_perform(TABLE_CUSTOMERS, $sql_data_array, 'update', "customers_id = '" . (int)$customer_id . "'");
+ tep_db_perform(TABLE_CUSTOMERS, $sql_data_array, 'update', "customers_id = '" . (int)$osC_Customer->id . "'");
- tep_db_query("update " . TABLE_CUSTOMERS_INFO . " set customers_info_date_account_last_modified = now() where customers_info_id = '" . (int)$customer_id . "'");
+ tep_db_query("update " . TABLE_CUSTOMERS_INFO . " set customers_info_date_account_last_modified = now() where customers_info_id = '" . (int)$osC_Customer->id . "'");
$sql_data_array = array('entry_firstname' => $firstname,
'entry_lastname' => $lastname);
- tep_db_perform(TABLE_ADDRESS_BOOK, $sql_data_array, 'update', "customers_id = '" . (int)$customer_id . "' and address_book_id = '" . (int)$customer_default_address_id . "'");
+ tep_db_perform(TABLE_ADDRESS_BOOK, $sql_data_array, 'update', "customers_id = '" . (int)$osC_Customer->id . "' and address_book_id = '" . (int)$osC_Customer->default_address_id . "'");
// reset the session variables
- $customer_first_name = $firstname;
+ if (ACCOUNT_GENDER == 'true') $osC_Customer->setGender($gender);
+ $osC_Customer->setFirstName($firstname);
+ $osC_Customer->setLastName($lastname);
+ $osC_Customer->setFullName();
+ $osC_Customer->setEmailAddress($email_address);
$messageStack->add_session('account', SUCCESS_ACCOUNT_UPDATED, 'success');
@@ -113,7 +118,7 @@
}
}
- $account_query = tep_db_query("select customers_gender, customers_firstname, customers_lastname, customers_dob, customers_email_address, customers_telephone, customers_fax from " . TABLE_CUSTOMERS . " where customers_id = '" . (int)$customer_id . "'");
+ $account_query = tep_db_query("select customers_gender, customers_firstname, customers_lastname, customers_dob, customers_email_address, customers_telephone, customers_fax from " . TABLE_CUSTOMERS . " where customers_id = '" . (int)$osC_Customer->id . "'");
$account = tep_db_fetch_array($account_query);
$breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(FILENAME_ACCOUNT, '', 'SSL'));
Index: account_history.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/account_history.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- account_history.php 9 Jun 2003 23:03:52 -0000 1.63
+++ account_history.php 17 Nov 2003 20:45:28 -0000 1.64
@@ -12,12 +12,13 @@
require('includes/application_top.php');
- if (!tep_session_is_registered('customer_id')) {
+ if ($osC_Customer->isLoggedOn() == false) {
$navigation->set_snapshot();
+
tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
}
- require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_ACCOUNT_HISTORY);
+ 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'));
@@ -62,7 +63,7 @@
$orders_total = tep_count_customer_orders();
if ($orders_total > 0) {
- $history_query_raw = "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 = '" . (int)$customer_id . "' and o.orders_id = ot.orders_id and ot.class = 'ot_total' and o.orders_status = s.orders_status_id and s.language_id = '" . (int)$languages_id . "' order by orders_id DESC";
+ $history_query_raw = "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 = '" . (int)$osC_Customer->id . "' and o.orders_id = ot.orders_id and ot.class = 'ot_total' and o.orders_status = s.orders_status_id and s.language_id = '" . (int)$osC_Session->value('languages_id') . "' order by orders_id DESC";
$history_split = new splitPageResults($history_query_raw, MAX_DISPLAY_ORDER_HISTORY);
$history_query = tep_db_query($history_split->sql_query);
@@ -90,7 +91,7 @@
<tr>
<td class="main" width="50%" valign="top"><?php echo '<b>' . TEXT_ORDER_DATE . '</b> ' . tep_date_long($history['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> ' . $products['count'] . '<br><b>' . TEXT_ORDER_COST . '</b> ' . strip_tags($history['order_total']); ?></td>
- <td class="main" width="20%"><?php echo '<a href="' . tep_href_link(FILENAME_ACCOUNT_HISTORY_INFO, (isset($HTTP_GET_VARS['page']) ? 'page=' . $HTTP_GET_VARS['page'] . '&' : '') . 'order_id=' . $history['orders_id'], 'SSL') . '">' . tep_image_button('small_view.gif', SMALL_IMAGE_BUTTON_VIEW) . '</a>'; ?></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=' . $history['orders_id'], 'SSL') . '">' . tep_image_button('small_view.gif', SMALL_IMAGE_BUTTON_VIEW) . '</a>'; ?></td>
</tr>
</table></td>
</tr>
Index: account_history_info.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/account_history_info.php,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- account_history_info.php 9 Jun 2003 23:03:52 -0000 1.100
+++ account_history_info.php 17 Nov 2003 20:45:28 -0000 1.101
@@ -12,29 +12,31 @@
require('includes/application_top.php');
- if (!tep_session_is_registered('customer_id')) {
+ if ($osC_Customer->isLoggedOn() == false) {
$navigation->set_snapshot();
+
tep_redirect(tep_href_link(FILENAME_LOGIN, '', 'SSL'));
}
- if (!isset($HTTP_GET_VARS['order_id']) || (isset($HTTP_GET_VARS['order_id']) && !is_numeric($HTTP_GET_VARS['order_id']))) {
+ if (!isset($_GET['order_id']) || (isset($_GET['order_id']) && !is_numeric($_GET['order_id']))) {
tep_redirect(tep_href_link(FILENAME_ACCOUNT_HISTORY, '', 'SSL'));
}
-
- $customer_info_query = tep_db_query("select customers_id from " . TABLE_ORDERS . " where orders_id = '". (int)$HTTP_GET_VARS['order_id'] . "'");
+
+ $customer_info_query = tep_db_query("select customers_id from " . TABLE_ORDERS . " where orders_id = '". (int)$_GET['order_id'] . "'");
$customer_info = tep_db_fetch_array($customer_info_query);
- if ($customer_info['customers_id'] != $customer_id) {
+
+ if ($customer_info['customers_id'] != $osC_Customer->id) {
tep_redirect(tep_href_link(FILENAME_ACCOUNT_HISTORY, '', 'SSL'));
}
- require(DIR_WS_LANGUAGES . $language . '/' . FILENAME_ACCOUNT_HISTORY_INFO);
+ 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, $HTTP_GET_VARS['order_id']), tep_href_link(FILENAME_ACCOUNT_HISTORY_INFO, 'order_id=' . $HTTP_GET_VARS['order_id'], '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($HTTP_GET_VARS['order_id']);
+ $order = new order($_GET['order_id']);
?>
<!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
<html <?php echo HTML_PARAMS; ?>>
@@ -73,7 +75,7 @@
<tr>
<td><table border="0" width="100%" cellspacing="0" cellpadding="2">
<tr>
- <td class="main" colspan="2"><b><?php echo sprintf(HEADING_ORDER_NUMBER, $HTTP_GET_VARS['order_id']) . ' <small>(' . $order->info['orders_status'] . ')</small>'; ?></b></td>
+ <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>
@@ -210,7 +212,7 @@
<tr class="infoBoxContents">
<td valign="top"><table border="0" width="100%" cellspacing="0" cellpadding="2">
<?php
- $statuses_query = tep_db_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 = '" . (int)$HTTP_GET_VARS['order_id'] . "' and osh.orders_status_id = os.orders_status_id and os.language_id = '" . (int)$languages_id . "' order by osh.date_added");
+ $statuses_query = tep_db_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 = '" . (int)$_GET['order_id'] . "' and osh.orders_status_id = os.orders_status_id and os.language_id = '" . (int)$osC_Session->value('languages_id') . "' order by osh.date_added");
while ($statuses = tep_db_fetch_array($statuses_query)) {
echo ' <tr>' . "\n" .
' <td class="main" valign="top" width="70">' . tep_date_short($statuses['date_added']) . '</td>' . "\n" .
Index: account_newsletters.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/account_newsletters.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- account_newsletters.php 5 Jun 2003 23:23:52 -0000 1.3
+++ account_newsletters.php 17 Nov 2003 20:45:28 -0000 1.4
@@ -12,20 +12,21 @@
require('includes/application_top.php');
- if (!tep_session_is_registered('customer_id')) {
+ 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 . $language . '/' . FILENAME_ACCOUNT_NEWSLETTERS);
+ require(DIR_WS_LANGUAGES . $osC_Session->value('language') . '/' . FILENAME_ACCOUNT_NEWSLETTERS);
- $newsletter_query = tep_db_query("select customers_newsletter from " . TABLE_CUSTOMERS . " where customers_id = '" . (int)$customer_id . "'");
+ $newsletter_query = tep_db_query("select customers_newsletter from " . TABLE_CUSTOMERS . " where customers_id = '" . (int)$osC_Customer->id . "'");
$newsletter = tep_db_fetch_array($newsletter_query);
- if (isset($HTTP_POST_VARS['action']) && ($HTTP_POST_VARS['action'] == 'process')) {
- if (isset($HTTP_POST_VARS['newsletter_general']) && is_numeric($HTTP_POST_VARS['newsletter_general'])) {
- $newsletter_general = tep_db_prepare_input($HTTP_POST_VARS['newsletter_general']);
+ if (isset($_POST['action']) && ($_POST['action'] == 'process')) {
+ if (isset($_POST['newsletter_general']) && is_numeric($_POST['newsletter_general'])) {
+ $newsletter_general = tep_db_prepare_input($_POST['newsletter_general']);
} else {
$newsletter_general = '0';
}
@@ -33,7 +34,7 @@
if ($newsletter_general != $newsletter['customers_newsletter']) {
$newsletter_general = (($newsletter['customers_newsletter'] == '1') ? '0' : '1');
- tep_db_query("update " . TABLE_CUSTOMERS . " set customers_newsletter = '" . (int)$newsletter_general . "' where customers_id = '" . (int)$customer_id . "'");
+ tep_db_query("update " . TABLE_CUSTOMERS . " set customers_newsletter = '" . (int)$newsletter_general . "' where customers_id = '" . (int)$osC_Customer->id . "'");
}
$messageStack->add_session('account', SUCCESS_NEWSLETTER_UPDATED, 'success');
Index: account_notifications.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/account_notifications.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- account_notifications.php 22 May 2003 14:24:54 -0000 1.2
+++ account_notifications.php 17 Nov 2003 20:45:28 -0000 1.3
@@ -12,52 +12,52 @@
require('includes/application_top.php');
- if (!tep_session_is_registered('customer_id')) {
+ 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 . $language . '/' . FILENAME_ACCOUNT_NOTIFICATIONS);
+ require(DIR_WS_LANGUAGES . $osC_Session->value('language') . '/' . FILENAME_ACCOUNT_NOTIFICATIONS);
- $global_query = tep_db_query("select global_product_notifications from " . TABLE_CUSTOMERS_INFO . " where customers_info_id = '" . (int)$customer_id . "'");
+ $global_query = tep_db_query("select global_product_notifications from " . TABLE_CUSTOMERS_INFO . " where customers_info_id = '" . (int)$osC_Customer->id . "'");
$global = tep_db_fetch_array($global_query);
- if (isset($HTTP_POST_VARS['action']) && ($HTTP_POST_VARS['action'] == 'process')) {
- if (isset($HTTP_POST_VARS['product_global']) && is_numeric($HTTP_POST_VARS['product_global'])) {
- $product_global = tep_db_prepare_input($HTTP_POST_VARS['product_global']);
+ if (isset($_POST['action']) && ($_POST['action'] == 'process')) {
+ if (isset($_POST['product_global']) && is_numeric($_POST['product_global'])) {
+ $product_global = tep_db_prepare_input($_POST['product_global']);
} else {
$product_global = '0';
}
- (array)$products = $HTTP_POST_VARS['products'];
+ if (isset($_POST['products'])) {
+ (array)$products = $_POST['products'];
+ } else {
+ $products = array();
+ }
if ($product_global != $global['global_product_notifications']) {
$product_global = (($global['global_product_notifications'] == '1') ? '0' : '1');
- tep_db_query("update " . TABLE_CUSTOMERS_INFO . " set global_product_notifications = '" . (int)$product_global . "' where customers_info_id = '" . (int)$customer_id . "'");
+ tep_db_query("update " . TABLE_CUSTOMERS_INFO . " set global_product_notifications = '" . (int)$product_global . "' where customers_info_id = '" . (int)$osC_Customer->id . "'");
} elseif (sizeof($products) > 0) {
- $products_parsed = array();
- for ($i=0, $n=sizeof($products); $i<$n; $i++) {
- if (is_numeric($products[$i])) {
- $products_parsed[] = $products[$i];
- }
- }
+ $products_parsed = tep_array_filter($products, 'is_numeric');
if (sizeof($products_parsed) > 0) {
- $check_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS_NOTIFICATIONS . " where customers_id = '" . (int)$customer_id . "' and products_id not in (" . implode(',', $products_parsed) . ")");
+ $check_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS_NOTIFICATIONS . " where customers_id = '" . (int)$osC_Customer->id . "' and products_id not in (" . implode(',', $products_parsed) . ")");
$check = tep_db_fetch_array($check_query);
if ($check['total'] > 0) {
- tep_db_query("delete from " . TABLE_PRODUCTS_NOTIFICATIONS . " where customers_id = '" . (int)$customer_id . "' and products_id not in (" . implode(',', $products_parsed) . ")");
+ tep_db_query("delete from " . TABLE_PRODUCTS_NOTIFICATIONS . " where customers_id = '" . (int)$osC_Customer->id . "' and products_id not in (" . implode(',', $products_parsed) . ")");
}
}
} else {
- $check_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS_NOTIFICATIONS . " where customers_id = '" . (int)$customer_id . "'");
+ $check_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS_NOTIFICATIONS . " where customers_id = '" . (int)$osC_Customer->id . "'");
$check = tep_db_fetch_array($check_query);
if ($check['total'] > 0) {
- tep_db_query("delete from " . TABLE_PRODUCTS_NOTIFICATIONS . " where customers_id = '" . (int)$customer_id . "'");
+ tep_db_query("delete from " . TABLE_PRODUCTS_NOTIFICATIONS . " where customers_id = '" . (int)$osC_Customer->id . "'");
}
}
@@ -177,7 +177,7 @@
<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
- $products_check_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS_NOTIFICATIONS . " where customers_id = '" . (int)$customer_id . "'");
+ $products_check_query = tep_db_query("select count(*) as total from " . TABLE_PRODUCTS_NOTIFICATIONS . " where customers_id = '" . (int)$osC_Customer->id . "'");
$products_check = tep_db_fetch_array($products_check_query);
if ($products_check['total'] > 0) {
?>
@@ -186,7 +186,7 @@
</tr>
<?php
$counter = 0;
- $products_query = tep_db_query("select pd.products_id, pd.products_name from " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_NOTIFICATIONS . " pn where pn.customers_id = '" . (int)$customer_id . "' and pn.products_id = pd.products_id and pd.language_id = '" . (int)$languages_id . "' order by pd.products_name");
+ $products_query = tep_db_query("select pd.products_id, pd.products_name from " . TABLE_PRODUCTS_DESCRIPTION . " pd, " . TABLE_PRODUCTS_NOTIFICATIONS . " pn where pn.customers_id = '" . (int)$osC_Customer->id . "' and pn.products_id = pd.products_id and pd.language_id = '" . (int)$osC_Session->value('languages_id') . "' order by pd.products_name");
while ($products = tep_db_fetch_array($products_query)) {
?>
<tr class="moduleRow" onmouseover="rowOverEffect(this)" onmouseout="rowOutEffect(this)" onclick="checkBox('products[<?php echo $counter; ?>]')">
Index: account_password.php
===================================================================
RCS file: /cvsroot/tep/catalog/catalog/account_password.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- account_password.php 19 May 2003 19:55:45 -0000 1.1
+++ account_password.php 17 Nov 2003 20:45:28 -0000 1.2
@@ -12,18 +12,19 @@
require('includes/application_top.php');
- if (!tep_session_is_registered('customer_id')) {
+ 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 . $language . '/' . FILENAME_ACCOUNT_PASSWORD);
+ require(DIR_WS_LANGUAGES . $osC_Session->value('language') . '/' . FILENAME_ACCOUNT_PASSWORD);
- if (isset($HTTP_POST_VARS['action']) && ($HTTP_POST_VARS['action'] == 'process')) {
- $password_current = tep_db_prepare_input($HTTP_POST_VARS['password_current']);
- $password_new = tep_db_prepare_input($HTTP_POST_VARS['password_new']);
- $password_confirmation = tep_db_prepare_input($HTTP_POST_VARS['password_confirmation']);
+ if (isset($_POST['action']) && ($_POST['action'] == 'process')) {
+ $password_current = tep_db_prepare_input($_POST['password_current']);
+ $password_new = tep_db_prepare_input($_POST['password_new']);
+ $password_confirmation = tep_db_prepare_input($_POST['password_confirmation']);
$error = false;
@@ -42,13 +43,13 @@
}
if ($error == false) {
- $check_customer_query = tep_db_query("select customers_password from " . TABLE_CUSTOMERS . " where customers_id = '" . (int)$customer_id . "'");
+ $check_customer_query = tep_db_query("select customers_password from " . TABLE_CUSTOMERS . " where customers_id = '" . (int)$osC_Customer->id . "'");
$check_customer = tep_db_fetch_array($check_customer_query);
if (tep_validate_password($password_current, $check_customer['customers_password'])) {
- tep_db_query("update " . TABLE_CUSTOMERS . " set customers_password = '" . tep_encrypt_password($password_new) . "' where customers_id = '" . (int)$customer_id . "'");
+ tep_db_query("update " . TABLE_CUSTOMERS . " set customers_password = '" . tep_encrypt_password($password_new) . "' where customers_id = '" . (int)$osC_Customer->id . "'");
- tep_db_query("update " . TABLE_CUSTOMERS_INFO . " set customers_info_date_account_last_modified = now() where customers_info_id = '" . (int)$customer_id . "'");
+ tep_db_query("update " . TABLE_CUSTOMERS_INFO . " set customers_info_date_account_last_modified = now() where customers_info_id = '" . (int)$osC_Customer->id . "'");
$messageStack->add_session('account', SUCCESS_PASSWORD_UPDATED, 'success');
-------------------------------------------------------
This SF. Net email is sponsored by: GoToMyPC
GoToMyPC is the fast, easy and secure way to access your computer from
any Web browser or wireless device. Click here to Try it Free!
https://www.gotomypc.com/tr/OSDN/AW/Q4_2003/t/g22lp?Target=mm/g22lp.tmpl