From eb2e78a12505b8d41e0ef62cb1b321cdc540e5fd Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Sun, 10 Dec 2017 20:20:21 +0100
Subject: additional checks if a parameter is set; function to create paths
 added

---
 functions.common.inc.php | 15 +++++++++++++++
 functions.http.inc.php   | 12 +++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/functions.common.inc.php b/functions.common.inc.php
index 11bcefc..a9db566 100644
--- a/functions.common.inc.php
+++ b/functions.common.inc.php
@@ -48,4 +48,19 @@ function endsWith($haystack, $needle) {
 
     return $length === 0 || (substr($haystack, -$length) === $needle);
 }
+
+function generatePath($parts, $basePath = __DIR__) {
+    $path = $basePath;
+    if (!is_array($parts)) {
+        $parts = [$parts];
+    }
+    foreach ($parts as $part) {
+        $path .= DIRECTORY_SEPARATOR.generatePathName($part);
+    }
+    return $path;
+}
+
+function generatePathName($name) {
+    return urlencode($name);
+}
 ?>
diff --git a/functions.http.inc.php b/functions.http.inc.php
index 19f3e9e..f718179 100644
--- a/functions.http.inc.php
+++ b/functions.http.inc.php
@@ -103,7 +103,13 @@ function getMandatoryFileParameter($parameterName, $message = '', $json = false)
 }
 
 function getPostParameter($parameterName) {
-    return $_POST[$parameterName];
+    if (array_key_exists($parameterName, $_POST)
+        && isset($_POST[$parameterName])
+        && !empty($_POST[$parameterName])) {
+        return $_POST[$parameterName];
+    } else {
+        return NULL;
+    }
 }
 
 function getOptionalPostParameter($parameterName, $default = NULL) {
@@ -123,7 +129,7 @@ function getGetParameter($parameterName) {
 }
 
 function getOptionalGetParameter($parameterName, $default = NULL) {
-    $parameter = getPostParameter($parameterName);
+    $parameter = getGetParameter($parameterName);
     
     return handleOptionalParameter($parameter, $default);
 }
@@ -143,7 +149,7 @@ function handleOptionalParameter($parameter, $default) {
 
 function handleMandatoryParameter($parameterName, $parameter, $message, $json) {
     if (!isset($parameter) || is_null($parameter) || empty($parameter)) {
-        if (empty($message)) {
+        if (empty($message) || is_null($message)) {
             if ($json) {
                 $message = ['msg' => 'Missing parameter.', 'parameters' => ['missing_parameter' => $parameterName]];
             } else {
-- 
cgit v1.2.3