Skip to content
Permalink
Browse files

Merge remote branch 'main/WebGUI8' into WebGUI8

  • Loading branch information...
daviddelikat committed Nov 7, 2011
2 parents ffbc759 + 3bd5172 commit 546932869aacb0231d4990854725e43a7130dc92
Showing with 5,489 additions and 583 deletions.
  1. +37 −0 docs/changelog/7.x.x.txt
  2. +10 −0 docs/gotcha.txt
  3. +1 −1 docs/legal.txt
  4. +5 −1 docs/templates.txt
  5. BIN docs/upgrades/packages-7.10.21/default_forum_notification.wgpkg
  6. BIN docs/upgrades/packages-7.10.22/default_emsbadge.wgpkg
  7. BIN docs/upgrades/packages-7.10.22/root_import_thingy-templates_thingy.css.wgpkg
  8. BIN docs/upgrades/packages-7.10.22/shopping-cart-collateral-items.wgpkg
  9. BIN docs/upgrades/packages-7.10.23/shopping-cart-collateral-items_my-purchases-default.wgpkg
  10. BIN docs/upgrades/packages-7.10.23/stockdatatmpl000000001.wgpkg
  11. BIN docs/upgrades/packages-7.9.34-7.10.22/merged.wgpkg
  12. +146 −0 docs/upgrades/upgrade_7.10.20-7.10.21.pl
  13. +198 −0 docs/upgrades/upgrade_7.10.21-7.10.22.pl
  14. +141 −0 docs/upgrades/upgrade_7.10.22-7.10.23.pl
  15. +561 −0 docs/upgrades/upgrade_7.9.34-7.10.22.pl
  16. +3 −0 etc/WebGUI.conf.original
  17. +0 −2 lib/WebGUI.pm
  18. +1 −1 lib/WebGUI/Account.pm
  19. +51 −1 lib/WebGUI/Account/Profile.pm
  20. +59 −22 lib/WebGUI/Asset.pm
  21. +1 −0 lib/WebGUI/Asset/Event.pm
  22. +1 −0 lib/WebGUI/Asset/File.pm
  23. +1 −0 lib/WebGUI/Asset/Post.pm
  24. +7 −5 lib/WebGUI/Asset/Post/Thread.pm
  25. +16 −0 lib/WebGUI/Asset/Sku.pm
  26. +80 −4 lib/WebGUI/Asset/Sku/EMSBadge.pm
  27. +6 −6 lib/WebGUI/Asset/Template.pm
  28. +15 −0 lib/WebGUI/Asset/Wobject.pm
  29. +1 −0 lib/WebGUI/Asset/Wobject/Article.pm
  30. +2 −3 lib/WebGUI/Asset/Wobject/AssetReport.pm
  31. +1 −1 lib/WebGUI/Asset/Wobject/Collaboration.pm
  32. +40 −3 lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
  33. +1 −0 lib/WebGUI/Asset/Wobject/Folder.pm
  34. +15 −1 lib/WebGUI/Asset/Wobject/Layout.pm
  35. +14 −11 lib/WebGUI/Asset/Wobject/Thingy.pm
  36. +1 −2 lib/WebGUI/AssetMetaData.pm
  37. +53 −18 lib/WebGUI/Auth.pm
  38. +19 −8 lib/WebGUI/Auth/WebGUI.pm
  39. +145 −0 lib/WebGUI/Content/PDFGenerator.pm
  40. +1 −0 lib/WebGUI/Form/Attachments.pm
  41. +20 −1 lib/WebGUI/Form/Combo.pm
  42. +1 −0 lib/WebGUI/Form/DataTable.pm
  43. +1 −1 lib/WebGUI/Form/JsonTable.pm
  44. +2 −2 lib/WebGUI/Form/List.pm
  45. +2 −2 lib/WebGUI/Form/SelectBox.pm
  46. +24 −9 lib/WebGUI/Group.pm
  47. +5 −1 lib/WebGUI/HTML.pm
  48. +1 −0 lib/WebGUI/Operation.pm
  49. +9 −0 lib/WebGUI/Operation/Settings.pm
  50. +88 −7 lib/WebGUI/Operation/User.pm
  51. +1 −1 lib/WebGUI/Session/Url.pm
  52. +10 −1 lib/WebGUI/Shop/Address.pm
  53. +160 −19 lib/WebGUI/Shop/AddressBook.pm
  54. +25 −8 lib/WebGUI/Shop/Cart.pm
  55. +1 −0 lib/WebGUI/Shop/Pay.pm
  56. +227 −0 lib/WebGUI/Shop/PayDriver/CreditCard.pm
  57. +256 −0 lib/WebGUI/Shop/PayDriver/CreditCard/AuthorizeNet.pm
  58. +8 −0 lib/WebGUI/Test/MockAsset.pm
  59. +17 −19 lib/WebGUI/User.pm
  60. +23 −0 lib/WebGUI/Workflow/Activity.pm
  61. +7 −1 lib/WebGUI/Workflow/Activity/ExtendCalendarRecurrences.pm
  62. +1 −1 lib/WebGUI/Workflow/Activity/NotifyAboutVersionTag.pm
  63. +270 −0 lib/WebGUI/Workflow/Activity/WaitForUserConfirmation.pm
  64. +6 −0 lib/WebGUI/i18n/English/Account.pm
  65. +74 −0 lib/WebGUI/i18n/English/Activity_WaitForUserConfirmation.pm
  66. +6 −0 lib/WebGUI/i18n/English/Asset_EventManagementSystem.pm
  67. +29 −0 lib/WebGUI/i18n/English/Form_DataTable.pm
  68. +50 −0 lib/WebGUI/i18n/English/PayDriver_AuthorizeNet.pm
  69. +161 −0 lib/WebGUI/i18n/English/PayDriver_CreditCard.pm
  70. +12 −0 lib/WebGUI/i18n/English/WebGUI.pm
  71. +5 −1 sbin/testEnvironment.pl
  72. +1 −1 sbin/userImport.pl
  73. +197 −196 share/create.sql
  74. 0 share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/addAssetEditTemplate.pl
  75. 0 share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/addI18nMacroAlias.pl
  76. 0 share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/addMaintenancePageToConfig.pl
  77. 0 share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/addNewAdminConsole.pl
  78. 0 share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/addTemplateToolkit.pl
  79. BIN share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/admin_console.wgpkg
  80. BIN share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/admin_progress_bar.wgpkg
  81. BIN share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/default_page.wgpkg
  82. BIN share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/documentation_free-documentation.wgpkg
  83. 0 share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/facebook_auth.sql
  84. 0 share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/migrateToNewCache.pl
  85. 0 share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/moveFileLocations.pl
  86. 0 share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/moveMaintenance.pl
  87. 0 share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/moveRequiredProfileFields.pl
  88. BIN share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/one_over_three.wgpkg
  89. BIN share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/one_over_two.wgpkg
  90. BIN share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/pbtmplblankstyle000001.wgpkg
  91. BIN share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/plainblacknews.wgpkg
  92. 0 share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/removeAdminBar.pl
  93. 0 share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/removeFilePile.pl
  94. 0 share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/removeMobileUserAgents.pl
  95. 0 share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/removeURLHandlers.pl
  96. BIN share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/right_column.wgpkg
  97. BIN share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/root_import_adminconsole_admin-interface.wgpkg
  98. BIN share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/root_import_adminconsole_edit-asset.wgpkg
  99. BIN share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/root_import_default-asset-subscription.wgpkg
  100. BIN share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/root_import_default-facebook-choose-username.wgpkg
  101. BIN share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/root_import_richedit.wgpkg
  102. BIN share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/side_by_side.wgpkg
  103. BIN share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/style-underground.wgpkg
  104. BIN share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/three-columns.wgpkg
  105. 0 share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/zzz_renameAccountMacroTemplateVariables.pl
  106. 0 share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/zzz_renameAdminToggleMacroTemplateVariables.pl
  107. 0 share/upgrades/{7.10.20-8.0.0 → 7.10.23-8.0.0}/zzz_renameFormBuilderTemplateVars.pl
  108. +218 −0 t/Account/Profile.t
  109. +1 −1 t/Asset/Asset.t
  110. +5 −0 t/Asset/Post.t
  111. +51 −0 t/Asset/Post/Thread/bug_12206_bad_subscription_groups_in_duplicate.t
  112. +1 −0 t/Asset/Sku/EMSRibbon.t
  113. +1 −0 t/Asset/Sku/EMSTicket.t
  114. +1 −0 t/Asset/Sku/EMSToken.t
  115. +7 −0 t/Asset/Sku/Product.t
  116. +64 −2 t/Asset/Wobject/Article.t
  117. +34 −1 t/Asset/Wobject/Layout.t
  118. +1 −1 t/Asset/Wobject/Thingy/getFieldValue.t
  119. +4 −4 t/Asset/Wobject/Thingy/indexing.t
  120. +166 −0 t/Asset/Wobject/Thingy/www_editThingDataSaveViaAjax.t
  121. +43 −0 t/Asset/editFormOverride.t
  122. +121 −9 t/Auth.t
  123. +6 −5 t/Auth/LDAP.t
  124. +5 −1 t/Auth/mech.t
  125. +16 −86 t/Group.t
  126. +34 −12 t/Group/group_scratch.t
  127. +101 −0 t/Group/ldap_groups.t
  128. +29 −4 t/HTML.t
  129. +4 −2 t/LDAPLink.t
  130. +7 −1 t/Macro/H_homeLink.t
  131. +4 −0 t/Macro/LastUpdatedBy.t
  132. +170 −19 t/Operation/User.t
  133. +1 −0 t/SQL.t
  134. +3 −5 t/Shop/Address.t
  135. +403 −16 t/Shop/AddressBook.t
  136. +9 −5 t/Shop/Cart.t
  137. +4 −1 t/Shop/Pay.t
  138. +15 −9 t/VersionTag.t
  139. +112 −0 t/Workflow/Activity/WaitForUserConfirmation.t
  140. +58 −0 t/templateAttachments.t
  141. +60 −0 www/extras/css/wg-datatable-html.css
  142. +59 −0 www/extras/css/wg-datatable-yui.css
  143. +118 −0 www/extras/yui-webgui/build/asset/sku/emsbadge.js
  144. +21 −0 www/extras/yui-webgui/build/form/datatable.css
  145. +140 −38 www/extras/yui-webgui/build/form/datatable.js
  146. +59 −0 www/extras/yui-webgui/build/form/form.js
  147. BIN .../d2/5cd2d045be1d0967e47276fd6c2d3242 → 38/93/389319e91b251464dc3ccf559de5c691}/thumb-top-left.jpg
  148. BIN ...ds/{5c/d2/5cd2d045be1d0967e47276fd6c2d3242 → 38/93/389319e91b251464dc3ccf559de5c691}/top-left.jpg
  149. BIN ...ds/{08/52/0852d6c3186fd9a9e52eab8fd8d1ad77 → 3c/e1/3ce1c9490aa981a19c9228f47be0eeda}/input_bg.jpg
  150. BIN .../52/0852d6c3186fd9a9e52eab8fd8d1ad77 → 3c/e1/3ce1c9490aa981a19c9228f47be0eeda}/thumb-input_bg.jpg
  151. BIN ...c8/37c8ed37c9f44558525c0fd5c648d3e1 → 48/d9/48d94a1f46e6369767982bde8e4ff194}/thumb-top-right.jpg
  152. BIN ...s/{37/c8/37c8ed37c9f44558525c0fd5c648d3e1 → 48/d9/48d94a1f46e6369767982bde8e4ff194}/top-right.jpg
  153. BIN ...c3/43/c343e82e0cddb9ac924d05ec41d45f75 → 56/6a/566a9ad05defc721d369ccf5a230b8f5}/bottom-right.jpg
  154. BIN ...c343e82e0cddb9ac924d05ec41d45f75 → 56/6a/566a9ad05defc721d369ccf5a230b8f5}/thumb-bottom-right.jpg
  155. BIN ...{b3/0b/b30b065dfd4de937335e8bb7cd5db1cf → 7a/37/7a37d34156e8e11a579f3926cbc2ab12}/bottom-left.jpg
  156. BIN .../b30b065dfd4de937335e8bb7cd5db1cf → 7a/37/7a37d34156e8e11a579f3926cbc2ab12}/thumb-bottom-left.jpg
