clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replaced "filter_input" with the new request value function

This commit is contained in:
Michael 2022-01-16 16:40:13 +00:00
parent 720a43461d
commit 344d514857
11 changed files with 69 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Module/Api/Twitter/Account/UpdateProfile.php
View File

@ -56,7 +56,7 @@ class UpdateProfile extends BaseApi
Profile::publishUpdate($uid); Profile::publishUpdate($uid);
$skip_status = filter_var($request['skip_status'] ?? false, FILTER_VALIDATE_BOOLEAN); $skip_status = $this->getRequestValue($request, 'skip_status', false);
$user_info = DI::twitterUser()->createFromUserId($uid, $skip_status)->toArray(); $user_info = DI::twitterUser()->createFromUserId($uid, $skip_status)->toArray();

2
src/Module/Api/Twitter/Account/UpdateProfileImage.php
View File

@ -57,7 +57,7 @@ class UpdateProfileImage extends BaseApi
} }
// output for client // output for client
$skip_status = filter_var($request['skip_status'] ?? false, FILTER_VALIDATE_BOOLEAN); $skip_status = $this->getRequestValue($request, 'skip_status', false);
$user_info = DI::twitterUser()->createFromUserId($uid, $skip_status)->toArray(); $user_info = DI::twitterUser()->createFromUserId($uid, $skip_status)->toArray();

2
src/Module/Api/Twitter/Account/VerifyCredentials.php
View File

@ -37,7 +37,7 @@ class VerifyCredentials extends BaseApi
BaseApi::checkAllowedScope(BaseApi::SCOPE_READ); BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
$uid = BaseApi::getCurrentUserID(); $uid = BaseApi::getCurrentUserID();
$skip_status = filter_var($request['skip_status'] ?? false, FILTER_VALIDATE_BOOLEAN); $skip_status = $this->getRequestValue($request, 'skip_status', false);
$user_info = DI::twitterUser()->createFromUserId($uid, $skip_status)->toArray(); $user_info = DI::twitterUser()->createFromUserId($uid, $skip_status)->toArray();

17
src/Module/Api/Twitter/Blocks/Ids.php
View File

@ -37,17 +37,14 @@ class Ids extends ContactEndpoint
$uid = BaseApi::getCurrentUserID(); $uid = BaseApi::getCurrentUserID();
// Expected value for user_id parameter: public/user contact id // Expected value for user_id parameter: public/user contact id
$cursor = filter_input(INPUT_GET, 'cursor' , FILTER_VALIDATE_INT, ['options' => ['default' => -1]]); $cursor = $this->getRequestValue($request, 'cursor', -1);
$stringify_ids = filter_input(INPUT_GET, 'stringify_ids', FILTER_VALIDATE_BOOLEAN, ['options' => ['default' => false]]); $stringify_ids = $this->getRequestValue($request, 'stringify_ids', false);
$count = filter_input(INPUT_GET, 'count' , FILTER_VALIDATE_INT, ['options' => [ $count = $this->getRequestValue($request, 'count', self::DEFAULT_COUNT, 1, self::MAX_COUNT);
'default' => self::DEFAULT_COUNT,
'min_range' => 1,
'max_range' => self::MAX_COUNT,
]]);
// Friendica-specific // Friendica-specific
$since_id = filter_input(INPUT_GET, 'since_id', FILTER_VALIDATE_INT); $since_id = $this->getRequestValue($request, 'since_id', 0, 0);
$max_id = filter_input(INPUT_GET, 'max_id' , FILTER_VALIDATE_INT); $max_id = $this->getRequestValue($request, 'max_id', 0, 0);
$min_id = filter_input(INPUT_GET, 'min_id' , FILTER_VALIDATE_INT); $min_id = $this->getRequestValue($request, 'min_id', 0, 0);
$params = ['order' => ['cid' => true], 'limit' => $count]; $params = ['order' => ['cid' => true], 'limit' => $count];

19
src/Module/Api/Twitter/Blocks/Lists.php
View File

