Skip to content
Permalink
Browse files

Merge commit 'v7.10.24' into WebGUI8

  • Loading branch information...
perlDreamer committed Jan 17, 2012
2 parents c94af49 + 9ba3022 commit 3b418ede3c09bad42cff84cfb933f65a35a41e6f
Showing with 696 additions and 32,130 deletions.
  1. +6 −0 docs/changelog/7.x.x.txt
  2. +6 −0 docs/gotcha.txt
  3. BIN docs/upgrades/packages-7.10.24/default-shopping-cart-template.wgpkg
  4. BIN docs/upgrades/packages-7.10.24/root_import_calendar-templates_default-calendar-search.wgpkg
  5. BIN docs/upgrades/packages-7.10.24/shopping-cart-collateral-items.wgpkg
  6. +183 −0 docs/upgrades/upgrade_7.10.23-7.10.24.pl
  7. +2 −0 lib/WebGUI/Asset/EMSSubmission.pm
  8. +3 −2 lib/WebGUI/Asset/Template.pm
  9. +7 −4 lib/WebGUI/Asset/Wobject/Calendar.pm
  10. +47 −0 lib/WebGUI/Asset/Wobject/Survey.pm
  11. +1 −1 lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm
  12. +4 −0 lib/WebGUI/AssetExportHtml.pm
  13. +8 −5 lib/WebGUI/Auth.pm
  14. +15 −0 lib/WebGUI/Fork.pm
  15. +3 −3 lib/WebGUI/Fork/ProgressBar.pm
  16. +3 −2 lib/WebGUI/Fork/Status.pm
  17. +1 −0 lib/WebGUI/Form/AssetReportQuery.pm
  18. +3 −3 lib/WebGUI/Help/Asset_Calendar.pm
  19. +2 −2 lib/WebGUI/LDAPLink.pm
  20. +5 −2 lib/WebGUI/Macro/L_loginBox.pm
  21. +2 −2 lib/WebGUI/Operation/VersionTag.pm
  22. +86 −17 lib/WebGUI/PassiveAnalytics/Flow.pm
  23. +49 −33 lib/WebGUI/Workflow/Activity/BucketPassiveAnalytics.pm
  24. +54 −51 lib/WebGUI/Workflow/Activity/SummarizePassiveAnalytics.pm
  25. +15 −0 lib/WebGUI/i18n/English/Form_TimeField.pm
  26. +6 −0 lib/WebGUI/i18n/English/PassiveAnalytics.pm
  27. +1 −1 sbin/testEnvironment.pl
  28. +9 −2 sbin/userImport.pl
  29. +22 −12 share/create.sql
  30. +1 −1 t/Asset/EMSSubmissionForm.t
  31. +12 −2 t/Asset/Template.t
  32. +5 −2 t/Asset/Wobject/Calendar.t
  33. +67 −0 t/Asset/Wobject/Survey/package.t
  34. +7 −1 t/Macro/L_loginBox.t
  35. +50 −6 t/Workflow/Activity/BucketPassiveAnalytics.t
  36. +2 −1 t/Workflow/Activity/DeleteExpiredSessions.t
  37. +9 −0 t/supporting_collateral/passiveAnalyticsLog
  38. +0 −111 www/extras/yui/tests/animation/tests/animation.html
  39. +0 −283 www/extras/yui/tests/autocomplete/tests/autocomplete.html
  40. +0 −163 www/extras/yui/tests/button/tests/button-activeelement-test.html
  41. +0 −81 www/extras/yui/tests/button/tests/label-click-test.html
  42. +0 −82 www/extras/yui/tests/button/tests/label-replace-test.html
  43. +0 −144 www/extras/yui/tests/button/tests/preventoverlap.html
  44. +0 −97 www/extras/yui/tests/button/tests/selected-menuitem-change-test.html
  45. +0 −130 www/extras/yui/tests/button/tests/submit-twice-test.html
  46. +0 −114 www/extras/yui/tests/button/tests/yui-prefix-test.html
  47. +0 −1,336 www/extras/yui/tests/calendar/tests/calendar.html
  48. +0 −80 www/extras/yui/tests/carousel/tests/AllTests.html
  49. +0 −242 www/extras/yui/tests/carousel/tests/markupTests.js
  50. +0 −63 www/extras/yui/tests/carousel/tests/protectedMethodTests.js
  51. +0 −285 www/extras/yui/tests/carousel/tests/scriptTests.js
  52. +0 −167 www/extras/yui/tests/colorpicker/tests/colorpicker.html
  53. +0 −103 www/extras/yui/tests/common/tests/YUI.html
  54. +0 −635 www/extras/yui/tests/connection/tests/setForm.html
  55. +0 −8 www/extras/yui/tests/connection/tests/submitReporter.php
  56. +0 −243 www/extras/yui/tests/container/tests/config.html
  57. +0 −443 www/extras/yui/tests/container/tests/module.html
  58. +0 −1,701 www/extras/yui/tests/cookie/tests/cookie.html
  59. +0 −687 www/extras/yui/tests/datasource/tests/datasource.html
  60. +0 −306 www/extras/yui/tests/datasource/tests/date.php
  61. +0 −45 www/extras/yui/tests/datasource/tests/php/proxy_ylocal.php
  62. +0 −49 www/extras/yui/tests/datasource/tests/php/xhr_table.php
  63. +0 −121 www/extras/yui/tests/datasource/tests/xmlparsing.html
  64. +0 −151 www/extras/yui/tests/datatable/tests/2099844.html
  65. +0 −56 www/extras/yui/tests/datatable/tests/datatable.html
  66. +0 −152 www/extras/yui/tests/datatable/tests/datatable/ColumnSet.js
  67. +0 −1,930 www/extras/yui/tests/datatable/tests/datatable/DataTable.js
  68. +0 −196 www/extras/yui/tests/datatable/tests/datatable/RecordSet.js
  69. +0 −1,385 www/extras/yui/tests/datemath/tests/datemath.html
  70. +0 −594 www/extras/yui/tests/dom/tests/dom.html
  71. +0 −274 www/extras/yui/tests/dragdrop/tests/index.html
  72. +0 −45 www/extras/yui/tests/editor/tests/index.html
  73. +0 −403 www/extras/yui/tests/editor/tests/tests.js
  74. +0 −230 www/extras/yui/tests/element/tests/element.html
  75. +0 −195 www/extras/yui/tests/element/tests/mouseenter.html
  76. +0 −342 www/extras/yui/tests/event-delegate/tests/delegation.html
  77. +0 −60 www/extras/yui/tests/event-delegate/tests/delegation2.html
  78. +0 −229 www/extras/yui/tests/event-mouseenter/tests/mouseenter.html
  79. +0 −60 www/extras/yui/tests/event-mouseenter/tests/mouseenter2.html
  80. +0 −125 www/extras/yui/tests/event-mouseenter/tests/mouseenter3.html
  81. +0 −63 www/extras/yui/tests/event/tests/focusblur.html
  82. +0 −254 www/extras/yui/tests/event/tests/focusin-focusout.html
  83. +0 −310 www/extras/yui/tests/imageloader/tests/imageloader.html
  84. +0 −989 www/extras/yui/tests/json/tests/json.html
  85. +0 −189 www/extras/yui/tests/logger/tests/logger.html
  86. +0 −86 www/extras/yui/tests/menu/tests/keep-open-fix.html
  87. +0 −86 www/extras/yui/tests/menu/tests/keep-open-repo.html
  88. +0 −116 www/extras/yui/tests/menu/tests/menu-activeelement-test.html
  89. +0 −103 www/extras/yui/tests/menu/tests/menu-right-click-test.html
  90. +0 −118 www/extras/yui/tests/menu/tests/menu-unsubscribe.html
  91. +0 −1,752 www/extras/yui/tests/menu/tests/menu.html
  92. +0 −242 www/extras/yui/tests/menu/tests/visited-link-test.html
  93. +0 −206 www/extras/yui/tests/paginator/tests/basic.html
  94. +0 −143 www/extras/yui/tests/paginator/tests/example.html
  95. +0 −513 www/extras/yui/tests/profiler/tests/profiler.html
  96. +0 −920 www/extras/yui/tests/progressbar/tests/index.html
  97. +0 −329 www/extras/yui/tests/selector/tests/selector.html
  98. +0 −54 www/extras/yui/tests/slider/tests/background.html
  99. +0 −231 www/extras/yui/tests/slider/tests/base.html
  100. +0 −40 www/extras/yui/tests/slider/tests/base_animated.html
  101. +0 −79 www/extras/yui/tests/slider/tests/base_dual.html
  102. +0 −43 www/extras/yui/tests/slider/tests/base_graduated.html
  103. +0 −62 www/extras/yui/tests/slider/tests/base_graduated_region.html
  104. +0 −62 www/extras/yui/tests/slider/tests/base_region.html
  105. +0 −71 www/extras/yui/tests/slider/tests/grad_win_resize.html
  106. +0 −86 www/extras/yui/tests/slider/tests/move_setval.html
  107. +0 −67 www/extras/yui/tests/slider/tests/offscreen.html
  108. +0 −218 www/extras/yui/tests/storage/tests/storage.html
  109. +0 −7,318 www/extras/yui/tests/storage/tests/testvalues.js
  110. +0 −644 www/extras/yui/tests/stylesheet/tests/stylesheet.html
  111. BIN www/extras/yui/tests/swf/tests/YUIBridgeProject.swf
  112. +0 −46 www/extras/yui/tests/swf/tests/basic.html
  113. +0 −136 www/extras/yui/tests/tabview/tests/tabview.html
  114. +0 −31 www/extras/yui/tests/yahoo/tests/assets/xframe.html
  115. +0 −445 www/extras/yui/tests/yahoo/tests/yahoo.html
  116. +0 −118 www/extras/yui/tests/yuiloader/tests/yuiloader.html
  117. +0 −82 www/extras/yui/tests/yuiloader/tests/yuiloader_config.html
  118. +0 −85 www/extras/yui/tests/yuiloader/tests/yuiloader_rollup.html
  119. +0 −1,492 www/extras/yui/tests/yuitest/tests/yuitest.html
  120. BIN ...d9/48d94a1f46e6369767982bde8e4ff194 → 12/6c/126c123b9de9c957770d943dfa93f542}/thumb-top-right.jpg
  121. BIN ...s/{48/d9/48d94a1f46e6369767982bde8e4ff194 → 12/6c/126c123b9de9c957770d943dfa93f542}/top-right.jpg
  122. BIN ...ds/{3c/e1/3ce1c9490aa981a19c9228f47be0eeda → 1e/03/1e036e4dd875763e679038c53a802a8c}/input_bg.jpg
  123. BIN .../e1/3ce1c9490aa981a19c9228f47be0eeda → 1e/03/1e036e4dd875763e679038c53a802a8c}/thumb-input_bg.jpg
  124. BIN ...56/6a/566a9ad05defc721d369ccf5a230b8f5 → 21/fc/21fc9dbb68b6249e8e7f72936ecb0b2f}/bottom-right.jpg
  125. BIN ...566a9ad05defc721d369ccf5a230b8f5 → 21/fc/21fc9dbb68b6249e8e7f72936ecb0b2f}/thumb-bottom-right.jpg
  126. BIN .../93/389319e91b251464dc3ccf559de5c691 → 41/8d/418d7ad6590c974f4c50284060178039}/thumb-top-left.jpg
  127. BIN ...ds/{38/93/389319e91b251464dc3ccf559de5c691 → 41/8d/418d7ad6590c974f4c50284060178039}/top-left.jpg
  128. BIN ...{7a/37/7a37d34156e8e11a579f3926cbc2ab12 → 77/93/779351e19745d87662438e6be3ae36aa}/bottom-left.jpg
  129. BIN .../7a37d34156e8e11a579f3926cbc2ab12 → 77/93/779351e19745d87662438e6be3ae36aa}/thumb-bottom-left.jpg
  130. BIN www/uploads/a6/48/a648b8354e35425e94b74ff5e24daae0/thumb-top-right.jpg
  131. BIN www/uploads/a6/48/a648b8354e35425e94b74ff5e24daae0/top-right.jpg
  132. BIN www/uploads/b2/7d/b27d1f0a521671747fcec8938ae72fc6/input_bg.jpg
  133. BIN www/uploads/b2/7d/b27d1f0a521671747fcec8938ae72fc6/thumb-input_bg.jpg
  134. BIN www/uploads/b7/3d/b73db582e589a6116f55ba680b4766c1/bottom-right.jpg
  135. BIN www/uploads/b7/3d/b73db582e589a6116f55ba680b4766c1/thumb-bottom-right.jpg
  136. BIN www/uploads/c2/f1/c2f1e149fe26a04efd66cd7eb7b00f5d/thumb-top-left.jpg
  137. BIN www/uploads/c2/f1/c2f1e149fe26a04efd66cd7eb7b00f5d/top-left.jpg
  138. BIN www/uploads/d2/68/d26878bb45b2b836379dc7be9115dc89/bottom-left.jpg
  139. BIN www/uploads/d2/68/d26878bb45b2b836379dc7be9115dc89/thumb-bottom-left.jpg
