nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-09-23 06:39:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace index.php with caldav.php when we find it in our path.

Browse Source
This commit is contained in:
Andrew McMillan 2010-11-30 09:52:33 +13:00
parent f492eabdd6
commit 04ecf36c88
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/always.php
View File

@ -358,6 +358,7 @@ function ConstructURL( $partial_path, $force_script = false ) {
$partial_path = str_replace( '%2F', '/', $partial_path); $partial_path = str_replace( '%2F', '/', $partial_path);
if ( ! isset($c->_url_script_path) ) { if ( ! isset($c->_url_script_path) ) {
$c->protocol_server_port_script = str_replace( 'index.php', 'caldav.php', $c->protocol_server_port_script);
$c->_url_script_path = (preg_match('#/$#', $c->protocol_server_port_script) ? 'caldav.php' : ''); $c->_url_script_path = (preg_match('#/$#', $c->protocol_server_port_script) ? 'caldav.php' : '');
$c->_url_script_path = $c->protocol_server_port_script . $c->_url_script_path; $c->_url_script_path = $c->protocol_server_port_script . $c->_url_script_path;
} }
@ -412,7 +413,7 @@ function DeconstructURL( $url, $force_script = false ) {
*/ */
function ISODateToHTTPDate( $isodate ) { function ISODateToHTTPDate( $isodate ) {
// Use strtotime since strptime is not available on Windows platform. // Use strtotime since strptime is not available on Windows platform.
return( gmstrftime('%a, %d %b %Y %T GMT', strtotime($isodate)) ); return( gmstrftime('%a, %d %b %Y %H:%M:%S GMT', strtotime($isodate)) );
} }
/** /**

1
inc/always.php.in
View File

@ -358,6 +358,7 @@ function ConstructURL( $partial_path, $force_script = false ) {
$partial_path = str_replace( '%2F', '/', $partial_path); $partial_path = str_replace( '%2F', '/', $partial_path);
if ( ! isset($c->_url_script_path) ) { if ( ! isset($c->_url_script_path) ) {
$c->protocol_server_port_script = str_replace( 'index.php', 'caldav.php', $c->protocol_server_port_script);
$c->_url_script_path = (preg_match('#/$#', $c->protocol_server_port_script) ? 'caldav.php' : ''); $c->_url_script_path = (preg_match('#/$#', $c->protocol_server_port_script) ? 'caldav.php' : '');
$c->_url_script_path = $c->protocol_server_port_script . $c->_url_script_path; $c->_url_script_path = $c->protocol_server_port_script . $c->_url_script_path;
} }