summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2017-12-10 20:20:21 +0100
committersteckbrief <steckbrief@chefmail.de>2017-12-10 20:20:21 +0100
commiteb2e78a12505b8d41e0ef62cb1b321cdc540e5fd (patch)
treecd2ac4c7625d210ab36593b95f2bd1dc0b3e9a90
parent075f05aaf9dfccc4a8a1e5741462ec4ee42ae743 (diff)
additional checks if a parameter is set; function to create paths added
-rw-r--r--functions.common.inc.php15
-rw-r--r--functions.http.inc.php10
2 files changed, 23 insertions, 2 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) {
+ 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 {