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

Merge branch 'dev' of https://github.com/andryyy/mailcow-dockerized into dev

master
andryyy 2017-02-13 13:43:11 +01:00
parent 622a8872e7 7668f82566
commit 68a9490dc3
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/conf/postfix/sql/mysql_virtual_sender_acl.cf
View File

@ -2,4 +2,4 @@ user = mailcow
password = mysafepasswd password = mysafepasswd
hosts = mysql hosts = mysql
dbname = mailcow dbname = mailcow
query = SELECT goto FROM alias WHERE address='%s' AND active='1' AND domain IN(SELECT domain FROM domain WHERE domain='%d' AND active='1') UNION SELECT logged_in_as FROM sender_acl WHERE send_as='@%d' OR send_as='%s' OR send_as IN ( SELECT CONCAT ('@',target_domain) FROM alias_domain WHERE alias_domain = '%d') OR send_as IN ( SELECT CONCAT ('%u','@',target_domain) FROM alias_domain WHERE alias_domain = '%d' ) AND logged_in_as NOT IN (SELECT goto FROM alias WHERE address='%s') UNION SELECT goto FROM alias,alias_domain WHERE alias_domain.alias_domain = '%d' AND alias.address = CONCAT('%u','@',alias_domain.target_domain) AND alias.active ='1' AND alias_domain.active='1 query = SELECT goto FROM alias WHERE address='%s' AND active='1' AND domain IN(SELECT domain FROM domain WHERE domain='%d' AND active='1') UNION SELECT logged_in_as FROM sender_acl WHERE send_as='@%d' OR send_as='%s' OR send_as IN ( SELECT CONCAT ('@',target_domain) FROM alias_domain WHERE alias_domain = '%d') OR send_as IN ( SELECT CONCAT ('%u','@',target_domain) FROM alias_domain WHERE alias_domain = '%d' ) AND logged_in_as NOT IN (SELECT goto FROM alias WHERE address='%s') UNION SELECT goto FROM alias,alias_domain WHERE alias_domain.alias_domain = '%d' AND alias.address = CONCAT('%u','@',alias_domain.target_domain) AND alias.active ='1' AND alias_domain.active='1'

3
data/web/autodiscover.php
View File

@ -1,4 +1,5 @@
<?php <?php
ini_set('error_reporting', '0');
$config = array( $config = array(
'useEASforOutlook' => 'yes', 'useEASforOutlook' => 'yes',
'autodiscoverType' => 'activesync', 'autodiscoverType' => 'activesync',
@ -25,7 +26,9 @@ if ($config['useEASforOutlook'] == 'no') {
} }
} }
require_once 'inc/vars.inc.php'; require_once 'inc/vars.inc.php';
if(file_exists('inc/vars.local.inc.php')) {
include_once 'inc/vars.local.inc.php'; include_once 'inc/vars.local.inc.php';
}
require_once 'inc/functions.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";