[TEP-COMMIT] [CVS admin] remove the "send email" page, which has been replaced by a email newsletter

hpdl-OfajU3CKLf1/[email protected] 18 Aug 2004 00:00:32 -0000
Newsgroups	gmane.comp.web.oscommerce.cvs
Message-ID	<[email protected]>
Commit in admin/admin on MAIN

mail.php 1.32 removed

includes/filenames.php -1 1.6 -> 1.7

includes/languages/english/mail.php 1.8 removed

includes/languages/espanol/mail.php 1.10 removed

includes/languages/german/mail.php 1.9 removed

-1

4 removed + 1 modified, total 5 files

remove the "send email" page, which has been replaced by a email newsletter
module

----------

admin /admin

mail.php removed after 1.32

diff -N mail.php
--- /tmp/cvsAAAQjaWA3 Wed Aug 18 02:00:29 2004
+++ /dev/null Wed Aug 18 02:00:27 2004
@@ -1,225 +0,0 @@

-<?php
-/*
- $Id$
-
- osCommerce, Open Source E-Commerce Solutions
- http://www.oscommerce.com
-
- Copyright (c) 2003 osCommerce
-
- Released under the GNU General Public License
-*/
-
- require('includes/application_top.php');
-
- $selected_box = 'tools';
-
- $action = (isset($HTTP_GET_VARS['action']) ? $HTTP_GET_VARS['action'] : '');
-
- if ( ($action == 'send_email_to_user') && isset($HTTP_POST_VARS['customers_email_address']) && !isset($HTTP_POST_VARS['back_x']) ) {
- switch ($HTTP_POST_VARS['customers_email_address']) {
- case '***':
- $mail_query = tep_db_query("select customers_firstname, customers_lastname, customers_email_address from " . TABLE_CUSTOMERS);
- $mail_sent_to = TEXT_ALL_CUSTOMERS;
- break;
- case '**D':
- $mail_query = tep_db_query("select customers_firstname, customers_lastname, customers_email_address from " . TABLE_CUSTOMERS . " where customers_newsletter = '1'");
- $mail_sent_to = TEXT_NEWSLETTER_CUSTOMERS;
- break;
- default:
- $customers_email_address = tep_db_prepare_input($HTTP_POST_VARS['customers_email_address']);
-
- $mail_query = tep_db_query("select customers_firstname, customers_lastname, customers_email_address from " . TABLE_CUSTOMERS . " where customers_email_address = '" . tep_db_input($customers_email_address) . "'");
- $mail_sent_to = $HTTP_POST_VARS['customers_email_address'];
- break;
- }
-
- $from = tep_db_prepare_input($HTTP_POST_VARS['from']);
- $subject = tep_db_prepare_input($HTTP_POST_VARS['subject']);
- $message = tep_db_prepare_input($HTTP_POST_VARS['message']);
-
- //Let's build a message object using the email class
- $mimemessage = new email(array('X-Mailer: osCommerce'));
- // add the message to the object
- $mimemessage->add_text($message);
- $mimemessage->build_message();
- while ($mail = tep_db_fetch_array($mail_query)) {
- $mimemessage->send($mail['customers_firstname'] . ' ' . $mail['customers_lastname'], $mail['customers_email_address'], '', $from, $subject);
- }
-
- tep_redirect(tep_href_link(FILENAME_MAIL, 'mail_sent_to=' . urlencode($mail_sent_to)));
- }
-
- if ( ($action == 'preview') && !isset($HTTP_POST_VARS['customers_email_address']) ) {
- $messageStack->add(ERROR_NO_CUSTOMER_SELECTED, 'error');
- }
-
- if (isset($HTTP_GET_VARS['mail_sent_to'])) {
- $messageStack->add(sprintf(NOTICE_EMAIL_SENT_TO, $HTTP_GET_VARS['mail_sent_to']), 'success');
- }
-?>
-<!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>
-<link rel="stylesheet" type="text/css" href="includes/stylesheet.css">
-</head>
-<body marginwidth="0" marginheight="0" topmargin="0" bottommargin="0" leftmargin="0" rightmargin="0" bgcolor="#FFFFFF">
-<!-- header //-->
-<?php require(DIR_WS_INCLUDES . 'header.php'); ?>
-<!-- header_eof //-->
-
-<!-- body //-->
-<table border="0" width="100%" cellspacing="2" cellpadding="2">
- <tr>
- <td width="<?php echo BOX_WIDTH; ?>" valign="top"><table border="0" width="<?php echo BOX_WIDTH; ?>" cellspacing="1" cellpadding="1" class="columnLeft">
-<!-- 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 width="100%"><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_draw_separator('pixel_trans.gif', HEADING_IMAGE_WIDTH, HEADING_IMAGE_HEIGHT); ?></td>
- </tr>
- </table></td>
- </tr>
- <tr>
- <td><table border="0" width="100%" cellspacing="0" cellpadding="2">
-<?php
- if ( ($action == 'preview') && isset($HTTP_POST_VARS['customers_email_address']) ) {
- switch ($HTTP_POST_VARS['customers_email_address']) {
- case '***':
- $mail_sent_to = TEXT_ALL_CUSTOMERS;
- break;
- case '**D':
- $mail_sent_to = TEXT_NEWSLETTER_CUSTOMERS;
- break;
- default:
- $mail_sent_to = $HTTP_POST_VARS['customers_email_address'];
- break;
- }
-?>
- <tr><?php echo tep_draw_form('mail', FILENAME_MAIL, 'action=send_email_to_user'); ?>
- <td><table border="0" width="100%" cellpadding="0" cellspacing="2">
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
- <tr>
- <td class="smallText"><b><?php echo TEXT_CUSTOMER; ?></b><br><?php echo $mail_sent_to; ?></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
- <tr>
- <td class="smallText"><b><?php echo TEXT_FROM; ?></b><br><?php echo htmlspecialchars(stripslashes($HTTP_POST_VARS['from'])); ?></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
- <tr>
- <td class="smallText"><b><?php echo TEXT_SUBJECT; ?></b><br><?php echo htmlspecialchars(stripslashes($HTTP_POST_VARS['subject'])); ?></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
- <tr>
- <td class="smallText"><b><?php echo TEXT_MESSAGE; ?></b><br><?php echo nl2br(htmlspecialchars(stripslashes($HTTP_POST_VARS['message']))); ?></td>
- </tr>
- <tr>
- <td><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
- <tr>
- <td>
-<?php
-/* Re-Post all POST'ed variables */
- reset($HTTP_POST_VARS);
- while (list($key, $value) = each($HTTP_POST_VARS)) {
- if (!is_array($HTTP_POST_VARS[$key])) {
- echo tep_draw_hidden_field($key, htmlspecialchars(stripslashes($value)));
- }
- }
-?>
- <table border="0" width="100%" cellpadding="0" cellspacing="2">
- <tr>
- <td><?php echo tep_image_submit('button_back.gif', IMAGE_BACK, 'name="back"'); ?></td>
- <td align="right"><?php echo '<a href="' . tep_href_link(FILENAME_MAIL) . '">' . tep_image_button('button_cancel.gif', IMAGE_CANCEL) . '</a> ' . tep_image_submit('button_send_mail.gif', IMAGE_SEND_EMAIL); ?></td>
- </tr>
- </table></td>
- </tr>
- </table></td>
- </form></tr>
-<?php
- } else {
-?>
- <tr><?php echo tep_draw_form('mail', FILENAME_MAIL, 'action=preview'); ?>
- <td><table border="0" cellpadding="0" cellspacing="2">
- <tr>
- <td colspan="2"><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
-<?php
- $customers = array();
- $customers[] = array('id' => '', 'text' => TEXT_SELECT_CUSTOMER);
- $customers[] = array('id' => '***', 'text' => TEXT_ALL_CUSTOMERS);
- $customers[] = array('id' => '**D', 'text' => TEXT_NEWSLETTER_CUSTOMERS);
- $mail_query = tep_db_query("select customers_email_address, customers_firstname, customers_lastname from " . TABLE_CUSTOMERS . " order by customers_lastname");
- while($customers_values = tep_db_fetch_array($mail_query)) {
- $customers[] = array('id' => $customers_values['customers_email_address'],
- 'text' => $customers_values['customers_lastname'] . ', ' . $customers_values['customers_firstname'] . ' (' . $customers_values['customers_email_address'] . ')');
- }
-?>
- <tr>
- <td class="main"><?php echo TEXT_CUSTOMER; ?></td>
- <td><?php echo tep_draw_pull_down_menu('customers_email_address', $customers, (isset($HTTP_GET_VARS['customer']) ? $HTTP_GET_VARS['customer'] : ''));?></td>
- </tr>
- <tr>
- <td colspan="2"><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
- <tr>
- <td class="main"><?php echo TEXT_FROM; ?></td>
- <td><?php echo tep_draw_input_field('from', EMAIL_FROM); ?></td>
- </tr>
- <tr>
- <td colspan="2"><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
- <tr>
- <td class="main"><?php echo TEXT_SUBJECT; ?></td>
- <td><?php echo tep_draw_input_field('subject'); ?></td>
- </tr>
- <tr>
- <td colspan="2"><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
- <tr>
- <td valign="top" class="main"><?php echo TEXT_MESSAGE; ?></td>
- <td><?php echo tep_draw_textarea_field('message', 'soft', '60', '15'); ?></td>
- </tr>
- <tr>
- <td colspan="2"><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>
- </tr>
- <tr>
- <td colspan="2" align="right"><?php echo tep_image_submit('button_send_mail.gif', IMAGE_SEND_EMAIL); ?></td>
- </tr>
- </table></td>
- </form></tr>
-<?php
- }
-?>
-<!-- body_text_eof //-->
- </table></td>
- </tr>
- </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'); ?>