@@ -1,4 +1,6 @@
7.10.24
- fixed #12318: asset error causes asset manager to fail
- fixed #12308: error message used scalar as reference
- fixed #12256: Calendar Search doesn't show admin controls
- fixed #12268: Point of sale form missing from cart screen.
- fixed #12201: AssetReport - no selects.
@@ -7,6 +9,10 @@
- fixed Passive Analytics, UI, Progress Bar, server load.
- fixed #12303: Survey custom multiple choice question types
- fixed #12304: Surven packages do not include custom question types
- fixed #12309: Some child assets ignore visitor cache timeouts
- fixed possible values and default values on EMS submission.
- fixed #12312: Shop account plugin has unrendered macro
- fixed #12315: Remove yui tests from git repo.

7.10.23
- fixed #12225: Stock asset, multiple instances on a page
@@ -38,6 +38,12 @@ save you many hours of grief.

* Support for server-side spell checking in the Rich Editor TinyMCE has been removed.

7.10.24
--------------------------------------------------------------------
* WebGUI now depends on Business::OnlinePayment::AuthorizeNet. This version
should install automatically via the testEnvironment.pl script, or the
perl-standard CPAN module.

7.10.23
--------------------------------------------------------------------
* The default_search2 template had a bad template attachment pointing to
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,183 @@
#!/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.24';
my $quiet; # this line required


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

