Kolab Groupware OBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 47

kolab-webadmin.spec Changed

@@ -34,8 +34,8 @@
 %global kolabr_group_id 414
 
 Name: kolab-webadmin
-Version: 3.2.1
-Release: 3%{?dist}
+Version: 3.2.2
+Release: 1%{?dist}
 Summary: Kolab Groupware Server Web Administration Interface
 License: AGPLv3+
 Group: Productivity/Office/Organizers
@@ -43,9 +43,6 @@
 
 Source0: http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz
 
-Patch1: 0001-updated-translations.patch
-Patch2: 0002-remove-debugging.patch
-
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
 
@@ -82,9 +79,6 @@
 %prep
 %setup -q 
 
-%patch1 -p1
-%patch2 -p1
-
 for file in `find . -type f -name "*.enterprise"`; do
 if [ 0%{?kolab_enterprise} -gt 0 ]; then
 mv -v $file $(echo $file | sed -e 's/.enterprise$//g')
@@ -173,6 +167,9 @@
 %attr(0770,%{httpd_user},%{httpd_group}) %{_var}/log/%{name}
 
 %changelog
+* Fri Oct 10 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.2.2-1
+- New upstream release
+
 * Fri Aug 29 2014 Daniel Hoffend <dh@dotlan.net> - 3.2.1-3
 - removed debugging

0001-updated-translations.patch Deleted

@@ -1,9783 +0,0 @@
-From a92987a317a5e9856e945170932830f1e3d105e7 Mon Sep 17 00:00:00 2001
-From: Daniel Hoffend <dh@dotlan.net>
-Date: Fri, 29 Aug 2014 14:33:29 +0200
-Subject: [PATCH] updated translations
-
----
- lib/locale/bg_BG.php | 431 ++++++++++++++++++++++++++++++++++++++++++++++++
- lib/locale/ca_ES.php | 444 ++++++++++++++++++++++++++++++++++++++++++++++++++
- lib/locale/cs_CZ.php | 432 ++++++++++++++++++++++++++++++++++++++++++++++++
- lib/locale/da.php | 444 ++++++++++++++++++++++++++++++++++++++++++++++++++
- lib/locale/de_CH.php | 435 +++++++++++++++++++++++++++++++++++++++++++++++++
- lib/locale/de_DE.php | 198 +++++++++++++++++++++-
- lib/locale/es_AR.php | 444 ++++++++++++++++++++++++++++++++++++++++++++++++++
- lib/locale/es_ES.php | 193 +++++++++++++++++++++-
- lib/locale/et_EE.php | 423 +++++++++++++++++++++++++++++++++++++++++++++++
- lib/locale/fi_FI.php | 304 ++++++++++++++++++++++++++++++++++
- lib/locale/fr_FR.php | 185 ++++++++++++++++++++-
- lib/locale/he.php | 444 ++++++++++++++++++++++++++++++++++++++++++++++++++
- lib/locale/hr.php | 444 ++++++++++++++++++++++++++++++++++++++++++++++++++
- lib/locale/hu_HU.php | 444 ++++++++++++++++++++++++++++++++++++++++++++++++++
- lib/locale/it_IT.php | 375 ++++++++++++++++++++++++++++++++++++++++++
- lib/locale/ja_JP.php | 185 ++++++++++++++++++++-
- lib/locale/nl_NL.php | 219 +++++++++++++++++++++++--
- lib/locale/pl_PL.php | 185 ++++++++++++++++++++-
- lib/locale/pt_BR.php | 214 +++++++++++++++++++++++-
- lib/locale/ru_RU.php | 196 +++++++++++++++++++++-
- lib/locale/vi.php | 444 ++++++++++++++++++++++++++++++++++++++++++++++++++
- lib/locale/vi_VN.php | 444 ++++++++++++++++++++++++++++++++++++++++++++++++++
- lib/locale/zh_TW.php | 444 ++++++++++++++++++++++++++++++++++++++++++++++++++
- 23 files changed, 7942 insertions(+), 29 deletions(-)
- create mode 100644 lib/locale/ca_ES.php
- create mode 100644 lib/locale/da.php
- create mode 100644 lib/locale/es_AR.php
- create mode 100644 lib/locale/he.php
- create mode 100644 lib/locale/hr.php
- create mode 100644 lib/locale/hu_HU.php
- create mode 100644 lib/locale/vi.php
- create mode 100644 lib/locale/vi_VN.php
- create mode 100644 lib/locale/zh_TW.php
-
-diff --git a/lib/locale/bg_BG.php b/lib/locale/bg_BG.php
-index f444aac..30d61ed 100644
---- a/lib/locale/bg_BG.php
-+++ b/lib/locale/bg_BG.php
-@@ -1,13 +1,444 @@
- <?php
-+
-+$LANG['about.community'] = '';
-+$LANG['about.kolab'] = '';
-+$LANG['about.kolabsys'] = '';
-+$LANG['about.support'] = '';
-+$LANG['about.technology'] = '';
-+$LANG['about.warranty'] = '';
-+
-+$LANG['aci.new'] = '';
-+$LANG['aci.edit'] = '';
-+$LANG['aci.remove'] = 'Изтриване';
-+$LANG['aci.users'] = '';
-+$LANG['aci.rights'] = '';
-+$LANG['aci.targets'] = '';
-+$LANG['aci.aciname'] = '';
-+$LANG['aci.hosts'] = '';
-+$LANG['aci.times'] = '';
-+$LANG['aci.name'] = 'Име';
-+$LANG['aci.userid'] = '';
-+$LANG['aci.email'] = '';
-+$LANG['aci.read'] = '';
-+$LANG['aci.compare'] = '';
-+$LANG['aci.search'] = '';
-+$LANG['aci.write'] = '';
-+$LANG['aci.selfwrite'] = '';
-+$LANG['aci.delete'] = '';
-+$LANG['aci.add'] = '';
-+$LANG['aci.proxy'] = '';
-+$LANG['aci.all'] = '';
-+$LANG['aci.allow'] = '';
-+$LANG['aci.deny'] = '';
-+$LANG['aci.typeusers'] = '';
-+$LANG['aci.typegroups'] = '';
-+$LANG['aci.typeroles'] = '';
-+$LANG['aci.typeadmins'] = '';
-+$LANG['aci.typespecials'] = '';
-+$LANG['aci.ldap-self'] = '';
-+$LANG['aci.ldap-anyone'] = '';
-+$LANG['aci.ldap-all'] = '';
-+$LANG['aci.ldap-parent'] = '';
-+$LANG['aci.usersearch'] = '';
-+$LANG['aci.usersearchresult'] = '';
-+$LANG['aci.userselected'] = '';
-+$LANG['aci.useradd'] = '';
-+$LANG['aci.userremove'] = 'Изтриване';
-+$LANG['aci.error.noname'] = '';
-+$LANG['aci.error.exists'] = '';
-+$LANG['aci.error.nousers'] = '';
-+$LANG['aci.rights.target'] = '';
-+$LANG['aci.rights.filter'] = '';
-+$LANG['aci.rights.attrs'] = '';
-+$LANG['aci.checkall'] = '';
-+$LANG['aci.checknone'] = '';
-+$LANG['aci.thisentry'] = '';
-+$LANG['aci.selected'] = '';
-+$LANG['aci.other'] = '';
-+
-+$LANG['acl.all'] = '';
-+$LANG['acl.append'] = '';
-+$LANG['acl.custom'] = '';
-+$LANG['acl.full'] = '';
-+$LANG['acl.post'] = '';
-+$LANG['acl.read'] = '';
-+$LANG['acl.read-only'] = '';
-+$LANG['acl.read-write'] = '';
-+$LANG['acl.semi-full'] = '';
-+$LANG['acl.write'] = '';
-+$LANG['acl.l'] = '';
-+$LANG['acl.r'] = '';
-+$LANG['acl.s'] = '';
-+$LANG['acl.w'] = '';
-+$LANG['acl.i'] = '';
-+$LANG['acl.p'] = '';
-+$LANG['acl.c'] = '';
-+$LANG['acl.k'] = '';
-+$LANG['acl.d'] = '';
-+$LANG['acl.t'] = '';
-+$LANG['acl.e'] = '';
-+$LANG['acl.x'] = '';
-+$LANG['acl.a'] = '';
-+$LANG['acl.n'] = '';
-+$LANG['acl.identifier'] = '';
-+$LANG['acl.rights'] = '';
-+$LANG['acl.expire'] = '';
-+$LANG['acl.user'] = '';
-+$LANG['acl.anyone'] = '';
-+$LANG['acl.anonymous'] = '';
-+$LANG['acl.error.invaliddate'] = '';
-+$LANG['acl.error.norights'] = '';
-+$LANG['acl.error.subjectexists'] = '';
-+$LANG['acl.error.nouser'] = '';
-+
-+$LANG['add'] = '';
-+
-+$LANG['api.notypeid'] = '';
-+$LANG['api.invalidtypeid'] = '';
-+
-+$LANG['attribute.add'] = '';
-+$LANG['attribute.default'] = '';
-+$LANG['attribute.static'] = '';
-+$LANG['attribute.name'] = '';
- $LANG['attribute.optional'] = 'По избор';
-+$LANG['attribute.maxcount'] = '';
-+$LANG['attribute.readonly'] = '';
-+$LANG['attribute.type'] = '';
-+$LANG['attribute.value'] = '';
-+$LANG['attribute.value.auto'] = '';
-+$LANG['attribute.value.auto-readonly'] = '';
-+$LANG['attribute.value.normal'] = '';
-+$LANG['attribute.value.static'] = '';
-+$LANG['attribute.options'] = '';
-+$LANG['attribute.key.invalid'] = '';
-+$LANG['attribute.required.error'] = '';
-+$LANG['attribute.validate'] = '';
-+$LANG['attribute.validate.default'] = '';
-+$LANG['attribute.validate.none'] = '';
-+$LANG['attribute.validate.basic'] = '';
-+$LANG['attribute.validate.extended'] = '';
-+
- $LANG['button.cancel'] = 'Отказ';
-+$LANG['button.delete'] = '';
-+$LANG['button.ok'] = '';
- $LANG['button.save'] = 'Запис';
-+$LANG['button.submit'] = '';
-+
-+$LANG['creatorsname'] = '';
-+$LANG['days'] = '';
-+$LANG['debug'] = '';
-+$LANG['delete'] = '';
-+$LANG['deleting'] = '';
-+
-+$LANG['domain.add'] = '';
-+$LANG['domain.add.success'] = '';
-+$LANG['domain.associateddomain'] = '';
-+$LANG['domain.delete.confirm'] = '';
-+$LANG['domain.delete.force'] = "";
-+$LANG['domain.delete.success'] = '';
-+$LANG['domain.edit'] = '';
-+$LANG['domain.edit.success'] = '';
-+$LANG['domain.inetdomainbasedn'] = '';
-+$LANG['domain.inetdomainstatus'] = 'Статус';
-+$LANG['domain.list'] = '';
-+$LANG['domain.norecords'] = '';
-+$LANG['domain.o'] = '';
-+$LANG['domain.other'] = '';
-+$LANG['domain.system'] = '';
-+$LANG['domain.type_id'] = '';
-+
- $LANG['edit'] = 'Промяна';
-+$LANG['error'] = '';
-+
-+$LANG['error.401'] = '';
-+$LANG['error.403'] = '';

0002-remove-debugging.patch Deleted

