Merge pull request #899 from bareos/dev/fbergkemper/bareos-19.2/bug-0…

…001235 webui: fix issue 0001235
bareos · Aug 10, 2021 · 0cb66db · 0cb66db
2 parents bb04177 + 3a56372
commit 0cb66db
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 43 deletions.
diff --git a/webui/module/Dashboard/view/dashboard/dashboard/index.phtml b/webui/module/Dashboard/view/dashboard/dashboard/index.phtml
@@ -261,7 +261,7 @@ $this->headTitle($title);
             }
             else {
                $('.running-jobs-container').empty();
-               $('.running-jobs-container').append('<?php echo $this->translate('There are no jobs running.'); ?>');
+               $('.running-jobs-container').append('<?php echo addslashes($this->translate('There are no jobs running.')); ?>');
             }
          },
          error: function() {

diff --git a/webui/module/Job/view/job/job/details.phtml b/webui/module/Job/view/job/job/details.phtml
@@ -148,23 +148,23 @@ $this->headTitle($title);
       html.push('<div class="container-fluid">');
       html.push('<table class="table table-bordered">');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Fileset"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Fileset")); ?></th>');
       html.push('<td><a href="<?php echo $this->basePath() . '/fileset/details/'; ?>' + row.filesetid + '">' + row.fileset +'</a></td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Pool"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Pool")); ?></th>');
       html.push('<td><a href="<?php echo $this->basePath() . '/pool/details/'; ?>' + row.poolname + '">' + row.poolname + '</a></td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Scheduled"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Scheduled")); ?></th>');
       html.push('<td>' + row.schedtime + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Start"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Start")); ?></th>');
       html.push('<td>' + row.starttime + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("End"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("End")); ?></th>');
       html.push('<td>' + row.endtime + '</td>');
       html.push('</tr>');
       html.push('</table>');

diff --git a/webui/module/Job/view/job/job/index.phtml b/webui/module/Job/view/job/job/index.phtml
@@ -149,15 +149,15 @@ $this->headTitle($title);
       html.push('<div class="container-fluid">');
       html.push('<table class="table table-bordered">');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Fileset"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Fileset")); ?></th>');
       html.push('<td><a href="<?php echo $this->basePath() . '/fileset/details/'; ?>' + row.filesetid + '">' + row.fileset +'</a></td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Pool"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Pool")); ?></th>');
       html.push('<td><a href="<?php echo $this->basePath() . '/pool/details/'; ?>' + row.poolname + '">' + row.poolname + '</a></td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Scheduled"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Scheduled")); ?></th>');
       html.push('<td>' + row.schedtime + '</td>');
       html.push('</tr>');
       html.push('<tr>');

diff --git a/webui/module/Media/view/media/media/details.phtml b/webui/module/Media/view/media/media/details.phtml
@@ -274,119 +274,119 @@ $this->headTitle($title);
       html.push('<div class="container-fluid">');
       html.push('<table class="table table-bordered">');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Label date"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Label date")); ?></th>');
       html.push('<td>' + row.labeldate + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("First written"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("First written")); ?></th>');
       html.push('<td>' + row.firstwritten + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Last written"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Last written")); ?></th>');
       html.push('<td>' + row.lastwritten + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Volume jobs"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Volume jobs")); ?></th>');
       html.push('<td>' + row.voljobs + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Recycle"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Recycle")); ?></th>');
       html.push('<td>' + r + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Volume writes"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Volume writes")); ?></th>');
       html.push('<td>' + row.volwrites + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Slot"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Slot")); ?></th>');
       html.push('<td>' + row.slot + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Media Id"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Media Id")); ?></th>');
       html.push('<td>' + row.mediaid + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Volume Blocks"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Volume Blocks")); ?></th>');
       html.push('<td>' + row.volblocks + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Volume use duration"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Volume use duration")); ?></th>');
       html.push('<td>' + row.voluseduration + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Volume Pool Id"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Volume Pool Id")); ?></th>');
       html.push('<td>' + row.poolid + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("In changer"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("In changer")); ?></th>');
       html.push('<td>' + row.inchanger + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Volume Files"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Volume Files")); ?></th>');
       html.push('<td>' + row.volfiles + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Max. volume jobs"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Max. volume jobs")); ?></th>');
       html.push('<td>' + row.maxvoljobs + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Volume mounts"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Volume mounts")); ?></th>');
       html.push('<td>' + row.volmounts + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Volume capacity bytes"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Volume capacity bytes")); ?></th>');
       html.push('<td>' + row.volcapacitybytes + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Volume errors"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Volume errors")); ?></th>');
       html.push('<td>' + row.volerrors + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Enabled"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Enabled")); ?></th>');
       html.push('<td>' + row.enabled + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Max. volume files"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Max. volume files")); ?></th>');
       html.push('<td>' + row.maxvolfiles + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Endfile"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Endfile")); ?></th>');
       html.push('<td>' + row.endfile + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Endblock"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Endblock")); ?></th>');
       html.push('<td>' + row.endblock + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Labeltype"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Labeltype")); ?></th>');
       html.push('<td>' + row.labeltype + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Device Id"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Device Id")); ?></th>');
       html.push('<td>' + row.deviceid + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Location Id"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Location Id")); ?></th>');
       html.push('<td>' + row.locationid + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Recycle count"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Recycle count")); ?></th>');
       html.push('<td>' + row.recyclecount + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Initial write"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Initial write")); ?></th>');
       html.push('<td>' + row.initialwrite + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Scratch Pool Id"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Scratch Pool Id")); ?></th>');
       html.push('<td>' + row.scratchpoolid + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Recycle Pool Id"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Recycle Pool Id")); ?></th>');
       html.push('<td>' + row.recyclepoolid + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Comment"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Comment")); ?></th>');
       html.push('<td>' + row.comment + '</td>');
       html.push('</tr>');
       html.push('</table>');

diff --git a/webui/module/Pool/view/pool/pool/details.phtml b/webui/module/Pool/view/pool/pool/details.phtml
@@ -250,23 +250,23 @@ $this->headTitle($title);
       html.push('<div class="container-fluid">');
       html.push('<table class="table table-bordered">');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Label date"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Label date")); ?></th>');
       html.push('<td>' + row.labeldate + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("First written"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("First written")); ?></th>');
       html.push('<td>' + row.firstwritten + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Last written"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Last written")); ?></th>');
       html.push('<td>' + row.lastwritten + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Volume jobs"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Volume jobs")); ?></th>');
       html.push('<td>' + row.voljobs + '</td>');
       html.push('</tr>');
       html.push('<tr>');
-      html.push('<th><?php echo $this->translate("Recycle"); ?></th>');
+      html.push('<th><?php echo addslashes($this->translate("Recycle")); ?></th>');
       html.push('<td>' + formatRecycle(row.recycle) + '</td>');
       html.push('</tr>');
       html.push('</table>');