2 commits - doc/kolab_wap.sql doc/sample-insert-sharedfolder_types.php

[Aleksander Machniak]

 doc/kolab_wap.sql                        |    2 +-
 doc/sample-insert-sharedfolder_types.php |   10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit faa0ca6b18476bdb1f4110bbf55e16fa446105f0
Author: Aleksander Machniak <alec at alec.pl>
Date:   Mon Aug 18 14:52:42 2014 +0200

    Enable default ACL for shared folders in sample inserts file

diff --git a/doc/sample-insert-sharedfolder_types.php b/doc/sample-insert-sharedfolder_types.php
index 29ac87a..76dae22 100644
--- a/doc/sample-insert-sharedfolder_types.php
+++ b/doc/sample-insert-sharedfolder_types.php
@@ -24,12 +24,11 @@
                         ),
                 ),
             "form_fields" => Array(
-/* TODO: Pending implementation of a folder acl list form widget - see #1752
                     "acl" => Array(
-                            "type" => "folder_acl_list",
+                            "type" => "imap_acl",
                             "optional" => true,
+                            "default" => "anyone, lrs",
                         ),
-*/
                     "cn" => Array(),
                 ),
         );


commit b891dfdd596d24edcdde924ed8b1e98c22d81770
Author: Aleksander Machniak <alec at alec.pl>
Date:   Mon Aug 18 14:50:21 2014 +0200

    Add Shared Notes Folder type (#3385)

diff --git a/doc/kolab_wap.sql b/doc/kolab_wap.sql
index 9a6c13d..fdb794b 100644
--- a/doc/kolab_wap.sql
+++ b/doc/kolab_wap.sql
@@ -174,7 +174,7 @@ CREATE TABLE `sharedfolder_types` (
 
 LOCK TABLES `sharedfolder_types` WRITE;
 /*!40000 ALTER TABLE `sharedfolder_types` DISABLE KEYS */;
-INSERT INTO `sharedfolder_types` VALUES (1,'addressbook','Shared Address Book','A shared address book','{\"fields\":{\"objectclass\":[\"kolabsharedfolder\",\"top\"],\"kolabfoldertype\":\"contact\"},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true,\"default\":\"anyone, lrs\"},\"cn\":[]},\"auto_form_fields\":[]}'),(2,'calendar','Shared Calendar','A shared calendar','{\"fields\":{\"objectclass\":[\"kolabsharedfolder\",\"top\"],\"kolabfoldertype\":\"event\"},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true,\"default\":\"anyone, lrs\"},\"cn\":[]},\"auto_form_fields\":[]}'),(3,'journal','Shared Journal','A shared journal','{\"fields\":{\"objectclass\":[\"kolabsharedfolder\",\"top\"],\"kolabfoldertype\":\"journal\"},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true,\"default\":\"anyone, lrs\"},\"cn\":[]},\"auto_form_fields\":[]}'),(4,'task','Shared Tasks','A shared tasks folder','{\"fields\":{\"objectclass\":[\"kolabsharedfolder\",\
 "top\"],\"kolabfoldertype\":\"task\"},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true,\"default\":\"anyone, lrs\"},\"cn\":[]},\"auto_form_fields\":[]}'),(5,'mail','Shared Mail Folder','A shared mail folder','{\"fields\":{\"objectclass\":[\"kolabsharedfolder\",\"mailrecipient\",\"top\"],\"kolabfoldertype\":\"mail\"},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true,\"default\":\"anyone, lrsp\"},\"alias\":{\"type\":\"list\",\"optional\":true},\"cn\":[],\"kolaballowsmtprecipient\":{\"type\":\"list\",\"optional\":true},\"kolaballowsmtpsender\":{\"type\":\"list\",\"optional\":true},\"kolabdelegate\":{\"type\":\"list\",\"autocomplete\":true,\"optional\":true},\"kolabtargetfolder\":[],\"mail\":[]},\"auto_form_fields\":[]}');
+INSERT INTO `sharedfolder_types` VALUES (1,'addressbook','Shared Address Book','A shared address book','{\"fields\":{\"objectclass\":[\"kolabsharedfolder\",\"top\"],\"kolabfoldertype\":\"contact\"},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true,\"default\":\"anyone, lrs\"},\"cn\":[]},\"auto_form_fields\":[]}'),(2,'calendar','Shared Calendar','A shared calendar','{\"fields\":{\"objectclass\":[\"kolabsharedfolder\",\"top\"],\"kolabfoldertype\":\"event\"},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true,\"default\":\"anyone, lrs\"},\"cn\":[]},\"auto_form_fields\":[]}'),(3,'journal','Shared Journal','A shared journal','{\"fields\":{\"objectclass\":[\"kolabsharedfolder\",\"top\"],\"kolabfoldertype\":\"journal\"},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true,\"default\":\"anyone, lrs\"},\"cn\":[]},\"auto_form_fields\":[]}'),(4,'task','Shared Tasks','A shared tasks folder','{\"fields\":{\"objectclass\":[\"kolabsharedfolder\",\
 "top\"],\"kolabfoldertype\":\"task\"},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true,\"default\":\"anyone, lrs\"},\"cn\":[]},\"auto_form_fields\":[]}'),(5,'note','Shared Notes','A shared notes folder','{\"fields\":{\"objectclass\":[\"kolabsharedfolder\",\"top\"],\"kolabfoldertype\":\"note\"},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true,\"default\":\"anyone, lrs\"},\"cn\":[]},\"auto_form_fields\":[]}'),(6,'mail','Shared Mail Folder','A shared mail folder','{\"fields\":{\"objectclass\":[\"kolabsharedfolder\",\"mailrecipient\",\"top\"],\"kolabfoldertype\":\"mail\"},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true,\"default\":\"anyone, lrsp\"},\"alias\":{\"type\":\"list\",\"optional\":true},\"cn\":[],\"kolaballowsmtprecipient\":{\"type\":\"list\",\"optional\":true},\"kolaballowsmtpsender\":{\"type\":\"list\",\"optional\":true},\"kolabdelegate\":{\"type\":\"list\",\"autocomplete\":true,\"optional\":true},\"kolabtargetfolder
 \":[],\"mail\":[]},\"auto_form_fields\":[]}');
 /*!40000 ALTER TABLE `sharedfolder_types` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/doc/sample-insert-sharedfolder_types.php b/doc/sample-insert-sharedfolder_types.php
index e0609fe..29ac87a 100644
--- a/doc/sample-insert-sharedfolder_types.php
+++ b/doc/sample-insert-sharedfolder_types.php
@@ -53,6 +53,11 @@
                 "VALUES ('task','Shared Tasks', 'A shared tasks folder'," .
                 "'" . json_encode($attributes) . "')");
 
+    $attributes["fields"]["kolabfoldertype"] = Array('note');
+    $result = $db->query("INSERT INTO `sharedfolder_types` (`key`, `name`, `description`, `attributes`) " .
+                "VALUES ('note','Shared Notes', 'A shared notes folder'," .
+                "'" . json_encode($attributes) . "')");
+
     $attributes["fields"]["kolabfoldertype"] = Array('mail');
     $attributes["form_fields"]["alias"] = Array(
             "type" => "list",