diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index 1a1ae682c..0699f75bb 100644
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -11,7 +11,7 @@ define('FROMGPLUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
 
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
-use Friendica\Object\Photo;
+use Friendica\Object\Image;
 
 require_once 'mod/share.php';
 require_once 'mod/parse_url.php';
@@ -264,12 +264,12 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) {
 	}
 
 	if ($cleaned["full"] != "")
-		$infoFull = Photo::getInfoFromURL($cleaned["full"]);
+		$infoFull = Image::getInfoFromURL($cleaned["full"]);
 	else
 		$infoFull = array("0" => 0, "1" => 0);
 
 	if ($cleaned["preview"] != "")
-		$infoPreview = Photo::getInfoFromURL($cleaned["preview"]);
+		$infoPreview = Image::getInfoFromURL($cleaned["preview"]);
 	else
 		$infoFull = array("0" => 0, "1" => 0);
 
@@ -352,9 +352,9 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
 					$images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
 				} else {
 					if ($attachment->fullImage->url != "") {
-						$images = Photo::storePhoto($a, $uid, "", $attachment->fullImage->url);
+						$images = Image::storePhoto($a, $uid, "", $attachment->fullImage->url);
 					} elseif ($attachment->image->url != "") {
-						$images = Photo::storePhoto($a, $uid, "", $attachment->image->url);
+						$images = Image::storePhoto($a, $uid, "", $attachment->image->url);
 					}
 				}
 
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 968838265..c3201f424 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -8,8 +8,8 @@
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
-use Friendica\Model\GlobalContact;
-use Friendica\Object\Contact;
+use Friendica\Model\Contact;
+use Friendica\Model\GContact;
 
 require 'addon/pumpio/oauth/http.php';
 require 'addon/pumpio/oauth/oauth_client.php';
