mirror of
https://git.friendi.ca/friendica/friendica-addons.git
synced 2025-07-07 08:58:49 +00:00
Move Config::get() to DI::config()->get()
This commit is contained in:
nupplaPhil
parent
c67ad31c8b
commit
1ce63185ab
38 changed files with 342 additions and 342 deletions
|
|
@ -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 = DI::config()->get('system', 'proxy');
|
||||
if (strlen($prx)) {
|
||||
curl_setopt($ci, CURLOPT_HTTPPROXYTUNNEL, 1);
|
||||
curl_setopt($ci, CURLOPT_PROXY, $prx);
|
||||
$prxusr = DI::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;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ function statusnet_settings_post(App $a, $post)
|
|||
* use them. All the data are available in the global config.
|
||||
* Check the API Url never the less and blame the admin if it's not working ^^
|
||||
*/
|
||||
$globalsn = Config::get('statusnet', 'sites');
|
||||
$globalsn = DI::config()->get('statusnet', 'sites');
|
||||
foreach ($globalsn as $asn) {
|
||||
if ($asn['apiurl'] == $_POST['statusnet-preconf-apiurl']) {
|
||||
$apibase = $asn['apiurl'];
|
||||
|
|
@ -277,7 +277,7 @@ function statusnet_settings(App $a, &$s)
|
|||
/* * *
|
||||
* no consumer keys
|
||||
*/
|
||||
$globalsn = Config::get('statusnet', 'sites');
|
||||
$globalsn = DI::config()->get('statusnet', 'sites');
|
||||
/* * *
|
||||
* lets check if we have one or more globally configured GNU Social
|
||||
* server OAuth credentials in the configuration. If so offer them
|
||||
|
|
@ -690,7 +690,7 @@ function statusnet_addon_admin_post(App $a)
|
|||
|
||||
function statusnet_addon_admin(App $a, &$o)
|
||||
{
|
||||
$sites = Config::get('statusnet', 'sites');
|
||||
$sites = DI::config()->get('statusnet', 'sites');
|
||||
$sitesform = [];
|
||||
if (is_array($sites)) {
|
||||
foreach ($sites as $id => $s) {
|
||||
|
|
@ -766,9 +766,9 @@ function statusnet_prepare_body(App $a, &$b)
|
|||
|
||||
function statusnet_cron(App $a, $b)
|
||||
{
|
||||
$last = Config::get('statusnet', 'last_poll');
|
||||
$last = DI::config()->get('statusnet', 'last_poll');
|
||||
|
||||
$poll_interval = intval(Config::get('statusnet', 'poll_interval'));
|
||||
$poll_interval = intval(DI::config()->get('statusnet', 'poll_interval'));
|
||||
if (!$poll_interval) {
|
||||
$poll_interval = STATUSNET_DEFAULT_POLL_INTERVAL;
|
||||
}
|
||||
|
|
@ -790,7 +790,7 @@ function statusnet_cron(App $a, $b)
|
|||
}
|
||||
}
|
||||
|
||||
$abandon_days = intval(Config::get('system', 'account_abandon_days'));
|
||||
$abandon_days = intval(DI::config()->get('system', 'account_abandon_days'));
|
||||
if ($abandon_days < 1) {
|
||||
$abandon_days = 0;
|
||||
}
|
||||
|
|
@ -833,7 +833,7 @@ function statusnet_fetchtimeline(App $a, $uid)
|
|||
// hostname of the node if neither one is set.
|
||||
$application_name = DI::pConfig()->get($uid, 'statusnet', 'application_name');
|
||||
if ($application_name == "") {
|
||||
$application_name = Config::get('statusnet', 'application_name');
|
||||
$application_name = DI::config()->get('statusnet', 'application_name');
|
||||
}
|
||||
if ($application_name == "") {
|
||||
$application_name = DI::baseUrl()->getHostname();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue