steffen: server/kolab-webadmin/kolab-webadmin/www/admin/maintainer index.php, 1.3, 1.4 maintainer.php, 1.7, 1.8
cvs at intevation.de
cvs at intevation.de
Fri Aug 20 04:10:03 CEST 2004
Author: steffen
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer
In directory doto:/tmp/cvs-serv21496/kolab-webadmin/kolab-webadmin/www/admin/maintainer
Modified Files:
index.php maintainer.php
Log Message:
Move system user to internal subtree. Fix for Issue324
Index: index.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- index.php 12 Aug 2004 10:55:39 -0000 1.3
+++ index.php 20 Aug 2004 02:10:00 -0000 1.4
@@ -1,6 +1,6 @@
<?php
/*
- (c) 2004 Klarälvdalens Datakonsult AB
+ (c) 2004 KlarÃ��¤lvdalens Datakonsult AB
This program is Free Software under the GNU General Public License (>=v2).
Read the file COPYING that comes with this packages for details.
@@ -37,10 +37,10 @@
if (isset($_SESSION['base_dn'])) $base_dn = $_SESSION['base_dn'];
else $base_dn = 'k=kolab';
- $maintainers = $ldap->groupMembers( $base_dn, 'maintainer' );
+ $maintainers = $ldap->groupMembers( "cn=internal,$base_dn", 'maintainer' );
$filter = "(&(cn=*)(objectclass=inetOrgPerson)(uid=*)(sn=*))";
- $result = ldap_list($ldap->connection, $base_dn, $filter, array( 'uid', 'sn', 'cn', 'kolabdeleteflag' ));
+ $result = ldap_search($ldap->connection, $base_dn, $filter, array( 'uid', 'sn', 'cn', 'kolabdeleteflag' ));
if( $result ) {
$title = _('Manage Maintainers (').count($maintainers)._(' Maintainers)');
Index: maintainer.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/maintainer/maintainer.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- maintainer.php 13 Aug 2004 11:59:13 -0000 1.7
+++ maintainer.php 20 Aug 2004 02:10:00 -0000 1.8
@@ -1,6 +1,6 @@
<?php
/*
- * Copyright (c) 2004 Klarälvdalens Datakonsult AB
+ * Copyright (c) 2004 KlarÃ��¿½ï¿½Ã¤lvdalens Datakonsult AB
*
* Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
*
@@ -208,7 +208,7 @@
if ($action == "save") {
if (!$errors) {
- if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap_object['cn'].",".$domain_dn;
+ if (!empty($ldap_object['cn'])) $newdn = "cn=".$ldap_object['cn'].",cn=internal,".$domain_dn;
else $newdn = $dn;
if (!$visible && !strstr($newdn,$dn_add)) {
list($cn,$rest) = split(',', $newdn, 2);
@@ -230,7 +230,7 @@
}
if( !$errors ) {
// Update maintainer group
- $groupdn = 'cn=maintainer,'.$domain_dn;
+ $groupdn = 'cn=maintainer,cn=internal,'.$domain_dn;
if( !ldap_mod_delete($ldap->connection,$groupdn,
array( 'member' => $dn ) ) ) {
$errors[] = _("LDAP Error: Could not remove old group entry $dn: ")
@@ -262,11 +262,11 @@
} else {
// firstsave
if (!$errors) {
- $dn = "cn=".$ldap_object['cn'].",".$domain_dn;
+ $dn = "cn=".$ldap_object['cn'].",cn=internal,".$domain_dn;
debug("Calling ldap_add with dn=$dn");
if ($dn && !ldap_add($ldap->connection, $dn, $ldap_object))
- array_push($errors, _("LDAP Error: could not add object $dn_ ").ldap_error($ldap->connection));
- if( $dn && !ldap_mod_add($ldap->connection, 'cn=maintainer,'.$domain_dn,
+ array_push($errors, _("LDAP Error: could not add object $dn: ").ldap_error($ldap->connection));
+ if( $dn && !ldap_mod_add($ldap->connection, 'cn=maintainer,cn=internal,'.$domain_dn,
array( 'member' => $dn ) ) ) {
array_push($errors, _("LDAP Error: could not add object $dn to maintainer group: ")
.ldap_error($ldap->connection));
@@ -322,7 +322,7 @@
array_push($errors, _("Error: you need administrative permissions to delete users"));
if (!$errors) {
- if(!ldap_mod_del($ldap->connection, 'cn=maintainer,'.domain_dn(), array('member' => $dn ) )) {
+ if(!ldap_mod_del($ldap->connection, 'cn=maintainer,cn=internal,'.domain_dn(), array('member' => $dn ) )) {
$errors[] = _("LDAP Error: Could not remove $dn from maintainer group: ")
.ldap_error($ldap->connection);
}
More information about the commits
mailing list