merge from utf-8

[nucleus-jp/nucleus-jp-ancient.git] / euc / nucleus / libs / vars4.1.0.php

diff --git a/euc/nucleus/libs/vars4.1.0.php b/euc/nucleus/libs/vars4.1.0.php
index ca3051e..22b2934 100755 (executable)
--- a/euc/nucleus/libs/vars4.1.0.php
+++ b/euc/nucleus/libs/vars4.1.0.php
@@ -1,62 +1,113 @@
 <?php
 
+/*
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
+ * Copyright (C) 2002-2007 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)
+ */
 /**
-  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/) 
-  * Copyright (C) 2002-2004 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.1.1.1 2005-02-28 07:14:14 kimitake Exp $
-  */
-  
+ * @license http://nucleuscms.org/license.txt GNU General Public License
+ * @copyright Copyright (C) 2002-2007 The Nucleus Group
+ * @version $Id: vars4.1.0.php,v 1.6.2.1 2008-01-29 07:05:06 kimitake Exp $
+ * @version $NucleusJP: vars4.1.0.php,v 1.10.2.2 2007/10/30 19:01:33 kmorimatsu Exp $
+ */
+
+
+// Remove $_COOKIE keys in $_REQUEST
+// This is for maintaining the compatibility with PHP 4.0.6
+// and also for avoiding bugs of plugins due to cookie keys
+if (isset($_REQUEST) and isset($_COOKIE)) {
+       foreach($_COOKIE as $key=>$value) {
+               if (isset($_REQUEST[$key])) unset($_REQUEST[$key]);
+       }
+}
+
 function getVar($name) {
+       if (!isset($_GET[$name])) {
+               return;
+       }
+
        return undoMagic($_GET[$name]);
 }
 
 function postVar($name) {
+       if (!isset($_POST[$name])) {
+               return;
+       }
+
        return undoMagic($_POST[$name]);
 }
 
-function cookieVar($name) {    
+function cookieVar($name) {
+       if (!isset($_COOKIE[$name])) {
+               return;
+       }
+
        return undoMagic($_COOKIE[$name]);
 }
 
 function requestVar($name) {
        if(array_key_exists($name,$_REQUEST))
                return undoMagic($_REQUEST[$name]);
-       elseif( array_key_exists($name,$_GET))   
+       elseif( array_key_exists($name,$_GET))
                return undoMagic($_GET[$name]);
-       elseif( array_key_exists($name,$_POST))   
+       elseif( array_key_exists($name,$_POST))
                return undoMagic($_POST[$name]);
        else
                return;
 }
 
 function serverVar($name) {
+       if (!isset($_SERVER[$name])) {
+               return false;
+       }
+
        return $_SERVER[$name];
 }
 
 // removes magic quotes if that option is enabled
 function undoMagic($data) {
-       return get_magic_quotes_gpc() ? stripslashes_array($data) : $data;
+       if (!get_magic_quotes_gpc())
+               return $data;
+       if (ini_get('magic_quotes_sybase') != 1)
+               return stripslashes_array($data);
+       else
+               return undoSybaseQuotes_array($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) {
+       return is_array($data) ? array_map('undoSybaseQuotes', $data) : stripslashes($data);
+}
+
+function undoSybaseQuotes($data) {
+       return str_replace("''", "'", $data);
 }
 
 // integer array from request
 function requestIntArray($name) {
-       return $_REQUEST[$name];        
+       if (!isset($_REQUEST[$name])) {
+               return;
+       }
+
+       return $_REQUEST[$name];
 }
 
 // array from request. Be sure to call undoMagic on the strings inside
 function requestArray($name) {
-       return $_REQUEST[$name];        
+       if (!isset($_REQUEST[$name])) {
+               return;
+       }
+
+       return $_REQUEST[$name];
 }
 
 // add all the variables from the request as hidden input field
@@ -65,22 +116,27 @@ 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) {
+       if (!isset($_FILES[$name])) {
+               return;
+       }
+
        return $_FILES[$name];
 }
 
 function setOldAction($value) {
-       $_POST['oldaction'] = $value;   
+       $_POST['oldaction'] = $value;
 }
 
+
 ?>
\ No newline at end of file