| 1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-email-4.16.0/root/etc/e-smith/db/accounts/defaults/abuse/Removable mezzanine_patched_e-smith-email-4.16.0/root/etc/e-smith/db/accounts/defaults/abuse/Removable |
| 2 |
--- e-smith-email-4.16.0/root/etc/e-smith/db/accounts/defaults/abuse/Removable 1969-12-31 17:00:00.000000000 -0700 |
| 3 |
+++ mezzanine_patched_e-smith-email-4.16.0/root/etc/e-smith/db/accounts/defaults/abuse/Removable 2006-12-26 14:52:06.000000000 -0700 |
| 4 |
@@ -0,0 +1 @@ |
| 5 |
+no |
| 6 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-email-4.16.0/root/etc/e-smith/db/accounts/defaults/anonymous/Removable mezzanine_patched_e-smith-email-4.16.0/root/etc/e-smith/db/accounts/defaults/anonymous/Removable |
| 7 |
--- e-smith-email-4.16.0/root/etc/e-smith/db/accounts/defaults/anonymous/Removable 1969-12-31 17:00:00.000000000 -0700 |
| 8 |
+++ mezzanine_patched_e-smith-email-4.16.0/root/etc/e-smith/db/accounts/defaults/anonymous/Removable 2006-12-26 14:52:34.000000000 -0700 |
| 9 |
@@ -0,0 +1 @@ |
| 10 |
+no |
| 11 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-email-4.16.0/root/etc/e-smith/db/accounts/defaults/everyone/Changeable mezzanine_patched_e-smith-email-4.16.0/root/etc/e-smith/db/accounts/defaults/everyone/Changeable |
| 12 |
--- e-smith-email-4.16.0/root/etc/e-smith/db/accounts/defaults/everyone/Changeable 1969-12-31 17:00:00.000000000 -0700 |
| 13 |
+++ mezzanine_patched_e-smith-email-4.16.0/root/etc/e-smith/db/accounts/defaults/everyone/Changeable 2006-12-26 15:13:39.000000000 -0700 |
| 14 |
@@ -0,0 +1 @@ |
| 15 |
+no |
| 16 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-email-4.16.0/root/etc/e-smith/db/accounts/defaults/everyone/Removable mezzanine_patched_e-smith-email-4.16.0/root/etc/e-smith/db/accounts/defaults/everyone/Removable |
| 17 |
--- e-smith-email-4.16.0/root/etc/e-smith/db/accounts/defaults/everyone/Removable 1969-12-31 17:00:00.000000000 -0700 |
| 18 |
+++ mezzanine_patched_e-smith-email-4.16.0/root/etc/e-smith/db/accounts/defaults/everyone/Removable 2006-12-26 14:51:46.000000000 -0700 |
| 19 |
@@ -0,0 +1 @@ |
| 20 |
+no |
| 21 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-email-4.16.0/root/etc/e-smith/db/accounts/defaults/mailer-daemon/Removable mezzanine_patched_e-smith-email-4.16.0/root/etc/e-smith/db/accounts/defaults/mailer-daemon/Removable |
| 22 |
--- e-smith-email-4.16.0/root/etc/e-smith/db/accounts/defaults/mailer-daemon/Removable 1969-12-31 17:00:00.000000000 -0700 |
| 23 |
+++ mezzanine_patched_e-smith-email-4.16.0/root/etc/e-smith/db/accounts/defaults/mailer-daemon/Removable 2006-12-26 14:51:52.000000000 -0700 |
| 24 |
@@ -0,0 +1 @@ |
| 25 |
+no |
| 26 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-email-4.16.0/root/etc/e-smith/db/accounts/defaults/postmaster/Removable mezzanine_patched_e-smith-email-4.16.0/root/etc/e-smith/db/accounts/defaults/postmaster/Removable |
| 27 |
--- e-smith-email-4.16.0/root/etc/e-smith/db/accounts/defaults/postmaster/Removable 1969-12-31 17:00:00.000000000 -0700 |
| 28 |
+++ mezzanine_patched_e-smith-email-4.16.0/root/etc/e-smith/db/accounts/defaults/postmaster/Removable 2006-12-26 14:51:57.000000000 -0700 |
| 29 |
@@ -0,0 +1 @@ |
| 30 |
+no |
| 31 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-email-4.16.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/pseudonyms.pm mezzanine_patched_e-smith-email-4.16.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/pseudonyms.pm |
| 32 |
--- e-smith-email-4.16.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/pseudonyms.pm 2006-12-26 15:16:12.000000000 -0700 |
| 33 |
+++ mezzanine_patched_e-smith-email-4.16.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/pseudonyms.pm 2006-12-26 15:12:25.000000000 -0700 |
| 34 |
@@ -338,15 +338,9 @@ |
| 35 |
# Need to untie and re-tie the accounts database to ensure changes |
| 36 |
# are recognised. |
| 37 |
foreach my $account ($accounts->get_all()) { |
| 38 |
- my $type =$account->prop('type'); |
| 39 |
+ my $type = $account->prop('type'); |
| 40 |
my $key = $account->key(); |
| 41 |
- if ($type eq 'pseudonym') { |
| 42 |
- next if ($key eq "everyone"); |
| 43 |
- next if ($key eq "mailer-daemon"); |
| 44 |
- next if ($key eq "postmaster"); |
| 45 |
- next if ($key eq "abuse"); |
| 46 |
- push (@emailPseudonyms, $key); |
| 47 |
- } |
| 48 |
+ push (@emailPseudonyms, $key) if ($type eq 'pseudonym'); |
| 49 |
} |
| 50 |
my $urlprefix = $fm->build_cgi_params($q->param('pseudonym')); |
| 51 |
print " <tr>\n <td colspan='2'>\n"; |
| 52 |
@@ -363,37 +357,33 @@ |
| 53 |
" <th class=\"sme-border\">".$fm->localise('USER_OR_GROUP') . "</th>\n" . |
| 54 |
" <th class=\"sme-border\" colspan=\"2\">".$fm->localise('ACTION') . "</th></tr>\n"; |
| 55 |
|
| 56 |
- foreach my $pseudonym ("everyone", "mailer-daemon", "postmaster", "abuse") { |
| 57 |
- my $account = $accounts->get($pseudonym)->prop('Account'); |
| 58 |
- $account = "Administrator" if (defined $account && $account eq "admin"); |
| 59 |
- $account = $fm->localise("EVERYONE") if (defined $account && $account eq "shared"); |
| 60 |
- |
| 61 |
- my $visible =$accounts->get($pseudonym)->prop('Visible'); |
| 62 |
- $account .= $fm->localise('LOCAL_ONLY')if (defined $visible && $visible eq "internal"); |
| 63 |
- print " <tr>\n" . |
| 64 |
- " <td class=\"sme-border\">$pseudonym</td>\n" . |
| 65 |
- " <td class=\"sme-border\">$account</td>\n" . |
| 66 |
- " <td class=\"sme-border\"> </td>\n" . |
| 67 |
- " <td class=\"sme-border\"> </td>\n"; |
| 68 |
- } |
| 69 |
- |
| 70 |
foreach my $pseudonym (sort @emailPseudonyms) { |
| 71 |
my $account = $accounts->get($pseudonym)->prop('Account'); |
| 72 |
|
| 73 |
$account = "Administrator" if ($account eq "admin"); |
| 74 |
$account = $fm->localise("EVERYONE") if ($account eq "shared"); |
| 75 |
|
| 76 |
- my $visible = $accounts->get($pseudonym)->prop('Visible'); |
| 77 |
+ my $removable = $accounts->get($pseudonym)->prop('Removable') || 'yes'; |
| 78 |
+ my $changeable = $accounts->get($pseudonym)->prop('Changeable') || 'yes'; |
| 79 |
|
| 80 |
+ my $visible = $accounts->get($pseudonym)->prop('Visible'); |
| 81 |
$account .= $fm->localise("LOCAL_ONLY") |
| 82 |
if (defined $visible && $visible eq "internal"); |
| 83 |
|
| 84 |
my $urlprefix = $fm->build_cgi_params($pseudonym); |
| 85 |
print " <tr>\n" . |
| 86 |
" <td class=\"sme-border\">$pseudonym</td>\n" . |
| 87 |
- " <td class=\"sme-border\">$account</td>\n" . |
| 88 |
- " <td class=\"sme-border\">".$q->a({href => "pseudonyms?$urlprefix&wherenext=Modify"},$fm->localise("MODIFY"))."</td>\n" . |
| 89 |
- " <td class=\"sme-border\">".$q->a({href => "pseudonyms?$urlprefix&wherenext=Remove"},$fm->localise("REMOVE"))."</td>\n"; |
| 90 |
+ " <td class=\"sme-border\">$account</td>\n"; |
| 91 |
+ if ($changeable eq 'no') { |
| 92 |
+ print " <td class=\"sme-border\"> </td>\n"; |
| 93 |
+ } else { |
| 94 |
+ print " <td class=\"sme-border\">".$q->a({href => "pseudonyms?$urlprefix&wherenext=Modify"},$fm->localise("MODIFY"))."</td>\n"; |
| 95 |
+ } |
| 96 |
+ if ($removable eq 'no') { |
| 97 |
+ print " <td class=\"sme-border\"> </td>\n"; |
| 98 |
+ } else { |
| 99 |
+ print " <td class=\"sme-border\">".$q->a({href => "pseudonyms?$urlprefix&wherenext=Remove"},$fm->localise("REMOVE"))."</td>\n"; |
| 100 |
+ } |
| 101 |
print "</tr>"; |
| 102 |
} |
| 103 |
|
Parent Directory
| 
Revision Log
| 
Revision Graph
