XOOPS

[xoops-cvslog 3114] CVS update: xoops2jp/html/install/class

onokazu onoka****@users*****
2006年 5月 21日 (日) 12:32:07 JST

• 前の記事 [xoops-cvslog 3113] CVS update: xoops2jp/html/modules/base/admin/templates
• 次の記事 [xoops-cvslog 3115] CVS update: xoops2jp/html/modules/base/admin/class
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Index: xoops2jp/html/install/class/settingmanager.php
diff -u xoops2jp/html/install/class/settingmanager.php:1.2 xoops2jp/html/install/class/settingmanager.php:1.2.16.1
--- xoops2jp/html/install/class/settingmanager.php:1.2	Fri Mar 18 21:52:14 2005
+++ xoops2jp/html/install/class/settingmanager.php	Sun May 21 12:32:07 2006
@@ -29,7 +29,7 @@
 * setting manager for XOOPS installer
 *
 * @author Haruki Setoyama  <haruk****@plane*****>
-* @version $Id: settingmanager.php,v 1.2 2005/03/18 12:52:14 onokazu Exp $
+* @version $Id: settingmanager.php,v 1.2.16.1 2006/05/21 03:32:07 onokazu Exp $
 * @access public
 **/
 class setting_manager {
@@ -72,7 +72,7 @@
             if ( substr($filepath, -1) == "/" ) {
                 $filepath = substr($filepath, 0, -1);
             }
-            $protocol = ($_SERVER['HTTPS'] == 'on') ? 'https://' : 'http://';
+            $protocol = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https://' : 'http://';
             $this->xoops_url = (!empty($filepath)) ? $protocol.$_SERVER['HTTP_HOST']."/".$filepath : $protocol.$_SERVER['HTTP_HOST'];
         }
     }
