steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include ldap.class.php, 1.12, 1.13
cvs at intevation.de
cvs at intevation.de
Thu Aug 12 12:55:41 CEST 2004
- Previous message: steffen: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.2, 1.3 Makefile.am, 1.4, 1.5
- Next message: steffen: server/kolab/kolab/templates fbview.conf.template, 1.3, 1.4 freebusy.conf.template, 1.5, 1.6 httpd.conf.template, 1.7, 1.8 imapd.conf.template, 1.9, 1.10 kolab.conf.template, 1.2, 1.3 main.cf.template, 1.9, 1.10 resmgr.conf.template, 1.6, 1.7 saslauthd.conf.template, 1.3, 1.4 session_vars.php.template, 1.4, 1.5 slapd.conf.template, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: steffen
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include
In directory doto:/tmp/cvs-serv3739/kolab-webadmin/kolab-webadmin/php/admin/include
Modified Files:
ldap.class.php
Log Message:
*BOMB*. Changes to support the new schema
Index: ldap.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/ldap.class.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ldap.class.php 12 Aug 2004 02:20:05 -0000 1.12
+++ ldap.class.php 12 Aug 2004 10:55:39 -0000 1.13
@@ -156,7 +156,7 @@
function dnForUid( $uid ) {
if( $this->search( $_SESSION['base_dn'],
- '(&(objectclass=kInetOrgPerson)(uid='.$this->escape($uid).'))' ) ) {
+ '(&(objectclass=kolabinetorgperson)(uid='.$this->escape($uid).'))' ) ) {
$entry = $this->firstEntry();
if( $entry ) {
return ldap_get_dn( $this->connection, $entry );
@@ -186,7 +186,7 @@
function dnForMail( $mail ) {
if( $this->search( $_SESSION['base_dn'],
- '(&(objectclass=kInetOrgPerson)(mail='.$this->escape($mail).'))' ) ) {
+ '(&(objectclass=kolabinetorgperson)(mail='.$this->escape($mail).'))' ) ) {
$entry = $this->firstEntry();
if( $entry ) {
return ldap_get_dn( $this->connection, $entry );
@@ -237,7 +237,7 @@
global $errors;
$privmembers = array();
$mybase = 'cn='.$group.','.$base;
- $filter = '(objectClass=groupOfNames)';
+ $filter = '(objectClass=kolabgroupofnames)';
$res = ldap_search( $this->connection, $mybase, $filter, array('member') );
if( !$res ) {
array_push($errors, _("LDAP Error: Can't read maintainers group: ")
@@ -283,7 +283,7 @@
// Now count dist. lists
$cn = substr( $mail, 0, strpos( $mail, '@' ) );
- $filter = '(&(objectClass=groupOfNames)(cn='.$this->escape($cn).'))';
+ $filter = '(&(objectClass=kolabgroupofnames)(cn='.$this->escape($cn).'))';
$res = $this->search( $base, $filter, array( 'dn' ) );
$entries = ldap_get_entries( $this->connection, $res );
@@ -314,8 +314,8 @@
$kolab_obj = $this->read( 'k=kolab,'.$_SESSION['base_dn'] );
if( !$kolab_obj ) return false;
$delete_template = array();
- $delete_template['deleteflag'] = $kolab_obj['kolabhost'];
- unset($delete_template['deleteflag']['count']);
+ $delete_template['kolabdeleteflag'] = $kolab_obj['kolabhost'];
+ unset($delete_template['kolabdeleteflag']['count']);
if( !ldap_modify($this->connection,$dn,$delete_template) ) {
return false;
}
- Previous message: steffen: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.2, 1.3 Makefile.am, 1.4, 1.5
- Next message: steffen: server/kolab/kolab/templates fbview.conf.template, 1.3, 1.4 freebusy.conf.template, 1.5, 1.6 httpd.conf.template, 1.7, 1.8 imapd.conf.template, 1.9, 1.10 kolab.conf.template, 1.2, 1.3 main.cf.template, 1.9, 1.10 resmgr.conf.template, 1.6, 1.7 saslauthd.conf.template, 1.3, 1.4 session_vars.php.template, 1.4, 1.5 slapd.conf.template, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list