steffen: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook addr.php, 1.11, 1.12 index.php, 1.6, 1.7

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	addr.php index.php 
Log Message:
deletion handling + versions

Index: addr.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/addr.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- addr.php	20 Jun 2005 14:18:03 -0000	1.11
+++ addr.php	28 Jul 2005 02:14:38 -0000	1.12
@@ -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 => $value ) {
+		foreach( array_keys($form->entries) as $key ) {
 		  $form->entries[$key]['attrs'] = 'readonly';
 		}
 		$form->submittext = _('Delete');
@@ -279,7 +279,7 @@
 	break;
   case 'kill':
 	if (!$errors) {    
-	  if (!(ldap_delete($ldap->connection,$dn))) {
+	  if (!($ldap->deleteObject($dn))) {
 		array_push($errors, _("LDAP Error: could not delete ").$dn.": ".ldap_error($ldap->connection));
 	  } else {
 		$heading = _('Entry Deleted');

Index: index.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/index.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- index.php	11 Mar 2005 09:11:15 -0000	1.6
+++ index.php	28 Jul 2005 02:14:38 -0000	1.7
@@ -1,6 +1,6 @@
 <?php
 /*
- (c) 2004 Klar䬶dalens Datakonsult AB
+ (c) 2004 Klar〓dalens Datakonsult AB
  (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
  (c) 2003 Martin Konold <martin.konold at erfrakon.de>
  This program is Free Software under the GNU General Public License (>=v2).
@@ -97,10 +97,12 @@
         $a = strlen($sn);
         $b = strlen($cn);
         $fn = substr($cn, 0, $b - $a);
+		$deleted = array_key_exists('kolabDeleteflag',$attrs)?$attrs['kolabDeleteflag'][0]:"FALSE";
 		$entries[] = array( 'dn' => $dn,
 							'sn' => $sn,
 							'fn' => $fn,
-							'mail' => $mail );		
+							'mail' => $mail,
+							'deleted' => $deleted );		
 		$entry = ldap_next_entry( $ldap->connection,$entry );
 	  }
 	}
@@ -142,4 +144,4 @@
   buffer-file-coding-system: utf-8
   End:
  */
-?>
\ No newline at end of file
+?>