diff --git a/blockem/blockem.php b/blockem/blockem.php
index 32af096d..a4b3c49e 100644
--- a/blockem/blockem.php
+++ b/blockem/blockem.php
@@ -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";
 	}
diff --git a/statusnet/library/codebirdsn.php b/statusnet/library/codebirdsn.php
index cba5f936..c90eb9e8 100644
--- a/statusnet/library/codebirdsn.php
+++ b/statusnet/library/codebirdsn.php
@@ -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.');
diff --git a/statusnet/library/statusnetoauth.php b/statusnet/library/statusnetoauth.php
index 27d91638..e9fd783c 100644
--- a/statusnet/library/statusnetoauth.php
+++ b/statusnet/library/statusnetoauth.php
@@ -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;
+	}
+}
diff --git a/statusnet/library/twitteroauth.php b/statusnet/library/twitteroauth.php
index bf56fc01..78d58089 100644
--- a/statusnet/library/twitteroauth.php
+++ b/statusnet/library/twitteroauth.php
@@ -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();
diff --git a/tumblr/library/tumblroauth.php b/tumblr/library/tumblroauth.php
index 914e6afa..948b19b6 100644
--- a/tumblr/library/tumblroauth.php
+++ b/tumblr/library/tumblroauth.php
@@ -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 */