steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php, 1.46, 1.47

cvs at intevation.de cvs at intevation.de
Sun Dec 5 10:17:24 CET 2004


Author: steffen

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

Modified Files:
	user.php 
Log Message:
Fix for Issue561 (webadmin shows misleading invitation policy for missing kolabInvitationPolicy attributes)

Index: user.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- user.php	30 Nov 2004 01:30:40 -0000	1.46
+++ user.php	5 Dec 2004 09:17:22 -0000	1.47
@@ -203,13 +203,14 @@
 	}
 	if( $form->entries['accttype']['value'] == 1 ) {
 	  // default for groups
-	  $pol = policy2number( $pol, 3 );
+	  $pol = policy2number( $pol, 3 /*ACT_MANUAL_IF_CONFLICTS*/ );
 	} else {
 	  // default for resources
-	  $pol = policy2number( $pol, 2 );
+	  $pol = policy2number( $pol, 2 /*ACT_REJECT_IF_CONFLICTS*/ );
 	}
 	$policies[$user] = $pol;
   }
+  if( !isset( $policies['anyone'] ) ) $policies['anyone'] = 4 /*ACT_MANUAL*/;
   $form->entries['resourceaction']['policies'] = $policies;  
 
   foreach( array( 'title', 'o', 'ou', 'roomNumber', 'street', 





More information about the commits mailing list