Request 51 (accepted)

Overview

Request 51 (accepted)

Correction for openSUSE

Created by vanmeeuwen about 11 years ago
In state accepted

Submit kolab-webadmin

Submit package home:vanmeeu...Development / kolab-webadmin to package Kolab:Development / kolab-webadmin

kolab-webadmin.spec Changed

@@ -1,3 +1,19 @@
+%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d}
+
+%if 0%{?suse_version} < 1 && 0%{?fedora} < 1 && 0%{?rhel} < 7
+%global with_systemd 0
+%else
+%global with_systemd 1
+%endif
+
+%if 0%{?suse_version}
+%global httpd_name apache2
+%else
+%global httpd_name httpd
+%endif
+
+%global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
+
 %global kolab_user kolab
 %global kolab_user_id 412
 %global kolab_group kolab
@@ -13,23 +29,16 @@
 %global kolabr_group kolab-r
 %global kolabr_group_id 414
 
-%if 0%{?suse_version}
-%global _ap_sysconfdir %{_sysconfdir}/apache2
-%global httpd_name apache2
-%else
-%global _ap_sysconfdir %{_sysconfdir}/httpd
-%global httpd_name httpd
-%endif
-
 Name:           kolab-webadmin
-Version:        3.0.5
-Release:        1%{?dist}
+Version:        3.1
+Release:        0.1.dev20130712.git3b093b%{?dist}
 Summary:        Kolab Groupware Server Web Administration Interface
 License:        AGPLv3+
 Group:          Productivity/Office/Organizers
 Url:            http://www.kolab.org
 
-Source0:        http://git.kolab.org/kolab-wap/snapshot/kolab-webadmin-%{version}.tar.gz
+# From http://git.kolab.org/kolab-wap/snapshot/f11818cff39f33021ff1017c1e8a1c6a8b3b093b.tar.gz
+Source0:        http://mirror.kolabsys.com/pub/releases/kolab-webadmin-%{version}.tar.gz
 
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -38,23 +47,19 @@
 Requires:       mozldap-tools
 Requires:       php >= 5.3
 Requires:       php-Smarty >= 3.1.7
+Requires:       php-pear(Net_Socket)
+Requires:       php-pear(Net_LDAP2)
 Requires:       php-gettext
 Requires:       php-ldap
 Requires:       php-mysql
 
-%if 0%{?suse_version}
-Requires:       php5-pear-Net_Socket
-Requires:       php5-pear-Net_LDAP2
-%else
-Requires:       php-pear(Net_Socket)
-Requires:       php-pear(Net_LDAP2)
-%endif
-
 %description
 Web based admin - and user interface for the Kolab Groupware Server
 
 %prep
-%setup -q
+%setup -q 
+
+rm -rf doc/kolab_wap-3.0.sql
 
 %build
 
@@ -91,6 +96,9 @@
 
 gpasswd -a apache kolab >/dev/null 2>&1 || :
 
+# Previous versions of kolab-webadmin installed separate directories for public_html/ and hosted/*,
+# that are now merged in to public_html/. For the sake of being able to serve up hosted/ and not
+# public_html/ though, these are to be / become symbolic links.
 if [ $1 -gt 1 ]; then
     if [ ! -L "/usr/share/kolab-webadmin/hosted/js" -a -d "/usr/share/kolab-webadmin/hosted/js" ]; then
         rm -rf /usr/share/kolab-webadmin/hosted/js >/dev/null 2>&1 || :
@@ -105,9 +113,24 @@
     fi
 fi
 
