maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Revert "refactor global array"

Browse Source 
This reverts commit 370ccbdb74.
This commit is contained in:
Michael Kaufmann
2018-12-22 08:15:31 +01:00
parent c800e89414
commit 7e39a7bc60
220 changed files with 2244 additions and 2227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api_keys.php
View File

@@ -59,7 +59,7 @@ if ($action == 'delete') {
Database::pexecute($del_stmt, array(
'id' => $id
));
$success_message = sprintf(\Froxlor\I18N\Lang::getAll()['apikeys']['apikey_removed'], $id);
$success_message = sprintf($lng['apikeys']['apikey_removed'], $id);
}
}
} elseif ($action == 'add') {
@@ -81,7 +81,7 @@ if ($action == 'delete') {
'aid' => \Froxlor\User::getAll()['adminid'],
'cid' => $cid
));
$success_message = \Froxlor\I18N\Lang::getAll()['apikeys']['apikey_added'];
$success_message = $lng['apikeys']['apikey_added'];
} elseif ($action == 'jqEditApiKey') {
$keyid = isset($_POST['id']) ? (int) $_POST['id'] : 0;
$allowed_from = isset($_POST['allowed_from']) ? $_POST['allowed_from'] : "";
@@ -138,20 +138,20 @@ if (AREA == 'admin' && \Froxlor\User::getAll()['customers_see_all'] == '0') {
$keys_stmt_query .= "ak.adminid = :adminid ";
$qry_params['adminid'] = \Froxlor\User::getAll()['adminid'];
$fields = array(
'a.loginname' => \Froxlor\I18N\Lang::getAll()['login']['username']
'a.loginname' => $lng['login']['username']
);
} elseif (AREA == 'customer') {
// customer-area
$keys_stmt_query .= "ak.customerid = :cid ";
$qry_params['cid'] = \Froxlor\User::getAll()['customerid'];
$fields = array(
'c.loginname' => \Froxlor\I18N\Lang::getAll()['login']['username']
'c.loginname' => $lng['login']['username']
);
} else {
// admin who can see all customers / reseller / admins
$keys_stmt_query .= "1 ";
$fields = array(
'a.loginname' => \Froxlor\I18N\Lang::getAll()['login']['username']
'a.loginname' => $lng['login']['username']
);
}
@@ -165,7 +165,7 @@ $apikeys = "";
if (count($all_keys) == 0) {
$count = 0;
$message = \Froxlor\I18N\Lang::getAll()['apikeys']['no_api_keys'];
$message = $lng['apikeys']['no_api_keys'];
$sortcode = "";
$searchcode = "";
$pagingcode = "";