Merge branch 'master' into dev

data/web/autodiscover.php

@@ -1,4 +1,4 @@
-<?php
+require_once 'inc/vars.inc.php';
 ini_set('error_reporting', '0');
 $config = array(
      'useEASforOutlook' => 'yes',
@@ -18,6 +18,10 @@ $config = array(
      )
 );
 
+if(file_exists('inc/vars.local.inc.php')) {
+	include_once 'inc/vars.local.inc.php';
+}
+
 /* ---------- DO NOT MODIFY ANYTHING BEYOND THIS LINE. IGNORE AT YOUR OWN RISK. ---------- */
 
 if ($config['useEASforOutlook'] == 'no') {
@@ -25,11 +29,6 @@ if ($config['useEASforOutlook'] == 'no') {
 		$config['autodiscoverType'] = 'imap';
 	}
 }
-require_once 'inc/vars.inc.php';
-if(file_exists('inc/vars.local.inc.php')) {
-	include_once 'inc/vars.local.inc.php';
-}
-require_once 'inc/functions.inc.php';
 
 $dsn = "$database_type:host=$database_host;dbname=$database_name";
 $opt = [