diff --git a/GPL_LIB/Color_Picker/color_picker.html b/GPL_LIB/Color_Picker/color_picker.html
index bb7ed3f6c8fea2c1fc42ac92898ba6f9fe81b25c..e18bc0678e653815555b6c61e8b8224232c74236 100644
--- a/GPL_LIB/Color_Picker/color_picker.html
+++ b/GPL_LIB/Color_Picker/color_picker.html
@@ -171,7 +171,7 @@
</td>
</tr>
</table>
- <br>
+ <br />
<table align="center">
<tr valign="center">
<td>Résultat :</td>
diff --git a/GPL_LIB/Color_Picker/color_picker.php b/GPL_LIB/Color_Picker/color_picker.php
index 52cce114f6ed7ffae362328e961c8f42685f3d05..f52ca66448514beb1b54831c54c64a9aff2602e9 100644
--- a/GPL_LIB/Color_Picker/color_picker.php
+++ b/GPL_LIB/Color_Picker/color_picker.php
@@ -185,7 +185,7 @@ $name2 = $n."_color";
</td>
</tr>
</table>
- <br>
+ <br />
<table align="center">
<tr valign="center">
<td><input type="button" name="btn_choose_color" value=" " style="background-color:#000000; border-color:#000000; width:100px; height:35px;"></td>
diff --git a/GPL_LIB/Smarty/demo/templates/index.tpl b/GPL_LIB/Smarty/demo/templates/index.tpl
index f274cc5e1b253dd194e8c55666b1bf7a27bf1f1a..238d86514276221b27d682c16a944ed93f4685e5 100644
--- a/GPL_LIB/Smarty/demo/templates/index.tpl
+++ b/GPL_LIB/Smarty/demo/templates/index.tpl
@@ -37,9 +37,9 @@ An example of a section loop:
An example of section looped key values:
{section name=sec1 loop=$contacts}
- phone: {$contacts[sec1].phone}<br>
- fax: {$contacts[sec1].fax}<br>
- cell: {$contacts[sec1].cell}<br>
+ phone: {$contacts[sec1].phone}<br />
+ fax: {$contacts[sec1].fax}<br />
+ cell: {$contacts[sec1].cell}<br />
{/section}
<p>
diff --git a/GPL_LIB/Smarty/libs/internals/core.assign_smarty_interface.php b/GPL_LIB/Smarty/libs/internals/core.assign_smarty_interface.php
index 500ba9a96a3555d821e10f204685865b78d3be8d..2266ff425068b9326a4718f1b21aa8d52433eab1 100644
--- a/GPL_LIB/Smarty/libs/internals/core.assign_smarty_interface.php
+++ b/GPL_LIB/Smarty/libs/internals/core.assign_smarty_interface.php
@@ -8,8 +8,8 @@
/**
* Smarty assign_smarty_interface core plugin
*
- * Type: core<br>
- * Name: assign_smarty_interface<br>
+ * Type: core<br />
+ * Name: assign_smarty_interface<br />
* Purpose: assign the $smarty interface variable
* @param array Format: null
* @param Smarty
diff --git a/GPL_LIB/Smarty/libs/internals/core.display_debug_console.php b/GPL_LIB/Smarty/libs/internals/core.display_debug_console.php
index 596867673fc05fba51db5a7b17cfb549f05352f7..5c86ef1b97a0ce6a73da7d984f25fc38294ae7ac 100644
--- a/GPL_LIB/Smarty/libs/internals/core.display_debug_console.php
+++ b/GPL_LIB/Smarty/libs/internals/core.display_debug_console.php
@@ -8,8 +8,8 @@
/**
* Smarty debug_console function plugin
*
- * Type: core<br>
- * Name: display_debug_console<br>
+ * Type: core<br />
+ * Name: display_debug_console<br />
* Purpose: display the javascript debug console window
* @param array Format: null
* @param Smarty
diff --git a/GPL_LIB/Smarty/libs/plugins/block.textformat.php b/GPL_LIB/Smarty/libs/plugins/block.textformat.php
index 2a374232d976b10dd75d871f48f419ec51715a36..d06474db32f806894180f94c1ab8eef8392330fc 100644
--- a/GPL_LIB/Smarty/libs/plugins/block.textformat.php
+++ b/GPL_LIB/Smarty/libs/plugins/block.textformat.php
@@ -8,10 +8,10 @@
/**
* Smarty {textformat}{/textformat} block plugin
*
- * Type: block function<br>
- * Name: textformat<br>
+ * Type: block function<br />
+ * Name: textformat<br />
* Purpose: format text a certain way with preset styles
- * or custom wrap/indent settings<br>
+ * or custom wrap/indent settings<br />
* @link http://smarty.php.net/manual/en/language.function.textformat.php {textformat}
* (Smarty online manual)
* @param array
diff --git a/GPL_LIB/Smarty/libs/plugins/compiler.assign.php b/GPL_LIB/Smarty/libs/plugins/compiler.assign.php
index 25970f1bfae0213fb3bfffa4a1fc2ca9ce82edb4..2c4b874ed383e1076da8c639c1ee6c19796413e0 100644
--- a/GPL_LIB/Smarty/libs/plugins/compiler.assign.php
+++ b/GPL_LIB/Smarty/libs/plugins/compiler.assign.php
@@ -8,8 +8,8 @@
/**
* Smarty {assign} compiler function plugin
*
- * Type: compiler function<br>
- * Name: assign<br>
+ * Type: compiler function<br />
+ * Name: assign<br />
* Purpose: assign a value to a template variable
* @link http://smarty.php.net/manual/en/language.custom.functions.php#LANGUAGE.FUNCTION.ASSIGN {assign}
* (Smarty online manual)
diff --git a/GPL_LIB/Smarty/libs/plugins/function.assign_debug_info.php b/GPL_LIB/Smarty/libs/plugins/function.assign_debug_info.php
index cc2c14b542c60e433c81383b0af1bb09bd06780f..69f60bf0b7f4a441f179b3fc1ab9eccd85a5d5ae 100644
--- a/GPL_LIB/Smarty/libs/plugins/function.assign_debug_info.php
+++ b/GPL_LIB/Smarty/libs/plugins/function.assign_debug_info.php
@@ -8,9 +8,9 @@
/**
* Smarty {assign_debug_info} function plugin
*
- * Type: function<br>
- * Name: assign_debug_info<br>
- * Purpose: assign debug info to the template<br>
+ * Type: function<br />
+ * Name: assign_debug_info<br />
+ * Purpose: assign debug info to the template<br />
* @author Monte Ohrt <monte at ohrt dot com>
* @param array unused in this plugin, this plugin uses {@link Smarty::$_config},
* {@link Smarty::$_tpl_vars} and {@link Smarty::$_smarty_debug_info}
diff --git a/GPL_LIB/Smarty/libs/plugins/function.config_load.php b/GPL_LIB/Smarty/libs/plugins/function.config_load.php
index 062c3564a9bc0d55ffbc141cb7b64ad690825c1b..04d1e52b3de26e869bc2bac2d75020119113a279 100644
--- a/GPL_LIB/Smarty/libs/plugins/function.config_load.php
+++ b/GPL_LIB/Smarty/libs/plugins/function.config_load.php
@@ -8,8 +8,8 @@
/**
* Smarty {config_load} function plugin
*
- * Type: function<br>
- * Name: config_load<br>
+ * Type: function<br />
+ * Name: config_load<br />
* Purpose: load config file vars
* @link http://smarty.php.net/manual/en/language.function.config.load.php {config_load}
* (Smarty online manual)
diff --git a/GPL_LIB/Smarty/libs/plugins/function.counter.php b/GPL_LIB/Smarty/libs/plugins/function.counter.php
index e8937d11156901749105fdce0504c5fa890ea654..7aa7bacdeb95c9f3d515c8874dd18df134160193 100644
--- a/GPL_LIB/Smarty/libs/plugins/function.counter.php
+++ b/GPL_LIB/Smarty/libs/plugins/function.counter.php
@@ -9,8 +9,8 @@
/**
* Smarty {counter} function plugin
*
- * Type: function<br>
- * Name: counter<br>
+ * Type: function<br />
+ * Name: counter<br />
* Purpose: print out a counter value
* @author Monte Ohrt <monte at ohrt dot com>
* @link http://smarty.php.net/manual/en/language.function.counter.php {counter}
diff --git a/GPL_LIB/Smarty/libs/plugins/function.cycle.php b/GPL_LIB/Smarty/libs/plugins/function.cycle.php
index 1a04af98ae8cd22d2fbb5c0b2c4e77e5ae547fc5..6a84fd6fd98de4e5aaded203ca8cf80fe062c49e 100644
--- a/GPL_LIB/Smarty/libs/plugins/function.cycle.php
+++ b/GPL_LIB/Smarty/libs/plugins/function.cycle.php
@@ -8,10 +8,10 @@
/**
* Smarty {cycle} function plugin
*
- * Type: function<br>
- * Name: cycle<br>
- * Date: May 3, 2002<br>
- * Purpose: cycle through given values<br>
+ * Type: function<br />
+ * Name: cycle<br />
+ * Date: May 3, 2002<br />
+ * Purpose: cycle through given values<br />
* Input:
* - name = name of cycle (optional)
* - values = comma separated list of values to cycle,
@@ -24,7 +24,7 @@
* - assign = boolean, assigns to template var instead of
* printed.
*
- * Examples:<br>
+ * Examples:<br />
* <pre>
* {cycle values="#eeeeee,#d0d0d0d"}
* {cycle name=row values="one,two,three" reset=true}
diff --git a/GPL_LIB/Smarty/libs/plugins/function.debug.php b/GPL_LIB/Smarty/libs/plugins/function.debug.php
index de09b308cd5b49bfdcc564657d4e3c760b0f98ee..aba9c46984b070a7e79e2c046d2f2d324615ba14 100644
--- a/GPL_LIB/Smarty/libs/plugins/function.debug.php
+++ b/GPL_LIB/Smarty/libs/plugins/function.debug.php
@@ -9,9 +9,9 @@
/**
* Smarty {debug} function plugin
*
- * Type: function<br>
- * Name: debug<br>
- * Date: July 1, 2002<br>
+ * Type: function<br />
+ * Name: debug<br />
+ * Date: July 1, 2002<br />
* Purpose: popup debug window
* @link http://smarty.php.net/manual/en/language.function.debug.php {debug}
* (Smarty online manual)
diff --git a/GPL_LIB/Smarty/libs/plugins/function.eval.php b/GPL_LIB/Smarty/libs/plugins/function.eval.php
index 3bb8cbb4269234c835811ebc14a47cab185742a6..3739ed242544ef77201da31f615c0f1a3a1d6d39 100644
--- a/GPL_LIB/Smarty/libs/plugins/function.eval.php
+++ b/GPL_LIB/Smarty/libs/plugins/function.eval.php
@@ -9,9 +9,9 @@
/**
* Smarty {eval} function plugin
*
- * Type: function<br>
- * Name: eval<br>
- * Purpose: evaluate a template variable as a template<br>
+ * Type: function<br />
+ * Name: eval<br />
+ * Purpose: evaluate a template variable as a template<br />
* @link http://smarty.php.net/manual/en/language.function.eval.php {eval}
* (Smarty online manual)
* @author Monte Ohrt <monte at ohrt dot com>
diff --git a/GPL_LIB/Smarty/libs/plugins/function.fetch.php b/GPL_LIB/Smarty/libs/plugins/function.fetch.php
index 0d5ce7f7591134a5eb46f843b2595f7d2d5ebfa0..c8f345b90344d885799978eaa03a08c33c2847aa 100644
--- a/GPL_LIB/Smarty/libs/plugins/function.fetch.php
+++ b/GPL_LIB/Smarty/libs/plugins/function.fetch.php
@@ -9,8 +9,8 @@
/**
* Smarty {fetch} plugin
*
- * Type: function<br>
- * Name: fetch<br>
+ * Type: function<br />
+ * Name: fetch<br />
* Purpose: fetch file, web or ftp data and display results
* @link http://smarty.php.net/manual/en/language.function.fetch.php {fetch}
* (Smarty online manual)
diff --git a/GPL_LIB/Smarty/libs/plugins/function.html_checkboxes.php b/GPL_LIB/Smarty/libs/plugins/function.html_checkboxes.php
index 45a161be6e776f8b52c9324afc8c767a6e364fa2..19d119b77e73f5ccdf4fa541d5e40c421c75b28e 100644
--- a/GPL_LIB/Smarty/libs/plugins/function.html_checkboxes.php
+++ b/GPL_LIB/Smarty/libs/plugins/function.html_checkboxes.php
@@ -9,24 +9,24 @@
/**
* Smarty {html_checkboxes} function plugin
*
- * File: function.html_checkboxes.php<br>
- * Type: function<br>
- * Name: html_checkboxes<br>
- * Date: 24.Feb.2003<br>
- * Purpose: Prints out a list of checkbox input types<br>
- * Input:<br>
+ * File: function.html_checkboxes.php<br />
+ * Type: function<br />
+ * Name: html_checkboxes<br />
+ * Date: 24.Feb.2003<br />
+ * Purpose: Prints out a list of checkbox input types<br />
+ * Input:<br />
* - name (optional) - string default "checkbox"
* - values (required) - array
* - options (optional) - associative array
* - checked (optional) - array default not set
- * - separator (optional) - ie <br> or
+ * - separator (optional) - ie <br /> or
* - output (optional) - the output next to each checkbox
* - assign (optional) - assign the output as an array to this variable
* Examples:
* <pre>
* {html_checkboxes values=$ids output=$names}
- * {html_checkboxes values=$ids name='box' separator='<br>' output=$names}
- * {html_checkboxes values=$ids checked=$checked separator='<br>' output=$names}
+ * {html_checkboxes values=$ids name='box' separator='<br />' output=$names}
+ * {html_checkboxes values=$ids checked=$checked separator='<br />' output=$names}
* </pre>
* @link http://smarty.php.net/manual/en/language.function.html.checkboxes.php {html_checkboxes}
* (Smarty online manual)
diff --git a/GPL_LIB/Smarty/libs/plugins/function.html_image.php b/GPL_LIB/Smarty/libs/plugins/function.html_image.php
index d758ebe7d8371c14fce73757ca77ca72e873915e..0a09efffc3423a80743975312e703ed57c0b8fbc 100644
--- a/GPL_LIB/Smarty/libs/plugins/function.html_image.php
+++ b/GPL_LIB/Smarty/libs/plugins/function.html_image.php
@@ -9,11 +9,11 @@
/**
* Smarty {html_image} function plugin
*
- * Type: function<br>
- * Name: html_image<br>
- * Date: Feb 24, 2003<br>
- * Purpose: format HTML tags for the image<br>
- * Input:<br>
+ * Type: function<br />
+ * Name: html_image<br />
+ * Date: Feb 24, 2003<br />
+ * Purpose: format HTML tags for the image<br />
+ * Input:<br />
* - file = file (and path) of image (required)
* - height = image height (optional, default actual height)
* - width = image width (optional, default actual width)
diff --git a/GPL_LIB/Smarty/libs/plugins/function.html_options.php b/GPL_LIB/Smarty/libs/plugins/function.html_options.php
index f84b63136b82582d516d4aff590ed4e24b4ddd3a..6304be21baf50df93f191c49ff49251cd275a46a 100644
--- a/GPL_LIB/Smarty/libs/plugins/function.html_options.php
+++ b/GPL_LIB/Smarty/libs/plugins/function.html_options.php
@@ -9,9 +9,9 @@
/**
* Smarty {html_options} function plugin
*
- * Type: function<br>
- * Name: html_options<br>
- * Input:<br>
+ * Type: function<br />
+ * Name: html_options<br />
+ * Input:<br />
* - name (optional) - string default "select"
* - values (required if no options supplied) - array
* - options (required if no values supplied) - associative array
diff --git a/GPL_LIB/Smarty/libs/plugins/function.html_radios.php b/GPL_LIB/Smarty/libs/plugins/function.html_radios.php
index 239ad8fc835b6114bf4e4ef90e8c88b14f262b2d..e356b8b585b99733f1132edecfdfb648aa5efd2c 100644
--- a/GPL_LIB/Smarty/libs/plugins/function.html_radios.php
+++ b/GPL_LIB/Smarty/libs/plugins/function.html_radios.php
@@ -9,24 +9,24 @@
/**
* Smarty {html_radios} function plugin
*
- * File: function.html_radios.php<br>
- * Type: function<br>
- * Name: html_radios<br>
- * Date: 24.Feb.2003<br>
- * Purpose: Prints out a list of radio input types<br>
- * Input:<br>
+ * File: function.html_radios.php<br />
+ * Type: function<br />
+ * Name: html_radios<br />
+ * Date: 24.Feb.2003<br />
+ * Purpose: Prints out a list of radio input types<br />
+ * Input:<br />
* - name (optional) - string default "radio"
* - values (required) - array
* - options (optional) - associative array
* - checked (optional) - array default not set
- * - separator (optional) - ie <br> or
+ * - separator (optional) - ie <br /> or
* - output (optional) - the output next to each radio button
* - assign (optional) - assign the output as an array to this variable
* Examples:
* <pre>
* {html_radios values=$ids output=$names}
- * {html_radios values=$ids name='box' separator='<br>' output=$names}
- * {html_radios values=$ids checked=$checked separator='<br>' output=$names}
+ * {html_radios values=$ids name='box' separator='<br />' output=$names}
+ * {html_radios values=$ids checked=$checked separator='<br />' output=$names}
* </pre>
* @link http://smarty.php.net/manual/en/language.function.html.radios.php {html_radios}
* (Smarty online manual)
diff --git a/GPL_LIB/Smarty/libs/plugins/function.html_select_date.php b/GPL_LIB/Smarty/libs/plugins/function.html_select_date.php
index 5e952c2112cc197770c34d221b62d009bceb2ce6..16ada704c3f0b74ce238be0ad749a8df62efb847 100644
--- a/GPL_LIB/Smarty/libs/plugins/function.html_select_date.php
+++ b/GPL_LIB/Smarty/libs/plugins/function.html_select_date.php
@@ -8,11 +8,11 @@
/**
* Smarty {html_select_date} plugin
*
- * Type: function<br>
- * Name: html_select_date<br>
+ * Type: function<br />
+ * Name: html_select_date<br />
* Purpose: Prints the dropdowns for date selection.
*
- * ChangeLog:<br>
+ * ChangeLog:<br />
* - 1.0 initial release
* - 1.1 added support for +/- N syntax for begin
* and end year values. (Monte)
diff --git a/GPL_LIB/Smarty/libs/plugins/function.html_select_time.php b/GPL_LIB/Smarty/libs/plugins/function.html_select_time.php
index c0f56eec03b7b554ad1eac02e687b51859d1bb98..4fee1dab710ccdf16971cec5f5267bbf5df775fc 100644
--- a/GPL_LIB/Smarty/libs/plugins/function.html_select_time.php
+++ b/GPL_LIB/Smarty/libs/plugins/function.html_select_time.php
@@ -9,8 +9,8 @@
/**
* Smarty {html_select_time} function plugin
*
- * Type: function<br>
- * Name: html_select_time<br>
+ * Type: function<br />
+ * Name: html_select_time<br />
* Purpose: Prints the dropdowns for time selection
* @link http://smarty.php.net/manual/en/language.function.html.select.time.php {html_select_time}
* (Smarty online manual)
diff --git a/GPL_LIB/Smarty/libs/plugins/function.html_table.php b/GPL_LIB/Smarty/libs/plugins/function.html_table.php
index d74da62cbf2140f585f29362f5cef5948a478540..388848018e8b96307c60c81d385bd0d208f6e4ed 100644
--- a/GPL_LIB/Smarty/libs/plugins/function.html_table.php
+++ b/GPL_LIB/Smarty/libs/plugins/function.html_table.php
@@ -9,11 +9,11 @@
/**
* Smarty {html_table} function plugin
*
- * Type: function<br>
- * Name: html_table<br>
- * Date: Feb 17, 2003<br>
- * Purpose: make an html table from an array of data<br>
- * Input:<br>
+ * Type: function<br />
+ * Name: html_table<br />
+ * Date: Feb 17, 2003<br />
+ * Purpose: make an html table from an array of data<br />
+ * Input:<br />
* - loop = array to loop through
* - cols = number of columns, comma separated list of column names
* or array of column names
diff --git a/GPL_LIB/Smarty/libs/plugins/function.mailto.php b/GPL_LIB/Smarty/libs/plugins/function.mailto.php
index e6be9089f841da7cf12e04f5d3855117c966e7d7..d8540ae07f5f9d3ed245a3699e5ec93b9ea9bff0 100644
--- a/GPL_LIB/Smarty/libs/plugins/function.mailto.php
+++ b/GPL_LIB/Smarty/libs/plugins/function.mailto.php
@@ -9,12 +9,12 @@
/**
* Smarty {mailto} function plugin
*
- * Type: function<br>
- * Name: mailto<br>
+ * Type: function<br />
+ * Name: mailto<br />
* Date: May 21, 2002
* Purpose: automate mailto address link creation, and optionally
- * encode them.<br>
- * Input:<br>
+ * encode them.<br />
+ * Input:<br />
* - address = e-mail address
* - text = (optional) text to display, default is address
* - encode = (optional) can be one of:
diff --git a/GPL_LIB/Smarty/libs/plugins/function.math.php b/GPL_LIB/Smarty/libs/plugins/function.math.php
index ed5c2d3439feed4a7093d36fdffbeccbd9cb4aed..54c86de8bd47d09be2e75c034f8742a41e10d43c 100644
--- a/GPL_LIB/Smarty/libs/plugins/function.math.php
+++ b/GPL_LIB/Smarty/libs/plugins/function.math.php
@@ -9,9 +9,9 @@
/**
* Smarty {math} function plugin
*
- * Type: function<br>
- * Name: math<br>
- * Purpose: handle math computations in template<br>
+ * Type: function<br />
+ * Name: math<br />
+ * Purpose: handle math computations in template<br />
* @link http://smarty.php.net/manual/en/language.function.math.php {math}
* (Smarty online manual)
* @author Monte Ohrt <monte at ohrt dot com>
diff --git a/GPL_LIB/Smarty/libs/plugins/function.popup.php b/GPL_LIB/Smarty/libs/plugins/function.popup.php
index 2048e4a6a5bf3d75909e70a0de0f1f059106a7cf..7f72923e71e32ebc96daee04296f4a383a7219ff 100644
--- a/GPL_LIB/Smarty/libs/plugins/function.popup.php
+++ b/GPL_LIB/Smarty/libs/plugins/function.popup.php
@@ -9,8 +9,8 @@
/**
* Smarty {popup} function plugin
*
- * Type: function<br>
- * Name: popup<br>
+ * Type: function<br />
+ * Name: popup<br />
* Purpose: make text pop up in windows via overlib
* @link http://smarty.php.net/manual/en/language.function.popup.php {popup}
* (Smarty online manual)
diff --git a/GPL_LIB/Smarty/libs/plugins/function.popup_init.php b/GPL_LIB/Smarty/libs/plugins/function.popup_init.php
index 3b0ab9944c6a119a62fca51831d3a4b53a81778e..1453e346bcc8d3b0d17988771f3c8731f38d01cf 100644
--- a/GPL_LIB/Smarty/libs/plugins/function.popup_init.php
+++ b/GPL_LIB/Smarty/libs/plugins/function.popup_init.php
@@ -9,8 +9,8 @@
/**
* Smarty {popup_init} function plugin
*
- * Type: function<br>
- * Name: popup_init<br>
+ * Type: function<br />
+ * Name: popup_init<br />
* Purpose: initialize overlib
* @link http://smarty.php.net/manual/en/language.function.popup.init.php {popup_init}
* (Smarty online manual)
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.capitalize.php b/GPL_LIB/Smarty/libs/plugins/modifier.capitalize.php
index 5c20b270ef5a24fca93fb12c39c898a68aba14f3..622517c854417b5902b5c8e700a7f1caf7e083a5 100644
--- a/GPL_LIB/Smarty/libs/plugins/modifier.capitalize.php
+++ b/GPL_LIB/Smarty/libs/plugins/modifier.capitalize.php
@@ -9,8 +9,8 @@
/**
* Smarty capitalize modifier plugin
*
- * Type: modifier<br>
- * Name: capitalize<br>
+ * Type: modifier<br />
+ * Name: capitalize<br />
* Purpose: capitalize words in the string
* @link http://smarty.php.net/manual/en/language.modifiers.php#LANGUAGE.MODIFIER.CAPITALIZE
* capitalize (Smarty online manual)
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.cat.php b/GPL_LIB/Smarty/libs/plugins/modifier.cat.php
index 308e597e7449edb41a129fd381e6199e37369f49..79fa59e96cce26c41d25626a54a4d8404d42519d 100644
--- a/GPL_LIB/Smarty/libs/plugins/modifier.cat.php
+++ b/GPL_LIB/Smarty/libs/plugins/modifier.cat.php
@@ -9,8 +9,8 @@
/**
* Smarty cat modifier plugin
*
- * Type: modifier<br>
- * Name: cat<br>
+ * Type: modifier<br />
+ * Name: cat<br />
* Date: Feb 24, 2003
* Purpose: catenate a value to a variable
* Input: string to catenate
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.count_characters.php b/GPL_LIB/Smarty/libs/plugins/modifier.count_characters.php
index 3888886200f015c8b90b3a6e377d9b9b62b80ad1..b5c162c0710548b4975e3f0dedc6eeeec6c45c4f 100644
--- a/GPL_LIB/Smarty/libs/plugins/modifier.count_characters.php
+++ b/GPL_LIB/Smarty/libs/plugins/modifier.count_characters.php
@@ -9,8 +9,8 @@
/**
* Smarty count_characters modifier plugin
*
- * Type: modifier<br>
- * Name: count_characteres<br>
+ * Type: modifier<br />
+ * Name: count_characteres<br />
* Purpose: count the number of characters in a text
* @link http://smarty.php.net/manual/en/language.modifier.count.characters.php
* count_characters (Smarty online manual)
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.count_paragraphs.php b/GPL_LIB/Smarty/libs/plugins/modifier.count_paragraphs.php
index f52228da9a00f87fe941699082e52225983a145a..8a8bef65d1181298b7ee3dd12626e33b16407a32 100644
--- a/GPL_LIB/Smarty/libs/plugins/modifier.count_paragraphs.php
+++ b/GPL_LIB/Smarty/libs/plugins/modifier.count_paragraphs.php
@@ -9,8 +9,8 @@
/**
* Smarty count_paragraphs modifier plugin
*
- * Type: modifier<br>
- * Name: count_paragraphs<br>
+ * Type: modifier<br />
+ * Name: count_paragraphs<br />
* Purpose: count the number of paragraphs in a text
* @link http://smarty.php.net/manual/en/language.modifier.count.paragraphs.php
* count_paragraphs (Smarty online manual)
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.count_sentences.php b/GPL_LIB/Smarty/libs/plugins/modifier.count_sentences.php
index 0f5af29af0d47212e9c4e6a9d3acad478c0f88f1..6b88add5d1f650ed33762191ec9daa829eba9f45 100644
--- a/GPL_LIB/Smarty/libs/plugins/modifier.count_sentences.php
+++ b/GPL_LIB/Smarty/libs/plugins/modifier.count_sentences.php
@@ -9,7 +9,7 @@
/**
* Smarty count_sentences modifier plugin
*
- * Type: modifier<br>
+ * Type: modifier<br />
* Name: count_sentences
* Purpose: count the number of sentences in a text
* @link http://smarty.php.net/manual/en/language.modifier.count.paragraphs.php
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.count_words.php b/GPL_LIB/Smarty/libs/plugins/modifier.count_words.php
index 607ed46acf11d957befbcd06466c905b3775ea07..8e006e88f1278e48d4931a5165e3a43b84b8c2d6 100644
--- a/GPL_LIB/Smarty/libs/plugins/modifier.count_words.php
+++ b/GPL_LIB/Smarty/libs/plugins/modifier.count_words.php
@@ -9,8 +9,8 @@
/**
* Smarty count_words modifier plugin
*
- * Type: modifier<br>
- * Name: count_words<br>
+ * Type: modifier<br />
+ * Name: count_words<br />
* Purpose: count the number of words in a text
* @link http://smarty.php.net/manual/en/language.modifier.count.words.php
* count_words (Smarty online manual)
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.date_format.php b/GPL_LIB/Smarty/libs/plugins/modifier.date_format.php
index e4e8850ab6d316f137d297d1213fce20a2995e5a..ed6db04c8460a17f22669811f1844bcf7ea7195e 100644
--- a/GPL_LIB/Smarty/libs/plugins/modifier.date_format.php
+++ b/GPL_LIB/Smarty/libs/plugins/modifier.date_format.php
@@ -12,10 +12,10 @@ require_once $smarty->_get_plugin_filepath('shared', 'make_timestamp');
/**
* Smarty date_format modifier plugin
*
- * Type: modifier<br>
- * Name: date_format<br>
- * Purpose: format datestamps via strftime<br>
- * Input:<br>
+ * Type: modifier<br />
+ * Name: date_format<br />
+ * Purpose: format datestamps via strftime<br />
+ * Input:<br />
* - string: input date string
* - format: strftime format for output
* - default_date: default date if $string is empty
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.debug_print_var.php b/GPL_LIB/Smarty/libs/plugins/modifier.debug_print_var.php
index 57378381495a1728b1b77d9f046038307c7c1a68..6611f374a48597b24d37950acc783f6268f3704b 100644
--- a/GPL_LIB/Smarty/libs/plugins/modifier.debug_print_var.php
+++ b/GPL_LIB/Smarty/libs/plugins/modifier.debug_print_var.php
@@ -9,8 +9,8 @@
/**
* Smarty debug_print_var modifier plugin
*
- * Type: modifier<br>
- * Name: debug_print_var<br>
+ * Type: modifier<br />
+ * Name: debug_print_var<br />
* Purpose: formats variable contents for display in the console
* @link http://smarty.php.net/manual/en/language.modifier.debug.print.var.php
* debug_print_var (Smarty online manual)
@@ -32,7 +32,7 @@ function smarty_modifier_debug_print_var($var, $depth = 0, $length = 40)
case 'array' :
$results = '<b>Array (' . count($var) . ')</b>';
foreach ($var as $curr_key => $curr_val) {
- $results .= '<br>' . str_repeat(' ', $depth * 2)
+ $results .= '<br />' . str_repeat(' ', $depth * 2)
. '<b>' . strtr($curr_key, $_replace) . '</b> => '
. smarty_modifier_debug_print_var($curr_val, ++$depth, $length);
$depth--;
@@ -42,7 +42,7 @@ function smarty_modifier_debug_print_var($var, $depth = 0, $length = 40)
$object_vars = get_object_vars($var);
$results = '<b>' . get_class($var) . ' Object (' . count($object_vars) . ')</b>';
foreach ($object_vars as $curr_key => $curr_val) {
- $results .= '<br>' . str_repeat(' ', $depth * 2)
+ $results .= '<br />' . str_repeat(' ', $depth * 2)
. '<b> ->' . strtr($curr_key, $_replace) . '</b> = '
. smarty_modifier_debug_print_var($curr_val, ++$depth, $length);
$depth--;
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.default.php b/GPL_LIB/Smarty/libs/plugins/modifier.default.php
index a96de03e3b9c601331afd366180ebd41cc7c021c..844119b8a33396afd496edca6a7ff342318a1526 100644
--- a/GPL_LIB/Smarty/libs/plugins/modifier.default.php
+++ b/GPL_LIB/Smarty/libs/plugins/modifier.default.php
@@ -9,8 +9,8 @@
/**
* Smarty default modifier plugin
*
- * Type: modifier<br>
- * Name: default<br>
+ * Type: modifier<br />
+ * Name: default<br />
* Purpose: designate default value for empty variables
* @link http://smarty.php.net/manual/en/language.modifier.default.php
* default (Smarty online manual)
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.escape.php b/GPL_LIB/Smarty/libs/plugins/modifier.escape.php
index dc528643bfc945db78d7305a110f911e0a7411de..63a3917792c8f7f7263eba54cbc47e40988b1090 100644
--- a/GPL_LIB/Smarty/libs/plugins/modifier.escape.php
+++ b/GPL_LIB/Smarty/libs/plugins/modifier.escape.php
@@ -9,8 +9,8 @@
/**
* Smarty escape modifier plugin
*
- * Type: modifier<br>
- * Name: escape<br>
+ * Type: modifier<br />
+ * Name: escape<br />
* Purpose: Escape the string according to escapement type
* @link http://smarty.php.net/manual/en/language.modifier.escape.php
* escape (Smarty online manual)
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.indent.php b/GPL_LIB/Smarty/libs/plugins/modifier.indent.php
index 0633c22c82da2444bf5d34ec54d03e5be4f72662..d4f3788c140a1a427195a5fb51167558073a21f0 100644
--- a/GPL_LIB/Smarty/libs/plugins/modifier.indent.php
+++ b/GPL_LIB/Smarty/libs/plugins/modifier.indent.php
@@ -9,8 +9,8 @@
/**
* Smarty indent modifier plugin
*
- * Type: modifier<br>
- * Name: indent<br>
+ * Type: modifier<br />
+ * Name: indent<br />
* Purpose: indent lines of text
* @link http://smarty.php.net/manual/en/language.modifier.indent.php
* indent (Smarty online manual)
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.lower.php b/GPL_LIB/Smarty/libs/plugins/modifier.lower.php
index f3e30bae28db4a839d351762f1bffb3f6b598c8a..28ca7727690448f62e62d98782a66cd08137abb5 100644
--- a/GPL_LIB/Smarty/libs/plugins/modifier.lower.php
+++ b/GPL_LIB/Smarty/libs/plugins/modifier.lower.php
@@ -9,8 +9,8 @@
/**
* Smarty lower modifier plugin
*
- * Type: modifier<br>
- * Name: lower<br>
+ * Type: modifier<br />
+ * Name: lower<br />
* Purpose: convert string to lowercase
* @link http://smarty.php.net/manual/en/language.modifier.lower.php
* lower (Smarty online manual)
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.nl2br.php b/GPL_LIB/Smarty/libs/plugins/modifier.nl2br.php
index faf0b2bef7ed84cf239a4da2b6da02b39d3c20d4..9383673353242ebd64235b397b198986ee5dd7ee 100644
--- a/GPL_LIB/Smarty/libs/plugins/modifier.nl2br.php
+++ b/GPL_LIB/Smarty/libs/plugins/modifier.nl2br.php
@@ -9,11 +9,11 @@
/**
* Smarty plugin
*
- * Type: modifier<br>
- * Name: nl2br<br>
+ * Type: modifier<br />
+ * Name: nl2br<br />
* Date: Feb 26, 2003
- * Purpose: convert \r\n, \r or \n to <<br>>
- * Input:<br>
+ * Purpose: convert \r\n, \r or \n to <<br />>
+ * Input:<br />
* - contents = contents to replace
* - preceed_test = if true, includes preceeding break tags
* in replacement
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.regex_replace.php b/GPL_LIB/Smarty/libs/plugins/modifier.regex_replace.php
index ce34ac656cc6d9da36af5351d1ac49cab340303a..14851a8bb3d8300752f8fdd74356717aef04b9ea 100644
--- a/GPL_LIB/Smarty/libs/plugins/modifier.regex_replace.php
+++ b/GPL_LIB/Smarty/libs/plugins/modifier.regex_replace.php
@@ -9,8 +9,8 @@
/**
* Smarty regex_replace modifier plugin
*
- * Type: modifier<br>
- * Name: regex_replace<br>
+ * Type: modifier<br />
+ * Name: regex_replace<br />
* Purpose: regular expression search/replace
* @link http://smarty.php.net/manual/en/language.modifier.regex.replace.php
* regex_replace (Smarty online manual)
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.replace.php b/GPL_LIB/Smarty/libs/plugins/modifier.replace.php
index fde66cfebeb4b3e9b504714c7dfdd8c6b4dd4fa9..8f407ad5759ebc7401060e8b00b3f2107c1ea35e 100644
--- a/GPL_LIB/Smarty/libs/plugins/modifier.replace.php
+++ b/GPL_LIB/Smarty/libs/plugins/modifier.replace.php
@@ -9,8 +9,8 @@
/**
* Smarty replace modifier plugin
*
- * Type: modifier<br>
- * Name: replace<br>
+ * Type: modifier<br />
+ * Name: replace<br />
* Purpose: simple search/replace
* @link http://smarty.php.net/manual/en/language.modifier.replace.php
* replace (Smarty online manual)
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.spacify.php b/GPL_LIB/Smarty/libs/plugins/modifier.spacify.php
index 755b51e21adeb50962477ad8789f4bc8c2f0625f..ab386d23086fea7e67698bd7755e1cf717e4f33a 100644
--- a/GPL_LIB/Smarty/libs/plugins/modifier.spacify.php
+++ b/GPL_LIB/Smarty/libs/plugins/modifier.spacify.php
@@ -9,8 +9,8 @@
/**
* Smarty spacify modifier plugin
*
- * Type: modifier<br>
- * Name: spacify<br>
+ * Type: modifier<br />
+ * Name: spacify<br />
* Purpose: add spaces between characters in a string
* @link http://smarty.php.net/manual/en/language.modifier.spacify.php
* spacify (Smarty online manual)
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.string_format.php b/GPL_LIB/Smarty/libs/plugins/modifier.string_format.php
index f58d7eedec5552a587e02a4c51c8455a9b228723..8f5359afbc1e88dbf4a07d0610c52992dfeec255 100644
--- a/GPL_LIB/Smarty/libs/plugins/modifier.string_format.php
+++ b/GPL_LIB/Smarty/libs/plugins/modifier.string_format.php
@@ -9,8 +9,8 @@
/**
* Smarty string_format modifier plugin
*
- * Type: modifier<br>
- * Name: string_format<br>
+ * Type: modifier<br />
+ * Name: string_format<br />
* Purpose: format strings via sprintf
* @link http://smarty.php.net/manual/en/language.modifier.string.format.php
* string_format (Smarty online manual)
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.strip.php b/GPL_LIB/Smarty/libs/plugins/modifier.strip.php
index 7c9006f16f2bfa0d07df26a9e16a6e02165ae206..01fa4f21b8c0432153f124b8a6b273decd7a3bc9 100644
--- a/GPL_LIB/Smarty/libs/plugins/modifier.strip.php
+++ b/GPL_LIB/Smarty/libs/plugins/modifier.strip.php
@@ -9,10 +9,10 @@
/**
* Smarty strip modifier plugin
*
- * Type: modifier<br>
- * Name: strip<br>
+ * Type: modifier<br />
+ * Name: strip<br />
* Purpose: Replace all repeated spaces, newlines, tabs
- * with a single space or supplied replacement string.<br>
+ * with a single space or supplied replacement string.<br />
* Example: {$var|strip} {$var|strip:" "}
* Date: September 25th, 2002
* @link http://smarty.php.net/manual/en/language.modifier.strip.php
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.strip_tags.php b/GPL_LIB/Smarty/libs/plugins/modifier.strip_tags.php
index af60b372f8b5b5d9aee5ce9b3cc828f3026c11af..ef8842310d2cdee0d6d746a42595df13dcc28f86 100644
--- a/GPL_LIB/Smarty/libs/plugins/modifier.strip_tags.php
+++ b/GPL_LIB/Smarty/libs/plugins/modifier.strip_tags.php
@@ -9,8 +9,8 @@
/**
* Smarty strip_tags modifier plugin
*
- * Type: modifier<br>
- * Name: strip_tags<br>
+ * Type: modifier<br />
+ * Name: strip_tags<br />
* Purpose: strip html tags from text
* @link http://smarty.php.net/manual/en/language.modifier.strip.tags.php
* strip_tags (Smarty online manual)
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.truncate.php b/GPL_LIB/Smarty/libs/plugins/modifier.truncate.php
index bd67407428d2c806598b84a5e171fdb964c1e0ae..56647cae36d4dd3d3ac7772cf5eb6e6be89253fb 100644
--- a/GPL_LIB/Smarty/libs/plugins/modifier.truncate.php
+++ b/GPL_LIB/Smarty/libs/plugins/modifier.truncate.php
@@ -9,8 +9,8 @@
/**
* Smarty truncate modifier plugin
*
- * Type: modifier<br>
- * Name: truncate<br>
+ * Type: modifier<br />
+ * Name: truncate<br />
* Purpose: Truncate a string to a certain length if necessary,
* optionally splitting in the middle of a word, and
* appending the $etc string or inserting $etc into the middle.
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.upper.php b/GPL_LIB/Smarty/libs/plugins/modifier.upper.php
index b92a5a34ee536f48f617338dc3a24ea387c93339..0c64a17192a5da80c52a15120eb615cda1e1f3be 100644
--- a/GPL_LIB/Smarty/libs/plugins/modifier.upper.php
+++ b/GPL_LIB/Smarty/libs/plugins/modifier.upper.php
@@ -9,8 +9,8 @@
/**
* Smarty upper modifier plugin
*
- * Type: modifier<br>
- * Name: upper<br>
+ * Type: modifier<br />
+ * Name: upper<br />
* Purpose: convert string to uppercase
* @link http://smarty.php.net/manual/en/language.modifier.upper.php
* upper (Smarty online manual)
diff --git a/GPL_LIB/Smarty/libs/plugins/modifier.wordwrap.php b/GPL_LIB/Smarty/libs/plugins/modifier.wordwrap.php
index 2d131293a0721b69617fd00859494bb6fe4233a4..c0ae62722183003e33e822b6026a4e6c713a22d5 100644
--- a/GPL_LIB/Smarty/libs/plugins/modifier.wordwrap.php
+++ b/GPL_LIB/Smarty/libs/plugins/modifier.wordwrap.php
@@ -9,8 +9,8 @@
/**
* Smarty wordwrap modifier plugin
*
- * Type: modifier<br>
- * Name: wordwrap<br>
+ * Type: modifier<br />
+ * Name: wordwrap<br />
* Purpose: wrap a string of text at a given length
* @link http://smarty.php.net/manual/en/language.modifier.wordwrap.php
* wordwrap (Smarty online manual)
diff --git a/GPL_LIB/Smarty/libs/plugins/outputfilter.trimwhitespace.php b/GPL_LIB/Smarty/libs/plugins/outputfilter.trimwhitespace.php
index ac2583ebf7993412fb9b0fae56a4d549c2215ee8..728317568ffaa372753f8a27df98ce65d8f98a4f 100644
--- a/GPL_LIB/Smarty/libs/plugins/outputfilter.trimwhitespace.php
+++ b/GPL_LIB/Smarty/libs/plugins/outputfilter.trimwhitespace.php
@@ -8,14 +8,14 @@
/**
* Smarty trimwhitespace outputfilter plugin
*
- * File: outputfilter.trimwhitespace.php<br>
- * Type: outputfilter<br>
- * Name: trimwhitespace<br>
- * Date: Jan 25, 2003<br>
+ * File: outputfilter.trimwhitespace.php<br />
+ * Type: outputfilter<br />
+ * Name: trimwhitespace<br />
+ * Date: Jan 25, 2003<br />
* Purpose: trim leading white space and blank lines from
* template source after it gets interpreted, cleaning
* up code and saving bandwidth. Does not affect
- * <<PRE>></PRE> and <SCRIPT></SCRIPT> blocks.<br>
+ * <<PRE>></PRE> and <SCRIPT></SCRIPT> blocks.<br />
* Install: Drop into the plugin directory, call
* <code>$smarty->load_filter('output','trimwhitespace');</code>
* from application.
diff --git a/GPL_LIB/Smarty/libs/plugins/shared.escape_special_chars.php b/GPL_LIB/Smarty/libs/plugins/shared.escape_special_chars.php
index 4ea0979c29243e980b098e7824d3882cfe1881cf..d77267e7cf150d413dc8a2a2502a36a906fc1a44 100644
--- a/GPL_LIB/Smarty/libs/plugins/shared.escape_special_chars.php
+++ b/GPL_LIB/Smarty/libs/plugins/shared.escape_special_chars.php
@@ -9,7 +9,7 @@
/**
* escape_special_chars common function
*
- * Function: smarty_function_escape_special_chars<br>
+ * Function: smarty_function_escape_special_chars<br />
* Purpose: used by other smarty functions to escape
* special chars except for already escaped ones
* @author Monte Ohrt <monte at ohrt dot com>
diff --git a/GPL_LIB/Smarty/libs/plugins/shared.make_timestamp.php b/GPL_LIB/Smarty/libs/plugins/shared.make_timestamp.php
index 2673165cd2ea8f61b93e410b8838103a3097082f..66a2a37249113d303fecb85ee09830b30c6a5080 100644
--- a/GPL_LIB/Smarty/libs/plugins/shared.make_timestamp.php
+++ b/GPL_LIB/Smarty/libs/plugins/shared.make_timestamp.php
@@ -7,7 +7,7 @@
/**
- * Function: smarty_make_timestamp<br>
+ * Function: smarty_make_timestamp<br />
* Purpose: used by other smarty functions to make a timestamp
* from a string.
* @author Monte Ohrt <monte at ohrt dot com>
diff --git a/cron/ods/buildDailyReport.php b/cron/ods/buildDailyReport.php
index e94807d335acbf1d9ad679d4f5e8ff30f30431c6..b1965424a1fff687347b8592e15777837cc3578f 100644
--- a/cron/ods/buildDailyReport.php
+++ b/cron/ods/buildDailyReport.php
@@ -54,8 +54,8 @@
$total_v += ($data["value"] - $average) * ($data["value"] - $average);
}
$variance = $total_v / $count;
- print "Min : " . $min . "<br>\n";
- print "Max : " . $max . "<br>\n";
- print "Average : " . $average . "<br>\n";
- print "Variance : " . $variance . "<br>\n";
+ print "Min : " . $min . "<br />\n";
+ print "Max : " . $max . "<br />\n";
+ print "Average : " . $average . "<br />\n";
+ print "Variance : " . $variance . "<br />\n";
?>
diff --git a/doc/en/beginners.html b/doc/en/beginners.html
index 75738356e816c353737213c77950a8db7902f032..40dcd487c0dd74db177dc5c01b27d9f7bc4cb050 100644
--- a/doc/en/beginners.html
+++ b/doc/en/beginners.html
@@ -30,11 +30,11 @@ Congrats on choosing to try Nagios! Nagios is quite powerful and flexible, but
<p>
<ol>
-<li><strong>Relax - its going to take some time.</strong> Don't expect to be able to compile Nagios and start it up right off the bat. Its not that easy. In fact, its pretty difficult. If you don't want to spend time learning how things work and getting things running smoothly, don't bother using this software. Instead, pay someone to monitor your network for you or hire someone to install Nagios for you. :-)<br><br>
+<li><strong>Relax - its going to take some time.</strong> Don't expect to be able to compile Nagios and start it up right off the bat. Its not that easy. In fact, its pretty difficult. If you don't want to spend time learning how things work and getting things running smoothly, don't bother using this software. Instead, pay someone to monitor your network for you or hire someone to install Nagios for you. :-)<br /><br />
-<li><strong>Read the documentation.</strong> Nagios is difficult enough to configure when you've got a good grasp of what's going on, and nearly impossible if you don't. Do yourself a favor and read before blindly attempting to install and run Nagios. If you're the type who doesn't want to take the time to read the documentation, you'll probably find that others won't find the time to help you out when you have problems. RTFM.<br><br>
+<li><strong>Read the documentation.</strong> Nagios is difficult enough to configure when you've got a good grasp of what's going on, and nearly impossible if you don't. Do yourself a favor and read before blindly attempting to install and run Nagios. If you're the type who doesn't want to take the time to read the documentation, you'll probably find that others won't find the time to help you out when you have problems. RTFM.<br /><br />
-<li><strong>Use the sample config files.</strong> Sample configuration files are provided with Nagios. Look at them, modify them for your particular setup and test them! The sample files are just that - samples. There's a very good chance that they won't work for you without modifications. Sample config files can be found in the <i>sample-config/</i> subdirectory of the Nagios distribution.<br><br>
+<li><strong>Use the sample config files.</strong> Sample configuration files are provided with Nagios. Look at them, modify them for your particular setup and test them! The sample files are just that - samples. There's a very good chance that they won't work for you without modifications. Sample config files can be found in the <i>sample-config/</i> subdirectory of the Nagios distribution.<br /><br />
<li><strong>Seek the help of others.</strong> If you've read the documentation, reviewed the sample config files, and are still having problems, try sending a <i>descriptive</i> email message describing your problems to the <i>nagios-users</i> mailing list. Due to the amount of work that I have to do for this project, I am unable to answer most of the questions that get sent directly to me, so your best source of help is going to be the mailing list. If you've done some background reading and you provide a good problem description, odds are that someone will give you some pointers on getting things working properly.
</ol>
diff --git a/doc/en/cgiauth.html b/doc/en/cgiauth.html
index a2fe9840ff6a9c96fe4925c8fb598858c51b0cb7..3d0437fdc181f56db763ff2d5ad3b5931bf97caa 100644
--- a/doc/en/cgiauth.html
+++ b/doc/en/cgiauth.html
@@ -46,11 +46,11 @@ Throughout these instructions I will be using the following terms, so you should
<strong><u>Index</u></strong>
</p>
<p>
-<a href="#config_web_users">Setting up authenticated users</a><br>
-<a href="#enable_cgi_auth">Enabling authentication/authorization functionality in the CGIs</a><br>
-<a href="#default_rights">Default permissions to CGI information</a><br>
-<a href="#additional_rights">Granting additional permissions to CGI information</a><br>
-<a href="#secure_web_servers">Authentication on secure web servers</a><br>
+<a href="#config_web_users">Setting up authenticated users</a><br />
+<a href="#enable_cgi_auth">Enabling authentication/authorization functionality in the CGIs</a><br />
+<a href="#default_rights">Default permissions to CGI information</a><br />
+<a href="#additional_rights">Granting additional permissions to CGI information</a><br />
+<a href="#secure_web_servers">Authentication on secure web servers</a><br />
</p>
diff --git a/doc/en/cgiincludes.html b/doc/en/cgiincludes.html
index 3076f0638818c41e9410457aad02fdb1b1f2cadb..124f4f9bca8199b6126de50a1382c2857c65a966 100644
--- a/doc/en/cgiincludes.html
+++ b/doc/en/cgiincludes.html
@@ -59,7 +59,7 @@ Custom headers are included immediately after the <b><BODY></b> tag in the
<p>
<ul>
-<li><b>Global headers/footers</b>. These files should be named <i>common-header.ssi</i> and <i>common-footer.ssi</i>, respectively. If these files exist, they will be included in the output of all CGIs.<br><br>
+<li><b>Global headers/footers</b>. These files should be named <i>common-header.ssi</i> and <i>common-footer.ssi</i>, respectively. If these files exist, they will be included in the output of all CGIs.<br /><br />
<li><b>CGI-specific headers/footers</b>. These files should be named in the format <i>CGINAME-header.ssi</i> and <i>CGINAME-footer.ssi</i>, where <i>CGINAME</i> is the physical name of the CGI without the .cgi extension. For example, the header and footer files for the <a href="cgis.html#summary_cgi">alert summary CGI</a> (summary.cgi) would be named <i>summary-header.ssi</i> and <i>summary-footer.ssi</i>, respectively.
</ul>
</p>
diff --git a/doc/en/cgis.html b/doc/en/cgis.html
index 7c8b65d73c9a34e1b363921be8d70912489666a4..c1789f957f82c7a113613dcfdab308d05f693485 100644
--- a/doc/en/cgis.html
+++ b/doc/en/cgis.html
@@ -36,22 +36,22 @@ The various CGIs distributed with Nagios are described here, along with the auth
<strong><u>Index</u></strong>
</p>
<p>
-<a href="#status_cgi">Status CGI</a><br>
-<a href="#statusmap_cgi">Status map CGI</a><br>
-<a href="#statuswml_cgi">WAP interface CGI</a><br>
-<a href="#statuswrl_cgi">Status world CGI (VRML)</a><br>
-<a href="#tac_cgi">Tactical overview CGI</a><br>
-<a href="#outages_cgi">Network outages CGI</a><br>
-<a href="#config_cgi">Configuration CGI</a><br>
-<a href="#cmd_cgi">Command CGI</a><br>
-<a href="#extinfo_cgi">Extended information CGI</a><br>
-<a href="#showlog_cgi">Event log CGI</a><br>
-<a href="#history_cgi">Alert history CGI</a><br>
-<a href="#notifications_cgi">Notifications CGI</a><br>
-<a href="#trends_cgi">Trends CGI</a><br>
-<a href="#avail_cgi">Availability reporting CGI</a><br>
-<a href="#histogram_cgi">Alert histogram CGI</a><br>
-<a href="#summary_cgi">Alert summary CGI</a><br>
+<a href="#status_cgi">Status CGI</a><br />
+<a href="#statusmap_cgi">Status map CGI</a><br />
+<a href="#statuswml_cgi">WAP interface CGI</a><br />
+<a href="#statuswrl_cgi">Status world CGI (VRML)</a><br />
+<a href="#tac_cgi">Tactical overview CGI</a><br />
+<a href="#outages_cgi">Network outages CGI</a><br />
+<a href="#config_cgi">Configuration CGI</a><br />
+<a href="#cmd_cgi">Command CGI</a><br />
+<a href="#extinfo_cgi">Extended information CGI</a><br />
+<a href="#showlog_cgi">Event log CGI</a><br />
+<a href="#history_cgi">Alert history CGI</a><br />
+<a href="#notifications_cgi">Notifications CGI</a><br />
+<a href="#trends_cgi">Trends CGI</a><br />
+<a href="#avail_cgi">Availability reporting CGI</a><br />
+<a href="#histogram_cgi">Alert histogram CGI</a><br />
+<a href="#summary_cgi">Alert summary CGI</a><br />
</p>
@@ -85,10 +85,10 @@ The various CGIs distributed with Nagios are described here, along with the auth
<tr>
<td align=left valign=top width="50%">
<p>
-<strong>Description:</strong><br>
+<strong>Description:</strong><br />
This is the most important CGI included with Nagios. It allows you to view the current status of all hosts and services that are being monitored. The status CGI can produce two main types of output - a status overview of all host groups (or a particular host group) and a detailed view of all services (or those associated with a particular host). Pretty icons can be associated with hosts by defining <a href="configextinfo.html">extended host and service information</a> entries.
<p>
-<strong>Authorization Requirements:</strong><br>
+<strong>Authorization Requirements:</strong><br />
<ul class="Default">
<li>If you are <a href="configcgi.html#authorized_for_all_hosts"><i>authorized for all hosts</i></a> you can view all hosts <b>and</b> all services.
<li>If you are <a href="configcgi.html#authorized_for_all_services"><i>authorized for all services</i></a> you can view all services.
@@ -128,16 +128,16 @@ This is the most important CGI included with Nagios. It allows you to view the
<tr>
<td align=left valign=top width="50%">
<p>
-<strong>Description:</strong><br>
+<strong>Description:</strong><br />
This CGI creates a map of all hosts that you have defined on your network. The CGI uses Thomas Boutell's <a href="http://www.boutell.com/gd">gd</a> library (version 1.6.3 or higher) to create a PNG image of your network layout. The coordinates used when drawing each host (along with the optional pretty icons) are taken from <a href="configextinfo.html">extended host information</a> definitions. If you'd prefer to let the CGI automatically generate drawing coordinates for you, use the <a href="configcgi.html#default_statusmap_layout">default_statusmap_layout</a> directive to specify a layout algorithm that should be used. If you can't seem to find this CGI, or if you have get errors when trying to compile or run it, read <a href="faqs.html#gd_library_problems">this FAQ</a>.
</p>
<p>
-<strong>Authorization Requirements:</strong><br>
+<strong>Authorization Requirements:</strong><br />
<ul class="Default" class="Default">
<li>If you are <a href="configcgi.html#authorized_for_all_hosts"><i>authorized for all hosts</i></a> you can view all hosts.
<li>If you are an <i>authenticated contact</i> you can view hosts for which you are a contact.
</ul>
-<br>
+<br />
Note: Users who are not authorized to view specific hosts will see <i>unknown</i> nodes in those positions. I realize that they really shouldn't see <i>anything</i> there, but it doesn't make sense to even generate the map if you can't see all the host dependencies...
</p>
</td>
@@ -173,11 +173,11 @@ Note: Users who are not authorized to view specific hosts will see <i>unknown</i
<tr>
<td align=left valign=top width="50%">
<p>
-<strong>Description:</strong><br>
+<strong>Description:</strong><br />
This CGI serves as a WAP interface to network status information. If you have a WAP-enable device (i.e. an Internet-ready cellphone), you can view status information while you're on the go. Different status views include hostgroup summary, hostgroup overview, host detail, service detail, all problems, and unhandled problems. In addition to viewing status information, you can also disable notifications and checks and acknowledge problems from your cellphone. Pretty cool, huh?
</p>
<p>
-<strong>Authorization Requirements:</strong><br>
+<strong>Authorization Requirements:</strong><br />
<ul class="Default">
<li>If you are <a href="configcgi.html#authorized_for_system_information"><i>authorized for system information</i></a> you can view Nagios process information.
<li>If you are <a href="configcgi.html#authorized_for_all_hosts"><i>authorized for all hosts</i></a> you can view status data for all hosts <b>and</b> services.
@@ -218,16 +218,16 @@ This CGI serves as a WAP interface to network status information. If you have a
<tr>
<td align=left valign=top width="50%">
<p>
-<strong>Description:</strong><br>
+<strong>Description:</strong><br />
This CGI creates a 3-D VRML model of all hosts that you have defined on your network. Coordinates used when drawing the hosts (as well as pretty texture maps) are defined using <a href="configextinfo.html">extended host information</a> definitions. If you'd prefer to let the CGI automatically generate drawing coordinates for you, use the <a href="configcgi.html#default_statuswrl_layout">default_statuswrl_layout</a> directive to specify a layout algorithm that should be used. You'll need a VRML browser (like <a href="http://www.parallelgraphics.com/cortona/">Cortona</a>, <a href="http://www.cosmosoftware.com">Cosmo Player</a> or <a href="http://www.intervista.com">WorldView</a>) installed on your system before you can actually view the generated model.
</p>
<p>
-<strong>Authorization Requirements:</strong><br>
+<strong>Authorization Requirements:</strong><br />
<ul class="Default">
<li>If you are <a href="configcgi.html#authorized_for_all_hosts"><i>authorized for all hosts</i></a> you can view all hosts.
<li>If you are an <i>authenticated contact</i> you can view hosts for which you are a contact.
</ul>
-<br>
+<br />
Note: Users who are not authorized to view specific hosts will see <i>unknown</i> nodes in those positions. I realize that they really shouldn't see <i>anything</i> there, but it doesn't make sense to even generate the map if you can't see all the host dependencies...
</p>
</td>
@@ -263,10 +263,10 @@ Note: Users who are not authorized to view specific hosts will see <i>unknown</i
<tr>
<td align=left valign=top width="50%">
<p>
-<strong>Description:</strong><br>
+<strong>Description:</strong><br />
This CGI is designed to server as a "birds-eye view" of all network monitoring activity. It allows you to quickly see network outages, host status, and service status. It distinguishes between problems that have been "handled" in some way (i.e. been acknowledged, had notifications disabled, etc.) and those which have not been handled, and thus need attention. Very useful if you've got a lot of hosts/services you're monitoring and you need to keep a single screen up to alert you of problems.
<p>
-<strong>Authorization Requirements:</strong><br>
+<strong>Authorization Requirements:</strong><br />
<ul class="Default">
<li>If you are <a href="configcgi.html#authorized_for_all_hosts"><i>authorized for all hosts</i></a> you can view all hosts <b>and</b> all services.
<li>If you are <a href="configcgi.html#authorized_for_all_services"><i>authorized for all services</i></a> you can view all services.
@@ -306,11 +306,11 @@ This CGI is designed to server as a "birds-eye view" of all network monitoring a
<tr>
<td align=left valign=top width="50%">
<p>
-<strong>Description:</strong><br>
+<strong>Description:</strong><br />
This CGI will produce a listing of "problem" hosts on your network that are causing network outages. This can be particularly useful if you have a large network and want to quickly identify the source of the problem. Hosts are sorted based on the severity of the outage they are causing. More information on how the network outage CGI works can be found <a href="networkoutages.html">here</a>.
</p>
<p>
-<strong>Authorization Requirements:</strong><br>
+<strong>Authorization Requirements:</strong><br />
<ul class="Default">
<li>If you are <a href="configcgi.html#authorized_for_all_hosts"><i>authorized for all hosts</i></a> you can view all hosts.
<li>If you are an <i>authenticated contact</i> you can view hosts for which you are a contact.
@@ -348,10 +348,10 @@ This CGI will produce a listing of "problem" hosts on your network that are caus
<tr>
<td align=left valign=top width="50%">
<p>
-<strong>Description:</strong><br>
+<strong>Description:</strong><br />
This CGI allows you to view objects (i.e. hosts, host groups, contacts, contact groups, time periods, services, etc.) that you have defined in your <a href="configobject.html">object configuration file(s)</a>.
<p>
-<strong>Authorization Requirements:</strong><br>
+<strong>Authorization Requirements:</strong><br />
<ul class="Default">
<li>You must be <a href="configcgi.html#authorized_for_configuration_information"><i>authorized for configuration information</i></a> in order to any kind of configuration information.
</ul>
@@ -388,10 +388,10 @@ This CGI allows you to view objects (i.e. hosts, host groups, contacts, contact
<tr>
<td align=left valign=top width="50%">
<p>
-<strong>Description:</strong><br>
+<strong>Description:</strong><br />
This CGI allows you to send commands to the Nagios process. Although this CGI has several arguments, you would be better to leave them alone. Most will change between different revisions of Nagios. Use the <a href="#extinfo_cgi">extended information CGI</a> as a starting point for issuing commands.
<p>
-<strong>Authorization Requirements:</strong><br>
+<strong>Authorization Requirements:</strong><br />
<ul class="Default">
<li>You must be <a href="configcgi.html#authorized_for_system_commands"><i>authorized for system commands</i></a> in order to issue commands that affect the Nagios process (restarts, shutdowns, mode changes, etc.).
<li>If you are <a href="configcgi.html#authorized_for_all_host_commands"><i>authorized for all host commands</i></a> you can issue commands for all hosts <b>and</b> services.
@@ -442,10 +442,10 @@ This CGI allows you to send commands to the Nagios process. Although this CGI h
<tr>
<td align=left valign=top width="50%">
<p>
-<strong>Description:</strong><br>
+<strong>Description:</strong><br />
This CGI allows you to view Nagios process information, host and service state statistics, host and service comments, and more. It also serves as a launching point for sending commands to Nagios via the <a href="#cmd_cgi">command CGI</a>. Although this CGI has several arguments, you would be better to leave them alone - they are likely to change between different releases of Nagios. You can access this CGI by clicking on the 'Network Health' and 'Process Information' links on the side navigation bar, or by clicking on a host or service link in the output of the <a href="#status_cgi">status CGI</a>.
<p>
-<strong>Authorization Requirements:</strong><br>
+<strong>Authorization Requirements:</strong><br />
<ul class="Default">
<li>You must be <a href="configcgi.html#authorized_for_system_information"><i>authorized for system information</i></a> in order to view Nagios process information.
<li>If you are <a href="configcgi.html#authorized_for_all_hosts"><i>authorized for all hosts</i></a> you can view extended information for all hosts <b>and</b> services.
@@ -487,11 +487,11 @@ This CGI allows you to view Nagios process information, host and service state s
<tr>
<td align=left valign=top width="50%">
<p>
-<strong>Description:</strong><br>
+<strong>Description:</strong><br />
This CGI will display the <a href="configmain.html#log_file">log file</a>. If you have <a href="configmain.html#log_rotation_method">log rotation</a> enabled, you can browse notifications present in archived log files by using the navigational links near the top of the page.
</p>
<p>
-<strong>Authorization Requirements:</strong><br>
+<strong>Authorization Requirements:</strong><br />
<ul class="Default">
<li>You must be <a href="configcgi.html#authorized_for_system_information"><i>authorized for system information</i></a> in order to view the log file.
</ul>
@@ -528,11 +528,11 @@ This CGI will display the <a href="configmain.html#log_file">log file</a>. If y
<tr>
<td align=left valign=top width="50%">
<p>
-<strong>Description:</strong><br>
+<strong>Description:</strong><br />
This CGI is used to display the history of problems with either a particular host or all hosts. The output is basically a subset of the information that is displayed by the <a href="#showlog_cgi">log file CGI</a>. You have the ability to filter the output to display only the specific types of problems you wish to see (i.e. hard and/or soft alerts, various types of service and host alerts, all types of alerts, etc.). If you have <a href="configmain.html#log_rotation_method">log rotation</a> enabled, you can browse history information present in archived log files by using the navigational links near the top of the page.
</p>
<p>
-<strong>Authorization Requirements:</strong><br>
+<strong>Authorization Requirements:</strong><br />
<ul class="Default">
<li>If you are <a href="configcgi.html#authorized_for_all_hosts"><i>authorized for all hosts</i></a> you can view history information for all hosts <b>and</b> all services.
<li>If you are <a href="configcgi.html#authorized_for_all_services"><i>authorized for all services</i></a> you can view history information for all services.
@@ -571,11 +571,11 @@ This CGI is used to display the history of problems with either a particular hos
<tr>
<td align=left valign=top width="50%">
<p>
-<strong>Description:</strong><br>
+<strong>Description:</strong><br />
This CGI is used to display host and service notifications that have been sent to various contacts. The output is basically a subset of the information that is displayed by the <a href="#showlog_cgi">log file CGI</a>. You have the ability to filter the output to display only the specific types of notifications you wish to see (i.e. service notifications, host notifications, notifications sent to specific contacts, etc). If you have <a href="configmain.html#log_rotation_method">log rotation</a> enabled, you can browse notifications present in archived log files by using the navigational links near the top of the page.
</p>
<p>
-<strong>Authorization Requirements:</strong><br>
+<strong>Authorization Requirements:</strong><br />
<ul class="Default">
<li>If you are <a href="configcgi.html#authorized_for_all_hosts"><i>authorized for all hosts</i></a> you can view notifications for all hosts <b>and</b> all services.
<li>If you are <a href="configcgi.html#authorized_for_all_services"><i>authorized for all services</i></a> you can view notifications for all services.
@@ -615,11 +615,11 @@ This CGI is used to display host and service notifications that have been sent t
<tr>
<td align=left valign=top width="50%">
<p>
-<strong>Description:</strong><br>
+<strong>Description:</strong><br />
This CGI is used to create a graph of host or service states over an arbitrary period of time. In order for this CGI to be of much use, you should enable <a href="configmain.html#log_rotation_method">log rotation</a> and keep archived logs in the path specified by the <a href="configmain.html#log_archive_path">log_archive_path</a> directive. The CGI uses Thomas Boutell's <a href="http://www.boutell.com/gd">gd</a> library (version 1.6.3 or higher) to create the trends image. If you can't seem to find this CGI or if you have get errors when trying to compile or run it, read <a href="faqs.html#gd_library_problems">this FAQ</a>.
</p>
<p>
-<strong>Authorization Requirements:</strong><br>
+<strong>Authorization Requirements:</strong><br />
<ul class="Default">
<li>If you are <a href="configcgi.html#authorized_for_all_hosts"><i>authorized for all hosts</i></a> you can view trends for all hosts <b>and</b> all services.
<li>If you are <a href="configcgi.html#authorized_for_all_services"><i>authorized for all services</i></a> you can view trends for all services.
@@ -660,11 +660,11 @@ This CGI is used to create a graph of host or service states over an arbitrary p
<tr>
<td align=left valign=top width="50%">
<p>
-<strong>Description:</strong><br>
+<strong>Description:</strong><br />
This CGI is used to report on the availability of hosts and services over a user-specified period of time. In order for this CGI to be of much use, you should enable <a href="configmain.html#log_rotation_method">log rotation</a> and keep archived logs in the path specified by the <a href="configmain.html#log_archive_path">log_archive_path</a> directive.
</p>
<p>
-<strong>Authorization Requirements:</strong><br>
+<strong>Authorization Requirements:</strong><br />
<ul class="Default">
<li>If you are <a href="configcgi.html#authorized_for_all_hosts"><i>authorized for all hosts</i></a> you can view availability data for all hosts <b>and</b> all services.
<li>If you are <a href="configcgi.html#authorized_for_all_services"><i>authorized for all services</i></a> you can view availability data for all services.
@@ -705,11 +705,11 @@ This CGI is used to report on the availability of hosts and services over a user
<tr>
<td align=left valign=top width="50%">
<p>
-<strong>Description:</strong><br>
+<strong>Description:</strong><br />
This CGI is used to report on the availability of hosts and services over a user-specified period of time. In order for this CGI to be of much use, you should enable <a href="configmain.html#log_rotation_method">log rotation</a> and keep archived logs in the path specified by the <a href="configmain.html#log_archive_path">log_archive_path</a> directive. The CGI uses Thomas Boutell's <a href="http://www.boutell.com/gd">gd</a> library (version 1.6.3 or higher) to create the histogram image. If you can't seem to find this CGI or if you have get errors when trying to compile or run it, read <a href="faqs.html#gd_library_problems">this FAQ</a>.
</p>
<p>
-<strong>Authorization Requirements:</strong><br>
+<strong>Authorization Requirements:</strong><br />
<ul class="Default">
<li>If you are <a href="configcgi.html#authorized_for_all_hosts"><i>authorized for all hosts</i></a> you can view histograms for all hosts <b>and</b> all services.
<li>If you are <a href="configcgi.html#authorized_for_all_services"><i>authorized for all services</i></a> you can view histograms for all services.
@@ -750,11 +750,11 @@ This CGI is used to report on the availability of hosts and services over a user
<tr>
<td align=left valign=top width="50%">
<p>
-<strong>Description:</strong><br>
+<strong>Description:</strong><br />
This CGI provides some generic reports about host and service alert data, including alert totals, top alert producers, etc.
</p>
<p>
-<strong>Authorization Requirements:</strong><br>
+<strong>Authorization Requirements:</strong><br />
<ul class="Default">
<li>If you are <a href="configcgi.html#authorized_for_all_hosts"><i>authorized for all hosts</i></a> you can view summary information for all hosts <b>and</b> all services.
<li>If you are <a href="configcgi.html#authorized_for_all_services"><i>authorized for all services</i></a> you can view summary information for all services.
diff --git a/doc/en/checkscheduling.html b/doc/en/checkscheduling.html
index f5986dda039e77e2fe9de452da51f2a13e91a01a..9afd1dd2d9cc0bd0a9d57daf5fb3c70be13f9414 100644
--- a/doc/en/checkscheduling.html
+++ b/doc/en/checkscheduling.html
@@ -26,19 +26,19 @@
<strong><u>Index</u></strong>
</p>
<p>
-<a href="#introduction">Introduction</a><br>
-<a href="#configuration_options">Configuration options</a><br>
-<a href="#initial_scheduling">Initial scheduling</a><br>
-<a href="#inter_check_delay">Inter-check delay</a><br>
-<a href="#service_interleaving">Service interleaving</a><br>
-<a href="#max_concurrent_checks">Max concurrent service checks</a><br>
-<a href="#time_restraints">Time restraints</a><br>
-<a href="#normal_scheduling">Normal scheduling</a><br>
-<a href="#problem_scheduling">Scheduling during problems</a><br>
-<a href="#host_checks">Host checks</a><br>
-<a href="#scheduling_delays">Scheduling delays</a><br>
-<a href="#scheduling_example">Scheduling example</a><br>
-<a href="#service_options">Service definition options that affect scheduling</a><br>
+<a href="#introduction">Introduction</a><br />
+<a href="#configuration_options">Configuration options</a><br />
+<a href="#initial_scheduling">Initial scheduling</a><br />
+<a href="#inter_check_delay">Inter-check delay</a><br />
+<a href="#service_interleaving">Service interleaving</a><br />
+<a href="#max_concurrent_checks">Max concurrent service checks</a><br />
+<a href="#time_restraints">Time restraints</a><br />
+<a href="#normal_scheduling">Normal scheduling</a><br />
+<a href="#problem_scheduling">Scheduling during problems</a><br />
+<a href="#host_checks">Host checks</a><br />
+<a href="#scheduling_delays">Scheduling delays</a><br />
+<a href="#scheduling_example">Scheduling example</a><br />
+<a href="#service_options">Service definition options that affect scheduling</a><br />
</p>
<p>
diff --git a/doc/en/commandfile.html b/doc/en/commandfile.html
index cbba046109068161309649218a9ae15d91edb24e..3075989820fc999379557733a07ddf4aae1ee6b1 100644
--- a/doc/en/commandfile.html
+++ b/doc/en/commandfile.html
@@ -60,7 +60,7 @@ Next, add the web server user (<i>nobody</i> or <i>apache</i>, etc) and the Nagi
</p>
<p>
-<font color="red">/usr/sbin/usermod -G nagiocmd nagios</font><br>
+<font color="red">/usr/sbin/usermod -G nagiocmd nagios</font><br />
<font color="red">/usr/sbin/usermod -G nagiocmd nobody</font>
</p>
diff --git a/doc/en/configcgi.html b/doc/en/configcgi.html
index 8d650e6b46842cb9751c7593be80fa383859ae98..e550a640af732a747e1135ff6720d10caabbda04 100644
--- a/doc/en/configcgi.html
+++ b/doc/en/configcgi.html
@@ -54,29 +54,29 @@ By default, Nagios expects the CGI configuration file to be named <b>cgi.cfg</b>
<strong><u>Index</u></strong>
</p>
<p>
-<a href="#main_cfg_file">Main configuration file location</a><br>
-<a href="#physical_html_path">Physical HTML path</a><br>
-<a href="#url_html_path">URL HTML path</a><br>
-<br>
-<a href="#use_authentication">Authentication usage</a><br>
-<a href="#default_user_name">Default user name</a><br>
-<a href="#authorized_for_system_information">System/process information access</a><br>
-<a href="#authorized_for_system_commands">System/process command access</a><br>
-<a href="#authorized_for_configuration_information">Configuration information access</a><br>
-<a href="#authorized_for_all_hosts">Global host information access</a><br>
-<a href="#authorized_for_all_host_commands">Global host command access</a><br>
-<a href="#authorized_for_all_services">Global service information access</a><br>
-<a href="#authorized_for_all_service_commands">Global service command access</a><br>
-<br>
-<a href="#statusmap_background_image">Statusmap CGI background image</a><br>
-<a href="#default_statusmap_layout">Default statusmap layout method</a><br>
-<a href="#statuswrl_include">Statuswrl CGI include world</a><br>
-<a href="#default_statuswrl_layout">Default statuswrl layout method</a><br>
-<br>
-<a href="#refresh_rate">CGI refresh rate</a><br>
-<a href="#audio_alerts">Audio alerts</a><br>
-<br>
-<a href="#ping_syntax">Ping syntax</a><br>
+<a href="#main_cfg_file">Main configuration file location</a><br />
+<a href="#physical_html_path">Physical HTML path</a><br />
+<a href="#url_html_path">URL HTML path</a><br />
+<br />
+<a href="#use_authentication">Authentication usage</a><br />
+<a href="#default_user_name">Default user name</a><br />
+<a href="#authorized_for_system_information">System/process information access</a><br />
+<a href="#authorized_for_system_commands">System/process command access</a><br />
+<a href="#authorized_for_configuration_information">Configuration information access</a><br />
+<a href="#authorized_for_all_hosts">Global host information access</a><br />
+<a href="#authorized_for_all_host_commands">Global host command access</a><br />
+<a href="#authorized_for_all_services">Global service information access</a><br />
+<a href="#authorized_for_all_service_commands">Global service command access</a><br />
+<br />
+<a href="#statusmap_background_image">Statusmap CGI background image</a><br />
+<a href="#default_statusmap_layout">Default statusmap layout method</a><br />
+<a href="#statuswrl_include">Statuswrl CGI include world</a><br />
+<a href="#default_statuswrl_layout">Default statuswrl layout method</a><br />
+<br />
+<a href="#refresh_rate">CGI refresh rate</a><br />
+<a href="#audio_alerts">Audio alerts</a><br />
+<br />
+<a href="#ping_syntax">Ping syntax</a><br />
</p>
<p>
@@ -585,21 +585,21 @@ This option allows you to specify the number of seconds between page refreshes f
<tr>
<td valign=top>Formats:</td>
<td>
-<strong>host_unreachable_sound=<sound_file></strong><br>
-<strong>host_down_sound=<sound_file></strong><br>
-<strong>service_critical_sound=<sound_file></strong><br>
-<strong>service_warning_sound=<sound_file></strong><br>
-<strong>service_unknown_sound=<sound_file></strong><br>
+<strong>host_unreachable_sound=<sound_file></strong><br />
+<strong>host_down_sound=<sound_file></strong><br />
+<strong>service_critical_sound=<sound_file></strong><br />
+<strong>service_warning_sound=<sound_file></strong><br />
+<strong>service_unknown_sound=<sound_file></strong><br />
</td>
</tr>
<tr>
<td valign=top>Examples:</td>
<td>
-<font color="red"><strong>host_unreachable_sound=hostu.wav</strong></font><br>
-<font color="red"><strong>host_down_sound=hostd.wav</strong></font><br>
-<font color="red"><strong>service_critical_sound=critical.wav</strong></font><br>
-<font color="red"><strong>service_warning_sound=warning.wav</strong></font><br>
-<font color="red"><strong>service_unknown_sound=unknown.wav</strong></font><br>
+<font color="red"><strong>host_unreachable_sound=hostu.wav</strong></font><br />
+<font color="red"><strong>host_down_sound=hostd.wav</strong></font><br />
+<font color="red"><strong>service_critical_sound=critical.wav</strong></font><br />
+<font color="red"><strong>service_warning_sound=warning.wav</strong></font><br />
+<font color="red"><strong>service_unknown_sound=unknown.wav</strong></font><br />
</td>
</tr>
</table>
diff --git a/doc/en/configmain.html b/doc/en/configmain.html
index 102c8ad80e333bd33c8890b15d2cadf47147eb15..66fefa9a387543e0c130fe4c8a2c0bf10a758bb6 100644
--- a/doc/en/configmain.html
+++ b/doc/en/configmain.html
@@ -47,123 +47,123 @@ A sample main configuration file is created in the base directory of the Nagios
<strong><u>Index</u></strong>
</p>
<p>
-<a href="#log_file">Log file</a><br>
-<a href="#cfg_file">Object configuration file</a><br>
-<a href="#cfg_dir">Object configuration directory</a><br>
-<a href="#object_cache_file">Object cache file</a><br>
-<a href="#resource_file">Resource file</a><br>
-<a href="#temp_file">Temp file</a><br>
-<br>
-<a href="#status_file">Status file</a><br>
-<a href="#aggregate_status_updates">Aggregated status updates option</a><br>
-<a href="#status_update_interval">Aggregated status data update interval</a><br>
-<br>
-<a href="#nagios_user">Nagios user</a><br>
-<a href="#nagios_group">Nagios group</a><br>
-<br>
-<a href="#enable_notifications">Notifications option</a><br>
-<a href="#execute_service_checks">Service check execution option</a><br>
-<a href="#accept_passive_service_checks">Passive service check acceptance option</a><br>
-<a href="#execute_host_checks">Host check execution option</a><br>
-<a href="#accept_passive_host_checks">Passive host check acceptance option</a><br>
-<a href="#enable_event_handlers">Event handler option</a><br>
-<br>
-<a href="#log_rotation_method">Log rotation method</a><br>
-<a href="#log_archive_path">Log archive path</a><br>
-<br>
-<a href="#check_external_commands">External command check option</a><br>
-<a href="#command_check_interval">External command check interval</a><br>
-<a href="#command_file">External command file</a><br>
-<br>
-<a href="#comment_file">Comment file</a><br>
-<a href="#downtime_file">Downtime file</a><br>
-<a href="#lock_file">Lock file</a><br>
-<br>
-<a href="#retain_state_information">State retention option</a><br>
-<a href="#state_retention_file">State retention file</a><br>
-<a href="#retention_update_interval">Automatic state retention update interval</a><br>
-<a href="#use_retained_program_state">Use retained program state option</a><br>
-<a href="#use_retained_scheduling_info">Use retained scheduling info option</a><br>
-<br>
-<a href="#use_syslog">Syslog logging option</a><br>
-<a href="#log_notifications">Notification logging option</a><br>
-<a href="#log_service_retries">Service check retry logging option</a><br>
-<a href="#log_host_retries">Host retry logging option</a><br>
-<a href="#log_event_handlers">Event handler logging option</a><br>
-<a href="#log_initial_states">Initial state logging option</a><br>
-<a href="#log_external_commands">External command logging option</a><br>
-<a href="#log_passive_checks">Passive check logging option</a><br>
-<br>
-<a href="#global_host_event_handler">Global host event handler</a><br>
-<a href="#global_service_event_handler">Global service event handler</a><br>
-<br>
-<a href="#sleep_time">Inter-check sleep time</a><br>
-<a href="#service_inter_check_delay_method">Service inter-check delay method</a><br>
-<a href="#max_service_check_spread">Maximum service check spread</a><br>
-<a href="#service_interleave_factor">Service interleave factor</a><br>
-<a href="#max_concurrent_checks">Maximum concurrent service checks</a><br>
-<a href="#service_reaper_frequency">Service reaper frequency</a><br>
-<a href="#host_inter_check_delay_method">Host inter-check delay method</a><br>
-<a href="#max_host_check_spread">Maximum host check spread</a><br>
-<a href="#interval_length">Timing interval length</a><br>
-<a href="#auto_reschedule_checks">Auto-rescheduling option</a><br>
-<a href="#auto_rescheduling_interval">Auto-rescheduling interval</a><br>
-<a href="#auto_rescheduling_window">Auto-rescheduling window</a><br>
-<br>
-<a href="#use_aggressive_host_checking">Aggressive host checking option</a><br>
-<br>
-<a href="#enable_flap_detection">Flap detection option</a><br>
-<a href="#low_service_flap_threshold">Low service flap threshold</a><br>
-<a href="#high_service_flap_threshold">High service flap threshold</a><br>
-<a href="#low_host_flap_threshold">Low host flap threshold</a><br>
-<a href="#high_host_flap_threshold">High host flap threshold</a><br>
-<br>
-<a href="#soft_service_dependencies">Soft service dependencies option</a><br>
-<br>
-<a href="#service_check_timeout">Service check timeout</a><br>
-<a href="#host_check_timeout">Host check timeout</a><br>
-<a href="#event_handler_timeout">Event handler timeout</a><br>
-<a href="#notification_timeout">Notification timeout</a><br>
-<a href="#ocsp_timeout">Obsessive compulsive service processor timeout</a><br>
-<a href="#ochp_timeout">Obsessive compulsive host processor timeout</a><br>
-<a href="#perfdata_timeout">Performance data processor command timeout</a><br>
-<br>
-<a href="#obsess_over_services">Obsess over services option</a><br>
-<a href="#ocsp_command">Obsessive compulsive service processor command</a><br>
-<a href="#obsess_over_hosts">Obsess over hosts option</a><br>
-<a href="#ochp_command">Obsessive compulsive host processor command</a><br>
-<br>
-<a href="#process_performance_data">Performance data processing option</a><br>
-<a href="#host_perfdata_command">Host performance data processing command</a><br>
-<a href="#service_perfdata_command">Service performance data processing command</a><br>
-<a href="#host_perfdata_file">Host performance data file</a><br>
-<a href="#service_perfdata_file">Service performance data file</a><br>
-<a href="#host_perfdata_file_template">Host performance data file template</a><br>
-<a href="#service_perfdata_file_template">Service performance data file template</a><br>
-<a href="#host_perfdata_file_mode">Host performance data file mode</a><br>
-<a href="#service_perfdata_file_mode">Service performance data file mode</a><br>
-<a href="#host_perfdata_file_processing_interval">Host performance data file processing interval</a><br>
-<a href="#service_perfdata_file_processing_interval">Service performance data file processing interval</a><br>
-<a href="#host_perfdata_file_processing_command">Host performance data file processing command</a><br>
-<a href="#service_perfdata_file_processing_command">Service performance data file processing command</a><br>
-<br>
-<a href="#check_for_orphaned_services">Orphaned service check option</a><br>
-<br>
-<a href="#check_service_freshness">Service freshness checking option</a><br>
-<a href="#service_freshness_check_interval">Service freshness check interval</a><br>
-<a href="#check_host_freshness">Host freshness checking option</a><br>
-<a href="#host_freshness_check_interval">Host freshness check interval</a><br>
-<br>
-<a href="#date_format">Date format</a><br>
-<br>
-<a href="#illegal_object_name_chars">Illegal object name characters</a><br>
-<a href="#illegal_macro_output_chars">Illegal macro output characters</a><br>
-<br>
-<a href="#use_regexp_matching">Regular expression matching option</a><br>
-<a href="#use_true_regexp_matching">True regular expression matching option</a><br>
-<br>
-<a href="#admin_email">Administrator email address</a><br>
-<a href="#admin_pager">Administrator pager</a><br>
+<a href="#log_file">Log file</a><br />
+<a href="#cfg_file">Object configuration file</a><br />
+<a href="#cfg_dir">Object configuration directory</a><br />
+<a href="#object_cache_file">Object cache file</a><br />
+<a href="#resource_file">Resource file</a><br />
+<a href="#temp_file">Temp file</a><br />
+<br />
+<a href="#status_file">Status file</a><br />
+<a href="#aggregate_status_updates">Aggregated status updates option</a><br />
+<a href="#status_update_interval">Aggregated status data update interval</a><br />
+<br />
+<a href="#nagios_user">Nagios user</a><br />
+<a href="#nagios_group">Nagios group</a><br />
+<br />
+<a href="#enable_notifications">Notifications option</a><br />
+<a href="#execute_service_checks">Service check execution option</a><br />
+<a href="#accept_passive_service_checks">Passive service check acceptance option</a><br />
+<a href="#execute_host_checks">Host check execution option</a><br />
+<a href="#accept_passive_host_checks">Passive host check acceptance option</a><br />
+<a href="#enable_event_handlers">Event handler option</a><br />
+<br />
+<a href="#log_rotation_method">Log rotation method</a><br />
+<a href="#log_archive_path">Log archive path</a><br />
+<br />
+<a href="#check_external_commands">External command check option</a><br />
+<a href="#command_check_interval">External command check interval</a><br />
+<a href="#command_file">External command file</a><br />
+<br />
+<a href="#comment_file">Comment file</a><br />
+<a href="#downtime_file">Downtime file</a><br />
+<a href="#lock_file">Lock file</a><br />
+<br />
+<a href="#retain_state_information">State retention option</a><br />
+<a href="#state_retention_file">State retention file</a><br />
+<a href="#retention_update_interval">Automatic state retention update interval</a><br />
+<a href="#use_retained_program_state">Use retained program state option</a><br />
+<a href="#use_retained_scheduling_info">Use retained scheduling info option</a><br />
+<br />
+<a href="#use_syslog">Syslog logging option</a><br />
+<a href="#log_notifications">Notification logging option</a><br />
+<a href="#log_service_retries">Service check retry logging option</a><br />
+<a href="#log_host_retries">Host retry logging option</a><br />
+<a href="#log_event_handlers">Event handler logging option</a><br />
+<a href="#log_initial_states">Initial state logging option</a><br />
+<a href="#log_external_commands">External command logging option</a><br />
+<a href="#log_passive_checks">Passive check logging option</a><br />
+<br />
+<a href="#global_host_event_handler">Global host event handler</a><br />
+<a href="#global_service_event_handler">Global service event handler</a><br />
+<br />
+<a href="#sleep_time">Inter-check sleep time</a><br />
+<a href="#service_inter_check_delay_method">Service inter-check delay method</a><br />
+<a href="#max_service_check_spread">Maximum service check spread</a><br />
+<a href="#service_interleave_factor">Service interleave factor</a><br />
+<a href="#max_concurrent_checks">Maximum concurrent service checks</a><br />
+<a href="#service_reaper_frequency">Service reaper frequency</a><br />
+<a href="#host_inter_check_delay_method">Host inter-check delay method</a><br />
+<a href="#max_host_check_spread">Maximum host check spread</a><br />
+<a href="#interval_length">Timing interval length</a><br />
+<a href="#auto_reschedule_checks">Auto-rescheduling option</a><br />
+<a href="#auto_rescheduling_interval">Auto-rescheduling interval</a><br />
+<a href="#auto_rescheduling_window">Auto-rescheduling window</a><br />
+<br />
+<a href="#use_aggressive_host_checking">Aggressive host checking option</a><br />
+<br />
+<a href="#enable_flap_detection">Flap detection option</a><br />
+<a href="#low_service_flap_threshold">Low service flap threshold</a><br />
+<a href="#high_service_flap_threshold">High service flap threshold</a><br />
+<a href="#low_host_flap_threshold">Low host flap threshold</a><br />
+<a href="#high_host_flap_threshold">High host flap threshold</a><br />
+<br />
+<a href="#soft_service_dependencies">Soft service dependencies option</a><br />
+<br />
+<a href="#service_check_timeout">Service check timeout</a><br />
+<a href="#host_check_timeout">Host check timeout</a><br />
+<a href="#event_handler_timeout">Event handler timeout</a><br />
+<a href="#notification_timeout">Notification timeout</a><br />
+<a href="#ocsp_timeout">Obsessive compulsive service processor timeout</a><br />
+<a href="#ochp_timeout">Obsessive compulsive host processor timeout</a><br />
+<a href="#perfdata_timeout">Performance data processor command timeout</a><br />
+<br />
+<a href="#obsess_over_services">Obsess over services option</a><br />
+<a href="#ocsp_command">Obsessive compulsive service processor command</a><br />
+<a href="#obsess_over_hosts">Obsess over hosts option</a><br />
+<a href="#ochp_command">Obsessive compulsive host processor command</a><br />
+<br />
+<a href="#process_performance_data">Performance data processing option</a><br />
+<a href="#host_perfdata_command">Host performance data processing command</a><br />
+<a href="#service_perfdata_command">Service performance data processing command</a><br />
+<a href="#host_perfdata_file">Host performance data file</a><br />
+<a href="#service_perfdata_file">Service performance data file</a><br />
+<a href="#host_perfdata_file_template">Host performance data file template</a><br />
+<a href="#service_perfdata_file_template">Service performance data file template</a><br />
+<a href="#host_perfdata_file_mode">Host performance data file mode</a><br />
+<a href="#service_perfdata_file_mode">Service performance data file mode</a><br />
+<a href="#host_perfdata_file_processing_interval">Host performance data file processing interval</a><br />
+<a href="#service_perfdata_file_processing_interval">Service performance data file processing interval</a><br />
+<a href="#host_perfdata_file_processing_command">Host performance data file processing command</a><br />
+<a href="#service_perfdata_file_processing_command">Service performance data file processing command</a><br />
+<br />
+<a href="#check_for_orphaned_services">Orphaned service check option</a><br />
+<br />
+<a href="#check_service_freshness">Service freshness checking option</a><br />
+<a href="#service_freshness_check_interval">Service freshness check interval</a><br />
+<a href="#check_host_freshness">Host freshness checking option</a><br />
+<a href="#host_freshness_check_interval">Host freshness check interval</a><br />
+<br />
+<a href="#date_format">Date format</a><br />
+<br />
+<a href="#illegal_object_name_chars">Illegal object name characters</a><br />
+<a href="#illegal_macro_output_chars">Illegal macro output characters</a><br />
+<br />
+<a href="#use_regexp_matching">Regular expression matching option</a><br />
+<a href="#use_true_regexp_matching">True regular expression matching option</a><br />
+<br />
+<a href="#admin_email">Administrator email address</a><br />
+<a href="#admin_pager">Administrator pager</a><br />
</p>
@@ -214,8 +214,8 @@ finds in the rest of your configuration data to this file. If you have <a href=
<tr>
<td>Example:</td>
<td>
-<font color="red"><strong>cfg_file=/usr/local/nagios/etc/hosts.cfg</strong></font><br>
-<font color="red"><strong>cfg_file=/usr/local/nagios/etc/services.cfg</strong></font><br>
+<font color="red"><strong>cfg_file=/usr/local/nagios/etc/hosts.cfg</strong></font><br />
+<font color="red"><strong>cfg_file=/usr/local/nagios/etc/services.cfg</strong></font><br />
<font color="red"><strong>cfg_file=/usr/local/nagios/etc/commands.cfg</strong></font>
</td>
</tr>
@@ -245,8 +245,8 @@ This directive is used to specify an <a href="configobject.html">object configur
<tr>
<td>Example:</td>
<td>
-<font color="red"><strong>cfg_dir=/usr/local/nagios/etc/commands</strong></font><br>
-<font color="red"><strong>cfg_dir=/usr/local/nagios/etc/services</strong></font><br>
+<font color="red"><strong>cfg_dir=/usr/local/nagios/etc/commands</strong></font><br />
+<font color="red"><strong>cfg_dir=/usr/local/nagios/etc/services</strong></font><br />
<font color="red"><strong>cfg_dir=/usr/local/nagios/etc/hosts</strong></font>
</td>
</tr>
diff --git a/doc/en/embeddedperl.html b/doc/en/embeddedperl.html
index 47785d7eff6ef93a5324326932e17b8a09c58c4f..1597fccbe6ccb0dbfe1f1148a7715d5201aff628 100644
--- a/doc/en/embeddedperl.html
+++ b/doc/en/embeddedperl.html
@@ -48,13 +48,13 @@ Some advantages of ePN (embedded Perl Nagios) include:
<p>
<ul>
-<li>Nagios will spend much less time running your Perl plugins because it no longer forks to execute the plugin (each time loading the Perl interpreter). Instead, it executes your plugin by making a library call.<br><br>
+<li>Nagios will spend much less time running your Perl plugins because it no longer forks to execute the plugin (each time loading the Perl interpreter). Instead, it executes your plugin by making a library call.<br /><br />
-<li>It greatly reduces the system impact of Perl plugins and/or allows you to run more checks with Perl plugin than you otherwise would be able to. In other words, you have less incentive to write plugins in other languages such as C/C++, or Expect/TCL, that are generally recognised to have development times at least an order of magnitude slower than Perl (although they do run about ten times faster also - TCL being an exception).<br><br>
+<li>It greatly reduces the system impact of Perl plugins and/or allows you to run more checks with Perl plugin than you otherwise would be able to. In other words, you have less incentive to write plugins in other languages such as C/C++, or Expect/TCL, that are generally recognised to have development times at least an order of magnitude slower than Perl (although they do run about ten times faster also - TCL being an exception).<br /><br />
-<li>If you are not a C programmer, then you can still get a huge amount of mileage out of Nagios by letting Perl do all the heavy lifting without having Nagios slow right down. Note however, that the ePN will not speed up your plugin (apart from eliminating the interpreter load time). If you want fast plugins then consider Perl XSUBs (XS), or C <i>after</i> you are sure that your Perl is tuned and that you have a suitable algorithm (Benchmark.pm is <i>invaluable</i> for comparing the performance of Perl language elements).<br><br>
+<li>If you are not a C programmer, then you can still get a huge amount of mileage out of Nagios by letting Perl do all the heavy lifting without having Nagios slow right down. Note however, that the ePN will not speed up your plugin (apart from eliminating the interpreter load time). If you want fast plugins then consider Perl XSUBs (XS), or C <i>after</i> you are sure that your Perl is tuned and that you have a suitable algorithm (Benchmark.pm is <i>invaluable</i> for comparing the performance of Perl language elements).<br /><br />
-<li>Using the ePN is an excellent opportunity to learn more about Perl.<br><br>
+<li>Using the ePN is an excellent opportunity to learn more about Perl.<br /><br />
</ul>
</p>
@@ -70,17 +70,17 @@ The disadvantages of ePN (embedded Perl Nagios) are much the same as Apache mod_
<p>
<ul>
-<li>A Perl program that works <i>fine</i> with plain Nagios may <i>not</i> work with the ePN. You may have to modify your plugins to get them to work.<br><br>
+<li>A Perl program that works <i>fine</i> with plain Nagios may <i>not</i> work with the ePN. You may have to modify your plugins to get them to work.<br /><br />
-<li>Perl plugins are harder to debug under an ePN than under a plain Nagios.<br><br>
+<li>Perl plugins are harder to debug under an ePN than under a plain Nagios.<br /><br />
-<li>Your ePN will have a larger SIZE (memory footprint) than a plain Nagios.<br><br>
+<li>Your ePN will have a larger SIZE (memory footprint) than a plain Nagios.<br /><br />
-<li>Some Perl constructs cannot be used or may behave differently than what you would expect.<br><br>
+<li>Some Perl constructs cannot be used or may behave differently than what you would expect.<br /><br />
-<li>You may have to be aware of 'more than one way to do it' and choose a way that seems less attractive or obvious.<br><br>
+<li>You may have to be aware of 'more than one way to do it' and choose a way that seems less attractive or obvious.<br /><br />
-<li>You will need greater Perl knowledge (but nothing very esoteric or stuff about Perl internals - unless your plugin uses XSUBS).<br><br>
+<li>You will need greater Perl knowledge (but nothing very esoteric or stuff about Perl internals - unless your plugin uses XSUBS).<br /><br />
</ul>
</p>
@@ -93,11 +93,11 @@ The disadvantages of ePN (embedded Perl Nagios) are much the same as Apache mod_
<p>
<ul>
-<li>Average Perl developers; those with an appreciation of the languages powerful features without knowledge of internals or an in depth knowledge of those features.<br><br>
+<li>Average Perl developers; those with an appreciation of the languages powerful features without knowledge of internals or an in depth knowledge of those features.<br /><br />
-<li>Those with a utilitarian appreciation rather than a great depth of understanding.<br><br>
+<li>Those with a utilitarian appreciation rather than a great depth of understanding.<br /><br />
-<li>If you are happy with Perl objects, name management, data structures, and the debugger, that's probably sufficient.<br><br>
+<li>If you are happy with Perl objects, name management, data structures, and the debugger, that's probably sufficient.<br /><br />
</ul>
</p>
@@ -110,11 +110,11 @@ The disadvantages of ePN (embedded Perl Nagios) are much the same as Apache mod_
<p>
<ul>
-<li>Always always generate some output<br><br>
+<li>Always always generate some output<br /><br />
-<li>Use 'use utils' and import the stuff it exports ($TIMEOUT %ERRORS &print_revision &support)<br><br>
+<li>Use 'use utils' and import the stuff it exports ($TIMEOUT %ERRORS &print_revision &support)<br /><br />
-<li>Have a look at how the standard Perl plugins do their stuff e.g.<br><br>
+<li>Have a look at how the standard Perl plugins do their stuff e.g.<br /><br />
<ul>
<li>Always exit with $ERRORS{CRITICAL}, $ERRORS{OK}, etc.
@@ -136,7 +136,7 @@ The disadvantages of ePN (embedded Perl Nagios) are much the same as Apache mod_
<ol>
-<li><DATA> can not be used; use here documents instead e.g.<br><br>
+<li><DATA> can not be used; use here documents instead e.g.<br /><br />
<dir>
<pre>
my $data = <<DATA;
@@ -154,22 +154,22 @@ DATA
</pre>
</dir>
-<li>BEGIN blocks will not work as you expect. May be best to avoid.<br><br>
+<li>BEGIN blocks will not work as you expect. May be best to avoid.<br /><br />
-<li>Ensure that it is squeaky clean at compile time i.e.<br><br>
+<li>Ensure that it is squeaky clean at compile time i.e.<br /><br />
<ul>
<li>use strict
<li>use perl -w (other switches [T notably] may not help)
<li>use perl -c
</ul>
-<br><br>
+<br /><br />
<li>Avoid lexical variables (my) with global scope as a means of passing __variable__ data into subroutines. In fact this is __fatal__ if the subroutine is called by the plugin more than once when the check is run. Such subroutines act as 'closures' that lock the global lexicals first value into subsequent calls of the subroutine. If however, your global
-is read-only (a complicated structure for example) this is not a problem. What Bekman <a href="http://perl.apache.org/guide/">recommends you do instead</a>, is any of the following:<br><br>
+is read-only (a complicated structure for example) this is not a problem. What Bekman <a href="http://perl.apache.org/guide/">recommends you do instead</a>, is any of the following:<br /><br />
<ul>
-<li>make the subroutine anonymous and call it via a code ref e.g.<br><br>
+<li>make the subroutine anonymous and call it via a code ref e.g.<br /><br />
<dir>
<pre>
turn this into
@@ -193,9 +193,9 @@ a ; &$a_cr ;
<li>replace lexicals with package globals and exclude them from 'use strict' objections with 'use vars qw(global1 global2 ..)'
</ul>
-<br>
+<br />
-<li>Be aware of where you can get more information.<br><br>
+<li>Be aware of where you can get more information.<br /><br />
<dir>
<p>
Useful information can be had from the usual suspects (the O'Reilly books, plus Damien Conways "Object Oriented Perl") but for the really useful stuff in the right context start at Stas Bekman's mod_perl guide at <a href="http://perl.apache.org/guide/">http://perl.apache.org/guide/</a>.
@@ -211,10 +211,10 @@ On the basis that Lincoln Stein and Doug MacEachern know a thing or two about Pe
</p>
</dir>
-<li>Be aware that your plugin may return strange values with an ePN and that this is likely to be caused by the problem in item #4 above<br><br>
+<li>Be aware that your plugin may return strange values with an ePN and that this is likely to be caused by the problem in item #4 above<br /><br />
-<li>Be prepared to debug via:<br><br>
+<li>Be prepared to debug via:<br /><br />
<ul>
<li>having a test ePN and
<li>adding print statements to your plugin to display variable values to STDERR (can't use STDOUT)
@@ -223,15 +223,15 @@ On the basis that Lincoln Stein and Doug MacEachern know a thing or two about Pe
<li>use the 'Deparse' module on your plugin to see how the parser has optimised it and what the interpreter will actually get. (see 'Constants in Perl' by Sean M. Burke, The Perl Journal, Fall 2001)
</ul>
-<br>
+<br />
<dir>
perl -MO::Deparse <your_program>
</dir>
-<br>
+<br />
-<li>Be aware of what ePN is transforming your plugin too, and if all else fails try and debug the transformed version.<br><br>
+<li>Be aware of what ePN is transforming your plugin too, and if all else fails try and debug the transformed version.<br /><br />
<dir>
<p>
@@ -285,11 +285,11 @@ The following output shows how a test ePN transformed the <i>check_rpc</i> plugi
</dir>
-<br>
+<br />
-<li>Don't use 'use diagnostics' in a plugin run by your production ePN. I think it causes__all__ the Perl plugins to return CRITICAL.<br><br>
+<li>Don't use 'use diagnostics' in a plugin run by your production ePN. I think it causes__all__ the Perl plugins to return CRITICAL.<br /><br />
-<li>Consider using a mini embedded Perl C program to check your plugin. This is not sufficient to guarantee your plugin will perform Ok with an ePN but if the plugin fails this test it will ceratinly fail with your ePN. <font color="red">[ A sample mini ePN is included in the <i>contrib/</i> directory of the Nagios distribution for use in testing Perl plugins. Change to the contrib/ directory and type 'make mini_epn' to compile it. It must be executed from the same directory that the p1.pl file resides in (this file is distributed with Nagios). ]</font> <br><br>
+<li>Consider using a mini embedded Perl C program to check your plugin. This is not sufficient to guarantee your plugin will perform Ok with an ePN but if the plugin fails this test it will ceratinly fail with your ePN. <font color="red">[ A sample mini ePN is included in the <i>contrib/</i> directory of the Nagios distribution for use in testing Perl plugins. Change to the contrib/ directory and type 'make mini_epn' to compile it. It must be executed from the same directory that the p1.pl file resides in (this file is distributed with Nagios). ]</font> <br /><br />
</ol>
diff --git a/doc/en/eventhandlers.html b/doc/en/eventhandlers.html
index ecc3e7a43896b60063468b53ec368b61f26598a4..7d6249aaa82fb64d650eae121d2f2b210b790820 100644
--- a/doc/en/eventhandlers.html
+++ b/doc/en/eventhandlers.html
@@ -72,7 +72,7 @@ In most cases, event handler commands will be shell or perl scripts. At a minim
the following <a href="macros.html">macros</a> as arguments:
</p>
<p>
-Service event handler macros: <b>$SERVICESTATE$</b>, <b>$SERVICESTATETYPE$</b>, <b>$SERVICEATTEMPT$</b><br>
+Service event handler macros: <b>$SERVICESTATE$</b>, <b>$SERVICESTATETYPE$</b>, <b>$SERVICEATTEMPT$</b><br />
Host event handler macros: <b>$HOSTSTATE$</b>, <b>$HOSTSTATETYPE$</b>, <b>$HOSTATTEMPT$</b>
</p>
<p>
diff --git a/doc/en/index.html b/doc/en/index.html
index 8cece94b7f337d337a8d9c789ed6ac758176c039..02e9dac4fe215ba181d70cf841b722294028e5cf 100644
--- a/doc/en/index.html
+++ b/doc/en/index.html
@@ -35,12 +35,12 @@
</P>
<P class="Title">
-Nagios® Version 2.x<br>
+Nagios® Version 2.x<br />
Documentation
</p>
<P class="Copyright">
-Copyright © 1999-2006 Ethan Galstad<br>
+Copyright © 1999-2006 Ethan Galstad<br />
<a href="http://www.nagios.org/" target="_blank">www.nagios.org</a>
</P>
@@ -49,13 +49,13 @@ Last Updated: 11-27-2006
</P>
-<br><br>
+<br /><br />
<P class="DocLink">
[ <a href="toc.html" class="DocLink">Table of Contents</a> ]
</P>
-<br><br><br><br>
+<br /><br /><br /><br />
<p class="Disclaimer">
Nagios and the Nagios logo are registered trademarks of Ethan Galstad. All other trademarks, servicemarks, registered trademarks, and registered servicemarks mentioned herein may be the property of their respective owner(s). The information contained herein is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/doc/en/installing.html b/doc/en/installing.html
index 513b2346012e37b0f4565b867b6091c3263487b4..2b55b66b9e3dc4f490dbda8ee8e46db2d8514fc5 100644
--- a/doc/en/installing.html
+++ b/doc/en/installing.html
@@ -115,7 +115,7 @@ You're probably going to want to issue <a href="extcommands.html">external comma
<p>
<strong>
<font color="red">
-grep "^User" /etc/httpd/conf/httpd.conf<br>
+grep "^User" /etc/httpd/conf/httpd.conf<br />
</font>
</strong>
</p>
@@ -137,8 +137,8 @@ Next, add the users that your web server and Nagios run as to the newly created
</p>
<p>
-<font color="red">/usr/sbin/usermod -G nagcmd apache</font><br>
-<font color="red">/usr/sbin/usermod -G nagcmd nagios</font><br>
+<font color="red">/usr/sbin/usermod -G nagcmd apache</font><br />
+<font color="red">/usr/sbin/usermod -G nagcmd nagios</font><br />
</p>
<p>
diff --git a/doc/en/networkreachability.html b/doc/en/networkreachability.html
index ef116245fd2666a7977407c2256576842d145cd4..57ba5049cb16d74bbd66661dde6c0b7a52e98b36 100644
--- a/doc/en/networkreachability.html
+++ b/doc/en/networkreachability.html
@@ -55,7 +55,7 @@ If Nagios needs to check to see if a local host is "alive" it will simply run th
<p>
<a name="figure1"></a>
-<strong>Figure 1.</strong><br>
+<strong>Figure 1.</strong><br />
<img src="images/physical-network.png" border=1><br clear="all">
</p>
@@ -74,7 +74,7 @@ The <b><parents></b> option in the host definition for a "remote" host sho
<p>
<a name="figure2"></a>
-<strong>Figure 2.</strong><br>
+<strong>Figure 2.</strong><br />
<img src="images/network-heirarchy.png" border=1><br clear="all">
</p>
diff --git a/doc/en/notifications.html b/doc/en/notifications.html
index b4820090f8ef7999bc1739d063b5dad0bbb20d83..0dee2ebc49c9f13adaaffc7f1941ccb1cc521277 100644
--- a/doc/en/notifications.html
+++ b/doc/en/notifications.html
@@ -174,9 +174,9 @@ If you're interested in sending an alphanumeric notification to your pager or ce
<p>
<ul>
-<li><a href="http://www.cingular.com/media/text_messaging">Cigular</a><br>
-<li><a href="http://www.pagenet.com/sendamessage/emailpage.asp">PageNet</a><br>
-<li><a href="http://www.messaging.sprintpcs.com/sms_help/send_email.html">SprintPCS</a> (SMS phones)<br>
+<li><a href="http://www.cingular.com/media/text_messaging">Cigular</a><br />
+<li><a href="http://www.pagenet.com/sendamessage/emailpage.asp">PageNet</a><br />
+<li><a href="http://www.messaging.sprintpcs.com/sms_help/send_email.html">SprintPCS</a> (SMS phones)<br />
</ul>
</p>
diff --git a/doc/en/perfdata.html b/doc/en/perfdata.html
index ca980f3a6b58c1ba7463710b075b8ff6db4bf59f..b23a137eea1f6050eff37000bdf2e88b882148c0 100644
--- a/doc/en/perfdata.html
+++ b/doc/en/perfdata.html
@@ -104,7 +104,7 @@ If you want to process the performance data that is available from Nagios and th
<p>
<ol>
-<li>Enable the <a href="configmain.html#process_performance_data">process_performance_data</a> option.<br><br>
+<li>Enable the <a href="configmain.html#process_performance_data">process_performance_data</a> option.<br /><br />
<li>Configure Nagios so that performance data is written to files and/or processed by executing commands.
</ol>
</p>
diff --git a/doc/en/redundancy.html b/doc/en/redundancy.html
index 08ff18176f0a4460a8b053f40e80346400b7db34..878a6817daa7923085a96a635c8bc6feeaf54846 100644
--- a/doc/en/redundancy.html
+++ b/doc/en/redundancy.html
@@ -38,10 +38,10 @@ This section describes a few scenarios for implementing redundant monitoring hos
</p>
<p>
-<a href="#prerequisites">Prerequisites</a><br>
-<a href="#samples">Sample scripts</a><br>
-<a href="#scenario_1">Scenario 1 - Redundant monitoring</a><br>
-<a href="#scenario_2">Scenario 2 - Failover monitoring</a><br>
+<a href="#prerequisites">Prerequisites</a><br />
+<a href="#samples">Sample scripts</a><br />
+<a href="#scenario_1">Scenario 1 - Redundant monitoring</a><br />
+<a href="#scenario_2">Scenario 2 - Failover monitoring</a><br />
</p>
<p>
diff --git a/doc/en/templatetricks.html b/doc/en/templatetricks.html
index b483cc9f68e60dafc2ae82fac93e3c0d81964e48..2d07f83e5f84169cc92ab581d9d4dff22c1da8bb 100644
--- a/doc/en/templatetricks.html
+++ b/doc/en/templatetricks.html
@@ -18,7 +18,7 @@
<p>
<div align="center">
<h2 class="PageTitle">Time-Saving Tricks For Object Definitions</h2>
-or...<br>
+or...<br />
<b>"How To Preserve Your Sanity"</b>
</div>
</p>
diff --git a/doc/en/timeperiods.html b/doc/en/timeperiods.html
index 7b2e48cdec57933b5eba3ae6d0b00788263d8ace..54abd1caa78c1bc24ba8454d7be36dea41da6294 100644
--- a/doc/en/timeperiods.html
+++ b/doc/en/timeperiods.html
@@ -17,8 +17,8 @@
<p>
<div align="center">
-<h2 class="PageTitle">Time Periods</h2><br>
-or...<br>
+<h2 class="PageTitle">Time Periods</h2><br />
+or...<br />
<b>"Is This a Good Time?"</b>
</div>
</p>
diff --git a/doc/en/toc.html b/doc/en/toc.html
index eff6e674696c25a9a72dc335620410a50b3a6018..71d821c69b526529005ba9d5ad3f04d47e1a230e 100644
--- a/doc/en/toc.html
+++ b/doc/en/toc.html
@@ -38,55 +38,55 @@ Table of Contents
<P>
<strong>About</strong>
<ul>
-<a href="about.html#whatis"><strong>What is Nagios?</strong></a><br>
-<a href="about.html#requirements"><strong>System requirements</strong></a><br>
-<a href="about.html#licensing"><strong>Licensing</strong></a><br>
-<a href="about.html#downloading"><strong>Downloading the latest version</strong></a><br>
-<a href="about.html#othermonitors"><strong>Other monitoring utilities</strong></a><br>
+<a href="about.html#whatis"><strong>What is Nagios?</strong></a><br />
+<a href="about.html#requirements"><strong>System requirements</strong></a><br />
+<a href="about.html#licensing"><strong>Licensing</strong></a><br />
+<a href="about.html#downloading"><strong>Downloading the latest version</strong></a><br />
+<a href="about.html#othermonitors"><strong>Other monitoring utilities</strong></a><br />
</ul>
<strong>Release Notes</strong>
<ul>
-<a href="whatsnew.html"><font color="red"><strong>What's new in this version</strong></font></a><br>
-<a href="whatsnew.html#changelog"><strong>Change log</strong></a><br>
+<a href="whatsnew.html"><font color="red"><strong>What's new in this version</strong></font></a><br />
+<a href="whatsnew.html#changelog"><strong>Change log</strong></a><br />
</ul>
<strong>Support</strong>
<ul>
-<a href="http://www.nagios.org/support/"><strong>Self-service and commercial support</strong></a><br>
+<a href="http://www.nagios.org/support/"><strong>Self-service and commercial support</strong></a><br />
</ul>
<strong>Getting Started</strong>
<ul>
-<a href="beginners.html"><strong>Advice for beginners</strong></a><br>
+<a href="beginners.html"><strong>Advice for beginners</strong></a><br />
</ul>
<strong>Installing Nagios</strong>
<ul>
-<a href="installing.html"><strong>Compiling and installing Nagios</strong></a><br>
-<a href="installweb.html"><strong>Setting up the web interface</strong></a><br>
+<a href="installing.html"><strong>Compiling and installing Nagios</strong></a><br />
+<a href="installweb.html"><strong>Setting up the web interface</strong></a><br />
</ul>
<strong>Configuring Nagios</strong>
<ul>
-<a href="config.html"><strong>Configuration overview</strong></a><br>
-<a href="configmain.html"><strong>Main configuration file options</strong></a><br>
-<a href="configobject.html"><strong>Object configuration file options</strong></a><br>
-<a href="configcgi.html"><strong>CGI configuration file options</strong></a><br>
-<a href="cgiauth.html"><strong>Configuring authorization for the CGIs</strong></strong></a><br>
+<a href="config.html"><strong>Configuration overview</strong></a><br />
+<a href="configmain.html"><strong>Main configuration file options</strong></a><br />
+<a href="configobject.html"><strong>Object configuration file options</strong></a><br />
+<a href="configcgi.html"><strong>CGI configuration file options</strong></a><br />
+<a href="cgiauth.html"><strong>Configuring authorization for the CGIs</strong></strong></a><br />
</ul>
<strong>Running Nagios</strong>
<ul>
-<a href="verifyconfig.html"><strong>Verifying the configuration</strong></a><br>
-<a href="starting.html"><strong>Starting Nagios</strong></a><br>
-<a href="stoprestart.html"><strong>Stopping and restarting Nagios</strong></a><br>
+<a href="verifyconfig.html"><strong>Verifying the configuration</strong></a><br />
+<a href="starting.html"><strong>Starting Nagios</strong></a><br />
+<a href="stoprestart.html"><strong>Stopping and restarting Nagios</strong></a><br />
</ul>
<strong>Nagios Plugins</strong>
<ul>
-<a href="plugins.html"><strong>Standard plugins</strong></a><br>
-<a href="plugins.html#howto"><strong>Writing your own plugins</strong></a><br>
+<a href="plugins.html"><strong>Standard plugins</strong></a><br />
+<a href="plugins.html#howto"><strong>Writing your own plugins</strong></a><br />
</ul>
<strong>Nagios Addons</strong>
@@ -105,53 +105,53 @@ Table of Contents
<strong>Theory Of Operation</strong>
<ul>
-<a href="networkreachability.html"><strong>Determing status and reachability of network hosts</strong></a><br>
-<a href="networkoutages.html"><strong>Network outages</strong></a><br>
-<a href="notifications.html"><strong>Notifications</strong></a><br>
-<a href="plugintheory.html"><strong>Plugin theory</strong></a><br>
-<a href="checkscheduling.html"><strong>Service check scheduling</strong></a><br>
-<a href="statetypes.html"><strong>State types</strong></a><br>
-<a href="timeperiods.html"><strong>Time periods</strong></a><br>
+<a href="networkreachability.html"><strong>Determing status and reachability of network hosts</strong></a><br />
+<a href="networkoutages.html"><strong>Network outages</strong></a><br />
+<a href="notifications.html"><strong>Notifications</strong></a><br />
+<a href="plugintheory.html"><strong>Plugin theory</strong></a><br />
+<a href="checkscheduling.html"><strong>Service check scheduling</strong></a><br />
+<a href="statetypes.html"><strong>State types</strong></a><br />
+<a href="timeperiods.html"><strong>Time periods</strong></a><br />
</ul>
<strong>Advanced Topics</strong>
<ul>
-<a href="eventhandlers.html"><strong>Event handlers</strong></a><br>
-<a href="extcommands.html"><strong>External commands</strong></a><br>
-<a href="indirectchecks.html"><strong>Indirect host and service checks</strong></a><br>
-<a href="passivechecks.html"><strong>Passive service checks</strong></a><br>
-<a href="volatileservices.html"><strong>Volatile services</strong></a><br>
-<a href="freshness.html"><strong>Service and host result freshness checks</strong></a><br>
-<a href="distributed.html"><strong>Distributed monitoring</strong></a><br>
-<a href="redundancy.html"><strong>Redundant and failover monitoring</strong></a><br>
-<a href="flapping.html"><strong>Detection and handling of state flapping</strong></a><br>
-<a href="parallelization.html"><strong>Service check parallelization</strong></a><br>
-<a href="escalations.html"><strong>Notification escalations</strong></a><br>
-<a href="clusters.html"><strong>Monitoring service and host clusters</strong></a><br>
-<a href="dependencies.html"><strong>Host and service dependencies</strong></a><br>
-<a href="stalking.html"><strong>State stalking</strong></a><br>
-<a href="perfdata.html"><strong>Performance data</strong></a><br>
-<a href="downtime.html"><strong>Scheduled host and service downtime</strong></a><br>
-<a href="embeddedperl.html"><strong>Using the embedded Perl interpreter</strong></a><br>
-<a href="adaptive.html"><strong>Adaptive monitoring</strong></a><br>
-<a href="templaterecursion.html"><strong>Object inheritance</strong></a><br>
-<a href="templatetricks.html"><strong>Time-saving tips for object definitions</strong></a><br>
+<a href="eventhandlers.html"><strong>Event handlers</strong></a><br />
+<a href="extcommands.html"><strong>External commands</strong></a><br />
+<a href="indirectchecks.html"><strong>Indirect host and service checks</strong></a><br />
+<a href="passivechecks.html"><strong>Passive service checks</strong></a><br />
+<a href="volatileservices.html"><strong>Volatile services</strong></a><br />
+<a href="freshness.html"><strong>Service and host result freshness checks</strong></a><br />
+<a href="distributed.html"><strong>Distributed monitoring</strong></a><br />
+<a href="redundancy.html"><strong>Redundant and failover monitoring</strong></a><br />
+<a href="flapping.html"><strong>Detection and handling of state flapping</strong></a><br />
+<a href="parallelization.html"><strong>Service check parallelization</strong></a><br />
+<a href="escalations.html"><strong>Notification escalations</strong></a><br />
+<a href="clusters.html"><strong>Monitoring service and host clusters</strong></a><br />
+<a href="dependencies.html"><strong>Host and service dependencies</strong></a><br />
+<a href="stalking.html"><strong>State stalking</strong></a><br />
+<a href="perfdata.html"><strong>Performance data</strong></a><br />
+<a href="downtime.html"><strong>Scheduled host and service downtime</strong></a><br />
+<a href="embeddedperl.html"><strong>Using the embedded Perl interpreter</strong></a><br />
+<a href="adaptive.html"><strong>Adaptive monitoring</strong></a><br />
+<a href="templaterecursion.html"><strong>Object inheritance</strong></a><br />
+<a href="templatetricks.html"><strong>Time-saving tips for object definitions</strong></a><br />
</ul>
<strong>Integration With Other Software</strong>
<ul>
-<a href="int-snmptrap.html"><strong>SNMP Traps</strong></a><br>
-<a href="int-tcpwrappers.html"><strong>TCP Wrappers</strong></a><br>
+<a href="int-snmptrap.html"><strong>SNMP Traps</strong></a><br />
+<a href="int-tcpwrappers.html"><strong>TCP Wrappers</strong></a><br />
</ul>
<strong>Miscellaneous</strong>
<ul>
-<a href="security.html"><strong>Securing Nagios</strong></a><br>
-<a href="tuning.html"><strong>Tuning Nagios for maximum performance</strong></a><br>
-<a href="nagiostats.html"><strong>Using the nagiostats utility</strong></a><br>
-<a href="macros.html"><strong>Using macros in commands</strong></a><br>
-<a href="cgis.html"><strong>Information on the CGIs</strong></a><br>
+<a href="security.html"><strong>Securing Nagios</strong></a><br />
+<a href="tuning.html"><strong>Tuning Nagios for maximum performance</strong></a><br />
+<a href="nagiostats.html"><strong>Using the nagiostats utility</strong></a><br />
+<a href="macros.html"><strong>Using macros in commands</strong></a><br />
+<a href="cgis.html"><strong>Information on the CGIs</strong></a><br />
<a href="cgiincludes.html"><strong>Custom CGI headers and footers</strong></a>
</ul>
</P>
diff --git a/doc/en/tuning.html b/doc/en/tuning.html
index 4dc7ea9dd17be26c8a0f9760bf377c5271db56e6..049abd2a0dd17980935ef4aff9b91db6afdee076 100644
--- a/doc/en/tuning.html
+++ b/doc/en/tuning.html
@@ -36,28 +36,28 @@ So you've finally got Nagios up and running and you want to know how you can twe
<p>
<ol>
-<li><b>Use aggregated status updates</b>. Enabling aggregated status updates (with the <a href="configmain.html#aggregate_status_updates">aggregate_status_updates</a> option) will greatly reduce the load on your monitoring host because it won't be constantly trying to update the <a href="configmain.html#status_file">status log</a>. This is especially recommended if you are monitoring a large number of services. The main trade-off with using aggregated status updates is that changes in the states of hosts and services will not be reflected immediately in the status file. This may or may not be a big concern for you.<br><br>
+<li><b>Use aggregated status updates</b>. Enabling aggregated status updates (with the <a href="configmain.html#aggregate_status_updates">aggregate_status_updates</a> option) will greatly reduce the load on your monitoring host because it won't be constantly trying to update the <a href="configmain.html#status_file">status log</a>. This is especially recommended if you are monitoring a large number of services. The main trade-off with using aggregated status updates is that changes in the states of hosts and services will not be reflected immediately in the status file. This may or may not be a big concern for you.<br /><br />
-<li><b>Use a ramdisk for holding status data</b>. If you're using the standard <a href="configmain.html#status_file">status log</a> and you're <i>not</i> using aggregated status updates, consider putting the directory where the status log is stored on a ramdisk. This will speed things up quite a bit (in both the core program and the CGIs) because it saves a lot of interrupts and disk thrashing.<br><br>
+<li><b>Use a ramdisk for holding status data</b>. If you're using the standard <a href="configmain.html#status_file">status log</a> and you're <i>not</i> using aggregated status updates, consider putting the directory where the status log is stored on a ramdisk. This will speed things up quite a bit (in both the core program and the CGIs) because it saves a lot of interrupts and disk thrashing.<br /><br />
-<li><b>Check service latencies to determine best value for maximum concurrent checks</b>. Nagios can restrict the number of maximum concurrently executing service checks to the value you specify with the <a href="configmain.html#max_concurrent_checks">max_concurrent_checks</a> option. This is good because it gives you some control over how much load Nagios will impose on your monitoring host, but it can also slow things down. If you are seeing high latency values (> 10 or 15 seconds) for the majority of your service checks (via the <a href="cgis.html#extinfo_cgi">extinfo CGI</a>), you are probably starving Nagios of the checks it needs. That's not Nagios's fault - its yours. Under ideal conditions, all service checks would have a latency of 0, meaning they were executed at the exact time that they were scheduled to be executed. However, it is normal for some checks to have small latency values. I would recommend taking the minimum number of maximum concurrent checks reported when running Nagios with the <b>-s</b> command line argument and doubling it. Keep increasing it until the average check latency for your services is fairly low. More information on service check scheduling can be found <a href="checkscheduling.html">here</a>.<br><br>
+<li><b>Check service latencies to determine best value for maximum concurrent checks</b>. Nagios can restrict the number of maximum concurrently executing service checks to the value you specify with the <a href="configmain.html#max_concurrent_checks">max_concurrent_checks</a> option. This is good because it gives you some control over how much load Nagios will impose on your monitoring host, but it can also slow things down. If you are seeing high latency values (> 10 or 15 seconds) for the majority of your service checks (via the <a href="cgis.html#extinfo_cgi">extinfo CGI</a>), you are probably starving Nagios of the checks it needs. That's not Nagios's fault - its yours. Under ideal conditions, all service checks would have a latency of 0, meaning they were executed at the exact time that they were scheduled to be executed. However, it is normal for some checks to have small latency values. I would recommend taking the minimum number of maximum concurrent checks reported when running Nagios with the <b>-s</b> command line argument and doubling it. Keep increasing it until the average check latency for your services is fairly low. More information on service check scheduling can be found <a href="checkscheduling.html">here</a>.<br /><br />
-<li><b>Use passive checks when possible</b>. The overhead needed to process the results of <a href="passivechecks.html">passive service checks</a> is much lower than that of "normal" active checks, so make use of that piece of info if you're monitoring a slew of services. It should be noted that passive service checks are only really useful if you have some external application doing some type of monitoring or reporting, so if you're having Nagios do all the work, this won't help things.<br><br>
+<li><b>Use passive checks when possible</b>. The overhead needed to process the results of <a href="passivechecks.html">passive service checks</a> is much lower than that of "normal" active checks, so make use of that piece of info if you're monitoring a slew of services. It should be noted that passive service checks are only really useful if you have some external application doing some type of monitoring or reporting, so if you're having Nagios do all the work, this won't help things.<br /><br />
-<li><b>Avoid using interpreted plugins</b>. One thing that will significantly reduce the load on your monitoring host is the use of compiled (C/C++, etc.) plugins rather than interpreted script (Perl, etc) plugins. While Perl scripts and such are easy to write and work well, the fact that they are compiled/interpreted at every execution instance can significantly increase the load on your monitoring host if you have a lot of service checks. If you want to use Perl plugins, consider compiling them into true executables using perlcc(1) (a utility which is part of the standard Perl distribution) or compiling Nagios with an embedded Perl interpreter (see below).<br><br>
+<li><b>Avoid using interpreted plugins</b>. One thing that will significantly reduce the load on your monitoring host is the use of compiled (C/C++, etc.) plugins rather than interpreted script (Perl, etc) plugins. While Perl scripts and such are easy to write and work well, the fact that they are compiled/interpreted at every execution instance can significantly increase the load on your monitoring host if you have a lot of service checks. If you want to use Perl plugins, consider compiling them into true executables using perlcc(1) (a utility which is part of the standard Perl distribution) or compiling Nagios with an embedded Perl interpreter (see below).<br /><br />
<li><b>Use the embedded Perl interpreter</b>. If you're using a lot of Perl scripts for service checks, etc., you will probably find that compiling an embedded Perl interpreter into the Nagios binary will speed things up. In order to compile in the embedded Perl interpreter, you'll need to supply the <i>--enable-embedded-perl</i> option to the configure script before you compile Nagios. Also, if you use the <i>--with-perlcache</i> option, the compiled version of all Perl scripts processed by the embedded interpreter will be cached for later reuse.
-<br><br>
+<br /><br />
-<li><b>Optimize host check commands</b>. If you're checking host states using the check_ping plugin you'll find that host checks will be performed much faster if you break up the checks. Instead of specifying a <i>max_attempts</i> value of 1 in the host definition and having the check_ping plugin send 10 ICMP packets to the host, it would be much faster to set the <i>max_attempts</i> value to 10 and only send out 1 ICMP packet each time. This is due to the fact that Nagios can often determine the status of a host after executing the plugin once, so you want to make the first check as fast as possible. This method does have its pitfalls in some situations (i.e. hosts that are slow to respond may be assumed to be down), but I you'll see faster host checks if you use it. Another option would be to use a faster plugin (i.e. check_fping) as the <i>host_check_command</i> instead of check_ping.<br><br>
+<li><b>Optimize host check commands</b>. If you're checking host states using the check_ping plugin you'll find that host checks will be performed much faster if you break up the checks. Instead of specifying a <i>max_attempts</i> value of 1 in the host definition and having the check_ping plugin send 10 ICMP packets to the host, it would be much faster to set the <i>max_attempts</i> value to 10 and only send out 1 ICMP packet each time. This is due to the fact that Nagios can often determine the status of a host after executing the plugin once, so you want to make the first check as fast as possible. This method does have its pitfalls in some situations (i.e. hosts that are slow to respond may be assumed to be down), but I you'll see faster host checks if you use it. Another option would be to use a faster plugin (i.e. check_fping) as the <i>host_check_command</i> instead of check_ping.<br /><br />
-<li><b>Don't schedule regular host checks</b>. Do NOT schedule regular checks of hosts unless absolutely necessary. There are not many reasons to do this, as host checks are performed on-demand as needed. To disable regular checks of a host, set the <i>check_interval</i> directive in the <a href="xodtemplate.html#host">host definition</a> to 0. If you do need to have regularly scheduled host checks, try to use a longer check interval and make sure your host checks are optimized (see above).<br><br>
+<li><b>Don't schedule regular host checks</b>. Do NOT schedule regular checks of hosts unless absolutely necessary. There are not many reasons to do this, as host checks are performed on-demand as needed. To disable regular checks of a host, set the <i>check_interval</i> directive in the <a href="xodtemplate.html#host">host definition</a> to 0. If you do need to have regularly scheduled host checks, try to use a longer check interval and make sure your host checks are optimized (see above).<br /><br />
<li><b>Don't use agressive host checking</b>. Unless you're having problems with Nagios recognizing host recoveries, I would recommend <i>not</i> enabling the <a href="configmain.html#use_agressive_host_checking">use_aggressive_host_checking</a> option. With this option turned off host checks will execute much faster, resulting in speedier processing of service check results. However, host recoveries can be missed under certain circumstances when this it turned off. For example, if a host recovers and all of the services associated with that host stay in non-OK states (and don't "wobble" between different non-OK states), Nagios may miss the fact that the host has recovered. A few people may need to enable this option, but the majority don't and I would recommend <i>not</i> using it unless you find it necessary...
-<br><br>
+<br /><br />
<li><b>Increase external command check interval</b>. If you're processing a lot of external commands (i.e. passive checks in a <a href="distributed.html">distributed setup</a>, you'll probably want to set the <a href="configmain.html#command_check_interval">command_check_interval</a> variable to <b>-1</b>. This will cause Nagios to check for external commands as often as possible. This is important because most systems have small pipe buffer sizes (i.e. 4KB). If Nagios doesn't read the data from the pipe fast enough, applications that write to the external command file (i.e. the <a href="addons.html#nsca">NSCA daemon</a>) will block and wait until there is enough free space in the pipe to write their data.
-<br><br>
+<br /><br />
<li><b>Optimize hardware for maximum performance</b>. Your system configuration and your hardware setup are going to directly affect how your operating system performs, so they'll affect how Nagios performs. The most common hardware optimization you can make is with your hard drives. CPU and memory speed are obviously factors that affect performance, but disk access is going to be your biggest bottlenck. Don't store plugins, the status log, etc on slow drives (i.e. old IDE drives or NFS mounts). If you've got them, use UltraSCSI drives or fast IDE drives. An important note for IDE/Linux users is that many Linux installations do not attempt to optimize disk access. If you don't change the disk access parameters (by using a utility like <b>hdparam</b>), you'll loose out on a <b>lot</b> of the speedy features of the new IDE drives.
diff --git a/doc/en/volatileservices.html b/doc/en/volatileservices.html
index 7bf8e2a71ffbe3f2e90ea40a3991cc1eff9f466c..8b05724ed9d4e388af30212ffecdac953082a48d 100644
--- a/doc/en/volatileservices.html
+++ b/doc/en/volatileservices.html
@@ -96,9 +96,9 @@ How about an example... Let's say you're running <a href="http://sourceforge.net
<p>
<ul>
-<li>Edit your PortSentry configuration file (portsentry.conf), define a command for the <B>KILL_RUN_CMD</b> directive as follows:<br><br>
+<li>Edit your PortSentry configuration file (portsentry.conf), define a command for the <B>KILL_RUN_CMD</b> directive as follows:<br /><br />
<font color="red">KILL_RUN_CMD="/usr/local/Nagios/libexec/eventhandlers/submit_check_result <i><host_name></i> 'Port Scans' 2 'Port scan from host $TARGET$ on port $PORT$. Host has been firewalled.'"</font>
-<br><br>
+<br /><br />
Make sure to replace <i><host_name></i> with the short name of the host that the service is associated with.
</ul>
</p>
diff --git a/doc/en/whatsnew.html b/doc/en/whatsnew.html
index 974603b2d2d45318ed9a24ae0589ca467e49cac4..d99007400dbb721fb346cf77e6f006f1a4169d14 100644
--- a/doc/en/whatsnew.html
+++ b/doc/en/whatsnew.html
@@ -59,8 +59,8 @@ There is a known issue that can affect Nagios 2.0 on FreeBSD systems. Hopefully
<p>
<ol>
-<li><b>Macro Changes</b> - <a href="macros.html">Macros</a> have undergone a major overhaul. You will have to update most of your command definitions to match the new macros. Most macros are now available as environment variables. Also, "on-demand" host and service macros have been added. See the <a href="macros.html">documentation on macros</a> for more information.<br>
-<br>
+<li><b>Macro Changes</b> - <a href="macros.html">Macros</a> have undergone a major overhaul. You will have to update most of your command definitions to match the new macros. Most macros are now available as environment variables. Also, "on-demand" host and service macros have been added. See the <a href="macros.html">documentation on macros</a> for more information.<br />
+<br />
<li><b>Hostgroup Changes</b>
<ul>
<li><b>Hostgroup escalations removed</b> - Hostgroup escalations have been removed. Their functionality can be duplicated by using the <i>hostgroup_name</i> directive in <a href="xodtemplate.html#hostgroup">hostgroup definitions</a>.
@@ -68,37 +68,37 @@ There is a known issue that can affect Nagios 2.0 on FreeBSD systems. Hopefully
<li><b>Contact group changes</b> - The <i>contact_groups</i> directive has been moved from hostgroup definitions to <a href="xodtemplate.html#host">host definitions</a>. This was done in order to maintain consistency with the way service contacts are specified. Make sure to update your config files!
<li><b>Authorization changes</b> - Authorization for access to hostgroups in the CGIs has been changed. You must now be authorized for all hosts that are members of the hostgroup in order to be authorized for the hostgroup.
</ul>
-<br>
+<br />
<li><b>Host Changes</b>
<ul>
<li><b>Host freshness checking</b> - Freshness checking has been added for host checks. This is controlled by the <a href="configmain.html#check_host_freshness">check_host_freshness</a> option, along with the <i>check_freshness</i> directive in <a href="xodtemplate.html#host">host definitions</a>.
<li><b>OCHP Command</b> - Host checks can now be obsessed over, just as services can be. The <a href="configmain.html#ochp_command">OCHP command</a> is run for all hosts that have the <i>obsess_over_host</i> directive enabled in their <a href="xodtemplate.html#host">host definition</a>.
</ul>
-<br>
+<br />
<li><b>Host Check Changes</b>
<ul>
<li><b>Regularly scheduled checks</b> - You can now schedule regular checks of hosts by using the <i>check_interval</i> directive in <a href="xodtemplate.html#host">host definitions</a>. <strong>NOTE:</strong> Listen up! You should use regularly scheduled host checks rather sparingly. They are not necessary for normal operation (on-demand checks are already performed when necessary) and can <a href="tuning.html">negatively affect performance</a> if used improperly. You've been warned.
<li><b>Passive host checks</b> - Passive host checks are now supported if you've enabled them with the <a href="configmain.html#accept_passive_host_checks">accept_passive_host_checks</a> option in the main config file and the <i>accept_passive_host_checks</i> directive in the <a href="xodtemplate.html#host">host definition</a>. <a href="passivechecks.html">Passive host checks</a> can make setting up <a href="redundancy.html">redundant</a> or <a href="distributed.html">distributed</a> monitoring environments easier. <strong>NOTE:</strong> There are some problems with passive host checks that you should be aware of - read more about them <a href="passivechecks.html">here</a>.
</ul>
-<br>
+<br />
<li><b>Retention Changes</b>
<ul>
<li><b>Retention of scheduling information</b> - Host and service check scheduling information (next check times) can now be retained across program restarts using the <a href="configmain.html#use_retained_scheduling_info">use_retained_scheduling_info</a> directive.
<li><b>Smarter retention</b> - Values of various host and service directives that can be retained across program restarts are now only retained if they are changed during runtime by an <a href="extcommands.html">external command</a>. This should make things less confusing to people when they try and modify host and service directive values and then restart Nagios, expecting to see some changes.
<li><b>More stuff retained</b> - More information is now retained across program restarts, including <a href="flapping.html">flap detection</a> history. Hoorah!
</ul>
-<br>
+<br />
<li><b>Extended Info Changes</b>
<ul>
<li><b>New location</b> - Extended <a href="xodtemplate.html#hostextinfo">host info</a> and <a href="xodtemplate.html#serviceextinfo">service info</a> definitions are now stored in object config files along with host definitions, etc. As a result, extended info definitions are now parsed and validated by the Nagios daemon before startup.
<li><b>New directives</b> - Extended <a href="xodtemplate.html#hostextinfo">host info</a> and <a href="xodtemplate.html#serviceextinfo">service info</a> definitions now have two new directives: <i>notes</i> and <i>action_url</i>.
</ul>
-<br>
+<br />
<li><b>Embedded Perl Changes</b>
<ul>
<li><b>p1.pl location</b> - You can now specify the location of the embedded Perl "helper" file (p1.pl) using the <a href="configmain.html#p1_file">p1_file</a> directive.
</ul>
-<br>
+<br />
<li><b>Notification Changes</b>
<ul>
<li><b>Flapping notifications</b> - Notifications are now sent out when <a href="flapping.html">flapping</a> starts and stops for hosts and services. This feature can be controlled using the <i>f</i> option in the <i>notification_options</i> for <a href="xodtemplate.html#contact">contacts</a>, <a href="xodtemplate.html#host">hosts</a> and <a href="xodtemplate.html#service">services</a>.
@@ -106,21 +106,21 @@ There is a known issue that can affect Nagios 2.0 on FreeBSD systems. Hopefully
<li><b>Service notifications</b> - Before service notifications are sent out, notification <a href="xodtemplate.html#hostdependency">dependencies</a> for the host are now checked. If host notifications are not deemed to be viable, notifications for the service will not be sent out either.
<li><b>Escalation options</b> - Time period and state options have been added to <a href="xodtemplate.html#hostescalation">host</a> and <a href="xodtemplate.html#serviceescalation">service</a> escalations. This gives you more control in determining when escalations can be used. More information on escalations can be found <a href="escalations.html">here</a>.
</ul>
-<br>
-<li><b>Service Groups Added</b> - <a href="xodtemplate.html#servicegroup">Service groups</a> have now been added. They allow you to group services together for display purposes in the CGIs and <a href="templatetricks.html">can be referenced</a> in service dependency and service escalation definitions to make configuration a bit easier.<br>
-<br>
-<li><b>Triggered Downtime Added</b> - Support for what's called "triggered" downtime has been added for host and service downtime. Triggered downtime allows you to define downtime that should start at the same time another downtime starts (very useful for scheduling downtime for child hosts when the parent host is scheduled for flexible downtime). More information on triggered downtime can be found <a href="downtime.html">here</a>.<br>
-<br>
-<li><b>New Stats Utility</b> - A new utility called 'nagiostats' is now included in the Nagios distribution. Its a command-line utility that allows you to view current statistics for a running Nagios process. It can also produce data compatible with MRTG, so you can graph statistical information. More information on how to use the utility can be found <a href="nagiostats.html">here</a>.<br>
-<br>
-<li><b>Adaptive Monitoring</b> - You can now change certain attributes relating to host and service checks (check command, check interval, max check attempts etc.) during runtime by submitting the appropriate external commands. This kind of adaptive monitoring will probably not be of much use to the majority of users out there, but it does provide a way for doing some neat stuff. More information on adaptive monitoring can be found <a href="adaptive.html">here</a>.<br>
-<br>
-<li><b>Performance Data Changes</b> - The methods for processing performance data have changed slightly. You can now process performance data by executing external commands and/or writing to files without recompiling Nagios. Read the documentation on <a href="perfdata.html">performance data</a> for more information.<br>
-<br>
-<li><b>Native DB Support Dropped</b> - Native support for storing various types of data (status, retention, comment, downtime, etc.) in MySQL and PostgreSQL has been dropped. Stop whining. I expect someone will develop an alternative using the new event broker sometime in the near future. Besides, DB support was not well implemented and dropping native DB support will make things easier for newbies to understand (one less thing to figure out).<br>
-<br>
-<li><b>Event Broker API</b> - An API has been created to allow individual developers to create addons that integrate with the core Nagios daemon. Documentation on the event broker API will be created as the 2.x code matures and will be available on the Nagios website.<br>
-<br>
+<br />
+<li><b>Service Groups Added</b> - <a href="xodtemplate.html#servicegroup">Service groups</a> have now been added. They allow you to group services together for display purposes in the CGIs and <a href="templatetricks.html">can be referenced</a> in service dependency and service escalation definitions to make configuration a bit easier.<br />
+<br />
+<li><b>Triggered Downtime Added</b> - Support for what's called "triggered" downtime has been added for host and service downtime. Triggered downtime allows you to define downtime that should start at the same time another downtime starts (very useful for scheduling downtime for child hosts when the parent host is scheduled for flexible downtime). More information on triggered downtime can be found <a href="downtime.html">here</a>.<br />
+<br />
+<li><b>New Stats Utility</b> - A new utility called 'nagiostats' is now included in the Nagios distribution. Its a command-line utility that allows you to view current statistics for a running Nagios process. It can also produce data compatible with MRTG, so you can graph statistical information. More information on how to use the utility can be found <a href="nagiostats.html">here</a>.<br />
+<br />
+<li><b>Adaptive Monitoring</b> - You can now change certain attributes relating to host and service checks (check command, check interval, max check attempts etc.) during runtime by submitting the appropriate external commands. This kind of adaptive monitoring will probably not be of much use to the majority of users out there, but it does provide a way for doing some neat stuff. More information on adaptive monitoring can be found <a href="adaptive.html">here</a>.<br />
+<br />
+<li><b>Performance Data Changes</b> - The methods for processing performance data have changed slightly. You can now process performance data by executing external commands and/or writing to files without recompiling Nagios. Read the documentation on <a href="perfdata.html">performance data</a> for more information.<br />
+<br />
+<li><b>Native DB Support Dropped</b> - Native support for storing various types of data (status, retention, comment, downtime, etc.) in MySQL and PostgreSQL has been dropped. Stop whining. I expect someone will develop an alternative using the new event broker sometime in the near future. Besides, DB support was not well implemented and dropping native DB support will make things easier for newbies to understand (one less thing to figure out).<br />
+<br />
+<li><b>Event Broker API</b> - An API has been created to allow individual developers to create addons that integrate with the core Nagios daemon. Documentation on the event broker API will be created as the 2.x code matures and will be available on the Nagios website.<br />
+<br />
<li><b>Misc Changes</b>
<ul>
<li><b>All commands can contain arguments</b> - All command types (host checks, notifications, performance data processors, event handlers, etc.) can contain arguments (seperated from the command name by <b>!</b> characters). Arguments are substituted in the command line using <b>$ARGx</b> <a href="macros.html">macros</a>.
@@ -137,7 +137,7 @@ There is a known issue that can affect Nagios 2.0 on FreeBSD systems. Hopefully
<li><b>Service pseudo-states</b> - Support for some redundant service pseudo-states have been removed from the status CGI. This will affect any hardcoded URLs which use the servicestatustypes=X parameter for the CGI. Check include/statusdata.h for the new list of service states that you can use.
<li><b>Freshness check changes</b> - The freshness check logic has been changed slightly. Freshness checks will not occur if the current time is not valid for the host or service <i>check_timeperiod</i>. Also, freshness checks will no longer occur if both the host or service <i>check_interval</i> and <i>freshness_threshold</i> variables are set to zero (0).
</ul>
-<br>
+<br />
</ol>
</p>
diff --git a/doc/en/xodtemplate.html b/doc/en/xodtemplate.html
index acc21784eb23f871a771a4c2ef962ebfb55c3b5d..ca16e4dec1cc0e2cc681ba026426b5cba9d0cd05 100644
--- a/doc/en/xodtemplate.html
+++ b/doc/en/xodtemplate.html
@@ -88,20 +88,20 @@ A few sample object configuration files are created when you run the configure s
<strong><u>Object Types</u></strong>
</p>
<p>
-<a href="#host">Host definitions</a><br>
-<a href="#hostgroup">Host group definitions</a><br>
-<a href="#service">Service definitions</a><br>
-<a href="#servicegroup">Service group definitions</a><br>
-<a href="#contact">Contact definitions</a><br>
-<a href="#contactgroup">Contact group definitions</a><br>
-<a href="#timeperiod">Time period definitions</a><br>
-<a href="#command">Command definitions</a><br>
-<a href="#servicedependency">Service dependency definitions</a><br>
-<a href="#serviceescalation">Service escalation definitions</a><br>
-<a href="#hostdependency">Host dependency definitions</a><br>
-<a href="#hostescalation">Host escalation definitions</a><br>
-<a href="#hostextinfo">Extended host information definitions</a><br>
-<a href="#serviceextinfo">Extended service information definitions</a><br>
+<a href="#host">Host definitions</a><br />
+<a href="#hostgroup">Host group definitions</a><br />
+<a href="#service">Service definitions</a><br />
+<a href="#servicegroup">Service group definitions</a><br />
+<a href="#contact">Contact definitions</a><br />
+<a href="#contactgroup">Contact group definitions</a><br />
+<a href="#timeperiod">Time period definitions</a><br />
+<a href="#command">Command definitions</a><br />
+<a href="#servicedependency">Service dependency definitions</a><br />
+<a href="#serviceescalation">Service escalation definitions</a><br />
+<a href="#hostdependency">Host dependency definitions</a><br />
+<a href="#hostescalation">Host escalation definitions</a><br />
+<a href="#hostextinfo">Extended host information definitions</a><br />
+<a href="#serviceextinfo">Extended service information definitions</a><br />
</p>
<p>
diff --git a/doc/fr/about.html b/doc/fr/about.html
index c33f5cb33b1113132589aeb5225e8845ccfc061f..867ce38e9ad05605ad2b13bfc7359ff3425584db 100644
--- a/doc/fr/about.html
+++ b/doc/fr/about.html
@@ -106,8 +106,8 @@ Vous <i>n'</i>êtes <i>pas obligé</i> d'utiliser les CGIs inclus dan
<p class="SectionBody"><b>[NdT] </b>: Cette traduction est également distribuée
sous les termes de la <a href="http://www.gnu.org/copyleft/fdl.html">GNU Free
Documentation License [Anglais]</a></p>
-<p><br>
- <b>Pour Nagios : </b><br>
+<p><br />
+ <b>Pour Nagios : </b><br />
Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier
au titre des clauses de la Licence Publique Générale GNU, telle
@@ -121,14 +121,14 @@ Vous <i>n'</i>êtes <i>pas obligé</i> d'utiliser les CGIs inclus dan
n'est pas le cas, écrivez à la Free Software Foundation Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p>
-<p><b>Pour la traduction : <br>
+<p><b>Pour la traduction : <br />
</b>Copyright (c) 2006-2007 pour <a href="#traducteurs">l'équipe de traduction</a>
- .<br>
+ .<br />
Cette documentation est une documentation libre; vous pouvez la redistribuer
et/ou la modifier au titre des clauses de la <a href="http://www.gnu.org/copyleft/fdl.html">GNU
Free Documentation License[Anglais]</a>, Version 1.2, ou (à votre discrétion)
une version ultérieure quelconque. Une copie de cette licence est incluse
- dans cette documention <a href="fdl.txt">ici [Anglais].</a><br>
+ dans cette documention <a href="fdl.txt">ici [Anglais].</a><br />
</p>
<p></p>
@@ -150,12 +150,12 @@ Beaucoup de monde a contribué à Nagios, en signalant des bugs, en
<p> <b><u>Traduction:</u></b></p>
-<p>Notes de traduction : <br>
+<p>Notes de traduction : <br />
</p>
<ul>
<li>Pour certains termes traduits, la version originale anglaise est spécifiée
entre crochet : <i>méthode de délai inter-contrôles de service</i>
- [service_inter_check_delay_method]<br>
+ [service_inter_check_delay_method]<br />
Ceci est utilisé lorsque les termes anglais sont des variables de configurations,
des éléments dans l'interface Nagios, ou des anglicismes fréquements
utilisés.
@@ -169,22 +169,22 @@ Beaucoup de monde a contribué à Nagios, en signalant des bugs, en
<p>La traduction de ce manuel est une mise à jour effectuée à
partir de celle de Nagios version 1 crée par Pierre-Antoine Angelini,
Johan MOREAU et Christian Vanguers, elle même tirée de la documentation
- française de NetSaint réalisée par Xavier Dusart.<br>
+ française de NetSaint réalisée par Xavier Dusart.<br />
</p>
<p><a name="traducteurs"></a>Elle est issue d'un effort collectif des personnes
suivantes : </p>
<p><b><u>Equipe de traduction : </u></b></p>
-<p>Erwan Ben Souiden<br>
-Xavier Dusart<br>
-Hervé Nicol<br>
-Patrick Proy<br>
+<p>Erwan Ben Souiden<br />
+Xavier Dusart<br />
+Hervé Nicol<br />
+Patrick Proy<br />
</p>
<p><b><u>Equipe de relecture : </u></b></p>
-<p>Hervé Bouchind'homme<br>
-René Coulet <br>
-Philippe Delsol <br>
-Johan Moreau<br>
+<p>Hervé Bouchind'homme<br />
+René Coulet <br />
+Philippe Delsol <br />
+Johan Moreau<br />
</p>
<hr>
diff --git a/doc/fr/adaptive.html b/doc/fr/adaptive.html
index 7631db6c7f3f53d55cd5aef0b8844ef918166954..d3afe383b15c1041fb2460613bd26b9db4c5825a 100644
--- a/doc/fr/adaptive.html
+++ b/doc/fr/adaptive.html
@@ -98,7 +98,7 @@
de commande</a> avant que Nagios n'ai été démarré.
Si une commande non configurée est entrée, elle sera ignorée.
Les arguments sont fournis avec la commande en utilisant le séparateur
- "!" entre la commande et les arguments, et entre les arguments.<br>
+ "!" entre la commande et les arguments, et entre les arguments.<br />
Les informations sur le traitement des arguments durant l'exécution sont
disponibles sur la page <a href="macros.html">macros</a>.</p>
@@ -110,7 +110,7 @@
<th class="Command">Notes</th></tr>
<tr>
- <td class="CommandType" nowrap>Commande de vérification du service<br>
+ <td class="CommandType" nowrap>Commande de vérification du service<br />
[Service check command]</td>
<td class="Command" nowrap>CHANGE_SVC_CHECK_COMMAND:<i>nom_commande</i></td>
<td class="CommandNotes">Modifie la commande courante de vérification
@@ -120,7 +120,7 @@
<tr>
<td class="CommandType" nowrap>Commande du gestionnaire d'évènements
- du service<br>
+ du service<br />
[Service event handler]</td>
<td class="Command" nowrap>CHANGE_SVC_EVENT_HANDLER:<i>nom_commande</i></td>
<td class="CommandNotes">Modifie la commande courante du gestionnaire d'évènements
@@ -129,7 +129,7 @@
</tr>
<tr>
- <td class="CommandType" nowrap>Intervalle de vérification du service<br>
+ <td class="CommandType" nowrap>Intervalle de vérification du service<br />
[Service check interval]</td>
<td class="Command" nowrap>CHANGE_NORMAL_SVC_CHECK_INTERVAL:<i>intervalle</i></td>
<td class="CommandNotes">Modifie l'intervalle courant de vérification
@@ -139,7 +139,7 @@
<tr>
<td class="CommandType" nowrap>Intervalle de vérification du service
- sur problème<br>
+ sur problème<br />
[Service check retry interval]</td>
<td class="Command" nowrap>CHANGE_RETRY_SVC_CHECK_INTERVAL:<i>intervalle</i></td>
<td class="CommandNotes">Modifie l'intervalle courant de vérification
@@ -148,7 +148,7 @@
</tr>
<tr>
- <td class="CommandType" nowrap>Nombre maximum de vérification du service<br>
+ <td class="CommandType" nowrap>Nombre maximum de vérification du service<br />
[Max service check attempts]</td>
<td class="Command" nowrap>CHANGE_MAX_SVC_CHECK_ATTEMPTS:<i>tentatives</i></td>
<td class="CommandNotes">Modifie le nombre courant maximum de vérification
@@ -158,7 +158,7 @@
<tr>
<td class="CommandType" nowrap>
- <p>Commande de vérification de l'hôte<br>
+ <p>Commande de vérification de l'hôte<br />
[Host check command]</p>
</td>
<td class="Command" nowrap>CHANGE_HOST_CHECK_COMMAND:<i>nom_commande</i></td>
@@ -169,7 +169,7 @@
<tr>
<td class="CommandType" nowrap>Commande du gestionnaire d'évènements
- de l'hôte<br>
+ de l'hôte<br />
[Host event handler]</td>
<td class="Command" nowrap>CHANGE_HOST_EVENT_HANDLER:<i>nom_commande</i></td>
@@ -178,7 +178,7 @@
</tr>
<tr>
- <td class="CommandType" nowrap>Intervalle de vérification de l'hôte<br>
+ <td class="CommandType" nowrap>Intervalle de vérification de l'hôte<br />
[Host check interval]</td>
<td class="Command" nowrap>CHANGE_NORMAL_HOST_CHECK_INTERVAL:<i>intervalle</i></td>
@@ -187,7 +187,7 @@
</tr>
<tr>
- <td class="CommandType" nowrap>Nombre maximum de vérification de l'hôte<br>
+ <td class="CommandType" nowrap>Nombre maximum de vérification de l'hôte<br />
[Max host check attempts]</td>
<td class="Command" nowrap>CHANGE_MAX_HOST_CHECK_ATTEMPTS:<i>tentatives</i></td>
<td class="CommandNotes">Modifie le nombre courant maximum de vérification
@@ -197,7 +197,7 @@
<tr>
<td class="CommandType" nowrap>Commande du gestionnaire d'évènements
- globale des hôtes<br>
+ globale des hôtes<br />
[Global host event handler]</td>
<td class="Command" nowrap>CHANGE_GLOBAL_HOST_EVENT_HANDLER;<i>nom_commande</i></td>
<td class="CommandNotes">Modifie la valeure de <a href="configmain.html#global_host_event_handler">global
@@ -207,7 +207,7 @@
<tr>
<td class="CommandType" nowrap>Commande du gestionnaire d'évènements
- globale des services<br>
+ globale des services<br />
[Global service event handler]</td>
<td class="Command" nowrap>CHANGE_GLOBAL_SVC_EVENT_HANDLER;<i>nom_commande</i></td>
<td class="CommandNotes">Modifie la valeure de <a href="configmain.html#global_service_event_handler">global
diff --git a/doc/fr/addons.html b/doc/fr/addons.html
index 61e0ad42f0d3540c87ec2b961bdf3be61e859bdf..653e4973473619ef696db694c86a26d9b6f6434c 100644
--- a/doc/fr/addons.html
+++ b/doc/fr/addons.html
@@ -21,7 +21,7 @@
</div>
<p></p>
<hr>
-<p> Voici une description de certains compléments disponibles pour Nagios.<br>
+<p> Voici une description de certains compléments disponibles pour Nagios.<br />
Ces ajouts ainsi que d'autres peuvent être obtenus : </p>
<ul>
@@ -39,7 +39,7 @@
<p>Plugins </p>
<p><a href="#nrpe">nrpe</a> - Démon et plugin pour l'exécution de plugins sur
- des machines distantes<br>
+ des machines distantes<br />
<a href="#nsca">nsca</a> - Démon et programme client pour envoyer des résultats
de contrôles passifs via le réseau</p>
diff --git a/doc/fr/beginners.html b/doc/fr/beginners.html
index b274b6893bab29d475b1b0e23c5dc6caa4fc5fe2..447f60d5a23dd3009d8809a89a83fd0ecd2f7b4e 100644
--- a/doc/fr/beginners.html
+++ b/doc/fr/beginners.html
@@ -33,15 +33,15 @@
comment ça fonctionne et pensez voir les choses tourner facilement, ne prenez pas
la peine d'utiliser ce logiciel. Au lieu de cela, payez quelqu'un pour surveiller
votre réseau pour vous ou embauchez quelqu'un pour installer Nagios à votre
- place : -)<br>
- <br>
+ place : -)<br />
+ <br />
<li><strong>Lire la documentation.</strong> Nagios est suffisament difficile à configurer lorsque vous avez une bonne connaissance de son fonctionnement, c'est donc quasiment impossible si vous ne possédez pas ces connaissances .
Rendez vous service et lisez avant d'essayer d'installer et faire tourner Nagios à l'aveuglette.
Si vous êtes du genre à ne pas prendre le temps de lire la documentation, vous vous renderez probablement compte que les autres aussi
ne trouveront pas de temps pour vous aider quand vous aurez des problèmes. RTFM. [<b>NdT </b>: <b>R</b>ead <b>T</b>he <b>F</b>ucking
- <b>M</b>anual (lisez ce foutu manuel) ]<br>
- <br>
+ <b>M</b>anual (lisez ce foutu manuel) ]<br />
+ <br />
<li><strong>Utiliser les fichiers d'exemples de configurations.</strong>
@@ -49,9 +49,9 @@
Regardez les, modifiez les en fonction de vos besoins et testez les !
Les fichiers d'exemple ne sont que cela - des exemples.
Il y a de très fortes chances qu'ils ne fonctionnent pas pour vous sans modifications.
- Les fichiers d'exemple de configurations peuvent être trouvés dans le sous-répertoire <i>sample-config/</i> de la distribution Nagios.<br>
+ Les fichiers d'exemple de configurations peuvent être trouvés dans le sous-répertoire <i>sample-config/</i> de la distribution Nagios.<br />
- <br>
+ <br />
<li><strong>Demandez de l'aide aux autres.</strong> Si vous avez lu la documentation,
passé en revu les fichiers d'exemple de configurations,
et avez toujours des problèmes, essayez d'envoyer un mail décrivant vos problèmes à la liste de diffusion
@@ -60,10 +60,10 @@
alors votre meilleure source d'aide sera la liste de diffusion.
Si vous avez bien lu auparavant et que vous fournissez une bonne description de votre problème,
il y a de fortes chances que quelqu'un vous donne des pistes pour faire fonctionner les choses proprement.
- <br>
+ <br />
<b>[NdT</b> : Un forum francophone existe à l'adresse suivante : <a href="http://forums.opsyx.com/">http://forums.opsyx.com/</a>].
- <br>
+ <br />
</ol>
<hr>
diff --git a/doc/fr/cgiauth.html b/doc/fr/cgiauth.html
index 4a8e1ada3b520fddf32499755768aecb7d93ad4f..066751ab470c2e967030acdb438b75a7a1525ab1 100644
--- a/doc/fr/cgiauth.html
+++ b/doc/fr/cgiauth.html
@@ -50,15 +50,15 @@
<p>
<strong><u>Index</u></strong>
</p>
-<p> <a href="#config_web_users">Déclarer des utilisateurs authentifiés</a><br>
+<p> <a href="#config_web_users">Déclarer des utilisateurs authentifiés</a><br />
<a href="#enable_cgi_auth">Activer l'authentification/l'autorisation dans les
- CGI</a><br>
+ CGI</a><br />
<a href="#default_rights">Droits d'accès par défaut aux informations
- des CGI</a><br>
+ des CGI</a><br />
<a href="#additional_rights">Donner des droits d'accès supplémentaires
- aux informations des CGI</a><br>
- <a href="#secure_web_servers">Authentification sur des serveurs web sécurisés</a><br>
+ aux informations des CGI</a><br />
+ <a href="#secure_web_servers">Authentification sur des serveurs web sécurisés</a><br />
</p>
<font color="red"><strong> </strong></font>
diff --git a/doc/fr/cgiincludes.html b/doc/fr/cgiincludes.html
index 747daee2c3b95fd70a7114d75d4b33854477032a..caa4c11ce2672f6aa10fa5af16c01bb9044ca4e8 100644
--- a/doc/fr/cgiincludes.html
+++ b/doc/fr/cgiincludes.html
@@ -74,9 +74,9 @@
<li><b>En-têtes/pieds de page globaux</b>. Ces fichiers devraient être nommés
<i>common-header.ssi</i> et <i>common-footer.ssi</i>, respectivement. Si ces
fichiers existent, ils seront inclus dans le résultat de l'exécution de toutes
- les CGI.<br>
+ les CGI.<br />
- <br>
+ <br />
<li><b>En-têtes/pieds de page de CGI spécifiques</b>. Ces fichiers devraient
être nommés dans le format <i>NOMCGI-header.ssi</i> et <i>NOMCGI-footer.ssi</i>,
où <i>CGINAME</i> est le nom physique du CGI sans l'extension .cgi. Par exemple,
diff --git a/doc/fr/cgis.html b/doc/fr/cgis.html
index 8240fcc29e138ecd70f7d6798a67260fe8057be1..8b3bc724626c582d7a483d721267d5c2769ec44e 100644
--- a/doc/fr/cgis.html
+++ b/doc/fr/cgis.html
@@ -44,25 +44,25 @@
<p>
<strong><u>Index</u></strong>
</p>
-<p> <a href="#status_cgi"> CGI d'état</a><br>
- <a href="#statusmap_cgi">CGI de cartographie des états<br>
- </a><a href="#statuswml_cgi">CGI d'interface WAP</a><br>
-
- <a href="#statuswrl_cgi">CGI du monde des états (VRML)</a><br>
- <a href="#tac_cgi">CGI d'aperçu tactique</a><br>
- <a href="#outages_cgi">CGI d'indisponibilité du réseau</a><br>
- <a href="#config_cgi">CGI de configuration</a><br>
-
- <a href="#cmd_cgi">CGI de commande</a><br>
- <a href="#extinfo_cgi">CGI d'informations complémentaires</a><br>
- <a href="#showlog_cgi">CGI du fichier journal</a><br>
- <a href="#history_cgi">CGI d'historique d'alerte</a><br>
- <a href="#notifications_cgi">CGI des notifications</a><br>
- <a href="#trends_cgi">CGI des tendances</a><br>
-
- <a href="#avail_cgi">CGI de rapport de disponibilité</a><br>
- <a href="#histogram_cgi">CGI des histogrammes des alertes</a><br>
- <a href="#summary_cgi">CGI de récapitulatif des alertes</a><br>
+<p> <a href="#status_cgi"> CGI d'état</a><br />
+ <a href="#statusmap_cgi">CGI de cartographie des états<br />
+ </a><a href="#statuswml_cgi">CGI d'interface WAP</a><br />
+
+ <a href="#statuswrl_cgi">CGI du monde des états (VRML)</a><br />
+ <a href="#tac_cgi">CGI d'aperçu tactique</a><br />
+ <a href="#outages_cgi">CGI d'indisponibilité du réseau</a><br />
+ <a href="#config_cgi">CGI de configuration</a><br />
+
+ <a href="#cmd_cgi">CGI de commande</a><br />
+ <a href="#extinfo_cgi">CGI d'informations complémentaires</a><br />
+ <a href="#showlog_cgi">CGI du fichier journal</a><br />
+ <a href="#history_cgi">CGI d'historique d'alerte</a><br />
+ <a href="#notifications_cgi">CGI des notifications</a><br />
+ <a href="#trends_cgi">CGI des tendances</a><br />
+
+ <a href="#avail_cgi">CGI de rapport de disponibilité</a><br />
+ <a href="#histogram_cgi">CGI des histogrammes des alertes</a><br />
+ <a href="#summary_cgi">CGI de récapitulatif des alertes</a><br />
</p>
<p>
<a name="status_cgi"></a>
@@ -93,7 +93,7 @@
<table border="0" width="99%" class="Default">
<tr>
<td align=left valign=top width="99%">
- <p> <strong>Description :</strong><br>
+ <p> <strong>Description :</strong><br />
C'est le CGI le plus important de Nagios. Il vous permet de voir l'état
de tous les hôtes et de tous les services supervisés. Le
CGI d'état peut produire deux types principaux d'affichage - un
@@ -103,7 +103,7 @@
pouvez associer de jolies icônes aux hôtes en utilisant les
options d'<a href="xodtemplate.html#hostextinfo">informations complémentaires
sur les hôtes</a> du <a href="xodtemplate.html">fichier de configuration</a>.
- <p> <strong>Autorisation requises :</strong><br>
+ <p> <strong>Autorisation requises :</strong><br />
<ul>
<li>Si vous êtes <a href="configcgi.html#authorized_for_all_hosts"><i>autorisé
@@ -145,7 +145,7 @@
<table border="0" width="100%">
<tr>
<td align=left valign=top width="99%">
- <p> <span class="Default"><strong>Description :</strong><br>
+ <p> <span class="Default"><strong>Description :</strong><br />
Ce CGI crée une carte de tous les hôtes que vous avez défini
dans votre réseau. Il utilise la bibliothèque <a href="http://www.boutell.com/gd">gd</a>
de Thomas Boutell (version 1.6.3 ou plus) pour créer une image
@@ -158,7 +158,7 @@
lisez <a href="http://www.nagios.org/faqs/">cette FAQ</a>.</span></p>
<p> <span class="Default"><strong>A</strong></span><strong><span class="Default">utorisations
- requises :</span></strong><span class="Default"><br>
+ requises :</span></strong><span class="Default"><br />
</span>
<ul>
<li class="Default"><span class="Default">Si vous êtes <a href="configcgi.html#authorized_for_all_hosts"><i>autorisé
@@ -169,7 +169,7 @@
authentifié</i> vous pouvez voir les hôtes dont vous êtes
un contac<font size="-1">t. </font></span>
</ul>
- <span class="Default"><font size="-1"><br>
+ <span class="Default"><font size="-1"><br />
</font></span><font size="-1"><span class="Default">Note : Les utilisateurs
qui ne sont pas autorisés à voir un hôte particulier
verront un noeud nommé <i>unknown</i> à la place. Je suis
@@ -207,7 +207,7 @@
<table border="0" width="100%" class="Default">
<tr>
<td align=left valign=top width="50%">
- <p> <span class="Default"><strong>Description :</strong><br>
+ <p> <span class="Default"><strong>Description :</strong><br />
Ce CGI gère l'interface WAP d'accès aux informations sur
l'état du réseau. Si vous avez un appareil WAP (i.e. un
téléphone portable compatible Internet), vous pouvez accéder
@@ -219,7 +219,7 @@
et les contrôles et acquitter des problèmes depuis votre
portable. Plutôt cool, non ? </span></p>
- <p> <strong><span class="Default">Autorisations requises :</span></strong><span class="Default"><br>
+ <p> <strong><span class="Default">Autorisations requises :</span></strong><span class="Default"><br />
</span>
<ul>
<li class="Default">Si vous êtes <a href="configcgi.html#authorized_for_system_information"><i>autorisé
@@ -262,7 +262,7 @@
<table border="0" width="100%" class="Default">
<tr>
<td align=left valign=top width="99%">
- <p> <span class="Default"><strong>Description :</strong><br>
+ <p> <span class="Default"><strong>Description :</strong><br />
Ce CGI crée une modélisation en 3D utilisant le langage
VRML de tous les hôtes définis dans votre réseau.
@@ -274,7 +274,7 @@
<a href="http://www.parallelgraphics.com/cortona/">Cortona</a>) pour pouvoir
visualiser ce modèle. </span></p>
- <p> <span class="Default"><strong>Autorisations requises :</strong><br>
+ <p> <span class="Default"><strong>Autorisations requises :</strong><br />
</span>
<ul>
<li class="Default">Si vous êtes <a href="configcgi.html#authorized_for_all_hosts"><i>autorisé
@@ -283,7 +283,7 @@
vous pouvez voir les hôtes dont vous êtes un contact.
</ul>
- <span class="Default"><font size="-1"><br>
+ <span class="Default"><font size="-1"><br />
</font></span><font size="-1"><span class="Default">Note : Les utilisateurs
qui ne sont pas autorisés à voir un hôte particulier
verront un noeud nommé <i>unknown</i> à la place. Je suis
@@ -321,7 +321,7 @@
<table border="0" width="100%" class="Default">
<tr>
<td align=left valign=top width="50%">
- <p> <span class="Default"><strong>Description:</strong><br>
+ <p> <span class="Default"><strong>Description:</strong><br />
Ce CGI vous donne une vue générale de toute l'activité
de supervision du réseau. Il vous permet de repérer rapidement
les indisponibilités du réseau, l'état des hôtes
@@ -333,7 +333,7 @@
à superviser et que vous ne voulez consulter qu'un seul écran
pour être averti des problèmes. </span>
- <p> <span class="Default"><strong>Autorisations requises :</strong><br>
+ <p> <span class="Default"><strong>Autorisations requises :</strong><br />
</span>
<ul>
<li class="Default">Si vous êtes <a href="configcgi.html#authorized_for_all_hosts"><i>autorisé
@@ -374,7 +374,7 @@
<table border="0" width="100%">
<tr>
<td align=left valign=top width="99%">
- <p> <span class="Default"><strong>Description :</strong><br>
+ <p> <span class="Default"><strong>Description :</strong><br />
Ce CGI produit une liste des hôtes "à problèmes"
de votre réseau qui sont responsables des ruptures de lien. Ceci
est particulièrement utile sur les grands réseaux pour identifier
@@ -383,7 +383,7 @@
plus d'informations sur le fonctionnement de ce CGI, voyez <a href="networkoutages.html">ici</a>.
</span></p>
- <p> <span class="Default"><strong>Autorisations requises :</strong><br>
+ <p> <span class="Default"><strong>Autorisations requises :</strong><br />
</span>
<ul>
<li class="Default">Si vous êtes <a href="configcgi.html#authorized_for_all_hosts"><i>autorisé
@@ -422,13 +422,13 @@
<table border="0" width="100%">
<tr>
<td align=left valign=top width="99%" height="174">
- <p> <span class="Default"><strong>Description :</strong><br>
+ <p> <span class="Default"><strong>Description :</strong><br />
Ce CGI permet de visualiser les définitions d'objets (c.a.d hôtes,
groupes d'hôtes, contacts, groupes de contacts, périodes,
services et commandes) tels que spécifiés dans votre (vos)
<a href="configobject.html">fichier(s) de configuration des objets</a>.
</span>
- <p> <span class="Default"><strong>Autorisations requises :</strong><br>
+ <p> <span class="Default"><strong>Autorisations requises :</strong><br />
</span>
<ul>
@@ -468,14 +468,14 @@
<table border="0" width="100%" class="Default">
<tr>
<td align=left valign=top width="99%">
- <p> <span class="Default"><strong>Description :</strong><br>
+ <p> <span class="Default"><strong>Description :</strong><br />
Ce CGI permet d'envoyer des commandes au processus de Nagios. Bien que
ce CGI accepte plusieurs arguments, mieux vaut ne pas s'y essayer : la
plupart changent selon les révisions de Nagios. Utilisez plutôt
<a href="#extinfo_cgi">les informations complémentaires des CGI</a>
comme point de départ pour envoyer des commandes. </span>
- <p> <span class="Default"><strong>Autorisations requises :</strong><br>
+ <p> <span class="Default"><strong>Autorisations requises :</strong><br />
</span>
<ul>
<li class="Default"><font size="-1"><span class="Default">Vous devez être
@@ -548,7 +548,7 @@
<table border="0" width="100%">
<tr>
<td align=left valign=top width="99%">
- <p> <span class="Default"><strong>Description :</strong><br>
+ <p> <span class="Default"><strong>Description :</strong><br />
Ce CGI permet de voir les informations relatives au processus de Nagios,
aux statistiques sur les hôtes et les services, aux commentaires
@@ -562,7 +562,7 @@
Information sur le processus Nagios] de la barre latérale de navigation,
ou en cliquant sur un lien hôte ou service dans l'affichage du <a href="#status_cgi">CGI
d'état</a>. </span>
- <p> <span class="Default"><strong>Autorisations requises :</strong><br>
+ <p> <span class="Default"><strong>Autorisations requises :</strong><br />
</span>
<ul>
@@ -615,14 +615,14 @@
<table border="0" width="100%">
<tr>
<td align=left valign=top width="99%">
- <p> <span class="Default"><strong>Description :</strong><br>
+ <p> <span class="Default"><strong>Description :</strong><br />
Ce CGI affiche le <a href="configmain.html#log_file">fichier journal</a>.
Si vous avez activé la <a href="configmain.html#log_rotation_method">rotation
du journal</a>, vous pouvez voir le contenu des journaux archivés
en utilisant les liens de navigation situés en haut de la page.
</span></p>
- <p> <span class="Default"><strong>Autorisations requises :</strong><br>
+ <p> <span class="Default"><strong>Autorisations requises :</strong><br />
</span>
<ul>
<li class="Default"><font size="-1" class="Default">Vous devez être
@@ -661,7 +661,7 @@
<table border="0" width="100%" class="Default">
<tr>
<td align=left valign=top width="99%">
- <p> <span class="Default"><strong>Description :</strong><br>
+ <p> <span class="Default"><strong>Description :</strong><br />
Ce CGI affiche l'historique des problèmes relatifs soit à
un hôte particulier soit à tous les hôtes. L'affichage
est un sous-ensemble de ce que produit le <a href="#showlog_cgi">CGI du
@@ -673,7 +673,7 @@
archivés en utilisant les liens de navigation situés en
haut de la page. </span></p>
- <p> <span class="Default"><strong>Autorisations requises :</strong><br>
+ <p> <span class="Default"><strong>Autorisations requises :</strong><br />
</span>
<ul>
<li class="Default"><font size="-1" class="Default">Si vous êtes
@@ -719,7 +719,7 @@
<table border="0" width="100%">
<tr>
<td align=left valign=top width="99%">
- <p> <span class="Default"><strong>Description :</strong><br>
+ <p> <span class="Default"><strong>Description :</strong><br />
Ce CGI affiche les notifications envoyées aux différents
contacts d'un hôte ou d'un service. L'affichage est un sous-ensemble
de ce que produit le <a href="#showlog_cgi">CGI du fichier journal</a>.
@@ -731,7 +731,7 @@
en utilisant les liens de navigation situés en haut de la page.
</span></p>
- <p> <span class="Default"><strong>Autorisations requises :</strong><br>
+ <p> <span class="Default"><strong>Autorisations requises :</strong><br />
</span>
<ul>
<li class="Default"><font size="-1" class="Default">Si vous êtes
@@ -779,7 +779,7 @@
<table border="0" width="100%">
<tr>
<td align=left valign=top width="99%">
- <p> <span class="Default"><strong>Description :</strong><br>
+ <p> <span class="Default"><strong>Description :</strong><br />
Ce CGI crée un graphique des états des hôtes et des
services sur une période donnée. Pour que ce CGI soit pertinent,
vous devez activer la <a href="configmain.html#log_rotation_method">rotation
@@ -791,7 +791,7 @@
vous avez des erreurs lors de sa compilation ou de son exécution,
lisez <a href="http://www.nagios.org/faqs/">cette FAQ</a>. </span></p>
- <p> <span class="Default"><strong>Autorisations requises :</strong><br>
+ <p> <span class="Default"><strong>Autorisations requises :</strong><br />
</span>
<ul>
<li class="Default"><font size="-1" class="Default">Si vous êtes
@@ -838,14 +838,14 @@
<table border="0" width="100%" class="Default">
<tr>
<td align=left valign=top width="99%">
- <p> <span class="Default"><strong>Description:</strong><br>
+ <p> <span class="Default"><strong>Description:</strong><br />
Ce CGI permet de créer un rapport sur la disponibilité des
hôtes et des services sur une période donnée. Pour
que ce CGI soit pertinent, vous devez activer la <a href="configmain.html#log_rotation_method">rotation
du journal</a> et archiver les journaux dans le répertoire défini
par la variable <a href="configmain.html#log_archive_path">log_archive_path</a>.</span></p>
- <p> <span class="Default"><strong>Autorisations requises :</strong><br>
+ <p> <span class="Default"><strong>Autorisations requises :</strong><br />
</span>
<ul>
<li class="Default"><font size="-1" class="Default">Si vous êtes
@@ -889,7 +889,7 @@
<table border="0" width="100%" class="Default">
<tr>
<td align=left valign=top width="50%" height="270">
- <p> <span class="Default"><strong>Description:</strong><br>
+ <p> <span class="Default"><strong>Description:</strong><br />
Ce CGI permet d'afficher l'histogramme de disponibilité d'hôtes
et services sur une période de temps. Pour que ce CGI soit pertinent,
vous devez activer la <a href="configmain.html#log_rotation_method">rotation
@@ -901,7 +901,7 @@
vous avez des erreurs lors de sa compilation ou de son exécution,
lisez <a href="http://www.nagios.org/faqs/">cette FAQ</a>. </span></p>
- <p> <span class="Default"><strong>Autorisations requises :</strong><br>
+ <p> <span class="Default"><strong>Autorisations requises :</strong><br />
</span>
<ul>
<li class="Default"><font size="-1" class="Default">Si vous êtes
@@ -946,12 +946,12 @@
<table border="0" width="100%" class="Default">
<tr>
<td align=left valign=top width="50%" height="218">
- <p> <span class="Default"><strong>Description:</strong><br>
+ <p> <span class="Default"><strong>Description:</strong><br />
Ce CGI fournit des rapports synthétiques sur les alertes concernant
les hôtes et services, ainsi que le nombre total d'alertes, les
services/hôtes générant le plus d'alertes, etc.</span></p>
- <p class="Default"><strong>Autorisations requises :</strong><br>
+ <p class="Default"><strong>Autorisations requises :</strong><br />
</p>
<ul>
<li class="Default"><font size="-1" class="Default">Si vous êtes
diff --git a/doc/fr/checkscheduling.html b/doc/fr/checkscheduling.html
index e6a4b638238df07ab4c2f0de45d17c54f9b3d352..3559a071c646d1aa4275dbd4f89b63b3beb46e7f 100644
--- a/doc/fr/checkscheduling.html
+++ b/doc/fr/checkscheduling.html
@@ -24,23 +24,23 @@
<p>
<strong><u>Index</u></strong>
</p>
-<p> <a href="#introduction">Introduction</a><br>
- <a href="#configuration_options">Options de configuration</a><br>
- <a href="#initial_scheduling">Ordonnancement initial</a><br>
+<p> <a href="#introduction">Introduction</a><br />
+ <a href="#configuration_options">Options de configuration</a><br />
+ <a href="#initial_scheduling">Ordonnancement initial</a><br />
- <a href="#service_inter_check_delay">Délai inter-contrôles</a><br>
- <a href="#service_interleaving">Entrelacement des services</a><br>
+ <a href="#service_inter_check_delay">Délai inter-contrôles</a><br />
+ <a href="#service_interleaving">Entrelacement des services</a><br />
<a href="#max_concurrent_checks">Nombre maximal de contrôle de services
- simultanés</a><br>
- <a href="#time_restraints">Restrictions temporelles</a><br>
- <a href="#normal_scheduling">Ordonnancement normal</a><br>
-
- <a href="#problem_scheduling">Ordonnancement en cas de problème</a><br>
- <a href="#host_checks">Contrôles d'hôtes</a><br>
- <a href="#scheduling_delays">Délais d'ordonnancement</a><br>
- <a href="#scheduling_example">Exemple d'ordonnancement</a><br>
+ simultanés</a><br />
+ <a href="#time_restraints">Restrictions temporelles</a><br />
+ <a href="#normal_scheduling">Ordonnancement normal</a><br />
+
+ <a href="#problem_scheduling">Ordonnancement en cas de problème</a><br />
+ <a href="#host_checks">Contrôles d'hôtes</a><br />
+ <a href="#scheduling_delays">Délais d'ordonnancement</a><br />
+ <a href="#scheduling_example">Exemple d'ordonnancement</a><br />
<a href="#service_options">Options de définition de service affectant
- l'ordonnancement</a><br>
+ l'ordonnancement</a><br />
</p>
diff --git a/doc/fr/clusters.html b/doc/fr/clusters.html
index 0bb2836390fe0820674867605ce499916494e935..124cb31f7750b2db42db00634ac9e3e08bfb4fa4 100644
--- a/doc/fr/clusters.html
+++ b/doc/fr/clusters.html
@@ -65,7 +65,7 @@
bien cinq définitions de service (probablement en utilisant le plugin
<i>check_dns</i>). Pour les grappes d'hôtes, assurez-vous d'avoir configuré
les définitions d'hôtes pour chaque membre de la grappe (vous aurez aussi
- besoin de définir au moins un service à superviser pour chacun des hôtes). <br>
+ besoin de définir au moins un service à superviser pour chacun des hôtes). <br />
<b>Important</b>: Vous allez sans doute vouloir désactiver les notifications
pour les éléments individuels de la grappe (définitions d'hôtes ou de services).
@@ -83,7 +83,7 @@
de la grappe mis en cache peuvent être trouvés dans le <A href="configmain.html#status_file">journal
des états</A> (en supposant que vous supervisiez chaque élément). Le plugin
<I>check_cluster2</I> a été développé spécialement pour vérifier les états des
- hôtes et services mis en cache dans le journal des états. <br>
+ hôtes et services mis en cache dans le journal des états. <br />
<b>Important</b> : Bien que vous n'ayez pas activé les notifications pour les
éléments individuels de la grappe, vous voudrez les activer pour son contrôle
@@ -103,7 +103,7 @@
<P><strong><u>Superviser les grappes de services</u></strong></P>
<P>Mettons que vous ayez trois serveurs DNS en redondance sur votre réseau.
Vous aurez tout d'abord besoin de superviser chaque serveur DNS individuellement
- avant de vérifier la grappe.<br>
+ avant de vérifier la grappe.<br />
Je présume que vous avez donc déjà 3 services séparés
(tous nommés "Service DNS") associés à vos hôtes
diff --git a/doc/fr/commandfile.html b/doc/fr/commandfile.html
index 18d3c798d67a693ec8cdf45f391ec848a1931ae4..c629df7ee0beba3939ef8659a2460ee75b99f0a8 100644
--- a/doc/fr/commandfile.html
+++ b/doc/fr/commandfile.html
@@ -65,7 +65,7 @@
<P>Ensuite, ajoutez au nouveau groupe l'utilisateur du serveur web (<i>nobody
ou apache, etc ..</i>) et l'utilisateur de Nagios (<i>nagios</i>) à l'aide de
la commande suivante :</P>
-<P> <FONT color=red>/usr/sbin/usermod -G nagiocmd nagios</FONT> <BR>
+<P> <FONT color=red>/usr/sbin/usermod -G nagiocmd nagios</FONT> <br />
<FONT color=red>/usr/sbin/usermod -G nagiocmd nobody</FONT> </P>
<P>
diff --git a/doc/fr/configcgi.html b/doc/fr/configcgi.html
index 072825e1ff0d71884c3cf8422e6c53650a26cee9..47abd2b70fb8ce8e6c0260b4dd32d994a0f9176c 100644
--- a/doc/fr/configcgi.html
+++ b/doc/fr/configcgi.html
@@ -43,7 +43,7 @@
<p> <strong><u>Exemple de configuration</u></strong></p>
<p> Un exemple de fichier de configuration est créé lorsque vous
lancez le script "configure". Vous pouvez trouver le fichier exemple
- dans le répertoire <i>sample-config </i>de la distribution Nagios.<br>
+ dans le répertoire <i>sample-config </i>de la distribution Nagios.<br />
En lançant la commande '<b>make install-config</b>', les fichiers seront
copiés dans le répertoire Nagios destination.</p>
@@ -59,43 +59,43 @@
<p> <strong><u>Index</u></strong> </p>
-<p> <a href="#main_cfg_file">Emplacement du fichier de configuration principal</a><br>
- <a href="#physical_html_path">Chemin d'accès physique aux fichiers HTML</a><br>
- <a href="#url_html_path">URL d'accès aux pages HTML</a><br>
- <br>
+<p> <a href="#main_cfg_file">Emplacement du fichier de configuration principal</a><br />
+ <a href="#physical_html_path">Chemin d'accès physique aux fichiers HTML</a><br />
+ <a href="#url_html_path">URL d'accès aux pages HTML</a><br />
+ <br />
- <a href="#use_authentication">Utilisation de l'authentification</a><br>
- <a href="#default_user_name">Nom d'utilisateur par défaut</a><br>
+ <a href="#use_authentication">Utilisation de l'authentification</a><br />
+ <a href="#default_user_name">Nom d'utilisateur par défaut</a><br />
<a href="#authorized_for_system_information">Accès aux informations sur
- le système/processus</a><br>
- <a href="#authorized_for_system_commands">Accès aux commandes du système/processus</a><br>
+ le système/processus</a><br />
+ <a href="#authorized_for_system_commands">Accès aux commandes du système/processus</a><br />
<a href="#authorized_for_configuration_information">Accès aux informations
- de configuration</a><br>
+ de configuration</a><br />
<a href="#authorized_for_all_hosts">Accès global aux informations sur
- les hôtes</a><br>
+ les hôtes</a><br />
<a href="#authorized_for_all_host_commands">Accès global aux commandes
- des hôtes</a><br>
+ des hôtes</a><br />
<a href="#authorized_for_all_services">Accès global aux informations
- sur les services</a><br>
+ sur les services</a><br />
<a href="#authorized_for_all_service_commands">Accès global aux commandes
- des services</a><br>
- <br>
+ des services</a><br />
+ <br />
<a href="#statusmap_background_image">Image de fond du CGI de cartographie des
- états (Statusmap)</a><br>
+ états (Statusmap)</a><br />
<a href="#default_statusmap_layout">Dessin de la cartographie des états:
- valeur par défaut</a><br>
+ valeur par défaut</a><br />
<a href="#statuswrl_include">Monde inclus dans
- le CGI du monde des états (Statuswrl)</a><br>
+ le CGI du monde des états (Statuswrl)</a><br />
<a href="#default_statuswrl_layout">Dessin du monde des états : valeur
- par défaut</a><br>
-<br>
- <a href="#refresh_rate">Fréquence de rafraîchissement des CGI</a><br>
- <a href="#audio_alerts">Alertes auditives</a><br>
- <br>
- <a href="#ping_syntax">Syntaxe du Ping</a><br>
+ par défaut</a><br />
+<br />
+ <a href="#refresh_rate">Fréquence de rafraîchissement des CGI</a><br />
+ <a href="#audio_alerts">Alertes auditives</a><br />
+ <br />
+ <a href="#ping_syntax">Syntaxe du Ping</a><br />
</p>
<p>
@@ -709,22 +709,22 @@
<tr>
<td valign=top class="Default">Formats :</td>
- <td> <span class="Default"><strong>host_unreachable_sound=<fichier_son></strong><br>
- <strong>host_down_sound=<fichier_son></strong><br>
- <strong>service_critical_sound=<fichier_son></strong><br>
- <strong>service_warning_sound=<fichier_son></strong><br>
+ <td> <span class="Default"><strong>host_unreachable_sound=<fichier_son></strong><br />
+ <strong>host_down_sound=<fichier_son></strong><br />
+ <strong>service_critical_sound=<fichier_son></strong><br />
+ <strong>service_warning_sound=<fichier_son></strong><br />
- <strong>service_unknown_sound=<fichier_son></strong><br>
+ <strong>service_unknown_sound=<fichier_son></strong><br />
</span></td>
</tr>
<tr>
<td valign=top class="Default">Exemples :</td>
- <td> <span class="Default"><font color="red"><strong>host_unreachable_sound=hostu.wav</strong></font><br>
- <font color="red"><strong>host_down_sound=hostd.wav</strong></font><br>
+ <td> <span class="Default"><font color="red"><strong>host_unreachable_sound=hostu.wav</strong></font><br />
+ <font color="red"><strong>host_down_sound=hostd.wav</strong></font><br />
- <font color="red"><strong>service_critical_sound=critical.wav</strong></font><br>
- <font color="red"><strong>service_warning_sound=warning.wav</strong></font><br>
- <font color="red"><strong>service_unknown_sound=unknown.wav</strong></font><br>
+ <font color="red"><strong>service_critical_sound=critical.wav</strong></font><br />
+ <font color="red"><strong>service_warning_sound=warning.wav</strong></font><br />
+ <font color="red"><strong>service_unknown_sound=unknown.wav</strong></font><br />
</span></td>
</tr>
</table>
diff --git a/doc/fr/configmain.html b/doc/fr/configmain.html
index 1fb8280fbc99dc1eaa0f3ad74a35dbe961673281..a3633bd493532cfebf61ee615ac670e118ce51c2 100644
--- a/doc/fr/configmain.html
+++ b/doc/fr/configmain.html
@@ -37,174 +37,174 @@
dans la distribution de Nagios ou dans le sous-répertoire etc/ de votre
installation. (<i>c.a.d /usr/local/nagios/etc/)</i></p>
<p> <strong><u>Index</u></strong> </p>
-<p> <a href="#log_file">Fichier journal</a><br>
- <a href="#cfg_file">Fichier de configuration des objets</a><br>
+<p> <a href="#log_file">Fichier journal</a><br />
+ <a href="#cfg_file">Fichier de configuration des objets</a><br />
<a href="#cfg_dir">Répertoire des fichiers de configuration des objets
- </a><br>
- <a href="#object_cache_file">Fichier de cache des objets</a><br>
- <a href="#resource_file">Fichier de ressources</a><br>
+ </a><br />
+ <a href="#object_cache_file">Fichier de cache des objets</a><br />
+ <a href="#resource_file">Fichier de ressources</a><br />
<a href="#temp_file">Fichier temporaire</a></p>
-<p><a href="#status_file">Fichier d'état (log d'état)</a><br>
+<p><a href="#status_file">Fichier d'état (log d'état)</a><br />
<a href="#aggregate_status_updates">Option d'agrégation des changements
- d'états</a><br>
+ d'états</a><br />
<a href="#status_update_interval">Intervalle de mise à jour des états
- agrégés</a><br>
- <br>
- <a href="#nagios_user">Utilisateur de Nagios</a><br>
- <a href="#nagios_group">Groupe de Nagios</a> <br>
- <br>
- <a href="#program_mode">Option des notifications</a> <br>
+ agrégés</a><br />
+ <br />
+ <a href="#nagios_user">Utilisateur de Nagios</a><br />
+ <a href="#nagios_group">Groupe de Nagios</a> <br />
+ <br />
+ <a href="#program_mode">Option des notifications</a> <br />
<a href="#execute_service_checks">Option d'exécution des contrôles
- de service</a><br>
+ de service</a><br />
<a href="#accept_passive_service_checks">Option d'acceptation des contrôles
- passifs de service</a><br>
+ passifs de service</a><br />
<a href="#execute_host_checks">Option d'exécution des contrôles
- d'hôte</a><br>
+ d'hôte</a><br />
<a href="#accept_passive_host_checks">Option d'acceptation des contrôles
- passifs d'hôte</a><br>
- <a href="#enable_event_handlers">Option de gestion d'événement</a><br>
- <br>
- <a href="#log_rotation_method">Méthode de rotation du journal</a><br>
- <a href="#log_archive_path">Chemin d'accès aux archives du journal</a><br>
- <br>
- <a href="#check_external_commands">Option de contrôle des commandes externes</a><br>
+ passifs d'hôte</a><br />
+ <a href="#enable_event_handlers">Option de gestion d'événement</a><br />
+ <br />
+ <a href="#log_rotation_method">Méthode de rotation du journal</a><br />
+ <a href="#log_archive_path">Chemin d'accès aux archives du journal</a><br />
+ <br />
+ <a href="#check_external_commands">Option de contrôle des commandes externes</a><br />
<a href="#command_check_interval">Intervalle entre les contrôles des commandes
- externes</a><br>
- <a href="#command_file">Fichier de commandes externes<br>
- </a><br>
- <a href="#comment_file">Fichier de commentaire</a><br>
+ externes</a><br />
+ <a href="#command_file">Fichier de commandes externes<br />
+ </a><br />
+ <a href="#comment_file">Fichier de commentaire</a><br />
<a href="#downtime_file">Fichier des temps d'indisponibilité programmés
- des hôtes et services</a><br>
- <a href="#lock_file">Fichier verrou</a><br>
- <br>
- <a href="#retain_state_information">Option de mémorisation de l'état</a><br>
- <a href="#state_retention_file">Fichier de mémorisation de l'état</a><br>
+ des hôtes et services</a><br />
+ <a href="#lock_file">Fichier verrou</a><br />
+ <br />
+ <a href="#retain_state_information">Option de mémorisation de l'état</a><br />
+ <a href="#state_retention_file">Fichier de mémorisation de l'état</a><br />
<a href="#retention_update_interval">Intervalle de mise à jour des états
- mémorisés</a><br>
+ mémorisés</a><br />
<a href="#use_retained_program_state">Option d'utilisation des états
- mémorisés du programme </a><br>
+ mémorisés du programme </a><br />
<a href="#use_retained_scheduling_info">Option d'utilisation des états
- mémorisés de l'ordonnanceur</a><br>
- <br>
- <a href="#use_syslog">Option de journalisation dans Syslog</a><br>
- <a href="#log_notifications">Option de journalisation des notifications</a><br>
+ mémorisés de l'ordonnanceur</a><br />
+ <br />
+ <a href="#use_syslog">Option de journalisation dans Syslog</a><br />
+ <a href="#log_notifications">Option de journalisation des notifications</a><br />
<a href="#log_service_retries">Option de journalisation des tentatives de contrôle
- de service</a><br>
+ de service</a><br />
<a href="#log_host_retries">Option de journalisation des tentatives de contrôle
- d'hôte</a><br>
- <a href="#log_event_handlers">Option de journalisation des gestions d'événement</a><br>
- <a href="#log_initial_states">Option de journalisation des états initiaux</a><br>
- <a href="#log_external_commands">Option de journalisation des commandes externes</a><br>
- <a href="#log_passive_checks">Option de journalisation des contrôles passifs</a><br>
- <br>
+ d'hôte</a><br />
+ <a href="#log_event_handlers">Option de journalisation des gestions d'événement</a><br />
+ <a href="#log_initial_states">Option de journalisation des états initiaux</a><br />
+ <a href="#log_external_commands">Option de journalisation des commandes externes</a><br />
+ <a href="#log_passive_checks">Option de journalisation des contrôles passifs</a><br />
+ <br />
<a href="#global_host_event_handler">Gestionnaire global des événement
- relatifs aux hôtes</a><br>
+ relatifs aux hôtes</a><br />
<a href="#global_service_event_handler">Gestionnaire global des événements
- relatifs aux services</a><br>
- <br>
- <a href="#sleep_time">Temps de sommeil entre les contrôles</a><br>
+ relatifs aux services</a><br />
+ <br />
+ <a href="#sleep_time">Temps de sommeil entre les contrôles</a><br />
<a href="#service_inter_check_delay_method">Méthode de délai inter-contrôles
- de services</a><br>
+ de services</a><br />
<a href="#max_service_check_spread">Délai maximum de répartition
- des contrôles initiaux de services</a><br>
- <a href="#service_interleave_factor">Facteur d'entrelacement des services</a><br>
+ des contrôles initiaux de services</a><br />
+ <a href="#service_interleave_factor">Facteur d'entrelacement des services</a><br />
<a href="#max_concurrent_checks">Nombre maximal de contrôles de service
- simultanés</a><br>
- <a href="#service_reaper_frequency">Fréquence de consolidation des services<br>
+ simultanés</a><br />
+ <a href="#service_reaper_frequency">Fréquence de consolidation des services<br />
</a><a href="#host_inter_check_delay_method">Méthode de délai
- inter-contrôles d'hôtes<br>
+ inter-contrôles d'hôtes<br />
</a><a href="#max_host_check_spread">Délai maximum de répartition
- des contrôles initiaux d'hôtes</a><br>
- <a href="#interval_length">Valeur de l'intervalle de temps</a><br>
- <a href="#auto_reschedule_checks">Option de réordonnancement automatique</a><br>
- <a href="#auto_rescheduling_interval">Intervalle de réordonnancement automatique</a><br>
+ des contrôles initiaux d'hôtes</a><br />
+ <a href="#interval_length">Valeur de l'intervalle de temps</a><br />
+ <a href="#auto_reschedule_checks">Option de réordonnancement automatique</a><br />
+ <a href="#auto_rescheduling_interval">Intervalle de réordonnancement automatique</a><br />
<a href="#auto_rescheduling_window">Fenêtre de réordonnancement
- automatique </a><br>
- <br>
+ automatique </a><br />
+ <br />
<a href="#use_aggressive_host_checking">Option de contrôle agressif des
- hôtes</a><br>
- <br>
+ hôtes</a><br />
+ <br />
<a href="#enable_flap_detection">Option de détection de l'oscillation
- d'un service ou d'un hôte[flap]</a><br>
+ d'un service ou d'un hôte[flap]</a><br />
<a href="#low_service_flap_threshold">Seuil inférieur d'oscillation d'un
- service</a><br>
+ service</a><br />
<a href="#high_service_flap_threshold">Seuil supérieur d'oscillation
- d'un service</a><br>
+ d'un service</a><br />
<a href="#low_host_flap_threshold">Seuil inférieur d'oscillation d'un
- hôte</a><br>
+ hôte</a><br />
<a href="#high_host_flap_threshold">Seuil supérieur d'oscillation d'un
- hôte</a><br>
- <br>
+ hôte</a><br />
+ <br />
<a href="#soft_service_dependencies">Option de dépendance "Soft"
des services</a></p>
<p><a href="#service_check_timeout">Dépassement de délai du contrôle
- de service</a><br>
+ de service</a><br />
<a href="#host_check_timeout">Dépassement de délai du contrôle
- d'hôte</a><br>
+ d'hôte</a><br />
<a href="#event_handler_timeout">Dépassement de délai du contrôle
- du gestionnaire d'événement</a><br>
- <a href="#notification_timeout">Dépassement de délai de notification</a><br>
+ du gestionnaire d'événement</a><br />
+ <a href="#notification_timeout">Dépassement de délai de notification</a><br />
<a href="#ocsp_timeout">Dépassement de délai de la commande de
- remontée de contrôle de service</a><br>
+ remontée de contrôle de service</a><br />
<a href="#ochp_timeout">Dépassement de délai de la commande de
- remontée de contrôle d'hôte</a><br>
+ remontée de contrôle d'hôte</a><br />
<a href="#perfdata_timeout">Dépassement de délai de la commande
- de traitement des données liées aux performances</a><br>
- <br>
+ de traitement des données liées aux performances</a><br />
+ <br />
<a href="#obsess_over_services">Option de remontée de contrôle
- de service</a><br>
- <a href="#ocsp_command">Commande de remontée de contrôle de service</a><br>
- <a href="#obsess_over_hosts">Option de remontée de contrôle d'hôte</a><br>
- <a href="#ochp_command">Commande de remontée de contrôle d'hôte</a><br>
- <br>
+ de service</a><br />
+ <a href="#ocsp_command">Commande de remontée de contrôle de service</a><br />
+ <a href="#obsess_over_hosts">Option de remontée de contrôle d'hôte</a><br />
+ <a href="#ochp_command">Commande de remontée de contrôle d'hôte</a><br />
+ <br />
<a href="#process_performance_data">Option de traitement des données
- liées aux performances</a><br>
- <a href="#host_perfdata_command">Commande de performance liée aux hôtes</a><br>
+ liées aux performances</a><br />
+ <a href="#host_perfdata_command">Commande de performance liée aux hôtes</a><br />
<a href="#service_perfdata_command">Commande de performance liée aux
- services</a><br>
- <a href="#host_perfdata_file">Fichier de performance des hôtes</a><br>
- <a href="#service_perfdata_file">Fichier de performance des services</a><br>
+ services</a><br />
+ <a href="#host_perfdata_file">Fichier de performance des hôtes</a><br />
+ <a href="#service_perfdata_file">Fichier de performance des services</a><br />
<a href="#host_perfdata_file_template">Patron du fichier de performance des
- hôtes</a><br>
+ hôtes</a><br />
<a href="#service_perfdata_file_template">Patron du fichier de performance des
- services</a><br>
+ services</a><br />
<a href="#host_perfdata_file_mode">Mode d'ouverture du fichier de performance
- des hôtes</a><br>
+ des hôtes</a><br />
<a href="#service_perfdata_file_mode">Mode d'ouverture du fichier de performance
- des services</a><br>
+ des services</a><br />
<a href="#host_perfdata_file_processing_interval">Intervalle de traitement du
- fichier de performance des hôtes</a><br>
+ fichier de performance des hôtes</a><br />
<a href="#service_perfdata_file_processing_interval">Intervalle de traitement
- du fichier de performance des services</a><br>
+ du fichier de performance des services</a><br />
<a href="#host_perfdata_file_processing_command">Commande de traitement du fichier
- de performance des hôtes</a><br>
+ de performance des hôtes</a><br />
<a href="#service_perfdata_file_processing_command">Commande de traitement du
- fichier de performance des services</a><br>
- <br>
+ fichier de performance des services</a><br />
+ <br />
<a href="#check_for_orphaned_services">Option de vérification des contrôles
- de service orphelins</a><br>
- <br>
+ de service orphelins</a><br />
+ <br />
<a href="#check_service_freshness">Option du contrôle de la validité
- des données d'un service</a><br>
+ des données d'un service</a><br />
<a href="#freshness_check_interval">Intervalle de contrôle de la validité
- des données d'un service</a> <br>
+ des données d'un service</a> <br />
<a href="#check_host_freshness">Option du contrôle de la validité
- des données d'un hôte</a><br>
+ des données d'un hôte</a><br />
<a href="#host_freshness_check_interval">Intervalle du contrôle de la
- validité des données d'un hôte</a><br>
- <br>
- <a href="#date_format">Format de date</a><br>
- <br>
+ validité des données d'un hôte</a><br />
+ <br />
+ <a href="#date_format">Format de date</a><br />
+ <br />
<a href="#illegal_object_name_chars">Caractères illégaux dans la définition
- des objets</a><br>
- <a href="#illegal_macro_output_chars">Caractères illégaux dans la sortie des macros</a><br>
- <br>
- <a href="#use_regexp_matching">Option de concordance par expressions rationnelles</a><br>
+ des objets</a><br />
+ <a href="#illegal_macro_output_chars">Caractères illégaux dans la sortie des macros</a><br />
+ <br />
+ <a href="#use_regexp_matching">Option de concordance par expressions rationnelles</a><br />
<a href="#use_true_regexp_matching">Option de concordance systématique
- par expressions rationnelles </a><br>
- <br>
- <a href="#admin_email">Adresse email de l'administrateur</a><br>
- <a href="#admin_pager">Pager de l'administrateur</a><br>
+ par expressions rationnelles </a><br />
+ <br />
+ <a href="#admin_email">Adresse email de l'administrateur</a><br />
+ <a href="#admin_pager">Pager de l'administrateur</a><br />
</p>
<p> <span class="Default"><a name="log_file"></a> </span>
<table border="0" width="100%">
@@ -249,8 +249,8 @@
<tr>
<td class="Default" valign="top">Exemple :</td>
<td>
- <p class="Default"><font color="red"><strong>cfg_file=/usr/local/nagios/etc/hosts.cfg<br>
- </strong></font><strong><font color="red">cfg_file=/usr/local/nagios/etc/services.cfg<br>
+ <p class="Default"><font color="red"><strong>cfg_file=/usr/local/nagios/etc/hosts.cfg<br />
+ </strong></font><strong><font color="red">cfg_file=/usr/local/nagios/etc/services.cfg<br />
</font></strong><strong><font color="red">cfg_file=/usr/local/nagios/etc/commands.cfg</font></strong></p>
</td>
</tr>
@@ -282,8 +282,8 @@
<tr>
<td class="Default" valign="top">Exemple :</td>
<td>
- <p class="Default"><font color="red"><strong>cfg_dir=/usr/local/nagios/etc/commands<br>
- </strong></font><strong><font color="red">cfg_dir=/usr/local/nagios/etc/services<br>
+ <p class="Default"><font color="red"><strong>cfg_dir=/usr/local/nagios/etc/commands<br />
+ </strong></font><strong><font color="red">cfg_dir=/usr/local/nagios/etc/services<br />
</font></strong><strong><font color="red">cfg_dir=/usr/local/nagios/etc/hosts</font></strong></p>
</td>
</tr>
@@ -330,7 +330,7 @@
<td bgcolor="#cbcbcb" class="Default"><strong>Fichier de ressources</strong></td>
</tr>
</table>
-<span class="Default"><br>
+<span class="Default"><br />
</span>
<table border="0">
<tr>
@@ -2559,7 +2559,7 @@ dans le <a href="#host_perfdata_file_template">patron du fichier de performance
des hôtes</a>. Les données ne seront écrites que si l'<a href="#process_performance_data">option
de traitement des données de performance</a> est activée et si la
directive <i>process_perf_data </i>(<b>[NdT] : traitement des données de
-performance</b>) est activée dans la définition de l'hôte.<br>
+performance</b>) est activée dans la définition de l'hôte.<br />
<p> <a name="service_perfdata_file"></a>
<table border="0" width="100%" class="Default">
<tr>
@@ -2640,7 +2640,7 @@ le <a href="#service_perfdata_file">fichier de performance des services</a>. Le
patron peu contenir des <a href="macros.html">macros</a>, des caractères
spéciaux (\t pour une tabulation, \r un retour charriot, \n pour un retour
à la ligne). Un retour à la ligne est ajouté après
-chaque écriture des données de performance. <br>
+chaque écriture des données de performance. <br />
<p></p>
<p> <a name="host_perfdata_file_mode"></a>
<table border="0" width="100%" class="Default">
@@ -2778,7 +2778,7 @@ pour le traîtement du <a href="#host_perfdata_file">fichier de performance
des hôtes</a>. L'argument <i>command</i>e est le nom court d'une <a href="xodtemplate.html#command">définition
de commande</a> que vous avez définie dans le fichier de configuration
des objets. L'intervalle entre deux traitements est indiqué par l'<a href="#host_perfdata_file_processing_interval">intervalle
-de traitement du fichier de performance des hôtes</a><br>
+de traitement du fichier de performance des hôtes</a><br />
<p></p>
<p> <a name="service_perfdata_file_processing_command"></a>
<table border="0" width="100%" class="Default">
@@ -3126,7 +3126,7 @@ de traitement du fichier de performance des services</a>
comme des expressions rationnelles. Faîtes très attention lorsque
vous activez cette option !</li>
</ul>
-<p>Pour plus d'information, lisez <a href="templatetricks.html">ceci</a><br>
+<p>Pour plus d'information, lisez <a href="templatetricks.html">ceci</a><br />
</p>
<p>
<ul>
diff --git a/doc/fr/distributed.html b/doc/fr/distributed.html
index 564f7c804a814e5b68ba2c537664d1a461102655..e50a8cf8dcf7a55e7b57d6201cf6d9c632d76fca 100644
--- a/doc/fr/distributed.html
+++ b/doc/fr/distributed.html
@@ -321,7 +321,7 @@ define command{
Elle pourrait ressembler à cela .....</P>
<pre><strong><font color="red">
define command{
- command_name service-fige<br> command_line /usr/local/nagios/libexec/service-fige.sh
+ command_name service-fige<br /> command_line /usr/local/nagios/libexec/service-fige.sh
}
</font></strong></pre>
<p></p>
diff --git a/doc/fr/downtime.html b/doc/fr/downtime.html
index 1bcd17a991873c557fa81e5c45be1d15c3cf4bf9..a3e5922b5d3d5d3cc2062ec9ed49939a05dcad42 100644
--- a/doc/fr/downtime.html
+++ b/doc/fr/downtime.html
@@ -87,7 +87,7 @@
service ou hôte démarre son arrêt planifié. Cette
fonctionnalité est extrêmement pratique lorsque l'arrêt planifié
d'un grand nombre de services ou d'hôtes dépend d'un hôte
- ou d'un services particulier.<br>
+ ou d'un services particulier.<br />
Par exemple, si vous planifiez un arrêt variable sur un hôte, vous
voudrez certainement déclencher l'arrêt planifié de tous
ses "fils".</p>
diff --git a/doc/fr/embeddedperl.html b/doc/fr/embeddedperl.html
index 3aae494932a8f701102efacb2c2b105631d75042..ba27e03e719f2b80756e061669384182ec385e92 100644
--- a/doc/fr/embeddedperl.html
+++ b/doc/fr/embeddedperl.html
@@ -103,9 +103,9 @@
Perl). Il exécute maintenant votre plugin grâce à un appel
- de bibliothèque.<br>
+ de bibliothèque.<br />
- <br>
+ <br />
<li>Il réduit grandement l'impact sur le système des plugins Perl
@@ -121,9 +121,9 @@
s'ils tournent a peu près dix fois plus vite — TCL étant
- une exception).<br>
+ une exception).<br />
- <br>
+ <br />
<li>Si vous n'êtes pas un développeur C, vous pouvez quand même
@@ -141,11 +141,11 @@
<i>n'a pas de prix</i> pour comparer les performances des éléments
- de langage Perl).<br>
+ de langage Perl).<br />
- <br>
+ <br />
- <li>L'utilisation de ePN est un excellent moyen d'en apprendre plus sur Perl.<br>
+ <li>L'utilisation de ePN est un excellent moyen d'en apprendre plus sur Perl.<br />
</ul>
@@ -169,41 +169,41 @@
peut <i>ne pas</i> fonctionner avec ePN. Il vous faudra peut-être modifier
- vos plugins pour qu'ils tournent.<br>
+ vos plugins pour qu'ils tournent.<br />
- <br>
+ <br />
<li>Les plugins Perl sont plus difficiles à déboguer sous ePN
- qu'avec un Nagios standard.<br>
+ qu'avec un Nagios standard.<br />
- <br>
+ <br />
<li>Votre ePN aura une plus grande taille (encombrement en mémoire) qu'un
- Nagios standard.<br>
+ Nagios standard.<br />
- <br>
+ <br />
<li>Certaines constructions [constructs] Perl ne peuvent pas être utilisées,
ou peuvent se comporter différemment de ce à quoi vous vous
- attendiez.<br>
+ attendiez.<br />
- <br>
+ <br />
<li>Il vous faudra connaître "plus d'une façon de le faire",
- et peut-être choisir celle qui semble la moins attirante ou évidente.<br>
+ et peut-être choisir celle qui semble la moins attirante ou évidente.<br />
- <br>
+ <br />
<li>Il vous faudra une meilleure connaissance de Perl (mais rien de bien ésotérique
ou concernant la structure interne de Perl — sauf si vous utilisez les
- XSUBS).<br>
+ XSUBS).<br />
</ul>
@@ -219,21 +219,21 @@
des fonctionnalités du langage sans en connaître les rouages
- internes.<br>
+ internes.<br />
- <br>
+ <br />
<li>Ceux qui ont un point de vue utilitaire plutôt qu'une profonde compréhension
- [sic].<br>
+ [sic].<br />
- <br>
+ <br />
<li>Si vous aimez les objets Perl, la gestion de noms, les structures de données,
- et le débogueur, cela suffit sans doute.<br>
+ et le débogueur, cela suffit sans doute.<br />
- <br>
+ <br />
</ul>
@@ -247,21 +247,21 @@
<ul>
- <li>Générez <b>toujours</b> un affichage<br>
+ <li>Générez <b>toujours</b> un affichage<br />
- <br>
+ <br />
<li>Utilisez "use utils" et importez ce qui en est exporté
- ($TIMEOUT %ERRORS &print_revision &support)<br>
+ ($TIMEOUT %ERRORS &print_revision &support)<br />
- <br>
+ <br />
<li>Jetez un œil sur la façon dont sont écrits les plugins
- Perl standard, comme par exemple :<br>
+ Perl standard, comme par exemple :<br />
- <br>
+ <br />
<ul>
@@ -301,9 +301,9 @@
<li><DATA> ne peut pas être utilisé ; utilisez ici des documents
- à la place, par exemple :<br>
+ à la place, par exemple :<br />
- <br>
+ <br />
<dir>
@@ -339,15 +339,15 @@ DATA
<li>Les blocks BEGIN ne fonctionneront pas comme vous l'attendez. Il vaut mieux
- les éviter.<br>
+ les éviter.<br />
- <br>
+ <br />
<li>Assurez-vous de la parfaite propreté du code à la compilation,
- i.e.<br>
+ i.e.<br />
- <br>
+ <br />
<ul>
@@ -361,9 +361,9 @@ DATA
</ul>
- <br>
+ <br />
- <br>
+ <br />
<li>Evitez les variables de portée lexicale (my) déclarées
@@ -383,17 +383,17 @@ DATA
Ce que Bekman <a href="http://perl.apache.org/guide/">recommande en remplacement</a>
- est une des solutions suivantes :<br>
+ est une des solutions suivantes :<br />
- <br>
+ <br />
<ul>
<li>faites une fonction anonyme et appelez-la à travers une référence
- au code, par exemple :<br>
+ au code, par exemple :<br />
- <br>
+ <br />
<dir>
@@ -439,11 +439,11 @@ a ; &$a_cr ;
</ul>
- <br>
+ <br />
- <li>Sachez où trouvez plus d'informations.<br>
+ <li>Sachez où trouvez plus d'informations.<br />
- <br>
+ <br />
<dir>
@@ -479,13 +479,13 @@ a ; &$a_cr ;
<li>Sachez que votre plugin peut retourner d'étranges valeurs avec ePN,
- et que cela est probablement dû au point 4 ci-dessus.<br>
+ et que cela est probablement dû au point 4 ci-dessus.<br />
- <br>
+ <br />
- <li>Soyez prêt à déboguer en :<br>
+ <li>Soyez prêt à déboguer en :<br />
- <br>
+ <br />
<ul>
@@ -513,17 +513,17 @@ a ; &$a_cr ;
</ul>
- <br>
+ <br />
<dir> perl -MO::Deparse <votre_programme> </dir>
- <br>
+ <br />
<li>Sachez qu'ePN transforme votre plugin lui aussi, et si tout le reste a échoué
- essayez de déboguer la version transformée.<br>
+ essayez de déboguer la version transformée.<br />
- <br>
+ <br />
<dir>
@@ -625,15 +625,15 @@ a ; &$a_cr ;
</dir>
- <br>
+ <br />
<li>Ne pas utiliser "use diagnostics" dans un plugin lancé
par votre ePN de production. Je pense qu'il force la valeur de retour à
- CRITICAL dans <u>tous</u> les plugins Perl.<br>
+ CRITICAL dans <u>tous</u> les plugins Perl.<br />
- <br>
+ <br />
<li>Envisagez l'utilisation d'un mini Perl intégré pour vérifier
@@ -651,9 +651,9 @@ a ; &$a_cr ;
où se trouve p1.pl (ce fichier est distribué avec Nagios).</font>
- <br>
+ <br />
- <br>
+ <br />
</ol>
diff --git a/doc/fr/eventhandlers.html b/doc/fr/eventhandlers.html
index 33478f953896baa631f8734a3c24839cba52374f..c7422dbffd88e469c4a7c6507ae6e8bd58a9a010 100644
--- a/doc/fr/eventhandlers.html
+++ b/doc/fr/eventhandlers.html
@@ -92,7 +92,7 @@ Dans la plupart des cas, les commandes de gestionnaires d'évènemen
des scripts écrits en shell ou en perl. Ils doivent accepter au moins les <a href="macros.html">macros</a> suivantes comme arguments:
</p>
<p>
-Macros de gestionnaire d'événement de service : <b>$SERVICESTATE$</b>, <b>$SERVICESTATETYPE$</b>, <b>$SERVICEATTEMPT$</b><br>
+Macros de gestionnaire d'événement de service : <b>$SERVICESTATE$</b>, <b>$SERVICESTATETYPE$</b>, <b>$SERVICEATTEMPT$</b><br />
Macros de gestionnaire d'événement d'hôte : <b>$HOSTSTATE$</b>, <b>$HOSTSTATETYPE$</b>, <b>$HOSTATTEMPT$</b>
</p>
<p>
diff --git a/doc/fr/index.html b/doc/fr/index.html
index c992ac948a0c806332371a0aebc0bbbece5bd738..0073b59ddf1977d3a022d250473cc841595140cc 100644
--- a/doc/fr/index.html
+++ b/doc/fr/index.html
@@ -34,12 +34,12 @@
</P>
<P class="Title">
-Nagios® Version 2.x<br>
+Nagios® Version 2.x<br />
Documentation
</p>
<P class="Copyright">
-Copyright © 1999-2006 Ethan Galstad<br>
+Copyright © 1999-2006 Ethan Galstad<br />
<a href="http://www.nagios.org/" target="_blank">www.nagios.org</a>
</P>
@@ -48,13 +48,13 @@ Mise à jour le : 03/05/2006
</P>
-<br><br>
+<br /><br />
<P class="DocLink">
[ <a href="toc.html" class="DocLink">Table des matières</a> ]
</P>
-<br><br><br><br>
+<br /><br /><br /><br />
<p class="Disclaimer">
Nagios et le logo Nagios sont des marques déposés par Ethan Galstad. Toutes les autres marques, marques de services, marques déposées, et marques de service déposées mentionnées ci-après peuvent être la propriété de leurs propriétaires respectifs. Les informations contenues ci-après sont fournies EN L'ETAT et SANS AUCUNE GARANTIE, Y COMPRIS LES GARANTIES LIEES A LA CONCEPTION, COMMERCIALISATION, ET ADEQUATION A UN USAGE PARTICULIER.
diff --git a/doc/fr/installing.html b/doc/fr/installing.html
index 64ee9cfd9f1905e8ca04084c94f2274c12447e5b..b63cb5c9d45388a2720808a1aa91346cb0a64420 100644
--- a/doc/fr/installing.html
+++ b/doc/fr/installing.html
@@ -123,7 +123,7 @@ système) :
<p>
<strong>
<font color="red">
-grep "^User" /etc/httpd/conf/httpd.conf<br>
+grep "^User" /etc/httpd/conf/httpd.conf<br />
</font>
</strong>
</p>
@@ -146,8 +146,8 @@ Ensuite, on ajoute au nouveau groupe créé les utilisateurs Web et
</p>
<p>
-<font color="red">/usr/sbin/usermod -G nagcmd apache</font><br>
-<font color="red">/usr/sbin/usermod -G nagcmd nagios</font><br>
+<font color="red">/usr/sbin/usermod -G nagcmd apache</font><br />
+<font color="red">/usr/sbin/usermod -G nagcmd nagios</font><br />
</p>
<p>
diff --git a/doc/fr/networkreachability.html b/doc/fr/networkreachability.html
index 5da638fbb3ac718bb097a1937665cdcdecb56d20..b95ef92a1d852aa9f3ccdbf61711adc068f57aac 100644
--- a/doc/fr/networkreachability.html
+++ b/doc/fr/networkreachability.html
@@ -59,7 +59,7 @@ Si Nagios a besoin de contrôler qu'un hôte est "vivant", il lancera
<p>
<a name="figure1"></a>
-<strong>Figure 1.</strong><br>
+<strong>Figure 1.</strong><br />
<img src="images/physical-network.png" border=1><br clear="all">
</p>
@@ -80,7 +80,7 @@ L'option <b><parents></b> de la définition d'hôte d'un h&ocir
<p>
<a name="figure2"></a>
-<strong>Figure 2.</strong><br>
+<strong>Figure 2.</strong><br />
<img src="images/network-heirarchy.png" border=1><br clear="all">
</p>
diff --git a/doc/fr/notifications.html b/doc/fr/notifications.html
index 1310309e9e5ef46e9d4fe8a2b026385b7452f0fc..1b10540cbe150e5f7ce97c626515fe7260733205 100644
--- a/doc/fr/notifications.html
+++ b/doc/fr/notifications.html
@@ -179,9 +179,9 @@ Si vous voulez envoyer une notification alphanumérique à votre pag
<p>
<ul>
-<li><a href="http://www.cingular.com/media/text_messaging">Cigular</a><br>
-<li><a href="http://www.pagenet.com/sendamessage/emailpage.asp">PageNet</a><br>
-<li><a href="http://www.messaging.sprintpcs.com/sms_help/send_email.html">SprintPCS</a> (téléphones SMS)<br>
+<li><a href="http://www.cingular.com/media/text_messaging">Cigular</a><br />
+<li><a href="http://www.pagenet.com/sendamessage/emailpage.asp">PageNet</a><br />
+<li><a href="http://www.messaging.sprintpcs.com/sms_help/send_email.html">SprintPCS</a> (téléphones SMS)<br />
</ul>
</p>
diff --git a/doc/fr/perfdata.html b/doc/fr/perfdata.html
index 2c25182fc322ded054748f0a1bcdcb33bda97aa2..98c600596e2e8cff79a0175962fa50cbe3e5aede 100644
--- a/doc/fr/perfdata.html
+++ b/doc/fr/perfdata.html
@@ -107,7 +107,7 @@ Pour traiter les données de performance mises à disposition par Na
<p>
<ol>
-<li>Activer le paramétre <a href="configmain.html#process_performance_data">process_performance_data</a>.<br><br>
+<li>Activer le paramétre <a href="configmain.html#process_performance_data">process_performance_data</a>.<br /><br />
<li>Configurer Nagios pour que les données de performance soient écrites dans des fichiers et/ou traitées en exécutant des commandes.
</ol>
diff --git a/doc/fr/redundancy.html b/doc/fr/redundancy.html
index e587040f86305a37e25172f7e7edf2d67085589e..2a4ba777cf2c41571b7c3e4148a400f17808a72d 100644
--- a/doc/fr/redundancy.html
+++ b/doc/fr/redundancy.html
@@ -33,10 +33,10 @@ lequel tourne Nagios pose problème ou lorsque des parties du résea
<strong><u>Index</u></strong>
</p>
<p>
-<a href="#prerequisites">Pré-requis</a><br>
-<a href="#samples">Exemples de scripts</a><br>
-<a href="#scenario_1">Scenario 1 - Monitoring Redondant</a><br>
- <a href="#scenario_2">Scenario 2 - Monitoring en haute disponibilité</a><br>
+<a href="#prerequisites">Pré-requis</a><br />
+<a href="#samples">Exemples de scripts</a><br />
+<a href="#scenario_1">Scenario 1 - Monitoring Redondant</a><br />
+ <a href="#scenario_2">Scenario 2 - Monitoring en haute disponibilité</a><br />
</p>
<p>
<a name="prerequisites"></a>
diff --git a/doc/fr/templatetricks.html b/doc/fr/templatetricks.html
index b145c5ab3467ab54e6855e67f5a8cca22868e69f..971411af44ca7e807438a7f9a808a27c8bd0585f 100644
--- a/doc/fr/templatetricks.html
+++ b/doc/fr/templatetricks.html
@@ -19,7 +19,7 @@
<div align="center">
<h2 class="PageTitle">Trucs et astuces "gain de temps" dans les définitions de modèles d'objets</h2>
-ou...<br>
+ou...<br />
<b>"Comment ne pas pêter les plombs"</b>
</div>
</p>
diff --git a/doc/fr/timeperiods.html b/doc/fr/timeperiods.html
index 5523f4ab90210e9aeb29b2c2e514d587024397cd..a371eaf231e16886d4cf2c0509a75e26d081b1ec 100644
--- a/doc/fr/timeperiods.html
+++ b/doc/fr/timeperiods.html
@@ -17,8 +17,8 @@
<p>
<div align="center">
-<h2 class="PageTitle">Les Périodes</h2><br>
-or...<br>
+<h2 class="PageTitle">Les Périodes</h2><br />
+or...<br />
<b>"Est-ce le bon moment ?"</b>
</div>
</p>
diff --git a/doc/fr/toc.html b/doc/fr/toc.html
index f698c19da150ed95939877c91cd0c02695459d0b..37c403a4560653a571d1b2256ec50b1f91eb26fd 100644
--- a/doc/fr/toc.html
+++ b/doc/fr/toc.html
@@ -66,19 +66,19 @@
<ul>
- <a href="about.html#whatis"><strong>Qu'est ce que Nagios?</strong></a><br>
+ <a href="about.html#whatis"><strong>Qu'est ce que Nagios?</strong></a><br />
- <a href="about.html#requirements"><strong>Pré-requis du système</strong></a><br>
+ <a href="about.html#requirements"><strong>Pré-requis du système</strong></a><br />
- <a href="about.html#licensing"><strong>Licence</strong></a><br>
+ <a href="about.html#licensing"><strong>Licence</strong></a><br />
<a href="about.html#downloading"><strong>Télécharger la dernière
- version</strong></a><br>
+ version</strong></a><br />
- <a href="about.html#traduction"><strong>Traduction</strong></a><br>
+ <a href="about.html#traduction"><strong>Traduction</strong></a><br />
</ul>
@@ -88,9 +88,9 @@
<ul>
- <a href="whatsnew.html"><strong><b>Quoi de neuf ?</b></strong></a><b><br>
+ <a href="whatsnew.html"><strong><b>Quoi de neuf ?</b></strong></a><b><br />
- <a href="whatsnew.html#changelog"><strong>Changements et nouveautés</strong></a><br>
+ <a href="whatsnew.html#changelog"><strong>Changements et nouveautés</strong></a><br />
</b>
@@ -116,7 +116,7 @@
-<a href="beginners.html"><strong>Information aux débutants</strong></a><br>
+<a href="beginners.html"><strong>Information aux débutants</strong></a><br />
</ul>
@@ -126,9 +126,9 @@
<ul>
-<a href="installing.html"><strong>Compilation et installation de Nagios</strong></a><br>
+<a href="installing.html"><strong>Compilation et installation de Nagios</strong></a><br />
-<a href="installweb.html"><strong>Configurer l'interface web</strong></a><br>
+<a href="installweb.html"><strong>Configurer l'interface web</strong></a><br />
</ul>
@@ -138,19 +138,19 @@
<ul>
- <a href="config.html"><strong>Survol de la configuration</strong></a><br>
+ <a href="config.html"><strong>Survol de la configuration</strong></a><br />
- <a href="configmain.html"><strong>Configuration principale</strong></a><br>
+ <a href="configmain.html"><strong>Configuration principale</strong></a><br />
- <a href="configobject.html"><strong>Définition des objets</strong></a><br>
+ <a href="configobject.html"><strong>Définition des objets</strong></a><br />
- <a href="configcgi.html"><strong>Configuration des CGIs</strong></a><br>
+ <a href="configcgi.html"><strong>Configuration des CGIs</strong></a><br />
<a href="cgiauth.html"><strong>Configuration des autorisation des accès
- CGIs</strong></a><br>
+ CGIs</strong></a><br />
- <a href="configextinfo.html"><strong>Configuration des informations étendues</strong></a><br>
+ <a href="configextinfo.html"><strong>Configuration des informations étendues</strong></a><br />
</ul>
@@ -160,11 +160,11 @@
<ul>
-<a href="verifyconfig.html"><strong>Vérifier la configuration</strong></a><br>
+<a href="verifyconfig.html"><strong>Vérifier la configuration</strong></a><br />
-<a href="starting.html"><strong>Démarrer Nagios</strong></a><br>
+<a href="starting.html"><strong>Démarrer Nagios</strong></a><br />
-<a href="stoprestart.html"><strong>Arrêter et redémarrer Nagios</strong></a><br>
+<a href="stoprestart.html"><strong>Arrêter et redémarrer Nagios</strong></a><br />
</ul>
@@ -174,9 +174,9 @@
<ul>
-<a href="plugins.html"><strong>Plugins standard</strong></a><br>
+<a href="plugins.html"><strong>Plugins standard</strong></a><br />
-<a href="plugins.html#howto"><strong>Ecrire ses propres plugins</strong></a><br>
+<a href="plugins.html#howto"><strong>Ecrire ses propres plugins</strong></a><br />
</ul>
@@ -190,7 +190,7 @@
-- Daemon et plugin pour exécuter des plugins sur des hôtes distants<br>
+- Daemon et plugin pour exécuter des plugins sur des hôtes distants<br />
<a href="addons.html#nsca"><strong>nsca</strong></a>
@@ -206,23 +206,23 @@
<a href="networkreachability.html"><strong>Déterminer l'état et
- l'accessibilité des hôtes du réseau</strong></a><br>
+ l'accessibilité des hôtes du réseau</strong></a><br />
- <a href="networkoutages.html"><strong>Rupture de la continuité du réseau</strong></a><br>
+ <a href="networkoutages.html"><strong>Rupture de la continuité du réseau</strong></a><br />
- <a href="notifications.html"><strong>Notifications</strong></a><br>
+ <a href="notifications.html"><strong>Notifications</strong></a><br />
- <a href="plugintheory.html"><strong>Théorie sur les plugins</strong></a><br>
+ <a href="plugintheory.html"><strong>Théorie sur les plugins</strong></a><br />
- <a href="checkscheduling.html"><strong>Ordonnancement du contrôle des services</strong></a><br>
+ <a href="checkscheduling.html"><strong>Ordonnancement du contrôle des services</strong></a><br />
- <a href="statetypes.html"><strong>Types d'état</strong></a><br>
+ <a href="statetypes.html"><strong>Types d'état</strong></a><br />
- <a href="timeperiods.html"><strong>Les Périodes</strong></a><br>
+ <a href="timeperiods.html"><strong>Les Périodes</strong></a><br />
</ul>
@@ -232,65 +232,65 @@
<ul>
- <p><a href="eventhandlers.html"><strong>Gestionnaire d'évènements</strong></a><br>
+ <p><a href="eventhandlers.html"><strong>Gestionnaire d'évènements</strong></a><br />
- <a href="extcommands.html"><strong>Commandes externes</strong></a><br>
+ <a href="extcommands.html"><strong>Commandes externes</strong></a><br />
<a href="indirectchecks.html"><strong>Contrôle indirect des hôtes
- et des services</strong></a><br>
+ et des services</strong></a><br />
<a href="passivechecks.html"><strong>Contrôles passifs d'hôtes
- et de services</strong></a><br>
+ et de services</strong></a><br />
- <a href="volatileservices.html"><strong>Services volatils</strong></a><br>
+ <a href="volatileservices.html"><strong>Services volatils</strong></a><br />
<a href="freshness.html"><strong>Contrôle de la fraîcheur des
- résultats d'hôtes et de services</strong></a><br>
+ résultats d'hôtes et de services</strong></a><br />
- <a href="distributed.html"><strong>Supervision distribuée</strong></a><br>
+ <a href="distributed.html"><strong>Supervision distribuée</strong></a><br />
- <a href="redundancy.html"><strong>Supervision redondante</strong></a><br>
+ <a href="redundancy.html"><strong>Supervision redondante</strong></a><br />
<a href="flapping.html"><strong>Détection et gestion des oscillations
- </strong></a><br>
+ </strong></a><br />
<a href="parallelization.html"><strong>Parallélisation du contrôle
- des services</strong></a><br>
+ des services</strong></a><br />
- <a href="escalations.html"><strong>Escalade des notifications</strong></a><br>
+ <a href="escalations.html"><strong>Escalade des notifications</strong></a><br />
- <a href="clusters.html"><strong>Supervision des grappes de services et d'hôtes</strong></a><br>
+ <a href="clusters.html"><strong>Supervision des grappes de services et d'hôtes</strong></a><br />
<a href="dependencies.html"><strong>Dépendances d'hôtes et de
- services</strong></a><br>
+ services</strong></a><br />
<a href="stalking.html"><strong>Suivi précis des changements d'états
- </strong></a><br>
+ </strong></a><br />
- <a href="perfdata.html"><strong>Données liées aux performances</strong></a><br>
+ <a href="perfdata.html"><strong>Données liées aux performances</strong></a><br />
<a href="downtime.html"><strong>Planification de l'arrêt d'un hôte
- ou d'un service</strong></a><br>
+ ou d'un service</strong></a><br />
<a href="embeddedperl.html"><strong>Utilisation de l'interpréteur Perl
- embarqué</strong></a><br>
+ embarqué</strong></a><br />
- <a href="adaptive.html"><b>Surveillance adaptative</b></a> <br>
+ <a href="adaptive.html"><b>Surveillance adaptative</b></a> <br />
- <a href="templaterecursion.html"><strong>Configuration des objets par héritage</strong></a><br>
+ <a href="templaterecursion.html"><strong>Configuration des objets par héritage</strong></a><br />
<a href="templatetricks.html"><strong>Truc et astuces concernant la configuration
- des objets</strong></a><br>
+ des objets</strong></a><br />
</p>
@@ -302,9 +302,9 @@
<ul>
- <a href="int-snmptrap.html"><strong>Intégration de UCD-SNMP (NET-SNMP)</strong></a><br>
+ <a href="int-snmptrap.html"><strong>Intégration de UCD-SNMP (NET-SNMP)</strong></a><br />
- <a href="int-tcpwrappers.html"><strong>Intégration d'un TCP Wrapper</strong></a><br>
+ <a href="int-tcpwrappers.html"><strong>Intégration d'un TCP Wrapper</strong></a><br />
</ul>
@@ -316,15 +316,15 @@
<ul>
- <a href="security.html"><strong>Sécuriser Nagios</strong></a><br>
+ <a href="security.html"><strong>Sécuriser Nagios</strong></a><br />
- <a href="tuning.html"><strong>Régler Nagios pour des performances optimales</strong></a><br>
+ <a href="tuning.html"><strong>Régler Nagios pour des performances optimales</strong></a><br />
- <a href="nagiostats.html"><b>Utiliser nagiostats</b> </a><br>
+ <a href="nagiostats.html"><b>Utiliser nagiostats</b> </a><br />
- <a href="macros.html"><strong>Utilisation des macros dans les commandes</strong></a><br>
+ <a href="macros.html"><strong>Utilisation des macros dans les commandes</strong></a><br />
- <a href="cgis.html"><strong>Informations sur les CGI</strong></a><br>
+ <a href="cgis.html"><strong>Informations sur les CGI</strong></a><br />
<a href="cgiincludes.html"><strong>Personnalisation de l'en-tête
diff --git a/doc/fr/tuning.html b/doc/fr/tuning.html
index 050eb705d0fc159937712b5bf0cf3e52bdf3344a..5f34638ff9152582e2ff45d2d2596f6676b4fba2 100644
--- a/doc/fr/tuning.html
+++ b/doc/fr/tuning.html
@@ -38,26 +38,26 @@ Maintenant que vous avez pu installer et lancer Nagios, vous voulez savoir comme
<p>
<ol>
-<li><b>Utilisez des changements d'état agrégés</b>. En activant la consolidation des changements d'état (grâce au paramètre <a href="configmain.html#aggregate_status_updates">aggregate_status_updates</a>), vous réduirez considérablement la charge sur votre hôte de supervision, car il n'essaiera pas constamment de mettre à jour le <a href="configmain.html#status_file">journal des états</a>. Ceci est particulièrement vrai si vous supervisez un grand nombre de services. La principale contrepartie lorsque vous agrégez les changements d'état est que les modifications d'état des hôtes et des services ne sont pas immédiatement répliquées dans le fichier d'état. Ceci peut vous poser problème, ou pas.<br><br>
+<li><b>Utilisez des changements d'état agrégés</b>. En activant la consolidation des changements d'état (grâce au paramètre <a href="configmain.html#aggregate_status_updates">aggregate_status_updates</a>), vous réduirez considérablement la charge sur votre hôte de supervision, car il n'essaiera pas constamment de mettre à jour le <a href="configmain.html#status_file">journal des états</a>. Ceci est particulièrement vrai si vous supervisez un grand nombre de services. La principale contrepartie lorsque vous agrégez les changements d'état est que les modifications d'état des hôtes et des services ne sont pas immédiatement répliquées dans le fichier d'état. Ceci peut vous poser problème, ou pas.<br /><br />
-<li><b>Utilisez un disque virtuel [NdT : ramdisk] pour conserver les données d'état</b>. Si vous utilisez le <a href="configmain.html#status_file">journal des états</a> standard et que vous n'utilisez <i>pas</i> l'agrégation des changements d'état, pensez à mettre le répertoire où le journal des états est stocké sur un disque virtuel en mémoire. Cela accélérera pas mal les choses (à la fois pour le programme principal et les CGI) parce que cela évite beaucoup d'interruptions et d'accès au disque.<br><br>
+<li><b>Utilisez un disque virtuel [NdT : ramdisk] pour conserver les données d'état</b>. Si vous utilisez le <a href="configmain.html#status_file">journal des états</a> standard et que vous n'utilisez <i>pas</i> l'agrégation des changements d'état, pensez à mettre le répertoire où le journal des états est stocké sur un disque virtuel en mémoire. Cela accélérera pas mal les choses (à la fois pour le programme principal et les CGI) parce que cela évite beaucoup d'interruptions et d'accès au disque.<br /><br />
-<li><b>Vérifiez la latence des services pour déterminer la meilleure valeur pour le nombre maximal de contrôles en parallèle</b>. Nagios peut restreindre le nombre maximal de contrôles de service exécutés en parallèle à la valeur que vous spécifiez dans le paramètre <a href="configmain.html#max_concurrent_checks">max_concurrent_checks</a>. Cela vous permet de gérer la charge que Nagios impose à votre hôte de supervision, mais cela peut aussi ralentir le traitement. Si vous notez des latences importantes (> 10 ou 15 secondes) pour la majorité de vos contrôles de service (via le <a href="cgis.html#extinfo_cgi">CGI d'informations complémentaires</a>), vous privez sans doute Nagios des contrôles dont il a besoin. Ce n'est pas la faute de Nagios - c'est la vôtre. Dans des conditions idéales, tous les contrôles de service ont une latence de 0, ce qui signifie qu'ils sont exécutés au moment précis où ils ont été ordonnancés. Ceci dit, il est normal que certains contrôles aient de petites latences. Je recommanderais de doubler la valeur que propose Nagios pour le nombre minimal de contrôles en parallèle, fournie lorsque Nagios est lancé avec le paramètre <b>-s</b>. Continuez à augmenter cette valeur tant que la latence moyenne pour vos services reste assez basse. Vous trouverez plus d'informations sur l'ordonnancement des contrôles de service <a href="checkscheduling.html">ici</a>.<br><br>
+<li><b>Vérifiez la latence des services pour déterminer la meilleure valeur pour le nombre maximal de contrôles en parallèle</b>. Nagios peut restreindre le nombre maximal de contrôles de service exécutés en parallèle à la valeur que vous spécifiez dans le paramètre <a href="configmain.html#max_concurrent_checks">max_concurrent_checks</a>. Cela vous permet de gérer la charge que Nagios impose à votre hôte de supervision, mais cela peut aussi ralentir le traitement. Si vous notez des latences importantes (> 10 ou 15 secondes) pour la majorité de vos contrôles de service (via le <a href="cgis.html#extinfo_cgi">CGI d'informations complémentaires</a>), vous privez sans doute Nagios des contrôles dont il a besoin. Ce n'est pas la faute de Nagios - c'est la vôtre. Dans des conditions idéales, tous les contrôles de service ont une latence de 0, ce qui signifie qu'ils sont exécutés au moment précis où ils ont été ordonnancés. Ceci dit, il est normal que certains contrôles aient de petites latences. Je recommanderais de doubler la valeur que propose Nagios pour le nombre minimal de contrôles en parallèle, fournie lorsque Nagios est lancé avec le paramètre <b>-s</b>. Continuez à augmenter cette valeur tant que la latence moyenne pour vos services reste assez basse. Vous trouverez plus d'informations sur l'ordonnancement des contrôles de service <a href="checkscheduling.html">ici</a>.<br /><br />
-<li><b>Utilisez des contrôles passifs à chaque fois que c'est possible</b>. La surcharge induite par le traitement des résultats des <a href="passivechecks.html">contrôles passifs de service</a> est bien moindre que celle des contrôles actifs "normaux", donc prenez cette information en compte si vous supervisez de nombreux services. Notez que les contrôles passifs de service ne sont réellement utiles que si une application externe réalise une partie de la supervision ou produit des rapports ; si c'est Nagios qui réalise tout le travail, ceci ne changera rien.<br><br>
+<li><b>Utilisez des contrôles passifs à chaque fois que c'est possible</b>. La surcharge induite par le traitement des résultats des <a href="passivechecks.html">contrôles passifs de service</a> est bien moindre que celle des contrôles actifs "normaux", donc prenez cette information en compte si vous supervisez de nombreux services. Notez que les contrôles passifs de service ne sont réellement utiles que si une application externe réalise une partie de la supervision ou produit des rapports ; si c'est Nagios qui réalise tout le travail, ceci ne changera rien.<br /><br />
-<li><b>Evitez l'utilisation des plugins interprétés.</b> L'utilisation de plugins compilés (C/C++, etc.) réduira significativement la charge de votre hôte de supervision par rapport aux scripts interprétés (Perl, etc.). Si les scripts Perl ou autres sont faciles à écrire et fonctionnent bien, le fait qu'ils soient compilés/interprétés à chaque exécution peut augmenter considérablement la charge de votre hôte de supervision lorsque vous avez de nombreux contrôles de service. Si vous souhaitez utiliser des plugins Perl, essayez de les compiler en vrais exécutables grâce à perlcc(1) (un utilitaire qui fait partie de la distribution Perl standard) ou essayez de compiler Nagios avec un interpréteur Perl intégré (voir ci-dessous).<br><br>
+<li><b>Evitez l'utilisation des plugins interprétés.</b> L'utilisation de plugins compilés (C/C++, etc.) réduira significativement la charge de votre hôte de supervision par rapport aux scripts interprétés (Perl, etc.). Si les scripts Perl ou autres sont faciles à écrire et fonctionnent bien, le fait qu'ils soient compilés/interprétés à chaque exécution peut augmenter considérablement la charge de votre hôte de supervision lorsque vous avez de nombreux contrôles de service. Si vous souhaitez utiliser des plugins Perl, essayez de les compiler en vrais exécutables grâce à perlcc(1) (un utilitaire qui fait partie de la distribution Perl standard) ou essayez de compiler Nagios avec un interpréteur Perl intégré (voir ci-dessous).<br /><br />
-<li><b>Utilisez l'interpréteur Perl intégré.</b> Si vous utilisez de nombreux scripts Perl pour les contrôles de service, etc., vous vous apercevrez sans doute qu'en compilant Nagios avec un interpréteur Perl intégré vous accélérez les traitements. Pour compiler l'interpréteur Perl intégré, vous devez ajouter le paramètre <i>--enable-embedded-perl</i> au script de configuration [NdT : ./configure] avant de compiler Nagios. De même, si vous ajoutez le paramètre <i>--with-perlcache</i>, la version compilée de tous les scripts Perl exécutés par l'interpréteur Perl intégré sera mise en cache pour réutilisation.<br><br>
+<li><b>Utilisez l'interpréteur Perl intégré.</b> Si vous utilisez de nombreux scripts Perl pour les contrôles de service, etc., vous vous apercevrez sans doute qu'en compilant Nagios avec un interpréteur Perl intégré vous accélérez les traitements. Pour compiler l'interpréteur Perl intégré, vous devez ajouter le paramètre <i>--enable-embedded-perl</i> au script de configuration [NdT : ./configure] avant de compiler Nagios. De même, si vous ajoutez le paramètre <i>--with-perlcache</i>, la version compilée de tous les scripts Perl exécutés par l'interpréteur Perl intégré sera mise en cache pour réutilisation.<br /><br />
-<li><b>Optimisez les commandes de contrôle d'hôte.</b> Si vous contrôlez l'état des hôtes avec le plugin check_ping, vous vous apercevrez que ces contrôles se font bien plus vite en les éclatant. Plutôt que de spécifier une valeur de 1 pour le paramétre <i>max_attempts</i> dans la définition de l'hôte et de dire au plugin check_ping d'envoyer 10 paquets ICMP à l'hôte, il est bien plus rapide de passer max_attempts à 10 et de n'envoyer qu'un paquet ICMP à chaque fois. Ceci est dû au fait que Nagios peut souvent déterminer l'état d'un hôte après n'avoir exécuté le plugin qu'une fois, il vaut donc mieux que le premier contrôle soit le plus rapide possible. Cette méthode présente des inconvénients dans certaines situations (c.-à-d. que les hôtes lents à répondre peuvent être considérés comme hors service), mais vous aurez des contrôles d'hôte plus rapides si vous l'utilisez. Vous pouvez aussi utiliser un plugin plus rapide (c.-à-d. check_fping) dans le paramètre <i>host_check_command</i> plutôt que check_ping.<br><br>
+<li><b>Optimisez les commandes de contrôle d'hôte.</b> Si vous contrôlez l'état des hôtes avec le plugin check_ping, vous vous apercevrez que ces contrôles se font bien plus vite en les éclatant. Plutôt que de spécifier une valeur de 1 pour le paramétre <i>max_attempts</i> dans la définition de l'hôte et de dire au plugin check_ping d'envoyer 10 paquets ICMP à l'hôte, il est bien plus rapide de passer max_attempts à 10 et de n'envoyer qu'un paquet ICMP à chaque fois. Ceci est dû au fait que Nagios peut souvent déterminer l'état d'un hôte après n'avoir exécuté le plugin qu'une fois, il vaut donc mieux que le premier contrôle soit le plus rapide possible. Cette méthode présente des inconvénients dans certaines situations (c.-à-d. que les hôtes lents à répondre peuvent être considérés comme hors service), mais vous aurez des contrôles d'hôte plus rapides si vous l'utilisez. Vous pouvez aussi utiliser un plugin plus rapide (c.-à-d. check_fping) dans le paramètre <i>host_check_command</i> plutôt que check_ping.<br /><br />
-<li><b>Ne planifiez pas une vérification régulière des hôtes</b>. Il ne faut PAS planifier des vérifications régulières d'hôtes à moins que ce ne soit absolument nécessaire. Il n'y a pas beaucoup de raisons de faire cela, car les vérifications d'hôtes sont effectuées à la demande lorsque c'est nécessaire. Pour désactiver la vérification régulière d'un hôte, mettez 0 à la directive <i>check_interval</i> dans la <a href="xodtemplate.html#host">définition d'hôte</a>. Si vous avez besoin de vérifier régulièrement les hôtes, essayez de mettre un intervalle de vérification plus grand et vérifiez que vos vérifications sont optimisées (voir plus haut).<br><br>
+<li><b>Ne planifiez pas une vérification régulière des hôtes</b>. Il ne faut PAS planifier des vérifications régulières d'hôtes à moins que ce ne soit absolument nécessaire. Il n'y a pas beaucoup de raisons de faire cela, car les vérifications d'hôtes sont effectuées à la demande lorsque c'est nécessaire. Pour désactiver la vérification régulière d'un hôte, mettez 0 à la directive <i>check_interval</i> dans la <a href="xodtemplate.html#host">définition d'hôte</a>. Si vous avez besoin de vérifier régulièrement les hôtes, essayez de mettre un intervalle de vérification plus grand et vérifiez que vos vérifications sont optimisées (voir plus haut).<br /><br />
-<li><b>N'utilisez pas le contrôle agressif des hôtes.</b> Sauf si Nagios a du mal à identifier les rétablissements d'hôte, je recommanderais de <i>ne pas</i> activer le paramètre <a href="configmain.html#use_aggressive_host_checking">use_aggressive_host_checking</a>. Quand cette option est désactivée, les contrôles s'exécutent beaucoup plus vite, accélérant le traitement des résultats de contrôles de service. Cependant, les rétablissements d'hôtes peuvent être manqués en certaines circonstances lorsque l'option est désactivée. Par exemple, si un hôte se rétablit et que tous les services associés à cet hôte restent dans un état non-OK (et ne "bagotent" pas entre différents états non-OK), Nagios peut ne pas voir que l'hôte s'est rétabli. Certains utilisateurs peuvent avoir besoin d'activer cette option, mais ce n'est pas le cas pour la majorité, et je recommanderais de <i>ne pas</i> l'utiliser si vous n'en avez pas expressément besoin...<br><br>
+<li><b>N'utilisez pas le contrôle agressif des hôtes.</b> Sauf si Nagios a du mal à identifier les rétablissements d'hôte, je recommanderais de <i>ne pas</i> activer le paramètre <a href="configmain.html#use_aggressive_host_checking">use_aggressive_host_checking</a>. Quand cette option est désactivée, les contrôles s'exécutent beaucoup plus vite, accélérant le traitement des résultats de contrôles de service. Cependant, les rétablissements d'hôtes peuvent être manqués en certaines circonstances lorsque l'option est désactivée. Par exemple, si un hôte se rétablit et que tous les services associés à cet hôte restent dans un état non-OK (et ne "bagotent" pas entre différents états non-OK), Nagios peut ne pas voir que l'hôte s'est rétabli. Certains utilisateurs peuvent avoir besoin d'activer cette option, mais ce n'est pas le cas pour la majorité, et je recommanderais de <i>ne pas</i> l'utiliser si vous n'en avez pas expressément besoin...<br /><br />
-<li><b>Augmentez l'intervalle de vérification des commandes externes.</b> Si vous gérez beaucoup de commandes externes (p. ex. des vérifications passives dans une <a href="distributed.html">supervision distribuée</a>), vous devrez probablement affecter <b>-1</b> au paramètre <a href="configmain.html#command_check_interval">command_check_interval</a>. Cela forcera Nagios à vérifier les commandes externes aussi souvent que possible. C'est important parce que la plupart des systèmes ont une petite taille de tampon pour les tubes de redirections [NdT : pipe] (c.-à-d. 4 Ko). Si Nagios ne lit pas les données depuis le tube le plus rapidement possible, l'application qui écrit dans le fichier de commandes externes (p. ex. le <a href="addons.html#nsca">démon NSCA</a>) se bloquera et attendra jusqu'à ce qu'il y ait assez d'espace libre dans le tube pour écrire ses données.<br><br>
+<li><b>Augmentez l'intervalle de vérification des commandes externes.</b> Si vous gérez beaucoup de commandes externes (p. ex. des vérifications passives dans une <a href="distributed.html">supervision distribuée</a>), vous devrez probablement affecter <b>-1</b> au paramètre <a href="configmain.html#command_check_interval">command_check_interval</a>. Cela forcera Nagios à vérifier les commandes externes aussi souvent que possible. C'est important parce que la plupart des systèmes ont une petite taille de tampon pour les tubes de redirections [NdT : pipe] (c.-à-d. 4 Ko). Si Nagios ne lit pas les données depuis le tube le plus rapidement possible, l'application qui écrit dans le fichier de commandes externes (p. ex. le <a href="addons.html#nsca">démon NSCA</a>) se bloquera et attendra jusqu'à ce qu'il y ait assez d'espace libre dans le tube pour écrire ses données.<br /><br />
<li><b>Optimisez le matériel pour des performances maximales.</b> La configuration matérielle va affecter directement les performances de votre système d'exploitation, et donc celles de Nagios. L'amélioration principale que vous puissiez réaliser concerne les disques durs. La vitesse du processeur et la mémoire affectent bien évidemment les performances, mais les accès disque seront votre goulet d'étranglement le plus fréquent. Ne stockez pas les plugins, le journal des états, etc. sur des disques lents (c.-à-d. des vieux disques IDE ou des montages NFS). Si vous en avez, utilisez des disques UltraSCSI ou des disques IDE rapides. Une remarque importante pour les utilisateurs de IDE/Linux : bien des installations de Linux n'essaient pas d'optimiser les accès au disque. Si vous ne changez pas les paramètres d'accès au disque (en utilisant un utilitaire comme <b>hdparam</b>), vous perdrez <b>beaucoup</b> des fonctionnalités améliorant la vitesse des nouveaux disques IDE.
diff --git a/doc/fr/volatileservices.html b/doc/fr/volatileservices.html
index ef210b66f61a2280374d76a3cc3d8b54c6b7842b..5e50362ea8d65171c393a81c5a66c778f805ba66 100644
--- a/doc/fr/volatileservices.html
+++ b/doc/fr/volatileservices.html
@@ -103,9 +103,9 @@ Si vous voulez que Nagios soit averti des scans de ports, vous pouvez mettre en
<p>
<ul>
-<li>Modifiez votre fichier de configuration de PortSentry (portsentry.conf), et définissez une commande pour la directive <b>KILL_RUN_CMD</b> comme suit ::<br><br>
+<li>Modifiez votre fichier de configuration de PortSentry (portsentry.conf), et définissez une commande pour la directive <b>KILL_RUN_CMD</b> comme suit ::<br /><br />
<font color="red">KILL_RUN_CMD="/usr/local/Nagios/libexec/eventhandlers/submit_check_result <i><host_name></i> 'Port Scans' 2 'Port scan from host $TARGET$ on port $PORT$. Host has been firewalled.'"</font>
-<br><br>
+<br /><br />
Assurez-vous de remplacer <i><host_name></i> avec le nom court de l'hôte avec lequel le service est associé.
</ul>
</p>
diff --git a/doc/fr/whatsnew.html b/doc/fr/whatsnew.html
index c7fc7630020de9ead7c079613afbe79c20deea74..a323ea050fe8c69828ee004f34d914bebed985e1 100644
--- a/doc/fr/whatsnew.html
+++ b/doc/fr/whatsnew.html
@@ -62,8 +62,8 @@ Il y a un problème connu qui affecte Nagios 2.0 sur les systèmes F
<p>
<ol>
-<li><b>Changements dans les macros</b> - Les <a href="macros.html">macros</a> ont subi une refonte majeure. Vous devrez mettre à jour la plupart de vos définitions de commandes pour vous adapter aux nouvelles macros. La plupart des macros sont maintenant disponibles en tant que variables d'environnement. De plus, des macros d'hôte et de service "à la demande" ont été ajoutées. Lisez la <a href="macros.html">documentation sur les macros</a> pour de plus amples informations.<br>
-<br>
+<li><b>Changements dans les macros</b> - Les <a href="macros.html">macros</a> ont subi une refonte majeure. Vous devrez mettre à jour la plupart de vos définitions de commandes pour vous adapter aux nouvelles macros. La plupart des macros sont maintenant disponibles en tant que variables d'environnement. De plus, des macros d'hôte et de service "à la demande" ont été ajoutées. Lisez la <a href="macros.html">documentation sur les macros</a> pour de plus amples informations.<br />
+<br />
<li><b>Changements dans les groupes d'hôtes</b>
<ul>
@@ -73,21 +73,21 @@ Il y a un problème connu qui affecte Nagios 2.0 sur les systèmes F
<li><b>Changement dans les permissions</b> - Les permissions d'accès aux groupes d'hôtes dans les CGI ont été changées. Vous devez maintenant avoir accès à tous les hôtes membres du groupe d'hôtes pour avoir accès au groupe d'hôtes.
</ul>
-<br>
+<br />
<li><b>Changements dans les hôtes</b>
<ul>
<li><b>Contrôle de fraîcheur de l'hôte</b> - le contrôle de fraîcheur a été ajouté aux contrôles d'hôtes. C'est le paramétre <a href="configmain.html#check_host_freshness">check_host_freshness</a> qui définit ce comportement, associé au paramétre <i>check_freshness</i> de la <a href="xodtemplate.html#host">défintion d'hôte</a>.
<li><b>Commande OCHP</b> - Les contrôles d'hôtes peuvent maintenant être remontés, comme l'étaient les contrôles de services. La <a href="configmain.html#ochp_command">commande OCHP</a> est lancée pour tous les hôtes dont le paramétre <i>obsess_over_host</i> est activé dans la <a href="xodtemplate.html#host">définition d'hôte</a>.
</ul>
-<br>
+<br />
<li><b>Changements dans le contrôle des hôtes</b>
<ul>
<li><b>Contrôles ordonnancés régulièrement</b> - Vous pouvez maintenant ordonnancer le contrôle régulier d'hôtes en utilisant le paramétre <i>check_interval</i> de la <a href="xodtemplate.html#host">définition d'hôte</a>. <strong>NOTE :</strong> Attention ! Vous devez utiliser parcimonieusement les contrôles réguliers d'hôtes. Ils ne sont pas nécessaires au fonctionnement normal (les contrôles à la demande sont déjà réalisés quand c'est nécessaire) et peuvent <a href="tuning.html">dégrader les performances</a> s'ils sont utilisés de manière inappropriée. Vous êtes prévenus.
<li><b>Contrôles d'hôtes passifs</b> - Les contrôles d'hôtes passifs sont maintenant possibles s'ils sont activés par le paramétre <a href="configmain.html#accept_passive_host_checks">accept_passive_host_checks</a> du fichier de configuration principal et le paramétre <i>accept_passive_host_checks</i> de la <a href="xodtemplate.html#host">définition d'hôte</a>. Les <a href="passivechecks.html">contrôles passifs d'hôtes</a> peuvent simplifier la mise en oeuvre d'une supervision <a href="redundancy.html">redondante</a> ou <a href="distributed.html">répartie</a>. <strong>NOTE :</strong> Certains problèmes sont liés aux contrôles d'hôtes passifs - pour en savoir plus lisez <a href="passivechecks.html">ceci</a>.
</ul>
-<br>
+<br />
<li><b>Changements dans la mémorisation</b>
<ul>
<li><b>Mémorisation des informations d'ordonnancement</b> - Les information d'ordonnancement des contrôles d'hôtes et de services (prochains moments de contrôle) peuvent maintenant être mémorisées entre les redémarrages du programme grâce au paramétre <a href="configmain.html#use_retained_scheduling_info">use_retained_scheduling_info</a>.
@@ -95,19 +95,19 @@ Il y a un problème connu qui affecte Nagios 2.0 sur les systèmes F
<li><b>Plus de choses mémorisées</b> - Il y a plus d'informations mémorisées entre les redémarrages du programme, y compris l'historique de la <a href="flapping.html">détection d'oscillation</a>. Youpi !
</ul>
-<br>
+<br />
<li><b>Changements dans les informations étendues</b>
<ul>
<li><b>Nouvel emplacement</b> - Les définitions d'informations étendues <a href="xodtemplate.html#hostextinfo">d'hôtes</a> et <a href="xodtemplate.html#serviceextinfo">de services</a> sont maintenant stockées dans les fichiers de configuration des objets, avec les définitions d'hôtes, etc. Il en résulte que les définitions d'information étendues sont maintenant analysées et validées par le démon Nagios avant le démarrage.
<li><b>Nouveaux paramétres</b> - Les définitions d'informations étendues <a href="xodtemplate.html#hostextinfo">d'hôtes</a> et <a href="xodtemplate.html#serviceextinfo">de services</a> comportent maintenant deux nouveaux paramétres : <i>notes</i> et <i>action_url</i>.
</ul>
-<br>
+<br />
<li><b>Changements dans l'interpréteur Perl intégré</b>
<ul>
<li><b>Emplacement de p1.pl</b> - Vous pouvez maintenant définir l'emplacement du fichier d'aide de l'interpréteur Perl intégré (p1.pl) grâce au paramétre p1_file.
</ul>
-<br>
+<br />
<li><b>Changements dans les notifications</b>
<ul>
@@ -117,23 +117,23 @@ Il y a un problème connu qui affecte Nagios 2.0 sur les systèmes F
<li><b>Options d'escalade</b> - Les paramétres de période et d'état ont été ajoutés aux escalades <a href="xodtemplate.html#hostescalation">d'hôtes</a> et <a href="xodtemplate.html#serviceescalation">de services</a>. Cela vous permet de contrôler plus finement l'utilisation des escalades. Vous trouverez <a href="escalations.html">ici</a> plus d'informations sur les escalades.
</ul>
-<br>
-<li><b>Ajout des groupes de services</b> - Les <a href="xodtemplate.html#servicegroup">groupes de services</a> ont été ajoutés. Ils vous permettent de grouper des services pour l'affichage dans les CGI et <a href="templatetricks.html">peuvent être utilisés</a> dans les définitions de dépendances de services et d'escalade de services pour faciliter la configuration.<br>
-<br>
-<li><b>Ajout de l'arrêt planifié déclenché</b> - La gestion de l'arrêt planifié dit "déclenché" a été ajouté pour les hôtes et les services. L'arrêt planifié déclenché vous permet de définir un arrêt planifié qui commence en même temps qu'un autre arrêt planifié (très utile pour définir l'arrêt planifié des hôtes enfants d'un hôte dont le moment d'arrêt planifié est variable). Vous trouverez <a href="downtime.html">ici</a> plus d'informations sur l'arrêt planifié.<br>
-
-<br>
-<li><b>Nouvel outil de statistiques</b> - Un nouvel outil appelé 'nagiostats' fait maintenant partie de la distribution de Nagios. C'est un outil en ligne de commande qui vous donne les statistiques pour un processus Nagios en cours d'exécution. Il peut également produire des données compatibles avec MRTG, vous permettant de représenter graphiquement les statistiques. Vous trouverez <a href="nagiostats.html">ici</a> plus d'information sur l'utilisation de cet outil.<br>
-<br>
-<li><b>Supervision adaptative</b> - Vous pouvez maintenant changer certains paramétres propres aux contrôles d'hôtes et de services (commandes de contrôles, intervalle de contrôle, nombre maximal d'essais de contrôle, etc.) en cours d'exécution en envoyant les commandes externes appropriées. Ce type de supervision adaptative ne sera probablement pas d'un grand usage pour la majorité des utilisateurs, mais il permet des trucs élégants. Vous trouverez <a href="adaptive.html">ici</a> plus d'informations sur la supervision adaptative.<br>
-<br>
-<li><b>Changements dans les données de performance</b> - La méthode de traitement des données de performance a légèrement changé. Vous pouvez maintenant traiter les données de performance en exécutant des commandes externes et/ou en écrivant dans les fichiers sans recompiler Nagios. Lisez la documentation sur les <a href="perfdata.html">données de performance</a> pour de plus amples informations.<br>
-
-<br>
-<li><b>Abandon de la gestion native des bases de données</b> - La gestion native du stockage de divers types de données (états, mémorisation, commentaires, arrêt planifié, etc.) dans MySQL et PostgreSQL a été abandonnée. Arrêtez de vous plaindre. J'espère que quelqu'un développera bientôt une solution alternative grâce au nouveau gestionnaire d'évènements. De plus, la gestion des bases de données n'était pas très bien implémentée et son abandon va rendre la tâche plus facile pour les nouveaux utilisateurs (une question de moins à se poser).<br>
-<br>
-<li><b>API de distribution des évènements [NdT : event broker]</b> - Une API [NdT : interface de programmation] a été créée pour permettre aux développeurs indépendants d'écrire des greffons qui s'intégrent avec le coeur du démon Nagios. La documentation de l'API de distribution d'évènements sera créée quand le code de la version 2.x sera mûr, et elle sera disponible sur le site web de Nagios.<br>
-<br>
+<br />
+<li><b>Ajout des groupes de services</b> - Les <a href="xodtemplate.html#servicegroup">groupes de services</a> ont été ajoutés. Ils vous permettent de grouper des services pour l'affichage dans les CGI et <a href="templatetricks.html">peuvent être utilisés</a> dans les définitions de dépendances de services et d'escalade de services pour faciliter la configuration.<br />
+<br />
+<li><b>Ajout de l'arrêt planifié déclenché</b> - La gestion de l'arrêt planifié dit "déclenché" a été ajouté pour les hôtes et les services. L'arrêt planifié déclenché vous permet de définir un arrêt planifié qui commence en même temps qu'un autre arrêt planifié (très utile pour définir l'arrêt planifié des hôtes enfants d'un hôte dont le moment d'arrêt planifié est variable). Vous trouverez <a href="downtime.html">ici</a> plus d'informations sur l'arrêt planifié.<br />
+
+<br />
+<li><b>Nouvel outil de statistiques</b> - Un nouvel outil appelé 'nagiostats' fait maintenant partie de la distribution de Nagios. C'est un outil en ligne de commande qui vous donne les statistiques pour un processus Nagios en cours d'exécution. Il peut également produire des données compatibles avec MRTG, vous permettant de représenter graphiquement les statistiques. Vous trouverez <a href="nagiostats.html">ici</a> plus d'information sur l'utilisation de cet outil.<br />
+<br />
+<li><b>Supervision adaptative</b> - Vous pouvez maintenant changer certains paramétres propres aux contrôles d'hôtes et de services (commandes de contrôles, intervalle de contrôle, nombre maximal d'essais de contrôle, etc.) en cours d'exécution en envoyant les commandes externes appropriées. Ce type de supervision adaptative ne sera probablement pas d'un grand usage pour la majorité des utilisateurs, mais il permet des trucs élégants. Vous trouverez <a href="adaptive.html">ici</a> plus d'informations sur la supervision adaptative.<br />
+<br />
+<li><b>Changements dans les données de performance</b> - La méthode de traitement des données de performance a légèrement changé. Vous pouvez maintenant traiter les données de performance en exécutant des commandes externes et/ou en écrivant dans les fichiers sans recompiler Nagios. Lisez la documentation sur les <a href="perfdata.html">données de performance</a> pour de plus amples informations.<br />
+
+<br />
+<li><b>Abandon de la gestion native des bases de données</b> - La gestion native du stockage de divers types de données (états, mémorisation, commentaires, arrêt planifié, etc.) dans MySQL et PostgreSQL a été abandonnée. Arrêtez de vous plaindre. J'espère que quelqu'un développera bientôt une solution alternative grâce au nouveau gestionnaire d'évènements. De plus, la gestion des bases de données n'était pas très bien implémentée et son abandon va rendre la tâche plus facile pour les nouveaux utilisateurs (une question de moins à se poser).<br />
+<br />
+<li><b>API de distribution des évènements [NdT : event broker]</b> - Une API [NdT : interface de programmation] a été créée pour permettre aux développeurs indépendants d'écrire des greffons qui s'intégrent avec le coeur du démon Nagios. La documentation de l'API de distribution d'évènements sera créée quand le code de la version 2.x sera mûr, et elle sera disponible sur le site web de Nagios.<br />
+<br />
<li><b>Changements divers</b>
<ul>
<li><b>Toutes les commandes peuvent avoir des paramétres</b> - Tous les types de commandes (contrôles d'hôtes, notifications, traitement des données de performance, gestionnaires d'évènements, etc.) peuvent recevoir des paramétres (séparés du nom de la commande par le caractère <b>!</b>). Les paramétres sont remplacés dans la ligne de commande via les <a href="macros.html">macros</a> <b>$ARGx</b>.
@@ -151,7 +151,7 @@ Il y a un problème connu qui affecte Nagios 2.0 sur les systèmes F
<li><b>Changements dans le contrôle de la fraîcheur</b> - L'algorithme de contrôle de la fraîcheur a légèrement changé. Le contrôle de fraîcheur ne se fera pas si l'instant présent n'est pas définit dans le paramétre <i>check_timeperiod</i> de l'hôte ou du service. De plus, les contrôles de fraîcheur n'auront plus lieu si les deux paramétres <i>check_interval</i> et <i>freshness_threshold</i> pour l'hôte ou le service valent zéro (0).
</ul>
-<br>
+<br />
</ol>
</p>
diff --git a/doc/fr/xodtemplate.html b/doc/fr/xodtemplate.html
index 1087fca4c6d9eece3e719d4402b6609334254aa5..912e7f18262a505186cadc19f0e655e171c19d12 100644
--- a/doc/fr/xodtemplate.html
+++ b/doc/fr/xodtemplate.html
@@ -122,20 +122,20 @@ Une des manières de se débarrasser de ce problème consiste
</p>
<p>
-<a href="#host">Définition d'hôte</a><br>
- <a href="#hostgroup">Définition de groupe d'hôtes</a><br>
- <a href="#service">Définition de service</a><br>
- <a href="#servicegroup">Définition de groupe de service</a><br>
- <a href="#contact">Définition de contact</a><br>
- <a href="#contactgroup">Définition de groupe de contacts</a><br>
- <a href="#timeperiod">Définition de période</a><br>
- <a href="#command">Définition de commande</a><br>
- <a href="#servicedependency">Définition des dépendances de service</a><br>
- <a href="#serviceescalation">Définition d'escalade de service</a><br>
- <a href="#hostdependency">Définition des dépendances d'hôte</a><br>
- <a href="#hostescalation">Définition d'escalade d'hôte</a><br>
- <a href="#hostextinfo">Définition des informations étendues d'hôte</a><br>
-<a href="#serviceextinfo">Définition des informations étendues de service</a><br>
+<a href="#host">Définition d'hôte</a><br />
+ <a href="#hostgroup">Définition de groupe d'hôtes</a><br />
+ <a href="#service">Définition de service</a><br />
+ <a href="#servicegroup">Définition de groupe de service</a><br />
+ <a href="#contact">Définition de contact</a><br />
+ <a href="#contactgroup">Définition de groupe de contacts</a><br />
+ <a href="#timeperiod">Définition de période</a><br />
+ <a href="#command">Définition de commande</a><br />
+ <a href="#servicedependency">Définition des dépendances de service</a><br />
+ <a href="#serviceescalation">Définition d'escalade de service</a><br />
+ <a href="#hostdependency">Définition des dépendances d'hôte</a><br />
+ <a href="#hostescalation">Définition d'escalade d'hôte</a><br />
+ <a href="#hostextinfo">Définition des informations étendues d'hôte</a><br />
+<a href="#serviceextinfo">Définition des informations étendues de service</a><br />
</p>
<p>
<a name="host"></a>
diff --git a/misc/checkInterval.php b/misc/checkInterval.php
index 7eed6fe4cf2ffed5e012a5e32c84f0c9c249a18a..02e8deb69be521045c93452b1283cb81fe637045 100644
--- a/misc/checkInterval.php
+++ b/misc/checkInterval.php
@@ -35,11 +35,11 @@
if ($old_time == 0){
$i = $data["ctime"];
$is = $i / 60;
- print date ("G:i:s (d)", $data["ctime"]) . " <br>\n";
+ print date ("G:i:s (d)", $data["ctime"]) . " <br />\n";
} else {
$i = $data["ctime"] - $old_time;
$is = $i / 60;
- print date ("G:i:s (d)", $data["ctime"]) . " : " . $data["ctime"] . " - " .$old_time . " = ". $i." sec (".$is.")<br>\n";
+ print date ("G:i:s (d)", $data["ctime"]) . " : " . $data["ctime"] . " - " .$old_time . " = ". $i." sec (".$is.")<br />\n";
}
$old_time = $data["ctime"];
}
diff --git a/www/alt_main.php b/www/alt_main.php
index f8c02429da003f8cdf43d78f112e7e12913c06bd..bdf08fa0fbaa005d89ffee10e7634b2b2aafe58f 100644
--- a/www/alt_main.php
+++ b/www/alt_main.php
@@ -48,7 +48,7 @@ For information : contact@oreon-project.org
<td width="<?php print (100 - $Logs->Service_health) * 1.7 ; ?>" bgcolor="#999999"><?phpif ($Logs->Service_health != 100) print "<img src='./img/blank.gif' width='1' height='1'>"; ?></td>
<td width="15"> </td>
</tr>
- </table><br>
+ </table><br />
</td>
</tr>
<tr>
diff --git a/www/footer.php b/www/footer.php
index 10f1985fcbde1a04a46d1114107823514f431566..ea5238aa4f5d154f3bdc2d97075b25d565da0c58 100644
--- a/www/footer.php
+++ b/www/footer.php
@@ -31,7 +31,7 @@ For information : contact@oreon-project.org
<tr>
<td align='center' class='copyRight'>
Generated in <?php $time_end = microtime_float(); $now = $time_end - $time_start; print round($now,3) . $lang["time_sec"]; ?><br />
- Copyright © 1999-2007 Nagios - <a href="http://www.nagios.org/contact/">Ethan Galstad</a> | Copyright © 2004-2007 <a href="mailto:infos@oreon-project.org">Centreon</a><br>
+ Copyright © 1999-2007 Nagios - <a href="http://www.nagios.org/contact/">Ethan Galstad</a> | Copyright © 2004-2007 <a href="mailto:infos@oreon-project.org">Centreon</a><br />
All Rights Reserved<br />
</td>
</tr>
diff --git a/www/func.php b/www/func.php
index ccd6de323ef33cf5635e889d59414316763699be..2269286c213252f900316b94ab1c5d570b6a71f9 100644
--- a/www/func.php
+++ b/www/func.php
@@ -37,7 +37,7 @@ For information : contact@oreon-project.org
ORDER BY topology_order, topology_group ";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT->fetchInto($redirect);
return $redirect;
}
@@ -62,7 +62,7 @@ For information : contact@oreon-project.org
LIMIT 1";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$root_menu = array();
if ($DBRESULT->numRows())
$DBRESULT->fetchInto($root_menu);
diff --git a/www/header.php b/www/header.php
index 862ffdf86c20c3859f29ee0142b4461775d88d1e..069daf096d99da675bdc3ab23a730aca530de69b 100644
--- a/www/header.php
+++ b/www/header.php
@@ -59,18 +59,18 @@ For information : contact@oreon-project.org
* Delete Session Expired
*/
$DBRESULT =& $pearDB->query("SELECT session_expire FROM general_opt LIMIT 1");
- if (PEAR::isError($DBRESULT)) print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ if (PEAR::isError($DBRESULT)) print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT->fetchInto($session_expire);
$time_limit = time() - ($session_expire["session_expire"] * 60);
$DBRESULT =& $pearDB->query("DELETE FROM session WHERE last_reload < '".$time_limit."'");
- if (PEAR::isError($DBRESULT)) print "DB error Where deleting Sessions : ".$DBRESULT->getDebugInfo()."<br>";
+ if (PEAR::isError($DBRESULT)) print "DB error Where deleting Sessions : ".$DBRESULT->getDebugInfo()."<br />";
/*
* Get session and Check if session is not expired
*/
$DBRESULT =& $pearDB->query("SELECT user_id FROM session WHERE `session_id` = '".session_id()."'");
- if (PEAR::isError($DBRESULT)) print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ if (PEAR::isError($DBRESULT)) print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if (!$DBRESULT->numRows())
header("Location: index.php?disconnect=2");
@@ -119,7 +119,7 @@ For information : contact@oreon-project.org
# Skin path
$DBRESULT =& $pearDB->query("SELECT template FROM general_opt LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT->fetchInto($data);
$skin = "./Themes/".$data["template"]."/";
@@ -145,7 +145,7 @@ For information : contact@oreon-project.org
# Update Session Table For last_reload and current_page row
$DBRESULT =& $pearDB->query("UPDATE `session` SET `current_page` = '".$level1.$level2.$level3.$level4."',`last_reload` = '".time()."', `ip_address` = '".$_SERVER["REMOTE_ADDR"]."' WHERE CONVERT( `session_id` USING utf8 ) = '".session_id()."' AND `user_id` = '".$oreon->user->user_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error WHERE Updating Session : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error WHERE Updating Session : ".$DBRESULT->getDebugInfo()."<br />";
# Load traduction in the selected language.
is_file ("./lang/".$oreon->user->get_lang().".php") ? include_once ("./lang/".$oreon->user->get_lang().".php") : include_once ("./lang/en.php");
diff --git a/www/htmlHeader.php b/www/htmlHeader.php
index db18b165992a532a0e13df597ef4473171ccceb7..7b5559d2c3464ad07cc7443aac9b26c45c9975c9 100644
--- a/www/htmlHeader.php
+++ b/www/htmlHeader.php
@@ -70,7 +70,7 @@ For information : contact@oreon-project.org
$res = null;
$DBRESULT =& $pearDB->query("SELECT DISTINCT PathName_js, init FROM topology_JS WHERE id_page = '".$p."' AND (o = '" . $o . "' OR o IS NULL)");
if (PEAR::isError($DBRESULT))
- print $DBRESULT->getDebugInfo()."<br>";
+ print $DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($topology_js)){
if(!$ndo || ($ndo && $topology_js['PathName_js'] != "./include/common/javascript/ajaxMonitoring.js"))
echo "<script type='text/javascript' src='".$topology_js['PathName_js']."'></script> ";
@@ -94,7 +94,7 @@ For information : contact@oreon-project.org
$res = null;
$DBRESULT =& $pearDB->query("SELECT PathName_js, init FROM topology_JS WHERE id_page = '".$p."' AND (o = '" . $o . "' OR o IS NULL)");
- if (PEAR::isError($DBRESULT)) print $DBRESULT->getDebugInfo()."<br>";
+ if (PEAR::isError($DBRESULT)) print $DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($topology_js)){
if($topology_js['init'] == "initM") {
?>setTimeout('initM(<?php echo $tM; ?>,"<?php echo $sid; ?>","<?php echo $o;?>")', 0);<?php
diff --git a/www/include/common/autoNumLimit.php b/www/include/common/autoNumLimit.php
index 99ff7688e3d5bfc7a0512e1bea4cdad298bfe856..a0bc0e7e286efd89b2c4fc94235a6d87dd16b5f5 100644
--- a/www/include/common/autoNumLimit.php
+++ b/www/include/common/autoNumLimit.php
@@ -29,7 +29,7 @@ For information : contact@oreon-project.org
$pagination = "maxViewConfiguration";
$DBRESULT =& $pearDB->query("SELECT maxViewConfiguration FROM general_opt LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$gopt = array_map("myDecode", $DBRESULT->fetchRow());
$limit = $gopt["maxViewConfiguration"];
} else
diff --git a/www/include/common/common-Func-ACL.php b/www/include/common/common-Func-ACL.php
index 5c0049f91400c62376587a162d0aefb95b326eaf..b4cce77be4588e667188b86b076aa299da3935fc 100644
--- a/www/include/common/common-Func-ACL.php
+++ b/www/include/common/common-Func-ACL.php
@@ -24,23 +24,23 @@ For information : contact@oreon-project.org
if (session_id() == "") $uid = $_POST["sid"] ; else $uid = session_id();
$DBRESULT =& $pearDB->query("SELECT user_id FROM session WHERE session_id = '".$uid."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT->fetchInto($user);
$user_id = $user["user_id"];
$lcaServiceGroup = array();
$DBRESULT =& $pearDB->query("SELECT contactgroup_cg_id FROM contactgroup_contact_relation WHERE contact_contact_id = '".$user_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if ($DBRESULT->numRows()) {
while($DBRESULT->fetchInto($contactGroup)) {
$DBRESULT1 =& $pearDB->query("SELECT lca.lca_id, lca.lca_hg_childs FROM lca_define_contactgroup_relation ldcgr, lca_define lca WHERE ldcgr.contactgroup_cg_id = '".$contactGroup["contactgroup_cg_id"]."' AND ldcgr.lca_define_lca_id = lca.lca_id AND lca.lca_activate = '1'");
if (PEAR::isError($DBRESULT1))
- print "DB Error : ".$DBRESULT1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT1->getDebugInfo()."<br />";
if ($DBRESULT1->numRows())
while ($DBRESULT1->fetchInto($lca)) {
$DBRESULT2 =& $pearDB->query("SELECT sg_id, sg_name FROM servicegroup, lca_define_servicegroup_relation WHERE lca_define_lca_id = '".$lca["lca_id"]."' AND sg_id = servicegroup_sg_id");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while ($DBRESULT2->fetchInto($serviceGroup))
$lcaServiceGroup[$serviceGroup["sg_id"]] = $serviceGroup["sg_name"];
unset($DBRESULT2);
@@ -56,34 +56,34 @@ For information : contact@oreon-project.org
if (session_id() == "") $uid = $_POST["sid"]; else $uid = session_id();
$DBRESULT =& $pearDB->query("SELECT user_id FROM session WHERE session_id = '".$uid."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT->fetchInto($user);
$user_id = $user["user_id"];
$DBRESULT =& $pearDB->query("SELECT contactgroup_cg_id FROM contactgroup_contact_relation WHERE contact_contact_id = '".$user_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if ($DBRESULT->numRows()) {
while($DBRESULT->fetchInto($contactGroup)) {
$DBRESULT2 =& $pearDB->query("SELECT lca.lca_id, lca.lca_hg_childs FROM lca_define_contactgroup_relation ldcgr, lca_define lca WHERE ldcgr.contactgroup_cg_id = '".$contactGroup["contactgroup_cg_id"]."' AND ldcgr.lca_define_lca_id = lca.lca_id AND lca.lca_activate = '1'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
if ($DBRESULT2->numRows())
while ($DBRESULT2->fetchInto($lca)) {
$DBRESULT3 =& $pearDB->query("SELECT DISTINCT host_id, host_name FROM host, lca_define_host_relation ldr WHERE lca_define_lca_id = '".$lca["lca_id"]."' AND host_id = ldr.host_host_id");
if (PEAR::isError($DBRESULT3))
- print "DB Error : ".$DBRESULT3->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT3->getDebugInfo()."<br />";
while ($DBRESULT3->fetchInto($host))
$lcaHost[$host["host_id"]] = $host["host_name"];
$DBRESULT3 =& $pearDB->query("SELECT DISTINCT hg_id, hg_name FROM hostgroup, lca_define_hostgroup_relation WHERE lca_define_lca_id = '".$lca["lca_id"]."' AND hg_id = hostgroup_hg_id");
if (PEAR::isError($DBRESULT3))
- print "DB Error : ".$DBRESULT3->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT3->getDebugInfo()."<br />";
while ($DBRESULT3->fetchInto($hostGroup)) {
$lcaHostGroup[$hostGroup["hg_id"]] = $hostGroup["hg_name"];
# Apply the LCA to hosts contains in
if ($lca["lca_hg_childs"]) {
$DBRESULT4 =& $pearDB->query("SELECT h.host_name, hgr.host_host_id FROM hostgroup_relation hgr, host h WHERE hgr.hostgroup_hg_id = '".$hostGroup["hg_id"]."' AND h.host_id = hgr.host_host_id");
if (PEAR::isError($DBRESULT4))
- print "DB Error : ".$DBRESULT4->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT4->getDebugInfo()."<br />";
while ($DBRESULT4->fetchInto($host))
$lcaHost[$host["host_host_id"]] = $host["host_name"];
}
diff --git a/www/include/common/common-Func.php b/www/include/common/common-Func.php
index f94e3b1f235f2aed70d2fb8c1d08a99740de1903..507492b0448db3ecb5ae8025f2b985dff867e702 100644
--- a/www/include/common/common-Func.php
+++ b/www/include/common/common-Func.php
@@ -86,7 +86,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT host_template_model_htm_id FROM host WHERE host_id = '".$host_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
if ($row["host_template_model_htm_id"])
return $row["host_template_model_htm_id"];
@@ -99,7 +99,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT host_name FROM host WHERE host_id = '".$host_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
if ($row["host_name"])
return $row["host_name"];
@@ -110,7 +110,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT host_register FROM host WHERE host_id = '".$host_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
if ($row["host_register"])
return true;
@@ -124,7 +124,7 @@ For information : contact@oreon-project.org
while(1) {
$DBRESULT =& $pearDB->query("SELECT host_address, host_template_model_htm_id FROM host WHERE host_id = '".$host_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
if ($row["host_address"])
return html_entity_decode($row["host_address"], ENT_QUOTES);
@@ -141,7 +141,7 @@ For information : contact@oreon-project.org
while(1) {
$DBRESULT =& $pearDB->query("SELECT host_address, host_template_model_htm_id FROM host WHERE host_name = '".$host_name."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
if ($row["host_address"])
return html_entity_decode($row["host_address"], ENT_QUOTES);
@@ -158,11 +158,11 @@ For information : contact@oreon-project.org
while(1) {
$DBRESULT =& $pearDB->query("SELECT host_template_model_htm_id AS tpl FROM host WHERE host_id = '".$host_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$host = clone($DBRESULT->fetchRow());
$DBRESULT =& $pearDB->query("SELECT hpr.host_parent_hp_id FROM host_hostparent_relation hpr WHERE hpr.host_host_id = '".$host_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if ($DBRESULT->numRows())
return $DBRESULT;
else if (isset($host["tpl"]) && $host["tpl"])
@@ -178,7 +178,7 @@ For information : contact@oreon-project.org
$hgs = array();
$DBRESULT =& $pearDB->query("SELECT hg.hg_name, hgr.hostgroup_hg_id FROM hostgroup hg, hostgroup_relation hgr WHERE hgr.host_host_id = '".$host_id."' AND hgr.hostgroup_hg_id = hg.hg_id");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($hg))
$hgs[$hg["hostgroup_hg_id"]] = html_entity_decode($hg["hg_name"], ENT_QUOTES);
return $hgs;
@@ -192,7 +192,7 @@ For information : contact@oreon-project.org
while(1) {
$DBRESULT =& $pearDB->query("SELECT host_snmp_community, host_template_model_htm_id FROM host WHERE host_id = '".$host_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
if ($row["host_snmp_community"])
return $row["host_snmp_community"];
@@ -203,14 +203,14 @@ For information : contact@oreon-project.org
foreach ($hgs as $key=>$value) {
$DBRESULT =& $pearDB->query("SELECT hg_snmp_community FROM hostgroup WHERE hg_id = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
if ($row["hg_snmp_community"])
return html_entity_decode($row["hg_snmp_community"], ENT_QUOTES);
}
$DBRESULT =& $pearDB->query("SELECT snmp_community FROM general_opt LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
if (isset($row["snmp_community"]))
return html_entity_decode($row["snmp_community"], ENT_QUOTES);
@@ -228,7 +228,7 @@ For information : contact@oreon-project.org
while(1) {
$DBRESULT =& $pearDB->query("SELECT host_snmp_version, host_template_model_htm_id FROM host WHERE host_id = '".$host_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
if ($row["host_snmp_version"])
return $row["host_snmp_version"];
@@ -239,14 +239,14 @@ For information : contact@oreon-project.org
foreach ($hgs as $key=>$value) {
$DBRESULT =& $pearDB->query("SELECT hg_snmp_version FROM hostgroup WHERE hg_id = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
if ($row["hg_snmp_version"])
return html_entity_decode($row["hg_snmp_version"], ENT_QUOTES);
}
$DBRESULT =& $pearDB->query("SELECT snmp_version FROM general_opt LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
if (isset($row["snmp_version"]))
return html_entity_decode($row["snmp_version"], ENT_QUOTES);
@@ -264,7 +264,7 @@ For information : contact@oreon-project.org
while(1) {
$DBRESULT =& $pearDB->query("SELECT ".$field.", host_template_model_htm_id FROM host WHERE host_id = '".$host_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
//$field_result = $row[$field];
if (isset($row[$field]) && $row[$field])
@@ -282,7 +282,7 @@ For information : contact@oreon-project.org
while(1) {
$DBRESULT =& $pearDB->query("SELECT ehi.".$field.", h.host_template_model_htm_id FROM host h, extended_host_information ehi WHERE ehi.host_host_id = '".$host_id."' AND h.host_id = '".$host_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
//$field_result = $row[$field];
if (isset($row[$field]) && $row[$field])
@@ -301,7 +301,7 @@ For information : contact@oreon-project.org
while(1) {
$DBRESULT =& $pearDB->query("SELECT host_name, host_template_model_htm_id FROM host WHERE host_id = '".$host_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
if ($row["host_name"])
$tplArr[$host_id] = html_entity_decode($row["host_name"], ENT_QUOTES);
@@ -324,7 +324,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT hg_name FROM hostgroup WHERE hg_id = '".$hg_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
if ($row["hg_name"])
return html_entity_decode($row["hg_name"], ENT_QUOTES);
@@ -338,7 +338,7 @@ For information : contact@oreon-project.org
// $DBRESULT =& $pearDB->query("SELECT host_host_id FROM hostgroup_relation WHERE hostgroup_hg_id = '".$hg_id."'");
$DBRESULT =& $pearDB->query("SELECT hgr.host_host_id FROM hostgroup_relation hgr, host h WHERE hgr.hostgroup_hg_id = '".$hg_id."' AND h.host_id = hgr.host_host_id ORDER by h.host_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($elem))
$hosts[$elem["host_host_id"]] = $elem["host_host_id"];
$DBRESULT->free();
@@ -350,7 +350,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT hg_snmp_community FROM hostgroup WHERE hg_id = '".$hg_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
if ($row["hg_snmp_community"])
return html_entity_decode($row["hg_snmp_community"], ENT_QUOTES);
@@ -362,7 +362,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT hg_snmp_version FROM hostgroup WHERE hg_id = '".$hg_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
if ($row["hg_snmp_version"])
return html_entity_decode($row["hg_snmp_version"], ENT_QUOTES);
@@ -378,7 +378,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT sg_name FROM servicegroup WHERE sg_id = '".$sg_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
if ($row["sg_name"])
return html_entity_decode($row["sg_name"], ENT_QUOTES);
@@ -396,7 +396,7 @@ For information : contact@oreon-project.org
"AND service.service_id = servicegroup_relation.service_service_id " .
"AND servicegroup_relation.host_host_id IS NOT NULL");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($elem)) {
$elem["service_description"] = str_replace('#S#', "/", $elem["service_description"]);
$elem["service_description"] = str_replace('#BS#', "\\", $elem["service_description"]);
@@ -409,7 +409,7 @@ For information : contact@oreon-project.org
"AND service.service_id = servicegroup_relation.service_service_id " .
"AND servicegroup_relation.hostgroup_hg_id IS NOT NULL");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($elem)) {
$elem["service_description"] = str_replace('#S#', "/", $elem["service_description"]);
$elem["service_description"] = str_replace('#BS#', "\\", $elem["service_description"]);
@@ -431,7 +431,7 @@ For information : contact@oreon-project.org
while(1) {
$DBRESULT =& $pearDB->query("SELECT ".$field.", service_template_model_stm_id FROM service WHERE service_id = '".$service_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
$field_result = $row[$field];
if ($row[$field])
@@ -449,7 +449,7 @@ For information : contact@oreon-project.org
while(1) {
$DBRESULT =& $pearDB->query("SELECT `extended_service_information`.`".$field."`, `service`.`service_template_model_stm_id` FROM `service`, `extended_service_information` WHERE `extended_service_information`.`service_service_id` = '".$service_id."' AND `service`.`service_id` = '".$service_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
$field_result = $row[$field];
if ($row[$field])
@@ -467,7 +467,7 @@ For information : contact@oreon-project.org
while(1) {
$DBRESULT =& $pearDB->query("SELECT service_description, service_template_model_stm_id FROM service WHERE service_id = '".$service_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
if ($row["service_description"]) {
$row["service_description"] = str_replace('#S#', "/", $row["service_description"]);
@@ -487,7 +487,7 @@ For information : contact@oreon-project.org
while(1) {
$DBRESULT =& $pearDB->query("SELECT service_alias, service_template_model_stm_id FROM service WHERE service_id = '".$service_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
if ($row["service_alias"]) {
$row["service_alias"] = str_replace('#S#', "/", $row["service_alias"]);
@@ -507,7 +507,7 @@ For information : contact@oreon-project.org
while(1) {
$DBRESULT =& $pearDB->query("SELECT esi.graph_id, service_template_model_stm_id FROM service, extended_service_information esi WHERE service_id = '".$service_id."' AND esi.service_service_id = service_id LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
if ($row["graph_id"])
return $row["graph_id"];
@@ -529,7 +529,7 @@ For information : contact@oreon-project.org
"WHERE hsr.host_host_id = '".$host_id."' AND hsr.service_service_id = service_id " .
"AND service_description = '".$service_description."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
# Service is directely link to a host, no problem
if ($row["service_id"])
@@ -539,7 +539,7 @@ For information : contact@oreon-project.org
" WHERE hgr.host_host_id = '".$host_id."' AND hsr.hostgroup_hg_id = hgr.hostgroup_hg_id" .
" AND service_id = hsr.service_service_id AND service_description = '".$service_description."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
if ($row["service_id"])
return $row["service_id"];
@@ -547,7 +547,7 @@ For information : contact@oreon-project.org
if ($hg_id) {
$DBRESULT =& $pearDB->query("SELECT service_id FROM service, host_service_relation hsr WHERE hsr.hostgroup_hg_id = '".$hg_id."' AND hsr.service_service_id = service_id AND service_description = '".$service_description."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
if ($row["service_id"])
return $row["service_id"];
@@ -561,7 +561,7 @@ For information : contact@oreon-project.org
$hSvs = array();
$DBRESULT =& $pearDB->query("SELECT service_id, service_description FROM service, host_service_relation hsr WHERE hsr.host_host_id = '".$host_id."' AND hsr.service_service_id = service_id");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($elem)) {
$elem["service_description"] = str_replace('#S#', '/', $elem["service_description"]);
$elem["service_description"] = str_replace('#BS#', '\\', $elem["service_description"]);
@@ -572,7 +572,7 @@ For information : contact@oreon-project.org
" WHERE hgr.host_host_id = '".$host_id."' AND hsr.hostgroup_hg_id = hgr.hostgroup_hg_id" .
" AND service_id = hsr.service_service_id");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($elem))
$hSvs[$elem["service_id"]] = html_entity_decode($elem["service_description"], ENT_QUOTES);
$DBRESULT->free();
@@ -585,14 +585,14 @@ For information : contact@oreon-project.org
$hosts = array();
$DBRESULT =& $pearDB->query("SELECT host_host_id, hostgroup_hg_id FROM host_service_relation hsr WHERE hsr.service_service_id = '".$service_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($elem)) {
if ($elem["host_host_id"])
$hosts[$elem["host_host_id"]] = $elem["host_host_id"];
else if ($elem["hostgroup_hg_id"]){
$DBRESULT2 =& $pearDB->query("SELECT host_host_id FROM hostgroup_relation hgr WHERE hgr.hostgroup_hg_id = '".$elem["hostgroup_hg_id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while ($DBRESULT2->fetchInto($elem2))
$hosts[$elem2["host_host_id"]] = $elem2["host_host_id"];
$DBRESULT2->free();
@@ -608,7 +608,7 @@ For information : contact@oreon-project.org
$hosts = array();
$DBRESULT =& $pearDB->query("SELECT DISTINCT host_host_id FROM host_service_relation hsr WHERE hsr.service_service_id = '".$service_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($elem))
if ($elem["host_host_id"])
$hosts[$elem["host_host_id"]] = $elem["host_host_id"];
@@ -622,7 +622,7 @@ For information : contact@oreon-project.org
$hgs = array();
$DBRESULT =& $pearDB->query("SELECT DISTINCT hostgroup_hg_id FROM host_service_relation hsr WHERE hsr.service_service_id = '".$service_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($elem))
if ($elem["hostgroup_hg_id"])
$hgs[$elem["hostgroup_hg_id"]] = $elem["hostgroup_hg_id"];
@@ -637,7 +637,7 @@ For information : contact@oreon-project.org
$service_description = str_replace('\\', "#BS#", $service_description);
$DBRESULT =& $pearDB->query("SELECT service_id FROM service WHERE service_description = '".htmlentities($service_description, ENT_QUOTES)."' AND service_register = '0' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
if ($row["service_id"])
return $row["service_id"];
@@ -650,12 +650,12 @@ For information : contact@oreon-project.org
while(1) {
$DBRESULT =& $pearDB->query("SELECT command_command_id, service_template_model_stm_id FROM service WHERE service_id = '".$service_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
if ($row["command_command_id"]) {
$DBRESULT2 =& $pearDB->query("SELECT command_name FROM command WHERE command_id = '".$row["command_command_id"]."' LIMIT 1");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$row2 =& $DBRESULT2->fetchRow();
if (strstr($row2["command_name"], "check_graph_"))
return true;
@@ -677,7 +677,7 @@ For information : contact@oreon-project.org
while(1) {
$DBRESULT =& $pearDB->query("SELECT service_description, service_template_model_stm_id FROM service WHERE service_id = '".$service_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
if ($row["service_description"])
$tplArr[$service_id] = html_entity_decode($row["service_description"], ENT_QUOTES);
@@ -701,12 +701,12 @@ For information : contact@oreon-project.org
while(1) {
$DBRESULT =& $pearDB->query("SELECT command_command_id, service_template_model_stm_id FROM service WHERE service_id = '".$service_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
if ($row["command_command_id"]) {
$DBRESULT2 =& $pearDB->query("SELECT command_name FROM command WHERE command_id = '".$row["command_command_id"]."' LIMIT 1");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$row2 =& $DBRESULT2->fetchRow();
return ($row2["command_name"]);
}
@@ -724,7 +724,7 @@ For information : contact@oreon-project.org
while(1) {
$DBRESULT =& $pearDB->query("SELECT command_command_id_arg, service_template_model_stm_id FROM service WHERE service_id = '".$service_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
if ($row["command_command_id_arg"]) {
$row["command_command_id_arg"] = str_replace('#BR#', "\\n", $row["command_command_id_arg"]);
@@ -749,7 +749,7 @@ For information : contact@oreon-project.org
$arg = NULL;
$DBRESULT =& $pearDB->query("SELECT command_command_id, command_command_id_arg FROM service WHERE service_id = '".$service_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row =& $DBRESULT->fetchRow();
if ($row["command_command_id_arg"] && !$row["command_command_id"]) {
$row["command_command_id_arg"] = str_replace('#BR#', "\\n", $row["command_command_id_arg"]);
@@ -763,7 +763,7 @@ For information : contact@oreon-project.org
else if($row["command_command_id"] && !$row["command_command_id_arg"]) {
$DBRESULT2 =& $pearDB->query("SELECT command_name FROM command WHERE command_id = '".$row["command_command_id"]."' LIMIT 1");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$row2 =& $DBRESULT2->fetchRow();
// Uncomment if we want to take the template arg by default if it's not define in the current service
//$arg = getMyCheckCmdArg($service_id);
@@ -777,7 +777,7 @@ For information : contact@oreon-project.org
$row["command_command_id_arg"] = str_replace('#BS#', "\\", $row["command_command_id_arg"]);
$DBRESULT2 =& $pearDB->query("SELECT command_name FROM command WHERE command_id = '".$row["command_command_id"]."' LIMIT 1");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$row2 =& $DBRESULT2->fetchRow();
return $row2["command_name"].$row["command_command_id_arg"];
}
@@ -794,7 +794,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT host_id FROM host WHERE host_name = '".htmlentities($host_name, ENT_QUOTES)."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if ($DBRESULT->numRows()) {
$row =& $DBRESULT->fetchRow();
return $row["host_id"];
@@ -807,7 +807,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT hg_id FROM hostgroup WHERE hg_name = '".htmlentities($hostgroup_name, ENT_QUOTES)."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if ($DBRESULT->numRows()) {
$row =& $DBRESULT->fetchRow();
return $row["hg_id"];
@@ -820,7 +820,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT sg_id FROM servicegroup WHERE sg_name = '".htmlentities($servicegroup_name, ENT_QUOTES)."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if ($DBRESULT->numRows()) {
$row =& $DBRESULT->fetchRow();
return $row["sg_id"];
@@ -833,7 +833,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT contact_id FROM contact WHERE contact_name = '".htmlentities($contact_name, ENT_QUOTES)."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if ($DBRESULT->numRows()) {
$row =& $DBRESULT->fetchRow();
return $row["contact_id"];
@@ -846,7 +846,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT cg_id FROM contactgroup WHERE cg_name = '".htmlentities($cg_name, ENT_QUOTES)."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if ($DBRESULT->numRows()) {
$row =& $DBRESULT->fetchRow();
return $row["cg_id"];
@@ -859,7 +859,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT command_id FROM command WHERE command_name = '".htmlentities($command_name, ENT_QUOTES)."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if ($DBRESULT->numRows()) {
$row =& $DBRESULT->fetchRow();
return $row["command_id"];
@@ -872,7 +872,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT tp_id FROM timeperiod WHERE tp_name = '".htmlentities($tp_name, ENT_QUOTES)."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if ($DBRESULT->numRows()) {
$row =& $DBRESULT->fetchRow();
return $row["tp_id"];
@@ -895,14 +895,14 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT graph_id FROM meta_service WHERE meta_id = '".$meta_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$gt =& $DBRESULT->fetchRow();
if ($gt["graph_id"])
return $gt["graph_id"];
else {
$DBRESULT =& $pearDB->query("SELECT graph_id FROM giv_graphs_template WHERE default_tpl1 = '1' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if ($DBRESULT->numRows()) {
$gt =& $DBRESULT->fetchRow();
return $gt["graph_id"];
@@ -910,7 +910,7 @@ For information : contact@oreon-project.org
}
$DBRESULT =& $pearDB->query("SELECT graph_id FROM giv_graphs_template LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if ($DBRESULT->numRows()) {
$gt =& $DBRESULT->fetchRow();
return $gt["graph_id"];
@@ -928,7 +928,7 @@ For information : contact@oreon-project.org
$command_id = getMyServiceField($service_id, "command_command_id");
$DBRESULT =& $pearDB->query("SELECT graph_id FROM command WHERE `command_id` = '".$command_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if ($DBRESULT->numRows()) {
$gt =& $DBRESULT->fetchRow();
return $gt["graph_id"];
@@ -936,7 +936,7 @@ For information : contact@oreon-project.org
}
$DBRESULT =& $pearDB->query("SELECT graph_id FROM giv_graphs_template WHERE default_tpl1 = '1' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if ($DBRESULT->numRows()) {
$gt =& $DBRESULT->fetchRow();
return $gt["graph_id"];
@@ -949,7 +949,7 @@ For information : contact@oreon-project.org
$ds = array();
$DBRESULT =& $pearDB->query("SELECT compo_id FROM giv_components_template WHERE default_tpl1 = '1' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if ($DBRESULT->numRows()) {
$ds =& $DBRESULT->fetchRow();
return $ds["compo_id"];
@@ -1047,7 +1047,7 @@ For information : contact@oreon-project.org
$hgs = array();
$DBRESULT =& $pearDB->query("SELECT DISTINCT * FROM hostgroup ORDER BY `hg_name`");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($hg))
$hgs[$hg["hg_id"]] = $hg["hg_name"];
return $hgs;
@@ -1111,7 +1111,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT host_id FROM host h,host_service_relation hsr WHERE h.host_id = hsr.host_host_id AND hsr.service_service_id = '".$service_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if ($DBRESULT->numRows()) {
$row =& $DBRESULT->fetchRow();
return $row["host_id"];
diff --git a/www/include/common/javascript/Timeline/src/main/webapp/api/scripts/sources.js b/www/include/common/javascript/Timeline/src/main/webapp/api/scripts/sources.js
index 258fb8e5feb1dd5d6c5118581c27620c0ca0037a..9c1bd8c65f8987880a94535e27c01874d477bacf 100644
--- a/www/include/common/javascript/Timeline/src/main/webapp/api/scripts/sources.js
+++ b/www/include/common/javascript/Timeline/src/main/webapp/api/scripts/sources.js
@@ -195,7 +195,7 @@ Timeline.DefaultEventSource.Event = function(
// Merethis modification by cedrick facon here
-// description = description.replace(/~br~/ig, "<br>");
+// description = description.replace(/~br~/ig, "<br />");
description = description.replace(/{/ig, "<");
description = description.replace(/}/ig, ">");
diff --git a/www/include/common/javascript/color_picker.html b/www/include/common/javascript/color_picker.html
index bb7ed3f6c8fea2c1fc42ac92898ba6f9fe81b25c..e18bc0678e653815555b6c61e8b8224232c74236 100644
--- a/www/include/common/javascript/color_picker.html
+++ b/www/include/common/javascript/color_picker.html
@@ -171,7 +171,7 @@
</td>
</tr>
</table>
- <br>
+ <br />
<table align="center">
<tr valign="center">
<td>Résultat :</td>
diff --git a/www/include/common/javascript/color_picker.php b/www/include/common/javascript/color_picker.php
index d9e259f57f83fa617e873e2919383e86d558113a..c5a63793d224705cfb426cda6831ecee3da6b0f5 100644
--- a/www/include/common/javascript/color_picker.php
+++ b/www/include/common/javascript/color_picker.php
@@ -182,7 +182,7 @@ $name2 = $n."_color";
</td>
</tr>
</table>
- <br>
+ <br />
<table align="center">
<tr valign="center">
<td><input type="button" name="btn_choose_color" value=" " style="background-color:#000000; border-color:#000000; width:100px; height:35px;"></td>
diff --git a/www/include/configuration/configCGI/DB-Func.php b/www/include/configuration/configCGI/DB-Func.php
index 7d551b3e265b8e8f360b8adce4fd506282758f61..cc70808c475afd15617da1a1de574b55395f414e 100644
--- a/www/include/configuration/configCGI/DB-Func.php
+++ b/www/include/configuration/configCGI/DB-Func.php
@@ -23,7 +23,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('cgi_id');
$DBRESULT =& $pearDB->query("SELECT cgi_name, cgi_id FROM cfg_cgi WHERE cgi_name = '".htmlentities($name, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$cgi =& $DBRESULT->fetchRow();
#Modif case
if ($DBRESULT->numRows() >= 1 && $cgi["cgi_id"] == $id)
@@ -41,10 +41,10 @@ For information : contact@oreon-project.org
global $oreon;
$DBRESULT =& $pearDB->query("UPDATE cfg_cgi SET cgi_activate = '0'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("UPDATE cfg_cgi SET cgi_activate = '1' WHERE cgi_id = '".$cgi_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function disableCGIInDB ($cgi_id = null) {
@@ -53,15 +53,15 @@ For information : contact@oreon-project.org
global $oreon;
$DBRESULT =& $pearDB->query("UPDATE cfg_cgi SET cgi_activate = '0' WHERE cgi_id = '".$cgi_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(cgi_id) FROM cfg_cgi WHERE cgi_id != '".$cgi_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$maxId =& $DBRESULT->fetchRow();
if (isset($maxId["MAX(cgi_id)"])) {
$DBRESULT =& $pearDB->query("UPDATE cfg_cgi SET cgi_activate = '1' WHERE cgi_id = '".$maxId["MAX(cgi_id)"]."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -70,18 +70,18 @@ For information : contact@oreon-project.org
foreach($cgi as $key=>$value)
$DBRESULT =& $pearDB->query("DELETE FROM cfg_cgi WHERE cgi_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT cgi_id FROM cfg_cgi WHERE cgi_activate = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if (!$DBRESULT->numRows()) {
$DBRESULT =& $pearDB->query("SELECT MAX(cgi_id) FROM cfg_cgi");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$cgi_id = $DBRESULT->fetchRow();
$DBRESULT =& $pearDB->query("UPDATE cfg_cgi SET cgi_activate = '1' WHERE cgi_id = '".$cgi_id["MAX(cgi_id)"]."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -90,7 +90,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT * FROM cfg_cgi WHERE cgi_id = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["cgi_id"] = '';
$row["cgi_activate"] = '0';
@@ -104,7 +104,7 @@ For information : contact@oreon-project.org
$val ? $rq = "INSERT INTO cfg_cgi VALUES (".$val.")" : $rq = null;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
@@ -164,17 +164,17 @@ For information : contact@oreon-project.org
isset($ret["cgi_activate"]["cgi_activate"]) && $ret["cgi_activate"]["cgi_activate"] != NULL ? $rq .= "'".$ret["cgi_activate"]["cgi_activate"]."')" : $rq .= "'0')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(cgi_id) FROM cfg_cgi");
$cgi_id = $DBRESULT->fetchRow();
if (isset($ret["cgi_activate"]["cgi_activate"]) && $ret["cgi_activate"]["cgi_activate"]) {
$DBRESULT =& $pearDB->query("UPDATE cfg_cgi SET cgi_activate = '0' WHERE cgi_id != '".$cgi_id["MAX(cgi_id)"]."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$oreon->CGIcfg = array();
$DBRESULT =& $pearDB->query("SELECT * FROM `cfg_cgi` WHERE `cgi_activate` = '1' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$oreon->CGIcfg = $DBRESULT->fetchRow();
}
return ($cgi_id["MAX(cgi_id)"]);
@@ -217,7 +217,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE cgi_id = '".$cgi_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if ($ret["cgi_activate"]["cgi_activate"])
enableCGIInDB($cgi_id);
}
diff --git a/www/include/configuration/configCGI/formCGI.php b/www/include/configuration/configCGI/formCGI.php
index 4206bbf85f3995a89018fcc779a51907997b6168..20a6d96bcb4ab4a15cdf00227319673c2c4b8731 100644
--- a/www/include/configuration/configCGI/formCGI.php
+++ b/www/include/configuration/configCGI/formCGI.php
@@ -23,7 +23,7 @@ For information : contact@oreon-project.org
if (($o == "c" || $o == "w") && $cgi_id) {
$DBRESULT =& $pearDB->query("SELECT * FROM cfg_cgi WHERE cgi_id = '".$cgi_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$cgi = array_map("myDecode", $DBRESULT->fetchRow());
}
@@ -34,7 +34,7 @@ For information : contact@oreon-project.org
$checkCmds = array();
$DBRESULT =& $pearDB->query("SELECT command_id, command_name FROM command ORDER BY command_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$checkCmds = array(NULL=>NULL);
while($DBRESULT->fetchInto($checkCmd))
$checkCmds[$checkCmd["command_id"]] = $checkCmd["command_name"];
@@ -49,7 +49,7 @@ For information : contact@oreon-project.org
$attrsText2 = array("size"=>"50");
$attrsText3 = array("size"=>"10");
$attrsTextarea = array("rows"=>"5", "cols"=>"40");
- $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br><br><br>{remove}</td><td>{selected}</td></tr></table>";
+ $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br /><br /><br />{remove}</td><td>{selected}</td></tr></table>";
#
## Form begin
diff --git a/www/include/configuration/configCGI/listCGI.php b/www/include/configuration/configCGI/listCGI.php
index c2224d5bbe7e681f8c43df09989e9a05884f9b53..f684bd5275305a45f48a8022e8bd77401fed0cc8 100644
--- a/www/include/configuration/configCGI/listCGI.php
+++ b/www/include/configuration/configCGI/listCGI.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
*/
$DBRESULT =& $pearDB->query("SELECT maxViewConfiguration FROM general_opt LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$gopt = array_map("myDecode", $DBRESULT->fetchRow());
!isset ($_GET["limit"]) ? $limit = $gopt["maxViewConfiguration"] : $limit = $_GET["limit"];
@@ -39,7 +39,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query("SELECT COUNT(*) FROM cfg_cgi $SearchTool");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp =& $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
@@ -75,7 +75,7 @@ For information : contact@oreon-project.org
$rq = "SELECT cgi_id, cgi_name, cgi_comment, cgi_activate FROM cfg_cgi ORDER BY cgi_name LIMIT ".$num * $limit.", ".$limit;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$form = new HTML_QuickForm('select_form', 'POST', "?p=".$p);
diff --git a/www/include/configuration/configGenerate/DB-Func.php b/www/include/configuration/configGenerate/DB-Func.php
index 383a84f7033a9cd3865c2de695192981ceeb9089..2f4720cca261aa2fbc0a97ca05575b8b4cf571af 100644
--- a/www/include/configuration/configGenerate/DB-Func.php
+++ b/www/include/configuration/configGenerate/DB-Func.php
@@ -21,7 +21,7 @@ For information : contact@oreon-project.org
$DBRESULT_relation =& $pearDB->query("SELECT * FROM ns_host_relation WHERE host_host_id = '".$host_id."' AND nagios_server_id = '".$instance_id."'");
if (PEAR::isError($DBRESULT_relation))
- print "DB Error : ".$DBRESULT_relation->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_relation->getDebugInfo()."<br />";
if ($DBRESULT_relation->numRows())
return 1;
else
@@ -33,7 +33,7 @@ For information : contact@oreon-project.org
$DBRESULT_relation =& $pearDB->query("SELECT localhost FROM nagios_server WHERE id = '".$instance_id."'");
if (PEAR::isError($DBRESULT_relation))
- print "DB Error : ".$DBRESULT_relation->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_relation->getDebugInfo()."<br />";
$data = $DBRESULT_relation->fetchRow();
return $data["localhost"];
}
@@ -72,11 +72,11 @@ For information : contact@oreon-project.org
$contact = array();
$DBRESULT =& $pearDB->query("SELECT contact_id FROM contact WHERE contact_activate ='1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($contact)) {
$DBRESULT2 =& $pearDB->query("SELECT DISTINCT cg.cg_activate FROM contactgroup_contact_relation cgcr, contactgroup cg WHERE cgcr.contact_contact_id = '".$contact["contact_id"]."' AND cg.cg_id = cgcr.contactgroup_cg_id");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($contactGroup)) {
if ($contactGroup["cg_activate"])
$cctEnb[$contact["contact_id"]] = 1;
@@ -89,7 +89,7 @@ For information : contact@oreon-project.org
$contactGroup = array();
$DBRESULT =& $pearDB->query("SELECT DISTINCT cgcr.contactgroup_cg_id, cgcr.contact_contact_id FROM contactgroup cg, contactgroup_contact_relation cgcr WHERE cg.cg_activate ='1' AND cgcr.contactgroup_cg_id = cg.cg_id");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($contactGroup))
array_key_exists($contactGroup["contact_contact_id"], $cctEnb) ? $cgEnb[$contactGroup["contactgroup_cg_id"]] = 1 : NULL;
unset($contactGroup);
@@ -98,7 +98,7 @@ For information : contact@oreon-project.org
$host = array();
$DBRESULT =& $pearDB->query("SELECT host_id FROM host WHERE host.host_register = '0' AND host.host_activate = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($host))
$hostEnb[$host["host_id"]] = 1;
$DBRESULT->free();
@@ -108,7 +108,7 @@ For information : contact@oreon-project.org
if ($oreon->user->get_version() == 2) {
$DBRESULT =& $pearDB->query("SELECT host_template_model_htm_id, host_id FROM host WHERE host.host_register = '1' AND host.host_activate = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($host)) {
# If the Host is link to a Template, we think that the dependencies are manage in the template
if ($host["host_template_model_htm_id"]) {
@@ -118,7 +118,7 @@ For information : contact@oreon-project.org
else {
$DBRESULT2 =& $pearDB->query("SELECT DISTINCT cghr.contactgroup_cg_id FROM contactgroup_host_relation cghr WHERE cghr.host_host_id = '".$host["host_id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($valid))
array_key_exists($valid["contactgroup_cg_id"], $cgEnb) ? $hostEnb[$host["host_id"]] = 1 : NULL;
$DBRESULT2->free();
@@ -126,7 +126,7 @@ For information : contact@oreon-project.org
}
$DBRESULT2 =& $pearDB->query("SELECT DISTINCT hg.hg_activate FROM hostgroup_relation hgr, hostgroup hg WHERE hgr.host_host_id = '".$host["host_id"]."' AND hg.hg_id = hgr.hostgroup_hg_id");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($hostGroup)) {
if ($hostGroup["hg_activate"])
$hostEnb[$host["host_id"]] = 1;
@@ -138,7 +138,7 @@ For information : contact@oreon-project.org
else {
$DBRESULT =& $pearDB->query("SELECT DISTINCT host_template_model_htm_id, host.host_id FROM host WHERE host.host_register = '1' AND host.host_activate = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($host)) {/*
# If the Host is link to a Template, we think that the dependencies are manage in the template
if ($host["host_template_model_htm_id"]) {
@@ -147,7 +147,7 @@ For information : contact@oreon-project.org
}*/
$DBRESULT2 =& $pearDB->query("SELECT DISTINCT hg.hg_activate FROM hostgroup_relation hgr, hostgroup hg WHERE hgr.host_host_id = '".$host["host_id"]."' AND hg.hg_id = hgr.hostgroup_hg_id");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
if ($DBRESULT2->numRows()) {
while($DBRESULT2->fetchInto($hostGroup))
if ($hostGroup["hg_activate"])
@@ -165,13 +165,13 @@ For information : contact@oreon-project.org
if ($oreon->user->get_version() == 1) {
$DBRESULT =& $pearDB->query("SELECT hg.hg_id FROM hostgroup hg WHERE hg.hg_activate = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($hostGroup)) {
$h = false;
$cg = false;
$DBRESULT2 =& $pearDB->query("SELECT DISTINCT hgr.host_host_id, cghgr.contactgroup_cg_id FROM hostgroup_relation hgr, contactgroup_hostgroup_relation cghgr WHERE hgr.hostgroup_hg_id = '".$hostGroup["hg_id"]."' AND cghgr.hostgroup_hg_id = '".$hostGroup["hg_id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($valid)) {
array_key_exists($valid["host_host_id"], $hostEnb) ? $h = true : NULL;
array_key_exists($valid["contactgroup_cg_id"], $cgEnb) ? $cg = true : NULL;
@@ -185,11 +185,11 @@ For information : contact@oreon-project.org
else if ($oreon->user->get_version() == 2) {
$DBRESULT =& $pearDB->query("SELECT DISTINCT hg.hg_id FROM hostgroup hg WHERE hg.hg_activate = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($hostGroup)) {
$DBRESULT2 =& $pearDB->query("SELECT DISTINCT hgr.host_host_id, hgr.hostgroup_hg_id FROM hostgroup_relation hgr WHERE hgr.hostgroup_hg_id = '".$hostGroup["hg_id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($hostGroup))
array_key_exists($hostGroup["host_host_id"], $hostEnb) ? $hgEnb[$hostGroup["hostgroup_hg_id"]] = 1 : NULL;
$DBRESULT2->free();
@@ -201,7 +201,7 @@ For information : contact@oreon-project.org
$service = array();
$DBRESULT =& $pearDB->query("SELECT DISTINCT sv.service_id FROM service sv WHERE sv.service_activate = '1' AND service_register = '0'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($service))
$svEnb[$service["service_id"]] = 1;
$DBRESULT->free();
@@ -209,7 +209,7 @@ For information : contact@oreon-project.org
$service = array();
$DBRESULT =& $pearDB->query("SELECT DISTINCT sv.service_id, sv.service_template_model_stm_id FROM service sv WHERE sv.service_activate = '1' AND service_register = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($service)) {
# If the Service is link to a Template, we think that the dependencies are manage in the template
if ($service["service_template_model_stm_id"] && array_key_exists($service["service_template_model_stm_id"], $svEnb))
@@ -220,7 +220,7 @@ For information : contact@oreon-project.org
$cg = false;
$DBRESULT2 =& $pearDB->query("SELECT DISTINCT hsr.host_host_id, hsr.hostgroup_hg_id, cgsr.contactgroup_cg_id FROM contactgroup_service_relation cgsr, host_service_relation hsr WHERE cgsr.service_service_id = '".$service["service_id"]."' AND hsr.service_service_id = '".$service["service_id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while ($DBRESULT2->fetchInto($valid)) {
array_key_exists($valid["host_host_id"], $hostEnb) ? $h = true : NULL;
array_key_exists($valid["hostgroup_hg_id"], $hgEnb) ? $hg = true : NULL;
@@ -236,11 +236,11 @@ For information : contact@oreon-project.org
$serviceGroup = array();
$DBRESULT =& $pearDB->query("SELECT sg_id FROM servicegroup sg WHERE sg.sg_activate = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($serviceGroup)) {
$DBRESULT2 =& $pearDB->query("SELECT sgr.service_service_id FROM servicegroup_relation sgr WHERE sgr.servicegroup_sg_id = '".$serviceGroup["sg_id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while ($DBRESULT2->fetchInto($valid))
array_key_exists($valid["service_service_id"], $svEnb) ? $sgEnb[$serviceGroup["sg_id"]] = 1 : NULL;
$DBRESULT2->free();
@@ -253,7 +253,7 @@ For information : contact@oreon-project.org
$osl = array();
$DBRESULT =& $pearDB->query("SELECT osl_id FROM osl WHERE osl_activate = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($osl))
$oslEnb[$osl["osl_id"]] = 1;
unset($osl);
@@ -264,7 +264,7 @@ For information : contact@oreon-project.org
$oms = array();
$DBRESULT =& $pearDB->query("SELECT meta_id FROM meta_service WHERE meta_activate = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($oms))
$omsEnb[$oms["meta_id"]] = 1;
unset($oms);
@@ -290,7 +290,7 @@ For information : contact@oreon-project.org
$contact = array();
$DBRESULT =& $pearDB->query("SELECT contact_id FROM contact WHERE contact_activate ='1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($contact))
$cctEnb[$contact["contact_id"]] = 1;
unset($contact);
@@ -300,7 +300,7 @@ For information : contact@oreon-project.org
$contactGroup = array();
$DBRESULT =& $pearDB->query("SELECT cg_id FROM contactgroup WHERE cg_activate ='1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($contactGroup))
$cgEnb[$contactGroup["cg_id"]] = 1;
unset($contactGroup);
@@ -310,7 +310,7 @@ For information : contact@oreon-project.org
$host = array();
$DBRESULT =& $pearDB->query("SELECT host_id FROM host WHERE host_activate = '1' AND host_register = '0'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($host))
$hostEnb[$host["host_id"]] = 1;
$DBRESULT->free();
@@ -320,7 +320,7 @@ For information : contact@oreon-project.org
$host = array();
$DBRESULT =& $pearDB->query("SELECT host_id, host_template_model_htm_id FROM host WHERE host_activate = '1' AND host_register = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($host)) {
if ($host["host_template_model_htm_id"]) {
if (array_key_exists($host["host_template_model_htm_id"], $hostEnb))
@@ -336,7 +336,7 @@ For information : contact@oreon-project.org
$hostGroup = array();
$DBRESULT =& $pearDB->query("SELECT hg.hg_id FROM hostgroup hg WHERE hg.hg_activate = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($hostGroup))
$hgEnb[$hostGroup["hg_id"]] = 1;
$DBRESULT->free();
@@ -346,7 +346,7 @@ For information : contact@oreon-project.org
$service = array();
$DBRESULT =& $pearDB->query("SELECT service_id FROM service WHERE service_activate = '1' AND service_register = '0'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($service))
$svEnb[$service["service_id"]] = 1;
$DBRESULT->free();
@@ -355,7 +355,7 @@ For information : contact@oreon-project.org
$service = array();
$DBRESULT =& $pearDB->query("SELECT service_id, service_template_model_stm_id FROM service WHERE service_activate = '1' AND service_register = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($service)) {
if ($service["service_template_model_stm_id"]) {
if (array_key_exists($service["service_template_model_stm_id"], $svEnb))
@@ -370,7 +370,7 @@ For information : contact@oreon-project.org
$serviceGroup = array();
$DBRESULT =& $pearDB->query("SELECT sg_id FROM servicegroup WHERE sg_activate = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($serviceGroup))
$sgEnb[$serviceGroup["sg_id"]] = 1;
unset($serviceGroup);
@@ -382,7 +382,7 @@ For information : contact@oreon-project.org
$osl = array();
$DBRESULT =& $pearDB->query("SELECT osl_id FROM osl WHERE osl_activate = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($osl))
$oslEnb[$osl["osl_id"]] = 1;
unset($osl);
@@ -393,7 +393,7 @@ For information : contact@oreon-project.org
$oms = array();
$DBRESULT =& $pearDB->query("SELECT meta_id FROM meta_service WHERE meta_activate = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($oms))
$omsEnb[$oms["meta_id"]] = 1;
unset($oms);
@@ -419,7 +419,7 @@ For information : contact@oreon-project.org
$contact = array();
$DBRESULT =& $pearDB->query("SELECT contact_id FROM contact");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($contact))
$cctEnb[$contact["contact_id"]] = 1;
unset($contact);
@@ -429,7 +429,7 @@ For information : contact@oreon-project.org
$contactGroup = array();
$DBRESULT =& $pearDB->query("SELECT cg_id FROM contactgroup");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($contactGroup))
$cgEnb[$contactGroup["cg_id"]] = 1;
unset($contactGroup);
@@ -439,7 +439,7 @@ For information : contact@oreon-project.org
$host = array();
$DBRESULT =& $pearDB->query("SELECT host_id FROM host");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($host))
$hostEnb[$host["host_id"]] = 1;
$DBRESULT->free();
@@ -449,7 +449,7 @@ For information : contact@oreon-project.org
$hostGroup = array();
$DBRESULT =& $pearDB->query("SELECT hg.hg_id FROM hostgroup hg");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($hostGroup))
$hgEnb[$hostGroup["hg_id"]] = 1;
$DBRESULT->free();
@@ -459,7 +459,7 @@ For information : contact@oreon-project.org
$service = array();
$DBRESULT =& $pearDB->query("SELECT service_id FROM service");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($service))
$svEnb[$service["service_id"]] = 1;
$DBRESULT->free();
@@ -468,7 +468,7 @@ For information : contact@oreon-project.org
$serviceGroup = array();
$DBRESULT =& $pearDB->query("SELECT sg_id FROM servicegroup");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($serviceGroup))
$sgEnb[$serviceGroup["sg_id"]] = 1;
unset($serviceGroup);
@@ -479,7 +479,7 @@ For information : contact@oreon-project.org
$osl = array();
$DBRESULT =& $pearDB->query("SELECT osl_id FROM osl");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($osl))
$oslEnb[$osl["osl_id"]] = 1;
unset($osl);
@@ -490,7 +490,7 @@ For information : contact@oreon-project.org
$oms = array();
$DBRESULT =& $pearDB->query("SELECT meta_id FROM meta_service");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($oms))
$omsEnb[$oms["meta_id"]] = 1;
unset($oms);
diff --git a/www/include/configuration/configGenerate/formGenerateFiles.ihtml b/www/include/configuration/configGenerate/formGenerateFiles.ihtml
index 08dd52ae1e4100555055fbdbb797c29f0de33058..7a580dce0731133a04674a5e0e80db8f6c130b2c 100644
--- a/www/include/configuration/configGenerate/formGenerateFiles.ihtml
+++ b/www/include/configuration/configGenerate/formGenerateFiles.ihtml
@@ -17,7 +17,7 @@
</table>
<div align="center" id="validForm"><p class="oreonbutton">{$form.submit.html}</p></div>
- <br><br><br><br>
+ <br /><br /><br /><br />
{if $msg_debug || $msg_copy || msg_restart }
<div>
<ul id="mainnav">
diff --git a/www/include/configuration/configGenerate/formGenerateFiles.php b/www/include/configuration/configGenerate/formGenerateFiles.php
index d3e46c39d6c88fa90e944b63d9d626e0494b23f7..3e3ab9697512c35ccdceb7fab93019f89ddd1ff2 100644
--- a/www/include/configuration/configGenerate/formGenerateFiles.php
+++ b/www/include/configuration/configGenerate/formGenerateFiles.php
@@ -31,7 +31,7 @@ For information : contact@oreon-project.org
$tab_nagios_server = array("0" => "All Nagios Servers");
$DBRESULT =& $pearDB->query("SELECT * FROM `nagios_server` ORDER BY `localhost` DESC");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($nagios =& $DBRESULT->fetchRow())
$tab_nagios_server[$nagios['id']] = $nagios['name'];
@@ -85,7 +85,7 @@ For information : contact@oreon-project.org
$DBRESULT_Servers =& $pearDB->query("SELECT `id`, `localhost` FROM `nagios_server` ORDER BY `name`");
if (PEAR::isError($DBRESULT_Servers))
- print "DB Error : ".$DBRESULT_Servers->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_Servers->getDebugInfo()."<br />";
while ($tab =& $DBRESULT_Servers->fetchRow()){
if (isset($ret["host"]) && $ret["host"] == 0 || $ret["host"] == $tab['id']){
unset($DBRESULT2);
@@ -119,7 +119,7 @@ For information : contact@oreon-project.org
*/
$DBRESULT_Servers =& $pearDB->query("SELECT `id`, `localhost` FROM `nagios_server` ORDER BY `localhost` DESC");
if (PEAR::isError($DBRESULT_Servers))
- print "DB Error : ".$DBRESULT_Servers->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_Servers->getDebugInfo()."<br />";
while ($tab =& $DBRESULT_Servers->fetchRow()){
if (isset($tab['localhost']) && $tab['localhost'])
if ($files = glob("./include/configuration/configGenerate/metaService/*.php"))
@@ -144,7 +144,7 @@ For information : contact@oreon-project.org
$tab_server = array();
$DBRESULT_Servers =& $pearDB->query("SELECT `name`, `id`, `localhost` FROM `nagios_server` ORDER BY `localhost` DESC");
if (PEAR::isError($DBRESULT_Servers))
- print "DB Error : ".$DBRESULT_Servers->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_Servers->getDebugInfo()."<br />";
while ($tab =& $DBRESULT_Servers->fetchRow()){
if (isset($ret["host"]) && $ret["host"] == 0 || $ret["host"] == $tab['id'])
$tab_server[$tab["id"]] = array("id" => $tab["id"], "name" => $tab["name"], "localhost" => $tab["localhost"]);
@@ -158,7 +158,7 @@ For information : contact@oreon-project.org
$msg_debug = array();
foreach ($tab_server as $host) {
$stdout = shell_exec($oreon->optGen["nagios_path_bin"] . " -v ".$nagiosCFGPath.$host["id"]."/nagiosCFG.DEBUG");
- $msg_debug[$host['id']] = str_replace ("\n", "<br>", $stdout);
+ $msg_debug[$host['id']] = str_replace ("\n", "<br />", $stdout);
$msg_debug[$host['id']] = str_replace ("Warning:", "<font color='orange'>Warning</font>", $msg_debug[$host['id']]);
$msg_debug[$host['id']] = str_replace ("Error:", "<font color='red'>Error</font>", $msg_debug[$host['id']]);
$msg_debug[$host['id']] = str_replace ("Total Warnings: 0", "<font color='green'>Total Warnings: 0</font>", $msg_debug[$host['id']]);
@@ -220,8 +220,8 @@ For information : contact@oreon-project.org
}
$DBRESULT =& $pearDB->query("UPDATE `nagios_server` SET `last_restart` = '".time()."' WHERE `id` = '".$host["id"]."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
- $msg_restart[$host["id"]] = "<br>".str_replace ("\n", "<br>", $stdout);
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
+ $msg_restart[$host["id"]] = "<br />".str_replace ("\n", "<br />", $stdout);
}
}
diff --git a/www/include/configuration/configGenerate/genCGICFG.php b/www/include/configuration/configGenerate/genCGICFG.php
index 2776304ae355c6108f92caa8ff1114f41fe5cbff..7dfc309836e52d1bfb29a1403a917c900ef27839 100644
--- a/www/include/configuration/configGenerate/genCGICFG.php
+++ b/www/include/configuration/configGenerate/genCGICFG.php
@@ -26,11 +26,11 @@ For information : contact@oreon-project.org
$handle = create_file($nagiosCFGPath.$tab['id']."/cgi.cfg", $oreon->user->get_name());
$res =& $pearDB->query("SELECT cfg_dir FROM `cfg_nagios` WHERE `nagios_activate` = '1' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$nagios = $res->fetchRow();
$DBRESULT =& $pearDB->query("SELECT * FROM `cfg_cgi` WHERE `cgi_activate` = '1' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if ($DBRESULT->numRows())
$cgi = $DBRESULT->fetchRow();
else
diff --git a/www/include/configuration/configGenerate/genCommands.php b/www/include/configuration/configGenerate/genCommands.php
index 3bfb71f7fb31ce437ceeffdba996558e1d32ed69..757458240900a1a82ba433d834d3c2790fe966ba 100644
--- a/www/include/configuration/configGenerate/genCommands.php
+++ b/www/include/configuration/configGenerate/genCommands.php
@@ -27,7 +27,7 @@ For information : contact@oreon-project.org
$handle2 = create_file($nagiosCFGPath.$tab['id']."/checkcommands.cfg", $oreon->user->get_name());
$DBRESULT =& $pearDB->query('SELECT * FROM `command` ORDER BY `command_type`,`command_name`');
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$command = array();
$i1 = 1;
$i2 = 1;
diff --git a/www/include/configuration/configGenerate/genContactGroups.php b/www/include/configuration/configGenerate/genContactGroups.php
index 5f6c4022e8bac9ef5922a132c45d884c5dc4add7..a6e6e6c7a8775db11c20a40ed5cd0369c77480c6 100644
--- a/www/include/configuration/configGenerate/genContactGroups.php
+++ b/www/include/configuration/configGenerate/genContactGroups.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
$handle = create_file($nagiosCFGPath.$tab['id']."/contactgroups.cfg", $oreon->user->get_name());
$DBRESULT =& $pearDB->query("SELECT * FROM contactgroup ORDER BY `cg_name`");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$contactGroup = array();
$i = 1;
$str = NULL;
@@ -48,7 +48,7 @@ For information : contact@oreon-project.org
$strTemp = NULL;
$DBRESULT2 =& $pearDB->query("SELECT cct.contact_id, cct.contact_name FROM contactgroup_contact_relation ccr, contact cct WHERE ccr.contactgroup_cg_id = '".$contactGroup["cg_id"]."' AND ccr.contact_contact_id = cct.contact_id ORDER BY `contact_name`");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($contact)) {
$BP = false;
array_key_exists($contact["contact_id"], $gbArr[0]) ? $BP = true : $BP = false;
diff --git a/www/include/configuration/configGenerate/genContacts.php b/www/include/configuration/configGenerate/genContacts.php
index f8cd51426c133d08f6efc3b1e60c74dea7f5d891..bf79d27aece5e3dac7a47d2bcf91a1f55434fb72 100644
--- a/www/include/configuration/configGenerate/genContacts.php
+++ b/www/include/configuration/configGenerate/genContacts.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
$handle = create_file($nagiosCFGPath.$tab['id']."/contacts.cfg", $oreon->user->get_name());
$DBRESULT =& $pearDB->query("SELECT * FROM contact ORDER BY `contact_name`");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$contact = array();
$i = 1;
$str = NULL;
@@ -50,7 +50,7 @@ For information : contact@oreon-project.org
$strTemp = NULL;
$DBRESULT2 =& $pearDB->query("SELECT cg.cg_name, cg.cg_id FROM contactgroup_contact_relation ccr, contactgroup cg WHERE ccr.contact_contact_id = '".$contact["contact_id"]."' AND ccr.contactgroup_cg_id = cg.cg_id ORDER BY `cg_name`");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($contactGroup)) {
$BP = false;
array_key_exists($contactGroup["cg_id"], $gbArr[1]) ? $BP = true : NULL;
@@ -66,7 +66,7 @@ For information : contact@oreon-project.org
$timeperiod = array();
$DBRESULT2 =& $pearDB->query("SELECT cct.timeperiod_tp_id AS cctTP1, cct.timeperiod_tp_id2 AS cctTP2, tp.tp_id, tp.tp_name FROM contact cct, timeperiod tp WHERE cct.contact_id = '".$contact["contact_id"]."' AND (tp.tp_id = cct.timeperiod_tp_id OR tp.tp_id = cct.timeperiod_tp_id2) ORDER BY `cctTP1`");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($timeperiod)) {
$timeperiod["cctTP1"] == $timeperiod["tp_id"] ? $str .= print_line("host_notification_period", $timeperiod["tp_name"]) : NULL;
$timeperiod["cctTP2"] == $timeperiod["tp_id"] ? $str .= print_line("service_notification_period", $timeperiod["tp_name"]) : NULL;
@@ -80,7 +80,7 @@ For information : contact@oreon-project.org
$strTemp = NULL;
$DBRESULT2 =& $pearDB->query("SELECT cmd.command_name FROM contact_hostcommands_relation chr, command cmd WHERE chr.contact_contact_id = '".$contact["contact_id"]."' AND chr.command_command_id = cmd.command_id ORDER BY `command_name`");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($command))
$strTemp != NULL ? $strTemp .= ", ".$command["command_name"] : $strTemp = $command["command_name"];
$DBRESULT2->free();
@@ -91,7 +91,7 @@ For information : contact@oreon-project.org
$strTemp = NULL;
$DBRESULT2 =& $pearDB->query("SELECT cmd.command_name FROM contact_servicecommands_relation csr, command cmd WHERE csr.contact_contact_id = '".$contact["contact_id"]."' AND csr.command_command_id = cmd.command_id ORDER BY `command_name`");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($command))
$strTemp != NULL ? $strTemp .= ", ".$command["command_name"] : $strTemp = $command["command_name"];
$DBRESULT2->free();
diff --git a/www/include/configuration/configGenerate/genDependencies.php b/www/include/configuration/configGenerate/genDependencies.php
index 0dac930bf756fcb32f2f9dc7df756a3e47835493..8f8718a3e61382437aedadb1e05dfc765f2df762 100644
--- a/www/include/configuration/configGenerate/genDependencies.php
+++ b/www/include/configuration/configGenerate/genDependencies.php
@@ -32,7 +32,7 @@ For information : contact@oreon-project.org
$rq = "SELECT * FROM dependency dep WHERE (SELECT DISTINCT COUNT(*) FROM dependency_hostParent_relation dhpr WHERE dhpr.dependency_dep_id = dep.dep_id) > 0 AND (SELECT DISTINCT COUNT(*) FROM dependency_hostChild_relation dhcr WHERE dhcr.dependency_dep_id = dep.dep_id) > 0";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$dependency = array();
$i = 1;
$str = "";
@@ -40,7 +40,7 @@ For information : contact@oreon-project.org
$BP = false;
$DBRESULT2 =& $pearDB->query("SELECT DISTINCT host.host_id, host.host_name FROM dependency_hostParent_relation dhpr, host, ns_host_relation nhr WHERE host.host_id = nhr.host_host_id AND nhr.nagios_server_id = '".$tab["id"]."' AND dhpr.dependency_dep_id = '".$dependency["dep_id"]."' AND host.host_id = dhpr.host_host_id");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$host = array();
$strTemp1 = "";
while ($DBRESULT2->fetchInto($host)) {
@@ -51,7 +51,7 @@ For information : contact@oreon-project.org
}
$DBRESULT2 =& $pearDB->query("SELECT DISTINCT host.host_id, host.host_name FROM dependency_hostChild_relation dhcr, host, ns_host_relation nhr WHERE host.host_id = nhr.host_host_id AND nhr.nagios_server_id = '".$tab["id"]."' AND dhcr.dependency_dep_id = '".$dependency["dep_id"]."' AND host.host_id = dhcr.host_host_id");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$host = array();
$strTemp2 = "";
while ($DBRESULT2->fetchInto($host)) {
@@ -91,7 +91,7 @@ For information : contact@oreon-project.org
$rq = "SELECT * FROM dependency dep WHERE (SELECT DISTINCT COUNT(*) FROM dependency_hostgroupParent_relation dhgpr WHERE dhgpr.dependency_dep_id = dep.dep_id) > 0 AND (SELECT DISTINCT COUNT(*) FROM dependency_hostgroupChild_relation dhgcr WHERE dhgcr.dependency_dep_id = dep.dep_id) > 0";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$dependency = array();
while($DBRESULT->fetchInto($dependency)) {
$BP = false;
@@ -100,7 +100,7 @@ For information : contact@oreon-project.org
$strDef = "";
$DBRESULT2 =& $pearDB->query("SELECT DISTINCT hostgroup.hg_id, hostgroup.hg_name FROM dependency_hostgroupParent_relation dhgpr, hostgroup WHERE dhgpr.dependency_dep_id = '".$dependency["dep_id"]."' AND hostgroup.hg_id = dhgpr.hostgroup_hg_id");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$hg = array();
$strTemp1 = "";
while ($DBRESULT2->fetchInto($hg)) {
@@ -115,7 +115,7 @@ For information : contact@oreon-project.org
$DBRESULT2->free();
$DBRESULT2 =& $pearDB->query("SELECT DISTINCT hostgroup.hg_id, hostgroup.hg_name FROM dependency_hostgroupChild_relation dhgcr, hostgroup WHERE dhgcr.dependency_dep_id = '".$dependency["dep_id"]."' AND hostgroup.hg_id = dhgcr.hostgroup_hg_id");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$hg = array();
$strTemp2 = "";
while ($DBRESULT2->fetchInto($hg)) {
@@ -160,7 +160,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query("SELECT * FROM dependency_serviceParent_relation dspr, dependency WHERE dependency.dep_id = dspr.dependency_dep_id");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($svPar)) {
$BP = false;
array_key_exists($svPar["service_service_id"], $gbArr[4]) ? $BP = true : "";
@@ -175,7 +175,7 @@ For information : contact@oreon-project.org
# Service Child
$DBRESULT2 =& $pearDB->query("SELECT * FROM dependency_serviceChild_relation WHERE dependency_dep_id = '".$svPar["dependency_dep_id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while ($DBRESULT2->fetchInto($svCh)) {
$BP = false;
array_key_exists($svCh["service_service_id"], $gbArr[4]) ? $BP = true : "";
@@ -223,13 +223,13 @@ For information : contact@oreon-project.org
$rq = "SELECT * FROM dependency dep WHERE (SELECT DISTINCT COUNT(*) FROM dependency_servicegroupParent_relation dsgpr WHERE dsgpr.dependency_dep_id = dep.dep_id) > 0 AND (SELECT DISTINCT COUNT(*) FROM dependency_servicegroupChild_relation dsgcr WHERE dsgcr.dependency_dep_id = dep.dep_id) > 0";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$dependency = array();
while($DBRESULT->fetchInto($dependency)) {
$BP = false;
$DBRESULT2 =& $pearDB->query("SELECT DISTINCT servicegroup.sg_id, servicegroup.sg_name FROM dependency_servicegroupParent_relation dsgpr, servicegroup WHERE dsgpr.dependency_dep_id = '".$dependency["dep_id"]."' AND servicegroup.sg_id = dsgpr.servicegroup_sg_id");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$sg = array();
$strTemp1 = "";
while ($DBRESULT2->fetchInto($sg)) {
@@ -242,7 +242,7 @@ For information : contact@oreon-project.org
$DBRESULT2->free();
$DBRESULT2 =& $pearDB->query("SELECT DISTINCT servicegroup.sg_id, servicegroup.sg_name FROM dependency_servicegroupChild_relation dsgcr, servicegroup WHERE dsgcr.dependency_dep_id = '".$dependency["dep_id"]."' AND servicegroup.sg_id = dsgcr.servicegroup_sg_id");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$sg= array();
$strTemp2 = "";
while ($DBRESULT2->fetchInto($sg)) {
diff --git a/www/include/configuration/configGenerate/genEscalations.php b/www/include/configuration/configGenerate/genEscalations.php
index d2f158470b4cc6370e59d58b5d1618a653142d20..25642bb41262b2cb3c5c06aab572372ac83cbd07 100644
--- a/www/include/configuration/configGenerate/genEscalations.php
+++ b/www/include/configuration/configGenerate/genEscalations.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
$handle = create_file($nagiosCFGPath.$tab['id']."/escalations.cfg", $oreon->user->get_name());
$DBRESULT =& $pearDB->query("SELECT DISTINCT esc.* FROM escalation_host_relation ehr, escalation esc WHERE ehr.escalation_esc_id = esc.esc_id ORDER BY esc.esc_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$escalation = array();
$i = 1;
$str = NULL;
@@ -36,7 +36,7 @@ For information : contact@oreon-project.org
$linkedToHost = 0;
$DBRESULT2 =& $pearDB->query("SELECT DISTINCT host.host_id, host.host_name FROM escalation_host_relation ehr, host , ns_host_relation nhr WHERE ehr.escalation_esc_id = '".$escalation["esc_id"]."' AND host.host_id = ehr.host_host_id AND host.host_id = nhr.host_host_id AND nhr.nagios_server_id = '".$tab['id']."' ");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$host = array();
$strTemp = NULL;
while ($DBRESULT2->fetchInto($host)) {
@@ -64,7 +64,7 @@ For information : contact@oreon-project.org
$strTemp = NULL;
$DBRESULT2 =& $pearDB->query("SELECT DISTINCT cg.cg_id, cg.cg_name FROM escalation_contactgroup_relation ecgr, contactgroup cg WHERE ecgr.escalation_esc_id = '".$escalation["esc_id"]."' AND ecgr.contactgroup_cg_id = cg.cg_id ORDER BY cg.cg_name");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($cg)) {
$BP = false;
array_key_exists($cg["cg_id"], $gbArr[1]) ? $BP = true : $BP = false;
@@ -84,7 +84,7 @@ For information : contact@oreon-project.org
if ($oreon->user->get_version() == 2) {
$DBRESULT2 =& $pearDB->query("SELECT tp_name FROM timeperiod WHERE tp_id = '".$escalation["escalation_period"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$tp =& $DBRESULT2->fetchRow();
if ($tp["tp_name"]) $strDef .= print_line("escalation_period", $tp["tp_name"]);
if ($escalation["escalation_options1"]) $strDef .= print_line("escalation_options", $escalation["escalation_options1"]);
@@ -102,13 +102,13 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query("SELECT DISTINCT esc.* FROM escalation_hostgroup_relation ehgr, escalation esc WHERE ehgr.escalation_esc_id = esc.esc_id ORDER BY esc.esc_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$escalation = array();
while($DBRESULT->fetchInto($escalation)) {
$BP = false;
$DBRESULT2 =& $pearDB->query("SELECT DISTINCT hg.hg_id, hg.hg_name FROM escalation_hostgroup_relation ehgr, hostgroup hg WHERE ehgr.escalation_esc_id = '".$escalation["esc_id"]."' AND hg.hg_id = ehgr.hostgroup_hg_id");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$hg = array();
$strTemp = NULL;
while ($DBRESULT2->fetchInto($hg)) {
@@ -134,7 +134,7 @@ For information : contact@oreon-project.org
$strTemp = NULL;
$DBRESULT2 =& $pearDB->query("SELECT DISTINCT cg.cg_id, cg.cg_name FROM escalation_contactgroup_relation ecgr, contactgroup cg WHERE ecgr.escalation_esc_id = '".$escalation["esc_id"]."' AND ecgr.contactgroup_cg_id = cg.cg_id ORDER BY cg.cg_name");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($cg)) {
$BP = false;
array_key_exists($cg["cg_id"], $gbArr[1]) ? $BP = true : $BP = false;
@@ -155,7 +155,7 @@ For information : contact@oreon-project.org
if ($oreon->user->get_version() == 2) {
$DBRESULT2 =& $pearDB->query("SELECT tp_name FROM timeperiod WHERE tp_id = '".$escalation["escalation_period"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$tp =& $DBRESULT2->fetchRow();
if ($tp["tp_name"]) $str .= print_line("escalation_period", $tp["tp_name"]);
if ($escalation["escalation_options1"]) $str .= print_line("escalation_options", $escalation["escalation_options1"]);
@@ -169,13 +169,13 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query("SELECT DISTINCT esc.* FROM escalation_servicegroup_relation esgr, escalation esc WHERE esgr.escalation_esc_id = esc.esc_id ORDER BY esc.esc_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$escalation = array();
while($DBRESULT->fetchInto($escalation)) {
$BP = false;
$DBRESULT2 =& $pearDB->query("SELECT DISTINCT sg.sg_id, sg.sg_name FROM escalation_servicegroup_relation esgr, servicegroup sg WHERE esgr.escalation_esc_id = '".$escalation["esc_id"]."' AND sg.sg_id = esgr.servicegroup_sg_id");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$sg = array();
$strTemp = NULL;
while ($DBRESULT2->fetchInto($sg)) {
@@ -200,7 +200,7 @@ For information : contact@oreon-project.org
$strTemp = NULL;
$DBRESULT2 =& $pearDB->query("SELECT DISTINCT cg.cg_id, cg.cg_name FROM escalation_contactgroup_relation ecgr, contactgroup cg WHERE ecgr.escalation_esc_id = '".$escalation["esc_id"]."' AND ecgr.contactgroup_cg_id = cg.cg_id ORDER BY cg.cg_name");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($cg)) {
$BP = false;
array_key_exists($cg["cg_id"], $gbArr[1]) ? $BP = true : $BP = false;
@@ -217,7 +217,7 @@ For information : contact@oreon-project.org
if ($oreon->user->get_version() == 2) {
$DBRESULT2 =& $pearDB->query("SELECT tp_name FROM timeperiod WHERE tp_id = '".$escalation["escalation_period"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$tp =& $DBRESULT2->fetchRow();
if ($tp["tp_name"]) $str .= print_line("escalation_period", $tp["tp_name"]);
if ($escalation["escalation_options2"]) $str .= print_line("escalation_options", $escalation["escalation_options2"]);
@@ -231,7 +231,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query("SELECT DISTINCT service.service_activate, service.service_description, esr.service_service_id FROM service, escalation_service_relation esr WHERE esr.service_service_id = service.service_id ORDER BY service.service_description");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($service)) {
$BP = false;
$generated = 0;
@@ -240,7 +240,7 @@ For information : contact@oreon-project.org
if ($BP) {
$DBRESULT2 =& $pearDB->query("SELECT * FROM escalation esc, escalation_service_relation esr WHERE esr.service_service_id = '".$service["service_service_id"]."' AND esc.esc_id = esr.escalation_esc_id ORDER BY esc.esc_name");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$escalation = array();
while($DBRESULT2->fetchInto($escalation)) {
$host = array();
@@ -268,7 +268,7 @@ For information : contact@oreon-project.org
$strTemp = NULL;
$DBRESULT3 =& $pearDB->query("SELECT DISTINCT cg.cg_id, cg.cg_name FROM escalation_contactgroup_relation ecgr, contactgroup cg WHERE ecgr.escalation_esc_id = '".$escalation["esc_id"]."' AND ecgr.contactgroup_cg_id = cg.cg_id ORDER BY cg.cg_name");
if (PEAR::isError($DBRESULT3))
- print "DB Error : ".$DBRESULT3->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT3->getDebugInfo()."<br />";
while($DBRESULT3->fetchInto($cg)) {
$BP = false;
array_key_exists($cg["cg_id"], $gbArr[1]) ? $BP = true : $BP = false;
@@ -285,7 +285,7 @@ For information : contact@oreon-project.org
if ($oreon->user->get_version() == 2) {
$DBRESULT4 =& $pearDB->query("SELECT tp_name FROM timeperiod WHERE tp_id = '".$escalation["escalation_period"]."'");
if (PEAR::isError($DBRESULT4))
- print "DB Error : ".$DBRESULT4->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT4->getDebugInfo()."<br />";
$tp =& $DBRESULT4->fetchRow();
$DBRESULT4->free();
if ($tp["tp_name"]) $strDef .= print_line("escalation_period", $tp["tp_name"]);
diff --git a/www/include/configuration/configGenerate/genExtendedInfos.php b/www/include/configuration/configGenerate/genExtendedInfos.php
index 10749961371d4e9b4f07c82014b490f31dbc76b9..d3b5c2341a4f64c1a2354d2b1551c2ffacc98e59 100644
--- a/www/include/configuration/configGenerate/genExtendedInfos.php
+++ b/www/include/configuration/configGenerate/genExtendedInfos.php
@@ -27,7 +27,7 @@ For information : contact@oreon-project.org
$handle = create_file($nagiosCFGPath.$tab['id']."/hostextinfo.cfg", $oreon->user->get_name());
$DBRESULT =& $pearDB->query("SELECT host_id, host_name FROM host WHERE host_register = '1' ORDER BY `host_name`");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$ehi = array();
$i = 1;
$str = NULL;
@@ -79,7 +79,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query("SELECT service_id FROM service WHERE service_register = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($esi)) {
$BP = false;
array_key_exists($esi["service_id"], $gbArr[4]) ? $BP = true : NULL;
diff --git a/www/include/configuration/configGenerate/genHostGroups.php b/www/include/configuration/configGenerate/genHostGroups.php
index 3ed94175e74a2529db391271b8d126d80076ba58..34f3b4e278dc90c14dc8cf0dfb33add9852ea706 100644
--- a/www/include/configuration/configGenerate/genHostGroups.php
+++ b/www/include/configuration/configGenerate/genHostGroups.php
@@ -31,7 +31,7 @@ For information : contact@oreon-project.org
$handle = create_file($nagiosCFGPath.$tab['id']."/hostgroups.cfg", $oreon->user->get_name());
$DBRESULT =& $pearDB->query("SELECT * FROM hostgroup ORDER BY `hg_name`");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$hostGroup = array();
$i = 1;
$str = NULL;
@@ -66,7 +66,7 @@ For information : contact@oreon-project.org
$strTemp = NULL;
$DBRESULT2 =& $pearDB->query("SELECT host.host_id, host.host_name FROM hostgroup_relation hgr, host WHERE hgr.hostgroup_hg_id = '".$hostGroup["hg_id"]."' AND hgr.host_host_id = host.host_id ORDER BY `host_name`");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($host)) {
$BP = false;
array_key_exists($host["host_id"], $gbArr[2]) ? $BP = true : NULL;
@@ -90,7 +90,7 @@ For information : contact@oreon-project.org
$strTemp = NULL;
$DBRESULT2 =& $pearDB->query("SELECT cg.cg_name, cg.cg_id FROM contactgroup_hostgroup_relation cghgr, contactgroup cg WHERE cghgr.hostgroup_hg_id = '".$hostGroup["hg_id"]."' AND cghgr.contactgroup_cg_id = cg.cg_id ORDER BY `cg_name`");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($contactGroup)) {
$BP = false;
array_key_exists($contactGroup["cg_id"], $gbArr[1]) ? $BP = true : NULL;
diff --git a/www/include/configuration/configGenerate/genHosts.php b/www/include/configuration/configGenerate/genHosts.php
index b65e919270ac581180706b29fc54f4a9a50b915b..e70da317fa36958cef2fbddc01a2d91c6d58c051 100644
--- a/www/include/configuration/configGenerate/genHosts.php
+++ b/www/include/configuration/configGenerate/genHosts.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
$handle = create_file($nagiosCFGPath.$tab['id']."/hosts.cfg", $oreon->user->get_name());
$DBRESULT =& $pearDB->query("SELECT * FROM host ORDER BY `host_register`, `host_name`");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$host = array();
$i = 1;
$str = NULL;
@@ -59,7 +59,7 @@ For information : contact@oreon-project.org
$hostTemplate = array();
$DBRESULT2 =& $pearDB->query("SELECT host.host_name FROM host WHERE host.host_id = '".$host["host_template_model_htm_id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($hostTemplate))
$str .= print_line("use", $hostTemplate["host_name"]);
$DBRESULT2->free();
@@ -77,11 +77,11 @@ For information : contact@oreon-project.org
$strTemp = NULL;
$DBRESULT2 =& $pearDB->query("SELECT host.host_id, host.host_name FROM host_hostparent_relation hhr, host WHERE hhr.host_host_id = '".$host["host_id"]."' AND hhr.host_parent_hp_id = host.host_id ORDER BY `host_name`");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($hostParent)) {
$DBRESULT3 =& $pearDB->query("SELECT * FROM ns_host_relation WHERE host_host_id = '".$hostParent["host_id"]."' AND nagios_server_id = '".$tab['id']."'");
if (PEAR::isError($DBRESULT3))
- print "DB Error : ".$DBRESULT3->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT3->getDebugInfo()."<br />";
if (verifyIfMustBeGenerated($host["host_id"], $gbArr[2], $ret) && $DBRESULT3->numRows())
$strTemp != NULL ? $strTemp .= ", ".$hostParent["host_name"] : $strTemp = $hostParent["host_name"];
}
@@ -96,7 +96,7 @@ For information : contact@oreon-project.org
$strTemp = NULL;
$DBRESULT2 =& $pearDB->query("SELECT hg.hg_id, hg.hg_name FROM hostgroup_relation hgr, hostgroup hg WHERE hgr.host_host_id = '".$host["host_id"]."' AND hgr.hostgroup_hg_id = hg.hg_id ORDER BY `hg_name`");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($hostGroup)) {
$BP = false;
array_key_exists($hostGroup["hg_id"], $gbArr[3]) ? $BP = true : NULL;
@@ -117,7 +117,7 @@ For information : contact@oreon-project.org
$command = array();
$DBRESULT2 =& $pearDB->query("SELECT cmd.command_name FROM command cmd WHERE cmd.command_id = '".$host["command_command_id"]."' LIMIT 1");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$host["command_command_id_arg2"] = removeSpecialChar($host["command_command_id_arg2"]);
@@ -137,7 +137,7 @@ For information : contact@oreon-project.org
$timePeriod = array();
$DBRESULT2 =& $pearDB->query("SELECT tp.tp_name FROM timeperiod tp WHERE tp.tp_id = '".$host["timeperiod_tp_id"]."' LIMIT 1");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($timePeriod))
$str .= print_line("check_period", $timePeriod["tp_name"]);
$DBRESULT2->free();
@@ -151,7 +151,7 @@ For information : contact@oreon-project.org
$command = array();
$DBRESULT2 =& $pearDB->query("SELECT cmd.command_name FROM command cmd WHERE cmd.command_id = '".$host["command_command_id2"]."' LIMIT 1");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$host["command_command_id_arg2"] = str_replace('#BR#', "\\n", $host["command_command_id_arg2"]);
$host["command_command_id_arg2"] = str_replace('#T#', "\\t", $host["command_command_id_arg2"]);
$host["command_command_id_arg2"] = str_replace('#R#', "\\r", $host["command_command_id_arg2"]);
@@ -176,7 +176,7 @@ For information : contact@oreon-project.org
$strTemp = NULL;
$DBRESULT2 =& $pearDB->query("SELECT cg.cg_id, cg.cg_name FROM contactgroup_host_relation chr, contactgroup cg WHERE chr.host_host_id = '".$host["host_id"]."' AND chr.contactgroup_cg_id = cg.cg_id ORDER BY `cg_name`");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($contactGroup)) {
$BP = false;
array_key_exists($contactGroup["cg_id"], $gbArr[1]) ? $BP = true : NULL;
@@ -195,7 +195,7 @@ For information : contact@oreon-project.org
$timePeriod = array();
$DBRESULT2 =& $pearDB->query("SELECT tp.tp_name FROM timeperiod tp WHERE tp.tp_id = '".$host["timeperiod_tp_id2"]."' LIMIT 1");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($timePeriod))
$str .= print_line("notification_period", $timePeriod["tp_name"]);
$DBRESULT2->free();
diff --git a/www/include/configuration/configGenerate/genNagiosCFG-DEBUG.php b/www/include/configuration/configGenerate/genNagiosCFG-DEBUG.php
index f4bd3f33cf5df363fb7aee6d2a0377a3083d83ef..4fac1ecf0d82c18b8e430c55faf8e0f15be02981 100644
--- a/www/include/configuration/configGenerate/genNagiosCFG-DEBUG.php
+++ b/www/include/configuration/configGenerate/genNagiosCFG-DEBUG.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
$handle = create_file($nagiosCFGPath.$tab['id']."/nagiosCFG.DEBUG", $oreon->user->get_name(), false);
$DBRESULT =& $pearDB->query("SELECT * FROM `cfg_nagios` WHERE `nagios_activate` = '1' AND `nagios_server_id` = '".$tab['id']."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$nagios = $DBRESULT->fetchRow();
$str = NULL;
$ret["comment"] ? ($str .= "# '".$nagios["nagios_name"]."'\n") : NULL;
@@ -116,56 +116,56 @@ For information : contact@oreon-project.org
else if ($key == "global_host_event_handler" && $value) {
$DBRESULT2 =& $pearDB->query("SELECT command_name FROM `command` WHERE command_id = '".$value."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$row = $DBRESULT2->fetchRow();
$str .= $key."=".$row["command_name"]."\n";
}
else if ($key == "global_service_event_handler" && $value) {
$DBRESULT2 =& $pearDB->query("SELECT command_name FROM `command` WHERE command_id = '".$value."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$row = $DBRESULT2->fetchRow();
$str .= $key."=".$row["command_name"]."\n";
}
else if ($key == "ocsp_command" && $value) {
$DBRESULT2 =& $pearDB->query("SELECT command_name FROM `command` WHERE command_id = '".$value."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$row = $DBRESULT2->fetchRow();
$str .= $key."=".$row["command_name"]."\n";
}
else if ($key == "ochp_command" && $value) {
$DBRESULT2 =& $pearDB->query("SELECT command_name FROM `command` WHERE command_id = '".$value."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$row = $DBRESULT2->fetchRow();
$str .= $key."=".$row["command_name"]."\n";
}
else if ($key == "host_perfdata_command`" && $value) {
$DBRESULT2 =& $pearDB->query("SELECT command_name FROM `command` WHERE command_id = '".$value."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$row = $DBRESULT2->fetchRow();
$str .= $key."=".$row["command_name"]."\n";
}
else if ($key == "service_perfdata_command" && $value) {
$DBRESULT2 =& $pearDB->query("SELECT command_name FROM `command` WHERE command_id = '".$value."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$row = $DBRESULT2->fetchRow();
$str .= $key."=".$row["command_name"]."\n";
}
else if ($key == "host_perfdata_file_processing_command" && $value) {
$DBRESULT2 =& $pearDB->query("SELECT command_name FROM `command` WHERE command_id = '".$value."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$row = $DBRESULT2->fetchRow();
$str .= $key."=".$row["command_name"]."\n";
}
else if ($key == "service_perfdata_file_processing_command" && $value) {
$DBRESULT2 =& $pearDB->query("SELECT command_name FROM `command` WHERE command_id = '".$value."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$row = $DBRESULT2->fetchRow();
$str .= $key."=".$row["command_name"]."\n";
}
diff --git a/www/include/configuration/configGenerate/genNagiosCFG.php b/www/include/configuration/configGenerate/genNagiosCFG.php
index d82052183403783ce1df74071e6a892a55a2d335..48834728b5edf85ae23815d0411faa0d8d536356 100644
--- a/www/include/configuration/configGenerate/genNagiosCFG.php
+++ b/www/include/configuration/configGenerate/genNagiosCFG.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
$handle = create_file($nagiosCFGPath.$tab['id']."/nagios.cfg", $oreon->user->get_name());
$DBRESULT =& $pearDB->query("SELECT * FROM `cfg_nagios` WHERE `nagios_activate` = '1' AND `nagios_server_id` = '".$tab['id']."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$nagios = $DBRESULT->fetchRow();
$str = NULL;
$ret["comment"] ? ($str .= "# '".$nagios["nagios_name"]."'\n") : NULL;
@@ -117,56 +117,56 @@ For information : contact@oreon-project.org
else if ($key == "global_host_event_handler" && $value) {
$DBRESULT2 =& $pearDB->query("SELECT command_name FROM `command` WHERE command_id = '".$value."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$row = $DBRESULT2->fetchRow();
$str .= $key."=".$row["command_name"]."\n";
}
else if ($key == "global_service_event_handler" && $value) {
$DBRESULT2 =& $pearDB->query("SELECT command_name FROM `command` WHERE command_id = '".$value."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$row = $DBRESULT2->fetchRow();
$str .= $key."=".$row["command_name"]."\n";
}
else if ($key == "ocsp_command" && $value) {
$DBRESULT2 =& $pearDB->query("SELECT command_name FROM `command` WHERE command_id = '".$value."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$row = $DBRESULT2->fetchRow();
$str .= $key."=".$row["command_name"]."\n";
}
else if ($key == "ochp_command" && $value) {
$DBRESULT2 =& $pearDB->query("SELECT command_name FROM `command` WHERE command_id = '".$value."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$row = $DBRESULT2->fetchRow();
$str .= $key."=".$row["command_name"]."\n";
}
else if ($key == "host_perfdata_command" && $value) {
$DBRESULT2 =& $pearDB->query("SELECT command_name FROM `command` WHERE command_id = '".$value."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$row = $DBRESULT2->fetchRow();
$str .= $key."=".$row["command_name"]."\n";
}
else if ($key == "service_perfdata_command" && $value) {
$DBRESULT2 =& $pearDB->query("SELECT command_name FROM `command` WHERE command_id = '".$value."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$row = $DBRESULT2->fetchRow();
$str .= $key."=".$row["command_name"]."\n";
}
else if ($key == "host_perfdata_file_processing_command" && $value) {
$DBRESULT2 =& $pearDB->query("SELECT command_name FROM `command` WHERE command_id = '".$value."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$row = $DBRESULT2->fetchRow();
$str .= $key."=".$row["command_name"]."\n";
}
else if ($key == "service_perfdata_file_processing_command" && $value) {
$DBRESULT2 =& $pearDB->query("SELECT command_name FROM `command` WHERE command_id = '".$value."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$row = $DBRESULT2->fetchRow();
$str .= $key."=".$row["command_name"]."\n";
} else {
diff --git a/www/include/configuration/configGenerate/genNdomod.php b/www/include/configuration/configGenerate/genNdomod.php
index 841b2ae5a1c6392f437942422e29e70978119d1c..df263d4a7918f887a51e510868f0788001cd8869 100644
--- a/www/include/configuration/configGenerate/genNdomod.php
+++ b/www/include/configuration/configGenerate/genNdomod.php
@@ -27,7 +27,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query("SELECT * FROM `cfg_ndomod` WHERE `activate` = '1' AND `ns_nagios_server` = '".$tab['id']."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT->numRows() ? $ndomod = $DBRESULT->fetchRow() : $ndomod = array();
diff --git a/www/include/configuration/configGenerate/genPerfparseCFG.php b/www/include/configuration/configGenerate/genPerfparseCFG.php
index b25de4765d0c4c1d4d91cf024294681a28b674e2..5356addb75e57a0d956071e4cc6c4caa919c5bc4 100644
--- a/www/include/configuration/configGenerate/genPerfparseCFG.php
+++ b/www/include/configuration/configGenerate/genPerfparseCFG.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
$handle = create_file($nagiosCFGPath.$tab['id']."/perfparse.cfg", $oreon->user->get_name());
$DBRESULT =& $pearDB->query("SELECT * FROM `cfg_perfparse` WHERE `perfparse_activate` = '1' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if ($DBRESULT->numRows())
$perfparse = $DBRESULT->fetchRow();
else
diff --git a/www/include/configuration/configGenerate/genResourceCFG.php b/www/include/configuration/configGenerate/genResourceCFG.php
index a7d5f0562c269d30ca95dcba955696fe8e0847df..31229fb690d5aa629db0ee2ce9164af1786da234 100644
--- a/www/include/configuration/configGenerate/genResourceCFG.php
+++ b/www/include/configuration/configGenerate/genResourceCFG.php
@@ -25,7 +25,7 @@ For information : contact@oreon-project.org
$handle = create_file($nagiosCFGPath.$tab['id']."/resource.cfg", $oreon->user->get_name());
$DBRESULT =& $pearDB->query("SELECT * FROM `cfg_resource` WHERE `resource_activate` = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$str = NULL;
while ($DBRESULT->fetchInto($DBRESULTource)) {
$ret["comment"] ? ($str .= "# '".$DBRESULTource["resource_name"]."'\n") : NULL;
diff --git a/www/include/configuration/configGenerate/genServiceGroups.php b/www/include/configuration/configGenerate/genServiceGroups.php
index 17dfea49696068dbee1865c1cc17f37b854f2e99..87601751edd1e4481db3e29b4b9f7b8e4cf73813 100644
--- a/www/include/configuration/configGenerate/genServiceGroups.php
+++ b/www/include/configuration/configGenerate/genServiceGroups.php
@@ -28,7 +28,7 @@ For information : contact@oreon-project.org
$handle = create_file($nagiosCFGPath.$tab['id']."/servicegroups.cfg", $oreon->user->get_name());
$DBRESULT =& $pearDB->query("SELECT * FROM servicegroup ORDER BY `sg_name`");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$serviceGroup = array();
$i = 1;
@@ -65,7 +65,7 @@ For information : contact@oreon-project.org
"AND host.host_activate = '1' " .
"AND servicegroup_relation.host_host_id IS NOT NULL");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($service)){
isset($gbArr[4][$service["service_id"]]) ? $BP = true : NULL;
@@ -94,7 +94,7 @@ For information : contact@oreon-project.org
"AND hostgroup.hg_activate = '1' " .
"AND servicegroup_relation.hostgroup_hg_id IS NOT NULL ");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($service)){
isset($gbArr[4][$service["service_id"]]) ? $BP = true : NULL;
@@ -106,7 +106,7 @@ For information : contact@oreon-project.org
if ($BP){
$DBRESULT3 =& $pearDB->query("SELECT host_host_id FROM hostgroup_relation WHERE hostgroup_hg_id = '".$service["hg_id"]."'");
if (PEAR::isError($DBRESULT3))
- print "DB Error : ".$DBRESULT3->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT3->getDebugInfo()."<br />";
while($DBRESULT3->fetchInto($host)) {
$BP = false;
isset($gbArr[2][$host["host_host_id"]]) ? $BP = true : NULL;
diff --git a/www/include/configuration/configGenerate/genServices.php b/www/include/configuration/configGenerate/genServices.php
index 5f670b878213261dae79f1b61d10505b87d5317d..d7b64a906bec7b81f1d2f6f9adb7e54626ab1266 100644
--- a/www/include/configuration/configGenerate/genServices.php
+++ b/www/include/configuration/configGenerate/genServices.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
$handle = create_file($nagiosCFGPath.$tab['id']."/services.cfg", $oreon->user->get_name());
$DBRESULT =& $pearDB->query("SELECT * FROM service ORDER BY `service_register`, `service_description`");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$service = array();
$i = 1;
$str = NULL;
@@ -60,7 +60,7 @@ For information : contact@oreon-project.org
$strTMPTemp = NULL;
$DBRESULT2 =& $pearDB->query("SELECT hg.hg_id, hg.hg_name FROM host_service_relation hsr, hostgroup hg WHERE hsr.service_service_id ='".$service["service_id"]."' AND hsr.hostgroup_hg_id = hg.hg_id");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($hostGroup)) {
$BP = false;
array_key_exists($hostGroup["hg_id"], $gbArr[3]) ? $BP = true : NULL;
@@ -81,7 +81,7 @@ For information : contact@oreon-project.org
$strTMPTemp = NULL;
$DBRESULT2 =& $pearDB->query("SELECT host.host_id, host.host_name FROM host_service_relation hsr, host WHERE hsr.service_service_id ='".$service["service_id"]."' AND hsr.host_host_id = host.host_id");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($host)) {
$BP = false;
array_key_exists($host["host_id"], $gbArr[2]) ? $BP = true : NULL;
@@ -111,7 +111,7 @@ For information : contact@oreon-project.org
$serviceTemplate = array();
$DBRESULT2 =& $pearDB->query("SELECT service.service_description FROM service WHERE service.service_id = '".$service["service_template_model_stm_id"]."' LIMIT 1");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($serviceTemplate)) {
$serviceTemplate["service_description"] = str_replace('#S#', "/", $serviceTemplate["service_description"]);
$serviceTemplate["service_description"] = str_replace('#BS#', "\\", $serviceTemplate["service_description"]);
@@ -126,7 +126,7 @@ For information : contact@oreon-project.org
$strTMPTemp = NULL;
$DBRESULT2 =& $pearDB->query("SELECT DISTINCT sg.sg_id, sg.sg_name FROM servicegroup_relation sgr, servicegroup sg WHERE sgr.service_service_id = '".$service["service_id"]."' AND sgr.servicegroup_sg_id = sg.sg_id ORDER BY `sg_name`");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($serviceGroup)) {
$BP = false;
array_key_exists($serviceGroup["sg_id"], $gbArr[5]) ? $BP = true : NULL;
@@ -160,7 +160,7 @@ For information : contact@oreon-project.org
$timePeriod = array();
$DBRESULT2 =& $pearDB->query("SELECT tp.tp_name FROM timeperiod tp WHERE tp.tp_id = '".$service["timeperiod_tp_id"]."' LIMIT 1");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($timePeriod))
$strTMP .= print_line("check_period", $timePeriod["tp_name"]);
$DBRESULT2->free();
@@ -183,7 +183,7 @@ For information : contact@oreon-project.org
$service["command_command_id_arg2"] = str_replace('#BS#', "\\", $service["command_command_id_arg2"]);
$DBRESULT2 =& $pearDB->query("SELECT cmd.command_name FROM command cmd WHERE cmd.command_id = '".$service["command_command_id2"]."' LIMIT 1");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($command))
$strTMP .= print_line("event_handler", strstr($command["command_name"], "check_graph_") ? $command["command_name"].$service["command_command_id_arg2"]."!".$service["service_id"] : $command["command_name"].$service["command_command_id_arg2"]);
$DBRESULT2->free();
@@ -201,7 +201,7 @@ For information : contact@oreon-project.org
$timePeriod = array();
$DBRESULT2 =& $pearDB->query("SELECT tp.tp_name FROM timeperiod tp WHERE tp.tp_id = '".$service["timeperiod_tp_id2"]."' LIMIT 1");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($timePeriod))
$strTMP .= print_line("notification_period", $timePeriod["tp_name"]);
$DBRESULT2->free();
@@ -214,7 +214,7 @@ For information : contact@oreon-project.org
$strTMPTemp = NULL;
$DBRESULT2 =& $pearDB->query("SELECT cg.cg_id, cg.cg_name FROM contactgroup_service_relation csr, contactgroup cg WHERE csr.service_service_id = '".$service["service_id"]."' AND csr.contactgroup_cg_id = cg.cg_id ORDER BY `cg_name`");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($contactGroup)) {
$BP = false;
array_key_exists($contactGroup["cg_id"], $gbArr[1]) ? $BP = true : NULL;
@@ -232,7 +232,7 @@ For information : contact@oreon-project.org
if (isset($service["service_register"]) && $service["service_register"] == 0){
$DBRESULT_TEMP =& $pearDB->query("SELECT host_name FROM host, host_service_relation WHERE `service_service_id` = '".$service["service_id"]."' AND `host_id` = `host_host_id`");
if (PEAR::isError($DBRESULT_TEMP))
- print "DB Error : ".$DBRESULT_TEMP->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_TEMP->getDebugInfo()."<br />";
while($DBRESULT_TEMP->fetchInto($template_link))
$strTMP .= print_line("#TEMPLATE-HOST-LINK", $template_link["host_name"]);
unset($template_link);
diff --git a/www/include/configuration/configGenerate/genTimeperiods.php b/www/include/configuration/configGenerate/genTimeperiods.php
index 517f375076f5e6b20c648eeff37f4661b1af15a3..0901f27247286bf4573265de728b570e2922bfea 100644
--- a/www/include/configuration/configGenerate/genTimeperiods.php
+++ b/www/include/configuration/configGenerate/genTimeperiods.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
$handle = create_file($nagiosCFGPath.$tab['id']."/timeperiods.cfg", $oreon->user->get_name());
$DBRESULT =& $pearDB->query("SELECT * FROM `timeperiod` ORDER BY `tp_name`");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$timePeriod = array();
$i = 1;
$str = NULL;
diff --git a/www/include/configuration/configGenerate/genXMLList.php b/www/include/configuration/configGenerate/genXMLList.php
index 23f2dfc376a22fa1727784d4937248cad68fda2e..ed5a9195e9b496ebde8481e8b815d608e9d362a5 100644
--- a/www/include/configuration/configGenerate/genXMLList.php
+++ b/www/include/configuration/configGenerate/genXMLList.php
@@ -33,7 +33,7 @@ For information : contact@oreon-project.org
foreach($gbArr[2] as $key => $value) {
$DBRESULT =& $pearDB->query("SELECT host_name, host_template_model_htm_id, host_address, host_register FROM host, extended_host_information ehi WHERE host_id = '".$key."' AND ehi.host_host_id = host_id LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$host = $DBRESULT->fetchRow();
if ($host["host_register"]) {
if (!$host["host_name"])
@@ -51,7 +51,7 @@ For information : contact@oreon-project.org
foreach($gbArr[3] as $key => $value) {
$DBRESULT =& $pearDB->query("SELECT * FROM hostgroup WHERE hg_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$hostGroup = $DBRESULT->fetchRow();
$str .= "<hg id='".$key."' name='".html_entity_decode($hostGroup["hg_name"], ENT_QUOTES)."'";
$str .= " gps='false'";
@@ -61,7 +61,7 @@ For information : contact@oreon-project.org
foreach($gbArr[4] as $key => $value) {
$DBRESULT =& $pearDB->query("SELECT DISTINCT sv.service_description, sv.service_template_model_stm_id, service_register, hsr.host_host_id, hsr.hostgroup_hg_id FROM service sv, host_service_relation hsr WHERE sv.service_id = '".$key."' AND hsr.service_service_id = sv.service_id");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($sv)) {
if ($sv["service_register"]) {
if (!$sv["service_description"])
@@ -73,7 +73,7 @@ For information : contact@oreon-project.org
} else if ($sv["hostgroup_hg_id"]) {
$DBRESULT2 =& $pearDB->query("SELECT DISTINCT host_host_id FROM hostgroup_relation WHERE hostgroup_hg_id = '".$sv["hostgroup_hg_id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while ($DBRESULT2->fetchInto($host))
if (array_key_exists($host["host_host_id"], $gbArr[2])){
$sv["service_description"] = str_replace("#S#", "/", $sv["service_description"]);
@@ -91,7 +91,7 @@ For information : contact@oreon-project.org
foreach($gbArr[5] as $key => $value) {
$DBRESULT =& $pearDB->query("SELECT * FROM servicegroup WHERE sg_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$serviceGroup = $DBRESULT->fetchRow();
$str .= "<sg id='".$key."' name='".html_entity_decode($serviceGroup["sg_name"], ENT_QUOTES)."'";
$str .= " gps='false'";
@@ -101,7 +101,7 @@ For information : contact@oreon-project.org
foreach($gbArr[6] as $key => $value) {
$DBRESULT =& $pearDB->query("SELECT name FROM osl WHERE osl_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$osl = $DBRESULT->fetchRow();
$str .= "<osl id='".$key."' name='".html_entity_decode($osl["name"], ENT_QUOTES)."'/>\n";
$DBRESULT->free();
@@ -111,7 +111,7 @@ For information : contact@oreon-project.org
foreach($gbArr[7] as $key => $value) {
$DBRESULT =& $pearDB->query("SELECT meta_name FROM meta_service WHERE meta_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$osm = $DBRESULT->fetchRow();
$str .= "<ms id='".$key."' name='".html_entity_decode($osm["meta_name"], ENT_QUOTES)."'/>\n";
$DBRESULT->free();
@@ -127,7 +127,7 @@ For information : contact@oreon-project.org
foreach($gbArr[2] as $key => $value) {
$DBRESULT =& $pearDB->query("SELECT host_template_model_htm_id AS tpl, host_register FROM host WHERE host_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$host = $DBRESULT->fetchRow();
$str .= "<h id='".$key."'>\n";
## Parents
@@ -135,7 +135,7 @@ For information : contact@oreon-project.org
# Host Groups
$DBRESULT =& $pearDB->query("SELECT hgr.hostgroup_hg_id FROM hostgroup_relation hgr WHERE hgr.host_host_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($hostGroup)) {
$BP = false;
if ($ret["level"]["level"] == 1)
@@ -151,7 +151,7 @@ For information : contact@oreon-project.org
# Hosts
$DBRESULT =& $pearDB->query("SELECT hpr.host_parent_hp_id FROM host_hostparent_relation hpr WHERE hpr.host_host_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
//if (!$DBRESULT->numRows() && $host["tpl"])
// $DBRESULT =& getMyHostParents($host["tpl"]);
while($DBRESULT->fetchInto($host)) {
@@ -172,7 +172,7 @@ For information : contact@oreon-project.org
# Hosts
$DBRESULT =& $pearDB->query("SELECT host_host_id FROM host_hostparent_relation WHERE host_parent_hp_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($host)) {
$BP = false;
if ($ret["level"]["level"] == 1)
@@ -188,7 +188,7 @@ For information : contact@oreon-project.org
# Services from Host
$DBRESULT =& $pearDB->query("SELECT hsr.service_service_id FROM host_service_relation hsr WHERE hsr.host_host_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($service)) {
$BP = false;
if ($ret["level"]["level"] == 1)
@@ -204,7 +204,7 @@ For information : contact@oreon-project.org
# Services from Host Group
$DBRESULT =& $pearDB->query("SELECT hgr.hostgroup_hg_id FROM hostgroup_relation hgr WHERE hgr.host_host_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($hostGroup)) {
$BP = false;
if ($ret["level"]["level"] == 1)
@@ -216,7 +216,7 @@ For information : contact@oreon-project.org
if ($BP) {
$DBRESULT2 =& $pearDB->query("SELECT hsr.service_service_id FROM host_service_relation hsr WHERE hsr.hostgroup_hg_id = '".$hostGroup["hostgroup_hg_id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($service)) {
$BP = false;
if ($ret["level"]["level"] == 1)
@@ -245,7 +245,7 @@ For information : contact@oreon-project.org
$str .= "<chds>\n";
$DBRESULT =& $pearDB->query("SELECT hgr.host_host_id FROM hostgroup_relation hgr WHERE hgr.hostgroup_hg_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($host)) {
$BP = false;
if ($ret["level"]["level"] == 1)
@@ -265,7 +265,7 @@ For information : contact@oreon-project.org
foreach($gbArr[4] as $key => $value) {
$DBRESULT =& $pearDB->query("SELECT hsr.host_host_id, hsr.hostgroup_hg_id FROM host_service_relation hsr WHERE hsr.service_service_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($sv)) {
if ($sv["host_host_id"]) {
$str .= "<sv id='".$sv["host_host_id"]."_".$key."'>\n";
@@ -281,7 +281,7 @@ For information : contact@oreon-project.org
else if ($sv["hostgroup_hg_id"]) {
$DBRESULT2 =& $pearDB->query("SELECT DISTINCT host_host_id FROM hostgroup_relation WHERE hostgroup_hg_id = '".$sv["hostgroup_hg_id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while ($DBRESULT2->fetchInto($host))
if (array_key_exists($host["host_host_id"], $gbArr[2])) {
$str .= "<sv id='".$host["host_host_id"]."_".$key."'>\n";
@@ -310,7 +310,7 @@ For information : contact@oreon-project.org
$str .= "<chds>\n";
$DBRESULT =& $pearDB->query("SELECT sgr.service_service_id FROM servicegroup_relation sgr WHERE sgr.servicegroup_sg_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($service)) {
$BP = false;
if ($ret["level"]["level"] == 1)
@@ -322,7 +322,7 @@ For information : contact@oreon-project.org
if ($BP) {
$DBRESULT2 =& $pearDB->query("SELECT hsr.host_host_id, hsr.hostgroup_hg_id FROM host_service_relation hsr WHERE hsr.service_service_id = '".$service["service_service_id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($service2)) {
$BP = false;
if ($ret["level"]["level"] == 1) {
@@ -339,7 +339,7 @@ For information : contact@oreon-project.org
if ($service2["hostgroup_hg_id"]) {
$DBRESULT3 =& $pearDB->query("SELECT hgr.host_host_id FROM hostgroup_relation hgr WHERE hgr.hostgroup_hg_id = '".$service2["hostgroup_hg_id"]."'");
if (PEAR::isError($DBRESULT3))
- print "DB Error : ".$DBRESULT3->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT3->getDebugInfo()."<br />";
while($DBRESULT3->fetchInto($service3)) {
$BP = false;
if ($ret["level"]["level"] == 1)
@@ -372,7 +372,7 @@ For information : contact@oreon-project.org
$str .= "<prts>\n";
$DBRESULT =& $pearDB->query("SELECT id_osl FROM osl_indicator WHERE id_indicator_osl = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($osl))
$str .= "<osl id='".$osl["id_osl"]."'/>";
$DBRESULT->free();
@@ -382,7 +382,7 @@ For information : contact@oreon-project.org
$str .= "<chds>\n";
$DBRESULT =& $pearDB->query("SELECT host_id, service_id, id_indicator_osl, meta_id FROM osl_indicator WHERE id_osl = '".$key."' AND activate = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($osl)) {
if ($osl["host_id"] && $osl["service_id"]) {
$BP = false;
@@ -424,14 +424,14 @@ For information : contact@oreon-project.org
$str .= "<chds>\n";
$DBRESULT =& $pearDB->query("SELECT meta_select_mode, regexp_str FROM meta_service WHERE meta_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$meta =& $DBRESULT->fetchrow();
$DBRESULT->free();
# Regexp mode
if ($meta["meta_select_mode"] == 2) {
$DBRESULT =& $pearDB->query("SELECT service_id FROM service WHERE service_description LIKE '".$meta["regexp_str"]."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($service)) {
$BP = false;
if ($ret["level"]["level"] == 1)
@@ -443,7 +443,7 @@ For information : contact@oreon-project.org
if ($BP) {
$DBRESULT2 =& $pearDB->query("SELECT hsr.host_host_id, hsr.hostgroup_hg_id FROM host_service_relation hsr WHERE hsr.service_service_id = '".$service["service_id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($service2)) {
$BP = false;
if ($ret["level"]["level"] == 1) {
@@ -460,7 +460,7 @@ For information : contact@oreon-project.org
if ($service2["hostgroup_hg_id"]) {
$DBRESULT3 =& $pearDB->query("SELECT hgr.host_host_id FROM hostgroup_relation hgr WHERE hgr.hostgroup_hg_id = '".$service2["hostgroup_hg_id"]."'");
if (PEAR::isError($DBRESULT3))
- print "DB Error : ".$DBRESULT3->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT3->getDebugInfo()."<br />";
while($DBRESULT3->fetchInto($service3)) {
$BP = false;
if ($ret["level"]["level"] == 1)
@@ -488,7 +488,7 @@ For information : contact@oreon-project.org
require_once("./DBOdsConnect.php");
$DBRESULT =& $pearDB->query("SELECT meta_id, host_id, metric_id FROM meta_service_relation msr WHERE meta_id = '".$key."' AND activate = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($metric)) {
$BP = false;
if ($ret["level"]["level"] == 1)
@@ -500,7 +500,7 @@ For information : contact@oreon-project.org
if ($BP) {
$DBRESULT2 =& $pearDBO->query("SELECT service_description FROM metrics m, index_data i WHERE m.metric_id = '".$metric["metric_id"]."' and m.index_id=i.id");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$OService =& $DBRESULT2->fetchRow();
$sv_id =& getMyServiceID($OService["service_description"], $metric["host_id"]);
$BP = false;
diff --git a/www/include/configuration/configGenerate/metaService/meta_dependencies.php b/www/include/configuration/configGenerate/metaService/meta_dependencies.php
index ec274ca45293c02ce5da3fbd779e637ea49f124c..8dfbd6d5c1d51e65338909b8690b4f1202510618 100644
--- a/www/include/configuration/configGenerate/metaService/meta_dependencies.php
+++ b/www/include/configuration/configGenerate/metaService/meta_dependencies.php
@@ -23,7 +23,7 @@ For information : contact@oreon-project.org
$rq = "SELECT * FROM dependency dep WHERE (SELECT DISTINCT COUNT(*) FROM dependency_metaserviceParent_relation dmspr WHERE dmspr.dependency_dep_id = dep.dep_id) > 0 AND (SELECT DISTINCT COUNT(*) FROM dependency_metaserviceChild_relation dmscr WHERE dmscr.dependency_dep_id = dep.dep_id) > 0";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : SELECT * FROM dependency dep WHERE (SELECT DISTINCT COUNT(*)... : ".$DBRESULT->getMessage()."<br>";
+ print "DB Error : SELECT * FROM dependency dep WHERE (SELECT DISTINCT COUNT(*)... : ".$DBRESULT->getMessage()."<br />";
$dependency = array();
$i = 1;
$str = NULL;
@@ -31,7 +31,7 @@ For information : contact@oreon-project.org
$BP = false;
$DBRESULT2 =& $pearDB->query("SELECT meta_service_meta_id FROM dependency_metaserviceParent_relation WHERE dependency_dep_id = '".$dependency["dep_id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : SELECT meta_service_meta_id FROM dependency_metaserviceParent_relation.. : ".$DBRESULT2->getMessage()."<br>";
+ print "DB Error : SELECT meta_service_meta_id FROM dependency_metaserviceParent_relation.. : ".$DBRESULT2->getMessage()."<br />";
$metaPar = NULL;
while ($DBRESULT2->fetchInto($metaPar)) {
$BP = false;
@@ -44,7 +44,7 @@ For information : contact@oreon-project.org
if ($BP) {
$DBRESULT3 =& $pearDB->query("SELECT meta_service_meta_id FROM dependency_metaserviceChild_relation WHERE dependency_dep_id = '".$dependency["dep_id"]."'");
if (PEAR::isError($DBRESULT3))
- print "DB Error : SELECT meta_service_meta_id FROM dependency_metaserviceChild_relation.. : ".$DBRESULT3->getMessage()."<br>";
+ print "DB Error : SELECT meta_service_meta_id FROM dependency_metaserviceChild_relation.. : ".$DBRESULT3->getMessage()."<br />";
$metaCh = NULL;
while ($DBRESULT3->fetchInto($metaCh)) {
$BP = false;
diff --git a/www/include/configuration/configGenerate/metaService/meta_escalations.php b/www/include/configuration/configGenerate/metaService/meta_escalations.php
index 012c790c83ca10b88bccb08ebff21b6412e35c5e..e59e4866ceb1595404342d4a7a3839680a1c7294 100644
--- a/www/include/configuration/configGenerate/metaService/meta_escalations.php
+++ b/www/include/configuration/configGenerate/metaService/meta_escalations.php
@@ -22,7 +22,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query("SELECT DISTINCT meta_service_meta_id FROM escalation_meta_service_relation");
if (PEAR::isError($DBRESULT))
- print "DB Error : SELECT DISTINCT meta_service_meta_id FROM escalation_meta_service_relation : ".$DBRESULT->getMessage()."<br>";
+ print "DB Error : SELECT DISTINCT meta_service_meta_id FROM escalation_meta_service_relation : ".$DBRESULT->getMessage()."<br />";
while($DBRESULT->fetchInto($service)) {
$BP = false;
if ($ret["level"]["level"] == 1)
@@ -34,7 +34,7 @@ For information : contact@oreon-project.org
if ($BP) {
$DBRESULT2 =& $pearDB->query("SELECT esc.* FROM escalation esc, escalation_meta_service_relation emsr WHERE emsr.meta_service_meta_id = '".$service["meta_service_meta_id"]."' AND esc.esc_id = emsr.escalation_esc_id ORDER BY esc.esc_name");
if (PEAR::isError($DBRESULT2))
- print "DB Error : SELECT esc.* FROM escalation esc, escalation_meta_service_relation emsr.. : ".$DBRESULT2->getMessage()."<br>";
+ print "DB Error : SELECT esc.* FROM escalation esc, escalation_meta_service_relation emsr.. : ".$DBRESULT2->getMessage()."<br />";
$escalation = array();
while($DBRESULT2->fetchInto($escalation)) {
$ret["comment"]["comment"] ? ($str .= "# '".$escalation["esc_name"]."' service escalation definition ".$i."\n") : NULL;
@@ -51,7 +51,7 @@ For information : contact@oreon-project.org
$strTemp = NULL;
$DBRESULT3 =& $pearDB->query("SELECT DISTINCT cg.cg_id, cg.cg_name FROM escalation_contactgroup_relation ecgr, contactgroup cg WHERE ecgr.escalation_esc_id = '".$escalation["esc_id"]."' AND ecgr.contactgroup_cg_id = cg.cg_id ORDER BY cg.cg_name");
if (PEAR::isError($DBRESULT3))
- print "DB Error : SELECT DISTINCT cg.cg_id, cg.cg_name.. : ".$DBRESULT3->getMessage()."<br>";
+ print "DB Error : SELECT DISTINCT cg.cg_id, cg.cg_name.. : ".$DBRESULT3->getMessage()."<br />";
while($DBRESULT3->fetchInto($cg)) {
$BP = false;
if ($ret["level"]["level"] == 1)
@@ -72,7 +72,7 @@ For information : contact@oreon-project.org
if ($oreon->user->get_version() == 2) {
$DBRESULT4 =& $pearDB->query("SELECT tp_name FROM timeperiod WHERE tp_id = '".$escalation["escalation_period"]."'");
if (PEAR::isError($DBRESULT4))
- print "DB Error : SELECT tp_name FROM timeperiod WHERE tp_id = '".$escalation["escalation_period"]."' : ".$DBRESULT4->getMessage()."<br>";
+ print "DB Error : SELECT tp_name FROM timeperiod WHERE tp_id = '".$escalation["escalation_period"]."' : ".$DBRESULT4->getMessage()."<br />";
$tp =& $DBRESULT4->fetchRow();
$DBRESULT4->free();
if ($tp["tp_name"]) $str .= print_line("escalation_period", $tp["tp_name"]);
diff --git a/www/include/configuration/configGenerate/metaService/meta_services.php b/www/include/configuration/configGenerate/metaService/meta_services.php
index 82fb7c9aa924c2866b3d7176e35059b906edf4bd..afd8240bca266a36aa7b0ad4c538ad6945dab2e6 100644
--- a/www/include/configuration/configGenerate/metaService/meta_services.php
+++ b/www/include/configuration/configGenerate/metaService/meta_services.php
@@ -20,7 +20,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query("SELECT * FROM meta_service WHERE meta_activate = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : SELECT * FROM meta_service WHERE meta_activate = '1' : ".$DBRESULT->getMessage()."<br>";
+ print "DB Error : SELECT * FROM meta_service WHERE meta_activate = '1' : ".$DBRESULT->getMessage()."<br />";
# Write Virtual Services For meta
while ($DBRESULT->fetchInto($meta)) {
$strEval = NULL;
@@ -36,7 +36,7 @@ For information : contact@oreon-project.org
$DBRESULT2 =& $pearDB->query("SELECT DISTINCT tp_name FROM timeperiod WHERE tp_id = '".$meta["check_period"]."' LIMIT 1");
if (PEAR::isError($DBRESULT2))
- print "DB Error : SELECT DISTINCT tp_name FROM timeperiod WHERE tp_id = '".$meta["check_period"]."' LIMIT 1 : ".$DBRESULT2->getMessage()."<br>";
+ print "DB Error : SELECT DISTINCT tp_name FROM timeperiod WHERE tp_id = '".$meta["check_period"]."' LIMIT 1 : ".$DBRESULT2->getMessage()."<br />";
$period =& $DBRESULT2->fetchRow();
if (isset($period) && $period["tp_name"])
$strEval .= print_line("check_period", $period["tp_name"]);
@@ -46,7 +46,7 @@ For information : contact@oreon-project.org
$DBRESULT2 =& $pearDB->query("SELECT DISTINCT tp_name FROM timeperiod WHERE tp_id = '".$meta["notification_period"]."' LIMIT 1");
if (PEAR::isError($DBRESULT2))
- print "DB Error : SELECT DISTINCT tp_name FROM timeperiod WHERE tp_id = '".$meta["notification_period"]."' LIMIT 1 : ".$DBRESULT2->getMessage()."<br>";
+ print "DB Error : SELECT DISTINCT tp_name FROM timeperiod WHERE tp_id = '".$meta["notification_period"]."' LIMIT 1 : ".$DBRESULT2->getMessage()."<br />";
$period =& $DBRESULT2->fetchRow();
if (isset($period) && $period["tp_name"])
$strEval .= print_line("notification_period", $period["tp_name"]);
@@ -59,7 +59,7 @@ For information : contact@oreon-project.org
$strTemp = NULL;
$DBRESULT2 =& $pearDB->query("SELECT cg.cg_id, cg.cg_name FROM meta_contactgroup_relation mcgr, contactgroup cg WHERE mcgr.meta_id = '".$meta["meta_id"]."' AND mcgr.cg_cg_id = cg.cg_id ORDER BY `cg_name`");
if (PEAR::isError($DBRESULT2))
- print "DB Error : SELECT cg.cg_id, cg.cg_name FROM meta_contactgroup_relation mcgr,.. : ".$DBRESULT2->getMessage()."<br>";
+ print "DB Error : SELECT cg.cg_id, cg.cg_name FROM meta_contactgroup_relation mcgr,.. : ".$DBRESULT2->getMessage()."<br />";
while($DBRESULT2->fetchInto($contactGroup)) {
$BP = false;
if ($ret["level"]["level"] == 1)
diff --git a/www/include/configuration/configLoad/DB-Func.php b/www/include/configuration/configLoad/DB-Func.php
index 8a9f0b5de9d208043dac83d798568262869bc572..64cbd5730e131110a1c69ea3920fe51bb2b9108f 100644
--- a/www/include/configuration/configLoad/DB-Func.php
+++ b/www/include/configuration/configLoad/DB-Func.php
@@ -18,47 +18,47 @@ For information : contact@oreon-project.org
function deleteAllConfCFG() {
global $pearDB;
global $oreon;
- //echo "delete all cfg conf<br>";
+ //echo "delete all cfg conf<br />";
$rq = "DELETE FROM command";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$rq = "DELETE FROM timeperiod";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$rq = "DELETE FROM contact WHERE contact_id != '".$oreon->user->get_id()."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$rq = "DELETE FROM contactgroup";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$rq = "DELETE FROM host";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$rq = "DELETE FROM service";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$rq = "DELETE FROM hostgroup";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$rq = "DELETE FROM servicegroup";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$rq = "DELETE FROM dependency";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$rq = "DELETE FROM escalation";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function insertResourceCFG(& $buf) {
@@ -95,7 +95,7 @@ For information : contact@oreon-project.org
$rq = "DELETE * FROM cfg_resource; ";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : DELETE * FROM cfg_resource; : ".$DBRESULT->getMessage()."<br>";
+ print "DB Error : DELETE * FROM cfg_resource; : ".$DBRESULT->getMessage()."<br />";
}
function insertNagiosCFG(& $buf) {
@@ -150,7 +150,7 @@ For information : contact@oreon-project.org
$rq = "DELETE FROM cfg_nagios; ";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : DELETE FROM cfg_nagios; : ".$DBRESULT->getMessage()."<br>";
+ print "DB Error : DELETE FROM cfg_nagios; : ".$DBRESULT->getMessage()."<br />";
}
function insertCgiCFG(& $buf) {
@@ -182,7 +182,7 @@ For information : contact@oreon-project.org
$rq = "DELETE FROM cfg_cgi; ";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : DELETE FROM cfg_cgi; : ".$DBRESULT->getMessage()."<br>";
+ print "DB Error : DELETE FROM cfg_cgi; : ".$DBRESULT->getMessage()."<br />";
}
function deletePerfparseCFG() {
@@ -190,7 +190,7 @@ For information : contact@oreon-project.org
$rq = "DELETE FROM cfg_perfparse; ";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : DELETE FROM cfg_perfparse; : ".$DBRESULT->getMessage()."<br>";
+ print "DB Error : DELETE FROM cfg_perfparse; : ".$DBRESULT->getMessage()."<br />";
}
@@ -1093,7 +1093,7 @@ For information : contact@oreon-project.org
$host_host_id = getMyHostID($tvalue);
$DBRESULT_TEMP =& $pearDB->query("INSERT INTO `host_service_relation` (`host_host_id`, `service_service_id`) VALUES ('".$host_host_id."', '".$useTpl[0]."')");
if (PEAR::isError($DBRESULT_TEMP))
- print "DB Error : ".$DBRESULT_TEMP->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_TEMP->getDebugInfo()."<br />";
}
}
} else {
diff --git a/www/include/configuration/configLoad/formLoadFiles.ihtml b/www/include/configuration/configLoad/formLoadFiles.ihtml
index 3134de0487688de548bda836c13a495a120daf44..93ed1acaa9822444419c21a530227ba81311947b 100644
--- a/www/include/configuration/configLoad/formLoadFiles.ihtml
+++ b/www/include/configuration/configLoad/formLoadFiles.ihtml
@@ -14,15 +14,15 @@
<tr class="list_lvl_1"><td class="ListColLvl1_name" colspan="2"><img src='./img/icones/16x16/document_into.gif'> {$form.header.fileType}</td></tr>
<tr class="list_one">
<td class="FormRowField">
- <b>{$form.Type.label}</b><br>
+ <b>{$form.Type.label}</b><br />
{$form.header.fileMis1}
</td>
<td class="FormRowValue">{$form.Type.html}</td>
</tr>
<tr class="list_two">
<td class="FormRowField">
- <b>{$form.cmdType.label}</b><br>
- {$form.header.fileCmt1}<br>
+ <b>{$form.cmdType.label}</b><br />
+ {$form.header.fileCmt1}<br />
{$form.header.fileCmt2}
</td>
<td class="FormRowValue">{$form.cmdType.html}</td>
@@ -34,7 +34,7 @@
<tr class="list_one"><td class="FormRowField">{$form.debug.label}</td><td class="FormRowValue">{$form.debug.html}</td></tr>
</table>
- <br><br>
+ <br /><br />
{if $msg}
<table class="ListTable">
<tr class="ListHeader">
diff --git a/www/include/configuration/configLoad/formLoadFiles.php b/www/include/configuration/configLoad/formLoadFiles.php
index 53735590fe44bcda0e4b0ae660d2a037bb0582f9..52e96cd3d79775cbdc3fcc69f53d5ab3789e5c40 100644
--- a/www/include/configuration/configLoad/formLoadFiles.php
+++ b/www/include/configuration/configLoad/formLoadFiles.php
@@ -19,7 +19,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT debug_path, debug_nagios_import FROM general_opt LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : SELECT debug_path, debug_nagios_import FROM general_opt LIMIT 1 : ".$DBRESULT->getMessage()."<br>";
+ print "DB Error : SELECT debug_path, debug_nagios_import FROM general_opt LIMIT 1 : ".$DBRESULT->getMessage()."<br />";
$debug = $DBRESULT->fetchRow();
@@ -59,13 +59,13 @@ For information : contact@oreon-project.org
$form->setDefaults(array('comment' => '0'));
$form->addElement('header', 'fileType', _("File Type"));
- $form->addElement('header', 'fileMis1', _("For archive upload, be sure that the first line of each file has no importance because it is not handled.<br>Avoid to begin with a definition."));
+ $form->addElement('header', 'fileMis1', _("For archive upload, be sure that the first line of each file has no importance because it is not handled.<br />Avoid to begin with a definition."));
$tab = array();
$tab[] = &HTML_QuickForm::createElement('radio', 'Type', null, _("nagios.cfg"), 'nagios');
$tab[] = &HTML_QuickForm::createElement('radio', 'Type', null, _("cgi.cfg"), 'cgi');
$tab[] = &HTML_QuickForm::createElement('radio', 'Type', null, _("resource.cfg"), 'res');
$tab[] = &HTML_QuickForm::createElement('radio', 'Type', null, _("Template based method file"), 'cfg');
- $form->addGroup($tab, 'Type', _("Type"), '<br>');
+ $form->addGroup($tab, 'Type', _("Type"), '<br />');
$form->setDefaults(array('Type' => array("Type"=>"cfg")));
$tab = array();
@@ -112,23 +112,23 @@ For information : contact@oreon-project.org
# File Moving
switch ($fDataz["type"]) {
- case "application/x-zip-compressed" : $msg .= $fDataz["name"]." "._("Not supported extension")."<br>"; break;
- case "application/x-gzip" : $file->moveUploadedFile($nagiosCFGPath); $msg .= $fDataz["name"]." "._("File loading OK")."<br>"; break; // tar.gz
- case "application/x-tar" : $file->moveUploadedFile($nagiosCFGPath); $msg .= $fDataz["name"]." "._("File loading OK")."<br>"; break; // tar
- case "application/octet-stream" : $file->moveUploadedFile($nagiosCFGPath); $msg .= _("Manual filling OK")." "._("File loading OK")."<br>"; break; // Text
- default : $msg .= _("File loading KO")."<br>";
+ case "application/x-zip-compressed" : $msg .= $fDataz["name"]." "._("Not supported extension")."<br />"; break;
+ case "application/x-gzip" : $file->moveUploadedFile($nagiosCFGPath); $msg .= $fDataz["name"]." "._("File loading OK")."<br />"; break; // tar.gz
+ case "application/x-tar" : $file->moveUploadedFile($nagiosCFGPath); $msg .= $fDataz["name"]." "._("File loading OK")."<br />"; break; // tar
+ case "application/octet-stream" : $file->moveUploadedFile($nagiosCFGPath); $msg .= _("Manual filling OK")." "._("File loading OK")."<br />"; break; // Text
+ default : $msg .= _("File loading KO")."<br />";
}
# Buffering Data
if (is_file($nagiosCFGPath.$fDataz["name"])) {
$buf =& gzfile($nagiosCFGPath.$fDataz["name"]);
- $buf ? $msg .= _("Data recovery OK")."<br>" : $msg .= _("Data recovery KO")."<br>";
+ $buf ? $msg .= _("Data recovery OK")."<br />" : $msg .= _("Data recovery KO")."<br />";
}
else if ($ret["manualDef"]) {
if ($debug_nagios_import == 1)
error_log("[" . date("d/m/Y H:s") ."] Nagios Import : Manual Definition\n", 3, $debug_path."cfgimport.log");
- $msg .= _("Manual filling OK")."<br>";
- $msg .= _("Data recovery OK")."<br>";
+ $msg .= _("Manual filling OK")."<br />";
+ $msg .= _("Data recovery OK")."<br />";
$buf =& explode("\n", $ret["manualDef"]);
}
# Enum Object Types
@@ -142,18 +142,18 @@ For information : contact@oreon-project.org
if ($ret["del"]["del"])
deleteNagiosCFG();
if (insertNagiosCFG($buf))
- $msg .= "1 "._("Entries are registered")."<br>";
+ $msg .= "1 "._("Entries are registered")."<br />";
break;
case "cgi" :
if ($ret["del"]["del"])
deleteCgiCFG();
if (insertCgiCFG($buf))
- $msg .= "1 "._("Entries are registered")."<br>";
+ $msg .= "1 "._("Entries are registered")."<br />";
break;
case "res" :
if ($ret["del"]["del"])
deleteResourceCFG();
- $msg .= insertResourceCFG($buf)." "._("Entries are registered")."<br>";
+ $msg .= insertResourceCFG($buf)." "._("Entries are registered")."<br />";
break;
case "cfg" :
if ($ret["del"]["del"]) {
@@ -162,18 +162,18 @@ For information : contact@oreon-project.org
error_log("[" . date("d/m/Y H:s") ."] Nagios Import : Delete All Conf\n", 3, $debug_path."cfgimport.log");
}
$nbr =& insertCFG($buf, $ret);
- ($nbr["cmd"] ? $msg .= "Command : ".$nbr["cmd"]." "._("Entries are registered")."<br>" : 0);
- ($nbr["tp"] ? $msg .= "Time Period : ".$nbr["tp"]." "._("Entries are registered")."<br>" : 0);
- ($nbr["cct"] ? $msg .= "Contact : ".$nbr["cct"]." "._("Entries are registered")."<br>" : 0);
- ($nbr["cg"] ? $msg .= "Contact Group : ".$nbr["cg"]." "._("Entries are registered")."<br>" : 0);
- ($nbr["h"] ? $msg .= "Host : ".$nbr["h"]." "._("Entries are registered")."<br>" : 0);
- ($nbr["hei"] ? $msg .= "Host Extended Infos : ".$nbr["hei"]." "._("Entries are registered")."<br>" : 0);
- ($nbr["hg"] ? $msg .= "Host Group : ".$nbr["hg"]." "._("Entries are registered")."<br>" : 0);
- ($nbr["hd"] ? $msg .= "Host Dependency : ".$nbr["hd"]." "._("Entries are registered")."<br>" : 0);
- ($nbr["sv"] ? $msg .= "Service : ".$nbr["sv"]." "._("Entries are registered")."<br>" : 0);
- ($nbr["svd"] ? $msg .= "Service Dependency : ".$nbr["svd"]." "._("Entries are registered")."<br>" : 0);
- ($nbr["sg"] ? $msg .= "Service Group : ".$nbr["sg"]." "._("Entries are registered")."<br>" : 0);
- ($nbr["sgd"] ? $msg .= "Service Group Dependency : ".$nbr["sgd"]." "._("Entries are registered")."<br>" : 0);
+ ($nbr["cmd"] ? $msg .= "Command : ".$nbr["cmd"]." "._("Entries are registered")."<br />" : 0);
+ ($nbr["tp"] ? $msg .= "Time Period : ".$nbr["tp"]." "._("Entries are registered")."<br />" : 0);
+ ($nbr["cct"] ? $msg .= "Contact : ".$nbr["cct"]." "._("Entries are registered")."<br />" : 0);
+ ($nbr["cg"] ? $msg .= "Contact Group : ".$nbr["cg"]." "._("Entries are registered")."<br />" : 0);
+ ($nbr["h"] ? $msg .= "Host : ".$nbr["h"]." "._("Entries are registered")."<br />" : 0);
+ ($nbr["hei"] ? $msg .= "Host Extended Infos : ".$nbr["hei"]." "._("Entries are registered")."<br />" : 0);
+ ($nbr["hg"] ? $msg .= "Host Group : ".$nbr["hg"]." "._("Entries are registered")."<br />" : 0);
+ ($nbr["hd"] ? $msg .= "Host Dependency : ".$nbr["hd"]." "._("Entries are registered")."<br />" : 0);
+ ($nbr["sv"] ? $msg .= "Service : ".$nbr["sv"]." "._("Entries are registered")."<br />" : 0);
+ ($nbr["svd"] ? $msg .= "Service Dependency : ".$nbr["svd"]." "._("Entries are registered")."<br />" : 0);
+ ($nbr["sg"] ? $msg .= "Service Group : ".$nbr["sg"]." "._("Entries are registered")."<br />" : 0);
+ ($nbr["sgd"] ? $msg .= "Service Group Dependency : ".$nbr["sgd"]." "._("Entries are registered")."<br />" : 0);
break;
}
}
diff --git a/www/include/configuration/configNagios/DB-Func.php b/www/include/configuration/configNagios/DB-Func.php
index 45f003cf0af4aa9b2154f50533dfea9c087745dd..1467b36a3450a9974ac5d92195ab9e9152b5fe50 100644
--- a/www/include/configuration/configNagios/DB-Func.php
+++ b/www/include/configuration/configNagios/DB-Func.php
@@ -25,7 +25,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('nagios_id');
$DBRESULT =& $pearDB->query("SELECT nagios_name, nagios_id FROM cfg_nagios WHERE nagios_name = '".htmlentities($name, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$nagios =& $DBRESULT->fetchRow();
#Modif case
if ($DBRESULT->numRows() >= 1 && $nagios["nagios_id"] == $id)
@@ -46,11 +46,11 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query("UPDATE `cfg_nagios` SET `nagios_activate` = '0' WHERE `nagios_server_id` = '".$data["nagios_server_id"]."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("UPDATE cfg_nagios SET nagios_activate = '1' WHERE nagios_id = '".$nagios_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$oreon->Nagioscfg = array();
}
@@ -63,18 +63,18 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query("UPDATE cfg_nagios SET nagios_activate = '0' WHERE `nagios_server_id` = '".$data["nagios_server_id"]."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(nagios_id) FROM cfg_nagios WHERE nagios_id != '".$nagios_id."'");
$maxId =& $DBRESULT->fetchRow();
if (isset($maxId["MAX(nagios_id)"])) {
$DBRESULT2 =& $pearDB->query("UPDATE cfg_nagios SET nagios_activate = '1' WHERE nagios_id = '".$maxId["MAX(nagios_id)"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$oreon->Nagioscfg = array();
$DBRESULT2 =& $pearDB->query("SELECT * FROM `cfg_nagios` WHERE `nagios_activate` = '1' LIMIT 1");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$oreon->Nagioscfg = $DBRESULT->fetchRow();
$DBRESULT2->free();
}
@@ -85,19 +85,19 @@ For information : contact@oreon-project.org
foreach($nagios as $key => $value) {
$DBRESULT =& $pearDB->query("DELETE FROM cfg_nagios WHERE nagios_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
$DBRESULT =& $pearDB->query("SELECT nagios_id FROM cfg_nagios WHERE nagios_activate = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if (!$DBRESULT->numRows()) {
$DBRESULT2 =& $pearDB->query("SELECT MAX(nagios_id) FROM cfg_nagios");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$nagios_id = $DBRESULT2->fetchRow();
$DBRESULT2 =& $pearDB->query("UPDATE cfg_nagios SET nagios_activate = '1' WHERE nagios_id = '".$nagios_id["MAX(nagios_id)"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT->free();
}
@@ -107,7 +107,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT * FROM cfg_nagios WHERE nagios_id = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["nagios_id"] = '';
$row["nagios_activate"] = '0';
@@ -122,7 +122,7 @@ For information : contact@oreon-project.org
$val ? $rq = "INSERT INTO cfg_nagios VALUES (".$val.")" : $rq = null;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
@@ -273,20 +273,20 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(nagios_id) FROM cfg_nagios");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$nagios_id = $DBRESULT->fetchRow();
$DBRESULT->free();
if (isset($ret["nagios_activate"]["nagios_activate"]) && $ret["nagios_activate"]["nagios_activate"]) {
$DBRESULT =& $pearDB->query("UPDATE cfg_nagios SET nagios_activate = '0' WHERE nagios_id != '".$nagios_id["MAX(nagios_id)"]."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$oreon->Nagioscfg = array();
$DBRESULT =& $pearDB->query("SELECT * FROM `cfg_nagios` WHERE `nagios_activate` = '1' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$oreon->Nagioscfg = $DBRESULT->fetchRow();
$DBRESULT->free();
}
@@ -300,7 +300,7 @@ For information : contact@oreon-project.org
if (isset($ret["nagios_server_id"])){
$DBRESULT =& $pearDB->query("UPDATE cfg_nagios SET `nagios_server_id` != '".$ret["nagios_server_id"]."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
$ret = array();
@@ -412,7 +412,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE nagios_id = '".$nagios_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if ($ret["nagios_activate"]["nagios_activate"])
enableNagiosInDB($nagios_id);
}
diff --git a/www/include/configuration/configNagios/comments.php b/www/include/configuration/configNagios/comments.php
index 14c82eb76f897ed91def6c0dda9a0e9fabd5340f..453604db62e6cf0adbd7adc3b0be449af68cac1f 100644
--- a/www/include/configuration/configNagios/comments.php
+++ b/www/include/configuration/configNagios/comments.php
@@ -91,12 +91,12 @@ $nagios_comment["temp_file"]="This is a temporary file< that is used as scratch
$nagios_comment["log_rotation_method"]="This is the log rotation method that Nagios should use to rotate "
- . "the main log file. Values are as follows..<br> "
- . "n = None - don\'t rotate the log <br>"
- . "h = Hourly rotation (top of the hour) <br>"
- . "d = Daily rotation (midnight every day)<br> "
- . "w = Weekly rotation (midnight on Saturday evening)<br> "
- . "m = Monthly rotation (midnight last day of month)<br> ";
+ . "the main log file. Values are as follows..<br /> "
+ . "n = None - don\'t rotate the log <br />"
+ . "h = Hourly rotation (top of the hour) <br />"
+ . "d = Daily rotation (midnight every day)<br /> "
+ . "w = Weekly rotation (midnight on Saturday evening)<br /> "
+ . "m = Monthly rotation (midnight last day of month)<br /> ";
$nagios_comment["log_archive_path"]="This is the directory where archived (rotated) log files should be "
. "placed (assuming you\'ve chosen to do log rotation). ";
@@ -141,32 +141,32 @@ $nagios_comment["inter_check"]="This is the method that Nagios should use when i
. "Using the dumb setting will cause all checks to be scheduled "
. "at the same time (with no delay between them)! This is not a "
. "good thing for production, but is useful when testing the "
- . "parallelization functionality. <br>"
- . "n = None - don\'t use any delay between checks <br>"
- . "d = Use a «dumb» delay of 1 second between checks <br>"
- . "s = Use «smart» inter-check delay calculation <br>"
+ . "parallelization functionality. <br />"
+ . "n = None - don\'t use any delay between checks <br />"
+ . "d = Use a «dumb» delay of 1 second between checks <br />"
+ . "s = Use «smart» inter-check delay calculation <br />"
. " x.xx = Use an inter-check delay of x.xx seconds ";
-$nagios_comment["service_inter_check"]="This option allows you to control how service checks are initially «spread out« in the event queue.<br>"
- . "Using a «smart« delay calculation (the default) will cause Nagios to calculate an average check interval and spread initial checks of all services out over that interval, thereby helping to eliminate CPU load spikes.<br>"
- . "Using no delay is generally not recommended unless you are testing the service check parallelization functionality.<br>"
- . "no delay will cause all service checks to be scheduled for execution at the same time.<br>"
- . "This means that you will generally have large CPU spikes when the services are all executed in parallel.<br>"
- . "Values are as follows :<br> "
- . "n = None - don\'t use any delay between checks to run immediately (i.e. at the same time!) <br>"
- . "d = Use a «dumb» delay of 1 second between checks <br>"
- . "s = Use «smart» inter-check delay calculation to spread service checks out evenly (default)<br>"
+$nagios_comment["service_inter_check"]="This option allows you to control how service checks are initially «spread out« in the event queue.<br />"
+ . "Using a «smart« delay calculation (the default) will cause Nagios to calculate an average check interval and spread initial checks of all services out over that interval, thereby helping to eliminate CPU load spikes.<br />"
+ . "Using no delay is generally not recommended unless you are testing the service check parallelization functionality.<br />"
+ . "no delay will cause all service checks to be scheduled for execution at the same time.<br />"
+ . "This means that you will generally have large CPU spikes when the services are all executed in parallel.<br />"
+ . "Values are as follows :<br /> "
+ . "n = None - don\'t use any delay between checks to run immediately (i.e. at the same time!) <br />"
+ . "d = Use a «dumb» delay of 1 second between checks <br />"
+ . "s = Use «smart» inter-check delay calculation to spread service checks out evenly (default)<br />"
. " x.xx = Use a user-supplied inter-check delay of x.xx seconds";
-$nagios_comment["host_inter_check"]="This option allows you to control how host checks that are scheduled to be checked on a regular basis are initially «spread out« in the event queue.<br>"
- . "Using a «smart« delay calculation (the default) will cause Nagios to calculate an average check interval and spread initial checks of all hosts out over that interval, thereby helping to eliminate CPU load spikes.<br>"
- . "Using no delay is generally not recommended.<br>"
- . "Using no delay will cause all host checks to be scheduled for execution at the same time.<br>"
- . "Values are as follows :<br> "
- . "n = None - don\'t use any delay - schedule all host checks to run immediately (i.e. at the same time!) <br>"
- . "d = Use a «dumb» delay of 1 second between host checks <br>"
- . "s = Use «smart» delay calculation to spread host checks out evenly (default) <br>"
+$nagios_comment["host_inter_check"]="This option allows you to control how host checks that are scheduled to be checked on a regular basis are initially «spread out« in the event queue.<br />"
+ . "Using a «smart« delay calculation (the default) will cause Nagios to calculate an average check interval and spread initial checks of all hosts out over that interval, thereby helping to eliminate CPU load spikes.<br />"
+ . "Using no delay is generally not recommended.<br />"
+ . "Using no delay will cause all host checks to be scheduled for execution at the same time.<br />"
+ . "Values are as follows :<br /> "
+ . "n = None - don\'t use any delay - schedule all host checks to run immediately (i.e. at the same time!) <br />"
+ . "d = Use a «dumb» delay of 1 second between host checks <br />"
+ . "s = Use «smart» delay calculation to spread host checks out evenly (default) <br />"
. " x.xx = Use a user-supplied inter-check delay of x.xx seconds";
$nagios_comment["service_interleave_factor"]="This variable determines how service checks are interleaved. "
@@ -175,9 +175,9 @@ $nagios_comment["service_interleave_factor"]="This variable determines how servi
. "hosts. Setting this value to 1 is equivalent to how versions "
. "of Nagios previous to 0.0.5 did service checks. Set this "
. "value to s (smart) for automatic calculation of the interleave "
- . "factor unless you have a specific reason to change it.<br> "
- . " s = Use «smart» interleave factor calculation<br> "
- . " x = Use an interleave factor of x, where x is a <br>"
+ . "factor unless you have a specific reason to change it.<br /> "
+ . " s = Use «smart» interleave factor calculation<br /> "
+ . " x = Use an interleave factor of x, where x is a <br />"
. " number greater than or equal to 1. ";
$nagios_comment["max_concurrent_checks"]="This option allows you to specify the maximum number of "
@@ -187,14 +187,14 @@ $nagios_comment["max_concurrent_checks"]="This option allows you to specify the
. "will not restrict the number of concurrent checks that are "
. "being executed. ";
-$nagios_comment["max_service_check_spread"]="This option determines the maximum number of minutes from when Nagios starts that all services (that are scheduled to be regularly checked) are checked.<br>"
- . "This option will automatically adjust the service inter-check delay (if necessary) to ensure that the initial checks of all services occur within the timeframe you specify.<br>"
- . "In general, this option will not have an affect on service check scheduling if scheduling information is being retained using the use_retained_scheduling_info option.<br>"
+$nagios_comment["max_service_check_spread"]="This option determines the maximum number of minutes from when Nagios starts that all services (that are scheduled to be regularly checked) are checked.<br />"
+ . "This option will automatically adjust the service inter-check delay (if necessary) to ensure that the initial checks of all services occur within the timeframe you specify.<br />"
+ . "In general, this option will not have an affect on service check scheduling if scheduling information is being retained using the use_retained_scheduling_info option.<br />"
. "Default value is 30 (minutes). ";
-$nagios_comment["max_host_check_spread"]="This option determines the maximum number of minutes from when Nagios starts that all hosts (that are scheduled to be regularly checked) are checked.<br>"
- . "This option will automatically adjust the host inter-check delay (if necessary) to ensure that the initial checks of all hosts occur within the timeframe you specify.<br>"
- . "In general, this option will not have an affect on host check scheduling if scheduling information is being retained using the use_retained_scheduling_info option.<br>"
+$nagios_comment["max_host_check_spread"]="This option determines the maximum number of minutes from when Nagios starts that all hosts (that are scheduled to be regularly checked) are checked.<br />"
+ . "This option will automatically adjust the host inter-check delay (if necessary) to ensure that the initial checks of all hosts occur within the timeframe you specify.<br />"
+ . "In general, this option will not have an affect on host check scheduling if scheduling information is being retained using the use_retained_scheduling_info option.<br />"
. "Default value is 30 (minutes). ";
$nagios_comment["service_reaper_frequency"]="This is the frequency (in seconds!) that Nagios will process "
@@ -240,8 +240,8 @@ $nagios_comment["use_retained_program_state"]="This setting determines whether o
. "information, set this value to 1. If not, set this value "
. "to 0. ";
-$nagios_comment["use_retained_scheduling_info"]="This setting determines whether or not Nagios will retain scheduling info (next check times) for hosts and services when it restarts.<br>"
- . "If you are adding a large number (or percentage) of hosts and services, I would recommend disabling this option when you first restart Nagios, as it can adversely skew the spread of initial checks.<br>"
+$nagios_comment["use_retained_scheduling_info"]="This setting determines whether or not Nagios will retain scheduling info (next check times) for hosts and services when it restarts.<br />"
+ . "If you are adding a large number (or percentage) of hosts and services, I would recommend disabling this option when you first restart Nagios, as it can adversely skew the spread of initial checks.<br />"
. "Otherwise you will probably want to leave it enabled.";
$nagios_comment["interval_length"]="This is the seconds per unit interval as used in the "
@@ -267,14 +267,14 @@ $nagios_comment["accept_passive_service_checks"]="This determines whether or not
. "service checks results when it initially (re)starts. "
. "Values: 1 = accept passive checks, 0 = reject passive checks ";
-$nagios_comment["log_passive_checks"]="This variable determines whether or not Nagios will log passive host and service checks that it receives from the external command file.<br>"
+$nagios_comment["log_passive_checks"]="This variable determines whether or not Nagios will log passive host and service checks that it receives from the external command file.<br />"
. "If you are setting up a distributed monitoring environment or plan on handling a large number of passive checks on a regular basis, you may wish to disable this option so your log file doesn\'t get too large.";
$nagios_comment["execute_host_checks"]="This option determines whether or not Nagios will execute on-demand and regularly scheduled host checks when it initially (re)starts. "
- . "If this option is disabled, Nagios will not actively execute any host checks, although it can still accept passive host checks unless you\'ve disabled them).<br>"
+ . "If this option is disabled, Nagios will not actively execute any host checks, although it can still accept passive host checks unless you\'ve disabled them).<br />"
. "This option is most often used when configuring backup monitoring servers, as described in the documentation on redundancy, or when setting up a distributed monitoring environment.";
-$nagios_comment["accept_passive_host_checks"]= "This option determines whether or not Nagios will accept passive host checks when it initially (re)starts.<br>"
+$nagios_comment["accept_passive_host_checks"]= "This option determines whether or not Nagios will accept passive host checks when it initially (re)starts.<br />"
. "If this option is disabled, Nagios will not accept any passive host checks.";
$nagios_comment["enable_notifications"]="This determines whether or not Nagios will sent out any host or "
@@ -295,50 +295,50 @@ $nagios_comment["process_performance_data"]="This determines whether or not Nagi
. "performance data. "
. "Values: 1 = process performance data, 0 = do not process performance data ";
- $nagios_comment["host_perfdata_command"]="This option allows you to specify a command to be run after every host check to process host performance data that may be returned from the check.<br>"
- . "The command argument is the short name of a command definition that you define in your object configuration file.<br>"
+ $nagios_comment["host_perfdata_command"]="This option allows you to specify a command to be run after every host check to process host performance data that may be returned from the check.<br />"
+ . "The command argument is the short name of a command definition that you define in your object configuration file.<br />"
. "This command is only executed if the process_performance_data option is enabled globally and if the process_perf_data directive in the host definition is enabled.";
- $nagios_comment["service_perfdata_command"]="This option allows you to specify a command to be run after every service check to process service performance data that may be returned from the check.<br>"
- . "The command argument is the short name of a command definition that you define in your object configuration file.<br>"
+ $nagios_comment["service_perfdata_command"]="This option allows you to specify a command to be run after every service check to process service performance data that may be returned from the check.<br />"
+ . "The command argument is the short name of a command definition that you define in your object configuration file.<br />"
. "This command is only executed if the process_performance_data option is enabled globally and if the process_perf_data directive in the service definition is enabled.";
- $nagios_comment["host_perfdata_file"]="This option allows you to specify a file to which host performance data will be written after every host check.<br>"
- . "Data will be written to the performance file as specified by the host_perfdata_file_template option.<br>"
+ $nagios_comment["host_perfdata_file"]="This option allows you to specify a file to which host performance data will be written after every host check.<br />"
+ . "Data will be written to the performance file as specified by the host_perfdata_file_template option.<br />"
. "Performance data is only written to this file if the process_performance_data option is enabled globally and if the process_perf_data directive in the host definition is enabled.";
- $nagios_comment["service_perfdata_file"]="This option allows you to specify a file to which service performance data will be written after every service check.<br>"
- . "Data will be written to the performance file as specified by the service_perfdata_file_template option. <br>"
+ $nagios_comment["service_perfdata_file"]="This option allows you to specify a file to which service performance data will be written after every service check.<br />"
+ . "Data will be written to the performance file as specified by the service_perfdata_file_template option. <br />"
. "Performance data is only written to this file if the process_performance_data option is enabled globally and if the process_perf_data directive in the service definition is enabled.";
- $nagios_comment["host_perfdata_file_template"]="This option determines what (and how) data is written to the host performance data file.<br>"
- . "The template may contain macros, special characters ( t for tab, r for carriage return, n for newline) and plain text.<br>"
+ $nagios_comment["host_perfdata_file_template"]="This option determines what (and how) data is written to the host performance data file.<br />"
+ . "The template may contain macros, special characters ( t for tab, r for carriage return, n for newline) and plain text.<br />"
. "A newline is automatically added after each write to the performance data file.";
- $nagios_comment["service_perfdata_file_template"]="This option determines what (and how) data is written to the service performance data file.<br>"
- . "The template may contain macros, special characters (t for tab, r for carriage return, n for newline) and plain text.<br>"
+ $nagios_comment["service_perfdata_file_template"]="This option determines what (and how) data is written to the service performance data file.<br />"
+ . "The template may contain macros, special characters (t for tab, r for carriage return, n for newline) and plain text.<br />"
. "A newline is automatically added after each write to the performance data file.";
- $nagios_comment["host_perfdata_file_mode"]="This option determines whether the host performance data file is opened in write or append mode.<br>"
- . "Unless the file is a named pipe, you will probably want to use the default mode of append.<br>"
- . "a = Open file in append mode (default)<br>w = Open file in write mode ";
+ $nagios_comment["host_perfdata_file_mode"]="This option determines whether the host performance data file is opened in write or append mode.<br />"
+ . "Unless the file is a named pipe, you will probably want to use the default mode of append.<br />"
+ . "a = Open file in append mode (default)<br />w = Open file in write mode ";
- $nagios_comment["service_perfdata_file_mode"]="This option determines whether the service performance data file is opened in write or append mode.<br>"
- . "Unless the file is a named pipe, you will probably want to use the default mode of append.<br>"
- . "a = Open file in append mode (default)<br>w = Open file in write mode ";
+ $nagios_comment["service_perfdata_file_mode"]="This option determines whether the service performance data file is opened in write or append mode.<br />"
+ . "Unless the file is a named pipe, you will probably want to use the default mode of append.<br />"
+ . "a = Open file in append mode (default)<br />w = Open file in write mode ";
- $nagios_comment["host_perfdata_file_processing_interval"]="This option allows you to specify the interval (in seconds) at which the host performance data file is processed using the host performance data file processing command.<br>"
+ $nagios_comment["host_perfdata_file_processing_interval"]="This option allows you to specify the interval (in seconds) at which the host performance data file is processed using the host performance data file processing command.<br />"
. "A value of 0 indicates that the performance data file should not be processed at regular intervals.";
- $nagios_comment["service_perfdata_file_processing_interval"]="This option allows you to specify the interval (in seconds) at which the service performance data file is processed using the service performance data file processing command.<br>"
+ $nagios_comment["service_perfdata_file_processing_interval"]="This option allows you to specify the interval (in seconds) at which the service performance data file is processed using the service performance data file processing command.<br />"
. "A value of 0 indicates that the performance data file should not be processed at regular intervals.";
- $nagios_comment["host_perfdata_file_processing_command"]="This option allows you to specify the command that should be executed to process the host performance data file.<br>"
- . "The command argument is the short name of a command definition that you define in your object configuration file.<br>"
+ $nagios_comment["host_perfdata_file_processing_command"]="This option allows you to specify the command that should be executed to process the host performance data file.<br />"
+ . "The command argument is the short name of a command definition that you define in your object configuration file.<br />"
. "The interval at which this command is executed is determined by the host_perfdata_file_processing_interval directive.";
- $nagios_comment["service_perfdata_file_processing_command"]="This option allows you to specify the command that should be executed to process the service performance data file.<br>"
- . "The command argument is the short name of a command definition that you define in your object configuration file.<br>"
+ $nagios_comment["service_perfdata_file_processing_command"]="This option allows you to specify the command that should be executed to process the service performance data file.<br />"
+ . "The command argument is the short name of a command definition that you define in your object configuration file.<br />"
. "The interval at which this command is executed is determined by the service_perfdata_file_processing_interval directive.";
$nagios_comment["obsess_over_services"]="This determines whether or not Nagios will obsess over service "
@@ -348,9 +348,9 @@ $nagios_comment["obsess_over_services"]="This determines whether or not Nagios w
. "implementing distributed monitoring. "
. "Values: 1 = obsess over services, 0 = do not obsess (default) ";
-$nagios_comment["obsess_over_hosts"]="This value determines whether or not Nagios will «obsess« over host checks results and run the obsessive compulsive host processor command you define.<br>"
- . "I know - funny name, but it was all I could think of.<br>"
- . "This option is useful for performing distributed monitoring.<br>"
+$nagios_comment["obsess_over_hosts"]="This value determines whether or not Nagios will «obsess« over host checks results and run the obsessive compulsive host processor command you define.<br />"
+ . "I know - funny name, but it was all I could think of.<br />"
+ . "This option is useful for performing distributed monitoring.<br />"
. "If you're not doing distributed monitoring, don't enable this option.";
$nagios_comment["ocsp_command"]="This is the command that is run for every service check that is "
@@ -360,10 +360,10 @@ $nagios_comment["ocsp_command"]="This is the command that is run for every servi
. "define in your host configuration file. Read the HTML docs for "
. "more information on implementing distributed monitoring. ";
-$nagios_comment["ochp_command"]="This option allows you to specify a command to be run after every host check, which can be useful in distributed monitoring.<br>"
- . "This command is executed after any event handler or notification commands.<br>"
- . "The command argument is the short name of a command definition that you define in your object configuration file.<br>"
- . "The maximum amount of time that this command can run is controlled by the ochp_timeout option.<br>"
+$nagios_comment["ochp_command"]="This option allows you to specify a command to be run after every host check, which can be useful in distributed monitoring.<br />"
+ . "This command is executed after any event handler or notification commands.<br />"
+ . "The command argument is the short name of a command definition that you define in your object configuration file.<br />"
+ . "The maximum amount of time that this command can run is controlled by the ochp_timeout option.<br />"
. "This command is only executed if the obsess_over_hosts option is enabled globally and if the obsess_over_host directive in the host definition is enabled.";
$nagios_comment["check_for_orphaned_services"]="This determines whether or not Nagios will periodically "
@@ -382,13 +382,13 @@ $nagios_comment["check_service_freshness"]="This option determines whether or no
. "manner. "
. "Values: 1 = enabled freshness checking, 0 = disable freshness checking ";
-$nagios_comment["service_freshness_check_interval"]="This setting determines how often (in seconds) Nagios will periodically check the «freshness« of service check results.<br>"
+$nagios_comment["service_freshness_check_interval"]="This setting determines how often (in seconds) Nagios will periodically check the «freshness« of service check results.<br />"
. "If you have disabled service freshness checking (with the check_service_freshness option), this option has no effect.";
-$nagios_comment["check_host_freshness"]="This option determines whether or not Nagios will periodically check the «freshness« of host checks.<br>"
+$nagios_comment["check_host_freshness"]="This option determines whether or not Nagios will periodically check the «freshness« of host checks.<br />"
. "Enabling this option is useful for helping to ensure that passive host checks are received in a timely manner.";
-$nagios_comment["host_freshness_check_interval"]="This setting determines how often (in seconds) Nagios will periodically check the «freshness« of host check results.<br>"
+$nagios_comment["host_freshness_check_interval"]="This setting determines how often (in seconds) Nagios will periodically check the «freshness« of host check results.<br />"
. "If you have disabled host freshness checking (with the check_host_freshness option), this option has no effect.";
$nagios_comment["freshness_check_interval"]="This setting determines how often (in seconds) Nagios will "
@@ -427,25 +427,25 @@ $nagios_comment["flap_threshold"]="Read the HTML documentation on flap detection
. "has no effect if flap detection is disabled. ";
$nagios_comment["date_format"]="This option determines how short dates are displayed. Valid options "
- . "include:<br> "
- . "us (MM-DD-YYYY HH:MM:SS) <br>"
- . "euro (DD-MM-YYYY HH:MM:SS) <br>"
- . "iso8601 (YYYY-MM-DD HH:MM:SS) <br>"
+ . "include:<br /> "
+ . "us (MM-DD-YYYY HH:MM:SS) <br />"
+ . "euro (DD-MM-YYYY HH:MM:SS) <br />"
+ . "iso8601 (YYYY-MM-DD HH:MM:SS) <br />"
. "strict-iso8601 (YYYY-MM-DDTHH:MM:SS) ";
$nagios_comment["illegal_object_name_chars"]="This options allows you to specify illegal characters that cannot "
. "be used in host names, service descriptions, or names of other "
. "object types. ";
-$nagios_comment["use_regexp_matching"]="If you\'ve enabled regular expression matching of various object directives using the use_regexp_matching option, this option will determine when object directives are treated as regular expressions.<br>"
- . "If this option is disabled (the default), directives will only be treated as regular expressions if the contain a * or ? wildcard character.<br>"
- . "If this option is enabled, all appropriate directives will be treated as regular expression - be careful when enabling this!<br>"
- . "0 = Don\'t use true regular expression matching (default)<br>1 = Use true regular expression matching ";
+$nagios_comment["use_regexp_matching"]="If you\'ve enabled regular expression matching of various object directives using the use_regexp_matching option, this option will determine when object directives are treated as regular expressions.<br />"
+ . "If this option is disabled (the default), directives will only be treated as regular expressions if the contain a * or ? wildcard character.<br />"
+ . "If this option is enabled, all appropriate directives will be treated as regular expression - be careful when enabling this!<br />"
+ . "0 = Don\'t use true regular expression matching (default)<br />1 = Use true regular expression matching ";
- $nagios_comment["use_true_regexp_matching"]="If you\'ve enabled regular expression matching of various object directives using the use_regexp_matching option, this option will determine when object directives are treated as regular expressions.<br>"
- . "If this option is disabled (the default), directives will only be treated as regular expressions if the contain a * or ? wildcard character..<br>"
- . "If this option is enabled, all appropriate directives will be treated as regular expression - be careful when enabling this!<br>"
- . "0 = Don\'t use regular expression matching (default)<br>1 = Use regular expression matching ";
+ $nagios_comment["use_true_regexp_matching"]="If you\'ve enabled regular expression matching of various object directives using the use_regexp_matching option, this option will determine when object directives are treated as regular expressions.<br />"
+ . "If this option is disabled (the default), directives will only be treated as regular expressions if the contain a * or ? wildcard character..<br />"
+ . "If this option is enabled, all appropriate directives will be treated as regular expression - be careful when enabling this!<br />"
+ . "0 = Don\'t use regular expression matching (default)<br />1 = Use regular expression matching ";
$nagios_comment["illegal_macro_output_chars"]="This options allows you to specify illegal characters that are "
. "stripped from macros before being used in notifications, event "
@@ -464,16 +464,16 @@ $nagios_comment["admin_pager"]="The pager number/address for the administrator o
. "value by using the \$ADMINPAGER\$ macro in your notification "
. "commands. ";
-$nagios_comment["auto_reschedule_checks"]="This option determines whether or not Nagios will attempt to automatically reschedule active host and service checks to «smooth« them out over time.<br>"
+$nagios_comment["auto_reschedule_checks"]="This option determines whether or not Nagios will attempt to automatically reschedule active host and service checks to «smooth« them out over time.<br />"
. "This can help to balance the load on the monitoring server, as it will attempt to keep the time between consecutive checks consistent, at the expense of executing checks on a more rigid schedule.";
-$nagios_comment["auto_rescheduling_interval"]="This option determines how often (in seconds) Nagios will attempt to automatically reschedule checks.<br>"
- . "This option only has an effect if the auto_reschedule_checks option is enabled.<br>"
+$nagios_comment["auto_rescheduling_interval"]="This option determines how often (in seconds) Nagios will attempt to automatically reschedule checks.<br />"
+ . "This option only has an effect if the auto_reschedule_checks option is enabled.<br />"
. "Default is 30 seconds.";
-$nagios_comment["auto_rescheduling_window"]="This option determines the «window« of time (in seconds) that Nagios will look at when automatically rescheduling checks.<br>"
- . "Only host and service checks that occur in the next X seconds (determined by this variable) will be rescheduled.<br>"
- . "This option only has an effect if the auto_reschedule_checks option is enabled.<br>"
+$nagios_comment["auto_rescheduling_window"]="This option determines the «window« of time (in seconds) that Nagios will look at when automatically rescheduling checks.<br />"
+ . "Only host and service checks that occur in the next X seconds (determined by this variable) will be rescheduled.<br />"
+ . "This option only has an effect if the auto_reschedule_checks option is enabled.<br />"
. "Default is 180 seconds (3 minutes).";
?>
\ No newline at end of file
diff --git a/www/include/configuration/configNagios/formNagios.php b/www/include/configuration/configNagios/formNagios.php
index 769539b923584b3797df35e534df5e8fa38b612e..63744ba76ff2319ad136d937b9dabe8dcb6dee84 100644
--- a/www/include/configuration/configNagios/formNagios.php
+++ b/www/include/configuration/configNagios/formNagios.php
@@ -23,7 +23,7 @@ For information : contact@oreon-project.org
if (($o == "c" || $o == "w") && $nagios_id) {
$DBRESULT =& $pearDB->query("SELECT * FROM cfg_nagios WHERE nagios_id = '".$nagios_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$nagios = array_map("myDecode", $DBRESULT->fetchRow());
$DBRESULT->free();
@@ -35,7 +35,7 @@ For information : contact@oreon-project.org
$checkCmds = array();
$DBRESULT =& $pearDB->query("SELECT command_id, command_name FROM command ORDER BY command_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$checkCmds = array(NULL=>NULL);
while($DBRESULT->fetchInto($checkCmd))
$checkCmds[$checkCmd["command_id"]] = $checkCmd["command_name"];
@@ -59,7 +59,7 @@ For information : contact@oreon-project.org
$attrsText2 = array("size"=>"50");
$attrsText3 = array("size"=>"10");
$attrsTextarea = array("rows"=>"5", "cols"=>"40");
- $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br><br><br>{remove}</td><td>{selected}</td></tr></table>";
+ $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br /><br /><br />{remove}</td><td>{selected}</td></tr></table>";
#
## Form begin
diff --git a/www/include/configuration/configNagios/listNagios.php b/www/include/configuration/configNagios/listNagios.php
index 83469119aabc4c2df9806589e9857e69c3e85260..5669939ef3b6a07d8eb2178dffb2dda155411d39 100644
--- a/www/include/configuration/configNagios/listNagios.php
+++ b/www/include/configuration/configNagios/listNagios.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
$SearchTool = "WHERE nagios_name LIKE '%".htmlentities($search, ENT_QUOTES)."%'";
$DBRESULT = & $pearDB->query("SELECT COUNT(*) FROM cfg_nagios $SearchTool");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp = & $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
@@ -37,7 +37,7 @@ For information : contact@oreon-project.org
$nagios_servers = array(NULL => "");
$DBRESULT =& $pearDB->query("SELECT * FROM nagios_server ORDER BY name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($nagios_server = $DBRESULT->fetchRow())
$nagios_servers[$nagios_server["id"]] = $nagios_server["name"];
$DBRESULT->free();
@@ -71,7 +71,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query("SELECT nagios_id, nagios_name, nagios_comment, nagios_activate, nagios_server_id FROM cfg_nagios $SearchTool ORDER BY nagios_name LIMIT ".$num * $limit.", ".$limit);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$form = new HTML_QuickForm('select_form', 'POST', "?p=".$p);
diff --git a/www/include/configuration/configNdo2db/DB-Func.php b/www/include/configuration/configNdo2db/DB-Func.php
index 9b9d5d56fed7cbe4d369e1e63b7e107507b310ce..860922cf32f1f140f597f59ba248e96e9199055e 100644
--- a/www/include/configuration/configNdo2db/DB-Func.php
+++ b/www/include/configuration/configNdo2db/DB-Func.php
@@ -25,7 +25,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('ndo2db_id');
$DBRESULT =& $pearDB->query("SELECT description, id FROM cfg_ndo2db WHERE `description` = '".htmlentities($name, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$ndo2db =& $DBRESULT->fetchRow();
if ($DBRESULT->numRows() >= 1 && $ndo2db["id"] == $id)#Modif case
return true;
@@ -40,7 +40,7 @@ For information : contact@oreon-project.org
global $pearDB, $oreon;
$DBRESULT =& $pearDB->query("UPDATE `cfg_ndo2db` SET `activate` = '1' WHERE id = '".$id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function disableNdo2dbInDB ($id = null) {
@@ -54,7 +54,7 @@ For information : contact@oreon-project.org
foreach($ndo2db as $key => $value) {
$DBRESULT =& $pearDB->query("DELETE FROM `cfg_ndo2db` WHERE id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
$DBRESULT->free();
}
@@ -64,7 +64,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT * FROM `cfg_ndo2db` WHERE id = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["id"] = '';
$row["activate"] = '0';
@@ -79,7 +79,7 @@ For information : contact@oreon-project.org
$val ? $rq = "INSERT INTO `cfg_ndo2db` VALUES (".$val.")" : $rq = null;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
@@ -125,10 +125,10 @@ For information : contact@oreon-project.org
isset($ret["activate"]) && $ret["activate"]["activate"] != NULL ? $rq .= "'".$ret["activate"]["activate"]."')" : $rq .= "NULL )";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(id) FROM `cfg_ndo2db`");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$ndo2db_id = $DBRESULT->fetchRow();
$DBRESULT->free();
return ($ndo2db_id["MAX(id)"]);
@@ -161,6 +161,6 @@ For information : contact@oreon-project.org
$rq .= "WHERE id = '".$id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
?>
\ No newline at end of file
diff --git a/www/include/configuration/configNdo2db/formNdo2db.php b/www/include/configuration/configNdo2db/formNdo2db.php
index ca39a35a37806da9c3cadcd83cab1fc978a9fec4..2de556fc730f54e1ee35834a8751d99608579af0 100644
--- a/www/include/configuration/configNdo2db/formNdo2db.php
+++ b/www/include/configuration/configNdo2db/formNdo2db.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
if (($o == "c" || $o == "w") && $id) {
$DBRESULT =& $pearDB->query("SELECT * FROM cfg_ndo2db WHERE id = '".$id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$cfg_ndo2db = array_map("myDecode", $DBRESULT->fetchRow());
$DBRESULT->free();
@@ -38,7 +38,7 @@ For information : contact@oreon-project.org
$checkCmds = array();
$DBRESULT =& $pearDB->query("SELECT command_id, command_name FROM command ORDER BY command_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$checkCmds = array(NULL=>NULL);
while($DBRESULT->fetchInto($checkCmd))
$checkCmds[$checkCmd["command_id"]] = $checkCmd["command_name"];
@@ -48,7 +48,7 @@ For information : contact@oreon-project.org
$nagios_servers = array();
$DBRESULT =& $pearDB->query("SELECT * FROM nagios_server ORDER BY name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($nagios_server = $DBRESULT->fetchRow())
$nagios_servers[$nagios_server["id"]] = $nagios_server["name"];
$DBRESULT->free();
@@ -64,7 +64,7 @@ For information : contact@oreon-project.org
$attrsText2 = array("size"=>"50");
$attrsText3 = array("size"=>"10");
$attrsTextarea = array("rows"=>"5", "cols"=>"40");
- $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br><br><br>{remove}</td><td>{selected}</td></tr></table>";
+ $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br /><br /><br />{remove}</td><td>{selected}</td></tr></table>";
#
## Form begin
diff --git a/www/include/configuration/configNdo2db/listNdo2db.php b/www/include/configuration/configNdo2db/listNdo2db.php
index 8d38d9719f832eb1ce97bcc10717f273b91b76fd..5d70f8615c572d324f1e6bc81e49cfe572f5e38b 100644
--- a/www/include/configuration/configNdo2db/listNdo2db.php
+++ b/www/include/configuration/configNdo2db/listNdo2db.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
else
$DBRESULT = & $pearDB->query("SELECT COUNT(*) FROM `cfg_ndo2db`");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp = & $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
@@ -37,7 +37,7 @@ For information : contact@oreon-project.org
$nagios_servers = array();
$DBRESULT =& $pearDB->query("SELECT * FROM nagios_server ORDER BY name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($nagios_server = $DBRESULT->fetchRow())
$nagios_servers[$nagios_server["id"]] = $nagios_server["name"];
$DBRESULT->free();
@@ -73,7 +73,7 @@ For information : contact@oreon-project.org
$rq = "SELECT id, description, ns_nagios_server, activate FROM cfg_ndo2db ORDER BY description LIMIT ".$num * $limit.", ".$limit;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$form = new HTML_QuickForm('select_form', 'POST', "?p=".$p);
diff --git a/www/include/configuration/configNdomod/DB-Func.php b/www/include/configuration/configNdomod/DB-Func.php
index eb5e2e907109dc78c48a18e396bf9e145b85fd61..eace5e8ef81b99ef96202e4955fa41f285898644 100644
--- a/www/include/configuration/configNdomod/DB-Func.php
+++ b/www/include/configuration/configNdomod/DB-Func.php
@@ -25,7 +25,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('id');
$DBRESULT =& $pearDB->query("SELECT description, id FROM cfg_ndomod WHERE `description` = '".htmlentities($name, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$ndomod =& $DBRESULT->fetchRow();
if ($DBRESULT->numRows() >= 1 && $ndomod["id"] == $id)#Modif case
return true;
@@ -40,7 +40,7 @@ For information : contact@oreon-project.org
global $pearDB, $oreon;
$DBRESULT =& $pearDB->query("UPDATE `cfg_ndomod` SET `activate` = '1' WHERE id = '".$id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function disableNdomodInDB ($id = null) {
@@ -54,7 +54,7 @@ For information : contact@oreon-project.org
foreach($ndomod as $key => $value) {
$DBRESULT =& $pearDB->query("DELETE FROM `cfg_ndomod` WHERE id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -63,7 +63,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT * FROM `cfg_ndomod` WHERE id = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["id"] = '';
$row["activate"] = '0';
@@ -78,7 +78,7 @@ For information : contact@oreon-project.org
$val ? $rq = "INSERT INTO `cfg_ndomod` VALUES (".$val.")" : $rq = null;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
@@ -122,10 +122,10 @@ For information : contact@oreon-project.org
print_r($ret);
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(id) FROM `cfg_ndomod`");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$ndomod_id = $DBRESULT->fetchRow();
$DBRESULT->free();
return ($ndomod_id["MAX(id)"]);
@@ -155,6 +155,6 @@ For information : contact@oreon-project.org
$rq .= "WHERE id = '".$id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
?>
\ No newline at end of file
diff --git a/www/include/configuration/configNdomod/formNdomod.php b/www/include/configuration/configNdomod/formNdomod.php
index 7ba71782b888a0efe150fc54318e485524af5295..29abc9ad6966481e1780a5c5c7ae8a4c036626d3 100644
--- a/www/include/configuration/configNdomod/formNdomod.php
+++ b/www/include/configuration/configNdomod/formNdomod.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
if (($o == "c" || $o == "w") && $id) {
$DBRESULT =& $pearDB->query("SELECT * FROM cfg_ndomod WHERE id = '".$id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$cfg_ndomod = array_map("myDecode", $DBRESULT->fetchRow());
$DBRESULT->free();
@@ -36,7 +36,7 @@ For information : contact@oreon-project.org
$nagios_servers = array();
$DBRESULT =& $pearDB->query("SELECT * FROM nagios_server ORDER BY name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($nagios_server = $DBRESULT->fetchRow())
$nagios_servers[$nagios_server["id"]] = $nagios_server["name"];
$DBRESULT->free();
@@ -52,7 +52,7 @@ For information : contact@oreon-project.org
$attrsText2 = array("size"=>"50");
$attrsText3 = array("size"=>"10");
$attrsTextarea = array("rows"=>"5", "cols"=>"40");
- $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br><br><br>{remove}</td><td>{selected}</td></tr></table>";
+ $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br /><br /><br />{remove}</td><td>{selected}</td></tr></table>";
#
## Form begin
diff --git a/www/include/configuration/configNdomod/listNdomod.php b/www/include/configuration/configNdomod/listNdomod.php
index 67af3a99eabcb6eea9c67022545655e115ba1c52..57ee9d7ce61f8a99b3f74594f38307852f3dcc12 100644
--- a/www/include/configuration/configNdomod/listNdomod.php
+++ b/www/include/configuration/configNdomod/listNdomod.php
@@ -27,7 +27,7 @@ For information : contact@oreon-project.org
$DBRESULT = & $pearDB->query("SELECT COUNT(*) FROM `cfg_ndomod` $SearchTool");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp = & $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
@@ -38,7 +38,7 @@ For information : contact@oreon-project.org
$nagios_servers = array();
$DBRESULT =& $pearDB->query("SELECT * FROM cfg_ndomod ORDER BY description");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($nagios_server = $DBRESULT->fetchRow())
$nagios_servers[$nagios_server["id"]] = $nagios_server["description"];
$DBRESULT->free();
@@ -74,7 +74,7 @@ For information : contact@oreon-project.org
$rq = "SELECT id, description, instance_name, ns_nagios_server, activate FROM cfg_ndomod $SearchTool ORDER BY description LIMIT ".$num * $limit.", ".$limit;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$form = new HTML_QuickForm('select_form', 'POST', "?p=".$p);
diff --git a/www/include/configuration/configObject/command/DB-Func.php b/www/include/configuration/configObject/command/DB-Func.php
index 8bfdd8775affb931851a055dd075aff5cebe0dec..c09b3e24444db130ae120c252b479eb3ed1d0749 100644
--- a/www/include/configuration/configObject/command/DB-Func.php
+++ b/www/include/configuration/configObject/command/DB-Func.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('command_id');
$DBRESULT =& $pearDB->query("SELECT command_name, command_id FROM command WHERE command_name = '".htmlentities($name, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$command =& $DBRESULT->fetchRow();
#Modif case
if ($DBRESULT->numRows() >= 1 && $command["command_id"] == $id)
@@ -43,7 +43,7 @@ For information : contact@oreon-project.org
foreach($commands as $key=>$value) {
$DBRESULT =& $pearDB->query("DELETE FROM command WHERE command_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -52,7 +52,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT * FROM command WHERE command_id = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["command_id"] = '';
for ($i = 1; $i <= $nbrDup[$key]; $i++) {
@@ -65,7 +65,7 @@ For information : contact@oreon-project.org
$val ? $rq = "INSERT INTO command VALUES (".$val.")" : $rq = null;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
@@ -102,7 +102,7 @@ For information : contact@oreon-project.org
"WHERE command_id = '".$cmd_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function insertCommandInDB ($ret = array()) {
@@ -132,10 +132,10 @@ For information : contact@oreon-project.org
$rq .= "('".htmlentities($ret["command_name"], ENT_QUOTES)."', '".htmlentities($ret["command_line"], ENT_QUOTES)."', '".htmlentities($ret["command_example"], ENT_QUOTES)."', '".$ret["command_type"]["command_type"]."', '".$ret["graph_id"]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(command_id) FROM command");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$cmd_id = $DBRESULT->fetchRow();
return ($cmd_id["MAX(command_id)"]);
}
diff --git a/www/include/configuration/configObject/command/formCommand.ihtml b/www/include/configuration/configObject/command/formCommand.ihtml
index 9797a4c8ecdc080fad4a1956bbaf753c5f5ca1c6..1d4d30965a4a706afde9a5d4b1f34a32c781d85e 100644
--- a/www/include/configuration/configObject/command/formCommand.ihtml
+++ b/www/include/configuration/configObject/command/formCommand.ihtml
@@ -27,13 +27,13 @@
<input type="button" value=" < < " onclick="insertValueQuery(1)" />
{$form.resource.html}
- <br><br>
+ <br /><br />
<input type="button" value=" < < " onclick="insertValueQuery(2)" />
{$form.plugins.html}
<img alt='{$cmd_help}' title='{$cmd_help}' src='./img/icones/16x16/about.gif' onClick="window.open('oreon.php?p=60706&command_name='+ document.Form.plugins.value + '&o=h&min=1','','toolbar=no,location=no,directories=no,status=no,scrollbars=yes,resizable=yes,copyhistory=no, width=700, height=400');">
- <br><br>
+ <br /><br />
<input type="button" value=" < < " onclick="insertValueQuery(3)" />
diff --git a/www/include/configuration/configObject/command/formCommand.php b/www/include/configuration/configObject/command/formCommand.php
index eda304d85c1cbdd6b7b03beadf60828438524411..0b432ec0d48ceae77c98847446b47bbadfd5de54 100644
--- a/www/include/configuration/configObject/command/formCommand.php
+++ b/www/include/configuration/configObject/command/formCommand.php
@@ -34,7 +34,7 @@ For information : contact@oreon-project.org
if (($o == "c" || $o == "w") && $command_id) {
$DBRESULT =& $pearDB->query("SELECT * FROM command WHERE command_id = '".$command_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$cmd = array_map("myDecodeCommand", $DBRESULT->fetchRow());
}
@@ -45,7 +45,7 @@ For information : contact@oreon-project.org
$resource = array();
$DBRESULT =& $pearDB->query("SELECT DISTINCT resource_line FROM cfg_resource ORDER BY resource_line");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($row)) {
$row["resource_line"] = explode("=", $row["resource_line"]);
$resource[$row["resource_line"][0]] = $row["resource_line"][0];
@@ -58,7 +58,7 @@ For information : contact@oreon-project.org
$graphTpls = array(NULL=>NULL);
$DBRESULT =& $pearDB->query("SELECT graph_id, name FROM giv_graphs_template ORDER BY name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($graphTpl))
$graphTpls[$graphTpl["graph_id"]] = $graphTpl["name"];
$DBRESULT->free();
@@ -67,7 +67,7 @@ For information : contact@oreon-project.org
$macros = array();
$DBRESULT =& $pearDB->query("SELECT macro_name FROM nagios_macro ORDER BY macro_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($row))
$macros[$row["macro_name"]] = $row["macro_name"];
$DBRESULT->free();
diff --git a/www/include/configuration/configObject/command/listCommand.php b/www/include/configuration/configObject/command/listCommand.php
index 412cd6aee1790bcb69e320de088fa0aafeea0ae6..4721ba0be9eafd1a390651596cff0c180529a74f 100644
--- a/www/include/configuration/configObject/command/listCommand.php
+++ b/www/include/configuration/configObject/command/listCommand.php
@@ -42,7 +42,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query($req);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp = & $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
@@ -77,7 +77,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$form = new HTML_QuickForm('form', 'POST', "?p=".$p);
diff --git a/www/include/configuration/configObject/command/minCommand.php b/www/include/configuration/configObject/command/minCommand.php
index f7451c92490124f0662cc33211bf2b424a50edff..7b0fd59237b14ad5a03453df7952b35ffdbc1276 100644
--- a/www/include/configuration/configObject/command/minCommand.php
+++ b/www/include/configuration/configObject/command/minCommand.php
@@ -34,7 +34,7 @@ For information : contact@oreon-project.org
}
$DBRESULT =& $pearDB->query("SELECT * FROM command WHERE command_id = '".$command_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
if ($DBRESULT->numRows())
$cmd = array_map("myDecodeCommand", $DBRESULT->fetchRow());
@@ -46,7 +46,7 @@ For information : contact@oreon-project.org
$notifCmds = array(null=>null);
$DBRESULT =& $pearDB->query("SELECT command_id, command_name FROM command WHERE command_type = '1' ORDER BY command_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($notifCmd))
$notifCmds[$notifCmd["command_id"]] = $notifCmd["command_name"];
$DBRESULT->free();
@@ -54,7 +54,7 @@ For information : contact@oreon-project.org
$checkCmds = array(null=>null);
$DBRESULT =& $pearDB->query("SELECT command_id, command_name FROM command WHERE command_type = '2' ORDER BY command_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($checkCmd))
$checkCmds[$checkCmd["command_id"]] = $checkCmd["command_name"];
$DBRESULT->free();
diff --git a/www/include/configuration/configObject/command/minHelpCommand.php b/www/include/configuration/configObject/command/minHelpCommand.php
index 93fb31770a2d8444777926fd55dcf671740ab295..260a43a595d35195f0519e11d80e65ea59ede45e 100644
--- a/www/include/configuration/configObject/command/minHelpCommand.php
+++ b/www/include/configuration/configObject/command/minHelpCommand.php
@@ -33,7 +33,7 @@ For information : contact@oreon-project.org
if($command_id != NULL){
$DBRESULT =& $pearDB->query("SELECT * FROM command WHERE command_id = '".$command_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$cmd = $DBRESULT->fetchRow();
$cmd_array = explode(" ", $cmd["command_line"]);
@@ -46,7 +46,7 @@ For information : contact@oreon-project.org
if (preg_match("/@DOLLAR@USER([0-9]+)@DOLLAR@/", $resource_def, $matches)) {
$DBRESULT =& $pearDB->query("SELECT resource_line FROM cfg_resource WHERE resource_name = '\$USER".$matches[1]."\$' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$resource = $DBRESULT->fetchRow();
$resource_path = explode("=", $resource["resource_line"]);
$resource_path = $resource_path[1];
@@ -62,7 +62,7 @@ For information : contact@oreon-project.org
$command = str_replace("#S#", "/", $command);
$stdout = shell_exec($command." --help");
- $msg = str_replace ("\n", "<br>", $stdout);
+ $msg = str_replace ("\n", "<br />", $stdout);
$attrsText = array("size"=>"25");
$form = new HTML_QuickForm('Form', 'post', "?p=".$p);
diff --git a/www/include/configuration/configObject/command_categories/DB-Func.php b/www/include/configuration/configObject/command_categories/DB-Func.php
index 81e5013f6641356831b4a2fa05acad8879292f3a..8c9964066158879537ba004bab6ffcf914057649 100644
--- a/www/include/configuration/configObject/command_categories/DB-Func.php
+++ b/www/include/configuration/configObject/command_categories/DB-Func.php
@@ -25,7 +25,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('cmd_category_id');
$DBRESULT =& $pearDB->query("SELECT `category_name`, `cmd_category_id` FROM `command_categories` WHERE `category_name` = '".htmlentities($name, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT->fetchInto($cat);
if ($DBRESULT->numRows() >= 1 && $cat["cmd_category_id"] == $id)
return true;
@@ -40,7 +40,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT * FROM `command_categories` WHERE `cmd_category_id` = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["cmd_category_id"] = '';
for ($i = 1; $i <= $nbrDup[$key]; $i++) {
@@ -54,10 +54,10 @@ For information : contact@oreon-project.org
$val ? $rq = "INSERT INTO `command_categories` VALUES (".$val.")" : $rq = null;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(cmd_category_id) FROM `command_categories`");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$maxId =& $DBRESULT->fetchRow();
}
}
@@ -69,7 +69,7 @@ For information : contact@oreon-project.org
if (testCommandCategorieExistence($_POST["category_name"])){
$DBRESULT =& $pearDB->query("INSERT INTO `command_categories` (`category_name` , `category_alias`, `category_order`) VALUES ('".$_POST["category_name"]."', '".$_POST["category_alias"]."', '1')");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -77,7 +77,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("UPDATE `command_categories` SET `category_name` = '".$_POST["category_name"]."' , `category_alias` = '".$_POST["category_alias"]."' , `category_order` = '".$_POST["category_order"]."' WHERE `cmd_category_id` = '".$_POST["cmd_category_id"]."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function deleteCommandCategorieInDB($sc_id = NULL){
@@ -86,7 +86,7 @@ For information : contact@oreon-project.org
foreach ($select as $key => $value){
$DBRESULT =& $pearDB->query("DELETE FROM `command_categories` WHERE `cmd_category_id` = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
diff --git a/www/include/configuration/configObject/command_categories/formCommandCategories.php b/www/include/configuration/configObject/command_categories/formCommandCategories.php
index 7c30bfd7f8683178c786b3f7b50142bbb36107ff..d36f44d5bbfb7879c2467a30cb67b44dbfa84cad 100644
--- a/www/include/configuration/configObject/command_categories/formCommandCategories.php
+++ b/www/include/configuration/configObject/command_categories/formCommandCategories.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
if (($o == "c" || $o == "w") && $cc_id) {
$DBRESULT =& $pearDB->query("SELECT * FROM `command_categories` WHERE `cmd_category_id` = '".$cc_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
/*
* Set base value
*/
@@ -38,7 +38,7 @@ For information : contact@oreon-project.org
$attrsText2 = array("size"=>"60");
$attrsAdvSelect = array("style" => "width: 200px; height: 100px;");
$attrsTextarea = array("rows"=>"5", "cols"=>"40");
- $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br><br><br>{remove}</td><td>{selected}</td></tr></table>";
+ $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br /><br /><br />{remove}</td><td>{selected}</td></tr></table>";
/*
* Form begin
diff --git a/www/include/configuration/configObject/command_categories/listCommandCategories.php b/www/include/configuration/configObject/command_categories/listCommandCategories.php
index cf0d53232736cdce6bb5b59a58e8296f9899b2ad..08d1b90113803706987831b9c0848a63cfcbf0ea 100644
--- a/www/include/configuration/configObject/command_categories/listCommandCategories.php
+++ b/www/include/configuration/configObject/command_categories/listCommandCategories.php
@@ -25,7 +25,7 @@ For information : contact@oreon-project.org
$SearchTool = "WHERE (category_name LIKE '%".htmlentities($search, ENT_QUOTES)."%' OR category_alias LIKE '%".htmlentities($search, ENT_QUOTES)."%')";
$DBRESULT = & $pearDB->query("SELECT COUNT(*) FROM command_categories $SearchTool");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp = & $DBRESULT->fetchRow();
$DBRESULT->free();
@@ -59,7 +59,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query("SELECT * FROM command_categories $SearchTool ORDER BY category_order, category_name LIMIT ".$num * $limit.", ".$limit);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$search = tidySearchKey($search, $advanced_search);
diff --git a/www/include/configuration/configObject/contact/DB-Func.php b/www/include/configuration/configObject/contact/DB-Func.php
index 7231dceffecd8f62b2ee5c267d591481f6d4176f..933fee9fe97397d5056ebae4c6e0e653ebba3c5d 100644
--- a/www/include/configuration/configObject/contact/DB-Func.php
+++ b/www/include/configuration/configObject/contact/DB-Func.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('contact_id');
$DBRESULT =& $pearDB->query("SELECT contact_name, contact_id FROM contact WHERE contact_name = '".htmlentities($name, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$contact =& $DBRESULT->fetchRow();
#Modif case
if ($DBRESULT->numRows() >= 1 && $contact["contact_id"] == $id)
@@ -46,7 +46,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('contact_id');
$DBRESULT =& $pearDB->query("SELECT contact_alias, contact_id FROM contact WHERE contact_alias = '".htmlentities($alias, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$contact =& $DBRESULT->fetchRow();
#Modif case
if ($DBRESULT->numRows() >= 1 && $contact["contact_id"] == $id)
@@ -63,7 +63,7 @@ For information : contact@oreon-project.org
global $form;
$DBRESULT =& $pearDB->query("SELECT COUNT(*) AS nbr_valid FROM contact WHERE contact_activate = '1' AND contact_oreon = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if (isset($form))
$cct_oreon = $form->getSubmitValue('contact_oreon');
else
@@ -86,7 +86,7 @@ For information : contact@oreon-project.org
foreach($contact_arr as $key=>$value) {
$DBRESULT =& $pearDB->query("UPDATE contact SET contact_activate = '1' WHERE contact_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -99,7 +99,7 @@ For information : contact@oreon-project.org
if (keepOneContactAtLeast()) {
$DBRESULT =& $pearDB->query("UPDATE contact SET contact_activate = '0' WHERE contact_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
@@ -109,7 +109,7 @@ For information : contact@oreon-project.org
foreach($contacts as $key=>$value) {
$DBRESULT =& $pearDB->query("DELETE FROM contact WHERE contact_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -118,7 +118,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT * FROM contact WHERE contact_id = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["contact_id"] = '';
for ($i = 1; $i <= $nbrDup[$key]; $i++) {
@@ -132,35 +132,35 @@ For information : contact@oreon-project.org
$val ? $rq = "INSERT INTO contact VALUES (".$val.")" : $rq = null;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(contact_id) FROM contact");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$maxId =& $DBRESULT->fetchRow();
if (isset($maxId["MAX(contact_id)"])) {
$DBRESULT =& $pearDB->query("SELECT DISTINCT command_command_id FROM contact_hostcommands_relation WHERE contact_contact_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($hostCmd)) {
$DBRESULT2 =& $pearDB->query("INSERT INTO contact_hostcommands_relation VALUES ('', '".$maxId["MAX(contact_id)"]."', '".$hostCmd["command_command_id"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT =& $pearDB->query("SELECT DISTINCT command_command_id FROM contact_servicecommands_relation WHERE contact_contact_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($serviceCmd)) {
$DBRESULT2 =& $pearDB->query("INSERT INTO contact_servicecommands_relation VALUES ('', '".$maxId["MAX(contact_id)"]."', '".$serviceCmd["command_command_id"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT =& $pearDB->query("SELECT DISTINCT contactgroup_cg_id FROM contactgroup_contact_relation WHERE contact_contact_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($Cg)) {
$DBRESULT2 =& $pearDB->query("INSERT INTO contactgroup_contact_relation VALUES ('', '".$maxId["MAX(contact_id)"]."', '".$Cg["contactgroup_cg_id"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
}
}
@@ -249,10 +249,10 @@ For information : contact@oreon-project.org
$rq .= ")";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(contact_id) FROM contact");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$contact_id = $DBRESULT->fetchRow();
return ($contact_id["MAX(contact_id)"]);
}
@@ -304,7 +304,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE contact_id = '".$contact_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function updateContact_MC($contact_id = null) {
@@ -336,7 +336,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE contact_id = '".$contact_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -348,7 +348,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE contact_contact_id = '".$contact_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if (isset($ret["contact_hostNotifCmds"]))
$ret = $ret["contact_hostNotifCmds"];
else
@@ -360,7 +360,7 @@ For information : contact@oreon-project.org
$rq .= "('".$contact_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -373,7 +373,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE contact_contact_id = '".$contact_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$cmds = array();
while($DBRESULT->fetchInto($arr))
$cmds[$arr["command_command_id"]] = $arr["command_command_id"];
@@ -386,7 +386,7 @@ For information : contact@oreon-project.org
$rq .= "('".$contact_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
@@ -399,7 +399,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE contact_contact_id = '".$contact_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if (isset($ret["contact_svNotifCmds"]))
$ret = $ret["contact_svNotifCmds"];
else
@@ -411,7 +411,7 @@ For information : contact@oreon-project.org
$rq .= "('".$contact_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -424,7 +424,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE contact_contact_id = '".$contact_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$cmds = array();
while($DBRESULT->fetchInto($arr))
$cmds[$arr["command_command_id"]] = $arr["command_command_id"];
@@ -437,7 +437,7 @@ For information : contact@oreon-project.org
$rq .= "('".$contact_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
@@ -450,7 +450,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE contact_contact_id = '".$contact_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if (isset($ret["contact_cgNotif"]))
$ret = $ret["contact_cgNotif"];
else
@@ -462,7 +462,7 @@ For information : contact@oreon-project.org
$rq .= "('".$contact_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -475,7 +475,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE contact_contact_id = '".$contact_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$cmds = array();
while($DBRESULT->fetchInto($arr))
$cmds[$arr["contactgroup_cg_id"]] = $arr["contactgroup_cg_id"];
@@ -488,7 +488,7 @@ For information : contact@oreon-project.org
$rq .= "('".$contact_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
diff --git a/www/include/configuration/configObject/contact/formContact.php b/www/include/configuration/configObject/contact/formContact.php
index 67e2a4a6e2a005989d86dac4e3bc147be799fb7e..0dfc260962cb231fbec9372a220ad6166f30b58a 100644
--- a/www/include/configuration/configObject/contact/formContact.php
+++ b/www/include/configuration/configObject/contact/formContact.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
$cct["contact_cgNotif"] = array();
$DBRESULT =& $pearDB->query("SELECT * FROM contact WHERE contact_id = '".$contact_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$cct = array_map("myDecode", $DBRESULT->fetchRow());
$cct["contact_passwd"] = NULL;
@@ -42,27 +42,27 @@ For information : contact@oreon-project.org
# Set Contact Group Parents
$DBRESULT =& $pearDB->query("SELECT DISTINCT contactgroup_cg_id FROM contactgroup_contact_relation WHERE contact_contact_id = '".$contact_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($notifCg); $i++)
$cct["contact_cgNotif"][$i] = $notifCg["contactgroup_cg_id"];
$DBRESULT->free();
# Set Host Notification Commands
$DBRESULT =& $pearDB->query("SELECT DISTINCT command_command_id FROM contact_hostcommands_relation WHERE contact_contact_id = '".$contact_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($notifCmd); $i++)
$cct["contact_hostNotifCmds"][$i] = $notifCmd["command_command_id"];
$DBRESULT->free();
# Set Service Notification Commands
$DBRESULT =& $pearDB->query("SELECT DISTINCT command_command_id FROM contact_servicecommands_relation WHERE contact_contact_id = '".$contact_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($notifCmd); $i++)
$cct["contact_svNotifCmds"][$i] = $notifCmd["command_command_id"];
$DBRESULT->free();
$DBRESULT =& $pearDB->query("SELECT ldap_auth_enable FROM general_opt LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT->fetchInto($ldap_auth);
$DBRESULT->free();
}
@@ -79,7 +79,7 @@ For information : contact@oreon-project.org
$notifTps = array(NULL=>NULL);
$DBRESULT =& $pearDB->query("SELECT tp_id, tp_name FROM timeperiod ORDER BY tp_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($notifTp))
$notifTps[$notifTp["tp_id"]] = $notifTp["tp_name"];
$DBRESULT->free();
@@ -87,7 +87,7 @@ For information : contact@oreon-project.org
$notifCmds = array();
$DBRESULT =& $pearDB->query("SELECT command_id, command_name FROM command WHERE command_type = '1' ORDER BY command_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($notifCmd))
$notifCmds[$notifCmd["command_id"]] = $notifCmd["command_name"];
$DBRESULT->free();
@@ -95,7 +95,7 @@ For information : contact@oreon-project.org
$notifCgs = array();
$DBRESULT =& $pearDB->query("SELECT cg_id, cg_name FROM contactgroup ORDER BY cg_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($notifCg))
$notifCgs[$notifCg["cg_id"]] = $notifCg["cg_name"];
$DBRESULT->free();
@@ -109,7 +109,7 @@ For information : contact@oreon-project.org
$attrsText2 = array("size"=>"60");
$attrsAdvSelect = array("style" => "width: 200px; height: 100px;");
$attrsTextarea = array("rows"=>"5", "cols"=>"40");
- $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br><br><br>{remove}</td><td>{selected}</td></tr></table>";
+ $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br /><br /><br />{remove}</td><td>{selected}</td></tr></table>";
#
## Form begin
diff --git a/www/include/configuration/configObject/contact/ldapImportContact.php b/www/include/configuration/configObject/contact/ldapImportContact.php
index b777dc9f1206ac99189be63e106cfafbf60501a8..5d804949ee3637b271ea7409414088bee210b020 100644
--- a/www/include/configuration/configObject/contact/ldapImportContact.php
+++ b/www/include/configuration/configObject/contact/ldapImportContact.php
@@ -18,7 +18,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query("SELECT ldap_host, ldap_port, ldap_base_dn, ldap_login_attrib, ldap_ssl, ldap_auth_enable, ldap_search_user, ldap_search_user_pwd, ldap_search_filter, ldap_search_timeout, ldap_search_limit FROM general_opt LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$ldap_auth = array_map("myDecode", $DBRESULT->fetchRow());
$attrsText = array("size"=>"80");
@@ -58,7 +58,7 @@ For information : contact@oreon-project.org
$tpl = new Smarty();
$tpl = initSmartyTpl($path, $tpl);
- $tpl->assign('ldap_search_filter_help', _("Active Directory : (&(objectClass=user)(samaccounttype=805306368)(objectCategory=person)(cn=*))<br>Lotus Domino : (&(objectClass=person)(cn=*))<br>OpenLDAP : (&(objectClass=person)(cn=*))"));
+ $tpl->assign('ldap_search_filter_help', _("Active Directory : (&(objectClass=user)(samaccounttype=805306368)(objectCategory=person)(cn=*))<br />Lotus Domino : (&(objectClass=person)(cn=*))<br />OpenLDAP : (&(objectClass=person)(cn=*))"));
$tpl->assign('ldap_search_filter_help_title', _("Filter Examples"));
$tpl->assign('javascript', '<script type="text/javascript" src="./include/common/javascript/ajaxLdapSearch.js"></script>');
diff --git a/www/include/configuration/configObject/contact/ldapsearch.php b/www/include/configuration/configObject/contact/ldapsearch.php
index d037216ead50f068b769247d6050311c25ed1050..fe0e567057d2569a1b57eba890b6c0e2d5becabb 100644
--- a/www/include/configuration/configObject/contact/ldapsearch.php
+++ b/www/include/configuration/configObject/contact/ldapsearch.php
@@ -52,7 +52,7 @@ require_once 'DB.php';
$pearDB =& DB::connect($dsn, $options);
if (PEAR::isError($pearDB))
- print "DB Error : ".$pearDB->getDebugInfo()."<br>";
+ print "DB Error : ".$pearDB->getDebugInfo()."<br />";
$pearDB->setFetchMode(DB_FETCHMODE_ASSOC);
diff --git a/www/include/configuration/configObject/contact/listContact.php b/www/include/configuration/configObject/contact/listContact.php
index d0561ae8573dff3702fc851ef4ad705ad44d5170..e03ae0f85fc180cff5aa92ebad853772c07bcfd3 100644
--- a/www/include/configuration/configObject/contact/listContact.php
+++ b/www/include/configuration/configObject/contact/listContact.php
@@ -25,14 +25,14 @@ For information : contact@oreon-project.org
else
$DBRESULT = & $pearDB->query("SELECT COUNT(*) FROM contact");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp = & $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
$DBRESULT =& $pearDB->query("SELECT ldap_auth_enable FROM general_opt LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT->fetchInto($ldap_auth);
$DBRESULT->free();
@@ -65,7 +65,7 @@ For information : contact@oreon-project.org
$rq = "SELECT contact_id, timeperiod_tp_id, timeperiod_tp_id2, contact_name, contact_alias, contact_host_notification_options, contact_service_notification_options, contact_activate, contact_email FROM contact ORDER BY contact_name LIMIT ".$num * $limit.", ".$limit;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$search = tidySearchKey($search, $advanced_search);
@@ -89,13 +89,13 @@ For information : contact@oreon-project.org
$hostTp = NULL;
$DBRESULT2 =& $pearDB->query("SELECT tp_name FROM timeperiod WHERE tp_id = '".$contact["timeperiod_tp_id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$hostTp = $DBRESULT2->fetchRow();
/* Get Service Notif Period */
$svTp = NULL;
$DBRESULT2 =& $pearDB->query("SELECT tp_name FROM timeperiod WHERE tp_id = '".$contact["timeperiod_tp_id2"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$svTp = $DBRESULT2->fetchRow();
$elemArr[$i] = array("MenuClass"=>"list_".$style,
"RowMenu_select"=>$selectedElements->toHtml(),
diff --git a/www/include/configuration/configObject/contactgroup/DB-Func.php b/www/include/configuration/configObject/contactgroup/DB-Func.php
index e49cc2eedaf4885191a82c3c3c7238985fbbf63e..0e384e193c67bfe80bced9e90c989cd4c5eaac78 100644
--- a/www/include/configuration/configObject/contactgroup/DB-Func.php
+++ b/www/include/configuration/configObject/contactgroup/DB-Func.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('cg_id');
$DBRESULT =& $pearDB->query("SELECT cg_name, cg_id FROM contactgroup WHERE cg_name = '".htmlentities($name, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$cg =& $DBRESULT->fetchRow();
#Modif case
if ($DBRESULT->numRows() >= 1 && $cg["cg_id"] == $id)
@@ -43,7 +43,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("UPDATE contactgroup SET cg_activate = '1' WHERE cg_id = '".$cg_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function disableContactGroupInDB ($cg_id = null) {
@@ -51,7 +51,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("UPDATE contactgroup SET cg_activate = '0' WHERE cg_id = '".$cg_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function deleteContactGroupInDB ($contactGroups = array()) {
@@ -59,7 +59,7 @@ For information : contact@oreon-project.org
foreach($contactGroups as $key=>$value) {
$DBRESULT =& $pearDB->query("DELETE FROM contactgroup WHERE cg_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -68,7 +68,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT * FROM contactgroup WHERE cg_id = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["cg_id"] = '';
for ($i = 1; $i <= $nbrDup[$key]; $i++) {
@@ -81,19 +81,19 @@ For information : contact@oreon-project.org
$val ? $rq = "INSERT INTO contactgroup VALUES (".$val.")" : $rq = null;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(cg_id) FROM contactgroup");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$maxId =& $DBRESULT->fetchRow();
if (isset($maxId["MAX(cg_id)"])) {
$DBRESULT =& $pearDB->query("SELECT DISTINCT cgcr.contact_contact_id FROM contactgroup_contact_relation cgcr WHERE cgcr.contactgroup_cg_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($cct)) {
$DBRESULT2 =& $pearDB->query("INSERT INTO contactgroup_contact_relation VALUES ('', '".$cct["contact_contact_id"]."', '".$maxId["MAX(cg_id)"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
}
}
@@ -118,10 +118,10 @@ For information : contact@oreon-project.org
$rq .= "('".htmlentities($ret["cg_name"], ENT_QUOTES)."', '".htmlentities($ret["cg_alias"], ENT_QUOTES)."', '".htmlentities($ret["cg_comment"], ENT_QUOTES)."', '".$ret["cg_activate"]["cg_activate"]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(cg_id) FROM contactgroup");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$cg_id = $DBRESULT->fetchRow();
return ($cg_id["MAX(cg_id)"]);
}
@@ -146,7 +146,7 @@ For information : contact@oreon-project.org
"WHERE cg_id = '".$cg_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function updateContactGroupContacts($cg_id, $ret = array()) {
@@ -157,7 +157,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE contactgroup_cg_id = '".$cg_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if (isset($ret["cg_contacts"]))
$ret = $ret["cg_contacts"];
else
@@ -169,7 +169,7 @@ For information : contact@oreon-project.org
$rq .= "('".$ret[$i]."', '".$cg_id."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
?>
\ No newline at end of file
diff --git a/www/include/configuration/configObject/contactgroup/formContactGroup.php b/www/include/configuration/configObject/contactgroup/formContactGroup.php
index 641c064fc1a10ac5b25a6102571cedcbcd6ba9e2..6cf981b08754243cdb406ae303bb1520127e507b 100644
--- a/www/include/configuration/configObject/contactgroup/formContactGroup.php
+++ b/www/include/configuration/configObject/contactgroup/formContactGroup.php
@@ -23,13 +23,13 @@ For information : contact@oreon-project.org
if (($o == "c" || $o == "w") && $cg_id) {
$DBRESULT =& $pearDB->query("SELECT * FROM contactgroup WHERE cg_id = '".$cg_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$cg = array_map("myDecode", $DBRESULT->fetchRow());
# Set Contact Childs
$DBRESULT =& $pearDB->query("SELECT DISTINCT contact_contact_id FROM contactgroup_contact_relation WHERE contactgroup_cg_id = '".$cg_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($contacts); $i++)
$cg["cg_contacts"][$i] = $contacts["contact_contact_id"];
$DBRESULT->free();
@@ -41,7 +41,7 @@ For information : contact@oreon-project.org
$contacts = array();
$DBRESULT =& $pearDB->query("SELECT contact_id, contact_name FROM contact ORDER BY contact_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($contact))
$contacts[$contact["contact_id"]] = $contact["contact_name"];
unset($contact);
@@ -53,7 +53,7 @@ For information : contact@oreon-project.org
$attrsText = array("size"=>"30");
$attrsAdvSelect = array("style" => "width: 250px; height: 100px;");
$attrsTextarea = array("rows"=>"5", "cols"=>"60");
- $template = "<table style='border:0px;'><tr><td>{unselected}</td><td align='center'>{add}<br><br><br>{remove}</td><td>{selected}</td></tr></table>";
+ $template = "<table style='border:0px;'><tr><td>{unselected}</td><td align='center'>{add}<br /><br /><br />{remove}</td><td>{selected}</td></tr></table>";
#
## Form begin
diff --git a/www/include/configuration/configObject/contactgroup/listContactGroup.php b/www/include/configuration/configObject/contactgroup/listContactGroup.php
index 8c5d9682c09faf8995b9f9d2b8ad97b646e55c4f..51885ca45dc7fe426c95a3216129e59f455f4502 100644
--- a/www/include/configuration/configObject/contactgroup/listContactGroup.php
+++ b/www/include/configuration/configObject/contactgroup/listContactGroup.php
@@ -25,7 +25,7 @@ For information : contact@oreon-project.org
else
$DBRESULT =& $pearDB->query("SELECT COUNT(*) FROM contactgroup");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp = & $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
@@ -55,7 +55,7 @@ For information : contact@oreon-project.org
$rq = "SELECT cg_id, cg_name, cg_alias, cg_activate FROM contactgroup ORDER BY cg_name LIMIT ".$num * $limit.", ".$limit;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$search = tidySearchKey($search, $advanced_search);
@@ -80,7 +80,7 @@ For information : contact@oreon-project.org
$rq = "SELECT COUNT(*) AS nbr FROM contactgroup_contact_relation cgr WHERE cgr.contactgroup_cg_id = '".$cg['cg_id']."'";
$DBRESULT2 =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$ctNbr = $DBRESULT2->fetchRow();
$elemArr[$i] = array("MenuClass"=>"list_".$style,
"RowMenu_select"=>$selectedElements->toHtml(),
diff --git a/www/include/configuration/configObject/escalation/DB-Func.php b/www/include/configuration/configObject/escalation/DB-Func.php
index ca0558f18ce6df1f893dfbd1e2b12fb9f370ab6c..580c3d702eb2ca6f2bc68c1b682e6bc6b86fb49f 100644
--- a/www/include/configuration/configObject/escalation/DB-Func.php
+++ b/www/include/configuration/configObject/escalation/DB-Func.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('esc_id');
$DBRESULT =& $pearDB->query("SELECT esc_name, esc_id FROM escalation WHERE esc_name = '".$name."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$esc =& $DBRESULT->fetchRow();
#Modif case
if ($DBRESULT->numRows() >= 1 && $esc["esc_id"] == $id)
@@ -43,7 +43,7 @@ For information : contact@oreon-project.org
foreach($escalations as $key=>$value) {
$DBRESULT =& $pearDB->query("DELETE FROM escalation WHERE esc_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -52,7 +52,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT * FROM escalation WHERE esc_id = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["esc_id"] = '';
for ($i = 1; $i <= $nbrDup[$key]; $i++) {
@@ -65,59 +65,59 @@ For information : contact@oreon-project.org
$val ? $rq = "INSERT INTO escalation VALUES (".$val.")" : $rq = null;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(esc_id) FROM escalation");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$maxId =& $DBRESULT->fetchRow();
if (isset($maxId["MAX(esc_id)"])) {
$DBRESULT =& $pearDB->query("SELECT DISTINCT contactgroup_cg_id FROM escalation_contactgroup_relation WHERE escalation_esc_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($cg)) {
$DBRESULT2 =& $pearDB->query("INSERT INTO escalation_contactgroup_relation VALUES ('', '".$maxId["MAX(esc_id)"]."', '".$cg["contactgroup_cg_id"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT =& $pearDB->query("SELECT DISTINCT host_host_id FROM escalation_host_relation WHERE escalation_esc_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($host)) {
$DBRESULT2 =& $pearDB->query("INSERT INTO escalation_host_relation VALUES ('', '".$maxId["MAX(esc_id)"]."', '".$host["host_host_id"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT =& $pearDB->query("SELECT DISTINCT hostgroup_hg_id FROM escalation_hostgroup_relation WHERE escalation_esc_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($hg)) {
$DBRESULT2 =& $pearDB->query("INSERT INTO escalation_hostgroup_relation VALUES ('', '".$maxId["MAX(esc_id)"]."', '".$hg["hostgroup_hg_id"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT =& $pearDB->query("SELECT DISTINCT servicegroup_sg_id FROM escalation_servicegroup_relation WHERE escalation_esc_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($sg)) {
$DBRESULT2 =& $pearDB->query("INSERT INTO escalation_servicegroup_relation VALUES ('', '".$maxId["MAX(esc_id)"]."', '".$sg["servicegroup_sg_id"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT =& $pearDB->query("SELECT * FROM escalation_service_relation WHERE escalation_esc_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($sv)) {
$DBRESULT2 =& $pearDB->query("INSERT INTO escalation_service_relation VALUES ('', '".$maxId["MAX(esc_id)"]."', '".$sv["service_service_id"]."', '".$sv["host_host_id"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT =& $pearDB->query("SELECT DISTINCT meta_service_meta_id FROM escalation_meta_service_relation WHERE escalation_esc_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($sv)) {
$DBRESULT2 =& $pearDB->query("INSERT INTO escalation_meta_service_relation VALUES ('', '".$maxId["MAX(esc_id)"]."', '".$sv["meta_service_meta_id"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
}
}
@@ -167,10 +167,10 @@ For information : contact@oreon-project.org
$rq .= ")";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(esc_id) FROM escalation");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$esc_id = $DBRESULT->fetchRow();
return ($esc_id["MAX(esc_id)"]);
}
@@ -203,7 +203,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE esc_id = '".$esc_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function updateEscalationContactGroups($esc_id = null) {
@@ -214,7 +214,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE escalation_esc_id = '".$esc_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$ret = array();
$ret = $form->getSubmitValue("esc_cgs");
for($i = 0; $i < count($ret); $i++) {
@@ -224,7 +224,7 @@ For information : contact@oreon-project.org
$rq .= "('".$esc_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -236,7 +236,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE escalation_esc_id = '".$esc_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$ret = array();
$ret = $form->getSubmitValue("esc_hosts");
for($i = 0; $i < count($ret); $i++) {
@@ -246,7 +246,7 @@ For information : contact@oreon-project.org
$rq .= "('".$esc_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -258,7 +258,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE escalation_esc_id = '".$esc_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$ret = array();
$ret = $form->getSubmitValue("esc_hgs");
for($i = 0; $i < count($ret); $i++) {
@@ -268,7 +268,7 @@ For information : contact@oreon-project.org
$rq .= "('".$esc_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -280,7 +280,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE escalation_esc_id = '".$esc_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$ret = array();
$ret = $form->getSubmitValue("esc_sgs");
for($i = 0; $i < count($ret); $i++) {
@@ -290,7 +290,7 @@ For information : contact@oreon-project.org
$rq .= "('".$esc_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -302,7 +302,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE escalation_esc_id = '".$esc_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$ret = array();
$ret = $form->getSubmitValue("esc_hServices");
for($i = 0; $i < count($ret); $i++) {
@@ -314,7 +314,7 @@ For information : contact@oreon-project.org
$rq .= "('".$esc_id."', '".$exp[1]."', '".$exp[0]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
@@ -327,7 +327,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE escalation_esc_id = '".$esc_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$ret = array();
$ret = $form->getSubmitValue("esc_metas");
for($i = 0; $i < count($ret); $i++) {
@@ -337,7 +337,7 @@ For information : contact@oreon-project.org
$rq .= "('".$esc_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
?>
\ No newline at end of file
diff --git a/www/include/configuration/configObject/escalation/ViewEscalation.php b/www/include/configuration/configObject/escalation/ViewEscalation.php
index 626e8a5cba3e9322fc44f5c945f577bbb937e508..94d75d627611266b98cf7a35312764eb9dd10f3e 100644
--- a/www/include/configuration/configObject/escalation/ViewEscalation.php
+++ b/www/include/configuration/configObject/escalation/ViewEscalation.php
@@ -34,7 +34,7 @@ if (!isset($oreon))
$cmd = "SELECT hg_id, hg_name FROM hostgroup";
$DBRESULT = $pearDB->query($cmd);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($hostgroup))
$hostgroup_ary[$hostgroup["hg_id"]] = $hostgroup["hg_name"];
$DBRESULT->free();
@@ -79,7 +79,7 @@ if (!isset($oreon))
$attrsText2 = array("size"=>"6");
$attrsAdvSelect = array("style" => "width: 200px; height: 200px;");
$attrsTextarea = array("rows"=>"5", "cols"=>"40");
- $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br><br><br>{remove}</td><td>{selected}</td></tr></table>";
+ $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br /><br /><br />{remove}</td><td>{selected}</td></tr></table>";
$form->addElement('header', 'title', _("Escalations View"));
$form->addElement('select', 'hostgroup_escalation', _("Hostgroups Escalation"), $hostgroup_ary, array("onChange" =>"this.form.submit();"));
diff --git a/www/include/configuration/configObject/escalation/formEscalation.php b/www/include/configuration/configObject/escalation/formEscalation.php
index 6a3c57a99834745eca216fd0a0d7433e49133f56..1e1646cc5b3629a54c7c6b11c906239dd903d846 100644
--- a/www/include/configuration/configObject/escalation/formEscalation.php
+++ b/www/include/configuration/configObject/escalation/formEscalation.php
@@ -23,7 +23,7 @@ For information : contact@oreon-project.org
if (($o == "c" || $o == "w") && $esc_id) {
$DBRESULT =& $pearDB->query("SELECT * FROM escalation WHERE esc_id = '".$esc_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$esc = array_map("myDecode", $DBRESULT->fetchRow());
# Set Host Options
@@ -37,42 +37,42 @@ For information : contact@oreon-project.org
# Set Host Groups relations
$DBRESULT =& $pearDB->query("SELECT DISTINCT hostgroup_hg_id FROM escalation_hostgroup_relation WHERE escalation_esc_id = '".$esc_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($hg); $i++)
$esc["esc_hgs"][$i] = $hg["hostgroup_hg_id"];
$DBRESULT->free();
# Set Service Groups relations
$DBRESULT =& $pearDB->query("SELECT DISTINCT servicegroup_sg_id FROM escalation_servicegroup_relation WHERE escalation_esc_id = '".$esc_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($sg); $i++)
$esc["esc_sgs"][$i] = $sg["servicegroup_sg_id"];
$DBRESULT->free();
# Set Host relations
$DBRESULT =& $pearDB->query("SELECT DISTINCT host_host_id FROM escalation_host_relation WHERE escalation_esc_id = '".$esc_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for ($i = 0; $DBRESULT->fetchInto($host); $i++)
$esc["esc_hosts"][$i] = $host["host_host_id"];
$DBRESULT->free();
# Set Meta Service
$DBRESULT =& $pearDB->query("SELECT DISTINCT emsr.meta_service_meta_id FROM escalation_meta_service_relation emsr WHERE emsr.escalation_esc_id = '".$esc_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($metas); $i++)
$esc["esc_metas"][$i] = $metas["meta_service_meta_id"];
$DBRESULT->free();
# Set Host Service
$DBRESULT =& $pearDB->query("SELECT DISTINCT * FROM escalation_service_relation esr WHERE esr.escalation_esc_id = '".$esc_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for ($i = 0; $DBRESULT->fetchInto($services); $i++)
$esc["esc_hServices"][$i] = $services["host_host_id"]."_".$services["service_service_id"];
$DBRESULT->free();
# Set Contact Groups relations
$DBRESULT =& $pearDB->query("SELECT DISTINCT contactgroup_cg_id FROM escalation_contactgroup_relation WHERE escalation_esc_id = '".$esc_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($cg); $i++)
$esc["esc_cgs"][$i] = $cg["contactgroup_cg_id"];
$DBRESULT->free();
@@ -87,7 +87,7 @@ For information : contact@oreon-project.org
else
$DBRESULT =& $pearDB->query("SELECT hg_id, hg_name FROM hostgroup WHERE hg_id IN (".$lcaHostGroupstr.") ORDER BY hg_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($hg))
$hgs[$hg["hg_id"]] = $hg["hg_name"];
$DBRESULT->free();
@@ -99,7 +99,7 @@ For information : contact@oreon-project.org
else
$DBRESULT =& $pearDB->query("SELECT sg_id, sg_name FROM servicegroup WHERE sg_id IN (".$lcaServiceGroupstr.") ORDER BY sg_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($sg))
$sgs[$sg["sg_id"]] = $sg["sg_name"];
$DBRESULT->free();
@@ -111,7 +111,7 @@ For information : contact@oreon-project.org
else
$DBRESULT =& $pearDB->query("SELECT host_id, host_name FROM host WHERE host_register = '1' AND host_id IN (".$lcaHoststr.") ORDER BY host_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($host))
$hosts[$host["host_id"]] = $host["host_name"];
$DBRESULT->free();
@@ -123,7 +123,7 @@ For information : contact@oreon-project.org
else
$DBRESULT =& $pearDB->query("SELECT DISTINCT host_id, host_name FROM host WHERE host_register = '1' AND host_id IN (".$lcaHoststr.") ORDER BY host_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($elem)) {
$services = getMyHostServices($elem["host_id"]);
foreach ($services as $key=>$index) {
@@ -137,7 +137,7 @@ For information : contact@oreon-project.org
$metas = array();
$DBRESULT =& $pearDB->query("SELECT meta_id, meta_name FROM meta_service ORDER BY meta_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($meta))
$metas[$meta["meta_id"]] = $meta["meta_name"];
$DBRESULT->free();
@@ -145,7 +145,7 @@ For information : contact@oreon-project.org
$cgs = array();
$DBRESULT =& $pearDB->query("SELECT cg_id, cg_name FROM contactgroup ORDER BY cg_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($cg))
$cgs[$cg["cg_id"]] = $cg["cg_name"];
$DBRESULT->free();
@@ -154,7 +154,7 @@ For information : contact@oreon-project.org
$tps = array();
$DBRESULT =& $pearDB->query("SELECT tp_id, tp_name FROM timeperiod ORDER BY tp_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($tp))
$tps[$tp["tp_id"]] = $tp["tp_name"];
$DBRESULT->free();
@@ -169,7 +169,7 @@ For information : contact@oreon-project.org
$attrsAdvSelect = array("style" => "width: 250px; height: 150px;");
$attrsAdvSelect2 = array("style" => "width: 250px; height: 400px;");
$attrsTextarea = array("rows"=>"3", "cols"=>"30");
- $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br><br><br>{remove}</td><td>{selected}</td></tr></table>";
+ $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br /><br /><br />{remove}</td><td>{selected}</td></tr></table>";
#
## Form begin
diff --git a/www/include/configuration/configObject/escalation/listEscalation.php b/www/include/configuration/configObject/escalation/listEscalation.php
index 923d22f5069753fbe9cb4bbd9c2dfc903e01ff8c..a2aab7ef8d541e76a140a2716e17568bfdb67095 100644
--- a/www/include/configuration/configObject/escalation/listEscalation.php
+++ b/www/include/configuration/configObject/escalation/listEscalation.php
@@ -58,7 +58,7 @@ For information : contact@oreon-project.org
$rq .= " WHERE (esc.esc_name LIKE '".$search."' OR esc.esc_alias LIKE '%".$search."%')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp = & $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
@@ -99,7 +99,7 @@ For information : contact@oreon-project.org
$rq .= " ORDER BY esc_name LIMIT ".$num * $limit.", ".$limit;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$search = tidySearchKey($search, $advanced_search);
diff --git a/www/include/configuration/configObject/host/DB-Func.php b/www/include/configuration/configObject/host/DB-Func.php
index 3448b5ea2abfd01abadc8d746186e7b228dddd04..af1f58080b505b9508aa28054620a12bfe9051b6 100644
--- a/www/include/configuration/configObject/host/DB-Func.php
+++ b/www/include/configuration/configObject/host/DB-Func.php
@@ -25,7 +25,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('host_id');
$DBRESULT =& $pearDB->query("SELECT host_name, host_id FROM host WHERE host_name = '".htmlentities($name, ENT_QUOTES)."' AND host_register = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$host =& $DBRESULT->fetchRow();
/*
@@ -51,7 +51,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('host_id');
$DBRESULT =& $pearDB->query("SELECT host_name, host_id FROM host WHERE host_name = '".htmlentities($name, ENT_QUOTES)."' AND host_register = '0'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$host =& $DBRESULT->fetchRow();
/*
@@ -79,7 +79,7 @@ For information : contact@oreon-project.org
foreach($host_arr as $key=>$value) {
$DBRESULT =& $pearDB->query("UPDATE host SET host_activate = '1' WHERE host_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -91,7 +91,7 @@ For information : contact@oreon-project.org
foreach($host_arr as $key=>$value) {
$DBRESULT =& $pearDB->query("UPDATE host SET host_activate = '0' WHERE host_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -101,16 +101,16 @@ For information : contact@oreon-project.org
$rq = "SELECT @nbr := (SELECT COUNT( * ) FROM host_service_relation WHERE service_service_id = hsr.service_service_id GROUP BY service_service_id ) AS nbr, hsr.service_service_id FROM host_service_relation hsr, host WHERE hsr.host_host_id = '".$key."' AND host.host_id = hsr.host_host_id AND host.host_register = '1'";
$DBRESULT = & $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($row))
if ($row["nbr"] == 1) {
$DBRESULT2 =& $pearDB->query("DELETE FROM service WHERE service_id = '".$row["service_service_id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT =& $pearDB->query("DELETE FROM host WHERE host_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$files = glob($oreon->optGen["oreon_rrdbase_path"].$key."_*.rrd");
foreach ($files as $filename)
unlink ($filename);
@@ -124,7 +124,7 @@ For information : contact@oreon-project.org
global $oreon;
$DBRESULT =& $pearDB->query("SELECT * FROM host WHERE host_id = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["host_id"] = '';
for ($i = 1; $i <= $nbrDup[$key]; $i++) {
@@ -137,20 +137,20 @@ For information : contact@oreon-project.org
$val ? $rq = "INSERT INTO host VALUES (".$val.")" : $rq = null;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(host_id) FROM host");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$maxId =& $DBRESULT->fetchRow();
if (isset($maxId["MAX(host_id)"])) {
# Update LCA
$DBRESULT1 =& $pearDB->query("SELECT contactgroup_cg_id FROM contactgroup_contact_relation WHERE contact_contact_id = '".$oreon->user->get_id()."'");
if (PEAR::isError($DBRESULT1))
- print "DB Error : ".$DBRESULT1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT1->getDebugInfo()."<br />";
while($DBRESULT1->fetchInto($contactGroup)) {
$DBRESULT2 =& $pearDB->query("SELECT lca_define_lca_id FROM lca_define_contactgroup_relation ldcgr WHERE ldcgr.contactgroup_cg_id = '".$contactGroup["contactgroup_cg_id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while ($DBRESULT2->fetchInto($lca)) {
$rq = "INSERT INTO lca_define_host_relation ";
$rq .= "(lca_define_lca_id, host_host_id) ";
@@ -158,17 +158,17 @@ For information : contact@oreon-project.org
$rq .= "('".$lca["lca_define_lca_id"]."', '".$maxId["MAX(host_id)"]."')";
$DBRESULT3 =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT3))
- print "DB Error : ".$DBRESULT3->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT3->getDebugInfo()."<br />";
}
}
#
$DBRESULT =& $pearDB->query("SELECT DISTINCT host_parent_hp_id FROM host_hostparent_relation WHERE host_host_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($host)){
$DBRESULT1 =& $pearDB->query("INSERT INTO host_hostparent_relation VALUES ('', '".$host["host_parent_hp_id"]."', '".$maxId["MAX(host_id)"]."')");
if (PEAR::isError($DBRESULT1))
- print "DB Error : ".$DBRESULT1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT1->getDebugInfo()."<br />";
}
# We need to duplicate the entire Service and not only create a new relation for it in the DB / Need Service functions
require_once($path."../service/DB-Func.php");
@@ -178,17 +178,17 @@ For information : contact@oreon-project.org
# Get all Services link to the Host
$DBRESULT =& $pearDB->query("SELECT DISTINCT service_service_id FROM host_service_relation WHERE host_host_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($service)) {
# If the Service is link with several Host, we keep this property and don't duplicate it, just create a new relation with the new Host
$DBRESULT2 =& $pearDB->query("SELECT COUNT(*) FROM host_service_relation WHERE service_service_id = '".$service["service_service_id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$mulHostSv = $DBRESULT2->fetchrow();
if ($mulHostSv["COUNT(*)"] > 1) {
$DBRESULT3 =& $pearDB->query("INSERT INTO host_service_relation VALUES ('', NULL, '".$maxId["MAX(host_id)"]."', NULL, '".$service["service_service_id"]."')");
if (PEAR::isError($DBRESULT3))
- print "DB Error : ".$DBRESULT3->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT3->getDebugInfo()."<br />";
}
else {
$serviceArr[$service["service_service_id"]] = $service["service_service_id"];
@@ -202,32 +202,32 @@ For information : contact@oreon-project.org
else {
$DBRESULT =& $pearDB->query("SELECT DISTINCT service_service_id FROM host_service_relation WHERE host_host_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($svs)){
$DBRESULT1 =& $pearDB->query("INSERT INTO host_service_relation VALUES ('', NULL, '".$maxId["MAX(host_id)"]."', NULL, '".$svs["service_service_id"]."')");
if (PEAR::isError($DBRESULT1))
- print "DB Error : ".$DBRESULT1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT1->getDebugInfo()."<br />";
}
}
$DBRESULT =& $pearDB->query("SELECT DISTINCT contactgroup_cg_id FROM contactgroup_host_relation WHERE host_host_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($Cg)){
$DBRESULT1 =& $pearDB->query("INSERT INTO contactgroup_host_relation VALUES ('', '".$maxId["MAX(host_id)"]."', '".$Cg["contactgroup_cg_id"]."')");
if (PEAR::isError($DBRESULT1))
- print "DB Error : ".$DBRESULT1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT1->getDebugInfo()."<br />";
}
$DBRESULT =& $pearDB->query("SELECT DISTINCT hostgroup_hg_id FROM hostgroup_relation WHERE host_host_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($Hg)){
$DBRESULT1 =& $pearDB->query("INSERT INTO hostgroup_relation VALUES ('', '".$Hg["hostgroup_hg_id"]."', '".$maxId["MAX(host_id)"]."')");
if (PEAR::isError($DBRESULT1))
- print "DB Error : ".$DBRESULT1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT1->getDebugInfo()."<br />";
}
$DBRESULT =& $pearDB->query("SELECT * FROM extended_host_information WHERE host_host_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($ehi)) {
$val = null;
$ehi["host_host_id"] = $maxId["MAX(host_id)"];
@@ -237,15 +237,15 @@ For information : contact@oreon-project.org
$val ? $rq = "INSERT INTO extended_host_information VALUES (".$val.")" : $rq = null;
$DBRESULT2 =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT =& $pearDB->query("SELECT DISTINCT nagios_server_id FROM ns_host_relation WHERE host_host_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($Hg)){
$DBRESULT1 =& $pearDB->query("INSERT INTO ns_host_relation VALUES ('', '".$Hg["nagios_server_id"]."', '".$maxId["MAX(host_id)"]."')");
if (PEAR::isError($DBRESULT1))
- print "DB Error : ".$DBRESULT1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT1->getDebugInfo()."<br />";
}
}
}
@@ -420,7 +420,7 @@ For information : contact@oreon-project.org
$rq .= ")";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(host_id) FROM host");
$host_id = $DBRESULT->fetchRow();
@@ -430,11 +430,11 @@ For information : contact@oreon-project.org
$DBRESULT1 =& $pearDB->query("SELECT contactgroup_cg_id FROM contactgroup_contact_relation WHERE contact_contact_id = '".$oreon->user->get_id()."'");
if (PEAR::isError($DBRESULT1))
- print "DB Error : ".$DBRESULT1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT1->getDebugInfo()."<br />";
while($DBRESULT1->fetchInto($contactGroup)) {
$DBRESULT2 =& $pearDB->query("SELECT lca_define_lca_id FROM lca_define_contactgroup_relation ldcgr WHERE ldcgr.contactgroup_cg_id = '".$contactGroup["contactgroup_cg_id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while ($DBRESULT2->fetchInto($lca)) {
$rq = "INSERT INTO lca_define_host_relation ";
$rq .= "(lca_define_lca_id, host_host_id) ";
@@ -442,7 +442,7 @@ For information : contact@oreon-project.org
$rq .= "('".$lca["lca_define_lca_id"]."', '".$host_id["MAX(host_id)"]."')";
$DBRESULT3 =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT3))
- print "DB Error : ".$DBRESULT3->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT3->getDebugInfo()."<br />";
}
}
#
@@ -473,7 +473,7 @@ For information : contact@oreon-project.org
$rq .= ")";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function updateHost($host_id = null, $from_MC = false) {
@@ -571,7 +571,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE host_id = '".$host_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function updateHost_MC($host_id = null) {
@@ -633,7 +633,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE host_id = '".$host_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -644,7 +644,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE host_host_id = '".$host_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if (isset($ret["host_parents"]))
$ret = $ret["host_parents"];
else
@@ -656,7 +656,7 @@ For information : contact@oreon-project.org
$rq .= "('".$ret[$i]."', '".$host_id."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -668,7 +668,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE host_host_id = '".$host_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$hpars = array();
while($DBRESULT->fetchInto($arr))
$hpars[$arr["host_parent_hp_id"]] = $arr["host_parent_hp_id"];
@@ -681,7 +681,7 @@ For information : contact@oreon-project.org
$rq .= "('".$ret[$i]."', '".$host_id."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
@@ -693,7 +693,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE host_parent_hp_id = '".$host_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$ret = array();
$ret = $form->getSubmitValue("host_childs");
for($i = 0; $i < count($ret); $i++) {
@@ -703,7 +703,7 @@ For information : contact@oreon-project.org
$rq .= "('".$host_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -715,7 +715,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE host_parent_hp_id = '".$host_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$hchs = array();
while($DBRESULT->fetchInto($arr))
$hchs[$arr["host_host_id"]] = $arr["host_host_id"];
@@ -728,7 +728,7 @@ For information : contact@oreon-project.org
$rq .= "('".$host_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
@@ -760,7 +760,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE host_host_id = '".$host_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function updateHostExtInfos_MC($host_id = null) {
@@ -783,7 +783,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE host_host_id = '".$host_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -794,7 +794,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE host_host_id = '".$host_id."'";
$DBRESULT = $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
isset($ret["host_cgs"]) ? $ret = $ret["host_cgs"] : $ret = $form->getSubmitValue("host_cgs");
for($i = 0; $i < count($ret); $i++) {
$rq = "INSERT INTO contactgroup_host_relation ";
@@ -803,7 +803,7 @@ For information : contact@oreon-project.org
$rq .= "('".$host_id."', '".$ret[$i]."')";
$DBRESULT = $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -815,7 +815,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE host_host_id = '".$host_id."'";
$DBRESULT = $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$cgs = array();
while($DBRESULT->fetchInto($arr))
$cgs[$arr["contactgroup_cg_id"]] = $arr["contactgroup_cg_id"];
@@ -828,7 +828,7 @@ For information : contact@oreon-project.org
$rq .= "('".$host_id."', '".$ret[$i]."')";
$DBRESULT = $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
@@ -843,7 +843,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE host_host_id = '".$host_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$hgsOLD = array();
while ($DBRESULT->fetchInto($hg))
$hgsOLD[$hg["hostgroup_hg_id"]] = $hg["hostgroup_hg_id"];
@@ -854,7 +854,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE hostgroup_hg_id = '".$hg."' AND host_host_id IS NULL";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($sv))
$hgSVS[$hg][$sv["service_service_id"]] = $sv["service_service_id"];
}
@@ -863,7 +863,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE host_host_id = '".$host_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
isset($ret["host_hgs"]) ? $ret = $ret["host_hgs"] : $ret = $form->getSubmitValue("host_hgs");
$hgsNEW = array();
for($i = 0; $i < count($ret); $i++) {
@@ -873,7 +873,7 @@ For information : contact@oreon-project.org
$rq .= "('".$ret[$i]."', '".$host_id."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$hgsNEW[$ret[$i]] = $ret[$i];
}
# Special Case, delete relation between host/service, when service is linked to hostgroup in escalation, dependencies, osl
@@ -887,24 +887,24 @@ For information : contact@oreon-project.org
$rq .= "WHERE host_host_id = '".$host_id."' AND service_service_id = '".$sv."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Delete in dependencies
$rq = "DELETE FROM dependency_serviceChild_relation ";
$rq .= "WHERE host_host_id = '".$host_id."' AND service_service_id = '".$sv."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$rq = "DELETE FROM dependency_serviceParent_relation ";
$rq .= "WHERE host_host_id = '".$host_id."' AND service_service_id = '".$sv."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Delete in OSL
$rq = "DELETE FROM osl_indicator ";
$rq .= "WHERE host_id = '".$host_id."' AND service_id = '".$sv."'";
$DBRESULT =& $pearDB->query($rq);
//if (PEAR::isError($DBRESULT))
- // print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ // print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
#
@@ -919,7 +919,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE host_host_id = '".$host_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$hgs = array();
while($DBRESULT->fetchInto($arr))
$hgs[$arr["hostgroup_hg_id"]] = $arr["hostgroup_hg_id"];
@@ -932,7 +932,7 @@ For information : contact@oreon-project.org
$rq .= "('".$ret[$i]."', '".$host_id."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
@@ -955,7 +955,7 @@ For information : contact@oreon-project.org
$rq .= "(NULL, '".$host_id."', NULL, '".$service_id."')";
$DBRESULT2 =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
}
}
@@ -979,7 +979,7 @@ For information : contact@oreon-project.org
$rq .= "(NULL, '".$host_id."', NULL, '".$service_id."')";
$DBRESULT2 =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
}
}
@@ -998,7 +998,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE host_host_id = '".$host_id."'";
$DBRESULT2 =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$ret = array();
$ret = $form->getSubmitValue("host_svTpls");
for($i = 0; $i < count($ret); $i++) {
@@ -1008,7 +1008,7 @@ For information : contact@oreon-project.org
$rq .= "(NULL, '".$host_id."', NULL, '".$ret[$i]."')";
$DBRESULT2 =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
}
}
@@ -1023,7 +1023,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE host_host_id = '".$host_id."'";
$DBRESULT2 =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$svtpls = array();
while($DBRESULT2->fetchInto($arr))
$svtpls [$arr["service_service_id"]] = $arr["service_service_id"];
@@ -1036,7 +1036,7 @@ For information : contact@oreon-project.org
$rq .= "(NULL, '".$host_id."', NULL, '".$ret[$i]."')";
$DBRESULT2 =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
}
}
@@ -1049,7 +1049,7 @@ For information : contact@oreon-project.org
foreach ($useTpls as $key=>$value){
$DBRESULT =& $pearDB->query("UPDATE host SET host_template_model_htm_id = '".getMyHostID($value)."' WHERE host_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -1060,7 +1060,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE `host_host_id` = '".$host_id."'";
$DBRESULT = $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
isset($ret["nagios_server_id"]) ? $ret = $ret["nagios_server_id"] : $ret = $form->getSubmitValue("nagios_server_id");
for($i = 0; $i < count($ret); $i++) {
$rq = "INSERT INTO `ns_host_relation` ";
@@ -1069,7 +1069,7 @@ For information : contact@oreon-project.org
$rq .= "('".$host_id."', '".$ret[$i]."')";
$DBRESULT = $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -1081,7 +1081,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE host_host_id = '".$host_id."'";
$DBRESULT = $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$cgs = array();
while($DBRESULT->fetchInto($arr))
$cgs[$arr["nagios_server_id"]] = $arr["nagios_server_id"];
@@ -1094,7 +1094,7 @@ For information : contact@oreon-project.org
$rq .= "('".$host_id."', '".$ret[$i]."')";
$DBRESULT = $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
diff --git a/www/include/configuration/configObject/host/formHost.php b/www/include/configuration/configObject/host/formHost.php
index 6f6edd17cecb3c01630a57d67476e467ee4bc077..99ce789476c19fdae4ec43939401c19240c2c445 100644
--- a/www/include/configuration/configObject/host/formHost.php
+++ b/www/include/configuration/configObject/host/formHost.php
@@ -27,7 +27,7 @@ For information : contact@oreon-project.org
$rq = "SELECT * FROM host, extended_host_information ehi WHERE host_id = '".$host_id."' AND ehi.host_host_id = host.host_id AND host_id IN (".$lcaHoststr.") LIMIT 1";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
/*
* Set base value
@@ -206,7 +206,7 @@ For information : contact@oreon-project.org
$attrsAdvSelectsmall= array("style" => "width: 220px; height: 50px;");
$attrsAdvSelectbig = array("style" => "width: 220px; height: 130px;");
$attrsTextarea = array("rows"=>"4", "cols"=>"80");
- $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br><br><br>{remove}</td><td>{selected}</td></tr></table>";
+ $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br /><br /><br />{remove}</td><td>{selected}</td></tr></table>";
#
## Form begin
diff --git a/www/include/configuration/configObject/host/listHost.php b/www/include/configuration/configObject/host/listHost.php
index eedff69bb67fcd88c8af80a0619f2de9636e9668..dac538a26ff8eca87d8a026afbd06163186c8aca 100644
--- a/www/include/configuration/configObject/host/listHost.php
+++ b/www/include/configuration/configObject/host/listHost.php
@@ -47,7 +47,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query("SELECT COUNT(*) FROM host WHERE $SearchTool $LCATool host_register = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp =& $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
@@ -78,7 +78,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query("SELECT host_id, host_name, host_alias, host_address, host_activate, host_template_model_htm_id FROM host h WHERE $SearchTool $LCATool host_register = '1' ORDER BY host_name LIMIT ".$num * $limit.", ".$limit);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$search = tidySearchKey($search, $advanced_search);
diff --git a/www/include/configuration/configObject/host_dependency/DB-Func.php b/www/include/configuration/configObject/host_dependency/DB-Func.php
index df94af810a1d95fd700b9a5ac9d664f7ff772988..eb91014948409c4c1ac0ed43d9eed5870349a9fa 100644
--- a/www/include/configuration/configObject/host_dependency/DB-Func.php
+++ b/www/include/configuration/configObject/host_dependency/DB-Func.php
@@ -27,7 +27,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('dep_id');
$DBRESULT =& $pearDB->query("SELECT dep_name, dep_id FROM dependency WHERE dep_name = '".htmlentities($name, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$dep =& $DBRESULT->fetchRow();
#Modif case
if ($DBRESULT->numRows() >= 1 && $dep["dep_id"] == $id)
@@ -60,7 +60,7 @@ For information : contact@oreon-project.org
foreach($dependencies as $key=>$value) {
$DBRESULT =& $pearDB->query("DELETE FROM dependency WHERE dep_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -69,7 +69,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT * FROM dependency WHERE dep_id = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["dep_id"] = '';
for ($i = 1; $i <= $nbrDup[$key]; $i++) {
@@ -82,28 +82,28 @@ For information : contact@oreon-project.org
$val ? $rq = "INSERT INTO dependency VALUES (".$val.")" : $rq = null;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(dep_id) FROM dependency");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$maxId =& $DBRESULT->fetchRow();
if (isset($maxId["MAX(dep_id)"])) {
$DBRESULT =& $pearDB->query("SELECT DISTINCT host_host_id FROM dependency_hostParent_relation WHERE dependency_dep_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($host)) {
$DBRESULT2 =& $pearDB->query("INSERT INTO dependency_hostParent_relation VALUES ('', '".$maxId["MAX(dep_id)"]."', '".$host["host_host_id"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT->free();
$DBRESULT =& $pearDB->query("SELECT DISTINCT host_host_id FROM dependency_hostChild_relation WHERE dependency_dep_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($host)) {
$DBRESULT2 =& $pearDB->query("INSERT INTO dependency_hostChild_relation VALUES ('', '".$maxId["MAX(dep_id)"]."', '".$host["host_host_id"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT->free();
}
@@ -143,10 +143,10 @@ For information : contact@oreon-project.org
$rq .= ")";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(dep_id) FROM dependency");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$dep_id = $DBRESULT->fetchRow();
return ($dep_id["MAX(dep_id)"]);
}
@@ -173,7 +173,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE dep_id = '".$dep_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function updateHostDependencyHostParents($dep_id = null, $ret = array()) {
@@ -184,7 +184,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE dependency_dep_id = '".$dep_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if (isset($ret["dep_hostParents"]))
$ret = $ret["dep_hostParents"];
else
@@ -196,7 +196,7 @@ For information : contact@oreon-project.org
$rq .= "('".$dep_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -208,7 +208,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE dependency_dep_id = '".$dep_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if (isset($ret["dep_hostChilds"]))
$ret = $ret["dep_hostChilds"];
else
@@ -220,7 +220,7 @@ For information : contact@oreon-project.org
$rq .= "('".$dep_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
?>
\ No newline at end of file
diff --git a/www/include/configuration/configObject/host_dependency/formHostDependency.php b/www/include/configuration/configObject/host_dependency/formHostDependency.php
index f589faf153f96a2af83f4db34b1b2f29bf573941..c74d95df3100072393b1861a819b90d9a7f3d30f 100644
--- a/www/include/configuration/configObject/host_dependency/formHostDependency.php
+++ b/www/include/configuration/configObject/host_dependency/formHostDependency.php
@@ -24,7 +24,7 @@ For information : contact@oreon-project.org
if (($o == "c" || $o == "w") && $dep_id) {
$DBRESULT =& $pearDB->query("SELECT * FROM dependency WHERE dep_id = '".$dep_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$dep = array_map("myDecode", $DBRESULT->fetchRow());
# Set Notification Failure Criteria
@@ -38,14 +38,14 @@ For information : contact@oreon-project.org
# Set Host Parents
$DBRESULT =& $pearDB->query("SELECT DISTINCT host_host_id FROM dependency_hostParent_relation WHERE dependency_dep_id = '".$dep_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($hostP); $i++)
$dep["dep_hostParents"][$i] = $hostP["host_host_id"];
$DBRESULT->free();
# Set Host Childs
$DBRESULT =& $pearDB->query("SELECT DISTINCT host_host_id FROM dependency_hostChild_relation WHERE dependency_dep_id = '".$dep_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($hostC); $i++)
$dep["dep_hostChilds"][$i] = $hostC["host_host_id"];
$DBRESULT->free();
@@ -60,7 +60,7 @@ For information : contact@oreon-project.org
else
$DBRESULT =& $pearDB->query("SELECT host_id, host_name FROM host WHERE host_register = '1' AND host_id IN (".$lcaHoststr.") ORDER BY host_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($host))
$hosts[$host["host_id"]] = $host["host_name"];
$DBRESULT->free();
@@ -74,7 +74,7 @@ For information : contact@oreon-project.org
$attrsText2 = array("size"=>"10");
$attrsAdvSelect = array("style" => "width: 250px; height: 150px;");
$attrsTextarea = array("rows"=>"3", "cols"=>"30");
- $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br><br><br>{remove}</td><td>{selected}</td></tr></table>";
+ $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br /><br /><br />{remove}</td><td>{selected}</td></tr></table>";
#
## Form begin
diff --git a/www/include/configuration/configObject/host_dependency/listHostDependency.php b/www/include/configuration/configObject/host_dependency/listHostDependency.php
index 69adfa070ab0e9950c0dc10f30b4829b48b58627..4e6777ecfd2d83b29937b8795f06cd064a8f887e 100644
--- a/www/include/configuration/configObject/host_dependency/listHostDependency.php
+++ b/www/include/configuration/configObject/host_dependency/listHostDependency.php
@@ -40,7 +40,7 @@ For information : contact@oreon-project.org
$rq .= " AND (dep_name LIKE '".htmlentities($search, ENT_QUOTES)."' OR dep_description LIKE '%".htmlentities($search, ENT_QUOTES)."%')";
$DBRESULT = & $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp = & $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
@@ -71,7 +71,7 @@ For information : contact@oreon-project.org
$rq .= " LIMIT ".$num * $limit.", ".$limit;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$search = tidySearchKey($search, $advanced_search);
diff --git a/www/include/configuration/configObject/host_template_model/formHostTemplateModel.php b/www/include/configuration/configObject/host_template_model/formHostTemplateModel.php
index 2883b99ff4892f6c75fc4d98a1211cf0c83b511c..26f6ed08e6161fd989c368e791cd07dc7be29501 100644
--- a/www/include/configuration/configObject/host_template_model/formHostTemplateModel.php
+++ b/www/include/configuration/configObject/host_template_model/formHostTemplateModel.php
@@ -22,7 +22,7 @@ For information : contact@oreon-project.org
if (($o == "c" || $o == "w") && $host_id) {
$DBRESULT =& $pearDB->query("SELECT * FROM host, extended_host_information ehi WHERE host_id = '".$host_id."' AND ehi.host_host_id = host.host_id LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
if ($DBRESULT->numRows()) {
$host = array_map("myDecode", $DBRESULT->fetchRow());
@@ -38,21 +38,21 @@ For information : contact@oreon-project.org
# Set Contact Group
$DBRESULT =& $pearDB->query("SELECT DISTINCT contactgroup_cg_id FROM contactgroup_host_relation WHERE host_host_id = '".$host_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($notifCg); $i++)
$host["host_cgs"][$i] = $notifCg["contactgroup_cg_id"];
$DBRESULT->free();
# Set Host Parents
$DBRESULT =& $pearDB->query("SELECT DISTINCT host_parent_hp_id FROM host_hostparent_relation WHERE host_host_id = '".$host_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($parent); $i++)
$host["host_parents"][$i] = $parent["host_parent_hp_id"];
$DBRESULT->free();
# Set Service Templates Childs
$DBRESULT =& $pearDB->query("SELECT DISTINCT service_service_id FROM host_service_relation WHERE host_host_id = '".$host_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($svTpl); $i++)
$host["host_svTpls"][$i] = $svTpl["service_service_id"];
$DBRESULT->free();
@@ -69,7 +69,7 @@ For information : contact@oreon-project.org
if (isset($_GET["host_id"]) && $_GET["host_id"]){
$DBRESULT =& $pearDB->query("SELECT host_id, host_name FROM host WHERE host_template_model_htm_id = '".$_GET["host_id"]."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($host_tmpl_father))
$host_tmplt_who_use_me[$host_tmpl_father["host_id"]] = $host_tmpl_father["host_name"];
$DBRESULT->free();
@@ -81,7 +81,7 @@ For information : contact@oreon-project.org
$hTpls = array(NULL=>NULL);
$DBRESULT =& $pearDB->query("SELECT host_id, host_name, host_template_model_htm_id FROM host WHERE host_register = '0' AND host_id != '".$host_id."' ORDER BY host_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($hTpl)) {
if (!$hTpl["host_name"])
$hTpl["host_name"] = getMyHostName($hTpl["host_template_model_htm_id"])."'";
@@ -93,7 +93,7 @@ For information : contact@oreon-project.org
$svTpls = array();
$DBRESULT =& $pearDB->query("SELECT service_id, service_description, service_template_model_stm_id FROM service WHERE service_register = '0' ORDER BY service_description");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($svTpl)) {
if (!$svTpl["service_description"])
$svTpl["service_description"] = getMyServiceName($svTpl["service_template_model_stm_id"])."'";
@@ -108,7 +108,7 @@ For information : contact@oreon-project.org
$tps = array(NULL=>NULL);
$DBRESULT =& $pearDB->query("SELECT tp_id, tp_name FROM timeperiod ORDER BY tp_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($tp))
$tps[$tp["tp_id"]] = $tp["tp_name"];
$DBRESULT->free();
@@ -116,7 +116,7 @@ For information : contact@oreon-project.org
$checkCmds = array(NULL=>NULL);
$DBRESULT =& $pearDB->query("SELECT command_id, command_name FROM command WHERE command_type = '2' ORDER BY command_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($checkCmd))
$checkCmds[$checkCmd["command_id"]] = $checkCmd["command_name"];
$DBRESULT->free();
@@ -124,7 +124,7 @@ For information : contact@oreon-project.org
$notifCgs = array();
$DBRESULT =& $pearDB->query("SELECT cg_id, cg_name FROM contactgroup ORDER BY cg_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($notifCg))
$notifCgs[$notifCg["cg_id"]] = $notifCg["cg_name"];
$DBRESULT->free();
@@ -132,7 +132,7 @@ For information : contact@oreon-project.org
$ppols = array(NULL=>NULL);
$DBRESULT =& $pearDB->query("SELECT purge_policy_id, purge_policy_name FROM purge_policy ORDER BY purge_policy_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($ppol))
$ppols[$ppol["purge_policy_id"]] = $ppol["purge_policy_name"];
$DBRESULT->free();
@@ -154,7 +154,7 @@ For information : contact@oreon-project.org
$attrsAdvSelect = array("style" => "width: 200px; height: 100px;");
$attrsAdvSelect2 = array("style" => "width: 200px; height: 200px;");
$attrsTextarea = array("rows"=>"5", "cols"=>"40");
- $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br><br><br>{remove}</td><td>{selected}</td></tr></table>";
+ $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br /><br /><br />{remove}</td><td>{selected}</td></tr></table>";
#
## Form begin
diff --git a/www/include/configuration/configObject/host_template_model/listHostTemplateModel.php b/www/include/configuration/configObject/host_template_model/listHostTemplateModel.php
index 3b9b0ce53163dbf82ff33912d815341614415937..373ae373443ba8c1cfc0f10237a8555e71198ab9 100644
--- a/www/include/configuration/configObject/host_template_model/listHostTemplateModel.php
+++ b/www/include/configuration/configObject/host_template_model/listHostTemplateModel.php
@@ -25,7 +25,7 @@ For information : contact@oreon-project.org
else
$DBRESULT = & $pearDB->query("SELECT COUNT(*) FROM host WHERE host_register = '0'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp = & $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
@@ -63,7 +63,7 @@ For information : contact@oreon-project.org
$rq = "SELECT host_id, host_name, host_alias, host_activate, host_template_model_htm_id FROM host WHERE host_register = '0' ORDER BY host_name LIMIT ".$num * $limit.", ".$limit;
$DBRESULT = & $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$search = tidySearchKey($search, $advanced_search);
diff --git a/www/include/configuration/configObject/hostgroup/DB-Func.php b/www/include/configuration/configObject/hostgroup/DB-Func.php
index 6b3bc69da42497d007e1b2d4bf99cc861f10646c..fb75efafdda0339649cb47ffa6bf1cfe2d596906 100644
--- a/www/include/configuration/configObject/hostgroup/DB-Func.php
+++ b/www/include/configuration/configObject/hostgroup/DB-Func.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('hg_id');
$DBRESULT =& $pearDB->query("SELECT hg_name, hg_id FROM hostgroup WHERE hg_name = '".htmlentities($name, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$hg =& $DBRESULT->fetchRow();
#Modif case
if ($DBRESULT->numRows() >= 1 && $hg["hg_id"] == $id)
@@ -46,7 +46,7 @@ For information : contact@oreon-project.org
foreach($hg_arr as $key=>$value) {
$DBRESULT =& $pearDB->query("UPDATE hostgroup SET hg_activate = '1' WHERE hg_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -58,7 +58,7 @@ For information : contact@oreon-project.org
foreach($hg_arr as $key=>$value) {
$DBRESULT =& $pearDB->query("UPDATE hostgroup SET hg_activate = '0' WHERE hg_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -71,11 +71,11 @@ For information : contact@oreon-project.org
if ($row["nbr"] == 1) {
$DBRESULT2 =& $pearDB->query("DELETE FROM service WHERE service_id = '".$row["service_service_id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT =& $pearDB->query("DELETE FROM hostgroup WHERE hg_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -84,7 +84,7 @@ For information : contact@oreon-project.org
foreach($hostGroups as $key=>$value) {
$DBRESULT =& $pearDB->query("SELECT * FROM hostgroup WHERE hg_id = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["hg_id"] = '';
for ($i = 1; $i <= $nbrDup[$key]; $i++) {
@@ -98,10 +98,10 @@ For information : contact@oreon-project.org
$val ? $rq = "INSERT INTO hostgroup VALUES (".$val.")" : $rq = null;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(hg_id) FROM hostgroup");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$maxId =& $DBRESULT->fetchRow();
if (isset($maxId["MAX(hg_id)"])) {
# Update LCA
@@ -109,7 +109,7 @@ For information : contact@oreon-project.org
while($DBRESULT1->fetchInto($contactGroup)) {
$DBRESULT2 =& $pearDB->query("SELECT lca_define_lca_id FROM lca_define_contactgroup_relation ldcgr WHERE ldcgr.contactgroup_cg_id = '".$contactGroup["contactgroup_cg_id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while ($DBRESULT2->fetchInto($lca)) {
$rq = "INSERT INTO lca_define_hostgroup_relation ";
$rq .= "(lca_define_lca_id, hostgroup_hg_id) ";
@@ -117,25 +117,25 @@ For information : contact@oreon-project.org
$rq .= "('".$lca["lca_define_lca_id"]."', '".$maxId["MAX(hg_id)"]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
#
$DBRESULT =& $pearDB->query("SELECT DISTINCT hgr.host_host_id FROM hostgroup_relation hgr WHERE hgr.hostgroup_hg_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($host)){
$DBRESULT2 =& $pearDB->query("INSERT INTO hostgroup_relation VALUES ('', '".$maxId["MAX(hg_id)"]."', '".$host["host_host_id"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT =& $pearDB->query("SELECT DISTINCT cghgr.contactgroup_cg_id FROM contactgroup_hostgroup_relation cghgr WHERE cghgr.hostgroup_hg_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($cg)){
$DBRESULT2 =& $pearDB->query("INSERT INTO contactgroup_hostgroup_relation VALUES ('', '".$cg["contactgroup_cg_id"]."', '".$maxId["MAX(hg_id)"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
}
}
@@ -176,16 +176,16 @@ For information : contact@oreon-project.org
$pearDB->query($rq);
$DBRESULT =& $pearDB->query("SELECT MAX(hg_id) FROM hostgroup");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$hg_id = $DBRESULT->fetchRow();
# Update LCA
$DBRESULT =& $pearDB->query("SELECT contactgroup_cg_id FROM contactgroup_contact_relation WHERE contact_contact_id = '".$oreon->user->get_id()."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($contactGroup)) {
$DBRESULT2 =& $pearDB->query("SELECT lca_define_lca_id FROM lca_define_contactgroup_relation ldcgr WHERE ldcgr.contactgroup_cg_id = '".$contactGroup["contactgroup_cg_id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while ($DBRESULT2->fetchInto($lca)) {
$rq = "INSERT INTO lca_define_hostgroup_relation ";
$rq .= "(lca_define_lca_id, hostgroup_hg_id) ";
@@ -193,7 +193,7 @@ For information : contact@oreon-project.org
$rq .= "('".$lca["lca_define_lca_id"]."', '".$hg_id["MAX(hg_id)"]."')";
$DBRESULT3 =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT3))
- print "DB Error : ".$DBRESULT3->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT3->getDebugInfo()."<br />";
}
}
#
@@ -221,7 +221,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE hg_id = '".$hg_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function updateHostGroupHosts($hg_id, $ret = array()) {
@@ -233,7 +233,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE hostgroup_hg_id = '".$hg_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$hostsOLD = array();
while ($DBRESULT->fetchInto($host))
$hostsOLD[$host["host_host_id"]] = $host["host_host_id"];
@@ -242,7 +242,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE hostgroup_hg_id = '".$hg_id."' AND host_host_id IS NULL";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$hgSVS = array();
while ($DBRESULT->fetchInto($sv))
$hgSVS[$sv["service_service_id"]] = $sv["service_service_id"];
@@ -251,7 +251,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE hostgroup_hg_id = '".$hg_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
isset($ret["hg_hosts"]) ? $ret = $ret["hg_hosts"] : $ret = $form->getSubmitValue("hg_hosts");
$hostsNEW = array();
for($i = 0; $i < count($ret); $i++) {
@@ -261,7 +261,7 @@ For information : contact@oreon-project.org
$rq .= "('".$hg_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$hostsNEW[$ret[$i]] = $ret[$i];
}
# Special Case, delete relation between host/service, when service is linked to hostgroup in escalation, dependencies, osl
@@ -274,24 +274,24 @@ For information : contact@oreon-project.org
$rq .= "WHERE host_host_id = '".$host."' AND service_service_id = '".$sv."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Delete in dependencies
$rq = "DELETE FROM dependency_serviceChild_relation ";
$rq .= "WHERE host_host_id = '".$host."' AND service_service_id = '".$sv."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$rq = "DELETE FROM dependency_serviceParent_relation ";
$rq .= "WHERE host_host_id = '".$host."' AND service_service_id = '".$sv."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Delete in OSL
$rq = "DELETE FROM osl_indicator ";
$rq .= "WHERE host_id = '".$host."' AND service_id = '".$sv."'";
$DBRESULT =& $pearDB->query($rq);
//if (PEAR::isError($DBRESULT))
- // print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ // print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
#
@@ -304,7 +304,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE hostgroup_hg_id = '".$hg_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
isset($ret["hg_cgs"]) ? $ret = $ret["hg_cgs"]: $ret = $form->getSubmitValue("hg_cgs");
for($i = 0; $i < count($ret); $i++) {
$rq = "INSERT INTO contactgroup_hostgroup_relation ";
@@ -313,7 +313,7 @@ For information : contact@oreon-project.org
$rq .= "('".$ret[$i]."', '".$hg_id."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
?>
\ No newline at end of file
diff --git a/www/include/configuration/configObject/hostgroup/formHostGroup.php b/www/include/configuration/configObject/hostgroup/formHostGroup.php
index f9140e10523859f80afd55361f3fa0f9c8c114b4..e9cd74e04de295c6022641b72a8284e01c10de13 100644
--- a/www/include/configuration/configObject/hostgroup/formHostGroup.php
+++ b/www/include/configuration/configObject/hostgroup/formHostGroup.php
@@ -27,20 +27,20 @@ For information : contact@oreon-project.org
$rq = "SELECT * FROM hostgroup WHERE hg_id = '".$hg_id."' AND hg_id IN (".$lcaHostGroupstr.") LIMIT 1";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$hg = array_map("myDecode", $DBRESULT->fetchRow());
# Set HostGroup Childs
$DBRESULT =& $pearDB->query("SELECT DISTINCT host_host_id FROM hostgroup_relation WHERE hostgroup_hg_id = '".$hg_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($hosts); $i++)
$hg["hg_hosts"][$i] = $hosts["host_host_id"];
$DBRESULT->free();
# Nagios 1 - Set Contact Group Childs
$DBRESULT =& $pearDB->query("SELECT DISTINCT contactgroup_cg_id FROM contactgroup_hostgroup_relation WHERE hostgroup_hg_id = '".$hg_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($cgs); $i++)
$hg["hg_cgs"][$i] = $cgs["contactgroup_cg_id"];
$DBRESULT->free();
@@ -55,7 +55,7 @@ For information : contact@oreon-project.org
else
$DBRESULT =& $pearDB->query("SELECT host_id, host_name FROM host WHERE host_id IN (".$lcaHoststr.") AND host_register = '1' ORDER BY host_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($host))
$hosts[$host["host_id"]] = $host["host_name"];
$DBRESULT->free();
@@ -63,7 +63,7 @@ For information : contact@oreon-project.org
$cgs = array();
$DBRESULT =& $pearDB->query("SELECT cg_id, cg_name FROM contactgroup ORDER BY cg_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($cg))
$cgs[$cg["cg_id"]] = $cg["cg_name"];
$DBRESULT->free();
@@ -76,7 +76,7 @@ For information : contact@oreon-project.org
$attrsText = array("size"=>"30");
$attrsAdvSelect = array("style" => "width: 220px; height: 170px;");
$attrsTextarea = array("rows"=>"4", "cols"=>"60");
- $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br><br><br>{remove}</td><td>{selected}</td></tr></table>";
+ $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br /><br /><br />{remove}</td><td>{selected}</td></tr></table>";
#
## Form begin
diff --git a/www/include/configuration/configObject/hostgroup/listHostGroup.php b/www/include/configuration/configObject/hostgroup/listHostGroup.php
index c9e378d435e7586fbb6beee74b81330df0ad09aa..b6ec47942e84cdbd1226b7315c0ae7d396e68db8 100644
--- a/www/include/configuration/configObject/hostgroup/listHostGroup.php
+++ b/www/include/configuration/configObject/hostgroup/listHostGroup.php
@@ -43,7 +43,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query($request);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp = & $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
@@ -80,7 +80,7 @@ For information : contact@oreon-project.org
$rq = "SELECT hg_id, hg_name, hg_alias, hg_activate FROM hostgroup $SearchTool $LcaTool ORDER BY hg_name LIMIT ".$num * $limit .", $limit";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$search = tidySearchKey($search, $advanced_search);
@@ -104,12 +104,12 @@ For information : contact@oreon-project.org
$rq = "SELECT COUNT(*) as nbr FROM hostgroup_relation hgr, host WHERE hostgroup_hg_id = '".$hg['hg_id']."' AND host.host_id = hgr.host_host_id AND host.host_register = '1' AND host.host_activate = '1'";
$DBRESULT2 =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$nbrhostAct = $DBRESULT2->fetchRow();
$rq = "SELECT COUNT(*) as nbr FROM hostgroup_relation hgr, host WHERE hostgroup_hg_id = '".$hg['hg_id']."' AND host.host_id = hgr.host_host_id AND host.host_register = '1' AND host.host_activate = '0'";
$DBRESULT2 =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$nbrhostDeact = $DBRESULT2->fetchRow();
$elemArr[$i] = array("MenuClass"=>"list_".$style,
"RowMenu_select"=>$selectedElements->toHtml(),
diff --git a/www/include/configuration/configObject/hostgroup_dependency/DB-Func.php b/www/include/configuration/configObject/hostgroup_dependency/DB-Func.php
index 4c1bd202a30f2d594a285d7934acd1eb7e485e08..d277813cfc130a2a7388b2563371819cf70263cf 100644
--- a/www/include/configuration/configObject/hostgroup_dependency/DB-Func.php
+++ b/www/include/configuration/configObject/hostgroup_dependency/DB-Func.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('dep_id');
$DBRESULT =& $pearDB->query("SELECT dep_name, dep_id FROM dependency WHERE dep_name = '".htmlentities($name, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$dep =& $DBRESULT->fetchRow();
#Modif case
if ($DBRESULT->numRows() >= 1 && $dep["dep_id"] == $id)
@@ -59,7 +59,7 @@ For information : contact@oreon-project.org
foreach($dependencies as $key=>$value) {
$DBRESULT =& $pearDB->query("DELETE FROM dependency WHERE dep_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -68,7 +68,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT * FROM dependency WHERE dep_id = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["dep_id"] = '';
for ($i = 1; $i <= $nbrDup[$key]; $i++) {
@@ -81,28 +81,28 @@ For information : contact@oreon-project.org
$val ? $rq = "INSERT INTO dependency VALUES (".$val.")" : $rq = null;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(dep_id) FROM dependency");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$maxId =& $DBRESULT->fetchRow();
if (isset($maxId["MAX(dep_id)"])) {
$DBRESULT =& $pearDB->query("SELECT DISTINCT hostgroup_hg_id FROM dependency_hostgroupParent_relation WHERE dependency_dep_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($hg)) {
$DBRESULT2 =& $pearDB->query("INSERT INTO dependency_hostgroupParent_relation VALUES ('', '".$maxId["MAX(dep_id)"]."', '".$hg["hostgroup_hg_id"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT->free();
$DBRESULT =& $pearDB->query("SELECT DISTINCT hostgroup_hg_id FROM dependency_hostgroupChild_relation WHERE dependency_dep_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($hg)) {
$DBRESULT2 =& $pearDB->query("INSERT INTO dependency_hostgroupChild_relation VALUES ('', '".$maxId["MAX(dep_id)"]."', '".$hg["hostgroup_hg_id"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT->free();
}
@@ -142,10 +142,10 @@ For information : contact@oreon-project.org
$rq .= ")";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(dep_id) FROM dependency");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$dep_id = $DBRESULT->fetchRow();
return ($dep_id["MAX(dep_id)"]);
}
@@ -172,7 +172,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE dep_id = '".$dep_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function updateHostGroupDependencyHostGroupParents($dep_id = null, $ret = array()) {
@@ -183,7 +183,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE dependency_dep_id = '".$dep_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if (isset($ret["dep_hgParents"]))
$ret = $ret["dep_hgParents"];
else
@@ -195,7 +195,7 @@ For information : contact@oreon-project.org
$rq .= "('".$dep_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -207,7 +207,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE dependency_dep_id = '".$dep_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if (isset($ret["dep_hgChilds"]))
$ret = $ret["dep_hgChilds"];
else
@@ -219,7 +219,7 @@ For information : contact@oreon-project.org
$rq .= "('".$dep_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
?>
\ No newline at end of file
diff --git a/www/include/configuration/configObject/hostgroup_dependency/formHostGroupDependency.php b/www/include/configuration/configObject/hostgroup_dependency/formHostGroupDependency.php
index ccf64e5563d3071f26311d53ecfef17b396bf2b4..cf4777655065944efeb702c1140413cf2960aa71 100644
--- a/www/include/configuration/configObject/hostgroup_dependency/formHostGroupDependency.php
+++ b/www/include/configuration/configObject/hostgroup_dependency/formHostGroupDependency.php
@@ -23,7 +23,7 @@ For information : contact@oreon-project.org
if (($o == "c" || $o == "w") && $dep_id) {
$DBRESULT =& $pearDB->query("SELECT * FROM dependency WHERE dep_id = '".$dep_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$dep = array_map("myDecode", $DBRESULT->fetchRow());
# Set Notification Failure Criteria
@@ -37,14 +37,14 @@ For information : contact@oreon-project.org
# Set HostGroup Parents
$DBRESULT =& $pearDB->query("SELECT DISTINCT hostgroup_hg_id FROM dependency_hostgroupParent_relation WHERE dependency_dep_id = '".$dep_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($hgP); $i++)
$dep["dep_hgParents"][$i] = $hgP["hostgroup_hg_id"];
$DBRESULT->free();
# Set HostGroup Childs
$DBRESULT =& $pearDB->query("SELECT DISTINCT hostgroup_hg_id FROM dependency_hostgroupChild_relation WHERE dependency_dep_id = '".$dep_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($hgC); $i++)
$dep["dep_hgChilds"][$i] = $hgC["hostgroup_hg_id"];
$DBRESULT->free();
@@ -59,7 +59,7 @@ For information : contact@oreon-project.org
else
$DBRESULT =& $pearDB->query("SELECT hg_id, hg_name FROM hostgroup WHERE hg_id IN (".$lcaHostGroupstr.") ORDER BY hg_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($hg))
$hgs[$hg["hg_id"]] = $hg["hg_name"];
$DBRESULT->free();
@@ -73,7 +73,7 @@ For information : contact@oreon-project.org
$attrsText2 = array("size"=>"10");
$attrsAdvSelect = array("style" => "width: 250px; height: 150px;");
$attrsTextarea = array("rows"=>"3", "cols"=>"30");
- $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br><br><br>{remove}</td><td>{selected}</td></tr></table>";
+ $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br /><br /><br />{remove}</td><td>{selected}</td></tr></table>";
#
## Form begin
diff --git a/www/include/configuration/configObject/hostgroup_dependency/listHostGroupDependency.php b/www/include/configuration/configObject/hostgroup_dependency/listHostGroupDependency.php
index fe992a7eb93bc66c23e45c5bd2509b1f35d1d6f6..280fe8596e23e4377947361221720e90c85f7548 100644
--- a/www/include/configuration/configObject/hostgroup_dependency/listHostGroupDependency.php
+++ b/www/include/configuration/configObject/hostgroup_dependency/listHostGroupDependency.php
@@ -35,7 +35,7 @@ For information : contact@oreon-project.org
$rq .= " AND (dep_name LIKE '".htmlentities($search, ENT_QUOTES)."' OR dep_description LIKE '%".htmlentities($search, ENT_QUOTES)."%')";
$DBRESULT = & $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp = & $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
@@ -70,7 +70,7 @@ For information : contact@oreon-project.org
$rq .= " LIMIT ".$num * $limit.", ".$limit;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$search = tidySearchKey($search, $advanced_search);
diff --git a/www/include/configuration/configObject/meta_service/DB-Func.php b/www/include/configuration/configObject/meta_service/DB-Func.php
index 586925b2c1d296b95dbfd5aa0e93ee482dba822b..fe9c12e724a9922d6caaf905641aa486ea7631b6 100644
--- a/www/include/configuration/configObject/meta_service/DB-Func.php
+++ b/www/include/configuration/configObject/meta_service/DB-Func.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('meta_id');
$DBRESULT =& $pearDB->query("SELECT meta_id FROM meta_service WHERE meta_name = '".htmlentities($name, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$meta =& $DBRESULT->fetchRow();
#Modif case
if ($DBRESULT->numRows() >= 1 && $meta["meta_id"] == $id)
@@ -43,7 +43,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("UPDATE meta_service SET meta_activate = '1' WHERE meta_id = '".$meta_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function disableMetaServiceInDB ($meta_id = null) {
@@ -51,7 +51,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("UPDATE meta_service SET meta_activate = '0' WHERE meta_id = '".$meta_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function deleteMetaServiceInDB ($metas = array()) {
@@ -59,7 +59,7 @@ For information : contact@oreon-project.org
foreach($metas as $key=>$value) {
$DBRESULT =& $pearDB->query("DELETE FROM meta_service WHERE meta_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -68,7 +68,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("UPDATE meta_service_relation SET activate = '1' WHERE msr_id = '".$msr_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function disableMetricInDB ($msr_id = null) {
@@ -76,7 +76,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("UPDATE meta_service_relation SET activate = '0' WHERE msr_id = '".$msr_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function deleteMetricInDB ($metrics = array()) {
@@ -84,7 +84,7 @@ For information : contact@oreon-project.org
foreach($metrics as $key=>$value) {
$DBRESULT =& $pearDB->query("DELETE FROM meta_service_relation WHERE msr_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -95,7 +95,7 @@ For information : contact@oreon-project.org
# Get all information about it
$DBRESULT =& $pearDB->query("SELECT * FROM meta_service WHERE meta_id = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["meta_id"] = '';
# Loop on the number of MetaService we want to duplicate
@@ -110,23 +110,23 @@ For information : contact@oreon-project.org
$val ? $rq = "INSERT INTO meta_service VALUES (".$val.")" : $rq = null;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(meta_id) FROM meta_service");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$maxId =& $DBRESULT->fetchRow();
if (isset($maxId["MAX(meta_id)"])) {
$DBRESULT =& $pearDB->query("SELECT DISTINCT cg_cg_id FROM meta_contactgroup_relation WHERE meta_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($Cg)) {
$DBRESULT2 =& $pearDB->query("INSERT INTO meta_contactgroup_relation VALUES ('', '".$maxId["MAX(meta_id)"]."', '".$Cg["cg_cg_id"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT =& $pearDB->query("SELECT * FROM meta_service_relation WHERE meta_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($metric)) {
$val = null;
$metric["msr_id"] = '';
@@ -136,7 +136,7 @@ For information : contact@oreon-project.org
}
$DBRESULT2 =& $pearDB->query("INSERT INTO meta_service_relation VALUES (".$val.")");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
}
}
@@ -163,7 +163,7 @@ For information : contact@oreon-project.org
# Get all information about it
$DBRESULT =& $pearDB->query("SELECT * FROM meta_service_relation WHERE msr_id = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["msr_id"] = '';
# Loop on the number of Metric we want to duplicate
@@ -175,7 +175,7 @@ For information : contact@oreon-project.org
$val ? $rq = "INSERT INTO meta_service_relation VALUES (".$val.")" : $rq = null;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
@@ -214,10 +214,10 @@ For information : contact@oreon-project.org
$rq .= ")";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(meta_id) FROM meta_service");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$meta_id = $DBRESULT->fetchRow();
return ($meta_id["MAX(meta_id)"]);
}
@@ -270,7 +270,7 @@ For information : contact@oreon-project.org
$rq .= " WHERE meta_id = '".$meta_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function updateMetaServiceContactGroup($meta_id = null) {
@@ -281,7 +281,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE meta_id = '".$meta_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$ret = array();
$ret = $form->getSubmitValue("ms_cgs");
for($i = 0; $i < count($ret); $i++) {
@@ -291,7 +291,7 @@ For information : contact@oreon-project.org
$rq .= "('".$meta_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -322,10 +322,10 @@ For information : contact@oreon-project.org
$rq .= ")";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(msr_id) FROM meta_service_relation");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$msr_id = $DBRESULT->fetchRow();
return ($msr_id["MAX(msr_id)"]);
}
@@ -351,6 +351,6 @@ For information : contact@oreon-project.org
$rq .= " WHERE msr_id = '".$msr_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
?>
\ No newline at end of file
diff --git a/www/include/configuration/configObject/meta_service/formMetaService.php b/www/include/configuration/configObject/meta_service/formMetaService.php
index 5b3742cedc095e19c075631295bc9f81edaab1d7..80203a9d23353206696d78647a8e181574cca677 100644
--- a/www/include/configuration/configObject/meta_service/formMetaService.php
+++ b/www/include/configuration/configObject/meta_service/formMetaService.php
@@ -23,7 +23,7 @@ For information : contact@oreon-project.org
if (($o == "c" || $o == "w") && $meta_id) {
$DBRESULT =& $pearDB->query("SELECT * FROM meta_service WHERE meta_id = '".$meta_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$ms = array_map("myDecode", $DBRESULT->fetchRow());
# Set Service Notification Options
@@ -33,7 +33,7 @@ For information : contact@oreon-project.org
# Set Contact Group
$DBRESULT =& $pearDB->query("SELECT DISTINCT cg_cg_id FROM meta_contactgroup_relation WHERE meta_id = '".$meta_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($notifCg); $i++)
$ms["ms_cgs"][$i] = $notifCg["cg_cg_id"];
$DBRESULT->free();
@@ -46,14 +46,14 @@ For information : contact@oreon-project.org
$metrics = array(NULL=>NULL);
$DBRESULT =& $pearDBO->query("select DISTINCT metric_name from metrics ORDER BY metric_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($metric))
$metrics[$metric["metric_name"]] = $metric["metric_name"];
$DBRESULT->free();
# Timeperiods comes from DB -> Store in $tps Array
$DBRESULT =& $pearDB->query("SELECT tp_id, tp_name FROM timeperiod ORDER BY tp_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($tp))
$tps[$tp["tp_id"]] = $tp["tp_name"];
$DBRESULT->free();
@@ -61,7 +61,7 @@ For information : contact@oreon-project.org
$checkCmds = array(NULL=>NULL);
$DBRESULT =& $pearDB->query("SELECT command_id, command_name FROM command WHERE command_type = '2' ORDER BY command_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($checkCmd))
$checkCmds[$checkCmd["command_id"]] = $checkCmd["command_name"];
$DBRESULT->free();
@@ -69,7 +69,7 @@ For information : contact@oreon-project.org
$notifCgs = array();
$DBRESULT =& $pearDB->query("SELECT cg_id, cg_name FROM contactgroup ORDER BY cg_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($notifCg))
$notifCgs[$notifCg["cg_id"]] = $notifCg["cg_name"];
$DBRESULT->free();
@@ -77,7 +77,7 @@ For information : contact@oreon-project.org
$escs = array();
$DBRESULT =& $pearDB->query("SELECT esc_id, esc_name FROM escalation ORDER BY esc_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($esc))
$escs[$esc["esc_id"]] = $esc["esc_name"];
$DBRESULT->free();
@@ -85,7 +85,7 @@ For information : contact@oreon-project.org
$deps = array();
$DBRESULT =& $pearDB->query("SELECT meta_id, meta_name FROM meta_service WHERE meta_id != '".$meta_id."' ORDER BY meta_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($dep))
$deps[$dep["meta_id"]] = $dep["meta_name"];
$DBRESULT->free();
@@ -96,7 +96,7 @@ For information : contact@oreon-project.org
$graphTpls = array(NULL=>NULL);
$DBRESULT =& $pearDB->query("SELECT graph_id, name FROM giv_graphs_template ORDER BY name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($graphTpl))
$graphTpls[$graphTpl["graph_id"]] = $graphTpl["name"];
$DBRESULT->free();
@@ -111,7 +111,7 @@ For information : contact@oreon-project.org
$attrsText2 = array("size"=>"6");
$attrsAdvSelect = array("style" => "width: 200px; height: 100px;");
$attrsTextarea = array("rows"=>"5", "cols"=>"40");
- $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br><br><br>{remove}</td><td>{selected}</td></tr></table>";
+ $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br /><br /><br />{remove}</td><td>{selected}</td></tr></table>";
#
## Form begin
@@ -139,7 +139,7 @@ For information : contact@oreon-project.org
$tab = array();
$tab[] = &HTML_QuickForm::createElement('radio', 'meta_select_mode', null, _("Service List"), '1');
$tab[] = &HTML_QuickForm::createElement('radio', 'meta_select_mode', null, _("SQL matching"), '2');
- $form->addGroup($tab, 'meta_select_mode', _("Selection Mode"), '<br>');
+ $form->addGroup($tab, 'meta_select_mode', _("Selection Mode"), '<br />');
$form->setDefaults(array('meta_select_mode' => array('meta_select_mode'=>'1')));
$form->addElement('text', 'regexp_str', _("SQL matching"), $attrsText);
diff --git a/www/include/configuration/configObject/meta_service/listMetaService.php b/www/include/configuration/configObject/meta_service/listMetaService.php
index 6b64386c0e06c86953cccc0ee07d8b6bf4b9c975..be3fd7dd6e356cbb968c11c42b72f732bb013883 100644
--- a/www/include/configuration/configObject/meta_service/listMetaService.php
+++ b/www/include/configuration/configObject/meta_service/listMetaService.php
@@ -25,7 +25,7 @@ For information : contact@oreon-project.org
else
$DBRESULT = & $pearDB->query("SELECT COUNT(*) FROM meta_service");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp = & $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
@@ -64,7 +64,7 @@ For information : contact@oreon-project.org
$rq = "SELECT * FROM meta_service ORDER BY meta_name LIMIT ".$num * $limit.", ".$limit;
$DBRESULT = & $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$form = new HTML_QuickForm('select_form', 'GET', "?p=".$p);
diff --git a/www/include/configuration/configObject/meta_service/listMetric.ihtml b/www/include/configuration/configObject/meta_service/listMetric.ihtml
index 8a7f7cfba27876276129da594705002cc330b99a..cef253ff10047b3df9e2e9583a757081ee779795 100644
--- a/www/include/configuration/configObject/meta_service/listMetric.ihtml
+++ b/www/include/configuration/configObject/meta_service/listMetric.ihtml
@@ -5,7 +5,7 @@
</td>
</tr>
</table>
-<br>
+<br />
<script type="text/javascript" src="./include/common/javascript/tool.js"></script>
<form name='form' method='POST'>
<input type='hidden' name='o' id='o' value='42'>
diff --git a/www/include/configuration/configObject/meta_service/listMetric.php b/www/include/configuration/configObject/meta_service/listMetric.php
index e0cb58963d475d01e6428fafac489c9e9154bfb1..d8720314f8367569d91ab78115e0b89993cb6f0d 100644
--- a/www/include/configuration/configObject/meta_service/listMetric.php
+++ b/www/include/configuration/configObject/meta_service/listMetric.php
@@ -33,7 +33,7 @@ For information : contact@oreon-project.org
$DBRESULT = & $pearDB->query("SELECT * FROM meta_service WHERE meta_id = '".$meta_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$meta =& $DBRESULT->fetchRow();
$tpl->assign("meta",
@@ -58,7 +58,7 @@ For information : contact@oreon-project.org
$rq = "SELECT * FROM `meta_service_relation` WHERE host_id IN (".$lcaHoststr.") AND meta_id = '".$meta_id."' ORDER BY host_id";
$DBRESULT = & $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$form = new HTML_QuickForm('Form', 'POST', "?p=".$p);
diff --git a/www/include/configuration/configObject/meta_service/metric.php b/www/include/configuration/configObject/meta_service/metric.php
index 15b707a82db022cc148a7c0f6b7236af0514d9c6..3806dcb0e5e45730c9b0aacacb2a96d6d79fdb5c 100644
--- a/www/include/configuration/configObject/meta_service/metric.php
+++ b/www/include/configuration/configObject/meta_service/metric.php
@@ -26,13 +26,13 @@ For information : contact@oreon-project.org
# Set base value
$DBRESULT =& $pearDB->query("SELECT * FROM meta_service_relation WHERE msr_id = '".$msr_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$metric1 = array_map("myDecode", $DBRESULT->fetchRow());
$DBRESULT =& $pearDBO->query("SELECT * FROM metrics, index_data WHERE metric_id = '".$metric1["metric_id"]."' and metrics.index_id=index_data.id");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$metric2 = array_map("myDecode", $DBRESULT->fetchRow());
$metric = array_merge($metric1, $metric2);
$host_id = $metric1["host_id"];
@@ -49,7 +49,7 @@ For information : contact@oreon-project.org
$hosts = array(NULL=>NULL);
$DBRESULT =& $pearDB->query("SELECT DISTINCT host_id, host_name FROM host WHERE host_register = '1' AND host_activate = '1' ORDER BY host_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($host))
if ($oreon->user->admin || !$isRestreint || ($isRestreint && isset($lcaHostByName["LcaHost"][$host["host_name"]])))
@@ -64,7 +64,7 @@ For information : contact@oreon-project.org
foreach ($services as $key=>$value) {
$DBRESULT =& $pearDBO->query("SELECT DISTINCT metric_name, metric_id, unit_name FROM metrics m, index_data i WHERE i.host_name = '".getMyHostName($host_id)."' AND i.service_description = '".$value."' and i.id=m.index_id ORDER BY metric_name, unit_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($metricSV)) {
$services1[$key] = $value;
$services2[$key][$metricSV["metric_id"]] = $metricSV["metric_name"]." (".$metricSV["unit_name"].")";
diff --git a/www/include/configuration/configObject/metaservice_dependency/DB-Func.php b/www/include/configuration/configObject/metaservice_dependency/DB-Func.php
index f67ad67a1f9899cf1812c7b7b47f86357ce2e83f..6d6cebb2577ee947e5c1237f7a70cd52d6b86713 100644
--- a/www/include/configuration/configObject/metaservice_dependency/DB-Func.php
+++ b/www/include/configuration/configObject/metaservice_dependency/DB-Func.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('dep_id');
$DBRESULT =& $pearDB->query("SELECT dep_name, dep_id FROM dependency WHERE dep_name = '".htmlentities($name, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$dep =& $DBRESULT->fetchRow();
#Modif case
if ($DBRESULT->numRows() >= 1 && $dep["dep_id"] == $id)
@@ -59,7 +59,7 @@ For information : contact@oreon-project.org
foreach($dependencies as $key=>$value) {
$DBRESULT =& $pearDB->query("DELETE FROM dependency WHERE dep_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -68,7 +68,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT * FROM dependency WHERE dep_id = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["dep_id"] = '';
for ($i = 1; $i <= $nbrDup[$key]; $i++) {
@@ -81,28 +81,28 @@ For information : contact@oreon-project.org
$val ? $rq = "INSERT INTO dependency VALUES (".$val.")" : $rq = null;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(dep_id) FROM dependency");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$maxId =& $DBRESULT->fetchRow();
if (isset($maxId["MAX(dep_id)"])) {
$DBRESULT =& $pearDB->query("SELECT DISTINCT meta_service_meta_id FROM dependency_metaserviceParent_relation WHERE dependency_dep_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($ms)) {
$DBRESULT2 =& $pearDB->query("INSERT INTO dependency_metaserviceParent_relation VALUES ('', '".$maxId["MAX(dep_id)"]."', '".$ms["meta_service_meta_id"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT->free();
$DBRESULT =& $pearDB->query("SELECT DISTINCT meta_service_meta_id FROM dependency_metaserviceChild_relation WHERE dependency_dep_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($ms)){
$DBRESULT2 =& $pearDB->query("INSERT INTO dependency_metaserviceChild_relation VALUES ('', '".$maxId["MAX(dep_id)"]."', '".$ms["meta_service_meta_id"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT->free();
}
@@ -142,10 +142,10 @@ For information : contact@oreon-project.org
$rq .= ")";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(dep_id) FROM dependency");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$dep_id = $DBRESULT->fetchRow();
return ($dep_id["MAX(dep_id)"]);
}
@@ -172,7 +172,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE dep_id = '".$dep_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function updateMetaServiceDependencyMetaServiceParents($dep_id = null) {
@@ -183,7 +183,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE dependency_dep_id = '".$dep_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$ret = array();
$ret = $form->getSubmitValue("dep_msParents");
for($i = 0; $i < count($ret); $i++) {
@@ -193,7 +193,7 @@ For information : contact@oreon-project.org
$rq .= "('".$dep_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -205,7 +205,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE dependency_dep_id = '".$dep_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$ret = array();
$ret = $form->getSubmitValue("dep_msChilds");
for($i = 0; $i < count($ret); $i++) {
@@ -215,7 +215,7 @@ For information : contact@oreon-project.org
$rq .= "('".$dep_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
?>
\ No newline at end of file
diff --git a/www/include/configuration/configObject/metaservice_dependency/formMetaServiceDependency.php b/www/include/configuration/configObject/metaservice_dependency/formMetaServiceDependency.php
index 42ffafa024f9182eb7ed6d4238abe2b73d4cd802..392c87f818c1952efe714cededf2ab32dc986052 100644
--- a/www/include/configuration/configObject/metaservice_dependency/formMetaServiceDependency.php
+++ b/www/include/configuration/configObject/metaservice_dependency/formMetaServiceDependency.php
@@ -23,7 +23,7 @@ For information : contact@oreon-project.org
if (($o == "c" || $o == "w") && $dep_id) {
$DBRESULT =& $pearDB->query("SELECT * FROM dependency WHERE dep_id = '".$dep_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$dep = array_map("myDecode", $DBRESULT->fetchRow());
# Set Notification Failure Criteria
@@ -37,14 +37,14 @@ For information : contact@oreon-project.org
# Set Meta Service Parents
$DBRESULT =& $pearDB->query("SELECT DISTINCT meta_service_meta_id FROM dependency_metaserviceParent_relation WHERE dependency_dep_id = '".$dep_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($msP); $i++)
$dep["dep_msParents"][$i] = $msP["meta_service_meta_id"];
$DBRESULT->free();
# Set Meta Service Childs
$DBRESULT =& $pearDB->query("SELECT DISTINCT meta_service_meta_id FROM dependency_metaserviceChild_relation WHERE dependency_dep_id = '".$dep_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($msC); $i++)
$dep["dep_msChilds"][$i] = $msC["meta_service_meta_id"];
$DBRESULT->free();
@@ -56,7 +56,7 @@ For information : contact@oreon-project.org
$metas = array();
$DBRESULT =& $pearDB->query("SELECT meta_id, meta_name FROM meta_service ORDER BY meta_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($meta))
$metas[$meta["meta_id"]] = $meta["meta_name"];
$DBRESULT->free();
@@ -70,7 +70,7 @@ For information : contact@oreon-project.org
$attrsText2 = array("size"=>"10");
$attrsAdvSelect = array("style" => "width: 250px; height: 150px;");
$attrsTextarea = array("rows"=>"3", "cols"=>"30");
- $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br><br><br>{remove}</td><td>{selected}</td></tr></table>";
+ $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br /><br /><br />{remove}</td><td>{selected}</td></tr></table>";
#
## Form begin
diff --git a/www/include/configuration/configObject/metaservice_dependency/listMetaServiceDependency.php b/www/include/configuration/configObject/metaservice_dependency/listMetaServiceDependency.php
index d9e88072e6c68ca3640839a6e3a0e4e65da94946..03951264859910d1e396ddf1d6bf0c12506f4567 100644
--- a/www/include/configuration/configObject/metaservice_dependency/listMetaServiceDependency.php
+++ b/www/include/configuration/configObject/metaservice_dependency/listMetaServiceDependency.php
@@ -30,7 +30,7 @@ For information : contact@oreon-project.org
$rq .= " AND (dep_name LIKE '%".htmlentities($search, ENT_QUOTES)."%' OR dep_alias LIKE '%".htmlentities($search, ENT_QUOTES)."%')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp = & $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
@@ -59,7 +59,7 @@ For information : contact@oreon-project.org
$rq .= " LIMIT ".$num * $limit.", ".$limit;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$search = tidySearchKey($search, $advanced_search);
diff --git a/www/include/configuration/configObject/purgePolicy/DB-Func.php b/www/include/configuration/configObject/purgePolicy/DB-Func.php
index d3de6b6fa01ac4bd5060cadbc63c4267b8661a81..4b14e370ea1b353c86932321f5578977c929c154 100644
--- a/www/include/configuration/configObject/purgePolicy/DB-Func.php
+++ b/www/include/configuration/configObject/purgePolicy/DB-Func.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('purge_policy_id');
$DBRESULT =& $pearDB->query("SELECT purge_policy_name, purge_policy_id FROM purge_policy WHERE purge_policy_name = '".htmlentities($name, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$pp =& $DBRESULT->fetchRow();
#Modif case
if ($DBRESULT->numRows() >= 1 && $pp["purge_policy_id"] == $id)
@@ -43,7 +43,7 @@ For information : contact@oreon-project.org
foreach($ppols as $key=>$value) {
$DBRESULT =& $pearDB->query("DELETE FROM purge_policy WHERE purge_policy_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -52,7 +52,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT * FROM purge_policy WHERE purge_policy_id = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["purge_policy_id"] = '';
for ($i = 1; $i <= $nbrDup[$key]; $i++) {
@@ -65,7 +65,7 @@ For information : contact@oreon-project.org
$val ? $rq = "INSERT INTO purge_policy VALUES (".$val.")" : $rq = null;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
@@ -104,10 +104,10 @@ For information : contact@oreon-project.org
$rq .= ")";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(purge_policy_id) FROM purge_policy");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$purge_policy_id = $DBRESULT->fetchRow();
return ($purge_policy_id["MAX(purge_policy_id)"]);
}
@@ -140,6 +140,6 @@ For information : contact@oreon-project.org
$rq .= "WHERE purge_policy_id = '".$purge_policy_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
?>
\ No newline at end of file
diff --git a/www/include/configuration/configObject/purgePolicy/formPurgePolicy.ihtml b/www/include/configuration/configObject/purgePolicy/formPurgePolicy.ihtml
index 61ce5365642036b998327b7ca66bccd74d97e19a..d623c78b4941f1fc474bb56691788d10d9c23353 100644
--- a/www/include/configuration/configObject/purgePolicy/formPurgePolicy.ihtml
+++ b/www/include/configuration/configObject/purgePolicy/formPurgePolicy.ihtml
@@ -17,35 +17,35 @@
<tr class="list_one"><td class="FormRowField">{$form.purge_policy_retention.label}</td><td class="FormRowValue">{$form.purge_policy_retention.html}</td></tr>
<tr class="list_two">
<td class="FormRowField">
- {$form.purge_policy_host.label}<br>
+ {$form.purge_policy_host.label}<br />
{$help.h5}
</td>
<td class="FormRowValue">{$form.purge_policy_host.html}</td>
</tr>
<tr class="list_two">
<td class="FormRowField">
- {$form.purge_policy_service.label}<br>
+ {$form.purge_policy_service.label}<br />
{$help.h4}
</td>
<td class="FormRowValue">{$form.purge_policy_service.html}</td>
</tr>
<tr class="list_one">
<td class="FormRowField">
- {$form.purge_policy_metric.label}<br>
+ {$form.purge_policy_metric.label}<br />
{$help.h3}
</td>
<td class="FormRowValue">{$form.purge_policy_metric.html}</td>
</tr>
<tr class="list_two">
<td class="FormRowField">
- {$form.purge_policy_raw.label}<br>
+ {$form.purge_policy_raw.label}<br />
{$help.h1}
</td>
<td class="FormRowValue">{$form.purge_policy_raw.html}</td>
</tr>
<tr class="list_one">
<td class="FormRowField">
- {$form.purge_policy_bin.label}<br>
+ {$form.purge_policy_bin.label}<br />
{$help.h2}
</td>
<td class="FormRowValue">{$form.purge_policy_bin.html}</td>
diff --git a/www/include/configuration/configObject/purgePolicy/formPurgePolicy.php b/www/include/configuration/configObject/purgePolicy/formPurgePolicy.php
index e9b7003f4d9a4a80d3dbb77329bc112bca87df78..22b5a2548056bbd9937442f4eb89a12fbedacec8 100644
--- a/www/include/configuration/configObject/purgePolicy/formPurgePolicy.php
+++ b/www/include/configuration/configObject/purgePolicy/formPurgePolicy.php
@@ -23,7 +23,7 @@ For information : contact@oreon-project.org
if (($o == "c" || $o == "w") && $purge_policy_id) {
$DBRESULT =& $pearDB->query("SELECT * FROM purge_policy WHERE purge_policy_id = '".$purge_policy_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$ppol = array_map("myDecode", $DBRESULT->fetchRow());
}
diff --git a/www/include/configuration/configObject/purgePolicy/listPurgePolicy.php b/www/include/configuration/configObject/purgePolicy/listPurgePolicy.php
index 0026b9e50f36c7a8e76469f75b8a00168185a1a6..9cc7b49d17fc0f939fcdbc9da0ca60f1784aa7a4 100644
--- a/www/include/configuration/configObject/purgePolicy/listPurgePolicy.php
+++ b/www/include/configuration/configObject/purgePolicy/listPurgePolicy.php
@@ -25,7 +25,7 @@ For information : contact@oreon-project.org
else
$DBRESULT =& $pearDB->query("SELECT COUNT(*) FROM purge_policy");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp = & $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
@@ -58,7 +58,7 @@ For information : contact@oreon-project.org
$rq = "SELECT * FROM purge_policy ORDER BY purge_policy_name LIMIT ".$num * $limit.", ".$limit;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$form = new HTML_QuickForm('select_form', 'POST', "?p=".$p);
#Different style between each lines
diff --git a/www/include/configuration/configObject/service/DB-Func.php b/www/include/configuration/configObject/service/DB-Func.php
index 26a7694e2f80012df750f57ca4dfaf2a4a78337f..347001df5f83444aee7847cdab061a36c4a54a8c 100644
--- a/www/include/configuration/configObject/service/DB-Func.php
+++ b/www/include/configuration/configObject/service/DB-Func.php
@@ -28,7 +28,7 @@ For information : contact@oreon-project.org
$name = str_replace('\\', "#BS#", $name);
$DBRESULT =& $pearDB->query("SELECT service_description, service_id FROM service WHERE service_register = '0' AND service_description = '".htmlentities($name, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$service =& $DBRESULT->fetchRow();
#Modif case
if ($DBRESULT->numRows() >= 1 && $service["service_id"] == $id)
@@ -62,7 +62,7 @@ For information : contact@oreon-project.org
foreach ($hPars as $host) {
$DBRESULT =& $pearDB->query("SELECT service_id FROM service, host_service_relation hsr WHERE hsr.host_host_id = '".$host."' AND hsr.service_service_id = service_id AND service.service_description = '".htmlentities($name, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$service =& $DBRESULT->fetchRow();
#Duplicate entry
if ($DBRESULT->numRows() >= 1 && $service["service_id"] != $id)
@@ -72,7 +72,7 @@ For information : contact@oreon-project.org
foreach ($hgPars as $hostgroup) {
$DBRESULT =& $pearDB->query("SELECT service_id FROM service, host_service_relation hsr WHERE hsr.hostgroup_hg_id = '".$hostgroup."' AND hsr.service_service_id = service_id AND service.service_description = '".htmlentities($name, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$service =& $DBRESULT->fetchRow();
#Duplicate entry
if ($DBRESULT->numRows() >= 1 && $service["service_id"] != $id)
@@ -90,7 +90,7 @@ For information : contact@oreon-project.org
foreach($service_arr as $key=>$value) {
$DBRESULT =& $pearDB->query("UPDATE service SET service_activate = '1' WHERE service_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -102,7 +102,7 @@ For information : contact@oreon-project.org
foreach($service_arr as $key=>$value) {
$DBRESULT =& $pearDB->query("UPDATE service SET service_activate = '0' WHERE service_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
function deleteServiceInDB ($services = array()) {
@@ -111,15 +111,15 @@ For information : contact@oreon-project.org
foreach($services as $key=>$value) {
$DBRESULT =& $pearDB->query("SELECT service_id FROM service WHERE service_template_model_stm_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($row)) {
$DBRESULT2 =& $pearDB->query("UPDATE service SET service_template_model_stm_id = NULL WHERE service_id = '".$row["service_id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT =& $pearDB->query("DELETE FROM service WHERE service_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$files = glob($oreon->optGen["oreon_rrdbase_path"]."*_".$key.".rrd");
foreach ($files as $filename)
unlink ($filename);
@@ -136,21 +136,21 @@ For information : contact@oreon-project.org
$lap= 0;
$DBRESULT =& $pearDB->query("SELECT * FROM host_service_relation WHERE service_service_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($relation)) {
if ($relation["hostgroup_hg_id"]) {
if ($lap) {
$sv_id = NULL;
$DBRESULT2 =& $pearDB->query("DELETE FROM host_service_relation WHERE service_service_id = '".$key."' AND hostgroup_hg_id = '".$relation["hostgroup_hg_id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$sv_id = multipleServiceInDB(array($key=>"1"), array($key=>"1"), NULL, 0, $relation["hostgroup_hg_id"], array(), array($relation["hostgroup_hg_id"]=>NULL));
if ($sv_id) {
$hosts = getMyHostGroupHosts($relation["hostgroup_hg_id"]);
foreach($hosts as $host) {
$DBRESULT3 = $pearDBO->query("UPDATE index_data SET service_id = '".$sv_id."' WHERE host_id = '".$host."' AND service_id = '".$key."'");
if (PEAR::isError($DBRESULT3))
- print "DB Error : ".$DBRESULT3->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT3->getDebugInfo()."<br />";
}
}
}
@@ -161,12 +161,12 @@ For information : contact@oreon-project.org
$sv_id = NULL;
$DBRESULT2 =& $pearDB->query("DELETE FROM host_service_relation WHERE service_service_id = '".$key."' AND host_host_id = '".$relation["host_host_id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$sv_id = multipleServiceInDB(array($key=>"1"), array($key=>"1"), $relation["host_host_id"], 0, NULL, array($relation["host_host_id"]=>NULL), array());
if ($sv_id) {
$DBRESULT3 = $pearDBO->query("UPDATE index_data SET service_id = '".$sv_id."' WHERE host_id = '".$relation["host_host_id"]."' AND service_id = '".$key."'");
if (PEAR::isError($DBRESULT3))
- print "DB Error : ".$DBRESULT3->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT3->getDebugInfo()."<br />";
}
}
$lap++;
@@ -184,7 +184,7 @@ For information : contact@oreon-project.org
# Get all information about it
$DBRESULT =& $pearDB->query("SELECT * FROM service WHERE service_id = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["service_id"] = '';
# Loop on the number of Service we want to duplicate
@@ -206,10 +206,10 @@ For information : contact@oreon-project.org
$val ? $rq = "INSERT INTO service VALUES (".$val.")" : $rq = null;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(service_id) FROM service");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$maxId =& $DBRESULT->fetchRow();
if (isset($maxId["MAX(service_id)"])) {
# Host duplication case -> Duplicate the Service for the Host we create
@@ -221,45 +221,45 @@ For information : contact@oreon-project.org
# Service duplication case -> Duplicate the Service for each relation the base Service have
$DBRESULT =& $pearDB->query("SELECT DISTINCT host_host_id, hostgroup_hg_id FROM host_service_relation WHERE service_service_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($service)) {
if ($service["host_host_id"])
$DBRESULT2 =& $pearDB->query("INSERT INTO host_service_relation VALUES ('', NULL, '".$service["host_host_id"]."', NULL, '".$maxId["MAX(service_id)"]."')");
else if ($service["hostgroup_hg_id"])
$DBRESULT2 =& $pearDB->query("INSERT INTO host_service_relation VALUES ('', '".$service["hostgroup_hg_id"]."', NULL, NULL, '".$maxId["MAX(service_id)"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
}
$DBRESULT =& $pearDB->query("SELECT DISTINCT contactgroup_cg_id FROM contactgroup_service_relation WHERE service_service_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($Cg)){
$DBRESULT2 =& $pearDB->query("INSERT INTO contactgroup_service_relation VALUES ('', '".$Cg["contactgroup_cg_id"]."', '".$maxId["MAX(service_id)"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT =& $pearDB->query("SELECT DISTINCT host_host_id, hostgroup_hg_id, servicegroup_sg_id FROM servicegroup_relation WHERE service_service_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($Sg)){
$Sg["host_host_id"] ? $host_id = "'".$Sg["host_host_id"]."'" : $host_id = "NULL";
$Sg["hostgroup_hg_id"] ? $hg_id = "'".$Sg["hostgroup_hg_id"]."'" : $hg_id = "NULL";
$DBRESULT2 =& $pearDB->query("INSERT INTO servicegroup_relation (host_host_id, hostgroup_hg_id, service_service_id, servicegroup_sg_id) VALUES (".$host_id.", ".$hg_id.", '".$maxId["MAX(service_id)"]."', '".$Sg["servicegroup_sg_id"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT =& $pearDB->query("SELECT DISTINCT traps_id FROM traps_service_relation WHERE service_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($traps)){
$DBRESULT2 =& $pearDB->query("INSERT INTO traps_service_relation VALUES ('', '".$traps["traps_id"]."', '".$maxId["MAX(service_id)"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT =& $pearDB->query("SELECT * FROM extended_service_information WHERE service_service_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($esi)) {
$val = null;
$esi["service_service_id"] = $maxId["MAX(service_id)"];
@@ -269,7 +269,7 @@ For information : contact@oreon-project.org
$val ? $rq = "INSERT INTO extended_service_information VALUES (".$val.")" : $rq = null;
$DBRESULT2 =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
}
}
@@ -434,10 +434,10 @@ For information : contact@oreon-project.org
$rq .= ")";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(service_id) FROM service");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$service_id = $DBRESULT->fetchRow();
return ($service_id["MAX(service_id)"]);
}
@@ -462,7 +462,7 @@ For information : contact@oreon-project.org
$rq .= ")";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function updateService($service_id = null, $from_MC = false) {
@@ -572,7 +572,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE service_id = '".$service_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function updateService_MC($service_id = null) {
@@ -643,7 +643,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE service_id = '".$service_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -655,7 +655,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE service_service_id = '".$service_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if (isset($ret["service_cgs"]))
$ret = $ret["service_cgs"];
else
@@ -667,7 +667,7 @@ For information : contact@oreon-project.org
$rq .= "('".$ret[$i]."', '".$service_id."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -680,7 +680,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE service_service_id = '".$service_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$cgs = array();
while($DBRESULT->fetchInto($arr))
$cgs[$arr["contactgroup_cg_id"]] = $arr["contactgroup_cg_id"];
@@ -693,7 +693,7 @@ For information : contact@oreon-project.org
$rq .= "('".$ret[$i]."', '".$service_id."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
@@ -706,7 +706,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE service_service_id = '".$service_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if (isset($ret["service_sgs"]))
$ret = $ret["service_sgs"];
else
@@ -729,7 +729,7 @@ For information : contact@oreon-project.org
$rq .= "(NULL, '".$value."', '".$service_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
else if (count($ret1))
foreach($ret1 as $key=>$value) {
@@ -739,7 +739,7 @@ For information : contact@oreon-project.org
$rq .= "('".$value."', NULL, '".$service_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
@@ -753,7 +753,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE service_service_id = '".$service_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$hsgs = array();
$hgsgs = array();
while($DBRESULT->fetchInto($arr)) {
@@ -776,7 +776,7 @@ For information : contact@oreon-project.org
$rq .= "(NULL, '".$hg."', '".$service_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
else if (count($ret1))
@@ -788,7 +788,7 @@ For information : contact@oreon-project.org
$rq .= "('".$h."', NULL, '".$service_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
@@ -802,7 +802,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE service_id = '".$service_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if (isset($ret["service_traps"]))
$ret = $ret["service_traps"];
else
@@ -814,7 +814,7 @@ For information : contact@oreon-project.org
$rq .= "('".$ret[$i]."', '".$service_id."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -827,7 +827,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE service_id = '".$service_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$traps = array();
while($DBRESULT->fetchInto($arr))
$traps[$arr["traps_id"]] = $arr["traps_id"];
@@ -840,7 +840,7 @@ For information : contact@oreon-project.org
$rq .= "('".$ret[$i]."', '".$service_id."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
@@ -853,7 +853,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE service_service_id = '".$service_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$ret1 = array();
$ret2 = array();
if (isset($ret["service_hPars"]))
@@ -872,7 +872,7 @@ For information : contact@oreon-project.org
$rq .= "('".$ret2[$i]."', NULL, NULL, '".$service_id."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
else if (count($ret1))
for($i = 0; $i < count($ret1); $i++) {
@@ -882,7 +882,7 @@ For information : contact@oreon-project.org
$rq .= "(NULL, '".$ret1[$i]."', NULL, '".$service_id."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -894,7 +894,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE service_service_id = '".$service_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$hsvs = array();
$hgsvs = array();
while($DBRESULT->fetchInto($arr)) {
@@ -914,14 +914,14 @@ For information : contact@oreon-project.org
$rq .= "WHERE service_service_id = '".$service_id."' AND host_host_id IS NOT NULL";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$rq = "INSERT INTO host_service_relation ";
$rq .= "(hostgroup_hg_id, host_host_id, servicegroup_sg_id, service_service_id) ";
$rq .= "VALUES ";
$rq .= "('".$ret2[$i]."', NULL, NULL, '".$service_id."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
else if (count($ret1))
@@ -931,14 +931,14 @@ For information : contact@oreon-project.org
$rq .= "WHERE service_service_id = '".$service_id."' AND hostgroup_hg_id IS NOT NULL";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$rq = "INSERT INTO host_service_relation ";
$rq .= "(hostgroup_hg_id, host_host_id, servicegroup_sg_id, service_service_id) ";
$rq .= "VALUES ";
$rq .= "(NULL, '".$ret1[$i]."', NULL, '".$service_id."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
@@ -964,7 +964,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE service_service_id = '".$service_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function updateServiceExtInfos_MC($service_id = null) {
@@ -984,7 +984,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE service_service_id = '".$service_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -995,7 +995,7 @@ For information : contact@oreon-project.org
foreach ($useTpls as $key=>$value) {
$DBRESULT =& $pearDB->query("UPDATE service SET service_template_model_stm_id = '".getMyServiceTPLID($value)."' WHERE service_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -1008,7 +1008,7 @@ For information : contact@oreon-project.org
$rq = "DELETE FROM service_categories_relation WHERE service_service_id = '".$service_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if (isset($ret["service_categories"]))
$ret = $ret["service_categories"];
else
@@ -1020,7 +1020,7 @@ For information : contact@oreon-project.org
$rq .= "('".$ret[$i]."', '".$service_id."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
?>
\ No newline at end of file
diff --git a/www/include/configuration/configObject/service/formService.ihtml b/www/include/configuration/configObject/service/formService.ihtml
index af7b43180d2090df3798b088375f9e44aadcdedd..f27f5203162d8c7f7019cba0c5ee1498634cb69c 100644
--- a/www/include/configuration/configObject/service/formService.ihtml
+++ b/www/include/configuration/configObject/service/formService.ihtml
@@ -22,7 +22,7 @@
<tr class="list_lvl_1"><td class="ListColLvl1_name" colspan="2"><img src='./img/icones/16x16/clipboard.gif'> {$form.header.information}</td></tr>
{if $msg.tpl}
- <tr class="list_one"><td class="FormRowField">{$form.service_alias.label}<br>{$form.header.service_alias_interest}</td><td class="FormRowValue">{$form.service_alias.html}</td></tr>
+ <tr class="list_one"><td class="FormRowField">{$form.service_alias.label}<br />{$form.header.service_alias_interest}</td><td class="FormRowValue">{$form.service_alias.html}</td></tr>
{/if}
{if $o != "mc"}
<tr class="list_two"><td class="FormRowField">{$form.service_description.label}</td><td class="FormRowValue">{$form.service_description.html}</td></tr>
diff --git a/www/include/configuration/configObject/service/formService.php b/www/include/configuration/configObject/service/formService.php
index 739e42a59a57e093b200b602b5ce6ae4b3e9523f..2218e2c8494a90d83ebfbca694f957f491e10436 100644
--- a/www/include/configuration/configObject/service/formService.php
+++ b/www/include/configuration/configObject/service/formService.php
@@ -36,14 +36,14 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query("SELECT * FROM service, extended_service_information esi WHERE service_id = '".$service_id."' AND esi.service_service_id = service_id LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$service = array_map("myDecodeService", $DBRESULT->fetchRow());
# Grab hostgroup || host
$DBRESULT =& $pearDB->query("SELECT * FROM host_service_relation hsr WHERE hsr.service_service_id = '".$service_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($parent)) {
if ($parent["host_host_id"])
$service["service_hPars"][$parent["host_host_id"]] = $parent["host_host_id"];
@@ -65,7 +65,7 @@ For information : contact@oreon-project.org
# Set Contact Group
$DBRESULT =& $pearDB->query("SELECT DISTINCT contactgroup_cg_id FROM contactgroup_service_relation WHERE service_service_id = '".$service_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($notifCg); $i++)
$service["service_cgs"][$i] = $notifCg["contactgroup_cg_id"];
$DBRESULT->free();
@@ -73,7 +73,7 @@ For information : contact@oreon-project.org
# Set Service Group Parents
$DBRESULT =& $pearDB->query("SELECT DISTINCT servicegroup_sg_id FROM servicegroup_relation WHERE service_service_id = '".$service_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($sg); $i++)
$service["service_sgs"][$i] = $sg["servicegroup_sg_id"];
$DBRESULT->free();
@@ -81,7 +81,7 @@ For information : contact@oreon-project.org
# Set Traps
$DBRESULT =& $pearDB->query("SELECT DISTINCT traps_id FROM traps_service_relation WHERE service_id = '".$service_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($trap); $i++)
$service["service_traps"][$i] = $trap["traps_id"];
$DBRESULT->free();
@@ -89,7 +89,7 @@ For information : contact@oreon-project.org
# Set Categories
$DBRESULT =& $pearDB->query("SELECT DISTINCT sc_id FROM service_categories_relation WHERE service_service_id = '".$service_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($service_category); $i++)
$service["service_categories"][$i] = $service_category["sc_id"];
$DBRESULT->free();
@@ -104,7 +104,7 @@ For information : contact@oreon-project.org
else
$DBRESULT =& $pearDB->query("SELECT host_id, host_name FROM host WHERE host_id IN (".$lcaHostStr.") AND host_register = '1' ORDER BY host_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($host))
$hosts[$host["host_id"]] = $host["host_name"];
$DBRESULT->free();
@@ -112,7 +112,7 @@ For information : contact@oreon-project.org
$svTpls = array(NULL=>NULL);
$DBRESULT =& $pearDB->query("SELECT service_id, service_description, service_template_model_stm_id FROM service WHERE service_register = '0' AND service_id != '".$service_id."' ORDER BY service_description");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($svTpl)) {
if (!$svTpl["service_description"])
$svTpl["service_description"] = getMyServiceName($svTpl["service_template_model_stm_id"])."'";
@@ -130,7 +130,7 @@ For information : contact@oreon-project.org
else
$DBRESULT =& $pearDB->query("SELECT hg_id, hg_name FROM hostgroup WHERE hg_id IN (".$lcaHGStr.") ORDER BY hg_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($hg))
$hgs[$hg["hg_id"]] = $hg["hg_name"];
$DBRESULT->free();
@@ -138,7 +138,7 @@ For information : contact@oreon-project.org
$tps = array(NULL=>NULL);
$DBRESULT =& $pearDB->query("SELECT tp_id, tp_name FROM timeperiod ORDER BY tp_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($tp))
$tps[$tp["tp_id"]] = $tp["tp_name"];
$DBRESULT->free();
@@ -146,7 +146,7 @@ For information : contact@oreon-project.org
$checkCmds = array(NULL=>NULL);
$DBRESULT =& $pearDB->query("SELECT command_id, command_name FROM command WHERE command_type = '2' ORDER BY command_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($checkCmd))
$checkCmds[$checkCmd["command_id"]] = $checkCmd["command_name"];
$DBRESULT->free();
@@ -154,7 +154,7 @@ For information : contact@oreon-project.org
$checkCmdEvent = array(NULL=>NULL);
$DBRESULT =& $pearDB->query("SELECT command_id, command_name FROM command WHERE command_type = '2' OR command_type = '3' ORDER BY command_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($checkCmd))
$checkCmdEvent[$checkCmd["command_id"]] = $checkCmd["command_name"];
$DBRESULT->free();
@@ -162,7 +162,7 @@ For information : contact@oreon-project.org
$notifCgs = array();
$DBRESULT =& $pearDB->query("SELECT cg_id, cg_name FROM contactgroup ORDER BY cg_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($notifCg))
$notifCgs[$notifCg["cg_id"]] = $notifCg["cg_name"];
$DBRESULT->free();
@@ -171,7 +171,7 @@ For information : contact@oreon-project.org
// $DBRESULT =& $pearDB->query("SELECT sg_id, sg_name FROM servicegroup WHERE sg_id IN (".$lcaServiceGroupStr.") ORDER BY sg_name");
$DBRESULT =& $pearDB->query("SELECT sg_id, sg_name FROM servicegroup ORDER BY sg_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($sg))
$sgs[$sg["sg_id"]] = $sg["sg_name"];
$DBRESULT->free();
@@ -180,7 +180,7 @@ For information : contact@oreon-project.org
$graphTpls = array(NULL=>NULL);
$DBRESULT =& $pearDB->query("SELECT graph_id, name FROM giv_graphs_template ORDER BY name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($graphTpl))
$graphTpls[$graphTpl["graph_id"]] = $graphTpl["name"];
$DBRESULT->free();
@@ -189,7 +189,7 @@ For information : contact@oreon-project.org
$service_categories = array();
$DBRESULT =& $pearDB->query("SELECT sc_name, sc_id FROM service_categories ORDER BY sc_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($service_categorie))
$service_categories[$service_categorie["sc_id"]] = $service_categorie["sc_name"];
$DBRESULT->free();
@@ -198,7 +198,7 @@ For information : contact@oreon-project.org
$traps = array();
$DBRESULT =& $pearDB->query("SELECT traps_id, traps_name FROM traps ORDER BY traps_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($trap))
$traps[$trap["traps_id"]] = $trap["traps_name"];
$DBRESULT->free();
@@ -207,7 +207,7 @@ For information : contact@oreon-project.org
$ppols = array(NULL=>NULL);
$DBRESULT =& $pearDB->query("SELECT purge_policy_id, purge_policy_name FROM purge_policy ORDER BY purge_policy_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($ppol))
$ppols[$ppol["purge_policy_id"]] = $ppol["purge_policy_name"];
$DBRESULT->free();
@@ -227,7 +227,7 @@ For information : contact@oreon-project.org
$attrsAdvSelect = array("style" => "width: 200px; height: 100px;");
$attrsAdvSelect2 = array("style" => "width: 200px; height: 200px;");
$attrsTextarea = array("rows"=>"5", "cols"=>"40");
- $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br><br><br>{remove}</td><td>{selected}</td></tr></table>";
+ $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br /><br /><br />{remove}</td><td>{selected}</td></tr></table>";
#
## Form begin
@@ -416,7 +416,7 @@ For information : contact@oreon-project.org
$mnftr = array(NULL=>NULL);
$DBRESULT =& $pearDB->query("SELECT id, alias FROM traps_vendor order by alias");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($rmnftr))
$mnftr[$rmnftr["id"]] = html_entity_decode($rmnftr["alias"], ENT_QUOTES);
$mnftr[""] = "_"._("ALL")."_";
diff --git a/www/include/configuration/configObject/service/listServiceByHost.php b/www/include/configuration/configObject/service/listServiceByHost.php
index 5b153eaf64df0d1dcd1cd9fbae9ebab40afd1fe4..a86385699b344524e48475505c36221e39e40d97 100644
--- a/www/include/configuration/configObject/service/listServiceByHost.php
+++ b/www/include/configuration/configObject/service/listServiceByHost.php
@@ -64,7 +64,7 @@ For information : contact@oreon-project.org
else
$DBRESULT =& $pearDB->query("SELECT service_id, service_description, service_template_model_stm_id FROM service sv, host_service_relation hsr WHERE sv.service_register = '1' AND hsr.service_service_id = sv.service_id AND hsr.hostgroup_hg_id IS NULL AND hsr.host_host_id IN (".$lcaHostStr.")");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($service))
if (!$service["service_description"]) {
$service["service_description"] = getMyServiceAlias($service['service_template_model_stm_id']);
@@ -84,7 +84,7 @@ For information : contact@oreon-project.org
$locale_query = "SELECT service_id, service_description, service_template_model_stm_id FROM service sv, host_service_relation hsr, host WHERE host_name like '%".$search."%' AND hsr.host_host_id=host.host_id AND sv.service_register = '1' AND hsr.service_service_id = sv.service_id AND hsr.hostgroup_hg_id IS NULL AND hsr.host_host_id IN (".$lcaHostStr.")";
$DBRESULT =& $pearDB->query($locale_query);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($service)) {
$tmp ? $tmp .= ", ".$service["service_id"] : $tmp = $service["service_id"];
$rows++;
@@ -96,7 +96,7 @@ For information : contact@oreon-project.org
else
$DBRESULT =& $pearDB->query("SELECT service_description FROM service sv, host_service_relation hsr WHERE service_register = '1' AND hsr.service_service_id = sv.service_id AND hsr.host_host_id IN (".$lcaHostStr.") AND hsr.hostgroup_hg_id IS NULL");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$rows = $DBRESULT->numRows();
}
@@ -131,7 +131,7 @@ For information : contact@oreon-project.org
$rq = "SELECT @nbr:=(SELECT COUNT(*) FROM host_service_relation WHERE service_service_id = sv.service_id GROUP BY service_id ) AS nbr, sv.service_id, sv.service_description, sv.service_activate, sv.service_template_model_stm_id, host.host_id, host.host_name, host.host_template_model_htm_id, sv.service_normal_check_interval, sv.service_retry_check_interval, sv.service_max_check_attempts FROM service sv, host, host_service_relation hsr WHERE sv.service_register = '1' AND hsr.service_service_id = sv.service_id AND host.host_id = hsr.host_host_id $strLCA AND host.host_register = '1' ORDER BY host.host_name, service_description LIMIT ".$num * $limit.", ".$limit;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$form = new HTML_QuickForm('select_form', 'POST', "?p=".$p);
#Different style between each lines
$style = "one";
diff --git a/www/include/configuration/configObject/service/listServiceByHostGroup.php b/www/include/configuration/configObject/service/listServiceByHostGroup.php
index 26124e80915e3075b4790414c682b405457460d0..924708dcc2854fb20bc4e9ef71b97f55f88936d8 100644
--- a/www/include/configuration/configObject/service/listServiceByHostGroup.php
+++ b/www/include/configuration/configObject/service/listServiceByHostGroup.php
@@ -50,7 +50,7 @@ For information : contact@oreon-project.org
else
$DBRESULT =& $pearDB->query("SELECT service_id, service_description, service_template_model_stm_id FROM service sv, host_service_relation hsr WHERE sv.service_register = '1' AND hsr.service_service_id = sv.service_id AND hsr.host_host_id IS NULL AND hsr.hostgroup_hg_id IN (".$lcaHGStr.") AND sv.service_description LIKE '%$search%'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($service)){
$rows++;
$tmp ? $tmp .= ", ".$service["service_id"] : $tmp = $service["service_id"];
@@ -61,7 +61,7 @@ For information : contact@oreon-project.org
else
$DBRESULT =& $pearDB->query("SELECT service_description FROM service sv, host_service_relation hsr WHERE service_register = '1' AND hsr.service_service_id = sv.service_id AND hsr.host_host_id IS NULL AND hsr.hostgroup_hg_id IN (".$lcaHGStr.")");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$rows = $DBRESULT->numRows();
}
@@ -101,7 +101,7 @@ For information : contact@oreon-project.org
$rq = "SELECT @nbr:=(SELECT COUNT(*) FROM host_service_relation WHERE service_service_id = sv.service_id GROUP BY service_id ) AS nbr, sv.service_id, sv.service_description, sv.service_activate, sv.service_template_model_stm_id, hg.hg_id, hg.hg_name FROM service sv, hostgroup hg, host_service_relation hsr WHERE sv.service_register = '1' AND hsr.service_service_id = sv.service_id AND hg.hg_id = hsr.hostgroup_hg_id $strLca ORDER BY hg.hg_name, service_description LIMIT ".$num * $limit.", ".$limit;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$search = tidySearchKey($search, $advanced_search);
diff --git a/www/include/configuration/configObject/service_categories/DB-Func.php b/www/include/configuration/configObject/service_categories/DB-Func.php
index e42d9a1a84e741ff0854b439c21bd9cbc9c2adee..448056db902819349398cb4fdfa74e5089970bc3 100644
--- a/www/include/configuration/configObject/service_categories/DB-Func.php
+++ b/www/include/configuration/configObject/service_categories/DB-Func.php
@@ -25,7 +25,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('sc_id');
$DBRESULT =& $pearDB->query("SELECT `sc_name`, `sc_id` FROM `service_categories` WHERE `sc_name` = '".htmlentities($name, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT->fetchInto($sc);
if ($DBRESULT->numRows() >= 1 && $sc["sc_id"] == $id)
return true;
@@ -40,7 +40,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT * FROM `service_categories` WHERE `sc_id` = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["sc_id"] = '';
for ($i = 1; $i <= $nbrDup[$key]; $i++) {
@@ -54,10 +54,10 @@ For information : contact@oreon-project.org
$val ? $rq = "INSERT INTO `service_categories` VALUES (".$val.")" : $rq = null;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(sc_id) FROM `service_categories`");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$maxId =& $DBRESULT->fetchRow();
}
}
@@ -72,7 +72,7 @@ For information : contact@oreon-project.org
foreach($sc_arr as $key=>$value) {
$DBRESULT =& $pearDB->query("UPDATE service_categories SET sc_activate = '1' WHERE sc_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -84,7 +84,7 @@ For information : contact@oreon-project.org
foreach($sc_arr as $key=>$value) {
$DBRESULT =& $pearDB->query("UPDATE service_categories SET sc_activate = '0' WHERE sc_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -93,7 +93,7 @@ For information : contact@oreon-project.org
if (testServiceCategorieExistence($_POST["sc_name"])){
$DBRESULT =& $pearDB->query("INSERT INTO `service_categories` (`sc_name` , `sc_description` , `sc_activate` ) VALUES ('".$_POST["sc_name"]."', '".$_POST["sc_description"]."', '1')");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -101,7 +101,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("UPDATE `service_categories` SET `sc_name` = '".$_POST["sc_name"]."' , `sc_description` = '".$_POST["sc_description"]."' , `sc_activate` = '".$_POST["sc_activate"]."' WHERE `sc_id` = '".$_POST["sc_id"]."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function deleteServiceCategorieInDB($sc_id = NULL){
@@ -110,7 +110,7 @@ For information : contact@oreon-project.org
foreach ($select as $key => $value){
$DBRESULT =& $pearDB->query("DELETE FROM `service_categories` WHERE `sc_id` = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
diff --git a/www/include/configuration/configObject/service_categories/formServiceCategories.php b/www/include/configuration/configObject/service_categories/formServiceCategories.php
index 22b84ee9d3c5e6526c489114a5fc098679dc8b89..d527c73f333313c1f13d4f994efc6f9b0807705c 100644
--- a/www/include/configuration/configObject/service_categories/formServiceCategories.php
+++ b/www/include/configuration/configObject/service_categories/formServiceCategories.php
@@ -25,7 +25,7 @@ For information : contact@oreon-project.org
if (($o == "c" || $o == "w") && $sc_id) {
$DBRESULT =& $pearDB->query("SELECT * FROM `service_categories` WHERE `sc_id` = '".$sc_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$sc = array_map("myDecode", $DBRESULT->fetchRow());
$DBRESULT->free();
@@ -41,7 +41,7 @@ For information : contact@oreon-project.org
$attrsText2 = array("size"=>"60");
$attrsAdvSelect = array("style" => "width: 200px; height: 100px;");
$attrsTextarea = array("rows"=>"5", "cols"=>"40");
- $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br><br><br>{remove}</td><td>{selected}</td></tr></table>";
+ $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br /><br /><br />{remove}</td><td>{selected}</td></tr></table>";
#
## Form begin
diff --git a/www/include/configuration/configObject/service_categories/listServiceCategories.php b/www/include/configuration/configObject/service_categories/listServiceCategories.php
index 5e618ca47ebedd6b39d9e2cf359a83404317c4a2..da20ff42ca351f7d1e764c2c9179f1e70ae8a755 100644
--- a/www/include/configuration/configObject/service_categories/listServiceCategories.php
+++ b/www/include/configuration/configObject/service_categories/listServiceCategories.php
@@ -25,7 +25,7 @@ For information : contact@oreon-project.org
$SearchTool = "WHERE (sc_name LIKE '%".htmlentities($search, ENT_QUOTES)."%' OR sc_description LIKE '%".htmlentities($search, ENT_QUOTES)."%')";
$DBRESULT = & $pearDB->query("SELECT COUNT(*) FROM service_categories $SearchTool");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp = & $DBRESULT->fetchRow();
$DBRESULT->free();
@@ -60,7 +60,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query("SELECT * FROM service_categories $SearchTool ORDER BY sc_name LIMIT ".$num * $limit.", ".$limit);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$search = tidySearchKey($search, $advanced_search);
diff --git a/www/include/configuration/configObject/service_dependency/DB-Func.php b/www/include/configuration/configObject/service_dependency/DB-Func.php
index 19ecf2c36069d7cecd9ce30f3b0a7935ac3bf557..62075422c09811d46142f7a55fba6c3ea0c53621 100644
--- a/www/include/configuration/configObject/service_dependency/DB-Func.php
+++ b/www/include/configuration/configObject/service_dependency/DB-Func.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('dep_id');
$DBRESULT =& $pearDB->query("SELECT dep_name, dep_id FROM dependency WHERE dep_name = '".htmlentities($name, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$dep =& $DBRESULT->fetchRow();
#Modif case
if ($DBRESULT->numRows() >= 1 && $dep["dep_id"] == $id)
@@ -59,7 +59,7 @@ For information : contact@oreon-project.org
foreach($dependencies as $key=>$value) {
$DBRESULT =& $pearDB->query("DELETE FROM dependency WHERE dep_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -68,7 +68,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT * FROM dependency WHERE dep_id = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["dep_id"] = '';
for ($i = 1; $i <= $nbrDup[$key]; $i++) {
@@ -82,24 +82,24 @@ For information : contact@oreon-project.org
$pearDB->query($rq);
$DBRESULT =& $pearDB->query("SELECT MAX(dep_id) FROM dependency");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$maxId =& $DBRESULT->fetchRow();
if (isset($maxId["MAX(dep_id)"])) {
$DBRESULT =& $pearDB->query("SELECT * FROM dependency_serviceParent_relation WHERE dependency_dep_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($service)) {
$DBRESULT2 =& $pearDB->query("INSERT INTO dependency_serviceParent_relation VALUES ('', '".$maxId["MAX(dep_id)"]."', '".$service["service_service_id"]."', '".$service["host_host_id"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT =& $pearDB->query("SELECT * FROM dependency_serviceChild_relation WHERE dependency_dep_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($service)) {
$DBRESULT2 =& $pearDB->query("INSERT INTO dependency_serviceChild_relation VALUES ('', '".$maxId["MAX(dep_id)"]."', '".$service["service_service_id"]."', '".$service["host_host_id"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
}
}
@@ -138,10 +138,10 @@ For information : contact@oreon-project.org
$rq .= ")";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(dep_id) FROM dependency");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$dep_id = $DBRESULT->fetchRow();
return ($dep_id["MAX(dep_id)"]);
}
@@ -168,7 +168,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE dep_id = '".$dep_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function updateServiceDependencyServiceParents($dep_id = null, $ret = array()) {
@@ -179,7 +179,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE dependency_dep_id = '".$dep_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if (isset($ret["dep_hSvPar"]))
$ret1 = $ret["dep_hSvPar"];
else
@@ -193,7 +193,7 @@ For information : contact@oreon-project.org
$rq .= "('".$dep_id."', '".$exp[1]."', '".$exp[0]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
@@ -206,7 +206,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE dependency_dep_id = '".$dep_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if (isset($ret["dep_hSvChi"]))
$ret1 = $ret["dep_hSvChi"];
else
@@ -220,7 +220,7 @@ For information : contact@oreon-project.org
$rq .= "('".$dep_id."', '".$exp[1]."', '".$exp[0]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
diff --git a/www/include/configuration/configObject/service_dependency/formServiceDependency.php b/www/include/configuration/configObject/service_dependency/formServiceDependency.php
index 71f676902ffbf569a14a3335dd410bb7033f7462..64c6b5c4716eefba9fe917bfb0fdd67224f1d4b2 100644
--- a/www/include/configuration/configObject/service_dependency/formServiceDependency.php
+++ b/www/include/configuration/configObject/service_dependency/formServiceDependency.php
@@ -23,7 +23,7 @@ For information : contact@oreon-project.org
if (($o == "c" || $o == "w") && $dep_id) {
$DBRESULT =& $pearDB->query("SELECT * FROM dependency WHERE dep_id = '".$dep_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$dep = array_map("myDecode", $DBRESULT->fetchRow());
# Set Notification Failure Criteria
@@ -37,14 +37,14 @@ For information : contact@oreon-project.org
# Set Host Service Childs
$DBRESULT =& $pearDB->query("SELECT * FROM dependency_serviceChild_relation dscr WHERE dscr.dependency_dep_id = '".$dep_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($service); $i++)
$dep["dep_hSvChi"][$i] = $service["host_host_id"]."_".$service["service_service_id"];
$DBRESULT->free();
# Set Host Service Parents
$DBRESULT =& $pearDB->query("SELECT * FROM dependency_serviceParent_relation dspr WHERE dspr.dependency_dep_id = '".$dep_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($service); $i++)
$dep["dep_hSvPar"][$i] = $service["host_host_id"]."_".$service["service_service_id"];
$DBRESULT->free();
@@ -60,7 +60,7 @@ For information : contact@oreon-project.org
else
$DBRESULT =& $pearDB->query("SELECT DISTINCT host_id, host_name FROM host WHERE host_register = '1' AND host_id IN (".$lcaHostStr.") ORDER BY host_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($elem)) {
$services = getMyHostServices($elem["host_id"]);
foreach ($services as $key=>$index) {
@@ -79,7 +79,7 @@ For information : contact@oreon-project.org
$attrsText2 = array("size"=>"10");
$attrsAdvSelect = array("style" => "width: 260px; height: 200px;");
$attrsTextarea = array("rows"=>"3", "cols"=>"30");
- $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br><br><br>{remove}</td><td>{selected}</td></tr></table>";
+ $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br /><br /><br />{remove}</td><td>{selected}</td></tr></table>";
#
## Form begin
diff --git a/www/include/configuration/configObject/service_dependency/listServiceDependency.php b/www/include/configuration/configObject/service_dependency/listServiceDependency.php
index 6c00320fdf972ed95066e1a6f4f58e03100d6e2d..3dc7a9cce15abe620382e436f05b1e441119d3fb 100644
--- a/www/include/configuration/configObject/service_dependency/listServiceDependency.php
+++ b/www/include/configuration/configObject/service_dependency/listServiceDependency.php
@@ -28,7 +28,7 @@ For information : contact@oreon-project.org
$rq .= " AND (dep_name LIKE '%".htmlentities($search, ENT_QUOTES)."%' OR dep_description LIKE '%".htmlentities($search, ENT_QUOTES)."%')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp =& $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
@@ -60,7 +60,7 @@ For information : contact@oreon-project.org
$rq .= " LIMIT ".$num * $limit.", ".$limit;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$search = tidySearchKey($search, $advanced_search);
diff --git a/www/include/configuration/configObject/service_template_model/formServiceTemplateModel.php b/www/include/configuration/configObject/service_template_model/formServiceTemplateModel.php
index 338cc8b18c77b44bb7d93a2fce2d498b3ae279c3..850f874b2672c809e2bd58adda26b567d2f5ed3b 100644
--- a/www/include/configuration/configObject/service_template_model/formServiceTemplateModel.php
+++ b/www/include/configuration/configObject/service_template_model/formServiceTemplateModel.php
@@ -29,13 +29,13 @@ For information : contact@oreon-project.org
if (($o == "c" || $o == "w") && $service_id) {
$DBRESULT =& $pearDB->query("SELECT * FROM service, extended_service_information esi WHERE service_id = '".$service_id."' AND esi.service_service_id = service_id LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$service = array_map("myDecodeSvTP", $DBRESULT->fetchRow());
# Grab hostgroup || host
$DBRESULT =& $pearDB->query("SELECT * FROM host_service_relation hsr WHERE hsr.service_service_id = '".$service_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($DBRESULT->fetchInto($parent)) {
if ($parent["host_host_id"])
$service["service_hPars"][$parent["host_host_id"]] = $parent["host_host_id"];
@@ -54,21 +54,21 @@ For information : contact@oreon-project.org
# Set Contact Group
$DBRESULT =& $pearDB->query("SELECT DISTINCT contactgroup_cg_id FROM contactgroup_service_relation WHERE service_service_id = '".$service_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($notifCg); $i++)
$service["service_cgs"][$i] = $notifCg["contactgroup_cg_id"];
$DBRESULT->free();
# Set Service Group Parents
$DBRESULT =& $pearDB->query("SELECT DISTINCT servicegroup_sg_id FROM servicegroup_relation WHERE service_service_id = '".$service_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($sg); $i++)
$service["service_sgs"][$i] = $sg["servicegroup_sg_id"];
$DBRESULT->free();
# Set Traps
$DBRESULT =& $pearDB->query("SELECT DISTINCT traps_id FROM traps_service_relation WHERE service_id = '".$service_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($trap); $i++)
$service["service_traps"][$i] = $trap["traps_id"];
$DBRESULT->free();
@@ -76,7 +76,7 @@ For information : contact@oreon-project.org
# Set Categories
$DBRESULT =& $pearDB->query("SELECT DISTINCT sc_id FROM service_categories_relation WHERE service_service_id = '".$service_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($service_category); $i++)
$service["service_categories"][$i] = $service_category["sc_id"];
$DBRESULT->free();
@@ -91,7 +91,7 @@ For information : contact@oreon-project.org
$hosts = array();
$DBRESULT =& $pearDB->query("SELECT host_id, host_name FROM host WHERE host_register = '0' ORDER BY host_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($host)){
$hosts[$host["host_id"]] = $host["host_name"];
}
@@ -104,7 +104,7 @@ For information : contact@oreon-project.org
if (isset($_GET["service_id"]) && $_GET["service_id"]){
$DBRESULT =& $pearDB->query("SELECT service_description, service_id FROM service WHERE service_template_model_stm_id = '".$_GET["service_id"]."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($service_tmpl_father))
$svc_tmplt_who_use_me[$service_tmpl_father["service_id"]] = $service_tmpl_father["service_description"];
$DBRESULT->free();
@@ -116,7 +116,7 @@ For information : contact@oreon-project.org
$svTpls = array(NULL=>NULL);
$DBRESULT =& $pearDB->query("SELECT service_id, service_description, service_template_model_stm_id FROM service WHERE service_register = '0' AND service_id != '".$service_id."' ORDER BY service_description");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($svTpl)) {
if (!$svTpl["service_description"])
$svTpl["service_description"] = getMyServiceName($svTpl["service_template_model_stm_id"])."'";
@@ -132,7 +132,7 @@ For information : contact@oreon-project.org
$tps = array(NULL=>NULL);
$DBRESULT =& $pearDB->query("SELECT tp_id, tp_name FROM timeperiod ORDER BY tp_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($tp))
$tps[$tp["tp_id"]] = $tp["tp_name"];
$DBRESULT->free();
@@ -140,7 +140,7 @@ For information : contact@oreon-project.org
$checkCmds = array(NULL=>NULL);
$DBRESULT =& $pearDB->query("SELECT command_id, command_name FROM command WHERE command_type = '2' ORDER BY command_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($checkCmd))
$checkCmds[$checkCmd["command_id"]] = $checkCmd["command_name"];
$DBRESULT->free();
@@ -148,7 +148,7 @@ For information : contact@oreon-project.org
$notifCgs = array();
$DBRESULT =& $pearDB->query("SELECT cg_id, cg_name FROM contactgroup ORDER BY cg_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($notifCg))
$notifCgs[$notifCg["cg_id"]] = $notifCg["cg_name"];
$DBRESULT->free();
@@ -162,7 +162,7 @@ For information : contact@oreon-project.org
$graphTpls = array(NULL=>NULL);
$DBRESULT =& $pearDB->query("SELECT graph_id, name FROM giv_graphs_template ORDER BY name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($graphTpl))
$graphTpls[$graphTpl["graph_id"]] = $graphTpl["name"];
$DBRESULT->free();
@@ -170,7 +170,7 @@ For information : contact@oreon-project.org
$traps = array();
$DBRESULT =& $pearDB->query("SELECT traps_id, traps_name FROM traps ORDER BY traps_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($trap))
$traps[$trap["traps_id"]] = $trap["traps_name"];
$DBRESULT->free();
@@ -178,7 +178,7 @@ For information : contact@oreon-project.org
$ppols = array(NULL=>NULL);
$DBRESULT =& $pearDB->query("SELECT purge_policy_id, purge_policy_name FROM purge_policy ORDER BY purge_policy_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($ppol))
$ppols[$ppol["purge_policy_id"]] = $ppol["purge_policy_name"];
$DBRESULT->free();
@@ -187,7 +187,7 @@ For information : contact@oreon-project.org
$service_categories = array();
$DBRESULT =& $pearDB->query("SELECT sc_name, sc_id FROM service_categories ORDER BY sc_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($service_categorie))
$service_categories[$service_categorie["sc_id"]] = $service_categorie["sc_name"];
$DBRESULT->free();
@@ -206,7 +206,7 @@ For information : contact@oreon-project.org
$attrsAdvSelect_small = array("style" => "width: 200px; height: 70px;");
$attrsAdvSelect = array("style" => "width: 200px; height: 100px;");
$attrsTextarea = array("rows"=>"5", "cols"=>"40");
- $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br><br><br>{remove}</td><td>{selected}</td></tr></table>";
+ $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br /><br /><br />{remove}</td><td>{selected}</td></tr></table>";
#
## Form begin
@@ -380,7 +380,7 @@ For information : contact@oreon-project.org
$mnftr = array(NULL=>NULL);
$DBRESULT =& $pearDB->query("SELECT id, alias FROM traps_vendor order by alias");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($rmnftr))
$mnftr[$rmnftr["id"]] = html_entity_decode($rmnftr["alias"], ENT_QUOTES);
$mnftr[""] = "_"._("ALL")."_";
diff --git a/www/include/configuration/configObject/service_template_model/listServiceTemplateModel.php b/www/include/configuration/configObject/service_template_model/listServiceTemplateModel.php
index 9cc2f45df5414c90b1fce6ebc26f295d1494a04c..6e3939a762dd1d25ad01cb38cc007110562825e1 100644
--- a/www/include/configuration/configObject/service_template_model/listServiceTemplateModel.php
+++ b/www/include/configuration/configObject/service_template_model/listServiceTemplateModel.php
@@ -25,7 +25,7 @@ For information : contact@oreon-project.org
else
$DBRESULT = & $pearDB->query("SELECT COUNT(*) FROM service sv WHERE service_register = '0'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp = & $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
@@ -63,7 +63,7 @@ For information : contact@oreon-project.org
$rq = "SELECT sv.service_id, sv.service_description, sv.service_alias, sv.service_activate, sv.service_template_model_stm_id FROM service sv WHERE sv.service_register = '0' ORDER BY service_description LIMIT ".$num * $limit.", ".$limit;
$DBRESULT = & $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$search = tidySearchKey($search, $advanced_search);
diff --git a/www/include/configuration/configObject/servicegroup/DB-Func.php b/www/include/configuration/configObject/servicegroup/DB-Func.php
index ce81236945d478b650f65f5178290d409afa5845..4356d06979b254d26e0598f964c3496ee235d274 100644
--- a/www/include/configuration/configObject/servicegroup/DB-Func.php
+++ b/www/include/configuration/configObject/servicegroup/DB-Func.php
@@ -27,7 +27,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('sg_id');
$DBRESULT =& $pearDB->query("SELECT sg_name, sg_id FROM servicegroup WHERE sg_name = '".htmlentities($name, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$sg =& $DBRESULT->fetchRow();
#Modif case
if ($DBRESULT->numRows() >= 1 && $sg["sg_id"] == $id)
@@ -44,7 +44,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("UPDATE servicegroup SET sg_activate = '1' WHERE sg_id = '".$sg_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function disableServiceGroupInDB ($sg_id = null) {
@@ -52,7 +52,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("UPDATE servicegroup SET sg_activate = '0' WHERE sg_id = '".$sg_id."'");
if (PEAR::isError($DBRESULT))
- print $DBRESULT->getDebugInfo()."<br>";
+ print $DBRESULT->getDebugInfo()."<br />";
}
function deleteServiceGroupInDB ($serviceGroups = array()) {
@@ -60,7 +60,7 @@ For information : contact@oreon-project.org
foreach($serviceGroups as $key=>$value)
$DBRESULT =& $pearDB->query("DELETE FROM servicegroup WHERE sg_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print $DBRESULT->getDebugInfo()."<br>";
+ print $DBRESULT->getDebugInfo()."<br />";
}
function multipleServiceGroupInDB ($serviceGroups = array(), $nbrDup = array()) {
@@ -69,7 +69,7 @@ For information : contact@oreon-project.org
foreach($serviceGroups as $key=>$value) {
$DBRESULT =& $pearDB->query("SELECT * FROM servicegroup WHERE sg_id = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print $DBRESULT->getDebugInfo()."<br>";
+ print $DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["sg_id"] = '';
for ($i = 1; $i <= $nbrDup[$key]; $i++) {
@@ -83,20 +83,20 @@ For information : contact@oreon-project.org
$val ? $rq = "INSERT INTO servicegroup VALUES (".$val.")" : $rq = null;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print $DBRESULT->getDebugInfo()."<br>";
+ print $DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(sg_id) FROM servicegroup");
if (PEAR::isError($DBRESULT))
- print $DBRESULT->getDebugInfo()."<br>";
+ print $DBRESULT->getDebugInfo()."<br />";
$maxId =& $DBRESULT->fetchRow();
if (isset($maxId["MAX(sg_id)"])) {
# Update LCA
$DBRESULT =& $pearDB->query("SELECT contactgroup_cg_id FROM contactgroup_contact_relation WHERE contact_contact_id = '".$oreon->user->get_id()."'");
if (PEAR::isError($DBRESULT))
- print $DBRESULT->getDebugInfo()."<br>";
+ print $DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($contactGroup)) {
$DBRESULT2 =& $pearDB->query("SELECT lca_define_lca_id FROM lca_define_contactgroup_relation ldcgr WHERE ldcgr.contactgroup_cg_id = '".$contactGroup["contactgroup_cg_id"]."'");
if (PEAR::isError($DBRESULT2))
- print $DBRESULT2->getDebugInfo()."<br>";
+ print $DBRESULT2->getDebugInfo()."<br />";
while ($DBRESULT2->fetchInto($lca)) {
$rq = "INSERT INTO lca_define_servicegroup_relation ";
$rq .= "(lca_define_lca_id, servicegroup_sg_id) ";
@@ -104,21 +104,21 @@ For information : contact@oreon-project.org
$rq .= "('".$lca["lca_define_lca_id"]."', '".$maxId["MAX(sg_id)"]."')";
$DBRESULT3 =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT3))
- print $DBRESULT3->getDebugInfo()."<br>";
+ print $DBRESULT3->getDebugInfo()."<br />";
}
$DBRESULT2->free();
}
$DBRESULT->free();
$DBRESULT =& $pearDB->query("SELECT DISTINCT sgr.host_host_id, sgr.hostgroup_hg_id, sgr.service_service_id FROM servicegroup_relation sgr WHERE sgr.servicegroup_sg_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print $DBRESULT->getDebugInfo()."<br>";
+ print $DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($service)) {
$val = null;
foreach ($service as $key2=>$value2)
$val ? $val .= ($value2!=NULL?(", '".$value2."'"):", NULL") : $val .= ($value2!=NULL?("'".$value2."'"):"NULL");
$DBRESULT2 =& $pearDB->query("INSERT INTO servicegroup_relation (host_host_id, hostgroup_hg_id, service_service_id, servicegroup_sg_id) VALUES (".$val.", '".$maxId["MAX(sg_id)"]."')");
if (PEAR::isError($DBRESULT2))
- print $DBRESULT2->getDebugInfo()."<br>";
+ print $DBRESULT2->getDebugInfo()."<br />";
}
}
}
@@ -153,21 +153,21 @@ For information : contact@oreon-project.org
$rq .= ")";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print $DBRESULT->getDebugInfo()."<br>";
+ print $DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(sg_id) FROM servicegroup");
if (PEAR::isError($DBRESULT))
- print $DBRESULT->getDebugInfo()."<br>";
+ print $DBRESULT->getDebugInfo()."<br />";
$sg_id = $DBRESULT->fetchRow();
# Update LCA
$DBRESULT =& $pearDB->query("SELECT contactgroup_cg_id FROM contactgroup_contact_relation WHERE contact_contact_id = '".$oreon->user->get_id()."'");
if (PEAR::isError($DBRESULT))
- print $DBRESULT->getDebugInfo()."<br>";
+ print $DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($contactGroup)) {
$DBRESULT2 =& $pearDB->query("SELECT lca_define_lca_id FROM lca_define_contactgroup_relation ldcgr WHERE ldcgr.contactgroup_cg_id = '".$contactGroup["contactgroup_cg_id"]."'");
if (PEAR::isError($DBRESULT2))
- print $DBRESULT2->getDebugInfo()."<br>";
+ print $DBRESULT2->getDebugInfo()."<br />";
while ($DBRESULT2->fetchInto($lca)) {
$rq = "INSERT INTO lca_define_servicegroup_relation ";
$rq .= "(lca_define_lca_id, servicegroup_sg_id) ";
@@ -175,7 +175,7 @@ For information : contact@oreon-project.org
$rq .= "('".$lca["lca_define_lca_id"]."', '".$sg_id["MAX(sg_id)"]."')";
$DBRESULT3 =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT3))
- print $DBRESULT3->getDebugInfo()."<br>";
+ print $DBRESULT3->getDebugInfo()."<br />";
}
$DBRESULT2->free();
}
@@ -197,7 +197,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE sg_id = '".$sg_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print $DBRESULT->getDebugInfo()."<br>";
+ print $DBRESULT->getDebugInfo()."<br />";
}
function updateServiceGroupServices($sg_id, $ret = array()) {
@@ -207,7 +207,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE servicegroup_sg_id = '".$sg_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print $DBRESULT->getDebugInfo()."<br>";
+ print $DBRESULT->getDebugInfo()."<br />";
isset($ret["sg_hServices"]) ? $ret = $ret["sg_hServices"] : $ret = $form->getSubmitValue("sg_hServices");
for($i = 0; $i < count($ret); $i++) {
if (isset($ret[$i]) && $ret[$i]){
@@ -215,7 +215,7 @@ For information : contact@oreon-project.org
$rq = "INSERT INTO servicegroup_relation (host_host_id, service_service_id, servicegroup_sg_id) VALUES ('".$t[0]."', '".$t[1]."', '".$sg_id."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print $DBRESULT->getDebugInfo()."<br>";
+ print $DBRESULT->getDebugInfo()."<br />";
}
}
isset($ret["sg_hgServices"]) ? $ret = $ret["sg_hgServices"] : $ret = $form->getSubmitValue("sg_hgServices");
@@ -224,7 +224,7 @@ For information : contact@oreon-project.org
$rq = "INSERT INTO servicegroup_relation (hostgroup_hg_id, service_service_id, servicegroup_sg_id) VALUES ('".$t[0]."', '".$t[1]."', '".$sg_id."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print $DBRESULT->getDebugInfo()."<br>";
+ print $DBRESULT->getDebugInfo()."<br />";
}
}
?>
\ No newline at end of file
diff --git a/www/include/configuration/configObject/servicegroup/formServiceGroup.php b/www/include/configuration/configObject/servicegroup/formServiceGroup.php
index 9425f7f9b34909384d13089241087ce3df9473c1..ea351f452c51868f0968f0130e01ed843361423a 100644
--- a/www/include/configuration/configObject/servicegroup/formServiceGroup.php
+++ b/www/include/configuration/configObject/servicegroup/formServiceGroup.php
@@ -33,7 +33,7 @@ For information : contact@oreon-project.org
else
$DBRESULT =& $pearDB->query("SELECT * FROM servicegroup WHERE sg_id = '".$sg_id."' AND sg_id IN (".$lcaSGStr.") LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$sg = array_map("myDecode", $DBRESULT->fetchRow());
@@ -41,12 +41,12 @@ For information : contact@oreon-project.org
# Set ServiceGroup Childs
$DBRESULT =& $pearDB->query("SELECT host_host_id, service_service_id FROM servicegroup_relation WHERE servicegroup_sg_id = '".$sg_id."' AND host_host_id IS NOT NULL ORDER BY service_service_id");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($host); $i++)
$sg["sg_hServices"][$i] = $host["host_host_id"]."-".$host["service_service_id"];
$DBRESULT =& $pearDB->query("SELECT hostgroup_hg_id, service_service_id FROM servicegroup_relation WHERE servicegroup_sg_id = '".$sg_id."' AND hostgroup_hg_id IS NOT NULL GROUP BY service_service_id");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($services); $i++)
$sg["sg_hgServices"][$i] = $services["hostgroup_hg_id"]."-".$services["service_service_id"];
$DBRESULT->free();
@@ -63,7 +63,7 @@ For information : contact@oreon-project.org
else
$DBRESULT =& $pearDB->query("SELECT host_name, host_id FROM host WHERE host_register = '1' AND host_id IN (".$lcaHostStr.") ORDER BY host_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($host)) {
$services = getMyHostServices($host["host_id"]);
foreach ($services as $key => $s)
@@ -90,7 +90,7 @@ For information : contact@oreon-project.org
"ORDER BY hg.hg_name, sv.service_description");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($elem)) {
# If the description of our Service is in the Template definition, we have to catch it, whatever the level of it :-)
if (!$elem["service_description"])
@@ -107,7 +107,7 @@ For information : contact@oreon-project.org
$attrsText = array("size"=>"30");
$attrsAdvSelect = array("style" => "width: 250px; height: 150px;");
$attrsTextarea = array("rows"=>"5", "cols"=>"40");
- $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br><br><br>{remove}</td><td>{selected}</td></tr></table>";
+ $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br /><br /><br />{remove}</td><td>{selected}</td></tr></table>";
#
## Form begin
diff --git a/www/include/configuration/configObject/servicegroup/listServiceGroup.php b/www/include/configuration/configObject/servicegroup/listServiceGroup.php
index 2b11bdd10b528f04e3ffd62cc7516d947f385430..4a6d38f839735436a9e8088ef9e85d3471a840d0 100644
--- a/www/include/configuration/configObject/servicegroup/listServiceGroup.php
+++ b/www/include/configuration/configObject/servicegroup/listServiceGroup.php
@@ -41,7 +41,7 @@ For information : contact@oreon-project.org
$DBRESULT = & $pearDB->query("SELECT COUNT(*) FROM servicegroup WHERE $SearchTool");
}
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp = & $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
@@ -81,7 +81,7 @@ For information : contact@oreon-project.org
$DBRESULT = & $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$search = tidySearchKey($search, $advanced_search);
diff --git a/www/include/configuration/configObject/servicegroup_dependency/DB-Func.php b/www/include/configuration/configObject/servicegroup_dependency/DB-Func.php
index 5b1038be51c6d1f265d49a394308d2a125c43c7b..477f794e2f69f5af048d688640ca7568fbdf4829 100644
--- a/www/include/configuration/configObject/servicegroup_dependency/DB-Func.php
+++ b/www/include/configuration/configObject/servicegroup_dependency/DB-Func.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('dep_id');
$DBRESULT =& $pearDB->query("SELECT dep_name, dep_id FROM dependency WHERE dep_name = '".htmlentities($name, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$dep =& $DBRESULT->fetchRow();
#Modif case
if ($DBRESULT->numRows() >= 1 && $dep["dep_id"] == $id)
@@ -59,7 +59,7 @@ For information : contact@oreon-project.org
foreach($dependencies as $key=>$value) {
$DBRESULT =& $pearDB->query("DELETE FROM dependency WHERE dep_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -68,7 +68,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT * FROM dependency WHERE dep_id = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["dep_id"] = '';
for ($i = 1; $i <= $nbrDup[$key]; $i++) {
@@ -81,28 +81,28 @@ For information : contact@oreon-project.org
$val ? $rq = "INSERT INTO dependency VALUES (".$val.")" : $rq = null;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(dep_id) FROM dependency");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$maxId =& $DBRESULT->fetchRow();
if (isset($maxId["MAX(dep_id)"])) {
$DBRESULT =& $pearDB->query("SELECT DISTINCT servicegroup_sg_id FROM dependency_servicegroupParent_relation WHERE dependency_dep_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($sg)){
$DBRESULT2 =& $pearDB->query("INSERT INTO dependency_servicegroupParent_relation VALUES ('', '".$maxId["MAX(dep_id)"]."', '".$sg["servicegroup_sg_id"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT->free();
$DBRESULT =& $pearDB->query("SELECT DISTINCT servicegroup_sg_id FROM dependency_servicegroupChild_relation WHERE dependency_dep_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($sg)) {
$DBRESULT2 =& $pearDB->query("INSERT INTO dependency_servicegroupChild_relation VALUES ('', '".$maxId["MAX(dep_id)"]."', '".$sg["servicegroup_sg_id"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT->free();
}
@@ -142,10 +142,10 @@ For information : contact@oreon-project.org
$rq .= ")";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(dep_id) FROM dependency");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$dep_id = $DBRESULT->fetchRow();
return ($dep_id["MAX(dep_id)"]);
}
@@ -172,7 +172,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE dep_id = '".$dep_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function updateServiceGroupDependencyServiceGroupParents($dep_id = null, $ret = array()) {
@@ -183,7 +183,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE dependency_dep_id = '".$dep_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if (isset($ret["dep_sgParents"]))
$ret = $ret["dep_sgParents"];
else
@@ -195,7 +195,7 @@ For information : contact@oreon-project.org
$rq .= "('".$dep_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -207,7 +207,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE dependency_dep_id = '".$dep_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if (isset($ret["dep_sgChilds"]))
$ret = $ret["dep_sgChilds"];
else
@@ -219,7 +219,7 @@ For information : contact@oreon-project.org
$rq .= "('".$dep_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
?>
\ No newline at end of file
diff --git a/www/include/configuration/configObject/servicegroup_dependency/formServiceGroupDependency.php b/www/include/configuration/configObject/servicegroup_dependency/formServiceGroupDependency.php
index e9fba77033c7cd20a0261a6bd743753b7e6ef0d0..22cddc39a1f479653e7aed9e7cb7e80111b485eb 100644
--- a/www/include/configuration/configObject/servicegroup_dependency/formServiceGroupDependency.php
+++ b/www/include/configuration/configObject/servicegroup_dependency/formServiceGroupDependency.php
@@ -23,7 +23,7 @@ For information : contact@oreon-project.org
if (($o == "c" || $o == "w") && $dep_id) {
$DBRESULT =& $pearDB->query("SELECT * FROM dependency WHERE dep_id = '".$dep_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$dep = array_map("myDecode", $DBRESULT->fetchRow());
# Set Notification Failure Criteria
@@ -37,14 +37,14 @@ For information : contact@oreon-project.org
# Set ServiceGroup Parents
$DBRESULT =& $pearDB->query("SELECT DISTINCT servicegroup_sg_id FROM dependency_servicegroupParent_relation WHERE dependency_dep_id = '".$dep_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($sgP); $i++)
$dep["dep_sgParents"][$i] = $sgP["servicegroup_sg_id"];
$DBRESULT->free();
# Set ServiceGroup Childs
$DBRESULT =& $pearDB->query("SELECT DISTINCT servicegroup_sg_id FROM dependency_servicegroupChild_relation WHERE dependency_dep_id = '".$dep_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
for($i = 0; $DBRESULT->fetchInto($sgC); $i++)
$dep["dep_sgChilds"][$i] = $sgC["servicegroup_sg_id"];
$DBRESULT->free();
@@ -59,7 +59,7 @@ For information : contact@oreon-project.org
else
$DBRESULT =& $pearDB->query("SELECT sg_id, sg_name FROM servicegroup WHERE sg_id IN (".$lcaServiceGroupStr.") ORDER BY sg_name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($sg))
$sgs[$sg["sg_id"]] = $sg["sg_name"];
$DBRESULT->free();
@@ -73,7 +73,7 @@ For information : contact@oreon-project.org
$attrsText2 = array("size"=>"10");
$attrsAdvSelect = array("style" => "width: 250px; height: 150px;");
$attrsTextarea = array("rows"=>"3", "cols"=>"30");
- $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br><br><br>{remove}</td><td>{selected}</td></tr></table>";
+ $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br /><br /><br />{remove}</td><td>{selected}</td></tr></table>";
#
## Form begin
diff --git a/www/include/configuration/configObject/servicegroup_dependency/listServiceGroupDependency.php b/www/include/configuration/configObject/servicegroup_dependency/listServiceGroupDependency.php
index 604d0ae4b39f7e98bef8e39436984d967937024d..2d922350983903c7da87e4c64f71374411b4f370 100644
--- a/www/include/configuration/configObject/servicegroup_dependency/listServiceGroupDependency.php
+++ b/www/include/configuration/configObject/servicegroup_dependency/listServiceGroupDependency.php
@@ -30,7 +30,7 @@ For information : contact@oreon-project.org
$rq .= " AND (dep_name LIKE '".htmlentities($search, ENT_QUOTES)."' OR dep_description LIKE '".htmlentities($search, ENT_QUOTES)."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp =& $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
@@ -63,7 +63,7 @@ For information : contact@oreon-project.org
$rq .= " ORDER BY dep_name, dep_description LIMIT ".$num * $limit.", ".$limit;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$search = tidySearchKey($search, $advanced_search);
diff --git a/www/include/configuration/configObject/timeperiod/DB-Func.php b/www/include/configuration/configObject/timeperiod/DB-Func.php
index c91d89058fc78ebe6765623d19d36ad8311e8200..e827adc71212fd5e25359062995fbbd5bbee54c6 100644
--- a/www/include/configuration/configObject/timeperiod/DB-Func.php
+++ b/www/include/configuration/configObject/timeperiod/DB-Func.php
@@ -27,7 +27,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('tp_id');
$DBRESULT =& $pearDB->query("SELECT tp_name, tp_id FROM timeperiod WHERE tp_name = '".htmlentities($name, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tp =& $DBRESULT->fetchRow();
#Modif case
if ($DBRESULT->numRows() >= 1 && $tp["tp_id"] == $id)
@@ -44,7 +44,7 @@ For information : contact@oreon-project.org
foreach($timeperiods as $key=>$value) {
$DBRESULT =& $pearDB->query("DELETE FROM timeperiod WHERE tp_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -53,7 +53,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT * FROM timeperiod WHERE tp_id = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["tp_id"] = '';
for ($i = 1; $i <= $nbrDup[$key]; $i++) {
@@ -65,7 +65,7 @@ For information : contact@oreon-project.org
if (testTPExistence($tp_name)) {
$DBRESULT =& $pearDB->query($val ? $rq = "INSERT INTO timeperiod VALUES (".$val.")" : $rq = null);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
@@ -95,7 +95,7 @@ For information : contact@oreon-project.org
"WHERE tp_id = '".$tp_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function insertTimeperiodInDB ($ret = array()) {
@@ -123,10 +123,10 @@ For information : contact@oreon-project.org
$rq .= ")";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(tp_id) FROM timeperiod");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tp_id = $DBRESULT->fetchRow();
return ($tp_id["MAX(tp_id)"]);
}
diff --git a/www/include/configuration/configObject/timeperiod/formTimeperiod.php b/www/include/configuration/configObject/timeperiod/formTimeperiod.php
index a35f6ad99bdf4a93230a1ca66dcc2566d974492f..5f8d0a21f42d0abaad1608f6ade98d1102842fea 100644
--- a/www/include/configuration/configObject/timeperiod/formTimeperiod.php
+++ b/www/include/configuration/configObject/timeperiod/formTimeperiod.php
@@ -23,7 +23,7 @@ For information : contact@oreon-project.org
if (($o == "c" || $o == "w") && $tp_id) {
$DBRESULT =& $pearDB->query("SELECT * FROM timeperiod WHERE tp_id = '".$tp_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$tp = array_map("myDecode", $DBRESULT->fetchRow());
}
diff --git a/www/include/configuration/configObject/timeperiod/listTimeperiod.php b/www/include/configuration/configObject/timeperiod/listTimeperiod.php
index 13ad0a371b0947ad0a8fa6c53a2573ab8806895b..90b0a7cfe8d0d56e49c8c91fac1e1fa93bb49649 100644
--- a/www/include/configuration/configObject/timeperiod/listTimeperiod.php
+++ b/www/include/configuration/configObject/timeperiod/listTimeperiod.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query("SELECT COUNT(*) FROM timeperiod $SearchTool");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp =& $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
@@ -57,7 +57,7 @@ For information : contact@oreon-project.org
*/
$DBRESULT = &$pearDB->query("SELECT tp_id, tp_name, tp_alias FROM timeperiod $SearchTool ORDER BY tp_name LIMIT ".$num * $limit.", ".$limit);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$search = tidySearchKey($search, $advanced_search);
diff --git a/www/include/configuration/configObject/traps-manufacturer/DB-Func.php b/www/include/configuration/configObject/traps-manufacturer/DB-Func.php
index 3c14c28e81c757fc9e4ff95f8e5ee6edf8751368..ed626a2ee875ac697e3fdc569614ce784627e0e1 100644
--- a/www/include/configuration/configObject/traps-manufacturer/DB-Func.php
+++ b/www/include/configuration/configObject/traps-manufacturer/DB-Func.php
@@ -24,7 +24,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('id');
$DBRESULT =& $pearDB->query("SELECT name, id FROM traps_vendor WHERE name = '".htmlentities($name, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$mnftr =& $DBRESULT->fetchRow();
#Modif case
if ($DBRESULT->numRows() >= 1 && $mnftr["id"] == $id)
@@ -41,7 +41,7 @@ For information : contact@oreon-project.org
foreach($mnftr as $key=>$value) {
$DBRESULT =& $pearDB->query("DELETE FROM traps_vendor WHERE id = '".htmlentities($key, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -50,7 +50,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT * FROM traps_vendor WHERE id = '".htmlentities($key, ENT_QUOTES)."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["id"] = '';
for ($i = 1; $i <= $nbrDup[$key]; $i++) {
@@ -63,7 +63,7 @@ For information : contact@oreon-project.org
$val ? $rq = "INSERT INTO traps_vendor VALUES (".$val.")" : $rq = null;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
@@ -87,7 +87,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE id = '".$id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function insertMnftrInDB ($ret = array()) {
@@ -108,7 +108,7 @@ For information : contact@oreon-project.org
$rq .= "'".htmlentities($ret["description"], ENT_QUOTES)."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(id) FROM traps_vendor");
$mnftr_id = $DBRESULT->fetchRow();
return ($mnftr_id["MAX(id)"]);
diff --git a/www/include/configuration/configObject/traps-manufacturer/formMnftr.php b/www/include/configuration/configObject/traps-manufacturer/formMnftr.php
index e786a0bddaa8ce1edbfb6785ca23db7df3dc1e46..4efdb5ad5705ae0c5f04e4bda161ec141a3b17f1 100644
--- a/www/include/configuration/configObject/traps-manufacturer/formMnftr.php
+++ b/www/include/configuration/configObject/traps-manufacturer/formMnftr.php
@@ -29,7 +29,7 @@ For information : contact@oreon-project.org
if (($o == "c" || $o == "w") && $id) {
$DBRESULT =& $pearDB->query("SELECT * FROM traps_vendor WHERE id = '".$id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$mnftr = array_map("myDecodeMnftr", $DBRESULT->fetchRow());
$DBRESULT->free();
diff --git a/www/include/configuration/configObject/traps-manufacturer/listMnftr.php b/www/include/configuration/configObject/traps-manufacturer/listMnftr.php
index 361824b67c5aed306876875fc4ddebf272b80618..be72f4751278925e490bcbf21aa5d26fd8cfcabc 100644
--- a/www/include/configuration/configObject/traps-manufacturer/listMnftr.php
+++ b/www/include/configuration/configObject/traps-manufacturer/listMnftr.php
@@ -32,7 +32,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query("SELECT COUNT(*) FROM traps_vendor $SearchTool");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp = & $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
@@ -58,7 +58,7 @@ For information : contact@oreon-project.org
*/
$DBRESULT =& $pearDB->query("SELECT * FROM traps_vendor $SearchTool ORDER BY name, alias LIMIT ".$num * $limit.", ".$limit);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$form = new HTML_QuickForm('form', 'POST', "?p=".$p);
/*
diff --git a/www/include/configuration/configObject/traps-mibs/formMibs.ihtml b/www/include/configuration/configObject/traps-mibs/formMibs.ihtml
index 7b31a43ae6b8bb37aca30c1ef9f5f2fc684f61d2..71cbd9a8f2e89efab4ecf786e6a3df8863cf2e6b 100644
--- a/www/include/configuration/configObject/traps-mibs/formMibs.ihtml
+++ b/www/include/configuration/configObject/traps-mibs/formMibs.ihtml
@@ -20,7 +20,7 @@
<p class="oreonbutton">{$form.submit.html} {$form.reset.html}</p>
</div>
{if $msg}
- <br><br><br><br>
+ <br /><br /><br /><br />
<div>
<table class="ListTable">
<tr class="ListHeader">
diff --git a/www/include/configuration/configObject/traps-mibs/formMibs.php b/www/include/configuration/configObject/traps-mibs/formMibs.php
index a31e9059966e41ab855783d70127160b7760a7dc..8d67f997344fb40d0bb3dfd6dee91d25454a4464 100644
--- a/www/include/configuration/configObject/traps-mibs/formMibs.php
+++ b/www/include/configuration/configObject/traps-mibs/formMibs.php
@@ -28,7 +28,7 @@ For information : contact@oreon-project.org
$mnftr = array(NULL=>NULL);
$DBRESULT =& $pearDB->query("SELECT id, alias FROM traps_vendor order by alias");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
while($DBRESULT->fetchInto($rmnftr)){
$mnftr[$rmnftr["id"]] = $rmnftr["alias"];
@@ -86,13 +86,13 @@ For information : contact@oreon-project.org
$values = $fileObj->getValue();
$stdout = shell_exec("export LD_LIBRARY_PATH=".$oreon->optGen["perl_library_path"]." && export MIBS=ALL && ".$oreon->optGen["snmpttconvertmib_path_bin"]." --in=/tmp/".$values["name"]." --out=/tmp/".
$values["name"].".conf 2>&1");
- $msg .= "<br>".str_replace ("\n", "<br>", $stdout);
- $msg .= "<br>Moving traps in DataBase...";
+ $msg .= "<br />".str_replace ("\n", "<br />", $stdout);
+ $msg .= "<br />Moving traps in DataBase...";
$stdout = shell_exec($oreon->optGen["nagios_path_plugins"]."traps/centFillTrapDB -f /tmp/".
$values["name"].".conf -m ".htmlentities($ret["mnftr"], ENT_QUOTES)." 2>&1");
shell_exec("rm /tmp/".$values["name"].".conf /tmp/".$values["name"]);
- $msg .= "<br>".str_replace ("\n", "<br>", $stdout);
- $msg .= "<br>Generate Traps configuration files from Nagios configuration form!";
+ $msg .= "<br />".str_replace ("\n", "<br />", $stdout);
+ $msg .= "<br />Generate Traps configuration files from Nagios configuration form!";
if ($msg)
$tpl->assign('msg', $msg);
}
diff --git a/www/include/configuration/configObject/traps/DB-Func.php b/www/include/configuration/configObject/traps/DB-Func.php
index a644f5e388e590d955cbd7380075c428a21bf1ab..9383292c1ece045d7f6410ecc83cc10259a36a75 100644
--- a/www/include/configuration/configObject/traps/DB-Func.php
+++ b/www/include/configuration/configObject/traps/DB-Func.php
@@ -23,7 +23,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('traps_id');
$DBRESULT =& $pearDB->query("SELECT traps_oid, traps_id FROM traps WHERE traps_oid = '".htmlentities($oid, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$trap =& $DBRESULT->fetchRow();
#Modif case
if ($DBRESULT->numRows() >= 1 && $trap["traps_id"] == $id)
@@ -40,7 +40,7 @@ For information : contact@oreon-project.org
foreach($traps as $key=>$value) {
$DBRESULT =& $pearDB->query("DELETE FROM traps WHERE traps_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -49,7 +49,7 @@ For information : contact@oreon-project.org
foreach($traps as $key=>$value) {
$DBRESULT =& $pearDB->query("SELECT * FROM traps WHERE traps_id = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["traps_id"] = '';
for ($i = 1; $i <= $nbrDup[$key]; $i++) {
@@ -62,7 +62,7 @@ For information : contact@oreon-project.org
$val ? $rq = "INSERT INTO traps VALUES (".$val.")" : $rq = null;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
@@ -98,7 +98,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE `traps_id` = '".$traps_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function insertTrapInDB ($ret = array()) {
@@ -125,7 +125,7 @@ For information : contact@oreon-project.org
$rq .= "'".htmlentities($ret["manufacturer_id"], ENT_QUOTES)."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(traps_id) FROM traps");
$traps_id = $DBRESULT->fetchRow();
return ($traps_id["MAX(traps_id)"]);
diff --git a/www/include/configuration/configObject/traps/GetXMLTrapsForVendor.php b/www/include/configuration/configObject/traps/GetXMLTrapsForVendor.php
index edc722c07e47875cf700599979d8352ce3fad3dd..bdbb39f88a41636759c8f665c4dd56fdbb82b041 100644
--- a/www/include/configuration/configObject/traps/GetXMLTrapsForVendor.php
+++ b/www/include/configuration/configObject/traps/GetXMLTrapsForVendor.php
@@ -58,7 +58,7 @@ For information : contact@oreon-project.org
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($trap)){
diff --git a/www/include/configuration/configObject/traps/formTraps.php b/www/include/configuration/configObject/traps/formTraps.php
index 9589b6f3e844db55ff5543f21e0004dc2b5aaa19..192b196d0ff49c7a36b474d6de1ef2e87ba3aff2 100644
--- a/www/include/configuration/configObject/traps/formTraps.php
+++ b/www/include/configuration/configObject/traps/formTraps.php
@@ -39,14 +39,14 @@ For information : contact@oreon-project.org
if (($o == "c" || $o == "w") && $traps_id) {
$DBRESULT =& $pearDB->query("SELECT * FROM traps WHERE traps_id = '".$traps_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$trap = array_map("myDecodeTrap", $DBRESULT->fetchRow());
$DBRESULT->free();
}
$DBRESULT =& $pearDB->query("SELECT id, alias FROM traps_vendor");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($rmnftr)){
$mnftr[$rmnftr["id"]] = $rmnftr["alias"];
}
diff --git a/www/include/configuration/configObject/traps/listTraps.php b/www/include/configuration/configObject/traps/listTraps.php
index 51c380bc7a395642985fda30822854d3a30b07b6..f7a9b75cae62cca9ee967a5dd47a68fd9bb853d9 100644
--- a/www/include/configuration/configObject/traps/listTraps.php
+++ b/www/include/configuration/configObject/traps/listTraps.php
@@ -33,7 +33,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query("SELECT COUNT(*) FROM traps $SearchTool");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp = & $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
@@ -62,7 +62,7 @@ For information : contact@oreon-project.org
$rq = "SELECT * FROM traps $SearchTool ORDER BY manufacturer_id, traps_name LIMIT ".$num * $limit.", ".$limit;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$form = new HTML_QuickForm('form', 'POST', "?p=".$p);
/*
@@ -81,7 +81,7 @@ For information : contact@oreon-project.org
$moptions .= "<input onKeypress=\"if(event.keyCode > 31 && (event.keyCode < 45 || event.keyCode > 57)) event.returnValue = false; if(event.which > 31 && (event.which < 45 || event.which > 57)) return false;\" maxlength=\"3\" size=\"3\" value='1' style=\"margin-bottom:0px;\" name='dupNbr[".$trap['traps_id']."]'></input>";
$DBRESULT2 =& $pearDB->query("select alias from traps_vendor where id='".$trap['manufacturer_id']."' LIMIT 1");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$DBRESULT2->fetchInto($mnftr);
$DBRESULT2->free();
$elemArr[$i] = array("MenuClass"=>"list_".$style,
diff --git a/www/include/configuration/configOptimize/formOptimizeFiles.ihtml b/www/include/configuration/configOptimize/formOptimizeFiles.ihtml
index 5a743a1ab4a8e7363b9b66bfbb0fb6f753d39946..13a9f72796914eda18452bd257fdd1031cb6fd8d 100644
--- a/www/include/configuration/configOptimize/formOptimizeFiles.ihtml
+++ b/www/include/configuration/configOptimize/formOptimizeFiles.ihtml
@@ -6,7 +6,7 @@
<tr class="list_one"><td class="FormRowField">{$form.host.label}</td><td class="FormRowValue">{$form.host.html}</td></tr>
</table>
<div align="center" id="validForm"><p class="oreonbutton">{$form.submit.html}</p></div>
- <br><br><br><br>
+ <br /><br /><br /><br />
{if $msg_optimize}
<div>
<ul id="mainnav">
diff --git a/www/include/configuration/configOptimize/formOptimizeFiles.php b/www/include/configuration/configOptimize/formOptimizeFiles.php
index 8fb2f1663c076631338c144496ff101965b62a9d..d1bd68ddb04fdf1586689b541ae0152a903f8484 100644
--- a/www/include/configuration/configOptimize/formOptimizeFiles.php
+++ b/www/include/configuration/configOptimize/formOptimizeFiles.php
@@ -23,7 +23,7 @@ For information : contact@oreon-project.org
$tab_nagios_server = array("0" => "All Nagios Servers");
$DBRESULT =& $pearDB->query("SELECT * FROM `nagios_server` ORDER BY `name`");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($nagios =& $DBRESULT->fetchRow())
$tab_nagios_server[$nagios['id']] = $nagios['name'];
@@ -78,13 +78,13 @@ For information : contact@oreon-project.org
$ret = $form->getSubmitValues();
$DBRESULT_Servers =& $pearDB->query("SELECT `id` FROM `nagios_server` ORDER BY `name`");
if (PEAR::isError($DBRESULT_Servers))
- print "DB Error : ".$DBRESULT_Servers->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_Servers->getDebugInfo()."<br />";
$msg_optimize = array();
$cpt = 1;
while ($tab =& $DBRESULT_Servers->fetchRow()){
if (isset($ret["host"]) && $ret["host"] == 0 || $ret["host"] == $tab['id']){
$stdout = shell_exec($oreon->optGen["nagios_path_bin"] . " -s ".$nagiosCFGPath.$tab['id']."/nagiosCFG.DEBUG");
- $msg_optimize[$cpt] = str_replace ("\n", "<br>", $stdout);
+ $msg_optimize[$cpt] = str_replace ("\n", "<br />", $stdout);
$cpt++;
}
}
diff --git a/www/include/configuration/configPerfparse/DB-Func.php b/www/include/configuration/configPerfparse/DB-Func.php
index 4353bc0938abd2f26cf43672b909c0c5424a4070..c8bb0e91a012638358f6b651fbaa0e4fbf5a017e 100644
--- a/www/include/configuration/configPerfparse/DB-Func.php
+++ b/www/include/configuration/configPerfparse/DB-Func.php
@@ -25,7 +25,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('perfparse_id');
$DBRESULT =& $pearDB->query("SELECT perfparse_name, perfparse_id FROM cfg_perfparse WHERE perfparse_name = '".htmlentities($name, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$perfparse =& $DBRESULT->fetchRow();
#Modif case
if ($DBRESULT->numRows() >= 1 && $perfparse["perfparse_id"] == $id)
@@ -42,10 +42,10 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("UPDATE cfg_perfparse SET perfparse_activate = '0'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("UPDATE cfg_perfparse SET perfparse_activate = '1' WHERE perfparse_id = '".$perfparse_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function disablePerfparseInDB ($perfparse_id = null) {
@@ -53,15 +53,15 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("UPDATE cfg_perfparse SET perfparse_activate = '0' WHERE perfparse_id = '".$perfparse_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(perfparse_id) FROM cfg_perfparse WHERE perfparse_id != '".$perfparse_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$maxId =& $DBRESULT->fetchRow();
if (isset($maxId["MAX(perfparse_id)"])){
$DBRESULT =& $pearDB->query("UPDATE cfg_perfparse SET perfparse_activate = '1' WHERE perfparse_id = '".$maxId["MAX(perfparse_id)"]."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -70,17 +70,17 @@ For information : contact@oreon-project.org
foreach($perfparse as $key=>$value){
$DBRESULT =& $pearDB->query("DELETE FROM cfg_perfparse WHERE perfparse_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
$DBRESULT =& $pearDB->query("SELECT perfparse_id FROM cfg_perfparse WHERE perfparse_activate = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if (!$DBRESULT->numRows()) {
$DBRESULT =& $pearDB->query("SELECT MAX(perfparse_id) FROM cfg_perfparse");
$perfparse_id = $DBRESULT->fetchRow();
$DBRESULT =& $pearDB->query("UPDATE cfg_perfparse SET perfparse_activate = '1' WHERE perfparse_id = '".$perfparse_id["MAX(perfparse_id)"]."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -89,7 +89,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT * FROM cfg_perfparse WHERE perfparse_id = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["perfparse_id"] = '';
$row["perfparse_activate"] = '0';
@@ -103,7 +103,7 @@ For information : contact@oreon-project.org
$val ? $rq = "INSERT INTO cfg_perfparse VALUES (".$val.")" : $rq = null;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
@@ -169,15 +169,15 @@ For information : contact@oreon-project.org
$rq .= "'".$ret["perfparse_activate"]["perfparse_activate"]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(perfparse_id) FROM cfg_perfparse");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$perfparse_id = $DBRESULT->fetchRow();
if ($ret["perfparse_activate"]["perfparse_activate"]){
$DBRESULT =& $pearDB->query("UPDATE cfg_perfparse SET perfparse_activate = '0' WHERE perfparse_id != '".$perfparse_id["MAX(perfparse_id)"]."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
return ($perfparse_id["MAX(perfparse_id)"]);
}
@@ -225,7 +225,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE perfparse_id = '".$perfparse_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if ($ret["perfparse_activate"]["perfparse_activate"])
enablePerfparseInDB($perfparse_id);
}
diff --git a/www/include/configuration/configPerfparse/formPerfparse.php b/www/include/configuration/configPerfparse/formPerfparse.php
index 28d931549ebf42705eef29913cb34cc199bc73fe..c0cc7331d6251d0018c17d30e7e6249223aef700 100644
--- a/www/include/configuration/configPerfparse/formPerfparse.php
+++ b/www/include/configuration/configPerfparse/formPerfparse.php
@@ -24,7 +24,7 @@ For information : contact@oreon-project.org
if (($o == "c" || $o == "w") && $perfparse_id) {
$DBRESULT =& $pearDB->query("SELECT * FROM cfg_perfparse WHERE perfparse_id = '".$perfparse_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$ppTemp = array_map("myDecode", $DBRESULT->fetchRow());
foreach ($ppTemp as $key=>$value)
@@ -38,7 +38,7 @@ For information : contact@oreon-project.org
$attrsText2 = array("size"=>"50");
$attrsText3 = array("size"=>"10");
$attrsTextarea = array("rows"=>"5", "cols"=>"40");
- $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br><br><br>{remove}</td><td>{selected}</td></tr></table>";
+ $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br /><br /><br />{remove}</td><td>{selected}</td></tr></table>";
#
## Form begin
diff --git a/www/include/configuration/configPerfparse/listPerfparse.php b/www/include/configuration/configPerfparse/listPerfparse.php
index 4479152fc5021e13f7fc8a82714a530bcf275cf1..c358163533a3d04b1f4be4dce866f99e23cfbee2 100644
--- a/www/include/configuration/configPerfparse/listPerfparse.php
+++ b/www/include/configuration/configPerfparse/listPerfparse.php
@@ -25,7 +25,7 @@ For information : contact@oreon-project.org
else
$DBRESULT = & $pearDB->query("SELECT COUNT(*) FROM cfg_perfparse");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp = & $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
@@ -54,7 +54,7 @@ For information : contact@oreon-project.org
$rq = "SELECT perfparse_id, perfparse_name, perfparse_comment, perfparse_activate FROM cfg_perfparse ORDER BY perfparse_name LIMIT ".$num * $limit.", ".$limit;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$form = new HTML_QuickForm('select_form', 'POST', "?p=".$p);
#Different style between each lines
diff --git a/www/include/configuration/configPlugins/listPlugins.ihtml b/www/include/configuration/configPlugins/listPlugins.ihtml
index d9d635c5aa9906a5ba61990010d4496b353f8773..fc8a2f7f56f400802b82bc30b82de8a9cdfbcee4 100644
--- a/www/include/configuration/configPlugins/listPlugins.ihtml
+++ b/www/include/configuration/configPlugins/listPlugins.ihtml
@@ -49,7 +49,7 @@
{/php}
</tr>
</table>
-<br><br>
+<br /><br />
<input name="p" value="{$p}" type="hidden">
<!--<table class="ListTable">
diff --git a/www/include/configuration/configPlugins/listPlugins.php b/www/include/configuration/configPlugins/listPlugins.php
index a26d51744501aad3aef818ca14f27687612a1fa4..0ad277e8ae26c336be03355da30f7ddfafdb3fe8 100644
--- a/www/include/configuration/configPlugins/listPlugins.php
+++ b/www/include/configuration/configPlugins/listPlugins.php
@@ -111,10 +111,10 @@ For information : contact@oreon-project.org
/*
# File Moving
switch ($fDataz["type"]) {
- case "application/x-zip-compressed" : $msg .= $fDataz["name"]." ".$lang["upl_uplBadType"]."<br>"; break;
- case "application/x-gzip" : $file->moveUploadedFile($nagiosCFGPath); $msg .= $fDataz["name"]." ".$lang["upl_uplOk"]."<br>"; break; // tar.gz
- case "application/octet-stream" : $file->moveUploadedFile($nagiosCFGPath); $msg .= $lang["upl_manualDef"]." ".$lang["upl_uplOk"]."<br>"; break; // Text
- default : $msg .= $lang["upl_uplKo"]."<br>";
+ case "application/x-zip-compressed" : $msg .= $fDataz["name"]." ".$lang["upl_uplBadType"]."<br />"; break;
+ case "application/x-gzip" : $file->moveUploadedFile($nagiosCFGPath); $msg .= $fDataz["name"]." ".$lang["upl_uplOk"]."<br />"; break; // tar.gz
+ case "application/octet-stream" : $file->moveUploadedFile($nagiosCFGPath); $msg .= $lang["upl_manualDef"]." ".$lang["upl_uplOk"]."<br />"; break; // Text
+ default : $msg .= $lang["upl_uplKo"]."<br />";
}
*/
}
diff --git a/www/include/configuration/configResources/DB-Func.php b/www/include/configuration/configResources/DB-Func.php
index bb9ec8cf90c8c6d5f12c01f771e36a6159536d75..c64b1f2f102621c4333635b243dda5f6e3562eab 100644
--- a/www/include/configuration/configResources/DB-Func.php
+++ b/www/include/configuration/configResources/DB-Func.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('resource_id');
$DBRESULT =& $pearDB->query("SELECT resource_name, resource_id FROM cfg_resource WHERE resource_name = '".htmlentities($name, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$res =& $DBRESULT->fetchRow();
#Modif case
if ($DBRESULT->numRows() >= 1 && $res["resource_id"] == $id)
@@ -43,7 +43,7 @@ For information : contact@oreon-project.org
foreach($DBRESULT as $key=>$value){
$DBRESULT =& $pearDB->query("DELETE FROM cfg_resource WHERE resource_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -52,7 +52,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("UPDATE cfg_resource SET resource_activate = '1' WHERE resource_id = '".$resource_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function disableResourceInDB ($resource_id = null) {
@@ -60,7 +60,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("UPDATE cfg_resource SET resource_activate = '0' WHERE resource_id = '".$resource_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function multipleResourceInDB ($DBRESULT = array(), $nbrDup = array()) {
@@ -68,7 +68,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT * FROM cfg_resource WHERE resource_id = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["resource_id"] = '';
for ($i = 1; $i <= $nbrDup[$key]; $i++) {
@@ -80,7 +80,7 @@ For information : contact@oreon-project.org
if (testExistence($resource_name)) {
$DBRESULT =& $pearDB->query($val ? $rq = "INSERT INTO cfg_resource VALUES (".$val.")" : $rq = null);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
@@ -104,7 +104,7 @@ For information : contact@oreon-project.org
"WHERE resource_id = '".$resource_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function insertResourceInDB () {
@@ -126,11 +126,11 @@ For information : contact@oreon-project.org
$rq .= ")";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(resource_id) FROM cfg_resource");
$resource_id = $DBRESULT->fetchRow();
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
return ($resource_id["MAX(resource_id)"]);
}
?>
\ No newline at end of file
diff --git a/www/include/configuration/configResources/formResources.php b/www/include/configuration/configResources/formResources.php
index d342f53b961fe83ab5eaad8b32f1a1e5e2b49f77..de95e861fcc2114d8b7770a3b8faaaf2377b0d8e 100644
--- a/www/include/configuration/configResources/formResources.php
+++ b/www/include/configuration/configResources/formResources.php
@@ -22,7 +22,7 @@ For information : contact@oreon-project.org
if (($o == "c" || $o == "w") && $resource_id) {
$DBRESULT =& $pearDB->query("SELECT * FROM cfg_resource WHERE resource_id = '".$resource_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$rs = array_map("myDecode", $DBRESULT->fetchRow());
$DBRESULT->free();
diff --git a/www/include/configuration/configResources/listResources.php b/www/include/configuration/configResources/listResources.php
index 6016249dfe311978b568e78d11ad74e4cc40e402..c5d337412c93f43889cd8efe64c952c2ca56d32b 100644
--- a/www/include/configuration/configResources/listResources.php
+++ b/www/include/configuration/configResources/listResources.php
@@ -29,7 +29,7 @@ For information : contact@oreon-project.org
$DBRESULT = & $pearDB->query("SELECT COUNT(*) FROM cfg_resource".$SearchTool);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp = & $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
@@ -62,7 +62,7 @@ For information : contact@oreon-project.org
$rq = "SELECT resource_id, resource_name, resource_line, resource_activate FROM cfg_resource $SearchTool ORDER BY resource_name LIMIT ".$num * $limit.", ".$limit;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$form = new HTML_QuickForm('select_form', 'POST', "?p=".$p);
diff --git a/www/include/configuration/configServers/DB-Func.php b/www/include/configuration/configServers/DB-Func.php
index 2d68fc3ce62e4f0ee6584c5f1a53dce9c4afe46b..9351e5457eeeb125656b5398caa42043ba2093ca 100644
--- a/www/include/configuration/configServers/DB-Func.php
+++ b/www/include/configuration/configServers/DB-Func.php
@@ -25,7 +25,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('id');
$DBRESULT =& $pearDB->query("SELECT name, id FROM `nagios_server` WHERE `name` = '".htmlentities($name, ENT_QUOTES)."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$ndomod =& $DBRESULT->fetchRow();
if ($DBRESULT->numRows() >= 1 && $ndomod["id"] == $id)#Modif case
return true;
@@ -40,7 +40,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("UPDATE `nagios_server` SET `ns_activate` = '1' WHERE id = '".$id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function disableServerInDB ($id = null) {
@@ -54,7 +54,7 @@ For information : contact@oreon-project.org
foreach($server as $key => $value) {
$DBRESULT =& $pearDB->query("DELETE FROM `nagios_server` WHERE id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -63,7 +63,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT * FROM `nagios_server` WHERE id = '".$key."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$row = $DBRESULT->fetchRow();
$row["id"] = '';
$row["ns_activate"] = '0';
@@ -79,7 +79,7 @@ For information : contact@oreon-project.org
$val ? $rq = "INSERT INTO `nagios_server` VALUES (".$val.")" : $rq = null;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
}
@@ -112,10 +112,10 @@ For information : contact@oreon-project.org
isset($ret["ns_activate"]) && $ret["ns_activate"] != 2 ? $rq .= "'".$ret["ns_activate"]."', " : $rq .= "NULL)";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(id) FROM `nagios_server`");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$ndomod_id = $DBRESULT->fetchRow();
$DBRESULT->free();
return ($ndomod_id["MAX(id)"]);
@@ -129,7 +129,7 @@ For information : contact@oreon-project.org
if ($ret["localhost"]["localhost"] == 1){
$DBRESULT =& $pearDB->query("UPDATE `nagios_server` SET `localhost` = '0'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
$rq = "UPDATE `nagios_server` SET ";
isset($ret["name"]) && $ret["name"] != NULL ? $rq .= "name = '".htmlentities($ret["name"], ENT_QUOTES)."', " : $rq .= "name = NULL, ";
@@ -144,6 +144,6 @@ For information : contact@oreon-project.org
$rq .= "WHERE id = '".$id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
?>
\ No newline at end of file
diff --git a/www/include/configuration/configServers/formServers.php b/www/include/configuration/configServers/formServers.php
index 937c46e063bce942f686280f216d29eda0bad74c..a5e2ce800d20a10c963b6f11edac111305122734 100644
--- a/www/include/configuration/configServers/formServers.php
+++ b/www/include/configuration/configServers/formServers.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
if (($o == "c" || $o == "w") && $server_id) {
$DBRESULT =& $pearDB->query("SELECT * FROM `nagios_server` WHERE `id` = '".$server_id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$cfg_server = array_map("myDecode", $DBRESULT->fetchRow());
$DBRESULT->free();
@@ -36,7 +36,7 @@ For information : contact@oreon-project.org
$nagios_servers = array();
$DBRESULT =& $pearDB->query("SELECT * FROM `nagios_server` ORDER BY name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($nagios_server = $DBRESULT->fetchRow())
$nagios_servers[$nagios_server["id"]] = $nagios_server["name"];
$DBRESULT->free();
@@ -52,7 +52,7 @@ For information : contact@oreon-project.org
$attrsText2 = array("size"=>"50");
$attrsText3 = array("size"=>"10");
$attrsTextarea = array("rows"=>"5", "cols"=>"40");
- $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br><br><br>{remove}</td><td>{selected}</td></tr></table>";
+ $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br /><br /><br />{remove}</td><td>{selected}</td></tr></table>";
#
## Form begin
diff --git a/www/include/configuration/configServers/listServers.php b/www/include/configuration/configServers/listServers.php
index bd21445064d188ff338cac48894e9ecd456f9feb..187517c5df2f7ebd5e1f58d766b000d2d6676b6f 100644
--- a/www/include/configuration/configServers/listServers.php
+++ b/www/include/configuration/configServers/listServers.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
else
$DBRESULT = & $pearDB->query("SELECT COUNT(*) FROM `nagios_server`");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tmp = & $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
@@ -37,7 +37,7 @@ For information : contact@oreon-project.org
$nagios_servers = array();
$DBRESULT =& $pearDB->query("SELECT * FROM `nagios_server` ORDER BY name");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($nagios_server = $DBRESULT->fetchRow())
$nagios_servers[$nagios_server["id"]] = $nagios_server["name"];
$DBRESULT->free();
@@ -73,7 +73,7 @@ For information : contact@oreon-project.org
$rq = "SELECT id, name, ns_activate, ns_ip_address FROM `nagios_server` ORDER BY name LIMIT ".$num * $limit.", ".$limit;
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$form = new HTML_QuickForm('select_form', 'POST', "?p=".$p);
diff --git a/www/include/configuration/configTraps/formOptimizeFiles.ihtml b/www/include/configuration/configTraps/formOptimizeFiles.ihtml
index c665ba48cf5efd827dba7580766559f01556a10c..59e040e145b46451665bb7fa5ca7b0137a2576cb 100644
--- a/www/include/configuration/configTraps/formOptimizeFiles.ihtml
+++ b/www/include/configuration/configTraps/formOptimizeFiles.ihtml
@@ -20,7 +20,7 @@
<tr class="list_one"><td class="FormRowField">{$form.optimize.label}</td><td class="FormRowValue">{$form.optimize.html}</td></tr>
</table>
<div align="center" id="validForm"><p class="oreonbutton">{$form.submit.html}</p></div>
- <br><br><br><br>
+ <br /><br /><br /><br />
{if $msg}
<table class="ListTable">
<tr class="ListHeader">
diff --git a/www/include/configuration/configTraps/formOptimizeFiles.php b/www/include/configuration/configTraps/formOptimizeFiles.php
index a7d7fd9b8a22238419dea6885630bee38255c9f1..821b4f6bebd04be28e75d95e52d193609b552290 100644
--- a/www/include/configuration/configTraps/formOptimizeFiles.php
+++ b/www/include/configuration/configTraps/formOptimizeFiles.php
@@ -23,7 +23,7 @@ For information : contact@oreon-project.org
$tab_nagios_server = array("0" => "All Nagios Servers");
$DBRESULT =& $pearDB->query("SELECT * FROM `nagios_server` ORDER BY `name`");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($nagios =& $DBRESULT->fetchRow())
$tab_nagios_server[$nagios['id']] = $nagios['name'];
@@ -49,7 +49,7 @@ For information : contact@oreon-project.org
$tab[] = &HTML_QuickForm::createElement('radio', 'level', null, _("Dependencies Management"), '1');
$tab[] = &HTML_QuickForm::createElement('radio', 'level', null, _("Current Activation"), '2');
$tab[] = &HTML_QuickForm::createElement('radio', 'level', null, _("None"), '3');
- $form->addGroup($tab, 'level', _("Relations between Elements"), '<br>');
+ $form->addGroup($tab, 'level', _("Relations between Elements"), '<br />');
$form->setDefaults(array('level' => '1'));
$tab = array();
$tab[] = &HTML_QuickForm::createElement('radio', 'comment', null, _("Yes"), '1');
@@ -124,7 +124,7 @@ For information : contact@oreon-project.org
$gbArr = manageDependencies();
$DBRESULT_Servers =& $pearDB->query("SELECT `id`, `localhost` FROM `nagios_server` ORDER BY `name`");
if (PEAR::isError($DBRESULT_Servers))
- print "DB Error : ".$DBRESULT_Servers->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_Servers->getDebugInfo()."<br />";
while ($tab =& $DBRESULT_Servers->fetchRow()){
if (isset($ret["host"]) && $ret["host"] == 0 || $ret["host"] == $tab['id']){
unset($DBRESULT2);
@@ -158,7 +158,7 @@ For information : contact@oreon-project.org
*/
$DBRESULT_Servers =& $pearDB->query("SELECT `id`, `localhost` FROM `nagios_server` ORDER BY `name`");
if (PEAR::isError($DBRESULT_Servers))
- print "DB Error : ".$DBRESULT_Servers->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_Servers->getDebugInfo()."<br />";
while ($tab =& $DBRESULT_Servers->fetchRow()){
if (isset($tab['localhost']) && $tab['localhost'])
if ($files = glob("./include/configuration/configGenerate/metaService/*.php"))
@@ -180,7 +180,7 @@ For information : contact@oreon-project.org
require_once($path."genXMLList.php");
$DBRESULT =& $pearDB->query("UPDATE `nagios_server` SET `last_restart` = '".time()."' WHERE `id` =1 LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -191,12 +191,12 @@ For information : contact@oreon-project.org
if ($ret["debug"]["debug"]) {
$DBRESULT_Servers =& $pearDB->query("SELECT `id` FROM `nagios_server` ORDER BY `name`");
if (PEAR::isError($DBRESULT_Servers))
- print "DB Error : ".$DBRESULT_Servers->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_Servers->getDebugInfo()."<br />";
while ($tab =& $DBRESULT_Servers->fetchRow()){
if (isset($ret["host"]) && $ret["host"] == 0 || $ret["host"] == $tab['id']){
print "OK";
$stdout = shell_exec($oreon->optGen["nagios_path_bin"] . " -v ".$nagiosCFGPath.$tab['id']."/nagiosCFG.DEBUG");
- $msg .= str_replace ("\n", "<br>", $stdout);
+ $msg .= str_replace ("\n", "<br />", $stdout);
}
}
}
@@ -204,11 +204,11 @@ For information : contact@oreon-project.org
if ($ret["optimize"]["optimize"]){
$DBRESULT_Servers =& $pearDB->query("SELECT `id` FROM `nagios_server` ORDER BY `name`");
if (PEAR::isError($DBRESULT_Servers))
- print "DB Error : ".$DBRESULT_Servers->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_Servers->getDebugInfo()."<br />";
while ($tab =& $DBRESULT_Servers->fetchRow()){
if (isset($ret["host"]) && $ret["host"] == 0 || $ret["host"] == $tab['id']){
$stdout = shell_exec($oreon->optGen["nagios_path_bin"] . " -s ".$nagiosCFGPath.$tab['id']."/nagiosCFG.DEBUG");
- $msg .= str_replace ("\n", "<br>", $stdout);
+ $msg .= str_replace ("\n", "<br />", $stdout);
}
}
}
@@ -216,15 +216,15 @@ For information : contact@oreon-project.org
if ($ret["move"]["move"]) {
$DBRESULT_Servers =& $pearDB->query("SELECT `id`, `localhost` FROM `nagios_server` ORDER BY `name`");
if (PEAR::isError($DBRESULT_Servers))
- print "DB Error : ".$DBRESULT_Servers->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_Servers->getDebugInfo()."<br />";
while ($tab =& $DBRESULT_Servers->fetchRow()){
if (isset($ret["host"]) && $ret["host"] == 0 || $ret["host"] == $tab['id']){
if (isset($tab['localhost']) && $tab['localhost'] == 1){
- $msg .= "<br>";
+ $msg .= "<br />";
foreach (glob($nagiosCFGPath.$tab['id']."/*.cfg") as $filename) {
$bool = @copy($filename , $oreon->Nagioscfg["cfg_dir"].basename($filename));
$filename = array_pop(explode("/", $filename));
- $bool ? $msg .= $filename._(" - movement <font color='green'>OK</font>")."<br>" : $msg .= $filename._(" - movement <font color='res'>KO</font>")."<br>";
+ $bool ? $msg .= $filename._(" - movement <font color='green'>OK</font>")."<br />" : $msg .= $filename._(" - movement <font color='res'>KO</font>")."<br />";
}
} else {
passthru ("echo 'SENDCFGFILE:".$tab['id']."' >> /srv/oreon/var/centcore", $return);
@@ -235,7 +235,7 @@ For information : contact@oreon-project.org
if (isset($ret["genTraps"]["genTraps"]) && $ret["genTraps"]["genTraps"]) {
$stdout = shell_exec($oreon->optGen["nagios_path_plugins"]."/traps/centGenSnmpttConfFile 2>&1");
- $msg .= "<br>".str_replace ("\n", "<br>", $stdout);
+ $msg .= "<br />".str_replace ("\n", "<br />", $stdout);
}
if ($ret["restart"]["restart"]) {
@@ -246,7 +246,7 @@ For information : contact@oreon-project.org
$stdout = "";
$DBRESULT_Servers =& $pearDB->query("SELECT `id`, `localhost` FROM `nagios_server` ORDER BY `name`");
if (PEAR::isError($DBRESULT_Servers))
- print "DB Error : ".$DBRESULT_Servers->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_Servers->getDebugInfo()."<br />";
while ($tab =& $DBRESULT_Servers->fetchRow()){
$nagios_init_script = (isset($oreon->optGen["nagios_init_script"]) ? $oreon->optGen["nagios_init_script"] : "/etc/init.d/nagios" );
if ($ret["restart_mode"] == 1){
@@ -271,9 +271,9 @@ For information : contact@oreon-project.org
}
$DBRESULT =& $pearDB->query("UPDATE `nagios_server` SET `last_restart` = '".time()."' WHERE `id` = '".$tab['id']."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
- $msg .= "<br>".str_replace ("\n", "<br>", $stdout);
+ $msg .= "<br />".str_replace ("\n", "<br />", $stdout);
}
}
diff --git a/www/include/configuration/lang/en.php b/www/include/configuration/lang/en.php
index 5d8004987a2383d341bd3c4ec3c04cc6491c280b..217c1f09926c68dbd31a6cc57845de22afd9c544 100644
--- a/www/include/configuration/lang/en.php
+++ b/www/include/configuration/lang/en.php
@@ -415,7 +415,7 @@ $lang['cct_ldap_search_result_output'] ="Result";
$lang['cct_ldap_search'] = "Search";
$lang['cct_ldap_import_users'] = "Import";
$lang['cct_ldap_search_filter_help_title'] ="Filter Examples";
-$lang['cct_ldap_search_filter_help'] = "Active Directory : (&(objectClass=user)(samaccounttype=805306368)(objectCategory=person)(cn=*))<br>Lotus Domino : (&(objectClass=person)(cn=*))<br>OpenLDAP : (&(objectClass=person)(cn=*))";
+$lang['cct_ldap_search_filter_help'] = "Active Directory : (&(objectClass=user)(samaccounttype=805306368)(objectCategory=person)(cn=*))<br />Lotus Domino : (&(objectClass=person)(cn=*))<br />OpenLDAP : (&(objectClass=person)(cn=*))";
/* contact group */
@@ -744,7 +744,7 @@ $lang['upl_del'] = "Delete all configuration for the chosen type of files";
$lang['upl_over'] = "Update definition in case of double definition";
$lang['upl_comment'] = "Include comments";
$lang['upl_type'] = "File Type";
-$lang['upl_mis1'] = "For archive upload, be sure that the first line of each file has no importance because it is not handled.<br>Avoid to begin with a definition.";
+$lang['upl_mis1'] = "For archive upload, be sure that the first line of each file has no importance because it is not handled.<br />Avoid to begin with a definition.";
$lang['upl_typeNag'] = "nagios.cfg";
$lang['upl_typeCgi'] = "cgi.cfg";
$lang['upl_typePerfparse'] = "perfparse.cfg";
diff --git a/www/include/configuration/lang/fr.php b/www/include/configuration/lang/fr.php
index 6831d3c2291a9484ac006b57d142acc1d667f566..5bd4b76cd940940614266d650c0dcbcde0a4e744 100644
--- a/www/include/configuration/lang/fr.php
+++ b/www/include/configuration/lang/fr.php
@@ -414,7 +414,7 @@ $lang['cct_ldap_search_filter'] ="Filtre de recherche";
$lang['cct_ldap_search_result_output'] ="Résultat";
$lang['cct_ldap_import_users'] = "Importer";
$lang['cct_ldap_search_filter_help_title'] ="Exemples de filtre";
-$lang['cct_ldap_search_filter_help'] = "Active Directory : (&(objectClass=user)(samaccounttype=805306368)(objectCategory=person)(cn=*))<br>Lotus Domino : (&(objectClass=person)(cn=*))<br>OpenLDAP : (&(objectClass=person)(cn=*))";
+$lang['cct_ldap_search_filter_help'] = "Active Directory : (&(objectClass=user)(samaccounttype=805306368)(objectCategory=person)(cn=*))<br />Lotus Domino : (&(objectClass=person)(cn=*))<br />OpenLDAP : (&(objectClass=person)(cn=*))";
/* contact group */
@@ -743,7 +743,7 @@ $lang['upl_del'] = "Supprimer toute la configuration existante pour le type de f
$lang['upl_over'] = "Mettre à jour une définition en cas de doublons";
$lang['upl_comment'] = "Inclure les commentaires";
$lang['upl_type'] = "Catégorie du Fichier";
-$lang['upl_mis1'] = "Pour l'upload d'une archive, la première ligne de chaque fichier doit etre sans importance car elle n'est pas prise en compte.<br>Evitez de faire démarrer une définition dès le début.";
+$lang['upl_mis1'] = "Pour l'upload d'une archive, la première ligne de chaque fichier doit etre sans importance car elle n'est pas prise en compte.<br />Evitez de faire démarrer une définition dès le début.";
$lang['upl_typeNag'] = "nagios.cfg";
$lang['upl_typeCgi'] = "cgi.cfg";
$lang['upl_typePerfparse'] = "perfparse.cfg";
@@ -814,9 +814,9 @@ $lang['m_traps_handler'] = "Handler";
$lang['m_traps_args'] = "Message à afficher";
$lang['m_traps_status'] = "Statut";
$lang['m_trap_submit_result_enable'] = "Envoyer les résultat";
-$lang['m_traps_reschedule_svc'] = "Réordonnancer les services associ�s";
+$lang['m_traps_reschedule_svc'] = "Réordonnancer les services associ�s";
$lang['m_traps_reschedule_svc_enable'] = "Activer le Réordonnancement forcé";
-$lang['m_traps_execution_command_enable'] = "Executer une commande sp�cifique";
+$lang['m_traps_execution_command_enable'] = "Executer une commande sp�cifique";
$lang['m_traps_execution_command'] = "Commande spécifique";
$lang['m_traps_status'] = "Statut";
$lang['m_traps_comments'] = "Commentaires";
diff --git a/www/include/home/old/radar_hg.php b/www/include/home/old/radar_hg.php
index 9fc97e36a53ff123222db1a53d03de26a64efbe5..e716cd7d50bf9adf1d3b4793542e852d5ebf93e4 100644
--- a/www/include/home/old/radar_hg.php
+++ b/www/include/home/old/radar_hg.php
@@ -51,7 +51,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $db->query("SELECT * FROM `session` WHERE session_id = '".$_GET["session_id"]."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if (!$session->numRows())
exit;
@@ -97,14 +97,14 @@ For information : contact@oreon-project.org
$DBRESULT =& $db->query("SELECT * FROM `hostgroup` WHERE hg_activate = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
else {
$tab_hg = array();
while ($hg =& $DBRESULT->fetchRow()){
$tab_hg[$hg["hg_name"]] = array();
$DBRESULT2 =& $db->query("SELECT host_host_id, host_name FROM hostgroup_relation, host WHERE hostgroup_relation.hostgroup_hg_id = '".$hg["hg_id"]."' AND host.host_id = hostgroup_relation.host_host_id");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
for ($total = 0, $up = 0; $rH =& $DBRESULT2->fetchRow(); $total++)
if (!strcmp($oreon->status_graph_host[$rH["host_name"]]["status"], "UP"))
$up++;
diff --git a/www/include/home/old/radar_sg.php b/www/include/home/old/radar_sg.php
index e34fbea0d97037fe718d77a746dccf861c757044..b0d21f26f0bd2ba8330e11f93967fdb8e6d3969a 100644
--- a/www/include/home/old/radar_sg.php
+++ b/www/include/home/old/radar_sg.php
@@ -51,7 +51,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query("SELECT * FROM `session` WHERE session_id = '".$_GET["session_id"]."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if (!$DBRESULT->numRows())
exit;
@@ -98,14 +98,14 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query("SELECT * FROM `servicegroup` WHERE sg_activate = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
else {
$tab_sg = array();
while ($sg =& $DBRESULT->fetchRow()){
$tab_sg[$sg["sg_name"]] = array();
$DBRESULT2 =& $pearDB->query("SELECT service_service_id, service_description FROM servicegroup_relation, service WHERE servicegroup_relation.servicegroup_sg_id = '".$sg["sg_id"]."' AND service.service_id = servicegroup_relation.service_service_id");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
for ($total = 0, $ok = 0;$rS =& $DBRESULT2->fetchRow();$total++){
if (!$rS["service_description"])
$rS["service_description"] = getMyHostName($rS["service_service_id"]);
diff --git a/www/include/home/pie-host.php b/www/include/home/pie-host.php
index 3d8a61d855b81b5d5fc692b540367342047b72fe..358083f34dbb91587205f47e5b969933b3d0bb78 100644
--- a/www/include/home/pie-host.php
+++ b/www/include/home/pie-host.php
@@ -43,7 +43,7 @@
$DBRESULT_NDO1 =& $pearDBndo->query($rq1);
if (PEAR::isError($DBRESULT_NDO1))
- print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br />";
$data = array();
$color = array();
$counter = 0;
diff --git a/www/include/home/pie-hostgroup.php b/www/include/home/pie-hostgroup.php
index a4296ca10a3c618aca71bca7ae56355b7dfa1572..144412f601f7cc15dcd92be4df52edce2d8140fe 100644
--- a/www/include/home/pie-hostgroup.php
+++ b/www/include/home/pie-hostgroup.php
@@ -47,7 +47,7 @@
$DBRESULT =& $pearDB->query("SELECT * FROM hostgroup");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($hg = $DBRESULT->fetchRow()){
$counterTotal = 0;
@@ -57,7 +57,7 @@
while($h = $DBRESULT2->fetchRow()){
$DBRESULT3 =& $pearDBndo->query("SELECT current_state FROM nagios_hoststatus, nagios_hosts WHERE nagios_hoststatus.host_object_id = nagios_hosts.host_object_id AND nagios_hosts.alias = '".$h["host_name"]."'");
if (PEAR::isError($DBRESULT3))
- print "DB Error : ".$DBRESULT3->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT3->getDebugInfo()."<br />";
while($stt = $DBRESULT3->fetchRow()){
if ($stt["current_state"] == 1)
$counterDown++;
diff --git a/www/include/home/pie-svc.php b/www/include/home/pie-svc.php
index 94b5d57d8a83e9ebe331e59d1edde9407a636c26..5f0c4e2a97b3ab53392aafa5cb33e72002f22203 100644
--- a/www/include/home/pie-svc.php
+++ b/www/include/home/pie-svc.php
@@ -43,7 +43,7 @@
$DBRESULT_NDO1 =& $pearDBndo->query($rq1);
if (PEAR::isError($DBRESULT_NDO1))
- print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br />";
$data = array();
$color = array();
$counter = 0;
diff --git a/www/include/home/pie-svcgroup.php b/www/include/home/pie-svcgroup.php
index 3e1372ce06ee50e27e08c0ce8f833ca6fa9cff18..8fc2896a2a0dbe4f7a2477e4ab5fda2d69bc9f48 100644
--- a/www/include/home/pie-svcgroup.php
+++ b/www/include/home/pie-svcgroup.php
@@ -51,7 +51,7 @@
$DBRESULT =& $pearDB->query("SELECT * FROM servicegroup");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($sg = $DBRESULT->fetchRow()){
$counterTotal = 0;
@@ -60,7 +60,7 @@
$counterCrit = 0;
$DBRESULT2 =& $pearDB->query("SELECT host_name, service_description FROM service, host, servicegroup_relation WHERE servicegroup_relation.servicegroup_sg_id = '".$sg["sg_id"]."' AND servicegroup_relation.host_host_id = host.host_id AND servicegroup_relation.service_service_id = service.service_id");
while ($s = $DBRESULT2->fetchRow()){
- print $s["host_name"] . " - " . $s["service_description"]."<br>";
+ print $s["host_name"] . " - " . $s["service_description"]."<br />";
$DBRESULT3 =& $pearDBndo->query( "SELECT current_state " .
"FROM nagios_servicestatus, nagios_services, nagios_hosts " .
"WHERE nagios_services.display_name = '".$s["service_description"]."' " .
@@ -68,9 +68,9 @@
"AND nagios_hosts.display_name = '".$s["host_name"]."'" .
"AND nagios_services.host_object_id = nagios_hosts.host_object_id ");
if (PEAR::isError($DBRESULT3))
- print "DB Error : ".$DBRESULT3->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT3->getDebugInfo()."<br />";
while($stt = $DBRESULT3->fetchRow()){
- print "Status : ".$stt["current_state"]."<br>";
+ print "Status : ".$stt["current_state"]."<br />";
if ($stt["current_state"] == 1)
$counterWarn++;
if ($stt["current_state"] == 0)
diff --git a/www/include/inventory/DB-Func.php b/www/include/inventory/DB-Func.php
index e97f9eb62079c5afcac7b4d26e3143c179b2d5e5..5cefa539aecce8fe8990e6447c77aa61c36f8eed 100644
--- a/www/include/inventory/DB-Func.php
+++ b/www/include/inventory/DB-Func.php
@@ -28,7 +28,7 @@ For information : contact@oreon-project.org
foreach($hosts as $key=>$value) {
$DBRESULT =& $pearDB->query("UPDATE `inventory_index` SET `type_ressources` = ".$manufacturer_id." WHERE `host_id` = ".$key);
if (PEAR::isError($DBRESULT))
- print $DBRESULT->getDebugInfo()."<br>";
+ print $DBRESULT->getDebugInfo()."<br />";
}
}
?>
\ No newline at end of file
diff --git a/www/include/inventory/inventoryUpdate.php b/www/include/inventory/inventoryUpdate.php
index d48c345e7daba4aba7d7bba86655e1048f51dda3..d94569d4d7edff733480c7caa35c8da30c2a7fcd 100644
--- a/www/include/inventory/inventoryUpdate.php
+++ b/www/include/inventory/inventoryUpdate.php
@@ -46,7 +46,7 @@ For information : contact@oreon-project.org
$tpl->assign("initJS", "<script type='text/javascript'>
- display('". _("Please wait, inventory is loading...") ."<br><br><img src=\'./img/icones/16x16/spinner_blue.gif\'>','inventory');
+ display('". _("Please wait, inventory is loading...") ."<br /><br /><img src=\'./img/icones/16x16/spinner_blue.gif\'>','inventory');
//display('Please wait during inventory...','inventory');
loadXMLDoc('include/inventory/inventory_cron_update.php','inventory');
</script>");
diff --git a/www/include/inventory/inventory_configure.php b/www/include/inventory/inventory_configure.php
index 6687ea25a034d20c68d0437d854ec0ce9fa40b89..2fd7a4429aa8950dcec78d64c89146424a78b369 100644
--- a/www/include/inventory/inventory_configure.php
+++ b/www/include/inventory/inventory_configure.php
@@ -21,7 +21,7 @@ For information : contact@oreon-project.org
$res =& $pearDB->query("SELECT * FROM inventory_manufacturer");
if (PEAR::isError($res))
- print $res->getDebugInfo()."<br>";
+ print $res->getDebugInfo()."<br />";
$manu_array = array();
$manu_array[0] = "Server";
while ($r =& $res->fetchRow())
@@ -32,9 +32,9 @@ For information : contact@oreon-project.org
$resHost =& $pearDB->query("SELECT host_name FROM host WHERE host_id = '".$r["host_id"]."'");
$rH =& $resHost->fetchRow();
if (isset($manu_array[$r["type_ressources"]]))
- print $rH["host_name"] . " - " . $manu_array[$r["type_ressources"]] . "<br>";
+ print $rH["host_name"] . " - " . $manu_array[$r["type_ressources"]] . "<br />";
else
- print $rH["host_name"] . " - " . "Not defined" . "<br>";
+ print $rH["host_name"] . " - " . "Not defined" . "<br />";
}
diff --git a/www/include/inventory/inventory_cron_update.php b/www/include/inventory/inventory_cron_update.php
index 515857655ba4615c163a4ecb8a8abded3c23163c..25f5ccd22baa7861ee88f1c5474cd47944fe24e3 100644
--- a/www/include/inventory/inventory_cron_update.php
+++ b/www/include/inventory/inventory_cron_update.php
@@ -73,7 +73,7 @@ For information : contact@oreon-project.org
$res =& $pearDB->query("SELECT debug_path, debug_inventory FROM general_opt LIMIT 1");
if (PEAR::isError($res))
- print $res->getDebugInfo()."<br>";
+ print $res->getDebugInfo()."<br />";
$debug = $res->fetchRow();
@@ -92,7 +92,7 @@ For information : contact@oreon-project.org
$resHost =& $pearDB->query("SELECT * FROM host WHERE host_register= '1'");
if (PEAR::isError($resHost))
- print $resHost->getDebugInfo()."<br>";
+ print $resHost->getDebugInfo()."<br />";
print "<table id='ListTable'>\n";
print " <tr class='ListHeader'>\n";
diff --git a/www/include/monitoring/engine/MakeXML4statusCounter.php b/www/include/monitoring/engine/MakeXML4statusCounter.php
index 3a3f797c10b4b71adc11aed69162ca385ac595bd..8b8a44a55a56dc2e775d9e06c6536f9d13ceba21 100644
--- a/www/include/monitoring/engine/MakeXML4statusCounter.php
+++ b/www/include/monitoring/engine/MakeXML4statusCounter.php
@@ -89,7 +89,7 @@ For information : contact@oreon-project.org
" WHERE session_id = '".$_POST["sid"]."'";
$DBRESULT =& $pearDB->query($sql);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
diff --git a/www/include/monitoring/engine/MakeXML_Ndo.php b/www/include/monitoring/engine/MakeXML_Ndo.php
index 2199ad8979c24ce4f6a691fdecdc2a540516c0d7..18259e669e5989e24866e787bf4057200fae24c4 100644
--- a/www/include/monitoring/engine/MakeXML_Ndo.php
+++ b/www/include/monitoring/engine/MakeXML_Ndo.php
@@ -184,7 +184,7 @@ For information : contact@oreon-project.org
$DBRESULT_OPT =& $pearDB->query("SELECT color_ok,color_warning,color_critical,color_unknown,color_pending,color_up,color_down,color_unreachable FROM general_opt");
if (PEAR::isError($DBRESULT_OPT))
- print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br />";
$DBRESULT_OPT->fetchInto($general_opt);
$tab_color_service = array();
@@ -213,7 +213,7 @@ For information : contact@oreon-project.org
" WHERE no.object_id = nhs.host_object_id";
$DBRESULT_NDO1 =& $pearDBndo->query($rq1);
if (PEAR::isError($DBRESULT_NDO1))
- print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br />";
while($DBRESULT_NDO1->fetchInto($ndo))
{
$host_status[$ndo["host_name"]] = $ndo;
@@ -279,7 +279,7 @@ For information : contact@oreon-project.org
$rq .= " LIMIT ".($num * $limit).",".$limit;
$DBRESULT_NDO =& $pearDBndo->query($rq);
if (PEAR::isError($DBRESULT_NDO))
- print "DB Error : ".$DBRESULT_NDO->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_NDO->getDebugInfo()."<br />";
$buffer .= '<reponse>';
$ct = 0;
$flag = 0;
@@ -287,7 +287,7 @@ For information : contact@oreon-project.org
/* Get Pagination Rows */
$DBRESULT_PAGINATION =& $pearDBndo->query($rq_pagination);
if (PEAR::isError($DBRESULT_PAGINATION))
- print "DB Error : ".$DBRESULT_PAGINATION->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_PAGINATION->getDebugInfo()."<br />";
$numRows = $DBRESULT_PAGINATION->numRows();
$buffer .= '<i>';
$buffer .= '<numrows>'.$numRows.'</numrows>';
diff --git a/www/include/monitoring/engine/MakeXML_Ndo_StatusCounter.php b/www/include/monitoring/engine/MakeXML_Ndo_StatusCounter.php
index 95043c09db43437335edb9d518c1fedc1a58f7ef..4367cca403c917b57d4998aa2a4191c13dc2a97d 100644
--- a/www/include/monitoring/engine/MakeXML_Ndo_StatusCounter.php
+++ b/www/include/monitoring/engine/MakeXML_Ndo_StatusCounter.php
@@ -113,7 +113,7 @@ For information : contact@oreon-project.org
" WHERE session_id = '".$_POST["sid"]."'";
$DBRESULT =& $pearDB->query($sql);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -132,7 +132,7 @@ For information : contact@oreon-project.org
$DBRESULT_OPT =& $pearDB->query("SELECT color_ok,color_warning,color_critical,color_unknown,color_pending,color_up,color_down,color_unreachable FROM general_opt");
if (PEAR::isError($DBRESULT_OPT))
- print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br />";
$DBRESULT_OPT->fetchInto($general_opt);
include_once($oreonPath . "www/DBndoConnect.php");
@@ -143,7 +143,7 @@ For information : contact@oreon-project.org
" WHERE no.object_id = nhs.host_object_id AND no.is_active = 1 GROUP BY nhs.current_state ORDER by nhs.current_state";
$DBRESULT_NDO1 =& $pearDBndo->query($rq1);
if (PEAR::isError($DBRESULT_NDO1))
- print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br />";
$host_stat = array();
$host_stat[0] = 0;
$host_stat[1] = 0;
@@ -163,7 +163,7 @@ For information : contact@oreon-project.org
$DBRESULT_NDO2 =& $pearDBndo->query($rq2);
if (PEAR::isError($DBRESULT_NDO2))
- print "DB Error : ".$DBRESULT_NDO2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_NDO2->getDebugInfo()."<br />";
$svc_stat = array();
$svc_stat[0] = 0;
diff --git a/www/include/monitoring/engine/MakeXML_Ndo_for_one_host.php b/www/include/monitoring/engine/MakeXML_Ndo_for_one_host.php
index 769f3c62dd92ea94175a6fb2df91fda97da15815..183ffbdf745e88c43e085a93a70f28cbfff4d8b7 100644
--- a/www/include/monitoring/engine/MakeXML_Ndo_for_one_host.php
+++ b/www/include/monitoring/engine/MakeXML_Ndo_for_one_host.php
@@ -183,7 +183,7 @@ For information : contact@oreon-project.org
$DBRESULT_OPT =& $pearDB->query("SELECT color_ok,color_warning,color_critical,color_unknown,color_pending,color_up,color_down,color_unreachable FROM general_opt");
if (PEAR::isError($DBRESULT_OPT))
- print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br />";
$DBRESULT_OPT->fetchInto($general_opt);
$tab_color_service = array();
@@ -245,7 +245,7 @@ For information : contact@oreon-project.org
$DBRESULT_NDO1 =& $pearDBndo->query($rq1);
if (PEAR::isError($DBRESULT_NDO1))
- print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br />";
$class = "list_one";
$ct = 0;
$flag = 0;
diff --git a/www/include/monitoring/engine/MakeXML_Ndo_for_one_svc.php b/www/include/monitoring/engine/MakeXML_Ndo_for_one_svc.php
index 328a0ded996866631159d57f771b88dc79d2432d..cd137baaf8efe9dd448ceab5f8f6d77462786e3a 100644
--- a/www/include/monitoring/engine/MakeXML_Ndo_for_one_svc.php
+++ b/www/include/monitoring/engine/MakeXML_Ndo_for_one_svc.php
@@ -183,7 +183,7 @@ For information : contact@oreon-project.org
$DBRESULT_OPT =& $pearDB->query("SELECT color_ok,color_warning,color_critical,color_unknown,color_pending,color_up,color_down,color_unreachable FROM general_opt");
// $DBRESULT_OPT =& $pearDB->query("SELECT color_ok,color_warning,color_critical,color_unknown,color_pending,color_up,color_down,color_unreachable FROM general_opt");
if (PEAR::isError($DBRESULT_OPT))
- print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br />";
$DBRESULT_OPT->fetchInto($general_opt);
$tab_color_service = array();
@@ -240,7 +240,7 @@ For information : contact@oreon-project.org
$DBRESULT_NDO1 =& $pearDBndo->query($rq1);
if (PEAR::isError($DBRESULT_NDO1))
- print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br />";
$class = "list_one";
$ct = 0;
$flag = 0;
diff --git a/www/include/monitoring/engine/MakeXML_Ndo_host.php b/www/include/monitoring/engine/MakeXML_Ndo_host.php
index 1dc6c08f55e6b5d4bd4e77156bd57955b025fdcf..98e6d42834368cea38326bfaac5c12992c7132d4 100644
--- a/www/include/monitoring/engine/MakeXML_Ndo_host.php
+++ b/www/include/monitoring/engine/MakeXML_Ndo_host.php
@@ -198,7 +198,7 @@ For information : contact@oreon-project.org
$DBRESULT_OPT =& $pearDB->query("SELECT color_ok,color_warning,color_critical,color_unknown,color_pending,color_up,color_down,color_unreachable FROM general_opt");
// $DBRESULT_OPT =& $pearDB->query("SELECT color_ok,color_warning,color_critical,color_unknown,color_pending,color_up,color_down,color_unreachable FROM general_opt");
if (PEAR::isError($DBRESULT_OPT))
- print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br />";
$DBRESULT_OPT->fetchInto($general_opt);
$tab_color_service = array();
@@ -268,7 +268,7 @@ For information : contact@oreon-project.org
/* Get Pagination Rows */
$DBRESULT_PAGINATION =& $pearDBndo->query($rq_pagination);
if (PEAR::isError($DBRESULT_PAGINATION))
- print "DB Error : ".$DBRESULT_PAGINATION->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_PAGINATION->getDebugInfo()."<br />";
$numRows = $DBRESULT_PAGINATION->numRows();
/* End Pagination Rows */
@@ -285,7 +285,7 @@ For information : contact@oreon-project.org
$buffer .= '</i>';
$DBRESULT_NDO1 =& $pearDBndo->query($rq1);
if (PEAR::isError($DBRESULT_NDO1))
- print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br />";
$class = "list_one";
$ct = 0;
$flag = 0;
diff --git a/www/include/monitoring/engine/MakeXML_Ndo_hostGroup.php b/www/include/monitoring/engine/MakeXML_Ndo_hostGroup.php
index 7bbf134c323ae000ea18f080fc0781121c81b3b9..3b2823014b1ba7ef2ac7427e20d6551655a476ce 100644
--- a/www/include/monitoring/engine/MakeXML_Ndo_hostGroup.php
+++ b/www/include/monitoring/engine/MakeXML_Ndo_hostGroup.php
@@ -173,7 +173,7 @@ For information : contact@oreon-project.org
include_once($oreonPath . "www/DBndoConnect.php");
$DBRESULT_OPT =& $pearDB->query("SELECT color_ok,color_warning,color_critical,color_unknown,color_pending,color_up,color_down,color_unreachable FROM general_opt");
if (PEAR::isError($DBRESULT_OPT))
- print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br />";
$DBRESULT_OPT->fetchInto($general_opt);
@@ -193,7 +193,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDBndo->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT->fetchInto($tab);
return($tab["nb"]);
@@ -233,7 +233,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDBndo->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT->fetchInto($tab);
return($tab["nb"]);
@@ -310,7 +310,7 @@ For information : contact@oreon-project.org
/* Get Pagination Rows */
$DBRESULT_PAGINATION =& $pearDBndo->query($rq_pagination);
if (PEAR::isError($DBRESULT_PAGINATION))
- print "DB Error : ".$DBRESULT_PAGINATION->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_PAGINATION->getDebugInfo()."<br />";
$numRows = $DBRESULT_PAGINATION->numRows();
/* End Pagination Rows */
@@ -326,7 +326,7 @@ For information : contact@oreon-project.org
$buffer .= '</i>';
$DBRESULT_NDO1 =& $pearDBndo->query($rq1);
if (PEAR::isError($DBRESULT_NDO1))
- print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br />";
$class = "list_one";
$ct = 0;
$flag = 0;
diff --git a/www/include/monitoring/engine/MakeXML_Ndo_service.php b/www/include/monitoring/engine/MakeXML_Ndo_service.php
index 80dee234eb0aa730511ef1b2ae74b12315048518..640736a907818053eb8080bc0b1cdc4c4c9e1e6b 100644
--- a/www/include/monitoring/engine/MakeXML_Ndo_service.php
+++ b/www/include/monitoring/engine/MakeXML_Ndo_service.php
@@ -198,7 +198,7 @@ For information : contact@oreon-project.org
global $pearDBO;
$DBRESULT =& $pearDBO->query("SELECT id FROM index_data WHERE host_name = '".$host_name."' AND service_description = '".$service_description."' ");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if ($DBRESULT->numRows()) {
$row =& $DBRESULT->fetchRow();
return $row["id"];
@@ -237,7 +237,7 @@ For information : contact@oreon-project.org
$DBRESULT_OPT =& $pearDB->query("SELECT color_ok,color_warning,color_critical,color_unknown,color_pending,color_up,color_down,color_unreachable FROM general_opt");
if (PEAR::isError($DBRESULT_OPT))
- print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br />";
$DBRESULT_OPT->fetchInto($general_opt);
$tab_color_service = array();
@@ -294,7 +294,7 @@ For information : contact@oreon-project.org
$DBRESULT_NDO1 =& $pearDBndo->query($rq1);
if (PEAR::isError($DBRESULT_NDO1))
- print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br />";
while($DBRESULT_NDO1->fetchInto($ndo))
{
$host_status[$ndo["host_name"]] = $ndo;
@@ -385,7 +385,7 @@ For information : contact@oreon-project.org
$rq .= " LIMIT ".($num * $limit).",".$limit;
$DBRESULT_NDO =& $pearDBndo->query($rq);
if (PEAR::isError($DBRESULT_NDO))
- print "DB Error : ".$DBRESULT_NDO->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_NDO->getDebugInfo()."<br />";
$buffer .= '<reponse>';
$ct = 0;
$flag = 0;
@@ -393,7 +393,7 @@ For information : contact@oreon-project.org
/* Get Pagination Rows */
$DBRESULT_PAGINATION =& $pearDBndo->query($rq_pagination);
if (PEAR::isError($DBRESULT_PAGINATION))
- print "DB Error : ".$DBRESULT_PAGINATION->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_PAGINATION->getDebugInfo()."<br />";
$numRows = $DBRESULT_PAGINATION->numRows();
$buffer .= '<i>';
$buffer .= '<numrows>'.$numRows.'</numrows>';
diff --git a/www/include/monitoring/engine/MakeXML_Ndo_serviceGrid.php b/www/include/monitoring/engine/MakeXML_Ndo_serviceGrid.php
index 0bfffc80c1a0d28ec3dcda4838d4452fe3324d08..3f86fdb060fc9ed6483f198ea5bb96576c3771a3 100644
--- a/www/include/monitoring/engine/MakeXML_Ndo_serviceGrid.php
+++ b/www/include/monitoring/engine/MakeXML_Ndo_serviceGrid.php
@@ -190,7 +190,7 @@ For information : contact@oreon-project.org
$DBRESULT_OPT =& $pearDB->query("SELECT color_ok,color_warning,color_critical,color_unknown,color_pending,color_up,color_down,color_unreachable FROM general_opt");
if (PEAR::isError($DBRESULT_OPT))
- print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br />";
$DBRESULT_OPT->fetchInto($general_opt);
@@ -233,7 +233,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDBndo->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tab = array();
while($DBRESULT->fetchInto($svc)){
@@ -321,7 +321,7 @@ For information : contact@oreon-project.org
/* Get Pagination Rows */
$DBRESULT_PAGINATION =& $pearDBndo->query($rq_pagination);
if (PEAR::isError($DBRESULT_PAGINATION))
- print "DB Error : ".$DBRESULT_PAGINATION->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_PAGINATION->getDebugInfo()."<br />";
$numRows = $DBRESULT_PAGINATION->numRows();
/* End Pagination Rows */
@@ -343,7 +343,7 @@ For information : contact@oreon-project.org
$buffer .= '</i>';
$DBRESULT_NDO1 =& $pearDBndo->query($rq1);
if (PEAR::isError($DBRESULT_NDO1))
- print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br />";
$class = "list_one";
$ct = 0;
$flag = 0;
diff --git a/www/include/monitoring/engine/MakeXML_Ndo_serviceGridByHG.php b/www/include/monitoring/engine/MakeXML_Ndo_serviceGridByHG.php
index 2d7c9830f6a13d03e17739002ffc779b38bd5c2a..f9993bc413404543b5a9fbd4e477e51778236216 100644
--- a/www/include/monitoring/engine/MakeXML_Ndo_serviceGridByHG.php
+++ b/www/include/monitoring/engine/MakeXML_Ndo_serviceGridByHG.php
@@ -175,7 +175,7 @@ For information : contact@oreon-project.org
include_once($oreonPath . "www/DBndoConnect.php");
$DBRESULT_OPT =& $pearDB->query("SELECT color_ok,color_warning,color_critical,color_unknown,color_pending,color_up,color_down,color_unreachable FROM general_opt");
if (PEAR::isError($DBRESULT_OPT))
- print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br />";
$DBRESULT_OPT->fetchInto($general_opt);
function get_services($host_name){
@@ -213,7 +213,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDBndo->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tab = array();
while($DBRESULT->fetchInto($svc)){
@@ -323,7 +323,7 @@ $rq_pagination = $rq1;
/* Get Pagination Rows */
$DBRESULT_PAGINATION =& $pearDBndo->query($rq_pagination);
if (PEAR::isError($DBRESULT_PAGINATION))
- print "DB Error : ".$DBRESULT_PAGINATION->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_PAGINATION->getDebugInfo()."<br />";
$numRows = $DBRESULT_PAGINATION->numRows();
/* End Pagination Rows */
@@ -355,7 +355,7 @@ exit();
$buffer .= '</i>';
$DBRESULT_NDO1 =& $pearDBndo->query($rq1);
if (PEAR::isError($DBRESULT_NDO1))
- print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br />";
$class = "list_one";
$ct = 0;
$flag = 0;
diff --git a/www/include/monitoring/engine/MakeXML_Ndo_serviceGridBySG.php b/www/include/monitoring/engine/MakeXML_Ndo_serviceGridBySG.php
index b1b9b862809fb508ed2e7068e4c2fb773011737e..c2254e2de8f86af5abe19bb74f2109f31350292f 100644
--- a/www/include/monitoring/engine/MakeXML_Ndo_serviceGridBySG.php
+++ b/www/include/monitoring/engine/MakeXML_Ndo_serviceGridBySG.php
@@ -189,7 +189,7 @@ For information : contact@oreon-project.org
include_once("common_ndo_func.php");
$DBRESULT_OPT =& $pearDB->query("SELECT color_ok,color_warning,color_critical,color_unknown,color_pending,color_up,color_down,color_unreachable FROM general_opt");
if (PEAR::isError($DBRESULT_OPT))
- print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br />";
$DBRESULT_OPT->fetchInto($general_opt);
function get_services($host_name){
@@ -229,7 +229,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDBndo->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tab = array();
while($DBRESULT->fetchInto($svc)){
@@ -315,7 +315,7 @@ For information : contact@oreon-project.org
/* Get Pagination Rows */
$DBRESULT_PAGINATION =& $pearDBndo->query($rq_pagination);
if (PEAR::isError($DBRESULT_PAGINATION))
- print "DB Error : ".$DBRESULT_PAGINATION->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_PAGINATION->getDebugInfo()."<br />";
$numRows = $DBRESULT_PAGINATION->numRows();
/* End Pagination Rows */
@@ -349,7 +349,7 @@ For information : contact@oreon-project.org
$DBRESULT_NDO1 =& $pearDBndo->query($rq1);
if (PEAR::isError($DBRESULT_NDO1))
- print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br />";
$class = "list_one";
$ct = 0;
$flag = 0;
diff --git a/www/include/monitoring/engine/MakeXML_Ndo_serviceSchedule.php b/www/include/monitoring/engine/MakeXML_Ndo_serviceSchedule.php
index 6b6d269c16ec522671a0b31095956e5d1a433518..3425b2905c1764b3e4957ee3f8ff18fd9374a014 100644
--- a/www/include/monitoring/engine/MakeXML_Ndo_serviceSchedule.php
+++ b/www/include/monitoring/engine/MakeXML_Ndo_serviceSchedule.php
@@ -225,7 +225,7 @@ For information : contact@oreon-project.org
$DBRESULT_OPT =& $pearDB->query("SELECT color_ok,color_warning,color_critical,color_unknown,color_pending,color_up,color_down,color_unreachable FROM general_opt");
if (PEAR::isError($DBRESULT_OPT))
- print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br />";
$DBRESULT_OPT->fetchInto($general_opt);
$tab_color_service = array();
@@ -265,7 +265,7 @@ For information : contact@oreon-project.org
$DBRESULT_NDO1 =& $pearDBndo->query($rq1);
if (PEAR::isError($DBRESULT_NDO1))
- print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br />";
while($DBRESULT_NDO1->fetchInto($ndo))
{
$host_status[$ndo["host_name"]] = $ndo;
@@ -345,7 +345,7 @@ For information : contact@oreon-project.org
$rq .= " LIMIT ".($num * $limit).",".$limit;
$DBRESULT_NDO =& $pearDBndo->query($rq);
if (PEAR::isError($DBRESULT_NDO))
- print "DB Error : ".$DBRESULT_NDO->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_NDO->getDebugInfo()."<br />";
$buffer .= '<reponse>';
$ct = 0;
$flag = 0;
@@ -353,7 +353,7 @@ For information : contact@oreon-project.org
/* Get Pagination Rows */
$DBRESULT_PAGINATION =& $pearDBndo->query($rq_pagination);
if (PEAR::isError($DBRESULT_PAGINATION))
- print "DB Error : ".$DBRESULT_PAGINATION->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_PAGINATION->getDebugInfo()."<br />";
$numRows = $DBRESULT_PAGINATION->numRows();
$buffer .= '<i>';
$buffer .= '<numrows>'.$numRows.'</numrows>';
diff --git a/www/include/monitoring/engine/MakeXML_Ndo_serviceSummary.php b/www/include/monitoring/engine/MakeXML_Ndo_serviceSummary.php
index 87c221f6efce1ec12359eef6076a43d21009bf26..4920ffe0db507ac29225bfcc02013bdfc1423144 100644
--- a/www/include/monitoring/engine/MakeXML_Ndo_serviceSummary.php
+++ b/www/include/monitoring/engine/MakeXML_Ndo_serviceSummary.php
@@ -190,7 +190,7 @@ For information : contact@oreon-project.org
$DBRESULT_OPT =& $pearDB->query("SELECT color_ok,color_warning,color_critical,color_unknown,color_pending,color_up,color_down,color_unreachable FROM general_opt");
if (PEAR::isError($DBRESULT_OPT))
- print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br />";
$DBRESULT_OPT->fetchInto($general_opt);
@@ -220,7 +220,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDBndo->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT->fetchInto($tab);
return($tab["nb"]);
@@ -297,7 +297,7 @@ For information : contact@oreon-project.org
/* Get Pagination Rows */
$DBRESULT_PAGINATION =& $pearDBndo->query($rq_pagination);
if (PEAR::isError($DBRESULT_PAGINATION))
- print "DB Error : ".$DBRESULT_PAGINATION->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_PAGINATION->getDebugInfo()."<br />";
$numRows = $DBRESULT_PAGINATION->numRows();
/* End Pagination Rows */
@@ -314,7 +314,7 @@ For information : contact@oreon-project.org
$DBRESULT_NDO1 =& $pearDBndo->query($rq1);
if (PEAR::isError($DBRESULT_NDO1))
- print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br />";
$class = "list_one";
$ct = 0;
$flag = 0;
diff --git a/www/include/monitoring/engine/MakeXML_Ndo_serviceSummaryByHG.php b/www/include/monitoring/engine/MakeXML_Ndo_serviceSummaryByHG.php
index 0274ae7664b06a16aed5c698c2fefe460fb91383..cf0771bfb3d23e2a002c3cdb69613d9ec0b988f6 100644
--- a/www/include/monitoring/engine/MakeXML_Ndo_serviceSummaryByHG.php
+++ b/www/include/monitoring/engine/MakeXML_Ndo_serviceSummaryByHG.php
@@ -188,7 +188,7 @@ For information : contact@oreon-project.org
$DBRESULT_OPT =& $pearDB->query("SELECT color_ok,color_warning,color_critical,color_unknown,color_pending,color_up,color_down,color_unreachable FROM general_opt");
if (PEAR::isError($DBRESULT_OPT))
- print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br />";
$DBRESULT_OPT->fetchInto($general_opt);
function get_services_status($host_name, $status){
@@ -222,7 +222,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDBndo->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT->fetchInto($tab);
return($tab["nb"]);
@@ -297,7 +297,7 @@ For information : contact@oreon-project.org
/* Get Pagination Rows */
$DBRESULT_PAGINATION =& $pearDBndo->query($rq_pagination);
if (PEAR::isError($DBRESULT_PAGINATION))
- print "DB Error : ".$DBRESULT_PAGINATION->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_PAGINATION->getDebugInfo()."<br />";
$numRows = $DBRESULT_PAGINATION->numRows();
/* End Pagination Rows */
@@ -320,7 +320,7 @@ For information : contact@oreon-project.org
$buffer .= '</i>';
$DBRESULT_NDO1 =& $pearDBndo->query($rq1);
if (PEAR::isError($DBRESULT_NDO1))
- print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br />";
$class = "list_one";
$ct = 0;
$flag = 0;
diff --git a/www/include/monitoring/engine/MakeXML_Ndo_serviceSummaryBySG.php b/www/include/monitoring/engine/MakeXML_Ndo_serviceSummaryBySG.php
index b25ea291cba11441788c8e79b4d24d9cb85f68d6..b7f70845b9a74e351a99f0d3c6642a19058e26fe 100644
--- a/www/include/monitoring/engine/MakeXML_Ndo_serviceSummaryBySG.php
+++ b/www/include/monitoring/engine/MakeXML_Ndo_serviceSummaryBySG.php
@@ -173,7 +173,7 @@ For information : contact@oreon-project.org
include_once("common_ndo_func.php");
$DBRESULT_OPT =& $pearDB->query("SELECT color_ok,color_warning,color_critical,color_unknown,color_pending,color_up,color_down,color_unreachable FROM general_opt");
if (PEAR::isError($DBRESULT_OPT))
- print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br />";
$DBRESULT_OPT->fetchInto($general_opt);
function get_services($host_name){
@@ -207,7 +207,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDBndo->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tab = array();
while($DBRESULT->fetchInto($svc)){
@@ -279,7 +279,7 @@ For information : contact@oreon-project.org
/* Get Pagination Rows */
$DBRESULT_PAGINATION =& $pearDBndo->query($rq_pagination);
if (PEAR::isError($DBRESULT_PAGINATION))
- print "DB Error : ".$DBRESULT_PAGINATION->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_PAGINATION->getDebugInfo()."<br />";
$numRows = $DBRESULT_PAGINATION->numRows();
/* End Pagination Rows */
@@ -308,7 +308,7 @@ For information : contact@oreon-project.org
$DBRESULT_NDO1 =& $pearDBndo->query($rq1);
if (PEAR::isError($DBRESULT_NDO1))
- print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br />";
$class = "list_one";
$ct = 0;
$flag = 0;
diff --git a/www/include/monitoring/engine/common_ndo_func.php b/www/include/monitoring/engine/common_ndo_func.php
index 9e1d578d9be60e264508973a92171023e1dcf82d..a1522d142b1b934e3a4eb0ebc1a9eb8204f7c3dc 100644
--- a/www/include/monitoring/engine/common_ndo_func.php
+++ b/www/include/monitoring/engine/common_ndo_func.php
@@ -25,7 +25,7 @@ function get_Host_Status($host_name,$pearDBndo,$general_opt){
$DBRESULT =& $pearDBndo->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$status = array();
// $status[0] = array();
// $status[0]["current_state"] = "0";
diff --git a/www/include/monitoring/engine/set_session_history.php b/www/include/monitoring/engine/set_session_history.php
index 3b1ef89878c13754039640f5cffb89e22d569a28..dc23ab3f543f3aacabaedb3f5bf3a3488286985a 100644
--- a/www/include/monitoring/engine/set_session_history.php
+++ b/www/include/monitoring/engine/set_session_history.php
@@ -26,10 +26,10 @@ if(isset($_POST["sid"])){
$path = '/srv/oreon/www';
set_include_path(get_include_path() . PATH_SEPARATOR . $path);
// dossier courant
-//echo getcwd() . "<br>";
+//echo getcwd() . "<br />";
chdir('/srv/oreon/www');
// dossier courant
-//echo getcwd() . "<br>";
+//echo getcwd() . "<br />";
require_once("class/Oreon.class.php");
session_id($sid);
diff --git a/www/include/monitoring/engine/tmp.php b/www/include/monitoring/engine/tmp.php
index d313ec7e9af938fea0e5277144496a1b3e4449c2..88ccb6aa2c1d4045fccb40a1b71e9fc5650a38ff 100644
--- a/www/include/monitoring/engine/tmp.php
+++ b/www/include/monitoring/engine/tmp.php
@@ -189,7 +189,7 @@ For information : contact@oreon-project.org
$DBRESULT_OPT =& $pearDB->query("SELECT color_ok,color_warning,color_critical,color_unknown,color_pending,color_up,color_down,color_unreachable FROM general_opt");
if (PEAR::isError($DBRESULT_OPT))
- print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br />";
$DBRESULT_OPT->fetchInto($general_opt);
$tab_color_service = array();
@@ -215,7 +215,7 @@ For information : contact@oreon-project.org
" WHERE no.object_id = nhs.host_object_id GROUP BY nhs.current_state ORDER by nhs.current_state";
$DBRESULT_NDO1 =& $pearDBndo->query($rq1);
if (PEAR::isError($DBRESULT_NDO1))
- print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br />";
$host_stat = array();
$host_stat[0] = 0;
$host_stat[1] = 0;
@@ -237,7 +237,7 @@ For information : contact@oreon-project.org
$DBRESULT_NDO2 =& $pearDBndo->query($rq2);
if (PEAR::isError($DBRESULT_NDO2))
- print "DB Error : ".$DBRESULT_NDO2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_NDO2->getDebugInfo()."<br />";
$svc_stat = array();
$svc_stat[0] = 0;
diff --git a/www/include/monitoring/external_cmd/launch_cmd.php b/www/include/monitoring/external_cmd/launch_cmd.php
index 6366471fac26ae85da0a81f1fe89488e975e13df..78f6ef7b3448f3909c89a54de8ea73eaa358cb76 100644
--- a/www/include/monitoring/external_cmd/launch_cmd.php
+++ b/www/include/monitoring/external_cmd/launch_cmd.php
@@ -21,7 +21,7 @@ For information : contact@oreon-project.org
function reschedule_chk_host($oreon, $id)
{
?>
- <br><br>
+ <br /><br />
<table border=0 width="35%" height="50%">
<tr>
<td>
@@ -54,7 +54,7 @@ For information : contact@oreon-project.org
<td><textarea name="cmt[comment]" cols="40" rows="7"></textarea></td>
</tr>
<tr>
- <td colspan="2" align="center"><br><bR><br> <input name="envoyer" type="submit"></td>
+ <td colspan="2" align="center"><br /><br /><br /> <input name="envoyer" type="submit"></td>
</tr>
</table>
<?phpinclude("./tab3Bot.php"); ?></form>
diff --git a/www/include/monitoring/external_cmd/templates/comments.ihtml b/www/include/monitoring/external_cmd/templates/comments.ihtml
index df84c34cd14c76a8eb6afba5064cd4cf070e4dd3..5c10313e2311ee27c67aa50d46279bed1533c628 100644
--- a/www/include/monitoring/external_cmd/templates/comments.ihtml
+++ b/www/include/monitoring/external_cmd/templates/comments.ihtml
@@ -1,9 +1,9 @@
<script type="text/javascript" src="./include/common/javascript/tool.js"></script>
<form action="" method='GET'>
<hidden name="p" value='{$p}'>
- <table class="ListTable"><tr class='ListHeader'><td> <img src='./img/icones/16x16/messages.gif'> {$lang.cmt_host_comment}</td>{if !$nb_comments_host}<td align='right'><a href="{$msgh.addL}">{$msgh.addT}</a></td>{/if}</tr></table><br>
+ <table class="ListTable"><tr class='ListHeader'><td> <img src='./img/icones/16x16/messages.gif'> {$lang.cmt_host_comment}</td>{if !$nb_comments_host}<td align='right'><a href="{$msgh.addL}">{$msgh.addT}</a></td>{/if}</tr></table><br />
{if $nb_comments_host}
- <br>
+ <br />
<table class="ListTable">
<tr class='ListHeader'>
<td class="ListColHeaderPicker"><input type="checkbox" name="checkall" onclick="checkUncheckAll(this);"/></td>
@@ -36,9 +36,9 @@
{/if}
{$form.hidden}
</form>
- <table class="ListTable"><tr class='ListHeader'><td> <img src='./img/icones/16x16/messages.gif'> {$lang.cmt_service_comment}</td>{if !$nb_comments_svc}<td align='right'><a href="{$msgs.addL}">{$msgs.addT}</a></td>{/if}</tr></table><br>
+ <table class="ListTable"><tr class='ListHeader'><td> <img src='./img/icones/16x16/messages.gif'> {$lang.cmt_service_comment}</td>{if !$nb_comments_svc}<td align='right'><a href="{$msgs.addL}">{$msgs.addT}</a></td>{/if}</tr></table><br />
{if $nb_comments_svc}
- <br>
+ <br />
<form action="" method='GET'>
<table class="ListTable">
<tr class='ListHeader'>
diff --git a/www/include/monitoring/external_cmd/templates/downtime.ihtml b/www/include/monitoring/external_cmd/templates/downtime.ihtml
index d00664dd5dc804214062b988ba7c491daf9b5492..f907b7f100a2057ef0fd6514171bcda2d1f10376 100644
--- a/www/include/monitoring/external_cmd/templates/downtime.ihtml
+++ b/www/include/monitoring/external_cmd/templates/downtime.ihtml
@@ -1,7 +1,7 @@
<script type="text/javascript" src="./include/common/javascript/tool.js"></script>
<form action="" method='GET'>
<hidden name="p" value='{$p}'>
- <table class="ListTable"><tr class='ListHeader'><td> <img src='./img/icones/16x16/warning.gif'> {$lang.dtm_host_downtimes}</td>{if !$nb_downtime_host}<td align='right'><a href="{$msgh.addL}">{$msgh.addT}</a></td>{/if}</tr></table><br><br>
+ <table class="ListTable"><tr class='ListHeader'><td> <img src='./img/icones/16x16/warning.gif'> {$lang.dtm_host_downtimes}</td>{if !$nb_downtime_host}<td align='right'><a href="{$msgh.addL}">{$msgh.addT}</a></td>{/if}</tr></table><br /><br />
{if $nb_downtime_host}
<table class="ListTable">
<tr class='ListHeader'>
@@ -39,7 +39,7 @@
<center><b>{$lang.no_host_dtm}</b></center>
{/if}
</form>
- <table class="ListTable"><tr class='ListHeader'><td> <img src='./img/icones/16x16/warning.gif'> {$lang.dtm_service_downtimes}</td>{if !$nb_downtime_svc}<td align='right'><a href="{$msgs.addL}">{$msgs.addT}</a></td>{/if}</tr></table><br><br>
+ <table class="ListTable"><tr class='ListHeader'><td> <img src='./img/icones/16x16/warning.gif'> {$lang.dtm_service_downtimes}</td>{if !$nb_downtime_svc}<td align='right'><a href="{$msgs.addL}">{$msgs.addT}</a></td>{/if}</tr></table><br /><br />
{if $nb_downtime_svc}
<form action="" method='GET'>
<table class="ListTable">
diff --git a/www/include/monitoring/load_status_log.php b/www/include/monitoring/load_status_log.php
index efe21be27b879e979905d500a6cb5d43887a8d0e..c66e572c2605aefefa27993b4c7d48f784e6895f 100644
--- a/www/include/monitoring/load_status_log.php
+++ b/www/include/monitoring/load_status_log.php
@@ -32,14 +32,14 @@ For information : contact@oreon-project.org
// Is User Admin ?
$DBRESULT1 =& $pearDB->query("SELECT contact_admin FROM contact, session WHERE contact.contact_id = session.user_id AND session_id = '$sid'");
if (PEAR::isError($DBRESULT1))
- print "DB Error : ".$DBRESULT1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT1->getDebugInfo()."<br />";
$DBRESULT1->fetchInto($user);
$user_admin = $user["contact_admin"];
// Read
$DBRESULT1 =& $pearDB->query("SELECT * FROM general_opt");
if (PEAR::isError($DBRESULT1))
- print "DB Error : ".$DBRESULT1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT1->getDebugInfo()."<br />";
$DBRESULT1->fetchInto($general_opt);
$version = $general_opt["nagios_version"];
@@ -55,13 +55,13 @@ For information : contact@oreon-project.org
if (isset($session_id) && $session_id){
$DBRESULT =& $pearDB->query("SELECT * FROM session WHERE session_id = '".$session_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if($session =& $DBRESULT->fetchRow()){
$time_limit = time() - $general_opt["session_expire"] * 60;
if ($session["last_reload"] >= $time_limit){
$DBRESULT2 =& $pearDB->query("UPDATE `session` SET `last_reload` = '".time()."', `ip_address` = '".$_SERVER["REMOTE_ADDR"]."' WHERE CONVERT( `session_id` USING utf8 ) = '".$session_id."' LIMIT 1");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
}
}
@@ -89,7 +89,7 @@ For information : contact@oreon-project.org
if (isset($pearDBO))
$DBRESULT =& $pearDBO->query("SELECT fast_parsing FROM config");
if (PEAR::isError($DBRESULT)){
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$fast_parsing = 0;
} else {
$DBRESULT->fetchInto($config);
@@ -101,7 +101,7 @@ For information : contact@oreon-project.org
# Read File
$DBRESULT1 =& $pearDB->query("SELECT status_file FROM cfg_nagios WHERE nagios_activate = '1'");
if (PEAR::isError($DBRESULT1))
- print "DB Error : ".$DBRESULT1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT1->getDebugInfo()."<br />";
$DBRESULT1->fetchInto($nagios_cfg);
if (($version == 1 || $version == 2) && $fast_parsing == 0)
@@ -118,7 +118,7 @@ For information : contact@oreon-project.org
$hostgroup = array();
$DBRESULT1 =& $pearDB->query("SELECT host_name FROM host, hostgroup, hostgroup_relation WHERE hostgroup.hg_name = '".$hg_name."' AND hostgroup_relation.hostgroup_hg_id = hostgroup.hg_id AND host.host_id = hostgroup_relation.host_host_id");
if (PEAR::isError($DBRESULT1))
- print "DB Error : ".$DBRESULT1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT1->getDebugInfo()."<br />";
while ($DBRESULT1->fetchInto($h))
$hostgroup[$h["host_name"]] = 1;
unset($h);
diff --git a/www/include/monitoring/log/templates/viewAlertLog.ihtml b/www/include/monitoring/log/templates/viewAlertLog.ihtml
index 27f42bc31c145fac18aeedd10f5d6e0eb2386933..6c16d938923aed033652b16b11aa2d4558c75229 100644
--- a/www/include/monitoring/log/templates/viewAlertLog.ihtml
+++ b/www/include/monitoring/log/templates/viewAlertLog.ihtml
@@ -9,7 +9,7 @@
{$form.hidden}
</form>
</div>
-<br><br>
+<br /><br />
<div>
<ul id="mainnav">
<li class="a" id='c1'><a href="#" onclick="javascript:montre('1');">Hosts Alerts</a></li>
@@ -62,4 +62,4 @@
{/foreach}
</table>
</div>
-<br><br><br>
\ No newline at end of file
+<br /><br /><br />
\ No newline at end of file
diff --git a/www/include/monitoring/log/templates/viewLog.ihtml b/www/include/monitoring/log/templates/viewLog.ihtml
index c3207646cbd45b9fbe3e38d612b8e3d64ee137c9..8faa03ba489d9f387591cd0e94f19d179ae68cbc 100644
--- a/www/include/monitoring/log/templates/viewLog.ihtml
+++ b/www/include/monitoring/log/templates/viewLog.ihtml
@@ -9,7 +9,7 @@
{$form.hidden}
</form>
</div>
- <br><br><br>
+ <br /><br /><br />
<div>
<table class="ListTable">
<tr class='ListHeader'>
diff --git a/www/include/monitoring/log/templates/viewNotifyLog.ihtml b/www/include/monitoring/log/templates/viewNotifyLog.ihtml
index 18f1e469c8f74ff8186c1743e6149c973e8481d3..6a70adee6c98c8c8f934d07317f1b56ab3267a0a 100644
--- a/www/include/monitoring/log/templates/viewNotifyLog.ihtml
+++ b/www/include/monitoring/log/templates/viewNotifyLog.ihtml
@@ -9,7 +9,7 @@
{$form.hidden}
</form>
</div>
-<br><br>
+<br /><br />
<div>
<ul id="mainnav">
<li class="a" id='c1'><a href="#" onclick="javascript:montre('1');">Hosts Notifications</a></li>
@@ -70,4 +70,4 @@
{/foreach}
</table>
</div>
-<br><br><br>
\ No newline at end of file
+<br /><br /><br />
\ No newline at end of file
diff --git a/www/include/monitoring/log/templates/viewWarnLog.ihtml b/www/include/monitoring/log/templates/viewWarnLog.ihtml
index ae9a67bc69b0d4b4989f6ae9db96f5c8c1e2cc8b..de845e769db0533d258b0c305b94429b82189992 100644
--- a/www/include/monitoring/log/templates/viewWarnLog.ihtml
+++ b/www/include/monitoring/log/templates/viewWarnLog.ihtml
@@ -9,7 +9,7 @@
{$form.hidden}
</form>
</div>
- <br><br><br>
+ <br /><br /><br />
<div>
<table class="ListTable">
<tr class='ListHeader'>
@@ -30,4 +30,4 @@
{/foreach}
</table>
</div>
-<br><br><br>
\ No newline at end of file
+<br /><br /><br />
\ No newline at end of file
diff --git a/www/include/monitoring/log/viewAlertLog.php b/www/include/monitoring/log/viewAlertLog.php
index 15ffe4fbb35a345c03d3379956d4da826dbaa550..b5312a65996ec563820f9a249c686f8371f9d646 100644
--- a/www/include/monitoring/log/viewAlertLog.php
+++ b/www/include/monitoring/log/viewAlertLog.php
@@ -55,7 +55,7 @@ For information : contact@oreon-project.org
$log = fopen($oreon->Nagioscfg["log_archive_path"] . $_POST["file"], "r");
} else {
if (file_exists($oreon->Nagioscfg["log_file"]) && !($log = fopen($oreon->Nagioscfg["log_file"], "r")))
- echo $lang["pel_cant_open"] . $oreon->Nagioscfg["log_file"] . "<br>";
+ echo $lang["pel_cant_open"] . $oreon->Nagioscfg["log_file"] . "<br />";
}
if ($log)
for ($i = 0; $str = fgets($log); $i++){
diff --git a/www/include/monitoring/log/viewLog.php b/www/include/monitoring/log/viewLog.php
index 8de290497ed817881ce414fa723a6033f56381ba..148b4e2215b7ccdb0590fcae4a91b8102b49a370 100644
--- a/www/include/monitoring/log/viewLog.php
+++ b/www/include/monitoring/log/viewLog.php
@@ -60,7 +60,7 @@ For information : contact@oreon-project.org
$log = fopen($oreon->Nagioscfg["log_archive_path"] . $_POST["file"], "r");
else
if (file_exists($oreon->Nagioscfg["log_file"]) && !($log = fopen($oreon->Nagioscfg["log_file"], "r")))
- echo $lang["pel_cant_open"] . $oreon->Nagioscfg["log_file"] . "<br>";
+ echo $lang["pel_cant_open"] . $oreon->Nagioscfg["log_file"] . "<br />";
if (isset($log))
diff --git a/www/include/monitoring/log/viewNotifyLog.php b/www/include/monitoring/log/viewNotifyLog.php
index 52604cf0487035b7662e659ccf40285897ec15cd..6ae7b1a617517736d2ad8803906cc208f2e090fc 100644
--- a/www/include/monitoring/log/viewNotifyLog.php
+++ b/www/include/monitoring/log/viewNotifyLog.php
@@ -41,7 +41,7 @@ For information : contact@oreon-project.org
$log = fopen($oreon->Nagioscfg["log_archive_path"] . $_POST["file"], "r");
} else {
if (file_exists($oreon->Nagioscfg["log_file"]) && !($log = fopen($oreon->Nagioscfg["log_file"], "r")))
- echo $lang["pel_cant_open"] . $oreon->Nagioscfg["log_file"] . "<br>";
+ echo $lang["pel_cant_open"] . $oreon->Nagioscfg["log_file"] . "<br />";
}
if ($log)
for ($i = 0; $str = fgets($log); $i++){
diff --git a/www/include/monitoring/log/viewWarnLog.php b/www/include/monitoring/log/viewWarnLog.php
index 9353be25240bbfb57c2768bb3cca3f09adb649a8..85d9e3c7a61555de0652ddeec999f243c4010615 100644
--- a/www/include/monitoring/log/viewWarnLog.php
+++ b/www/include/monitoring/log/viewWarnLog.php
@@ -37,7 +37,7 @@ For information : contact@oreon-project.org
$log = fopen($oreon->Nagioscfg["log_archive_path"] . $_POST["file"], "r");
else{
if (file_exists($oreon->Nagioscfg["log_file"]) && !($log = fopen($oreon->Nagioscfg["log_file"], "r")))
- echo $lang["pel_cant_open"] . $oreon->Nagioscfg["log_file"] . "<br>";
+ echo $lang["pel_cant_open"] . $oreon->Nagioscfg["log_file"] . "<br />";
}
if ($log)
for ($i = 0; $str = fgets($log); $i++){
diff --git a/www/include/monitoring/mysql_log/templates/viewAlerts.ihtml b/www/include/monitoring/mysql_log/templates/viewAlerts.ihtml
index ca60efaa48f89e096cb32c6c37a24d149d6c700e..6d72a3cb2471e2cf6a67388949a43b392a6f3a12 100644
--- a/www/include/monitoring/mysql_log/templates/viewAlerts.ihtml
+++ b/www/include/monitoring/mysql_log/templates/viewAlerts.ihtml
@@ -22,7 +22,7 @@
<td class="ListColCenter" colspan="2">{$form.ssubmit.html} {$form.reset.html}</td>
</tr>
</table>
-<br>
+<br />
<table class="Toolbar_TableTop">
<tr class="Toolbar_TR_Top">
{php}include('./include/monitoring/mysql_log/pagination.php');{/php}
diff --git a/www/include/monitoring/mysql_log/templates/viewErrors.ihtml b/www/include/monitoring/mysql_log/templates/viewErrors.ihtml
index 1111a1824b7d988593ccd5f9f4581463414a5349..972f91ec265e77540c7f00fa66ba510211c8980c 100644
--- a/www/include/monitoring/mysql_log/templates/viewErrors.ihtml
+++ b/www/include/monitoring/mysql_log/templates/viewErrors.ihtml
@@ -12,7 +12,7 @@
<td class="ListColCenter" colspan="2">{$form.submit.html} {$form.reset.html}</td>
</tr>
</table>
-<br>
+<br />
<table class="Toolbar_TableTop">
<tr class="Toolbar_TR_Top">
{php}
diff --git a/www/include/monitoring/mysql_log/templates/viewLog.ihtml b/www/include/monitoring/mysql_log/templates/viewLog.ihtml
index 458f0717898a24816c0dba3d6a95dcee22e4773b..d47027b2205e9c239e1db9a2842f866ff697e10d 100644
--- a/www/include/monitoring/mysql_log/templates/viewLog.ihtml
+++ b/www/include/monitoring/mysql_log/templates/viewLog.ihtml
@@ -15,7 +15,7 @@
<td class="ListColCenter">{$form.ssubmit.html} {$form.reset.html}</td>
</tr>
</table>
-<br>
+<br />
<table class="Toolbar_TableTop">
<tr class="Toolbar_TR_Top">
{php}
diff --git a/www/include/monitoring/mysql_log/templates/viewNotifications.ihtml b/www/include/monitoring/mysql_log/templates/viewNotifications.ihtml
index 9f250c2d35c2ba9626070ad6f1399b2693981f94..4049eb6b560336c924d5b5ce00527bada64d94df 100644
--- a/www/include/monitoring/mysql_log/templates/viewNotifications.ihtml
+++ b/www/include/monitoring/mysql_log/templates/viewNotifications.ihtml
@@ -19,7 +19,7 @@
<td class="ListColCenter" colspan="2">{$form.ssubmit.html} {$form.reset.html}</td>
</tr>
</table>
-<br>
+<br />
<table class="Toolbar_TableTop">
<tr class="Toolbar_TR_Top">
{php}include('./include/monitoring/mysql_log/pagination.php');{/php}
diff --git a/www/include/monitoring/mysql_log_2/GetODSXmlLog.php b/www/include/monitoring/mysql_log_2/GetODSXmlLog.php
index 911666a1a9e898ed9f07971b42aa7849573e6899..3eced9dd55e9f210392437874d3bb50a5307722e 100644
--- a/www/include/monitoring/mysql_log_2/GetODSXmlLog.php
+++ b/www/include/monitoring/mysql_log_2/GetODSXmlLog.php
@@ -56,7 +56,7 @@ function get_user_param($user_id, $pearDB)
$tab_row = array();
$DBRESULT =& $pearDB->query("SELECT * FROM contact_param where cp_contact_id = '".$user_id."'");
if (PEAR::isError($DBRESULT)){
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
return null;
}
while( $row = $DBRESULT->fetchRow()){
@@ -71,7 +71,7 @@ function set_user_param($user_id, $pearDB, $key, $value)
$DBRESULT =& $pearDB->query("UPDATE contact_param set cp_value ='".$value."' where cp_contact_id like '".$user_id."' AND cp_key like '".$key."' ");
if (PEAR::isError($DBRESULT)) {
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -142,7 +142,7 @@ include_once($oreonPath . "www/include/common/common-Func.php");
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT host_id FROM host h, host_service_relation hs WHERE h.host_id = hs.host_host_id AND hs.service_service_id = '".$svc_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if ($DBRESULT->numRows()) {
$row =& $DBRESULT->fetchRow();
return $row["host_id"];
@@ -313,7 +313,7 @@ include_once($oreonPath . "www/include/common/common-Func.php");
$DBRESULT_OPT =& $pearDB->query("SELECT color_ok,color_warning,color_critical,color_unknown,color_pending,color_up,color_down,color_unreachable FROM general_opt");
if (PEAR::isError($DBRESULT_OPT))
- print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_OPT->getDebugInfo()."<br />";
$DBRESULT_OPT->fetchInto($general_opt);
$tab_color_service = array();
diff --git a/www/include/monitoring/mysql_log_2/viewLog.php b/www/include/monitoring/mysql_log_2/viewLog.php
index 7eca32a206712fd8e4e51bde870446f703690bba..bc1e45ecf469a16620b3ae0830bd9b739afde13f 100644
--- a/www/include/monitoring/mysql_log_2/viewLog.php
+++ b/www/include/monitoring/mysql_log_2/viewLog.php
@@ -25,7 +25,7 @@ For information : contact@oreon-project.org
$tab_row = array();
$DBRESULT =& $pearDB->query("SELECT * FROM contact_param where cp_contact_id = '".$user_id."'");
if (PEAR::isError($DBRESULT)){
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
return null;
}
while( $row = $DBRESULT->fetchRow()){
diff --git a/www/include/monitoring/objectDetails/hostDetails.ihtml b/www/include/monitoring/objectDetails/hostDetails.ihtml
index beb04f964dc53a747e95f093d6c0ee0de1619b00..0e7c39c139a2c1311d5eee102cf6c130c51a3d28 100644
--- a/www/include/monitoring/objectDetails/hostDetails.ihtml
+++ b/www/include/monitoring/objectDetails/hostDetails.ihtml
@@ -21,7 +21,7 @@
</td>
</tr>
</table>
- <br>
+ <br />
<table width='100%'>
<tr>
<td style='vertical-align:top;'>
@@ -102,7 +102,7 @@
<td class="ListColLeft">{$host_data.last_update}</td>
</tr>
</table>
- <br>
+ <br />
<table class="ListTable">
<tr class='ListHeader'>
<td class="ListColHeaderCenter" colspan="2">{$lang.options}</td>
@@ -140,7 +140,7 @@
{/if}
</table>
{if $lcaTopo.6 || $lcaTopo.70101 || $lcaTopo.20201 || $lcaTopo.40210}
- <br>
+ <br />
<table class="ListTable">
<tr class='ListHeader'>
<td class="ListColHeaderCenter">{$lang.m_mon_tips}</td>
@@ -167,7 +167,7 @@
{/if}
</table>
{/if}
- <br>
+ <br />
<table class="ListTable">
<tr class='ListHeader'>
<td class="ListColHeaderCenter">{$lang.m_mon_tools}</td>
@@ -236,7 +236,7 @@
</tr>
{/if}
</table>
- <br>
+ <br />
<table class="ListTable">
<tr class='ListHeader'>
<td class="ListColHeaderCenter">{$lang.m_mon_host_statistics}</td>
@@ -248,14 +248,14 @@
</td>
</tr>
</table>
- <br>
+ <br />
{if count($tab_comments_host)}
<table class="ListTable">
<tr class='ListHeader'>
<td class="ListColHeaderCenter" colspan="3">Comments For this host</td>
</tr>
</table>
- <br>
+ <br />
<table class="ListTable">
<tr class='ListHeader'>
<td class="ListColHeaderCenter"><input type="checkbox" disabled checked></td>
diff --git a/www/include/monitoring/objectDetails/hostDetails.php b/www/include/monitoring/objectDetails/hostDetails.php
index c365e987b7d2e55fcd863f26badc1482531ae398..4e16fa91800d1a317a051be4d90e53b1736ef213 100644
--- a/www/include/monitoring/objectDetails/hostDetails.php
+++ b/www/include/monitoring/objectDetails/hostDetails.php
@@ -57,7 +57,7 @@ For information : contact@oreon-project.org
$DBRESULT_NDO =& $pearDBndo->query($rq);
if (PEAR::isError($DBRESULT_NDO))
- print "DB Error : ".$DBRESULT_NDO->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_NDO->getDebugInfo()."<br />";
$tab_status_service = array();
$tab_status_service[0] = "OK";
@@ -115,7 +115,7 @@ For information : contact@oreon-project.org
$DBRESULT_NDO =& $pearDBndo->query($rq2);
if (PEAR::isError($DBRESULT_NDO))
- print "DB Error : ".$DBRESULT_NDO->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_NDO->getDebugInfo()."<br />";
$DBRESULT_NDO->fetchInto($ndo2);
diff --git a/www/include/monitoring/objectDetails/serviceDetails.ihtml b/www/include/monitoring/objectDetails/serviceDetails.ihtml
index 23adf52083aa56dccbe7c8d9348384553ecf69d9..5253dcff1c043e078707696c60dbce8b48a027a3 100644
--- a/www/include/monitoring/objectDetails/serviceDetails.ihtml
+++ b/www/include/monitoring/objectDetails/serviceDetails.ihtml
@@ -15,7 +15,7 @@
{/if}
</td>
</tr>
- </table><br>
+ </table><br />
<table width='100%'>
<tr>
<td style='vertical-align:top;'>
@@ -96,7 +96,7 @@
<td class="ListColLeft">{$service_data.last_update}</td>
</tr>
</table>
- <br>
+ <br />
<table class="ListTable">
<tr class='ListHeader'>
<td class="ListColHeaderLeft" colspan="2"><img src='./img/icones/16x16/column-chart.gif'> Status</td>
@@ -105,7 +105,7 @@
<td class="ListColCenter" colspan="2"><img src="./include/views/graphs/statusGraphs/displayServiceStatus.php?{$options}"></td>
</tr>
</table>
- <br><br>
+ <br /><br />
{if $lcaTopo.602}
<table class="ListTable">
<tr class='ListHeader'>
@@ -117,7 +117,7 @@
</table>
{/if}
{if $sv_ext_action_url}
- <br>
+ <br />
<table class="ListTable">
<tr class='ListHeader'>
<td class="ListColHeaderCenter">{$lang.m_mon_tools}</td>
@@ -170,7 +170,7 @@
</tr>
{/if}
</table>
- <br>
+ <br />
<table class="ListTable">
<tr class='ListHeader'>
<td class="ListColHeaderCenter" colspan="2">Options</td>
@@ -202,14 +202,14 @@
</table>
</td>
</tr>
- </table><br>
+ </table><br />
{if $count_comments_svc}
<table class="ListTable">
<tr class='ListHeader'>
<td class="ListColHeaderLeft" colspan="3"> <img src="./img/icones/16x16/messages.gif"> {$lang.m_comment_for_service}</td>
</tr>
</table>
- <br>
+ <br />
<table class="ListTable">
<tr class='ListHeader'>
<td class="ListColHeaderPicker"><input type="checkbox" disabled checked></td>
diff --git a/www/include/monitoring/objectDetails/serviceDetails.php b/www/include/monitoring/objectDetails/serviceDetails.php
index c1683555171e7e71bcf047c5bf5acf141e9e0b88..c72ec895bf84d56aca93818734a033e2e4589264 100644
--- a/www/include/monitoring/objectDetails/serviceDetails.php
+++ b/www/include/monitoring/objectDetails/serviceDetails.php
@@ -70,7 +70,7 @@ For information : contact@oreon-project.org
$DBRESULT_NDO =& $pearDBndo->query($rq);
if (PEAR::isError($DBRESULT_NDO))
- print "DB Error : ".$DBRESULT_NDO->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_NDO->getDebugInfo()."<br />";
$tab_status_service = array();
$tab_status_service[0] = "OK";
@@ -102,7 +102,7 @@ For information : contact@oreon-project.org
" WHERE no.object_id = nhs.host_object_id AND no.name1 like '".$host_name."'";
$DBRESULT_NDO =& $pearDBndo->query($rq2);
if (PEAR::isError($DBRESULT_NDO))
- print "DB Error : ".$DBRESULT_NDO->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_NDO->getDebugInfo()."<br />";
$DBRESULT_NDO->fetchInto($ndo2);
$host_status[$host_name] = $tab_host_status[$ndo2["current_state"]];
/* end ndo host detail */
@@ -139,7 +139,7 @@ For information : contact@oreon-project.org
$log = fopen($oreon->Nagioscfg["comment_file"], "r");
if ($oreon->user->get_version() == 1){
while ($str = fgets($log)) {
- print $str . "<br>";
+ print $str . "<br />";
$res = preg_split("/;/", $str);
if (preg_match("/^\[([0-9]*)\] SERVICE_COMMENT;/", $str, $matches)){
if (!strcmp($res[2], $host_name)){
diff --git a/www/include/monitoring/status/status-log/proc_info.php b/www/include/monitoring/status/status-log/proc_info.php
index 302866780f37a3d71eb62228ea5763ab0ee5d4c3..b4cd4c485faf455f272bea8d98a81e29b0bf6f63 100644
--- a/www/include/monitoring/status/status-log/proc_info.php
+++ b/www/include/monitoring/status/status-log/proc_info.php
@@ -253,11 +253,11 @@ For information : contact@oreon-project.org
$i = 0;
foreach ($tab as $str){
if (preg_match("/^Running configuration check/", $str, $matches))
- print "<b><font color='blue'>" . $str . "</font></b><br>";
+ print "<b><font color='blue'>" . $str . "</font></b><br />";
else if (preg_match("/^Starting/", $str, $matches))
- print "<b><font color='red'>" . $str . "</font></b><br>";
+ print "<b><font color='red'>" . $str . "</font></b><br />";
else if (preg_match("/^/", $str, $matches))
- print $str . "<br>";
+ print $str . "<br />";
$i++;
unset($str);
}
diff --git a/www/include/monitoring/status/status-log/templates/hostgroup.ihtml b/www/include/monitoring/status/status-log/templates/hostgroup.ihtml
index bcd16ab72292aa2366ab944595d0d4104bf3783e..504b1d6438722dbc452bda48f27d5420002d8e00 100644
--- a/www/include/monitoring/status/status-log/templates/hostgroup.ihtml
+++ b/www/include/monitoring/status/status-log/templates/hostgroup.ihtml
@@ -15,5 +15,5 @@
</tr>
{/foreach}
</table>
- <br>
+ <br />
</div>
\ No newline at end of file
diff --git a/www/include/monitoring/status/status-log/templates/service.ihtml b/www/include/monitoring/status/status-log/templates/service.ihtml
index 839dc4085f48afed1b87155f54a9fc1d81c69f2f..31079d35625e1d7c9b1849e2f2bc1579294c1e18 100644
--- a/www/include/monitoring/status/status-log/templates/service.ihtml
+++ b/www/include/monitoring/status/status-log/templates/service.ihtml
@@ -4,16 +4,16 @@
<FORM id="fsave">
<INPUT type="hidden" name="type" value="service" size=12>
<INPUT type="hidden" name="len" value="0" size=12>
- time:<INPUT type="hidden" name="time" value="{$time}" size=12><br>
- lastreload session:<INPUT type="hidden" name="slastreload" value="{$slastreload}"><br>
- maxtime:<INPUT type="hidden" name="smaxtime" value="{$smaxtime}"><br>
- search:<INPUT type="hidden" name="search" value="{$search}"><br>
- search_type_host:<INPUT type="hidden" name="search_type_host" value="{$search_type_host}"><br>
- search_type_service:<INPUT type="hidden" name="search_type_service" value="{$search_type_service}"><br>
- limit:<INPUT type="hidden" name="limit" value="{$limit}"><br>
- num:<INPUT type="hidden" name="num" value="{$num}"><br>
- order:<INPUT type="hidden" name="order" value="{$order}"><br>
- sort_types:<INPUT type="hidden" name="sort_types" value="{$sort_types}"><br>
+ time:<INPUT type="hidden" name="time" value="{$time}" size=12><br />
+ lastreload session:<INPUT type="hidden" name="slastreload" value="{$slastreload}"><br />
+ maxtime:<INPUT type="hidden" name="smaxtime" value="{$smaxtime}"><br />
+ search:<INPUT type="hidden" name="search" value="{$search}"><br />
+ search_type_host:<INPUT type="hidden" name="search_type_host" value="{$search_type_host}"><br />
+ search_type_service:<INPUT type="hidden" name="search_type_service" value="{$search_type_service}"><br />
+ limit:<INPUT type="hidden" name="limit" value="{$limit}"><br />
+ num:<INPUT type="hidden" name="num" value="{$num}"><br />
+ order:<INPUT type="hidden" name="order" value="{$order}"><br />
+ sort_types:<INPUT type="hidden" name="sort_types" value="{$sort_types}"><br />
</FORM>
</div>
<form name='form'>
diff --git a/www/include/monitoring/status/status-log/templates/serviceGrid.ihtml b/www/include/monitoring/status/status-log/templates/serviceGrid.ihtml
index 062abc6d18bdaf087732efa83679403566650455..de7c6b696192a57ca79b9d4e6a38dce00a02066d 100644
--- a/www/include/monitoring/status/status-log/templates/serviceGrid.ihtml
+++ b/www/include/monitoring/status/status-log/templates/serviceGrid.ihtml
@@ -33,5 +33,5 @@
{/foreach}
{/if}
</table>
- <br>
+ <br />
</div>
\ No newline at end of file
diff --git a/www/include/monitoring/status/status-log/templates/serviceGridByHG.ihtml b/www/include/monitoring/status/status-log/templates/serviceGridByHG.ihtml
index 03167a8a9812e961f15b93b428f4e9897ba75272..c3a53cacff7c1655cfbd4fe0649ded3f0755dfd6 100644
--- a/www/include/monitoring/status/status-log/templates/serviceGridByHG.ihtml
+++ b/www/include/monitoring/status/status-log/templates/serviceGridByHG.ihtml
@@ -36,6 +36,6 @@
{/foreach}
{/if}
</table>
- <br>
+ <br />
{/foreach}
</div>
\ No newline at end of file
diff --git a/www/include/monitoring/status/status-log/templates/serviceGridBySG.ihtml b/www/include/monitoring/status/status-log/templates/serviceGridBySG.ihtml
index 3596cccc70676367fc94be66320ed521e845d588..21f3df34b8554957ad34fea6e048c56d79c06ecd 100644
--- a/www/include/monitoring/status/status-log/templates/serviceGridBySG.ihtml
+++ b/www/include/monitoring/status/status-log/templates/serviceGridBySG.ihtml
@@ -36,6 +36,6 @@
{/foreach}
{/if}
</table>
- <br>
+ <br />
{/foreach}
</div>
\ No newline at end of file
diff --git a/www/include/monitoring/status/status-log/templates/serviceOverview.ihtml b/www/include/monitoring/status/status-log/templates/serviceOverview.ihtml
index 98f07a07b3a63f4e6b190cc202a5d890049ca168..823e82d55ac3047969d7e48262b88623f81e95e1 100644
--- a/www/include/monitoring/status/status-log/templates/serviceOverview.ihtml
+++ b/www/include/monitoring/status/status-log/templates/serviceOverview.ihtml
@@ -33,5 +33,5 @@
{/foreach}
{/if}
</table>
- <br>
+ <br />
</div>
\ No newline at end of file
diff --git a/www/include/monitoring/status/status-log/templates/serviceOverviewByHG.ihtml b/www/include/monitoring/status/status-log/templates/serviceOverviewByHG.ihtml
index 206a2a29b370ad0de3e79e68717f30c781befe0d..5392f8e14b243dca5cc432a22d4f8bdef097ae42 100644
--- a/www/include/monitoring/status/status-log/templates/serviceOverviewByHG.ihtml
+++ b/www/include/monitoring/status/status-log/templates/serviceOverviewByHG.ihtml
@@ -37,6 +37,6 @@
{/foreach}
{/if}
</table>
- <br>
+ <br />
{/foreach}
</div>
\ No newline at end of file
diff --git a/www/include/monitoring/status/status-log/templates/serviceOverviewBySG.ihtml b/www/include/monitoring/status/status-log/templates/serviceOverviewBySG.ihtml
index 7dd924e42b1454cf34f50f88820b3e9002dd0f06..12a38ffcfd4d518be5e82f33ad305d8eead4511a 100644
--- a/www/include/monitoring/status/status-log/templates/serviceOverviewBySG.ihtml
+++ b/www/include/monitoring/status/status-log/templates/serviceOverviewBySG.ihtml
@@ -23,6 +23,6 @@
{/if}
{/foreach}
</table>
- <br>
+ <br />
{/foreach}
</div>
\ No newline at end of file
diff --git a/www/include/monitoring/status/status-log/templates/serviceSummary.ihtml b/www/include/monitoring/status/status-log/templates/serviceSummary.ihtml
index bdc653278ec622a8f8c0648230cbe1f6a0e443f1..0a0bc5cbfb7881098bf46906310d4c8a4200739d 100644
--- a/www/include/monitoring/status/status-log/templates/serviceSummary.ihtml
+++ b/www/include/monitoring/status/status-log/templates/serviceSummary.ihtml
@@ -33,5 +33,5 @@
{/foreach}
{/if}
</table>
- <br>
+ <br />
</div>
\ No newline at end of file
diff --git a/www/include/monitoring/status/status-log/templates/serviceSummaryByHG.ihtml b/www/include/monitoring/status/status-log/templates/serviceSummaryByHG.ihtml
index 100843f5655b04d414012ef63c2c1b652f91c34f..40b92303389189f821c060b542536483d17fdcbe 100644
--- a/www/include/monitoring/status/status-log/templates/serviceSummaryByHG.ihtml
+++ b/www/include/monitoring/status/status-log/templates/serviceSummaryByHG.ihtml
@@ -39,6 +39,6 @@
{/foreach}
{/if}
</table>
- <br>
+ <br />
{/foreach}
</div>
\ No newline at end of file
diff --git a/www/include/monitoring/status/status-log/templates/serviceSummaryBySG.ihtml b/www/include/monitoring/status/status-log/templates/serviceSummaryBySG.ihtml
index 7dd924e42b1454cf34f50f88820b3e9002dd0f06..12a38ffcfd4d518be5e82f33ad305d8eead4511a 100644
--- a/www/include/monitoring/status/status-log/templates/serviceSummaryBySG.ihtml
+++ b/www/include/monitoring/status/status-log/templates/serviceSummaryBySG.ihtml
@@ -23,6 +23,6 @@
{/if}
{/foreach}
</table>
- <br>
+ <br />
{/foreach}
</div>
\ No newline at end of file
diff --git a/www/include/monitoring/status/status-log/templates/service_problem.ihtml b/www/include/monitoring/status/status-log/templates/service_problem.ihtml
index 6123fe950b1407eb7ff598e9a9cb047255e26f23..a0d9cd30457b09e125cfaf924584a95ca7d3b786 100644
--- a/www/include/monitoring/status/status-log/templates/service_problem.ihtml
+++ b/www/include/monitoring/status/status-log/templates/service_problem.ihtml
@@ -4,16 +4,16 @@
<FORM id="fsave">
<INPUT type="hidden" name="type" value="service_problem" size=12>
<INPUT type="hidden" name="len" value="0" size=12>
- time:<INPUT type="hidden" name="time" value="{$time}" size=12><br>
- lastreload session:<INPUT type="hidden" name="slastreload" value="{$slastreload}"><br>
- maxtime:<INPUT type="hidden" name="smaxtime" value="{$smaxtime}"><br>
- search:<INPUT type="hidden" name="search" value="{$search}"><br>
- search_type_host:<INPUT type="hidden" name="search_type_host" value="{$search_type_host}"><br>
- search_type_service:<INPUT type="hidden" name="search_type_service" value="{$search_type_service}"><br>
- limit:<INPUT type="hidden" name="limit" value="{$limit}"><br>
- num:<INPUT type="hidden" name="num" value="{$num}"><br>
- order:<INPUT type="hidden" name="order" value="{$order}"><br>
- sort_types:<INPUT type="hidden" name="sort_types" value="{$sort_types}"><br>
+ time:<INPUT type="hidden" name="time" value="{$time}" size=12><br />
+ lastreload session:<INPUT type="hidden" name="slastreload" value="{$slastreload}"><br />
+ maxtime:<INPUT type="hidden" name="smaxtime" value="{$smaxtime}"><br />
+ search:<INPUT type="hidden" name="search" value="{$search}"><br />
+ search_type_host:<INPUT type="hidden" name="search_type_host" value="{$search_type_host}"><br />
+ search_type_service:<INPUT type="hidden" name="search_type_service" value="{$search_type_service}"><br />
+ limit:<INPUT type="hidden" name="limit" value="{$limit}"><br />
+ num:<INPUT type="hidden" name="num" value="{$num}"><br />
+ order:<INPUT type="hidden" name="order" value="{$order}"><br />
+ sort_types:<INPUT type="hidden" name="sort_types" value="{$sort_types}"><br />
</FORM>
</div>
<form name='form'>
diff --git a/www/include/monitoring/status/status-ndo/makeJS_Common.php b/www/include/monitoring/status/status-ndo/makeJS_Common.php
index 6ad0bf45c5a89aa5d78b3605f21d9ff905004908..c4e609dda8f4ece20146574b3fd736207b4867e7 100644
--- a/www/include/monitoring/status/status-ndo/makeJS_Common.php
+++ b/www/include/monitoring/status/status-ndo/makeJS_Common.php
@@ -97,7 +97,7 @@ function construct_selecteList_ndo_instance(id){
}
$DBRESULT =& $pearDB->query("SELECT cfg.instance_name as name FROM nagios_server ns, cfg_ndomod cfg WHERE cfg.ns_nagios_server = ns.id AND ns.ns_activate = 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($nagios_server))
{
$isntance_id = get_ndo_instance_id($nagios_server["name"]);
diff --git a/www/include/monitoring/status/status-ndo/templates/serviceSchedule.ihtml b/www/include/monitoring/status/status-ndo/templates/serviceSchedule.ihtml
index 526bcf697dd4ac2891561beddcf04a1c720de11e..5c3f622e86b5a583cadce9647508edab30c5c438 100644
--- a/www/include/monitoring/status/status-ndo/templates/serviceSchedule.ihtml
+++ b/www/include/monitoring/status/status-ndo/templates/serviceSchedule.ihtml
@@ -8,7 +8,7 @@
<fieldset id="advanced_options" STYLE = "padding:3px;-moz-border-radius : 5px 5px;">
<legend><a href="#" onclick="advanced_options('advanced_options');" >Advanced Options</a></legend>
next check:<input type="checkbox" name="next_check_case" onclick="addORdelTab('next_check_case');">
- <br>
+ <br />
</fieldset>
</td></tr>
<tr class="Toolbar_TR_Top">
diff --git a/www/include/nagiosStats/nagiosStats.php b/www/include/nagiosStats/nagiosStats.php
index 559cea73df2da6e4d60217d7f105cad784016a45..5b42ee59afad6bb2763230181c6e3c40436b9409 100644
--- a/www/include/nagiosStats/nagiosStats.php
+++ b/www/include/nagiosStats/nagiosStats.php
@@ -28,7 +28,7 @@ For information : contact@oreon-project.org
$tab_nagios_server = array();
$DBRESULT =& $pearDB->query("SELECT * FROM `nagios_server` ORDER BY `localhost` DESC");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while ($nagios =& $DBRESULT->fetchRow())
$tab_nagios_server[$nagios['id']] = $nagios['name'];
diff --git a/www/include/options/LCA/define/DB-Func.php b/www/include/options/LCA/define/DB-Func.php
index cac976f66ccb5e770ac0adaa7ea563673da69743..7930ad1abce33b72f18d30dfa98771e3346834f1 100644
--- a/www/include/options/LCA/define/DB-Func.php
+++ b/www/include/options/LCA/define/DB-Func.php
@@ -23,7 +23,7 @@ For information : contact@oreon-project.org
$id = $form->getSubmitValue('lca_id');
$DBRESULT =& $pearDB->query("SELECT lca_name, lca_id FROM lca_define WHERE lca_name = '".$name."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$lca =& $DBRESULT->fetchRow();
#Modif case
if ($DBRESULT->numRows() >= 1 && $lca["lca_id"] == $id)
@@ -40,7 +40,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("UPDATE lca_define SET lca_activate = '1' WHERE lca_id = '".$lca_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function disableLCAInDB ($lca_id = null) {
@@ -48,7 +48,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("UPDATE lca_define SET lca_activate = '0' WHERE lca_id = '".$lca_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function deleteLCAInDB ($lcas = array()) {
@@ -56,7 +56,7 @@ For information : contact@oreon-project.org
foreach($lcas as $key=>$value){
$DBRESULT =& $pearDB->query("DELETE FROM lca_define WHERE lca_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -80,43 +80,43 @@ For information : contact@oreon-project.org
if (isset($maxId["MAX(lca_id)"])) {
$DBRESULT =& $pearDB->query("SELECT DISTINCT contactgroup_cg_id FROM lca_define_contactgroup_relation WHERE lca_define_lca_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($cg)) {
$DBRESULT2 =& $pearDB->query("INSERT INTO lca_define_contactgroup_relation VALUES ('', '".$maxId["MAX(lca_id)"]."', '".$cg["contactgroup_cg_id"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT =& $pearDB->query("SELECT DISTINCT host_host_id FROM lca_define_host_relation WHERE lca_define_lca_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($host)) {
$DBRESULT2 =& $pearDB->query("INSERT INTO lca_define_host_relation VALUES ('', '".$maxId["MAX(lca_id)"]."', '".$host["host_host_id"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT =& $pearDB->query("SELECT DISTINCT hostgroup_hg_id FROM lca_define_hostgroup_relation WHERE lca_define_lca_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($hg)){
$DBRESULT2 =& $pearDB->query("INSERT INTO lca_define_hostgroup_relation VALUES ('', '".$maxId["MAX(lca_id)"]."', '".$hg["hostgroup_hg_id"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT =& $pearDB->query("SELECT DISTINCT servicegroup_sg_id FROM lca_define_servicegroup_relation WHERE lca_define_lca_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($sg)) {
$DBRESULT2 =& $pearDB->query("INSERT INTO lca_define_servicegroup_relation VALUES ('', '".$maxId["MAX(lca_id)"]."', '".$sg["servicegroup_sg_id"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
$DBRESULT =& $pearDB->query("SELECT DISTINCT topology_topology_id FROM lca_define_topology_relation WHERE lca_define_lca_id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
while($DBRESULT->fetchInto($sg)) {
$DBRESULT2 =& $pearDB->query("INSERT INTO lca_define_topology_relation VALUES ('', '".$maxId["MAX(lca_id)"]."', '".$sg["topology_topology_id"]."')");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
}
}
}
@@ -155,10 +155,10 @@ For information : contact@oreon-project.org
$rq .= "('".htmlentities($ret["lca_name"], ENT_QUOTES)."', '".htmlentities($ret["lca_alias"], ENT_QUOTES)."', '".htmlentities($ret["lca_comment"], ENT_QUOTES)."', '".$ret["lca_hg_childs"]["lca_hg_childs"]."', '".$ret["lca_activate"]["lca_activate"]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(lca_id) FROM lca_define");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$lca_id = $DBRESULT->fetchRow();
return ($lca_id["MAX(lca_id)"]);
}
@@ -178,7 +178,7 @@ For information : contact@oreon-project.org
"WHERE lca_id = '".$lca_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function updateLCAContactGroups($lca_id = null) {
@@ -191,7 +191,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE lca_define_lca_id = '".$lca_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$ret = array();
$ret = $form->getSubmitValue("lca_cgs");
for($i = 0; $i < count($ret); $i++) {
@@ -201,7 +201,7 @@ For information : contact@oreon-project.org
$rq .= "('".$lca_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -212,7 +212,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE lca_define_lca_id = '".$lca_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$ret = array();
$ret = $form->getSubmitValue("lca_hosts");
for($i = 0; $i < count($ret); $i++) {
@@ -222,7 +222,7 @@ For information : contact@oreon-project.org
$rq .= "('".$lca_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -233,7 +233,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE lca_define_lca_id = '".$lca_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$ret = array();
$ret = $form->getSubmitValue("lca_hgs");
for($i = 0; $i < count($ret); $i++) {
@@ -243,7 +243,7 @@ For information : contact@oreon-project.org
$rq .= "('".$lca_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -254,7 +254,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE lca_define_lca_id = '".$lca_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$ret = array();
$ret = $form->getSubmitValue("lca_sgs");
for($i = 0; $i < count($ret); $i++) {
@@ -264,7 +264,7 @@ For information : contact@oreon-project.org
$rq .= "('".$lca_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
}
@@ -275,7 +275,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE lca_define_lca_id = '".$lca_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$ret = array();
$ret = $form->getSubmitValue("lca_topos");
@@ -289,7 +289,7 @@ For information : contact@oreon-project.org
$rq .= "('".$lca_id."', '".$ret[$i]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
//updateLCATopologyParents($ret[$i], $lca_id);
}
}
@@ -300,11 +300,11 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT DISTINCT topology_page FROM topology WHERE topology_id = '".$topology_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$level1 =& $DBRESULT->fetchRow();
$DBRESULT2 =& $pearDB->query("SELECT topology_id, topology_page FROM topology WHERE topology_parent = '".$level1["topology_page"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
while($DBRESULT2->fetchInto($level2)) {
$rq = "INSERT INTO lca_define_topology_relation ";
$rq .= "(lca_define_lca_id, topology_topology_id) ";
@@ -312,7 +312,7 @@ For information : contact@oreon-project.org
$rq .= "('".$lca_id."', '".$level2["topology_id"]."')";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
updateLCATopologyChilds($level2["topology_id"], $lca_id);
}
}
diff --git a/www/include/options/LCA/define/formLCA.php b/www/include/options/LCA/define/formLCA.php
index ca3450df39efe03167429ee1bf09a0a4208b8e43..da7229065011f74f0827e03d31b797975086c909 100644
--- a/www/include/options/LCA/define/formLCA.php
+++ b/www/include/options/LCA/define/formLCA.php
@@ -112,7 +112,7 @@ $lca["lca_topos"] = array();
$attrsText = array("size"=>"30");
$attrsAdvSelect = array("style" => "width: 200px; height: 100px;");
$attrsTextarea = array("rows"=>"3", "cols"=>"30");
- $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br><br><br>{remove}</td><td>{selected}</td></tr></table>";
+ $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br /><br /><br />{remove}</td><td>{selected}</td></tr></table>";
#
## Form begin
@@ -208,7 +208,7 @@ $lca["lca_topos"] = array();
$lca_topos2[$a]["childs"] = array();
/*old*/
- $lca_topos[] = &HTML_QuickForm::createElement('checkbox', $topo1["topology_id"], null, array_key_exists($topo1["topology_name"], $lang) ? " ".$lang[$topo1["topology_name"]]."<br>" : " #UNDEF#"."<br>", array("style"=>"margin-top: 5px;", "id"=>$topo1["topology_id"]));
+ $lca_topos[] = &HTML_QuickForm::createElement('checkbox', $topo1["topology_id"], null, array_key_exists($topo1["topology_name"], $lang) ? " ".$lang[$topo1["topology_name"]]."<br />" : " #UNDEF#"."<br />", array("style"=>"margin-top: 5px;", "id"=>$topo1["topology_id"]));
$rq = "SELECT topology_id, topology_page, topology_name, topology_parent FROM topology WHERE topology_parent = '".$topo1["topology_page"]."' AND topology_page IN (".$oreon->user->lcaTStr.") ORDER BY topology_order";
$DBRESULT2 =& $pearDB->query($rq);
/*old*/
@@ -224,7 +224,7 @@ $lca["lca_topos"] = array();
/*old*/
- $lca_topos[] = &HTML_QuickForm::createElement('checkbox', $topo2["topology_id"], NULL, array_key_exists($topo2["topology_name"], $lang) ? " ".$lang[$topo2["topology_name"]]."<br>" : " #UNDEF#"."<br>", array("style"=>"margin-top: 5px; margin-left: 20px;"));
+ $lca_topos[] = &HTML_QuickForm::createElement('checkbox', $topo2["topology_id"], NULL, array_key_exists($topo2["topology_name"], $lang) ? " ".$lang[$topo2["topology_name"]]."<br />" : " #UNDEF#"."<br />", array("style"=>"margin-top: 5px; margin-left: 20px;"));
$rq = "SELECT topology_id, topology_name, topology_parent, topology_page FROM topology WHERE topology_parent = '".$topo2["topology_page"]."' AND topology_page IN (".$oreon->user->lcaTStr.") ORDER BY topology_order";
$DBRESULT3 =& $pearDB->query($rq);
/*old*/
@@ -240,7 +240,7 @@ $lca["lca_topos"] = array();
/*old*/
- $lca_topos[] = &HTML_QuickForm::createElement('checkbox', $topo3["topology_id"], null, array_key_exists($topo3["topology_name"], $lang) ? " ".$lang[$topo3["topology_name"]]."<br>" : " #UNDEF#"."<br>", array("style"=>"margin-top: 5px; margin-left: 40px;"));
+ $lca_topos[] = &HTML_QuickForm::createElement('checkbox', $topo3["topology_id"], null, array_key_exists($topo3["topology_name"], $lang) ? " ".$lang[$topo3["topology_name"]]."<br />" : " #UNDEF#"."<br />", array("style"=>"margin-top: 5px; margin-left: 40px;"));
$rq = "SELECT topology_id, topology_name, topology_parent FROM topology WHERE topology_parent = '".$topo3["topology_page"]."' AND topology_page IN (".$oreon->user->lcaTStr.") ORDER BY topology_order";
$DBRESULT4 =& $pearDB->query($rq);
/*old*/
@@ -256,7 +256,7 @@ $lca["lca_topos"] = array();
/*old*/
- $lca_topos[] = &HTML_QuickForm::createElement('checkbox', $topo4["topology_id"], null, array_key_exists($topo4["topology_name"], $lang) ? " ".$lang[$topo4["topology_name"]]."<br>" : " #UNDEF#"."<br>", array("style"=>"margin-top: 5px; margin-left: 55px;"));
+ $lca_topos[] = &HTML_QuickForm::createElement('checkbox', $topo4["topology_id"], null, array_key_exists($topo4["topology_name"], $lang) ? " ".$lang[$topo4["topology_name"]]."<br />" : " #UNDEF#"."<br />", array("style"=>"margin-top: 5px; margin-left: 55px;"));
/*old*/
$d++;
}
diff --git a/www/include/options/about/about.php b/www/include/options/about/about.php
index 79dce4289dd9928302715319ce9d78894b45cd9c..12e4ad4a0c3f1d77d84db28d44aee25940cbf1e4 100644
--- a/www/include/options/about/about.php
+++ b/www/include/options/about/about.php
@@ -26,30 +26,30 @@ For information : contact@oreon-project.org
<?php
$DBRESULT =& $pearDB->query("SELECT oi.value FROM oreon_informations oi WHERE oi.key = 'version' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$release = $DBRESULT->fetchRow();
print $release["value"];
?></h3></div>
- <br><br>
+ <br /><br />
<div class="list_one"><h3>
<b><?php echo _("Project Leaders"); ?> :</b>
- </h3></div><br>
- <a href="mailto:rlemerlus@oreon-project.org" class="list_two">Romain Le Merlus (rom)</a><br>
- <a href="mailto:jmathis@oreon-project.org" class="list_two">Julien Mathis (Julio)</a><br>
+ </h3></div><br />
+ <a href="mailto:rlemerlus@oreon-project.org" class="list_two">Romain Le Merlus (rom)</a><br />
+ <a href="mailto:jmathis@oreon-project.org" class="list_two">Julien Mathis (Julio)</a><br />
- <br>
+ <br />
<div class="list_one"><h3>
<b><?php echo _("Contributors"); ?> :</b>
- </h3></div><br>
- <a href="mailto:ccoraboeuf@oreon-project.org" class="list_two">Christophe Coraboeuf (Wistof)</a><br>
- <a href="mailto:cfacon@oreon-project.org" class="list_two">Cedrick Facon (Apo)</a><br>
- Mathavarajan Sugumaran (MrBrown)<br>
- Guillaume Watteeux (Watt)<br>
- Maximilien Bersoult (leoncx)<br>
- Gaetan Lucas de Couville (gae)<br>
- Nathanael Guyot (Tor)<br>
- Jean Marc Grisard (Jmou)<br>
- Ira Janssen (Iralein)<br>
+ </h3></div><br />
+ <a href="mailto:ccoraboeuf@oreon-project.org" class="list_two">Christophe Coraboeuf (Wistof)</a><br />
+ <a href="mailto:cfacon@oreon-project.org" class="list_two">Cedrick Facon (Apo)</a><br />
+ Mathavarajan Sugumaran (MrBrown)<br />
+ Guillaume Watteeux (Watt)<br />
+ Maximilien Bersoult (leoncx)<br />
+ Gaetan Lucas de Couville (gae)<br />
+ Nathanael Guyot (Tor)<br />
+ Jean Marc Grisard (Jmou)<br />
+ Ira Janssen (Iralein)<br />
</ul>
</div>
\ No newline at end of file
diff --git a/www/include/options/ods/viewData.php b/www/include/options/ods/viewData.php
index 41ff78e38532b39192e0a7ba516966bb9c239631..e5bcfc37913cce456054fbe2b30cd1778423efe6 100644
--- a/www/include/options/ods/viewData.php
+++ b/www/include/options/ods/viewData.php
@@ -49,60 +49,60 @@ For information : contact@oreon-project.org
foreach ($selected as $key => $value){
$DBRESULT =& $pearDBO->query("UPDATE index_data SET `must_be_rebuild` = '1' WHERE id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->postDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->postDebugInfo()."<br />";
}
} else if ($_POST["o"] == "nrg"){
$selected = $_POST["select"];
foreach ($selected as $key => $value){
$DBRESULT =& $pearDBO->query("UPDATE index_data SET `must_be_rebuild` = '0' WHERE id = '".$key."' AND `must_be_rebuild` = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->postDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->postDebugInfo()."<br />";
}
} else if ($_POST["o"] == "ed"){
$selected = $_POST["select"];
foreach ($selected as $key => $value){
$DBRESULT =& $pearDBO->query("SELECT * FROM metrics WHERE `index_id` = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->postDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->postDebugInfo()."<br />";
while($DBRESULT->fetchInto($metrics)){
$DBRESULT2 =& $pearDBO->query("DELETE FROM data_bin WHERE `id_metric` = '".$metrics['metric_id']."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->postDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->postDebugInfo()."<br />";
$DBRESULT2 =& $pearDBO->query("DELETE FROM metrics WHERE `metric_id` = '".$metrics['metric_id']."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->postDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->postDebugInfo()."<br />";
}
$DBRESULT =& $pearDBO->query("DELETE FROM index_data WHERE `id` = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->postDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->postDebugInfo()."<br />";
}
} else if ($_POST["o"] == "hg"){
$selected = $_POST["select"];
foreach ($selected as $key => $value){
$DBRESULT =& $pearDBO->query("UPDATE index_data SET `trashed` = '1' WHERE id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->POSTDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->POSTDebugInfo()."<br />";
}
} else if ($_POST["o"] == "nhg"){
$selected = $_POST["select"];
foreach ($selected as $key => $value){
$DBRESULT =& $pearDBO->query("UPDATE index_data SET `trashed` = '0' WHERE id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->POSTDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->POSTDebugInfo()."<br />";
}
} else if ($_POST["o"] == "lk"){
$selected = $_POST["select"];
foreach ($selected as $key => $value){
$DBRESULT =& $pearDBO->query("UPDATE index_data SET `locked` = '1' WHERE id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->POSTDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->POSTDebugInfo()."<br />";
}
} else if ($_POST["o"] == "nlk"){
$selected = $_POST["select"];
foreach ($selected as $key => $value){
$DBRESULT =& $pearDBO->query("UPDATE index_data SET `locked` = '0' WHERE id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->POSTDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->POSTDebugInfo()."<br />";
}
}
}
@@ -110,13 +110,13 @@ For information : contact@oreon-project.org
if (isset($_POST["o"]) && $_POST["o"] == "d" && isset($_POST["id"])){
$DBRESULT =& $pearDBO->query("UPDATE index_data SET `trashed` = '1' WHERE id = '".$_POST["id"]."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->POSTDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->POSTDebugInfo()."<br />";
}
if (isset($_POST["o"]) && $_POST["o"] == "rb" && isset($_POST["id"])){
$DBRESULT =& $pearDBO->query("UPDATE index_data SET `must_be_rebuild` = '1' WHERE id = '".$_POST["id"]."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->POSTDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->POSTDebugInfo()."<br />";
}
$search_string = "";
@@ -126,7 +126,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDBO->query("SELECT COUNT(*) FROM `index_data`$search_string");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->POSTDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->POSTDebugInfo()."<br />";
$tmp =& $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
@@ -137,12 +137,12 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDBO->query("SELECT * FROM `index_data`$search_string ORDER BY `host_name`, `service_description` LIMIT ".$num * $limit.", $limit");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$data = array();
for ($i = 0;$DBRESULT->fetchInto($index_data);$i++){
$DBRESULT2 =& $pearDBO->query("SELECT * FROM metrics WHERE index_id = '".$index_data["id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$metric = "";
for ($im = 0;$DBRESULT2->fetchInto($metrics);$im++){
if ($im)
diff --git a/www/include/options/ods/viewMetrics.php b/www/include/options/ods/viewMetrics.php
index 21374e2a017214bb725114cd5681edd1c476763d..5d5f62f33e92f7df5d708717059cb99018d1314d 100644
--- a/www/include/options/ods/viewMetrics.php
+++ b/www/include/options/ods/viewMetrics.php
@@ -25,28 +25,28 @@ For information : contact@oreon-project.org
foreach ($selected as $key => $value){
$DBRESULT =& $pearDBO->query("UPDATE index_data SET `must_be_rebuild` = '1' WHERE id = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->postDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->postDebugInfo()."<br />";
}
} else if ((defined($_POST["o1"]) && $_POST["o1"] == "nrg") || (defined($_POST["o2"]) && $_POST["o2"] == "nrg")){
$selected = $_POST["select"];
foreach ($selected as $key => $value){
$DBRESULT =& $pearDBO->query("UPDATE index_data SET `must_be_rebuild` = '0' WHERE `id` = '".$key."' AND `must_be_rebuild` = '1'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->postDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->postDebugInfo()."<br />";
}
} else if ($_POST["o1"] == "ed" || $_POST["o2"] == "ed"){
$selected = $_POST["select"];
foreach ($selected as $key => $value){
$DBRESULT =& $pearDBO->query("SELECT * FROM metrics WHERE `metric_id` = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->postDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->postDebugInfo()."<br />";
while($DBRESULT->fetchInto($metrics)){
$DBRESULT2 =& $pearDBO->query("DELETE FROM data_bin WHERE `id_metric` = '".$metrics['metric_id']."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->postDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->postDebugInfo()."<br />";
$DBRESULT2 =& $pearDBO->query("DELETE FROM metrics WHERE `metric_id` = '".$metrics['metric_id']."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->postDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->postDebugInfo()."<br />";
}
}
} else if ($_POST["o1"] == "hg" || $_POST["o2"] == "hg"){
@@ -54,28 +54,28 @@ For information : contact@oreon-project.org
foreach ($selected as $key => $value){
$DBRESULT =& $pearDBO->query("UPDATE metrics SET `hidden` = '1' WHERE `metric_id` = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->POSTDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->POSTDebugInfo()."<br />";
}
} else if ($_POST["o1"] == "nhg" || $_POST["o2"] == "nhg"){
$selected = $_POST["select"];
foreach ($selected as $key => $value){
$DBRESULT =& $pearDBO->query("UPDATE metrics SET `hidden` = '0' WHERE `metric_id` = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->POSTDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->POSTDebugInfo()."<br />";
}
} else if ($_POST["o1"] == "lk" || $_POST["o2"] == "lk"){
$selected = $_POST["select"];
foreach ($selected as $key => $value){
$DBRESULT =& $pearDBO->query("UPDATE metrics SET `locked` = '1' WHERE `metric_id` = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->POSTDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->POSTDebugInfo()."<br />";
}
} else if ($_POST["o1"] == "nlk" || $_POST["o2"] == "nlk"){
$selected = $_POST["select"];
foreach ($selected as $key => $value){
$DBRESULT =& $pearDBO->query("UPDATE metrics SET `locked` = '0' WHERE `metric_id` = '".$key."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->POSTDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->POSTDebugInfo()."<br />";
}
}
}
@@ -86,7 +86,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDBO->query("SELECT COUNT(*) FROM metrics WHERE index_id = '".$_GET["index_id"]."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->POSTDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->POSTDebugInfo()."<br />";
$tmp =& $DBRESULT->fetchRow();
$rows = $tmp["COUNT(*)"];
@@ -96,13 +96,13 @@ For information : contact@oreon-project.org
$DBRESULT2 =& $pearDBO->query("SELECT * FROM metrics WHERE index_id = '".$_GET["index_id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
unset($data);
for ($im = 0;$DBRESULT2->fetchInto($metrics);$im++){
$metric = array();
$DBRESULT3 =& $pearDBO->query("SELECT COUNT(*) FROM data_bin WHERE id_metric = '".$metrics["metric_id"]."'");
if (PEAR::isError($DBRESULT2))
- print "DB Error : ".$DBRESULT2->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT2->getDebugInfo()."<br />";
$DBRESULT3->fetchInto($nb_value);
$metric["nb"] = $nb_value["COUNT(*)"];
$metric["metric_id"] = $metrics["metric_id"];
diff --git a/www/include/options/oreon/generalOpt/DB-Func.php b/www/include/options/oreon/generalOpt/DB-Func.php
index a3e87a5ef121c3d2e0685c2e5bd335b6107b3add..c672e40647ab72b14c3fa8d1e9d24e6ba55353e0 100644
--- a/www/include/options/oreon/generalOpt/DB-Func.php
+++ b/www/include/options/oreon/generalOpt/DB-Func.php
@@ -87,11 +87,11 @@ For information : contact@oreon-project.org
$rq .= "WHERE gopt_id = '".$gopt_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$oreon->optGen = array();
$DBRESULT =& $pearDB->query("SELECT * FROM `general_opt` LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$oreon->optGen = $DBRESULT->fetchRow();
$oreon->user->version = $ret["nagios_version"];
}
@@ -117,7 +117,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE gopt_id = '".$gopt_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function updateDebugConfigData($gopt_id = null) {
@@ -141,7 +141,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE gopt_id = '".$gopt_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$oreon->optGen = array();
}
@@ -176,7 +176,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE gopt_id = '".$gopt_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function updateColorsConfigData($gopt_id = null) {
@@ -204,7 +204,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE gopt_id = '".$gopt_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function updateGeneralConfigData($gopt_id = null) {
@@ -248,7 +248,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE gopt_id = '".$gopt_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function updateRRDToolConfigData($gopt_id = null) {
@@ -264,7 +264,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE gopt_id = '".$gopt_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
function updateODSConfigData() {
@@ -307,7 +307,7 @@ For information : contact@oreon-project.org
`storage_type` = '".$ret["storage_type"]."' WHERE `id` = 1 LIMIT 1 ;";
$DBRESULT =& $pearDBO->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
?>
\ No newline at end of file
diff --git a/www/include/options/oreon/generalOpt/OreonDataStorage/formODS.php b/www/include/options/oreon/generalOpt/OreonDataStorage/formODS.php
index 6ea269b560aed73d698904aef879ebfe27fd5abd..d51c56f96c57b93f60119a6fc9eae071f73a35f6 100644
--- a/www/include/options/oreon/generalOpt/OreonDataStorage/formODS.php
+++ b/www/include/options/oreon/generalOpt/OreonDataStorage/formODS.php
@@ -26,7 +26,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDBO->query("SELECT * FROM config LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$gopt = array_map("myDecode", $DBRESULT->fetchRow());
diff --git a/www/include/options/oreon/generalOpt/css/formCss.php b/www/include/options/oreon/generalOpt/css/formCss.php
index cf213dafaf26f872637dfbf57ef63046dfe51b63..88ce1922eb01f5b9dac88cb597ae8784f96fcd62 100644
--- a/www/include/options/oreon/generalOpt/css/formCss.php
+++ b/www/include/options/oreon/generalOpt/css/formCss.php
@@ -22,7 +22,7 @@ For information : contact@oreon-project.org
# Skin path
$DBRESULT =& $pearDB->query("SELECT template FROM general_opt LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT->fetchInto($data);
$skin = "./Themes/".$data["template"]."/";
@@ -51,7 +51,7 @@ For information : contact@oreon-project.org
$rq = "UPDATE `css_color_menu` SET `css_name` = '".$name."' WHERE `id_css_color_menu` = $id";
$res =& $pearDB->query($rq);
if (PEAR::isError($res))
- print ($res->getMessage() . "<br>");
+ print ($res->getMessage() . "<br />");
}
}
diff --git a/www/include/options/oreon/generalOpt/general/formGeneralOpt.php b/www/include/options/oreon/generalOpt/general/formGeneralOpt.php
index 4518ca58e6e0c42f8837b5a29f3a6b153744f544..9230b5c0299a2e1b035c8e0c39b428a6f764f4f7 100644
--- a/www/include/options/oreon/generalOpt/general/formGeneralOpt.php
+++ b/www/include/options/oreon/generalOpt/general/formGeneralOpt.php
@@ -21,7 +21,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query("SELECT * FROM general_opt LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
# Set base value
$gopt = array_map("myDecode", $DBRESULT->fetchRow());
diff --git a/www/include/options/oreon/language/lang.ihtml b/www/include/options/oreon/language/lang.ihtml
index 87b6fbd5e59b96ca6b09978f02d4e5d9d37fd98f..200277ddb5f44556234547443902fb0d58ec8aa7 100644
--- a/www/include/options/oreon/language/lang.ihtml
+++ b/www/include/options/oreon/language/lang.ihtml
@@ -6,7 +6,7 @@
<dd>{$elemArr[elem].LangDispoName} {$elemArr[elem].LangDispo}</dd>
<dd>{$elemArr[elem].LangUtilName} {$elemArr[elem].LangUtil}</dd>
</dl>
- <br>
+ <br />
{/section}
</div>
diff --git a/www/include/options/oreon/modules/DB-Func.php b/www/include/options/oreon/modules/DB-Func.php
index 42813f5f8fa4298375f3bf6d1bbb2db83dd220f2..60f6493109e978a6ec7a4b2d7cdefb53f76edfd7 100644
--- a/www/include/options/oreon/modules/DB-Func.php
+++ b/www/include/options/oreon/modules/DB-Func.php
@@ -27,7 +27,7 @@ For information : contact@oreon-project.org
$rq = "SELECT * FROM modules_informations WHERE name='".$name."' LIMIT 1";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print $DBRESULT->getDebugInfo()."<br>";
+ print $DBRESULT->getDebugInfo()."<br />";
if ($DBRESULT->numRows())
return ($DBRESULT->fetchRow());
else
@@ -43,7 +43,7 @@ For information : contact@oreon-project.org
$rq = "SELECT id FROM modules_informations WHERE name = '".$name."' LIMIT 1";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print $DBRESULT->getDebugInfo()."<br>";
+ print $DBRESULT->getDebugInfo()."<br />";
if ($DBRESULT->numRows())
return true;
else
@@ -55,7 +55,7 @@ For information : contact@oreon-project.org
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT mod_release FROM modules_informations WHERE id = '".$id."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print $DBRESULT->getDebugInfo()."<br>";
+ print $DBRESULT->getDebugInfo()."<br />";
$module = $DBRESULT->fetchRow();
if ($module["mod_release"] == $release)
return true;
@@ -82,10 +82,10 @@ For information : contact@oreon-project.org
$rq .= ")";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT =& $pearDB->query("SELECT MAX(id) FROM modules_informations");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$id = $DBRESULT->fetchRow();
return ($id["MAX(id)"]);
}
@@ -109,7 +109,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE id = '".$id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
return true;
}
return NULL;
@@ -121,7 +121,7 @@ For information : contact@oreon-project.org
$rq = "DELETE FROM `modules_informations` WHERE id = '".$id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
return true;
}
@@ -139,7 +139,7 @@ For information : contact@oreon-project.org
$str = chop ($str);
$DBRESULT =& $pearDB->query($str);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$str = NULL;
}
else
diff --git a/www/include/options/oreon/modules/formModule.ihtml b/www/include/options/oreon/modules/formModule.ihtml
index e64af0bbba56fcd88560303635cce5548675bdbb..1e46147f7771bf900d981568ffc5b1bd2bab575d 100644
--- a/www/include/options/oreon/modules/formModule.ihtml
+++ b/www/include/options/oreon/modules/formModule.ihtml
@@ -31,19 +31,19 @@
<tr class="list_one">
<td colspan="2" align="center">
{if $output1}
- {$output1}<br>
+ {$output1}<br />
{/if}
{if $output2}
- {$output2}<br>
+ {$output2}<br />
{/if}
{if $output3}
- {$output3}<br>
+ {$output3}<br />
{/if}
{if $output4}
- {$output4}<br>
+ {$output4}<br />
{/if}
<form {$form1.attributes}>
- <br> {$form1.install.html} {$form1.list.html}<br>
+ <br /> {$form1.install.html} {$form1.list.html}<br />
{$form1.hidden}
</form>
</td>
@@ -53,7 +53,7 @@
<tr class="list_one">
<td colspan="2" align="center">
<form {$form2.attributes}>
- <br>
+ <br />
{$form2.list.html}
</form>
</td>
@@ -62,7 +62,7 @@
</table>
-<br><br>
+<br /><br />
{section name=elem loop=$elemArr}
{$form.javascript}
<form {$form.attributes}>
@@ -111,5 +111,5 @@
</table>
{$form.hidden}
</form>
- <br>
+ <br />
{/section}
\ No newline at end of file
diff --git a/www/include/options/oreon/modules/formModule.php b/www/include/options/oreon/modules/formModule.php
index 9239b09c66ac1ab63e89fc358baf34e56a651892..1fcbc6863eba70f926078cf2e32733405f9c8f7c 100644
--- a/www/include/options/oreon/modules/formModule.php
+++ b/www/include/options/oreon/modules/formModule.php
@@ -43,7 +43,7 @@ For information : contact@oreon-project.org
$tpl->assign("module_infos", $module_conf[$name]["infos"]);
if (is_dir("./modules/".$name."/infos") && is_file("./modules/".$name."/infos/infos.txt")) {
$infos_streams = file("./modules/".$name."/infos/infos.txt");
- $infos_streams = implode("<br>", $infos_streams);
+ $infos_streams = implode("<br />", $infos_streams);
$tpl->assign("module_infosTxt", $infos_streams);
} else
$tpl->assign("module_infosTxt", false);
@@ -134,7 +134,7 @@ For information : contact@oreon-project.org
}
if (is_dir("./modules/".$moduleinfo["name"]."/UPGRADE/".$filename."/infos") && is_file("./modules/".$moduleinfo["name"]."/UPGRADE/".$filename."/infos/infos.txt")) {
$infos_streams = file("./modules/".$moduleinfo["name"]."/UPGRADE/".$filename."/infos/infos.txt");
- $infos_streams = implode("<br>", $infos_streams);
+ $infos_streams = implode("<br />", $infos_streams);
$upgrade_infosTxt = $infos_streams;
}
else
diff --git a/www/include/options/oreon/myAccount/DB-Func.php b/www/include/options/oreon/myAccount/DB-Func.php
index ac9cfea5dbae32872f4b0c57869afcc759caf6c4..5a8156d5a5437ca19cc0c23dccef427f39f10f33 100644
--- a/www/include/options/oreon/myAccount/DB-Func.php
+++ b/www/include/options/oreon/myAccount/DB-Func.php
@@ -78,7 +78,7 @@ For information : contact@oreon-project.org
$rq .= "WHERE contact_id = '".$contact_id."'";
$DBRESULT =& $pearDB->query($rq);
if (PEAR::isError($DBRESULT))
- print $DBRESULT->getDebugInfo()."<br>";
+ print $DBRESULT->getDebugInfo()."<br />";
$oreon->user->name = $ret["contact_name"];
$oreon->user->alias = $ret["contact_alias"];
$oreon->user->lang = $ret["contact_lang"];
diff --git a/www/include/options/oreon/myAccount/formMyAccount.php b/www/include/options/oreon/myAccount/formMyAccount.php
index 4fe765fd0cdb28e251a457bb0b1ee0e459a2a046..d94bbf56c7c5f6f17b3b4a3588fc86e36890858c 100644
--- a/www/include/options/oreon/myAccount/formMyAccount.php
+++ b/www/include/options/oreon/myAccount/formMyAccount.php
@@ -42,7 +42,7 @@ For information : contact@oreon-project.org
if ($o == "c") {
$DBRESULT =& $pearDB->query("SELECT contact_id, contact_name, contact_alias, contact_lang, contact_email, contact_pager FROM contact WHERE contact_id = '".$oreon->user->get_id()."' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print $DBRESULT->getDebugInfo()."<br>";
+ print $DBRESULT->getDebugInfo()."<br />";
# Set base value
$cct = array_map("myDecode", $DBRESULT->fetchRow());
}
diff --git a/www/include/options/oreon/upGrade/functions.php b/www/include/options/oreon/upGrade/functions.php
index bb9146c67863487409a252da705a17f20f1336a2..e896c26bfd5d0f68e136e0a8d0e1783649eff9dc 100644
--- a/www/include/options/oreon/upGrade/functions.php
+++ b/www/include/options/oreon/upGrade/functions.php
@@ -28,7 +28,7 @@ function getConfigPatch() {
$query = "SELECT `patch_type_stable`, `patch_type_RC`, `patch_type_patch`, `patch_type_secu`, `patch_type_beta`, `patch_url_service`, `patch_url_download`, `patch_path_download` FROM `general_opt` LIMIT 1";
$result = $pearDB->query($query);
if (PEAR::isError($result)) {
- print $result->getDebugInfo()."<br>";
+ print $result->getDebugInfo()."<br />";
return(false);
}
$row =& $result->fetchRow();
@@ -45,7 +45,7 @@ function getCurrentVersion() {
$query = "SELECT value FROM oreon_informations WHERE `key`='version'";
$DBRESULT =& $pearDB->query($query);
if (PEAR::isError($DBRESULT)) {
- print $DBRESULT->getDebugInfo()."<br>";
+ print $DBRESULT->getDebugInfo()."<br />";
return(false);
}
if ($DBRESULT->numRows() != 1) {
diff --git a/www/include/options/sysInfos/ChangeLog b/www/include/options/sysInfos/ChangeLog
index db332e4b9cd2b17013c401722bfb38b5edb80bd9..7e09c0fc169f9a96d75e97de7c269146d47d5b49 100644
--- a/www/include/options/sysInfos/ChangeLog
+++ b/www/include/options/sysInfos/ChangeLog
@@ -1399,7 +1399,7 @@
* includes/os/class.Linux.inc.php: linux 2.5 or above memory
display bug fix ( Marcelo de Paula Bezerra <mosca at
- users.sf.net> ) and ( Frederik Sch�ler <fschueler at gmx.net> )
+ users.sf.net> ) and ( Frederik Sch�ler <fschueler at gmx.net> )
2003-10-14 18:28 webbie (webbie at ipfw dot org)
@@ -1483,7 +1483,7 @@
2003-03-31 21:22 precision Uriah Welcome (precision at users.sf.net)
* includes/lang/pt-br.php: Adding Portuguese-Brazil translation
- (Marc�lio Maia <marcilio at edn.org.br>)
+ (Marc�lio Maia <marcilio at edn.org.br>)
2003-02-23 09:04 webbie (webbie at ipfw dot org)
@@ -2501,7 +2501,7 @@
2001-05-30 18:07 precision Uriah Welcome (precision at users.sf.net)
- * templates/classic/form.tpl (tags: rel-1-9): added a <br>
+ * templates/classic/form.tpl (tags: rel-1-9): added a <br />
2001-05-30 18:07 precision Uriah Welcome (precision at users.sf.net)
diff --git a/www/include/options/sysInfos/images/ChangeLog b/www/include/options/sysInfos/images/ChangeLog
index db332e4b9cd2b17013c401722bfb38b5edb80bd9..7e09c0fc169f9a96d75e97de7c269146d47d5b49 100644
--- a/www/include/options/sysInfos/images/ChangeLog
+++ b/www/include/options/sysInfos/images/ChangeLog
@@ -1399,7 +1399,7 @@
* includes/os/class.Linux.inc.php: linux 2.5 or above memory
display bug fix ( Marcelo de Paula Bezerra <mosca at
- users.sf.net> ) and ( Frederik Sch�ler <fschueler at gmx.net> )
+ users.sf.net> ) and ( Frederik Sch�ler <fschueler at gmx.net> )
2003-10-14 18:28 webbie (webbie at ipfw dot org)
@@ -1483,7 +1483,7 @@
2003-03-31 21:22 precision Uriah Welcome (precision at users.sf.net)
* includes/lang/pt-br.php: Adding Portuguese-Brazil translation
- (Marc�lio Maia <marcilio at edn.org.br>)
+ (Marc�lio Maia <marcilio at edn.org.br>)
2003-02-23 09:04 webbie (webbie at ipfw dot org)
@@ -2501,7 +2501,7 @@
2001-05-30 18:07 precision Uriah Welcome (precision at users.sf.net)
- * templates/classic/form.tpl (tags: rel-1-9): added a <br>
+ * templates/classic/form.tpl (tags: rel-1-9): added a <br />
2001-05-30 18:07 precision Uriah Welcome (precision at users.sf.net)
diff --git a/www/include/options/sysInfos/images/includes/XPath.class.php b/www/include/options/sysInfos/images/includes/XPath.class.php
index 156e38a786ae2f374a656845b2b887cc68695e96..dbac8566d805df7f35a0e2347400a2eeaadaf326 100644
--- a/www/include/options/sysInfos/images/includes/XPath.class.php
+++ b/www/include/options/sysInfos/images/includes/XPath.class.php
@@ -1412,7 +1412,7 @@ class XPathEngine extends XPathBase {
$bDebugThisFunction = in_array($ThisFunctionName, $this->aDebugFunctions);
$this->_beginDebugFunction($ThisFunctionName, $bDebugThisFunction);
if ($bDebugThisFunction) {
- echo "Exporting node: ".$node['xpath']."<br>\n";
+ echo "Exporting node: ".$node['xpath']."<br />\n";
}
////////////////////////////////
@@ -1726,8 +1726,8 @@ class XPathEngine extends XPathBase {
$bDebugThisFunction = in_array($ThisFunctionName, $this->aDebugFunctions);
$this->_beginDebugFunction($ThisFunctionName, $bDebugThisFunction);
if ($bDebugThisFunction) {
- echo "Importing from string of length ".strlen($xmlString)." to node '$absoluteParentPath'\n<br>";
- echo "Parser options:\n<br>";
+ echo "Importing from string of length ".strlen($xmlString)." to node '$absoluteParentPath'\n<br />";
+ echo "Parser options:\n<br />";
print_r($this->parseOptions);
}
@@ -1863,8 +1863,8 @@ class XPathEngine extends XPathBase {
}
if ($this->bDebugXmlParse) {
- echo "<blockquote>" . htmlspecialchars("Start node: <".$nodeName . ">")."<br>";
- echo "Appended to stack entry: $this->parseStackIndex<br>\n";
+ echo "<blockquote>" . htmlspecialchars("Start node: <".$nodeName . ">")."<br />";
+ echo "Appended to stack entry: $this->parseStackIndex<br />\n";
echo "Text part before element is: ".htmlspecialchars($this->parsedTextLocation);
/*
echo "<pre>";
@@ -1891,9 +1891,9 @@ class XPathEngine extends XPathBase {
// Set the attributes.
if (!empty($attributes)) {
if ($this->bDebugXmlParse) {
- echo 'Attributes: <br>';
+ echo 'Attributes: <br />';
print_r($attributes);
- echo '<br>';
+ echo '<br />';
}
$this->nodeStack[$this->parseStackIndex]['attributes'] = $attributes;
}
@@ -1922,8 +1922,8 @@ class XPathEngine extends XPathBase {
}
if ($this->bDebugXmlParse) {
- echo "Text part after element is: ".htmlspecialchars($this->parsedTextLocation)."<br>\n";
- echo htmlspecialchars("Parent:<{$this->parseStackIndex}>, End-node:</$name> '".$this->parsedTextLocation) . "'<br>Text nodes:<pre>\n";
+ echo "Text part after element is: ".htmlspecialchars($this->parsedTextLocation)."<br />\n";
+ echo htmlspecialchars("Parent:<{$this->parseStackIndex}>, End-node:</$name> '".$this->parsedTextLocation) . "'<br />Text nodes:<pre>\n";
$dataPartsCount = count($this->nodeStack[$this->parseStackIndex]['textParts']);
for ($i = 0; $i < $dataPartsCount; $i++) {
echo "$i:". htmlspecialchars($this->nodeStack[$this->parseStackIndex]['textParts'][$i])."\n";
@@ -1962,7 +1962,7 @@ class XPathEngine extends XPathBase {
if ($this->parsInCData >0) $text = $this->_translateAmpersand($text, $reverse=TRUE);
- if ($this->bDebugXmlParse) echo "Handling character data: '".htmlspecialchars($text)."'<br>";
+ if ($this->bDebugXmlParse) echo "Handling character data: '".htmlspecialchars($text)."'<br />";
if ($this->parseSkipWhiteCache AND !empty($text) AND !$this->parsInCData) {
// Special case CR. CR always comes in a separate data. Trans. it to '' or ' '.
// If txtBuffer is already ending with a space use '' otherwise ' '.
@@ -1976,7 +1976,7 @@ class XPathEngine extends XPathBase {
$text = preg_replace('/\s+/', ' ', $text);
}
}
- if ($this->bDebugXmlParse) echo "'Skip white space' is ON. reduced to : '" .htmlspecialchars($text) . "'<br>";
+ if ($this->bDebugXmlParse) echo "'Skip white space' is ON. reduced to : '" .htmlspecialchars($text) . "'<br />";
}
$this->parsedTextLocation .= $text;
}
@@ -2000,7 +2000,7 @@ class XPathEngine extends XPathBase {
if ($this->parsInCData < 0) $this->parsInCData = 0;
}
$this->parsedTextLocation .= $this->_translateAmpersand($text, $reverse=TRUE);
- if ($this->bDebugXmlParse) echo "Default handler data: ".htmlspecialchars($text)."<br>";
+ if ($this->bDebugXmlParse) echo "Default handler data: ".htmlspecialchars($text)."<br />";
break; // try-block
} while (FALSE); // END try-block
}
@@ -2075,7 +2075,7 @@ class XPathEngine extends XPathBase {
$bDebugThisFunction = in_array($ThisFunctionName, $this->aDebugFunctions);
$this->_beginDebugFunction($ThisFunctionName, $bDebugThisFunction);
if ($bDebugThisFunction) {
- echo "Current Node (parent-index) and the child to append : '{$stackParentIndex}' + '{$nodeName}' \n<br>";
+ echo "Current Node (parent-index) and the child to append : '{$stackParentIndex}' + '{$nodeName}' \n<br />";
}
*/
//////////////////////////////////////
@@ -4977,7 +4977,7 @@ class XPathEngine extends XPathBase {
*
* foreach ($aFunctions as $Function) {
* $id = $xPath->match("generate-id($Function)");
- * echo "<a href='#$id'>$Function</a><br>";
+ * echo "<a href='#$id'>$Function</a><br />";
* }
*
* foreach ($aFunctions as $Function) {
@@ -6274,7 +6274,7 @@ class XPath extends XPathEngine {
}
} while (FALSE);
- if ($this->properties['verboseLevel'] >= 2) $this->_displayMessage("'{$xPathQuery}' parameter from '{$function}' returned the following nodes: ".(count($xPathSet)?implode('<br>', $xPathSet):'[none]'), __LINE__, __FILE__);
+ if ($this->properties['verboseLevel'] >= 2) $this->_displayMessage("'{$xPathQuery}' parameter from '{$function}' returned the following nodes: ".(count($xPathSet)?implode('<br />', $xPathSet):'[none]'), __LINE__, __FILE__);
return $xPathSet;
}
} // END OF CLASS XPath
@@ -6296,7 +6296,7 @@ class XPath extends XPathEngine {
* Produces a short title line.
*/
function _title($title) {
- echo "<br><hr><b>" . htmlspecialchars($title) . "</b><hr>\n";
+ echo "<br /><hr><b>" . htmlspecialchars($title) . "</b><hr>\n";
}
$self = isSet($_SERVER) ? $_SERVER['PHP_SELF'] : $PHP_SELF;
@@ -6323,10 +6323,10 @@ EOD;
echo $xPath->exportAsHtml();
_title("Get some content");
- echo "Last text part in <AAA>: '" . $xPath->wholeText('/AAA[1]', -1) ."'<br>\n";
- echo "All the text in <AAA>: '" . $xPath->wholeText('/AAA[1]') ."'<br>\n";
- echo "The attibute value in <BBB> using getAttributes('/AAA[1]/BBB[1]', 'FOO'): '" . $xPath->getAttributes('/AAA[1]', 'FOO') ."'<br>\n";
- echo "The attibute value in <BBB> using getData('/AAA[1]/@FOO'): '" . $xPath->getData('/AAA[1]/@FOO') ."'<br>\n";
+ echo "Last text part in <AAA>: '" . $xPath->wholeText('/AAA[1]', -1) ."'<br />\n";
+ echo "All the text in <AAA>: '" . $xPath->wholeText('/AAA[1]') ."'<br />\n";
+ echo "The attibute value in <BBB> using getAttributes('/AAA[1]/BBB[1]', 'FOO'): '" . $xPath->getAttributes('/AAA[1]', 'FOO') ."'<br />\n";
+ echo "The attibute value in <BBB> using getData('/AAA[1]/@FOO'): '" . $xPath->getData('/AAA[1]/@FOO') ."'<br />\n";
_title("Append some additional XML below /AAA/BBB:");
$xPath->appendChild('/AAA[1]/BBB[1]', '<CCC> Step 1. Append new node </CCC>', $afterText=FALSE);
diff --git a/www/include/options/sysInfos/images/includes/class.Template.inc.php b/www/include/options/sysInfos/images/includes/class.Template.inc.php
index 9c3457ce9b2e3cd8f2a5668a971675e469425269..cc722dc6f6aade64d118fbacf4d0aace3328ed53 100644
--- a/www/include/options/sysInfos/images/includes/class.Template.inc.php
+++ b/www/include/options/sysInfos/images/includes/class.Template.inc.php
@@ -142,7 +142,7 @@
{
if ($this->debug)
{
- print "scalar: set *$varname* to *$value*<br>\n";
+ print "scalar: set *$varname* to *$value*<br />\n";
}
$this->varkeys[$varname] = $this->varname($varname);
$this->varvals[$varname] = str_replace('phpGroupWare','eGroupWare',$value);
@@ -157,7 +157,7 @@
{
if ($this->debug)
{
- print "array: set *$k* to *$v*<br>\n";
+ print "array: set *$k* to *$v*<br />\n";
}
$this->varkeys[$k] = $this->varname($k);
$this->varvals[$k] = str_replace('phpGroupWare','eGroupWare',$v);
@@ -444,6 +444,6 @@
*/
function haltmsg($msg)
{
- printf("<b>Template Error:</b> %s<br>\n", $msg);
+ printf("<b>Template Error:</b> %s<br />\n", $msg);
}
}
diff --git a/www/include/options/sysInfos/images/includes/system_footer.php b/www/include/options/sysInfos/images/includes/system_footer.php
index 04a43fb584d7b1067578004e8dfe87cc63a822c8..f863803dac636e9849c5fbe38586f255a358e7c0 100644
--- a/www/include/options/sysInfos/images/includes/system_footer.php
+++ b/www/include/options/sysInfos/images/includes/system_footer.php
@@ -91,13 +91,13 @@ if (!$hide_picklist) {
echo "\n\n</center>";
} else {
- echo "\n\n<br>";
+ echo "\n\n<br />";
}
echo "\n<hr>\n" . $text['created'];
*/
echo ' <a href="http://phpsysinfo.sourceforge.net" target="_blank">phpSysInfo-' . $VERSION . '</a> ' . strftime ($text['gen_time'], time());
-echo "\n<br>\n</body>\n</html>\n";
+echo "\n<br />\n</body>\n</html>\n";
?>
diff --git a/www/include/options/sysInfos/images/includes/xml/hardware.php b/www/include/options/sysInfos/images/includes/xml/hardware.php
index 6e60c5660338785879f1e101b6ad0c4aee116a27..a0a15457db2602387ea18f0dfa3b139323320f23 100644
--- a/www/include/options/sysInfos/images/includes/xml/hardware.php
+++ b/www/include/options/sysInfos/images/includes/xml/hardware.php
@@ -158,7 +158,7 @@ function html_hardware ()
for ($i = 1, $max = sizeof($XPath->getDataParts('/phpsysinfo/Hardware/PCI')); $i < $max; $i++) {
if ($XPath->match("/phpsysinfo/Hardware/PCI/Device[$i]/Name")) {
- $pci_devices .= $XPath->getData("/phpsysinfo/Hardware/PCI/Device[$i]/Name") . '<br>';
+ $pci_devices .= $XPath->getData("/phpsysinfo/Hardware/PCI/Device[$i]/Name") . '<br />';
}
}
@@ -168,7 +168,7 @@ function html_hardware ()
if ($XPath->match("/phpsysinfo/Hardware/IDE/Device[$i]/Capacity")) {
$ide_devices .= " (" . $text['capacity'] . ": " . format_bytesize($XPath->getData("/phpsysinfo/Hardware/IDE/Device[$i]/Capacity") / 2) . ")";
}
- $ide_devices .= '<br>';
+ $ide_devices .= '<br />';
}
}
@@ -178,13 +178,13 @@ function html_hardware ()
if ($XPath->match("/phpsysinfo/Hardware/SCSI/Device[$i]/Capacity")) {
$scsi_devices .= " (" . $text['capacity'] . ": " . format_bytesize($XPath->getData("/phpsysinfo/Hardware/SCSI/Device[$i]/Capacity") / 2) . ")";
}
- $scsi_devices .= '<br>';
+ $scsi_devices .= '<br />';
}
}
for ($i = 1, $max = sizeof($XPath->getDataParts('/phpsysinfo/Hardware/USB')); $i < $max; $i++) {
if ($XPath->match("/phpsysinfo/Hardware/USB/Device[$i]/Name")) {
- $usb_devices .= $XPath->getData("/phpsysinfo/Hardware/USB/Device[$i]/Name") . '<br>';
+ $usb_devices .= $XPath->getData("/phpsysinfo/Hardware/USB/Device[$i]/Name") . '<br />';
}
}
diff --git a/www/include/options/sysInfos/includes/XPath.class.php b/www/include/options/sysInfos/includes/XPath.class.php
index 156e38a786ae2f374a656845b2b887cc68695e96..dbac8566d805df7f35a0e2347400a2eeaadaf326 100644
--- a/www/include/options/sysInfos/includes/XPath.class.php
+++ b/www/include/options/sysInfos/includes/XPath.class.php
@@ -1412,7 +1412,7 @@ class XPathEngine extends XPathBase {
$bDebugThisFunction = in_array($ThisFunctionName, $this->aDebugFunctions);
$this->_beginDebugFunction($ThisFunctionName, $bDebugThisFunction);
if ($bDebugThisFunction) {
- echo "Exporting node: ".$node['xpath']."<br>\n";
+ echo "Exporting node: ".$node['xpath']."<br />\n";
}
////////////////////////////////
@@ -1726,8 +1726,8 @@ class XPathEngine extends XPathBase {
$bDebugThisFunction = in_array($ThisFunctionName, $this->aDebugFunctions);
$this->_beginDebugFunction($ThisFunctionName, $bDebugThisFunction);
if ($bDebugThisFunction) {
- echo "Importing from string of length ".strlen($xmlString)." to node '$absoluteParentPath'\n<br>";
- echo "Parser options:\n<br>";
+ echo "Importing from string of length ".strlen($xmlString)." to node '$absoluteParentPath'\n<br />";
+ echo "Parser options:\n<br />";
print_r($this->parseOptions);
}
@@ -1863,8 +1863,8 @@ class XPathEngine extends XPathBase {
}
if ($this->bDebugXmlParse) {
- echo "<blockquote>" . htmlspecialchars("Start node: <".$nodeName . ">")."<br>";
- echo "Appended to stack entry: $this->parseStackIndex<br>\n";
+ echo "<blockquote>" . htmlspecialchars("Start node: <".$nodeName . ">")."<br />";
+ echo "Appended to stack entry: $this->parseStackIndex<br />\n";
echo "Text part before element is: ".htmlspecialchars($this->parsedTextLocation);
/*
echo "<pre>";
@@ -1891,9 +1891,9 @@ class XPathEngine extends XPathBase {
// Set the attributes.
if (!empty($attributes)) {
if ($this->bDebugXmlParse) {
- echo 'Attributes: <br>';
+ echo 'Attributes: <br />';
print_r($attributes);
- echo '<br>';
+ echo '<br />';
}
$this->nodeStack[$this->parseStackIndex]['attributes'] = $attributes;
}
@@ -1922,8 +1922,8 @@ class XPathEngine extends XPathBase {
}
if ($this->bDebugXmlParse) {
- echo "Text part after element is: ".htmlspecialchars($this->parsedTextLocation)."<br>\n";
- echo htmlspecialchars("Parent:<{$this->parseStackIndex}>, End-node:</$name> '".$this->parsedTextLocation) . "'<br>Text nodes:<pre>\n";
+ echo "Text part after element is: ".htmlspecialchars($this->parsedTextLocation)."<br />\n";
+ echo htmlspecialchars("Parent:<{$this->parseStackIndex}>, End-node:</$name> '".$this->parsedTextLocation) . "'<br />Text nodes:<pre>\n";
$dataPartsCount = count($this->nodeStack[$this->parseStackIndex]['textParts']);
for ($i = 0; $i < $dataPartsCount; $i++) {
echo "$i:". htmlspecialchars($this->nodeStack[$this->parseStackIndex]['textParts'][$i])."\n";
@@ -1962,7 +1962,7 @@ class XPathEngine extends XPathBase {
if ($this->parsInCData >0) $text = $this->_translateAmpersand($text, $reverse=TRUE);
- if ($this->bDebugXmlParse) echo "Handling character data: '".htmlspecialchars($text)."'<br>";
+ if ($this->bDebugXmlParse) echo "Handling character data: '".htmlspecialchars($text)."'<br />";
if ($this->parseSkipWhiteCache AND !empty($text) AND !$this->parsInCData) {
// Special case CR. CR always comes in a separate data. Trans. it to '' or ' '.
// If txtBuffer is already ending with a space use '' otherwise ' '.
@@ -1976,7 +1976,7 @@ class XPathEngine extends XPathBase {
$text = preg_replace('/\s+/', ' ', $text);
}
}
- if ($this->bDebugXmlParse) echo "'Skip white space' is ON. reduced to : '" .htmlspecialchars($text) . "'<br>";
+ if ($this->bDebugXmlParse) echo "'Skip white space' is ON. reduced to : '" .htmlspecialchars($text) . "'<br />";
}
$this->parsedTextLocation .= $text;
}
@@ -2000,7 +2000,7 @@ class XPathEngine extends XPathBase {
if ($this->parsInCData < 0) $this->parsInCData = 0;
}
$this->parsedTextLocation .= $this->_translateAmpersand($text, $reverse=TRUE);
- if ($this->bDebugXmlParse) echo "Default handler data: ".htmlspecialchars($text)."<br>";
+ if ($this->bDebugXmlParse) echo "Default handler data: ".htmlspecialchars($text)."<br />";
break; // try-block
} while (FALSE); // END try-block
}
@@ -2075,7 +2075,7 @@ class XPathEngine extends XPathBase {
$bDebugThisFunction = in_array($ThisFunctionName, $this->aDebugFunctions);
$this->_beginDebugFunction($ThisFunctionName, $bDebugThisFunction);
if ($bDebugThisFunction) {
- echo "Current Node (parent-index) and the child to append : '{$stackParentIndex}' + '{$nodeName}' \n<br>";
+ echo "Current Node (parent-index) and the child to append : '{$stackParentIndex}' + '{$nodeName}' \n<br />";
}
*/
//////////////////////////////////////
@@ -4977,7 +4977,7 @@ class XPathEngine extends XPathBase {
*
* foreach ($aFunctions as $Function) {
* $id = $xPath->match("generate-id($Function)");
- * echo "<a href='#$id'>$Function</a><br>";
+ * echo "<a href='#$id'>$Function</a><br />";
* }
*
* foreach ($aFunctions as $Function) {
@@ -6274,7 +6274,7 @@ class XPath extends XPathEngine {
}
} while (FALSE);
- if ($this->properties['verboseLevel'] >= 2) $this->_displayMessage("'{$xPathQuery}' parameter from '{$function}' returned the following nodes: ".(count($xPathSet)?implode('<br>', $xPathSet):'[none]'), __LINE__, __FILE__);
+ if ($this->properties['verboseLevel'] >= 2) $this->_displayMessage("'{$xPathQuery}' parameter from '{$function}' returned the following nodes: ".(count($xPathSet)?implode('<br />', $xPathSet):'[none]'), __LINE__, __FILE__);
return $xPathSet;
}
} // END OF CLASS XPath
@@ -6296,7 +6296,7 @@ class XPath extends XPathEngine {
* Produces a short title line.
*/
function _title($title) {
- echo "<br><hr><b>" . htmlspecialchars($title) . "</b><hr>\n";
+ echo "<br /><hr><b>" . htmlspecialchars($title) . "</b><hr>\n";
}
$self = isSet($_SERVER) ? $_SERVER['PHP_SELF'] : $PHP_SELF;
@@ -6323,10 +6323,10 @@ EOD;
echo $xPath->exportAsHtml();
_title("Get some content");
- echo "Last text part in <AAA>: '" . $xPath->wholeText('/AAA[1]', -1) ."'<br>\n";
- echo "All the text in <AAA>: '" . $xPath->wholeText('/AAA[1]') ."'<br>\n";
- echo "The attibute value in <BBB> using getAttributes('/AAA[1]/BBB[1]', 'FOO'): '" . $xPath->getAttributes('/AAA[1]', 'FOO') ."'<br>\n";
- echo "The attibute value in <BBB> using getData('/AAA[1]/@FOO'): '" . $xPath->getData('/AAA[1]/@FOO') ."'<br>\n";
+ echo "Last text part in <AAA>: '" . $xPath->wholeText('/AAA[1]', -1) ."'<br />\n";
+ echo "All the text in <AAA>: '" . $xPath->wholeText('/AAA[1]') ."'<br />\n";
+ echo "The attibute value in <BBB> using getAttributes('/AAA[1]/BBB[1]', 'FOO'): '" . $xPath->getAttributes('/AAA[1]', 'FOO') ."'<br />\n";
+ echo "The attibute value in <BBB> using getData('/AAA[1]/@FOO'): '" . $xPath->getData('/AAA[1]/@FOO') ."'<br />\n";
_title("Append some additional XML below /AAA/BBB:");
$xPath->appendChild('/AAA[1]/BBB[1]', '<CCC> Step 1. Append new node </CCC>', $afterText=FALSE);
diff --git a/www/include/options/sysInfos/includes/class.Template.inc.php b/www/include/options/sysInfos/includes/class.Template.inc.php
index 9c3457ce9b2e3cd8f2a5668a971675e469425269..cc722dc6f6aade64d118fbacf4d0aace3328ed53 100644
--- a/www/include/options/sysInfos/includes/class.Template.inc.php
+++ b/www/include/options/sysInfos/includes/class.Template.inc.php
@@ -142,7 +142,7 @@
{
if ($this->debug)
{
- print "scalar: set *$varname* to *$value*<br>\n";
+ print "scalar: set *$varname* to *$value*<br />\n";
}
$this->varkeys[$varname] = $this->varname($varname);
$this->varvals[$varname] = str_replace('phpGroupWare','eGroupWare',$value);
@@ -157,7 +157,7 @@
{
if ($this->debug)
{
- print "array: set *$k* to *$v*<br>\n";
+ print "array: set *$k* to *$v*<br />\n";
}
$this->varkeys[$k] = $this->varname($k);
$this->varvals[$k] = str_replace('phpGroupWare','eGroupWare',$v);
@@ -444,6 +444,6 @@
*/
function haltmsg($msg)
{
- printf("<b>Template Error:</b> %s<br>\n", $msg);
+ printf("<b>Template Error:</b> %s<br />\n", $msg);
}
}
diff --git a/www/include/options/sysInfos/includes/system_footer.php b/www/include/options/sysInfos/includes/system_footer.php
index 00491fc3aecf68a040242d41c5df179657c4342a..1d449173ce3d768c33b9fdbd4d81ec29b2e0cc02 100644
--- a/www/include/options/sysInfos/includes/system_footer.php
+++ b/www/include/options/sysInfos/includes/system_footer.php
@@ -91,7 +91,7 @@ if (!$hide_picklist) {
echo "\n\n</center>";
} else {
- echo "\n\n<br>";
+ echo "\n\n<br />";
}
echo "\n<hr>\n" . $text['created'];
@@ -100,5 +100,5 @@ echo "\n<hr>\n" . $text['created'];
echo ' <a href="http://phpsysinfo.sourceforge.net" target="_blank">phpSysInfo-' . $VERSION . '</a> ';
-echo "\n<br>\n</body>\n</html>\n";
+echo "\n<br />\n</body>\n</html>\n";
?>
\ No newline at end of file
diff --git a/www/include/options/sysInfos/includes/xml/hardware.php b/www/include/options/sysInfos/includes/xml/hardware.php
index 4436aa3335add5906b5910428f0902ccbc75b104..16caf074dd79bde8c47b70a193d417b972369d82 100644
--- a/www/include/options/sysInfos/includes/xml/hardware.php
+++ b/www/include/options/sysInfos/includes/xml/hardware.php
@@ -158,7 +158,7 @@ function html_hardware ()
for ($i = 1, $max = sizeof($XPath->getDataParts('/phpsysinfo/Hardware/PCI')); $i < $max; $i++) {
if ($XPath->match("/phpsysinfo/Hardware/PCI/Device[$i]/Name")) {
- $pci_devices .= $XPath->getData("/phpsysinfo/Hardware/PCI/Device[$i]/Name") . '<br>';
+ $pci_devices .= $XPath->getData("/phpsysinfo/Hardware/PCI/Device[$i]/Name") . '<br />';
}
}
@@ -168,7 +168,7 @@ function html_hardware ()
if ($XPath->match("/phpsysinfo/Hardware/IDE/Device[$i]/Capacity")) {
$ide_devices .= " (" . $text['capacity'] . ": " . format_bytesize($XPath->getData("/phpsysinfo/Hardware/IDE/Device[$i]/Capacity") / 2) . ")";
}
- $ide_devices .= '<br>';
+ $ide_devices .= '<br />';
}
}
@@ -178,13 +178,13 @@ function html_hardware ()
if ($XPath->match("/phpsysinfo/Hardware/SCSI/Device[$i]/Capacity")) {
$scsi_devices .= " (" . $text['capacity'] . ": " . format_bytesize($XPath->getData("/phpsysinfo/Hardware/SCSI/Device[$i]/Capacity") / 2) . ")";
}
- $scsi_devices .= '<br>';
+ $scsi_devices .= '<br />';
}
}
for ($i = 1, $max = sizeof($XPath->getDataParts('/phpsysinfo/Hardware/USB')); $i < $max; $i++) {
if ($XPath->match("/phpsysinfo/Hardware/USB/Device[$i]/Name")) {
- $usb_devices .= $XPath->getData("/phpsysinfo/Hardware/USB/Device[$i]/Name") . '<br>';
+ $usb_devices .= $XPath->getData("/phpsysinfo/Hardware/USB/Device[$i]/Name") . '<br />';
}
}
diff --git a/www/include/options/sysInfos/templates/blue/form.tpl b/www/include/options/sysInfos/templates/blue/form.tpl
index c98f4259a0035a883d1994689db3118e68d80358..766c429e18aba062753d70fb27eebf848bdf01b6 100644
--- a/www/include/options/sysInfos/templates/blue/form.tpl
+++ b/www/include/options/sysInfos/templates/blue/form.tpl
@@ -4,7 +4,7 @@
<tr>
<td width="50%" valign="top">
{vitals}
- <br>
+ <br />
{network}
</td>
@@ -30,7 +30,7 @@
<tr>
<td width="55%" valign="top">
{mbtemp}
- <br>
+ <br />
{mbfans}
</td>
<td width="45%" valign="top">
diff --git a/www/include/options/sysInfos/templates/bulix/form.tpl b/www/include/options/sysInfos/templates/bulix/form.tpl
index fbc27206b78ef8af26fa6c1eb804598ee4b7a698..56094f7c0712e337ca969804e937bf35ec840517 100644
--- a/www/include/options/sysInfos/templates/bulix/form.tpl
+++ b/www/include/options/sysInfos/templates/bulix/form.tpl
@@ -6,9 +6,9 @@
<tr>
<td width="50%" valign="top">
{vitals}
- <br>
+ <br />
{network}
- <br>
+ <br />
{memory}
</td>
@@ -19,7 +19,7 @@
<tr>
<td colspan="2">
- <br>
+ <br />
{filesystems}
</td>
</tr>
diff --git a/www/include/options/sysInfos/templates/classic/form.tpl b/www/include/options/sysInfos/templates/classic/form.tpl
index 42711fd36bc1b3477adaea8d96eb20464ff139a7..c2d4649d355f34c05165b66c5b200c9d891fa5c4 100644
--- a/www/include/options/sysInfos/templates/classic/form.tpl
+++ b/www/include/options/sysInfos/templates/classic/form.tpl
@@ -4,7 +4,7 @@
<tr>
<td width="50%" valign="top">
{vitals}
- <br>
+ <br />
{network}
</td>
@@ -30,7 +30,7 @@
<tr>
<td width="55%" valign="top">
{mbtemp}
- <br>
+ <br />
{mbfans}
</td>
diff --git a/www/include/options/sysInfos/templates/orange/form.tpl b/www/include/options/sysInfos/templates/orange/form.tpl
index 42711fd36bc1b3477adaea8d96eb20464ff139a7..c2d4649d355f34c05165b66c5b200c9d891fa5c4 100644
--- a/www/include/options/sysInfos/templates/orange/form.tpl
+++ b/www/include/options/sysInfos/templates/orange/form.tpl
@@ -4,7 +4,7 @@
<tr>
<td width="50%" valign="top">
{vitals}
- <br>
+ <br />
{network}
</td>
@@ -30,7 +30,7 @@
<tr>
<td width="55%" valign="top">
{mbtemp}
- <br>
+ <br />
{mbfans}
</td>
diff --git a/www/include/options/sysInfos/templates/typo3/form.tpl b/www/include/options/sysInfos/templates/typo3/form.tpl
index 42711fd36bc1b3477adaea8d96eb20464ff139a7..c2d4649d355f34c05165b66c5b200c9d891fa5c4 100644
--- a/www/include/options/sysInfos/templates/typo3/form.tpl
+++ b/www/include/options/sysInfos/templates/typo3/form.tpl
@@ -4,7 +4,7 @@
<tr>
<td width="50%" valign="top">
{vitals}
- <br>
+ <br />
{network}
</td>
@@ -30,7 +30,7 @@
<tr>
<td width="55%" valign="top">
{mbtemp}
- <br>
+ <br />
{mbfans}
</td>
diff --git a/www/include/reporting/dashboard/ExportCSV_HostGroupLog.php b/www/include/reporting/dashboard/ExportCSV_HostGroupLog.php
index e61cd07c89039ab3fb3e1ce5715bf5be96e1b0de..12da3f7a790626c4008101117e83e04cccb481d8 100644
--- a/www/include/reporting/dashboard/ExportCSV_HostGroupLog.php
+++ b/www/include/reporting/dashboard/ExportCSV_HostGroupLog.php
@@ -28,7 +28,7 @@ For information : contact@oreon-project.org
}
function get_error($str){
- echo $str."<br>";
+ echo $str."<br />";
exit(0);
}
diff --git a/www/include/reporting/dashboard/ExportCSV_HostLog.php b/www/include/reporting/dashboard/ExportCSV_HostLog.php
index 86f0a68dfda19017dd9a688ff178bc23808a76c4..53c9a1d0b77593d5c48c2d891bb15dbb09cb7c3a 100644
--- a/www/include/reporting/dashboard/ExportCSV_HostLog.php
+++ b/www/include/reporting/dashboard/ExportCSV_HostLog.php
@@ -27,7 +27,7 @@ For information : contact@oreon-project.org
}
function get_error($str){
- echo $str."<br>";
+ echo $str."<br />";
exit(0);
}
diff --git a/www/include/reporting/dashboard/ExportCSV_ServiceGroupLog.php b/www/include/reporting/dashboard/ExportCSV_ServiceGroupLog.php
index 6453c531335c3e22d5f656932995a0a3bfec1de1..43ca9e3190d0093952dcd551ef85c9a2fd60f13d 100644
--- a/www/include/reporting/dashboard/ExportCSV_ServiceGroupLog.php
+++ b/www/include/reporting/dashboard/ExportCSV_ServiceGroupLog.php
@@ -27,7 +27,7 @@ For information : contact@oreon-project.org
}
function get_error($str){
- echo $str."<br>";
+ echo $str."<br />";
exit(0);
}
diff --git a/www/include/reporting/dashboard/ExportCSV_ServiceLog.php b/www/include/reporting/dashboard/ExportCSV_ServiceLog.php
index a03be2b77312fc0b01841dbc3dd461be63852086..e6dca63abdc6de5d0220a5721b9a36dcb37ddf8e 100644
--- a/www/include/reporting/dashboard/ExportCSV_ServiceLog.php
+++ b/www/include/reporting/dashboard/ExportCSV_ServiceLog.php
@@ -28,7 +28,7 @@ For information : contact@oreon-project.org
}
function get_error($str){
- echo $str."<br>";
+ echo $str."<br />";
exit(0);
}
diff --git a/www/include/reporting/dashboard/GetXmlHost.php b/www/include/reporting/dashboard/GetXmlHost.php
index d5c90292796492d338cb309470bc4d62c0d6a318..8744c302319538cf6ae6b134d75eed5982ae8e1e 100644
--- a/www/include/reporting/dashboard/GetXmlHost.php
+++ b/www/include/reporting/dashboard/GetXmlHost.php
@@ -185,12 +185,12 @@ For information : contact@oreon-project.org
#
## make bubul
#
- $bubultab = '{table class=bubultab}';
- $bubultab .= '{tr}{td class=bubuleft colspan=3}Day: '. date("d/m/Y", $start) .' -- Duration: '.Duration::toString($tt).'{/td}{td class=bubuleft }Alert{/td}{/tr}';
- $bubultab .= '{tr}{td class=bubuleft style="background:#'.$colorUP.';" }Up:{/td}{td class=bubul}'. Duration::toString($uptime) .'{/td}{td class=bubul}'.(($pup > 0) ? $pup : "0").'%{/td}{td class=bubul}'.$h["UPnbEvent"].'{/td}{/tr}';
- $bubultab .= '{tr}{td class=bubuleft style="background:#'.$colorDOWN.';" }Down:{/td}{td class=bubul}'.Duration::toString($downtime).'{/td}{td class=bubul}'.(($pdown > 0) ? $pdown : "0").'%{/td}{td class=bubul}'.$h["DOWNnbEvent"].'{/td}{/tr}';
- $bubultab .= '{tr}{td class=bubuleft style="background:#'.$colorUNREACHABLE.';" }Unreachable:{/td}{td class=bubul}'.Duration::toString($unreachalbetime).'{/td}{td class=bubul}'.(($punreach > 0) ? $punreach : "0").'%{/td}{td class=bubul}'.$h["UNREACHABLEnbEvent"].'{/td}{/tr}';
- $bubultab .= '{tr}{td class=bubuleft style="background:#cccccc;" }Undeterminated:{/td}{td class=bubul}'.Duration::toString($undeterminatetime).'{/td}{td class=bubul}'.(($pundet > 0) ? $pundet : "0").'%{/td}{/tr}';
+ $bubultab = '{table class=bulleDashtab}';
+ $bubultab .= '{tr}{td class=bulleDashleft colspan=3}Day: '. date("d/m/Y", $start) .' -- Duration: '.Duration::toString($tt).'{/td}{td class=bulleDashleft }Alert{/td}{/tr}';
+ $bubultab .= '{tr}{td class=bulleDashleft style="background:#'.$colorUP.';" }Up:{/td}{td class=bulleDash}'. Duration::toString($uptime) .'{/td}{td class=bulleDash}'.(($pup > 0) ? $pup : "0").'%{/td}{td class=bulleDash}'.$h["UPnbEvent"].'{/td}{/tr}';
+ $bubultab .= '{tr}{td class=bulleDashleft style="background:#'.$colorDOWN.';" }Down:{/td}{td class=bulleDash}'.Duration::toString($downtime).'{/td}{td class=bulleDash}'.(($pdown > 0) ? $pdown : "0").'%{/td}{td class=bulleDash}'.$h["DOWNnbEvent"].'{/td}{/tr}';
+ $bubultab .= '{tr}{td class=bulleDashleft style="background:#'.$colorUNREACHABLE.';" }Unreachable:{/td}{td class=bulleDash}'.Duration::toString($unreachalbetime).'{/td}{td class=bulleDash}'.(($punreach > 0) ? $punreach : "0").'%{/td}{td class=bulleDash}'.$h["UNREACHABLEnbEvent"].'{/td}{/tr}';
+ $bubultab .= '{tr}{td class=bulleDashleft style="background:#cccccc;" }Undeterminated:{/td}{td class=bulleDash}'.Duration::toString($undeterminatetime).'{/td}{td class=bulleDash}'.(($pundet > 0) ? $pundet : "0").'%{/td}{/tr}';
$bubultab .= '{/table}';
$tp = round(($pundet * $t / 100 ),2);
@@ -268,12 +268,12 @@ For information : contact@oreon-project.org
#
## make bubul
#
- $bubultab = '{table class=bubultab}';
- $bubultab .= '{tr}{td class=bubuleft colspan=3}Day: '. date("d/m/Y", $start) .' -- Duration: '.Duration::toString($t).'{/td}{td class=bubuleft }Alert{/td}{/tr}';
- $bubultab .= '{tr}{td class=bubuleft style="background:#'.$colorUP.';" }Up:{/td}{td class=bubul}'. Duration::toString($_GET["today_up"] * $t / 100) .'{/td}{td class=bubul}'.$_GET["today_up"].'%{/td}{td class=bubul}'.$_GET["today_UPnbEvent"].'{/td}{/tr}';
- $bubultab .= '{tr}{td class=bubuleft style="background:#'.$colorDOWN.';" }Down:{/td}{td class=bubul}'.Duration::toString($_GET["today_down"] * $t / 100).'{/td}{td class=bubul}'.$_GET["today_down"].'%{/td}{td class=bubul}'.$_GET["today_DOWNnbEvent"].'{/td}{/tr}';
- $bubultab .= '{tr}{td class=bubuleft style="background:#'.$colorUNREACHABLE.';" }Unreachable:{/td}{td class=bubul}'.Duration::toString(0+$_GET["today_unreachable"] * $t / 100) .'{/td}{td class=bubul}'.$_GET["today_unreachable"].'%{/td}{td class=bubul}'.$_GET["today_UNREACHABLEnbEvent"].'{/td}{/tr}';
- $bubultab .= '{tr}{td class=bubuleft style="background:#cccccc;" }Undeterminated:{/td}{td class=bubul}'.Duration::toString($_GET["today_pending"] * $t / 100).'{/td}{td class=bubul}'.$_GET["today_pending"].'%{/td}{/tr}';
+ $bubultab = '{table class=bulleDashtab}';
+ $bubultab .= '{tr}{td class=bulleDashleft colspan=3}Day: '. date("d/m/Y", $start) .' -- Duration: '.Duration::toString($t).'{/td}{td class=bulleDashleft }Alert{/td}{/tr}';
+ $bubultab .= '{tr}{td class=bulleDashleft style="background:#'.$colorUP.';" }Up:{/td}{td class=bulleDash}'. Duration::toString($_GET["today_up"] * $t / 100) .'{/td}{td class=bulleDash}'.$_GET["today_up"].'%{/td}{td class=bulleDash}'.$_GET["today_UPnbEvent"].'{/td}{/tr}';
+ $bubultab .= '{tr}{td class=bulleDashleft style="background:#'.$colorDOWN.';" }Down:{/td}{td class=bulleDash}'.Duration::toString($_GET["today_down"] * $t / 100).'{/td}{td class=bulleDash}'.$_GET["today_down"].'%{/td}{td class=bulleDash}'.$_GET["today_DOWNnbEvent"].'{/td}{/tr}';
+ $bubultab .= '{tr}{td class=bulleDashleft style="background:#'.$colorUNREACHABLE.';" }Unreachable:{/td}{td class=bulleDash}'.Duration::toString(0+$_GET["today_unreachable"] * $t / 100) .'{/td}{td class=bulleDash}'.$_GET["today_unreachable"].'%{/td}{td class=bulleDash}'.$_GET["today_UNREACHABLEnbEvent"].'{/td}{/tr}';
+ $bubultab .= '{tr}{td class=bulleDashleft style="background:#cccccc;" }Undeterminated:{/td}{td class=bulleDash}'.Duration::toString($_GET["today_pending"] * $t / 100).'{/td}{td class=bulleDash}'.$_GET["today_pending"].'%{/td}{/tr}';
$bubultab .= '{/table}';
$t = round(($t - ($t * 0.11574074074)),2);
diff --git a/www/include/reporting/dashboard/GetXmlHostGroup.php b/www/include/reporting/dashboard/GetXmlHostGroup.php
index 59d48e747e5479b014a30bb535f286598c224d5d..21af63d47eed5208d28c0fa03afa0f67c6c65332 100644
--- a/www/include/reporting/dashboard/GetXmlHostGroup.php
+++ b/www/include/reporting/dashboard/GetXmlHostGroup.php
@@ -189,13 +189,13 @@ For information : contact@oreon-project.org
#
## make bubul
#
- $bubultab = '{table class=bubultab}';
- $bubultab .= '{tr}{td class=bubuleft colspan=3}Day: '. date("d/m/Y", $start) .' -- Duration: '.Duration::toString($tt).'{/td}{td class=bubuleft }Alert{/td}{/tr}';
- $bubultab .= '{tr}{td class=bubuleft style="background:#'.$colorUP.';" }Up:{/td}{td class=bubul}'. Duration::toString($uptime) .'{/td}{td class=bubul}'.(($pup > 0) ? $pup : "0").'%{/td}{td class=bubul}'.number_format($h["UPnbEvent"], 1,'.','').'{/td}{/tr}';
- $bubultab .= '{tr}{td class=bubuleft style="background:#'.$colorDOWN.';" }Down:{/td}{td class=bubul}'.Duration::toString($downtime).'{/td}{td class=bubul}'.(($pdown > 0) ? $pdown : "0").'%{/td}{td class=bubul}'.number_format($h["DOWNnbEvent"], 1,'.','').'{/td}{/tr}';
- $bubultab .= '{tr}{td class=bubuleft style="background:#'.$colorUNREACHABLE.';" }Unreachable:{/td}{td class=bubul}'.Duration::toString($unreachalbetime).'{/td}{td class=bubul}'.(($punreach > 0) ? $punreach : "0").'%{/td}{td class=bubul}'.number_format($h["UNREACHABLEnbEvent"], 1,'.','').'{/td}{/tr}';
- $bubultab .= '{tr}{td class=bubuleft style="background:#cccccc;" }Undeterminated:{/td}{td class=bubul}'.Duration::toString($undeterminatetime).'{/td}{td class=bubul}'.(($pundet > 0) ? $pundet : "0").'%{/td}{/tr}';
- $bubultab .= '{/table}';
+ $bulleDashtab = '{table class=bulleDashtab}';
+ $bulleDashtab .= '{tr}{td class=bulleDashleft colspan=3}Day: '. date("d/m/Y", $start) .' -- Duration: '.Duration::toString($tt).'{/td}{td class=bulleDashleft }Alert{/td}{/tr}';
+ $bulleDashtab .= '{tr}{td class=bulleDashleft style="background:#'.$colorUP.';" }Up:{/td}{td class=bulleDash}'. Duration::toString($uptime) .'{/td}{td class=bulleDash}'.(($pup > 0) ? $pup : "0").'%{/td}{td class=bulleDash}'.number_format($h["UPnbEvent"], 1,'.','').'{/td}{/tr}';
+ $bulleDashtab .= '{tr}{td class=bulleDashleft style="background:#'.$colorDOWN.';" }Down:{/td}{td class=bulleDash}'.Duration::toString($downtime).'{/td}{td class=bulleDash}'.(($pdown > 0) ? $pdown : "0").'%{/td}{td class=bulleDash}'.number_format($h["DOWNnbEvent"], 1,'.','').'{/td}{/tr}';
+ $bulleDashtab .= '{tr}{td class=bulleDashleft style="background:#'.$colorUNREACHABLE.';" }Unreachable:{/td}{td class=bulleDash}'.Duration::toString($unreachalbetime).'{/td}{td class=bulleDash}'.(($punreach > 0) ? $punreach : "0").'%{/td}{td class=bulleDash}'.number_format($h["UNREACHABLEnbEvent"], 1,'.','').'{/td}{/tr}';
+ $bulleDashtab .= '{tr}{td class=bulleDashleft style="background:#cccccc;" }Undeterminated:{/td}{td class=bulleDash}'.Duration::toString($undeterminatetime).'{/td}{td class=bulleDash}'.(($pundet > 0) ? $pundet : "0").'%{/td}{/tr}';
+ $bulleDashtab .= '{/table}';
$tp = round(($pundet * $t / 100 ),2);
if($pundet > 0){
@@ -206,7 +206,7 @@ For information : contact@oreon-project.org
$buffer .= ' color="#cccccc"';
$buffer .= ' isDuration="true" ';
$buffer .= ' title= "' . (($pundet > 0) ? $pundet : "0") . '%" >' ;
- $buffer .= $bubultab;
+ $buffer .= $bulleDashtab;
$buffer .= '</event>';
}
@@ -219,7 +219,7 @@ For information : contact@oreon-project.org
$buffer .= ' color="#' . $colorUNREACHABLE . '"';
$buffer .= ' isDuration="true" ';
$buffer .= ' title= "' . (($punreach > 0) ? $punreach : "0") . '%" >' ;
- $buffer .= $bubultab;
+ $buffer .= $bulleDashtab;
$buffer .= '</event>';
}
@@ -233,7 +233,7 @@ For information : contact@oreon-project.org
$buffer .= ' color="#' . $colorDOWN . '"';
$buffer .= ' isDuration="true" ';
$buffer .= ' title= "' . (($pdown > 0) ? $pdown : "0") . '%" >' ;
- $buffer .= $bubultab;
+ $buffer .= $bulleDashtab;
$buffer .= '</event>';
}
@@ -247,7 +247,7 @@ For information : contact@oreon-project.org
$buffer .= ' color="#' . $colorUP . '"';
$buffer .= ' isDuration="true" ';
$buffer .= ' title= "' . (($pup > 0) ? $pup : "0") . '%" >' ;
- $buffer .= $bubultab;
+ $buffer .= $bulleDashtab;
$buffer .= '</event>';
}
@@ -272,13 +272,13 @@ For information : contact@oreon-project.org
#
## make bubul
#
- $bubultab = '{table class=bubultab}';
- $bubultab .= '{tr}{td class=bubuleft colspan=3}Day: '. date("d/m/Y", $start) .' -- Duration: '.Duration::toString($t).'{/td}{td class=bubuleft }Alert{/td}{/tr}';
- $bubultab .= '{tr}{td class=bubuleft style="background:#'.$colorUP.';" }Up:{/td}{td class=bubul}'. Duration::toString($_GET["today_up"] * $t / 100) .'{/td}{td class=bubul}'.$_GET["today_up"].'%{/td}{td class=bubul}'.$_GET["today_UPnbEvent"].'{/td}{/tr}';
- $bubultab .= '{tr}{td class=bubuleft style="background:#'.$colorDOWN.';" }Down:{/td}{td class=bubul}'.Duration::toString($_GET["today_down"] * $t / 100).'{/td}{td class=bubul}'.$_GET["today_down"].'%{/td}{td class=bubul}'.$_GET["today_DOWNnbEvent"].'{/td}{/tr}';
- $bubultab .= '{tr}{td class=bubuleft style="background:#'.$colorUNREACHABLE.';" }Unreachable:{/td}{td class=bubul}'.Duration::toString(0+$_GET["today_unreachable"] * $t / 100) .'{/td}{td class=bubul}'.$_GET["today_unreachable"].'%{/td}{td class=bubul}'.$_GET["today_UNREACHABLEnbEvent"].'{/td}{/tr}';
- $bubultab .= '{tr}{td class=bubuleft style="background:#cccccc;" }Undeterminated:{/td}{td class=bubul}'.Duration::toString($_GET["today_pending"] * $t / 100).'{/td}{td class=bubul}'.$_GET["today_pending"].'%{/td}{/tr}';
- $bubultab .= '{/table}';
+ $bulleDashtab = '{table class=bulleDashtab}';
+ $bulleDashtab .= '{tr}{td class=bulleDashleft colspan=3}Day: '. date("d/m/Y", $start) .' -- Duration: '.Duration::toString($t).'{/td}{td class=bulleDashleft }Alert{/td}{/tr}';
+ $bulleDashtab .= '{tr}{td class=bulleDashleft style="background:#'.$colorUP.';" }Up:{/td}{td class=bulleDash}'. Duration::toString($_GET["today_up"] * $t / 100) .'{/td}{td class=bulleDash}'.$_GET["today_up"].'%{/td}{td class=bulleDash}'.$_GET["today_UPnbEvent"].'{/td}{/tr}';
+ $bulleDashtab .= '{tr}{td class=bulleDashleft style="background:#'.$colorDOWN.';" }Down:{/td}{td class=bulleDash}'.Duration::toString($_GET["today_down"] * $t / 100).'{/td}{td class=bulleDash}'.$_GET["today_down"].'%{/td}{td class=bulleDash}'.$_GET["today_DOWNnbEvent"].'{/td}{/tr}';
+ $bulleDashtab .= '{tr}{td class=bulleDashleft style="background:#'.$colorUNREACHABLE.';" }Unreachable:{/td}{td class=bulleDash}'.Duration::toString(0+$_GET["today_unreachable"] * $t / 100) .'{/td}{td class=bulleDash}'.$_GET["today_unreachable"].'%{/td}{td class=bulleDash}'.$_GET["today_UNREACHABLEnbEvent"].'{/td}{/tr}';
+ $bulleDashtab .= '{tr}{td class=bulleDashleft style="background:#cccccc;" }Undeterminated:{/td}{td class=bulleDash}'.Duration::toString($_GET["today_pending"] * $t / 100).'{/td}{td class=bulleDash}'.$_GET["today_pending"].'%{/td}{/tr}';
+ $bulleDashtab .= '{/table}';
$t = round(($t - ($t * 0.11574074074)),2);
$tp = round(($_GET["today_pending"] * $t / 100 ),2);
@@ -291,7 +291,7 @@ For information : contact@oreon-project.org
$buffer .= ' color="#cccccc"';
$buffer .= ' isDuration="true" ';
$buffer .= ' title= "' . $_GET["today_pending"] . '%" >' ;
- $buffer .= $bubultab;
+ $buffer .= $bulleDashtab;
$buffer .= '</event>';
}
$tp = round(($_GET["today_unreachable"] * $t / 100 ),2);
@@ -303,7 +303,7 @@ For information : contact@oreon-project.org
$buffer .= ' color="#' . $colorUNREACHABLE . '"';
$buffer .= ' isDuration="true" ';
$buffer .= ' title= "' . $_GET["today_unreachable"] . '%" >' ;
- $buffer .= $bubultab;
+ $buffer .= $bulleDashtab;
$buffer .= '</event>';
}
$tp = round(($_GET["today_down"] * $t / 100 ),2);
@@ -315,7 +315,7 @@ For information : contact@oreon-project.org
$buffer .= ' color="#' . $colorDOWN . '"';
$buffer .= ' isDuration="true" ';
$buffer .= ' title= "' . $_GET["today_down"] . '%" >' ;
- $buffer .= $bubultab;
+ $buffer .= $bulleDashtab;
$buffer .= '</event>';
}
@@ -328,7 +328,7 @@ For information : contact@oreon-project.org
$buffer .= ' color="#' . $colorUP . '"';
$buffer .= ' isDuration="true" ';
$buffer .= ' title= "' . $_GET["today_up"] . '%" >' ;
- $buffer .= $bubultab;
+ $buffer .= $bulleDashtab;
$buffer .= '</event>';
}
}
diff --git a/www/include/reporting/dashboard/GetXmlService.php b/www/include/reporting/dashboard/GetXmlService.php
index bcd4a152988332eae182ac9600a8f65bc6208441..58db8f3477ec0e2583749cb4f4ab7707bf423d0c 100644
--- a/www/include/reporting/dashboard/GetXmlService.php
+++ b/www/include/reporting/dashboard/GetXmlService.php
@@ -198,14 +198,14 @@ For information : contact@oreon-project.org
#
## make bubul
#
- $bubultab = '{table class=bubultab}';
- $bubultab .= '{tr}{td class=bubuleft colspan=3}Day: '. date("d/m/Y", $start) .' -- Duration: '.Duration::toString($tt).'{/td}{td class=bubuleft }Alert{/td}{/tr}';
- $bubultab .= '{tr}{td class=bubuleft style="background:#'.$colorOK.';" }OK:{/td}{td class=bubul}'. Duration::toString($oktime) .'{/td}{td class=bubul}'.(($pok > 0) ? $pok : "0").'%{/td}{td class=bubul}'.$h["OKnbEvent"].'{/td}{/tr}';
- $bubultab .= '{tr}{td class=bubuleft style="background:#'.$colorCRITICAL.';" }Critical:{/td}{td class=bubul}'. Duration::toString($criticaltime) .'{/td}{td class=bubul}'.(($pcritical > 0) ? $pcritical : "0").'%{/td}{td class=bubul}'.$h["CRITICALnbEvent"].'{/td}{/tr}';
- $bubultab .= '{tr}{td class=bubuleft style="background:#'.$colorWARNING.';" }Warning:{/td}{td class=bubul}'. Duration::toString($warningtime) .'{/td}{td class=bubul}'.(($pwarning > 0) ? $pwarning : "0").'%{/td}{td class=bubul}'.$h["WARNINGnbEvent"].'{/td}{/tr}';
- $bubultab .= '{tr}{td class=bubuleft style="background:#cccccc;" }Unknown:{/td}{td class=bubul}'. Duration::toString($pendingtime) .'{/td}{td class=bubul}'.(($ppending > 0) ? $ppending : "0").'%{/td}{td class=bubul}-{/td}{/tr}';
- $bubultab .= '{tr}{td class=bubuleft style="background:#'.$colorUNKNOWN.';" }Undeterminated:{/td}{td class=bubul}'. Duration::toString($unknowntime) .'{/td}{td class=bubul}'.(($punknown > 0) ? $punknown : "0").'%{/td}{/tr}';
- $bubultab .= '{/table}';
+ $bulleDashtab = '{table class=bulleDashtab}';
+ $bulleDashtab .= '{tr}{td class=bulleDashleft colspan=3}Day: '. date("d/m/Y", $start) .' -- Duration: '.Duration::toString($tt).'{/td}{td class=bulleDashleft }Alert{/td}{/tr}';
+ $bulleDashtab .= '{tr}{td class=bulleDashleft style="background:#'.$colorOK.';" }OK:{/td}{td class=bulleDash}'. Duration::toString($oktime) .'{/td}{td class=bulleDash}'.(($pok > 0) ? $pok : "0").'%{/td}{td class=bulleDash}'.$h["OKnbEvent"].'{/td}{/tr}';
+ $bulleDashtab .= '{tr}{td class=bulleDashleft style="background:#'.$colorCRITICAL.';" }Critical:{/td}{td class=bulleDash}'. Duration::toString($criticaltime) .'{/td}{td class=bulleDash}'.(($pcritical > 0) ? $pcritical : "0").'%{/td}{td class=bulleDash}'.$h["CRITICALnbEvent"].'{/td}{/tr}';
+ $bulleDashtab .= '{tr}{td class=bulleDashleft style="background:#'.$colorWARNING.';" }Warning:{/td}{td class=bulleDash}'. Duration::toString($warningtime) .'{/td}{td class=bulleDash}'.(($pwarning > 0) ? $pwarning : "0").'%{/td}{td class=bulleDash}'.$h["WARNINGnbEvent"].'{/td}{/tr}';
+ $bulleDashtab .= '{tr}{td class=bulleDashleft style="background:#cccccc;" }Unknown:{/td}{td class=bulleDash}'. Duration::toString($pendingtime) .'{/td}{td class=bulleDash}'.(($ppending > 0) ? $ppending : "0").'%{/td}{td class=bulleDash}-{/td}{/tr}';
+ $bulleDashtab .= '{tr}{td class=bulleDashleft style="background:#'.$colorUNKNOWN.';" }Undeterminated:{/td}{td class=bulleDash}'. Duration::toString($unknowntime) .'{/td}{td class=bulleDash}'.(($punknown > 0) ? $punknown : "0").'%{/td}{/tr}';
+ $bulleDashtab .= '{/table}';
$tp = round(($punknown * $t / 100 ),2);
@@ -218,7 +218,7 @@ For information : contact@oreon-project.org
$buffer .= ' isDuration="true" ';
$buffer .= ' title= "' . (($punknown > 0) ? $punknown : "0") . '%" >' ;
// $buffer .= '~br~ UnknownTime: ' . Duration::toString($unknowntime);
- $buffer .= $bubultab;
+ $buffer .= $bulleDashtab;
$buffer .= '</event>';
}
@@ -231,7 +231,7 @@ For information : contact@oreon-project.org
$buffer .= ' color="#cccccc"';
$buffer .= ' isDuration="true" ';
$buffer .= ' title= "' . (($ppending > 0) ? $ppending : "0") . '%" >' ;
- $buffer .= $bubultab;
+ $buffer .= $bulleDashtab;
// $buffer .= '~br~ UndeterminatedTime: ' . Duration::toString($pendingtime);
$buffer .= '</event>';
}
@@ -245,7 +245,7 @@ For information : contact@oreon-project.org
$buffer .= ' color="#' . $colorWARNING . '"';
$buffer .= ' isDuration="true" ';
$buffer .= ' title= "' . (($pwarning > 0) ? $pwarning : "0") . '%" >' ;
- $buffer .= $bubultab;
+ $buffer .= $bulleDashtab;
// $buffer .= '~br~ WarningTime: ' . Duration::toString($warningtime);
$buffer .= '</event>';
}
@@ -261,7 +261,7 @@ For information : contact@oreon-project.org
$buffer .= ' isDuration="true" ';
$buffer .= ' title= "' . (($pcritical > 0) ? $pcritical : "0") . '%" >' ;
// $buffer .= '~br~ CriticalTime: ' . Duration::toString($criticaltime);
- $buffer .= $bubultab;
+ $buffer .= $bulleDashtab;
$buffer .= '</event>';
}
@@ -274,7 +274,7 @@ For information : contact@oreon-project.org
$buffer .= ' color="#' . $colorOK . '"';
$buffer .= ' isDuration="true" ';
$buffer .= ' title= "' . (($pok > 0) ? $pok : "0") . '%" >' ;
- $buffer .= $bubultab;
+ $buffer .= $bulleDashtab;
// $buffer .= '~br~ Oktime: ' . Duration::toString($oktime);
$buffer .= '</event>';
}
@@ -296,14 +296,14 @@ For information : contact@oreon-project.org
#
## make bubul
#
- $bubultab = '{table class=bubultab}';
- $bubultab .= '{tr}{td class=bubuleft colspan=3}Day: '. date("d/m/Y", $start) .' -- Duration: '.Duration::toString($t).'{/td}{td class=bubuleft }Alert{/td}{/tr}';
- $bubultab .= '{tr}{td class=bubuleft style="background:#'.$colorOK.';" }OK:{/td}{td class=bubul}'.Duration::toString($_GET["today_ok"] * $t / 100) .'{/td}{td class=bubul}'.(($_GET["today_ok"] > 0) ? $_GET["today_ok"] : "0").'%{/td}{td class=bubul}'.$_GET["today_OKnbEvent"].'{/td}{/tr}';
- $bubultab .= '{tr}{td class=bubuleft style="background:#'.$colorCRITICAL.';" }Critical:{/td}{td class=bubul}'.Duration::toString($_GET["today_critical"] * $t / 100) .'{/td}{td class=bubul}'.(($_GET["today_critical"] > 0) ? $_GET["today_critical"] : "0").'%{/td}{td class=bubul}'.$_GET["today_CRITICALnbEvent"].'{/td}{/tr}';
- $bubultab .= '{tr}{td class=bubuleft style="background:#'.$colorWARNING.';" }Warning:{/td}{td class=bubul}'. Duration::toString($_GET["today_warning"] * $t / 100) .'{/td}{td class=bubul}'.(($_GET["today_warning"] > 0) ? $_GET["today_warning"] : "0").'%{/td}{td class=bubul}'.$_GET["today_WARNINGnbEvent"].'{/td}{/tr}';
- $bubultab .= '{tr}{td class=bubuleft style="background:#'.$colorUNKNOWN.';" }Unknown:{/td}{td class=bubul}'. Duration::toString($_GET["today_unknown"] * $t / 100) .'{/td}{td class=bubul}'.(($_GET["today_unknown"] > 0) ? $_GET["today_unknown"] : "0").'%{/td}{td class=bubul}'.$_GET["today_UNKNOWNnbEvent"].'{/td}{/tr}';
- $bubultab .= '{tr}{td class=bubuleft style="background:#cccccc;" }Undeterminated:{/td}{td class=bubul}'. Duration::toString($_GET["today_pending"] * $t / 100) .'{/td}{td class=bubul}'.(($_GET["today_pending"] > 0) ? $_GET["today_pending"] : "0").'%{/td}{/tr}';
- $bubultab .= '{/table}';
+ $bulleDashtab = '{table class=bulleDashtab}';
+ $bulleDashtab .= '{tr}{td class=bulleDashleft colspan=3}Day: '. date("d/m/Y", $start) .' -- Duration: '.Duration::toString($t).'{/td}{td class=bulleDashleft }Alert{/td}{/tr}';
+ $bulleDashtab .= '{tr}{td class=bulleDashleft style="background:#'.$colorOK.';" }OK:{/td}{td class=bulleDash}'.Duration::toString($_GET["today_ok"] * $t / 100) .'{/td}{td class=bulleDash}'.(($_GET["today_ok"] > 0) ? $_GET["today_ok"] : "0").'%{/td}{td class=bulleDash}'.$_GET["today_OKnbEvent"].'{/td}{/tr}';
+ $bulleDashtab .= '{tr}{td class=bulleDashleft style="background:#'.$colorCRITICAL.';" }Critical:{/td}{td class=bulleDash}'.Duration::toString($_GET["today_critical"] * $t / 100) .'{/td}{td class=bulleDash}'.(($_GET["today_critical"] > 0) ? $_GET["today_critical"] : "0").'%{/td}{td class=bulleDash}'.$_GET["today_CRITICALnbEvent"].'{/td}{/tr}';
+ $bulleDashtab .= '{tr}{td class=bulleDashleft style="background:#'.$colorWARNING.';" }Warning:{/td}{td class=bulleDash}'. Duration::toString($_GET["today_warning"] * $t / 100) .'{/td}{td class=bulleDash}'.(($_GET["today_warning"] > 0) ? $_GET["today_warning"] : "0").'%{/td}{td class=bulleDash}'.$_GET["today_WARNINGnbEvent"].'{/td}{/tr}';
+ $bulleDashtab .= '{tr}{td class=bulleDashleft style="background:#'.$colorUNKNOWN.';" }Unknown:{/td}{td class=bulleDash}'. Duration::toString($_GET["today_unknown"] * $t / 100) .'{/td}{td class=bulleDash}'.(($_GET["today_unknown"] > 0) ? $_GET["today_unknown"] : "0").'%{/td}{td class=bulleDash}'.$_GET["today_UNKNOWNnbEvent"].'{/td}{/tr}';
+ $bulleDashtab .= '{tr}{td class=bulleDashleft style="background:#cccccc;" }Undeterminated:{/td}{td class=bulleDash}'. Duration::toString($_GET["today_pending"] * $t / 100) .'{/td}{td class=bulleDash}'.(($_GET["today_pending"] > 0) ? $_GET["today_pending"] : "0").'%{/td}{/tr}';
+ $bulleDashtab .= '{/table}';
$t = round(($t - ($t * 0.11574074074)),2);
@@ -316,7 +316,7 @@ For information : contact@oreon-project.org
$buffer .= ' color="#cccccc"';
$buffer .= ' isDuration="true" ';
$buffer .= ' title= "' . $_GET["today_pending"] . '%" >' ;
- $buffer .= $bubultab;
+ $buffer .= $bulleDashtab;
$buffer .= '</event>';
}
$tp = round(($_GET["today_unknown"] * $t / 100 ),2);
@@ -328,7 +328,7 @@ For information : contact@oreon-project.org
$buffer .= ' color="#' . $colorUNKNOWN . '"';
$buffer .= ' isDuration="true" ';
$buffer .= ' title= "' . $_GET["today_unknown"] . '%" >' ;
- $buffer .= $bubultab;
+ $buffer .= $bulleDashtab;
$buffer .= '</event>';
}
$tp = round(($_GET["today_warning"] * $t / 100 ),2);
@@ -340,7 +340,7 @@ For information : contact@oreon-project.org
$buffer .= ' color="#' . $colorWARNING . '"';
$buffer .= ' isDuration="true" ';
$buffer .= ' title= "' . $_GET["today_warning"] . '%" >' ;
- $buffer .= $bubultab;
+ $buffer .= $bulleDashtab;
$buffer .= '</event>';
}
@@ -353,7 +353,7 @@ For information : contact@oreon-project.org
$buffer .= ' color="#' . $colorCRITICAL . '"';
$buffer .= ' isDuration="true" ';
$buffer .= ' title= "' . $_GET["today_critical"] . '%" >' ;
- $buffer .= $bubultab;
+ $buffer .= $bulleDashtab;
$buffer .= '</event>';
}
@@ -366,7 +366,7 @@ For information : contact@oreon-project.org
$buffer .= ' color="#' . $colorOK . '"';
$buffer .= ' isDuration="true" ';
$buffer .= ' title= "' . $_GET["today_ok"] . '%" >' ;
- $buffer .= $bubultab;
+ $buffer .= $bulleDashtab;
$buffer .= '</event>';
}
diff --git a/www/include/reporting/dashboard/chart_host.php b/www/include/reporting/dashboard/chart_host.php
index ff64df87509fb37056e6bacb2e91c0c208854ccb..7278fdbd5604ddd0c1498b7bccda772f5b5ebf4e 100755
--- a/www/include/reporting/dashboard/chart_host.php
+++ b/www/include/reporting/dashboard/chart_host.php
@@ -51,7 +51,7 @@ For information : contact@oreon-project.org
foreach($value as $key => $val) {
$Dataset[$i] =& Image_Graph::factory('dataset');
$Dataset[$i++]->addPoint($key, $val, $key);
- //echo $key."<br>";
+ //echo $key."<br />";
}
$Dataset[$i] =& Image_Graph::factory('dataset');
$Dataset[$i]->addPoint('', 0);
diff --git a/www/include/reporting/dashboard/pie-svc.php b/www/include/reporting/dashboard/pie-svc.php
index 0d1fdb4269463a7592da1259a36588ec74ba3e2f..0cc13974d560fe2e29f1edab84302ce82f759cd8 100644
--- a/www/include/reporting/dashboard/pie-svc.php
+++ b/www/include/reporting/dashboard/pie-svc.php
@@ -43,7 +43,7 @@
$DBRESULT_NDO1 =& $pearDBndo->query($rq1);
if (PEAR::isError($DBRESULT_NDO1))
- print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT_NDO1->getDebugInfo()."<br />";
$data = array();
$color = array();
while($DBRESULT_NDO1->fetchInto($ndo)){
diff --git a/www/include/reporting/dashboard/reporting-func.php b/www/include/reporting/dashboard/reporting-func.php
index 2058608898df7e4bae2076c896281407fc591b1e..f44e29c28f8f871ed1d2da93a7d84716f29ab57d 100644
--- a/www/include/reporting/dashboard/reporting-func.php
+++ b/www/include/reporting/dashboard/reporting-func.php
@@ -114,7 +114,7 @@ For information : contact@oreon-project.org
$DBres =& $pearDBO->query($rq);
if (PEAR::isError($DBres))
- print "DB Error : ".$DBres->getDebugInfo()."<br>";
+ print "DB Error : ".$DBres->getDebugInfo()."<br />";
$log = array();
while ($DBres->fetchInto($log)){
if($log["status"] == "UP"){
@@ -189,7 +189,7 @@ For information : contact@oreon-project.org
# ODS Database retrieve information
$DBRESULT =& $pearDBO->query("SELECT * FROM config LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$result_config = $DBRESULT->fetchRow();
if (isset($result_config) && $result_config)
$gopt = array_map("myDecode", $result_config);
@@ -230,7 +230,7 @@ For information : contact@oreon-project.org
# ODS Database retrieve information
$DBRESULT =& $pearDBO->query("SELECT * FROM config LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$result_config = $DBRESULT->fetchRow();
if (isset($result_config) && $result_config)
$gopt = array_map("myDecode", $result_config);
@@ -428,7 +428,7 @@ For information : contact@oreon-project.org
' GROUP BY service_id';
$DBres =& $pearDB->query($rq);
if (PEAR::isError($DBres))
- print "DB Error : ".$DBres->getDebugInfo()."<br>";
+ print "DB Error : ".$DBres->getDebugInfo()."<br />";
while ($DBres->fetchInto($s)){
$tab_log[$s["service_id"]] = $s;
}
@@ -479,7 +479,7 @@ For information : contact@oreon-project.org
$DBres =& $pearDBO->query($rq);
if (PEAR::isError($DBres))
- print "DB Error : ".$DBres->getDebugInfo()."<br>";
+ print "DB Error : ".$DBres->getDebugInfo()."<br />";
$log = array();
while ($DBres->fetchInto($log)){
if($log["status"] == "OK"){
@@ -649,7 +649,7 @@ For information : contact@oreon-project.org
$day_in_second = 86400;
if (file_exists($file) && !($log = fopen($file, "r")))
- echo "pel_cant_open" . $file . "<br>";
+ echo "pel_cant_open" . $file . "<br />";
if ($log)
for ($a=0, $b= 0, $i = 0; $str = fgets($log); $i++){
if (preg_match("/^\[([0-9]*)\] (.+)/", $str, $matches)){
diff --git a/www/include/reporting/dashboard/template/viewHostGroupLog.ihtml b/www/include/reporting/dashboard/template/viewHostGroupLog.ihtml
index 85ce9c536078e227bce52f1f29bff60425c49e37..0849661d860ae66ff5041608205b5ab057f894c9 100644
--- a/www/include/reporting/dashboard/template/viewHostGroupLog.ihtml
+++ b/www/include/reporting/dashboard/template/viewHostGroupLog.ihtml
@@ -3,7 +3,7 @@
{$styleB}
<div class="cachediv">
<FORM id="datareport">
-<INPUT type="hidden" name="hostID" value="{$hostID}"><br>
+<INPUT type="hidden" name="hostID" value="{$hostID}"><br />
<INPUT type="hidden" name="color_UNKNOWN" value="{$color.UNKNOWN}" >
<INPUT type="hidden" name="color_UP" value="{$color.UP}">
<INPUT type="hidden" name="color_DOWN" value="{$color.DOWN}" >
diff --git a/www/include/reporting/dashboard/template/viewHostLog.ihtml b/www/include/reporting/dashboard/template/viewHostLog.ihtml
index 34b5783cbc21ab3b30dea966d419f348cdda6949..373a11b16e826607a57f977e61dbced3461e8118 100644
--- a/www/include/reporting/dashboard/template/viewHostLog.ihtml
+++ b/www/include/reporting/dashboard/template/viewHostLog.ihtml
@@ -3,7 +3,7 @@
{$styleB}
<div class="cachediv">
<FORM id="datareport">
-<INPUT type="hidden" name="hostID" value="{$hostID}"><br>
+<INPUT type="hidden" name="hostID" value="{$hostID}"><br />
<INPUT type="hidden" name="color_UNKNOWN" value="{$color.UNKNOWN}" >
<INPUT type="hidden" name="color_UP" value="{$color.UP}">
<INPUT type="hidden" name="color_DOWN" value="{$color.DOWN}" >
diff --git a/www/include/reporting/dashboard/template/viewServicesGroupLog.ihtml b/www/include/reporting/dashboard/template/viewServicesGroupLog.ihtml
index 9c15d9a0fa4274ea19924555c27267882674366d..f39d736c026bb3ea89fdad761d12986ce8420693 100644
--- a/www/include/reporting/dashboard/template/viewServicesGroupLog.ihtml
+++ b/www/include/reporting/dashboard/template/viewServicesGroupLog.ihtml
@@ -3,7 +3,7 @@
{$styleB}
<div class="cachediv">
<FORM id="datareport">
- <INPUT type="hidden" name="hostID" value="{$hostID}"><br>
+ <INPUT type="hidden" name="hostID" value="{$hostID}"><br />
<INPUT type="hidden" name="color_UNKNOWN" value="{$color.UNKNOWN}" >
<INPUT type="hidden" name="color_UP" value="{$color.UP}">
<INPUT type="hidden" name="color_DOWN" value="{$color.DOWN}" >
diff --git a/www/include/reporting/dashboard/template/viewServicesLog.ihtml b/www/include/reporting/dashboard/template/viewServicesLog.ihtml
index ffceec0935099730ab3c7e5eba300be6b6402f5a..4539e081abeacc24370714ec5eaf01c62c0c1be3 100644
--- a/www/include/reporting/dashboard/template/viewServicesLog.ihtml
+++ b/www/include/reporting/dashboard/template/viewServicesLog.ihtml
@@ -3,7 +3,7 @@
{$styleB}
<div class="cachediv">
<FORM id="datareport">
- <INPUT type="hidden" name="hostID" value="{$hostID}"><br>
+ <INPUT type="hidden" name="hostID" value="{$hostID}"><br />
<INPUT type="hidden" name="color_UNKNOWN" value="{$color.UNKNOWN}" >
<INPUT type="hidden" name="color_UP" value="{$color.UP}">
<INPUT type="hidden" name="color_DOWN" value="{$color.DOWN}" >
diff --git a/www/include/tools/minTools.php b/www/include/tools/minTools.php
index 6117c6820f4493a2e689ba866e9a4e8a82380d08..50546f7b2ec4a2f00ac4ca73b1089da264280528 100644
--- a/www/include/tools/minTools.php
+++ b/www/include/tools/minTools.php
@@ -31,7 +31,7 @@ For information : contact@oreon-project.org
$Host = array();
$DBRESULT =& $pearDB->query("SELECT host_id, host_name, host_address, host_snmp_community, host_snmp_version FROM host WHERE host_id =". $host_id ."");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$Host = array(NULL=>NULL);
$DBRESULT->fetchInto($Host);
$DBRESULT->free();
@@ -73,7 +73,7 @@ For information : contact@oreon-project.org
$tpl->assign('command_tool',$tool );
$tpl->assign("initJS", "<script type='text/javascript'>
- display('".$lang ["m_mon_waiting"]."<br><br><img src=\'./img/icones/48x48/stopwatch.gif\'>','tools');
+ display('".$lang ["m_mon_waiting"]."<br /><br /><img src=\'./img/icones/48x48/stopwatch.gif\'>','tools');
// display('".$lang ["m_mon_waiting"]."','tools');
loadXMLDoc('".$tool_cmd_script."','tools');
</script>");
diff --git a/www/include/tools/ping.php b/www/include/tools/ping.php
index 09c2010602d5b3567cb3e711c971482e922635bd..20be42e48e4cece48b3792c51dde5e857b9f3c69 100644
--- a/www/include/tools/ping.php
+++ b/www/include/tools/ping.php
@@ -45,7 +45,7 @@ For information : contact@oreon-project.org
$ping->setArgs(array("count" => 4));
$response = $ping->ping($host);
foreach ($response->getRawData() as $key => $data)
- $msg .= $data ."<br>";
+ $msg .= $data ."<br />";
print $msg;
}
diff --git a/www/include/tools/traceroute.php b/www/include/tools/traceroute.php
index a1c9fcd990e4197767a60d8663a0f170b94fc4a0..74372a830c775eb6e585550c0950f60a1c151613 100644
--- a/www/include/tools/traceroute.php
+++ b/www/include/tools/traceroute.php
@@ -43,7 +43,7 @@ For information : contact@oreon-project.org
$tr->setArgs(array('timeout' => 5));
$response = $tr->traceroute($host);
foreach ($response->getRawData() as $key => $data)
- $msg .= $data ."<br>";
+ $msg .= $data ."<br />";
print $msg;
}
diff --git a/www/include/views/graphs/componentTemplates/formComponentTemplate.php b/www/include/views/graphs/componentTemplates/formComponentTemplate.php
index 540431a5e4ee902a70d63e98f5e0d48810f721a0..02badbbd6ba6be5fb562824ca0bbebc827e44c70 100644
--- a/www/include/views/graphs/componentTemplates/formComponentTemplate.php
+++ b/www/include/views/graphs/componentTemplates/formComponentTemplate.php
@@ -48,7 +48,7 @@ For information : contact@oreon-project.org
$attrsText2 = array("size"=>"10");
$attrsAdvSelect = array("style" => "width: 200px; height: 100px;");
$attrsTextarea = array("rows"=>"4", "cols"=>"60");
- $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br><br><br>{remove}</td><td>{selected}</td></tr></table>";
+ $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br /><br /><br />{remove}</td><td>{selected}</td></tr></table>";
#
## Form begin
diff --git a/www/include/views/graphs/graphODS/GetODSXmlGraph.php b/www/include/views/graphs/graphODS/GetODSXmlGraph.php
index 51a34e61f4a782d2a6da09ab2c5b41be042c1f3b..36ca0628ded68265fcadaf98aa45508c392b8ea2 100644
--- a/www/include/views/graphs/graphODS/GetODSXmlGraph.php
+++ b/www/include/views/graphs/graphODS/GetODSXmlGraph.php
@@ -104,7 +104,7 @@ $lang["optionAdvanced"] = "Options";
global $pearDB;
$DBRESULT =& $pearDB->query("SELECT host_id FROM host h, host_service_relation hs WHERE h.host_id = hs.host_host_id AND hs.service_service_id = '".$svc_id."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
if ($DBRESULT->numRows()) {
$row =& $DBRESULT->fetchRow();
return $row["host_id"];
diff --git a/www/include/views/graphs/graphODS/changeODSGraphProperties.ihtml b/www/include/views/graphs/graphODS/changeODSGraphProperties.ihtml
index 3af401268237cac18c61f2037242efa48b66d310..a8f77c38e9f4d4860fd4d66f90ee8336210fa590 100644
--- a/www/include/views/graphs/graphODS/changeODSGraphProperties.ihtml
+++ b/www/include/views/graphs/graphODS/changeODSGraphProperties.ihtml
@@ -15,10 +15,10 @@
</tr>
<tr class="list_one">
<td class="ListColLeft" colspan="2">
- <br><b>{$lang.ods_explain}</b>
- <br><br><u><i>{$lang.ods_choose_storage_type}</i></u>
- <br><br><b>1. RRDTool : </b>{$lang.ods_rrdtool_choose}.
- <br><br><b>2. RRDTool & MySQL : </b>{$lang.ods_mysql_choose}.
+ <br /><b>{$lang.ods_explain}</b>
+ <br /><br /><u><i>{$lang.ods_choose_storage_type}</i></u>
+ <br /><br /><b>1. RRDTool : </b>{$lang.ods_rrdtool_choose}.
+ <br /><br /><b>2. RRDTool & MySQL : </b>{$lang.ods_mysql_choose}.
</td>
</tr>
</table>
diff --git a/www/include/views/graphs/graphODS/changeODSGraphProperties.php b/www/include/views/graphs/graphODS/changeODSGraphProperties.php
index 8f5dd4870822fee8400dee6793475d420387de51..59c6bd12d3f7758c28f88292a50a77ef25281d44 100644
--- a/www/include/views/graphs/graphODS/changeODSGraphProperties.php
+++ b/www/include/views/graphs/graphODS/changeODSGraphProperties.php
@@ -32,7 +32,7 @@ For information : contact@oreon-project.org
$rq = "UPDATE `index_data` SET `storage_type` = '".$ret["storage_type"]."' WHERE `id` = '".$index."' LIMIT 1 ;";
$DBRESULT =& $pearDBO->query($rq);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
}
# Smarty template Init
diff --git a/www/include/views/graphs/graphODS/displayODSGraphProperties.ihtml b/www/include/views/graphs/graphODS/displayODSGraphProperties.ihtml
index 1ee5037c4c82ffbf7795e1a3cfb1afa21c3c55e0..93ecd8817057eb71e743a41120905d11fb82e934 100644
--- a/www/include/views/graphs/graphODS/displayODSGraphProperties.ihtml
+++ b/www/include/views/graphs/graphODS/displayODSGraphProperties.ihtml
@@ -12,8 +12,8 @@
<tr class="list_one">
<td class="ListColCenter">
<img id='zoomGraphImage' src='./include/views/graphs/graphODS/generateImages/generateODSMetricImage.php?session_id={$session_id}&cpt={$m.order}&metric={$m.metric_id}{if $template_id}&template_id={$template_id}{/if}&end={$end}&start={$start}' align="center">
- <br><br><b>Metric : </b>{$m.metric} {if $m.unit}({$m.unit}){/if} - <b>Last update :</b> {$m.last_update}<br>
- {$m.db_name} : {$m.size} Mo <br>
+ <br /><br /><b>Metric : </b>{$m.metric} {if $m.unit}({$m.unit}){/if} - <b>Last update :</b> {$m.last_update}<br />
+ {$m.db_name} : {$m.size} Mo <br />
</td>
</tr>
{/foreach}
diff --git a/www/include/views/graphs/graphODS/exportData/ExportCSVMetricData.php b/www/include/views/graphs/graphODS/exportData/ExportCSVMetricData.php
index 482d91b25add06fdbd32048036b8dea2b41d9af6..defdbc70c50245f8ce6021d923f55c4891c4a65d 100644
--- a/www/include/views/graphs/graphODS/exportData/ExportCSVMetricData.php
+++ b/www/include/views/graphs/graphODS/exportData/ExportCSVMetricData.php
@@ -27,7 +27,7 @@ For information : contact@oreon-project.org
}
function get_error($str){
- echo $str."<br>";
+ echo $str."<br />";
exit(0);
}
diff --git a/www/include/views/graphs/graphODS/exportData/ExportCSVServiceData.php b/www/include/views/graphs/graphODS/exportData/ExportCSVServiceData.php
index 0ec7854e2db30517d84c9022f7886d7751ed1da9..12175582f4f3475936effe16f89dc0a53b108207 100644
--- a/www/include/views/graphs/graphODS/exportData/ExportCSVServiceData.php
+++ b/www/include/views/graphs/graphODS/exportData/ExportCSVServiceData.php
@@ -27,7 +27,7 @@ For information : contact@oreon-project.org
}
function get_error($str){
- echo $str."<br>";
+ echo $str."<br />";
exit(0);
}
diff --git a/www/include/views/graphs/graphODS/graphODSByHost.ihtml b/www/include/views/graphs/graphODS/graphODSByHost.ihtml
index 183f77878168e3d9bc83b1083620228a99fc5691..a64d78d5a83a4a2812cd3a78c249c39117d03f94 100644
--- a/www/include/views/graphs/graphODS/graphODSByHost.ihtml
+++ b/www/include/views/graphs/graphODS/graphODSByHost.ihtml
@@ -13,10 +13,10 @@
<td>{$form.host_name.html}</td>
</tr>
</table>
- <div id="validForm"><p>{$form.submitC.html} {$form.reset.html} {$form.advanced.html}</p><br><br><br><br></div>
- <br><br>
+ <div id="validForm"><p>{$form.submitC.html} {$form.reset.html} {$form.advanced.html}</p><br /><br /><br /><br /></div>
+ <br /><br />
<div id="div1" class="cachediv" {if !$title2}style="padding-top:20px;"{/if}>
- <br><br>
+ <br /><br />
<table class="ListTable">
<tr class="ListHeader">
<td class="FormHeader" colspan="2">{$lang.advanced}</td>
@@ -32,7 +32,7 @@
</tr>
</table>
</div>
- </div><br><br>
+ </div><br /><br />
{$form.hidden}
</div>
{if $title2}
@@ -50,10 +50,10 @@
<td class='ListColCenter' valign="top" align='center'>
{if $curr_id.split}
{foreach from=$curr_id.metrics item=curr_id_metric key=key_metric}
- <div><a href='./oreon.php?p={$p}&o=vs&index={$key}&min={$min}'><img src='./include/views/graphs/graphODS/generateImages/generateODSMetricImage.php?session_id={$session_id}&cpt={counter}&metric={$key_metric}{if $curr_id[template_id].template_id}&template_id={$curr_id[template_id].template_id}{/if}&end={$end}&start={$start}' align="center"><a><br></div>
+ <div><a href='./oreon.php?p={$p}&o=vs&index={$key}&min={$min}'><img src='./include/views/graphs/graphODS/generateImages/generateODSMetricImage.php?session_id={$session_id}&cpt={counter}&metric={$key_metric}{if $curr_id[template_id].template_id}&template_id={$curr_id[template_id].template_id}{/if}&end={$end}&start={$start}' align="center"><a><br /></div>
{/foreach}
{else}
- <div><a href='./oreon.php?p={$p}&o=vs&index={$key}&min={$min}'><img src='./include/views/graphs/graphODS/generateImages/generateODSImage.php?session_id={$session_id}&index={$key}{if $curr_id[template_id].template_id}&template_id={$curr_id[template_id].template_id}{/if}&end={$end}&start={$start}'><a><br></div>
+ <div><a href='./oreon.php?p={$p}&o=vs&index={$key}&min={$min}'><img src='./include/views/graphs/graphODS/generateImages/generateODSImage.php?session_id={$session_id}&index={$key}{if $curr_id[template_id].template_id}&template_id={$curr_id[template_id].template_id}{/if}&end={$end}&start={$start}'><a><br /></div>
{/if}
</td>
</tr>
diff --git a/www/include/views/graphs/graphODS/graphODSService.ihtml b/www/include/views/graphs/graphODS/graphODSService.ihtml
index 033bc43772e58db5024db5897dbabca87a537eed..03fd6f2954f95ae17ce12fef5c9c40c6e9d0a4ee 100644
--- a/www/include/views/graphs/graphODS/graphODSService.ihtml
+++ b/www/include/views/graphs/graphODS/graphODSService.ihtml
@@ -18,7 +18,7 @@
<div>
{if $split == 1}
{foreach from=$metrics_list item=curr_id_metric key=key_metric}
- <div><a href='./oreon.php?p={$p}&o=vz&index={$index}&start={$start_daily}&end={$end_daily}&min={$min}'><img src='./include/views/graphs/graphODS/generateImages/generateODSMetricImage.php?session_id={$session_id}&cpt={$curr_id_metric}&metric={$key_metric}{if $template_id}&template_id={$template_id}{/if}&end={$end_daily}&start={$start_daily}' align="center"><a><br></div>
+ <div><a href='./oreon.php?p={$p}&o=vz&index={$index}&start={$start_daily}&end={$end_daily}&min={$min}'><img src='./include/views/graphs/graphODS/generateImages/generateODSMetricImage.php?session_id={$session_id}&cpt={$curr_id_metric}&metric={$key_metric}{if $template_id}&template_id={$template_id}{/if}&end={$end_daily}&start={$start_daily}' align="center"><a><br /></div>
{/foreach}
{else}
<div><a href='./oreon.php?p={$p}&o=vz&index={$index}&start={$start_daily}&end={$end_daily}&min={$min}'><img src='./include/views/graphs/graphODS/generateImages/generateODSImage.php?session_id={$session_id}&index={$index}{if $template_id}&template_id={$template_id}{/if}&end={$end_daily}&start={$start_daily}{foreach item=m_a from=$metrics_active key=k}&metric[{$k}]=1{/foreach}'></a></div>
@@ -35,7 +35,7 @@
<div>
{if $split == 1}
{foreach from=$metrics_list item=curr_id_metric key=key_metric}
- <div><a href='./oreon.php?p={$p}&o=vz&index={$index}&start={$start_weekly}&end={$end_weekly}&min={$min}'><img src='./include/views/graphs/graphODS/generateImages/generateODSMetricImage.php?session_id={$session_id}&cpt={$curr_id_metric}&metric={$key_metric}{if $template_id}&template_id={$template_id}{/if}&end={$end_weekly}&start={$start_weekly}' align="center"><a><br></div>
+ <div><a href='./oreon.php?p={$p}&o=vz&index={$index}&start={$start_weekly}&end={$end_weekly}&min={$min}'><img src='./include/views/graphs/graphODS/generateImages/generateODSMetricImage.php?session_id={$session_id}&cpt={$curr_id_metric}&metric={$key_metric}{if $template_id}&template_id={$template_id}{/if}&end={$end_weekly}&start={$start_weekly}' align="center"><a><br /></div>
{/foreach}
{else}
<div><a href='./oreon.php?p={$p}&o=vz&index={$index}&start={$start_weekly}&end={$end_weekly}&min={$min}'><img src='./include/views/graphs/graphODS/generateImages/generateODSImage.php?session_id={$session_id}&index={$index}{if $template_id}&template_id={$template_id}{/if}&end={$end_weekly}&start={$start_weekly}{foreach item=m_a from=$metrics_active key=k}&metric[{$k}]=1{/foreach}'></a></div>
@@ -52,7 +52,7 @@
<div>
{if $split == 1}
{foreach from=$metrics_list item=curr_id_metric key=key_metric}
- <div><a href='./oreon.php?p={$p}&o=vz&index={$index}&start={$start_monthly}&end={$end_monthly}&min={$min}'><img src='./include/views/graphs/graphODS/generateImages/generateODSMetricImage.php?session_id={$session_id}&cpt={$curr_id_metric}&metric={$key_metric}{if $template_id}&template_id={$template_id}{/if}&end={$end_monthly}&start={$start_monthly}' align="center"><a><br></div>
+ <div><a href='./oreon.php?p={$p}&o=vz&index={$index}&start={$start_monthly}&end={$end_monthly}&min={$min}'><img src='./include/views/graphs/graphODS/generateImages/generateODSMetricImage.php?session_id={$session_id}&cpt={$curr_id_metric}&metric={$key_metric}{if $template_id}&template_id={$template_id}{/if}&end={$end_monthly}&start={$start_monthly}' align="center"><a><br /></div>
{/foreach}
{else}
<div><a href='./oreon.php?p={$p}&o=vz&index={$index}&start={$start_monthly}&end={$end_monthly}&min={$min}'><img src='./include/views/graphs/graphODS/generateImages/generateODSImage.php?session_id={$session_id}&index={$index}{if $template_id}&template_id={$template_id}{/if}&end={$end_monthly}&start={$start_monthly}{foreach item=m_a from=$metrics_active key=k}&metric[{$k}]=1{/foreach}'></a></div>
@@ -69,7 +69,7 @@
<div>
{if $split == 1}
{foreach from=$metrics_list item=curr_id_metric key=key_metric}
- <div><a href='./oreon.php?p={$p}&o=vz&index={$index}&start={$start_yearly}&end={$end_yearly}&min={$min}'><img src='./include/views/graphs/graphODS/generateImages/generateODSMetricImage.php?session_id={$session_id}&cpt={$curr_id_metric}&metric={$key_metric}{if $template_id}&template_id={$template_id}{/if}&end={$end_yearly}&start={$start_yearly}' align="center"><a><br></div>
+ <div><a href='./oreon.php?p={$p}&o=vz&index={$index}&start={$start_yearly}&end={$end_yearly}&min={$min}'><img src='./include/views/graphs/graphODS/generateImages/generateODSMetricImage.php?session_id={$session_id}&cpt={$curr_id_metric}&metric={$key_metric}{if $template_id}&template_id={$template_id}{/if}&end={$end_yearly}&start={$start_yearly}' align="center"><a><br /></div>
{/foreach}
{else}
<div><a href='./oreon.php?p={$p}&o=vz&index={$index}&start={$start_yearly}&end={$end_yearly}&min={$min}'><img src='./include/views/graphs/graphODS/generateImages/generateODSImage.php?session_id={$session_id}&index={$index}{if $template_id}&template_id={$template_id}{/if}&end={$end_yearly}&start={$start_yearly}{foreach item=m_a from=$metrics_active key=k}&metric[{$k}]=1{/foreach}'></a></div>
@@ -87,7 +87,7 @@
<form {$form.attributes}>
{/if}
<div style="padding-top: 5px;">
- {if $title2}<div id="validForm"><p>{$form.submitC.html} {$form.reset.html}</p></div><br><br><br><br>{/if}
+ {if $title2}<div id="validForm"><p>{$form.submitC.html} {$form.reset.html}</p></div><br /><br /><br /><br />{/if}
<div>
<table class="ListTable">
<tr class="ListHeader">
@@ -112,15 +112,15 @@
<tr class="{$s.class}">
<td> <input type="checkbox" name="metric[{$s.metric_id}]"{if $metrics_active[$s.metric_id] } checked{/if}> {$s.metric_name} </td>
{if $cpt == 0}
- <td rowspan="{$nb_metrics}" valign="top" style="padding:10px;"><b><i>Aide : </i></b><br><br>Vous pouvez d�sactiver une source de donn�es pour qu'elle n'apparaisse plus sur le graphique. <br>Cela peut vous servir lorsque les deux sources de donn�es sont issues d'un m�me service mais dont les echelles sont completement differentes.</td>{assign var="cpt" value="1"}
+ <td rowspan="{$nb_metrics}" valign="top" style="padding:10px;"><b><i>Aide : </i></b><br /><br />Vous pouvez d�sactiver une source de donn�es pour qu'elle n'apparaisse plus sur le graphique. <br />Cela peut vous servir lorsque les deux sources de donn�es sont issues d'un m�me service mais dont les echelles sont completement differentes.</td>{assign var="cpt" value="1"}
{/if}
</tr>
{/foreach}
</table>
{if !$title2}
- <div id="validForm"><p>{$form.submitC.html} {$form.reset.html}</p><br><br><br><br></div>
+ <div id="validForm"><p>{$form.submitC.html} {$form.reset.html}</p><br /><br /><br /><br /></div>
{/if}
- <br>
+ <br />
</div>
{$form.hidden}
</div>
diff --git a/www/include/views/graphs/graphODS/graphODSServiceZoom.ihtml b/www/include/views/graphs/graphODS/graphODSServiceZoom.ihtml
index ff3c1414d80708b415e118b056c527811b944b2e..2fff00a20642b1121eaa3a0b600b5fd9a645e4c9 100644
--- a/www/include/views/graphs/graphODS/graphODSServiceZoom.ihtml
+++ b/www/include/views/graphs/graphODS/graphODSServiceZoom.ihtml
@@ -29,7 +29,7 @@
<form {$form.attributes}>
{/if}
<div style="padding-top: 10px;">
- {if $title2}<div id="validForm"><p>{$form.submitC.html} {$form.reset.html}</p></div><br><br><br><br>{/if}
+ {if $title2}<div id="validForm"><p>{$form.submitC.html} {$form.reset.html}</p></div><br /><br /><br /><br />{/if}
<div>
<table class="ListTable">
<tr class="ListHeader">
@@ -55,15 +55,15 @@
<tr class="{$s.class}">
<td> <input type="checkbox" name="metric[{$s.metric_id}]"{if $metrics_active[$s.metric_id] } checked{/if}> {$s.metric_name} </td>
{if $cpt == 0}
- <td rowspan="{$nb_metrics}" valign="top" style="padding:10px;"><b><i>Aide : </i></b><br><br>Vous pouvez d�sactiver une source de donn�es pour qu'elle n'apparaisse plus sur le graphique. <br>Cela peut vous servir lorsque les deux sources de donn�es sont issues d'un m�me service mais dont les echelles sont completement differentes.</td>{assign var="cpt" value="1"}
+ <td rowspan="{$nb_metrics}" valign="top" style="padding:10px;"><b><i>Aide : </i></b><br /><br />Vous pouvez d�sactiver une source de donn�es pour qu'elle n'apparaisse plus sur le graphique. <br />Cela peut vous servir lorsque les deux sources de donn�es sont issues d'un m�me service mais dont les echelles sont completement differentes.</td>{assign var="cpt" value="1"}
{/if}
</tr>
{/foreach}
</table>
{if !$title2}
- <div id="validForm"><p>{$form.submitC.html} {$form.reset.html}</p><br><br><br><br></div>
+ <div id="validForm"><p>{$form.submitC.html} {$form.reset.html}</p><br /><br /><br /><br /></div>
{/if}
- <br>
+ <br />
</div>
<input type="hidden" name="end" value="{$end}">
<input type="hidden" name="start" value="{$start}">
diff --git a/www/include/views/graphs/graphTemplates/formGraphTemplate.php b/www/include/views/graphs/graphTemplates/formGraphTemplate.php
index 7b6b89812c29ddbdd18939b6de702af680e7deba..fdedb49ac885dd22d8197c985d7d62c5b780f984 100644
--- a/www/include/views/graphs/graphTemplates/formGraphTemplate.php
+++ b/www/include/views/graphs/graphTemplates/formGraphTemplate.php
@@ -49,7 +49,7 @@ For information : contact@oreon-project.org
$attrsText2 = array("size"=>"6");
$attrsAdvSelect = array("style" => "width: 200px; height: 100px;");
$attrsTextarea = array("rows"=>"3", "cols"=>"30");
- $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br><br><br>{remove}</td><td>{selected}</td></tr></table>";
+ $template = "<table><tr><td>{unselected}</td><td align='center'>{add}<br /><br /><br />{remove}</td><td>{selected}</td></tr></table>";
#
## Form begin
diff --git a/www/install/step_upgrade/step3.php b/www/install/step_upgrade/step3.php
index bfc43c26eef397e1eaa7d13979fc3a859a4cea3b..6a986ddac490a5eb40667caf562c09898c8b1c57 100644
--- a/www/install/step_upgrade/step3.php
+++ b/www/install/step_upgrade/step3.php
@@ -23,7 +23,7 @@ For information : contact@oreon-project.org
$DBRESULT->fetchInto($version);
aff_header("Centreon Upgrade Wizard", "Select Version", 3); ?>
- In order for your Centreon upgrade to function properly, please select the mysql script file.<br><br>
+ In order for your Centreon upgrade to function properly, please select the mysql script file.<br /><br />
<table cellpadding="0" cellspacing="0" border="0" width="80%" class="StyleDottedHr" align="center">
<tr>
<th style="padding-left:20px;" colspan="2">Upgrade SQL Scripts</th>
diff --git a/www/install/step_upgrade/step4.php b/www/install/step_upgrade/step4.php
index e7c6fb6fea2ce039500b0ea65f0238b0700c27ef..05bb073b7ecfb7e26c6cb17ed4d867c9e1504df4 100644
--- a/www/install/step_upgrade/step4.php
+++ b/www/install/step_upgrade/step4.php
@@ -47,7 +47,7 @@ For information : contact@oreon-project.org
$_SESSION["mysqlscript"] = $_POST["mysqlscript"]; }
aff_header("Centreon Setup Wizard", "Updating ODS Database", 4); ?>
- <br><br>
+ <br /><br />
<table cellpadding="0" cellspacing="0" border="0" width="80%" class="StyleDottedHr" align="center"><?php
print "<tr><th align='left'>Component</th><th style='text-align: right;'>Status</th></tr>";
print "<tr><td><b>Database ’".$conf_oreon['ods']."’ : Upgrade</b></td>";
diff --git a/www/install/step_upgrade/step5.php b/www/install/step_upgrade/step5.php
index d84f95e194f1afe4883b99152330b20bc5887ff9..51d29a4f0d34d6523590244b2c2361f5cd977226 100644
--- a/www/install/step_upgrade/step5.php
+++ b/www/install/step_upgrade/step5.php
@@ -23,7 +23,7 @@ For information : contact@oreon-project.org
$DBRESULT->fetchInto($version);
aff_header("Centreon Upgrade Wizard", "Select Version", 5); ?>
- In order for your Oreon upgrade to function properly, please select the mysql script file.<br><br>
+ In order for your Oreon upgrade to function properly, please select the mysql script file.<br /><br />
<table cellpadding="0" cellspacing="0" border="0" width="80%" class="StyleDottedHr" align="center">
<tr>
<th style="padding-left:20px;" colspan="2">Upgrade SQL Scripts</th>
diff --git a/www/install/step_upgrade/step6.php b/www/install/step_upgrade/step6.php
index 867ed5044fdbc060d6e0695ac9fc5001600009b6..355a873336824365bcaaf98a20435ce25e5045e0 100644
--- a/www/install/step_upgrade/step6.php
+++ b/www/install/step_upgrade/step6.php
@@ -47,7 +47,7 @@ For information : contact@oreon-project.org
$_SESSION["mysqlscript"] = $_POST["mysqlscript"]; }
aff_header("Centreon Setup Wizard", "Updating Centreon Database", 6); ?>
- <br><br>
+ <br /><br />
<table cellpadding="0" cellspacing="0" border="0" width="80%" class="StyleDottedHr" align="center"><?php
print "<tr><th align='left'>Component</th><th style='text-align: right;'>Status</th></tr>";
print "<tr><td><b>Database ’".$conf_oreon['db']."’ : Upgrade</b></td>";
diff --git a/www/install/steps/step10.php b/www/install/steps/step10.php
index 1d3771ad27069fbe961dfde201148bc3ff270546..142814afdfb3df63bb21382ecbbbc8bdd0ed8322 100644
--- a/www/install/steps/step10.php
+++ b/www/install/steps/step10.php
@@ -43,7 +43,7 @@ aff_header("Oreon Setup Wizard", "Oreon Configuration File", 10); ?>
} else {
echo '<b><span class="stop">Critical: Not Writeable</font></b>';
$msg = $uid['name'] .':'. $gid['name'] .' (' .$perms. ')</b>';
- $msg .= '<br>Should be '. $_SESSION['apache_user'].':'.$_SESSION['apache_group'].' (755)';
+ $msg .= '<br />Should be '. $_SESSION['apache_user'].':'.$_SESSION['apache_group'].' (755)';
$return_false = 1;
}?>
</td>
@@ -64,7 +64,7 @@ aff_header("Oreon Setup Wizard", "Oreon Configuration File", 10); ?>
} else {
echo '<b><span class="stop">Critical: Not Writeable</font></b>';
$msg = $uid['name'] .':'. $gid['name'] .' (' .$perms. ')</b>';
- $msg .= '<br>Should be '. $_SESSION['apache_user'].':'.$_SESSION['apache_group'].' (775)';
+ $msg .= '<br />Should be '. $_SESSION['apache_user'].':'.$_SESSION['apache_group'].' (775)';
$return_false = 1;
} ?>
</td>
diff --git a/www/install/steps/step11.php b/www/install/steps/step11.php
index b13c5cdacda8b3ceb6b7360beb490d46f75900f6..b66210c1419666fcb44cc531af21b16f48d9ffe7 100644
--- a/www/install/steps/step11.php
+++ b/www/install/steps/step11.php
@@ -37,7 +37,7 @@ aff_header("Oreon Setup Wizard", "Creating Database", 11);
print "<tr><td><b>Database ’".$_SESSION["nameOreonDB"]."’ : Creation</b></td>";
$requete = "CREATE DATABASE ". $_SESSION["nameOreonDB"] . ";";
if ($DEBUG)
- print $requete . "<br>";
+ print $requete . "<br />";
@mysql_query($requete, $res['0']);
if ($res['1'])
print '<td align="right"><b><span class="go">CRITICAL</b></td></tr>';
@@ -48,7 +48,7 @@ aff_header("Oreon Setup Wizard", "Creating Database", 11);
print "<tr><td><b>Database ’".$_SESSION["nameOdsDB"]."’ : Creation</b></td>";
$requete = "CREATE DATABASE ". $_SESSION["nameOdsDB"] . ";";
if ($DEBUG)
- print $requete . "<br>";
+ print $requete . "<br />";
@mysql_query($requete, $res['0']);
if ($res['1'])
print '<td align="right"><b><span class="go">CRITICAL</b></td></tr>';
@@ -61,15 +61,15 @@ aff_header("Oreon Setup Wizard", "Creating Database", 11);
$mysql_msg = "";
print "<tr><td><b>Database ’".$_SESSION["nameOreonDB"]."’ : Users Management</b></td>";
$requete = "GRANT ALL PRIVILEGES ON `". $_SESSION["nameOreonDB"] . "` . * TO `". $_SESSION["nameOreonDB"] . "`@`". $_SESSION["nagiosLocation"] . "` IDENTIFIED BY '". $_SESSION["pwdOreonDB"] . "' WITH GRANT OPTION";
- if ($DEBUG) print $requete. "<br>";
+ if ($DEBUG) print $requete. "<br />";
mysql_query($requete, $res['0']) or ( $mysql_msg= mysql_error());
$mysql_msg = $res['1'];
$requete = "GRANT ALL PRIVILEGES ON `". $_SESSION["nameOdsDB"] . "` . * TO `". $_SESSION["nameOreonDB"] . "`@`". $_SESSION["nagiosLocation"] . "` IDENTIFIED BY '". $_SESSION["pwdOreonDB"] . "' WITH GRANT OPTION";
- if ($DEBUG) print $requete. "<br>";
+ if ($DEBUG) print $requete. "<br />";
mysql_query($requete, $res['0']) or ( $mysql_msg= mysql_error());
$mysql_msg .= $res['1'];
if ($res['1'])
- print '<td align="right"><b><span class="go">CRITICAL</b><br>$mysql_msg<br></td></tr>';
+ print '<td align="right"><b><span class="go">CRITICAL</b><br />$mysql_msg<br /></td></tr>';
else
print '<td align="right"><b><span class="go">OK</b></td></tr>';
}
@@ -108,8 +108,8 @@ aff_header("Oreon Setup Wizard", "Creating Database", 11);
if ($pos != false) {
$str .= $line;
$str = chop ($str);
- if ($DEBUG) print $str . "<br>";
- $result = @mysql_query($str, $res['0']) or ( $mysql_msg= $mysql_msg . "$str<br><span class='warning'>->" . mysql_error() ."</span><br>");
+ if ($DEBUG) print $str . "<br />";
+ $result = @mysql_query($str, $res['0']) or ( $mysql_msg= $mysql_msg . "$str<br /><span class='warning'>->" . mysql_error() ."</span><br />");
$str = NULL;
} else
$str .= $line;
@@ -118,7 +118,7 @@ aff_header("Oreon Setup Wizard", "Creating Database", 11);
if ($res[1] == '') {
echo '<td align="right"><b><span class="go">OK</b></td></tr>';
} else {
- echo '<td align="right"><b><span class="stop">CRITICAL</span></b><br>'.$res[1].'<br></td></tr>';
+ echo '<td align="right"><b><span class="stop">CRITICAL</span></b><br />'.$res[1].'<br /></td></tr>';
$return_false = 1;
}
}
@@ -149,8 +149,8 @@ aff_header("Oreon Setup Wizard", "Creating Database", 11);
if ($pos != false) {
$str .= $line;
$str = chop ($str);
- if ($DEBUG) print $str . "<br>";
- $result = @mysql_query($str, $res['0']) or ( $mysql_msg= $mysql_msg . "$str<br><span class='warning'>->" . mysql_error() ."</span><br>");
+ if ($DEBUG) print $str . "<br />";
+ $result = @mysql_query($str, $res['0']) or ( $mysql_msg= $mysql_msg . "$str<br /><span class='warning'>->" . mysql_error() ."</span><br />");
$str = NULL;
} else
$str .= $line;
@@ -159,7 +159,7 @@ aff_header("Oreon Setup Wizard", "Creating Database", 11);
if ($res[1] == '') {
echo '<td align="right"><b><span class="go">OK</b></td></tr>';
} else {
- echo '<td align="right"><b><span class="stop">CRITICAL</span></b><br>'.$res[1].'<br></td></tr>';
+ echo '<td align="right"><b><span class="stop">CRITICAL</span></b><br />'.$res[1].'<br /></td></tr>';
$return_false = 1;
}
}
@@ -188,8 +188,8 @@ aff_header("Oreon Setup Wizard", "Creating Database", 11);
if ($pos != false) {
$str .= $line;
$str = chop ($str);
- if ($DEBUG) print $str . "<br>";
- $result = @mysql_query($str, $res['0']) or ( $mysql_msg= $mysql_msg . "$str<br><span class='warning'>->" . mysql_error() ."</span><br>");
+ if ($DEBUG) print $str . "<br />";
+ $result = @mysql_query($str, $res['0']) or ( $mysql_msg= $mysql_msg . "$str<br /><span class='warning'>->" . mysql_error() ."</span><br />");
$str = NULL;
} else
$str .= $line;
@@ -198,7 +198,7 @@ aff_header("Oreon Setup Wizard", "Creating Database", 11);
if ($res[1] == '') {
echo '<td align="right"><b><span class="go">OK</b></td></tr>';
} else {
- echo '<td align="right"><b><span class="stop">CRITICAL</span></b><br>'.$res[1].'<br></td></tr>';
+ echo '<td align="right"><b><span class="stop">CRITICAL</span></b><br />'.$res[1].'<br /></td></tr>';
$return_false = 1;
}
}
@@ -214,8 +214,8 @@ aff_header("Oreon Setup Wizard", "Creating Database", 11);
if ($pos != false) {
$str .= $line;
$str = chop ($str);
- if ($DEBUG) print $str . "<br>";
- $result = @mysql_query($str, $res['0']) or ( $mysql_msg= $mysql_msg . "$str<br><span class='warning'>->" . mysql_error() ."</span><br>");
+ if ($DEBUG) print $str . "<br />";
+ $result = @mysql_query($str, $res['0']) or ( $mysql_msg= $mysql_msg . "$str<br /><span class='warning'>->" . mysql_error() ."</span><br />");
$str = NULL;
} else
$str .= $line;
@@ -224,7 +224,7 @@ aff_header("Oreon Setup Wizard", "Creating Database", 11);
if ($res[1] == '') {
echo '<td align="right"><b><span class="go">OK</b></td></tr>';
} else {
- echo '<td align="right"><b><span class="stop">CRITICAL</span></b><br>'.$res[1].'<br></td></tr>';
+ echo '<td align="right"><b><span class="stop">CRITICAL</span></b><br />'.$res[1].'<br /></td></tr>';
$return_false = 1;
}
}
@@ -240,8 +240,8 @@ aff_header("Oreon Setup Wizard", "Creating Database", 11);
if ($pos != false) {
$str .= $line;
$str = chop ($str);
- if ($DEBUG) print $str . "<br>";
- $result = @mysql_query($str, $res['0']) or ( $mysql_msg= $mysql_msg . "$str<br><span class='warning'>->" . mysql_error() ."</span><br>");
+ if ($DEBUG) print $str . "<br />";
+ $result = @mysql_query($str, $res['0']) or ( $mysql_msg= $mysql_msg . "$str<br /><span class='warning'>->" . mysql_error() ."</span><br />");
$str = NULL;
} else
$str .= $line;
@@ -250,7 +250,7 @@ aff_header("Oreon Setup Wizard", "Creating Database", 11);
if ($res[1] == '') {
echo '<td align="right"><b><span class="go">OK</b></td></tr>';
} else {
- echo '<td align="right"><b><span class="stop">CRITICAL</span></b><br>'.$res[1].'<br></td></tr>';
+ echo '<td align="right"><b><span class="stop">CRITICAL</span></b><br />'.$res[1].'<br /></td></tr>';
$return_false = 1;
}
}
@@ -266,8 +266,8 @@ aff_header("Oreon Setup Wizard", "Creating Database", 11);
if ($pos != false) {
$str .= $line;
$str = chop ($str);
- if ($DEBUG) print $str . "<br>";
- $result = @mysql_query($str, $res['0']) or ( $mysql_msg= $mysql_msg . "$str<br><span class='warning'>->" . mysql_error() ."</span><br>");
+ if ($DEBUG) print $str . "<br />";
+ $result = @mysql_query($str, $res['0']) or ( $mysql_msg= $mysql_msg . "$str<br /><span class='warning'>->" . mysql_error() ."</span><br />");
$str = NULL;
} else
$str .= $line;
@@ -276,7 +276,7 @@ aff_header("Oreon Setup Wizard", "Creating Database", 11);
if ($res[1] == '') {
echo '<td align="right"><b><span class="go">OK</b></td></tr>';
} else {
- echo '<td align="right"><b><span class="stop">CRITICAL</span></b><br>'.$res[1].'<br></td></tr>';
+ echo '<td align="right"><b><span class="stop">CRITICAL</span></b><br />'.$res[1].'<br /></td></tr>';
$return_false = 1;
}
}
@@ -293,18 +293,18 @@ aff_header("Oreon Setup Wizard", "Creating Database", 11);
if (!$tab && !$nb){
$requete = "INSERT INTO `contact` (`contact_name` , `contact_alias` , `contact_passwd` , `contact_lang` , `contact_email` , `contact_oreon` , `contact_admin` , `contact_activate` ) VALUES ";
$requete .= "('".htmlentities($_SESSION["oreonfirstname"], ENT_QUOTES). " " .htmlentities($_SESSION["oreonlastname"], ENT_QUOTES)."', '". htmlentities($_SESSION["oreonlogin"], ENT_QUOTES)."', '". md5($_SESSION["oreonpasswd"]) ."', '".$_SESSION["oreonlang"]."', '".$_SESSION['oreonemail']."', '1', '1', '1');";
- if ($DEBUG) print $requete . "<br>";
+ if ($DEBUG) print $requete . "<br />";
$result = @mysql_query($requete, $res['0']);
htmlentities($_SESSION["oreonfirstname"], ENT_QUOTES);
} else {
$requete = "UPDATE `contact` SET `user_firstname` = '". htmlentities($_SESSION["oreonfirstname"], ENT_QUOTES)."',`user_lastname` = '". htmlentities($_SESSION["oreonlastname"], ENT_QUOTES) ."',`user_alias` = '". htmlentities($_SESSION["oreonlogin"], ENT_QUOTES) ."',`user_passwd` = '". md5($_SESSION["oreonpasswd"]) ."',`user_mail` = '".$_SESSION['oreonemail']."',`user_status` = '32',`user_lang` = '".$_SESSION["oreonlang"]."' WHERE `user_id` =1 LIMIT 1 ;";
- if ($DEBUG) print $requete . "<br>";
+ if ($DEBUG) print $requete . "<br />";
$result = @mysql_query($requete, $res['0']);
}
if ($res[1] == '') {
echo '<td align="right"><b><span class="go">OK</b></td></tr>';
} else {
- echo '<td align="right"><b><span class="stop">CRITICAL</span></b><br>'.$res[1].'<br></td></tr>';
+ echo '<td align="right"><b><span class="stop">CRITICAL</span></b><br />'.$res[1].'<br /></td></tr>';
$return_false = 1;
}
}
@@ -339,7 +339,7 @@ aff_header("Oreon Setup Wizard", "Creating Database", 11);
$requete .= ", `ldap_auth_enable` = '".htmlentities($_SESSION["ldap_auth_enable"], ENT_QUOTES)."'";
$requete .= ", `debug_path` = '".$_SESSION["oreon_dir"]."log/' ;";
- if ($DEBUG) print $requete . "<br>";
+ if ($DEBUG) print $requete . "<br />";
$result = @mysql_query($requete, $res['0'])or ( $mysql_msg= mysql_error());
$conf_installoreon['status_file'] = ($conf_installoreon['status_file'] === "" ? "/usr/local/nagios/var/status.log" : $conf_installoreon['status_file']);
@@ -356,18 +356,18 @@ aff_header("Oreon Setup Wizard", "Creating Database", 11);
$requete .= "`log_archive_path` = '".$conf_installoreon['log_archive_path']."', `state_retention_file` = '".$conf_installoreon['state_retention_file']."',`comment_file` = '".$conf_installoreon['comment_file']."',`downtime_file` = '".$conf_installoreon['downtime_file']."',`lock_file` = '".$conf_installoreon['lock_file']."',`temp_file` = '". $conf_installoreon['temp_file']."',`log_file` = '".$conf_installoreon['log_file']."' ";
$requete .= " WHERE `nagios_activate` =1 LIMIT 1;";
- if ($DEBUG) print $requete . "<br>";
+ if ($DEBUG) print $requete . "<br />";
$result = @mysql_query($requete, $res['0']) or ( $mysql_msg= mysql_error());
$requete = "UPDATE `cfg_resource` SET `resource_line` = '\$USER1\$=".$_SESSION["nagios_plugins"]."' WHERE `resource_id` =1 LIMIT 1 ;";
- if ($DEBUG) print $requete . "<br>";
+ if ($DEBUG) print $requete . "<br />";
$result = @mysql_query($requete, $res['0']) or ( $mysql_msg= mysql_error());
if ($res[1] == '') {
echo '<td align="right"><b><span class="go">OK</b></td></tr>';
} else {
- echo '<td align="right"><b><span class="stop">CRITICAL</span></b><br>'.$res[1].'<br></td></tr>';
+ echo '<td align="right"><b><span class="stop">CRITICAL</span></b><br />'.$res[1].'<br /></td></tr>';
$return_false = 1;
}
}
diff --git a/www/install/steps/step12.php b/www/install/steps/step12.php
index 5f616371d7ebf83c09a966fc7da5da1ce467385c..06bd2d6e4378dd54bd93b59fb3344bcfaba23206 100644
--- a/www/install/steps/step12.php
+++ b/www/install/steps/step12.php
@@ -32,17 +32,17 @@ aff_header("Oreon Setup Wizard", "Post-Installation", 12); ?>
<td colspan="2" ><b>End of Setup</b></td>
</tr>
<tr>
- <td colspan="2"><br>
- Oreon Setup is finished. Now you can use your monitoring Solution.<br><br>Thanks for using Oreon
- <br><br>
- <b>Self service and commercial Support.</b><br><br>
+ <td colspan="2"><br />
+ Oreon Setup is finished. Now you can use your monitoring Solution.<br /><br />Thanks for using Oreon
+ <br /><br />
+ <b>Self service and commercial Support.</b><br /><br />
There are various way to get informations about Oreon ; the documentation, the wiki, forum and other stuffs.
<ul>
<li> Oreon WebSite : <a target="_blank" href="http://www.oreon-project.org">www.oreon-project.org</a></li>
<li> Oreon Forum : <a target="_blank" href="http://forum.oreon-project.org">forum.oreon-project.org</a></li></li>
<li> Oreon Wiki : <a target="_blank" href="http://wiki.oreon-project.org">wiki.oreon-project.org</a></li>
</ul>
- <br><p align="justify">
+ <br /><p align="justify">
If your company needs professional consulting and services for Oreon, or if you need to purchase a support contract for it, don't hesitate to contact official </b><a target="_blank" href="http://www.oreon-services.com">Oreon support center</a></b>.
</p>
</td>
diff --git a/www/install/steps/step3.php b/www/install/steps/step3.php
index 635718748952e3b60bf77e7cd395592d5c793079..21a7e6baf2756dee3caf7608a28479b76a2bbd59 100644
--- a/www/install/steps/step3.php
+++ b/www/install/steps/step3.php
@@ -17,7 +17,7 @@ For information : contact@oreon-project.org
*/
aff_header("Oreon Setup Wizard", "Environment Configuration", 3); ?>
-In order for your Oreon installation to function properly, please complete the following fields.<br><br>
+In order for your Oreon installation to function properly, please complete the following fields.<br /><br />
<table cellpadding="0" cellspacing="0" border="0" width="80%" class="StyleDottedHr" align="center">
<tr>
<th style="padding-left:20px " colspan="2">Environment Configurations</th>
diff --git a/www/install/steps/step4.php b/www/install/steps/step4.php
index 27486c6123fc6645fa347b504e8c3dd8eb870964..06ef4a05ea8ac1c28d0d112984ada660aeb648df 100644
--- a/www/install/steps/step4.php
+++ b/www/install/steps/step4.php
@@ -127,7 +127,7 @@ aff_header("Oreon Setup Wizard", "Verifying Configuration", 4); ?>
// if ( strstr (strtoupper( ini_get('include_path')),"PEAR") || strstr (strtoupper( ini_get('include_path')),"PHP")) {
echo '<b><span class="go">OK</font></b>';
} else {
- echo '<b><span class="stop">Warning: PHP Pear not found <br>'. $pear_path . '/PEAR.php</font></b>';
+ echo '<b><span class="stop">Warning: PHP Pear not found <br />'. $pear_path . '/PEAR.php</font></b>';
$return_false = 1;
}?>
</td>
@@ -146,7 +146,7 @@ aff_header("Oreon Setup Wizard", "Verifying Configuration", 4); ?>
} else {
echo '<b><span class="stop">Critical: Not Writeable</font></b>';
$msg = $uid['name'] .':'. $gid['name'] .' (' .$perms. ')</b>' ;
- $msg .= '<br>Should be '. $_SESSION['apache_user'].':'.$_SESSION['nagios_group'].' (775)';
+ $msg .= '<br />Should be '. $_SESSION['apache_user'].':'.$_SESSION['nagios_group'].' (775)';
$return_false = 1;
}
} else {
@@ -173,7 +173,7 @@ aff_header("Oreon Setup Wizard", "Verifying Configuration", 4); ?>
} else {
echo '<b><span class="stop">Critical: Not Writeable</font></b>';
$msg = $uid['name'] .':'. $gid['name'] .' (' .$perms. ')</b>';
- $msg .= '<br>Should be '. $_SESSION['apache_user'].':'.$_SESSION['nagios_group'].' (775)';
+ $msg .= '<br />Should be '. $_SESSION['apache_user'].':'.$_SESSION['nagios_group'].' (775)';
$return_false = 1;
}
} else {
diff --git a/www/install/steps/step6.php b/www/install/steps/step6.php
index 9c3b16c48365e4d986d105ef80c083176d3c5134..a07e3d548fb3792561b95e979227ebee5f9dfa4d 100644
--- a/www/install/steps/step6.php
+++ b/www/install/steps/step6.php
@@ -18,7 +18,7 @@ For information : contact@oreon-project.org
aff_header("Oreon Setup Wizard", "DataBase Configuration", 6);
if (isset($passwd_error) && $passwd_error)
- print "<center><b><span class=\"stop\">$passwd_error</span></b></center><br>";
+ print "<center><b><span class=\"stop\">$passwd_error</span></b></center><br />";
?>
<table cellpadding="0" cellspacing="0" border="0" width="80%" class="StyleDottedHr" align="center">
<tr>
diff --git a/www/install/steps/step7.php b/www/install/steps/step7.php
index c446147661aae34c48efbc1dff63b0cc23d62ef7..449dd5f64bc7170fb5c2e4fd07dbeeaffe1988ec 100644
--- a/www/install/steps/step7.php
+++ b/www/install/steps/step7.php
@@ -50,7 +50,7 @@ aff_header("Oreon Setup Wizard", "DataBase Verification", 7);
if ($mysql_msg == '') {
$requete = "SELECT VERSION() AS mysql_version;";
- if ($DEBUG) print $requete . "<br>";
+ if ($DEBUG) print $requete . "<br />";
$result = mysql_query($requete, $res['0']);
$row = mysql_fetch_assoc($result);
if(preg_match("/^(4\.1|5\.)/", $row['mysql_version'])){
diff --git a/www/install/steps/step8.php b/www/install/steps/step8.php
index 292cfcee1576787dfec3c52409f061d2e246bc33..a9bd28cf8e7389166cb6d25d57c28d09126976ac 100644
--- a/www/install/steps/step8.php
+++ b/www/install/steps/step8.php
@@ -18,7 +18,7 @@ For information : contact@oreon-project.org
aff_header("Oreon Setup Wizard", "User Interface Configuration", 8);
if (isset($passwd_error) && $passwd_error)
- print "<center><b><span class=\"stop\">$passwd_error</span></b></center><br>";
+ print "<center><b><span class=\"stop\">$passwd_error</span></b></center><br />";
?>
<table cellpadding="0" cellspacing="0" border="0" width="80%" class="StyleDottedHr" align="center">
<tr>
diff --git a/www/install/steps/step9.php b/www/install/steps/step9.php
index 74e0a21b426fde23c7bfb6e93cb419803e7d9b05..d5ad566dde1d6fb7a767195d0279a3ea791ce23d 100644
--- a/www/install/steps/step9.php
+++ b/www/install/steps/step9.php
@@ -24,7 +24,7 @@ if (isset($_POST["goto"]) && strcmp($_POST["goto"], "Back")){
$_SESSION["oreonlang"] = $_POST["oreonlang"];
}
aff_header("Oreon Setup Wizard", "LDAP Authentification", 9); ?>
-If you want enable LDAP authentification, please complete the following fields. If you don't, leave blank.<br><br>
+If you want enable LDAP authentification, please complete the following fields. If you don't, leave blank.<br /><br />
<table cellpadding="0" cellspacing="0" border="0" width="80%" class="StyleDottedHr" align="center">
<tr>
<th style="padding-left:20px " colspan="2">LDAP Configuration</th>
diff --git a/www/lang/en.php b/www/lang/en.php
index 53e9b3f8cf14c61208f27f222f1895d03410ea06..9199fe35dada4b62068f0bbc969bf603cde0c032 100644
--- a/www/lang/en.php
+++ b/www/lang/en.php
@@ -245,7 +245,7 @@ $lang['mon_scheduling'] = "Scheduling queue";
$lang['mon_actions'] = "Actions";
$lang['mon_active'] = "ACTIVE";
$lang['mon_inactive'] = "INACTIVE";
-$lang['mon_request_submit_host'] = "Your request had been submitted. <br><br>You’re gonna be send at the Host page'.";
+$lang['mon_request_submit_host'] = "Your request had been submitted. <br /><br />You’re gonna be send at the Host page'.";
$lang['Details'] = "Details";
$lang['mon_checkOutput'] = "check output";
$lang['mon_dataPerform'] = "data perform";
@@ -257,8 +257,8 @@ $lang['mon_hg_commands'] = "Host Group Commands";
$lang['mon_h_commands'] = "Host Commands";
$lang['mon_sg_commands'] = "Service Group Commands";
$lang['mon_s_commands'] = "Service Commands";
-$lang['mon_no_stat_for_host'] = "No stat for this Host.<br><br> Think has generate the configuration files.";
-$lang['mon_no_stat_for_service'] = "No stat for this Service.<br><br> Think has generate the configuration files.";
+$lang['mon_no_stat_for_host'] = "No stat for this Host.<br /><br /> Think has generate the configuration files.";
+$lang['mon_no_stat_for_service'] = "No stat for this Service.<br /><br /> Think has generate the configuration files.";
$lang['mon_hg_cmd1'] = "Schedule downtime for all hosts in this hostgroup";
$lang['mon_hg_cmd2'] = "Schedule downtime for all services in this hostgroup";
$lang['mon_hg_cmd3'] = "Enable notifications for all hosts in this hostgroup";
@@ -330,9 +330,9 @@ $lang['cmt_service_comment'] = "Service Comments";
$lang['cmt_host_comment'] = "Host Comments";
$lang['cmt_addH'] = "Add a Host comment";
$lang['cmt_addS'] = "Add a Service comment";
-$lang['cmt_added'] = "Comment added with succes. <br><br>Click <a href='./oreon.php?p=307' class='text11b'>here</a> to return to the comments page. ";
-$lang['cmt_del'] = "Comment deleted with succes. <br><br>Click <a href='./oreon.php?p=307' class='text11b'>here</a> to return to the comments page. ";
-$lang['cmt_del_all'] = "All Comments deleted with succes. <br><br>Click <a href='./oreon.php?p=307' class='text11b'>here</a> to return to the comments page. ";
+$lang['cmt_added'] = "Comment added with succes. <br /><br />Click <a href='./oreon.php?p=307' class='text11b'>here</a> to return to the comments page. ";
+$lang['cmt_del'] = "Comment deleted with succes. <br /><br />Click <a href='./oreon.php?p=307' class='text11b'>here</a> to return to the comments page. ";
+$lang['cmt_del_all'] = "All Comments deleted with succes. <br /><br />Click <a href='./oreon.php?p=307' class='text11b'>here</a> to return to the comments page. ";
$lang['cmt_host_name'] = "Host Name";
$lang['cmt_service_descr'] = "Services";
$lang['cmt_entry_time'] = "Entry Time";
@@ -346,8 +346,8 @@ $lang['cmt_actions'] = "Actions";
$lang['dtm_addH'] = "Add a Host downtime";
$lang['dtm_addS'] = "Add a Service downtime";
$lang['dtm_addHG'] = "Add a Host Group downtime";
-$lang['dtm_added'] = "Downtime added with succes. <br><br>Click <a href='./oreon.php?p=308' class='text11b'>here</a> to return to the Downtimes page. ";
-$lang['dtm_del'] = "Downtime deleted with succes. <br><br>Click <a href='./oreon.php?p=308' class='text11b'>here</a> to return to the Downtimes page. ";
+$lang['dtm_added'] = "Downtime added with succes. <br /><br />Click <a href='./oreon.php?p=308' class='text11b'>here</a> to return to the Downtimes page. ";
+$lang['dtm_del'] = "Downtime deleted with succes. <br /><br />Click <a href='./oreon.php?p=308' class='text11b'>here</a> to return to the Downtimes page. ";
$lang['dtm_start_time'] = "Start Time";
$lang['dtm_end_time'] = "End Time";
$lang['dtm_fixed'] = "Fixed";
@@ -390,7 +390,7 @@ $lang['confirm_detach'] = "Are you sure you want to detach the service ?";
$lang['file_exist'] = "Sorry the file already exist.";
$lang['uncomplete_form'] = "Uncomplete form or invalid";
$lang['none'] = "none";
-$lang['already_logged'] = "You are already connected to OREON, close firstly the other session. <br> If this window is the only Centreon window, click <br><a href='?disconnect=1' class='text11b'>here</a>";
+$lang['already_logged'] = "You are already connected to OREON, close firstly the other session. <br /> If this window is the only Centreon window, click <br /><a href='?disconnect=1' class='text11b'>here</a>";
$lang['usage_stats'] = "Statistics usage";
$lang['check'] = "Check";
$lang['uncheck'] = "Uncheck";
diff --git a/www/lang/fr.php b/www/lang/fr.php
index 19e26afa394097bdce088a6a67b4c9e84244766b..9f6a1a862f0f5f3466b205c07f9be41df38107bc 100644
--- a/www/lang/fr.php
+++ b/www/lang/fr.php
@@ -246,7 +246,7 @@ $lang['mon_scheduling'] = "Ordre d'ordonnancement";
$lang['mon_actions'] = "Actions";
$lang['mon_active'] = "ACTIF";
$lang['mon_inactive'] = "INACTIF";
-$lang['mon_request_submit_host'] = "Votre demande a bien été traitée. <br><br>Vous allez être redirigé vers la page des Hôtes.";
+$lang['mon_request_submit_host'] = "Votre demande a bien été traitée. <br /><br />Vous allez être redirigé vers la page des Hôtes.";
$lang['Details'] = "Détails";
$lang['mon_checkOutput'] = "check output";
$lang['mon_dataPerform'] = "data perform";
@@ -257,8 +257,8 @@ $lang['mon_hg_commands'] = "Commandes pour l'Host Group";
$lang['mon_h_commands'] = "Commandes pour l'Host";
$lang['mon_sg_commands'] = "Commandes pour le Service Group";
$lang['mon_s_commands'] = "Commandes pour le Service";
-$lang['mon_no_stat_for_host'] = "Pas de stat pour cet Host.<br><br>Pensez à générer les fichiers de configuration.";
-$lang['mon_no_stat_for_service'] = "Aucune stat pour ce service.<br><br> Pensez a gnrer les fichiers de configuration.";
+$lang['mon_no_stat_for_host'] = "Pas de stat pour cet Host.<br /><br />Pensez à générer les fichiers de configuration.";
+$lang['mon_no_stat_for_service'] = "Aucune stat pour ce service.<br /><br /> Pensez a gnrer les fichiers de configuration.";
$lang['mon_hg_cmd1'] = "Programmer un arrêt pour tous les Hôtes de ce Host Group";
$lang['mon_hg_cmd2'] = "Programmer un arrêt pour tous les Services de cet Host Group";
$lang['mon_hg_cmd3'] = "Activer les notifications pour tous les Hôtes de cet Host Group";
@@ -331,9 +331,9 @@ $lang['cmt_service_comment'] = "Commentaires de Services";
$lang['cmt_host_comment'] = "Commentaires d’Hôtes";
$lang['cmt_addH'] = "Ajouter une commentaired'Host";
$lang['cmt_addS'] = "Ajouter un commentaire de Service";
-$lang['cmt_added'] = "Commentaire ajouté avec succès .<br><br> Cliquez <a href='./oreon.php?p=307' class='text11b'>ici</a> pour retourner a la page des commentaires ";
-$lang['cmt_del'] = "Commentaire supprimé avec succès .<br><br> Cliquez <a href='./oreon.php?p=307' class='text11b'>ici</a> pour retourner a la page des commentaires ";
-$lang['cmt_del_all'] = "Tous les Commentaires ont été supprimés avec succès .<br><br> Cliquez <a href='./oreon.php?p=307'>ici</a> pour retourner a la page des commentaires ";
+$lang['cmt_added'] = "Commentaire ajouté avec succès .<br /><br /> Cliquez <a href='./oreon.php?p=307' class='text11b'>ici</a> pour retourner a la page des commentaires ";
+$lang['cmt_del'] = "Commentaire supprimé avec succès .<br /><br /> Cliquez <a href='./oreon.php?p=307' class='text11b'>ici</a> pour retourner a la page des commentaires ";
+$lang['cmt_del_all'] = "Tous les Commentaires ont été supprimés avec succès .<br /><br /> Cliquez <a href='./oreon.php?p=307'>ici</a> pour retourner a la page des commentaires ";
$lang['cmt_host_name'] = "Nom de l’Host";
$lang['cmt_service_descr'] = "Services";
$lang['cmt_entry_time'] = "Date de saisie";
@@ -347,8 +347,8 @@ $lang['cmt_actions'] = "Actions";
$lang['dtm_addH'] = "Ajouter un arrêt d’Host";
$lang['dtm_addS'] = "Ajouter un arrêt de Service";
$lang['dtm_addHG'] = "Ajouter un arrêt de Host Group";
-$lang['dtm_added'] = "Downtime ajouté avec succès .<br><br> Cliquez <a href='./oreon.php?p=308' class='text11b'>ici</a> pour retourner a la page des Downtimes ";
-$lang['dtm_del'] = "Downtime supprimé avec succès .<br><br> Cliquez <a href='./oreon.php?p=308' class='text11b'>ici</a> pour retourner a la page des Downtimes ";
+$lang['dtm_added'] = "Downtime ajouté avec succès .<br /><br /> Cliquez <a href='./oreon.php?p=308' class='text11b'>ici</a> pour retourner a la page des Downtimes ";
+$lang['dtm_del'] = "Downtime supprimé avec succès .<br /><br /> Cliquez <a href='./oreon.php?p=308' class='text11b'>ici</a> pour retourner a la page des Downtimes ";
$lang['dtm_start_time'] = "Date de début";
$lang['dtm_end_time'] = "Date de fin";
$lang['dtm_fixed'] = "Fixé";
@@ -391,7 +391,7 @@ $lang['confirm_detach'] = "Etes vous sur de vouloir detacher le service ?";
$lang['file_exist'] = "Désolé le fichier existe déjà.";
$lang['uncomplete_form'] = "Formulaire incomplet ou erroné";
$lang['none'] = "Aucun";
-$lang['already_logged'] = "Vous êtes déjà connecté à OREON, fermez d´abord l´autre session <br>Si c´est la seule fenêtre d´ouverte, cliquez<br><a href='?disconnect=1' class='text11b'>ici</a>";
+$lang['already_logged'] = "Vous êtes déjà connecté à OREON, fermez d´abord l´autre session <br />Si c´est la seule fenêtre d´ouverte, cliquez<br /><a href='?disconnect=1' class='text11b'>ici</a>";
$lang['usage_stats'] = "Statistiques d'utilisation";
$lang['check'] = "Cocher";
$lang['uncheck'] = "Décocher";
diff --git a/www/lib/ofc-library/open-flash-chart.php b/www/lib/ofc-library/open-flash-chart.php
index f0b6c10e788b68a9c43d44a15ca7a5ae0e683b8d..1c08d1f1688ddf82429c749eab59567c8d066627 100644
--- a/www/lib/ofc-library/open-flash-chart.php
+++ b/www/lib/ofc-library/open-flash-chart.php
@@ -301,10 +301,10 @@ class graph
* Replaceable tokens that can be used in the string include: \n
* #val# - The actual value of whatever the mouse is over. \n
* #key# - The key string. \n
- * \<br> - New line. \n
+ * \<br /> - New line. \n
* #x_label# - The X label string. \n
* #x_legend# - The X axis legend text. \n
- * Default string is: "#x_label#<br>#val#" \n
+ * Default string is: "#x_label#<br />#val#" \n
*
* @param tip a string argument.
* A formatted string to show as the tooltip.
diff --git a/www/login.php b/www/login.php
index 4fc4894916bc89a7c0f563057545ca4d4d2bd600..6a634c5d4b81a23bf886700fcdcea645072dba5b 100644
--- a/www/login.php
+++ b/www/login.php
@@ -36,16 +36,16 @@ For information : contact@oreon-project.org
<td class="LoginInvitLogo" colspan="2"><img src="img/logo_centreon_wt.gif" alt="Centreon logo" title="Centreon Logo"></td>
</tr>
<tr>
- <td class="LoginInvitVersion"><br>
+ <td class="LoginInvitVersion"><br />
<?php
$DBRESULT =& $pearDB->query("SELECT oi.value FROM oreon_informations oi WHERE oi.key = 'version' LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$release = $DBRESULT->fetchRow();
print $release["value"];
?>
</td>
- <td class="LoginInvitDate"><br><?php echo $date; ?></td>
+ <td class="LoginInvitDate"><br /><?php echo $date; ?></td>
</tr>
<tr>
<td colspan="2">
@@ -68,7 +68,7 @@ For information : contact@oreon-project.org
</tr>
<tr>
<td id="LoginInvitcpy" colspan="2">
- <br>
+ <br />
© 2004-2007 <a href="mailto:infos@oreon-project.org">Centreon</a>
</td>
</tr>
diff --git a/www/menu/BlockHeader.ihtml b/www/menu/BlockHeader.ihtml
index ef5864a28a18940f5e31fe92628ce1381a87999d..fc0036549068caa76b350171378f800914df2f9d 100644
--- a/www/menu/BlockHeader.ihtml
+++ b/www/menu/BlockHeader.ihtml
@@ -3,31 +3,34 @@
<img src="./img/icones/7x7/sort_asc.gif" onclick="new Effect.toggle('header')" style="position:absolute;top:0px;left:15px;" alt="hide_or_show_menu" />
<img src='{$urlLogo}' alt='Centreon logo' title='Centreon Logo' id="logo" />
<!-- informations bank for ajax -->
- <FORM id="AjaxBankBasic">
- <INPUT type="hidden" name="color_OK" value="{$color.OK}">
- <INPUT type="hidden" name="color_CRITICAL" value="{$color.CRITICAL}" >
- <INPUT type="hidden" name="color_WARNING" value="{$color.WARNING}" >
- <INPUT type="hidden" name="color_PENDING" value="{$color.PENDING}" >
- <INPUT type="hidden" name="color_UNKNOWN" value="{$color.UNKNOWN}" >
- <INPUT type="hidden" name="color_UP" value="{$color.UP}">
- <INPUT type="hidden" name="color_DOWN" value="{$color.DOWN}" >
- <INPUT type="hidden" name="color_UNREACHABLE" value="{$color.UNREACHABLE}" >
- <INPUT type="hidden" name="icone_is_flapping" value="./img/icones/16x16/flapping.gif" >
- <INPUT type="hidden" name="icone_problem_has_been_acknowledged" value="./img/icones/16x16/worker.gif" >
- <INPUT type="hidden" name="icone_accept_passive_check0" value="./img/icones/14x14/gears_pause.gif" >
- <INPUT type="hidden" name="icone_accept_passive_check1" value="./img/icones/14x14/gears_stop.gif" >
- <INPUT type="hidden" name="icone_notifications_enabled" value="./img/icones/14x14/noloudspeaker.gif" >
- <INPUT type="hidden" name="icone_undo" value="./img/icones/14x14/undo.gif" >
- <INPUT type="hidden" name="icone_graph" value="./img/icones/16x16/column-chart.gif">
- <INPUT type="hidden" name="icone_host_has_been_acknowledged" value="./img/icones/16x16/worker.gif">
- <INPUT type="hidden" name="icone_notifications_disabled" value="./img/icones/14x14/noloudspeaker.gif" >
- <INPUT type="hidden" name="icon_downtime" value="./img/icones/14x14/breakpoint.gif" >
- <INPUT type="hidden" name="icon_comment" value="./img/icones/14x14/about.gif" >
- <INPUT type="hidden" name="version" value="{$version}">
- <INPUT type="hidden" name="fileStatus" value="{$fileStatus}">
- <INPUT type="hidden" name="fileOreonConf" value="{$fileOreonConf}">
- <INPUT type="hidden" name="date_time_format_status" value="{$date_time_format_status}">
- </FORM>
+
+ <form id="AjaxBankBasic" action="#" method="post">
+ <div>
+ <input type="hidden" name="color_OK" value="{$color.OK}"/>
+ <input type="hidden" name="color_CRITICAL" value="{$color.CRITICAL}" />
+ <input type="hidden" name="color_WARNING" value="{$color.WARNING}" />
+ <input type="hidden" name="color_PENDING" value="{$color.PENDING}" />
+ <input type="hidden" name="color_UNKNOWN" value="{$color.UNKNOWN}" />
+ <input type="hidden" name="color_UP" value="{$color.UP}"/>
+ <input type="hidden" name="color_DOWN" value="{$color.DOWN}" />
+ <input type="hidden" name="color_UNREACHABLE" value="{$color.UNREACHABLE}" />
+ <input type="hidden" name="icone_is_flapping" value="./img/icones/16x16/flapping.gif" />
+ <input type="hidden" name="icone_problem_has_been_acknowledged" value="./img/icones/16x16/worker.gif" />
+ <input type="hidden" name="icone_accept_passive_check0" value="./img/icones/14x14/gears_pause.gif" />
+ <input type="hidden" name="icone_accept_passive_check1" value="./img/icones/14x14/gears_stop.gif" />
+ <input type="hidden" name="icone_notifications_enabled" value="./img/icones/14x14/noloudspeaker.gif" />
+ <input type="hidden" name="icone_undo" value="./img/icones/14x14/undo.gif" />
+ <input type="hidden" name="icone_graph" value="./img/icones/16x16/column-chart.gif"/>
+ <input type="hidden" name="icone_host_has_been_acknowledged" value="./img/icones/16x16/worker.gif"/>
+ <input type="hidden" name="icone_notifications_disabled" value="./img/icones/14x14/noloudspeaker.gif" />
+ <input type="hidden" name="icon_downtime" value="./img/icones/14x14/breakpoint.gif" />
+ <input type="hidden" name="icon_comment" value="./img/icones/14x14/about.gif" />
+ <input type="hidden" name="version" value="{$version}"/>
+ <input type="hidden" name="fileStatus" value="{$fileStatus}"/>
+ <input type="hidden" name="fileOreonConf" value="{$fileOreonConf}"/>
+ <input type="hidden" name="date_time_format_status" value="{$date_time_format_status}"/>
+ </div>
+ </form>
<!-- stat -->
<div id="resume_light">
<table cellpadding="0" cellspacing="0" border="0">
@@ -76,11 +79,10 @@
</div>
<span id="linkBar"></span>
<span id="logli">
- <img src='./img/icones/16x16/text_code.gif'> <a href='./oreon.php?p={$p}&doc=1&page=toc.html' alt='{$Documentation}'>{$Documentation}</a>
- <img onclick="DisplayHidden('legend');" src="./img/icones/16x16/text_view.gif" alt='{$legend1}' title='{$legend2}' alt='{$Help}'> <a onclick="DisplayHidden('legend');">{$Help}</a>
- <a href="{$LogOutUrl}"><img src="./img/icones/16x16/logout.gif"></a> <a href="{$LogOutUrl}">{$Logout}</a>
+ <img src='./img/icones/16x16/text_code.gif' alt="icon_link_doc" /> <a href='./oreon.php?p={$p}&doc=1&page=toc.html' title='{$Documentation}'>{$Documentation}</a>
+ <img onclick="DisplayHidden('legend');" src="./img/icones/16x16/text_view.gif" alt='{$legend1}' title='{$legend2}'/> <a onclick="DisplayHidden('legend');">{$Help}</a>
+ <a href="{$LogOutUrl}"><img src="./img/icones/16x16/logout.gif" alt="icon_logout"/></a> <a href="{$LogOutUrl}">{$Logout}</a>
</span>
<div id="date">{$Date}</div>
</div>
-</div>
diff --git a/www/menu/BlockMenuType1.ihtml b/www/menu/BlockMenuType1.ihtml
index a56d662bf44a663d3931c7107112699c1e7168d8..97340158b443d1c81dc076e0ad323b6f9bb48619 100644
--- a/www/menu/BlockMenuType1.ihtml
+++ b/www/menu/BlockMenuType1.ihtml
@@ -5,7 +5,7 @@
{if $elemArr1[elem1].Menu1UrlPopup}
<li><div id="{$elemArr1[elem1].Menu1ClassImg}"><a href='{$elemArr1[elem1].Menu1UrlPopupOpen}' target="_blank">{$elemArr1[elem1].Menu1Name}</a></div></li>
{else}
- <li><div id="{$elemArr1[elem1].Menu1ClassImg}"><a href={$elemArr1[elem1].Menu1Url}>{$elemArr1[elem1].Menu1Name}</a></div></li>
+ <li><div id="{$elemArr1[elem1].Menu1ClassImg}"><a href='{$elemArr1[elem1].Menu1Url}'>{$elemArr1[elem1].Menu1Name}</a></div></li>
{/if}
{/section}
</ul>
diff --git a/www/menu/BlockMenuType2.ihtml b/www/menu/BlockMenuType2.ihtml
index 44c719456f5b704333e7368cde95cc5db1848206..8b5eb7f6549d6f8b22cb8e474a23daf04e3a29a2 100644
--- a/www/menu/BlockMenuType2.ihtml
+++ b/www/menu/BlockMenuType2.ihtml
@@ -1,5 +1,5 @@
-<div id={$Menu2Color}>
- <div id={$Menu2ID}>
+<div id="{$Menu2Color}">
+ <div id="{$Menu2ID}">
{section name=elem2 loop=$elemArr2}
<span class="separator_menu2">{$elemArr2[elem2].Menu2Sep}</span>
<span class="span2">{if $elemArr2[elem2].Menu2UrlPopup}<a href='{$elemArr2[elem2].Menu2UrlPopupOpen}' target="_blank" style="white-space:nowrap;">{$elemArr2[elem2].Menu2Name}</a>{else}<a href='{$elemArr2[elem2].Menu2Url}' style="white-space:nowrap;">{$elemArr2[elem2].Menu2Name}</a>{/if}</span>
diff --git a/www/menu/BlockMenuType3.ihtml b/www/menu/BlockMenuType3.ihtml
index 275e72e89e290aa902867f5a628b6cf290d4e020..a9c05a304085b1c3fb6e55dd815f969339f835ea 100644
--- a/www/menu/BlockMenuType3.ihtml
+++ b/www/menu/BlockMenuType3.ihtml
@@ -16,11 +16,11 @@
<tr class="middle">
<td class="left"></td>
<td class="center" style="white-space: nowrap;">
- {if $cpt}<br>{/if}<img src='./img/icones/12x12/doublearrowsnav.gif' style='padding-bottom:2px;'> {$curr_id.title}<br><br>
+ {if $cpt}<br />{/if}<img src='./img/icones/12x12/doublearrowsnav.gif' style='padding-bottom:2px;' alt='icon_design' /> {$curr_id.title}<br /><br />
<ul>
{foreach from=$curr_id.tab item=curr_id2}
<li{if $curr_id2.MenuIsOnClick} onclick="{$curr_id2.MenuOnClick}()"{/if} id="menu_{$curr_id2.Menu3ID}">
- {if $curr_id2.Menu3Icone}<img src='{$curr_id2.Menu3Icone}' alt="{$curr_id2.Menu3Name}" style="padding-left:5px;">{/if}
+ {if $curr_id2.Menu3Icone}<img src='{$curr_id2.Menu3Icone}' alt="{$curr_id2.Menu3Name}" style="padding-left:5px;" />{/if}
{if $curr_id2.Menu3Popup}
<a href={$curr_id2.Menu3UrlPopup} target="_blank" title="{$curr_id2.Menu3Name}">{$curr_id2.Menu3Name}</a>
{else}
@@ -48,7 +48,7 @@
<td class="center"></td>
<td class="right"></td>
</tr>
- </table><br>
+ </table><br />
{if $amIadmin}
<table class="Tmenu3" width="100%">
<tr class="top">
@@ -59,12 +59,12 @@
<tr class="middle">
<td class="left"></td>
<td class="center" style="white-space: nowrap;">
- <img src='./img/icones/12x12/doublearrowsnav.gif' title='{$user.ip}' style='padding-bottom:2px;'> {$connected_users} <br><br>
+ <img src='./img/icones/12x12/doublearrowsnav.gif' title='{$user.ip}' style='padding-bottom:2px;' alt='icon_design' /> {$connected_users} <br /><br />
<ul>
{ foreach item=user from=$tab_user }
{if $user.admin}
<li>
- <img src='./img/icones/16x16/guard.gif' title='{$user.ip}' style='padding:1px;'>
+ <img src='./img/icones/16x16/guard.gif' title='{$user.ip}' style='padding:1px;' />
{if $user.alias == $UserName}
<a href="{$UserInfoUrl}">{$user.alias}</a>
{else}
@@ -72,7 +72,7 @@
{/if}
</li>
{else}
- <li><img src='./img/icones/16x16/user1.gif' title='{$user.ip}' style='padding:1px;'> {$user.alias}</li>
+ <li><img src='./img/icones/16x16/user1.gif' title='{$user.ip}' style='padding:1px;' /> {$user.alias}</li>
{/if}
{/foreach}
</ul>
diff --git a/www/menu/Menu.php b/www/menu/Menu.php
index b9e8b6f15c6b2d379acf604fe235a594ad6eaf04..40df2befa1210f2bae8a5227b93730f50e686ef7 100644
--- a/www/menu/Menu.php
+++ b/www/menu/Menu.php
@@ -25,7 +25,7 @@ For information : contact@oreon-project.org
# ODS Database retrieve information
$DBRESULT =& $pearDBO->query("SELECT * FROM config LIMIT 1");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$result_config = $DBRESULT->fetchRow();
if (isset($result_config) && $result_config)
$gopt = array_map("myDecode", $result_config);
@@ -88,7 +88,7 @@ For information : contact@oreon-project.org
if (PEAR::isError($DBRESULT))
print ($DBRESULT->getMessage());
for($i = 0; $DBRESULT->numRows() && $DBRESULT->fetchInto($elem);$i++)
- $elemArr[1][$i] = array("Menu1ClassImg" => $level1 == $elem["topology_page"] ? "menu1_bgimg" : NULL,
+ $elemArr[1][$i] = array("Menu1ClassImg" => $level1 == $elem["topology_page"] ? "menu1_bgimg" : "id_".$elem["topology_id"],
"Menu1Url" => "oreon.php?p=".$elem["topology_page"].$elem["topology_url_opt"],
"Menu1UrlPopup" => $elem["topology_popup"],
"Menu1UrlPopupOpen" => $elem["topology_url"],
diff --git a/www/oreon.php b/www/oreon.php
index 5eeea7ff90419cdab09f030ba917818b2084897a..4ba203a49bd919abf3d9ff3bb890e2dc07964d09 100644
--- a/www/oreon.php
+++ b/www/oreon.php
@@ -53,7 +53,7 @@ For information : contact@oreon-project.org
$isRestreint = HadUserLca($pearDB);
$DBRESULT =& $pearDB->query("SELECT topology_parent,topology_name,topology_id,topology_url,topology_page FROM topology WHERE topology_page = '".$p."'");
- if (PEAR::isError($DBRESULT)) print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ if (PEAR::isError($DBRESULT)) print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$redirect =& $DBRESULT->fetchRow();
$nb_page = NULL;
diff --git a/www/pathWay.php b/www/pathWay.php
index 93442b5f975ad4aa5eb49941cab1e0782232fa07..6a5b226aaa1103c552809d12a29d907ee5a7bf46 100644
--- a/www/pathWay.php
+++ b/www/pathWay.php
@@ -24,7 +24,7 @@ For information : contact@oreon-project.org
$rqPath = "SELECT topology_url, topology_url_opt, topology_parent, topology_name, topology_page FROM topology WHERE topology_page = '".$p."' ORDER BY topology_page";
$DBRESULT =& $pearDB->query($rqPath);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$redirectPath =& $DBRESULT->fetchRow();
return $redirectPath;
}
@@ -34,7 +34,7 @@ For information : contact@oreon-project.org
$rqPath = "SELECT topology_url, topology_url_opt, topology_parent, topology_name, topology_page FROM topology WHERE topology_page = '".$p."' ORDER BY topology_page";
$DBRESULT =& $pearDB->query($rqPath);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$redirectPath =& $DBRESULT->fetchRow();
return $redirectPath;
}
@@ -44,7 +44,7 @@ For information : contact@oreon-project.org
$rqPath = "SELECT topology_parent FROM topology WHERE topology_page = '".$p."'";
$DBRESULT =& $pearDB->query($rqPath);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$redirectPath =& $DBRESULT->fetchRow();
return $redirectPath["topology_parent"];
}
@@ -73,7 +73,7 @@ For information : contact@oreon-project.org
$DBRESULT =& $pearDB->query("SELECT * FROM topology WHERE topology_page = '".$p."'");
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$DBRESULT->fetchInto($current);
$page = $p;
@@ -85,7 +85,7 @@ For information : contact@oreon-project.org
break;
$DBRESULT->fetchInto($new_url);
if (PEAR::isError($DBRESULT))
- print "DB Error : ".$DBRESULT->getDebugInfo()."<br>";
+ print "DB Error : ".$DBRESULT->getDebugInfo()."<br />";
$tabPath[$new_url["topology_page"]] = array();
$tabPath[$new_url["topology_page"]]["name"] = _($tab["topology_name"]);
$tabPath[$new_url["topology_page"]]["opt"] = $new_url["topology_url_opt"];