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

[cvs at intevation.de]

Author: martin

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

Modified Files:
	index.php.in sf.php.in 
Log Message:
Martin Konold: Commited patch from Tobias König in order to support setting of foldertype for public folders.


Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/index.php.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- index.php.in	5 Feb 2006 20:13:55 -0000	1.1
+++ index.php.in	21 Apr 2006 10:41:38 -0000	1.2
@@ -59,10 +59,16 @@
 	  $cn = $attrs['cn'][0];
 	  $deleted = array_key_exists('kolabDeleteflag',$attrs)?$attrs['kolabDeleteflag'][0]:"FALSE";
 	  $kolabhomeserver = $attrs['kolabHomeServer'][0];
+	  
+          $folderTypeMap = array ( '' => _('None'), 'mail' => _('Mails'), 'task' => _('Tasks'), 'journal' => _('Journals'),
+		                   'event' => _('Events'), 'contact' => _('Contacts'), 'note' => _('Notes'));
+	  $folderType = $folderTypeMap[$attrs['folderType'][0]];
+
 	  $entries[] = array( 'dn' => $dn,
 						  'cn' => $cn,
 						  'kolabhomeserver' => $kolabhomeserver,
-						  'deleted' => $deleted );
+			    			  'deleted' => $deleted,
+						  'foldertype' => $folderType );
 	  $entry = ldap_next_entry( $ldap->connection,$entry );
 	}
   }

Index: sf.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/sf.php.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sf.php.in	9 Mar 2006 21:27:22 -0000	1.2
+++ sf.php.in	21 Apr 2006 10:41:38 -0000	1.3
@@ -39,6 +39,11 @@
   if (is_array($ldap_object['kolabHomeServer'])) $kolabhomeserver = $ldap_object['kolabHomeServer'][0];
   $form->entries['kolabhomeserver']['value'] = $kolabhomeserver;
 
+  if (is_array($ldap_object['folderType']))
+	$form->entries['foldertype']['value'] = $ldap_object['folderType'][0];
+  else
+  	$form->entries['foldertype']['value'] = '';
+
   $form->entries['action']['value'] = 'save';
   //debug("got userquota=$userquota<br/>cn=$cn<br/>");
   $aclcount = 0;
@@ -125,6 +130,10 @@
 										 'validation' => 'notempty',
 										 'comment' => ($action=='create')?_('Required, non volatile'):_('Non volatile'),
 										 'value' => $_SESSION['fqdnhostname'] ),
+				  'foldertype' => array( 'name' => _('Folder Type'),
+							 'type' => 'foldertypeselect',
+							 'value' => '' ),
+
 				  'cyrus-userquota' => array( 'name' => _('Quota Limit'),
 										'comment' => _('MBytes (empty for unlimited)') ),
 				  'acl_0' => array( 'name' => _('Permission for UID/GID'),
@@ -178,6 +187,10 @@
 		$cn = str_replace( utf8_decode('ß'), 'ss', $cn );
 		debug("cn=$cn");
 		$ldap_object['cn'] = utf8_encode($cn);
+
+		if (!empty($_POST['foldertype']))
+		  $ldap_object['folderType'] = $_POST['foldertype'];
+
 		foreach ( array( 'cyrus-userquota') as $attr) {
 		  $count = 0;
 		  $key = $attr;
@@ -264,7 +277,11 @@
 	  $form->entries['action']['value'] = 'save';
 	  $form->entries['dn'] = array( 'type' => 'hidden', 'value' => $dn );
 	  $form->entries['cn']['attrs'] = 'readonly';
+	  $form->entries['cn']['comment'] = '';
 	  $form->entries['kolabhomeserver']['attrs'] = 'readonly';
+	  $form->entries['kolabhomeserver']['comment'] = '';
+          $form->entries['foldertype']['attrs'] = 'readonly';
+          $form->entries['foldertype']['comment'] = '';
 	  $heading = _('Modify Shared Folder');
 	  $content = $form->outputForm();
 	} else {
@@ -278,6 +295,7 @@
 	  $form->entries['action']['value'] = 'kill';
 	  foreach( $form->entries as $key => $val ) {
 		$form->entries[$key]['attrs'] = 'readonly';
+		$form->entries[$key]['comment'] = '';
 	  }
 	  $form->submittext = _('Delete');
 	  $heading = _('Delete Shared Folder');