NagVis

Author:   Lars Michelsen <lm@...>
Date:     Tue Nov 29 18:44:22 2011 +0100
Committer:   Lars Michelsen <lm@...>
Commit-Date: Tue Nov 29 18:44:22 2011 +0100

Updated some notes

---

 TODO                                       |  166 +++++++++++++++++++++++----
 share/server/core/classes/GlobalMapCfg.php |    6 +
 2 files changed, 147 insertions(+), 25 deletions(-)

Diff:   http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis/diff/?id=0a3b47f87a760136d0c896cac3aec99a6d9650ad

Author:   Lars Michelsen <lm@...>
Date:     Sun Nov 27 21:35:45 2011 +0100
Committer:   Lars Michelsen <lm@...>
Commit-Date: Sun Nov 27 21:35:45 2011 +0100

Ignoring right clicks and clicks on the header menu when currently
adding an object to the map

---

 ChangeLog                             |    2 ++
 share/frontend/nagvis-js/js/edit.js   |   17 +++++++++++++++--
 share/frontend/nagvis-js/js/nagvis.js |    1 -
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 78743a9..69606cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,8 @@ Frontend
   * Reimplemented the "clone object" functionality in edit mode
   * Only show the edit links in context menu when permitted to edit the map
   * long text values with no spaces do not stretch the add/modify dialog anymore
+  * Ignoring right clicks and clicks on the header menu when currently adding
+    an object to the map
   * Bugfix: Not adding default_params parameter to all maps after editing the
     global map configuration using the web frontend
   * Bugfix: Don't enable map_image when not set when editing the global
