Changeset 952

Timestamp:

07/07/10 10:06:37 (2 months ago)

Author:

ort

Message:

fix text parser

Location:

trunk/engine

Files:

• lib/external/Jevix/jevix.class.php (modified) (1 diff)
• modules/text/Text.class.php (modified) (4 diffs)

trunk/engine/lib/external/Jevix/jevix.class.php

@@ -954 +954 @@
                                                 }
                                                 // HTTP в начале если нет
-                                                if(!preg_match('/^(http|https|ftp):\/\//ui', $value) && !preg_match('/^(\/|\#)/ui', $value) ) $value = 'http://'.$value;
+                                                if(!preg_match('/^(http|https|ftp):\/\//ui', $value) && !preg_match('/^(\/|\#)/ui', $value) && !preg_match('/^(mailto):/ui', $value) ) $value = 'http://'.$value;
                                                 break;
 

trunk/engine/modules/text/Text.class.php

@@ -47 +47 @@
          */
         protected function JevixConfig() {
+                // разрешаем в параметрах символ &
+                unset($this->oJevix->entities1['&']);
                 // Разрешённые теги
                 $this->oJevix->cfgAllowTags(array('cut','a', 'img', 'i', 'b', 'u', 's', 'video', 'em',  'strong', 'nobr', 'li', 'ol', 'ul', 'sup', 'abbr', 'sub', 'acronym', 'h4', 'h5', 'h6', 'br', 'hr', 'pre', 'code', 'object', 'param', 'embed', 'blockquote'));
@@ -57 +59 @@
                 $this->oJevix->cfgAllowTagParams('a', array('title', 'href', 'rel'));           
                 $this->oJevix->cfgAllowTagParams('cut', array('name'));
-                $this->oJevix->cfgAllowTagParams('object', array('width' => '#int', 'height' => '#int', 'data' => '#link'));
+                $this->oJevix->cfgAllowTagParams('object', array('width' => '#int', 'height' => '#int', 'data' => '#link', 'type' => '#text'));
                 $this->oJevix->cfgAllowTagParams('param', array('name' => '#text', 'value' => '#text'));
                 $this->oJevix->cfgAllowTagParams('embed', array('src' => '#image', 'type' => '#text','allowscriptaccess' => '#text', 'allowfullscreen' => '#text','width' => '#int', 'height' => '#int', 'flashvars'=> '#text', 'wmode'=> '#text'));
@@ -139 +141 @@
          */
         protected function FlashParamParser($sText) {   
-                if (preg_match_all("@(<\s*param\s*name\s*=\s*\".*\"\s*value\s*=\s*\".*\")\s*/?\s*>(?!</param>)@Ui",$sText,$aMatch)) {                           
+                if (preg_match_all("@(<\s*param\s*name\s*=\s*(?:\"|').*(?:\"|')\s*value\s*=\s*(?:\"|').*(?:\"|'))\s*/?\s*>(?!</param>)@Ui",$sText,$aMatch)) {                           
                         foreach ($aMatch[1] as $key => $str) {
                                 $str_new=$str.'></param>';                              
@@ -154 +156 @@
                  * Удаляем все <param name="wmode" value="*"></param>            
                  */
-                if (preg_match_all("@(<param\s.*name=\"wmode\".*>\s*</param>)@Ui",$sText,$aMatch)) {
+                if (preg_match_all("@(<param\s.*name=(?:\"|')wmode(?:\"|').*>\s*</param>)@Ui",$sText,$aMatch)) {
                         foreach ($aMatch[1] as $key => $str) {
                                 $sText=str_replace($aMatch[0][$key],'',$sText);