gunnar: server/php-kolab/Kolab_Webadmin/Webadmin address.class.php, 1.1, 1.2 administrator.class.php, 1.1, 1.2 domainmaintainer.class.php, 1.2, 1.3 group.class.php, 1.2, 1.3 maintainer.class.php, 1.1, 1.2 sharedfolder.class.php, 1.2, 1.3 user.class.php, 1.4, 1.5 webadmin.class.php, 1.6, 1.7
cvs at kolab.org
cvs at kolab.org
Wed Aug 22 08:53:20 CEST 2007
Author: gunnar
Update of /kolabrepository/server/php-kolab/Kolab_Webadmin/Webadmin
In directory doto:/tmp/cvs-serv1320/Kolab_Webadmin/Webadmin
Modified Files:
address.class.php administrator.class.php
domainmaintainer.class.php group.class.php
maintainer.class.php sharedfolder.class.php user.class.php
webadmin.class.php
Log Message:
Fix some whitespace and a set of syntaxc errors.
Index: address.class.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Webadmin/Webadmin/address.class.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- address.class.php 22 Aug 2007 06:33:55 -0000 1.1
+++ address.class.php 22 Aug 2007 06:53:18 -0000 1.2
@@ -57,21 +57,21 @@
*/
function getAddresses($ldap, $base_dn, $addfilter = '', $perpage = 50, $page = 1)
{
- $filter = "(&$addfilter(objectclass=inetOrgPerson)(!(uid=*))(sn=*))";
- $result = $ldap->getPagedResult($base_dn, $filter,
- array( 'mail', 'sn', 'cn',
- 'kolabDeleteflag' )
- 'sn', $perpage, $page);
+ $filter = "(&$addfilter(objectclass=inetOrgPerson)(!(uid=*))(sn=*))";
+ $result = $ldap->getPagedResult($base_dn, $filter,
+ array( 'mail', 'sn', 'cn',
+ 'kolabDeleteflag' ),
+ 'sn', $perpage, $page);
- $entries = array();
- foreach($result as $attrs) {
- $deleted = array_key_exists('kolabDeleteflag', $attrs)?$attrs['kolabDeleteflag'][0]:'FALSE';
- $fn = $this->_ldap->getFirstName($attrs['sn'][0], $attrs['cn'][0]);
- $entries[] = array( 'dn' => $attrs['dn'][0],
- 'sn' => $attrs['sn'][0],
- 'fn' => $fn,
- 'mail' => $attrs['mail'][0],
- 'deleted' => $deleted );
+ $entries = array();
+ foreach($result as $attrs) {
+ $deleted = array_key_exists('kolabDeleteflag', $attrs)?$attrs['kolabDeleteflag'][0]:'FALSE';
+ $fn = $this->_ldap->getFirstName($attrs['sn'][0], $attrs['cn'][0]);
+ $entries[] = array( 'dn' => $attrs['dn'][0],
+ 'sn' => $attrs['sn'][0],
+ 'fn' => $fn,
+ 'mail' => $attrs['mail'][0],
+ 'deleted' => $deleted );
}
return $entries;
}
Index: administrator.class.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Webadmin/Webadmin/administrator.class.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- administrator.class.php 22 Aug 2007 06:33:55 -0000 1.1
+++ administrator.class.php 22 Aug 2007 06:53:18 -0000 1.2
@@ -57,22 +57,22 @@
*/
function getAdministrators($ldap, $base_dn, $addfilter = '', $perpage = 50, $page = 1)
{
- $filter = "(&$addfilter(cn=*)(objectclass=inetOrgPerson)(uid=*)(sn=*))";
- $result = $ldap->getPagedResult($base_dn, $filter,
- array('uid', 'sn',
- 'cn', 'kolabDeleteflag'),
- 'sn', $perpage, $page);
+ $filter = "(&$addfilter(cn=*)(objectclass=inetOrgPerson)(uid=*)(sn=*))";
+ $result = $ldap->getPagedResult($base_dn, $filter,
+ array('uid', 'sn',
+ 'cn', 'kolabDeleteflag'),
+ 'sn', $perpage, $page);
- $entries = array();
- foreach($result as $attrs) {
- $deleted = array_key_exists('kolabDeleteflag', $attrs)?$attrs['kolabDeleteflag'][0]:'FALSE';
- $fn = $this->_ldap->getFirstName($attrs['sn'][0], $attrs['cn'][0]);
- $entries[] = array( 'dn' => $attrs['dn'][0],
- 'sn' => $attrs['sn'][0],
- 'fn' => $fn,
- 'uid' => $attrs['uid'][0],
- 'deleted' => $deleted );
- }
+ $entries = array();
+ foreach($result as $attrs) {
+ $deleted = array_key_exists('kolabDeleteflag', $attrs)?$attrs['kolabDeleteflag'][0]:'FALSE';
+ $fn = $this->_ldap->getFirstName($attrs['sn'][0], $attrs['cn'][0]);
+ $entries[] = array( 'dn' => $attrs['dn'][0],
+ 'sn' => $attrs['sn'][0],
+ 'fn' => $fn,
+ 'uid' => $attrs['uid'][0],
+ 'deleted' => $deleted );
+ }
return $entries;
}
Index: domainmaintainer.class.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Webadmin/Webadmin/domainmaintainer.class.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- domainmaintainer.class.php 22 Aug 2007 06:33:55 -0000 1.2
+++ domainmaintainer.class.php 22 Aug 2007 06:53:18 -0000 1.3
@@ -1,3 +1,4 @@
+<?php
/*
* COPYRIGHT
* ---------
@@ -69,25 +70,25 @@
*/
function getDomainMaintainers($ldap, $base_dn, $addfilter = '', $perpage = 50, $page = 1)
{
- $filter = "(&$addfilter(cn=*)(objectclass=kolabInetOrgPerson)(!(uid=manager))(sn=*))";
- $result = $ldap->getPagedResult($base_dn, $filter,
- array( 'uid', 'sn', 'cn',
- 'kolabDeleteflag' )
- 'sn', $perpage, $page);
+ $filter = "(&$addfilter(cn=*)(objectclass=kolabInetOrgPerson)(!(uid=manager))(sn=*))";
+ $result = $ldap->getPagedResult($base_dn, $filter,
+ array( 'uid', 'sn', 'cn',
+ 'kolabDeleteflag' ),
+ 'sn', $perpage, $page);
- $entries = array();
- foreach($result as $attrs) {
- $deleted = array_key_exists('kolabDeleteflag', $attrs)?$attrs['kolabDeleteflag'][0]:'FALSE';
- $fn = $this->_ldap->getFirstName($attrs['sn'][0], $attrs['cn'][0]);
- $dn = $attrs['dn'][0];
- $dm =& new KolabDomainMaintainer($ldap, $dn);
- $domains = join(' ', $dm->domains());
- $entries[] = array( 'dn' => $dn,
- 'sn' => $attrs['sn'][0],
- 'fn' => $fn,
- 'uid' => $attrs['uid'][0],
- 'domains' => $domains,
- 'deleted' => $deleted );
+ $entries = array();
+ foreach($result as $attrs) {
+ $deleted = array_key_exists('kolabDeleteflag', $attrs)?$attrs['kolabDeleteflag'][0]:'FALSE';
+ $fn = $this->_ldap->getFirstName($attrs['sn'][0], $attrs['cn'][0]);
+ $dn = $attrs['dn'][0];
+ $dm =& new KolabDomainMaintainer($ldap, $dn);
+ $domains = join(' ', $dm->domains());
+ $entries[] = array( 'dn' => $dn,
+ 'sn' => $attrs['sn'][0],
+ 'fn' => $fn,
+ 'uid' => $attrs['uid'][0],
+ 'domains' => $domains,
+ 'deleted' => $deleted );
}
return $entries;
}
Index: group.class.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Webadmin/Webadmin/group.class.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- group.class.php 22 Aug 2007 06:33:55 -0000 1.2
+++ group.class.php 22 Aug 2007 06:53:18 -0000 1.3
@@ -56,21 +56,21 @@
*/
function getGroups($ldap, $base_dn, $addfilter = '', $perpage = 50, $page = 1)
{
- $filter = "(&$addfilter(!(cn=domains))(objectclass=kolabGroupOfNames)";
- $result = $ldap->getPagedResult($base_dn, $filter,
- array( 'mail', 'cn',
- 'kolabDeleteflag' )
- 'cn', $perpage, $page);
+ $filter = "(&$addfilter(!(cn=domains))(objectclass=kolabGroupOfNames)";
+ $result = $ldap->getPagedResult($base_dn, $filter,
+ array( 'mail', 'cn',
+ 'kolabDeleteflag' ),
+ 'cn', $perpage, $page);
- $entries = array();
- foreach($result as $attrs) {
- $deleted = array_key_exists('kolabDeleteflag', $attrs)?$attrs['kolabDeleteflag'][0]:'FALSE';
- $internal = (strpos($attrs['dn'][0], 'cn=internal') !== false);
- $entries[] = array( 'dn' => $attrs['dn'][0],
- 'cn' => $attrs['cn'][0],
- 'internal' => $internal,
- 'mail' => $attrs['mail'][0],
- 'deleted' => $deleted );
+ $entries = array();
+ foreach($result as $attrs) {
+ $deleted = array_key_exists('kolabDeleteflag', $attrs)?$attrs['kolabDeleteflag'][0]:'FALSE';
+ $internal = (strpos($attrs['dn'][0], 'cn=internal') !== false);
+ $entries[] = array( 'dn' => $attrs['dn'][0],
+ 'cn' => $attrs['cn'][0],
+ 'internal' => $internal,
+ 'mail' => $attrs['mail'][0],
+ 'deleted' => $deleted );
}
return $entries;
}
Index: maintainer.class.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Webadmin/Webadmin/maintainer.class.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- maintainer.class.php 22 Aug 2007 06:33:55 -0000 1.1
+++ maintainer.class.php 22 Aug 2007 06:53:18 -0000 1.2
@@ -57,22 +57,22 @@
*/
function getMaintainers($ldap, $base_dn, $addfilter = '', $perpage = 50, $page = 1)
{
- $filter = "(&$addfilter(cn=*)(objectclass=inetOrgPerson)(!(uid=manager))(sn=*))";
- $result = $ldap->getPagedResult($base_dn, $filter,
- array('uid', 'sn',
- 'cn', 'kolabDeleteflag'),
- 'sn', $perpage, $page);
+ $filter = "(&$addfilter(cn=*)(objectclass=inetOrgPerson)(!(uid=manager))(sn=*))";
+ $result = $ldap->getPagedResult($base_dn, $filter,
+ array('uid', 'sn',
+ 'cn', 'kolabDeleteflag'),
+ 'sn', $perpage, $page);
- $entries = array();
- foreach($result as $attrs) {
- $deleted = array_key_exists('kolabDeleteflag', $attrs)?$attrs['kolabDeleteflag'][0]:'FALSE';
- $fn = $this->_ldap->getFirstName($attrs['sn'][0], $attrs['cn'][0]);
- $entries[] = array( 'dn' => $attrs['dn'][0],
- 'sn' => $attrs['sn'][0],
- 'fn' => $fn,
- 'uid' => $attrs['uid'][0],
- 'deleted' => $deleted );
- }
+ $entries = array();
+ foreach($result as $attrs) {
+ $deleted = array_key_exists('kolabDeleteflag', $attrs)?$attrs['kolabDeleteflag'][0]:'FALSE';
+ $fn = $this->_ldap->getFirstName($attrs['sn'][0], $attrs['cn'][0]);
+ $entries[] = array( 'dn' => $attrs['dn'][0],
+ 'sn' => $attrs['sn'][0],
+ 'fn' => $fn,
+ 'uid' => $attrs['uid'][0],
+ 'deleted' => $deleted );
+ }
return $entries;
}
Index: sharedfolder.class.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Webadmin/Webadmin/sharedfolder.class.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sharedfolder.class.php 22 Aug 2007 06:33:55 -0000 1.2
+++ sharedfolder.class.php 22 Aug 2007 06:53:18 -0000 1.3
@@ -45,19 +45,6 @@
class KolabSharedFolder {
/**
- * The list of possible folder types
- *
- * @var array
- */
- var $type_map = array('' => _('Unspecified'),
- 'mail' => _('Mails'),
- 'task' => _('Tasks'),
- 'journal' => _('Journals'),
- 'event' => _('Events'),
- 'contact' => _('Contacts'),
- 'note' => _('Notes'));
-
- /**
* Return a list of all shared folders
*
* @param KolabLDAP $ldap The connection to the Kolab LDAP filter.
@@ -71,21 +58,28 @@
function getSharedFolderss($ldap, $base_dn, $addfilter = '', $perpage = 50, $page = 1)
{
$filter = "(&$addfilter(objectclass=kolabSharedFolder))";
- $result = $ldap->getPagedResult($base_dn, $filter,
- array('cn', 'kolabDeleteflag',
+ $result = $ldap->getPagedResult($base_dn, $filter,
+ array('cn', 'kolabDeleteflag',
'kolabFolderType'),
- 'cn', $perpage, $page);
+ 'cn', $perpage, $page);
+
+ $type_map = array('' => _('Unspecified'),
+ 'mail' => _('Mails'),
+ 'task' => _('Tasks'),
+ 'journal' => _('Journals'),
+ 'event' => _('Events'),
+ 'contact' => _('Contacts'),
+ 'note' => _('Notes'));
- $entries = array();
- foreach($result as $attrs) {
- $deleted = array_key_exists('kolabDeleteflag', $attrs)?$attrs['kolabDeleteflag'][0]:'FALSE';
- $fn = $this->_ldap->getFirstName($attrs['sn'][0], $attrs['cn'][0]);
- $folderType = KolabSharedFolder::type_map[$attrs['kolabFolderType'][0]];
- $entries[] = array( 'dn' => $attrs['dn'][0],
- 'cn' => $attrs['cn'][0],
- 'foldertype' => $folderType,
- 'deleted' => $deleted );
- }
+ $entries = array();
+ foreach($result as $attrs) {
+ $deleted = array_key_exists('kolabDeleteflag', $attrs)?$attrs['kolabDeleteflag'][0]:'FALSE';
+ $fn = $this->_ldap->getFirstName($attrs['sn'][0], $attrs['cn'][0]);
+ $entries[] = array( 'dn' => $attrs['dn'][0],
+ 'cn' => $attrs['cn'][0],
+ 'foldertype' => $type_map[$attrs['kolabFolderType'][0]],
+ 'deleted' => $deleted );
+ }
return $entries;
}
Index: user.class.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Webadmin/Webadmin/user.class.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- user.class.php 22 Aug 2007 06:33:55 -0000 1.4
+++ user.class.php 22 Aug 2007 06:53:18 -0000 1.5
@@ -118,35 +118,35 @@
$filter = "(&$addfilter(objectclass=kolabInetOrgPerson)(uid=*)(mail=*)(sn=*))";
$result = $ldap->search($base_dn, $filter,
- array( 'uid', 'mail', 'sn', 'cn',
- 'kolabDeleteflag' ));
+ array( 'uid', 'mail', 'sn', 'cn',
+ 'kolabDeleteflag' ));
if( $result ) {
$this->_ldap->sort($result, 'sn');
- $ldap_entries = getEntrySection($result, $perpage, $page);
+ $ldap_entries = getEntrySection($result, $perpage, $page);
- $entries = array();
+ $entries = array();
foreach($ldap_entries as $attrs) {
$dn = $attrs['dn'][0];;
// skip admins and maintainers
if(!array_key_exists($dn, $privmembers)) {
- $dncomp = split(',', $dn);
- if( in_array('cn=groups',$dncomp) ) {
- $type = 'G';
- } else if(in_array('cn=resources',$dncomp)) {
- $type = 'R';
- } else if(in_array('cn=internal',$dncomp)) {
- $type = 'I';
- } else {
- $type = 'U';
- }
- $deleted = array_key_exists('kolabDeleteflag', $attrs)?$attrs['kolabDeleteflag'][0]:'FALSE';
- $a = strlen($sn);
- $b = strlen($cn);
- $cn = $attrs['cn'][0];
- $fn = substr($cn, 0, $b - $a);
+ $dncomp = split(',', $dn);
+ if( in_array('cn=groups',$dncomp) ) {
+ $type = 'G';
+ } else if(in_array('cn=resources',$dncomp)) {
+ $type = 'R';
+ } else if(in_array('cn=internal',$dncomp)) {
+ $type = 'I';
+ } else {
+ $type = 'U';
+ }
+ $deleted = array_key_exists('kolabDeleteflag', $attrs)?$attrs['kolabDeleteflag'][0]:'FALSE';
+ $a = strlen($sn);
+ $b = strlen($cn);
+ $cn = $attrs['cn'][0];
+ $fn = substr($cn, 0, $b - $a);
$entries[] = array( 'dn' => $dn,
'sn' => $attrs['sn'][0],
'fn' => $fn,
Index: webadmin.class.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Webadmin/Webadmin/webadmin.class.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- webadmin.class.php 22 Aug 2007 06:33:55 -0000 1.6
+++ webadmin.class.php 22 Aug 2007 06:53:18 -0000 1.7
@@ -313,7 +313,7 @@
}
$this->assign( 'page_title', $title);
- $this->assign( 'submenu', $submenu);
+ $this->assign( 'submenuitems', $submenu);
}
/**
More information about the commits
mailing list