| 1 |
vip-ire |
1.1 |
diff -Nur e-smith-email-5.2.0/root/etc/e-smith/db/configuration/migrate/35enableImap e-smith-email-5.2.0-imap_loopback/root/etc/e-smith/db/configuration/migrate/35enableImap |
| 2 |
|
|
--- e-smith-email-5.2.0/root/etc/e-smith/db/configuration/migrate/35enableImap 1970-01-01 01:00:00.000000000 +0100 |
| 3 |
|
|
+++ e-smith-email-5.2.0-imap_loopback/root/etc/e-smith/db/configuration/migrate/35enableImap 2013-06-21 12:40:09.714039807 +0200 |
| 4 |
|
|
@@ -0,0 +1,10 @@ |
| 5 |
|
|
+{ |
| 6 |
|
|
+ |
| 7 |
|
|
+my $imap = $DB->get('imap') || |
| 8 |
|
|
+ $DB->new_record('imap', {type => 'service'}); |
| 9 |
|
|
+my $status = $imap->prop('status') || 'disabled'; |
| 10 |
|
|
+return "" if ($status eq 'enabled'); |
| 11 |
|
|
+$imap->set_prop('status', 'enabled'); |
| 12 |
|
|
+$imap->set_prop('access', 'localhost'); |
| 13 |
|
|
+ |
| 14 |
|
|
+} |
| 15 |
|
|
Les fichiers binaires e-smith-email-5.2.0/root/etc/e-smith/db/configuration/migrate/.40enableImap.swp et e-smith-email-5.2.0-imap_loopback/root/etc/e-smith/db/configuration/migrate/.40enableImap.swp sont différents. |
| 16 |
|
|
diff -Nur e-smith-email-5.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm e-smith-email-5.2.0-imap_loopback/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm |
| 17 |
|
|
--- e-smith-email-5.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm 2013-06-20 15:30:12.131425161 +0200 |
| 18 |
|
|
+++ e-smith-email-5.2.0-imap_loopback/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm 2013-06-21 12:35:22.345337336 +0200 |
| 19 |
|
|
@@ -304,20 +304,23 @@ |
| 20 |
|
|
|
| 21 |
|
|
my $imapAccess = ($q->param('IMAPAccess') || 'private'); |
| 22 |
|
|
if ($imapAccess eq 'disabled') { |
| 23 |
|
|
- $db->set_prop('imap', "status", "disabled" ); |
| 24 |
|
|
+ $db->set_prop('imap', "status", "enabled" ); |
| 25 |
|
|
+ $db->set_prop('imap', "access", "localhost" ); |
| 26 |
|
|
$db->set_prop('imaps', "status", "disabled" ); |
| 27 |
|
|
- } else { |
| 28 |
|
|
+ } elsif ($imapAccess eq 'public') { |
| 29 |
|
|
$db->set_prop('imap', "status", "enabled" ); |
| 30 |
|
|
- $db->set_prop('imaps', "status", "enabled" ); |
| 31 |
|
|
- } |
| 32 |
|
|
- if ($imapAccess eq 'public') { |
| 33 |
|
|
$db->set_prop('imap', "access", "public" ); |
| 34 |
|
|
+ $db->set_prop('imaps', "status", "enabled" ); |
| 35 |
|
|
$db->set_prop('imaps', "access", "public" ); |
| 36 |
|
|
} elsif ($imapAccess eq 'publicSSL') { |
| 37 |
|
|
+ $db->set_prop('imap', "status", "enabled" ); |
| 38 |
|
|
$db->set_prop('imap', "access", "private" ); |
| 39 |
|
|
+ $db->set_prop('imaps', "status", "enabled" ); |
| 40 |
|
|
$db->set_prop('imaps', "access", "public" ); |
| 41 |
|
|
} else { |
| 42 |
|
|
+ $db->set_prop('imap', "status", "enabled" ); |
| 43 |
|
|
$db->set_prop('imap', "access", "private" ); |
| 44 |
|
|
+ $db->set_prop('imaps', "status", "enabled" ); |
| 45 |
|
|
$db->set_prop('imaps', "access", "private" ); |
| 46 |
|
|
} |
| 47 |
|
|
|
| 48 |
|
|
@@ -494,7 +497,7 @@ |
| 49 |
|
|
|
| 50 |
|
|
my $options = get_imap_options(); |
| 51 |
|
|
|
| 52 |
|
|
- if ($imapStatus ne 'enabled' && $imapsStatus ne 'enabled') |
| 53 |
|
|
+ if (($imapStatus ne 'enabled' || $imapAccess eq 'localhost') && $imapsStatus ne 'enabled') |
| 54 |
|
|
{ |
| 55 |
|
|
return $localise ? $fm->localise($options->{disabled}) : 'disabled'; |
| 56 |
|
|
} |
Parent Directory
| 
Revision Log
| 
Revision Graph
