From eba26021c775bf425c288fdebcd9fe466e9d67b6 Mon Sep 17 00:00:00 2001
From: Florian Schlichting <fsfs@debian.org>
Date: Thu, 4 Jan 2018 00:33:41 +0100
Subject: [PATCH] update doc and fix a warning

---
 htdocs/always.php   | 5 +++--
 inc/DAVResource.php | 2 +-
 inc/Principal.php   | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/always.php b/htdocs/always.php
index 3e12a903..23c1b1e3 100644
--- a/htdocs/always.php
+++ b/htdocs/always.php
@@ -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);
diff --git a/inc/DAVResource.php b/inc/DAVResource.php
index 67d786cb..3ff175de 100644
--- a/inc/DAVResource.php
+++ b/inc/DAVResource.php
@@ -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();
diff --git a/inc/Principal.php b/inc/Principal.php
index 4e9fa10a..f23bac0d 100644
--- a/inc/Principal.php
+++ b/inc/Principal.php
@@ -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;