steffen: server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder index.php, 1.1, 1.2 sf.php, 1.1, 1.2

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	index.php sf.php 
Log Message:
shared folder handling + multiple bugfixes

Index: index.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- index.php	17 May 2004 15:24:27 -0000	1.1
+++ index.php	21 Jun 2004 01:46:39 -0000	1.2
@@ -44,7 +44,7 @@
 	  $dn = ldap_get_dn($ldap->connection,$entry);
 	  $cn = $attrs['cn'][0];
 	  $deleteflag = $attrs['deleteflag'][0];
-	  $homeserver = 'not yet implemented';
+	  $homeserver = $attrs['homeServer'][0];
 	  $entries[] = array( 'dn' => $dn,
 						  'cn' => $cn,
 						  'homeserver' => $homeserver,

Index: sf.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/sf.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sf.php	17 May 2004 15:24:27 -0000	1.1
+++ sf.php	21 Jun 2004 01:46:39 -0000	1.2
@@ -26,6 +26,10 @@
   if (is_array($ldap_object['userquota'])) $userquota = $ldap_object['userquota'][0];
   else $userquota = $ldap_object['userquota'];
   $form->entries['userquota']['value'] = $userquota;
+
+  if (is_array($ldap_object['homeServer'])) $homeserver = $ldap_object['homeServer'][0];
+  $form->entries['homeserver']['value'] = $homeserver;
+
   $form->entries['action']['value'] = 'save';
   //debug("got userquota=$userquota<br/>cn=$cn<br/>");
   $aclcount = 0;
@@ -67,8 +71,12 @@
 $entries = array( 'cn' => array( 'name' => 'Folder Name',
 								 'validation' => 'notempty',
 								 'comment' => 'Required' ),
+				  'homeserver' => array( 'name' => 'Folder Location',
+										 'validation' => 'notempty',
+										 'comment' => ($action=='create')?'Required, non volatile':'Non volatile',
+										 'value' => $_SESSION['fqhostname'] ),
 				  'userquota' => array( 'name' => 'Quota Limit',
-										'comment' => 'KBytes (empty for unlimited)' ),
+										'comment' => 'KBytes (empty for unlimited)' ),				  
 				  'acl_0' => array( 'name' => 'Permission for UID',
 									'type' => 'aclselect',
 									'user' => 'anyone',
@@ -118,7 +126,7 @@
 		  if ($count > 0) $ldap_object[$attr] = $args;
 		  else if (!empty($_POST[$key])) $ldap_object[$attr] = $_POST[$key];
 		}
-		if( $ldap_object['userquota'] == '' ) unset($ldap_object['userquota']); 
+		if( $ldap_object['userquota'] == '' ) unset($ldap_object['userquota']);
 		$aclcount = 0;
 		while( $_POST['user_acl_'.$aclcount] ) {
 		  if( !empty( $_POST['user_acl_'.$aclcount] ) ) {
@@ -153,6 +161,7 @@
 		} else {
 		  if (!$errors) {
 			$dn = "cn=".$ldap_object['cn'].",".$sf_root;
+			$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';
@@ -166,6 +175,7 @@
 		$form->entries['action']['value'] = 'save';
 		$form->entries['dn'] = array( 'type' => 'hidden', 'value' => $dn );
 		$form->entries['cn']['attrs'] = 'readonly';
+		$form->entries['homeserver']['attrs'] = 'readonly';
 		$heading = 'Modify Shared Folder';
 		fill_form_for_modify( $form, $ldap_object );
 		$content = $form->outputForm();		
@@ -182,6 +192,7 @@
 		$form->entries['action']['value'] = 'save';
 		$form->entries['dn'] = array( 'type' => 'hidden', 'value' => $dn );
 		$form->entries['cn']['attrs'] = 'readonly';
+		$form->entries['homeserver']['attrs'] = 'readonly';
 		$heading = 'Modify Shared Folder'; 
 		$content = $form->outputForm();
 	  } else {