@@ -974,7 +974,7 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru
 
 function pumpio_get_contact($uid, $contact, $no_insert = false) {
 
-	GlobalContact::update(array("url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2,
+	GContact::update(array("url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2,
 			"photo" => $contact->image->url, "name" => $contact->displayName,  "hide" => true,
 			"nick" => $contact->preferredUsername, "location" => $contact->location->displayName,
 			"about" => $contact->summary, "addr" => str_replace("acct:", "", $contact->id)));
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 8433580f2..a9e309cff 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Name: GNU Social Connector
  * Description: Bidirectional (posting, relaying and reading) connector for GNU Social.
@@ -32,9 +33,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
-
-
-/***
+/*
  * 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.
  *
@@ -46,133 +45,163 @@ define('STATUSNET_DEFAULT_POLL_INTERVAL', 5); // given in minutes
 require_once 'library/twitteroauth.php';
 require_once 'include/enotify.php';
 
+use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
-use Friendica\Model\GlobalContact;
-use Friendica\Object\Photo;
+use Friendica\Model\GContact;
+use Friendica\Model\Photo;
 
-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
-   *
-   * @return API results
-   *
-   * Copied here from the twitteroauth library and complemented by applying the proxy settings of friendica
-   */
-  function http($url, $method, $postfields = NULL) {
-    $this->http_info = array();
-    $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, 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);
+class StatusNetOAuth extends TwitterOAuth
+{
+	function get_maxlength()
+	{
+		$config = $this->get($this->host . 'statusnet/config.json');
+		return $config->site->textlimit;
 	}
-	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;
-  }
+	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
+	 *
+	 * @return API results
+	 *
+	 * Copied here from the twitteroauth library and complemented by applying the proxy settings of friendica
+	 */
+	function http($url, $method, $postfields = NULL)
+	{
+		$this->http_info = array();
+		$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, 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;
+	}
 }
 
-function statusnet_install() {
+function statusnet_install()
+{
 	//  we need some hooks, for the configuration and for sending tweets
 	register_hook('connector_settings', 'addon/statusnet/statusnet.php', 'statusnet_settings');
 	register_hook('connector_settings_post', 'addon/statusnet/statusnet.php', 'statusnet_settings_post');
 	register_hook('notifier_normal', 'addon/statusnet/statusnet.php', 'statusnet_post_hook');
 	register_hook('post_local', 'addon/statusnet/statusnet.php', 'statusnet_post_local');
-	register_hook('jot_networks',    'addon/statusnet/statusnet.php', 'statusnet_jot_nets');
+	register_hook('jot_networks', 'addon/statusnet/statusnet.php', 'statusnet_jot_nets');
 	register_hook('cron', 'addon/statusnet/statusnet.php', 'statusnet_cron');
 	register_hook('prepare_body', 'addon/statusnet/statusnet.php', 'statusnet_prepare_body');
-	register_hook('check_item_notification','addon/statusnet/statusnet.php', 'statusnet_check_item_notification');
+	register_hook('check_item_notification', 'addon/statusnet/statusnet.php', 'statusnet_check_item_notification');
 	logger("installed GNU Social");
 }
 
-
-function statusnet_uninstall() {
+function statusnet_uninstall()
+{
 	unregister_hook('connector_settings', 'addon/statusnet/statusnet.php', 'statusnet_settings');
 	unregister_hook('connector_settings_post', 'addon/statusnet/statusnet.php', 'statusnet_settings_post');
 	unregister_hook('notifier_normal', 'addon/statusnet/statusnet.php', 'statusnet_post_hook');
 	unregister_hook('post_local', 'addon/statusnet/statusnet.php', 'statusnet_post_local');
-	unregister_hook('jot_networks',    'addon/statusnet/statusnet.php', 'statusnet_jot_nets');
+	unregister_hook('jot_networks', 'addon/statusnet/statusnet.php', 'statusnet_jot_nets');
 	unregister_hook('cron', 'addon/statusnet/statusnet.php', 'statusnet_cron');
 	unregister_hook('prepare_body', 'addon/statusnet/statusnet.php', 'statusnet_prepare_body');
-	unregister_hook('check_item_notification','addon/statusnet/statusnet.php', 'statusnet_check_item_notification');
+	unregister_hook('check_item_notification', 'addon/statusnet/statusnet.php', 'statusnet_check_item_notification');
 
 	// old setting - remove only
 	unregister_hook('post_local_end', 'addon/statusnet/statusnet.php', 'statusnet_post_hook');
 	unregister_hook('plugin_settings', 'addon/statusnet/statusnet.php', 'statusnet_settings');
 	unregister_hook('plugin_settings_post', 'addon/statusnet/statusnet.php', 'statusnet_settings_post');
-
 }
 
-function statusnet_check_item_notification($a, &$notification_data) {
+function statusnet_check_item_notification(App $a, &$notification_data)
+{
 	$notification_data["profiles"][] = PConfig::get($notification_data["uid"], 'statusnet', 'own_url');
 }
 
-function statusnet_jot_nets(&$a,&$b) {
-	if(! local_user())
+function statusnet_jot_nets(App $a, &$b)
+{
+	if (!local_user()) {
 		return;
+	}
 
-	$statusnet_post = PConfig::get(local_user(),'statusnet','post');
-	if(intval($statusnet_post) == 1) {
-		$statusnet_defpost = PConfig::get(local_user(),'statusnet','post_by_default');
+	$statusnet_post = PConfig::get(local_user(), 'statusnet', 'post');
+	if (intval($statusnet_post) == 1) {
+		$statusnet_defpost = PConfig::get(local_user(), 'statusnet', 'post_by_default');
 		$selected = ((intval($statusnet_defpost) == 1) ? ' checked="checked" ' : '');
 		$b .= '<div class="profile-jot-net"><input type="checkbox" name="statusnet_enable"' . $selected . ' value="1" /> '
 			. t('Post to GNU Social') . '</div>';
 	}
 }
 
-function statusnet_settings_post ($a,$post) {
-	if(! local_user())
+function statusnet_settings_post(App $a, $post)
+{
+	if (!local_user()) {
 		return;
+	}
 	// don't check GNU Social settings if GNU Social submit button is not clicked
-	if (!x($_POST,'statusnet-submit'))
+	if (!x($_POST, 'statusnet-submit')) {
 		return;
+	}
 
 	if (isset($_POST['statusnet-disconnect'])) {
-		/***
+		/*		 * *
 		 * if the GNU Social-disconnect checkbox is set, clear the GNU Social configuration
 		 */
 		PConfig::delete(local_user(), 'statusnet', 'consumerkey');
@@ -188,94 +217,100 @@ function statusnet_settings_post ($a,$post) {
 		PConfig::delete(local_user(), 'statusnet', 'create_user');
 		PConfig::delete(local_user(), 'statusnet', 'own_id');
 	} else {
-	if (isset($_POST['statusnet-preconf-apiurl'])) {
-		/***
-		 * If the user used one of the preconfigured GNU Social server credentials
-		 * 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');
-		foreach ( $globalsn as $asn) {
-			if ($asn['apiurl'] == $_POST['statusnet-preconf-apiurl'] ) {
-				$apibase = $asn['apiurl'];
-				$c = fetch_url( $apibase . 'statusnet/version.xml' );
+		if (isset($_POST['statusnet-preconf-apiurl'])) {
+			/*			 * *
+			 * If the user used one of the preconfigured GNU Social server credentials
+			 * 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');
+			foreach ($globalsn as $asn) {
+				if ($asn['apiurl'] == $_POST['statusnet-preconf-apiurl']) {
+					$apibase = $asn['apiurl'];
+					$c = fetch_url($apibase . 'statusnet/version.xml');
+					if (strlen($c) > 0) {
+						PConfig::set(local_user(), 'statusnet', 'consumerkey', $asn['consumerkey']);
+						PConfig::set(local_user(), 'statusnet', 'consumersecret', $asn['consumersecret']);
+						PConfig::set(local_user(), 'statusnet', 'baseapi', $asn['apiurl']);
+						//PConfig::set(local_user(), 'statusnet', 'application_name', $asn['applicationname'] );
+					} else {
+						notice(t('Please contact your site administrator.<br />The provided API URL is not valid.') . EOL . $asn['apiurl'] . EOL);
+					}
+				}
+			}
+			goaway($a->get_baseurl() . '/settings/connectors');
+		} else {
+			if (isset($_POST['statusnet-consumersecret'])) {
+				//  check if we can reach the API of the GNU Social server
+				//  we'll check the API Version for that, if we don't get one we'll try to fix the path but will
+				//  resign quickly after this one try to fix the path ;-)
+				$apibase = $_POST['statusnet-baseapi'];
+				$c = fetch_url($apibase . 'statusnet/version.xml');
 				if (strlen($c) > 0) {
-					PConfig::set(local_user(), 'statusnet', 'consumerkey', $asn['consumerkey'] );
-					PConfig::set(local_user(), 'statusnet', 'consumersecret', $asn['consumersecret'] );
-					PConfig::set(local_user(), 'statusnet', 'baseapi', $asn['apiurl'] );
-					//PConfig::set(local_user(), 'statusnet', 'application_name', $asn['applicationname'] );
+					//  ok the API path is correct, let's save the settings
+					PConfig::set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
+					PConfig::set(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']);
+					PConfig::set(local_user(), 'statusnet', 'baseapi', $apibase);
+					//PConfig::set(local_user(), 'statusnet', 'application_name', $_POST['statusnet-applicationname'] );
 				} else {
-					notice( t('Please contact your site administrator.<br />The provided API URL is not valid.').EOL.$asn['apiurl'].EOL );
+					//  the API path is not correct, maybe missing trailing / ?
+					$apibase = $apibase . '/';
+					$c = fetch_url($apibase . 'statusnet/version.xml');
+					if (strlen($c) > 0) {
+						//  ok the API path is now correct, let's save the settings
+						PConfig::set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
+						PConfig::set(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']);
+						PConfig::set(local_user(), 'statusnet', 'baseapi', $apibase);
+					} else {
+						//  still not the correct API base, let's do noting
+						notice(t('We could not contact the GNU Social API with the Path you entered.') . EOL);
+					}
+				}
+				goaway($a->get_baseurl() . '/settings/connectors');
+			} else {
+				if (isset($_POST['statusnet-pin'])) {
+					//  if the user supplied us with a PIN from GNU Social, let the magic of OAuth happen
+					$api = PConfig::get(local_user(), 'statusnet', 'baseapi');
+					$ckey = PConfig::get(local_user(), 'statusnet', 'consumerkey');
+					$csecret = PConfig::get(local_user(), 'statusnet', 'consumersecret');
+					//  the token and secret for which the PIN was generated were hidden in the settings
+					//  form as token and token2, we need a new connection to GNU Social using these token
+					//  and secret to request a Access Token with the PIN
+					$connection = new StatusNetOAuth($api, $ckey, $csecret, $_POST['statusnet-token'], $_POST['statusnet-token2']);
+					$token = $connection->getAccessToken($_POST['statusnet-pin']);
+					//  ok, now that we have the Access Token, save them in the user config
+					PConfig::set(local_user(), 'statusnet', 'oauthtoken', $token['oauth_token']);
+					PConfig::set(local_user(), 'statusnet', 'oauthsecret', $token['oauth_token_secret']);
+					PConfig::set(local_user(), 'statusnet', 'post', 1);
+					PConfig::set(local_user(), 'statusnet', 'post_taglinks', 1);
+					//  reload the Addon Settings page, if we don't do it see Bug #42
+					goaway($a->get_baseurl() . '/settings/connectors');
+				} else {
+					//  if no PIN is supplied in the POST variables, the user has changed the setting
+					//  to post a dent for every new __public__ posting to the wall
+					PConfig::set(local_user(), 'statusnet', 'post', intval($_POST['statusnet-enable']));
+					PConfig::set(local_user(), 'statusnet', 'post_by_default', intval($_POST['statusnet-default']));
+					PConfig::set(local_user(), 'statusnet', 'mirror_posts', intval($_POST['statusnet-mirror']));
+					PConfig::set(local_user(), 'statusnet', 'import', intval($_POST['statusnet-import']));
+					PConfig::set(local_user(), 'statusnet', 'create_user', intval($_POST['statusnet-create_user']));
+
+					if (!intval($_POST['statusnet-mirror']))
+						PConfig::delete(local_user(), 'statusnet', 'lastid');
+
+					info(t('GNU Social settings updated.') . EOL);
 				}
 			}
 		}
-		goaway($a->get_baseurl().'/settings/connectors');
-	} else {
-	if (isset($_POST['statusnet-consumersecret'])) {
-		//  check if we can reach the API of the GNU Social server
-		//  we'll check the API Version for that, if we don't get one we'll try to fix the path but will
-		//  resign quickly after this one try to fix the path ;-)
-		$apibase = $_POST['statusnet-baseapi'];
-		$c = fetch_url( $apibase . 'statusnet/version.xml' );
-		if (strlen($c) > 0) {
-			//  ok the API path is correct, let's save the settings
-			PConfig::set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
-			PConfig::set(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']);
-			PConfig::set(local_user(), 'statusnet', 'baseapi', $apibase );
-			//PConfig::set(local_user(), 'statusnet', 'application_name', $_POST['statusnet-applicationname'] );
-		} else {
-			//  the API path is not correct, maybe missing trailing / ?
-			$apibase = $apibase . '/';
-			$c = fetch_url( $apibase . 'statusnet/version.xml' );
-			if (strlen($c) > 0) {
-				//  ok the API path is now correct, let's save the settings
-				PConfig::set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
-				PConfig::set(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']);
-				PConfig::set(local_user(), 'statusnet', 'baseapi', $apibase );
-			} else {
-				//  still not the correct API base, let's do noting
-				notice( t('We could not contact the GNU Social API with the Path you entered.').EOL );
-			}
-		}
-		goaway($a->get_baseurl().'/settings/connectors');
-	} else {
-	if (isset($_POST['statusnet-pin'])) {
-		//  if the user supplied us with a PIN from GNU Social, let the magic of OAuth happen
-		$api     = PConfig::get(local_user(), 'statusnet', 'baseapi');
-		$ckey    = PConfig::get(local_user(), 'statusnet', 'consumerkey'  );
-		$csecret = PConfig::get(local_user(), 'statusnet', 'consumersecret' );
-		//  the token and secret for which the PIN was generated were hidden in the settings
-		//  form as token and token2, we need a new connection to GNU Social using these token
-		//  and secret to request a Access Token with the PIN
-		$connection = new StatusNetOAuth($api, $ckey, $csecret, $_POST['statusnet-token'], $_POST['statusnet-token2']);
-		$token   = $connection->getAccessToken( $_POST['statusnet-pin'] );
-		//  ok, now that we have the Access Token, save them in the user config
-		PConfig::set(local_user(),'statusnet', 'oauthtoken',  $token['oauth_token']);
-		PConfig::set(local_user(),'statusnet', 'oauthsecret', $token['oauth_token_secret']);
-		PConfig::set(local_user(),'statusnet', 'post', 1);
-		PConfig::set(local_user(),'statusnet', 'post_taglinks', 1);
-		//  reload the Addon Settings page, if we don't do it see Bug #42
-		goaway($a->get_baseurl().'/settings/connectors');
-	} else {
-		//  if no PIN is supplied in the POST variables, the user has changed the setting
-		//  to post a dent for every new __public__ posting to the wall
-		PConfig::set(local_user(),'statusnet','post',intval($_POST['statusnet-enable']));
-		PConfig::set(local_user(),'statusnet','post_by_default',intval($_POST['statusnet-default']));
-		PConfig::set(local_user(), 'statusnet', 'mirror_posts', intval($_POST['statusnet-mirror']));
-		PConfig::set(local_user(), 'statusnet', 'import', intval($_POST['statusnet-import']));
-		PConfig::set(local_user(), 'statusnet', 'create_user', intval($_POST['statusnet-create_user']));
-
-		if (!intval($_POST['statusnet-mirror']))
-			PConfig::delete(local_user(),'statusnet','lastid');
-
-		info( t('GNU Social settings updated.') . EOL);
-	}}}}
+	}
 }
-function statusnet_settings(&$a,&$s) {
-	if(! local_user())
+
+function statusnet_settings(App $a, &$s)
+{
+	if (!local_user()) {
 		return;
+	}
 	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/statusnet/statusnet.css' . '" media="all" />' . "\r\n";
-	/***
+	/*	 * *
 	 * 1) Check that we have a base api url and a consumer key & secret
 	 * 2) If no OAuthtoken & stuff is present, generate button to get some
 	 *    allow the user to cancel the connection process at this step
@@ -288,59 +323,59 @@ function statusnet_settings(&$a,&$s) {
 	$osecret = PConfig::get(local_user(), 'statusnet', 'oauthsecret');
 	$enabled = PConfig::get(local_user(), 'statusnet', 'post');
 	$checked = (($enabled) ? ' checked="checked" ' : '');
-	$defenabled = PConfig::get(local_user(),'statusnet','post_by_default');
+	$defenabled = PConfig::get(local_user(), 'statusnet', 'post_by_default');
 	$defchecked = (($defenabled) ? ' checked="checked" ' : '');
-	$mirrorenabled = PConfig::get(local_user(),'statusnet','mirror_posts');
+	$mirrorenabled = PConfig::get(local_user(), 'statusnet', 'mirror_posts');
 	$mirrorchecked = (($mirrorenabled) ? ' checked="checked" ' : '');
-	$import = PConfig::get(local_user(),'statusnet','import');
+	$import = PConfig::get(local_user(), 'statusnet', 'import');
 	$importselected = array("", "", "");
 	$importselected[$import] = ' selected="selected"';
 	//$importenabled = PConfig::get(local_user(),'statusnet','import');
 	//$importchecked = (($importenabled) ? ' checked="checked" ' : '');
-	$create_userenabled = PConfig::get(local_user(),'statusnet','create_user');
+	$create_userenabled = PConfig::get(local_user(), 'statusnet', 'create_user');
 	$create_userchecked = (($create_userenabled) ? ' checked="checked" ' : '');
 
 	$css = (($enabled) ? '' : '-disabled');
 
 	$s .= '<span id="settings_statusnet_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_statusnet_expanded\'); openClose(\'settings_statusnet_inflated\');">';
-	$s .= '<img class="connector'.$css.'" src="images/gnusocial.png" /><h3 class="connector">'. t('GNU Social Import/Export/Mirror').'</h3>';
+	$s .= '<img class="connector' . $css . '" src="images/gnusocial.png" /><h3 class="connector">' . t('GNU Social Import/Export/Mirror') . '</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_statusnet_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_statusnet_expanded\'); openClose(\'settings_statusnet_inflated\');">';
-	$s .= '<img class="connector'.$css.'" src="images/gnusocial.png" /><h3 class="connector">'. t('GNU Social Import/Export/Mirror').'</h3>';
+	$s .= '<img class="connector' . $css . '" src="images/gnusocial.png" /><h3 class="connector">' . t('GNU Social Import/Export/Mirror') . '</h3>';
 	$s .= '</span>';
 
-	if ( (!$ckey) && (!$csecret) ) {
-		/***
+	if ((!$ckey) && (!$csecret)) {
+		/*		 * *
 		 * no consumer keys
 		 */
 		$globalsn = 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
 		 * with a little explanation to the user as choice - otherwise
 		 * ignore this option entirely.
 		 */
-		if (! $globalsn == null) {
+		if (!$globalsn == null) {
 			$s .= '<h4>' . t('Globally Available GNU Social OAuthKeys') . '</h4>';
-			$s .= '<p>'. t("There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance \x28see below\x29.") .'</p>';
+			$s .= '<p>' . t("There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance \x28see below\x29.") . '</p>';
 			$s .= '<div id="statusnet-preconf-wrapper">';
 			foreach ($globalsn as $asn) {
-				$s .= '<input type="radio" name="statusnet-preconf-apiurl" value="'. $asn['apiurl'] .'">'. $asn['sitename'] .'<br />';
+				$s .= '<input type="radio" name="statusnet-preconf-apiurl" value="' . $asn['apiurl'] . '">' . $asn['sitename'] . '<br />';
 			}
 			$s .= '<p></p><div class="clear"></div></div>';
 			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
 		}
 		$s .= '<h4>' . t('Provide your own OAuth Credentials') . '</h4>';
-		$s .= '<p>'. t('No consumer key pair for GNU Social found. Register your Friendica Account as an desktop client on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited GNU Social installation.') .'</p>';
+		$s .= '<p>' . t('No consumer key pair for GNU Social found. Register your Friendica Account as an desktop client on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited GNU Social installation.') . '</p>';
 		$s .= '<div id="statusnet-consumer-wrapper">';
-		$s .= '<label id="statusnet-consumerkey-label" for="statusnet-consumerkey">'. t('OAuth Consumer Key') .'</label>';
+		$s .= '<label id="statusnet-consumerkey-label" for="statusnet-consumerkey">' . t('OAuth Consumer Key') . '</label>';
 		$s .= '<input id="statusnet-consumerkey" type="text" name="statusnet-consumerkey" size="35" /><br />';
 		$s .= '<div class="clear"></div>';
-		$s .= '<label id="statusnet-consumersecret-label" for="statusnet-consumersecret">'. t('OAuth Consumer Secret') .'</label>';
+		$s .= '<label id="statusnet-consumersecret-label" for="statusnet-consumersecret">' . t('OAuth Consumer Secret') . '</label>';
 		$s .= '<input id="statusnet-consumersecret" type="text" name="statusnet-consumersecret" size="35" /><br />';
 		$s .= '<div class="clear"></div>';
-		$s .= '<label id="statusnet-baseapi-label" for="statusnet-baseapi">'. t("Base API Path \x28remember the trailing /\x29") .'</label>';
+		$s .= '<label id="statusnet-baseapi-label" for="statusnet-baseapi">' . t("Base API Path \x28remember the trailing /\x29") . '</label>';
 		$s .= '<input id="statusnet-baseapi" type="text" name="statusnet-baseapi" size="35" /><br />';
 		$s .= '<div class="clear"></div>';
 		//$s .= '<label id="statusnet-applicationname-label" for="statusnet-applicationname">'.t('GNU Socialapplication name').'</label>';
@@ -349,11 +384,11 @@ function statusnet_settings(&$a,&$s) {
 		$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
 		$s .= '</div>';
 	} else {
-		/***
+		/*		 * *
 		 * ok we have a consumer key pair now look into the OAuth stuff
 		 */
-		if ( (!$otoken) && (!$osecret) ) {
-			/***
+		if ((!$otoken) && (!$osecret)) {
+			/*			 * *
 			 * the user has not yet connected the account to GNU Social
 			 * get a temporary OAuth key/secret pair and display a button with
 			 * which the user can request a PIN to connect the account to a
@@ -362,67 +397,67 @@ function statusnet_settings(&$a,&$s) {
 			$connection = new StatusNetOAuth($api, $ckey, $csecret);
 			$request_token = $connection->getRequestToken('oob');
 			$token = $request_token['oauth_token'];
-			/***
+			/*			 * *
 			 *  make some nice form
 			 */
-			$s .= '<p>'. t('To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social.') .'</p>';
-			$s .= '<a href="'.$connection->getAuthorizeURL($token,False).'" target="_statusnet"><img src="addon/statusnet/signinwithstatusnet.png" alt="'. t('Log in with GNU Social') .'"></a>';
+			$s .= '<p>' . t('To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social.') . '</p>';
+			$s .= '<a href="' . $connection->getAuthorizeURL($token, False) . '" target="_statusnet"><img src="addon/statusnet/signinwithstatusnet.png" alt="' . t('Log in with GNU Social') . '"></a>';
 			$s .= '<div id="statusnet-pin-wrapper">';
-			$s .= '<label id="statusnet-pin-label" for="statusnet-pin">'. t('Copy the security code from GNU Social here') .'</label>';
+			$s .= '<label id="statusnet-pin-label" for="statusnet-pin">' . t('Copy the security code from GNU Social here') . '</label>';
 			$s .= '<input id="statusnet-pin" type="text" name="statusnet-pin" />';
-			$s .= '<input id="statusnet-token" type="hidden" name="statusnet-token" value="'.$token.'" />';
-			$s .= '<input id="statusnet-token2" type="hidden" name="statusnet-token2" value="'.$request_token['oauth_token_secret'].'" />';
+			$s .= '<input id="statusnet-token" type="hidden" name="statusnet-token" value="' . $token . '" />';
+			$s .= '<input id="statusnet-token2" type="hidden" name="statusnet-token2" value="' . $request_token['oauth_token_secret'] . '" />';
 			$s .= '</div><div class="clear"></div>';
 			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
-			$s .= '<h4>'.t('Cancel Connection Process').'</h4>';
+			$s .= '<h4>' . t('Cancel Connection Process') . '</h4>';
 			$s .= '<div id="statusnet-cancel-wrapper">';
-			$s .= '<p>'.t('Current GNU Social API is').': '.$api.'</p>';
-			$s .= '<label id="statusnet-cancel-label" for="statusnet-cancel">'. t('Cancel GNU Social Connection') . '</label>';
+			$s .= '<p>' . t('Current GNU Social API is') . ': ' . $api . '</p>';
+			$s .= '<label id="statusnet-cancel-label" for="statusnet-cancel">' . t('Cancel GNU Social Connection') . '</label>';
 			$s .= '<input id="statusnet-cancel" type="checkbox" name="statusnet-disconnect" value="1" />';
 			$s .= '</div><div class="clear"></div>';
 			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
 		} else {
-			/***
+			/*			 * *
 			 *  we have an OAuth key / secret pair for the user
 			 *  so let's give a chance to disable the postings to GNU Social
 			 */
-			$connection = new StatusNetOAuth($api,$ckey,$csecret,$otoken,$osecret);
+			$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
 			$details = $connection->get('account/verify_credentials');
-			$s .= '<div id="statusnet-info" ><img id="statusnet-avatar" src="'.$details->profile_image_url.'" /><p id="statusnet-info-block">'. t('Currently connected to: ') .'<a href="'.$details->statusnet_profile_url.'" target="_statusnet">'.$details->screen_name.'</a><br /><em>'.$details->description.'</em></p></div>';
-			$s .= '<p>'. t('If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.') .'</p>';
+			$s .= '<div id="statusnet-info" ><img id="statusnet-avatar" src="' . $details->profile_image_url . '" /><p id="statusnet-info-block">' . t('Currently connected to: ') . '<a href="' . $details->statusnet_profile_url . '" target="_statusnet">' . $details->screen_name . '</a><br /><em>' . $details->description . '</em></p></div>';
+			$s .= '<p>' . t('If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.') . '</p>';
 			if ($a->user['hidewall']) {
-			    $s .= '<p>'. t('<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.') .'</p>';
+				$s .= '<p>' . t('<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.') . '</p>';
 			}
 			$s .= '<div id="statusnet-enable-wrapper">';
-			$s .= '<label id="statusnet-enable-label" for="statusnet-checkbox">'. t('Allow posting to GNU Social') .'</label>';
+			$s .= '<label id="statusnet-enable-label" for="statusnet-checkbox">' . t('Allow posting to GNU Social') . '</label>';
 			$s .= '<input id="statusnet-checkbox" type="checkbox" name="statusnet-enable" value="1" ' . $checked . '/>';
 			$s .= '<div class="clear"></div>';
-			$s .= '<label id="statusnet-default-label" for="statusnet-default">'. t('Send public postings to GNU Social by default') .'</label>';
+			$s .= '<label id="statusnet-default-label" for="statusnet-default">' . t('Send public postings to GNU Social by default') . '</label>';
 			$s .= '<input id="statusnet-default" type="checkbox" name="statusnet-default" value="1" ' . $defchecked . '/>';
 			$s .= '<div class="clear"></div>';
 
-			$s .= '<label id="statusnet-mirror-label" for="statusnet-mirror">'.t('Mirror all posts from GNU Social that are no replies or repeated messages').'</label>';
-			$s .= '<input id="statusnet-mirror" type="checkbox" name="statusnet-mirror" value="1" '. $mirrorchecked . '/>';
+			$s .= '<label id="statusnet-mirror-label" for="statusnet-mirror">' . t('Mirror all posts from GNU Social that are no replies or repeated messages') . '</label>';
+			$s .= '<input id="statusnet-mirror" type="checkbox" name="statusnet-mirror" value="1" ' . $mirrorchecked . '/>';
 
 			$s .= '<div class="clear"></div>';
 			$s .= '</div>';
 
-			$s .= '<label id="statusnet-import-label" for="statusnet-import">'.t('Import the remote timeline').'</label>';
+			$s .= '<label id="statusnet-import-label" for="statusnet-import">' . t('Import the remote timeline') . '</label>';
 			//$s .= '<input id="statusnet-import" type="checkbox" name="statusnet-import" value="1" '. $importchecked . '/>';
 
 			$s .= '<select name="statusnet-import" id="statusnet-import" />';
-			$s .= '<option value="0" '.$importselected[0].'>'.t("Disabled").'</option>';
-			$s .= '<option value="1" '.$importselected[1].'>'.t("Full Timeline").'</option>';
-			$s .= '<option value="2" '.$importselected[2].'>'.t("Only Mentions").'</option>';
+			$s .= '<option value="0" ' . $importselected[0] . '>' . t("Disabled") . '</option>';
+			$s .= '<option value="1" ' . $importselected[1] . '>' . t("Full Timeline") . '</option>';
+			$s .= '<option value="2" ' . $importselected[2] . '>' . t("Only Mentions") . '</option>';
 			$s .= '</select>';
 			$s .= '<div class="clear"></div>';
-/*
-			$s .= '<label id="statusnet-create_user-label" for="statusnet-create_user">'.t('Automatically create contacts').'</label>';
-			$s .= '<input id="statusnet-create_user" type="checkbox" name="statusnet-create_user" value="1" '. $create_userchecked . '/>';
-			$s .= '<div class="clear"></div>';
-*/
+			/*
+			  $s .= '<label id="statusnet-create_user-label" for="statusnet-create_user">'.t('Automatically create contacts').'</label>';
+			  $s .= '<input id="statusnet-create_user" type="checkbox" name="statusnet-create_user" value="1" '. $create_userchecked . '/>';
+			  $s .= '<div class="clear"></div>';
+			 */
 			$s .= '<div id="statusnet-disconnect-wrapper">';
-			$s .= '<label id="statusnet-disconnect-label" for="statusnet-disconnect">'. t('Clear OAuth configuration') .'</label>';
+			$s .= '<label id="statusnet-disconnect-label" for="statusnet-disconnect">' . t('Clear OAuth configuration') . '</label>';
 			$s .= '<input id="statusnet-disconnect" type="checkbox" name="statusnet-disconnect" value="1" />';
 			$s .= '</div><div class="clear"></div>';
 			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
@@ -431,8 +466,8 @@ function statusnet_settings(&$a,&$s) {
 	$s .= '</div><div class="clear"></div>';
 }
 
-
-function statusnet_post_local(&$a, &$b) {
+function statusnet_post_local(App $a, &$b)
+{
 	if ($b['edit']) {
 		return;
 	}
@@ -441,11 +476,11 @@ function statusnet_post_local(&$a, &$b) {
 		return;
 	}
 
-	$statusnet_post = PConfig::get(local_user(),'statusnet','post');
-	$statusnet_enable = (($statusnet_post && x($_REQUEST,'statusnet_enable')) ? intval($_REQUEST['statusnet_enable']) : 0);
+	$statusnet_post = PConfig::get(local_user(), 'statusnet', 'post');
+	$statusnet_enable = (($statusnet_post && x($_REQUEST, 'statusnet_enable')) ? intval($_REQUEST['statusnet_enable']) : 0);
 
 	// if API is used, default to the chosen settings
-	if ($b['api_source'] && intval(PConfig::get(local_user(),'statusnet','post_by_default'))) {
+	if ($b['api_source'] && intval(PConfig::get(local_user(), 'statusnet', 'post_by_default'))) {
 		$statusnet_enable = 1;
 	}
 
@@ -460,64 +495,61 @@ function statusnet_post_local(&$a, &$b) {
 	$b['postopts'] .= 'statusnet';
 }
 
-function statusnet_action($a, $uid, $pid, $action) {
-	$api     = PConfig::get($uid, 'statusnet', 'baseapi');
-	$ckey    = PConfig::get($uid, 'statusnet', 'consumerkey');
+function statusnet_action(App $a, $uid, $pid, $action)
+{
+	$api = PConfig::get($uid, 'statusnet', 'baseapi');
+	$ckey = PConfig::get($uid, 'statusnet', 'consumerkey');
 	$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
-	$otoken  = PConfig::get($uid, 'statusnet', 'oauthtoken');
+	$otoken = PConfig::get($uid, 'statusnet', 'oauthtoken');
 	$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
 
-	$connection = new StatusNetOAuth($api,$ckey,$csecret,$otoken,$osecret);
+	$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
 
-	logger("statusnet_action '".$action."' ID: ".$pid, LOGGER_DATA);
+	logger("statusnet_action '" . $action . "' ID: " . $pid, LOGGER_DATA);
 
 	switch ($action) {
 		case "delete":
-			$result = $connection->post("statuses/destroy/".$pid);
+			$result = $connection->post("statuses/destroy/" . $pid);
 			break;
 		case "like":
-			$result = $connection->post("favorites/create/".$pid);
+			$result = $connection->post("favorites/create/" . $pid);
 			break;
 		case "unlike":
-			$result = $connection->post("favorites/destroy/".$pid);
+			$result = $connection->post("favorites/destroy/" . $pid);
 			break;
 	}
-	logger("statusnet_action '".$action."' send, result: " . print_r($result, true), LOGGER_DEBUG);
+	logger("statusnet_action '" . $action . "' send, result: " . print_r($result, true), LOGGER_DEBUG);
 }
 
-function statusnet_post_hook(&$a,&$b) {
-
+function statusnet_post_hook(App $a, &$b)
+{
 	/**
 	 * Post to GNU Social
 	 */
-
-	if (!PConfig::get($b["uid"],'statusnet','import')) {
-		if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
+	if (!PConfig::get($b["uid"], 'statusnet', 'import')) {
+		if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
 			return;
 	}
 
 	$api = PConfig::get($b["uid"], 'statusnet', 'baseapi');
 	$hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $api);
 
-	if($b['parent'] != $b['id']) {
-		logger("statusnet_post_hook: parameter ".print_r($b, true), LOGGER_DATA);
+	if ($b['parent'] != $b['id']) {
+		logger("statusnet_post_hook: parameter " . print_r($b, true), LOGGER_DATA);
 
 		// Looking if its a reply to a GNU Social post
 		$hostlength = strlen($hostname) + 2;
-		if ((substr($b["parent-uri"], 0, $hostlength) != $hostname."::") && (substr($b["extid"], 0, $hostlength) != $hostname."::")
-			&& (substr($b["thr-parent"], 0, $hostlength) != $hostname."::")) {
-			logger("statusnet_post_hook: no GNU Social post ".$b["parent"]);
+		if ((substr($b["parent-uri"], 0, $hostlength) != $hostname . "::") && (substr($b["extid"], 0, $hostlength) != $hostname . "::") && (substr($b["thr-parent"], 0, $hostlength) != $hostname . "::")) {
+			logger("statusnet_post_hook: no GNU Social post " . $b["parent"]);
 			return;
 		}
 
 		$r = q("SELECT `item`.`author-link`, `item`.`uri`, `contact`.`nick` AS contact_nick
 			FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-			WHERE `item`.`uri` = '%s' AND `item`.`uid` = %d LIMIT 1",
-			dbesc($b["thr-parent"]),
-			intval($b["uid"]));
+			WHERE `item`.`uri` = '%s' AND `item`.`uid` = %d LIMIT 1", dbesc($b["thr-parent"]), intval($b["uid"]));
 
-		if(!count($r)) {
-			logger("statusnet_post_hook: no parent found ".$b["thr-parent"]);
+		if (!count($r)) {
+			logger("statusnet_post_hook: no parent found " . $b["thr-parent"]);
 			return;
 		} else {
 			$iscomment = true;
@@ -529,18 +561,18 @@ function statusnet_post_hook(&$a,&$b) {
 
 		$nick = preg_replace("=https?://(.*)/(.*)=ism", "$2", $orig_post["author-link"]);
 
-		$nickname = "@[url=".$orig_post["author-link"]."]".$nick."[/url]";
-		$nicknameplain = "@".$nick;
+		$nickname = "@[url=" . $orig_post["author-link"] . "]" . $nick . "[/url]";
+		$nicknameplain = "@" . $nick;
 
-		logger("statusnet_post_hook: comparing ".$nickname." and ".$nicknameplain." with ".$b["body"], LOGGER_DEBUG);
+		logger("statusnet_post_hook: comparing " . $nickname . " and " . $nicknameplain . " with " . $b["body"], LOGGER_DEBUG);
 		if ((strpos($b["body"], $nickname) === false) && (strpos($b["body"], $nicknameplain) === false))
-			$b["body"] = $nickname." ".$b["body"];
+			$b["body"] = $nickname . " " . $b["body"];
 
-		logger("statusnet_post_hook: parent found ".print_r($orig_post, true), LOGGER_DEBUG);
+		logger("statusnet_post_hook: parent found " . print_r($orig_post, true), LOGGER_DEBUG);
 	} else {
 		$iscomment = false;
 
-		if($b['private'] || !strstr($b['postopts'],'statusnet'))
+		if ($b['private'] || !strstr($b['postopts'], 'statusnet'))
 			return;
 
 		// Dont't post if the post doesn't belong to us.
@@ -551,11 +583,12 @@ function statusnet_post_hook(&$a,&$b) {
 		}
 	}
 
-	if (($b['verb'] == ACTIVITY_POST) && $b['deleted'])
+	if (($b['verb'] == ACTIVITY_POST) && $b['deleted']) {
 		statusnet_action($a, $b["uid"], substr($orig_post["uri"], $hostlength), "delete");
+	}
 
-	if($b['verb'] == ACTIVITY_LIKE) {
-		logger("statusnet_post_hook: parameter 2 ".substr($b["thr-parent"], $hostlength), LOGGER_DEBUG);
+	if ($b['verb'] == ACTIVITY_LIKE) {
+		logger("statusnet_post_hook: parameter 2 " . substr($b["thr-parent"], $hostlength), LOGGER_DEBUG);
 		if ($b['deleted'])
 			statusnet_action($a, $b["uid"], substr($b["thr-parent"], $hostlength), "unlike");
 		else
@@ -563,15 +596,18 @@ function statusnet_post_hook(&$a,&$b) {
 		return;
 	}
 
-	if($b['deleted'] || ($b['created'] !== $b['edited']))
+	if ($b['deleted'] || ($b['created'] !== $b['edited'])) {
 		return;
+	}
 
 	// if posts comes from GNU Social don't send it back
-	if($b['extid'] == NETWORK_STATUSNET)
+	if ($b['extid'] == NETWORK_STATUSNET) {
 		return;
+	}
 
-	if($b['app'] == "StatusNet")
+	if ($b['app'] == "StatusNet") {
 		return;
+	}
 
 	logger('GNU Socialpost invoked');
 
@@ -583,21 +619,21 @@ function statusnet_post_hook(&$a,&$b) {
 	$otoken  = PConfig::get($b['uid'], 'statusnet', 'oauthtoken');
 	$osecret = PConfig::get($b['uid'], 'statusnet', 'oauthsecret');
 
-	if($ckey && $csecret && $otoken && $osecret) {
-
+	if ($ckey && $csecret && $otoken && $osecret) {
 		// If it's a repeated message from GNU Social then do a native retweet and exit
-		if (statusnet_is_retweet($a, $b['uid'], $b['body']))
+		if (statusnet_is_retweet($a, $b['uid'], $b['body'])) {
 			return;
+		}
 
-		require_once('include/bbcode.php');
-		$dent = new StatusNetOAuth($api,$ckey,$csecret,$otoken,$osecret);
+		require_once 'include/bbcode.php';
+		$dent = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
 		$max_char = $dent->get_maxlength(); // max. length for a dent
 
 		PConfig::set($b['uid'], 'statusnet', 'max_char', $max_char);
 
 		$tempfile = "";
-		require_once("include/plaintext.php");
-		require_once("include/network.php");
+		require_once "include/plaintext.php";
+		require_once "include/network.php";
 		$msgarr = plaintext($a, $b, $max_char, true, 7);
 		$msg = $msgarr["text"];
 
@@ -608,104 +644,108 @@ function statusnet_post_hook(&$a,&$b) {
 
 		if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {
 			if ((strlen($msgarr["url"]) > 20) &&
-				((strlen($msg." \n".$msgarr["url"]) > $max_char)))
-				$msg .= " \n".short_link($msgarr["url"]);
-			else
-				$msg .= " \n".$msgarr["url"];
-		} elseif (isset($msgarr["image"]) && ($msgarr["type"] != "video"))
+				((strlen($msg . " \n" . $msgarr["url"]) > $max_char))) {
+				$msg .= " \n" . short_link($msgarr["url"]);
+			} else {
+				$msg .= " \n" . $msgarr["url"];
+			}
+		} elseif (isset($msgarr["image"]) && ($msgarr["type"] != "video")) {
 			$image = $msgarr["image"];
+		}
 
 		if ($image != "") {
 			$img_str = fetch_url($image);
 			$tempfile = tempnam(get_temppath(), "cache");
 			file_put_contents($tempfile, $img_str);
 			$postdata = array("status" => $msg, "media[]" => $tempfile);
-		} else
-			$postdata = array("status"=>$msg);
+		} else {
+			$postdata = array("status" => $msg);
+		}
 
 		// and now dent it :-)
-		if(strlen($msg)) {
-
+		if (strlen($msg)) {
 			if ($iscomment) {
 				$postdata["in_reply_to_status_id"] = substr($orig_post["uri"], $hostlength);
-				logger('statusnet_post send reply '.print_r($postdata, true), LOGGER_DEBUG);
+				logger('statusnet_post send reply ' . print_r($postdata, true), LOGGER_DEBUG);
 			}
 
 			// New code that is able to post pictures
-			require_once("addon/statusnet/codebird.php");
+			require_once "addon/statusnet/codebird.php";
 			$cb = \CodebirdSN\CodebirdSN::getInstance();
 			$cb->setAPIEndpoint($api);
 			$cb->setConsumerKey($ckey, $csecret);
 			$cb->setToken($otoken, $osecret);
 			$result = $cb->statuses_update($postdata);
 			//$result = $dent->post('statuses/update', $postdata);
-			logger('statusnet_post send, result: ' . print_r($result, true).
-				"\nmessage: ".$msg, LOGGER_DEBUG."\nOriginal post: ".print_r($b, true)."\nPost Data: ".print_r($postdata, true));
+			logger('statusnet_post send, result: ' . print_r($result, true) .
+				"\nmessage: " . $msg, LOGGER_DEBUG . "\nOriginal post: " . print_r($b, true) . "\nPost Data: " . print_r($postdata, true));
 
-			if ($result->source)
+			if ($result->source) {
 				PConfig::set($b["uid"], "statusnet", "application_name", strip_tags($result->source));
+			}
 
 			if ($result->error) {
-				logger('Send to GNU Social failed: "'.$result->error.'"');
+				logger('Send to GNU Social failed: "' . $result->error . '"');
 			} elseif ($iscomment) {
-				logger('statusnet_post: Update extid '.$result->id." for post id ".$b['id']);
+				logger('statusnet_post: Update extid ' . $result->id . " for post id " . $b['id']);
 				q("UPDATE `item` SET `extid` = '%s', `body` = '%s' WHERE `id` = %d",
-					dbesc($hostname."::".$result->id),
+					dbesc($hostname . "::" . $result->id),
 					dbesc($result->text),
 					intval($b['id'])
 				);
 			}
 		}
-		if ($tempfile != "")
+		if ($tempfile != "") {
 			unlink($tempfile);
+		}
 	}
 }
 
-function statusnet_plugin_admin_post(&$a){
-
+function statusnet_plugin_admin_post(App $a)
+{
 	$sites = array();
 
-	foreach($_POST['sitename'] as $id=>$sitename){
-		$sitename=trim($sitename);
-		$apiurl=trim($_POST['apiurl'][$id]);
-		if (! (substr($apiurl, -1)=='/'))
-		    $apiurl=$apiurl.'/';
-		$secret=trim($_POST['secret'][$id]);
-		$key=trim($_POST['key'][$id]);
+	foreach ($_POST['sitename'] as $id => $sitename) {
+		$sitename = trim($sitename);
+		$apiurl = trim($_POST['apiurl'][$id]);
+		if (!(substr($apiurl, -1) == '/')) {
+			$apiurl = $apiurl . '/';
+		}
+		$secret = trim($_POST['secret'][$id]);
+		$key = trim($_POST['key'][$id]);
 		//$applicationname = ((x($_POST, 'applicationname')) ? notags(trim($_POST['applicationname'][$id])):'');
-		if ($sitename!="" &&
-			$apiurl!="" &&
-			$secret!="" &&
-			$key!="" &&
-			!x($_POST['delete'][$id])){
+		if ($sitename != "" &&
+			$apiurl != "" &&
+			$secret != "" &&
+			$key != "" &&
+			!x($_POST['delete'][$id])) {
 
-				$sites[] = Array(
-					'sitename' => $sitename,
-					'apiurl' => $apiurl,
-					'consumersecret' => $secret,
-					'consumerkey' => $key,
-					//'applicationname' => $applicationname
-				);
+			$sites[] = Array(
+				'sitename' => $sitename,
+				'apiurl' => $apiurl,
+				'consumersecret' => $secret,
+				'consumerkey' => $key,
+				//'applicationname' => $applicationname
+			);
 		}
 	}
 
-	$sites = Config::set('statusnet','sites', $sites);
-
+	$sites = Config::set('statusnet', 'sites', $sites);
 }
 
-function statusnet_plugin_admin(&$a, &$o){
-
-	$sites = Config::get('statusnet','sites');
-	$sitesform=array();
-	if (is_array($sites)){
-		foreach($sites as $id=>$s){
+function statusnet_plugin_admin(App $a, &$o)
+{
+	$sites = Config::get('statusnet', 'sites');
+	$sitesform = array();
+	if (is_array($sites)) {
+		foreach ($sites as $id => $s) {
 			$sitesform[] = Array(
 				'sitename' => Array("sitename[$id]", "Site name", $s['sitename'], ""),
-				'apiurl' => Array("apiurl[$id]", "Api url", $s['apiurl'], t("Base API Path \x28remember the trailing /\x29") ),
+				'apiurl' => Array("apiurl[$id]", "Api url", $s['apiurl'], t("Base API Path \x28remember the trailing /\x29")),
 				'secret' => Array("secret[$id]", "Secret", $s['consumersecret'], ""),
 				'key' => Array("key[$id]", "Key", $s['consumerkey'], ""),
 				//'applicationname' => Array("applicationname[$id]", "Application name", $s['applicationname'], ""),
-				'delete' => Array("delete[$id]", "Delete", False , "Check to delete this preset"),
+				'delete' => Array("delete[$id]", "Delete", False, "Check to delete this preset"),
 			);
 		}
 	}
@@ -713,31 +753,34 @@ function statusnet_plugin_admin(&$a, &$o){
 	$id++;
 	$sitesform[] = Array(
 		'sitename' => Array("sitename[$id]", t("Site name"), "", ""),
-		'apiurl' => Array("apiurl[$id]", "Api url", "", t("Base API Path \x28remember the trailing /\x29") ),
+		'apiurl' => Array("apiurl[$id]", "Api url", "", t("Base API Path \x28remember the trailing /\x29")),
 		'secret' => Array("secret[$id]", t("Consumer Secret"), "", ""),
 		'key' => Array("key[$id]", t("Consumer Key"), "", ""),
 		//'applicationname' => Array("applicationname[$id]", t("Application name"), "", ""),
 	);
 
-	$t = get_markup_template( "admin.tpl", "addon/statusnet/" );
+	$t = get_markup_template("admin.tpl", "addon/statusnet/");
 	$o = replace_macros($t, array(
 		'$submit' => t('Save Settings'),
 		'$sites' => $sitesform,
 	));
 }
 
-function statusnet_prepare_body(&$a,&$b) {
-        if ($b["item"]["network"] != NETWORK_STATUSNET)
-                return;
+function statusnet_prepare_body(App $a, &$b)
+{
+	if ($b["item"]["network"] != NETWORK_STATUSNET) {
+		return;
+	}
 
-        if ($b["preview"]) {
-		$max_char = PConfig::get(local_user(),'statusnet','max_char');
-		if (intval($max_char) == 0)
+	if ($b["preview"]) {
+		$max_char = PConfig::get(local_user(), 'statusnet', 'max_char');
+		if (intval($max_char) == 0) {
 			$max_char = 140;
+		}
 
-                require_once("include/plaintext.php");
-                $item = $b["item"];
-                $item["plink"] = $a->get_baseurl()."/display/".$a->user["nickname"]."/".$item["parent"];
+		require_once "include/plaintext.php";
+		$item = $b["item"];
+		$item["plink"] = $a->get_baseurl() . "/display/" . $a->user["nickname"] . "/" . $item["parent"];
 
 		$r = q("SELECT `item`.`author-link`, `item`.`uri`, `contact`.`nick` AS contact_nick
                         FROM `item` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
@@ -745,44 +788,48 @@ function statusnet_prepare_body(&$a,&$b) {
                         dbesc($item["thr-parent"]),
                         intval(local_user()));
 
-                if(count($r)) {
-                        $orig_post = $r[0];
+		if (count($r)) {
+			$orig_post = $r[0];
 			//$nickname = "@[url=".$orig_post["author-link"]."]".$orig_post["contact_nick"]."[/url]";
 			//$nicknameplain = "@".$orig_post["contact_nick"];
 
 			$nick = preg_replace("=https?://(.*)/(.*)=ism", "$2", $orig_post["author-link"]);
 
-			$nickname = "@[url=".$orig_post["author-link"]."]".$nick."[/url]";
-			$nicknameplain = "@".$nick;
+			$nickname = "@[url=" . $orig_post["author-link"] . "]" . $nick . "[/url]";
+			$nicknameplain = "@" . $nick;
 
-	                if ((strpos($item["body"], $nickname) === false) && (strpos($item["body"], $nicknameplain) === false))
-	                        $item["body"] = $nickname." ".$item["body"];
-                }
+			if ((strpos($item["body"], $nickname) === false) && (strpos($item["body"], $nicknameplain) === false)) {
+				$item["body"] = $nickname . " " . $item["body"];
+			}
+		}
 
+		$msgarr = plaintext($a, $item, $max_char, true, 7);
+		$msg = $msgarr["text"];
 
-                $msgarr = plaintext($a, $item, $max_char, true, 7);
-                $msg = $msgarr["text"];
+		if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {
+			$msg .= " " . $msgarr["url"];
+		}
 
-                if (isset($msgarr["url"]) && ($msgarr["type"] != "photo"))
-                        $msg .= " ".$msgarr["url"];
+		if (isset($msgarr["image"])) {
+			$msg .= " " . $msgarr["image"];
+		}
 
-                if (isset($msgarr["image"]))
-                        $msg .= " ".$msgarr["image"];
-
-                $b['html'] = nl2br(htmlspecialchars($msg));
-        }
+		$b['html'] = nl2br(htmlspecialchars($msg));
+	}
 }
 
-function statusnet_cron($a,$b) {
-	$last = Config::get('statusnet','last_poll');
+function statusnet_cron(App $a, $b)
+{
+	$last = Config::get('statusnet', 'last_poll');
 
-	$poll_interval = intval(Config::get('statusnet','poll_interval'));
-	if(! $poll_interval)
+	$poll_interval = intval(Config::get('statusnet', 'poll_interval'));
+	if (!$poll_interval) {
 		$poll_interval = STATUSNET_DEFAULT_POLL_INTERVAL;
+	}
 
-	if($last) {
+	if ($last) {
 		$next = $last + ($poll_interval * 60);
-		if($next > time()) {
+		if ($next > time()) {
 			logger('statusnet: poll intervall not reached');
 			return;
 		}
@@ -790,41 +837,43 @@ function statusnet_cron($a,$b) {
 	logger('statusnet: cron_start');
 
 	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'statusnet' AND `k` = 'mirror_posts' AND `v` = '1' ORDER BY RAND() ");
-	if(count($r)) {
-		foreach($r as $rr) {
-			logger('statusnet: fetching for user '.$rr['uid']);
+	if (count($r)) {
+		foreach ($r as $rr) {
+			logger('statusnet: fetching for user ' . $rr['uid']);
 			statusnet_fetchtimeline($a, $rr['uid']);
 		}
 	}
 
-	$abandon_days = intval(Config::get('system','account_abandon_days'));
-	if ($abandon_days < 1)
+	$abandon_days = intval(Config::get('system', 'account_abandon_days'));
+	if ($abandon_days < 1) {
 		$abandon_days = 0;
+	}
 
 	$abandon_limit = date("Y-m-d H:i:s", time() - $abandon_days * 86400);
 
 	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'statusnet' AND `k` = 'import' AND `v` ORDER BY RAND()");
-	if(count($r)) {
-		foreach($r as $rr) {
+	if (count($r)) {
+		foreach ($r as $rr) {
 			if ($abandon_days != 0) {
 				$user = q("SELECT `login_date` FROM `user` WHERE uid=%d AND `login_date` >= '%s'", $rr['uid'], $abandon_limit);
 				if (!count($user)) {
-					logger('abandoned account: timeline from user '.$rr['uid'].' will not be imported');
+					logger('abandoned account: timeline from user ' . $rr['uid'] . ' will not be imported');
 					continue;
 				}
 			}
 
-			logger('statusnet: importing timeline from user '.$rr['uid']);
+			logger('statusnet: importing timeline from user ' . $rr['uid']);
 			statusnet_fetchhometimeline($a, $rr["uid"], $rr["v"]);
 		}
 	}
 
 	logger('statusnet: cron_end');
 
-	Config::set('statusnet','last_poll', time());
+	Config::set('statusnet', 'last_poll', time());
 }
 
-function statusnet_fetchtimeline($a, $uid) {
+function statusnet_fetchtimeline(App $a, $uid)
+{
 	$ckey    = PConfig::get($uid, 'statusnet', 'consumerkey');
 	$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
 	$api     = PConfig::get($uid, 'statusnet', 'baseapi');
@@ -832,129 +881,144 @@ function statusnet_fetchtimeline($a, $uid) {
 	$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
 	$lastid  = PConfig::get($uid, 'statusnet', 'lastid');
 
-	require_once('mod/item.php');
-	require_once('include/items.php');
+	require_once 'mod/item.php';
+	require_once 'include/items.php';
 
 	//  get the application name for the SN app
 	//  1st try personal config, then system config and fallback to the
 	//  hostname of the node if neither one is set.
-	$application_name  = PConfig::get( $uid, 'statusnet', 'application_name');
-	if ($application_name == "")
-		$application_name  = Config::get('statusnet', 'application_name');
-	if ($application_name == "")
+	$application_name = PConfig::get($uid, 'statusnet', 'application_name');
+	if ($application_name == "") {
+		$application_name = Config::get('statusnet', 'application_name');
+	}
+	if ($application_name == "") {
 		$application_name = $a->get_hostname();
+	}
 
-	$connection = new StatusNetOAuth($api, $ckey,$csecret,$otoken,$osecret);
+	$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
 
 	$parameters = array("exclude_replies" => true, "trim_user" => true, "contributor_details" => false, "include_rts" => false);
 
 	$first_time = ($lastid == "");
 
-	if ($lastid <> "")
+	if ($lastid <> "") {
 		$parameters["since_id"] = $lastid;
+	}
 
 	$items = $connection->get('statuses/user_timeline', $parameters);
 
-	if (!is_array($items))
+	if (!is_array($items)) {
 		return;
+	}
 
 	$posts = array_reverse($items);
 
 	if (count($posts)) {
-	    foreach ($posts as $post) {
-		if ($post->id > $lastid)
-			$lastid = $post->id;
+		foreach ($posts as $post) {
+			if ($post->id > $lastid)
+				$lastid = $post->id;
 
-		if ($first_time)
-			continue;
-
-		if ($post->source == "activity")
-			continue;
-
-		if (is_object($post->retweeted_status))
-			continue;
-
-		if ($post->in_reply_to_status_id != "")
-			continue;
-
-		if (!stristr($post->source, $application_name)) {
-			$_SESSION["authenticated"] = true;
-			$_SESSION["uid"] = $uid;
-
-			unset($_REQUEST);
-			$_REQUEST["type"] = "wall";
-			$_REQUEST["api_source"] = true;
-			$_REQUEST["profile_uid"] = $uid;
-			//$_REQUEST["source"] = "StatusNet";
-			$_REQUEST["source"] = $post->source;
-			$_REQUEST["extid"] = NETWORK_STATUSNET;
-
-			if (isset($post->id)) {
-				$_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_STATUSNET.":".$post->id);
+			if ($first_time) {
+				continue;
 			}
 
-			//$_REQUEST["date"] = $post->created_at;
+			if ($post->source == "activity") {
+				continue;
+			}
 
-			$_REQUEST["title"] = "";
+			if (is_object($post->retweeted_status)) {
+				continue;
+			}
 
-			$_REQUEST["body"] = add_page_info_to_body($post->text, true);
-			if (is_string($post->place->name))
-				$_REQUEST["location"] = $post->place->name;
+			if ($post->in_reply_to_status_id != "") {
+				continue;
+			}
 
-			if (is_string($post->place->full_name))
-				$_REQUEST["location"] = $post->place->full_name;
+			if (!stristr($post->source, $application_name)) {
+				$_SESSION["authenticated"] = true;
+				$_SESSION["uid"] = $uid;
 
-			if (is_array($post->geo->coordinates))
-				$_REQUEST["coord"] = $post->geo->coordinates[0]." ".$post->geo->coordinates[1];
+				unset($_REQUEST);
+				$_REQUEST["type"] = "wall";
+				$_REQUEST["api_source"] = true;
+				$_REQUEST["profile_uid"] = $uid;
+				//$_REQUEST["source"] = "StatusNet";
+				$_REQUEST["source"] = $post->source;
+				$_REQUEST["extid"] = NETWORK_STATUSNET;
 
-			if (is_array($post->coordinates->coordinates))
-				$_REQUEST["coord"] = $post->coordinates->coordinates[1]." ".$post->coordinates->coordinates[0];
+				if (isset($post->id)) {
+					$_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_STATUSNET . ":" . $post->id);
+				}
 
-			//print_r($_REQUEST);
-			if ($_REQUEST["body"] != "") {
-				logger('statusnet: posting for user '.$uid);
+				//$_REQUEST["date"] = $post->created_at;
 
-				item_post($a);
+				$_REQUEST["title"] = "";
+
+				$_REQUEST["body"] = add_page_info_to_body($post->text, true);
+				if (is_string($post->place->name)) {
+					$_REQUEST["location"] = $post->place->name;
+				}
+
+				if (is_string($post->place->full_name)) {
+					$_REQUEST["location"] = $post->place->full_name;
+				}
+
+				if (is_array($post->geo->coordinates)) {
+					$_REQUEST["coord"] = $post->geo->coordinates[0] . " " . $post->geo->coordinates[1];
+				}
+
+				if (is_array($post->coordinates->coordinates)) {
+					$_REQUEST["coord"] = $post->coordinates->coordinates[1] . " " . $post->coordinates->coordinates[0];
+				}
+
+				//print_r($_REQUEST);
+				if ($_REQUEST["body"] != "") {
+					logger('statusnet: posting for user ' . $uid);
+
+					item_post($a);
+				}
 			}
 		}
-	    }
 	}
 	PConfig::set($uid, 'statusnet', 'lastid', $lastid);
 }
 
-function statusnet_address($contact) {
+function statusnet_address($contact)
+{
 	$hostname = normalise_link($contact->statusnet_profile_url);
 	$nickname = $contact->screen_name;
 
 	$hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $contact->statusnet_profile_url);
 
-	$address = $contact->screen_name."@".$hostname;
+	$address = $contact->screen_name . "@" . $hostname;
 
-	return($address);
+	return $address;
 }
 
-function statusnet_fetch_contact($uid, $contact, $create_user) {
-	if ($contact->statusnet_profile_url == "")
-		return(-1);
-
-	GlobalContact::update(array("url" => $contact->statusnet_profile_url,
-			"network" => NETWORK_STATUSNET, "photo" => $contact->profile_image_url,
-			"name" => $contact->name, "nick" => $contact->screen_name,
-			"location" => $contact->location, "about" => $contact->description,
-			"addr" => statusnet_address($contact), "generation" => 3));
-
-	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' AND `network` = '%s'LIMIT 1",
-		intval($uid), dbesc(normalise_link($contact->statusnet_profile_url)), dbesc(NETWORK_STATUSNET));
-
-	if(!count($r) && !$create_user)
-		return(0);
-
-	if (count($r) && ($r[0]["readonly"] || $r[0]["blocked"])) {
-		logger("statusnet_fetch_contact: Contact '".$r[0]["nick"]."' is blocked or readonly.", LOGGER_DEBUG);
-		return(-1);
+function statusnet_fetch_contact($uid, $contact, $create_user)
+{
+	if ($contact->statusnet_profile_url == "") {
+		return -1;
 	}
 
-	if(!count($r)) {
+	GContact::update(array("url" => $contact->statusnet_profile_url,
+		"network" => NETWORK_STATUSNET, "photo" => $contact->profile_image_url,
+		"name" => $contact->name, "nick" => $contact->screen_name,
+		"location" => $contact->location, "about" => $contact->description,
+		"addr" => statusnet_address($contact), "generation" => 3));
+
+	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' AND `network` = '%s'LIMIT 1", intval($uid), dbesc(normalise_link($contact->statusnet_profile_url)), dbesc(NETWORK_STATUSNET));
+
+	if (!count($r) && !$create_user) {
+		return 0;
+	}
+
+	if (count($r) && ($r[0]["readonly"] || $r[0]["blocked"])) {
+		logger("statusnet_fetch_contact: Contact '" . $r[0]["nick"] . "' is blocked or readonly.", LOGGER_DEBUG);
+		return -1;
+	}
+
+	if (!count($r)) {
 		// create contact record
 		q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
 					`name`, `nick`, `photo`, `network`, `rel`, `priority`,
@@ -984,21 +1048,22 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
 			intval($uid),
 			dbesc(NETWORK_STATUSNET));
 
-		if(! count($r))
-			return(false);
+		if (!count($r)) {
+			return false;
+		}
 
-		$contact_id  = $r[0]['id'];
+		$contact_id = $r[0]['id'];
 
 		$g = q("SELECT def_gid FROM user WHERE uid = %d LIMIT 1",
 			intval($uid)
 		);
 
-		if($g && intval($g[0]['def_gid'])) {
-			require_once('include/group.php');
-			group_add_member($uid,'',$contact_id,$g[0]['def_gid']);
+		if ($g && intval($g[0]['def_gid'])) {
+			require_once 'include/group.php';
+			group_add_member($uid, '', $contact_id, $g[0]['def_gid']);
 		}
 
-		$photos = Photo::importProfilePhoto($contact->profile_image_url,$uid,$contact_id);
+		$photos = Photo::importProfilePhoto($contact->profile_image_url, $uid, $contact_id);
 
 		q("UPDATE `contact` SET `photo` = '%s',
 					`thumb` = '%s',
@@ -1013,15 +1078,12 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
 		);
 	} else {
 		// update profile photos once every two weeks as we have no notification of when they change.
-
 		//$update_photo = (($r[0]['avatar-date'] < datetime_convert('','','now -2 days')) ? true : false);
-		$update_photo = ($r[0]['avatar-date'] < datetime_convert('','','now -12 hours'));
+		$update_photo = ($r[0]['avatar-date'] < datetime_convert('', '', 'now -12 hours'));
 
 		// check that we have all the photos, this has been known to fail on occasion
-
-		if((!$r[0]['photo']) || (!$r[0]['thumb']) || (!$r[0]['micro']) || ($update_photo)) {
-
-			logger("statusnet_fetch_contact: Updating contact ".$contact->screen_name, LOGGER_DEBUG);
+		if ((!$r[0]['photo']) || (!$r[0]['thumb']) || (!$r[0]['micro']) || ($update_photo)) {
+			logger("statusnet_fetch_contact: Updating contact " . $contact->screen_name, LOGGER_DEBUG);
 
 			$photos = Photo::importProfilePhoto($contact->profile_image_url, $uid, $r[0]['id']);
 
@@ -1057,17 +1119,18 @@ function statusnet_fetch_contact($uid, $contact, $create_user) {
 		}
 	}
 
-	return($r[0]["id"]);
+	return $r[0]["id"];
 }
 
-function statusnet_fetchuser($a, $uid, $screen_name = "", $user_id = "") {
+function statusnet_fetchuser(App $a, $uid, $screen_name = "", $user_id = "")
+{
 	$ckey    = PConfig::get($uid, 'statusnet', 'consumerkey');
 	$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
 	$api     = PConfig::get($uid, 'statusnet', 'baseapi');
 	$otoken  = PConfig::get($uid, 'statusnet', 'oauthtoken');
 	$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
 
-	require_once("addon/statusnet/codebird.php");
+	require_once "addon/statusnet/codebird.php";
 
 	$cb = \Codebird\Codebird::getInstance();
 	$cb->setConsumerKey($ckey, $csecret);
@@ -1076,33 +1139,37 @@ function statusnet_fetchuser($a, $uid, $screen_name = "", $user_id = "") {
 	$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
 		intval($uid));
 
-	if(count($r)) {
+	if (count($r)) {
 		$self = $r[0];
-	} else
+	} else {
 		return;
+	}
 
 	$parameters = array();
 
-	if ($screen_name != "")
+	if ($screen_name != "") {
 		$parameters["screen_name"] = $screen_name;
+	}
 
-	if ($user_id != "")
+	if ($user_id != "") {
 		$parameters["user_id"] = $user_id;
+	}
 
 	// Fetching user data
 	$user = $cb->users_show($parameters);
 
-	if (!is_object($user))
+	if (!is_object($user)) {
 		return;
+	}
 
 	$contact_id = statusnet_fetch_contact($uid, $user, true);
 
 	return $contact_id;
 }
 
-function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existing_contact) {
-
-	require_once("include/html2bbcode.php");
+function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_existing_contact)
+{
+	require_once "include/html2bbcode.php";
 
 	logger("statusnet_createpost: start", LOGGER_DEBUG);
 
@@ -1118,29 +1185,31 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
 	if (is_object($post->retweeted_status)) {
 		$content = $post->retweeted_status;
 		statusnet_fetch_contact($uid, $content->user, false);
-	} else
+	} else {
 		$content = $post;
+	}
 
-	$postarray['uri'] = $hostname."::".$content->id;
+	$postarray['uri'] = $hostname . "::" . $content->id;
 
 	$r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
 			dbesc($postarray['uri']),
 			intval($uid)
-		);
+	);
 
-	if (count($r))
-		return(array());
+	if (count($r)) {
+		return array();
+	}
 
 	$contactid = 0;
 
 	if ($content->in_reply_to_status_id != "") {
 
-		$parent = $hostname."::".$content->in_reply_to_status_id;
+		$parent = $hostname . "::" . $content->in_reply_to_status_id;
 
 		$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 				dbesc($parent),
 				intval($uid)
-			);
+		);
 		if (count($r)) {
 			$postarray['thr-parent'] = $r[0]["uri"];
 			$postarray['parent-uri'] = $r[0]["parent-uri"];
@@ -1150,7 +1219,7 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
 			$r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
 					dbesc($parent),
 					intval($uid)
-				);
+			);
 			if (count($r)) {
 				$postarray['thr-parent'] = $r[0]['uri'];
 				$postarray['parent-uri'] = $r[0]['parent-uri'];
@@ -1170,14 +1239,15 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
 			$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
 				intval($uid));
 
-			if(count($r)) {
+			if (count($r)) {
 				$contactid = $r[0]["id"];
 
-				$postarray['owner-name'] =  $r[0]["name"];
+				$postarray['owner-name'] = $r[0]["name"];
 				$postarray['owner-link'] = $r[0]["url"];
-				$postarray['owner-avatar'] =  $r[0]["photo"];
-			} else
-				return(array());
+				$postarray['owner-avatar'] = $r[0]["photo"];
+			} else {
+				return array();
+			}
 		}
 		// Don't create accounts of people who just comment something
 		$create_user = false;
@@ -1192,10 +1262,11 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
 		$postarray['owner-link'] = $post->user->statusnet_profile_url;
 		$postarray['owner-avatar'] = $post->user->profile_image_url;
 	}
-	if(($contactid == 0) && !$only_existing_contact)
+	if (($contactid == 0) && !$only_existing_contact) {
 		$contactid = $self['id'];
-	elseif ($contactid <= 0)
-		return(array());
+	} elseif ($contactid <= 0) {
+		return array();
+	}
 
 	$postarray['contact-id'] = $contactid;
 
@@ -1208,7 +1279,7 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
 	// To-Do: Maybe unreliable? Can the api be entered without trailing "/"?
 	$hostname = str_replace("/api/", "/notice/", PConfig::get($uid, 'statusnet', 'baseapi'));
 
-	$postarray['plink'] = $hostname.$content->id;
+	$postarray['plink'] = $hostname . $content->id;
 	$postarray['app'] = strip_tags($content->source);
 
 	if ($content->user->protected) {
@@ -1222,98 +1293,91 @@ function statusnet_createpost($a, $uid, $post, $self, $create_user, $only_existi
 	$postarray['body'] = $converted["body"];
 	$postarray['tag'] = $converted["tags"];
 
-	$postarray['created'] = datetime_convert('UTC','UTC',$content->created_at);
-	$postarray['edited'] = datetime_convert('UTC','UTC',$content->created_at);
+	$postarray['created'] = datetime_convert('UTC', 'UTC', $content->created_at);
+	$postarray['edited'] = datetime_convert('UTC', 'UTC', $content->created_at);
 
-	if (is_string($content->place->name))
+	if (is_string($content->place->name)) {
 		$postarray["location"] = $content->place->name;
+	}
 
-	if (is_string($content->place->full_name))
+	if (is_string($content->place->full_name)) {
 		$postarray["location"] = $content->place->full_name;
+	}
 
-	if (is_array($content->geo->coordinates))
-		$postarray["coord"] = $content->geo->coordinates[0]." ".$content->geo->coordinates[1];
+	if (is_array($content->geo->coordinates)) {
+		$postarray["coord"] = $content->geo->coordinates[0] . " " . $content->geo->coordinates[1];
+	}
 
-	if (is_array($content->coordinates->coordinates))
-		$postarray["coord"] = $content->coordinates->coordinates[1]." ".$content->coordinates->coordinates[0];
+	if (is_array($content->coordinates->coordinates)) {
+		$postarray["coord"] = $content->coordinates->coordinates[1] . " " . $content->coordinates->coordinates[0];
+	}
 
-	/*if (is_object($post->retweeted_status)) {
-		$postarray['body'] = html2bbcode($post->retweeted_status->statusnet_html);
-
-		$converted = statusnet_convertmsg($a, $postarray['body'], false);
-		$postarray['body'] = $converted["body"];
-		$postarray['tag'] = $converted["tags"];
-
-		statusnet_fetch_contact($uid, $post->retweeted_status->user, false);
-
-		// Let retweets look like wall-to-wall posts
-		$postarray['author-name'] = $post->retweeted_status->user->name;
-		$postarray['author-link'] = $post->retweeted_status->user->statusnet_profile_url;
-		$postarray['author-avatar'] = $post->retweeted_status->user->profile_image_url;
-	}*/
 	logger("statusnet_createpost: end", LOGGER_DEBUG);
-	return($postarray);
+
+	return $postarray;
 }
 
-function statusnet_checknotification($a, $uid, $own_url, $top_item, $postarray) {
-
+function statusnet_checknotification(App $a, $uid, $own_url, $top_item, $postarray)
+{
 	// This function necer worked and need cleanup
-
 	$user = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
 			intval($uid)
-		);
+	);
 
-	if(!count($user))
+	if (!count($user)) {
 		return;
+	}
 
 	// Is it me?
-	if (link_compare($user[0]["url"], $postarray['author-link']))
+	if (link_compare($user[0]["url"], $postarray['author-link'])) {
 		return;
+	}
 
 	$own_user = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
 			intval($uid),
 			dbesc($own_url)
-		);
+	);
 
-	if(!count($own_user))
+	if (!count($own_user)) {
 		return;
+	}
 
 	// Is it me from GNU Social?
-	if (link_compare($own_user[0]["url"], $postarray['author-link']))
+	if (link_compare($own_user[0]["url"], $postarray['author-link'])) {
 		return;
+	}
 
 	$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0",
 			dbesc($postarray['parent-uri']),
 			intval($uid)
-			);
+	);
 
-	if(count($myconv)) {
-
-		foreach($myconv as $conv) {
+	if (count($myconv)) {
+		foreach ($myconv as $conv) {
 			// now if we find a match, it means we're in this conversation
-
-			if(!link_compare($conv['author-link'],$user[0]["url"]) && !link_compare($conv['author-link'],$own_user[0]["url"]))
+			if (!link_compare($conv['author-link'], $user[0]["url"]) && !link_compare($conv['author-link'], $own_user[0]["url"])) {
 				continue;
+			}
 
-			require_once('include/enotify.php');
+			require_once 'include/enotify.php';
 
 			$conv_parent = $conv['parent'];
 
 			notification(array(
-				'type'         => NOTIFY_COMMENT,
+				'type' => NOTIFY_COMMENT,
 				'notify_flags' => $user[0]['notify-flags'],
-				'language'     => $user[0]['language'],
-				'to_name'      => $user[0]['username'],
-				'to_email'     => $user[0]['email'],
-				'uid'          => $user[0]['uid'],
-				'item'         => $postarray,
-				'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($top_item)),
-				'source_name'  => $postarray['author-name'],
-				'source_link'  => $postarray['author-link'],
+				'language' => $user[0]['language'],
+				'to_name' => $user[0]['username'],
+				'to_email' => $user[0]['email'],
+				'uid' => $user[0]['uid'],
+				'item' => $postarray,
+				'link' => $a->get_baseurl() . '/display/' . urlencode(get_item_guid($top_item)),
+				'source_name' => $postarray['author-name'],
+				'source_link' => $postarray['author-link'],
 				'source_photo' => $postarray['author-avatar'],
-				'verb'         => ACTIVITY_POST,
-				'otype'        => 'item',
-				'parent'       => $conv_parent,
+				'verb' => ACTIVITY_POST,
+				'otype' => 'item',
+				'parent' => $conv_parent,
 			));
 
 			// only send one notification
@@ -1322,7 +1386,8 @@ function statusnet_checknotification($a, $uid, $own_url, $top_item, $postarray)
 	}
 }
 
-function statusnet_fetchhometimeline($a, $uid, $mode = 1) {
+function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
+{
 	$conversations = array();
 
 	$ckey    = PConfig::get($uid, 'statusnet', 'consumerkey');
@@ -1335,12 +1400,12 @@ function statusnet_fetchhometimeline($a, $uid, $mode = 1) {
 	// "create_user" is deactivated, since currently you cannot add users manually by now
 	$create_user = true;
 
-	logger("statusnet_fetchhometimeline: Fetching for user ".$uid, LOGGER_DEBUG);
+	logger("statusnet_fetchhometimeline: Fetching for user " . $uid, LOGGER_DEBUG);
 
-	require_once('library/twitteroauth.php');
-	require_once('include/items.php');
+	require_once 'library/twitteroauth.php';
+	require_once 'include/items.php';
 
-	$connection = new StatusNetOAuth($api, $ckey,$csecret,$otoken,$osecret);
+	$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
 
 	$own_contact = statusnet_fetch_own_contact($a, $uid);
 
@@ -1348,27 +1413,27 @@ function statusnet_fetchhometimeline($a, $uid, $mode = 1) {
 		intval($own_contact),
 		intval($uid));
 
-	if(count($r)) {
+	if (count($r)) {
 		$nick = $r[0]["nick"];
 	} else {
-		logger("statusnet_fetchhometimeline: Own GNU Social contact not found for user ".$uid, LOGGER_DEBUG);
+		logger("statusnet_fetchhometimeline: Own GNU Social contact not found for user " . $uid, LOGGER_DEBUG);
 		return;
 	}
 
 	$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
 		intval($uid));
 
-	if(count($r)) {
+	if (count($r)) {
 		$self = $r[0];
 	} else {
-		logger("statusnet_fetchhometimeline: Own contact not found for user ".$uid, LOGGER_DEBUG);
+		logger("statusnet_fetchhometimeline: Own contact not found for user " . $uid, LOGGER_DEBUG);
 		return;
 	}
 
 	$u = q("SELECT * FROM user WHERE uid = %d LIMIT 1",
 		intval($uid));
-	if(!count($u)) {
-		logger("statusnet_fetchhometimeline: Own user not found for user ".$uid, LOGGER_DEBUG);
+	if (!count($u)) {
+		logger("statusnet_fetchhometimeline: Own user not found for user " . $uid, LOGGER_DEBUG);
 		return;
 	}
 
@@ -1377,42 +1442,46 @@ function statusnet_fetchhometimeline($a, $uid, $mode = 1) {
 
 	if ($mode == 1) {
 		// Fetching timeline
-		$lastid  = PConfig::get($uid, 'statusnet', 'lasthometimelineid');
+		$lastid = PConfig::get($uid, 'statusnet', 'lasthometimelineid');
 		//$lastid = 1;
 
 		$first_time = ($lastid == "");
 
-		if ($lastid <> "")
+		if ($lastid != "") {
 			$parameters["since_id"] = $lastid;
+		}
 
 		$items = $connection->get('statuses/home_timeline', $parameters);
 
 		if (!is_array($items)) {
-			if (is_object($items) && isset($items->error))
+			if (is_object($items) && isset($items->error)) {
 				$errormsg = $items->error;
-			elseif (is_object($items))
+			} elseif (is_object($items)) {
 				$errormsg = print_r($items, true);
-			elseif (is_string($items) || is_float($items) || is_int($items))
+			} elseif (is_string($items) || is_float($items) || is_int($items)) {
 				$errormsg = $items;
-			else
+			} else {
 				$errormsg = "Unknown error";
+			}
 
-			logger("statusnet_fetchhometimeline: Error fetching home timeline: ".$errormsg, LOGGER_DEBUG);
+			logger("statusnet_fetchhometimeline: Error fetching home timeline: " . $errormsg, LOGGER_DEBUG);
 			return;
 		}
 
 		$posts = array_reverse($items);
 
-		logger("statusnet_fetchhometimeline: Fetching timeline for user ".$uid." ".sizeof($posts)." items", LOGGER_DEBUG);
+		logger("statusnet_fetchhometimeline: Fetching timeline for user " . $uid . " " . sizeof($posts) . " items", LOGGER_DEBUG);
 
 		if (count($posts)) {
 			foreach ($posts as $post) {
 
-				if ($post->id > $lastid)
+				if ($post->id > $lastid) {
 					$lastid = $post->id;
+				}
 
-				if ($first_time)
+				if ($first_time) {
 					continue;
+				}
 
 				if (isset($post->statusnet_conversation_id)) {
 					if (!isset($conversations[$post->statusnet_conversation_id])) {
@@ -1422,48 +1491,52 @@ function statusnet_fetchhometimeline($a, $uid, $mode = 1) {
 				} else {
 					$postarray = statusnet_createpost($a, $uid, $post, $self, $create_user, true);
 
-					if (trim($postarray['body']) == "")
+					if (trim($postarray['body']) == "") {
 						continue;
+					}
 
 					$item = item_store($postarray);
 					$postarray["id"] = $item;
 
-					logger('statusnet_fetchhometimeline: User '.$self["nick"].' posted home timeline item '.$item);
+					logger('statusnet_fetchhometimeline: User ' . $self["nick"] . ' posted home timeline item ' . $item);
 
-					if ($item && !function_exists("check_item_notification"))
+					if ($item && !function_exists("check_item_notification")) {
 						statusnet_checknotification($a, $uid, $nick, $item, $postarray);
+					}
 				}
-
 			}
 		}
 		PConfig::set($uid, 'statusnet', 'lasthometimelineid', $lastid);
 	}
 
 	// Fetching mentions
-	$lastid  = PConfig::get($uid, 'statusnet', 'lastmentionid');
+	$lastid = PConfig::get($uid, 'statusnet', 'lastmentionid');
 	$first_time = ($lastid == "");
 
-	if ($lastid <> "")
+	if ($lastid != "") {
 		$parameters["since_id"] = $lastid;
+	}
 
 	$items = $connection->get('statuses/mentions_timeline', $parameters);
 
 	if (!is_array($items)) {
-		logger("statusnet_fetchhometimeline: Error fetching mentions: ".print_r($items, true), LOGGER_DEBUG);
+		logger("statusnet_fetchhometimeline: Error fetching mentions: " . print_r($items, true), LOGGER_DEBUG);
 		return;
 	}
 
 	$posts = array_reverse($items);
 
-	logger("statusnet_fetchhometimeline: Fetching mentions for user ".$uid." ".sizeof($posts)." items", LOGGER_DEBUG);
+	logger("statusnet_fetchhometimeline: Fetching mentions for user " . $uid . " " . sizeof($posts) . " items", LOGGER_DEBUG);
 
 	if (count($posts)) {
 		foreach ($posts as $post) {
-			if ($post->id > $lastid)
+			if ($post->id > $lastid) {
 				$lastid = $post->id;
+			}
 
-			if ($first_time)
+			if ($first_time) {
 				continue;
+			}
 
 			$postarray = statusnet_createpost($a, $uid, $post, $self, false, false);
 
@@ -1473,16 +1546,17 @@ function statusnet_fetchhometimeline($a, $uid, $mode = 1) {
 					$conversations[$post->statusnet_conversation_id] = $post->statusnet_conversation_id;
 				}
 			} else {
-				if (trim($postarray['body']) != "") {
+				if (trim($postarray['body']) == "") {
 					continue;
+				}
 
-					$item = item_store($postarray);
-					$postarray["id"] = $item;
+				$item = item_store($postarray);
+				$postarray["id"] = $item;
 
-					logger('statusnet_fetchhometimeline: User '.$self["nick"].' posted mention timeline item '.$item);
+				logger('statusnet_fetchhometimeline: User ' . $self["nick"] . ' posted mention timeline item ' . $item);
 
-					if ($item && function_exists("check_item_notification"))
-						check_item_notification($item, $uid, NOTIFY_TAGSELF);
+				if ($item && function_exists("check_item_notification")) {
+					check_item_notification($item, $uid, NOTIFY_TAGSELF);
 				}
 			}
 
@@ -1496,7 +1570,7 @@ function statusnet_fetchhometimeline($a, $uid, $mode = 1) {
 			}
 
 			if (($item != 0) && !function_exists("check_item_notification")) {
-				require_once('include/enotify.php');
+				require_once 'include/enotify.php';
 				notification(array(
 					'type'         => NOTIFY_TAGSELF,
 					'notify_flags' => $u[0]['notify-flags'],
@@ -1505,7 +1579,7 @@ function statusnet_fetchhometimeline($a, $uid, $mode = 1) {
 					'to_email'     => $u[0]['email'],
 					'uid'          => $u[0]['uid'],
 					'item'         => $postarray,
-					'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)),
+					'link'         => $a->get_baseurl() . '/display/' . urlencode(get_item_guid($item)),
 					'source_name'  => $postarray['author-name'],
 					'source_link'  => $postarray['author-link'],
 					'source_photo' => $postarray['author-avatar'],
@@ -1520,7 +1594,8 @@ function statusnet_fetchhometimeline($a, $uid, $mode = 1) {
 	PConfig::set($uid, 'statusnet', 'lastmentionid', $lastid);
 }
 
-function statusnet_complete_conversation($a, $uid, $self, $create_user, $nick, $conversation) {
+function statusnet_complete_conversation(App $a, $uid, $self, $create_user, $nick, $conversation)
+{
 	$ckey    = PConfig::get($uid, 'statusnet', 'consumerkey');
 	$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
 	$api     = PConfig::get($uid, 'statusnet', 'baseapi');
@@ -1528,44 +1603,45 @@ function statusnet_complete_conversation($a, $uid, $self, $create_user, $nick, $
 	$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
 	$own_url = PConfig::get($uid, 'statusnet', 'own_url');
 
-	require_once('library/twitteroauth.php');
+	require_once 'library/twitteroauth.php';
 
-	$connection = new StatusNetOAuth($api, $ckey,$csecret,$otoken,$osecret);
+	$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
 
 	$parameters["count"] = 200;
 
-	$items = $connection->get('statusnet/conversation/'.$conversation, $parameters);
+	$items = $connection->get('statusnet/conversation/' . $conversation, $parameters);
 	if (is_array($items)) {
 		$posts = array_reverse($items);
 
-		foreach($posts AS $post) {
+		foreach ($posts AS $post) {
 			$postarray = statusnet_createpost($a, $uid, $post, $self, false, false);
 
-			if (trim($postarray['body']) == "")
+			if (trim($postarray['body']) == "") {
 				continue;
+			}
 
-			//print_r($postarray);
 			$item = item_store($postarray);
 			$postarray["id"] = $item;
 
-			logger('statusnet_complete_conversation: User '.$self["nick"].' posted home timeline item '.$item);
+			logger('statusnet_complete_conversation: User ' . $self["nick"] . ' posted home timeline item ' . $item);
 
-			if ($item && !function_exists("check_item_notification"))
+			if ($item && !function_exists("check_item_notification")) {
 				statusnet_checknotification($a, $uid, $nick, $item, $postarray);
+			}
 		}
 	}
 }
 
-function statusnet_convertmsg($a, $body, $no_tags = false) {
+function statusnet_convertmsg(App $a, $body, $no_tags = false)
+{
+	require_once "include/oembed.php";
+	require_once "include/items.php";
+	require_once "include/network.php";
 
-	require_once("include/oembed.php");
-	require_once("include/items.php");
-	require_once("include/network.php");
-
-	$body = preg_replace("=\[url\=https?://([0-9]*).([0-9]*).([0-9]*).([0-9]*)/([0-9]*)\](.*?)\[\/url\]=ism","$1.$2.$3.$4/$5",$body);
+	$body = preg_replace("=\[url\=https?://([0-9]*).([0-9]*).([0-9]*).([0-9]*)/([0-9]*)\](.*?)\[\/url\]=ism", "$1.$2.$3.$4/$5", $body);
 
 	$URLSearchString = "^\[\]";
-	$links = preg_match_all("/[^!#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $body,$matches,PREG_SET_ORDER);
+	$links = preg_match_all("/[^!#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER);
 
 	$footer = "";
 	$footerurl = "";
@@ -1574,32 +1650,34 @@ function statusnet_convertmsg($a, $body, $no_tags = false) {
 
 	if ($links) {
 		foreach ($matches AS $match) {
-			$search = "[url=".$match[1]."]".$match[2]."[/url]";
+			$search = "[url=" . $match[1] . "]" . $match[2] . "[/url]";
 
-			logger("statusnet_convertmsg: expanding url ".$match[1], LOGGER_DEBUG);
+			logger("statusnet_convertmsg: expanding url " . $match[1], LOGGER_DEBUG);
 
 			$expanded_url = original_url($match[1]);
 
-			logger("statusnet_convertmsg: fetching data for ".$expanded_url, LOGGER_DEBUG);
+			logger("statusnet_convertmsg: fetching data for " . $expanded_url, LOGGER_DEBUG);
 
 			$oembed_data = oembed_fetch_url($expanded_url, true);
 
 			logger("statusnet_convertmsg: fetching data: done", LOGGER_DEBUG);
 
-			if ($type == "")
+			if ($type == "") {
 				$type = $oembed_data->type;
+			}
+
 			if ($oembed_data->type == "video") {
 				//$body = str_replace($search, "[video]".$expanded_url."[/video]", $body);
 				$type = $oembed_data->type;
 				$footerurl = $expanded_url;
-				$footerlink = "[url=".$expanded_url."]".$expanded_url."[/url]";
+				$footerlink = "[url=" . $expanded_url . "]" . $expanded_url . "[/url]";
 
 				$body = str_replace($search, $footerlink, $body);
-			} elseif (($oembed_data->type == "photo") && isset($oembed_data->url) && !$dontincludemedia)
-				$body = str_replace($search, "[url=".$expanded_url."][img]".$oembed_data->url."[/img][/url]", $body);
-			elseif ($oembed_data->type != "link")
-				$body = str_replace($search,  "[url=".$expanded_url."]".$expanded_url."[/url]", $body);
-			else {
+			} elseif (($oembed_data->type == "photo") && isset($oembed_data->url) && !$dontincludemedia) {
+				$body = str_replace($search, "[url=" . $expanded_url . "][img]" . $oembed_data->url . "[/img][/url]", $body);
+			} elseif ($oembed_data->type != "link") {
+				$body = str_replace($search, "[url=" . $expanded_url . "]" . $expanded_url . "[/url]", $body);
+			} else {
 				$img_str = fetch_url($expanded_url, true, $redirects, 4);
 
 				$tempfile = tempnam(get_temppath(), "cache");
@@ -1609,61 +1687,66 @@ function statusnet_convertmsg($a, $body, $no_tags = false) {
 
 				if (substr($mime, 0, 6) == "image/") {
 					$type = "photo";
-					$body = str_replace($search, "[img]".$expanded_url."[/img]", $body);
+					$body = str_replace($search, "[img]" . $expanded_url . "[/img]", $body);
 				} else {
 					$type = $oembed_data->type;
 					$footerurl = $expanded_url;
-					$footerlink = "[url=".$expanded_url."]".$expanded_url."[/url]";
+					$footerlink = "[url=" . $expanded_url . "]" . $expanded_url . "[/url]";
 
 					$body = str_replace($search, $footerlink, $body);
 				}
 			}
 		}
 
-		if ($footerurl != "")
+		if ($footerurl != "") {
 			$footer = add_page_info($footerurl);
+		}
 
 		if (($footerlink != "") && (trim($footer) != "")) {
 			$removedlink = trim(str_replace($footerlink, "", $body));
 
-			if (($removedlink == "") || strstr($body, $removedlink))
+			if (($removedlink == "") || strstr($body, $removedlink)) {
 				$body = $removedlink;
+			}
 
 			$body .= $footer;
 		}
 	}
 
-	if ($no_tags)
-		return(array("body" => $body, "tags" => ""));
+	if ($no_tags) {
+		return array("body" => $body, "tags" => "");
+	}
 
 	$str_tags = '';
 
-	$cnt = preg_match_all("/([!#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",$body,$matches,PREG_SET_ORDER);
-	if($cnt) {
-		foreach($matches as $mtch) {
-			if(strlen($str_tags))
+	$cnt = preg_match_all("/([!#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER);
+	if ($cnt) {
+		foreach ($matches as $mtch) {
+			if (strlen($str_tags)) {
 				$str_tags .= ',';
+			}
 
 			if ($mtch[1] == "#") {
 				// Replacing the hash tags that are directed to the GNU Social server with internal links
-				$snhash = "#[url=".$mtch[2]."]".$mtch[3]."[/url]";
-				$frdchash = '#[url='.$a->get_baseurl().'/search?tag='.rawurlencode($mtch[3]).']'.$mtch[3].'[/url]';
+				$snhash = "#[url=" . $mtch[2] . "]" . $mtch[3] . "[/url]";
+				$frdchash = '#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($mtch[3]) . ']' . $mtch[3] . '[/url]';
 				$body = str_replace($snhash, $frdchash, $body);
 
 				$str_tags .= $frdchash;
-			} else
-				$str_tags .= "@[url=".$mtch[2]."]".$mtch[3]."[/url]";
-				// To-Do:
-				// There is a problem with links with to GNU Social groups, so these links are stored with "@" like friendica groups
-				//$str_tags .= $mtch[1]."[url=".$mtch[2]."]".$mtch[3]."[/url]";
+			} else {
+				$str_tags .= "@[url=" . $mtch[2] . "]" . $mtch[3] . "[/url]";
+			}
+			// To-Do:
+			// There is a problem with links with to GNU Social groups, so these links are stored with "@" like friendica groups
+			//$str_tags .= $mtch[1]."[url=".$mtch[2]."]".$mtch[3]."[/url]";
 		}
 	}
 
-	return(array("body"=>$body, "tags"=>$str_tags));
-
+	return array("body" => $body, "tags" => $str_tags);
 }
 
-function statusnet_fetch_own_contact($a, $uid) {
+function statusnet_fetch_own_contact(App $a, $uid)
+{
 	$ckey    = PConfig::get($uid, 'statusnet', 'consumerkey');
 	$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
 	$api     = PConfig::get($uid, 'statusnet', 'baseapi');
@@ -1674,9 +1757,9 @@ function statusnet_fetch_own_contact($a, $uid) {
 	$contact_id = 0;
 
 	if ($own_url == "") {
-		require_once('library/twitteroauth.php');
+		require_once 'library/twitteroauth.php';
 
-		$connection = new StatusNetOAuth($api, $ckey,$csecret,$otoken,$osecret);
+		$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
 
 		// Fetching user data
 		$user = $connection->get('account/verify_credentials');
@@ -1684,44 +1767,49 @@ function statusnet_fetch_own_contact($a, $uid) {
 		PConfig::set($uid, 'statusnet', 'own_url', normalise_link($user->statusnet_profile_url));
 
 		$contact_id = statusnet_fetch_contact($uid, $user, true);
-
 	} else {
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
 			intval($uid), dbesc($own_url));
-		if(count($r))
+		if (count($r)) {
 			$contact_id = $r[0]["id"];
-		else
+		} else {
 			PConfig::delete($uid, 'statusnet', 'own_url');
-
+		}
 	}
-	return($contact_id);
+	return $contact_id;
 }
 
-function statusnet_is_retweet($a, $uid, $body) {
+function statusnet_is_retweet(App $a, $uid, $body)
+{
 	$body = trim($body);
 
 	// Skip if it isn't a pure repeated messages
 	// Does it start with a share?
-	if (strpos($body, "[share") > 0)
-		return(false);
+	if (strpos($body, "[share") > 0) {
+		return false;
+	}
 
 	// Does it end with a share?
-	if (strlen($body) > (strrpos($body, "[/share]") + 8))
-		return(false);
+	if (strlen($body) > (strrpos($body, "[/share]") + 8)) {
+		return false;
+	}
 
-	$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
+	$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "$1", $body);
 	// Skip if there is no shared message in there
-	if ($body == $attributes)
-		return(false);
+	if ($body == $attributes) {
+		return false;
+	}
 
 	$link = "";
 	preg_match("/link='(.*?)'/ism", $attributes, $matches);
-	if ($matches[1] != "")
+	if ($matches[1] != "") {
 		$link = $matches[1];
+	}
 
 	preg_match('/link="(.*?)"/ism', $attributes, $matches);
-	if ($matches[1] != "")
+	if ($matches[1] != "") {
 		$link = $matches[1];
+	}
 
 	$ckey    = PConfig::get($uid, 'statusnet', 'consumerkey');
 	$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
@@ -1730,17 +1818,19 @@ function statusnet_is_retweet($a, $uid, $body) {
 	$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
 	$hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $api);
 
-	$id = preg_replace("=https?://".$hostname."/notice/(.*)=ism", "$1", $link);
+	$id = preg_replace("=https?://" . $hostname . "/notice/(.*)=ism", "$1", $link);
 
-	if ($id == $link)
-		return(false);
+	if ($id == $link) {
+		return false;
+	}
 
-	logger('statusnet_is_retweet: Retweeting id '.$id.' for user '.$uid, LOGGER_DEBUG);
+	logger('statusnet_is_retweet: Retweeting id ' . $id . ' for user ' . $uid, LOGGER_DEBUG);
 
-	$connection = new StatusNetOAuth($api, $ckey,$csecret,$otoken,$osecret);
+	$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
 
-	$result = $connection->post('statuses/retweet/'.$id);
+	$result = $connection->post('statuses/retweet/' . $id);
 
-	logger('statusnet_is_retweet: result '.print_r($result, true), LOGGER_DEBUG);
-	return(isset($result->id));
+	logger('statusnet_is_retweet: result ' . print_r($result, true), LOGGER_DEBUG);
+
+	return isset($result->id);
 }
diff --git a/twitter/twitter.php b/twitter/twitter.php
index e8e890316..f88d4542b 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Name: Twitter Connector
  * Description: Bidirectional (posting, relaying and reading) connector for Twitter.
@@ -32,7 +33,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
-
 /*   Twitter Plugin for Friendica
  *
  *   Author: Tobias Diekershoff
@@ -60,18 +60,20 @@
  *     Requirements: PHP5, curl [Slinky library]
  */
 
+use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
-use Friendica\Model\GlobalContact;
-use Friendica\Object\Photo;
+use Friendica\Model\GContact;
+use Friendica\Model\Photo;
+use Friendica\Object\Image;
 
 require_once 'include/enotify.php';
 
-
 define('TWITTER_DEFAULT_POLL_INTERVAL', 5); // given in minutes
 
-function twitter_install() {
+function twitter_install()
+{
 	//  we need some hooks, for the configuration and for sending tweets
 	register_hook('connector_settings', 'addon/twitter/twitter.php', 'twitter_settings');
 	register_hook('connector_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post');
@@ -83,12 +85,12 @@ function twitter_install() {
 	register_hook('follow', 'addon/twitter/twitter.php', 'twitter_follow');
 	register_hook('expire', 'addon/twitter/twitter.php', 'twitter_expire');
 	register_hook('prepare_body', 'addon/twitter/twitter.php', 'twitter_prepare_body');
-	register_hook('check_item_notification','addon/twitter/twitter.php', 'twitter_check_item_notification');
+	register_hook('check_item_notification', 'addon/twitter/twitter.php', 'twitter_check_item_notification');
 	logger("installed twitter");
 }
 
-
-function twitter_uninstall() {
+function twitter_uninstall()
+{
 	unregister_hook('connector_settings', 'addon/twitter/twitter.php', 'twitter_settings');
 	unregister_hook('connector_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post');
 	unregister_hook('post_local', 'addon/twitter/twitter.php', 'twitter_post_local');
@@ -99,33 +101,35 @@ function twitter_uninstall() {
 	unregister_hook('follow', 'addon/twitter/twitter.php', 'twitter_follow');
 	unregister_hook('expire', 'addon/twitter/twitter.php', 'twitter_expire');
 	unregister_hook('prepare_body', 'addon/twitter/twitter.php', 'twitter_prepare_body');
-	unregister_hook('check_item_notification','addon/twitter/twitter.php', 'twitter_check_item_notification');
+	unregister_hook('check_item_notification', 'addon/twitter/twitter.php', 'twitter_check_item_notification');
 
 	// old setting - remove only
 	unregister_hook('post_local_end', 'addon/twitter/twitter.php', 'twitter_post_hook');
 	unregister_hook('plugin_settings', 'addon/twitter/twitter.php', 'twitter_settings');
 	unregister_hook('plugin_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post');
-
 }
 
-function twitter_check_item_notification($a, &$notification_data) {
+function twitter_check_item_notification(App $a, &$notification_data)
+{
 	$own_id = PConfig::get($notification_data["uid"], 'twitter', 'own_id');
 
 	$own_user = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
 			intval($notification_data["uid"]),
 			dbesc("twitter::".$own_id)
-		);
+	);
 
-	if ($own_user)
+	if ($own_user) {
 		$notification_data["profiles"][] = $own_user[0]["url"];
+	}
 }
 
-function twitter_follow($a, &$contact) {
+function twitter_follow(App $a, &$contact)
+{
+	logger("twitter_follow: Check if contact is twitter contact. " . $contact["url"], LOGGER_DEBUG);
 
-	logger("twitter_follow: Check if contact is twitter contact. ".$contact["url"], LOGGER_DEBUG);
-
-	if (!strstr($contact["url"], "://twitter.com") && !strstr($contact["url"], "@twitter.com"))
+	if (!strstr($contact["url"], "://twitter.com") && !strstr($contact["url"], "@twitter.com")) {
 		return;
+	}
 
 	// contact seems to be a twitter contact, so continue
 	$nickname = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $contact["url"]);
@@ -138,7 +142,7 @@ function twitter_follow($a, &$contact) {
 	$otoken  = PConfig::get($uid, 'twitter', 'oauthtoken');
 	$osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
 
-	require_once("addon/twitter/codebird.php");
+	require_once "addon/twitter/codebird.php";
 
 	$cb = \Codebird\Codebird::getInstance();
 	$cb->setConsumerKey($ckey, $csecret);
@@ -155,32 +159,38 @@ function twitter_follow($a, &$contact) {
 		FROM `contact` WHERE `uid` = %d AND `nick` = '%s'",
 				intval($uid),
 				dbesc($nickname));
-	if (count($r))
+	if (count($r)) {
 		$contact["contact"] = $r[0];
+	}
 }
 
-function twitter_jot_nets(&$a,&$b) {
-	if(! local_user())
+function twitter_jot_nets(App $a, &$b)
+{
+	if (!local_user()) {
 		return;
+	}
 
-	$tw_post = PConfig::get(local_user(),'twitter','post');
-	if(intval($tw_post) == 1) {
-		$tw_defpost = PConfig::get(local_user(),'twitter','post_by_default');
+	$tw_post = PConfig::get(local_user(), 'twitter', 'post');
+	if (intval($tw_post) == 1) {
+		$tw_defpost = PConfig::get(local_user(), 'twitter', 'post_by_default');
 		$selected = ((intval($tw_defpost) == 1) ? ' checked="checked" ' : '');
 		$b .= '<div class="profile-jot-net"><input type="checkbox" name="twitter_enable"' . $selected . ' value="1" /> '
 			. t('Post to Twitter') . '</div>';
 	}
 }
 
-function twitter_settings_post($a,$post) {
-	if(! local_user())
+function twitter_settings_post(App $a, $post)
+{
+	if (!local_user()) {
 		return;
+	}
 	// don't check twitter settings if twitter submit button is not clicked
-	if (!x($_POST,'twitter-submit'))
+	if (!x($_POST, 'twitter-submit')) {
 		return;
+	}
 
 	if (isset($_POST['twitter-disconnect'])) {
-		/***
+		/*		 * *
 		 * if the twitter-disconnect checkbox is set, clear the OAuth key/secret pair
 		 * from the user configuration
 		 */
@@ -196,43 +206,48 @@ function twitter_settings_post($a,$post) {
 		PConfig::delete(local_user(), 'twitter', 'create_user');
 		PConfig::delete(local_user(), 'twitter', 'own_id');
 	} else {
-	if (isset($_POST['twitter-pin'])) {
-		//  if the user supplied us with a PIN from Twitter, let the magic of OAuth happen
-		logger('got a Twitter PIN');
-		require_once('library/twitteroauth.php');
-		$ckey    = Config::get('twitter', 'consumerkey');
-		$csecret = Config::get('twitter', 'consumersecret');
-		//  the token and secret for which the PIN was generated were hidden in the settings
-		//  form as token and token2, we need a new connection to Twitter using these token
-		//  and secret to request a Access Token with the PIN
-		$connection = new TwitterOAuth($ckey, $csecret, $_POST['twitter-token'], $_POST['twitter-token2']);
-		$token   = $connection->getAccessToken( $_POST['twitter-pin'] );
-		//  ok, now that we have the Access Token, save them in the user config
-		PConfig::set(local_user(),'twitter', 'oauthtoken',  $token['oauth_token']);
-		PConfig::set(local_user(),'twitter', 'oauthsecret', $token['oauth_token_secret']);
-		PConfig::set(local_user(),'twitter', 'post', 1);
-		//  reload the Addon Settings page, if we don't do it see Bug #42
-		goaway($a->get_baseurl().'/settings/connectors');
-	} else {
-		//  if no PIN is supplied in the POST variables, the user has changed the setting
-		//  to post a tweet for every new __public__ posting to the wall
-		PConfig::set(local_user(),'twitter','post',intval($_POST['twitter-enable']));
-		PConfig::set(local_user(),'twitter','post_by_default',intval($_POST['twitter-default']));
-		PConfig::set(local_user(), 'twitter', 'mirror_posts', intval($_POST['twitter-mirror']));
-		PConfig::set(local_user(), 'twitter', 'import', intval($_POST['twitter-import']));
-		PConfig::set(local_user(), 'twitter', 'create_user', intval($_POST['twitter-create_user']));
+		if (isset($_POST['twitter-pin'])) {
+			//  if the user supplied us with a PIN from Twitter, let the magic of OAuth happen
+			logger('got a Twitter PIN');
+			require_once 'library/twitteroauth.php';
+			$ckey    = Config::get('twitter', 'consumerkey');
+			$csecret = Config::get('twitter', 'consumersecret');
+			//  the token and secret for which the PIN was generated were hidden in the settings
+			//  form as token and token2, we need a new connection to Twitter using these token
+			//  and secret to request a Access Token with the PIN
+			$connection = new TwitterOAuth($ckey, $csecret, $_POST['twitter-token'], $_POST['twitter-token2']);
+			$token = $connection->getAccessToken($_POST['twitter-pin']);
+			//  ok, now that we have the Access Token, save them in the user config
+			PConfig::set(local_user(), 'twitter', 'oauthtoken', $token['oauth_token']);
+			PConfig::set(local_user(), 'twitter', 'oauthsecret', $token['oauth_token_secret']);
+			PConfig::set(local_user(), 'twitter', 'post', 1);
+			//  reload the Addon Settings page, if we don't do it see Bug #42
+			goaway($a->get_baseurl() . '/settings/connectors');
+		} else {
+			//  if no PIN is supplied in the POST variables, the user has changed the setting
+			//  to post a tweet for every new __public__ posting to the wall
+			PConfig::set(local_user(), 'twitter', 'post', intval($_POST['twitter-enable']));
+			PConfig::set(local_user(), 'twitter', 'post_by_default', intval($_POST['twitter-default']));
+			PConfig::set(local_user(), 'twitter', 'mirror_posts', intval($_POST['twitter-mirror']));
+			PConfig::set(local_user(), 'twitter', 'import', intval($_POST['twitter-import']));
+			PConfig::set(local_user(), 'twitter', 'create_user', intval($_POST['twitter-create_user']));
 
-		if (!intval($_POST['twitter-mirror']))
-			PConfig::delete(local_user(),'twitter','lastid');
+			if (!intval($_POST['twitter-mirror'])) {
+				PConfig::delete(local_user(), 'twitter', 'lastid');
+			}
 
-		info(t('Twitter settings updated.') . EOL);
-	}}
+			info(t('Twitter settings updated.') . EOL);
+		}
+	}
 }
-function twitter_settings(&$a,&$s) {
-	if(! local_user())
+
+function twitter_settings(App $a, &$s)
+{
+	if (!local_user()) {
 		return;
+	}
 	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/twitter/twitter.css' . '" media="all" />' . "\r\n";
-	/***
+	/*	 * *
 	 * 1) Check that we have global consumer key & secret
 	 * 2) If no OAuthtoken & stuff is present, generate button to get some
 	 * 3) Checkbox for "Send public notices (280 chars only)
@@ -243,94 +258,94 @@ function twitter_settings(&$a,&$s) {
 	$osecret = PConfig::get(local_user(), 'twitter', 'oauthsecret' );
 	$enabled = PConfig::get(local_user(), 'twitter', 'post');
 	$checked = (($enabled) ? ' checked="checked" ' : '');
-	$defenabled = PConfig::get(local_user(),'twitter','post_by_default');
+	$defenabled = PConfig::get(local_user(), 'twitter', 'post_by_default');
 	$defchecked = (($defenabled) ? ' checked="checked" ' : '');
-	$mirrorenabled = PConfig::get(local_user(),'twitter','mirror_posts');
+	$mirrorenabled = PConfig::get(local_user(), 'twitter', 'mirror_posts');
 	$mirrorchecked = (($mirrorenabled) ? ' checked="checked" ' : '');
-	$importenabled = PConfig::get(local_user(),'twitter','import');
+	$importenabled = PConfig::get(local_user(), 'twitter', 'import');
 	$importchecked = (($importenabled) ? ' checked="checked" ' : '');
-	$create_userenabled = PConfig::get(local_user(),'twitter','create_user');
+	$create_userenabled = PConfig::get(local_user(), 'twitter', 'create_user');
 	$create_userchecked = (($create_userenabled) ? ' checked="checked" ' : '');
 
 	$css = (($enabled) ? '' : '-disabled');
 
 	$s .= '<span id="settings_twitter_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_twitter_expanded\'); openClose(\'settings_twitter_inflated\');">';
-	$s .= '<img class="connector'.$css.'" src="images/twitter.png" /><h3 class="connector">'. t('Twitter Import/Export/Mirror').'</h3>';
+	$s .= '<img class="connector' . $css . '" src="images/twitter.png" /><h3 class="connector">' . t('Twitter Import/Export/Mirror') . '</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_twitter_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_twitter_expanded\'); openClose(\'settings_twitter_inflated\');">';
-	$s .= '<img class="connector'.$css.'" src="images/twitter.png" /><h3 class="connector">'. t('Twitter Import/Export/Mirror').'</h3>';
+	$s .= '<img class="connector' . $css . '" src="images/twitter.png" /><h3 class="connector">' . t('Twitter Import/Export/Mirror') . '</h3>';
 	$s .= '</span>';
 
-	if ( (!$ckey) && (!$csecret) ) {
-		/***
+	if ((!$ckey) && (!$csecret)) {
+		/*		 * *
 		 * no global consumer keys
 		 * display warning and skip personal config
 		 */
-		$s .= '<p>'. t('No consumer key pair for Twitter found. Please contact your site administrator.') .'</p>';
+		$s .= '<p>' . t('No consumer key pair for Twitter found. Please contact your site administrator.') . '</p>';
 	} else {
-		/***
+		/*		 * *
 		 * ok we have a consumer key pair now look into the OAuth stuff
 		 */
-		if ( (!$otoken) && (!$osecret) ) {
-			/***
+		if ((!$otoken) && (!$osecret)) {
+			/*			 * *
 			 * the user has not yet connected the account to twitter...
 			 * get a temporary OAuth key/secret pair and display a button with
 			 * which the user can request a PIN to connect the account to a
 			 * account at Twitter.
 			 */
-			require_once('library/twitteroauth.php');
+			require_once 'library/twitteroauth.php';
 			$connection = new TwitterOAuth($ckey, $csecret);
 			$request_token = $connection->getRequestToken();
 			$token = $request_token['oauth_token'];
-			/***
+			/*			 * *
 			 *  make some nice form
 			 */
-			$s .= '<p>'. t('At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.') .'</p>';
-			$s .= '<a href="'.$connection->getAuthorizeURL($token).'" target="_twitter"><img src="addon/twitter/lighter.png" alt="'.t('Log in with Twitter').'"></a>';
+			$s .= '<p>' . t('At this Friendica instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.') . '</p>';
+			$s .= '<a href="' . $connection->getAuthorizeURL($token) . '" target="_twitter"><img src="addon/twitter/lighter.png" alt="' . t('Log in with Twitter') . '"></a>';
 			$s .= '<div id="twitter-pin-wrapper">';
-			$s .= '<label id="twitter-pin-label" for="twitter-pin">'. t('Copy the PIN from Twitter here') .'</label>';
+			$s .= '<label id="twitter-pin-label" for="twitter-pin">' . t('Copy the PIN from Twitter here') . '</label>';
 			$s .= '<input id="twitter-pin" type="text" name="twitter-pin" />';
-			$s .= '<input id="twitter-token" type="hidden" name="twitter-token" value="'.$token.'" />';
-			$s .= '<input id="twitter-token2" type="hidden" name="twitter-token2" value="'.$request_token['oauth_token_secret'].'" />';
-	    $s .= '</div><div class="clear"></div>';
-	    $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
+			$s .= '<input id="twitter-token" type="hidden" name="twitter-token" value="' . $token . '" />';
+			$s .= '<input id="twitter-token2" type="hidden" name="twitter-token2" value="' . $request_token['oauth_token_secret'] . '" />';
+			$s .= '</div><div class="clear"></div>';
+			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
 		} else {
-			/***
+			/*			 * *
 			 *  we have an OAuth key / secret pair for the user
 			 *  so let's give a chance to disable the postings to Twitter
 			 */
-			require_once('library/twitteroauth.php');
-			$connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
+			require_once 'library/twitteroauth.php';
+			$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
 			$details = $connection->get('account/verify_credentials');
-			$s .= '<div id="twitter-info" ><img id="twitter-avatar" src="'.$details->profile_image_url.'" /><p id="twitter-info-block">'. t('Currently connected to: ') .'<a href="https://twitter.com/'.$details->screen_name.'" target="_twitter">'.$details->screen_name.'</a><br /><em>'.$details->description.'</em></p></div>';
-			$s .= '<p>'. t('If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.') .'</p>';
+			$s .= '<div id="twitter-info" ><img id="twitter-avatar" src="' . $details->profile_image_url . '" /><p id="twitter-info-block">' . t('Currently connected to: ') . '<a href="https://twitter.com/' . $details->screen_name . '" target="_twitter">' . $details->screen_name . '</a><br /><em>' . $details->description . '</em></p></div>';
+			$s .= '<p>' . t('If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.') . '</p>';
 			if ($a->user['hidewall']) {
-			    $s .= '<p>'. t('<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.') .'</p>';
+				$s .= '<p>' . t('<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.') . '</p>';
 			}
 			$s .= '<div id="twitter-enable-wrapper">';
-			$s .= '<label id="twitter-enable-label" for="twitter-checkbox">'. t('Allow posting to Twitter'). '</label>';
+			$s .= '<label id="twitter-enable-label" for="twitter-checkbox">' . t('Allow posting to Twitter') . '</label>';
 			$s .= '<input id="twitter-checkbox" type="checkbox" name="twitter-enable" value="1" ' . $checked . '/>';
 			$s .= '<div class="clear"></div>';
-			$s .= '<label id="twitter-default-label" for="twitter-default">'. t('Send public postings to Twitter by default') .'</label>';
+			$s .= '<label id="twitter-default-label" for="twitter-default">' . t('Send public postings to Twitter by default') . '</label>';
 			$s .= '<input id="twitter-default" type="checkbox" name="twitter-default" value="1" ' . $defchecked . '/>';
 			$s .= '<div class="clear"></div>';
 
-			$s .= '<label id="twitter-mirror-label" for="twitter-mirror">'.t('Mirror all posts from twitter that are no replies').'</label>';
-			$s .= '<input id="twitter-mirror" type="checkbox" name="twitter-mirror" value="1" '. $mirrorchecked . '/>';
+			$s .= '<label id="twitter-mirror-label" for="twitter-mirror">' . t('Mirror all posts from twitter that are no replies') . '</label>';
+			$s .= '<input id="twitter-mirror" type="checkbox" name="twitter-mirror" value="1" ' . $mirrorchecked . '/>';
 			$s .= '<div class="clear"></div>';
 			$s .= '</div>';
 
-			$s .= '<label id="twitter-import-label" for="twitter-import">'.t('Import the remote timeline').'</label>';
-			$s .= '<input id="twitter-import" type="checkbox" name="twitter-import" value="1" '. $importchecked . '/>';
+			$s .= '<label id="twitter-import-label" for="twitter-import">' . t('Import the remote timeline') . '</label>';
+			$s .= '<input id="twitter-import" type="checkbox" name="twitter-import" value="1" ' . $importchecked . '/>';
 			$s .= '<div class="clear"></div>';
 
-			$s .= '<label id="twitter-create_user-label" for="twitter-create_user">'.t('Automatically create contacts').'</label>';
-			$s .= '<input id="twitter-create_user" type="checkbox" name="twitter-create_user" value="1" '. $create_userchecked . '/>';
+			$s .= '<label id="twitter-create_user-label" for="twitter-create_user">' . t('Automatically create contacts') . '</label>';
+			$s .= '<input id="twitter-create_user" type="checkbox" name="twitter-create_user" value="1" ' . $create_userchecked . '/>';
 			$s .= '<div class="clear"></div>';
 
 			$s .= '<div id="twitter-disconnect-wrapper">';
-			$s .= '<label id="twitter-disconnect-label" for="twitter-disconnect">'. t('Clear OAuth configuration') .'</label>';
+			$s .= '<label id="twitter-disconnect-label" for="twitter-disconnect">' . t('Clear OAuth configuration') . '</label>';
 			$s .= '<input id="twitter-disconnect" type="checkbox" name="twitter-disconnect" value="1" />';
 			$s .= '</div><div class="clear"></div>';
 			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
@@ -339,9 +354,8 @@ function twitter_settings(&$a,&$s) {
 	$s .= '</div><div class="clear"></div>';
 }
 
-
-function twitter_post_local(&$a, &$b) {
-
+function twitter_post_local(App $a, &$b)
+{
 	if ($b['edit']) {
 		return;
 	}
@@ -369,14 +383,14 @@ function twitter_post_local(&$a, &$b) {
 	$b['postopts'] .= 'twitter';
 }
 
-function twitter_action($a, $uid, $pid, $action) {
-
-	$ckey    = Config::get('twitter', 'consumerkey');
+function twitter_action(App $a, $uid, $pid, $action)
+{
+	$ckey = Config::get('twitter', 'consumerkey');
 	$csecret = Config::get('twitter', 'consumersecret');
-	$otoken  = PConfig::get($uid, 'twitter', 'oauthtoken');
+	$otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
 	$osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
 
-	require_once("addon/twitter/codebird.php");
+	require_once "addon/twitter/codebird.php";
 
 	$cb = \Codebird\Codebird::getInstance();
 	$cb->setConsumerKey($ckey, $csecret);
@@ -384,7 +398,7 @@ function twitter_action($a, $uid, $pid, $action) {
 
 	$post = array('id' => $pid);
 
-	logger("twitter_action '".$action."' ID: ".$pid." data: " . print_r($post, true), LOGGER_DATA);
+	logger("twitter_action '" . $action . "' ID: " . $pid . " data: " . print_r($post, true), LOGGER_DATA);
 
 	switch ($action) {
 		case "delete":
@@ -397,28 +411,25 @@ function twitter_action($a, $uid, $pid, $action) {
 			$result = $cb->favorites_destroy($post);
 			break;
 	}
-	logger("twitter_action '".$action."' send, result: " . print_r($result, true), LOGGER_DEBUG);
+	logger("twitter_action '" . $action . "' send, result: " . print_r($result, true), LOGGER_DEBUG);
 }
 
-function twitter_post_hook(&$a,&$b) {
+function twitter_post_hook(App $a, &$b)
+{
+	// Post to Twitter
+	require_once "include/network.php";
 
-	/**
-	 * Post to Twitter
-	 */
-
-	require_once("include/network.php");
-
-	if (!PConfig::get($b["uid"],'twitter','import')) {
-		if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
-			return;
+	if (!PConfig::get($b["uid"], 'twitter', 'import')
+		&& ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))) {
+		return;
 	}
 
 	if ($b['parent'] != $b['id']) {
-		logger("twitter_post_hook: parameter ".print_r($b, true), LOGGER_DATA);
+		logger("twitter_post_hook: parameter " . print_r($b, true), LOGGER_DATA);
 
 		// Looking if its a reply to a twitter post
 		if ((substr($b["parent-uri"], 0, 9) != "twitter::") && (substr($b["extid"], 0, 9) != "twitter::") && (substr($b["thr-parent"], 0, 9) != "twitter::")) {
-			logger("twitter_post_hook: no twitter post ".$b["parent"]);
+			logger("twitter_post_hook: no twitter post " . $b["parent"]);
 			return;
 		}
 
@@ -426,8 +437,8 @@ function twitter_post_hook(&$a,&$b) {
 			dbesc($b["thr-parent"]),
 			intval($b["uid"]));
 
-		if(!count($r)) {
-			logger("twitter_post_hook: no parent found ".$b["thr-parent"]);
+		if (!count($r)) {
+			logger("twitter_post_hook: no parent found " . $b["thr-parent"]);
 			return;
 		} else {
 			$iscomment = true;
@@ -436,18 +447,19 @@ function twitter_post_hook(&$a,&$b) {
 
 
 		$nicknameplain = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $orig_post["author-link"]);
-		$nickname = "@[url=".$orig_post["author-link"]."]".$nicknameplain."[/url]";
-		$nicknameplain = "@".$nicknameplain;
+		$nickname = "@[url=" . $orig_post["author-link"] . "]" . $nicknameplain . "[/url]";
+		$nicknameplain = "@" . $nicknameplain;
 
-		logger("twitter_post_hook: comparing ".$nickname." and ".$nicknameplain." with ".$b["body"], LOGGER_DEBUG);
-		if ((strpos($b["body"], $nickname) === false) && (strpos($b["body"], $nicknameplain) === false))
-			$b["body"] = $nickname." ".$b["body"];
+		logger("twitter_post_hook: comparing " . $nickname . " and " . $nicknameplain . " with " . $b["body"], LOGGER_DEBUG);
+		if ((strpos($b["body"], $nickname) === false) && (strpos($b["body"], $nicknameplain) === false)) {
+			$b["body"] = $nickname . " " . $b["body"];
+		}
 
-		logger("twitter_post_hook: parent found ".print_r($orig_post, true), LOGGER_DATA);
+		logger("twitter_post_hook: parent found " . print_r($orig_post, true), LOGGER_DATA);
 	} else {
 		$iscomment = false;
 
-		if ($b['private'] || !strstr($b['postopts'],'twitter')) {
+		if ($b['private'] || !strstr($b['postopts'], 'twitter')) {
 			return;
 		}
 
@@ -459,11 +471,12 @@ function twitter_post_hook(&$a,&$b) {
 		}
 	}
 
-	if (($b['verb'] == ACTIVITY_POST) && $b['deleted'])
+	if (($b['verb'] == ACTIVITY_POST) && $b['deleted']) {
 		twitter_action($a, $b["uid"], substr($orig_post["uri"], 9), "delete");
+	}
 
-	if($b['verb'] == ACTIVITY_LIKE) {
-		logger("twitter_post_hook: parameter 2 ".substr($b["thr-parent"], 9), LOGGER_DEBUG);
+	if ($b['verb'] == ACTIVITY_LIKE) {
+		logger("twitter_post_hook: parameter 2 " . substr($b["thr-parent"], 9), LOGGER_DEBUG);
 		if ($b['deleted'])
 			twitter_action($a, $b["uid"], substr($b["thr-parent"], 9), "unlike");
 		else
@@ -471,19 +484,21 @@ function twitter_post_hook(&$a,&$b) {
 		return;
 	}
 
-	if($b['deleted'] || ($b['created'] !== $b['edited']))
+	if ($b['deleted'] || ($b['created'] !== $b['edited'])) {
 		return;
+	}
 
 	// if post comes from twitter don't send it back
-	if($b['extid'] == NETWORK_TWITTER)
+	if ($b['extid'] == NETWORK_TWITTER) {
 		return;
+	}
 
-	if($b['app'] == "Twitter")
+	if ($b['app'] == "Twitter") {
 		return;
+	}
 
 	logger('twitter post invoked');
 
-
 	PConfig::load($b['uid'], 'twitter');
 
 	$ckey    = Config::get('twitter', 'consumerkey');
@@ -491,35 +506,39 @@ function twitter_post_hook(&$a,&$b) {
 	$otoken  = PConfig::get($b['uid'], 'twitter', 'oauthtoken');
 	$osecret = PConfig::get($b['uid'], 'twitter', 'oauthsecret');
 
-	if($ckey && $csecret && $otoken && $osecret) {
+	if ($ckey && $csecret && $otoken && $osecret) {
 		logger('twitter: we have customer key and oauth stuff, going to send.', LOGGER_DEBUG);
 
 		// If it's a repeated message from twitter then do a native retweet and exit
-		if (twitter_is_retweet($a, $b['uid'], $b['body']))
+		if (twitter_is_retweet($a, $b['uid'], $b['body'])) {
 			return;
+		}
 
-		require_once('library/twitteroauth.php');
-		require_once('include/bbcode.php');
-		$tweet = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
+		require_once 'library/twitteroauth.php';
+		require_once 'include/bbcode.php';
+		$tweet = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
 
 		$max_char = 280;
-		require_once("include/plaintext.php");
+		require_once "include/plaintext.php";
 		$msgarr = plaintext($a, $b, $max_char, true, 8);
 		$msg = $msgarr["text"];
 
-		if (($msg == "") && isset($msgarr["title"]))
+		if (($msg == "") && isset($msgarr["title"])) {
 			$msg = shortenmsg($msgarr["title"], $max_char - 50);
+		}
 
 		$image = "";
 
-		if (isset($msgarr["url"]) && ($msgarr["type"] != "photo"))
-			$msg .= "\n".$msgarr["url"];
+		if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {
+			$msg .= "\n" . $msgarr["url"];
+		}
 
-		if (isset($msgarr["image"]) && ($msgarr["type"] != "video"))
+		if (isset($msgarr["image"]) && ($msgarr["type"] != "video")) {
 			$image = $msgarr["image"];
+		}
 
 		// and now tweet it :-)
-		if(strlen($msg) && ($image != "")) {
+		if (strlen($msg) && ($image != "")) {
 			$img_str = fetch_url($image);
 
 			$tempfile = tempnam(get_temppath(), "cache");
@@ -529,7 +548,7 @@ function twitter_post_hook(&$a,&$b) {
 			// so we are using a new library for twitter
 			// To-Do:
 			// Switching completely to this library with all functions
-			require_once("addon/twitter/codebird.php");
+			require_once "addon/twitter/codebird.php";
 
 			$cb = \Codebird\Codebird::getInstance();
 			$cb->setConsumerKey($ckey, $csecret);
@@ -537,116 +556,120 @@ function twitter_post_hook(&$a,&$b) {
 
 			$post = array('status' => $msg, 'media[]' => $tempfile);
 
-			if ($iscomment)
+			if ($iscomment) {
 				$post["in_reply_to_status_id"] = substr($orig_post["uri"], 9);
+			}
 
 			$result = $cb->statuses_updateWithMedia($post);
 			unlink($tempfile);
 
 			logger('twitter_post_with_media send, result: ' . print_r($result, true), LOGGER_DEBUG);
 
-			if ($result->source)
+			if ($result->source) {
 				Config::set("twitter", "application_name", strip_tags($result->source));
+			}
 
 			if ($result->errors || $result->error) {
 				logger('Send to Twitter failed: "' . print_r($result->errors, true) . '"');
 
 				// Workaround: Remove the picture link so that the post can be reposted without it
-				$msg .= " ".$image;
+				$msg .= " " . $image;
 				$image = "";
 			} elseif ($iscomment) {
-				logger('twitter_post: Update extid '.$result->id_str." for post id ".$b['id']);
+				logger('twitter_post: Update extid ' . $result->id_str . " for post id " . $b['id']);
 				q("UPDATE `item` SET `extid` = '%s', `body` = '%s' WHERE `id` = %d",
-					dbesc("twitter::".$result->id_str),
+					dbesc("twitter::" . $result->id_str),
 					dbesc($result->text),
 					intval($b['id'])
 				);
 			}
 		}
 
-		if(strlen($msg) && ($image == "")) {
+		if (strlen($msg) && ($image == "")) {
 // -----------------
 			$max_char = 280;
-			require_once("include/plaintext.php");
+			require_once "include/plaintext.php";
 			$msgarr = plaintext($a, $b, $max_char, true, 8);
 			$msg = $msgarr["text"];
 
-			if (($msg == "") && isset($msgarr["title"]))
+			if (($msg == "") && isset($msgarr["title"])) {
 				$msg = shortenmsg($msgarr["title"], $max_char - 50);
+			}
 
-			if (isset($msgarr["url"]))
-				$msg .= "\n".$msgarr["url"];
+			if (isset($msgarr["url"])) {
+				$msg .= "\n" . $msgarr["url"];
+			}
 // -----------------
 			$url = 'statuses/update';
 			$post = array('status' => $msg, 'weighted_character_count' => 'true');
 
-			if ($iscomment)
+			if ($iscomment) {
 				$post["in_reply_to_status_id"] = substr($orig_post["uri"], 9);
+			}
 
 			$result = $tweet->post($url, $post);
 			logger('twitter_post send, result: ' . print_r($result, true), LOGGER_DEBUG);
 
-			if ($result->source)
+			if ($result->source) {
 				Config::set("twitter", "application_name", strip_tags($result->source));
+			}
 
 			if ($result->errors) {
 				logger('Send to Twitter failed: "' . print_r($result->errors, true) . '"');
 
 				$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", intval($b['uid']));
-				if (count($r))
+				if (count($r)) {
 					$a->contact = $r[0]["id"];
+				}
 
 				$s = serialize(array('url' => $url, 'item' => $b['id'], 'post' => $post));
-				require_once('include/queue_fn.php');
-				add_to_queue($a->contact,NETWORK_TWITTER,$s);
-				notice(t('Twitter post failed. Queued for retry.').EOL);
+				require_once 'include/queue_fn.php';
+				add_to_queue($a->contact, NETWORK_TWITTER, $s);
+				notice(t('Twitter post failed. Queued for retry.') . EOL);
 			} elseif ($iscomment) {
-				logger('twitter_post: Update extid '.$result->id_str." for post id ".$b['id']);
+				logger('twitter_post: Update extid ' . $result->id_str . " for post id " . $b['id']);
 				q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d",
-					dbesc("twitter::".$result->id_str),
+					dbesc("twitter::" . $result->id_str),
 					intval($b['id'])
 				);
-				//q("UPDATE `item` SET `extid` = '%s', `body` = '%s' WHERE `id` = %d",
-				//	dbesc("twitter::".$result->id_str),
-				//	dbesc($result->text),
-				//	intval($b['id'])
-				//);
 			}
 		}
 	}
 }
 
-function twitter_plugin_admin_post(&$a){
-	$consumerkey	=	((x($_POST,'consumerkey'))		? notags(trim($_POST['consumerkey']))	: '');
-	$consumersecret	=	((x($_POST,'consumersecret'))	? notags(trim($_POST['consumersecret'])): '');
-	$applicationname = ((x($_POST, 'applicationname')) ? notags(trim($_POST['applicationname'])):'');
-	Config::set('twitter','consumerkey',$consumerkey);
-	Config::set('twitter','consumersecret',$consumersecret);
-	//Config::set('twitter','application_name',$applicationname);
-	info( t('Settings updated.'). EOL );
+function twitter_plugin_admin_post(App $a)
+{
+	$consumerkey     = x($_POST, 'consumerkey')     ? notags(trim($_POST['consumerkey']))     : '';
+	$consumersecret  = x($_POST, 'consumersecret')  ? notags(trim($_POST['consumersecret']))  : '';
+	Config::set('twitter', 'consumerkey', $consumerkey);
+	Config::set('twitter', 'consumersecret', $consumersecret);
+	info(t('Settings updated.') . EOL);
 }
-function twitter_plugin_admin(&$a, &$o){
-	$t = get_markup_template( "admin.tpl", "addon/twitter/" );
+
+function twitter_plugin_admin(App $a, &$o)
+{
+	$t = get_markup_template("admin.tpl", "addon/twitter/");
 
 	$o = replace_macros($t, array(
 		'$submit' => t('Save Settings'),
-								// name, label, value, help, [extra values]
-		'$consumerkey' => array('consumerkey', t('Consumer key'),  Config::get('twitter', 'consumerkey' ), ''),
-		'$consumersecret' => array('consumersecret', t('Consumer secret'),  Config::get('twitter', 'consumersecret' ), ''),
-		//'$applicationname' => array('applicationname', t('Name of the Twitter Application'), Config::get('twitter','application_name'),t('Set this to the exact name you gave the app on twitter.com/apps to avoid mirroring postings from ~friendica back to ~friendica'))
+		// name, label, value, help, [extra values]
+		'$consumerkey' => array('consumerkey', t('Consumer key'), Config::get('twitter', 'consumerkey'), ''),
+		'$consumersecret' => array('consumersecret', t('Consumer secret'), Config::get('twitter', 'consumersecret'), ''),
 	));
 }
 
-function twitter_cron($a,$b) {
-	$last = Config::get('twitter','last_poll');
+function twitter_cron(App $a, $b)
+{
+	$last = Config::get('twitter', 'last_poll');
 
-	$poll_interval = intval(Config::get('twitter','poll_interval'));
-	if(! $poll_interval)
+	$poll_interval = intval(Config::get('twitter', 'poll_interval'));
+	if (!$poll_interval) {
 		$poll_interval = TWITTER_DEFAULT_POLL_INTERVAL;
+	}
 
-	if($last) {
+	if ($last) {
 		$next = $last + ($poll_interval * 60);
-		if($next > time()) {
+		if ($next > time()) {
 			logger('twitter: poll intervall not reached');
 			return;
 		}
@@ -654,61 +677,61 @@ function twitter_cron($a,$b) {
 	logger('twitter: cron_start');
 
 	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'mirror_posts' AND `v` = '1'");
-	if(count($r)) {
-		foreach($r as $rr) {
-			logger('twitter: fetching for user '.$rr['uid']);
-			Worker::add(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 1, (int)$rr['uid']);
+	if (count($r)) {
+		foreach ($r as $rr) {
+			logger('twitter: fetching for user ' . $rr['uid']);
+			Worker::add(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 1, (int) $rr['uid']);
 		}
 	}
 
-	$abandon_days = intval(Config::get('system','account_abandon_days'));
+	$abandon_days = intval(Config::get('system', 'account_abandon_days'));
 	if ($abandon_days < 1)
 		$abandon_days = 0;
 
 	$abandon_limit = date("Y-m-d H:i:s", time() - $abandon_days * 86400);
 
 	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'import' AND `v` = '1'");
-	if(count($r)) {
-		foreach($r as $rr) {
+	if (count($r)) {
+		foreach ($r as $rr) {
 			if ($abandon_days != 0) {
 				$user = q("SELECT `login_date` FROM `user` WHERE uid=%d AND `login_date` >= '%s'", $rr['uid'], $abandon_limit);
 				if (!count($user)) {
-					logger('abandoned account: timeline from user '.$rr['uid'].' will not be imported');
+					logger('abandoned account: timeline from user ' . $rr['uid'] . ' will not be imported');
 					continue;
 				}
 			}
 
-			logger('twitter: importing timeline from user '.$rr['uid']);
-			Worker::add(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 2, (int)$rr['uid']);
-/*
-			// To-Do
-			// check for new contacts once a day
-			$last_contact_check = PConfig::get($rr['uid'],'pumpio','contact_check');
-			if($last_contact_check)
-				$next_contact_check = $last_contact_check + 86400;
-			else
-				$next_contact_check = 0;
-
-			if($next_contact_check <= time()) {
-				pumpio_getallusers($a, $rr["uid"]);
-				PConfig::set($rr['uid'],'pumpio','contact_check',time());
-			}
-*/
+			logger('twitter: importing timeline from user ' . $rr['uid']);
+			Worker::add(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 2, (int) $rr['uid']);
+			/*
+			  // To-Do
+			  // check for new contacts once a day
+			  $last_contact_check = PConfig::get($rr['uid'],'pumpio','contact_check');
+			  if($last_contact_check)
+			  $next_contact_check = $last_contact_check + 86400;
+			  else
+			  $next_contact_check = 0;
 
+			  if($next_contact_check <= time()) {
+			  pumpio_getallusers($a, $rr["uid"]);
+			  PConfig::set($rr['uid'],'pumpio','contact_check',time());
+			  }
+			 */
 		}
 	}
 
 	logger('twitter: cron_end');
 
-	Config::set('twitter','last_poll', time());
+	Config::set('twitter', 'last_poll', time());
 }
 
-function twitter_expire($a,$b) {
-
+function twitter_expire(App $a, $b)
+{
 	$days = Config::get('twitter', 'expire');
 
-	if ($days == 0)
+	if ($days == 0) {
 		return;
+	}
 
 	if (method_exists('dba', 'delete')) {
 		$r = dba::select('item', array('id'), array('deleted' => true, 'network' => NETWORK_TWITTER));
@@ -720,14 +743,14 @@ function twitter_expire($a,$b) {
 		$r = q("DELETE FROM `item` WHERE `deleted` AND `network` = '%s'", dbesc(NETWORK_TWITTER));
 	}
 
-	require_once("include/items.php");
+	require_once "include/items.php";
 
 	logger('twitter_expire: expire_start');
 
 	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'import' AND `v` = '1' ORDER BY RAND()");
-	if(count($r)) {
-		foreach($r as $rr) {
-			logger('twitter_expire: user '.$rr['uid']);
+	if (count($r)) {
+		foreach ($r as $rr) {
+			logger('twitter_expire: user ' . $rr['uid']);
 			item_expire($rr['uid'], $days, NETWORK_TWITTER, true);
 		}
 	}
@@ -735,60 +758,65 @@ function twitter_expire($a,$b) {
 	logger('twitter_expire: expire_end');
 }
 
-function twitter_prepare_body(&$a,&$b) {
-	if ($b["item"]["network"] != NETWORK_TWITTER)
+function twitter_prepare_body(App $a, &$b)
+{
+	if ($b["item"]["network"] != NETWORK_TWITTER) {
 		return;
+	}
 
 	if ($b["preview"]) {
 		$max_char = 280;
-		require_once("include/plaintext.php");
+		require_once "include/plaintext.php";
 		$item = $b["item"];
-		$item["plink"] = $a->get_baseurl()."/display/".$a->user["nickname"]."/".$item["parent"];
+		$item["plink"] = $a->get_baseurl() . "/display/" . $a->user["nickname"] . "/" . $item["parent"];
 
 		$r = q("SELECT `author-link` FROM item WHERE item.uri = '%s' AND item.uid = %d LIMIT 1",
 			dbesc($item["thr-parent"]),
 			intval(local_user()));
 
-		if(count($r)) {
+		if (count($r)) {
 			$orig_post = $r[0];
 
 			$nicknameplain = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $orig_post["author-link"]);
-			$nickname = "@[url=".$orig_post["author-link"]."]".$nicknameplain."[/url]";
-			$nicknameplain = "@".$nicknameplain;
+			$nickname = "@[url=" . $orig_post["author-link"] . "]" . $nicknameplain . "[/url]";
+			$nicknameplain = "@" . $nicknameplain;
 
-			if ((strpos($item["body"], $nickname) === false) && (strpos($item["body"], $nicknameplain) === false))
-				$item["body"] = $nickname." ".$item["body"];
+			if ((strpos($item["body"], $nickname) === false) && (strpos($item["body"], $nicknameplain) === false)) {
+				$item["body"] = $nickname . " " . $item["body"];
+			}
 		}
 
-
 		$msgarr = plaintext($a, $item, $max_char, true, 8);
 		$msg = $msgarr["text"];
 
-		if (isset($msgarr["url"]) && ($msgarr["type"] != "photo"))
-			$msg .= " ".$msgarr["url"];
+		if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {
+			$msg .= " " . $msgarr["url"];
+		}
 
-		if (isset($msgarr["image"]))
-			$msg .= " ".$msgarr["image"];
+		if (isset($msgarr["image"])) {
+			$msg .= " " . $msgarr["image"];
+		}
 
-                $b['html'] = nl2br(htmlspecialchars($msg));
+		$b['html'] = nl2br(htmlspecialchars($msg));
 	}
 }
 
 /**
  * @brief Build the item array for the mirrored post
  *
- * @param object $a Application class
+ * @param App $a Application class
  * @param integer $uid User id
  * @param object $post Twitter object with the post
  *
  * @return array item data to be posted
  */
-function twitter_do_mirrorpost($a, $uid, $post) {
+function twitter_do_mirrorpost(App $a, $uid, $post)
+{
 	$datarray["type"] = "wall";
 	$datarray["api_source"] = true;
 	$datarray["profile_uid"] = $uid;
 	$datarray["extid"] = NETWORK_TWITTER;
-	$datarray['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_TWITTER.":".$post->id);
+	$datarray['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_TWITTER . ":" . $post->id);
 	$datarray['object'] = json_encode($post);
 	$datarray["title"] = "";
 
@@ -796,10 +824,9 @@ function twitter_do_mirrorpost($a, $uid, $post) {
 		// We don't support nested shares, so we mustn't show quotes as shares on retweets
 		$item = twitter_createpost($a, $uid, $post->retweeted_status, array('id' => 0), false, false, true);
 
-		$datarray['body'] = "\n".share_header($item['author-name'], $item['author-link'], $item['author-avatar'], "",
-					$item['created'], $item['plink']);
+		$datarray['body'] = "\n" . share_header($item['author-name'], $item['author-link'], $item['author-avatar'], "", $item['created'], $item['plink']);
 
-		$datarray['body'] .= $item['body'].'[/share]';
+		$datarray['body'] .= $item['body'] . '[/share]';
 	} else {
 		$item = twitter_createpost($a, $uid, $post, array('id' => 0), false, false, false);
 
@@ -820,80 +847,86 @@ function twitter_do_mirrorpost($a, $uid, $post) {
 	return $datarray;
 }
 
-function twitter_fetchtimeline($a, $uid) {
+function twitter_fetchtimeline(App $a, $uid)
+{
 	$ckey    = Config::get('twitter', 'consumerkey');
 	$csecret = Config::get('twitter', 'consumersecret');
 	$otoken  = PConfig::get($uid, 'twitter', 'oauthtoken');
 	$osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
 	$lastid  = PConfig::get($uid, 'twitter', 'lastid');
 
-	$application_name  = Config::get('twitter', 'application_name');
+	$application_name = Config::get('twitter', 'application_name');
 
-	if ($application_name == "")
+	if ($application_name == "") {
 		$application_name = $a->get_hostname();
+	}
 
 	$has_picture = false;
 
-	require_once('mod/item.php');
-	require_once('include/items.php');
-	require_once('mod/share.php');
+	require_once 'mod/item.php';
+	require_once 'include/items.php';
+	require_once 'mod/share.php';
 
-	require_once('library/twitteroauth.php');
-	$connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
+	require_once 'library/twitteroauth.php';
+	$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
 
 	$parameters = array("exclude_replies" => true, "trim_user" => false, "contributor_details" => true, "include_rts" => true, "tweet_mode" => "extended");
 
 	$first_time = ($lastid == "");
 
-	if ($lastid <> "")
+	if ($lastid != "") {
 		$parameters["since_id"] = $lastid;
+	}
 
 	$items = $connection->get('statuses/user_timeline', $parameters);
 
-	if (!is_array($items))
+	if (!is_array($items)) {
 		return;
+	}
 
 	$posts = array_reverse($items);
 
 	if (count($posts)) {
-	    foreach ($posts as $post) {
-		if ($post->id_str > $lastid) {
-			$lastid = $post->id_str;
-			PConfig::set($uid, 'twitter', 'lastid', $lastid);
+		foreach ($posts as $post) {
+			if ($post->id_str > $lastid) {
+				$lastid = $post->id_str;
+				PConfig::set($uid, 'twitter', 'lastid', $lastid);
+			}
+
+			if ($first_time) {
+				continue;
+			}
+
+			if (!stristr($post->source, $application_name)) {
+				$_SESSION["authenticated"] = true;
+				$_SESSION["uid"] = $uid;
+
+				$_REQUEST = twitter_do_mirrorpost($a, $uid, $post);
+
+				logger('twitter: posting for user ' . $uid);
+
+				item_post($a);
+			}
 		}
-
-		if ($first_time)
-			continue;
-
-		if (!stristr($post->source, $application_name)) {
-
-			$_SESSION["authenticated"] = true;
-			$_SESSION["uid"] = $uid;
-
-			$_REQUEST = twitter_do_mirrorpost($a, $uid, $post);
-
-			logger('twitter: posting for user '.$uid);
-
-			item_post($a);
-		}
-	    }
 	}
 	PConfig::set($uid, 'twitter', 'lastid', $lastid);
 }
 
-function twitter_queue_hook(&$a,&$b) {
-
+function twitter_queue_hook(App $a, &$b)
+{
 	$qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
 		dbesc(NETWORK_TWITTER)
-		);
-	if(! count($qi))
+	);
+	if (!count($qi)) {
 		return;
+	}
 
-	require_once('include/queue_fn.php');
+	require_once 'include/queue_fn.php';
 
-	foreach($qi as $x) {
-		if($x['network'] !== NETWORK_TWITTER)
+	foreach ($qi as $x) {
+		if ($x['network'] !== NETWORK_TWITTER) {
 			continue;
+		}
 
 		logger('twitter_queue: run');
 
@@ -901,8 +934,9 @@ function twitter_queue_hook(&$a,&$b) {
 			WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1",
 			intval($x['cid'])
 		);
-		if(! count($r))
+		if (!count($r)) {
 			continue;
+		}
 
 		$user = $r[0];
 
@@ -914,30 +948,31 @@ function twitter_queue_hook(&$a,&$b) {
 		$success = false;
 
 		if ($ckey && $csecret && $otoken && $osecret) {
-
 			logger('twitter_queue: able to post');
 
 			$z = unserialize($x['content']);
 
-			require_once("addon/twitter/codebird.php");
+			require_once "addon/twitter/codebird.php";
 
 			$cb = \Codebird\Codebird::getInstance();
 			$cb->setConsumerKey($ckey, $csecret);
 			$cb->setToken($otoken, $osecret);
 
-			if ($z['url'] == "statuses/update")
+			if ($z['url'] == "statuses/update") {
 				$result = $cb->statuses_update($z['post']);
+			}
 
 			logger('twitter_queue: post result: ' . print_r($result, true), LOGGER_DEBUG);
 
-			if ($result->errors)
+			if ($result->errors) {
 				logger('twitter_queue: Send to Twitter failed: "' . print_r($result->errors, true) . '"');
-			else {
+			} else {
 				$success = true;
 				remove_queue_item($x['id']);
 			}
-		} else
-			logger("twitter_queue: Error getting tokens for user ".$user['uid']);
+		} else {
+			logger("twitter_queue: Error getting tokens for user " . $user['uid']);
+		}
 
 		if (!$success) {
 			logger('twitter_queue: delayed');
@@ -946,41 +981,45 @@ function twitter_queue_hook(&$a,&$b) {
 	}
 }
 
-function twitter_fix_avatar($avatar) {
+function twitter_fix_avatar($avatar)
+{
 	$new_avatar = str_replace("_normal.", ".", $avatar);
 
-	$info = Photo::getInfoFromURL($new_avatar);
-	if (!$info)
+	$info = Image::getInfoFromURL($new_avatar);
+	if (!$info) {
 		$new_avatar = $avatar;
+	}
 
 	return $new_avatar;
 }
 
-function twitter_fetch_contact($uid, $contact, $create_user) {
-
-	if ($contact->id_str == "")
-		return(-1);
+function twitter_fetch_contact($uid, $contact, $create_user)
+{
+	if ($contact->id_str == "") {
+		return -1;
+	}
 
 	$avatar = twitter_fix_avatar($contact->profile_image_url_https);
 
-	GlobalContact::update(array("url" => "https://twitter.com/".$contact->screen_name,
-			"network" => NETWORK_TWITTER, "photo" => $avatar,  "hide" => true,
-			"name" => $contact->name, "nick" => $contact->screen_name,
-			"location" => $contact->location, "about" => $contact->description,
-			"addr" => $contact->screen_name."@twitter.com", "generation" => 2));
+	GContact::update(array("url" => "https://twitter.com/" . $contact->screen_name,
+		"network" => NETWORK_TWITTER, "photo" => $avatar, "hide" => true,
+		"name" => $contact->name, "nick" => $contact->screen_name,
+		"location" => $contact->location, "about" => $contact->description,
+		"addr" => $contact->screen_name . "@twitter.com", "generation" => 2));
 
 	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
-		intval($uid), dbesc("twitter::".$contact->id_str));
+		intval($uid), dbesc("twitter::" . $contact->id_str));
 
-	if(!count($r) && !$create_user)
-		return(0);
-
-	if (count($r) && ($r[0]["readonly"] || $r[0]["blocked"])) {
-		logger("twitter_fetch_contact: Contact '".$r[0]["nick"]."' is blocked or readonly.", LOGGER_DEBUG);
-		return(-1);
+	if (!count($r) && !$create_user) {
+		return 0;
 	}
 
-	if(!count($r)) {
+	if (count($r) && ($r[0]["readonly"] || $r[0]["blocked"])) {
+		logger("twitter_fetch_contact: Contact '" . $r[0]["nick"] . "' is blocked or readonly.", LOGGER_DEBUG);
+		return -1;
+	}
+
+	if (!count($r)) {
 		// create contact record
 		q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
 					`name`, `nick`, `photo`, `network`, `rel`, `priority`,
@@ -988,12 +1027,12 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
 					VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0)",
 			intval($uid),
 			dbesc(datetime_convert()),
-			dbesc("https://twitter.com/".$contact->screen_name),
-			dbesc(normalise_link("https://twitter.com/".$contact->screen_name)),
+			dbesc("https://twitter.com/" . $contact->screen_name),
+			dbesc(normalise_link("https://twitter.com/" . $contact->screen_name)),
 			dbesc($contact->screen_name."@twitter.com"),
-			dbesc("twitter::".$contact->id_str),
+			dbesc("twitter::" . $contact->id_str),
 			dbesc(''),
-			dbesc("twitter::".$contact->id_str),
+			dbesc("twitter::" . $contact->id_str),
 			dbesc($contact->name),
 			dbesc($contact->screen_name),
 			dbesc($avatar),
@@ -1008,20 +1047,21 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
 		$r = q("SELECT * FROM `contact` WHERE `alias` = '%s' AND `uid` = %d LIMIT 1",
 			dbesc("twitter::".$contact->id_str),
 			intval($uid)
-			);
+		);
 
-		if(! count($r))
-			return(false);
+		if (!count($r)) {
+			return false;
+		}
 
-		$contact_id  = $r[0]['id'];
+		$contact_id = $r[0]['id'];
 
 		$g = q("SELECT def_gid FROM user WHERE uid = %d LIMIT 1",
 			intval($uid)
 		);
 
-		if($g && intval($g[0]['def_gid'])) {
-			require_once('include/group.php');
-			group_add_member($uid,'',$contact_id,$g[0]['def_gid']);
+		if ($g && intval($g[0]['def_gid'])) {
+			require_once 'include/group.php';
+			group_add_member($uid, '', $contact_id, $g[0]['def_gid']);
 		}
 
 		$photos = Photo::importProfilePhoto($avatar, $uid, $contact_id, true);
@@ -1045,15 +1085,12 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
 		}
 	} else {
 		// update profile photos once every two weeks as we have no notification of when they change.
-
 		//$update_photo = (($r[0]['avatar-date'] < datetime_convert('','','now -2 days')) ? true : false);
-		$update_photo = ($r[0]['avatar-date'] < datetime_convert('','','now -12 hours'));
+		$update_photo = ($r[0]['avatar-date'] < datetime_convert('', '', 'now -12 hours'));
 
 		// check that we have all the photos, this has been known to fail on occasion
-
-		if((! $r[0]['photo']) || (! $r[0]['thumb']) || (! $r[0]['micro']) || ($update_photo)) {
-
-			logger("twitter_fetch_contact: Updating contact ".$contact->screen_name, LOGGER_DEBUG);
+		if ((!$r[0]['photo']) || (!$r[0]['thumb']) || (!$r[0]['micro']) || ($update_photo)) {
+			logger("twitter_fetch_contact: Updating contact " . $contact->screen_name, LOGGER_DEBUG);
 
 			$photos = Photo::importProfilePhoto($avatar, $uid, $r[0]['id'], true);
 
@@ -1091,16 +1128,17 @@ function twitter_fetch_contact($uid, $contact, $create_user) {
 		}
 	}
 
-	return($r[0]["id"]);
+	return $r[0]["id"];
 }
 
-function twitter_fetchuser($a, $uid, $screen_name = "", $user_id = "") {
+function twitter_fetchuser(App $a, $uid, $screen_name = "", $user_id = "")
+{
 	$ckey    = Config::get('twitter', 'consumerkey');
 	$csecret = Config::get('twitter', 'consumersecret');
 	$otoken  = PConfig::get($uid, 'twitter', 'oauthtoken');
 	$osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
 
-	require_once("addon/twitter/codebird.php");
+	require_once "addon/twitter/codebird.php";
 
 	$cb = \Codebird\Codebird::getInstance();
 	$cb->setConsumerKey($ckey, $csecret);
@@ -1109,33 +1147,38 @@ function twitter_fetchuser($a, $uid, $screen_name = "", $user_id = "") {
 	$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
 		intval($uid));
 
-	if(count($r)) {
+	if (count($r)) {
 		$self = $r[0];
-	} else
+	} else {
 		return;
+	}
 
 	$parameters = array();
 
-	if ($screen_name != "")
+	if ($screen_name != "") {
 		$parameters["screen_name"] = $screen_name;
+	}
 
-	if ($user_id != "")
+	if ($user_id != "") {
 		$parameters["user_id"] = $user_id;
+	}
 
 	// Fetching user data
 	$user = $cb->users_show($parameters);
 
-	if (!is_object($user))
+	if (!is_object($user)) {
 		return;
+	}
 
 	$contact_id = twitter_fetch_contact($uid, $user, true);
 
 	return $contact_id;
 }
 
-function twitter_expand_entities($a, $body, $item, $no_tags = false, $picture) {
-	require_once("include/oembed.php");
-	require_once("include/network.php");
+function twitter_expand_entities(App $a, $body, $item, $no_tags = false, $picture)
+{
+	require_once "include/oembed.php";
+	require_once "include/network.php";
 
 	$tags = "";
 
@@ -1148,21 +1191,21 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $picture) {
 		$footer = "";
 
 		foreach ($item->entities->urls AS $url) {
-
 			$plain = str_replace($url->url, '', $plain);
 
 			if ($url->url && $url->expanded_url && $url->display_url) {
-
 				$expanded_url = original_url($url->expanded_url);
 
 				$oembed_data = oembed_fetch_url($expanded_url);
 
 				// Quickfix: Workaround for URL with "[" and "]" in it
-				if (strpos($expanded_url, "[") || strpos($expanded_url, "]"))
+				if (strpos($expanded_url, "[") || strpos($expanded_url, "]")) {
 					$expanded_url = $url->url;
+				}
 
-				if ($type == "")
+				if ($type == "") {
 					$type = $oembed_data->type;
+				}
 
 				if ($oembed_data->type == "video") {
 					//$body = str_replace($url->url,
@@ -1170,20 +1213,16 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $picture) {
 					//$dontincludemedia = true;
 					$type = $oembed_data->type;
 					$footerurl = $expanded_url;
-					$footerlink = "[url=".$expanded_url."]".$expanded_url."[/url]";
+					$footerlink = "[url=" . $expanded_url . "]" . $expanded_url . "[/url]";
 
 					$body = str_replace($url->url, $footerlink, $body);
-				//} elseif (($oembed_data->type == "photo") AND isset($oembed_data->url) AND !$dontincludemedia) {
+					//} elseif (($oembed_data->type == "photo") AND isset($oembed_data->url) AND !$dontincludemedia) {
 				} elseif (($oembed_data->type == "photo") && isset($oembed_data->url)) {
-					$body = str_replace($url->url,
-							"[url=".$expanded_url."][img]".$oembed_data->url."[/img][/url]",
-							$body);
+					$body = str_replace($url->url, "[url=" . $expanded_url . "][img]" . $oembed_data->url . "[/img][/url]", $body);
 					//$dontincludemedia = true;
-				} elseif ($oembed_data->type != "link")
-					$body = str_replace($url->url,
-							"[url=".$expanded_url."]".$expanded_url."[/url]",
-							$body);
-				else {
+				} elseif ($oembed_data->type != "link") {
+					$body = str_replace($url->url, "[url=" . $expanded_url . "]" . $expanded_url . "[/url]", $body);
+				} else {
 					$img_str = fetch_url($expanded_url, true, $redirects, 4);
 
 					$tempfile = tempnam(get_temppath(), "cache");
@@ -1193,12 +1232,12 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $picture) {
 
 					if (substr($mime, 0, 6) == "image/") {
 						$type = "photo";
-						$body = str_replace($url->url, "[img]".$expanded_url."[/img]", $body);
+						$body = str_replace($url->url, "[img]" . $expanded_url . "[/img]", $body);
 						//$dontincludemedia = true;
 					} else {
 						$type = $oembed_data->type;
 						$footerurl = $expanded_url;
-						$footerlink = "[url=".$expanded_url."]".$expanded_url."[/url]";
+						$footerlink = "[url=" . $expanded_url . "]" . $expanded_url . "[/url]";
 
 						$body = str_replace($url->url, $footerlink, $body);
 					}
@@ -1206,79 +1245,84 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $picture) {
 			}
 		}
 
-		if ($footerurl != "")
+		if ($footerurl != "") {
 			$footer = add_page_info($footerurl, false, $picture);
+		}
 
 		if (($footerlink != "") && (trim($footer) != "")) {
 			$removedlink = trim(str_replace($footerlink, "", $body));
 
-			if (($removedlink == "") || strstr($body, $removedlink))
+			if (($removedlink == "") || strstr($body, $removedlink)) {
 				$body = $removedlink;
+			}
 
 			$body .= $footer;
 		}
 
-		if (($footer == "") && ($picture != ""))
-			$body .= "\n\n[img]".$picture."[/img]\n";
-		elseif (($footer == "") && ($picture == ""))
+		if (($footer == "") && ($picture != "")) {
+			$body .= "\n\n[img]" . $picture . "[/img]\n";
+		} elseif (($footer == "") && ($picture == "")) {
 			$body = add_page_info_to_body($body);
+		}
 
-		if ($no_tags)
+		if ($no_tags) {
 			return array("body" => $body, "tags" => "", "plain" => $plain);
+		}
 
 		$tags_arr = array();
 
 		foreach ($item->entities->hashtags AS $hashtag) {
-			$url = "#[url=".$a->get_baseurl()."/search?tag=".rawurlencode($hashtag->text)."]".$hashtag->text."[/url]";
-			$tags_arr["#".$hashtag->text] = $url;
-			$body = str_replace("#".$hashtag->text, $url, $body);
+			$url = "#[url=" . $a->get_baseurl() . "/search?tag=" . rawurlencode($hashtag->text) . "]" . $hashtag->text . "[/url]";
+			$tags_arr["#" . $hashtag->text] = $url;
+			$body = str_replace("#" . $hashtag->text, $url, $body);
 		}
 
 		foreach ($item->entities->user_mentions AS $mention) {
-			$url = "@[url=https://twitter.com/".rawurlencode($mention->screen_name)."]".$mention->screen_name."[/url]";
-			$tags_arr["@".$mention->screen_name] = $url;
-			$body = str_replace("@".$mention->screen_name, $url, $body);
+			$url = "@[url=https://twitter.com/" . rawurlencode($mention->screen_name) . "]" . $mention->screen_name . "[/url]";
+			$tags_arr["@" . $mention->screen_name] = $url;
+			$body = str_replace("@" . $mention->screen_name, $url, $body);
 		}
 
 		// it seems as if the entities aren't always covering all mentions. So the rest will be checked here
 		$tags = get_tags($body);
 
-		if(count($tags)) {
-			foreach($tags as $tag) {
-				if (strstr(trim($tag), " "))
+		if (count($tags)) {
+			foreach ($tags as $tag) {
+				if (strstr(trim($tag), " ")) {
 					continue;
+				}
 
-				if(strpos($tag,'#') === 0) {
-					if(strpos($tag,'[url='))
+				if (strpos($tag, '#') === 0) {
+					if (strpos($tag, '[url=')) {
 						continue;
+					}
 
 					// don't link tags that are already embedded in links
-
-					if(preg_match('/\[(.*?)' . preg_quote($tag,'/') . '(.*?)\]/',$body))
+					if (preg_match('/\[(.*?)' . preg_quote($tag, '/') . '(.*?)\]/', $body)) {
 						continue;
-					if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag,'/') . '(.*?)\)/',$body))
+					}
+					if (preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag, '/') . '(.*?)\)/', $body)) {
 						continue;
+					}
 
-					$basetag = str_replace('_',' ',substr($tag,1));
-					$url = '#[url='.$a->get_baseurl().'/search?tag='.rawurlencode($basetag).']'.$basetag.'[/url]';
-					$body = str_replace($tag,$url,$body);
-					$tags_arr["#".$basetag] = $url;
-					continue;
-				} elseif(strpos($tag,'@') === 0) {
-					if(strpos($tag,'[url='))
+					$basetag = str_replace('_', ' ', substr($tag, 1));
+					$url = '#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
+					$body = str_replace($tag, $url, $body);
+					$tags_arr["#" . $basetag] = $url;
+				} elseif (strpos($tag, '@') === 0) {
+					if (strpos($tag, '[url=')) {
 						continue;
+					}
 
-					$basetag = substr($tag,1);
-					$url = '@[url=https://twitter.com/'.rawurlencode($basetag).']'.$basetag.'[/url]';
-					$body = str_replace($tag,$url,$body);
-					$tags_arr["@".$basetag] = $url;
+					$basetag = substr($tag, 1);
+					$url = '@[url=https://twitter.com/' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
+					$body = str_replace($tag, $url, $body);
+					$tags_arr["@" . $basetag] = $url;
 				}
 			}
 		}
 
-
 		$tags = implode($tags_arr, ",");
-
 	}
 	return array("body" => $body, "tags" => $tags, "plain" => $plain);
 }
@@ -1291,8 +1335,8 @@ function twitter_expand_entities($a, $body, $item, $no_tags = false, $picture) {
  *
  * @return $picture string Returns a a single picture string if it isn't a media post
  */
-function twitter_media_entities($post, &$postarray) {
-
+function twitter_media_entities($post, &$postarray)
+{
 	// There are no media entities? So we quit.
 	if (!is_array($post->extended_entities->media)) {
 		return "";
@@ -1302,7 +1346,7 @@ function twitter_media_entities($post, &$postarray) {
 	// We only do this when there is exactly one media.
 	if ((count($post->entities->urls) > 0) && (count($post->extended_entities->media) == 1)) {
 		$picture = "";
-		foreach($post->extended_entities->media AS $medium) {
+		foreach ($post->extended_entities->media AS $medium) {
 			if (isset($medium->media_url_https)) {
 				$picture = $medium->media_url_https;
 				$postarray['body'] = str_replace($medium->url, "", $postarray['body']);
@@ -1313,22 +1357,22 @@ function twitter_media_entities($post, &$postarray) {
 
 	// This is a pure media post, first search for all media urls
 	$media = array();
-	foreach($post->extended_entities->media AS $medium) {
-		switch($medium->type) {
+	foreach ($post->extended_entities->media AS $medium) {
+		switch ($medium->type) {
 			case 'photo':
-				$media[$medium->url] .= "\n[img]".$medium->media_url_https."[/img]";
+				$media[$medium->url] .= "\n[img]" . $medium->media_url_https . "[/img]";
 				$postarray['object-type'] = ACTIVITY_OBJ_IMAGE;
 				break;
 			case 'video':
 			case 'animated_gif':
-				$media[$medium->url] .= "\n[img]".$medium->media_url_https."[/img]";
+				$media[$medium->url] .= "\n[img]" . $medium->media_url_https . "[/img]";
 				$postarray['object-type'] = ACTIVITY_OBJ_VIDEO;
 				if (is_array($medium->video_info->variants)) {
 					$bitrate = 0;
 					// We take the video with the highest bitrate
 					foreach ($medium->video_info->variants AS $variant) {
 						if (($variant->content_type == "video/mp4") && ($variant->bitrate >= $bitrate)) {
-							$media[$medium->url] = "\n[video]".$variant->url."[/video]";
+							$media[$medium->url] = "\n[video]" . $variant->url . "[/video]";
 							$bitrate = $variant->bitrate;
 						}
 					}
@@ -1342,42 +1386,41 @@ function twitter_media_entities($post, &$postarray) {
 
 	// Now we replace the media urls.
 	foreach ($media AS $key => $value) {
-		$postarray['body'] = str_replace($key, "\n".$value."\n", $postarray['body']);
+		$postarray['body'] = str_replace($key, "\n" . $value . "\n", $postarray['body']);
 	}
 	return "";
 }
 
-function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing_contact, $noquote) {
-
+function twitter_createpost(App $a, $uid, $post, $self, $create_user, $only_existing_contact, $noquote)
+{
 	$postarray = array();
 	$postarray['network'] = NETWORK_TWITTER;
 	$postarray['gravity'] = 0;
 	$postarray['uid'] = $uid;
 	$postarray['wall'] = 0;
-	$postarray['uri'] = "twitter::".$post->id_str;
+	$postarray['uri'] = "twitter::" . $post->id_str;
 	$postarray['object'] = json_encode($post);
 
 	// Don't import our own comments
 	$r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
 			dbesc($postarray['uri']),
 			intval($uid)
-		);
+	);
 
 	if (count($r)) {
-		logger("Item with extid ".$postarray['uri']." found.", LOGGER_DEBUG);
-		return(array());
+		logger("Item with extid " . $postarray['uri'] . " found.", LOGGER_DEBUG);
+		return array();
 	}
 
 	$contactid = 0;
 
 	if ($post->in_reply_to_status_id_str != "") {
-
-		$parent = "twitter::".$post->in_reply_to_status_id_str;
+		$parent = "twitter::" . $post->in_reply_to_status_id_str;
 
 		$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 				dbesc($parent),
 				intval($uid)
-			);
+		);
 		if (count($r)) {
 			$postarray['thr-parent'] = $r[0]["uri"];
 			$postarray['parent-uri'] = $r[0]["parent-uri"];
@@ -1387,7 +1430,7 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
 			$r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
 					dbesc($parent),
 					intval($uid)
-				);
+			);
 			if (count($r)) {
 				$postarray['thr-parent'] = $r[0]['uri'];
 				$postarray['parent-uri'] = $r[0]['parent-uri'];
@@ -1407,15 +1450,15 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
 			$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
 				intval($uid));
 
-			if(count($r)) {
+			if (count($r)) {
 				$contactid = $r[0]["id"];
 
-				$postarray['owner-name'] =  $r[0]["name"];
-				$postarray['owner-link'] = $r[0]["url"];
-				$postarray['owner-avatar'] =  $r[0]["photo"];
+				$postarray['owner-name']   = $r[0]["name"];
+				$postarray['owner-link']   = $r[0]["url"];
+				$postarray['owner-avatar'] = $r[0]["photo"];
 			} else {
-				logger("No self contact for user ".$uid, LOGGER_DEBUG);
-				return(array());
+				logger("No self contact for user " . $uid, LOGGER_DEBUG);
+				return array();
 			}
 		}
 		// Don't create accounts of people who just comment something
@@ -1429,15 +1472,15 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
 		$contactid = twitter_fetch_contact($uid, $post->user, $create_user);
 
 		$postarray['owner-name'] = $post->user->name;
-		$postarray['owner-link'] = "https://twitter.com/".$post->user->screen_name;
+		$postarray['owner-link'] = "https://twitter.com/" . $post->user->screen_name;
 		$postarray['owner-avatar'] = twitter_fix_avatar($post->user->profile_image_url_https);
 	}
 
-	if(($contactid == 0) && !$only_existing_contact) {
+	if (($contactid == 0) && !$only_existing_contact) {
 		$contactid = $self['id'];
 	} elseif ($contactid <= 0) {
 		logger("Contact ID is zero or less than zero.", LOGGER_DEBUG);
-		return(array());
+		return array();
 	}
 
 	$postarray['contact-id'] = $contactid;
@@ -1446,7 +1489,7 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
 	$postarray['author-name'] = $postarray['owner-name'];
 	$postarray['author-link'] = $postarray['owner-link'];
 	$postarray['author-avatar'] = $postarray['owner-avatar'];
-	$postarray['plink'] = "https://twitter.com/".$post->user->screen_name."/status/".$post->id_str;
+	$postarray['plink'] = "https://twitter.com/" . $post->user->screen_name . "/status/" . $post->id_str;
 	$postarray['app'] = strip_tags($post->source);
 
 	if ($post->user->protected) {
@@ -1471,8 +1514,8 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
 	$converted = twitter_expand_entities($a, $postarray['body'], $post, false, $picture);
 	$postarray['body'] = $converted["body"];
 	$postarray['tag'] = $converted["tags"];
-	$postarray['created'] = datetime_convert('UTC','UTC',$post->created_at);
-	$postarray['edited'] = datetime_convert('UTC','UTC',$post->created_at);
+	$postarray['created'] = datetime_convert('UTC', 'UTC', $post->created_at);
+	$postarray['edited'] = datetime_convert('UTC', 'UTC', $post->created_at);
 
 	$statustext = $converted["plain"];
 
@@ -1483,10 +1526,10 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
 		$postarray["location"] = $post->place->full_name;
 	}
 	if (is_array($post->geo->coordinates)) {
-		$postarray["coord"] = $post->geo->coordinates[0]." ".$post->geo->coordinates[1];
+		$postarray["coord"] = $post->geo->coordinates[0] . " " . $post->geo->coordinates[1];
 	}
 	if (is_array($post->coordinates->coordinates)) {
-		$postarray["coord"] = $post->coordinates->coordinates[1]." ".$post->coordinates->coordinates[0];
+		$postarray["coord"] = $post->coordinates->coordinates[1] . " " . $post->coordinates->coordinates[0];
 	}
 	if (is_object($post->retweeted_status)) {
 		$retweet = twitter_createpost($a, $uid, $post->retweeted_status, $self, false, false, $noquote);
@@ -1507,74 +1550,75 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
 
 		$postarray['body'] = $statustext;
 
-		$postarray['body'] .= "\n".share_header($quoted['author-name'], $quoted['author-link'], $quoted['author-avatar'], "",
-							$quoted['created'], $quoted['plink']);
+		$postarray['body'] .= "\n" . share_header($quoted['author-name'], $quoted['author-link'], $quoted['author-avatar'], "", $quoted['created'], $quoted['plink']);
 
-		$postarray['body'] .= $quoted['body'].'[/share]';
+		$postarray['body'] .= $quoted['body'] . '[/share]';
 	}
 
-	return($postarray);
+	return $postarray;
 }
 
-function twitter_checknotification($a, $uid, $own_id, $top_item, $postarray) {
-
-	// this whole function doesn't seem to work. Needs complete check
-
+function twitter_checknotification(App $a, $uid, $own_id, $top_item, $postarray)
+{
+	/// TODO: this whole function doesn't seem to work. Needs complete check
 	$user = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
 			intval($uid)
-		);
+	);
 
-	if(!count($user))
+	if (!count($user)) {
 		return;
+	}
 
 	// Is it me?
-	if (link_compare($user[0]["url"], $postarray['author-link']))
+	if (link_compare($user[0]["url"], $postarray['author-link'])) {
 		return;
+	}
 
 	$own_user = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
 			intval($uid),
 			dbesc("twitter::".$own_id)
-		);
+	);
 
-	if(!count($own_user))
+	if (!count($own_user)) {
 		return;
+	}
 
 	// Is it me from twitter?
-	if (link_compare($own_user[0]["url"], $postarray['author-link']))
+	if (link_compare($own_user[0]["url"], $postarray['author-link'])) {
 		return;
+	}
 
 	$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0",
 			dbesc($postarray['parent-uri']),
 			intval($uid)
-			);
+	);
 
-	if(count($myconv)) {
-
-		foreach($myconv as $conv) {
+	if (count($myconv)) {
+		foreach ($myconv as $conv) {
 			// now if we find a match, it means we're in this conversation
-
-			if(!link_compare($conv['author-link'],$user[0]["url"]) && !link_compare($conv['author-link'],$own_user[0]["url"]))
+			if (!link_compare($conv['author-link'], $user[0]["url"]) && !link_compare($conv['author-link'], $own_user[0]["url"])) {
 				continue;
+			}
 
-			require_once('include/enotify.php');
+			require_once 'include/enotify.php';
 
 			$conv_parent = $conv['parent'];
 
 			notification(array(
-				'type'         => NOTIFY_COMMENT,
+				'type' => NOTIFY_COMMENT,
 				'notify_flags' => $user[0]['notify-flags'],
-				'language'     => $user[0]['language'],
-				'to_name'      => $user[0]['username'],
-				'to_email'     => $user[0]['email'],
-				'uid'          => $user[0]['uid'],
-				'item'         => $postarray,
-				'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($top_item)),
-				'source_name'  => $postarray['author-name'],
-				'source_link'  => $postarray['author-link'],
+				'language' => $user[0]['language'],
+				'to_name' => $user[0]['username'],
+				'to_email' => $user[0]['email'],
+				'uid' => $user[0]['uid'],
+				'item' => $postarray,
+				'link' => $a->get_baseurl() . '/display/' . urlencode(get_item_guid($top_item)),
+				'source_name' => $postarray['author-name'],
+				'source_link' => $postarray['author-link'],
 				'source_photo' => $postarray['author-avatar'],
-				'verb'         => ACTIVITY_POST,
-				'otype'        => 'item',
-				'parent'       => $conv_parent,
+				'verb' => ACTIVITY_POST,
+				'otype' => 'item',
+				'parent' => $conv_parent,
 			));
 
 			// only send one notification
@@ -1583,8 +1627,9 @@ function twitter_checknotification($a, $uid, $own_id, $top_item, $postarray) {
 	}
 }
 
-function twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id) {
-	logger("twitter_fetchparentposts: Fetching for user ".$uid." and post ".$post->id_str, LOGGER_DEBUG);
+function twitter_fetchparentposts(App $a, $uid, $post, $connection, $self, $own_id)
+{
+	logger("twitter_fetchparentposts: Fetching for user " . $uid . " and post " . $post->id_str, LOGGER_DEBUG);
 
 	$posts = array();
 
@@ -1594,22 +1639,23 @@ function twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id)
 		$post = $connection->get('statuses/show', $parameters);
 
 		if (!count($post)) {
-			logger("twitter_fetchparentposts: Can't fetch post ".$parameters->id, LOGGER_DEBUG);
+			logger("twitter_fetchparentposts: Can't fetch post " . $parameters->id, LOGGER_DEBUG);
 			break;
 		}
 
 		$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 				dbesc("twitter::".$post->id_str),
 				intval($uid)
-			);
+		);
 
-		if (count($r))
+		if (count($r)) {
 			break;
+		}
 
 		$posts[] = $post;
 	}
 
-	logger("twitter_fetchparentposts: Fetching ".count($posts)." parents", LOGGER_DEBUG);
+	logger("twitter_fetchparentposts: Fetching " . count($posts) . " parents", LOGGER_DEBUG);
 
 	$posts = array_reverse($posts);
 
@@ -1623,15 +1669,17 @@ function twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id)
 			$item = item_store($postarray);
 			$postarray["id"] = $item;
 
-			logger('twitter_fetchparentpost: User '.$self["nick"].' posted parent timeline item '.$item);
+			logger('twitter_fetchparentpost: User ' . $self["nick"] . ' posted parent timeline item ' . $item);
 
-			if ($item && !function_exists("check_item_notification"))
+			if ($item && !function_exists("check_item_notification")) {
 				twitter_checknotification($a, $uid, $own_id, $item, $postarray);
+			}
 		}
 	}
 }
 
-function twitter_fetchhometimeline($a, $uid) {
+function twitter_fetchhometimeline(App $a, $uid)
+{
 	$ckey    = Config::get('twitter', 'consumerkey');
 	$csecret = Config::get('twitter', 'consumersecret');
 	$otoken  = PConfig::get($uid, 'twitter', 'oauthtoken');
@@ -1639,17 +1687,18 @@ function twitter_fetchhometimeline($a, $uid) {
 	$create_user = PConfig::get($uid, 'twitter', 'create_user');
 	$mirror_posts = PConfig::get($uid, 'twitter', 'mirror_posts');
 
-	logger("twitter_fetchhometimeline: Fetching for user ".$uid, LOGGER_DEBUG);
+	logger("twitter_fetchhometimeline: Fetching for user " . $uid, LOGGER_DEBUG);
 
-	$application_name  = Config::get('twitter', 'application_name');
+	$application_name = Config::get('twitter', 'application_name');
 
-	if ($application_name == "")
+	if ($application_name == "") {
 		$application_name = $a->get_hostname();
+	}
 
-	require_once('library/twitteroauth.php');
-	require_once('include/items.php');
+	require_once 'library/twitteroauth.php';
+	require_once 'include/items.php';
 
-	$connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
+	$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
 
 	$own_contact = twitter_fetch_own_contact($a, $uid);
 
@@ -1657,52 +1706,51 @@ function twitter_fetchhometimeline($a, $uid) {
 		intval($own_contact),
 		intval($uid));
 
-	if(count($r)) {
+	if (count($r)) {
 		$own_id = $r[0]["nick"];
 	} else {
-		logger("twitter_fetchhometimeline: Own twitter contact not found for user ".$uid, LOGGER_DEBUG);
+		logger("twitter_fetchhometimeline: Own twitter contact not found for user " . $uid, LOGGER_DEBUG);
 		return;
 	}
 
 	$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
 		intval($uid));
 
-	if(count($r)) {
+	if (count($r)) {
 		$self = $r[0];
 	} else {
-		logger("twitter_fetchhometimeline: Own contact not found for user ".$uid, LOGGER_DEBUG);
+		logger("twitter_fetchhometimeline: Own contact not found for user " . $uid, LOGGER_DEBUG);
 		return;
 	}
 
 	$u = q("SELECT * FROM user WHERE uid = %d LIMIT 1",
 		intval($uid));
-	if(!count($u)) {
-		logger("twitter_fetchhometimeline: Own user not found for user ".$uid, LOGGER_DEBUG);
+	if (!count($u)) {
+		logger("twitter_fetchhometimeline: Own user not found for user " . $uid, LOGGER_DEBUG);
 		return;
 	}
 
 	$parameters = array("exclude_replies" => false, "trim_user" => false, "contributor_details" => true, "include_rts" => true, "tweet_mode" => "extended");
 	//$parameters["count"] = 200;
-
-
 	// Fetching timeline
-	$lastid  = PConfig::get($uid, 'twitter', 'lasthometimelineid');
+	$lastid = PConfig::get($uid, 'twitter', 'lasthometimelineid');
 
 	$first_time = ($lastid == "");
 
-	if ($lastid <> "")
+	if ($lastid != "") {
 		$parameters["since_id"] = $lastid;
+	}
 
 	$items = $connection->get('statuses/home_timeline', $parameters);
 
 	if (!is_array($items)) {
-		logger("twitter_fetchhometimeline: Error fetching home timeline: ".print_r($items, true), LOGGER_DEBUG);
+		logger("twitter_fetchhometimeline: Error fetching home timeline: " . print_r($items, true), LOGGER_DEBUG);
 		return;
 	}
 
 	$posts = array_reverse($items);
 
-	logger("twitter_fetchhometimeline: Fetching timeline for user ".$uid." ".sizeof($posts)." items", LOGGER_DEBUG);
+	logger("twitter_fetchhometimeline: Fetching timeline for user " . $uid . " " . sizeof($posts) . " items", LOGGER_DEBUG);
 
 	if (count($posts)) {
 		foreach ($posts as $post) {
@@ -1711,8 +1759,9 @@ function twitter_fetchhometimeline($a, $uid) {
 				PConfig::set($uid, 'twitter', 'lasthometimelineid', $lastid);
 			}
 
-			if ($first_time)
+			if ($first_time) {
 				continue;
+			}
 
 			if (stristr($post->source, $application_name) && $post->user->screen_name == $own_id) {
 				logger("twitter_fetchhometimeline: Skip previously sended post", LOGGER_DEBUG);
@@ -1724,71 +1773,80 @@ function twitter_fetchhometimeline($a, $uid) {
 				continue;
 			}
 
-			if ($post->in_reply_to_status_id_str != "")
+			if ($post->in_reply_to_status_id_str != "") {
 				twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id);
+			}
 
 			$postarray = twitter_createpost($a, $uid, $post, $self, $create_user, true, false);
 
-			if (trim($postarray['body']) == "")
+			if (trim($postarray['body']) == "") {
 				continue;
+			}
 
 			$item = item_store($postarray);
 			$postarray["id"] = $item;
 
-			logger('twitter_fetchhometimeline: User '.$self["nick"].' posted home timeline item '.$item);
+			logger('twitter_fetchhometimeline: User ' . $self["nick"] . ' posted home timeline item ' . $item);
 
-			if ($item && !function_exists("check_item_notification"))
+			if ($item && !function_exists("check_item_notification")) {
 				twitter_checknotification($a, $uid, $own_id, $item, $postarray);
-
+			}
 		}
 	}
 	PConfig::set($uid, 'twitter', 'lasthometimelineid', $lastid);
 
 	// Fetching mentions
-	$lastid  = PConfig::get($uid, 'twitter', 'lastmentionid');
+	$lastid = PConfig::get($uid, 'twitter', 'lastmentionid');
 
 	$first_time = ($lastid == "");
 
-	if ($lastid <> "")
+	if ($lastid != "") {
 		$parameters["since_id"] = $lastid;
+	}
 
 	$items = $connection->get('statuses/mentions_timeline', $parameters);
 
 	if (!is_array($items)) {
-		logger("twitter_fetchhometimeline: Error fetching mentions: ".print_r($items, true), LOGGER_DEBUG);
+		logger("twitter_fetchhometimeline: Error fetching mentions: " . print_r($items, true), LOGGER_DEBUG);
 		return;
 	}
 
 	$posts = array_reverse($items);
 
-	logger("twitter_fetchhometimeline: Fetching mentions for user ".$uid." ".sizeof($posts)." items", LOGGER_DEBUG);
+	logger("twitter_fetchhometimeline: Fetching mentions for user " . $uid . " " . sizeof($posts) . " items", LOGGER_DEBUG);
 
 	if (count($posts)) {
 		foreach ($posts as $post) {
-			if ($post->id_str > $lastid)
+			if ($post->id_str > $lastid) {
 				$lastid = $post->id_str;
+			}
 
-			if ($first_time)
+			if ($first_time) {
 				continue;
+			}
 
-			if ($post->in_reply_to_status_id_str != "")
+			if ($post->in_reply_to_status_id_str != "") {
 				twitter_fetchparentposts($a, $uid, $post, $connection, $self, $own_id);
+			}
 
 			$postarray = twitter_createpost($a, $uid, $post, $self, false, false, false);
 
-			if (trim($postarray['body']) == "")
+			if (trim($postarray['body']) == "") {
 				continue;
+			}
 
 			$item = item_store($postarray);
 			$postarray["id"] = $item;
 
-			if ($item && function_exists("check_item_notification"))
+			if ($item && function_exists("check_item_notification")) {
 				check_item_notification($item, $uid, NOTIFY_TAGSELF);
+			}
 
-			if (!isset($postarray["parent"]) || ($postarray["parent"] == 0))
+			if (!isset($postarray["parent"]) || ($postarray["parent"] == 0)) {
 				$postarray["parent"] = $item;
+			}
 
-			logger('twitter_fetchhometimeline: User '.$self["nick"].' posted mention timeline item '.$item);
+			logger('twitter_fetchhometimeline: User ' . $self["nick"] . ' posted mention timeline item ' . $item);
 
 			if ($item == 0) {
 				$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
@@ -1803,7 +1861,7 @@ function twitter_fetchhometimeline($a, $uid) {
 				$parent_id = $postarray['parent'];
 
 			if (($item != 0) && !function_exists("check_item_notification")) {
-				require_once('include/enotify.php');
+				require_once 'include/enotify.php';
 				notification(array(
 					'type'         => NOTIFY_TAGSELF,
 					'notify_flags' => $u[0]['notify-flags'],
@@ -1812,7 +1870,7 @@ function twitter_fetchhometimeline($a, $uid) {
 					'to_email'     => $u[0]['email'],
 					'uid'          => $u[0]['uid'],
 					'item'         => $postarray,
-					'link'         => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item)),
+					'link'         => $a->get_baseurl() . '/display/' . urlencode(get_item_guid($item)),
 					'source_name'  => $postarray['author-name'],
 					'source_link'  => $postarray['author-link'],
 					'source_photo' => $postarray['author-avatar'],
@@ -1827,7 +1885,8 @@ function twitter_fetchhometimeline($a, $uid) {
 	PConfig::set($uid, 'twitter', 'lastmentionid', $lastid);
 }
 
-function twitter_fetch_own_contact($a, $uid) {
+function twitter_fetch_own_contact(App $a, $uid)
+{
 	$ckey    = Config::get('twitter', 'consumerkey');
 	$csecret = Config::get('twitter', 'consumersecret');
 	$otoken  = PConfig::get($uid, 'twitter', 'oauthtoken');
@@ -1838,9 +1897,9 @@ function twitter_fetch_own_contact($a, $uid) {
 	$contact_id = 0;
 
 	if ($own_id == "") {
-		require_once('library/twitteroauth.php');
+		require_once 'library/twitteroauth.php';
 
-		$connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
+		$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
 
 		// Fetching user data
 		$user = $connection->get('account/verify_credentials');
@@ -1848,64 +1907,70 @@ function twitter_fetch_own_contact($a, $uid) {
 		PConfig::set($uid, 'twitter', 'own_id', $user->id_str);
 
 		$contact_id = twitter_fetch_contact($uid, $user, true);
-
 	} else {
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
-			intval($uid), dbesc("twitter::".$own_id));
-		if(count($r))
+			intval($uid),
+			dbesc("twitter::" . $own_id));
+		if (count($r)) {
 			$contact_id = $r[0]["id"];
-		else
+		} else {
 			PConfig::delete($uid, 'twitter', 'own_id');
-
+		}
 	}
 
-	return($contact_id);
+	return $contact_id;
 }
 
-function twitter_is_retweet($a, $uid, $body) {
+function twitter_is_retweet(App $a, $uid, $body)
+{
 	$body = trim($body);
 
 	// Skip if it isn't a pure repeated messages
 	// Does it start with a share?
-	if (strpos($body, "[share") > 0)
-		return(false);
+	if (strpos($body, "[share") > 0) {
+		return false;
+	}
 
 	// Does it end with a share?
-	if (strlen($body) > (strrpos($body, "[/share]") + 8))
-		return(false);
+	if (strlen($body) > (strrpos($body, "[/share]") + 8)) {
+		return false;
+	}
 
-	$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
+	$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "$1", $body);
 	// Skip if there is no shared message in there
-	if ($body == $attributes)
-		return(false);
+	if ($body == $attributes) {
+		return false;
+	}
 
 	$link = "";
 	preg_match("/link='(.*?)'/ism", $attributes, $matches);
-	if ($matches[1] != "")
+	if ($matches[1] != "") {
 		$link = $matches[1];
+	}
 
 	preg_match('/link="(.*?)"/ism', $attributes, $matches);
-	if ($matches[1] != "")
+	if ($matches[1] != "") {
 		$link = $matches[1];
+	}
 
 	$id = preg_replace("=https?://twitter.com/(.*)/status/(.*)=ism", "$2", $link);
-	if ($id == $link)
-		return(false);
+	if ($id == $link) {
+		return false;
+	}
 
-	logger('twitter_is_retweet: Retweeting id '.$id.' for user '.$uid, LOGGER_DEBUG);
+	logger('twitter_is_retweet: Retweeting id ' . $id . ' for user ' . $uid, LOGGER_DEBUG);
 
 	$ckey    = Config::get('twitter', 'consumerkey');
 	$csecret = Config::get('twitter', 'consumersecret');
 	$otoken  = PConfig::get($uid, 'twitter', 'oauthtoken');
 	$osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
 
-	require_once('library/twitteroauth.php');
-	$connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
+	require_once 'library/twitteroauth.php';
+	$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
 
-	$result = $connection->post('statuses/retweet/'.$id);
+	$result = $connection->post('statuses/retweet/' . $id);
 
-	logger('twitter_is_retweet: result '.print_r($result, true), LOGGER_DEBUG);
+	logger('twitter_is_retweet: result ' . print_r($result, true), LOGGER_DEBUG);
 
-	return(!isset($result->errors));
+	return !isset($result->errors);
 }
-?>