@@ -1,3 +1,38 @@
7.10.23
- fixed #12225: Stock asset, multiple instances on a page
- fixed #12229: Indexed thingy data has gateway url prepended to it
- fixed #12195: Visitor group by scratch membership shared among all Visitors (Dale Trexel)
- fixed #12227: Corrected AssetReport such that OrderBy works correctly.
- fixed #12238: Old template attachement in search template slows down sites
- fixed #12239: Still get cart error message after removing extra recurring items from the cart
- fixed #12240: Empty Extend Calendar Recurrance version tags
- fixed #12241: Account Shop
- fixed #12246: Layout inherits mobileStyleTemplateId and mobileTemplateId from parent Layouts
- fixed #12246: added extra_www_add_properties as properties fix-up hook in child for www_add
- fixed #12231: Thingy reindex fails on upgrade
- fixed #12245: Encrypt Login and Display Message on Login conflict
- fixed #12211: Recurring Item error message in Cart

7.10.22
- rfe #12223: Add date type to content profiling (metadata)
- rfe #12207: Thingy. Field_name info returned by www_editThingDataSaveViaAjax
- fixed #12206: Bad Subscription Groups in Duplicated Threads
- fixed #12208: replacements don't work
- fixed #12213: Unable to view cart when an asset is deleted.
- added: Better integration between User Profile fields, the Shop address book and the EMS.
- fixed #12218: Failed INSERT in Passive Profiling causes leak
- fixed #12173: CrystalX theme Thingy drop down problem

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 +48,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 +4260,4 @@
- Made the Include macro more secure.
- Added Len's patch to fix some caching problems.


