Merge 2019.12 master into develop

advancedcontentfilter/advancedcontentfilter.php

@@ -60,6 +60,7 @@ function advancedcontentfilter_install(App $a)
 	Hook::register('prepare_body_content_filter', __FILE__, 'advancedcontentfilter_prepare_body_content_filter');
 	Hook::register('addon_settings'             , __FILE__, 'advancedcontentfilter_addon_settings');
 
+	Hook::add('dbstructure_definition'          , __FILE__, 'advancedcontentfilter_dbstructure_definition');
 	DBStructure::update($a->getBasePath(), false, true);
 
 	Logger::log("installed advancedcontentfilter");

buglink/lang/de/messages.po

@@ -4,15 +4,16 @@
 # 
 # 
 # Translators:
-# bavatar <tobias.diekershoff@gmx.net>, 2014
+# René Wagner <apollo@rw-net.de>, 2019
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-06-22 13:18+0200\n"
-"PO-Revision-Date: 2014-06-22 11:28+0000\n"
+"PO-Revision-Date: 2019-11-10 20:12+0000\n"
-"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"Last-Translator: René Wagner <apollo@rw-net.de>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,4 +22,4 @@ msgstr ""
 
 #: buglink.php:15
 msgid "Report Bug"
-msgstr "Fehler melden."
+msgstr "Fehler melden"

buglink/lang/de/strings.php

@@ -2,7 +2,8 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
+	$n = intval($n);
 	return ($n != 1);;
 }}
 ;
-$a->strings["Report Bug"] = "Fehler melden.";
+$a->strings["Report Bug"] = "Fehler melden";

showmore/lang/et/messages.po

@@ -0,0 +1,44 @@
+# ADDON showmore
+# Copyright (C)
+# This file is distributed under the same license as the Friendica showmore addon package.
+# 
+# 
+# Translators:
+# Rain Hawk, 2019
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-04-01 11:11-0400\n"
+"PO-Revision-Date: 2019-12-22 00:47+0000\n"
+"Last-Translator: Rain Hawk\n"
+"Language-Team: Estonian (http://www.transifex.com/Friendica/friendica/language/et/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: showmore.php:41 showmore.php:45
+msgid "\"Show more\" Settings"
+msgstr "Näita rohkem sätteid"
+
+#: showmore.php:50
+msgid "Enable Show More"
+msgstr "Võimalda Näita Rohkem"
+
+#: showmore.php:53
+msgid "Cutting posts after how much characters"
+msgstr "Lõika postitus peale kuimitut karakterit"
+
+#: showmore.php:57
+msgid "Save Settings"
+msgstr "Salvesta sätted"
+
+#: showmore.php:74
+msgid "Show More Settings saved."
+msgstr "Näita Rohkem sätted salvesatud."
+
+#: showmore.php:134
+msgid "show more"
+msgstr "näita rohkem"

showmore/lang/et/strings.php

