[Nagvis-checkins] SF.net Git: nagvis: * Checking read permissions before reading directory contents

[lars <la...@us...>]

Author:   Lars Michelsen <lm...@la...>
Date:     Wed Jul 27 20:55:02 2011 +0200
Committer:   Lars Michelsen <lm...@la...>
Commit-Date: Wed Jul 27 20:55:02 2011 +0200

  * Checking read permissions before reading directory contents
  * Bugfix: Added backgrounds/styles [paths] options to main cfg
  * definitions

---

 ChangeLog                                   |    2 ++
 share/server/core/classes/GlobalCore.php    |    2 +-
 share/server/core/classes/GlobalMainCfg.php |   12 ++++++++++++
 3 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d7daa3a..bacd146 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@ Frontend
 
 Core
   * omd_install: Installing missing doc/ dir now; Cleaning cache files on install
+  * Checking read permissions before reading directory contents
+  * Bugfix: Added backgrounds/styles [paths] options to main cfg definitions
 
 Automap
   * Improved coordinate parsing regex to match graphviz output of more versions
diff --git a/share/server/core/classes/GlobalCore.php b/share/server/core/classes/GlobalCore.php
index 804fa26..abecc27 100644
--- a/share/server/core/classes/GlobalCore.php
+++ b/share/server/core/classes/GlobalCore.php
@@ -401,7 +401,7 @@ class GlobalCore {
         if($setKey === null)
             $setKey = false;
 
-        if(!self::checkExisting($dir, $printErr))
+        if(!self::checkExisting($dir, $printErr) || !self::checkReadable($dir, $printErr))
             return $files;
 
         if($handle = opendir($dir)) {
diff --git a/share/server/core/classes/GlobalMainCfg.php b/share/server/core/classes/GlobalMainCfg.php
index b4fab20..d9ef9b0 100644
--- a/share/server/core/classes/GlobalMainCfg.php
+++ b/share/server/core/classes/GlobalMainCfg.php
@@ -477,6 +477,18 @@ class GlobalMainCfg {
                     'default' => '',
                     'field_type' => 'hidden',
                     'match' => MATCH_STRING_PATH),
+                'styles' => Array(
+                    'must'       => 0,
+                    'editable'   => 0,
+                    'default'    => '',
+                    'field_type' => 'hidden',
+                    'match'      => MATCH_STRING_PATH),
+                'backgrounds' => Array(
+                    'must'       => 0,
+                    'editable'   => 0,
+                    'default'    => '',
+                    'field_type' => 'hidden',
+                    'match'      => MATCH_STRING_PATH),
                 'templates' => Array('must' => 0,
                     'editable' => 0,
                     'default' => '',