Module: nagvis Branch: master Commit: 23bf0f503f5aec01e5263b937215398a27b73c4d URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=23bf0f503f5aec01e5263b937215398a27b73c4d
Author: Lars Michelsen <[email protected]> Date: Fri May 14 23:16:34 2010 +0200 Removed deprecated options from docs and fixed backward compatibility to maxLayers parameter in automap --- docs/en_US/automap_config_format.html | 4 ++-- etc/automaps/__automap.cfg | 2 +- etc/nagvis.ini.php-sample | 2 +- share/server/core/classes/GlobalMainCfg.php | 2 +- share/server/core/classes/NagVisAutoMap.php | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/en_US/automap_config_format.html b/docs/en_US/automap_config_format.html index f28f92e..af1a17c 100644 --- a/docs/en_US/automap_config_format.html +++ b/docs/en_US/automap_config_format.html @@ -58,7 +58,7 @@ <td>context_template</td><td>inherited (<a href="nagvis_config_format_description.html">nagvis.ini.php</a>)</td><td>Default <a href="context_templates.html">context template</a> to be used on this map </td> </tr> <tr> - <td>default_params</td><td>inherited (<a href="nagvis_config_format_description.html">nagvis.ini.php</a>)</td><td>Default parameters to take when the different options are not given by url. Format is as in the URL e.g. <code>&maxLayers=2</code>. Valid options can be found <a href="automap.html">here</a>. (<font color="#ff0000">New in 1.5</font>)</td> + <td>default_params</td><td>inherited (<a href="nagvis_config_format_description.html">nagvis.ini.php</a>)</td><td>Default parameters to take when the different options are not given by url. Format is as in the URL e.g. <code>&childLayers=2</code>. Valid options can be found <a href="automap.html">here</a>. (<font color="#ff0000">New in 1.5</font>)</td> </tr> <tr> <td>event_background</td><td>inherited (<a href="nagvis_config_format_description.html">nagvis.ini.php</a>)</td><td>Enable/Disable changing background color on state changes (Configured color is shown when summary state is PENDING, OK or UP). </td> @@ -161,4 +161,4 @@ </tr> </table> </body> -</html> \ No newline at end of file +</html> diff --git a/etc/automaps/__automap.cfg b/etc/automaps/__automap.cfg index 6381bb8..c94e5db 100644 --- a/etc/automaps/__automap.cfg +++ b/etc/automaps/__automap.cfg @@ -49,5 +49,5 @@ url=[htmlcgi]/status.cgi?host=[host_name] #x=0 #y=0 #iconset=std_big -#url=[htmlbase]/frontend/nagvis-js/index.php?mod=AutoMap&act=view&show=__automap&root=www2.nagvis.org&maxLayers=2&renderMode=undirected +#url=[htmlbase]/frontend/nagvis-js/index.php?mod=AutoMap&act=view&show=__automap&root=www2.nagvis.org&childLayers=2&renderMode=undirected #} diff --git a/etc/nagvis.ini.php-sample b/etc/nagvis.ini.php-sample index f520db1..2e3414c 100644 --- a/etc/nagvis.ini.php-sample +++ b/etc/nagvis.ini.php-sample @@ -214,7 +214,7 @@ ; Options for the Automap [automap] ; Default URL parameters for links to the automap -;defaultparams="&maxLayers=2" +;defaultparams="&childLayers=2" ; Default root host (NagVis uses this if it can't detect it via NDO) ;defaultroot="" ; Path to the graphviz binaries (dot,neato,...); Only needed if not in ENV PATH diff --git a/share/server/core/classes/GlobalMainCfg.php b/share/server/core/classes/GlobalMainCfg.php index f3cde71..46248e7 100644 --- a/share/server/core/classes/GlobalMainCfg.php +++ b/share/server/core/classes/GlobalMainCfg.php @@ -548,7 +548,7 @@ class GlobalMainCfg { 'automap' => Array( 'defaultparams' => Array('must' => 0, 'editable' => 1, - 'default' => '&maxLayers=2', + 'default' => '&childLayers=2', 'match' => MATCH_STRING_URL), 'defaultroot' => Array('must' => 0, 'editable' => 1, diff --git a/share/server/core/classes/NagVisAutoMap.php b/share/server/core/classes/NagVisAutoMap.php index ec44d52..7ce29d1 100644 --- a/share/server/core/classes/NagVisAutoMap.php +++ b/share/server/core/classes/NagVisAutoMap.php @@ -121,7 +121,7 @@ class NagVisAutoMap extends GlobalMap { * This is for compatibility to old the old parent layer limitation * FIXME: May be removed in 1.6 */ - if(isset($prop['maxLayers']) && $prop['maxLayers'] != '' && (!isset($prop['childLayers']) || $prop['childLayers'] == '')) { + if(isset($prop['maxLayers']) && $prop['maxLayers'] != '') { $prop['childLayers'] = $prop['maxLayers']; } ------------------------------------------------------------------------------ _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
