webmail restructuring.

2 files changed, 42 insertions, 41 deletions

diff --git a/imp/MOTD.html b/imp/MOTD.html
index b5effbc..7113e60 100644
--- a/imp/MOTD.html
+++ b/imp/MOTD.html
@@ -7,21 +7,24 @@ Use one of the alternative programs below if sending attachments is needed.
 In case of problems consider using one of the newer Horde sites:<BR>
 <A href="http://horde.jones.dk/" target="_top">dr. Jones</A>,
 <A href="http://horde.homebase.dk/" target="_top">Homebase</A>,
-or <A href="http://horde.biks.dk/" target="_top">Biks</A>.
+<A href="http://horde.107b.dk/" target="_top">Lab</A>,
+or <A href="http://horde.bitbase.dk/" target="_top">Bitbase</A>.
 </P>
 <P align="center">
 Here is a list of all of the (older) IMP sites<BR>
 (remember to select your own organisation when logging in...!):<BR>
 <A href="http://imp.jones.dk/" target="_top">dr. Jones</A>,
+<A href="http://imp.homebase.dk/" target="_top">Homebase</A>,
+<A href="http://imp.107b.dk/" target="_top">Lab</A>,
+<A href="http://imp.jones.dk/" target="_top">Bitbase</A>,
 <A href="http://webmail.a-host.dk/imp/" target="_top">A-host</A>,
-<A href="http://www.homebase.dk/imp/" target="_top">Homebase</A>,
 <A href="http://woody.macvaerk.com/imp/" target="_top">Macvaerk</A>.
 </P>
 <P align="center">
 There's also a few alternative webmail programs<BR>
 (less secure, but might work better in some situations):<BR>
-<A href="http://webtools.jones.dk/nocc/" target="_top">NOCC</A>
+<A href="http://mail.jones.dk/nocc/" target="_top">NOCC</A>
 and AeroMail
-(<A href="http://webtools.jones.dk/aeromail/" target="_top">jones.dk</A>/<A href="http://www.homebase.dk/aeromail/" target="_top">homebase.dk</A>).<BR>
+(<A href="http://mail.jones.dk/aeromail/" target="_top">jones.dk</A>/<A href="http://mail.homebase.dk/aeromail/" target="_top">homebase.dk</A>).<BR>
 </P>
 </CENTER>
diff --git a/imp/servers.php3 b/imp/servers.php3
index 2c5a8f9..ac999b1 100644
--- a/imp/servers.php3
+++ b/imp/servers.php3
@@ -40,15 +40,12 @@ $IMAPServers['jones'] = new IMAPServer('dr. Jones',
 					'',
 					'jones.dk',
 					array(
-						"jones.dk",
-						"mail.jones.dk",
-						"www.jones.dk",
-						"bastian.jones.dk",
-						"webtools.jones.dk",
-						"dr.jones.dk",
-						"imp.jones.dk",
 						"jones.imp.jones.dk",
-						"jones.horde.biks.dk"
+						"jones.imp.homebase.dk",
+						"jones.imp.107b.dk",
+						"jones.imp.a-host.dk",
+						"jones.imp.vega.dk",
+						"jones.imp.bitbase.dk"
 						));
 
 $IMAPServers['homebase'] = new IMAPServer('Homebase',
@@ -57,25 +54,12 @@ $IMAPServers['homebase'] = new IMAPServer('Homebase',
 					'',
 					'homebase.dk',
 					array(
-						"homebase.dk",
-						"mail.homebase.dk",
-						"www.homebase.dk",
-						"honda.homebase.dk",
-						"nimbus.homebase.dk",
 						"homebase.imp.jones.dk",
-						"imp.homebase.dk",
-						"homebase.horde.biks.dk"
-						));
-
-$IMAPServers['a-host'] = new IMAPServer('a-host',
-					'mail2.a-host.dk',
-					143,
-					'',
-					'a-host.dk',
-					array(
-						"webmail.a-host.dk",
-						"mail2.a-host.dk",
-						"a-host.horde.biks.dk"
+						"homebase.imp.homebase.dk",
+						"homebase.imp.107b.dk",
+						"homebase.imp.a-host.dk",
+						"homebase.imp.vega.dk",
+						"homebase.imp.bitbase.dk"
 						));
 
 $IMAPServers['lab'] = new IMAPServer('Lab (107b.dk)',
@@ -84,17 +68,12 @@ $IMAPServers['lab'] = new IMAPServer('Lab (107b.dk)',
 					'',
 					'107b.dk',
 					array(
-						"mail.107b.dk",
-						"lab.horde.biks.dk"
-						));
-
-$IMAPServers['louiz'] = new IMAPServer('Louiz',
-					'louiz.dk',
-					143,
-					'',
-					'louiz.dk',
-					array(
-						"louiz.horde.biks.dk"
+						"lab.imp.jones.dk",
+						"lab.imp.homebase.dk",
+						"lab.imp.107b.dk",
+						"lab.imp.a-host.dk",
+						"lab.imp.vega.dk",
+						"lab.imp.bitbase.dk"
 						));
 
 $IMAPServers['bitbase'] = new IMAPServer('Bitbase',
@@ -111,5 +90,24 @@ $IMAPServers['bitbase'] = new IMAPServer('Bitbase',
 						"bitbase.imp.bitbase.dk"
 						));
 
+$IMAPServers['a-host'] = new IMAPServer('a-host',
+					'mail2.a-host.dk',
+					143,
+					'',
+					'a-host.dk',
+					array(
+						"webmail.a-host.dk",
+						"mail2.a-host.dk",
+						"a-host.horde.biks.dk"
+						));
+
+$IMAPServers['louiz'] = new IMAPServer('Louiz',
+					'louiz.dk',
+					143,
+					'',
+					'louiz.dk',
+					array(
+						"louiz.horde.biks.dk"
+						));
 
 ?>