dépôts
/
lhc
/
ateliers.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modifications : local/check-mk-agent-configure
[lhc/ateliers.git]
/
etc
/
agendav
/
caldav.php
diff --git
a/etc/agendav/caldav.php
b/etc/agendav/caldav.php
index
44f4eee
..
f7a2407
100755
(executable)
--- a/
etc/agendav/caldav.php
+++ b/
etc/agendav/caldav.php
@@
-1,13
+1,18
@@
<?php
<?php
+$http_host=$_SERVER["HTTP_HOST"];
+if (substr($http_host, 0, strlen("agendav.")) == "agendav.") {
+ $http_host = substr($http_host, strlen("agendav."));
+ }
+
$scheme = 'http';
if (strtolower($_SERVER['HTTPS']) == 'on') {
$scheme = 'https';
}
$scheme = 'http';
if (strtolower($_SERVER['HTTPS']) == 'on') {
$scheme = 'https';
}
-$config['caldav_calendar_url'] = "$scheme://davical.
heureux-cyclage.org
/caldav.php/%s/";
+$config['caldav_calendar_url'] = "$scheme://davical.
$http_host
/caldav.php/%s/";
$config['caldav_http_auth_method'] = CURLAUTH_BASIC;
$config['caldav_http_auth_method'] = CURLAUTH_BASIC;
-$config['caldav_principal_url'] = "$scheme://davical.
heureux-cyclage.org
/caldav.php/%u/";
+$config['caldav_principal_url'] = "$scheme://davical.
$http_host
/caldav.php/%u/";
$config['default_permissions'] = array('C:read-free-busy');
$config['enable_calendar_sharing'] = TRUE;
$config['owner_permissions'] = array
$config['default_permissions'] = array('C:read-free-busy');
$config['enable_calendar_sharing'] = TRUE;
$config['owner_permissions'] = array
@@
-24,7
+29,7
@@
$config['owner_permissions'] = array
, 'bind'
, 'unbind'
);
, 'bind'
, 'unbind'
);
-$config['public_caldav_url'] = "$scheme://davical.
heureux-cyclage.org
/caldav.php/%s/";
+$config['public_caldav_url'] = "$scheme://davical.
$http_host
/caldav.php/%s/";
$config['read_profile_permissions'] = array
( 'read'
, 'C:read-free-busy'
$config['read_profile_permissions'] = array
( 'read'
, 'C:read-free-busy'