summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-08-29 10:40:07 (GMT)
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-08-29 10:40:42 (GMT)
commita8486853220ad93970754f9c156e246e61932e3d (patch)
tree0d085f02241686681f656d660d5b805be41209a3 /doc
parenta8c1e2fee299d3d8b7f7b94b5fa92dcdb14ad1d0 (diff)
downloadkolab-wap-a8486853220ad93970754f9c156e246e61932e3d.tar.gz
Update sample insert user_types and initial kolab_wap SQL file
Diffstat (limited to 'doc')
-rw-r--r--doc/kolab_wap-3.0.1.sql (renamed from doc/kolab_wap-3.0.0.sql)14
-rw-r--r--doc/sample-insert-user_types.php40
2 files changed, 26 insertions, 28 deletions
diff --git a/doc/kolab_wap-3.0.0.sql b/doc/kolab_wap-3.0.1.sql
index bcfbddf..b4d6964 100644
--- a/doc/kolab_wap-3.0.0.sql
+++ b/doc/kolab_wap-3.0.1.sql
@@ -1,11 +1,11 @@
-- phpMyAdmin SQL Dump
--- version 3.5.1
+-- version 3.5.2
-- http://www.phpmyadmin.net
--
-- Host: localhost
--- Generation Time: Jun 21, 2012 at 12:14 PM
--- Server version: 5.5.13
--- PHP Version: 5.3.10
+-- Generation Time: Aug 29, 2012 at 11:37 AM
+-- Server version: 5.5.27
+-- PHP Version: 5.4.5
SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
SET time_zone = "+00:00";
@@ -126,7 +126,7 @@ CREATE TABLE IF NOT EXISTS `user_types` (
`name` varchar(256) NOT NULL,
`description` text NOT NULL,
`attributes` longtext NOT NULL,
- `used_for` varchar(16),
+ `used_for` varchar(16) DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `name` (`name`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=4 ;
@@ -136,9 +136,9 @@ CREATE TABLE IF NOT EXISTS `user_types` (
--
INSERT INTO `user_types` (`id`, `key`, `name`, `description`, `attributes`, `used_for`) VALUES
-(1, 'kolab', 'Kolab User', 'A Kolab User', '{"auto_form_fields":{"cn":{"data":["givenname","sn"]},"displayname":{"data":["givenname","sn"]},"mail":{"data":["givenname","preferredlanguage","sn"]},"alias":{"data":["givenname","preferredlanguage","sn"],"optional":true},"mailhost":{"optional":true},"uid":{"data":["givenname","preferredlanguage","sn"]},"userpassword":{"optional":true}},"form_fields":{"givenname":[],"initials":{"optional":true},"kolabdelegate":{"type":"list","autocomplete":true,"optional":true},"kolabinvitationpolicy":{"type":"select","values":["","ACT_MANUAL","ACT_REJECT"],"optional":true},"kolaballowsmtprecipient":{"type":"list","optional":true},"kolaballowsmtpsender":{"type":"list","optional":true},"l":{"optional":true},"alias":{"type":"list","optional":true},"mailquota":{"optional":true},"mobile":{"optional":true},"nsroledn":{"type":"list","autocomplete":true,"optional":true},"o":{"optional":true},"ou":{"type":"select"},"pager":{"optional":true},"postalcode":{"optional":true},"preferredlanguage":{"type":"select"},"sn":[],"street":{"optional":true},"telephonenumber":{"optional":true},"title":{"optional":true},"userpassword":{"optional":true}},"fields":{"objectclass":["top","inetorgperson","kolabinetorgperson","mailrecipient","organizationalperson","person"]}}', NULL),
+(1, 'kolab', 'Kolab User', 'A Kolab User', '{"auto_form_fields":{"alias":{"type":"list","data":["givenname","preferredlanguage","sn"]},"cn":{"data":["givenname","sn"]},"displayname":{"data":["givenname","sn"]},"mail":{"data":["givenname","preferredlanguage","sn"]},"mailhost":{"optional":true},"uid":{"data":["givenname","preferredlanguage","sn"]},"userpassword":{"optional":true}},"form_fields":{"alias":{"optional":true},"givenname":[],"initials":{"optional":true},"kolabdelegate":{"type":"list","autocomplete":true,"optional":true},"kolabinvitationpolicy":{"type":"select","values":["","ACT_MANUAL","ACT_REJECT"],"optional":true},"kolaballowsmtprecipient":{"type":"list","optional":true},"kolaballowsmtpsender":{"type":"list","optional":true},"l":{"optional":true},"mailalternateaddress":{"type":"list","optional":true},"mailquota":{"optional":true},"mobile":{"optional":true},"nsroledn":{"type":"list","autocomplete":true,"optional":true},"o":{"optional":true},"ou":{"type":"select"},"pager":{"optional":true},"postalcode":{"optional":true},"preferredlanguage":{"type":"select"},"sn":[],"street":{"optional":true},"telephonenumber":{"optional":true},"title":{"optional":true},"userpassword":{"optional":true}},"fields":{"objectclass":["top","inetorgperson","kolabinetorgperson","mailrecipient","organizationalperson","person"]}}', NULL),
(2, 'posix', 'POSIX User', 'A POSIX user (with a home directory and shell access)', '{"auto_form_fields":{"cn":{"data":["givenname","sn"]},"displayname":{"data":["givenname","sn"]},"gidnumber":[],"homedirectory":{"data":["givenname","sn"]},"uid":{"data":["givenname","sn"]},"uidnumber":[],"userpassword":{"optional":true}},"form_fields":{"givenname":[],"initials":{"optional":true},"preferredlanguage":{"type":"select","values":["en_US","de_DE","de_CH","en_GB","fi_FI","fr_FR","hu_HU"]},"loginshell":{"type":"select","values":["/bin/bash","/usr/bin/git-shell","/sbin/nologin"]},"ou":{"type":"select"},"sn":[],"title":{"optional":true},"userpassword":{"optional":true}},"fields":{"objectclass":["top","inetorgperson","organizationalperson","person","posixaccount"]}}', NULL),
-(3, 'kolab_posix', 'Mail-enabled POSIX User', 'A mail-enabled POSIX User', '{"auto_form_fields":{"cn":{"data":["givenname","preferredlanguage","sn"]},"displayname":{"data":["givenname","preferredlanguage","sn"]},"gidnumber":[],"homedirectory":{"data":["givenname","preferredlanguage","sn"]},"mail":{"data":["givenname","preferredlanguage","sn"]},"alias":{"data":["givenname","preferredlanguage","sn"],"optional":true},"mailhost":{"optional":true},"uid":{"data":["givenname","preferredlanguage","sn"]},"uidnumber":[],"userpassword":{"optional":true}},"form_fields":{"givenname":[],"initials":{"optional":true},"kolabdelegate":{"type":"list","autocomplete":true,"optional":true},"kolabinvitationpolicy":{"type":"select","values":["","ACT_MANUAL","ACT_REJECT"],"optional":true},"kolaballowsmtprecipient":{"type":"list","optional":true},"kolaballowsmtpsender":{"type":"list","optional":true},"l":{"optional":true},"loginshell":{"type":"select","values":["/bin/bash","/usr/bin/git-shell","/sbin/nologin"]},"alias":{"type":"list","optional":true},"mailquota":{"optional":true},"mobile":{"optional":true},"nsroledn":{"type":"list","autocomplete":true,"optional":true},"o":{"optional":true},"ou":{"type":"select"},"pager":{"optional":true},"postalcode":{"optional":true},"preferredlanguage":{"type":"select"},"sn":[],"street":{"optional":true},"telephonenumber":{"optional":true},"title":{"optional":true},"userpassword":{"optional":true}},"fields":{"objectclass":["top","inetorgperson","kolabinetorgperson","mailrecipient","organizationalperson","person","posixaccount"]}}', NULL);
+(3, 'kolab_posix', 'Mail-enabled POSIX User', 'A mail-enabled POSIX User', '{"auto_form_fields":{"alias":{"data":["givenname","preferredlanguage","sn"]},"cn":{"data":["givenname","preferredlanguage","sn"]},"displayname":{"data":["givenname","preferredlanguage","sn"]},"gidnumber":[],"homedirectory":{"data":["givenname","preferredlanguage","sn"]},"mail":{"data":["givenname","preferredlanguage","sn"]},"mailhost":{"optional":true},"uid":{"data":["givenname","preferredlanguage","sn"]},"uidnumber":[],"userpassword":{"optional":true}},"form_fields":{"alias":{"optional":true},"givenname":[],"initials":{"optional":true},"kolabdelegate":{"type":"list","autocomplete":true,"optional":true},"kolabinvitationpolicy":{"type":"select","values":["","ACT_MANUAL","ACT_REJECT"],"optional":true},"kolaballowsmtprecipient":{"type":"list","optional":true},"kolaballowsmtpsender":{"type":"list","optional":true},"l":{"optional":true},"loginshell":{"type":"select","values":["/bin/bash","/usr/bin/git-shell","/sbin/nologin"]},"mailalternateaddress":{"type":"list","optional":true},"mailquota":{"optional":true},"mobile":{"optional":true},"nsroledn":{"type":"list","autocomplete":true,"optional":true},"o":{"optional":true},"ou":{"type":"select"},"pager":{"optional":true},"postalcode":{"optional":true},"preferredlanguage":{"type":"select"},"sn":[],"street":{"optional":true},"telephonenumber":{"optional":true},"title":{"optional":true},"userpassword":{"optional":true}},"fields":{"objectclass":["top","inetorgperson","kolabinetorgperson","mailrecipient","organizationalperson","person","posixaccount"]}}', NULL);
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
diff --git a/doc/sample-insert-user_types.php b/doc/sample-insert-user_types.php
index 7470aec..8932744 100644
--- a/doc/sample-insert-user_types.php
+++ b/doc/sample-insert-user_types.php
@@ -13,33 +13,38 @@
$attributes = Array(
"auto_form_fields" => Array(
- "cn" => Array(
+ // Note that this form field is marked as optional in
+ // 'form_fields'.
+ "alias" => Array(
+ "type" => "list",
"data" => Array(
"givenname",
+ "preferredlanguage",
"sn",
),
),
- "displayname" => Array(
+ "cn" => Array(
"data" => Array(
"givenname",
"sn",
),
),
- "mail" => Array(
+ "displayname" => Array(
"data" => Array(
"givenname",
- "preferredlanguage",
"sn",
),
),
- "mailalternateaddress" => Array(
+ "mail" => Array(
"data" => Array(
"givenname",
"preferredlanguage",
"sn",
),
- "optional" => true,
),
+ // Using this form field to move a user to a different
+ // server, or have the user be created on a specific server
+ // is not yet supported.
"mailhost" => Array(
"optional" => true,
),
@@ -55,12 +60,9 @@
),
),
"form_fields" => Array(
-/*
- "c" => Array(
- "type" => "select",
+ "alias" => Array(
"optional" => true,
),
-*/
"givenname" => Array(),
"initials" => Array(
"optional" => true,
@@ -235,42 +237,41 @@
$attributes = Array(
"auto_form_fields" => Array(
- "cn" => Array(
+ "alias" => Array(
"data" => Array(
"givenname",
"preferredlanguage",
"sn",
),
),
- "displayname" => Array(
+ "cn" => Array(
"data" => Array(
"givenname",
"preferredlanguage",
"sn",
),
),
- "gidnumber" => Array(),
- "homedirectory" => Array(
+ "displayname" => Array(
"data" => Array(
"givenname",
"preferredlanguage",
"sn",
),
),
- "mail" => Array(
+ "gidnumber" => Array(),
+ "homedirectory" => Array(
"data" => Array(
"givenname",
"preferredlanguage",
"sn",
),
),
- "mailalternateaddress" => Array(
+ "mail" => Array(
"data" => Array(
"givenname",
"preferredlanguage",
"sn",
),
- "optional" => true,
),
"mailhost" => Array(
"optional" => true,
@@ -288,12 +289,9 @@
),
),
"form_fields" => Array(
-/*
- "c" => Array(
- "type" => "select",
+ "alias" => Array(
"optional" => true,
),
-*/
"givenname" => Array(),
"initials" => Array(
"optional" => true,