baculum: Assign Baculum copyright to Kern Sibbald

[bacula/bacula] / gui / baculum / protected / Pages / API / Job.php

diff --git a/gui/baculum/protected/Pages/API/Job.php b/gui/baculum/protected/Pages/API/Job.php
index e758454ee2e5807f553dd1625e3590e5a98ae139..96af02eb85a397257d75c6b2c774bb2d71931bf6 100644 (file)
--- a/gui/baculum/protected/Pages/API/Job.php
+++ b/gui/baculum/protected/Pages/API/Job.php
@@ -1,33 +1,41 @@
 <?php
-/**
- * Bacula® - The Network Backup Solution
- * Baculum - Bacula web interface
+/*
+ * Bacula(R) - The Network Backup Solution
+ * Baculum   - Bacula web interface
  *
- * Copyright (C) 2013-2015 Marcin Haba
+ * Copyright (C) 2013-2016 Kern Sibbald
  *
  * The main author of Baculum is Marcin Haba.
- * The main author of Bacula is Kern Sibbald, with contributions from many
- * others, a complete list can be found in the file AUTHORS.
+ * The original author of Bacula is Kern Sibbald, with contributions
+ * from many others, a complete list can be found in the file AUTHORS.
  *
  * You may use this file and others of this release according to the
  * license defined in the LICENSE file, which includes the Affero General
  * Public License, v3.0 ("AGPLv3") and some additional permissions and
  * terms pursuant to its AGPLv3 Section 7.
  *
- * Bacula® is a registered trademark of Kern Sibbald.
+ * This notice must be preserved when any source code is
+ * conveyed and/or propagated.
+ *
+ * Bacula(R) is a registered trademark of Kern Sibbald.
  */
  
 class Job extends BaculumAPI {
        public function get() {
                $jobid = intval($this->Request['id']);
                $job = $this->getModule('job')->getJobById($jobid);
-               $allowedJobs = $this->getModule('bconsole')->bconsoleCommand($this->director, array('.jobs'), $this->user)->output;
-               if(!is_null($job) && in_array($job->name, $allowedJobs)) {
-                       $this->output = $job;
-                       $this->error = JobError::ERROR_NO_ERRORS;
+               $allowedJobs = $this->getModule('bconsole')->bconsoleCommand($this->director, array('.jobs'), $this->user);
+               if ($allowedJobs->exitcode === 0) {
+                       if(!is_null($job) && in_array($job->name, $allowedJobs->output)) {
+                               $this->output = $job;
+                               $this->error = JobError::ERROR_NO_ERRORS;
+                       } else {
+                               $this->output = JobError::MSG_ERROR_JOB_DOES_NOT_EXISTS;
+                               $this->error = JobError::ERROR_JOB_DOES_NOT_EXISTS;
+                       }
                } else {
-                       $this->output = JobError::MSG_ERROR_JOB_DOES_NOT_EXISTS;
-                       $this->error = JobError::ERROR_JOB_DOES_NOT_EXISTS;
+                       $this->output = $allowedJobs->output;
+                       $this->error = $allowedJobs->exitcode;
                }
        }
 
@@ -45,4 +53,4 @@ class Job extends BaculumAPI {
        }
 }
 
-?>
\ No newline at end of file
+?>