Merge branch 'master' into 'master'

Enclose XML response to only contain the XML tags (trimming any possible...

See merge request davical-project/davical!82

.gitlab-ci.yml

@@ -11,7 +11,7 @@ build:
   script:
     - apt-get -y update
     - bash -c 'mkdir -p /usr/share/man/man{0..10}'
-    - apt-get -y install build-essential devscripts fakeroot dh-exec jdupes doxygen graphviz php-cli phpunit
+    - apt-get -y install build-essential devscripts fakeroot dh-exec jdupes doxygen graphviz php-cli phpunit rst2pdf
     - mv debian/changelog debian/changelog.old
     - >
       cat
@@ -82,7 +82,7 @@ build_bullseye_latestphp:
   script:
     - apt-get -y update
     - bash -c 'mkdir -p /usr/share/man/man{0..10}'
-    - apt-get -y install build-essential devscripts fakeroot dh-exec jdupes doxygen graphviz
+    - apt-get -y install build-essential devscripts fakeroot dh-exec jdupes doxygen graphviz rst2pdf
     - mv debian/changelog debian/changelog.old
     - >
       cat

ChangeLog

@@ -1,3 +1,6 @@
+2025-01-22 Andrew Ruthven <andrew@etc.gen.nz>
+	* Using a Ticket ID requires public.php
+
 2024-04-15 Andrew Ruthven <andrew@etc.gen.nz>
 	* Add caching of user credential success/failure
 

inc/DAVResource.php

@@ -173,7 +173,7 @@ class DAVResource
   * field of the resource is populated with the given data, so it does not need
   * to be queried again later
   */
-  function __construct( $parameters = null, DAVResource $prefetched_collection = null ) {
+  function __construct( $parameters = null, ?DAVResource $prefetched_collection = null ) {
     $this->exists        = null;
     $this->bound_from    = null;
     $this->dav_name      = null;

inc/caldav-client.php

@@ -119,12 +119,13 @@ class CalDAVClient {
    */
   function ParseResponse( $response ) {
       $pos = strpos($response, '<?xml');
+      $epos = strrpos($response, '>');
       if ($pos === false) {
         $this->httpResponse = trim($response);
       }
       else {
         $this->httpResponse = trim(substr($response, 0, $pos));
-        $this->xmlResponse = trim(substr($response, $pos));
+        $this->xmlResponse = trim(substr($response, $pos, $epos-$pos+1));
       }
   }
 

inc/ui/collection-edit.php

@@ -463,7 +463,7 @@ EOTEMPLATE;
   if ($can_write_collection) {
     $browser->AddColumn( 'ticket_id', translate('Ticket ID'), '', '' );
   }
-  $browser->AddColumn( 'target', translate('Target'), '', '<td style="white-space:nowrap;">%s</td>', "'".$c->base_url.'/caldav.php'."' ||COALESCE(d.dav_name,c.dav_name)" );
+  $browser->AddColumn( 'target', translate('Target'), '', '<td style="white-space:nowrap;">%s</td>', "'".$c->base_url.'/public.php'."' ||COALESCE(d.dav_name,c.dav_name)" );
   $browser->AddColumn( 'expiry', translate('Expires'), '', '', 'TO_CHAR(expires,\'YYYYMMDD"T"HH:MI:SS\')');
   $browser->AddColumn( 'privs', translate('Privileges'), '', '', "privileges_list(privileges)" );
   if ($can_write_collection) {