Skip to content
Permalink
Browse files

Merge commit 'v7.10.20' into WebGUI8

  • Loading branch information...
perlDreamer committed Oct 26, 2011
2 parents 4fea10a + 7fda01b commit fdb979ca8a9790614c5005198628277020106cde
Showing with 830 additions and 224 deletions.
  1. +16 −0 docs/changelog/7.x.x.txt
  2. +1 −0 docs/credits.txt
  3. +1 −1 docs/upgrades/upgrade_7.10.18-7.10.19.pl
  4. +147 −0 docs/upgrades/upgrade_7.10.19-7.10.20.pl
  5. +1 −0 etc/WebGUI.conf.original
  6. +1 −0 lib/WebGUI/Asset.pm
  7. +9 −5 lib/WebGUI/Asset/Post.pm
  8. +10 −6 lib/WebGUI/Asset/Wobject/Thingy.pm
  9. +5 −8 lib/WebGUI/DateTime.pm
  10. +7 −21 lib/WebGUI/Form/AdSpace.pm
  11. +22 −18 lib/WebGUI/Form/ContentType.pm
  12. +7 −7 lib/WebGUI/Form/Country.pm
  13. +6 −5 lib/WebGUI/Form/DatabaseLink.pm
  14. +15 −14 lib/WebGUI/Form/FilterContent.pm
  15. +6 −19 lib/WebGUI/Form/Group.pm
  16. +6 −19 lib/WebGUI/Form/LdapLink.pm
  17. +7 −17 lib/WebGUI/Form/MatrixCompare.pm
  18. +10 −12 lib/WebGUI/Form/MatrixFieldType.pm
  19. +24 −12 lib/WebGUI/Form/MimeType.pm
  20. +1 −17 lib/WebGUI/Form/TimeZone.pm
  21. +6 −19 lib/WebGUI/Form/Vendor.pm
  22. +6 −5 lib/WebGUI/Form/Workflow.pm
  23. +64 −0 lib/WebGUI/Macro/FormField.pm
  24. +22 −0 lib/WebGUI/Shop/TaxDriver/Generic.pm
  25. +2 −1 lib/WebGUI/User.pm
  26. +2 −2 lib/WebGUI/i18n/English/Asset_Thingy.pm
  27. +27 −0 sbin/installClass.pl
  28. +1 −0 sbin/testEnvironment.pl
  29. +1 −1 share/create.sql
  30. 0 share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/addAssetEditTemplate.pl
  31. 0 share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/addI18nMacroAlias.pl
  32. 0 share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/addMaintenancePageToConfig.pl
  33. 0 share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/addNewAdminConsole.pl
  34. 0 share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/addTemplateToolkit.pl
  35. BIN share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/admin_console.wgpkg
  36. BIN share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/admin_progress_bar.wgpkg
  37. BIN share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/default_page.wgpkg
  38. BIN share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/documentation_free-documentation.wgpkg
  39. 0 share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/facebook_auth.sql
  40. 0 share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/migrateToNewCache.pl
  41. 0 share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/moveFileLocations.pl
  42. 0 share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/moveMaintenance.pl
  43. 0 share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/moveRequiredProfileFields.pl
  44. BIN share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/one_over_three.wgpkg
  45. BIN share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/one_over_two.wgpkg
  46. BIN share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/pbtmplblankstyle000001.wgpkg
  47. BIN share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/plainblacknews.wgpkg
  48. 0 share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/removeAdminBar.pl
  49. 0 share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/removeFilePile.pl
  50. 0 share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/removeMobileUserAgents.pl
  51. 0 share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/removeURLHandlers.pl
  52. BIN share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/right_column.wgpkg
  53. BIN share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/root_import_adminconsole_admin-interface.wgpkg
  54. BIN share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/root_import_adminconsole_edit-asset.wgpkg
  55. BIN share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/root_import_default-asset-subscription.wgpkg
  56. BIN share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/root_import_default-facebook-choose-username.wgpkg
  57. BIN share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/root_import_richedit.wgpkg
  58. BIN share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/side_by_side.wgpkg
  59. BIN share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/style-underground.wgpkg
  60. BIN share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/three-columns.wgpkg
  61. 0 share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/zzz_renameAccountMacroTemplateVariables.pl
  62. 0 share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/zzz_renameAdminToggleMacroTemplateVariables.pl
  63. 0 share/upgrades/{7.10.19-8.0.0 → 7.10.20-8.0.0}/zzz_renameFormBuilderTemplateVars.pl
  64. +107 −0 t/Asset/Post/purging.t
  65. +1 −0 t/Asset/Wobject/EventManagementSystem.t
  66. +84 −0 t/Asset/Wobject/Thingy/getFieldValue.t
  67. +51 −0 t/Asset/processTemplate.t
  68. +6 −2 t/DateTime.t
  69. +0 −2 t/Form/Workflow.t
  70. +111 −0 t/Macro/FormField.t
  71. +26 −3 t/Shop/TaxDriver/Generic.t
  72. +11 −8 www/extras/yui-webgui/build/form/datatable.js