@@ -1,41 +0,0 @@
-From da397091f63d3bfd0cf33165f9128fee47df9f39 Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <machniak@kolabsys.com>
-Date: Tue, 26 Aug 2014 01:14:26 +0000
-Subject: Fix so LDAP internal debug is enabled only when debug_mode=trace (#3535)
-
----
-diff --git a/lib/Auth/LDAP.php b/lib/Auth/LDAP.php
-index 7763205..2dfe084 100644
---- a/lib/Auth/LDAP.php
-+++ b/lib/Auth/LDAP.php
-@@ -43,7 +43,7 @@ class LDAP extends Net_LDAP3 {
- // Causes nesting levels to be too deep...?
- //$this->config_set('config_get_hook', array($this, "_config_get"));
- 
-- $this->config_set("debug", true);
-+ $this->config_set("debug", Log::mode() == Log::TRACE);
- $this->config_set("log_hook", array($this, "_log"));
- 
- $this->config_set("config_root_dn", "cn=config");
-@@ -1208,6 +1208,9 @@ class LDAP extends Net_LDAP3 {
- Log::debug($str . $msg);
- break;
- case LOG_ERR:
-+ case LOG_ALERT:
-+ case LOG_CRIT:
-+ case LOG_EMERG:
- Log::error($str . $msg);
- break;
- case LOG_INFO:
-@@ -1216,9 +1219,6 @@ class LDAP extends Net_LDAP3 {
- case LOG_WARNING:
- Log::warning($str . $msg);
- break;
-- case LOG_ALERT:
-- case LOG_CRIT:
-- case LOG_EMERG:
- case LOG_NOTICE:
- default:
- Log::trace($str . $msg);
---
-cgit v0.9.0.2

debian.changelog Changed

debian.series Changed

kolab-webadmin-3.2.2.tar.gz/doc/kolab_wap.oracle.sql Added

@@ -0,0 +1,215 @@
+
+CREATE TABLE "group_types" (
+  "id" integer PRIMARY KEY,
+  "key" varchar(256) NOT NULL,
+  "name" varchar(256) NOT NULL,
+  "description" varchar(2048) DEFAULT NULL,
+  "attributes" long NOT NULL,
+  "is_default" smallint DEFAULT 0
+);
+
+CREATE UNIQUE INDEX "group_types_name_idx" ON "group_types" ("name");
+
+CREATE SEQUENCE "group_types_seq"
+    START WITH 1 INCREMENT BY 1 NOMAXVALUE;
+
+CREATE OR REPLACE TRIGGER "group_types_seq_trig"
+BEFORE INSERT ON "group_types" FOR EACH ROW
+BEGIN
+    IF :NEW."id" IS NULL THEN
+        :NEW."id" := "group_types_seq".nextval;
+    END IF;
+END;
+
+INSERT ALL
+    INTO "group_types" ("id", "key", "name", "description", "attributes", "is_default")
+        VALUES (1,'kolab','Kolab Distribution Group (Static)','A static Kolab Distribution Group (with mail address)','{"auto_form_fields":{"mail":{"data":["cn"]}},"fields":{"objectclass":["top","groupofuniquenames","kolabgroupofuniquenames"]},"form_fields":{"cn":[],"kolaballowsmtprecipient":{"type":"list","optional":true},"kolaballowsmtpsender":{"type":"list","optional":true},"ou":{"type":"select"},"uniquemember":{"type":"list","autocomplete":true,"optional":true}}}',0)
+    INTO "group_types" ("id", "key", "name", "description", "attributes", "is_default")
+        VALUES (2,'kolab_dynamic','Kolab Distribution Group (Dynamic)','A dynamic Kolab Distribution Group (with mail address)','{"auto_form_fields":{"mail":{"data":["cn"]}},"fields":{"objectclass":["top","groupofurls","kolabgroupofuniquenames"]},"form_fields":{"cn":[],"kolaballowsmtprecipient":{"type":"list","optional":true},"kolaballowsmtpsender":{"type":"list","optional":true},"memberurl":{"type":"ldap_url","optional":true},"ou":{"type":"select"},"uniquemember":{"type":"list","autocomplete":true,"optional":true}}}',0)
+    INTO "group_types" ("id", "key", "name", "description", "attributes", "is_default")
+        VALUES (3,'posix','(Pure) POSIX Group','A pure UNIX POSIX Group','{"auto_form_fields":{"gidnumber":[]},"fields":{"objectclass":["top","groupofuniquenames","posixgroup"]},"form_fields":{"cn":[],"ou":{"type":"select"},"uniquemember":{"type":"list","autocomplete":true,"optional":true}}}',0)
+    INTO "group_types" ("id", "key", "name", "description", "attributes", "is_default")
+        VALUES (4,'posix_mail','Mail-enabled POSIX Group','A Kolab and also UNIX POSIX Group','{"auto_form_fields":{"gidnumber":[],"mail":{"data":["cn"]}},"fields":{"objectclass":["top","groupofuniquenames","kolabgroupofuniquenames","posixgroup"]},"form_fields":{"cn":[],"kolaballowsmtprecipient":{"type":"list","optional":true},"kolaballowsmtpsender":{"type":"list","optional":true},"mail":{"optional":true},"ou":{"type":"select"},"uniquemember":{"type":"list","autocomplete":true,"optional":true}}}',0)
+    INTO "group_types" ("id", "key", "name", "description", "attributes", "is_default")
+        VALUES (5,'simple','Simple Group (Static)','A simple, traditional LDAP group with a static list of members','{"auto_form_fields":[],"fields":{"objectclass":["top","groupofuniquenames"]},"form_fields":{"cn":[],"ou":{"type":"select"},"uniquemember":{"type":"list","autocomplete":true,"optional":true}}}',0)
+SELECT 1 FROM DUAL;
+
+
+CREATE TABLE "options" (
+  "attribute" varchar(128) NOT NULL,
+  "option_values" long NOT NULL
+);
+
+INSERT ALL
+    INTO "options" ("attribute", "option_values")
+        VALUES ('preferredlanguage','["aa_DJ","aa_ER","aa_ET","af_ZA","am_ET","an_ES","ar_AE","ar_BH","ar_DZ","ar_EG","ar_IN","ar_IQ","ar_JO","ar_KW","ar_LB","ar_LY","ar_MA","ar_OM","ar_QA","ar_SA","ar_SD","ar_SY","ar_TN","ar_YE","as_IN","az_AZ","be_BY","bg_BG","bn_BD","bn_IN","bokmal","br_FR","bs_BA","byn_ER","C","ca_AD","ca_ES","ca_FR","ca_IT","catalan","croatian","csb_PL","cs_CZ","cy_GB","czech","da_DK","danish","dansk","de_AT","de_BE","de_CH","de_DE","de_LU","deutsch","dutch","dz_BT","eesti","el_CY","el_GR","en_AU","en_BW","en_CA","en_DK","en_GB","en_HK","en_IE","en_IN","en_NZ","en_PH","en_SG","en_US","en_ZA","en_ZW","es_AR","es_BO","es_CL","es_CO","es_CR","es_DO","es_EC","es_ES","es_GT","es_HN","es_MX","es_NI","es_PA","es_PE","es_PR","es_PY","es_SV","estonian","es_US","es_UY","es_VE","et_EE","eu_ES","fa_IR","fi_FI","finnish","fo_FO","fr_BE","fr_CA","fr_CH","french","fr_FR","fr_LU","fy_NL","ga_IE","galego","galician","gd_GB","german","gez_ER","gez_ET","gl_ES","greek","gu_IN","gv_GB","hebrew","he_IL","hi_IN","hr_HR","hrvatski","hsb_DE","hu_HU","hungarian","hy_AM","icelandic","id_ID","is_IS","italian","it_CH","it_IT","iw_IL","ja_JP","japanese","ka_GE","kk_KZ","kl_GL","km_KH","kn_IN","ko_KR","korean","ku_TR","kw_GB","ky_KG","lg_UG","lithuanian","lo_LA","lt_LT","lv_LV","mai_IN","mg_MG","mi_NZ","mk_MK","ml_IN","mn_MN","mr_IN","ms_MY","mt_MT","nb_NO","ne_NP","nl_BE","nl_NL","nn_NO","no_NO","norwegian","nr_ZA","nso_ZA","nynorsk","oc_FR","om_ET","om_KE","or_IN","pa_IN","pa_PK","pl_PL","polish","portuguese","POSIX","pt_BR","pt_PT","romanian","ro_RO","ru_RU","russian","ru_UA","rw_RW","se_NO","sid_ET","si_LK","sk_SK","slovak","slovene","slovenian","sl_SI","so_DJ","so_ET","so_KE","so_SO","spanish","sq_AL","sr_CS","sr_ME","sr_RS","ss_ZA","st_ZA","sv_FI","sv_SE","swedish","ta_IN","te_IN","tg_TJ","thai","th_TH","ti_ER","ti_ET","tig_ER","tl_PH","tn_ZA","tr_CY","tr_TR","ts_ZA","tt_RU","turkish","uk_UA","ur_PK","uz_UZ","ve_ZA","vi_VN","wa_BE","xh_ZA","yi_US","zh_CN","zh_HK","zh_SG","zh_TW","zu_ZA"]')
+    INTO "options" ("attribute", "option_values")
+        VALUES ('c','["AD","AE","AF","AG","AI","AL","AM","AO","AQ","AR","AS","AT","AU","AW","AX","AZ","BA","BB","BD","BE","BF","BG","BH","BI","BJ","BL","BM","BN","BO","BQ","BR","BS","BT","BV","BW","BY","BZ","CA","CC","CD","CF","CG","CH","CI","CK","CL","CM","CN","CO","CR","CU","CV","CW","CX","CY","CZ","DE","DJ","DK","DM","DO","DZ","EC","EE","EG","EH","ER","ES","ET","FI","FJ","FK","FM","FO","FR","GA","GB","GD","GE","GF","GG","GH","GI","GL","GM","GN","GP","GQ","GR","GS","GT","GU","GW","GY","HK","HM","HN","HR","HT","HU","ID","IE","IL","IM","IN","IO","IQ","IR","IS","IT","JE","JM","JO","JP","KE","KG","KH","KI","KM","KN","KP","KR","KW","KY","KZ","LA","LB","LC","LI","LK","LR","LS","LT","LU","LV","LY","MA","MC","MD","ME","MG","MH","MK","ML","MM","MN","MO","MP","MQ","MR","MS","MT","MT","MU","MV","MW","MX","MY","MZ","NA","NC","NE","NF","NG","NI","NL","NO","NP","NR","NU","NZ","OM","PA","PE","PF","PG","PH","PK","PL","PM","PN","PR","PS","PT","PW","PY","QA","RE","RO","RS","RU","RW","SA","SB","SC","SD","SE","SG","SH","SI","SJ","SK","SL","SM","SN","SO","SR","SS","ST","SV","SX","SY","SZ","TC","TD","TF","TG","TH","TJ","TK","TL","TM","TN","TO","TR","TT","TV","TW","TZ","UA","UG","UM","US","UY","UZ","VA","VA","VC","VE","VG","VI","VN","VU","WF","WS","YE","YT","YU","ZA","ZM","ZW"]')
+SELECT 1 FROM DUAL;
+
+
+CREATE TABLE "ou_types" (
+  "id" integer PRIMARY KEY,
+  "key" varchar(256) NOT NULL,
+  "name" varchar(256) NOT NULL,
+  "description" varchar(2048) DEFAULT NULL,
+  "attributes" long NOT NULL,
+  "is_default" smallint DEFAULT 0
+);
+
+CREATE UNIQUE INDEX "ou_types_name_idx" ON "ou_types" ("name");
+
+CREATE SEQUENCE "ou_types_seq"
+    START WITH 1 INCREMENT BY 1 NOMAXVALUE;
+
+CREATE OR REPLACE TRIGGER "ou_types_seq_trig"
+BEFORE INSERT ON "ou_types" FOR EACH ROW
+BEGIN
+    IF :NEW."id" IS NULL THEN
+        :NEW."id" := "ou_types_seq".nextval;
+    END IF;
+END;
+
+INSERT ALL
+    INTO "ou_types" ("id", "key", "name", "description", "attributes", "is_default")
+        VALUES (1,'unit','Standard Organizational Unit','A standard organizational unit definition','{"auto_form_fields":[],"fields":{"objectclass":["top","organizationalunit"]},"form_fields":{"ou":[],"description":[],"aci":{"optional":true,"type":"aci"}}}',0)
+SELECT 1 FROM DUAL;
+
+
+CREATE TABLE "resource_types" (
+  "id" integer PRIMARY KEY,
+  "key" varchar(256) NOT NULL,
+  "name" varchar(256) NOT NULL,
+  "description" varchar(2048) DEFAULT NULL,
+  "attributes" long NOT NULL,
+  "is_default" smallint DEFAULT 0
+);
+
+CREATE UNIQUE INDEX "resource_types_name_idx" ON "resource_types" ("name");
+
+CREATE SEQUENCE "resource_types_seq"
+    START WITH 1 INCREMENT BY 1 NOMAXVALUE;
+
+CREATE OR REPLACE TRIGGER "resource_types_seq_trig"
+BEFORE INSERT ON "resource_types" FOR EACH ROW
+BEGIN
+    IF :NEW."id" IS NULL THEN
+        :NEW."id" := "resource_types_seq".nextval;
+    END IF;
+END;
+
+INSERT ALL
+    INTO "resource_types" ("id", "key", "name", "description", "attributes", "is_default")
+        VALUES (1,'collection','Resource Collection','A collection or pool of resources','{"auto_form_fields":{"mail":{"data":["cn"]}},"fields":{"objectclass":["top","groupofuniquenames","kolabgroupofuniquenames"]},"form_fields":{"cn":[],"ou":{"type":"select"},"uniquemember":{"type":"list","autocomplete":true,"optional":true}}}',0)
+    INTO "resource_types" ("id", "key", "name", "description", "attributes", "is_default")
+        VALUES (2,'car','Car','A car','{"auto_form_fields":{"cn":{"data":["cn"]},"kolabtargetfolder":{"data":["cn"]},"mail":{"data":["cn"]}},"fields":{"objectclass":["top","kolabsharedfolder","mailrecipient"],"kolabfoldertype":["event"]},"form_fields":{"acl":{"type":"imap_acl","optional":true},"cn":[],"ou":{"type":"select"},"owner":{"type":"list","autocomplete":true,"optional":true}}}',0)
+    INTO "resource_types" ("id", "key", "name", "description", "attributes", "is_default")
+        VALUES (3,'confroom','Conference Room','A conference room','{"auto_form_fields":{"cn":{"data":["cn"]},"kolabtargetfolder":{"data":["cn"]},"mail":{"data":["cn"]}},"fields":{"objectclass":["top","kolabsharedfolder","mailrecipient"],"kolabfoldertype":["event"]},"form_fields":{"acl":{"type":"imap_acl","optional":true},"cn":[],"ou":{"type":"select"},"owner":{"type":"list","autocomplete":true,"optional":true}}}',0)
+    INTO "resource_types" ("id", "key", "name", "description", "attributes", "is_default")
+        VALUES (4,'projector','Projector','A portable overhead projector','{"auto_form_fields":{"cn":{"data":["cn"]},"kolabtargetfolder":{"data":["cn"]},"mail":{"data":["cn"]}},"fields":{"objectclass":["top","kolabsharedfolder","mailrecipient"],"kolabfoldertype":["event"]},"form_fields":{"acl":{"type":"imap_acl","optional":true},"cn":[],"ou":{"type":"select"},"owner":{"type":"list","autocomplete":true,"optional":true}}}',0)
+    INTO "resource_types" ("id", "key", "name", "description", "attributes", "is_default")
+        VALUES (5,'footballtickets','Football Season Tickets','Season tickets to the game (pretty good seats too!)','{"auto_form_fields":{"cn":{"data":["cn"]},"kolabtargetfolder":{"data":["cn"]},"mail":{"data":["cn"]}},"fields":{"objectclass":["top","kolabsharedfolder","mailrecipient"],"kolabfoldertype":["event"]},"form_fields":{"acl":{"type":"imap_acl","optional":true},"cn":[],"ou":{"type":"select"},"owner":{"type":"list","autocomplete":true,"optional":true}}}',0)
+SELECT 1 FROM DUAL;
+
+
+CREATE TABLE "role_types" (
+  "id" integer PRIMARY KEY,
+  "key" varchar(256) NOT NULL,
+  "name" varchar(256) NOT NULL,
+  "description" varchar(2048) DEFAULT NULL,
+  "attributes" long NOT NULL,
+  "is_default" smallint DEFAULT 0
+);
+
+CREATE UNIQUE INDEX "role_types_name_idx" ON "role_types" ("name");
+
+CREATE SEQUENCE "role_types_seq"
+    START WITH 1 INCREMENT BY 1 NOMAXVALUE;
+
+CREATE OR REPLACE TRIGGER "role_types_seq_trig"
+BEFORE INSERT ON "role_types" FOR EACH ROW
+BEGIN
+    IF :NEW."id" IS NULL THEN
+        :NEW."id" := "role_types_seq".nextval;
+    END IF;
+END;
+
+INSERT ALL
+    INTO "role_types" ("id", "key", "name", "description", "attributes", "is_default")
+        VALUES (1,'simple_managed','Standard Role','A standard role definition','{"auto_form_fields":[],"fields":{"objectclass":["top","ldapsubentry","nsroledefinition","nssimpleroledefinition","nsmanagedroledefinition"]},"form_fields":{"cn":[],"description":[]}}',0)
+SELECT 1 FROM DUAL;
+
+CREATE TABLE "sharedfolder_types" (
+  "id" integer PRIMARY KEY,
+  "key" varchar(256) NOT NULL,
+  "name" varchar(256) NOT NULL,
+  "description" varchar(2048) DEFAULT NULL,
+  "attributes" long NOT NULL,
+  "is_default" smallint DEFAULT 0
+);
+
+CREATE UNIQUE INDEX "sharedfolder_types_name_idx" ON "sharedfolder_types" ("name");
+
+CREATE SEQUENCE "sharedfolder_types_seq"
+    START WITH 1 INCREMENT BY 1 NOMAXVALUE;
+
+CREATE OR REPLACE TRIGGER "sharedfolder_types_seq_trig"
+BEFORE INSERT ON "sharedfolder_types" FOR EACH ROW
+BEGIN
+    IF :NEW."id" IS NULL THEN
+        :NEW."id" := "sharedfolder_types_seq".nextval;
+    END IF;
+END;
+
+INSERT ALL
+    INTO "sharedfolder_types" ("id", "key", "name", "description", "attributes", "is_default")
+        VALUES (1,'addressbook','Shared Address Book','A shared address book','{"auto_form_fields":[],"fields":{"kolabfoldertype":["contact"],"objectclass":["top","kolabsharedfolder"]},"form_fields":{"acl":{"type":"imap_acl","optional":true,"default":"anyone, lrs"},"cn":[]}}',0)
+    INTO "sharedfolder_types" ("id", "key", "name", "description", "attributes", "is_default")
+        VALUES (2,'calendar','Shared Calendar','A shared calendar','{"auto_form_fields":[],"fields":{"kolabfoldertype":["event"],"objectclass":["top","kolabsharedfolder"]},"form_fields":{"acl":{"type":"imap_acl","optional":true,"default":"anyone, lrs"},"cn":[]}}',0)
+    INTO "sharedfolder_types" ("id", "key", "name", "description", "attributes", "is_default")
+        VALUES (3,'journal','Shared Journal','A shared journal','{"auto_form_fields":[],"fields":{"kolabfoldertype":["journal"],"objectclass":["top","kolabsharedfolder"]},"form_fields":{"acl":{"type":"imap_acl","optional":true,"default":"anyone, lrs"},"cn":[]}}',0)
+    INTO "sharedfolder_types" ("id", "key", "name", "description", "attributes", "is_default")
+        VALUES (4,'task','Shared Tasks','A shared tasks folder','{"auto_form_fields":[],"fields":{"kolabfoldertype":["task"],"objectclass":["top","kolabsharedfolder"]},"form_fields":{"acl":{"type":"imap_acl","optional":true,"default":"anyone, lrs"},"cn":[]}}',0)
+    INTO "sharedfolder_types" ("id", "key", "name", "description", "attributes", "is_default")
+        VALUES (5,'note','Shared Notes','A shared Notes folder','{"auto_form_fields":[],"fields":{"kolabfoldertype":["note"],"objectclass":["top","kolabsharedfolder"]},"form_fields":{"acl":{"type":"imap_acl","optional":true,"default":"anyone, lrs"},"cn":[]}}',0)
+    INTO "sharedfolder_types" ("id", "key", "name", "description", "attributes", "is_default")
+        VALUES (6,'file','Shared Files','A shared Files folder','{"auto_form_fields":[],"fields":{"kolabfoldertype":["file"],"objectclass":["top","kolabsharedfolder"]},"form_fields":{"acl":{"type":"imap_acl","optional":true,"default":"anyone, lrs"},"cn":[]}}',0)
+    INTO "sharedfolder_types" ("id", "key", "name", "description", "attributes", "is_default")
+        VALUES (7,'mail','Shared Mail Folder','A shared mail folder','{"auto_form_fields":[],"fields":{"kolabfoldertype":["mail"],"objectclass":["top","kolabsharedfolder","mailrecipient"]},"form_fields":{"acl":{"type":"imap_acl","optional":true,"default":"anyone, lrs"},"cn":[],"alias":{"type":"list","optional":true},"kolabdelegate":{"type":"list","autocomplete":true,"optional":true},"kolaballowsmtprecipient":{"type":"list","optional":true},"kolaballowsmtpsender":{"type":"list","optional":true},"kolabtargetfolder":[],"mail":[]}}',0)
+SELECT 1 FROM DUAL;
+
+CREATE TABLE "user_types" (
+  "id" integer PRIMARY KEY,
+  "key" varchar(256) NOT NULL,
+  "name" varchar(256) NOT NULL,
+  "description" varchar(2048) DEFAULT NULL,
+  "attributes" long NOT NULL,
+  "used_for" varchar(16) DEFAULT NULL,
+  "is_default" smallint DEFAULT 0
+);
+
+CREATE UNIQUE INDEX "user_types_name_idx" ON "user_types" ("name");
+
+CREATE SEQUENCE "user_types_seq"
+    START WITH 1 INCREMENT BY 1 NOMAXVALUE;
+
+CREATE OR REPLACE TRIGGER "user_types_seq_trig"
+BEFORE INSERT ON "user_types" FOR EACH ROW
+BEGIN
+    IF :NEW."id" IS NULL THEN

kolab-webadmin-3.2.1.tar.gz/doc/kolab_wap.sql -> kolab-webadmin-3.2.2.tar.gz/doc/kolab_wap.sql Changed

@@ -28,6 +28,7 @@
   `name` varchar(256) NOT NULL,
   `description` text NOT NULL,
   `attributes` longtext NOT NULL,
+  `is_default` tinyint(1) DEFAULT 0,
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
 ) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=latin1;
@@ -39,7 +40,7 @@
 
 LOCK TABLES `group_types` WRITE;
 /*!40000 ALTER TABLE `group_types` DISABLE KEYS */;
-INSERT INTO `group_types` VALUES (1,'kolab','Kolab Distribution Group (Static)','A static Kolab Distribution Group (with mail address)','{\"auto_form_fields\":{\"mail\":{\"data\":[\"cn\"]}},\"fields\":{\"objectclass\":[\"top\",\"groupofuniquenames\",\"kolabgroupofuniquenames\"]},\"form_fields\":{\"cn\":[],\"kolaballowsmtprecipient\":{\"type\":\"list\",\"optional\":true},\"kolaballowsmtpsender\":{\"type\":\"list\",\"optional\":true},\"ou\":{\"type\":\"select\"},\"uniquemember\":{\"type\":\"list\",\"autocomplete\":true,\"optional\":true}}}'),(2,'kolab_dynamic','Kolab Distribution Group (Dynamic)','A dynamic Kolab Distribution Group (with mail address)','{\"auto_form_fields\":{\"mail\":{\"data\":[\"cn\"]}},\"fields\":{\"objectclass\":[\"top\",\"groupofurls\",\"kolabgroupofuniquenames\"]},\"form_fields\":{\"cn\":[],\"kolaballowsmtprecipient\":{\"type\":\"list\",\"optional\":true},\"kolaballowsmtpsender\":{\"type\":\"list\",\"optional\":true},\"memberurl\":{\"type\":\"ldap_url\",\"optional\":true},\"ou\":{\"type\":\"select\"},\"uniquemember\":{\"type\":\"list\",\"autocomplete\":true,\"optional\":true}}}'),(3,'posix','(Pure) POSIX Group','A pure UNIX POSIX Group','{\"auto_form_fields\":{\"gidnumber\":[]},\"fields\":{\"objectclass\":[\"top\",\"groupofuniquenames\",\"posixgroup\"]},\"form_fields\":{\"cn\":[],\"ou\":{\"type\":\"select\"},\"uniquemember\":{\"type\":\"list\",\"autocomplete\":true,\"optional\":true}}}'),(4,'posix_mail','Mail-enabled POSIX Group','A Kolab and also UNIX POSIX Group','{\"auto_form_fields\":{\"gidnumber\":[],\"mail\":{\"data\":[\"cn\"]}},\"fields\":{\"objectclass\":[\"top\",\"groupofuniquenames\",\"kolabgroupofuniquenames\",\"posixgroup\"]},\"form_fields\":{\"cn\":[],\"kolaballowsmtprecipient\":{\"type\":\"list\",\"optional\":true},\"kolaballowsmtpsender\":{\"type\":\"list\",\"optional\":true},\"mail\":{\"optional\":true},\"ou\":{\"type\":\"select\"},\"uniquemember\":{\"type\":\"list\",\"autocomplete\":true,\"optional\":true}}}'),(5,'simple','Simple Group (Static)','A simple, traditional LDAP group with a static list of members','{\"auto_form_fields\":[],\"fields\":{\"objectclass\":[\"top\",\"groupofuniquenames\"]},\"form_fields\":{\"cn\":[],\"ou\":{\"type\":\"select\"},\"uniquemember\":{\"type\":\"list\",\"autocomplete\":true,\"optional\":true}}}');
+INSERT INTO `group_types` VALUES (1,'kolab','Kolab Distribution Group (Static)','A static Kolab Distribution Group (with mail address)','{\"auto_form_fields\":{\"mail\":{\"data\":[\"cn\"]}},\"fields\":{\"objectclass\":[\"top\",\"groupofuniquenames\",\"kolabgroupofuniquenames\"]},\"form_fields\":{\"cn\":[],\"kolaballowsmtprecipient\":{\"type\":\"list\",\"optional\":true},\"kolaballowsmtpsender\":{\"type\":\"list\",\"optional\":true},\"ou\":{\"type\":\"select\"},\"uniquemember\":{\"type\":\"list\",\"autocomplete\":true,\"optional\":true}}}',0),(2,'kolab_dynamic','Kolab Distribution Group (Dynamic)','A dynamic Kolab Distribution Group (with mail address)','{\"auto_form_fields\":{\"mail\":{\"data\":[\"cn\"]}},\"fields\":{\"objectclass\":[\"top\",\"groupofurls\",\"kolabgroupofuniquenames\"]},\"form_fields\":{\"cn\":[],\"kolaballowsmtprecipient\":{\"type\":\"list\",\"optional\":true},\"kolaballowsmtpsender\":{\"type\":\"list\",\"optional\":true},\"memberurl\":{\"type\":\"ldap_url\",\"optional\":true},\"ou\":{\"type\":\"select\"},\"uniquemember\":{\"type\":\"list\",\"autocomplete\":true,\"optional\":true}}}',0),(3,'posix','(Pure) POSIX Group','A pure UNIX POSIX Group','{\"auto_form_fields\":{\"gidnumber\":[]},\"fields\":{\"objectclass\":[\"top\",\"groupofuniquenames\",\"posixgroup\"]},\"form_fields\":{\"cn\":[],\"ou\":{\"type\":\"select\"},\"uniquemember\":{\"type\":\"list\",\"autocomplete\":true,\"optional\":true}}}',0),(4,'posix_mail','Mail-enabled POSIX Group','A Kolab and also UNIX POSIX Group','{\"auto_form_fields\":{\"gidnumber\":[],\"mail\":{\"data\":[\"cn\"]}},\"fields\":{\"objectclass\":[\"top\",\"groupofuniquenames\",\"kolabgroupofuniquenames\",\"posixgroup\"]},\"form_fields\":{\"cn\":[],\"kolaballowsmtprecipient\":{\"type\":\"list\",\"optional\":true},\"kolaballowsmtpsender\":{\"type\":\"list\",\"optional\":true},\"mail\":{\"optional\":true},\"ou\":{\"type\":\"select\"},\"uniquemember\":{\"type\":\"list\",\"autocomplete\":true,\"optional\":true}}}',0),(5,'simple','Simple Group (Static)','A simple, traditional LDAP group with a static list of members','{\"auto_form_fields\":[],\"fields\":{\"objectclass\":[\"top\",\"groupofuniquenames\"]},\"form_fields\":{\"cn\":[],\"ou\":{\"type\":\"select\"},\"uniquemember\":{\"type\":\"list\",\"autocomplete\":true,\"optional\":true}}}',0);
 /*!40000 ALTER TABLE `group_types` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -79,6 +80,7 @@
   `name` varchar(256) NOT NULL,
   `description` text NOT NULL,
   `attributes` longtext NOT NULL,
+  `is_default` tinyint(1) DEFAULT 0,
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
 ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1;
@@ -90,7 +92,7 @@
 
 LOCK TABLES `ou_types` WRITE;
 /*!40000 ALTER TABLE `ou_types` DISABLE KEYS */;
-INSERT INTO `ou_types` VALUES (1,'unit','Standard Organizational Unit','A standard organizational unit definition','{\"auto_form_fields\":[],\"fields\":{\"objectclass\":[\"top\",\"organizationalunit\"]},\"form_fields\":{\"ou\":[],\"description\":[],\"aci\":{\"optional\":true,\"type\":\"aci\"}}}');
+INSERT INTO `ou_types` VALUES (1,'unit','Standard Organizational Unit','A standard organizational unit definition','{\"auto_form_fields\":[],\"fields\":{\"objectclass\":[\"top\",\"organizationalunit\"]},\"form_fields\":{\"ou\":[],\"description\":[],\"aci\":{\"optional\":true,\"type\":\"aci\"}}}',0);
 /*!40000 ALTER TABLE `ou_types` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -107,6 +109,7 @@
   `name` varchar(256) NOT NULL,
   `description` text NOT NULL,
   `attributes` longtext NOT NULL,
+  `is_default` tinyint(1) DEFAULT 0,
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
 ) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=latin1;
@@ -118,7 +121,7 @@
 
 LOCK TABLES `resource_types` WRITE;
 /*!40000 ALTER TABLE `resource_types` DISABLE KEYS */;
-INSERT INTO `resource_types` VALUES (1,'collection','Resource Collection','A collection or pool of resources','{\"auto_form_fields\":{\"mail\":{\"data\":[\"cn\"]}},\"fields\":{\"objectclass\":[\"top\",\"groupofuniquenames\",\"kolabgroupofuniquenames\"]},\"form_fields\":{\"cn\":[],\"ou\":{\"type\":\"select\"},\"uniquemember\":{\"type\":\"list\",\"autocomplete\":true,\"optional\":true}}}'),(2,'car','Car','A car','{\"auto_form_fields\":{\"cn\":{\"data\":[\"cn\"]},\"kolabtargetfolder\":{\"data\":[\"cn\"]},\"mail\":{\"data\":[\"cn\"]}},\"fields\":{\"objectclass\":[\"top\",\"kolabsharedfolder\",\"mailrecipient\"],\"kolabfoldertype\":[\"event\"]},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true},\"cn\":[],\"ou\":{\"type\":\"select\"},\"owner\":{\"type\":\"list\",\"autocomplete\":true,\"optional\":true}}}'),(3,'confroom','Conference Room','A conference room','{\"auto_form_fields\":{\"cn\":{\"data\":[\"cn\"]},\"kolabtargetfolder\":{\"data\":[\"cn\"]},\"mail\":{\"data\":[\"cn\"]}},\"fields\":{\"objectclass\":[\"top\",\"kolabsharedfolder\",\"mailrecipient\"],\"kolabfoldertype\":[\"event\"]},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true},\"cn\":[],\"ou\":{\"type\":\"select\"},\"owner\":{\"type\":\"list\",\"autocomplete\":true,\"optional\":true}}}'),(4,'projector','Projector','A portable overhead projector','{\"auto_form_fields\":{\"cn\":{\"data\":[\"cn\"]},\"kolabtargetfolder\":{\"data\":[\"cn\"]},\"mail\":{\"data\":[\"cn\"]}},\"fields\":{\"objectclass\":[\"top\",\"kolabsharedfolder\",\"mailrecipient\"],\"kolabfoldertype\":[\"event\"]},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true},\"cn\":[],\"ou\":{\"type\":\"select\"},\"owner\":{\"type\":\"list\",\"autocomplete\":true,\"optional\":true}}}'),(5,'footballtickets','Football Season Tickets','Season tickets to the game (pretty good seats too!)','{\"auto_form_fields\":{\"cn\":{\"data\":[\"cn\"]},\"kolabtargetfolder\":{\"data\":[\"cn\"]},\"mail\":{\"data\":[\"cn\"]}},\"fields\":{\"objectclass\":[\"top\",\"kolabsharedfolder\",\"mailrecipient\"],\"kolabfoldertype\":[\"event\"]},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true},\"cn\":[],\"ou\":{\"type\":\"select\"},\"owner\":{\"type\":\"list\",\"autocomplete\":true,\"optional\":true}}}');
+INSERT INTO `resource_types` VALUES (1,'collection','Resource Collection','A collection or pool of resources','{\"auto_form_fields\":{\"mail\":{\"data\":[\"cn\"]}},\"fields\":{\"objectclass\":[\"top\",\"groupofuniquenames\",\"kolabgroupofuniquenames\"]},\"form_fields\":{\"cn\":[],\"ou\":{\"type\":\"select\"},\"uniquemember\":{\"type\":\"list\",\"autocomplete\":true,\"optional\":true}}}',0),(2,'car','Car','A car','{\"auto_form_fields\":{\"cn\":{\"data\":[\"cn\"]},\"kolabtargetfolder\":{\"data\":[\"cn\"]},\"mail\":{\"data\":[\"cn\"]}},\"fields\":{\"objectclass\":[\"top\",\"kolabsharedfolder\",\"mailrecipient\"],\"kolabfoldertype\":[\"event\"]},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true},\"cn\":[],\"ou\":{\"type\":\"select\"},\"owner\":{\"type\":\"list\",\"autocomplete\":true,\"optional\":true}}}',0),(3,'confroom','Conference Room','A conference room','{\"auto_form_fields\":{\"cn\":{\"data\":[\"cn\"]},\"kolabtargetfolder\":{\"data\":[\"cn\"]},\"mail\":{\"data\":[\"cn\"]}},\"fields\":{\"objectclass\":[\"top\",\"kolabsharedfolder\",\"mailrecipient\"],\"kolabfoldertype\":[\"event\"]},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true},\"cn\":[],\"ou\":{\"type\":\"select\"},\"owner\":{\"type\":\"list\",\"autocomplete\":true,\"optional\":true}}}',0),(4,'projector','Projector','A portable overhead projector','{\"auto_form_fields\":{\"cn\":{\"data\":[\"cn\"]},\"kolabtargetfolder\":{\"data\":[\"cn\"]},\"mail\":{\"data\":[\"cn\"]}},\"fields\":{\"objectclass\":[\"top\",\"kolabsharedfolder\",\"mailrecipient\"],\"kolabfoldertype\":[\"event\"]},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true},\"cn\":[],\"ou\":{\"type\":\"select\"},\"owner\":{\"type\":\"list\",\"autocomplete\":true,\"optional\":true}}}',0),(5,'footballtickets','Football Season Tickets','Season tickets to the game (pretty good seats too!)','{\"auto_form_fields\":{\"cn\":{\"data\":[\"cn\"]},\"kolabtargetfolder\":{\"data\":[\"cn\"]},\"mail\":{\"data\":[\"cn\"]}},\"fields\":{\"objectclass\":[\"top\",\"kolabsharedfolder\",\"mailrecipient\"],\"kolabfoldertype\":[\"event\"]},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true},\"cn\":[],\"ou\":{\"type\":\"select\"},\"owner\":{\"type\":\"list\",\"autocomplete\":true,\"optional\":true}}}',0);
 /*!40000 ALTER TABLE `resource_types` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -135,6 +138,7 @@
   `name` varchar(256) NOT NULL,
   `description` text NOT NULL,
   `attributes` longtext NOT NULL,
+  `is_default` tinyint(1) DEFAULT 0,
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
 ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1;
@@ -146,7 +150,7 @@
 
 LOCK TABLES `role_types` WRITE;
 /*!40000 ALTER TABLE `role_types` DISABLE KEYS */;
-INSERT INTO `role_types` VALUES (1,'simple_managed','Standard Role','A standard role definition','{\"auto_form_fields\":[],\"fields\":{\"objectclass\":[\"top\",\"ldapsubentry\",\"nsroledefinition\",\"nssimpleroledefinition\",\"nsmanagedroledefinition\"]},\"form_fields\":{\"cn\":[],\"description\":[]}}');
+INSERT INTO `role_types` VALUES (1,'simple_managed','Standard Role','A standard role definition','{\"auto_form_fields\":[],\"fields\":{\"objectclass\":[\"top\",\"ldapsubentry\",\"nsroledefinition\",\"nssimpleroledefinition\",\"nsmanagedroledefinition\"]},\"form_fields\":{\"cn\":[],\"description\":[]}}',0);
 /*!40000 ALTER TABLE `role_types` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -163,6 +167,7 @@
   `name` varchar(256) NOT NULL,
   `description` text NOT NULL,
   `attributes` longtext NOT NULL,
+  `is_default` tinyint(1) DEFAULT 0,
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
 ) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=latin1;
@@ -174,7 +179,7 @@
 
 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','{\"auto_form_fields\":[],\"fields\":{\"kolabfoldertype\":[\"contact\"],\"objectclass\":[\"top\",\"kolabsharedfolder\"]},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true,\"default\":\"anyone, lrs\"},\"cn\":[]}}'),(2,'calendar','Shared Calendar','A shared calendar','{\"auto_form_fields\":[],\"fields\":{\"kolabfoldertype\":[\"event\"],\"objectclass\":[\"top\",\"kolabsharedfolder\"]},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true,\"default\":\"anyone, lrs\"},\"cn\":[]}}'),(3,'journal','Shared Journal','A shared journal','{\"auto_form_fields\":[],\"fields\":{\"kolabfoldertype\":[\"journal\"],\"objectclass\":[\"top\",\"kolabsharedfolder\"]},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true,\"default\":\"anyone, lrs\"},\"cn\":[]}}'),(4,'task','Shared Tasks','A shared tasks folder','{\"auto_form_fields\":[],\"fields\":{\"kolabfoldertype\":[\"task\"],\"objectclass\":[\"top\",\"kolabsharedfolder\"]},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true,\"default\":\"anyone, lrs\"},\"cn\":[]}}'),(5,'note','Shared Notes','A shared Notes folder','{\"auto_form_fields\":[],\"fields\":{\"kolabfoldertype\":[\"note\"],\"objectclass\":[\"top\",\"kolabsharedfolder\"]},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true,\"default\":\"anyone, lrs\"},\"cn\":[]}}'),(6,'file','Shared Files','A shared Files folder','{\"auto_form_fields\":[],\"fields\":{\"kolabfoldertype\":[\"file\"],\"objectclass\":[\"top\",\"kolabsharedfolder\"]},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true,\"default\":\"anyone, lrs\"},\"cn\":[]}}'),(7,'mail','Shared Mail Folder','A shared mail folder','{\"auto_form_fields\":[],\"fields\":{\"kolabfoldertype\":[\"mail\"],\"objectclass\":[\"top\",\"kolabsharedfolder\",\"mailrecipient\"]},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true,\"default\":\"anyone, lrs\"},\"cn\":[],\"alias\":{\"type\":\"list\",\"optional\":true},\"kolabdelegate\":{\"type\":\"list\",\"autocomplete\":true,\"optional\":true},\"kolaballowsmtprecipient\":{\"type\":\"list\",\"optional\":true},\"kolaballowsmtpsender\":{\"type\":\"list\",\"optional\":true},\"kolabtargetfolder\":[],\"mail\":[]}}');
+INSERT INTO `sharedfolder_types` VALUES (1,'addressbook','Shared Address Book','A shared address book','{\"auto_form_fields\":[],\"fields\":{\"kolabfoldertype\":[\"contact\"],\"objectclass\":[\"top\",\"kolabsharedfolder\"]},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true,\"default\":\"anyone, lrs\"},\"cn\":[]}}',0),(2,'calendar','Shared Calendar','A shared calendar','{\"auto_form_fields\":[],\"fields\":{\"kolabfoldertype\":[\"event\"],\"objectclass\":[\"top\",\"kolabsharedfolder\"]},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true,\"default\":\"anyone, lrs\"},\"cn\":[]}}',0),(3,'journal','Shared Journal','A shared journal','{\"auto_form_fields\":[],\"fields\":{\"kolabfoldertype\":[\"journal\"],\"objectclass\":[\"top\",\"kolabsharedfolder\"]},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true,\"default\":\"anyone, lrs\"},\"cn\":[]}}',0),(4,'task','Shared Tasks','A shared tasks folder','{\"auto_form_fields\":[],\"fields\":{\"kolabfoldertype\":[\"task\"],\"objectclass\":[\"top\",\"kolabsharedfolder\"]},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true,\"default\":\"anyone, lrs\"},\"cn\":[]}}',0),(5,'note','Shared Notes','A shared Notes folder','{\"auto_form_fields\":[],\"fields\":{\"kolabfoldertype\":[\"note\"],\"objectclass\":[\"top\",\"kolabsharedfolder\"]},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true,\"default\":\"anyone, lrs\"},\"cn\":[]}}',0),(6,'file','Shared Files','A shared Files folder','{\"auto_form_fields\":[],\"fields\":{\"kolabfoldertype\":[\"file\"],\"objectclass\":[\"top\",\"kolabsharedfolder\"]},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true,\"default\":\"anyone, lrs\"},\"cn\":[]}}',0),(7,'mail','Shared Mail Folder','A shared mail folder','{\"auto_form_fields\":[],\"fields\":{\"kolabfoldertype\":[\"mail\"],\"objectclass\":[\"top\",\"kolabsharedfolder\",\"mailrecipient\"]},\"form_fields\":{\"acl\":{\"type\":\"imap_acl\",\"optional\":true,\"default\":\"anyone, lrs\"},\"cn\":[],\"alias\":{\"type\":\"list\",\"optional\":true},\"kolabdelegate\":{\"type\":\"list\",\"autocomplete\":true,\"optional\":true},\"kolaballowsmtprecipient\":{\"type\":\"list\",\"optional\":true},\"kolaballowsmtpsender\":{\"type\":\"list\",\"optional\":true},\"kolabtargetfolder\":[],\"mail\":[]}}',0);
 /*!40000 ALTER TABLE `sharedfolder_types` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -192,6 +197,7 @@
   `description` text NOT NULL,
   `attributes` longtext NOT NULL,
   `used_for` varchar(16) DEFAULT NULL,
+  `is_default` tinyint(1) DEFAULT 0,
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`)
 ) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=latin1;
@@ -203,7 +209,7 @@
 
 LOCK TABLES `user_types` WRITE;
 /*!40000 ALTER TABLE `user_types` DISABLE KEYS */;
-INSERT INTO `user_types` VALUES (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\":{\"type\":\"text-quota\",\"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\":{\"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\":{\"type\":\"text-quota\",\"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),(4,'contact','Contact','A global address book contact','{\"auto_form_fields\":{\"cn\":{\"data\":[\"givenname\",\"sn\"]},\"displayname\":{\"data\":[\"givenname\",\"sn\"]},\"uid\":{\"data\":[\"givenname\",\"sn\"]},\"userpassword\":{\"optional\":true}},\"form_fields\":{\"cn\":{\"optional\":true},\"displayname\":{\"optional\":true},\"givenname\":[],\"initials\":{\"optional\":true},\"l\":{\"optional\":true},\"mail\":{\"type\":\"list\",\"optional\":true},\"mailalternateaddress\":{\"type\":\"list\",\"optional\":true},\"mobile\":{\"optional\":true},\"o\":{\"optional\":true},\"ou\":{\"type\":\"select\"},\"pager\":{\"optional\":true},\"postalcode\":{\"optional\":true},\"sn\":[],\"street\":{\"optional\":true},\"telephonenumber\":{\"optional\":true},\"title\":{\"optional\":true},\"userpassword\":{\"optional\":true}},\"fields\":{\"objectclass\":[\"top\",\"inetorgperson\",\"mailrecipient\",\"organizationalperson\",\"person\"]}}',NULL),(5,'forwarding','Mail Forwarding','A mail forwarding account (forwarding only!)','{\"auto_form_fields\":{\"cn\":{\"data\":[\"givenname\",\"sn\"]},\"displayname\":{\"data\":[\"givenname\",\"sn\"]},\"uid\":{\"data\":[\"givenname\",\"sn\"]},\"userpassword\":{\"optional\":true}},\"form_fields\":{\"cn\":{\"optional\":true},\"displayname\":{\"optional\":true},\"givenname\":[],\"initials\":{\"optional\":true},\"l\":{\"optional\":true},\"mail\":{\"type\":\"list\",\"optional\":true},\"mailalternateaddress\":{\"type\":\"list\",\"optional\":true},\"mailforwardingaddress\":{\"type\":\"list\"},\"mobile\":{\"optional\":true},\"o\":{\"optional\":true},\"ou\":{\"type\":\"select\"},\"pager\":{\"optional\":true},\"postalcode\":{\"optional\":true},\"sn\":[],\"street\":{\"optional\":true},\"telephonenumber\":{\"optional\":true},\"title\":{\"optional\":true},\"userpassword\":{\"optional\":true}},\"fields\":{\"objectclass\":[\"top\",\"inetorgperson\",\"mailrecipient\",\"organizationalperson\",\"person\"]}}',NULL);
+INSERT INTO `user_types` VALUES (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\":{\"type\":\"text-quota\",\"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),(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,0),(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\":{\"type\":\"text-quota\",\"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,0),(4,'contact','Contact','A global address book contact','{\"auto_form_fields\":{\"cn\":{\"data\":[\"givenname\",\"sn\"]},\"displayname\":{\"data\":[\"givenname\",\"sn\"]},\"uid\":{\"data\":[\"givenname\",\"sn\"]},\"userpassword\":{\"optional\":true}},\"form_fields\":{\"cn\":{\"optional\":true},\"displayname\":{\"optional\":true},\"givenname\":[],\"initials\":{\"optional\":true},\"l\":{\"optional\":true},\"mail\":{\"type\":\"list\",\"optional\":true},\"mailalternateaddress\":{\"type\":\"list\",\"optional\":true},\"mobile\":{\"optional\":true},\"o\":{\"optional\":true},\"ou\":{\"type\":\"select\"},\"pager\":{\"optional\":true},\"postalcode\":{\"optional\":true},\"sn\":[],\"street\":{\"optional\":true},\"telephonenumber\":{\"optional\":true},\"title\":{\"optional\":true},\"userpassword\":{\"optional\":true}},\"fields\":{\"objectclass\":[\"top\",\"inetorgperson\",\"mailrecipient\",\"organizationalperson\",\"person\"]}}',NULL,0),(5,'forwarding','Mail Forwarding','A mail forwarding account (forwarding only!)','{\"auto_form_fields\":{\"cn\":{\"data\":[\"givenname\",\"sn\"]},\"displayname\":{\"data\":[\"givenname\",\"sn\"]},\"uid\":{\"data\":[\"givenname\",\"sn\"]},\"userpassword\":{\"optional\":true}},\"form_fields\":{\"cn\":{\"optional\":true},\"displayname\":{\"optional\":true},\"givenname\":[],\"initials\":{\"optional\":true},\"l\":{\"optional\":true},\"mail\":{\"type\":\"list\",\"optional\":true},\"mailalternateaddress\":{\"type\":\"list\",\"optional\":true},\"mailforwardingaddress\":{\"type\":\"list\"},\"mobile\":{\"optional\":true},\"o\":{\"optional\":true},\"ou\":{\"type\":\"select\"},\"pager\":{\"optional\":true},\"postalcode\":{\"optional\":true},\"sn\":[],\"street\":{\"optional\":true},\"telephonenumber\":{\"optional\":true},\"title\":{\"optional\":true},\"userpassword\":{\"optional\":true}},\"fields\":{\"objectclass\":[\"top\",\"inetorgperson\",\"mailrecipient\",\"organizationalperson\",\"person\"]}}',NULL,0);
 /*!40000 ALTER TABLE `user_types` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;

kolab-webadmin-3.2.1.tar.gz/doc/sample-insert-user_types.php -> kolab-webadmin-3.2.2.tar.gz/doc/sample-insert-user_types.php Changed

kolab-webadmin-3.2.1.tar.gz/lib/Auth/LDAP.php -> kolab-webadmin-3.2.2.tar.gz/lib/Auth/LDAP.php Changed

@@ -43,7 +43,7 @@
         // Causes nesting levels to be too deep...?
         //$this->config_set('config_get_hook', array($this, "_config_get"));
 
-        $this->config_set("debug", true);
+        $this->config_set("debug", Log::mode() == Log::TRACE);
         $this->config_set("log_hook", array($this, "_log"));
 
         $this->config_set("config_root_dn", "cn=config");
@@ -60,11 +60,11 @@
                 try {
                     $domain = $_SESSION['user']->get_domain();
                 } catch (Exception $e) {
-                    Log::warning("LDAP: User not authenticated yet");
+                    $this->_log(LOG_WARNING, "LDAP: User not authenticated yet");
                 }
             }
         } else {
-            Log::debug("LDAP: __construct() using domain $domain");
+            $this->_log(LOG_DEBUG, "LDAP: __construct() using domain $domain");
         }
 
         // Continue and default to the primary domain.
@@ -127,7 +127,7 @@
      */
     public function authenticate($username, $password, $domain = NULL)
     {
-        Log::debug("Auth::LDAP: authentication request for $username against domain $domain");
+        $this->_log(LOG_DEBUG, "Auth::LDAP: authentication request for $username against domain $domain");
 
         if (!$this->connect()) {
             return false;
@@ -302,7 +302,7 @@
                         $attrs['nsslapd-directory'] = $this->nsslapd_directory($ldap, $domain);
                     }
                     if (!$ldap->add_entry($dn, $attrs)) {
-                        Log::error("Error adding $dn to $replica_host");
+                        $this->_log(LOG_ERR, "Error adding $dn to $replica_host");
                     }
                 }
                 $ldap->close();
@@ -314,7 +314,7 @@
                     $attrs['nsslapd-directory'] = $this->nsslapd_directory($this, $domain);
                 }
                 if (!$this->add_entry($dn, $attrs)) {
-                    Log::error("Error adding $dn");
+                    $this->_log(LOG_ERR, "Error adding $dn");
                 }
             }
         }
@@ -1110,7 +1110,7 @@
             $unique_attr = 'nsuniqueid';
         }
 
-        Log::trace("Using unique_attribute " . var_export($unique_attr, TRUE) . " at " . __FILE__ . ":" . __LINE__);
+        $this->_log(LOG_NOTICE, "Using unique_attribute " . var_export($unique_attr, TRUE) . " at " . __FILE__ . ":" . __LINE__);
 
         if (!in_array($unique_attr, $attributes)) {
             $attributes[] = $unique_attr;
@@ -1208,6 +1208,9 @@
                 Log::debug($str . $msg);
                 break;
             case LOG_ERR:
+            case LOG_ALERT:
+            case LOG_CRIT:
+            case LOG_EMERG:
                 Log::error($str . $msg);
                 break;
             case LOG_INFO:
@@ -1216,9 +1219,6 @@
             case LOG_WARNING:
                 Log::warning($str . $msg);
                 break;
-            case LOG_ALERT:
-            case LOG_CRIT:
-            case LOG_EMERG:
             case LOG_NOTICE:
             default:
                 Log::trace($str . $msg);
@@ -1681,7 +1681,7 @@
         // only report once
         if (!$seen["$host:$port"]++) {
             $this->mc_available--;
-            Log::error("Memcache failure on host $host:$port");
+            $this->_log(LOG_ERR, "Memcache failure on host $host:$port");
         }
     }

kolab-webadmin-3.2.1.tar.gz/lib/SQL.php -> kolab-webadmin-3.2.2.tar.gz/lib/SQL.php Changed

@@ -42,6 +42,8 @@
         'identifier_end'   => '"',
     );
 
+    const DEFAULT_QUOTE = '`';
+
 
     /**
      * This implements the 'singleton' design pattern
@@ -82,7 +84,8 @@
             'sybase'  => 'mssql',
             'dblib'   => 'mssql',
             'mysqli'  => 'mysql',
-            'oracle'  => 'oci',
+            'oci'     => 'oracle',
+            'oci8'    => 'oracle',
         );
 
         $driver = isset($driver_map[$driver]) ? $driver_map[$driver] : $driver;
@@ -172,6 +175,9 @@
             $query = $this->set_limit($query, $numrows, $offset);
         }
 
+        // replace self::DEFAULT_QUOTE with driver-specific quoting
+        $query = $this->query_parse($query);
+
         $pos = 0;
         $idx = 0;
 
@@ -212,6 +218,51 @@
     }
 
     /**
+     * Parse SQL query and replace identifier quoting
+     *
+     * @param string $query SQL query
+     *
+     * @return string SQL query
+     */
+    protected function query_parse($query)
+    {
+        $start = $this->options['identifier_start'];
+        $end   = $this->options['identifier_end'];
+        $quote = self::DEFAULT_QUOTE;
+
+        if ($start == $quote) {
+            return $query;
+        }
+
+        $pos = 0;
+        $in  = false;
+
+        while ($pos = strpos($query, $quote, $pos)) {
+            if ($query[$pos+1] == $quote) {  // skip escaped quote
+                $pos += 2;
+            }
+            else {
+                if ($in) {
+                    $q  = $end;
+                    $in = false;
+                }
+                else {
+                    $q  = $start;
+                    $in = true;
+                }
+
+                $query = substr_replace($query, $q, $pos, 1);
+                $pos++;
+            }
+        }
+
+        // replace escaped quote back to normal, see self::quote()
+        $query = str_replace($quote.$quote, $quote, $query);
+
+        return $query;
+    }
+
+    /**
      * Helper method to handle DB errors.
      * This by default logs the error but could be overriden by a driver implementation
      *
@@ -259,10 +310,6 @@
      */
     public function fetch_assoc($result = null)
     {
-        if (!$this->connect()) {
-            return null;
-        }
-
         return $this->fetch_row($result, PDO::FETCH_ASSOC);
     }
 
@@ -291,7 +338,7 @@
         return false;
     }
 
