paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

master
André Peters 2017-02-15 21:25:14 +01:00 committed by GitHub
parent ac6d8655b4 7781e5f37d
commit ade004a40a
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
data/web/autodiscover.php
View File

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