----------

admin /admin /includes

filenames.php 1.6 -> 1.7

diff -u -r1.6 -r1.7
--- filenames.php 2004/08/15 18:20:30 1.6
+++ filenames.php 2004/08/18 00:00:29 1.7
@@ -26,7 +26,6 @@

define('FILENAME_FILE_MANAGER', 'file_manager.php');
define('FILENAME_GEO_ZONES', 'geo_zones.php');
define('FILENAME_LANGUAGES', 'languages.php');

- define('FILENAME_MAIL', 'mail.php');

define('FILENAME_MANUFACTURERS', 'manufacturers.php');
define('FILENAME_MODULES', 'modules.php');
define('FILENAME_NEWSLETTERS', 'newsletters.php');

----------

admin /admin /includes /languages /english

mail.php removed after 1.8

diff -N mail.php
--- /tmp/cvsAAAjwaOC3 Wed Aug 18 02:00:30 2004
+++ /dev/null Wed Aug 18 02:00:27 2004
@@ -1,25 +0,0 @@

-<?php
-/*
- $Id$
-
- osCommerce, Open Source E-Commerce Solutions
- http://www.oscommerce.com
-
- Copyright (c) 2002 osCommerce
-
- Released under the GNU General Public License
-*/
-
-define('HEADING_TITLE', 'Send Email To Customers');
-
-define('TEXT_CUSTOMER', 'Customer:');
-define('TEXT_SUBJECT', 'Subject:');
-define('TEXT_FROM', 'From:');
-define('TEXT_MESSAGE', 'Message:');
-define('TEXT_SELECT_CUSTOMER', 'Select Customer');
-define('TEXT_ALL_CUSTOMERS', 'All Customers');
-define('TEXT_NEWSLETTER_CUSTOMERS', 'To All Newsletter Subscribers');
-
-define('NOTICE_EMAIL_SENT_TO', 'Notice: Email sent to: %s');
-define('ERROR_NO_CUSTOMER_SELECTED', 'Error: No customer has been selected.');
-?>

