From f4ce2a5d8298bb4d43eb253c0bce41d43cf17c9e Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 8 Nov 2017 10:26:41 +0100 Subject: [PATCH] Fix code style issues --- .../application/clicommands/ListCommand.php | 3 ++- .../application/controllers/CommentController.php | 3 ++- .../monitoring/library/Monitoring/Controller.php | 13 +++++++++---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/modules/monitoring/application/clicommands/ListCommand.php b/modules/monitoring/application/clicommands/ListCommand.php index 491c12894..a82724aec 100644 --- a/modules/monitoring/application/clicommands/ListCommand.php +++ b/modules/monitoring/application/clicommands/ListCommand.php @@ -148,7 +148,8 @@ class ListCommand extends Command * icingacli monitoring list --problems * icingacli monitoring list --problems --service_state_type 0 * icingacli monitoring list --host=local* --service=*disk* - * icingacli monitoring list --columns 'host,service,service_output' --format='$host$: $service$ ($service_output$)' + * icingacli monitoring list --columns 'host,service,service_output' \ + --format='$host$: $service$ ($service_output$)' */ public function statusAction() { diff --git a/modules/monitoring/application/controllers/CommentController.php b/modules/monitoring/application/controllers/CommentController.php index 4d82a0080..e47105404 100644 --- a/modules/monitoring/application/controllers/CommentController.php +++ b/modules/monitoring/application/controllers/CommentController.php @@ -68,7 +68,8 @@ class CommentController extends Controller $this->view->comment = $this->comment; if ($this->hasPermission('monitoring/command/comment/delete')) { - $listUrl = Url::fromPath('monitoring/list/comments')->setQueryString('comment_type=comment|comment_type=ack'); + $listUrl = Url::fromPath('monitoring/list/comments') + ->setQueryString('comment_type=comment|comment_type=ack'); $form = new DeleteCommentCommandForm(); $form ->populate(array( diff --git a/modules/monitoring/library/Monitoring/Controller.php b/modules/monitoring/library/Monitoring/Controller.php index 470d652de..7c41f3e5a 100644 --- a/modules/monitoring/library/Monitoring/Controller.php +++ b/modules/monitoring/library/Monitoring/Controller.php @@ -45,8 +45,7 @@ class Controller extends IcingaWebController $query->limit(); // Resets any default limit and offset } - switch ($desiredFormat) - { + switch ($desiredFormat) { case 'sql': echo '
'
                     . htmlspecialchars(wordwrap($query->dump()))
@@ -57,7 +56,10 @@ class Controller extends IcingaWebController
                 $response
                     ->setHeader('Content-Type', 'application/json')
                     ->setHeader('Cache-Control', 'no-store')
-                    ->setHeader('Content-Disposition', 'inline; filename=' . $this->getRequest()->getActionName() . '.json')
+                    ->setHeader(
+                        'Content-Disposition',
+                        'inline; filename=' . $this->getRequest()->getActionName() . '.json'
+                    )
                     ->appendBody(Json::encode($query->getQuery()->fetchAll()))
                     ->sendResponse();
                 exit;
@@ -66,7 +68,10 @@ class Controller extends IcingaWebController
                 $response
                     ->setHeader('Content-Type', 'text/csv')
                     ->setHeader('Cache-Control', 'no-store')
-                    ->setHeader('Content-Disposition', 'attachment; filename=' . $this->getRequest()->getActionName() . '.csv')
+                    ->setHeader(
+                        'Content-Disposition',
+                        'attachment; filename=' . $this->getRequest()->getActionName() . '.csv'
+                    )
                     ->appendBody((string) Csv::fromQuery($query))
                     ->sendResponse();
                 exit;