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 33

kolab-webadmin-3.1.5.tar.gz/INSTALL Deleted

@@ -1,87 +0,0 @@
-= Kolab WAP Installation Instructions =
-
-- Put the contents of this directory somewhere you can visit with a browser.
-
-- Edit public_html/.htaccess to your needs. An example (for
-  http://admin.klab.cc/~vanmeeuwen/kolab-wap/public_html/.htaccess) is as
-  follows:
-
-<IfModule mod_rewrite.c>
-    RewriteEngine on
-    # NOTE: This needs to point to the base uri of your installation.
-    RewriteBase /~vanmeeuwen/kolab-wap/public_html
-
-    # Rewrite URLs of the form 'x' to the form 'index.php?q=x'.
-    RewriteCond %{REQUEST_FILENAME} !-f
-    RewriteCond %{REQUEST_FILENAME} !-d
-    RewriteCond %{REQUEST_URI} !=/favicon.ico
-    RewriteRule ^api/(.*)\.(.*)$ api/index.php?service=$1&method=$2 [L,QSA]
-
-</IfModule>
-AddDefaultCharset   UTF-8
-php_value error_reporting      6135
-
-- Include in /etc/kolab/kolab.conf:
-
-[kolab_wap]
-; Database URI
-sql_uri = mysql://kolab_wap:*****@mysql.klab.cc/kolab_wap
-; URI to the API location, if not default. Example URI included
-;api_url = http://admin.klab.cc/~vanmeeuwen/kolab-wap/public_html/api/
-skin = default
-
-  NOTE: You need to create the user and database on the MySQL server, perhaps
-  like so:
-
-  # mysql -e "CREATE DATABASE kolab_wap;"
-  # mysql -e "GRANT ALL PRIVILEGES on kolab_wap.* to 'kolab_wap'@'admin.klab.cc'
-  > IDENTIFIED BY '*****';"
-  # mysql -e "FLUSH PRIVILEGES;"
-
-- Also include in /etc/kolab/kolab.conf the following settings:
-
-[ldap]
-auth_attrs = uid, mail, [mailalternateaddress|alias]
-; For 389 Directory Server
-unique_attribute = nsuniqueid
-; For OpenLDAP
-unique_attribute = entrydn
-
-  For a complete sample configuration file, please see:
-
-    doc/sample-kolab.conf
-
-- Make /etc/kolab/kolab.conf readable for the apache group, for example:
-
-# chown kolab-n kolab-n /etc/kolab/kolab.conf
-# gpasswd -a apache kolab-n
-
-- Initialize the kolab_wap database. For an example SQL file, please see:
-
-    doc/kolab_wap-*.sql
-
-  If you wanted to play with alternate types / attribute settings, please see
-  the following locations for sample PHP code you could use to insert your own
-  user_types, group_types and options;
-
-    doc/sample-insert-group_types.php
-    doc/sample-insert-options.php
-    doc/sample-insert-user_types.php
-
-  Save these to the kolab-wap root directory (next to the lib/ and public_html/
-  directories) as the *.php equivalent of these *.phps counterparts, and execute
-  them from the command-line.
-
-- You *should* now be ready to login. Please note that;
-
-  - The login dialog currently allows only a full DN, or a value of the mail
-    attribute of any LDAP object in the tree under the domain root dn.
-
-    See: https://issues.kolab.org/show_bug.cgi?id=594
-
-  - No effective rights to LDAP in general or LDAP objects in particular
-    currently propagate to the client UI properly. I.e., a regular user will be
-    presented with the opportunity to "Add a user", but can't. The Web Admin and
-    API are designed to always use the user's bind credentials.
-
-    See: https://issues.kolab.org/show_bug.cgi?id=661

kolab-webadmin-3.1.5.tar.gz/doc/kolab_wap-3.1.sql Deleted

@@ -1,191 +0,0 @@
--- MySQL dump 10.13  Distrib 5.1.69, for redhat-linux-gnu (x86_64)
---
--- Host: localhost    Database: kolab
--- ------------------------------------------------------
--- Server version	5.1.69
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `group_types`
---
-
-DROP TABLE IF EXISTS `group_types`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `group_types` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `key` text NOT NULL,
-  `name` varchar(256) NOT NULL,
-  `description` text NOT NULL,
-  `attributes` longtext NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `group_types`
---
-
-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},\"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},\"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\":[],\"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},\"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\":[],\"uniquemember\":{\"type\":\"list\",\"autocomplete\":true,\"optional\":true}}}');
-/*!40000 ALTER TABLE `group_types` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `options`
---
-
-DROP TABLE IF EXISTS `options`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `options` (
-  `attribute` varchar(128) NOT NULL,
-  `option_values` text NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `options`
---
-
-LOCK TABLES `options` WRITE;
-/*!40000 ALTER TABLE `options` DISABLE KEYS */;
-INSERT INTO `options` 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\"]'),('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\"]');
-/*!40000 ALTER TABLE `options` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `resource_types`
---
-
-DROP TABLE IF EXISTS `resource_types`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `resource_types` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `key` text NOT NULL,
-  `name` varchar(256) NOT NULL,
-  `description` text NOT NULL,
-  `attributes` longtext NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `resource_types`
---
-
-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\":[],\"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\":{\"cn\":[]}}'),(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\":{\"cn\":[]}}'),(4,'beamer','Beamer','A portable beamer','{\"auto_form_fields\":{\"cn\":{\"data\":[\"cn\"]},\"kolabtargetfolder\":{\"data\":[\"cn\"]},\"mail\":{\"data\":[\"cn\"]}},\"fields\":{\"objectclass\":[\"top\",\"kolabsharedfolder\",\"mailrecipient\"],\"kolabfoldertype\":[\"event\"]},\"form_fields\":{\"cn\":[]}}'),(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\":{\"cn\":[]}}');
-/*!40000 ALTER TABLE `resource_types` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `role_types`
---
-
-DROP TABLE IF EXISTS `role_types`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `role_types` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `key` text NOT NULL,
-  `name` varchar(256) NOT NULL,
-  `description` text NOT NULL,
-  `attributes` longtext NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `role_types`
---
-
-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\":[]}}');
-/*!40000 ALTER TABLE `role_types` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `sharedfolder_types`
---
-
-DROP TABLE IF EXISTS `sharedfolder_types`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `sharedfolder_types` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `key` text NOT NULL,
-  `name` varchar(256) NOT NULL,
-  `description` text NOT NULL,
-  `attributes` longtext NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `sharedfolder_types`
---
-
-LOCK TABLES `sharedfolder_types` WRITE;
-/*!40000 ALTER TABLE `sharedfolder_types` DISABLE KEYS */;
-INSERT INTO `sharedfolder_types` VALUES (1,'addressbook','Shared Address Book','A shared address book','{\"auto_form_fields\":[],\"fields\":{\"kolabfoldertype\":[\"contact\"],\"objectclass\":[\"top\",\"kolabsharedfolder\"]},\"form_fields\":{\"cn\":[]}}'),(2,'calendar','Shared Calendar','A shared calendar','{\"auto_form_fields\":[],\"fields\":{\"kolabfoldertype\":[\"event\"],\"objectclass\":[\"top\",\"kolabsharedfolder\"]},\"form_fields\":{\"cn\":[]}}'),(3,'journal','Shared Journal','A shared journal','{\"auto_form_fields\":[],\"fields\":{\"kolabfoldertype\":[\"journal\"],\"objectclass\":[\"top\",\"kolabsharedfolder\"]},\"form_fields\":{\"cn\":[]}}'),(4,'task','Shared Tasks','A shared tasks folder','{\"auto_form_fields\":[],\"fields\":{\"kolabfoldertype\":[\"task\"],\"objectclass\":[\"top\",\"kolabsharedfolder\"]},\"form_fields\":{\"cn\":[]}}'),(5,'mail','Shared Mail Folder','A shared mail folder','{\"auto_form_fields\":[],\"fields\":{\"kolabfoldertype\":[\"mail\"],\"objectclass\":[\"top\",\"kolabsharedfolder\",\"mailrecipient\"]},\"form_fields\":{\"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\":[]}}');
-/*!40000 ALTER TABLE `sharedfolder_types` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `user_types`
---
-
-DROP TABLE IF EXISTS `user_types`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `user_types` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `key` text NOT NULL,
-  `name` varchar(256) NOT NULL,
-  `description` text NOT NULL,
-  `attributes` longtext NOT NULL,
-  `used_for` varchar(16) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `user_types`
---
-
-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);
-/*!40000 ALTER TABLE `user_types` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2013-11-15 12:19:12

kolab-webadmin-3.1.5.tar.gz/lib/locale/de.php Deleted

@@ -1,288 +0,0 @@
-<?php
-
-$LANG['about.community'] = 'Dies ist die Community-Edition des <b>Kolab Servers</b>.';
-$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 <b>keinen Garantien</b> 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['add'] = 'Hinzufügen';
-
-$LANG['attribute.add'] = 'Attribut hinzufügen';
-$LANG['attribute.static'] = 'Statischer Wert';
-$LANG['attribute.name'] = 'Attribut';
-$LANG['attribute.optional'] = 'Optional';
-$LANG['attribute.maxcount'] = 'Max. Anzahl';
-$LANG['attribute.readonly'] = 'Schreibgeschützt';
-$LANG['attribute.type'] = 'Feldtyp';
-$LANG['attribute.value'] = 'Wert';
-$LANG['attribute.value.auto'] = 'Erzeugt';
-$LANG['attribute.value.auto-readonly'] = 'Erzeugt (schreibgeschützt)';
-$LANG['attribute.value.normal'] = 'Normal';
-$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'] = 'Required attributes missing in attributes list ($1)!';
-
-$LANG['button.cancel'] = 'Abbrechen';
-$LANG['button.delete'] = 'Löschen';
-$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.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.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['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.success'] = 'Gruppe erfolgreich gelöscht.';
-$LANG['group.edit.success'] = 'Gruppe erfolgreich aktualisiert.';
-$LANG['group.gidnumber'] = 'Primäre Gruppennummer';
-$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.system'] = 'System';
-$LANG['group.type_id'] = 'Gruppentyp';
-$LANG['group.uniquemember'] = 'Mitglieder';
-
-$LANG['info'] = 'Informationen';
-$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'] = 'Bedingungen';
-$LANG['ldap.scope'] = 'Scope';
-$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:';
-$LANG['login.password'] = 'Passwort:';
-$LANG['login.domain'] = 'Domäne:';
-$LANG['login.login'] = 'Anmelden';
-$LANG['loginerror'] = 'Ungültiger Benutzername oder Passwort!';
-$LANG['MB'] = 'MB';
-
-$LANG['menu.about'] = 'Über';
-$LANG['menu.domains'] = 'Domänen';
-$LANG['menu.groups'] = 'Gruppen';
-$LANG['menu.resources'] = 'Ressourcen';
-$LANG['menu.roles'] = 'Rollen';
-$LANG['menu.settings'] = 'Einstellungen';
-$LANG['menu.users'] = 'Benutzer';
-
-$LANG['modifiersname'] = 'Geändert von';
-$LANG['password.generate'] = 'Passwort erzeugen';
-$LANG['reqtime'] = 'Anfragezeit: $1 Sekunde(n)';
-
-$LANG['resource.add'] = 'Ressource hinzufügen';
-$LANG['resource.add.success'] = 'Ressource erfolgreich hinzugefügt.';
-$LANG['resource.cn'] = 'Name';
-$LANG['resource.delete'] = 'Ressource löschen';
-$LANG['resource.delete.success'] = 'Ressource erfolgreich gelöscht.';
-$LANG['resource.edit'] = 'Ressource bearbeiten';
-$LANG['resource.edit.success'] = 'Ressource erfolgreich bearbeitet.';
-$LANG['resource.kolabtargetfolder'] = 'Zielordner';
-$LANG['resource.list'] = 'Ressourcen-(Sammlung)-Liste';
-$LANG['resource.mail'] = 'Email-Adresse';
-$LANG['resource.member'] = 'Mitglieder der Sammlung';
-$LANG['resource.norecords'] = 'Keine Ressourceneinträge gefunden!';
-$LANG['resource.other'] = 'Andere';
-$LANG['resource.system'] = 'System';
-$LANG['resource.type_id'] = 'Ressourcentyp';
-$LANG['resource.uniquemember'] = 'Mitglieder der Sammlung';
-
-$LANG['role.add'] = 'Rolle hinzufügen';
-$LANG['role.add.success'] = 'Rolle erfolgreich erzeugt.';
-$LANG['role.cn'] = 'Rollenname';
-$LANG['role.delete.success'] = 'Rolle erfolgreich gelöscht.';
-$LANG['role.description'] = 'Rollenbeschreibung';
-$LANG['role.edit.success'] = 'Rolle erfolgreich bearbeitet';
-$LANG['role.list'] = 'Rollenliste';
-$LANG['role.norecords'] = 'Keine Rolleneinträge gefunden!';
-$LANG['role.system'] = 'Details';
-$LANG['role.type_id'] = 'Rollentyp';
-
-$LANG['saving'] = 'Speichern…';
-
-$LANG['search'] = 'Suchen';
-$LANG['search.reset'] = 'Zurücksetzen';
-$LANG['search.criteria'] = 'Suchkriterien';
-$LANG['search.field'] = 'Feld:';
-$LANG['search.method'] = 'Methode:';
-$LANG['search.contains'] = 'enthält';
-$LANG['search.is'] = 'ist';
-$LANG['search.key'] = 'Schlüssel';
-$LANG['search.prefix'] = 'beginnt mit';
-$LANG['search.name'] = 'Name';
-$LANG['search.email'] = 'Email';
-$LANG['search.description'] = 'Beschreibung';
-$LANG['search.uid'] = 'UID';
-$LANG['search.loading'] = 'Suchen…';
-$LANG['search.acchars'] = 'Mindestens $min Zeichen werden für die Autovervollständigung benötigt';
-
-$LANG['servererror'] = 'Server Fehler!';
-
-$LANG['session.expired'] = 'Die Sitzung ist abgelaufen. Bitte erneut anmelden';
-
-$LANG['signup.headline'] = 'Anmeldung für ein Kolab Konto';
-$LANG['signup.intro1'] = 'Ein Kolab E-Mail Adresse ist viel besser als eine normale E-Mail, denn sie stellt Ihnen volle Groupware-Funktionalität zur Verfügung, inklusive Synchronisation gemeinsamer Adressbücher, Kalender, Aufgaben, Notizen und vielem mehr.';
-$LANG['signup.intro2'] = 'Sie können sich hier eine E-Mail Adresse registrieren.';
-$LANG['signup.formtitle'] = 'Anmelden';
-$LANG['signup.username'] = 'Benutzername';
-$LANG['signup.domain'] = 'Domäne';
-$LANG['signup.mailalternateaddress'] = 'Aktuelle E-Mail Adresse';
-$LANG['signup.futuremail'] = 'Zukünftige E-Mail Adresse';
-$LANG['signup.company'] = 'Firma';
-$LANG['signup.captcha'] = 'CAPTCHA';
-$LANG['signup.userexists'] = 'Benutzer existiert bereits!';
-$LANG['signup.usercreated'] = '<h3>Ihre E-Mail Adresse wurde erfolgreich angelegt!</h3>Glückwunsch, Sie haben jetzt ein eigenes Kolab-Konto.';
-$LANG['signup.wronguid'] = 'Ungültiger Benutzername!';
-$LANG['signup.wrongmailalternateaddress'] = 'Bitte geben Sie eine gültige E-Mail Adresse an!';
-$LANG['signup.footer'] = 'Dieser Dienst wird von <a href="http://kolabsys.com">Kolab Systems</a> angeboten.';
-
-$LANG['type.add'] = 'Objekt-Typ hinzufügen';
-$LANG['type.add.success'] = 'Objekt-Typ erfolgreich generiert.';
-$LANG['type.attributes'] = 'Attribute';
-$LANG['type.description'] = 'Beschreibung';
-$LANG['type.delete.success'] = 'Objekt-Typ erfolgreich entfernt.';
-$LANG['type.domain'] = 'Domäne';
-$LANG['type.edit.success'] = 'Objekt-Typ erfolgreich geändert.';
-$LANG['type.group'] = 'Gruppe';
-$LANG['type.list'] = 'Liste von Objekt-Typen';
-$LANG['type.key'] = 'Schlüssel';
-$LANG['type.name'] = 'Name';
-$LANG['type.norecords'] = 'Keine Enträge von Objekt-Typen gefunden!';
-$LANG['type.objectclass'] = 'Objektklasse';
-$LANG['type.object_type'] = 'Objekttyp';
-$LANG['type.properties'] = 'Eigenschaften';
-$LANG['type.resource'] = 'Ressource';
-$LANG['type.role'] = 'Rolle';
-$LANG['type.used_for'] = 'Hosted';
-$LANG['type.user'] = 'Benutzer';
-

kolab-webadmin-3.1.5.tar.gz/lib/locale/en.php Deleted

@@ -1,288 +0,0 @@
-<?php
-
-$LANG['about.community'] = 'This is the Community Edition of the <b>Kolab Server</b>.';
-$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 <b>no warranties</b> 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['add'] = 'Add';
-
-$LANG['attribute.add'] = 'Add attribute';
-$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['button.cancel'] = 'Cancel';
-$LANG['button.delete'] = 'Delete';
-$LANG['button.save'] = '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.success'] = 'Domain deleted successfully.';
-$LANG['domain.edit'] = 'Edit domain';
-$LANG['domain.edit.success'] = 'Domain updated successfully.';
-$LANG['domain.inetdomainbasedn'] = 'Custom Root DN(s)';
-$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['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.success'] = 'Group deleted successfully.';
-$LANG['group.edit.success'] = 'Group updated successfully.';
-$LANG['group.gidnumber'] = 'Primary group number';
-$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.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';
-
-$LANG['list.records'] = '$1 to $2 of $3';
-
-$LANG['loading'] = 'Loading...';
-$LANG['logout'] = 'Logout';
-$LANG['login.username'] = 'Username:';
-$LANG['login.password'] = 'Password:';
-$LANG['login.domain'] = 'Domain:';
-$LANG['login.login'] = 'Login';
-$LANG['loginerror'] = 'Incorrect username or password!';
-$LANG['MB'] = 'MB';
-
-$LANG['menu.about'] = 'About';
-$LANG['menu.domains'] = 'Domains';
-$LANG['menu.groups'] = 'Groups';
-$LANG['menu.resources'] = 'Resources';
-$LANG['menu.roles'] = 'Roles';
-$LANG['menu.settings'] = 'Settings';
-$LANG['menu.users'] = 'Users';
-
-$LANG['modifiersname'] = 'Modified by';
-$LANG['password.generate'] = 'Generate password';
-$LANG['reqtime'] = 'Request time: $1 sec.';
-
-$LANG['resource.add'] = 'Add Resource';
-$LANG['resource.add.success'] = 'Resource created successfully.';
-$LANG['resource.cn'] = 'Name';
-$LANG['resource.delete'] = 'Delete Resource';
-$LANG['resource.delete.success'] = 'Resource deleted successfully.';
-$LANG['resource.edit'] = 'Edit Resource';
-$LANG['resource.edit.success'] = 'Resource updated successfully.';
-$LANG['resource.kolabtargetfolder'] = 'Target Folder';
-$LANG['resource.list'] = 'Resource (Collection) List';
-$LANG['resource.mail'] = 'Mail Address';
-$LANG['resource.member'] = 'Collection Members';
-$LANG['resource.norecords'] = 'No resource records found!';
-$LANG['resource.other'] = 'Other';
-$LANG['resource.system'] = 'System';
-$LANG['resource.type_id'] = 'Resource Type';
-$LANG['resource.uniquemember'] = 'Collection Members';
-
-$LANG['role.add'] = 'Add Role';
-$LANG['role.add.success'] = 'Role created successfully.';
-$LANG['role.cn'] = 'Role Name';
-$LANG['role.delete.success'] = 'Role deleted successfully.';
-$LANG['role.description'] = 'Role Description';
-$LANG['role.edit.success'] = 'Role updated successfully';
-$LANG['role.list'] = 'Role List';
-$LANG['role.norecords'] = 'No role records found!';
-$LANG['role.system'] = 'Details';
-$LANG['role.type_id'] = 'Role Type';
-
-$LANG['saving'] = 'Saving data...';
-
-$LANG['search'] = 'Search';
-$LANG['search.reset'] = 'Reset';
-$LANG['search.criteria'] = 'Search criteria';
-$LANG['search.field'] = 'Field:';
-$LANG['search.method'] = 'Method:';
-$LANG['search.contains'] = 'contains';
-$LANG['search.is'] = 'is';
-$LANG['search.key'] = 'key';
-$LANG['search.prefix'] = 'begins with';
-$LANG['search.name'] = 'name';
-$LANG['search.email'] = 'email';
-$LANG['search.description'] = 'description';
-$LANG['search.uid'] = 'UID';
-$LANG['search.loading'] = 'Searching...';
-$LANG['search.acchars'] = 'At least $min characters required for autocompletion';
-
-$LANG['servererror'] = 'Server Error!';
-
-$LANG['session.expired'] = 'Session has expired. Login again, please';
-
-$LANG['signup.headline'] = 'Sign Up for Hosted Kolab';
-$LANG['signup.intro1'] = 'Having an account on a Kolab server is way better than just simple Email. It also provides you with full groupware functionality including synchronization for shared addressbooks, calendars, tasks, journal and more.';
-$LANG['signup.intro2'] = 'You can sign up here now for an account.';
-$LANG['signup.formtitle'] = 'Sign Up';
-$LANG['signup.username'] = 'Username';
-$LANG['signup.domain'] = 'Domain';
-$LANG['signup.mailalternateaddress'] = 'Current Email Address';
-$LANG['signup.futuremail'] = 'Future Email Address';
-$LANG['signup.company'] = 'Company';
-$LANG['signup.captcha'] = 'CAPTCHA';
-$LANG['signup.userexists'] = 'User already exists!';
-$LANG['signup.usercreated'] = '<h3>Your account has been successfully added!</h3>Congratulations, you now have your own Kolab account.';
-$LANG['signup.wronguid'] = 'Invalid Username!';
-$LANG['signup.wrongmailalternateaddress'] = 'Please provide a valid Email Address!';
-$LANG['signup.footer'] = 'This is a service offered by <a href="http://kolabsys.com">Kolab Systems</a>.';
-
-$LANG['type.add'] = 'Add Object Type';
-$LANG['type.add.success'] = 'Object type created successfully.';
-$LANG['type.attributes'] = 'Attributes';
-$LANG['type.description'] = 'Description';
-$LANG['type.delete.success'] = 'Object type deleted successfully.';
-$LANG['type.domain'] = 'Domain';
-$LANG['type.edit.success'] = 'Object type updated successfully.';
-$LANG['type.group'] = 'Group';
-$LANG['type.list'] = 'Object Types List';
-$LANG['type.key'] = 'Key';
-$LANG['type.name'] = 'Name';
-$LANG['type.norecords'] = 'No object type records found!';
-$LANG['type.objectclass'] = 'Object class';
-$LANG['type.object_type'] = 'Object type';
-$LANG['type.properties'] = 'Properties';
-$LANG['type.resource'] = 'Resource';
-$LANG['type.role'] = 'Role';
-$LANG['type.used_for'] = 'Hosted';
-$LANG['type.user'] = 'User';
-

kolab-webadmin-3.2.tar.gz/bin/domain_delete.php Added

@@ -0,0 +1,128 @@
+<?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>                      |
+ +--------------------------------------------------------------------------+
+*/
+
+set_time_limit(0);
+
+require_once __DIR__ . '/../lib/functions.php';
+require_once 'Auth/LDAP.php';
+
+$LDAP = new LDAP();
+$CONF = Conf::get_instance();
+
+$username = $CONF->get('ldap', 'bind_dn');
+$password = $CONF->get('ldap', 'bind_pw');
+$domain   = $CONF->get('kolab', 'primary_domain');
+
+$LDAP->authenticate($username, $password, $domain);
+
+// get list of domains to delete
+$domains = list_deleted_domains();
+
+if (empty($domains)) {
+    die("Nothing to delete. Done.");
+}
+
+// delete domains
+foreach ($domains as $dn => $domain) {
+    delete_domain($dn, $domain);
+}
+
+
+function list_deleted_domains()
+{
+    global $LDAP, $CONF;
+
+    $result = $LDAP->list_domains(
+        array(
+            'associateddomain',
+            'inetdomainbasedn',
+            'inetdomainstatus',
+        ),
+        array(
+            'params' => array(
+                'inetdomainstatus' => array(
+                    'value' => 'deleted',
+                    'type'  => 'exact',
+                ),
+            ),
+        ),
+        array(
+            'page_size' => 999,
+            'page'      => 1,
+            'sort_by'   => 'associateddomain',
+        )
+    );
+
+    return $result['list'];
+}
+
+function delete_domain($domain_dn, $domain)
+{
+    global $LDAP, $CONF;
+
+    // get domain name
+    $domain_name = $domain['associateddomain'];
+    if (is_array($domain_name)) {
+        $domain_name = array_shift($domain_name);
+    }
+
+    // sanity check
+    if ($domain['inetdomainstatus'] != 'deleted') {
+        echo "Domain $domain_name is not marked for deletion. Skipped.";
+        return;
+    }
+
+    echo "Deleting domain $domain_name... ";
+
+    if (!empty($domain['inetdomainbasedn'])) {
+        $inetdomainbasedn = $domain['inetdomainbasedn'];
+    }
+    else {
+        $inetdomainbasedn = "dc=" . implode(',dc=', explode('.', $domain_name));
+    }
+
+    // only deletes associateddomain=domain.tld,cn=kolab,cn=config
+    if (!$LDAP->delete_entry($domain_dn)) {
+        echo "Error: Failed to delete $domain_dn.\n";
+        return;
+    }
+
+    $entries   = array();
+    $entries[] = $inetdomainbasedn;
+
+    $cn        = str_replace('.', '_', $domain_name);
+    $entries[] = "cn={$cn},cn=ldbm database,cn=plugins,cn=config";
+
+    $cn        = str_replace(array(',', '='), array('\2C', '\3D'), $inetdomainbasedn);
+    $entries[] = "cn={$cn},cn=mapping tree,cn=config";
+
+    foreach ($entries as $dn) {
+        if (!$LDAP->delete_entry_recursive($dn)) {
+            echo "Error: Failed to delete $dn.\n";
+            return;
+        }
+    }
+
+    echo "Done.\n";
+}

