Merge pull request #636 from mkuron/outlook
Preliminary support for Outlook 2016’s autodiscover.jsonmaster
commit
d8636113dd
|
@ -86,6 +86,14 @@ server {
|
||||||
try_files /autodiscover.php =404;
|
try_files /autodiscover.php =404;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
location ~* ^/Autodiscover/Autodiscover.json {
|
||||||
|
fastcgi_split_path_info ^(.+\.php)(/.+)$;
|
||||||
|
fastcgi_pass phpfpm:9000;
|
||||||
|
include /etc/nginx/fastcgi_params;
|
||||||
|
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||||
|
try_files /autodiscover-json.php =404;
|
||||||
|
}
|
||||||
|
|
||||||
location ~ /(?:m|M)ail/(?:c|C)onfig-v1.1.xml {
|
location ~ /(?:m|M)ail/(?:c|C)onfig-v1.1.xml {
|
||||||
fastcgi_split_path_info ^(.+\.php)(/.+)$;
|
fastcgi_split_path_info ^(.+\.php)(/.+)$;
|
||||||
fastcgi_pass phpfpm:9000;
|
fastcgi_pass phpfpm:9000;
|
||||||
|
@ -233,6 +241,14 @@ server {
|
||||||
try_files /autodiscover.php =404;
|
try_files /autodiscover.php =404;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
location ~* ^/Autodiscover/Autodiscover.json {
|
||||||
|
fastcgi_split_path_info ^(.+\.php)(/.+)$;
|
||||||
|
fastcgi_pass phpfpm:9000;
|
||||||
|
include /etc/nginx/fastcgi_params;
|
||||||
|
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||||
|
try_files /autodiscover-json.php =404;
|
||||||
|
}
|
||||||
|
|
||||||
location ~ /(?:m|M)ail/(?:c|C)onfig-v1.1.xml {
|
location ~ /(?:m|M)ail/(?:c|C)onfig-v1.1.xml {
|
||||||
fastcgi_split_path_info ^(.+\.php)(/.+)$;
|
fastcgi_split_path_info ^(.+\.php)(/.+)$;
|
||||||
fastcgi_pass phpfpm:9000;
|
fastcgi_pass phpfpm:9000;
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
<?php
|
||||||
|
require_once 'inc/vars.inc.php';
|
||||||
|
require_once 'inc/functions.inc.php';
|
||||||
|
$default_autodiscover_config = $autodiscover_config;
|
||||||
|
if(file_exists('inc/vars.local.inc.php')) {
|
||||||
|
include_once 'inc/vars.local.inc.php';
|
||||||
|
}
|
||||||
|
$autodiscover_config = array_merge($default_autodiscover_config, $autodiscover_config);
|
||||||
|
|
||||||
|
header('Content-type: application/json');
|
||||||
|
if ($_GET['Protocol'] == 'ActiveSync') {
|
||||||
|
echo '{"Protocol":"ActiveSync","Url":"' . $autodiscover_config['activesync']['url'] . '"}';
|
||||||
|
}
|
||||||
|
elseif ($_GET['Protocol'] == 'AutodiscoverV1') {
|
||||||
|
echo '{"Protocol":"AutodiscoverV1","Url":"https://' . $_SERVER['HTTP_HOST'] . '/autodiscover/autodiscover.xml"}';
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
http_response_code(400);
|
||||||
|
echo '{"ErrorCode":"InvalidProtocol","ErrorMessage":"The given protocol value \u0027' . $_GET['Protocol'] . '\u0027 is invalid. Supported values are \u0027ActiveSync,AutodiscoverV1\u0027"}';
|
||||||
|
}
|
||||||
|
?>
|
Loading…
Reference in New Issue