@@ -0,0 +1,14 @@
+<?php
+
+if(! function_exists("string_plural_select_et")) {
+function string_plural_select_et($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["\"Show more\" Settings"] = "Näita rohkem sätteid";
+$a->strings["Enable Show More"] = "Võimalda Näita Rohkem";
+$a->strings["Cutting posts after how much characters"] = "Lõika postitus peale kuimitut karakterit";
+$a->strings["Save Settings"] = "Salvesta sätted";
+$a->strings["Show More Settings saved."] = "Näita Rohkem sätted salvesatud.";
+$a->strings["show more"] = "näita rohkem";

smileybutton/lang/et/messages.po

@@ -0,0 +1,36 @@
+# ADDON smileybutton
+# Copyright (C)
+# This file is distributed under the same license as the Friendica smileybutton addon package.
+# 
+# 
+# Translators:
+# Rain Hawk, 2019
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2019-11-30 14:52+0000\n"
+"Last-Translator: Rain Hawk\n"
+"Language-Team: Estonian (http://www.transifex.com/Friendica/friendica/language/et/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: smileybutton.php:269
+msgid "Smileybutton settings"
+msgstr "SmileyNupu sätted"
+
+#: smileybutton.php:272
+msgid "You can hide the button and show the smilies directly."
+msgstr "Saad peita nupu ja näidata smailisid otse"
+
+#: smileybutton.php:274
+msgid "Hide the button"
+msgstr "Peida nupp"
+
+#: smileybutton.php:281
+msgid "Save Settings"
+msgstr "Salvesta sätted"

smileybutton/lang/et/strings.php

@@ -0,0 +1,12 @@
+<?php
+
+if(! function_exists("string_plural_select_et")) {
+function string_plural_select_et($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Smileybutton settings"] = "SmileyNupu sätted";
+$a->strings["You can hide the button and show the smilies directly."] = "Saad peita nupu ja näidata smailisid otse";
+$a->strings["Hide the button"] = "Peida nupp";
+$a->strings["Save Settings"] = "Salvesta sätted";

statusnet/library/twitteroauth.php

@@ -13,10 +13,6 @@
  */
 class TwitterOAuth
 {
-	/* Contains the last HTTP status code returned. */
-	public $http_code;
-	/* Contains the last API call. */
-	public $url;
 	/* Set up the API root URL. */
 	public $host = "https://api.twitter.com/1.1/";
 	/* Set timeout default. */
@@ -25,17 +21,34 @@ class TwitterOAuth
 	public $connecttimeout = 30;
 	/* Verify SSL Cert. */
 	public $ssl_verifypeer = FALSE;
-	/* Respons format. */
+	/* Response format. */
 	public $format = 'json';
 	/* Decode returned json data. */
 	public $decode_json = TRUE;
-	/* Contains the last HTTP headers returned. */
+	/* Set the useragent. */
-	public $http_info;
-	/* Set the useragnet. */
 	public $useragent = 'TwitterOAuth v0.2.0-beta2';
 
-	/* Immediately retry the API call if the response was not successful. */
+	/* Contains the last HTTP status code returned. */
-	//public $retry = TRUE;
+	public $http_code;
+	/* Contains the last API call. */
+	public $url;
+	/**
+	 * Contains the last HTTP headers returned.
+	 * @var array
+	 */
+	public $http_header;
+	/**
+	 * Contains the last HTTP request info
+	 * @var string
+	 */
+	public $http_info;
+
+	/** @var OAuthToken */
+	private $token;
+	/** @var OAuthConsumer */
+	private $consumer;
+	/** @var OAuthSignatureMethod_HMAC_SHA1 */
+	private $sha1_method;
 
 	/**
 	 * Set API URLS
@@ -60,60 +73,49 @@ class TwitterOAuth
 		return 'https://api.twitter.com/oauth/request_token';
 	}
 
-	/**
+	function __construct($consumer_key, $consumer_secret, $oauth_token = null, $oauth_token_secret = null)
-	 * Debug helpers
-	 */
-	function lastStatusCode()
-	{
-		return $this->http_status;
-	}
-
-	function lastAPICall()
-	{
-		return $this->last_api_call;
-	}
-
-	/**
-	 * construct TwitterOAuth object
-	 */
-	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);
+			$this->token = new OAuthToken($oauth_token, $oauth_token_secret);
 		} else {
-			$this->token = NULL;
+			$this->token = null;
 		}
 	}
 
 	/**
-	 * Get a request_token from Twitter
+	 * Get a request_token
 	 *
-	 * @returns a key/value array containing oauth_token and oauth_token_secret
+	 * @param callback $oauth_callback
+	 * @return array
 	 */
-	function getRequestToken($oauth_callback = NULL)
+	function getRequestToken($oauth_callback = null)
 	{
-		$parameters = array();
+		$parameters = [];
 		if (!empty($oauth_callback)) {
 			$parameters['oauth_callback'] = $oauth_callback;
 		}
+
 		$request = $this->oAuthRequest($this->requestTokenURL(), 'GET', $parameters);
 		$token = OAuthUtil::parse_parameters($request);
-		$this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
+		$this->token = new OAuthToken($token['oauth_token'], $token['oauth_token_secret']);
 		return $token;
 	}
 
 	/**
 	 * Get the authorize URL
 	 *
-	 * @returns a string
+	 * @param array $token
+	 * @param bool $sign_in_with_tumblr
+	 * @return string
 	 */
 	function getAuthorizeURL($token, $sign_in_with_twitter = TRUE)
 	{
 		if (is_array($token)) {
 			$token = $token['oauth_token'];
 		}
+
 		if (empty($sign_in_with_twitter)) {
 			return $this->authorizeURL() . "?oauth_token={$token}";
 		} else {
@@ -125,27 +127,32 @@ class TwitterOAuth
 	 * Exchange request token and secret for an access token and
 	 * secret, to sign API calls.
 	 *
-	 * @returns array("oauth_token" => "the-access-token",
+	 * @param bool $oauth_verifier
+	 * @return array ("oauth_token" => "the-access-token",
 	 *                "oauth_token_secret" => "the-access-secret",
 	 *                "user_id" => "9436992",
 	 *                "screen_name" => "abraham")
 	 */
 	function getAccessToken($oauth_verifier = FALSE)
 	{
-		$parameters = array();
+		$parameters = [];
 		if (!empty($oauth_verifier)) {
 			$parameters['oauth_verifier'] = $oauth_verifier;
 		}
+
 		$request = $this->oAuthRequest($this->accessTokenURL(), 'GET', $parameters);
 		$token = OAuthUtil::parse_parameters($request);
-		$this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
+		$this->token = new OAuthToken($token['oauth_token'], $token['oauth_token_secret']);
+
 		return $token;
 	}
 
 	/**
 	 * One time exchange of username and password for access token and secret.
 	 *
-	 * @returns array("oauth_token" => "the-access-token",
+	 * @param string $username
+	 * @param string $password
+	 * @return array ("oauth_token" => "the-access-token",
 	 *                "oauth_token_secret" => "the-access-secret",
 	 *                "user_id" => "9436992",
 	 *                "screen_name" => "abraham",
@@ -153,60 +160,82 @@ class TwitterOAuth
 	 */
 	function getXAuthToken($username, $password)
 	{
-		$parameters = array();
+		$parameters = [];
 		$parameters['x_auth_username'] = $username;
 		$parameters['x_auth_password'] = $password;
 		$parameters['x_auth_mode'] = 'client_auth';
 		$request = $this->oAuthRequest($this->accessTokenURL(), 'POST', $parameters);
 		$token = OAuthUtil::parse_parameters($request);
-		$this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
+		$this->token = new OAuthToken($token['oauth_token'], $token['oauth_token_secret']);
+
 		return $token;
 	}
 
 	/**
 	 * GET wrapper for oAuthRequest.
+	 *
+	 * @param string $url
+	 * @param array $parameters
+	 * @return mixed|string
 	 */
-	function get($url, $parameters = array())
+	function get($url, $parameters = [])
 	{
 		$response = $this->oAuthRequest($url, 'GET', $parameters);
 		if ($this->format === 'json' && $this->decode_json) {
 			return json_decode($response);
 		}
+
 		return $response;
 	}
 
 	/**
 	 * POST wrapper for oAuthRequest.
+	 *
+	 * @param string $url
+	 * @param array $parameters
+	 * @return mixed|string
 	 */
-	function post($url, $parameters = array())
+	function post($url, $parameters = [])
 	{
 		$response = $this->oAuthRequest($url, 'POST', $parameters);
 		if ($this->format === 'json' && $this->decode_json) {
 			return json_decode($response);
 		}
+
 		return $response;
 	}
 
 	/**
 	 * DELETE wrapper for oAuthReqeust.
+	 *
+	 * @param string $url
+	 * @param array $parameters
+	 * @return mixed|string
 	 */
-	function delete($url, $parameters = array())
+	function delete($url, $parameters = [])
 	{
 		$response = $this->oAuthRequest($url, 'DELETE', $parameters);
 		if ($this->format === 'json' && $this->decode_json) {
 			return json_decode($response);
 		}
+
 		return $response;
 	}
 
 	/**
 	 * Format and sign an OAuth / API request
+	 *
+	 * @param string $url
+	 * @param string $method
+	 * @param array $parameters
+	 * @return mixed|string
 	 */
 	function oAuthRequest($url, $method, $parameters)
 	{
 		if (strrpos($url, 'https://') !== 0 && strrpos($url, 'http://') !== 0) {
 			$url = "{$this->host}{$url}.{$this->format}";
 		}
+
 		$request = OAuthRequest::from_consumer_and_token($this->consumer, $this->token, $method, $url, $parameters);
 		$request->sign_request($this->sha1_method, $this->consumer, $this->token);
 		switch ($method) {
@@ -222,11 +251,14 @@ class TwitterOAuth
 	/**
 	 * Make an HTTP request
 	 *
-	 * @return API results
+	 * @param string $url
+	 * @param string $method
+	 * @param mixed  $postfields
+	 * @return string API results
 	 */
-	function http($url, $method, $postfields = NULL)
+	function http($url, $method, $postfields = null)
 	{
-		$this->http_info = array();
+		$this->http_info = [];
 		$ci = curl_init();
 		/* Curl settings */
 		curl_setopt($ci, CURLOPT_USERAGENT, $this->useragent);
@@ -258,11 +290,16 @@ class TwitterOAuth
 		$this->http_info = array_merge($this->http_info, curl_getinfo($ci));
 		$this->url = $url;
 		curl_close($ci);
+
 		return $response;
 	}
 
 	/**
 	 * Get the header info to store.
+	 *
+	 * @param resource $ch
+	 * @param string $header
+	 * @return int
 	 */
 	function getHeader($ch, $header)
 	{
@@ -272,6 +309,7 @@ class TwitterOAuth
 			$value = trim(substr($header, $i + 2));
 			$this->http_header[$key] = $value;
 		}
+
 		return strlen($header);
 	}
 }

tumblr/library/tumblroauth.php

@@ -9,234 +9,303 @@
 /**
  * Tumblr OAuth class
  */
-class TumblrOAuth {
+class TumblrOAuth
-  /* Contains the last HTTP status code returned. */
+{
-  public $http_code;
+	/* Set up the API root URL. */
-  /* Contains the last API call. */
+	public $host = "https://api.tumblr.com/v2/";
-  public $url;
+	/* Set timeout default. */
-  /* Set up the API root URL. */
+	public $timeout = 30;
-  public $host = "https://api.tumblr.com/v2/";
+	/* Set connect timeout. */
-  /* Set timeout default. */
+	public $connecttimeout = 30;
-  public $timeout = 30;
+	/* Verify SSL Cert. */
-  /* Set connect timeout. */
+	public $ssl_verifypeer = FALSE;
-  public $connecttimeout = 30;
+	/* Response format. */
-  /* Verify SSL Cert. */
+	public $format = 'json';
-  public $ssl_verifypeer = FALSE;
+	/* Decode returned json data. */
-  /* Respons format. */
+	public $decode_json = TRUE;
-  public $format = 'json';
+	/* Set the useragent. */
-  /* Decode returned json data. */
+	public $useragent = 'TumblrOAuth v0.2.0-beta2';
-  public $decode_json = TRUE;
-  /* Contains the last HTTP headers returned. */
-  public $http_info;
-  /* Set the useragnet. */
-  public $useragent = 'TumblrOAuth v0.2.0-beta2';
-  /* Immediately retry the API call if the response was not successful. */
-  //public $retry = TRUE;
 
+	/* Contains the last HTTP status code returned. */
+	public $http_code;
+	/* Contains the last API call. */
+	public $url;
+	/**
+	 * Contains the last HTTP headers returned.
+	 * @var array
+	 */
+	public $http_header;
+	/**
+	 * Contains the last HTTP request info
+	 * @var string
+	 */
+	public $http_info;
 
+	/** @var OAuthToken */
+	private $token;
+	/** @var OAuthConsumer */
+	private $consumer;
+	/** @var OAuthSignatureMethod_HMAC_SHA1 */
+	private $sha1_method;
 
+	/**
+	 * Set API URLS
+	 */
+	function accessTokenURL()
+	{
+		return 'https://www.tumblr.com/oauth/access_token';
+	}
 
-  /**
+	function authenticateURL()
-   * Set API URLS
+	{
-   */
+		return 'https://www.tumblr.com/oauth/authorize';
-  function accessTokenURL()  { return 'https://www.tumblr.com/oauth/access_token'; }
+	}
-  function authenticateURL() { return 'https://www.tumblr.com/oauth/authorize'; }
-  function authorizeURL()    { return 'https://www.tumblr.com/oauth/authorize'; }
-  function requestTokenURL() { return 'https://www.tumblr.com/oauth/request_token'; }
 
-  /**
+	function authorizeURL()
-   * Debug helpers
+	{
-   */
+		return 'https://www.tumblr.com/oauth/authorize';
-  function lastStatusCode() { return $this->http_status; }
+	}
-  function lastAPICall() { return $this->last_api_call; }
 
-  /**
+	function requestTokenURL()
-   * construct TumblrOAuth object
+	{
-   */
+		return 'https://www.tumblr.com/oauth/request_token';
-  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;
-    }
-  }
 
+	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 OAuthToken($oauth_token, $oauth_token_secret);
+		} else {
+			$this->token = null;
+		}
+	}
 
-  /**
+	/**
-   * Get a request_token from Tumblr
+	 * Get a request_token from Tumblr
-   *
+	 *
-   * @returns a key/value array containing oauth_token and oauth_token_secret
+	 * @param callback $oauth_callback
-   */
+	 * @return array
-  function getRequestToken($oauth_callback = null) {
+	 */
-    $parameters = array();
+	function getRequestToken($oauth_callback = null)
-    if (!empty($oauth_callback)) {
+	{
-      $parameters['oauth_callback'] = $oauth_callback;
+		$parameters = [];
-    }
+		if (!empty($oauth_callback)) {
-    $request = $this->oAuthRequest($this->requestTokenURL(), 'GET', $parameters);
+			$parameters['oauth_callback'] = $oauth_callback;
-    $token = OAuthUtil::parse_parameters($request);
+		}
-    $this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
-    return $token;
-  }
 
-  /**
+		$request = $this->oAuthRequest($this->requestTokenURL(), 'GET', $parameters);
-   * Get the authorize URL
+		$token = OAuthUtil::parse_parameters($request);
-   *
+		$this->token = new OAuthToken($token['oauth_token'], $token['oauth_token_secret']);
-   * @returns a string
+		return $token;
-   */
+	}
-  function getAuthorizeURL($token, $sign_in_with_tumblr = TRUE) {
-    if (is_array($token)) {
-      $token = $token['oauth_token'];
-    }
-    if (empty($sign_in_with_tumblr)) {
-      return $this->authorizeURL() . "?oauth_token={$token}";
-    } else {
-       return $this->authenticateURL() . "?oauth_token={$token}";
-    }
-  }
 
-  /**
+	/**
-   * Exchange request token and secret for an access token and
+	 * Get the authorize URL
-   * secret, to sign API calls.
+	 *
-   *
+	 * @param array $token
-   * @returns array("oauth_token" => "the-access-token",
+	 * @param bool $sign_in_with_tumblr
-   *                "oauth_token_secret" => "the-access-secret",
+	 * @return string
-   *                "user_id" => "9436992",
+	 */
-   *                "screen_name" => "abraham")
+	function getAuthorizeURL($token, $sign_in_with_tumblr = TRUE)
-   */
+	{
-  function getAccessToken($oauth_verifier = FALSE) {
+		if (is_array($token)) {
-    $parameters = array();
+			$token = $token['oauth_token'];
-    if (!empty($oauth_verifier)) {
+		}
-      $parameters['oauth_verifier'] = $oauth_verifier;
-    }
-    $request = $this->oAuthRequest($this->accessTokenURL(), 'GET', $parameters);
-    $token = OAuthUtil::parse_parameters($request);
-    $this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
-    return $token;
-  }
 
-  /**
+		if (empty($sign_in_with_tumblr)) {
-   * One time exchange of username and password for access token and secret.
+			return $this->authorizeURL() . "?oauth_token={$token}";
-   *
+		} else {
-   * @returns array("oauth_token" => "the-access-token",
+			return $this->authenticateURL() . "?oauth_token={$token}";
-   *                "oauth_token_secret" => "the-access-secret",
+		}
-   *                "user_id" => "9436992",
+	}
-   *                "screen_name" => "abraham",
-   *                "x_auth_expires" => "0")
-   */
-  function getXAuthToken($username, $password) {
-    $parameters = array();
-    $parameters['x_auth_username'] = $username;
-    $parameters['x_auth_password'] = $password;
-    $parameters['x_auth_mode'] = 'client_auth';
-    $request = $this->oAuthRequest($this->accessTokenURL(), 'POST', $parameters);
-    $token = OAuthUtil::parse_parameters($request);
-    $this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
-    return $token;
-  }
 
-  /**
+	/**
-   * GET wrapper for oAuthRequest.
+	 * Exchange request token and secret for an access token and
-   */
+	 * secret, to sign API calls.
-  function get($url, $parameters = array()) {
+	 *
-    $response = $this->oAuthRequest($url, 'GET', $parameters);
+	 * @param bool $oauth_verifier
-    if ($this->format === 'json' && $this->decode_json) {
+	 * @return array ("oauth_token" => "the-access-token",
-      return json_decode($response);
+	 *                "oauth_token_secret" => "the-access-secret",
-    }
+	 *                "user_id" => "9436992",
-    return $response;
+	 *                "screen_name" => "abraham")
-  }
+	 */
+	function getAccessToken($oauth_verifier = FALSE)
+	{
+		$parameters = [];
+		if (!empty($oauth_verifier)) {
+			$parameters['oauth_verifier'] = $oauth_verifier;
+		}
 
-  /**
+		$request = $this->oAuthRequest($this->accessTokenURL(), 'GET', $parameters);
-   * POST wrapper for oAuthRequest.
+		$token = OAuthUtil::parse_parameters($request);
-   */
+		$this->token = new OAuthToken($token['oauth_token'], $token['oauth_token_secret']);
-  function post($url, $parameters = array()) {
-    $response = $this->oAuthRequest($url, 'POST', $parameters);
-    if ($this->format === 'json' && $this->decode_json) {
-      return json_decode($response);
-    }
-    return $response;
-  }
 
-  /**
+		return $token;
-   * DELETE wrapper for oAuthReqeust.
+	}
-   */
-  function delete($url, $parameters = array()) {
-    $response = $this->oAuthRequest($url, 'DELETE', $parameters);
-    if ($this->format === 'json' && $this->decode_json) {
-      return json_decode($response);
-    }
-    return $response;
-  }
 
-  /**
+	/**
-   * Format and sign an OAuth / API request
+	 * One time exchange of username and password for access token and secret.
-   */
+	 *
-  function oAuthRequest($url, $method, $parameters) {
+	 * @param string $username
-    if (strrpos($url, 'https://') !== 0 && strrpos($url, 'http://') !== 0) {
+	 * @param string $password
-      $url = "{$this->host}{$url}";
+	 * @return array ("oauth_token" => "the-access-token",
-    }
+	 *                "oauth_token_secret" => "the-access-secret",
-    $request = OAuthRequest::from_consumer_and_token($this->consumer, $this->token, $method, $url, $parameters);
+	 *                "user_id" => "9436992",
-    $request->sign_request($this->sha1_method, $this->consumer, $this->token);
+	 *                "screen_name" => "abraham",
-    switch ($method) {
+	 *                "x_auth_expires" => "0")
-    case 'GET':
+	 */
-      return $this->http($request->to_url(), 'GET');
+	function getXAuthToken($username, $password)
-    default:
+	{
-      return $this->http($request->get_normalized_http_url(), $method, $request->to_postdata());
+		$parameters = [];
-    }
+		$parameters['x_auth_username'] = $username;
-  }
+		$parameters['x_auth_password'] = $password;
+		$parameters['x_auth_mode'] = 'client_auth';
+		$request = $this->oAuthRequest($this->accessTokenURL(), 'POST', $parameters);
+		$token = OAuthUtil::parse_parameters($request);
+		$this->token = new OAuthToken($token['oauth_token'], $token['oauth_token_secret']);
 
-  /**
+		return $token;
-   * Make an HTTP request
+	}
-   *
-   * @return API results
-   */
-  function http($url, $method, $postfields = null) {
-    $this->http_info = array();
-    $ci = curl_init();
-    /* Curl settings */
-    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, array('Expect:'));
-    curl_setopt($ci, CURLOPT_SSL_VERIFYPEER, $this->ssl_verifypeer);
-    curl_setopt($ci, CURLOPT_HEADERFUNCTION, array($this, 'getHeader'));
-    curl_setopt($ci, CURLOPT_HEADER, FALSE);
 
-    switch ($method) {
+	/**
-      case 'POST':
+	 * GET wrapper for oAuthRequest.
-        curl_setopt($ci, CURLOPT_POST, TRUE);
+	 *
-        if (!empty($postfields)) {
+	 * @param string $url
-          curl_setopt($ci, CURLOPT_POSTFIELDS, $postfields);
+	 * @param array $parameters
-        }
+	 * @return mixed|string
-        break;
+	 */
-      case 'DELETE':
+	function get($url, $parameters = [])
-        curl_setopt($ci, CURLOPT_CUSTOMREQUEST, 'DELETE');
+	{
-        if (!empty($postfields)) {
+		$response = $this->oAuthRequest($url, 'GET', $parameters);
-          $url = "{$url}?{$postfields}";
+		if ($this->format === 'json' && $this->decode_json) {
-        }
+			return json_decode($response);
-    }
+		}
 
-    curl_setopt($ci, CURLOPT_URL, $url);
+		return $response;
-    $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;
-  }
 
-  /**
+	/**
-   * Get the header info to store.
+	 * POST wrapper for oAuthRequest.
-   */
+	 *
-  function getHeader($ch, $header) {
+	 * @param string $url
-    $i = strpos($header, ':');
+	 * @param array $parameters
-    if (!empty($i)) {
+	 * @return mixed|string
-      $key = str_replace('-', '_', strtolower(substr($header, 0, $i)));
+	 */
-      $value = trim(substr($header, $i + 2));
+	function post($url, $parameters = [])
-      $this->http_header[$key] = $value;
+	{
-    }
+		$response = $this->oAuthRequest($url, 'POST', $parameters);
-    return strlen($header);
+		if ($this->format === 'json' && $this->decode_json) {
-  }
+			return json_decode($response);
+		}
+
+		return $response;
+	}
+
+	/**
+	 * DELETE wrapper for oAuthReqeust.
+	 *
+	 * @param string $url
+	 * @param array $parameters
+	 * @return mixed|string
+	 */
+	function delete($url, $parameters = [])
+	{
+		$response = $this->oAuthRequest($url, 'DELETE', $parameters);
+		if ($this->format === 'json' && $this->decode_json) {
+			return json_decode($response);
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Format and sign an OAuth / API request
+	 *
+	 * @param string $url
+	 * @param string $method
+	 * @param array $parameters
+	 * @return mixed|string
+	 */
+	function oAuthRequest($url, $method, $parameters)
+	{
+		if (strrpos($url, 'https://') !== 0 && strrpos($url, 'http://') !== 0) {
+			$url = "{$this->host}{$url}";
+		}
+
+		$request = OAuthRequest::from_consumer_and_token($this->consumer, $this->token, $method, $url, $parameters);
+		$request->sign_request($this->sha1_method, $this->consumer, $this->token);
+		switch ($method) {
+			case 'GET':
+				return $this->http($request->to_url(), 'GET');
+			default:
+				return $this->http($request->get_normalized_http_url(), $method, $request->to_postdata());
+		}
+	}
+
+	/**
+	 * Make an HTTP request
+	 *
+	 * @param string $url
+	 * @param string $method
+	 * @param mixed  $postfields
+	 * @return string API results
+	 */
+	function http($url, $method, $postfields = null)
+	{
+		$this->http_info = [];
+		$ci = curl_init();
+		/* Curl settings */
+		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, array('Expect:'));
+		curl_setopt($ci, CURLOPT_SSL_VERIFYPEER, $this->ssl_verifypeer);
+		curl_setopt($ci, CURLOPT_HEADERFUNCTION, array($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;
+	}
+
+	/**
+	 * Get the header info to store.
+	 *
+	 * @param resource $ch
+	 * @param string $header
+	 * @return int
+	 */
+	function getHeader($ch, $header)
+	{
+		$i = strpos($header, ':');
+		if (!empty($i)) {
+			$key = str_replace('-', '_', strtolower(substr($header, 0, $i)));
+			$value = trim(substr($header, $i + 2));
+			$this->http_header[$key] = $value;
+		}
+
+		return strlen($header);
+	}
 }

twitter/twitter.php

@@ -84,10 +84,10 @@ use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\ItemContent;
 use Friendica\Model\User;
-use Friendica\Object\Image;
 use Friendica\Protocol\Activity;
 use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Images;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
@@ -1010,7 +1010,7 @@ function twitter_fix_avatar($avatar)
 {
 	$new_avatar = str_replace("_normal.", ".", $avatar);
 
-	$info = Image::getInfoFromURL($new_avatar);
+	$info = Images::getInfoFromURLCached($new_avatar);
 	if (!$info) {
 		$new_avatar = $avatar;
 	}