-    public function affected_rows($result)
+    public function affected_rows($result = null)
     {
         if ($result || ($result === null && ($result = $this->last_result))) {
             return $result->rowCount();
@@ -347,7 +394,9 @@
 
         $type = isset($map[$type]) ? $map[$type] : PDO::PARAM_STR;
 
-        return strtr($this->conn->quote($input, $type), array('?' => '??'));  // escape ?
+        return strtr($this->conn->quote($input, $type), array(
+            '?' => '??', self::DEFAULT_QUOTE => self::DEFAULT_QUOTE.self::DEFAULT_QUOTE
+        ));
     }
 
     /**

kolab-webadmin-3.2.2.tar.gz/lib/SQL/oracle.php Added

@@ -0,0 +1,467 @@
+<?php
+
+/*
+ +--------------------------------------------------------------------------+
+ | This file is part of the Kolab Web Admin Panel |
+ | |
+ | Copyright (C) 2011-2014, Kolab Systems AG |
+ | |
+ | This program is free software: you can redistribute it and/or modify |
+ | it under the terms of the GNU Affero General Public License as published |
+ | by the Free Software Foundation, either version 3 of the License, or |
+ | (at your option) any later version. |
+ | |
+ | This program is distributed in the hope that it will be useful, |
+ | but WITHOUT ANY WARRANTY; without even the implied warranty of |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
+ | GNU Affero General Public License for more details. |
+ | |
+ | You should have received a copy of the GNU Affero General Public License |
+ | along with this program. If not, see <http://www.gnu.org/licenses/> |
+ +--------------------------------------------------------------------------+
+ | Author: Aleksander Machniak <machniak@kolabsys.com> |
+ +--------------------------------------------------------------------------+
+*/
+
+/**
+ * Database independent query interface
+ */
+class SQL_oracle extends SQL
+{
+ public $db_provider = 'oracle';
+
+ /**
+ * Connects to database
+ */
+ protected function connect()
+ {
+ if (!$this->conn && !$this->conn_tried) {
+ Log::debug("SQL: Connecting to " . $this->sql_uri);
+
+ $this->conn_tried = true;
+
+ $dsn = self::parse_dsn($this->sql_uri);
+
+ // Get database specific connection options
+ $dsn_options = $this->dsn_options($dsn);
+
+ $function = $this->db_pconn ? 'oci_pconnect' : 'oci_connect';
+
+ if (!function_exists($function)) {
+ $this->db_error = true;
+ $this->db_error_msg = 'OCI8 extension not loaded. See http://php.net/manual/en/book.oci8.php';
+
+ Log::error($this->db_error_msg);
+ return;
+ }
+
+ // connect
+ $dbh = @$function($dsn['username'], $dsn['password'], $dsn_options['database'], $dsn_options['charset']);
+
+ if (!$dbh) {
+ $error = oci_error();
+ $this->db_error = true;
+ $this->db_error_msg = $error['message'];
+
+ Log::error($this->db_error_msg);
+ return;
+ }
+
+ // configure session
+ $this->conn_configure($dsn, $dbh);
+
+ $this->conn = $dbh;
+ }
+
+ return $this->conn;
+ }
+
+ /**
+ * Driver-specific configuration of database connection
+ *
+ * @param array $dsn DSN for DB connections
+ * @param PDO $dbh Connection handler
+ */
+ protected function conn_configure($dsn, $dbh)
+ {
+ $init_queries = array(
+ "ALTER SESSION SET nls_date_format = 'YYYY-MM-DD'",
+ "ALTER SESSION SET nls_timestamp_format = 'YYYY-MM-DD HH24:MI:SS'",
+ );
+
+ foreach ($init_queries as $query) {
+ $stmt = oci_parse($dbh, $query);
+ oci_execute($stmt);
+ }
+ }
+
+ /**
+ * Execute a SQL query with limits
+ *
+ * @param string $query SQL query to execute
+ * @param array $params Values to be inserted in query
+ * @param int $offset Offset for LIMIT statement
+ * @param int $numrows Number of rows for LIMIT statement
+ *
+ * @return resource|bool Query handle or False on error
+ */
+ public function query($query, $params = array(), $offset = null, $numrows = null)
+ {
+ if (!$this->connect()) {
+ return $this->last_result = false;
+ }
+
+ $query = ltrim($query);
+
+ if ($numrows || $offset) {
+ $query = $this->set_limit($query, $numrows, $offset);
+ }
+
+ // replace self::DEFAULT_QUOTE with driver-specific quoting
+ $query = $this->query_parse($query);
+
+ // Because in Roundcube we mostly use queries that are
+ // executed only once, we will not use prepared queries
+ $pos = 0;
+ $idx = 0;
+ $args = array();
+
+ if (count($params)) {
+ while ($pos = strpos($query, '?', $pos)) {
+ if ($query[$pos+1] == '?') { // skip escaped '?'
+ $pos += 2;
+ }
+ else {
+ $val = $this->quote($params[$idx++]);
+
+ // long strings are not allowed inline, need to be parametrized
+ if (strlen($val) > 4000) {
+ $key = ':param' . (count($args) + 1);
+ $args[$key] = $params[$idx-1];
+ $val = $key;
+ }
+
+ unset($params[$idx-1]);
+ $query = substr_replace($query, $val, $pos, 1);
+ $pos += strlen($val);
+ }
+ }
+ }
+
+ // replace escaped '?' back to normal, see self::quote()
+ $query = str_replace('??', '?', $query);
+ $query = rtrim($query, " \t\n\r\0\x0B;");
+
+ // log query
+ Log::debug('SQL: ' . $query);
+
+ // destroy reference to previous result
+ $this->last_result = null;
+ $this->db_error_msg = null;
+
+ // prepare query
+ $result = @oci_parse($this->conn, $query);
+ $mode = $this->in_transaction ? OCI_NO_AUTO_COMMIT : OCI_COMMIT_ON_SUCCESS;
+
+ if ($result) {
+ foreach ($args as $param => $arg) {
+ oci_bind_by_name($result, $param, $args[$param], -1, SQLT_LNG);
+ }
+ }
+
+ // execute query
+ if (!$result || !@oci_execute($result, $mode)) {
+ $result = $this->handle_error($query, $result);
+ }
+
+ return $this->last_result = $result;
+ }
+
+ /**
+ * Helper method to handle DB errors.
+ * This by default logs the error but could be overriden by a driver implementation
+ *
+ * @param string Query that triggered the error
+ * @return mixed Result to be stored and returned
+ */
+ protected function handle_error($query, $result = null)
+ {
+ $error = oci_error(is_resource($result) ? $result : $this->conn);
+
+ // @TODO: Find error codes for key errors
+ if (empty($this->options['ignore_key_errors']) || !in_array($error['code'], array('23000', '23505'))) {
+ $this->db_error = true;
+ $this->db_error_msg = sprintf('[%s] %s', $error['code'], $error['message']);
+
+ Log::error($this->db_error_msg . " (SQL Query: $query)");
+ }
+
+ return false;

kolab-webadmin-3.2.1.tar.gz/lib/api/kolab_api_service_form_value.php -> kolab-webadmin-3.2.2.tar.gz/lib/api/kolab_api_service_form_value.php Changed

@@ -673,6 +673,33 @@
 
             $primary_mail = kolab_recipient_policy::primary_mail($postdata);
 
+            $auth = Auth::get_instance();
+
+            list($_local, $_domain) = explode("@", $primary_mail);
+            $local = $_local;
+
+            $x = 2;
+            while (($user_found = $auth->find_recipient($local . "@" . $_domain))) {
+                Log::trace(__FUNCTION__ . ": An entry with address " . $local . "@" . $_domain . " was found.");
+
+                if (!empty($postdata['id'])) {
+                    $user_found_dn          = key($user_found);
+                    $user_found_unique_attr = $this->unique_attribute_value($user_found_dn);
+
+                    if ($user_found_unique_attr == $postdata['id']) {
+                        Log::trace(__FUNCTION__ . ": Entry with address " . $local . "@" . $_domain . " is actually us.");
+                        break;
+                    }
+                } // empty($postdata['id'])
+
+                // Otherwise this is a new user and therefore the entry found with
+                // this address is definitely not us
+                $local = $_local . $x;
+                $x++;
+            }
+
+            $primary_mail = $local . "@" . $_domain;
+
             return $primary_mail;
         }
     }
@@ -1001,10 +1028,9 @@
                 $subjects = $subjects->entries(true);
                 $subject = array_shift($subjects);
                 $subject_dn = key($subject);
-                $subject_dn_components = ldap_explode_dn($subject_dn, 0);
+                $subject_dn_components = kolab_utils::explode_dn($subject_dn);
 
                 if ($subject_dn_components) {
-                    unset($subject_dn_components['count']);
                     array_shift($subject_dn_components);
                     $default = strtolower(implode(',', $subject_dn_components));
                 }
@@ -1398,7 +1424,7 @@
         }
 
         $db     = SQL::get_instance();
-        $query  = $db->query("SELECT option_values FROM options WHERE attribute = ?", array($attribute));
+        $query  = $db->query("SELECT `option_values` FROM `options` WHERE `attribute` = ?", array($attribute));
         $result = $db->fetch_assoc($query);
         $result = json_decode($result['option_values']);

kolab-webadmin-3.2.1.tar.gz/lib/api/kolab_api_service_group.php -> kolab-webadmin-3.2.2.tar.gz/lib/api/kolab_api_service_group.php Changed

kolab-webadmin-3.2.1.tar.gz/lib/api/kolab_api_service_ou.php -> kolab-webadmin-3.2.2.tar.gz/lib/api/kolab_api_service_ou.php Changed

kolab-webadmin-3.2.1.tar.gz/lib/api/kolab_api_service_resource.php -> kolab-webadmin-3.2.2.tar.gz/lib/api/kolab_api_service_resource.php Changed

@@ -124,10 +124,8 @@
 
         //console("\$resource_attributes as result from parse_input_attributes", $resource_attributes);
 
-        $resource            = $postdata['id'];
-
         $auth   = Auth::get_instance();
-        $result = $auth->resource_edit($resource, $resource_attributes, $postdata['type_id']);
+        $result = $auth->resource_edit($postdata['id'], $resource_attributes, $postdata['type_id']);
 
         // Return the $mod_array
         if ($result) {
@@ -175,14 +173,6 @@
         // normalize result
         $result = $this->parse_result_attributes('resource', $result);
 
-        if (empty($result['ou'])) {
-            $dn = ldap_explode_dn($result['entrydn'], 0);
-            // pop the count and rdn
-            unset($dn['count']);
-            unset($dn[0]);
-            $result['ou'] = implode(',', $dn);
-        }
-
         if ($result) {
             return $result;
         }
@@ -210,14 +200,6 @@
         // normalize result
         $result = $this->parse_result_attributes('resource', $result);
 
-        if (empty($result['ou'])) {
-            $dn = ldap_explode_dn($result['entrydn'], 0);
-            // pop the count and rdn
-            unset($dn['count']);
-            unset($dn[0]);
-            $result['ou'] = implode(',', $dn);
-        }
-
         if ($result) {
             return $result;
         }

kolab-webadmin-3.2.1.tar.gz/lib/api/kolab_api_service_role.php -> kolab-webadmin-3.2.2.tar.gz/lib/api/kolab_api_service_role.php Changed

kolab-webadmin-3.2.1.tar.gz/lib/api/kolab_api_service_sharedfolder.php -> kolab-webadmin-3.2.2.tar.gz/lib/api/kolab_api_service_sharedfolder.php Changed

kolab-webadmin-3.2.1.tar.gz/lib/api/kolab_api_service_type.php -> kolab-webadmin-3.2.2.tar.gz/lib/api/kolab_api_service_type.php Changed

@@ -94,6 +94,7 @@
 'name' => $postdata['name'],
 'description' => $postdata['description'] ? $postdata['description'] : '',
 'attributes' => json_encode($postdata['attributes']),
+ 'is_default' => $postdata['is_default'] ? 1 : 0,
 );
 
 if ($postdata['type'] == 'user') {
@@ -103,13 +104,18 @@
 $query = array_map(array($this->db, 'quote'), $query);
 $columns = array_map(array($this->db, 'quote_identifier'), array_keys($query));
 
- $this->db->query("INSERT INTO {$type}_types"
+ $this->db->query("INSERT INTO `{$type}_types`"
 . " (" . implode(', ', $columns) . ") VALUES (" . implode(', ', $query) . ")");
 
- if (!($id = $this->db->insert_id())) {
+ if (!($id = $this->db->insert_id($type . '_types'))) {
 return false;
 }
 
+ // there can be only one default
+ if ($postdata['is_default']) {
+ $this->db->query("UPDATE `{$type}_types` SET `is_default` = 0 WHERE `id` <> " . intval($id));
+ }
+
 // update cache
 $this->cache['object_types'][$type][$id] = $postdata;
 
@@ -144,7 +150,7 @@
 return false;
 }
 
- $this->db->query("DELETE FROM {$object_name}_types WHERE id = " . intval($object_id));
+ $this->db->query("DELETE FROM `{$object_name}_types` WHERE `id` = " . intval($object_id));
 
 return (bool) $this->db->affected_rows();
 }
@@ -182,6 +188,7 @@
 'name' => $postdata['name'],
 'description' => $postdata['description'] ? $postdata['description'] : '',
 'attributes' => json_encode($postdata['attributes']),
+ 'is_default' => $postdata['is_default'] ? 1 : 0,
 );
 
 if ($postdata['type'] == 'user') {
@@ -192,13 +199,18 @@
 $query[$idx] = $this->db->quote_identifier($idx) . " = " . $this->db->quote($value);
 }
 
- $result = $this->db->query("UPDATE {$type}_types SET "
- . implode(', ', $query) . " WHERE id = " . intval($postdata['id']));
+ $result = $this->db->query("UPDATE `{$type}_types` SET "
+ . implode(', ', $query) . " WHERE `id` = " . intval($postdata['id']));
 
 if (!$result) {
 return false;
 }
 
+ // there can be only one default
+ if ($postdata['is_default']) {
+ $this->db->query("UPDATE `{$type}_types` SET `is_default` = 0 WHERE `id` <> " . intval($postdata['id']));
+ }
+
 // update cache
 $this->cache['object_types'][$type][$id] = $postdata;

kolab-webadmin-3.2.1.tar.gz/lib/api/kolab_api_service_user.php -> kolab-webadmin-3.2.2.tar.gz/lib/api/kolab_api_service_user.php Changed

@@ -130,12 +130,11 @@
         Log::trace("\$postdata to user_edit()", $postdata);
 
         $user_attributes = $this->parse_input_attributes('user', $postdata);
-        $user            = $postdata['id'];
 
         Log::trace("\$user_attributes as result from parse_input_attributes", $user_attributes);
 
         $auth   = Auth::get_instance();
-        $result = $auth->user_edit($user, $user_attributes, $postdata['type_id']);
+        $result = $auth->user_edit($postdata['id'], $user_attributes, $postdata['type_id']);
 
         // Return the $mod_array
         if ($result) {
@@ -176,14 +175,6 @@
         // normalize result
         $result = $this->parse_result_attributes('user', $result);
 
-        if (empty($result['ou'])) {
-            $dn = ldap_explode_dn($result['entrydn'], 0);
-            // pop the count and rdn
-            unset($dn['count']);
-            unset($dn[0]);
-            $result['ou'] = implode(',', $dn);
-        }
-
         Log::trace("user.info on " . $getdata['id'] . " parsed result: " . var_export($result, TRUE));
 
         if ($result) {

kolab-webadmin-3.2.1.tar.gz/lib/client/kolab_client_task_domain.php -> kolab-webadmin-3.2.2.tar.gz/lib/client/kolab_client_task_domain.php Changed

@@ -78,14 +78,9 @@
 public function action_info()
 {
 $id = $this->get_input('id', 'POST');
- //console("action_info() on", $id);
 
 $result = $this->api_get('domain.info', array('id' => $id));
- //console("action_info() \$result", $result);
-
 $domain = $result->get();
- //console("action_info() \$domain", $domain);
-
 $output = $this->domain_form(array_keys($domain), $domain);
 
 $this->output->set_object('taskcontent', $output);
@@ -125,32 +120,9 @@
 'inetdomainstatus' => 'system',
 );
 
- //console("domain_form() \$data", $data);
-
 // Prepare fields
- list($fields, $types, $type) = $this->form_prepare('domain', $data);
-
- //console("Result from form_prepare", $fields, $types, $type);
-
- $add_mode = empty($data['id']);
- $accttypes = array();
-
- foreach ($types as $idx => $elem) {
- $accttypes[$idx] = array('value' => $idx, 'content' => $elem['name']);
- }
-
- // Add domain type id selector
- $fields['type_id'] = array(
- 'section' => 'system',
- 'type' => kolab_form::INPUT_SELECT,
- 'options' => $accttypes,
- 'onchange' => "kadm.domain_save(true, 'system')",
- );
-
- // Hide account type selector if there's only one type
- if (count($accttypes) < 2 || !$add_mode) {
- $fields['type_id']['type'] = kolab_form::INPUT_HIDDEN;
- }
+ $form = $this->form_prepare('domain', $data, array(), null, $fields_map['type_id']);
+ list($fields, $types, $type, $add_mode) = $form;
 
 // Create mode
 if ($add_mode) {
@@ -169,21 +141,10 @@
 else {
 $title = $data['associateddomain'][0];
 }
-
- // Add domain type name
- $fields['type_id_name'] = array(
- 'label' => 'domain.type_id',
- 'section' => 'system',
- 'value' => $accttypes[$type]['content'],
- );
 }
 
 // Create form object and populate with fields
- $form = $this->form_create('domain', $attribs, $sections, $fields, $fields_map, $data, $add_mode);
-
- //console("domain_form() \$form", $form);
-
- $form->set_title(kolab_html::escape($title));
+ $form = $this->form_create('domain', $attribs, $sections, $fields, $fields_map, $data, $add_mode, $title);
 
 return $form->output();
 }

kolab-webadmin-3.2.1.tar.gz/lib/client/kolab_client_task_group.php -> kolab-webadmin-3.2.2.tar.gz/lib/client/kolab_client_task_group.php Changed

@@ -104,50 +104,12 @@
 );
 
 // Prepare fields
- list($fields, $types, $type) = $this->form_prepare('group', $data);
-
- $add_mode = empty($data['id']);
- $accttypes = array();
-
- foreach ($types as $idx => $elem) {
- $accttypes[$idx] = array('value' => $idx, 'content' => $elem['name']);
- }
-
- // Add user type id selector
- $fields['type_id'] = array(
- 'section' => 'system',
- 'type' => kolab_form::INPUT_SELECT,
- 'options' => $accttypes,
- 'onchange' => "kadm.group_save(true, 'system')",
- );
-
- // Hide account type selector if there's only one type
- if (count($accttypes) < 2 || !$add_mode) {
- $fields['type_id']['type'] = kolab_form::INPUT_HIDDEN;
- }
-
- // Create mode
- if ($add_mode) {
- // Page title
- $title = $this->translate('group.add');
- }
- // Edit mode
- else {
- $title = $data['cn'];
-
- // Add user type name
- $fields['type_id_name'] = array(
- 'label' => 'group.type_id',
- 'section' => 'system',
- 'value' => $accttypes[$type]['content'],
- );
- }
+ $form = $this->form_prepare('group', $data, array(), null, $fields_map['type_id']);
+ list($fields, $types, $type, $add_mode) = $form;
 
 // Create form object and populate with fields
 $form = $this->form_create('group', $attribs, $sections, $fields, $fields_map, $data, $add_mode);
 
- $form->set_title(kolab_html::escape($title));
-
 return $form->output();
 }

kolab-webadmin-3.2.1.tar.gz/lib/client/kolab_client_task_ou.php -> kolab-webadmin-3.2.2.tar.gz/lib/client/kolab_client_task_ou.php Changed

@@ -152,36 +152,14 @@
 );
 
 // Prepare fields
- list($fields, $types, $type) = $this->form_prepare('ou', $data);
-
- $add_mode = empty($data['id']);
- $accttypes = array();
-
- foreach ($types as $idx => $elem) {
- $accttypes[$idx] = array('value' => $idx, 'content' => $elem['name']);
- }
-
- // Add OU type id selector
- $fields['type_id'] = array(
- 'section' => 'system',
- 'type' => kolab_form::INPUT_SELECT,
- 'options' => $accttypes,
- 'onchange' => "kadm.ou_save(true, 'system')",
- );
-
- // Hide account type selector if there's only one type
- if (count($accttypes) < 2 || !$add_mode) {
- //console("setting type_id form type to hidden");
- $fields['type_id']['type'] = kolab_form::INPUT_HIDDEN;
- }
-
- $ou_roots = array_merge(array(''), $this->ou_list());
+ $form = $this->form_prepare('ou', $data, array(), null, $fields_map['type_id']);
+ list($fields, $types, $type, $add_mode) = $form;
 
 // Add OU root selector
 $fields['base_dn'] = array(
- 'section' => 'system',
+ 'section' => $fields_map['base_dn'],
 'type' => kolab_form::INPUT_SELECT,
- 'options' => $ou_roots,
+ 'options' => array_merge(array(''), $this->ou_list()),
 'escaped' => true,
 'default' => $data['base_dn'],
 );
@@ -194,13 +172,6 @@
 // Edit mode
 else {
 $title = $data['ou'];
-
- // Add OU type name
- $fields['type_id_name'] = array(
- 'label' => 'ou.type_id',
- 'section' => 'system',
- 'value' => $accttypes[$type]['content'],
- );
 }
 
 // Create form object and populate with fields

kolab-webadmin-3.2.1.tar.gz/lib/client/kolab_client_task_resource.php -> kolab-webadmin-3.2.2.tar.gz/lib/client/kolab_client_task_resource.php Changed

@@ -68,13 +68,10 @@
 */
 public function action_info()
 {
- $id = $this->get_input('id', 'POST');
- $result = $this->api_get('resource.info', array('id' => $id));
- $resource = $result->get();
-
- //console("action_info()", $resource);
-
- $output = $this->resource_form(null, $resource);
+ $id = $this->get_input('id', 'POST');
+ $result = $this->api_get('resource.info', array('id' => $id));
+ $resource = $result->get();
+ $output = $this->resource_form(null, $resource);
 
 $this->output->set_object('taskcontent', $output);
 }
@@ -85,8 +82,6 @@
 $attribs['id'] = 'resource-form';
 }
 
- //console("resource_form(\$attribs, \$data)", $attribs, $data);
-
 // Form sections
 $sections = array(
 'system' => 'resource.system',
@@ -125,55 +120,12 @@
 );
 
 // Prepare fields
- list($fields, $types, $type) = $this->form_prepare('resource', $data);
-
- //console("Result from form_prepare", $fields, $types, $type);
-
- $add_mode = empty($data['id']);
- $accttypes = array();
-
- foreach ($types as $idx => $elem) {
- $accttypes[$idx] = array('value' => $idx, 'content' => $elem['name']);
- }
-
- // Add resource type id selector
- $fields['type_id'] = array(
- 'section' => 'system',
- 'type' => kolab_form::INPUT_SELECT,
- 'options' => $accttypes,
- 'onchange' => "kadm.resource_save(true, 'system')",
- );
-
- //console($accttypes);
-
- // Hide account type selector if there's only one type
- if (count($accttypes) < 2 || !$add_mode) {
- //console("setting type_id form type to hidden");
- $fields['type_id']['type'] = kolab_form::INPUT_HIDDEN;
- }
-
- // Create mode
- if ($add_mode) {
- // Page title
- $title = $this->translate('resource.add');
- }
- // Edit mode
- else {
- $title = $data['cn'];
-
- // Add resource type name
- $fields['type_id_name'] = array(
- 'label' => 'resource.type_id',
- 'section' => 'system',
- 'value' => $accttypes[$type]['content'],
- );
- }
+ $form = $this->form_prepare('resource', $data, array(), null, $fields_map['type_id']);
+ list($fields, $types, $type, $add_mode) = $form;
 
 // Create form object and populate with fields
 $form = $this->form_create('resource', $attribs, $sections, $fields, $fields_map, $data, $add_mode);
 
- $form->set_title(kolab_html::escape($title));
-
 return $form->output();
 }
 }

kolab-webadmin-3.2.1.tar.gz/lib/client/kolab_client_task_role.php -> kolab-webadmin-3.2.2.tar.gz/lib/client/kolab_client_task_role.php Changed

@@ -59,7 +59,7 @@
 {
 $id = $this->get_input('id', 'POST');
 $result = $this->api_get('role.info', array('id' => $id));
- $role = $result->get();
+ $role = $result->get();
 $output = $this->role_form(null, $role);
 
 $this->output->set_object('taskcontent', $output);
@@ -99,55 +99,13 @@
 'description' => 'system',
 );
 
- //console("role_form \$data", $data);
-
 // Prepare fields
- list($fields, $types, $type) = $this->form_prepare('role', $data);
-
- //console("role_form \$types", $types);
-
- $add_mode = empty($data['id']);
- $accttypes = array();
-
- foreach ($types as $idx => $elem) {
- $accttypes[$idx] = array('value' => $idx, 'content' => $elem['name']);
- }
-
- // Add user type id selector
- $fields['type_id'] = array(
- 'section' => 'system',
- 'type' => kolab_form::INPUT_SELECT,
- 'options' => $accttypes,
- 'onchange' => "kadm.role_save(true, 'system')",
- );
-
- // Hide account type selector if there's only one type
- if (count($accttypes) < 2 || !$add_mode) {
- $fields['type_id']['type'] = kolab_form::INPUT_HIDDEN;
- }
-
- // Create mode
- if ($add_mode) {
- // Page title
- $title = $this->translate('role.add');
- }
- // Edit mode
- else {
- $title = $data['cn'];
-
- // Add user type name
- $fields['type_id_name'] = array(
- 'label' => 'role.type_id',
- 'section' => 'system',
- 'value' => $accttypes[$type]['content'],
- );
- }
+ $form = $this->form_prepare('role', $data, array(), null, $fields_map['type_id']);
+ list($fields, $types, $type, $add_mode) = $form;
 
 // Create form object and populate with fields
 $form = $this->form_create('role', $attribs, $sections, $fields, $fields_map, $data, $add_mode);
 
- $form->set_title(kolab_html::escape($title));
-
 return $form->output();
 }

kolab-webadmin-3.2.1.tar.gz/lib/client/kolab_client_task_settings.php -> kolab-webadmin-3.2.2.tar.gz/lib/client/kolab_client_task_settings.php Changed

@@ -410,6 +410,7 @@
             'description'   => 'props',
             'objectclass'   => 'props',
             'used_for'      => 'props',
+            'is_default'    => 'props',
             'attributes'    => 'attribs',
         );
 
@@ -418,12 +419,7 @@
         $add_mode = empty($data['id']);
         $title    = $add_mode ? $this->translate('type.add') : $data['name'];
 
-        // unset $data for correct form_create() run, we've got already data specified
-        $effective_rights = $data['effective_rights'];
-        $id = $data['id'] ? $data['type'].':'.$data['id'] : null;
-        $data = array();
-        $data['effective_rights'] = $effective_rights;
-        $data['id'] = $id;
+        $data['id'] = $data['id'] ? $data['type'].':'.$data['id'] : null;
 
         // Create form object and populate with fields
         $form = $this->form_create('type', $attribs, $sections, $fields, $fields_map, $data, $add_mode);
@@ -481,6 +477,11 @@
                 'type'    => kolab_form::INPUT_CHECKBOX,
                 'checked' => !empty($data['used_for']) && $data['used_for'] == 'hosted',
             ),
+            'is_default' => array(
+                'value'   => '1',
+                'type'    => kolab_form::INPUT_CHECKBOX,
+                'checked' => !empty($data['is_default']),
+            ),
             'attributes' => array(
                 'type'    => kolab_form::INPUT_CONTENT,
                 'content' => $this->type_form_attributes($data),

kolab-webadmin-3.2.1.tar.gz/lib/client/kolab_client_task_sharedfolder.php -> kolab-webadmin-3.2.2.tar.gz/lib/client/kolab_client_task_sharedfolder.php Changed

@@ -82,8 +82,6 @@
 $attribs['id'] = 'sharedfolder-form';
 }
 
- //console("sharedfolder_form(\$attribs, \$data)", $attribs, $data);
-
 // Form sections
 $sections = array(
 'system' => 'sharedfolder.system',
@@ -122,55 +120,12 @@
 );
 
 // Prepare fields
- list($fields, $types, $type) = $this->form_prepare('sharedfolder', $data);
-
- //console("Result from form_prepare", $fields, $types, $type);
-
- $add_mode = empty($data['id']);
- $accttypes = array();
-
- foreach ($types as $idx => $elem) {
- $accttypes[$idx] = array('value' => $idx, 'content' => $elem['name']);
- }
-
- // Add sharedfolder type id selector
- $fields['type_id'] = array(
- 'section' => 'system',
- 'type' => kolab_form::INPUT_SELECT,
- 'options' => $accttypes,
- 'onchange' => "kadm.sharedfolder_save(true, 'system')",
- );
-
- //console($accttypes);
-
- // Hide account type selector if there's only one type
- if (count($accttypes) < 2 || !$add_mode) {
- //console("setting type_id form type to hidden");
- $fields['type_id']['type'] = kolab_form::INPUT_HIDDEN;
- }
-
- // Create mode
- if ($add_mode) {
- // Page title
- $title = $this->translate('sharedfolder.add');
- }
- // Edit mode
- else {
- $title = $data['cn'];
-
- // Add sharedfolder type name
- $fields['type_id_name'] = array(
- 'label' => 'sharedfolder.type_id',
- 'section' => 'system',
- 'value' => $accttypes[$type]['content'],
- );
- }
+ $form = $this->form_prepare('sharedfolder', $data, array(), null, $fields_map['type_id']);
+ list($fields, $types, $type, $add_mode) = $form;
 
 // Create form object and populate with fields
 $form = $this->form_create('sharedfolder', $attribs, $sections, $fields, $fields_map, $data, $add_mode);
 
- $form->set_title(kolab_html::escape($title));
-
 return $form->output();
 }
 }

kolab-webadmin-3.2.1.tar.gz/lib/client/kolab_client_task_signup.php -> kolab-webadmin-3.2.2.tar.gz/lib/client/kolab_client_task_signup.php Changed

@@ -206,27 +206,8 @@
 );
 
 // Prepare fields
- list($fields, $types, $type) = $this->form_prepare('user', $data, array('userpassword2'), 'hosted');
-
- // Add user type id selector
- $accttypes = array();
- foreach ($types as $idx => $elem) {
- if($elem['used_for'] == 'hosted') {
- $accttypes[$idx] = array('value' => $idx, 'content' => $elem['name']);
- }
- }
- $fields['type_id'] = array(
- 'section' => 'personal',
- 'type' => kolab_form::INPUT_SELECT,
- 'options' => $accttypes,
- 'onchange' => "kadm.change_user_type()",
- );
- // Hide user types selector if only one is available
- if(count($accttypes) <= 1) {
- $accctype = array_shift(array_values($accttypes));
- $fields['type_id']['type'] = kolab_form::INPUT_HIDDEN;
- $fields['type_id']['value'] = $accttype['value'];
- }
+ $form = $this->form_prepare('user', $data, array('userpassword2'), 'hosted', $fields_map['type_id']);
+ list($fields, $types, $type, $add_mode) = $form;
 
 // Add object type field
 $fields['object_type'] = array(
@@ -270,9 +251,8 @@
 $fields['domain']['label'] = 'signup.domain';
 
 // Create form object and populate with fields
- $form = $this->form_create('user', $attribs, array('other'), $fields, $fields_map, $data, true);
-
- $form->set_title($this->translate('signup.formtitle'));
+ $form = $this->form_create('user', $attribs, array('other'), $fields, $fields_map, $data, true
+ $this->translate('signup.formtitle'));
 
 $this->output->add_translation('user.password.mismatch', 'signup.wronguid', 'signup.userexists', 'internalerror', 'servererror');

kolab-webadmin-3.2.1.tar.gz/lib/client/kolab_client_task_user.php -> kolab-webadmin-3.2.2.tar.gz/lib/client/kolab_client_task_user.php Changed

@@ -173,24 +173,8 @@
 );
 
 // Prepare fields
- list($fields, $types, $type) = $this->form_prepare('user', $data, array('userpassword2'));
-
- //console("Result from form_prepare", $fields, $types, $type);
-
- $add_mode = empty($data['id']);
- $accttypes = array();
-
- foreach ($types as $idx => $elem) {
- $accttypes[$idx] = array('value' => $idx, 'content' => $elem['name']);
- }
-
- // Add user type id selector
- $fields['type_id'] = array(
- 'section' => 'personal',
- 'type' => kolab_form::INPUT_SELECT,
- 'options' => $accttypes,
- 'onchange' => "kadm.user_save(true, 'personal')",
- );
+ $form = $this->form_prepare('user', $data, array('userpassword2'), null, $fields_map['type_id']);
+ list($fields, $types, $type, $add_mode) = $form;
 
 // Add password confirmation
 if (isset($fields['userpassword'])) {
@@ -206,11 +190,6 @@
 }
 }
 
- // Hide account type selector if there's only one type
- if (count($accttypes) < 2 || !$add_mode) {
- $fields['type_id']['type'] = kolab_form::INPUT_HIDDEN;
- }
-
 // Create mode
 if ($add_mode) {
 // copy password to password confirm field
@@ -228,19 +207,10 @@
 
 // remove password
 $data['userpassword'] = '';
-
- // Add user type name
- $fields['type_id_name'] = array(
- 'label' => 'user.type_id',
- 'section' => 'personal',
- 'value' => $accttypes[$type]['content'],
- );
 }
 
 // Create form object and populate with fields
- $form = $this->form_create('user', $attribs, $sections, $fields, $fields_map, $data, $add_mode);
-
- $form->set_title(kolab_html::escape($title));
+ $form = $this->form_create('user', $attribs, $sections, $fields, $fields_map, $data, $add_mode, $title);
 
 $this->output->add_translation('user.password.mismatch');

kolab-webadmin-3.2.1.tar.gz/lib/ext/Net/LDAP3.php -> kolab-webadmin-3.2.2.tar.gz/lib/ext/Net/LDAP3.php Changed

