Make 'realm' and 'preferred' less prominent, since most people

won't/shouldn't be using it.

diff --git a/imp/config/servers.php.dist b/imp/config/servers.php.dist
index e3ce255..856497a 100644 (file)
--- a/imp/config/servers.php.dist
+++ b/imp/config/servers.php.dist
@@ -65,29 +65,6 @@
  *           This value overrides any existing
  *           $conf['mailer']['params']['port'] value at runtime.
  *
- * realm: (string) ONLY USE REALM IF YOU ARE USING IMP FOR HORDE
- *        AUTHENTICATION AND YOU HAVE MULTIPLE SERVERS AND USERNAMES OVERLAP
- *        BETWEEN THOSE SERVERS.
- *
- *        If you only have one server, or have multiple servers with no
- *        username clashes, or have full user@example.com usernames, you DO
- *        NOT need a realm setting. If you set one, a '@' symbol plus the
- *        realm value will be appended to the username that users login to
- *        IMP with to create the username that Horde treats the user as.
- *
- *        Example: with a realm of 'example.com', the username 'jane' would
- *        be treated by Horde (NOT your IMAP/POP server) as 'jane@example.com',
- *        and the username 'jane@example.com' would be treated as
- *        'jane@example.com@example.com' - an occasion where you probably
- *        don't need a realm setting.
- *
- * preferred: (string) Only useful if you want to use the same servers.php file
- *            for different machines: if the hostname of the IMP machine is
- *            identical to one of those in the preferred list, then the
- *            corresponding option in the select box will include SELECTED
- *            (i.e. it is selected per default). Otherwise the first entry
- *            in the list is selected.
- *
  * quota: (array) Use this if you want to display a user's quota status on
  *        various IMP pages. Set 'driver' equal to the mailserver and 'params'
  *        equal to any extra parameters needed by the driver (see the
@@ -209,6 +186,30 @@
  *       have an effect. By default, IMAP messages are output in the IMAP
  *       server default language. (IMAP only)
  *
+ * realm: (string) ONLY USE REALM IF YOU ARE USING IMP FOR HORDE
+ *        AUTHENTICATION, YOU HAVE MULTIPLE SERVERS, AND USERNAMES OVERLAP
+ *        BETWEEN THOSE SERVERS.
+ *
+ *        If you only have one server, or have multiple servers with no
+ *        username clashes, or have full user@example.com usernames, you DO
+ *        NOT need a realm setting. If realm is set, a '@' symbol plus the
+ *        realm value will be appended to the username that users login to
+ *        IMP with to create the username that Horde treats the user as.
+ *
+ *        Example: with a realm of 'example.com', the username 'jane' would
+ *        be treated by Horde (NOT your IMAP/POP server) as 'jane@example.com',
+ *        and the username 'jane@example.com' would be treated as
+ *        'jane@example.com@example.com' - an occasion where you probably
+ *        don't need a realm setting.
+ *
+ * preferred: (string) Only useful if you want to use the same servers.php file
+ *            for different machines: if the hostname of the IMP machine is
+ *            identical to one of those in the preferred list, then the
+ *            corresponding option in the select box will include SELECTED
+ *            (i.e. it is selected per default). Otherwise the first entry
+ *            in the list is selected.
+ *
+ *
  * $Id$
  */
 
@@ -232,8 +233,6 @@ $servers['imap'] = array(
     'maildomain' => 'example.com',
     'smtphost' => 'smtp.example.com',
     'smtpport' => 25,
-    'realm' => '',
-    'preferred' => '',
     'cache' => false,
 );
 
@@ -247,8 +246,6 @@ $servers['cyrus'] = array(
     'maildomain' => 'example.com',
     'smtphost' => 'smtp.example.com',
     'smtpport' => 25,
-    'realm' => '',
-    'preferred' => '',
     'admin' => array(
         'params' => array(
             'admin_user' => 'cyrus',
@@ -277,8 +274,6 @@ $servers['pop'] = array(
     'maildomain' => 'example.com',
     'smtphost' => 'smtp.example.com',
     'smtpport' => 25,
-    'realm' => '',
-    'preferred' => '',
     'cache' => false,
 );
 
@@ -292,8 +287,6 @@ $servers['secure-imap'] = array(
     'maildomain' => 'example.com',
     'smtphost' => 'smtp.example.com',
     'smtpport' => 25,
-    'realm' => '',
-    'preferred' => '',
     'acl' => false,
     'cache' => false,
 );
@@ -308,8 +301,6 @@ if ($GLOBALS['conf']['kolab']['enabled']) {
         'port' => $GLOBALS['conf']['kolab']['imap']['port'],
         'secure' => false,
         'maildomain' => $GLOBALS['conf']['kolab']['imap']['maildomain'],
-        'realm' => '',
-        'preferred' => '',
         'quota' => array(
             'driver' => 'imap',
             'params' => array(