steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user user.php, 1.35, 1.36
cvs at intevation.de
cvs at intevation.de
Wed Sep 29 00:46:24 CEST 2004
Author: steffen
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv16428/kolab-webadmin/kolab-webadmin/www/admin/user
Modified Files:
user.php
Log Message:
renamed kolabResourceAction to kolabInvitationPolicy
Index: user.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- user.php 28 Sep 2004 20:38:19 -0000 1.35
+++ user.php 28 Sep 2004 22:46:22 -0000 1.36
@@ -178,8 +178,8 @@
} else {
// group or resource
$policies = array();
- for( $i = 0; $i < $ldap_object['kolabResourceAction']['count']; $i++ ) {
- $resact = $ldap_object['kolabResourceAction'][$i];
+ for( $i = 0; $i < $ldap_object['kolabInvitationPolicy']['count']; $i++ ) {
+ $resact = $ldap_object['kolabInvitationPolicy'][$i];
debug("resact=$resact");
if( ereg( '(.*):(.*)', trim($resact), $regs ) ) {
$user = trim($regs[1]);
@@ -455,7 +455,7 @@
{
// Handle group/resource policies
$i = 0;
- $ldap_object['kolabResourceAction'] = array();
+ $ldap_object['kolabInvitationPolicy'] = array();
while( isset( $_POST['user_resourceaction_'.$i] ) ) {
$user = $_POST['user_resourceaction_'.$i];
$pol = (int)$_POST['policy_resourceaction_'.$i];
@@ -464,7 +464,7 @@
if( !empty($user) && 0 <= $pol && $pol < 5 ) {
$ra = array('ACT_ALWAYS_ACCEPT', 'ACT_ALWAYS_REJECT', 'ACT_REJECT_IF_CONFLICTS', 'ACT_MANUAL_IF_CONFLICTS', 'ACT_MANUAL' );
if( $ra[$pol] ) {
- $ldap_object['kolabResourceAction'][] = ($user=='anyone'?"":"$user:").$ra[$pol];
+ $ldap_object['kolabInvitationPolicy'][] = ($user=='anyone'?"":"$user:").$ra[$pol];
}
}
}
More information about the commits
mailing list