Merge branch 'master' into passive_analytics_without_flux

* master:
  Fixed Survey Take template
  Squashed commit of the following: (from survey-rfe branch)
  Fix a POD typo.
  correct inbox message from user preface
  Fix a typo in the Default gallery view template
  Documentation bug in buildArrayRefOfHashRefs
  changed screenshots in Matrix Listing view to popup
  matrix privileging fixes
  Fix an i18n typo in the Post user defined variables.
  Remove debugging code.
  approval workflow fix
  matrix upgrade and privileging fixes
  fixed: Template parser cannot be set
  forward porting gallery bug fixes
  preparing for 7.7.0 dev
  parser should be a selectbox, not a selectlist.
  labeling survey as beta
  fixeding my borkes to the changelog
  fixed #9852: Users can accept private messages from Visitor, but Visitor cannot send messages

lib/WebGUI/Workflow/Activity/ExpireIncompleteSurveyResponses.pm

@@ -0,0 +1,152 @@
+package WebGUI::Workflow::Activity::ExpireIncompleteSurveyResponses;
+
+
+=head1 LEGAL
+
+ -------------------------------------------------------------------
+  WebGUI is Copyright 2001-2008 Plain Black Corporation.
+ -------------------------------------------------------------------
+  Please read the legal notices (docs/legal.txt) and the license
+  (docs/license.txt) that came with this distribution before using
+  this software.
+ -------------------------------------------------------------------
+  http://www.plainblack.com                     info@plainblack.com
+ -------------------------------------------------------------------
+
+=cut
+
+use strict;
+use base 'WebGUI::Workflow::Activity';
+use WebGUI::Asset;
+use WebGUI::DateTime;
+use DateTime::Duration;
+
+=head1 NAME
+
+Package WebGUI::Workflow::Activity::ExpireIncompleteSurveyResponses
+
+=head1 DESCRIPTION
+
+This activity deletes the survey responses for which the allowed time has expired and emails the survey user.
+
+=head1 SYNOPSIS
+
+See WebGUI::Workflow::Activity for details on how to use any activity.
+
+=head1 METHODS
+
+These methods are available from this class:
+
+=cut
+
+
+#-------------------------------------------------------------------
+
+=head2 definition ( session, definition )
+
+See WebGUI::Workflow::Activity::defintion() for details.
+
+=cut 
+
+sub definition {
+	my $class = shift;
+	my $session = shift;
+	my $definition = shift;
+	my $i18n = WebGUI::International->new($session, "Workflow_Activity_ExpireIncompleteSurveyResponses");
+	push(@{$definition}, {
+		name        =>  $i18n->get("name"),
+		properties  => {
+            deleteExpired=>{
+                fieldType=>"yesNo",
+                defaultValue=>0,
+                label=>$i18n->get("Delete expired survey responses"),
+                hoverHelp=>$i18n->get("delete expired")
+                },
+            emailUsers=>{
+                fieldType=>"yesNo",
+                defaultValue=>0,
+                label=>$i18n->get("Email users that responses were deleted"),
+                hoverHelp=>$i18n->get("email users")
+                },
+            emailTemplateId => {
+                fieldType => "template",
+                defaultValue => 'ExpireIncResptmpl00001',
+                namespace => "ExpireIncompleteSurveyResponses",
+                label => $i18n->get('Email template sent to user'),
+                hoverHelp => $i18n->get('email template'),
+                },
+            from => {
+                fieldType=>"text",
+                label=>$i18n->get("from"),
+                defaultValue=>$session->setting->get("companyEmail"),
+                hoverHelp=>$i18n->get("from mouse over"),
+                },
+            subject => {
+                fieldType=>"text",
+                label=>$i18n->get("subject", 'WebGUI'),
+                defaultValue=>"Expired Survey",
+                hoverHelp=>$i18n->get("subject mouse over"),
+                },
+			}
+		});
+	return $class->SUPER::definition($session,$definition);
+}
+
+
+#-------------------------------------------------------------------
+
+=head2 execute ( [ object ] )
+
+Finds all the expired Survey Responses on the system.  If delete is selected, they are removed.  Then if
+email is selected, the users are emailed the template. 
+
+=cut
+
+sub execute {
+	my $self = shift;
+    my $session = $self->session;
+
+    my $sql = "select r.Survey_responseId, r.username, r.userId, upd.email,upd.firstName,upd.lastName, r.startDate, s.timeLimit, ad.title, ad.url  
+                from Survey s, Survey_response r, assetData ad, userProfileData upd
+                where r.isComplete = 0 and s.timeLimit > 0 and (unix_timestamp() - r.startDate) > (s.timeLimit * 60) 
+                    and r.assetId = s.assetId and s.revisionDate = (select max(revisionDate) from Survey where assetId = s.assetId)
+                    and ad.assetId = s.assetId and ad.revisionDate = s.revisionDate and upd.userId = r.userId"; 
+    my $refs = $self->session->db->buildArrayRefOfHashRefs($sql);
+    for my $ref (@{$refs}) {
+        if($self->get("deleteExpired") == 1){
+            $self->session->db->write("delete from Survey_response where Survey_responseId = ?",[$ref->{Survey_responseId}]);
+        }else{#else sent to expired but not deleted
+            $self->session->db->write("update Survey_response set isComplete = 99 where Survey_responseId = ?",[$ref->{Survey_responseId}]);
+        }
+        if($self->get("emailUsers") == 1 && $ref->{email} =~ /\@/){
+
+            my $var = { 
+                    to  =>  $ref->{email},
+                    from => $self->get("from"),
+                    firstName => $ref->{firstName},
+                    lastName => $ref->{lastName},
+                    surveyTitle => $ref->{title},
+                    surveyUrl => $ref->{url},
+                    responseId => $ref->{Survey_responseId},
+                    deleted => $self->get("deleteExpired"),
+                    companyName => $self->session->setting->get("companyName"),
+                };
+            my $template = WebGUI::Asset->newByDynamicClass($self->session,$self->get('emailTemplateId')); 
+            my $message = $template->processTemplate($var, $self->get("emailTemplateId"));
+            WebGUI::Macro::process($self->session,\$message);
+            my $mail = WebGUI::Mail::Send->create($self->session,{
+                to      => $ref->{email},
+                subject => $self->get("subject"),
+                from    => $self->get('from'),
+            });
+            $mail->addHtml($message);
+            $mail->addFooter;
+            $mail->queue;
+        }
+    }
+	return $self->COMPLETE;
+}
+
+1;
+
+

lib/WebGUI/Workflow/Activity/RequestApprovalForVersionTag.pm

@@ -342,8 +342,10 @@ sub setMessageCompleted {
 
     # Set all messages to completed
     for my $messageId ( split /,/, $instance->getScratch("messageId") ) { 
-        my $message = $inbox->getMessage( $messageId );
-        $message->setCompleted;
+        if($messageId){
+            my $message = $inbox->getMessage( $messageId );
+            $message->setCompleted;
+        }
     }
 
     $instance->deleteScratch( "messageId" );