steffen: server/kolab-webadmin/kolab-webadmin/www/admin/addressbook addr.php, 1.10, 1.10.2.1 index.php, 1.6, 1.6.2.1
cvs at intevation.de
cvs at intevation.de
Thu Jul 28 03:45:43 CEST 2005
Author: steffen
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook
In directory doto:/tmp/cvs-serv846/kolab-webadmin/www/admin/addressbook
Modified Files:
Tag: kolab_2_0_branch
addr.php index.php
Log Message:
deletion handling
Index: addr.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/addr.php,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- addr.php 16 Jun 2005 00:32:10 -0000 1.10
+++ addr.php 28 Jul 2005 01:45:41 -0000 1.10.2.1
@@ -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( array_keys($form->entries) as $key ) {
$form->entries[$key]['attrs'] = 'readonly';
}
$form->submittext = _('Delete');
@@ -279,8 +279,8 @@
break;
case 'kill':
if (!$errors) {
- if (!(ldap_delete($ldap->connection,$dn))) {
- array_push($errors, _("LDAP Error: could not delete ").$dn.": ".ldap_error($link));
+ if (!($ldap->deleteObject($dn))) {
+ 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");
Index: index.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/addressbook/index.php,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- index.php 11 Mar 2005 09:11:15 -0000 1.6
+++ index.php 28 Jul 2005 01:45:41 -0000 1.6.2.1
@@ -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
+?>
More information about the commits
mailing list