MrPetovan/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request 'Fix phpstan error level 0 part2' (#1577) from fix-phpstan-error-level-0-part2 into develop

Browse source 
Reviewed-on: friendica/friendica-addons#1577
Reviewed-by: Hypolite Petovan <hypolite@mrpetovan.com>
This commit is contained in:
Hypolite Petovan 2024-12-01 03:20:18 +01:00
commit fb9c10f8c5
11 changed files with 171 additions and 148 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cld/cld.php
View file

@ -22,6 +22,16 @@ function cld_detect_languages(array &$data)
return; return;
} }
if (!class_exists('CLD2Detector')) {
Logger::warning('CLD2Detector class does not exist.');
return;
}
if (!class_exists('CLD2Encoding')) {
Logger::warning('CLD2Encoding class does not exist.');
return;
}
$cld2 = new \CLD2Detector(); $cld2 = new \CLD2Detector();
$cld2->setEncodingHint(CLD2Encoding::UTF8); // optional, hints about text encoding $cld2->setEncodingHint(CLD2Encoding::UTF8); // optional, hints about text encoding

3
convert/UnitConvertor.php
View file

@ -169,7 +169,6 @@ class UnitConvertor
* @param string name of the source unit from which to convert * @param string name of the source unit from which to convert
* @param string name of the target unit to which we are converting * @param string name of the target unit to which we are converting
* @param integer double precision of the end result * @param integer double precision of the end result
* @return void
* @access public * @access public
*/ */
function convert($value, $from_unit, $to_unit, $precision) function convert($value, $from_unit, $to_unit, $precision)
@ -280,4 +279,4 @@ class UnitConvertor
} // end func getConvSpecs } // end func getConvSpecs
} // end class UnitConvertor } // end class UnitConvertor
?> ?>

20
convert/convert.php
View file

