steffen: server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder sf.php, 1.2, 1.3
cvs at intevation.de
cvs at intevation.de
Mon Jun 28 16:00:09 CEST 2004
Author: steffen
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder
In directory doto:/tmp/cvs-serv26120/kolab-webadmin/www/admin/sharedfolder
Modified Files:
sf.php
Log Message:
fix for issues 204 and 205
Index: sf.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/sf.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sf.php 21 Jun 2004 01:46:39 -0000 1.2
+++ sf.php 28 Jun 2004 14:00:06 -0000 1.3
@@ -27,7 +27,7 @@
else $userquota = $ldap_object['userquota'];
$form->entries['userquota']['value'] = $userquota;
- if (is_array($ldap_object['homeServer'])) $homeserver = $ldap_object['homeServer'][0];
+ if (is_array($ldap_object['homeserver'])) $homeserver = $ldap_object['homeserver'][0];
$form->entries['homeserver']['value'] = $homeserver;
$form->entries['action']['value'] = 'save';
@@ -161,7 +161,7 @@
} else {
if (!$errors) {
$dn = "cn=".$ldap_object['cn'].",".$sf_root;
- $ldap_object['homeServer'] = trim($_POST['homeserver']);
+ $ldap_object['homeserver'] = trim($_POST['homeserver']);
if ($dn && !ldap_add($ldap->connection, $dn, $ldap_object))
array_push($errors, "LDAP Error: could not add object ".$dn." ".ldap_error($ldap->connection));
else $messages[] = 'Shared folder '.$cn.' added';
@@ -177,9 +177,16 @@
$form->entries['cn']['attrs'] = 'readonly';
$form->entries['homeserver']['attrs'] = 'readonly';
$heading = 'Modify Shared Folder';
- fill_form_for_modify( $form, $ldap_object );
+ $result = $ldap->search( $dn, '(objectClass=sharedfolder)' );
+ if( $result ) {
+ $ldap_object = ldap_get_entries( $ldap->connection, $result );
+ if( $ldap_object['count'] == 1 ) {
+ $ldap_object = $ldap_object[0];
+ fill_form_for_modify( $form, $ldap_object );
+ }
+ $ldap->freeSearchResult();
+ }
$content = $form->outputForm();
-
}
}
break;
@@ -236,7 +243,7 @@
/**** Insert into template and output ***/
$smarty =& new MySmarty();
-$smarty->assign( 'errors', $errors );
+$smarty->assign( 'errors', array_merge($errors,$form->errors) );
$smarty->assign( 'heading', $heading );
$smarty->assign( 'uid', $auth->uid() );
$smarty->assign( 'group', $auth->group() );
More information about the commits
mailing list