update host list. Use SSL. Drop Conduct.

2 files changed, 39 insertions, 43 deletions

diff --git a/imp3/motd.php b/imp3/motd.php
index 17a2e6a..4ce7220 100644
--- a/imp3/motd.php
+++ b/imp3/motd.php
@@ -4,18 +4,14 @@
 </P>
 <P align="center" class="light">
 Bookmark the following alternatives now, in case this site goes down one day:<BR>
-<A href="http://mail.jones.dk/" target="_top" class="helpitem">dr. Jones</A>,
-<A href="http://mail.homebase.dk/" target="_top" class="helpitem">Homebase</A>,
+<A href="https://mail.jones.dk/" target="_top" class="helpitem">dr. Jones</A>,
+<A href="https://mail.homebase.dk/" target="_top" class="helpitem">Homebase</A>,
 <A href="http://mail.107b.dk/" target="_top" class="helpitem">Lab</A>,
-<A href="http://mail.bitbase.dk/" target="_top" class="helpitem">Bitbase</A>,
-<A href="http://mail.conduct.dk/" target="_top" class="helpitem">Conduct I/S</A>,
+<A href="https://mail.bitbase.dk/" target="_top" class="helpitem">Bitbase</A>,
+<A href="https://mail.kaospilot.no/" target="_top" class="helpitem">Bitbase</A>,
 <A href="http://mail.dgi-huset.dk/" target="_top" class="helpitem">DGI-huset</A>,
 <A href="http://mail.idraetsdaghojskolen.dk/" target="_top" class="helpitem">IDA</A>.
 </P>
 <P align="center" class="light">
-Also, this older site may still work for some domains:<BR>
-<A href="http://webmail.a-host.dk/imp/" target="_top" class="helpitem">A-host</A>.
-</P>
-<P align="center" class="light">
 Always remember to select your home organisation at login!<BR>
 </P>
