friendica/friendica-addons
1
0
Fork 0
mirror of https://git.friendi.ca/friendica/friendica-addons.git synced 2025-07-19 06:47:03 +00:00
Code Issues Releases Wiki Activity

Continued:

Browse source 
- changed NULL -> null (was used at more places)
- converted CRLF -> LF

Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2018-05-10 23:00:12 +02:00
parent eaa307be58
commit d05a92370a
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
5 changed files with 115 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

2
blockem/blockem.php
View file

@ -139,7 +139,7 @@ function blockem_prepare_body_content_filter(App $a, array &$hook_data)
} }
} }
function blockem_display_item(App $a, array &$b = NULL) { function blockem_display_item(App $a, array &$b = null) {
if (strstr($b['output']['body'],'id="blockem-wrap-')) { if (strstr($b['output']['body'],'id="blockem-wrap-')) {
$b['output']['thumb'] = $a->get_baseurl() . "/images/person-80.jpg"; $b['output']['thumb'] = $a->get_baseurl() . "/images/person-80.jpg";
} }

4
statusnet/library/codebirdsn.php
View file

@ -317,7 +317,7 @@ class CodebirdSN
* *
* @return string The OAuth authenticate URL * @return string The OAuth authenticate URL
*/ */
public function oauth_authenticate($force_login = NULL, $screen_name = NULL) public function oauth_authenticate($force_login = null, $screen_name = null)
{ {
if ($this->_oauth_token == null) { if ($this->_oauth_token == null) {
throw new \Exception('To get the authenticate URL, the OAuth token must be set.'); throw new \Exception('To get the authenticate URL, the OAuth token must be set.');
@ -337,7 +337,7 @@ class CodebirdSN
* *
* @return string The OAuth authorize URL * @return string The OAuth authorize URL
*/ */
public function oauth_authorize($force_login = NULL, $screen_name = NULL) public function oauth_authorize($force_login = null, $screen_name = null)
{ {
if ($this->_oauth_token == null) { if ($this->_oauth_token == null) {
throw new \Exception('To get the authorize URL, the OAuth token must be set.'); throw new \Exception('To get the authorize URL, the OAuth token must be set.');

208
statusnet/library/statusnetoauth.php
View file

@ -1,104 +1,104 @@
<?php <?php
use Friendica\Core\Config; use Friendica\Core\Config;
require_once __DIR__ . DIRECTORY_SEPARATOR . 'twitteroauth.php'; require_once __DIR__ . DIRECTORY_SEPARATOR . 'twitteroauth.php';
/* /*
* We have to alter the TwitterOAuth class a little bit to work with any GNU Social * We have to alter the TwitterOAuth class a little bit to work with any GNU Social
* installation abroad. Basically it's only make the API path variable and be happy. * installation abroad. Basically it's only make the API path variable and be happy.
* *
* Thank you guys for the Twitter compatible API! * Thank you guys for the Twitter compatible API!
*/ */
class StatusNetOAuth extends TwitterOAuth class StatusNetOAuth extends TwitterOAuth
{ {
function get_maxlength() function get_maxlength()
{ {
$config = $this->get($this->host . 'statusnet/config.json'); $config = $this->get($this->host . 'statusnet/config.json');
return $config->site->textlimit; return $config->site->textlimit;
} }
function accessTokenURL() function accessTokenURL()
{ {
return $this->host . 'oauth/access_token'; return $this->host . 'oauth/access_token';
} }
function authenticateURL() function authenticateURL()
{ {
return $this->host . 'oauth/authenticate'; return $this->host . 'oauth/authenticate';
} }
function authorizeURL() function authorizeURL()
{ {
return $this->host . 'oauth/authorize'; return $this->host . 'oauth/authorize';
} }
function requestTokenURL() function requestTokenURL()
{ {
return $this->host . 'oauth/request_token'; return $this->host . 'oauth/request_token';
} }
function __construct($apipath, $consumer_key, $consumer_secret, $oauth_token = NULL, $oauth_token_secret = NULL) function __construct($apipath, $consumer_key, $consumer_secret, $oauth_token = null, $oauth_token_secret = null)
{ {
parent::__construct($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret); parent::__construct($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret);
$this->host = $apipath; $this->host = $apipath;
} }
/** /**
* Make an HTTP request * Make an HTTP request
* *
* Copied here from the TwitterOAuth library and complemented by applying the proxy settings of Friendica * Copied here from the TwitterOAuth library and complemented by applying the proxy settings of Friendica
* *
* @param string $method * @param string $method
* @param string $host * @param string $host
* @param string $path * @param string $path
* @param array $parameters * @param array $parameters
* *
* @return array|object API results * @return array|object API results
*/ */
function http($url, $method, $postfields = NULL) function http($url, $method, $postfields = null)
{ {
$this->http_info = []; $this->http_info = [];
$ci = curl_init(); $ci = curl_init();
/* Curl settings */ /* Curl settings */
$prx = Config::get('system', 'proxy'); $prx = Config::get('system', 'proxy');
if (strlen($prx)) { if (strlen($prx)) {
curl_setopt($ci, CURLOPT_HTTPPROXYTUNNEL, 1); curl_setopt($ci, CURLOPT_HTTPPROXYTUNNEL, 1);
curl_setopt($ci, CURLOPT_PROXY, $prx); curl_setopt($ci, CURLOPT_PROXY, $prx);
$prxusr = Config::get('system', 'proxyuser'); $prxusr = Config::get('system', 'proxyuser');
if (strlen($prxusr)) { if (strlen($prxusr)) {
curl_setopt($ci, CURLOPT_PROXYUSERPWD, $prxusr); curl_setopt($ci, CURLOPT_PROXYUSERPWD, $prxusr);
} }
} }
curl_setopt($ci, CURLOPT_USERAGENT, $this->useragent); curl_setopt($ci, CURLOPT_USERAGENT, $this->useragent);
curl_setopt($ci, CURLOPT_CONNECTTIMEOUT, $this->connecttimeout); curl_setopt($ci, CURLOPT_CONNECTTIMEOUT, $this->connecttimeout);
curl_setopt($ci, CURLOPT_TIMEOUT, $this->timeout); curl_setopt($ci, CURLOPT_TIMEOUT, $this->timeout);
curl_setopt($ci, CURLOPT_RETURNTRANSFER, TRUE); curl_setopt($ci, CURLOPT_RETURNTRANSFER, TRUE);
curl_setopt($ci, CURLOPT_HTTPHEADER, ['Expect:']); curl_setopt($ci, CURLOPT_HTTPHEADER, ['Expect:']);
curl_setopt($ci, CURLOPT_SSL_VERIFYPEER, $this->ssl_verifypeer); curl_setopt($ci, CURLOPT_SSL_VERIFYPEER, $this->ssl_verifypeer);
curl_setopt($ci, CURLOPT_HEADERFUNCTION, [$this, 'getHeader']); curl_setopt($ci, CURLOPT_HEADERFUNCTION, [$this, 'getHeader']);
curl_setopt($ci, CURLOPT_HEADER, FALSE); curl_setopt($ci, CURLOPT_HEADER, FALSE);
switch ($method) { switch ($method) {
case 'POST': case 'POST':
curl_setopt($ci, CURLOPT_POST, TRUE); curl_setopt($ci, CURLOPT_POST, TRUE);
if (!empty($postfields)) { if (!empty($postfields)) {
curl_setopt($ci, CURLOPT_POSTFIELDS, $postfields); curl_setopt($ci, CURLOPT_POSTFIELDS, $postfields);
} }
break; break;
case 'DELETE': case 'DELETE':
curl_setopt($ci, CURLOPT_CUSTOMREQUEST, 'DELETE'); curl_setopt($ci, CURLOPT_CUSTOMREQUEST, 'DELETE');
if (!empty($postfields)) { if (!empty($postfields)) {
$url = "{$url}?{$postfields}"; $url = "{$url}?{$postfields}";
} }
} }
curl_setopt($ci, CURLOPT_URL, $url); curl_setopt($ci, CURLOPT_URL, $url);
$response = curl_exec($ci); $response = curl_exec($ci);
$this->http_code = curl_getinfo($ci, CURLINFO_HTTP_CODE); $this->http_code = curl_getinfo($ci, CURLINFO_HTTP_CODE);
$this->http_info = array_merge($this->http_info, curl_getinfo($ci)); $this->http_info = array_merge($this->http_info, curl_getinfo($ci));
$this->url = $url; $this->url = $url;
curl_close($ci); curl_close($ci);
return $response; return $response;
} }
} }

8
statusnet/library/twitteroauth.php
View file

@ -76,14 +76,14 @@ class TwitterOAuth
/** /**
* construct TwitterOAuth object * construct TwitterOAuth object
*/ */
function __construct($consumer_key, $consumer_secret, $oauth_token = NULL, $oauth_token_secret = NULL) function __construct($consumer_key, $consumer_secret, $oauth_token = null, $oauth_token_secret = null)
{ {
$this->sha1_method = new OAuthSignatureMethod_HMAC_SHA1(); $this->sha1_method = new OAuthSignatureMethod_HMAC_SHA1();
$this->consumer = new OAuthConsumer($consumer_key, $consumer_secret); $this->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
if (!empty($oauth_token) && !empty($oauth_token_secret)) { if (!empty($oauth_token) && !empty($oauth_token_secret)) {
$this->token = new OAuthConsumer($oauth_token, $oauth_token_secret); $this->token = new OAuthConsumer($oauth_token, $oauth_token_secret);
} else { } else {
$this->token = NULL; $this->token = null;
} }
} }
@ -92,7 +92,7 @@ class TwitterOAuth
* *
* @returns a key/value array containing oauth_token and oauth_token_secret * @returns a key/value array containing oauth_token and oauth_token_secret
*/ */
function getRequestToken($oauth_callback = NULL) function getRequestToken($oauth_callback = null)
{ {
$parameters = array(); $parameters = array();
if (!empty($oauth_callback)) { if (!empty($oauth_callback)) {
@ -224,7 +224,7 @@ class TwitterOAuth
* *
* @return API results * @return API results
*/ */
function http($url, $method, $postfields = NULL) function http($url, $method, $postfields = null)
{ {
$this->http_info = array(); $this->http_info = array();
$ci = curl_init(); $ci = curl_init();

8
tumblr/library/tumblroauth.php
View file

@ -53,13 +53,13 @@ class TumblrOAuth {
/** /**
* construct TumblrOAuth object * construct TumblrOAuth object
*/ */
function __construct($consumer_key, $consumer_secret, $oauth_token = NULL, $oauth_token_secret = NULL) { function __construct($consumer_key, $consumer_secret, $oauth_token = null, $oauth_token_secret = null) {
$this->sha1_method = new OAuthSignatureMethod_HMAC_SHA1(); $this->sha1_method = new OAuthSignatureMethod_HMAC_SHA1();
$this->consumer = new OAuthConsumer($consumer_key, $consumer_secret); $this->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
if (!empty($oauth_token) && !empty($oauth_token_secret)) { if (!empty($oauth_token) && !empty($oauth_token_secret)) {
$this->token = new OAuthConsumer($oauth_token, $oauth_token_secret); $this->token = new OAuthConsumer($oauth_token, $oauth_token_secret);
} else { } else {
$this->token = NULL; $this->token = null;
} }
} }
@ -69,7 +69,7 @@ class TumblrOAuth {
* *
* @returns a key/value array containing oauth_token and oauth_token_secret * @returns a key/value array containing oauth_token and oauth_token_secret
*/ */
function getRequestToken($oauth_callback = NULL) { function getRequestToken($oauth_callback = null) {
$parameters = array(); $parameters = array();
if (!empty($oauth_callback)) { if (!empty($oauth_callback)) {
$parameters['oauth_callback'] = $oauth_callback; $parameters['oauth_callback'] = $oauth_callback;
@ -191,7 +191,7 @@ class TumblrOAuth {
* *
* @return API results * @return API results
*/ */
function http($url, $method, $postfields = NULL) { function http($url, $method, $postfields = null) {
$this->http_info = array(); $this->http_info = array();
$ci = curl_init(); $ci = curl_init();
/* Curl settings */ /* Curl settings */