Author: Wolfgang <[email protected]>
Date: Thu Mar 21 21:36:12 2013 +0100
Committer: Wolfgang <[email protected]>
Commit-Date: Thu Mar 21 21:36:12 2013 +0100
bugfix: added missing slash, changed match_type
---
share/server/core/classes/GlobalMainCfg.php | 2 +-
share/server/core/sources/geomap.php | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/share/server/core/classes/GlobalMainCfg.php
b/share/server/core/classes/GlobalMainCfg.php
index bef1340..2924989 100644
--- a/share/server/core/classes/GlobalMainCfg.php
+++ b/share/server/core/classes/GlobalMainCfg.php
@@ -134,7 +134,7 @@ class GlobalMainCfg {
'http_proxy_auth' => array(
'must' => 0,
'default' => null,
- 'match' => MATCH_STRING_NO_SPACE,
+ 'match' => MATCH_STRING,
),
'http_timeout' => array(
'must' => 1,
diff --git a/share/server/core/sources/geomap.php
b/share/server/core/sources/geomap.php
index 50ec763..1ebd464 100644
--- a/share/server/core/sources/geomap.php
+++ b/share/server/core/sources/geomap.php
@@ -22,7 +22,7 @@ function geomap_read_csv($p) {
foreach(file($f) AS $line) {
// skip lines beginning with any of the usual comment characters
- if(preg_match('/^[;#\/]',$line))
+ if(preg_match('/^[;#\/]/',$line))
continue;
$parts = explode(';', $line);
$locations[] = array(
@@ -108,10 +108,10 @@ function geomap_get_contents($url) {
if($proxy !== null) {
$opts['http']['proxy'] = $proxy;
$opts['http']['request_fulluri'] = true;
- }
- $proxy_auth = cfg('global', 'http_proxy_auth');
- if($proxy_auth !== null) {
- $opts['http']['header'] = 'Proxy-Authorization: Basic ' .
base64_encode("$proxy_auth");
+ $proxy_auth = cfg('global', 'http_proxy_auth');
+ if($proxy_auth !== null) {
+ $opts['http']['header'] = 'Proxy-Authorization: Basic ' .
base64_encode("$proxy_auth");
+ }
}
$context = stream_context_create($opts);
@@ -144,7 +144,7 @@ function list_geomap_source_files($CORE) {
return $CORE->getAvailableGeomapSourceFiles();
}
-// options to be modyfiable by the user(url)
+// options to be modifiable by the user(url)
global $viewParams;
$viewParams = array(
'geomap' => array(
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
