mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Simplified null check

Browse source
This commit is contained in:
Michael 2021-05-12 12:40:45 +00:00
parent 4a6d33e182
commit 8a5560ec8f
7 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Module/Api/Mastodon/Apps.php
View file

@ -37,10 +37,10 @@ class Apps extends BaseApi
*/ */
public static function post(array $parameters = []) public static function post(array $parameters = [])
{ {
$name = !isset($_REQUEST['client_name']) ? '' : $_REQUEST['client_name']; $name = $_REQUEST['client_name'] ?? '';
$redirect = !isset($_REQUEST['redirect_uris']) ? '' : $_REQUEST['redirect_uris']; $redirect = $_REQUEST['redirect_uris'] ?? '';
$scopes = !isset($_REQUEST['scopes']) ? '' : $_REQUEST['scopes']; $scopes = $_REQUEST['scopes'] ?? '';
$website = !isset($_REQUEST['website']) ? '' : $_REQUEST['website']; $website = $_REQUEST['website'] ?? '';
if (empty($name) || empty($redirect)) { if (empty($name) || empty($redirect)) {
DI::mstdnError()->UnprocessableEntity(DI::l10n()->t('Missing parameters')); DI::mstdnError()->UnprocessableEntity(DI::l10n()->t('Missing parameters'));

2
src/Module/Api/Mastodon/Directory.php
View file

@ -44,7 +44,7 @@ class Directory extends BaseApi
{ {
$offset = (int)!isset($_REQUEST['offset']) ? 0 : $_REQUEST['offset']; $offset = (int)!isset($_REQUEST['offset']) ? 0 : $_REQUEST['offset'];
$limit = (int)!isset($_REQUEST['limit']) ? 40 : $_REQUEST['limit']; $limit = (int)!isset($_REQUEST['limit']) ? 40 : $_REQUEST['limit'];
$order = !isset($_REQUEST['order']) ? 'active' : $_REQUEST['order']; $order = $_REQUEST['order'] ?? 'active';
$local = (bool)!isset($_REQUEST['local']) ? false : ($_REQUEST['local'] == 'true'); $local = (bool)!isset($_REQUEST['local']) ? false : ($_REQUEST['local'] == 'true');
Logger::info('directory', ['offset' => $offset, 'limit' => $limit, 'order' => $order, 'local' => $local]); Logger::info('directory', ['offset' => $offset, 'limit' => $limit, 'order' => $order, 'local' => $local]);

2
src/Module/Api/Mastodon/Notifications.php
View file

@ -63,7 +63,7 @@ class Notifications extends BaseApi
$limit = (int)!isset($_REQUEST['limit']) ? 20 : $_REQUEST['limit']; $limit = (int)!isset($_REQUEST['limit']) ? 20 : $_REQUEST['limit'];
// Array of types to exclude (follow, favourite, reblog, mention, poll, follow_request) // Array of types to exclude (follow, favourite, reblog, mention, poll, follow_request)
$exclude_types = !isset($_REQUEST['exclude_types']) ? [] : $_REQUEST['exclude_types']; $exclude_types = $_REQUEST['exclude_types'] ?? [];
// Return only notifications received from this account // Return only notifications received from this account
$account_id = (int)!isset($_REQUEST['account_id']) ? 0 : $_REQUEST['account_id']; $account_id = (int)!isset($_REQUEST['account_id']) ? 0 : $_REQUEST['account_id'];

6
src/Module/BaseApi.php
View file

@ -210,9 +210,9 @@ class BaseApi extends BaseModule
*/ */
public static function getApplication() public static function getApplication()
{ {
$redirect_uri = !isset($_REQUEST['redirect_uri']) ? '' : $_REQUEST['redirect_uri']; $redirect_uri = $_REQUEST['redirect_uri'] ?? '';
$client_id = !isset($_REQUEST['client_id']) ? '' : $_REQUEST['client_id']; $client_id = $_REQUEST['client_id'] ?? '';
$client_secret = !isset($_REQUEST['client_secret']) ? '' : $_REQUEST['client_secret']; $client_secret = $_REQUEST['client_secret'] ?? '';
if ((empty($redirect_uri) && empty($client_secret)) || empty($client_id)) { if ((empty($redirect_uri) && empty($client_secret)) || empty($client_id)) {
Logger::warning('Incomplete request', ['request' => $_REQUEST]); Logger::warning('Incomplete request', ['request' => $_REQUEST]);

2
src/Module/OAuth/Authorize.php
View file

@ -36,7 +36,7 @@ class Authorize extends BaseApi
*/ */
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
$response_type = !isset($_REQUEST['response_type']) ? '' : $_REQUEST['response_type']; $response_type = $_REQUEST['response_type'] ?? '';
if ($response_type != 'code') { if ($response_type != 'code') {
Logger::warning('Wrong or missing response type', ['response_type' => $response_type]); Logger::warning('Wrong or missing response type', ['response_type' => $response_type]);
DI::mstdnError()->RecordNotFound(); DI::mstdnError()->RecordNotFound();

6
src/Module/OAuth/Token.php
View file

@ -34,9 +34,9 @@ class Token extends BaseApi
{ {
public static function post(array $parameters = []) public static function post(array $parameters = [])
{ {
$client_secret = !isset($_REQUEST['client_secret']) ? '' : $_REQUEST['client_secret']; $client_secret = $_REQUEST['client_secret'] ?? '';
$code = !isset($_REQUEST['code']) ? '' : $_REQUEST['code']; $code = $_REQUEST['code'] ?? '';
$grant_type = !isset($_REQUEST['grant_type']) ? '' : $_REQUEST['grant_type']; $grant_type = $_REQUEST['grant_type'] ?? '';
if ($grant_type != 'authorization_code') { if ($grant_type != 'authorization_code') {
Logger::warning('Unsupported or missing grant type', ['request' => $_REQUEST]); Logger::warning('Unsupported or missing grant type', ['request' => $_REQUEST]);

2
src/Module/Security/Login.php
View file

@ -36,7 +36,7 @@ class Login extends BaseModule
{ {
public static function content(array $parameters = []) public static function content(array $parameters = [])
{ {
$return_path = !isset($_REQUEST['return_path']) ? '' : $_REQUEST['return_path']; $return_path = $_REQUEST['return_path'] ?? '' ;
if (local_user()) { if (local_user()) {
DI::baseUrl()->redirect($return_path); DI::baseUrl()->redirect($return_path);