From 5a3bfa1e592e278095f34aeb6acc200c0dd781eb Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Wed, 21 Dec 2016 12:19:08 +0100
Subject: [PATCH] Fix order

---
 data/web/autoconfig.php                       |  2 +-
 data/web/autoconfig/mail/config-v1.1.xml_rc   | 85 -------------------
 data/web/autoconfig/mail/config-v1.1.xml_sogo | 79 -----------------
 3 files changed, 1 insertion(+), 165 deletions(-)
 delete mode 100644 data/web/autoconfig/mail/config-v1.1.xml_rc
 delete mode 100644 data/web/autoconfig/mail/config-v1.1.xml_sogo

diff --git a/data/web/autoconfig.php b/data/web/autoconfig.php
index 4fd03474..563df5d5 100644
--- a/data/web/autoconfig.php
+++ b/data/web/autoconfig.php
@@ -1,7 +1,7 @@
 <?php
+require_once "inc/vars.inc.php";
 if (empty($mailcow_hostname)) { exit(); }
 header("Content-Type: application/xml");
-require_once "inc/vars.inc.php";
 ?>
 <?='<?xml version="1.0"?>';?>
 <clientConfig version="1.1">
diff --git a/data/web/autoconfig/mail/config-v1.1.xml_rc b/data/web/autoconfig/mail/config-v1.1.xml_rc
deleted file mode 100644
index 4bb35685..00000000
--- a/data/web/autoconfig/mail/config-v1.1.xml_rc
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Mozilla Thunderbird Autoconfiguration file provided by mailcow
-
-     Further reading:
-     https://developer.mozilla.org/en-US/docs/Mozilla/Thunderbird/Autoconfiguration
-     https://wiki.mozilla.org/Thunderbird:Autoconfiguration
-     https://wiki.mozilla.org/Thunderbird:Autoconfiguration:ConfigFileFormat
--->
-
-<clientConfig version="1.1">
-    <emailProvider id="MAILCOW_DOMAIN">
-      <domain>MAILCOW_DOMAIN</domain>
-
-      <displayName>MAILCOW_DOMAIN mail server powered by mailcow</displayName>
-      <displayShortName>MAILCOW_DOMAIN mail server</displayShortName>
-
-      <incomingServer type="imap">
-         <hostname>MAILCOW_HOST.MAILCOW_DOMAIN</hostname>
-         <port>993</port>
-         <socketType>SSL</socketType>
-         <username>%EMAILADDRESS%</username>
-         <authentication>password-cleartext</authentication>
-      </incomingServer>
-      <incomingServer type="imap">
-         <hostname>MAILCOW_HOST.MAILCOW_DOMAIN</hostname>
-         <port>143</port>
-         <socketType>STARTTLS</socketType>
-         <username>%EMAILADDRESS%</username>
-         <authentication>password-cleartext</authentication>
-      </incomingServer>
-
-      <incomingServer type="pop3">
-         <hostname>MAILCOW_HOST.MAILCOW_DOMAIN</hostname>
-         <port>995</port>
-         <socketType>SSL</socketType>
-         <username>%EMAILADDRESS%</username>
-         <authentication>password-cleartext</authentication>
-      </incomingServer>
-      <incomingServer type="pop3">
-         <hostname>MAILCOW_HOST.MAILCOW_DOMAIN</hostname>
-         <port>110</port>
-         <socketType>STARTTLS</socketType>
-         <username>%EMAILADDRESS%</username>
-         <authentication>password-cleartext</authentication>
-      </incomingServer>
-
-      <outgoingServer type="smtp">
-         <hostname>MAILCOW_HOST.MAILCOW_DOMAIN</hostname>
-         <port>465</port>
-         <socketType>SSL</socketType>
-         <username>%EMAILADDRESS%</username>
-         <authentication>password-cleartext</authentication>
-      </outgoingServer>
-
-      <outgoingServer type="smtp">
-         <hostname>MAILCOW_HOST.MAILCOW_DOMAIN</hostname>
-         <port>587</port>
-         <socketType>STARTTLS</socketType>
-         <username>%EMAILADDRESS%</username>
-         <authentication>password-cleartext</authentication>
-      </outgoingServer>
-
-      <enable visiturl="https://MAILCOW_HOST.MAILCOW_DOMAIN/admin.php">
-         <instruction>If you didn't change the password given to you by the administrator or if you didn't change it in a long time, please consider doing that now.</instruction>
-         <instruction lang="de">Sollten Sie das Ihnen durch den Administrator vergebene Passwort noch nicht geändert haben, empfehlen wir dies nun zu tun. Auch ein altes Passwort sollte aus Sicherheitsgründen geändert werden.</instruction>
-      </enable>
-
-      <documentation url="http://MAILCOW_HOST.MAILCOW_DOMAIN">
-         <descr lang="en">MAILCOW_DOMAIN mail server info</descr>
-         <descr lang="de">MAILCOW_DOMAIN Mailserver Info</descr>
-      </documentation>
-
-    </emailProvider>
-
-    <webMail>
-      <loginPage url="https://MAILCOW_HOST.MAILCOW_DOMAIN/rc/" />
-      <loginPageInfo url="https://MAILCOW_HOST.MAILCOW_DOMAIN/rc/">
-        <username>%EMAILADDRESS%</username>
-        <usernameField id="rcmloginuser" />
-        <passwordField id="rcmloginpwd" />
-        <loginButton id="rcmloginsubmit" />
-      </loginPageInfo>
-    </webMail>
-</clientConfig>
diff --git a/data/web/autoconfig/mail/config-v1.1.xml_sogo b/data/web/autoconfig/mail/config-v1.1.xml_sogo
deleted file mode 100644
index adf5fcaa..00000000
--- a/data/web/autoconfig/mail/config-v1.1.xml_sogo
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- Mozilla Thunderbird Autoconfiguration file provided by mailcow
-
-     Further reading:
-     https://developer.mozilla.org/en-US/docs/Mozilla/Thunderbird/Autoconfiguration
-     https://wiki.mozilla.org/Thunderbird:Autoconfiguration
-     https://wiki.mozilla.org/Thunderbird:Autoconfiguration:ConfigFileFormat
--->
-
-<clientConfig version="1.1">
-    <emailProvider id="MAILCOW_DOMAIN">
-      <domain>MAILCOW_DOMAIN</domain>
-
-      <displayName>MAILCOW_DOMAIN mail server powered by mailcow</displayName>
-      <displayShortName>MAILCOW_DOMAIN mail server</displayShortName>
-
-      <incomingServer type="imap">
-         <hostname>MAILCOW_HOST.MAILCOW_DOMAIN</hostname>
-         <port>993</port>
-         <socketType>SSL</socketType>
-         <username>%EMAILADDRESS%</username>
-         <authentication>password-cleartext</authentication>
-      </incomingServer>
-      <incomingServer type="imap">
-         <hostname>MAILCOW_HOST.MAILCOW_DOMAIN</hostname>
-         <port>143</port>
-         <socketType>STARTTLS</socketType>
-         <username>%EMAILADDRESS%</username>
-         <authentication>password-cleartext</authentication>
-      </incomingServer>
-
-      <incomingServer type="pop3">
-         <hostname>MAILCOW_HOST.MAILCOW_DOMAIN</hostname>
-         <port>995</port>
-         <socketType>SSL</socketType>
-         <username>%EMAILADDRESS%</username>
-         <authentication>password-cleartext</authentication>
-      </incomingServer>
-      <incomingServer type="pop3">
-         <hostname>MAILCOW_HOST.MAILCOW_DOMAIN</hostname>
-         <port>110</port>
-         <socketType>STARTTLS</socketType>
-         <username>%EMAILADDRESS%</username>
-         <authentication>password-cleartext</authentication>
-      </incomingServer>
-
-      <outgoingServer type="smtp">
-         <hostname>MAILCOW_HOST.MAILCOW_DOMAIN</hostname>
-         <port>465</port>
-         <socketType>SSL</socketType>
-         <username>%EMAILADDRESS%</username>
-         <authentication>password-cleartext</authentication>
-      </outgoingServer>
-
-      <outgoingServer type="smtp">
-         <hostname>MAILCOW_HOST.MAILCOW_DOMAIN</hostname>
-         <port>587</port>
-         <socketType>STARTTLS</socketType>
-         <username>%EMAILADDRESS%</username>
-         <authentication>password-cleartext</authentication>
-      </outgoingServer>
-
-      <enable visiturl="https://MAILCOW_HOST.MAILCOW_DOMAIN/admin.php">
-         <instruction>If you didn't change the password given to you by the administrator or if you didn't change it in a long time, please consider doing that now.</instruction>
-         <instruction lang="de">Sollten Sie das Ihnen durch den Administrator vergebene Passwort noch nicht ge�ndert haben, empfehlen wir dies nun zu tun. Auch ein altes Passwort sollte aus Sicherheitsgr�nden ge�ndert werden.</instruction>
-      </enable>
-
-      <documentation url="http://MAILCOW_HOST.MAILCOW_DOMAIN">
-         <descr lang="en">MAILCOW_DOMAIN mail server info</descr>
-         <descr lang="de">MAILCOW_DOMAIN Mailserver Info</descr>
-      </documentation>
-
-    </emailProvider>
-
-    <webMail>
-      <loginPage url="https://MAILCOW_HOST.MAILCOW_DOMAIN/SOGo/" />
-    </webMail>
-</clientConfig>