kolab-webadmin-3.2.tar.gz/doc/INSTALL Added

@@ -0,0 +1,105 @@
+= Kolab WAP Requirements =
+
+1. PHP >= 5.3 with specified settings:
+    - session.auto_start = Off
+1.1. PHP extensions:
+    - mysql
+    - mbstring
+    - ldap
+2. MySQL database
+3. Smarty 3.x
+4. PEAR packages:
+    - Mail
+    - HTTP_Request2
+    - Net_URL2
+    - Net_SMTP
+    - Net_LDAP3 (http://git.kolab.org/pear/Net_LDAP3/)
+
+
+= Kolab WAP Installation Instructions =
+
+- Put the contents of this directory somewhere you can visit with a browser.
+
+- Edit public_html/.htaccess to your needs. An example (for
+  http://admin.klab.cc/~vanmeeuwen/kolab-wap/public_html/.htaccess) is as
+  follows:
+
+<IfModule mod_rewrite.c>
+    RewriteEngine on
+    # NOTE: This needs to point to the base uri of your installation.
+    RewriteBase /~vanmeeuwen/kolab-wap/public_html
+
+    # Rewrite URLs of the form 'x' to the form 'index.php?q=x'.
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteCond %{REQUEST_URI} !=/favicon.ico
+    RewriteRule ^api/(.*)\.(.*)$ api/index.php?service=$1&method=$2 [L,QSA]
+
+</IfModule>
+AddDefaultCharset   UTF-8
+php_value error_reporting      6135
+
+- Include in /etc/kolab/kolab.conf:
+
+[kolab_wap]
+; Database URI
+sql_uri = mysql://kolab_wap:*****@mysql.klab.cc/kolab_wap
+; URI to the API location, if not default. Example URI included
+;api_url = http://admin.klab.cc/~vanmeeuwen/kolab-wap/public_html/api/
+skin = default
+
+  NOTE: You need to create the user and database on the MySQL server, perhaps
+  like so:
+
+  # mysql -e "CREATE DATABASE kolab_wap;"
+  # mysql -e "GRANT ALL PRIVILEGES on kolab_wap.* to 'kolab_wap'@'admin.klab.cc'
+  > IDENTIFIED BY '*****';"
+  # mysql -e "FLUSH PRIVILEGES;"
+
+- Also include in /etc/kolab/kolab.conf the following settings:
+
+[ldap]
+auth_attrs = uid, mail, [mailalternateaddress|alias]
+; For 389 Directory Server
+unique_attribute = nsuniqueid
+; For OpenLDAP
+unique_attribute = entrydn
+
+  For a complete sample configuration file, please see:
+
+    doc/sample-kolab.conf
+
+- Make /etc/kolab/kolab.conf readable for the apache group, for example:
+
+# chown kolab-n kolab-n /etc/kolab/kolab.conf
+# gpasswd -a apache kolab-n
+
+- Initialize the kolab_wap database. For an example SQL file, please see:
+
+    doc/kolab_wap-*.sql
+
+  If you wanted to play with alternate types / attribute settings, please see
+  the following locations for sample PHP code you could use to insert your own
+  user_types, group_types and options;
+
+    doc/sample-insert-group_types.php
+    doc/sample-insert-options.php
+    doc/sample-insert-user_types.php
+
+  Save these to the kolab-wap root directory (next to the lib/ and public_html/
+  directories) as the *.php equivalent of these *.phps counterparts, and execute
+  them from the command-line.
+
+- You *should* now be ready to login. Please note that;
+
+  - The login dialog currently allows only a full DN, or a value of the mail
+    attribute of any LDAP object in the tree under the domain root dn.
+
+    See: https://issues.kolab.org/show_bug.cgi?id=594
+
+  - No effective rights to LDAP in general or LDAP objects in particular
+    currently propagate to the client UI properly. I.e., a regular user will be
+    presented with the opportunity to "Add a user", but can't. The Web Admin and
+    API are designed to always use the user's bind credentials.
+
+    See: https://issues.kolab.org/show_bug.cgi?id=661

kolab-webadmin-3.2.tar.gz/doc/LICENSE Changed

kolab-webadmin-3.2.tar.gz/doc/kolab_wap.sql Added

@@ -0,0 +1,219 @@
+-- MySQL dump 10.13  Distrib 5.1.69, for redhat-linux-gnu (x86_64)
+--
+-- Host: localhost    Database: kolab
+-- ------------------------------------------------------
+-- Server version	5.1.69
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `group_types`
+--
+
+DROP TABLE IF EXISTS `group_types`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `group_types` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `key` text NOT NULL,
+  `name` varchar(256) NOT NULL,
+  `description` text NOT NULL,
+  `attributes` longtext NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `group_types`
+--
+
+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},\"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},\"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\":[],\"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},\"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\":[],\"uniquemember\":{\"type\":\"list\",\"autocomplete\":true,\"optional\":true}}}');
+/*!40000 ALTER TABLE `group_types` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `options`
+--
+
+DROP TABLE IF EXISTS `options`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `options` (
+  `attribute` varchar(128) NOT NULL,
+  `option_values` text NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `options`
+--
+
+LOCK TABLES `options` WRITE;
+/*!40000 ALTER TABLE `options` DISABLE KEYS */;
+INSERT INTO `options` 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\"]'),('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\"]');
+/*!40000 ALTER TABLE `options` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `ou_types`
+--
+
+DROP TABLE IF EXISTS `ou_types`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `ou_types` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `key` text NOT NULL,
+  `name` varchar(256) NOT NULL,
+  `description` text NOT NULL,
+  `attributes` longtext NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `ou_types`
+--
+
+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\":[]}}');
+/*!40000 ALTER TABLE `ou_types` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `resource_types`
+--
+
+DROP TABLE IF EXISTS `resource_types`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `resource_types` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `key` text NOT NULL,
+  `name` varchar(256) NOT NULL,
+  `description` text NOT NULL,
+  `attributes` longtext NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `resource_types`
+--
+
+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\":[],\"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\":{\"cn\":[]}}'),(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\":{\"cn\":[]}}'),(4,'beamer','Beamer','A portable beamer','{\"auto_form_fields\":{\"cn\":{\"data\":[\"cn\"]},\"kolabtargetfolder\":{\"data\":[\"cn\"]},\"mail\":{\"data\":[\"cn\"]}},\"fields\":{\"objectclass\":[\"top\",\"kolabsharedfolder\",\"mailrecipient\"],\"kolabfoldertype\":[\"event\"]},\"form_fields\":{\"cn\":[]}}'),(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\":{\"cn\":[]}}');
+/*!40000 ALTER TABLE `resource_types` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `role_types`
+--
+
+DROP TABLE IF EXISTS `role_types`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `role_types` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `key` text NOT NULL,
+  `name` varchar(256) NOT NULL,
+  `description` text NOT NULL,
+  `attributes` longtext NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `role_types`
+--
+
+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\":[]}}');
+/*!40000 ALTER TABLE `role_types` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `sharedfolder_types`
+--
+
+DROP TABLE IF EXISTS `sharedfolder_types`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `sharedfolder_types` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `key` text NOT NULL,
+  `name` varchar(256) NOT NULL,
+  `description` text NOT NULL,
+  `attributes` longtext NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `sharedfolder_types`
+--
+
+LOCK TABLES `sharedfolder_types` WRITE;
+/*!40000 ALTER TABLE `sharedfolder_types` DISABLE KEYS */;
+INSERT INTO `sharedfolder_types` VALUES (1,'addressbook','Shared Address Book','A shared address book','{\"auto_form_fields\":[],\"fields\":{\"kolabfoldertype\":[\"contact\"],\"objectclass\":[\"top\",\"kolabsharedfolder\"]},\"form_fields\":{\"cn\":[]}}'),(2,'calendar','Shared Calendar','A shared calendar','{\"auto_form_fields\":[],\"fields\":{\"kolabfoldertype\":[\"event\"],\"objectclass\":[\"top\",\"kolabsharedfolder\"]},\"form_fields\":{\"cn\":[]}}'),(3,'journal','Shared Journal','A shared journal','{\"auto_form_fields\":[],\"fields\":{\"kolabfoldertype\":[\"journal\"],\"objectclass\":[\"top\",\"kolabsharedfolder\"]},\"form_fields\":{\"cn\":[]}}'),(4,'task','Shared Tasks','A shared tasks folder','{\"auto_form_fields\":[],\"fields\":{\"kolabfoldertype\":[\"task\"],\"objectclass\":[\"top\",\"kolabsharedfolder\"]},\"form_fields\":{\"cn\":[]}}'),(5,'mail','Shared Mail Folder','A shared mail folder','{\"auto_form_fields\":[],\"fields\":{\"kolabfoldertype\":[\"mail\"],\"objectclass\":[\"top\",\"kolabsharedfolder\",\"mailrecipient\"]},\"form_fields\":{\"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\":[]}}');
+/*!40000 ALTER TABLE `sharedfolder_types` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `user_types`
+--
+
+DROP TABLE IF EXISTS `user_types`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `user_types` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `key` text NOT NULL,
+  `name` varchar(256) NOT NULL,
+  `description` text NOT NULL,
+  `attributes` longtext NOT NULL,
+  `used_for` varchar(16) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+

kolab-webadmin-3.2.tar.gz/doc/sample-insert-ou_types.php Added

@@ -0,0 +1,35 @@
+#!/usr/bin/php
+<?php
+
+    if (isset($_SERVER["REQUEST_METHOD"]) && !empty($SERVER["REQUEST_METHOD"])) {
+        die("Not intended for execution through the webserver, sorry!");
+    }
+
+    require_once("lib/functions.php");
+
+    $db   = SQL::get_instance();
+
+    $result = $db->query("TRUNCATE `ou_types`");
+
+    $attributes = Array(
+            "auto_form_fields" => Array(
+                ),
+            "fields" => Array(
+                    "objectclass" => Array(
+                            "top",
+                            "organizationalunit",
+                        ),
+                ),
+            "form_fields" => Array(
+                    "ou" => Array(),
+                    "description" => Array(
+                        "optional" => true,
+                    ),
+                ),
+        );
+
+    $result = $db->query("INSERT INTO `ou_types` (`key`, `name`, `description`, `attributes`) " .
+                "VALUES ('simple_managed','Standard Organizational Unit', 'A standard organizational unit definition'," .
+                "'" . json_encode($attributes) . "')");
+
+?>

kolab-webadmin-3.1.5.tar.gz/lib/Auth.php -> kolab-webadmin-3.2.tar.gz/lib/Auth.php Changed

@@ -181,24 +181,6 @@
         return $this->_auth[$domain];
     }
 
-    // TODO: Dummy function to be removed
-    public function attr_details($attribute)
-    {
-        $conf   = Conf::get_instance();
-        $domain = $conf->get('kolab', 'primary_domain');
-
-        return $this->auth_instance($domain)->attribute_details((array)$attribute);
-    }
-
-    // TODO: Dummy function to be removed
-    public function attrs_allowed($objectclasses = array())
-    {
-        $conf   = Conf::get_instance();
-        $domain = $conf->get('kolab', 'primary_domain');
-
-        return $this->auth_instance($domain)->allowed_attributes($objectclasses);
-    }
-
     public function allowed_attributes($objectclasses = array())
     {
         return $this->auth_instance()->allowed_attributes((array)$objectclasses);
@@ -234,6 +216,11 @@
         return $this->auth_instance()->domain_info($domaindata);
     }
 
+    public function domain_is_empty($domain)
+    {
+        return $this->auth_instance()->domain_is_empty($domain);
+    }
+
     public function find_recipient($address)
     {
         return $this->auth_instance()->find_recipient($address);
@@ -315,31 +302,39 @@
         return $this->auth_instance($domain)->list_roles($attributes, $search, $params);
     }
 
+    public function list_organizationalunits($domain = NULL, $attributes = array(), $search = array(), $params = array())
+    {
+        return $this->auth_instance($domain)->list_organizationalunits($attributes, $search, $params);
+    }
+
     public function list_sharedfolders($domain = NULL, $attributes = array(), $search = array(), $params = array())
     {
         return $this->auth_instance($domain)->list_sharedfolders($attributes, $search, $params);
     }
 
-    public function primary_for_valid_domain($domain)
+    public function organizationalunit_add($attributes, $typeid = null)
     {
-        $this->domains = $this->list_domains();
+        return $this->auth_instance()->organizationalunit_add($attributes, $typeid);
+    }
 
-        if (array_key_exists($domain, $this->domains)) {
-            return $domain;
-        }
-        else if (in_array($domain, $this->domains)) {
-            // We know it's not a key!
-            foreach ($this->domains as $parent_domain => $child_domains) {
-                if (in_array($domain, $child_domains)) {
-                    return $parent_domain;
-                }
-            }
+    public function organizationalunit_edit($resource, $attributes, $typeid = null)
+    {
+        return $this->auth_instance()->organizationalunit_edit($resource, $attributes, $typeid);
+    }
 
-            return FALSE;
-        }
-        else {
-            return FALSE;
-        }
+    public function organizationalunit_delete($subject)
+    {
+        return $this->auth_instance()->organizationalunit_delete($subject);
+    }
+
+    public function organizationalunit_find_by_attribute($attribute)
+    {
+        return $this->auth_instance()->organizationalunit_find_by_attribute($attribute);
+    }
+
+    public function organizationalunit_info($resourcedata)
+    {
+        return $this->auth_instance()->organizationalunit_info($resourcedata);
     }
 
     public function resource_add($attributes, $typeid = null)
@@ -367,9 +362,9 @@
         return $this->auth_instance()->resource_info($resourcedata);
     }
 
-    public function role_add($role)
+    public function role_add($role, $typeid = null)
     {
-        return $this->auth_instance()->role_add($role);
+        return $this->auth_instance()->role_add($role, $typeid = null);
     }
 
     public function role_edit($role, $attributes, $typeid = null)

kolab-webadmin-3.1.5.tar.gz/lib/Auth/LDAP.php -> kolab-webadmin-3.2.tar.gz/lib/Auth/LDAP.php Changed

@@ -159,9 +159,12 @@
 
         $domain_base_dn        = $this->conf->get('ldap', 'domain_base_dn');
         $domain_name_attribute = $this->conf->get('ldap', 'domain_name_attribute');
+        $service_bind_dn       = $this->conf->get('ldap', 'service_bind_dn');
         $primary_domain        = $this->conf->get('kolab', 'primary_domain');
-        $_primary_domain       = str_replace('.', '_', $primary_domain);
-        $_domain               = str_replace('.', '_', $domain);
+
+        if (empty($service_bind_dn)) {
+            $service_bind_dn = $this->conf->get('ldap', 'bind_dn');
+        }
 
         if (empty($domain_name_attribute)) {
             $domain_name_attribute = 'associateddomain';
@@ -175,9 +178,9 @@
             array_unshift($attributes[$domain_name_attribute], $domain);
         }
 
-        $dn = $domain_name_attribute . '=' . $domain . ',' . $domain_base_dn;
+        $domain_dn = $domain_name_attribute . '=' . $domain . ',' . $domain_base_dn;
 
-        $result = $this->add_entry($dn, $attributes);
+        $result = $this->add_entry($domain_dn, $attributes);
 
         if (!$result) {
             return false;
@@ -190,124 +193,6 @@
             $inetdomainbasedn = $this->_standard_root_dn($domain);
         }
 
-        $cn = str_replace(array(',', '='), array('\2C', '\3D'), $inetdomainbasedn);
-
-        $dn = "cn=" . $cn . ",cn=mapping tree,cn=config";
-        $attrs = array(
-            'objectclass' => array(
-                'top',
-                'extensibleObject',
-                'nsMappingTree',
-            ),
-            'nsslapd-state'   => 'backend',
-            'cn'              => $inetdomainbasedn,
-            'nsslapd-backend' => $_domain,
-        );
-
-        $replica_hosts = $this->list_replicas();
-
-        if (!empty($replica_hosts)) {
-            foreach ($replica_hosts as $replica_host) {
-                Log::trace("Iterating over replication partners (now: $replica_host)");
-                $ldap = new Net_LDAP3($this->config);
-                $ldap->config_set("log_hook", array($this, "_log"));
-                $ldap->config_set('host', $replica_host);
-                $ldap->config_set('hosts', array($replica_host));
-                $ldap->connect();
-                $ldap->bind($_SESSION['user']->user_bind_dn, $_SESSION['user']->user_bind_pw);
-                $result = $ldap->add_entry($dn, $attrs);
-
-                if (!$result) {
-                    Log::error("Error adding $dn to $replica_host");
-                }
-
-                $ldap->close();
-            }
-        } else {
-            $this->add_entry($dn, $attrs);
-        }
-
-        $result = $this->_read("cn=" . $_primary_domain . ",cn=ldbm database,cn=plugins,cn=config", array('nsslapd-directory'));
-        if (!$result) {
-            $result = $this->_read("cn=" . $primary_domain . ",cn=ldbm database,cn=plugins,cn=config", array('nsslapd-directory'));
-        }
-
-        if (!$result) {
-            $result = $this->_read("cn=userRoot,cn=ldbm database,cn=plugins,cn=config", array('nsslapd-directory'));
-        }
-
-        $this->_log(LOG_DEBUG, "Primary domain ldbm database configuration entry: " . var_export($result, true));
-
-        $result         = $result[key($result)];
-        $orig_directory = $result['nsslapd-directory'];
-        $directory      = str_replace($_primary_domain, $_domain, $result['nsslapd-directory']);
-
-        if ($directory == $orig_directory) {
-            $directory = str_replace($primary_domain, $_domain, $result['nsslapd-directory']);
-        }
-
-        if ($directory == $orig_directory) {
-            $directory = str_replace("userRoot", $_domain, $result['nsslapd-directory']);
-        }
-
-        $dn = "cn=" . $_domain . ",cn=ldbm database,cn=plugins,cn=config";
-        $attrs = array(
-            'objectclass' => array(
-                'top',
-                'extensibleobject',
-                'nsbackendinstance',
-             ),
-            'cn'                     => $_domain,
-            'nsslapd-suffix'         => $inetdomainbasedn,
-            'nsslapd-cachesize'      => '-1',
-            'nsslapd-cachememsize'   => '10485760',
-            'nsslapd-readonly'       => 'off',
-            'nsslapd-require-index'  => 'off',
-            'nsslapd-dncachememsize' => '10485760'
-        );
-
-        if (!empty($replica_hosts)) {
-            foreach ($replica_hosts as $replica_host) {
-                $ldap = new Net_LDAP3($this->config);
-                $ldap->config_set("log_hook", array($this, "_log"));
-                $ldap->config_set('host', $replica_host);
-                $ldap->config_set('hosts', array($replica_host));
-                $ldap->connect();
-                $ldap->bind($_SESSION['user']->user_bind_dn, $_SESSION['user']->user_bind_pw);
-
-                $ldap->config_set('return_attributes', array('nsslapd-directory'));
-                $result = $ldap->get_entry("cn=" . $_primary_domain . ",cn=ldbm database,cn=plugins,cn=config");
-                if (!$result) {
-                    $result = $ldap->get_entry("cn=" . $primary_domain . ",cn=ldbm database,cn=plugins,cn=config");
-                }
-
-                if (!$result) {
-                    $result = $ldap->get_entry("cn=userRoot,cn=ldbm database,cn=plugins,cn=config");
-                }
-
-                $this->_log(LOG_DEBUG, "Primary domain ldbm database configuration entry: " . var_export($result, true));
-
-                $result         = $result[key($result)];
-                $orig_directory = $result['nsslapd-directory'];
-                $directory      = str_replace($_primary_domain, $_domain, $result['nsslapd-directory']);
-
-                if ($directory == $orig_directory) {
-                    $directory = str_replace($primary_domain, $_domain, $result['nsslapd-directory']);
-                }
-
-                if ($directory == $orig_directory) {
-                    $directory = str_replace("userRoot", $_domain, $result['nsslapd-directory']);
-                }
-
-                $attrs['nsslapd-directory'] = $directory;
-
-                $ldap->add_entry($dn, $attrs);
-                $ldap->close();
-            }
-        } else {
-            $this->add_entry($dn, $attrs);
-        }
-
         // Query the ACI for the primary domain
         if ($domain_entry = $this->_find_domain($primary_domain)) {
             $domain_entry = array_shift($domain_entry);
@@ -332,13 +217,6 @@
             $_aci = $aci;
         }
 
-        $service_bind_dn = $this->conf->get('ldap', 'service_bind_dn');
-        if (empty($service_bind_dn)) {
-            $service_bind_dn = $this->conf->get('ldap', 'bind_dn');
-        }
-
-        $dn = $inetdomainbasedn;
-
         // @TODO: this list should be configurable or auto-created somehow
         $self_attrs = array(
             'carLicense', 'description', 'displayName', 'facsimileTelephoneNumber', 'homePhone',
@@ -352,31 +230,65 @@
              $self_attrs = array_merge($self_attrs, array('kolabDelegate', 'kolabInvitationPolicy', 'kolabAllowSMTPSender'));
         }
 
-        $attrs = array(
-            // @TODO: Probably just use ldap_explode_dn()
-            'dc' => substr($dn, (strpos($dn, '=')+1), ((strpos($dn, ',')-strpos($dn, '='))-1)),
-            'objectclass' => array(
-                'top',
-                'domain',
+        $_domain = str_replace('.', '_', $domain);
+        $dn      = $inetdomainbasedn;
+        $cn      = str_replace(array(',', '='), array('\2C', '\3D'), $dn);
+
+        // Additional domain entries in various trees
+        $entries = array(
+            "cn={$cn},cn=mapping tree,cn=config" => array(
+                'objectclass' => array(
+                    'top',
+                    'extensibleObject',
+                    'nsMappingTree',
+                ),
+                'nsslapd-state'   => 'backend',
+                'cn'              => $inetdomainbasedn,
+                'nsslapd-backend' => $_domain,
+            ),
+            "cn={$_domain},cn=ldbm database,cn=plugins,cn=config" => array(
+                'objectclass' => array(
+                    'top',
+                    'extensibleobject',
+                    'nsbackendinstance',
+                ),
+                'cn'                     => $_domain,
+                'nsslapd-suffix'         => $inetdomainbasedn,

kolab-webadmin-3.2.tar.gz/lib/SQL Added

kolab-webadmin-3.1.5.tar.gz/lib/SQL.php -> kolab-webadmin-3.2.tar.gz/lib/SQL.php Changed

@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------------+
  | This file is part of the Kolab Web Admin Panel                           |
  |                                                                          |
- | Copyright (C) 2011-2012, Kolab Systems AG                                |
+ | 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 |
@@ -27,128 +27,509 @@
 {
     static private $instance = array();
 
-    private $sql_uri = "mysql://username:password@hostname/database";
+    private $name;
+    private $conn       = false;
+    private $conn_tried = false;
 
-    /* Placeholder for the existing MySQL connection */
-    private $conn = false;
+    protected $sql_uri;
+    protected $last_result;
+    protected $db_error;
+    protected $db_error_msg;
 
-    private $conn_tried = false;
-    private $sql_stats = array(
-        'queries' => 0,
-        'query_time' => 0,
-        'connections' => 0
+    protected $options = array(
+        // column/table quotes
+        'identifier_start' => '"',
+        'identifier_end'   => '"',
     );
 
+
     /**
      * This implements the 'singleton' design pattern
      *
      * @return SQL The one and only instance associated with $_conn
      */
-    static function get_instance($_conn = 'kolab_wap')
+    static function get_instance($conn_name = 'kolab_wap')
     {
-        if (!isset(self::$instance[$_conn])) {
-            self::$instance[$_conn] = new SQL($_conn);
+        if (!array_key_exists($conn_name, self::$instance)) {
+            self::$instance[$conn_name] = SQL::factory($conn_name);
         }
 
-        return self::$instance[$_conn];
+        return self::$instance[$conn_name];
     }
 
-    public function __construct($_conn = 'kolab_wap')
+    /**
+     * Class constructor
+     */
+    public function __construct($conn_name, $conn_dsn)
+    {
+        $this->name    = $conn_name;
+        $this->sql_uri = $conn_dsn;
+    }
+
+    /**
+     * Factory, returns driver-specific instance of the class
+     *
+     * @return SQL Object instance
+     */
+    public static function factory($conn_name = 'kolab_wap')
     {
         $conf = Conf::get_instance();
+        $dsn  = $conf->get($conn_name, 'sql_uri');
 
-        $this->name    = $_conn;
-        $this->sql_uri = $conf->get($_conn, 'sql_uri');
+        $driver     = strtolower(substr($dsn, 0, strpos($dsn, ':')));
+        $driver_map = array(
+            'sqlite2' => 'sqlite',
+            'sybase'  => 'mssql',
+            'dblib'   => 'mssql',
+            'mysqli'  => 'mysql',
+            'oracle'  => 'oci',
+        );
+
+        $driver = isset($driver_map[$driver]) ? $driver_map[$driver] : $driver;
+        $class  = "SQL_$driver";
+
+        if (!$driver || !class_exists($class)) {
+            Log::error("Configuration error. Unsupported database driver: $driver");
+            exit;
+        }
+
+        return new $class($conn_name, $dsn);
     }
 
-    public function query()
+    /**
+     * Connects to database
+     */
+    protected function connect()
     {
-        if (!$this->conn) {
-            $this->_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_string  = $this->dsn_string($dsn);
+            $dsn_options = $this->dsn_options($dsn);
+
+            // Connect
+            try {
+                // with this check we skip fatal error on PDO object creation
+                if (!class_exists('PDO', false)) {
+                    throw new Exception('PDO extension not loaded. See http://php.net/manual/en/intro.pdo.php');
+                }
+
+                $this->conn_prepare();
+
+                $this->conn = new PDO($dsn_string, $dsn['username'], $dsn['password'], $dsn_options);
+
+                // don't throw exceptions or warnings
+                $this->conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
+
+                $this->conn_configure();
+            }
+            catch (Exception $e) {
+                Log::error('DB Error: ' . $e->getMessage());
+            }
         }
 
-        $i     = 0;
-        $start = 0;
-        $query = func_get_arg(0);
+        return $this->conn;
+    }
+
+    /**
+     * Driver-specific preparation of database connection
+     */
+    protected function conn_prepare()
+    {
+    }
 
-        while (strlen($query) > $start && ($pos = strpos($query, '?', $start)) !== false) {
-            $i++;
-            $param = $this->escape(func_get_arg($i));
+    /**
+     * Driver-specific configuration of database connection
+     */
+    protected function conn_configure()
+    {
+    }
 
-            $query = substr_replace($query, $param, $pos, 1);
-            $start = $pos + strlen($param) + 1;
+    /**
+     * 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 PDOStatement|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);
         }
 
-        Log::trace("SQL: $query");
+        $pos = 0;
+        $idx = 0;
+
+        if (count($params)) {
+            while ($pos = strpos($query, '?', $pos)) {
+                if ($query[$pos+1] == '?') {  // skip escaped '?'
+                    $pos += 2;
+                }
+                else {
+                    $val = $this->quote($params[$idx++]);
+                    unset($params[$idx-1]);
+                    $query = substr_replace($query, $val, $pos, 1);
+                    $pos += strlen($val);
+                }
+            }

kolab-webadmin-3.2.tar.gz/lib/SQL/mysql.php Added

@@ -0,0 +1,133 @@
+<?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
+ *
+ * This is a wrapper for the PHP PDO
+ */
+class SQL_mysql extends SQL
+{
+    public $db_provider = 'mysql';
+
+    /**
+     * Object constructor
+     */
+    public function __construct($conn_name, $conn_dsn)
+    {
+        parent::__construct($conn_name, $conn_dsn);
+
+        // SQL identifiers quoting
+        $this->options['identifier_start'] = '`';
+        $this->options['identifier_end'] = '`';
+    }
+
+    /**
+     * Driver-specific configuration of database connection
+     */
+    protected function conn_configure()
+    {
+        if ($this->conn) {
+            $this->conn->query("SET NAMES 'utf8'");
+        }
+    }
+
+    /**
+     * Returns PDO DSN string from DSN array
+     *
+     * @param array $dsn DSN parameters
+     *
+     * @return string Connection string
+     */
+    protected function dsn_string($dsn)
+    {
+        $params = array();
+        $result = 'mysql:';
+
+        if ($dsn['database']) {
+            $params[] = 'dbname=' . $dsn['database'];
+        }
+
+        if ($dsn['hostspec']) {
+            $params[] = 'host=' . $dsn['hostspec'];
+        }
+
+        if ($dsn['port']) {
+            $params[] = 'port=' . $dsn['port'];
+        }
+
+        if ($dsn['socket']) {
+            $params[] = 'unix_socket=' . $dsn['socket'];
+        }
+
+        $params[] = 'charset=utf8';
+
+        if (!empty($params)) {
+            $result .= implode(';', $params);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns driver-specific connection options
+     *
+     * @param array $dsn DSN parameters
+     *
+     * @return array Connection options
+     */
+    protected function dsn_options($dsn)
+    {
+        $result = array();
+
+        if (!empty($dsn['key'])) {
+            $result[PDO::MYSQL_ATTR_SSL_KEY] = $dsn['key'];
+        }
+
+        if (!empty($dsn['cipher'])) {
+            $result[PDO::MYSQL_ATTR_SSL_CIPHER] = $dsn['cipher'];
+        }
+
+        if (!empty($dsn['cert'])) {
+            $result[PDO::MYSQL_ATTR_SSL_CERT] = $dsn['cert'];
+        }
+
+        if (!empty($dsn['capath'])) {
+            $result[PDO::MYSQL_ATTR_SSL_CAPATH] = $dsn['capath'];
+        }
+
+        if (!empty($dsn['ca'])) {
+            $result[PDO::MYSQL_ATTR_SSL_CA] = $dsn['ca'];
+        }
+
+        // Always return matching (not affected only) rows count
+        $result[PDO::MYSQL_ATTR_FOUND_ROWS] = true;
+
+        // Enable AUTOCOMMIT mode
+        $result[PDO::ATTR_AUTOCOMMIT] = true;
+
+        return $result;
+    }
+}

kolab-webadmin-3.1.5.tar.gz/lib/User.php -> kolab-webadmin-3.2.tar.gz/lib/User.php Changed

kolab-webadmin-3.1.5.tar.gz/lib/api/kolab_api_service_domain.php -> kolab-webadmin-3.2.tar.gz/lib/api/kolab_api_service_domain.php Changed

@@ -77,7 +77,7 @@
         Log::trace("domain.add(\$getdata = " . var_export($getdata, TRUE) . ", \$postdata = " . var_export($postdata, TRUE) . ")");
 
         $conf = Conf::get_instance();
-        $dna = $conf->get('domain_name_attribute');
+        $dna  = $conf->get('domain_name_attribute');
 
         if (empty($dna)) {
             $dna = 'associateddomain';
@@ -91,11 +91,21 @@
         $auth = Auth::get_instance($conf->get('kolab', 'primary_domain'));
 
         // parse input attributes
-        $domain_attributes       = $this->parse_input_attributes('domain', $postdata);
-        $domain_attributes[$dna] = (array)$domain_attributes[$dna];
-        $domain                  = array_shift($domain_attributes[$dna]);
+        $attributes       = $this->parse_input_attributes('domain', $postdata);
+        $attributes[$dna] = (array) $attributes[$dna];
+        $domain           = array_shift($attributes[$dna]);
+
+        $result = $auth->domain_add($domain, $attributes);
+
+        if ($result) {
+            if ($id = $this->unique_attribute_value($result)) {
+                $attributes['id'] = $id;
+            }
+
+            return $attributes;
+        }
 
-        return $auth->domain_add($domain, $domain_attributes);
+        return false;
     }
 
     /**
@@ -105,6 +115,7 @@
      * @param array $post POST parameters
      *
      * @return bool True on success, False on failure
+     * @throws kolab_api_exception
      */
     public function domain_delete($getdata, $postdata)
     {
@@ -115,8 +126,15 @@
             return false;
         }
 
-        // TODO: Input validation
-        $auth   = Auth::get_instance();
+        $auth = Auth::get_instance();
+
+        // check if domain is empty
+        if (empty($postdata['force']) || strtolower($postdata['force']) == 'false') {
+            if (!$auth->domain_is_empty($postdata['id'])) {
+                throw new kolab_api_exception(kolab_api_exception::DOMAIN_NOT_EMPTY);
+            }
+        }
+
         $result = $auth->domain_delete($postdata['id']);
 
         if ($result) {
@@ -135,13 +153,25 @@
             return false;
         }
 
-        $auth       = Auth::get_instance();
+        $auth = Auth::get_instance();
+
+        // check if domain is empty when changing status to deleted, as in domain.delete
+        if ($postdata['inetdomainstatus'] == 'deleted'
+            && (empty($postdata['force']) || strtolower($postdata['force']) == 'false')
+        ) {
+            $domain = $auth->domain_info($postdata['id']);
+
+            if ($domain['inetdomainstatus'] != 'deleted' && !$auth->domain_is_empty($postdata['id'])) {
+                throw new kolab_api_exception(kolab_api_exception::DOMAIN_NOT_EMPTY);
+            }
+        }
+
+
         $attributes = $this->parse_input_attributes('domain', $postdata);
         $result     = $auth->domain_edit($postdata['id'], $attributes, $postdata['type_id']);
 
-        // @TODO: return unique attribute or all attributes as domain_add()
         if ($result) {
-            return true;
+            return $result;
         }
 
         return false;
@@ -160,7 +190,7 @@
         // TODO: Input validation
         if (!empty($getdata[$dna])) {
             $entry_dn    = $getdata[$dna];
-            $unique_attr = $this->unique_attribute();
+            $unique_attr = self::unique_attribute();
             $domain      = $auth->domain_find_by_attribute(array($unique_attr => $entry_dn));
 
             if (!empty($domain)) {

kolab-webadmin-3.1.5.tar.gz/lib/api/kolab_api_service_domain_types.php -> kolab-webadmin-3.2.tar.gz/lib/api/kolab_api_service_domain_types.php Changed

kolab-webadmin-3.1.5.tar.gz/lib/api/kolab_api_service_domains.php -> kolab-webadmin-3.2.tar.gz/lib/api/kolab_api_service_domains.php Changed

kolab-webadmin-3.1.5.tar.gz/lib/api/kolab_api_service_form_value.php -> kolab-webadmin-3.2.tar.gz/lib/api/kolab_api_service_form_value.php Changed

@@ -695,8 +695,6 @@
 
     private function generate_secondary_mail($postdata, $attribs = array())
     {
-        $secondary_mail_addresses = Array();
-
         if (isset($attribs['auto_form_fields'])) {
             if (isset($attribs['auto_form_fields']['alias'])) {
                 $secondary_mail_key = 'alias';
@@ -755,16 +753,15 @@
                 }
 
                 $secondary_mail_addresses[] = $local . "@" . $_domain;
-
             }
 
-            if (in_array($postdata['mail'], $secondary_mail_addresses)) {
+            if (($key = array_search($postdata['mail'], $secondary_mail_addresses)) !== false) {
                 Log::trace("Found primary mail as part of the secondary mail addresses");
 
-                unset($secondary_mail_addresses[array_search($postdata['mail'], $secondary_mail_addresses)]);
+                unset($secondary_mail_addresses[$key]);
             }
 
-            return $secondary_mail_addresses;
+            return array_unique($secondary_mail_addresses);
         }
     }
 
@@ -867,42 +864,12 @@
 
     private function list_options_kolabdelegate($postdata, $attribs = array())
     {
-        // return specified records only, by exact DN attributes
-        if (!empty($postdata['list'])) {
-            $data['page_size'] = count($postdata['list']);
-            $data['search'] = array(
-                'entrydn' => array(
-                    'value' => $postdata['list'],
-                    'type'  => 'exact',
-                ),
-            );
-        }
-        // return records with specified string
-        else {
-            $keyword = array('value' => $postdata['search']);
-            $data['page_size'] = 15;
-            $data['search']    = array(
-                'displayname' => $keyword,
-                'cn'          => $keyword,
-                'mail'        => $keyword,
-            );
-        }
-
-        $data['attributes'] = array('displayname', 'mail');
-
-        $service = $this->controller->get_service('users');
-        $result  = $service->users_list(null, $data);
-        $list    = $result['list'];
-
-        // convert to key=>value array
-        foreach ($list as $idx => $value) {
-            $list[$idx] = $value['displayname'];
-            if (!empty($value['mail'])) {
-                $list[$idx] .= ' <' . $value['mail'] . '>';
-            }
-        }
+        return $this->_list_options_users($postdata, $attribs);
+    }
 
-        return $list;
+    private function list_options_owner($postdata, $attribs = array())
+    {
+        return $this->_list_options_users($postdata, $attribs);
     }
 
     private function list_options_member($postdata, $attribs = array())
@@ -983,6 +950,22 @@
 
     private function select_options_attribute($postdata, $attribs = array())
     {
+        // if objectClasses aren't specified we'll use all classes already in use
+        // not all classes in LDAP
+        if (empty($postdata['classes'])) {
+            $postdata['classes'] = array();
+
+            foreach ($this->supported_types as $type) {
+                foreach ($this->object_types($type) as $obj_type) {
+                    if ($obj_type['attributes'] && $obj_type['attributes']['fields']) {
+                        $postdata['classes'] = array_merge($postdata['classes'], (array) $obj_type['attributes']['fields']['objectclass']);
+                    }
+                }
+            }
+        }
+
+        $postdata['classes'] = array_unique($postdata['classes']);
+
         $auth = Auth::get_instance();
         $list = $auth->schema_attributes($postdata['classes']);
 
@@ -1005,7 +988,7 @@
         $auth = Auth::get_instance();
         $conf = Conf::get_instance();
 
-        $unique_attr = $this->unique_attribute();
+        $unique_attr = self::unique_attribute();
         $object_type = $postdata['object_type'];
         $object_key  = $postdata['type_key'];
 
@@ -1150,11 +1133,9 @@
     private function validate_associateddomain($value, $postdata = array(), $validation_type = null)
     {
         if (!is_array($value)) {
-            $value = (array)($value);
+            $value = (array) $value;
         }
 
-        //console("form_value.validate_associateddomain(\$value)", $value);
-
         return $value;
     }
 
@@ -1317,6 +1298,46 @@
         return $list;
     }
 
+    private function _list_options_users($postdata, $attribs = array())
+    {
+        // return specified records only, by exact DN attributes
+        if (!empty($postdata['list'])) {
+            $data['page_size'] = count($postdata['list']);
+            $data['search'] = array(
+                'entrydn' => array(
+                    'value' => $postdata['list'],
+                    'type'  => 'exact',
+                ),
+            );
+        }
+        // return records with specified string
+        else {
+            $keyword = array('value' => $postdata['search']);
+            $data['page_size'] = 15;
+            $data['search']    = array(
+                'displayname' => $keyword,
+                'cn'          => $keyword,
+                'mail'        => $keyword,
+            );
+        }
+
+        $data['attributes'] = array('displayname', 'mail');
+
+        $service = $this->controller->get_service('users');
+        $result  = $service->users_list(null, $data);
+        $list    = $result['list'];
+
+        // convert to key=>value array
+        foreach ($list as $idx => $value) {
+            $list[$idx] = $value['displayname'];
+            if (!empty($value['mail'])) {
+                $list[$idx] .= ' <' . $value['mail'] . '>';
+            }
+        }
+
+        return $list;
+    }
+
     private function _list_options_resources($postdata, $attribs = array())
     {
         // return specified records only, by exact DN attributes
@@ -1368,7 +1389,8 @@
         }
 
         $db     = SQL::get_instance();
-        $result = $db->fetch_assoc($db->query("SELECT option_values FROM options WHERE attribute = ?", $attribute));
+        $query  = $db->query("SELECT option_values FROM options WHERE attribute = ?", array($attribute));
+        $result = $db->fetch_assoc($query);
         $result = json_decode($result['option_values']);
 
         return array('list' => $result);

kolab-webadmin-3.1.5.tar.gz/lib/api/kolab_api_service_group.php -> kolab-webadmin-3.2.tar.gz/lib/api/kolab_api_service_group.php Changed

kolab-webadmin-3.2.tar.gz/lib/api/kolab_api_service_ou.php Added

@@ -0,0 +1,221 @@
+<?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>                      |
+ | Author: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>                     |
+ +--------------------------------------------------------------------------+
+*/
+
+/**
+ *
+ */
+class kolab_api_service_ou extends kolab_api_service
+{
+    /**
+     * Returns service capabilities.
+     *
+     * @param string $domain Domain name
+     *
+     * @return array Capabilities list
+     */
+    public function capabilities($domain)
+    {
+        $auth             = Auth::get_instance($domain);
+        $effective_rights = $auth->list_rights('ou');
+        $rights           = array();
+
+        if (in_array('add', $effective_rights['entryLevelRights'])) {
+            $rights['add'] = "w";
+        }
+
+        if (in_array('delete', $effective_rights['entryLevelRights'])) {
+            $rights['delete'] = "w";
+        }
+
+        if (in_array('modrdn', $effective_rights['entryLevelRights'])) {
+            $rights['edit'] = "w";
+        }
+
+        if (in_array('read', $effective_rights['entryLevelRights'])) {
+            $rights['info'] = "r";
+            $rights['find'] = "r";
+            $rights['members_list'] = "r";
+        }
+
+        $rights['effective_rights'] = "r";
+
+        return $rights;
+    }
+
+    /**
+     * Create organizational unit.
+     *
+     * @param array $get   GET parameters
+     * @param array $post  POST parameters
+     *
+     * @return array|bool Unit attributes or False on failure
+     */
+    public function ou_add($getdata, $postdata)
+    {
+        $attributes = $this->parse_input_attributes('ou', $postdata);
+        $auth       = Auth::get_instance();
+        $result     = $auth->organizationalunit_add($attributes, $postdata['type_id']);
+
+        if ($result) {
+            if ($id = $this->unique_attribute_value($result)) {
+                $attributes['id'] = $id;
+            }
+
+            return $attributes;
+        }
+
+        return FALSE;
+    }
+
+    /**
+     * Delete organizational unit.
+     *
+     * @param array $get   GET parameters
+     * @param array $post  POST parameters
+     *
+     * @return bool True on success, False on failure
+     */
+    public function ou_delete($getdata, $postdata)
+    {
+        if (empty($postdata['id'])) {
+            return FALSE;
+        }
+
+        // TODO: Input validation
+        $auth   = Auth::get_instance();
+        $result = $auth->organizationalunit_delete($postdata['id']);
+
+        if ($result) {
+            return $result;
+        }
+
+        return FALSE;
+    }
+
+    public function ou_edit($getdata, $postdata)
+    {
+        $unit_attributes = $this->parse_input_attributes('ou', $postdata);
+        $unit            = $postdata['id'];
+
+        $auth   = Auth::get_instance();
+        $result = $auth->organizationalunit_edit($postdata['id'], $unit_attributes, $postdata['type_id']);
+
+        // @TODO: return unique attribute or all attributes as ou_add()
+        if ($result) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public function ou_effective_rights($getdata, $postdata)
+    {
+        $auth = Auth::get_instance();
+
+        // Org. units are special in that they are ldapsubentries.
+        if (!empty($getdata['id'])) {
+            $unique_attr = self::unique_attribute();
+            $unit        = $auth->organizationalunit_find_by_attribute(array($unique_attr => $getdata['id']));
+
+            if (is_array($unit) && count($unit) == 1) {
+                $unit_dn = key($unit);
+            }
+        }
+
+        $effective_rights = $auth->list_rights(empty($unit_dn) ? 'ou' : $unit_dn);
+
+        return $effective_rights;
+    }
+
+    /**
+     * Organizational unit information.
+     *
+     * @param array $get   GET parameters
+     * @param array $post  POST parameters
+     *
+     * @return array|bool Unit attributes or False on failure
+     */
+    public function ou_info($getdata, $postdata)
+    {
+        if (empty($getdata['id'])) {
+            return false;
+        }
+
+        $auth   = Auth::get_instance();
+        $result = $auth->organizationalunit_info($getdata['id']);
+
+        // normalize result
+        $result = $this->parse_result_attributes('ou', $result);
+
+        if ($result) {
+            // get base_dn "attribute" for the API client
+            $dn = substr($result['entrydn'], strlen($result['ou']) + 4);
+            if (strpos($dn, 'ou=') === 0) {
+                $result['base_dn'] = $dn;
+            }
+
+            return $result;
+        }
+
+        return false;
+    }
+
+    /**
+     * Find organizational unit and return its data.
+     * It is a combination of ou.info and ous.list with search capabilities
+     * If the search returns only one record we'll return unit data.
+     *
+     * @param array $get   GET parameters
+     * @param array $post  POST parameters
+     *
+     * @return array|bool Unit attributes, False on error
+     */
+    public function ou_find($get, $post)
+    {
+        $auth       = Auth::get_instance();
+        $attributes = array('');
+        $params     = array('page_size' => 2);

kolab-webadmin-3.2.tar.gz/lib/api/kolab_api_service_ou_types.php Added

@@ -0,0 +1,62 @@
+<?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>                      |
+ | Author: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>                     |
+ +--------------------------------------------------------------------------+
+*/
+
+/**
+ *
+ */
+class kolab_api_service_ou_types extends kolab_api_service
+{
+    /**
+     * Returns service capabilities.
+     *
+     * @param string $domain Domain name
+     *
+     * @return array Capabilities list
+     */
+    public function capabilities($domain)
+    {
+        return array(
+            'list' => 'r',
+        );
+    }
+
+    /**
+     * Organizational unit types listing.
+     *
+     * @param array $get   GET parameters
+     * @param array $post  POST parameters
+     *
+     * @return array List result with 'list' and 'count' items
+     */
+    public function ou_types_list($get, $post)
+    {
+        $ou_types = $this->object_types('ou');
+
+        return array(
+            'list'  => $ou_types,
+            'count' => count($ou_types),
+        );
+    }
+}

kolab-webadmin-3.2.tar.gz/lib/api/kolab_api_service_ous.php Added

@@ -0,0 +1,73 @@
+<?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>                      |
+ | Author: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>                     |
+ +--------------------------------------------------------------------------+
+*/
+
+/**
+ * Service providing roles listing
+ */
+class kolab_api_service_ous extends kolab_api_service
+{
+    public $list_attribs = array(
+        'ou',
+        'objectclass',
+        'entrydn',
+        'description',
+    );
+
+    /**
+     * Returns service capabilities.
+     *
+     * @param string $domain Domain name
+     *
+     * @return array Capabilities list
+     */
+    public function capabilities($domain)
+    {
+        return array(
+            'list' => 'r',
+        );
+    }
+
+    /**
+     * Organizational units listing (with searching).
+     *
+     * @param array $get   GET parameters
+     * @param array $post  POST parameters
+     *
+     * @return array List result with 'list' and 'count' items
+     */
+    public function ous_list($get, $post)
+    {
+        $auth = Auth::get_instance();
+
+        $attributes = $this->parse_list_attributes($post);
+        $params     = $this->parse_list_params($post);
+        $search     = $this->parse_list_search($post);
+
+        $units = $auth->list_organizationalunits(null, $attributes, $search, $params);
+        $units = $this->parse_list_result($units);
+
+        return $units;
+    }
+}

kolab-webadmin-3.1.5.tar.gz/lib/api/kolab_api_service_resource.php -> kolab-webadmin-3.2.tar.gz/lib/api/kolab_api_service_resource.php Changed

@@ -75,18 +75,16 @@
      */
     public function resource_add($getdata, $postdata)
     {
-        //console("resource_add()", $postdata);
-
-        $resource_attributes = $this->parse_input_attributes('resource', $postdata);
-
-        //console("resource_add()", $resource_attributes);
-
-        // TODO: The cn needs to be unique
-        $auth = Auth::get_instance();
-        $result = $auth->resource_add($resource_attributes, $postdata['type_id']);
+        $attributes = $this->parse_input_attributes('resource', $postdata);
+        $auth       = Auth::get_instance();
+        $result     = $auth->resource_add($attributes, $postdata['type_id']);
 
         if ($result) {
-            return $resource_attributes;
+            if ($id = $this->unique_attribute_value($result)) {
+                $attributes['id'] = $id;
+            }
+
+            return $attributes;
         }
 
         return false;
@@ -167,8 +165,6 @@
         // normalize result
         $result = $this->parse_result_attributes('resource', $result);
 
-        //console($result);
-
         if ($result) {
             return $result;
         }

kolab-webadmin-3.1.5.tar.gz/lib/api/kolab_api_service_role.php -> kolab-webadmin-3.2.tar.gz/lib/api/kolab_api_service_role.php Changed

@@ -76,16 +76,19 @@
      */
     public function role_add($getdata, $postdata)
     {
-        $role_attributes = $this->parse_input_attributes('role', $postdata);
-
-        $auth   = Auth::get_instance();
-        $result = $auth->role_add($role_attributes, $postdata['type_id']);
+        $attributes = $this->parse_input_attributes('role', $postdata);
+        $auth       = Auth::get_instance();
+        $result     = $auth->role_add($attributes, $postdata['type_id']);
 
         if ($result) {
-            return $role_attributes;
+            if ($id = $this->unique_attribute_value($result)) {
+                $attributes['id'] = $id;
+            }
+
+            return $attributes;
         }
 
-        return FALSE;
+        return false;
     }
 
     /**
@@ -99,7 +102,7 @@
     public function role_delete($getdata, $postdata)
     {
         if (empty($postdata['id'])) {
-            return FALSE;
+            return false;
         }
 
         // TODO: Input validation
@@ -110,7 +113,7 @@
             return $result;
         }
 
-        return FALSE;
+        return false;
     }
 
     public function role_edit($getdata, $postdata)
@@ -137,8 +140,8 @@
 
         // Roles are special in that they are ldapsubentries.
         if (!empty($getdata['id'])) {
-            $unique_attr = $this->unique_attribute();
-            $role        = $auth->role_find_by_attribute(Array($unique_attr => $getdata['id']));
+            $unique_attr = self::unique_attribute();
+            $role        = $auth->role_find_by_attribute(array($unique_attr => $getdata['id']));
 
             if (is_array($role) && count($role) == 1) {
                 $role_dn = key($role);

kolab-webadmin-3.1.5.tar.gz/lib/api/kolab_api_service_sharedfolder.php -> kolab-webadmin-3.2.tar.gz/lib/api/kolab_api_service_sharedfolder.php Changed

@@ -75,18 +75,16 @@
      */
     public function sharedfolder_add($getdata, $postdata)
     {
-        //console("sharedfolder_add()", $postdata);
-
-        $sharedfolder_attributes = $this->parse_input_attributes('sharedfolder', $postdata);
-
-        //console("sharedfolder_add()", $sharedfolder_attributes);
-
-        // TODO: The cn needs to be unique
-        $auth = Auth::get_instance();
-        $result = $auth->sharedfolder_add($sharedfolder_attributes, $postdata['type_id']);
+        $attributes = $this->parse_input_attributes('sharedfolder', $postdata);
+        $auth       = Auth::get_instance();
+        $result     = $auth->sharedfolder_add($attributes, $postdata['type_id']);
 
         if ($result) {
-            return $sharedfolder_attributes;
+            if ($id = $this->unique_attribute_value($result)) {
+                $attributes['id'] = $id;
+            }
+
+            return $attributes;
         }
 
         return false;
@@ -167,8 +165,6 @@
         // normalize result
         $result = $this->parse_result_attributes('sharedfolder', $result);
 
-        //console($result);
-
         if ($result) {
             return $result;
         }

kolab-webadmin-3.1.5.tar.gz/lib/api/kolab_api_service_type.php -> kolab-webadmin-3.2.tar.gz/lib/api/kolab_api_service_type.php Changed

@@ -100,13 +100,13 @@
             $query['used_for'] = $postdata['used_for'] == 'hosted' ? 'hosted' : null;
         }
 
-        $query   = array_map(array($this->db, 'escape'), $query);
-        $columns = array_map(array($this->db, 'escape_identifier'), array_keys($query));
+        $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"
             . " (" . implode(', ', $columns) . ") VALUES (" . implode(', ', $query) . ")");
 
-        if (!($id = $this->db->last_insert_id())) {
+        if (!($id = $this->db->insert_id())) {
             return false;
         }
 
@@ -189,7 +189,7 @@
         }
 
         foreach ($query as $idx => $value) {
-            $query[$idx] = $this->db->escape_identifier($idx) . " = " . $this->db->escape($value);
+            $query[$idx] = $this->db->quote_identifier($idx) . " = " . $this->db->quote($value);
         }
 
         $result = $this->db->query("UPDATE {$type}_types SET "

kolab-webadmin-3.1.5.tar.gz/lib/api/kolab_api_service_user.php -> kolab-webadmin-3.2.tar.gz/lib/api/kolab_api_service_user.php Changed

@@ -81,15 +81,19 @@
     {
         Log::trace("user_add()", $postdata);
 
-        $user_attributes = $this->parse_input_attributes('user', $postdata);
+        $attributes = $this->parse_input_attributes('user', $postdata);
 
-        Log::trace("user_add()", $user_attributes);
+        Log::trace("user_add()", $attributes);
 
-        $auth = Auth::get_instance();
-        $result = $auth->user_add($user_attributes, $postdata['type_id']);
+        $auth   = Auth::get_instance();
+        $result = $auth->user_add($attributes, $postdata['type_id']);
 
         if ($result) {
-            return $user_attributes;
+            if ($id = $this->unique_attribute_value($result)) {
+                $attributes['id'] = $id;
+            }
+
+            return $attributes;
         }
 
         return false;
@@ -146,6 +150,7 @@
     {
         $auth = Auth::get_instance();
         $effective_rights = $auth->list_rights(empty($getdata['id']) ? 'user' : $getdata['id']);
+
         return $effective_rights;
     }
 
@@ -173,11 +178,11 @@
         $result = $this->parse_result_attributes('user', $result);
 
         if (empty($result['ou'])) {
-            $_dn = ldap_explode_dn($result_dn, 0);
+            $dn = ldap_explode_dn($result['entrydn'], 0);
             // pop the count and rdn
-            unset($_dn['count']);
-            unset($_dn[0]);
-            $result['ou'] = implode(',', $_dn);
+            unset($dn['count']);
+            unset($dn[0]);
+            $result['ou'] = implode(',', $dn);
         }
 
         Log::trace("user.info on " . $getdata['id'] . " parsed result: " . var_export($result, TRUE));

kolab-webadmin-3.1.5.tar.gz/lib/client/kolab_client_task_domain.php -> kolab-webadmin-3.2.tar.gz/lib/client/kolab_client_task_domain.php Changed

@@ -34,7 +34,7 @@
         'name' => array('associateddomain'),
     );
 
-    protected $list_attribs = array('associateddomain');
+    protected $list_attribs = array('associateddomain', 'inetdomainstatus');
 
     /**
      * Default action.
@@ -122,6 +122,7 @@
             'type_id'           => 'system',
             'type_id_name'      => 'system',
             'associateddomain'  => 'system',
+            'inetdomainstatus'  => 'system',
         );
 
         //console("domain_form() \$data", $data);
@@ -190,12 +191,26 @@
     /**
      * List item handler
      */
-    protected function list_item_handler($item)
+    protected function list_item_handler($item, &$class)
     {
+        if ($item['inetdomainstatus'] == 'deleted') {
+            $class[] = 'deleted';
+        }
+
         if (is_array($item['associateddomain'])) {
             return $item['associateddomain'][0];
         }
 
         return $item['associateddomain'];
     }
+
+    /**
+     * Returns false when object matches current domain
+     */
+    protected function is_deletable($data)
+    {
+        // domain delete is done by setting inetdomainstatus to 'deleted'
+        return false;
+    }
+
 }

kolab-webadmin-3.1.5.tar.gz/lib/client/kolab_client_task_main.php -> kolab-webadmin-3.2.tar.gz/lib/client/kolab_client_task_main.php Changed

kolab-webadmin-3.2.tar.gz/lib/client/kolab_client_task_ou.php Added

@@ -0,0 +1,311 @@
+<?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>                      |
+ +--------------------------------------------------------------------------+
+*/
+
+class kolab_client_task_ou extends kolab_client_task
+{
+    protected $ajax_only = true;
+
+    protected $menu = array(
+        'add'  => 'ou.add',
+    );
+
+    protected $list_attribs   = array('ou');
+    protected $search_attribs = array('name'  => array('ou'));
+
+
+    /**
+     * Default action.
+     */
+    public function action_default()
+    {
+        $this->output->set_object('content', 'ou', true);
+        $this->output->set_object('task_navigation', $this->menu());
+
+        $this->action_list();
+
+        // display form to add OU if logged-in user has right to do so
+        $caps = $this->get_capability('actions');
+        if (!empty($caps['ou.add'])) {
+            $this->action_add();
+        }
+        else {
+            $this->output->command('set_watermark', 'taskcontent');
+        }
+    }
+
+    /**
+     * Organizational unit adding (form) action.
+     */
+    public function action_add()
+    {
+        $data   = $this->get_input('data', 'POST');
+        $output = $this->ou_form(null, $data, true);
+
+        $this->output->set_object('taskcontent', $output);
+    }
+
+    /**
+     * Organizational unit information (form) action.
+     */
+    public function action_info()
+    {
+        $id     = $this->get_input('id', 'POST');
+        $result = $this->api_get('ou.info', array('id' => $id));
+        $unit   = $result->get();
+        $output = $this->ou_form(null, $unit);
+
+        $this->output->set_object('taskcontent', $output);
+    }
+
+    /**
+     * OU list result handler, tree list builder
+     */
+    protected function list_result_handler($result, $head, $foot, $table_class)
+    {
+        $result = $this->ou_list_sort($result);
+        $result = $this->ou_list_build_tree($result, $max_tree_level);
+
+        foreach ($result as $idx => $item) {
+            $class = array('selectable');
+            $tree  = '';
+            $style = '';
+
+            if ($item['level']) {
+                $tree .= '<span class="level" style="width:' . ($item['level'] * 16) . 'px"></span>';
+                $style = 'display:none';
+            }
+
+            if ($item['has_children']) {
+                $tree .= '<span class="expando"></span>';
+            }
+            else if ($max_tree_level) {
+                $tree .= '<span class="spacer"></span>';
+            }
+
+            $i++;
+            $cells = array();
+            $cells[] = array(
+                'class'   => 'name',
+                'body'    => $tree . kolab_html::escape($item['name']),
+                'onclick' => "kadm.command('ou.info', '$idx')",
+            );
+
+            $rows[] = array(
+                'id'    => $i,
+                'class' => implode(' ', $class),
+                'cells' => $cells,
+                'style' => $style,
+                'data-level' => !empty($item['level']) ? $item['level'] : '',
+            );
+        }
+
+        if ($max_tree_level) {
+            $this->output->command('tree_list_init');
+        }
+
+        return array($rows, $head, '', $table_class . ' tree');
+    }
+
+    private function ou_form($attribs, $data = array())
+    {
+        if (empty($attribs['id'])) {
+            $attribs['id'] = 'ou-form';
+        }
+
+        // Form sections
+        $sections = array(
+            'system' => 'ou.system',
+            'aci'    => 'ou.aci',
+            'other'  => 'ou.other',
+        );
+
+        // field-to-section map and fields order
+        $fields_map = array(
+            'type_id'         => 'system',
+            'type_id_name'    => 'system',
+            'ou'              => 'system',
+            'base_dn'         => 'system',
+            'description'     => 'system',
+
+            'aci'             => 'aci',
+        );
+
+        // 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());
+
+        // Add OU root selector
+        $fields['base_dn'] = array(
+            'section' => 'system',
+            'type'    => kolab_form::INPUT_SELECT,
+            'options' => $ou_roots,
+            'escaped' => true,
+            'default' => $data['base_dn'],
+        );
+
+        // Create mode
+        if ($add_mode) {
+            // Page title
+            $title = $this->translate('ou.add');
+        }
+        // Edit mode
+        else {
+            $title = $data['ou'];
+
+            // Add OU type name
+            $fields['type_id_name'] = array(

kolab-webadmin-3.1.5.tar.gz/lib/client/kolab_client_task_settings.php -> kolab-webadmin-3.2.tar.gz/lib/client/kolab_client_task_settings.php Changed

kolab-webadmin-3.1.5.tar.gz/lib/client/kolab_client_task_signup.php -> kolab-webadmin-3.2.tar.gz/lib/client/kolab_client_task_signup.php Changed

@@ -105,7 +105,8 @@
     }
 
     // check if user already exists
-    public function action_check_user($data = array()) {
+    public function action_check_user($data = array())
+    {
         if(count($data) == 0) $data = $this->get_input('data', 'POST');
 
         $this->login($data['domain']);
@@ -131,7 +132,8 @@
         return true;
     }
 
-    public function action_add_user() {
+    public function action_add_user()
+    {
         $data = $this->get_input('data', 'POST');
 
         $private_key = $this->config_get('recaptcha_private_key');
@@ -184,7 +186,8 @@
         }
     }
 
-    private function user_form($data = array()) {
+    private function user_form($data = array())
+    {
         $attribs['id'] = 'signup-form';
 
         $fields_map = array(
@@ -224,13 +227,13 @@
             $fields['type_id']['type'] = kolab_form::INPUT_HIDDEN;
             $fields['type_id']['value'] = $accttype['value'];
         }
-        
+
         // Add object type field
         $fields['object_type'] = array(
             'type'     => kolab_form::INPUT_HIDDEN,
             'value'    => 'user',
         );
- 
+
         // Add available domains
         $domains = $this->get_domains();
         $fields['domain'] = array(
@@ -258,7 +261,7 @@
             $fields['userpassword2'] = $fields['userpassword'];
             $fields['userpassword2']['onchange'] = 'password_match()';
         }
-        
+
         // Change field labels for hosted case
         $fields['uid']['label'] = 'signup.username';
         $fields['mail']['label'] = 'signup.futuremail';
@@ -276,7 +279,8 @@
         return $form->output();
     }
 
-    protected function get_domains() {
+    protected function get_domains()
+    {
         // Get a list of domains ($domains again is a kolab_client_api_result instance)
         $domains_list = $this->api->get('domains.list')->get('list');

kolab-webadmin-3.1.5.tar.gz/lib/client/kolab_client_task_user.php -> kolab-webadmin-3.2.tar.gz/lib/client/kolab_client_task_user.php Changed

kolab-webadmin-3.1.5.tar.gz/lib/ext/Net/LDAP3.php -> kolab-webadmin-3.2.tar.gz/lib/ext/Net/LDAP3.php Changed

@@ -677,7 +677,6 @@
 
         if (ldap_delete($this->conn, $entry_dn) === false) {
             $this->_debug("LDAP: S: " . ldap_error($this->conn));
-            $this->_debug("LDAP: Delete failed. " . ldap_error($this->conn));
             return false;
         }
 
@@ -686,6 +685,32 @@
         return true;
     }
 
+    /**
+     * Deletes specified entry and all entries in the tree
+     */
+    public function delete_entry_recursive($entry_dn)
+    {
+        // searching for sub entries, but not scope sub, just one level
+        $this->config_set('return_attributes', array('entrydn'));
+        $result = $this->search($entry_dn, '(objectclass=*)', 'one');
+
+        if ($result) {
+            $entries = $result->entries(true);
+
+            foreach (array_keys($entries) as $sub_dn) {
+                if (!$this->delete_entry_recursive($sub_dn)) {
+                    return false;
+                }
+            }
+        }
+
+        if (!$this->delete_entry($entry_dn)) {
+            return false;
+        }
+
+        return true;
+    }
+
     public function effective_rights($subject)
     {
         $effective_rights_control_oid = "1.3.6.1.4.1.42.2.27.9.5.2";
@@ -1203,8 +1228,7 @@
         // TODO: Get $rdn_attr - we have type_id in $new_attrs
         $dn_components  = ldap_explode_dn($subject_dn, 0);
         $rdn_components = explode('=', $dn_components[0]);
-
-        $rdn_attr = $rdn_components[0];
+        $rdn_attr       = $rdn_components[0];
 
         $this->_debug("Net_LDAP3::modify_entry() using rdn attribute: " . $rdn_attr);
 
@@ -1338,6 +1362,11 @@
         }
 
         foreach ($new_attrs as $attr => $value) {
+            // OU's parent base dn
+            if ($attr == 'base_dn') {
+                continue;
+            }
+
             if (is_array($value)) {
                 if (count($value) == 1) {
                     $new_attrs[$attr] = $value[0];
@@ -1395,10 +1424,27 @@
             $old_ou = implode(',', $subject_dn_components);
         }
 
-        if (!(empty($old_ou) || empty($new_ou)) && !(strtolower($old_ou) === strtolower($new_ou))) {
+        // object is an organizational unit
+        if (strpos($subject_dn, 'ou=' . $old_ou) === 0) {
+            $root = substr($subject_dn, strlen($old_ou) + 4); // remove ou=*,
+
+            if ((!empty($new_attrs['base_dn']) && strtolower($new_attrs['base_dn']) !== strtolower($root))
+                || (strtolower($old_ou) !== strtolower($new_ou))
+            ) {
+                if (!empty($new_attrs['base_dn'])) {
+                    $root = $new_attrs['base_dn'];
+                }
+
+                $mod_array['rename']['new_parent'] = $root;
+                $mod_array['rename']['dn']         = $subject_dn;
+                $mod_array['rename']['new_rdn']    = 'ou=' . $new_ou;
+            }
+        }
+        // not OU object, but changed ou attribute
+        else if ((!empty($old_ou) && !empty($new_ou)) && strtolower($old_ou) !== strtolower($new_ou)) {
             $mod_array['rename']['new_parent'] = $new_ou;
             if (empty($mod_array['rename']['dn']) || empty($mod_array['rename']['new_rdn'])) {
-                $mod_array['rename']['dn'] = $subject_dn;
+                $mod_array['rename']['dn']      = $subject_dn;
                 $mod_array['rename']['new_rdn'] = $rdn_attr . '=' . $new_attrs[$rdn_attr];
             }
         }
@@ -1410,7 +1456,6 @@
         if ($result) {
             return $mod_array;
         }
-
     }
 
     /**

kolab-webadmin-3.1.5.tar.gz/lib/functions.php -> kolab-webadmin-3.2.tar.gz/lib/functions.php Changed

kolab-webadmin-3.1.5.tar.gz/lib/kolab_api_controller.php -> kolab-webadmin-3.2.tar.gz/lib/kolab_api_controller.php Changed

kolab-webadmin-3.2.tar.gz/lib/kolab_api_exception.php Added

@@ -0,0 +1,71 @@
+<?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>                      |
+ +--------------------------------------------------------------------------+
+*/
+
+/**
+ * Main exception class for Kolab Admin API responses
+ */
+class kolab_api_exception extends Exception
+{
+    const UNAUTHORIZED     = 401;
+    const FORBIDDEN        = 403;
+    const NOT_FOUND        = 404;
+    const TIMEOUT          = 408;
+    const DOMAIN_NOT_EMPTY = 450;
+    const SERVER_ERROR     = 500;
+    const TEMP_ERROR       = 503;
+
+    /**
+     * Constructor
+     */
+    function __construct()
+    {
+        $args = func_get_args();
+
+        if (isset($args[1])) {
+            $code    = $args[1];
+            $message = $args[0];
+        }
+        else if (is_int($args[0])) {
+            $code    = $args[0];
+            $message = null;
+        }
+        else {
+            $message = $args[0];
+        }
+
+        if (!$code) {
+            $code = self::SERVER_ERROR;
+        }
+
+        if (!$message) {
+            $message = kolab_api_controller::translate("error.$code");
+
+            if (!$message) {
+                $message = "Server error.";
+            }
+        }
+
+        parent::__construct($message, $code);
+    }
+}

kolab-webadmin-3.1.5.tar.gz/lib/kolab_api_service.php -> kolab-webadmin-3.2.tar.gz/lib/kolab_api_service.php Changed

@@ -32,8 +32,8 @@
     protected $conf;
     protected $controller;
     protected $db;
-    protected $supported_types_db = array('group', 'resource', 'role', 'sharedfolder', 'user');
-    protected $supported_types    = array('domain', 'group', 'resource', 'role', 'sharedfolder', 'user');
+    protected $supported_types_db = array('ou', 'group', 'resource', 'role', 'sharedfolder', 'user');
+    protected $supported_types    = array('domain', 'ou', 'group', 'resource', 'role', 'sharedfolder', 'user');
 
     /**
      * Class constructor.
@@ -67,22 +67,7 @@
             return array();
         }
 
-        // get list of object types
-        if ($object_name == 'domain') {
-            $object_types = array(
-                '1' => array(
-                    'key'        => 'default',
-                    'attributes' => kolab_api_service_domain_types::$DEFAULT_TYPE_ATTRS,
-                ),
-            );
-            $object_types['1']['attributes']['form_fields']['aci'] = array(
-                'type'     => 'list',
-                'optional' => true,
-            );
-        }
-        else {
-            $object_types = $this->object_types($object_name);
-        }
+        $object_types = $this->object_types($object_name);
 
         if (empty($type_id)) {
             if (count($object_types) == 1) {
@@ -224,7 +209,7 @@
      */
     protected function object_types($object_name)
     {
-        if (!$object_name || !in_array($object_name, $this->supported_types_db)) {
+        if (!$object_name || !in_array($object_name, $this->supported_types)) {
             return array();
         }
 
@@ -238,29 +223,43 @@
             }
         }
 
-        $sql_result   = $this->db->query("SELECT * FROM {$object_name}_types ORDER BY name");
-        $object_types = array();
-
-        while ($row = $this->db->fetch_assoc($sql_result)) {
-            $object_types[$row['id']] = array();
-
-            foreach ($row as $key => $value) {
-                if ($key != "id") {
-                    if ($key == "attributes") {
-                        $object_types[$row['id']][$key] = json_decode($value, true);
-                    }
-                    else {
-                        $object_types[$row['id']][$key] = $value;
+        // get list of object types
+        if ($object_name == 'domain') {
+            $object_types = array(
+                '1' => array(
+                    'key'        => 'default',
+                    'attributes' => kolab_api_service_domain_types::$DEFAULT_TYPE_ATTRS,
+                ),
+            );
+            $object_types['1']['attributes']['form_fields']['aci'] = array(
+                'type'     => 'list',
+                'optional' => true,
+            );
+        }
+        else {
+            $sql_result   = $this->db->query("SELECT * FROM {$object_name}_types ORDER BY name");
+            $object_types = array();
+
+            while ($row = $this->db->fetch_assoc($sql_result)) {
+                $object_types[$row['id']] = array();
+
+                foreach ($row as $key => $value) {
+                    if ($key != "id") {
+                        if ($key == "attributes") {
+                            $object_types[$row['id']][$key] = json_decode($value, true);
+                        }
+                        else {
+                            $object_types[$row['id']][$key] = $value;
+                        }
                     }
                 }
             }
         }
 
-        //console("Object types for " . $object_name, $object_types);
-
         if ($devel_mode == null) {
             return $this->cache['object_types'][$object_name] = $object_types;
-        } else {
+        }
+        else {
             return $object_types;
         }
 
@@ -347,6 +346,12 @@
             }
         }
 
+        // OU's parent attribute
+        if ($object_name == 'ou' && !empty($attribs['base_dn'])) {
+            // @TODO: validate?
+            $result['base_dn'] = $attribs['base_dn'];
+        }
+
         $result = array_merge($result, $special_attr_validate);
 
         Log::trace("parse_input_attributes result (merge of \$result and \$special_attr_validate)", $result);
@@ -366,7 +371,7 @@
 
             // unique attribute is always allowed
             if (($key = array_search('id', $post['attributes'])) !== false) {
-                $attributes[] = $this->unique_attribute();
+                $attributes[] = self::unique_attribute();
             }
         }
 
@@ -380,7 +385,7 @@
     protected function parse_list_result($result)
     {
         if (!empty($result) && !empty($result['count'])) {
-            $unique_attr = $this->unique_attribute();
+            $unique_attr = self::unique_attribute();
 
             // replace back unique attribute name with 'id'
             foreach ($result['list'] as $idx => $record) {
@@ -468,7 +473,7 @@
         $attrs       = $attrs[$dn];
         $extra_attrs = array();
         $type_id     = $this->object_type_id($object_name, $attrs);
-        $unique_attr = $this->unique_attribute();
+        $unique_attr = self::unique_attribute();
 
         // Search for attributes associated with the type_id that are not part
         // of the result returned earlier. Example: nsrole / nsroledn / aci, etc.
@@ -516,6 +521,9 @@
         // add object type id to the result
         $attrs['type_id'] = $type_id;
 
+        // always return entrydn
+        $attrs['entrydn'] = $dn;
+
         return $attrs;
     }
 
@@ -553,7 +561,7 @@
      *
      * @return string Unique attribute name
      */
-    protected function unique_attribute()
+    public static function unique_attribute()
     {
         $conf        = Conf::get_instance();
         $unique_attr = $conf->get('unique_attribute');
@@ -578,7 +586,7 @@
             return $this->cache['unique_attributes'][$dn];
         }
 
-        $unique_attr = $this->unique_attribute();
+        $unique_attr = self::unique_attribute();
         $auth        = Auth::get_instance();
         $result      = $auth->get_entry_attribute($dn, $unique_attr);

kolab-webadmin-3.1.5.tar.gz/lib/kolab_client_task.php -> kolab-webadmin-3.2.tar.gz/lib/kolab_client_task.php Changed

@@ -46,7 +46,7 @@
     protected $menu         = array();
     protected $cache        = array();
     protected $devel_mode   = false;
-    protected $object_types = array('user', 'group', 'role', 'resource', 'sharedfolder', 'domain');
+    protected $object_types = array('user', 'group', 'role', 'resource', 'sharedfolder', 'ou', 'domain');
     protected $page_size    = 20;
     protected $list_attribs = array();
     protected $list_module;
@@ -226,7 +226,7 @@
                             $user['language'] = $res['preferredlanguage'];
                             $user['fullname'] = $res['cn'];
 
-                            // overwrite user id set in login request, which is user base DN,
+                            // overwrite user id set in login request, which might be user base DN,
                             // with unique attribute, which suits better to our needs
                             $user['id'] = $res['id'];
                         }
@@ -849,7 +849,7 @@
 
         case 'list':
             $result['type']      = kolab_form::INPUT_TEXTAREA;
-            $result['data-type'] = kolab_form::TYPE_LIST;
+            $result['data-type'] = 'list';
 
             if (!empty($field['maxlength'])) {
                 $result['data-maxlength'] = $field['maxlength'];
@@ -879,6 +879,24 @@
             $result['default'] = $field['default'];
             break;
 
+        case 'aci':
+            $result['type']      = kolab_form::INPUT_TEXTAREA;
+            $result['data-type'] = 'aci';
+
+            $this->output->add_translation('aci.new', 'aci.edit', 'aci.remove',
+                'aci.users', 'aci.rights', 'aci.targets', 'aci.aciname',
+                'aci.read', 'aci.compare', 'aci.search', 'aci.write', 'aci.selfwrite',
+                'aci.delete', 'aci.add', 'aci.proxy', 'aci.all', 'aci.allow', 'aci.deny',
+                'aci.typeusers', 'aci.typegroups', 'aci.typeroles', 'aci.typeadmins', 'aci.typespecials',
+                'aci.ldap-all', 'aci.ldap-anyone', 'aci.ldap-self', 'aci.ldap-parent',
+                'aci.usersearch', 'aci.usersearchresult', 'aci.selected', 'aci.other',
+                'aci.userselected', 'aci.useradd', 'aci.userremove', 'aci.thisentry',
+                'aci.rights.target', 'aci.rights.filter', 'aci.rights.attrs', 'aci.checkall', 'aci.checknone',
+                'aci.error.noname', 'aci.error.exists', 'aci.error.nousers',
+                'button.cancel', 'button.ok'
+            );
+            break;
+
         default:
             $result['type'] = kolab_form::INPUT_TEXT;
 
@@ -1260,7 +1278,7 @@
                     $value = $data[$idx];
 
                     // Convert data for the list field with autocompletion
-                    if ($field['data-type'] == kolab_form::TYPE_LIST) {
+                    if ($field['data-type'] == 'list') {
                         if (!is_array($value)) {
                             if (!empty($field['data-autocomplete'])) {
                                 $value = array($value => $value);
@@ -1298,7 +1316,7 @@
                     $field['suffix'] = kolab_html::escape($this->translate($field['suffix']));
                 }
 */
-                if (!empty($field['options'])) {
+                if (!empty($field['options']) && empty($field['escaped'])) {
                     foreach ($field['options'] as $opt_idx => $option) {
                         if (is_array($option)) {
                             $field['options'][$opt_idx]['content'] = kolab_html::escape($this->translate($option['content']));
@@ -1348,16 +1366,13 @@
             ));
         }
 
-        if (!empty($data['id']) && in_array('delete', (array) $data['effective_rights']['entry'])) {
+        // add delete button
+        if ($this->is_deletable($data)) {
             $id = $data['id'];
-
-            // disable delete for self
-            if ($id != $_SESSION['user']['id']) {
-                $form->add_button(array(
-                    'value'   => kolab_html::escape($this->translate('button.delete')),
-                    'onclick' => "kadm.{$name}_delete('{$id}')",
-                ));
-            }
+            $form->add_button(array(
+                'value'   => kolab_html::escape($this->translate('button.delete')),
+                'onclick' => "kadm.{$name}_delete('{$id}')",
+            ));
         }
 
         $ac_min_len = $this->config_get('autocomplete_min_length', 1, Conf::INT);
@@ -1366,14 +1381,24 @@
         $this->output->set_env('assoc_fields', $assoc_fields);
         $this->output->set_env('required_fields', $req_fields);
         $this->output->set_env('autocomplete_min_length', $ac_min_len);
+        $this->output->set_env('entrydn', $data['entrydn']);
         $this->output->add_translation('form.required.empty', 'form.maxcount.exceeded',
             $name . '.add.success', $name . '.edit.success', $name . '.delete.success',
-            $name . '.delete.confirm', 'add', 'edit', 'delete');
+            $name . '.delete.confirm', $name . '.delete.force',
+            'add', 'edit', 'delete');
 
         return $form;
     }
 
     /**
+     * Check wether specified object can be deleted
+     */
+    protected function is_deletable($data)
+    {
+        return !empty($data['id']) && in_array('delete', (array) $data['effective_rights']['entry']);
+    }
+
+    /**
      * Search form.
      *
      * @return string HTML output of the form
@@ -1521,6 +1546,8 @@
         $cols = array('name');
         $i    = 0;
 
+        $table_class = 'list';
+
         // table header
         $head[0]['cells'][] = array('class' => 'name', 'body' => $this->translate($task . '.list'));
 
@@ -1549,27 +1576,34 @@
 
         // table body
         if (!empty($result)) {
-            foreach ($result as $idx => $item) {
-                if (!is_array($item)) {
-                    continue;
-                }
+            if (method_exists($this, 'list_result_handler')) {
+                list($rows, $head, $foot, $table_class) = $this->list_result_handler($result, $head, $foot, $table_class);
+            }
+            else {
+                foreach ($result as $idx => $item) {
+                    if (!is_array($item)) {
+                        continue;
+                    }
 
-                if (method_exists($this, 'list_item_handler')) {
-                    $item = $this->list_item_handler($item);
-                }
-                else {
-                    $item = array_shift($item);
-                }
+                    $class = array('selectable');
 
-                if (empty($item)) {
-                    continue;
-                }
+                    if (method_exists($this, 'list_item_handler')) {
+                        $item = $this->list_item_handler($item, $class);
+                    }
+                    else {
+                        $item = array_shift($item);
+                    }
 
-                $i++;
-                $cells = array();
-                $cells[] = array('class' => 'name', 'body' => kolab_html::escape($item),
-                    'onclick' => "kadm.command('$task.info', '$idx')");
-                $rows[] = array('id' => $i, 'class' => 'selectable', 'cells' => $cells);
+                    if (empty($item)) {
+                        continue;
+                    }
+
+                    $i++;
+                    $cells = array();
+                    $cells[] = array('class' => 'name', 'body' => kolab_html::escape($item),
+                        'onclick' => "kadm.command('$task.info', '$idx')");
+                    $rows[] = array('id' => $i, 'class' => implode(' ', $class), 'cells' => $cells);
+                }
             }
         }
         else {
@@ -1580,7 +1614,7 @@
 
         $table = kolab_html::table(array(
             'id'    => $task . 'list',
-            'class' => 'list',
+            'class' => $table_class,
             'head'  => $head,
             'body'  => $rows,
             'foot'  => $foot,

kolab-webadmin-3.1.5.tar.gz/lib/kolab_form.php -> kolab-webadmin-3.2.tar.gz/lib/kolab_form.php Changed

kolab-webadmin-3.1.5.tar.gz/lib/kolab_html.php -> kolab-webadmin-3.2.tar.gz/lib/kolab_html.php Changed

kolab-webadmin-3.1.5.tar.gz/lib/locale/en_US.php -> kolab-webadmin-3.2.tar.gz/lib/locale/en_US.php Changed

@@ -7,6 +7,55 @@
 $LANG['about.technology'] = 'Technology';
 $LANG['about.warranty'] = 'It comes with absolutely <b>no warranties</b> 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'] = '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'] = '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'] = '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['add'] = 'Add';
 
 $LANG['api.notypeid'] = 'No object type ID specified!';
@@ -36,6 +85,7 @@
 
 $LANG['button.cancel'] = 'Cancel';
 $LANG['button.delete'] = 'Delete';
+$LANG['button.ok'] = 'OK';
 $LANG['button.save'] = 'Save';
 $LANG['button.submit'] = 'Submit';
 
@@ -49,10 +99,11 @@
 $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(s)';
+$LANG['domain.inetdomainbasedn'] = 'Custom Root DN';
 $LANG['domain.inetdomainstatus'] = 'Status';
 $LANG['domain.list'] = 'Domains List';
 $LANG['domain.norecords'] = 'No domain records found!';
@@ -64,6 +115,14 @@
 $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!';
 
@@ -116,6 +175,7 @@
 $LANG['menu.about'] = 'About';
 $LANG['menu.domains'] = 'Domains';
 $LANG['menu.groups'] = 'Groups';
+$LANG['menu.ous'] = 'Units';
 $LANG['menu.resources'] = 'Resources';
 $LANG['menu.roles'] = 'Roles';
 $LANG['menu.settings'] = 'Settings';
@@ -126,6 +186,20 @@
 $LANG['password.generate'] = 'Generate password';
 $LANG['reqtime'] = 'Request time: $1 sec.';
 
+$LANG['ou.aci'] = 'Access Rights';
+$LANG['ou.add'] = 'Add Unit';
+$LANG['ou.add.success'] = 'Unit created successfully.';
+$LANG['ou.ou'] = 'Unit Name';
+$LANG['ou.delete.confirm'] = 'Are you sure, you want to delete this organizational unit?';
+$LANG['ou.delete.success'] = 'Unit deleted successfully.';
+$LANG['ou.description'] = 'Unit Description';
+$LANG['ou.edit.success'] = 'Unit updated successfully.';
+$LANG['ou.list'] = 'Organizational Unit List';
+$LANG['ou.norecords'] = 'No organizational unit records found!';
+$LANG['ou.system'] = 'Details';
+$LANG['ou.type_id'] = 'Unit Type';
+$LANG['ou.base_dn'] = 'Parent Unit';
+
 $LANG['resource.add'] = 'Add Resource';
 $LANG['resource.add.success'] = 'Resource created successfully.';
 $LANG['resource.cn'] = 'Name';
@@ -143,6 +217,8 @@
 $LANG['resource.system'] = 'System';
 $LANG['resource.type_id'] = 'Resource Type';
 $LANG['resource.uniquemember'] = 'Collection Members';
+$LANG['resource.description'] = 'Descroption';
+$LANG['resource.owner'] = 'Owner';
 
 $LANG['role.add'] = 'Add Role';
 $LANG['role.add.success'] = 'Role created successfully.';
@@ -228,6 +304,7 @@
 $LANG['type.norecords'] = 'No object type records found!';
 $LANG['type.objectclass'] = 'Object class';
 $LANG['type.object_type'] = 'Object type';
+$LANG['type.ou'] = 'Ogranizational Unit';
 $LANG['type.properties'] = 'Properties';
 $LANG['type.resource'] = 'Resource';
 $LANG['type.role'] = 'Role';

kolab-webadmin-3.2.tar.gz/lib/locale/es_ES.php Changed

kolab-webadmin-3.2.tar.gz/lib/locale/fr_FR.php Changed

kolab-webadmin-3.2.tar.gz/lib/locale/ja_JP.php Changed

kolab-webadmin-3.2.tar.gz/lib/locale/nl_NL.php Changed

kolab-webadmin-3.1.5.tar.gz/public_html/js/kolab_admin.js -> kolab-webadmin-3.2.tar.gz/public_html/js/kolab_admin.js Changed

@@ -2,7 +2,7 @@
  +--------------------------------------------------------------------------+
  | This file is part of the Kolab Web Admin Panel                           |
  |                                                                          |
- | Copyright (C) 2011-2012, Kolab Systems AG                                |
+ | 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 |
@@ -23,7 +23,7 @@
 
 function kolab_admin()
 {
-  var ref = this;
+  var self = this;
 
   this.env = {};
   this.translations = {};
@@ -34,8 +34,8 @@
   // set jQuery ajax options
   $.ajaxSetup({
     cache: false,
-    error: function(request, status, err) { ref.http_error(request, status, err); },
-    beforeSend: function(xmlhttp) { xmlhttp.setRequestHeader('X-Session-Token', ref.env.token); }
+    error: function(request, status, err) { self.http_error(request, status, err); },
+    beforeSend: function(xmlhttp) { xmlhttp.setRequestHeader('X-Session-Token', self.env.token); }
   });
 
   /*********************************************************/
@@ -130,7 +130,7 @@
 
     // set timer for requests
     if (a && this.env.request_timeout)
-      this.request_timer = window.setTimeout(function() { ref.request_timed_out(); }, this.request_timeout * 1000);
+      this.request_timer = window.setTimeout(function() { self.request_timed_out(); }, this.request_timeout * 1000);
   };
 
   // called when a request timed out
@@ -190,7 +190,7 @@
   // display a system message (types: loading, notice, error)
   this.display_message = function(msg, type, timeout)
   {
-    var obj, ref = this;
+    var obj;
 
     if (!type)
       type = 'notice';
@@ -209,11 +209,11 @@
 
     if (type != 'loading') {
       msg = '<div><span>' + msg + '</span></div>';
-      obj.addClass(type).click(function() { return ref.hide_message(); });
+      obj.addClass(type).click(function() { return self.hide_message(); });
     }
 
     if (timeout > 0)
-      window.setTimeout(function() { ref.hide_message(type, type != 'loading'); }, timeout);
+      window.setTimeout(function() { self.hide_message(type, type != 'loading'); }, timeout);
 
     obj.attr('id', type == 'loading' ? 'loading' : 'message')
       .appendTo('body').html(msg).show();
@@ -234,6 +234,103 @@
       $('#'+id).html(this.env.watermark);
   }
 
+  // modal dialog popup
+  this.modal_dialog = function(content, buttons, opts)
+  {
+    var settings = {btns: {}},
+      body = $('<div class="modal"></div>'),
+      head, foot, footer = [];
+
+    // title bar
+    if (opts && opts.title)
+      $('<div class="modal_header"></div>')
+        .append($('<span>').text(opts.title))
+        .appendTo(body);
+
+    // dialog content
+    if (typeof content != 'object')
+      content = $('<div></div>').html(content);
+
+    content.addClass('modal_msg').appendTo(body);
+
+    // buttons
+    $.each(buttons, function(i, v) {
+      var n = i.replace(/[^a-z0-9_]/ig, '');
+      settings.btns[n] = v;
+      footer.push({name: n, label: self.t(i)});
+    });
+
+//    if (!settings.btns.cancel && (!opts || !opts.no_cancel))
+//      settings.btns.cancel = function() { this.hide(); };
+
+    if (footer.length) {
+      foot = $('<div class="modal_btns"></div>');
+      $.each(footer, function() {
+        $('<div></div>').addClass('modal_btn_' + this.name).text(this.label).appendTo(foot);
+      });
+
+      body.append(foot);
+    }
+
+    // configure and display dialog
+    body.wModal(settings).wModal('show');
+  };
+
+  this.tree_list_init = function()
+  {
+    $('table.list.tree span.expando').click(function() {
+      var tr = $(this).parents('table.list.tree tr'),
+        expanded = tr.hasClass('expanded'),
+        level = tr.data('level') || 0,
+        row = tr[0],
+        found = false;
+
+      tr[expanded ? 'removeClass' : 'addClass']('expanded');
+
+      $('tr', tr.parent()).each(function() {
+        if (this === row) {
+          found = true;
+          return;
+        }
+
+        if (!found)
+          return;
+
+        var r = $(this), l = r.data('level') || 0;
+
+        if (l <= level)
+          return false;
+
+        if (!expanded && l == level+1)
+          r.show();
+        else if (expanded && l > level)
+          r.hide().removeClass('expanded');
+      });
+
+      return false;
+    });
+  };
+
+  // position and display popup
+  this.popup_show = function(e, popup)
+  {
+    var popup = $(popup),
+      pos = this.mouse_pos(e),
+      win = $(window),
+      w = popup.width(),
+      h = popup.height(),
+      left = pos.left - w,
+      top = pos.top;
+
+    if (top + h > win.height())
+      top -= h;
+    if (left + w > win.width())
+      left -= w;
+
+    popup.css({left: left + 'px', top: top + 'px'}).show();
+    e.stopPropagation();
+  };
+
 
   /********************************************************/
   /*********        Remote request methods        *********/
@@ -369,93 +466,6 @@
   };
 
 
-  /********************************************************/
-  /*********            Helper methods            *********/
-  /********************************************************/
-
-  // disable/enable all fields of a form
-  this.lock_form = function(form, lock)
-  {
-    if (!form || !form.elements)
-      return;
-
-    var n, len, elm;
-
-    if (lock)
-      this.disabled_form_elements = [];
-
-    for (n=0, len=form.elements.length; n<len; n++) {
-      elm = form.elements[n];
-
-      if (elm.type == 'hidden')
-        continue;
-      // remember which elem was disabled before lock
-      if (lock && elm.disabled)
-        this.disabled_form_elements.push(elm);
-      // check this.disabled_form_elements before inArray() as a workaround for FF5 bug
-      // http://bugs.jquery.com/ticket/9873
-      else if (lock || (this.disabled_form_elements && $.inArray(elm, this.disabled_form_elements)<0))
-        elm.disabled = lock;
-    }
-  };
-
-  this.set_request_time = function()

kolab-webadmin-3.1.5.tar.gz/public_html/js/kolab_hosted.js -> kolab-webadmin-3.2.tar.gz/public_html/js/kolab_hosted.js Changed

@@ -24,22 +24,25 @@
 // overwrite user_save() function
 kadm.user_save = function(reload, section)
 {
-    var data = kadm.serialize_form('#'+this.env.form_id);
+    if (this.busy)
+      return;
+
+    var data = this.serialize_form('#'+this.env.form_id);
 
-    if (!kadm.check_required_fields(data)) {
-      kadm.display_message('form.required.empty', 'error');
+    if (!this.check_required_fields(data)) {
+      this.display_message('form.required.empty', 'error');
       return;
     }
 
     // check password
     if (data.userpassword != data.userpassword2) {
-      kadm.display_message('user.password.mismatch', 'error');
-      kadm.form_value_error('userpassword2');
+      this.display_message('user.password.mismatch', 'error');
+      this.form_value_error('userpassword2');
       return;
     }
     delete data['userpassword2'];
 
-    kadm.http_post('signup.add_user', {data: data});
+    this.http_post('signup.add_user', {data: data});
 };
 
 kadm.reload_captcha = function()
@@ -49,7 +52,7 @@
 
 kadm.change_user_type = function()
 {
-    var data = kadm.serialize_form('#'+this.env.form_id);
+    var data = this.serialize_form('#'+this.env.form_id);
 
     this.set_busy(true, 'loading');
     kadm.http_post('signup.default', {data: data});
@@ -58,18 +61,19 @@
 kadm.check_user_availability = function()
 {
     // get form data and build new email address
-    var data = kadm.serialize_form('#signup-form');
-    var mail = data['uid'] + '@' + data['domain'];
+    var data = this.serialize_form('#signup-form');
+    var mail = data.uid + '@' + data.domain;
 
-    if(data['uid'] != '') {
+    if(data.uid) {
         if(isValidEmailAddress(mail)) {
             // update future mail form field
             $('input[name="mail"]').val(mail);
 
             // check if user with that email address already exists
-            kadm.http_post('signup.check_user', {data: data});
+            this.set_busy(true, 'loading');
+            this.http_post('signup.check_user', {data: data});
         } else {
-            kadm.update_user_info('signup.wronguid', 'uid');
+            this.update_user_info('signup.wronguid', 'uid');
         }
     }
 };
@@ -82,7 +86,7 @@
     }
 
     if (msg) {
-        msg = kadm.t(msg);
+        msg = this.t(msg);
     }
 
     // display message next to form field

kolab-webadmin-3.1.5.tar.gz/public_html/skins/default/images/buttons.png -> kolab-webadmin-3.2.tar.gz/public_html/skins/default/images/buttons.png Changed

kolab-webadmin-3.1.5.tar.gz/public_html/skins/default/style.css -> kolab-webadmin-3.2.tar.gz/public_html/skins/default/style.css Changed

@@ -95,6 +95,10 @@
   text-align: center;
 }
 
+table.list tbody tr.deleted td {
+  color: #999;
+}
+
 fieldset {
   border: 1px solid #d0d0d0;
   border-radius: 3px;
@@ -136,6 +140,28 @@
   white-space: nowrap;
 }
 
+table.list.tree td span.expando {
+  background: url(images/buttons.png) -4px -161px no-repeat;
+  width: 16px;
+  height: 14px;
+  cursor: pointer;
+}
+
+table.list.tree tr.expanded td span.expando {
+  background-position: -4px -180px;
+}
+
+table.list.tree td span.expando,
+table.list.tree td span.spacer,
+table.list.tree td span.level {
+  display: inline-block;
+}
+
+table.list.tree td span.spacer {
+  width: 16px;
+}
+
+
 /**** Common UI elements ****/
 
 #topmenu {
@@ -746,7 +772,8 @@
   padding-left: 5px;
 }
 
-.ldap_url {
+.ldap_url,
+.aci {
   background-color: #F5F5F5;
   border: 1px solid #D0D0D0;
   border-radius: 3px 3px 3px 3px;
@@ -799,6 +826,24 @@
   height: 22px;
 }
 
+.aci {
+  padding: 5px;
+}
+
+.acltable select {
+  width: 400px;
+}
+
+.acltable .buttons {
+  vertical-align: top;
+  text-align: center;
+}
+
+.acltable .buttons input {
+  display: block;
+  width: 100px;
+}
+
 /*****   autocomplete list   *****/
 
 #autocompletepane
@@ -897,6 +942,156 @@
   border-top: none;
 }
 
+/*****  Dialog windows  *****/
+
+#modal_bg {
+  background-color: #000;
+  z-index: 10000;
+  opacity: 0.2;
+  filter: alpha(opacity=20);
+}
+
+#modal_pixel {
+  z-index: 10001;
+}
+
+.modal {
+  position: relative;
+  min-width: 350px;
+  overflow: hidden;
+  line-height: 15px;
+  background-color: #FFF;
+  color: #333;
+  border: 1px solid rgba(51, 51, 51, 0.5);
+  border-radius: 4px;
+  box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+}
+
+.modal_header {
+  padding: 10px;
+  font-size: 14px;
+  font-weight: bold;
+  border-bottom: solid 1px #DDD;
+}
+
+.modal_close {
+  position: absolute;
+  right: 10px;
+  top: 10px;
+  font-weight: normal;
+  font-size: 12px;
+  cursor: pointer;
+  color: #BABABA;
+}
+
+.modal_msg {
+  font-size: 12px;
+  padding: 20px;
+  color: #3A3A3A;
+  text-shadow: rgba(255, 255, 255, 0.75) 0 1px 1px;
+}
+
+.modal_btns {
+  padding: 10px;
+  font-size: 10px;
+  font-weight: bold;
+  border-top: solid 1px #DDD;
+  background-color: #EFEFEF;
+  text-align: right;
+  white-space: nowrap;
+}
+
+.modal_btns div {
+  display: inline-block;
+  min-width: 40px;
+  padding: 0 10px;
+  height: 25px;
+  line-height: 25px;
+  margin-left: 10px;
+  text-align: center;
+  cursor: pointer;
+  border-radius: 4px;
+  box-shadow: rgba(255, 255, 255, 0.2) 0px 1px 0px 0px inset, rgba(0, 0, 0, 0.0470588) 0px 1px 2px 0px;
+  text-shadow: rgba(255, 255, 255, 0.75) 0 1px 1px;
+  border: 1px solid rgba(0, 0, 0, 0.14902);
+  border-bottom-color: rgba(0, 0, 0, 0.247059);
+  background-color: #F5F5F5;
+  color: #333;
+}
+
+.modal_btns div:hover {
+  background-color: #E6E6E6;
+}
+
+.modal_btns div.default {
+  text-shadow: rgba(0, 0, 0, 0.247059) 0px -1px 0px;
+  border: 1px solid rgba(0, 0, 0, 0.0980392);
+  background-color: #006DCC;
+  color: #FFF;
+}
+
+.modal_btns div.default:hover {
+  background-color: #0044CC
+}
+
+/**** ACI widget ********/
+
+#aci-dialog,
+#aci-users-dialog {
+  width: 550px;
+  background-color: #F0F0F0;
+  border: 1px solid #D0D0D0;
+  border-radius: 4px;
+  margin: 10px;
+  padding: 10px;
+}
+
+#aci-users-dialog {
+  width: 400px;
+}
+
+#aci-dialog fieldset {
+  background-color: #f0f0f0;
+}
+
+#aci-dialog > label {
+  padding-right: 5px;
+}
+
+#aci-name {
+  width: 420px;
+}
+
+#aci-rights label,

kolab-webadmin-3.1.5.tar.gz/public_html/skins/default/templates/about.html -> kolab-webadmin-3.2.tar.gz/public_html/skins/default/templates/about.html Changed

@@ -35,10 +35,10 @@
     <p>
         <ul>
             <li>
-                <a href="http://lists.kolab.org/mailman/listinfo/kolab-users">Users mailing list</a>, for help installing, configuring or operating, other general questions and comments. (<a href="mailto:kolab-users-subscribe@kolab.org">subscribe</a>, <a href="http://lists.kolab.org/pipermail/kolab-users/">archives</a>)
+                <a href="http://lists.kolab.org/mailman/listinfo/users">Users mailing list</a>, for help installing, configuring or operating, other general questions and comments. (<a href="mailto:users-subscribe@lists.kolab.org">subscribe</a>, <a href="http://lists.kolab.org/pipermail/users/">archives</a>)
             </li>
             <li>
-                <a href="http://lists.kolab.org/mailman/listinfo/kolab-devel">Development mailing list</a>, for enhancement requests, compatibility issues and general inquiries. (<a href="mailto:kolab-devel-subscribe@kolab.org">subscribe</a>, <a href="http://lists.kolab.org/pipermail/kolab-devel/">archives</a>)
+                <a href="http://lists.kolab.org/mailman/listinfo/devel">Development mailing list</a>, for enhancement requests, compatibility issues and general inquiries. (<a href="mailto:devel-subscribe@lists.kolab.org">subscribe</a>, <a href="http://lists.kolab.org/pipermail/devel/">archives</a>)
             </li>
             <li>
                 Our <a href="https://issues.kolab.org/">issue tracker</a>,

kolab-webadmin-3.1.5.tar.gz/public_html/skins/default/templates/about_kolab.html -> kolab-webadmin-3.2.tar.gz/public_html/skins/default/templates/about_kolab.html Changed

@@ -5,9 +5,9 @@
 This is the server of the Kolab Groupware Solution,
 a <a href="http://fsfe.org/about/basics/freesoftware">Free Software</a>
 Personal Information Management (PIM) solution developed by the
-<a href="http://www.kolab.org/">Kolab Community</a>. Any installation of
+<a href="https://kolab.org/">Kolab.org Community</a>. Any installation of
 the Kolab Groupware Solution would normally include one or more of these
-servers, in combination with <a href="http://kolab.org/clients">a
+servers, in combination with <a href="https://kolab.org/clients">a
 variety of clients</a> for its users.
 If you are interested in the technology, you can read more about
 it on the dedicated <a href="/admin/kolab/technology.php">technology page</a>.
@@ -42,16 +42,16 @@
 <h2>More Information</h2>
 
 <ul>
-    <li><a href="http://www.kolab.org">Kolab Community Web Site</a></li>
+    <li><a href="https://kolab.org">Kolab Community Web Site</a></li>
     <li><a href="http://wiki.kolab.org">Kolab Community Wiki</a></li>
     <li><a href="http://blogs.fsfe.org/greve/?p=431">Article: 'The Kolab Story' by Georg Greve</a></li>
     <li><a href="http://files.kolabsys.com/Public/Handouts/">Handouts for the Kolab Groupware Solution by Kolab Systems</a></li>
 </ul>
 
-<h2>Warranties &amp; Commercial Support</h2>
+<h2>Warranties &amp; Professional Support</h2>
 
 <p>
-This is the <b>Community Edition</b> of the Kolab Groupware Server.
+This is the <b>Kolab.org Development Edition</b> of the Kolab Groupware Server.
 It is provided by Kolab Systems as fully <a href="http://fsfe.org/about/basics/freesoftware">Free Software</a>
 and you can use it to the fullest extent and any purpose. There are no license
 costs or other obligations other than those set forth in the respective
@@ -64,18 +64,18 @@
 There is a wide variety of commercial support options and warranties available
 by <a href="/admin/kolab/kolabsystems.php">Kolab Systems AG</a> and its
 network of partners, the Kolab Enterprise Community. This support comes with
-access to the additionally quality assured and hardened <b>Certified Kolab</b>
-edition, which like the community edition is fully available as Free Software,
-so has all the advantages of the Community Edition and is free of hidden lock-in.
+access to the additionally quality assured and hardened <b>Kolab Enterprise</b>
+edition, which like the Kolab.org edition is fully available as Free Software,
+so has all the advantages of the Kolab.org Edition and is free of hidden lock-in.
 </p>
 
 <p>
-Kolab Systems AG will provide limited support for the Community Edition on
-a case-by-case basis, but with no guaranteed response times, as availability permits,
-and at rates that may be adjusted due to the work load at the time of the request.
+Kolab Systems AG will only provide very limited <a href="https://kolabsys.com/community-assistance">community assistance</a>
+for the Kolab.org Edition on a case-by-case basis, but with no guaranteed response times,
+as availability permits, and at rates that may be adjusted due to the work load
+at the time of the request.
 <b>It is strongly recommended that for mission-critical professional deployments
-of the Kolab Groupware Solution you at least choose one of the partially
-self-supported On Demand support models.</b>
+of the Kolab Groupware Solution you use Kolab Enterprise with an SLA.</b>
 </p>
 
 <p>
@@ -83,7 +83,7 @@
         <tr>
             <td></td>
             <td><b>This edition</b></td>
-            <td><em>With SLA by Kolab Systems</em></b></td>
+            <td><b><em>Kolab Enterprise</em></b></td>
         </tr>
         <tr>
             <td>Support channels</td>
@@ -96,7 +96,12 @@
             <td class="yes">YES</td>
         </tr>
         <tr>
-            <td>Access to Certified Kolab</td>
+            <td>Access to Kolab Enterprise repositories</td>
+            <td class="no">NO</td>
+            <td class="yes">YES</td>
+        </tr>
+        <tr>
+            <td>Security Updates</td>
             <td class="no">NO</td>
             <td class="yes">YES</td>
         </tr>
@@ -110,14 +115,24 @@
             <td class="no">NO</td>
             <td class="yes">YES</td>
         </tr>
+        <tr>
+            <td>Discounts on Kolab services</td>
+            <td class="no">NO</td>
+            <td class="yes">YES</td>
+        </tr>
+        <tr>
+            <td>Direct access to Kolab developers</td>
+            <td class="no">NO</td>
+            <td class="yes">YES</td>
+        </tr>
     </table>
 </p>
 
 <p>
 Kolab Systems provides an overview of all available
-<a href="http://kolabsys.com/pricing">Service Level Agreements (SLA)</a>.
-To upgrade your installation to Certified Kolab, please contact
-<a href="mailto:getkolab@kolabsys.com">getkolab@kolabsys.com</a> or visit our
+<a href="https://kolabsys.com/pricing">Service Level Agreements (SLA)</a>.
+To upgrade your installation to Kolab Enterprise, please contact
+<a href="mailto:sales@kolabsys.com">sales@kolabsys.com</a> or visit their
 <a href="http://kolabsys.com/contact">web page</a>.
 </p>

kolab-webadmin-3.1.5.tar.gz/public_html/skins/default/templates/about_kolabsys.html -> kolab-webadmin-3.2.tar.gz/public_html/skins/default/templates/about_kolabsys.html Changed

@@ -22,9 +22,9 @@
 <p>
 Kolab Systems provides a wide range of <a href="http://kolabsys.com/pricing">Service Level Agreements (SLA)</a>
 which range from fully self-supported installations to maintained installations with
-reaction times as low as 1 hour. These are provided exclusively on Kolab Systems' Certified Kolab
-edition. To upgrade your installation to Certified Kolab, please contact
-<a href="mailto:getkolab@kolabsys.com">getkolab@kolabsys.com</a> or visit our
+reaction times as low as 1 hour. These are provided exclusively on Kolab Systems' Kolab Enterprise
+edition. To upgrade your installation to Kolab Enterprise, please contact
+<a href="mailto:sales@kolabsys.com">sales@kolabsys.com</a> or visit their
 <a href="http://kolabsys.com/contact">web page</a>.
 </p>
 
@@ -40,6 +40,7 @@
     <li><a href="/admin/kolab/intevation.php">Intevation</a></li>
     <li><a href="/admin/kolab/kdab.php">KDAB</a></li>
     <li><a href="http://www.libertech.fr/default.htm">Libertech</a></li>
+    <li><a href="http://www.tbits.de">TBits</a></li>
     <li>...and all the community contributors.</li>
 </ul>
 
@@ -48,7 +49,7 @@
 </p>
 
 <p>If <b>you</b> want to join the community, please go to
-    <a href="http://kolab.org">kolab.org</a> and <a href="http://wiki.kolab.org">wiki.kolab.org</a>.
+    <a href="https://kolab.org">kolab.org</a> and <a href="http://wiki.kolab.org">wiki.kolab.org</a>.
 </p>
 
 </div>

kolab-webadmin-3.1.5.tar.gz/public_html/skins/default/templates/about_technology.html -> kolab-webadmin-3.2.tar.gz/public_html/skins/default/templates/about_technology.html Changed

kolab-webadmin-3.2.tar.gz/public_html/skins/default/templates/ou.html Added

kolab-webadmin-3.1.5.tar.gz/public_html/skins/default/ui.js -> kolab-webadmin-3.2.tar.gz/public_html/skins/default/ui.js Changed