From 390648a795ac603c7558d808bd742f5f235b0918 Mon Sep 17 00:00:00 2001
From: kmorimatsu <kmorimatsu@1ca29b6e-896d-4ea0-84a5-967f57386b96>
Date: Mon, 18 Dec 2006 20:31:58 +0000
Subject: [PATCH] stripslashes_array() function bug fix

git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/nucleus-jp/trunk@173 1ca29b6e-896d-4ea0-84a5-967f57386b96
---
 euc/nucleus/libs/vars4.0.6.php  | 206 ++++++++++++++++++++--------------------
 euc/nucleus/libs/vars4.1.0.php  | 174 ++++++++++++++++-----------------
 utf8/nucleus/libs/vars4.0.6.php |   6 +-
 utf8/nucleus/libs/vars4.1.0.php |   7 +-
 4 files changed, 196 insertions(+), 197 deletions(-)

diff --git a/euc/nucleus/libs/vars4.0.6.php b/euc/nucleus/libs/vars4.0.6.php
index 45210c7..8169e55 100755
--- a/euc/nucleus/libs/vars4.0.6.php
+++ b/euc/nucleus/libs/vars4.0.6.php
@@ -1,103 +1,103 @@
-<?php
-
-/**
-  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/) 
-  * Copyright (C) 2002-2005 The Nucleus Group
-  *
-  * This program is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU General Public License
-  * as published by the Free Software Foundation; either version 2
-  * of the License, or (at your option) any later version.
-  * (see nucleus/documentation/index.html#license for more info)
-  *
-  * $Id: vars4.0.6.php,v 1.4 2005-03-16 08:10:35 kimitake Exp $
-  * $NucleusJP: vars4.0.6.php,v 1.5 2005/03/12 06:19:05 kimitake Exp $
-  */
-  
-/**
-  * The purpose of the functions below is to avoid declaring HTTP_ vars to be global
-  * everywhere, plus to offer support for php versions before 4.1.0, that do not
-  * have the _GET etc vars
-  */
-function getVar($name) {
-	global $HTTP_GET_VARS;
-	return undoMagic($HTTP_GET_VARS[$name]);
-}
-
-function postVar($name) {
-	global $HTTP_POST_VARS;
-	return undoMagic($HTTP_POST_VARS[$name]);
-}
-
-function cookieVar($name) {	
-	global $HTTP_COOKIE_VARS;
-	return undoMagic($HTTP_COOKIE_VARS[$name]);
-}
-
-// request: either POST or GET
-function requestVar($name) {
-	return (postVar($name)) ? postVar($name) : getVar($name);
-}
-
-function serverVar($name) {
-	global $HTTP_SERVER_VARS;
-	return $HTTP_SERVER_VARS[$name];
-}
-
-// removes magic quotes if that option is enabled
-function undoMagic($data) {
-	return get_magic_quotes_gpc() ? stripslashes_array($data) : $data;
-}
-
-function stripslashes_array($data) {
-	return is_array($data) ? array_map('stripslashes', $data) : stripslashes($data);
-}
-
-// integer array from request
-function requestIntArray($name) {
-	global $HTTP_POST_VARS;
-	return $HTTP_POST_VARS[$name];	
-}
-
-// array from request. Be sure to call undoMagic on the strings inside
-function requestArray($name) {
-	global $HTTP_POST_VARS;
-	return $HTTP_POST_VARS[$name];	
-}
-
-
-// add all the variables from the request as hidden input field
-// @see globalfunctions.php#passVar
-function passRequestVars() {
-	global $HTTP_POST_VARS, $HTTP_GET_VARS;
-	foreach ($HTTP_POST_VARS as $key => $value) {
-		if (($key == 'action') && ($value != requestVar('nextaction')))
-			$key = 'nextaction';
-		// a nextaction of 'showlogin' makes no sense
-		if (($key == 'nextaction') && ($value == 'showlogin'))
-			continue;
-		if (($key != 'login') && ($key != 'password'))
-			passVar($key, $value);
-	}
-	foreach ($HTTP_GET_VARS as $key => $value) {
-		if (($key == 'action') && ($value != requestVar('nextaction')))
-			$key = 'nextaction';
-		// a nextaction of 'showlogin' makes no sense
-		if (($key == 'nextaction') && ($value == 'showlogin'))
-			continue;
-		if (($key != 'login') && ($key != 'password'))
-			passVar($key, $value);
-	}
-}
-
-function postFileInfo($name) {
-	global $HTTP_POST_FILES;
-	return $HTTP_POST_FILES[$name];
-}
-
-function setOldAction($value) {
-	global $HTTP_POST_VARS;
-	$HTTP_POST_VARS['oldaction'] = $value;	
-}
-
-?>
+<?php
+
+/**
+  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/) 
+  * Copyright (C) 2002-2005 The Nucleus Group
+  *
+  * This program is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU General Public License
+  * as published by the Free Software Foundation; either version 2
+  * of the License, or (at your option) any later version.
+  * (see nucleus/documentation/index.html#license for more info)
+  *
+  * $Id: vars4.0.6.php,v 1.5 2006-12-18 20:31:39 kmorimatsu Exp $
+  * $NucleusJP: vars4.0.6.php,v 1.5 2005/03/12 06:19:05 kimitake Exp $
+  */
+  
+/**
+  * The purpose of the functions below is to avoid declaring HTTP_ vars to be global
+  * everywhere, plus to offer support for php versions before 4.1.0, that do not
+  * have the _GET etc vars
+  */
+function getVar($name) {
+	global $HTTP_GET_VARS;
+	return undoMagic($HTTP_GET_VARS[$name]);
+}
+
+function postVar($name) {
+	global $HTTP_POST_VARS;
+	return undoMagic($HTTP_POST_VARS[$name]);
+}
+
+function cookieVar($name) {
+	global $HTTP_COOKIE_VARS;
+	return undoMagic($HTTP_COOKIE_VARS[$name]);
+}
+
+// request: either POST or GET
+function requestVar($name) {
+	return (postVar($name)) ? postVar($name) : getVar($name);
+}
+
+function serverVar($name) {
+	global $HTTP_SERVER_VARS;
+	return $HTTP_SERVER_VARS[$name];
+}
+
+// removes magic quotes if that option is enabled
+function undoMagic($data) {
+	return get_magic_quotes_gpc() ? stripslashes_array($data) : $data;
+}
+
+function stripslashes_array($data) {
+	return is_array($data) ? array_map('stripslashes_array', $data) : stripslashes($data);
+}
+
+// integer array from request
+function requestIntArray($name) {
+	global $HTTP_POST_VARS;
+	return $HTTP_POST_VARS[$name];
+}
+
+// array from request. Be sure to call undoMagic on the strings inside
+function requestArray($name) {
+	global $HTTP_POST_VARS;
+	return $HTTP_POST_VARS[$name];
+}
+
+
+// add all the variables from the request as hidden input field
+// @see globalfunctions.php#passVar
+function passRequestVars() {
+	global $HTTP_POST_VARS, $HTTP_GET_VARS;
+	foreach ($HTTP_POST_VARS as $key => $value) {
+		if (($key == 'action') && ($value != requestVar('nextaction')))
+			$key = 'nextaction';
+		// a nextaction of 'showlogin' makes no sense
+		if (($key == 'nextaction') && ($value == 'showlogin'))
+			continue;
+		if (($key != 'login') && ($key != 'password'))
+			passVar($key, $value);
+	}
+	foreach ($HTTP_GET_VARS as $key => $value) {
+		if (($key == 'action') && ($value != requestVar('nextaction')))
+			$key = 'nextaction';
+		// a nextaction of 'showlogin' makes no sense
+		if (($key == 'nextaction') && ($value == 'showlogin'))
+			continue;
+		if (($key != 'login') && ($key != 'password'))
+			passVar($key, $value);
+	}
+}
+
+function postFileInfo($name) {
+	global $HTTP_POST_FILES;
+	return $HTTP_POST_FILES[$name];
+}
+
+function setOldAction($value) {
+	global $HTTP_POST_VARS;
+	$HTTP_POST_VARS['oldaction'] = $value;
+}
+
+?>
diff --git a/euc/nucleus/libs/vars4.1.0.php b/euc/nucleus/libs/vars4.1.0.php
index f6893fa..6ba8bcb 100755
--- a/euc/nucleus/libs/vars4.1.0.php
+++ b/euc/nucleus/libs/vars4.1.0.php
@@ -1,87 +1,87 @@
-<?php
-
-/**
-  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/) 
-  * Copyright (C) 2002-2005 The Nucleus Group
-  *
-  * This program is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU General Public License
-  * as published by the Free Software Foundation; either version 2
-  * of the License, or (at your option) any later version.
-  * (see nucleus/documentation/index.html#license for more info)
-  *
-  * $Id: vars4.1.0.php,v 1.4 2005-03-16 08:10:35 kimitake Exp $
-  * $NucleusJP: vars4.1.0.php,v 1.5 2005/03/12 06:19:05 kimitake Exp $
-  */
-  
-function getVar($name) {
-	return undoMagic($_GET[$name]);
-}
-
-function postVar($name) {
-	return undoMagic($_POST[$name]);
-}
-
-function cookieVar($name) {	
-	return undoMagic($_COOKIE[$name]);
-}
-
-function requestVar($name) {
-	if(array_key_exists($name,$_REQUEST))
-		return undoMagic($_REQUEST[$name]);
-	elseif( array_key_exists($name,$_GET))   
-		return undoMagic($_GET[$name]);
-	elseif( array_key_exists($name,$_POST))   
-		return undoMagic($_POST[$name]);
-	else
-		return;
-}
-
-function serverVar($name) {
-	return $_SERVER[$name];
-}
-
-// removes magic quotes if that option is enabled
-function undoMagic($data) {
-	return get_magic_quotes_gpc() ? stripslashes_array($data) : $data;
-}
-
-function stripslashes_array($data) {
-	return is_array($data) ? array_map('stripslashes', $data) : stripslashes($data);
-}
-
-// integer array from request
-function requestIntArray($name) {
-	return $_REQUEST[$name];	
-}
-
-// array from request. Be sure to call undoMagic on the strings inside
-function requestArray($name) {
-	return $_REQUEST[$name];	
-}
-
-// add all the variables from the request as hidden input field
-// @see globalfunctions.php#passVar
-function passRequestVars() {
-	foreach ($_REQUEST as $key => $value) {
-		if (($key == 'action') && ($value != requestVar('nextaction')))
-			$key = 'nextaction';
-			
-		// a nextaction of 'showlogin' makes no sense
-		if (($key == 'nextaction') && ($value == 'showlogin'))
-			continue;
-			
-		if (($key != 'login') && ($key != 'password'))
-			passVar($key, $value);
-	}
-}
-
-function postFileInfo($name) {
-	return $_FILES[$name];
-}
-
-function setOldAction($value) {
-	$_POST['oldaction'] = $value;	
-}
-
-?>
+<?php
+
+/**
+  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/) 
+  * Copyright (C) 2002-2005 The Nucleus Group
+  *
+  * This program is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU General Public License
+  * as published by the Free Software Foundation; either version 2
+  * of the License, or (at your option) any later version.
+  * (see nucleus/documentation/index.html#license for more info)
+  *
+  * $Id: vars4.1.0.php,v 1.5 2006-12-18 20:31:58 kmorimatsu Exp $
+  * $NucleusJP: vars4.1.0.php,v 1.5 2005/03/12 06:19:05 kimitake Exp $
+  */
+  
+function getVar($name) {
+	return undoMagic($_GET[$name]);
+}
+
+function postVar($name) {
+	return undoMagic($_POST[$name]);
+}
+
+function cookieVar($name) {
+	return undoMagic($_COOKIE[$name]);
+}
+
+function requestVar($name) {
+	if(array_key_exists($name,$_REQUEST))
+		return undoMagic($_REQUEST[$name]);
+	elseif( array_key_exists($name,$_GET))   
+		return undoMagic($_GET[$name]);
+	elseif( array_key_exists($name,$_POST))   
+		return undoMagic($_POST[$name]);
+	else
+		return;
+}
+
+function serverVar($name) {
+	return $_SERVER[$name];
+}
+
+// removes magic quotes if that option is enabled
+function undoMagic($data) {
+	return get_magic_quotes_gpc() ? stripslashes_array($data) : $data;
+}
+
+function stripslashes_array($data) {
+	return is_array($data) ? array_map('stripslashes_array', $data) : stripslashes($data);
+}
+
+// integer array from request
+function requestIntArray($name) {
+	return $_REQUEST[$name];
+}
+
+// array from request. Be sure to call undoMagic on the strings inside
+function requestArray($name) {
+	return $_REQUEST[$name];
+}
+
+// add all the variables from the request as hidden input field
+// @see globalfunctions.php#passVar
+function passRequestVars() {
+	foreach ($_REQUEST as $key => $value) {
+		if (($key == 'action') && ($value != requestVar('nextaction')))
+			$key = 'nextaction';
+
+		// a nextaction of 'showlogin' makes no sense
+		if (($key == 'nextaction') && ($value == 'showlogin'))
+			continue;
+
+		if (($key != 'login') && ($key != 'password'))
+			passVar($key, $value);
+	}
+}
+
+function postFileInfo($name) {
+	return $_FILES[$name];
+}
+
+function setOldAction($value) {
+	$_POST['oldaction'] = $value;
+}
+
+?>
diff --git a/utf8/nucleus/libs/vars4.0.6.php b/utf8/nucleus/libs/vars4.0.6.php
index f6250da..8a2fb69 100755
--- a/utf8/nucleus/libs/vars4.0.6.php
+++ b/utf8/nucleus/libs/vars4.0.6.php
@@ -13,8 +13,8 @@
 /**
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2006 The Nucleus Group
- * @version $Id: vars4.0.6.php,v 1.8 2006-07-20 08:01:52 kimitake Exp $
- * @version $NucleusJP: vars4.0.6.php,v 1.7 2006/07/12 07:11:47 kimitake Exp $
+ * @version $Id: vars4.0.6.php,v 1.9 2006-12-18 20:30:48 kmorimatsu Exp $
+ * @version $NucleusJP: vars4.0.6.php,v 1.8 2006/07/20 08:01:52 kimitake Exp $
  */
 
 /**
@@ -78,7 +78,7 @@ function undoMagic($data) {
 }
 
 function stripslashes_array($data) {
-	return is_array($data) ? array_map('stripslashes', $data) : stripslashes($data);
+	return is_array($data) ? array_map('stripslashes_array', $data) : stripslashes($data);
 }
 
 function undoSybaseQuotes_array($data) {
diff --git a/utf8/nucleus/libs/vars4.1.0.php b/utf8/nucleus/libs/vars4.1.0.php
index 7b0aa8d..8a01799 100755
--- a/utf8/nucleus/libs/vars4.1.0.php
+++ b/utf8/nucleus/libs/vars4.1.0.php
@@ -13,8 +13,8 @@
 /**
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2006 The Nucleus Group
- * @version $Id: vars4.1.0.php,v 1.8 2006-07-20 08:01:52 kimitake Exp $
- * @version $NucleusJP: vars4.1.0.php,v 1.7 2006/07/12 07:11:47 kimitake Exp $
+ * @version $Id: vars4.1.0.php,v 1.9 2006-12-18 20:31:08 kmorimatsu Exp $
+ * @version $NucleusJP: vars4.1.0.php,v 1.8 2006/07/20 08:01:52 kimitake Exp $
  */
 
 function getVar($name) {
@@ -71,7 +71,7 @@ function undoMagic($data) {
 }
 
 function stripslashes_array($data) {
-	return is_array($data) ? array_map('stripslashes', $data) : stripslashes($data);
+	return is_array($data) ? array_map('stripslashes_array', $data) : stripslashes($data);
 }
 
 function undoSybaseQuotes_array($data) {
@@ -128,5 +128,4 @@ function setOldAction($value) {
 	$_POST['oldaction'] = $value;
 }
 
-
 ?>
-- 
2.11.0