@ -37,18 +37,15 @@ class Lists extends ContactEndpoint
$uid = BaseApi::getCurrentUserID(); $uid = BaseApi::getCurrentUserID();
// Expected value for user_id parameter: public/user contact id // Expected value for user_id parameter: public/user contact id
$cursor = filter_input(INPUT_GET, 'cursor' , FILTER_VALIDATE_INT, ['options' => ['default' => -1]]); $cursor = $this->getRequestValue($request, 'cursor', -1);
$skip_status = filter_input(INPUT_GET, 'skip_status' , FILTER_VALIDATE_BOOLEAN, ['options' => ['default' => false]]); $skip_status = $this->getRequestValue($request, 'skip_status', false);
$include_user_entities = filter_input(INPUT_GET, 'include_user_entities', FILTER_VALIDATE_BOOLEAN, ['options' => ['default' => false]]); $include_user_entities = $this->getRequestValue($request, 'include_user_entities', false);
$count = filter_input(INPUT_GET, 'count' , FILTER_VALIDATE_INT, ['options' => [ $count = $this->getRequestValue($request, 'count', self::DEFAULT_COUNT, 1, self::MAX_COUNT);
'default' => self::DEFAULT_COUNT,
'min_range' => 1,
'max_range' => self::MAX_COUNT,
]]);
// Friendica-specific // Friendica-specific
$since_id = filter_input(INPUT_GET, 'since_id', FILTER_VALIDATE_INT); $since_id = $this->getRequestValue($request, 'since_id', 0, 0);
$max_id = filter_input(INPUT_GET, 'max_id' , FILTER_VALIDATE_INT); $max_id = $this->getRequestValue($request, 'max_id', 0, 0);
$min_id = filter_input(INPUT_GET, 'min_id' , FILTER_VALIDATE_INT); $min_id = $this->getRequestValue($request, 'min_id', 0, 0);
$params = ['order' => ['cid' => true], 'limit' => $count]; $params = ['order' => ['cid' => true], 'limit' => $count];

4
src/Module/Api/Twitter/DirectMessages/Destroy.php
View File

@ -52,8 +52,8 @@ class Destroy extends BaseApi
BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE); BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
$uid = BaseApi::getCurrentUserID(); $uid = BaseApi::getCurrentUserID();
$id = filter_var($request['id'] ?? 0, FILTER_VALIDATE_INT); $id = $this->getRequestValue($request, 'id', 0);
$verbose = filter_var($request['friendica_verbose'] ?? false, FILTER_VALIDATE_BOOLEAN); $verbose = $this->getRequestValue($request, 'friendica_verbose', false);
$parenturi = $request['friendica_parenturi'] ?? ''; $parenturi = $request['friendica_parenturi'] ?? '';

23
src/Module/Api/Twitter/Followers/Ids.php
View File

@ -37,20 +37,17 @@ class Ids extends ContactEndpoint
$uid = BaseApi::getCurrentUserID(); $uid = BaseApi::getCurrentUserID();
// Expected value for user_id parameter: public/user contact id // Expected value for user_id parameter: public/user contact id
$contact_id = filter_input(INPUT_GET, 'user_id' , FILTER_VALIDATE_INT); $contact_id = $this->getRequestValue($request, 'user_id', 0);
$screen_name = filter_input(INPUT_GET, 'screen_name'); $screen_name = $this->getRequestValue($request, 'screen_name', '');
$profile_url = filter_input(INPUT_GET, 'profile_url'); $profile_url = $this->getRequestValue($request, 'profile_url', '');
$cursor = filter_input(INPUT_GET, 'cursor' , FILTER_VALIDATE_INT, ['options' => ['default' => -1]]); $cursor = $this->getRequestValue($request, 'cursor', -1);
$stringify_ids = filter_input(INPUT_GET, 'stringify_ids', FILTER_VALIDATE_BOOLEAN, ['options' => ['default' => false]]); $stringify_ids = $this->getRequestValue($request, 'stringify_ids', false);
$count = filter_input(INPUT_GET, 'count' , FILTER_VALIDATE_INT, ['options' => [ $count = $this->getRequestValue($request, 'count', self::DEFAULT_COUNT, 1, self::MAX_COUNT);
'default' => self::DEFAULT_COUNT,
'min_range' => 1,
'max_range' => self::MAX_COUNT,
]]);
// Friendica-specific // Friendica-specific
$since_id = filter_input(INPUT_GET, 'since_id' , FILTER_VALIDATE_INT); $since_id = $this->getRequestValue($request, 'since_id', 0, 0);
$max_id = filter_input(INPUT_GET, 'max_id' , FILTER_VALIDATE_INT); $max_id = $this->getRequestValue($request, 'max_id', 0, 0);
$min_id = filter_input(INPUT_GET, 'min_id' , FILTER_VALIDATE_INT); $min_id = $this->getRequestValue($request, 'min_id', 0, 0);
$cid = BaseApi::getContactIDForSearchterm($screen_name, $profile_url, $contact_id, $uid); $cid = BaseApi::getContactIDForSearchterm($screen_name, $profile_url, $contact_id, $uid);

25
src/Module/Api/Twitter/Followers/Lists.php
View File

