- fix [ 1488598 ] edit workflow broken

- fix [ 1488561 ] webggui
 - fix [ 1488557 ] new styles are missing ^/; in link
 - fix [ 1488530 ] search has no toolbar
 - fix [ 1488663 ] Add new subscription broken
 - fix [ 1485461 ] Internationalized the Date in Mail headers
 - fix [ 1488518 ] Snippet has no cacheTimeout field
 - fix [ 1486788 ] karma isn't working on forums

docs/changelog/6.x.x.txt

@@ -1,11 +1,20 @@
 6.99.1
  - Bugfixes on dashboard to fix template errors.
+ - fix [ 1488849 ] Can't instantiate template (Dashboard)
  - Bug fixes to make WebGUI work with the WRE demo system.
  - Fixed a typo in the activities in the config file.
  - fixed a bug that caused threadId's to be empty in new posts
  - fix [ 1489123 ] problem with graphing (Martin Kamerbeek / Procolix) 
  - Fixed a problem where anybody could see the complete list of admin console
    functions in the adminbar, even though they couldn't actually use them.
+ - fix [ 1488598 ] edit workflow broken
+ - fix [ 1488561 ] webggui
+ - fix [ 1488557 ] new styles are missing ^/; in link
+ - fix [ 1488530 ] search has no toolbar
+ - fix [ 1488663 ] Add new subscription broken
+ - fix [ 1485461 ] Internationalized the Date in Mail headers
+ - fix [ 1488518 ] Snippet has no cacheTimeout field
+ - fix [ 1486788 ] karma isn't working on forums
  - fix [ 1489094 ] DataForm Record edit link wrong for list mode (Michelle LaMar)
  - fix [ 1488663 ] Add new subscription broken (Martin Kamerbeek / Procolix)
 

docs/upgrades/templates-6.99.1/search.tmpl

@@ -0,0 +1,33 @@
+#PBtmpl0000000000000200
+<a name="id<tmpl_var assetId>" id="id<tmpl_var assetId>"></a>
+
+<tmpl_if session.var.adminOn>
+        <p><tmpl_var controls></p>
+</tmpl_if>
+
+<tmpl_if displayTitle>
+  <h2><tmpl_var title></h2>
+</tmpl_if>
+
+<tmpl_if description>
+  <p><tmpl_var description></p>
+</tmpl_if>
+
+<tmpl_var form_header>
+<tmpl_var form_keywords> <tmpl_var form_submit>
+<tmpl_var form_footer>
+
+<tmpl_if session.form.doit>
+	<tmpl_loop result_set>
+		<dl>
+			<dt><a href="^/;<tmpl_var url>"><tmpl_var title></a></dt>
+			<dd><tmpl_var synopsis></dd>
+		</dl>
+	</tmpl_loop>
+	<tmpl_if pagination.pageCount.isMultiple>
+		<div class="pagination">
+			<tmpl_var pagination.previousPage> &#183; <tmpl_var pagination.pageList.upTo10> &#183; <tmpl_var pagination.nextPage>
+		</div>
+	</tmpl_if>
+</tmpl_if>
+

docs/upgrades/upgrade_6.99.0-6.99.1.pl

@@ -21,9 +21,59 @@ my $quiet; # this line required
 my $session = start(); # this line required
 
 fixTypos($session);
+updateTemplates();
 
 finish($session); # this line required
 
+#-------------------------------------------------
+sub updateTemplates {
+        print "\tFixing template problems\n" unless ($quiet);
+	opendir(DIR,"templates-6.99.1");
+	my @files = readdir(DIR);
+	closedir(DIR);
+	my $importNode = WebGUI::Asset->getImportNode($session);
+	my $folder = $importNode->addChild({
+		className=>"WebGUI::Asset::Wobject::Folder",
+		title => "7.0.0 New Templates",
+		menuTitle => "7.0.0 New Templates",
+		url=> "7_0_0_new_templates",
+		groupIdView=>"12"
+		});
+	foreach my $file (@files) {
+		next unless ($file =~ /\.tmpl$/);
+		open(FILE,"<templates-6.99.1/".$file);
+		my $first = 1;
+		my $create = 0;
+		my $head = 0;
+		my %properties = (className=>"WebGUI::Asset::Template");
+		while (my $line = <FILE>) {
+			if ($first) {
+				$line =~ m/^\#(.*)$/;
+				$properties{id} = $1;
+				$first = 0;
+			} elsif ($line =~ m/^\#create$/) {
+				$create = 1;
+			} elsif ($line =~ m/^\#(.*):(.*)$/) {
+				$properties{$1} = $2;
+			} elsif ($line =~ m/^~~~$/) {
+				$head = 1;
+			} elsif ($head) {
+				$properties{headBlock} .= $line;
+			} else {
+				$properties{template} .= $line;	
+			}
+		}
+		close(FILE);
+		if ($create) {
+			my $template = $folder->addChild(\%properties, $properties{id});
+		} else {
+			my $template = WebGUI::Asset->new($session,$properties{id}, "WebGUI::Asset::Template");
+			if (defined $template) {
+				my $newRevision = $template->addRevision(\%properties);
+			}
+		}
+	}
+}
 
 #-------------------------------------------------
 sub fixTypos {

lib/WebGUI/Asset/Post.pm

@@ -145,9 +145,9 @@ sub commit {
 	$self->getThread->unarchive if ($self->getThread->get("status") eq "archived");
         $self->notifySubscribers;
 	if ($self->isNew) {
-		if ($self->session->setting->get("enableKarma") && $self->getThread->getParent->get("karmaPerPost")) {
+		if ($self->session->setting->get("useKarma") && $self->getThread->getParent->get("karmaPerPost")) {
 			my $u = WebGUI::User->new($self->session, $self->get("ownerUserId"));
-			$u->addKarma($self->getThread->getParent->get("karmaPerPost"), $self->getId, "Collaboration post");
+			$u->karma($self->getThread->getParent->get("karmaPerPost"), $self->getId, "Collaboration post");
 		}
         	$self->getThread->incrementReplies($self->get("dateUpdated"),$self->getId) if ($self->isReply);
 	}

lib/WebGUI/Asset/Snippet.pm

@@ -107,6 +107,14 @@ sub getEditForm {
 	my $self = shift;
 	my $tabform = $self->SUPER::getEditForm();
 	my $i18n = WebGUI::International->new($self->session,"Asset_Snippet");
+	$tabform->getTab("display")->interval(
+		name => "cacheTimeout",
+		defaultValue => 3600,
+		uiLevel => 8,
+		label => $i18n->get("cache timeout"),
+                hoverHelp => $i18n->get("cache timeout help"),
+		value=> $self->getValue("cacheTimeout")
+		);
         $tabform->getTab("properties")->codearea(
                 -name=>"snippet",
                 -label=>$i18n->get('assetName'),

lib/WebGUI/Commerce/Payment.pm

@@ -460,7 +460,8 @@ The period you want the name for.
 =cut
 
 sub recurringPeriodValues {
-	my ($session) = @_;
+	my $class = shift;
+	my $session = shift;
 	my ($i18n, %periods);
 	$i18n = WebGUI::International->new($session, 'Commerce');
 	tie %periods, "Tie::IxHash";	

lib/WebGUI/Operation/Subscription.pm

@@ -309,7 +309,6 @@ sub www_editSubscription {
 	unless ($session->form->process("sid") eq 'new') {
 		$properties = WebGUI::Subscription->new($session,$session->form->process("sid"))->get;
 	}
-
 	$subscriptionId = $session->form->process("sid") || 'new';
 
 	$f = WebGUI::HTMLForm->new($session);