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

Revert "Support http://.../freebusy.php?foo@example.com"

Browse Source 
This reverts commit 38788acc5cbec147d6a46a6254ef8eec0a270c71, which
causes the following tests to fail (not return any FREEBUSY):

    tests/regression-suite/0832-freebusy.test
    tests/regression-suite/0836-freebusy.test
    tests/regression-suite/0837-freebusy.test
    tests/regression-suite/0888-GET-freebusy.test
This commit is contained in:
Florian Schlichting 2017-06-03 22:12:57 +02:00
parent 40e2714adf
commit 5f3aecfda4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/freebusy.php
View File

@ -44,7 +44,7 @@ if ( isset($fb_user) ) $_SERVER['PATH_INFO'] = '/'.$fb_user.'/';
require_once("CalDAVRequest.php"); require_once("CalDAVRequest.php");
$request = new CalDAVRequest(array("allow_by_email" => 1)); $request = new CalDAVRequest(array("allow_by_email" => 1));
$path_match = '^'.$request->path; $path_match = '^'.$request->path;
if ( preg_match( '{^/(\S+@[a-z0-9][a-z0-9-]*[.][a-z0-9.-]+)[/?]+?$}i', $request->path, $matches ) ) { if ( preg_match( '{^/(\S+@[a-z0-9][a-z0-9-]*[.][a-z0-9.-]+)/?$}i', $request->path, $matches ) ) {
$principal = new Principal('email',$matches[1]); $principal = new Principal('email',$matches[1]);
$path_match = '^'.$principal->dav_name(); $path_match = '^'.$principal->dav_name();
} }