@@ -268,7 +268,7 @@
 
     function getDBList()
     {
-		return array('mysql');
+        return array('mysql');
         //$dirname = '../class/database/';
         //$dirlist = array();
         //if (is_dir($dirname) && $handle = opendir($dirname)) {
Index: xoops2jp/html/install/class/textsanitizer.php
diff -u xoops2jp/html/install/class/textsanitizer.php:1.2 xoops2jp/html/install/class/textsanitizer.php:1.2.16.1
--- xoops2jp/html/install/class/textsanitizer.php:1.2	Fri Mar 18 21:52:14 2005
+++ xoops2jp/html/install/class/textsanitizer.php	Sun May 21 12:32:07 2006
@@ -1,5 +1,5 @@
 <?php
-// $Id: textsanitizer.php,v 1.2 2005/03/18 12:52:14 onokazu Exp $
+// $Id: textsanitizer.php,v 1.2.16.1 2006/05/21 03:32:07 onokazu Exp $
 //  ------------------------------------------------------------------------ //
 //                XOOPS - PHP Content Management System                      //
 //                    Copyright (c) 2000 XOOPS.org                           //
@@ -34,227 +34,232 @@
 class TextSanitizer
 {
 
-	/*
-	* Constructor of this class
-	* Gets allowed html tags from admin config settings
-	* <br> should not be allowed since nl2br will be used
-	* when storing data
-	*/
-	function TextSanitizer()
-	{
-
-	}
-
-	function &getInstance()
-	{
-		static $instance;
-		if (!isset($instance)) {
-			$instance = new TextSanitizer();
-		}
-		return $instance;
-	}
-
-	function &makeClickable(&$text)
-	{
-		$patterns = array("/([^]_a-z0-9-=\"'\/])([a-z]+?):\/\/([^, \r\n\"\(\)'<>]+)/i", "/([^]_a-z0-9-=\"'\/])www\.([a-z0-9\-]+)\.([^, \r\n\"\(\)'<>]+)/i", "/([^]_a-z0-9-=\"'\/])([a-z0-9\-_.]+?)@([^, \r\n\"\(\)'<>]+)/i");
-		$replacements = array("\\1<a href=\"\\2://\\3\" target=\"_blank\">\\2://\\3</a>", "\\1<a href=\"http://www.\\2.\\3\" target=\"_blank\">www.\\2.\\3</a>", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>");
-		return preg_replace($patterns, $replacements, $text);
-	}
-
-	function &nl2Br($text)
-	{
-		return preg_replace("/(\015\012)|(\015)|(\012)/","<br />",$text);
-	}
-
-	function &addSlashes($text, $force=false)
-	{
-		if ($force) {
-			return addslashes($text);
-		}
-		if (!get_magic_quotes_gpc()) {
-			$text =& addslashes($text);
-		}
-		return $text;
-	}
-
-	/*
-	* if magic_quotes_gpc is on, stirip back slashes
-	*/
-	function &stripSlashesGPC($text)
-	{
-		if (get_magic_quotes_gpc()) {
-			$text =& stripslashes($text);
-		}
-		return $text;
-	}
-
-	/*
-	*  for displaying data in html textbox forms
-	*/
-	function &htmlSpecialChars($text)
-	{
-		return preg_replace("/&amp;/i", '&', htmlspecialchars($text, ENT_QUOTES));
-	}
-
-	function &undoHtmlSpecialChars(&$text)
-	{
-		return preg_replace(array("/&gt;/i", "/&lt;/i", "/&quot;/i", "/&#039;/i"), array(">", "<", "\"", "'"), $text);
-	}
-
-	/*
-	*  Filters textarea form data in DB for display
-	*/
-	function &displayText($text, $html=false)
-	{
-		if (! $html) {
-			// html not allowed
-			$text =& $this->htmlSpecialChars($text);
-		}
-		$text =& $this->makeClickable($text);
-		$text =& $this->nl2Br($text);
-		return $text;
-	}
-
-	/*
-	*  Filters textarea form data submitted for preview
-	*/
-	function &previewText($text, $html=false)
-	{
-		$text =& $this->stripSlashesGPC($text);
-		return $this->displayText($text, $html);
-	}
+    /*
+    * Constructor of this class
+    * Gets allowed html tags from admin config settings
+    * <br> should not be allowed since nl2br will be used
+    * when storing data
+    */
+    function TextSanitizer()
+    {
+
+    }
+
+    function &getInstance()
+    {
+        static $instance;
+        if (!isset($instance)) {
+            $instance = new TextSanitizer();
+        }
+        return $instance;
+    }
+
+    function &makeClickable(&$text)
+    {
+        $patterns = array("/([^]_a-z0-9-=\"'\/])([a-z]+?):\/\/([^, \r\n\"\(\)'<>]+)/i", "/([^]_a-z0-9-=\"'\/])www\.([a-z0-9\-]+)\.([^, \r\n\"\(\)'<>]+)/i", "/([^]_a-z0-9-=\"'\/])([a-z0-9\-_.]+?)@([^, \r\n\"\(\)'<>]+)/i");
+        $replacements = array("\\1<a href=\"\\2://\\3\" target=\"_blank\">\\2://\\3</a>", "\\1<a href=\"http://www.\\2.\\3\" target=\"_blank\">www.\\2.\\3</a>", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>");
+        $ret = preg_replace($patterns, $replacements, $text);
+        return $ret;
+    }
+
+    function &nl2Br($text)
+    {
+        $ret = preg_replace("/(\015\012)|(\015)|(\012)/","<br />",$text);
+        return $ret;
+    }
+
+    function &addSlashes($text, $force=false)
+    {
+        if ($force) {
+            return addslashes($text);
+        }
+        if (!get_magic_quotes_gpc()) {
+            $text =& addslashes($text);
+        }
+        return $text;
+    }
+
+    /*
+    * if magic_quotes_gpc is on, stirip back slashes
+    */
+    function &stripSlashesGPC($text)
+    {
+        if (get_magic_quotes_gpc()) {
+            $text =& stripslashes($text);
+        }
+        return $text;
+    }
+
+    /*
+    *  for displaying data in html textbox forms
+    */
+    function &htmlSpecialChars($text)
+    {
+        $ret = preg_replace("/&amp;/i", '&', htmlspecialchars($text, ENT_QUOTES));
+        return $ret;
+    }
+
+    function &undoHtmlSpecialChars(&$text)
+    {
+        $ret = preg_replace(array("/&gt;/i", "/&lt;/i", "/&quot;/i", "/&#039;/i"), array(">", "<", "\"", "'"), $text);
+        return $ret;
+    }
+
+    /*
+    *  Filters textarea form data in DB for display
+    */
+    function &displayText($text, $html=false)
+    {
+        if (! $html) {
+            // html not allowed
+            $text =& $this->htmlSpecialChars($text);
+        }
+        $text =& $this->makeClickable($text);
+        $text =& $this->nl2Br($text);
+        return $text;
+    }
+
+    /*
+    *  Filters textarea form data submitted for preview
+    */
+    function &previewText($text, $html=false)
+    {
+        $text =& $this->stripSlashesGPC($text);
+        $ret = $this->displayText($text, $html);
+        return $ret;
+    }
 
 ##################### Deprecated Methods ######################
 
-	function sanitizeForDisplay($text, $allowhtml = 0, $smiley = 1, $bbcode = 1)
-	{
-		if ( $allowhtml == 0 ) {
-			$text = $this->htmlSpecialChars($text);
-		} else {
-			//$config =& $GLOBALS['xoopsConfig'];
-			//$allowed = $config['allowed_html'];
-			//$text = strip_tags($text, $allowed);
-			$text = $this->makeClickable($text);
-		}
-		if ( $smiley == 1 ) {
-			$text = $this->smiley($text);
-		}
-		if ( $bbcode == 1 ) {
-			$text = $this->xoopsCodeDecode($text);
-		}
-		$text = $this->nl2Br($text);
-		return $text;
-	}
-
-	function sanitizeForPreview($text, $allowhtml = 0, $smiley = 1, $bbcode = 1)
-	{
-		$text = $this->oopsStripSlashesGPC($text);
-		if ( $allowhtml == 0 ) {
-			$text = $this->htmlSpecialChars($text);
-		} else {
-			//$config =& $GLOBALS['xoopsConfig'];
-			//$allowed = $config['allowed_html'];
-			//$text = strip_tags($text, $allowed);
-			$text = $this->makeClickable($text);
-		}
-		if ( $smiley == 1 ) {
-			$text = $this->smiley($text);
-		}
-		if ( $bbcode == 1 ) {
-			$text = $this->xoopsCodeDecode($text);
-		}
-		$text = $this->nl2Br($text);
-		return $text;
-	}
-
-	function makeTboxData4Save($text)
-	{
-		//$text = $this->undoHtmlSpecialChars($text);
-		return $this->addSlashes($text);
-	}
-
-	function makeTboxData4Show($text, $smiley=0)
-	{
-		$text = $this->htmlSpecialChars($text);
-		return $text;
-	}
-
-	function makeTboxData4Edit($text)
-	{
-		return $this->htmlSpecialChars($text);
-	}
-
-	function makeTboxData4Preview($text, $smiley=0)
-	{
-		$text = $this->stripSlashesGPC($text);
-		$text = $this->htmlSpecialChars($text);
-		return $text;
-	}
-
-	function makeTboxData4PreviewInForm($text)
-	{
-		$text = $this->stripSlashesGPC($text);
-		return $this->htmlSpecialChars($text);
-	}
-
-	function makeTareaData4Save($text)
-	{
-		return $this->addSlashes($text);
-	}
-
-	function &makeTareaData4Show(&$text, $html=1, $smiley=1, $xcode=1)
-	{
-		return $this->displayTarea($text, $html, $smiley, $xcode);
-	}
-
-	function makeTareaData4Edit($text)
-	{
-		return htmlSpecialChars($text, ENT_QUOTES);
-	}
-
-	function &makeTareaData4Preview(&$text, $html=1, $smiley=1, $xcode=1)
-	{
-		return $this->previewTarea($text, $html, $smiley, $xcode);
-	}
-
-	function makeTareaData4PreviewInForm($text)
-	{
-		//if magic_quotes_gpc is on, do stipslashes
-		$text = $this->stripSlashesGPC($text);
-		return htmlSpecialChars($text, ENT_QUOTES);
-	}
-
-	function makeTareaData4InsideQuotes($text)
-	{
-		return $this->htmlSpecialChars($text);
-	}
-
-	function &oopsStripSlashesGPC($text)
-	{
-		return $this->stripSlashesGPC($text);
-	}
-
-	function &oopsStripSlashesRT($text)
-	{
-		if (get_magic_quotes_runtime()) {
-			$text =& stripslashes($text);
-		}
-		return $text;
-	}
-
-	function &oopsAddSlashes($text)
-	{
-		return $this->addSlashes($text);
-	}
-
-	function &oopsHtmlSpecialChars($text)
-	{
-		return $this->htmlSpecialChars($text);
-	}
-
-	function &oopsNl2Br($text)
-	{
-		return $this->nl2br($text);
-	}
+    function sanitizeForDisplay($text, $allowhtml = 0, $smiley = 1, $bbcode = 1)
+    {
+        if ( $allowhtml == 0 ) {
+            $text = $this->htmlSpecialChars($text);
+        } else {
+            //$config =& $GLOBALS['xoopsConfig'];
+            //$allowed = $config['allowed_html'];
+            //$text = strip_tags($text, $allowed);
+            $text = $this->makeClickable($text);
+        }
+        if ( $smiley == 1 ) {
+            $text = $this->smiley($text);
+        }
+        if ( $bbcode == 1 ) {
+            $text = $this->xoopsCodeDecode($text);
+        }
+        $text = $this->nl2Br($text);
+        return $text;
+    }
+
+    function sanitizeForPreview($text, $allowhtml = 0, $smiley = 1, $bbcode = 1)
+    {
+        $text = $this->oopsStripSlashesGPC($text);
+        if ( $allowhtml == 0 ) {
+            $text = $this->htmlSpecialChars($text);
+        } else {
+            //$config =& $GLOBALS['xoopsConfig'];
+            //$allowed = $config['allowed_html'];
+            //$text = strip_tags($text, $allowed);
+            $text = $this->makeClickable($text);
+        }
+        if ( $smiley == 1 ) {
+            $text = $this->smiley($text);
+        }
+        if ( $bbcode == 1 ) {
+            $text = $this->xoopsCodeDecode($text);
+        }
+        $text = $this->nl2Br($text);
+        return $text;
+    }
+
+    function makeTboxData4Save($text)
+    {
+        //$text = $this->undoHtmlSpecialChars($text);
+        return $this->addSlashes($text);
+    }
+
+    function makeTboxData4Show($text, $smiley=0)
+    {
+        $text = $this->htmlSpecialChars($text);
+        return $text;
+    }
+
+    function makeTboxData4Edit($text)
+    {
+        return $this->htmlSpecialChars($text);
+    }
+
+    function makeTboxData4Preview($text, $smiley=0)
+    {
+        $text = $this->stripSlashesGPC($text);
+        $text = $this->htmlSpecialChars($text);
+        return $text;
+    }
+
+    function makeTboxData4PreviewInForm($text)
+    {
+        $text = $this->stripSlashesGPC($text);
+        return $this->htmlSpecialChars($text);
+    }
+
+    function makeTareaData4Save($text)
+    {
+        return $this->addSlashes($text);
+    }
+
+    function &makeTareaData4Show(&$text, $html=1, $smiley=1, $xcode=1)
+    {
+        return $this->displayTarea($text, $html, $smiley, $xcode);
+    }
+
+    function makeTareaData4Edit($text)
+    {
+        return htmlSpecialChars($text, ENT_QUOTES);
+    }
+
+    function &makeTareaData4Preview(&$text, $html=1, $smiley=1, $xcode=1)
+    {
+        return $this->previewTarea($text, $html, $smiley, $xcode);
+    }
+
+    function makeTareaData4PreviewInForm($text)
+    {
+        //if magic_quotes_gpc is on, do stipslashes
+        $text = $this->stripSlashesGPC($text);
+        return htmlSpecialChars($text, ENT_QUOTES);
+    }
+
+    function makeTareaData4InsideQuotes($text)
+    {
+        return $this->htmlSpecialChars($text);
+    }
+
+    function &oopsStripSlashesGPC($text)
+    {
+        return $this->stripSlashesGPC($text);
+    }
+
+    function &oopsStripSlashesRT($text)
+    {
+        if (get_magic_quotes_runtime()) {
+            $text =& stripslashes($text);
+        }
+        return $text;
+    }
+
+    function &oopsAddSlashes($text)
+    {
+        return $this->addSlashes($text);
+    }
+
+    function &oopsHtmlSpecialChars($text)
+    {
+        return $this->htmlSpecialChars($text);
+    }
+
+    function &oopsNl2Br($text)
+    {
+        return $this->nl2br($text);
+    }
 }
 ?>
\ No newline at end of file

• 前の記事 [xoops-cvslog 3113] CVS update: xoops2jp/html/modules/base/admin/templates
• 次の記事 [xoops-cvslog 3115] CVS update: xoops2jp/html/modules/base/admin/class
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]