Merge commit '4969f31e1f' into WebGUI8

docs/changelog/7.x.x.txt

@@ -1,4 +1,29 @@
 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
+ - fixed #11557: Shop credit deduction calculated incorrectly
+ - fixed #11561: PayDriver_Cash - password help
+ - fixed #11541: running workflows screen
+ - fixed #11544: VersionTag Workflows with missing Version Tags run forever
+ - fixed #11555: Wiki subcategories entry field is not labeled
+ - fixed: UserList asset has SQL injection bug
+ - fixed #11558: wiki results for visitors 
+ - fixed #11533: Saving entered data at registration
+ - fixed #11564: Shop: Cart does not require a state field in the address
+ - fixed #11562: Missing perl modules in gotcha
+ - fixed #11565: Can't clear cache on plainblack.com
+ - fixed #11540: Pending version tags are not completed on approval under certain conditions
+ - fixed #11566: Group API: group membership cannot be checked without consideration of expiration dates.
+ - fixed #11567: EMS: Build badge page, ticket tab, pagination
+ - added: a new inbox setting which supresses friend rejection notices
+ - fixed #11552: Visitors (and others) can bypass group-by-IP restrictions
+ - fixed #11572: visitors can enter editProfile
+ - fixed #11563: Syndicated Content - descriptionFirstParagraph cuts off
+ - fixed #11538: User invite mail: whitespace in message lost
+ - fixed #11549: Shortcut Asset cannot override Page Layout
+ - added #11502: Gallery: Allow specification of location when uploading ZIP archives
+ - added #11517: Gallery: Sorting of files uploaded in zip archives
+ - fixed #11559: Unsubscribe Link in Emails
 
 7.9.4
  - We're shipping underscore.js now for its suite of extremely handy utility

docs/gotcha.txt

@@ -17,6 +17,14 @@ save you many hours of grief.
     - Moose
     - CHI
 
+7.9.5
+--------------------------------------------------------------------
+     * Starting in WebGUI 7.9.4, the CHI and Cache::FastMmap modules are required.
+
+     * Starting in WebGUI 7.9.5, you cannot enter in a URL that is a has more than 2 dashes,
+     "-", in a row.  They will be collapsed down into 1 dash.
+
+
 7.9.4
 --------------------------------------------------------------------
      * Shop and Cart changes

docs/upgrades/upgrade_7.9.4-7.9.5.pl

@@ -22,6 +22,7 @@ use Getopt::Long;
 use WebGUI::Session;
 use WebGUI::Storage;
 use WebGUI::Asset;
+use WebGUI::Workflow::Instance;
 
 
 my $toVersion = '7.9.5';
@@ -31,10 +32,14 @@ my $quiet; # this line required
 my $session = start(); # this line required
 
 # upgrade functions go here
+modifySortItems( $session );
+fixRequestForApprovalScratch($session);
+addRejectNoticeSetting($session);
+updateGroupGroupingsTable($session);
+installNewCSUnsubscribeTemplate($session);
 
 finish($session); # this line required
 
-
 #----------------------------------------------------------------------------
 # Describe what our function does
 #sub exampleFunction {
@@ -44,6 +49,85 @@ finish($session); # this line required
 #    print "DONE!\n" unless $quiet;
 #}
 
+#----------------------------------------------------------------------------
+# Adds setting which allows users to set whether or not to send reject notices
+sub addRejectNoticeSetting {
+    my $session = shift;
+    print "\tAdding reject notice setting... " unless $quiet;
+    $session->setting->add('sendRejectNotice',1);
+    print "DONE!\n" unless $quiet;
+}
+
+#----------------------------------------------------------------------------
+sub installNewCSUnsubscribeTemplate {
+    my $session = shift;
+    print "\tAdding new unsubscribe template to the CS... " unless $quiet;
+    $session->db->write(q|ALTER TABLE Collaboration ADD COLUMN unsubscribeTemplateId CHAR(22) NOT NULL|);
+    $session->db->write(q|UPDATE Collaboration set unsubscribeTemplateId='default_CS_unsubscribe'|);
+    print "DONE!\n" unless $quiet;
+}
+
+#----------------------------------------------------------------------------
+# Add keys and indicies to groupGroupings to help speed up group queries
+sub updateGroupGroupingsTable {
+    my $session = shift;
+    print "\tAdding primary key and indicies to groupGroupings table... " unless $quiet;
+    my $sth = $session->db->read('show create table groupGroupings');
+    my ($field,$stmt) = $sth->array;
+    $sth->finish;
+    unless ($stmt =~ m/PRIMARY KEY/i) {
+        $session->db->write("alter table groupGroupings add primary key (groupId,inGroup)");
+    }
+    unless ($stmt =~ m/KEY `inGroup`/i) {
+        $session->db->write("alter table groupGroupings add index inGroup (inGroup)");
+    }
+    print "DONE!\n" unless $quiet;
+}
+
+
+#----------------------------------------------------------------------------
+# Describe what our function does
+sub fixRequestForApprovalScratch {
+    my $session = shift;
+    print "\tCorrect RequestApprovalForVersionTag workflow instance data with leading commas... " unless $quiet;
+    # and here's our code
+    my $instances = WebGUI::Workflow::Instance->getAllInstances($session);
+    INSTANCE: foreach my $instance (@{ $instances }) {
+        my $messageId = $instance->getScratch('messageId');
+        next INSTANCE unless $messageId;
+        $messageId =~ s/^,//;
+        $instance->setScratch('messageId', $messageId);
+    }
+    print "DONE!\n" unless $quiet;
+}
+
+#----------------------------------------------------------------------------
+# Changes sortItems to a SelectBox
+sub modifySortItems {
+    my $session = shift;
+    print "\tUpdating SyndicatedContent...\n" unless $quiet;
+
+    require WebGUI::Form::SelectBox;
+
+    print "\t\tModifying table...\n" unless $quiet;
+    my $type = WebGUI::Form::SelectBox->getDatabaseFieldType;
+    $session->db->write("ALTER TABLE SyndicatedContent MODIFY sortItems $type");
+
+    print "\t\tConverting old values..." unless $quiet;
+    $session->db->write(q{
+        UPDATE SyndicatedContent
+        SET    sortItems = 'none'
+        WHERE  sortItems <> '1'
+    });
+    $session->db->write(q{
+        UPDATE SyndicatedContent
+        SET    sortItems = 'pubDate_des'
+        WHERE  sortItems = '1'
+    });
+
+    # and here's our code
+    print "DONE!\n" unless $quiet;
+}
 
 # -------------- DO NOT EDIT BELOW THIS LINE --------------------------------