refactor(abstractitiltarget): remove obsolete code

pluginsGLPI · Aug 1, 2023 · de592b6 · de592b6
1 parent 55cfa80
commit de592b6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 26 deletions.
diff --git a/inc/abstractfield.class.php b/inc/abstractfield.class.php
@@ -131,7 +131,7 @@ public function show(string $domain, bool $canEdit = true): string {
 
       if ($this->isEditableField() && !empty($this->question->fields['description'])) {
          $description = $this->question->fields['description'];
-         foreach (PluginFormcreatorCommon::getDocumentsFromTag($description) as $document) {
+         foreach (Toolbox::getDocumentsFromTag($description) as $document) {
             $prefix = uniqid('', true);
             $filename = $prefix . 'image_paste.' . pathinfo($document['filename'], PATHINFO_EXTENSION);
             if (!copy(GLPI_DOC_DIR . '/' . $document['filepath'], GLPI_TMP_DIR . '/' . $filename)) {

diff --git a/inc/abstractitiltarget.class.php b/inc/abstractitiltarget.class.php
@@ -2412,9 +2412,7 @@ protected function prepareUploadedFiles(array $data): array {
       $data['_tag_filename'] = [];
 
       // emulate file uploads of inline images
-      // TODO: replace PluginFormcreatorCommon::getDocumentsFromTag by Toolbox::getDocumentsFromTag
-      // when is merged https://github.com/glpi-project/glpi/pull/9335
-      foreach (PluginFormcreatorCommon::getDocumentsFromTag($data['content']) as $document) {
+      foreach (Toolbox::getDocumentsFromTag($data['content']) as $document) {
          $prefix = uniqid('', true);
          $filename = $prefix . 'image_paste.' . pathinfo($document['filename'], PATHINFO_EXTENSION);
          if (!@copy(GLPI_DOC_DIR . '/' . $document['filepath'], GLPI_TMP_DIR . '/' . $filename)) {

diff --git a/inc/common.class.php b/inc/common.class.php
@@ -583,28 +583,6 @@ public static function checkRegex($regex) {
       return $isValid;
    }
 
-   /**
-    * Find documents data matching the tags found in the string
-    * Tags are deduplicated
-    *
-    * @param string $content_text String to search tags from
-    *
-    * @return array data from documents having tags found
-    */
-   public static function getDocumentsFromTag(string $content_text): array {
-      preg_match_all(
-         '/'.Document::getImageTag('(([a-z0-9]+|[\.\-]?)+)').'/',
-         $content_text,
-         $matches, PREG_PATTERN_ORDER
-      );
-      if (!isset($matches[1]) || count($matches[1]) == 0) {
-         return [];
-      }
-
-      $document = new Document();
-      return $document->find(['tag' => array_unique($matches[1])]);
-   }
-
    /**
     * find a document with a file attached, with respect of blacklisting
     *