From 04f39ebc197b80bcc74351825c43066f8a689c99 Mon Sep 17 00:00:00 2001
From: Martin Kamerbeek <martin@martintwee.oqapi.nl>
Date: Wed, 19 May 2010 17:06:18 +0200
Subject: [PATCH] Adding basic per instance mailing configuration.

---
 lib/WebGUI/AssetAspect/Mailable.pm            |  39 +++++++++--
 lib/WebGUI/Mailing.pm                         |  63 ++++++++++++++++++
 lib/WebGUI/Mailing/Admin.pm                   |   4 +-
 lib/WebGUI/Mailing/Email.pm                   |   6 +-
 .../root_import_personalnewsletter.wgpkg      | Bin 1544 -> 1891 bytes
 5 files changed, 104 insertions(+), 8 deletions(-)

diff --git a/lib/WebGUI/AssetAspect/Mailable.pm b/lib/WebGUI/AssetAspect/Mailable.pm
index 9bc1a75..6fd9790 100644
--- a/lib/WebGUI/AssetAspect/Mailable.pm
+++ b/lib/WebGUI/AssetAspect/Mailable.pm
@@ -5,6 +5,7 @@ use warnings;
 use Class::C3; 
 
 use WebGUI::Macro;
+use Tie::IxHash;
 
 ##----------------------------------------------------------------------------
 #sub configureMailingForm {
@@ -62,6 +63,33 @@ sub getIssueList {
     return;
 }
 
