From ca5e787452d0a32c34e0df2247d1263d92bb55b2 Mon Sep 17 00:00:00 2001 From: Jean Paul Galea Date: Tue, 21 Jul 2015 21:38:37 +0000 Subject: [PATCH] Refactor. --- ykval-common.php | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/ykval-common.php b/ykval-common.php index b2340e9..a494af2 100644 --- a/ykval-common.php +++ b/ykval-common.php @@ -53,16 +53,25 @@ function logdie ($logger, $str) die($str . "\n"); } -function getHttpVal($key, $defaultVal) { - $val = $defaultVal; - if (array_key_exists($key, $_GET)) { +function getHttpVal ($key, $default) +{ + if (array_key_exists($key, $_GET)) + { $val = $_GET[$key]; - } else if (array_key_exists($key, $_POST)) { - $val = $_POST[$key]; - } - $v = trim($val); - $v = str_replace('\\', "", $v); - return $v; + } + elseif (array_key_exists($key, $_POST)) + { + $val = $_POST[$key]; + } + else + { + $val = $default; + } + + $val = trim($val); + $val = str_replace('\\', '', $val); + + return $val; } function log_format() {