mirror of
https://git.friendi.ca/friendica/friendica-addons.git
synced 2025-07-17 05:48:49 +00:00
Continued:
- 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
parent
eaa307be58
commit
d05a92370a
5 changed files with 115 additions and 115 deletions
|
|
@ -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-')) {
|
||||
$b['output']['thumb'] = $a->get_baseurl() . "/images/person-80.jpg";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -317,7 +317,7 @@ class CodebirdSN
|
|||
*
|
||||
* @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) {
|
||||
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
|
||||
*/
|
||||
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) {
|
||||
throw new \Exception('To get the authorize URL, the OAuth token must be set.');
|
||||
|
|
|
|||
|
|
@ -1,104 +1,104 @@
|
|||
<?php
|
||||
|
||||
use Friendica\Core\Config;
|
||||
|
||||
require_once __DIR__ . DIRECTORY_SEPARATOR . 'twitteroauth.php';
|
||||
|
||||
/*
|
||||
* 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.
|
||||
*
|
||||
* Thank you guys for the Twitter compatible API!
|
||||
*/
|
||||
class StatusNetOAuth extends TwitterOAuth
|
||||
{
|
||||
function get_maxlength()
|
||||
{
|
||||
$config = $this->get($this->host . 'statusnet/config.json');
|
||||
return $config->site->textlimit;
|
||||
}
|
||||
|
||||
function accessTokenURL()
|
||||
{
|
||||
return $this->host . 'oauth/access_token';
|
||||
}
|
||||
|
||||
function authenticateURL()
|
||||
{
|
||||
return $this->host . 'oauth/authenticate';
|
||||
}
|
||||
|
||||
function authorizeURL()
|
||||
{
|
||||
return $this->host . 'oauth/authorize';
|
||||
}
|
||||
|
||||
function requestTokenURL()
|
||||
{
|
||||
return $this->host . 'oauth/request_token';
|
||||
}
|
||||
|
||||
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);
|
||||
$this->host = $apipath;
|
||||
}
|
||||
|
||||
/**
|
||||
* Make an HTTP request
|
||||
*
|
||||
* Copied here from the TwitterOAuth library and complemented by applying the proxy settings of Friendica
|
||||
*
|
||||
* @param string $method
|
||||
* @param string $host
|
||||
* @param string $path
|
||||
* @param array $parameters
|
||||
*
|
||||
* @return array|object API results
|
||||
*/
|
||||
function http($url, $method, $postfields = NULL)
|
||||
{
|
||||
$this->http_info = [];
|
||||
$ci = curl_init();
|
||||
/* Curl settings */
|
||||
$prx = Config::get('system', 'proxy');
|
||||
if (strlen($prx)) {
|
||||
curl_setopt($ci, CURLOPT_HTTPPROXYTUNNEL, 1);
|
||||
curl_setopt($ci, CURLOPT_PROXY, $prx);
|
||||
$prxusr = Config::get('system', 'proxyuser');
|
||||
if (strlen($prxusr)) {
|
||||
curl_setopt($ci, CURLOPT_PROXYUSERPWD, $prxusr);
|
||||
}
|
||||
}
|
||||
curl_setopt($ci, CURLOPT_USERAGENT, $this->useragent);
|
||||
curl_setopt($ci, CURLOPT_CONNECTTIMEOUT, $this->connecttimeout);
|
||||
curl_setopt($ci, CURLOPT_TIMEOUT, $this->timeout);
|
||||
curl_setopt($ci, CURLOPT_RETURNTRANSFER, TRUE);
|
||||
curl_setopt($ci, CURLOPT_HTTPHEADER, ['Expect:']);
|
||||
curl_setopt($ci, CURLOPT_SSL_VERIFYPEER, $this->ssl_verifypeer);
|
||||
curl_setopt($ci, CURLOPT_HEADERFUNCTION, [$this, 'getHeader']);
|
||||
curl_setopt($ci, CURLOPT_HEADER, FALSE);
|
||||
|
||||
switch ($method) {
|
||||
case 'POST':
|
||||
curl_setopt($ci, CURLOPT_POST, TRUE);
|
||||
if (!empty($postfields)) {
|
||||
curl_setopt($ci, CURLOPT_POSTFIELDS, $postfields);
|
||||
}
|
||||
break;
|
||||
case 'DELETE':
|
||||
curl_setopt($ci, CURLOPT_CUSTOMREQUEST, 'DELETE');
|
||||
if (!empty($postfields)) {
|
||||
$url = "{$url}?{$postfields}";
|
||||
}
|
||||
}
|
||||
|
||||
curl_setopt($ci, CURLOPT_URL, $url);
|
||||
$response = curl_exec($ci);
|
||||
$this->http_code = curl_getinfo($ci, CURLINFO_HTTP_CODE);
|
||||
$this->http_info = array_merge($this->http_info, curl_getinfo($ci));
|
||||
$this->url = $url;
|
||||
curl_close($ci);
|
||||
return $response;
|
||||
}
|
||||
}
|
||||
<?php
|
||||
|
||||
use Friendica\Core\Config;
|
||||
|
||||
require_once __DIR__ . DIRECTORY_SEPARATOR . 'twitteroauth.php';
|
||||
|
||||
/*
|
||||
* 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.
|
||||
*
|
||||
* Thank you guys for the Twitter compatible API!
|
||||
*/
|
||||
class StatusNetOAuth extends TwitterOAuth
|
||||
{
|
||||
function get_maxlength()
|
||||
{
|
||||
$config = $this->get($this->host . 'statusnet/config.json');
|
||||
return $config->site->textlimit;
|
||||
}
|
||||
|
||||
function accessTokenURL()
|
||||
{
|
||||
return $this->host . 'oauth/access_token';
|
||||
}
|
||||
|
||||
function authenticateURL()
|
||||
{
|
||||
return $this->host . 'oauth/authenticate';
|
||||
}
|
||||
|
||||
function authorizeURL()
|
||||
{
|
||||
return $this->host . 'oauth/authorize';
|
||||
}
|
||||
|
||||
function requestTokenURL()
|
||||
{
|
||||
return $this->host . 'oauth/request_token';
|
||||
}
|
||||
|
||||
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);
|
||||
$this->host = $apipath;
|
||||
}
|
||||
|
||||
/**
|
||||
* Make an HTTP request
|
||||
*
|
||||
* Copied here from the TwitterOAuth library and complemented by applying the proxy settings of Friendica
|
||||
*
|
||||
* @param string $method
|
||||
* @param string $host
|
||||
* @param string $path
|
||||
* @param array $parameters
|
||||
*
|
||||
* @return array|object API results
|
||||
*/
|
||||
function http($url, $method, $postfields = null)
|
||||
{
|
||||
$this->http_info = [];
|
||||
$ci = curl_init();
|
||||
/* Curl settings */
|
||||
$prx = Config::get('system', 'proxy');
|
||||
if (strlen($prx)) {
|
||||
curl_setopt($ci, CURLOPT_HTTPPROXYTUNNEL, 1);
|
||||
curl_setopt($ci, CURLOPT_PROXY, $prx);
|
||||
$prxusr = Config::get('system', 'proxyuser');
|
||||
if (strlen($prxusr)) {
|
||||
curl_setopt($ci, CURLOPT_PROXYUSERPWD, $prxusr);
|
||||
}
|
||||
}
|
||||
curl_setopt($ci, CURLOPT_USERAGENT, $this->useragent);
|
||||
curl_setopt($ci, CURLOPT_CONNECTTIMEOUT, $this->connecttimeout);
|
||||
curl_setopt($ci, CURLOPT_TIMEOUT, $this->timeout);
|
||||
curl_setopt($ci, CURLOPT_RETURNTRANSFER, TRUE);
|
||||
curl_setopt($ci, CURLOPT_HTTPHEADER, ['Expect:']);
|
||||
curl_setopt($ci, CURLOPT_SSL_VERIFYPEER, $this->ssl_verifypeer);
|
||||
curl_setopt($ci, CURLOPT_HEADERFUNCTION, [$this, 'getHeader']);
|
||||
curl_setopt($ci, CURLOPT_HEADER, FALSE);
|
||||
|
||||
switch ($method) {
|
||||
case 'POST':
|
||||
curl_setopt($ci, CURLOPT_POST, TRUE);
|
||||
if (!empty($postfields)) {
|
||||
curl_setopt($ci, CURLOPT_POSTFIELDS, $postfields);
|
||||
}
|
||||
break;
|
||||
case 'DELETE':
|
||||
curl_setopt($ci, CURLOPT_CUSTOMREQUEST, 'DELETE');
|
||||
if (!empty($postfields)) {
|
||||
$url = "{$url}?{$postfields}";
|
||||
}
|
||||
}
|
||||
|
||||
curl_setopt($ci, CURLOPT_URL, $url);
|
||||
$response = curl_exec($ci);
|
||||
$this->http_code = curl_getinfo($ci, CURLINFO_HTTP_CODE);
|
||||
$this->http_info = array_merge($this->http_info, curl_getinfo($ci));
|
||||
$this->url = $url;
|
||||
curl_close($ci);
|
||||
return $response;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -76,14 +76,14 @@ class TwitterOAuth
|
|||
/**
|
||||
* 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->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
|
||||
if (!empty($oauth_token) && !empty($oauth_token_secret)) {
|
||||
$this->token = new OAuthConsumer($oauth_token, $oauth_token_secret);
|
||||
} 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
|
||||
*/
|
||||
function getRequestToken($oauth_callback = NULL)
|
||||
function getRequestToken($oauth_callback = null)
|
||||
{
|
||||
$parameters = array();
|
||||
if (!empty($oauth_callback)) {
|
||||
|
|
@ -224,7 +224,7 @@ class TwitterOAuth
|
|||
*
|
||||
* @return API results
|
||||
*/
|
||||
function http($url, $method, $postfields = NULL)
|
||||
function http($url, $method, $postfields = null)
|
||||
{
|
||||
$this->http_info = array();
|
||||
$ci = curl_init();
|
||||
|
|
|
|||
|
|
@ -53,13 +53,13 @@ class TumblrOAuth {
|
|||
/**
|
||||
* 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->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
|
||||
if (!empty($oauth_token) && !empty($oauth_token_secret)) {
|
||||
$this->token = new OAuthConsumer($oauth_token, $oauth_token_secret);
|
||||
} 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
|
||||
*/
|
||||
function getRequestToken($oauth_callback = NULL) {
|
||||
function getRequestToken($oauth_callback = null) {
|
||||
$parameters = array();
|
||||
if (!empty($oauth_callback)) {
|
||||
$parameters['oauth_callback'] = $oauth_callback;
|
||||
|
|
@ -191,7 +191,7 @@ class TumblrOAuth {
|
|||
*
|
||||
* @return API results
|
||||
*/
|
||||
function http($url, $method, $postfields = NULL) {
|
||||
function http($url, $method, $postfields = null) {
|
||||
$this->http_info = array();
|
||||
$ci = curl_init();
|
||||
/* Curl settings */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue