thomas: server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder index.php.in, 1.3, 1.4
cvs at kolab.org
cvs at kolab.org
Tue Jan 22 19:36:22 CET 2008
Author: thomas
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder
In directory doto:/tmp/cvs-serv21978/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder
Modified Files:
index.php.in
Log Message:
Adjusted common code in management pages to look the same for easier comparison.
This fixed some variable initialisations.
Index: index.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/www/admin/sharedfolder/index.php.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- index.php.in 11 Jul 2006 16:02:24 -0000 1.3
+++ index.php.in 22 Jan 2008 18:36:20 -0000 1.4
@@ -17,9 +17,9 @@
/**** Authentication etc. ***/
$sidx = 'sf';
-$group = $auth->group();
-if( $group != 'maintainer' && $group != 'admin' && $group != 'domain-maintainer' ) {
- array_push($errors, _("Error: You don't have Permissions to access this Menu"));
+if( $auth->group() != 'maintainer' && $auth->group() != 'admin' && $auth->group() != 'domain-maintainer' ) {
+ debug("auth->group=".$auth->group());
+ array_push($errors, _("Error: You don't have Permissions to access this Menu"));
}
require_once('@kolab_php_module_prefix at admin/include/menu.php');
@@ -53,32 +53,35 @@
$title = sprintf(_("Manage Shared Folders (%d Folders)"), $count);
$template = 'sflistall.tpl';
ldap_sort($ldap->connection,$result,'cn');
- $entry = ldap_first_entry($ldap->connection, $result);
- while( $entry ) {
- $attrs = ldap_get_attributes($ldap->connection, $entry);
- $dn = ldap_get_dn($ldap->connection,$entry);
- $cn = $attrs['cn'][0];
- $deleted = array_key_exists('kolabDeleteflag',$attrs)?$attrs['kolabDeleteflag'][0]:"FALSE";
- $kolabhomeserver = $attrs['kolabHomeServer'][0];
-
- $folderTypeMap = array ( '' => _('Unspecified'), 'mail' => _('Mails'), 'task' => _('Tasks'), 'journal' => _('Journals'),
- 'event' => _('Events'), 'contact' => _('Contacts'), 'note' => _('Notes'));
- if( in_array('kolabFolderType',$attrs) ) $folderType = $folderTypeMap[$attrs['kolabFolderType'][0]];
- else $folderType = $folderTypeMap[''];
+ $entry = ldap_first_entry($ldap->connection, $result);
+ while( $entry ) {
+ $attrs = ldap_get_attributes($ldap->connection, $entry);
+ $dn = ldap_get_dn($ldap->connection,$entry);
+ $deleted = array_key_exists('kolabDeleteflag',$attrs)?$attrs['kolabDeleteflag'][0]:"FALSE";
+ $cn = $attrs['cn'][0];
+ $kolabhomeserver = $attrs['kolabHomeServer'][0];
+ $folderTypeMap = array ( '' => _('Unspecified'),
+ 'mail' => _('Mails'),
+ 'task' => _('Tasks'),
+ 'journal' => _('Journals'),
+ 'event' => _('Events'),
+ 'contact' => _('Contacts'),
+ 'note' => _('Notes'));
+ if( in_array('kolabFolderType',$attrs) ) $folderType = $folderTypeMap[$attrs['kolabFolderType'][0]];
+ else $folderType = $folderTypeMap[''];
- $entries[] = array( 'dn' => $dn,
- 'cn' => $cn,
- 'kolabhomeserver' => $kolabhomeserver,
- 'deleted' => $deleted,
- 'foldertype' => $folderType );
- $entry = ldap_next_entry( $ldap->connection,$entry );
+ $entries[] = array( 'dn' => $dn,
+ 'cn' => $cn,
+ 'kolabhomeserver' => $kolabhomeserver,
+ 'foldertype' => $folderType,
+ 'deleted' => $deleted );
+ $entry = ldap_next_entry( $ldap->connection,$entry );
}
}
}
-
/**** Insert into template and output ***/
-$smarty =& new MySmarty();
+$smarty = new MySmarty();
$smarty->assign( 'errors', $errors );
$smarty->assign( 'uid', $auth->uid() );
$smarty->assign( 'group', $auth->group() );
More information about the commits
mailing list