Merge branch 'Fix-getting-freebusy-by-email' into 'master'

Fix getting freebusy info from email

See merge request davical-project/davical!67

Makefile

@@ -75,7 +75,7 @@ test:
 		exit 0; \
 	   fi
 	# run phpunit tests
-	phpunit --do-not-cache-result testing/phpunit
+	phpunit testing/phpunit
 
 
 .PHONY: clean

VERSION

@@ -1 +1 @@
-1.1.13
+1.1.12

debian/changelog

@@ -1,21 +1,3 @@
-davical (1.1.13-1) unstable; urgency=medium
-
-  [ Andrew Ruthven ]
-  * New upstream release (Closes: #1040996, #1054143)
-
-  [ Florian Schlichting ]
-  * Acknowledge NMUs by David Prévot - thank you! (closes: #1121419)
-  * Depend on AWL 0.65
-  * Update copyright years
-  * Drop redundant "Priority: optional" and "Rules-Requires-Root: no" fields
-    in debian/control
-  * Update Doxyfile using "doxygen -u"
-  * Add graphviz to Build-Depends, our doxygen config needs "dot"
-  * Update debian/watch to version 5 (Gitlab template)
-  * Declare compliance with Debian Policy 4.7.4
-
- -- Florian Schlichting <fsfs@debian.org>  Mon, 11 May 2026 23:00:17 +0200
-
 davical (1.1.12-2.3) unstable; urgency=medium
 
   * Non-maintainer upload
@@ -37,13 +19,11 @@ davical (1.1.12-2.1) unstable; urgency=medium
 
  -- David Prévot <taffit@debian.org>  Tue, 14 Jan 2025 13:45:14 +0100
 
-davical (1.1.12-2) unstable; urgency=medium
+davical (1.1.13-1) UNRELEASED; urgency=medium
 
-  * Cherry-pick two bug fixes from upstream:
+  * New upstream release (Closes: #1040996)
-    + use "." to concatenate strings, not "+" (gitlab #288)
-    + Add a missing space to a SQL statement to fix adding groups (gitlab #294)
 
- -- Florian Schlichting <fsfs@debian.org>  Mon, 01 May 2023 00:29:20 +0200
+ -- Andrew Ruthven <andrew@etc.gen.nz>  Mon, 23 Oct 2023 17:57:01 +1300
 
 davical (1.1.12-1) unstable; urgency=medium
 

debian/control

@@ -1,26 +1,27 @@
 Source: davical
 Section: web
+Priority: optional
 Maintainer: Davical Development Team <davical-devel@lists.sourceforge.net>
 Uploaders: Andrew McMillan <awm@debian.org>,
  Florian Schlichting <fsfs@debian.org>
-Standards-Version: 4.7.4
+Standards-Version: 4.6.2
 Build-Depends: debhelper-compat (= 13),
  dh-exec,
  jdupes,
- libawl-php (>= 0.65-1~), libawl-php (<< 0.66),
+ libawl-php (>= 0.64-1~), libawl-php (<< 0.65),
  gettext,
  doxygen,
- graphviz,
  php-cli | php5-cli,
  phpunit
 Vcs-Git: https://gitlab.com/davical-project/davical.git
 Vcs-Browser: https://gitlab.com/davical-project/davical
 Homepage: https://www.davical.org/
+Rules-Requires-Root: no
 
 Package: davical
 Architecture: all
 Depends: ${misc:Depends}, ${perl:Depends},
- libawl-php (>= 0.65-1~), libawl-php (<< 0.66),
+ libawl-php (>= 0.64-1~), libawl-php (<< 0.65),
  libdbd-pg-perl,
  libyaml-perl,
  php | php5,

debian/copyright

@@ -7,7 +7,7 @@ Files: *
 Copyright: 2006 - 2013, Andrew McMillan <andrew@mcmillan.net.nz>
  2006 - 2008, Catalyst IT Ltd
  2008 - 2013, Morphoss Ltd
- 2007 - 2026, Davical contributors (see CREDITS for details)
+ 2007 - 2023, Davical contributors (see CREDITS for details)
 License: GPL-2+
 
 Files: dba/caldav_functions.sql htdocs/public.php htdocs/tools.php
@@ -18,7 +18,7 @@ Files: dba/caldav_functions.sql htdocs/public.php htdocs/tools.php
 Copyright: 2006 - 2013, Andrew McMillan <andrew@mcmillan.net.nz>
  2006 - 2008, Catalyst IT Ltd
  2008 - 2013, Morphoss Ltd
- 2007 - 2026, Davical contributors (see CREDITS for details)
+ 2007 - 2023, Davical contributors (see CREDITS for details)
 License: GPL-2
 
 Files: htdocs/tz.php inc/CalDAVRequest.php inc/iSchedule-POST.php
@@ -28,14 +28,14 @@ Files: htdocs/tz.php inc/CalDAVRequest.php inc/iSchedule-POST.php
 Copyright: 2006 - 2013, Andrew McMillan <andrew@mcmillan.net.nz>
  2006 - 2008, Catalyst IT Ltd
  2008 - 2013, Morphoss Ltd
- 2007 - 2026, Davical contributors (see CREDITS for details)
+ 2007 - 2023, Davical contributors (see CREDITS for details)
 License: GPL-3+
 
 Files: inc/caldav-client-v2.php
 Copyright: 2006 - 2013, Andrew McMillan <andrew@mcmillan.net.nz>
  2006 - 2008, Catalyst IT Ltd
  2008 - 2013, Morphoss Ltd
- 2007 - 2026, Davical contributors (see CREDITS for details)
+ 2007 - 2023, Davical contributors (see CREDITS for details)
 License: LGPL-3+
 
 Files: inc/check_UTF8.php
@@ -93,7 +93,7 @@ License: 3-clause-bsd
 
 Files: debian/*
 Copyright: 2006-2012, Andrew McMillan <awm@debian.org>
- 2014-2026, Florian Schlichting <fsfs@debian.org>
+ 2014-2023, Florian Schlichting <fsfs@debian.org>
 License: GPL-2+
 
 License: GPL-2+

debian/watch

@@ -1,5 +1,2 @@
-Version: 5
+version=4
-
+https://gitlab.com/davical-project/davical/tags?sort=updated_desc \/davical-project\/davical\/-\/archive\/r([\d.]+)\/davical-r[\d.]+\.tar\.gz
-Template: GitLab
-Dist: https://gitlab.com/davical-project/davical
-Matching-Pattern: r(\d[\-+\.:\~\da-zA-Z]*)

htdocs/always.php

@@ -161,6 +161,10 @@ $c->template_usr = array( 'active' => true,
 $c->hide_TODO = true;                      // VTODO only visible to collection owner
 $c->readonly_webdav_collections = true;    // WebDAV access is readonly
 
+// Any many times GetMoreInstances in inc/RRule.php should loop trying to
+// find more instances.
+$c->rrule_loop_limit = 100;
+
 // Authentication caching details
 $c->auth_cache = false;                    // Default to off
 $c->auth_cache_pass = 0;                   // Default to off
@@ -169,13 +173,6 @@ $c->auth_cache_fail = 0;                   // Default to off
 // Kind of private configuration values
 $c->total_query_time = 0;
 
-// How many times GetMoreInstances in inc/RRule.php should loop trying to
-// find more instances.
-$c->rrule_loop_limit = 100;
-
-// Kind of private configuration values
-$c->total_query_time = 0;
-
 // Are we in test mode?
 $c->test_mode = false;
 
@@ -311,7 +308,7 @@ if ( function_exists('awl_set_locale') ) {
 */
 $c->code_version = 0;
 $c->want_awl_version = '0.65';
-$c->version_string = '1.1.13'; // The actual version # is replaced into that during the build /release process
+$c->version_string = '1.1.12'; // The actual version # is replaced into that during the build /release process
 if ( isset($c->version_string) && preg_match( '/(\d+)\.(\d+)\.(\d+)(.*)/', $c->version_string, $matches) ) {
   $c->code_major = $matches[1];
   $c->code_minor = $matches[2];

inc/always.php.in

@@ -169,7 +169,7 @@ $c->auth_cache_fail = 0;                   // Default to off
 // Kind of private configuration values
 $c->total_query_time = 0;
 
-// How many times GetMoreInstances in inc/RRule.php should loop trying to
+// Any many times GetMoreInstances in inc/RRule.php should loop trying to
 // find more instances.
 $c->rrule_loop_limit = 100;
 

inc/drivers_ldap.php

@@ -887,7 +887,7 @@ function sync_LDAP(){
             $$k = substr($ldap_timestamp,$v[0],$v[1]);
         $ldap_timestamp = $Y.$m.$d.$H.$M.$S;
       }
-      else if ( preg_match('{^(\d{8})(\d{6})(Z)?$}', $ldap_timestamp, $matches ) ) {
+      else if ( preg_match('{^(\d{8})(\d{6})(Z)?$', $ldap_timestamp, $matches ) ) {
         $ldap_timestamp = $matches[1].'T'.$matches[2].$matches[3];
       }
       else if ( empty($ldap_timestamp) ) {