@ -37,21 +37,18 @@ class Lists extends ContactEndpoint
$uid = BaseApi::getCurrentUserID(); $uid = BaseApi::getCurrentUserID();
// Expected value for user_id parameter: public/user contact id // Expected value for user_id parameter: public/user contact id
$contact_id = filter_input(INPUT_GET, 'user_id' , FILTER_VALIDATE_INT); $contact_id = $this->getRequestValue($request, 'user_id', 0);
$screen_name = filter_input(INPUT_GET, 'screen_name'); $screen_name = $this->getRequestValue($request, 'screen_name', '');
$profile_url = filter_input(INPUT_GET, 'profile_url'); $profile_url = $this->getRequestValue($request, 'profile_url', '');
$cursor = filter_input(INPUT_GET, 'cursor' , FILTER_VALIDATE_INT, ['options' => ['default' => -1]]); $cursor = $this->getRequestValue($request, 'cursor', -1);
$skip_status = filter_input(INPUT_GET, 'skip_status' , FILTER_VALIDATE_BOOLEAN, ['options' => ['default' => false]]); $skip_status = $this->getRequestValue($request, 'skip_status', false);
$include_user_entities = filter_input(INPUT_GET, 'include_user_entities', FILTER_VALIDATE_BOOLEAN, ['options' => ['default' => false]]); $include_user_entities = $this->getRequestValue($request, 'include_user_entities', false);
$count = filter_input(INPUT_GET, 'count' , FILTER_VALIDATE_INT, ['options' => [ $count = $this->getRequestValue($request, 'count', self::DEFAULT_COUNT, 1, self::MAX_COUNT);
'default' => self::DEFAULT_COUNT,
'min_range' => 1,
'max_range' => self::MAX_COUNT,
]]);
// Friendica-specific // Friendica-specific
$since_id = filter_input(INPUT_GET, 'since_id', FILTER_VALIDATE_INT); $since_id = $this->getRequestValue($request, 'since_id', 0, 0);
$max_id = filter_input(INPUT_GET, 'max_id' , FILTER_VALIDATE_INT); $max_id = $this->getRequestValue($request, 'max_id', 0, 0);
$min_id = filter_input(INPUT_GET, 'min_id' , FILTER_VALIDATE_INT); $min_id = $this->getRequestValue($request, 'min_id', 0, 0);
$cid = BaseApi::getContactIDForSearchterm($screen_name, $profile_url, $contact_id, $uid); $cid = BaseApi::getContactIDForSearchterm($screen_name, $profile_url, $contact_id, $uid);

23
src/Module/Api/Twitter/Friends/Ids.php
View File

@ -37,20 +37,17 @@ class Ids extends ContactEndpoint
$uid = BaseApi::getCurrentUserID(); $uid = BaseApi::getCurrentUserID();
// Expected value for user_id parameter: public/user contact id // Expected value for user_id parameter: public/user contact id
$contact_id = filter_input(INPUT_GET, 'user_id' , FILTER_VALIDATE_INT); $contact_id = $this->getRequestValue($request, 'user_id', 0);
$screen_name = filter_input(INPUT_GET, 'screen_name'); $screen_name = $this->getRequestValue($request, 'screen_name', '');
$profile_url = filter_input(INPUT_GET, 'profile_url'); $profile_url = $this->getRequestValue($request, 'profile_url', '');
$cursor = filter_input(INPUT_GET, 'cursor' , FILTER_VALIDATE_INT, ['options' => ['default' => -1]]); $cursor = $this->getRequestValue($request, 'cursor', -1);
$stringify_ids = filter_input(INPUT_GET, 'stringify_ids', FILTER_VALIDATE_BOOLEAN, ['options' => ['default' => false]]); $stringify_ids = $this->getRequestValue($request, 'stringify_ids', false);
$count = filter_input(INPUT_GET, 'count' , FILTER_VALIDATE_INT, ['options' => [ $count = $this->getRequestValue($request, 'count', self::DEFAULT_COUNT, 1, self::MAX_COUNT);
'default' => self::DEFAULT_COUNT,
'min_range' => 1,
'max_range' => self::MAX_COUNT,
]]);
// Friendica-specific // Friendica-specific
$since_id = filter_input(INPUT_GET, 'since_id' , FILTER_VALIDATE_INT); $since_id = $this->getRequestValue($request, 'since_id', 0, 0);
$max_id = filter_input(INPUT_GET, 'max_id' , FILTER_VALIDATE_INT); $max_id = $this->getRequestValue($request, 'max_id', 0, 0);
$min_id = filter_input(INPUT_GET, 'min_id' , FILTER_VALIDATE_INT); $min_id = $this->getRequestValue($request, 'min_id', 0, 0);
$cid = BaseApi::getContactIDForSearchterm($screen_name, $profile_url, $contact_id, $uid); $cid = BaseApi::getContactIDForSearchterm($screen_name, $profile_url, $contact_id, $uid);

