Skip to content

Commit

Permalink
Merge pull request #251 from fbergkemper/dev/fbergkemper/master/story…
Browse files Browse the repository at this point in the history
…-3173

dev/fbergkemper/master/story-3173-including-general-fixes
  • Loading branch information
fbergkemper committed Aug 27, 2019
2 parents e155f52 + 82728e4 commit 07c71f8
Show file tree
Hide file tree
Showing 102 changed files with 968 additions and 1,046 deletions.
2 changes: 1 addition & 1 deletion webui/composer.json
@@ -1,5 +1,5 @@
{
"name": "bareos-webui",
"name": "bareos/bareos-webui",
"description": "A Web-Frontend to manage Bareos",
"license": "AGPL3",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion webui/config/application.config.php
Expand Up @@ -4,7 +4,7 @@
*
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos-webui for the canonical source repository
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2016 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
*
Expand Down
2 changes: 1 addition & 1 deletion webui/config/autoload/global.php.in
Expand Up @@ -4,7 +4,7 @@
*
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos-webui for the canonical source repository
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2017 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
*
Expand Down
4 changes: 2 additions & 2 deletions webui/debian/control
Expand Up @@ -5,9 +5,9 @@ Maintainer: Bareos Packager <packager@bareos.com>
Build-Depends: debhelper (>= 7.0.50~),
apache2-dev | apache2-prefork-dev, apache2
Standards-Version: 3.9.1
Homepage: https://github.com/bareos/bareos-webui
Homepage: https://github.com/bareos/bareos
Vcs-Git: git://github.com/bareos/bareos-webui.git
Vcs-Browser: https://github.com/bareos/bareos-webui.git
Vcs-Browser: https://github.com/bareos/bareos.git

Package: bareos-webui
Architecture: all
Expand Down
2 changes: 1 addition & 1 deletion webui/debian/copyright
Expand Up @@ -6,7 +6,7 @@ This work was packaged for Debian by:

It was downloaded from:

https://github.com/bareos/bareos-webui
https://github.com/bareos/bareos

Upstream Author(s):

Expand Down
2 changes: 1 addition & 1 deletion webui/module/Application/Module.php
Expand Up @@ -4,7 +4,7 @@
*
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos-webui for the canonical source repository
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2016 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
* @author Frank Bergkemper
Expand Down
Expand Up @@ -4,7 +4,7 @@
*
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos-webui for the canonical source repository
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2016 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
* @author Frank Bergkemper
Expand Down
Expand Up @@ -4,7 +4,7 @@
*
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos-webui for the canonical source repository
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2016 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
* @author Frank Bergkemper
Expand Down
Expand Up @@ -4,7 +4,7 @@
*
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos-webui for the canonical source repository
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2016 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
* @author Frank Bergkemper
Expand Down
Expand Up @@ -4,7 +4,7 @@
*
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos-webui for the canonical source repository
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2014 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
*
Expand Down
2 changes: 1 addition & 1 deletion webui/module/Application/view/layout/error.phtml
Expand Up @@ -4,7 +4,7 @@
*
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos-webui for the canonical source repository
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2014 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
* @author Frank Bergkemper
Expand Down
2 changes: 1 addition & 1 deletion webui/module/Application/view/layout/install.phtml
Expand Up @@ -4,7 +4,7 @@
*
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos-webui for the canonical source repository
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2014 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
* @author Frank Bergkemper
Expand Down
6 changes: 3 additions & 3 deletions webui/module/Application/view/layout/layout.phtml.in
Expand Up @@ -4,7 +4,7 @@
*
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos-webui for the canonical source repository
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2019 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
* @author Frank Bergkemper
Expand Down Expand Up @@ -57,9 +57,9 @@ include 'version.php';
->prependFile($this->basePath() . '/js/bootstrap-select.min.js')
->prependFile($this->basePath() . '/js/bootstrap-datetimepicker.min.js')
->prependFile($this->basePath() . '/js/bootstrap.min.js')
->prependFile($this->basePath() . '/js/moment.min.js')
->prependFile($this->basePath() . '/js/excanvas.min.js', 'text/jaavscript')
->prependFile($this->basePath() . '/js/excanvas.min.js', 'text/javascript')
->prependFile($this->basePath() . '/js/jquery.min.js', 'text/javascript')
->prependFile($this->basePath() . '/js/moment.min.js')
->prependFile($this->basePath() . '/js/respond.min.js', 'text/javascript', array('conditional' => 'lt IE 9'))
->prependFile($this->basePath() . '/js/html5shiv.js', 'text/javascript', array('conditional' => 'lt IE 9'));
?>
Expand Down
2 changes: 1 addition & 1 deletion webui/module/Application/view/layout/login.phtml.in
Expand Up @@ -4,7 +4,7 @@
*
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos-webui for the canonical source repository
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2014 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
* @author Frank Bergkemper
Expand Down
2 changes: 1 addition & 1 deletion webui/module/Auth/Module.php
Expand Up @@ -4,7 +4,7 @@
*
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos-webui for the canonical source repository
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2014 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
*
Expand Down
2 changes: 1 addition & 1 deletion webui/module/Auth/autoload_classmap.php
Expand Up @@ -4,7 +4,7 @@
*
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos-webui for the canonical source repository
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2014 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
*
Expand Down
2 changes: 1 addition & 1 deletion webui/module/Auth/config/module.config.php
Expand Up @@ -4,7 +4,7 @@
*
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos-webui for the canonical source repository
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2014 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
*
Expand Down
2 changes: 1 addition & 1 deletion webui/module/Auth/src/Auth/Controller/AuthController.php
Expand Up @@ -4,7 +4,7 @@
*
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos-webui for the canonical source repository
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2017 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
*
Expand Down
2 changes: 1 addition & 1 deletion webui/module/Auth/src/Auth/Form/LoginForm.php
Expand Up @@ -4,7 +4,7 @@
*
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos-webui for the canonical source repository
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2016 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
*
Expand Down
2 changes: 1 addition & 1 deletion webui/module/Auth/view/auth/auth/login.phtml
Expand Up @@ -4,7 +4,7 @@
*
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos-webui for the canonical source repository
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2016 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
*
Expand Down
2 changes: 1 addition & 1 deletion webui/module/Client/config/module.config.php
Expand Up @@ -4,7 +4,7 @@
*
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos-webui for the canonical source repository
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2015 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
*
Expand Down
Expand Up @@ -4,7 +4,7 @@
*
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos-webui for the canonical source repository
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2016 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
*
Expand Down
16 changes: 8 additions & 8 deletions webui/module/Client/src/Client/Model/ClientModel.php
Expand Up @@ -4,7 +4,7 @@
*
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos-webui for the canonical source repository
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2017 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
*
Expand Down Expand Up @@ -38,7 +38,7 @@ public function getClients(&$bsock=null)
{
if(isset($bsock)) {
$cmd = 'llist clients current';
$result = $bsock->send_command($cmd, 2, null);
$result = $bsock->send_command($cmd, 2);
$clients = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
return $clients['result']['clients'];
}
Expand All @@ -58,7 +58,7 @@ public function getDotClients(&$bsock=null)
{
if(isset($bsock)) {
$cmd = '.clients';
$result = $bsock->send_command($cmd, 2, null);
$result = $bsock->send_command($cmd, 2);
$clients = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
return $clients['result']['clients'];
}
Expand All @@ -79,7 +79,7 @@ public function getClient(&$bsock=null, $client=null)
{
if(isset($bsock, $client)) {
$cmd = 'llist client="'.$client.'"';
$result = $bsock->send_command($cmd, 2, null);
$result = $bsock->send_command($cmd, 2);
$client = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
return $client['result']['clients'];
}
Expand Down Expand Up @@ -112,7 +112,7 @@ public function getClientBackups(&$bsock=null, $client=null, $fileset=null, $ord
if ($limit != null) {
$cmd .= ' limit='.$limit;
}
$result = $bsock->send_command($cmd, 2, null);
$result = $bsock->send_command($cmd, 2);
$backups = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
return $backups['result']['backups'];
}
Expand All @@ -133,7 +133,7 @@ public function statusClient(&$bsock=null, $name=null)
{
if(isset($bsock, $name)) {
$cmd = 'status client="'.$name;
$result = $bsock->send_command($cmd, 0, null);
$result = $bsock->send_command($cmd, 0);
return $result;
}
else {
Expand All @@ -153,7 +153,7 @@ public function enableClient(&$bsock=null, $name=null)
{
if(isset($bsock, $name)) {
$cmd = 'enable client="'.$name.'" yes';
$result = $bsock->send_command($cmd, 0, null);
$result = $bsock->send_command($cmd, 0);
return $result;
}
else {
Expand All @@ -173,7 +173,7 @@ public function disableClient(&$bsock=null, $name=null)
{
if(isset($bsock, $name)) {
$cmd = 'disable client="'.$name.'" yes';
$result = $bsock->send_command($cmd, 0, null);
$result = $bsock->send_command($cmd, 0);
return $result;
}
else {
Expand Down
6 changes: 3 additions & 3 deletions webui/module/Client/view/client/client/details.phtml
Expand Up @@ -4,7 +4,7 @@
*
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos-webui for the canonical source repository
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2017 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
*
Expand Down Expand Up @@ -139,7 +139,7 @@ $this->headTitle($title);
{
field: 'action',
formatter: function(value, row, index) {
return '<a href="<?php echo $this->basePath() . '/restore/index?type=client&client='; ?>'+row.name+'"><button type="button" class="btn btn-default btn-xs" id="btn-1" data-toggle="tooltip" data-placement="top" title="<?php echo $this->translate("Restore"); ?>"><span class="glyphicon glyphicon-import"></span></button></a>&nbsp;<a class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="top" href="<?php echo $this->basePath(); ?>/client/status?client='+row.name+'" title="<?php echo $this->translate("Status"); ?>" id="btn-1"><span class="glyphicon glyphicon-zoom-in"></span></a>';
return '<a href="<?php echo $this->basePath() . '/restore/index?client='; ?>'+row.name+'"><button type="button" class="btn btn-default btn-xs" id="btn-1" data-toggle="tooltip" data-placement="top" title="<?php echo $this->translate("Restore"); ?>"><span class="glyphicon glyphicon-import"></span></button></a>&nbsp;<a class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="top" href="<?php echo $this->basePath(); ?>/client/status?client='+row.name+'" title="<?php echo $this->translate("Status"); ?>" id="btn-1"><span class="glyphicon glyphicon-zoom-in"></span></a>';
}
}
]
Expand Down Expand Up @@ -218,7 +218,7 @@ $this->headTitle($title);
{
field: 'action',
formatter: function(value, row, index) {
return '<a class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="top" href="<?php echo $this->basePath();?>/job/details/'+row.jobid+'" title="<?php echo $this->translate("View Job Details"); ?>" id="btn-0"><span class="glyphicon glyphicon-search"></span></a>&nbsp;<a class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="top" href="<?php echo $this->basePath(); ?>/restore/?type=client&mergefilesets=1&mergejobs=1&client='+row.client+'&jobid='+row.jobid+'" title="<?php echo $this->translate("Show Files"); ?>" id="btn-1"><span class="glyphicon glyphicon-folder-open"></span></a>';
return '<a class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="top" href="<?php echo $this->basePath();?>/job/details/'+row.jobid+'" title="<?php echo $this->translate("View Job Details"); ?>" id="btn-0"><span class="glyphicon glyphicon-search"></span></a>&nbsp;<a class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="top" href="<?php echo $this->basePath(); ?>/restore/?mergefilesets=1&mergejobs=1&client='+row.client+'&jobid='+row.jobid+'" title="<?php echo $this->translate("Show Files"); ?>" id="btn-1"><span class="glyphicon glyphicon-folder-open"></span></a>';
}
}
]
Expand Down
4 changes: 2 additions & 2 deletions webui/module/Client/view/client/client/index.phtml
Expand Up @@ -4,7 +4,7 @@
*
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos-webui for the canonical source repository
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2017 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
*
Expand Down Expand Up @@ -214,7 +214,7 @@ $this->headTitle($title);
field: 'actions',
formatter: function(value, row, index) {
var actions = null;
var rlink = '<a class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="top" href="<?php echo $this->basePath() . '/restore/index?type=client&client='; ?>'+row.name+'" title="<?php echo $this->translate("Restore"); ?>" id="btn-1"><span class="glyphicon glyphicon-import"></span></a>&nbsp;<a class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="top" href="<?php echo $this->basePath(); ?>/client/status?client='+row.name+'" title="<?php echo $this->translate("Status"); ?>" id="btn-1"><span class="glyphicon glyphicon-zoom-in"></span></a>';
var rlink = '<a class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="top" href="<?php echo $this->basePath() . '/restore/index?client='; ?>'+row.name+'" title="<?php echo $this->translate("Restore"); ?>" id="btn-1"><span class="glyphicon glyphicon-import"></span></a>&nbsp;<a class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="top" href="<?php echo $this->basePath(); ?>/client/status?client='+row.name+'" title="<?php echo $this->translate("Status"); ?>" id="btn-1"><span class="glyphicon glyphicon-zoom-in"></span></a>';
var ulink = '<a href="'+row.url_package+'" target="_blank"><button type="button" class="btn btn-default btn-xs" id="btn-1" data-toggle="tooltip" data-placement="top" title="Download update"><span class="glyphicon glyphicon-download-alt"></span></button></a>';
if(row.enabled) {
actions = rlink + '&nbsp;' + '<a class="btn btn-default btn-xs" data-toggle="tooltip" data-placement="top" href="<?php echo $this->basePath(); ?>/client/index?action=disable&client='+row.name+'" title="<?php echo $this->translate("Disable"); ?>" id="btn-1"><span class="glyphicon glyphicon-remove"></span></a>';
Expand Down
2 changes: 1 addition & 1 deletion webui/module/Dashboard/config/module.config.php
Expand Up @@ -4,7 +4,7 @@
*
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos-webui for the canonical source repository
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2015 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
*
Expand Down
Expand Up @@ -4,7 +4,7 @@
*
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos-webui for the canonical source repository
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2017 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
*
Expand Down
2 changes: 1 addition & 1 deletion webui/module/Dashboard/src/Dashboard/Model/Dashboard.php
Expand Up @@ -4,7 +4,7 @@
*
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos-webui for the canonical source repository
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2014 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
*
Expand Down
Expand Up @@ -4,7 +4,7 @@
*
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos-webui for the canonical source repository
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2016 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
*
Expand Down
Expand Up @@ -4,7 +4,7 @@
*
* bareos-webui - Bareos Web-Frontend
*
* @link https://github.com/bareos/bareos-webui for the canonical source repository
* @link https://github.com/bareos/bareos for the canonical source repository
* @copyright Copyright (c) 2013-2017 Bareos GmbH & Co. KG (http://www.bareos.org/)
* @license GNU Affero General Public License (http://www.gnu.org/licenses/)
*
Expand Down

0 comments on commit 07c71f8

Please sign in to comment.