Index: openacs-4/packages/ecommerce/www/admin/customer-service/actions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/actions.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/ecommerce/www/admin/customer-service/actions.tcl 20 Aug 2008 20:34:33 -0000 1.5
+++ openacs-4/packages/ecommerce/www/admin/customer-service/actions.tcl 25 Aug 2008 12:32:34 -0000 1.6
@@ -1,5 +1,4 @@
# actions.tcl
-
ad_page_contract {
@param view_info_used:optional
@param view_rep:optional
Index: openacs-4/packages/ecommerce/www/admin/customer-service/customer-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/customer-search.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/customer-service/customer-search.adp 20 Aug 2008 20:34:33 -0000 1.1
+++ openacs-4/packages/ecommerce/www/admin/customer-service/customer-search.adp 25 Aug 2008 12:32:34 -0000 1.2
@@ -10,5 +10,5 @@
<ul>
@user_ids_from_search_html;noquote@
</ul>
- <p><a href="spam-2?show_users_p=t&@export_url_vars_html;noquote@">Spam these users</a></p>
+ <p><a href="spam-2?show_users_p=t&@export_url_vars_html;noquote@">Email these users</a></p>
</else>
Index: openacs-4/packages/ecommerce/www/admin/customer-service/email-send.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/email-send.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/customer-service/email-send.adp 25 Aug 2008 12:32:34 -0000 1.1
@@ -0,0 +1,27 @@
+<master>
+ <property name="doc(title)">@title;noquote@</property>
+ <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+
+ @early_message;noquote@
+<if @email_to_use@ not nil>
+
+<!-- this form should use the standard spell checker tool instead of
+ the ecommerce one -->
+ <form name=email_form method=post action=../tools/spell>
+ @export_form_vars_html;noquote@
+ <table>
+ <tr><td align=right><b>From</td><td>@customer_service_email@</td></tr>
+ <tr><td align=right><b>To</td><td>@email_to_use@</td></tr>
+ <tr><td align=right><b>Cc</td><td><input type=text name=cc_to size=30></td></tr>
+ <tr><td align=right><b>Bcc</td><td><input type=text name=bcc_to size=30></td></tr>
+ <tr><td align=right><b>Subject</td><td><input type=text name=subject size=30></td></tr>
+ <tr><td align=right><b>Message</td><td><textarea wrap name=message rows=10 cols=50></textarea></td></tr>
+ <tr><td align=right><b>Canned Responses</td><td>@email_form_message@</td></tr>
+ </table>
+ <br>
+ <center>
+ <input type=submit value="Send">
+ </center>
+ </form>
+</if>
Index: openacs-4/packages/ecommerce/www/admin/customer-service/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/customer-service/index.adp 20 Aug 2008 20:34:33 -0000 1.1
+++ openacs-4/packages/ecommerce/www/admin/customer-service/index.adp 25 Aug 2008 12:32:34 -0000 1.2
@@ -40,7 +40,7 @@
<h3>Administrative Actions</h3>
<ul>
-<li><a href="spam">Spam Users</a></li>
+<li><a href="spam">Email Users</a></li>
<li><a href="picklists">Picklist Management</a></li>
<li><a href="canned-responses">Prepared Responses</a></li>
<li><a href="statistics">Statistics and Reports</a></li>
Index: openacs-4/packages/ecommerce/www/admin/customer-service/spam-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/spam-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/admin/customer-service/spam-2.adp 25 Aug 2008 05:42:51 -0000 1.2
+++ openacs-4/packages/ecommerce/www/admin/customer-service/spam-2.adp 25 Aug 2008 12:32:34 -0000 1.3
@@ -3,7 +3,7 @@
<property name="context">@context;noquote@</property>
<h2>@title@</h2>
-<p>The following users will be spammed:</p>
+<p>The following users will be emailed:</p>
<ul>
@users_for_spam_html;noquote@
</ul>
@@ -23,7 +23,7 @@
</center>
</form>
<p><b>Notes:</b></p>
-<p>* You can issue a gift certificate to each user you are spamming (if you don't want to, just leave the amount blank).</p>
+<p>* You can issue a gift certificate to each user you are emailing (if you don't want to, just leave the amount blank).</p>
<p>** A customer service issue is created whenever an email is
sent. The issue is automatically closed unless the customer replies to
the issue, in which case it should be reopened.</p>
Index: openacs-4/packages/ecommerce/www/admin/customer-service/spam-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/spam-2.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/ecommerce/www/admin/customer-service/spam-2.tcl 25 Aug 2008 00:00:29 -0000 1.8
+++ openacs-4/packages/ecommerce/www/admin/customer-service/spam-2.tcl 25 Aug 2008 12:32:34 -0000 1.9
@@ -36,7 +36,7 @@
ad_script_abort
}
-set title "Spam Users, continued"
+set title "Email Users, continued"
set context [list [list index "Customer Service"] $title]
if { [info exists show_users_p] && $show_users_p == "t" } {
@@ -84,7 +84,7 @@
} else {
set start ""
set end ""
- ad_return_complaint 1 "<li>I could not determine who you wanted to spam. Please go back to previous page and make a selection.</li>"
+ ad_return_complaint 1 "<li>I could not determine who you wanted to email to. Please go back to previous page and make a selection.</li>"
ad_script_abort
}
Index: openacs-4/packages/ecommerce/www/admin/customer-service/spam-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/spam-3.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/customer-service/spam-3.adp 25 Aug 2008 00:19:36 -0000 1.1
+++ openacs-4/packages/ecommerce/www/admin/customer-service/spam-3.adp 25 Aug 2008 12:32:34 -0000 1.2
@@ -6,7 +6,7 @@
<if @doubleclicked@ true>
<p>You are seeing this page because you probably either tried
reloading the page or pushed the Submit button twice.</p>
- <p>If you wonder whether the users got the spam, just check the
+ <p>If you wonder whether the users got the email, just check the
customer service issues for one of the users (all mail sent to a
user is recorded as a customer service issue).</p>
</if><else>
Index: openacs-4/packages/ecommerce/www/admin/customer-service/spam-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/spam-3.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/ecommerce/www/admin/customer-service/spam-3.tcl 25 Aug 2008 00:20:06 -0000 1.9
+++ openacs-4/packages/ecommerce/www/admin/customer-service/spam-3.tcl 25 Aug 2008 12:32:34 -0000 1.10
@@ -49,7 +49,7 @@
# Get rid of stupid ^Ms
regsub -all "\r" $message "" message
-set title "Spam Sent"
+set title "Email Sent"
set context [list [list index "Customer Service"] $title]
# Doubleclick protection
@@ -150,7 +150,7 @@
to_date(:end_date,'YYYY-MM-DD HH24:MI:SS'))"
set sql $users_query
- set title "Spamming Users..."
+ set title "Emailing Users..."
set spamming_users_html ""
db_foreach get_users_for_spam $sql {
# Create a customer service issue/interaction/action
Index: openacs-4/packages/ecommerce/www/admin/customer-service/spam-log.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/spam-log.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/ecommerce/www/admin/customer-service/spam-log.tcl 25 Aug 2008 00:44:11 -0000 1.5
+++ openacs-4/packages/ecommerce/www/admin/customer-service/spam-log.tcl 25 Aug 2008 12:32:34 -0000 1.6
@@ -13,7 +13,7 @@
ad_require_permission [ad_conn package_id] admin
-set title "Spam Log"
+set title "Email Log"
set context [list [list index "Customer Service"] $title]
set form_alter_date_html "<form method=post action=\"[ad_conn url]\">
Index: openacs-4/packages/ecommerce/www/admin/customer-service/spam.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/spam.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/admin/customer-service/spam.adp 25 Aug 2008 05:42:51 -0000 1.2
+++ openacs-4/packages/ecommerce/www/admin/customer-service/spam.adp 25 Aug 2008 12:32:34 -0000 1.3
@@ -4,25 +4,25 @@
<h2>@title@</h2>
<form method=post action=spam-log>
-<p><input type="submit" value="View spam log">
+<p><input type="submit" value="View email log">
@report_date_range_widget_html;noquote@
</p>
</form>
<ol>
- <li><b>Spam all users in a mailing list:</b> @ml_body;noquote@</li>
- <li><b>Spam all members of a user class:</b> @uc_body;noquote@</li>
- <li><b>Spam all users who bought this product:</b>
+ <li><b>Email all users in a mailing list:</b> @ml_body;noquote@</li>
+ <li><b>Email all members of a user class:</b> @uc_body;noquote@</li>
+ <li><b>Email all users who bought this product:</b>
<form method=post action=spam-2>Product SKU: <input type=text name=product_sku size=5><br>
- <input type=checkbox name=show_users_p value="t" checked>Show me the users who will be spammed.</br>
+ <input type=checkbox name=show_users_p value="t" checked>Show me the users who will be emailed.</br>
<center><input type=submit value="Continue"></center></form></li>
- <li><b>Spam all users who viewed this product:</b>
+ <li><b>Email all users who viewed this product:</b>
<form method=post action=spam-2>Product SKU: <input type=text name=viewed_product_sku size=5><br>
- <input type=checkbox name=show_users_p value="t" checked>Show me the users who will be spammed.<br>
+ <input type=checkbox name=show_users_p value="t" checked>Show me the users who will be emailed.<br>
<center><input type=submit value="Continue"></center></form></li>
- <li><b>Spam all users who viewed this category:</b> @c_body;noquote@</li>
- <li><b>Spam all users whose last visit was:</b>
+ <li><b>Email all users who viewed this category:</b> @c_body;noquote@</li>
+ <li><b>Email all users whose last visit was:</b>
<form method=post action=spam-2>@report_date_range_widget_html;noquote@<br>
- <input type=checkbox name=show_users_p value="t" checked>Show me the users who will be spammed.<br>
+ <input type=checkbox name=show_users_p value="t" checked>Show me the users who will be emailed.<br>
<center><input type=submit value="Continue"></center></form></li>
</ol>
Index: openacs-4/packages/ecommerce/www/admin/customer-service/spam.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/spam.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/ecommerce/www/admin/customer-service/spam.tcl 25 Aug 2008 05:42:51 -0000 1.7
+++ openacs-4/packages/ecommerce/www/admin/customer-service/spam.tcl 25 Aug 2008 12:32:34 -0000 1.8
@@ -76,7 +76,7 @@
}
-set title "Spam Users"
+set title "Email Users"
set context [list [list index "Customer Service"] $title]
@@ -87,10 +87,10 @@
foreach {v name widget} [list ml_body {Mailing lists} $mailing_list_widget uc_body {User classes} $user_class_widget c_body {Category} $only_category_widget] {
if {[string equal [string trim $widget] "<b>none</b>"]} {
- set $v "$name: $widget - No one to spam.\n"
+ set $v "$name: $widget - No one to email.\n"
} else {
set $v "<form method=post action=spam-2>
-<p>$name: $widget <br><input type=checkbox name=show_users_p value=\"t\" checked>Show me the users who will be spammed.</p>
+<p>$name: $widget <br><input type=checkbox name=show_users_p value=\"t\" checked>Show me the users who will be emailed.</p>
<center><input type=submit value=\"Continue\"></center></form>\n"
}
}