few more bug fixes and preparing for 7.0.3 release

docs/changelog/7.x.x.txt

@@ -57,6 +57,11 @@
    workflow is unwanted.
  - fix: WebGUI::International::get can't handle spaces
  - fix: makePagePrintable macro uses style name instead of styleId
+ - fix: Tell A Friend
+ - Fixed a crash problem with Spectre run once cron jobs.
+ - Fixed a formatting problem and a data collision problem with the Create
+   Cron Job workflow activity.
+ - fix: HTML tags in subject
 
 
 7.0.2

docs/gotcha.txt

@@ -19,6 +19,10 @@ save you many hours of grief.
    If you're using this macro, you might need to increment the max
    parameter.
 
+ * We've made a number of improvements and bug fixes to the search
+   indexing system in this release. You may want to use the search.pl
+   utiltity in sbin to reindex your site to get better search results.
+
 
 7.0.2
 --------------------------------------------------------------------

docs/upgrades/upgrade_7.0.2-7.0.3.pl

@@ -12,7 +12,8 @@ use lib "../../lib";
 use strict;
 use Getopt::Long;
 use WebGUI::Session;
-
+use WebGUI::Asset;
+use WebGUI::HTML;
 
 my $toVersion = "7.0.3"; # make this match what version you're going to
 my $quiet; # this line required
@@ -23,10 +24,22 @@ my $session = start(); # this line required
 
 deleteTemplate();
 addConfigOption();
+fixPostSubjects();
 
 finish($session); # this line required
 
 
+#-------------------------------------------------
+sub fixPostSubjects {
+	print "\tRemoving HTML from CS Post subjects.\n" unless ($quiet);
+	my $write = $session->db->prepare("update assetData set title=? where assetId=? and revisionDate=?");
+	my $sth = $session->db->read("select title, asset.assetId, assetData.revisionDate from assetData left join asset on assetData.assetId=asset.assetId where asset.className like 'WebGUI::Asset::Post%'");
+	while (my $row = $sth->arrayRef) {
+		$row->[0] = WebGUI::HTML::filter($row->[0], "all");		
+		$write->execute($row);
+	}
+}
+
 #-------------------------------------------------
 sub addConfigOption {
 	print "\tAdding save and commit option.\n" unless ($quiet);

lib/Spectre/Cron.pm

@@ -425,28 +425,34 @@ sub runJobResponse {
 	my $id = $request->header("X-jobId");	# got to figure out how to get this from the request, cuz the response may die
 	$self->debug("Response retrieved is for job $id.");
 	if ($response->is_success) {
-		$self->debug("Response for job $id retrieved successfully.");
+		my $job = $self->getJob($id);
-		if ($response->header("Set-Cookie") ne "") {
+		if (defined $job && ref $job eq "HASH") {
-			$self->debug("Storing cookie for $id for later use.");
+			$self->debug("Response for job $id retrieved successfully.");
-			my $cookie = $response->header("Set-Cookie");
+			if ($response->header("Set-Cookie") ne "") {
-			$cookie =~ s/wgSession=([a-zA-Z0-9\_\-]{22}).*/$1/;
+				$self->debug("Storing cookie for $id for later use.");
-			$self->{_cookies}{$self->getJob($id)->{sitename}} = $cookie;
+				my $cookie = $response->header("Set-Cookie");
-		}
+				$cookie =~ s/wgSession=([a-zA-Z0-9\_\-]{22}).*/$1/;
-		my $state = $response->content; 
+				$self->{_cookies}{$job->{sitename}} = $cookie;
-		if ($state eq "done") {
+			}
-			delete $self->{_errorCount}{$id};
+			my $state = $response->content; 
-			$self->debug("Job $id is now complete.");
+			if ($state eq "done") {
-			if ($self->getJob($id)->{runOnce}) {
+				delete $self->{_errorCount}{$id};
-				$kernel->yield("deleteJob",$id);
+				$self->debug("Job $id is now complete.");
+				if ($job->{runOnce}) {
+					$kernel->yield("deleteJob",$id);
+				}
+			} elsif ($state eq "error") {
+				$self->{_errorCount}{$id}++;
+				$self->debug("Got an error response for job $id, will try again in ".$self->config->get("suspensionDelay")." seconds.");
+				$kernel->delay_set("runJob",$self->config->get("suspensionDelay"),$id);
+			} else {
+				$self->{_errorCount}{$id}++;
+				$self->error("Something bad happened on the return of job $id, will try again in ".$self->config->get("suspensionDelay")." seconds. ".$response->error_as_HTML);
+				$kernel->delay_set("runJob",$self->config->get("suspensionDelay"),$id);
 			}
-		} elsif ($state eq "error") {
-			$self->{_errorCount}{$id}++;
-			$self->debug("Got an error response for job $id, will try again in ".$self->config->get("suspensionDelay")." seconds.");
-			$kernel->delay_set("runJob",$self->config->get("suspensionDelay"),$id);
 		} else {
 			$self->{_errorCount}{$id}++;
-			$self->error("Something bad happened on the return of job $id, will try again in ".$self->config->get("suspensionDelay")." seconds. ".$response->error_as_HTML);
+			$self->error("Job $id is not in our queue.");
-			$kernel->delay_set("runJob",$self->config->get("suspensionDelay"),$id);
 		}
 	} elsif ($response->is_redirect) {
 		$self->error("Response for $id was redirected. This should never happen if configured properly!!!");

lib/WebGUI/Asset/Shortcut.pm

@@ -299,7 +299,10 @@ Returns the extraHeadTags stored in the asset.  Called in $self->session->style-
 
 sub getExtraHeadTags {
 	my $self = shift;
-	return $self->get("extraHeadTags")."\n".$self->getShortcut->get("extraHeadTags");
+	my $output = $self->get("extraHeadTags")."\n";
+	my $shortcut = $self->getShortcut;
+	$output .= $self->getShortcut->get("extraHeadTags") if defined $shortcut;
+	return $output;
 }
 
 #-------------------------------------------------------------------

lib/WebGUI/Operation/Workflow.pm

@@ -115,7 +115,6 @@ sub www_deleteWorkflowActivity {
 	my $workflow = WebGUI::Workflow->new($session, $session->form->get("workflowId"));
 	if (defined $workflow) {
 		$workflow->deleteActivity($session->form->get("activityId"));
-		$workflow->set({enabled=>0});
 	}
 	return www_editWorkflow($session);
 }

lib/WebGUI/Workflow/Activity/CreateCronJob.pm

@@ -69,7 +69,7 @@ sub definition {
 				label=>$i18n->get("run once"),
 				hoverHelp=>$i18n->get("run once help")
 				},
-			workflowId=>{
+			workflowIdToRun=>{
 				fieldType=>"workflow",
 				defaultValue=>undef,
 				label=>$i18n->get("workflow"),
@@ -137,7 +137,7 @@ sub execute {
 		title=>"Generated by workflow instance ".$instance->getId." (".$self->get("title").")",
 		enabled=>$self->get("enabled"),
 		runOnce=>$self->get("runOnce"),
-		workflowId=>$self->get("workflowId"),
+		workflowId=>$self->get("workflowIdToRun"),
 		priority=>$self->get("priority"),
 		minuteOfHour=>$self->get("minuteOfHour"),
 		hourOfDay=>$self->get("hourOfDay"),