Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
In directory
james.mmbase.org:/tmp/cvs-serv1147/portlets-newsletter/src/java/com/finalist/newsletter/util
Modified Files:
NewsletterSubscriptionUtil.java
Log Message:
CMSC-632 Uhm...... resources translated, e-mail adresses and names fixed, and
some more I can't remember.... .
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
See also: http://www.mmbase.org/jira/browse/CMSC-632
Index: NewsletterSubscriptionUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterSubscriptionUtil.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- NewsletterSubscriptionUtil.java 17 Jan 2008 21:47:15 -0000 1.22
+++ NewsletterSubscriptionUtil.java 21 Jan 2008 22:09:00 -0000 1.23
@@ -22,7 +22,8 @@
public static final String SUBSCRIPTION_STATUS_KEY = "subscriptionstatus";
public static final String SUBSCRIPTION_STATUS_ACTIVE =
rb.getString("status.active");
- public static final String SUBSCRIPTION_STATUS_INACTIVE =
rb.getString("status.inactive");
+ public static final String SUBSCRIPTION_STATUS_PAUSED =
rb.getString("status.paused");
+ public static final String SUBSCRIPTION_STATUS_TERMINATED =
rb.getString("status.terminated");
public static final String SUBSCRIPTION_STATUS_DEFAULT =
SUBSCRIPTION_STATUS_ACTIVE;
public static final String STATUS_OPTIONS = "statusoptions";
@@ -30,7 +31,7 @@
static {
statusOptions.add(SUBSCRIPTION_STATUS_ACTIVE);
- statusOptions.add(SUBSCRIPTION_STATUS_INACTIVE);
+ statusOptions.add(SUBSCRIPTION_STATUS_PAUSED);
}
// public static final List AVAILABLE_MIMETYPES = new ArrayList<String>()
@@ -157,7 +158,7 @@
}
public static void pauseSubscription(String userName) {
- setSubscriptionStatus(userName, SUBSCRIPTION_STATUS_INACTIVE);
+ setSubscriptionStatus(userName, SUBSCRIPTION_STATUS_PAUSED);
}
public static void resumeSubscription(String userName) {
@@ -179,13 +180,11 @@
status = SUBSCRIPTION_STATUS_DEFAULT;
}
if (userName != null && status != null) {
- if (statusOptions.contains(status)) {
NewsletterCommunication.removeUserPreference(userName,
SUBSCRIPTION_STATUS_KEY);
NewsletterCommunication.setUserPreference(userName,
SUBSCRIPTION_STATUS_KEY, status);
return;
}
}
- }
private static void subscribe(String userName, List<Integer> objects,
String prefType) {
if (userName != null && objects != null) {
@@ -213,13 +212,20 @@
public static void terminateUserSubscription(String userName) {
if (userName != null) {
- NewsletterCommunication.removeNewsPrefByUser(userName);
+ NewsletterSubscriptionUtil.unsubscribeFromAllNewsletters(userName);
+ NewsletterSubscriptionUtil.unsubscribeFromAllThemes(userName);
+ NewsletterSubscriptionUtil.setSubscriptionStatus(userName,
SUBSCRIPTION_STATUS_TERMINATED);
}
}
public static void unsubscribeFromAllNewsletters(String userName) {
if (userName != null) {
NewsletterCommunication.removeUserPreference(userName, NEWSLETTER);
+ }
+ }
+
+ public static void unsubscribeFromAllThemes(String userName) {
+ if (userName != null) {
NewsletterCommunication.removeUserPreference(userName,
NEWSLETTER_THEME);
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
