NobuNobu
nobun****@users*****
2006年 9月 25日 (月) 00:19:43 JST
Index: xoops2jp/html/class/module.textsanitizer.php
diff -u xoops2jp/html/class/module.textsanitizer.php:1.2.8.8 xoops2jp/html/class/module.textsanitizer.php:1.2.8.9
--- xoops2jp/html/class/module.textsanitizer.php:1.2.8.8 Sun Aug 13 14:33:02 2006
+++ xoops2jp/html/class/module.textsanitizer.php Mon Sep 25 00:19:42 2006
@@ -1,5 +1,5 @@
<?php
-// $Id: module.textsanitizer.php,v 1.2.8.8 2006/08/13 05:33:02 minahito Exp $
+// $Id: module.textsanitizer.php,v 1.2.8.9 2006/09/24 15:19:42 nobunobu Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -139,14 +139,14 @@
if (count($this->smileys) == 0) {
if ($getsmiles = $db->query("SELECT * FROM ".$db->prefix("smiles"))){
while ($smiles = $db->fetchArray($getsmiles)) {
- $message =& str_replace($smiles['code'], '<img src="'.XOOPS_UPLOAD_URL.'/'.htmlspecialchars($smiles['smile_url']).'" alt="" />', $message);
+ $message = str_replace($smiles['code'], '<img src="'.XOOPS_UPLOAD_URL.'/'.htmlspecialchars($smiles['smile_url']).'" alt="" />', $message);
array_push($this->smileys, $smiles);
}
}
}
elseif (is_array($this->smileys)) {
foreach ($this->smileys as $smile) {
- $message =& str_replace($smile['code'], '<img src="'.XOOPS_UPLOAD_URL.'/'.htmlspecialchars($smile['smile_url']).'" alt="" />', $message);
+ $message = str_replace($smile['code'], '<img src="'.XOOPS_UPLOAD_URL.'/'.htmlspecialchars($smile['smile_url']).'" alt="" />', $message);
}
}
return $message;
@@ -326,7 +326,7 @@
function &addSlashes($text)
{
if (!get_magic_quotes_gpc()) {
- $text =& addslashes($text);
+ $text = addslashes($text);
}
return $text;
}
@@ -387,7 +387,7 @@
// html not allowed
$text =& $this->htmlSpecialChars($text);
}
- $text =& $this->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18)
+ $text = $this->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18)
$text =& $this->makeClickable($text);
if ($smiley != 0) {
// process smiley
@@ -398,15 +398,15 @@
if ($image != 0) {
// image allowed
$text =& $this->xoopsCodeDecode($text);
- } else {
- // image not allowed
+ } else {
+ // image not allowed
$text =& $this->xoopsCodeDecode($text, 0);
}
}
if ($br != 0) {
$text =& $this->nl2Br($text);
}
- $text =& $this->codeConv($text, $xcode, $image); // Ryuji_edit(2003-11-18)
+ $text = $this->codeConv($text, $xcode, $image); // Ryuji_edit(2003-11-18)
return $text;
}
@@ -428,7 +428,7 @@
// html not allowed
$text =& $this->htmlSpecialChars($text);
}
- $text =& $this->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18)
+ $text = $this->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18)
$text =& $this->makeClickable($text);
if ($smiley != 0) {
// process smiley
@@ -447,7 +447,7 @@
if ($br != 0) {
$text =& $this->nl2Br($text);
}
- $text =& $this->codeConv($text, $xcode, $image); // Ryuji_edit(2003-11-18)
+ $text = $this->codeConv($text, $xcode, $image); // Ryuji_edit(2003-11-18)
return $text;
}
@@ -615,7 +615,8 @@
function &makeTareaData4Show(&$text, $html=1, $smiley=1, $xcode=1)
{
- return $this->displayTarea($text, $html, $smiley, $xcode);
+ $ret = $this->displayTarea($text, $html, $smiley, $xcode);
+ return $ret;
}
function makeTareaData4Edit($text)
@@ -625,7 +626,8 @@
function &makeTareaData4Preview(&$text, $html=1, $smiley=1, $xcode=1)
{
- return $this->previewTarea($text, $html, $smiley, $xcode);
+ $ret = $this->previewTarea($text, $html, $smiley, $xcode);
+ return $ret;
}
function makeTareaData4PreviewInForm($text)
@@ -642,7 +644,8 @@
function &oopsStripSlashesGPC($text)
{
- return $this->stripSlashesGPC($text);
+ $ret = $this->stripSlashesGPC($text);
+ return $ret;
}
function &oopsStripSlashesRT($text)
@@ -655,17 +658,20 @@
function &oopsAddSlashes($text)
{
- return $this->addSlashes($text);
+ $ret = $this->addSlashes($text);
+ return $ret;
}
function &oopsHtmlSpecialChars($text)
{
- return $this->htmlSpecialChars($text);
+ $ret = $this->htmlSpecialChars($text);
+ return $ret;
}
function &oopsNl2Br($text)
{
- return $this->nl2br($text);
+ $ret = $this->nl2br($text);
+ return $ret;
}
/**#@-*/
}