25
src/Module/Api/Twitter/Friends/Lists.php
View File

@ -37,21 +37,18 @@ class Lists extends ContactEndpoint
$uid = BaseApi::getCurrentUserID(); $uid = BaseApi::getCurrentUserID();
// Expected value for user_id parameter: public/user contact id // Expected value for user_id parameter: public/user contact id
$contact_id = filter_input(INPUT_GET, 'user_id' , FILTER_VALIDATE_INT); $contact_id = $this->getRequestValue($request, 'user_id', 0);
$screen_name = filter_input(INPUT_GET, 'screen_name'); $screen_name = $this->getRequestValue($request, 'screen_name', '');
$profile_url = filter_input(INPUT_GET, 'profile_url'); $profile_url = $this->getRequestValue($request, 'profile_url', '');
$cursor = filter_input(INPUT_GET, 'cursor' , FILTER_VALIDATE_INT, ['options' => ['default' => -1]]); $cursor = $this->getRequestValue($request, 'cursor', -1);
$skip_status = filter_input(INPUT_GET, 'skip_status' , FILTER_VALIDATE_BOOLEAN, ['options' => ['default' => false]]); $skip_status = $this->getRequestValue($request, 'skip_status', false);
$include_user_entities = filter_input(INPUT_GET, 'include_user_entities', FILTER_VALIDATE_BOOLEAN, ['options' => ['default' => false]]); $include_user_entities = $this->getRequestValue($request, 'include_user_entities', false);
$count = filter_input(INPUT_GET, 'count' , FILTER_VALIDATE_INT, ['options' => [ $count = $this->getRequestValue($request, 'count', self::DEFAULT_COUNT, 1, self::MAX_COUNT);
'default' => self::DEFAULT_COUNT,
'min_range' => 1,
'max_range' => self::MAX_COUNT,
]]);
// Friendica-specific // Friendica-specific
$since_id = filter_input(INPUT_GET, 'since_id', FILTER_VALIDATE_INT); $since_id = $this->getRequestValue($request, 'since_id', 0, 0);
$max_id = filter_input(INPUT_GET, 'max_id' , FILTER_VALIDATE_INT); $max_id = $this->getRequestValue($request, 'max_id', 0, 0);
$min_id = filter_input(INPUT_GET, 'min_id' , FILTER_VALIDATE_INT); $min_id = $this->getRequestValue($request, 'min_id', 0, 0);
$cid = BaseApi::getContactIDForSearchterm($screen_name, $profile_url, $contact_id, $uid); $cid = BaseApi::getContactIDForSearchterm($screen_name, $profile_url, $contact_id, $uid);

17
src/Module/Api/Twitter/Friendships/Incoming.php
View File

@ -37,17 +37,14 @@ class Incoming extends ContactEndpoint
$uid = BaseApi::getCurrentUserID(); $uid = BaseApi::getCurrentUserID();
// Expected value for user_id parameter: public/user contact id // Expected value for user_id parameter: public/user contact id
$cursor = filter_input(INPUT_GET, 'cursor' , FILTER_VALIDATE_INT, ['options' => ['default' => -1]]); $cursor = $this->getRequestValue($request, 'cursor', -1);
$stringify_ids = filter_input(INPUT_GET, 'stringify_ids', FILTER_VALIDATE_BOOLEAN, ['options' => ['default' => false]]); $stringify_ids = $this->getRequestValue($request, 'stringify_ids', false);
$count = filter_input(INPUT_GET, 'count' , FILTER_VALIDATE_INT, ['options' => [ $count = $this->getRequestValue($request, 'count', self::DEFAULT_COUNT, 1, self::MAX_COUNT);
'default' => self::DEFAULT_COUNT,
'min_range' => 1,
'max_range' => self::MAX_COUNT,
]]);
// Friendica-specific // Friendica-specific
$since_id = filter_input(INPUT_GET, 'since_id', FILTER_VALIDATE_INT); $since_id = $this->getRequestValue($request, 'since_id', 0, 0);
$max_id = filter_input(INPUT_GET, 'max_id' , FILTER_VALIDATE_INT); $max_id = $this->getRequestValue($request, 'max_id', 0, 0);
$min_id = filter_input(INPUT_GET, 'min_id' , FILTER_VALIDATE_INT); $min_id = $this->getRequestValue($request, 'min_id', 0, 0);
$params = ['order' => ['cid' => true], 'limit' => $count]; $params = ['order' => ['cid' => true], 'limit' => $count];