From 53f344b38b86af4fe535a1b86d81b2fb8f83f799 Mon Sep 17 00:00:00 2001
From: Frank Bergkemper <frank.bergkemper@bareos.com>
Date: Tue, 5 Apr 2022 17:04:00 +0100
Subject: [PATCH] webui: update job controller

---
 .../Job/src/Job/Controller/JobController.php  | 70 ++++++++++++++++++-
 1 file changed, 67 insertions(+), 3 deletions(-)

diff --git a/webui/module/Job/src/Job/Controller/JobController.php b/webui/module/Job/src/Job/Controller/JobController.php
index 80b68c39e51..694d6d8f6e8 100644
--- a/webui/module/Job/src/Job/Controller/JobController.php
+++ b/webui/module/Job/src/Job/Controller/JobController.php
@@ -536,6 +536,43 @@ public function runAction()
     }
   }
 
+  public function rerunAction()
+  {
+    $this->RequestURIPlugin()->setRequestURI();
+
+    if(!$this->SessionTimeoutPlugin()->isValid()) {
+      return $this->redirect()->toRoute(
+        'auth',
+        array(
+          'action' => 'login'
+        ),
+        array(
+          'query' => array(
+            'req' => $this->RequestURIPlugin()->getRequestURI(),
+            'dird' => $_SESSION['bareos']['director']
+          )
+        )
+      );
+    }
+
+    $module_config = $this->getServiceLocator()->get('ModuleManager')->getModule('Application')->getConfig();
+    $invalid_commands = $this->CommandACLPlugin()->getInvalidCommands(
+      $module_config['console_commands']['Job']['optional']
+    );
+    if(count($invalid_commands) > 0 && in_array('rerun', $invalid_commands)) {
+      $this->acl_alert = true;
+      return new ViewModel(
+        array(
+          'acl_alert' => $this->acl_alert,
+          'invalid_commands' => 'rerun'
+        )
+      );
+    }
+
+    return new ViewModel();
+
+  }
+
   public function timelineAction()
   {
     $this->RequestURIPlugin()->setRequestURI();
@@ -569,8 +606,6 @@ public function timelineAction()
       );
     }
 
-    $this->bsock = $this->getServiceLocator()->get('director');
-
     return new ViewModel();
   }
 
@@ -679,7 +714,36 @@ public function getDataAction()
         echo $e->getMessage();
       }
     }
-    elseif($data="job-timeline") {
+    elseif($data == "jobs-to-rerun") {
+      try {
+        $result = $this->getJobModel()->getJobsToRerun($this->bsock, $period, null);
+      }
+      catch(Exception $e) {
+        echo $e->getMessages();
+      }
+    }
+    elseif($data == "job-rerun") {
+      try {
+        $result = [];
+        $j = explode(",", $jobs);
+        foreach($j as $job) {
+          array_push($result, $this->getJobModel()->rerunJob($this->bsock, $job));
+        }
+      }
+      catch(Exception $e) {
+        echo $e->getMessage();
+      }
+
+      $response = $this->getResponse();
+      $response->getHeaders()->addHeaderLine('Content-Type', 'application/json');
+
+      if(isset($result)) {
+        $response->setContent(JSON::encode($result));
+      }
+
+      return $response;
+    }
+    elseif($data == "job-timeline") {
       try {
         $result = [];
         $j = explode(",", $jobs);