+%post
+if [ -f "%{php_inidir}/apc.ini" ]; then
+    if [ ! -z "`grep ^apc.enabled=1 %{php_inidir}/apc.ini`" ]; then
+%if 0%{?with_systemd}
+        /sbin/systemctl condrestart %{httpd_name}.service
+%else
+        /sbin/service %{httpd_name} condrestart
+%endif
+    fi
+fi
+
 %files
 %defattr(-, root, root)
 %doc doc/* INSTALL LICENSE
+%if 0%{?suse_version}
+%dir %{_ap_sysconfdir}
+%dir %{_ap_sysconfdir}/conf.d
+%endif
 %config(noreplace) %{_ap_sysconfdir}/conf.d/%{name}.conf
 %config(noreplace) %{_ap_sysconfdir}/conf.d/hosted-kolab.conf
 %{_datadir}/%{name}
@@ -115,6 +138,14 @@
 %attr(0770,apache,apache) %{_var}/log/%{name}
 
 %changelog
+* Fri Jul 12 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.1-0.1
+- Check in today's development snapshot
+- Make sure replicas and replication agreements are created when adding
+  new domains
+
+* Tue Mar 12 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.0.4-2
+- Correct packaging provided feedback in rhbz #812526
+
 * Tue Jan 15 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.0.4-1
 - New upstream release
 
@@ -157,7 +188,7 @@
 * Thu May  3 2012 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.4.0-4
 - Ship some very nice patches
 
-* Fri Apr 12 2012 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.4.0-3
+* Thu Apr 12 2012 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.4.0-3
 - Re-packaged sources
 - Require mozldap-tools

debian.changelog Changed

kolab-webadmin-3.0.5.tar.gz/doc/kolab_wap-3.0.sql -> kolab-webadmin-3.1.tar.gz/doc/kolab_wap-3.0.sql Changed

@@ -136,9 +136,9 @@
 --
 
 INSERT INTO `user_types` (`id`, `key`, `name`, `description`, `attributes`, `used_for`) 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":{"optional":true},"mobile":{"optional":true},"nsroledn":{"type":"list","autocomplete":true,"optional":true},"o":{"optional":true},"ou":{"type":"select"},"pager":{"optional":true},"postalcode":{"optional":true},"preferredlanguage":{"type":"select"},"sn":[],"street":{"optional":true},"telephonenumber":{"optional":true},"title":{"optional":true},"userpassword":{"optional":true}},"fields":{"objectclass":["top","inetorgperson","kolabinetorgperson","mailrecipient","organizationalperson","person"]}}', NULL),
+(1, 'kolab', 'Kolab User', 'A Kolab User', '{"auto_form_fields":{"alias":{"type":"list","data":["givenname","preferredlanguage","sn"]},"cn":{"data":["givenname","sn"]},"displayname":{"data":["givenname","sn"]},"mail":{"data":["givenname","preferredlanguage","sn"]},"mailhost":{"optional":true},"uid":{"data":["givenname","preferredlanguage","sn"]},"userpassword":{"optional":true}},"form_fields":{"alias":{"optional":true},"givenname":[],"initials":{"optional":true},"kolabdelegate":{"type":"list","autocomplete":true,"optional":true},"kolabinvitationpolicy":{"type":"select","values":["","ACT_MANUAL","ACT_REJECT"],"optional":true},"kolaballowsmtprecipient":{"type":"list","optional":true},"kolaballowsmtpsender":{"type":"list","optional":true},"l":{"optional":true},"mailalternateaddress":{"type":"list","optional":true},"mailquota":{"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","preferredlanguage","sn"]},"uid":{"data":["givenname","preferredlanguage","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":{"optional":true},"mobile":{"optional":true},"nsroledn":{"type":"list","autocomplete":true,"optional":true},"o":{"optional":true},"ou":{"type":"select"},"pager":{"optional":true},"postalcode":{"optional":true},"preferredlanguage":{"type":"select"},"sn":[],"street":{"optional":true},"telephonenumber":{"optional":true},"title":{"optional":true},"userpassword":{"optional":true}},"fields":{"objectclass":["top","inetorgperson","kolabinetorgperson","mailrecipient","organizationalperson","person","posixaccount"]}}', NULL);
+(3, 'kolab_posix', 'Mail-enabled POSIX User', 'A mail-enabled POSIX User', '{"auto_form_fields":{"alias":{"type":"list","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);
 
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;

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

@@ -0,0 +1,172 @@
+-- phpMyAdmin SQL Dump
+-- version 3.5.7
+-- http://www.phpmyadmin.net
+--
+-- Host: localhost
+-- Generation Time: Apr 15, 2013 at 12:33 PM
+-- Server version: 5.1.67
+-- PHP Version: 5.3.10
+
+SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
+SET time_zone = "+00:00";
+
+
+/*!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 */;
+
+--
+-- Database: `kolab`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `group_types`
+--
+
+CREATE TABLE IF NOT EXISTS `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  DEFAULT CHARSET=latin1 AUTO_INCREMENT=4 ;
+
+--
+-- Dumping data for table `group_types`
+--
+
+INSERT INTO `group_types` (`id`, `key`, `name`, `description`, `attributes`) VALUES
+(1, 'kolab', 'Kolab Distribution Group', 'A Kolab Distribution Group (with mail address)', '{"auto_form_fields":{"mail":{"data":["cn"]}},"fields":{"objectclass":["top","groupofuniquenames","kolabgroupofuniquenames"]},"form_fields":{"cn":[],"uniquemember":{"type":"list","autocomplete":true,"optional":true}}}'),
+(2, '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}}}'),
+(3, '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":[],"mail":{"optional":true},"uniquemember":{"type":"list","autocomplete":true,"optional":true}}}');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `options`
+--
+
+CREATE TABLE IF NOT EXISTS `options` (
+  `attribute` varchar(128) NOT NULL,
+  `option_values` text NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+--
+-- Dumping data for table `options`
+--
+
+INSERT INTO `options` (`attribute`, `option_values`) VALUES
+('preferredlanguage', '["aa_DJ","aa_ER","aa_ET","af_ZA","am_ET","an_ES","ar_AE","ar_BH","ar_DZ","ar_EG","ar_IN","ar_IQ","ar_JO","ar_KW","ar_LB","ar_LY","ar_MA","ar_OM","ar_QA","ar_SA","ar_SD","ar_SY","ar_TN","ar_YE","as_IN","az_AZ","be_BY","bg_BG","bn_BD","bn_IN","bokmal","br_FR","bs_BA","byn_ER","C","ca_AD","ca_ES","ca_FR","ca_IT","catalan","croatian","csb_PL","cs_CZ","cy_GB","czech","da_DK","danish","dansk","de_AT","de_BE","de_CH","de_DE","de_LU","deutsch","dutch","dz_BT","eesti","el_CY","el_GR","en_AU","en_BW","en_CA","en_DK","en_GB","en_HK","en_IE","en_IN","en_NZ","en_PH","en_SG","en_US","en_ZA","en_ZW","es_AR","es_BO","es_CL","es_CO","es_CR","es_DO","es_EC","es_ES","es_GT","es_HN","es_MX","es_NI","es_PA","es_PE","es_PR","es_PY","es_SV","estonian","es_US","es_UY","es_VE","et_EE","eu_ES","fa_IR","fi_FI","finnish","fo_FO","fr_BE","fr_CA","fr_CH","french","fr_FR","fr_LU","fy_NL","ga_IE","galego","galician","gd_GB","german","gez_ER","gez_ET","gl_ES","greek","gu_IN","gv_GB","hebrew","he_IL","hi_IN","hr_HR","hrvatski","hsb_DE","hu_HU","hungarian","hy_AM","icelandic","id_ID","is_IS","italian","it_CH","it_IT","iw_IL","ja_JP","japanese","ka_GE","kk_KZ","kl_GL","km_KH","kn_IN","ko_KR","korean","ku_TR","kw_GB","ky_KG","lg_UG","lithuanian","lo_LA","lt_LT","lv_LV","mai_IN","mg_MG","mi_NZ","mk_MK","ml_IN","mn_MN","mr_IN","ms_MY","mt_MT","nb_NO","ne_NP","nl_BE","nl_NL","nn_NO","no_NO","norwegian","nr_ZA","nso_ZA","nynorsk","oc_FR","om_ET","om_KE","or_IN","pa_IN","pa_PK","pl_PL","polish","portuguese","POSIX","pt_BR","pt_PT","romanian","ro_RO","ru_RU","russian","ru_UA","rw_RW","se_NO","sid_ET","si_LK","sk_SK","slovak","slovene","slovenian","sl_SI","so_DJ","so_ET","so_KE","so_SO","spanish","sq_AL","sr_CS","sr_ME","sr_RS","ss_ZA","st_ZA","sv_FI","sv_SE","swedish","ta_IN","te_IN","tg_TJ","thai","th_TH","ti_ER","ti_ET","tig_ER","tl_PH","tn_ZA","tr_CY","tr_TR","ts_ZA","tt_RU","turkish","uk_UA","ur_PK","uz_UZ","ve_ZA","vi_VN","wa_BE","xh_ZA","yi_US","zh_CN","zh_HK","zh_SG","zh_TW","zu_ZA"]'),
+('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"]');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `resource_types`
+--
+
+CREATE TABLE IF NOT EXISTS `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  DEFAULT CHARSET=latin1 AUTO_INCREMENT=6 ;
+
+--
+-- Dumping data for table `resource_types`
+--
+
+INSERT INTO `resource_types` (`id`, `key`, `name`, `description`, `attributes`) 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":[]}}');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `role_types`
+--
+
+CREATE TABLE IF NOT EXISTS `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  DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;
+
+--
+-- Dumping data for table `role_types`
+--
+
+INSERT INTO `role_types` (`id`, `key`, `name`, `description`, `attributes`) VALUES
+(1, 'simple_managed', 'Standard Role', 'A standard role definition', '{"auto_form_fields":[],"fields":{"objectclass":["top","ldapsubentry","nsroledefinition","nssimpleroledefinition","nsmanagedroledefinition"]},"form_fields":{"cn":[],"description":[]}}');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `sharedfolder_types`
+--
+
+CREATE TABLE IF NOT EXISTS `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  DEFAULT CHARSET=latin1 AUTO_INCREMENT=6 ;
+
+--
+-- Dumping data for table `sharedfolder_types`
+--
+
+INSERT INTO `sharedfolder_types` (`id`, `key`, `name`, `description`, `attributes`) 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":[]}}');
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `user_types`
+--
+
+CREATE TABLE IF NOT EXISTS `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  DEFAULT CHARSET=latin1 AUTO_INCREMENT=4 ;
+
+--
+-- Dumping data for table `user_types`
+--
+
+INSERT INTO `user_types` (`id`, `key`, `name`, `description`, `attributes`, `used_for`) 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","preferredlanguage","sn"]},"uid":{"data":["givenname","preferredlanguage","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);
+
+/*!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 */;

kolab-webadmin-3.0.5.tar.gz/doc/sample-insert-group_types.php -> kolab-webadmin-3.1.tar.gz/doc/sample-insert-group_types.php Changed

@@ -28,6 +28,14 @@
                 ),
             "form_fields" => Array(
                     "cn" => Array(),
+                    "kolaballowsmtprecipient" => Array(
+                            "type" => "list",
+                            "optional" => true,
+                        ),
+                    "kolaballowsmtpsender" => Array(
+                            "type" => "list",
+                            "optional" => true,
+                        ),
                     "uniquemember" => Array(
                             "type" => "list",
                             "autocomplete" => true,
@@ -37,11 +45,53 @@
         );
 
     $result = $db->query("INSERT INTO `group_types` (`key`, `name`, `description`, `attributes`) " .
-                "VALUES ('kolab','Kolab Distribution Group', 'A Kolab Distribution Group (with mail address)'," .
+                "VALUES ('kolab','Kolab Distribution Group (Static)', 'A static Kolab Distribution Group (with mail address)'," .
                 "'" . json_encode($attributes) . "')");
 
     $attributes = Array(
             "auto_form_fields" => Array(
+                    "mail" => Array(
+                            "data" => Array(
+                                    "cn",
+                                ),
+                        ),
+                ),
+            "fields" => Array(
+                    "objectclass" => Array(
+                            "top",
+                            "groupofurls",
+                            "kolabgroupofuniquenames",
+                        ),
+                ),
+            "form_fields" => Array(
+                    "cn" => Array(),
+                    "kolaballowsmtprecipient" => Array(
+                            "type" => "list",
+                            "optional" => true,
+                        ),
+                    "kolaballowsmtpsender" => Array(
+                            "type" => "list",
+                            "optional" => true,
+                        ),
+                    "memberurl" => Array(
+                            "type" => "ldap_url",
+                            "optional" => true,
+                        ),
+                    "uniquemember" => Array(
+                            "type" => "list",
+                            "autocomplete" => true,
+                            "optional" => true,
+                        ),
+                ),
+        );
+
+    $result = $db->query("INSERT INTO `group_types` (`key`, `name`, `description`, `attributes`) " .
+                "VALUES ('kolab_dynamic','Kolab Distribution Group (Dynamic)', 'A dynamic Kolab Distribution Group (with mail address)'," .
+                "'" . json_encode($attributes) . "')");
+
+
+    $attributes = Array(
+            "auto_form_fields" => Array(
                     "gidnumber" => Array(),
                 ),
             "fields" => Array(
@@ -84,6 +134,14 @@
                 ),
             "form_fields" => Array(
                     "cn" => Array(),
+                    "kolaballowsmtprecipient" => Array(
+                            "type" => "list",
+                            "optional" => true,
+                        ),
+                    "kolaballowsmtpsender" => Array(
+                            "type" => "list",
+                            "optional" => true,
+                        ),
                     "mail" => Array(
                             "optional" => true
                         ),
@@ -99,4 +157,28 @@
                 "VALUES ('posix_mail','Mail-enabled POSIX Group', 'A Kolab and also UNIX POSIX Group'," .
                 "'" . json_encode($attributes) . "')");
 
+    $attributes = Array(
+            "auto_form_fields" => Array(
+                ),
+            "fields" => Array(
+                    "objectclass" => Array(
+                            "top",
+                            "groupofuniquenames",
+                        ),
+                ),
+            "form_fields" => Array(
+                    "cn" => Array(),
+                    "uniquemember" => Array(
+                            "type" => "list",
+                            "autocomplete" => true,
+                            "optional" => true,
+                        ),
+                ),
+        );
+
+    $result = $db->query("INSERT INTO `group_types` (`key`, `name`, `description`, `attributes`) " .
+                "VALUES ('simple','Simple Group (Static)', 'A simple, traditional LDAP group with a static list of members'," .
+                "'" . json_encode($attributes) . "')");
+
+
 ?>

kolab-webadmin-3.1.tar.gz/doc/sample-insert-sharedfolder_types.php Added

@@ -0,0 +1,86 @@
+#!/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 `sharedfolder_types`");
+
+    $attributes = Array(
+            "auto_form_fields" => Array(
+                ),
+            "fields" => Array(
+                    "kolabfoldertype" => Array(
+                            "contact",
+                        ),
+                    "objectclass" => Array(
+                            "top",
+                            "kolabsharedfolder",
+                        ),
+                ),
+            "form_fields" => Array(
+/* TODO: Pending implementation of a folder acl list form widget - see #1752
+                    "acl" => Array(
+                            "type" => "folder_acl_list",
+                            "optional" => true,
+                        ),
+*/
+                    "cn" => Array(),
+                ),
+        );
+
+    $result = $db->query("INSERT INTO `sharedfolder_types` (`key`, `name`, `description`, `attributes`) " .
+                "VALUES ('addressbook','Shared Address Book', 'A shared address book'," .
+                "'" . json_encode($attributes) . "')");
+
+    $attributes["fields"]["kolabfoldertype"] = Array('event');
+    $result = $db->query("INSERT INTO `sharedfolder_types` (`key`, `name`, `description`, `attributes`) " .
+                "VALUES ('calendar','Shared Calendar', 'A shared calendar'," .
+                "'" . json_encode($attributes) . "')");
+
+    $attributes["fields"]["kolabfoldertype"] = Array('journal');
+    $result = $db->query("INSERT INTO `sharedfolder_types` (`key`, `name`, `description`, `attributes`) " .
+                "VALUES ('journal','Shared Journal', 'A shared journal'," .
+                "'" . json_encode($attributes) . "')");
+
+    $attributes["fields"]["kolabfoldertype"] = Array('task');
+    $result = $db->query("INSERT INTO `sharedfolder_types` (`key`, `name`, `description`, `attributes`) " .
+                "VALUES ('task','Shared Tasks', 'A shared tasks folder'," .
+                "'" . json_encode($attributes) . "')");
+
+    $attributes["fields"]["kolabfoldertype"] = Array('mail');
+    $attributes["form_fields"]["alias"] = Array(
+            "type" => "list",
+            "optional" => true,
+        );
+
+    $attributes["form_fields"]["kolabdelegate"] = Array(
+            "type" => "list",
+            "autocomplete" => true,
+            "optional" => true,
+        );
+
+    $attributes["form_fields"]["kolaballowsmtprecipient"] = Array(
+            "type" => "list",
+            "optional" => true,
+        );
+
+    $attributes["form_fields"]["kolaballowsmtpsender"] = Array(
+            "type" => "list",
+            "optional" => true,
+        );
+
+    $attributes["form_fields"]["kolabtargetfolder"] = Array();
+    $attributes["form_fields"]["mail"] = Array();
+    $attributes["fields"]["objectclass"][] = "mailrecipient";
+
+    $result = $db->query("INSERT INTO `sharedfolder_types` (`key`, `name`, `description`, `attributes`) " .
+                "VALUES ('mail','Shared Mail Folder', 'A shared mail folder'," .
+                "'" . json_encode($attributes) . "')");
+
+?>

kolab-webadmin-3.0.5.tar.gz/doc/sample-insert-user_types.php -> kolab-webadmin-3.1.tar.gz/doc/sample-insert-user_types.php Changed

@@ -390,4 +390,95 @@
                 "VALUES ('kolab_posix','Mail-enabled POSIX User', 'A mail-enabled POSIX User'," .
                 "'" . json_encode($attributes) . "')");
 
+    $attributes = Array(
+            "auto_form_fields" => Array(
+                    "cn" => Array(
+                            "data" => Array(
+                                    "givenname",
+                                    "sn",
+                                ),
+                        ),
+                    "displayname" => Array(
+                            "data" => Array(
+                                    "givenname",
+                                    "sn",
+                                ),
+                        ),
+                    "uid" => Array(
+                            "data" => Array(
+                                    "givenname",
+                                    "preferredlanguage",
+                                    "sn",
+                                ),
+                        ),
+                    "userpassword" => Array(
+                            "optional" => true,
+                        ),
+                ),
+            "form_fields" => Array(
+                    "cn" => Array(
+                            "optional" => true,
+                        ),
+                    "displayname" => Array(
+                            "optional" => true,
+                        ),
+                    "givenname" => Array(),
+                    "initials" => Array(
+                            "optional" => true,
+                        ),
+                    "l" => Array(
+                            "optional" => true,
+                        ),
+                    "mail" => Array(
+                            "type" => "list",
+                            "optional" => true,
+                        ),
+                    "mailalternateaddress" => Array(
+                            "type" => "list",
+                            "optional" => true,
+                        ),
+                    "mobile" => Array(
+                            "optional" => true,
+                        ),
+                    "o" => Array(
+                            "optional" => true,
+                        ),
+                    "ou" => Array(
+                            "type" => "select",
+                        ),
+                    "pager" => Array(
+                            "optional" => true,
+                        ),
+                    "postalcode" => Array(
+                            "optional" => true,
+                        ),
+                    "sn" => Array(),
+                    "street" => Array(
+                            "optional" => true,
+                        ),
+                    "telephonenumber" => Array(
+                            "optional" => true,
+                        ),
+                    "title" => Array(
+                            "optional" => true,
+                        ),
+                    "userpassword" => Array(
+                            "optional" => true,
+                        ),
+                ),
+            "fields" => Array(
+                    "objectclass" => Array(
+                            "top",
+                            "inetorgperson",
+                            "mailrecipient",
+                            "organizationalperson",
+                            "person",
+                        ),
+                ),
+        );
+
+    $result = $db->query("INSERT INTO `user_types` (`key`, `name`, `description`, `attributes`) " .
+                "VALUES ('contact','Contact', 'A global address book contact'," .
+                "'" . json_encode($attributes) . "')");
+
 ?>

kolab-webadmin-3.0.5.tar.gz/lib/Auth.php -> kolab-webadmin-3.1.tar.gz/lib/Auth.php Changed

@@ -209,9 +209,9 @@
         return $this->auth_instance()->attribute_details((array)$attributes);
     }
 
-    public function domain_add($domain, $parent_domain=null)
+    public function domain_add($domain, $domain_attrs)
     {
-        return $this->auth_instance()->domain_add($domain, $parent_domain);
+        return $this->auth_instance()->domain_add($domain, $domain_attrs);
     }
 
     public function domain_edit($domain, $attributes, $typeid = null)
@@ -315,6 +315,11 @@
         return $this->auth_instance($domain)->list_roles($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)
     {
         $this->domains = $this->list_domains();
@@ -392,14 +397,46 @@
         return $this->auth_instance()->role_info($roledata);
     }
 
+    public function sharedfolder_add($attributes, $typeid = null)
+    {
+        return $this->auth_instance()->sharedfolder_add($attributes, $typeid);
+    }
+
+    public function sharedfolder_edit($sharedfolder, $attributes, $typeid = null)
+    {
+        return $this->auth_instance()->sharedfolder_edit($sharedfolder, $attributes, $typeid);
+    }
+
+    public function sharedfolder_delete($subject)
+    {
+        return $this->auth_instance()->sharedfolder_delete($subject);
+    }
+
+    public function sharedfolder_find_by_attribute($attribute)
+    {
+        return $this->auth_instance()->sharedfolder_find_by_attribute($attribute);
+    }
+
+    public function sharedfolder_info($sharedfolderdata)
+    {
+        return $this->auth_instance()->sharedfolder_info($sharedfolderdata);
+    }
+
     public function search()
     {
         return call_user_func_array(Array($this->auth_instance(), 'search'), func_get_args());
     }
 
-    public function subject_base_dn($subject)
+    public function subject_base_dn($key, $type)
     {
-        return $this->auth_instance()->subject_base_dn($subject);
+        // first try strict match
+        $base_dn = $this->auth_instance()->subject_base_dn($key . '_' . $type, true);
+
+        if (!$base_dn) {
+            $base_dn = $this->auth_instance()->subject_base_dn($type);
+        }
+
+        return $base_dn;
     }
 
     public function user_add($attributes, $typeid = null)

kolab-webadmin-3.0.5.tar.gz/lib/Auth/LDAP.php -> kolab-webadmin-3.1.tar.gz/lib/Auth/LDAP.php Changed

@@ -23,7 +23,7 @@
  +--------------------------------------------------------------------------+
 */
 
-require_once("Net/LDAP3.php");
+require_once "Net/LDAP3.php";
 
 /**
  * Kolab LDAP handling abstraction class.
@@ -69,6 +69,18 @@
         // Continue and default to the primary domain.
         $this->domain       = $domain ? $domain : $this->conf->get('primary_domain');
 
+        $unique_attr = $this->conf->get($domain, 'unique_attribute');
+
+        if (empty($unique_attr)) {
+            $unique_attr = $this->conf->get('ldap', 'unique_attribute');
+        }
+
+        if (empty($unique_attr)) {
+            $unique_attr = 'nsuniqueid';
+        }
+
+        $this->config_set('unique_attribute', $unique_attr);
+
         $this->_ldap_uri    = $this->conf->get('ldap_uri');
         $this->_ldap_server = parse_url($this->_ldap_uri, PHP_URL_HOST);
         $this->_ldap_port   = parse_url($this->_ldap_uri, PHP_URL_PORT);
@@ -86,6 +98,7 @@
 
         $this->config_set("host", $this->_ldap_server);
         $this->config_set("port", $this->_ldap_port);
+        $this->config_set("use_tls", $this->_ldap_scheme == 'tls');
 
         parent::connect();
 
@@ -135,20 +148,317 @@
         return $result;
     }
 
-    public function domain_add($domain, $parent_domain = false, $prepopulate = true)
+    public function domain_add($domain, $attributes = array())
     {
-        // Apply some routines for access control to this function here.
-        if (!empty($parent_domain)) {
-            $domain_info = $this->domain_info($parent_domain);
-            if ($domain_info === false) {
-                $this->_domain_add_new($parent_domain, $prepopulate);
+        if (empty($domain)) {
+            return false;
+        }
+
+        $this->bind($_SESSION['user']->user_bind_dn, $_SESSION['user']->user_bind_pw);
+
+        $domain_base_dn        = $this->conf->get('ldap', 'domain_base_dn');
+        $domain_name_attribute = $this->conf->get('ldap', 'domain_name_attribute');
+        $primary_domain        = $this->conf->get('kolab', 'primary_domain');
+        $_primary_domain       = str_replace('.', '_', $primary_domain);
+        $_domain               = str_replace('.', '_', $domain);
+
+        if (empty($domain_name_attribute)) {
+            $domain_name_attribute = 'associateddomain';
+        }
+
+        if (!is_array($attributes[$domain_name_attribute])) {
+            $attributes[$domain_name_attribute] = (array) $attributes[$domain_name_attribute];
+        }
+
+        if (!in_array($domain, $attributes[$domain_name_attribute])) {
+            array_unshift($attributes[$domain_name_attribute], $domain);
+        }
+
+        $dn = $domain_name_attribute . '=' . $domain . ',' . $domain_base_dn;
+
+        $result = $this->add_entry($dn, $attributes);
+
+        if (!$result) {
+            return false;
+        }
+
+        if (!empty($attributes['inetdomainbasedn'])) {
+            $inetdomainbasedn = $attributes['inetdomainbasedn'];
+        }
+        else {
+            $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']);
 
-            return $this->_domain_add_alias($domain, $parent_domain);
+        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'
+        );
+
+        $replica_hosts = $this->list_replicas();
+        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
+        $domain_filter = $this->conf->get('ldap', 'domain_filter');
+        $domain_filter = '(&(' . $domain_name_attribute . '=' . $primary_domain . ')' . $domain_filter . ')';
+        $results       = $this->_search($domain_base_dn, $domain_filter);
+        $entries       = $results->entries(true);
+        $domain_entry  = array_shift($entries);
+
+        if (in_array('inetdomainbasedn', $domain_entry)) {
+            $_base_dn = $domain_entry['inetdomainbasedn'];
         }
         else {
-            return $this->_domain_add_new($domain, $prepopulate);
+            $_base_dn = $this->_standard_root_dn($primary_domain);
         }
+
+        $result = $this->_read($_base_dn, array('aci'));
+        $result = $result[key($result)];
+        $acis   = $result['aci'];
+
+        // Skip one particular ACI
+        foreach ($acis as $aci) {
+            if (stristr($aci, "SIE Group") === false) {
+                continue;
+            }
+            $_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;
+        $attrs = array(
+                // @TODO: Probably just use ldap_explode_dn()
+                'dc' => substr($dn, (strpos($dn, '=')+1), ((strpos($dn, ',')-strpos($dn, '='))-1)),
+                'objectclass' => array(
+                        'top',
+                        'domain',
+                    ),
+                'aci' => array(
+                        // Self-modification
+                        "(targetattr=\"carLicense || description || displayName || facsimileTelephoneNumber || homePhone || homePostalAddress || initials || jpegPhoto || labeledURI || mobile || pager || photo || postOfficeBox || postalAddress || postalCode || preferredDeliveryMethod || preferredLanguage || registeredAddress || roomNumber || secretary || seeAlso || st || street || telephoneNumber || telexNumber || title || userCertificate || userPassword || userSMIMECertificate || x500UniqueIdentifier\")(version 3.0; acl \"Enable self write for common attributes\"; allow (write) userdn=\"ldap:///self\";)",
+
+                        // Directory Administrators
+                        "(targetattr =\"*\")(version 3.0;acl \"Directory Administrators Group\";allow (all) (groupdn=\"ldap:///cn=Directory Administrators," . $inetdomainbasedn . "\" or roledn=\"ldap:///cn=kolab-admin," . $inetdomainbasedn . "\");)",
+
+                        // Configuration Administrators
+                        "(targetattr=\"*\")(version 3.0; acl \"Configuration Administrators Group\"; allow (all) groupdn=\"ldap:///cn=Configuration Administrators,ou=Groups,ou=TopologyManagement,o=NetscapeRoot\";)",
+
+                        // Administrator users
+                        "(targetattr=\"*\")(version 3.0; acl \"Configuration Administrator\"; allow (all) userdn=\"ldap:///uid=admin,ou=Administrators,ou=TopologyManagement,o=NetscapeRoot\";)",
+
+                        // SIE Group
+                        $_aci,
+
+                        // Search Access,
+                        "(targetattr != \"userPassword\") (version 3.0;acl \"Search Access\";allow (read,compare,search)(userdn = \"ldap:///" . $inetdomainbasedn . "??sub?(objectclass=*)\");)",
+
+                        // Service Search Access
+                        "(targetattr = \"*\") (version 3.0;acl \"Service Search Access\";allow (read,compare,search)(userdn = \"ldap:///" . $service_bind_dn . "\");)",
+                    ),
+            );
+
+        $replica_hosts = $this->list_replicas();
+        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->add_entry($dn, $attrs);
+                $ldap->close();
+            }
+        } else {
+            $this->add_entry($dn, $attrs);
+        }
+
+        if (!empty($replica_hosts)) {
+            $this->add_replication_agreements($inetdomainbasedn);
+        }
+
+        $dn = "cn=Directory Administrators," . $inetdomainbasedn;
+        $attrs = array(
+            'objectclass' => array(
+                'top',
+                'groupofuniquenames',
+            ),
+            'cn' => 'Directory Administrators',
+            'uniquemember' => array(
+                'cn=Directory Manager'
+            ),
+        );
+
+        $this->add_entry($dn, $attrs);
+
+        $dn = "ou=Groups," . $inetdomainbasedn;
+        $attrs = array(
+            'objectclass' => array('top', 'organizationalunit'),
+            'ou' => 'Groups',
+        );
+
+        $this->add_entry($dn, $attrs);
+
+        $dn = "ou=People," . $inetdomainbasedn;
+        $attrs = array(
+            'objectclass' => array('top', 'organizationalunit'),
+            'ou' => 'People',
+        );
+
+        $this->add_entry($dn, $attrs);
+
+        $dn = "ou=Special Users," . $inetdomainbasedn;
+        $attrs = array(
+            'objectclass' => array('top', 'organizationalunit'),
+            'ou' => 'Special Users',
+        );
+
+        $this->add_entry($dn, $attrs);
+
+        $dn = "ou=Resources," . $inetdomainbasedn;
+        $attrs = array(
+            'objectclass' => array('top', 'organizationalunit'),
+            'ou' => 'Resources',
+        );
+
+        $this->add_entry($dn, $attrs);
+
+        $dn = "ou=Shared Folders," . $inetdomainbasedn;
+        $attrs = array(
+            'objectclass' => array('top', 'organizationalunit'),
+            'ou' => 'Shared Folders',
+        );
+
+        $this->add_entry($dn, $attrs);
+
+        $dn = 'cn=kolab-admin,' . $inetdomainbasedn;
+        $attrs = array(
+            'objectclass' => array(
+                'top',
+                'ldapsubentry',
+                'nsroledefinition',
+                'nssimpleroledefinition',
+                'nsmanagedroledefinition',
+            ),
+            'cn' => 'kolab-admin'
+        );
+
+        $this->add_entry($dn, $attrs);
+
+        return true;
     }
 
     public function domain_edit($domain, $attributes, $typeid = null)
@@ -182,6 +492,11 @@
     public function domain_info($domain, $attributes = array('*'))
     {
         $this->_log(LOG_DEBUG, "Auth::LDAP::domain_info() for domain " . var_export($domain, true));
+
+        if (empty($domain)) {
+            return false;
+        }
+
         $this->bind($_SESSION['user']->user_bind_dn, $_SESSION['user']->user_bind_pw);
 
         $domain_base_dn = $this->conf->get('ldap', 'domain_base_dn');
@@ -195,7 +510,8 @@
             $this->_log(LOG_DEBUG, "Auth::LDAP::domain_info() uses _search()");
             $result = $this->_search($domain_base_dn, $domain_filter, $attributes);
             $result = $result->entries(true);
-        } else {
+        }
+        else {
             $this->_log(LOG_DEBUG, "Auth::LDAP::domain_info() uses _read()");
             $result = $this->_read($domain_dn, $attributes);
         }
@@ -222,25 +538,24 @@
 
         switch ($subject) {
             case "domain":
-                return parent::effective_rights($this->conf->get("ldap", "domain_base_dn"));
-                break;
+                $result = parent::effective_rights($this->conf->get("ldap", "domain_base_dn"));
+
             case "group":
-                return parent::effective_rights($this->_subject_base_dn("group"));
-                break;
             case "resource":
-                return parent::effective_rights($this->_subject_base_dn("resource"));
-                break;
             case "role":
-                return parent::effective_rights($this->_subject_base_dn("role"));
-                break;
+            case "sharedfolder":
             case "user":
-                return parent::effective_rights($this->_subject_base_dn("user"));
-                break;
+                $result = parent::effective_rights($this->_subject_base_dn($subject));
+
             default:
-                return parent::effective_rights($subject);
-                break;
+                $result = parent::effective_rights($subject);
         }
 
+        if (!$result) {
+            return $this->legacy_rights($subject);
+        } else {
+            return $result;
+        }
     }
 
     public function find_recipient($address)
@@ -248,8 +563,7 @@
         $this->bind($_SESSION['user']->user_bind_dn, $_SESSION['user']->user_bind_pw);
 
         $mail_attrs = $this->conf->get_list('mail_attributes', array('mail', 'alias'));
-
-        $search = array('operator' => 'OR');
+        $search     = array('operator' => 'OR');
 
         foreach ($mail_attrs as $num => $attr) {
             $search['params'][$attr] = array(
@@ -262,9 +576,9 @@
 
         if ($result && $result->count() > 0) {
             return $result->entries(TRUE);
-        } else {
-            return FALSE;
         }
+
+        return FALSE;
     }
 
     public function get_attributes($subject_dn, $attributes)
@@ -399,6 +713,20 @@
         return $this->_list($base_dn, $filter, 'sub', $attributes, $search, $params);
     }
 
+    public function list_sharedfolders($attributes = array(), $search = array(), $params = array())
+    {
+        $this->_log(LOG_DEBUG, "Auth::LDAP::list_sharedfolders(" . var_export($attributes, true) . ", " . var_export($search, true) . ", " . var_export($params, true));
+
+        $base_dn = $this->_subject_base_dn('sharedfolder');
+        $filter  = $this->conf->get('sharedfolder_filter');
+
+        if (!$filter) {
+            $filter = "(&(objectclass=*)(!(objectclass=organizationalunit)))";
+        }
+
+        return $this->_list($base_dn, $filter, 'sub', $attributes, $search, $params);
+    }
+
     public function list_users($attributes = array(), $search = array(), $params = array())
     {
         $this->_log(LOG_DEBUG, "Auth::LDAP::list_users(" . var_export($attributes, true) . ", " . var_export($search, true) . ", " . var_export($params, true));
@@ -468,16 +796,68 @@
     {
         $resource_dn = $this->entry_dn($resource);
 
-        if (!$resource_dn) {
+        if (!$resource_dn) {
+            return false;
+        }
+
+        return $this->_list_resource_members($resource_dn, null, $recurse);
+    }
+
+    public function role_add($attrs)
+    {
+        $base_dn = $this->entry_base_dn('role', $typeid);
+
+        // TODO: The rdn is configurable as well.
+        // Use [$type_str . "_"]user_rdn_attr
+        $dn = "cn=" . $attrs['cn'] . "," . $base_dn;
+
+        return $this->entry_add($dn, $attrs);
+    }
+
+    public function role_edit($role, $attributes, $typeid = null)
+    {
+        $role = $this->role_info($role, array_keys($attributes));
+
+        if (empty($role)) {
+            return false;
+        }
+
+        $role_dn = key($role);
+
+        // We should start throwing stuff over the fence here.
+        return $this->modify_entry($role_dn, $role[$role_dn], $attributes);
+    }
+
+    public function role_delete($role)
+    {
+        return $this->entry_delete($role, array('objectclass' => 'ldapsubentry'));
+    }
+
+    public function role_find_by_attribute($attribute)
+    {
+        $attribute['objectclass'] = 'ldapsubentry';
+        return $this->entry_find_by_attribute($attribute);
+    }
+
+    public function role_info($role, $attributes = array('*'))
+    {
+        $this->_log(LOG_DEBUG, "Auth::LDAP::role_info() for role " . var_export($role, true));
+        $this->bind($_SESSION['user']->user_bind_dn, $_SESSION['user']->user_bind_pw);
+
+        $role_dn = $this->entry_dn($role, array('objectclass' => 'ldapsubentry'));
+
+        if (!$role_dn) {
             return false;
         }
 
-        return $this->_list_resource_members($resource_dn, null, $recurse);
+        $this->read_prepare($attributes);
+
+        return $this->_read($role_dn, $attributes);
     }
 
-    public function role_add($attrs)
+    public function sharedfolder_add($attrs, $typeid = null)
     {
-        $base_dn = $this->entry_base_dn('role', $typeid);
+        $base_dn = $this->entry_base_dn('sharedfolder', $typeid);
 
         // TODO: The rdn is configurable as well.
         // Use [$type_str . "_"]user_rdn_attr
@@ -486,47 +866,47 @@
         return $this->entry_add($dn, $attrs);
     }
 
-    public function role_edit($role, $attributes, $typeid = null)
+    public function sharedfolder_delete($sharedfolder)
     {
-        $role = $this->role_info($role, array_keys($attributes));
+        return $this->entry_delete($sharedfolder);
+    }
 
-        if (empty($role)) {
+    public function sharedfolder_edit($sharedfolder, $attributes, $typeid = null)
+    {
+        $sharedfolder = $this->sharedfolder_info($sharedfolder, array_keys($attributes));
+
+        if (empty($sharedfolder)) {
             return false;
         }
 
-        $role_dn = key($role);
+        $sharedfolder_dn = key($sharedfolder);
 
         // We should start throwing stuff over the fence here.
-        return $this->modify_entry($role_dn, $role[$role_dn], $attributes);
+        return $this->modify_entry($sharedfolder_dn, $sharedfolder[$sharedfolder_dn], $attributes);
     }
 
-    public function role_delete($role)
-    {
-        return $this->entry_delete($role, array('objectclass' => 'ldapsubentry'));
-    }
-
-    public function role_find_by_attribute($attribute)
+    public function sharedfolder_find_by_attribute($attribute)
     {
-        $attribute['objectclass'] = 'ldapsubentry';
         return $this->entry_find_by_attribute($attribute);
     }
 
-    public function role_info($role, $attributes = array('*'))
+    public function sharedfolder_info($sharedfolder, $attributes = array('*'))
     {
-        $this->_log(LOG_DEBUG, "Auth::LDAP::role_info() for role " . var_export($role, true));
+        $this->_log(LOG_DEBUG, "Auth::LDAP::sharedfolder_info() for sharedfolder " . var_export($sharedfolder, true));
         $this->bind($_SESSION['user']->user_bind_dn, $_SESSION['user']->user_bind_pw);
 
-        $role_dn = $this->entry_dn($role, array('objectclass' => 'ldapsubentry'));
+        $sharedfolder_dn = $this->entry_dn($sharedfolder);
 
-        if (!$role_dn) {
+        if (!$sharedfolder_dn) {
             return false;
         }
 
         $this->read_prepare($attributes);
 
-        return $this->_read($role_dn, $attributes);
+        return $this->_read($sharedfolder_dn, $attributes);
     }
 
+
     public function search($base_dn, $filter = '(objectclass=*)', $scope = 'sub', $sort = NULL, $search = array())
     {
         if (isset($_SESSION['user']->user_bind_dn) && !empty($_SESSION['user']->user_bind_dn)) {
@@ -537,9 +917,9 @@
         return parent::search($base_dn, $filter, $scope, $sort, $search);
     }
 
-    public function subject_base_dn($subject)
+    public function subject_base_dn($subject, $strict = false)
     {
-        return $this->_subject_base_dn($subject);
+        return $this->_subject_base_dn($subject, $strict);
     }
 
     public function user_add($attrs, $typeid = null)
@@ -667,6 +1047,8 @@
             $unique_attr = 'nsuniqueid';
         }
 
+        Log::trace("Using unique_attribute " . var_export($unique_attr, TRUE) . " at " . __FILE__ . ":" . __LINE__);
+
         if (!in_array($unique_attr, $attributes)) {
             $attributes[] = $unique_attr;
         }
@@ -847,8 +1229,13 @@
         );
 
         $subject    = $this->_search($subject_dn);
+
+        if (!$subject) {
+            return $rights;
+        }
+
         $subject    = $subject->entries(true);
-        $attributes = $this->allowed_attributes($subject[$subject_dn]['objectclass']);
+        $attributes = $this->attributes_allowed($subject[$subject_dn]['objectclass']);
         $attributes = array_merge($attributes['may'], $attributes['must']);
 
         foreach ($attributes as $attribute) {
@@ -912,6 +1299,13 @@
             $str2 = $b[$this->sort_result_key];
         }
 
+        if (is_array($str1)) {
+            $str1 = array_shift($str1);
+        }
+        if (is_array($str2)) {
+            $str2 = array_shift($str2);
+        }
+
         return strcmp(mb_strtoupper($str1), mb_strtoupper($str2));
     }
 
@@ -940,282 +1334,6 @@
      ************      Shortcut functions       ****************
      ***********************************************************/
 
-    private function _domain_add_alias($domain, $parent)
-    {
-        $domain_base_dn = $this->conf->get('ldap', 'domain_base_dn');
-        $domain_filter  = $this->conf->get('ldap', 'domain_filter');
-
-        $domain_name_attribute = $this->conf->get('ldap', 'domain_name_attribute');
-
-        // Get the parent
-        $domain_filter = '(&(' . $domain_name_attribute . '=' . $parent . ')' . $domain_filter . ')';
-
-        $result = $this->_search($domain_base_dn, $domain_filter);
-
-        if ($result->count() < 1) {
-            Log::error("Attempt to add a domain alias for a non-existent parent domain.");
-            return false;
-        } else if ($result->count() > 1) {
-            Log::error("Attempt to add a domain alias for a parent domain which is found to have multiple entries.");
-            return false;
-        }
-
-        $entries = $result->entries(true);
-
-        $domain_dn    = key($entries);
-        $domain_entry = $entries[$domain_dn];
-
-        $_old_attr = array($domain_name_attribute => $domain_entry[$domain_name_attribute]);
-
-        if (is_array($domain)) {
-            $_new_attr = array($domain_name_attribute => array_unique(array_merge((array)($domain_entry[$domain_name_attribute]), $domain)));
-        } else {
-            $_new_attr = array($domain_name_attribute => array($domain_entry[$domain_name_attribute], $domain));
-        }
-
-        return $this->modify_entry($domain_dn, $_old_attr, $_new_attr);
-    }
-
-    private function _domain_add_new($domain)
-    {
-        console("Auth::LDAP::_domain_add_new()", $domain);
-
-        $auth = Auth::get_instance();
-
-        $domain_base_dn        = $this->conf->get('ldap', 'domain_base_dn');
-        $domain_name_attribute = $this->conf->get('ldap', 'domain_name_attribute');
-
-        if (is_array($domain)) {
-            $domain_name = array_shift($domain);
-        } else {
-            $domain_name = $domain;
-            $domain = (array)$domain;
-        }
-
-        $dn = $domain_name_attribute . '=' . $domain_name . ',' . $domain_base_dn;
-        $attrs = array(
-            'objectclass' => array(
-                'top',
-                'domainrelatedobject'
-            ),
-            $domain_name_attribute => array_unique(array_merge((array)($domain_name), $domain)),
-        );
-
-        $this->add_entry($dn, $attrs);
-
-        $inetdomainbasedn = $this->_standard_root_dn($domain_name);
-        $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' => str_replace('.', '_', $domain_name),
-        );
-
-        $this->add_entry($dn, $attrs);
-
-        //
-        // Use the information we find on the primary domain configuration for
-        // the new domain configuration.
-        //
-        $domain_filter = $this->conf->get('ldap', 'domain_filter');
-        $domain_filter = '(&(' . $domain_name_attribute . '=' . $this->conf->get('kolab', 'primary_domain') . ')' . $domain_filter . ')';
-        $results  = $this->_search($domain_base_dn, $domain_filter);
-        $entries = $results->entries(true);
-        $domain_entry = array_shift($entries);
-
-        // The root_dn for the parent domain is needed to find the ldbm
-        // database.
-        if (in_array('inetdomainbasedn', $domain_entry)) {
-            $_base_dn = $domain_entry['inetdomainbasedn'];
-        } else {
-            $_base_dn = $this->_standard_root_dn($this->conf->get('kolab', 'primary_domain'));
-        }
-
-        $result = $this->_read("cn=" . str_replace('.', '_', $this->conf->get('kolab', 'primary_domain') . ",cn=ldbm database,cn=plugins,cn=config"), array('nsslapd-directory'));
-        if (!$result) {
-            $result = $this->_read("cn=" . $this->conf->get('kolab', '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(str_replace('.', '_', $this->conf->get('kolab', 'primary_domain')), str_replace('.','_',$domain_name), $result['nsslapd-directory']);
-
-        if ($directory == $orig_directory) {
-            $directory = str_replace($this->conf->get('kolab', 'primary_domain'), str_replace('.','_',$domain_name), $result['nsslapd-directory']);
-        }
-
-        if ($directory == $orig_directory) {
-            $directory = str_replace("userRoot", str_replace('.','_',$domain_name), $result['nsslapd-directory']);
-        }
-
-        $dn = "cn=" . str_replace('.', '_', $domain_name) . ",cn=ldbm database,cn=plugins,cn=config";
-        $attrs = array(
-            'objectclass' => array(
-                'top',
-                'extensibleobject',
-                'nsbackendinstance',
-             ),
-            'cn' => str_replace('.', '_', $domain_name),
-            'nsslapd-suffix' => $inetdomainbasedn,
-            'nsslapd-cachesize' => '-1',
-            'nsslapd-cachememsize' => '10485760',
-            'nsslapd-readonly' => 'off',
-            'nsslapd-require-index' => 'off',
-            'nsslapd-directory' => $directory,
-            'nsslapd-dncachememsize' => '10485760'
-        );
-
-        $this->add_entry($dn, $attrs);
-
-        // Query the ACI for the primary domain
-        $domain_filter = $this->conf->get('ldap', 'domain_filter');
-        $domain_filter = '(&(' . $domain_name_attribute . '=' . $this->conf->get('kolab', 'primary_domain') . ')' . $domain_filter . ')';
-        $results  = $this->_search($domain_base_dn, $domain_filter);
-        $entries = $results->entries(true);
-        $domain_entry = array_shift($entries);
-
-        if (in_array('inetdomainbasedn', $domain_entry)) {
-            $_base_dn = $domain_entry['inetdomainbasedn'];
-        } else {
-            $_base_dn = $this->_standard_root_dn($this->conf->get('kolab', 'primary_domain'));
-        }
-
-        $result = $this->_read($_base_dn, array('aci'));
-        $result = $result[key($result)];
-        $acis   = $result['aci'];
-
-        foreach ($acis as $aci) {
-            if (stristr($aci, "SIE Group") === false) {
-                continue;
-            }
-            $_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;
-        $attrs = array(
-                // @TODO: Probably just use ldap_explode_dn()
-                'dc' => substr($dn, (strpos($dn, '=')+1), ((strpos($dn, ',')-strpos($dn, '='))-1)),
-                'objectclass' => array(
-                        'top',
-                        'domain',
-                    ),
-                'aci' => array(
-                        // Self-modification
-                        "(targetattr=\"carLicense || description || displayName || facsimileTelephoneNumber || homePhone || homePostalAddress || initials || jpegPhoto || labeledURI || mobile || pager || photo || postOfficeBox || postalAddress || postalCode || preferredDeliveryMethod || preferredLanguage || registeredAddress || roomNumber || secretary || seeAlso || st || street || telephoneNumber || telexNumber || title || userCertificate || userPassword || userSMIMECertificate || x500UniqueIdentifier\")(version 3.0; acl \"Enable self write for common attributes\"; allow (write) userdn=\"ldap:///self\";)",
-
-                        // Directory Administrators
-                        "(targetattr =\"*\")(version 3.0;acl \"Directory Administrators Group\";allow (all) (groupdn=\"ldap:///cn=Directory Administrators," . $inetdomainbasedn . "\" or roledn=\"ldap:///cn=kolab-admin," . $inetdomainbasedn . "\");)",
-
-                        // Configuration Administrators
-                        "(targetattr=\"*\")(version 3.0; acl \"Configuration Administrators Group\"; allow (all) groupdn=\"ldap:///cn=Configuration Administrators,ou=Groups,ou=TopologyManagement,o=NetscapeRoot\";)",
-
-                        // Administrator users
-                        "(targetattr=\"*\")(version 3.0; acl \"Configuration Administrator\"; allow (all) userdn=\"ldap:///uid=admin,ou=Administrators,ou=TopologyManagement,o=NetscapeRoot\";)",
-
-                        // SIE Group
-                        $_aci,
-
-                        // Search Access,
-                        "(targetattr = \"*\") (version 3.0;acl \"Search Access\";allow (read,compare,search)(userdn = \"ldap:///" . $inetdomainbasedn . "??sub?(objectclass=*)\");)",
-
-                        // Service Search Access
-                        "(targetattr = \"*\") (version 3.0;acl \"Service Search Access\";allow (read,compare,search)(userdn = \"ldap:///" . $service_bind_dn . "\");)",
-                    ),
-            );
-
-        $this->add_entry($dn, $attrs);
-
-        $dn = "cn=Directory Administrators," . $inetdomainbasedn;
-        $attrs = array(
-            'objectclass' => array(
-                'top',
-                'groupofuniquenames',
-            ),
-            'cn' => 'Directory Administrators',
-            'uniquemember' => array(
-                'cn=Directory Manager'
-            ),
-        );
-
-        $this->add_entry($dn, $attrs);
-
-        $dn = "ou=Groups," . $inetdomainbasedn;
-        $attrs = array(
-            'objectclass' => array('top', 'organizationalunit'),
-            'ou' => 'Groups',
-        );
-
-        $this->add_entry($dn, $attrs);
-
-        $dn = "ou=People," . $inetdomainbasedn;
-        $attrs = array(
-            'objectclass' => array('top', 'organizationalunit'),
-            'ou' => 'People',
-        );
-
-        $this->add_entry($dn, $attrs);
-
-        $dn = "ou=Special Users," . $inetdomainbasedn;
-        $attrs = array(
-            'objectclass' => array('top', 'organizationalunit'),
-            'ou' => 'Special Users',
-        );
-
-        $this->add_entry($dn, $attrs);
-
-        $dn = "ou=Resources," . $inetdomainbasedn;
-        $attrs = array(
-            'objectclass' => array('top', 'organizationalunit'),
-            'ou' => 'Resources',
-        );
-
-        $this->add_entry($dn, $attrs);
-
-        $dn = "ou=Shared Folders," . $inetdomainbasedn;
-        $attrs = array(
-            'objectclass' => array('top', 'organizationalunit'),
-            'ou' => 'Shared Folders',
-        );
-
-        $this->add_entry($dn, $attrs);
-
-        $dn = 'cn=kolab-admin,' . $inetdomainbasedn;
-        $attrs = array(
-            'objectclass' => array(
-                'top',
-                'ldapsubentry',
-                'nsroledefinition',
-                'nssimpleroledefinition',
-                'nsmanagedroledefinition',
-            ),
-            'cn' => 'kolab-admin'
-        );
-
-        $this->add_entry($dn, $attrs);
-
-        return true;
-    }
-
     /**
      * Translate a domain name into it's corresponding root dn.
      */
@@ -1251,6 +1369,10 @@
 
         $result = $this->_search($domain_base_dn, $domain_filter);
 
+        if (!$result) {
+            return $this->_standard_root_dn($domain);
+        }
+
         $entries = $result->entries(true);
         $entry_dn = key($entries);
         $entry_attrs = $entries[$entry_dn];

kolab-webadmin-3.0.5.tar.gz/lib/api/kolab_api_service_domain.php -> kolab-webadmin-3.1.tar.gz/lib/api/kolab_api_service_domain.php Changed

@@ -48,8 +48,7 @@
         }
 
         $effective_rights = $auth->list_rights($domain_base_dn);
-
-        $rights = array();
+        $rights           = array();
 
         if (in_array('add', $effective_rights['entryLevelRights'])) {
             $rights['add'] = "w";
@@ -65,9 +64,6 @@
 
         if (in_array('read', $effective_rights['entryLevelRights'])) {
             $rights['find'] = "r";
-            $rights['find_by_any_attribute'] = "r";
-            $rights['find_by_attribute'] = "r";
-            $rights['find_by_attributes'] = "r";
             $rights['info'] = "r";
         }
 
@@ -78,6 +74,8 @@
 
     public function domain_add($getdata, $postdata)
     {
+        Log::trace("domain.add(\$getdata = " . var_export($getdata, TRUE) . ", \$postdata = " . var_export($postdata, TRUE) . ")");
+
         $conf = Conf::get_instance();
         $dna = $conf->get('domain_name_attribute');
 
@@ -86,35 +84,18 @@
         }
 
         if (empty($postdata[$dna])) {
-            return;
+            Log::error("domain.add called without '" . $dna . "' specified");
+            return false;
         }
 
         $auth = Auth::get_instance($conf->get('kolab', 'primary_domain'));
 
-        if (is_array($postdata[$dna])) {
-            $parent_domain = array_shift($postdata[$dna]);
-            return $auth->domain_add($postdata[$dna], $parent_domain);
-        } else {
-            return $auth->domain_add($postdata[$dna]);
-        }
-    }
-
-    public function domain_edit($getdata, $postdata)
-    {
-        //console("domain_edit \$postdata", $postdata);
-
-        $domain_attributes  = $this->parse_input_attributes('domain', $postdata);
-        $domain             = $postdata['id'];
-
-        $auth   = Auth::get_instance();
-        $result = $auth->domain_edit($postdata['id'], $domain_attributes, $postdata['type_id']);
+        // parse input attributes
+        $domain_attributes       = $this->parse_input_attributes('domain', $postdata);
+        $domain_attributes[$dna] = (array)$domain_attributes[$dna];
+        $domain                  = array_shift($domain_attributes[$dna]);
 
-        // @TODO: return unique attribute or all attributes as domain_add()
-        if ($result) {
-            return true;
-        }
-
-        return false;
+        return $auth->domain_add($domain, $domain_attributes);
     }
 
     /**
@@ -127,13 +108,16 @@
      */
     public function domain_delete($getdata, $postdata)
     {
-        if (empty($postdata['domain'])) {
+        Log::trace("domain.delete(\$getdata = '" . var_export($getdata, TRUE) . "', \$postdata = '" . var_export($postdata, TRUE) . "')");
+
+        if (empty($postdata['id'])) {
+            Log::error("domain.delete called without a Domain ID");
             return false;
         }
 
         // TODO: Input validation
         $auth   = Auth::get_instance();
-        $result = $auth->domain_delete($postdata['domain']);
+        $result = $auth->domain_delete($postdata['id']);
 
         if ($result) {
             return $result;
@@ -142,12 +126,43 @@
         return false;
     }
 
+    public function domain_edit($getdata, $postdata)
+    {
+        Log::trace("domain.edit(\$getdata = '" . var_export($getdata, TRUE) . "', \$postdata = '" . var_export($postdata, TRUE) . "')");
+
+        if (empty($postdata['id'])) {
+            Log::error("domain.edit called without a Domain ID");
+            return false;
+        }
+
+        $domain_attributes  = $this->parse_input_attributes('domain', $postdata);
+        $domain             = $postdata['id'];
+
+        $auth   = Auth::get_instance();
+        $result = $auth->domain_edit($postdata['id'], $domain_attributes, $postdata['type_id']);
+
+        // @TODO: return unique attribute or all attributes as domain_add()
+        if ($result) {
+            return true;
+        }
+
+        return false;
+    }
+
     public function domain_effective_rights($getdata, $postdata)
     {
         $auth = Auth::get_instance();
 
-        if (!empty($getdata['domain'])) {
-            $entry_dn    = $getdata['domain'];
+        $conf = Conf::get_instance();
+        $dna = $conf->get('domain_name_attribute');
+
+        if (empty($dna)) {
+            $dna = 'associateddomain';
+        }
+
+        // TODO: Input validation
+        if (!empty($getdata[$dna])) {
+            $entry_dn    = $getdata[$dna];
             $unique_attr = $this->unique_attribute();
             $domain      = $auth->domain_find_by_attribute(array($unique_attr => $entry_dn));
 
@@ -167,6 +182,30 @@
         return $effective_rights;
     }
 
+    public function domain_find($getdata, $postdata)
+    {
+        $auth = Auth::get_instance();
+        $conf = Conf::get_instance();
+        $dna = $conf->get('domain_name_attribute');
+
+        if (empty($dna)) {
+            $dna = 'associateddomain';
+        }
+
+        if (empty($getdata[$dna])) {
+            Log::error("domain.find called without a '" . $dna . "' parameter");
+            return false;
+        }
+
+        $domain      = $auth->domain_find_by_attribute(array($dna => $getdata[$dna]));
+
+        if (!empty($domain)) {
+            return $domain;
+        }
+
+        return false;
+    }
+
     /**
      * Domain information.
      *
@@ -177,22 +216,23 @@
      */
     public function domain_info($getdata, $postdata)
     {
-        if (!isset($getdata['domain'])) {
+        Log::trace("domain.info(\$getdata = '" . var_export($getdata, TRUE) . "', \$postdata = '" . var_export($postdata, TRUE) . "')");
+
+        if (empty($getdata['id'])) {
+            Log::error("domain.info called without a Domain ID");
             return false;
         }
 
         $auth   = Auth::get_instance();
-        $result = $auth->domain_info($getdata['domain']);
+        $result = $auth->domain_info($getdata['id']);
 
         // normalize result
         $result = $this->parse_result_attributes('domain', $result);
 
         if (empty($result['id'])) {
-            $result['id'] = $getdata['domain'];
+            $result['id'] = $getdata[$dna];
         }
 
-        //console("API/domain.info() \$result:", $result);
-
         if ($result) {
             return $result;
         }

kolab-webadmin-3.0.5.tar.gz/lib/api/kolab_api_service_domain_types.php -> kolab-webadmin-3.1.tar.gz/lib/api/kolab_api_service_domain_types.php Changed

kolab-webadmin-3.0.5.tar.gz/lib/api/kolab_api_service_domains.php -> kolab-webadmin-3.1.tar.gz/lib/api/kolab_api_service_domains.php Changed

kolab-webadmin-3.0.5.tar.gz/lib/api/kolab_api_service_form_value.php -> kolab-webadmin-3.1.tar.gz/lib/api/kolab_api_service_form_value.php Changed

@@ -59,21 +59,23 @@
      */
     public function generate($getdata, $postdata)
     {
-        $attribs    = $this->object_type_attributes($postdata['object_type'], $postdata['type_id']);
+        $attribs    = $this->object_type_attributes($postdata['object_type'], $postdata['type_id'], true, $type_key);
         $attributes = (array) $postdata['attributes'];
         $result     = array();
 
+        $postdata['type_key'] = $type_key;
+
         foreach ($attributes as $attr_name) {
             if (empty($attr_name)) {
                 continue;
             }
 
-            $method_name = 'generate_' . strtolower($attr_name) . '_' . strtolower($postdata['object_type']);
+            $method_name = 'generate_' . str_replace('-', '_', strtolower($attr_name)) . '_' . strtolower($postdata['object_type']);
 
             if (!method_exists($this, $method_name)) {
                 Log::trace("Method $method_name doesn't exist");
 
-                $method_name = 'generate_' . strtolower($attr_name);
+                $method_name = 'generate_' . str_replace('-', '_', strtolower($attr_name));
 
                 if (!method_exists($this, $method_name)) {
                     Log::trace("Method $method_name doesn't exist either");
@@ -221,9 +223,21 @@
                 }
             }
 
-            if (array_key_exists($attr_name, $attribs['form_fields']) && !empty($attribs['form_fields'][$attr_name]['optional']) && !$attribs['form_fields'][$attr_name]['optional']) {
+            if (array_key_exists($attr_name, $attribs['form_fields'])) {
+                if (empty($attribs['form_fields'][$attr_name]['optional'])) {
+                    $attribs['form_fields'][$attr_name]['optional'] = false;
+                }
+            }
+
+            if (array_key_exists($attr_name, $attribs['form_fields'])) {
+                if (empty($attribs['form_fields'][$attr_name]['validate'])) {
+                    $attribs['form_fields'][$attr_name]['validate'] = true;
+                }
+            }
+
+            if ($attribs['form_fields'][$attr_name]['optional'] && !($attribs['form_fields'][$attr_name]['validate'])) {
                 $result[$attr_name] = $this->{$method_name}($attr_value, $postdata);
-            } elseif (array_key_exists($attr_name, $attribs['form_fields']) && !empty($attribs['form_fields'][$attr_name]['validate']) && !$attribs['form_fields'][$attr_name]['validate']) {
+            } else if (!($attribs['form_fields'][$attr_name]['validate'])) {
                 $result[$attr_name] = $attr_value;
             } else {
                 try {
@@ -232,7 +246,6 @@
                     Log::debug("Attribute $attr_name did not validate, but it is not a required attribute. Not saving. (Error was: $e)");
                 }
             }
-
         }
 
         Log::trace("kolab_api_form_value::validate() \$result: " . var_export($result, TRUE));
@@ -245,7 +258,7 @@
         $rcpt_pol_aliases = $this->generate_secondary_mail($postdata, $attribs);
 
         $service = $this->controller->get_service('user');
-        $user_attrs  = $service->user_info(Array( "user" => $postdata['id']), null);
+        $user_attrs  = $service->user_info(array('id' => $postdata['id']), null);
 
         if (!empty($user_attrs['alias'])) {
             $cur_aliases = $user_attrs['alias'];
@@ -267,6 +280,14 @@
         return array_values($form_aliases);
     }
 
+    private function generate_apple_generateduid($postdata, $attribs = array())
+    {
+        if (isset($attribs['auto_form_fields']) && isset($attribs['auto_form_fields']['apple-generateduid'])) {
+            $uuid = exec("uuidgen | tr '[:lower:]' '[:upper:]'");
+            return $uuid;
+        }
+    }
+
     private function generate_astaccountcallerid($postdata, $attribs = array())
     {
         if (isset($attribs['auto_form_fields']) && isset($attribs['auto_form_fields']['astaccountcallerid'])) {
@@ -515,8 +536,22 @@
             $uid = $this->generate_uid($postdata, $attribs);
 
             // TODO: Home directory base path from configuration?
+            $conf = Conf::get_instance();
+
+            $homedirectory_base = $conf->get($_SESSION['user']->get_domain(), 'homedirectory_base');
+            if (empty($homedirectory_base)) {
+                $homedirectory_base = $conf->get('kolab', 'homedirectory_base');
+            }
+
+            if (empty($homedirectory_base)) {
+                $homedirectory_base = "/home/";
+            }
 
-            return '/home/' . $uid;
+            if (substr($homedirectory_base, (strlen($homedirectory_base)-1), 1) == "/") {
+                $homedirectory_base = substr($homedirectory_base, 0, (strlen($homedirectory_base)-1));
+            }
+
+            return $homedirectory_base . '/' . $uid;
         }
     }
 
@@ -757,19 +792,15 @@
                 }
             }
 
-            // TODO: Use preferredlanguage
-            if (isset($postdata['preferredlanguage'])) {
-                //console("Using locale for " . $postdata['preferredlanguage']);
-                setlocale(LC_ALL, $postdata['preferredlanguage']);
-            }
-/*            else {
-                //console("No locale specified...!");
+
+            if (empty($postdata['uid'])) {
+                $postdata['uid'] = $postdata['sn'];
             }
-*/
 
-            $uid = iconv('UTF-8', 'ASCII//TRANSLIT', $postdata['sn']);
-            $uid = strtolower($uid);
-            $uid = preg_replace('/[^a-z-_]/i', '', $uid);
+            $userdata = kolab_recipient_policy::normalize_userdata($postdata);
+
+            $uid = kolab_recipient_policy::uid($userdata);
+            Log::debug("uid from recipient policy: " . var_export($uid, TRUE));
 
             $orig_uid = $uid;
 
@@ -842,6 +873,7 @@
     {
         // 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'],
@@ -892,6 +924,7 @@
     {
         // 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'],
@@ -980,7 +1013,7 @@
         $object_type = $postdata['object_type'];
         $object_key  = $postdata['type_key'];
 
-        $base_dn = $auth->subject_base_dn($object_key . '_' . $object_type);
+        $base_dn = $auth->subject_base_dn($object_key, $object_type);
 
         if (!empty($postdata['id'])) {
             $subjects = $auth->search($base_dn, '(' . $unique_attr . '=' . $postdata['id'] . ')')->entries(true);
@@ -1002,14 +1035,15 @@
             $default = $base_dn;
         }
 
-        $ous  = $auth->search($base_dn, '(objectclass=organizationalunit)');
         $_ous = array();
 
-        foreach ($ous->entries(true) as $ou_dn => $ou_attrs) {
-            $_ous[] = strtolower($ou_dn);
-        }
+        if ($ous = $auth->search($base_dn, '(objectclass=organizationalunit)')) {
+            foreach ($ous->entries(true) as $ou_dn => $ou_attrs) {
+                $_ous[] = strtolower($ou_dn);
+            }
 
-        sort($_ous);
+            sort($_ous);
+        }
 
         return array(
             'list'    => $_ous,
@@ -1161,6 +1195,7 @@
     {
         // return specified records only, by exact DN attributes
         if (!empty($postdata['list'])) {
+            $data['page_size'] = count($postdata['list']);
             $data['search'] = array(
                     'params' => array(
                             'entrydn' => array(
@@ -1189,14 +1224,17 @@
 
         $service = $this->controller->get_service('users');
         $result  = $service->users_list(null, $data);
-
         $list    = $result['list'];
 
-        $data['attributes'] = array('cn', 'mail');
+        // skip groups listing if the list if already full,
+        // and full list was requested (no paging)
+        if (empty($keyword) && $result['count'] < $data['page_size']) {
+            $data['attributes'] = array('cn', 'mail');
 
-        $service = $this->controller->get_service('groups');
-        $result  = $service->groups_list(null, $data);
-        $list    = array_merge($list, $result['list']);
+            $service = $this->controller->get_service('groups');
+            $result  = $service->groups_list(null, $data);
+            $list    = array_merge($list, $result['list']);
+        }
 
         // convert to key=>value array
         foreach ($list as $idx => $value) {
@@ -1227,6 +1265,7 @@
     {
         // 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'],

kolab-webadmin-3.0.5.tar.gz/lib/api/kolab_api_service_group.php -> kolab-webadmin-3.1.tar.gz/lib/api/kolab_api_service_group.php Changed

@@ -39,13 +39,9 @@
     {
         //console("kolab_api_service_group::capabilities");
 
-        $auth = Auth::get_instance();
-
+        $auth             = Auth::get_instance();
         $effective_rights = $auth->list_rights('group');
-
-        //console("effective_rights", $effective_rights);
-
-        $rights = array();
+        $rights           = array();
 
         if (in_array('add', $effective_rights['entryLevelRights'])) {
             $rights['add'] = "w";
@@ -61,6 +57,7 @@
 
         if (in_array('read', $effective_rights['entryLevelRights'])) {
             $rights['info'] = "r";
+            $rights['find'] = "r";
             $rights['members_list'] = "r";
         }
 
@@ -101,13 +98,13 @@
      */
     public function group_delete($getdata, $postdata)
     {
-        if (empty($postdata['group'])) {
+        if (empty($postdata['id'])) {
             return FALSE;
         }
 
         // TODO: Input validation
         $auth   = Auth::get_instance();
-        $result = $auth->group_delete($postdata['group']);
+        $result = $auth->group_delete($postdata['id']);
 
         if ($result) {
             return $result;
@@ -137,7 +134,7 @@
     public function group_effective_rights($getdata, $postdata)
     {
         $auth = Auth::get_instance();
-        $effective_rights = $auth->list_rights(empty($getdata['group']) ? 'group' : $getdata['group']);
+        $effective_rights = $auth->list_rights(empty($getdata['id']) ? 'group' : $getdata['id']);
         return $effective_rights;
     }
 
@@ -151,12 +148,12 @@
      */
     public function group_info($getdata, $postdata)
     {
-        if (empty($getdata['group'])) {
+        if (empty($getdata['id'])) {
             return false;
         }
 
         $auth   = Auth::get_instance();
-        $result = $auth->group_info($getdata['group']);
+        $result = $auth->group_info($getdata['id']);
 
         // normalize result
         $result = $this->parse_result_attributes('group', $result);
@@ -171,6 +168,43 @@
     }
 
     /**
+     * Find group and return its data.
+     * It is a combination of group.info and groups.list with search capabilities
+     * If the search returns only one record we'll return group data.
+     *
+     * @param array $get   GET parameters
+     * @param array $post  POST parameters
+     *
+     * @return array|bool Group attributes, False on error
+     */
+    public function group_find($get, $post)
+    {
+        $auth       = Auth::get_instance();
+        $attributes = array('');
+        $params     = array('page_size' => 2);
+        $search     = $this->parse_list_search($post);
+
+        // find group(s)
+        $groups = $auth->list_groups(null, $attributes, $search, $params);
+
+        if (empty($groups) || empty($groups['list']) || $groups['count'] > 1) {
+            return false;
+        }
+
+        // get group data
+        $result = $auth->group_info(key($groups['list']));
+
+        // normalize result
+        $result = $this->parse_result_attributes('group', $result);
+
+        if ($result) {
+            return $result;
+        }
+
+        return false;
+    }
+
+    /**
      * Group members listing.
      *
      * @param array $get   GET parameters
@@ -180,15 +214,15 @@
      */
     public function group_members_list($getdata, $postdata)
     {
-        Log::trace("group_members_list() for group " . $getdata['group']);
+        Log::trace("group_members_list() for group " . $getdata['id']);
         $auth = Auth::get_instance();
 
-        if (empty($getdata['group'])) {
-            //console("Empty \$getdata['group']");
+        if (empty($getdata['id'])) {
+            //console("Empty \$getdata['id']");
             return FALSE;
         }
 
-        $result = $auth->group_members_list($getdata['group'], false);
+        $result = $auth->group_members_list($getdata['id'], false);
 
         Log::trace("group_members_list() result: " . var_export($result, TRUE));

kolab-webadmin-3.0.5.tar.gz/lib/api/kolab_api_service_groups.php -> kolab-webadmin-3.1.tar.gz/lib/api/kolab_api_service_groups.php Changed

kolab-webadmin-3.0.5.tar.gz/lib/api/kolab_api_service_resource.php -> kolab-webadmin-3.1.tar.gz/lib/api/kolab_api_service_resource.php Changed

@@ -39,13 +39,9 @@
     {
         //console("kolab_api_service_group::capabilities");
 
-        $auth = Auth::get_instance();
-
+        $auth             = Auth::get_instance();
         $effective_rights = $auth->list_rights('resource');
-
-        //console("effective_rights", $effective_rights);
-
-        $rights = array();
+        $rights           = array();
 
         if (in_array('add', $effective_rights['entryLevelRights'])) {
             $rights['add'] = "w";
@@ -60,11 +56,8 @@
         }
 
         if (in_array('read', $effective_rights['entryLevelRights'])) {
-            $rights['find'] = "r";
-            $rights['find_by_any_attribute'] = "r";
-            $rights['find_by_attribute'] = "r";
-            $rights['find_by_attributes'] = "r";
             $rights['info'] = "r";
+            $rights['find'] = "r";
         }
 
         $rights['effective_rights'] = "r";
@@ -110,13 +103,13 @@
     public function resource_delete($getdata, $postdata)
     {
         //console("resource_delete()", $getdata, $postdata);
-        if (!isset($postdata['resource'])) {
+        if (!isset($postdata['id'])) {
             return false;
         }
 
         // TODO: Input validation
         $auth   = Auth::get_instance();
-        $result = $auth->resource_delete($postdata['resource']);
+        $result = $auth->resource_delete($postdata['id']);
 
         if ($result) {
             return $result;
@@ -150,7 +143,7 @@
     public function resource_effective_rights($getdata, $postdata)
     {
         $auth = Auth::get_instance();
-        $effective_rights = $auth->list_rights(empty($getdata['resource']) ? 'resource' : $getdata['resource']);
+        $effective_rights = $auth->list_rights(empty($getdata['id']) ? 'resource' : $getdata['id']);
         return $effective_rights;
     }
 
@@ -164,12 +157,12 @@
      */
     public function resource_info($getdata, $postdata)
     {
-        if (!isset($getdata['resource'])) {
+        if (!isset($getdata['id'])) {
             return false;
         }
 
         $auth   = Auth::get_instance();
-        $result = $auth->resource_info($getdata['resource']);
+        $result = $auth->resource_info($getdata['id']);
 
         // normalize result
         $result = $this->parse_result_attributes('resource', $result);
@@ -182,4 +175,42 @@
 
         return false;
     }
+
+    /**
+     * Find resource and return its data.
+     * It is a combination of resource.info and resources.list with search capabilities
+     * If the search returns only one record we'll return resource data.
+     *
+     * @param array $get   GET parameters
+     * @param array $post  POST parameters
+     *
+     * @return array|bool Resource attributes, False on error
+     */
+    public function resource_find($get, $post)
+    {
+        $auth       = Auth::get_instance();
+        $attributes = array('');
+        $params     = array('page_size' => 2);
+        $search     = $this->parse_list_search($post);
+
+        // find resource(s)
+        $resources = $auth->list_resources(null, $attributes, $search, $params);
+
+        if (empty($resources) || empty($resources['list']) || $resources['count'] > 1) {
+            return false;
+        }
+
+        // get resource data
+        $result = $auth->resource_info(key($resources['list']));
+
+        // normalize result
+        $result = $this->parse_result_attributes('resource', $result);
+
+        if ($result) {
+            return $result;
+        }
+
+        return false;
+    }
+
 }

kolab-webadmin-3.0.5.tar.gz/lib/api/kolab_api_service_resources.php -> kolab-webadmin-3.1.tar.gz/lib/api/kolab_api_service_resources.php Changed

kolab-webadmin-3.0.5.tar.gz/lib/api/kolab_api_service_role.php -> kolab-webadmin-3.1.tar.gz/lib/api/kolab_api_service_role.php Changed

@@ -39,13 +39,9 @@
     {
         //console("kolab_api_service_role::capabilities");
 
-        $auth = Auth::get_instance();
-
+        $auth             = Auth::get_instance();
         $effective_rights = $auth->list_rights('role');
-
-        //console("effective_rights", $effective_rights);
-
-        $rights = array();
+        $rights           = array();
 
         if (in_array('add', $effective_rights['entryLevelRights'])) {
             $rights['add'] = "w";
@@ -61,6 +57,7 @@
 
         if (in_array('read', $effective_rights['entryLevelRights'])) {
             $rights['info'] = "r";
+            $rights['find'] = "r";
             $rights['members_list'] = "r";
         }
 
@@ -101,13 +98,13 @@
      */
     public function role_delete($getdata, $postdata)
     {
-        if (empty($postdata['role'])) {
+        if (empty($postdata['id'])) {
             return FALSE;
         }
 
         // TODO: Input validation
         $auth   = Auth::get_instance();
-        $result = $auth->role_delete($postdata['role']);
+        $result = $auth->role_delete($postdata['id']);
 
         if ($result) {
             return $result;
@@ -139,9 +136,9 @@
         $auth = Auth::get_instance();
 
         // Roles are special in that they are ldapsubentries.
-        if (!empty($getdata['role'])) {
+        if (!empty($getdata['id'])) {
             $unique_attr = $this->unique_attribute();
-            $role        = $auth->role_find_by_attribute(Array($unique_attr => $getdata['role']));
+            $role        = $auth->role_find_by_attribute(Array($unique_attr => $getdata['id']));
 
             if (is_array($role) && count($role) == 1) {
                 $role_dn = key($role);
@@ -165,12 +162,49 @@
     {
         //console("api::role.info \$getdata, \$postdata", $getdata, $postdata);
 
-        if (empty($getdata['role'])) {
+        if (empty($getdata['id'])) {
             return false;
         }
 
         $auth   = Auth::get_instance();
-        $result = $auth->role_info($getdata['role']);
+        $result = $auth->role_info($getdata['id']);
+
+        // normalize result
+        $result = $this->parse_result_attributes('role', $result);
+
+        if ($result) {
+            return $result;
+        }
+
+        return false;
+    }
+
+    /**
+     * Find role and return its data.
+     * It is a combination of role.info and roles.list with search capabilities
+     * If the search returns only one record we'll return role data.
+     *
+     * @param array $get   GET parameters
+     * @param array $post  POST parameters
+     *
+     * @return array|bool Role attributes, False on error
+     */
+    public function role_find($get, $post)
+    {
+        $auth       = Auth::get_instance();
+        $attributes = array('');
+        $params     = array('page_size' => 2);
+        $search     = $this->parse_list_search($post);
+
+        // find role(s)
+        $roles = $auth->list_roles(null, $attributes, $search, $params);
+
+        if (empty($roles) || empty($roles['list']) || $roles['count'] > 1) {
+            return false;
+        }
+
+        // get role data
+        $result = $auth->role_info(key($roles['list']));
 
         // normalize result
         $result = $this->parse_result_attributes('role', $result);
@@ -194,12 +228,12 @@
     {
         $auth = Auth::get_instance();
 
-        if (empty($getdata['role'])) {
-            //console("Empty \$getdata['role']");
+        if (empty($getdata['id'])) {
+            //console("Empty \$getdata['id']");
             return FALSE;
         }
 
-        $result = $auth->role_members_list($getdata['role'], false);
+        $result = $auth->role_members_list($getdata['id'], false);
 
         return array(
             'list'  => $result,

kolab-webadmin-3.0.5.tar.gz/lib/api/kolab_api_service_roles.php -> kolab-webadmin-3.1.tar.gz/lib/api/kolab_api_service_roles.php Changed

kolab-webadmin-3.1.tar.gz/lib/api/kolab_api_service_sharedfolder.php Added

@@ -0,0 +1,216 @@
+<?php
+/*
+ +--------------------------------------------------------------------------+
+ | This file is part of the Kolab Web Admin Panel                           |
+ |                                                                          |
+ | Copyright (C) 2011-2012, 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 shared folder data management
+ */
+class kolab_api_service_sharedfolder extends kolab_api_service
+{
+    /**
+     * Returns service capabilities.
+     *
+     * @param string $domain Domain name
+     *
+     * @return array Capabilities list
+     */
+    public function capabilities($domain)
+    {
+        //console("kolab_api_service_group::capabilities");
+
+        $auth             = Auth::get_instance();
+        $effective_rights = $auth->list_rights('sharedfolder');
+        $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['effective_rights'] = "r";
+
+        return $rights;
+    }
+
+    /**
+     * Create a shared folder.
+     *
+     * @param array $get   GET parameters
+     * @param array $post  POST parameters
+     *
+     * @return array|bool User attributes or False on error.
+     */
+    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']);
+
+        if ($result) {
+            return $sharedfolder_attributes;
+        }
+
+        return false;
+    }
+
+    /**
+     * Detete a shared folder.
+     *
+     * @param array $get   GET parameters
+     * @param array $post  POST parameters
+     *
+     * @return bool True on success, False on failure
+     */
+    public function sharedfolder_delete($getdata, $postdata)
+    {
+        //console("sharedfolder_delete()", $getdata, $postdata);
+        if (!isset($postdata['id'])) {
+            return false;
+        }
+
+        // TODO: Input validation
+        $auth   = Auth::get_instance();
+        $result = $auth->sharedfolder_delete($postdata['id']);
+
+        if ($result) {
+            return $result;
+        }
+
+        return false;
+    }
+
+    public function sharedfolder_edit($getdata, $postdata)
+    {
+        //console("\$postdata to sharedfolder_edit()", $postdata);
+
+        $sharedfolder_attributes = $this->parse_input_attributes('sharedfolder', $postdata);
+
+        //console("\$sharedfolder_attributes as result from parse_input_attributes", $sharedfolder_attributes);
+
+        $sharedfolder   = $postdata['id'];
+
+        $auth   = Auth::get_instance();
+        $result = $auth->sharedfolder_edit($sharedfolder, $sharedfolder_attributes, $postdata['type_id']);
+
+        // Return the $mod_array
+        if ($result) {
+            return $result;
+        }
+
+        return false;
+
+    }
+
+    public function sharedfolder_effective_rights($getdata, $postdata)
+    {
+        $auth = Auth::get_instance();
+        $effective_rights = $auth->list_rights(empty($getdata['id']) ? 'sharedfolder' : $getdata['id']);
+        return $effective_rights;
+    }
+
+    /**
+     * User information.
+     *
+     * @param array $get   GET parameters
+     * @param array $post  POST parameters
+     *
+     * @return array|bool User attributes, False on error
+     */
+    public function sharedfolder_info($getdata, $postdata)
+    {
+        if (!isset($getdata['id'])) {
+            return false;
+        }
+
+        $auth   = Auth::get_instance();
+        $result = $auth->sharedfolder_info($getdata['id']);
+
+        // normalize result
+        $result = $this->parse_result_attributes('sharedfolder', $result);
+
+        //console($result);
+
+        if ($result) {
+            return $result;
+        }
+
+        return false;
+    }
+
+    /**
+     * Find a shared folder and return its data.
+     * It is a combination of sharedfolder.info and sharedfolders.list with search capabilities
+     * If the search returns only one record we'll return sharedfolder data.
+     *
+     * @param array $get   GET parameters
+     * @param array $post  POST parameters
+     *
+     * @return array|bool Resource attributes, False on error
+     */
+    public function sharedfolder_find($get, $post)
+    {
+        $auth       = Auth::get_instance();
+        $attributes = array('');
+        $params     = array('page_size' => 2);
+        $search     = $this->parse_list_search($post);
+
+        // find shared folder(s)
+        $sharedfolders = $auth->list_sharedfolders(null, $attributes, $search, $params);
+
+        if (empty($sharedfolders) || empty($sharedfolders['list']) || $sharedfolders['count'] > 1) {
+            return false;
+        }
+
+        // get shared folder data
+        $result = $auth->sharedfolder_info(key($sharedfolders['list']));
+
+        // normalize result
+        $result = $this->parse_result_attributes('sharedfolder', $result);
+
+        if ($result) {
+            return $result;
+        }
+
+        return false;
+    }
+
+}

kolab-webadmin-3.1.tar.gz/lib/api/kolab_api_service_sharedfolder_types.php Added

@@ -0,0 +1,64 @@
+<?php
+/*
+ +--------------------------------------------------------------------------+
+ | This file is part of the Kolab Web Admin Panel                           |
+ |                                                                          |
+ | Copyright (C) 2011-2012, 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_sharedfolder_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',
+        );
+    }
+
+    /**
+     * Shared folder types listing.
+     *
+     * @param array $get   GET parameters
+     * @param array $post  POST parameters
+     *
+     * @return array List result with 'list' and 'count' items
+     */
+    public function sharedfolder_types_list($get, $post)
+    {
+        $sharedfolder_types = $this->object_types('sharedfolder');
+
+        Log::trace("api/sharedfolder_types_list()", $sharedfolder_types);
+
+        return array(
+            'list'  => $sharedfolder_types,
+            'count' => count($sharedfolder_types),
+        );
+    }
+}

kolab-webadmin-3.1.tar.gz/lib/api/kolab_api_service_sharedfolders.php Added

@@ -0,0 +1,78 @@
+<?php
+/*
+ +--------------------------------------------------------------------------+
+ | This file is part of the Kolab Web Admin Panel                           |
+ |                                                                          |
+ | Copyright (C) 2011-2012, 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 shared folders listing
+ */
+class kolab_api_service_sharedfolders extends kolab_api_service
+{
+    public $list_attribs = array(
+        'alias',
+        'cn',
+        'entrydn',
+        'mail',
+        'kolabtargetfolder',
+        'kolabfoldertype',
+        'objectclass',
+    );
+
+
+    /**
+     * Returns service capabilities.
+     *
+     * @param string $domain Domain name
+     *
+     * @return array Capabilities list
+     */
+    public function capabilities($domain)
+    {
+        return array(
+            'list' => 'r',
+        );
+    }
+
+    /**
+     * Shared folder listing (with searching).
+     *
+     * @param array $get   GET parameters
+     * @param array $post  POST parameters
+     *
+     * @return array List result with 'list' and 'count' items
+     */
+    public function sharedfolders_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);
+
+        $resources = $auth->list_sharedfolders(null, $attributes, $search, $params);
+        $resources = $this->parse_list_result($resources);
+
+        return $resources;
+    }
+
+}

kolab-webadmin-3.0.5.tar.gz/lib/api/kolab_api_service_type.php -> kolab-webadmin-3.1.tar.gz/lib/api/kolab_api_service_type.php Changed

kolab-webadmin-3.0.5.tar.gz/lib/api/kolab_api_service_user.php -> kolab-webadmin-3.1.tar.gz/lib/api/kolab_api_service_user.php Changed

@@ -60,11 +60,8 @@
         }
 
         if (in_array('read', $effective_rights['entryLevelRights'])) {
-            $rights['find'] = "r";
-            $rights['find_by_any_attribute'] = "r";
-            $rights['find_by_attribute'] = "r";
-            $rights['find_by_attributes'] = "r";
             $rights['info'] = "r";
+            $rights['find'] = "r";
         }
 
         $rights['effective_rights'] = "r";
@@ -109,13 +106,13 @@
     public function user_delete($getdata, $postdata)
     {
         //console("user_delete()", $getdata, $postdata);
-        if (!isset($postdata['user'])) {
+        if (!isset($postdata['id'])) {
             return false;
         }
 
         // TODO: Input validation
         $auth   = Auth::get_instance();
-        $result = $auth->user_delete($postdata['user']);
+        $result = $auth->user_delete($postdata['id']);
 
         if ($result) {
             return $result;
@@ -128,6 +125,13 @@
     {
         //console("\$postdata to user_edit()", $postdata);
 
+        if ($postdata['mailquota-unit'] == 'gb') {
+            $postdata['mailquota'] *= 1024*1024;
+        }
+        if ($postdata['mailquota-unit'] == 'mb') {
+            $postdata['mailquota'] *= 1024;
+        }
+
         $user_attributes = $this->parse_input_attributes('user', $postdata);
         $user            = $postdata['id'];
 
@@ -148,7 +152,7 @@
     public function user_effective_rights($getdata, $postdata)
     {
         $auth = Auth::get_instance();
-        $effective_rights = $auth->list_rights(empty($getdata['user']) ? 'user' : $getdata['user']);
+        $effective_rights = $auth->list_rights(empty($getdata['id']) ? 'user' : $getdata['id']);
         return $effective_rights;
     }
 
@@ -162,18 +166,55 @@
      */
     public function user_info($getdata, $postdata)
     {
-        if (!isset($getdata['user'])) {
+        if (!isset($getdata['id'])) {
             return false;
         }
 
         $auth   = Auth::get_instance();
-        $result = $auth->user_info($getdata['user']);
+        $result = $auth->user_info($getdata['id']);
 
-        Log::trace("user.info on " . $getdata['user'] . " result: " . var_export($result, TRUE));
+        Log::trace("user.info on " . $getdata['id'] . " result: " . var_export($result, TRUE));
         // normalize result
         $result = $this->parse_result_attributes('user', $result);
 
-        Log::trace("user.info on " . $getdata['user'] . " parsed result: " . var_export($result, TRUE));
+        Log::trace("user.info on " . $getdata['id'] . " parsed result: " . var_export($result, TRUE));
+
+        if ($result) {
+            return $result;
+        }
+
+        return false;
+    }
+
+    /**
+     * Find user and return his data.
+     * It is a combination of user.info and users.list with search capabilities
+     * If the search returns only one record we'll return user data.
+     *
+     * @param array $get   GET parameters
+     * @param array $post  POST parameters
+     *
+     * @return array|bool User attributes, False on error
+     */
+    public function user_find($get, $post)
+    {
+        $auth       = Auth::get_instance();
+        $attributes = array('');
+        $params     = array('page_size' => 2);
+        $search     = $this->parse_list_search($post);
+
+        // find user(s)
+        $users = $auth->list_users(null, $attributes, $search, $params);
+
+        if (empty($users) || empty($users['list']) || $users['count'] > 1) {
+            return false;
+        }
+
+        // get user data
+        $result = $auth->user_info(key($users['list']));
+
+        // normalize result
+        $result = $this->parse_result_attributes('user', $result);
 
         if ($result) {
             return $result;
@@ -181,4 +222,5 @@
 
         return false;
     }
+
 }

kolab-webadmin-3.0.5.tar.gz/lib/api/kolab_api_service_users.php -> kolab-webadmin-3.1.tar.gz/lib/api/kolab_api_service_users.php Changed

kolab-webadmin-3.0.5.tar.gz/lib/client/kolab_client_task_domain.php -> kolab-webadmin-3.1.tar.gz/lib/client/kolab_client_task_domain.php Changed

kolab-webadmin-3.0.5.tar.gz/lib/client/kolab_client_task_group.php -> kolab-webadmin-3.1.tar.gz/lib/client/kolab_client_task_group.php Changed

kolab-webadmin-3.0.5.tar.gz/lib/client/kolab_client_task_main.php -> kolab-webadmin-3.1.tar.gz/lib/client/kolab_client_task_main.php Changed

kolab-webadmin-3.0.5.tar.gz/lib/client/kolab_client_task_resource.php -> kolab-webadmin-3.1.tar.gz/lib/client/kolab_client_task_resource.php Changed

kolab-webadmin-3.0.5.tar.gz/lib/client/kolab_client_task_role.php -> kolab-webadmin-3.1.tar.gz/lib/client/kolab_client_task_role.php Changed

kolab-webadmin-3.0.5.tar.gz/lib/client/kolab_client_task_settings.php -> kolab-webadmin-3.1.tar.gz/lib/client/kolab_client_task_settings.php Changed

@@ -33,6 +33,7 @@
 
     protected $form_element_types = array(
         'text', 'select', 'multiselect', 'list', 'list-autocomplete', 'checkbox', 'password', 'ldap_url',
+        'text-quota',
     );
 
 
@@ -633,6 +634,7 @@
             if ($data['attributes']['fields'][$attr]) {
                 $valtype = 'static';
                 $_data   = $data['attributes']['fields'][$attr];
+                $_data   = is_array($_data) ? implode(',', $_data) : $_data;
                 $value   = $this->translate('attribute.value.static') . ': ' . kolab_html::escape($_data);
             }
             else if (isset($data['attributes']['auto_form_fields'][$attr])) {
@@ -836,6 +838,7 @@
         $response   = $this->api_post('form_value.select_options', null, $post_data);
         $response   = $response->get('attribute');
         $attributes = array();
+        $required   = array();
 
         // convert to hash array
         if (!empty($response['list'])) {
@@ -846,8 +849,13 @@
             }
         }
 
+        if (!empty($response['required'])) {
+            // remove objectClass
+            $required = array_diff($response['required'], array('objectClass'));
+        }
+
         $this->output->set_env('attributes', $attributes);
-        $this->output->set_env('attributes_required', $response['required']);
+        $this->output->set_env('attributes_required', $required);
 
         return $attributes;
     }

kolab-webadmin-3.1.tar.gz/lib/client/kolab_client_task_sharedfolder.php Added

@@ -0,0 +1,338 @@
+<?php
+/*
+ +--------------------------------------------------------------------------+
+ | This file is part of the Kolab Web Admin Panel                           |
+ |                                                                          |
+ | Copyright (C) 2011-2012, 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_sharedfolder extends kolab_client_task
+{
+    protected $ajax_only = true;
+
+    protected $menu = array(
+        'add'  => 'sharedfolder.add',
+    );
+
+    /**
+     * Default action.
+     */
+    public function action_default()
+    {
+        $this->output->set_object('content', 'sharedfolder', true);
+        $this->output->set_object('task_navigation', $this->menu());
+
+        $this->action_list();
+
+        // display form to add a shared folder if logged-in user has right to do so
+        $caps = $this->get_capability('actions');
+        if (!empty($caps['sharedfolder.add'])) {
+            $this->action_add();
+        }
+        else {
+            $this->output->command('set_watermark', 'taskcontent');
+        }
+    }
+
+    /**
+     * Users list action.
+     */
+    public function action_list()
+    {
+        $page_size = 20;
+        $page      = (int) self::get_input('page', 'POST');
+        if (!$page || $page < 1) {
+            $page = 1;
+        }
+
+        // request parameters
+        $post = array(
+            'attributes' => array('cn'),
+//            'sort_order' => 'ASC',
+            'sort_by'    => array('cn'),
+            'page_size'  => $page_size,
+            'page'       => $page,
+        );
+
+        // search parameters
+        if (!empty($_POST['search'])) {
+            $search = self::get_input('search', 'POST', true);
+            $field  = self::get_input('field',  'POST');
+            $method = self::get_input('method', 'POST');
+
+            $search_request = array(
+                $field => array(
+                    'value' => $search,
+                    'type'  => $method,
+                ),
+            );
+        }
+        else if (!empty($_POST['search_request'])) {
+            $search_request = self::get_input('search_request', 'POST');
+            $search_request = @unserialize(base64_decode($search_request));
+        }
+
+        if (!empty($search_request)) {
+            $post['search']          = $search_request;
+            $post['search_operator'] = 'OR';
+        }
+
+        // get shared folders list
+        $result = $this->api_post('sharedfolders.list', null, $post);
+        $count  = $result->get('count');
+        $result = (array) $result->get('list');
+
+        //console($result);
+
+        // calculate records
+        if ($count) {
+            $start = 1 + max(0, $page - 1) * $page_size;
+            $end   = min($start + $page_size - 1, $count);
+        }
+
+        $rows = $head = $foot = array();
+        $cols = array('name');
+        $i    = 0;
+
+        // table header
+        $head[0]['cells'][] = array('class' => 'name', 'body' => $this->translate('sharedfolder.list'));
+
+        // table footer (navigation)
+        if ($count) {
+            $pages = ceil($count / $page_size);
+            $prev  = max(0, $page - 1);
+            $next  = $page < $pages ? $page + 1 : 0;
+
+            $count_str = kolab_html::span(array(
+                'content' => $this->translate('list.records', $start, $end, $count)), true);
+            $prev = kolab_html::a(array(
+                'class' => 'prev' . ($prev ? '' : ' disabled'),
+                'href'  => '#',
+                'onclick' => $prev ? "kadm.command('sharedfolder.list', {page: $prev})" : "return false",
+            ));
+            $next = kolab_html::a(array(
+                'class' => 'next' . ($next ? '' : ' disabled'),
+                'href'  => '#',
+                'onclick' => $next ? "kadm.command('sharedfolder.list', {page: $next})" : "return false",
+            ));
+
+            $foot_body = kolab_html::span(array('content' => $prev . $count_str . $next));
+        }
+        $foot[0]['cells'][] = array('class' => 'listnav', 'body' => $foot_body);
+
+        // table body
+        if (!empty($result)) {
+            foreach ($result as $idx => $item) {
+                if (!is_array($item) || empty($item['cn'])) {
+                    continue;
+                }
+
+                $i++;
+                $cells = array();
+                $cells[] = array('class' => 'name', 'body' => kolab_html::escape($item['cn']),
+                    'onclick' => "kadm.command('sharedfolder.info', '$idx')");
+                $rows[] = array('id' => $i, 'class' => 'selectable', 'cells' => $cells);
+            }
+        }
+        else {
+            $rows[] = array('cells' => array(
+                0 => array('class' => 'empty-body', 'body' => $this->translate('sharedfolder.norecords')
+            )));
+        }
+
+        $table = kolab_html::table(array(
+            'id'    => 'sharedfolderlist',
+            'class' => 'list',
+            'head'  => $head,
+            'body'  => $rows,
+            'foot'  => $foot,
+        ));
+
+        if ($this->action == 'list') {
+            $this->output->command('set_watermark', 'taskcontent');
+        }
+
+        $this->output->set_env('search_request', $search_request ? base64_encode(serialize($search_request)) : null);
+        $this->output->set_env('list_page', $page);
+        $this->output->set_env('list_count', $count);
+        $this->output->set_env('list_size', count($result));
+        $this->output->set_object('sharedfolderlist', $table);
+    }
+
+    /**
+     * Resource adding (form) action.
+     */
+    public function action_add()
+    {
+        $data   = $this->get_input('data', 'POST');
+        $output = $this->sharedfolder_form(null, $data, true);
+
+        $this->output->set_object('taskcontent', $output);
+    }
+
+    /**
+     * Resource information (form) action.
+     */
+    public function action_info()
+    {
+        $id             = $this->get_input('id', 'POST');
+        $result         = $this->api_get('sharedfolder.info', array('id' => $id));
+        $sharedfolder   = $result->get();
+
+        //console("action_info()", $sharedfolder);
+
+        $output     = $this->sharedfolder_form(null, $sharedfolder);
+
+        $this->output->set_object('taskcontent', $output);
+    }
+
+    private function sharedfolder_form($attribs, $data = array())
+    {
+        if (empty($attribs['id'])) {
+            $attribs['id'] = 'sharedfolder-form';
+        }
+
+        //console("sharedfolder_form(\$attribs, \$data)", $attribs, $data);
+
+        // Form sections
+        $sections = array(
+            'system'        => 'sharedfolder.system',
+            'other'         => 'sharedfolder.other',
+        );
+
+        // field-to-section map and fields order
+        $fields_map = array(
+            'type_id'                   => 'system',
+            'type_id_name'              => 'system',
+
+            'cn'                        => 'system',
+            'ou'                        => 'system',
+            'preferredlanguage'         => 'system',
+
+            'mail'                      => 'system',
+            'alias'                     => 'system',
+            'mailalternateaddress'      => 'system',
+
+            'member'                    => 'system',
+            'uniquemember'              => 'system',
+            'memberurl'                 => 'system',
+
+            'nsrole'                    => 'system',
+            'nsroledn'                  => 'system',
+
+            /* Kolab Settings */
+            'kolabhomeserver'           => 'system',
+            'mailhost'                  => 'system',
+            'mailquota'                 => 'system',
+            'kolabfreebusyfuture'       => 'system',
+            'kolabinvitationpolicy'     => 'system',
+            'kolabdelegate'             => 'system',
+            'kolaballowsmtprecipient'   => 'system',
+            'kolaballowsmtpsender'      => 'system',
+        );
+
+        // Prepare fields
+        list($fields, $types, $type) = $this->form_prepare('sharedfolder', $data);
+
+        //console("Result from form_prepare", $fields, $types, $type);
+
+        $add_mode  = empty($data['id']);
+        $accttypes = array();
+
+        foreach ($types as $idx => $elem) {
+            $accttypes[$idx] = array('value' => $idx, 'content' => $elem['name']);
+        }
+
+        // Add sharedfolder type id selector
+        $fields['type_id'] = array(
+            'section'  => 'system',
+            'type'     => kolab_form::INPUT_SELECT,
+            'options'  => $accttypes,
+            'onchange' => "kadm.sharedfolder_save(true, 'system')",
+        );
+
+        //console($accttypes);
+
+        // Hide account type selector if there's only one type
+        if (count($accttypes) < 2 || !$add_mode) {
+            //console("setting type_id form type to hidden");
+            $fields['type_id']['type'] = kolab_form::INPUT_HIDDEN;
+        }
+
+        // Create mode
+        if ($add_mode) {
+            // Page title
+            $title = $this->translate('sharedfolder.add');
+        }
+        // Edit mode
+        else {
+            $title = $data['cn'];
+
+            // Add sharedfolder type name
+            $fields['type_id_name'] = array(
+                'label'    => 'sharedfolder.type_id',
+                'section'  => 'system',
+                'value'    => $accttypes[$type]['content'],
+            );
+        }
+
+        // Create form object and populate with fields
+        $form = $this->form_create('sharedfolder', $attribs, $sections, $fields, $fields_map, $data, $add_mode);
+
+        $form->set_title(kolab_html::escape($title));
+
+        return $form->output();
+    }
+
+    /**
+     * Users search form.
+     *
+     * @return string HTML output of the form
+     */
+    public function search_form()
+    {
+        $form = new kolab_form(array('id' => 'search-form'));
+
+        $form->add_section('criteria', kolab_html::escape($this->translate('search.criteria')));
+        $form->add_element(array(
+            'section' => 'criteria',
+            'label'   => $this->translate('search.field'),
+            'name'    => 'field',
+            'type'    => kolab_form::INPUT_SELECT,
+            'options' => array(
+                'cn'    => kolab_html::escape($this->translate('search.name')),
+                'email' => kolab_html::escape($this->translate('search.email')),
+                'uid'   => kolab_html::escape($this->translate('search.uid')),
+            ),
+        ));
+        $form->add_element(array(
+            'section' => 'criteria',
+            'label'   => $this->translate('search.method'),
+            'name'    => 'method',
+            'type'    => kolab_form::INPUT_SELECT,
+            'options' => array(
+                'both'   => kolab_html::escape($this->translate('search.contains')),
+                'exact'  => kolab_html::escape($this->translate('search.is')),
+                'prefix' => kolab_html::escape($this->translate('search.prefix')),
+            ),
+        ));
+
+        return $form->output();
+    }
+}

kolab-webadmin-3.0.5.tar.gz/lib/client/kolab_client_task_signup.php -> kolab-webadmin-3.1.tar.gz/lib/client/kolab_client_task_signup.php Changed

@@ -110,10 +110,16 @@
 
         $this->login($data['domain']);
 
-        // Assemble mail attribute
-        $mail = $data['uid'].'@'.$data['domain'];
+        $post = array(
+            'attributes' =>  array('uid', 'mail'),
+            'search' => array('params' => array(
+                        'uid' => array('type' => 'exact', 'value' => $data['uid']),
+                        'mail' => array('type' => 'exact', 'value' => $data['uid'].'@'.$data['domain']),
+                    ),
+                'operator' => "OR"
+             )
+        );
 
-        $post = array('search' => array('mail' => array('value' => $mail) ) );
         $result = $this->api->post('users.list', null, $post);
 
         if($result->get('count') > 0) {
@@ -265,7 +271,7 @@
 
         $form->set_title($this->translate('signup.formtitle'));
 
-        $this->output->add_translation('user.password.mismatch', 'signup.wronguid', 'signup.userexists', 'signup.wrongmailalternateaddress', 'internalerror', 'servererror');
+        $this->output->add_translation('user.password.mismatch', 'signup.wronguid', 'signup.userexists', 'internalerror', 'servererror');
 
         return $form->output();
     }

kolab-webadmin-3.0.5.tar.gz/lib/client/kolab_client_task_user.php -> kolab-webadmin-3.1.tar.gz/lib/client/kolab_client_task_user.php Changed

kolab-webadmin-3.0.5.tar.gz/lib/ext/Net/LDAP3.php -> kolab-webadmin-3.1.tar.gz/lib/ext/Net/LDAP3.php Changed

@@ -23,8 +23,7 @@
  +-----------------------------------------------------------------------+
 */
 
-require_once('PEAR.php');
-require_once('LDAP3/Result.php');
+require_once __DIR__ . '/LDAP3/Result.php';
 
 /**
  * Model class to access a LDAP directories
@@ -39,39 +38,39 @@
     const UPDATE_MOD_FULL = 7;
 
     private $conn;
-    public $vlv_active = FALSE;
+    public $vlv_active = false;
 
-    protected $config = Array(
-            'sizelimit' => 0,
-            'timelimit' => 0,
-            'vlv' => NULL
-        );
+    protected $config = array(
+        'sizelimit' => 0,
+        'timelimit' => 0,
+        'vlv'       => null
+    );
 
     private $attribute_level_rights_map = array(
-            "r" => "read",
-            "s" => "search",
-            "w" => "write",
-            "o" => "delete",
-            "c" => "compare",
-            "W" => "write",
-            "O" => "delete"
-        );
+        "r" => "read",
+        "s" => "search",
+        "w" => "write",
+        "o" => "delete",
+        "c" => "compare",
+        "W" => "write",
+        "O" => "delete"
+    );
 
     private $entry_level_rights_map = array(
-            "a" => "add",
-            "d" => "delete",
-            "n" => "modrdn",
-            "v" => "read"
-        );
+        "a" => "add",
+        "d" => "delete",
+        "n" => "modrdn",
+        "v" => "read"
+    );
 
     /*
         Manipulate configuration through the config_set and config_get methods.
     *//*
-            'debug' => FALSE,
-            'host' => NULL,
-            'hosts' => Array(),
+            'debug' => false,
+            'host' => null,
+            'hosts' => array(),
             'port' => 389,
-            'use_tls' => FALSE,
+            'use_tls' => false,
             'bind_dn' => '%bind_dn',
             'bind_pw' => '%bind_pw',
             'service_bind_dn' => 'uid=kolab-service,ou=Special Users,dc=example,dc=org',
@@ -80,42 +79,44 @@
             'root_dn_db_name' => 'example_org',
             'root_dn_db_name_attr' => 'cn',
             'config_root_dn' => 'cn=config',
+            'referrals' => false,
+            'network_timeout' => 10,
             'sizelimit' => 0,
             'timelimit' => 0,
             // Force VLV off.
-            'vlv' => FALSE,
+            'vlv' => false,
 
         );
     */
 
-    protected $return_attributes = Array('entrydn');
-    protected $entries = NULL;
-    protected $result = NULL;
-    protected $debug_level = FALSE;
+    protected $return_attributes = array('entrydn');
+    protected $entries = null;
+    protected $result = null;
+    protected $debug_level = false;
     protected $list_page = 1;
     protected $page_size = 10;
 
     // Use public method config_set('log_hook', $callback) to have $callback be
     // call_user_func'ed instead of the local log functions.
-    protected $_log_hook = NULL;
+    protected $_log_hook = null;
 
     // Use public method config_set('config_get_hook', $callback) to have
     // $callback be call_user_func'ed instead of the local config_get function.
-    protected $_config_get_hook = NULL;
+    protected $_config_get_hook = null;
 
     // Use public method config_set('config_set_hook', $callback) to have
     // $callback be call_user_func'ed instead of the local config_set function.
-    protected $_config_set_hook = NULL;
+    protected $_config_set_hook = null;
 
     // Not Yet Implemented
     // Intended to allow hooking in for the purpose of caching.
-    protected $_result_hook = NULL;
+    protected $_result_hook = null;
 
     // Runtime. These are not the variables you're looking for.
-    protected $_current_bind_dn = NULL;
-    protected $_current_host = NULL;
-    protected $_supported_control = Array();
-    protected $_vlv_indexes_and_searches = NULL;
+    protected $_current_bind_dn = null;
+    protected $_current_host = null;
+    protected $_supported_control = array();
+    protected $_vlv_indexes_and_searches = null;
 
     /**
      * Constructor
@@ -125,12 +126,21 @@
      *                          that have in fact been set, use the config_set()
      *                          method after initialization.
      */
-    public function __construct($config = Array())
+    public function __construct($config = array())
     {
         if (!empty($config) && is_array($config)) {
             foreach ($config as $key => $value) {
                 if (!isset($this->config[$key]) || empty($this->config[$key])) {
-                    $this->config[$key] = $value;
+                    $setter = 'config_set_' . $key;
+                    if (method_exists($this, $setter)) {
+                        $this->$setter($value);
+                    }
+                    else if (isset($this->$key)) {
+                        $this->$key = $value;
+                    }
+                    else {
+                        $this->config[$key] = $value;
+                    }
                 }
             }
         }
@@ -139,22 +149,22 @@
     /**
      *  Add multiple entries to the directory information tree in one go.
      */
-    public function add_entries($entries, $attributes = Array())
+    public function add_entries($entries, $attributes = array())
     {
-        // If $entries is an associative array, it's keys are DNs and it's
+        // If $entries is an associative array, it's keys are DNs and its
         // values are the attributes for that DN.
         //
         // If $entries is a non-associative array, the attributes are expected
         // to be positional in $attributes.
 
-        $result_set = Array();
+        $result_set = array();
 
         if (array_keys($entries) == range(0, count($entries) - 1)) {
             // $entries is sequential
 
             if (count($entries) !== count($attributes)) {
-                new PEAR_Error("Wrong entry/attribute count in " . __FUNCTION__);
-                return FALSE;
+                $this->_error("Wrong entry/attribute count in " . __FUNCTION__);
+                return false;
             }
 
             for ($i = 0; $i < count($entries); $i++) {
@@ -209,16 +219,165 @@
 
         $this->_debug("C: Add $entry_dn: " . json_encode($attributes));
 
-        if (($add_result = ldap_add($this->conn, $entry_dn, $attributes)) == FALSE) {
+        if (($add_result = ldap_add($this->conn, $entry_dn, $attributes)) == false) {
             $this->_debug("S: " . ldap_error($this->conn));
             $this->_debug("S: Adding entry $entry_dn failed. " . ldap_error($this->conn));
 
-            return FALSE;
+            return false;
         }
 
         $this->_debug("LDAP: S: OK");
 
-        return TRUE;
+        return true;
+    }
+
+    /**
+     * Add replication agreements and initialize the consumer(s) for
+     * $domain_root_dn.
+     *
+     * Searches the configured replicas for any of the current domain/config
+     * databases, and uses this information to configure the additional
+     * replication for the (new) domain database (at $domain_root_dn).
+     *
+     * Very specific to Netscape-based directory servers, and currently also
+     * very specific to multi-master replication.
+     */
+    public function add_replication_agreements($domain_root_dn)
+    {
+        $replica_hosts = $this->list_replicas();
+
+        if (empty($replica_hosts)) {
+            return;
+        }
+
+        $result = $this->search($this->config_get('config_root_dn'), "(&(objectclass=nsDS5Replica)(nsDS5ReplicaType=3))", "sub");
+
+        if (!$result) {
+            $this->_debug("No replication configuration found.");
+            return;
+        }
+
+        // Preserve the number of replicated databases we have, because the replication ID
+        // can be calculated from the number of databases replicated, and the number of
+        // servers.
+        $num_replica_dbs = $result->count();
+
+        $replicas = $result->entries(TRUE);
+
+        $max_replica_agreements = 0;
+
+        foreach ($replicas as $replica_dn => $replica_attrs) {
+            $result = $this->search($replica_dn, "(objectclass=nsDS5ReplicationAgreement)", "sub");
+            if ($result) {
+                if ($max_replica_agreements < $result->count()) {
+                    $max_replica_agreements = $result->count();
+                    $max_replica_agreements_dn = $replica_dn;
+                }
+            }
+        }
+
+        $max_repl_id = ($num_replica_dbs * count($replica_hosts));
+
+        $this->_debug("The current maximum replication ID is $max_repl_id");
+        $this->_debug("The current maximum number of replication agreements for any database is $max_replica_agreements (for $max_replica_agreements_dn)");
+
+        $this->_debug("With " . count($replica_hosts) . " replicas, the next is " . ($max_repl_id + 1) . " and the last one is " . ($max_repl_id + count($replica_hosts)));
+
+        // Then add the replication agreements
+        foreach ($replica_hosts as $num => $replica_host) {
+            $ldap = new Net_LDAP3($this->config);
+            $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);
+
+            $replica_attrs = Array(
+                    'cn' => 'replica',
+                    'objectclass' => Array(
+                            'top',
+                            'nsds5replica',
+                            'extensibleobject',
+                        ),
+                    'nsDS5ReplicaBindDN' => $ldap->get_entry_attribute($replica_dn, "nsDS5ReplicaBindDN"),
+                    'nsDS5ReplicaId' => ($max_repl_id + $num + 1),
+                    'nsDS5ReplicaRoot' => $domain_root_dn,
+                    'nsDS5ReplicaType' => $ldap->get_entry_attribute($replica_dn, "nsDS5ReplicaType"),
+                    'nsds5ReplicaPurgeDelay' => $ldap->get_entry_attribute($replica_dn, "nsds5ReplicaPurgeDelay"),
+                    'nsDS5Flags' => $ldap->get_entry_attribute($replica_dn, "nsDS5Flags")
+                );
+
+            $new_replica_dn = 'cn=replica,cn="' . $domain_root_dn . '",cn=mapping tree,cn=config';
+
+            $this->_debug("Adding $new_replica_dn to $replica_host with attributes: " . var_export($replica_attrs, TRUE));
+
+            $result = $ldap->add_entry($new_replica_dn, $replica_attrs);
+
+            if (!$result) {
+                $this->_error("Could not add replication configuration to database for $domain_root_dn on $replica_host");
+                continue;
+            }
+
+            $result = $ldap->search($replica_dn, "(objectclass=nsDS5ReplicationAgreement)", "sub");
+
+            if (!$result) {
+                $this->_error("Host $replica_host does not have any replication agreements");
+                continue;
+            }
+
+            $entries = $result->entries(TRUE);
+            $replica_agreement_tpl_dn = key($entries);
+
+            $this->_debug("Using " . var_export($replica_agreement_tpl_dn, TRUE) . " as the template for new replication agreements");
+
+            foreach ($replica_hosts as $replicate_to_host) {
+                // Skip the current server
+                if ($replicate_to_host == $replica_host)
+                    continue;
+
+                $this->_debug("Adding a replication agreement for $domain_root_dn to $replicate_to_host on " . $ldap->config_get('host'));
+
+                $attrs = Array(
+                        'objectclass',
+                        'nsDS5ReplicaBindDN',
+                        'nsDS5ReplicaCredentials',
+                        'nsDS5ReplicaTransportInfo',
+                        'nsDS5ReplicaBindMethod',
+                        'nsDS5ReplicaHost',
+                        'nsDS5ReplicaPort'
+                    );
+
+                $replica_agreement_attrs = $ldap->get_entry_attributes($replica_agreement_tpl_dn, $attrs);
+                $replica_agreement_attrs['cn'] = array_shift(explode('.', $replicate_to_host)) . str_replace(array('dc=',','), array('_',''), $domain_root_dn);
+                $replica_agreement_attrs['nsDS5ReplicaRoot'] = $domain_root_dn;
+                $replica_agreement_dn = "cn=" . $replica_agreement_attrs['cn'] . "," . $new_replica_dn;
+
+                $this->_debug("Adding $replica_agreement_dn to $replica_host with attributes: " . var_export($replica_agreement_attrs, TRUE));
+
+                $result = $ldap->add_entry($replica_agreement_dn, $replica_agreement_attrs);
+                if (!$result) {
+                    $this->_error("Failed adding $replica_agreement_dn");
+                }
+            }
+        }
+
+        $server_id = implode('', array_diff($replica_hosts, $this->_server_id_not));
+
+        $this->_debug("About to trigger consumer initialization for replicas on current 'parent': $server_id");
+
+        $result = $this->search($this->config_get('config_root_dn'), "(&(objectclass=nsDS5ReplicationAgreement)(nsds5replicaroot=$domain_root_dn))", "sub");
+
+        if ($result) {
+            foreach ($result->entries(TRUE) as $agreement_dn => $agreement_attrs) {
+                $this->modify_entry_attributes(
+                        $agreement_dn,
+                        Array(
+                                'replace' => Array(
+                                        'nsds5BeginReplicaRefresh' => 'start',
+                                    ),
+                            )
+                    );
+            }
+        }
     }
 
     public function attribute_details($attributes = array())
@@ -265,7 +424,7 @@
                 'type' => (array_key_exists('single-value', $attrib_details) && $attrib_details['single-value']) ? "text" : "list",
                 'description' => $attrib_details['desc'],
                 'syntax' => $attrib_details['syntax'],
-                'max-length' => (array_key_exists('max_length', $attrib_details)) ? $attrib_details['max-length'] : FALSE,
+                'max-length' => (array_key_exists('max_length', $attrib_details)) ? $attrib_details['max-length'] : false,
             );
         }
 
@@ -347,11 +506,11 @@
     public function bind($bind_dn, $bind_pw)
     {
         if (!$this->conn) {
-            return FALSE;
+            return false;
         }
 
         if ($bind_dn == $this->_current_bind_dn) {
-            return TRUE;
+            return true;
         }
 
         $this->_debug("C: Bind [dn: $bind_dn] [pass: $bind_pw]");
@@ -359,13 +518,13 @@
         if (@ldap_bind($this->conn, $bind_dn, $bind_pw)) {
             $this->_debug("S: OK");
             $this->_current_bind_dn = $bind_dn;
-            return TRUE;
+            return true;
         }
 
         $this->_debug("S: ".ldap_error($this->conn));
+        $this->_error("Bind failed for dn=$bind_dn: ".ldap_error($this->conn));
 
-        new PEAR_Error("Bind failed for dn=$bind_dn: ".ldap_error($this->conn), ldap_errno($this->conn));
-        return FALSE;
+        return false;
     }
 
     /**
@@ -375,8 +534,9 @@
     {
         if ($this->conn) {
             $this->_debug("C: Close");
+            $this->_current_bind_dn = null;
             ldap_unbind($this->conn);
-            $this->conn = NULL;
+            $this->conn = null;
         }
     }
 
@@ -386,10 +546,10 @@
      *  @param  string  $key        Configuration key
      *  @param  mixed   $default    Default value to return
      */
-    public function config_get($key, $default = NULL)
+    public function config_get($key, $default = null)
     {
         if (!empty($this->_config_get_hook)) {
-            return call_user_func_array($this->_config_get_hook, Array($key, $value));
+            return call_user_func_array($this->_config_get_hook, array($key, $value));
         } else if (method_exists($this, "config_get_{$key}")) {
             return call_user_func(array($this, "config_get_$key"), $value);
         } else if (!isset($this->config[$key])) {
@@ -410,20 +570,20 @@
         if (!empty($this->_config_set_hook)) {
             return call_user_func(
                     $this->_config_set_hook,
-                    Array($key, $value)
+                    array($key, $value)
                 );
 
         } else if (method_exists($this, "config_set_{$key}")) {
             return call_user_func_array(
-                    Array($this, "config_set_$key"),
-                    Array($value)
+                    array($this, "config_set_$key"),
+                    array($value)
                 );
 
         } else if (isset($this->$key)) {
-            $this->_debug("setting property $key to value " . var_export($value, TRUE));
+            $this->_debug("setting property $key to value " . var_export($value, true));
             $this->$key = $value;
         } else {
-            $this->_debug("setting config array $key to value " . var_export($value, TRUE));
+            $this->_debug("setting config array $key to value " . var_export($value, true));
             $this->config[$key] = $value;
         }
     }
@@ -434,25 +594,25 @@
     public function connect()
     {
         if (!function_exists('ldap_connect')) {
-            new PEAR_Error("No ldap support in this PHP installation", 100);
-            return FALSE;
+            $this->_error("No ldap support in this PHP installation");
+            return false;
         }
 
         if (is_resource($this->conn)) {
             $this->_debug("Connection already exists");
-            return TRUE;
+            return true;
         }
 
-        $config_hosts = $this->config_get('hosts', Array());
-        $config_host = $this->config_get('host', NULL);
+        $config_hosts = $this->config_get('hosts', array());
+        $config_host = $this->config_get('host', null);
 
         if (empty($config_hosts)) {
             if (empty($config_host)) {
-                new PEAR_Error("No host or hosts configured", __LINE__);
-                return FALSE;
+                $this->_error("No host or hosts configured");
+                return false;
             }
 
-            $this->config_set('hosts', Array($this->config_get('host')));
+            $this->config_set('hosts', array($this->config_get('host')));
         }
 
         $port = $this->config_get('port', 389);
@@ -462,9 +622,9 @@
 
             if ($lc = @ldap_connect($host, $port))
             {
-                if ($this->config_get('use_tls', FALSE) === TRUE) {
+                if ($this->config_get('use_tls', false) === true) {
                     if (!ldap_start_tls($lc)) {
-                        $this->_debug("S: Could not start TLS.");
+                        $this->_debug("S: Could not start TLS. " . ldap_error($lc));
                         continue;
                     }
                 }
@@ -480,14 +640,20 @@
                 $this->_current_host = $host;
                 $this->conn = $lc;
 
-                if ($this->config_get('referrals', FALSE)) {
+                if (!empty($this->prop['network_timeout'])) {
                     ldap_set_option(
-                            $lc,
-                            LDAP_OPT_REFERRALS,
-                            $this->config['referrals']
-                        );
+                        $lc,
+                        LDAP_OPT_NETWORK_TIMEOUT,
+                        $this->prop['network_timeout']
+                    );
                 }
 
+                ldap_set_option(
+                    $lc,
+                    LDAP_OPT_REFERRALS,
+                    (bool)($this->config_get('referrals'))
+                );
+
                 break;
             }
 
@@ -495,11 +661,11 @@
         }
 
         if (!is_resource($this->conn)) {
-            new PEAR_Error("Could not connect to LDAP", 100);
-            return FALSE;
+            $this->_error("Could not connect to LDAP");
+            return false;
         }
 
-        return TRUE;
+        return true;
     }
 
     /**
@@ -509,15 +675,15 @@
     {
         $this->_debug("LDAP: C: Delete $entry_dn");
 
-        if (ldap_delete($this->conn, $entry_dn) === FALSE) {
+        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;
+            return false;
         }
 
         $this->_debug("LDAP: S: OK");
 
-        return TRUE;
+        return true;
     }
 
     public function effective_rights($subject)
@@ -528,7 +694,7 @@
 
         if (!in_array($effective_rights_control_oid, $supported_controls)) {
             $this->_debug("LDAP: No getEffectiveRights control in supportedControls");
-            return $this->legacy_rights($subject);
+            return false;
         }
 
         $attributes = array(
@@ -545,6 +711,9 @@
         if (!$entry_dn) {
             $entry_dn = $this->config_get("base_dn");
         }
+        if (!$entry_dn) {
+            $entry_dn = $this->config_get("root_dn");
+        }
 
         $this->_debug("effective_rights for subject $subject resolves to entry dn $entry_dn");
 
@@ -553,12 +722,12 @@
             $moz_ldapsearch = "/usr/lib/mozldap/ldapsearch";
         }
         if (!is_file($moz_ldapsearch)) {
-            $moz_ldapsearch = NULL;
+            $moz_ldapsearch = null;
         }
 
         if (empty($moz_ldapsearch)) {
-            $this->_debug("Mozilla LDAP C SDK binary ldapsearch not found, cannot get effective rights on subject $subject");
-            return NULL;
+            $this->_error("Mozilla LDAP C SDK binary ldapsearch not found, cannot get effective rights on subject $subject");
+            return null;
         }
 
         $command = array(
@@ -577,7 +746,7 @@
                 '-J',
                 escapeshellarg(implode(':', array(
                     $effective_rights_control_oid,          // OID
-                    'TRUE',                                 // Criticality
+                    'true',                                 // Criticality
                     'dn:' . $_SESSION['user']->user_bind_dn // User DN
                 ))),
                 '-s',
@@ -592,9 +761,14 @@
 
         exec($command, $output, $return_code);
 
-        $this->_debug("LDAP: Command output:" . var_export($output, TRUE));
+        $this->_debug("LDAP: Command output:" . var_export($output, true));
         $this->_debug("Return code: " . $return_code);
 
+        if ($return_code) {
+            $this->_error("Command $moz_ldapsearch returned error code: $return_code");
+            return null;
+        }
+
         $lines = array();
         foreach ($output as $line_num => $line) {
             if (substr($line, 0, 1) == " ") {
@@ -637,7 +811,7 @@
      *
      * @return string Entry DN string
      */
-    public function entry_dn($subject, $attributes = array(), $base_dn = NULL)
+    public function entry_dn($subject, $attributes = array(), $base_dn = null)
     {
         $this->_debug("entry_dn on subject $subject");
         $is_dn = ldap_explode_dn($subject, 1);
@@ -648,6 +822,9 @@
         }
 
         $unique_attr = $this->config_get('unique_attribute', 'nsuniqueid');
+
+        $this->_debug("Using unique_attribute " . var_export($unique_attr, TRUE) . " at " . __FILE__ . ":" . __LINE__);
+
         $attributes  = array_merge(array($unique_attr => $subject), (array)$attributes);
         $subject     = $this->entry_find_by_attribute($attributes, $base_dn);
 
@@ -656,16 +833,16 @@
         }
     }
 
-    public function entry_find_by_attribute($attributes, $base_dn = NULL)
+    public function entry_find_by_attribute($attributes, $base_dn = null)
     {
         $this->_debug("Net_LDAP3::entry_find_by_attribute(\$attributes, \$base_dn) called with base_dn", $base_dn, "and attributes", $attributes);
 
         if (empty($attributes) || !is_array($attributes)) {
-            return FALSE;
+            return false;
         }
 
         if (empty($attributes[key($attributes)])) {
-            return FALSE;
+            return false;
         }
 
         $filter = count($attributes) ? "(&" : "";
@@ -684,13 +861,13 @@
         $this->config_set('return_attributes', array_keys($attributes));
         $result = $this->search($base_dn, $filter);
 
-        if ($result->count() > 0) {
-            $this->_debug("Results found: " . implode(', ', array_keys($result->entries(TRUE))));
-            return $result->entries(TRUE);
+        if ($result && $result->count() > 0) {
+            $this->_debug("Results found: " . implode(', ', array_keys($result->entries(true))));
+            return $result->entries(true);
         }
         else {
             $this->_debug("No result");
-            return FALSE;
+            return false;
         }
     }
 
@@ -699,7 +876,7 @@
         $this->_debug(__FILE__ . "(" . __LINE__ . "): " .  $member_dn);
 
         $groups  = array();
-        $root_dn = $this->domain_root_dn($this->domain);
+        $root_dn = $this->config_get('root_dn');
 
         // TODO: Do not query for both, it's either one or the other
         $entries = $this->search($root_dn, "(|" .
@@ -707,7 +884,9 @@
             "(&(objectclass=groupofuniquenames)(uniquemember=$member_dn))" .
             ")");
 
-        $groups  = array_keys($entries);
+        if ($entries) {
+            $groups  = array_keys($entries->entries(TRUE));
+        }
 
         return $groups;
     }
@@ -716,7 +895,7 @@
     {
         $entry = $this->get_entry_attributes($subject_dn, (array)$attribute);
 
-        return $entry[$attribute];
+        return $entry[strtolower($attribute)];
     }
 
     public function get_entry_attributes($subject_dn, $attributes)
@@ -741,8 +920,8 @@
     public function get_count($base_dn, $filter = '(objectclass=*)', $scope = 'sub')
     {
         if (!$this->__result_current($base_dn, $filter, $scope)) {
-            new PEAR_Error("No current search result for these search parameters");
-            return FALSE;
+            $this->error("No current search result for these search parameters");
+            return false;
         }
 
         return $this->result->get_total();
@@ -756,7 +935,7 @@
      */
     public function get_entry($dn)
     {
-        $rec = NULL;
+        $rec = null;
 
         if ($this->conn && $dn) {
             $this->_debug("C: Read [dn: $dn] [(objectclass=*)]");
@@ -790,6 +969,72 @@
         return $this->result;
     }
 
+    public function list_replicas()
+    {
+        $this->_debug("Finding replicas for this server.");
+
+        // Search any host that is a replica for the current host
+        $replica_hosts = $this->config_get('replica_hosts', Array());
+
+        if (!empty($replica_hosts)) {
+            return $replica_hosts;
+        }
+
+        $ldap = new Net_LDAP3($this->config);
+        $ldap->connect();
+        $ldap->bind($_SESSION['user']->user_bind_dn, $_SESSION['user']->user_bind_pw);
+
+        $ldap->config_set('return_attributes', array('nsds5replicahost'));
+
+        $result = $ldap->search($this->config_get('config_root_dn'), '(objectclass=nsds5replicationagreement)', 'sub');
+
+        if (!$result) {
+            $this->_debug("No replicas configured");
+            return $replica_hosts;
+        }
+
+	$this->_debug("Replication agreements found: " . var_export($result->entries(TRUE), TRUE));
+
+        foreach ($result->entries(TRUE) as $dn => $attrs) {
+            if (!in_array($attrs['nsds5replicahost'], $replica_hosts)) {
+                $replica_hosts[] = $attrs['nsds5replicahost'];
+            }
+        }
+
+        // $replica_hosts now holds the IDs of servers we are currently NOT
+        // connected to. We might need this later in order to set
+        $this->_server_id_not = $replica_hosts;
+
+        $this->_debug("So far, we have the following replicas: " . var_export($replica_hosts, TRUE));
+
+        $ldap->close();
+
+        foreach ($replica_hosts as $replica_host) {
+            $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('nsds5replicahost'));
+            $result = $ldap->search($this->config_get('config_root_dn'), '(objectclass=nsds5replicationagreement)', 'sub');
+            if (!$result) {
+                $this->_debug("No replicas configured");
+            }
+
+            foreach ($result->entries(TRUE) as $dn => $attrs) {
+                if (!in_array($attrs['nsds5replicahost'], $replica_hosts)) {
+                    $replica_hosts[] = $attrs['nsds5replicahost'];
+                }
+            }
+
+            $ldap->close();
+        }
+
+        $this->config_set('replica_hosts', $replica_hosts);
+
+        return $replica_hosts;
+    }
+
     public function login($username, $password, $domain = null)
     {
         $this->_debug("Net_LDAP3::login(\$username = '" . $username . "', \$password = '****', \$domain = '" . $domain . "')");
@@ -797,23 +1042,20 @@
         $_bind_pw = $this->config_get('service_bind_pw');
 
         if (empty($_bind_dn)) {
-            new PEAR_Error("No valid service bind dn found.");
             $this->_debug("No valid service bind dn found.");
-            return NULL;
+            return null;
         }
 
         if (empty($_bind_pw)) {
-            new PEAR_Error("No valid service bind password found.");
             $this->_debug("No valid service bind password found.");
-            return NULL;
+            return null;
         }
 
         $bound = $this->bind($_bind_dn, $_bind_pw);
 
         if (!$bound) {
-            new PEAR_Error("Could not bind with service bind credentials.");
             $this->_debug("Could not bind with service bind credentials.");
-            return NULL;
+            return null;
         }
 
         $entry_dn = $this->entry_dn($username);
@@ -822,8 +1064,8 @@
             $bound = $this->bind($entry_dn, $password);
 
             if (!$bound) {
-                new PEAR_Error("Could not bind with " . $entry_dn);
-                return NULL;
+                $this->_error("Could not bind with " . $entry_dn);
+                return null;
             }
 
             return $entry_dn;
@@ -832,9 +1074,8 @@
         $base_dn = $this->config_get('root_dn');
 
         if (empty($base_dn)) {
-            new PEAR_Error("Could not get a valid base dn to search.");
             $this->_debug("Could not get a valid base dn to search.");
-            return NULL;
+            return null;
         }
 
         $localpart = $username;
@@ -852,9 +1093,9 @@
 
         $realm = $domain;
 
-        $filter = $this->config_get("login_filter", NULL);
+        $filter = $this->config_get("login_filter", null);
         if (empty($filter)) {
-            $filter = $this->config_get("filter", NULL);
+            $filter = $this->config_get("filter", null);
         }
         if (empty($filter)) {
             $filter = "(&(|(mail=%s)(mail=%U@%d)(alias=%s)(alias=%U@%d)(uid=%s))(objectclass=inetorgperson))";
@@ -862,7 +1103,7 @@
 
         $this->_debug("Net::LDAP3::login() original filter: " . $filter);
 
-        $replace_patterns = Array(
+        $replace_patterns = array(
                 '/%s/' => $username,
                 '/%d/' => $domain,
                 '/%U/' => $localpart,
@@ -876,15 +1117,16 @@
         $result = $this->search($base_dn, $filter, 'sub');
 
         if (!$result) {
-            new PEAR_Error("Could not search $base_dn with $filter");
+            $this->_debug("Could not search $base_dn with $filter");
+            return null;
         }
 
         if ($this->result->count() > 1) {
-            new PEAR_Error("Multiple entries found.");
-            return NULL;
+            $this->_debug("Multiple entries found.");
+            return null;
         } else if ($this->result->count() < 1) {
-            new PEAR_Error("No entries found.");
-            return NULL;
+            $this->_debug("No entries found.");
+            return null;
         }
 
         $entries = $this->result->entries();
@@ -894,27 +1136,27 @@
         $bound = $this->bind($entry_dn, $password);
 
         if (!$bound) {
-            new PEAR_Error("Could not bind with " . $entry_dn);
-            return NULL;
+            $this->_debug("Could not bind with " . $entry_dn);
+            return null;
         }
 
         return $entry_dn;
     }
 
-    public function list_entries($base_dn, $filter = '(objectclass=*)', $scope = 'sub', $sort = NULL)
+    public function list_entries($base_dn, $filter = '(objectclass=*)', $scope = 'sub', $sort = null)
     {
         $search = $this->search($base_dn, $filter, $scope, $sort);
 
         if (!$search) {
             $this->_debug("Net_LDAP3: Search did not succeed!");
-            return FALSE;
+            return false;
         }
 
         return $this->result;
 
     }
 
-    public function list_group_members($dn, $entry = NULL, $recurse = TRUE)
+    public function list_group_members($dn, $entry = null, $recurse = true)
     {
         $group_members = array();
 
@@ -981,8 +1223,8 @@
             unset($old_attrs['ou']);
             unset($new_attrs['ou']);
         } else {
-            $old_ou = NULL;
-            $new_ou = NULL;
+            $old_ou = null;
+            $new_ou = null;
         }
 
         // Compare each attribute value of the old attrs with the corresponding value
@@ -1010,12 +1252,12 @@
                     $_sort2 = $old_attr_value;
                     sort($_sort2);
                 } else {
-                    $_sort1 = TRUE;
-                    $_sort2 = FALSE;
+                    $_sort1 = true;
+                    $_sort2 = false;
                 }
 
                 if (!($new_attrs[$attr] === $old_attr_value) && !($_sort1 === $_sort2)) {
-                    $this->_debug("Attribute $attr changed from " . var_export($old_attr_value, TRUE) . " to " . var_export($new_attrs[$attr], TRUE));
+                    $this->_debug("Attribute $attr changed from " . var_export($old_attr_value, true) . " to " . var_export($new_attrs[$attr], true));
                     if ($attr === $rdn_attr) {
                         $this->_debug("This attribute is the RDN attribute. Let's see if it is multi-valued, and if the original still exists in the new value.");
                         if (is_array($old_attrs[$attr])) {
@@ -1121,8 +1363,8 @@
                     $_sort2 = $value;
                     sort($_sort2);
                 } else {
-                    $_sort1 = TRUE;
-                    $_sort2 = FALSE;
+                    $_sort1 = true;
+                    $_sort2 = false;
                 }
 
                 if (empty($value)) {
@@ -1185,15 +1427,15 @@
      *
      * @return boolean True on success, False on error
      */
-    public function sasl_bind($authc, $pass, $authz=NULL)
+    public function sasl_bind($authc, $pass, $authz=null)
     {
         if (!$this->conn) {
-            return FALSE;
+            return false;
         }
 
         if (!function_exists('ldap_sasl_bind')) {
-            new PEAR_Error("Unable to bind: ldap_sasl_bind() not exists", 100);
-            return FALSE;
+            $this->_error("Unable to bind: ldap_sasl_bind() not exists");
+            return false;
         }
 
         if (!empty($authz)) {
@@ -1209,22 +1451,33 @@
 
         $this->_debug("C: Bind [mech: $method, authc: $authc, authz: $authz] [pass: $pass]");
 
-        if (ldap_sasl_bind($this->conn, NULL, $pass, $method, NULL, $authc, $authz)) {
+        if (ldap_sasl_bind($this->conn, null, $pass, $method, null, $authc, $authz)) {
             $this->_debug("S: OK");
-            return TRUE;
+            return true;
         }
 
         $this->_debug("S: ".ldap_error($this->conn));
 
-        new PEAR_Error("Bind failed for authcid=$authc ".ldap_error($this->conn), ldap_errno($this->conn));
-        return FALSE;
+        $this->_error("Bind failed for authcid=$authc ".ldap_error($this->conn));
+        return false;
     }
 
-    public function search($base_dn, $filter = '(objectclass=*)', $scope = 'sub', $sort = NULL, $search = Array())
+    /**
+     * Execute LDAP search
+     *
+     * @param string  $base_dn  Base DN to use for searching
+     * @param string  $filter   Filter string to query
+     * @param string  $scope    Scope to use for searching: sub, base, one, list
+     * @param array   $sort     List of attributes to sort results (if VLV is active, this list has to match the VLV index)
+     * @param string  $search   Search string used in $filter. This is only used if VLV is active
+     *
+     * @return mixed  Net_LDAP3_Result instance containing the result set or False on failure
+     */
+    public function search($base_dn, $filter = '(objectclass=*)', $scope = 'sub', $sort = null, $search = array())
     {
         if (!$this->conn) {
-            new PEAR_Error("No active connection for " . __CLASS__ . "->" . __FUNCTION__);
-            return FALSE;
+            $this->_debug("No active connection for " . __CLASS__ . "->" . __FUNCTION__);
+            return false;
         }
 
         $this->_debug("C: Search base dn: [$base_dn] scope [$scope] with filter [$filter]");
@@ -1235,7 +1488,7 @@
             $sort = $this->find_vlv($base_dn, $filter, $scope, $sort);
         }
 
-        if (!($sort === FALSE)) {
+        if (!($sort === false)) {
             $vlv_search = $this->_vlv_search($sort, $search);
             $this->vlv_active = $this->_vlv_set_controls($base_dn, $filter, $scope, $sort, $this->list_page, $this->page_size, $vlv_search);
         }
@@ -1258,7 +1511,7 @@
             $this->_debug("C: (Without VLV) Setting a filter of " . $filter);
         }
 
-        $this->_debug("Executing search with return attributes: " . var_export($this->return_attributes, TRUE));
+        $this->_debug("Executing search with return attributes: " . var_export($this->return_attributes, true));
 
         $ldap_result = @$function(
                 $this->conn,
@@ -1271,8 +1524,8 @@
             );
 
         if (!$ldap_result) {
-            new PEAR_Error("$function failed for dn=$bind_dn: ".ldap_error($this->conn), ldap_errno($this->conn));
-            return FALSE;
+            $this->_debug("$function failed for dn=$base_dn: ".ldap_error($this->conn));
+            return false;
         }
 
         if ($this->vlv_active && function_exists('ldap_parse_virtuallist_control')) {
@@ -1281,10 +1534,9 @@
                 $this->result = new Net_LDAP3_Result($this->conn, $base_dn, $filter, $scope, $ldap_result);
                 $this->result->set('offset', $last_offset);
                 $this->result->set('count', $vlv_count);
-                $this->result->set('vlv', TRUE);
+                $this->result->set('vlv', true);
             } else {
                 $this->_debug("S: " . ($errmsg ? $errmsg : ldap_error($this->conn)));
-                new PEAR_Error("Something went terribly wrong");
             }
         } else {
             $this->result = new Net_LDAP3_Result($this->conn, $base_dn, $filter, $scope, $ldap_result);
@@ -1293,15 +1545,16 @@
         return $this->result;
     }
 
-    public function search_entries($base_dn, $filter = '(objectclass=*)', $scope = 'sub', $sort = NULL, $search = Array())
+    /**
+     * Similar to Net_LDAP3::search() but using a search array with multiple
+     * keys and values that to continue to use the VLV but with an original
+     * filter adding the search stuff to an additional filter.
+     *
+     * @see Net_LDAP3::search()
+     */
+    public function search_entries($base_dn, $filter = '(objectclass=*)', $scope = 'sub', $sort = null, $search = array())
     {
-        /*
-            Use a search array with multiple keys and values that to continue
-            to use the VLV but with an original filter adding the search stuff
-            to an additional filter.
-        */
-
-        $this->_debug("Net_LDAP3::search_entries with search " . var_export($search, TRUE));
+        $this->_debug("Net_LDAP3::search_entries with search " . var_export($search, true));
 
         if (is_array($search) && array_key_exists('params', $search)) {
             $this->_debug("C: Composing search filter");
@@ -1329,7 +1582,7 @@
 
         if (!$search) {
             $this->_debug("Net_LDAP3: Search did not succeed!");
-            return FALSE;
+            return false;
         }
 
         return $this->result;
@@ -1342,7 +1595,7 @@
     public function search_filter($search)
     {
         if (empty($search) || !is_array($search) || empty($search['params'])) {
-            return NULL;
+            return null;
         }
 
         $filter = '';
@@ -1397,7 +1650,7 @@
      */
     public static function escape_dn($dn)
     {
-        return strtr($str, Array(','=>'\2c', '='=>'\3d', '+'=>'\2b',
+        return strtr($str, array(','=>'\2c', '='=>'\3d', '+'=>'\2b',
             '<'=>'\3c', '>'=>'\3e', ';'=>'\3b', '\\'=>'\5c',
             '"'=>'\22', '#'=>'\23'));
     }
@@ -1410,7 +1663,7 @@
      */
     public static function escape_value($val)
     {
-        return strtr($str, Array('*'=>'\2a', '('=>'\28', ')'=>'\29',
+        return strtr($str, array('*'=>'\2a', '('=>'\28', ')'=>'\29',
             '\\'=>'\5c', '/'=>'\2f'));
     }
 
@@ -1422,7 +1675,7 @@
      */
     public static function normalize_entry($entry)
     {
-        $rec = Array();
+        $rec = array();
         for ($i=0; $i < $entry['count']; $i++) {
             $attr = $entry[$i];
             for ($j=0; $j < $entry[$attr]['count']; $j++) {
@@ -1433,23 +1686,26 @@
         return $rec;
     }
 
+    /**
+     * Normalize a ldap result by converting entry attribute arrays into single values
+     */
     public static function normalize_result($__result)
     {
         if (!is_array($__result)) {
-            return Array();
+            return array();
         }
 
-        $result  = Array();
+        $result  = array();
 
         for ($x = 0; $x < $__result["count"]; $x++) {
             $dn = $__result[$x]['dn'];
-            $result[$dn] = Array();
+            $result[$dn] = array();
             for ($y = 0; $y < $__result[$x]["count"]; $y++) {
                 $attr = $__result[$x][$y];
                 if ($__result[$x][$attr]["count"] == 1) {
                     switch ($attr) {
                         case "objectclass":
-                            $result[$dn][$attr] = Array(strtolower($__result[$x][$attr][0]));
+                            $result[$dn][$attr] = array(strtolower($__result[$x][$attr][0]));
                             break;
                         default:
                             $result[$dn][$attr] = $__result[$x][$attr][0];
@@ -1457,7 +1713,7 @@
                     }
                 }
                 else {
-                    $result[$dn][$attr] = Array();
+                    $result[$dn][$attr] = array();
                     for ($z = 0; $z < $__result[$x][$attr]["count"]; $z++) {
                         switch ($attr) {
                             case "objectclass":
@@ -1488,7 +1744,7 @@
                 return 'base';
                 break;
             default:
-                new PEAR_Error("Scope $scope is not a valid scope integer");
+                $this->_debug("Scope $scope is not a valid scope integer");
                 break;
         }
     }
@@ -1500,7 +1756,7 @@
      * @param string $ns_function   Function to be used for numSubOrdinates queries
      * @return string  PHP function to be used to query directory
      */
-    public static function scope_to_function($scope, &$ns_function = NULL)
+    public static function scope_to_function($scope, &$ns_function = null)
     {
         switch ($scope) {
             case 'sub':
@@ -1535,14 +1791,14 @@
      */
     private function config_set_debug($value)
     {
-        if ($value === FALSE) {
-            $this->config['debug'] = FALSE;
+        if ($value === false) {
+            $this->config['debug'] = false;
         } else {
-            $this->config['debug'] = TRUE;
+            $this->config['debug'] = true;
         }
 
         if ((int)($value) > 0) {
-            ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, (int)($value));
+            ldap_set_option(null, LDAP_OPT_DEBUG_LEVEL, (int)($value));
         }
     }
 
@@ -1554,32 +1810,32 @@
         $this->_log_hook = $callback;
     }
 
-    private function config_set_return_attributes($attribute_names = Array('entrydn'))
+    private function config_set_return_attributes($attribute_names = array('entrydn'))
     {
-        $this->_debug("setting return attributes: " . var_export($attribute_names, TRUE));
-        $this->return_attributes = (Array)($attribute_names);
+        $this->_debug("setting return attributes: " . var_export($attribute_names, true));
+        $this->return_attributes = (array)($attribute_names);
     }
 
     /**
      * Find a matching VLV
      */
-    private function find_vlv($base_dn, $filter, $scope, $sort_attrs = NULL)
+    private function find_vlv($base_dn, $filter, $scope, $sort_attrs = null)
     {
-        if (array_key_exists('vlv', $this->config) && $this->config['vlv'] === FALSE) {
-            return FALSE;
+        if (array_key_exists('vlv', $this->config) && $this->config['vlv'] === false) {
+            return false;
         }
 
         if ($scope == 'base') {
-            return FALSE;
+            return false;
         }
 
         if (empty($this->_vlv_indexes_and_searches)) {
             $this->_debug("No VLV information available yet, refreshing");
-            $this->find_vlv_indexes_and_searches(TRUE);
+            $this->find_vlv_indexes_and_searches(true);
         }
 
         if (empty($this->_vlv_indexes_and_searches) && !is_array($this->_vlv_indexes_and_searches)) {
-            return FALSE;
+            return false;
         }
 
         $this->_debug("Existing vlv index and search information", $this->_vlv_indexes_and_searches);
@@ -1596,41 +1852,41 @@
                         if (in_array($sort_attrs, $this->_vlv_indexes_and_searches[$base_dn]['sort'])) {
                             return $sort_attrs;
                         } else {
-                            return FALSE;
+                            return false;
                         }
                     } else {
                         return $this->_vlv_indexes_and_searches[$base_dn]['sort'][0];
                     }
 
                 } else {
-                    $this->_debug("Scope does not match. VLV: " . var_export($this->_vlv_indexes_and_searches[$base_dn]['scope'], TRUE) . " while looking for " . var_export($scope, TRUE));
-                    return FALSE;
+                    $this->_debug("Scope does not match. VLV: " . var_export($this->_vlv_indexes_and_searches[$base_dn]['scope'], true) . " while looking for " . var_export($scope, true));
+                    return false;
                 }
             } else {
                 $this->_debug("Filter does not match");
-                return FALSE;
+                return false;
             }
         } else {
             $this->_debug("No VLV for base dn", $base_dn);
-            return FALSE;
+            return false;
         }
     }
 
     /**
-        Return VLV indexes and searches including necessary configuration
-        details.
-    */
-    private function find_vlv_indexes_and_searches($refresh = FALSE)
+     * Return VLV indexes and searches including necessary configuration
+     * details.
+     */
+    private function find_vlv_indexes_and_searches($refresh = false)
     {
         if (!empty($this->config['vlv'])) {
-            if ($this->config['vlv'] === FALSE) {
-                return Array();
+            if ($this->config['vlv'] === false) {
+                return array();
             } else {
                 return $this->config['vlv'];
             }
         }
 
-        if (!$this->_vlv_indexes_and_searches === NULL) {
+        if (!$this->_vlv_indexes_and_searches === null) {
             if (!$refresh) {
                 return $this->_vlv_indexes_and_searches;
             }
@@ -1638,18 +1894,18 @@
 
         $return_attributes = $this->return_attributes;
 
-        $config_root_dn = $this->config_get('config_root_dn', NULL);
+        $config_root_dn = $this->config_get('config_root_dn', null);
         if (empty($config_root_dn)) {
-            return Array();
+            return array();
         }
 
-        $this->return_attributes = Array('*');
+        $this->return_attributes = array('*');
 
         $search_result = ldap_search(
                 $this->conn,
                 $config_root_dn,
                 '(objectclass=vlvsearch)',
-                Array('*'),
+                array('*'),
                 0,
                 0,
                 0
@@ -1662,7 +1918,7 @@
             $this->return_attributes = $return_attributes;
             return;
         } else {
-            $vlv_searches = $vlv_searches->entries(TRUE);
+            $vlv_searches = $vlv_searches->entries(true);
         }
 
         foreach ($vlv_searches as $vlv_search_dn => $vlv_search_attrs) {
@@ -1677,7 +1933,7 @@
                     $this->conn,
                     $vlv_search_dn,
                     '(objectclass=vlvindex)',
-                    Array('*'),
+                    array('*'),
                     0,
                     0,
                     0
@@ -1685,18 +1941,18 @@
 
 
             $vlv_indexes = new Net_LDAP3_Result($this->conn, $vlv_search_dn, '(objectclass=vlvindex)', 'sub', $index_result);
-            $vlv_indexes = $vlv_indexes->entries(TRUE);
+            $vlv_indexes = $vlv_indexes->entries(true);
 
-            $this->_debug("find_vlv() vlvindex result: " . var_export($vlv_indexes, TRUE));
+            $this->_debug("find_vlv() vlvindex result: " . var_export($vlv_indexes, true));
 
             // Reset this one for each VLV search.
-            $_vlv_sort = Array();
+            $_vlv_sort = array();
 
             foreach ($vlv_indexes as $vlv_index_dn => $vlv_index_attrs) {
                 $_vlv_sort[] = explode(' ', $vlv_index_attrs['vlvsort']);
             }
 
-            $this->_vlv_indexes_and_searches[$_vlv_base_dn] = Array(
+            $this->_vlv_indexes_and_searches[$_vlv_base_dn] = array(
                     'scope' => self::scopeint2str($_vlv_scope),
                     'filter' => $_vlv_filter,
                     'sort' => $_vlv_sort,
@@ -1706,14 +1962,18 @@
 
         $this->return_attributes = $return_attributes;
 
-        $this->_debug("Refreshed VLV: " . var_export($this->_vlv_indexes_and_searches, TRUE));
+        $this->_debug("Refreshed VLV: " . var_export($this->_vlv_indexes_and_searches, true));
     }
 
     private function init_schema()
     {
-        require_once("Net/LDAP2.php");
+        // use PEAR include if autoloading failed
+        if (!class_exists('Net_LDAP2')) {
+            require_once('Net/LDAP2.php');
+        }
 
         $port = $this->config_get('port', 389);
+        $tls  = $this->config_get('use_tls', false);
 
         foreach ($this->config_get('hosts') as $host) {
             $this->_debug("C: Connect [$host:$port]");
@@ -1721,7 +1981,7 @@
             $_ldap_cfg = array(
                 'host'   => $host,
                 'port'   => $port,
-                'tls'    => FALSE,
+                'tls'    => $tls,
                 'version' => 3,
                 'binddn' => $this->config_get('service_bind_dn'),
                 'bindpw' => $this->config_get('service_bind_pw')
@@ -1740,7 +2000,7 @@
             }
 
             $this->_debug("S: NOT OK");
-            new PEAR_Error($_ldap->getMessage());
+            $this->_debug($_ldap->getMessage());
         }
 
         if (is_a($_ldap, 'Net_LDAP2_Error')) {
@@ -1762,7 +2022,7 @@
         return $_schema;
     }
 
-    private function list_group_member($dn, $members, $recurse = TRUE)
+    private function list_group_member($dn, $members, $recurse = true)
     {
         $this->_debug("Called _list_group_member(" . $dn . ")");
 
@@ -1797,7 +2057,7 @@
         return array_filter($group_members);
     }
 
-    private function list_group_uniquemember($dn, $uniquemembers, $recurse = TRUE)
+    private function list_group_uniquemember($dn, $uniquemembers, $recurse = true)
     {
         $this->_debug("Called _list_group_uniquemember(" . $dn . ")", $entry);
 
@@ -1836,7 +2096,7 @@
         return array_filter($group_members);
     }
 
-    private function list_group_memberurl($dn, $memberurls, $recurse = TRUE)
+    private function list_group_memberurl($dn, $memberurls, $recurse = true)
     {
         $this->_debug("Called _list_group_memberurl(" . $dn . ")");
 
@@ -1883,8 +2143,8 @@
 
     private function modify_entry_attributes($subject_dn, $attributes)
     {
-        // Opportunities to set FALSE include failed ldap commands.
-        $result = TRUE;
+        // Opportunities to set false include failed ldap commands.
+        $result = true;
 
         if (is_array($attributes['rename']) && !empty($attributes['rename'])) {
             $olddn = $attributes['rename']['dn'];
@@ -1892,12 +2152,12 @@
             if (!empty($attributes['rename']['new_parent'])) {
                 $new_parent = $attributes['rename']['new_parent'];
             } else {
-                $new_parent = NULL;
+                $new_parent = null;
             }
 
             $this->_debug("LDAP: C: Rename $olddn to $newrdn,$new_parent");
 
-            $result = ldap_rename($this->conn, $olddn, $newrdn, $new_parent, TRUE);
+            $result = ldap_rename($this->conn, $olddn, $newrdn, $new_parent, true);
 
             if ($result) {
                 $this->_debug("LDAP: S: OK");
@@ -1915,7 +2175,7 @@
             else {
                 $this->_debug("LDAP: S: " . ldap_error($this->conn));
                 $this->_warning("LDAP: Failed to rename $olddn to $newrdn,$new_parent");
-                return FALSE;
+                return false;
             }
         }
 
@@ -1930,7 +2190,7 @@
             else {
                 $this->_debug("LDAP: S: " . ldap_error($this->conn));
                 $this->_warning("LDAP: Failed to replace attributes on $subject_dn: " . json_encode($attributes['replace']));
-                return FALSE;
+                return false;
             }
         }
 
@@ -1945,7 +2205,7 @@
             else {
                 $this->_debug("LDAP: S: " . ldap_error($this->conn));
                 $this->_warning("LDAP: Failed to delete attributes on $subject_dn: " . json_encode($attributes['del']));
-                return FALSE;
+                return false;
             }
         }
 
@@ -1961,11 +2221,11 @@
             else {
                 $this->_debug("LDAP: S: " . ldap_error($this->conn));
                 $this->_warning("LDAP: Failed to add attributes on $subject_dn: " . json_encode($attributes['add']));
-                return FALSE;
+                return false;
             }
         }
 
-        return TRUE;
+        return true;
     }
 
     private function parse_attribute_level_rights($attribute_value)
@@ -2015,12 +2275,19 @@
         }
 
         $this->_info("Obtaining supported controls");
-        $this->return_attributes = Array("supportedcontrol");
-        $result = $this->search("", "(objectclass=*)", 'base');
-        $result = $result->entries(TRUE);
-        $this->_info("Obtained " . count($result['']['supportedcontrol']) . " supported controls");
-        $this->supported_controls = $result['']['supportedcontrol'];
-        return $result['']['supportedcontrol'];
+        $this->return_attributes = array("supportedcontrol");
+
+        if ($result = $this->search("", "(objectclass=*)", 'base')) {
+            $result  = $result->entries(true);
+            $control = $result['']['supportedcontrol'];
+        }
+        else {
+            $control = array();
+        }
+
+        $this->_info("Obtained " . count($control) . " supported controls");
+        $this->supported_controls = $control;
+        return $control;
     }
 
     private function _alert()
@@ -2096,15 +2363,15 @@
     {
         if (!empty($this->additional_filter)) {
             $this->_debug("Not setting a VLV search filter because we already have a filter");
-            return NULL;
+            return null;
         }
 
         $search_suffix = $this->_fuzzy_search_suffix();
 
         foreach ($search as $attr => $value) {
             if (!in_array(strtolower($attr), $sort)) {
-                $this->_debug("Cannot use VLV search using attribute not indexed: $attr (not in " . var_export($sort, TRUE) . ")");
-                return NULL;
+                $this->_debug("Cannot use VLV search using attribute not indexed: $attr (not in " . var_export($sort, true) . ")");
+                return null;
             } else {
                 return $value . $search_suffix;
             }
@@ -2114,38 +2381,38 @@
     /**
      * Set server controls for Virtual List View (paginated listing)
      */
-    private function _vlv_set_controls($base_dn, $filter, $scope, $sort, $list_page, $page_size, $search = NULL)
+    private function _vlv_set_controls($base_dn, $filter, $scope, $sort, $list_page, $page_size, $search = null)
     {
-        $sort_ctrl = Array(
-                'oid' => "1.2.840.113556.1.4.473",
-                'value' => self::_sort_ber_encode($sort)
-            );
+        $sort_ctrl = array(
+            'oid' => "1.2.840.113556.1.4.473",
+            'value' => self::_sort_ber_encode($sort)
+        );
 
         if (!empty($search)) {
-            $this->_debug("_vlv_set_controls to include search: " . var_export($search, TRUE));
+            $this->_debug("_vlv_set_controls to include search: " . var_export($search, true));
         }
 
-        $vlv_ctrl  = Array(
-                'oid' => "2.16.840.1.113730.3.4.9",
-                'value' => self::_vlv_ber_encode(
-                        ($offset = ($list_page-1) * $page_size + 1),
-                        $page_size,
-                        $search
-                    ),
-                'iscritical' => TRUE
-            );
+        $vlv_ctrl  = array(
+            'oid' => "2.16.840.1.113730.3.4.9",
+            'value' => self::_vlv_ber_encode(
+                    ($offset = ($list_page-1) * $page_size + 1),
+                    $page_size,
+                    $search
+            ),
+            'iscritical' => true
+        );
 
         $this->_debug("C: set controls sort=" . join(' ', unpack('H'.(strlen($sort_ctrl['value'])*2), $sort_ctrl['value'])) . " ($sort[0]);"
             . " vlv=" . join(' ', (unpack('H'.(strlen($vlv_ctrl['value'])*2), $vlv_ctrl['value']))) . " ($offset/$page_size)");
 
-        if (!ldap_set_option($this->conn, LDAP_OPT_SERVER_CONTROLS, Array($sort_ctrl, $vlv_ctrl))) {
+        if (!ldap_set_option($this->conn, LDAP_OPT_SERVER_CONTROLS, array($sort_ctrl, $vlv_ctrl))) {
             $this->_debug("S: ".ldap_error($this->conn));
             $this->set_error(self::ERROR_SEARCH, 'vlvnotsupported');
 
-            return FALSE;
+            return false;
         }
 
-        return TRUE;
+        return true;
     }
 
     /**
@@ -2153,14 +2420,14 @@
      */
     private function __log($level, $args)
     {
-        $msg = Array();
+        $msg = array();
 
         foreach ($args as $arg) {
             $msg[] = !is_string($arg) ? var_export($arg, true) : $arg;
         }
 
         if (!empty($this->_log_hook)) {
-            call_user_func_array($this->_log_hook, Array($level, $msg));
+            call_user_func_array($this->_log_hook, array($level, $msg));
             return;
         }
 
@@ -2180,22 +2447,22 @@
     private function __result_current($base_dn, $filter, $scope)
     {
         if (empty($this->result)) {
-            return FALSE;
+            return false;
         }
 
         if ($this->result->get('base_dn') !== $base_dn) {
-            return FALSE;
+            return false;
         }
 
         if ($this->result->get('filter') !== $filter) {
-            return FALSE;
+            return false;
         }
 
         if ($this->result->get('scope') !== $scope) {
-            return FALSE;
+            return false;
         }
 
-        return TRUE;
+        return true;
     }
 
     /**
@@ -2204,7 +2471,7 @@
     private static function _attr_name($namev)
     {
         // list of known attribute aliases
-        static $aliases = Array(
+        static $aliases = array(
             'gn' => 'givenname',
             'rfc822mailbox' => 'email',
             'userid' => 'uid',
@@ -2256,7 +2523,7 @@
      *
      * @return string Quoted string
      */
-    private static function _quote_string($str, $is_dn = FALSE)
+    private static function _quote_string($str, $is_dn = false)
     {
         // take firt entry if array given
         if (is_array($str)) {
@@ -2387,4 +2654,3 @@
     }
 
 }
-?>

kolab-webadmin-3.0.5.tar.gz/lib/functions.php -> kolab-webadmin-3.1.tar.gz/lib/functions.php Changed

kolab-webadmin-3.0.5.tar.gz/lib/kolab_api_controller.php -> kolab-webadmin-3.1.tar.gz/lib/kolab_api_controller.php Changed

@@ -62,18 +62,21 @@
         $this->add_service('domain_types',      'kolab_api_service_domain_types');
         $this->add_service('domains',           'kolab_api_service_domains');
         $this->add_service('form_value',        'kolab_api_service_form_value');
-        $this->add_service('group_types',       'kolab_api_service_group_types');
         $this->add_service('group',             'kolab_api_service_group');
+        $this->add_service('group_types',       'kolab_api_service_group_types');
         $this->add_service('groups',            'kolab_api_service_groups');
-        $this->add_service('resource_types',    'kolab_api_service_resource_types');
         $this->add_service('resource',          'kolab_api_service_resource');
+        $this->add_service('resource_types',    'kolab_api_service_resource_types');
         $this->add_service('resources',         'kolab_api_service_resources');
+        $this->add_service('sharedfolder',      'kolab_api_service_sharedfolder');
+        $this->add_service('sharedfolder_types','kolab_api_service_sharedfolder_types');
+        $this->add_service('sharedfolders',     'kolab_api_service_sharedfolders');
         $this->add_service('roles',             'kolab_api_service_roles');
         $this->add_service('role',              'kolab_api_service_role');
         $this->add_service('role_types',        'kolab_api_service_role_types');
         $this->add_service('type',              'kolab_api_service_type');
-        $this->add_service('user_types',        'kolab_api_service_user_types');
         $this->add_service('user',              'kolab_api_service_user');
+        $this->add_service('user_types',        'kolab_api_service_user_types');
         $this->add_service('users',             'kolab_api_service_users');
     }
 
@@ -256,7 +259,7 @@
         session_id($sess_id);
         session_start();
 
-        if (empty($_SESSION['user']) || !$_SESSION['user']->authenticated()) {
+        if (empty($_SESSION['user']) || !is_a($_SESSION['user'], 'User') || !$_SESSION['user']->authenticated()) {
             return false;
         }

kolab-webadmin-3.0.5.tar.gz/lib/kolab_api_service.php -> kolab-webadmin-3.1.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', 'user');
-    protected $supported_types    = array('domain', 'group', 'resource', 'role', 'user');
+    protected $supported_types_db = array('group', 'resource', 'role', 'sharedfolder', 'user');
+    protected $supported_types    = array('domain', 'group', 'resource', 'role', 'sharedfolder', 'user');
 
     /**
      * Class constructor.
@@ -83,14 +83,25 @@
                 $result = array(
                     'auto_form_fields' => array(),
                     'form_fields' => array(
+                        'aci' => array(
+                            'type' => 'list',
+                            'optional' => true,
+                        ),
                         'associateddomain' => array(
                             'type' => 'list'
                         ),
+                        'inetdomainbasedn' => array(
+                            'optional' => true,
+                        ),
+                        'inetdomainstatus' => array(
+                            'optional' => true,
+                        ),
                     ),
                     'fields' => array(
                         'objectclass' => array(
                             'top',
                             'domainrelatedobject',
+                            'inetdomain',
                         ),
                     ),
                 );
@@ -134,8 +145,7 @@
         $object_class = array_map('strtolower', $object_class);
         $object_keys  = array_keys($attributes);
         $keys_count   = count($object_keys);
-        $type_score   = -1;
-        $keys_score   = 0;
+        $type_score   = null;
         $type_id      = null;
 
         Log::trace("kolab_api_service::object_type_id objectClasses: " . implode(", ", $object_class));
@@ -149,6 +159,9 @@
 
             Log::trace("Reference objectclasses for " . $elem['key'] . ": " . implode(", ", $ref_class));
 
+            $elem_keys_score   = 0;
+            $elem_values_score = 0;
+
             // Eliminate the duplicates between the $data_ocs and $ref_ocs
             $_object_class = array_diff($object_class, $ref_class);
             $_ref_class    = array_diff($ref_class, $object_class);
@@ -169,6 +182,19 @@
                 $elem_keys_score = $keys_count - count(array_diff($object_keys, $ref_keys));
             }
 
+            // Static attributes score
+            $elem_values_score = 0;
+            foreach ((array) $elem['attributes']['fields'] as $attr => $value) {
+                $v = $attributes[$attr];
+                if (is_array($value)) {
+                    $value = implode('', $value);
+                }
+                if (is_array($v)) {
+                    $v = implode('', $v);
+                }
+                $elem_values_score += intval($v == $value);
+            }
+
             // Position in tree score
             if (!empty($elem['attributes']['fields']['ou'])) {
                 if (!empty($attributes['ou'])) {
@@ -180,28 +206,27 @@
                 }
             }
 
-            Log::trace("\$object_class not in \$ref_class (" . $elem['key'] . "): " . implode(", ", $_object_class));
-            Log::trace("\$ref_class not in \$object_class (" . $elem['key'] . "): " . implode(", ", $_ref_class));
-            Log::trace("Score for $object_name type " . $elem['name'] . ": " . $elem_score . "(" . $commonalities . "/" . $differences . ") " . $elem_keys_score);
-
-            // Compare last and current element score
-            if ($elem_score > $type_score || ($elem_score == $type_score && $elem_keys_score > $keys_score)) {
-                $type_id    = $idx;
-                $type_score = $elem_score;
-                $keys_score = $elem_keys_score;
-            }
-
             // On the likely chance that the object is a resource (types of which likely have the same
             // set of objectclass attribute values), consider the other attributes. (#853)
             if ($object_name == 'resource') {
                 //console("From database", $elem);
                 //console("Element key is " . $elem['key'] . " and \$attributes['mail'] is " . $attributes['mail']);
-
-                if (strstr($attributes['mail'], "-" . $elem['key'] . "-")) {
-                    $type_id = $idx;
-                    $type_score = 10;
+                if (strpos($attributes['mail'], 'resource-' . $elem['key'] . '-') === 0) {
+                    $elem_score += 10;
                 }
             }
+
+            $elem_score .= ':' . $elem_keys_score . ':' . $elem_values_score;
+
+//            Log::trace("\$object_class not in \$ref_class (" . $elem['key'] . "): " . implode(", ", $_object_class));
+//            Log::trace("\$ref_class not in \$object_class (" . $elem['key'] . "): " . implode(", ", $_ref_class));
+            Log::trace("Score for $object_name type " . $elem['name'] . ": " . $elem_score . " (" . $commonalities . "/" . $differences . ")");
+
+            // Compare last and current element (object type) score
+            if ($this->score_compare($elem_score, $type_score)) {
+                $type_id    = $idx;
+                $type_score = $elem_score;
+            }
         }
 
         return $type_id;
@@ -268,7 +293,7 @@
      */
     protected function parse_input_attributes($object_name, $attribs)
     {
-        $type_attrs   = $this->object_type_attributes($object_name, $attribs['type_id']);
+        $type_attrs = $this->object_type_attributes($object_name, $attribs['type_id']);
 
         Log::trace("kolab_api_service::parse_input_attributes for $object_name: " . var_export($type_attrs, TRUE));
         Log::trace("called with \$attribs: " . var_export($attribs, TRUE));
@@ -354,6 +379,11 @@
             $attributes = array_intersect($this->list_attribs, $post['attributes']);
             // need to fix array keys
             $attributes = array_values($attributes);
+
+            // unique attribute is always allowed
+            if (($key = array_search('id', $post['attributes'])) !== false) {
+                $attributes[] = $this->unique_attribute();
+            }
         }
 
         if (empty($attributes)) {
@@ -363,6 +393,25 @@
         return $attributes;
     }
 
+    protected function parse_list_result($result)
+    {
+        if (!empty($result) && !empty($result['count'])) {
+            $unique_attr = $this->unique_attribute();
+
+            // replace back unique attribute name with 'id'
+            foreach ($result['list'] as $idx => $record) {
+                // if not set, we assume unique attribute wasn't requested
+                if (!isset($record[$unique_attr])) {
+                    break;
+                }
+                $result['list'][$idx]['id'] = $record[$unique_attr];
+                unset($result['list'][$idx][$unique_attr]);
+            }
+        }
+
+        return $result;
+    }
+
     protected function parse_list_params($post)
     {
         $params = Array();
@@ -486,6 +535,35 @@
     }
 
     /**
+     * Compare two score values
+     *
+     * @param string $s1 Score
+     * @param string $s2 Score
+     *
+     * @return bool True when $s1 is greater than $s2
+     */
+    protected function score_compare($s1, $s2)
+    {
+        if (empty($s2) && !empty($s1)) {
+            return true;
+        }
+
+        $s1 = explode(':', $s1);
+        $s2 = explode(':', $s2);
+
+        foreach ($s1 as $key => $val) {
+            if ($val > $s2[$key]) {
+                return true;
+            }
+            if ($val < $s2[$key]) {
+                return false;
+            }
+        }
+
+        return false;
+    }
+
+    /**
      * Returns name of unique attribute
      *
      * @return string Unique attribute name

kolab-webadmin-3.0.5.tar.gz/lib/kolab_client_task.php -> kolab-webadmin-3.1.tar.gz/lib/kolab_client_task.php Changed

@@ -42,11 +42,11 @@
     protected $config;
 
     protected $ajax_only = false;
-    protected $page_title = 'Kolab Admin Panel';
+    protected $page_title = 'Kolab Web Admin Panel';
     protected $menu = array();
     protected $cache = array();
     protected $devel_mode = false;
-    protected $object_types = array('user', 'group', 'role', 'resource', 'domain');
+    protected $object_types = array('user', 'group', 'role', 'resource', 'sharedfolder', 'domain');
 
     protected static $translation = array();
 
@@ -76,6 +76,10 @@
      */
     protected function locale_init()
     {
+        if (!empty(self::$translation)) {
+            return;
+        }
+
         $language = $this->get_language();
         $LANG     = array();
 
@@ -114,6 +118,9 @@
 
         $skin = $this->config_get('skin', 'default');
         $this->output = new kolab_client_output($skin);
+
+        // Assign self to template variable
+        $this->output->assign('engine', $this);
     }
 
     /**
@@ -205,7 +212,7 @@
                         $user['fullname'] = ucwords($m[1]);
                     }
                     else {
-                        $res = $this->api->get('user.info', array('user' => $user['id']));
+                        $res = $this->api->get('user.info', array('id' => $user['id']));
                         $res = $res->get();
 
                         if (is_array($res) && !empty($res)) {
@@ -241,6 +248,7 @@
                         $label = 'internalerror';
                         $this->raise_error(500, 'Login failed. ' . $str);
                     }
+
                     $this->output->command('display_message', $label, 'error');
                 }
             }
@@ -268,9 +276,6 @@
         // Initialize locales
         $this->locale_init();
 
-        // Assign self to template variable
-        $this->output->assign('engine', $this);
-
         // Session check
         if (empty($_SESSION['user']) || empty($_SESSION['user']['token'])) {
             $this->action_logout();
@@ -318,6 +323,9 @@
      */
     private function action_logout($sess_expired = false, $stop_sess = true)
     {
+        // Initialize locales
+        $this->locale_init();
+
         if (!empty($_SESSION['user']) && !empty($_SESSION['user']['token']) && $stop_sess) {
             $this->api->logout();
         }
@@ -349,7 +357,7 @@
             $this->output->command('display_message', $error, 'error', 60000);
         }
 
-        $this->output->send('login');
+        $this->send('login');
         exit;
     }
 
@@ -381,16 +389,18 @@
 
         $this->output->assign('error_code', $code);
         $this->output->assign('error_message', $msg);
-        $this->output->send('error');
+        $this->send('error');
         exit;
     }
 
     /**
      * Output sending.
      */
-    public function send()
+    public function send($template = null)
     {
-        $template = $this->get_task();
+        if (!$template) {
+            $template = $this->get_task();
+        }
 
         if ($this->page_title) {
             $this->output->assign('pagetitle', $this->page_title);
@@ -638,7 +648,7 @@
             }
         }
 
-        $result   = $this->api_get('user.info', array('user' => $dn));
+        $result   = $this->api_get('user.info', array('id' => $dn));
         $username = $result->get('displayname');
 
         if (empty($username)) {
@@ -661,13 +671,14 @@
     /**
      * Returns list of system capabilities.
      *
-     * @param bool $all If enabled capabilities for all domains will be returned
+     * @param bool $all     If enabled capabilities for all domains will be returned
+     * @param bool $refresh Disable session cache
      *
      * @return array List of system capabilities
      */
-    protected function capabilities($all = false)
+    protected function capabilities($all = false, $refresh = false)
     {
-        if (isset($_SESSION['capabilities']) && !$this->devel_mode) {
+        if (!$refresh && isset($_SESSION['capabilities']) && !$this->devel_mode) {
             $list = $_SESSION['capabilities'];
         }
         else {
@@ -701,11 +712,13 @@
     /**
      * Returns domains list (based on capabilities response)
      *
+     * @param bool $refresh Refresh session cache
+     *
      * @return array List of domains
      */
-    protected function get_domains()
+    protected function get_domains($refresh = false)
     {
-        $caps = $this->capabilities(true);
+        $caps = $this->capabilities(true, $refresh);
 
         return is_array($caps) ? array_keys($caps) : array();
     }
@@ -730,7 +743,7 @@
         }
 
         // Get the rights on the entry and attribute level
-        $result = $this->api_get($type . '.effective_rights', array($type => $id));
+        $result = $this->api_get($type . '.effective_rights', array('id' => $id));
 
         $result = array(
             'attribute' => $result->get('attributeLevelRights'),
@@ -849,6 +862,10 @@
             }
             break;
 
+        case 'text-quota':
+            $result['type'] = kolab_form::INPUT_TEXTQUOTA;
+            break;
+
         default:
             $result['type'] = kolab_form::INPUT_TEXT;
             if (isset($field['maxlength'])) {
@@ -906,7 +923,7 @@
             // Exceptions
             if ($field['name'] == 'ou') {
                 foreach ($options as $idx => $dn) {
-                    $options[$idx] = ldap_dn2ufn($dn);
+                    $options[$idx] = kolab_utils::dn2ufn($dn);
                 }
             }
         }
@@ -1020,8 +1037,8 @@
 
         // Get the rights on the entry and attribute level
         $data['effective_rights'] = $this->effective_rights($name, $data['id']);
-        $attribute_rights         = $data['effective_rights']['attribute'];
-        $entry_rights             = $data['effective_rights']['entry'];
+        $attribute_rights         = (array) $data['effective_rights']['attribute'];
+        $entry_rights             = (array) $data['effective_rights']['entry'];
 
         // See if "administrators" (those who can delete and add back on the entry
         // level) may override the automatically generated contents of auto_form_fields.

kolab-webadmin-3.0.5.tar.gz/lib/kolab_form.php -> kolab-webadmin-3.1.tar.gz/lib/kolab_form.php Changed

kolab-webadmin-3.0.5.tar.gz/lib/kolab_html.php -> kolab-webadmin-3.1.tar.gz/lib/kolab_html.php Changed

@@ -154,6 +154,33 @@
     }
 
     /**
+     * Input element for mail quota. user can select the unit (GB, MB)
+     *
+     * @param array  $attribs  Element attributes
+     *
+     * @return string HTML output of the input
+     */
+    public static function inputquota($attribs = array())
+    {
+        $elem_attribs = array_merge(self::$input_attribs, self::$input_event_attribs,
+            self::$common_attribs, self::$event_attribs);
+        $selected_option_mb = $selected_option_gb = "";
+        $selected_option_kb = "selected";
+        if ($attribs['value'] >= 1024 && $attribs['value'] % 1024 == 0) {
+            $attribs['value'] /= 1024;
+            $selected_option_kb = "";
+            $selected_option_mb = "selected";
+        }
+        if ($attribs['value'] >= 1024 && $attribs['value'] % 1024 == 0) {
+            $attribs['value'] /= 1024;
+            $selected_option_mb = "";
+            $selected_option_gb = "selected";
+        }
+
+        return sprintf('<input%s /><select name="%s-unit"><option value="kb" %s>KB</option><option value="mb" %s>MB</option><option value="gb" %s>GB</option></select>', self::attrib_string($attribs, $elem_attribs), $attribs['name'], $selected_option_kb, $selected_option_mb, $selected_option_gb);
+    }
+
+    /**
      * Textarea element.
      *
      * @param array $attribs  Element attributes

kolab-webadmin-3.0.5.tar.gz/lib/kolab_recipient_policy.php -> kolab-webadmin-3.1.tar.gz/lib/kolab_recipient_policy.php Changed

@@ -42,21 +42,27 @@
     {
         //console("IN", $groupdata);
         foreach ($groupdata as $key => $value) {
-            if (isset($groupdata['preferredlanguage'])) {
-                setlocale(LC_ALL, $groupdata['preferredlanguage']);
+            if (!empty($groupdata['preferredlanguage'])) {
+                $locale = $groupdata['preferredlanguage'];
             } else {
                 $conf = Conf::get_instance();
                 $locale = $conf->get('default_locale');
-                if (!empty($locale)) {
-                    setlocale(LC_ALL, $locale);
-                }
+            }
+
+            if (!empty($locale)) {
+                setlocale(LC_ALL, $locale.'utf8', $locale.'UTF-8', $locale);
             }
 
             if (!is_array($groupdata[$key])) {
                 $orig_value = $groupdata[$key];
 
-                $groupdata[$key] = iconv('UTF-8', 'ASCII//TRANSLIT', $groupdata[$key]);
-                $groupdata[$key] = preg_replace('/[^a-z0-9-_]/i', '', $groupdata[$key]);
+                $result = iconv('UTF-8', 'ASCII//TRANSLIT', $groupdata[$key]);
+
+                if (strpos($result, '?')) {
+                    $result = self::transliterate($groupdata[$key], $locale);
+                }
+
+                $groupdata[$key] = preg_replace('/[^a-z0-9-_]/i', '', $result);
             }
         }
 
@@ -70,28 +76,40 @@
                 'sn' => 'surname',
             );
 
+        $zero_canon = array('ou', 'cn', 'displayname', 'mailhost');
+
         foreach ($userdata as $key => $value) {
+            if (in_array($key, $zero_canon)) {
+                continue;
+            }
+
             if (isset($keymap[$key])) {
                 $_key = $keymap[$key];
             } else {
                 $_key = $key;
             }
 
-            if (isset($userdata['preferredlanguage'])) {
-                setlocale(LC_ALL, $userdata['preferredlanguage']);
+            if (!empty($userdata['preferredlanguage'])) {
+                $locale = $userdata['preferredlanguage'];
             } else {
                 $conf = Conf::get_instance();
                 $locale = $conf->get('default_locale');
-                if (!empty($locale)) {
-                    setlocale(LC_ALL, $locale);
-                }
+            }
+
+            if (!empty($locale)) {
+                setlocale(LC_ALL, $locale.'utf8', $locale.'UTF-8', $locale);
             }
 
             if (!is_array($userdata[$_key])) {
                 $orig_value = $userdata[$key];
 
-                $userdata[$_key] = iconv('UTF-8', 'ASCII//TRANSLIT', $userdata[$key]);
-                $userdata[$_key] = preg_replace('/[^a-z0-9-_]/i', '', $userdata[$_key]);
+                $result = iconv('UTF-8', 'ASCII//TRANSLIT', $userdata[$key]);
+
+                if (strstr($result, '?')) {
+                    $result = self::transliterate($userdata[$key], $locale);
+                }
+
+                $userdata[$_key] = preg_replace('/[^a-z0-9-_]/i', '', $result);
             }
         }
 
@@ -266,6 +284,204 @@
         return $secondary_mail_addresses;
     }
 
+    static public function transliterate($mystring, $locale) {
+        $locale_translit_map = Array(
+                'ru_RU' => 'cyrillic'
+            );
+
+        $translit_map = Array(
+                'cyrillic' => Array(
+                        'А' => 'A',
+                        'а' => 'a',
+                        'Б' => 'B',
+                        'б' => 'b',
+                        'В' => 'V',
+                        'в' => 'v',
+                        'Г' => 'G',
+                        'г' => 'g',
+                        'Д' => 'D',
+                        'д' => 'd',
+                        'Е' => 'E',
+                        'е' => 'e',
+                        'Ё' => 'Yo',
+                        'ё' => 'e',
+                        'Ж' => 'Zh',
+                        'ж' => 'zh',
+                        'З' => 'Z',
+                        'з' => 'z',
+                        'И' => 'I',
+                        'и' => 'i',
+                        'Й' => 'J',
+                        'й' => 'j',
+                        'К' => 'K',
+                        'к' => 'k',
+                        'Л' => 'L',
+                        'л' => 'l',
+                        'М' => 'M',
+                        'м' => 'm',
+                        'Н' => 'N',
+                        'н' => 'n',
+                        'О' => 'O',
+                        'о' => 'o',
+                        'П' => 'P',
+                        'п' => 'p',
+                        'Р' => 'R',
+                        'р' => 'r',
+                        'С' => 'S',
+                        'с' => 's',
+                        'Т' => 'T',
+                        'т' => 't',
+                        'У' => 'U',
+                        'у' => 'u',
+                        'Ф' => 'F',
+                        'ф' => 'f',
+                        'Х' => 'Kh',
+                        'х' => 'kh',
+                        'Ц' => 'Tc',
+                        'ц' => 'tc',
+                        'Ч' => 'Ch',
+                        'ч' => 'ch',
+                        'Ш' => 'Sh',
+                        'ш' => 'sh',
+                        'Щ' => 'Shch',
+                        'щ' => 'shch',
+                        'Ъ' => '',
+                        'ъ' => '',
+                        'Ы' => 'Y',
+                        'ы' => 'y',
+                        'Ь' => '',
+                        'ь' => '',
+                        'Э' => 'E',
+                        'э' => 'e',
+                        'Ю' => 'Yu',
+                        'ю' => 'yu',
+                        'Я' => 'Ya',
+                        'я' => 'ya',
+                    ),
+            );
+
+        if ($translit = $translit_map[$locale_translit_map[$locale]]) {
+            $mystring = strtr($mystring, $translit);
+        }
+
+        return $mystring;
+    }
+
+    static public function uid($userdata) {
+        $conf = Conf::get_instance();
+
+        if (isset($userdata['domain'])) {
+            $policy_uid = $conf->get_raw($userdata['domain'], 'policy_uid');
+        } else {
+            $policy_uid = $conf->get_raw($_SESSION['user']->get_domain(), 'policy_uid');
+            $userdata['domain'] = $_SESSION['user']->get_domain();
+        }
+
+        if (empty($policy_uid)) {
+            $policy_uid = "%(surname)s.lower()";
+        }
+
+        $functions = array(
+                '\'*(\w+)\'*\.capitalize.*' => 'strtoupper(substr("${1}", 0, 1)) . strtolower(substr("${1}", 1))',
+                '\'*(.*)\'*\.lower.*'       => 'strtolower("${1}")',
+                '\'*(\w+)\'*\.upper.*'      => 'strtoupper("${1}")',
+            );
+
+        $policy_uid = preg_replace('/(\{\d+\})/', '%s', $policy_uid);
+
+        preg_match_all('/%$(\w+)$s/', $policy_uid, $substrings);
+
+        // Update userdata array
+        for ($x = 0; $x < count($substrings[0]); $x++) {
+            if (array_key_exists($substrings[1][$x], $userdata)) {
+                if (!empty($substrings[2][$x])) {
+                    if (!empty($substrings[3][$x])) {
+                        $policy_uid = preg_replace(
+                                '/%$' . $substrings[1][$x]. '$s/',
+                                substr(
+                                        $userdata[$substrings[1][$x]],
+                                        $substrings[2][$x],
+                                        $substrings[3][$x]
+                                    ),
+                                $policy_uid
+                            );
+
+                    } else {
+                        $policy_uid = preg_replace(
+                                '/%$' . $substrings[1][$x]. '$s/',
+                                substr(
+                                        $userdata[$substrings[1][$x]],
+                                        $substrings[2][$x]
+                                    ),
+                                $policy_uid
+                            );
+
+                    }
+                } elseif (!empty($substrings[3][$x])) {
+                    $policy_uid = preg_replace(
+                            '/%$' . $substrings[1][$x]. '$s/',
+                            substr(
+                                    $userdata[$substrings[1][$x]],
+                                    0,
+                                    $substrings[3][$x]
+                                ),
+                            $policy_uid
+                        );
+
+                } else {
+                    $policy_uid = preg_replace(
+                            '/%$' . $substrings[1][$x]. '$s/',
+                            $userdata[$substrings[1][$x]],
+                            $policy_uid
+                        );
+
+                }
+            }
+        }
+
+        preg_match_all('/.*\'(.*)\'\[(\d+):(\d+)\].*/', $policy_uid, $substrings);
+
+        for ($x = 0; $x < count($substrings[0]); $x++) {
+            if (!empty($substrings[2][$x])) {
+                $start = $substrings[2][$x];
+            } else {
+                $start = 0;
+            }
+
+            if (!empty($substrings[3][$x])) {
+                $end = $substrings[3][$x];
+            } else {
+                $end = 0;
+            }
+
+            $policy_uid = preg_replace(
+                    "/'" . $substrings[1][$x] . "'\[" . $substrings[2][$x] . ':' . $substrings[3][$x] . "\]/",
+                    substr($substrings[1][$x], $start, $end),
+                    $policy_uid
+                );
+        }
+
+        foreach ($functions as $match => $replace) {
+            while (preg_match('/' . $match . '/', $policy_uid, $strings)) {
+                $policy_uid = preg_replace('/' . $match . '/', $replace, $policy_uid);
+            }
+        }
+
+        Log::trace("kolab_recipient_policy::" . __LINE__ . " \$policy_uid: " . var_export($policy_uid, TRUE));
+
+        $formatted_policy_uid = explode(":", $policy_uid);
+        if (is_array($formatted_policy_uid) && count($formatted_policy_uid) == 2) {
+            eval("\$policy_uid = sprintf(" . $formatted_policy_uid[0] . ", " . $formatted_policy_uid[1] . ");");
+        } elseif (preg_match('/$/', $policy_uid) && preg_match('/$/', $policy_uid)) {
+            eval("\$policy_uid = " . $policy_uid . ";");
+        } else {
+            eval("\$policy_uid = '" . $policy_uid . "';");
+        }
+
+        return $policy_uid;
+
+    }
+
     /**
      * Make sure email address is valid, if not return empty string
      */

kolab-webadmin-3.0.5.tar.gz/lib/kolab_utils.php -> kolab-webadmin-3.1.tar.gz/lib/kolab_utils.php Changed

kolab-webadmin-3.0.5.tar.gz/lib/locale/en_US.php -> kolab-webadmin-3.1.tar.gz/lib/locale/en_US.php Changed

@@ -62,6 +62,8 @@
 $LANG['group.delete.success'] = 'Group deleted successfully.';
 $LANG['group.edit.success'] = 'Group updated successfully.';
 $LANG['group.gidnumber'] = 'Primary group number';
+$LANG['group.kolaballowsmtprecipient'] = 'Recipient(s) Access List';
+$LANG['group.kolaballowsmtpsender'] = 'Sender Access List';
 $LANG['group.list'] = 'Groups List';
 $LANG['group.mail'] = 'Primary Email Address';
 $LANG['group.member'] = 'Member(s)';
@@ -105,6 +107,7 @@
 $LANG['menu.resources'] = 'Resources';
 $LANG['menu.roles'] = 'Roles';
 $LANG['menu.settings'] = 'Settings';
+$LANG['menu.sharedfolders'] = 'Shared Folders';
 $LANG['menu.users'] = 'Users';
 
 $LANG['modifiersname'] = 'Modified by';
@@ -133,7 +136,7 @@
 $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.edit.success'] = 'Role updated successfully.';
 $LANG['role.list'] = 'Role List';
 $LANG['role.norecords'] = 'No role records found!';
 $LANG['role.system'] = 'Details';
@@ -161,6 +164,24 @@
 
 $LANG['session.expired'] = 'Session has expired. Login again, please';
 
+$LANG['sharedfolder.add'] = 'Add Shared Folder';
+$LANG['sharedfolder.add.success'] = 'Shared folder created successfully.';
+$LANG['sharedfolder.alias'] = 'Secondary Email Address(es)';
+$LANG['sharedfolder.cn'] = 'Folder Name';
+$LANG['sharedfolder.delete.success'] = 'Shared folder deleted successfully.';
+$LANG['sharedfolder.edit'] = 'Edit Shared Folder';
+$LANG['sharedfolder.edit.success'] = 'Shared folder updated successfully.';
+$LANG['sharedfolder.kolaballowsmtprecipient'] = 'Recipient(s) Access List';
+$LANG['sharedfolder.kolaballowsmtpsender'] = 'Sender Access List';
+$LANG['sharedfolder.kolabdelegate'] = 'Delegate(s)';
+$LANG['sharedfolder.kolabtargetfolder'] = 'Target IMAP Folder';
+$LANG['sharedfolder.list'] = 'Shared Folders List';
+$LANG['sharedfolder.norecords'] = 'No shared folder records found!';
+$LANG['sharedfolder.mail'] = 'Email Address';
+$LANG['sharedfolder.other'] = 'Other';
+$LANG['sharedfolder.system'] = 'System';
+$LANG['sharedfolder.type_id'] = 'Shared Folder Type';
+
 $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.';
@@ -194,6 +215,7 @@
 $LANG['type.properties'] = 'Properties';
 $LANG['type.resource'] = 'Resource';
 $LANG['type.role'] = 'Role';
+$LANG['type.sharedfolder'] = 'Shared Folder';
 $LANG['type.used_for'] = 'Hosted';
 $LANG['type.user'] = 'User';

kolab-webadmin-3.0.5.tar.gz/public_html/js/kolab_admin.js -> kolab-webadmin-3.1.tar.gz/public_html/js/kolab_admin.js Changed

@@ -284,7 +284,7 @@
 
     return $.ajax({
       type: 'POST', url: url, data: postdata, dataType: 'json',
-      success: function(response) { kadm.http_response(response); },
+      success: function(response) { kadm.http_response(response, action); },
       error: function(o, status, err) { kadm.http_error(o, status, err); }
     });
   };
@@ -307,7 +307,7 @@
   };
 
   // handle HTTP response
-  this.http_response = function(response)
+  this.http_response = function(response, action)
   {
     var i;
 
@@ -334,6 +334,7 @@
     if (response.exec)
       eval(response.exec);
 
+    response.action = action;
     this.trigger_event('http-response', response);
   };
 
@@ -980,25 +981,34 @@
   {
     var e = $(form_element),
       form = form_element.form,
-      elem = $('<span class="link"></span>'),
-      area = $('<span class="listarea autocomplete select popup"></span>'),
-      content = $('<span class="listcontent"></span>'),
+      name = form_element.name,
+      elem = $('#selectlabel_' + name),
+      area = $('<span class="listarea autocomplete select popup" id="selectarea_' + name + '"></span>'),
+      content = $('<span class="listcontent" id="selectcontent_' + name + '"></span>'),
       list = this.env.assoc_fields ? this.env.assoc_fields[form_element.name] : [];
 
-    elem.text(e.val()).css({cursor: 'pointer'})
-      .click(function(e) {
-        var popup = $('span.listarea', this.parentNode);
-        kadm.popup_show(e, popup);
-        $('input', popup).val('').focus();
-        $('span.listcontent > span.listelement', popup).removeClass('selected').show();
-      })
-      .appendTo(form_element.parentNode);
+    if (elem.length) {
+      $('#selectarea_' + name).remove();
+      $('#selectcontent_' + name).remove();
+    }
+    else {
+      elem = $('<span class="link" id="selectlabel_' + name + '"></span>')
+        .css({cursor: 'pointer'})
+        .click(function(e) {
+          var popup = $('span.listarea', this.parentNode);
+          kadm.popup_show(e, popup);
+          $('input', popup).val('').focus();
+          $('span.listcontent > span.listelement', popup).removeClass('selected').show();
+        })
+        .appendTo(form_element.parentNode);
+    }
+
+    elem.text(e.val());
 
     if (list.length <= 1)
       return;
 
     if (form_element.type != 'hidden') e.hide();
-    area.hide();
 
     elem = this.form_list_element(form, {
       autocomplete: true,
@@ -1007,6 +1017,7 @@
 
     elem.appendTo(area);
     content.appendTo(area);
+    area.hide().appendTo(form_element.parentNode);
 
     // popup events
     $('input', area)
@@ -1019,6 +1030,12 @@
         if (e.which == 13)
           e.preventDefault();
       })
+      .keydown(function(e) {
+        // block Up/Down arrow keys,
+        // in Firefox Up arrow moves cursor left
+        if (e.which == 38 || e.which == 40)
+          e.preventDefault();
+      })
       .keyup(function(e) {
         // filtering
         var s = this.value,
@@ -1037,36 +1054,38 @@
         // UP/Down arrows
         else if (e.which == 38 || e.which == 40) {
           options = options.not(':hidden');
-          var selected = options.filter('.selected');
-
-          if (!selected.length) {
-            if (e.which == 40) // Down key
-              options.first().addClass('selected').parent().get(0).scrollTop = 0;
-          }
-          else {
-            var focused = selected[e.which == 40 ? 'next' : 'prev']();
 
-            while (focused.length && focused.is(':hidden'))
-              focused = selected[e.which == 40 ? 'next' : 'prev']();
+          if (options.length <= 1)
+            return;
 
-            if (!focused.length)
-              focused = options[e.which == 40 ? 'first' : 'last']();
+          var focused,
+            selected = options.filter('.selected'),
+            index = options.index(selected);
 
-            if (focused.length) {
-              selected.removeClass('selected');
-              focused.addClass('selected');
-
-              var parent = focused.parent(),
-                parent_height = parent.height(),
-                parent_top = parent.get(0).scrollTop,
-                top = focused.offset().top - parent.offset().top,
-                height = focused.height();
+          if (e.which == 40) {
+            if (!(focused = options.get(index+1)))
+              focused = options.get(index-1);
+          }
+          else {
+            if (!(focused = options.get(index-1)))
+              focused = options.get(index+1);
+          }
 
-              if (top < 0)
-                parent.get(0).scrollTop = 0;
-              else if (top >= parent_height)
-                parent.get(0).scrollTop = top - parent_height + height + parent_top;
-            }
+          if (focused) {
+            focused = $(focused);
+            selected.removeClass('selected');
+            focused.addClass('selected');
+
+            var parent = focused.parent(),
+              parent_height = parent.height(),
+              parent_top = parent.get(0).scrollTop,
+              top = focused.offset().top - parent.offset().top,
+              height = focused.height();
+
+            if (top < 0)
+              parent.get(0).scrollTop = 0;
+            else if (top >= parent_height)
+              parent.get(0).scrollTop = top - parent_height + height + parent_top;
           }
 
           return;
@@ -1092,8 +1111,6 @@
       var elem = kadm.form_select_option_element(form, {value: v, key: v, element: e});
       elem.appendTo(content);
     });
-
-    area.appendTo(form_element.parentNode);
   };
 
   // Creates option element for smart select
@@ -1304,16 +1321,17 @@
 
   this.form_value_response = function(response)
   {
-    var i, val;
+    var i, val, field;
     if (!this.api_response(response))
       return;
 
     for (i in response.result) {
       val = response.result[i];
+      field = $('[name="'+i+'"]');
       // @TODO: indexed list support
       if ($.isArray(val))
-        val = val.join("\n");
-      $('[name="'+i+'"]').val(val);
+        val = field.is('textarea') ? val.join("\n") : val.shift();
+      field.val(val);
 
       this.form_element_update({name: i});
     }
@@ -1372,10 +1390,10 @@
     this.list_handler('domain', props);
   };
 
-  this.domain_delete = function(domainid)
+  this.domain_delete = function(id)
   {
     this.set_busy(true, 'deleting');
-    this.api_post('domain.delete', {domain: domainid}, 'domain_delete_response');
+    this.api_post('domain.delete', {'id': id}, 'domain_delete_response');
   };
 
   this.domain_save = function(reload, section)
@@ -1402,22 +1420,22 @@
 
   this.domain_delete_response = function(response)
   {
-    this.response_handler(response, 'domain.delete', 'domain.list');
+    this.response_handler(response, 'domain.delete', 'domain.list', {refresh: 1});
   };
 
   this.domain_add_response = function(response)
   {
-    this.response_handler(response, 'domain.add', 'domain.list');
+    this.response_handler(response, 'domain.add', 'domain.list', {refresh: 1});
   };
 
   this.domain_edit_response = function(response)
   {
-    this.response_handler(response, 'domain.edit', 'domain.list');
+    this.response_handler(response, 'domain.edit', 'domain.list', {refresh: 1});
   };
 
   this.user_info = function(id)
   {
-    this.http_post('user.info', {id: id});
+    this.http_post('user.info', {'id': id});
   };
 
   this.user_list = function(props)
@@ -1425,10 +1443,10 @@
     this.list_handler('user', props);
   };
 
-  this.user_delete = function(userid)
+  this.user_delete = function(id)
   {
     this.set_busy(true, 'deleting');
-    this.api_post('user.delete', {user: userid}, 'user_delete_response');
+    this.api_post('user.delete', {'id': id}, 'user_delete_response');
   };
 
   this.user_save = function(reload, section)
@@ -1486,10 +1504,10 @@
     this.list_handler('group', props);
   };
 
-  this.group_delete = function(groupid)
+  this.group_delete = function(id)
   {
     this.set_busy(true, 'deleting');
-    this.api_post('group.delete', {group: groupid}, 'group_delete_response');
+    this.api_post('group.delete', {'id': id}, 'group_delete_response');
   };
 
   this.group_save = function(reload, section)
@@ -1539,10 +1557,10 @@
     this.list_handler('resource', props);
   };
 
-  this.resource_delete = function(resourceid)
+  this.resource_delete = function(id)
   {
     this.set_busy(true, 'deleting');
-    this.api_post('resource.delete', {resource: resourceid}, 'resource_delete_response');
+    this.api_post('resource.delete', {'id': id}, 'resource_delete_response');
   };
 
   this.resource_save = function(reload, section)
@@ -1592,10 +1610,10 @@
     this.list_handler('role', props);
   };
 
-  this.role_delete = function(roleid)
+  this.role_delete = function(id)
   {
     this.set_busy(true, 'deleting');
-    this.api_post('role.delete', {role: roleid}, 'role_delete_response');
+    this.api_post('role.delete', {'id': id}, 'role_delete_response');
   };
 
   this.role_save = function(reload, section)
@@ -1635,6 +1653,59 @@
     this.response_handler(response, 'role.edit', 'role.list');
   };
 
+  this.sharedfolder_info = function(id)
+  {
+    this.http_post('sharedfolder.info', {id: id});
+  };
+
+  this.sharedfolder_list = function(props)
+  {
+    this.list_handler('sharedfolder', props);
+  };
+
+  this.sharedfolder_delete = function(id)
+  {
+    this.set_busy(true, 'deleting');
+    this.api_post('sharedfolder.delete', {'id': id}, 'sharedfolder_delete_response');
+  };
+
+  this.sharedfolder_save = function(reload, section)
+  {
+    var data = this.serialize_form('#'+this.env.form_id),
+      action = data.id ? 'edit' : 'add';
+
+    if (reload) {
+      data.section = section;
+      this.http_post('sharedfolder.' + action, {data: data});
+      return;
+    }
+
+    this.form_error_clear();
+
+    if (!this.check_required_fields(data)) {
+      this.display_message('form.required.empty', 'error');
+      return;
+    }
+
+    this.set_busy(true, 'saving');
+    this.api_post('sharedfolder.' + action, data, 'sharedfolder_' + action + '_response');
+  };
+
+  this.sharedfolder_delete_response = function(response)
+  {
+    this.response_handler(response, 'sharedfolder.delete', 'sharedfolder.list');
+  };
+
+  this.sharedfolder_add_response = function(response)
+  {
+    this.response_handler(response, 'sharedfolder.add', 'sharedfolder.list');
+  };
+
+  this.sharedfolder_edit_response = function(response)
+  {
+    this.response_handler(response, 'sharedfolder.edit', 'sharedfolder.list');
+  };
+
   this.settings_type_info = function(id)
   {
     this.http_post('settings.type_info', {id: id});
@@ -1689,9 +1760,6 @@
       return;
     }
 
-    // remove objectClass from required attributes list
-    required = $.map(required, function(a) { return a == 'objectClass' ? null : a; });
-
     request.id = data.id;
     request.key = data.key;
     request.name = data.name;
@@ -1773,7 +1841,7 @@
   /*********************************************************/
 
   // universal API response handler
-  this.response_handler = function(response, action, list)
+  this.response_handler = function(response, action, list, list_params)
   {
     if (!this.api_response(response))
       return;
@@ -1789,7 +1857,11 @@
       if (this.env.list_page > 1 && this.env.list_size == 1 && action.match(/\.delete/))
         page -= 1;
 
-      this.command(list, {page: page});
+      if (!list_params)
+        list_params = {};
+
+      list_params.page = page;
+      this.command(list, list_params);
       this.set_watermark('taskcontent');
     }
   };
@@ -1987,15 +2059,18 @@
       return;
 
     var i, lc, list = response.result.attribute.list || [],
+      required = response.result.attribute.required || [],
       select = $('select[name="attr_name"]');
 
+    // remove objectClass from attributes list(s)
+    required = $.map(required, function(a) { return a == 'objectClass' ? null : a; });
+    list = $.map(list, function(a) { return a == 'objectClass' ? null : a; });
+
     this.env.attributes = {};
-    this.env.attributes_required = response.result.attribute.required || [];
+    this.env.attributes_required = required;
     select.empty();
 
     for (i in list) {
-      if (i == 'objectClass')
-        continue;
       lc = list[i].toLowerCase();
       this.env.attributes[lc] = list[i];
       $('<option>').text(list[i]).val(lc).appendTo(select);

kolab-webadmin-3.0.5.tar.gz/public_html/js/kolab_hosted.js -> kolab-webadmin-3.1.tar.gz/public_html/js/kolab_hosted.js Changed

@@ -26,13 +26,6 @@
 {
     var data = kadm.serialize_form('#'+this.env.form_id);
 
-    // check email address
-    if(typeof data.mailalternateaddress != 'undefined' && !isValidEmailAddress(data.mailalternateaddress)) {
-        kadm.display_message('signup.wrongmailalternateaddress', 'error');
-        kadm.form_value_error('mailalternateaddress');
-        return;
-    }
-
     if (!kadm.check_required_fields(data)) {
       kadm.display_message('form.required.empty', 'error');
       return;
@@ -121,7 +114,7 @@
     }
 }
 
-// TODO use form.validate api call for that
+// this is only used to update GUI only when it makes sense, for real validation we rely on form_value.validate
 function isValidEmailAddress(emailAddress) {
     var pattern = new RegExp(/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i);
     return pattern.test(emailAddress);

kolab-webadmin-3.1.tar.gz/public_html/skins/default/images/sharedfolders.png Added

kolab-webadmin-3.0.5.tar.gz/public_html/skins/default/style.css -> kolab-webadmin-3.1.tar.gz/public_html/skins/default/style.css Changed

kolab-webadmin-3.1.tar.gz/public_html/skins/default/templates/sharedfolder.html Added

kolab-webadmin-3.0.5.tar.gz/public_html/skins/default/ui.js -> kolab-webadmin-3.1.tar.gz/public_html/skins/default/ui.js Changed

kolab-webadmin-3.0.5.tar.gz/public_html/skins/kolabsys/hosted.css -> kolab-webadmin-3.1.tar.gz/public_html/skins/kolabsys/hosted.css Changed

kolab-webadmin.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 51 0

Request History

vanmeeuwen created request about 11 years ago

Correction for openSUSE

vanmeeuwen accepted request about 11 years ago