Info flash outputs tags cleared text

b23prodtm · Dec 16, 2018 · 657d388 · 657d388
1 parent b2e7b06
commit 657d388
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/app/View/E14/admin_cat.ctp b/app/View/E14/admin_cat.ctp
@@ -1,5 +1,5 @@
 <?php
-App:uses(array('SQL', 'Page', 'Formulaire'), 'Cms');
+App::uses(array('SQL', 'Page', 'Formulaire'), 'Cms');
 require APP . $r->r['include__php_constantes.inc'];
 require APP . $r->r['include__php_module_html.inc'];
 require APP . $r->r['include__php_module_cat.inc'];

diff --git a/app/View/Helper/InfoHelper.php b/app/View/Helper/InfoHelper.php
@@ -149,11 +149,23 @@ function getInfoFlashN($offset = 0, &$pages = array(), $characters = 160) {
 			$this->__getInfo($this->pageCount, $offset, $infos);
 			/* contenu de la page */
 			foreach($infos as $lastinfo) {
-						$c = $lastinfo->getContenu(null, true, true, $characters);
+						$c = $this->clearTags($lastinfo->getContenu(null, true, true, $characters));
 						$c = $this->md ? $this->r->view->Markdown->transform($c) : $c;
+
 						$html .= $this->r->view->HTML->para("info_flash", $lastinfo->getLien($lastinfo->getTitre()) . "<p>" . $c . "...</p>\n");
 			}
 			return $html;
 	}
 
+  function clearTags($text, $pattern = "|<[^>]+>(.*)</[^>]+>|U") {
+      $sptn = "|<[^>]+>?(.*)|U";
+      if(preg_match_all($pattern, $text, $match, PREG_PATTERN_ORDER) > 0) {
+          return $this->clearTags(implode($match[1]), $pattern);
+      } else if($sptn !== $pattern) {
+          return $this->clearTags($text, $sptn);
+      } else {
+          $text = explode(" ", $text);
+          return implode(" ",array_slice($text, 0, count($text) - 1));
+      }
+  }
 }
diff --git a/app/webroot/php_cms b/app/webroot/php_cms