From 1244c497b3bc510f6ca2c37775b2c4ac8b94852f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Tue, 20 Jan 2009 08:39:18 +0000
Subject: [PATCH] Fixed separator in error message, and order of column
(ldapstatus module)
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1173 44740490-163a-0410-bde0-09ae8108e29a
---
lib/SimpleSAML/Auth/LDAP.php | 2 +-
.../ldapstatus/templates/default/ldapstatus.php | 14 +++++++-------
modules/ldapstatus/www/index.php | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lib/SimpleSAML/Auth/LDAP.php b/lib/SimpleSAML/Auth/LDAP.php
index feea4699b..d7136a962 100644
--- a/lib/SimpleSAML/Auth/LDAP.php
+++ b/lib/SimpleSAML/Auth/LDAP.php
@@ -127,7 +127,7 @@ class SimpleSAML_Auth_LDAP {
return NULL;
} else {
throw new Exception('LDAP search returned zero entries: ' . $searchattr . '=' . $searchvalue . ' base(s): ' .
- join(',', $searchbases));
+ join(' & ', $searchbases));
}
}
diff --git a/modules/ldapstatus/templates/default/ldapstatus.php b/modules/ldapstatus/templates/default/ldapstatus.php
index 670b1784e..0e0159389 100644
--- a/modules/ldapstatus/templates/default/ldapstatus.php
+++ b/modules/ldapstatus/templates/default/ldapstatus.php
@@ -12,14 +12,14 @@ $this->includeAtTemplateBase('includes/header.php');
<tr>
<th>Name of institusion</th>
<th>Conf</th>
- <th>Meta</th>
<th>Ping</th>
<th>Admin bind()</th>
- <th>Search bogus</th>
- <th>Search test</th>
+ <th>S=bogus</th>
<th>test</th>
- <th>Bind test</th>
- <th>GetAttr</th>
+ <th>S=test</th>
+ <th>test bind()</th>
+ <th>attributes</th>
+ <th>Meta</th>
</tr>
<?php
@@ -60,14 +60,14 @@ foreach($this->data['sortedOrgIndex'] as $orgkey) {
echo('<td><span style="color: #b4b4b4; font-size: x-small">NA</span> <tt>' . $orgkey . '</tt></td>');
}
showRes('config', $res, $this);
- showRes('configMeta', $res, $this);
showRes('ping', $res, $this);
showRes('adminBind', $res, $this);
showRes('ldapSearchBogus', $res, $this);
- showRes('ldapSearchTestUser', $res, $this);
showRes('configTest', $res, $this);
+ showRes('ldapSearchTestUser', $res, $this);
showRes('ldapBindTestUser', $res, $this);
showRes('ldapGetAttributesTestUser', $res, $this);
+ showRes('configMeta', $res, $this);
echo('</tr>');
}
?>
diff --git a/modules/ldapstatus/www/index.php b/modules/ldapstatus/www/index.php
index d547a4016..4bea0d1d2 100644
--- a/modules/ldapstatus/www/index.php
+++ b/modules/ldapstatus/www/index.php
@@ -150,7 +150,7 @@ foreach ($orgs AS $orgkey => $orgconfig) {
function resultCode($res) {
$code = '';
- $columns = array('config', 'configMeta', 'ping', 'adminUser', 'ldapSearchBogus', 'configTest', 'ldapSearchTestUser', 'ldapBindTestUser', 'ldapGetAttributesTestUser');
+ $columns = array('config', 'ping', 'adminBind', 'ldapSearchBogus', 'configTest', 'ldapSearchTestUser', 'ldapBindTestUser', 'ldapGetAttributesTestUser', 'configMeta');
foreach ($columns AS $c) {
if (array_key_exists($c, $res)) {
$code .= ($res[$c][0] ? '0' : '2');
--
GitLab