----------

admin /admin /includes /languages /espanol

mail.php removed after 1.10

diff -N mail.php
--- /tmp/cvsAAA2BayD3 Wed Aug 18 02:00:30 2004
+++ /dev/null Wed Aug 18 02:00:27 2004
@@ -1,25 +0,0 @@

-<?php
-/*
- $Id$
-
- osCommerce, Open Source E-Commerce Solutions
- http://www.oscommerce.com
-
- Copyright (c) 2003 osCommerce
-
- Released under the GNU General Public License
-*/
-
-define('HEADING_TITLE', 'Enviar Email a Cliente(s)');
-
-define('TEXT_CUSTOMER', 'Cliente:');
-define('TEXT_SUBJECT', 'Asunto:');
-define('TEXT_FROM', 'Desde:');
-define('TEXT_MESSAGE', 'Mensaje:');
-define('TEXT_SELECT_CUSTOMER', 'Seleccionar Cliente');
-define('TEXT_ALL_CUSTOMERS', 'Todos los Clientes');
-define('TEXT_NEWSLETTER_CUSTOMERS', 'Todos los Suscritos');
-
-define('NOTICE_EMAIL_SENT_TO', 'Aviso: Email enviado a: %s');
-define('ERROR_NO_CUSTOMER_SELECTED', 'Error: No ha seleccionado ningun cliente.');
-?>

\ No newline at end of file

----------

admin /admin /includes /languages /german

mail.php removed after 1.9

diff -N mail.php
--- /tmp/cvsAAApLayE3 Wed Aug 18 02:00:31 2004
+++ /dev/null Wed Aug 18 02:00:27 2004
@@ -1,25 +0,0 @@

-<?php
-/*
- $Id$
-
- osCommerce, Open Source E-Commerce Solutions
- http://www.oscommerce.com
-
- Copyright (c) 2002 osCommerce
-
- Released under the GNU General Public License
-*/
-
-define('HEADING_TITLE', 'eMail an Kunden versenden');
-
-define('TEXT_CUSTOMER', 'Kunde:');
-define('TEXT_SUBJECT', 'Betreff:');
-define('TEXT_FROM', 'Absender:');
-define('TEXT_MESSAGE', 'Nachricht:');
-define('TEXT_SELECT_CUSTOMER', 'Kunden ausw&auml;hlen');
-define('TEXT_ALL_CUSTOMERS', 'Alle Kunden');
-define('TEXT_NEWSLETTER_CUSTOMERS', 'An alle Newsletter-Abonnenten');
-
-define('NOTICE_EMAIL_SENT_TO', 'Hinweis: eMail wurde versendet an: %s');
-define('ERROR_NO_CUSTOMER_SELECTED', 'Fehler: Es wurde kein Kunde ausgew&auml;hlt.');
-?>

\ No newline at end of file
CVSspam 0.2.9

-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285