@@ -992,7 +992,9 @@
 
             $result = $ldap->search($root_dn, '(objectclass=nsds5replicationagreement)', 'sub', array('nsds5replicahost'));
             if (!$result) {
-                $this->_debug("No replicas configured");
+                $this->_debug("No replicas configured on $replica_host");
+                $ldap->close();
+                continue;
             }
 
             foreach ($result->entries(true) as $dn => $attrs) {
@@ -1852,12 +1854,15 @@
                         // Not passing any sort attributes means you don't care
                         if (!empty($sort_attrs)) {
                             $sort_attrs = (array) $sort_attrs;
-                            if (count(array_intersect($sort_attrs, $vlv_index[$base_dn]['sort'])) == count($sort_attrs)) {
-                                return $sort_attrs;
-                            }
-                            else {
-                                return false;
+                            foreach ($vlv_index[$base_dn]['sort'] as $sss_config) {
+                                if (count(array_intersect($sort_attrs, $sss_config)) == count($sort_attrs)) {
+                                    return $sort_attrs;
+                                }
                             }
+
+                            $this->_error("The requested sorting does not match any server-side sorting configuration");
+
+                            return false;
                         }
                         else {
                             return $vlv_index[$base_dn]['sort'][0];
@@ -2180,25 +2185,19 @@
             }
         }
 
-        // Use ldap_modify() not ldap_mod_replace(), this is the only way to update entry
-        // in case of objectClass change (Bug #1921)
         if (is_array($attributes['replace']) && !empty($attributes['replace'])) {
-            $attrs = array_merge($attributes['replace'], $attributes['add']);
+            $this->_debug("LDAP: C: Mod-Replace $subject_dn: " . json_encode($attributes['replace']));
 
-            $this->_debug("LDAP: C: Modify $subject_dn: " . json_encode($attrs));
-
-            $result = ldap_modify($this->conn, $subject_dn, $attrs);
+            $result = ldap_mod_replace($this->conn, $subject_dn, $attributes['replace']);
 
             if ($result) {
                 $this->_debug("LDAP: S: OK");
             }
             else {
                 $this->_debug("LDAP: S: " . ldap_error($this->conn));
-                $this->_warning("LDAP: Failed to replace attributes on $subject_dn: " . json_encode($attrs));
+                $this->_warning("LDAP: Failed to replace attributes on $subject_dn: " . json_encode($attributes['replace']));
                 return false;
             }
-
-            unset($attributes['add'], $attributes['replace']);
         }
 
         if (is_array($attributes['del']) && !empty($attributes['del'])) {

kolab-webadmin-3.2.1.tar.gz/lib/ext/Net/LDAP3/Result.php -> kolab-webadmin-3.2.2.tar.gz/lib/ext/Net/LDAP3/Result.php Changed

@@ -71,7 +71,7 @@
     }
 
     /**
-     *
+     * Wrapper for ldap_sort()
      */
     public function sort($attr)
     {
@@ -79,18 +79,23 @@
     }
 
     /**
-     *
+     * Get entries count
      */
     public function count()
     {
-        if (!isset($this->count))
+        if (!isset($this->count)) {
             $this->count = ldap_count_entries($this->conn, $this->result);
+        }
 
         return $this->count;
     }
 
     /**
+     * Wrapper for ldap_get_entries()
      *
+     * @param bool $normalize Optionally normalize the entries to a list of hash arrays
+     *
+     * @return array List of LDAP entries
      */
     public function entries($normalize = false)
     {
@@ -103,6 +108,14 @@
         return $entries;
     }
 
+    /**
+     * Wrapper for ldap_get_dn() using the current entry pointer
+     */
+    public function get_dn()
+    {
+        return $this->current ? ldap_get_dn($this->conn, $this->current) : null;
+    }
+
 
     /***  Implement PHP 5 Iterator interface to make foreach work  ***/

kolab-webadmin-3.2.1.tar.gz/lib/kolab_api_controller.php -> kolab-webadmin-3.2.2.tar.gz/lib/kolab_api_controller.php Changed

@@ -41,21 +41,6 @@
         $this->output = new kolab_json_output();
         $this->config = Conf::get_instance();
 
-        if (!empty($_GET['service'])) {
-            if (!empty($_GET['method'])) {
-                $this->request = array(
-                    'service' => $_GET['service'],
-                    'method'  => $_GET['method']
-                );
-            }
-            else {
-                throw new Exception("Unknown method " . $_GET['method'], 400);
-            }
-        }
-        else {
-            throw new Exception("Unknown service " . $_GET['service'], 400);
-        }
-
         // TODO: register services based on config or whatsoever
         $this->add_service('domain',            'kolab_api_service_domain');
         $this->add_service('domain_types',      'kolab_api_service_domain_types');
@@ -135,6 +120,21 @@
      */
     public function dispatch($postdata)
     {
+        if (!empty($_GET['service'])) {
+            if (!empty($_GET['method'])) {
+                $this->request = array(
+                    'service' => $_GET['service'],
+                    'method'  => $_GET['method']
+                );
+            }
+            else {
+                throw new Exception("Unknown method " . $_GET['method'], 400);
+            }
+        }
+        else {
+            throw new Exception("Unknown service " . $_GET['service'], 400);
+        }
+
         // Use proxy
         if (empty($_GET['proxy']) && ($url = $this->config->get('kolab_wap', 'api_url'))) {
             $this->proxy($postdata, $url);

kolab-webadmin-3.2.1.tar.gz/lib/kolab_api_service.php -> kolab-webadmin-3.2.2.tar.gz/lib/kolab_api_service.php Changed

kolab-webadmin-3.2.1.tar.gz/lib/kolab_client_task.php -> kolab-webadmin-3.2.2.tar.gz/lib/kolab_client_task.php Changed

@@ -903,8 +903,8 @@
 $result['default'] = $field['default'];
 
 $this->output->add_translation('aci.new', 'aci.edit', 'aci.remove',
- 'button.ok', 'button.cancel',
- 'acl.read', 'acl.write', 'acl.append', 'acl.post', 'acl.all', 'acl.custom',
+ 'button.ok', 'button.cancel', 'acl.all', 'acl.custom',
+ 'acl.read-only', 'acl.read-write', 'acl.full', 'acl.semi-full',
 'acl.l', 'acl.r', 'acl.s', 'acl.w', 'acl.i', 'acl.p', 'acl.k', 'acl.a',
 'acl.x', 'acl.t', 'acl.n', 'acl.e', 'acl.d', 'acl.anyone', 'acl.anonymous',
 'acl.identifier', 'acl.rights', 'acl.expire', 'acl.user',
@@ -999,10 +999,12 @@
 * @param string $name Object name (user, group, etc.)
 * @param array $data Object data
 * @param array $extra_fields Extra field names
+ * @param string $used_for Object types filter
+ * @param string $id_section Name of section for type_id field
 *
 * @return array Fields list, Object types list, Current type ID
 */
- protected function form_prepare($name, &$data, $extra_fields = array(), $used_for = null)
+ protected function form_prepare($name, &$data, $extra_fields = array(), $used_for = null, $id_section = null)
 {
 $types = (array) $this->object_types($name, $used_for);
 $add_mode = empty($data['id']);
@@ -1021,7 +1023,17 @@
 $type = $data['type_id'];
 }
 else {
- $data['type_id'] = $type = key($types);
+ // find default object type
+ foreach ($types as $type_id => $type) {
+ if ($type['is_default']) {
+ $default = $type_id;
+ break;
+ }
+ }
+
+ reset($types);
+
+ $data['type_id'] = $type = ($default !== null ? $default : key($types));
 }
 
 if ($type) {
@@ -1225,7 +1237,37 @@
 );
 }
 
- $result = array($fields, $types, $type);
+ // Add object type id selector
+ if ($id_section) {
+ $object_types = array();
+ foreach ($types as $idx => $elem) {
+ $object_types[$idx] = array('value' => $idx, 'content' => $elem['name']);
+ }
+
+ // Add object type id selector
+ $fields['type_id'] = array(
+ 'section' => $id_section,
+ 'type' => kolab_form::INPUT_SELECT,
+ 'options' => $object_types,
+ 'onchange' => "kadm.{$name}_save(true, '$id_section')",
+ );
+
+ // Hide account type selector if there's only one type
+ if (count($object_types) < 2 || !$add_mode) {
+ $fields['type_id']['type'] = kolab_form::INPUT_HIDDEN;
+ }
+
+ // Add object type name
+ if (!$add_mode && count($object_types) > 1) {
+ $fields['type_id_name'] = array(
+ 'label' => "$name.type_id",
+ 'section' => $id_section,
+ 'value' => $object_types[$type]['content'],
+ );
+ }
+ }
+
+ $result = array($fields, $types, $type, $add_mode);
 return $result;
 }
 
@@ -1238,10 +1280,12 @@
 * @param array $fields Fields list (from self::form_prepare())
 * @param array $fields_map Fields map (used for sorting and sections assignment)
 * @param array $data Object data (with effective rights, see form_prepare())
+ * @param bool $add_mode Add mode enabled
+ * @param string $title Page title
 *
 * @return kolab_form HTML Form object
 */
- protected function form_create($name, $attribs, $sections, $fields, $fields_map, $data, $add_mode)
+ protected function form_create($name, $attribs, $sections, $fields, $fields_map, $data, $add_mode, $title = null)
 {
 // Assign sections to fields
 foreach ($fields as $idx => $field) {
@@ -1336,7 +1380,7 @@
 $assoc_fields[$idx] = !empty($data[$idx]) ? $data[$idx] : array();
 }
 
- if ($field['type'] == kolab_form::INPUT_CHECKBOX) {
+ if ($field['type'] == kolab_form::INPUT_CHECKBOX && !isset($field['checked'])) {
 $field['checked'] = $field['value'] == 'TRUE';
 }
 /*
@@ -1392,7 +1436,7 @@
 if ($writeable) {
 $form->add_button(array(
 'value' => kolab_html::escape($this->translate('button.submit')),
- 'onclick' => "kadm.{$name}_save()",
+ 'onclick' => "kadm.command('{$name}.save')",
 ));
 }
 
@@ -1401,7 +1445,7 @@
 $id = $data['id'];
 $form->add_button(array(
 'value' => kolab_html::escape($this->translate('button.delete')),
- 'onclick' => "kadm.{$name}_delete('{$id}')",
+ 'onclick' => "kadm.command('{$name}.delete', '{$id}')",
 ));
 }
 
@@ -1418,6 +1462,12 @@
 $name . '.delete.confirm', $name . '.delete.force',
 'add', 'edit', 'delete');
 
+ if (empty($title)) {
+ $title = $add_mode ? $this->translate("$name.add") : $data['cn'];
+ }
+
+ $form->set_title(kolab_html::escape($title));
+
 return $form;
 }

kolab-webadmin-3.2.1.tar.gz/lib/kolab_utils.php -> kolab-webadmin-3.2.2.tar.gz/lib/kolab_utils.php Changed

@@ -163,17 +163,47 @@
      */
     public static function dn2ufn($dn)
     {
-        $name = ldap_dn2ufn($dn);
+        return self::decode_dn(ldap_dn2ufn($dn));
+    }
+
+    /**
+     * Unicode-aware ldap_explode_dn() wrapper
+     *
+     * @param string $dn LDAP DN string
+     *
+     * @return array Exploded DN (uses unicode encoding)
+     */
+    public static function explode_dn($dn)
+    {
+        $result = ldap_explode_dn($dn, 0);
+
+        // get rid of count
+        unset($result['count']);
+
+        $result = array_map(array('kolab_utils', 'decode_dn'), $result);
+
+        return $result;
+    }
+
+    /**
+     * Decode \XX sequences into characters
+     *
+     * @param string $str String to decode
+     *
+     * @return string Decoded string
+     */
+    public static function decode_dn($str)
+    {
         $pos  = 0;
 
         // example: "\C3\A4" => "ä"
-        while (preg_match('/\\\\[0-9a-fA-F]{2}/', $name, $matches, PREG_OFFSET_CAPTURE, $pos)) {
+        while (preg_match('/\\\\[0-9a-fA-F]{2}/', $str, $matches, PREG_OFFSET_CAPTURE, $pos)) {
             $char = chr(hexdec(substr($matches[0][0], 1)));
             $pos  = $matches[0][1];
-            $name = substr_replace($name, $char, $pos, 3);
+            $str  = substr_replace($str, $char, $pos, 3);
             $pos += 1;
         }
 
-        return $name;
+        return $str;
     }
 }

kolab-webadmin-3.2.1.tar.gz/lib/locale/bg_BG.php -> kolab-webadmin-3.2.2.tar.gz/lib/locale/bg_BG.php Changed

@@ -1,13 +1,444 @@
 <?php
+
+$LANG['about.community'] = 'This is the Community Edition of the Kolab Server.';
+$LANG['about.kolab'] = 'Kolab';
+$LANG['about.kolabsys'] = 'Kolab Systems';
+$LANG['about.support'] = 'Professional support is available from <a href="http://kolabsys.com">Kolab Systems</a>.';
+$LANG['about.technology'] = 'Technology';
+$LANG['about.warranty'] = 'It comes with absolutely no warranties and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>.';
+
+$LANG['aci.new'] = 'New...';
+$LANG['aci.edit'] = 'Edit...';
+$LANG['aci.remove'] = 'Изтриване';
+$LANG['aci.users'] = 'Users';
+$LANG['aci.rights'] = 'Rights';
+$LANG['aci.targets'] = 'Targets';
+$LANG['aci.aciname'] = 'ACI name:';
+$LANG['aci.hosts'] = 'Hosts';
+$LANG['aci.times'] = 'Times';
+$LANG['aci.name'] = 'Име';
+$LANG['aci.userid'] = 'User ID';
+$LANG['aci.email'] = 'E-mail';
+$LANG['aci.read'] = 'Read';
+$LANG['aci.compare'] = 'Compare';
+$LANG['aci.search'] = 'Search';
+$LANG['aci.write'] = 'Write';
+$LANG['aci.selfwrite'] = 'Self-write';
+$LANG['aci.delete'] = 'Delete';
+$LANG['aci.add'] = 'Add';
+$LANG['aci.proxy'] = 'Proxy';
+$LANG['aci.all'] = 'All rights';
+$LANG['aci.allow'] = 'Allow';
+$LANG['aci.deny'] = 'Deny';
+$LANG['aci.typeusers'] = 'Users';
+$LANG['aci.typegroups'] = 'Groups';
+$LANG['aci.typeroles'] = 'Roles';
+$LANG['aci.typeadmins'] = 'Administrators';
+$LANG['aci.typespecials'] = 'Special Rights';
+$LANG['aci.ldap-self'] = 'Self';
+$LANG['aci.ldap-anyone'] = 'All users';
+$LANG['aci.ldap-all'] = 'All authenticated users';
+$LANG['aci.ldap-parent'] = 'Parent';
+$LANG['aci.usersearch'] = 'Search for:';
+$LANG['aci.usersearchresult'] = 'Search results:';
+$LANG['aci.userselected'] = 'Selected users/groups/roles:';
+$LANG['aci.useradd'] = 'Add';
+$LANG['aci.userremove'] = 'Изтриване';
+$LANG['aci.error.noname'] = 'ACI rule name is required!';
+$LANG['aci.error.exists'] = 'ACI rule with specified name already exists!';
+$LANG['aci.error.nousers'] = 'At least one user entry is required!';
+$LANG['aci.rights.target'] = 'Target entry:';
+$LANG['aci.rights.filter'] = 'Filter:';
+$LANG['aci.rights.attrs'] = 'Attributes:';
+$LANG['aci.checkall'] = 'Check all';
+$LANG['aci.checknone'] = 'Check none';
+$LANG['aci.thisentry'] = 'This entry';
+$LANG['aci.selected'] = 'all selected';
+$LANG['aci.other'] = 'all except selected';
+
+$LANG['acl.all'] = 'all';
+$LANG['acl.append'] = 'append';
+$LANG['acl.custom'] = 'custom...';
+$LANG['acl.full'] = 'Full (without access control)';
+$LANG['acl.post'] = 'post';
+$LANG['acl.read'] = 'read';
+$LANG['acl.read-only'] = 'Read-Only';
+$LANG['acl.read-write'] = 'Read/Write';
+$LANG['acl.semi-full'] = 'Write new items';
+$LANG['acl.write'] = 'write';
+$LANG['acl.l'] = 'Lookup';
+$LANG['acl.r'] = 'Read messages';
+$LANG['acl.s'] = 'Keep Seen state';
+$LANG['acl.w'] = 'Write flags';
+$LANG['acl.i'] = 'Insert (Copy into)';
+$LANG['acl.p'] = 'Post';
+$LANG['acl.c'] = 'Create subfolders';
+$LANG['acl.k'] = 'Create subfolders';
+$LANG['acl.d'] = 'Delete messages';
+$LANG['acl.t'] = 'Delete messages';
+$LANG['acl.e'] = 'Expunge';
+$LANG['acl.x'] = 'Delete folder';
+$LANG['acl.a'] = 'Administer';
+$LANG['acl.n'] = 'Annotate messages';
+$LANG['acl.identifier'] = 'Identifier';
+$LANG['acl.rights'] = 'Access Rights';
+$LANG['acl.expire'] = 'Expires On';
+$LANG['acl.user'] = 'User...';
+$LANG['acl.anyone'] = 'All users (anyone)';
+$LANG['acl.anonymous'] = 'Guests (anonymous)';
+$LANG['acl.error.invaliddate'] = 'Invalid date format!';
+$LANG['acl.error.norights'] = 'No access rights specified!';
+$LANG['acl.error.subjectexists'] = 'Access rights for specified identifier already exist!';
+$LANG['acl.error.nouser'] = 'User identifier not specified!';
+
+$LANG['add'] = 'Add';
+
+$LANG['api.notypeid'] = 'No object type ID specified!';
+$LANG['api.invalidtypeid'] = 'Invalid object type ID!';
+
+$LANG['attribute.add'] = 'Add attribute';
+$LANG['attribute.default'] = 'Default value';
+$LANG['attribute.static'] = 'Static value';
+$LANG['attribute.name'] = 'Attribute';
 $LANG['attribute.optional'] = 'По избор';
+$LANG['attribute.maxcount'] = 'Max. count';
+$LANG['attribute.readonly'] = 'Read-only';
+$LANG['attribute.type'] = 'Field type';
+$LANG['attribute.value'] = 'Value';
+$LANG['attribute.value.auto'] = 'Generated';
+$LANG['attribute.value.auto-readonly'] = 'Generated (read-only)';
+$LANG['attribute.value.normal'] = 'Normal';
+$LANG['attribute.value.static'] = 'Static';
+$LANG['attribute.options'] = 'Options';
+$LANG['attribute.key.invalid'] = 'Type key contains forbidden characters!';
+$LANG['attribute.required.error'] = 'Required attributes missing in attributes list ($1)!';
+$LANG['attribute.validate'] = ' Validation';
+$LANG['attribute.validate.default'] = 'default';
+$LANG['attribute.validate.none'] = 'none';
+$LANG['attribute.validate.basic'] = 'basic';
+$LANG['attribute.validate.extended'] = 'extended';
+
 $LANG['button.cancel'] = 'Отказ';
+$LANG['button.delete'] = 'Delete';
+$LANG['button.ok'] = 'OK';
 $LANG['button.save'] = 'Запис';
+$LANG['button.submit'] = 'Submit';
+
+$LANG['creatorsname'] = 'Created by';
+$LANG['days'] = 'days';
+$LANG['debug'] = 'Debug info';
+$LANG['delete'] = 'Delete';
+$LANG['deleting'] = 'Deleting data...';
+
+$LANG['domain.add'] = 'Add Domain';
+$LANG['domain.add.success'] = 'Domain created successfully.';
+$LANG['domain.associateddomain'] = 'Domain name(s)';
+$LANG['domain.delete.confirm'] = 'Are you sure, you want to delete this domain?';
+$LANG['domain.delete.force'] = "There are users assigned to this domain.\nAre you sure, you want to delete this domain and all assigned objects?";
+$LANG['domain.delete.success'] = 'Domain deleted successfully.';
+$LANG['domain.edit'] = 'Edit domain';
+$LANG['domain.edit.success'] = 'Domain updated successfully.';
+$LANG['domain.inetdomainbasedn'] = 'Custom Root DN';
+$LANG['domain.inetdomainstatus'] = 'Статус';
+$LANG['domain.list'] = 'Domains List';
+$LANG['domain.norecords'] = 'No domain records found!';
+$LANG['domain.o'] = 'Organization';
+$LANG['domain.other'] = 'Other';
+$LANG['domain.system'] = 'System';
+$LANG['domain.type_id'] = 'Standard Domain';
+
 $LANG['edit'] = 'Промяна';
+$LANG['error'] = 'Error';
+
+$LANG['error.401'] = 'Unauthorized.';
+$LANG['error.403'] = 'Access forbidden.';
+$LANG['error.404'] = 'Object not found.';
+$LANG['error.408'] = 'Request timeout.';
+$LANG['error.450'] = 'Domain is not empty.';
+$LANG['error.500'] = 'Internal server error.';
+$LANG['error.503'] = 'Service unavailable. Try again later.';
+
+$LANG['form.required.empty'] = 'Some of the required fields are empty!';
+$LANG['form.maxcount.exceeded'] = 'Maximum count of items exceeded!';
+
+$LANG['group.add'] = 'Add Group';
+$LANG['group.add.success'] = 'Group created successfully.';
+$LANG['group.cn'] = 'Common name';
+$LANG['group.delete.confirm'] = 'Are you sure, you want to delete this group?';
+$LANG['group.delete.success'] = 'Group deleted successfully.';
+$LANG['group.edit.success'] = 'Group updated successfully.';
+$LANG['group.gidnumber'] = 'Primary group number';
+$LANG['group.kolaballowsmtprecipient'] = 'Recipient(s) Access List';
+$LANG['group.kolaballowsmtpsender'] = 'Sender Access List';
+$LANG['group.list'] = 'Groups List';
+$LANG['group.mail'] = 'Primary Email Address';
+$LANG['group.member'] = 'Member(s)';
+$LANG['group.memberurl'] = 'Members URL';
+$LANG['group.norecords'] = 'No group records found!';
+$LANG['group.other'] = 'Other';
+$LANG['group.ou'] = 'Organizational Unit';
+$LANG['group.system'] = 'System';
+$LANG['group.type_id'] = 'Group type';
+$LANG['group.uniquemember'] = 'Members';
+
+$LANG['info'] = 'Information';
+$LANG['internalerror'] = 'Internal system error!';
+
+$LANG['ldap.one'] = 'one: all entries one level under the base DN';
+$LANG['ldap.sub'] = 'sub: whole subtree starting with the base DN';
+$LANG['ldap.base'] = 'base: base DN only';
+$LANG['ldap.basedn'] = 'Base DN';
+$LANG['ldap.host'] = 'LDAP Server';
+$LANG['ldap.conditions'] = 'Conditions';
+$LANG['ldap.scope'] = 'Scope';
+$LANG['ldap.filter_any'] = 'is non-empty';
+$LANG['ldap.filter_both'] = 'contains';
+$LANG['ldap.filter_prefix'] = 'starts with';
+$LANG['ldap.filter_suffix'] = 'ends with';
+$LANG['ldap.filter_exact'] = 'is equal to';
+

kolab-webadmin-3.2.1.tar.gz/lib/locale/cs_CZ.php -> kolab-webadmin-3.2.2.tar.gz/lib/locale/cs_CZ.php Changed

@@ -1,12 +1,444 @@
 <?php
+
+$LANG['about.community'] = 'This is the Community Edition of the Kolab Server.';
+$LANG['about.kolab'] = 'Kolab';
+$LANG['about.kolabsys'] = 'Kolab Systems';
+$LANG['about.support'] = 'Professional support is available from <a href="http://kolabsys.com">Kolab Systems</a>.';
+$LANG['about.technology'] = 'Technology';
+$LANG['about.warranty'] = 'It comes with absolutely no warranties and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>.';
+
+$LANG['aci.new'] = 'New...';
+$LANG['aci.edit'] = 'Edit...';
+$LANG['aci.remove'] = 'Odstranit';
+$LANG['aci.users'] = 'Users';
+$LANG['aci.rights'] = 'Rights';
+$LANG['aci.targets'] = 'Targets';
+$LANG['aci.aciname'] = 'ACI name:';
+$LANG['aci.hosts'] = 'Hosts';
+$LANG['aci.times'] = 'Times';
+$LANG['aci.name'] = 'Název';
+$LANG['aci.userid'] = 'User ID';
+$LANG['aci.email'] = 'E-mail';
+$LANG['aci.read'] = 'Read';
+$LANG['aci.compare'] = 'Compare';
+$LANG['aci.search'] = 'Search';
+$LANG['aci.write'] = 'Write';
+$LANG['aci.selfwrite'] = 'Self-write';
+$LANG['aci.delete'] = 'Delete';
+$LANG['aci.add'] = 'Add';
+$LANG['aci.proxy'] = 'Proxy';
+$LANG['aci.all'] = 'All rights';
+$LANG['aci.allow'] = 'Allow';
+$LANG['aci.deny'] = 'Deny';
+$LANG['aci.typeusers'] = 'Users';
+$LANG['aci.typegroups'] = 'Groups';
+$LANG['aci.typeroles'] = 'Roles';
+$LANG['aci.typeadmins'] = 'Administrators';
+$LANG['aci.typespecials'] = 'Special Rights';
+$LANG['aci.ldap-self'] = 'Self';
+$LANG['aci.ldap-anyone'] = 'All users';
+$LANG['aci.ldap-all'] = 'All authenticated users';
+$LANG['aci.ldap-parent'] = 'Parent';
+$LANG['aci.usersearch'] = 'Search for:';
+$LANG['aci.usersearchresult'] = 'Search results:';
+$LANG['aci.userselected'] = 'Selected users/groups/roles:';
+$LANG['aci.useradd'] = 'Add';
+$LANG['aci.userremove'] = 'Odstranit';
+$LANG['aci.error.noname'] = 'ACI rule name is required!';
+$LANG['aci.error.exists'] = 'ACI rule with specified name already exists!';
+$LANG['aci.error.nousers'] = 'At least one user entry is required!';
+$LANG['aci.rights.target'] = 'Target entry:';
+$LANG['aci.rights.filter'] = 'Filter:';
+$LANG['aci.rights.attrs'] = 'Attributes:';
+$LANG['aci.checkall'] = 'Check all';
+$LANG['aci.checknone'] = 'Check none';
+$LANG['aci.thisentry'] = 'This entry';
+$LANG['aci.selected'] = 'all selected';
+$LANG['aci.other'] = 'all except selected';
+
+$LANG['acl.all'] = 'all';
+$LANG['acl.append'] = 'append';
+$LANG['acl.custom'] = 'custom...';
+$LANG['acl.full'] = 'Full (without access control)';
+$LANG['acl.post'] = 'post';
+$LANG['acl.read'] = 'read';
+$LANG['acl.read-only'] = 'Read-Only';
+$LANG['acl.read-write'] = 'Read/Write';
+$LANG['acl.semi-full'] = 'Write new items';
+$LANG['acl.write'] = 'write';
+$LANG['acl.l'] = 'Lookup';
+$LANG['acl.r'] = 'Read messages';
+$LANG['acl.s'] = 'Keep Seen state';
+$LANG['acl.w'] = 'Write flags';
+$LANG['acl.i'] = 'Insert (Copy into)';
+$LANG['acl.p'] = 'Post';
+$LANG['acl.c'] = 'Create subfolders';
+$LANG['acl.k'] = 'Create subfolders';
+$LANG['acl.d'] = 'Delete messages';
+$LANG['acl.t'] = 'Delete messages';
+$LANG['acl.e'] = 'Expunge';
+$LANG['acl.x'] = 'Delete folder';
+$LANG['acl.a'] = 'Administer';
+$LANG['acl.n'] = 'Annotate messages';
+$LANG['acl.identifier'] = 'Identifier';
+$LANG['acl.rights'] = 'Access Rights';
+$LANG['acl.expire'] = 'Expires On';
+$LANG['acl.user'] = 'User...';
+$LANG['acl.anyone'] = 'All users (anyone)';
+$LANG['acl.anonymous'] = 'Guests (anonymous)';
+$LANG['acl.error.invaliddate'] = 'Invalid date format!';
+$LANG['acl.error.norights'] = 'No access rights specified!';
+$LANG['acl.error.subjectexists'] = 'Access rights for specified identifier already exist!';
+$LANG['acl.error.nouser'] = 'User identifier not specified!';
+
+$LANG['add'] = 'Add';
+
+$LANG['api.notypeid'] = 'No object type ID specified!';
+$LANG['api.invalidtypeid'] = 'Invalid object type ID!';
+
+$LANG['attribute.add'] = 'Add attribute';
+$LANG['attribute.default'] = 'Default value';
+$LANG['attribute.static'] = 'Static value';
+$LANG['attribute.name'] = 'Attribute';
 $LANG['attribute.optional'] = 'Nepovinný';
+$LANG['attribute.maxcount'] = 'Max. count';
+$LANG['attribute.readonly'] = 'Read-only';
+$LANG['attribute.type'] = 'Field type';
+$LANG['attribute.value'] = 'Value';
+$LANG['attribute.value.auto'] = 'Generated';
+$LANG['attribute.value.auto-readonly'] = 'Generated (read-only)';
+$LANG['attribute.value.normal'] = 'Normal';
+$LANG['attribute.value.static'] = 'Static';
+$LANG['attribute.options'] = 'Options';
+$LANG['attribute.key.invalid'] = 'Type key contains forbidden characters!';
+$LANG['attribute.required.error'] = 'Required attributes missing in attributes list ($1)!';
+$LANG['attribute.validate'] = ' Validation';
+$LANG['attribute.validate.default'] = 'default';
+$LANG['attribute.validate.none'] = 'none';
+$LANG['attribute.validate.basic'] = 'basic';
+$LANG['attribute.validate.extended'] = 'extended';
+
 $LANG['button.cancel'] = 'Storno';
+$LANG['button.delete'] = 'Delete';
+$LANG['button.ok'] = 'OK';
 $LANG['button.save'] = 'Uložit';
+$LANG['button.submit'] = 'Submit';
+
+$LANG['creatorsname'] = 'Created by';
+$LANG['days'] = 'days';
+$LANG['debug'] = 'Debug info';
+$LANG['delete'] = 'Delete';
+$LANG['deleting'] = 'Deleting data...';
+
+$LANG['domain.add'] = 'Add Domain';
+$LANG['domain.add.success'] = 'Domain created successfully.';
+$LANG['domain.associateddomain'] = 'Domain name(s)';
+$LANG['domain.delete.confirm'] = 'Are you sure, you want to delete this domain?';
+$LANG['domain.delete.force'] = "There are users assigned to this domain.\nAre you sure, you want to delete this domain and all assigned objects?";
+$LANG['domain.delete.success'] = 'Domain deleted successfully.';
+$LANG['domain.edit'] = 'Edit domain';
+$LANG['domain.edit.success'] = 'Domain updated successfully.';
+$LANG['domain.inetdomainbasedn'] = 'Custom Root DN';
+$LANG['domain.inetdomainstatus'] = 'Stav';
+$LANG['domain.list'] = 'Domains List';
+$LANG['domain.norecords'] = 'No domain records found!';
+$LANG['domain.o'] = 'Organization';
+$LANG['domain.other'] = 'Other';
+$LANG['domain.system'] = 'System';
+$LANG['domain.type_id'] = 'Standard Domain';
+
 $LANG['edit'] = 'Upravit';
+$LANG['error'] = 'Error';
+
+$LANG['error.401'] = 'Unauthorized.';
+$LANG['error.403'] = 'Access forbidden.';
+$LANG['error.404'] = 'Object not found.';
+$LANG['error.408'] = 'Request timeout.';
+$LANG['error.450'] = 'Domain is not empty.';
+$LANG['error.500'] = 'Internal server error.';
+$LANG['error.503'] = 'Service unavailable. Try again later.';
+
+$LANG['form.required.empty'] = 'Some of the required fields are empty!';
+$LANG['form.maxcount.exceeded'] = 'Maximum count of items exceeded!';
+
+$LANG['group.add'] = 'Add Group';
+$LANG['group.add.success'] = 'Group created successfully.';
+$LANG['group.cn'] = 'Common name';
+$LANG['group.delete.confirm'] = 'Are you sure, you want to delete this group?';
+$LANG['group.delete.success'] = 'Group deleted successfully.';
+$LANG['group.edit.success'] = 'Group updated successfully.';
+$LANG['group.gidnumber'] = 'Primary group number';
+$LANG['group.kolaballowsmtprecipient'] = 'Recipient(s) Access List';
+$LANG['group.kolaballowsmtpsender'] = 'Sender Access List';
+$LANG['group.list'] = 'Groups List';
+$LANG['group.mail'] = 'Primary Email Address';
+$LANG['group.member'] = 'Member(s)';
+$LANG['group.memberurl'] = 'Members URL';
+$LANG['group.norecords'] = 'No group records found!';
+$LANG['group.other'] = 'Other';
+$LANG['group.ou'] = 'Organizational Unit';
+$LANG['group.system'] = 'System';
+$LANG['group.type_id'] = 'Group type';
+$LANG['group.uniquemember'] = 'Members';
+
+$LANG['info'] = 'Information';
+$LANG['internalerror'] = 'Internal system error!';
+
+$LANG['ldap.one'] = 'one: all entries one level under the base DN';
+$LANG['ldap.sub'] = 'sub: whole subtree starting with the base DN';
+$LANG['ldap.base'] = 'base: base DN only';
+$LANG['ldap.basedn'] = 'Base DN';
+$LANG['ldap.host'] = 'LDAP Server';
+$LANG['ldap.conditions'] = 'Conditions';
+$LANG['ldap.scope'] = 'Scope';
+$LANG['ldap.filter_any'] = 'is non-empty';
+$LANG['ldap.filter_both'] = 'contains';
+$LANG['ldap.filter_prefix'] = 'starts with';
+$LANG['ldap.filter_suffix'] = 'ends with';
+$LANG['ldap.filter_exact'] = 'is equal to';
+

kolab-webadmin-3.2.1.tar.gz/lib/locale/de_CH.php -> kolab-webadmin-3.2.2.tar.gz/lib/locale/de_CH.php Changed

@@ -1,9 +1,444 @@
 <?php
+
+$LANG['about.community'] = 'This is the Community Edition of the Kolab Server.';
+$LANG['about.kolab'] = 'Kolab';
+$LANG['about.kolabsys'] = 'Kolab Systems';
+$LANG['about.support'] = 'Professional support is available from <a href="http://kolabsys.com">Kolab Systems</a>.';
+$LANG['about.technology'] = 'Technology';
+$LANG['about.warranty'] = 'It comes with absolutely no warranties and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>.';
+
+$LANG['aci.new'] = 'New...';
+$LANG['aci.edit'] = 'Edit...';
+$LANG['aci.remove'] = 'Löschen';
+$LANG['aci.users'] = 'Users';
+$LANG['aci.rights'] = 'Rights';
+$LANG['aci.targets'] = 'Targets';
+$LANG['aci.aciname'] = 'ACI name:';
+$LANG['aci.hosts'] = 'Hosts';
+$LANG['aci.times'] = 'Times';
+$LANG['aci.name'] = 'Name';
+$LANG['aci.userid'] = 'User ID';
+$LANG['aci.email'] = 'E-mail';
+$LANG['aci.read'] = 'Read';
+$LANG['aci.compare'] = 'Compare';
+$LANG['aci.search'] = 'Suchen';
+$LANG['aci.write'] = 'Write';
+$LANG['aci.selfwrite'] = 'Self-write';
+$LANG['aci.delete'] = 'Löschen';
+$LANG['aci.add'] = 'Add';
+$LANG['aci.proxy'] = 'Proxy';
+$LANG['aci.all'] = 'All rights';
+$LANG['aci.allow'] = 'Allow';
+$LANG['aci.deny'] = 'Deny';
+$LANG['aci.typeusers'] = 'Users';
+$LANG['aci.typegroups'] = 'Groups';
+$LANG['aci.typeroles'] = 'Roles';
+$LANG['aci.typeadmins'] = 'Administrators';
+$LANG['aci.typespecials'] = 'Special Rights';
+$LANG['aci.ldap-self'] = 'Self';
+$LANG['aci.ldap-anyone'] = 'All users';
+$LANG['aci.ldap-all'] = 'All authenticated users';
+$LANG['aci.ldap-parent'] = 'Parent';
+$LANG['aci.usersearch'] = 'Search for:';
+$LANG['aci.usersearchresult'] = 'Search results:';
+$LANG['aci.userselected'] = 'Selected users/groups/roles:';
+$LANG['aci.useradd'] = 'Add';
+$LANG['aci.userremove'] = 'Löschen';
+$LANG['aci.error.noname'] = 'ACI rule name is required!';
+$LANG['aci.error.exists'] = 'ACI rule with specified name already exists!';
+$LANG['aci.error.nousers'] = 'At least one user entry is required!';
+$LANG['aci.rights.target'] = 'Target entry:';
+$LANG['aci.rights.filter'] = 'Filter:';
+$LANG['aci.rights.attrs'] = 'Attributes:';
+$LANG['aci.checkall'] = 'Check all';
+$LANG['aci.checknone'] = 'Check none';
+$LANG['aci.thisentry'] = 'This entry';
+$LANG['aci.selected'] = 'all selected';
+$LANG['aci.other'] = 'all except selected';
+
+$LANG['acl.all'] = 'all';
+$LANG['acl.append'] = 'append';
+$LANG['acl.custom'] = 'custom...';
+$LANG['acl.full'] = 'Full (without access control)';
+$LANG['acl.post'] = 'post';
+$LANG['acl.read'] = 'read';
+$LANG['acl.read-only'] = 'Read-Only';
+$LANG['acl.read-write'] = 'Read/Write';
+$LANG['acl.semi-full'] = 'Write new items';
+$LANG['acl.write'] = 'write';
+$LANG['acl.l'] = 'Lookup';
+$LANG['acl.r'] = 'Read messages';
+$LANG['acl.s'] = 'Keep Seen state';
+$LANG['acl.w'] = 'Write flags';
+$LANG['acl.i'] = 'Insert (Copy into)';
+$LANG['acl.p'] = 'Post';
+$LANG['acl.c'] = 'Create subfolders';
+$LANG['acl.k'] = 'Create subfolders';
+$LANG['acl.d'] = 'Delete messages';
+$LANG['acl.t'] = 'Delete messages';
+$LANG['acl.e'] = 'Expunge';
+$LANG['acl.x'] = 'Delete folder';
+$LANG['acl.a'] = 'Administer';
+$LANG['acl.n'] = 'Annotate messages';
+$LANG['acl.identifier'] = 'Identifier';
+$LANG['acl.rights'] = 'Access Rights';
+$LANG['acl.expire'] = 'Expires On';
+$LANG['acl.user'] = 'User...';
+$LANG['acl.anyone'] = 'All users (anyone)';
+$LANG['acl.anonymous'] = 'Guests (anonymous)';
+$LANG['acl.error.invaliddate'] = 'Invalid date format!';
+$LANG['acl.error.norights'] = 'No access rights specified!';
+$LANG['acl.error.subjectexists'] = 'Access rights for specified identifier already exist!';
+$LANG['acl.error.nouser'] = 'User identifier not specified!';
+
+$LANG['add'] = 'Add';
+
+$LANG['api.notypeid'] = 'No object type ID specified!';
+$LANG['api.invalidtypeid'] = 'Invalid object type ID!';
+
+$LANG['attribute.add'] = 'Add attribute';
+$LANG['attribute.default'] = 'Default value';
+$LANG['attribute.static'] = 'Static value';
+$LANG['attribute.name'] = 'Attribute';
+$LANG['attribute.optional'] = 'Optional';
+$LANG['attribute.maxcount'] = 'Max. count';
+$LANG['attribute.readonly'] = 'Read-only';
+$LANG['attribute.type'] = 'Field type';
+$LANG['attribute.value'] = 'Value';
+$LANG['attribute.value.auto'] = 'Generated';
+$LANG['attribute.value.auto-readonly'] = 'Generated (read-only)';
+$LANG['attribute.value.normal'] = 'Normal';
+$LANG['attribute.value.static'] = 'Static';
+$LANG['attribute.options'] = 'Options';
+$LANG['attribute.key.invalid'] = 'Type key contains forbidden characters!';
+$LANG['attribute.required.error'] = 'Required attributes missing in attributes list ($1)!';
+$LANG['attribute.validate'] = ' Validation';
+$LANG['attribute.validate.default'] = 'default';
+$LANG['attribute.validate.none'] = 'none';
+$LANG['attribute.validate.basic'] = 'basic';
+$LANG['attribute.validate.extended'] = 'extended';
+
 $LANG['button.cancel'] = 'Abbrechen';
+$LANG['button.delete'] = 'Löschen';
+$LANG['button.ok'] = 'OK';
 $LANG['button.save'] = 'Speichern';
+$LANG['button.submit'] = 'Absenden';
+
+$LANG['creatorsname'] = 'Created by';
+$LANG['days'] = 'days';
+$LANG['debug'] = 'Debug info';
+$LANG['delete'] = 'Löschen';
+$LANG['deleting'] = 'Deleting data...';
+
+$LANG['domain.add'] = 'Add Domain';
+$LANG['domain.add.success'] = 'Domain created successfully.';
+$LANG['domain.associateddomain'] = 'Domain name(s)';
+$LANG['domain.delete.confirm'] = 'Are you sure, you want to delete this domain?';
+$LANG['domain.delete.force'] = "There are users assigned to this domain.\nAre you sure, you want to delete this domain and all assigned objects?";
+$LANG['domain.delete.success'] = 'Domain deleted successfully.';
+$LANG['domain.edit'] = 'Edit domain';
+$LANG['domain.edit.success'] = 'Domain updated successfully.';
+$LANG['domain.inetdomainbasedn'] = 'Custom Root DN';
+$LANG['domain.inetdomainstatus'] = 'Status';
+$LANG['domain.list'] = 'Domains List';
+$LANG['domain.norecords'] = 'No domain records found!';
+$LANG['domain.o'] = 'Organization';
+$LANG['domain.other'] = 'Other';
+$LANG['domain.system'] = 'System';
+$LANG['domain.type_id'] = 'Standard Domain';
+
 $LANG['edit'] = 'Bearbeiten';
+$LANG['error'] = 'Error';
+
+$LANG['error.401'] = 'Unauthorized.';
+$LANG['error.403'] = 'Access forbidden.';
+$LANG['error.404'] = 'Object not found.';
+$LANG['error.408'] = 'Request timeout.';
+$LANG['error.450'] = 'Domain is not empty.';
+$LANG['error.500'] = 'Internal server error.';
+$LANG['error.503'] = 'Service unavailable. Try again later.';
+
+$LANG['form.required.empty'] = 'Some of the required fields are empty!';
+$LANG['form.maxcount.exceeded'] = 'Maximum count of items exceeded!';
+
+$LANG['group.add'] = 'Add Group';
+$LANG['group.add.success'] = 'Group created successfully.';
+$LANG['group.cn'] = 'Common name';
+$LANG['group.delete.confirm'] = 'Are you sure, you want to delete this group?';
+$LANG['group.delete.success'] = 'Group deleted successfully.';
+$LANG['group.edit.success'] = 'Group updated successfully.';
+$LANG['group.gidnumber'] = 'Primary group number';
+$LANG['group.kolaballowsmtprecipient'] = 'Recipient(s) Access List';
+$LANG['group.kolaballowsmtpsender'] = 'Sender Access List';
+$LANG['group.list'] = 'Groups List';
+$LANG['group.mail'] = 'Primary Email Address';
+$LANG['group.member'] = 'Member(s)';
+$LANG['group.memberurl'] = 'Members URL';
+$LANG['group.norecords'] = 'No group records found!';
+$LANG['group.other'] = 'Other';
+$LANG['group.ou'] = 'Organizational Unit';
+$LANG['group.system'] = 'System';
+$LANG['group.type_id'] = 'Group type';
+$LANG['group.uniquemember'] = 'Members';
+
+$LANG['info'] = 'Information';
+$LANG['internalerror'] = 'Interner Systemfehler!';
+
+$LANG['ldap.one'] = 'one: all entries one level under the base DN';
+$LANG['ldap.sub'] = 'sub: whole subtree starting with the base DN';
+$LANG['ldap.base'] = 'base: base DN only';
+$LANG['ldap.basedn'] = 'Base DN';
+$LANG['ldap.host'] = 'LDAP Server';
+$LANG['ldap.conditions'] = 'Conditions';
+$LANG['ldap.scope'] = 'Scope';
+$LANG['ldap.filter_any'] = 'is non-empty';
+$LANG['ldap.filter_both'] = 'contains';
+$LANG['ldap.filter_prefix'] = 'starts with';
+$LANG['ldap.filter_suffix'] = 'ends with';
+$LANG['ldap.filter_exact'] = 'is equal to';
+

kolab-webadmin-3.2.1.tar.gz/lib/locale/de_DE.php -> kolab-webadmin-3.2.2.tar.gz/lib/locale/de_DE.php Changed

@@ -1,12 +1,103 @@
 <?php
+
 $LANG['about.community'] = 'Dies ist die Community-Edition des Kolab Servers.';
 $LANG['about.kolab'] = 'Kolab';
 $LANG['about.kolabsys'] = 'Kolab Systems';
 $LANG['about.support'] = 'Professionelle Unterstützung ist erhältlich bei <a href="http://kolabsys.com">Kolab Systems</a>.';
 $LANG['about.technology'] = 'Technologie';
 $LANG['about.warranty'] = 'Sie kommt mit keinen Garantien und wird normalerweise ohne professionelle Unterstützung eingesetzt. Hilfe und weitere Informationen finden Sie auf der <a href="http://kolab.org">Web-Seite</a> und im <a href="http://wiki.kolab.org">Wiki</a>.';
+
+$LANG['aci.new'] = 'Neu...';
+$LANG['aci.edit'] = 'Bearbeiten...';
+$LANG['aci.remove'] = 'Entfernen';
+$LANG['aci.users'] = 'Benutzer';
+$LANG['aci.rights'] = 'Rechte';
+$LANG['aci.targets'] = 'Ziele';
+$LANG['aci.aciname'] = 'ACI Nam';
+$LANG['aci.hosts'] = 'Hosts';
+$LANG['aci.times'] = 'Zeiten';
+$LANG['aci.name'] = 'Name';
+$LANG['aci.userid'] = 'Benutzer ID';
+$LANG['aci.email'] = 'E-Mail';
+$LANG['aci.read'] = 'Lesen';
+$LANG['aci.compare'] = 'Vergleichen';
+$LANG['aci.search'] = 'Suchen';
+$LANG['aci.write'] = 'Schreiben';
+$LANG['aci.selfwrite'] = 'Sich-Selbst-Beschreiben';
+$LANG['aci.delete'] = 'Löschen';
+$LANG['aci.add'] = 'Hinzufügen';
+$LANG['aci.proxy'] = 'Proxy';
+$LANG['aci.all'] = 'Alle Rechte';
+$LANG['aci.allow'] = 'Erlauben';
+$LANG['aci.deny'] = 'Verbieten';
+$LANG['aci.typeusers'] = 'Benutzer';
+$LANG['aci.typegroups'] = 'Gruppen';
+$LANG['aci.typeroles'] = 'Rollen';
+$LANG['aci.typeadmins'] = 'Administratoren';
+$LANG['aci.typespecials'] = 'Spezialrechte';
+$LANG['aci.ldap-self'] = 'Selbst';
+$LANG['aci.ldap-anyone'] = 'Alle Benutzer';
+$LANG['aci.ldap-all'] = 'Alle authentifizierten Benutzer';
+$LANG['aci.ldap-parent'] = 'Eltern';
+$LANG['aci.usersearch'] = 'Suche nach:';
+$LANG['aci.usersearchresult'] = 'Suchergebnis:';
+$LANG['aci.userselected'] = 'Ausgewählte Benutzer/Gruppen/Rollen:';
+$LANG['aci.useradd'] = 'Hinzufügen';
+$LANG['aci.userremove'] = 'Entfernen';
+$LANG['aci.error.noname'] = 'ACI Regel Name wird benötigt!';
+$LANG['aci.error.exists'] = 'ACI Regel mit dem gegebenen Namen exisitiert bereits!';
+$LANG['aci.error.nousers'] = 'Mindestens ein Benutzer Eintrag ist erforderlich!';
+$LANG['aci.rights.target'] = 'Ziel Eintrag:';
+$LANG['aci.rights.filter'] = 'Filter:';
+$LANG['aci.rights.attrs'] = 'Attribute:';
+$LANG['aci.checkall'] = 'Alle auswählen';
+$LANG['aci.checknone'] = 'Nichts auswählen';
+$LANG['aci.thisentry'] = 'Dieser Eintrag';
+$LANG['aci.selected'] = 'alle ausgewählten';
+$LANG['aci.other'] = 'alle nicht ausgewählten';
+
+$LANG['acl.all'] = 'alle';
+$LANG['acl.append'] = 'anhängen';
+$LANG['acl.custom'] = 'benutzerdefiniert...';
+$LANG['acl.full'] = 'Volle Rechte (ohne Zugriffs Verwaltung)';
+$LANG['acl.post'] = 'zustellen';
+$LANG['acl.read'] = 'lesen';
+$LANG['acl.read-only'] = 'Nur lesen';
+$LANG['acl.read-write'] = 'Lesen/Schreiben';
+$LANG['acl.semi-full'] = 'Schreibe neue Items';
+$LANG['acl.write'] = 'schreiben';
+$LANG['acl.l'] = 'Nachschlagen';
+$LANG['acl.r'] = 'Nachrichten lesen';
+$LANG['acl.s'] = 'Behalte Gelesen Status';
+$LANG['acl.w'] = 'Schreibe Kennzeichen';
+$LANG['acl.i'] = 'Einfügen (Kopiere in)';
+$LANG['acl.p'] = 'Zustellen';
+$LANG['acl.c'] = 'Erzeuge Unterordner';
+$LANG['acl.k'] = 'Erzeuge Unterordner';
+$LANG['acl.d'] = 'Nachricht löschen';
+$LANG['acl.t'] = 'Nachricht löschen';
+$LANG['acl.e'] = 'Löschen';
+$LANG['acl.x'] = 'Ordner löschen';
+$LANG['acl.a'] = 'Verwalten';
+$LANG['acl.n'] = 'Nachricht beschriften';
+$LANG['acl.identifier'] = 'Kennung';
+$LANG['acl.rights'] = 'Zugriffsrechte';
+$LANG['acl.expire'] = 'Läuft ab am';
+$LANG['acl.user'] = 'Benutzer...';
+$LANG['acl.anyone'] = 'Alle Benutzer (jeder)';
+$LANG['acl.anonymous'] = 'Gast (anonym)';
+$LANG['acl.error.invaliddate'] = 'Ungültiges Zeitformat';
+$LANG['acl.error.norights'] = 'Keine Zugriffsrechte angegeben!';
+$LANG['acl.error.subjectexists'] = 'Die Zugriffsrechte für die Kennung existieren bereits!';
+$LANG['acl.error.nouser'] = 'Benutzer Kennung nicht angegeben!';
+
 $LANG['add'] = 'Hinzufügen';
+
+$LANG['api.notypeid'] = 'Keine ID für den Objekt-Typen angegeben!';
+$LANG['api.invalidtypeid'] = 'Ungültige ID für den Objekt-Typ!';
+
 $LANG['attribute.add'] = 'Attribut hinzufügen';
+$LANG['attribute.default'] = 'Standard Wert';
 $LANG['attribute.static'] = 'Statischer Wert';
 $LANG['attribute.name'] = 'Attribut';
 $LANG['attribute.optional'] = 'Optional';
@@ -20,57 +111,94 @@
 $LANG['attribute.value.static'] = 'Statisch';
 $LANG['attribute.options'] = 'Optionen';
 $LANG['attribute.key.invalid'] = 'Der Typ-Key enthält unzulässige Zeichen!';
+$LANG['attribute.required.error'] = 'Benötigte Attribute fehlen in Attributliste ($1)!';
+$LANG['attribute.validate'] = 'Validierung';
+$LANG['attribute.validate.default'] = 'standard';
+$LANG['attribute.validate.none'] = 'keine';
+$LANG['attribute.validate.basic'] = 'einfach';
+$LANG['attribute.validate.extended'] = 'erweitert';
+
 $LANG['button.cancel'] = 'Abbrechen';
 $LANG['button.delete'] = 'Löschen';
+$LANG['button.ok'] = 'OK';
 $LANG['button.save'] = 'Speichern';
 $LANG['button.submit'] = 'Absenden';
+
 $LANG['creatorsname'] = 'Erstellt von';
 $LANG['days'] = 'Tage';
 $LANG['debug'] = 'Informationen zur Fehlerbehebung';
 $LANG['delete'] = 'Löschen';
 $LANG['deleting'] = 'Daten löschen…';
+
 $LANG['domain.add'] = 'Domäne hinzufügen';
 $LANG['domain.add.success'] = 'Domäne erfolgreich hinzugefügt.';
 $LANG['domain.associateddomain'] = 'Domänenname(n)';
+$LANG['domain.delete.confirm'] = 'Diese Domain wirklich löschen?';
+$LANG['domain.delete.force'] = "Benutzer sind mit dieser Domain verbunden.\nSind Sie sicher, dass Sie die Domain und alle zugehörigen Objekte löschen möchten?";
 $LANG['domain.delete.success'] = 'Domäne erfolgreich gelöscht.';
 $LANG['domain.edit'] = 'Domäne bearbeiten';
 $LANG['domain.edit.success'] = 'Domäne erfolgreich aktualisiert.';
-$LANG['domain.inetdomainbasedn'] = 'Benutzerdefinierte(s) Root DN(s)';
+$LANG['domain.inetdomainbasedn'] = 'Benutzerdefinierter Root DN';
+$LANG['domain.inetdomainstatus'] = 'Status';
 $LANG['domain.list'] = 'Domänenliste';
 $LANG['domain.norecords'] = 'Keine Domain-Einträge gefunden!';
 $LANG['domain.o'] = 'Organisation';
 $LANG['domain.other'] = 'Andere';
 $LANG['domain.system'] = 'System';
 $LANG['domain.type_id'] = 'Standarddomäne';
+
 $LANG['edit'] = 'Bearbeiten';
 $LANG['error'] = 'Fehler';
+
+$LANG['error.401'] = 'Nicht berechtigt.';
+$LANG['error.403'] = 'Zugriff verweigert.';
+$LANG['error.404'] = 'Objekt nicht gefunden.';
+$LANG['error.408'] = 'Zeitüberschreitung der Anfrage.';
+$LANG['error.450'] = 'Domain ist nicht leer.';
+$LANG['error.500'] = 'Interner Serverfehler.';
+$LANG['error.503'] = 'Service nicht verfügbar. Bitte versuchen Sie es später noch einmal.';
+
 $LANG['form.required.empty'] = 'Einige der erforderlichen Felder sind leer!';
 $LANG['form.maxcount.exceeded'] = 'Maximale Zahl der Felder erreicht!';
+
 $LANG['group.add'] = 'Gruppe hinzufügen';
 $LANG['group.add.success'] = 'Gruppe erfolgreich erstellt.';
 $LANG['group.cn'] = 'Common Name';
+$LANG['group.delete.confirm'] = 'Diese Gruppe wirklich löschen?';
 $LANG['group.delete.success'] = 'Gruppe erfolgreich gelöscht.';
 $LANG['group.edit.success'] = 'Gruppe erfolgreich aktualisiert.';
 $LANG['group.gidnumber'] = 'Primäre Gruppennummer';
+$LANG['group.kolaballowsmtprecipient'] = 'Liste von Adressaten';
+$LANG['group.kolaballowsmtpsender'] = 'Absender Zugriffsliste';
 $LANG['group.list'] = 'Gruppenliste';
 $LANG['group.mail'] = 'Primäre Email-Adresse';
 $LANG['group.member'] = 'Mitglied(er)';
 $LANG['group.memberurl'] = 'Mitglieder URL';
 $LANG['group.norecords'] = 'Keine Gruppeneinträge gefunden!';
 $LANG['group.other'] = 'Andere';
+$LANG['group.ou'] = 'Organisationseinheit';
 $LANG['group.system'] = 'System';
 $LANG['group.type_id'] = 'Gruppentyp';
 $LANG['group.uniquemember'] = 'Mitglieder';
+
 $LANG['info'] = 'Informationen';
 $LANG['internalerror'] = 'Interner Systemfehler!';
+
+$LANG['ldap.one'] = 'one: Alle Einträge ein Level unterhalb der Base DN';
+$LANG['ldap.sub'] = 'sub: Der ganze Unterzweig ab dem Base DN';
+$LANG['ldap.base'] = 'base: nur Base DN';
+$LANG['ldap.basedn'] = 'Base DN';
 $LANG['ldap.host'] = 'LDAP-Server';
 $LANG['ldap.conditions'] = 'Bedingungen';
+$LANG['ldap.scope'] = 'Geltungsbereich';
 $LANG['ldap.filter_any'] = 'ist nicht leer';
 $LANG['ldap.filter_both'] = 'enthält';
 $LANG['ldap.filter_prefix'] = 'beginnt mit';
 $LANG['ldap.filter_suffix'] = 'endet mit';
 $LANG['ldap.filter_exact'] = 'ist gleich';
+
 $LANG['list.records'] = '$1 zu $2 von $3';
+
 $LANG['loading'] = 'Laden…';
 $LANG['logout'] = 'Abmelden';
 $LANG['login.username'] = 'Benutzername:';

kolab-webadmin-3.2.1.tar.gz/lib/locale/en_US.php -> kolab-webadmin-3.2.2.tar.gz/lib/locale/en_US.php Changed

@@ -56,30 +56,26 @@
 $LANG['aci.selected'] = 'all selected';
 $LANG['aci.other'] = 'all except selected';
 
-$LANG['acl.all'] = 'all';
-$LANG['acl.append'] = 'append';
-$LANG['acl.custom'] = 'custom...';
+$LANG['acl.all'] = 'All';
+$LANG['acl.custom'] = 'Custom...';
 $LANG['acl.full'] = 'Full (without access control)';
-$LANG['acl.post'] = 'post';
-$LANG['acl.read'] = 'read';
 $LANG['acl.read-only'] = 'Read-Only';
 $LANG['acl.read-write'] = 'Read/Write';
 $LANG['acl.semi-full'] = 'Write new items';
-$LANG['acl.write'] = 'write';
-$LANG['acl.l'] = 'Lookup';
-$LANG['acl.r'] = 'Read messages';
-$LANG['acl.s'] = 'Keep Seen state';
-$LANG['acl.w'] = 'Write flags';
-$LANG['acl.i'] = 'Insert (Copy into)';
-$LANG['acl.p'] = 'Post';
-$LANG['acl.c'] = 'Create subfolders';
-$LANG['acl.k'] = 'Create subfolders';
-$LANG['acl.d'] = 'Delete messages';
-$LANG['acl.t'] = 'Delete messages';
-$LANG['acl.e'] = 'Expunge';
-$LANG['acl.x'] = 'Delete folder';
-$LANG['acl.a'] = 'Administer';
-$LANG['acl.n'] = 'Annotate messages';
+$LANG['acl.l'] = 'l - Lookup';
+$LANG['acl.r'] = 'r - Read messages';
+$LANG['acl.s'] = 's - Keep Seen state';
+$LANG['acl.w'] = 'w - Write flags';
+$LANG['acl.i'] = 'i - Insert (Copy into)';
+$LANG['acl.p'] = 'p - Post';
+$LANG['acl.c'] = 'c - Create subfolders';
+$LANG['acl.k'] = 'k - Create subfolders';
+$LANG['acl.d'] = 'd - Delete messages';
+$LANG['acl.t'] = 't - Delete messages';
+$LANG['acl.e'] = 'e - Expunge';
+$LANG['acl.x'] = 'x - Delete folder';
+$LANG['acl.a'] = 'a - Administer';
+$LANG['acl.n'] = 'n - Annotate messages';
 $LANG['acl.identifier'] = 'Identifier';
 $LANG['acl.rights'] = 'Access Rights';
 $LANG['acl.expire'] = 'Expires On';
@@ -338,6 +334,7 @@
 $LANG['type.domain'] = 'Domain';
 $LANG['type.edit.success'] = 'Object type updated successfully.';
 $LANG['type.group'] = 'Group';
+$LANG['type.is_default'] = 'Default';
 $LANG['type.list'] = 'Object Types List';
 $LANG['type.key'] = 'Key';
 $LANG['type.name'] = 'Name';

kolab-webadmin-3.2.1.tar.gz/lib/locale/es_ES.php -> kolab-webadmin-3.2.2.tar.gz/lib/locale/es_ES.php Changed

@@ -1,15 +1,107 @@
 <?php
+
 $LANG['about.community'] = 'Esta es la edición Community de Kolab Server.';
 $LANG['about.kolab'] = 'Kolab';
 $LANG['about.kolabsys'] = 'Kolab Systems';
 $LANG['about.support'] = 'Professional support is available from <a href="http://kolabsys.com">Kolab Systems</a>.';
 $LANG['about.technology'] = 'Tecnología';
 $LANG['about.warranty'] = 'Viene absolutamente sin ninguna garantia y normalmente se ejecuta sin ningun tipo de soporte. Puedes obetner ayuda y más información en el <a href="http://kolab.org">sitio web</a> de la comunidad y en el <a href="http://wiki.kolab.org">wiki</a>.';
+
+$LANG['aci.new'] = 'New...';
+$LANG['aci.edit'] = 'Edit...';
+$LANG['aci.remove'] = 'Remove';
+$LANG['aci.users'] = 'Usuarios';
+$LANG['aci.rights'] = 'Rights';
+$LANG['aci.targets'] = 'Targets';
+$LANG['aci.aciname'] = 'ACI name:';
+$LANG['aci.hosts'] = 'Hosts';
+$LANG['aci.times'] = 'Times';
+$LANG['aci.name'] = 'Nombre';
+$LANG['aci.userid'] = 'ID de usuario';
+$LANG['aci.email'] = 'Correo electrónico';
+$LANG['aci.read'] = 'Read';
+$LANG['aci.compare'] = 'Compare';
+$LANG['aci.search'] = 'Buscar';
+$LANG['aci.write'] = 'Write';
+$LANG['aci.selfwrite'] = 'Self-write';
+$LANG['aci.delete'] = 'Borrar';
+$LANG['aci.add'] = 'Añadir';
+$LANG['aci.proxy'] = 'Proxy';
+$LANG['aci.all'] = 'All rights';
+$LANG['aci.allow'] = 'Allow';
+$LANG['aci.deny'] = 'Deny';
+$LANG['aci.typeusers'] = 'Usuarios';
+$LANG['aci.typegroups'] = 'Grupos';
+$LANG['aci.typeroles'] = 'Roles';
+$LANG['aci.typeadmins'] = 'Administradores';
+$LANG['aci.typespecials'] = 'Special Rights';
+$LANG['aci.ldap-self'] = 'Self';
+$LANG['aci.ldap-anyone'] = 'All users';
+$LANG['aci.ldap-all'] = 'All authenticated users';
+$LANG['aci.ldap-parent'] = 'Parent';
+$LANG['aci.usersearch'] = 'Search for:';
+$LANG['aci.usersearchresult'] = 'Search results:';
+$LANG['aci.userselected'] = 'Selected users/groups/roles:';
+$LANG['aci.useradd'] = 'Añadir';
+$LANG['aci.userremove'] = 'Remove';
+$LANG['aci.error.noname'] = 'ACI rule name is required!';
+$LANG['aci.error.exists'] = 'ACI rule with specified name already exists!';
+$LANG['aci.error.nousers'] = 'At least one user entry is required!';
+$LANG['aci.rights.target'] = 'Target entry:';
+$LANG['aci.rights.filter'] = 'Filtro:';
+$LANG['aci.rights.attrs'] = 'Attributes:';
+$LANG['aci.checkall'] = 'Check all';
+$LANG['aci.checknone'] = 'Check none';
+$LANG['aci.thisentry'] = 'This entry';
+$LANG['aci.selected'] = 'all selected';
+$LANG['aci.other'] = 'all except selected';
+
+$LANG['acl.all'] = 'all';
+$LANG['acl.append'] = 'append';
+$LANG['acl.custom'] = 'custom...';
+$LANG['acl.full'] = 'Full (without access control)';
+$LANG['acl.post'] = 'post';
+$LANG['acl.read'] = 'read';
+$LANG['acl.read-only'] = 'Read-Only';
+$LANG['acl.read-write'] = 'Read/Write';
+$LANG['acl.semi-full'] = 'Write new items';
+$LANG['acl.write'] = 'write';
+$LANG['acl.l'] = 'Lookup';
+$LANG['acl.r'] = 'Read messages';
+$LANG['acl.s'] = 'Keep Seen state';
+$LANG['acl.w'] = 'Write flags';
+$LANG['acl.i'] = 'Insert (Copy into)';
+$LANG['acl.p'] = 'Post';
+$LANG['acl.c'] = 'Create subfolders';
+$LANG['acl.k'] = 'Create subfolders';
+$LANG['acl.d'] = 'Delete messages';
+$LANG['acl.t'] = 'Delete messages';
+$LANG['acl.e'] = 'Expunge';
+$LANG['acl.x'] = 'Delete folder';
+$LANG['acl.a'] = 'Administer';
+$LANG['acl.n'] = 'Annotate messages';
+$LANG['acl.identifier'] = 'Identifier';
+$LANG['acl.rights'] = 'Access Rights';
+$LANG['acl.expire'] = 'Expires On';
+$LANG['acl.user'] = 'User...';
+$LANG['acl.anyone'] = 'All users (anyone)';
+$LANG['acl.anonymous'] = 'Guests (anonymous)';
+$LANG['acl.error.invaliddate'] = 'Invalid date format!';
+$LANG['acl.error.norights'] = 'No access rights specified!';
+$LANG['acl.error.subjectexists'] = 'Access rights for specified identifier already exist!';
+$LANG['acl.error.nouser'] = 'User identifier not specified!';
+
 $LANG['add'] = 'Añadir';
+
+$LANG['api.notypeid'] = 'No object type ID specified!';
+$LANG['api.invalidtypeid'] = 'Invalid object type ID!';
+
 $LANG['attribute.add'] = 'Agregar atributo';
+$LANG['attribute.default'] = 'Default value';
 $LANG['attribute.static'] = 'Valor estático';
 $LANG['attribute.name'] = 'Atributo';
 $LANG['attribute.optional'] = 'Opcional';
+$LANG['attribute.maxcount'] = 'Max. count';
 $LANG['attribute.readonly'] = 'Solo-lectura';
 $LANG['attribute.type'] = 'Tipo de campo';
 $LANG['attribute.value'] = 'Valor';
@@ -18,62 +110,95 @@
 $LANG['attribute.value.normal'] = 'Normal';
 $LANG['attribute.value.static'] = 'Estático';
 $LANG['attribute.options'] = 'Opciones';
+$LANG['attribute.key.invalid'] = 'Type key contains forbidden characters!';
 $LANG['attribute.required.error'] = 'Faltan atributos requeridos en la lista de atributos ($1)!';
+$LANG['attribute.validate'] = ' Validation';
+$LANG['attribute.validate.default'] = 'default';
+$LANG['attribute.validate.none'] = 'none';
+$LANG['attribute.validate.basic'] = 'basic';
+$LANG['attribute.validate.extended'] = 'extended';
+
 $LANG['button.cancel'] = 'Cancelar';
 $LANG['button.delete'] = 'Borrar';
+$LANG['button.ok'] = 'OK';
 $LANG['button.save'] = 'Guardar';
 $LANG['button.submit'] = 'Enviar';
+
 $LANG['creatorsname'] = 'Creado por';
 $LANG['days'] = 'días';
 $LANG['debug'] = 'Información de depuración';
 $LANG['delete'] = 'Borrar';
 $LANG['deleting'] = 'Borrando datos...';
+
 $LANG['domain.add'] = 'Añadir dominio';
 $LANG['domain.add.success'] = 'Dominio añadido';
 $LANG['domain.associateddomain'] = 'Nombre(s) de dominio(s)';
+$LANG['domain.delete.confirm'] = 'Are you sure, you want to delete this domain?';
+$LANG['domain.delete.force'] = "There are users assigned to this domain.\nAre you sure, you want to delete this domain and all assigned objects?";
 $LANG['domain.delete.success'] = 'Dominio borrado correctamente';
 $LANG['domain.edit'] = 'Editar dominio';
 $LANG['domain.edit.success'] = 'Dominio actualizado';
-$LANG['domain.inetdomainbasedn'] = 'Custom Root DN(s)';
+$LANG['domain.inetdomainbasedn'] = 'Custom Root DN';
+$LANG['domain.inetdomainstatus'] = 'Status';
 $LANG['domain.list'] = 'Lista de dominios';
 $LANG['domain.norecords'] = 'No se encontraron registros de dominio!';
 $LANG['domain.o'] = 'Organización';
 $LANG['domain.other'] = 'Otro';
 $LANG['domain.system'] = 'Sistema';
 $LANG['domain.type_id'] = 'Dominio estandar';
+
 $LANG['edit'] = 'Editar';
 $LANG['error'] = 'Error';
+
+$LANG['error.401'] = 'Unauthorized.';
+$LANG['error.403'] = 'Access forbidden.';
+$LANG['error.404'] = 'Object not found.';
+$LANG['error.408'] = 'Request timeout.';
+$LANG['error.450'] = 'Domain is not empty.';
+$LANG['error.500'] = 'Internal server error.';
+$LANG['error.503'] = 'Service unavailable. Try again later.';
+
 $LANG['form.required.empty'] = '¡Alguno de los campos obligatorios está vacio!';
 $LANG['form.maxcount.exceeded'] = '¡Número máximo de elementos superado!';
+
 $LANG['group.add'] = 'Añadir grupo';
 $LANG['group.add.success'] = 'Grupo creado correctamente.';
 $LANG['group.cn'] = 'Nombre común';
+$LANG['group.delete.confirm'] = 'Are you sure, you want to delete this group?';
 $LANG['group.delete.success'] = 'Grupo borrado correctamente.';
 $LANG['group.edit.success'] = 'Grupo editado correctamente.';
 $LANG['group.gidnumber'] = 'Número de grupo primario';
+$LANG['group.kolaballowsmtprecipient'] = 'Lista de acceso del destinatario(s)';
+$LANG['group.kolaballowsmtpsender'] = 'Lista de acceso del remitente';
 $LANG['group.list'] = 'Lista de grupos';
 $LANG['group.mail'] = 'Dirección primario de correo electrónico';
 $LANG['group.member'] = 'Miembros(s)';
 $LANG['group.memberurl'] = 'URL de Miembros';
 $LANG['group.norecords'] = '¡No se han encontrado registro(s) de recursos¡';
 $LANG['group.other'] = 'Otro';
+$LANG['group.ou'] = 'Unidad organizativa';
 $LANG['group.system'] = 'Sistema';
 $LANG['group.type_id'] = 'Tipo de grupo';
 $LANG['group.uniquemember'] = 'Miembros';
+
 $LANG['info'] = 'Información';
 $LANG['internalerror'] = '¡Error interno del sistema!';
+
 $LANG['ldap.one'] = 'one: todas las entradas un nivel debajo del DN base';
 $LANG['ldap.sub'] = 'sub: todo el sub-árbol comenzando con el DN base';
 $LANG['ldap.base'] = 'base: solo el DN base';
 $LANG['ldap.basedn'] = 'DN Base';
 $LANG['ldap.host'] = 'Servidor LDAP';
 $LANG['ldap.conditions'] = 'Condiciones';
+$LANG['ldap.scope'] = 'Scope';
 $LANG['ldap.filter_any'] = 'no esta vacío';
 $LANG['ldap.filter_both'] = 'contiene';
 $LANG['ldap.filter_prefix'] = 'comienza con';
 $LANG['ldap.filter_suffix'] = 'acaba por';
 $LANG['ldap.filter_exact'] = 'es igual a';
+

kolab-webadmin-3.2.1.tar.gz/lib/locale/et_EE.php -> kolab-webadmin-3.2.2.tar.gz/lib/locale/et_EE.php Changed

@@ -1,21 +1,444 @@
 <?php
+
+$LANG['about.community'] = 'This is the Community Edition of the Kolab Server.';
+$LANG['about.kolab'] = 'Kolab';
+$LANG['about.kolabsys'] = 'Kolab Systems';
+$LANG['about.support'] = 'Professional support is available from <a href="http://kolabsys.com">Kolab Systems</a>.';
 $LANG['about.technology'] = 'Tehnoloogia';
+$LANG['about.warranty'] = 'It comes with absolutely no warranties and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>.';
+
+$LANG['aci.new'] = 'New...';
+$LANG['aci.edit'] = 'Edit...';
+$LANG['aci.remove'] = 'Remove';
+$LANG['aci.users'] = 'Kasutajad';
+$LANG['aci.rights'] = 'Rights';
+$LANG['aci.targets'] = 'Targets';
+$LANG['aci.aciname'] = 'ACI name:';
+$LANG['aci.hosts'] = 'Hosts';
+$LANG['aci.times'] = 'Times';
+$LANG['aci.name'] = 'Nimi';
+$LANG['aci.userid'] = 'User ID';
+$LANG['aci.email'] = 'E-mail';
+$LANG['aci.read'] = 'Read';
+$LANG['aci.compare'] = 'Compare';
+$LANG['aci.search'] = 'Search';
+$LANG['aci.write'] = 'Write';
+$LANG['aci.selfwrite'] = 'Self-write';
+$LANG['aci.delete'] = 'Kustuta';
+$LANG['aci.add'] = 'Lisa';
+$LANG['aci.proxy'] = 'Proxy';
+$LANG['aci.all'] = 'All rights';
+$LANG['aci.allow'] = 'Allow';
+$LANG['aci.deny'] = 'Deny';
+$LANG['aci.typeusers'] = 'Kasutajad';
+$LANG['aci.typegroups'] = 'Groups';
+$LANG['aci.typeroles'] = 'Roles';
+$LANG['aci.typeadmins'] = 'Administraatorid';
+$LANG['aci.typespecials'] = 'Special Rights';
+$LANG['aci.ldap-self'] = 'Self';
+$LANG['aci.ldap-anyone'] = 'All users';
+$LANG['aci.ldap-all'] = 'All authenticated users';
+$LANG['aci.ldap-parent'] = 'Parent';
+$LANG['aci.usersearch'] = 'Search for:';
+$LANG['aci.usersearchresult'] = 'Search results:';
+$LANG['aci.userselected'] = 'Selected users/groups/roles:';
+$LANG['aci.useradd'] = 'Lisa';
+$LANG['aci.userremove'] = 'Remove';
+$LANG['aci.error.noname'] = 'ACI rule name is required!';
+$LANG['aci.error.exists'] = 'ACI rule with specified name already exists!';
+$LANG['aci.error.nousers'] = 'At least one user entry is required!';
+$LANG['aci.rights.target'] = 'Target entry:';
+$LANG['aci.rights.filter'] = 'Filter:';
+$LANG['aci.rights.attrs'] = 'Attributes:';
+$LANG['aci.checkall'] = 'Check all';
+$LANG['aci.checknone'] = 'Check none';
+$LANG['aci.thisentry'] = 'This entry';
+$LANG['aci.selected'] = 'all selected';
+$LANG['aci.other'] = 'all except selected';
+
+$LANG['acl.all'] = 'all';
+$LANG['acl.append'] = 'append';
+$LANG['acl.custom'] = 'custom...';
+$LANG['acl.full'] = 'Full (without access control)';
+$LANG['acl.post'] = 'post';
+$LANG['acl.read'] = 'read';
+$LANG['acl.read-only'] = 'Read-Only';
+$LANG['acl.read-write'] = 'Read/Write';
+$LANG['acl.semi-full'] = 'Write new items';
+$LANG['acl.write'] = 'write';
+$LANG['acl.l'] = 'Lookup';
+$LANG['acl.r'] = 'Read messages';
+$LANG['acl.s'] = 'Keep Seen state';
+$LANG['acl.w'] = 'Write flags';
+$LANG['acl.i'] = 'Insert (Copy into)';
+$LANG['acl.p'] = 'Post';
+$LANG['acl.c'] = 'Create subfolders';
+$LANG['acl.k'] = 'Create subfolders';
+$LANG['acl.d'] = 'Delete messages';
+$LANG['acl.t'] = 'Delete messages';
+$LANG['acl.e'] = 'Expunge';
+$LANG['acl.x'] = 'Delete folder';
+$LANG['acl.a'] = 'Administer';
+$LANG['acl.n'] = 'Annotate messages';
+$LANG['acl.identifier'] = 'Identifier';
+$LANG['acl.rights'] = 'Access Rights';
+$LANG['acl.expire'] = 'Expires On';
+$LANG['acl.user'] = 'User...';
+$LANG['acl.anyone'] = 'All users (anyone)';
+$LANG['acl.anonymous'] = 'Guests (anonymous)';
+$LANG['acl.error.invaliddate'] = 'Invalid date format!';
+$LANG['acl.error.norights'] = 'No access rights specified!';
+$LANG['acl.error.subjectexists'] = 'Access rights for specified identifier already exist!';
+$LANG['acl.error.nouser'] = 'User identifier not specified!';
+
 $LANG['add'] = 'Lisa';
+
+$LANG['api.notypeid'] = 'No object type ID specified!';
+$LANG['api.invalidtypeid'] = 'Invalid object type ID!';
+
+$LANG['attribute.add'] = 'Add attribute';
+$LANG['attribute.default'] = 'Default value';
+$LANG['attribute.static'] = 'Static value';
+$LANG['attribute.name'] = 'Attribute';
+$LANG['attribute.optional'] = 'Optional';
+$LANG['attribute.maxcount'] = 'Max. count';
+$LANG['attribute.readonly'] = 'Read-only';
+$LANG['attribute.type'] = 'Field type';
+$LANG['attribute.value'] = 'Value';
+$LANG['attribute.value.auto'] = 'Generated';
+$LANG['attribute.value.auto-readonly'] = 'Generated (read-only)';
+$LANG['attribute.value.normal'] = 'Normal';
+$LANG['attribute.value.static'] = 'Static';
+$LANG['attribute.options'] = 'Options';
+$LANG['attribute.key.invalid'] = 'Type key contains forbidden characters!';
+$LANG['attribute.required.error'] = 'Required attributes missing in attributes list ($1)!';
+$LANG['attribute.validate'] = ' Validation';
+$LANG['attribute.validate.default'] = 'default';
+$LANG['attribute.validate.none'] = 'none';
+$LANG['attribute.validate.basic'] = 'basic';
+$LANG['attribute.validate.extended'] = 'extended';
+
+$LANG['button.cancel'] = 'Cancel';
 $LANG['button.delete'] = 'Kustuta';
+$LANG['button.ok'] = 'OK';
 $LANG['button.save'] = 'Salvesta';
+$LANG['button.submit'] = 'Submit';
+
+$LANG['creatorsname'] = 'Created by';
+$LANG['days'] = 'days';
+$LANG['debug'] = 'Debug info';
 $LANG['delete'] = 'Kustuta';
+$LANG['deleting'] = 'Deleting data...';
+
+$LANG['domain.add'] = 'Add Domain';
+$LANG['domain.add.success'] = 'Domain created successfully.';
+$LANG['domain.associateddomain'] = 'Domain name(s)';
+$LANG['domain.delete.confirm'] = 'Are you sure, you want to delete this domain?';
+$LANG['domain.delete.force'] = "There are users assigned to this domain.\nAre you sure, you want to delete this domain and all assigned objects?";
+$LANG['domain.delete.success'] = 'Domain deleted successfully.';
+$LANG['domain.edit'] = 'Edit domain';
+$LANG['domain.edit.success'] = 'Domain updated successfully.';
+$LANG['domain.inetdomainbasedn'] = 'Custom Root DN';
+$LANG['domain.inetdomainstatus'] = 'Status';
+$LANG['domain.list'] = 'Domains List';
+$LANG['domain.norecords'] = 'No domain records found!';
+$LANG['domain.o'] = 'Organization';
+$LANG['domain.other'] = 'Other';
+$LANG['domain.system'] = 'System';
+$LANG['domain.type_id'] = 'Standard Domain';
+
+$LANG['edit'] = 'Edit';
+$LANG['error'] = 'Error';
+
+$LANG['error.401'] = 'Unauthorized.';
+$LANG['error.403'] = 'Access forbidden.';
+$LANG['error.404'] = 'Object not found.';
+$LANG['error.408'] = 'Request timeout.';
+$LANG['error.450'] = 'Domain is not empty.';
+$LANG['error.500'] = 'Internal server error.';
+$LANG['error.503'] = 'Service unavailable. Try again later.';
+
+$LANG['form.required.empty'] = 'Some of the required fields are empty!';
+$LANG['form.maxcount.exceeded'] = 'Maximum count of items exceeded!';
+
+$LANG['group.add'] = 'Add Group';
+$LANG['group.add.success'] = 'Group created successfully.';
+$LANG['group.cn'] = 'Common name';
+$LANG['group.delete.confirm'] = 'Are you sure, you want to delete this group?';
+$LANG['group.delete.success'] = 'Group deleted successfully.';
+$LANG['group.edit.success'] = 'Group updated successfully.';
+$LANG['group.gidnumber'] = 'Primary group number';
+$LANG['group.kolaballowsmtprecipient'] = 'Recipient(s) Access List';
+$LANG['group.kolaballowsmtpsender'] = 'Sender Access List';
+$LANG['group.list'] = 'Groups List';
 $LANG['group.mail'] = 'Peamine e-posti aadress';
+$LANG['group.member'] = 'Member(s)';
+$LANG['group.memberurl'] = 'Members URL';
+$LANG['group.norecords'] = 'No group records found!';
+$LANG['group.other'] = 'Other';
+$LANG['group.ou'] = 'Organizational Unit';
+$LANG['group.system'] = 'System';
+$LANG['group.type_id'] = 'Group type';
 $LANG['group.uniquemember'] = 'Liikmed';
+
+$LANG['info'] = 'Information';
+$LANG['internalerror'] = 'Internal system error!';
+
+$LANG['ldap.one'] = 'one: all entries one level under the base DN';
+$LANG['ldap.sub'] = 'sub: whole subtree starting with the base DN';
+$LANG['ldap.base'] = 'base: base DN only';
+$LANG['ldap.basedn'] = 'Base DN';
+$LANG['ldap.host'] = 'LDAP Server';
+$LANG['ldap.conditions'] = 'Conditions';
+$LANG['ldap.scope'] = 'Scope';
+$LANG['ldap.filter_any'] = 'is non-empty';
+$LANG['ldap.filter_both'] = 'contains';
+$LANG['ldap.filter_prefix'] = 'starts with';
+$LANG['ldap.filter_suffix'] = 'ends with';
+$LANG['ldap.filter_exact'] = 'is equal to';
+

kolab-webadmin-3.2.1.tar.gz/lib/locale/fi_FI.php -> kolab-webadmin-3.2.2.tar.gz/lib/locale/fi_FI.php Changed

@@ -1,39 +1,204 @@
 <?php
+
 $LANG['about.community'] = 'Tämä on Kolab-palvelimen yhteisöversio.';
 $LANG['about.kolab'] = 'Kolab';
+$LANG['about.kolabsys'] = 'Kolab Systems';
 $LANG['about.support'] = 'Kaupallista tukea tarjoaa <a href="http://kolabsys.com">Kolab Systems</a>.';
+$LANG['about.technology'] = 'Technology';
 $LANG['about.warranty'] = 'Se ei sisällä minkäänlaista takuuta, ja tuki on yleensä hoidettava itse. Apua ja ohjeita on saatavilla yhteisön <a href="http://kolab.org">verkkosivustolta</a> sekä <a href="http://wiki.kolab.org">wikistä</a>.';
+
+$LANG['aci.new'] = 'New...';
+$LANG['aci.edit'] = 'Edit...';
+$LANG['aci.remove'] = 'Poista';
+$LANG['aci.users'] = 'Käyttäjät';
+$LANG['aci.rights'] = 'Rights';
+$LANG['aci.targets'] = 'Targets';
+$LANG['aci.aciname'] = 'ACI name:';
+$LANG['aci.hosts'] = 'Hosts';
+$LANG['aci.times'] = 'Times';
+$LANG['aci.name'] = 'Nimi';
+$LANG['aci.userid'] = 'User ID';
+$LANG['aci.email'] = 'E-mail';
+$LANG['aci.read'] = 'Read';
+$LANG['aci.compare'] = 'Compare';
+$LANG['aci.search'] = 'Etsi';
+$LANG['aci.write'] = 'Kirjoitus';
+$LANG['aci.selfwrite'] = 'Self-write';
+$LANG['aci.delete'] = 'Poista';
+$LANG['aci.add'] = 'Lisää';
+$LANG['aci.proxy'] = 'Proxy';
+$LANG['aci.all'] = 'All rights';
+$LANG['aci.allow'] = 'Allow';
+$LANG['aci.deny'] = 'Deny';
+$LANG['aci.typeusers'] = 'Käyttäjät';
+$LANG['aci.typegroups'] = 'Ryhmät';
+$LANG['aci.typeroles'] = 'Roolit';
+$LANG['aci.typeadmins'] = 'Administrators';
+$LANG['aci.typespecials'] = 'Special Rights';
+$LANG['aci.ldap-self'] = 'Self';
+$LANG['aci.ldap-anyone'] = 'All users';
+$LANG['aci.ldap-all'] = 'All authenticated users';
+$LANG['aci.ldap-parent'] = 'Parent';
+$LANG['aci.usersearch'] = 'Search for:';
+$LANG['aci.usersearchresult'] = 'Search results:';
+$LANG['aci.userselected'] = 'Selected users/groups/roles:';
+$LANG['aci.useradd'] = 'Lisää';
+$LANG['aci.userremove'] = 'Poista';
+$LANG['aci.error.noname'] = 'ACI rule name is required!';
+$LANG['aci.error.exists'] = 'ACI rule with specified name already exists!';
+$LANG['aci.error.nousers'] = 'At least one user entry is required!';
+$LANG['aci.rights.target'] = 'Target entry:';
+$LANG['aci.rights.filter'] = 'Filter:';
+$LANG['aci.rights.attrs'] = 'Attributes:';
+$LANG['aci.checkall'] = 'Check all';
+$LANG['aci.checknone'] = 'Check none';
+$LANG['aci.thisentry'] = 'This entry';
+$LANG['aci.selected'] = 'all selected';
+$LANG['aci.other'] = 'all except selected';
+
+$LANG['acl.all'] = 'all';
+$LANG['acl.append'] = 'append';
+$LANG['acl.custom'] = 'custom...';
+$LANG['acl.full'] = 'Full (without access control)';
+$LANG['acl.post'] = 'post';
+$LANG['acl.read'] = 'read';
+$LANG['acl.read-only'] = 'Read-Only';
+$LANG['acl.read-write'] = 'Read/Write';
+$LANG['acl.semi-full'] = 'Write new items';
+$LANG['acl.write'] = 'write';
+$LANG['acl.l'] = 'Lookup';
+$LANG['acl.r'] = 'Read messages';
+$LANG['acl.s'] = 'Keep Seen state';
+$LANG['acl.w'] = 'Write flags';
+$LANG['acl.i'] = 'Insert (Copy into)';
+$LANG['acl.p'] = 'Post';
+$LANG['acl.c'] = 'Create subfolders';
+$LANG['acl.k'] = 'Create subfolders';
+$LANG['acl.d'] = 'Delete messages';
+$LANG['acl.t'] = 'Delete messages';
+$LANG['acl.e'] = 'Expunge';
+$LANG['acl.x'] = 'Poista kansio';
+$LANG['acl.a'] = 'Administer';
+$LANG['acl.n'] = 'Annotate messages';
+$LANG['acl.identifier'] = 'Identifier';
+$LANG['acl.rights'] = 'Access Rights';
+$LANG['acl.expire'] = 'Expires On';
+$LANG['acl.user'] = 'User...';
+$LANG['acl.anyone'] = 'All users (anyone)';
+$LANG['acl.anonymous'] = 'Guests (anonymous)';
+$LANG['acl.error.invaliddate'] = 'Invalid date format!';
+$LANG['acl.error.norights'] = 'No access rights specified!';
+$LANG['acl.error.subjectexists'] = 'Access rights for specified identifier already exist!';
+$LANG['acl.error.nouser'] = 'User identifier not specified!';
+
 $LANG['add'] = 'Lisää';
+
+$LANG['api.notypeid'] = 'No object type ID specified!';
+$LANG['api.invalidtypeid'] = 'Invalid object type ID!';
+
+$LANG['attribute.add'] = 'Add attribute';
+$LANG['attribute.default'] = 'Oletusarvo';
+$LANG['attribute.static'] = 'Static value';
+$LANG['attribute.name'] = 'Attribute';
 $LANG['attribute.optional'] = 'Valinnainen';
+$LANG['attribute.maxcount'] = 'Max. count';
 $LANG['attribute.readonly'] = 'Vain luku';
 $LANG['attribute.type'] = 'Kentän tyyppi';
 $LANG['attribute.value'] = 'Arvo';
+$LANG['attribute.value.auto'] = 'Generated';
+$LANG['attribute.value.auto-readonly'] = 'Generated (read-only)';
+$LANG['attribute.value.normal'] = 'Normal';
+$LANG['attribute.value.static'] = 'Static';
 $LANG['attribute.options'] = 'Valinnat';
+$LANG['attribute.key.invalid'] = 'Type key contains forbidden characters!';
+$LANG['attribute.required.error'] = 'Required attributes missing in attributes list ($1)!';
+$LANG['attribute.validate'] = ' Validation';
+$LANG['attribute.validate.default'] = 'oletus';
+$LANG['attribute.validate.none'] = 'none';
+$LANG['attribute.validate.basic'] = 'basic';
+$LANG['attribute.validate.extended'] = 'extended';
+
 $LANG['button.cancel'] = 'Peru';
 $LANG['button.delete'] = 'Poista';
+$LANG['button.ok'] = 'OK';
 $LANG['button.save'] = 'Tallenna';
+$LANG['button.submit'] = 'Lähetä';
+
 $LANG['creatorsname'] = 'Luonut';
+$LANG['days'] = 'päivää';
+$LANG['debug'] = 'Debug info';
 $LANG['delete'] = 'Poista';
 $LANG['deleting'] = 'Poistetaan tietoja...';
+
 $LANG['domain.add'] = 'Lisää toimialue';
 $LANG['domain.add.success'] = 'Toimialue luotiin onnistuneesti.';
+$LANG['domain.associateddomain'] = 'Domain name(s)';
+$LANG['domain.delete.confirm'] = 'Are you sure, you want to delete this domain?';
+$LANG['domain.delete.force'] = "There are users assigned to this domain.\nAre you sure, you want to delete this domain and all assigned objects?";
 $LANG['domain.delete.success'] = 'Toimialue poistettu onnistuneesti.';
 $LANG['domain.edit'] = 'Muokkaa toimialuetta';
 $LANG['domain.edit.success'] = 'Toimialue päivitettiin onnistuneesti.';
+$LANG['domain.inetdomainbasedn'] = 'Custom Root DN';
+$LANG['domain.inetdomainstatus'] = 'Tila';
+$LANG['domain.list'] = 'Domains List';
+$LANG['domain.norecords'] = 'No domain records found!';
 $LANG['domain.o'] = 'Organisaatio';
+$LANG['domain.other'] = 'Muu';
+$LANG['domain.system'] = 'System';
+$LANG['domain.type_id'] = 'Standard Domain';
+
 $LANG['edit'] = 'Muokkaa';
 $LANG['error'] = 'Virhe';
+
+$LANG['error.401'] = 'Unauthorized.';
+$LANG['error.403'] = 'Access forbidden.';
+$LANG['error.404'] = 'Object not found.';
+$LANG['error.408'] = 'Request timeout.';
+$LANG['error.450'] = 'Domain is not empty.';
+$LANG['error.500'] = 'Internal server error.';
+$LANG['error.503'] = 'Service unavailable. Try again later.';
+
 $LANG['form.required.empty'] = 'Jotkin vaaditut kentät ovat tyhjiä!';
+$LANG['form.maxcount.exceeded'] = 'Maximum count of items exceeded!';
+
 $LANG['group.add'] = 'Lisää ryhmä';
 $LANG['group.add.success'] = 'Ryhmä luotiin onnistuneesti.';
+$LANG['group.cn'] = 'Common name';
+$LANG['group.delete.confirm'] = 'Are you sure, you want to delete this group?';
 $LANG['group.delete.success'] = 'Ryhmä poistettu onnistuneesti.';
 $LANG['group.edit.success'] = 'Ryhmä päivitetty onnistuneesti.';
+$LANG['group.gidnumber'] = 'Primary group number';
+$LANG['group.kolaballowsmtprecipient'] = 'Recipient(s) Access List';
+$LANG['group.kolaballowsmtpsender'] = 'Sender Access List';
+$LANG['group.list'] = 'Groups List';
 $LANG['group.mail'] = 'Ensisijainen sähköpostiosoite';
+$LANG['group.member'] = 'Member(s)';
+$LANG['group.memberurl'] = 'Members URL';
+$LANG['group.norecords'] = 'No group records found!';
+$LANG['group.other'] = 'Muu';
+$LANG['group.ou'] = 'Organisaatioyksikkö';
+$LANG['group.system'] = 'System';
 $LANG['group.type_id'] = 'Ryhmän tyyppi';
 $LANG['group.uniquemember'] = 'Jäsenet';
+
+$LANG['info'] = 'Information';
 $LANG['internalerror'] = 'Sisäinen järjestelmävirhe!';
+
+$LANG['ldap.one'] = 'one: all entries one level under the base DN';
+$LANG['ldap.sub'] = 'sub: whole subtree starting with the base DN';
+$LANG['ldap.base'] = 'base: base DN only';
+$LANG['ldap.basedn'] = 'Base DN';
 $LANG['ldap.host'] = 'LDAP-palvelin';
+$LANG['ldap.conditions'] = 'Conditions';
+$LANG['ldap.scope'] = 'Scope';
+$LANG['ldap.filter_any'] = 'is non-empty';
 $LANG['ldap.filter_both'] = 'sisältää';
+$LANG['ldap.filter_prefix'] = 'starts with';
+$LANG['ldap.filter_suffix'] = 'ends with';
+$LANG['ldap.filter_exact'] = 'is equal to';
+

kolab-webadmin-3.2.1.tar.gz/lib/locale/fr_FR.php -> kolab-webadmin-3.2.2.tar.gz/lib/locale/fr_FR.php Changed

@@ -1,12 +1,103 @@
 <?php
+
 $LANG['about.community'] = 'Ceci est l\'Edition Communautaire de Kolab Server.';
 $LANG['about.kolab'] = 'Kolab';
 $LANG['about.kolabsys'] = 'Kolab Systems';
 $LANG['about.support'] = 'Un support professionnel est disponible au près de <a href="http://kolabsys.com">Kolab Systems</a>.';
 $LANG['about.technology'] = 'Technologie';
 $LANG['about.warranty'] = 'Il est livré sans aucune garantie et généralement exécuté sous votre responsabilité. Vous pouvez trouver de l\'aide et des informations sur <a href="http://kolab.org">le site web communautaire</a> et sur <a href="http://wiki.kolab.org">le wiki</a>.';
+
+$LANG['aci.new'] = 'New...';
+$LANG['aci.edit'] = 'Edit...';
+$LANG['aci.remove'] = 'Supprimer';
+$LANG['aci.users'] = 'Utilisateurs';
+$LANG['aci.rights'] = 'Rights';
+$LANG['aci.targets'] = 'Targets';
+$LANG['aci.aciname'] = 'ACI name:';
+$LANG['aci.hosts'] = 'Hôtes';
+$LANG['aci.times'] = 'Times';
+$LANG['aci.name'] = 'Nom';
+$LANG['aci.userid'] = 'User ID';
+$LANG['aci.email'] = 'Adresse de messagerie';
+$LANG['aci.read'] = 'Read';
+$LANG['aci.compare'] = 'Compare';
+$LANG['aci.search'] = 'Chercher';
+$LANG['aci.write'] = 'Écriture';
+$LANG['aci.selfwrite'] = 'Self-write';
+$LANG['aci.delete'] = 'Supprimer';
+$LANG['aci.add'] = 'Ajouter';
+$LANG['aci.proxy'] = 'Proxy';
+$LANG['aci.all'] = 'All rights';
+$LANG['aci.allow'] = 'Allow';
+$LANG['aci.deny'] = 'Deny';
+$LANG['aci.typeusers'] = 'Utilisateurs';
+$LANG['aci.typegroups'] = 'Groupes';
+$LANG['aci.typeroles'] = 'Rôles';
+$LANG['aci.typeadmins'] = 'Administrateurs';
+$LANG['aci.typespecials'] = 'Special Rights';
+$LANG['aci.ldap-self'] = 'Self';
+$LANG['aci.ldap-anyone'] = 'All users';
+$LANG['aci.ldap-all'] = 'All authenticated users';
+$LANG['aci.ldap-parent'] = 'Parent';
+$LANG['aci.usersearch'] = 'Search for:';
+$LANG['aci.usersearchresult'] = 'Search results:';
+$LANG['aci.userselected'] = 'Selected users/groups/roles:';
+$LANG['aci.useradd'] = 'Ajouter';
+$LANG['aci.userremove'] = 'Supprimer';
+$LANG['aci.error.noname'] = 'ACI rule name is required!';
+$LANG['aci.error.exists'] = 'ACI rule with specified name already exists!';
+$LANG['aci.error.nousers'] = 'At least one user entry is required!';
+$LANG['aci.rights.target'] = 'Target entry:';
+$LANG['aci.rights.filter'] = 'Filtre :';
+$LANG['aci.rights.attrs'] = 'Attributes:';
+$LANG['aci.checkall'] = 'Check all';
+$LANG['aci.checknone'] = 'Check none';
+$LANG['aci.thisentry'] = 'This entry';
+$LANG['aci.selected'] = 'all selected';
+$LANG['aci.other'] = 'all except selected';
+
+$LANG['acl.all'] = 'all';
+$LANG['acl.append'] = 'append';
+$LANG['acl.custom'] = 'custom...';
+$LANG['acl.full'] = 'Full (without access control)';
+$LANG['acl.post'] = 'post';
+$LANG['acl.read'] = 'read';
+$LANG['acl.read-only'] = 'Read-Only';
+$LANG['acl.read-write'] = 'Read/Write';
+$LANG['acl.semi-full'] = 'Write new items';
+$LANG['acl.write'] = 'write';
+$LANG['acl.l'] = 'Lookup';
+$LANG['acl.r'] = 'Read messages';
+$LANG['acl.s'] = 'Keep Seen state';
+$LANG['acl.w'] = 'Write flags';
+$LANG['acl.i'] = 'Insert (Copy into)';
+$LANG['acl.p'] = 'Post';
+$LANG['acl.c'] = 'Create subfolders';
+$LANG['acl.k'] = 'Create subfolders';
+$LANG['acl.d'] = 'Delete messages';
+$LANG['acl.t'] = 'Delete messages';
+$LANG['acl.e'] = 'Expunge';
+$LANG['acl.x'] = 'Supprimer le répertoire';
+$LANG['acl.a'] = 'Administer';
+$LANG['acl.n'] = 'Annotate messages';
+$LANG['acl.identifier'] = 'Identifier';
+$LANG['acl.rights'] = 'Access Rights';
+$LANG['acl.expire'] = 'Expires On';
+$LANG['acl.user'] = 'User...';
+$LANG['acl.anyone'] = 'All users (anyone)';
+$LANG['acl.anonymous'] = 'Guests (anonymous)';
+$LANG['acl.error.invaliddate'] = 'Invalid date format!';
+$LANG['acl.error.norights'] = 'No access rights specified!';
+$LANG['acl.error.subjectexists'] = 'Access rights for specified identifier already exist!';
+$LANG['acl.error.nouser'] = 'User identifier not specified!';
+
 $LANG['add'] = 'Ajouter';
+
+$LANG['api.notypeid'] = 'No object type ID specified!';
+$LANG['api.invalidtypeid'] = 'Invalid object type ID!';
+
 $LANG['attribute.add'] = 'Ajouter un attribut';
+$LANG['attribute.default'] = 'Valeur par défaut';
 $LANG['attribute.static'] = 'Valeure statique';
 $LANG['attribute.name'] = 'Attribut';
 $LANG['attribute.optional'] = 'Optionel';
@@ -21,49 +112,78 @@
 $LANG['attribute.options'] = 'Options';
 $LANG['attribute.key.invalid'] = 'La clé contient des caractères invalides!';
 $LANG['attribute.required.error'] = 'Certains attributs obligatoires manquent dans la liste ($1)!';
+$LANG['attribute.validate'] = 'Validation';
+$LANG['attribute.validate.default'] = 'default';
+$LANG['attribute.validate.none'] = 'none';
+$LANG['attribute.validate.basic'] = 'basique';
+$LANG['attribute.validate.extended'] = 'extended';
+
 $LANG['button.cancel'] = 'Annuler';
 $LANG['button.delete'] = 'Supprimer';
+$LANG['button.ok'] = 'OK';
 $LANG['button.save'] = 'Enregistrer';
 $LANG['button.submit'] = 'Envoyer';
+
 $LANG['creatorsname'] = 'Créé par';
 $LANG['days'] = 'jours';
 $LANG['debug'] = 'Debug info';
 $LANG['delete'] = 'Supprimer';
 $LANG['deleting'] = 'Suppression des données...';
+
 $LANG['domain.add'] = 'Ajouter un domaine';
 $LANG['domain.add.success'] = 'Domaine créé. N\'oubliez pas d\'ajouter le nouveau domaine dans /etc/kolab/kolab.conf Voir chapitre 11 dans le Guide de l\'Administrateur.';
 $LANG['domain.associateddomain'] = 'Nom du(des) domaine(s)';
+$LANG['domain.delete.confirm'] = 'Are you sure, you want to delete this domain?';
+$LANG['domain.delete.force'] = "There are users assigned to this domain.\nAre you sure, you want to delete this domain and all assigned objects?";
 $LANG['domain.delete.success'] = 'Domaine supprimé.';
 $LANG['domain.edit'] = 'Modifier le Domaine';
 $LANG['domain.edit.success'] = 'Domaine modifié.';
-$LANG['domain.inetdomainbasedn'] = 'Racine personnalisée (DN)';
+$LANG['domain.inetdomainbasedn'] = 'Custom Root DN';
+$LANG['domain.inetdomainstatus'] = 'Statut';
 $LANG['domain.list'] = 'Liste des Domaines';
 $LANG['domain.norecords'] = 'Pas de domaine trouvé!';
 $LANG['domain.o'] = 'Organisation';
 $LANG['domain.other'] = 'Autre';
 $LANG['domain.system'] = 'Système';
 $LANG['domain.type_id'] = 'Domaine Standard';
+
 $LANG['edit'] = 'Modifier';
 $LANG['error'] = 'Erreur';
+
+$LANG['error.401'] = 'Unauthorized.';
+$LANG['error.403'] = 'Access forbidden.';
+$LANG['error.404'] = 'Object not found.';
+$LANG['error.408'] = 'Request timeout.';
+$LANG['error.450'] = 'Domain is not empty.';
+$LANG['error.500'] = 'Internal server error.';
+$LANG['error.503'] = 'Service unavailable. Try again later.';
+
 $LANG['form.required.empty'] = 'Certains champs obligatoires sont vides!';
 $LANG['form.maxcount.exceeded'] = 'Le nombre maximum d\'objet est dépassé!';
+
 $LANG['group.add'] = 'Ajouter Groupe';
 $LANG['group.add.success'] = 'Groupe créé.';
 $LANG['group.cn'] = 'Nom';
+$LANG['group.delete.confirm'] = 'Are you sure, you want to delete this group?';
 $LANG['group.delete.success'] = 'Groupe supprimé.';
 $LANG['group.edit.success'] = 'Group modifié.';
 $LANG['group.gidnumber'] = 'Numéro de groupe principal';
+$LANG['group.kolaballowsmtprecipient'] = 'Liste d\'accès destinataire(s)';
+$LANG['group.kolaballowsmtpsender'] = 'Liste d\'accès expéditeur';
 $LANG['group.list'] = 'Liste des Groups';
 $LANG['group.mail'] = 'Adresse courriel principale';
 $LANG['group.member'] = 'Membre(s)';
 $LANG['group.memberurl'] = 'Membees URL';
 $LANG['group.norecords'] = 'Pas de groupes trouvés!';
 $LANG['group.other'] = 'Autre';
+$LANG['group.ou'] = 'Unité Organisationelle';
 $LANG['group.system'] = 'Système';
 $LANG['group.type_id'] = 'Type de groupe';
 $LANG['group.uniquemember'] = 'Membre';
+
 $LANG['info'] = 'Information';
 $LANG['internalerror'] = 'Erreur système interne!';
+
 $LANG['ldap.one'] = 'one: Toutes les entrées de niveau 1 à la base du DN';
 $LANG['ldap.sub'] = 'sub: Tous les sous-ensembles commençant à la base du DN';
 $LANG['ldap.base'] = 'base: base DN seulement';
@@ -76,7 +196,9 @@
 $LANG['ldap.filter_prefix'] = 'commence par';
 $LANG['ldap.filter_suffix'] = 'finit par';
 $LANG['ldap.filter_exact'] = 'est égal à';
+
 $LANG['list.records'] = '$1 to $2 of $3';
+
 $LANG['loading'] = 'Chargement...';
 $LANG['logout'] = 'Déconnexion';
 $LANG['login.username'] = 'Nom d\'Utilisateur:';
@@ -85,42 +207,72 @@
 $LANG['login.login'] = 'Se connecter';
 $LANG['loginerror'] = 'Nom d\'utilisateur ou mot de passe incorrect!';
 $LANG['MB'] = 'MB';
+
 $LANG['menu.about'] = 'A propos';

kolab-webadmin-3.2.1.tar.gz/lib/locale/it_IT.php -> kolab-webadmin-3.2.2.tar.gz/lib/locale/it_IT.php Changed

@@ -1,69 +1,444 @@
 <?php
+
 $LANG['about.community'] = 'Questo è Kolab Server in Versione Comunitaria.';
+$LANG['about.kolab'] = 'Kolab';
+$LANG['about.kolabsys'] = 'Kolab Systems';
 $LANG['about.support'] = 'È disponibile il supporto professionale di <a href="http://kolabsys.com">Kolab Systems</a>.';
+$LANG['about.technology'] = 'Technology';
+$LANG['about.warranty'] = 'It comes with absolutely no warranties and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>.';
+
+$LANG['aci.new'] = 'New...';
+$LANG['aci.edit'] = 'Edit...';
+$LANG['aci.remove'] = 'Elimina';
+$LANG['aci.users'] = 'Utenti';
+$LANG['aci.rights'] = 'Rights';
+$LANG['aci.targets'] = 'Targets';
+$LANG['aci.aciname'] = 'ACI name:';
+$LANG['aci.hosts'] = 'Hosts';
+$LANG['aci.times'] = 'Times';
+$LANG['aci.name'] = 'Nome';
+$LANG['aci.userid'] = 'User ID';
+$LANG['aci.email'] = 'E-mail';
+$LANG['aci.read'] = 'Read';
+$LANG['aci.compare'] = 'Compare';
+$LANG['aci.search'] = 'Search';
+$LANG['aci.write'] = 'Scrittura';
+$LANG['aci.selfwrite'] = 'Self-write';
+$LANG['aci.delete'] = 'Elimina';
+$LANG['aci.add'] = 'Add';
+$LANG['aci.proxy'] = 'Proxy';
+$LANG['aci.all'] = 'All rights';
+$LANG['aci.allow'] = 'Allow';
+$LANG['aci.deny'] = 'Deny';
+$LANG['aci.typeusers'] = 'Utenti';
+$LANG['aci.typegroups'] = 'Gruppi';
+$LANG['aci.typeroles'] = 'Roles';
+$LANG['aci.typeadmins'] = 'Administrators';
+$LANG['aci.typespecials'] = 'Special Rights';
+$LANG['aci.ldap-self'] = 'Self';
+$LANG['aci.ldap-anyone'] = 'All users';
+$LANG['aci.ldap-all'] = 'All authenticated users';
+$LANG['aci.ldap-parent'] = 'Parent';
+$LANG['aci.usersearch'] = 'Search for:';
+$LANG['aci.usersearchresult'] = 'Search results:';
+$LANG['aci.userselected'] = 'Selected users/groups/roles:';
+$LANG['aci.useradd'] = 'Add';
+$LANG['aci.userremove'] = 'Elimina';
+$LANG['aci.error.noname'] = 'ACI rule name is required!';
+$LANG['aci.error.exists'] = 'ACI rule with specified name already exists!';
+$LANG['aci.error.nousers'] = 'At least one user entry is required!';
+$LANG['aci.rights.target'] = 'Target entry:';
+$LANG['aci.rights.filter'] = 'Filter:';
+$LANG['aci.rights.attrs'] = 'Attributes:';
+$LANG['aci.checkall'] = 'Check all';
+$LANG['aci.checknone'] = 'Check none';
+$LANG['aci.thisentry'] = 'This entry';
+$LANG['aci.selected'] = 'all selected';
+$LANG['aci.other'] = 'all except selected';
+
+$LANG['acl.all'] = 'all';
+$LANG['acl.append'] = 'append';
+$LANG['acl.custom'] = 'custom...';
+$LANG['acl.full'] = 'Full (without access control)';
+$LANG['acl.post'] = 'post';
+$LANG['acl.read'] = 'read';
+$LANG['acl.read-only'] = 'Read-Only';
+$LANG['acl.read-write'] = 'Read/Write';
+$LANG['acl.semi-full'] = 'Write new items';
+$LANG['acl.write'] = 'write';
+$LANG['acl.l'] = 'Lookup';
+$LANG['acl.r'] = 'Read messages';
+$LANG['acl.s'] = 'Keep Seen state';
+$LANG['acl.w'] = 'Write flags';
+$LANG['acl.i'] = 'Insert (Copy into)';
+$LANG['acl.p'] = 'Post';
+$LANG['acl.c'] = 'Create subfolders';
+$LANG['acl.k'] = 'Create subfolders';
+$LANG['acl.d'] = 'Delete messages';
+$LANG['acl.t'] = 'Delete messages';
+$LANG['acl.e'] = 'Expunge';
+$LANG['acl.x'] = 'Elimina cartella';
+$LANG['acl.a'] = 'Administer';
+$LANG['acl.n'] = 'Annotate messages';
+$LANG['acl.identifier'] = 'Identifier';
+$LANG['acl.rights'] = 'Access Rights';
+$LANG['acl.expire'] = 'Expires On';
+$LANG['acl.user'] = 'User...';
+$LANG['acl.anyone'] = 'All users (anyone)';
+$LANG['acl.anonymous'] = 'Guests (anonymous)';
+$LANG['acl.error.invaliddate'] = 'Invalid date format!';
+$LANG['acl.error.norights'] = 'No access rights specified!';
+$LANG['acl.error.subjectexists'] = 'Access rights for specified identifier already exist!';
+$LANG['acl.error.nouser'] = 'User identifier not specified!';
+
+$LANG['add'] = 'Add';
+
+$LANG['api.notypeid'] = 'No object type ID specified!';
+$LANG['api.invalidtypeid'] = 'Invalid object type ID!';
+
+$LANG['attribute.add'] = 'Add attribute';
+$LANG['attribute.default'] = 'Default value';
+$LANG['attribute.static'] = 'Static value';
+$LANG['attribute.name'] = 'Attribute';
 $LANG['attribute.optional'] = 'Facoltativo';
+$LANG['attribute.maxcount'] = 'Max. count';
+$LANG['attribute.readonly'] = 'Sola lettura';
+$LANG['attribute.type'] = 'Field type';
+$LANG['attribute.value'] = 'Valore';
+$LANG['attribute.value.auto'] = 'Generated';
+$LANG['attribute.value.auto-readonly'] = 'Generated (read-only)';
+$LANG['attribute.value.normal'] = 'Normal';
+$LANG['attribute.value.static'] = 'Static';
+$LANG['attribute.options'] = 'Options';
+$LANG['attribute.key.invalid'] = 'Type key contains forbidden characters!';
+$LANG['attribute.required.error'] = 'Required attributes missing in attributes list ($1)!';
+$LANG['attribute.validate'] = ' Validation';
+$LANG['attribute.validate.default'] = 'default';
+$LANG['attribute.validate.none'] = 'none';
+$LANG['attribute.validate.basic'] = 'basic';
+$LANG['attribute.validate.extended'] = 'extended';
+
 $LANG['button.cancel'] = 'Annulla';
+$LANG['button.delete'] = 'Elimina';
+$LANG['button.ok'] = 'OK';
 $LANG['button.save'] = 'Salva';
+$LANG['button.submit'] = 'Submit';
+
 $LANG['creatorsname'] = 'Creato da';
 $LANG['days'] = 'giorni';
 $LANG['debug'] = 'Informazioni di debug';
+$LANG['delete'] = 'Elimina';
 $LANG['deleting'] = 'Eliminazione dati...';
+
 $LANG['domain.add'] = 'Aggiungi Dominio';
 $LANG['domain.add.success'] = 'Dominio creato con successo.';
 $LANG['domain.associateddomain'] = 'Nome/i dominio';
+$LANG['domain.delete.confirm'] = 'Are you sure, you want to delete this domain?';
+$LANG['domain.delete.force'] = "There are users assigned to this domain.\nAre you sure, you want to delete this domain and all assigned objects?";
+$LANG['domain.delete.success'] = 'Domain deleted successfully.';
 $LANG['domain.edit'] = 'Modifica dominio';
 $LANG['domain.edit.success'] = 'Dominio aggiornato con successo.';
+$LANG['domain.inetdomainbasedn'] = 'Custom Root DN';
+$LANG['domain.inetdomainstatus'] = 'Stato';
 $LANG['domain.list'] = 'Lista Domini';
+$LANG['domain.norecords'] = 'No domain records found!';
+$LANG['domain.o'] = 'Organization';
 $LANG['domain.other'] = 'Altro';
 $LANG['domain.system'] = 'Sistema';
 $LANG['domain.type_id'] = 'Dominio Standard';
+
 $LANG['edit'] = 'Modifica';
 $LANG['error'] = 'Errore';
+
+$LANG['error.401'] = 'Unauthorized.';
+$LANG['error.403'] = 'Access forbidden.';
+$LANG['error.404'] = 'Object not found.';
+$LANG['error.408'] = 'Request timeout.';
+$LANG['error.450'] = 'Domain is not empty.';
+$LANG['error.500'] = 'Internal server error.';
+$LANG['error.503'] = 'Service unavailable. Try again later.';
+
 $LANG['form.required.empty'] = 'Alcuni dei campi richiesti sono vuoti!';
+$LANG['form.maxcount.exceeded'] = 'Maximum count of items exceeded!';
+
 $LANG['group.add'] = 'Aggiungi Gruppo';
 $LANG['group.add.success'] = 'Gruppo creato con successo.';
 $LANG['group.cn'] = 'Nome comune';
+$LANG['group.delete.confirm'] = 'Are you sure, you want to delete this group?';
 $LANG['group.delete.success'] = 'Gruppo eliminato con successo.';
 $LANG['group.edit.success'] = 'Gruppo aggiornato con successo.';
+$LANG['group.gidnumber'] = 'Primary group number';
+$LANG['group.kolaballowsmtprecipient'] = 'Recipient(s) Access List';
+$LANG['group.kolaballowsmtpsender'] = 'Sender Access List';
 $LANG['group.list'] = 'Lista Gruppi';
 $LANG['group.mail'] = 'Indirizzo Email Principale';
 $LANG['group.member'] = 'Membro/i';
+$LANG['group.memberurl'] = 'Members URL';
+$LANG['group.norecords'] = 'No group records found!';
 $LANG['group.other'] = 'Altro';
+$LANG['group.ou'] = 'Organizational Unit';
 $LANG['group.system'] = 'Sistema';
 $LANG['group.type_id'] = 'Tipo di gruppo';
 $LANG['group.uniquemember'] = 'Membri';
+
+$LANG['info'] = 'Information';
+$LANG['internalerror'] = 'Internal system error!';
+
+$LANG['ldap.one'] = 'one: all entries one level under the base DN';
+$LANG['ldap.sub'] = 'sub: whole subtree starting with the base DN';
+$LANG['ldap.base'] = 'base: base DN only';
+$LANG['ldap.basedn'] = 'Base DN';
+$LANG['ldap.host'] = 'LDAP Server';
+$LANG['ldap.conditions'] = 'Conditions';
+$LANG['ldap.scope'] = 'Scope';
+$LANG['ldap.filter_any'] = 'is non-empty';
+$LANG['ldap.filter_both'] = 'contains';
+$LANG['ldap.filter_prefix'] = 'starts with';
+$LANG['ldap.filter_suffix'] = 'ends with';
+$LANG['ldap.filter_exact'] = 'is equal to';
+

kolab-webadmin-3.2.1.tar.gz/lib/locale/ja_JP.php -> kolab-webadmin-3.2.2.tar.gz/lib/locale/ja_JP.php Changed

@@ -1,12 +1,103 @@
 <?php
+
 $LANG['about.community'] = 'これはKolab Serverのコミュニティーエディションです。';
 $LANG['about.kolab'] = 'Kolab';
 $LANG['about.kolabsys'] = 'Kolab Systems';
 $LANG['about.support'] = '有償サポートは<a href="http://kolabsys.com">Kolab Systems</a>にて受付けております。';
 $LANG['about.technology'] = 'Technology';
 $LANG['about.warranty'] = '動作保証は全くなく、ユーザの自己責任により実行されます。 <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>にてヘルプやコミュニティの情報を得ることができます。';
+
+$LANG['aci.new'] = 'New...';
+$LANG['aci.edit'] = 'Edit...';
+$LANG['aci.remove'] = '削除';
+$LANG['aci.users'] = 'ユーザ';
+$LANG['aci.rights'] = 'Rights';
+$LANG['aci.targets'] = 'Targets';
+$LANG['aci.aciname'] = 'ACI name:';
+$LANG['aci.hosts'] = 'ホスト';
+$LANG['aci.times'] = 'Times';
+$LANG['aci.name'] = '名前';
+$LANG['aci.userid'] = 'ユーザ ID';
+$LANG['aci.email'] = 'E-mail';
+$LANG['aci.read'] = 'Read';
+$LANG['aci.compare'] = 'Compare';
+$LANG['aci.search'] = '検索';
+$LANG['aci.write'] = 'Write';
+$LANG['aci.selfwrite'] = 'Self-write';
+$LANG['aci.delete'] = '削除';
+$LANG['aci.add'] = '追加';
+$LANG['aci.proxy'] = 'Proxy';
+$LANG['aci.all'] = 'All rights';
+$LANG['aci.allow'] = 'Allow';
+$LANG['aci.deny'] = 'Deny';
+$LANG['aci.typeusers'] = 'ユーザ';
+$LANG['aci.typegroups'] = 'グループ';
+$LANG['aci.typeroles'] = '役割';
+$LANG['aci.typeadmins'] = 'Administrators';
+$LANG['aci.typespecials'] = 'Special Rights';
+$LANG['aci.ldap-self'] = 'Self';
+$LANG['aci.ldap-anyone'] = 'All users';
+$LANG['aci.ldap-all'] = 'All authenticated users';
+$LANG['aci.ldap-parent'] = 'Parent';
+$LANG['aci.usersearch'] = 'Search for:';
+$LANG['aci.usersearchresult'] = 'Search results:';
+$LANG['aci.userselected'] = 'Selected users/groups/roles:';
+$LANG['aci.useradd'] = '追加';
+$LANG['aci.userremove'] = '削除';
+$LANG['aci.error.noname'] = 'ACI rule name is required!';
+$LANG['aci.error.exists'] = 'ACI rule with specified name already exists!';
+$LANG['aci.error.nousers'] = 'At least one user entry is required!';
+$LANG['aci.rights.target'] = 'Target entry:';
+$LANG['aci.rights.filter'] = 'Filter:';
+$LANG['aci.rights.attrs'] = 'Attributes:';
+$LANG['aci.checkall'] = 'Check all';
+$LANG['aci.checknone'] = 'Check none';
+$LANG['aci.thisentry'] = 'This entry';
+$LANG['aci.selected'] = 'all selected';
+$LANG['aci.other'] = 'all except selected';
+
+$LANG['acl.all'] = 'all';
+$LANG['acl.append'] = 'append';
+$LANG['acl.custom'] = 'custom...';
+$LANG['acl.full'] = 'Full (without access control)';
+$LANG['acl.post'] = 'post';
+$LANG['acl.read'] = 'read';
+$LANG['acl.read-only'] = 'Read-Only';
+$LANG['acl.read-write'] = 'Read/Write';
+$LANG['acl.semi-full'] = 'Write new items';
+$LANG['acl.write'] = 'write';
+$LANG['acl.l'] = 'Lookup';
+$LANG['acl.r'] = 'Read messages';
+$LANG['acl.s'] = 'Keep Seen state';
+$LANG['acl.w'] = 'Write flags';
+$LANG['acl.i'] = 'Insert (Copy into)';
+$LANG['acl.p'] = 'Post';
+$LANG['acl.c'] = 'Create subfolders';
+$LANG['acl.k'] = 'Create subfolders';
+$LANG['acl.d'] = 'Delete messages';
+$LANG['acl.t'] = 'Delete messages';
+$LANG['acl.e'] = 'Expunge';
+$LANG['acl.x'] = 'Delete folder';
+$LANG['acl.a'] = 'Administer';
+$LANG['acl.n'] = 'Annotate messages';
+$LANG['acl.identifier'] = 'Identifier';
+$LANG['acl.rights'] = 'Access Rights';
+$LANG['acl.expire'] = 'Expires On';
+$LANG['acl.user'] = 'User...';
+$LANG['acl.anyone'] = 'All users (anyone)';
+$LANG['acl.anonymous'] = 'Guests (anonymous)';
+$LANG['acl.error.invaliddate'] = 'Invalid date format!';
+$LANG['acl.error.norights'] = 'No access rights specified!';
+$LANG['acl.error.subjectexists'] = 'Access rights for specified identifier already exist!';
+$LANG['acl.error.nouser'] = 'User identifier not specified!';
+
 $LANG['add'] = '追加';
+
+$LANG['api.notypeid'] = 'No object type ID specified!';
+$LANG['api.invalidtypeid'] = 'Invalid object type ID!';
+
 $LANG['attribute.add'] = '属性追加';
+$LANG['attribute.default'] = 'Default value';
 $LANG['attribute.static'] = '固定値';
 $LANG['attribute.name'] = '属性';
 $LANG['attribute.optional'] = 'オプション';
@@ -21,49 +112,78 @@
 $LANG['attribute.options'] = 'オプション';
 $LANG['attribute.key.invalid'] = 'タイプキーに使用できない文字が含まれています!';
 $LANG['attribute.required.error'] = '属性一覧($1)に要求された属性がありません!';
+$LANG['attribute.validate'] = ' Validation';
+$LANG['attribute.validate.default'] = 'default';
+$LANG['attribute.validate.none'] = 'none';
+$LANG['attribute.validate.basic'] = 'basic';
+$LANG['attribute.validate.extended'] = 'extended';
+
 $LANG['button.cancel'] = 'キャンセル';
 $LANG['button.delete'] = '削除';
+$LANG['button.ok'] = 'OK';
 $LANG['button.save'] = '保存';
 $LANG['button.submit'] = '適用';
+
 $LANG['creatorsname'] = 'Created by';
 $LANG['days'] = 'days';
 $LANG['debug'] = 'Debug info';
 $LANG['delete'] = '削除';
 $LANG['deleting'] = 'データの削除';
+
 $LANG['domain.add'] = 'ドメインの追加';
 $LANG['domain.add.success'] = 'ドメインを作成しました。';
 $LANG['domain.associateddomain'] = 'ドメイン名(s)';
+$LANG['domain.delete.confirm'] = 'Are you sure, you want to delete this domain?';
+$LANG['domain.delete.force'] = "There are users assigned to this domain.\nAre you sure, you want to delete this domain and all assigned objects?";
 $LANG['domain.delete.success'] = 'ドメインを削除しました。';
 $LANG['domain.edit'] = 'ドメイン編集';
 $LANG['domain.edit.success'] = 'ドメインを更新しました。';
-$LANG['domain.inetdomainbasedn'] = 'カスタムRootDN(s)';
+$LANG['domain.inetdomainbasedn'] = 'Custom Root DN';
+$LANG['domain.inetdomainstatus'] = '状態';
 $LANG['domain.list'] = 'ドメイン一覧';
 $LANG['domain.norecords'] = 'ドメインレコードが見つかりません!';
 $LANG['domain.o'] = '組織';
 $LANG['domain.other'] = 'その他';
 $LANG['domain.system'] = 'システム';
 $LANG['domain.type_id'] = '標準ドメイン';
+
 $LANG['edit'] = '編集';
 $LANG['error'] = 'エラー';
+
+$LANG['error.401'] = 'Unauthorized.';
+$LANG['error.403'] = 'Access forbidden.';
+$LANG['error.404'] = 'Object not found.';
+$LANG['error.408'] = 'Request timeout.';
+$LANG['error.450'] = 'Domain is not empty.';
+$LANG['error.500'] = 'Internal server error.';
+$LANG['error.503'] = 'Service unavailable. Try again later.';
+
 $LANG['form.required.empty'] = '要求されているフィールドが空欄です!';
 $LANG['form.maxcount.exceeded'] = 'アイテムの最大数を超過しています!';
+
 $LANG['group.add'] = 'グループ追加';
 $LANG['group.add.success'] = 'グループを作成しました。';
 $LANG['group.cn'] = '共通名';
+$LANG['group.delete.confirm'] = 'Are you sure, you want to delete this group?';
 $LANG['group.delete.success'] = 'グループを削除しました。';
 $LANG['group.edit.success'] = 'グループを更新しました。';
 $LANG['group.gidnumber'] = 'プライマリグループナンバー';
+$LANG['group.kolaballowsmtprecipient'] = '受信者(s)アクセスリスト';
+$LANG['group.kolaballowsmtpsender'] = '送信者アクセスリスト';
 $LANG['group.list'] = 'グループ一覧';
 $LANG['group.mail'] = 'プライマリEmailアドレス';
 $LANG['group.member'] = 'メンバー(s)';
 $LANG['group.memberurl'] = 'メンバーURL';
 $LANG['group.norecords'] = 'グループレコードは見つかりません。';
 $LANG['group.other'] = 'その他';
+$LANG['group.ou'] = 'Organization Unit';
 $LANG['group.system'] = 'システム';
 $LANG['group.type_id'] = 'グループタイプ';
 $LANG['group.uniquemember'] = 'メンバー';
+
 $LANG['info'] = 'インフォメーション';
 $LANG['internalerror'] = '内部システムエラー!';
+
 $LANG['ldap.one'] = 'one: 全てのエントリーがベースDN下で1レベル';
 $LANG['ldap.sub'] = 'sub: 全てのサブツリーがベースDNから始まる';
 $LANG['ldap.base'] = 'base: ベースDNのみ';
@@ -76,7 +196,9 @@
 $LANG['ldap.filter_prefix'] = '開始';
 $LANG['ldap.filter_suffix'] = '終了';
 $LANG['ldap.filter_exact'] = '等しい';
+
 $LANG['list.records'] = '$1から$2 $3中';
+
 $LANG['loading'] = '読込中…';
 $LANG['logout'] = 'ログアウト';
 $LANG['login.username'] = 'ユーザ名:';
@@ -85,42 +207,72 @@
 $LANG['login.login'] = 'ログイン';
 $LANG['loginerror'] = 'ユーザ名もしくはパスワードが違います!';
 $LANG['MB'] = 'MB';
+
 $LANG['menu.about'] = 'About';

kolab-webadmin-3.2.1.tar.gz/lib/locale/nl_NL.php -> kolab-webadmin-3.2.2.tar.gz/lib/locale/nl_NL.php Changed

@@ -1,12 +1,103 @@
 <?php
+
 $LANG['about.community'] = 'Dit is de community editie van de Kolab Server';
 $LANG['about.kolab'] = 'Kolab';
 $LANG['about.kolabsys'] = 'Kolab Systems';
 $LANG['about.support'] = 'Professionele ondersteuning is beschikbaar bij <a href="http://kolabsys.com">Kolab Systems</a>';
 $LANG['about.technology'] = 'Technologie';
 $LANG['about.warranty'] = 'Het komt zonder enige garanties en wordt typisch geheel zelf ondersteund. U kunt help & informatie vinden in de community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>.';
+
+$LANG['aci.new'] = 'nieuw...';
+$LANG['aci.edit'] = 'Wijzigen...';
+$LANG['aci.remove'] = 'Verwijder';
+$LANG['aci.users'] = 'Gebruikers';
+$LANG['aci.rights'] = 'Rechten';
+$LANG['aci.targets'] = 'Doelen';
+$LANG['aci.aciname'] = 'ACI naam:';
+$LANG['aci.hosts'] = 'Hosts';
+$LANG['aci.times'] = 'Tijden';
+$LANG['aci.name'] = 'Naam';
+$LANG['aci.userid'] = 'Gebruiker ID';
+$LANG['aci.email'] = 'E-mail';
+$LANG['aci.read'] = 'Lezen';
+$LANG['aci.compare'] = 'Vergelijken';
+$LANG['aci.search'] = 'Zoeken';
+$LANG['aci.write'] = 'Schrijven';
+$LANG['aci.selfwrite'] = 'Zelf-schrijven';
+$LANG['aci.delete'] = 'Verwijderen';
+$LANG['aci.add'] = 'Toevoegen';
+$LANG['aci.proxy'] = 'Proxy';
+$LANG['aci.all'] = 'Alle rechten';
+$LANG['aci.allow'] = 'Toestaan';
+$LANG['aci.deny'] = 'Weigeren';
+$LANG['aci.typeusers'] = 'Gebruikers';
+$LANG['aci.typegroups'] = 'Groepen';
+$LANG['aci.typeroles'] = 'Rollen';
+$LANG['aci.typeadmins'] = 'Administratoren';
+$LANG['aci.typespecials'] = 'Speciale Rechten';
+$LANG['aci.ldap-self'] = 'Zelf';
+$LANG['aci.ldap-anyone'] = 'Alle gebruikers';
+$LANG['aci.ldap-all'] = 'Alle geauthorizeerde gebruikers';
+$LANG['aci.ldap-parent'] = 'Ouder';
+$LANG['aci.usersearch'] = 'Zoek op:';
+$LANG['aci.usersearchresult'] = 'Zoekresultaten:';
+$LANG['aci.userselected'] = 'Geselecteerde gebruikers/groepen/rollen:';
+$LANG['aci.useradd'] = 'Toevoegen';
+$LANG['aci.userremove'] = 'Verwijder';
+$LANG['aci.error.noname'] = 'ACI regel naam is vereist!';
+$LANG['aci.error.exists'] = 'ACI regel met de gespecificeerde naam bestaat al!';
+$LANG['aci.error.nousers'] = 'Tenminste één gebruikerstoegang is vereist!';
+$LANG['aci.rights.target'] = 'Doel toegang:';
+$LANG['aci.rights.filter'] = 'Filter:';
+$LANG['aci.rights.attrs'] = 'Attributen:';
+$LANG['aci.checkall'] = 'Selecteer alles';
+$LANG['aci.checknone'] = 'Deselecteer alles';
+$LANG['aci.thisentry'] = 'Deze toegang';
+$LANG['aci.selected'] = 'Alle geselecteerde';
+$LANG['aci.other'] = 'Alle behalve geselecteerde';
+
+$LANG['acl.all'] = 'all';
+$LANG['acl.append'] = 'append';
+$LANG['acl.custom'] = 'custom...';
+$LANG['acl.full'] = 'Full (without access control)';
+$LANG['acl.post'] = 'post';
+$LANG['acl.read'] = 'read';
+$LANG['acl.read-only'] = 'Read-Only';
+$LANG['acl.read-write'] = 'Read/Write';
+$LANG['acl.semi-full'] = 'Write new items';
+$LANG['acl.write'] = 'write';
+$LANG['acl.l'] = 'Lookup';
+$LANG['acl.r'] = 'Read messages';
+$LANG['acl.s'] = 'Keep Seen state';
+$LANG['acl.w'] = 'Write flags';
+$LANG['acl.i'] = 'Insert (Copy into)';
+$LANG['acl.p'] = 'Post';
+$LANG['acl.c'] = 'Create subfolders';
+$LANG['acl.k'] = 'Create subfolders';
+$LANG['acl.d'] = 'Delete messages';
+$LANG['acl.t'] = 'Delete messages';
+$LANG['acl.e'] = 'Expunge';
+$LANG['acl.x'] = 'Verwijder map';
+$LANG['acl.a'] = 'Administer';
+$LANG['acl.n'] = 'Annotate messages';
+$LANG['acl.identifier'] = 'Identifier';
+$LANG['acl.rights'] = 'Teogangsrechten';
+$LANG['acl.expire'] = 'Expires On';
+$LANG['acl.user'] = 'User...';
+$LANG['acl.anyone'] = 'All users (anyone)';
+$LANG['acl.anonymous'] = 'Guests (anonymous)';
+$LANG['acl.error.invaliddate'] = 'Invalid date format!';
+$LANG['acl.error.norights'] = 'No access rights specified!';
+$LANG['acl.error.subjectexists'] = 'Access rights for specified identifier already exist!';
+$LANG['acl.error.nouser'] = 'User identifier not specified!';
+
 $LANG['add'] = 'Toevoegen';
+
+$LANG['api.notypeid'] = 'Geen object type ID gespecificeerd!';
+$LANG['api.invalidtypeid'] = 'Ongeldig object type ID!';
+
 $LANG['attribute.add'] = 'Voeg attribuut toe';
+$LANG['attribute.default'] = 'Standaard waarde';
 $LANG['attribute.static'] = 'Statische waarde';
 $LANG['attribute.name'] = 'Attribuut';
 $LANG['attribute.optional'] = 'Optioneel';
@@ -21,49 +112,78 @@
 $LANG['attribute.options'] = 'Opties';
 $LANG['attribute.key.invalid'] = 'De sleutelwaarde voor het type bevat ongeldige karakters!';
 $LANG['attribute.required.error'] = 'Er missen vereiste attributen van de attributen-lijst ($1)!';
+$LANG['attribute.validate'] = 'Validatie';
+$LANG['attribute.validate.default'] = 'standaard';
+$LANG['attribute.validate.none'] = 'geen';
+$LANG['attribute.validate.basic'] = 'basis';
+$LANG['attribute.validate.extended'] = 'uitgebreid';
+
 $LANG['button.cancel'] = 'Annuleren';
 $LANG['button.delete'] = 'Verwijder';
+$LANG['button.ok'] = 'OK';
 $LANG['button.save'] = 'Opslaan';
 $LANG['button.submit'] = 'Opslaan';
+
 $LANG['creatorsname'] = 'Gemaakt door';
 $LANG['days'] = 'dagen';
 $LANG['debug'] = 'Debug informatie';
 $LANG['delete'] = 'Verwijder';
 $LANG['deleting'] = 'Bezig data te verwijderen...';
+
 $LANG['domain.add'] = 'Domein Toevoegen';
 $LANG['domain.add.success'] = 'Domein Toegevoegd';
 $LANG['domain.associateddomain'] = 'Domein naam/namen';
+$LANG['domain.delete.confirm'] = 'Wilt u dit domein echt verwijderen?';
+$LANG['domain.delete.force'] = "Er zijn gebruikers toegewezen aan dit domein.\n Weet u zeker dat u dit domein en alle toegewezen objecten wilt verwijderen?";
 $LANG['domain.delete.success'] = 'Domein succesvol verwijderd';
 $LANG['domain.edit'] = 'Domein wijzigen';
 $LANG['domain.edit.success'] = 'Domein bijgewerkt';
-$LANG['domain.inetdomainbasedn'] = 'Custom Root DN(s)';
+$LANG['domain.inetdomainbasedn'] = 'Custom Root DN';
+$LANG['domain.inetdomainstatus'] = 'Status';
 $LANG['domain.list'] = 'Lijst van Domeinen';
 $LANG['domain.norecords'] = 'Geen domeinen gevonden!';
 $LANG['domain.o'] = 'Organisatie';
 $LANG['domain.other'] = 'Overig';
 $LANG['domain.system'] = 'Systeem';
 $LANG['domain.type_id'] = 'Standaard domein';
+
 $LANG['edit'] = 'Wijzigen';
 $LANG['error'] = 'Fout';
+
+$LANG['error.401'] = 'Niet geauthorizeerd.';
+$LANG['error.403'] = 'Toegang verboden.';
+$LANG['error.404'] = 'Object niet gevonden.';
+$LANG['error.408'] = 'Verzoek timeout.';
+$LANG['error.450'] = 'Domein is niet leeg.';
+$LANG['error.500'] = 'Interne server fout.';
+$LANG['error.503'] = 'Dienst niet beschikbaar. Probeer het later slstublieft nog een keer.';
+
 $LANG['form.required.empty'] = 'Sommige van de vereiste velden zijn leeg!';
 $LANG['form.maxcount.exceeded'] = 'Maximaal aantal waarden overtreden!';
+
 $LANG['group.add'] = 'Groep Toevoegen';
 $LANG['group.add.success'] = 'Groep succesvol toegevoegd.';
 $LANG['group.cn'] = 'Volledige naam';
+$LANG['group.delete.confirm'] = 'Wilt u deze groep echt verwijderen?';
 $LANG['group.delete.success'] = 'Groep succesvol verwijderd.';
 $LANG['group.edit.success'] = 'Groep succesvol gewijzigd.';
 $LANG['group.gidnumber'] = 'Primair groep nummer';
+$LANG['group.kolaballowsmtprecipient'] = 'Ontvanger(s) Toegangslijst';
+$LANG['group.kolaballowsmtpsender'] = 'Afzender Toegangslijst';
 $LANG['group.list'] = 'Lijst van Groepen';
-$LANG['group.mail'] = 'Primair Email Adres';
+$LANG['group.mail'] = 'Primair E-mail Adres';
 $LANG['group.member'] = 'Leden';
 $LANG['group.memberurl'] = 'URL voor leden';
 $LANG['group.norecords'] = 'Geen groepen gevonden!';
 $LANG['group.other'] = 'Overig';
+$LANG['group.ou'] = 'Afdeling';
 $LANG['group.system'] = 'Systeem';
 $LANG['group.type_id'] = 'Type Groep';
 $LANG['group.uniquemember'] = 'Leden';
+
 $LANG['info'] = 'Informatie';
 $LANG['internalerror'] = 'Interne systeem-fout!';
+
 $LANG['ldap.one'] = 'one: alle entiteiten een enkel niveau onder de basis DN';
 $LANG['ldap.sub'] = 'sub: alle entiteiten onder de basis DN';
 $LANG['ldap.base'] = 'base: alleen de basis DN';
@@ -76,7 +196,9 @@
 $LANG['ldap.filter_prefix'] = 'begint met';
 $LANG['ldap.filter_suffix'] = 'eindigt met';
 $LANG['ldap.filter_exact'] = 'is gelijk aan';
+
 $LANG['list.records'] = '$1 tot $2 van $3';
+
 $LANG['loading'] = 'Bezig met laden...';
 $LANG['logout'] = 'Uitloggen';
 $LANG['login.username'] = 'Gebruikersnaam:';
@@ -85,42 +207,72 @@
 $LANG['login.login'] = 'Gebruikersnaam';
 $LANG['loginerror'] = 'Incorrecte gebruikersnaam of wachtwoord!';
 $LANG['MB'] = 'MB';
+

kolab-webadmin-3.2.1.tar.gz/lib/locale/pl_PL.php -> kolab-webadmin-3.2.2.tar.gz/lib/locale/pl_PL.php Changed

@@ -1,12 +1,103 @@
 <?php
+
 $LANG['about.community'] = 'To jest wersja społecznościowa Serwera Kolab.';
 $LANG['about.kolab'] = 'Kolab';
 $LANG['about.kolabsys'] = 'Kolab Systems';
 $LANG['about.support'] = 'Profesjonalne wsparcie techniczne jest dostępne ze strony <a href="http://kolabsys.com">Kolab Systems</a>.';
 $LANG['about.technology'] = 'Technologia';
 $LANG['about.warranty'] = 'Oprogramowanie to dostarczane jest bez żadnych gwarancji ani wsparcia. Pomoc i niezbędne informacje można znaleźć na <a href=http://kolab.org">stronie społeczności</a> oraz <a href="http://wiki.kolab.org">wiki</a>.';
+
+$LANG['aci.new'] = 'Nowy...';
+$LANG['aci.edit'] = 'Edytuj...';
+$LANG['aci.remove'] = 'Usuń';
+$LANG['aci.users'] = 'Użytkownicy';
+$LANG['aci.rights'] = 'Uprawnienia';
+$LANG['aci.targets'] = 'Cele';
+$LANG['aci.aciname'] = 'Nazwa ACI:';
+$LANG['aci.hosts'] = 'Hosty';
+$LANG['aci.times'] = 'Czas';
+$LANG['aci.name'] = 'Nazwa';
+$LANG['aci.userid'] = 'ID użytkownika';
+$LANG['aci.email'] = 'E-mail';
+$LANG['aci.read'] = 'Odczyt';
+$LANG['aci.compare'] = 'Porównaj';
+$LANG['aci.search'] = 'Znajdź';
+$LANG['aci.write'] = 'Zapis';
+$LANG['aci.selfwrite'] = 'Zapis dla siebie';
+$LANG['aci.delete'] = 'Usuń';
+$LANG['aci.add'] = 'Dodaj';
+$LANG['aci.proxy'] = 'Proxy';
+$LANG['aci.all'] = 'Wszystkie prawa';
+$LANG['aci.allow'] = 'Pozwolenie';
+$LANG['aci.deny'] = 'Odmowa';
+$LANG['aci.typeusers'] = 'Użytkownicy';
+$LANG['aci.typegroups'] = 'Grupy';
+$LANG['aci.typeroles'] = 'Role';
+$LANG['aci.typeadmins'] = 'Administratorzy';
+$LANG['aci.typespecials'] = 'Uprawnienia specjalne';
+$LANG['aci.ldap-self'] = 'Ja';
+$LANG['aci.ldap-anyone'] = 'Wszyscy użytkownicy';
+$LANG['aci.ldap-all'] = 'Uwierzytelnieni użytkownicy';
+$LANG['aci.ldap-parent'] = 'Rodzic';
+$LANG['aci.usersearch'] = 'Szukaj wg:';
+$LANG['aci.usersearchresult'] = 'Wyniki wyszukiwania:';
+$LANG['aci.userselected'] = 'Wybrani użytkownicy/grupy/role:';
+$LANG['aci.useradd'] = 'Dodaj';
+$LANG['aci.userremove'] = 'Usuń';
+$LANG['aci.error.noname'] = 'Nazwa reguły ACI jest wymagana!';
+$LANG['aci.error.exists'] = 'Reguła ACI o podanej nazwie już istnieje!';
+$LANG['aci.error.nousers'] = 'Wymagany jest co najmniej jeden wpis użytkownika!';
+$LANG['aci.rights.target'] = 'Cel:';
+$LANG['aci.rights.filter'] = 'Filtr:';
+$LANG['aci.rights.attrs'] = 'Atrybuty:';
+$LANG['aci.checkall'] = 'Zaznacz wszystkie';
+$LANG['aci.checknone'] = 'Odznacz wszystkie';
+$LANG['aci.thisentry'] = 'Ten wpis';
+$LANG['aci.selected'] = 'wszystkie zaznaczone';
+$LANG['aci.other'] = 'wszystkie oprócz zaznaczonych';
+
+$LANG['acl.all'] = 'wszystkie';
+$LANG['acl.append'] = 'dodaj';
+$LANG['acl.custom'] = 'własne...';
+$LANG['acl.full'] = 'Pełne (bez kontroli dostępu)';
+$LANG['acl.post'] = 'wysyłanie';
+$LANG['acl.read'] = 'odczyt';
+$LANG['acl.read-only'] = 'Tylko-Odczyt';
+$LANG['acl.read-write'] = 'Odczyt/Zapis';
+$LANG['acl.semi-full'] = 'Write new items';
+$LANG['acl.write'] = 'zapis';
+$LANG['acl.l'] = 'Podgląd';
+$LANG['acl.r'] = 'Odczyt wiadomości';
+$LANG['acl.s'] = 'Status przeczytania';
+$LANG['acl.w'] = 'Zapis flag';
+$LANG['acl.i'] = 'Tworzenie (kopiowanie do)';
+$LANG['acl.p'] = 'Wysyłka';
+$LANG['acl.c'] = 'Tworzenie pod-folderów';
+$LANG['acl.k'] = 'Tworzenie pod-folderów';
+$LANG['acl.d'] = 'Usuwanie wiadomości';
+$LANG['acl.t'] = 'Usuwanie wiadomości';
+$LANG['acl.e'] = 'Porządkowanie';
+$LANG['acl.x'] = 'Usuń folder';
+$LANG['acl.a'] = 'Administracja';
+$LANG['acl.n'] = 'Adnotacje wiadomości';
+$LANG['acl.identifier'] = 'Identyfikator';
+$LANG['acl.rights'] = 'Prawa dostępu';
+$LANG['acl.expire'] = 'Wygasa';
+$LANG['acl.user'] = 'Użytkownik...';
+$LANG['acl.anyone'] = 'Wszyscy użytkownicy (anyone)';
+$LANG['acl.anonymous'] = 'Goście (anonymous)';
+$LANG['acl.error.invaliddate'] = 'Błędny format daty!';
+$LANG['acl.error.norights'] = 'Nie zdefiniowano praw dostępu!';
+$LANG['acl.error.subjectexists'] = 'Prawa dostępu dla wybranego identyfikatora już istnieją!';
+$LANG['acl.error.nouser'] = 'Nie podano identyfikatora użytkownika!';
+
 $LANG['add'] = 'Dodaj';
+
+$LANG['api.notypeid'] = 'Nie podano identyfikatora typu obiektu!';
+$LANG['api.invalidtypeid'] = 'Błędny identyfikator typu obiektu!';
+
 $LANG['attribute.add'] = 'Dodaj atrybut';
+$LANG['attribute.default'] = 'Wartość domyślna';
 $LANG['attribute.static'] = 'Wartość stała';
 $LANG['attribute.name'] = 'Atrybut';
 $LANG['attribute.optional'] = 'Opcjonalny';
@@ -21,49 +112,78 @@
 $LANG['attribute.options'] = 'Opcje';
 $LANG['attribute.key.invalid'] = 'Klucz typu zawiera niedozwolone znaki!';
 $LANG['attribute.required.error'] = 'Pominięto wymagane atrybuty na liście atrybutów ($1)!';
+$LANG['attribute.validate'] = 'Spr. poprawności';
+$LANG['attribute.validate.default'] = 'domyślne';
+$LANG['attribute.validate.none'] = 'brak';
+$LANG['attribute.validate.basic'] = 'podstawowe';
+$LANG['attribute.validate.extended'] = 'rozszerzone';
+
 $LANG['button.cancel'] = 'Anuluj';
 $LANG['button.delete'] = 'Usuń';
+$LANG['button.ok'] = 'OK';
 $LANG['button.save'] = 'Zapisz';
 $LANG['button.submit'] = 'Zatwierdź';
+
 $LANG['creatorsname'] = 'Utworzony przez';
 $LANG['days'] = 'dni';
 $LANG['debug'] = 'Debug info';
 $LANG['delete'] = 'Usuń';
 $LANG['deleting'] = 'Usuwanie danych...';
+
 $LANG['domain.add'] = 'Dodaj domenę';
 $LANG['domain.add.success'] = 'Domena została dodana pomyślnie.';
 $LANG['domain.associateddomain'] = 'Nazwy domen';
+$LANG['domain.delete.confirm'] = 'Czy na pewno chcesz usunąć tą domenę?';
+$LANG['domain.delete.force'] = "Do tej domeny są przpisani użytkownicy.\nCzy na pewno chcesz usunąć tą domenę i wszystkie przypisane obiekty?";
 $LANG['domain.delete.success'] = 'Domena usunięta pomyślnie.';
 $LANG['domain.edit'] = 'Edytuj domenę';
 $LANG['domain.edit.success'] = 'Domena zostałą uaktualniona pomyślnie.';
-$LANG['domain.inetdomainbasedn'] = 'Niestandardowy Root DN';
+$LANG['domain.inetdomainbasedn'] = 'Własny Root DN';
+$LANG['domain.inetdomainstatus'] = 'Status';
 $LANG['domain.list'] = 'Lista domen';
 $LANG['domain.norecords'] = 'Nie znaleziono żadnej domeny!';
 $LANG['domain.o'] = 'Organizacja';
 $LANG['domain.other'] = 'Inne';
 $LANG['domain.system'] = 'System';
 $LANG['domain.type_id'] = 'Domena standardowa';
+
 $LANG['edit'] = 'Edytuj';
 $LANG['error'] = 'Błąd';
+
+$LANG['error.401'] = 'Nieupoważniony.';
+$LANG['error.403'] = 'Brak dostępu.';
+$LANG['error.404'] = 'Nie znaleziono obiektu.';
+$LANG['error.408'] = 'Upłynął limit czasu żądania.';
+$LANG['error.450'] = 'Domena nie jest pusta.';
+$LANG['error.500'] = 'Wewnętrzny błąd serwera.';
+$LANG['error.503'] = 'Usługa niedostępna. Spróbuj póżniej.';
+
 $LANG['form.required.empty'] = 'Niektóre z wymaganych pól są puste!';
 $LANG['form.maxcount.exceeded'] = 'Przekroczono maksymalną liczbę elementów!';
+
 $LANG['group.add'] = 'Dodaj grupę';
 $LANG['group.add.success'] = 'Grupa utworzona pomyślnie.';
 $LANG['group.cn'] = 'Nazwa typowa';
+$LANG['group.delete.confirm'] = 'Czy na pewno chcesz usunąć tą grupę?';
 $LANG['group.delete.success'] = 'Grupa usunięta pomyślnie.';
 $LANG['group.edit.success'] = 'Grupa zostałą zmieniona pomyślnie.';
 $LANG['group.gidnumber'] = 'Numer grupy głównej';
+$LANG['group.kolaballowsmtprecipient'] = 'Lista dostępu odbiorców';
+$LANG['group.kolaballowsmtpsender'] = 'Lista dostępu nadawców';
 $LANG['group.list'] = 'Lista grup';
 $LANG['group.mail'] = 'Główny adres e-mail';
 $LANG['group.member'] = 'Członkowie';
 $LANG['group.memberurl'] = 'URL członków';
 $LANG['group.norecords'] = 'Nie znaleziono żadnej grupy!';
 $LANG['group.other'] = 'Inne';
+$LANG['group.ou'] = 'Jednostka organizacyjna';
 $LANG['group.system'] = 'System';
 $LANG['group.type_id'] = 'Rodzaj grupy';
 $LANG['group.uniquemember'] = 'Członkowie';
+
 $LANG['info'] = 'Informacje';
 $LANG['internalerror'] = 'Wewnętrzny błąd systemu!';
+
 $LANG['ldap.one'] = '(one): wszystkie elementy jeden poziom od główej domeny (base DN)';
 $LANG['ldap.sub'] = '(sub): całe drzewo począwszy od głównej domeny (base DN)';
 $LANG['ldap.base'] = '(base): tylko główna domena (base DN)';
@@ -76,7 +196,9 @@
 $LANG['ldap.filter_prefix'] = 'rozpoczyna się od';
 $LANG['ldap.filter_suffix'] = 'kończy się na';
 $LANG['ldap.filter_exact'] = 'jest równa z';
+
 $LANG['list.records'] = '$1 do $2 z $3';
+
 $LANG['loading'] = 'Ładowanie...';
 $LANG['logout'] = 'Wyloguj';
 $LANG['login.username'] = 'Nazwa użytkownika:';
@@ -85,42 +207,72 @@
 $LANG['login.login'] = 'Zaloguj';
 $LANG['loginerror'] = 'Nieprawidłowa nazwa użytkownika lub hasło!';
 $LANG['MB'] = 'MB';
+
 $LANG['menu.about'] = 'O programie';

kolab-webadmin-3.2.1.tar.gz/lib/locale/pt_BR.php -> kolab-webadmin-3.2.2.tar.gz/lib/locale/pt_BR.php Changed

@@ -1,14 +1,107 @@
 <?php
+
 $LANG['about.community'] = 'Esta é a Edição Comunitária do Kolab Server';
 $LANG['about.kolab'] = 'Kolab';
 $LANG['about.kolabsys'] = 'Sistemas Kolab';
 $LANG['about.support'] = 'Suporte profissional está disponível a partir da <a href="http://kolabsys.com">Kolab Systems</a>.';
 $LANG['about.technology'] = 'Tecnologia ';
+$LANG['about.warranty'] = 'It comes with absolutely no warranties and is typically run entirely self supported. You can find help & information on the community <a href="http://kolab.org">web site</a> & <a href="http://wiki.kolab.org">wiki</a>.';
+
+$LANG['aci.new'] = 'New...';
+$LANG['aci.edit'] = 'Edit...';
+$LANG['aci.remove'] = 'Remover';
+$LANG['aci.users'] = 'Usuários';
+$LANG['aci.rights'] = 'Rights';
+$LANG['aci.targets'] = 'Targets';
+$LANG['aci.aciname'] = 'ACI name:';
+$LANG['aci.hosts'] = 'Hosts';
+$LANG['aci.times'] = 'Times';
+$LANG['aci.name'] = 'Nome';
+$LANG['aci.userid'] = 'User ID';
+$LANG['aci.email'] = 'E-mail';
+$LANG['aci.read'] = 'Read';
+$LANG['aci.compare'] = 'Compare';
+$LANG['aci.search'] = 'Pesquisar';
+$LANG['aci.write'] = 'Gravar';
+$LANG['aci.selfwrite'] = 'Self-write';
+$LANG['aci.delete'] = 'Deletar';
+$LANG['aci.add'] = 'Adicionar';
+$LANG['aci.proxy'] = 'Proxy';
+$LANG['aci.all'] = 'All rights';
+$LANG['aci.allow'] = 'Allow';
+$LANG['aci.deny'] = 'Deny';
+$LANG['aci.typeusers'] = 'Usuários';
+$LANG['aci.typegroups'] = 'Grupos';
+$LANG['aci.typeroles'] = 'Papeis';
+$LANG['aci.typeadmins'] = 'Administrators';
+$LANG['aci.typespecials'] = 'Special Rights';
+$LANG['aci.ldap-self'] = 'Self';
+$LANG['aci.ldap-anyone'] = 'All users';
+$LANG['aci.ldap-all'] = 'All authenticated users';
+$LANG['aci.ldap-parent'] = 'Parent';
+$LANG['aci.usersearch'] = 'Search for:';
+$LANG['aci.usersearchresult'] = 'Search results:';
+$LANG['aci.userselected'] = 'Selected users/groups/roles:';
+$LANG['aci.useradd'] = 'Adicionar';
+$LANG['aci.userremove'] = 'Remover';
+$LANG['aci.error.noname'] = 'ACI rule name is required!';
+$LANG['aci.error.exists'] = 'ACI rule with specified name already exists!';
+$LANG['aci.error.nousers'] = 'At least one user entry is required!';
+$LANG['aci.rights.target'] = 'Target entry:';
+$LANG['aci.rights.filter'] = 'Filter:';
+$LANG['aci.rights.attrs'] = 'Attributes:';
+$LANG['aci.checkall'] = 'Check all';
+$LANG['aci.checknone'] = 'Check none';
+$LANG['aci.thisentry'] = 'This entry';
+$LANG['aci.selected'] = 'all selected';
+$LANG['aci.other'] = 'all except selected';
+
+$LANG['acl.all'] = 'all';
+$LANG['acl.append'] = 'append';
+$LANG['acl.custom'] = 'custom...';
+$LANG['acl.full'] = 'Full (without access control)';
+$LANG['acl.post'] = 'post';
+$LANG['acl.read'] = 'read';
+$LANG['acl.read-only'] = 'Read-Only';
+$LANG['acl.read-write'] = 'Read/Write';
+$LANG['acl.semi-full'] = 'Write new items';
+$LANG['acl.write'] = 'write';
+$LANG['acl.l'] = 'Lookup';
+$LANG['acl.r'] = 'Read messages';
+$LANG['acl.s'] = 'Keep Seen state';
+$LANG['acl.w'] = 'Write flags';
+$LANG['acl.i'] = 'Insert (Copy into)';
+$LANG['acl.p'] = 'Post';
+$LANG['acl.c'] = 'Create subfolders';
+$LANG['acl.k'] = 'Create subfolders';
+$LANG['acl.d'] = 'Delete messages';
+$LANG['acl.t'] = 'Delete messages';
+$LANG['acl.e'] = 'Expunge';
+$LANG['acl.x'] = 'Remover pasta';
+$LANG['acl.a'] = 'Administer';
+$LANG['acl.n'] = 'Annotate messages';
+$LANG['acl.identifier'] = 'Identifier';
+$LANG['acl.rights'] = 'Access Rights';
+$LANG['acl.expire'] = 'Expires On';
+$LANG['acl.user'] = 'User...';
+$LANG['acl.anyone'] = 'All users (anyone)';
+$LANG['acl.anonymous'] = 'Guests (anonymous)';
+$LANG['acl.error.invaliddate'] = 'Invalid date format!';
+$LANG['acl.error.norights'] = 'No access rights specified!';
+$LANG['acl.error.subjectexists'] = 'Access rights for specified identifier already exist!';
+$LANG['acl.error.nouser'] = 'User identifier not specified!';
+
 $LANG['add'] = 'Adicionar';
+
+$LANG['api.notypeid'] = 'No object type ID specified!';
+$LANG['api.invalidtypeid'] = 'Invalid object type ID!';
+
 $LANG['attribute.add'] = 'Adicionar atributo';
+$LANG['attribute.default'] = 'Default value';
 $LANG['attribute.static'] = 'Valor estático';
 $LANG['attribute.name'] = 'Atributo';
 $LANG['attribute.optional'] = 'Opcional';
+$LANG['attribute.maxcount'] = 'Max. count';
 $LANG['attribute.readonly'] = 'Somente leitura';
 $LANG['attribute.type'] = 'Tipo do campo';
 $LANG['attribute.value'] = 'Valor';
@@ -17,57 +110,95 @@
 $LANG['attribute.value.normal'] = 'Normal';
 $LANG['attribute.value.static'] = 'Estático';
 $LANG['attribute.options'] = 'Opções';
+$LANG['attribute.key.invalid'] = 'Type key contains forbidden characters!';
+$LANG['attribute.required.error'] = 'Required attributes missing in attributes list ($1)!';
+$LANG['attribute.validate'] = ' Validation';
+$LANG['attribute.validate.default'] = 'default';
+$LANG['attribute.validate.none'] = 'none';
+$LANG['attribute.validate.basic'] = 'basic';
+$LANG['attribute.validate.extended'] = 'extended';
+
 $LANG['button.cancel'] = 'Cancelar';
 $LANG['button.delete'] = 'Deletar';
+$LANG['button.ok'] = 'OK';
 $LANG['button.save'] = 'Salvar';
 $LANG['button.submit'] = 'Enviar';
+
 $LANG['creatorsname'] = 'Criado por';
 $LANG['days'] = 'dias';
 $LANG['debug'] = 'Informação do debug';
 $LANG['delete'] = 'Deletar';
 $LANG['deleting'] = 'Exclusão de dados...';
+
 $LANG['domain.add'] = 'Adicionar Domínio';
 $LANG['domain.add.success'] = 'Domínio criado com sucesso.';
 $LANG['domain.associateddomain'] = 'Nome(s) de domínio';
+$LANG['domain.delete.confirm'] = 'Are you sure, you want to delete this domain?';
+$LANG['domain.delete.force'] = "There are users assigned to this domain.\nAre you sure, you want to delete this domain and all assigned objects?";
 $LANG['domain.delete.success'] = 'Domínio deletado com sucesso.';
 $LANG['domain.edit'] = 'Editar domínio';
 $LANG['domain.edit.success'] = 'Domínio alterado com sucesso.';
-$LANG['domain.inetdomainbasedn'] = 'Root DN(s) personalizado';
+$LANG['domain.inetdomainbasedn'] = 'Custom Root DN';
+$LANG['domain.inetdomainstatus'] = 'Situação';
 $LANG['domain.list'] = 'Lista de Domínios';
 $LANG['domain.norecords'] = 'Nenhum registro de domínio encontrado!';
 $LANG['domain.o'] = 'Organização';
 $LANG['domain.other'] = 'Outro';
 $LANG['domain.system'] = 'Sistema';
 $LANG['domain.type_id'] = 'Domínio padrão';
+
 $LANG['edit'] = 'Editar';
 $LANG['error'] = 'Erro';
+
+$LANG['error.401'] = 'Unauthorized.';
+$LANG['error.403'] = 'Access forbidden.';
+$LANG['error.404'] = 'Object not found.';
+$LANG['error.408'] = 'Request timeout.';
+$LANG['error.450'] = 'Domain is not empty.';
+$LANG['error.500'] = 'Internal server error.';
+$LANG['error.503'] = 'Service unavailable. Try again later.';
+
 $LANG['form.required.empty'] = 'Alguns dos campos obrigatórios estão vazios!';
 $LANG['form.maxcount.exceeded'] = 'Contagem máxima de itens excedido!';
+
 $LANG['group.add'] = 'Adicionar Grupo';
 $LANG['group.add.success'] = 'Grupo criado com sucesso.';
 $LANG['group.cn'] = 'Nome comum';
+$LANG['group.delete.confirm'] = 'Are you sure, you want to delete this group?';
 $LANG['group.delete.success'] = 'Grupo deletado com sucesso.';
 $LANG['group.edit.success'] = 'Grupo alterado com sucesso.';
 $LANG['group.gidnumber'] = 'Numero do grupo principal';
+$LANG['group.kolaballowsmtprecipient'] = 'Recipient(s) Access List';
+$LANG['group.kolaballowsmtpsender'] = 'Sender Access List';
 $LANG['group.list'] = 'Lista de grupos';
 $LANG['group.mail'] = 'Endereço de e-mail principal';
 $LANG['group.member'] = 'Membro(s)';
 $LANG['group.memberurl'] = 'URL dos membros';
 $LANG['group.norecords'] = 'Não há registros de grupo encontrado!';
 $LANG['group.other'] = 'Outro';
+$LANG['group.ou'] = 'Unidade organizacional';
 $LANG['group.system'] = 'Sistema';
 $LANG['group.type_id'] = 'Tipo do grupo';
 $LANG['group.uniquemember'] = 'Membros';
+
 $LANG['info'] = 'Informação';
 $LANG['internalerror'] = 'Erro interno do sistema!';
+
+$LANG['ldap.one'] = 'one: all entries one level under the base DN';
+$LANG['ldap.sub'] = 'sub: whole subtree starting with the base DN';
+$LANG['ldap.base'] = 'base: base DN only';
+$LANG['ldap.basedn'] = 'Base DN';
 $LANG['ldap.host'] = 'Servidor LDAP';
 $LANG['ldap.conditions'] = 'Condições';
 $LANG['ldap.scope'] = 'Escopo';
+$LANG['ldap.filter_any'] = 'is non-empty';
 $LANG['ldap.filter_both'] = 'contém';
 $LANG['ldap.filter_prefix'] = 'Começar com';
 $LANG['ldap.filter_suffix'] = 'Terminar com';
 $LANG['ldap.filter_exact'] = 'É igual a';
+

kolab-webadmin-3.2.1.tar.gz/lib/locale/ru_RU.php -> kolab-webadmin-3.2.2.tar.gz/lib/locale/ru_RU.php Changed

@@ -1,12 +1,103 @@
 <?php
+
 $LANG['about.community'] = 'Это свободная версия Kolab Server.';
 $LANG['about.kolab'] = 'Kolab';
 $LANG['about.kolabsys'] = 'Kolab Systems';
 $LANG['about.support'] = 'Профессиональную поддержку можно получить от <a href="http://kolabsys.com">Kolab Systems</a>.';
 $LANG['about.technology'] = 'Технология';
 $LANG['about.warranty'] = 'Она распространяется абсолютно без гарантий и обычно поддерживается силами сообщества. Помощь и информацию можно найти на сайте <a href="http://kolab.org">сообщества</a> и <a href="http://wiki.kolab.org">wiki</a>.';
+
+$LANG['aci.new'] = 'Новый...';
+$LANG['aci.edit'] = 'Редактировать...';
+$LANG['aci.remove'] = 'Убрать';
+$LANG['aci.users'] = 'Пользователи';
+$LANG['aci.rights'] = 'Права';
+$LANG['aci.targets'] = 'Targets';
+$LANG['aci.aciname'] = 'ACI name:';
+$LANG['aci.hosts'] = 'Хосты';
+$LANG['aci.times'] = 'Times';
+$LANG['aci.name'] = 'Имя';
+$LANG['aci.userid'] = 'User ID';
+$LANG['aci.email'] = 'E-mail';
+$LANG['aci.read'] = 'Читать';
+$LANG['aci.compare'] = 'Сравнить';
+$LANG['aci.search'] = 'Поиск';
+$LANG['aci.write'] = 'Запись';
+$LANG['aci.selfwrite'] = 'Self-write';
+$LANG['aci.delete'] = 'Удалить';
+$LANG['aci.add'] = 'Добавить';
+$LANG['aci.proxy'] = 'Proxy';
+$LANG['aci.all'] = 'Все права';
+$LANG['aci.allow'] = 'Разрешить';
+$LANG['aci.deny'] = 'Запретить';
+$LANG['aci.typeusers'] = 'Пользователи';
+$LANG['aci.typegroups'] = 'Группы';
+$LANG['aci.typeroles'] = 'Роли';
+$LANG['aci.typeadmins'] = 'Администраторы';
+$LANG['aci.typespecials'] = 'Особые права';
+$LANG['aci.ldap-self'] = 'Self';
+$LANG['aci.ldap-anyone'] = 'Все пользователи';
+$LANG['aci.ldap-all'] = 'All authenticated users';
+$LANG['aci.ldap-parent'] = 'Parent';
+$LANG['aci.usersearch'] = 'Искать:';
+$LANG['aci.usersearchresult'] = 'Результат поиска:';
+$LANG['aci.userselected'] = 'Выбранные пользователи/группы/роли:';
+$LANG['aci.useradd'] = 'Добавить';
+$LANG['aci.userremove'] = 'Убрать';
+$LANG['aci.error.noname'] = 'Требуется имя правила ACI!';
+$LANG['aci.error.exists'] = 'Правило ACI с таким именем уже существует!';
+$LANG['aci.error.nousers'] = 'Требуется указать хотябы одного пользователя!';
+$LANG['aci.rights.target'] = 'Target entry:';
+$LANG['aci.rights.filter'] = 'Фильтр';
+$LANG['aci.rights.attrs'] = 'Атрибуты:';
+$LANG['aci.checkall'] = 'Проверить все';
+$LANG['aci.checknone'] = 'Check none';
+$LANG['aci.thisentry'] = 'This entry';
+$LANG['aci.selected'] = 'Все выбранные';
+$LANG['aci.other'] = 'Все кроме выбранных';
+
+$LANG['acl.all'] = 'все';
+$LANG['acl.append'] = 'append';
+$LANG['acl.custom'] = 'custom...';
+$LANG['acl.full'] = 'Full (without access control)';
+$LANG['acl.post'] = 'post';
+$LANG['acl.read'] = 'читать';
+$LANG['acl.read-only'] = 'Read-Only';
+$LANG['acl.read-write'] = 'Read/Write';
+$LANG['acl.semi-full'] = 'Write new items';
+$LANG['acl.write'] = 'писать';
+$LANG['acl.l'] = 'Lookup';
+$LANG['acl.r'] = 'Читать сообщения';
+$LANG['acl.s'] = 'Keep Seen state';
+$LANG['acl.w'] = 'Write flags';
+$LANG['acl.i'] = 'Insert (Copy into)';
+$LANG['acl.p'] = 'Post';
+$LANG['acl.c'] = 'Создать вложенную папку';
+$LANG['acl.k'] = 'Создать вложенную папку';
+$LANG['acl.d'] = 'Удаление сообщений';
+$LANG['acl.t'] = 'Удаление сообщений';
+$LANG['acl.e'] = 'Expunge';
+$LANG['acl.x'] = 'Удалить папку';
+$LANG['acl.a'] = 'Administer';
+$LANG['acl.n'] = 'Annotate messages';
+$LANG['acl.identifier'] = 'Идентификатор';
+$LANG['acl.rights'] = 'Права доступа';
+$LANG['acl.expire'] = 'Истекают';
+$LANG['acl.user'] = 'Пользователь...';
+$LANG['acl.anyone'] = 'Все пользователи (любой)';
+$LANG['acl.anonymous'] = 'Гости (анонимный)';
+$LANG['acl.error.invaliddate'] = 'Неверный формат даты!';
+$LANG['acl.error.norights'] = 'Не указаны права доступа!';
+$LANG['acl.error.subjectexists'] = 'Права доступа для указанного идентификатора уже существуют!';
+$LANG['acl.error.nouser'] = 'Идентификатор пользователя не указан!';
+
 $LANG['add'] = 'Добавить';
+
+$LANG['api.notypeid'] = 'Не указан ID типа объекта!';
+$LANG['api.invalidtypeid'] = 'Неверный ID типа объекта!';
+
 $LANG['attribute.add'] = 'Добавить атрибут';
+$LANG['attribute.default'] = 'Значение по умолчанию';
 $LANG['attribute.static'] = 'Постоянное значение';
 $LANG['attribute.name'] = 'Атрибут';
 $LANG['attribute.optional'] = 'Необязательный';
@@ -21,49 +112,78 @@
 $LANG['attribute.options'] = 'Опции';
 $LANG['attribute.key.invalid'] = 'Ключ содержит запрещенные символы!';
 $LANG['attribute.required.error'] = 'Требуемые атрибуты отсутствуют в списке атрибутов ($1)!';
+$LANG['attribute.validate'] = ' Validation';
+$LANG['attribute.validate.default'] = 'по умолчанию';
+$LANG['attribute.validate.none'] = 'none';
+$LANG['attribute.validate.basic'] = 'базовый';
+$LANG['attribute.validate.extended'] = 'расширенный';
+
 $LANG['button.cancel'] = 'Отмена';
 $LANG['button.delete'] = 'Удалить';
+$LANG['button.ok'] = 'Ок';
 $LANG['button.save'] = 'Сохранить';
 $LANG['button.submit'] = 'Отправить';
+
 $LANG['creatorsname'] = 'Создатель';
 $LANG['days'] = 'дней';
 $LANG['debug'] = 'Отладочная информация';
 $LANG['delete'] = 'Удалить';
 $LANG['deleting'] = 'Удаление данных...';
+
 $LANG['domain.add'] = 'Добавить домен';
 $LANG['domain.add.success'] = 'Домен успешно создан.';
 $LANG['domain.associateddomain'] = 'Доменные имена';
+$LANG['domain.delete.confirm'] = 'Вы уверены, что хотите удалить этот домен?';
+$LANG['domain.delete.force'] = "К домену приписаны пользователи.\nВы уверены, что хотите удалить этот домен и все его объекты?";
 $LANG['domain.delete.success'] = 'Домен успешно удален.';
 $LANG['domain.edit'] = 'Редактировать домен';
 $LANG['domain.edit.success'] = 'Домен успешно обновлен.';
-$LANG['domain.inetdomainbasedn'] = 'Выбрать корневые базы поиска';
+$LANG['domain.inetdomainbasedn'] = 'Custom Root DN';
+$LANG['domain.inetdomainstatus'] = 'Статус';
 $LANG['domain.list'] = 'Список доменов';
 $LANG['domain.norecords'] = 'Домены не найдены!';
 $LANG['domain.o'] = 'Организация';
 $LANG['domain.other'] = 'Прочее';
 $LANG['domain.system'] = 'Система';
 $LANG['domain.type_id'] = 'Стандартный домен';
+
 $LANG['edit'] = 'Редактировать';
 $LANG['error'] = 'Ошибка';
+
+$LANG['error.401'] = 'Неавторизован.';
+$LANG['error.403'] = 'Доступ запрещён.';
+$LANG['error.404'] = 'Объект не найден.';
+$LANG['error.408'] = 'Время запроса превышено.';
+$LANG['error.450'] = 'Домен не пуст.';
+$LANG['error.500'] = 'Внутренняя ошибка сервера.';
+$LANG['error.503'] = 'Сервис недоступен. Попробуйте позже.';
+
 $LANG['form.required.empty'] = 'Некоторые обязательные поля не заполнены!';
 $LANG['form.maxcount.exceeded'] = 'Превышено максимальное количество элементов!';
+
 $LANG['group.add'] = 'Добавить группу';
-$LANG['group.add.success'] = 'Группа успешнно создана.';
+$LANG['group.add.success'] = 'Группа успешно создана.';
 $LANG['group.cn'] = 'Общее обозначение';
+$LANG['group.delete.confirm'] = 'Вы уверены, что хотите удалить эту группу?';
 $LANG['group.delete.success'] = 'Группа успешно удалена.';
 $LANG['group.edit.success'] = 'Группа успешно обновлена.';
 $LANG['group.gidnumber'] = 'Номер основной группы';
+$LANG['group.kolaballowsmtprecipient'] = 'Список разрешенных получателей';
+$LANG['group.kolaballowsmtpsender'] = 'Список разрешенных отправителей';
 $LANG['group.list'] = 'Список групп';
 $LANG['group.mail'] = 'Основная электронная почта';
 $LANG['group.member'] = 'Участник(и)';
 $LANG['group.memberurl'] = 'URL участников';
 $LANG['group.norecords'] = 'Группы не найдены!';
 $LANG['group.other'] = 'Прочее';
+$LANG['group.ou'] = 'Организационная единица';
 $LANG['group.system'] = 'Система';
 $LANG['group.type_id'] = 'Тип группы';
 $LANG['group.uniquemember'] = 'Участники';
+
 $LANG['info'] = 'Информация';
 $LANG['internalerror'] = 'Внутренняя ошибка!';
+
 $LANG['ldap.one'] = 'one: только на уровень ниже базы поиска';
 $LANG['ldap.sub'] = 'sub: по всему поддереву от базы поиска';
 $LANG['ldap.base'] = 'base: только в этом узле';
@@ -76,7 +196,9 @@
 $LANG['ldap.filter_prefix'] = 'начинается с';
 $LANG['ldap.filter_suffix'] = 'заканчивается на';
 $LANG['ldap.filter_exact'] = 'Равен';
+
 $LANG['list.records'] = 'от $1 до $2 из $3';
+
 $LANG['loading'] = 'Загрузка...';
 $LANG['logout'] = 'Выход';
 $LANG['login.username'] = 'Имя пользователя:';
@@ -85,42 +207,72 @@
 $LANG['login.login'] = 'Логин';
 $LANG['loginerror'] = 'Неверное имя пользователя или пароль!';
 $LANG['MB'] = 'МБ';
+

kolab-webadmin-3.2.1.tar.gz/public_html/js/kolab_admin.js -> kolab-webadmin-3.2.2.tar.gz/public_html/js/kolab_admin.js Changed

@@ -216,6 +216,9 @@
     if (timeout > 0)
       window.setTimeout(function() { self.hide_message(type, type != 'loading'); }, timeout);
 
+    if (type == 'loading')
+      this.hide_message(type);
+
     obj.attr('id', type == 'loading' ? 'loading' : 'message')
       .appendTo('body').html(msg).show();
   };
@@ -1905,7 +1908,7 @@
       format: 'Y-m-d H:i'
     });
 */
-    var v = $.inArray(acl.rights, options) != -1 ? acl.rights : 'custom';
+    var v = !acl.rights ? 'read-write' : $.inArray(acl.rights, options) != -1 ? acl.rights : 'custom';
     select.val(v).change();
     $.each(rights, function() {
       $('input[value="' + this + '"]', rights_div).prop('checked', v == 'custom' && acl.rights && acl.rights.indexOf(this) > -1);
@@ -2210,7 +2213,6 @@
 
     if (data.attributes.length)
       this.api_post('form_value.generate', data, 'form_value_response');
-    this.set_busy(false);
   };
 
   this.form_value_response = function(response)
@@ -2619,6 +2621,7 @@
     request.type = data.type;
     request.description = data.description;
     request.used_for = data.used_for;
+    request.is_default = data.is_default;
     request.attributes = {fields: {}, form_fields: {}, auto_form_fields: {}};
     request.attributes.fields.objectclass = data.objectclass;

kolab-webadmin-3.2.1.tar.gz/public_html/skins/default/style.css -> kolab-webadmin-3.2.2.tar.gz/public_html/skins/default/style.css Changed

kolab-webadmin.dsc Changed