gunnar: server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0 t_framework_HK_GW_ZpushAnnotations.diff, 1.1, 1.2
cvs at kolab.org
cvs at kolab.org
Mon Jun 7 17:14:09 CEST 2010
Author: gunnar
Update of /kolabrepository/server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0
In directory doto:/tmp/cvs-serv14011/patches/Kolab_Storage-0.4.0
Modified Files:
t_framework_HK_GW_ZpushAnnotations.diff
Log Message:
Only allow modification of the annotation type (default setting)
in case the user owns a folder. Do not store empty share
parameters.
Index: t_framework_HK_GW_ZpushAnnotations.diff
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Storage/patches/Kolab_Storage-0.4.0/t_framework_HK_GW_ZpushAnnotations.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_framework_HK_GW_ZpushAnnotations.diff 6 May 2010 07:10:06 -0000 1.1
+++ t_framework_HK_GW_ZpushAnnotations.diff 7 Jun 2010 15:14:07 -0000 1.2
@@ -1,7 +1,16 @@
diff -Naur a/framework/Kolab_Storage/lib/Horde/Kolab/Storage.orig/Folder.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php 2010-05-04 23:44:49.522328256 +0200
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder.php 2010-05-06 07:46:01.507036608 +0200
-@@ -412,13 +412,23 @@
+@@ -390,7 +390,7 @@
+
+ /** Handle the folder type */
+ $folder_type = $this->_type . ($this->_default ? '.default' : '');
+- if ($this->_type_annotation != $folder_type) {
++ if ($this->_owner == Auth::getAuth() && $this->_type_annotation != $folder_type) {
+ $result = $this->_setAnnotation(KOLAB_ANNOT_FOLDER_TYPE, $folder_type);
+ if (is_a($result, 'PEAR_Error')) {
+ $this->_type = null;
+@@ -412,13 +412,26 @@
if (is_a($result, 'PEAR_Error')) {
return $result;
}
@@ -21,10 +30,22 @@
+ }
+ unset($params['activesync']);
+ }
++ if (empty($params)) {
++ continue;
++ }
+ $value = serialize($params);
}
// setAnnotation apparently does not suppoort UTF-8 nor any special characters
+@@ -447,7 +450,7 @@
+ }
+
+ /** Now save the folder permissions */
+- if (isset($this->_perms)) {
++ if ($this->_owner == Auth::getAuth() && isset($this->_perms)) {
+ $result = $this->_perms->save();
+ if (is_a($result, 'PEAR_Error')) {
+ return $result;
@@ -1645,6 +1655,132 @@
return $this->_setAnnotation(KOLAB_ANNOT_ROOT . 'pxfb-readable-for',
$value);
More information about the commits
mailing list