diff --git a/module/Application/view/layout/layout.phtml b/module/Application/view/layout/layout.phtml
index 0d2eb1b5..c0916b1b 100644
--- a/module/Application/view/layout/layout.phtml
+++ b/module/Application/view/layout/layout.phtml
@@ -84,7 +84,7 @@ echo $this->doctype();
-
+
@@ -126,7 +126,7 @@ echo $this->doctype();
diff --git a/module/Client/view/client/client/details.phtml b/module/Client/view/client/client/details.phtml
index 8858d82b..b1d802b7 100644
--- a/module/Client/view/client/client/details.phtml
+++ b/module/Client/view/client/client/details.phtml
@@ -28,7 +28,7 @@ $this->headTitle($title);
Fileretention | printRetention($client->fileretention) . " days"; ?> |
Jobretention | printRetention($client->jobretention) . " days"; ?> |
Last successful backup | printHumanReadableTimeperiod($job->endtime, "fuzzy")?> (Level: printJobLevel($job->level); ?>) |
-Online status | |
+
diff --git a/module/Client/view/client/client/index.phtml b/module/Client/view/client/client/index.phtml
index 5a2d97be..bccf0d61 100644
--- a/module/Client/view/client/client/index.phtml
+++ b/module/Client/view/client/client/index.phtml
@@ -24,7 +24,7 @@ $this->headTitle($title);
Autoprune |
Fileretention |
Jobretention |
- Online status |
+
paginator as $client) : ?>
@@ -37,7 +37,7 @@ $this->headTitle($title);
escapeHtml($client->autoprune); ?> |
printRetention($client->fileretention) . " days"; ?> |
printRetention($client->jobretention) . " days"; ?> |
- |
+
diff --git a/module/Dashboard/view/dashboard/dashboard/index.phtml b/module/Dashboard/view/dashboard/dashboard/index.phtml
index 5cb4ef56..4bb4ea35 100644
--- a/module/Dashboard/view/dashboard/dashboard/index.phtml
+++ b/module/Dashboard/view/dashboard/dashboard/index.phtml
@@ -345,8 +345,8 @@ $flash->setMessageOpenFormat('
escapeHtml($jobSuccess->jobid); ?> |
escapeHtml($jobSuccess->jobname); ?> |
escapeHtml($jobSuccess->clientname); ?> |
- printJobLevel($jobSuccess->level); ?> |
printJobType($jobSuccess->type); ?> |
+ printJobLevel($jobSuccess->level); ?> |
printDate($jobSuccess->starttime); ?> |
printDate($jobSuccess->endtime); ?> |
printJobDuration($jobSuccess->starttime, $jobSuccess->endtime); ?> |
diff --git a/module/Job/view/job/job/index.phtml b/module/Job/view/job/job/index.phtml
index 9ba7d0b3..48f7f24e 100644
--- a/module/Job/view/job/job/index.phtml
+++ b/module/Job/view/job/job/index.phtml
@@ -38,7 +38,7 @@ $this->headTitle($title);
translate('Waiting'); ?>
translate('Unsuccessful'); ?>
translate('Successful'); ?>
- translate('Timeline'); ?>
+
@@ -97,7 +97,7 @@ $this->headTitle($title);
jobstatus == "T") : ?>
"> Re-run job
- "> Restore job
+
jobstatus == "E" || $job->jobstatus == "e" || $job->jobstatus == "f" || $job->jobstatus == "A") : ?>
"> Re-run job
diff --git a/module/Job/view/job/job/running.phtml b/module/Job/view/job/job/running.phtml
index 5a60150a..95ce68f1 100644
--- a/module/Job/view/job/job/running.phtml
+++ b/module/Job/view/job/job/running.phtml
@@ -57,7 +57,7 @@ $flash->setMessageOpenFormat('
translate('Waiting'); ?>
translate('Unsuccessful'); ?>
translate('Successful'); ?>
- translate('Timeline'); ?>
+
diff --git a/module/Job/view/job/job/successful.phtml b/module/Job/view/job/job/successful.phtml
index 253f0d94..67c1eab8 100644
--- a/module/Job/view/job/job/successful.phtml
+++ b/module/Job/view/job/job/successful.phtml
@@ -57,7 +57,7 @@ $flash->setMessageOpenFormat('
translate('Waiting'); ?>
translate('Unsuccessful'); ?>
translate('Successful'); ?>
- translate('Timeline'); ?>
+
@@ -112,7 +112,7 @@ $flash->setMessageOpenFormat('
"> View messages
"> Re-run job
- "> Restore job
+
diff --git a/module/Job/view/job/job/unsuccessful.phtml b/module/Job/view/job/job/unsuccessful.phtml
index c545b035..ec4cfd63 100644
--- a/module/Job/view/job/job/unsuccessful.phtml
+++ b/module/Job/view/job/job/unsuccessful.phtml
@@ -57,7 +57,7 @@ $flash->setMessageOpenFormat('
translate('Waiting'); ?>
translate('Unsuccessful'); ?>
translate('Successful'); ?>
- translate('Timeline'); ?>
+
diff --git a/module/Job/view/job/job/waiting.phtml b/module/Job/view/job/job/waiting.phtml
index cde4bfa9..586bb0e7 100644
--- a/module/Job/view/job/job/waiting.phtml
+++ b/module/Job/view/job/job/waiting.phtml
@@ -57,7 +57,7 @@ $flash->setMessageOpenFormat('
translate('Waiting'); ?>
translate('Unsuccessful'); ?>
translate('Successful'); ?>
- translate('Timeline'); ?>
+
diff --git a/module/Storage/src/Storage/Model/Storage.php b/module/Storage/src/Storage/Model/Storage.php
index da157f17..646cbc2d 100644
--- a/module/Storage/src/Storage/Model/Storage.php
+++ b/module/Storage/src/Storage/Model/Storage.php
@@ -34,6 +34,8 @@ class Storage
public function exchangeArray($data)
{
+ $data = array_change_key_case($data, CASE_LOWER);
+
$this->storageid = (!empty($data['storageid'])) ? $data['storageid'] : null;
$this->name = (!empty($data['name'])) ? $data['name'] : null;
$this->autochanger = (!empty($data['autochanger'])) ? $data['autochanger'] : null;
diff --git a/module/Storage/src/Storage/Model/StorageTable.php b/module/Storage/src/Storage/Model/StorageTable.php
index d92c44b4..0c170438 100644
--- a/module/Storage/src/Storage/Model/StorageTable.php
+++ b/module/Storage/src/Storage/Model/StorageTable.php
@@ -26,17 +26,34 @@
namespace Storage\Model;
use Zend\Db\TableGateway\TableGateway;
+use Zend\ServiceManager\ServiceLocatorAwareInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+use Bareos\Db\Sql\BareosSqlCompatHelper;
-class StorageTable
+class StorageTable implements ServiceLocatorAwareInterface
{
protected $tableGateway;
+ protected $serviceLocator;
public function __construct(TableGateway $tableGateway)
{
$this->tableGateway = $tableGateway;
}
+ public function setServiceLocator(ServiceLocatorInterface $serviceLocator) {
+ $this->serviceLocator = $serviceLocator;
+ }
+
+ public function getServiceLocator() {
+ return $this->serviceLocator;
+ }
+
+ public function getDbDriverConfig() {
+ $config = $this->getServiceLocator()->get('Config');
+ return $config['db']['driver'];
+ }
+
public function fetchAll()
{
$resultSet = $this->tableGateway->select();
@@ -46,7 +63,9 @@ public function fetchAll()
public function getStorage($id)
{
$id = (int) $id;
- $rowset = $this->tableGateway->select(array('storageid' => $id));
+
+ $bsqlch = new BareosSqlCompatHelper($this->getDbDriverConfig());
+ $rowset = $this->tableGateway->select(array($bsqlch->strdbcompat("StorageId") => $id));
$row = $rowset->current();
if(!$row) {
throw new \Exception("Could not find row $id");
diff --git a/vendor/Bareos/library/Bareos/BConsole/BConsoleConnector.php b/vendor/Bareos/library/Bareos/BConsole/BConsoleConnector.php
index f9c2174f..9c7dce60 100644
--- a/vendor/Bareos/library/Bareos/BConsole/BConsoleConnector.php
+++ b/vendor/Bareos/library/Bareos/BConsole/BConsoleConnector.php
@@ -47,7 +47,7 @@ public function getBConsoleOutput($cmd)
$env = array('/usr/sbin');
if($this->bconsole_sudo == "true") {
- $process = proc_open('sudo ' . $this->bconsole_exec_path, $descriptorspec, $pipes, $cwd, $env);
+ $process = proc_open('sudo ' . $this->bconsole_exec_path . ' -c ' . $this->bconsole_config_path, $descriptorspec, $pipes, $cwd, $env);
}
else {
$process = proc_open($this->bconsole_exec_path, $descriptorspec, $pipes, $cwd, $env);
@@ -58,7 +58,7 @@ public function getBConsoleOutput($cmd)
if(is_resource($process))
{
- fwrite($pipes[0], $cmd . ' -c ' . $this->bconsole_config_path);
+ fwrite($pipes[0], $cmd);
fclose($pipes[0]);
while(!feof($pipes[1])) {
array_push($this->bconsole_output, fread($pipes[1],8192));