gunnar: server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist list.php.in, 1.5, 1.6

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	list.php.in 
Log Message:
kolab/issue4516 (Various logic/spelling fixes for the web admin)

Index: list.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/distributionlist/list.php.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- list.php.in	11 Jan 2010 09:30:11 -0000	1.5
+++ list.php.in	23 Aug 2010 17:13:44 -0000	1.6
@@ -76,6 +76,8 @@
   if (is_array($ldap_object['cn'])) $cn = $ldap_object['cn'][0];
   else $cn = $ldap_object['cn'];
   $form->entries['cn']['value'] = $cn;
+  if ($_REQUEST['action'] != "firstsave")
+	$form->entries['cn']['attrs'] = "readonly";
 
   $form->entries['action']['value'] = 'save';
   $m = $ldap_object['member'];
@@ -88,7 +90,8 @@
   debug("internaldn=\"$internaldn\"");
   debug("dn=\"$dn\"");
   debug("substr=\"".substr( $dn, strlen($dn)-strlen( $internaldn ) )."\"");
-  if( substr( $dn, strlen($dn)-strlen( $internaldn ) ) === $internaldn ) {
+  if( substr( $dn, strlen($dn)-strlen( $internaldn ) ) === $internaldn
+		|| preg_match("/cn=internal/",$dn) ) {
 	$form->entries['hidden']['value'] = true;
   } else {
 	$form->entries['hidden']['value'] = false;
@@ -146,10 +149,11 @@
 	$content = $form->outputForm();
 	break;
   case 'firstsave':
-	$form->entries['cn']['validation'] = 'checkuniquemail';
+	$form->entries['cn']['validation'] = array('notempty', 'checkuniquemail');
   case 'save':	
 	if( $form->isSubmitted() ) {
 	  if( !$form->validate() ) {
+		fill_form_for_modify( $form, $ldap_object );
 		$form->setValues();
 		$content = $form->outputForm();
 	  } else {