diff options
author | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2020-11-21 20:53:41 +0300 |
---|---|---|
committer | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2020-11-21 20:53:41 +0300 |
commit | d46f5bce969216e72958b255f1651e83cc5bb4d7 (patch) | |
tree | 4e368b5aa0e8b98ed7a67687abd6c1e4a998f2af /ui/app/controllers | |
parent | 3b08895375f572efdb3b6b76566560b0f43c01d7 (diff) |
A.F....... [ZBXNEXT-686] removed trailing commas after the last element of the arrays
Diffstat (limited to 'ui/app/controllers')
24 files changed, 24 insertions, 24 deletions
diff --git a/ui/app/controllers/CControllerDashboardWidgetCheck.php b/ui/app/controllers/CControllerDashboardWidgetCheck.php index 7bb881e3b80..41a02c77a64 100644 --- a/ui/app/controllers/CControllerDashboardWidgetCheck.php +++ b/ui/app/controllers/CControllerDashboardWidgetCheck.php @@ -28,7 +28,7 @@ class CControllerDashboardWidgetCheck extends CController { 'templateid' => 'db dashboard.templateid', 'type' => 'required|string', 'name' => 'required|string', - 'fields' => 'json', + 'fields' => 'json' ]; $ret = $this->validateInput($fields); diff --git a/ui/app/controllers/CControllerDiscoveryView.php b/ui/app/controllers/CControllerDiscoveryView.php index 403392382ad..ef7556c6d97 100644 --- a/ui/app/controllers/CControllerDiscoveryView.php +++ b/ui/app/controllers/CControllerDiscoveryView.php @@ -80,7 +80,7 @@ class CControllerDiscoveryView extends CController { 'druleids' => $filter_druleids, 'filter' => ['status' => DRULE_STATUS_ACTIVE] ]), ['druleid' => 'id']) - : [], + : [] ], 'profileIdx' => 'web.discovery.filter', 'active_tab' => CProfile::get('web.discovery.filter.active', 1) diff --git a/ui/app/controllers/CControllerHost.php b/ui/app/controllers/CControllerHost.php index 8bcedcd39b5..a3b1658a578 100644 --- a/ui/app/controllers/CControllerHost.php +++ b/ui/app/controllers/CControllerHost.php @@ -137,7 +137,7 @@ abstract class CControllerHost extends CController { 'port' => ($filter['port'] === '') ? null : $filter['port'], 'maintenance_status' => ($filter['maintenance_status'] == HOST_MAINTENANCE_STATUS_ON) ? null - : HOST_MAINTENANCE_STATUS_OFF, + : HOST_MAINTENANCE_STATUS_OFF ], 'sortfield' => 'name', 'limit' => $limit, diff --git a/ui/app/controllers/CControllerHostView.php b/ui/app/controllers/CControllerHostView.php index 71c840c5a44..1c5cf2e8b3c 100644 --- a/ui/app/controllers/CControllerHostView.php +++ b/ui/app/controllers/CControllerHostView.php @@ -115,7 +115,7 @@ class CControllerHostView extends CControllerHost { 'support_custom_time' => 0, 'expanded' => $profile->expanded, 'page' => $filter['page'] - ], + ] ] + $this->getData($filter); $response = new CControllerResponseData($data); diff --git a/ui/app/controllers/CControllerHousekeepingUpdate.php b/ui/app/controllers/CControllerHousekeepingUpdate.php index 93d6c60d273..874b67d81a7 100644 --- a/ui/app/controllers/CControllerHousekeepingUpdate.php +++ b/ui/app/controllers/CControllerHousekeepingUpdate.php @@ -62,7 +62,7 @@ class CControllerHousekeepingUpdate extends CController { 'hk_history_global' => '0', 'hk_trends_mode' => '0', 'hk_trends_global' => '0', - 'compression_status' => '0', + 'compression_status' => '0' ]); CMessageHelper::setErrorTitle(_('Cannot update configuration')); $this->setResponse($response); diff --git a/ui/app/controllers/CControllerMediatypeList.php b/ui/app/controllers/CControllerMediatypeList.php index 2bdf3da097f..98d09ccb317 100644 --- a/ui/app/controllers/CControllerMediatypeList.php +++ b/ui/app/controllers/CControllerMediatypeList.php @@ -33,7 +33,7 @@ class CControllerMediatypeList extends CController { 'filter_set' => 'in 1', 'filter_rst' => 'in 1', 'filter_name' => 'string', - 'filter_status' => 'in -1,'.MEDIA_TYPE_STATUS_ACTIVE.','.MEDIA_TYPE_STATUS_DISABLED, + 'filter_status' => 'in -1,'.MEDIA_TYPE_STATUS_ACTIVE.','.MEDIA_TYPE_STATUS_DISABLED ]; $ret = $this->validateInput($fields); diff --git a/ui/app/controllers/CControllerMenuPopup.php b/ui/app/controllers/CControllerMenuPopup.php index 4e459ce9992..a98c5f30da6 100644 --- a/ui/app/controllers/CControllerMenuPopup.php +++ b/ui/app/controllers/CControllerMenuPopup.php @@ -434,7 +434,7 @@ class CControllerMenuPopup extends CController { case SYSMAP_ELEMENT_TYPE_IMAGE: $menu_data = [ - 'type' => 'map_element_image', + 'type' => 'map_element_image' ]; if ($selement['urls']) { $menu_data['urls'] = $selement['urls']; diff --git a/ui/app/controllers/CControllerModuleEdit.php b/ui/app/controllers/CControllerModuleEdit.php index d5918bfb550..bf2d722f543 100644 --- a/ui/app/controllers/CControllerModuleEdit.php +++ b/ui/app/controllers/CControllerModuleEdit.php @@ -91,7 +91,7 @@ class CControllerModuleEdit extends CController { ? $this->hasInput('status') ? MODULE_STATUS_ENABLED : MODULE_STATUS_DISABLED - : $this->module['status'], + : $this->module['status'] ]; $response = new CControllerResponseData($data); diff --git a/ui/app/controllers/CControllerModuleList.php b/ui/app/controllers/CControllerModuleList.php index 12f67a62468..73d32319289 100644 --- a/ui/app/controllers/CControllerModuleList.php +++ b/ui/app/controllers/CControllerModuleList.php @@ -115,7 +115,7 @@ class CControllerModuleList extends CController { 'modules' => $modules, 'paging' => $paging, 'filter_profile' => 'web.modules.filter', - 'filter_active_tab' => CProfile::get('web.modules.filter.active', 1), + 'filter_active_tab' => CProfile::get('web.modules.filter.active', 1) ]; $response = new CControllerResponseData($data); diff --git a/ui/app/controllers/CControllerNotificationsGet.php b/ui/app/controllers/CControllerNotificationsGet.php index 3912dc0a192..cf8f13c7c09 100644 --- a/ui/app/controllers/CControllerNotificationsGet.php +++ b/ui/app/controllers/CControllerNotificationsGet.php @@ -218,7 +218,7 @@ class CControllerNotificationsGet extends CController { '[url='.$url_events.']'.CHtml::encode($notification['name']).'[/url]', '[url='.$url_trigger_events.']'. zbx_date2str(DATE_TIME_FORMAT_SECONDS, $notification['clock']). - '[/url]', + '[/url]' ] ]; } diff --git a/ui/app/controllers/CControllerPopupGeneric.php b/ui/app/controllers/CControllerPopupGeneric.php index ef6889debe1..d54114cbaaa 100644 --- a/ui/app/controllers/CControllerPopupGeneric.php +++ b/ui/app/controllers/CControllerPopupGeneric.php @@ -404,7 +404,7 @@ class CControllerPopupGeneric extends CController { 'table_columns' => [ _('Name') ] - ], + ] ]; } diff --git a/ui/app/controllers/CControllerPopupMaintenancePeriod.php b/ui/app/controllers/CControllerPopupMaintenancePeriod.php index bd0a954cc32..548a7fd5c1c 100644 --- a/ui/app/controllers/CControllerPopupMaintenancePeriod.php +++ b/ui/app/controllers/CControllerPopupMaintenancePeriod.php @@ -101,7 +101,7 @@ class CControllerPopupMaintenancePeriod extends CController { case TIMEPERIOD_TYPE_WEEKLY: $rules = [ 'every' => 'required|ge 1', - 'days' => 'required|not_empty', + 'days' => 'required|not_empty' ]; break; diff --git a/ui/app/controllers/CControllerPopupMediatypeTestEdit.php b/ui/app/controllers/CControllerPopupMediatypeTestEdit.php index 9ab726edf2e..c844191b3db 100644 --- a/ui/app/controllers/CControllerPopupMediatypeTestEdit.php +++ b/ui/app/controllers/CControllerPopupMediatypeTestEdit.php @@ -49,7 +49,7 @@ class CControllerPopupMediatypeTestEdit extends CController { protected function doAction() { $mediatype = API::MediaType()->get([ 'output' => ['type', 'name', 'status', 'parameters'], - 'mediatypeids' => $this->getInput('mediatypeid'), + 'mediatypeids' => $this->getInput('mediatypeid') ]); if (!$mediatype) { diff --git a/ui/app/controllers/CControllerPopupMediatypeTestSend.php b/ui/app/controllers/CControllerPopupMediatypeTestSend.php index e5882c6ebf0..ff21f64af8c 100644 --- a/ui/app/controllers/CControllerPopupMediatypeTestSend.php +++ b/ui/app/controllers/CControllerPopupMediatypeTestSend.php @@ -66,7 +66,7 @@ class CControllerPopupMediatypeTestSend extends CController { protected function validateMediaType() { $mediatypes = API::MediaType()->get([ 'output' => ['type', 'status'], - 'mediatypeids' => $this->getInput('mediatypeid'), + 'mediatypeids' => $this->getInput('mediatypeid') ]); if (!$mediatypes) { diff --git a/ui/app/controllers/CControllerPopupServices.php b/ui/app/controllers/CControllerPopupServices.php index 6fb4c8ec0c0..73f5a875e75 100644 --- a/ui/app/controllers/CControllerPopupServices.php +++ b/ui/app/controllers/CControllerPopupServices.php @@ -123,7 +123,7 @@ class CControllerPopupServices extends CController { 'output' => ['serviceid', 'name', 'algorithm'], 'selectTrigger' => ['description'], 'preservekeys' => true, - 'sortfield' => ['name'], + 'sortfield' => ['name'] ]); if ($service) { diff --git a/ui/app/controllers/CControllerPopupTabFilterEdit.php b/ui/app/controllers/CControllerPopupTabFilterEdit.php index f78c488f77e..5607b88f314 100644 --- a/ui/app/controllers/CControllerPopupTabFilterEdit.php +++ b/ui/app/controllers/CControllerPopupTabFilterEdit.php @@ -65,7 +65,7 @@ class CControllerPopupTabFilterEdit extends CController { $rules = [ 'tabfilter_from' => 'range_time|required', - 'tabfilter_to' => 'range_time|required', + 'tabfilter_to' => 'range_time|required' ]; $validator = new CNewValidator($this->getInputAll(), $rules); diff --git a/ui/app/controllers/CControllerPopupTabFilterUpdate.php b/ui/app/controllers/CControllerPopupTabFilterUpdate.php index d6d863c7c72..8f469a5b630 100644 --- a/ui/app/controllers/CControllerPopupTabFilterUpdate.php +++ b/ui/app/controllers/CControllerPopupTabFilterUpdate.php @@ -63,7 +63,7 @@ class CControllerPopupTabFilterUpdate extends CController { $rules = [ 'tabfilter_from' => 'range_time|required', - 'tabfilter_to' => 'range_time|required', + 'tabfilter_to' => 'range_time|required' ]; $validator = new CNewValidator($this->getInputAll(), $rules); diff --git a/ui/app/controllers/CControllerPopupTriggerExpr.php b/ui/app/controllers/CControllerPopupTriggerExpr.php index d0a89985e53..c808a8586c9 100644 --- a/ui/app/controllers/CControllerPopupTriggerExpr.php +++ b/ui/app/controllers/CControllerPopupTriggerExpr.php @@ -668,7 +668,7 @@ class CControllerPopupTriggerExpr extends CController { 'itemValueType' => $item_value_type, 'selectedFunction' => null, 'groupid' => $this->getInput('groupid', 0), - 'hostid' => $this->getInput('hostid', 0), + 'hostid' => $this->getInput('hostid', 0) ]; // Check if submitted function is usable with selected item. diff --git a/ui/app/controllers/CControllerTimeSelectorUpdate.php b/ui/app/controllers/CControllerTimeSelectorUpdate.php index ef0ed19c835..32830fdfa11 100644 --- a/ui/app/controllers/CControllerTimeSelectorUpdate.php +++ b/ui/app/controllers/CControllerTimeSelectorUpdate.php @@ -201,7 +201,7 @@ class CControllerTimeSelectorUpdate extends CController { 'from_date' => $date->setTimestamp($ts['from'])->format(ZBX_FULL_DATE_TIME), 'to' => $value['to'], 'to_ts' => $ts['to'], - 'to_date' => $date->setTimestamp($ts['to'])->format(ZBX_FULL_DATE_TIME), + 'to_date' => $date->setTimestamp($ts['to'])->format(ZBX_FULL_DATE_TIME) ] + getTimeselectorActions($value['from'], $value['to']))])); } diff --git a/ui/app/controllers/CControllerUsergroupTagfilterAdd.php b/ui/app/controllers/CControllerUsergroupTagfilterAdd.php index ac27f68b399..b338d5138ea 100644 --- a/ui/app/controllers/CControllerUsergroupTagfilterAdd.php +++ b/ui/app/controllers/CControllerUsergroupTagfilterAdd.php @@ -81,7 +81,7 @@ class CControllerUsergroupTagfilterAdd extends CController { $tag_filters[] = [ 'groupid' => $groupid, 'tag' => $new_tag_filter['tag'], - 'value' => $new_tag_filter['value'], + 'value' => $new_tag_filter['value'] ]; } diff --git a/ui/app/controllers/CControllerUserroleEditGeneral.php b/ui/app/controllers/CControllerUserroleEditGeneral.php index 4eb4dcd46f3..fd34bff5aa7 100644 --- a/ui/app/controllers/CControllerUserroleEditGeneral.php +++ b/ui/app/controllers/CControllerUserroleEditGeneral.php @@ -28,7 +28,7 @@ abstract class CControllerUserroleEditGeneral extends CController { $rules = [ CRoleHelper::UI_DEFAULT_ACCESS => $this->getInput('ui_default_access'), CRoleHelper::ACTIONS_DEFAULT_ACCESS => $this->getInput('actions_default_access'), - CRoleHelper::MODULES_DEFAULT_ACCESS => $this->getInput('modules_default_access'), + CRoleHelper::MODULES_DEFAULT_ACCESS => $this->getInput('modules_default_access') ]; $rules += $this->getUiSectionRules($user_type); diff --git a/ui/app/controllers/CControllerWidgetDataOverView.php b/ui/app/controllers/CControllerWidgetDataOverView.php index bcf3708c6aa..7407fa87175 100644 --- a/ui/app/controllers/CControllerWidgetDataOverView.php +++ b/ui/app/controllers/CControllerWidgetDataOverView.php @@ -27,7 +27,7 @@ class CControllerWidgetDataOverView extends CControllerWidget { $this->setType(WIDGET_DATA_OVER); $this->setValidationRules([ 'name' => 'string', - 'fields' => 'json', + 'fields' => 'json' ]); } diff --git a/ui/app/controllers/CControllerWidgetGraphView.php b/ui/app/controllers/CControllerWidgetGraphView.php index 126ba3c7762..291b0a9874a 100644 --- a/ui/app/controllers/CControllerWidgetGraphView.php +++ b/ui/app/controllers/CControllerWidgetGraphView.php @@ -416,7 +416,7 @@ class CControllerWidgetGraphView extends CControllerWidget { 'item_graph_url' => $unavailable_object ? null : $item_graph_url, 'widget' => [ 'uniqueid' => $uniqueid, - 'initial_load' => (int) $this->getInput('initial_load', 0), + 'initial_load' => (int) $this->getInput('initial_load', 0) ], 'time_control_data' => $time_control_data, 'timeline' => $timeline, diff --git a/ui/app/controllers/CControllerWidgetHostAvailView.php b/ui/app/controllers/CControllerWidgetHostAvailView.php index 1d9987799b6..5a5203e5a09 100644 --- a/ui/app/controllers/CControllerWidgetHostAvailView.php +++ b/ui/app/controllers/CControllerWidgetHostAvailView.php @@ -27,7 +27,7 @@ class CControllerWidgetHostAvailView extends CControllerWidget { $this->setType(WIDGET_HOST_AVAIL); $this->setValidationRules([ 'name' => 'string', - 'fields' => 'json', + 'fields' => 'json' ]); } |