+#----------------------------------------------------------------------------
+sub getSubject {
+    my $self            = shift;
+    my $configuration   = shift || {};
+
+    return $configuration->{ subject } || '(No subject)';
+}
+
+#----------------------------------------------------------------------------
+sub getMailingProperties {
+    my $self = shift;
+    tie my %properties, 'Tie::IxHash', (
+        subject     => {
+            fieldType   => 'text',
+            label       => 'subject',
+        },
+        styleTemplateId => {
+            fieldType   => 'template',
+            label       => 'Style template',
+            defaultValue=> $self->get('mailStyleTemplateId'),
+            namespace   => 'style',
+        },
+    );
+
+    return \%properties;
+}
+
 #----------------------------------------------------------------------------
 sub getRecipients {
     WebGUI::Error::OverrideMe->throw;
@@ -70,9 +98,11 @@ sub getRecipients {
 
 #----------------------------------------------------------------------------
 sub processContentAsUser {
-    my $self        = shift;
-    my $issueId     = shift;
-    my $userId      = shift;
+    my $self            = shift;
+    my $issueId         = shift;
+    my $userId          = shift;
+    my $configuration   = shift || {};
+
     my $session     = $self->session;
     my $currentUser = $session->user;
 
@@ -81,7 +111,8 @@ sub processContentAsUser {
     $session->log->preventDebugOutput;
 
     my $styleTemplateId = 
-           $self->get('mailStyleTemplateId') 
+           $configuration->{ styleTemplateId } 
+        || $self->get('mailStyleTemplateId') 
         || $self->get('styleTemplateId');
 
     # Generate email body for this user
diff --git a/lib/WebGUI/Mailing.pm b/lib/WebGUI/Mailing.pm
index 443b145..eb4fdbf 100644
--- a/lib/WebGUI/Mailing.pm
+++ b/lib/WebGUI/Mailing.pm
@@ -28,6 +28,7 @@ sub crud_definition {
         },
         configuration   => {
             fieldType       => 'textarea',
+            serialize       => 1,
         },
         sendDate        => {
             fieldType       => 'dateTime',
@@ -122,6 +123,68 @@ sub queueEmails {
 
     return;
 }
+
+sub www_delete {
+    my $self    = shift;
+    my $session = $self->session;
+
+    $self->delete;
+
+    return WebGUI::Mailing::Admin->new($session)->www_view;
+}
+
+sub www_edit {
+    my $self    = shift;
+    my $session = $self->session;
+
+    my $f = WebGUI::HTMLForm->new( $session );
+    $f->hidden(
+        name    => 'newsletter',
+        value   => 'mailing',
+    );
+    $f->hidden(
+        name    => 'func',
+        value   => 'editSave',
+    );
+    $f->hidden(
+        name    => 'id',
+        value   => $self->getId,
+    );
+
+    my %fields          = %{ $self->getAsset->getMailingProperties };
+    my $configuration   = $self->get('configuration') || {};
+    while ( my( $name, $properties ) = each %fields ) {
+        $f->dynamicField(
+            name    => $name,
+            %{ $properties },
+            value   => $configuration->{ $name },
+        );
+    }
+
+    $f->submit;
+
+    return WebGUI::Mailing::Admin->new($session)->getAdminConsole->render( $f->print, 'Configure mailing' );
+}
+
+sub www_editSave {
+    my $self    = shift;
+    my $session = $self->session;
+    my $form    = $session->form;
+
+    my %fields          = %{ $self->getAsset->getMailingProperties };
+    my $configuration   = {}; 
+    while ( my( $name, $properties ) = each %fields ) {
+        my $value = $form->process( $name, $properties->{ fieldType }, $properties->{ defaultValue } );
+
+        $configuration->{ $name } = $value;
+    }
+    
+    #### TODO: Add error checking and required fields?
+    $self->update( { configuration => $configuration } );
+
+    return WebGUI::Mailing::Admin->new( $session )->www_view;
+}
+
 sub www_sendBatch {
     my $self    = shift;
     my $session = $self->session;
diff --git a/lib/WebGUI/Mailing/Admin.pm b/lib/WebGUI/Mailing/Admin.pm
index e21b763..526e0a9 100644
--- a/lib/WebGUI/Mailing/Admin.pm
+++ b/lib/WebGUI/Mailing/Admin.pm
@@ -60,7 +60,7 @@ sub www_createMailing {
         active  => 0,
     } );
 
-    return $self->www_view;
+    return $mailing->www_edit;
 }
 
 sub www_settings {
@@ -124,6 +124,8 @@ sub www_view {
                     status          => $mailing->getStatusLine,
                     sendTestUrl     => $url->page('newsletter=mailing;func=sendTestEmails;id='.$mailing->getId),
                     sendUrl         => $url->page('newsletter=mailing;func=sendBatch;id='.$mailing->getId),
+                    editUrl         => $url->page('newsletter=mailing;func=edit;id='.$mailing->getId),
+                    deleteUrl       => $url->page('newsletter=mailing;func=delete;id='.$mailing->getId),
                 };
             };
 
diff --git a/lib/WebGUI/Mailing/Email.pm b/lib/WebGUI/Mailing/Email.pm
index d6e86e4..02d01e7 100644
--- a/lib/WebGUI/Mailing/Email.pm
+++ b/lib/WebGUI/Mailing/Email.pm
@@ -150,8 +150,9 @@ sub send {
 
     #### TODO: Error checking
     my $mailing = $self->getMailing;
+    my $configuration = $mailing->get('configuration') || {};
     my $asset   = $mailing->getAsset;
-    my $content = $asset->processContentAsUser( $mailing->get('issueId'), $self->get('userId') );
+    my $content = $asset->processContentAsUser( $mailing->get('issueId'), $self->get('userId'), $configuration );
     my $body    = $self->absolutifyURIs( $content, $asset->getUrl );
 
     # Mail is a test mail but there is noone to send the result to
@@ -169,7 +170,7 @@ sub send {
     }
 
     # Fetch subject
-    my $subject = '[TEST] Subject selection still needs to be implemented.';
+    my $subject   = $asset->getSubject( $configuration );
 
     my $messageId = $id->toHex( $self->getId );
     my $domain    = $session->setting->get( 'newsletterReturnDomain' );
@@ -187,7 +188,6 @@ sub send {
     # And send it.  
     my $success = $mail->send;
 
-$session->log->warn( "Sending email to [$to]" );
     if ( $success ne '1' ) {
         $self->error( "Mail couldn't be sent by WebGUI::Mail::Send" );
     }
diff --git a/sbin/packages/root_import_personalnewsletter.wgpkg b/sbin/packages/root_import_personalnewsletter.wgpkg
index 484edbdb0aefb17634b34f22c376dda1724a079c..f8d796ff3b94cd9864bd4b8ab0d36b66e45639f8 100644
GIT binary patch
literal 1891
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

literal 1544
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