diff --git a/imp3/servers.php b/imp3/servers.php
index 0820dfd..9cbec7d 100644
--- a/imp3/servers.php
+++ b/imp3/servers.php
@@ -5,8 +5,8 @@ $servers['_prompt'] = array(
 $servers['jones'] = array(
 	'name'		=>	'dr. Jones',
 	'server'	=>	'mail.jones.dk',
-	'port'		=>	143,
-	'protocol'	=>	'imap/notls',
+	'port'		=>	993,
+	'protocol'	=>	'imap/ssl',
 	'folders'	=>	'',
 	'namespace'	=>	'',
 	'maildomain'	=>	'jones.dk',
@@ -18,7 +18,7 @@ $servers['jones'] = array(
 					"jones.mail.homebase.dk",
 					"jones.mail.107b.dk",
 					"jones.mail.bitbase.dk",
-					"jones.mail.conduct.dk",
+					"jones.mail.kaospilot.no",
 					"jones.mail.dgi-huset.dk",
 					"jones.mail.idraetsdaghojskolen.dk",
 				)
@@ -26,8 +26,8 @@ $servers['jones'] = array(
 $servers['homebase'] = array(
 	'name'		=>	'Homebase',
 	'server'	=>	'mail.homebase.dk',
-	'port'		=>	143,
-	'protocol'	=>	'imap/notls',
+	'port'		=>	993,
+	'protocol'	=>	'imap/ssl',
 	'folders'	=>	'',
 	'namespace'	=>	'',
 	'maildomain'	=>	'homebase.dk',
@@ -39,7 +39,7 @@ $servers['homebase'] = array(
 					"homebase.mail.homebase.dk",
 					"homebase.mail.107b.dk",
 					"homebase.mail.bitbase.dk",
-					"homebase.mail.conduct.dk",
+					"homebase.mail.kaospilot.no",
 					"homebase.mail.dgi-huset.dk",
 					"homebase.mail.idraetsdaghojskolen.dk",
 				)
@@ -47,8 +47,8 @@ $servers['homebase'] = array(
 $servers['lab'] = array(
 	'name'		=>	'Lab',
 	'server'	=>	'107b.dk',
-	'port'		=>	143,
-	'protocol'	=>	'imap/notls',
+	'port'		=>	993,
+	'protocol'	=>	'imap/ssl',
 	'folders'	=>	'',
 	'namespace'	=>	'',
 	'maildomain'	=>	'107b.dk',
@@ -60,7 +60,7 @@ $servers['lab'] = array(
 					"lab.mail.homebase.dk",
 					"lab.mail.107b.dk",
 					"lab.mail.bitbase.dk",
-					"lab.mail.conduct.dk",
+					"lab.mail.kaospilot.no",
 					"lab.mail.dgi-huset.dk",
 					"lab.mail.idraetsdaghojskolen.dk",
 				)
@@ -68,8 +68,8 @@ $servers['lab'] = array(
 $servers['bitbase'] = array(
 	'name'		=>	'Bitbase',
 	'server'	=>	'mail.bitbase.dk',
-	'port'		=>	143,
-	'protocol'	=>	'imap/notls',
+	'port'		=>	993,
+	'protocol'	=>	'imap/ssl',
 	'folders'	=>	'',
 	'namespace'	=>	'',
 	'maildomain'	=>	'bitbase.dk',
@@ -81,37 +81,37 @@ $servers['bitbase'] = array(
 					"bitbase.mail.homebase.dk",
 					"bitbase.mail.107b.dk",
 					"bitbase.mail.bitbase.dk",
-					"bitbase.mail.conduct.dk",
+					"bitbase.mail.kaospilot.no",
 					"bitbase.mail.dgi-huset.dk",
 					"bitbase.mail.idraetsdaghojskolen.dk",
 				)
 );
-$servers['conduct'] = array(
-	'name'		=>	'Conduct I/S',
-	'server'	=>	'mail.conduct.dk',
-	'port'		=>	143,
-	'protocol'	=>	'imap/notls',
+$servers['kpno'] = array(
+	'name'		=>	'Kaospiloterne, Norge',
+	'server'	=>	'mail.kaospilot.no',
+	'port'		=>	993,
+	'protocol'	=>	'imap/ssl',
 	'folders'	=>	'',
 	'namespace'	=>	'',
-	'maildomain'	=>	'mail.conduct.dk',
+	'maildomain'	=>	'users.kaospilot.no',
 	'smtphost'	=>	'localhost',
-	'realm'		=>	'mail.conduct.dk',
+	'realm'		=>	'kaospilot.no',
 	'preferred'	=>	array(
-					"mail.conduct.dk",
-					"conduct.mail.jones.dk",
-					"conduct.mail.homebase.dk",
-					"conduct.mail.107b.dk",
-					"conduct.mail.bitbase.dk",
-					"conduct.mail.conduct.dk",
-					"conduct.mail.dgi-huset.dk",
-					"conduct.mail.idraetsdaghojskolen.dk",
+					"mail.kaospilot.no",
+					"kpno.mail.jones.dk",
+					"kpno.mail.homebase.dk",
+					"kpno.mail.107b.dk",
+					"kpno.mail.bitbase.dk",
+					"kpno.mail.kaospilot.no",
+					"kpno.mail.dgi-huset.dk",
+					"kpno.mail.idraetsdaghojskolen.dk",
 				)
 );
 $servers['dgih'] = array(
 	'name'		=>	'DGI-huset',
 	'server'	=>	'mail.dgi-huset.dk',
-	'port'		=>	143,
-	'protocol'	=>	'imap/notls',
+	'port'		=>	993,
+	'protocol'	=>	'imap/ssl',
 	'folders'	=>	'',
 	'namespace'	=>	'',
 	'maildomain'	=>	'dgi-huset.dk',
@@ -123,7 +123,7 @@ $servers['dgih'] = array(
 					"dgih.mail.homebase.dk",
 					"dgih.mail.107b.dk",
 					"dgih.mail.bitbase.dk",
-					"dgih.mail.conduct.dk",
+					"dgih.mail.kaospilot.no",
 					"dgih.mail.dgi-huset.dk",
 					"dgih.mail.idraetsdaghojskolen.dk",
 				)
@@ -131,20 +131,20 @@ $servers['dgih'] = array(
 $servers['ida'] = array(
 	'name'		=>	'IDA',
 	'server'	=>	'mail.idraetsdaghojskolen.dk',
-	'port'		=>	143,
-	'protocol'	=>	'imap/notls',
+	'port'		=>	993,
+	'protocol'	=>	'imap/ssl',
 	'folders'	=>	'',
 	'namespace'	=>	'',
-	'maildomain'	=>	'mail.idraetsdaghojskolen.dk',
+	'maildomain'	=>	'idraetsdaghojskolen.dk',
 	'smtphost'	=>	'localhost',
-	'realm'		=>	'mail.idraetsdaghojskolen.dk',
+	'realm'		=>	'idraetsdaghojskolen.dk',
 	'preferred'	=>	array(
 					"mail.idraetsdaghojskolen.dk",
 					"ida.mail.jones.dk",
 					"ida.mail.homebase.dk",
 					"ida.mail.107b.dk",
 					"ida.mail.bitbase.dk",
-					"ida.mail.conduct.dk",
+					"ida.mail.kaospilot.no",
 					"ida.mail.dgi-huset.dk",
 					"ida.mail.idraetsdaghojskolen.dk",
 				)