Permalink
Browse files

Item14199: Use Storable to store/retrieve registration

Data::Dumper does not support utf-8, and international names get
corrupted.

Storable preserves the utf-8 data, but is not very portable

Caution:  When this update is applied, any pending registrations
will become invalid.
  • Loading branch information...
1 parent 6afef6b commit e245b22952d64c2e08ece82e63daf9f4f0b6b256 @gac410 gac410 committed Oct 12, 2016
@@ -1879,9 +1879,12 @@ sub verify_UnregisteredUser {
};
my $file = Foswiki::UI::Register::_codeFile( $regSave->{VerificationCode} );
- $this->assert( open( my $F, '>', $file ) );
- print $F Data::Dumper->Dump( [ $regSave, undef ], [ 'data', 'form' ] );
- $this->assert( close $F );
+ use Storable;
+ store( $regSave, $file );
+
+ #$this->assert( open( my $F, '>', $file ) );
+ #print $F Data::Dumper->Dump( [ $regSave, undef ], [ 'data', 'form' ] );
+ #$this->assert( close $F );
my $result2 =
Foswiki::UI::Register::_loadPendingRegistration( $this->{session},
@@ -14,6 +14,7 @@ use strict;
use warnings;
use Assert;
use Error qw( :try );
+use Storable;
use Foswiki ();
use Foswiki::LoginManager ();
@@ -679,22 +680,8 @@ sub _requireConfirmation {
# SMELL: used for Register unit tests
$session->{DebugVerificationCode} = $data->{"${type}Code"};
- require Data::Dumper;
-
my $file = _codeFile( $data->{"${type}Code"} );
- my $F;
- open( $F, '>', $file )
- or throw Error::Simple( 'Failed to open file: ' . $! );
- print $F "# $type code\n";
-
- # SMELL: wierd jiggery-pokery required, otherwise Data::Dumper screws
- # up the form fields when it saves. Perl bug? Probably to do with
- # chucking around arrays, instead of references to them.
- my $form = $data->{form};
- $data->{form} = undef;
- print $F Data::Dumper->Dump( [ $data, $form ], [ 'data', 'form' ] );
- $data->{form} = $form;
- close($F);
+ store( $data, $file );
$session->logger->log(
{
@@ -2051,15 +2038,19 @@ sub _loadPendingRegistration {
);
}
- $data = undef;
- $form = undef;
- do $file;
- $data->{form} = $form if $form;
- throw Foswiki::OopsException(
- 'register',
- def => 'bad_ver_code',
- params => [ $code, 'Bad activation code' ]
- ) if $!;
+ try {
+ $data = retrieve($file);
+ }
+ catch Error with {
+ my $e = shift;
+ require Data::Dumper;
+ print STDERR Data::Dumper::Dumper( \$e );
+ throw Foswiki::OopsException(
+ 'register',
+ def => 'internal_error',
+ params => [ $code, 'Retrieve of stored registration failed' ]
+ );
+ };
return $data;
}
@@ -2165,8 +2156,7 @@ sub _checkPendingRegistrations {
}
if ($check) {
local $data;
- local $form;
- eval 'do $regFile';
+ $data = retrieve($regFile);
next unless defined $data;
push @pending, $data->{WikiName} . '(pending)'
if ( $check eq $data->{Email} );
@@ -87,6 +87,13 @@
%MAKETEXT{"Please contact [_1] if you have any questions." args="<a href='mailto:%WIKIWEBMASTER%'>%WIKIWEBMASTER%</a>"}%
%TMPL:END%
%{==============================================================================}%
+%TMPL:DEF{"internal_error"}%
+---+++ %MAKETEXT{"Activation Failed"}%
+%MAKETEXT{"Activation for code [_1] failed with an internal error." args="'<code>%PARAM1%</code>'"}% %PARAM2%
+
+%MAKETEXT{"This is an internal error. You can try to register again, or contact [_1] to report the error." args="<a href='mailto:%WIKIWEBMASTER%'>%WIKIWEBMASTER%</a>"}%
+%TMPL:END%
+%{==============================================================================}%
%TMPL:DEF{"registration_mail_failed"}%
---+++ %MAKETEXT{"Error registering new user"}%

0 comments on commit e245b22

Please sign in to comment.