mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 09:49:18 -04:00
mail/roundcube-carddav: update to 3.0.2
This commit is contained in:
Pietro Cerutti
parent
4e85cae52e
commit
1a7174e7a9
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=479019
5 changed files with 10 additions and 72 deletions
|
|
@ -2,8 +2,7 @@
|
||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
|
|
||||||
PORTNAME= carddav
|
PORTNAME= carddav
|
||||||
PORTVERSION= 2.0.4
|
PORTVERSION= 3.0.2
|
||||||
PORTREVISION= 2
|
|
||||||
CATEGORIES= mail
|
CATEGORIES= mail
|
||||||
MASTER_SITES= https://github.com/blind-coder/rcmcarddav/releases/download/v${PORTVERSION}/
|
MASTER_SITES= https://github.com/blind-coder/rcmcarddav/releases/download/v${PORTVERSION}/
|
||||||
PKGNAMEPREFIX= roundcube-
|
PKGNAMEPREFIX= roundcube-
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
TIMESTAMP = 1509360656
|
TIMESTAMP = 1536140344
|
||||||
SHA256 (carddav-2.0.4.tar.bz2) = d24da18a9c8f1058be3468e74daf8ead14a1ed755c4cdf42b40d4fbbeeadf0ba
|
SHA256 (carddav-3.0.2.tar.bz2) = c591609c707e10a18e90a59fd3d9bf11cb24365703a3219639c4df1d9ba38adb
|
||||||
SIZE (carddav-2.0.4.tar.bz2) = 298144
|
SIZE (carddav-3.0.2.tar.bz2) = 300259
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
--- carddav_backend.php.orig 2017-06-12 12:21:39 UTC
|
--- carddav_backend.php.orig 2018-05-28 06:30:30 UTC
|
||||||
+++ carddav_backend.php
|
+++ carddav_backend.php
|
||||||
@@ -694,9 +694,7 @@ EOF
|
@@ -716,9 +716,7 @@ EOF
|
||||||
<C:addressbook-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav">
|
<C:addressbook-multiget xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:carddav">
|
||||||
<D:prop>
|
<D:prop>
|
||||||
<D:getetag/>
|
<D:getetag/>
|
||||||
|
|
|
||||||
|
|
@ -1,65 +0,0 @@
|
||||||
From c14c32af9fd1ff363e9be0c237ffa1a0ccc1514d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Benjamin 'blindCoder' Schieder <benjamin@anderdonau.de>
|
|
||||||
Date: Thu, 27 Apr 2017 09:19:04 +0200
|
|
||||||
Subject: [PATCH] use correct namespace for RCUBE_INPUT_POST, fixes #186
|
|
||||||
|
|
||||||
---
|
|
||||||
carddav.php | 24 ++++++++++++------------
|
|
||||||
1 file changed, 12 insertions(+), 12 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/carddav.php b/carddav.php
|
|
||||||
index 998272e..7034ab5 100644
|
|
||||||
--- carddav.php.orig
|
|
||||||
+++ carddav.php
|
|
||||||
@@ -499,16 +499,16 @@ function cd_save($args)
|
|
||||||
|
|
||||||
} else {
|
|
||||||
$newset = array (
|
|
||||||
- 'name' => rcube_utils::get_input_value($abookid."_cd_name", RCUBE_INPUT_POST),
|
|
||||||
- 'username' => rcube_utils::get_input_value($abookid."_cd_username", RCUBE_INPUT_POST, true),
|
|
||||||
- 'url' => rcube_utils::get_input_value($abookid."_cd_url", RCUBE_INPUT_POST),
|
|
||||||
+ 'name' => rcube_utils::get_input_value($abookid."_cd_name", rcube_utils::INPUT_POST),
|
|
||||||
+ 'username' => rcube_utils::get_input_value($abookid."_cd_username", rcube_utils::INPUT_POST, true),
|
|
||||||
+ 'url' => rcube_utils::get_input_value($abookid."_cd_url", rcube_utils::INPUT_POST),
|
|
||||||
'active' => isset($_POST[$abookid.'_cd_active']) ? 1 : 0,
|
|
||||||
'use_categories' => isset($_POST[$abookid.'_cd_use_categories']) ? 1 : 0,
|
|
||||||
- 'refresh_time' => rcube_utils::get_input_value($abookid."_cd_refresh_time", RCUBE_INPUT_POST),
|
|
||||||
+ 'refresh_time' => rcube_utils::get_input_value($abookid."_cd_refresh_time", rcube_utils::INPUT_POST),
|
|
||||||
);
|
|
||||||
|
|
||||||
// only set the password if the user entered a new one
|
|
||||||
- $password = rcube_utils::get_input_value($abookid."_cd_password", RCUBE_INPUT_POST, true);
|
|
||||||
+ $password = rcube_utils::get_input_value($abookid."_cd_password", rcube_utils::INPUT_POST, true);
|
|
||||||
if(strlen($password) > 0) {
|
|
||||||
$newset['password'] = $password;
|
|
||||||
}
|
|
||||||
@@ -525,14 +525,14 @@ function cd_save($args)
|
|
||||||
}
|
|
||||||
|
|
||||||
// add a new address book?
|
|
||||||
- $new = rcube_utils::get_input_value('new_cd_name', RCUBE_INPUT_POST);
|
|
||||||
+ $new = rcube_utils::get_input_value('new_cd_name', rcube_utils::INPUT_POST);
|
|
||||||
if ( (!array_key_exists('_GLOBAL', $prefs) || !$prefs['_GLOBAL']['fixed']) && strlen($new) > 0) {
|
|
||||||
- $srv = rcube_utils::get_input_value('new_cd_url', RCUBE_INPUT_POST);
|
|
||||||
- $usr = rcube_utils::get_input_value('new_cd_username', RCUBE_INPUT_POST, true);
|
|
||||||
- $pass = rcube_utils::get_input_value('new_cd_password', RCUBE_INPUT_POST, true);
|
|
||||||
+ $srv = rcube_utils::get_input_value('new_cd_url', rcube_utils::INPUT_POST);
|
|
||||||
+ $usr = rcube_utils::get_input_value('new_cd_username', rcube_utils::INPUT_POST, true);
|
|
||||||
+ $pass = rcube_utils::get_input_value('new_cd_password', rcube_utils::INPUT_POST, true);
|
|
||||||
$pass = self::$helper->encrypt_password($pass);
|
|
||||||
- $abname = rcube_utils::get_input_value('new_cd_name', RCUBE_INPUT_POST);
|
|
||||||
- $use_categories = intval(rcube_utils::get_input_value('new_cd_use_categories', RCUBE_INPUT_POST, true), 0);
|
|
||||||
+ $abname = rcube_utils::get_input_value('new_cd_name', rcube_utils::INPUT_POST);
|
|
||||||
+ $use_categories = intval(rcube_utils::get_input_value('new_cd_use_categories', rcube_utils::INPUT_POST, true), 0);
|
|
||||||
|
|
||||||
$discovery = new carddav_discovery();
|
|
||||||
$srvs = $discovery->find_addressbooks($srv, $usr, $pass);
|
|
||||||
@@ -550,7 +550,7 @@ function cd_save($args)
|
|
||||||
'password' => $pass,
|
|
||||||
'use_categories' => $use_categories,
|
|
||||||
'url' => $srv['href'],
|
|
||||||
- 'refresh_time' => rcube_utils::get_input_value('new_cd_refresh_time', RCUBE_INPUT_POST)
|
|
||||||
+ 'refresh_time' => rcube_utils::get_input_value('new_cd_refresh_time', rcube_utils::INPUT_POST)
|
|
||||||
));
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
%%WWWDIR%%/.gitignore
|
%%WWWDIR%%/.gitignore
|
||||||
%%WWWDIR%%/ChangeLog
|
%%WWWDIR%%/ChangeLog
|
||||||
%%WWWDIR%%/INSTALL
|
%%WWWDIR%%/INSTALL
|
||||||
|
%%WWWDIR%%/INSTALLFROMGIT.md
|
||||||
%%WWWDIR%%/LICENSE
|
%%WWWDIR%%/LICENSE
|
||||||
%%WWWDIR%%/README.md
|
%%WWWDIR%%/README.md
|
||||||
%%WWWDIR%%/carddav.php
|
%%WWWDIR%%/carddav.php
|
||||||
|
|
@ -29,6 +30,9 @@
|
||||||
%%WWWDIR%%/dbmigrations/0004-fixtimestampdefaultvalue/mysql.sql
|
%%WWWDIR%%/dbmigrations/0004-fixtimestampdefaultvalue/mysql.sql
|
||||||
%%WWWDIR%%/dbmigrations/0004-fixtimestampdefaultvalue/postgres.sql
|
%%WWWDIR%%/dbmigrations/0004-fixtimestampdefaultvalue/postgres.sql
|
||||||
%%WWWDIR%%/dbmigrations/0004-fixtimestampdefaultvalue/sqlite3.sql
|
%%WWWDIR%%/dbmigrations/0004-fixtimestampdefaultvalue/sqlite3.sql
|
||||||
|
%%WWWDIR%%/dbmigrations/0005-changemysqlut8toutf8mb4/mysql.sql
|
||||||
|
%%WWWDIR%%/dbmigrations/0005-changemysqlut8toutf8mb4/postgres.sql
|
||||||
|
%%WWWDIR%%/dbmigrations/0005-changemysqlut8toutf8mb4/sqlite3.sql
|
||||||
%%WWWDIR%%/localization/cs_CZ.inc
|
%%WWWDIR%%/localization/cs_CZ.inc
|
||||||
%%WWWDIR%%/localization/de_DE.inc
|
%%WWWDIR%%/localization/de_DE.inc
|
||||||
%%WWWDIR%%/localization/en_US.inc
|
%%WWWDIR%%/localization/en_US.inc
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue