diff --git a/www/api/class/centreon_administration_widget.class.php b/www/api/class/centreon_administration_widget.class.php index 2cc4d810aa8117a3cb924d7ff2e6291622cd2188..4f6ba0a7c4ce6572e2f1945084e91990081a424c 100644 --- a/www/api/class/centreon_administration_widget.class.php +++ b/www/api/class/centreon_administration_widget.class.php @@ -81,7 +81,7 @@ class CentreonAdministrationWidget extends CentreonWebService * @param string $action The action name * @param array $user The current user * @param boolean $isInternal If the api is call in internal - * @return boolean If the has access to the action + * @return boolean If the user has access to the action */ public function authorize($action, $user, $isInternal) { diff --git a/www/api/class/centreon_clapi.class.php b/www/api/class/centreon_clapi.class.php index 1e506c7238e37e390bf0fb305d22322cac32cae3..53075b85e7d94df8658a86fc112afe2e28afe778 100644 --- a/www/api/class/centreon_clapi.class.php +++ b/www/api/class/centreon_clapi.class.php @@ -196,7 +196,7 @@ class CentreonClapi extends CentreonWebService * @param string $action The action name * @param array $user The current user * @param boolean $isInternal If the api is call in internal - * @return boolean If the has access to the action + * @return boolean If the user has access to the action */ public function authorize($action, $user, $isInternal) { diff --git a/www/api/class/centreon_configuration_objects.class.php b/www/api/class/centreon_configuration_objects.class.php index 6146bf3569eb51c05826f3d8a2fb883fec9ccc06..6d3e4685fdbf563464cbe97ef1b6d99e30d1a252 100644 --- a/www/api/class/centreon_configuration_objects.class.php +++ b/www/api/class/centreon_configuration_objects.class.php @@ -277,7 +277,7 @@ class CentreonConfigurationObjects extends CentreonWebService * @param string $action The action name * @param array $user The current user * @param boolean $isInternal If the api is call in internal - * @return boolean If the has access to the action + * @return boolean If the user has access to the action */ public function authorize($action, $user, $isInternal) { diff --git a/www/api/class/centreon_home_customview.class.php b/www/api/class/centreon_home_customview.class.php index ff90db6ae048e398438926510b431b30c8ba2e46..3aa5d7b4611c6b8a57daaad0ae6bd12fda0fa540 100644 --- a/www/api/class/centreon_home_customview.class.php +++ b/www/api/class/centreon_home_customview.class.php @@ -170,7 +170,7 @@ class CentreonHomeCustomview extends CentreonWebService * @param string $action The action name * @param array $user The current user * @param boolean $isInternal If the api is call in internal - * @return boolean If the has access to the action + * @return boolean If the user has access to the action */ public function authorize($action, $user, $isInternal) { diff --git a/www/api/class/centreon_keepalive.class.php b/www/api/class/centreon_keepalive.class.php index e08d0c64be43584488e7ec71f75f4a5f9a2e48e9..bc1b9d15d808bd2e7f47b620de7a820e1dfbec99 100644 --- a/www/api/class/centreon_keepalive.class.php +++ b/www/api/class/centreon_keepalive.class.php @@ -66,7 +66,7 @@ class CentreonKeepalive extends CentreonWebService * @param string $action The action name * @param array $user The current user * @param boolean $isInternal If the api is call in internal - * @return boolean If the has access to the action + * @return boolean If the user has access to the action */ public function authorize($action, $user, $isInternal) { diff --git a/www/api/class/centreon_metric.class.php b/www/api/class/centreon_metric.class.php index 925355b0acb9ee190132e9a2ea67e1b964df90a7..5ca9701cd89ffb15bf4a645e9e2e1643ec348fb1 100644 --- a/www/api/class/centreon_metric.class.php +++ b/www/api/class/centreon_metric.class.php @@ -682,7 +682,7 @@ class CentreonMetric extends CentreonWebService * @param string $action The action name * @param array $user The current user * @param boolean $isInternal If the api is call in internal - * @return boolean If the has access to the action + * @return boolean If the user has access to the action */ public function authorize($action, $user, $isInternal) { diff --git a/www/api/class/centreon_proxy.class.php b/www/api/class/centreon_proxy.class.php index a047e8b4b3ff8f2116d1275e526bb25606a28ce0..13980cfbad9c6da31e383baf1deebb7ff6bfa67a 100644 --- a/www/api/class/centreon_proxy.class.php +++ b/www/api/class/centreon_proxy.class.php @@ -33,7 +33,7 @@ class CentreonProxy extends CentreonWebService * @param string $action The action name * @param array $user The current user * @param boolean $isInternal If the api is call in internal - * @return boolean If the has access to the action + * @return boolean If the user has access to the action */ public function authorize($action, $user, $isInternal) { diff --git a/www/api/class/centreon_realtime_base.class.php b/www/api/class/centreon_realtime_base.class.php index d0c863702276b16311c5f9cbfca0adf55a43265e..f2a589789fd4579df1151f445821080e164db01b 100644 --- a/www/api/class/centreon_realtime_base.class.php +++ b/www/api/class/centreon_realtime_base.class.php @@ -254,7 +254,7 @@ class CentreonRealtimeBase extends CentreonWebService * @param string $action The action name * @param array $user The current user * @param boolean $isInternal If the api is call in internal - * @return boolean If the has access to the action + * @return boolean If the user has access to the action */ public function authorize($action, $user, $isInternal) { diff --git a/www/api/class/centreon_results_acceptor.class.php b/www/api/class/centreon_results_acceptor.class.php index 52bef36428d3cbb3153c7c869705b03f872527bf..d80a32ba82fd84d4bc5b928511d651a960329ad0 100644 --- a/www/api/class/centreon_results_acceptor.class.php +++ b/www/api/class/centreon_results_acceptor.class.php @@ -243,7 +243,7 @@ class CentreonResultsAcceptor extends CentreonConfigurationObjects * @param string $action The action name * @param array $user The current user * @param boolean $isInternal If the api is call in internal - * @return boolean If the has access to the action + * @return boolean If the user has access to the action */ public function authorize($action, $user, $isInternal) { diff --git a/www/api/class/centreon_wiki.class.php b/www/api/class/centreon_wiki.class.php index 338e3973146ee68f0ed3f0f8b68e87abf49a0f21..675118177dab0e4d343ebf6fd4a6145826ee3c8a 100644 --- a/www/api/class/centreon_wiki.class.php +++ b/www/api/class/centreon_wiki.class.php @@ -85,7 +85,7 @@ class CentreonWiki extends CentreonWebService * @param string $action The action name * @param array $user The current user * @param boolean $isInternal If the api is call in internal - * @return boolean If the has access to the action + * @return boolean If the user has access to the action */ public function authorize($action, $user, $isInternal) { diff --git a/www/api/class/webService.class.php b/www/api/class/webService.class.php index 1488790a1bd4e8bc5d2588349ac53da8370f7b89..169385ce837abcfe0920772f6f01e9aea43750bc 100644 --- a/www/api/class/webService.class.php +++ b/www/api/class/webService.class.php @@ -127,7 +127,7 @@ class CentreonWebService * @param string $action The action name * @param array $user The current user * @param boolean $isInternal If the api is call in internal - * @return boolean If the has access to the action + * @return boolean If the user has access to the action */ public function authorize($action, $user, $isInternal = false) { diff --git a/www/include/configuration/configObject/contact/DB-Func.php b/www/include/configuration/configObject/contact/DB-Func.php index b30970d2975937d0bb03db252e06e11f59594689..29caaf98c9b95ae629ab3e3266abeb5e0f3bedc6 100644 --- a/www/include/configuration/configObject/contact/DB-Func.php +++ b/www/include/configuration/configObject/contact/DB-Func.php @@ -395,7 +395,8 @@ function insertContact($ret = array()) "`contact_id` , `timeperiod_tp_id` , `timeperiod_tp_id2` , `contact_name` , " . "`contact_alias` , `contact_autologin_key` , `contact_passwd` , `contact_lang` , `contact_template_id`, " . "`contact_host_notification_options` , `contact_service_notification_options` , " . - "`contact_email` , `contact_pager` , `contact_comment` , `contact_oreon`, `reach_api`, `reach_api_rt`, `contact_register`, `contact_enable_notifications` , " . + "`contact_email` , `contact_pager` , `contact_comment` , `contact_oreon`, `reach_api`, `reach_api_rt`, " . + "`contact_register`, `contact_enable_notifications` , " . "`contact_admin` , `contact_type_msg`, `contact_activate`, `contact_auth_type`, " . "`contact_ldap_dn`, `contact_location`, `contact_address1`, `contact_address2`, " . "`contact_address3`, `contact_address4`, `contact_address5`, `contact_address6`)" . @@ -439,7 +440,9 @@ function insertContact($ret = array()) isset($ret["contact_oreon"]["contact_oreon"]) && $ret["contact_oreon"]["contact_oreon"] != null ? $rq .= "'" . $ret["contact_oreon"]["contact_oreon"] . "', " : $rq .= " '1', "; } isset($ret["reach_api"]["reach_api"]) && $ret["reach_api"]["reach_api"] != null ? $rq .= $ret["reach_api"]["reach_api"] . ", " : $rq .= " 0, "; - isset($ret["reach_api_rt"]["reach_api_rt"]) && $ret["reach_api_rt"]["reach_api_rt"] != null ? $rq .= $ret["reach_api_rt"]["reach_api_rt"] . ", " : $rq .= " 0, "; + isset($ret["reach_api_rt"]["reach_api_rt"]) && $ret["reach_api_rt"]["reach_api_rt"] != null + ? $rq .= $ret["reach_api_rt"]["reach_api_rt"] . ", " + : $rq .= " 0, "; isset($ret["contact_register"]) && $ret["contact_register"] != null ? $rq .= "'" . $ret["contact_register"] . "', " : $rq .= " '1', "; isset($ret["contact_enable_notifications"]["contact_enable_notifications"]) && $ret["contact_enable_notifications"]["contact_enable_notifications"] != null ? $rq .= "'" . $ret["contact_enable_notifications"]["contact_enable_notifications"] . "', " : $rq .= "NULL, "; isset($ret["contact_admin"]["contact_admin"]) && $ret["contact_admin"]["contact_admin"] != null ? $rq .= "'" . $ret["contact_admin"]["contact_admin"] . "', " : $rq .= "'0', "; @@ -533,7 +536,9 @@ function updateContact($contact_id = null, $from_MC = false) $rq .= "reach_api = "; isset($ret["reach_api"]["reach_api"]) && $ret["reach_api"]["reach_api"] != null ? $rq .= "'" . $ret["reach_api"]["reach_api"] . "', " : $rq .= "NULL, "; $rq .= "reach_api_rt = "; - isset($ret["reach_api_rt"]["reach_api_rt"]) && $ret["reach_api_rt"]["reach_api_rt"] != null ? $rq .= "'" . $ret["reach_api_rt"]["reach_api_rt"] . "', " : $rq .= "NULL, "; + isset($ret["reach_api_rt"]["reach_api_rt"]) && $ret["reach_api_rt"]["reach_api_rt"] != null + ? $rq .= "'" . $ret["reach_api_rt"]["reach_api_rt"] . "', " + : $rq .= "NULL, "; $rq .= "contact_enable_notifications = "; isset($ret["contact_enable_notifications"]["contact_enable_notifications"]) && $ret["contact_enable_notifications"]["contact_enable_notifications"] != null ? $rq .= "'" . $ret["contact_enable_notifications"]["contact_enable_notifications"] . "', " : $rq .= "NULL, "; $rq .= "contact_admin = "; diff --git a/www/include/configuration/configObject/contact/formContact.ihtml b/www/include/configuration/configObject/contact/formContact.ihtml index 29f99daae61a43cbc825639b1de9807ded0bb686..6291be53ddcd6f73e81a536290a28d8a8b9cd04e 100644 --- a/www/include/configuration/configObject/contact/formContact.ihtml +++ b/www/include/configuration/configObject/contact/formContact.ihtml @@ -118,7 +118,13 @@ {if $displayAdminFlag == 1} <tr class="list_two"><td class="FormRowField"><img class="helpTooltip" name="admin"> {$form.contact_admin.label}</td><td class="FormRowValue">{$form.contact_admin.html}</td></tr> <tr class="list_one"><td class="FormRowField"><img class="helpTooltip" name="reach_api"> {$form.reach_api.label}</td><td class="FormRowValue">{$form.reach_api.html}</td></tr> - <tr class="list_two"><td class="FormRowField"><img class="helpTooltip" name="reach_api_rt"> {$form.reach_api_rt.label}</td><td class="FormRowValue">{$form.reach_api_rt.html}</td></tr> + <tr class="list_two"> + <td class="FormRowField"> + <img class="helpTooltip" name="reach_api_rt"> + {$form.reach_api_rt.label} + </td> + <td class="FormRowValue">{$form.reach_api_rt.html}</td> + </tr> {/if} <tr class="list_lvl_1"> <td class="ListColLvl1_name" colspan="2">