@@ -1,3 +1,19 @@
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)
- fixed #12179: DataTable Field types get reset to "Text" in Edit Schema (Amir Plivatsky)
- added: FormField macro for rendering Form objects directly from templates
- fixed: Generic Tax driver does not like spaces around commas
- fixed: Date formatting with WebGUI::DateTime has extra spaces for single digit months and days.
- fixed #12165: Default date in Thingy doesn't work
- fixed #12188: Thingy broken after upgrade to 7.9.32-stable
- fixed #12184: Apache error in modperl.error.log (William McKee, Knowmad Technologies)
- fixed #12186: keywords template variable not working properly in Article
- fixed #12190: List type form plugins that do not override getOptions show no value when getValueAsHtml is called
- fixed #12135: Geo::Coder::Googlev3 needs common sense
- fixed #12183: Posts do not disqualify themselves when purged
- fixed #12189: installClass ignores preload.custom

7.10.19
- fixed #12169: extras uploads symlink export
- Added ability to pass caller assetId to RenderThingMacro
@@ -55,6 +55,7 @@ Contributing Developers..............C.J. Adams-Collier / <cjac@colliertech.org>
Ernesto Hernández-Novich / itverx C.A.
Stephen Opal / Plain Black
Tavis Parker / Plain Black
Amir Plivatsky
Daniel Quinlan
Jukka Raimovaara / Mentalhouse Oy
Alan Ritari / DonorWare
@@ -49,7 +49,7 @@ BEGIN
# print "DONE!\n" unless $quiet;
#}

#----------------------------------------------------------------------------

