steffen: server/kolab-webadmin/kolab-webadmin/www/admin/user index.php, 1.4, 1.5 user.php, 1.23, 1.24
cvs at intevation.de
cvs at intevation.de
Thu Aug 12 12:55:42 CEST 2004
Author: steffen
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user
In directory doto:/tmp/cvs-serv3739/kolab-webadmin/kolab-webadmin/www/admin/user
Modified Files:
index.php user.php
Log Message:
*BOMB*. Changes to support the new schema
Index: index.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/index.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- index.php 5 Aug 2004 15:07:39 -0000 1.4
+++ index.php 12 Aug 2004 10:55:39 -0000 1.5
@@ -62,7 +62,7 @@
}
}
$filter = "(&($userfilter)(objectclass=inetOrgPerson)(uid=*)(mail=*)(sn=*))";
- $result = ldap_search($ldap->connection, $base_dn, $filter, array( 'uid', 'mail', 'sn', 'cn', 'deleteflag' ));
+ $result = ldap_search($ldap->connection, $base_dn, $filter, array( 'uid', 'mail', 'sn', 'cn', 'kolabdeleteflag' ));
if( $result ) {
$count = ldap_count_entries($ldap->connection, $result);
@@ -85,7 +85,7 @@
while( $entry ) {
$attrs = ldap_get_attributes($ldap->connection, $entry);
$dn = ldap_get_dn($ldap->connection,$entry);
- $deleted = array_key_exists('deleteflag',$attrs)?$attrs['deleteflag'][0]:"FALSE";
+ $deleted = array_key_exists('kolabdeleteflag',$attrs)?$attrs['kolabdeleteflag'][0]:"FALSE";
$uid = $attrs['uid'][0];
$mail = $attrs['mail'][0];
$sn = $attrs['sn'][0];
Index: user.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/user/user.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- user.php 12 Aug 2004 02:20:05 -0000 1.23
+++ user.php 12 Aug 2004 10:55:39 -0000 1.24
@@ -89,8 +89,6 @@
}
return $str;
}
-+
-+
function checkdelegate( $form, $key, $value ) {
global $ldap;
@@ -188,31 +186,31 @@
else $v = $ldap_object[$attr];
$form->entries['alias']['value'] = $v;
- // delegate
- if (is_array($ldap_object['delegate'])) {
- $arr = $ldap_object['delegate'];
+ // kolabdelegate
+ if (is_array($ldap_object['kolabdelegate'])) {
+ $arr = $ldap_object['kolabdelegate'];
unset( $arr['count'] );
$v = join("\n", $arr );
}
else $v = $ldap_object[$attr];
- $form->entries['delegate']['value'] = $v;
+ $form->entries['kolabdelegate']['value'] = $v;
- // homeServer
- if( is_array($ldap_object['homeServer']) ) {
- $form->entries['homeserver']['value'] = $ldap_object['homeServer'][0];
+ // kolabhomeserver
+ if( is_array($ldap_object['kolabhomeserver']) ) {
+ $form->entries['kolabhomeserver']['value'] = $ldap_object['kolabhomeserver'][0];
}
- $form->entries['homeserver']['attrs'] = 'readonly';
+ $form->entries['kolabhomeserver']['attrs'] = 'readonly';
$form->entries['action']['value'] = 'save';
// userquota
- if( isset( $form->entries['userquota'] ) ) {
- if (is_array($ldap_object['userquota'])) $userquota = $ldap_object['userquota'][0];
- else $userquota = $ldap_object['userquota'];
+ if( isset( $form->entries['cyrus-userquota'] ) ) {
+ if (is_array($ldap_object['cyrus-userquota'])) $userquota = $ldap_object['cyrus-userquota'][0];
+ else $userquota = $ldap_object['cyrus-userquota'];
if( $userquota > 0 ) {
- $form->entries['userquota']['value'] = $userquota;
+ $form->entries['cyrus-userquota']['value'] = $userquota;
} else {
- $form->entries['userquota']['value'] = '';
+ $form->entries['cyrus-userquota']['value'] = '';
}
}
}
@@ -254,11 +252,11 @@
if ($action == "create") {
$comment_mail_0 = _('Required, non volatile');
$comment_password = _('Required');
- $comment_homeserver = _('Required, non volatile');
+ $comment_kolabhomeserver = _('Required, non volatile');
} else {
$comment_mail_0 = _('Non volatile');
$comment_password = _('Leave blank to keep password unchanged');
- $comment_homeserver = _('Non volatile');
+ $comment_kolabhomeserver = _('Non volatile');
}
$entries = array( 'firstname' => array( 'name' => _('First Name'),
@@ -281,10 +279,10 @@
'uid' => array( 'name' => _('Unique Identity (UID)'),
'validation' => 'checkuid',
'comment' => _('Optional - Defaults to Primary Email Address') ),
- 'homeserver' => array( 'name' => _('Mailbox Home Server'),
+ 'kolabhomeserver' => array( 'name' => _('Mailbox Home Server'),
'validation' => 'notempty',
- 'comment' => $comment_homeserver,
- 'value' => $_SESSION['fqhostname'] ),
+ 'comment' => $comment_kolabhomeserver,
+ 'value' => $_SESSION['fqdnhostname'] ),
'accttype' => array( 'name' => _('Account Type'),
'type' => 'select',
'options' => array( _('User Account'), _('Group Account'), _('Resource Account') ),
@@ -294,9 +292,9 @@
'type' => 'textarea',
'validation' => 'checkuniquealias',
'comment' => _('One address per line') );
-$entries['delegate'] =array( 'name' => _('Delegates'),
+$entries['kolabdelegate'] =array( 'name' => _('kolabdelegates'),
'type' => 'textarea',
- 'validation' => 'checkdelegate',
+ 'validation' => 'checkkolabdelegate',
'comment' => _('One UID per line') );
$entries['o_0'] = array( 'name' => _('Organisation') );
$entries['ou_0'] = array( 'name' => _('Organisational Unit') );
@@ -313,11 +311,11 @@
'value' => true,
'comment' => _('Check here to make this users address <br> visible in the address book'));
if( $auth->group() == "admin" || $auth->group() == "maintainer" ) {
- $entries['userquota'] = array( 'name' => _('User Quota in KB'),
+ $entries['cyrus-userquota'] = array( 'name' => _('User Quota in KB'),
'comment' => _('Leave blank for unlimited') );
} else {
$entries['alias']['attrs'] = 'readonly';
- $entries['homeserver']['attrs'] = 'readonly';
+ $entries['kolabhomeserver']['attrs'] = 'readonly';
$entries['accttype']['attrs'] = 'readonly';
$entries['uid']['attrs'] = 'readonly';
}
@@ -344,7 +342,7 @@
$content = $form->outputForm();
} else {
$ldap_object = array();
- $ldap_object['objectClass'] = 'kInetOrgPerson';
+ $ldap_object['objectClass'] = array('inetorgperson','kolabinetorgperson');
$ldap_object['sn'] = trim($_POST['lastname']);
$ldap_object['cn'] = trim($_POST['firstname']).' '.$ldap_object['sn'];
$ldap_object['givenName'] = trim($_POST['firstname']);
@@ -367,7 +365,7 @@
$sslerr .= $msg.' ';
$errors[] = $sslerr;
} else {
- $ldap_object['encryptedPassword'] = base64_encode( $encpw );
+ $ldap_object['kolabencryptedpassword'] = base64_encode( $encpw );
}
openssl_free_key( $pkey );
}
@@ -377,7 +375,7 @@
$ldap_object['uid'] = trim( strtolower( $_POST['uid'] ) );
if( $action == 'firstsave' ) {
if ($ldap_object['uid'] == "") $ldap_object['uid'] = $ldap_object['mail'];
- $ldap_object['homeServer'] = trim($_POST['homeserver']);
+ $ldap_object['kolabhomeserver'] = trim($_POST['kolabhomeserver']);
}
foreach( array( 'title', 'o', 'ou', 'roomNumber', 'street', 'postOfficeBox',
'postalCode', 'l', 'c', 'telephoneNumber',
@@ -397,10 +395,10 @@
$dn_add = "";
- // delegate
- $ldap_object['delegate'] = array_unique( array_filter( array_map( 'trim',
- preg_split( '/\n/', $_POST['delegate'] ) ), 'strlen') );
- if( !$ldap_object['delegate'] && $action == 'firstsave' ) unset($ldap_object['delegate']);
+ // kolabdelegate
+ $ldap_object['kolabdelegate'] = array_unique( array_filter( array_map( 'trim',
+ preg_split( '/\n/', $_POST['kolabdelegate'] ) ), 'strlen') );
+ if( !$ldap_object['kolabdelegate'] && $action == 'firstsave' ) unset($ldap_object['kolabdelegate']);
if ($auth->group() == "maintainer" || $auth->group() == "admin") {
@@ -414,10 +412,10 @@
else $visible = false;
// userquota
- if( isset( $_POST['userquota'] ) ) {
- $ldap_object['userquota'] = trim($_POST['userquota']);
- if( empty( $ldap_object['userquota'] ) ) {
- $ldap_object['userquota'] = array();
+ if( isset( $_POST['cyrus-userquota'] ) ) {
+ $ldap_object['cyrus-userquota'] = trim($_POST['cyrus-userquota']);
+ if( empty( $ldap_object['cyrus-userquota'] ) ) {
+ $ldap_object['cyrus-userquota'] = array();
}
}
if (!$visible) $dn_add = ",cn=internal";
@@ -489,7 +487,7 @@
if( !$errors ) $messages[] = _("User '$dn' successfully modified");
$form->setValues();
$form->entries['mail_0']['attrs'] = 'readonly';
- $form->entries['homeserver']['attrs'] = 'readonly';
+ $form->entries['kolabhomeserver']['attrs'] = 'readonly';
$form->entries['action']['value'] = 'save';
$form->entries['dn'] = array( 'name' => 'dn',
'type' => 'hidden',
More information about the commits
mailing list