steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php, 1.28, 1.29

cvs at intevation.de cvs at intevation.de
Thu Sep 9 03:09:15 CEST 2004


Author: steffen

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

Modified Files:
	user.php 
Log Message:
"kolab group/resource action" editable

Index: user.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- user.php	4 Sep 2004 11:29:25 -0000	1.28
+++ user.php	9 Sep 2004 01:09:13 -0000	1.29
@@ -156,6 +156,39 @@
   }
   $form->entries['accttype']['attrs'] = 'readonly';
 
+  // resourceaction
+  if( $form->entries['accttype']['value'] == 0 ) {
+	// regular user
+	unset($form->entries['resourceaction']);
+  } else {
+	// group or resource
+	switch ($ldap_object['kolabResourceAction'][0]) {
+    case 'ACT_ALWAYS_ACCEPT':
+	  $form->entries['resourceaction']['value'] = 0;
+	  break;
+    case 'ACT_ALWAYS_REJECT':
+	  $form->entries['resourceaction']['value'] = 1;
+	  break;
+    case 'ACT_REJECT_IF_CONFLICTS':
+	  $form->entries['resourceaction']['value'] = 2;
+	  break;
+    case 'ACT_MANUAL_IF_CONFLICTS':
+	  $form->entries['resourceaction']['value'] = 3;
+	  break;
+    case 'ACT_MANUAL':
+	  $form->entries['resourceaction']['value'] = 4;
+	  break;
+    default:
+	  if( $form->entries['accttype']['value'] == 1 ) {
+		// default for groups
+		$form->entries['resourceaAction']['value'] = 3;
+	  } else {
+		// default for resources
+		$form->entries['resourceaAction']['value'] = 2;		
+	  }
+    }
+  }
+
   // visible
   $internaldn = 'cn=internal,'.domain_dn();
   debug("<br/>internaldn=$internaldn");
@@ -285,6 +318,15 @@
 								 'type' => 'select',
 								 'options' => array( _('User Account'), _('Group Account'), _('Resource Account') ),
 								 'value'   => 0 ),
+		  'resourceaction' => array( 'name' => _('Resource/Group Action'),
+									 'type' => 'select',
+									 'options' => array( _('Always accept'), 
+														 _('Always reject'), 
+														 _('Reject if conflicts'), 
+														 _('Manual if conflicts'),
+														 _('Manual') ),
+									 'value' => 2,
+									 'comment' => _('Only applies to group and resource accounts') ),														 
 		  'title_0' => array( 'name' => _('Title') ) );
 $entries['alias'] = array( 'name' => _('Email Aliases'), 
 						   'type' => 'textarea',
@@ -390,6 +432,12 @@
 		 elseif (!empty($_POST[$key])) $ldap_object[$attr] = $_POST[$key];  
 		 else $ldap_object[$attr] = array();
        }
+	   if( !empty($_POST['resourceaction'] ) ) {
+		 $ra = array('ACT_ALWAYS_ACCEPT', 'ACT_ALWAYS_REJECT', 'ACT_REJECT_IF_CONFLICTS', 'ACT_MANUAL_IF_CONFLICTS', 'ACT_MANUAL' );
+		 if( $ra[0+$_POST['resourceaction']] ) {
+		   $ldap_object['kolabResourceAction'] = $ra[0+$_POST['resourceaction']];
+		 }
+	   }
 
 	   $dn_add = "";
 





More information about the commits mailing list