# Fix calendar feed urls that had adminId attached to them until they blew up
sub fixBrokenCalendarFeedUrls {
my $session = shift;
@@ -0,0 +1,147 @@
#!/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.20';
my $quiet; # this line required

my $session = start(); # this line required

addFormFieldMacroToConfig();

# upgrade functions go here
fixSpacesInTaxInfo ( $session );

sub addFormFieldMacroToConfig {
print "\tAdd FormField macro to config... " unless $quiet;
$session->config->addToHash( 'macros', FormField => 'FormField' );
print "DONE!\n" unless $quiet;
}

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;
#}

#----------------------------------------------------------------------------
# Fix calendar feed urls that had adminId attached to them until they blew up
sub fixSpacesInTaxInfo {
my $session = shift;
print "\tRemoving spaces around commas in generic tax rate information... " unless $quiet;
use WebGUI::Shop::TaxDriver::Generic;
my $taxer = WebGUI::Shop::TaxDriver::Generic->new($session);
my $taxIterator = $taxer->getItems;
while (my $taxInfo = $taxIterator->hashRef) {
my $taxId = $taxInfo->{taxId};
$taxer->add($taxInfo); ##Automatically removes spaces now.
$taxer->delete({taxId => $taxId});
}
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
@@ -847,6 +847,7 @@
"FetchMimeType" : "FetchMimeType",
"FilePump" : "FilePump",
"FileUrl" : "FileUrl",
"FormField" : "FormField",
"GroupAdd" : "GroupAdd",
"GroupDelete" : "GroupDelete",
"GroupText" : "GroupText",
@@ -2395,6 +2395,7 @@ sub processTemplate {
%{$self->get},
'title' => $self->getTitle,
'menuTitle' => $self->getMenuTitle,
'keywords' => $self->get('keywords'),
%{$var},
);
return $template->process(\%vars);
@@ -1516,12 +1516,16 @@ Extend the base method to handle cleaning up storage locations.

override purge => sub {
my $self = shift;
my $sth = $self->session->db->read("select storageId from Post where assetId=".$self->session->db->quote($self->getId));
while (my ($storageId) = $sth->array) {
my $storage = WebGUI::Storage->get($self->session, $storageId);
$storage->delete if defined $storage;
my $purged = super();
if ($purged) {
my $sth = $self->session->db->read("select storageId from Post where assetId=?",[$self->getId]);
while (my ($storageId) = $sth->array) {
my $storage = WebGUI::Storage->get($self->session, $storageId);
$storage->delete if defined $storage;
}
$sth->finish;
$self->disqualifyAsLastPost;
}
$sth->finish;
return super();
};

@@ -1037,18 +1037,22 @@ sub getFieldValue {
my $dateFormat = shift || "%z";
my $dateTimeFormat = shift;
my $processedValue = $value;
my $dbh = $self->session->db->dbh;
my $session = $self->session;
my $dbh = $session->db->dbh;

if (lc $field->{fieldType} eq "date"){
$processedValue = $self->session->datetime->epochToHuman($value,$dateFormat);
my $fieldType = lc $field->{fieldType};
if ($fieldType eq "date"){
my $dt = WebGUI::DateTime->new($session, $value);
$processedValue = $dt->webguiDate($dateFormat);
}
elsif (lc $field->{fieldType} eq "datetime"){
$processedValue = $self->session->datetime->epochToHuman($value,$dateTimeFormat);
elsif ($fieldType eq "datetime"){
my $dt = WebGUI::DateTime->new($session, $value);
$processedValue = $dt->webguiDate($dateTimeFormat);
}
# TODO: The otherThing field type is probably also handled by getFormPlugin, so the elsif below can probably be
# safely removed. However, this requires more testing than I can provide right now, so for now this stays the
# way it was.
elsif ($field->{fieldType} =~ m/^otherThing/x) {
elsif ($field->{fieldType} =~ m/^otherthing/x) {
my $otherThingId = $field->{fieldType};
$otherThingId =~ s/^otherThing_//x;
my $tableName = 'Thingy_'.$otherThingId;
@@ -491,7 +491,9 @@ sub session {
Change a WebGUI format into a Strftime format.
NOTE: %M in WebGUI's format has no equivalent in strftime format, so it will
be replaced with "_varmonth_". Do something with it.
be replaced with "{month}". Single digit hours are handled similarly. DateTime's
strftime will use {method} to call a method on the object to fill in that part of
the format.
=cut

@@ -514,13 +516,13 @@ sub webguiToStrftime {
"c" => "B",
"C" => "b",
"d" => "d",
"D" => "e",
"D" => "{day}",
"h" => "I",
"H" => "l",
"j" => "H",
"J" => "k",
"m" => "m",
"M" => "_varmonth_",
"M" => "{month}",
"n" => "M",
"t" => "Z",
"O" => "z",
@@ -587,12 +589,7 @@ sub webguiDate {

my $format = $self->webguiToStrftime( shift || "%z %Z" );

#--- %M
my $datestr = $self->strftime($format);
my $temp = int($self->month);
$datestr =~ s/\%_varmonth_/$temp/g;

#--- return
return $datestr;
}
#######################################################################
@@ -17,6 +17,7 @@ package WebGUI::Form::AdSpace;
use strict;
use base 'WebGUI::Form::SelectBox';
use WebGUI::International;
use WebGUI::AdSpace;

=head1 NAME
@@ -137,34 +138,19 @@ sub isDynamicCompatible {

#-------------------------------------------------------------------

=head2 toHtml ( )
=head2 new ( )
Returns a group pull-down field. A group pull down provides a select list that provides name value pairs for all the groups in the WebGUI system.
Extend the base "new" to set options and the default value.
=cut

sub toHtml {
my $self = shift;
sub new {
my $class = shift;
my $self = $class->SUPER::new(@_);
my $options = { map { $_->getId => $_->get('name') } ( @{ WebGUI::AdSpace->getAdSpaces($self->session) } ) };
$self->set('defaultValue', ( keys %{$options} )[0] );
$self->set('options', $options );
return $self->SUPER::toHtml();
}

#-------------------------------------------------------------------

=head2 toHtmlAsHidden ( )
Creates a series of hidden fields representing the data in the list.
=cut

sub toHtmlAsHidden {
my $self = shift;
my $options = { map { $_->getId => $_->get('name') } ( @{ WebGUI::AdSpace->getAdSpaces($self->session) } ) };
$self->set('defaultValue', ( keys %{$options} )[0] );
$self->set('options', $options );
return $self->SUPER::toHtmlAsHidden();
return $self;
}

#-------------------------------------------------------------------
@@ -118,29 +118,33 @@ sub isDynamicCompatible {

#-------------------------------------------------------------------

=head2 toHtml ( )
=head2 new ( )
Renders a select list form control.
Extend the base "new" to set options.
=cut

sub toHtml {
my $self = shift;
my %types;
my $i18n = WebGUI::International->new($self->session);
foreach my $type (@{ $self->get('types') }) {
if ($type eq "text") {
$types{text} = $i18n->get(1010);
} elsif ($type eq "mixed") {
$types{mixed} = $i18n->get(1008);
} elsif ($type eq "code") {
$types{code} = $i18n->get(1011);
} elsif ($type eq "html") {
$types{html} = $i18n->get(1009);
}
sub new {
my $class = shift;
my $self = $class->SUPER::new(@_);
my %types;
my $i18n = WebGUI::International->new($self->session);
foreach my $type (@{ $self->get('types') }) {
if ($type eq "text") {
$types{text} = $i18n->get(1010);
}
$self->set("options", \%types);
return $self->SUPER::toHtml();
elsif ($type eq "mixed") {
$types{mixed} = $i18n->get(1008);
}
elsif ($type eq "code") {
$types{code} = $i18n->get(1011);
}
elsif ($type eq "html") {
$types{html} = $i18n->get(1009);
}
}
$self->set("options", \%types);
return $self;
}

1;
Oops, something went wrong.

0 comments on commit fdb979c

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