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

update doc and fix a warning

Browse Source
This commit is contained in:
Florian Schlichting 2018-01-04 00:33:41 +01:00
parent 50a29d96ab
commit eba26021c7
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/always.php
View File

@ -344,6 +344,7 @@ function getStatusMessage($status) {
* Construct a URL from the supplied dav_name. The URL will be urlencoded,
* except for any '/' characters in it.
* @param string $partial_path The part of the path after the script name
* @param boolean $force_script Whether to force-include caldav.php in the URL. Defaults to false.
*/
function ConstructURL( $partial_path, $force_script = false ) {
global $c;
@ -379,9 +380,9 @@ function ConstructURL( $partial_path, $force_script = false ) {
/**
* Deconstruct a dav_name from the supplied URL. The dav_name will be urldecoded.
*
* @param string $partial_path The part of the path after the script name
* @param string $url The full path including the script name
*/
function DeconstructURL( $url, $force_script = false ) {
function DeconstructURL( $url ) {
global $c;
$dav_name = rawurldecode($url);

2
inc/DAVResource.php
View File

@ -285,7 +285,7 @@ class DAVResource
$this->resource->url = null;
}
else {
if ( strtoupper($this->resource->class)=='CONFIDENTIAL' && !$this->HavePrivilegeTo('all') && $session->user_no != $this->resource->user_no ) {
if ( isset($this->resource->class) && strtoupper($this->resource->class)=='CONFIDENTIAL' && !$this->HavePrivilegeTo('all') && $session->user_no != $this->resource->user_no ) {
$vcal = new iCalComponent($this->resource->caldav_data);
$confidential = $vcal->CloneConfidential();
$this->resource->caldav_data = $confidential->Render();

1
inc/Principal.php
View File

@ -293,7 +293,6 @@ class Principal {
/**
* Work out the username, based on elements of the path.
* @param string $path The path to be used.
* @param array $options The request options, controlling whether e-mail paths are allowed.
*/
private function usernameFromPath( $path ) {
global $session, $c;