projects
/
authserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a3184df
)
use better variant to deal with missing entries instead of error suppression to fix...
author
Robert Kaiser
<kairo@kairo.at>
Fri, 12 Aug 2022 19:57:42 +0000
(21:57 +0200)
committer
Robert Kaiser
<kairo@kairo.at>
Fri, 12 Aug 2022 19:57:42 +0000
(21:57 +0200)
app/api.php
patch
|
blob
|
blame
|
history
diff --git
a/app/api.php
b/app/api.php
index 0efc179417910781b9d425af8c775126dead0bce..605a7d79d6ee735ad4fd672bfc4972631ab036ae 100644
(file)
--- a/
app/api.php
+++ b/
app/api.php
@@
-62,7
+62,7
@@
if (!count($errors)) {
}
elseif (array_key_exists('newclient', $_GET)) {
if ($token['scope'] == 'clientreg') {
}
elseif (array_key_exists('newclient', $_GET)) {
if ($token['scope'] == 'clientreg') {
- if (intval(
@$token['user_id']
)) {
+ if (intval(
$token['user_id'] ?? 0
)) {
$result = $db->prepare('SELECT `id`,`email` FROM `auth_users` WHERE `id` = :userid;');
$result->execute(array(':userid' => $token['user_id']));
$user = $result->fetch(PDO::FETCH_ASSOC);
$result = $db->prepare('SELECT `id`,`email` FROM `auth_users` WHERE `id` = :userid;');
$result->execute(array(':userid' => $token['user_id']));
$user = $result->fetch(PDO::FETCH_ASSOC);
@@
-73,7
+73,7
@@
if (!count($errors)) {
}
else {
if (($utils->client_reg_email_whitelist === false) || (in_array($user['email'], $utils->client_reg_email_whitelist))) {
}
else {
if (($utils->client_reg_email_whitelist === false) || (in_array($user['email'], $utils->client_reg_email_whitelist))) {
- if (strlen(
@$_GET['client_id']
) >= 5) {
+ if (strlen(
$_GET['client_id'] ?? ''
) >= 5) {
$result = $db->prepare('SELECT `client_id`,`user_id` FROM `oauth_clients` WHERE `client_id` = :clientid;');
$result->execute(array(':clientid' => $_GET['client_id']));
$client = $result->fetch(PDO::FETCH_ASSOC);
$result = $db->prepare('SELECT `client_id`,`user_id` FROM `oauth_clients` WHERE `client_id` = :clientid;');
$result->execute(array(':clientid' => $_GET['client_id']));
$client = $result->fetch(PDO::FETCH_ASSOC);
@@
-104,13
+104,13
@@
if (!count($errors)) {
'error_description' => 'Unexpectedly failed to save new secret.')));
}
else {
'error_description' => 'Unexpectedly failed to save new secret.')));
}
else {
- if (strlen(
@$_GET['redirect_uri']
)) {
+ if (strlen(
$_GET['redirect_uri'] ?? ''
)) {
$result = $db->prepare('UPDATE `oauth_clients` SET `redirect_uri` = :rediruri WHERE `client_id` = :clientid;');
if (!$result->execute(array(':rediruri' => $_GET['redirect_uri'],':clientid' => $client['client_id']))) {
$utils->log('client_save_failure', 'client: '.$client['client_id'].', new redirect_uri: '.$_GET['redirect_uri'].' - '.$result->errorInfo()[2]);
}
}
$result = $db->prepare('UPDATE `oauth_clients` SET `redirect_uri` = :rediruri WHERE `client_id` = :clientid;');
if (!$result->execute(array(':rediruri' => $_GET['redirect_uri'],':clientid' => $client['client_id']))) {
$utils->log('client_save_failure', 'client: '.$client['client_id'].', new redirect_uri: '.$_GET['redirect_uri'].' - '.$result->errorInfo()[2]);
}
}
- if (strlen(
@$_GET['scope']
)) {
+ if (strlen(
$_GET['scope'] ?? ''
)) {
$result = $db->prepare('UPDATE `oauth_clients` SET `scope` = :scope WHERE `client_id` = :clientid;');
if (!$result->execute(array(':scope' => $_GET['scope'],':clientid' => $client['client_id']))) {
$utils->log('client_save_failure', 'client: '.$client['client_id'].', new scope: '.$_GET['scope'].' - '.$result->errorInfo()[2]);
$result = $db->prepare('UPDATE `oauth_clients` SET `scope` = :scope WHERE `client_id` = :clientid;');
if (!$result->execute(array(':scope' => $_GET['scope'],':clientid' => $client['client_id']))) {
$utils->log('client_save_failure', 'client: '.$client['client_id'].', new scope: '.$_GET['scope'].' - '.$result->errorInfo()[2]);