Author: Lars Michelsen <[email protected]>
Date: Sun Nov 27 17:16:07 2011 +0100
Committer: Lars Michelsen <[email protected]>
Commit-Date: Sun Nov 27 17:16:07 2011 +0100
nagvis: Fixed auth session var deletion during logout; Fixed default login
dialog target
---
TODO | 3 +++
.../frontend/nagvis-js/classes/NagVisLoginView.php | 9 ++++++++-
share/server/core/classes/CoreAuthHandler.php | 5 +++++
share/server/core/classes/CoreModUserMgmt.php | 2 +-
4 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/TODO b/TODO
index a872c48..4e72259 100644
--- a/TODO
+++ b/TODO
@@ -11,6 +11,9 @@ Relative Koordinaten:
- Sidebar Folder auf/zu klappbar
- In Sidebar/Dropdown die aktuelle Map highlighten
+- Erster AJAX request geht schief (You are not authenticated)
+- omdadmin Passwort ist offensichtlich nicht omd
+
-------------------------------------------------------------------------------
- NagVis Multisite Snapin optional als Baum
diff --git a/share/frontend/nagvis-js/classes/NagVisLoginView.php
b/share/frontend/nagvis-js/classes/NagVisLoginView.php
index 5b1aa98..427bccf 100644
--- a/share/frontend/nagvis-js/classes/NagVisLoginView.php
+++ b/share/frontend/nagvis-js/classes/NagVisLoginView.php
@@ -49,13 +49,20 @@ class NagVisLoginView {
$TMPL = New FrontendTemplateSystem($this->CORE);
$TMPLSYS = $TMPL->getTmplSys();
+ $defaultTarget = cfg('paths', 'htmlbase')
+ .'/frontend/nagvis-js/index.php?Mod='
+ .cfg('global', 'startmodule')
+ .'&act='.cfg('global', 'startaction')
+ .'&show='.cfg('global', 'startshow');
+ $target = CoreRequestHandler::getReferer($defaultTarget);
+
$aData = Array(
'generalProperties' =>
$this->CORE->getMainCfg()->parseGeneralProperties(),
'pageTitle' => cfg('internal', 'title') . ' › Log In',
'htmlBase' => cfg('paths', 'htmlbase'),
'htmlJs' => cfg('paths', 'htmljs'),
'htmlCss' => cfg('paths', 'htmlcss'),
- 'formTarget' => CoreRequestHandler::getReferer(cfg('paths',
'htmlbase')),
+ 'formTarget' => $target,
'htmlTemplates' => $this->CORE->getMainCfg()->getPath('html',
'global', 'templates'),
'htmlImages' => cfg('paths', 'htmlimages'),
'maxPasswordLength' => AUTH_MAX_PASSWORD_LENGTH,
diff --git a/share/server/core/classes/CoreAuthHandler.php
b/share/server/core/classes/CoreAuthHandler.php
index e4300a0..e450b09 100644
--- a/share/server/core/classes/CoreAuthHandler.php
+++ b/share/server/core/classes/CoreAuthHandler.php
@@ -187,6 +187,7 @@ class CoreAuthHandler {
$this->SESS->del('authCredentials');
$this->SESS->del('authTrusted');
$this->SESS->del('userPermissions');
+ $this->SESS->del('authLogoutPossible');
//$this->SESS->del('multisiteLogonCookie');
return true;
@@ -196,10 +197,14 @@ class CoreAuthHandler {
// Remove logins which were performed with different logon/auth modules
if($this->SESS->get('logonModule') != cfg('global', 'logonmodule')
|| $this->SESS->get('authModule') != $this->sModuleName) {
+ debug('removing different logon/auth module data');
$this->logout(true);
return false;
}
+ debug($_SERVER['REQUEST_URI']);
+ debug(json_encode($_SESSION));
+
$this->passCredentials($this->SESS->get('authCredentials'));
$this->setTrustUsername($this->SESS->get('authTrusted'));
$this->setLogoutPossible($this->SESS->get('authLogoutPossible'));
diff --git a/share/server/core/classes/CoreModUserMgmt.php
b/share/server/core/classes/CoreModUserMgmt.php
index 0bb900e..b022535 100644
--- a/share/server/core/classes/CoreModUserMgmt.php
+++ b/share/server/core/classes/CoreModUserMgmt.php
@@ -136,7 +136,7 @@ class CoreModUserMgmt extends CoreModule {
$FHANDLER = new CoreRequestHandler($_POST);
$attr = Array('userId' => MATCH_INTEGER,
'password1' => MATCH_STRING,
- 'password2' => MATCH_STRING);
+ 'password2' => MATCH_STRING);
$this->verifyValuesSet($FHANDLER, $attr);
$this->verifyValuesMatch($FHANDLER, $attr);
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
