xoops-cvs2

[<ok...@us...>]

Update of /cvsroot/xoops/xoops2/class
In directory sc8-pr-cvs1:/tmp/cvs-serv4324/class

Modified Files:
	module.textsanitizer.php 
Log Message:


Index: module.textsanitizer.php
===================================================================
RCS file: /cvsroot/xoops/xoops2/class/module.textsanitizer.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** module.textsanitizer.php	2 Jan 2003 15:15:21 -0000	1.1
--- module.textsanitizer.php	5 Jan 2003 14:21:38 -0000	1.2
***************
*** 85,89 ****
  	}
  
! 	function &xoopsCodeDecode(&$text, $allowimage=1)
  	{
  		$patterns = array();
--- 85,89 ----
  	}
  
! 	function &xoopsCodeDecode(&$text, $allowimage = 1)
  	{
  		$patterns = array();
***************
*** 141,145 ****
  	}
  
! 	function &addSlashes($text, $force=false)
  	{
  		if ($force) {
--- 141,145 ----
  	}
  
! 	function &addSlashes($text, $force = false)
  	{
  		if ($force) {
***************
*** 178,182 ****
  	*  Filters textarea form data in DB for display
  	*/
! 	function &displayTarea(&$text, $html=0, $smiley=1, $xcode=1, $image=1)
  	{
  		if ($html != 1) {
--- 178,182 ----
  	*  Filters textarea form data in DB for display
  	*/
! 	function &displayTarea(&$text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1)
  	{
  		if ($html != 1) {
***************
*** 188,193 ****
  			// process smiley
  			$text =& $this->smiley($text);
!         	}
! 
  		if ($xcode != 0) {
  			// decode xcode
--- 188,192 ----
  			// process smiley
  			$text =& $this->smiley($text);
! 		}
  		if ($xcode != 0) {
  			// decode xcode
***************
*** 200,204 ****
  			}
  		}
! 		$text =& $this->nl2Br($text);
  		return $text;
  	}
--- 199,205 ----
  			}
  		}
! 		if ($br != 0) {
! 			$text =& $this->nl2Br($text);
! 		}
  		return $text;
  	}
***************
*** 207,211 ****
  	*  Filters textarea form data submitted for preview
  	*/
! 	function &previewTarea(&$text, $html=0, $smiley=1, $xcode=1, $image=1)
  	{
  		$text =& $this->stripSlashesGPC($text);
--- 208,212 ----
  	*  Filters textarea form data submitted for preview
  	*/
! 	function &previewTarea(&$text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1)
  	{
  		$text =& $this->stripSlashesGPC($text);
***************
*** 229,233 ****
  			}
  		}
! 		$text =& $this->nl2Br($text);
  		return $text;
  	}
--- 230,236 ----
  			}
  		}
! 		if ($br != 0) {
! 			$text =& $this->nl2Br($text);
! 		}
  		return $text;
  	}