This repository has been archived by the owner on Dec 13, 2022. It is now read-only.
Rest api rt temporary acl fix #6188
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
An user can have a role to access to configuration API or realtime API.
* Add the parameter reach_api_rt on contact and contact template
Use the database flag instead the is_admin
kduret
suggested changes
Apr 9, 2018
kduret
approved these changes
Apr 9, 2018
sc979
suggested changes
Apr 9, 2018
| * @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 |
There was a problem hiding this comment.
Annotation : "boolean If the ? has..."
| * @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 |
There was a problem hiding this comment.
Annotation : "boolean If the ? has..."
| * @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 |
There was a problem hiding this comment.
Annotation : "boolean If the ? has..."
| * @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 |
There was a problem hiding this comment.
Annotation : "boolean If the ? has..."
| * @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 |
There was a problem hiding this comment.
Annotation : "boolean If the ? has..."
| @@ -531,6 +532,8 @@ function updateContact($contact_id = null, $from_MC = false) | |||
| isset($ret["contact_oreon"]["contact_oreon"]) && $ret["contact_oreon"]["contact_oreon"] != null ? $rq .= "'" . $ret["contact_oreon"]["contact_oreon"] . "', " : $rq .= "NULL, "; | |||
| $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, "; | |||
There was a problem hiding this comment.
Coding Style : lenght >120chars
| @@ -439,6 +439,7 @@ 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, "; | |||
There was a problem hiding this comment.
Coding Style : lenght >120chars
| @@ -395,7 +395,7 @@ 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`, `contact_register`, `contact_enable_notifications` , " . | |||
| "`contact_email` , `contact_pager` , `contact_comment` , `contact_oreon`, `reach_api`, `reach_api_rt`, `contact_register`, `contact_enable_notifications` , " . | |||
There was a problem hiding this comment.
Coding Style : lenght >120chars
| @@ -118,14 +118,15 @@ | |||
| {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> | |||
There was a problem hiding this comment.
Coding Style : lenght > 120chars
| {/if} | ||
| <tr class="list_lvl_1"> | ||
| <td class="ListColLvl1_name" colspan="2"> | ||
| <h4>{$form.header.acl}</h4> | ||
| </td> | ||
| </tr> | ||
| {if $o == "mc"} | ||
| <tr class="list_two"><td class="FormRowField"><img class="helpTooltip" name="mc_update"> {$form.mc_mod_acl.label}</td><td class="FormRowValue">{$form.mc_mod_acl.html}</td></tr> | ||
| <tr class="list_one"><td class="FormRowField"><img class="helpTooltip" name="mc_update"> {$form.mc_mod_acl.label}</td><td class="FormRowValue">{$form.mc_mod_acl.html}</td></tr> |
There was a problem hiding this comment.
Coding Style : lenght > 120chars
* Fix bad comment * Split line to be less of 120 characters
sc979
approved these changes
Apr 9, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Separate Rest Api configuration and Rest Api realtime access.
Add the choise to access on each API on the user configuration page.