1 |
bytegw |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-email-4.18.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/pseudonyms.pm mezzanine_patched_e-smith-email-4.18.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/pseudonyms.pm |
2 |
|
|
--- e-smith-email-4.18.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/pseudonyms.pm 2008-03-11 17:03:25.000000000 +0000 |
3 |
|
|
+++ mezzanine_patched_e-smith-email-4.18.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/pseudonyms.pm 2008-07-26 17:37:22.000000000 +0100 |
4 |
|
|
@@ -164,7 +164,7 @@ |
5 |
|
|
my $fm = shift; |
6 |
|
|
my $q = $fm->{'cgi'}; |
7 |
|
|
my $account = $q->param ('account'); |
8 |
|
|
- my $pseudonym = $q->param('pseudonym'); |
9 |
|
|
+ my $pseudonym = uri_unescape($q->param('pseudonym')); |
10 |
|
|
my $msg = "OK"; |
11 |
|
|
|
12 |
|
|
$accounts->new_record($pseudonym, { type => 'pseudonym', |
13 |
|
|
@@ -355,7 +355,7 @@ |
14 |
|
|
my $key = $account->key(); |
15 |
|
|
push (@emailPseudonyms, $key) if ($type eq 'pseudonym'); |
16 |
|
|
} |
17 |
|
|
- my $urlprefix = $fm->build_cgi_params($q->param('pseudonym')); |
18 |
|
|
+ my $urlprefix = $fm->build_cgi_params(uri_unescape($q->param('pseudonym'))); |
19 |
|
|
print " <tr>\n <td colspan='2'>\n"; |
20 |
|
|
print $q->p($q->a({href => "pseudonyms?$urlprefix&wherenext=Create", -class => "button-like"}, |
21 |
|
|
$fm->localise("CLICK_TO_CREATE"))); |
22 |
|
|
@@ -419,7 +419,7 @@ |
23 |
|
|
sub get_pseudonym_account { |
24 |
|
|
my $fm = shift; |
25 |
|
|
my $q = $fm->{'cgi'}; |
26 |
|
|
- my $pseudonym = $q->param('pseudonym'); |
27 |
|
|
+ my $pseudonym = uri_unescape($q->param('pseudonym')); |
28 |
|
|
my $account = $accounts->get($pseudonym)->prop('Account'); |
29 |
|
|
if ($account eq "admin") { |
30 |
|
|
$account = "Administrator"; |
31 |
|
|
@@ -441,7 +441,7 @@ |
32 |
|
|
sub is_pseudonym_not_removable { |
33 |
|
|
my $fm = shift; |
34 |
|
|
my $q = $fm->{'cgi'}; |
35 |
|
|
- my $pseudonym = $q->param('pseudonym'); |
36 |
|
|
+ my $pseudonym = uri_unescape($q->param('pseudonym')); |
37 |
|
|
my $removable = $accounts->get($pseudonym)->prop('Removable') || 'yes'; |
38 |
|
|
return 1 if ($removable eq 'yes'); |
39 |
|
|
return 0; |
40 |
|
|
@@ -459,7 +459,7 @@ |
41 |
|
|
sub is_pseudonym_internal { |
42 |
|
|
my $fm = shift; |
43 |
|
|
my $q = $fm->{'cgi'}; |
44 |
|
|
- my $pseudonym = $q->param('pseudonym'); |
45 |
|
|
+ my $pseudonym = uri_unescape($q->param('pseudonym')); |
46 |
|
|
my $visible = $accounts->get($pseudonym)->prop('Visible') || ''; |
47 |
|
|
return 'YES' if ($visible eq 'internal'); |
48 |
|
|
return 'NO'; |