summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2007-05-28 19:24:10 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2007-05-28 19:24:10 (GMT)
commit74805786b9274c9ebb755f4ee5e95ace10013eb4 (patch)
tree6cd40f8bd52ebb94b9f6a46e63575100203aea17
parent77aa805fbe8f8260da8fe2b075f4fd6cf352ef2c (diff)
downloadkolab-webadmin-74805786b9274c9ebb755f4ee5e95ace10013eb4.tar.gz
Corrected fix for kolab/issue1742 (https://intevation.de/roundup/kolab/issue1742)
-rw-r--r--ChangeLog11
-rw-r--r--www/admin/administrator/admin.php.in5
-rw-r--r--www/admin/domainmaintainer/domainmaintainer.php.in5
-rw-r--r--www/admin/maintainer/maintainer.php.in5
-rw-r--r--www/admin/user/user.php.in5
5 files changed, 31 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7923d4e..a0654ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-05-28 Gunnar Wrobel <p@rdus.de>
+
+ * www/admin/user/user.php.in:
+ * www/admin/maintainer/maintainer.php.in:
+ * www/admin/domainmaintainer/domainmaintainer.php.in:
+ * www/admin/administrator/admin.php.in:
+ * www/admin/addressbook/addr.php.in:
+
+ Corrected fix for
+ kolab/issue1742 (https://intevation.de/roundup/kolab/issue1742)
+
2007-05-24 Gunnar Wrobel <p@rdus.de>
* Makefile.am (WSKOLAB_FILES):
diff --git a/www/admin/administrator/admin.php.in b/www/admin/administrator/admin.php.in
index 332540d..232ade3 100644
--- a/www/admin/administrator/admin.php.in
+++ b/www/admin/administrator/admin.php.in
@@ -163,11 +163,15 @@ $entries = array( 'firstname' => array( 'name' => _('First Name'),
$entries['action'] = array( 'name' => 'action',
'type' => 'hidden' );
+$oc = array('top', 'inetOrgPerson','kolabInetOrgPerson');
+
if( $dn ) {
$ldap_object = $ldap->read( $dn );
if( !$ldap_object ) {
array_push($errors, sprintf(_("LDAP Error: No such dn: %s: %s"), $dn, ldap_error($ldap->connection)));
}
+ $oc = $ldap_object['objectClass'];
+ unset($oc['count']);
}
$form =& new KolabForm( 'admin', 'createadmin.tpl', $entries );
@@ -185,6 +189,7 @@ switch( $action ) {
} else {
debug("Process...");
$ldap_object = array();
+ $ldap_object['objectClass'] = $oc;
$ldap_object['sn'] = trim($_POST['lastname']);
$ldap_object['cn'] = trim($_POST['firstname']).' '.$ldap_object['sn'];
if( !empty( $_POST['password_0'] ) ) {
diff --git a/www/admin/domainmaintainer/domainmaintainer.php.in b/www/admin/domainmaintainer/domainmaintainer.php.in
index ff89675..b27edd9 100644
--- a/www/admin/domainmaintainer/domainmaintainer.php.in
+++ b/www/admin/domainmaintainer/domainmaintainer.php.in
@@ -146,11 +146,15 @@ if( $auth->group() == 'admin' || $auth->group() == 'maintainer' ) {
$entries['action'] = array( 'name' => 'action',
'type' => 'hidden' );
+$oc = array('top', 'inetOrgPerson','kolabInetOrgPerson');
+
if( $dn ) {
$ldap_object = $ldap->read( $dn );
if( !$ldap_object ) {
array_push($errors, sprintf( _("LDAP Error: No such dn: %s: %s"), $dn, ldap_error($ldap->connection)));
}
+ $oc = $ldap_object['objectClass'];
+ unset($oc['count']);
}
$form =& new KolabForm( 'maintainer', 'createmaintainer.tpl', $entries );
@@ -167,6 +171,7 @@ switch( $action ) {
$content = $form->outputForm();
} else {
$ldap_object = array();
+ $ldap_object['objectClass'] = $oc;
$ldap_object['sn'] = trim($_POST['lastname']);
$ldap_object['cn'] = trim($_POST['firstname']).' '.$ldap_object['sn'];
if( !empty( $_POST['password_0'] ) ) {
diff --git a/www/admin/maintainer/maintainer.php.in b/www/admin/maintainer/maintainer.php.in
index 72037c6..24658e7 100644
--- a/www/admin/maintainer/maintainer.php.in
+++ b/www/admin/maintainer/maintainer.php.in
@@ -160,11 +160,15 @@ $entries = array( 'firstname' => array( 'name' => _('First Name'),
$entries['action'] = array( 'name' => 'action',
'type' => 'hidden' );
+$oc = array('top', 'inetOrgPerson','kolabInetOrgPerson');
+
if( $dn ) {
$ldap_object = $ldap->read( $dn );
if( !$ldap_object ) {
array_push($errors, sprintf(_("LDAP Error: No such dn: %s: %s"), $dn, ldap_error($ldap->connection)));
}
+ $oc = $ldap_object['objectClass'];
+ unset($oc['count']);
}
$form =& new KolabForm( 'maintainer', 'createmaintainer.tpl', $entries );
@@ -182,6 +186,7 @@ switch( $action ) {
} else {
debug("Process...");
$ldap_object = array();
+ $ldap_object['objectClass'] = $oc;
$ldap_object['sn'] = trim($_POST['lastname']);
$ldap_object['cn'] = trim($_POST['firstname']).' '.$ldap_object['sn'];
if( !empty( $_POST['password_0'] ) ) {
diff --git a/www/admin/user/user.php.in b/www/admin/user/user.php.in
index e26a000..3790798 100644
--- a/www/admin/user/user.php.in
+++ b/www/admin/user/user.php.in
@@ -481,11 +481,15 @@ $entries['kolabFreeBusyFuture_0'] = array( 'name' => _('Free/Busy interval in da
$entries['action'] = array( 'name' => 'action',
'type' => 'hidden' );
+$oc = array('top', 'inetOrgPerson','kolabInetOrgPerson');
+
if( $dn ) {
$ldap_object = $ldap->read( $dn );
if( !$ldap_object ) {
array_push($errors, sprintf(_("LDAP Error: No such dn: %s: %s"), $dn, ldap_error($ldap->connection)));
}
+ $oc = $ldap_object['objectClass'];
+ unset($oc['count']);
}
if( $auth->group() == 'user' ) {
@@ -505,6 +509,7 @@ switch( $action ) {
$content = $form->outputForm();
} else {
$ldap_object = array();
+ $ldap_object['objectClass'] = $oc;
$ldap_object['sn'] = trim($_POST['sn']);
$ldap_object['cn'] = trim($_POST['givenname']).' '.$ldap_object['sn'];
$ldap_object['givenName'] = trim($_POST['givenname']);