From d29b16dc37ce3fb807c24ae10db6247b605cf52c Mon Sep 17 00:00:00 2001
From: gnieark <gnieark@free.fr>
Date: Thu, 15 Jul 2021 10:31:20 +0200
Subject: [PATCH] webui: quote strings with slashes in job index and details
 view

Strings coming from "translate" function can contain apostrophes
that need to be escaped.

(cherry picked from commit d72df730e8229b6c849eefac83f329fe204e71db)

Fixes #1235: Special characters not escaped in translations
---
 webui/module/Job/view/job/job/details.phtml | 10 +++++-----
 webui/module/Job/view/job/job/index.phtml   |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/webui/module/Job/view/job/job/details.phtml b/webui/module/Job/view/job/job/details.phtml
index 938fc5574b4..b3fc5606e54 100644
--- 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
index a03e843a8c1..8ed3d473dcb 100644
--- 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>');