From cb9ab928b37effa66fea2d70fbc25c71c6bdf8f3 Mon Sep 17 00:00:00 2001
From: ntimo <git@nowitzki.me>
Date: Fri, 4 Oct 2019 08:40:24 +0200
Subject: [PATCH] [Web] Replaced die(); with exit(); due to code conventions
---
data/web/inc/ajax/dns_diagnostics.php | 6 +++---
.../src/OAuth2/Controller/ResourceControllerInterface.php | 2 +-
data/web/inc/sessions.inc.php | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/data/web/inc/ajax/dns_diagnostics.php b/data/web/inc/ajax/dns_diagnostics.php
index 5f8e9aae..bc7b52d1 100644
--- a/data/web/inc/ajax/dns_diagnostics.php
+++ b/data/web/inc/ajax/dns_diagnostics.php
@@ -23,12 +23,12 @@ if (isset($_GET['domain'])) {
}
else {
echo "No such domain in context";
- die();
+ exit();
}
}
else {
echo "Invalid domain name";
- die();
+ exit();
}
}
@@ -422,6 +422,6 @@ foreach ($records as $record) {
<?php
} else {
echo "Session invalid";
- die();
+ exit();
}
?>
diff --git a/data/web/inc/lib/vendor/bshaffer/oauth2-server-php/src/OAuth2/Controller/ResourceControllerInterface.php b/data/web/inc/lib/vendor/bshaffer/oauth2-server-php/src/OAuth2/Controller/ResourceControllerInterface.php
index 0e847ca6..9d005143 100644
--- a/data/web/inc/lib/vendor/bshaffer/oauth2-server-php/src/OAuth2/Controller/ResourceControllerInterface.php
+++ b/data/web/inc/lib/vendor/bshaffer/oauth2-server-php/src/OAuth2/Controller/ResourceControllerInterface.php
@@ -13,7 +13,7 @@ use OAuth2\ResponseInterface;
* @code
* if (!$resourceController->verifyResourceRequest(OAuth2\Request::createFromGlobals(), $response = new OAuth2\Response())) {
* $response->send(); // authorization failed
- * die();
+ * exit();
* }
* return json_encode($resource); // valid token! Send the stuff!
* @endcode
diff --git a/data/web/inc/sessions.inc.php b/data/web/inc/sessions.inc.php
index 20232511..bb9d3c81 100644
--- a/data/web/inc/sessions.inc.php
+++ b/data/web/inc/sessions.inc.php
@@ -66,7 +66,7 @@ if (!empty($_SERVER['HTTP_X_API_KEY'])) {
'msg' => 'api access denied for ip ' . $_SERVER['REMOTE_ADDR']
));
unset($_POST);
- die();
+ exit();
}
}
else {
@@ -78,7 +78,7 @@ if (!empty($_SERVER['HTTP_X_API_KEY'])) {
'msg' => 'authentication failed'
));
unset($_POST);
- die();
+ exit();
}
}