Commit: eb785b734cc89878e0731bcfa8685aba1b71e536 - xoopscubelegacy (git)

XOOPS Cube Legacy base repository

Commit MetaInfo

• Revision: eb785b734cc89878e0731bcfa8685aba1b71e536 (tree)
• Zeit: 2011-11-25 19:58:18
• Autor: kilica <kilica@704c...>
• Commiter: kilica

Log Message

- Feature Request #2976820 - MyTextSanitizer delegate

git-svn-id: https://xoopscube.svn.sourceforge.net/svnroot/xoopscube/Package_Legacy/trunk@1064 704cf05f-ae62-4b0e-a484-234ee0250e75

Ändern Zusammenfassung

• modified: html/class/module.textsanitizer.php
• modified: html/modules/legacy/kernel/Legacy_TextFilter.class.php

Diff

--- a/html/class/module.textsanitizer.php
+++ b/html/class/module.textsanitizer.php
@@ -58,13 +58,13 @@ class MyTextSanitizer
      * @deprecated
 	 */
 	var $mMakeClickablePostFilter = null;
-	
+
 	/**
 	 * @var XCube_Delegate
      * @deprecated
 	 */
 	var $mXoopsCodePostFilter = null;
-	
+
     /*
     * Constructor of this class
     *
@@ -78,10 +78,10 @@ class MyTextSanitizer
     */
     function MyTextSanitizer()
     {
-		
+
 		$this->mMakeClickablePostFilter =new XCube_Delegate();
 		$this->mMakeClickablePostFilter->register('MyTextSanitizer.MakeClickablePostFilter');
-		
+
 		$this->mXoopsCodePostFilter =new XCube_Delegate();
 		$this->mXoopsCodePostFilter->register('MyTextSanitizer.XoopsCodePostFilter');
 
@@ -142,7 +142,7 @@ class MyTextSanitizer
 
         // RaiseEvent : 'MyTextSanitizer.MakeClickablePostFilter'
         //  Delegate may convert output text with quickApplyFilter rule
-        //  Args : 
+        //  Args :
         //      'string'       [I/O] : Text to convert;
         //
         $this->mMakeClickablePostFilter->call(new XCube_Ref($text));
@@ -160,10 +160,10 @@ class MyTextSanitizer
     function &xoopsCodeDecode($text, $allowimage = 1)
     {
         $text = $this->mTextFilter->convertXCode($text, $allowimage);
-        
+
         // RaiseEvent : 'MyTextSanitizer.XoopsCodePostFilter'
         //  Delegate may convert output text with quickApplyFilter rule
-        //  Args : 
+        //  Args :
         //      'string'       [I/O] : Text to convert;
         //      'allowimage'   [I]   : xoopsCodeDecode $allowimage parameter
         //
@@ -286,7 +286,7 @@ class MyTextSanitizer
      * @param   bool    $br     convert linebreaks?
      * @return  string
      **/
-    
+
     function _ToShowTarea($text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1) {
         $text = $this->codePreConv($text, $xcode);
         if ($html != 1) $text = $this->htmlSpecialChars($text);
@@ -311,7 +311,7 @@ class MyTextSanitizer
      **/
     function &displayTarea($text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1)
     {
-        $text = $this->_ToShowTarea($text, $html, $smiley, $xcode, $image, $br);
+        $text = $this->mTextFilter->toShowTarea($text, $html, $smiley, $xcode, $image, $br, true);
         return $text;
     }
 
@@ -329,7 +329,7 @@ class MyTextSanitizer
     function &previewTarea($text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1)
     {
         $text =& $this->stripSlashesGPC($text);
-        $text = $this->_ToShowTarea($text, $html, $smiley, $xcode, $image, $br);
+        $text = $this->mTextFilter->toPreviewTarea($text, $html, $smiley, $xcode, $image, $br, true);
         return $text;
     }
 

--- a/html/modules/legacy/kernel/Legacy_TextFilter.class.php
+++ b/html/modules/legacy/kernel/Legacy_TextFilter.class.php
@@ -163,6 +163,23 @@ class Legacy_TextFilter extends XCube_TextFilter
 	}
 
 	/**
+	 * Filters textarea data for preview
+	 *
+	 * @param	string	$text
+	 * @param	bool	$html	allow html?
+	 * @param	bool	$smiley allow smileys?
+	 * @param	bool	$xcode	allow xoopscode?
+	 * @param	bool	$image	allow inline images?
+	 * @param	bool	$br 	convert linebreaks?
+	 * @param	string	$x2comat
+	 * @return	string
+	 **/
+	function toPreviewTarea($text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1, $x2comat=false)
+	{
+		return $this->toShowTarea($text, $html, $smiley, $xcode, $image, $br, $x2comat);
+	}
+
+	/**
 	 * purifyHtml
 	 * 
 	 * @param	string	$html