Merge commit 'f2e0fb509a' into WebGUI8. Some tests still failing.

docs/changelog/7.x.x.txt

@@ -1,3 +1,24 @@
+7.9.6
+ - new checkbox in the asset manager for clearing the package flag on import
+ - fixed #11597: manageTrash and newlines
+ - fixed #11577: Gallery Album: "Sort by" radio list missing in "Add Archive" view
+ - fixed #11576: Default WebGUI config has a bad macro
+ - fixed #11578: Collaboration System: add edit stamp uses wrong user
+ - added #9774: More owner information in the gallery
+ - fixed #11581: Calendar problems
+ - fixed #11583: EMS: Tokens do not follow their permissions
+ - fixed #11584: Errors on checkout when payment problems occur
+ - fixed #11582: Registering with a .mobi email address
+ - fixed #11580: Date not populated for Story Archive RSS feed
+ - fixed #11587: Thingy, no fields and undefined statement handles
+ - fixed #11589: Syndicated Content: Return raw text for sentence and word template variables
+ - fixed #11573: user has no way of knowing what they are currently using
+ - fixed #11603: Shelf, template variables for sub shelves
+ - added #11504: Allow search by location in the gallery
+ - migrate to getLineageIterator to save memory
+ - add findBrokenAssets.pl to find and fix/delete broken assets
+ - change to use weaken() to save memory
+
 7.9.5
  - Asset->www_copy now has a progress bar
  - fixed #11556: New cart doesn't work with other forms on the same page

docs/gotcha.txt

@@ -17,6 +17,12 @@ save you many hours of grief.
     - Moose
     - CHI
 
+
+7.9.6
+--------------------------------------------------------------------
+     * The javascript check for email addresses has been removed.
+
+
 7.9.5
 --------------------------------------------------------------------
      * Starting in WebGUI 7.9.4, the CHI and Cache::FastMmap modules are required.

docs/upgrades/upgrade_7.9.5-7.9.6.pl

@@ -0,0 +1,161 @@
+#!/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.9.6';
+my $quiet; # this line required
+
+
+my $session = start(); # this line required
+
+# upgrade functions go here
+fixConvertUTCMacroName($session);
+dropOldEMSTableColumn($session);
+addIndexForInbox($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;
+#}
+
+#----------------------------------------------------------------------------
+# Add keys and indicies to groupGroupings to help speed up group queries
+sub addIndexForInbox {
+    my $session = shift;
+    print "\tAdding index to inbox_messageState... " unless $quiet;
+    my $sth = $session->db->read('show create table inbox_messageState');
+    my ($field,$stmt) = $sth->array;
+    $sth->finish;
+    unless ($stmt =~ m/KEY `userId_deleted_isRead`/i) {
+        $session->db->write("alter table inbox_messageState add index userId_deleted_isRead (userId,deleted,isRead)");
+    }
+    print "DONE!\n" unless $quiet;
+}
+
+#----------------------------------------------------------------------------
+# Describe what our function does
+sub fixConvertUTCMacroName {
+    my $session = shift;
+    print "\tFix the name of the ConvertUTCToTZ macro in the config file... " unless $quiet;
+    $session->config->deleteFromHash('macros', 'ConvertToUTC');
+    $session->config->addToHash('macros', 'ConvertUTCToTZ', 'ConvertUTCToTZ');
+    # and here's our code
+    print "DONE!\n" unless $quiet;
+}
+
+#----------------------------------------------------------------------------
+# Describe what our function does
+sub dropOldEMSTableColumn {
+    my $session = shift;
+    print "\tDrop an old column from the EventMangementSystem table that is no longer used... " unless $quiet;
+    $session->db->write(q|ALTER TABLE EventManagementSystem DROP COLUMN groupToApproveEvents|);
+    # 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