diff --git a/src/Model/Contact.php b/src/Model/Contact.php index a6bb882e865..3d38005455f 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -2969,7 +2969,7 @@ public static function removeFollower(array $contact) $cdata = self::getPublicAndUserContactID($contact['id'], $contact['uid']); - DI::notification()->deleteForUserByVerb($contact['uid'], Activity::FOLLOW, ['actor-id' => $cdata['public']]); + DI::notification()->deleteForUserByVerb($contact['uid'], Activity::FOLLOW, ['actor-id' => $contact['public']]); } /** diff --git a/src/Module/Api/Friendica/DirectMessages/Search.php b/src/Module/Api/Friendica/DirectMessages/Search.php index 67f8193f251..26d8efaf783 100644 --- a/src/Module/Api/Friendica/DirectMessages/Search.php +++ b/src/Module/Api/Friendica/DirectMessages/Search.php @@ -77,7 +77,7 @@ protected function rawContent(array $request = []) } else { $ret = []; foreach ($mails as $mail) { - $ret[] = $this->directMessage->createFromMailId($mail['id'], $uid, $request['getText'] ?? ''); + $ret[] = $this->directMessage->createFromMailId($mail['id'], $uid, $this->getRequestValue($request, 'getText', '')); } $success = ['success' => true, 'search_results' => $ret]; } diff --git a/src/Module/Api/Friendica/Group/Delete.php b/src/Module/Api/Friendica/Group/Delete.php index d48e9a4f9d4..d263bbbd74f 100644 --- a/src/Module/Api/Friendica/Group/Delete.php +++ b/src/Module/Api/Friendica/Group/Delete.php @@ -44,7 +44,7 @@ protected function post(array $request = []) // params // error if no gid specified - if ($request['gid'] == 0 || $request['name'] == "") { + if ($request['gid'] == 0 || $request['name'] == '') { throw new BadRequestException('gid or name not specified'); } diff --git a/src/Module/Api/Friendica/Notification/Seen.php b/src/Module/Api/Friendica/Notification/Seen.php index 7a52a124df9..00015d90bc7 100644 --- a/src/Module/Api/Friendica/Notification/Seen.php +++ b/src/Module/Api/Friendica/Notification/Seen.php @@ -47,7 +47,7 @@ protected function post(array $request = []) throw new BadRequestException('Invalid argument count'); } - $id = intval($request['id'] ?? 0); + $id = intval($this->getRequestValue($request, 'id', 0)); $include_entities = $this->getRequestValue($request, 'include_entities', false); diff --git a/src/Module/Api/GNUSocial/Statusnet/Conversation.php b/src/Module/Api/GNUSocial/Statusnet/Conversation.php index 65ef9654b86..98d1de14d00 100644 --- a/src/Module/Api/GNUSocial/Statusnet/Conversation.php +++ b/src/Module/Api/GNUSocial/Statusnet/Conversation.php @@ -50,7 +50,7 @@ protected function rawContent(array $request = []) $start = max(0, ($page - 1) * $count); if ($id == 0) { - $id = $request['id'] ?? 0; + $id = $this->getRequestValue($request, 'id', 0); } Logger::info(BaseApi::LOG_PREFIX . '{subaction}', ['module' => 'api', 'action' => 'conversation', 'subaction' => 'show', 'id' => $id]); diff --git a/src/Module/Api/Twitter/Account/RateLimitStatus.php b/src/Module/Api/Twitter/Account/RateLimitStatus.php index c5f052b3945..739ed04b5d2 100644 --- a/src/Module/Api/Twitter/Account/RateLimitStatus.php +++ b/src/Module/Api/Twitter/Account/RateLimitStatus.php @@ -34,13 +34,13 @@ protected function rawContent(array $request = []) if (($this->parameters['extension'] ?? '') == 'xml') { $hash = [ 'remaining-hits' => '150', - '@attributes' => ["type" => "integer"], + '@attributes' => ['type' => 'integer'], 'hourly-limit' => '150', - '@attributes2' => ["type" => "integer"], + '@attributes2' => ['type' => 'integer'], 'reset-time' => DateTimeFormat::utc('now + 1 hour', DateTimeFormat::ATOM), - '@attributes3' => ["type" => "datetime"], + '@attributes3' => ['type' => 'datetime'], 'reset_time_in_seconds' => strtotime('now + 1 hour'), - '@attributes4' => ["type" => "integer"], + '@attributes4' => ['type' => 'integer'], ]; } else { $hash = [ diff --git a/src/Module/Api/Twitter/DirectMessages/Conversation.php b/src/Module/Api/Twitter/DirectMessages/Conversation.php index ebd4b6bbc46..808189c24df 100644 --- a/src/Module/Api/Twitter/DirectMessages/Conversation.php +++ b/src/Module/Api/Twitter/DirectMessages/Conversation.php @@ -34,6 +34,6 @@ protected function rawContent(array $request = []) BaseApi::checkAllowedScope(BaseApi::SCOPE_READ); $uid = BaseApi::getCurrentUserID(); - $this->getMessages($request, $uid, ["`parent-uri` = ?", $request['uri'] ?? '']); + $this->getMessages($request, $uid, ["`parent-uri` = ?", $this->getRequestValue($request, 'uri', '')]); } } diff --git a/src/Module/Api/Twitter/DirectMessages/Destroy.php b/src/Module/Api/Twitter/DirectMessages/Destroy.php index 9de09823640..2b95f7a6b68 100644 --- a/src/Module/Api/Twitter/DirectMessages/Destroy.php +++ b/src/Module/Api/Twitter/DirectMessages/Destroy.php @@ -55,9 +55,8 @@ protected function rawContent(array $request = []) $id = $this->getRequestValue($request, 'id', 0); $id = $this->getRequestValue($this->parameters, 'id', $id); - $verbose = $this->getRequestValue($request, 'friendica_verbose', false); - - $parenturi = $request['friendica_parenturi'] ?? ''; + $verbose = $this->getRequestValue($request, 'friendica_verbose', false); + $parenturi = $this->getRequestValue($request, 'friendica_parenturi', ''); // error if no id or parenturi specified (for clients posting parent-uri as well) if ($verbose && $id == 0 && $parenturi == "") { diff --git a/src/Module/Api/Twitter/DirectMessages/NewDM.php b/src/Module/Api/Twitter/DirectMessages/NewDM.php index 7ac82533e84..1eaa6019532 100644 --- a/src/Module/Api/Twitter/DirectMessages/NewDM.php +++ b/src/Module/Api/Twitter/DirectMessages/NewDM.php @@ -63,7 +63,7 @@ protected function rawContent(array $request = []) return; } - $cid = BaseApi::getContactIDForSearchterm($request['screen_name'] ?? '', $request['profileurl'] ?? '', $request['user_id'] ?? 0, 0); + $cid = BaseApi::getContactIDForSearchterm($this->getRequestValue($request, 'screen_name', ''), $this->getRequestValue($request, 'profileurl', ''), $this->getRequestValue($request, 'user_id', 0), 0); if (empty($cid)) { throw new NotFoundException('Recipient not found'); } @@ -86,7 +86,7 @@ protected function rawContent(array $request = []) $id = Mail::send($cdata['user'], $request['text'], $sub, $replyto); if ($id > -1) { - $ret = $this->directMessage->createFromMailId($id, $uid, $request['getText'] ?? ''); + $ret = $this->directMessage->createFromMailId($id, $uid, $this->getRequestValue($request, 'getText', '')); } else { $ret = ['error' => $id]; } diff --git a/src/Module/Api/Twitter/DirectMessagesEndpoint.php b/src/Module/Api/Twitter/DirectMessagesEndpoint.php index 28b867889f6..5505c6c44c2 100644 --- a/src/Module/Api/Twitter/DirectMessagesEndpoint.php +++ b/src/Module/Api/Twitter/DirectMessagesEndpoint.php @@ -84,7 +84,7 @@ protected function getMessages(array $request, int $uid, array $condition) $params['order'] = ['id']; } - $cid = BaseApi::getContactIDForSearchterm($request['screen_name'] ?? '', $request['profileurl'] ?? '', $request['user_id'] ?? 0, 0); + $cid = BaseApi::getContactIDForSearchterm($this->getRequestValue($request, 'screen_name', ''), $this->getRequestValue($request, 'profileurl', ''), $this->getRequestValue($request, 'user_id', 0), 0); if (!empty($cid)) { $cdata = Contact::getPublicAndUserContactID($cid, $uid); if (!empty($cdata['user'])) { @@ -109,7 +109,7 @@ protected function getMessages(array $request, int $uid, array $condition) $ret = []; foreach ($ids as $id) { - $ret[] = $this->directMessage->createFromMailId($id, $uid, $request['getText'] ?? ''); + $ret[] = $this->directMessage->createFromMailId($id, $uid, $this->getRequestValue($request, 'getText', '')); } self::setLinkHeader(); diff --git a/src/Module/Api/Twitter/Favorites/Create.php b/src/Module/Api/Twitter/Favorites/Create.php index 6544fe470c7..c81b5af8734 100644 --- a/src/Module/Api/Twitter/Favorites/Create.php +++ b/src/Module/Api/Twitter/Favorites/Create.php @@ -37,7 +37,7 @@ protected function post(array $request = []) self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); - $id = $request['id'] ?? 0; + $id = $this->getRequestValue($request, 'id', 0); if (empty($id)) { throw new BadRequestException('Item id not specified'); diff --git a/src/Module/Api/Twitter/Favorites/Destroy.php b/src/Module/Api/Twitter/Favorites/Destroy.php index 0d3046afb13..c03064e79a1 100644 --- a/src/Module/Api/Twitter/Favorites/Destroy.php +++ b/src/Module/Api/Twitter/Favorites/Destroy.php @@ -37,7 +37,7 @@ protected function post(array $request = []) self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); - $id = $request['id'] ?? 0; + $id = $this->getRequestValue($request, 'id', 0); if (empty($id)) { throw new BadRequestException('Item id not specified'); diff --git a/src/Module/Api/Twitter/Followers/Ids.php b/src/Module/Api/Twitter/Followers/Ids.php index df7120ab62a..6acf7c83110 100644 --- a/src/Module/Api/Twitter/Followers/Ids.php +++ b/src/Module/Api/Twitter/Followers/Ids.php @@ -37,7 +37,7 @@ protected function rawContent(array $request = []) $uid = BaseApi::getCurrentUserID(); // Expected value for user_id parameter: public/user contact id - $cid = BaseApi::getContactIDForSearchterm($request['screen_name'] ?? '', $request['profileurl'] ?? '', $request['user_id'] ?? 0, $uid); + $cid = BaseApi::getContactIDForSearchterm($this->getRequestValue($request, 'screen_name', ''), $this->getRequestValue($request, 'profileurl', ''), $this->getRequestValue($request, 'user_id', 0), $uid); $cursor = $this->getRequestValue($request, 'cursor', -1); $stringify_ids = $this->getRequestValue($request, 'stringify_ids', false); $count = $this->getRequestValue($request, 'count', self::DEFAULT_COUNT, 1, self::MAX_COUNT); diff --git a/src/Module/Api/Twitter/Followers/Lists.php b/src/Module/Api/Twitter/Followers/Lists.php index 0e9a2aa82a0..fbae33652f7 100644 --- a/src/Module/Api/Twitter/Followers/Lists.php +++ b/src/Module/Api/Twitter/Followers/Lists.php @@ -37,7 +37,7 @@ protected function rawContent(array $request = []) $uid = BaseApi::getCurrentUserID(); // Expected value for user_id parameter: public/user contact id - $cid = BaseApi::getContactIDForSearchterm($request['screen_name'] ?? '', $request['profileurl'] ?? '', $request['user_id'] ?? 0, $uid); + $cid = BaseApi::getContactIDForSearchterm($this->getRequestValue($request, 'screen_name', ''), $this->getRequestValue($request, 'profileurl', ''), $this->getRequestValue($request, 'user_id', 0), $uid); $cursor = $this->getRequestValue($request, 'cursor', -1); $skip_status = $this->getRequestValue($request, 'skip_status', false); $include_user_entities = $this->getRequestValue($request, 'include_user_entities', false); diff --git a/src/Module/Api/Twitter/Friends/Ids.php b/src/Module/Api/Twitter/Friends/Ids.php index b5b571a9f06..a46be8deb99 100644 --- a/src/Module/Api/Twitter/Friends/Ids.php +++ b/src/Module/Api/Twitter/Friends/Ids.php @@ -37,7 +37,7 @@ protected function rawContent(array $request = []) $uid = BaseApi::getCurrentUserID(); // Expected value for user_id parameter: public/user contact id - $cid = BaseApi::getContactIDForSearchterm($request['screen_name'] ?? '', $request['profileurl'] ?? '', $request['user_id'] ?? 0, $uid); + $cid = BaseApi::getContactIDForSearchterm($this->getRequestValue($request, 'screen_name', ''), $this->getRequestValue($request, 'profileurl', ''), $this->getRequestValue($request, 'user_id', 0), $uid); $cursor = $this->getRequestValue($request, 'cursor', -1); $stringify_ids = $this->getRequestValue($request, 'stringify_ids', false); $count = $this->getRequestValue($request, 'count', self::DEFAULT_COUNT, 1, self::MAX_COUNT); diff --git a/src/Module/Api/Twitter/Friends/Lists.php b/src/Module/Api/Twitter/Friends/Lists.php index 750ba6db612..304f19db9e4 100644 --- a/src/Module/Api/Twitter/Friends/Lists.php +++ b/src/Module/Api/Twitter/Friends/Lists.php @@ -37,7 +37,7 @@ protected function rawContent(array $request = []) $uid = BaseApi::getCurrentUserID(); // Expected value for user_id parameter: public/user contact id - $cid = BaseApi::getContactIDForSearchterm($request['screen_name'] ?? '', $request['profileurl'] ?? '', $request['user_id'] ?? 0, $uid); + $cid = BaseApi::getContactIDForSearchterm($this->getRequestValue($request, 'screen_name', ''), $this->getRequestValue($request, 'profileurl', ''), $this->getRequestValue($request, 'user_id', 0), $uid); $cursor = $this->getRequestValue($request, 'cursor', -1); $skip_status = $this->getRequestValue($request, 'skip_status', false); $include_user_entities = $this->getRequestValue($request, 'include_user_entities', false); diff --git a/src/Module/Api/Twitter/Friendships/Destroy.php b/src/Module/Api/Twitter/Friendships/Destroy.php index b730f066365..d324fc6be4f 100644 --- a/src/Module/Api/Twitter/Friendships/Destroy.php +++ b/src/Module/Api/Twitter/Friendships/Destroy.php @@ -63,7 +63,7 @@ protected function post(array $request = []) throw new HTTPException\NotFoundException('Error Processing Request'); } - $contact_id = BaseApi::getContactIDForSearchterm($request['screen_name'] ?? '', $request['profileurl'] ?? '', $request['user_id'] ?? 0, 0); + $contact_id = BaseApi::getContactIDForSearchterm($this->getRequestValue($request, 'screen_name', ''), $this->getRequestValue($request, 'profileurl', ''), $this->getRequestValue($request, 'user_id', 0), 0); if (empty($contact_id)) { Logger::notice(BaseApi::LOG_PREFIX . 'No user_id specified', ['module' => 'api', 'action' => 'friendships_destroy']); diff --git a/src/Module/Api/Twitter/Friendships/Show.php b/src/Module/Api/Twitter/Friendships/Show.php index 66605e72650..c05dc090231 100644 --- a/src/Module/Api/Twitter/Friendships/Show.php +++ b/src/Module/Api/Twitter/Friendships/Show.php @@ -38,9 +38,8 @@ protected function rawContent(array $request = []) self::checkAllowedScope(self::SCOPE_READ); $uid = BaseApi::getCurrentUserID(); - $source_cid = BaseApi::getContactIDForSearchterm($request['source_screen_name'] ?? '', '', $request['source_id'] ?? 0, $uid); - - $target_cid = BaseApi::getContactIDForSearchterm($request['target_screen_name'] ?? '', '', $request['target_id'] ?? 0, $uid); + $source_cid = BaseApi::getContactIDForSearchterm($this->getRequestValue($request, 'source_screen_name', ''), '', $this->getRequestValue($request, 'source_id', 0), $uid); + $target_cid = BaseApi::getContactIDForSearchterm($this->getRequestValue($request, 'target_screen_name', ''), '', $this->getRequestValue($request, 'target_id', 0), $uid); $source = Contact::getById($source_cid); if (empty($source)) { diff --git a/src/Module/Api/Twitter/Statuses/UserTimeline.php b/src/Module/Api/Twitter/Statuses/UserTimeline.php index 05aa0796249..a6616636cac 100644 --- a/src/Module/Api/Twitter/Statuses/UserTimeline.php +++ b/src/Module/Api/Twitter/Statuses/UserTimeline.php @@ -42,7 +42,7 @@ protected function rawContent(array $request = []) Logger::info('api_statuses_user_timeline', ['api_user' => $uid, '_REQUEST' => $request]); - $cid = BaseApi::getContactIDForSearchterm($request['screen_name'] ?? '', $request['profileurl'] ?? '', $request['user_id'] ?? 0, $uid); + $cid = BaseApi::getContactIDForSearchterm($this->getRequestValue($request, 'screen_name', ''), $this->getRequestValue($request, 'profileurl', ''), $this->getRequestValue($request, 'user_id', 0), $uid); $count = $this->getRequestValue($request, 'count', 20, 1, 100); $page = $this->getRequestValue($request, 'page', 1, 1); $since_id = $this->getRequestValue($request, 'since_id', 0, 0); diff --git a/src/Module/Api/Twitter/Users/Show.php b/src/Module/Api/Twitter/Users/Show.php index e6bd24d27bd..27510b93877 100644 --- a/src/Module/Api/Twitter/Users/Show.php +++ b/src/Module/Api/Twitter/Users/Show.php @@ -38,7 +38,7 @@ protected function rawContent(array $request = []) $uid = BaseApi::getCurrentUserID(); if (empty($this->parameters['id'])) { - $cid = BaseApi::getContactIDForSearchterm($request['screen_name'] ?? '', $request['profileurl'] ?? '', $request['user_id'] ?? 0, $uid); + $cid = BaseApi::getContactIDForSearchterm($this->getRequestValue($request, 'screen_name', ''), $this->getRequestValue($request, 'profileurl', ''), $this->getRequestValue($request, 'user_id', 0), $uid); } else { $cid = (int)$this->parameters['id']; } diff --git a/src/Module/Feed.php b/src/Module/Feed.php index 9acde7bb30c..4c942cd762c 100644 --- a/src/Module/Feed.php +++ b/src/Module/Feed.php @@ -45,7 +45,7 @@ class Feed extends BaseModule { protected function rawContent(array $request = []) { - $last_update = $request['last_update'] ?? ''; + $last_update = $this->getRequestValue($request, 'last_update', ''); $nocache = !empty($request['nocache']) && local_user(); $type = null;