Date: Thu, 10 Dec 2020 10:41:36 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r557426 - in head/mail/roundcube-carddav: . files Message-ID: <202012101041.0BAAfaC0030738@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Thu Dec 10 10:41:36 2020 New Revision: 557426 URL: https://svnweb.freebsd.org/changeset/ports/557426 Log: mail/roundcube-carddav: fix unparenthesized deprecation warn in php74 Reported by: David Gessel <gessel@blackrosetech.com> Obtained from: https://github.com/mstilkerich/rcmcarddav/commit/b66791 Added: head/mail/roundcube-carddav/files/patch-carddav.php (contents, props changed) Modified: head/mail/roundcube-carddav/Makefile Modified: head/mail/roundcube-carddav/Makefile ============================================================================== --- head/mail/roundcube-carddav/Makefile Thu Dec 10 10:37:22 2020 (r557425) +++ head/mail/roundcube-carddav/Makefile Thu Dec 10 10:41:36 2020 (r557426) @@ -3,6 +3,7 @@ PORTNAME= carddav PORTVERSION= 3.0.3 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= https://github.com/blind-coder/rcmcarddav/releases/download/v${PORTVERSION}/ PKGNAMEPREFIX= roundcube- Added: head/mail/roundcube-carddav/files/patch-carddav.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/roundcube-carddav/files/patch-carddav.php Thu Dec 10 10:41:36 2020 (r557426) @@ -0,0 +1,20 @@ +--- carddav.php.orig 2020-12-10 08:52:54 UTC ++++ carddav.php +@@ -349,8 +349,15 @@ class carddav extends rcube_plugin + + if (self::no_override('username', $abook, $prefs)) { + // %V parses username for macosx, replaces periods and @ by _, work around bugs in contacts.app +- $content_username = $abook['username'] === '%V' ? str_replace('@','_', str_replace('.','_',$_SESSION['username'])) : $abook['username'] === '%u' ? $_SESSION['username'] : $abook['username'] === '%l' ? $rcmail->user->get_username('local') : $abook['username']; +- ++ if ($abook['username'] === '%V') { ++ $content_username = str_replace('@','_', str_replace('.','_',$_SESSION['username'])); ++ } elseif ($abook['username'] === '%u') { ++ $content_username = $_SESSION['username']; ++ } elseif ($abook['username'] === '%l') { ++ $content_username = $rcmail->user->get_username('local'); ++ } else { ++ $content_username = $abook['username']; ++ } + } else { + // input box for username + $input = new html_inputfield(array('name' => $abookid.'_cd_username', 'type' => 'text', 'autocomplete' => 'off', 'value' => $abook['username']));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012101041.0BAAfaC0030738>