Merge branch 'bareos-16.2'

bareos · Dec 22, 2016 · 9c2f7bf · 9c2f7bf
2 parents a1841ef + 104f61d
commit 9c2f7bf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/install/bareos/bareos-dir.d/profile/webui-admin.conf b/install/bareos/bareos-dir.d/profile/webui-admin.conf
@@ -3,7 +3,7 @@
 #
 Profile {
   Name = "webui-admin"
-  CommandACL = !.bvfs_clear_cache, !.exit, !.sql, !configure, !create, !delete, !purge, !sqlquery, !umount, !unmount, *all*
+  CommandACL = !.bvfs_clear_cache, !.exit, !.sql, !configure, !create, !delete, !purge, !prune, !sqlquery, !umount, !unmount, *all*
   Job ACL = *all*
   Schedule ACL = *all*
   Catalog ACL = *all*

diff --git a/module/Job/view/job/job/details.phtml b/module/Job/view/job/job/details.phtml
@@ -274,7 +274,9 @@ $(document).ready(function() {
       "ordering": true,
       "info": true,
       "pagingType": "full_numbers",
-      "stateSave": true,
+      "lengthMenu": [ <?php echo $_SESSION['bareos']['dt_lengthmenu']; ?> ],
+      "pageLength": <?php echo $_SESSION['bareos']['dt_pagelength']; ?>,
+      "stateSave": <?php echo $_SESSION['bareos']['dt_statesave']; ?>,
       "order": [[0, 'desc']],
       "columnDefs": [
          {

diff --git a/module/Restore/src/Restore/Controller/RestoreController.php b/module/Restore/src/Restore/Controller/RestoreController.php
@@ -340,7 +340,7 @@ private function buildSubtree()
          foreach($files as $file) {
             $items .= '{';
             $items .= '"id":"' . $file["fileid"] . '"';
-            $items .= ',"text":"' . preg_replace('/[\x00-\x1F\x7F]/', '', $file["name"]) . '"';
+            $items .= ',"text":"' . preg_replace('/[\x00-\x1F\x7F]/', '', addslashes($file["name"])) . '"';
             $items .= ',"icon":"glyphicon glyphicon-file"';
             $items .= ',"state":""';
             $items .= ',"data":' . \Zend\Json\Json::encode($file, \Zend\Json\Json::TYPE_OBJECT);