@@ -31,6 +31,16 @@ save you many hours of grief.
Account Macro template
Admin Toggle Macro template

7.10.23
--------------------------------------------------------------------
* The default_search2 template had a bad template attachment pointing to
an old WebGUI CSS Snippet called /webgui.css. Any attachment with that
URL will be removed from ALL templates in the Search namespace.

7.10.21
--------------------------------------------------------------------
* WebGUI now depends on Kwargs.

7.10.17
--------------------------------------------------------------------
* Due to a formatting problem with form variables in the PayPal driver, WebGUI
@@ -2,7 +2,7 @@
# WebGUI Legal Information #
####################################################################

WebGUI is Copyright 2001-2009 Plain Black Corporation. All rights
WebGUI is Copyright 2001-2011 Plain Black Corporation. All rights
reserved.

WebGUI Content Engine, WebGUI Runtime Environment, and Plain Black
@@ -1,7 +1,7 @@
This is a running list of template changes made during upgrades. If you have copied the default
templates, you will need to apply these changes manually to your copies.

7.8.0
8.0

* Account Macro template variables renamed:
account.url => account_url
@@ -11,6 +11,10 @@ templates, you will need to apply these changes manually to your copies.
toggle.url => toggle_url
toggle.text => toggle_text

7.10.22
* Thingy CSS file - root/import/thingy-templates/thingy.css
Add CSS to make sure that overflows are visible, to handle style that hide overflow by default.

7.10.18
* Collaboration System Default Notification Template /default_forum_notification
Replace table with divs to make inline replying easier.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -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
Oops, something went wrong.

0 comments on commit 5469328

Please sign in to comment.
You can’t perform that action at this time.