Merge branch 'master' of git@github.com:plainblack/webgui

docs/changelog/7.x.x.txt

@@ -1,4 +1,18 @@
+7.8.3
+ - fixed #11074: Links to CS posts not working
+ - fixed #11152: Image edits do not autocommit version tags
+ - fixed template attachments are not cleaned up during purge
+ - fixed #11150: matrix - search boxes all ticked
+ - fixed #11063: template_attachments
+ - fixed #11002: Matrix shows backend stuff on load
+ - added #10082: Unarchive all collaboration posts
+ - fixed #11086: bad urls in wiki
+ - fixed #11047: required field on dataform
+ - fixed #11162: Can't delete calendar Related Material Link
+ - fixed #11154: vendor payouts screen borked ( Martin Kamerbeek / Oqapi )
+
 7.8.2
+ - Added scheduled vendor payout workflow activity. (Special thanks to Martin @ Oqapi)
  - fixed #11098: Leaving a version tag makes everyone leave
  - fixed #11096: Error on deleting FAQ(CS)-item
  - fixed #11060: Some tables have latin1 as the default character set
@@ -29,6 +43,11 @@
  - fixed #11156: Syndicated Content doesn't show all headlines in feed
  - fixed #11138: RichEdit, upload image does not commit a version tag
  - fixed ExpireIncompleteSurveyResponses Workflow: process responses for deleted users
+ - fixed #11157: calendar tool for entering add event date
+ - fixed #11158: Calendar iCal feed doesn't show today's all-day events
+ - added #10614: Force rich editor to use strong and em instead of b and i
+ - fixed #11131: https / http URLs still caching across secure/insecure boundary
+ - fixed #11093: Spectre cron can DoS server with many sites
 
 7.8.1
  - mark $session->datetime->time as deprecated and remove its use from core code

docs/gotcha.txt

@@ -7,6 +7,11 @@ upgrading from one version to the next, or even between multiple
 versions. Be sure to heed the warnings contained herein as they will
 save you many hours of grief.
 
+7.8.2
+--------------------------------------------------------------------
+ * WebGUI now requires Business::PayPal::API 0.62 or higher.
+
+
 7.8.1
 --------------------------------------------------------------------
 
@@ -32,6 +37,7 @@ save you many hours of grief.
       prefix from the filename.
 
 
+
 7.8.0
 --------------------------------------------------------------------
 

docs/upgrades/upgrade_7.8.1-7.8.2.pl

@@ -35,18 +35,36 @@ fixTableDefaultCharsets($session);
 correctWikiAttachmentPermissions( $session );
 transactionsNotifications( $session );
 fixBadVarCharColumns ( $session );
+addVendorPayouts($session);
 
 finish($session); # this line required
 
 
 #----------------------------------------------------------------------------
-# 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;
-#}
+sub addVendorPayouts {
+    my $session = shift;
+    print "\tAdding vendor payouts... " unless $quiet;
+    my $db = $session->db;
+    $db->write(" create table if not exists vendorPayoutLog (
+        payoutId        char(22) binary not null primary key,
+            isSuccessful    tinyint(1) not null,
+                errorCode       char(10),
+                    errorMessage    char(255),
+                        paypalTimestamp char(20) not null,
+                            amount          decimal(7,2) not null,
+                                currency        char(3) not null,
+                                    correlationId   char(13) not null,
+                                        paymentInformation  char(255) not null
+                                        )");
+    $db->write(" create table if not exists vendorPayoutLog_items (
+        payoutId            char(22) binary not null,
+            transactionItemId   char(22) binary not null,
+                amount              decimal(7,2) not null,
+                    primary key( payoutId, transactionItemId )
+                    )");
+
+    print "DONE!\n" unless $quiet;
+}
 
 #----------------------------------------------------------------------------
 sub fixTableDefaultCharsets {

docs/upgrades/upgrade_7.8.2-7.8.3.pl

@@ -0,0 +1,157 @@
+#!/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.8.3';
+my $quiet; # this line required
+
+
+my $session = start(); # this line required
+
+# upgrade functions go here
+reKeyTemplateAttachments($session);
+addSelectPaymentGatewayTemplateToSettings($session);
+finish($session); # this line required
+
+
+#----------------------------------------------------------------------------
+# Describe what our function does
+sub reKeyTemplateAttachments {
+    my $session = shift;
+    print "\tChanging the key structure for the template attachments table... " unless $quiet;
+    # and here's our code
+    $session->db->write('ALTER TABLE template_attachments ADD COLUMN attachId CHAR(22) BINARY NOT NULL');
+    my $rh = $session->db->read('select url, templateId, revisionDate from template_attachments');
+    my $wh = $session->db->prepare('update template_attachments set attachId=? where url=? and templateId=? and revisionDate=?');
+    while (my @key = $rh->array) {
+        $wh->execute([$session->id->generate, @key ]);
+    }
+    $rh->finish;
+    $wh->finish;
+    $session->db->write('ALTER TABLE template_attachments DROP PRIMARY KEY');
+    $session->db->write('ALTER TABLE template_attachments ADD PRIMARY KEY (attachId)');
+    print "DONE!\n" unless $quiet;
+}
+
+#----------------------------------------------------------------------------
+# add default template for selectPaymentGateway
+sub addSelectPaymentGatewayTemplateToSettings {
+    my $session = shift;
+    print "\tAdding select payment gateway template to settings... " unless $quiet;
+    $session->db->write("insert into settings values ('selectGatewayTemplateId', '2GxjjkRuRkdUg_PccRPjpA');");
+    print "Done.\n" unless $quiet;
+}
+
+#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;
+
+    # 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 { WebGUI::Asset->getImportNode($session)->importPackage( $storage, { overwriteLatest => 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.";
+    }
+
+    # Turn off the package flag, and set the default flag for templates added
+    my $assetIds = $package->getLineage( ['self','descendants'] );
+    for my $assetId ( @{ $assetIds } ) {
+        my $asset   = WebGUI::Asset->newByDynamicClass( $session, $assetId );
+        if ( !$asset ) {
+            print "Couldn't instantiate asset with ID '$assetId'. Please check package '$file' for corruption.\n";
+            next;
+        }
+        my $properties = { isPackage => 0 };
+        if ($asset->isa('WebGUI::Asset::Template')) {
+            $properties->{isDefault} = 1;
+        }
+        $asset->update( $properties );
+    }
+
+    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