Author: Lars Michelsen <[email protected]>
Date: Mon Jul 1 11:25:43 2013 +0200
Committer: Lars Michelsen <[email protected]>
Commit-Date: Mon Jul 1 11:25:43 2013 +0200
Added auth/authorization modules to debug page
---
.../frontend/nagvis-js/classes/NagVisInfoView.php | 28 ++++++++++---------
share/userfiles/templates/default.info.html | 2 +
2 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/share/frontend/nagvis-js/classes/NagVisInfoView.php
b/share/frontend/nagvis-js/classes/NagVisInfoView.php
index 15e0067..ebc0c6a 100644
--- a/share/frontend/nagvis-js/classes/NagVisInfoView.php
+++ b/share/frontend/nagvis-js/classes/NagVisInfoView.php
@@ -76,19 +76,21 @@ class NagVisInfoView {
'phpLoadedExtensions' => implode(", ",get_loaded_extensions()),
'userAgent' => $_SERVER['HTTP_USER_AGENT'],
// Auth details
- 'logonModule' => cfg('global', 'logonmodule'),
- 'logonEnvVar' => cfg('global', 'logonenvvar'),
- 'logonEnvVal' => (isset($_SERVER[cfg('global', 'logonenvvar')]) ?
$_SERVER[cfg('global', 'logonenvvar')] : ''),
- 'logonEnvCreateUser' => cfg('global', 'logonenvcreateuser'),
- 'logonEnvCreateRole' => cfg('global', 'logonenvcreaterole'),
- 'loggedIn' => $userName.' ('.$userId.')',
- 'userRoles' => json_encode($userRoles),
- 'userPerms' => json_encode($userPerms),
- 'userAuthModule' => $AUTH->getAuthModule(),
- 'userLogonModule' => $AUTH->getLogonModule(),
- 'userAuthTrusted' => ($AUTH->authedTrusted() ? l("yes") :
l("no")),
- 'compatJsonEncode' => (!COMPAT_JSON_ENCODE ? l("yes") : l("no
(compat mode, may lead to performance problems)")),
- 'compatJsonDecode' => (!COMPAT_JSON_DECODE ? l("yes") : l("no
(compat mode, may lead to performance problems)")),
+ 'logonModule' => cfg('global', 'logonmodule'),
+ 'authModule' => cfg('global', 'authmodule'),
+ 'authorisationModule' => cfg('global', 'authorisationmodule'),
+ 'logonEnvVar' => cfg('global', 'logonenvvar'),
+ 'logonEnvVal' => (isset($_SERVER[cfg('global',
'logonenvvar')]) ? $_SERVER[cfg('global', 'logonenvvar')] : ''),
+ 'logonEnvCreateUser' => cfg('global', 'logonenvcreateuser'),
+ 'logonEnvCreateRole' => cfg('global', 'logonenvcreaterole'),
+ 'loggedIn' => $userName.' ('.$userId.')',
+ 'userRoles' => json_encode($userRoles),
+ 'userPerms' => json_encode($userPerms),
+ 'userAuthModule' => $AUTH->getAuthModule(),
+ 'userLogonModule' => $AUTH->getLogonModule(),
+ 'userAuthTrusted' => ($AUTH->authedTrusted() ? l("yes") :
l("no")),
+ 'compatJsonEncode' => (!COMPAT_JSON_ENCODE ? l("yes") : l("no
(compat mode, may lead to performance problems)")),
+ 'compatJsonDecode' => (!COMPAT_JSON_DECODE ? l("yes") : l("no
(compat mode, may lead to performance problems)")),
);
// Build page based on the template file and the data array
diff --git a/share/userfiles/templates/default.info.html
b/share/userfiles/templates/default.info.html
index c1114b8..cfc2be1 100644
--- a/share/userfiles/templates/default.info.html
+++ b/share/userfiles/templates/default.info.html
@@ -42,6 +42,8 @@
<tr><td>USER_AGENT</td><td>{$userAgent}</td></tr>
<tr><th colspan="2">Logon Information</th></tr>
<tr><td>Logon Module</td><td>{$logonModule}</td></tr>
+ <tr><td>Auth Module</td><td>{$authModule}</td></tr>
+ <tr><td>Authorization
Module</td><td>{$authorisationModule}</td></tr>
<tr><td>Logon Var</td><td>{$logonEnvVar}</td></tr>
<tr><td>{$logonEnvVar}</td><td>{$logonEnvVal}</td></tr>
<tr><td>Logon Create
User?</td><td>{$logonEnvCreateUser}</td></tr>
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