# upgrade functions go here
addPALastLogTable($session);
addForkRedirect($session);
extendBucketName($session);
fixSurveyQuestionTypes($session);

finish($session); # this line required


#----------------------------------------------------------------------------
# Describe what our function does
sub addPALastLogTable {
my $session = shift;
print "\tAdd a table to keep track of additional Passive Analytics data... " unless $quiet;
# and here's our code
$session->db->write(<<EOSQL);
CREATE TABLE IF NOT EXISTS `PA_lastLog` (
`userId` char(22) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
`assetId` char(22) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
`sessionId` char(22) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
`timeStamp` bigint(20) DEFAULT NULL,
`url` char(255) NOT NULL,
PRIMARY KEY (userId, sessionId)
) ENGINE=MyISAM DEFAULT CHARSET=utf8
EOSQL
print "DONE!\n" unless $quiet;
}

#----------------------------------------------------------------------------
# Describe what our function does
sub addForkRedirect {
my $session = shift;
print "\tAdd a column to Fork to keep track of late generated redirect URLs... " unless $quiet;
# and here's our code
$session->db->write(<<EOSQL);
ALTER TABLE Fork add column redirect CHAR(255);
EOSQL
print "DONE!\n" unless $quiet;
}

#----------------------------------------------------------------------------
# Describe what our function does
sub extendBucketName {
my $session = shift;
print "\tExtend the size of the bucket name in the bucketLog table for Passive Analytics... " unless $quiet;
# and here's our code
$session->db->write(<<EOSQL);
ALTER TABLE bucketLog CHANGE COLUMN Bucket Bucket CHAR(255)
EOSQL
print "DONE!\n" unless $quiet;
}


