nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-02-16 03:53:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Consistently use URL without protocol://host:port prefix.

Browse Source
This commit is contained in:
Andrew McMillan 2007-11-25 12:42:40 +13:00
parent 6f2ee67ea3
commit 78ce98b8de
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
inc/caldav-PROPFIND.php
View File

@ -322,9 +322,7 @@ function collection_to_xml( $collection ) {
$url = $c->protocol_server_port_script . $collection->dav_name;
$url = preg_replace( '#^(https?://.+)//#', '$1/', $url ); // Ensure we don't double any '/'
if ( preg_match( '/ iCal 3\.0/', $_SERVER['HTTP_USER_AGENT'] ) ) {
$url = preg_replace('#^https?://[^/]+#', '', $url );
}
$url = preg_replace('#^https?://[^/]+#', '', $url );
$resourcetypes = array( new XMLElement("collection") );
@ -481,7 +479,10 @@ function item_to_xml( $item ) {
$item->properties = get_arbitrary_properties($item->dav_name);
$url = $_SERVER['SCRIPT_NAME'] . $item->dav_name;
$url = $c->protocol_server_port_script . $item->dav_name;
$url = preg_replace( '#^(https?://.+)//#', '$1/', $url ); // Ensure we don't double any '/'
$url = preg_replace('#^https?://[^/]+#', '', $url );
$prop = new XMLElement("prop");
$not_found = new XMLElement("prop");
$denied = new XMLElement("prop");