Better HTML encoding for DbUtils, DisplayPreference and DocumentType

glpi-project · Sep 18, 2024 · 9dd9446 · 9dd9446
1 parent 6044ae1
commit 9dd9446
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/src/DbUtils.php b/src/DbUtils.php
@@ -1476,14 +1476,14 @@ public function getTreeValueCompleteName($table, $ID, $withcomment = false, $tra
                     $alias   = $result['alias'];
                     if (!empty($alias)) {
                         $name = $alias;
-                        $comment .= "<span class='b'>" . __('Alias:') . "</span> " . $alias . "<br/>";
+                        $comment .= "<span class='b'>" . __s('Alias:') . "</span> " . htmlspecialchars($alias) . "<br/>";
                     }
                     if (!empty($code)) {
                         $name .= ' - ' . $code;
-                        $comment .= "<span class='b'>" . __('Code:') . "</span> " . $code . "<br/>";
+                        $comment .= "<span class='b'>" . __s('Code:') . "</span> " . htmlspecialchars($code) . "<br/>";
                     }
                     if (!empty($address)) {
-                        $acomment .= $address;
+                        $acomment .= htmlspecialchars($address);
                     }
                     if (
                         !empty($address) &&
@@ -1492,19 +1492,19 @@ public function getTreeValueCompleteName($table, $ID, $withcomment = false, $tra
                         $acomment .= '<br/>';
                     }
                     if (!empty($town)) {
-                        $acomment .= $town;
+                        $acomment .= htmlspecialchars($town);
                     }
                     if (!empty($country)) {
                         if (!empty($town)) {
                             $acomment .= ' - ';
                         }
-                        $acomment .= $country;
+                        $acomment .= htmlspecialchars($country);
                     }
                     if (trim($acomment) != '') {
-                        $comment .= "<span class='b'>&nbsp;" . __('Address:') . "</span> " . $acomment . "<br/>";
+                        $comment .= "<span class='b'>&nbsp;" . __s('Address:') . "</span> " . $acomment . "<br/>";
                     }
                 }
-                $comment .= "<span class='b'>&nbsp;" . __('Comments') . "&nbsp;</span>";
+                $comment .= "<span class='b'>&nbsp;" . __s('Comments') . "&nbsp;</span>";
             }
             $transcomment = $result['transcomment'];
             if ($translate && !empty($transcomment)) {

diff --git a/src/DisplayPreference.php b/src/DisplayPreference.php
@@ -80,8 +80,8 @@ public static function showMassiveActionsSubForm(MassiveAction $ma)
     {
         switch ($ma->getAction()) {
             case 'reset_to_default':
-                $msg = __('This will reset the columns to the defaults for a new installation.');
-                $msg2 = __('This will only work for types from GLPI itself or enabled plugins that support this action.');
+                $msg = __s('This will reset the columns to the defaults for a new installation.');
+                $msg2 = __s('This will only work for types from GLPI itself or enabled plugins that support this action.');
                 echo '<div class="alert alert-info">' . $msg . '<br>' . $msg2 . '</div>';
                 echo Html::submit(_x('button', 'Post'), ['name' => 'massiveaction']);
                 return true;

diff --git a/src/DocumentType.php b/src/DocumentType.php
@@ -130,7 +130,7 @@ public static function getSpecificValueToDisplay($field, $values, array $options
             case 'icon':
                 if (!empty($values[$field])) {
                     return "&nbsp;<img style='vertical-align:middle;' alt='' src='" .
-                      $CFG_GLPI["typedoc_icon_dir"] . "/" . $values[$field] . "'>";
+                      htmlspecialchars($CFG_GLPI["typedoc_icon_dir"] . "/" . $values[$field]) . "'>";
                 }
         }
         return parent::getSpecificValueToDisplay($field, $values, $options);
@@ -191,7 +191,8 @@ public static function showAvailableTypesLink($options = [])
         $display .= Ajax::createIframeModalWindow(
             "documenttypelist_{$p['rand']}",
             $CFG_GLPI["root_doc"] . "/front/documenttype.list.php",
-            ['title'   => static::getTypeName(Session::getPluralNumber()),
+            [
+                'title'   => static::getTypeName(Session::getPluralNumber()),
                 'display' => false
             ]
         );