steffen: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook addr.php, 1.10, 1.11

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook
In directory doto:/tmp/cvs-serv11162/kolab-webadmin/www/admin/addressbook

Modified Files:
	addr.php 
Log Message:
issue810

Index: addr.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/addr.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- addr.php	16 Jun 2005 00:32:10 -0000	1.10
+++ addr.php	20 Jun 2005 14:18:03 -0000	1.11
@@ -135,7 +135,7 @@
 							'type' => 'hidden' );
 
 $dn = '';
-if( $action == 'modify' || $action == 'delete' || $action == 'save') {
+if( $action == 'modify' || $action == 'delete' || $action == 'save' || $action == 'kill' ) {
   if( $_REQUEST['dn'] ) {
 	$dn = $_REQUEST['dn'];
   } else {  
@@ -266,7 +266,7 @@
 	  if( $ldap_object['count'] == 1 ) {
 		fill_form_for_modify( $form, $ldap_object[0] );
 		$form->entries['action']['value'] = 'kill';
-		foreach( $form->entries as $key ) {
+		foreach( $form->entries as $key => $value ) {
 		  $form->entries[$key]['attrs'] = 'readonly';
 		}
 		$form->submittext = _('Delete');
@@ -280,7 +280,7 @@
   case 'kill':
 	if (!$errors) {    
 	  if (!(ldap_delete($ldap->connection,$dn))) {
-		array_push($errors, _("LDAP Error: could not delete ").$dn.": ".ldap_error($link));
+		array_push($errors, _("LDAP Error: could not delete ").$dn.": ".ldap_error($ldap->connection));
 	  } else {
 		$heading = _('Entry Deleted');
 		$messages[] = _("Address book entry with DN $dn  was deleted");