gunnar: server/kolab-webadmin/admin index.php, 1.3, 1.4 list.php, 1.2, 1.3
cvs at kolab.org
cvs at kolab.org
Wed Aug 22 19:33:40 CEST 2007
- Previous message: gunnar: server/php-kolab/Kolab_Webadmin/Webadmin auth.class.php, 1.5, 1.6 db.php, 1.2, 1.3 ldap.class.php, 1.10, 1.11 menu.php, 1.4, 1.5 object.php, 1.2, 1.3 webadmin.class.php, 1.9, 1.10
- Next message: gunnar: server/kolab-webadmin/admin/templates list.tpl,NONE,1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/admin
In directory doto:/tmp/cvs-serv11986
Modified Files:
index.php list.php
Log Message:
Started rebuilding the listing page.
Index: index.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/admin/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- index.php 20 Aug 2007 09:43:32 -0000 1.3
+++ index.php 22 Aug 2007 17:33:38 -0000 1.4
@@ -41,7 +41,7 @@
$ADMIN = new KolabWebadmin($params);
/** Check for system aliases */
-if( $ADMIN->isAdmin() && !$ADMIN->domains_valid()) {
+if (!$ADMIN->hasGroup(array(KOLAB_OBJECT_ADMINISTRATOR)) && !$ADMIN->domains_valid()) {
// User did not set up system aliases
$ADMIN->setContent('systemaliasnagscreen.tpl');
} else {
Index: list.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/admin/list.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- list.php 22 Aug 2007 12:41:36 -0000 1.2
+++ list.php 22 Aug 2007 17:33:38 -0000 1.3
@@ -36,13 +36,13 @@
require_once('Kolab/Webadmin/webadmin.class.php');
/** Read our configuration. */
-require_once('../config.php');
+require_once('config.php');
/** Get the requested object type. */
$default_type = KOLAB_OBJECT_USER;
$type = KolabForm::getRequestVar('type', $default_type);
-
-if (!in_array($type, KolabObjectDb::valid_types)) {
+$db = get_class_vars('KolabObjectDb');
+if (!in_array($type, $db['valid_types'])) {
$type = $default_type;
}
@@ -78,7 +78,7 @@
} else {
$entries = $ADMIN->listVisible($type);
if (is_a($entries, 'PEAR_Error')) {
- $ADMIN->assign('errors', $entries->getMessage());
+ $ADMIN->assign('errors', array($entries->getMessage()));
} else {
$ADMIN->assign('entries', $entries);
$ADMIN->assign('type', $type);
- Previous message: gunnar: server/php-kolab/Kolab_Webadmin/Webadmin auth.class.php, 1.5, 1.6 db.php, 1.2, 1.3 ldap.class.php, 1.10, 1.11 menu.php, 1.4, 1.5 object.php, 1.2, 1.3 webadmin.class.php, 1.9, 1.10
- Next message: gunnar: server/kolab-webadmin/admin/templates list.tpl,NONE,1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list