#----------------------------------------------------------------------------
# Describe what our function does
sub fixSurveyQuestionTypes {
my $session = shift;
print "\tFix bad custom Question Types in the Survey... " unless $quiet;
# and here's our code
$session->db->write(<<EOSQL);
update Survey_questionTypes set answers="{}" where answers like 'HASH%';
EOSQL
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
@@ -391,6 +391,8 @@ sub www_editSubmission {
$fields->{$fieldId}{fieldType} = $metaField->{dataType};
$fields->{$fieldId}{name} = $fieldId;
$fields->{$fieldId}{value} = $self->get($fieldId) if $self;
$fields->{$fieldId}{options} = $metaField->{possibleValues};
$fields->{$fieldId}{defaultValue} = $metaField->{defaultValues};
}
}

@@ -731,9 +731,10 @@ sub process {
my $output;
eval { $output = $parser->process($template, $self->param); };
if (my $e = Exception::Class->caught) {
$session->log->error(sprintf "Error processing template: %s, %s, %s", $self->getUrl, $self->getId, $e->error);
my $message = ref $e ? $e->error : $e;
$session->log->error(sprintf "Error processing template: %s, %s, %s", $self->getUrl, $self->getId, $message);
my $i18n = WebGUI::International->new($session, 'Asset_Template');
$output = sprintf $i18n->get('template error').$e->error, $self->getUrl, $self->getId;
$output = sprintf $i18n->get('template error').$message, $self->getUrl, $self->getId;
}

# Process the style template
@@ -1126,7 +1126,7 @@ sub viewList {
);

### Build the event vars
my $dtLast = $dtStart; # The DateTime of the last event
my $dtLast = WebGUI::DateTime->new(0); # The DateTime of the last event
EVENT: for my $event (@events) {
next EVENT unless $event && $event->canView();
my ( %eventVar, %eventDate )
@@ -1135,12 +1135,15 @@ sub viewList {
# Add the change flags
my $dt = $event->getDateTimeStart;
if ( $dt->year > $dtLast->year ) {
$eventVar{ new_year } = 1;
$eventVar{ new_year } = 1;
$eventVar{ new_month } = 1;
$eventVar{ new_day } = 1;
}
if ( $dt->month > $dtLast->month ) {
elsif ( $dt->month > $dtLast->month ) {
$eventVar{ new_month } = 1;
$eventVar{ new_day } = 1;
}
if ( $dt->day > $dtLast->day ) {
elsif ( $dt->day > $dtLast->day ) {
$eventVar{ new_day } = 1;
}

@@ -2430,6 +2430,53 @@ sub export {

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

=head2 exportAssetData ()
Extend the base method to include custom question types added to this Survey.
=cut

sub exportAssetData {
my $self = shift;
my $asset_data = $self->SUPER::exportAssetData();
my $questions = $self->surveyJSON->questions();
my $multiple_choice = $self->surveyJSON->multipleChoiceTypes();
my %question_types = ();
my $get_question = $self->session->db->prepare('select answers from Survey_questionTypes where questionType=?');
foreach my $question (@{ $questions }) {
my $type = $question->{questionType};
next unless $multiple_choice->{$type};
next if $question_types{$type};
$get_question->execute([$type]);
my ($answers) = $get_question->array();
$question_types{$type} = $answers;
}
#my $question_types = $self->db->buildArrayRefOfHashRefs('select * from Survey_questionTypes');
$get_question->finish;
$asset_data->{question_types} = \%question_types;
return $asset_data;
}

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

=head2 importAssetCollateralData ($data)
Extend the base method to include custom question types added to this Survey.
=cut

sub importAssetCollateralData {
my $self = shift;
my $data = shift;
$self->SUPER::importAssetCollateralData($data);
my $custom_types = $data->{question_types};
while (my ($question, $answer) = each %{ $custom_types }) {
$self->session->db->write("INSERT INTO Survey_questionTypes VALUES(?,?) ON DUPLICATE KEY UPDATE answers = ?",[$question,$answer,$answer]);
}
}

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

=head2 www_exportSimpleResults ()
Exports transposed results as CSV (or tabbed depending on the C<format> form param)
@@ -169,7 +169,7 @@ sub addType {
my $questionType = shift;
my $address = shift;
my $question = $self->question($address);
my $ansString = $question->{answers} ? to_json $question->{answers} : {};
my $ansString = $question->{answers} ? to_json $question->{answers} : '{}';
$self->session->db->write("INSERT INTO Survey_questionTypes VALUES(?,?) ON DUPLICATE KEY UPDATE answers = ?",[$questionType,$ansString,$ansString]);
$question->{questionType} = $questionType;
}
@@ -157,6 +157,10 @@ This scratch variable is used by the Widget Macro.
Takes a hashref of arguments, containing the following keys:
=head3 depth
How many levels deep to export.
=head3 quiet
Boolean. To be or not to be quiet with our output. Defaults to false.
@@ -1169,8 +1169,10 @@ sub www_displayLogin {
$vars->{title} = $i18n->get(66);
my $action;
if ($self->session->setting->get("encryptLogin")) {
$action = $self->session->url->page(undef,1);
$action =~ s/http:/https:/;
my $uri = URI->new($self->session->url->page(undef,1));
$uri->scheme('https');
$uri->host_port($uri->host);
$action = $uri->as_string;
}
use WebGUI::Form::Password;
use WebGUI::Form::Hidden;
@@ -1241,9 +1243,10 @@ sub www_login {
$self->session->scratch->delete("redirectAfterLogin");
}
elsif ($self->session->setting->get('encryptLogin')) {
my $currentUrl = $self->session->url->page(undef,1);
$currentUrl =~ s/^https:/http:/;
$self->session->response->setRedirect($currentUrl);
my $currentUrl = URI->new($self->session->url->page(undef,1));
$currentUrl->scheme('http');
$currentUrl->port($self->session->config->get('webServerPort') || 80);
$self->session->response->setRedirect($currentUrl->canonical->as_string);
}

# Get open version tag. This is needed if we want
@@ -293,6 +293,7 @@ sub finish {
$props{latch} = 0;
}
$props{endTime} = time();
$props{redirect} = $self->{redirect};
$self->set( \%props );
}

@@ -529,6 +530,20 @@ sub setGroup {

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

=head2 setRedirect($url)
Allows a redirect to be set for the process after the initial fork. This happens
in the case when a file is to be downloaded after the fork finishes.
=cut

sub setRedirect {
my ( $self, $url ) = @_;
$self->{redirect} = $url;
}

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

=head2 request ($module, $subname, $data)
Internal method. Generates a hashref suitable for passing to runRequest.
Oops, something went wrong.

0 comments on commit 3b418ed

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