Handle htmlawed dependency using composer

trasher · Feb 15, 2019 · 1afbd40 · 1afbd40
1 parent 17cc629
commit 1afbd40
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 742 deletions.
diff --git a/composer.json b/composer.json
@@ -43,7 +43,8 @@
         "doctrine/annotations": "^1.4",
         "twig/extensions": "^1.5",
         "kanellov/slim-twig-flash": "^0.2.0",
-        "runcmf/runtracy": "^0.2.10"
+        "runcmf/runtracy": "^0.2.10",
+        "fossar/htmlawed": "1.2.4.1"
     },
     "require-dev": {
         "guzzlehttp/guzzle": "~6",

diff --git a/composer.lock b/composer.lock
diff --git a/inc/based_config.php b/inc/based_config.php
@@ -134,13 +134,6 @@
    define("GLPI_SCRIPT_DIR", GLPI_ROOT . "/scripts");
 }
 
-// Default patch to htmLawed
-if (!defined('GLPI_HTMLAWED')) {
-   define('GLPI_HTMLAWED', GLPI_ROOT.'/lib/htmlawed/htmLawed.php');
-   // if htmLawed available in system, use (in config_path.php)
-   // define('GLPI_HTMLAWED', '/usr/share/htmlawed/htmLawed.php');
-}
-
 // Install mode for telemetry
 if (!defined('GLPI_INSTALL_MODE')) {
    if (is_dir(GLPI_ROOT . '/.git')) {

diff --git a/inc/config.class.php b/inc/config.class.php
@@ -1904,12 +1904,11 @@ static function getLibraryDir($libstring) {
     * @since 9.4
     */
    static function getLibraries($all = false) {
-      include_once(GLPI_HTMLAWED);
       $pm = new PHPMailer();
       $sp = new SimplePie();
 
       // use same name that in composer.json
-      $deps = [[ 'name'    => 'htmLawed',
+      $deps = [[ 'name'    => 'fossar/htmlawed',
                  'version' => hl_version() ,
                  'check'   => 'hl_version' ],
                [ 'name'    => 'phpmailer/phpmailer',

diff --git a/inc/html.class.php b/inc/html.class.php
@@ -81,7 +81,6 @@ static function clean($value, $striptags = true, $keep_bad = 2) {
       // Neutralize not well formatted html tags
       $value = preg_replace("/(<)([^>]*<)/", "&lt;$2", $value);
 
-      include_once(GLPI_HTMLAWED);
       $value = htmLawed(
          $value,
          [

diff --git a/inc/toolbox.class.php b/inc/toolbox.class.php
@@ -334,7 +334,6 @@ static function unclean_cross_side_scripting_deep($value) {
     * @see clean_cross_side_scripting_deep()
    **/
    static function unclean_html_cross_side_scripting_deep($value) {
-      include_once(GLPI_HTMLAWED);
 
       $in  = ['<', '>'];
       $out = ['&lt;', '&gt;'];