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

Fixes for warnings in PHP 8.1

Browse Source
This commit is contained in:
Andrew Ruthven 2022-02-12 23:35:05 +13:00
parent 9fb6be6f9c
commit 8096807c6d
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/always.php
View File

@ -45,7 +45,9 @@ function clean_get() {
if(isset($_POST)) array_walk($_POST, 'filter_post');
$_GET = clean_get();
$_SERVER['REQUEST_URI'] = str_replace("&", "&", htmlspecialchars($_SERVER['REQUEST_URI']));
$_SERVER['HTTP_REFERER'] = htmlspecialchars(@$_SERVER['HTTP_REFERER']);
if (isset($_SERVER['HTTP_REFERER'])) {
$_SERVER['HTTP_REFERER'] = htmlspecialchars(@$_SERVER['HTTP_REFERER']);
}

10
inc/CalDAVRequest.php
View File

@ -217,9 +217,13 @@ class CalDAVRequest
$_SERVER['REQUEST_METHOD'] = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'];
}
$this->method = $_SERVER['REQUEST_METHOD'];
$this->content_type = (isset($_SERVER['CONTENT_TYPE']) ? $_SERVER['CONTENT_TYPE'] : null);
if ( preg_match( '{^(\S+/\S+?)\s*(;.*)?$}', $this->content_type, $matches ) ) {
$this->content_type = $matches[1];
if (isset($_SERVER['CONTENT_TYPE'])) {
$this->content_type = $_SERVER['CONTENT_TYPE'];
if ( preg_match( '{^(\S+/\S+?)\s*(;.*)?$}', $this->content_type, $matches ) ) {
$this->content_type = $matches[1];
}
} else {
$this->content_type = null;
}
if ( strlen($c->raw_post) > 0 ) {
if ( $this->method == 'PROPFIND' || $this->method == 'REPORT' || $this->method == 'PROPPATCH' || $this->method == 'BIND' || $this->method == 'MKTICKET' || $this->method == 'ACL' ) {

4
inc/RRule.php
View File

@ -354,6 +354,7 @@ class RepeatRuleDateTime extends DateTime {
}
#[\ReturnTypeWillChange]
public function modify( $interval ) {
// print ">>$interval<<\n";
if ( preg_match('{^(-)?P(([0-9-]+)W)?(([0-9-]+)D)?T?(([0-9-]+)H)?(([0-9-]+)M)?(([0-9-]+)S)?$}', $interval, $matches) ) {
@ -444,6 +445,7 @@ class RepeatRuleDateTime extends DateTime {
}
#[\ReturnTypeWillChange]
public function setTimeZone( $tz ) {
if ( is_string($tz) ) {
$tz = new RepeatRuleTimeZone($tz);
@ -454,6 +456,7 @@ class RepeatRuleDateTime extends DateTime {
}
#[\ReturnTypeWillChange]
public function getTimeZone() {
return $this->tzid;
}
@ -482,6 +485,7 @@ class RepeatRuleDateTime extends DateTime {
}
#[\ReturnTypeWillChange]
function setDate( $year=null, $month=null, $day=null ) {
if ( !isset($year) ) $year = parent::format('Y');
if ( !isset($month) ) $month = parent::format('m');