Merge commit 'v7.10.21' into WebGUI8. Also, add POD and fix broken tests.

docs/changelog/7.x.x.txt

@@ -1,3 +1,13 @@
+7.10.21
+ - added #9668 extension template variable to attachment loops for the following assets:
+      Article,Post,Event,File,Form::Attachments,Folder
+ - added WaitForUserConfirmation workflow activity
+ - added new setting - Enable Users after Anonymous Registration?
+ - added the optional WebGUI::Content::PDFGenerator, not enabled by default
+   (see the module's documentation).
+ - fixed #12204: Default forum notification template produces invalid HTML
+ - fixed #12202: JsonTable refers to unexistent YUI file
+
 7.10.20
  - fixed: Do not call group methods on an undefined value.
  - fixed #12178: random deletion of columns may happen when a schema is saved (Amir Plivatsky)
@@ -13,6 +23,7 @@
  - fixed #12135: Geo::Coder::Googlev3 needs common sense
  - fixed #12183: Posts do not disqualify themselves when purged
  - fixed #12189: installClass ignores preload.custom
+ - fixed #12197: Default date Thingy disables date
 
 7.10.19
  - fixed #12169: extras uploads symlink export
@@ -4224,3 +4235,4 @@
  - Made the Include macro more secure.
  - Added Len's patch to fix some caching problems.
 
+

docs/gotcha.txt

@@ -31,6 +31,10 @@ save you many hours of grief.
        Account Macro template
        Admin Toggle Macro template
 
+7.10.21
+--------------------------------------------------------------------
+    * WebGUI now depends on Kwargs.
+
 7.10.17
 --------------------------------------------------------------------
     * Due to a formatting problem with form variables in the PayPal driver, WebGUI

docs/upgrades/upgrade_7.10.20-7.10.21.pl

@@ -0,0 +1,146 @@
+#!/usr/bin/env perl
+
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2009 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
+#-------------------------------------------------------------------
+
+our ($webguiRoot);
+
+BEGIN {
+    $webguiRoot = "../..";
+    unshift (@INC, $webguiRoot."/lib");
+}
+
+use strict;
+use Getopt::Long;
+use WebGUI::Session;
+use WebGUI::Storage;
+use WebGUI::Asset;
+
+
+my $toVersion = '7.10.21';
+my $quiet; # this line required
+
+
+my $session = start(); # this line required
+addWaitForConfirmationWorkflow($session);
+addCreateUsersEnabledSetting($session);
+finish($session); # this line required
+
+
+#----------------------------------------------------------------------------
+sub addWaitForConfirmationWorkflow {
+    my $session = shift;
+    my $c       = $session->config;
+    my $exists  = $c->get('workflowActivities/WebGUI::User');
+    my $class   = 'WebGUI::Workflow::Activity::WaitForUserConfirmation';
+    unless (grep { $_ eq $class } @$exists) {
+        print "Adding WaitForUserConfirmation workflow..." unless $quiet;
+        $c->addToArray('workflowActivities/WebGUI::User' => $class);
+        print "Done!\n" unless $quiet;
+    }
+}
+
+#----------------------------------------------------------------------------
+sub addCreateUsersEnabledSetting {
+    my $session = shift;
+    my $s       = $session->setting;
+    my $name    = 'enableUsersAfterAnonymousRegistration';
+    return if $s->has($name);
+    print "Adding $name setting..." unless $quiet;
+    $s->add($name => 1);
+    print "Done!\n" unless $quiet;
+}
+
+#----------------------------------------------------------------------------
+# Describe what our function does
+#sub exampleFunction {
+#    my $session = shift;
+#    print "\tWe're doing some stuff here that you should know about... " unless $quiet;
+#    # and here's our code
+#    print "DONE!\n" unless $quiet;
+#}
+
+
+# -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
+
+#----------------------------------------------------------------------------
+# Add a package to the import node
+sub addPackage {
+    my $session     = shift;
+    my $file        = shift;
+
+    print "\tUpgrading package $file\n" unless $quiet;
+    # Make a storage location for the package
+    my $storage     = WebGUI::Storage->createTemp( $session );
+    $storage->addFileFromFilesystem( $file );
+
+    # Import the package into the import node
+    my $package = eval {
+        my $node = WebGUI::Asset->getImportNode($session);
+        $node->importPackage( $storage, {
+            overwriteLatest    => 1,
+            clearPackageFlag   => 1,
+            setDefaultTemplate => 1,
+        } );
+    };
+
+    if ($package eq 'corrupt') {
+        die "Corrupt package found in $file.  Stopping upgrade.\n";
+    }
+    if ($@ || !defined $package) {
+        die "Error during package import on $file: $@\nStopping upgrade\n.";
+    }
+
+    return;
+}
+
+#-------------------------------------------------
+sub start {
+    my $configFile;
+    $|=1; #disable output buffering
+    GetOptions(
+        'configFile=s'=>\$configFile,
+        'quiet'=>\$quiet
+    );
+    my $session = WebGUI::Session->open($webguiRoot,$configFile);
+    $session->user({userId=>3});
+    my $versionTag = WebGUI::VersionTag->getWorking($session);
+    $versionTag->set({name=>"Upgrade to ".$toVersion});
+    return $session;
+}
+
+#-------------------------------------------------
+sub finish {
+    my $session = shift;
+    updateTemplates($session);
+    my $versionTag = WebGUI::VersionTag->getWorking($session);
+    $versionTag->commit;
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
+    $session->close();
+}
+
+#-------------------------------------------------
+sub updateTemplates {
+    my $session = shift;
+    return undef unless (-d "packages-".$toVersion);
+    print "\tUpdating packages.\n" unless ($quiet);
+    opendir(DIR,"packages-".$toVersion);
+    my @files = readdir(DIR);
+    closedir(DIR);
+    my $newFolder = undef;
+    foreach my $file (@files) {
+        next unless ($file =~ /\.wgpkg$/);
+        # Fix the filename to include a path
+        $file       = "packages-" . $toVersion . "/" . $file;
+        addPackage( $session, $file );
+    }
+}
+
+#vim:ft=perl