diff --git a/api_keys.php b/api_keys.php
index 1a110ce40..54e4f8098 100644
--- a/api_keys.php
+++ b/api_keys.php
@@ -1,5 +1,5 @@
0) {
- $chk = (AREA == 'admin' && $userinfo['customers_see_all'] == '1') ? true : false;
- if (AREA == 'customer') {
- $chk_stmt = Database::prepare("
- SELECT c.customerid FROM `" . TABLE_PANEL_CUSTOMERS . "` c
- LEFT JOIN `" . TABLE_API_KEYS . "` ak ON ak.customerid = c.customerid
- WHERE ak.`id` = :id AND c.`customerid` = :cid
- ");
- $chk = Database::pexecute_first($chk_stmt, array(
- 'id' => $id,
- 'cid' => $userinfo['customerid']
- ));
- } elseif (AREA == 'admin' && $userinfo['customers_see_all'] == '0') {
- $chk_stmt = Database::prepare("
- SELECT a.adminid FROM `" . TABLE_PANEL_ADMINS . "` a
- LEFT JOIN `" . TABLE_API_KEYS . "` ak ON ak.adminid = a.adminid
- WHERE ak.`id` = :id AND a.`adminid` = :aid
- ");
- $chk = Database::pexecute_first($chk_stmt, array(
- 'id' => $id,
- 'aid' => $userinfo['adminid']
- ));
- }
- if ($chk !== false) {
- Database::pexecute($del_stmt, array(
+ if (isset($_POST['send']) && $_POST['send'] == 'send') {
+ $chk = (AREA == 'admin' && $userinfo['customers_see_all'] == '1') ? true : false;
+ if (AREA == 'customer') {
+ $chk_stmt = Database::prepare("
+ SELECT c.customerid FROM `" . TABLE_PANEL_CUSTOMERS . "` c
+ LEFT JOIN `" . TABLE_API_KEYS . "` ak ON ak.customerid = c.customerid
+ WHERE ak.`id` = :id AND c.`customerid` = :cid
+ ");
+ $chk = Database::pexecute_first($chk_stmt, array(
+ 'id' => $id,
+ 'cid' => $userinfo['customerid']
+ ));
+ } elseif (AREA == 'admin' && $userinfo['customers_see_all'] == '0') {
+ $chk_stmt = Database::prepare("
+ SELECT a.adminid FROM `" . TABLE_PANEL_ADMINS . "` a
+ LEFT JOIN `" . TABLE_API_KEYS . "` ak ON ak.adminid = a.adminid
+ WHERE ak.`id` = :id AND a.`adminid` = :aid
+ ");
+ $chk = Database::pexecute_first($chk_stmt, array(
+ 'id' => $id,
+ 'aid' => $userinfo['adminid']
+ ));
+ }
+ if ($chk !== false) {
+ Database::pexecute($del_stmt, array(
+ 'id' => $id
+ ));
+ $success_message = sprintf($lng['apikeys']['apikey_removed'], $id);
+ }
+ } else {
+ \Froxlor\UI\HTML::askYesNo('api_reallydelete', $filename, array(
+ 'page' => $page,
+ 'action' => $action,
'id' => $id
- ));
- $success_message = sprintf($lng['apikeys']['apikey_removed'], $id);
+ ), $id);
}
}
} elseif ($action == 'add') {
@@ -85,10 +93,10 @@
} elseif ($action == 'jqEditApiKey') {
$keyid = isset($_POST['id']) ? (int) $_POST['id'] : 0;
$allowed_from = isset($_POST['allowed_from']) ? $_POST['allowed_from'] : "";
- $valid_until = isset($_POST['valid_until']) ? (int) $_POST['valid_until'] : - 1;
+ $valid_until = isset($_POST['valid_until']) ? (int) $_POST['valid_until'] : -1;
// validate allowed_from
- if (! empty($allowed_from)) {
+ if (!empty($allowed_from)) {
$ip_list = array_map('trim', explode(",", $allowed_from));
$_check_list = $ip_list;
foreach ($_check_list as $idx => $ip) {
@@ -100,8 +108,8 @@
$allowed_from = implode(",", array_unique($ip_list));
}
- if ($valid_until <= 0 || ! is_numeric($valid_until)) {
- $valid_until = - 1;
+ if ($valid_until <= 0 || !is_numeric($valid_until)) {
+ $valid_until = -1;
}
$upd_stmt = Database::prepare("
diff --git a/lng/english.lng.php b/lng/english.lng.php
index 43aa28632..912370d06 100644
--- a/lng/english.lng.php
+++ b/lng/english.lng.php
@@ -2138,3 +2138,5 @@
$lng['error']['pathmustberelative'] = 'The user does not have the permission to specify directories outside the customers home-directory. Please specify a relative path (no leading /).';
$lng['serversettings']['acmeshpath']['title'] = 'Path to acme.sh';
$lng['serversettings']['acmeshpath']['description'] = 'Set this to where acme.sh is installed to, including the acme.sh script
Default is /root/.acme.sh/acme.sh';
+
+$lng['question']['api_reallydelete'] = 'Do you really want to delete the api-key #%d?';
\ No newline at end of file
diff --git a/lng/german.lng.php b/lng/german.lng.php
index e40d4878c..63aa9f963 100644
--- a/lng/german.lng.php
+++ b/lng/german.lng.php
@@ -1784,3 +1784,5 @@
$lng['error']['pathmustberelative'] = 'Der Benutzer hat nicht die benötigten Berechtigungen, um Pfade außerhalb des Kunden-Heimatverzeichnisses anzugeben. Bitte einen relativen Pfad angeben (kein führendes /).';
$lng['serversettings']['acmeshpath']['title'] = 'Pfad zu acme.sh';
$lng['serversettings']['acmeshpath']['description'] = 'Installationspfad zu acme.sh, inklusive acme.sh Script
Standard ist /root/.acme.sh/acme.sh';
+
+$lng['question']['api_reallydelete'] = 'Api-Key #%d wirklich löschen?';