1 |
vip-ire |
1.1 |
diff -Nur e-smith-imp-5.4.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/servers.php/120IMAPServers e-smith-imp-5.4.0-no_ssl/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/servers.php/120IMAPServers |
2 |
|
|
--- e-smith-imp-5.4.0/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/servers.php/120IMAPServers 2013-02-14 00:00:14.000000000 +0100 |
3 |
|
|
+++ e-smith-imp-5.4.0-no_ssl/root/etc/e-smith/templates/home/httpd/html/horde/imp/config/servers.php/120IMAPServers 2013-06-21 11:34:53.661665632 +0200 |
4 |
|
|
@@ -11,18 +11,8 @@ |
5 |
|
|
$OUT .= " 'name' => 'IMAP Server',\n"; |
6 |
|
|
$OUT .= " 'server' => 'localhost',\n"; |
7 |
|
|
$OUT .= " 'hordeauth' => false,\n"; |
8 |
|
|
- |
9 |
|
|
- if ($imaps{access} eq 'public') |
10 |
|
|
- { |
11 |
|
|
- $OUT .= " 'protocol' => 'imap/ssl/novalidate-cert',\n"; |
12 |
|
|
- $OUT .= " 'port' => '$imaps{TCPPort}',\n"; |
13 |
|
|
- } |
14 |
|
|
- else |
15 |
|
|
- { |
16 |
|
|
- $OUT .= " 'protocol' => 'imap/notls',\n"; |
17 |
|
|
- $OUT .= " 'port' => '$imap{TCPPort}',\n"; |
18 |
|
|
- |
19 |
|
|
- } |
20 |
|
|
+ $OUT .= " 'protocol' => 'imap/notls',\n"; |
21 |
|
|
+ $OUT .= " 'port' => '$imap{TCPPort}',\n"; |
22 |
|
|
$OUT .= " 'maildomain' => '$domain',\n"; |
23 |
|
|
$OUT .= " 'smtphost' => 'localhost',\n"; |
24 |
|
|
$OUT .= " 'smtpport' => '$smtpd{TCPPort}',\n"; |