steffen: server/kolab-webadmin/kolab-webadmin/php/admin/include form.class.php, 1.18, 1.18.2.1 ldap.class.php, 1.24, 1.24.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/php/admin/include
In directory doto:/tmp/cvs-serv846/kolab-webadmin/php/admin/include
Modified Files:
Tag: kolab_2_0_branch
form.class.php ldap.class.php
Log Message:
deletion handling
Index: form.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/form.class.php,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -d -r1.18 -r1.18.2.1
--- form.class.php 16 Jun 2005 00:32:10 -0000 1.18
+++ form.class.php 28 Jul 2005 01:45:41 -0000 1.18.2.1
@@ -1,6 +1,6 @@
<?php
/*
- * Copyright (c) 2004 Klarälvdalens Datakonsult AB
+ * Copyright (c) 2004-2005 Klarälvdalens Datakonsult AB
*
* Writen by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
*
@@ -65,6 +65,11 @@
if( !isset( $value['comment'] ) ) $value['comment'] = '';
if( !isset( $value['attrs'] ) ) $value['attrs'] = '';
if( !isset( $value['value'] ) ) $value['value'] = '';
+ if( empty($value['type']) ) {
+ // Default is text
+ $value['type'] = 'text';
+ }
+
switch( $value['type'] ) {
case 'hidden': continue;
case 'password':
@@ -72,17 +77,16 @@
// If readonly, skip it -- passwords are at most write-only
break;
}
- case '':
- // Default is text
- $value['type'] = 'text';
case 'input':
case 'text':
$str .= '<tr>';
$str .= '<td>'.$value['name'].'</td>';
if( ereg( 'readonly', $value['attrs'] ) ) {
- $str .= '<td><p class="ctrl">'.$value['value'].'</p><input name="'.$key.'" type="hidden" value="'.$value['value'].'" /></td>';
+ $str .= '<td><p class="ctrl">'.htmlentities($value['value']).'</p><input name="'
+ .$key.'" type="hidden" value="'.htmlentities($value['value']).'" /></td>';
} else {
- $str .= '<td><input name="'.$key.'" type="'.$value['type'].'" value="'.$value['value'].'" '.$value['attrs'].' size="'.$size.'" /></td>';
+ $str .= '<td><input name="'.$key.'" type="'.$value['type'].'" value="'.htmlentities($value['value']).'" '
+ .htmlentities($value['attrs']).' size="'.$size.'" /></td>';
}
$str .= '<td>'.$value['comment'].'</td>';
$str .= '</tr>'."\n";
@@ -100,7 +104,7 @@
if( ereg( 'readonly', $value['attrs'] ) ) {
$str .= '<td><p class="ctrl">'.htmlentities($value['value']).'</p></td>';
} else {
- $str .= '<td><textarea name="'.$key.'" rows="5" cols="'.$size.'" '.$value['attrs'].' onkeypress="javascript:textareakeypress()">'.$value['value'].'</textarea></td>';
+ $str .= '<td><textarea name="'.$key.'" rows="5" cols="'.$size.'" '.$value['attrs'].' onkeypress="javascript:textareakeypress()">'.htmlentities($value['value']).'</textarea></td>';
}
$str .= '<td>'.$value['comment'].'</td>';
$str .= '</tr>'."\n";
@@ -121,7 +125,7 @@
$str .= '<td>'.$value['name'].'</td>';
if( ereg( 'readonly', $value['attrs'] ) ) {
$str .= '<td><p class="ctrl">'.htmlentities($value['options'][$value['value']]).
- '<input type="hidden" name="'.$key.'" value="'.$value['value'].'" /></p></td>';
+ '<input type="hidden" name="'.$key.'" value="'.htmlentities($value['value']).'" /></p></td>';
} else {
$str .= '<td><select name="'.$key.'" '.$value['attrs'].' >'."\n";
@@ -142,7 +146,8 @@
if( ereg( 'readonly', $value['attrs'] ) ) {
if( $value['user'] ) $str .= '<td><span class="ctrl">'.htmlentities($value['user']).'</span> <span class="ctrl">'.$value['perm'].'</span></td>';
} else {
- $str .= '<td><input name="user_'.$key.'" type="'.$value['type'].'" size="'.($size-15).'" value="'.$value['user'].'" '.$value['attrs'].' />';
+ $str .= '<td><input name="user_'.$key.'" type="'.$value['type'].'" size="'.($size-15).'" value="'
+ .htmlentities($value['user']).'" '.$value['attrs'].' />';
$str .= '<select name="perm_'.$key.'">'."\n";
if( $value['perm'] ) $selected_perm = $value['perm'];
else $selected_perm = 'all';
@@ -190,14 +195,14 @@
$str .= '<tr><td>';
if( $user == 'anyone' ) $str .= '<p class="ctrl">'._('Anyone').'</p>';
else $str .= '<p class="ctrl">'.htmlentities($user).'</p>';
- $str .= '</td><td><p class="ctrl">'.$policies[$pol].'</p></td></tr>'."\n";
+ $str .= '</td><td><p class="ctrl">'.htmlentities($policies[$pol]).'</p></td></tr>'."\n";
} else {
$str .= '<tr><td>';
if( $user == 'anyone' ) {
- $str .= _('Anyone').'<input type="hidden" name="user_'.$key.'_'.$i.'" value="'.$user.'" '.$value['attrs'].' />';
+ $str .= _('Anyone').'<input type="hidden" name="user_'.$key.'_'.$i.'" value="'.htmlentities($user).'" '.$value['attrs'].' />';
} else {
$str .= '<input name="user_'.$key.'_'.$i.'" type="text" size="'.($size-20)
- .'" value="'.$user.'" '.$value['attrs'].' />';
+ .'" value="'.htmlentities($user).'" '.$value['attrs'].' />';
}
$str .= '</td><td><select name="policy_'.$key.'_'.$i.'">'."\n";
$j = 0;
@@ -226,7 +231,7 @@
if( !isset( $value['comment'] ) ) $value['comment'] = '';
if( !isset( $value['attrs'] ) ) $value['attrs'] = '';
if( $value['type'] == 'hidden' ) {
- $str .= '<input name="'.$key.'" type="hidden" value="'.$value['value'].'" '.$value['attrs'].' />';
+ $str .= '<input name="'.$key.'" type="hidden" value="'.htmlentities($value['value']).'" '.$value['attrs'].' />';
}
}
$str .= '</form>';
Index: ldap.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/ldap.class.php,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -u -d -r1.24 -r1.24.2.1
--- ldap.class.php 16 Jun 2005 00:32:10 -0000 1.24
+++ ldap.class.php 28 Jul 2005 01:45:41 -0000 1.24.2.1
@@ -384,6 +384,10 @@
return $this->_doDeleteObject( $dn, $delete_now, false );
}
+ function deleteGroupOfNames( $dn, $delete_now = false ) {
+ return $this->_doDeleteObject( $dn, $delete_now, false );
+ }
+
// Private
function _doDeleteObject( $dn, $delete_now = false, $nuke_password = false ) {
if( $delete_now ) {
More information about the commits
mailing list