steffen: server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder index.php, 1.4, 1.5 sf.php, 1.8, 1.9
cvs at intevation.de
cvs at intevation.de
Thu Aug 12 12:55:41 CEST 2004
Author: steffen
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder
In directory doto:/tmp/cvs-serv3739/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder
Modified Files:
index.php sf.php
Log Message:
*BOMB*. Changes to support the new schema
Index: index.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/index.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- index.php 6 Aug 2004 00:01:18 -0000 1.4
+++ index.php 12 Aug 2004 10:55:39 -0000 1.5
@@ -31,7 +31,7 @@
if( !$errors ) {
if (isset($_SESSION['base_dn'])) $base_dn = $_SESSION['base_dn'];
else $base_dn = 'k=kolab';
- $filter = "(&(cn=*)(objectclass=sharedfolder))";
+ $filter = "(&(cn=*)(objectclass=kolabsharedfolder))";
$result = ldap_search($ldap->connection, $base_dn, $filter);
if( $result ) {
$count = ldap_count_entries($ldap->connection, $result);
@@ -43,11 +43,11 @@
$attrs = ldap_get_attributes($ldap->connection, $entry);
$dn = ldap_get_dn($ldap->connection,$entry);
$cn = $attrs['cn'][0];
- $deleted = array_key_exists('deleteflag',$attrs)?$attrs['deleteflag'][0]:"FALSE";
- $homeserver = $attrs['homeServer'][0];
+ $deleted = array_key_exists('kolabdeleteflag',$attrs)?$attrs['kolabdeleteflag'][0]:"FALSE";
+ $kolabhomeserver = $attrs['kolabhomeserver'][0];
$entries[] = array( 'dn' => $dn,
'cn' => $cn,
- 'homeserver' => $homeserver,
+ 'kolabhomeserver' => $kolabhomeserver,
'deleted' => $deleted );
$entry = ldap_next_entry( $ldap->connection,$entry );
}
Index: sf.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/sf.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- sf.php 6 Aug 2004 10:53:29 -0000 1.8
+++ sf.php 12 Aug 2004 10:55:39 -0000 1.9
@@ -29,12 +29,12 @@
else $cn = $ldap_object['cn'];
$form->entries['cn']['value'] = $cn;
- if (is_array($ldap_object['userquota'])) $userquota = $ldap_object['userquota'][0];
- else $userquota = $ldap_object['userquota'];
- $form->entries['userquota']['value'] = $userquota;
+ if (is_array($ldap_object['cyrus-userquota'])) $userquota = $ldap_object['cyrus-userquota'][0];
+ else $userquota = $ldap_object['cyrus-userquota'];
+ $form->entries['cyrus-userquota']['value'] = $userquota;
- if (is_array($ldap_object['homeserver'])) $homeserver = $ldap_object['homeserver'][0];
- $form->entries['homeserver']['value'] = $homeserver;
+ if (is_array($ldap_object['kolabhomeserver'])) $kolabhomeserver = $ldap_object['kolabhomeserver'][0];
+ $form->entries['kolabhomeserver']['value'] = $kolabhomeserver;
$form->entries['action']['value'] = 'save';
//debug("got userquota=$userquota<br/>cn=$cn<br/>");
@@ -69,7 +69,7 @@
// Special users allowed
return "$uid $perm";
}
- $res = $ldap->search( $_SESSION['base_dn'], '(&(uid='.$ldap->escape($uid).')(objectClass=kInetOrgPerson))',
+ $res = $ldap->search( $_SESSION['base_dn'], '(&(uid='.$ldap->escape($uid).')(objectClass=kolabinetorgperson))',
array('dn') );
if( $ldap->count($res) == 1 ) {
// Ok, we have a regular user
@@ -80,7 +80,7 @@
$regs = array();
if( ereg('(.*)@(.*)', $uid, $regs ) ) {
$cn = $regs[1];
- $res = $ldap->search( $_SESSION['base_dn'], '(&(cn='.$ldap->escape($cn).')(objectClass=groupOfNames))',
+ $res = $ldap->search( $_SESSION['base_dn'], '(&(cn='.$ldap->escape($cn).')(objectClass=kolabgroupofnames))',
array('dn') );
if( $ldap->count($res) == 1 ) {
$objects = $ldap->getEntries();
@@ -115,11 +115,11 @@
$entries = array( 'cn' => array( 'name' => _('Folder Name'),
'validation' => 'notempty',
'comment' => _('Required') ),
- 'homeserver' => array( 'name' => _('Folder Location'),
+ 'kolabhomeserver' => array( 'name' => _('Folder Location'),
'validation' => 'notempty',
'comment' => ($action=='create')?_('Required, non volatile'):_('Non volatile'),
- 'value' => $_SESSION['fqhostname'] ),
- 'userquota' => array( 'name' => _('Quota Limit'),
+ 'value' => $_SESSION['fqdnhostname'] ),
+ 'cyrus-userquota' => array( 'name' => _('Quota Limit'),
'comment' => _('KBytes (empty for unlimited)') ),
'acl_0' => array( 'name' => _('Permission for UID/GID'),
'type' => 'aclselect',
@@ -155,10 +155,10 @@
$content = $form->outputForm();
} else {
$sf_root = $_SESSION['base_dn'];
- $ldap_object = array('objectClass' => 'sharedfolder');
+ $ldap_object = array('objectClass' => 'kolabsharedfolder');
$cn = trim($_POST['cn']);
$ldap_object['cn'] = $cn;
- foreach ( array( 'userquota') as $attr) {
+ foreach ( array( 'cyrus-userquota') as $attr) {
$count = 0;
$key = $attr;
$args = array();
@@ -170,7 +170,7 @@
if ($count > 0) $ldap_object[$attr] = $args;
else if (!empty($_POST[$key])) $ldap_object[$attr] = $_POST[$key];
}
- if( $ldap_object['userquota'] == '' ) unset($ldap_object['userquota']);
+ if( $ldap_object['cyrus-userquota'] == '' ) unset($ldap_object['cyrus-userquota']);
$aclcount = 0;
while( $_POST['user_acl_'.$aclcount] ) {
if( !empty( $_POST['user_acl_'.$aclcount] ) ) {
@@ -212,7 +212,7 @@
} else {
if (!$errors) {
$dn = "cn=".$ldap_object['cn'].",".$sf_root;
- $ldap_object['homeserver'] = trim($_POST['homeserver']);
+ $ldap_object['kolabhomeserver'] = trim($_POST['kolabhomeserver']);
if ($dn && !ldap_add($ldap->connection, $dn, $ldap_object))
array_push($errors, _("LDAP Error: could not add object $dn: ")
.ldap_error($ldap->connection));
@@ -227,9 +227,9 @@
$form->entries['action']['value'] = 'save';
$form->entries['dn'] = array( 'type' => 'hidden', 'value' => $dn );
$form->entries['cn']['attrs'] = 'readonly';
- $form->entries['homeserver']['attrs'] = 'readonly';
+ $form->entries['kolabhomeserver']['attrs'] = 'readonly';
$heading = _('Modify Shared Folder');
- $result = $ldap->search( $dn, '(objectClass=sharedfolder)' );
+ $result = $ldap->search( $dn, '(objectClass=kolabsharedfolder)' );
if( $result ) {
$ldap_object = ldap_get_entries( $ldap->connection, $result );
if( $ldap_object['count'] == 1 ) {
@@ -243,7 +243,7 @@
}
break;
case 'modify':
- $result = $ldap->search( $dn, '(objectClass=sharedfolder)' );
+ $result = $ldap->search( $dn, '(objectClass=kolabsharedfolder)' );
if( $result ) {
$ldap_object = ldap_get_entries( $ldap->connection, $result );
if( $ldap_object['count'] == 1 ) {
@@ -251,7 +251,7 @@
$form->entries['action']['value'] = 'save';
$form->entries['dn'] = array( 'type' => 'hidden', 'value' => $dn );
$form->entries['cn']['attrs'] = 'readonly';
- $form->entries['homeserver']['attrs'] = 'readonly';
+ $form->entries['kolabhomeserver']['attrs'] = 'readonly';
$heading = _('Modify Shared Folder');
$content = $form->outputForm();
} else {
@@ -260,7 +260,7 @@
}
break;
case 'delete':
- $result = $ldap->search( $dn, '(objectClass=sharedfolder)' );
+ $result = $ldap->search( $dn, '(objectClass=kolabsharedfolder)' );
if( $result ) {
$ldap_object = ldap_get_entries( $ldap->connection, $result );
if( $ldap_object['count'] == 1 ) {
More information about the commits
mailing list