diff --git a/share/frontend/nagvis-js/js/edit.js b/share/frontend/nagvis-js/js/edit.js
index ac6ae4b..9a0b92c 100644
--- a/share/frontend/nagvis-js/js/edit.js
+++ b/share/frontend/nagvis-js/js/edit.js
@@ -401,6 +401,21 @@ function addObject(e, objType, viewType, numLeft, action) {
 function getEventMousePos(e) {
     var event = !e ? window.event : e;
 
+    // Only accept "left" mouse clicks
+    if(getButton(event) != 'LEFT')
+        return;
+
+    // Ignore clicks on the header menu
+    if(event.target) {
+        var target = event.target;
+        while(target) {
+            if(target.id && target.id == 'header') {
+                return;
+            }
+            target = target.parentNode;
+        }
+    }
+
     if (event.pageX || event.pageY) {
         posx = event.pageX;
         posy = event.pageY;
@@ -409,8 +424,6 @@ function getEventMousePos(e) {
         posy = event.clientY;
     }
 
-    // FIXME: Check the clicked area. Only handle clicks on the map!
-
     // Substract height of header menu here
     posy -= getHeaderHeight();
 
diff --git a/share/frontend/nagvis-js/js/nagvis.js b/share/frontend/nagvis-js/js/nagvis.js
index b485806..2baeae2 100644
--- a/share/frontend/nagvis-js/js/nagvis.js
+++ b/share/frontend/nagvis-js/js/nagvis.js
@@ -685,7 +685,6 @@ function oDump(object, depth, max){
 
 /**
  * This counts the elements in an object
- * FIXME: There must be a better way!
  */
 function oLength(object) {
     var c = 0;

Author:   Lars Michelsen <lm@...>
Date:     Sun Nov 27 20:09:06 2011 +0100
Committer:   Lars Michelsen <lm@...>
Commit-Date: Sun Nov 27 20:09:06 2011 +0100

Removed useless notes

---

 docs/de_DE/backends.html |    3 ---
 docs/en_US/backends.html |    3 ---
 2 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/docs/de_DE/backends.html b/docs/de_DE/backends.html
index ac26e64..83a6d65 100644
--- a/docs/de_DE/backends.html
+++ b/docs/de_DE/backends.html
@@ -97,9 +97,6 @@
         </table>
         <p>Es gibt auch einige allgemeine Parameter. Sie finden sie in der <a href="nagvis_config_format_description.html#backend">Formatbeschreibung der Hauptkonfigurationsdatei</a>.</p>
         
-        <h3>Andere Backend-Typen</h3>
-        <p>FIXME: Hinweis auf andere Backends (eigene erzeugen, Backends von Dritten, ...).</p>
-        
         <h2>Konfigurieren von Backends</h2>
         <p>Die Backends werden in der Hauptkonfigurationsdatei definiert.
             Schauen Sie in die <a href="nagvis_config_format_description.html#backend">Formatbeschreibung der Hauptkonfigurationsdatei</a>, wie Backends definiert werden.</p>
diff --git a/docs/en_US/backends.html b/docs/en_US/backends.html
index 9670b79..8590d7f 100644
--- a/docs/en_US/backends.html
+++ b/docs/en_US/backends.html
@@ -36,8 +36,5 @@
         <p>The backends are defined in the main configuration file. See 
            <a href="nagvis_config_format_description.html#backend">main configuration format description</a> 
            on how to define backends.</p>
-
-        <h3>Other backend types</h3>
-        <p>FIXME: Hint to other backends (Create own, 3rd party backends, ...).</p>
     </body>
 </html>

Author:   Lars Michelsen <lm@...>
Date:     Sun Nov 27 20:08:14 2011 +0100
Committer:   Lars Michelsen <lm@...>
Commit-Date: Sun Nov 27 20:08:14 2011 +0100

Made view templates configurable (defaults / view_template)

---

 ChangeLog                                          |    1 +
 docs/en_US/nagvis_config_format_description.html   |    5 +++++
 .../nagvis-js/classes/NagVisAutoMapView.php        |    3 +--
 .../frontend/nagvis-js/classes/NagVisIndexView.php |    5 ++---
 .../frontend/nagvis-js/classes/NagVisInfoView.php  |    3 +--
 .../frontend/nagvis-js/classes/NagVisLoginView.php |    3 +--
 share/frontend/nagvis-js/classes/NagVisMapView.php |    3 +--
 .../nagvis-js/classes/NagVisOverviewView.php       |    3 +--
 share/frontend/nagvis-js/classes/NagVisUrlView.php |    5 ++---
 share/server/core/classes/GlobalMainCfg.php        |    5 +++++
 .../core/classes/NagVisViewAutomapModifyParams.php |    2 +-
 .../server/core/classes/NagVisViewAutomapToMap.php |    4 ++--
 .../core/classes/NagVisViewChangePassword.php      |    2 +-
 .../server/core/classes/NagVisViewManageRoles.php  |    2 +-
 share/server/core/classes/NagVisViewSearch.php     |    4 ++--
 share/server/core/classes/NagVisViewUserMgmt.php   |    2 +-
 share/server/core/classes/WuiViewEditMainCfg.php   |    2 +-
 .../server/core/classes/WuiViewManageBackends.php  |    2 +-
 .../core/classes/WuiViewManageBackgrounds.php      |    2 +-
 share/server/core/classes/WuiViewManageMaps.php    |    2 +-
 20 files changed, 32 insertions(+), 28 deletions(-)

Diff:   http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis/diff/?id=eecff2b5b218a14a3790b9994bedc3fdf7446756

Author:   Lars Michelsen <lm@...>
Date:     Sun Nov 27 19:59:56 2011 +0100
Committer:   Lars Michelsen <lm@...>
Commit-Date: Sun Nov 27 19:59:56 2011 +0100

automap: Finally removed the deprecated option maxLayers. Use childLayers instead.

---

 ChangeLog                                          |    3 +++
 docs/de_DE/automap.html                            |    3 ---
 docs/de_DE/nagvis_config_format_description.html   |    4 ++--
 docs/en_US/automap.html                            |    3 ---
 docs/en_US/nagvis_config_format_description.html   |    2 +-
 .../nagvis-js/classes/FrontendModAutoMap.php       |    1 -
 share/server/core/classes/CoreModAutoMap.php       |    1 -
 share/server/core/classes/NagVisAutoMap.php        |    7 -------
 .../core/classes/NagVisViewAutomapModifyParams.php |    1 -
 9 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 753761c..92aca7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,9 @@ Frontend
   * Bugfix: Removing just dragged new lines before opening the add/modify dialog
   * Bugfix: Not terminating map rename when one map contains a syntax error
 
+Automap
+  * Finally removed the deprecated option maxLayers. Use childLayers instead.
+
 1.6rc4
 Core
   * Bugfix: Fixed inclusion problem of default settings in some rare cases
diff --git a/docs/de_DE/automap.html b/docs/de_DE/automap.html
index 5151e6e..b37ac3b 100644
--- a/docs/de_DE/automap.html
+++ b/docs/de_DE/automap.html
@@ -66,9 +66,6 @@
             <td> root </td><td> siehe <a href="#root/object/definition">root object definition</a></td><td>Dies ist der Name des Root-Objektes. Es ist nicht notwendig, den Host hier zu setzen. Es gibt mehrere Wege, das Root-Objekt zu ermitteln. Einzelheiten finden Sie im <a href=#Root-Objekt-Definition>Root-Objekt-Definition</a>-Kapitel auf dieser Seite</td>
         </tr>
         <tr>
-            <td> maxLayers </td><td> 2 </td><td> Diese Option ist veraltet. Nutzen Sie statt dessen childLayers (s.u.) </td>
-        </tr>
-        <tr>
             <td> childLayers </td><td> 2 </td><td> maximale Anzahl von anzuzeigenden Ebenen abh&auml;ngiger "Child"-Hosts.</td>
         </tr>
         <tr>
diff --git a/docs/de_DE/nagvis_config_format_description.html b/docs/de_DE/nagvis_config_format_description.html
index 7e69be9..3a6d37f 100644
--- a/docs/de_DE/nagvis_config_format_description.html
+++ b/docs/de_DE/nagvis_config_format_description.html
@@ -352,14 +352,14 @@
     showinlists=1
     defaultroot="localhost"
     graphvizpath="/usr/local/bin"
-    defaultparams="&maxLayers=2"</pre>
+    defaultparams="&childLayers=2"</pre>
     -->
     <table border=0 style="width:100%">
         <tr>
             <th width="200">Wert</th><th width="150">Default</th><th>Beschreibung</th>
         </tr>
         <tr>
-            <td>defaultparams</td><td>&maxLayers=2</td><td>Dies sind die Parameter f&uuml;r die Automap-Ansichten und Links in den Listen (Map-Indexseite, Dropdown-Men&uuml;s in den Headern)</td>
+            <td>defaultparams</td><td>&childLayers=2</td><td>Dies sind die Parameter f&uuml;r die Automap-Ansichten und Links in den Listen (Map-Indexseite, Dropdown-Men&uuml;s in den Headern)</td>
         </tr>
         <tr>
             <td>defaultroot</td><td>localhost</td><td>Default-Wert f&uuml;r das Root-Objekt. Details finden Sie in der <a href=./automap.html>Automap-Dokumentation</a></td>
diff --git a/docs/en_US/automap.html b/docs/en_US/automap.html
index d24c314..b498434 100644
--- a/docs/en_US/automap.html
+++ b/docs/en_US/automap.html
@@ -47,9 +47,6 @@
             <td>root</td><td> see <a href="#root/object/definition">root object definition</a> </td><td> This is the name of the root object. It is not essential to set the host here. There are some more ways to tell the root object. For details see the <a href="#root/object/definition">root object definition</a> chapter on this page. </td>
         </tr>
         <tr>
-            <td>maxLayers</td><td>2</td><td>This option is deprecated. Use childLayers instead (See below).</td>
-        </tr>
-        <tr>
             <td>childLayers</td><td>2</td><td>Maximum layers of child hosts to be displayed.</td>
         </tr>
         <tr>
diff --git a/docs/en_US/nagvis_config_format_description.html b/docs/en_US/nagvis_config_format_description.html
index 214e0eb..0ea8397 100644
--- a/docs/en_US/nagvis_config_format_description.html
+++ b/docs/en_US/nagvis_config_format_description.html
@@ -383,7 +383,7 @@
             <th width="200"> Value </th><th width="150"> Default </th><th> Description </th>
             </tr>
             <tr>
-            <td> defaultparams </td><td> &amp;maxLayers=2 </td><td> These are the parameters for the automap views and links in the lists (map index page, dropdown menus in header) </td>
+            <td> defaultparams </td><td> &amp;childLayers=2 </td><td> These are the parameters for the automap views and links in the lists (map index page, dropdown menus in header) </td>
             </tr>
             <tr>
             <td> defaultroot </td><td> localhost </td><td> Default value for the root object. For details see <a href="automap.html">Automap documentation</a> </td>
diff --git a/share/frontend/nagvis-js/classes/FrontendModAutoMap.php b/share/frontend/nagvis-js/classes/FrontendModAutoMap.php
index d9f1322..fd2b9d5 100644
--- a/share/frontend/nagvis-js/classes/FrontendModAutoMap.php
+++ b/share/frontend/nagvis-js/classes/FrontendModAutoMap.php
@@ -42,7 +42,6 @@ class FrontendModAutoMap extends FrontendModule {
                        'search' => MATCH_STRING_NO_SPACE_EMPTY,
                        'backend' => MATCH_STRING_NO_SPACE_EMPTY,
                        'root' => MATCH_STRING_NO_SPACE_EMPTY,
-                       'maxLayers' => MATCH_INTEGER_PRESIGN_EMPTY,
                        'childLayers' => MATCH_INTEGER_PRESIGN_EMPTY,
                        'parentLayers' => MATCH_INTEGER_PRESIGN_EMPTY,
                        'renderMode' => MATCH_AUTOMAP_RENDER_MODE,
diff --git a/share/server/core/classes/CoreModAutoMap.php b/share/server/core/classes/CoreModAutoMap.php
index f04fb37..9e38819 100644
--- a/share/server/core/classes/CoreModAutoMap.php
+++ b/share/server/core/classes/CoreModAutoMap.php
@@ -37,7 +37,6 @@ class CoreModAutoMap extends CoreModule {
         $this->aOpts = Array('show' => MATCH_MAP_NAME,
                        'backend' => MATCH_STRING_NO_SPACE_EMPTY,
                        'root' => MATCH_STRING_NO_SPACE_EMPTY,
-                       'maxLayers' => MATCH_INTEGER_PRESIGN_EMPTY,
                        'childLayers' => MATCH_INTEGER_PRESIGN_EMPTY,
                        'parentLayers' => MATCH_INTEGER_PRESIGN_EMPTY,
                        'renderMode' => MATCH_AUTOMAP_RENDER_MODE,
diff --git a/share/server/core/classes/NagVisAutoMap.php b/share/server/core/classes/NagVisAutoMap.php
index 399472c..0411edb 100644
--- a/share/server/core/classes/NagVisAutoMap.php
+++ b/share/server/core/classes/NagVisAutoMap.php
@@ -114,13 +114,6 @@ class NagVisAutoMap extends GlobalMap {
             $prop['root'] = $this->getRootHostName();
 
         /**
-         * This is for compatibility to old the old parent layer limitation
-         * FIXME: May be removed in 1.6
-         */
-        if(isset($prop['maxLayers']) && $prop['maxLayers'] != '')
-            $prop['childLayers'] = $prop['maxLayers'];
-
-        /**
          * This sets how many child layers should be displayed. Default value is -1,
          * this means no limitation.
          */
diff --git a/share/server/core/classes/NagVisViewAutomapModifyParams.php b/share/server/core/classes/NagVisViewAutomapModifyParams.php
index 4ed270e..6e253e1 100644
--- a/share/server/core/classes/NagVisViewAutomapModifyParams.php
+++ b/share/server/core/classes/NagVisViewAutomapModifyParams.php
@@ -65,7 +65,6 @@ class NagVisViewAutomapModifyParams {
             $this->aOpts = $MAP->getOptions();
 
             // Skip unwanted params
-            unset($this->aOpts['maxLayers']);
             unset($this->aOpts['perm']);
         }
     }

Author:   Lars Michelsen <lm@...>
Date:     Sun Nov 27 19:54:06 2011 +0100
Committer:   Lars Michelsen <lm@...>
Commit-Date: Sun Nov 27 19:54:06 2011 +0100

Removed texts about WUI from docs

---

 TODO                                               |   24 +++++++++++++++++++-
 docs/en_US/about.html                              |    5 +--
 docs/en_US/after_installation.html                 |    2 +-
 docs/en_US/automap_config_format.html              |    2 +-
 docs/en_US/extending/iconsets.html                 |   21 +++++++++++++----
 docs/en_US/gadgets.html                            |    3 +-
 docs/en_US/header_templates.html                   |    3 --
 docs/en_US/map_config_format_description.html      |   13 +++++++---
 docs/en_US/nagvis_config_format_description.html   |   14 +++++------
 .../nagvis-js/classes/NagVisHeaderMenu.php         |    2 +-
 share/userfiles/templates/default.header.html      |    2 +-
 11 files changed, 61 insertions(+), 30 deletions(-)

Diff:   http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis/diff/?id=b22e839fa50f3c397b160158e09cee91b798609b

Author:   Lars Michelsen <lm@...>
Date:     Sun Nov 27 19:22:49 2011 +0100
Committer:   Lars Michelsen <lm@...>
Commit-Date: Sun Nov 27 19:22:49 2011 +0100

Removed unused class definition

---

 share/userfiles/templates/default.header.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/share/userfiles/templates/default.header.html b/share/userfiles/templates/default.header.html
index e7f94bf..c474455 100644
--- a/share/userfiles/templates/default.header.html
+++ b/share/userfiles/templates/default.header.html
@@ -147,7 +147,7 @@
 {template sideMaps maps pathBase type indent=1}
 {foreach $maps map}
     {if $map.configError == true}<li class="lvl{$indent}"><a class="error">{$map.mapAlias}</a></li>
-    {else}<li class="lvl{$indent}"><a class="left" href="{$pathBase}/frontend/nagvis-js/index.php?mod={$type}&amp;act=view&amp;show={$map.mapName}{$map.urlParams}">{$map.mapAlias}</a></li>{/if}
+    {else}<li class="lvl{$indent}"><a href="{$pathBase}/frontend/nagvis-js/index.php?mod={$type}&amp;act=view&amp;show={$map.mapName}{$map.urlParams}">{$map.mapAlias}</a></li>{/if}
     {if $map.childs}
         {sideMaps $map.childs $pathBase $type $indent+1}
     {/if}

Author:   Lars Michelsen <lm@...>
Date:     Sun Nov 27 19:13:38 2011 +0100
Committer:   Lars Michelsen <lm@...>
Commit-Date: Sun Nov 27 19:13:38 2011 +0100

multisite logon: Now really checking if the secret file exists

---

 share/server/core/classes/CoreLogonMultisite.php |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/share/server/core/classes/CoreLogonMultisite.php b/share/server/core/classes/CoreLogonMultisite.php
index 9e75477..78c007b 100644
--- a/share/server/core/classes/CoreLogonMultisite.php
+++ b/share/server/core/classes/CoreLogonMultisite.php
@@ -29,13 +29,13 @@ class CoreLogonMultisite extends CoreLogonModule {
 
     public function __construct() {
         $this->htpasswdPath = cfg('global', 'logon_multisite_htpasswd');
+        $this->secretPath   = cfg('global', 'logon_multisite_secret');
+
         if(!file_exists($this->htpasswdPath)) {
             throw new NagVisException(l('LogonMultisite: The htpasswd file &quot;[PATH]&quot; does not exist.',
                           array('PATH' => $this->htpasswdPath)));
         }
-
-        $this->secretPath   = cfg('global', 'logon_multisite_secret');
-        if(!file_exists($this->htpasswdPath)) {
+        if(!file_exists($this->secretPath)) {
             throw new NagVisException(l('LogonMultisite: The auth secret file &quot;[PATH]&quot; does not exist.',
                           array('PATH' => $this->secretPath)));
         }
@@ -85,6 +85,8 @@ class CoreLogonMultisite extends CoreLogonModule {
     }
 
     private function checkAuth() {
+        // Loop all cookies trying to fetch a valid authentication
+        // cookie for this installation
         foreach(array_keys($_COOKIE) AS $cookieName) {
             if(substr($cookieName, 0, 5) != 'auth_') {
                 continue;

Author:   Lars Michelsen <lm@...>
Date:     Sun Nov 27 18:19:01 2011 +0100
Committer:   Lars Michelsen <lm@...>
Commit-Date: Sun Nov 27 18:19:01 2011 +0100

Made login possible via URL when using LogonDialog

---

 .../server/core/classes/CoreLogonDialogHandler.php |   42 ++++++++++++++------
 share/userfiles/templates/default.login.html       |    4 +-
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/share/server/core/classes/CoreLogonDialogHandler.php b/share/server/core/classes/CoreLogonDialogHandler.php
index dc56c4d..e31ce53 100644
--- a/share/server/core/classes/CoreLogonDialogHandler.php
+++ b/share/server/core/classes/CoreLogonDialogHandler.php
@@ -59,24 +59,42 @@ class CoreLogonDialogHandler {
     }
 
     private function handleResponseAuth() {
-        $attr = Array('username' => MATCH_USER_NAME,
-                      'password' => null);
+        $attr = Array('_username' => MATCH_USER_NAME,
+                      '_password' => null);
 
-        $FHANDLER = new CoreRequestHandler($_POST);
+        $FHANDLER = new CoreRequestHandler(array_merge($_GET, $_POST));
 
-        if(!$FHANDLER->issetAndNotEmpty('username') && !$FHANDLER->issetAndNotEmpty('password'))
+        // Don't try to auth if one of the vars is missing
+        if(!$FHANDLER->issetAndNotEmpty('_username')
+           || !$FHANDLER->issetAndNotEmpty('_password'))
             return null;
 
-        if(!$FHANDLER->match('username', MATCH_USER_NAME)
-           || $FHANDLER->isLongerThan('username', AUTH_MAX_USERNAME_LENGTH))
-            throw new FieldInputError('username', l('Invalid username.'));
+        if(!$FHANDLER->match('_username', MATCH_USER_NAME)
+           || $FHANDLER->isLongerThan('_username', AUTH_MAX_USERNAME_LENGTH))
+            throw new FieldInputError('_username', l('Invalid username.'));
 
-        if(!$FHANDLER->issetAndNotEmpty('password')
-           || $FHANDLER->isLongerThan('password', AUTH_MAX_PASSWORD_LENGTH))
-            throw new FieldInputError('password', l('Invalid password.'));
+        if(!$FHANDLER->issetAndNotEmpty('_password')
+           || $FHANDLER->isLongerThan('_password', AUTH_MAX_PASSWORD_LENGTH))
+            throw new FieldInputError('_password', l('Invalid password.'));
+        
+        $a = Array('user'     => $FHANDLER->get('_username'),
+                   'password' => $FHANDLER->get('_password'));
+    
+        // Remove authentication infos. Hide it from the following code
+        if(isset($_REQUEST['_username']))
+            unset($_REQUEST['_username']);
+        if(isset($_REQUEST['_password']))
+            unset($_REQUEST['_password']);
+        if(isset($_POST['_username']))
+            unset($_POST['_username']);
+        if(isset($_POST['_password']))
+            unset($_POST['_password']);
+        if(isset($_GET['_username']))
+            unset($_GET['_username']);
+        if(isset($_GET['_password']))
+            unset($_GET['_password']);
 
-        return Array('user'     => $FHANDLER->get('username'),
-                     'password' => $FHANDLER->get('password'));
+        return $a;
     }
 }
 ?>
diff --git a/share/userfiles/templates/default.login.html b/share/userfiles/templates/default.login.html
index 20c2ca2..ba1a881 100644
--- a/share/userfiles/templates/default.login.html
+++ b/share/userfiles/templates/default.login.html
@@ -40,11 +40,11 @@
     </p>{/if}
     <p>
         <label>{$langName}<br />
-        <input type="text" name="username" id="user_login" class="input" value="" size="{$maxUsernameLength}" tabindex="10" /></label>
+        <input type="text" name="_username" id="user_login" class="input" value="" size="{$maxUsernameLength}" tabindex="10" /></label>
     </p>
     <p>
         <label>{$langPassword}<br />
-        <input type="password" name="password" id="user_pass" class="input" value="" size="{$maxPasswordLength}" tabindex="20" /></label>
+        <input type="password" name="_password" id="user_pass" class="input" value="" size="{$maxPasswordLength}" tabindex="20" /></label>
 
     </p>
     <p class="submit">

Author:   Lars Michelsen <lm@...>
Date:     Sun Nov 27 18:00:04 2011 +0100
Committer:   Lars Michelsen <lm@...>
Commit-Date: Sun Nov 27 18:00:04 2011 +0100

Added error messages to login dialog on login failure

---

 TODO                                               |    3 -
 .../frontend/nagvis-js/classes/NagVisLoginView.php |    2 +
 .../server/core/classes/CoreLogonDialogHandler.php |   51 ++++++++++++--------
 share/server/core/functions/index.php              |    1 +
 share/userfiles/templates/default.login.css        |   11 ++++-
 share/userfiles/templates/default.login.html       |    3 +
 6 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/TODO b/TODO
index 4e72259..a872c48 100644
--- a/TODO
+++ b/TODO
@@ -11,9 +11,6 @@ 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 427bccf..48c56c9 100644
--- a/share/frontend/nagvis-js/classes/NagVisLoginView.php
+++ b/share/frontend/nagvis-js/classes/NagVisLoginView.php
@@ -45,6 +45,7 @@ class NagVisLoginView {
      * @author 	Lars Michelsen <lars@...>
      */
     public function parse() {
+        global $LOGIN_MSG;
         // Initialize template system
         $TMPL = New FrontendTemplateSystem($this->CORE);
         $TMPLSYS = $TMPL->getTmplSys();
@@ -72,6 +73,7 @@ class NagVisLoginView {
             'langLogin' => l('Login'),
             'langTitleCookiesDisabled' => l('Cookies disabled'),
             'langTextCookiesDisabled' => l('NagVis is unable to set a cookie in your browser. Please enable cookies for at least the NagVis host.'),
+            'loginMsg' => isset($LOGIN_MSG)  && $LOGIN_MSG !== null ? $LOGIN_MSG->msg : '',
         );
 
         // Build page based on the template file and the data array
diff --git a/share/server/core/classes/CoreLogonDialogHandler.php b/share/server/core/classes/CoreLogonDialogHandler.php
index a127899..dc56c4d 100644
--- a/share/server/core/classes/CoreLogonDialogHandler.php
+++ b/share/server/core/classes/CoreLogonDialogHandler.php
@@ -27,25 +27,32 @@ class CoreLogonDialogHandler {
     public function check($printErr = true) {
         global $AUTH;
 
-        $data = $this->handleResponseAuth();
-        if($data !== false) {
-            // Set credentials to authenticate
-            $AUTH->setTrustUsername(false);
-            $AUTH->setLogoutPossible(true);
-            $AUTH->passCredentials($data);
+        $err = null;
+        try {
+            $data = $this->handleResponseAuth();
+            if($data !== null) {
+                // Set credentials to authenticate
+                $AUTH->setTrustUsername(false);
+                $AUTH->setLogoutPossible(true);
+                $AUTH->passCredentials($data);
 
-            // Try to authenticate the user
-            $result = $AUTH->isAuthenticated();
-            if($result === true) {
-                // Success: Store in session
-                $AUTH->storeInSession();
-                return true;
+                // Try to authenticate the user
+                $result = $AUTH->isAuthenticated();
+                if($result === true) {
+                    // Success: Store in session
+                    $AUTH->storeInSession();
+                    return true;
+                } else {
+                    throw new FieldInputError(null, l('Authentication failed.'));
+                }
             }
+        } catch(FieldInputError $e) {
+            $err = $e;
         }
 
         // Failed!
         if(!CONST_AJAX) {
-            return array('LogonDialog', 'view');
+            return array('LogonDialog', 'view', $err);
         } else {
             throw new NagVisException(l('You are not authenticated'), null, l('Access denied'));
         }
@@ -57,14 +64,16 @@ class CoreLogonDialogHandler {
 
         $FHANDLER = new CoreRequestHandler($_POST);
 
-        if(!$FHANDLER->match('username', MATCH_USER_NAME))
-            return false;
-        if(!$FHANDLER->issetAndNotEmpty('password'))
-            return false;
-        if($FHANDLER->isLongerThan('username', AUTH_MAX_USERNAME_LENGTH))
-            return false;
-        if($FHANDLER->isLongerThan('password', AUTH_MAX_PASSWORD_LENGTH))
-            return false;
+        if(!$FHANDLER->issetAndNotEmpty('username') && !$FHANDLER->issetAndNotEmpty('password'))
+            return null;
+
+        if(!$FHANDLER->match('username', MATCH_USER_NAME)
+           || $FHANDLER->isLongerThan('username', AUTH_MAX_USERNAME_LENGTH))
+            throw new FieldInputError('username', l('Invalid username.'));
+
+        if(!$FHANDLER->issetAndNotEmpty('password')
+           || $FHANDLER->isLongerThan('password', AUTH_MAX_PASSWORD_LENGTH))
+            throw new FieldInputError('password', l('Invalid password.'));
 
         return Array('user'     => $FHANDLER->get('username'),
                      'password' => $FHANDLER->get('password'));
diff --git a/share/server/core/functions/index.php b/share/server/core/functions/index.php
index 862cf0f..8bf290e 100644
--- a/share/server/core/functions/index.php
+++ b/share/server/core/functions/index.php
@@ -58,6 +58,7 @@ if(!($AUTH->sessionAuthPresent() && $AUTH->isAuthenticatedSession())) {
     if(is_array($ret)) {
         $UHANDLER->set('mod', $ret[0]);
         $UHANDLER->set('act', $ret[1]);
+        $LOGIN_MSG = $ret[2];
     }
 }
 
diff --git a/share/userfiles/templates/default.login.css b/share/userfiles/templates/default.login.css
index d8a341b..3e4bf76 100644
--- a/share/userfiles/templates/default.login.css
+++ b/share/userfiles/templates/default.login.css
@@ -22,6 +22,15 @@ form {
 
 form .forgetmenot { font-weight: normal; float: left; margin-bottom: 0; }
 
+#login form .msg {
+    font-size: 14px;
+    text-align: center;
+    margin-bottom: 10px;
+}
+#login form .msg strong {
+    color: #ff0000;
+}
+
 #login form .submit input {
     font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
     padding: 3px 10px;
@@ -94,4 +103,4 @@ h1 a {
 
 .clear {
     clear: both;
-}
\ No newline at end of file
+}
diff --git a/share/userfiles/templates/default.login.html b/share/userfiles/templates/default.login.html
index 51efbcc..20c2ca2 100644
--- a/share/userfiles/templates/default.login.html
+++ b/share/userfiles/templates/default.login.html
@@ -35,6 +35,9 @@
 <h1><a href="#" title="{$pageTitle}" style="background-image:url({$htmlImages}internal/logo.png)">{$pageTitle}</a></h1>
 
 <form name="loginform" id="loginform" action="{$formTarget}" method="post">
+    {if $loginMsg != ''}<p class="msg">
+    <strong>Error:</strong> {$loginMsg}
+    </p>{/if}
     <p>
         <label>{$langName}<br />
         <input type="text" name="username" id="user_login" class="input" value="" size="{$maxUsernameLength}" tabindex="10" /></label>

Author:   Lars Michelsen <lm@...>
Date:     Sun Nov 27 17:16:07 2011 +0100
Committer:   Lars Michelsen <lm@...>
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') . ' &rsaquo; 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);

Author:   Lars Michelsen <lm@...>
Date:     Sun Nov 27 14:37:07 2011 +0100
Committer:   Lars Michelsen <lm@...>
Commit-Date: Sun Nov 27 14:37:07 2011 +0100

Fixed html code in login form

---

 share/userfiles/templates/default.login.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/share/userfiles/templates/default.login.html b/share/userfiles/templates/default.login.html
index 458bbfd..51efbcc 100644
--- a/share/userfiles/templates/default.login.html
+++ b/share/userfiles/templates/default.login.html
@@ -34,7 +34,7 @@
 <div id="login">
 <h1><a href="#" title="{$pageTitle}" style="background-image:url({$htmlImages}internal/logo.png)">{$pageTitle}</a></h1>
 
-<form name="loginform" id="loginform" action="#" onsubmit="{$formTarget}" method="post">
+<form name="loginform" id="loginform" action="{$formTarget}" method="post">
     <p>
         <label>{$langName}<br />
         <input type="text" name="username" id="user_login" class="input" value="" size="{$maxUsernameLength}" tabindex="10" /></label>

Author:   Lars Michelsen <lm@...>
Date:     Sun Nov 27 01:10:33 2011 +0100
Committer:   Lars Michelsen <lm@...>
Commit-Date: Sun Nov 27 01:10:33 2011 +0100

code formating

---

 share/server/core/classes/GlobalIndexPage.php |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/share/server/core/classes/GlobalIndexPage.php b/share/server/core/classes/GlobalIndexPage.php
index 796be49..7674d52 100644
--- a/share/server/core/classes/GlobalIndexPage.php
+++ b/share/server/core/classes/GlobalIndexPage.php
@@ -287,13 +287,13 @@ class GlobalIndexPage {
             $aSteps = Array();
             for($i = 0; $i < $iNum; $i++) {
                 $aSteps[] = Array('name' => $ROTATION->getStepLabelById($i),
-                                                    'url'  => $ROTATION->getStepUrlById($i));
+                                  'url'  => $ROTATION->getStepUrlById($i));
             }
 
             $aRotations[] = Array('name'      => $poolName,
-                                                        'url'       => $ROTATION->getStepUrlById(0),
-                                                        'num_steps' => $ROTATION->getNumSteps(),
-                                                        'steps'     => $aSteps);
+                                  'url'       => $ROTATION->getStepUrlById(0),
+                                  'num_steps' => $ROTATION->getNumSteps(),
+                                  'steps'     => $aSteps);
         }
 
         return json_encode($aRotations);

Author:   Lars Michelsen <lm@...>
Date:     Sun Nov 27 01:04:38 2011 +0100
Committer:   Lars Michelsen <lm@...>
Commit-Date: Sun Nov 27 01:04:38 2011 +0100

Added new demo maps to the rotations

---

 etc/nagvis.ini.php-sample |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/etc/nagvis.ini.php-sample b/etc/nagvis.ini.php-sample
index 7ae3105..d63e6d1 100644
--- a/etc/nagvis.ini.php-sample
+++ b/etc/nagvis.ini.php-sample
@@ -368,12 +368,12 @@ backendtype="merlinmy"
 ; in this example the browser switches between the maps demo and demo2 every 15
 ; seconds, the rotation is enabled by url: index.php?rotation=demo
 [rotation_demo]
-; These steps are rotated. The "Demo2:" is a label which is being displayed in
-; the index pages rotation list.
+; These steps are rotated. The single steps may have optional prefixes like "Demo2:"
+; which are used as display text on the index pages rotation list.
 ; You may also add external URLs as steps. Simply enclose the url using []
 ; instead of the map name. It is also possible to add automaps to rotations,
 ; add an @ sign before the automap name to add an automap to the rotation.
-maps="demo,Demo2:demo2"
+maps="demo-germany,demo-ham-racks,demo-load,demo-muc-srv1"
 ; rotation interval (seconds)
 interval=15

Author:   Lars Michelsen <lm@...>
Date:     Sun Nov 27 00:59:04 2011 +0100
Committer:   Lars Michelsen <lm@...>
Commit-Date: Sun Nov 27 00:59:04 2011 +0100

Bugfix: Not terminating map rename when one map contains a syntax error

---

 ChangeLog                                |    1 +
 share/server/core/classes/CoreModMap.php |   24 ++++++++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index db3e578..753761c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,7 @@ Frontend
   * Bugfix: Don't enable map_image when not set when editing the global
     sections of maps
   * Bugfix: Removing just dragged new lines before opening the add/modify dialog
+  * Bugfix: Not terminating map rename when one map contains a syntax error
 
 1.6rc4
 Core
diff --git a/share/server/core/classes/CoreModMap.php b/share/server/core/classes/CoreModMap.php
index 46cf168..a44e1b1 100644
--- a/share/server/core/classes/CoreModMap.php
+++ b/share/server/core/classes/CoreModMap.php
@@ -775,18 +775,22 @@ class CoreModMap extends CoreModule {
 
         // loop all map configs to replace mapname in all map configs
         foreach($this->CORE->getAvailableMaps() as $mapName) {
-            $MAPCFG1 = new GlobalMapCfg($this->CORE, $mapName);
-            $MAPCFG1->readMapConfig();
+            try {
+                $MAPCFG1 = new GlobalMapCfg($this->CORE, $mapName);
+                $MAPCFG1->readMapConfig();
 
-            $i = 0;
-            // loop definitions of type map
-            foreach($MAPCFG1->getDefinitions('map') AS $key => $obj) {
-                // check if old map name is linked...
-                if($obj['map_name'] == $a['map']) {
-                    $MAPCFG1->setValue('map', $i, 'map_name', $a['map_new_name']);
-                    $MAPCFG1->writeElement('map',$i);
+                $i = 0;
+                // loop definitions of type map
+                foreach($MAPCFG1->getDefinitions('map') AS $key => $obj) {
+                    // check if old map name is linked...
+                    if($obj['map_name'] == $a['map']) {
+                        $MAPCFG1->setValue('map', $i, 'map_name', $a['map_new_name']);
+                        $MAPCFG1->writeElement('map',$i);
+                    }
+                    $i++;
                 }
-                $i++;
+            } catch(Exception $e) {
+                // Do nothing. Siletly pass config errors here...
             }
         }

Author:   Lars Michelsen <lm@...>
Date:     Sun Nov 27 00:54:55 2011 +0100
Committer:   Lars Michelsen <lm@...>
Commit-Date: Sun Nov 27 00:54:55 2011 +0100

Recoded logon and authentication module interface; Several code cleanups

---

 ChangeLog                                          |    2 +
 TODO                                               |   43 ++++
 docs/de_DE/nagvis_config_format_description.html   |    2 +-
 .../nagvis-js/classes/FrontendModAutoMap.php       |   18 +-
 .../nagvis-js/classes/FrontendModLogonDialog.php   |    7 +-
 .../nagvis-js/classes/FrontendModLogonEnv.php      |   29 ---
 .../nagvis-js/classes/FrontendModLogonMixed.php    |   69 -------
 .../frontend/nagvis-js/classes/FrontendModMap.php  |   99 +++++-----
 .../nagvis-js/classes/FrontendModOverview.php      |    4 +-
 .../frontend/nagvis-js/classes/FrontendModUrl.php  |   14 +-
 .../nagvis-js/classes/NagVisHeaderMenu.php         |   47 +++---
 .../frontend/nagvis-js/classes/NagVisInfoView.php  |   15 +-
 .../frontend/nagvis-js/classes/NagVisLoginView.php |   16 +-
 share/frontend/nagvis-js/index.php                 |    2 +-
 share/server/core/classes/CoreAuthHandler.php      |  153 +++++++--------
 share/server/core/classes/CoreAuthModMySQL.php     |    5 +-
 share/server/core/classes/CoreAuthModSQLite.php    |   68 +++----
 .../core/classes/CoreAuthorisationHandler.php      |   17 +--
 .../core/classes/CoreAuthorisationModMySQL.php     |   10 +-
 .../core/classes/CoreAuthorisationModSQLite.php    |   10 +-
 .../server/core/classes/CoreLogonDialogHandler.php |   73 +++++++
 share/server/core/classes/CoreLogonEnv.php         |   59 ++++++
 .../core/classes/CoreLogonMixed.php}               |   19 ++-
 share/server/core/classes/CoreLogonModule.php      |   57 ++++++
 share/server/core/classes/CoreLogonMultisite.php   |  126 ++++++++++++
 share/server/core/classes/CoreModAuth.php          |   45 +----
 .../server/core/classes/CoreModChangePassword.php  |   16 +-
 share/server/core/classes/CoreModLogonEnv.php      |  135 -------------
 .../server/core/classes/CoreModLogonMultisite.php  |  202 --------------------
 share/server/core/classes/CoreModMainCfg.php       |    4 +-
 .../core/classes/CoreModManageBackgrounds.php      |    2 +-
 share/server/core/classes/CoreModManageShapes.php  |    2 +-
 share/server/core/classes/CoreModMap.php           |    4 +-
 share/server/core/classes/CoreModMultisite.php     |    3 +-
 share/server/core/classes/CoreModOverview.php      |   18 +-
 share/server/core/classes/CoreModRoleMgmt.php      |   14 +-
 share/server/core/classes/CoreModSearch.php        |    5 +-
 share/server/core/classes/CoreModUserMgmt.php      |   27 ++-
 share/server/core/classes/CoreModule.php           |   12 +-
 share/server/core/classes/CoreUserCfg.php          |   15 +-
 share/server/core/classes/GlobalIndexPage.php      |   17 +-
 .../core/classes/NagVisViewChangePassword.php      |   12 +-
 .../server/core/classes/NagVisViewManageRoles.php  |   45 ++---
 share/server/core/classes/NagVisViewUserMgmt.php   |   25 +--
 share/server/core/classes/WuiViewEditMainCfg.php   |   37 ++---
 .../server/core/classes/WuiViewManageBackends.php  |   30 +--
 .../core/classes/WuiViewManageBackgrounds.php      |   23 +--
 share/server/core/classes/WuiViewManageMaps.php    |   28 +--
 share/server/core/classes/WuiViewManageShapes.php  |   24 +--
 share/server/core/classes/WuiViewMapManageTmpl.php |   23 +--
 share/server/core/functions/index.php              |   56 +++---
 share/userfiles/templates/default.info.html        |    5 +-
 share/userfiles/templates/default.login.html       |    4 +-
 53 files changed, 768 insertions(+), 1029 deletions(-)

Diff:   http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis/diff/?id=28928af65f5974e5f4ee74824a62982a9753a9bf

Author:   Lars Michelsen <lm@...>
Date:     Fri Nov 25 16:09:09 2011 +0100
Committer:   Lars Michelsen <lm@...>
Commit-Date: Fri Nov 25 16:09:09 2011 +0100

Fixed multisite auth logout

---

 share/server/core/classes/CoreAuthHandler.php    |   15 ++++++++++-----
 share/server/core/classes/CoreSessionHandler.php |    4 ++++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/share/server/core/classes/CoreAuthHandler.php b/share/server/core/classes/CoreAuthHandler.php
index e5b39cd..156d5c6 100644
--- a/share/server/core/classes/CoreAuthHandler.php
+++ b/share/server/core/classes/CoreAuthHandler.php
@@ -157,18 +157,21 @@ class CoreAuthHandler {
         // out if the auth_* cookie does not exist anymore. The cookie name has been
         // stored in the session var multisiteLogonCookie
         // This is a bad hacky place for this but I see no other good solution atm
-        if($bAlreadyAuthed && $this->SESS->isSetAndNotEmpty('multisiteLogonCookie')
-           && !isset($_COOKIE[$this->SESS->get('multisiteLogonCookie')])) {
-            $this->logout(true);
-            return false;
+        if($bAlreadyAuthed && $this->SESS->isSetAndNotEmpty('multisiteLogonCookie')) {
+            $cookieName = $this->SESS->get('multisiteLogonCookie');
+            if(!$cookieName || !isset($_COOKIE[$cookieName])) {
+                $this->logout(true);
+                return false;
+            }
         }
 
         // When the user authenticated in trust mode read it here and override
         // the value handed over with the function call.
-        // The isAuthentication() function will then only check if the user exists.
+        // The isAuthenticated() function will then only check if the user exists.
         if($this->authedTrusted())
             $bTrustUsername = AUTH_TRUST_USERNAME;
 
+
         // Ask the module
         $isAuthenticated = $this->MOD->isAuthenticated($bTrustUsername);
 
@@ -233,6 +236,8 @@ class CoreAuthHandler {
         $this->SESS->set('authCredentials',      false);
         $this->SESS->set('userPermissions',      false);
         $this->SESS->set('logonModule',          false);
+        $this->SESS->del('multisiteLogonCookie');
+        $this->SESS->del('authTrusted');
 
         return true;
     }
diff --git a/share/server/core/classes/CoreSessionHandler.php b/share/server/core/classes/CoreSessionHandler.php
index 1e57a54..1af11a4 100644
--- a/share/server/core/classes/CoreSessionHandler.php
+++ b/share/server/core/classes/CoreSessionHandler.php
@@ -110,6 +110,10 @@ class CoreSessionHandler {
 
         return $sOld;
     }
+
+    public function del($key) {
+        unset($_SESSION[$key]);
+    }
 }
 
 ?>

Author:   Lars Michelsen <lm@...>
Date:     Fri Nov 25 15:35:17 2011 +0100
Committer:   Lars Michelsen <lm@...>
Commit-Date: Fri Nov 25 15:35:17 2011 +0100

Added new LogonMultisite module to use the new Check_MK multisite auth cookie

---

 ChangeLog                                          |    1 +
 TODO                                               |    1 -
 docs/en_US/nagvis_config_format_description.html   |   61 ++++++-
 etc/nagvis.ini.php-sample                          |   39 +++--
 .../classes/FrontendModLogonMultisite.php          |   27 +++
 share/server/core/classes/CoreAuthHandler.php      |   20 ++-
 .../server/core/classes/CoreModLogonMultisite.php  |  202 ++++++++++++++++++++
 share/server/core/classes/GlobalMainCfg.php        |   35 ++++
 8 files changed, 365 insertions(+), 21 deletions(-)

Diff:   http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis/diff/?id=c6eb5a95be2f69a9bd579134b681b63ca6203ef3

Author:   Lars Michelsen <lm@...>
Date:     Thu Nov 24 19:25:56 2011 +0100
Committer:   Lars Michelsen <lm@...>
Commit-Date: Thu Nov 24 19:25:56 2011 +0100

Fixed line_y_label position

---

 TODO                                 |    1 -
 share/frontend/nagvis-js/js/lines.js |   10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/TODO b/TODO
index 042821b..0186941 100644
--- a/TODO
+++ b/TODO
@@ -10,7 +10,6 @@ Relative Koordinaten:
     - Beim Config Parsen Fehlermeldung erzeugen
 - Sidebar Folder auf/zu klappbar
 - In Sidebar/Dropdown die aktuelle Map highlighten
-- line_weather_color umbrechen wenn als Text dargestellt
 - line_label_y_offset wird noch nicht sauber berechnet
 
 -------------------------------------------------------------------------------
diff --git a/share/frontend/nagvis-js/js/lines.js b/share/frontend/nagvis-js/js/lines.js
index 1d53039..8507007 100644
--- a/share/frontend/nagvis-js/js/lines.js
+++ b/share/frontend/nagvis-js/js/lines.js
@@ -147,17 +147,17 @@ function drawLabel(objectId, num, lineType, lx, ly, z, perfdataA, perfdataB, yOf
     labelShift = getLabelShift(perfdataA);
 
     // Maybe use function to detect the real height in future
-    var labelHeight = 22;
+    var labelHeight = 21;
 
     if(lineType == '13') {
         if(oLinkContainer)
-            oLinkContainer.appendChild(drawNagVisTextbox(objectId+'-link'+num, 'box', '#ffffff', '#000000', (lx-labelShift), (ly - labelHeight / 2), z, 'auto', 'auto', '<b>' + perfdataA + '</b>'));
+            oLinkContainer.appendChild(drawNagVisTextbox(objectId+'-link'+num, 'box', '#ffffff', '#000000', (lx-labelShift), parseInt(ly - labelHeight / 2), z, 'auto', 'auto', '<b>' + perfdataA + '</b>'));
     } else if(lineType == '14') {
-        var label = drawNagVisTextbox(objectId+'-link'+num, 'box', '#ffffff', '#000000', (lx-labelShift), (ly - labelHeight - yOffset), z, 'auto', 'auto', '<b>' + perfdataA + '</b>');
+        var label = drawNagVisTextbox(objectId+'-link'+num, 'box', '#ffffff', '#000000', (lx-labelShift), parseInt(ly - labelHeight - yOffset), z, 'auto', 'auto', '<b>' + perfdataA + '</b>');
         if(oLinkContainer)
             oLinkContainer.appendChild(label);
         labelShift = getLabelShift(perfdataB);
-        label = drawNagVisTextbox(objectId+'-link'+(num+1), 'box', '#ffffff', '#000000', (lx-labelShift), (ly + yOffset), z, 'auto', 'auto', '<b>' + perfdataB + '</b>');
+        label = drawNagVisTextbox(objectId+'-link'+(num+1), 'box', '#ffffff', '#000000', (lx-labelShift), parseInt(ly + yOffset), z, 'auto', 'auto', '<b>' + perfdataB + '</b>');
         if(oLinkContainer)
             oLinkContainer.appendChild(label);
         label = null;
@@ -338,7 +338,7 @@ function drawNagVisLine(objectId, lineType, cuts, x, y, z, width, colorFill, col
             }
 
             // Take the configured line width into account
-            yOffset = yOffset + parseInt(width / 2);
+            yOffset = yOffset + width;
 
             // perfdataA contains the percentage info
             // perfdataB contains the bandwith info

Author:   Lars Michelsen <lm@...>
Date:     Thu Nov 24 18:52:13 2011 +0100
Committer:   Lars Michelsen <lm@...>
Commit-Date: Thu Nov 24 18:52:13 2011 +0100

long text values with no spaces do not stretch the add/modify dialog anymore

---

 ChangeLog                                         |    5 +++--
 share/server/core/classes/WuiViewMapAddModify.php |   10 ++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 905aa3b..2a69f21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,13 +14,14 @@ Core
 
 Frontend
   * Sorting maps by alias in header menu now
-  * Bugfix: Not adding default_params parameter to all maps after editing the
-    global map configuration using the web frontend
   * Added map name dropdown to parent_map option when editing global map
     configuration
   * iconset option is now optional when creating maps using the GUI
   * Reimplemented the "clone object" functionality in edit mode
   * Only show the edit links in context menu when permitted to edit the map
+  * long text values with no spaces do not stretch the add/modify dialog anymore
+  * Bugfix: Not adding default_params parameter to all maps after editing the
+    global map configuration using the web frontend
   * Bugfix: Don't enable map_image when not set when editing the global
     sections of maps
   * Bugfix: Removing just dragged new lines before opening the add/modify dialog
diff --git a/share/server/core/classes/WuiViewMapAddModify.php b/share/server/core/classes/WuiViewMapAddModify.php
index bb6a5dc..f2497a5 100644
--- a/share/server/core/classes/WuiViewMapAddModify.php
+++ b/share/server/core/classes/WuiViewMapAddModify.php
@@ -281,6 +281,16 @@ class WuiViewMapAddModify {
                     $ret .= $this->inputField($propname, $value, $hideField);
                 break;
             }
+            
+            // Try to split too long values in chunks
+            // At the moment the only way is to try to add a space after each ",".
+            // The browsers do break automatically at & and spaces - so no need to
+            // do anything there. Seems to be enough for now
+            if(strlen($valueTxt) > 36 && strpos($valueTxt, ' ') === false) {
+                if(strpos($valueTxt, ',') !== false) {
+                    $valueTxt = str_replace(',', ', ', $valueTxt);
+                }
+            }
 
             $ret .= '<span id="_txt_'.$propname.'"'.$hideTxt.'>'.$valueTxt.'</span>';

Author:   Lars Michelsen <lm@...>
Date:     Thu Nov 24 18:40:13 2011 +0100
Committer:   Lars Michelsen <lm@...>
Commit-Date: Thu Nov 24 18:40:13 2011 +0100

Bugfix: Removing just dragged new lines before opening the add/modify dialog

---

 ChangeLog                           |    1 +
 TODO                                |    1 -
 share/frontend/nagvis-js/js/edit.js |   10 +++++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 565a824..905aa3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,7 @@ Frontend
   * Only show the edit links in context menu when permitted to edit the map
   * Bugfix: Don't enable map_image when not set when editing the global
     sections of maps
+  * Bugfix: Removing just dragged new lines before opening the add/modify dialog
 
 1.6rc4
 Core
diff --git a/TODO b/TODO
index e929be5..042821b 100644
--- a/TODO
+++ b/TODO
@@ -10,7 +10,6 @@ Relative Koordinaten:
     - Beim Config Parsen Fehlermeldung erzeugen
 - Sidebar Folder auf/zu klappbar
 - In Sidebar/Dropdown die aktuelle Map highlighten
-- Abgebrochene Linie wieder aus Ansicht entfernen
 - line_weather_color umbrechen wenn als Text dargestellt
 - line_label_y_offset wird noch nicht sauber berechnet
 
diff --git a/share/frontend/nagvis-js/js/edit.js b/share/frontend/nagvis-js/js/edit.js
index 569fb84..ac6ae4b 100644
--- a/share/frontend/nagvis-js/js/edit.js
+++ b/share/frontend/nagvis-js/js/edit.js
@@ -436,8 +436,10 @@ function addClick(e) {
     pos = null;
 
     // Draw a line to illustrate the progress of drawing the current line
-    if(addViewType === 'line' || addObjType === 'textbox' || addObjType === 'line') {
+    if((addViewType === 'line' || addObjType === 'textbox' || addObjType === 'line')
+       && addShape === null) {
         addShape = new jsGraphics('map');
+        addShape.cnv.setAttribute('id', 'drawing');
 
         addShape.setColor('#06B606');
         addShape.setStroke(1);
@@ -480,6 +482,12 @@ function addClick(e) {
     if(sUrl === '')
         return false;
 
+    // remove the drawing area. Once reached this it is not needed anymore
+    if(addShape !== null) {
+        addShape.clear();
+        document.getElementById('map').removeChild(addShape.cnv);
+    }
+
     // FIXME: Language string
     showFrontendDialog(sUrl, 'Properties');
     sUrl = '';

Author:   Lars Michelsen <lm@...>
Date:     Thu Nov 24 11:29:41 2011 +0100
Committer:   Lars Michelsen <lm@...>
Commit-Date: Thu Nov 24 11:29:41 2011 +0100

omd_install.sh deals now correctly with new conf.d directory

---

 ChangeLog      |    1 +
 TODO           |    2 --
 omd_install.sh |   13 ++++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5e87361..565a824 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 1.6
 Core
   * Implented conf.d/ directory to have an optional modular main configuration
+  * omd_install.sh deals now correctly with new conf.d directory
   * Improved the installer a bit: Better directory detections; Less questions
     during update
   * Removed all old demo maps and created new ones using an the internal test
diff --git a/TODO b/TODO
index c788e41..e929be5 100644
--- a/TODO
+++ b/TODO
@@ -13,8 +13,6 @@ Relative Koordinaten:
 - Abgebrochene Linie wieder aus Ansicht entfernen
 - line_weather_color umbrechen wenn als Text dargestellt
 - line_label_y_offset wird noch nicht sauber berechnet
-- omd_install.sh - muss mit alten nagvis-omd.ini.php umgehen können und die 
-  nach conf.d/omd.ini.php bewegen können
 
 -------------------------------------------------------------------------------
 
diff --git a/omd_install.sh b/omd_install.sh
index 6664cbc..c4ad2ac 100755
--- a/omd_install.sh
+++ b/omd_install.sh
@@ -69,13 +69,16 @@ if [ -d $OMD_ROOT/var/nagvis/userfiles ]; then
 fi
 
 # Handle the old and new omd specific config file paths
-if [ -d $OMD_ROOT/etc/nagvis/conf.d ]; then
-    OMD_CFG=$OMD_ROOT/etc/nagvis/conf.d/omd.ini.php
-else
-    OMD_CFG=$OMD_ROOT/etc/nagvis/nagvis-omd.ini.php
+OMD_CFG=$OMD_ROOT/etc/nagvis/conf.d/omd.ini.php
+if [ ! -d $OMD_ROOT/etc/nagvis/conf.d ]; then
+    mkdir $OMD_ROOT/etc/nagvis/conf.d
+    if [ -f $OMD_ROOT/etc/nagvis/nagvis-omd.ini.php ]; then
+        mv $OMD_ROOT/etc/nagvis/nagvis-omd.ini.php $OMD_ROOT/etc/nagvis/conf.d/omd.ini.php
+        ln -s $OMD_ROOT/etc/nagvis/conf.d/omd.ini.php $OMD_ROOT/etc/nagvis/nagvis-omd.ini.php
+    fi
 fi
 
-# Backup the nagvis-omd.ini.php on first time using omd_install.sh
+# Backup the omd.ini.php on first time using omd_install.sh
 if ! grep omd_install.sh $OMD_CFG >/dev/null 2>&1; then
     cp $OMD_CFG $OMD_CFG.bak
 fi

Author:   Lars Michelsen <lm@...>
Date:     Thu Nov 24 11:24:22 2011 +0100
Committer:   Lars Michelsen <lm@...>
Commit-Date: Thu Nov 24 11:24:22 2011 +0100

Bugfix: Correctly adding object_id=0 to global section when creating maps

---

 ChangeLog                                  |    1 +
 TODO                                       |    2 ++
 share/server/core/classes/GlobalMapCfg.php |    2 +-
 3 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e4f4fd1..5e87361 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ Core
   * Using z=5 for textboxes and z=1 for shapes again as default values
   * Added new config option line_label_y_offset to configure the label offset
     used in weathermap lines which show percentage and absolute bandwidth labels
+  * Bugfix: Correctly adding object_id=0 to global section when creating maps
 
 Frontend
   * Sorting maps by alias in header menu now
diff --git a/TODO b/TODO
index e929be5..c788e41 100644
--- a/TODO
+++ b/TODO
@@ -13,6 +13,8 @@ Relative Koordinaten:
 - Abgebrochene Linie wieder aus Ansicht entfernen
 - line_weather_color umbrechen wenn als Text dargestellt
 - line_label_y_offset wird noch nicht sauber berechnet
+- omd_install.sh - muss mit alten nagvis-omd.ini.php umgehen können und die 
+  nach conf.d/omd.ini.php bewegen können
 
 -------------------------------------------------------------------------------
 
diff --git a/share/server/core/classes/GlobalMapCfg.php b/share/server/core/classes/GlobalMapCfg.php
index 9a84e3e..d4a3700 100644
--- a/share/server/core/classes/GlobalMapCfg.php
+++ b/share/server/core/classes/GlobalMapCfg.php
@@ -879,7 +879,7 @@ class GlobalMapCfg {
             $keys = array_keys($this->mapConfig[$id]);
 
         foreach($keys AS $key)
-            if($key !== 'type' && isset($this->mapConfig[$id][$key]) && $this->mapConfig[$id][$key] != '')
+            if($key !== 'type' && isset($this->mapConfig[$id][$key]) && $this->mapConfig[$id][$key] !== '')
                 $a[] = $key.'='.$this->mapConfig[$id][$key]."\n";
 
         $a[] = "}\n";

Author:   Lars Michelsen <lm@...>
Date:     Thu Nov 24 11:17:06 2011 +0100
Committer:   Lars Michelsen <lm@...>
Commit-Date: Thu Nov 24 11:17:06 2011 +0100

Disabled preselection of std_medium iconset when creating maps

---

 .../userfiles/templates/default.wuiManageMaps.html |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/share/userfiles/templates/default.wuiManageMaps.html b/share/userfiles/templates/default.wuiManageMaps.html
index a0dfae3..bc183a7 100644
--- a/share/userfiles/templates/default.wuiManageMaps.html
+++ b/share/userfiles/templates/default.wuiManageMaps.html
@@ -19,7 +19,6 @@ lang = {$lang};
                 </select>
             </td>
         </tr>
-        <script>document.map_create.map_iconset.value="std_medium";</script>
         <tr>
             <td class="tdlabel">{$langBackground}</td><td class="tdfield">
                 <select name="map_image">

Author:   Lars Michelsen <lm@...>
Date:     Thu Nov 24 11:15:17 2011 +0100
Committer:   Lars Michelsen <lm@...>
Commit-Date: Thu Nov 24 11:15:17 2011 +0100

Bugfix: Don't enable map_image when not set when editing the global sections of maps

---

 ChangeLog                                |    2 ++
 TODO                                     |    2 +-
 share/server/core/classes/CoreModMap.php |    2 +-
 share/server/core/mapcfg/default.php     |   17 +++++++++--------
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7513658..e4f4fd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@ Frontend
   * iconset option is now optional when creating maps using the GUI
   * Reimplemented the "clone object" functionality in edit mode
   * Only show the edit links in context menu when permitted to edit the map
+  * Bugfix: Don't enable map_image when not set when editing the global
+    sections of maps
 
 1.6rc4
 Core
diff --git a/TODO b/TODO
index f2ead93..e929be5 100644
--- a/TODO
+++ b/TODO
@@ -9,10 +9,10 @@ Relative Koordinaten:
     - In WUI Fehler anzeigen
     - Beim Config Parsen Fehlermeldung erzeugen
 - Sidebar Folder auf/zu klappbar
-- Objekt klonen neu implementieren
 - In Sidebar/Dropdown die aktuelle Map highlighten
 - Abgebrochene Linie wieder aus Ansicht entfernen
 - line_weather_color umbrechen wenn als Text dargestellt
+- line_label_y_offset wird noch nicht sauber berechnet
 
 -------------------------------------------------------------------------------
 
diff --git a/share/server/core/classes/CoreModMap.php b/share/server/core/classes/CoreModMap.php
index 10a123e..38ca823 100644
--- a/share/server/core/classes/CoreModMap.php
+++ b/share/server/core/classes/CoreModMap.php
@@ -837,7 +837,7 @@ class CoreModMap extends CoreModule {
         if(!$MAPCFG->createMapConfig())
             return false;
 
-        $MAPCFG->addElement('global', $a, true);
+        $MAPCFG->addElement('global', $a, true, 0);
         return true;
     }
 
diff --git a/share/server/core/mapcfg/default.php b/share/server/core/mapcfg/default.php
index f2f7fd6..bcdbbc9 100644
--- a/share/server/core/mapcfg/default.php
+++ b/share/server/core/mapcfg/default.php
@@ -146,27 +146,28 @@ function listBackendIds($CORE) {
 
 $mapConfigVars = Array(
     'type' => Array(
-        'must' => 0,
-        'match' => MATCH_OBJECTTYPE,
+        'must'       => 0,
+        'match'      => MATCH_OBJECTTYPE,
         'field_type' => 'hidden',
     ),
     'object_id' => Array(
-        'must' => 0,
-        'match' => MATCH_OBJECTID,
+        'must'       => 0,
+        'match'      => MATCH_OBJECTID,
         'field_type' => 'hidden',
     ),
     'allowed_for_config' => Array(
-        'must' => 0,
+        'must'       => 0,
         'deprecated' => true,
-        'match' => MATCH_STRING,
+        'match'      => MATCH_STRING,
     ),
     'allowed_user' => Array(
-        'must' => 0,
+        'must'       => 0,
         'deprecated' => true,
-        'match' => MATCH_STRING,
+        'match'      => MATCH_STRING,
     ),
     'map_image' => Array(
         'must'       => 0,
+        'default'    => '',
         'match'      => MATCH_PNG_GIF_JPG_FILE_OR_URL_NONE,
         'field_type' => 'dropdown',
         'list'       => 'listMapImages',