Author: Lars Michelsen <[email protected]>
Date: Sat Feb 26 21:51:20 2011 +0100
Committer: Lars Michelsen <[email protected]>
Commit-Date: Sat Feb 26 20:51:20 2011 +0000
Fixed map global section modification
---
TODO | 4 ++++
share/server/core/classes/CoreModMap.php | 2 +-
share/server/core/classes/GlobalMapCfg.php | 2 +-
share/server/core/classes/WuiViewMapAddModify.php | 12 ++++++------
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/TODO b/TODO
index c940b56..13aac5a 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,10 @@
This is a small file for storing quick thoughts about new features and needed
changes:
===============================================================================
+Installer:
+ - Der Installer muss beim Update darauf achten, dass die alten [paths]
Variablen aus
+ der nagvis.ini.php entfernt werden.
+
Neue Idee:
- Map Aufbau gliedert sich in 2 Phasen
1. Was kommt auf die Map? Mögliche Quellen:
diff --git a/share/server/core/classes/CoreModMap.php
b/share/server/core/classes/CoreModMap.php
index 5ad23be..928dd0f 100644
--- a/share/server/core/classes/CoreModMap.php
+++ b/share/server/core/classes/CoreModMap.php
@@ -162,7 +162,7 @@ class CoreModMap extends CoreModule {
case 'modifyObject':
$refresh = null;
$success = null;
- if(isset($aReturn['refresh']) &&
$aReturn['refresh'] == 1) {
+ if(isset($_GET['ref']) && $_GET['ref']
== 1) {
$refresh = 1;
$success =
$this->CORE->getLang()->getText('The object has been modified.');
}
diff --git a/share/server/core/classes/GlobalMapCfg.php
b/share/server/core/classes/GlobalMapCfg.php
index 0a4b301..df90bd2 100644
--- a/share/server/core/classes/GlobalMapCfg.php
+++ b/share/server/core/classes/GlobalMapCfg.php
@@ -2228,7 +2228,7 @@ class GlobalMapCfg {
public function storeUpdateElement($id) {
$type = $this->mapConfig[$id]['type'];
- if($id === 0)
+ if($id == 0)
list($inObj, $start, $end) =
$this->getObjectLinesByNum(0);
else
list($inObj, $start, $end) =
$this->getObjectLinesById($id);
diff --git a/share/server/core/classes/WuiViewMapAddModify.php
b/share/server/core/classes/WuiViewMapAddModify.php
index f922cae..bb0373a 100644
--- a/share/server/core/classes/WuiViewMapAddModify.php
+++ b/share/server/core/classes/WuiViewMapAddModify.php
@@ -77,13 +77,13 @@ class WuiViewMapAddModify {
}
$aData = Array(
- 'htmlBase' =>
$this->CORE->getMainCfg()->getValue('paths', 'htmlbase'),
- 'action' => $action,
- 'type' => $this->aOpts['type'],
- 'id' => $this->aOpts['id'],
- 'map' => $this->aOpts['show'],
+ 'htmlBase' =>
$this->CORE->getMainCfg()->getValue('paths', 'htmlbase'),
+ 'action' => $action,
+ 'type' => $this->aOpts['type'],
+ 'id' => $this->aOpts['id'],
+ 'map' => $this->aOpts['show'],
'formContents' =>
$this->getFields().$this->fillFields(),
- 'langSave' => $this->CORE->getLang()->getText('save')
+ 'langSave' =>
$this->CORE->getLang()->getText('save')
);
// Build page based on the template file and the data array
------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in
Real-Time with Splunk. Collect, index and harness all the fast moving IT data
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business
insights. http://p.sf.net/sfu/splunk-dev2dev
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