@ -6,7 +6,6 @@
* Author: Mike Macgirvin <http://macgirvin.com/profile/mike> * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
function convert_install() { function convert_install() {
@ -26,7 +25,7 @@ function convert_content() {
// @TODO Let's one day rewrite this to a modern composer package // @TODO Let's one day rewrite this to a modern composer package
include 'UnitConvertor.php'; include 'UnitConvertor.php';
class TP_Converter extends UnitConvertor $conv = new class('en') extends UnitConvertor
{ {
public function __construct(string $lang = 'en') public function __construct(string $lang = 'en')
{ {
@ -43,7 +42,7 @@ function convert_content() {
private function findBaseUnit($from, $to) private function findBaseUnit($from, $to)
{ {
while (list($skey, $sval) = each($this->bases)) { foreach ($this->bases as $skey => $sval) {
if ($skey == $from || $to == $skey || in_array($to, $sval) || in_array($from, $sval)) { if ($skey == $from || $to == $skey || in_array($to, $sval) || in_array($from, $sval)) {
return $skey; return $skey;
} }
@ -63,7 +62,7 @@ function convert_content() {
$cells[] = $cell; $cells[] = $cell;
// We now have the base unit and value now lets produce the table; // We now have the base unit and value now lets produce the table;
while (list($key, $val) = each($this->bases[$base_unit])) { foreach ($this->bases[$base_unit] as $val) {
$cell ['value'] = $this->convert($value, $from_unit, $val, $precision) . ' ' . $val; $cell ['value'] = $this->convert($value, $from_unit, $val, $precision) . ' ' . $val;
$cell ['class'] = ($val == $from_unit || $val == $to_unit) ? 'framedred' : ''; $cell ['class'] = ($val == $from_unit || $val == $to_unit) ? 'framedred' : '';
$cells[] = $cell; $cells[] = $cell;
@ -86,9 +85,7 @@ function convert_content() {
return $string; return $string;
} }
} };
$conv = new TP_Converter('en');
$conversions = [ $conversions = [
'Temperature' => ['base' => 'Celsius', 'Temperature' => ['base' => 'Celsius',
@ -176,10 +173,10 @@ function convert_content() {
] ]
]; ];
while (list($key, $val) = each($conversions)) { foreach ($conversions as $key => $val) {
$conv->addConversion($val['base'], $val['conv']); $conv->addConversion($val['base'], $val['conv']);
$list[$key][] = $val['base']; $list[$key][] = $val['base'];
while (list($ukey, $uval) = each($val['conv'])) { foreach ($val['conv'] as $ukey => $uval) {
$list[$key][] = $ukey; $list[$key][] = $ukey;
} }
} }
@ -202,10 +199,9 @@ function convert_content() {
$o .= '<input name="value" type="text" id="value" value="' . $value . '" size="10" maxlength="10" />'; $o .= '<input name="value" type="text" id="value" value="' . $value . '" size="10" maxlength="10" />';
$o .= '<select name="from_unit" size="12">'; $o .= '<select name="from_unit" size="12">';
reset($list); foreach ($list as $key => $val) {
while(list($key, $val) = each($list)) {
$o .= "\n\t<optgroup label=\"$key\">"; $o .= "\n\t<optgroup label=\"$key\">";
while(list($ukey, $uval) = each($val)) { foreach ($val as $ukey => $uval) {
$selected = (($uval == $_POST['from_unit']) ? ' selected="selected" ' : ''); $selected = (($uval == $_POST['from_unit']) ? ' selected="selected" ' : '');
$o .= "\n\t\t<option value=\"$uval\" $selected >$uval</option>"; $o .= "\n\t\t<option value=\"$uval\" $selected >$uval</option>";
} }

2
diaspora/diasphp.php
View file

@ -9,6 +9,8 @@ use Friendica\Core\System;
class Diasphp { class Diasphp {
private $cookiejar; private $cookiejar;
private $token_regex;
private $pod;
function __construct($pod) { function __construct($pod) {
$this->token_regex = '/content="(.*?)" name="csrf-token/'; $this->token_regex = '/content="(.*?)" name="csrf-token/';

4
libravatar/Services/Libravatar.php
View file

@ -217,7 +217,7 @@ class Services_Libravatar
* *
* @param array $options Array of options for getUrl() * @param array $options Array of options for getUrl()
* *
* @return void * @return array
* @throws Exception When an invalid option is used * @throws Exception When an invalid option is used
*/ */
protected function checkOptionsArray($options) protected function checkOptionsArray($options)
@ -462,6 +462,8 @@ class Services_Libravatar
return $v['target']; return $v['target'];
} }
} }
return '';
} }
/** /**

2
mailstream/mailstream.php
View file

@ -378,7 +378,7 @@ function mailstream_send(string $message_id, array $item, array $user): bool
if (!$address) { if (!$address) {
$address = $user['email']; $address = $user['email'];
} }
$mail = new PHPmailer(); $mail = new PHPMailer();
try { try {
$mail->XMailer = 'Friendica Mailstream Addon'; $mail->XMailer = 'Friendica Mailstream Addon';
$mail->SetFrom($frommail, mailstream_sender($item)); $mail->SetFrom($frommail, mailstream_sender($item));

7
mailstream/phpmailer/class.phpmailer.php
View file

@ -1519,6 +1519,7 @@ class PHPMailer
public function getSMTPInstance() public function getSMTPInstance()
{ {
if (!is_object($this->smtp)) { if (!is_object($this->smtp)) {
/** @phpstan-ignore-next-line file class.smtp.php does not exist */
$this->smtp = new SMTP; $this->smtp = new SMTP;
} }
return $this->smtp; return $this->smtp;
@ -2690,10 +2691,10 @@ class PHPMailer
if (!is_readable($path)) { if (!is_readable($path)) {
throw new phpmailerException($this->lang('file_open') . $path, self::STOP_CONTINUE); throw new phpmailerException($this->lang('file_open') . $path, self::STOP_CONTINUE);
} }
$magic_quotes = get_magic_quotes_runtime(); $magic_quotes = false;
if ($magic_quotes) { if ($magic_quotes) {
if (version_compare(PHP_VERSION, '5.3.0', '<')) { if (version_compare(PHP_VERSION, '5.3.0', '<')) {
set_magic_quotes_runtime(false); //set_magic_quotes_runtime(false);
} else { } else {
//Doesn't exist in PHP 5.4, but we don't need to check because //Doesn't exist in PHP 5.4, but we don't need to check because
//get_magic_quotes_runtime always returns false in 5.4+ //get_magic_quotes_runtime always returns false in 5.4+
@ -2705,7 +2706,7 @@ class PHPMailer
$file_buffer = $this->encodeString($file_buffer, $encoding); $file_buffer = $this->encodeString($file_buffer, $encoding);
if ($magic_quotes) { if ($magic_quotes) {
if (version_compare(PHP_VERSION, '5.3.0', '<')) { if (version_compare(PHP_VERSION, '5.3.0', '<')) {
set_magic_quotes_runtime($magic_quotes); //set_magic_quotes_runtime($magic_quotes);
} else { } else {
ini_set('magic_quotes_runtime', $magic_quotes); ini_set('magic_quotes_runtime', $magic_quotes);
} }

173
pnut/lib/phpnut.php
View file

@ -2,6 +2,8 @@
namespace phpnut; namespace phpnut;
use CURLFile;
/** /**
* phpnut.php * phpnut.php
* pnut.io PHP library * pnut.io PHP library
@ -99,6 +101,10 @@ class phpnut
// if processing stream_markers or any fast stream, decrease $sleepFor // if processing stream_markers or any fast stream, decrease $sleepFor
public $streamingSleepFor = 20000; public $streamingSleepFor = 20000;
private $_clientId;
private $_clientSecret;
/** /**
* Constructs an phpnut PHP object with the specified client ID and * Constructs an phpnut PHP object with the specified client ID and
* client secret. * client secret.
@ -162,7 +168,7 @@ class phpnut
* from the user. If you don't specify anything, you'll only receive * from the user. If you don't specify anything, you'll only receive
* access to the user's basic profile (the default). * access to the user's basic profile (the default).
*/ */
public function getAuthUrl(?string $callback_uri=null, array|string|null $scope=null): string public function getAuthUrl(?string $callback_uri=null, array $scope=null): string
{ {
if (empty($this->_clientId)) { if (empty($this->_clientId)) {
throw new phpnutException('You must specify your pnut client ID'); throw new phpnutException('You must specify your pnut client ID');
@ -256,8 +262,10 @@ class phpnut
/** /**
* Check the scope of current token to see if it has required scopes * Check the scope of current token to see if it has required scopes
* has to be done after a check * has to be done after a check
*
* @return int|array
*/ */
public function checkScopes(array $app_scopes): int|array public function checkScopes(array $app_scopes)
{ {
if (count($this->_scopes) === 0) { if (count($this->_scopes) === 0) {
return -1; // _scope is empty return -1; // _scope is empty
@ -303,7 +311,7 @@ class phpnut
{ {
return $this->httpReq('delete', "{$this->_baseUrl}token"); return $this->httpReq('delete', "{$this->_baseUrl}token");
} }
/** /**
* Retrieve an app access token from the app.net API. This allows you * Retrieve an app access token from the app.net API. This allows you
* to access the API without going through the user access flow if you * to access the API without going through the user access flow if you
@ -314,7 +322,7 @@ class phpnut
* @return string The app access token * @return string The app access token
*/ */
public function getAppAccessToken() public function getAppAccessToken()
{ {
if (empty($this->_clientId) || empty($this->_clientSecret)) { if (empty($this->_clientId) || empty($this->_clientSecret)) {
throw new phpnutException('You must specify your Pnut client ID and client secret'); throw new phpnutException('You must specify your Pnut client ID and client secret');
} }
@ -450,8 +458,10 @@ class phpnut
/** /**
* Internal function to handle all * Internal function to handle all
* HTTP requests (POST,PUT,GET,DELETE) * HTTP requests (POST,PUT,GET,DELETE)
*
* @param string|array $params
*/ */
protected function httpReq(string $act, string $req, string|array $params=[], string $contentType='application/x-www-form-urlencoded') protected function httpReq(string $act, string $req, $params = [], string $contentType='application/x-www-form-urlencoded')
{ {
$ch = curl_init($req); $ch = curl_init($req);
$headers = []; $headers = [];
@ -520,7 +530,7 @@ class phpnut
} else { } else {
throw new phpnutException($response['error']); throw new phpnutException($response['error']);
} }
} }
// look for response migration errors // look for response migration errors
elseif (isset($response['meta'], $response['meta']['error_message'])) { elseif (isset($response['meta'], $response['meta']['error_message'])) {
@ -588,7 +598,7 @@ class phpnut
{ {
return $this->_last_request; return $this->_last_request;
} }
public function getLastResponse() public function getLastResponse()
{ {
return $this->_last_response; return $this->_last_response;
@ -752,7 +762,7 @@ class phpnut
* Retrieve the Posts that are 'in reply to' a specific Post. * Retrieve the Posts that are 'in reply to' a specific Post.
* @param integer $post_id The ID of the post you want to retrieve replies for. * @param integer $post_id The ID of the post you want to retrieve replies for.
* @param array $params An associative array of optional general parameters. * @param array $params An associative array of optional general parameters.
* @return An array of associative arrays, each representing a single post. * @return array An array of associative arrays, each representing a single post.
*/ */
public function getPostThread(int $post_id, array $params=[]) public function getPostThread(int $post_id, array $params=[])
{ {
@ -767,7 +777,7 @@ class phpnut
* Retrieve revisions of a post. Currently only one can be created. * Retrieve revisions of a post. Currently only one can be created.
* @param integer $post_id The ID of the post you want to retrieve previous revisions of. * @param integer $post_id The ID of the post you want to retrieve previous revisions of.
* @param array $params An associative array of optional general parameters. * @param array $params An associative array of optional general parameters.
* @return An array of associative arrays, each representing a single post. * @return array An array of associative arrays, each representing a single post.
*/ */
public function getPostRevisions(int $post_id, array $params=[]) public function getPostRevisions(int $post_id, array $params=[])
{ {
@ -781,13 +791,13 @@ class phpnut
/** /**
* Get the most recent Posts created by a specific User in reverse * Get the most recent Posts created by a specific User in reverse
* chronological order (most recent first). * chronological order (most recent first).
* @param mixed $user_id Either the ID of the user you wish to retrieve posts by, * @param string|int $user_id $user_id Either the ID of the user you wish to retrieve posts by,
* or the string "me", which will retrieve posts for the user you're authenticated * or the string "me", which will retrieve posts for the user you're authenticated
* as. * as.
* @param array $params An associative array of optional general parameters. * @param array $params An associative array of optional general parameters.
* @return An array of associative arrays, each representing a single post. * @return array An array of associative arrays, each representing a single post.
*/ */
public function getUserPosts(string|int $user_id='me', array $params=[]) public function getUserPosts($user_id = 'me', array $params=[])
{ {
return $this->httpReq( return $this->httpReq(
'get', 'get',
@ -799,13 +809,13 @@ class phpnut
/** /**
* Get the most recent Posts mentioning by a specific User in reverse * Get the most recent Posts mentioning by a specific User in reverse
* chronological order (newest first). * chronological order (newest first).
* @param mixed $user_id Either the ID of the user who is being mentioned, or * @param string|int $user_id Either the ID of the user who is being mentioned, or
* the string "me", which will retrieve posts for the user you're authenticated * the string "me", which will retrieve posts for the user you're authenticated
* as. * as.
* @param array $params An associative array of optional general parameters. * @param array $params An associative array of optional general parameters.
* @return An array of associative arrays, each representing a single post. * @return array An array of associative arrays, each representing a single post.
*/ */
public function getUserMentions(string|int $user_id='me', array $params=[]) public function getUserMentions($user_id='me', array $params=[])
{ {
return $this->httpReq( return $this->httpReq(
'get', 'get',
@ -817,7 +827,7 @@ class phpnut
/** /**
* Get the currently authenticated user's recent messages * Get the currently authenticated user's recent messages
* @param array $params An associative array of optional general parameters. * @param array $params An associative array of optional general parameters.
* @return An array of associative arrays, each representing a single post. * @return array An array of associative arrays, each representing a single post.
*/ */
public function getUserMessages(array $params=[]) public function getUserMessages(array $params=[])
{ {
@ -832,7 +842,7 @@ class phpnut
* Return the 20 most recent posts from the current User and * Return the 20 most recent posts from the current User and
* the Users they follow. * the Users they follow.
* @param array $params An associative array of optional general parameters. * @param array $params An associative array of optional general parameters.
* @return An array of associative arrays, each representing a single post. * @return array An array of associative arrays, each representing a single post.
*/ */
public function getUserStream(array $params=[]) public function getUserStream(array $params=[])
{ {
@ -847,7 +857,7 @@ class phpnut
* Retrieve a list of all public Posts on pnut.io, often referred to as the * Retrieve a list of all public Posts on pnut.io, often referred to as the
* global stream. * global stream.
* @param array $params An associative array of optional general parameters. * @param array $params An associative array of optional general parameters.
* @return An array of associative arrays, each representing a single post. * @return array An array of associative arrays, each representing a single post.
*/ */
public function getPublicPosts(array $params=[]) public function getPublicPosts(array $params=[])
{ {
@ -860,7 +870,7 @@ class phpnut
/** /**
* Retrieve a list of "explore" streams * Retrieve a list of "explore" streams
* @return An array of associative arrays, each representing a single explore stream. * @return array An array of associative arrays, each representing a single explore stream.
*/ */
public function getPostExploreStreams() public function getPostExploreStreams()
{ {
@ -874,7 +884,7 @@ class phpnut
* Retrieve a list of posts from an "explore" stream on pnut.io. * Retrieve a list of posts from an "explore" stream on pnut.io.
* @param string $slug [<description>] * @param string $slug [<description>]
* @param array $params An associative array of optional general parameters. * @param array $params An associative array of optional general parameters.
* @return An array of associative arrays, each representing a single post. * @return array An array of associative arrays, each representing a single post.
*/ */
public function getPostExploreStream(string $slug, array $params=[]) public function getPostExploreStream(string $slug, array $params=[])
{ {
@ -916,10 +926,11 @@ class phpnut
* are: count, before_id, since_id, include_muted, include_deleted, * are: count, before_id, since_id, include_muted, include_deleted,
* and include_post_raw. * and include_post_raw.
* See https://github.com/phpnut/api-spec/blob/master/resources/posts.md#general-parameters * See https://github.com/phpnut/api-spec/blob/master/resources/posts.md#general-parameters
* @param string|int $user_id
* @return array An array of associative arrays, each representing a single * @return array An array of associative arrays, each representing a single
* user who has bookmarked a post * user who has bookmarked a post
*/ */
public function getBookmarked(string|int $user_id='me', array $params=[]) public function getBookmarked($user_id='me', array $params=[])
{ {
return $this->httpReq( return $this->httpReq(
'get', 'get',
@ -967,7 +978,7 @@ class phpnut
/** /**
* Repost an existing Post object. * Repost an existing Post object.
* @param integer $post_id The id of the post * @param integer $post_id The id of the post
* @return the reposted post * @return mixed the reposted post
*/ */
public function repost(int $post_id) public function repost(int $post_id)
{ {
@ -980,7 +991,7 @@ class phpnut
/** /**
* Delete a post that the user has reposted. * Delete a post that the user has reposted.
* @param integer $post_id The id of the post * @param integer $post_id The id of the post
* @return the un-reposted post * @return mixed the un-reposted post
*/ */
public function deleteRepost(int $post_id) public function deleteRepost(int $post_id)
{ {
@ -997,7 +1008,7 @@ class phpnut
* This will likely change as the API evolves, as of this writing allowed keys * This will likely change as the API evolves, as of this writing allowed keys
* are: count, before_id, since_id, include_muted, include_deleted, * are: count, before_id, since_id, include_muted, include_deleted,
* include_directed_posts, and include_raw. * include_directed_posts, and include_raw.
* @return An array of associative arrays, each representing a single post. * @return array An array of associative arrays, each representing a single post.
*/ */
public function searchHashtags(string $hashtag, array $params=[]) public function searchHashtags(string $hashtag, array $params=[])
{ {
@ -1044,7 +1055,7 @@ class phpnut
* This will likely change as the API evolves, as of this writing allowed keys * This will likely change as the API evolves, as of this writing allowed keys
* are: count, before_id, since_id, include_muted, include_deleted, * are: count, before_id, since_id, include_muted, include_deleted,
* and include_post_raw. * and include_post_raw.
* @return An array of associative arrays, each representing a single post. * @return array An array of associative arrays, each representing a single post.
*/ */
public function getUserPersonalStream(array $params=[]) public function getUserPersonalStream(array $params=[])
{ {
@ -1063,7 +1074,7 @@ class phpnut
); );
} }
} }
/** /**
* Return the 20 most recent Posts from the current User's personalized stream * Return the 20 most recent Posts from the current User's personalized stream
* and mentions stream merged into one stream. * and mentions stream merged into one stream.
@ -1071,7 +1082,7 @@ class phpnut
* This will likely change as the API evolves, as of this writing allowed keys * This will likely change as the API evolves, as of this writing allowed keys
* are: count, before_id, since_id, include_muted, include_deleted, * are: count, before_id, since_id, include_muted, include_deleted,
* include_directed_posts, and include_raw. * include_directed_posts, and include_raw.
* @return An array of associative arrays, each representing a single post. * @return array An array of associative arrays, each representing a single post.
*/ */
public function getUserUnifiedStream(array $params=[]) public function getUserUnifiedStream(array $params=[])
{ {
@ -1096,14 +1107,14 @@ class phpnut
/** /**
* Returns a specific user object. * Returns a specific user object.
* @param mixed $user_id The ID of the user you want to retrieve, or the string "@-username", or the string * @param string|int $user_id The ID of the user you want to retrieve, or the string "@-username", or the string
* "me" to retrieve data for the users you're currently authenticated as. * "me" to retrieve data for the users you're currently authenticated as.
* @param array $params An associative array of optional general parameters. * @param array $params An associative array of optional general parameters.
* This will likely change as the API evolves, as of this writing allowed keys * This will likely change as the API evolves, as of this writing allowed keys
* are: include_raw|include_user_raw. * are: include_raw|include_user_raw.
* @return array An associative array representing the user data. * @return array An associative array representing the user data.
*/ */
public function getUser(string|int $user_id='me', array $params=[]) public function getUser($user_id='me', array $params=[])
{ {
return $this->httpReq( return $this->httpReq(
'get', 'get',
@ -1131,10 +1142,10 @@ class phpnut
/** /**
* Add the specified user ID to the list of users followed. * Add the specified user ID to the list of users followed.
* Returns the User object of the user being followed. * Returns the User object of the user being followed.
* @param integer $user_id The user ID of the user to follow. * @param string|int $user_id The user ID of the user to follow.
* @return array An associative array representing the user you just followed. * @return array An associative array representing the user you just followed.
*/ */
public function followUser(string|int $user_id) public function followUser($user_id)
{ {
return $this->httpReq( return $this->httpReq(
'put', 'put',
@ -1145,10 +1156,10 @@ class phpnut
/** /**
* Removes the specified user ID to the list of users followed. * Removes the specified user ID to the list of users followed.
* Returns the User object of the user being unfollowed. * Returns the User object of the user being unfollowed.
* @param integer $user_id The user ID of the user to unfollow. * @param string|int $user_id The user ID of the user to unfollow.
* @return array An associative array representing the user you just unfollowed. * @return array An associative array representing the user you just unfollowed.
*/ */
public function unfollowUser(string|int $user_id) public function unfollowUser($user_id)
{ {
return $this->httpReq( return $this->httpReq(
'delete', 'delete',
@ -1158,13 +1169,13 @@ class phpnut
/** /**
* Returns an array of User objects the specified user is following. * Returns an array of User objects the specified user is following.
* @param mixed $user_id Either the ID of the user being followed, or * @param string|int $user_id Either the ID of the user being followed, or
* the string "me", which will retrieve posts for the user you're authenticated * the string "me", which will retrieve posts for the user you're authenticated
* as. * as.
* @return array An array of associative arrays, each representing a single * @return array An array of associative arrays, each representing a single
* user following $user_id * user following $user_id
*/ */
public function getFollowing(string|int $user_id='me', array $params=[]) public function getFollowing($user_id='me', array $params=[])
{ {
return $this->httpReq( return $this->httpReq(
'get', 'get',
@ -1172,31 +1183,31 @@ class phpnut
. $this->buildQueryString($params) . $this->buildQueryString($params)
); );
} }
/** /**
* Returns an array of User ids the specified user is following. * Returns an array of User ids the specified user is following.
* @param mixed $user_id Either the ID of the user being followed, or * @param string|int $user_id Either the ID of the user being followed, or
* the string "me", which will retrieve posts for the user you're authenticated * the string "me", which will retrieve posts for the user you're authenticated
* as. * as.
* @return array user ids the specified user is following. * @return array user ids the specified user is following.
*/ */
public function getFollowingIDs(string|int $user_id='me') public function getFollowingIDs($user_id='me')
{ {
return $this->httpReq( return $this->httpReq(
'get', 'get',
"{$this->_baseUrl}users/{$user_id}/following?include_user=0" "{$this->_baseUrl}users/{$user_id}/following?include_user=0"
); );
} }
/** /**
* Returns an array of User objects for users following the specified user. * Returns an array of User objects for users following the specified user.
* @param mixed $user_id Either the ID of the user being followed, or * @param string|int $user_id Either the ID of the user being followed, or
* the string "me", which will retrieve posts for the user you're authenticated * the string "me", which will retrieve posts for the user you're authenticated
* as. * as.
* @return array An array of associative arrays, each representing a single * @return array An array of associative arrays, each representing a single
* user following $user_id * user following $user_id
*/ */
public function getFollowers(string|int $user_id='me', array $params=[]) public function getFollowers($user_id='me', array $params=[])
{ {
return $this->httpReq( return $this->httpReq(
'get', 'get',
@ -1204,15 +1215,15 @@ class phpnut
. $this->buildQueryString($params) . $this->buildQueryString($params)
); );
} }
/** /**
* Returns an array of User ids for users following the specified user. * Returns an array of User ids for users following the specified user.
* @param mixed $user_id Either the ID of the user being followed, or * @param string|int $user_id Either the ID of the user being followed, or
* the string "me", which will retrieve posts for the user you're authenticated * the string "me", which will retrieve posts for the user you're authenticated
* as. * as.
* @return array user ids for users following the specified user * @return array user ids for users following the specified user
*/ */
public function getFollowersIDs(string|int $user_id='me') public function getFollowersIDs($user_id='me')
{ {
return $this->httpReq( return $this->httpReq(
'get', 'get',
@ -1236,9 +1247,9 @@ class phpnut
/** /**
* Mute a user * Mute a user
* @param integer $user_id The user ID to mute * @param string|int $user_id The user ID to mute
*/ */
public function muteUser(string|int $user_id) public function muteUser($user_id)
{ {
return $this->httpReq( return $this->httpReq(
'put', 'put',
@ -1248,9 +1259,9 @@ class phpnut
/** /**
* Unmute a user * Unmute a user
* @param integer $user_id The user ID to unmute * @param string|int $user_id The user ID to unmute
*/ */
public function unmuteUser(string|int $user_id) public function unmuteUser($user_id)
{ {
return $this->httpReq( return $this->httpReq(
'delete', 'delete',
@ -1288,7 +1299,7 @@ class phpnut
* @param string $search The search query. Supports @username or #tag searches as * @param string $search The search query. Supports @username or #tag searches as
* well as normal search terms. Searches username, display name, bio information. * well as normal search terms. Searches username, display name, bio information.
* Does not search posts. * Does not search posts.
* @return array An array of associative arrays, each representing one user. * @return array|false An array of associative arrays, each representing one user.
*/ */
public function searchUsers(array $params=[], string $query='') public function searchUsers(array $params=[], string $query='')
{ {
@ -1333,7 +1344,7 @@ class phpnut
$mimeType = $test['mime']; $mimeType = $test['mime'];
} }
$data = [ $data = [
$which => new CurlFile($image, $mimeType) $which => new CURLFile($image, $mimeType)
]; ];
return $this->httpReq( return $this->httpReq(
'post-raw', 'post-raw',
@ -1445,10 +1456,10 @@ class phpnut
/** /**
* get an existing private message channel between multiple users * get an existing private message channel between multiple users
* @param mixed $users Can be a comma- or space-separated string, or an array. * @param string|array $users Can be a comma- or space-separated string, or an array.
* Usernames with @-symbol, or user ids. * Usernames with @-symbol, or user ids.
*/ */
public function getExistingPM(string|array $users, array $params=[]) public function getExistingPM($users, array $params=[])
{ {
if (is_string($users)) { if (is_string($users)) {
$users = explode(',', str_replace(' ', ',', $users)); $users = explode(',', str_replace(' ', ',', $users));
@ -1561,7 +1572,7 @@ class phpnut
/** /**
* Retrieve a list of "explore" streams * Retrieve a list of "explore" streams
* @return An array of associative arrays, each representing a single explore stream. * @return array An array of associative arrays, each representing a single explore stream.
*/ */
public function getChannelExploreStreams() public function getChannelExploreStreams()
{ {
@ -1575,7 +1586,7 @@ class phpnut
* Retrieve a list of channels from an "explore" stream on pnut.io. * Retrieve a list of channels from an "explore" stream on pnut.io.
* @param string $slug [<description>] * @param string $slug [<description>]
* @param array $params An associative array of optional general parameters. * @param array $params An associative array of optional general parameters.
* @return An array of associative arrays, each representing a single channel. * @return array An array of associative arrays, each representing a single channel.
*/ */
public function getChannelExploreStream(string $slug, array $params=[]) public function getChannelExploreStream(string $slug, array $params=[])
{ {
@ -1585,7 +1596,7 @@ class phpnut
. $this->buildQueryString($params) . $this->buildQueryString($params)
); );
} }
/** /**
* mark channel inactive * mark channel inactive
*/ */
@ -1685,11 +1696,11 @@ class phpnut
/** /**
* create message * create message
* @param $channelid numeric or "pm" for auto-channel (type=io.pnut.core.pm) * @param string|int $channelid numeric or "pm" for auto-channel (type=io.pnut.core.pm)
* @param array $data array('text'=>'YOUR_MESSAGE') If a type=io.pnut.core.pm, then "destinations" key can be set to address as an array of people to send this PM too * @param array $data array('text'=>'YOUR_MESSAGE') If a type=io.pnut.core.pm, then "destinations" key can be set to address as an array of people to send this PM too
* @param array $params query parameters * @param array $params query parameters
*/ */
public function createMessage(string|int $channelid, array $data, array $params=[]) public function createMessage($channelid, array $data, array $params=[])
{ {
if (isset($data['destinations'])) { if (isset($data['destinations'])) {
if (is_string($data['destinations'])) { if (is_string($data['destinations'])) {
@ -1802,16 +1813,16 @@ class phpnut
public function createFile($file, array $data, array $params=[]) public function createFile($file, array $data, array $params=[])
{ {
if (!$file) { if (!$file) {
throw new PhpnutException('You must specify a path to a file'); throw new phpnutException('You must specify a path to a file');
} }
if (!file_exists($file)) { if (!file_exists($file)) {
throw new PhpnutException('File path specified does not exist'); throw new phpnutException('File path specified does not exist');
} }
if (!is_readable($file)) { if (!is_readable($file)) {
throw new PhpnutException('File path specified is not readable'); throw new phpnutException('File path specified is not readable');
} }
if (!array_key_exists('type', $data) || !$data['type']) { if (!array_key_exists('type', $data) || !$data['type']) {
throw new PhpnutException('Type is required when creating a file'); throw new phpnutException('Type is required when creating a file');
} }
if (!array_key_exists('name', $data)) { if (!array_key_exists('name', $data)) {
$data['name'] = basename($file); $data['name'] = basename($file);
@ -1823,7 +1834,7 @@ class phpnut
$mimeType = null; $mimeType = null;
} }
if (!array_key_exists('kind', $data)) { if (!array_key_exists('kind', $data)) {
$test = @getimagesize($path); $test = @getimagesize($file);
if ($test && array_key_exists('mime', $test)) { if ($test && array_key_exists('mime', $test)) {
$data['kind'] = 'image'; $data['kind'] = 'image';
if (!$mimeType) { if (!$mimeType) {
@ -1840,7 +1851,7 @@ class phpnut
finfo_close($finfo); finfo_close($finfo);
} }
if (!$mimeType) { if (!$mimeType) {
throw new PhpnutException('Unable to determine mime type of file, try specifying it explicitly'); throw new phpnutException('Unable to determine mime type of file, try specifying it explicitly');
} }
$data['content'] = new \CurlFile($file, $mimeType); $data['content'] = new \CurlFile($file, $mimeType);
return $this->httpReq( return $this->httpReq(
@ -2001,7 +2012,7 @@ class phpnut
$json = json_encode($data); $json = json_encode($data);
return $this->httpReq( return $this->httpReq(
'post', 'post',
$this->_baseUrl.'polls?'.$this->buildQueryString($params), $this->_baseUrl.'polls?'.$this->buildQueryString($params),
$json, $json,
'application/json' 'application/json'
); );
@ -2019,7 +2030,7 @@ class phpnut
return $this->httpReq( return $this->httpReq(
'put', 'put',
$this->_baseUrl.'polls/'.urlencode($poll_id).'/response?'.$this->buildQueryString($params), $this->_baseUrl.'polls/'.urlencode($poll_id).'/response?'.$this->buildQueryString($params),
$json, $json,
'application/json' 'application/json'
); );
} }
@ -2118,7 +2129,7 @@ class phpnut
$params $params
); );
} }
/** /**
* Get User Information * Get User Information
*/ */
@ -2129,7 +2140,7 @@ class phpnut
"{$this->_baseUrl}token" "{$this->_baseUrl}token"
); );
} }
/** /**
* Get Application Authorized User IDs * Get Application Authorized User IDs
*/ */
@ -2147,7 +2158,7 @@ class phpnut
$params $params
); );
} }
/** /**
* Get Application Authorized User Tokens * Get Application Authorized User Tokens
*/ */
@ -2181,7 +2192,7 @@ class phpnut
{ {
$this->_streamCallback = $function; $this->_streamCallback = $function;
} }
/** /**
* Opens a stream that's been created for this user/app and starts sending * Opens a stream that's been created for this user/app and starts sending
* events/objects to your defined callback functions. You must define at * events/objects to your defined callback functions. You must define at
@ -2231,7 +2242,7 @@ class phpnut
); );
return true; return true;
} }
/** /**
* Close the currently open stream. * Close the currently open stream.
* @return true; * @return true;
@ -2251,7 +2262,7 @@ class phpnut
$this->_currentStream = null; $this->_currentStream = null;
$this->_multiStream = null; $this->_multiStream = null;
} }
/** /**
* Retrieve all streams for the current access token. * Retrieve all streams for the current access token.
* @return array An array of stream definitions. * @return array An array of stream definitions.
@ -2263,7 +2274,7 @@ class phpnut
"{$this->_baseUrl}streams" "{$this->_baseUrl}streams"
); );
} }
/** /**
* Returns a single stream specified by a stream ID. The stream must have been * Returns a single stream specified by a stream ID. The stream must have been
* created with the current access token. * created with the current access token.
@ -2276,7 +2287,7 @@ class phpnut
$this->_baseUrl.'streams/'.urlencode($streamId) $this->_baseUrl.'streams/'.urlencode($streamId)
); );
} }
/** /**
* Creates a stream for the current app access token. * Creates a stream for the current app access token.
* *
@ -2307,7 +2318,7 @@ class phpnut
); );
return $response; return $response;
} }
/** /**
* Update stream for the current app access token * Update stream for the current app access token
* *
@ -2338,7 +2349,7 @@ class phpnut
); );
return $response; return $response;
} }
/** /**
* Deletes a stream if you no longer need it. * Deletes a stream if you no longer need it.
* *
@ -2352,7 +2363,7 @@ class phpnut
$this->_baseUrl.'streams/'.urlencode($streamId) $this->_baseUrl.'streams/'.urlencode($streamId)
); );
} }
/** /**
* Deletes all streams created by the current access token. * Deletes all streams created by the current access token.
*/ */
@ -2363,7 +2374,7 @@ class phpnut
"{$this->_baseUrl}streams" "{$this->_baseUrl}streams"
); );
} }
/** /**
* Internal function used to process incoming chunks from the stream. This is only * Internal function used to process incoming chunks from the stream. This is only
* public because it needs to be accessed by CURL. Do not call or use this function * public because it needs to be accessed by CURL. Do not call or use this function
@ -2394,7 +2405,7 @@ class phpnut
} }
return strlen($data); return strlen($data);
} }
/** /**
* Opens a long lived HTTP connection to the pnut.io servers, and sends data * Opens a long lived HTTP connection to the pnut.io servers, and sends data
* received to the httpStreamReceive function. As a general rule you should not * received to the httpStreamReceive function. As a general rule you should not
@ -2426,7 +2437,7 @@ class phpnut
$this->_lastStreamActivity = time(); $this->_lastStreamActivity = time();
curl_multi_add_handle($this->_multiStream, $this->_currentStream); curl_multi_add_handle($this->_multiStream, $this->_currentStream);
} }
public function reconnectStream(): void public function reconnectStream(): void
{ {
$this->closeStream(); $this->closeStream();
@ -2442,7 +2453,7 @@ class phpnut
} }
$this->httpStream('get', $this->_streamUrl); $this->httpStream('get', $this->_streamUrl);
} }
/** /**
* Process an open stream for x microseconds, then return. This is useful if you want * Process an open stream for x microseconds, then return. This is useful if you want
* to be doing other things while processing the stream. If you just want to * to be doing other things while processing the stream. If you just want to
@ -2487,7 +2498,7 @@ class phpnut
} }
} while ($timeSoFar+$sleepFor < $microseconds); } while ($timeSoFar+$sleepFor < $microseconds);
} }
/** /**
* Process an open stream forever. This function will never return, if you * Process an open stream forever. This function will never return, if you
* want to perform other actions while consuming the stream, you should use * want to perform other actions while consuming the stream, you should use

86
pumpio/oauth/http.php
View file

@ -109,9 +109,11 @@ class http_class
var $connected_port = -1; var $connected_port = -1;
var $connected_ssl = 0; var $connected_ssl = 0;
private $content_length_set;
/* Private methods - DO NOT CALL */ /* Private methods - DO NOT CALL */
Function Tokenize($string,$separator="") private function Tokenize($string,$separator="")
{ {
if(!strcmp($separator,"")) if(!strcmp($separator,""))
{ {
@ -135,18 +137,18 @@ class http_class
} }
} }
Function CookieEncode($value, $name) private function CookieEncode($value, $name)
{ {
return($name ? str_replace("=", "%25", $value) : str_replace(";", "%3B", $value)); return($name ? str_replace("=", "%25", $value) : str_replace(";", "%3B", $value));
} }
Function SetError($error, $error_code = HTTP_CLIENT_ERROR_UNSPECIFIED_ERROR) private function SetError($error, $error_code = HTTP_CLIENT_ERROR_UNSPECIFIED_ERROR)
{ {
$this->error_code = $error_code; $this->error_code = $error_code;
return($this->error=$error); return($this->error=$error);
} }
Function SetPHPError($error, &$php_error_message, $error_code = HTTP_CLIENT_ERROR_UNSPECIFIED_ERROR) private function SetPHPError($error, &$php_error_message, $error_code = HTTP_CLIENT_ERROR_UNSPECIFIED_ERROR)
{ {
if(IsSet($php_error_message) if(IsSet($php_error_message)
&& strlen($php_error_message)) && strlen($php_error_message))
@ -154,7 +156,7 @@ class http_class
return($this->SetError($error, $error_code)); return($this->SetError($error, $error_code));
} }
Function SetDataAccessError($error,$check_connection=0) private function SetDataAccessError($error,$check_connection=0)
{ {
$this->error=$error; $this->error=$error;
$this->error_code = HTTP_CLIENT_ERROR_COMMUNICATION_FAILURE; $this->error_code = HTTP_CLIENT_ERROR_COMMUNICATION_FAILURE;
@ -174,7 +176,7 @@ class http_class
} }
} }
Function OutputDebug($message) private function OutputDebug($message)
{ {
if($this->log_debug) if($this->log_debug)
error_log($message); error_log($message);
@ -188,7 +190,7 @@ class http_class
} }
} }
Function GetLine() private function GetLine()
{ {
for($line="";;) for($line="";;)
{ {
@ -227,7 +229,7 @@ class http_class
} }
} }
Function PutLine($line) private function PutLine($line)
{ {
if($this->debug) if($this->debug)
$this->OutputDebug("C $line"); $this->OutputDebug("C $line");
@ -239,7 +241,7 @@ class http_class
return(1); return(1);
} }
Function PutData($data) private function PutData($data)
{ {
if(strlen($data)) if(strlen($data))
{ {
@ -254,7 +256,7 @@ class http_class
return(1); return(1);
} }
Function FlushData() private function FlushData()
{ {
if(!fflush($this->connection)) if(!fflush($this->connection))
{ {
@ -264,7 +266,7 @@ class http_class
return(1); return(1);
} }
Function ReadChunkSize() private function ReadChunkSize()
{ {
if($this->remaining_chunk==0) if($this->remaining_chunk==0)
{ {
@ -289,7 +291,7 @@ class http_class
return(""); return("");
} }
Function ReadBytes($length) private function ReadBytes($length)
{ {
if($this->use_curl) if($this->use_curl)
{ {
@ -356,7 +358,7 @@ class http_class
return($bytes); return($bytes);
} }
Function EndOfInput() private function EndOfInput()
{ {
if($this->use_curl) if($this->use_curl)
return($this->read_response>=strlen($this->response)); return($this->read_response>=strlen($this->response));
@ -367,7 +369,7 @@ class http_class
return(feof($this->connection)); return(feof($this->connection));
} }
Function Resolve($domain, &$ip, $server_type) private function Resolve($domain, &$ip, $server_type)
{ {
if(preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/',$domain)) if(preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/',$domain))
$ip=$domain; $ip=$domain;
@ -385,7 +387,7 @@ class http_class
return(''); return('');
} }
Function Connect($host_name, $host_port, $ssl, $server_type = 'HTTP') private function Connect($host_name, $host_port, $ssl, $server_type = 'HTTP')
{ {
$domain=$host_name; $domain=$host_name;
$port = $host_port; $port = $host_port;
@ -552,7 +554,7 @@ class http_class
} }
} }
Function Disconnect() private function Disconnect()
{ {
if($this->debug) if($this->debug)
$this->OutputDebug("Disconnected from ".$this->connected_host); $this->OutputDebug("Disconnected from ".$this->connected_host);
@ -569,7 +571,7 @@ class http_class
/* Public methods */ /* Public methods */
Function GetRequestArguments($url, &$arguments) public function GetRequestArguments($url, &$arguments)
{ {
$this->error = ''; $this->error = '';
$this->error_code = HTTP_CLIENT_ERROR_NO_ERROR; $this->error_code = HTTP_CLIENT_ERROR_NO_ERROR;
@ -621,7 +623,7 @@ class http_class
return(""); return("");
} }
Function Open($arguments) public function Open($arguments)
{ {
if(strlen($this->error)) if(strlen($this->error))
return($this->error); return($this->error);
@ -750,7 +752,7 @@ class http_class
return(""); return("");
} }
Function Close($force = 0) public function Close($force = 0)
{ {
if($this->state=="Disconnected") if($this->state=="Disconnected")
return("1 already disconnected"); return("1 already disconnected");
@ -767,7 +769,7 @@ class http_class
return($this->Disconnect()); return($this->Disconnect());
} }
Function PickCookies(&$cookies,$secure) private function PickCookies(&$cookies,$secure)
{ {
if(IsSet($this->cookies[$secure])) if(IsSet($this->cookies[$secure]))
{ {
@ -803,7 +805,7 @@ class http_class
} }
} }
Function GetFileDefinition($file, &$definition) private function GetFileDefinition($file, &$definition)
{ {
$name=""; $name="";
if(IsSet($file["FileName"])) if(IsSet($file["FileName"]))
@ -990,9 +992,6 @@ class http_class
if(GetType($length=@filesize($file["FileName"]))!="integer") if(GetType($length=@filesize($file["FileName"]))!="integer")
{ {
$error="it was not possible to determine the length of the file ".$file["FileName"]; $error="it was not possible to determine the length of the file ".$file["FileName"];
if(IsSet($php_errormsg)
&& strlen($php_errormsg))
$error.=": ".$php_errormsg;
if(!file_exists($file["FileName"])) if(!file_exists($file["FileName"]))
$error="it was not possible to access the file ".$file["FileName"]; $error="it was not possible to access the file ".$file["FileName"];
return($error); return($error);
@ -1007,7 +1006,7 @@ class http_class
return(""); return("");
} }
Function ConnectFromProxy($arguments, &$headers) private function ConnectFromProxy($arguments, &$headers)
{ {
if(!$this->PutLine('CONNECT '.$this->host_name.':'.($this->host_port ? $this->host_port : 443).' HTTP/1.0') if(!$this->PutLine('CONNECT '.$this->host_name.':'.($this->host_port ? $this->host_port : 443).' HTTP/1.0')
|| (strlen($this->user_agent) || (strlen($this->user_agent)
@ -1052,7 +1051,7 @@ class http_class
return(""); return("");
} }
Function SendRequest($arguments) public function SendRequest($arguments)
{ {
if(strlen($this->error)) if(strlen($this->error))
return($this->error); return($this->error);
@ -1440,7 +1439,7 @@ class http_class
return(""); return("");
} }
Function SetCookie($name, $value, $expires="" , $path="/" , $domain="" , $secure=0, $verbatim=0) private function SetCookie($name, $value, $expires="" , $path="/" , $domain="" , $secure=0, $verbatim=0)
{ {
if(strlen($this->error)) if(strlen($this->error))
return($this->error); return($this->error);
@ -1472,7 +1471,7 @@ class http_class
return(""); return("");
} }
Function SendRequestBody($data, $end_of_data) private function SendRequestBody($data, $end_of_data)
{ {
if(strlen($this->error)) if(strlen($this->error))
return($this->error); return($this->error);
@ -1508,7 +1507,7 @@ class http_class
return(""); return("");
} }
Function ReadReplyHeadersResponse(&$headers) private function ReadReplyHeadersResponse(&$headers)
{ {
$headers=array(); $headers=array();
if(strlen($this->error)) if(strlen($this->error))
@ -1635,7 +1634,7 @@ class http_class
return(""); return("");
} }
Function Redirect(&$headers) private function Redirect(&$headers)
{ {
if($this->follow_redirect) if($this->follow_redirect)
{ {
@ -1678,7 +1677,7 @@ class http_class
return(""); return("");
} }
Function Authenticate(&$headers, $proxy, &$proxy_authorization, &$user, &$password, &$realm, &$workstation) private function Authenticate(&$headers, $proxy, &$proxy_authorization, &$user, &$password, &$realm, &$workstation)
{ {
if($proxy) if($proxy)
{ {
@ -1697,9 +1696,10 @@ class http_class
if(IsSet($headers[$authenticate_header]) if(IsSet($headers[$authenticate_header])
&& $this->sasl_authenticate) && $this->sasl_authenticate)
{ {
if(function_exists("class_exists") if(!class_exists('sasl_client_class'))
&& !class_exists("sasl_client_class")) {
return($this->SetError("the SASL client class needs to be loaded to be able to authenticate".($proxy ? " with the proxy server" : "")." and access this site", HTTP_CLIENT_ERROR_INVALID_PARAMETERS)); return($this->SetError("the SASL client class needs to be loaded to be able to authenticate".($proxy ? " with the proxy server" : "")." and access this site", HTTP_CLIENT_ERROR_INVALID_PARAMETERS));
}
if(GetType($headers[$authenticate_header])=="array") if(GetType($headers[$authenticate_header])=="array")
$authenticate=$headers[$authenticate_header]; $authenticate=$headers[$authenticate_header];
else else
@ -1719,7 +1719,7 @@ class http_class
else else
$mechanisms[]=$mechanism; $mechanisms[]=$mechanism;
} }
$sasl=new sasl_client_class; $sasl=new \sasl_client_class();
if(IsSet($user)) if(IsSet($user))
$sasl->SetCredential("user",$user); $sasl->SetCredential("user",$user);
if(IsSet($password)) if(IsSet($password))
@ -1731,6 +1731,8 @@ class http_class
$sasl->SetCredential("uri",$this->request_uri); $sasl->SetCredential("uri",$this->request_uri);
$sasl->SetCredential("method",$this->request_method); $sasl->SetCredential("method",$this->request_method);
$sasl->SetCredential("session",$this->session); $sasl->SetCredential("session",$this->session);
$message = '';
$interactions = [];
do do
{ {
$status=$sasl->Start($mechanisms,$message,$interactions); $status=$sasl->Start($mechanisms,$message,$interactions);
@ -1906,8 +1908,8 @@ class http_class
} }
return(""); return("");
} }
Function ReadReplyHeaders(&$headers) public function ReadReplyHeaders(&$headers)
{ {
if(strlen($error=$this->ReadReplyHeadersResponse($headers))) if(strlen($error=$this->ReadReplyHeadersResponse($headers)))
return($error); return($error);
@ -1938,7 +1940,7 @@ class http_class
return(""); return("");
} }
Function ReadReplyBody(&$body,$length) private function ReadReplyBody(&$body,$length)
{ {
$body=""; $body="";
if(strlen($this->error)) if(strlen($this->error))
@ -1980,7 +1982,7 @@ class http_class
return(""); return("");
} }
Function ReadWholeReplyBody(&$body) public function ReadWholeReplyBody(&$body)
{ {
$body = ''; $body = '';
for(;;) for(;;)
@ -1993,7 +1995,7 @@ class http_class
} }
} }
Function SaveCookies(&$cookies, $domain='', $secure_only=0, $persistent_only=0) private function SaveCookies(&$cookies, $domain='', $secure_only=0, $persistent_only=0)
{ {
$now=gmdate("Y-m-d H-i-s"); $now=gmdate("Y-m-d H-i-s");
$cookies=array(); $cookies=array();
@ -2034,17 +2036,17 @@ class http_class
} }
} }
Function SavePersistentCookies(&$cookies, $domain='', $secure_only=0) private function SavePersistentCookies(&$cookies, $domain='', $secure_only=0)
{ {
$this->SaveCookies($cookies, $domain, $secure_only, 1); $this->SaveCookies($cookies, $domain, $secure_only, 1);
} }
Function GetPersistentCookies(&$cookies, $domain='', $secure_only=0) private function GetPersistentCookies(&$cookies, $domain='', $secure_only=0)
{ {
$this->SavePersistentCookies($cookies, $domain, $secure_only); $this->SavePersistentCookies($cookies, $domain, $secure_only);
} }
Function RestoreCookies($cookies, $clear=1) private function RestoreCookies($cookies, $clear=1)
{ {
$new_cookies=($clear ? array() : $this->cookies); $new_cookies=($clear ? array() : $this->cookies);
for($secure_cookies=0, Reset($cookies); $secure_cookies<count($cookies); Next($cookies), $secure_cookies++) for($secure_cookies=0, Reset($cookies); $secure_cookies<count($cookies); Next($cookies), $secure_cookies++)

8
s3_storage/src/S3Client.php
View file

@ -4,10 +4,10 @@ namespace Friendica\Addon\s3_storage\src;
defined('AKEEBAENGINE') or define('AKEEBAENGINE', 1); defined('AKEEBAENGINE') or define('AKEEBAENGINE', 1);
use Akeeba\Engine\Postproc\Connector\S3v4\Configuration; use Akeeba\S3\Configuration;
use Akeeba\Engine\Postproc\Connector\S3v4\Connector; use Akeeba\S3\Connector;
use Akeeba\Engine\Postproc\Connector\S3v4\Exception\CannotDeleteFile; use Akeeba\S3\Exception\CannotDeleteFile;
use Akeeba\Engine\Postproc\Connector\S3v4\Input; use Akeeba\S3\Input;
use Friendica\Core\Storage\Capability\ICanWriteToStorage; use Friendica\Core\Storage\Capability\ICanWriteToStorage;
use Friendica\Core\Storage\Exception\StorageException; use Friendica\Core\Storage\Exception\StorageException;
use Friendica\Util\Strings; use Friendica\Util\Strings;

4
s3_storage/src/S3Config.php
View file

@ -4,8 +4,8 @@ namespace Friendica\Addon\s3_storage\src;
defined('AKEEBAENGINE') or define('AKEEBAENGINE', 1); defined('AKEEBAENGINE') or define('AKEEBAENGINE', 1);
use Akeeba\Engine\Postproc\Connector\S3v4\Configuration; use Akeeba\S3\Configuration;
use Akeeba\Engine\Postproc\Connector\S3v4\Connector; use Akeeba\S3\Connector;
use Friendica\Core\Config\Capability\IManageConfigValues; use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\Storage\Capability\ICanConfigureStorage; use Friendica\Core\Storage\Capability\ICanConfigureStorage;