Skip to content
Snippets Groups Projects
Commit 1244c497 authored by Andreas Åkre Solberg's avatar Andreas Åkre Solberg
Browse files

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
parent aee52168
No related branches found
No related tags found
No related merge requests found
...@@ -127,7 +127,7 @@ class SimpleSAML_Auth_LDAP { ...@@ -127,7 +127,7 @@ class SimpleSAML_Auth_LDAP {
return NULL; return NULL;
} else { } else {
throw new Exception('LDAP search returned zero entries: ' . $searchattr . '=' . $searchvalue . ' base(s): ' . throw new Exception('LDAP search returned zero entries: ' . $searchattr . '=' . $searchvalue . ' base(s): ' .
join(',', $searchbases)); join(' & ', $searchbases));
} }
} }
......
...@@ -12,14 +12,14 @@ $this->includeAtTemplateBase('includes/header.php'); ...@@ -12,14 +12,14 @@ $this->includeAtTemplateBase('includes/header.php');
<tr> <tr>
<th>Name of institusion</th> <th>Name of institusion</th>
<th>Conf</th> <th>Conf</th>
<th>Meta</th>
<th>Ping</th> <th>Ping</th>
<th>Admin bind()</th> <th>Admin bind()</th>
<th>Search bogus</th> <th>S=bogus</th>
<th>Search test</th>
<th>test</th> <th>test</th>
<th>Bind test</th> <th>S=test</th>
<th>GetAttr</th> <th>test bind()</th>
<th>attributes</th>
<th>Meta</th>
</tr> </tr>
<?php <?php
...@@ -60,14 +60,14 @@ foreach($this->data['sortedOrgIndex'] as $orgkey) { ...@@ -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>'); echo('<td><span style="color: #b4b4b4; font-size: x-small">NA</span> <tt>' . $orgkey . '</tt></td>');
} }
showRes('config', $res, $this); showRes('config', $res, $this);
showRes('configMeta', $res, $this);
showRes('ping', $res, $this); showRes('ping', $res, $this);
showRes('adminBind', $res, $this); showRes('adminBind', $res, $this);
showRes('ldapSearchBogus', $res, $this); showRes('ldapSearchBogus', $res, $this);
showRes('ldapSearchTestUser', $res, $this);
showRes('configTest', $res, $this); showRes('configTest', $res, $this);
showRes('ldapSearchTestUser', $res, $this);
showRes('ldapBindTestUser', $res, $this); showRes('ldapBindTestUser', $res, $this);
showRes('ldapGetAttributesTestUser', $res, $this); showRes('ldapGetAttributesTestUser', $res, $this);
showRes('configMeta', $res, $this);
echo('</tr>'); echo('</tr>');
} }
?> ?>
......
...@@ -150,7 +150,7 @@ foreach ($orgs AS $orgkey => $orgconfig) { ...@@ -150,7 +150,7 @@ foreach ($orgs AS $orgkey => $orgconfig) {
function resultCode($res) { function resultCode($res) {
$code = ''; $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) { foreach ($columns AS $c) {
if (array_key_exists($c, $res)) { if (array_key_exists($c, $res)) {
$code .= ($res[$c][0] ? '0' : '2'); $code .= ($res[$c][0] ? '0' : '2');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment