From owner-svn-ports-head@freebsd.org Thu Dec 10 10:41:37 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7359B47C960; Thu, 10 Dec 2020 10:41:37 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cs9Sx2hBDz3kYW; Thu, 10 Dec 2020 10:41:37 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4F026175EF; Thu, 10 Dec 2020 10:41:37 +0000 (UTC) (envelope-from gahr@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BAAfba9030739; Thu, 10 Dec 2020 10:41:37 GMT (envelope-from gahr@FreeBSD.org) Received: (from gahr@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BAAfaC0030738; Thu, 10 Dec 2020 10:41:36 GMT (envelope-from gahr@FreeBSD.org) Message-Id: <202012101041.0BAAfaC0030738@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gahr set sender to gahr@FreeBSD.org using -f From: Pietro Cerutti Date: Thu, 10 Dec 2020 10:41:36 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: gahr X-SVN-Commit-Paths: in head/mail/roundcube-carddav: . files X-SVN-Commit-Revision: 557426 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Dec 2020 10:41:37 -0000 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 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']));