From 3b2436f0a5f47fe5b1c18b8636e09aab9ae18fea Mon Sep 17 00:00:00 2001 From: Maximilien Bersoult <mbersoult@centreon.com> Date: Mon, 9 Apr 2018 12:20:29 +0200 Subject: [PATCH] fix(api): Fix coding style * Fix bad comment * Split line to be less of 120 characters --- www/api/class/centreon_administration_widget.class.php | 2 +- www/api/class/centreon_clapi.class.php | 2 +- www/api/class/centreon_configuration_objects.class.php | 2 +- www/api/class/centreon_home_customview.class.php | 2 +- www/api/class/centreon_keepalive.class.php | 2 +- www/api/class/centreon_metric.class.php | 2 +- www/api/class/centreon_proxy.class.php | 2 +- www/api/class/centreon_realtime_base.class.php | 2 +- www/api/class/centreon_results_acceptor.class.php | 2 +- www/api/class/centreon_wiki.class.php | 2 +- www/api/class/webService.class.php | 2 +- .../configuration/configObject/contact/formContact.ihtml | 8 +++++++- 12 files changed, 18 insertions(+), 12 deletions(-) diff --git a/www/api/class/centreon_administration_widget.class.php b/www/api/class/centreon_administration_widget.class.php index 4e51e81a0d..9d8d21c7ff 100644 --- a/www/api/class/centreon_administration_widget.class.php +++ b/www/api/class/centreon_administration_widget.class.php @@ -162,7 +162,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 56fdfe0f82..8ff296eceb 100644 --- a/www/api/class/centreon_clapi.class.php +++ b/www/api/class/centreon_clapi.class.php @@ -205,7 +205,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 7e28f99aee..58d271849b 100644 --- a/www/api/class/centreon_configuration_objects.class.php +++ b/www/api/class/centreon_configuration_objects.class.php @@ -272,7 +272,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 1bec3bb16e..2d980d563b 100644 --- a/www/api/class/centreon_home_customview.class.php +++ b/www/api/class/centreon_home_customview.class.php @@ -328,7 +328,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 51b377c7fa..fa4a0a7b5e 100644 --- a/www/api/class/centreon_keepalive.class.php +++ b/www/api/class/centreon_keepalive.class.php @@ -64,7 +64,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 ca0b642d36..ad158e4869 100644 --- a/www/api/class/centreon_metric.class.php +++ b/www/api/class/centreon_metric.class.php @@ -680,7 +680,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 a047e8b4b3..13980cfbad 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 ad3f21ad55..633b69f06f 100644 --- a/www/api/class/centreon_realtime_base.class.php +++ b/www/api/class/centreon_realtime_base.class.php @@ -255,7 +255,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 0d4a099f30..e01536b5a9 100644 --- a/www/api/class/centreon_results_acceptor.class.php +++ b/www/api/class/centreon_results_acceptor.class.php @@ -242,7 +242,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 79a04deb57..2b9b08a0e6 100644 --- a/www/api/class/centreon_wiki.class.php +++ b/www/api/class/centreon_wiki.class.php @@ -87,7 +87,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 aa10f8c34c..a7c58a0314 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/formContact.ihtml b/www/include/configuration/configObject/contact/formContact.ihtml index 29f99daae6..6291be53dd 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"> -- GitLab