From 72b140dc9804f159c2bee65832bbe105db329c5d Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 26 Feb 2010 06:43:19 -0500
Subject: [PATCH] - Support arrays in get_input_value() (#1486277)
---
program/include/main.inc | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/program/include/main.inc b/program/include/main.inc
index f81e95b..2076148 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -596,7 +596,6 @@
*/
function get_input_value($fname, $source, $allow_html=FALSE, $charset=NULL)
{
- global $OUTPUT;
$value = NULL;
if ($source==RCUBE_INPUT_GET && isset($_GET[$fname]))
@@ -613,8 +612,30 @@
$value = $_COOKIE[$fname];
}
+ return parse_input_value($value, $allow_html, $charset);
+}
+
+/**
+ * Parse/validate input value. See get_input_value()
+ * Performs stripslashes() and charset conversion if necessary
+ *
+ * @param string Input value
+ * @param boolean Allow HTML tags in field value
+ * @param string Charset to convert into
+ * @return string Parsed value
+ */
+function parse_input_value($value, $allow_html=FALSE, $charset=NULL)
+{
+ global $OUTPUT;
+
if (empty($value))
return $value;
+
+ if (is_array($value)) {
+ foreach ($value as $idx => $val)
+ $value[$idx] = parse_input_value($val, $allow_html, $charset);
+ return $value;
+ }
// strip single quotes if magic_quotes_sybase is enabled
if (ini_get('magic_quotes_sybase'))
@@ -628,7 +649,7 @@
$value = strip_tags($value);
// convert to internal charset
- if (is_object($OUTPUT))
+ if (is_object($OUTPUT) && $charset)
return rcube_charset_convert($value, $OUTPUT->get_charset(), $charset);
else
return $value;
--
Gitblit v1.9.1