From: Roland Häder <roland@mxchange.org>
Date: Thu, 22 Dec 2016 08:03:44 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4c04a78d1b6f14ce90e4ca0b23e356d234c4a296;hp=584cf75af3b8967fdea31556db61a25c7314c15e;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into develop
---

diff --git a/boot.php b/boot.php
index b282f8d48e..70f7d324d3 100644
--- a/boot.php
+++ b/boot.php
@@ -670,22 +670,23 @@ class App {
 
 		#set_include_path("include/$this->hostname" . PATH_SEPARATOR . get_include_path());
 
-		if((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,9) === "pagename=") {
+		if ((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,9) === "pagename=") {
 			$this->query_string = substr($_SERVER['QUERY_STRING'],9);
 			// removing trailing / - maybe a nginx problem
 			if (substr($this->query_string, 0, 1) == "/")
 				$this->query_string = substr($this->query_string, 1);
-		} elseif((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,2) === "q=") {
+		} elseif ((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,2) === "q=") {
 			$this->query_string = substr($_SERVER['QUERY_STRING'],2);
 			// removing trailing / - maybe a nginx problem
 			if (substr($this->query_string, 0, 1) == "/")
 				$this->query_string = substr($this->query_string, 1);
 		}
 
-		if (x($_GET,'pagename'))
+		if (x($_GET,'pagename')) {
 			$this->cmd = trim($_GET['pagename'],'/\\');
-		elseif (x($_GET,'q'))
+		} elseif (x($_GET,'q')) {
 			$this->cmd = trim($_GET['q'],'/\\');
+		}
 
 
 		// fix query_string
@@ -694,13 +695,15 @@ class App {
 
 		// unix style "homedir"
 
-		if(substr($this->cmd,0,1) === '~')
+		if (substr($this->cmd,0,1) === '~') {
 			$this->cmd = 'profile/' . substr($this->cmd,1);
+		}
 
 		// Diaspora style profile url
 
-		if(substr($this->cmd,0,2) === 'u/')
+		if (substr($this->cmd,0,2) === 'u/') {
 			$this->cmd = 'profile/' . substr($this->cmd,2);
+		}
 
 
 		/*
@@ -1028,7 +1031,7 @@ class App {
 		} else {
 			$r = q("SELECT `contact`.`avatar-date` AS picdate FROM `contact` WHERE `contact`.`thumb` like '%%/%s'",
 				$common_filename);
-			if(! dbm::is_result($r)){
+			if (! dbm::is_result($r)) {
 				$this->cached_profile_image[$avatar_image] = $avatar_image;
 			} else {
 				$this->cached_profile_picdate[$common_filename] = "?rev=".urlencode($r[0]['picdate']);
@@ -1537,7 +1540,7 @@ function check_db() {
  * Sets the base url for use in cmdline programs which don't have
  * $_SERVER variables
  */
-function check_url(&$a) {
+function check_url(App &$a) {
 
 	$url = get_config('system','url');
 
@@ -1548,9 +1551,9 @@ function check_url(&$a) {
 	// We will only change the url to an ip address if there is no existing setting
 
 	if(! x($url))
-		$url = set_config('system','url',$a->get_baseurl());
-	if((! link_compare($url,$a->get_baseurl())) && (! preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/",$a->get_hostname)))
-		$url = set_config('system','url',$a->get_baseurl());
+		$url = set_config('system','url',App::get_baseurl());
+	if((! link_compare($url,App::get_baseurl())) && (! preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/",$a->get_hostname)))
+		$url = set_config('system','url',App::get_baseurl());
 
 	return;
 }
@@ -1559,7 +1562,7 @@ function check_url(&$a) {
 /**
  * @brief Automatic database updates
  */
-function update_db(&$a) {
+function update_db(App &$a) {
 	$build = get_config('system','build');
 	if(! x($build))
 		$build = set_config('system','build',DB_UPDATE_VERSION);
@@ -1675,7 +1678,7 @@ function run_update_function($x) {
  * @param App $a
  *
 	 */
-function check_plugins(&$a) {
+function check_plugins(App &$a) {
 
 	$r = q("SELECT * FROM `addon` WHERE `installed` = 1");
 	if (dbm::is_result($r))
@@ -2410,7 +2413,8 @@ function get_temppath() {
 	return("");
 }
 
-function set_template_engine(&$a, $engine = 'internal') {
+/// @deprecated
+function set_template_engine(App &$a, $engine = 'internal') {
 /// @note This function is no longer necessary, but keep it as a wrapper to the class method
 /// to avoid breaking themes again unnecessarily
 
diff --git a/doc/Plugins.md b/doc/Plugins.md
index 49d0665fec..6460fd5a09 100644
--- a/doc/Plugins.md
+++ b/doc/Plugins.md
@@ -77,9 +77,9 @@ This will include:
     $a->argc = 3
     $a->argv = array(0 => 'plugin', 1 => 'arg1', 2 => 'arg2');
 
-Your module functions will often contain the function plugin_name_content(&$a), which defines and returns the page body content.
-They may also contain plugin_name_post(&$a) which is called before the _content function and typically handles the results of POST forms.
-You may also have plugin_name_init(&$a) which is called very early on and often does module initialisation.
+Your module functions will often contain the function plugin_name_content(App &$a), which defines and returns the page body content.
+They may also contain plugin_name_post(App &$a) which is called before the _content function and typically handles the results of POST forms.
+You may also have plugin_name_init(App &$a) which is called very early on and often does module initialisation.
 
 Templates
 ---
diff --git a/doc/autoloader.md b/doc/autoloader.md
index 947eade23c..25ffd7fe45 100644
--- a/doc/autoloader.md
+++ b/doc/autoloader.md
@@ -68,7 +68,7 @@ The code will be something like:
     file: mod/network.php
     <?php
     
-    function network_content(&$a) {
+    function network_content(App &$a) {
        $itemsmanager = new \Friendica\ItemsManager();
        $items = $itemsmanager->getAll();
     
diff --git a/doc/de/Plugins.md b/doc/de/Plugins.md
index 40be4a0695..b2c3f849ff 100644
--- a/doc/de/Plugins.md
+++ b/doc/de/Plugins.md
@@ -67,9 +67,9 @@ So würde http://example.com/plugin/arg1/arg2 nach einem Modul "plugin" suchen u
     $a->argc = 3
     $a->argv = array(0 => 'plugin', 1 => 'arg1', 2 => 'arg2');
 
-Deine Modulfunktionen umfassen oft die Funktion plugin_name_content(&$a), welche den Seiteninhalt definiert und zurückgibt.
-Sie können auch plugin_name_post(&$a) umfassen, welches vor der content-Funktion aufgerufen wird und normalerweise die Resultate der POST-Formulare handhabt.
-Du kannst ebenso plugin_name_init(&$a) nutzen, was oft frühzeitig aufgerufen wird und das Modul initialisert.
+Deine Modulfunktionen umfassen oft die Funktion plugin_name_content(App &$a), welche den Seiteninhalt definiert und zurückgibt.
+Sie können auch plugin_name_post(App &$a) umfassen, welches vor der content-Funktion aufgerufen wird und normalerweise die Resultate der POST-Formulare handhabt.
+Du kannst ebenso plugin_name_init(App &$a) nutzen, was oft frühzeitig aufgerufen wird und das Modul initialisert.
 
 
 Derzeitige Hooks
diff --git a/doc/themes.md b/doc/themes.md
index add44c776b..0b8f6cb83d 100644
--- a/doc/themes.md
+++ b/doc/themes.md
@@ -122,10 +122,11 @@ the 1st part of the line is the name of the CSS file (without the .css) the 2nd
 Calling the t() function with the common name makes the string translateable.
 The selected 1st part will be saved in the database by the theme_post function.
 
-    function theme_post(&$a){
+    function theme_post(App &$a){
         // non local users shall not pass
-        if(! local_user())
+        if (! local_user()) {
             return;
+        }
         // if the one specific submit button was pressed then proceed
         if (isset($_POST['duepuntozero-settings-submit'])){
             // and save the selection key into the personal config of the user
@@ -167,7 +168,7 @@ The content of this file should be something like
 
     <?php
     /* meta informations for the theme, see below */
-    function duepuntozero_lr_init(&$a) {
+    function duepuntozero_lr_init(App &$a) {
         $a-> theme_info = array(
             'extends' => 'duepuntozero'.
         );
@@ -250,7 +251,7 @@ Next crucial part of the theme.php file is a definition of an init function.
 The name of the function is <theme-name>_init.
 So in the case of quattro it is
 
-    function quattro_init(&$a) {
+    function quattro_init(App &$a) {
       $a->theme_info = array();
       set_template_engine($a, 'smarty3');
     }
diff --git a/include/Contact.php b/include/Contact.php
index 7ca45a21bd..13e11a8322 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -8,7 +8,6 @@
 function user_remove($uid) {
 	if(! $uid)
 		return;
-	$a = get_app();
 	logger('Removing user: ' . $uid);
 
 	$r = q("select * from user where uid = %d limit 1", intval($uid));
@@ -54,7 +53,7 @@ function user_remove($uid) {
 	if($uid == local_user()) {
 		unset($_SESSION['authenticated']);
 		unset($_SESSION['uid']);
-		goaway($a->get_baseurl());
+		goaway(App::get_baseurl());
 	}
 }
 
@@ -86,7 +85,6 @@ function contact_remove($id) {
 
 function terminate_friendship($user,$self,$contact) {
 
-
 	$a = get_app();
 
 	require_once('include/datetime.php');
@@ -229,14 +227,14 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
 			dbesc(normalise_link($url)), intval($uid));
 
 	// Fetch the data from the contact table with "uid=0" (which is filled automatically)
-	if (!$r)
+	if (!dbm::is_result($r))
 		$r = q("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
 			`keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`
 			FROM `contact` WHERE `nurl` = '%s' AND `uid` = 0",
 				dbesc(normalise_link($url)));
 
 	// Fetch the data from the gcontact table
-	if (!$r)
+	if (!dbm::is_result($r))
 		$r = q("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
 			`keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`
 			FROM `gcontact` WHERE `nurl` = '%s'",
@@ -361,7 +359,7 @@ function contact_photo_menu($contact, $uid = 0)
 	$sparkle = false;
 	if ($contact['network'] === NETWORK_DFRN) {
 		$sparkle = true;
-		$profile_link = $a->get_baseurl() . '/redir/' . $contact['id'];
+		$profile_link = App::get_baseurl() . '/redir/' . $contact['id'];
 	} else {
 		$profile_link = $contact['url'];
 	}
@@ -377,17 +375,17 @@ function contact_photo_menu($contact, $uid = 0)
 	}
 
 	if (in_array($contact['network'], array(NETWORK_DFRN, NETWORK_DIASPORA))) {
-		$pm_url = $a->get_baseurl() . '/message/new/' . $contact['id'];
+		$pm_url = App::get_baseurl() . '/message/new/' . $contact['id'];
 	}
 
 	if ($contact['network'] == NETWORK_DFRN) {
-		$poke_link = $a->get_baseurl() . '/poke/?f=&c=' . $contact['id'];
+		$poke_link = App::get_baseurl() . '/poke/?f=&c=' . $contact['id'];
 	}
 
-	$contact_url = $a->get_baseurl() . '/contacts/' . $contact['id'];
+	$contact_url = App::get_baseurl() . '/contacts/' . $contact['id'];
 
-	$posts_link = $a->get_baseurl() . '/contacts/' . $contact['id'] . '/posts';
-	$contact_drop_link = $a->get_baseurl() . '/contacts/' . $contact['id'] . '/drop?confirm=1';
+	$posts_link = App::get_baseurl() . '/contacts/' . $contact['id'] . '/posts';
+	$contact_drop_link = App::get_baseurl() . '/contacts/' . $contact['id'] . '/drop?confirm=1';
 
 	/**
 	 * menu array:
diff --git a/include/Core/Config.php b/include/Core/Config.php
index 7b7045a9ee..5235728864 100644
--- a/include/Core/Config.php
+++ b/include/Core/Config.php
@@ -97,7 +97,7 @@ class Config {
 			dbesc($family),
 			dbesc($key)
 		);
-		if (count($ret)) {
+		if (dbm::is_result($ret)) {
 			// manage array value
 			$val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
 			$a->config[$family][$key] = $val;
diff --git a/include/Core/PConfig.php b/include/Core/PConfig.php
index 43735018e4..49b69a1f7a 100644
--- a/include/Core/PConfig.php
+++ b/include/Core/PConfig.php
@@ -92,7 +92,7 @@ class PConfig {
 			dbesc($key)
 		);
 
-		if (count($ret)) {
+		if (dbm::is_result($ret)) {
 			$val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
 			$a->config[$uid][$family][$key] = $val;
 
diff --git a/include/Photo.php b/include/Photo.php
index 014cca7d25..1a97fe2fe4 100644
--- a/include/Photo.php
+++ b/include/Photo.php
@@ -794,8 +794,6 @@ function update_contact_avatar($avatar, $uid, $cid, $force = false) {
 
 function import_profile_photo($photo, $uid, $cid, $quit_on_error = false) {
 
-	$a = get_app();
-
 	$r = q("SELECT `resource-id` FROM `photo` WHERE `uid` = %d AND `contact-id` = %d AND `scale` = 4 AND `album` = 'Contact Photos' LIMIT 1",
 		intval($uid),
 		intval($cid)
@@ -841,9 +839,9 @@ function import_profile_photo($photo, $uid, $cid, $quit_on_error = false) {
 			$photo_failure = true;
 		}
 
-		$photo = $a->get_baseurl() . '/photo/' . $hash . '-4.' . $img->getExt();
-		$thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.' . $img->getExt();
-		$micro = $a->get_baseurl() . '/photo/' . $hash . '-6.' . $img->getExt();
+		$photo = App::get_baseurl() . '/photo/' . $hash . '-4.' . $img->getExt();
+		$thumb = App::get_baseurl() . '/photo/' . $hash . '-5.' . $img->getExt();
+		$micro = App::get_baseurl() . '/photo/' . $hash . '-6.' . $img->getExt();
 	} else {
 		$photo_failure = true;
 	}
@@ -853,9 +851,9 @@ function import_profile_photo($photo, $uid, $cid, $quit_on_error = false) {
 	}
 
 	if ($photo_failure) {
-		$photo = $a->get_baseurl() . '/images/person-175.jpg';
-		$thumb = $a->get_baseurl() . '/images/person-80.jpg';
-		$micro = $a->get_baseurl() . '/images/person-48.jpg';
+		$photo = App::get_baseurl() . '/images/person-175.jpg';
+		$thumb = App::get_baseurl() . '/images/person-80.jpg';
+		$micro = App::get_baseurl() . '/images/person-48.jpg';
 	}
 
 	return(array($photo,$thumb,$micro));
@@ -1044,18 +1042,18 @@ function store_photo($a, $uid, $imagedata = "", $url = "") {
 		return(array());
 	}
 
-	$image = array("page" => $a->get_baseurl().'/photos/'.$page_owner_nick.'/image/'.$hash,
-			"full" => $a->get_baseurl()."/photo/{$hash}-0.".$ph->getExt());
+	$image = array("page" => App::get_baseurl().'/photos/'.$page_owner_nick.'/image/'.$hash,
+			"full" => App::get_baseurl()."/photo/{$hash}-0.".$ph->getExt());
 
 	if ($width > 800 || $height > 800) {
-		$image["large"] = $a->get_baseurl()."/photo/{$hash}-0.".$ph->getExt();
+		$image["large"] = App::get_baseurl()."/photo/{$hash}-0.".$ph->getExt();
 	}
 
 	if ($width > 640 || $height > 640) {
 		$ph->scaleImage(640);
 		$r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 1, 0, $defperm);
 		if ($r) {
-			$image["medium"] = $a->get_baseurl()."/photo/{$hash}-1.".$ph->getExt();
+			$image["medium"] = App::get_baseurl()."/photo/{$hash}-1.".$ph->getExt();
 		}
 	}
 
@@ -1063,7 +1061,7 @@ function store_photo($a, $uid, $imagedata = "", $url = "") {
 		$ph->scaleImage(320);
 		$r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 2, 0, $defperm);
 		if ($r) {
-			$image["small"] = $a->get_baseurl()."/photo/{$hash}-2.".$ph->getExt();
+			$image["small"] = App::get_baseurl()."/photo/{$hash}-2.".$ph->getExt();
 		}
 	}
 
@@ -1088,7 +1086,7 @@ function store_photo($a, $uid, $imagedata = "", $url = "") {
 
 		$r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 3, 0, $defperm);
 		if ($r) {
-			$image["thumb"] = $a->get_baseurl()."/photo/{$hash}-3.".$ph->getExt();
+			$image["thumb"] = App::get_baseurl()."/photo/{$hash}-3.".$ph->getExt();
 		}
 	}
 
diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index ed9c634c23..b2e66c98f0 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -34,7 +34,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
 	call_hooks($a->module . '_pre_' . $selname, $arr);
 
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			if((is_array($preselected)) && in_array($rr['id'], $preselected))
 				$selected = " selected=\"selected\" ";
 			else
@@ -145,7 +145,7 @@ function contact_selector($selname, $selclass, $preselected = false, $options) {
 	call_hooks($a->module . '_pre_' . $selname, $arr);
 
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			if((is_array($preselected)) && in_array($rr['id'], $preselected))
 				$selected = " selected=\"selected\" ";
 			else
@@ -221,16 +221,20 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 	$receiverlist = array();
 
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
-			if((is_array($preselected)) && in_array($rr['id'], $preselected))
+		foreach ($r as $rr) {
+			if ((is_array($preselected)) && in_array($rr['id'], $preselected)) {
 				$selected = " selected=\"selected\" ";
-			else
+			}
+			else {
 				$selected = '';
+			}
 
-			if($privmail)
+			if ($privmail) {
 				$trimmed = GetProfileUsername($rr['url'], $rr['name'], false);
-			else
+			}
+			else {
 				$trimmed = mb_substr($rr['name'],0,20);
+			}
 
 			$receiverlist[] = $trimmed;
 
@@ -260,7 +264,7 @@ function prune_deadguys($arr) {
 		return $arr;
 	$str = dbesc(implode(',',$arr));
 	$r = q("SELECT `id` FROM `contact` WHERE `id` IN ( " . $str . ") AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 ");
-	if($r) {
+	if ($r) {
 		$ret = array();
 		foreach($r as $rr)
 			$ret[] = intval($rr['id']);
@@ -392,8 +396,9 @@ function construct_acl_data(&$a, $user) {
 
 function acl_lookup(&$a, $out_type = 'json') {
 
-	if(!local_user())
-		return "";
+	if (!local_user()) {
+		return '';
+	}
 
 	$start	=	(x($_REQUEST,'start')		? $_REQUEST['start']		: 0);
 	$count	=	(x($_REQUEST,'count')		? $_REQUEST['count']		: 100);
@@ -553,7 +558,7 @@ function acl_lookup(&$a, $out_type = 'json') {
 		// autocomplete for global contact search (e.g. navbar search)
 		$r = navbar_complete($a);
 		$contacts = array();
-		if($r) {
+		if ($r) {
 			foreach($r as $g) {
 				$contacts[] = array(
 					"photo"    => proxy_url($g['photo'], false, PROXY_SIZE_MICRO),
@@ -678,7 +683,7 @@ function acl_lookup(&$a, $out_type = 'json') {
  * @param App $a
  * @return array with the search results
  */
-function navbar_complete(&$a) {
+function navbar_complete(App &$a) {
 
 //	logger('navbar_complete');
 
diff --git a/include/api.php b/include/api.php
index 2ae1aeaa02..35efccf090 100644
--- a/include/api.php
+++ b/include/api.php
@@ -133,7 +133,7 @@
 	 * @hook 'logged_in'
 	 * 		array $user	logged user record
 	 */
-	function api_login(&$a){
+	function api_login(App &$a){
 		// login with oauth
 		try{
 			$oauth = new FKOAuth1();
@@ -251,8 +251,8 @@
 	 * @param App $a
 	 * @return string API call result
 	 */
-	function api_call(&$a){
-		GLOBAL $API, $called_api;
+	function api_call(App &$a){
+		global $API, $called_api;
 
 		$type="json";
 		if (strpos($a->query_string, ".xml")>0) $type="xml";
@@ -3068,8 +3068,8 @@
 		'image/gif' => 'gif'
 		);
 		$data = array('photo'=>array());
-		if($r) {
-			foreach($r as $rr) {
+		if ($r) {
+			foreach ($r as $rr) {
 				$photo = array();
 				$photo['id'] = $rr['resource-id'];
 				$photo['album'] = $rr['album'];
@@ -3590,7 +3590,7 @@
 			intval($gid),
 			dbesc($name));
 		// error message if specified gid is not in database
-		if (count($rname) == 0)
+		if (!dbm::is_result($rname))
 			throw new BadRequestException('wrong group name');
 
 		// delete group
@@ -3629,7 +3629,7 @@
 			intval($uid),
 			dbesc($name));
 		// error message if specified group name already exists
-		if (count($rname) != 0)
+		if (dbm::is_result($rname))
 			throw new BadRequestException('group name already exists');
 
 		// check if specified group name is a deleted group
@@ -3637,7 +3637,7 @@
 			intval($uid),
 			dbesc($name));
 		// error message if specified group name already exists
-		if (count($rname) != 0)
+		if (dbm::is_result($rname))
 			$reactivate_group = true;
 
 		// create group
diff --git a/include/auth.php b/include/auth.php
index 2ca9c3efb2..e3c8d92eeb 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -125,8 +125,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
 				$openid = new LightOpenID;
 				$openid->identity = $openid_url;
 				$_SESSION['openid'] = $openid_url;
-				$a = get_app();
-				$openid->returnUrl = $a->get_baseurl(true).'/openid';
+				$openid->returnUrl = App::get_baseurl(true).'/openid';
 				goaway($openid->authUrl());
 			} catch (Exception $e) {
 				notice(t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.').'<br /><br >'.t('The error message was:').' '.$e->getMessage());
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 0c637dc3af..842dbf0b1c 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -144,8 +144,6 @@ function unescape_underscores_in_links($m) {
 
 function format_event_diaspora($ev) {
 
-	$a = get_app();
-
 	if(! ((is_array($ev)) && count($ev)))
 		return '';
 
@@ -160,7 +158,7 @@ function format_event_diaspora($ev) {
 			$ev['start'] , $bd_format ))
 			:  day_translate(datetime_convert('UTC', 'UTC',
 			$ev['start'] , $bd_format)))
-		.  '](' . $a->get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['start'])) . ")\n";
+		.  '](' . App::get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['start'])) . ")\n";
 
 	if(! $ev['nofinish'])
 		$o .= t('Finishes:') . ' ' . '['
@@ -168,7 +166,7 @@ function format_event_diaspora($ev) {
 				$ev['finish'] , $bd_format ))
 				:  day_translate(datetime_convert('UTC', 'UTC',
 				$ev['finish'] , $bd_format )))
-			. '](' . $a->get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['finish'])) . ")\n";
+			. '](' . App::get_baseurl() . '/localtime/?f=&time=' . urlencode(datetime_convert('UTC','UTC',$ev['finish'])) . ")\n";
 
 	if(strlen($ev['location']))
 		$o .= t('Location:') . bb2diaspora($ev['location'])
diff --git a/include/bbcode.php b/include/bbcode.php
index 27213007ce..74dde2fdf4 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -343,7 +343,7 @@ function bb_replace_images($body, $images) {
 	$newbody = $body;
 
 	$cnt = 0;
-	foreach($images as $image) {
+	foreach ($images as $image) {
 		// We're depending on the property of 'foreach' (specified on the PHP website) that
 		// it loops over the array starting from the first element and going sequentially
 		// to the last element
@@ -613,9 +613,7 @@ function GetProfileUsername($profile, $username, $compact = false, $getnetwork =
 }
 
 function bb_DiasporaLinks($match) {
-	$a = get_app();
-
-	return "[url=".$a->get_baseurl()."/display/".$match[1]."]".$match[2]."[/url]";
+	return "[url=".App::get_baseurl()."/display/".$match[1]."]".$match[2]."[/url]";
 }
 
 function bb_RemovePictureLinks($match) {
@@ -894,7 +892,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
 	// we may need to restrict this further if it picks up too many strays
 	// link acct:user@host to a webfinger profile redirector
 
-	$Text = preg_replace('/acct:([^@]+)@((?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63})/', '<a href="' . $a->get_baseurl() . '/acctlink?addr=$1@$2" target="extlink">acct:$1@$2</a>',$Text);
+	$Text = preg_replace('/acct:([^@]+)@((?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63})/', '<a href="' . App::get_baseurl() . '/acctlink?addr=$1@$2" target="extlink">acct:$1@$2</a>',$Text);
 
 	// Perform MAIL Search
 	$Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '<a href="mailto:$1">$1</a>', $Text);
@@ -1063,9 +1061,9 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
 			return(bb_ShareAttributes($match, $simplehtml));
 		},$Text);
 
-	$Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . t('Encrypted content') . '" /><br />', $Text);
-	$Text = preg_replace("/\[crypt(.*?)\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);
-	//$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);
+	$Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'<br/><img src="' .App::get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . t('Encrypted content') . '" /><br />', $Text);
+	$Text = preg_replace("/\[crypt(.*?)\](.*?)\[\/crypt\]/ism",'<br/><img src="' .App::get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);
+	//$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism",'<br/><img src="' .App::get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);
 
 
 	// Try to Oembed
diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index 0790e503ea..ec9dff61d5 100644
--- a/include/contact_selectors.php
+++ b/include/contact_selectors.php
@@ -13,7 +13,7 @@ function contact_profile_assign($current,$foreign_net) {
 			intval($_SESSION['uid']));
 
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			$selected = (($rr['id'] == $current) ? " selected=\"selected\" " : "");
 			$o .= "<option value=\"{$rr['id']}\" $selected >{$rr['profile-name']}</option>\r\n";
 		}
diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index f66d23c518..36675da873 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -80,11 +80,13 @@ function networks_widget($baseurl,$selected = '') {
 
 	$a = get_app();
 
-	if(!local_user())
+	if (!local_user()) {
 		return '';
+	}
 
-	if(!feature_enabled(local_user(),'networks'))
+	if (!feature_enabled(local_user(),'networks')) {
 		return '';
+	}
 
 	$extra_sql = unavailable_networks();
 
@@ -95,9 +97,11 @@ function networks_widget($baseurl,$selected = '') {
 	$nets = array();
 	if (dbm::is_result($r)) {
 		require_once('include/contact_selectors.php');
-		foreach($r as $rr) {
-				if($rr['network'])
-					$nets[] = array('ref' => $rr['network'], 'name' => network_to_name($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' ));
+		foreach ($r as $rr) {
+			/// @TODO If 'network' is not there, this triggers an E_NOTICE
+			if ($rr['network']) {
+				$nets[] = array('ref' => $rr['network'], 'name' => network_to_name($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' ));
+			}
 		}
 	}
 
@@ -116,16 +120,18 @@ function networks_widget($baseurl,$selected = '') {
 }
 
 function fileas_widget($baseurl,$selected = '') {
-	$a = get_app();
-	if(! local_user())
+	if (! local_user()) {
 		return '';
+	}
 
-	if(! feature_enabled(local_user(),'filing'))
+	if (! feature_enabled(local_user(),'filing')) {
 		return '';
+	}
 
 	$saved = get_pconfig(local_user(),'system','filetags');
-	if(! strlen($saved))
+	if (! strlen($saved)) {
 		return;
+	}
 
 	$matches = false;
 	$terms = array();
@@ -235,7 +241,7 @@ function common_friends_visitor_widget($profile_uid) {
 
 	return replace_macros(get_markup_template('remote_friends_common.tpl'), array(
 		'$desc' =>  sprintf( tt("%d contact in common", "%d contacts in common", $t), $t),
-		'$base' => $a->get_baseurl(),
+		'$base' => App::get_baseurl(),
 		'$uid' => $profile_uid,
 		'$cid' => (($cid) ? $cid : '0'),
 		'$linkmore' => (($t > 5) ? 'true' : ''),
diff --git a/include/conversation.php b/include/conversation.php
index 567bf83e1b..36eded8e8a 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -78,7 +78,7 @@ function item_redir_and_replace_images($body, $images, $cid) {
 	$newbody .= $origbody;
 
 	$cnt = 0;
-	foreach($images as $image) {
+	foreach ($images as $image) {
 		// We're depending on the property of 'foreach' (specified on the PHP website) that
 		// it loops over the array starting from the first element and going sequentially
 		// to the last element
@@ -324,11 +324,13 @@ function localize_item(&$item){
 	// add sparkle links to appropriate permalinks
 
 	$x = stristr($item['plink'],'/display/');
-	if($x) {
+	if ($x) {
 		$sparkle = false;
 		$y = best_link_url($item,$sparkle,true);
-		if(strstr($y,'/redir/'))
+
+		if (strstr($y,'/redir/')) {
 			$item['plink'] = $y . '?f=&url=' . $item['plink'];
+		}
 	}
 
 
@@ -864,7 +866,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 	}
 
 	$o = replace_macros($page_template, array(
-		'$baseurl' => $a->get_baseurl($ssl_state),
+		'$baseurl' => App::get_baseurl($ssl_state),
 		'$return_path' => $a->query_string,
 		'$live_update' => $live_update_div,
 		'$remove' => t('remove'),
@@ -1183,7 +1185,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 	$tpl = get_markup_template('jot-header.tpl');
 	$a->page['htmlhead'] .= replace_macros($tpl, array(
 		'$newpost' => 'true',
-		'$baseurl' => $a->get_baseurl(true),
+		'$baseurl' => App::get_baseurl(true),
 		'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 		'$geotag' => $geotag,
 		'$nickname' => $x['nickname'],
@@ -1201,7 +1203,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 	$tpl = get_markup_template('jot-end.tpl');
 	$a->page['end'] .= replace_macros($tpl, array(
 		'$newpost' => 'true',
-		'$baseurl' => $a->get_baseurl(true),
+		'$baseurl' => App::get_baseurl(true),
 		'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 		'$geotag' => $geotag,
 		'$nickname' => $x['nickname'],
@@ -1267,7 +1269,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 		'$ptyp' => (($notes_cid) ? 'note' : 'wall'),
 		'$content' => $x['content'],
 		'$post_id' => $x['post_id'],
-		'$baseurl' => $a->get_baseurl(true),
+		'$baseurl' => App::get_baseurl(true),
 		'$defloc' => $x['default_location'],
 		'$visitor' => $x['visitor'],
 		'$pvisit' => (($notes_cid) ? 'none' : $x['visitor']),
diff --git a/include/cron.php b/include/cron.php
index 77332dcec6..e98239b829 100644
--- a/include/cron.php
+++ b/include/cron.php
@@ -264,7 +264,7 @@ function cron_poll_contacts($argc, $argv) {
 			intval($c['id'])
 		);
 
-		if((! $res) || (! count($res)))
+		if (dbm::is_result($res))
 			continue;
 
 		foreach($res as $contact) {
@@ -343,7 +343,7 @@ function cron_poll_contacts($argc, $argv) {
  *
  * @param App $a
  */
-function cron_clear_cache(&$a) {
+function cron_clear_cache(App &$a) {
 
 	$last = get_config('system','cache_last_cleared');
 
@@ -430,7 +430,7 @@ function cron_clear_cache(&$a) {
  *
  * @param App $a
  */
-function cron_repair_diaspora(&$a) {
+function cron_repair_diaspora(App &$a) {
 	$r = q("SELECT `id`, `url` FROM `contact`
 		WHERE `network` = '%s' AND (`batch` = '' OR `notify` = '' OR `poll` = '' OR pubkey = '')
 			ORDER BY RAND() LIMIT 50", dbesc(NETWORK_DIASPORA));
diff --git a/include/datetime.php b/include/datetime.php
index e88c274ab9..a17c405dc3 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -553,7 +553,7 @@ function update_contact_birthdays() {
 
 	$r = q("SELECT * FROM contact WHERE `bd` != '' AND `bd` != '0000-00-00' AND SUBSTRING(`bd`,1,4) != `bdyear` ");
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 
 			logger('update_contact_birthday: ' . $rr['bd']);
 
diff --git a/include/dbstructure.php b/include/dbstructure.php
index c694014f68..be1158eabe 100644
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -56,11 +56,11 @@ function update_fail($update_id, $error_message){
 	$email_tpl = get_intltext_template("update_fail_eml.tpl");
 	$email_msg = replace_macros($email_tpl, array(
 		'$sitename' => $a->config['sitename'],
-		'$siteurl' =>  $a->get_baseurl(),
+		'$siteurl' =>  App::get_baseurl(),
 		'$update' => DB_UPDATE_VERSION,
 		'$error' => sprintf(t('Update %s failed. See error logs.'), DB_UPDATE_VERSION)
 	));
-	$subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
+	$subject=sprintf(t('Update Error at %s'), App::get_baseurl());
 	require_once('include/email.php');
 	$subject = email_header_encode($subject,'UTF-8');
 	mail($a->config['admin_email'], $subject, $email_msg,
diff --git a/include/delivery.php b/include/delivery.php
index a7aebe709a..db2f03c8f4 100644
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -323,7 +323,7 @@ function delivery_run(&$argv, &$argc){
 
 				// perform local delivery if we are on the same site
 
-				if (link_compare($basepath,$a->get_baseurl())) {
+				if (link_compare($basepath,App::get_baseurl())) {
 
 					$nickname = basename($contact['url']);
 					if ($contact['issued-id'])
diff --git a/include/dfrn.php b/include/dfrn.php
index 6451b8521b..90ff1dfbbf 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -105,8 +105,9 @@ class dfrn {
 			dbesc($owner_nick)
 		);
 
-		if(! dbm::is_result($r))
+		if (! dbm::is_result($r)) {
 			killme();
+		}
 
 		$owner = $r[0];
 		$owner_id = $owner['uid'];
@@ -139,8 +140,9 @@ class dfrn {
 				intval($owner_id)
 			);
 
-			if(! dbm::is_result($r))
+			if (! dbm::is_result($r)) {
 				killme();
+			}
 
 			$contact = $r[0];
 			require_once('include/security.php');
@@ -2353,7 +2355,7 @@ class dfrn {
 						dbesc($xt->id),
 						intval($importer["importer_uid"])
 					);
-					if(count($i)) {
+					if (dbm::is_result($i)) {
 
 						// For tags, the owner cannot remove the tag on the author's copy of the post.
 
diff --git a/include/diaspora.php b/include/diaspora.php
index 3b4832e74f..cfb624fdf2 100644
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -319,8 +319,8 @@ class diaspora {
 			dbesc(NETWORK_DIASPORA),
 			dbesc($msg["author"])
 		);
-		if($r) {
-			foreach($r as $rr) {
+		if ($r) {
+			foreach ($r as $rr) {
 				logger("delivering to: ".$rr["username"]);
 				self::dispatch($rr,$msg);
 			}
@@ -806,7 +806,7 @@ class diaspora {
 			dbesc($guid)
 		);
 
-		if($r) {
+		if ($r) {
 			logger("message ".$guid." already exists for user ".$uid);
 			return $r[0]["id"];
 		}
@@ -1577,7 +1577,7 @@ class diaspora {
 			dbesc($message_uri),
 			intval($importer["uid"])
 		);
-		if($r) {
+		if ($r) {
 			logger("duplicate message already delivered.", LOGGER_DEBUG);
 			return false;
 		}
@@ -2022,7 +2022,7 @@ class diaspora {
 				FROM `item` WHERE `guid` = '%s' AND `visible` AND NOT `deleted` AND `body` != '' LIMIT 1",
 			dbesc($guid));
 
-		if($r) {
+		if ($r) {
 			logger("reshared message ".$guid." already exists on system.");
 
 			// Maybe it is already a reshared item?
@@ -2623,7 +2623,7 @@ class diaspora {
 
 		logger("transmit: ".$logid."-".$guid." returns: ".$return_code);
 
-		if(!$return_code || (($return_code == 503) && (stristr($a->get_curl_headers(), "retry-after")))) {
+		if (!$return_code || (($return_code == 503) && (stristr($a->get_curl_headers(), "retry-after")))) {
 			logger("queue message");
 
 			$r = q("SELECT `id` FROM `queue` WHERE `cid` = %d AND `network` = '%s' AND `content` = '%s' AND `batch` = %d LIMIT 1",
@@ -2632,7 +2632,7 @@ class diaspora {
 				dbesc($slap),
 				intval($public_batch)
 			);
-			if($r) {
+			if ($r) {
 				logger("add_to_queue ignored - identical item already in queue");
 			} else {
 				// queue message for redelivery
diff --git a/include/email.php b/include/email.php
index 2c05d3233f..42f80c2427 100644
--- a/include/email.php
+++ b/include/email.php
@@ -96,15 +96,20 @@ function email_get_msg($mbox,$uid, $reply) {
 		$html = '';
 		foreach($struc->parts as $ptop => $p) {
 			$x = email_get_part($mbox,$uid,$p,$ptop + 1, 'plain');
-			if($x)	$text .= $x;
+			if ($x) {
+				$text .= $x;
+			}
 
 			$x = email_get_part($mbox,$uid,$p,$ptop + 1, 'html');
-			if($x)	$html .= $x;
+			if ($x) {
+				$html .= $x;
+			}
 		}
-		if (trim($html) != '')
+		if (trim($html) != '') {
 			$ret['body'] = html2bbcode($html);
-		else
+		} else {
 			$ret['body'] = $text;
+		}
 	}
 
 	$ret['body'] = removegpg($ret['body']);
@@ -112,8 +117,9 @@ function email_get_msg($mbox,$uid, $reply) {
 	$ret['body'] = $msg['body'];
 	$ret['body'] = convertquote($ret['body'], $reply);
 
-	if (trim($html) != '')
+	if (trim($html) != '') {
 		$ret['body'] = removelinebreak($ret['body']);
+	}
 
 	$ret['body'] = unifyattributionline($ret['body']);
 
@@ -189,8 +195,9 @@ function email_get_part($mbox,$uid,$p,$partno, $subtype) {
 		$x = "";
 		foreach ($p->parts as $partno0=>$p2) {
 			$x .=  email_get_part($mbox,$uid,$p2,$partno . '.' . ($partno0+1), $subtype);  // 1.2, 1.2.1, etc.
-			//if($x)
+			//if ($x) {
 			//	return $x;
+			//}
 		}
 		return $x;
 	}
diff --git a/include/enotify.php b/include/enotify.php
index c6e0506e96..aa29e117a6 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -23,7 +23,7 @@ function notification($params) {
 
 	$banner = t('Friendica Notification');
 	$product = FRIENDICA_PLATFORM;
-	$siteurl = $a->get_baseurl(true);
+	$siteurl = App::get_baseurl(true);
 	$thanks = t('Thank You,');
 	$sitename = $a->config['sitename'];
 	if (!x($a->config['admin_name']))
@@ -58,7 +58,7 @@ function notification($params) {
 	$additional_mail_header .= "X-Friendica-Platform: ".FRIENDICA_PLATFORM."\n";
 	$additional_mail_header .= "X-Friendica-Version: ".FRIENDICA_VERSION."\n";
 	$additional_mail_header .= "List-ID: <notification.".$hostname.">\n";
-	$additional_mail_header .= "List-Archive: <".$a->get_baseurl()."/notifications/system>\n";
+	$additional_mail_header .= "List-Archive: <".App::get_baseurl()."/notifications/system>\n";
 
 	if (array_key_exists('item', $params)) {
 		$title = $params['item']['title'];
@@ -494,7 +494,7 @@ function notification($params) {
 		}
 
 
-		$itemlink = $a->get_baseurl().'/notify/view/'.$notify_id;
+		$itemlink = App::get_baseurl().'/notify/view/'.$notify_id;
 		$msg = replace_macros($epreamble, array('$itemlink' => $itemlink));
 		$msg_cache = format_notification_message($datarray['name_cache'], strip_tags(bbcode($msg)));
 		$r = q("UPDATE `notify` SET `msg` = '%s', `msg_cache` = '%s' WHERE `id` = %d AND `uid` = %d",
@@ -648,8 +648,6 @@ function notification($params) {
  * @param str $defaulttype (Optional) Forces a notification with this type.
  */
 function check_item_notification($itemid, $uid, $defaulttype = "") {
-	$a = get_app();
-
 	$notification_data = array("uid" => $uid, "profiles" => array());
 	call_hooks('check_item_notification', $notification_data);
 
@@ -667,7 +665,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
 	$profiles[] = $owner[0]["url"];
 
 	// Notifications from Diaspora are often with an URL in the Diaspora format
-	$profiles[] = $a->get_baseurl()."/u/".$user[0]["nickname"];
+	$profiles[] = App::get_baseurl()."/u/".$user[0]["nickname"];
 
 	$profiles2 = array();
 
diff --git a/include/event.php b/include/event.php
index 3a41dad4e7..73e61f25cf 100644
--- a/include/event.php
+++ b/include/event.php
@@ -206,7 +206,7 @@ function bbtoevent($s) {
 }
 
 
-function sort_by_date($a) {
+function sort_by_date(App &$a) {
 
 	usort($a,'ev_compare');
 	return $a;
@@ -408,7 +408,7 @@ function event_store($arr) {
 			intval($arr['uid'])
 		);
 		//if (dbm::is_result($r))
-		//	$plink = $a->get_baseurl() . '/display/' . $r[0]['nickname'] . '/' . $item_id;
+		//	$plink = App::get_baseurl() . '/display/' . $r[0]['nickname'] . '/' . $item_id;
 
 
 		if($item_id) {
diff --git a/include/expire.php b/include/expire.php
index eca2b1c42a..e3313a78be 100644
--- a/include/expire.php
+++ b/include/expire.php
@@ -40,7 +40,7 @@ function expire_run(&$argv, &$argc){
 
 	$r = q("SELECT `uid`,`username`,`expire` FROM `user` WHERE `expire` != 0");
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			logger('Expire: ' . $rr['username'] . ' interval: ' . $rr['expire'], LOGGER_DEBUG);
 			item_expire($rr['uid'],$rr['expire']);
 		}
diff --git a/include/follow.php b/include/follow.php
index 7a3514b3a7..15e8dd28d8 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -77,12 +77,12 @@ function new_contact($uid,$url,$interactive = false) {
 
 	$url = str_replace('/#!/','/',$url);
 
-	if(! allowed_url($url)) {
+	if (! allowed_url($url)) {
 		$result['message'] = t('Disallowed profile URL.');
 		return $result;
 	}
 
-	if(! $url) {
+	if (! $url) {
 		$result['message'] = t('Connect URL missing.');
 		return $result;
 	}
@@ -91,17 +91,21 @@ function new_contact($uid,$url,$interactive = false) {
 
 	call_hooks('follow', $arr);
 
-	if(x($arr['contact'],'name'))
+	if (x($arr['contact'],'name')) {
 		$ret = $arr['contact'];
-	else
+	}
+	else {
 		$ret = probe_url($url);
+	}
 
-	if($ret['network'] === NETWORK_DFRN) {
-		if($interactive) {
-			if(strlen($a->path))
-				$myaddr = bin2hex($a->get_baseurl() . '/profile/' . $a->user['nickname']);
-			else
+	if ($ret['network'] === NETWORK_DFRN) {
+		if ($interactive) {
+			if (strlen($a->path)) {
+				$myaddr = bin2hex(App::get_baseurl() . '/profile/' . $a->user['nickname']);
+			}
+			else {
 				$myaddr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname());
+			}
 
 			goaway($ret['request'] . "&addr=$myaddr");
 
@@ -254,7 +258,7 @@ function new_contact($uid,$url,$interactive = false) {
 		intval($uid)
 	);
 
-	if(! dbm::is_result($r)) {
+	if (! dbm::is_result($r)) {
 		$result['message'] .=  t('Unable to retrieve contact information.') . EOL;
 		return $result;
 	}
diff --git a/include/group.php b/include/group.php
index 2c90330686..6332c45da2 100644
--- a/include/group.php
+++ b/include/group.php
@@ -53,7 +53,7 @@ function group_rmv($uid,$name) {
 		$r = q("SELECT def_gid, allow_gid, deny_gid FROM user WHERE uid = %d LIMIT 1",
 		       intval($uid)
 		);
-		if($r) {
+		if ($r) {
 			$user_info = $r[0];
 			$change = false;
 
@@ -143,13 +143,14 @@ function group_add_member($uid,$name,$member,$gid = 0) {
 		return true;	// You might question this, but
 				// we indicate success because the group member was in fact created
 				// -- It was just created at another time
- 	if(! dbm::is_result($r))
+ 	if (! dbm::is_result($r)) {
 		$r = q("INSERT INTO `group_member` (`uid`, `gid`, `contact-id`)
 			VALUES( %d, %d, %d ) ",
 			intval($uid),
 			intval($gid),
 			intval($member)
-	);
+		);
+	}
 	return $r;
 }
 
@@ -198,7 +199,7 @@ function mini_group_select($uid,$gid = 0, $label = "") {
 	);
 	$grps[] = array('name' => '', 'id' => '0', 'selected' => '');
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			$grps[] = array('name' => $rr['name'], 'id' => $rr['id'], 'selected' => (($gid == $rr['id']) ? 'true' : ''));
 		}
 
@@ -233,7 +234,7 @@ function group_side($every="contacts",$each="group",$editmode = "standard", $gro
 
 	$o = '';
 
-	if(! local_user())
+	if (! local_user())
 		return '';
 
 	$groups = array();
@@ -256,7 +257,7 @@ function group_side($every="contacts",$each="group",$editmode = "standard", $gro
 	}
 
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			$selected = (($group_id == $rr['id']) ? ' group-selected' : '');
 
 			if ($editmode == "full") {
diff --git a/include/identity.php b/include/identity.php
index bf05a00516..35516efbea 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -229,13 +229,16 @@ function profile_sidebar($profile, $block = 0) {
 
 	// Is the local user already connected to that user?
 	if ($connect AND local_user()) {
-		if (isset($profile["url"]))
+		if (isset($profile["url"])) {
 			$profile_url = normalise_link($profile["url"]);
-		else
-			$profile_url = normalise_link($a->get_baseurl()."/profile/".$profile["nickname"]);
+		}
+		else {
+			$profile_url = normalise_link(App::get_baseurl()."/profile/".$profile["nickname"]);
+		}
 
 		$r = q("SELECT * FROM `contact` WHERE NOT `pending` AND `uid` = %d AND `nurl` = '%s'",
 			local_user(), $profile_url);
+
 		if (dbm::is_result($r))
 			$connect = false;
 	}
@@ -279,7 +282,7 @@ function profile_sidebar($profile, $block = 0) {
 
 	// show edit profile to yourself
 	if ($profile['uid'] == local_user() && feature_enabled(local_user(),'multi_profiles')) {
-		$profile['edit'] = array($a->get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
+		$profile['edit'] = array(App::get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
 		$r = q("SELECT * FROM `profile` WHERE `uid` = %d",
 				local_user());
 
@@ -291,7 +294,7 @@ function profile_sidebar($profile, $block = 0) {
 
 		if (dbm::is_result($r)) {
 
-			foreach($r as $rr) {
+			foreach ($r as $rr) {
 				$profile['menu']['entries'][] = array(
 					'photo' => $rr['thumb'],
 					'id' => $rr['id'],
@@ -308,7 +311,7 @@ function profile_sidebar($profile, $block = 0) {
 		}
 	}
 	if ($profile['uid'] == local_user() && !feature_enabled(local_user(),'multi_profiles')) {
-		$profile['edit'] = array($a->get_baseurl(). '/profiles/'.$profile['id'], t('Edit profile'),"", t('Edit profile'));
+		$profile['edit'] = array(App::get_baseurl(). '/profiles/'.$profile['id'], t('Edit profile'),"", t('Edit profile'));
 		$profile['menu'] = array(
 			'chg_photo' => t('Change profile photo'),
 			'cr_new' => null,
@@ -349,15 +352,15 @@ function profile_sidebar($profile, $block = 0) {
 	if ($profile['guid'] != "")
 		$diaspora = array(
 			'guid' => $profile['guid'],
-			'podloc' => $a->get_baseurl(),
+			'podloc' => App::get_baseurl(),
 			'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ),
 			'nickname' => $profile['nickname'],
 			'fullname' => $profile['name'],
 			'firstname' => $firstname,
 			'lastname' => $lastname,
-			'photo300' => $a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg',
-			'photo100' => $a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg',
-			'photo50' => $a->get_baseurl() . '/photo/custom/50/'  . $profile['uid'] . '.jpg',
+			'photo300' => App::get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg',
+			'photo100' => App::get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg',
+			'photo50' => App::get_baseurl() . '/photo/custom/50/'  . $profile['uid'] . '.jpg',
 		);
 	else
 		$diaspora = false;
@@ -466,7 +469,7 @@ function get_birthdays() {
 		$cids = array();
 
 		$istoday = false;
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			if(strlen($rr['name']))
 				$total ++;
 			if((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now))
@@ -489,7 +492,7 @@ function get_birthdays() {
 				$url = $rr['url'];
 				if($rr['network'] === NETWORK_DFRN) {
 					$sparkle = " sparkle";
-					$url = $a->get_baseurl() . '/redir/'  . $rr['cid'];
+					$url = App::get_baseurl() . '/redir/'  . $rr['cid'];
 				}
 
 				$rr['link'] = $url;
@@ -503,7 +506,7 @@ function get_birthdays() {
 	}
 	$tpl = get_markup_template("birthdays_reminder.tpl");
 	return replace_macros($tpl, array(
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => App::get_baseurl(),
 		'$classtoday' => $classtoday,
 		'$count' => $total,
 		'$event_reminders' => t('Birthday Reminders'),
@@ -546,7 +549,7 @@ function get_events() {
 	if (dbm::is_result($r)) {
 		$now = strtotime('now');
 		$istoday = false;
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			if(strlen($rr['name']))
 				$total ++;
 
@@ -587,7 +590,7 @@ function get_events() {
 
 	$tpl = get_markup_template("events_reminder.tpl");
 	return replace_macros($tpl, array(
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => App::get_baseurl(),
 		'$classtoday' => $classtoday,
 		'$count' => count($r) - $skip,
 		'$event_reminders' => t('Event Reminders'),
@@ -596,7 +599,7 @@ function get_events() {
 	));
 }
 
-function advanced_profile(&$a) {
+function advanced_profile(App &$a) {
 
 	$o = '';
 	$uid = $a->profile['uid'];
@@ -684,8 +687,9 @@ function advanced_profile(&$a) {
 			$profile['forumlist'] = array( t('Forums:'), ForumManager::profile_advanced($uid));
 		}
 
-		if ($a->profile['uid'] == local_user())
-			$profile['edit'] = array($a->get_baseurl(). '/profiles/'.$a->profile['id'], t('Edit profile'),"", t('Edit profile'));
+		if ($a->profile['uid'] == local_user()) {
+			$profile['edit'] = array(App::get_baseurl(). '/profiles/'.$a->profile['id'], t('Edit profile'),"", t('Edit profile'));
+		}
 
 		return replace_macros($tpl, array(
 			'$title' => t('Profile'),
@@ -707,7 +711,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
 	if(x($_GET,'tab'))
 		$tab = notags(trim($_GET['tab']));
 
-	$url = $a->get_baseurl() . '/profile/' . $nickname;
+	$url = App::get_baseurl() . '/profile/' . $nickname;
 
 	$tabs = array(
 		array(
@@ -728,7 +732,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
 		),
 		array(
 			'label' => t('Photos'),
-			'url'	=> $a->get_baseurl() . '/photos/' . $nickname,
+			'url'	=> App::get_baseurl() . '/photos/' . $nickname,
 			'sel'	=> ((!isset($tab)&&$a->argv[0]=='photos')?'active':''),
 			'title' => t('Photo Albums'),
 			'id' => 'photo-tab',
@@ -736,7 +740,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
 		),
 		array(
 			'label' => t('Videos'),
-			'url'	=> $a->get_baseurl() . '/videos/' . $nickname,
+			'url'	=> App::get_baseurl() . '/videos/' . $nickname,
 			'sel'	=> ((!isset($tab)&&$a->argv[0]=='videos')?'active':''),
 			'title' => t('Videos'),
 			'id' => 'video-tab',
@@ -748,7 +752,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
 	if ($is_owner && $a->theme_events_in_profile) {
 			$tabs[] = array(
 				'label' => t('Events'),
-				'url'	=> $a->get_baseurl() . '/events',
+				'url'	=> App::get_baseurl() . '/events',
 				'sel' 	=>((!isset($tab)&&$a->argv[0]=='events')?'active':''),
 				'title' => t('Events and Calendar'),
 				'id' => 'events-tab',
@@ -759,7 +763,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
 	} elseif (! $is_owner) {
 		$tabs[] = array(
 				'label' => t('Events'),
-				'url'	=> $a->get_baseurl() . '/cal/' . $nickname,
+				'url'	=> App::get_baseurl() . '/cal/' . $nickname,
 				'sel' 	=>((!isset($tab)&&$a->argv[0]=='cal')?'active':''),
 				'title' => t('Events and Calendar'),
 				'id' => 'events-tab',
@@ -770,7 +774,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
 	if ($is_owner){
 		$tabs[] = array(
 			'label' => t('Personal Notes'),
-			'url'	=> $a->get_baseurl() . '/notes',
+			'url'	=> App::get_baseurl() . '/notes',
 			'sel' 	=>((!isset($tab)&&$a->argv[0]=='notes')?'active':''),
 			'title' => t('Only You Can See This'),
 			'id' => 'notes-tab',
@@ -781,7 +785,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
 	if ((! $is_owner) && ((count($a->profile)) || (! $a->profile['hide-friends']))) {
 		$tabs[] = array(
 			'label' => t('Contacts'),
-			'url'	=> $a->get_baseurl() . '/viewcontacts/' . $nickname,
+			'url'	=> App::get_baseurl() . '/viewcontacts/' . $nickname,
 			'sel'	=> ((!isset($tab)&&$a->argv[0]=='viewcontacts')?'active':''),
 			'title' => t('Contacts'),
 			'id' => 'viewcontacts-tab',
@@ -803,7 +807,7 @@ function get_my_url() {
 	return false;
 }
 
-function zrl_init(&$a) {
+function zrl_init(App &$a) {
 	$tmp_str = get_my_url();
 	if(validate_url($tmp_str)) {
 
diff --git a/include/items.php b/include/items.php
index da9147fadd..c75bc768c2 100644
--- a/include/items.php
+++ b/include/items.php
@@ -208,13 +208,12 @@ function add_page_info_data($data) {
 
 	$hashtags = "";
 	if (isset($data["keywords"]) AND count($data["keywords"])) {
-		$a = get_app();
 		$hashtags = "\n";
 		foreach ($data["keywords"] AS $keyword) {
 			/// @todo make a positive list of allowed characters
 			$hashtag = str_replace(array(" ", "+", "/", ".", "#", "'", "’", "`", "(", ")", "„", "“"),
 						array("","", "", "", "", "", "", "", "", "", "", ""), $keyword);
-			$hashtags .= "#[url=".$a->get_baseurl()."/search?tag=".rawurlencode($hashtag)."]".$hashtag."[/url] ";
+			$hashtags .= "#[url=".App::get_baseurl()."/search?tag=".rawurlencode($hashtag)."]".$hashtag."[/url] ";
 		}
 	}
 
@@ -251,7 +250,6 @@ function add_page_keywords($url, $no_photos = false, $photo = "", $keywords = fa
 
 	$tags = "";
 	if (isset($data["keywords"]) AND count($data["keywords"])) {
-		$a = get_app();
 		foreach ($data["keywords"] AS $keyword) {
 			$hashtag = str_replace(array(" ", "+", "/", ".", "#", "'"),
 						array("","", "", "", "", ""), $keyword);
@@ -259,7 +257,7 @@ function add_page_keywords($url, $no_photos = false, $photo = "", $keywords = fa
 			if ($tags != "")
 				$tags .= ",";
 
-			$tags .= "#[url=".$a->get_baseurl()."/search?tag=".rawurlencode($hashtag)."]".$hashtag."[/url]";
+			$tags .= "#[url=".App::get_baseurl()."/search?tag=".rawurlencode($hashtag)."]".$hashtag."[/url]";
 		}
 	}
 
@@ -557,8 +555,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 		logger("Both author-link and owner-link are empty. Called by: ".App::callstack(), LOGGER_DEBUG);
 
 	if ($arr['plink'] == "") {
-		$a = get_app();
-		$arr['plink'] = $a->get_baseurl().'/display/'.urlencode($arr['guid']);
+		$arr['plink'] = App::get_baseurl().'/display/'.urlencode($arr['guid']);
 	}
 
 	if ($arr['network'] == "") {
@@ -707,9 +704,9 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 			// If its a post from myself then tag the thread as "mention"
 			logger("item_store: Checking if parent ".$parent_id." has to be tagged as mention for user ".$arr['uid'], LOGGER_DEBUG);
 			$u = q("SELECT `nickname` FROM `user` WHERE `uid` = %d", intval($arr['uid']));
-			if (count($u)) {
+			if (dbm::is_result($u)) {
 				$a = get_app();
-				$self = normalise_link($a->get_baseurl() . '/profile/' . $u[0]['nickname']);
+				$self = normalise_link(App::get_baseurl() . '/profile/' . $u[0]['nickname']);
 				logger("item_store: 'myself' is ".$self." for parent ".$parent_id." checking against ".$arr['author-link']." and ".$arr['owner-link'], LOGGER_DEBUG);
 				if ((normalise_link($arr['author-link']) == $self) OR (normalise_link($arr['owner-link']) == $self)) {
 					q("UPDATE `thread` SET `mention` = 1 WHERE `iid` = %d", intval($parent_id));
@@ -956,8 +953,8 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 	// in it.
 	if (!$deleted AND !$dontcache) {
 
-		$r = q('SELECT * FROM `item` WHERE id = %d', intval($current_post));
-		if (count($r) == 1) {
+		$r = q('SELECT * FROM `item` WHERE `id` = %d', intval($current_post));
+		if ((dbm::is_result($r)) && (count($r) == 1)) {
 			if ($notify)
 				call_hooks('post_local_end', $r[0]);
 			else
@@ -1068,10 +1065,10 @@ function item_body_set_hashtags(&$item) {
 
 	// All hashtags should point to the home server
 	//$item["body"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
-	//		"#[url=".$a->get_baseurl()."/search?tag=$2]$2[/url]", $item["body"]);
+	//		"#[url=".App::get_baseurl()."/search?tag=$2]$2[/url]", $item["body"]);
 
 	//$item["tag"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
-	//		"#[url=".$a->get_baseurl()."/search?tag=$2]$2[/url]", $item["tag"]);
+	//		"#[url=".App::get_baseurl()."/search?tag=$2]$2[/url]", $item["tag"]);
 
 	// mask hashtags inside of url, bookmarks and attachments to avoid urls in urls
 	$item["body"] = preg_replace_callback("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
@@ -1103,7 +1100,7 @@ function item_body_set_hashtags(&$item) {
 
 		$basetag = str_replace('_',' ',substr($tag,1));
 
-		$newtag = '#[url='.$a->get_baseurl().'/search?tag='.rawurlencode($basetag).']'.$basetag.'[/url]';
+		$newtag = '#[url='.App::get_baseurl().'/search?tag='.rawurlencode($basetag).']'.$basetag.'[/url]';
 
 		$item["body"] = str_replace($tag, $newtag, $item["body"]);
 
@@ -1191,28 +1188,31 @@ function tag_deliver($uid,$item_id) {
 	$u = q("select * from user where uid = %d limit 1",
 		intval($uid)
 	);
-	if (! count($u))
+
+	if (! dbm::is_result($u)) {
 		return;
+	}
 
 	$community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
 	$prvgroup = (($u[0]['page-flags'] == PAGE_PRVGROUP) ? true : false);
 
 
-	$i = q("select * from item where id = %d and uid = %d limit 1",
+	$i = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 		intval($item_id),
 		intval($uid)
 	);
-	if (! count($i))
+	if (! dbm::is_result($i)) {
 		return;
+	}
 
 	$item = $i[0];
 
-	$link = normalise_link($a->get_baseurl() . '/profile/' . $u[0]['nickname']);
+	$link = normalise_link(App::get_baseurl() . '/profile/' . $u[0]['nickname']);
 
 	// Diaspora uses their own hardwired link URL in @-tags
 	// instead of the one we supply with webfinger
 
-	$dlink = normalise_link($a->get_baseurl() . '/u/' . $u[0]['nickname']);
+	$dlink = normalise_link(App::get_baseurl() . '/u/' . $u[0]['nickname']);
 
 	$cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER);
 	if ($cnt) {
@@ -1301,23 +1301,24 @@ function tgroup_check($uid,$item) {
 	if (($item['wall']) || ($item['origin']) || ($item['uri'] != $item['parent-uri']))
 		return false;
 
-
-	$u = q("select * from user where uid = %d limit 1",
+	/// @TODO Encapsulate this or find it encapsulated and replace all occurrances
+	$u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
 		intval($uid)
 	);
-	if (! count($u))
+	if (! dbm::is_result($u)) {
 		return false;
+	}
 
 	$community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
 	$prvgroup = (($u[0]['page-flags'] == PAGE_PRVGROUP) ? true : false);
 
 
-	$link = normalise_link($a->get_baseurl() . '/profile/' . $u[0]['nickname']);
+	$link = normalise_link(App::get_baseurl() . '/profile/' . $u[0]['nickname']);
 
 	// Diaspora uses their own hardwired link URL in @-tags
 	// instead of the one we supply with webfinger
 
-	$dlink = normalise_link($a->get_baseurl() . '/u/' . $u[0]['nickname']);
+	$dlink = normalise_link(App::get_baseurl() . '/u/' . $u[0]['nickname']);
 
 	$cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER);
 	if ($cnt) {
@@ -1572,7 +1573,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
 					'to_name'      => $r[0]['username'],
 					'to_email'     => $r[0]['email'],
 					'uid'          => $r[0]['uid'],
-					'link'		   => $a->get_baseurl() . '/notifications/intro',
+					'link'		   => App::get_baseurl() . '/notifications/intro',
 					'source_name'  => ((strlen(stripslashes($contact_record['name']))) ? stripslashes($contact_record['name']) : t('[Name Withheld]')),
 					'source_link'  => $contact_record['url'],
 					'source_photo' => $contact_record['photo'],
@@ -1665,7 +1666,7 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
 	$a = get_app();
 
 	logger('fix_private_photos: check for photos', LOGGER_DEBUG);
-	$site = substr($a->get_baseurl(),strpos($a->get_baseurl(),'://'));
+	$site = substr(App::get_baseurl(),strpos(App::get_baseurl(),'://'));
 
 	$orig_body = $s;
 	$new_body = '';
@@ -1929,7 +1930,7 @@ function drop_item($id,$interactive = true) {
 		if (! $interactive)
 			return 0;
 		notice( t('Item not found.') . EOL);
-		goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
+		goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
 	}
 
 	$item = $r[0];
@@ -1977,7 +1978,7 @@ function drop_item($id,$interactive = true) {
 		}
 		// Now check how the user responded to the confirmation query
 		if ($_REQUEST['canceled']) {
-			goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
+			goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
 		}
 
 		logger('delete item: ' . $item['id'], LOGGER_DEBUG);
@@ -2127,13 +2128,13 @@ function drop_item($id,$interactive = true) {
 
 		if (! $interactive)
 			return $owner;
-		goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
+		goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
 		//NOTREACHED
 	} else {
 		if (! $interactive)
 			return 0;
 		notice( t('Permission denied.') . EOL);
-		goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
+		goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
 		//NOTREACHED
 	}
 
@@ -2230,7 +2231,7 @@ function posted_date_widget($url,$uid,$wall) {
 
 	$ret = list_post_dates($uid,$wall);
 
-	if (! count($ret))
+	if (! dbm::is_result($ret))
 		return $o;
 
 	$cutoff_year = intval(datetime_convert('',date_default_timezone_get(),'now','Y')) - $visible_years;
diff --git a/include/like.php b/include/like.php
index e997e05d6b..94ff33a699 100644
--- a/include/like.php
+++ b/include/like.php
@@ -66,7 +66,7 @@ function do_like($item_id, $verb) {
 
 	$owner_uid = $item['uid'];
 
-	if(! can_write_wall($a,$owner_uid)) {
+	if (! can_write_wall($a,$owner_uid)) {
 		return false;
 	}
 
@@ -78,10 +78,12 @@ function do_like($item_id, $verb) {
 			intval($item['contact-id']),
 			intval($item['uid'])
 		);
-		if(! dbm::is_result($r))
+		if (! dbm::is_result($r)) {
 			return false;
-		if(! $r[0]['self'])
+		}
+		if (! $r[0]['self']) {
 			$remote_owner = $r[0];
+		}
 	}
 
 	// this represents the post owner on this system.
@@ -90,21 +92,22 @@ function do_like($item_id, $verb) {
 		WHERE `contact`.`self` = 1 AND `contact`.`uid` = %d LIMIT 1",
 		intval($owner_uid)
 	);
-	if (dbm::is_result($r))
+	if (dbm::is_result($r)) {
 		$owner = $r[0];
+	}
 
-	if(! $owner) {
+	if (! $owner) {
 		logger('like: no owner');
 		return false;
 	}
 
-	if(! $remote_owner)
+	if (! $remote_owner) {
 		$remote_owner = $owner;
-
+	}
 
 	// This represents the person posting
 
-	if((local_user()) && (local_user() == $owner_uid)) {
+	if ((local_user()) && (local_user() == $owner_uid)) {
 		$contact = $owner;
 	}
 	else {
@@ -115,7 +118,7 @@ function do_like($item_id, $verb) {
 		if (dbm::is_result($r))
 			$contact = $r[0];
 	}
-	if(! $contact) {
+	if (! $contact) {
 		return false;
 	}
 
@@ -124,7 +127,7 @@ function do_like($item_id, $verb) {
 
 	// event participation are essentially radio toggles. If you make a subsequent choice,
 	// we need to eradicate your first choice.
-	if($activity === ACTIVITY_ATTEND || $activity === ACTIVITY_ATTENDNO || $activity === ACTIVITY_ATTENDMAYBE) {
+	if ($activity === ACTIVITY_ATTEND || $activity === ACTIVITY_ATTENDNO || $activity === ACTIVITY_ATTENDMAYBE) {
 		$verbs = " '" . dbesc(ACTIVITY_ATTEND) . "','" . dbesc(ACTIVITY_ATTENDNO) . "','" . dbesc(ACTIVITY_ATTENDMAYBE) . "' ";
 	}
 
@@ -161,10 +164,11 @@ function do_like($item_id, $verb) {
 	$uri = item_new_uri($a->get_hostname(),$owner_uid);
 
 	$post_type = (($item['resource-id']) ? t('photo') : t('status'));
-	if($item['object-type'] === ACTIVITY_OBJ_EVENT)
+	if ($item['object-type'] === ACTIVITY_OBJ_EVENT) {
 		$post_type = t('event');
+	}
 	$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
-	$link = xmlify('<link rel="alternate" type="text/html" href="' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
+	$link = xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
 	$body = $item['body'];
 
 	$obj = <<< EOT
@@ -178,20 +182,31 @@ function do_like($item_id, $verb) {
 		<content>$body</content>
 	</object>
 EOT;
-	if($verb === 'like')
+	if ($verb === 'like') {
 		$bodyverb = t('%1$s likes %2$s\'s %3$s');
-	if($verb === 'dislike')
+	}
+	if ($verb === 'dislike') {
 		$bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
-	if($verb === 'attendyes')
+	}
+	if ($verb === 'attendyes') {
 		$bodyverb = t('%1$s is attending %2$s\'s %3$s');
-	if($verb === 'attendno')
+	}
+	if ($verb === 'attendno') {
 		$bodyverb = t('%1$s is not attending %2$s\'s %3$s');
-	if($verb === 'attendmaybe')
+	}
+	if ($verb === 'attendmaybe') {
 		$bodyverb = t('%1$s may attend %2$s\'s %3$s');
+	}
 
-	if(! isset($bodyverb))
-			return false;
+	if (! isset($bodyverb)) {
+		return false;
+	}
+
+	$ulink = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
+	$alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
+	$plink = '[url=' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
 
+	/// @TODO Or rewrite this to multi-line initialization of the array?
 	$arr = array();
 
 	$arr['guid'] = get_guid(32);
@@ -211,12 +226,7 @@ EOT;
 	$arr['author-name'] = $contact['name'];
 	$arr['author-link'] = $contact['url'];
 	$arr['author-avatar'] = $contact['thumb'];
-
-	$ulink = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
-	$alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
-	$plink = '[url=' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
 	$arr['body'] =  sprintf( $bodyverb, $ulink, $alink, $plink );
-
 	$arr['verb'] = $activity;
 	$arr['object-type'] = $objtype;
 	$arr['object'] = $obj;
@@ -230,7 +240,7 @@ EOT;
 
 	$post_id = item_store($arr);
 
-	if(! $item['visible']) {
+	if (! $item['visible']) {
 		$r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d AND `uid` = %d",
 			intval($item['id']),
 			intval($owner_uid)
diff --git a/include/lock.php b/include/lock.php
index 0c7b6acaa4..b3d488a357 100644
--- a/include/lock.php
+++ b/include/lock.php
@@ -23,7 +23,8 @@ function lock_function($fn_name, $block = true, $wait_sec = 2, $timeout = 30) {
 			);
 			$got_lock = true;
 		}
-		elseif(! dbm::is_result($r)) { // the Boolean value for count($r) should be equivalent to the Boolean value of $r
+		elseif (! dbm::is_result($r)) {
+			/// @TODO the Boolean value for count($r) should be equivalent to the Boolean value of $r
 			q("INSERT INTO `locks` (`name`, `created`, `locked`) VALUES ('%s', '%s', 1)",
 				dbesc($fn_name),
 				dbesc(datetime_convert())
diff --git a/include/message.php b/include/message.php
index ea2fcef3bc..3d5d4d33ab 100644
--- a/include/message.php
+++ b/include/message.php
@@ -27,7 +27,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 	}
 
 	$guid = get_guid(32);
- 	$uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . local_user() . ':' . $guid;
+ 	$uri = 'urn:X-dfrn:' . App::get_baseurl() . ':' . local_user() . ':' . $guid;
 
 	$convid = 0;
 	$reply = false;
@@ -53,7 +53,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 		$recip_host = substr($recip_host,0,strpos($recip_host,'/'));
 
 		$recip_handle = (($contact[0]['addr']) ? $contact[0]['addr'] : $contact[0]['nick'] . '@' . $recip_host);
-		$sender_handle = $a->user['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
+		$sender_handle = $a->user['nickname'] . '@' . substr(App::get_baseurl(), strpos(App::get_baseurl(),'://') + 3);
 
 		$conv_guid = get_guid(32);
 		$convuri = $recip_handle.':'.$conv_guid;
@@ -130,12 +130,13 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 
 	$match = null;
 
-	if(preg_match_all("/\[img\](.*?)\[\/img\]/",$body,$match)) {
+	if (preg_match_all("/\[img\](.*?)\[\/img\]/",$body,$match)) {
 		$images = $match[1];
-		if(count($images)) {
-			foreach($images as $image) {
-				if(! stristr($image,$a->get_baseurl() . '/photo/'))
+		if (count($images)) {
+			foreach ($images as $image) {
+				if (! stristr($image,App::get_baseurl() . '/photo/')) {
 					continue;
+				}
 				$image_uri = substr($image,strrpos($image,'/') + 1);
 				$image_uri = substr($image_uri,0, strpos($image_uri,'-'));
 				$r = q("UPDATE `photo` SET `allow_cid` = '%s'
@@ -149,7 +150,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 		}
 	}
 
-	if($post_id) {
+	if ($post_id) {
 		proc_run(PRIORITY_HIGH, "include/notifier.php", "mail", $post_id);
 		return intval($post_id);
 	} else {
@@ -158,22 +159,18 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 
 }
 
-
-
-
-
 function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
 
-	$a = get_app();
-
-
-	if(! $recipient) return -1;
+	if (! $recipient) {
+		return -1;
+	}
 
-	if(! strlen($subject))
+	if (! strlen($subject)) {
 		$subject = t('[no subject]');
+	}
 
 	$guid = get_guid(32);
- 	$uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . local_user() . ':' . $guid;
+ 	$uri = 'urn:X-dfrn:' . App::get_baseurl() . ':' . local_user() . ':' . $guid;
 
 	$convid = 0;
 	$reply = false;
@@ -182,12 +179,13 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
 
 	$me = probe_url($replyto);
 
-	if(! $me['name'])
+	if (! $me['name']) {
 		return -2;
+	}
 
 	$conv_guid = get_guid(32);
 
-	$recip_handle = $recipient['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
+	$recip_handle = $recipient['nickname'] . '@' . substr(App::get_baseurl(), strpos(App::get_baseurl(),'://') + 3);
 
 	$sender_nick = basename($replyto);
 	$sender_host = substr($replyto,strpos($replyto,'://')+3);
@@ -196,7 +194,7 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
 
 	$handles = $recip_handle . ';' . $sender_handle;
 
-	$r = q("insert into conv (uid,guid,creator,created,updated,subject,recips) values(%d, '%s', '%s', '%s', '%s', '%s', '%s') ",
+	$r = q("INSERT INTO `conv` (`uid`,`guid`,`creator`,`created`,`updated`,`subject`,`recips`) values(%d, '%s', '%s', '%s', '%s', '%s', '%s') ",
 		intval($recipient['uid']),
 		dbesc($conv_guid),
 		dbesc($sender_handle),
@@ -206,18 +204,19 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
 		dbesc($handles)
 	);
 
-	$r = q("select * from conv where guid = '%s' and uid = %d limit 1",
+	$r = q("SELECT * FROM `conv` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
 		dbesc($conv_guid),
 		intval($recipient['uid'])
 	);
-	if (dbm::is_result($r))
-		$convid = $r[0]['id'];
 
-	if(! $convid) {
+
+	if (! dbm::is_result($r)) {
 		logger('send message: conversation not found.');
 		return -4;
 	}
 
+	$convid = $r[0]['id'];
+
 	$r = q("INSERT INTO `mail` ( `uid`, `guid`, `convid`, `from-name`, `from-photo`, `from-url`,
 		`contact-id`, `title`, `body`, `seen`, `reply`, `replied`, `uri`, `parent-uri`, `created`, `unknown`)
 		VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, %d, '%s', '%s', '%s', %d )",
diff --git a/include/nav.php b/include/nav.php
index 2a9f24ca9f..bd933929d3 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -1,6 +1,6 @@
 <?php
 
-function nav(&$a) {
+function nav(App &$a) {
 
 	/*
 	 *
@@ -28,7 +28,7 @@ function nav(&$a) {
 	$tpl = get_markup_template('nav.tpl');
 
 	$a->page['nav'] .= replace_macros($tpl, array(
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => App::get_baseurl(),
 		'$sitelocation' => $nav_info['sitelocation'],
 		'$nav' => $nav_info['nav'],
 		'$banner' => $nav_info['banner'],
@@ -65,7 +65,7 @@ function nav_info(App $a)
 
 	$myident = ((is_array($a->user) && isset($a->user['nickname'])) ? $a->user['nickname'] . '@' : '');
 
-	$sitelocation = $myident . substr($a->get_baseurl($ssl_state), strpos($a->get_baseurl($ssl_state), '//') + 2 );
+	$sitelocation = $myident . substr(App::get_baseurl($ssl_state), strpos(App::get_baseurl($ssl_state), '//') + 2 );
 
 	// nav links: array of array('href', 'text', 'extra css classes', 'title')
 	$nav = array();
diff --git a/include/network.php b/include/network.php
index df46d35932..7a662e4cbf 100644
--- a/include/network.php
+++ b/include/network.php
@@ -513,8 +513,6 @@ function allowed_email($email) {
 
 function avatar_img($email) {
 
-	$a = get_app();
-
 	$avatar['size'] = 175;
 	$avatar['email'] = $email;
 	$avatar['url'] = '';
@@ -522,8 +520,9 @@ function avatar_img($email) {
 
 	call_hooks('avatar_lookup', $avatar);
 
-	if(! $avatar['success'])
-		$avatar['url'] = $a->get_baseurl() . '/images/person-175.jpg';
+	if (! $avatar['success']) {
+		$avatar['url'] = App::get_baseurl() . '/images/person-175.jpg';
+	}
 
 	logger('Avatar: ' . $avatar['email'] . ' ' . $avatar['url'], LOGGER_DEBUG);
 	return $avatar['url'];
@@ -569,7 +568,7 @@ function scale_external_images($srctext, $include_link = true, $scale_replace =
 		foreach($matches as $mtch) {
 			logger('scale_external_image: ' . $mtch[1]);
 
-			$hostname = str_replace('www.','',substr($a->get_baseurl(),strpos($a->get_baseurl(),'://')+3));
+			$hostname = str_replace('www.','',substr(App::get_baseurl(),strpos(App::get_baseurl(),'://')+3));
 			if(stristr($mtch[1],$hostname))
 				continue;
 
diff --git a/include/notifier.php b/include/notifier.php
index 7221fa376d..72387c98db 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -210,8 +210,9 @@ function notifier_run(&$argv, &$argc){
 		intval($uid)
 	);
 
-	if(! dbm::is_result($r))
+	if (! dbm::is_result($r)) {
 		return;
+	}
 
 	$owner = $r[0];
 
@@ -557,7 +558,7 @@ function notifier_run(&$argv, &$argc){
 	if($slap && count($url_recipients) && ($public_message || $push_notify) && $normal_mode) {
 		if(!get_config('system','dfrn_only')) {
 			foreach($url_recipients as $url) {
-				if($url) {
+				if ($url) {
 					logger('notifier: urldelivery: ' . $url);
 					$deliver_status = slapper($owner,$url,$slap);
 					/// @TODO Redeliver/queue these items on failure, though there is no contact record
@@ -597,7 +598,7 @@ function notifier_run(&$argv, &$argc){
 
 			// throw everything into the queue in case we get killed
 
-			foreach($r as $rr) {
+			foreach ($r as $rr) {
 				if((! $mail) && (! $fsuggest) && (! $followup)) {
 					q("INSERT INTO `deliverq` (`cmd`,`item`,`contact`) VALUES ('%s', %d, %d)
 						ON DUPLICATE KEY UPDATE `cmd` = '%s', `item` = %d, `contact` = %d",
@@ -607,7 +608,7 @@ function notifier_run(&$argv, &$argc){
 				}
 			}
 
-			foreach($r as $rr) {
+			foreach ($r as $rr) {
 
 				// except for Diaspora batch jobs
 				// Don't deliver to folks who have already been delivered to
@@ -649,7 +650,7 @@ function notifier_run(&$argv, &$argc){
 
 				} else {
 
-					$params = 'hub.mode=publish&hub.url=' . urlencode( $a->get_baseurl() . '/dfrn_poll/' . $owner['nickname'] );
+					$params = 'hub.mode=publish&hub.url=' . urlencode( App::get_baseurl() . '/dfrn_poll/' . $owner['nickname'] );
 					post_url($h,$params);
 					logger('publish for item '.$item_id.' ' . $h . ' ' . $params . ' returned ' . $a->get_curl_code());
 				}
diff --git a/include/oauth.php b/include/oauth.php
index a30232df4a..3d4533d3e0 100644
--- a/include/oauth.php
+++ b/include/oauth.php
@@ -148,7 +148,7 @@ class FKOAuth1 extends OAuthServer {
 		$_SESSION['mobile-theme'] = get_pconfig($record['uid'], 'system', 'mobile_theme');
 		$_SESSION['authenticated'] = 1;
 		$_SESSION['page_flags'] = $record['page-flags'];
-		$_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $record['nickname'];
+		$_SESSION['my_url'] = App::get_baseurl() . '/profile/' . $record['nickname'];
 		$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
 		$_SESSION["allow_api"] = true;
 
diff --git a/include/onepoll.php b/include/onepoll.php
index 2834036665..d92cb915b6 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -143,8 +143,9 @@ function onepoll_run(&$argv, &$argc){
 	$r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` INNER JOIN `user` on `contact`.`uid` = `user`.`uid` WHERE `user`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1",
 		intval($importer_uid)
 	);
-	if(! dbm::is_result($r))
+	if (! dbm::is_result($r)) {
 		return;
+	}
 
 	$importer = $r[0];
 
diff --git a/include/plugin.php b/include/plugin.php
index 487ab57515..0b9c0166aa 100644
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -129,7 +129,7 @@ function reload_plugins() {
  */
 function plugin_enabled($plugin) {
 	$r = q("SELECT * FROM `addon` WHERE `installed` = 1 AND `name` = '%s'", $plugin);
-	return((bool)(count($r) > 0));
+	return ((dbm::is_result($r)) && (count($r) > 0));
 }
 
 
@@ -187,8 +187,9 @@ function load_hooks() {
 	$a = get_app();
 	$a->hooks = array();
 	$r = q("SELECT * FROM `hook` WHERE 1 ORDER BY `priority` DESC, `file`");
+
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			if(! array_key_exists($rr['hook'],$a->hooks))
 				$a->hooks[$rr['hook']] = array();
 			$a->hooks[$rr['hook']][] = array($rr['file'],$rr['function']);
@@ -410,13 +411,13 @@ function get_theme_info($theme){
  * @return string
  */
 function get_theme_screenshot($theme) {
-	$a = get_app();
 	$exts = array('.png','.jpg');
 	foreach($exts as $ext) {
-		if(file_exists('view/theme/' . $theme . '/screenshot' . $ext))
-			return($a->get_baseurl() . '/view/theme/' . $theme . '/screenshot' . $ext);
+		if(file_exists('view/theme/' . $theme . '/screenshot' . $ext)) {
+			return(App::get_baseurl() . '/view/theme/' . $theme . '/screenshot' . $ext);
+		}
 	}
-	return($a->get_baseurl() . '/images/blank.png');
+	return(App::get_baseurl() . '/images/blank.png');
 }
 
 // install and uninstall theme
diff --git a/include/poller.php b/include/poller.php
index 44f4895cdb..b631d2acd1 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -213,7 +213,7 @@ function poller_max_connections_reached() {
 	// The processlist only shows entries of the current user
 	if ($max != 0) {
 		$r = q("SHOW PROCESSLIST");
-		if (!$r)
+		if (!dbm::is_result($r))
 			return false;
 
 		$used = count($r);
@@ -484,7 +484,7 @@ function call_worker() {
 		return;
 	}
 
-	$url = get_app()->get_baseurl()."/worker";
+	$url = App::get_baseurl()."/worker";
 	fetch_url($url, false, $redirects, 1);
 }
 
diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php
index 85637facb2..6bd90bfc21 100644
--- a/include/pubsubpublish.php
+++ b/include/pubsubpublish.php
@@ -21,7 +21,7 @@ function handle_pubsubhubbub($id) {
 
 	$headers = array("Content-type: application/atom+xml",
 			sprintf("Link: <%s>;rel=hub,<%s>;rel=self",
-				$a->get_baseurl().'/pubsubhubbub',
+				App::get_baseurl().'/pubsubhubbub',
 				$rr['topic']),
 			"X-Hub-Signature: sha1=".$hmac_sig);
 
@@ -76,16 +76,19 @@ function pubsubpublish_run(&$argv, &$argc){
 	load_config('system');
 
 	// Don't check this stuff if the function is called by the poller
-	if (App::callstack() != "poller_run")
-		if (App::is_already_running("pubsubpublish", "include/pubsubpublish.php", 540))
+	if (App::callstack() != "poller_run") {
+		if (App::is_already_running("pubsubpublish", "include/pubsubpublish.php", 540)) {
 			return;
+		}
+	}
 
 	$a->set_baseurl(get_config('system','url'));
 
 	load_hooks();
 
-	if($argc > 1)
+	if ($argc > 1) {
 		$pubsubpublish_id = intval($argv[1]);
+	}
 	else {
 		// We'll push to each subscriber that has push > 0,
 		// i.e. there has been an update (set in notifier.php).
@@ -95,10 +98,11 @@ function pubsubpublish_run(&$argv, &$argc){
 		$interval = Config::get("system", "delivery_interval", 2);
 
 		// If we are using the worker we don't need a delivery interval
-		if (get_config("system", "worker"))
+		if (get_config("system", "worker")) {
 			$interval = false;
+		}
 
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			logger("Publish feed to ".$rr["callback_url"], LOGGER_DEBUG);
 			proc_run(PRIORITY_HIGH, 'include/pubsubpublish.php', $rr["id"]);
 
diff --git a/include/queue.php b/include/queue.php
index ad7079e959..2ef97fecd4 100644
--- a/include/queue.php
+++ b/include/queue.php
@@ -58,20 +58,21 @@ function queue_run(&$argv, &$argc){
 			$interval = false;
 
 		$r = q("select * from deliverq where 1");
-		if($r) {
-			foreach($r as $rr) {
+		if ($r) {
+			foreach ($r as $rr) {
 				logger('queue: deliverq');
 				proc_run(PRIORITY_HIGH,'include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']);
-				if($interval)
-				@time_sleep_until(microtime(true) + (float) $interval);
+				if($interval) {
+					time_sleep_until(microtime(true) + (float) $interval);
+				}
 			}
 		}
 
 		$r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue`
 			INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id`
 			WHERE `queue`.`created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
-		if($r) {
-			foreach($r as $rr) {
+		if ($r) {
+			foreach ($r as $rr) {
 				logger('Removing expired queue item for ' . $rr['name'] . ', uid=' . $rr['uid']);
 				logger('Expired queue data :' . $rr['content'], LOGGER_DATA);
 			}
@@ -126,7 +127,7 @@ function queue_run(&$argv, &$argc){
 		$c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
 			intval($qi[0]['cid'])
 		);
-		if(! count($c)) {
+		if (! dbm::is_result($c)) {
 			remove_queue_item($q_item['id']);
 			continue;
 		}
@@ -156,7 +157,7 @@ function queue_run(&$argv, &$argc){
 			FROM `user` WHERE `uid` = %d LIMIT 1",
 			intval($c[0]['uid'])
 		);
-		if(! count($u)) {
+		if (! dbm::is_result($u)) {
 			remove_queue_item($q_item['id']);
 			continue;
 		}
diff --git a/include/redir.php b/include/redir.php
index 8d8a035f1d..d8bb764396 100644
--- a/include/redir.php
+++ b/include/redir.php
@@ -20,7 +20,7 @@ function auto_redir(&$a, $contact_nick) {
 		//
 		// We also have to make sure that I'm a legitimate contact--I'm not blocked or pending.
 
-		$baseurl = $a->get_baseurl();
+		$baseurl = App::get_baseurl();
 		$domain_st = strpos($baseurl, "://");
 		if($domain_st === false)
 			return;
@@ -36,9 +36,9 @@ function auto_redir(&$a, $contact_nick) {
                dbesc($nurl)
 		);
 
-		if((! dbm::is_result($r)) || $r[0]['id'] == remote_user())
+		if ((! dbm::is_result($r)) || $r[0]['id'] == remote_user()) {
 			return;
-
+		}
 
 		$r = q("SELECT * FROM contact WHERE nick = '%s'
 		        AND network = '%s' AND uid = %d  AND url LIKE '%%%s%%' LIMIT 1",
@@ -48,8 +48,9 @@ function auto_redir(&$a, $contact_nick) {
 		       dbesc($baseurl)
 		);
 
-		if(! dbm::is_result($r))
+		if (! dbm::is_result($r)) {
 			return;
+		}
 
 		$cid = $r[0]['id'];
 
diff --git a/include/salmon.php b/include/salmon.php
index 5e9c4fa616..2b58334704 100644
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -24,22 +24,24 @@ function get_salmon_key($uri,$keyhash) {
 	// We have found at least one key URL
 	// If it's inline, parse it - otherwise get the key
 
-	if(count($ret)) {
-		for($x = 0; $x < count($ret); $x ++) {
-			if(substr($ret[$x],0,5) === 'data:') {
-				if(strstr($ret[$x],','))
+	if (count($ret) > 0) {
+		for ($x = 0; $x < count($ret); $x ++) {
+			if (substr($ret[$x],0,5) === 'data:') {
+				if (strstr($ret[$x],',')) {
 					$ret[$x] = substr($ret[$x],strpos($ret[$x],',')+1);
-				else
+				} else {
 					$ret[$x] = substr($ret[$x],5);
-			} elseif (normalise_link($ret[$x]) == 'http://')
+				}
+			} elseif (normalise_link($ret[$x]) == 'http://') {
 				$ret[$x] = fetch_url($ret[$x]);
+			}
 		}
 	}
 
 
 	logger('Key located: ' . print_r($ret,true));
 
-	if(count($ret) == 1) {
+	if (count($ret) == 1) {
 
 		// We only found one one key so we don't care if the hash matches.
 		// If it's the wrong key we'll find out soon enough because
@@ -50,10 +52,11 @@ function get_salmon_key($uri,$keyhash) {
 		return $ret[0];
 	}
 	else {
-		foreach($ret as $a) {
+		foreach ($ret as $a) {
 			$hash = base64url_encode(hash('sha256',$a));
-			if($hash == $keyhash)
+			if ($hash == $keyhash) {
 				return $a;
+			}
 		}
 	}
 
diff --git a/include/security.php b/include/security.php
index fa698c1b1a..cd00b5f7b0 100644
--- a/include/security.php
+++ b/include/security.php
@@ -9,8 +9,8 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 	$_SESSION['mobile-theme'] = get_pconfig($user_record['uid'], 'system', 'mobile_theme');
 	$_SESSION['authenticated'] = 1;
 	$_SESSION['page_flags'] = $user_record['page-flags'];
-	$_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $user_record['nickname'];
-	$_SESSION['my_address'] = $user_record['nickname'] . '@' . substr($a->get_baseurl(),strpos($a->get_baseurl(),'://')+3);
+	$_SESSION['my_url'] = App::get_baseurl() . '/profile/' . $user_record['nickname'];
+	$_SESSION['my_address'] = $user_record['nickname'] . '@' . substr(App::get_baseurl(),strpos(App::get_baseurl(),'://')+3);
 	$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
 
 	$a->user = $user_record;
@@ -94,11 +94,12 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 
 
 	}
-	if($login_initial) {
+	if ($login_initial) {
 		call_hooks('logged_in', $a->user);
 
-		if(($a->module !== 'home') && isset($_SESSION['return_url']))
-			goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
+		if (($a->module !== 'home') && isset($_SESSION['return_url'])) {
+			goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
+		}
 	}
 
 }
@@ -109,16 +110,17 @@ function can_write_wall(&$a,$owner) {
 
 	static $verified = 0;
 
-	if((! (local_user())) && (! (remote_user())))
+	if ((! (local_user())) && (! (remote_user()))) {
 		return false;
+	}
 
 	$uid = local_user();
 
-	if(($uid) && ($uid == $owner)) {
+	if (($uid) && ($uid == $owner)) {
 		return true;
 	}
 
-	if(remote_user()) {
+	if (remote_user()) {
 
 		// use remembered decision and avoid a DB lookup for each and every display item
 		// DO NOT use this function if there are going to be multiple owners
@@ -126,25 +128,25 @@ function can_write_wall(&$a,$owner) {
 		// We have a contact-id for an authenticated remote user, this block determines if the contact
 		// belongs to this page owner, and has the necessary permissions to post content
 
-		if($verified === 2)
+		if ($verified === 2) {
 			return true;
-		elseif($verified === 1)
+		} elseif ($verified === 1) {
 			return false;
-		else {
+		} else {
 			$cid = 0;
 
-			if(is_array($_SESSION['remote'])) {
-				foreach($_SESSION['remote'] as $visitor) {
-					if($visitor['uid'] == $owner) {
+			if (is_array($_SESSION['remote'])) {
+				foreach ($_SESSION['remote'] as $visitor) {
+					if ($visitor['uid'] == $owner) {
 						$cid = $visitor['cid'];
 						break;
 					}
 				}
 			}
 
-			if(! $cid)
+			if (! $cid) {
 				return false;
-
+			}
 
 			$r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` INNER JOIN `user` on `user`.`uid` = `contact`.`uid` 
 				WHERE `contact`.`uid` = %d AND `contact`.`id` = %d AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
@@ -378,7 +380,7 @@ function check_form_security_token_redirectOnErr($err_redirect, $typename = '',
 		logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
 		logger('check_form_security_token failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
 		notice( check_form_security_std_err_msg() );
-		goaway($a->get_baseurl() . $err_redirect );
+		goaway(App::get_baseurl() . $err_redirect );
 	}
 }
 function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'form_security_token') {
diff --git a/include/socgraph.php b/include/socgraph.php
index 349fd0b2ca..7c70a22a54 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -91,50 +91,58 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
 
 		$name = $entry->displayName;
 
-		if(isset($entry->urls)) {
-			foreach($entry->urls as $url) {
-				if($url->type == 'profile') {
+		if (isset($entry->urls)) {
+			foreach ($entry->urls as $url) {
+				if ($url->type == 'profile') {
 					$profile_url = $url->value;
 					continue;
 				}
-				if($url->type == 'webfinger') {
+				if ($url->type == 'webfinger') {
 					$connect_url = str_replace('acct:' , '', $url->value);
 					continue;
 				}
 			}
 		}
-		if(isset($entry->photos)) {
-			foreach($entry->photos as $photo) {
-				if($photo->type == 'profile') {
+		if (isset($entry->photos)) {
+			foreach ($entry->photos as $photo) {
+				if ($photo->type == 'profile') {
 					$profile_photo = $photo->value;
 					continue;
 				}
 			}
 		}
 
-		if(isset($entry->updated))
+		if (isset($entry->updated)) {
 			$updated = date("Y-m-d H:i:s", strtotime($entry->updated));
+		}
 
-		if(isset($entry->network))
+		if (isset($entry->network)) {
 			$network = $entry->network;
+		}
 
-		if(isset($entry->currentLocation))
+		if (isset($entry->currentLocation)) {
 			$location = $entry->currentLocation;
+		}
 
-		if(isset($entry->aboutMe))
+		if (isset($entry->aboutMe)) {
 			$about = html2bbcode($entry->aboutMe);
+		}
 
-		if(isset($entry->gender))
+		if (isset($entry->gender)) {
 			$gender = $entry->gender;
+		}
 
-		if(isset($entry->generation) AND ($entry->generation > 0))
+		if (isset($entry->generation) AND ($entry->generation > 0)) {
 			$generation = ++$entry->generation;
+		}
 
-		if(isset($entry->tags))
-			foreach($entry->tags as $tag)
+		if (isset($entry->tags)) {
+			foreach($entry->tags as $tag) {
 				$keywords = implode(", ", $tag);
+			}
+		}
 
-		if(isset($entry->contactType) AND ($entry->contactType >= 0))
+		if (isset($entry->contactType) AND ($entry->contactType >= 0))
 			$contact_type = $entry->contactType;
 
 		// If you query a Friendica server for its profiles, the network has to be Friendica
@@ -171,8 +179,6 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
 
 function poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, $cid = 0, $uid = 0, $zcid = 0) {
 
-	$a = get_app();
-
 	// Generation:
 	//  0: No definition
 	//  1: Profiles on this server
@@ -207,8 +213,9 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
 	$orig_updated = $updated;
 
 	// The global contacts should contain the original picture, not the cached one
-	if (($generation != 1) AND stristr(normalise_link($profile_photo), normalise_link($a->get_baseurl()."/photo/")))
+	if (($generation != 1) AND stristr(normalise_link($profile_photo), normalise_link(App::get_baseurl()."/photo/"))) {
 		$profile_photo = "";
+	}
 
 	$r = q("SELECT `network` FROM `contact` WHERE `nurl` = '%s' AND `network` != '' AND `network` != '%s' LIMIT 1",
 		dbesc(normalise_link($profile_url)), dbesc(NETWORK_STATUSNET)
@@ -330,7 +337,7 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
 		intval($gcid),
 		intval($zcid)
 	);
-	if(! dbm::is_result($r)) {
+	if (! dbm::is_result($r)) {
 		q("INSERT INTO `glink` (`cid`,`uid`,`gcid`,`zcid`, `updated`) VALUES (%d,%d,%d,%d, '%s') ",
 			intval($cid),
 			intval($uid),
@@ -1181,22 +1188,23 @@ function update_suggestions() {
 	$done = array();
 
 	/// TODO Check if it is really neccessary to poll the own server
-	poco_load(0,0,0,$a->get_baseurl() . '/poco');
+	poco_load(0,0,0,App::get_baseurl() . '/poco');
 
-	$done[] = $a->get_baseurl() . '/poco';
+	$done[] = App::get_baseurl() . '/poco';
 
-	if(strlen(get_config('system','directory'))) {
+	if (strlen(get_config('system','directory'))) {
 		$x = fetch_url(get_server()."/pubsites");
-		if($x) {
+		if ($x) {
 			$j = json_decode($x);
-			if($j->entries) {
-				foreach($j->entries as $entry) {
+			if ($j->entries) {
+				foreach ($j->entries as $entry) {
 
 					poco_check_server($entry->url);
 
 					$url = $entry->url . '/poco';
-					if(! in_array($url,$done))
+					if (! in_array($url,$done)) {
 						poco_load(0,0,0,$entry->url . '/poco');
+					}
 				}
 			}
 		}
@@ -1208,7 +1216,7 @@ function update_suggestions() {
 	);
 
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			$base = substr($rr['poco'],0,strrpos($rr['poco'],'/'));
 			if(! in_array($base,$done))
 				poco_load(0,0,0,$base);
@@ -1219,7 +1227,7 @@ function update_suggestions() {
 function poco_discover_federation() {
 	$last = get_config('poco','last_federation_discovery');
 
-	if($last) {
+	if ($last) {
 		$next = $last + (24 * 60 * 60);
 		if($next > time())
 			return;
@@ -1333,7 +1341,7 @@ function poco_discover_server_users($data, $server) {
 		$username = "";
 		if (isset($entry->urls)) {
 			foreach($entry->urls as $url)
-				if($url->type == 'profile') {
+				if ($url->type == 'profile') {
 					$profile_url = $url->value;
 					$urlparts = parse_url($profile_url);
 					$username = end(explode("/", $urlparts["path"]));
@@ -1375,52 +1383,61 @@ function poco_discover_server($data, $default_generation = 0) {
 
 		$name = $entry->displayName;
 
-		if(isset($entry->urls)) {
+		if (isset($entry->urls)) {
 			foreach($entry->urls as $url) {
-				if($url->type == 'profile') {
+				if ($url->type == 'profile') {
 					$profile_url = $url->value;
 					continue;
 				}
-				if($url->type == 'webfinger') {
+				if ($url->type == 'webfinger') {
 					$connect_url = str_replace('acct:' , '', $url->value);
 					continue;
 				}
 			}
 		}
 
-		if(isset($entry->photos)) {
-			foreach($entry->photos as $photo) {
-				if($photo->type == 'profile') {
+		if (isset($entry->photos)) {
+			foreach ($entry->photos as $photo) {
+				if ($photo->type == 'profile') {
 					$profile_photo = $photo->value;
 					continue;
 				}
 			}
 		}
 
-		if(isset($entry->updated))
+		if (isset($entry->updated)) {
 			$updated = date("Y-m-d H:i:s", strtotime($entry->updated));
+		}
 
-		if(isset($entry->network))
+		if(isset($entry->network)) {
 			$network = $entry->network;
+		}
 
-		if(isset($entry->currentLocation))
+		if(isset($entry->currentLocation)) {
 			$location = $entry->currentLocation;
+		}
 
-		if(isset($entry->aboutMe))
+		if(isset($entry->aboutMe)) {
 			$about = html2bbcode($entry->aboutMe);
+		}
 
-		if(isset($entry->gender))
+		if(isset($entry->gender)) {
 			$gender = $entry->gender;
+		}
 
-		if(isset($entry->generation) AND ($entry->generation > 0))
+		if(isset($entry->generation) AND ($entry->generation > 0)) {
 			$generation = ++$entry->generation;
+		}
 
-		if(isset($entry->contactType) AND ($entry->contactType >= 0))
+		if(isset($entry->contactType) AND ($entry->contactType >= 0)) {
 			$contact_type = $entry->contactType;
+		}
 
-		if(isset($entry->tags))
-			foreach($entry->tags as $tag)
+		if(isset($entry->tags)) {
+			foreach ($entry->tags as $tag) {
 				$keywords = implode(", ", $tag);
+			}
+		}
 
 		if ($generation > 0) {
 			$success = true;
@@ -1558,7 +1575,7 @@ function get_gcontact_id($contact) {
 		proc_run(PRIORITY_LOW, 'include/gprobe.php', bin2hex($contact["url"]));
 	}
 
-	if ((count($r) > 1) AND ($gcontact_id > 0) AND ($contact["url"] != ""))
+	if ((dbm::is_result($r)) AND (count($r) > 1) AND ($gcontact_id > 0) AND ($contact["url"] != ""))
 	 q("DELETE FROM `gcontact` WHERE `nurl` = '%s' AND `id` != %d",
 		dbesc(normalise_link($contact["url"])),
 		intval($gcontact_id));
@@ -1771,8 +1788,6 @@ function gs_fetch_users($server) {
 
 	logger("Fetching users from GNU Social server ".$server, LOGGER_DEBUG);
 
-	$a = get_app();
-
 	$url = $server."/main/statistics";
 
 	$result = z_fetch_url($url);
@@ -1811,7 +1826,7 @@ function gs_fetch_users($server) {
 					"nick" => $user->nickname,
 					"about" => $user->bio,
 					"network" => NETWORK_OSTATUS,
-					"photo" => $a->get_baseurl()."/images/person-175.jpg");
+					"photo" => App::get_baseurl()."/images/person-175.jpg");
 			get_gcontact_id($contact);
 		}
 }
diff --git a/include/tags.php b/include/tags.php
index 6c1d01d74d..0a09438478 100644
--- a/include/tags.php
+++ b/include/tags.php
@@ -1,13 +1,11 @@
 <?php
 function create_tags_from_item($itemid) {
-	$a = get_app();
-
-	$profile_base = $a->get_baseurl();
+	$profile_base = App::get_baseurl();
 	$profile_data = parse_url($profile_base);
 	$profile_base_friendica = $profile_data['host'].$profile_data['path']."/profile/";
 	$profile_base_diaspora = $profile_data['host'].$profile_data['path']."/u/";
 
-	$searchpath = $a->get_baseurl()."/search?tag=";
+	$searchpath = App::get_baseurl()."/search?tag=";
 
 	$messages = q("SELECT `guid`, `uid`, `id`, `edited`, `deleted`, `created`, `received`, `title`, `body`, `tag`, `parent` FROM `item` WHERE `id` = %d LIMIT 1", intval($itemid));
 
diff --git a/include/text.php b/include/text.php
index 5856226c37..6672b0d32f 100644
--- a/include/text.php
+++ b/include/text.php
@@ -23,7 +23,7 @@ function replace_macros($s,$r) {
 	$a = get_app();
 
 	// pass $baseurl to all templates
-	$r['$baseurl'] = $a->get_baseurl();
+	$r['$baseurl'] = App::get_baseurl();
 
 
 	$t = $a->template_engine();
@@ -369,7 +369,7 @@ if(! function_exists('paginate')) {
  * @param App $a App instance
  * @return string html for pagination #FIXME remove html
  */
-function paginate(&$a) {
+function paginate(App &$a) {
 
 	$data = paginate_data($a);
 	$tpl = get_markup_template("paginate.tpl");
@@ -912,7 +912,7 @@ function contact_block() {
 			if (dbm::is_result($r)) {
 				$contacts = sprintf( tt('%d Contact','%d Contacts', $total),$total);
 				$micropro = Array();
-				foreach($r as $rr) {
+				foreach ($r as $rr) {
 					$micropro[] = micropro($rr,true,'mpfriend');
 				}
 			}
@@ -1367,7 +1367,7 @@ function prepare_body(&$item,$attach = false, $preview = false) {
 	// map
 	if(strpos($s,'<div class="map">') !== false && $item['coord']) {
 		$x = generate_map(trim($item['coord']));
-		if($x) {
+		if ($x) {
 			$s = preg_replace('/\<div class\=\"map\"\>/','$0' . $x,$s);
 		}
 	}
@@ -1717,7 +1717,7 @@ function bb_translate_video($s) {
 
 	$matches = null;
 	$r = preg_match_all("/\[video\](.*?)\[\/video\]/ism",$s,$matches,PREG_SET_ORDER);
-	if($r) {
+	if ($r) {
 		foreach($matches as $mtch) {
 			if((stristr($mtch[1],'youtube')) || (stristr($mtch[1],'youtu.be')))
 				$s = str_replace($mtch[0],'[youtube]' . $mtch[1] . '[/youtube]',$s);
@@ -2000,8 +2000,9 @@ function file_tag_unsave_file($uid,$item,$file,$cat = false) {
 		intval($item),
 		intval($uid)
 	);
-	if(! dbm::is_result($r))
+	if (! dbm::is_result($r)) {
 		return false;
+	}
 
 	q("UPDATE `item` SET `file` = '%s' WHERE `id` = %d AND `uid` = %d",
 		dbesc(str_replace($pattern,'',$r[0]['file'])),
@@ -2020,11 +2021,11 @@ function file_tag_unsave_file($uid,$item,$file,$cat = false) {
 	//$r = q("select file from item where uid = %d and deleted = 0 " . file_tag_file_query('item',$file,(($cat) ? 'category' : 'file')),
 	//);
 
-	if(! dbm::is_result($r)) {
+	if (! dbm::is_result($r)) {
 		$saved = get_pconfig($uid,'system','filetags');
 		set_pconfig($uid,'system','filetags',str_replace($pattern,'',$saved));
-
 	}
+
 	return true;
 }
 
diff --git a/include/threads.php b/include/threads.php
index 48391174ec..c214cf2644 100644
--- a/include/threads.php
+++ b/include/threads.php
@@ -267,12 +267,10 @@ function update_threads() {
 }
 
 function update_threads_mention() {
-	$a = get_app();
-
 	$users = q("SELECT `uid`, `nickname` FROM `user` ORDER BY `uid`");
 
 	foreach ($users AS $user) {
-		$self = normalise_link($a->get_baseurl() . '/profile/' . $user['nickname']);
+		$self = normalise_link(App::get_baseurl() . '/profile/' . $user['nickname']);
 		$selfhttps = str_replace("http://", "https://", $self);
 		$parents = q("SELECT DISTINCT(`parent`) FROM `item` WHERE `uid` = %d AND
 				((`owner-link` IN ('%s', '%s')) OR (`author-link` IN ('%s', '%s')))",
diff --git a/include/uimport.php b/include/uimport.php
index 51672d92b6..0d9ffc35fc 100644
--- a/include/uimport.php
+++ b/include/uimport.php
@@ -133,7 +133,7 @@ function import_account(&$a, $file) {
 	}
 
 	$oldbaseurl = $account['baseurl'];
-	$newbaseurl = $a->get_baseurl();
+	$newbaseurl = App::get_baseurl();
 	$olduid = $account['user']['uid'];
 
         unset($account['user']['uid']);
@@ -290,5 +290,5 @@ function import_account(&$a, $file) {
 	proc_run(PRIORITY_HIGH, 'include/notifier.php', 'relocate', $newuid);
 
 	info(t("Done. You can now login with your username and password"));
-	goaway($a->get_baseurl() . "/login");
+	goaway(App::get_baseurl() . "/login");
 }
diff --git a/include/user.php b/include/user.php
index ec15d5b134..df871c5468 100644
--- a/include/user.php
+++ b/include/user.php
@@ -216,7 +216,7 @@ function create_user($arr) {
 		dbesc($default_service_class)
 	);
 
-	if($r) {
+	if ($r) {
 		$r = q("SELECT * FROM `user`
 			WHERE `username` = '%s' AND `password` = '%s' LIMIT 1",
 			dbesc($username),
@@ -241,7 +241,7 @@ function create_user($arr) {
 		WHERE `nickname` = '%s' ",
 		dbesc($nickname)
 	);
-	if((count($r) > 1) && $newuid) {
+	if ((dbm::is_result($r)) && (count($r) > 1) && $newuid) {
 		$result['message'] .= t('Nickname is already registered. Please choose another.') . EOL;
 		q("DELETE FROM `user` WHERE `uid` = %d",
 			intval($newuid)
@@ -262,7 +262,7 @@ function create_user($arr) {
 			intval($netpublish)
 
 		);
-		if($r === false) {
+		if ($r === false) {
 			$result['message'] .=  t('An error occurred creating your default profile. Please try again.') . EOL;
 			// Start fresh next time.
 			$r = q("DELETE FROM `user` WHERE `uid` = %d",
@@ -325,24 +325,27 @@ function create_user($arr) {
 
 			$r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 4 );
 
-			if($r === false)
+			if ($r === false) {
 				$photo_failure = true;
+			}
 
 			$img->scaleImage(80);
 
 			$r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 5 );
 
-			if($r === false)
+			if ($r === false) {
 				$photo_failure = true;
+			}
 
 			$img->scaleImage(48);
 
 			$r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 6 );
 
-			if($r === false)
+			if ($r === false) {
 				$photo_failure = true;
+			}
 
-			if(! $photo_failure) {
+			if (! $photo_failure) {
 				q("UPDATE `photo` SET `profile` = 1 WHERE `resource-id` = '%s' ",
 					dbesc($hash)
 				);
diff --git a/index.php b/index.php
index 08f24af60f..f05151757b 100644
--- a/index.php
+++ b/index.php
@@ -60,15 +60,15 @@ if(!$install) {
 	if ($a->max_processes_reached() OR $a->maxload_reached()) {
 		header($_SERVER["SERVER_PROTOCOL"].' 503 Service Temporarily Unavailable');
 		header('Retry-After: 120');
-		header('Refresh: 120; url='.$a->get_baseurl()."/".$a->query_string);
+		header('Refresh: 120; url='.App::get_baseurl()."/".$a->query_string);
 		die("System is currently unavailable. Please try again later");
 	}
 
 	if (get_config('system','force_ssl') AND ($a->get_scheme() == "http") AND
 		(intval(get_config('system','ssl_policy')) == SSL_POLICY_FULL) AND
-		(substr($a->get_baseurl(), 0, 8) == "https://")) {
+		(substr(App::get_baseurl(), 0, 8) == "https://")) {
 		header("HTTP/1.1 302 Moved Temporarily");
-		header("Location: ".$a->get_baseurl()."/".$a->query_string);
+		header("Location: ".App::get_baseurl()."/".$a->query_string);
 		exit();
 	}
 
@@ -150,24 +150,28 @@ if((x($_GET,'zrl')) && (!$install && !$maintenance)) {
  *
  */
 
-// header('Link: <' . $a->get_baseurl() . '/amcd>; rel="acct-mgmt";');
+// header('Link: <' . App::get_baseurl() . '/amcd>; rel="acct-mgmt";');
 
-if(x($_COOKIE["Friendica"]) || (x($_SESSION,'authenticated')) || (x($_POST,'auth-params')) || ($a->module === 'login'))
+if (x($_COOKIE["Friendica"]) || (x($_SESSION,'authenticated')) || (x($_POST,'auth-params')) || ($a->module === 'login')) {
 	require("include/auth.php");
+}
 
-if(! x($_SESSION,'authenticated'))
+if (! x($_SESSION,'authenticated')) {
 	header('X-Account-Management-Status: none');
+}
 
 /* set up page['htmlhead'] and page['end'] for the modules to use */
 $a->page['htmlhead'] = '';
 $a->page['end'] = '';
 
 
-if(! x($_SESSION,'sysmsg'))
+if (! x($_SESSION,'sysmsg')) {
 	$_SESSION['sysmsg'] = array();
+}
 
-if(! x($_SESSION,'sysmsg_info'))
+if (! x($_SESSION,'sysmsg_info')) {
 	$_SESSION['sysmsg_info'] = array();
+}
 
 /*
  * check_config() is responsible for running update scripts. These automatically
@@ -177,11 +181,11 @@ if(! x($_SESSION,'sysmsg_info'))
 
 // in install mode, any url loads install module
 // but we need "view" module for stylesheet
-if($install && $a->module!="view")
+if ($install && $a->module!="view") {
 	$a->module = 'install';
-elseif($maintenance && $a->module!="view")
+} elseif ($maintenance && $a->module!="view") {
 	$a->module = 'maintenance';
-else {
+} else {
 	check_url($a);
 	check_db();
 	check_plugins($a);
@@ -191,8 +195,7 @@ nav_set_selected('nothing');
 
 //Don't populate apps_menu if apps are private
 $privateapps = get_config('config','private_addons');
-if((local_user()) || (! $privateapps === "1"))
-{
+if ((local_user()) || (! $privateapps === "1")) {
 	$arr = array('app_menu' => $a->apps);
 
 	call_hooks('app_menu', $arr);
@@ -238,9 +241,9 @@ if(strlen($a->module)) {
 
 	$privateapps = get_config('config','private_addons');
 
-	if(is_array($a->plugins) && in_array($a->module,$a->plugins) && file_exists("addon/{$a->module}/{$a->module}.php")) {
+	if (is_array($a->plugins) && in_array($a->module,$a->plugins) && file_exists("addon/{$a->module}/{$a->module}.php")) {
 		//Check if module is an app and if public access to apps is allowed or not
-		if((!local_user()) && plugin_is_app($a->module) && $privateapps === "1") {
+		if ((!local_user()) && plugin_is_app($a->module) && $privateapps === "1") {
 			info( t("You must be logged in to use addons. "));
 		}
 		else {
@@ -254,7 +257,7 @@ if(strlen($a->module)) {
 	 * If not, next look for a 'standard' program module in the 'mod' directory
 	 */
 
-	if((! $a->module_loaded) && (file_exists("mod/{$a->module}.php"))) {
+	if ((! $a->module_loaded) && (file_exists("mod/{$a->module}.php"))) {
 		include_once("mod/{$a->module}.php");
 		$a->module_loaded = true;
 	}
@@ -272,16 +275,16 @@ if(strlen($a->module)) {
 	 *
 	 */
 
-	if(! $a->module_loaded) {
+	if (! $a->module_loaded) {
 
 		// Stupid browser tried to pre-fetch our Javascript img template. Don't log the event or return anything - just quietly exit.
-		if((x($_SERVER,'QUERY_STRING')) && preg_match('/{[0-9]}/',$_SERVER['QUERY_STRING']) !== 0) {
+		if ((x($_SERVER,'QUERY_STRING')) && preg_match('/{[0-9]}/',$_SERVER['QUERY_STRING']) !== 0) {
 			killme();
 		}
 
-		if((x($_SERVER,'QUERY_STRING')) && ($_SERVER['QUERY_STRING'] === 'q=internal_error.html') && isset($dreamhost_error_hack)) {
+		if ((x($_SERVER,'QUERY_STRING')) && ($_SERVER['QUERY_STRING'] === 'q=internal_error.html') && isset($dreamhost_error_hack)) {
 			logger('index.php: dreamhost_error_hack invoked. Original URI =' . $_SERVER['REQUEST_URI']);
-			goaway($a->get_baseurl() . $_SERVER['REQUEST_URI']);
+			goaway(App::get_baseurl() . $_SERVER['REQUEST_URI']);
 		}
 
 		logger('index.php: page not found: ' . $_SERVER['REQUEST_URI'] . ' ADDRESS: ' . $_SERVER['REMOTE_ADDR'] . ' QUERY: ' . $_SERVER['QUERY_STRING'], LOGGER_DEBUG);
@@ -304,11 +307,13 @@ if (file_exists($theme_info_file)){
 
 /* initialise content region */
 
-if(! x($a->page,'content'))
+if (! x($a->page,'content')) {
 	$a->page['content'] = '';
+}
 
-if(!$install && !$maintenance)
+if (!$install && !$maintenance) {
 	call_hooks('page_content_top',$a->page['content']);
+}
 
 /**
  * Call module functions
diff --git a/mod/_well_known.php b/mod/_well_known.php
index 33070a1ecd..eedddf1e5b 100644
--- a/mod/_well_known.php
+++ b/mod/_well_known.php
@@ -1,8 +1,9 @@
 <?php
+/// @TODO This file has DOS line endings!
 require_once("mod/hostxrd.php");
 require_once("mod/nodeinfo.php");
 
-function _well_known_init(&$a){
+function _well_known_init(App &$a){
 	if ($a->argc > 1) {
 		switch($a->argv[1]) {
 			case "host-meta":
@@ -20,7 +21,7 @@ function _well_known_init(&$a){
 	killme();
 }
 
-function wk_social_relay(&$a) {
+function wk_social_relay(App &$a) {
 
 	define('SR_SCOPE_ALL', 'all');
 	define('SR_SCOPE_TAGS', 'tags');
diff --git a/mod/acctlink.php b/mod/acctlink.php
index a2365803ac..29f17d6e41 100644
--- a/mod/acctlink.php
+++ b/mod/acctlink.php
@@ -2,7 +2,7 @@
 
 require_once('include/Scrape.php');
 
-function acctlink_init(&$a) {
+function acctlink_init(App &$a) {
 
 	if(x($_GET,'addr')) {
 		$addr = trim($_GET['addr']);
diff --git a/mod/acl.php b/mod/acl.php
index f5e04b96a7..802b0a399f 100644
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -3,7 +3,7 @@
 
 require_once("include/acl_selectors.php");
 
-function acl_init(&$a){
+function acl_init(App &$a){
 	acl_lookup($a);
 }
 
diff --git a/mod/admin.php b/mod/admin.php
index cf0d8d9ac6..c502e36fc5 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -23,7 +23,7 @@ require_once("include/text.php");
  * @param App $a
  *
  */
-function admin_post(&$a){
+function admin_post(App &$a){
 
 
 	if(!is_site_admin()) {
@@ -32,13 +32,12 @@ function admin_post(&$a){
 
 	// do not allow a page manager to access the admin panel at all.
 
-	if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
+	if (x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
 		return;
-
-
+	}
 
 	// urls
-	if($a->argc > 1) {
+	if ($a->argc > 1) {
 		switch ($a->argv[1]){
 			case 'site':
 				admin_page_site_post($a);
@@ -128,14 +127,15 @@ function admin_post(&$a){
  * @param App $a
  * @return string
  */
-function admin_content(&$a) {
+function admin_content(App &$a) {
 
 	if(!is_site_admin()) {
 		return login(false);
 	}
 
-	if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
+	if (x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
 		return "";
+	}
 
 	// APC deactivated, since there are problems with PHP 5.5
 	//if (function_exists("apc_delete")) {
@@ -260,7 +260,7 @@ function admin_content(&$a) {
  * @param App $a
  * @return string
  */
-function admin_page_federation(&$a) {
+function admin_page_federation(App &$a) {
 	// get counts on active friendica, diaspora, redmatrix, hubzilla, gnu
 	// social and statusnet nodes this node is knowing
 	//
@@ -376,7 +376,7 @@ function admin_page_federation(&$a) {
 		'$counts' => $counts,
 		'$version' => FRIENDICA_VERSION,
 		'$legendtext' => sprintf(t('Currently this node is aware of %d nodes from the following platforms:'), $total),
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => App::get_baseurl(),
 	));
 }
 
@@ -393,7 +393,7 @@ function admin_page_federation(&$a) {
  * @param App $a
  * @return string
  */
-function admin_page_queue(&$a) {
+function admin_page_queue(App &$a) {
 	// get content from the queue table
 	$r = q("SELECT `c`.`name`, `c`.`nurl`, `q`.`id`, `q`.`network`, `q`.`created`, `q`.`last`
 			FROM `queue` AS `q`, `contact` AS `c`
@@ -427,7 +427,7 @@ function admin_page_queue(&$a) {
  * @param App $a
  * @return string
  */
-function admin_page_summary(&$a) {
+function admin_page_summary(App &$a) {
 	global $db;
 	// are there MyISAM tables in the DB? If so, trigger a warning message
 	$r = q("SELECT `engine` FROM `information_schema`.`tables` WHERE `engine` = 'myisam' AND `table_schema` = '%s' LIMIT 1",
@@ -489,7 +489,7 @@ function admin_page_summary(&$a) {
 		'$accounts' => $accounts,
 		'$pending' => array(t('Pending registrations'), $pending),
 		'$version' => array(t('Version'), FRIENDICA_VERSION),
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => App::get_baseurl(),
 		'$platform' => FRIENDICA_PLATFORM,
 		'$codename' => FRIENDICA_CODENAME,
 		'$build' =>  get_config('system','build'),
@@ -504,7 +504,7 @@ function admin_page_summary(&$a) {
  * 
  * @param App $a
  */
-function admin_page_site_post(&$a) {
+function admin_page_site_post(App &$a) {
 	if(!x($_POST,"page_site")) {
 		return;
 	}
@@ -527,7 +527,7 @@ function admin_page_site_post(&$a) {
 		 * send relocate for every local user
 		 * */
 
-		$old_url = $a->get_baseurl(true);
+		$old_url = App::get_baseurl(true);
 
 		// Generate host names for relocation the addresses in the format user@address.tld
 		$new_host = str_replace("http://", "@", normalise_link($new_url));
@@ -845,7 +845,7 @@ function admin_page_site_post(&$a) {
  * @param  App $a
  * @return string
  */
-function admin_page_site(&$a) {
+function admin_page_site(App &$a) {
 
 	/* Installed langs */
 	$lang_choices = get_available_languages();
@@ -961,7 +961,7 @@ function admin_page_site(&$a) {
 		'$performance' => t('Performance'),
 		'$worker_title' => t('Worker'),
 		'$relocate'=> t('Relocate - WARNING: advanced function. Could make this server unreachable.'),
-		'$baseurl' => $a->get_baseurl(true),
+		'$baseurl' => App::get_baseurl(true),
 		// name, label, value, help string, extra data...
 		'$sitename' 		=> array('sitename', t("Site name"), $a->config['sitename'],''),
 		'$hostname' 		=> array('hostname', t("Host name"), $a->config['hostname'], ""),
@@ -1043,7 +1043,7 @@ function admin_page_site(&$a) {
 		'$old_pager'		=> array('old_pager', t("Enable old style pager"), get_config('system','old_pager'), t("The old style pager has page numbers but slows down massively the page speed.")),
 		'$only_tag_search'	=> array('only_tag_search', t("Only search in tags"), get_config('system','only_tag_search'), t("On large systems the text search can slow down the system extremely.")),
 
-		'$relocate_url'		=> array('relocate_url', t("New base url"), $a->get_baseurl(), t("Change base url for this server. Sends relocate message to all DFRN contacts of all users.")),
+		'$relocate_url'		=> array('relocate_url', t("New base url"), App::get_baseurl(), t("Change base url for this server. Sends relocate message to all DFRN contacts of all users.")),
 
 		'$rino' 		=> array('rino', t("RINO Encryption"), intval(get_config('system','rino_encrypt')), t("Encryption layer between nodes."), array("Disabled", "RINO1 (deprecated)", "RINO2")),
 		'$embedly' 		=> array('embedly', t("Embedly API key"), get_config('system','embedly'), t("<a href='http://embed.ly'>Embedly</a> is used to fetch additional data for web pages. This is an optional parameter.")),
@@ -1072,7 +1072,7 @@ function admin_page_site(&$a) {
  * @param App $a
  * @return string
  **/
-function admin_page_dbsync(&$a) {
+function admin_page_dbsync(App &$a) {
 
 	$o = '';
 
@@ -1122,26 +1122,26 @@ function admin_page_dbsync(&$a) {
 	$failed = array();
 	$r = q("SELECT `k`, `v` FROM `config` WHERE `cat` = 'database' ");
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			$upd = intval(substr($rr['k'],7));
 			if($upd < 1139 || $rr['v'] === 'success')
 				continue;
 			$failed[] = $upd;
 		}
 	}
-	if(! count($failed)) {
+	if (! count($failed)) {
 		$o = replace_macros(get_markup_template('structure_check.tpl'),array(
-			'$base' => $a->get_baseurl(true),
+			'$base'   => App::get_baseurl(true),
 			'$banner' => t('No failed updates.'),
-			'$check' => t('Check database structure'),
+			'$check'  => t('Check database structure'),
 		));
 	} else {
 		$o = replace_macros(get_markup_template('failed_updates.tpl'),array(
-			'$base' => $a->get_baseurl(true),
+			'$base'   => App::get_baseurl(true),
 			'$banner' => t('Failed Updates'),
-			'$desc' => t('This does not include updates prior to 1139, which did not return a status.'),
-			'$mark' => t('Mark success (if update was manually applied)'),
-			'$apply' => t('Attempt to execute this update step automatically'),
+			'$desc'   => t('This does not include updates prior to 1139, which did not return a status.'),
+			'$mark'   => t('Mark success (if update was manually applied)'),
+			'$apply'  => t('Attempt to execute this update step automatically'),
 			'$failed' => $failed
 		));
 	}
@@ -1155,12 +1155,12 @@ function admin_page_dbsync(&$a) {
  * 
  * @param App $a
  */
-function admin_page_users_post(&$a){
-	$pending     =	(x($_POST, 'pending')			? $_POST['pending']		: array());
-	$users       =	(x($_POST, 'user')			? $_POST['user']		: array());
-	$nu_name     =	(x($_POST, 'new_user_name')		? $_POST['new_user_name']	: '');
-	$nu_nickname =	(x($_POST, 'new_user_nickname')		? $_POST['new_user_nickname']	: '');
-	$nu_email    =	(x($_POST, 'new_user_email')		? $_POST['new_user_email']	: '');
+function admin_page_users_post(App &$a){
+	$pending     =	(x($_POST, 'pending')           ? $_POST['pending']           : array());
+	$users       =	(x($_POST, 'user')              ? $_POST['user']		      : array());
+	$nu_name     =	(x($_POST, 'new_user_name')     ? $_POST['new_user_name']     : '');
+	$nu_nickname =	(x($_POST, 'new_user_nickname') ? $_POST['new_user_nickname'] : '');
+	$nu_email    =	(x($_POST, 'new_user_email')    ? $_POST['new_user_email']    : '');
 	$nu_language = get_config('system', 'language');
 
 	check_form_security_token_redirectOnErr('/admin/users', 'admin_users');
@@ -1205,7 +1205,7 @@ function admin_page_users_post(&$a){
 			Thank you and welcome to %4$s.'));
 
 		$preamble = sprintf($preamble, $nu['username'], $a->config['sitename']);
-		$body = sprintf($body, $a->get_baseurl(), $nu['email'], $result['password'], $a->config['sitename']);
+		$body = sprintf($body, App::get_baseurl(), $nu['email'], $result['password'], $a->config['sitename']);
 
 		notification(array(
 			'type' => "SYSTEM_EMAIL",
@@ -1260,7 +1260,7 @@ function admin_page_users_post(&$a){
  * @param App $a
  * @return string
  */
-function admin_page_users(&$a){
+function admin_page_users(App &$a){
 	if($a->argc>2) {
 		$uid = $a->argv[3];
 		$user = q("SELECT `username`, `blocked` FROM `user` WHERE `uid` = %d", intval($uid));
@@ -1430,7 +1430,7 @@ function admin_page_users(&$a){
 		'$form_security_token' => get_form_security_token("admin_users"),
 
 		// values //
-		'$baseurl' => $a->get_baseurl(true),
+		'$baseurl' => App::get_baseurl(true),
 
 		'$pending' => $pending,
 		'deleted' => $deleted,
@@ -1460,7 +1460,7 @@ function admin_page_users(&$a){
  * @param App $a
  * @return string
  */
-function admin_page_plugins(&$a){
+function admin_page_plugins(App &$a){
 
 	/*
 	 * Single plugin
@@ -1522,7 +1522,7 @@ function admin_page_plugins(&$a){
 			'$page' => t('Plugins'),
 			'$toggle' => t('Toggle'),
 			'$settings' => t('Settings'),
-			'$baseurl' => $a->get_baseurl(true),
+			'$baseurl' => App::get_baseurl(true),
 
 			'$plugin' => $plugin,
 			'$status' => $status,
@@ -1546,32 +1546,35 @@ function admin_page_plugins(&$a){
 	 * List plugins
 	 */
 
-	if(x($_GET,"a") && $_GET['a']=="r") {
-		check_form_security_token_redirectOnErr($a->get_baseurl().'/admin/plugins', 'admin_themes', 't');
+	if (x($_GET,"a") && $_GET['a']=="r") {
+		check_form_security_token_redirectOnErr(App::get_baseurl().'/admin/plugins', 'admin_themes', 't');
 		reload_plugins();
 		info("Plugins reloaded");
-		goaway($a->get_baseurl().'/admin/plugins');
+		goaway(App::get_baseurl().'/admin/plugins');
 	}
 
 	$plugins = array();
 	$files = glob("addon/*/");
-	if($files) {
-		foreach($files as $file) {
-			if(is_dir($file)) {
+	if ($files) {
+		foreach ($files as $file) {
+			if (is_dir($file)) {
 				list($tmp, $id)=array_map("trim", explode("/",$file));
 				$info = get_plugin_info($id);
 				$show_plugin = true;
 
 				// If the addon is unsupported, then only show it, when it is enabled
-				if((strtolower($info["status"]) == "unsupported") AND !in_array($id,  $a->plugins))
+				if ((strtolower($info["status"]) == "unsupported") AND !in_array($id,  $a->plugins)) {
 					$show_plugin = false;
+				}
 
 				// Override the above szenario, when the admin really wants to see outdated stuff
-				if(get_config("system", "show_unsupported_addons"))
+				if (get_config("system", "show_unsupported_addons")) {
 					$show_plugin = true;
+				}
 
-				if($show_plugin)
+				if ($show_plugin) {
 					$plugins[] = array($id, (in_array($id,  $a->plugins)?"on":"off") , $info);
+				}
 			}
 		}
 	}
@@ -1582,7 +1585,7 @@ function admin_page_plugins(&$a){
 		'$page' => t('Plugins'),
 		'$submit' => t('Save Settings'),
 		'$reload' => t('Reload active plugins'),
-		'$baseurl' => $a->get_baseurl(true),
+		'$baseurl' => App::get_baseurl(true),
 		'$function' => 'plugins',
 		'$plugins' => $plugins,
 		'$pcount' => count($plugins), 
@@ -1666,7 +1669,7 @@ function rebuild_theme_table($themes) {
  * @param App $a
  * @return string
  */
-function admin_page_themes(&$a){
+function admin_page_themes(App &$a){
 
 	$allowed_themes_str = get_config('system','allowed_themes');
 	$allowed_themes_raw = explode(',',$allowed_themes_str);
@@ -1780,7 +1783,7 @@ function admin_page_themes(&$a){
 			'$page' => t('Themes'),
 			'$toggle' => t('Toggle'),
 			'$settings' => t('Settings'),
-			'$baseurl' => $a->get_baseurl(true),
+			'$baseurl' => App::get_baseurl(true),
 			'$plugin' => $theme,
 			'$status' => $status,
 			'$action' => $action,
@@ -1798,18 +1801,18 @@ function admin_page_themes(&$a){
 
 
 	// reload active themes
-	if(x($_GET,"a") && $_GET['a']=="r") {
-		check_form_security_token_redirectOnErr($a->get_baseurl().'/admin/themes', 'admin_themes', 't');
-		if($themes) {
-			foreach($themes as $th) {
-				if($th['allowed']) {
+	if (x($_GET,"a") && $_GET['a']=="r") {
+		check_form_security_token_redirectOnErr(App::get_baseurl().'/admin/themes', 'admin_themes', 't');
+		if ($themes) {
+			foreach ($themes as $th) {
+				if ($th['allowed']) {
 					uninstall_theme($th['name']);
 					install_theme($th['name']);
 				}
 			}
 		}
 		info("Themes reloaded");
-		goaway($a->get_baseurl().'/admin/themes');
+		goaway(App::get_baseurl().'/admin/themes');
 	}
 
 	/*
@@ -1817,7 +1820,7 @@ function admin_page_themes(&$a){
 	 */
 
 	$xthemes = array();
-	if($themes) {
+	if ($themes) {
 		foreach($themes as $th) {
 			$xthemes[] = array($th['name'],(($th['allowed']) ? "on" : "off"), get_theme_info($th['name']));
 		}
@@ -1826,17 +1829,17 @@ function admin_page_themes(&$a){
 
 	$t = get_markup_template("admin_plugins.tpl");
 	return replace_macros($t, array(
-		'$title' => t('Administration'),
-		'$page' => t('Themes'),
-		'$submit' => t('Save Settings'),
-		'$reload' => t('Reload active themes'),
-		'$baseurl' => $a->get_baseurl(true),
-		'$function' => 'themes',
-		'$plugins' => $xthemes,
-		'$pcount' => count($themes),
-		'$noplugshint' => sprintf(t('No themes found on the system. They should be paced in %1$s'),'<code>/view/themes</code>'),
-		'$experimental' => t('[Experimental]'),
-		'$unsupported' => t('[Unsupported]'),
+		'$title'               => t('Administration'),
+		'$page'                => t('Themes'),
+		'$submit'              => t('Save Settings'),
+		'$reload'              => t('Reload active themes'),
+		'$baseurl'             => App::get_baseurl(true),
+		'$function'            => 'themes',
+		'$plugins'             => $xthemes,
+		'$pcount'              => count($themes),
+		'$noplugshint'         => sprintf(t('No themes found on the system. They should be paced in %1$s'),'<code>/view/themes</code>'),
+		'$experimental'        => t('[Experimental]'),
+		'$unsupported'         => t('[Unsupported]'),
 		'$form_security_token' => get_form_security_token("admin_themes"),
 	));
 }
@@ -1847,7 +1850,7 @@ function admin_page_themes(&$a){
  * 
  * @param App $a
  */
-function admin_page_logs_post(&$a) {
+function admin_page_logs_post(App &$a) {
 	if(x($_POST,"page_logs")) {
 		check_form_security_token_redirectOnErr('/admin/logs', 'admin_logs');
 
@@ -1881,7 +1884,7 @@ function admin_page_logs_post(&$a) {
  * @param App $a
  * @return string
  */
-function admin_page_logs(&$a){
+function admin_page_logs(App &$a){
 
 	$log_choices = array(
 		LOGGER_NORMAL	=> 'Normal',
@@ -1904,7 +1907,7 @@ function admin_page_logs(&$a){
 		'$page' => t('Logs'),
 		'$submit' => t('Save Settings'),
 		'$clear' => t('Clear'),
-		'$baseurl' => $a->get_baseurl(true),
+		'$baseurl' => App::get_baseurl(true),
 		'$logname' =>  get_config('system','logfile'),
 
 		// name, label, value, help string, extra data...
@@ -1938,7 +1941,7 @@ function admin_page_logs(&$a){
  * @param App $a
  * @return string
  */
-function admin_page_viewlogs(&$a){
+function admin_page_viewlogs(App &$a){
 	$t = get_markup_template("admin_viewlogs.tpl");
 	$f = get_config('system','logfile');
 	$data = '';
@@ -1980,7 +1983,7 @@ function admin_page_viewlogs(&$a){
  * 
  * @param App $a
  */
-function admin_page_features_post(&$a) {
+function admin_page_features_post(App &$a) {
 
 	check_form_security_token_redirectOnErr('/admin/features', 'admin_manage_features');
 
@@ -2026,7 +2029,7 @@ function admin_page_features_post(&$a) {
  * @param App $a
  * @return string
  */
-function admin_page_features(&$a) {
+function admin_page_features(App &$a) {
 	
 	if((argc() > 1) && (argv(1) === 'features')) {
 		$arr = array();
diff --git a/mod/allfriends.php b/mod/allfriends.php
index 240aa524be..9e14a67d2e 100644
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -5,29 +5,32 @@ require_once('include/Contact.php');
 require_once('include/contact_selectors.php');
 require_once('mod/contacts.php');
 
-function allfriends_content(&$a) {
+function allfriends_content(App &$a) {
 
 	$o = '';
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
 
-	if($a->argc > 1)
+	if ($a->argc > 1) {
 		$cid = intval($a->argv[1]);
+	}
 
-	if(! $cid)
+	if (! $cid) {
 		return;
+	}
 
-	$uid = $a->user[uid];
+	$uid = $a->user['uid'];
 
 	$c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 		intval($cid),
 		intval(local_user())
 	);
 
-	if(! count($c))
+	if (! count($c)) {
 		return;
+	}
 
 	$a->page['aside'] = "";
 	profile_load($a, "", 0, get_contact_details_by_url($c[0]["url"]));
@@ -39,14 +42,14 @@ function allfriends_content(&$a) {
 
 	$r = all_friends(local_user(), $cid, $a->pager['start'], $a->pager['itemspage']);
 
-	if(! dbm::is_result($r)) {
+	if (! dbm::is_result($r)) {
 		$o .= t('No friends to display.');
 		return $o;
 	}
 
 	$id = 0;
 
-	foreach($r as $rr) {
+	foreach ($r as $rr) {
 
 		//get further details of the contact
 		$contact_details = get_contact_details_by_url($rr['url'], $uid, $rr);
@@ -60,7 +63,7 @@ function allfriends_content(&$a) {
 			$photo_menu = contact_photo_menu ($rr);
 		}
 		else {
-			$connlnk = $a->get_baseurl() . '/follow/?url=' . $rr['url'];
+			$connlnk = App::get_baseurl() . '/follow/?url=' . $rr['url'];
 			$photo_menu = array(
 				'profile' => array(t("View Profile"), zrl($rr['url'])),
 				'follow' => array(t("Connect/Follow"), $connlnk)
diff --git a/mod/amcd.php b/mod/amcd.php
index a2a1327e6d..3fcdb42c8d 100644
--- a/mod/amcd.php
+++ b/mod/amcd.php
@@ -1,6 +1,6 @@
 <?php
 
-function amcd_content(&$a) {
+function amcd_content(App &$a) {
 //header("Content-type: text/json");
 echo <<< EOT
 {
diff --git a/mod/api.php b/mod/api.php
index 406ef26c1c..74a0cff6f4 100644
--- a/mod/api.php
+++ b/mod/api.php
@@ -20,9 +20,9 @@ function oauth_get_client($request){
 	return $r[0];
 }
 
-function api_post(&$a) {
+function api_post(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
@@ -34,7 +34,7 @@ function api_post(&$a) {
 
 }
 
-function api_content(&$a) {
+function api_content(App &$a) {
 	if ($a->cmd=='api/oauth/authorize'){
 		/*
 		 * api/oauth/authorize interact with the user. return a standard page
@@ -84,7 +84,7 @@ function api_content(&$a) {
 		}
 
 
-		if(! local_user()) {
+		if (! local_user()) {
 			/// @TODO We need login form to redirect to this page
 			notice( t('Please login to continue.') . EOL );
 			return login(false,$request->get_parameters());
diff --git a/mod/apps.php b/mod/apps.php
index a821ef5d5b..4d6395e4ea 100644
--- a/mod/apps.php
+++ b/mod/apps.php
@@ -1,6 +1,6 @@
 <?php
 
-function apps_content(&$a) {
+function apps_content(App &$a) {
     $privateaddons = get_config('config','private_addons');
       if ($privateaddons === "1") {
 	if((! (local_user())))  {
diff --git a/mod/attach.php b/mod/attach.php
index 274acfc2be..3b1fc0ec82 100644
--- a/mod/attach.php
+++ b/mod/attach.php
@@ -2,7 +2,7 @@
 
 require_once('include/security.php');
 
-function attach_init(&$a) {
+function attach_init(App &$a) {
 
 	if($a->argc != 2) {
 		notice( t('Item not available.') . EOL);
@@ -16,7 +16,7 @@ function attach_init(&$a) {
 	$r = q("SELECT * FROM `attach` WHERE `id` = %d LIMIT 1",
 		intval($item_id)
 	);
-	if(! dbm::is_result($r)) {
+	if (! dbm::is_result($r)) {
 		notice( t('Item was not found.'). EOL);
 		return;
 	}
@@ -29,7 +29,7 @@ function attach_init(&$a) {
 		dbesc($item_id)
 	);
 
-	if(! dbm::is_result($r)) {
+	if (! dbm::is_result($r)) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
diff --git a/mod/babel.php b/mod/babel.php
index d31e090c55..5129f5bf59 100644
--- a/mod/babel.php
+++ b/mod/babel.php
@@ -9,7 +9,7 @@ function visible_lf($s) {
 	return str_replace("\n",'<br />', $s);
 }
 
-function babel_content(&$a) {
+function babel_content(App &$a) {
 
 	$o .= '<h1>Babel Diagnostic</h1>';
 
diff --git a/mod/bookmarklet.php b/mod/bookmarklet.php
index be8645c1fd..9bc8c33535 100644
--- a/mod/bookmarklet.php
+++ b/mod/bookmarklet.php
@@ -3,19 +3,19 @@
 require_once('include/conversation.php');
 require_once('include/items.php');
 
-function bookmarklet_init(&$a) {
+function bookmarklet_init(App &$a) {
 	$_GET["mode"] = "minimal";
 }
 
-function bookmarklet_content(&$a) {
-	if(!local_user()) {
+function bookmarklet_content(App &$a) {
+	if (!local_user()) {
 		$o = '<h2>'.t('Login').'</h2>';
 		$o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true);
 		return $o;
 	}
 
 	$referer = normalise_link($_SERVER["HTTP_REFERER"]);
-	$page = normalise_link($a->get_baseurl()."/bookmarklet");
+	$page = normalise_link(App::get_baseurl()."/bookmarklet");
 
 	if (!strstr($referer, $page)) {
 		$content = add_page_info($_REQUEST["url"]);
diff --git a/mod/cal.php b/mod/cal.php
index ba43393284..7cb36e7a54 100644
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -9,7 +9,7 @@
 require_once('include/event.php');
 require_once('include/redir.php');
 
-function cal_init(&$a) {
+function cal_init(App &$a) {
 	if($a->argc > 1)
 		auto_redir($a, $a->argv[1]);
 
@@ -64,7 +64,7 @@ function cal_init(&$a) {
 	return;
 }
 
-function cal_content(&$a) {
+function cal_content(App &$a) {
 	nav_set_selected('events');
 
 	$editselect = 'none';
@@ -80,7 +80,7 @@ function cal_content(&$a) {
 
 	$htpl = get_markup_template('event_head.tpl');
 	$a->page['htmlhead'] .= replace_macros($htpl,array(
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => App::get_baseurl(),
 		'$module_url' => '/cal/' . $a->data['user']['nickname'],
 		'$modparams' => 2,
 		'$i18n' => $i18n,
@@ -89,7 +89,7 @@ function cal_content(&$a) {
 
 	$etpl = get_markup_template('event_end.tpl');
 	$a->page['end'] .= replace_macros($etpl,array(
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => App::get_baseurl(),
 		'$editselect' => $editselect
 	));
 
@@ -229,10 +229,11 @@ function cal_content(&$a) {
 
 		if (dbm::is_result($r)) {
 			$r = sort_by_date($r);
-			foreach($r as $rr) {
+			foreach ($r as $rr) {
 				$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j'));
-				if(! x($links,$j))
-					$links[$j] = $a->get_baseurl() . '/' . $a->cmd . '#link-' . $j;
+				if (! x($links,$j)) {
+					$links[$j] = App::get_baseurl() . '/' . $a->cmd . '#link-' . $j;
+				}
 			}
 		}
 
@@ -270,12 +271,12 @@ function cal_content(&$a) {
 		}
 
 		$o = replace_macros($tpl, array(
-			'$baseurl'	=> $a->get_baseurl(),
+			'$baseurl'	=> App::get_baseurl(),
 			'$tabs'		=> $tabs,
 			'$title'	=> t('Events'),
 			'$view'		=> t('View'),
-			'$previus'	=> array($a->get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''),
-			'$next'		=> array($a->get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''),
+			'$previus'	=> array(App::get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''),
+			'$next'		=> array(App::get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''),
 			'$calendar' => cal($y,$m,$links, ' eventcal'),
 
 			'$events'	=> $events,
diff --git a/mod/cb.php b/mod/cb.php
index 6375d23984..90e41fb6d5 100644
--- a/mod/cb.php
+++ b/mod/cb.php
@@ -5,19 +5,19 @@
  */
 
 
-function cb_init(&$a) {
+function cb_init(App &$a) {
 	call_hooks('cb_init');
 }
 
-function cb_post(&$a) {
+function cb_post(App &$a) {
 	call_hooks('cb_post', $_POST);
 }
 
-function cb_afterpost(&$a) {
+function cb_afterpost(App &$a) {
 	call_hooks('cb_afterpost');
 }
 
-function cb_content(&$a) {
+function cb_content(App &$a) {
 	$o = '';
 	call_hooks('cb_content', $o);
 	return $o;
diff --git a/mod/common.php b/mod/common.php
index 9f9379be57..ab27dc667a 100644
--- a/mod/common.php
+++ b/mod/common.php
@@ -5,7 +5,7 @@ require_once('include/Contact.php');
 require_once('include/contact_selectors.php');
 require_once('mod/contacts.php');
 
-function common_content(&$a) {
+function common_content(App &$a) {
 
 	$o = '';
 
@@ -48,8 +48,9 @@ function common_content(&$a) {
 		$a->page['aside'] .= $vcard_widget;
 	}
 
-	if(! count($c))
+	if (! dbm::is_result($c)) {
 		return;
+	}
 
 	if(! $cid) {
 		if(get_my_url()) {
@@ -94,13 +95,13 @@ function common_content(&$a) {
 		$r = common_friends_zcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']);
 
 
-	if(! dbm::is_result($r)) {
+	if (! dbm::is_result($r)) {
 		return $o;
 	}
 
 	$id = 0;
 
-	foreach($r as $rr) {
+	foreach ($r as $rr) {
 
 		//get further details of the contact
 		$contact_details = get_contact_details_by_url($rr['url'], $uid);
diff --git a/mod/community.php b/mod/community.php
index 40d4016f33..2c2ea32b33 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -1,7 +1,7 @@
 <?php
 
-function community_init(&$a) {
-	if(! local_user()) {
+function community_init(App &$a) {
+	if (! local_user()) {
 		unset($_SESSION['theme']);
 		unset($_SESSION['mobile-theme']);
 	}
@@ -71,7 +71,7 @@ function community_content(&$a, $update = 0) {
 
 	$r = community_getitems($a->pager['start'], $a->pager['itemspage']);
 
-	if(! dbm::is_result($r)) {
+	if (! dbm::is_result($r)) {
 		info( t('No results.') . EOL);
 		return $o;
 	}
diff --git a/mod/contactgroup.php b/mod/contactgroup.php
index 4456db2f53..553c7d6cd3 100644
--- a/mod/contactgroup.php
+++ b/mod/contactgroup.php
@@ -2,10 +2,10 @@
 
 require_once('include/group.php');
 
-function contactgroup_content(&$a) {
+function contactgroup_content(App &$a) {
 
 
-	if(! local_user()) {
+	if (! local_user()) {
 		killme();
 	}
 
@@ -24,7 +24,7 @@ function contactgroup_content(&$a) {
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if(! dbm::is_result($r)) {
+		if (! dbm::is_result($r)) {
 			killme();
 		}
 
diff --git a/mod/contacts.php b/mod/contacts.php
index 735ccec727..f709f9d2fb 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -7,9 +7,10 @@ require_once('include/Scrape.php');
 require_once('mod/proxy.php');
 require_once('include/Photo.php');
 
-function contacts_init(&$a) {
-	if(! local_user())
+function contacts_init(App &$a) {
+	if (! local_user()) {
 		return;
+	}
 
 	$contact_id = 0;
 
@@ -19,7 +20,7 @@ function contacts_init(&$a) {
 			intval(local_user()),
 			intval($contact_id)
 		);
-		if(! dbm::is_result($r)) {
+		if (! dbm::is_result($r)) {
 			$contact_id = 0;
 		}
 	}
@@ -78,20 +79,20 @@ function contacts_init(&$a) {
 	$base = z_root();
 	$tpl = get_markup_template("contacts-head.tpl");
 	$a->page['htmlhead'] .= replace_macros($tpl,array(
-		'$baseurl' => $a->get_baseurl(true),
+		'$baseurl' => App::get_baseurl(true),
 		'$base' => $base
 	));
 
 	$tpl = get_markup_template("contacts-end.tpl");
 	$a->page['end'] .= replace_macros($tpl,array(
-		'$baseurl' => $a->get_baseurl(true),
+		'$baseurl' => App::get_baseurl(true),
 		'$base' => $base
 	));
 
 
 }
 
-function contacts_batch_actions(&$a){
+function contacts_batch_actions(App &$a){
 	$contacts_id = $_POST['contact_batch'];
 	if (!is_array($contacts_id)) return;
 
@@ -128,18 +129,21 @@ function contacts_batch_actions(&$a){
 		info ( sprintf( tt("%d contact edited.", "%d contacts edited.", $count_actions), $count_actions) );
 	}
 
-	if(x($_SESSION,'return_url'))
+	if (x($_SESSION,'return_url')) {
 		goaway('' . $_SESSION['return_url']);
-	else
+	}
+	else {
 		goaway('contacts');
+	}
 
 }
 
 
-function contacts_post(&$a) {
+function contacts_post(App &$a) {
 
-	if(! local_user())
+	if (! local_user()) {
 		return;
+	}
 
 	if ($a->argv[1]==="batch") {
 		contacts_batch_actions($a);
@@ -147,15 +151,16 @@ function contacts_post(&$a) {
 	}
 
 	$contact_id = intval($a->argv[1]);
-	if(! $contact_id)
+	if (! $contact_id) {
 		return;
+	}
 
 	$orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 		intval($contact_id),
 		intval(local_user())
 	);
 
-	if(! count($orig_record)) {
+	if (! count($orig_record)) {
 		notice( t('Could not access contact record.') . EOL);
 		goaway('contacts');
 		return; // NOTREACHED
@@ -164,12 +169,12 @@ function contacts_post(&$a) {
 	call_hooks('contact_edit_post', $_POST);
 
 	$profile_id = intval($_POST['profile-assign']);
-	if($profile_id) {
+	if ($profile_id) {
 		$r = q("SELECT `id` FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($profile_id),
 			intval(local_user())
 		);
-		if(! dbm::is_result($r)) {
+		if (! dbm::is_result($r)) {
 			notice( t('Could not locate selected profile.') . EOL);
 			return;
 		}
@@ -339,14 +344,14 @@ function _contact_drop($contact_id, $orig_record) {
 }
 
 
-function contacts_content(&$a) {
+function contacts_content(App &$a) {
 
 	$sort_type = 0;
 	$o = '';
 	nav_set_selected('contacts');
 
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
@@ -384,7 +389,7 @@ function contacts_content(&$a) {
 
 		if($cmd === 'block') {
 			$r = _contact_block($contact_id, $orig_record[0]);
-			if($r) {
+			if ($r) {
 				$blocked = (($orig_record[0]['blocked']) ? 0 : 1);
 				info((($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')).EOL);
 			}
@@ -395,7 +400,7 @@ function contacts_content(&$a) {
 
 		if($cmd === 'ignore') {
 			$r = _contact_ignore($contact_id, $orig_record[0]);
-			if($r) {
+			if ($r) {
 				$readonly = (($orig_record[0]['readonly']) ? 0 : 1);
 				info((($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')).EOL);
 			}
@@ -407,7 +412,7 @@ function contacts_content(&$a) {
 
 		if($cmd === 'archive') {
 			$r = _contact_archive($contact_id, $orig_record[0]);
-			if($r) {
+			if ($r) {
 				$archived = (($orig_record[0]['archive']) ? 0 : 1);
 				info((($archived) ? t('Contact has been archived') : t('Contact has been unarchived')).EOL);
 			}
@@ -446,22 +451,26 @@ function contacts_content(&$a) {
 				));
 			}
 			// Now check how the user responded to the confirmation query
-			if($_REQUEST['canceled']) {
-				if(x($_SESSION,'return_url'))
+			if ($_REQUEST['canceled']) {
+				if (x($_SESSION,'return_url')) {
 					goaway('' . $_SESSION['return_url']);
-				else
+				}
+				else {
 					goaway('contacts');
+				}
 			}
 
 			_contact_drop($contact_id, $orig_record[0]);
 			info( t('Contact has been removed.') . EOL );
-			if(x($_SESSION,'return_url'))
+			if (x($_SESSION,'return_url')) {
 				goaway('' . $_SESSION['return_url']);
-			else
+			}
+			else {
 				goaway('contacts');
+			}
 			return; // NOTREACHED
 		}
-		if($cmd === 'posts') {
+		if ($cmd === 'posts') {
 			return contact_posts($a, $contact_id);
 		}
 	}
@@ -480,11 +489,11 @@ function contacts_content(&$a) {
 			$editselect = 'exact';
 
 		$a->page['htmlhead'] .= replace_macros(get_markup_template('contact_head.tpl'), array(
-			'$baseurl' => $a->get_baseurl(true),
+			'$baseurl' => App::get_baseurl(true),
 			'$editselect' => $editselect,
 		));
 		$a->page['end'] .= replace_macros(get_markup_template('contact_end.tpl'), array(
-			'$baseurl' => $a->get_baseurl(true),
+			'$baseurl' => App::get_baseurl(true),
 			'$editselect' => $editselect,
 		));
 
@@ -564,7 +573,7 @@ function contacts_content(&$a) {
 
 		if (in_array($contact['network'], array(NETWORK_DIASPORA, NETWORK_OSTATUS)) AND
 			($contact['rel'] == CONTACT_IS_FOLLOWER))
-			$follow = $a->get_baseurl(true)."/follow?url=".urlencode($contact["url"]);
+			$follow = App::get_baseurl(true)."/follow?url=".urlencode($contact["url"]);
 
 		// Load contactact related actions like hide, suggest, delete and others
 		$contact_actions = contact_actions($contact);
diff --git a/mod/content.php b/mod/content.php
index 1e2307f553..2377032a79 100644
--- a/mod/content.php
+++ b/mod/content.php
@@ -23,7 +23,7 @@ function content_content(&$a, $update = 0) {
 
 	// Currently security is based on the logged in user
 
-	if(! local_user()) {
+	if (! local_user()) {
 		return;
 	}
 
@@ -113,11 +113,11 @@ function content_content(&$a, $update = 0) {
 			intval($group),
 			intval($_SESSION['uid'])
 		);
-		if(! dbm::is_result($r)) {
+		if (! dbm::is_result($r)) {
 			if($update)
 				killme();
 			notice( t('No such group') . EOL );
-			goaway($a->get_baseurl(true) . '/network');
+			goaway(App::get_baseurl(true) . '/network');
 			// NOTREACHED
 		}
 
@@ -509,8 +509,8 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
 					'like' => '',
 					'dislike' => '',
 					'comment' => '',
-					//'conv' => (($preview) ? '' : array('href'=> $a->get_baseurl($ssl_state) . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context'))),
-					'conv' => (($preview) ? '' : array('href'=> $a->get_baseurl($ssl_state).'/display/'.$item['guid'], 'title'=> t('View in context'))),
+					//'conv' => (($preview) ? '' : array('href'=> App::get_baseurl($ssl_state) . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context'))),
+					'conv' => (($preview) ? '' : array('href'=> App::get_baseurl($ssl_state).'/display/'.$item['guid'], 'title'=> t('View in context'))),
 					'previewing' => $previewing,
 					'wait' => t('Please wait'),
 				);
@@ -742,10 +742,11 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
 					}
 				}
 
-				if(local_user() && link_compare($a->contact['url'],$item['author-link']))
-					$edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"));
-				else
+				if (local_user() && link_compare($a->contact['url'],$item['author-link'])) {
+					$edpost = array(App::get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"));
+				} else {
 					$edpost = false;
+				}
 
 				$drop = '';
 				$dropping = false;
@@ -764,7 +765,7 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
 
 				$isstarred = "unstarred";
 				if ($profile_owner == local_user()) {
-					if($toplevelpost) {
+					if ($toplevelpost) {
 						$isstarred = (($item['starred']) ? "starred" : "unstarred");
 
 						$star = array(
@@ -782,6 +783,7 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
 							intval($item['uid']),
 							intval($item['id'])
 						);
+
 						if (dbm::is_result($r)) {
 							$ignore = array(
 								'do' => t("ignore thread"),
@@ -793,7 +795,7 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
 							);
 						}
 						$tagger = '';
-						if(feature_enabled($profile_owner,'commtag')) {
+						if (feature_enabled($profile_owner,'commtag')) {
 							$tagger = array(
 								'add' => t("add tag"),
 								'class' => "",
@@ -818,19 +820,22 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
 
 				$sp = false;
 				$profile_link = best_link_url($item,$sp);
-				if($profile_link === 'mailbox')
+				if ($profile_link === 'mailbox') {
 					$profile_link = '';
-				if($sp)
+				}
+				if ($sp) {
 					$sparkle = ' sparkle';
-				else
+				} else {
 					$profile_link = zrl($profile_link);
+				}
 
 				// Don't rely on the author-avatar. It is better to use the data from the contact table
 				$author_contact = get_contact_details_by_url($item['author-link'], $profile_owner);
-				if ($author_contact["thumb"])
+				if ($author_contact["thumb"]) {
 					$profile_avatar = $author_contact["thumb"];
-				else
+				} else {
 					$profile_avatar = $item['author-avatar'];
+				}
 
 				$like    = ((x($conv_responses['like'],$item['uri'])) ? format_like($conv_responses['like'][$item['uri']],$conv_responses['like'][$item['uri'] . '-l'],'like',$item['uri']) : '');
 				$dislike = ((x($conv_responses['dislike'],$item['uri'])) ? format_like($conv_responses['dislike'][$item['uri']],$conv_responses['dislike'][$item['uri'] . '-l'],'dislike',$item['uri']) : '');
diff --git a/mod/credits.php b/mod/credits.php
index f8cfb03f37..84e32b83d5 100644
--- a/mod/credits.php
+++ b/mod/credits.php
@@ -5,7 +5,7 @@
  * addons repository will be listed though ATM)
  */
 
-function credits_content (&$a) {
+function credits_content (App &$a) {
     /* fill the page with credits */
     $f = fopen('util/credits.txt','r');
     $names = fread($f, filesize('util/credits.txt'));
diff --git a/mod/crepair.php b/mod/crepair.php
index b4275f6baa..2661deaeed 100644
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -2,9 +2,10 @@
 require_once("include/contact_selectors.php");
 require_once("mod/contacts.php");
 
-function crepair_init(&$a) {
-	if(! local_user())
+function crepair_init(App &$a) {
+	if (! local_user()) {
 		return;
+	}
 
 	$contact_id = 0;
 
@@ -14,7 +15,7 @@ function crepair_init(&$a) {
 			intval(local_user()),
 			intval($contact_id)
 		);
-		if(! dbm::is_result($r)) {
+		if (! dbm::is_result($r)) {
 			$contact_id = 0;
 		}
 	}
@@ -30,9 +31,10 @@ function crepair_init(&$a) {
 }
 
 
-function crepair_post(&$a) {
-	if(! local_user())
+function crepair_post(App &$a) {
+	if (! local_user()) {
 		return;
+	}
 
 	$cid = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
@@ -43,8 +45,9 @@ function crepair_post(&$a) {
 		);
 	}
 
-	if(! dbm::is_result($r))
+	if (! dbm::is_result($r)) {
 		return;
+	}
 
 	$contact = $r[0];
 
@@ -94,9 +97,9 @@ function crepair_post(&$a) {
 
 
 
-function crepair_content(&$a) {
+function crepair_content(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
@@ -110,7 +113,7 @@ function crepair_content(&$a) {
 		);
 	}
 
-	if(! dbm::is_result($r)) {
+	if (! dbm::is_result($r)) {
 		notice( t('Contact not found.') . EOL);
 		return;
 	}
diff --git a/mod/delegate.php b/mod/delegate.php
index 71628aed0e..40618eb324 100644
--- a/mod/delegate.php
+++ b/mod/delegate.php
@@ -1,24 +1,25 @@
 <?php
 require_once('mod/settings.php');
 
-function delegate_init(&$a) {
+function delegate_init(App &$a) {
 	return settings_init($a);
 }
 
 
-function delegate_content(&$a) {
+function delegate_content(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
 
-	if($a->argc > 2 && $a->argv[1] === 'add' && intval($a->argv[2])) {
+	if ($a->argc > 2 && $a->argv[1] === 'add' && intval($a->argv[2])) {
 
 		// delegated admins can view but not change delegation permissions
 
-		if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
-			goaway($a->get_baseurl() . '/delegate');
+		if (x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
+			goaway(App::get_baseurl() . '/delegate');
+		}
 
 
 		$id = $a->argv[2];
@@ -29,7 +30,7 @@ function delegate_content(&$a) {
 		if (dbm::is_result($r)) {
 			$r = q("select id from contact where uid = %d and nurl = '%s' limit 1",
 				intval(local_user()),
-				dbesc(normalise_link($a->get_baseurl() . '/profile/' . $r[0]['nickname']))
+				dbesc(normalise_link(App::get_baseurl() . '/profile/' . $r[0]['nickname']))
 			);
 			if (dbm::is_result($r)) {
 				q("insert into manage ( uid, mid ) values ( %d , %d ) ",
@@ -38,21 +39,22 @@ function delegate_content(&$a) {
 				);
 			}
 		}
-		goaway($a->get_baseurl() . '/delegate');
+		goaway(App::get_baseurl() . '/delegate');
 	}
 
-	if($a->argc > 2 && $a->argv[1] === 'remove' && intval($a->argv[2])) {
+	if ($a->argc > 2 && $a->argv[1] === 'remove' && intval($a->argv[2])) {
 
 		// delegated admins can view but not change delegation permissions
 
-		if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
-			goaway($a->get_baseurl() . '/delegate');
+		if (x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
+			goaway(App::get_baseurl() . '/delegate');
+		}
 
 		q("delete from manage where uid = %d and mid = %d limit 1",
 			intval($a->argv[2]),
 			intval(local_user())
 		);
-		goaway($a->get_baseurl() . '/delegate');
+		goaway(App::get_baseurl() . '/delegate');
 
 	}
 
@@ -92,12 +94,12 @@ function delegate_content(&$a) {
 
 	$r = q("select nurl from contact where substring_index(contact.nurl,'/',3) = '%s' 
 		and contact.uid = %d and contact.self = 0 and network = '%s' ",
-		dbesc(normalise_link($a->get_baseurl())),
+		dbesc(normalise_link(App::get_baseurl())),
 		intval(local_user()),
 		dbesc(NETWORK_DFRN)
 	); 
 
-	if(! dbm::is_result($r)) {
+	if (! dbm::is_result($r)) {
 		notice( t('No potential page delegates located.') . EOL);
 		return;
 	}
@@ -105,7 +107,7 @@ function delegate_content(&$a) {
 	$nicknames = array();
 
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			$nicknames[] = "'" . dbesc(basename($rr['nurl'])) . "'";
 		}
 	}
@@ -128,7 +130,7 @@ function delegate_content(&$a) {
 
 	$o = replace_macros(get_markup_template('delegate.tpl'),array(
 		'$header' => t('Delegate Page Management'),
-		'$base' => $a->get_baseurl(),
+		'$base' => App::get_baseurl(),
 		'$desc' => t('Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely.'),
 		'$head_managers' => t('Existing Page Managers'),
 		'$managers' => $full_managers,
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 23c62cb0ab..22d4c15358 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -121,7 +121,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			intval($uid)
 		);
 
-		if(! dbm::is_result($r)) {
+		if (! dbm::is_result($r)) {
 			logger('Contact not found in DB.');
 			notice( t('Contact not found.') . EOL );
 			notice( t('This may occasionally happen if contact was requested by both persons and it has already been approved.') . EOL );
@@ -194,7 +194,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			$params['public_key'] = $public_key;
 
 
-			$my_url = $a->get_baseurl() . '/profile/' . $user[0]['nickname'];
+			$my_url = App::get_baseurl() . '/profile/' . $user[0]['nickname'];
 
 			openssl_public_encrypt($my_url, $params['source_url'], $site_pubkey);
 			$params['source_url'] = bin2hex($params['source_url']);
@@ -415,23 +415,26 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			);
 		}
 
-		if($r === false)
-				notice( t('Unable to set contact photo.') . EOL);
+		/// @TODO is dbm::is_result() working here?
+		if ($r === false) {
+			notice( t('Unable to set contact photo.') . EOL);
+		}
 
 		// reload contact info
 
 		$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
 			intval($contact_id)
 		);
-		if (dbm::is_result($r))
+		if (dbm::is_result($r)) {
 			$contact = $r[0];
-		else
+		} else {
 			$contact = null;
+		}
 
 
-		if((isset($new_relation) && $new_relation == CONTACT_IS_FRIEND)) {
+		if ((isset($new_relation) && $new_relation == CONTACT_IS_FRIEND)) {
 
-			if(($contact) && ($contact['network'] === NETWORK_DIASPORA)) {
+			if (($contact) && ($contact['network'] === NETWORK_DIASPORA)) {
 				require_once('include/diaspora.php');
 				$ret = diaspora::send_share($user[0],$r[0]);
 				logger('share returns: ' . $ret);
@@ -503,10 +506,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 		// Let's send our user to the contact editor in case they want to
 		// do anything special with this new friend.
 
-		if($handsfree === null)
-			goaway($a->get_baseurl() . '/contacts/' . intval($contact_id));
-		else
+		if ($handsfree === null) {
+			goaway(App::get_baseurl() . '/contacts/' . intval($contact_id));
+		} else {
 			return;
+		}
 		//NOTREACHED
 	}
 
@@ -522,7 +526,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 	 *
 	 */
 
-	if(x($_POST,'source_url')) {
+	if (x($_POST,'source_url')) {
 
 		// We are processing an external confirmation to an introduction created by our user.
 
@@ -543,7 +547,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
 		// If $aes_key is set, both of these items require unpacking from the hex transport encoding.
 
-		if(x($aes_key)) {
+		if (x($aes_key)) {
 			$aes_key = hex2bin($aes_key);
 			$public_key = hex2bin($public_key);
 		}
@@ -553,7 +557,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 		$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1",
 			dbesc($node));
 
-		if(! dbm::is_result($r)) {
+		if (! dbm::is_result($r)) {
 			$message = sprintf(t('No user record found for \'%s\' '), $node);
 			xml_status(3,$message); // failure
 			// NOTREACHED
@@ -584,7 +588,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			dbesc($decrypted_source_url),
 			intval($local_uid)
 		);
-		if(! count($ret)) {
+		if(! dbm::is_result($ret)) {
 			if(strstr($decrypted_source_url,'http:'))
 				$newurl = str_replace('http:','https:',$decrypted_source_url);
 			else
@@ -594,7 +598,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 				dbesc($newurl),
 				intval($local_uid)
 			);
-			if(! count($ret)) {
+			if(! dbm::is_result($ret)) {
 				// this is either a bogus confirmation (?) or we deleted the original introduction.
 				$message = t('Contact record was not found for you on our site.');
 				xml_status(3,$message);
@@ -640,7 +644,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			dbesc($dfrn_pubkey),
 			intval($dfrn_record)
 		);
-		if(! dbm::is_result($r)) {
+		if (! dbm::is_result($r)) {
 			$message = t('Unable to set your contact credentials on our system.');
 			xml_status(3,$message);
 		}
@@ -661,10 +665,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 		$r = q("SELECT `photo` FROM `contact` WHERE `id` = %d LIMIT 1",
 			intval($dfrn_record));
 
-		if (dbm::is_result($r))
+		if (dbm::is_result($r)) {
 			$photo = $r[0]['photo'];
-		else
-			$photo = $a->get_baseurl() . '/images/person-175.jpg';
+		} else {
+			$photo = App::get_baseurl() . '/images/person-175.jpg';
+		}
 
 		require_once("include/Photo.php");
 
@@ -673,11 +678,13 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 		logger('dfrn_confirm: request - photos imported');
 
 		$new_relation = CONTACT_IS_SHARING;
-		if(($relation == CONTACT_IS_FOLLOWER) || ($duplex))
+		if (($relation == CONTACT_IS_FOLLOWER) || ($duplex)) {
 			$new_relation = CONTACT_IS_FRIEND;
+		}
 
-		if(($relation == CONTACT_IS_FOLLOWER) && ($duplex))
+		if (($relation == CONTACT_IS_FOLLOWER) && ($duplex)) {
 			$duplex = 0;
+		}
 
 		$r = q("UPDATE `contact` SET
 			`rel` = %d,
@@ -699,7 +706,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 			dbesc(NETWORK_DFRN),
 			intval($dfrn_record)
 		);
-		if($r === false) {    // indicates schema is messed up or total db failure
+		if ($r === false) {    // indicates schema is messed up or total db failure
 			$message = t('Unable to update your contact profile details on our system');
 			xml_status(3,$message);
 		}
@@ -726,7 +733,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 				'to_name'      => $r[0]['username'],
 				'to_email'     => $r[0]['email'],
 				'uid'          => $r[0]['uid'],
-				'link'		   => $a->get_baseurl() . '/contacts/' . $dfrn_record,
+				'link'		   => App::get_baseurl() . '/contacts/' . $dfrn_record,
 				'source_name'  => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
 				'source_link'  => $r[0]['url'],
 				'source_photo' => $r[0]['photo'],
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index dfa2af18ce..eebaa076d9 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -11,7 +11,7 @@ require_once('include/event.php');
 
 require_once('library/defuse/php-encryption-1.2.1/Crypto.php');
 
-function dfrn_notify_post(&$a) {
+function dfrn_notify_post(App &$a) {
 	logger(__function__, LOGGER_TRACE);
 	$dfrn_id      = ((x($_POST,'dfrn_id'))      ? notags(trim($_POST['dfrn_id']))   : '');
 	$dfrn_version = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version']    : 2.0);
@@ -42,7 +42,7 @@ function dfrn_notify_post(&$a) {
 		dbesc($dfrn_id),
 		dbesc($challenge)
 	);
-	if(! dbm::is_result($r)) {
+	if (! dbm::is_result($r)) {
 		logger('dfrn_notify: could not match challenge to dfrn_id ' . $dfrn_id . ' challenge=' . $challenge);
 		xml_status(3);
 	}
@@ -88,7 +88,7 @@ function dfrn_notify_post(&$a) {
 		dbesc($a->argv[1])
 	);
 
-	if(! dbm::is_result($r)) {
+	if (! dbm::is_result($r)) {
 		logger('dfrn_notify: contact not found for dfrn_id ' . $dfrn_id);
 		xml_status(3);
 		//NOTREACHED
@@ -221,7 +221,7 @@ function dfrn_notify_post(&$a) {
 }
 
 
-function dfrn_notify_content(&$a) {
+function dfrn_notify_content(App &$a) {
 
 	if(x($_GET,'dfrn_id')) {
 
@@ -284,8 +284,9 @@ function dfrn_notify_content(&$a) {
 				dbesc($a->argv[1])
 		);
 
-		if(! dbm::is_result($r))
+		if (! dbm::is_result($r)) {
 			$status = 1;
+		}
 
 		logger("Remote rino version: ".$rino_remote." for ".$r[0]["url"], LOGGER_DEBUG);
 
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 91cd33f49a..a31a50ad25 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -4,7 +4,7 @@ require_once('include/auth.php');
 require_once('include/dfrn.php');
 
 
-function dfrn_poll_init(&$a) {
+function dfrn_poll_init(App &$a) {
 
 
 	$dfrn_id         = ((x($_GET,'dfrn_id'))         ? $_GET['dfrn_id']              : '');
@@ -112,7 +112,7 @@ function dfrn_poll_init(&$a) {
 				}
 			}
 			$profile = $r[0]['nickname'];
-			goaway((strlen($destination_url)) ? $destination_url : $a->get_baseurl() . '/profile/' . $profile);
+			goaway((strlen($destination_url)) ? $destination_url : App::get_baseurl() . '/profile/' . $profile);
 		}
 		goaway(z_root());
 
@@ -126,7 +126,7 @@ function dfrn_poll_init(&$a) {
 			$r = q("SELECT * FROM `profile_check` WHERE `sec` = '%s' ORDER BY `expire` DESC LIMIT 1",
 				dbesc($sec)
 			);
-			if(! dbm::is_result($r)) {
+			if (! dbm::is_result($r)) {
 				xml_status(3, 'No ticket');
 				// NOTREACHED
 			}
@@ -137,7 +137,7 @@ function dfrn_poll_init(&$a) {
 			$c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
 				intval($r[0]['cid'])
 			);
-			if(! count($c)) {
+			if (! dbm::is_result($c)) {
 				xml_status(3, 'No profile');
 			}
 			$contact = $c[0];
@@ -203,7 +203,7 @@ function dfrn_poll_init(&$a) {
 
 
 
-function dfrn_poll_post(&$a) {
+function dfrn_poll_post(App &$a) {
 
 	$dfrn_id      = ((x($_POST,'dfrn_id'))      ? $_POST['dfrn_id']              : '');
 	$challenge    = ((x($_POST,'challenge'))    ? $_POST['challenge']            : '');
@@ -223,7 +223,7 @@ function dfrn_poll_post(&$a) {
 			$r = q("SELECT * FROM `profile_check` WHERE `sec` = '%s' ORDER BY `expire` DESC LIMIT 1",
 				dbesc($sec)
 			);
-			if(! dbm::is_result($r)) {
+			if (! dbm::is_result($r)) {
 				xml_status(3, 'No ticket');
 				// NOTREACHED
 			}
@@ -234,7 +234,7 @@ function dfrn_poll_post(&$a) {
 			$c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
 				intval($r[0]['cid'])
 			);
-			if(! count($c)) {
+			if (! dbm::is_result($c)) {
 				xml_status(3, 'No profile');
 			}
 			$contact = $c[0];
@@ -284,8 +284,9 @@ function dfrn_poll_post(&$a) {
 		dbesc($challenge)
 	);
 
-	if(! dbm::is_result($r))
+	if (! dbm::is_result($r)) {
 		killme();
+	}
 
 	$type = $r[0]['type'];
 	$last_update = $r[0]['last_update'];
@@ -319,8 +320,9 @@ function dfrn_poll_post(&$a) {
 	$r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1");
 
 
-	if(! dbm::is_result($r))
+	if (! dbm::is_result($r)) {
 		killme();
+	}
 
 	$contact = $r[0];
 	$owner_uid = $r[0]['uid'];
@@ -381,7 +383,7 @@ function dfrn_poll_post(&$a) {
 	}
 }
 
-function dfrn_poll_content(&$a) {
+function dfrn_poll_content(App &$a) {
 
 	$dfrn_id         = ((x($_GET,'dfrn_id'))         ? $_GET['dfrn_id']              : '');
 	$type            = ((x($_GET,'type'))            ? $_GET['type']                 : 'data');
@@ -499,14 +501,14 @@ function dfrn_poll_content(&$a) {
 
 			switch($destination_url) {
 				case 'profile':
-					$dest = $a->get_baseurl() . '/profile/' . $profile . '?f=&tab=profile';
+					$dest = App::get_baseurl() . '/profile/' . $profile . '?f=&tab=profile';
 					break;
 				case 'photos':
-					$dest = $a->get_baseurl() . '/photos/' . $profile;
+					$dest = App::get_baseurl() . '/photos/' . $profile;
 					break;
 				case 'status':
 				case '':
-					$dest = $a->get_baseurl() . '/profile/' . $profile;
+					$dest = App::get_baseurl() . '/profile/' . $profile;
 					break;
 				default:
 					$dest = $destination_url . '?f=&redir=1';
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 236970a2e9..b9c1b67446 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -17,7 +17,7 @@ require_once('include/Scrape.php');
 require_once('include/Probe.php');
 require_once('include/group.php');
 
-function dfrn_request_init(&$a) {
+function dfrn_request_init(App &$a) {
 
 	if($a->argc > 1)
 		$which = $a->argv[1];
@@ -42,7 +42,7 @@ function dfrn_request_init(&$a) {
  * After logging in, we click 'submit' to approve the linkage.
  *
  */
-function dfrn_request_post(&$a) {
+function dfrn_request_post(App &$a) {
 
 	if(($a->argc != 2) || (! count($a->profile))) {
 		logger('Wrong count of argc or profiles: argc=' . $a->argc . ',profile()=' . count($a->profile));
@@ -120,17 +120,19 @@ function dfrn_request_post(&$a) {
 
 					$parms = Probe::profile($dfrn_url);
 
-					if(! count($parms)) {
+					if (! count($parms)) {
 						notice( t('Profile location is not valid or does not contain profile information.') . EOL );
 						return;
 					}
 					else {
-						if(! x($parms,'fn'))
+						if (! x($parms,'fn')) {
 							notice( t('Warning: profile location has no identifiable owner name.') . EOL );
-						if(! x($parms,'photo'))
+						}
+						if (! x($parms,'photo')) {
 							notice( t('Warning: profile location has no profile photo.') . EOL );
+						}
 						$invalid = Probe::valid_dfrn($parms);
-						if($invalid) {
+						if ($invalid) {
 							notice( sprintf( tt("%d required parameter was not found at the given location",
 												"%d required parameters were not found at the given location",
 												$invalid), $invalid) . EOL );
@@ -176,7 +178,7 @@ function dfrn_request_post(&$a) {
 					);
 				}
 
-				if($r) {
+				if ($r) {
 					info( t("Introduction complete.") . EOL);
 				}
 
@@ -193,19 +195,22 @@ function dfrn_request_post(&$a) {
 					if (isset($photo))
 						update_contact_avatar($photo, local_user(), $r[0]["id"], true);
 
-					$forwardurl = $a->get_baseurl()."/contacts/".$r[0]['id'];
-				} else
-					$forwardurl = $a->get_baseurl()."/contacts";
+					$forwardurl = App::get_baseurl()."/contacts/".$r[0]['id'];
+				} else {
+					$forwardurl = App::get_baseurl()."/contacts";
+				}
 
 				/*
 				 * Allow the blocked remote notification to complete
 				 */
 
-				if(is_array($contact_record))
+				if (is_array($contact_record)) {
 					$dfrn_request = $contact_record['request'];
+				}
 
-				if(strlen($dfrn_request) && strlen($confirm_key))
+				if (strlen($dfrn_request) && strlen($confirm_key)) {
 					$s = fetch_url($dfrn_request . '?confirm_key=' . $confirm_key);
+				}
 
 				// (ignore reply, nothing we can do it failed)
 
@@ -296,7 +301,7 @@ function dfrn_request_post(&$a) {
 			dbesc(NETWORK_MAIL2)
 		);
 		if (dbm::is_result($r)) {
-			foreach($r as $rr) {
+			foreach ($r as $rr) {
 				if(! $rr['rel']) {
 					q("DELETE FROM `contact` WHERE `id` = %d",
 						intval($rr['cid'])
@@ -321,7 +326,7 @@ function dfrn_request_post(&$a) {
 			dbesc(NETWORK_MAIL2)
 		);
 		if (dbm::is_result($r)) {
-			foreach($r as $rr) {
+			foreach ($r as $rr) {
 				if(! $rr['rel']) {
 					q("DELETE FROM `contact` WHERE `id` = %d",
 						intval($rr['cid'])
@@ -371,7 +376,7 @@ function dfrn_request_post(&$a) {
 					intval($uid)
 				);
 
-				if(! dbm::is_result($r)) {
+				if (! dbm::is_result($r)) {
 					notice( t('This account has not been configured for email. Request failed.') . EOL);
 					return;
 				}
@@ -499,15 +504,15 @@ function dfrn_request_post(&$a) {
 				);
 			}
 			else {
-				if(! validate_url($url)) {
+				if (! validate_url($url)) {
 					notice( t('Invalid profile URL.') . EOL);
-					goaway($a->get_baseurl() . '/' . $a->cmd);
+					goaway(App::get_baseurl() . '/' . $a->cmd);
 					return; // NOTREACHED
 				}
 
-				if(! allowed_url($url)) {
+				if (! allowed_url($url)) {
 					notice( t('Disallowed profile URL.') . EOL);
-					goaway($a->get_baseurl() . '/' . $a->cmd);
+					goaway(App::get_baseurl() . '/' . $a->cmd);
 					return; // NOTREACHED
 				}
 
@@ -516,17 +521,19 @@ function dfrn_request_post(&$a) {
 
 				$parms = Probe::profile(($hcard) ? $hcard : $url);
 
-				if(! count($parms)) {
+				if (! count($parms)) {
 					notice( t('Profile location is not valid or does not contain profile information.') . EOL );
-					goaway($a->get_baseurl() . '/' . $a->cmd);
+					goaway(App::get_baseurl() . '/' . $a->cmd);
 				}
 				else {
-					if(! x($parms,'fn'))
+					if (! x($parms,'fn')) {
 						notice( t('Warning: profile location has no identifiable owner name.') . EOL );
-					if(! x($parms,'photo'))
+					}
+					if (! x($parms,'photo')) {
 						notice( t('Warning: profile location has no profile photo.') . EOL );
+					}
 					$invalid = Probe::valid_dfrn($parms);
-					if($invalid) {
+					if ($invalid) {
 						notice( sprintf( tt("%d required parameter was not found at the given location",
 											"%d required parameters were not found at the given location",
 											$invalid), $invalid) . EOL );
@@ -565,7 +572,7 @@ function dfrn_request_post(&$a) {
 				);
 
 				// find the contact record we just created
-				if($r) {
+				if ($r) {
 					$r = q("SELECT `id` FROM `contact`
 						WHERE `uid` = %d AND `url` = '%s' AND `issued-id` = '%s' LIMIT 1",
 						intval($uid),
@@ -579,14 +586,14 @@ function dfrn_request_post(&$a) {
 				}
 
 			}
-			if($r === false) {
+			if ($r === false) {
 				notice( t('Failed to update contact record.') . EOL );
 				return;
 			}
 
 			$hash = random_string() . (string) time();   // Generate a confirm_key
 
-			if(is_array($contact_record)) {
+			if (is_array($contact_record)) {
 				$ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`)
 					VALUES ( %d, %d, 1, %d, '%s', '%s', '%s' )",
 					intval($uid),
@@ -600,12 +607,13 @@ function dfrn_request_post(&$a) {
 
 			// This notice will only be seen by the requestor if the requestor and requestee are on the same server.
 
-			if(! $failed)
+			if (! $failed) {
 				info( t('Your introduction has been sent.') . EOL );
+			}
 
 			// "Homecoming" - send the requestor back to their site to record the introduction.
 
-			$dfrn_url = bin2hex($a->get_baseurl() . '/profile/' . $nickname);
+			$dfrn_url = bin2hex(App::get_baseurl() . '/profile/' . $nickname);
 			$aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0);
 
 			goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url"
@@ -633,8 +641,9 @@ function dfrn_request_post(&$a) {
 					$uri .= '/'.$a->get_path();
 
 				$uri = urlencode($uri);
-			} else
-				$uri = $a->get_baseurl().'/profile/'.$nickname;
+			} else {
+				$uri = App::get_baseurl().'/profile/'.$nickname;
+			}
 
 			$url = str_replace('{uri}', $uri, $url);
 			goaway($url);
@@ -649,18 +658,19 @@ function dfrn_request_post(&$a) {
 }
 
 
-function dfrn_request_content(&$a) {
+function dfrn_request_content(App &$a) {
 
-	if(($a->argc != 2) || (! count($a->profile)))
+	if (($a->argc != 2) || (! count($a->profile))) {
 		return "";
+	}
 
 
 	// "Homecoming". Make sure we're logged in to this site as the correct user. Then offer a confirm button
 	// to send us to the post section to record the introduction.
 
-	if(x($_GET,'dfrn_url')) {
+	if (x($_GET,'dfrn_url')) {
 
-		if(! local_user()) {
+		if (! local_user()) {
 			info( t("Please login to confirm introduction.") . EOL );
 			/* setup the return URL to come back to this page if they use openid */
 			$_SESSION['return_url'] = $a->query_string;
@@ -742,7 +752,7 @@ function dfrn_request_content(&$a) {
 						'to_name'      => $r[0]['username'],
 						'to_email'     => $r[0]['email'],
 						'uid'          => $r[0]['uid'],
-						'link'         => $a->get_baseurl() . '/notifications/intros',
+						'link'         => App::get_baseurl() . '/notifications/intros',
 						'source_name'  => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
 						'source_link'  => $r[0]['url'],
 						'source_photo' => $r[0]['photo'],
@@ -804,15 +814,18 @@ function dfrn_request_content(&$a) {
 			$myaddr = hex2bin($_GET['addr']);
 		elseif (x($_GET,'address') AND ($_GET['address'] != ""))
 			$myaddr = $_GET['address'];
-		elseif(local_user()) {
-			if(strlen($a->path)) {
-				$myaddr = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
+		elseif (local_user()) {
+			if (strlen($a->path)) {
+				$myaddr = App::get_baseurl() . '/profile/' . $a->user['nickname'];
 			}
 			else {
 				$myaddr = $a->user['nickname'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3 );
 			}
-		} else	// last, try a zrl
+		}
+		else {
+			// last, try a zrl
 			$myaddr = get_my_url();
+		}
 
 		$target_addr = $a->profile['nickname'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3 );
 
@@ -825,10 +838,12 @@ function dfrn_request_content(&$a) {
 		 *
 		 */
 
-		if($a->profile['page-flags'] == PAGE_NORMAL)
+		if ($a->profile['page-flags'] == PAGE_NORMAL) {
 			$tpl = get_markup_template('dfrn_request.tpl');
-		else
+		}
+		else {
 			$tpl = get_markup_template('auto_request.tpl');
+		}
 
 		$page_desc = t("Please enter your 'Identity Address' from one of the following supported communications networks:");
 
@@ -842,8 +857,9 @@ function dfrn_request_content(&$a) {
 			$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
 				intval($a->profile['uid'])
 			);
-			if(! dbm::is_result($r))
+			if (! dbm::is_result($r)) {
 				$mail_disabled = 1;
+			}
 		}
 
 		// "coming soon" is disabled for now
diff --git a/mod/directory.php b/mod/directory.php
index ddea650de2..f3fbb9eb77 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -1,6 +1,6 @@
 <?php
 
-function directory_init(&$a) {
+function directory_init(App &$a) {
 	$a->set_pager_itemspage(60);
 
 	if(local_user()) {
@@ -20,14 +20,14 @@ function directory_init(&$a) {
 }
 
 
-function directory_post(&$a) {
+function directory_post(App &$a) {
 	if(x($_POST,'search'))
 		$a->data['search'] = $_POST['search'];
 }
 
 
 
-function directory_content(&$a) {
+function directory_content(App &$a) {
 	global $db;
 
 	require_once("mod/proxy.php");
@@ -92,12 +92,14 @@ function directory_content(&$a) {
 			WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 AND `contact`.`self` $sql_extra $order LIMIT ".$limit);
 	if (dbm::is_result($r)) {
 
-		if(in_array('small', $a->argv))
+		if (in_array('small', $a->argv)) {
 			$photo = 'thumb';
-		else
+		}
+		else {
 			$photo = 'photo';
+		}
 
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 
 			$itemurl= '';
 
diff --git a/mod/dirfind.php b/mod/dirfind.php
index 215731978c..7eb830bb68 100644
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -5,15 +5,16 @@ require_once('include/Contact.php');
 require_once('include/contact_selectors.php');
 require_once('mod/contacts.php');
 
-function dirfind_init(&$a) {
+function dirfind_init(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL );
 		return;
 	}
 
-	if(! x($a->page,'aside'))
+	if (! x($a->page,'aside')) {
 		$a->page['aside'] = '';
+	}
 
 	$a->page['aside'] .= findpeople_widget();
 
@@ -31,7 +32,7 @@ function dirfind_content(&$a, $prefix = "") {
 
 	$search = $prefix.notags(trim($_REQUEST['search']));
 
-	if(strpos($search,'@') === 0) {
+	if (strpos($search,'@') === 0) {
 		$search = substr($search,1);
 		$header = sprintf( t('People Search - %s'), $search);
 		if ((valid_email($search) AND validate_email($search)) OR
@@ -41,7 +42,7 @@ function dirfind_content(&$a, $prefix = "") {
 		}
 	}
 
-	if(strpos($search,'!') === 0) {
+	if (strpos($search,'!') === 0) {
 		$search = substr($search,1);
 		$community = true;
 		$header = sprintf( t('Forum Search - %s'), $search);
@@ -49,7 +50,7 @@ function dirfind_content(&$a, $prefix = "") {
 
 	$o = '';
 
-	if($search) {
+	if ($search) {
 
 		if ($discover_user) {
 			$j = new stdClass();
@@ -85,18 +86,21 @@ function dirfind_content(&$a, $prefix = "") {
 			$perpage = 80;
 			$startrec = (($a->pager['page']) * $perpage) - $perpage;
 
-			if (get_config('system','diaspora_enabled'))
+			if (get_config('system','diaspora_enabled')) {
 				$diaspora = NETWORK_DIASPORA;
-			else
+			} else {
 				$diaspora = NETWORK_DFRN;
+			}
 
-			if (!get_config('system','ostatus_disabled'))
+			if (!get_config('system','ostatus_disabled')) {
 				$ostatus = NETWORK_OSTATUS;
-			else
+			} else {
 				$ostatus = NETWORK_DFRN;
+			}
 
 			$search2 = "%".$search."%";
 
+			/// @TODO These 2 SELECTs are not checked on validity with dbm::is_result()
 			$count = q("SELECT count(*) AS `total` FROM `gcontact`
 					LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl`
 						AND `contact`.`network` = `gcontact`.`network`
@@ -133,8 +137,9 @@ function dirfind_content(&$a, $prefix = "") {
 			$j->items_page = $perpage;
 			$j->page = $a->pager['page'];
 			foreach ($results AS $result) {
-				if (poco_alternate_ostatus_url($result["url"]))
-					 continue;
+				if (poco_alternate_ostatus_url($result["url"])) {
+					continue;
+				}
 
 				$result = get_contact_details_by_url($result["url"], local_user(), $result);
 
@@ -167,16 +172,16 @@ function dirfind_content(&$a, $prefix = "") {
 			$j = json_decode($x);
 		}
 
-		if($j->total) {
+		if ($j->total) {
 			$a->set_pager_total($j->total);
 			$a->set_pager_itemspage($j->items_page);
 		}
 
-		if(count($j->results)) {
+		if (count($j->results)) {
 
 			$id = 0;
 
-			foreach($j->results as $jj) {
+			foreach ($j->results as $jj) {
 
 				$alt_text = "";
 
@@ -194,10 +199,11 @@ function dirfind_content(&$a, $prefix = "") {
 						$photo_menu = contact_photo_menu($contact[0]);
 						$details = _contact_detail_for_template($contact[0]);
 						$alt_text = $details['alt_text'];
-					} else
+					} else {
 						$photo_menu = array();
+					}
 				} else {
-					$connlnk = $a->get_baseurl().'/follow/?url='.(($jj->connect) ? $jj->connect : $jj->url);
+					$connlnk = App::get_baseurl().'/follow/?url='.(($jj->connect) ? $jj->connect : $jj->url);
 					$conntxt = t('Connect');
 					$photo_menu = array(
 						'profile' => array(t("View Profile"), zrl($jj->url)),
@@ -235,8 +241,7 @@ function dirfind_content(&$a, $prefix = "") {
 			'$paginate' => paginate($a),
 		));
 
-		}
-		else {
+		} else {
 			info( t('No matches') . EOL);
 		}
 
diff --git a/mod/display.php b/mod/display.php
index 293156cf19..c98d936a0f 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -1,6 +1,6 @@
 <?php
 
-function display_init(&$a) {
+function display_init(App &$a) {
 
 	if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
 		return;
@@ -81,8 +81,8 @@ function display_init(&$a) {
 
 			$profiledata = display_fetchauthor($a, $r[0]);
 
-			if (strstr(normalise_link($profiledata["url"]), normalise_link($a->get_baseurl()))) {
-				$nickname = str_replace(normalise_link($a->get_baseurl())."/profile/", "", normalise_link($profiledata["url"]));
+			if (strstr(normalise_link($profiledata["url"]), normalise_link(App::get_baseurl()))) {
+				$nickname = str_replace(normalise_link(App::get_baseurl())."/profile/", "", normalise_link($profiledata["url"]));
 
 				if (($nickname != $a->user["nickname"])) {
 					$r = qu("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
@@ -184,7 +184,7 @@ function display_fetchauthor($a, $item) {
 
 	if (local_user()) {
 		if (in_array($profiledata["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
-			$profiledata["remoteconnect"] = $a->get_baseurl()."/follow?url=".urlencode($profiledata["url"]);
+			$profiledata["remoteconnect"] = App::get_baseurl()."/follow?url=".urlencode($profiledata["url"]);
 		}
 	} elseif ($profiledata["network"] == NETWORK_DFRN) {
 		$connect = str_replace("/profile/", "/dfrn_request/", $profiledata["url"]);
diff --git a/mod/editpost.php b/mod/editpost.php
index 217d793f52..a655801d77 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -2,18 +2,18 @@
 
 require_once('include/acl_selectors.php');
 
-function editpost_content(&$a) {
+function editpost_content(App &$a) {
 
 	$o = '';
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
 
 	$post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
-	if(! $post_id) {
+	if (! $post_id) {
 		notice( t('Item not found') . EOL);
 		return;
 	}
@@ -23,7 +23,7 @@ function editpost_content(&$a) {
 		intval(local_user())
 	);
 
-	if(! count($itm)) {
+	if (! dbm::is_result($itm)) {
 		notice( t('Item not found') . EOL);
 		return;
 	}
@@ -42,7 +42,7 @@ function editpost_content(&$a) {
 
 	$tpl = get_markup_template('jot-header.tpl');
 	$a->page['htmlhead'] .= replace_macros($tpl, array(
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => App::get_baseurl(),
 		'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 		'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
 		'$geotag' => $geotag,
@@ -51,7 +51,7 @@ function editpost_content(&$a) {
 
 	$tpl = get_markup_template('jot-end.tpl');
 	$a->page['end'] .= replace_macros($tpl, array(
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => App::get_baseurl(),
 		'$editselect' =>  (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 		'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
 		'$geotag' => $geotag,
@@ -126,7 +126,7 @@ function editpost_content(&$a) {
 		'$ptyp' => $itm[0]['type'],
 		'$content' => undo_post_tagging($itm[0]['body']),
 		'$post_id' => $post_id,
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => App::get_baseurl(),
 		'$defloc' => $a->user['default-location'],
 		'$visitor' => 'none',
 		'$pvisit' => 'none',
diff --git a/mod/events.php b/mod/events.php
index 7cb171f9e5..1ed04deb08 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -8,20 +8,22 @@ require_once('include/datetime.php');
 require_once('include/event.php');
 require_once('include/items.php');
 
-function events_init(&$a) {
-	if(! local_user())
+function events_init(App &$a) {
+	if (! local_user()) {
 		return;
+	}
 
-	if($a->argc == 1) {
+	if ($a->argc == 1) {
 		// if it's a json request abort here becaus we don't
 		// need the widget data
-		if($a->argv[1] === 'json')
+		if ($a->argv[1] === 'json')
 			return;
 
 		$cal_widget = widget_events();
 
-		if(! x($a->page,'aside'))
+		if (! x($a->page,'aside')) {
 			$a->page['aside'] = '';
+		}
 
 		$a->page['aside'] .= $cal_widget;
 	}
@@ -29,12 +31,13 @@ function events_init(&$a) {
 	return;
 }
 
-function events_post(&$a) {
+function events_post(App &$a) {
 
 	logger('post: ' . print_r($_REQUEST,true));
 
-	if(! local_user())
+	if (! local_user()) {
 		return;
+	}
 
 	$event_id = ((x($_POST,'event_id')) ? intval($_POST['event_id']) : 0);
 	$cid = ((x($_POST,'cid')) ? intval($_POST['cid']) : 0);
@@ -49,33 +52,35 @@ function events_post(&$a) {
 	// The default setting for the `private` field in event_store() is false, so mirror that
 	$private_event = false;
 
-	if($start_text) {
+	if ($start_text) {
 		$start = $start_text;
 	}
 	else {
 		$start    = sprintf('%d-%d-%d %d:%d:0',$startyear,$startmonth,$startday,$starthour,$startminute);
 	}
 
-	if($nofinish) {
+	if ($nofinish) {
 		$finish = '0000-00-00 00:00:00';
 	}
 
-	if($finish_text) {
+	if ($finish_text) {
 		$finish = $finish_text;
 	}
 	else {
 		$finish    = sprintf('%d-%d-%d %d:%d:0',$finishyear,$finishmonth,$finishday,$finishhour,$finishminute);
 	}
 
-	if($adjust) {
+	if ($adjust) {
 		$start = datetime_convert(date_default_timezone_get(),'UTC',$start);
-		if(! $nofinish)
+		if (! $nofinish) {
 			$finish = datetime_convert(date_default_timezone_get(),'UTC',$finish);
+		}
 	}
 	else {
 		$start = datetime_convert('UTC','UTC',$start);
-		if(! $nofinish)
+		if (! $nofinish) {
 			$finish = datetime_convert('UTC','UTC',$finish);
+		}
 	}
 
 	// Don't allow the event to finish before it begins.
@@ -89,11 +94,11 @@ function events_post(&$a) {
 	$type     = 'event';
 
 	$action = ($event_id == '') ? 'new' : "event/" . $event_id;
-	$onerror_url = $a->get_baseurl() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish";
+	$onerror_url = App::get_baseurl() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish";
 
-	if(strcmp($finish,$start) < 0 && !$nofinish) {
+	if (strcmp($finish,$start) < 0 && !$nofinish) {
 		notice( t('Event can not end before it has started.') . EOL);
-		if(intval($_REQUEST['preview'])) {
+		if (intval($_REQUEST['preview'])) {
 			echo( t('Event can not end before it has started.'));
 			killme();
 		}
@@ -184,45 +189,48 @@ function events_post(&$a) {
 
 
 
-function events_content(&$a) {
+function events_content(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
 
-	if($a->argc == 1)
-		$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
+	if ($a->argc == 1) {
+		$_SESSION['return_url'] = App::get_baseurl() . '/' . $a->cmd;
+	}
 
-	if(($a->argc > 2) && ($a->argv[1] === 'ignore') && intval($a->argv[2])) {
+	if (($a->argc > 2) && ($a->argv[1] === 'ignore') && intval($a->argv[2])) {
 		$r = q("update event set ignore = 1 where id = %d and uid = %d",
 			intval($a->argv[2]),
 			intval(local_user())
 		);
 	}
 
-	if(($a->argc > 2) && ($a->argv[1] === 'unignore') && intval($a->argv[2])) {
+	if (($a->argc > 2) && ($a->argv[1] === 'unignore') && intval($a->argv[2])) {
 		$r = q("update event set ignore = 0 where id = %d and uid = %d",
 			intval($a->argv[2]),
 			intval(local_user())
 		);
 	}
 
-	if ($a->theme_events_in_profile)
+	if ($a->theme_events_in_profile) {
 		nav_set_selected('home');
-	else
+	} else {
 		nav_set_selected('events');
+	}
 
 	$editselect = 'none';
-	if( feature_enabled(local_user(), 'richtext') )
+	if ( feature_enabled(local_user(), 'richtext') ) {
 		$editselect = 'textareas';
+	}
 
 	// get the translation strings for the callendar
 	$i18n = get_event_strings();
 
 	$htpl = get_markup_template('event_head.tpl');
 	$a->page['htmlhead'] .= replace_macros($htpl,array(
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => App::get_baseurl(),
 		'$module_url' => '/events',
 		'$modparams' => 1,
 		'$i18n' => $i18n,
@@ -231,7 +239,7 @@ function events_content(&$a) {
 
 	$etpl = get_markup_template('event_end.tpl');
 	$a->page['end'] .= replace_macros($etpl,array(
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => App::get_baseurl(),
 		'$editselect' => $editselect
 	));
 
@@ -248,15 +256,15 @@ function events_content(&$a) {
 	$ignored = ((x($_REQUEST,'ignored')) ? intval($_REQUEST['ignored']) : 0);
 
 	if($a->argc > 1) {
-		if($a->argc > 2 && $a->argv[1] == 'event') {
+		if ($a->argc > 2 && $a->argv[1] == 'event') {
 			$mode = 'edit';
 			$event_id = intval($a->argv[2]);
 		}
-		if($a->argv[1] === 'new') {
+		if ($a->argv[1] === 'new') {
 			$mode = 'new';
 			$event_id = 0;
 		}
-		if($a->argc > 2 && intval($a->argv[1]) && intval($a->argv[2])) {
+		if ($a->argc > 2 && intval($a->argv[1]) && intval($a->argv[2])) {
 			$mode = 'view';
 			$y = intval($a->argv[1]);
 			$m = intval($a->argv[2]);
@@ -264,23 +272,27 @@ function events_content(&$a) {
 	}
 
 	// The view mode part is similiar to /mod/cal.php
-	if($mode == 'view') {
+	if ($mode == 'view') {
 
 
 		$thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y');
 		$thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m');
-		if(! $y)
+		if (! $y) {
 			$y = intval($thisyear);
-		if(! $m)
+		}
+		if (! $m) {
 			$m = intval($thismonth);
+		}
 
 		// Put some limits on dates. The PHP date functions don't seem to do so well before 1900.
 		// An upper limit was chosen to keep search engines from exploring links millions of years in the future.
 
-		if($y < 1901)
+		if ($y < 1901) {
 			$y = 1900;
-		if($y > 2099)
+		}
+		if ($y > 2099) {
 			$y = 2100;
+		}
 
 		$nextyear = $y;
 		$nextmonth = $m + 1;
@@ -334,10 +346,11 @@ function events_content(&$a) {
 
 		if (dbm::is_result($r)) {
 			$r = sort_by_date($r);
-			foreach($r as $rr) {
+			foreach ($r as $rr) {
 				$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j'));
-				if(! x($links,$j))
-					$links[$j] = $a->get_baseurl() . '/' . $a->cmd . '#link-' . $j;
+				if (! x($links,$j)) {
+					$links[$j] = App::get_baseurl() . '/' . $a->cmd . '#link-' . $j;
+				}
 			}
 		}
 
@@ -375,13 +388,13 @@ function events_content(&$a) {
 		}
 
 		$o = replace_macros($tpl, array(
-			'$baseurl'	=> $a->get_baseurl(),
+			'$baseurl'	=> App::get_baseurl(),
 			'$tabs'		=> $tabs,
 			'$title'	=> t('Events'),
 			'$view'		=> t('View'),
-			'$new_event'	=> array($a->get_baseurl().'/events/new',t('Create New Event'),'',''),
-			'$previus'	=> array($a->get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''),
-			'$next'		=> array($a->get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''),
+			'$new_event'	=> array(App::get_baseurl().'/events/new',t('Create New Event'),'',''),
+			'$previus'	=> array(App::get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''),
+			'$next'		=> array(App::get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''),
 			'$calendar'	=> cal($y,$m,$links, ' eventcal'),
 
 			'$events'	=> $events,
@@ -475,7 +488,7 @@ function events_content(&$a) {
 		$tpl = get_markup_template('event_form.tpl');
 
 		$o .= replace_macros($tpl,array(
-			'$post' => $a->get_baseurl() . '/events',
+			'$post' => App::get_baseurl() . '/events',
 			'$eid' => $eid,
 			'$cid' => $cid,
 			'$uri' => $uri,
diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 11ac2d8253..8c54a47ba2 100644
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -10,7 +10,7 @@ require_once('include/Photo.php');
 /**
  * @param App $a
  */
-function fbrowser_content($a){
+function fbrowser_content(App &$a){
 
 	if (!local_user())
 		killme();
@@ -83,9 +83,9 @@ function fbrowser_content($a){
 					$scale = $rr['loq'];
 
 				return array(
-					$a->get_baseurl() . '/photos/' . $a->user['nickname'] . '/image/' . $rr['resource-id'],
+					App::get_baseurl() . '/photos/' . $a->user['nickname'] . '/image/' . $rr['resource-id'],
 					$filename_e,
-					$a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext
+					App::get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext
 				);
 			}
 			$files = array_map("_map_files1", $r);
@@ -94,7 +94,7 @@ function fbrowser_content($a){
 
 			$o =  replace_macros($tpl, array(
 				'$type' => 'image',
-				'$baseurl' => $a->get_baseurl(),
+				'$baseurl' => App::get_baseurl(),
 				'$path' => $path,
 				'$folders' => $albums,
 				'$files' =>$files,
@@ -122,7 +122,7 @@ function fbrowser_content($a){
 						$filename_e = $rr['filename'];
 					}
 
-					return array( $a->get_baseurl() . '/attach/' . $rr['id'], $filename_e, $a->get_baseurl() . '/images/icons/16/' . $filetype . '.png');
+					return array( App::get_baseurl() . '/attach/' . $rr['id'], $filename_e, App::get_baseurl() . '/images/icons/16/' . $filetype . '.png');
 				}
 				$files = array_map("_map_files2", $files);
 
@@ -130,7 +130,7 @@ function fbrowser_content($a){
 				$tpl = get_markup_template($template_file);
 				$o = replace_macros($tpl, array(
 					'$type' => 'file',
-					'$baseurl' => $a->get_baseurl(),
+					'$baseurl' => App::get_baseurl(),
 					'$path' => array( array( "", t("Files")) ),
 					'$folders' => false,
 					'$files' =>$files,
diff --git a/mod/fetch.php b/mod/fetch.php
index 04bdf51880..bf27ffb6a6 100644
--- a/mod/fetch.php
+++ b/mod/fetch.php
@@ -8,7 +8,7 @@ require_once("include/xml.php");
 
 /// @TODO You always make it like this: function foo(&$a)
 /// @TODO This means that the value of $a can be changed in anything, remove & and use App as type-hint
-function fetch_init(&$a){
+function fetch_init(App &$a){
 
 	if (($a->argc != 3) OR (!in_array($a->argv[1], array("post", "status_message", "reshare")))) {
 		header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
diff --git a/mod/filer.php b/mod/filer.php
index 4e79f337dc..1b5589380b 100644
--- a/mod/filer.php
+++ b/mod/filer.php
@@ -5,9 +5,9 @@ require_once('include/bbcode.php');
 require_once('include/items.php');
 
 
-function filer_content(&$a) {
+function filer_content(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		killme();
 	}
 
diff --git a/mod/filerm.php b/mod/filerm.php
index c266082c8f..7dbfe29473 100644
--- a/mod/filerm.php
+++ b/mod/filerm.php
@@ -1,8 +1,8 @@
 <?php
 
-function filerm_content(&$a) {
+function filerm_content(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		killme();
 	}
 
@@ -10,18 +10,21 @@ function filerm_content(&$a) {
 	$cat = unxmlify(trim($_GET['cat']));
 
 	$category = (($cat) ? true : false);
-	if($category)
+	if ($category) {
 		$term = $cat;
+	}
 
 	$item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 
 	logger('filerm: tag ' . $term . ' item ' . $item_id);
 
-	if($item_id && strlen($term))
+	if ($item_id && strlen($term)) {
 		file_tag_unsave_file(local_user(),$item_id,$term, $category);
+	}
 
-	if(x($_SESSION,'return_url'))
-		goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
+	if (x($_SESSION,'return_url')) {
+		goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
+	}
 
 	killme();
 }
diff --git a/mod/follow.php b/mod/follow.php
index 1f56caea50..3ba33780ba 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -5,9 +5,9 @@ require_once('include/follow.php');
 require_once('include/Contact.php');
 require_once('include/contact_selectors.php');
 
-function follow_content(&$a) {
+function follow_content(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		goaway($_SESSION['return_url']);
 		// NOTREACHED
@@ -56,14 +56,15 @@ function follow_content(&$a) {
 		// NOTREACHED
 	}
 
-	if ($ret["network"] == NETWORK_MAIL)
+	if ($ret["network"] == NETWORK_MAIL) {
 		$ret["url"] = $ret["addr"];
+	}
 
-	if($ret['network'] === NETWORK_DFRN) {
+	if ($ret['network'] === NETWORK_DFRN) {
 		$request = $ret["request"];
 		$tpl = get_markup_template('dfrn_request.tpl');
 	} else {
-		$request = $a->get_baseurl()."/follow";
+		$request = App::get_baseurl()."/follow";
 		$tpl = get_markup_template('auto_request.tpl');
 	}
 
@@ -84,20 +85,22 @@ function follow_content(&$a) {
 	$r = q("SELECT `id`, `location`, `about`, `keywords` FROM `gcontact` WHERE `nurl` = '%s'",
 		normalise_link($ret["url"]));
 
-	if (!$r)
+	if (!$r) {
 		$r = array(array("location" => "", "about" => "", "keywords" => ""));
-	else
+	} else {
 		$gcontact_id = $r[0]["id"];
+	}
 
-	if($ret['network'] === NETWORK_DIASPORA) {
+	if ($ret['network'] === NETWORK_DIASPORA) {
 		$r[0]["location"] = "";
 		$r[0]["about"] = "";
 	}
 
 	$header = $ret["name"];
 
-	if ($ret["addr"] != "")
+	if ($ret["addr"] != "") {
 		$header .= " <".$ret["addr"].">";
+	}
 
 	//$header .= " (".network_to_name($ret['network'], $ret['url']).")";
 	$header = t("Connect/Follow");
@@ -149,16 +152,17 @@ function follow_content(&$a) {
 	return $o;
 }
 
-function follow_post(&$a) {
+function follow_post(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		goaway($_SESSION['return_url']);
 		// NOTREACHED
 	}
 
-	if ($_REQUEST['cancel'])
+	if ($_REQUEST['cancel']) {
 		goaway($_SESSION['return_url']);
+	}
 
 	$uid = local_user();
 	$url = notags(trim($_REQUEST['url']));
@@ -170,17 +174,20 @@ function follow_post(&$a) {
 
 	$result = new_contact($uid,$url,true);
 
-	if($result['success'] == false) {
-		if($result['message'])
+	if ($result['success'] == false) {
+		if ($result['message']) {
 			notice($result['message']);
+		}
 		goaway($return_url);
-	} elseif ($result['cid'])
-		goaway($a->get_baseurl().'/contacts/'.$result['cid']);
+	} elseif ($result['cid']) {
+		goaway(App::get_baseurl().'/contacts/'.$result['cid']);
+	}
 
 	info( t('Contact added').EOL);
 
-	if(strstr($return_url,'contacts'))
-		goaway($a->get_baseurl().'/contacts/'.$contact_id);
+	if (strstr($return_url,'contacts')) {
+		goaway(App::get_baseurl().'/contacts/'.$contact_id);
+	}
 
 	goaway($return_url);
 	// NOTREACHED
diff --git a/mod/friendica.php b/mod/friendica.php
index fb25f40e45..d79c89a6b2 100644
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -1,6 +1,6 @@
 <?php
 
-function friendica_init(&$a) {
+function friendica_init(App &$a) {
 	if ($a->argv[1]=="json"){
 		$register_policy = Array('REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN');
 
@@ -15,7 +15,7 @@ function friendica_init(&$a) {
 			$r = q("SELECT username, nickname FROM user WHERE email='%s' $sql_extra", dbesc($adminlist[0]));
 			$admin = array(
 				'name' => $r[0]['username'],
-				'profile'=> $a->get_baseurl().'/profile/'.$r[0]['nickname'],
+				'profile'=> App::get_baseurl().'/profile/'.$r[0]['nickname'],
 			);
 		} else {
 			$admin = false;
@@ -49,7 +49,7 @@ function friendica_init(&$a) {
 			'site_name' => $a->config['sitename'],
 			'platform' => FRIENDICA_PLATFORM,
 			'info' => ((x($a->config,'info')) ? $a->config['info'] : ''),
-			'no_scrape_url' => $a->get_baseurl().'/noscrape'
+			'no_scrape_url' => App::get_baseurl().'/noscrape'
 		);
 
 		echo json_encode($data);
@@ -59,7 +59,7 @@ function friendica_init(&$a) {
 
 
 
-function friendica_content(&$a) {
+function friendica_content(App &$a) {
 
 	$o = '';
 	$o .= '<h3>Friendica</h3>';
diff --git a/mod/fsuggest.php b/mod/fsuggest.php
index 1d56f45736..fcbadcc9b7 100644
--- a/mod/fsuggest.php
+++ b/mod/fsuggest.php
@@ -1,14 +1,15 @@
 <?php
 
 
-function fsuggest_post(&$a) {
+function fsuggest_post(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		return;
 	}
 
-	if($a->argc != 2)
+	if ($a->argc != 2) {
 		return;
+	}
 
 	$contact_id = intval($a->argv[1]);
 
@@ -16,7 +17,7 @@ function fsuggest_post(&$a) {
 		intval($contact_id),
 		intval(local_user())
 	);
-	if(! dbm::is_result($r)) {
+	if (! dbm::is_result($r)) {
 		notice( t('Contact not found.') . EOL);
 		return;
 	}
@@ -70,11 +71,11 @@ function fsuggest_post(&$a) {
 
 
 
-function fsuggest_content(&$a) {
+function fsuggest_content(App &$a) {
 
 	require_once('include/acl_selectors.php');
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
@@ -88,7 +89,7 @@ function fsuggest_content(&$a) {
 		intval($contact_id),
 		intval(local_user())
 	);
-	if(! dbm::is_result($r)) {
+	if (! dbm::is_result($r)) {
 		notice( t('Contact not found.') . EOL);
 		return;
 	}
diff --git a/mod/group.php b/mod/group.php
index db92ed7de6..bf9009ae0c 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -4,7 +4,7 @@ function validate_members(&$item) {
 	$item = intval($item);
 }
 
-function group_init(&$a) {
+function group_init(App &$a) {
 	if(local_user()) {
 		require_once('include/group.php');
 		$a->page['aside'] = group_side('contacts','group','extended',(($a->argc > 1) ? intval($a->argv[1]) : 0));
@@ -13,9 +13,9 @@ function group_init(&$a) {
 
 
 
-function group_post(&$a) {
+function group_post(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
@@ -25,39 +25,44 @@ function group_post(&$a) {
 
 		$name = notags(trim($_POST['groupname']));
 		$r = group_add(local_user(),$name);
-		if($r) {
+		if ($r) {
 			info( t('Group created.') . EOL );
 			$r = group_byname(local_user(),$name);
-			if($r)
-				goaway($a->get_baseurl() . '/group/' . $r);
+			if ($r) {
+				goaway(App::get_baseurl() . '/group/' . $r);
+			}
 		}
-		else
+		else {
 			notice( t('Could not create group.') . EOL );
-		goaway($a->get_baseurl() . '/group');
+		}
+		goaway(App::get_baseurl() . '/group');
 		return; // NOTREACHED
 	}
-	if(($a->argc == 2) && (intval($a->argv[1]))) {
+
+	if (($a->argc == 2) && (intval($a->argv[1]))) {
 		check_form_security_token_redirectOnErr('/group', 'group_edit');
 
 		$r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if(! dbm::is_result($r)) {
+		if (! dbm::is_result($r)) {
 			notice( t('Group not found.') . EOL );
-			goaway($a->get_baseurl() . '/contacts');
+			goaway(App::get_baseurl() . '/contacts');
 			return; // NOTREACHED
 		}
 		$group = $r[0];
 		$groupname = notags(trim($_POST['groupname']));
-		if((strlen($groupname))  && ($groupname != $group['name'])) {
+		if ((strlen($groupname))  && ($groupname != $group['name'])) {
 			$r = q("UPDATE `group` SET `name` = '%s' WHERE `uid` = %d AND `id` = %d",
 				dbesc($groupname),
 				intval(local_user()),
 				intval($group['id'])
 			);
-			if($r)
+
+			if ($r) {
 				info( t('Group name changed.') . EOL );
+			}
 		}
 
 		$a->page['aside'] = group_side();
@@ -65,10 +70,10 @@ function group_post(&$a) {
 	return;
 }
 
-function group_content(&$a) {
+function group_content(App &$a) {
 	$change = false;
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied') . EOL);
 		return;
 	}
@@ -99,26 +104,32 @@ function group_content(&$a) {
 
 	}
 
-	if(($a->argc == 3) && ($a->argv[1] === 'drop')) {
+	if (($a->argc == 3) && ($a->argv[1] === 'drop')) {
 		check_form_security_token_redirectOnErr('/group', 'group_drop', 't');
 
-		if(intval($a->argv[2])) {
+		if (intval($a->argv[2])) {
 			$r = q("SELECT `name` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 				intval($a->argv[2]),
 				intval(local_user())
 			);
-			if (dbm::is_result($r))
+
+			$result = null;
+
+			if (dbm::is_result($r)) {
 				$result = group_rmv(local_user(),$r[0]['name']);
-			if($result)
+			}
+
+			if ($result) {
 				info( t('Group removed.') . EOL);
-			else
+			} else {
 				notice( t('Unable to remove group.') . EOL);
+			}
 		}
-		goaway($a->get_baseurl() . '/group');
+		goaway(App::get_baseurl() . '/group');
 		// NOTREACHED
 	}
 
-	if(($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) {
+	if (($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) {
 		check_form_security_token_ForbiddenOnErr('group_member_change', 't');
 
 		$r = q("SELECT `id` FROM `contact` WHERE `id` = %d AND `uid` = %d and `self` = 0 and `blocked` = 0 AND `pending` = 0 LIMIT 1",
@@ -129,16 +140,16 @@ function group_content(&$a) {
 			$change = intval($a->argv[2]);
 	}
 
-	if(($a->argc > 1) && (intval($a->argv[1]))) {
+	if (($a->argc > 1) && (intval($a->argv[1]))) {
 
 		require_once('include/acl_selectors.php');
 		$r = q("SELECT * FROM `group` WHERE `id` = %d AND `uid` = %d AND `deleted` = 0 LIMIT 1",
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if(! dbm::is_result($r)) {
+		if (! dbm::is_result($r)) {
 			notice( t('Group not found.') . EOL );
-			goaway($a->get_baseurl() . '/contacts');
+			goaway(App::get_baseurl() . '/contacts');
 		}
 		$group = $r[0];
 		$members = group_get_members($group['id']);
diff --git a/mod/hcard.php b/mod/hcard.php
index 6d2d9e2ebf..50721720d0 100644
--- a/mod/hcard.php
+++ b/mod/hcard.php
@@ -1,11 +1,12 @@
 <?php
 
-function hcard_init(&$a) {
+function hcard_init(App &$a) {
 
 	$blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
 
-	if($a->argc > 1)
+	if ($a->argc > 1) {
 		$which = $a->argv[1];
+	}
 	else {
 		notice( t('No profile') . EOL );
 		$a->error = 404;
@@ -13,39 +14,42 @@ function hcard_init(&$a) {
 	}
 
 	$profile = 0;
-	if((local_user()) && ($a->argc > 2) && ($a->argv[2] === 'view')) {
-		$which = $a->user['nickname'];
-		$profile = $a->argv[1];		
+	if ((local_user()) && ($a->argc > 2) && ($a->argv[2] === 'view')) {
+		$which   = $a->user['nickname'];
+		$profile = $a->argv[1];
 	}
 
 	profile_load($a,$which,$profile);
 
-	if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
+	if ((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
 		$a->page['htmlhead'] .= '<meta name="friendica.community" content="true" />';
 	}
-	if(x($a->profile,'openidserver'))				
+	if (x($a->profile,'openidserver')) {
 		$a->page['htmlhead'] .= '<link rel="openid.server" href="' . $a->profile['openidserver'] . '" />' . "\r\n";
-	if(x($a->profile,'openid')) {
+	}
+	if (x($a->profile,'openid')) {
 		$delegate = ((strstr($a->profile['openid'],'://')) ? $a->profile['openid'] : 'http://' . $a->profile['openid']);
 		$a->page['htmlhead'] .= '<link rel="openid.delegate" href="' . $delegate . '" />' . "\r\n";
 	}
 
-	if(! $blocked) {
+	if (! $blocked) {
 		$keywords = ((x($a->profile,'pub_keywords')) ? $a->profile['pub_keywords'] : '');
 		$keywords = str_replace(array(',',' ',',,'),array(' ',',',','),$keywords);
-		if(strlen($keywords))
+		if (strlen($keywords)) {
 			$a->page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\r\n" ;
+		}
 	}
 
 	$a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . (($a->profile['net-publish']) ? 'true' : 'false') . '" />' . "\r\n" ;
-	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . $a->get_baseurl() . '/dfrn_poll/' . $which .'" />' . "\r\n" ;
+	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . App::get_baseurl() . '/dfrn_poll/' . $which .'" />' . "\r\n" ;
 	$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
-	$a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . $a->get_baseurl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
-	header('Link: <' . $a->get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
-  	
+	$a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . App::get_baseurl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
+	header('Link: <' . App::get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
+
 	$dfrn_pages = array('request', 'confirm', 'notify', 'poll');
-	foreach($dfrn_pages as $dfrn)
-		$a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".$a->get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
+	foreach ($dfrn_pages as $dfrn) {
+		$a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".App::get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
+	}
 
 }
 
diff --git a/mod/help.php b/mod/help.php
index 7222569279..c2693dedba 100644
--- a/mod/help.php
+++ b/mod/help.php
@@ -18,7 +18,7 @@ if (!function_exists('load_doc_file')) {
 
 }
 
-function help_content(&$a) {
+function help_content(App &$a) {
 
 	nav_set_selected('help');
 
@@ -77,7 +77,7 @@ function help_content(&$a) {
 					if ($level>$lastlevel) $toc.="<ul>";
 					$idnum[$level]++;
 					$id = implode("_", array_slice($idnum,1,$level));
-					$href = $a->get_baseurl()."/help/{$filename}#{$id}";
+					$href = App::get_baseurl()."/help/{$filename}#{$id}";
 					$toc .= "<li><a href='{$href}'>".strip_tags($line)."</a></li>";
 					$line = "<a name='{$id}'></a>".$line;
 					$lastlevel = $level;
diff --git a/mod/home.php b/mod/home.php
index cdf4b37158..ed66bad147 100644
--- a/mod/home.php
+++ b/mod/home.php
@@ -1,38 +1,43 @@
 <?php
 
 if(! function_exists('home_init')) {
-function home_init(&$a) {
+function home_init(App &$a) {
 
 	$ret = array();
 	call_hooks('home_init',$ret);
 
-	if(local_user() && ($a->user['nickname']))
-		goaway($a->get_baseurl()."/network");
-		//goaway($a->get_baseurl()."/profile/".$a->user['nickname']);
+	if (local_user() && ($a->user['nickname'])) {
+		goaway(App::get_baseurl()."/network");
+	}
 
-	if(strlen(get_config('system','singleuser')))
-		goaway($a->get_baseurl()."/profile/" . get_config('system','singleuser'));
+	if (strlen(get_config('system','singleuser'))) {
+		goaway(App::get_baseurl()."/profile/" . get_config('system','singleuser'));
+	}
 
 }}
 
-
 if(! function_exists('home_content')) {
-function home_content(&$a) {
+function home_content(App &$a) {
 
 	$o = '';
 
-	if(x($_SESSION,'theme'))
+	if (x($_SESSION,'theme')) {
 		unset($_SESSION['theme']);
-	if(x($_SESSION,'mobile-theme'))
+	}
+	if (x($_SESSION,'mobile-theme')) {
 		unset($_SESSION['mobile-theme']);
+	}
 
-	if(file_exists('home.html')){
-		if(file_exists('home.css')){
-			  $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->get_baseurl().'/home.css'.'" media="all" />';}
-
- 		$o .= file_get_contents('home.html');}
+	/// @TODO No absolute path used, maybe risky (security)
+	if (file_exists('home.html')) {
+		if (file_exists('home.css')) {
+			$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.App::get_baseurl().'/home.css'.'" media="all" />';
+		}
 
-	else 	$o .= '<h1>'.((x($a->config,'sitename')) ? sprintf(t("Welcome to %s"), $a->config['sitename']) : "").'</h1>';
+		$o .= file_get_contents('home.html');
+	} else {
+		$o .= '<h1>'.((x($a->config,'sitename')) ? sprintf(t("Welcome to %s"), $a->config['sitename']) : "").'</h1>';
+	}
 
 
 	$o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
@@ -41,5 +46,4 @@ function home_content(&$a) {
 
 	return $o;
 
-
 }}
diff --git a/mod/hostxrd.php b/mod/hostxrd.php
index 647073b056..d41d844805 100644
--- a/mod/hostxrd.php
+++ b/mod/hostxrd.php
@@ -2,7 +2,7 @@
 
 require_once('include/crypto.php');
 
-function hostxrd_init(&$a) {
+function hostxrd_init(App &$a) {
 	header('Access-Control-Allow-Origin: *');
 	header("Content-type: text/xml");
 	$pubkey = get_config('system','site_pubkey');
diff --git a/mod/hovercard.php b/mod/hovercard.php
index 65b75b3211..553d5d2232 100644
--- a/mod/hovercard.php
+++ b/mod/hovercard.php
@@ -11,7 +11,7 @@
 require_once("include/socgraph.php");
 require_once("include/Contact.php");
 
-function hovercard_init(&$a) {
+function hovercard_init(App &$a) {
 	// Just for testing purposes
 	$_GET["mode"] = "minimal";
 }
diff --git a/mod/ignored.php b/mod/ignored.php
index ba55c55e36..99b3a3ddcc 100644
--- a/mod/ignored.php
+++ b/mod/ignored.php
@@ -1,26 +1,31 @@
 <?php
 
 
-function ignored_init(&$a) {
+function ignored_init(App &$a) {
 
 	$ignored = 0;
 
-	if(! local_user())
+	if (! local_user()) {
 		killme();
-	if($a->argc > 1)
+	}
+	if ($a->argc > 1) {
 		$message_id = intval($a->argv[1]);
-	if(! $message_id)
+	}
+	if (! $message_id) {
 		killme();
+	}
 
 	$r = q("SELECT `ignored` FROM `thread` WHERE `uid` = %d AND `iid` = %d LIMIT 1",
 		intval(local_user()),
 		intval($message_id)
 	);
-	if(! dbm::is_result($r))
+	if (! dbm::is_result($r)) {
 		killme();
+	}
 
-	if(! intval($r[0]['ignored']))
+	if (! intval($r[0]['ignored'])) {
 		$ignored = 1;
+	}
 
 	$r = q("UPDATE `thread` SET `ignored` = %d WHERE `uid` = %d and `iid` = %d",
 		intval($ignored),
@@ -30,12 +35,12 @@ function ignored_init(&$a) {
 
 	// See if we've been passed a return path to redirect to
 	$return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
-	if($return_path) {
+	if ($return_path) {
 		$rand = '_=' . time();
 		if(strpos($return_path, '?')) $rand = "&$rand";
 		else $rand = "?$rand";
 
-		goaway($a->get_baseurl() . "/" . $return_path . $rand);
+		goaway(App::get_baseurl() . "/" . $return_path . $rand);
 	}
 
 	// the json doesn't really matter, it will either be 0 or 1
diff --git a/mod/install.php b/mod/install.php
index b5af1373a4..80a4cb799e 100755
--- a/mod/install.php
+++ b/mod/install.php
@@ -4,28 +4,27 @@ require_once "include/Photo.php";
 $install_wizard_pass=1;
 
 
-function install_init(&$a){
+function install_init(App &$a){
 
 	// $baseurl/install/testrwrite to test if rewite in .htaccess is working
 	if ($a->argc==2 && $a->argv[1]=="testrewrite") {
 		echo "ok";
 		killme();
 	}
-	
+
 	// We overwrite current theme css, because during install we could not have a working mod_rewrite
 	// so we could not have a css at all. Here we set a static css file for the install procedure pages
 	$a->config['system']['theme'] = "../install";
-	$a->theme['stylesheet'] = $a->get_baseurl()."/view/install/style.css";
-	
-	
-	
+	$a->theme['stylesheet'] = App::get_baseurl()."/view/install/style.css";
+
 	global $install_wizard_pass;
-	if (x($_POST,'pass'))
+	if (x($_POST,'pass')) {
 		$install_wizard_pass = intval($_POST['pass']);
+	}
 
 }
 
-function install_post(&$a) {
+function install_post(App &$a) {
 	global $install_wizard_pass, $db;
 
 	switch($install_wizard_pass) {
@@ -52,7 +51,7 @@ function install_post(&$a) {
 					$r = q("CREATE DATABASE '%s'",
 							dbesc($dbdata)
 					);
-					if($r) {
+					if ($r) {
 						unset($db);
 						$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
 					} else {
@@ -63,7 +62,7 @@ function install_post(&$a) {
 					return;
 				}
 			}*/
-			if(get_db_errno()) {
+			if (get_db_errno()) {
 				$a->data['db_conn_failed']=true;
 			}
 
@@ -107,17 +106,18 @@ function install_post(&$a) {
 
 
 			$result = file_put_contents('.htconfig.php', $txt);
-			if(! $result) {
+			if (! $result) {
 				$a->data['txt'] = $txt;
 			}
 
 			$errors = load_database($db);
 
 
-			if($errors)
+			if ($errors) {
 				$a->data['db_failed'] = $errors;
-			else
+			} else {
 				$a->data['db_installed'] = true;
+			}
 
 			return;
 		break;
@@ -125,13 +125,14 @@ function install_post(&$a) {
 }
 
 function get_db_errno() {
-	if(class_exists('mysqli'))
+	if (class_exists('mysqli')) {
 		return mysqli_connect_errno();
-	else
+	} else {
 		return mysql_errno();
+	}
 }
 
-function install_content(&$a) {
+function install_content(App &$a) {
 
 	global $install_wizard_pass, $db;
 	$o = '';
@@ -140,23 +141,23 @@ function install_content(&$a) {
 
 
 
-	if(x($a->data,'db_conn_failed')) {
+	if (x($a->data,'db_conn_failed')) {
 		$install_wizard_pass = 2;
 		$wizard_status =  t('Could not connect to database.');
 	}
-	if(x($a->data,'db_create_failed')) {
+	if (x($a->data,'db_create_failed')) {
 		$install_wizard_pass = 2;
 		$wizard_status =  t('Could not create table.');
 	}
 
 	$db_return_text="";
-	if(x($a->data,'db_installed')) {
+	if (x($a->data,'db_installed')) {
 		$txt = '<p style="font-size: 130%;">';
 		$txt .= t('Your Friendica site database has been installed.') . EOL;
 		$db_return_text .= $txt;
 	}
 
-	if(x($a->data,'db_failed')) {
+	if (x($a->data,'db_failed')) {
 		$txt = t('You may need to import the file "database.sql" manually using phpmyadmin or mysql.') . EOL;
 		$txt .= t('Please see the file "INSTALL.txt".') . EOL ."<hr>" ;
 		$txt .= "<pre>".$a->data['db_failed'] . "</pre>". EOL ;
@@ -176,7 +177,7 @@ function install_content(&$a) {
 		}
 	}
 
-	if(x($a->data,'txt') && strlen($a->data['txt'])) {
+	if (x($a->data,'txt') && strlen($a->data['txt'])) {
 		$db_return_text .= manual_config($a);
 	}
 
@@ -205,16 +206,19 @@ function install_content(&$a) {
 
 			check_keys($checks);
 
-			if(x($_POST,'phpath'))
+			if (x($_POST,'phpath')) {
 				$phpath = notags(trim($_POST['phpath']));
+			}
 
 			check_php($phpath, $checks);
 
-            check_htaccess($checks);
+			check_htaccess($checks);
 
+			/// @TODO Maybe move this out?
 			function check_passed($v, $c){
-				if ($c['required'])
+				if ($c['required']) {
 					$v = $v && $c['status'];
+				}
 				return $v;
 			}
 			$checkspassed = array_reduce($checks, "check_passed", true);
@@ -231,7 +235,7 @@ function install_content(&$a) {
 				'$next' => t('Next'),
 				'$reload' => t('Check again'),
 				'$phpath' => $phpath,
-				'$baseurl' => $a->get_baseurl(),
+				'$baseurl' => App::get_baseurl(),
 			));
 			return $o;
 		}; break;
@@ -265,7 +269,7 @@ function install_content(&$a) {
 
 				'$lbl_10' => t('Please select a default timezone for your website'),
 
-				'$baseurl' => $a->get_baseurl(),
+				'$baseurl' => App::get_baseurl(),
 
 				'$phpath' => $phpath,
 
@@ -305,7 +309,7 @@ function install_content(&$a) {
 
 				'$timezone' => field_timezone('timezone', t('Please select a default timezone for your website'), $timezone, ''),
 				'$language' => array('language', t('System Language:'), 'en', t('Set the default language for your Friendica installation interface and to send emails.'), $lang_choices),
-				'$baseurl' => $a->get_baseurl(),
+				'$baseurl' => App::get_baseurl(),
 
 
 
@@ -343,7 +347,7 @@ function check_php(&$phpath, &$checks) {
 		$passed = strlen($phpath);
 	}
 	$help = "";
-	if(!$passed) {
+	if (!$passed) {
 		$help .= t('Could not find a command line version of PHP in the web server PATH.'). EOL;
 		$help .= t("If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'Setup the poller'</a>") . EOL ;
 		$help .= EOL . EOL ;
@@ -370,7 +374,7 @@ function check_php(&$phpath, &$checks) {
 	}
 
 
-	if($passed2) {
+	if ($passed2) {
 		$str = autoname(8);
 		$cmd = "$phpath testargs.php $str";
 		$result = trim(shell_exec($cmd));
@@ -392,15 +396,17 @@ function check_keys(&$checks) {
 
 	$res = false;
 
-	if(function_exists('openssl_pkey_new'))
-		$res=openssl_pkey_new(array(
-		'digest_alg' => 'sha1',
-		'private_key_bits' => 4096,
-		'encrypt_key' => false ));
+	if (function_exists('openssl_pkey_new')) {
+		$res = openssl_pkey_new(array(
+			'digest_alg'       => 'sha1',
+			'private_key_bits' => 4096,
+			'encrypt_key'      => false
+		));
+	}
 
 	// Get private key
 
-	if(! $res) {
+	if (! $res) {
 		$help .= t('Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys'). EOL;
 		$help .= t('If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".');
 	}
@@ -420,7 +426,7 @@ function check_funcs(&$checks) {
 	check_add($ck_funcs, t('XML PHP module'), true, true, "");
 	check_add($ck_funcs, t('iconv module'), true, true, "");
 
-	if(function_exists('apache_get_modules')){
+	if (function_exists('apache_get_modules')){
 		if (! in_array('mod_rewrite',apache_get_modules())) {
 			check_add($ck_funcs, t('Apache mod_rewrite module'), false, true, t('Error: Apache webserver mod-rewrite module is required but not installed.'));
 		} else {
@@ -428,31 +434,31 @@ function check_funcs(&$checks) {
 		}
 	}
 
-	if(! function_exists('curl_init')){
+	if (! function_exists('curl_init')){
 		$ck_funcs[0]['status']= false;
 		$ck_funcs[0]['help']= t('Error: libCURL PHP module required but not installed.');
 	}
-	if(! function_exists('imagecreatefromjpeg')){
+	if (! function_exists('imagecreatefromjpeg')){
 		$ck_funcs[1]['status']= false;
 		$ck_funcs[1]['help']= t('Error: GD graphics PHP module with JPEG support required but not installed.');
 	}
-	if(! function_exists('openssl_public_encrypt')) {
+	if (! function_exists('openssl_public_encrypt')) {
 		$ck_funcs[2]['status']= false;
 		$ck_funcs[2]['help']= t('Error: openssl PHP module required but not installed.');
 	}
-	if(! function_exists('mysqli_connect')){
+	if (! function_exists('mysqli_connect')){
 		$ck_funcs[3]['status']= false;
 		$ck_funcs[3]['help']= t('Error: mysqli PHP module required but not installed.');
 	}
-	if(! function_exists('mb_strlen')){
+	if (! function_exists('mb_strlen')){
 		$ck_funcs[4]['status']= false;
 		$ck_funcs[4]['help']= t('Error: mb_string PHP module required but not installed.');
 	}
-	if(! function_exists('mcrypt_create_iv')){
+	if (! function_exists('mcrypt_create_iv')){
 		$ck_funcs[5]['status']= false;
 		$ck_funcs[5]['help']= t('Error: mcrypt PHP module required but not installed.');
 	}
-	if(! function_exists('iconv_strlen')){
+	if (! function_exists('iconv_strlen')){
 		$ck_funcs[7]['status']= false;
 		$ck_funcs[7]['help']= t('Error: iconv PHP module required but not installed.');
 	}
@@ -487,7 +493,7 @@ function check_funcs(&$checks) {
 function check_htconfig(&$checks) {
 	$status = true;
 	$help = "";
-	if(	(file_exists('.htconfig.php') && !is_writable('.htconfig.php')) ||
+	if ((file_exists('.htconfig.php') && !is_writable('.htconfig.php')) ||
 		(!file_exists('.htconfig.php') && !is_writable('.')) ) {
 
 		$status=false;
@@ -504,7 +510,7 @@ function check_htconfig(&$checks) {
 function check_smarty3(&$checks) {
 	$status = true;
 	$help = "";
-	if(	!is_writable('view/smarty3') ) {
+	if (!is_writable('view/smarty3') ) {
 
 		$status=false;
 		$help = t('Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.') .EOL;
@@ -518,14 +524,14 @@ function check_smarty3(&$checks) {
 }
 
 function check_htaccess(&$checks) {
-	$a = get_app();
 	$status = true;
 	$help = "";
-	if (function_exists('curl_init')){
-		$test = fetch_url($a->get_baseurl()."/install/testrewrite");
+	if (function_exists('curl_init')) {
+		$test = fetch_url(App::get_baseurl()."/install/testrewrite");
 
-		if ($test!="ok")
-			$test = fetch_url(normalise_link($a->get_baseurl()."/install/testrewrite"));
+		if ($test!="ok") {
+			$test = fetch_url(normalise_link(App::get_baseurl()."/install/testrewrite"));
+		}
 
 		if ($test!="ok") {
 			$status = false;
@@ -534,6 +540,7 @@ function check_htaccess(&$checks) {
 		check_add($checks, t('Url rewrite is working'), $status, true, $help);
 	} else {
 		// cannot check modrewrite if libcurl is not installed
+		/// @TODO Maybe issue warning here?
 	}
 }
 
@@ -550,8 +557,7 @@ function check_imagik(&$checks) {
 	}
 	if ($imagick == false) {
 		check_add($checks, t('ImageMagick PHP extension is not installed'), $imagick, false, "");
-		}
-	else {
+	} else {
 		check_add($checks, t('ImageMagick PHP extension is installed'), $imagick, false, "");
 		if ($imagick) {
 			check_add($checks, t('ImageMagick supports GIF'), $gif, false, "");
@@ -560,8 +566,7 @@ function check_imagik(&$checks) {
 }
 
 
-
-function manual_config(&$a) {
+function manual_config(App &$a) {
 	$data = htmlentities($a->data['txt'],ENT_COMPAT,'UTF-8');
 	$o = t('The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.');
 	$o .= "<textarea rows=\"24\" cols=\"80\" >$data</textarea>";
@@ -599,8 +604,7 @@ function load_database($db) {
 }
 
 function what_next() {
-	$a = get_app();
-	$baseurl = $a->get_baseurl();
+	$baseurl = App::get_baseurl();
 	return
 		t('<h1>What next</h1>')
 		."<p>".t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.')
diff --git a/mod/invite.php b/mod/invite.php
index ccf876c7c0..f7f48290c5 100644
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -9,9 +9,9 @@
 
 require_once('include/email.php');
 
-function invite_post(&$a) {
+function invite_post(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
@@ -19,14 +19,15 @@ function invite_post(&$a) {
 	check_form_security_token_redirectOnErr('/', 'send_invite');
 
 	$max_invites = intval(get_config('system','max_invites'));
-	if(! $max_invites)
+	if (! $max_invites) {
 		$max_invites = 50;
+	}
 
 	$current_invites = intval(get_pconfig(local_user(),'system','sent_invites'));
-	if($current_invites > $max_invites) {
+	if ($current_invites > $max_invites) {
 		notice( t('Total invitation limit exceeded.') . EOL);
 		return;
-	};
+	}
 
 
 	$recips  = ((x($_POST,'recipients')) ? explode("\n",$_POST['recipients']) : array());
@@ -34,23 +35,24 @@ function invite_post(&$a) {
 
 	$total = 0;
 
-	if(get_config('system','invitation_only')) {
+	if (get_config('system','invitation_only')) {
 		$invonly = true;
 		$x = get_pconfig(local_user(),'system','invites_remaining');
-		if((! $x) && (! is_site_admin()))
+		if ((! $x) && (! is_site_admin())) {
 			return;
+		}
 	}
 
-	foreach($recips as $recip) {
+	foreach ($recips as $recip) {
 
 		$recip = trim($recip);
 
-		if(! valid_email($recip)) {
+		if (! valid_email($recip)) {
 			notice(  sprintf( t('%s : Not a valid email address.'), $recip) . EOL);
 			continue;
 		}
-		
-		if($invonly && ($x || is_site_admin())) {
+
+		if ($invonly && ($x || is_site_admin())) {
 			$code = autoname(8) . srand(1000,9999);
 			$nmessage = str_replace('$invite_code',$code,$message);
 
@@ -59,16 +61,17 @@ function invite_post(&$a) {
 				dbesc(datetime_convert())
 			);
 
-			if(! is_site_admin()) {
+			if (! is_site_admin()) {
 				$x --;
-				if($x >= 0)
+				if ($x >= 0) {
 					set_pconfig(local_user(),'system','invites_remaining',$x);
-				else
+				} else {
 					return;
+				}
 			}
-		}
-		else
+		} else {
 			$nmessage = $message;
+		}
 
 		$res = mail($recip, email_header_encode( t('Please join us on Friendica'),'UTF-8'), 
 			$nmessage, 
@@ -76,7 +79,7 @@ function invite_post(&$a) {
 			. 'Content-type: text/plain; charset=UTF-8' . "\n"
 			. 'Content-transfer-encoding: 8bit' );
 
-		if($res) {
+		if ($res) {
 			$total ++;
 			$current_invites ++;
 			set_pconfig(local_user(),'system','sent_invites',$current_invites);
@@ -84,8 +87,7 @@ function invite_post(&$a) {
 				notice( t('Invitation limit exceeded. Please contact your site administrator.') . EOL);
 				return;
 			}
-		}
-		else {
+		} else {
 			notice( sprintf( t('%s : Message delivery failed.'), $recip) . EOL);
 		}
 
@@ -95,9 +97,9 @@ function invite_post(&$a) {
 }
 
 
-function invite_content(&$a) {
+function invite_content(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
@@ -105,39 +107,39 @@ function invite_content(&$a) {
 	$tpl = get_markup_template('invite.tpl');
 	$invonly = false;
 
-	if(get_config('system','invitation_only')) {
+	if (get_config('system','invitation_only')) {
 		$invonly = true;
 		$x = get_pconfig(local_user(),'system','invites_remaining');
-		if((! $x) && (! is_site_admin())) {
+		if ((! $x) && (! is_site_admin())) {
 			notice( t('You have no more invitations available') . EOL);
 			return '';
 		}
 	}
 
 	$dirloc = get_config('system','directory');
-	if(strlen($dirloc)) {
-		if($a->config['register_policy'] == REGISTER_CLOSED)
+	if (strlen($dirloc)) {
+		if ($a->config['register_policy'] == REGISTER_CLOSED) {
 			$linktxt = sprintf( t('Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.'), $dirloc . '/siteinfo');
-		elseif($a->config['register_policy'] != REGISTER_CLOSED)
-			$linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), $a->get_baseurl())
+		} elseif($a->config['register_policy'] != REGISTER_CLOSED) {
+			$linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), App::get_baseurl())
 			. "\r\n" . "\r\n" . sprintf( t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join.'),$dirloc . '/siteinfo');
-	}
-	else {
+		}
+	} else {
 		$o = t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
 		return $o;
 	}
 
 	$o = replace_macros($tpl, array(
 		'$form_security_token' => get_form_security_token("send_invite"),
-		'$invite' => t('Send invitations'),
-		'$addr_text' => t('Enter email addresses, one per line:'),
-		'$msg_text' => t('Your message:'),
-		'$default_message' => t('You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web.') . "\r\n" . "\r\n"
+		'$invite'              => t('Send invitations'),
+		'$addr_text'           => t('Enter email addresses, one per line:'),
+		'$msg_text'            => t('Your message:'),
+		'$default_message'     => t('You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web.') . "\r\n" . "\r\n"
 			. $linktxt
 			. "\r\n" . "\r\n" . (($invonly) ? t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') .t('Once you have registered, please connect with me via my profile page at:') 
-			. "\r\n" . "\r\n" . $a->get_baseurl() . '/profile/' . $a->user['nickname']
+			. "\r\n" . "\r\n" . App::get_baseurl() . '/profile/' . $a->user['nickname']
 			. "\r\n" . "\r\n" . t('For more information about the Friendica project and why we feel it is important, please visit http://friendica.com') . "\r\n" . "\r\n"  ,
-		'$submit' => t('Submit')
+		'$submit'              => t('Submit')
 	));
 
 	return $o;
diff --git a/mod/item.php b/mod/item.php
index 9ef82616c3..695e76a2fa 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -27,7 +27,7 @@ require_once('include/Scrape.php');
 require_once('include/diaspora.php');
 require_once('include/Contact.php');
 
-function item_post(&$a) {
+function item_post(App &$a) {
 
 	if((! local_user()) && (! remote_user()) && (! x($_REQUEST,'commenter')))
 		return;
@@ -59,13 +59,14 @@ function item_post(&$a) {
 	// Check for doubly-submitted posts, and reject duplicates
 	// Note that we have to ignore previews, otherwise nothing will post
 	// after it's been previewed
-	if(!$preview && x($_REQUEST['post_id_random'])) {
-		if(x($_SESSION['post-random']) && $_SESSION['post-random'] == $_REQUEST['post_id_random']) {
+	if (!$preview && x($_REQUEST['post_id_random'])) {
+		if (x($_SESSION['post-random']) && $_SESSION['post-random'] == $_REQUEST['post_id_random']) {
 			logger("item post: duplicate post", LOGGER_DEBUG);
-			item_post_return($a->get_baseurl(), $api_source, $return_path);
+			item_post_return(App::get_baseurl(), $api_source, $return_path);
 		}
-		else
+		else {
 			$_SESSION['post-random'] = $_REQUEST['post_id_random'];
+		}
 	}
 
 	/**
@@ -82,18 +83,20 @@ function item_post(&$a) {
 	$r = false;
 	$objecttype = null;
 
-	if($parent || $parent_uri) {
+	if ($parent || $parent_uri) {
 
 		$objecttype = ACTIVITY_OBJ_COMMENT;
 
-		if(! x($_REQUEST,'type'))
+		if (! x($_REQUEST,'type')) {
 			$_REQUEST['type'] = 'net-comment';
+		}
 
-		if($parent) {
+		if ($parent) {
 			$r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
 				intval($parent)
 			);
-		} elseif($parent_uri && local_user()) {
+		}
+		elseif ($parent_uri && local_user()) {
 			// This is coming from an API source, and we are logged in
 			$r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 				dbesc($parent_uri),
@@ -105,17 +108,18 @@ function item_post(&$a) {
 		if (dbm::is_result($r)) {
 			$parid = $r[0]['parent'];
 			$parent_uri = $r[0]['uri'];
-			if($r[0]['id'] != $r[0]['parent']) {
+			if ($r[0]['id'] != $r[0]['parent']) {
 				$r = q("SELECT * FROM `item` WHERE `id` = `parent` AND `parent` = %d LIMIT 1",
 					intval($parid)
 				);
 			}
 		}
 
-		if(! dbm::is_result($r)) {
+		if (! dbm::is_result($r)) {
 			notice( t('Unable to locate original post.') . EOL);
-			if(x($_REQUEST,'return'))
+			if (x($_REQUEST,'return')) {
 				goaway($return_path);
+			}
 			killme();
 		}
 		$parent_item = $r[0];
@@ -125,7 +129,7 @@ function item_post(&$a) {
 		//if(($parid) && ($parid != $parent))
 		$thr_parent = $parent_uri;
 
-		if($parent_item['contact-id'] && $uid) {
+		if ($parent_item['contact-id'] && $uid) {
 			$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 				intval($parent_item['contact-id']),
 				intval($uid)
@@ -135,7 +139,7 @@ function item_post(&$a) {
 
 			// If the contact id doesn't fit with the contact, then set the contact to null
 			$thrparent = q("SELECT `author-link`, `network` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($thr_parent));
-			if (count($thrparent) AND ($thrparent[0]["network"] === NETWORK_OSTATUS)
+			if (dbm::is_result($thrparent) AND ($thrparent[0]["network"] === NETWORK_OSTATUS)
 				AND (normalise_link($parent_contact["url"]) != normalise_link($thrparent[0]["author-link"]))) {
 				$parent_contact = null;
 
@@ -224,8 +228,9 @@ function item_post(&$a) {
 			intval($profile_uid),
 			intval($post_id)
 		);
-		if(! count($i))
+		if (! dbm::is_result($i)) {
 			killme();
+		}
 		$orig_post = $i[0];
 	}
 
@@ -448,13 +453,15 @@ function item_post(&$a) {
 
 			$objecttype = ACTIVITY_OBJ_IMAGE;
 
-			foreach($images as $image) {
-				if(! stristr($image,$a->get_baseurl() . '/photo/'))
+			foreach ($images as $image) {
+				if (! stristr($image,App::get_baseurl() . '/photo/')) {
 					continue;
+				}
 				$image_uri = substr($image,strrpos($image,'/') + 1);
 				$image_uri = substr($image_uri,0, strpos($image_uri,'-'));
-				if(! strlen($image_uri))
+				if (! strlen($image_uri)) {
 					continue;
+				}
 				$srch = '<' . intval($contact_id) . '>';
 
 				$r = q("SELECT `id` FROM `photo` WHERE `allow_cid` = '%s' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = ''
@@ -464,8 +471,9 @@ function item_post(&$a) {
 					intval($profile_uid)
 				);
 
-				if(! dbm::is_result($r))
+				if (! dbm::is_result($r)) {
 					continue;
+				}
 
 				$r = q("UPDATE `photo` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s'
 					WHERE `resource-id` = '%s' AND `uid` = %d AND `album` = '%s' ",
@@ -638,9 +646,10 @@ function item_post(&$a) {
 				intval($mtch)
 			);
 			if (dbm::is_result($r)) {
-				if(strlen($attachments))
+				if (strlen($attachments)) {
 					$attachments .= ',';
-				$attachments .= '[attach]href="' . $a->get_baseurl() . '/attach/' . $r[0]['id'] . '" length="' . $r[0]['filesize'] . '" type="' . $r[0]['filetype'] . '" title="' . (($r[0]['filename']) ? $r[0]['filename'] : '') . '"[/attach]';
+				}
+				$attachments .= '[attach]href="' . App::get_baseurl() . '/attach/' . $r[0]['id'] . '" length="' . $r[0]['filesize'] . '" type="' . $r[0]['filetype'] . '" title="' . (($r[0]['filename']) ? $r[0]['filename'] : '') . '"[/attach]';
 			}
 			$body = str_replace($match[1],'',$body);
 		}
@@ -648,14 +657,17 @@ function item_post(&$a) {
 
 	$wall = 0;
 
-	if($post_type === 'wall' || $post_type === 'wall-comment')
+	if ($post_type === 'wall' || $post_type === 'wall-comment') {
 		$wall = 1;
+	}
 
-	if(! strlen($verb))
+	if (! strlen($verb)) {
 		$verb = ACTIVITY_POST ;
+	}
 
-	if ($network == "")
+	if ($network == "") {
 		$network = NETWORK_DFRN;
+	}
 
 	$gravity = (($parent) ? 6 : 0 );
 
@@ -669,8 +681,9 @@ function item_post(&$a) {
 	$uri = (($message_id) ? $message_id : item_new_uri($a->get_hostname(),$profile_uid, $guid));
 
 	// Fallback so that we alway have a thr-parent
-	if(!$thr_parent)
+	if (!$thr_parent) {
 		$thr_parent = $uri;
+	}
 
 	$datarray = array();
 	$datarray['uid']           = $profile_uid;
@@ -732,7 +745,7 @@ function item_post(&$a) {
 //	$datarray['prvnets']       = $user['prvnets'];
 
 	$datarray['parent-uri'] = ($parent == 0) ? $uri : $parent_item['uri'];
-	$datarray['plink'] = $a->get_baseurl().'/display/'.urlencode($datarray['guid']);
+	$datarray['plink'] = App::get_baseurl().'/display/'.urlencode($datarray['guid']);
 	$datarray['last-child'] = 1;
 	$datarray['visible'] = 1;
 
@@ -765,8 +778,9 @@ function item_post(&$a) {
 		}
 
 		$json = array('cancel' => 1);
-		if(x($_REQUEST,'jsreload') && strlen($_REQUEST['jsreload']))
-			$json['reload'] = $a->get_baseurl() . '/' . $_REQUEST['jsreload'];
+		if (x($_REQUEST,'jsreload') && strlen($_REQUEST['jsreload'])) {
+			$json['reload'] = App::get_baseurl() . '/' . $_REQUEST['jsreload'];
+		}
 
 		echo json_encode($json);
 		killme();
@@ -938,7 +952,7 @@ function item_post(&$a) {
 				'to_email'     => $user['email'],
 				'uid'          => $user['uid'],
 				'item'         => $datarray,
-				'link'		=> $a->get_baseurl().'/display/'.urlencode($datarray['guid']),
+				'link'		=> App::get_baseurl().'/display/'.urlencode($datarray['guid']),
 				'source_name'  => $datarray['author-name'],
 				'source_link'  => $datarray['author-link'],
 				'source_photo' => $datarray['author-avatar'],
@@ -970,7 +984,7 @@ function item_post(&$a) {
 				'to_email'     => $user['email'],
 				'uid'          => $user['uid'],
 				'item'         => $datarray,
-				'link'		=> $a->get_baseurl().'/display/'.urlencode($datarray['guid']),
+				'link'		=> App::get_baseurl().'/display/'.urlencode($datarray['guid']),
 				'source_name'  => $datarray['author-name'],
 				'source_link'  => $datarray['author-link'],
 				'source_photo' => $datarray['author-avatar'],
@@ -991,14 +1005,14 @@ function item_post(&$a) {
 					continue;
 				$disclaimer = '<hr />' . sprintf( t('This message was sent to you by %s, a member of the Friendica social network.'),$a->user['username'])
 					. '<br />';
-				$disclaimer .= sprintf( t('You may visit them online at %s'), $a->get_baseurl() . '/profile/' . $a->user['nickname']) . EOL;
+				$disclaimer .= sprintf( t('You may visit them online at %s'), App::get_baseurl() . '/profile/' . $a->user['nickname']) . EOL;
 				$disclaimer .= t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL;
 				if (!$datarray['title']=='') {
 				    $subject = email_header_encode($datarray['title'],'UTF-8');
 				} else {
 				    $subject = email_header_encode('[Friendica]' . ' ' . sprintf( t('%s posted an update.'),$a->user['username']),'UTF-8');
 				}
-				$link = '<a href="' . $a->get_baseurl() . '/profile/' . $a->user['nickname'] . '"><img src="' . $author['thumb'] . '" alt="' . $a->user['username'] . '" /></a><br /><br />';
+				$link = '<a href="' . App::get_baseurl() . '/profile/' . $a->user['nickname'] . '"><img src="' . $author['thumb'] . '" alt="' . $a->user['username'] . '" /></a><br /><br />';
 				$html    = prepare_body($datarray);
 				$message = '<html><body>' . $link . $html . $disclaimer . '</body></html>';
 				include_once('include/html2plain.php');
@@ -1038,7 +1052,7 @@ function item_post(&$a) {
 
 	logger('post_complete');
 
-	item_post_return($a->get_baseurl(), $api_source, $return_path);
+	item_post_return(App::get_baseurl(), $api_source, $return_path);
 	// NOTREACHED
 }
 
@@ -1048,13 +1062,14 @@ function item_post_return($baseurl, $api_source, $return_path) {
 	if($api_source)
 		return;
 
-	if($return_path) {
+	if ($return_path) {
 		goaway($return_path);
 	}
 
 	$json = array('success' => 1);
-	if(x($_REQUEST,'jsreload') && strlen($_REQUEST['jsreload']))
+	if (x($_REQUEST,'jsreload') && strlen($_REQUEST['jsreload'])) {
 		$json['reload'] = $baseurl . '/' . $_REQUEST['jsreload'];
+	}
 
 	logger('post_json: ' . print_r($json,true), LOGGER_DEBUG);
 
@@ -1064,17 +1079,18 @@ function item_post_return($baseurl, $api_source, $return_path) {
 
 
 
-function item_content(&$a) {
+function item_content(App &$a) {
 
-	if((! local_user()) && (! remote_user()))
+	if ((! local_user()) && (! remote_user())) {
 		return;
+	}
 
 	require_once('include/security.php');
 
 	$o = '';
-	if(($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) {
+	if (($a->argc == 3) && ($a->argv[1] === 'drop') && intval($a->argv[2])) {
 		$o = drop_item($a->argv[2], !is_ajax());
-		if (is_ajax()){
+		if (is_ajax()) {
 			// ajax return: [<item id>, 0 (no perm) | <owner id>]
 			echo json_encode(array(intval($a->argv[2]), intval($o)));
 			killme();
@@ -1087,6 +1103,7 @@ function item_content(&$a) {
  * This function removes the tag $tag from the text $body and replaces it with
  * the appropiate link.
  *
+ * @param App $a Application instance @TODO is unused in this function's scope (excluding included files)
  * @param unknown_type $body the text to replace the tag in
  * @param string $inform a comma-seperated string containing everybody to inform
  * @param string $str_tags string to add the tag to
@@ -1104,13 +1121,14 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $netwo
 	$r = null;
 
 	//is it a person tag?
-	if(strpos($tag,'@') === 0) {
+	if (strpos($tag,'@') === 0) {
 		//is it already replaced?
-		if(strpos($tag,'[url=')) {
+		if (strpos($tag,'[url=')) {
 			//append tag to str_tags
-			if(!stristr($str_tags,$tag)) {
-				if(strlen($str_tags))
+			if (!stristr($str_tags,$tag)) {
+				if (strlen($str_tags)) {
 					$str_tags .= ',';
+				}
 				$str_tags .= $tag;
 			}
 
diff --git a/mod/like.php b/mod/like.php
index 8d383b9abe..ff1e238ac1 100755
--- a/mod/like.php
+++ b/mod/like.php
@@ -5,7 +5,7 @@ require_once('include/bbcode.php');
 require_once('include/items.php');
 require_once('include/like.php');
 
-function like_content(&$a) {
+function like_content(App &$a) {
 	if(! local_user() && ! remote_user()) {
 		return false;
 	}
@@ -24,7 +24,7 @@ function like_content(&$a) {
 	// See if we've been passed a return path to redirect to
 	$return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
 
-	like_content_return($a->get_baseurl(), $return_path);
+	like_content_return(App::get_baseurl(), $return_path);
 	killme(); // NOTREACHED
 //	return; // NOTREACHED
 }
diff --git a/mod/localtime.php b/mod/localtime.php
index d1453bc527..00a7c59094 100644
--- a/mod/localtime.php
+++ b/mod/localtime.php
@@ -3,7 +3,7 @@
 require_once('include/datetime.php');
 
 
-function localtime_post(&$a) {
+function localtime_post(App &$a) {
 
 	$t = $_REQUEST['time'];
 	if(! $t)
@@ -16,7 +16,7 @@ function localtime_post(&$a) {
 
 }
 
-function localtime_content(&$a) {
+function localtime_content(App &$a) {
 	$t = $_REQUEST['time'];
 	if(! $t)
 		$t = 'now';
@@ -36,7 +36,7 @@ function localtime_content(&$a) {
 		$o .= '<p>' . sprintf( t('Converted localtime: %s'),$a->data['mod-localtime']) . '</p>';
 
 
-	$o .= '<form action ="' . $a->get_baseurl() . '/localtime?f=&time=' . $t . '" method="post" >';
+	$o .= '<form action ="' . App::get_baseurl() . '/localtime?f=&time=' . $t . '" method="post" >';
 
 	$o .= '<p>' . t('Please select your timezone:') . '</p>'; 
 
diff --git a/mod/lockview.php b/mod/lockview.php
index c806fc3175..746df28cd9 100644
--- a/mod/lockview.php
+++ b/mod/lockview.php
@@ -1,7 +1,7 @@
 <?php
 
 
-function lockview_content(&$a) {
+function lockview_content(App &$a) {
   
 	$type = (($a->argc > 1) ? $a->argv[1] : 0);
 	if (is_numeric($type)) {
@@ -21,8 +21,9 @@ function lockview_content(&$a) {
 		dbesc($type),
 		intval($item_id)
 	);
-	if(! dbm::is_result($r))
+	if (! dbm::is_result($r)) {
 		killme();
+	}
 	$item = $r[0];
 
 	call_hooks('lockview_content', $item);
diff --git a/mod/login.php b/mod/login.php
index d09fc1868f..db49ba20ac 100644
--- a/mod/login.php
+++ b/mod/login.php
@@ -1,6 +1,6 @@
 <?php
 
-function login_content(&$a) {
+function login_content(App &$a) {
 	if(x($_SESSION,'theme'))
 		unset($_SESSION['theme']);
 	if(x($_SESSION,'mobile-theme'))
diff --git a/mod/lostpass.php b/mod/lostpass.php
index 3dca3a8b81..f9e9400fc2 100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -4,7 +4,7 @@ require_once('include/email.php');
 require_once('include/enotify.php');
 require_once('include/text.php');
 
-function lostpass_post(&$a) {
+function lostpass_post(App &$a) {
 
 	$loginame = notags(trim($_POST['login-name']));
 	if(! $loginame)
@@ -15,7 +15,7 @@ function lostpass_post(&$a) {
 		dbesc($loginame)
 	);
 
-	if(! dbm::is_result($r)) {
+	if (! dbm::is_result($r)) {
 		notice( t('No valid account found.') . EOL);
 		goaway(z_root());
 	}
@@ -36,8 +36,7 @@ function lostpass_post(&$a) {
 
 
 	$sitename = $a->config['sitename'];
-	$siteurl = $a->get_baseurl();
-	$resetlink = $a->get_baseurl() . '/lostpass?verify=' . $new_password;
+	$resetlink = App::get_baseurl() . '/lostpass?verify=' . $new_password;
 
 	$preamble = deindent(t('
 		Dear %1$s,
@@ -64,7 +63,7 @@ function lostpass_post(&$a) {
 		Login Name:	%3$s'));
 
 	$preamble = sprintf($preamble, $username, $sitename);
-	$body = sprintf($body, $resetlink, $siteurl, $email);
+	$body = sprintf($body, $resetlink, App::get_baseurl(), $email);
 
 	notification(array(
 		'type' => "SYSTEM_EMAIL",
@@ -78,7 +77,7 @@ function lostpass_post(&$a) {
 }
 
 
-function lostpass_content(&$a) {
+function lostpass_content(App &$a) {
 
 
 	if(x($_GET,'verify')) {
@@ -88,7 +87,7 @@ function lostpass_content(&$a) {
 		$r = q("SELECT * FROM `user` WHERE `pwdreset` = '%s' LIMIT 1",
 			dbesc($hash)
 		);
-		if(! dbm::is_result($r)) {
+		if (! dbm::is_result($r)) {
 			$o =  t("Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed.");
 			return $o;
 		}
@@ -103,24 +102,25 @@ function lostpass_content(&$a) {
 			dbesc($new_password_encoded),
 			intval($uid)
 		);
-		if($r) {
+
+		/// @TODO Is dbm::is_result() okay here?
+		if ($r) {
 			$tpl = get_markup_template('pwdreset.tpl');
 			$o .= replace_macros($tpl,array(
 				'$lbl1' => t('Password Reset'),
 				'$lbl2' => t('Your password has been reset as requested.'),
 				'$lbl3' => t('Your new password is'),
 				'$lbl4' => t('Save or copy your new password - and then'),
-				'$lbl5' => '<a href="' . $a->get_baseurl() . '">' . t('click here to login') . '</a>.',
+				'$lbl5' => '<a href="' . App::get_baseurl() . '">' . t('click here to login') . '</a>.',
 				'$lbl6' => t('Your password may be changed from the <em>Settings</em> page after successful login.'),
 				'$newpass' => $new_password,
-				'$baseurl' => $a->get_baseurl()
+				'$baseurl' => App::get_baseurl()
 
 			));
 				info("Your password has been reset." . EOL);
 
 
 			$sitename = $a->config['sitename'];
-			$siteurl = $a->get_baseurl();
 			// $username, $email, $new_password
 			$preamble = deindent(t('
 				Dear %1$s,
@@ -139,7 +139,7 @@ function lostpass_content(&$a) {
 			'));
 
 			$preamble = sprintf($preamble, $username);
-			$body = sprintf($body, $siteurl, $email, $new_password);
+			$body = sprintf($body, App::get_baseurl(), $email, $new_password);
 
 			notification(array(
 				'type' => "SYSTEM_EMAIL",
diff --git a/mod/maintenance.php b/mod/maintenance.php
index 3d21ce40b7..ce432f9307 100644
--- a/mod/maintenance.php
+++ b/mod/maintenance.php
@@ -1,6 +1,6 @@
 <?php
 
-function maintenance_content(&$a) {
+function maintenance_content(App &$a) {
 	header('HTTP/1.1 503 Service Temporarily Unavailable');
 	header('Status: 503 Service Temporarily Unavailable');
 	header('Retry-After: 600');
diff --git a/mod/manage.php b/mod/manage.php
index 66891db720..835a7fbcb7 100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -3,10 +3,11 @@
 require_once("include/text.php");
 
 
-function manage_post(&$a) {
+function manage_post(App &$a) {
 
-	if(! local_user())
+	if (! local_user()) {
 		return;
+	}
 
 	$uid = local_user();
 	$orig_record = $a->user;
@@ -56,8 +57,9 @@ function manage_post(&$a) {
 		);
 	}
 
-	if(! dbm::is_result($r))
+	if (! dbm::is_result($r)) {
 		return;
+	}
 
 	unset($_SESSION['authenticated']);
 	unset($_SESSION['uid']);
@@ -84,15 +86,15 @@ function manage_post(&$a) {
 	$ret = array();
 	call_hooks('home_init',$ret);
 
-	goaway( $a->get_baseurl() . "/profile/" . $a->user['nickname'] );
+	goaway( App::get_baseurl() . "/profile/" . $a->user['nickname'] );
 	// NOTREACHED
 }
 
 
 
-function manage_content(&$a) {
+function manage_content(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
diff --git a/mod/match.php b/mod/match.php
index f7fe325b38..f7274e4366 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -13,22 +13,24 @@ require_once('mod/proxy.php');
  * @param App &$a
  * @return void|string
  */
-function match_content(&$a) {
+function match_content(App &$a) {
 
 	$o = '';
-	if(! local_user())
+	if (! local_user()) {
 		return;
+	}
 
 	$a->page['aside'] .= findpeople_widget();
 	$a->page['aside'] .= follow_widget();
 
-	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
+	$_SESSION['return_url'] = App::get_baseurl() . '/' . $a->cmd;
 
 	$r = q("SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
 		intval(local_user())
 	);
-	if(! dbm::is_result($r))
+	if (! dbm::is_result($r)) {
 		return;
+	}
 	if(! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) {
 		notice( t('No keywords to match. Please add keywords to your default profile.') . EOL);
 		return;
@@ -45,7 +47,7 @@ function match_content(&$a) {
 		if(strlen(get_config('system','directory')))
 			$x = post_url(get_server().'/msearch', $params);
 		else
-			$x = post_url($a->get_baseurl() . '/msearch', $params);
+			$x = post_url(App::get_baseurl() . '/msearch', $params);
 
 		$j = json_decode($x);
 
@@ -66,7 +68,7 @@ function match_content(&$a) {
 
 				if (!count($match)) {
 					$jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
-					$connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
+					$connlnk = App::get_baseurl() . '/follow/?url=' . $jj->url;
 					$photo_menu = array(
 						'profile' => array(t("View Profile"), zrl($jj->url)),
 						'follow' => array(t("Connect/Follow"), $connlnk)
diff --git a/mod/message.php b/mod/message.php
index 9bd5b0d722..776a23bccd 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -4,7 +4,7 @@ require_once('include/acl_selectors.php');
 require_once('include/message.php');
 require_once('include/Smilies.php');
 
-function message_init(&$a) {
+function message_init(App &$a) {
 
 	$tabs = '';
 
@@ -24,25 +24,25 @@ function message_init(&$a) {
 		'$tabs'=>$tabs,
 		'$new'=>$new,
 	));
-	$base = $a->get_baseurl();
+	$base = App::get_baseurl();
 
 	$head_tpl = get_markup_template('message-head.tpl');
 	$a->page['htmlhead'] .= replace_macros($head_tpl,array(
-		'$baseurl' => $a->get_baseurl(true),
+		'$baseurl' => App::get_baseurl(true),
 		'$base' => $base
 	));
 
 	$end_tpl = get_markup_template('message-end.tpl');
 	$a->page['end'] .= replace_macros($end_tpl,array(
-		'$baseurl' => $a->get_baseurl(true),
+		'$baseurl' => App::get_baseurl(true),
 		'$base' => $base
 	));
 
 }
 
-function message_post(&$a) {
+function message_post(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
@@ -160,7 +160,7 @@ function item_redir_and_replace_images($body, $images, $cid) {
 	$newbody = $newbody . $origbody;
 
 	$cnt = 0;
-	foreach($images as $image) {
+	foreach ($images as $image) {
 		// We're depending on the property of 'foreach' (specified on the PHP website) that
 		// it loops over the array starting from the first element and going sequentially
 		// to the last element
@@ -173,17 +173,17 @@ function item_redir_and_replace_images($body, $images, $cid) {
 
 
 
-function message_content(&$a) {
+function message_content(App &$a) {
 
 	$o = '';
 	nav_set_selected('messages');
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
 
-	$myprofile = $a->get_baseurl().'/profile/' . $a->user['nickname'];
+	$myprofile = App::get_baseurl().'/profile/' . $a->user['nickname'];
 
 	$tpl = get_markup_template('mail_head.tpl');
 	$header = replace_macros($tpl, array(
@@ -231,10 +231,10 @@ function message_content(&$a) {
 				intval($a->argv[2]),
 				intval(local_user())
 			);
-			if($r) {
+			if ($r) {
 				info( t('Message deleted.') . EOL );
 			}
-			//goaway($a->get_baseurl(true) . '/message' );
+			//goaway(App::get_baseurl(true) . '/message' );
 			goaway($_SESSION['return_url']);
 		}
 		else {
@@ -265,7 +265,7 @@ function message_content(&$a) {
 				if($r)
 					info( t('Conversation removed.') . EOL );
 			}
-			//goaway($a->get_baseurl(true) . '/message' );
+			//goaway(App::get_baseurl(true) . '/message' );
 			goaway($_SESSION['return_url']);
 		}
 
@@ -285,7 +285,7 @@ function message_content(&$a) {
 
 		$tpl = get_markup_template('msg-header.tpl');
 		$a->page['htmlhead'] .= replace_macros($tpl, array(
-			'$baseurl' => $a->get_baseurl(true),
+			'$baseurl' => App::get_baseurl(true),
 			'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 			'$nickname' => $a->user['nickname'],
 			'$linkurl' => t('Please enter a link URL:')
@@ -293,7 +293,7 @@ function message_content(&$a) {
 
 		$tpl = get_markup_template('msg-end.tpl');
 		$a->page['end'] .= replace_macros($tpl, array(
-			'$baseurl' => $a->get_baseurl(true),
+			'$baseurl' => App::get_baseurl(true),
 			'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 			'$nickname' => $a->user['nickname'],
 			'$linkurl' => t('Please enter a link URL:')
@@ -364,7 +364,7 @@ function message_content(&$a) {
 
 	$_SESSION['return_url'] = $a->query_string;
 
-	if($a->argc == 1) {
+	if ($a->argc == 1) {
 
 		// List messages
 
@@ -381,7 +381,7 @@ function message_content(&$a) {
 
 		$r = get_messages(local_user(), $a->pager['start'], $a->pager['itemspage']);
 
-		if(! dbm::is_result($r)) {
+		if (! dbm::is_result($r)) {
 			info( t('No messages.') . EOL);
 			return $o;
 		}
@@ -438,7 +438,7 @@ function message_content(&$a) {
 
 		$tpl = get_markup_template('msg-header.tpl');
 		$a->page['htmlhead'] .= replace_macros($tpl, array(
-			'$baseurl' => $a->get_baseurl(true),
+			'$baseurl' => App::get_baseurl(true),
 			'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 			'$nickname' => $a->user['nickname'],
 			'$linkurl' => t('Please enter a link URL:')
@@ -446,7 +446,7 @@ function message_content(&$a) {
 
 		$tpl = get_markup_template('msg-end.tpl');
 		$a->page['end'] .= replace_macros($tpl, array(
-			'$baseurl' => $a->get_baseurl(true),
+			'$baseurl' => App::get_baseurl(true),
 			'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 			'$nickname' => $a->user['nickname'],
 			'$linkurl' => t('Please enter a link URL:')
@@ -573,7 +573,7 @@ function render_messages(array $msg, $t) {
 	$tpl = get_markup_template($t);
 	$rslt = '';
 
-	$myprofile = $a->get_baseurl().'/profile/' . $a->user['nickname'];
+	$myprofile = App::get_baseurl().'/profile/' . $a->user['nickname'];
 
 	foreach($msg as $rr) {
 
diff --git a/mod/modexp.php b/mod/modexp.php
index d1dabb101b..5fc7012909 100644
--- a/mod/modexp.php
+++ b/mod/modexp.php
@@ -2,7 +2,7 @@
 
 require_once('library/asn1.php');
 
-function modexp_init(&$a) {
+function modexp_init(App &$a) {
 
 	if($a->argc != 2)
 		killme();
@@ -12,8 +12,9 @@ function modexp_init(&$a) {
 			dbesc($nick)
 	);
 
-	if(! dbm::is_result($r))
+	if (! dbm::is_result($r)) {
 		killme();
+	}
 
 	$lines = explode("\n",$r[0]['spubkey']);
 	unset($lines[0]);
diff --git a/mod/mood.php b/mod/mood.php
index c64dd0d9ef..0e603c869a 100644
--- a/mod/mood.php
+++ b/mod/mood.php
@@ -5,10 +5,11 @@ require_once('include/bbcode.php');
 require_once('include/items.php');
 
 
-function mood_init(&$a) {
+function mood_init(App &$a) {
 
-	if(! local_user())
+	if (! local_user()) {
 		return;
+	}
 
 	$uid = local_user();
 	$verb = notags(trim($_GET['verb']));
@@ -91,7 +92,7 @@ function mood_init(&$a) {
 	$item_id = item_store($arr);
 	if($item_id) {
 		q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d",
-			dbesc($a->get_baseurl() . '/display/' . $poster['nickname'] . '/' . $item_id),
+			dbesc(App::get_baseurl() . '/display/' . $poster['nickname'] . '/' . $item_id),
 			intval($uid),
 			intval($item_id)
 		);
@@ -108,9 +109,9 @@ function mood_init(&$a) {
 
 
 
-function mood_content(&$a) {
+function mood_content(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
diff --git a/mod/msearch.php b/mod/msearch.php
index 43b200ddf8..4b5205ac08 100644
--- a/mod/msearch.php
+++ b/mod/msearch.php
@@ -1,6 +1,6 @@
 <?php
 
-function msearch_post(&$a) {
+function msearch_post(App &$a) {
 
 	$perpage = (($_POST['n']) ? $_POST['n'] : 80);
 	$page = (($_POST['p']) ? intval($_POST['p'] - 1) : 0);
@@ -29,8 +29,8 @@ function msearch_post(&$a) {
 		foreach($r as $rr)
 			$results[] = array(
 				'name' => $rr['name'], 
-				'url' => $a->get_baseurl() . '/profile/' . $rr['nickname'], 
-				'photo' => $a->get_baseurl() . '/photo/avatar/' . $rr['uid'] . '.jpg',
+				'url' => App::get_baseurl() . '/profile/' . $rr['nickname'], 
+				'photo' => App::get_baseurl() . '/photo/avatar/' . $rr['uid'] . '.jpg',
 				'tags' => str_replace(array(',','  '),array(' ',' '),$rr['pub_keywords'])
 			);
 	}
diff --git a/mod/navigation.php b/mod/navigation.php
index 5db69b171e..d69c76a843 100644
--- a/mod/navigation.php
+++ b/mod/navigation.php
@@ -2,7 +2,7 @@
 
 require_once("include/nav.php");
 
-function navigation_content(&$a) {
+function navigation_content(App &$a) {
 
 	$nav_info = nav_info($a);
 
@@ -12,7 +12,7 @@ function navigation_content(&$a) {
 
 	$tpl = get_markup_template('navigation.tpl');
 	return replace_macros($tpl, array(
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => App::get_baseurl(),
 		'$sitelocation' => $nav_info['sitelocation'],
 		'$nav' => $nav_info['nav'],
 		'$banner' =>  $nav_info['banner'],
diff --git a/mod/network.php b/mod/network.php
index 9cfeda1026..6c9bf75799 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -1,6 +1,6 @@
 <?php
-function network_init(&$a) {
-	if(! local_user()) {
+function network_init(App &$a) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
@@ -100,7 +100,7 @@ function network_init(&$a) {
 
 			$redir_url = ($net_queries ? $net_baseurl."?".$net_queries : $net_baseurl);
 
-			goaway($a->get_baseurl() . $redir_url);
+			goaway(App::get_baseurl() . $redir_url);
 		}
 	}
 
@@ -126,7 +126,7 @@ function network_init(&$a) {
 			intval(local_user()),
 			dbesc($search)
 		);
-		if(! dbm::is_result($r)) {
+		if (! dbm::is_result($r)) {
 			q("INSERT INTO `search` ( `uid`,`term` ) VALUES ( %d, '%s') ",
 				intval(local_user()),
 				dbesc($search)
@@ -183,13 +183,13 @@ function saved_searches($search) {
 	$saved = array();
 
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			$saved[] = array(
-				'id'		=> $rr['id'],
-				'term'		=> $rr['term'],
-				'encodedterm' 	=> urlencode($rr['term']),
-				'delete'	=> t('Remove term'),
-				'selected'	=> ($search==$rr['term']),
+				'id'          => $rr['id'],
+				'term'        => $rr['term'],
+				'encodedterm' => urlencode($rr['term']),
+				'delete'      => t('Remove term'),
+				'selected'    => ($search==$rr['term']),
 			);
 		}
 	}
@@ -197,10 +197,10 @@ function saved_searches($search) {
 
 	$tpl = get_markup_template("saved_searches_aside.tpl");
 	$o = replace_macros($tpl, array(
-		'$title'	=> t('Saved Searches'),
-		'$add'		=> t('add'),
-		'$searchbox'	=> search($search,'netsearch-box',$srchurl,true),
-		'$saved' 	=> $saved,
+		'$title'     => t('Saved Searches'),
+		'$add'       => t('add'),
+		'$searchbox' => search($search,'netsearch-box',$srchurl,true),
+		'$saved'     => $saved,
 	));
 
 	return $o;
@@ -222,7 +222,7 @@ function saved_searches($search) {
  *
  * @return Array ( $no_active, $comment_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active );
  */
-function network_query_get_sel_tab($a) {
+function network_query_get_sel_tab(App &$a) {
 	$no_active='';
 	$starred_active = '';
 	$new_active = '';
@@ -293,7 +293,7 @@ function network_query_get_sel_net() {
 	return $network;
 }
 
-function network_query_get_sel_group($a) {
+function network_query_get_sel_group(App &$a) {
 	$group = false;
 
 	if($a->argc >= 2 && is_numeric($a->argv[1])) {
@@ -308,7 +308,7 @@ function network_content(&$a, $update = 0) {
 
 	require_once('include/conversation.php');
 
-	if(! local_user()) {
+	if (! local_user()) {
 		$_SESSION['return_url'] = $a->query_string;
 		return login(false);
 	}
@@ -463,7 +463,7 @@ function network_content(&$a, $update = 0) {
 			intval($group),
 			intval($_SESSION['uid'])
 		);
-		if(! dbm::is_result($r)) {
+		if (! dbm::is_result($r)) {
 			if($update)
 				killme();
 			notice( t('No such group') . EOL );
@@ -810,7 +810,7 @@ function network_content(&$a, $update = 0) {
  * @param app $a The global App
  * @return string Html of the networktab
  */
-function network_tabs($a) {
+function network_tabs(App &$a) {
 	// item filter tabs
 	/// @TODO fix this logic, reduce duplication
 	/// $a->page['content'] .= '<div class="tabs-wrapper">';
diff --git a/mod/newmember.php b/mod/newmember.php
index aa55c3a098..1ef0985066 100644
--- a/mod/newmember.php
+++ b/mod/newmember.php
@@ -1,6 +1,6 @@
 <?php
 
-function newmember_content(&$a) {
+function newmember_content(App &$a) {
 
 
 	$o = '<h1>' . t('Welcome to Friendica') . '</h1>';
diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php
index 5c70603468..104fecb755 100644
--- a/mod/nodeinfo.php
+++ b/mod/nodeinfo.php
@@ -7,20 +7,20 @@
 
 require_once("include/plugin.php");
 
-function nodeinfo_wellknown(&$a) {
+function nodeinfo_wellknown(App &$a) {
 	if (!get_config("system", "nodeinfo")) {
 		http_status_exit(404);
 		killme();
 	}
 	$nodeinfo = array("links" => array(array("rel" => "http://nodeinfo.diaspora.software/ns/schema/1.0",
-					"href" => $a->get_baseurl()."/nodeinfo/1.0")));
+					"href" => App::get_baseurl()."/nodeinfo/1.0")));
 
 	header('Content-type: application/json; charset=utf-8');
 	echo json_encode($nodeinfo, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
 	exit;
 }
 
-function nodeinfo_init(&$a){
+function nodeinfo_init(App &$a){
 	if (!get_config("system", "nodeinfo")) {
 		http_status_exit(404);
 		killme();
diff --git a/mod/nogroup.php b/mod/nogroup.php
index 0a014c0676..c448406277 100644
--- a/mod/nogroup.php
+++ b/mod/nogroup.php
@@ -4,24 +4,26 @@ require_once('include/Contact.php');
 require_once('include/socgraph.php');
 require_once('include/contact_selectors.php');
 
-function nogroup_init(&$a) {
+function nogroup_init(App &$a) {
 
-	if(! local_user())
+	if (! local_user()) {
 		return;
+	}
 
 	require_once('include/group.php');
 	require_once('include/contact_widgets.php');
 
-	if(! x($a->page,'aside'))
+	if (! x($a->page,'aside')) {
 		$a->page['aside'] = '';
+	}
 
 	$a->page['aside'] .= group_side('contacts','group','extended',0,$contact_id);
 }
 
 
-function nogroup_content(&$a) {
+function nogroup_content(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return '';
 	}
@@ -33,7 +35,7 @@ function nogroup_content(&$a) {
 	}
 	$r = contacts_not_grouped(local_user(),$a->pager['start'],$a->pager['itemspage']);
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 
 			$contact_details = get_contact_details_by_url($rr['url'], local_user(), $rr);
 
diff --git a/mod/noscrape.php b/mod/noscrape.php
index 537aff878f..758ce8ba53 100644
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -1,6 +1,6 @@
 <?php
 
-function noscrape_init(&$a) {
+function noscrape_init(App &$a) {
 
 	if($a->argc > 1)
 		$which = $a->argv[1];
@@ -30,21 +30,22 @@ function noscrape_init(&$a) {
 		intval($a->profile['uid']));
 
 	$json_info = array(
-		'fn' => $a->profile['name'],
-		'addr' => $a->profile['addr'],
-		'nick' => $which,
-		'key' => $a->profile['pubkey'],
-		'homepage' => $a->get_baseurl()."/profile/{$which}",
-		'comm' => (x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY),
-		'photo' => $r[0]["photo"],
-		'tags' => $keywords
+		'fn'       => $a->profile['name'],
+		'addr'     => $a->profile['addr'],
+		'nick'     => $which,
+		'key'      => $a->profile['pubkey'],
+		'homepage' => App::get_baseurl()."/profile/{$which}",
+		'comm'     => (x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY),
+		'photo'    => $r[0]["photo"],
+		'tags'     => $keywords
 	);
 
-	if(is_array($a->profile) AND !$a->profile['hide-friends']) {
+	if (is_array($a->profile) AND !$a->profile['hide-friends']) {
 		$r = q("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1",
 			intval($a->profile['uid']));
-		if (dbm::is_result($r))
+		if (dbm::is_result($r)) {
 			$json_info["updated"] =  date("c", strtotime($r[0]['updated']));
+		}
 
 		$r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 AND `hidden` = 0 AND `archive` = 0
 				AND `network` IN ('%s', '%s', '%s', '')",
@@ -53,18 +54,23 @@ function noscrape_init(&$a) {
 			dbesc(NETWORK_DIASPORA),
 			dbesc(NETWORK_OSTATUS)
 		);
-		if (dbm::is_result($r))
+		if (dbm::is_result($r)) {
 			$json_info["contacts"] = intval($r[0]['total']);
+		}
 	}
 
 	//These are optional fields.
 	$profile_fields = array('pdesc', 'locality', 'region', 'postal-code', 'country-name', 'gender', 'marital', 'about');
-	foreach($profile_fields as $field)
-		if(!empty($a->profile[$field])) $json_info["$field"] = $a->profile[$field];
+	foreach ($profile_fields as $field) {
+		if (!empty($a->profile[$field])) {
+			$json_info["$field"] = $a->profile[$field];
+		}
+	}
 
 	$dfrn_pages = array('request', 'confirm', 'notify', 'poll');
-	foreach($dfrn_pages as $dfrn)
-		$json_info["dfrn-{$dfrn}"] = $a->get_baseurl()."/dfrn_{$dfrn}/{$which}";
+	foreach ($dfrn_pages as $dfrn) {
+		$json_info["dfrn-{$dfrn}"] = App::get_baseurl()."/dfrn_{$dfrn}/{$which}";
+	}
 
 	//Output all the JSON!
 	header('Content-type: application/json; charset=utf-8');
diff --git a/mod/notes.php b/mod/notes.php
index 74ab18a6f9..b2aa5487af 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -1,9 +1,10 @@
 <?php
 
-function notes_init(&$a) {
+function notes_init(App &$a) {
 
-	if(! local_user())
+	if (! local_user()) {
 		return;
+	}
 
 	$profile = 0;
 
@@ -18,7 +19,7 @@ function notes_init(&$a) {
 
 function notes_content(&$a,$update = false) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
diff --git a/mod/notice.php b/mod/notice.php
index 7fdf4493a4..e338d8752d 100644
--- a/mod/notice.php
+++ b/mod/notice.php
@@ -1,14 +1,14 @@
 <?php
 	/* identi.ca -> friendica items permanent-url compatibility */
 	
-	function notice_init(&$a){
+	function notice_init(App &$a){
 		$id = $a->argv[1];
 		$r = q("SELECT user.nickname FROM user LEFT JOIN item ON item.uid=user.uid WHERE item.id=%d",
 				intval($id)
 				);
 		if (dbm::is_result($r)){
 			$nick = $r[0]['nickname'];
-			$url = $a->get_baseurl()."/display/$nick/$id";
+			$url = App::get_baseurl()."/display/$nick/$id";
 			goaway($url);
 		} else {
 			$a->error = 404;
diff --git a/mod/notifications.php b/mod/notifications.php
index 78b26b5d69..47e4cd0340 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -9,9 +9,9 @@ require_once("include/NotificationsManager.php");
 require_once("include/contact_selectors.php");
 require_once("include/network.php");
 
-function notifications_post(&$a) {
+function notifications_post(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		goaway(z_root());
 	}
 
@@ -65,9 +65,9 @@ function notifications_post(&$a) {
 	}
 }
 
-function notifications_content(&$a) {
+function notifications_content(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
diff --git a/mod/notify.php b/mod/notify.php
index dceb326a4b..2d34821ded 100644
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -2,11 +2,14 @@
 require_once('include/NotificationsManager.php');
 
 
-function notify_init(&$a) {
-	if(! local_user()) return;
+function notify_init(App &$a) {
+	if (! local_user()) {
+		return;
+	}
+
 	$nm = new NotificationsManager();
-		
-	if($a->argc > 2 && $a->argv[1] === 'view' && intval($a->argv[2])) {
+
+	if ($a->argc > 2 && $a->argv[1] === 'view' && intval($a->argv[2])) {
 		$note = $nm->getByID($a->argv[2]);
 		if ($note) {
 			$nm->setSeen($note);
@@ -17,17 +20,18 @@ function notify_init(&$a) {
 				$urldata = parse_url($note['link']);
 				$guid = basename($urldata["path"]);
 				$itemdata = get_item_id($guid, local_user());
-				if ($itemdata["id"] != 0)
-					$note['link'] = $a->get_baseurl().'/display/'.$itemdata["nick"].'/'.$itemdata["id"];
+				if ($itemdata["id"] != 0) {
+					$note['link'] = App::get_baseurl().'/display/'.$itemdata["nick"].'/'.$itemdata["id"];
+				}
 			}
 
 			goaway($note['link']);
 		}
 
-		goaway($a->get_baseurl(true));
+		goaway(App::get_baseurl(true));
 	}
 
-	if($a->argc > 2 && $a->argv[1] === 'mark' && $a->argv[2] === 'all' ) {
+	if ($a->argc > 2 && $a->argv[1] === 'mark' && $a->argv[2] === 'all' ) {
 		$r = $nm->setAllSeen();
 		$j = json_encode(array('result' => ($r) ? 'success' : 'fail'));
 		echo $j;
@@ -36,8 +40,10 @@ function notify_init(&$a) {
 
 }
 
-function notify_content(&$a) {
-	if(! local_user()) return login();
+function notify_content(App &$a) {
+	if (! local_user()) {
+		return login();
+	}
 
 	$nm = new NotificationsManager();
 	
@@ -50,7 +56,7 @@ function notify_content(&$a) {
 	if (dbm::is_result($r) > 0) {
 		foreach ($r as $it) {
 			$notif_content .= replace_macros($not_tpl,array(
-				'$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'],
+				'$item_link' => App::get_baseurl(true).'/notify/view/'. $it['id'],
 				'$item_image' => $it['photo'],
 				'$item_text' => strip_tags(bbcode($it['msg'])),
 				'$item_when' => relative_date($it['date'])
diff --git a/mod/oembed.php b/mod/oembed.php
index cb478cb860..1d6e6145cd 100644
--- a/mod/oembed.php
+++ b/mod/oembed.php
@@ -1,7 +1,7 @@
 <?php
 require_once("include/oembed.php");
 
-function oembed_content(&$a){
+function oembed_content(App &$a){
 	// logger('mod_oembed ' . $a->query_string, LOGGER_ALL);
 
 	if ($a->argv[1]=='b2h'){
diff --git a/mod/oexchange.php b/mod/oexchange.php
index bbb436e702..49c5d01f45 100644
--- a/mod/oexchange.php
+++ b/mod/oexchange.php
@@ -1,12 +1,12 @@
 <?php
 
 
-function oexchange_init(&$a) {
+function oexchange_init(App &$a) {
 
 	if(($a->argc > 1) && ($a->argv[1] === 'xrd')) {
 		$tpl = get_markup_template('oexchange_xrd.tpl');
 
-		$o = replace_macros($tpl, array('$base' => $a->get_baseurl()));
+		$o = replace_macros($tpl, array('$base' => App::get_baseurl()));
 		echo $o;
 		killme();
 	}
@@ -14,14 +14,14 @@ function oexchange_init(&$a) {
 
 }
 
-function oexchange_content(&$a) {
+function oexchange_content(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		$o = login(false);
 		return $o;
 	}
 
-	if(($a->argc > 1) && $a->argv[1] === 'done') {
+	if (($a->argc > 1) && $a->argv[1] === 'done') {
 		info( t('Post successful.') . EOL);
 		return;
 	}
@@ -35,7 +35,7 @@ function oexchange_content(&$a) {
 	$tags = (((x($_REQUEST,'tags')) && strlen($_REQUEST['tags'])) 
 		? '&tags=' . urlencode(notags(trim($_REQUEST['tags']))) : '');
 
-	$s = fetch_url($a->get_baseurl() . '/parse_url?f=&url=' . $url . $title . $description . $tags);
+	$s = fetch_url(App::get_baseurl() . '/parse_url?f=&url=' . $url . $title . $description . $tags);
 
 	if(! strlen($s))
 		return;
diff --git a/mod/openid.php b/mod/openid.php
index 60a9c1381b..ce707c4150 100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -4,7 +4,7 @@
 require_once('library/openid.php');
 
 
-function openid_content(&$a) {
+function openid_content(App &$a) {
 
 	$noid = get_config('system','no_openid');
 	if($noid)
@@ -56,7 +56,7 @@ function openid_content(&$a) {
 			// Successful OpenID login - but we can't match it to an existing account.
 			// New registration?
 
-			if($a->config['register_policy'] == REGISTER_CLOSED) {
+			if ($a->config['register_policy'] == REGISTER_CLOSED) {
 				notice( t('Account not found and OpenID registration is not permitted on this site.') . EOL);
 				goaway(z_root());
 			}
@@ -64,35 +64,45 @@ function openid_content(&$a) {
 			unset($_SESSION['register']);
 			$args = '';
 			$attr = $openid->getAttributes();
-			if(is_array($attr) && count($attr)) {
-				foreach($attr as $k => $v) {
-					if($k === 'namePerson/friendly')
+			if (is_array($attr) && count($attr)) {
+				foreach ($attr as $k => $v) {
+					if ($k === 'namePerson/friendly') {
 						$nick = notags(trim($v));
-					if($k === 'namePerson/first')
+					}
+					if($k === 'namePerson/first') {
 						$first = notags(trim($v));
-					if($k === 'namePerson')
+					}
+					if($k === 'namePerson') {
 						$args .= '&username=' . notags(trim($v));
-					if($k === 'contact/email')
+					}
+					if ($k === 'contact/email') {
 						$args .= '&email=' . notags(trim($v));
-					if($k === 'media/image/aspect11')
+					}
+					if ($k === 'media/image/aspect11') {
 						$photosq = bin2hex(trim($v));
-					if($k === 'media/image/default')
+					}
+					if ($k === 'media/image/default') {
 						$photo = bin2hex(trim($v));
+					}
 				}
 			}
-			if($nick)
+			if ($nick) {
 				$args .= '&nickname=' . $nick;
-			elseif($first)
+			}
+			elseif ($first) {
 				$args .= '&nickname=' . $first;
+			}
 
-			if($photosq)
+			if ($photosq) {
 				$args .= '&photo=' . $photosq;
-			elseif($photo)
+			}
+			elseif ($photo) {
 				$args .= '&photo=' . $photo;
+			}
 
 			$args .= '&openid_url=' . notags(trim($authid));
 
-			goaway($a->get_baseurl() . '/register' . $args);
+			goaway(App::get_baseurl() . '/register' . $args);
 
 			// NOTREACHED
 		}
diff --git a/mod/opensearch.php b/mod/opensearch.php
index ff748d1c53..1a7d4cd307 100644
--- a/mod/opensearch.php
+++ b/mod/opensearch.php
@@ -1,12 +1,12 @@
 <?php
-    function opensearch_content(&$a) {
+    function opensearch_content(App &$a) {
     	
 		$tpl = get_markup_template('opensearch.tpl');
 	
 		header("Content-type: application/opensearchdescription+xml");
 	
 		$o = replace_macros($tpl, array(
-			'$baseurl' => $a->get_baseurl(),
+			'$baseurl' => App::get_baseurl(),
 			'$nodename' => $a->get_hostname(),
 		));
 		
diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index 6cca0bf679..ba17e28b73 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -3,9 +3,9 @@
 require_once('include/Scrape.php');
 require_once('include/follow.php');
 
-function ostatus_subscribe_content(&$a) {
+function ostatus_subscribe_content(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		goaway($_SESSION['return_url']);
 		// NOTREACHED
@@ -45,7 +45,7 @@ function ostatus_subscribe_content(&$a) {
 	$total = sizeof($friends);
 
 	if ($counter >= $total) {
-		$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.$a->get_baseurl().'/settings/connectors">';
+		$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.App::get_baseurl().'/settings/connectors">';
 		del_pconfig($uid, "ostatus", "legacy_friends");
 		del_pconfig($uid, "ostatus", "legacy_contact");
 		$o .= t("Done");
@@ -72,7 +72,7 @@ function ostatus_subscribe_content(&$a) {
 
 	$o .= "<p>".t("Keep this window open until done.")."</p>";
 
-	$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.$a->get_baseurl().'/ostatus_subscribe?counter='.$counter.'">';
+	$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.App::get_baseurl().'/ostatus_subscribe?counter='.$counter.'">';
 
 	return $o;
 }
diff --git a/mod/parse_url.php b/mod/parse_url.php
index 410e087737..44cf80935e 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -19,7 +19,7 @@ use \Friendica\ParseUrl;
 
 require_once("include/items.php");
 
-function parse_url_content(&$a) {
+function parse_url_content(App &$a) {
 
 	$text = null;
 	$str_tags = "";
diff --git a/mod/photo.php b/mod/photo.php
index a94a3ac2ce..9744b9f239 100644
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -3,7 +3,7 @@
 require_once('include/security.php');
 require_once('include/Photo.php');
 
-function photo_init(&$a) {
+function photo_init(App &$a) {
 	global $_SERVER;
 
 	$prvcachecontrol = false;
diff --git a/mod/photos.php b/mod/photos.php
index 1ef43f423a..d4b2a3b19f 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -10,7 +10,7 @@ require_once('include/tags.php');
 require_once('include/threads.php');
 require_once('include/Probe.php');
 
-function photos_init(&$a) {
+function photos_init(App &$a) {
 
 	if ($a->argc > 1)
 		auto_redir($a, $a->argv[1]);
@@ -112,7 +112,7 @@ function photos_init(&$a) {
 
 
 
-function photos_post(&$a) {
+function photos_post(App &$a) {
 
 	logger('mod-photos: photos_post: begin' , LOGGER_DEBUG);
 
@@ -255,7 +255,7 @@ function photos_post(&$a) {
 				);
 			}
 			if (dbm::is_result($r)) {
-				foreach($r as $rr) {
+				foreach ($r as $rr) {
 					$res[] = "'" . dbesc($rr['rid']) . "'" ;
 				}
 			} else {
@@ -277,7 +277,7 @@ function photos_post(&$a) {
 				intval($page_owner_uid)
 			);
 			if (dbm::is_result($r)) {
-				foreach($r as $rr) {
+				foreach ($r as $rr) {
 					q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
 						dbesc(datetime_convert()),
 						dbesc($rr['parent-uri']),
@@ -346,7 +346,7 @@ function photos_post(&$a) {
 				dbesc($r[0]['resource-id']),
 				intval($page_owner_uid)
 			);
-			if (count($i)) {
+			if (dbm::is_result($i)) {
 				q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
 					dbesc(datetime_convert()),
 					dbesc(datetime_convert()),
@@ -356,7 +356,7 @@ function photos_post(&$a) {
 				create_tags_from_itemuri($i[0]['uri'], $page_owner_uid);
 				delete_thread_uri($i[0]['uri'], $page_owner_uid);
 
-				$url = $a->get_baseurl();
+				$url = App::get_baseurl();
 				$drop_id = intval($i[0]['id']);
 
 				if ($i[0]['visible'])
@@ -496,8 +496,8 @@ function photos_post(&$a) {
 			$arr['visible']       = $visibility;
 			$arr['origin']        = 1;
 
-			$arr['body']          = '[url=' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $p[0]['resource-id'] . ']'
-						. '[img]' . $a->get_baseurl() . '/photo/' . $p[0]['resource-id'] . '-' . $p[0]['scale'] . '.'. $ext . '[/img]'
+			$arr['body']          = '[url=' . App::get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $p[0]['resource-id'] . ']'
+						. '[img]' . App::get_baseurl() . '/photo/' . $p[0]['resource-id'] . '-' . $p[0]['scale'] . '.'. $ext . '[/img]'
 						. '[/url]';
 
 			$item_id = item_store($arr);
@@ -615,7 +615,7 @@ function photos_post(&$a) {
 						}
 					} elseif (strpos($tag,'#') === 0) {
 						$tagname = substr($tag, 1);
-						$str_tags .= '#[url='.$a->get_baseurl()."/search?tag=".$tagname.']'.$tagname.'[/url]';
+						$str_tags .= '#[url='.App::get_baseurl()."/search?tag=".$tagname.']'.$tagname.'[/url]';
 					}
 				}
 			}
@@ -685,8 +685,8 @@ function photos_post(&$a) {
 					$arr['tag']           = $tagged[4];
 					$arr['inform']        = $tagged[2];
 					$arr['origin']        = 1;
-					$arr['body']          = sprintf( t('%1$s was tagged in %2$s by %3$s'), '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ;
-					$arr['body'] .= "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . '[img]' . $a->get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ;
+					$arr['body']          = sprintf( t('%1$s was tagged in %2$s by %3$s'), '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . App::get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ;
+					$arr['body'] .= "\n\n" . '[url=' . App::get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . '[img]' . App::get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ;
 
 					$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $tagged[0] . '</title><id>' . $tagged[1] . '/' . $tagged[0] . '</id>';
 					$arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $tagged[1] . '" />' . "\n");
@@ -695,8 +695,8 @@ function photos_post(&$a) {
 					$arr['object'] .= '</link></object>' . "\n";
 
 					$arr['target'] = '<target><type>' . ACTIVITY_OBJ_IMAGE . '</type><title>' . $p[0]['desc'] . '</title><id>'
-						. $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '</id>';
-					$arr['target'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '" />' . "\n" . '<link rel="preview" type="'.$p[0]['type'].'" href="' . $a->get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '" />') . '</link></target>';
+						. App::get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '</id>';
+					$arr['target'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '" />' . "\n" . '<link rel="preview" type="'.$p[0]['type'].'" href="' . App::get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '" />') . '</link></target>';
 
 					$item_id = item_store($arr);
 					if ($item_id) {
@@ -908,8 +908,8 @@ function photos_post(&$a) {
 	$arr['visible']       = $visible;
 	$arr['origin']        = 1;
 
-	$arr['body']          = '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo_hash . ']'
-				. '[img]' . $a->get_baseurl() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/img]'
+	$arr['body']          = '[url=' . App::get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo_hash . ']'
+				. '[img]' . App::get_baseurl() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/img]'
 				. '[/url]';
 
 	$item_id = item_store($arr);
@@ -928,7 +928,7 @@ function photos_post(&$a) {
 
 
 
-function photos_content(&$a) {
+function photos_content(App &$a) {
 
 	// URLs:
 	// photos/name
diff --git a/mod/ping.php b/mod/ping.php
index 1ef3cc5b47..cde03969f4 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -177,7 +177,7 @@ function ping_init(App $a)
 		$intro_count = count($intros1) + count($intros2);
 		$intros = $intros1 + $intros2;
 
-		$myurl = $a->get_baseurl() . '/profile/' . $a->user['nickname'] ;
+		$myurl = App::get_baseurl() . '/profile/' . $a->user['nickname'] ;
 		$mails = qu("SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail`
 			WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ",
 			intval(local_user()),
@@ -253,7 +253,7 @@ function ping_init(App $a)
 		if (dbm::is_result($intros)) {
 			foreach ($intros as $intro) {
 				$notif = array(
-					'href'    => $a->get_baseurl() . '/notifications/intros/' . $intro['id'],
+					'href'    => App::get_baseurl() . '/notifications/intros/' . $intro['id'],
 					'name'    => $intro['name'],
 					'url'     => $intro['url'],
 					'photo'   => $intro['photo'],
@@ -268,7 +268,7 @@ function ping_init(App $a)
 		if (dbm::is_result($mails)) {
 			foreach ($mails as $mail) {
 				$notif = array(
-					'href'    => $a->get_baseurl() . '/message/' . $mail['id'],
+					'href'    => App::get_baseurl() . '/message/' . $mail['id'],
 					'name'    => $mail['from-name'],
 					'url'     => $mail['from-url'],
 					'photo'   => $mail['from-photo'],
@@ -283,7 +283,7 @@ function ping_init(App $a)
 		if (dbm::is_result($regs)) {
 			foreach ($regs as $reg) {
 				$notif = array(
-					'href'    => $a->get_baseurl() . '/admin/users/',
+					'href'    => App::get_baseurl() . '/admin/users/',
 					'name'    => $reg['name'],
 					'url'     => $reg['url'],
 					'photo'   => $reg['micro'],
@@ -450,7 +450,7 @@ function ping_get_notifications($uid)
 				);
 			}
 
-			$notification["href"] = $a->get_baseurl() . "/notify/view/" . $notification["id"];
+			$notification["href"] = App::get_baseurl() . "/notify/view/" . $notification["id"];
 
 			if ($notification["visible"] AND !$notification["spam"] AND
 				!$notification["deleted"] AND !is_array($result[$notification["parent"]])) {
diff --git a/mod/poco.php b/mod/poco.php
index e454d1e668..0415e1a2ce 100644
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -2,7 +2,7 @@
 // See here for a documentation for portable contacts:
 // https://web.archive.org/web/20160405005550/http://portablecontacts.net/draft-spec.html
 
-function poco_init(&$a) {
+function poco_init(App &$a) {
 	require_once("include/bbcode.php");
 
 	$system_mode = false;
@@ -16,8 +16,9 @@ function poco_init(&$a) {
 	}
 	if(! x($user)) {
 		$c = q("SELECT * FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1");
-		if(! count($c))
+		if (! dbm::is_result($c)) {
 			http_status_exit(401);
+		}
 		$system_mode = true;
 	}
 
@@ -174,7 +175,7 @@ function poco_init(&$a) {
 
 	if(is_array($r)) {
 		if (dbm::is_result($r)) {
-			foreach($r as $rr) {
+			foreach ($r as $rr) {
 				if (!isset($rr['generation'])) {
 					if ($global)
 						$rr['generation'] = 3;
diff --git a/mod/poke.php b/mod/poke.php
index 8102c3697d..2e15ed853f 100644
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -19,27 +19,31 @@ require_once('include/bbcode.php');
 require_once('include/items.php');
 
 
-function poke_init(&$a) {
+function poke_init(App &$a) {
 
-	if(! local_user())
+	if (! local_user()) {
 		return;
+	}
 
 	$uid = local_user();
 	$verb = notags(trim($_GET['verb']));
 
-	if(! $verb)
+	if (! $verb) {
 		return;
+	}
 
 	$verbs = get_poke_verbs();
 
-	if(! array_key_exists($verb,$verbs))
+	if (! array_key_exists($verb,$verbs)) {
 		return;
+	}
 
 	$activity = ACTIVITY_POKE . '#' . urlencode($verbs[$verb][0]);
 
 	$contact_id = intval($_GET['cid']);
-	if(! $contact_id)
+	if (! $contact_id) {
 		return;
+	}
 
 	$parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : 0);
 
@@ -52,7 +56,7 @@ function poke_init(&$a) {
 		intval($uid)
 	);
 
-	if(! dbm::is_result($r)) {
+	if (! dbm::is_result($r)) {
 		logger('poke: no contact ' . $contact_id);
 		return;
 	}
@@ -118,7 +122,7 @@ function poke_init(&$a) {
 	$arr['origin']        = 1;
 	$arr['body']          = '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' . ' ' . t($verbs[$verb][0]) . ' ' . '[url=' . $target['url'] . ']' . $target['name'] . '[/url]';
 
-	$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $target['name'] . '</title><id>' . $a->get_baseurl() . '/contact/' . $target['id'] . '</id>';
+	$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $target['name'] . '</title><id>' . App::get_baseurl() . '/contact/' . $target['id'] . '</id>';
 	$arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $target['url'] . '" />' . "\n");
 
 	$arr['object'] .= xmlify('<link rel="photo" type="image/jpeg" href="' . $target['photo'] . '" />' . "\n");
@@ -127,7 +131,7 @@ function poke_init(&$a) {
 	$item_id = item_store($arr);
 	if($item_id) {
 		//q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d",
-		//	dbesc($a->get_baseurl() . '/display/' . $poster['nickname'] . '/' . $item_id),
+		//	dbesc(App::get_baseurl() . '/display/' . $poster['nickname'] . '/' . $item_id),
 		//	intval($uid),
 		//	intval($item_id)
 		//);
@@ -144,9 +148,9 @@ function poke_init(&$a) {
 
 
 
-function poke_content(&$a) {
+function poke_content(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
@@ -166,11 +170,11 @@ function poke_content(&$a) {
 	}
 
 
-	$base = $a->get_baseurl();
+	$base = App::get_baseurl();
 
 	$head_tpl = get_markup_template('poke_head.tpl');
 	$a->page['htmlhead'] .= replace_macros($head_tpl,array(
-		'$baseurl' => $a->get_baseurl(true),
+		'$baseurl' => App::get_baseurl(true),
 		'$base' => $base
 	));
 
diff --git a/mod/post.php b/mod/post.php
index 76282d29a5..076587839d 100644
--- a/mod/post.php
+++ b/mod/post.php
@@ -10,11 +10,11 @@ require_once('include/crypto.php');
 // not yet ready for prime time
 //require_once('include/zot.php');
 	
-function post_post(&$a) {
+function post_post(App &$a) {
 
 	$bulk_delivery = false;
 
-	if($a->argc == 1) {
+	if ($a->argc == 1) {
 		$bulk_delivery = true;
 	}
 	else {
@@ -23,8 +23,9 @@ function post_post(&$a) {
 				AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
 			dbesc($nickname)
 		);
-		if(! dbm::is_result($r))
+		if (! dbm::is_result($r)) {
 			http_status_exit(500);
+		}
 
 		$importer = $r[0];
 	}
diff --git a/mod/pretheme.php b/mod/pretheme.php
index 4584cb29e2..694fd5ba27 100644
--- a/mod/pretheme.php
+++ b/mod/pretheme.php
@@ -1,6 +1,6 @@
 <?php
 
-function pretheme_init(&$a) {
+function pretheme_init(App &$a) {
 	
 	if($_REQUEST['theme']) {
 		$theme = $_REQUEST['theme'];
diff --git a/mod/probe.php b/mod/probe.php
index c95db291b3..c368a50f58 100644
--- a/mod/probe.php
+++ b/mod/probe.php
@@ -2,7 +2,7 @@
 
 require_once('include/Scrape.php');
 
-function probe_content(&$a) {
+function probe_content(App &$a) {
 
 	$o .= '<h3>Probe Diagnostic</h3>';
 
diff --git a/mod/profile.php b/mod/profile.php
index 5ab675dd0d..52ffe8c47d 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -4,7 +4,7 @@ require_once('include/contact_widgets.php');
 require_once('include/redir.php');
 
 
-function profile_init(&$a) {
+function profile_init(App &$a) {
 
 	if(! x($a->page,'aside'))
 		$a->page['aside'] = '';
@@ -14,7 +14,7 @@ function profile_init(&$a) {
 	else {
 		$r = q("select nickname from user where blocked = 0 and account_expired = 0 and account_removed = 0 and verified = 1 order by rand() limit 1");
 		if (dbm::is_result($r)) {
-			goaway($a->get_baseurl() . '/profile/' . $r[0]['nickname']);
+			goaway(App::get_baseurl() . '/profile/' . $r[0]['nickname']);
 		}
 		else {
 			logger('profile error: mod_profile ' . $a->query_string, LOGGER_DEBUG);
@@ -56,15 +56,16 @@ function profile_init(&$a) {
 	}
 
 	$a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . (($a->profile['net-publish']) ? 'true' : 'false') . '" />' . "\r\n" ;
-	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . $a->get_baseurl() . '/dfrn_poll/' . $which .'" />' . "\r\n" ;
+	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . App::get_baseurl() . '/dfrn_poll/' . $which .'" />' . "\r\n" ;
 	$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
-	$a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . $a->get_baseurl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
-	header('Link: <' . $a->get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
+	$a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . App::get_baseurl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
+	header('Link: <' . App::get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
 
 	$dfrn_pages = array('request', 'confirm', 'notify', 'poll');
-	foreach($dfrn_pages as $dfrn)
-		$a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".$a->get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
-	$a->page['htmlhead'] .= "<link rel=\"dfrn-poco\" href=\"".$a->get_baseurl()."/poco/{$which}\" />\r\n";
+	foreach ($dfrn_pages as $dfrn) {
+		$a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".App::get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
+	}
+	$a->page['htmlhead'] .= "<link rel=\"dfrn-poco\" href=\"".App::get_baseurl()."/poco/{$which}\" />\r\n";
 
 }
 
@@ -181,8 +182,8 @@ function profile_content(&$a, $update = 0) {
 		$commpage = (($a->profile['page-flags'] == PAGE_COMMUNITY) ? true : false);
 		$commvisitor = (($commpage && $remote_contact == true) ? true : false);
 
-		$a->page['aside'] .= posted_date_widget($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],$a->profile['profile_uid'],true);
-		$a->page['aside'] .= categories_widget($a->get_baseurl(true) . '/profile/' . $a->profile['nickname'],(x($category) ? xmlify($category) : ''));
+		$a->page['aside'] .= posted_date_widget(App::get_baseurl(true) . '/profile/' . $a->profile['nickname'],$a->profile['profile_uid'],true);
+		$a->page['aside'] .= categories_widget(App::get_baseurl(true) . '/profile/' . $a->profile['nickname'],(x($category) ? xmlify($category) : ''));
 
 		if(can_write_wall($a,$a->profile['profile_uid'])) {
 
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 20bbbbcbd4..9b1ff8adb8 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -2,9 +2,9 @@
 
 require_once("include/Photo.php");
 
-function profile_photo_init(&$a) {
+function profile_photo_init(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		return;
 	}
 
@@ -13,9 +13,9 @@ function profile_photo_init(&$a) {
 }
 
 
-function profile_photo_post(&$a) {
+function profile_photo_post(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice ( t('Permission denied.') . EOL );
 		return;
 	}
@@ -73,22 +73,25 @@ function profile_photo_post(&$a) {
 
 				$r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 4, $is_default_profile);
 
-				if($r === false)
+				if ($r === false) {
 					notice ( sprintf(t('Image size reduction [%s] failed.'),"175") . EOL );
+				}
 
 				$im->scaleImage(80);
 
 				$r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 5, $is_default_profile);
 
-				if($r === false)
+				if ($r === false) {
 					notice( sprintf(t('Image size reduction [%s] failed.'),"80") . EOL );
+				}
 
 				$im->scaleImage(48);
 
 				$r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 6, $is_default_profile);
 
-				if($r === false)
+				if ($r === false) {
 					notice( sprintf(t('Image size reduction [%s] failed.'),"48") . EOL );
+				}
 
 				// If setting for the default profile, unset the profile photo flag from any other photos I own
 
@@ -99,15 +102,15 @@ function profile_photo_post(&$a) {
 					);
 
 					$r = q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s'  WHERE `self` AND `uid` = %d",
-						dbesc($a->get_baseurl() . '/photo/' . $base_image['resource-id'] . '-4.' . $im->getExt()),
-						dbesc($a->get_baseurl() . '/photo/' . $base_image['resource-id'] . '-5.' . $im->getExt()),
-						dbesc($a->get_baseurl() . '/photo/' . $base_image['resource-id'] . '-6.' . $im->getExt()),
+						dbesc(App::get_baseurl() . '/photo/' . $base_image['resource-id'] . '-4.' . $im->getExt()),
+						dbesc(App::get_baseurl() . '/photo/' . $base_image['resource-id'] . '-5.' . $im->getExt()),
+						dbesc(App::get_baseurl() . '/photo/' . $base_image['resource-id'] . '-6.' . $im->getExt()),
 						intval(local_user())
 					);
 				} else {
 					$r = q("update profile set photo = '%s', thumb = '%s' where id = %d and uid = %d",
-						dbesc($a->get_baseurl() . '/photo/' . $base_image['resource-id'] . '-4.' . $im->getExt()),
-						dbesc($a->get_baseurl() . '/photo/' . $base_image['resource-id'] . '-5.' . $im->getExt()),
+						dbesc(App::get_baseurl() . '/photo/' . $base_image['resource-id'] . '-4.' . $im->getExt()),
+						dbesc(App::get_baseurl() . '/photo/' . $base_image['resource-id'] . '-5.' . $im->getExt()),
 						intval($_REQUEST['profile']),
 						intval(local_user())
 					);
@@ -123,9 +126,10 @@ function profile_photo_post(&$a) {
 
 				info( t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
 				// Update global directory in background
-				$url = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
-				if($url && strlen(get_config('system','directory')))
+				$url = App::get_baseurl() . '/profile/' . $a->user['nickname'];
+				if ($url && strlen(get_config('system','directory'))) {
 					proc_run(PRIORITY_LOW, "include/directory.php", $url);
+				}
 
 				require_once('include/profile_update.php');
 				profile_change();
@@ -134,7 +138,7 @@ function profile_photo_post(&$a) {
 				notice( t('Unable to process image') . EOL);
 		}
 
-		goaway($a->get_baseurl() . '/profiles');
+		goaway(App::get_baseurl() . '/profiles');
 		return; // NOTREACHED
 	}
 
@@ -169,9 +173,9 @@ function profile_photo_post(&$a) {
 
 
 if(! function_exists('profile_photo_content')) {
-function profile_photo_content(&$a) {
+function profile_photo_content(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL );
 		return;
 	}
@@ -200,7 +204,7 @@ function profile_photo_content(&$a) {
 			return;
 		}
 		$havescale = false;
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			if($rr['scale'] == 5)
 				$havescale = true;
 		}
@@ -223,10 +227,11 @@ function profile_photo_content(&$a) {
 
 			// Update global directory in background
 			$url = $_SESSION['my_url'];
-			if($url && strlen(get_config('system','directory')))
+			if ($url && strlen(get_config('system','directory'))) {
 				proc_run(PRIORITY_LOW, "include/directory.php", $url);
+			}
 
-			goaway($a->get_baseurl() . '/profiles');
+			goaway(App::get_baseurl() . '/profiles');
 			return; // NOTREACHED
 		}
 		$ph = new Photo($r[0]['data'], $r[0]['type']);
@@ -251,7 +256,7 @@ function profile_photo_content(&$a) {
 			'$submit' => t('Upload'),
 			'$profiles' => $profiles,
 			'$form_security_token' => get_form_security_token("profile_photo"),
-			'$select' => sprintf('%s %s', t('or'), ($newuser) ? '<a href="' . $a->get_baseurl() . '">' . t('skip this step') . '</a>' : '<a href="'. $a->get_baseurl() . '/photos/' . $a->user['nickname'] . '">' . t('select a photo from your photo albums') . '</a>')
+			'$select' => sprintf('%s %s', t('or'), ($newuser) ? '<a href="' . App::get_baseurl() . '">' . t('skip this step') . '</a>' : '<a href="'. App::get_baseurl() . '/photos/' . $a->user['nickname'] . '">' . t('select a photo from your photo albums') . '</a>')
 		));
 
 		return $o;
@@ -264,7 +269,7 @@ function profile_photo_content(&$a) {
 			'$filename' => $filename,
 			'$profile' => intval($_REQUEST['profile']),
 			'$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'],
-			'$image_url' => $a->get_baseurl() . '/photo/' . $filename,
+			'$image_url' => App::get_baseurl() . '/photo/' . $filename,
 			'$title' => t('Crop Image'),
 			'$desc' => t('Please adjust the image cropping for optimum viewing.'),
 			'$form_security_token' => get_form_security_token("profile_photo"),
@@ -280,15 +285,17 @@ function profile_photo_content(&$a) {
 if(! function_exists('profile_photo_crop_ui_head')) {
 function profile_photo_crop_ui_head(&$a, $ph){
 	$max_length = get_config('system','max_image_length');
-	if(! $max_length)
+	if (! $max_length) {
 		$max_length = MAX_IMAGE_LENGTH;
-	if($max_length > 0)
+	}
+	if ($max_length > 0) {
 		$ph->scaleImage($max_length);
+	}
 
 	$width = $ph->getWidth();
 	$height = $ph->getHeight();
 
-	if($width < 175 || $height < 175) {
+	if ($width < 175 || $height < 175) {
 		$ph->scaleImageUp(200);
 		$width = $ph->getWidth();
 		$height = $ph->getHeight();
@@ -301,19 +308,21 @@ function profile_photo_crop_ui_head(&$a, $ph){
 
 	$r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 0 );	
 
-	if($r)
+	if ($r) {
 		info( t('Image uploaded successfully.') . EOL );
-	else
+	} else {
 		notice( t('Image upload failed.') . EOL );
+	}
 
-	if($width > 640 || $height > 640) {
+	if ($width > 640 || $height > 640) {
 		$ph->scaleImage(640);
 		$r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 1 );	
-		
-		if($r === false)
+
+		if ($r === false) {
 			notice( sprintf(t('Image size reduction [%s] failed.'),"640") . EOL );
-		else
+		} else {
 			$smallest = 1;
+		}
 	}
 
 	$a->config['imagecrop'] = $hash;
diff --git a/mod/profiles.php b/mod/profiles.php
index f9fde658d2..bf2f20d2a9 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -2,11 +2,11 @@
 require_once("include/Contact.php");
 require_once('include/Probe.php');
 
-function profiles_init(&$a) {
+function profiles_init(App &$a) {
 
 	nav_set_selected('profiles');
 
-	if(! local_user()) {
+	if (! local_user()) {
 		return;
 	}
 
@@ -15,7 +15,7 @@ function profiles_init(&$a) {
 			intval($a->argv[2]),
 			intval(local_user())
 		);
-		if(! dbm::is_result($r)) {
+		if (! dbm::is_result($r)) {
 			notice( t('Profile not found.') . EOL);
 			goaway('profiles');
 			return; // NOTREACHED
@@ -92,7 +92,7 @@ function profiles_init(&$a) {
 			intval(local_user()),
 			intval($a->argv[2])
 		);
-		if(! count($r1)) {
+		if(! dbm::is_result($r1)) {
 			notice( t('Profile unavailable to clone.') . EOL);
 			killme();
 			return;
@@ -116,7 +116,7 @@ function profiles_init(&$a) {
 			dbesc($name)
 		);
 		info( t('New profile created.') . EOL);
-		if(count($r3) == 1)
+		if ((dbm::is_result($r3)) && (count($r3) == 1))
 			goaway('profiles/'.$r3[0]['id']);
 
 		goaway('profiles');
@@ -130,7 +130,7 @@ function profiles_init(&$a) {
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if(! dbm::is_result($r)) {
+		if (! dbm::is_result($r)) {
 			notice( t('Profile not found.') . EOL);
 			killme();
 			return;
@@ -160,9 +160,9 @@ function profile_clean_keywords($keywords) {
 	return $keywords;
 }
 
-function profiles_post(&$a) {
+function profiles_post(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
@@ -502,8 +502,9 @@ function profiles_post(&$a) {
 
 			// Update global directory in background
 			$url = $_SESSION['my_url'];
-			if($url && strlen(get_config('system','directory')))
+			if ($url && strlen(get_config('system','directory'))) {
 				proc_run(PRIORITY_LOW, "include/directory.php", $url);
+			}
 
 			require_once('include/profile_update.php');
 			profile_change();
@@ -594,14 +595,15 @@ function profile_activity($changed, $value) {
 	$arr['deny_gid']  = $a->user['deny_gid'];
 
 	$i = item_store($arr);
-	if($i)
+	if ($i) {
 		proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i);
+	}
 }
 
 
-function profiles_content(&$a) {
+function profiles_content(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
@@ -613,7 +615,7 @@ function profiles_content(&$a) {
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if(! dbm::is_result($r)) {
+		if (! dbm::is_result($r)) {
 			notice( t('Profile not found.') . EOL);
 			return;
 		}
@@ -629,11 +631,11 @@ function profiles_content(&$a) {
 			$editselect = 'textareas';
 
 		$a->page['htmlhead'] .= replace_macros(get_markup_template('profed_head.tpl'), array(
-			'$baseurl' => $a->get_baseurl(true),
+			'$baseurl' => App::get_baseurl(true),
 			'$editselect' => $editselect,
 		));
 		$a->page['end'] .= replace_macros(get_markup_template('profed_end.tpl'), array(
-			'$baseurl' => $a->get_baseurl(true),
+			'$baseurl' => App::get_baseurl(true),
 			'$editselect' => $editselect,
 		));
 
@@ -711,7 +713,7 @@ function profiles_content(&$a) {
 			'$lbl_ex2' => t('Example: fishing photography software'),
 
 			'$disabled' => (($is_default) ? 'onclick="return false;" style="color: #BBBBFF;"' : ''),
-			'$baseurl' => $a->get_baseurl(true),
+			'$baseurl' => App::get_baseurl(true),
 			'$profile_id' => $r[0]['id'],
 			'$profile_name' => array('profile_name', t('Profile Name:'), $r[0]['profile-name'], t('Required'), '*'),
 			'$is_default'   => $is_default,
@@ -778,24 +780,26 @@ function profiles_content(&$a) {
 		if (dbm::is_result($r)) {
 
 			$tpl = get_markup_template('profile_entry.tpl');
-			foreach($r as $rr) {
+
+			$profiles = '';
+			foreach ($r as $rr) {
 				$profiles .= replace_macros($tpl, array(
-					'$photo' => $a->remove_baseurl($rr['thumb']),
-					'$id' => $rr['id'],
-					'$alt' => t('Profile Image'),
+					'$photo'        => $a->remove_baseurl($rr['thumb']),
+					'$id'           => $rr['id'],
+					'$alt'          => t('Profile Image'),
 					'$profile_name' => $rr['profile-name'],
-					'$visible' => (($rr['is-default']) ? '<strong>' . t('visible to everybody') . '</strong>'
+					'$visible'      => (($rr['is-default']) ? '<strong>' . t('visible to everybody') . '</strong>'
 						: '<a href="'.'profperm/'.$rr['id'].'" />' . t('Edit visibility') . '</a>')
 				));
 			}
 
 			$tpl_header = get_markup_template('profile_listing_header.tpl');
 			$o .= replace_macros($tpl_header,array(
-				'$header' => t('Edit/Manage Profiles'),
-				'$chg_photo' => t('Change profile photo'),
-				'$cr_new' => t('Create New Profile'),
+				'$header'      => t('Edit/Manage Profiles'),
+				'$chg_photo'   => t('Change profile photo'),
+				'$cr_new'      => t('Create New Profile'),
 				'$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new"),
-				'$profiles' => $profiles
+				'$profiles'    => $profiles
 			));
 		}
 		return $o;
diff --git a/mod/profperm.php b/mod/profperm.php
index 1c37f84ab2..bbb055b021 100644
--- a/mod/profperm.php
+++ b/mod/profperm.php
@@ -1,9 +1,10 @@
 <?php
 
-function profperm_init(&$a) {
+function profperm_init(App &$a) {
 
-	if(! local_user())
+	if (! local_user()) {
 		return;
+	}
 
 	$which = $a->user['nickname'];
 	$profile = $a->argv[1];
@@ -13,9 +14,9 @@ function profperm_init(&$a) {
 }
 
 
-function profperm_content(&$a) {
+function profperm_content(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied') . EOL);
 		return;
 	}
@@ -52,7 +53,7 @@ function profperm_content(&$a) {
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if(! dbm::is_result($r)) {
+		if (! dbm::is_result($r)) {
 			notice( t('Invalid profile identifier.') . EOL );
 			return;
 		}
diff --git a/mod/proxy.php b/mod/proxy.php
index 736b44007f..8046e4e963 100644
--- a/mod/proxy.php
+++ b/mod/proxy.php
@@ -136,6 +136,7 @@ function proxy_init(App $a) {
 	}
 
 	$valid = true;
+	$r = array();
 
 	if (!$direct_cache AND ($cachefile == '')) {
 		$r = qu("SELECT * FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", $urlhash);
@@ -146,8 +147,6 @@ function proxy_init(App $a) {
 				$mime = 'image/jpeg';
 			}
 		}
-	} else {
-		$r = array();
 	}
 
 	if (!dbm::is_result($r)) {
@@ -264,7 +263,7 @@ function proxy_url($url, $writemode = false, $size = '') {
 
 	// Only continue if it isn't a local image and the isn't deactivated
 	if (proxy_is_local_image($url)) {
-		$url = str_replace(normalise_link($a->get_baseurl()) . '/', $a->get_baseurl() . '/', $url);
+		$url = str_replace(normalise_link(App::get_baseurl()) . '/', App::get_baseurl() . '/', $url);
 		return $url;
 	}
 
@@ -297,7 +296,7 @@ function proxy_url($url, $writemode = false, $size = '') {
 		$longpath .= '.' . $extension;
 	}
 
-	$proxypath = $a->get_baseurl() . '/proxy/' . $longpath;
+	$proxypath = App::get_baseurl() . '/proxy/' . $longpath;
 
 	if ($size != '') {
 		$size = ':' . $size;
@@ -308,7 +307,7 @@ function proxy_url($url, $writemode = false, $size = '') {
 	if ((strlen($proxypath) > 250) AND $writemode) {
 		return $shortpath;
 	} elseif (strlen($proxypath) > 250) {
-		return $a->get_baseurl() . '/proxy/' . $shortpath . '?url=' . urlencode($url);
+		return App::get_baseurl() . '/proxy/' . $shortpath . '?url=' . urlencode($url);
 	} elseif ($writemode) {
 		return $longpath;
 	} else {
@@ -330,7 +329,7 @@ function proxy_is_local_image($url) {
 	}
 
 	// links normalised - bug #431
-	$baseurl = normalise_link(get_app()->get_baseurl());
+	$baseurl = normalise_link(App::get_baseurl());
 	$url = normalise_link($url);
 	return (substr($url, 0, strlen($baseurl)) == $baseurl);
 }
@@ -372,8 +371,7 @@ function proxy_img_cb($matches) {
 }
 
 function proxy_parse_html($html) {
-	$a = get_app();
-	$html = str_replace(normalise_link($a->get_baseurl()) . '/', $a->get_baseurl() . '/', $html);
+	$html = str_replace(normalise_link(App::get_baseurl()) . '/', App::get_baseurl() . '/', $html);
 
 	return preg_replace_callback('/(<img [^>]*src *= *["\'])([^"\']+)(["\'][^>]*>)/siU', 'proxy_img_cb', $html);
 }
diff --git a/mod/pubsub.php b/mod/pubsub.php
index ddda7ec228..308e237d5d 100644
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -26,7 +26,7 @@ function hub_post_return() {
 
 
 
-function pubsub_init(&$a) {
+function pubsub_init(App &$a) {
 
 	$nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
 	$contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
@@ -47,7 +47,7 @@ function pubsub_init(&$a) {
 		$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
 			dbesc($nick)
 		);
-		if(! dbm::is_result($r)) {
+		if (! dbm::is_result($r)) {
 			logger('pubsub: local account not found: ' . $nick);
 			hub_return(false, '');
 		}
@@ -62,7 +62,7 @@ function pubsub_init(&$a) {
 			intval($contact_id),
 			intval($owner['uid'])
 		);
-		if(! dbm::is_result($r)) {
+		if (! dbm::is_result($r)) {
 			logger('pubsub: contact '.$contact_id.' not found.');
 			hub_return(false, '');
 		}
@@ -98,7 +98,7 @@ function pubsub_init(&$a) {
 
 require_once('include/security.php');
 
-function pubsub_post(&$a) {
+function pubsub_post(App &$a) {
 
 	$xml = file_get_contents('php://input');
 
@@ -117,8 +117,9 @@ function pubsub_post(&$a) {
 	$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
 		dbesc($nick)
 	);
-	if(! dbm::is_result($r))
+	if (! dbm::is_result($r)) {
 		hub_post_return();
+	}
 
 	$importer = $r[0];
 
@@ -131,7 +132,7 @@ function pubsub_post(&$a) {
 		dbesc(NETWORK_FEED)
 	);
 
-	if(! dbm::is_result($r)) {
+	if (! dbm::is_result($r)) {
 		logger('pubsub: no contact record for "'.$nick.' ('.$contact_id.')" - ignored. '.$xml);
 		hub_post_return();
 	}
diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php
index bfe553c44c..a6c36631ae 100644
--- a/mod/pubsubhubbub.php
+++ b/mod/pubsubhubbub.php
@@ -4,7 +4,7 @@ function post_var($name) {
 	return (x($_POST, $name)) ? notags(trim($_POST[$name])) : '';
 }
 
-function pubsubhubbub_init(&$a) {
+function pubsubhubbub_init(App &$a) {
 	// PuSH subscription must be considered "public" so just block it
 	// if public access isn't enabled.
 	if (get_config('system', 'block_public')) {
diff --git a/mod/qsearch.php b/mod/qsearch.php
index a440ea708f..118c93d9fa 100644
--- a/mod/qsearch.php
+++ b/mod/qsearch.php
@@ -1,9 +1,10 @@
 <?php
 
-function qsearch_init(&$a) {
+function qsearch_init(App &$a) {
 
-	if(! local_user())
+	if (! local_user()) {
 		killme();
+	}
 
 	$limit = (get_config('system','qsearch_limit') ? intval(get_config('system','qsearch_limit')) : 100);
 
diff --git a/mod/randprof.php b/mod/randprof.php
index 6713a81d9e..08157a3851 100644
--- a/mod/randprof.php
+++ b/mod/randprof.php
@@ -1,10 +1,14 @@
 <?php
 
 
-function randprof_init(&$a) {
+function randprof_init(App &$a) {
 	require_once('include/Contact.php');
+
 	$x = random_profile();
-	if($x)
+
+	if ($x) {
 		goaway(zrl($x));
-	goaway($a->get_baseurl() . '/profile');
+	}
+
+	goaway(App::get_baseurl() . '/profile');
 }
diff --git a/mod/receive.php b/mod/receive.php
index dd4e61ae4f..90dcc05281 100644
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -10,7 +10,7 @@ require_once('include/crypto.php');
 require_once('include/diaspora.php');
 
 
-function receive_post(&$a) {
+function receive_post(App &$a) {
 
 
 	$enabled = intval(get_config('system','diaspora_enabled'));
@@ -34,8 +34,9 @@ function receive_post(&$a) {
 		$r = q("SELECT * FROM `user` WHERE `guid` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
 			dbesc($guid)
 		);
-		if(! dbm::is_result($r))
+		if (! dbm::is_result($r)) {
 			http_status_exit(500);
+		}
 
 		$importer = $r[0];
 	}
diff --git a/mod/redir.php b/mod/redir.php
index 5dc5ad3724..e951b2d2a9 100644
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -1,6 +1,6 @@
 <?php
 
-function redir_init(&$a) {
+function redir_init(App &$a) {
 
 	$url = ((x($_GET,'url')) ? $_GET['url'] : '');
 	$quiet = ((x($_GET,'quiet')) ? '&quiet=1' : '');
@@ -63,12 +63,14 @@ function redir_init(&$a) {
 			. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest . $quiet );
 	}
 
-	if(local_user())
-		$handle = $a->user['nickname'] . '@' . substr($a->get_baseurl(),strpos($a->get_baseurl(),'://')+3);
-	if(remote_user())
+	if (local_user()) {
+		$handle = $a->user['nickname'] . '@' . substr(App::get_baseurl(),strpos(App::get_baseurl(),'://')+3);
+	}
+	if (remote_user()) {
 		$handle = $_SESSION['handle'];
+	}
 
-	if($url) {
+	if ($url) {
 		$url = str_replace('{zid}','&zid=' . $handle,$url);
 		goaway($url);
 	}
diff --git a/mod/register.php b/mod/register.php
index f0348ef4e5..dd953de356 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -5,7 +5,7 @@ require_once('include/bbcode.php');
 require_once('include/user.php');
 
 if(! function_exists('register_post')) {
-function register_post(&$a) {
+function register_post(App &$a) {
 
 	global $lang;
 
@@ -64,7 +64,7 @@ function register_post(&$a) {
 	$user = $result['user'];
 
 	if($netpublish && $a->config['register_policy'] != REGISTER_APPROVE) {
-		$url = $a->get_baseurl() . '/profile/' . $user['nickname'];
+		$url = App::get_baseurl() . '/profile/' . $user['nickname'];
 		proc_run(PRIORITY_LOW, "include/directory.php", $url);
 	}
 
@@ -85,7 +85,7 @@ function register_post(&$a) {
 			$res = send_register_open_eml(
 				$user['email'],
 				$a->config['sitename'],
-				$a->get_baseurl(),
+				App::get_baseurl(),
 				$user['username'],
 				$result['password']);
 
@@ -142,9 +142,9 @@ function register_post(&$a) {
 				'source_name' => $user['username'],
 				'source_mail' => $user['email'],
 				'source_nick' => $user['nickname'],
-				'source_link' => $a->get_baseurl()."/admin/users/",
-				'link' => $a->get_baseurl()."/admin/users/",
-				'source_photo' => $a->get_baseurl() . "/photo/avatar/".$user['uid'].".jpg",
+				'source_link' => App::get_baseurl()."/admin/users/",
+				'link' => App::get_baseurl()."/admin/users/",
+				'source_photo' => App::get_baseurl() . "/photo/avatar/".$user['uid'].".jpg",
 				'to_email' => $admin['email'],
 				'uid' => $admin['uid'],
 				'language' => ($admin['language']?$admin['language']:'en'),
@@ -172,7 +172,7 @@ function register_post(&$a) {
 
 
 if(! function_exists('register_content')) {
-function register_content(&$a) {
+function register_content(App &$a) {
 
 	// logged in users can register others (people/pages/groups)
 	// even with closed registrations, unless specifically prohibited by site policy.
diff --git a/mod/regmod.php b/mod/regmod.php
index 0120017b00..44bdfe6644 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -12,15 +12,17 @@ function user_allow($hash) {
 	);
 
 
-	if(! count($register))
+	if (! dbm::is_result($register)) {
 		return false;
+	}
 
 	$user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
 		intval($register[0]['uid'])
 	);
 
-	if(! count($user))
+	if (! dbm::is_result($user)) {
 		killme();
+	}
 
 	$r = q("DELETE FROM `register` WHERE `hash` = '%s'",
 		dbesc($register[0]['hash'])
@@ -35,9 +37,10 @@ function user_allow($hash) {
 		intval($user[0]['uid'])
 	);
 	if (dbm::is_result($r) && $r[0]['net-publish']) {
-		$url = $a->get_baseurl() . '/profile/' . $user[0]['nickname'];
-		if($url && strlen(get_config('system','directory')))
+		$url = App::get_baseurl() . '/profile/' . $user[0]['nickname'];
+		if ($url && strlen(get_config('system','directory'))) {
 			proc_run(PRIORITY_LOW, "include/directory.php", $url);
+		}
 	}
 
 	push_lang($register[0]['language']);
@@ -45,7 +48,7 @@ function user_allow($hash) {
 	send_register_open_eml(
 		$user[0]['email'],
 		$a->config['sitename'],
-		$a->get_baseurl(),
+		App::get_baseurl(),
 		$user[0]['username'],
 		$register[0]['password']);
 
@@ -69,7 +72,7 @@ function user_deny($hash) {
 		dbesc($hash)
 	);
 
-	if(! count($register))
+	if(! dbm::is_result($register))
 		return false;
 
 	$user = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
@@ -94,40 +97,41 @@ function user_deny($hash) {
 
 }
 
-function regmod_content(&$a) {
+function regmod_content(App &$a) {
 
 	global $lang;
 
 	$_SESSION['return_url'] = $a->cmd;
 
-	if(! local_user()) {
+	if (! local_user()) {
 		info( t('Please login.') . EOL);
 		$o .= '<br /><br />' . login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
 		return $o;
 	}
 
-	if((!is_site_admin()) || (x($_SESSION,'submanage') && intval($_SESSION['submanage']))) {
+	if ((!is_site_admin()) || (x($_SESSION,'submanage') && intval($_SESSION['submanage']))) {
 		notice( t('Permission denied.') . EOL);
 		return '';
 	}
 
-	if($a->argc != 3)
+	if ($a->argc != 3) {
 		killme();
+	}
 
 	$cmd  = $a->argv[1];
 	$hash = $a->argv[2];
 
 
 
-	if($cmd === 'deny') {
+	if ($cmd === 'deny') {
 		user_deny($hash);
-		goaway($a->get_baseurl()."/admin/users/");
+		goaway(App::get_baseurl()."/admin/users/");
 		killme();
 	}
 
-	if($cmd === 'allow') {
+	if ($cmd === 'allow') {
 		user_allow($hash);
-		goaway($a->get_baseurl()."/admin/users/");
+		goaway(App::get_baseurl()."/admin/users/");
 		killme();
 	}
 }
diff --git a/mod/removeme.php b/mod/removeme.php
index 904606fd57..4257667c4b 100644
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -1,25 +1,30 @@
 <?php
 
-function removeme_post(&$a) {
+function removeme_post(App &$a) {
 
-	if(! local_user())
+	if (! local_user()) {
 		return;
+	}
 
-	if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
+	if (x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
 		return;
+	}
 
-	if((! x($_POST,'qxz_password')) || (! strlen(trim($_POST['qxz_password']))))
+	if ((! x($_POST,'qxz_password')) || (! strlen(trim($_POST['qxz_password'])))) {
 		return;
+	}
 
-	if((! x($_POST,'verify')) || (! strlen(trim($_POST['verify']))))
+	if ((! x($_POST,'verify')) || (! strlen(trim($_POST['verify'])))) {
 		return;
+	}
 
-	if($_POST['verify'] !== $_SESSION['remove_account_verify'])
+	if ($_POST['verify'] !== $_SESSION['remove_account_verify']) {
 		return;
+	}
 
 	$encrypted = hash('whirlpool',trim($_POST['qxz_password']));
 
-	if((strlen($a->user['password'])) && ($encrypted === $a->user['password'])) {
+	if ((strlen($a->user['password'])) && ($encrypted === $a->user['password'])) {
 		require_once('include/Contact.php');
 		user_remove($a->user['uid']);
 		// NOTREACHED
@@ -27,21 +32,22 @@ function removeme_post(&$a) {
 
 }
 
-function removeme_content(&$a) {
+function removeme_content(App &$a) {
 
-	if(! local_user())
+	if (! local_user()) {
 		goaway(z_root());
+	}
 
 	$hash = random_string();
 
-        require_once("mod/settings.php");
-        settings_init($a);
+	require_once("mod/settings.php");
+	settings_init($a);
 
 	$_SESSION['remove_account_verify'] = $hash;
 
 	$tpl = get_markup_template('removeme.tpl');
 	$o .= replace_macros($tpl, array(
-		'$basedir' => $a->get_baseurl(),
+		'$basedir' => App::get_baseurl(),
 		'$hash' => $hash,
 		'$title' => t('Remove My Account'),
 		'$desc' => t('This will completely remove your account. Once this has been done it is not recoverable.'),
diff --git a/mod/repair_ostatus.php b/mod/repair_ostatus.php
index 2b1224f423..07721220a0 100755
--- a/mod/repair_ostatus.php
+++ b/mod/repair_ostatus.php
@@ -3,9 +3,9 @@
 require_once('include/Scrape.php');
 require_once('include/follow.php');
 
-function repair_ostatus_content(&$a) {
+function repair_ostatus_content(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		goaway($_SESSION['return_url']);
 		// NOTREACHED
@@ -51,7 +51,7 @@ function repair_ostatus_content(&$a) {
 
 	$result = new_contact($uid,$r[0]["url"],true);
 
-	$a->page['htmlhead'] = '<meta http-equiv="refresh" content="1; URL='.$a->get_baseurl().'/repair_ostatus?counter='.$counter.'">';
+	$a->page['htmlhead'] = '<meta http-equiv="refresh" content="1; URL='.App::get_baseurl().'/repair_ostatus?counter='.$counter.'">';
 
 	return $o;
 }
diff --git a/mod/rsd_xml.php b/mod/rsd_xml.php
index f4984f0f0f..13c84c3fcc 100644
--- a/mod/rsd_xml.php
+++ b/mod/rsd_xml.php
@@ -2,7 +2,7 @@
 
 
 
-function rsd_xml_content(&$a) {
+function rsd_xml_content(App &$a) {
 	header ("Content-Type: text/xml");
 	echo '<?xml version="1.0" encoding="UTF-8"?>
  <rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
@@ -10,7 +10,7 @@ function rsd_xml_content(&$a) {
      <engineName>Friendica</engineName>
      <engineLink>http://friendica.com/</engineLink>
      <apis>
-       <api name="Twitter" preferred="true" apiLink="'.$a->get_baseurl().'/api/" blogID="">
+       <api name="Twitter" preferred="true" apiLink="'.App::get_baseurl().'/api/" blogID="">
          <settings>
            <docs>http://status.net/wiki/TwitterCompatibleAPI</docs>
            <setting name="OAuth">false</setting>
diff --git a/mod/salmon.php b/mod/salmon.php
index 78cdc09328..6c3aea2114 100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -19,7 +19,7 @@ function salmon_return($val) {
 
 }
 
-function salmon_post(&$a) {
+function salmon_post(App &$a) {
 
 	$xml = file_get_contents('php://input');
 
@@ -31,8 +31,9 @@ function salmon_post(&$a) {
 	$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
 		dbesc($nick)
 	);
-	if(! dbm::is_result($r))
+	if (! dbm::is_result($r)) {
 		http_status_exit(500);
+	}
 
 	$importer = $r[0];
 
@@ -150,7 +151,7 @@ function salmon_post(&$a) {
 		dbesc(normalise_link($author_link)),
 		intval($importer['uid'])
 	);
-	if(! dbm::is_result($r)) {
+	if (! dbm::is_result($r)) {
 		logger('mod-salmon: Author unknown to us.');
 		if(get_pconfig($importer['uid'],'system','ostatus_autofriend')) {
 			$result = new_contact($importer['uid'],$author_link);
diff --git a/mod/search.php b/mod/search.php
index d36cc8fcb7..22879f7f9e 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -17,7 +17,7 @@ function search_saved_searches() {
 
 	if (dbm::is_result($r)) {
 		$saved = array();
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			$saved[] = array(
 				'id'		=> $rr['id'],
 				'term'		=> $rr['term'],
@@ -43,7 +43,7 @@ function search_saved_searches() {
 }
 
 
-function search_init(&$a) {
+function search_init(App &$a) {
 
 	$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
@@ -53,7 +53,7 @@ function search_init(&$a) {
 				intval(local_user()),
 				dbesc($search)
 			);
-			if(! dbm::is_result($r)) {
+			if (! dbm::is_result($r)) {
 				q("INSERT INTO `search` (`uid`,`term`) VALUES ( %d, '%s')",
 					intval(local_user()),
 					dbesc($search)
@@ -81,13 +81,13 @@ function search_init(&$a) {
 
 
 
-function search_post(&$a) {
+function search_post(App &$a) {
 	if(x($_POST,'search'))
 		$a->data['search'] = $_POST['search'];
 }
 
 
-function search_content(&$a) {
+function search_content(App &$a) {
 
 	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
 		notice( t('Public access denied.') . EOL);
@@ -219,7 +219,7 @@ function search_content(&$a) {
 				intval($a->pager['start']), intval($a->pager['itemspage']));
 	}
 
-	if(! dbm::is_result($r)) {
+	if (! dbm::is_result($r)) {
 		info( t('No results.') . EOL);
 		return $o;
 	}
diff --git a/mod/settings.php b/mod/settings.php
index a9521db221..1fbd24325d 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -16,9 +16,9 @@ function get_theme_config_file($theme){
 	return null;
 }
 
-function settings_init(&$a) {
+function settings_init(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL );
 		return;
 	}
@@ -116,33 +116,35 @@ function settings_init(&$a) {
 }
 
 
-function settings_post(&$a) {
+function settings_post(App &$a) {
 
-	if(! local_user())
+	if (! local_user()) {
 		return;
+	}
 
-	if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
+	if (x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
 		return;
+	}
 
-	if(count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_user()) {
+	if (count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
 
 	$old_page_flags = $a->user['page-flags'];
 
-	if(($a->argc > 1) && ($a->argv[1] === 'oauth') && x($_POST,'remove')){
+	if (($a->argc > 1) && ($a->argv[1] === 'oauth') && x($_POST,'remove')) {
 		check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
 
 		$key = $_POST['remove'];
 		q("DELETE FROM tokens WHERE id='%s' AND uid=%d",
 			dbesc($key),
 			local_user());
-		goaway($a->get_baseurl(true)."/settings/oauth/");
+		goaway(App::get_baseurl(true)."/settings/oauth/");
 		return;
 	}
 
-	if(($a->argc > 2) && ($a->argv[1] === 'oauth')  && ($a->argv[2] === 'edit'||($a->argv[2] === 'add')) && x($_POST,'submit')) {
+	if (($a->argc > 2) && ($a->argv[1] === 'oauth')  && ($a->argv[2] === 'edit'||($a->argv[2] === 'add')) && x($_POST,'submit')) {
 
 		check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
 
@@ -183,7 +185,7 @@ function settings_post(&$a) {
 						local_user());
 			}
 		}
-		goaway($a->get_baseurl(true)."/settings/oauth/");
+		goaway(App::get_baseurl(true)."/settings/oauth/");
 		return;
 	}
 
@@ -225,7 +227,7 @@ function settings_post(&$a) {
 				$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
 					intval(local_user())
 				);
-				if(! dbm::is_result($r)) {
+				if (! dbm::is_result($r)) {
 					q("INSERT INTO `mailacct` (`uid`) VALUES (%d)",
 						intval(local_user())
 					);
@@ -625,11 +627,12 @@ function settings_post(&$a) {
 		);
 	}
 
-	if(($old_visibility != $net_publish) || ($page_flags != $old_page_flags)) {
+	if (($old_visibility != $net_publish) || ($page_flags != $old_page_flags)) {
 		// Update global directory in background
 		$url = $_SESSION['my_url'];
-		if($url && strlen(get_config('system','directory')))
+		if ($url && strlen(get_config('system','directory'))) {
 			proc_run(PRIORITY_LOW, "include/directory.php", $url);
+		}
 	}
 
 	require_once('include/profile_update.php');
@@ -639,10 +642,10 @@ function settings_post(&$a) {
 	update_gcontact_for_user(local_user());
 
 	//$_SESSION['theme'] = $theme;
-	if($email_changed && $a->config['register_policy'] == REGISTER_VERIFY) {
+	if ($email_changed && $a->config['register_policy'] == REGISTER_VERIFY) {
 
-		// FIXME - set to un-verified, blocked and redirect to logout
-		// Why? Are we verifying people or email addresses?
+		/// @TODO set to un-verified, blocked and redirect to logout
+		/// @TODO Why? Are we verifying people or email addresses?
 
 	}
 
@@ -651,26 +654,26 @@ function settings_post(&$a) {
 }
 
 
-function settings_content(&$a) {
+function settings_content(App &$a) {
 
 	$o = '';
 	nav_set_selected('settings');
 
-	if(! local_user()) {
+	if (! local_user()) {
 		#notice( t('Permission denied.') . EOL );
 		return;
 	}
 
-	if(x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
+	if (x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
 		notice( t('Permission denied.') . EOL );
 		return;
 	}
 
 
 
-	if(($a->argc > 1) && ($a->argv[1] === 'oauth')) {
+	if (($a->argc > 1) && ($a->argv[1] === 'oauth')) {
 
-		if(($a->argc > 2) && ($a->argv[2] === 'add')) {
+		if (($a->argc > 2) && ($a->argv[2] === 'add')) {
 			$tpl = get_markup_template("settings_oauth_edit.tpl");
 			$o .= replace_macros($tpl, array(
 				'$form_security_token' => get_form_security_token("settings_oauth"),
@@ -686,7 +689,7 @@ function settings_content(&$a) {
 			return $o;
 		}
 
-		if(($a->argc > 3) && ($a->argv[2] === 'edit')) {
+		if (($a->argc > 3) && ($a->argv[2] === 'edit')) {
 			$r = q("SELECT * FROM clients WHERE client_id='%s' AND uid=%d",
 					dbesc($a->argv[3]),
 					local_user());
@@ -718,11 +721,11 @@ function settings_content(&$a) {
 			$r = q("DELETE FROM clients WHERE client_id='%s' AND uid=%d",
 					dbesc($a->argv[3]),
 					local_user());
-			goaway($a->get_baseurl(true)."/settings/oauth/");
+			goaway(App::get_baseurl(true)."/settings/oauth/");
 			return;
 		}
 
-
+		/// @TODO validate result with dbm::is_result()
 		$r = q("SELECT clients.*, tokens.id as oauth_token, (clients.uid=%d) AS my
 				FROM clients
 				LEFT JOIN tokens ON clients.client_id=tokens.client_id
@@ -734,7 +737,7 @@ function settings_content(&$a) {
 		$tpl = get_markup_template("settings_oauth.tpl");
 		$o .= replace_macros($tpl, array(
 			'$form_security_token' => get_form_security_token("settings_oauth"),
-			'$baseurl'	=> $a->get_baseurl(true),
+			'$baseurl'	=> App::get_baseurl(true),
 			'$title'	=> t('Connected Apps'),
 			'$add'		=> t('Add application'),
 			'$edit'		=> t('Edit'),
@@ -748,12 +751,13 @@ function settings_content(&$a) {
 
 	}
 
-	if(($a->argc > 1) && ($a->argv[1] === 'addon')) {
+	if (($a->argc > 1) && ($a->argv[1] === 'addon')) {
 		$settings_addons = "";
 
 		$r = q("SELECT * FROM `hook` WHERE `hook` = 'plugin_settings' ");
-		if(! dbm::is_result($r))
+		if (! dbm::is_result($r)) {
 			$settings_addons = t('No Plugin settings configured');
+		}
 
 		call_hooks('plugin_settings', $settings_addons);
 
@@ -767,14 +771,14 @@ function settings_content(&$a) {
 		return $o;
 	}
 
-	if(($a->argc > 1) && ($a->argv[1] === 'features')) {
+	if (($a->argc > 1) && ($a->argv[1] === 'features')) {
 
 		$arr = array();
 		$features = get_features();
-		foreach($features as $fname => $fdata) {
+		foreach ($features as $fname => $fdata) {
 			$arr[$fname] = array();
 			$arr[$fname][0] = $fdata[0];
-			foreach(array_slice($fdata,1) as $f) {
+			foreach (array_slice($fdata,1) as $f) {
 				$arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_user(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On')));
 			}
 		}
@@ -783,14 +787,14 @@ function settings_content(&$a) {
 		$tpl = get_markup_template("settings_features.tpl");
 		$o .= replace_macros($tpl, array(
 			'$form_security_token' => get_form_security_token("settings_features"),
-			'$title'	=> t('Additional Features'),
-			'$features' => $arr,
-			'$submit'   => t('Save Settings'),
+			'$title'               => t('Additional Features'),
+			'$features'            => $arr,
+			'$submit'              => t('Save Settings'),
 		));
 		return $o;
 	}
 
-	if(($a->argc > 1) && ($a->argv[1] === 'connectors')) {
+	if (($a->argc > 1) && ($a->argv[1] === 'connectors')) {
 
 		$settings_connectors = '<span id="settings_general_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_general_expanded\'); openClose(\'settings_general_inflated\');">';
 		$settings_connectors .= '<h3 class="connector">'. t('General Social Media Settings').'</h3>';
@@ -821,8 +825,10 @@ function settings_content(&$a) {
 
 		$settings_connectors .= mini_group_select(local_user(), $default_group, t("Default group for OStatus contacts"));
 
-		if ($legacy_contact != "")
-			$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.$a->get_baseurl().'/ostatus_subscribe?url='.urlencode($legacy_contact).'">';
+		/// @TODO Found to much different usage to test empty/non-empty strings (e.g. empty(), trim() == '' ) which is wanted?
+		if ($legacy_contact != "") {
+			$a->page['htmlhead'] = '<meta http-equiv="refresh" content="0; URL='.App::get_baseurl().'/ostatus_subscribe?url='.urlencode($legacy_contact).'">';
+		}
 
 		$settings_connectors .= '<div id="legacy-contact-wrapper" class="field input">';
 		$settings_connectors .= '<label id="legacy-contact-label" for="snautofollow-checkbox">'. t('Your legacy GNU Social account'). '</label>';
@@ -830,7 +836,7 @@ function settings_content(&$a) {
 		$settings_connectors .= '<span class="field_help">'.t('If you enter your old GNU Social/Statusnet account name here (in the format user@domain.tld), your contacts will be added automatically. The field will be emptied when done.').'</span>';
 		$settings_connectors .= '</div>';
 
-		$settings_connectors .= '<p><a href="'.$a->get_baseurl().'/repair_ostatus">'.t("Repair OStatus subscriptions").'</a></p>';
+		$settings_connectors .= '<p><a href="'.App::get_baseurl().'/repair_ostatus">'.t("Repair OStatus subscriptions").'</a></p>';
 
 		$settings_connectors .= '<div class="settings-submit-wrapper" ><input type="submit" name="general-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
 
@@ -854,8 +860,7 @@ function settings_content(&$a) {
 			$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
 				local_user()
 			);
-		}
-		else {
+		} else {
 			$r = null;
 		}
 
@@ -872,10 +877,9 @@ function settings_content(&$a) {
 
 		$tpl = get_markup_template("settings_connectors.tpl");
 
-		if(! service_class_allows(local_user(),'email_connect')) {
+		if (! service_class_allows(local_user(),'email_connect')) {
 			$mail_disabled_message = upgrade_bool_message();
-		}
-		else {
+		} else {
 			$mail_disabled_message = (($mail_disabled) ? t('Email access is disabled on this site.') : '');
 		}
 
@@ -913,38 +917,42 @@ function settings_content(&$a) {
 	/*
 	 * DISPLAY SETTINGS
 	 */
-	if(($a->argc > 1) && ($a->argv[1] === 'display')) {
+	if (($a->argc > 1) && ($a->argv[1] === 'display')) {
 		$default_theme = get_config('system','theme');
-		if(! $default_theme)
+		if (! $default_theme) {
 			$default_theme = 'default';
+		}
 		$default_mobile_theme = get_config('system','mobile-theme');
-		if(! $mobile_default_theme)
+		if (! $mobile_default_theme) {
 			$mobile_default_theme = 'none';
+		}
 
 		$allowed_themes_str = get_config('system','allowed_themes');
 		$allowed_themes_raw = explode(',',$allowed_themes_str);
 		$allowed_themes = array();
-		if(count($allowed_themes_raw))
-			foreach($allowed_themes_raw as $x)
-				if(strlen(trim($x)) && is_dir("view/theme/$x"))
+		if (count($allowed_themes_raw)) {
+			foreach ($allowed_themes_raw as $x) {
+				if (strlen(trim($x)) && is_dir("view/theme/$x")) {
 					$allowed_themes[] = trim($x);
+				}
+			}
+		}
 
 
 		$themes = array();
 		$mobile_themes = array("---" => t('No special theme for mobile devices'));
 		$files = glob('view/theme/*'); /* */
-		if($allowed_themes) {
-			foreach($allowed_themes as $th) {
+		if ($allowed_themes) {
+			foreach ($allowed_themes as $th) {
 				$f = $th;
 				$is_experimental = file_exists('view/theme/' . $th . '/experimental');
 				$unsupported = file_exists('view/theme/' . $th . '/unsupported');
 				$is_mobile = file_exists('view/theme/' . $th . '/mobile');
 				if (!$is_experimental or ($is_experimental && (get_config('experimentals','exp_themes')==1 or get_config('experimentals','exp_themes')===false))){
 					$theme_name = (($is_experimental) ?  sprintf("%s - \x28Experimental\x29", $f) : $f);
-					if($is_mobile) {
+					if ($is_mobile) {
 						$mobile_themes[$f]=$theme_name;
-					}
-					else {
+					} else {
 						$themes[$f]=$theme_name;
 					}
 				}
@@ -956,8 +964,9 @@ function settings_content(&$a) {
 		$nowarn_insecure = intval(get_pconfig(local_user(), 'system', 'nowarn_insecure'));
 
 		$browser_update = intval(get_pconfig(local_user(), 'system','update_interval'));
-		if (intval($browser_update) != -1)
+		if (intval($browser_update) != -1) {
 			$browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds
+		}
 
 		$itemspage_network = intval(get_pconfig(local_user(), 'system','itemspage_network'));
 		$itemspage_network = (($itemspage_network > 0 && $itemspage_network < 101) ? $itemspage_network : 40); // default if not set: 40 items
@@ -994,7 +1003,7 @@ function settings_content(&$a) {
 			'$ptitle' 	=> t('Display Settings'),
 			'$form_security_token' => get_form_security_token("settings_display"),
 			'$submit' 	=> t('Save Settings'),
-			'$baseurl' => $a->get_baseurl(true),
+			'$baseurl' => App::get_baseurl(true),
 			'$uid' => local_user(),
 
 			'$theme'	=> array('theme', t('Display Theme:'), $theme_selected, '', $themes, true),
@@ -1036,8 +1045,9 @@ function settings_content(&$a) {
 	$p = q("SELECT * FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
 		intval(local_user())
 	);
-	if(count($p))
+	if (count($p)) {
 		$profile = $p[0];
+	}
 
 	$username   = $a->user['username'];
 	$email      = $a->user['email'];
@@ -1084,8 +1094,9 @@ function settings_content(&$a) {
 
 	// nowarn_insecure
 
-	if(! strlen($a->user['timezone']))
+	if (! strlen($a->user['timezone'])) {
 		$timezone = date_default_timezone_get();
+	}
 
 	// Set the account type to "Community" when the page is a community page but the account type doesn't fit
 	// This is only happening on the first visit after the update
@@ -1146,32 +1157,28 @@ function settings_content(&$a) {
 
 	$noid = get_config('system','no_openid');
 
-	if($noid) {
+	if ($noid) {
 		$openid_field = false;
-	}
-	else {
+	} else {
 		$openid_field = array('openid_url', t('OpenID:'),$openid, t("\x28Optional\x29 Allow this OpenID to login to this account."), "", "", "url");
 	}
 
-
 	$opt_tpl = get_markup_template("field_yesno.tpl");
 	if(get_config('system','publish_all')) {
 		$profile_in_dir = '<input type="hidden" name="profile_in_directory" value="1" />';
-	}
-	else {
+	} else {
 		$profile_in_dir = replace_macros($opt_tpl,array(
 			'$field' 	=> array('profile_in_directory', t('Publish your default profile in your local site directory?'), $profile['publish'], '', array(t('No'),t('Yes'))),
 		));
 	}
 
-	if(strlen(get_config('system','directory'))) {
+	if (strlen(get_config('system','directory'))) {
 		$profile_in_net_dir = replace_macros($opt_tpl,array(
 			'$field' 	=> array('profile_in_netdirectory', t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', array(t('No'),t('Yes'))),
 		));
-	}
-	else
+	} else {
 		$profile_in_net_dir = '';
-
+	}
 
 	$hide_friends = replace_macros($opt_tpl,array(
 			'$field' 	=> array('hide-friends', t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', array(t('No'),t('Yes'))),
@@ -1187,19 +1194,16 @@ function settings_content(&$a) {
 
 	));
 
-
 	$blocktags = replace_macros($opt_tpl,array(
 			'$field' 	=> array('blocktags',  t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', array(t('No'),t('Yes'))),
 
 	));
 
-
 	$suggestme = replace_macros($opt_tpl,array(
 			'$field' 	=> array('suggestme',  t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', array(t('No'),t('Yes'))),
 
 	));
 
-
 	$unkmail = replace_macros($opt_tpl,array(
 			'$field' 	=> array('unkmail',  t('Permit unknown people to send you private mail?'), $unkmail, '', array(t('No'),t('Yes'))),
 
@@ -1208,16 +1212,16 @@ function settings_content(&$a) {
 	$invisible = (((! $profile['publish']) && (! $profile['net-publish']))
 		? true : false);
 
-	if($invisible)
+	if ($invisible) {
 		info( t('Profile is <strong>not published</strong>.') . EOL );
-
+	}
 
 	//$subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . 'profile/' . $nickname : '');
 
 	$tpl_addr = get_markup_template("settings_nick_set.tpl");
 
 	$prof_addr = replace_macros($tpl_addr,array(
-		'$desc' => sprintf(t("Your Identity Address is <strong>'%s'</strong> or '%s'."), $nickname.'@'.$a->get_hostname().$a->get_path(), $a->get_baseurl().'/profile/'.$nickname),
+		'$desc' => sprintf(t("Your Identity Address is <strong>'%s'</strong> or '%s'."), $nickname.'@'.$a->get_hostname().$a->get_path(), App::get_baseurl().'/profile/'.$nickname),
 		'$basepath' => $a->get_hostname()
 	));
 
@@ -1237,32 +1241,35 @@ function settings_content(&$a) {
 	require_once('include/group.php');
 	$group_select = mini_group_select(local_user(),$a->user['def_gid']);
 
-
 	// Private/public post links for the non-JS ACL form
 	$private_post = 1;
-	if($_REQUEST['public'])
+	if ($_REQUEST['public']) {
 		$private_post = 0;
+	}
 
 	$query_str = $a->query_string;
-	if(strpos($query_str, 'public=1') !== false)
+	if (strpos($query_str, 'public=1') !== false) {
 		$query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str);
+	}
 
 	// I think $a->query_string may never have ? in it, but I could be wrong
 	// It looks like it's from the index.php?q=[etc] rewrite that the web
 	// server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61
-	if(strpos($query_str, '?') === false)
+	if (strpos($query_str, '?') === false) {
 		$public_post_link = '?public=1';
-	else
+	} else {
 		$public_post_link = '&public=1';
+	}
 
 	/* Installed langs */
 	$lang_choices = get_available_languages();
 
+	/// @TODO Fix indending (or so)
 	$o .= replace_macros($stpl, array(
 		'$ptitle' 	=> t('Account Settings'),
 
 		'$submit' 	=> t('Save Settings'),
-		'$baseurl' => $a->get_baseurl(true),
+		'$baseurl' => App::get_baseurl(true),
 		'$uid' => local_user(),
 		'$form_security_token' => get_form_security_token("settings"),
 		'$nickname_block' => $prof_addr,
diff --git a/mod/share.php b/mod/share.php
index 0a34c6fc50..f2e016708f 100644
--- a/mod/share.php
+++ b/mod/share.php
@@ -1,5 +1,5 @@
 <?php
-function share_init(&$a) {
+function share_init(App &$a) {
 
 	$post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
 	if((! $post_id) || (! local_user()))
diff --git a/mod/smilies.php b/mod/smilies.php
index 573cf17c8a..8e04d5d054 100644
--- a/mod/smilies.php
+++ b/mod/smilies.php
@@ -6,7 +6,7 @@
 
 require_once("include/Smilies.php");
 
-function smilies_content(&$a) {
+function smilies_content(App &$a) {
 	if ($a->argv[1]==="json"){
 		$tmp = Smilies::get_list();
 		$results = array();
diff --git a/mod/starred.php b/mod/starred.php
index 27f924e44b..c23b07b8b5 100644
--- a/mod/starred.php
+++ b/mod/starred.php
@@ -1,30 +1,35 @@
 <?php
 
 
-function starred_init(&$a) {
+function starred_init(App &$a) {
 
 	require_once("include/threads.php");
 
 	$starred = 0;
 
-	if(! local_user())
+	if (! local_user()) {
 		killme();
-	if($a->argc > 1)
+	}
+	if ($a->argc > 1) {
 		$message_id = intval($a->argv[1]);
-	if(! $message_id)
+	}
+	if (! $message_id) {
 		killme();
+	}
 
-	$r = q("SELECT starred FROM item WHERE uid = %d AND id = %d LIMIT 1",
+	$r = q("SELECT `starred` FROM `item` WHERE `uid` = %d AND `id` = %d LIMIT 1",
 		intval(local_user()),
 		intval($message_id)
 	);
-	if(! dbm::is_result($r))
+	if (! dbm::is_result($r)) {
 		killme();
+	}
 
-	if(! intval($r[0]['starred']))
+	if (! intval($r[0]['starred'])) {
 		$starred = 1;
+	}
 
-	$r = q("UPDATE item SET starred = %d WHERE uid = %d and id = %d",
+	$r = q("UPDATE `item` SET `starred` = %d WHERE `uid` = %d AND `id` = %d",
 		intval($starred),
 		intval(local_user()),
 		intval($message_id)
@@ -34,12 +39,15 @@ function starred_init(&$a) {
 
 	// See if we've been passed a return path to redirect to
 	$return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
-	if($return_path) {
+	if ($return_path) {
 		$rand = '_=' . time();
-		if(strpos($return_path, '?')) $rand = "&$rand";
-		else $rand = "?$rand";
+		if (strpos($return_path, '?')) {
+			$rand = "&$rand";
+		} else {
+			$rand = "?$rand";
+		}
 
-		goaway($a->get_baseurl() . "/" . $return_path . $rand);
+		goaway(App::get_baseurl() . "/" . $return_path . $rand);
 	}
 
 	// the json doesn't really matter, it will either be 0 or 1
diff --git a/mod/statistics_json.php b/mod/statistics_json.php
index 21a9a0521c..2f2adaafe7 100644
--- a/mod/statistics_json.php
+++ b/mod/statistics_json.php
@@ -5,7 +5,7 @@
 
 require_once("include/plugin.php");
 
-function statistics_json_init(&$a) {
+function statistics_json_init(App &$a) {
 
         if (!get_config("system", "nodeinfo")) {
                 http_status_exit(404);
diff --git a/mod/subthread.php b/mod/subthread.php
index b15b954742..a00196825b 100644
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -5,7 +5,7 @@ require_once('include/bbcode.php');
 require_once('include/items.php');
 
 
-function subthread_content(&$a) {
+function subthread_content(App &$a) {
 
 	if(! local_user() && ! remote_user()) {
 		return;
@@ -41,10 +41,12 @@ function subthread_content(&$a) {
 			intval($item['contact-id']),
 			intval($item['uid'])
 		);
-		if(! dbm::is_result($r))
+		if (! dbm::is_result($r)) {
 			return;
-		if(! $r[0]['self'])
+		}
+		if (! $r[0]['self']) {
 			$remote_owner = $r[0];
+		}
 	}
 
 	// this represents the post owner on this system. 
@@ -56,18 +58,18 @@ function subthread_content(&$a) {
 	if (dbm::is_result($r))
 		$owner = $r[0];
 
-	if(! $owner) {
+	if (! $owner) {
 		logger('like: no owner');
 		return;
 	}
 
-	if(! $remote_owner)
+	if (! $remote_owner)
 		$remote_owner = $owner;
 
 
 	// This represents the person posting
 
-	if((local_user()) && (local_user() == $owner_uid)) {
+	if ((local_user()) && (local_user() == $owner_uid)) {
 		$contact = $owner;
 	}
 	else {
@@ -78,7 +80,7 @@ function subthread_content(&$a) {
 		if (dbm::is_result($r))
 			$contact = $r[0];
 	}
-	if(! $contact) {
+	if (! $contact) {
 		return;
 	}
 
@@ -86,7 +88,7 @@ function subthread_content(&$a) {
 
 	$post_type = (($item['resource-id']) ? t('photo') : t('status'));
 	$objtype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
-	$link = xmlify('<link rel="alternate" type="text/html" href="' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
+	$link = xmlify('<link rel="alternate" type="text/html" href="' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
 	$body = $item['body'];
 
 	$obj = <<< EOT
@@ -102,8 +104,9 @@ function subthread_content(&$a) {
 EOT;
 	$bodyverb = t('%1$s is following %2$s\'s %3$s');
 
-	if(! isset($bodyverb))
-			return;
+	if (! isset($bodyverb)) {
+		return;
+	}
 
 	$arr = array();
 
@@ -127,7 +130,7 @@ EOT;
 
 	$ulink = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
 	$alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
-	$plink = '[url=' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
+	$plink = '[url=' . App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
 	$arr['body'] =  sprintf( $bodyverb, $ulink, $alink, $plink );
 
 	$arr['verb'] = $activity;
@@ -143,7 +146,7 @@ EOT;
 
 	$post_id = item_store($arr);
 
-	if(! $item['visible']) {
+	if (! $item['visible']) {
 		$r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d AND `uid` = %d",
 			intval($item['id']),
 			intval($owner_uid)
diff --git a/mod/suggest.php b/mod/suggest.php
index 8f4315a841..4c08db8b6c 100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -4,13 +4,14 @@ require_once('include/socgraph.php');
 require_once('include/contact_widgets.php');
 
 
-function suggest_init(&$a) {
-	if(! local_user())
+function suggest_init(App &$a) {
+	if (! local_user()) {
 		return;
+	}
 
-	if(x($_GET,'ignore') && intval($_GET['ignore'])) {
+	if (x($_GET,'ignore') && intval($_GET['ignore'])) {
 		// Check if we should do HTML-based delete confirmation
-		if($_REQUEST['confirm']) {
+		if ($_REQUEST['confirm']) {
 			// <form> can't take arguments in its "action" parameter
 			// so add any arguments as hidden inputs
 			$query = explode_querystring($a->query_string);
@@ -35,7 +36,7 @@ function suggest_init(&$a) {
 			return;
 		}
 		// Now check how the user responded to the confirmation query
-		if(!$_REQUEST['canceled']) {
+		if (!$_REQUEST['canceled']) {
 			q("INSERT INTO `gcign` ( `uid`, `gcid` ) VALUES ( %d, %d ) ",
 				intval(local_user()),
 				intval($_GET['ignore'])
@@ -49,17 +50,17 @@ function suggest_init(&$a) {
 
 
 
-function suggest_content(&$a) {
+function suggest_content(App &$a) {
 
 	require_once("mod/proxy.php");
 
 	$o = '';
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
 
-	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
+	$_SESSION['return_url'] = App::get_baseurl() . '/' . $a->cmd;
 
 	$a->page['aside'] .= findpeople_widget();
 	$a->page['aside'] .= follow_widget();
@@ -67,17 +68,17 @@ function suggest_content(&$a) {
 
 	$r = suggestion_query(local_user());
 
-	if(! dbm::is_result($r)) {
+	if (! dbm::is_result($r)) {
 		$o .= t('No suggestions available. If this is a new site, please try again in 24 hours.');
 		return $o;
 	}
 
 	require_once 'include/contact_selectors.php';
 
-	foreach($r as $rr) {
+	foreach ($r as $rr) {
 
-		$connlnk = $a->get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
-		$ignlnk = $a->get_baseurl() . '/suggest?ignore=' . $rr['id'];
+		$connlnk = App::get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
+		$ignlnk = App::get_baseurl() . '/suggest?ignore=' . $rr['id'];
 		$photo_menu = array(
 			'profile' => array(t("View Profile"), zrl($rr["url"])),
 			'follow' => array(t("Connect/Follow"), $connlnk),
diff --git a/mod/tagger.php b/mod/tagger.php
index d6f421205c..da5c4700f9 100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -5,7 +5,7 @@ require_once('include/bbcode.php');
 require_once('include/items.php');
 
 
-function tagger_content(&$a) {
+function tagger_content(App &$a) {
 
 	if(! local_user() && ! remote_user()) {
 		return;
@@ -63,7 +63,7 @@ function tagger_content(&$a) {
 	$targettype = (($item['resource-id']) ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE );
 
 	$link = xmlify('<link rel="alternate" type="text/html" href="'
-		. $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
+		. App::get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
 
 	$body = xmlify($item['body']);
 
@@ -78,7 +78,7 @@ function tagger_content(&$a) {
 	</target>
 EOT;
 
-	$tagid = $a->get_baseurl() . '/search?tag=' . $term;
+	$tagid = App::get_baseurl() . '/search?tag=' . $term;
 	$objtype = ACTIVITY_OBJ_TAGTERM;
 
 	$obj = <<< EOT
@@ -94,10 +94,11 @@ EOT;
 
 	$bodyverb = t('%1$s tagged %2$s\'s %3$s with %4$s');
 
-	if(! isset($bodyverb))
-			return;
+	if (! isset($bodyverb)) {
+		return;
+	}
 
-	$termlink = html_entity_decode('&#x2317;') . '[url=' . $a->get_baseurl() . '/search?tag=' . urlencode($term) . ']'. $term . '[/url]';
+	$termlink = html_entity_decode('&#x2317;') . '[url=' . App::get_baseurl() . '/search?tag=' . urlencode($term) . ']'. $term . '[/url]';
 
 	$arr = array();
 
@@ -140,7 +141,7 @@ EOT;
 	$post_id = item_store($arr);
 
 //	q("UPDATE `item` set plink = '%s' where id = %d",
-//		dbesc($a->get_baseurl() . '/display/' . $owner_nick . '/' . $post_id),
+//		dbesc(App::get_baseurl() . '/display/' . $owner_nick . '/' . $post_id),
 //		intval($post_id)
 //	);
 
@@ -159,7 +160,7 @@ EOT;
         );
 	if((! $blocktags) && $t[0]['tcount']==0 ) {
 		/*q("update item set tag = '%s' where id = %d",
-			dbesc($item['tag'] . (strlen($item['tag']) ? ',' : '') . '#[url=' . $a->get_baseurl() . '/search?tag=' . $term . ']'. $term . '[/url]'),
+			dbesc($item['tag'] . (strlen($item['tag']) ? ',' : '') . '#[url=' . App::get_baseurl() . '/search?tag=' . $term . ']'. $term . '[/url]'),
 			intval($item['id'])
 		);*/
 
@@ -168,7 +169,7 @@ EOT;
 		   $term_objtype,
 		   TERM_HASHTAG,
 		   dbesc($term),
-		   dbesc($a->get_baseurl() . '/search?tag=' . $term),
+		   dbesc(App::get_baseurl() . '/search?tag=' . $term),
 		   intval($owner_uid)
 		);
 	}
@@ -192,14 +193,14 @@ EOT;
 	                   $term_objtype,
 	                   TERM_HASHTAG,
 	                   dbesc($term),
-	                   dbesc($a->get_baseurl() . '/search?tag=' . $term),
+	                   dbesc(App::get_baseurl() . '/search?tag=' . $term),
 	                   intval($owner_uid)
 	                );
 		}
 
 		/*if(count($x) && !$x[0]['blocktags'] && (! stristr($r[0]['tag'], ']' . $term . '['))) {
 			q("update item set tag = '%s' where id = %d",
-				dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . '#[url=' . $a->get_baseurl() . '/search?tag=' . $term . ']'. $term . '[/url]'),
+				dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . '#[url=' . App::get_baseurl() . '/search?tag=' . $term . ']'. $term . '[/url]'),
 				intval($r[0]['id'])
 			);
 		}*/
diff --git a/mod/tagrm.php b/mod/tagrm.php
index 57024b3c3b..2a9a26e37b 100644
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
@@ -2,14 +2,15 @@
 
 require_once('include/bbcode.php');
 
-function tagrm_post(&$a) {
-
-	if(! local_user())
-		goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+function tagrm_post(App &$a) {
 
+	if (! local_user()) {
+		goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+	}
 
-	if((x($_POST,'submit')) && ($_POST['submit'] === t('Cancel')))
-		goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+	if ((x($_POST,'submit')) && ($_POST['submit'] === t('Cancel'))) {
+		goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+	}
 
 	$tag =  ((x($_POST,'tag'))  ? hex2bin(notags(trim($_POST['tag']))) : '');
 	$item = ((x($_POST,'item')) ? intval($_POST['item'])               : 0 );
@@ -19,12 +20,13 @@ function tagrm_post(&$a) {
 		intval(local_user())
 	);
 
-	if(! dbm::is_result($r))
-		goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+	if (! dbm::is_result($r)) {
+		goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+	}
 
 	$arr = explode(',', $r[0]['tag']);
-	for($x = 0; $x < count($arr); $x ++) {
-		if($arr[$x] === $tag) {
+	for ($x = 0; $x < count($arr); $x ++) {
+		if ($arr[$x] === $tag) {
 			unset($arr[$x]);
 			break;
 		}
@@ -39,7 +41,7 @@ function tagrm_post(&$a) {
 	);
 
 	info( t('Tag removed') . EOL );
-	goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+	goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
 	
 	// NOTREACHED
 
@@ -47,34 +49,35 @@ function tagrm_post(&$a) {
 
 
 
-function tagrm_content(&$a) {
+function tagrm_content(App &$a) {
 
 	$o = '';
 
-	if(! local_user()) {
-		goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+	if (! local_user()) {
+		goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
 		// NOTREACHED
 	}
 
 	$item = (($a->argc > 1) ? intval($a->argv[1]) : 0);
-	if(! $item) {
-		goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+	if (! $item) {
+		goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
 		// NOTREACHED
 	}
 
-
 	$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 		intval($item),
 		intval(local_user())
 	);
 
-	if(! dbm::is_result($r))
-		goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+	if (! dbm::is_result($r)) {
+		goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+	}
 
 	$arr = explode(',', $r[0]['tag']);
 
-	if(! count($arr))
-		goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']);
+	if (! count($arr)) {
+		goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
+	}
 
 	$o .= '<h3>' . t('Remove Item Tag') . '</h3>';
 
@@ -84,8 +87,7 @@ function tagrm_content(&$a) {
 	$o .= '<input type="hidden" name="item" value="' . $item . '" />';
 	$o .= '<ul>';
 
-
-	foreach($arr as $x) {
+	foreach ($arr as $x) {
 		$o .= '<li><input type="checkbox" name="tag" value="' . bin2hex($x) . '" >' . bbcode($x) . '</input></li>';
 	}
 
@@ -95,5 +97,5 @@ function tagrm_content(&$a) {
 	$o .= '</form>';
 
 	return $o;
-	
+
 }
diff --git a/mod/toggle_mobile.php b/mod/toggle_mobile.php
index 00991e44ca..89b73cd448 100644
--- a/mod/toggle_mobile.php
+++ b/mod/toggle_mobile.php
@@ -1,16 +1,18 @@
 <?php
 
-function toggle_mobile_init(&$a) {
+function toggle_mobile_init(App &$a) {
 
-	if(isset($_GET['off']))
+	if (isset($_GET['off'])) {
 		$_SESSION['show-mobile'] = false;
-	else
+	} else {
 		$_SESSION['show-mobile'] = true;
+	}
 
-	if(isset($_GET['address']))
+	if (isset($_GET['address'])) {
 		$address = $_GET['address'];
-	else
-		$address = $a->get_baseurl();
+	} else {
+		$address = App::get_baseurl();
+	}
 
 	goaway($address);
 }
diff --git a/mod/uexport.php b/mod/uexport.php
index e0a0b071f6..7aa9724d58 100644
--- a/mod/uexport.php
+++ b/mod/uexport.php
@@ -1,14 +1,15 @@
 <?php
 
-function uexport_init(&$a){
-	if(! local_user())
+function uexport_init(App &$a){
+	if (! local_user()) {
 		killme();
+	}
 
 	require_once("mod/settings.php");
-        settings_init($a);
+	settings_init($a);
 }
 
-function uexport_content(&$a){
+function uexport_content(App &$a){
 
     if ($a->argc > 1) {
         header("Content-type: application/json");
@@ -33,7 +34,7 @@ function uexport_content(&$a){
 
     $tpl = get_markup_template("uexport.tpl");
     return replace_macros($tpl, array(
-        '$baseurl' => $a->get_baseurl(),
+        '$baseurl' => App::get_baseurl(),
         '$title' => t('Export personal data'),
         '$options' => $options
     ));
@@ -104,7 +105,7 @@ function uexport_account($a){
 	$output = array(
         'version' => FRIENDICA_VERSION,
         'schema' => DB_UPDATE_VERSION,
-        'baseurl' => $a->get_baseurl(),
+        'baseurl' => App::get_baseurl(),
         'user' => $user,
         'contact' => $contact,
         'profile' => $profile,
@@ -122,7 +123,7 @@ function uexport_account($a){
 /**
  * echoes account data and items as separated json, one per line
  */
-function uexport_all(&$a) {
+function uexport_all(App &$a) {
 
 	uexport_account($a);
 	echo "\n";
diff --git a/mod/uimport.php b/mod/uimport.php
index 7ed5648d9e..15bc8322b9 100644
--- a/mod/uimport.php
+++ b/mod/uimport.php
@@ -1,11 +1,12 @@
 <?php
 /**
  * View for user import
+ * @TODO This file has DOS line endings!
  */
 
 require_once("include/uimport.php");
 
-function uimport_post(&$a) {
+function uimport_post(App &$a) {
 	switch($a->config['register_policy']) {
         case REGISTER_OPEN:
             $blocked = 0;
@@ -35,7 +36,7 @@ function uimport_post(&$a) {
     }
 }
 
-function uimport_content(&$a) {
+function uimport_content(App &$a) {
 	
 	if((! local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) {
 		notice("Permission denied." . EOL);
diff --git a/mod/update_community.php b/mod/update_community.php
index d5df7ba3bf..179e9c61c4 100644
--- a/mod/update_community.php
+++ b/mod/update_community.php
@@ -4,7 +4,7 @@
 
 require_once("mod/community.php");
 
-function update_community_content(&$a) {
+function update_community_content(App &$a) {
 
 	header("Content-type: text/html");
 	echo "<!DOCTYPE html><html><body>\r\n";
diff --git a/mod/update_display.php b/mod/update_display.php
index bd2a52934f..230bbaa0b4 100644
--- a/mod/update_display.php
+++ b/mod/update_display.php
@@ -5,7 +5,7 @@
 require_once("mod/display.php");
 require_once("include/group.php");
 
-function update_display_content(&$a) {
+function update_display_content(App &$a) {
 
 	$profile_uid = intval($_GET["p"]);
 
diff --git a/mod/update_network.php b/mod/update_network.php
index 258d03e322..c6d33132cc 100644
--- a/mod/update_network.php
+++ b/mod/update_network.php
@@ -5,7 +5,7 @@
 require_once("mod/network.php");
 require_once("include/group.php");
 
-function update_network_content(&$a) {
+function update_network_content(App &$a) {
 
 	$profile_uid = intval($_GET["p"]);
 
diff --git a/mod/update_notes.php b/mod/update_notes.php
index ee9d1d71f5..b21f698054 100644
--- a/mod/update_notes.php
+++ b/mod/update_notes.php
@@ -7,7 +7,7 @@
 
 require_once("mod/notes.php");
 
-function update_notes_content(&$a) {
+function update_notes_content(App &$a) {
 
 	$profile_uid = intval($_GET["p"]);
 
diff --git a/mod/update_profile.php b/mod/update_profile.php
index 1bc29d82ce..e16b0b5ccc 100644
--- a/mod/update_profile.php
+++ b/mod/update_profile.php
@@ -7,7 +7,7 @@
 
 require_once("mod/profile.php");
 
-function update_profile_content(&$a) {
+function update_profile_content(App &$a) {
 
 	$profile_uid = intval($_GET["p"]);
 
diff --git a/mod/videos.php b/mod/videos.php
index 1e03c5005a..00c7c6dfa1 100644
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -6,7 +6,7 @@ require_once('include/security.php');
 require_once('include/redir.php');
 
 
-function videos_init(&$a) {
+function videos_init(App &$a) {
 
 	if($a->argc > 1)
 		auto_redir($a, $a->argv[1]);
@@ -59,7 +59,7 @@ function videos_init(&$a) {
 
 			if($albums_visible) {
 				$o .= '<div id="sidebar-photos-albums" class="widget">';
-				$o .= '<h3>' . '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '">' . t('Photo Albums') . '</a></h3>';
+				$o .= '<h3>' . '<a href="' . App::get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '">' . t('Photo Albums') . '</a></h3>';
 
 				$o .= '<ul>';
 				foreach($albums as $album) {
@@ -74,7 +74,7 @@ function videos_init(&$a) {
 				$o .= '</ul>';
 			}
 			if(local_user() && $a->data['user']['uid'] == local_user()) {
-				$o .= '<div id="photo-albums-upload-link"><a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/upload" >' .t('Upload New Photos') . '</a></div>';
+				$o .= '<div id="photo-albums-upload-link"><a href="' . App::get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/upload" >' .t('Upload New Photos') . '</a></div>';
 			}
 
 			$o .= '</div>';
@@ -87,12 +87,12 @@ function videos_init(&$a) {
 
 		$tpl = get_markup_template("videos_head.tpl");
 		$a->page['htmlhead'] .= replace_macros($tpl,array(
-			'$baseurl' => $a->get_baseurl(),
+			'$baseurl' => App::get_baseurl(),
 		));
 
 		$tpl = get_markup_template("videos_end.tpl");
 		$a->page['end'] .= replace_macros($tpl,array(
-			'$baseurl' => $a->get_baseurl(),
+			'$baseurl' => App::get_baseurl(),
 		));
 
 	}
@@ -102,17 +102,21 @@ function videos_init(&$a) {
 
 
 
-function videos_post(&$a) {
+function videos_post(App &$a) {
 
 	$owner_uid = $a->data['user']['uid'];
 
-	if (local_user() != $owner_uid) goaway($a->get_baseurl() . '/videos/' . $a->data['user']['nickname']);
+	if (local_user() != $owner_uid) {
+		goaway(App::get_baseurl() . '/videos/' . $a->data['user']['nickname']);
+	}
 
-	if(($a->argc == 2) && x($_POST,'delete') && x($_POST, 'id')) {
+	if (($a->argc == 2) && x($_POST,'delete') && x($_POST, 'id')) {
 
 		// Check if we should do HTML-based delete confirmation
 		if(!x($_REQUEST,'confirm')) {
-			if(x($_REQUEST,'canceled')) goaway($a->get_baseurl() . '/videos/' . $a->data['user']['nickname']);
+			if (x($_REQUEST,'canceled')) {
+				goaway(App::get_baseurl() . '/videos/' . $a->data['user']['nickname']);
+			}
 
 			$drop_url = $a->query_string;
 			$a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), array(
@@ -149,8 +153,8 @@ function videos_post(&$a) {
 				dbesc($video_id),
 				intval(local_user())
 			);
-			#echo "<pre>"; var_dump($i); killme();
-			if(count($i)) {
+			//echo "<pre>"; var_dump($i); killme();
+			if (dbm::is_result($i)) {
 				q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
 					dbesc(datetime_convert()),
 					dbesc(datetime_convert()),
@@ -160,7 +164,7 @@ function videos_post(&$a) {
 				create_tags_from_itemuri($i[0]['uri'], local_user());
 				delete_thread_uri($i[0]['uri'], local_user());
 
-				$url = $a->get_baseurl();
+				$url = App::get_baseurl();
 				$drop_id = intval($i[0]['id']);
 
 				if($i[0]['visible'])
@@ -168,17 +172,17 @@ function videos_post(&$a) {
 			}
 		}
 
-		goaway($a->get_baseurl() . '/videos/' . $a->data['user']['nickname']);
+		goaway(App::get_baseurl() . '/videos/' . $a->data['user']['nickname']);
 		return; // NOTREACHED
 	}
 
-    goaway($a->get_baseurl() . '/videos/' . $a->data['user']['nickname']);
+	goaway(App::get_baseurl() . '/videos/' . $a->data['user']['nickname']);
 
 }
 
 
 
-function videos_content(&$a) {
+function videos_content(App &$a) {
 
 	// URLs (most aren't currently implemented):
 	// videos/name
@@ -364,8 +368,8 @@ function videos_content(&$a) {
 
 	$videos = array();
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
-			if($a->theme['template_engine'] === 'internal') {
+		foreach ($r as $rr) {
+			if ($a->theme['template_engine'] === 'internal') {
 				$alt_e = template_escape($rr['filename']);
 				$name_e = template_escape($rr['album']);
 			}
@@ -376,13 +380,13 @@ function videos_content(&$a) {
 
 			$videos[] = array(
 				'id'       => $rr['id'],
-				'link'  	=> $a->get_baseurl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['resource-id'],
-				'title' 	=> t('View Video'),
-				'src'     	=> $a->get_baseurl() . '/attach/' . $rr['id'] . '?attachment=0',
-				'alt'     	=> $alt_e,
-				'mime'		=> $rr['filetype'],
-				'album'	=> array(
-					'link'  => $a->get_baseurl() . '/videos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
+				'link'     => App::get_baseurl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['resource-id'],
+				'title'    => t('View Video'),
+				'src'      => App::get_baseurl() . '/attach/' . $rr['id'] . '?attachment=0',
+				'alt'      => $alt_e,
+				'mime'     => $rr['filetype'],
+				'album' => array(
+					'link'  => App::get_baseurl() . '/videos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
 					'name'  => $name_e,
 					'alt'   => t('View Album'),
 				),
@@ -393,11 +397,11 @@ function videos_content(&$a) {
 
 	$tpl = get_markup_template('videos_recent.tpl');
 	$o .= replace_macros($tpl, array(
-		'$title' => t('Recent Videos'),
-		'$can_post' => $can_post,
-		'$upload' => array(t('Upload New Videos'), $a->get_baseurl().'/videos/'.$a->data['user']['nickname'].'/upload'),
-		'$videos' => $videos,
-        '$delete_url' => (($can_post)?$a->get_baseurl().'/videos/'.$a->data['user']['nickname']:False)
+		'$title'      => t('Recent Videos'),
+		'$can_post'   => $can_post,
+		'$upload'     => array(t('Upload New Videos'), App::get_baseurl().'/videos/'.$a->data['user']['nickname'].'/upload'),
+		'$videos'     => $videos,
+		'$delete_url' => (($can_post)?App::get_baseurl().'/videos/'.$a->data['user']['nickname']:False)
 	));
 
 
diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index c9f465676c..9c72a46e9c 100644
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -2,7 +2,7 @@
 require_once('include/Contact.php');
 require_once('include/contact_selectors.php');
 
-function viewcontacts_init(&$a) {
+function viewcontacts_init(App &$a) {
 
 	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
 		return;
@@ -16,8 +16,9 @@ function viewcontacts_init(&$a) {
 			dbesc($nick)
 		);
 
-		if(! dbm::is_result($r))
+		if (! dbm::is_result($r)) {
 			return;
+		}
 
 		$a->data['user'] = $r[0];
 		$a->profile_uid = $r[0]['uid'];
@@ -28,7 +29,7 @@ function viewcontacts_init(&$a) {
 }
 
 
-function viewcontacts_content(&$a) {
+function viewcontacts_content(App &$a) {
 	require_once("mod/proxy.php");
 
 	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
@@ -75,9 +76,11 @@ function viewcontacts_content(&$a) {
 
 	$contacts = array();
 
-	foreach($r as $rr) {
-		if($rr['self'])
+	foreach ($r as $rr) {
+		/// @TODO This triggers an E_NOTICE if 'self' is not there
+		if ($rr['self']) {
 			continue;
+		}
 
 		$url = $rr['url'];
 
diff --git a/mod/viewsrc.php b/mod/viewsrc.php
index 904b144250..8510bd5395 100644
--- a/mod/viewsrc.php
+++ b/mod/viewsrc.php
@@ -1,9 +1,9 @@
 <?php
 
 
-function viewsrc_content(&$a) {
+function viewsrc_content(App &$a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Access denied.') . EOL);
 		return;
 	}
diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 80fc1c6e79..1812568545 100644
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -3,7 +3,7 @@
 require_once('include/attach.php');
 require_once('include/datetime.php');
 
-function wall_attach_post(&$a) {
+function wall_attach_post(App &$a) {
 
 	$r_json = (x($_GET,'response') && $_GET['response']=='json');
 
@@ -12,7 +12,7 @@ function wall_attach_post(&$a) {
 		$r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid`  WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
 			dbesc($nick)
 		);
-		if(! dbm::is_result($r)){
+		if (! dbm::is_result($r)) {
 			if ($r_json) {
 				echo json_encode(array('error'=>t('Invalid request.')));
 				killme();
@@ -168,7 +168,7 @@ function wall_attach_post(&$a) {
 		dbesc($hash)
 	);
 
-	if(! dbm::is_result($r)) {
+	if (! dbm::is_result($r)) {
 		$msg = t('File upload failed.');
 		if ($r_json) {
 			echo json_encode(array('error'=>$msg));
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 21d9bf49cb..eb2a92323a 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -15,7 +15,7 @@ function wall_upload_post(&$a, $desktopmode = true) {
 				dbesc($nick)
 			);
 
-			if(! dbm::is_result($r)){
+			if (! dbm::is_result($r)) {
 				if ($r_json) {
 					echo json_encode(array('error'=>t('Invalid request.')));
 					killme();
@@ -260,9 +260,9 @@ function wall_upload_post(&$a, $desktopmode = true) {
 		$picture["width"] = $r[0]["width"];
 		$picture["height"] = $r[0]["height"];
 		$picture["type"] = $r[0]["type"];
-		$picture["albumpage"] = $a->get_baseurl().'/photos/'.$page_owner_nick.'/image/'.$hash;
-		$picture["picture"] = $a->get_baseurl()."/photo/{$hash}-0.".$ph->getExt();
-		$picture["preview"] = $a->get_baseurl()."/photo/{$hash}-{$smallest}.".$ph->getExt();
+		$picture["albumpage"] = App::get_baseurl().'/photos/'.$page_owner_nick.'/image/'.$hash;
+		$picture["picture"] = App::get_baseurl()."/photo/{$hash}-0.".$ph->getExt();
+		$picture["preview"] = App::get_baseurl()."/photo/{$hash}-{$smallest}.".$ph->getExt();
 
 		if ($r_json) {
 			echo json_encode(array('picture'=>$picture));
@@ -282,14 +282,14 @@ function wall_upload_post(&$a, $desktopmode = true) {
 //if we get the signal then return the image url info in BBCODE, otherwise this outputs the info and bails (for the ajax image uploader on wall post)
 	if ($_REQUEST['hush']!='yeah') {
 		if(local_user() && (! feature_enabled(local_user(),'richtext') || x($_REQUEST['nomce'])) ) {
-			echo  "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]\n\n";
+			echo  "\n\n" . '[url=' . App::get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . App::get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]\n\n";
 		}
 		else {
-			echo  '<br /><br /><a href="' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '" ><img src="' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."\" alt=\"$basename\" /></a><br /><br />";
+			echo  '<br /><br /><a href="' . App::get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '" ><img src="' . App::get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."\" alt=\"$basename\" /></a><br /><br />";
 		}
 	}
 	else {
-		$m = '[url='.$a->get_baseurl().'/photos/'.$page_owner_nick.'/image/'.$hash.'][img]'.$a->get_baseurl()."/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]";
+		$m = '[url='.App::get_baseurl().'/photos/'.$page_owner_nick.'/image/'.$hash.'][img]'.App::get_baseurl()."/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]";
 		return($m);
 	}
 /* mod Waitman Gobble NO WARRANTY */
diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index 03a0b7a16f..e0c702cdb0 100644
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -2,7 +2,7 @@
 
 require_once('include/message.php');
 
-function wallmessage_post(&$a) {
+function wallmessage_post(App &$a) {
 
 	$replyto = get_my_url();
 	if(! $replyto) {
@@ -22,7 +22,7 @@ function wallmessage_post(&$a) {
 		dbesc($recipient)
 	);
 
-	if(! dbm::is_result($r)) {
+	if (! dbm::is_result($r)) {
 		logger('wallmessage: no recipient');
 		return;
 	}
@@ -73,7 +73,7 @@ function wallmessage_post(&$a) {
 }
 
 
-function wallmessage_content(&$a) {
+function wallmessage_content(App &$a) {
 
 	if(! get_my_url()) {
 		notice( t('Permission denied.') . EOL);
@@ -91,7 +91,7 @@ function wallmessage_content(&$a) {
 		dbesc($recipient)
 	);
 
-	if(! dbm::is_result($r)) {
+	if (! dbm::is_result($r)) {
 		notice( t('No recipient.') . EOL);
 		logger('wallmessage: no recipient');
 		return;
diff --git a/mod/webfinger.php b/mod/webfinger.php
index e1e5b367b9..f08451ba70 100644
--- a/mod/webfinger.php
+++ b/mod/webfinger.php
@@ -1,7 +1,7 @@
 <?php
 require_once("include/Probe.php");
 
-function webfinger_content(&$a) {
+function webfinger_content(App &$a) {
 
 	$o .= '<h3>Webfinger Diagnostic</h3>';
 
diff --git a/mod/xrd.php b/mod/xrd.php
index 1250b0812c..a56c7fbdff 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -2,7 +2,7 @@
 
 require_once('include/crypto.php');
 
-function xrd_init(&$a) {
+function xrd_init(App &$a) {
 
 	$uri = urldecode(notags(trim($_GET['uri'])));
 
@@ -21,8 +21,9 @@ function xrd_init(&$a) {
 	$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1",
 		dbesc($name)
 	);
-	if(! dbm::is_result($r))
+	if (! dbm::is_result($r)) {
 		killme();
+	}
 
 	$salmon_key = salmon_key($r[0]['spubkey']);
 
@@ -31,22 +32,24 @@ function xrd_init(&$a) {
 
 	$tpl = get_markup_template('xrd_diaspora.tpl');
 	$dspr = replace_macros($tpl,array(
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => App::get_baseurl(),
 		'$dspr_guid' => $r[0]['guid'],
 		'$dspr_key' => base64_encode(pemtorsa($r[0]['pubkey']))
 	));
 
 	$tpl = get_markup_template('xrd_person.tpl');
 
-	$profile_url = $a->get_baseurl().'/profile/'.$r[0]['nickname'];
+	$profile_url = App::get_baseurl().'/profile/'.$r[0]['nickname'];
 
-	if ($acct)
+	if ($acct) {
 		$alias = $profile_url;
+	}
 	else {
 		$alias = 'acct:'.$r[0]['nickname'].'@'.$a->get_hostname();
 
-		if ($a->get_path())
+		if ($a->get_path()) {
 			$alias .= '/'.$a->get_path();
+		}
 	}
 
 	$o = replace_macros($tpl, array(
@@ -54,17 +57,17 @@ function xrd_init(&$a) {
 		'$accturi'     => $uri,
 		'$alias'       => $alias,
 		'$profile_url' => $profile_url,
-		'$hcard_url'   => $a->get_baseurl() . '/hcard/'         . $r[0]['nickname'],
-		'$atom'        => $a->get_baseurl() . '/dfrn_poll/'     . $r[0]['nickname'],
-		'$zot_post'    => $a->get_baseurl() . '/post/'          . $r[0]['nickname'],
-		'$poco_url'    => $a->get_baseurl() . '/poco/'          . $r[0]['nickname'],
-		'$photo'       => $a->get_baseurl() . '/photo/profile/' . $r[0]['uid']      . '.jpg',
+		'$hcard_url'   => App::get_baseurl() . '/hcard/'         . $r[0]['nickname'],
+		'$atom'        => App::get_baseurl() . '/dfrn_poll/'     . $r[0]['nickname'],
+		'$zot_post'    => App::get_baseurl() . '/post/'          . $r[0]['nickname'],
+		'$poco_url'    => App::get_baseurl() . '/poco/'          . $r[0]['nickname'],
+		'$photo'       => App::get_baseurl() . '/photo/profile/' . $r[0]['uid']      . '.jpg',
 		'$dspr'        => $dspr,
-		'$salmon'      => $a->get_baseurl() . '/salmon/'        . $r[0]['nickname'],
-		'$salmen'      => $a->get_baseurl() . '/salmon/'        . $r[0]['nickname'] . '/mention',
-		'$subscribe'   => $a->get_baseurl() . '/follow?url={uri}',
+		'$salmon'      => App::get_baseurl() . '/salmon/'        . $r[0]['nickname'],
+		'$salmen'      => App::get_baseurl() . '/salmon/'        . $r[0]['nickname'] . '/mention',
+		'$subscribe'   => App::get_baseurl() . '/follow?url={uri}',
 		'$modexp'      => 'data:application/magic-public-key,'  . $salmon_key,
-		'$bigkey'      =>  salmon_key($r[0]['pubkey'])
+		'$bigkey'      => salmon_key($r[0]['pubkey']),
 	));
 
 
diff --git a/object/Item.php b/object/Item.php
index 45d2dba3ed..d14b5418cc 100644
--- a/object/Item.php
+++ b/object/Item.php
@@ -117,15 +117,19 @@ class Item extends BaseObject {
 			? t('Private Message')
 			: false);
 		$shareable = ((($conv->get_profile_owner() == local_user()) && ($item['private'] != 1)) ? true : false);
-		if(local_user() && link_compare($a->contact['url'],$item['author-link'])) {
-			if ($item["event-id"] != 0)
+		if (local_user() && link_compare($a->contact['url'],$item['author-link'])) {
+			if ($item["event-id"] != 0) {
 				$edpost = array("events/event/".$item['event-id'], t("Edit"));
-			else
+			} else {
 				$edpost = array("editpost/".$item['id'], t("Edit"));
-		} else
+			}
+		} else {
 			$edpost = false;
-		if(($this->get_data_value('uid') == local_user()) || $this->is_visiting())
+		}
+
+		if (($this->get_data_value('uid') == local_user()) || $this->is_visiting()) {
 			$dropping = true;
+		}
 
 		$drop = array(
 			'dropping' => $dropping,
@@ -143,27 +147,31 @@ class Item extends BaseObject {
 
 		$sp = false;
 		$profile_link = best_link_url($item,$sp);
-		if($profile_link === 'mailbox')
+		if ($profile_link === 'mailbox') {
 			$profile_link = '';
-		if($sp)
+		}
+		if ($sp) {
 			$sparkle = ' sparkle';
-		else
+		} else {
 			$profile_link = zrl($profile_link);
+		}
 
 		if (!isset($item['author-thumb']) OR ($item['author-thumb'] == "")) {
 			$author_contact = get_contact_details_by_url($item['author-link'], $conv->get_profile_owner());
-			if ($author_contact["thumb"])
+			if ($author_contact["thumb"]) {
 				$item['author-thumb'] = $author_contact["thumb"];
-			else
+			} else {
 				$item['author-thumb'] = $item['author-avatar'];
+			}
 		}
 
 		if (!isset($item['owner-thumb']) OR ($item['owner-thumb'] == "")) {
 			$owner_contact = get_contact_details_by_url($item['owner-link'], $conv->get_profile_owner());
-			if ($owner_contact["thumb"])
+			if ($owner_contact["thumb"]) {
 				$item['owner-thumb'] = $owner_contact["thumb"];
-			else
+			} else {
 				$item['owner-thumb'] = $item['owner-avatar'];
+			}
 		}
 
 		$locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
diff --git a/update.php b/update.php
index 0679b5a1f8..7aec2ec2b8 100644
--- a/update.php
+++ b/update.php
@@ -86,7 +86,7 @@ function update_1006() {
 
 	$r = q("SELECT * FROM `user` WHERE `spubkey` = '' ");
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			$sres=openssl_pkey_new(array('encrypt_key' => false ));
 			$sprvkey = '';
 			openssl_pkey_export($sres, $sprvkey);
@@ -123,7 +123,7 @@ function update_1011() {
 	q("ALTER TABLE `contact` ADD `nick` CHAR( 255 ) NOT NULL AFTER `name` ");
 	$r = q("SELECT * FROM `contact` WHERE 1");
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 				q("UPDATE `contact` SET `nick` = '%s' WHERE `id` = %d",
 					dbesc(basename($rr['url'])),
 					intval($rr['id'])
@@ -146,7 +146,7 @@ function update_1014() {
 	q("ALTER TABLE `contact` ADD `micro` TEXT NOT NULL AFTER `thumb` ");
 	$r = q("SELECT * FROM `photo` WHERE `scale` = 4");
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			$ph = new Photo($rr['data']);
 			if($ph->is_valid()) {
 				$ph->scaleImage(48);
@@ -156,7 +156,7 @@ function update_1014() {
 	}
 	$r = q("SELECT * FROM `contact` WHERE 1");
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			if(stristr($rr['thumb'],'avatar'))
 				q("UPDATE `contact` SET `micro` = '%s' WHERE `id` = %d",
 					dbesc(str_replace('avatar','micro',$rr['thumb'])),
@@ -309,7 +309,7 @@ function update_1031() {
 	// Repair any bad links that slipped into the item table
 	$r = q("SELECT `id`, `object` FROM `item` WHERE `object` != '' ");
 	if($r && dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			if(strstr($rr['object'],'type=&quot;http')) {
 				q("UPDATE `item` SET `object` = '%s' WHERE `id` = %d",
 					dbesc(str_replace('type=&quot;http','href=&quot;http',$rr['object'])),
@@ -357,7 +357,7 @@ function update_1036() {
 
 	$r = dbq("SELECT * FROM `contact` WHERE `network` = 'dfrn' && `photo` LIKE '%include/photo%' ");
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s' WHERE `id` = %d",
 				dbesc(str_replace('include/photo','photo',$rr['photo'])),
 				dbesc(str_replace('include/photo','photo',$rr['thumb'])),
@@ -607,7 +607,7 @@ function update_1075() {
 	q("ALTER TABLE `user` ADD `guid` CHAR( 16 ) NOT NULL AFTER `uid` ");
 	$r = q("SELECT `uid` FROM `user` WHERE 1");
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			$found = true;
 			do {
 				$guid = substr(random_string(),0,16);
@@ -689,7 +689,7 @@ function update_1082() {
 		return;
 	$r = q("SELECT distinct(`resource-id`) FROM `photo` WHERE 1 group by `id`");
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			$guid = get_guid();
 			q("update `photo` set `guid` = '%s' where `resource-id` = '%s'",
 				dbesc($guid),
@@ -732,7 +732,7 @@ function update_1087() {
 
 	$r = q("SELECT `id` FROM `item` WHERE `parent` = `id` ");
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			$x = q("SELECT max(`created`) AS `cdate` FROM `item` WHERE `parent` = %d LIMIT 1",
 				intval($rr['id'])
 			);
@@ -855,7 +855,7 @@ function update_1100() {
 
 	$r = q("select id, url from contact where url != '' and nurl = '' ");
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			q("update contact set nurl = '%s' where id = %d",
 				dbesc(normalise_link($rr['url'])),
 				intval($rr['id'])
@@ -1169,7 +1169,7 @@ function update_1136() {
 
 	$r = q("select * from config where 1 order by id desc");
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			$found = false;
 			foreach($arr as $x) {
 				if($x['cat'] == $rr['cat'] && $x['k'] == $rr['k']) {
@@ -1188,7 +1188,7 @@ function update_1136() {
 	$arr = array();
 	$r = q("select * from pconfig where 1 order by id desc");
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 			$found = false;
 			foreach($arr as $x) {
 				if($x['uid'] == $rr['uid'] && $x['cat'] == $rr['cat'] && $x['k'] == $rr['k']) {
diff --git a/view/php/default.php b/view/php/default.php
index df9adbc392..e51b531b5a 100644
--- a/view/php/default.php
+++ b/view/php/default.php
@@ -2,7 +2,7 @@
 <html itemscope itemtype="http://schema.org/Blog" lang="<?php echo $lang; ?>">
 <head>
   <title><?php if(x($page,'title')) echo $page['title'] ?></title>
-  <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+  <script>var baseurl="<?php echo App::get_baseurl() ?>";</script>
   <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
 </head>
 <body>
diff --git a/view/php/minimal.php b/view/php/minimal.php
index a131e3ec5e..e93aac1125 100644
--- a/view/php/minimal.php
+++ b/view/php/minimal.php
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title><?php if(x($page,'title')) echo $page['title'] ?></title>
-  <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+  <script>var baseurl="<?php echo App::get_baseurl() ?>";</script>
   <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
 </head>
 <body>
diff --git a/view/theme/duepuntozero/config.php b/view/theme/duepuntozero/config.php
index edf12c35fa..485e4c233e 100644
--- a/view/theme/duepuntozero/config.php
+++ b/view/theme/duepuntozero/config.php
@@ -5,61 +5,67 @@
 
 
 
-function theme_content(&$a){
-    if(!local_user())
-        return;		
+function theme_content(App &$a){
+	if (!local_user()) {
+		return;
+	}
 
-    $colorset = get_pconfig( local_user(), 'duepuntozero', 'colorset');
-    $user = true;
+	$colorset = get_pconfig( local_user(), 'duepuntozero', 'colorset');
+	$user = true;
 
-    return clean_form($a, $colorset, $user);
+	return clean_form($a, $colorset, $user);
 }
 
-function theme_post(&$a){
-    if(! local_user())
-        return;
-    
-    if (isset($_POST['duepuntozero-settings-submit'])){
-        set_pconfig(local_user(), 'duepuntozero', 'colorset', $_POST['duepuntozero_colorset']);
-    }
+function theme_post(App &$a){
+	if (! local_user()) {
+		return;
+	}
+
+	if (isset($_POST['duepuntozero-settings-submit'])){
+		set_pconfig(local_user(), 'duepuntozero', 'colorset', $_POST['duepuntozero_colorset']);
+	}
 }
 
 
-function theme_admin(&$a){
-    $colorset = get_config( 'duepuntozero', 'colorset');
-    $user = false;
+function theme_admin(App &$a){
+	$colorset = get_config( 'duepuntozero', 'colorset');
+	$user = false;
 
-    return clean_form($a, $colorset, $user);
+	return clean_form($a, $colorset, $user);
 }
 
-function theme_admin_post(&$a){
-    if (isset($_POST['duepuntozero-settings-submit'])){
-        set_config('duepuntozero', 'colorset', $_POST['duepuntozero_colorset']);
-    }
+function theme_admin_post(App &$a){
+	if (isset($_POST['duepuntozero-settings-submit'])){
+		set_config('duepuntozero', 'colorset', $_POST['duepuntozero_colorset']);
+	}
 }
 
-
+/// @TODO $a is no longer used
 function clean_form(&$a, &$colorset, $user){
-    $colorset = array(
-	'default'=>t('default'), 
-        'greenzero'=>t('greenzero'),
-        'purplezero'=>t('purplezero'),
-        'easterbunny'=>t('easterbunny'),
-        'darkzero'=>t('darkzero'),
-        'comix'=>t('comix'),
-        'slackr'=>t('slackr'),
-    );
-    if ($user) {
-        $color = get_pconfig(local_user(), 'duepuntozero', 'colorset');
-    } else {
-        $color = get_config( 'duepuntozero', 'colorset');
-    }
-    $t = get_markup_template("theme_settings.tpl" );
-    $o .= replace_macros($t, array(
-        '$submit' => t('Submit'),
-        '$baseurl' => $a->get_baseurl(),
-        '$title' => t("Theme settings"),
-        '$colorset' => array('duepuntozero_colorset', t('Variations'), $color, '', $colorset),
-    ));
-    return $o;
+	$colorset = array(
+		'default'=>t('default'), 
+		'greenzero'=>t('greenzero'),
+		'purplezero'=>t('purplezero'),
+		'easterbunny'=>t('easterbunny'),
+		'darkzero'=>t('darkzero'),
+		'comix'=>t('comix'),
+		'slackr'=>t('slackr'),
+	);
+
+	if ($user) {
+		$color = get_pconfig(local_user(), 'duepuntozero', 'colorset');
+	} else {
+		$color = get_config( 'duepuntozero', 'colorset');
+	}
+
+	$t = get_markup_template("theme_settings.tpl" );
+	/// @TODO No need for adding string here, $o is not defined
+	$o .= replace_macros($t, array(
+		'$submit'   => t('Submit'),
+		'$baseurl'  => App::get_baseurl(),
+		'$title'=> t("Theme settings"),
+		'$colorset' => array('duepuntozero_colorset', t('Variations'), $color, '', $colorset),
+	));
+
+	return $o;
 }
diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php
index 50d57f91e5..bf1d031def 100644
--- a/view/theme/duepuntozero/theme.php
+++ b/view/theme/duepuntozero/theme.php
@@ -1,6 +1,6 @@
 <?php
 
-function duepuntozero_init(&$a) {
+function duepuntozero_init(App &$a) {
 
 set_template_engine($a, 'smarty3');
 
diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php
index 2e896d45f6..000ef26092 100644
--- a/view/theme/frio/config.php
+++ b/view/theme/frio/config.php
@@ -1,8 +1,10 @@
 <?php
 require_once('view/theme/frio/php/Image.php');
 
-function theme_content(&$a) {
-	if(!local_user()) { return;}
+function theme_content(App &$a) {
+	if (!local_user()) {
+		return;
+	}
 	$arr = array();
 
 	$arr["schema"]		= get_pconfig(local_user(),'frio', 'schema');
@@ -17,8 +19,11 @@ function theme_content(&$a) {
 	return frio_form($a, $arr);
 }
 
-function theme_post(&$a) {
-	if(!local_user()) { return;}
+function theme_post(App &$a) {
+	if (!local_user()) {
+		return;
+	}
+
 	if (isset($_POST['frio-settings-submit'])) {
 		set_pconfig(local_user(), 'frio', 'schema',		$_POST["frio_schema"]);
 		set_pconfig(local_user(), 'frio', 'nav_bg',		$_POST["frio_nav_bg"]);
@@ -57,7 +62,7 @@ function frio_form(&$a, $arr) {
 	$t = get_markup_template('theme_settings.tpl');
 	$o .= replace_macros($t, array(
 		'$submit'		=> t('Submit'),
-		'$baseurl'		=> $a->get_baseurl(),
+		'$baseurl'		=> App::get_baseurl(),
 		'$title'		=> t("Theme settings"),
 		'$schema'		=> array('frio_schema',		t("Select scheme"),			$arr["schema"], '', $scheme_choices),
 		'$nav_bg'		=> array_key_exists("nav_bg", $disable) ? "" : array('frio_nav_bg',		t('Navigation bar background color'),	$arr['nav_bg']),
diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php
index bfc11a3580..56118cc90e 100644
--- a/view/theme/frio/php/default.php
+++ b/view/theme/frio/php/default.php
@@ -18,9 +18,9 @@
 <head>
 	<title><?php if(x($page,'title')) echo $page['title'] ?></title>
 	<meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?> ">
-	<script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+	<script>var baseurl="<?php echo App::get_baseurl() ?>";</script>
 	<script>var frio="<?php echo "view/theme/frio"; ?>";</script>
-	<?php $baseurl = $a->get_baseurl(); ?>
+	<?php $baseurl = App::get_baseurl(); ?>
 	<?php $frio = "view/theme/frio"; ?>
 	<?php 
 		// Because we use minimal for modals the header and the included js stuff should be only loaded
diff --git a/view/theme/frio/php/frio_boot.php b/view/theme/frio/php/frio_boot.php
index 827874d7e1..0e221f5337 100644
--- a/view/theme/frio/php/frio_boot.php
+++ b/view/theme/frio/php/frio_boot.php
@@ -13,7 +13,7 @@
  * 
  * @todo Check if this is really needed.
  */
-function load_page(&$a) {
+function load_page(App &$a) {
 	if(isset($_GET["mode"]) AND ($_GET["mode"] == "minimal")) {
 		require "view/theme/frio/minimal.php";
 	} elseif((isset($_GET["mode"]) AND ($_GET["mode"] == "none"))) {
diff --git a/view/theme/frio/php/standard.php b/view/theme/frio/php/standard.php
index 4a92a6aecf..491fa9d5b0 100644
--- a/view/theme/frio/php/standard.php
+++ b/view/theme/frio/php/standard.php
@@ -12,9 +12,9 @@
 	<title><?php if(x($page,'title')) echo $page['title'] ?></title>
 	<meta name="viewport" content="initial-scale=1.0">
 	<meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?> ">
-	<script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+	<script>var baseurl="<?php echo App::get_baseurl() ?>";</script>
 	<script>var frio="<?php echo "view/theme/frio"; ?>";</script>
-	<?php $baseurl = $a->get_baseurl(); ?>
+	<?php $baseurl = App::get_baseurl(); ?>
 	<?php $frio = "view/theme/frio"; ?>
 	<?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
 	
diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 279edd64ec..f9cbf79a6a 100644
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -11,7 +11,7 @@ $frio = "view/theme/frio";
 
 global $frio;
 
-function frio_init(&$a) {
+function frio_init(App &$a) {
 
 	// disable the events module link in the profile tab
 	$a->theme_events_in_profile = false;
@@ -21,7 +21,7 @@ function frio_init(&$a) {
 
 	set_template_engine($a, 'smarty3');
 
-	$baseurl = $a->get_baseurl();
+	$baseurl = App::get_baseurl();
 
 	$style = get_pconfig(local_user(), 'frio', 'style');
 
@@ -271,7 +271,7 @@ function frio_remote_nav($a,&$nav) {
  * We use this to give the data to textcomplete and have a filter function at the
  * contact page.
  * 
- * @param App $a The app data
+ * @param App $a The app data @TODO Unused
  * @param array $results The array with the originals from acl_lookup()
  */
 function frio_acl_lookup($a, &$results) {
@@ -281,17 +281,18 @@ function frio_acl_lookup($a, &$results) {
 
 	// we introduce a new search type, r should do the same query like it's
 	// done in /mod/contacts for connections
-	if($results["type"] == "r") {
+	if ($results["type"] == "r") {
 		$searching = false;
-		if($search) {
+		if ($search) {
 			$search_hdr = $search;
 			$search_txt = dbesc(protect_sprintf(preg_quote($search)));
 			$searching = true;
 		}
 		$sql_extra .= (($searching) ? " AND (`attag` LIKE '%%".dbesc($search_txt)."%%' OR `name` LIKE '%%".dbesc($search_txt)."%%' OR `nick` LIKE '%%".dbesc($search_txt)."%%') " : "");
 
-		if($nets)
+		if ($nets) {
 			$sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets));
+		}
 
 		$sql_extra2 = ((($sort_type > 0) && ($sort_type <= CONTACT_IS_FRIEND)) ? sprintf(" AND `rel` = %d ",intval($sort_type)) : '');
 
@@ -312,7 +313,7 @@ function frio_acl_lookup($a, &$results) {
 		$contacts = array();
 
 		if (dbm::is_result($r)) {
-			foreach($r as $rr) {
+			foreach ($r as $rr) {
 				$contacts[] = _contact_detail_for_template($rr);
 			}
 		}
diff --git a/view/theme/frost-mobile/php/default.php b/view/theme/frost-mobile/php/default.php
index 332291ca92..d739f56f26 100644
--- a/view/theme/frost-mobile/php/default.php
+++ b/view/theme/frost-mobile/php/default.php
@@ -2,7 +2,7 @@
 <html lang="<?php echo $lang; ?>">
 <head>
   <title><?php if(x($page,'title')) echo $page['title'] ?></title>
-  <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+  <script>var baseurl="<?php echo App::get_baseurl() ?>";</script>
   <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
 </head>
 <body <?php if($a->module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>>
diff --git a/view/theme/frost-mobile/theme.php b/view/theme/frost-mobile/theme.php
index 29a990f7b8..4ca592f4c8 100644
--- a/view/theme/frost-mobile/theme.php
+++ b/view/theme/frost-mobile/theme.php
@@ -9,7 +9,7 @@
  * Maintainer: Zach P <techcity@f.shmuz.in>
  */
 
-function frost_mobile_init(&$a) {
+function frost_mobile_init(App &$a) {
 	$a->sourcename = 'Friendica mobile web';
 	$a->videowidth = 250;
 	$a->videoheight = 200;
@@ -18,15 +18,17 @@ function frost_mobile_init(&$a) {
 	set_template_engine($a, 'smarty3');
 }
 
-function frost_mobile_content_loaded(&$a) {
+function frost_mobile_content_loaded(App &$a) {
 
 	// I could do this in style.php, but by having the CSS in a file the browser will cache it,
 	// making pages load faster
-	if( $a->module === 'home' || $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {
-//		$a->page['htmlhead'] = str_replace('$stylesheet', $a->get_baseurl() . '/view/theme/frost-mobile/login-style.css', $a->page['htmlhead']);
-		$a->theme['stylesheet'] = $a->get_baseurl() . '/view/theme/frost-mobile/login-style.css';
+	if ( $a->module === 'home' || $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {
+//		$a->page['htmlhead'] = str_replace('$stylesheet', App::get_baseurl() . '/view/theme/frost-mobile/login-style.css', $a->page['htmlhead']);
+		$a->theme['stylesheet'] = App::get_baseurl() . '/view/theme/frost-mobile/login-style.css';
 	}
-	if( $a->module === 'login' )
+
+	if ( $a->module === 'login' ) {
 		$a->page['end'] .= '<script type="text/javascript"> $(document).ready(function() { $("#id_" + window.loginName).focus();} );</script>';
+	}
 
 }
diff --git a/view/theme/frost/php/default.php b/view/theme/frost/php/default.php
index c67bdcf20e..0fe3404f69 100644
--- a/view/theme/frost/php/default.php
+++ b/view/theme/frost/php/default.php
@@ -2,7 +2,7 @@
 <html lang="<?php echo $lang; ?>">
 <head>
   <title><?php if(x($page,'title')) echo $page['title'] ?></title>
-  <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+  <script>var baseurl="<?php echo App::get_baseurl() ?>";</script>
   <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
 </head>
 <body <?php if($a->module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>>
diff --git a/view/theme/frost/theme.php b/view/theme/frost/theme.php
index 1093a04729..7746109e56 100644
--- a/view/theme/frost/theme.php
+++ b/view/theme/frost/theme.php
@@ -9,23 +9,25 @@
  * Maintainer: Zach P <techcity@f.shmuz.in>
  */
 
-function frost_init(&$a) {
+function frost_init(App &$a) {
 	$a->videowidth = 400;
 	$a->videoheight = 330;
 	$a->theme_thread_allow = false;
 	set_template_engine($a, 'smarty3');
 }
 
-function frost_content_loaded(&$a) {
+function frost_content_loaded(App &$a) {
 
 	// I could do this in style.php, but by having the CSS in a file the browser will cache it,
 	// making pages load faster
 	if( $a->module === 'home' || $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {
-		//$a->page['htmlhead'] = str_replace('$stylesheet', $a->get_baseurl() . '/view/theme/frost/login-style.css', $a->page['htmlhead']);
-		$a->theme['stylesheet'] = $a->get_baseurl() . '/view/theme/frost/login-style.css';
+		//$a->page['htmlhead'] = str_replace('$stylesheet', App::get_baseurl() . '/view/theme/frost/login-style.css', $a->page['htmlhead']);
+		$a->theme['stylesheet'] = App::get_baseurl() . '/view/theme/frost/login-style.css';
 	}
-	if( $a->module === 'login' )
+
+	if ( $a->module === 'login' ) {
 		$a->page['end'] .= '<script type="text/javascript"> $(document).ready(function() { $("#id_" + window.loginName).focus();} );</script>';
+	}
 
 }
 
diff --git a/view/theme/quattro/config.php b/view/theme/quattro/config.php
index db4356ccc8..1a5a9c0213 100644
--- a/view/theme/quattro/config.php
+++ b/view/theme/quattro/config.php
@@ -5,22 +5,24 @@
 
 
 
-function theme_content(&$a){
-	if(!local_user())
-		return;		
-	
+function theme_content(App &$a){
+	if (!local_user()) {
+		return;
+	}
+
 	$align = get_pconfig(local_user(), 'quattro', 'align' );
 	$color = get_pconfig(local_user(), 'quattro', 'color' );
-    $tfs = get_pconfig(local_user(),"quattro","tfs");
-    $pfs = get_pconfig(local_user(),"quattro","pfs");    
-    
+	$tfs = get_pconfig(local_user(),"quattro","tfs");
+	$pfs = get_pconfig(local_user(),"quattro","pfs");
+
 	return quattro_form($a,$align, $color, $tfs, $pfs);
 }
 
-function theme_post(&$a){
-	if(! local_user())
+function theme_post(App &$a){
+	if (! local_user()) {
 		return;
-	
+	}
+
 	if (isset($_POST['quattro-settings-submit'])){
 		set_pconfig(local_user(), 'quattro', 'align', $_POST['quattro_align']);
 		set_pconfig(local_user(), 'quattro', 'color', $_POST['quattro_color']);
@@ -30,7 +32,7 @@ function theme_post(&$a){
 }
 
 
-function theme_admin(&$a){
+function theme_admin(App &$a){
 	$align = get_config('quattro', 'align' );
 	$color = get_config('quattro', 'color' );
     $tfs = get_config("quattro","tfs");
@@ -39,7 +41,7 @@ function theme_admin(&$a){
 	return quattro_form($a,$align, $color, $tfs, $pfs);
 }
 
-function theme_admin_post(&$a){
+function theme_admin_post(App &$a){
 	if (isset($_POST['quattro-settings-submit'])){
 		set_config('quattro', 'align', $_POST['quattro_align']);
 		set_config('quattro', 'color', $_POST['quattro_color']);
@@ -48,7 +50,7 @@ function theme_admin_post(&$a){
 	}
 }
 
-
+/// @TODO $a is no longer used here
 function quattro_form(&$a, $align, $color, $tfs, $pfs){
 	$colors = array(
 		"dark"=>"Quattro", 
@@ -62,7 +64,7 @@ function quattro_form(&$a, $align, $color, $tfs, $pfs){
 	$t = get_markup_template("theme_settings.tpl" );
 	$o .= replace_macros($t, array(
 		'$submit' => t('Submit'),
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => App::get_baseurl(),
 		'$title' => t("Theme settings"),
 		'$align' => array('quattro_align', t('Alignment'), $align, '', array('left'=>t('Left'), 'center'=>t('Center'))),
 		'$color' => array('quattro_color', t('Color scheme'), $color, '', $colors),
diff --git a/view/theme/quattro/theme.php b/view/theme/quattro/theme.php
index 0b67c6b49a..ae8f4f9065 100644
--- a/view/theme/quattro/theme.php
+++ b/view/theme/quattro/theme.php
@@ -7,7 +7,7 @@
  * Maintainer: Tobias <https://diekershoff.homeunix.net/friendica/profile/tobias>
  */
 
-function quattro_init(&$a) {
-	$a->page['htmlhead'] .= '<script src="'.$a->get_baseurl().'/view/theme/quattro/tinycon.min.js"></script>';
-	$a->page['htmlhead'] .= '<script src="'.$a->get_baseurl().'/view/theme/quattro/js/quattro.js"></script>';;
+function quattro_init(App &$a) {
+	$a->page['htmlhead'] .= '<script src="'.App::get_baseurl().'/view/theme/quattro/tinycon.min.js"></script>';
+	$a->page['htmlhead'] .= '<script src="'.App::get_baseurl().'/view/theme/quattro/js/quattro.js"></script>';;
 }
diff --git a/view/theme/smoothly/php/default.php b/view/theme/smoothly/php/default.php
index 405e1cad34..1e97c6b462 100644
--- a/view/theme/smoothly/php/default.php
+++ b/view/theme/smoothly/php/default.php
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title><?php if(x($page,'title')) echo $page['title'] ?></title>
-  <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+  <script>var baseurl="<?php echo App::get_baseurl() ?>";</script>
   <script type="text/javascript">
 	function ScrollToBottom(){
 	window.scrollTo(0,document.body.scrollHeight);
diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php
index 0dae3a6e47..32c48fffa4 100644
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@@ -10,12 +10,12 @@
  * Screenshot: <a href="screenshot.png">Screenshot</a>
  */
 
-function smoothly_init(&$a) {
+function smoothly_init(App &$a) {
 	set_template_engine($a, 'smarty3');
 
 	$cssFile = null;
 	$ssl_state = null;
-	$baseurl = $a->get_baseurl($ssl_state);
+	$baseurl = App::get_baseurl($ssl_state);
 $a->page['htmlhead'] .= <<< EOT
 
 <script>
@@ -114,7 +114,7 @@ if(! function_exists('_js_in_foot')) {
 		*/
 		$a = get_app();
 		$ssl_state = null;
-		$baseurl = $a->get_baseurl($ssl_state);
+		$baseurl = App::get_baseurl($ssl_state);
 		$bottom['$baseurl'] = $baseurl;
 		$tpl = get_markup_template('bottom.tpl');
 
diff --git a/view/theme/vier/config.php b/view/theme/vier/config.php
index 7c51b4ec95..5326498908 100644
--- a/view/theme/vier/config.php
+++ b/view/theme/vier/config.php
@@ -5,20 +5,24 @@
 
 
 
-function theme_content(&$a){
-	if(!local_user())
+function theme_content(App &$a){
+	if (!local_user()) {
 		return;
+	}
 
-	if (!function_exists('get_vier_config'))
+	if (!function_exists('get_vier_config')) {
 		return;
+	}
 
 	$style = get_pconfig(local_user(), 'vier', 'style');
 
-	if ($style == "")
+	if ($style == "") {
 		$style = get_config('vier', 'style');
+	}
 
-	if ($style == "")
+	if ($style == "") {
 		$style = "plus";
+	}
 
 	$show_pages = get_vier_config('show_pages', true);
 	$show_profiles = get_vier_config('show_profiles', true);
@@ -31,9 +35,10 @@ function theme_content(&$a){
 			$show_services, $show_friends, $show_lastusers);
 }
 
-function theme_post(&$a){
-	if(! local_user())
+function theme_post(App &$a){
+	if (! local_user()) {
 		return;
+	}
 
 	if (isset($_POST['vier-settings-submit'])){
 		set_pconfig(local_user(), 'vier', 'style', $_POST['vier_style']);
@@ -47,7 +52,7 @@ function theme_post(&$a){
 }
 
 
-function theme_admin(&$a){
+function theme_admin(App &$a){
 
 	if (!function_exists('get_vier_config'))
 		return;
@@ -76,7 +81,7 @@ function theme_admin(&$a){
 	return $o;
 }
 
-function theme_admin_post(&$a){
+function theme_admin_post(App &$a){
 	if (isset($_POST['vier-settings-submit'])){
 		set_config('vier', 'style', $_POST['vier_style']);
 		set_config('vier', 'show_pages', $_POST['vier_show_pages']);
@@ -89,7 +94,7 @@ function theme_admin_post(&$a){
 	}
 }
 
-
+/// @TODO $a is no longer used
 function vier_form(&$a, $style, $show_pages, $show_profiles, $show_helpers, $show_services, $show_friends, $show_lastusers){
 	$styles = array(
 		"plus"=>"Plus",
@@ -105,7 +110,7 @@ function vier_form(&$a, $style, $show_pages, $show_profiles, $show_helpers, $sho
 	$t = get_markup_template("theme_settings.tpl");
 	$o .= replace_macros($t, array(
 		'$submit' => t('Submit'),
-		'$baseurl' => $a->get_baseurl(),
+		'$baseurl' => App::get_baseurl(),
 		'$title' => t("Theme settings"),
 		'$style' => array('vier_style',t ('Set style'),$style,'',$styles),
 		'$show_pages' => array('vier_show_pages', t('Community Pages'), $show_pages, '', $show_or_not),
diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 50b292f6b7..8be91220af 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -13,7 +13,7 @@ require_once("include/plugin.php");
 require_once("include/socgraph.php");
 require_once("mod/proxy.php");
 
-function vier_init(&$a) {
+function vier_init(App &$a) {
 
 	$a->theme_events_in_profile = false;
 
@@ -138,7 +138,7 @@ function vier_community_info() {
 	$show_lastusers  = get_vier_config("show_lastusers", 1);
 
 	//get_baseurl
-	$url = $a->get_baseurl($ssl_state);
+	$url = App::get_baseurl($ssl_state);
 	$aside['$url'] = $url;
 
 	// comunity_profiles
@@ -152,7 +152,7 @@ function vier_community_info() {
 			$aside['$comunity_profiles_title'] = t('Community Profiles');
 			$aside['$comunity_profiles_items'] = array();
 
-			foreach($r as $rr) {
+			foreach ($r as $rr) {
 				$entry = replace_macros($tpl,array(
 					'$id' => $rr['id'],
 					//'$profile_link' => zrl($rr['url']),
@@ -182,7 +182,7 @@ function vier_community_info() {
 			$aside['$lastusers_title'] = t('Last users');
 			$aside['$lastusers_items'] = array();
 
-			foreach($r as $rr) {
+			foreach ($r as $rr) {
 				$profile_link = 'profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
 				$entry = replace_macros($tpl,array(
 					'$id' => $rr['id'],
@@ -300,7 +300,7 @@ function vier_community_info() {
 
 			$aside['$helpers_items'] = array();
 
-			foreach($r as $rr) {
+			foreach ($r as $rr) {
 				$entry = replace_macros($tpl,array(
 					'$url' => $rr['url'],
 					'$title' => $rr['name'],
@@ -316,55 +316,72 @@ function vier_community_info() {
 	//connectable services
 	if ($show_services) {
 
+		/// @TODO This whole thing is hard-coded, better rewrite to Intercepting Filter Pattern (future-todo)
 		$r = array();
 
-		if (plugin_enabled("appnet"))
+		if (plugin_enabled("appnet")) {
 			$r[] = array("photo" => "images/appnet.png", "name" => "App.net");
+		}
 
-		if (plugin_enabled("buffer"))
+		if (plugin_enabled("buffer")) {
 			$r[] = array("photo" => "images/buffer.png", "name" => "Buffer");
+		}
 
-		if (plugin_enabled("blogger"))
+		if (plugin_enabled("blogger")) {
 			$r[] = array("photo" => "images/blogger.png", "name" => "Blogger");
+		}
 
-		if (plugin_enabled("dwpost"))
+		if (plugin_enabled("dwpost")) {
 			$r[] = array("photo" => "images/dreamwidth.png", "name" => "Dreamwidth");
+		}
 
-		if (plugin_enabled("fbpost"))
+		if (plugin_enabled("fbpost")) {
 			$r[] = array("photo" => "images/facebook.png", "name" => "Facebook");
+		}
 
-		if (plugin_enabled("ifttt"))
+		if (plugin_enabled("ifttt")) {
 			$r[] = array("photo" => "addon/ifttt/ifttt.png", "name" => "IFTTT");
+		}
 
-		if (plugin_enabled("statusnet"))
+		if (plugin_enabled("statusnet")) {
 			$r[] = array("photo" => "images/gnusocial.png", "name" => "GNU Social");
+		}
 
-		if (plugin_enabled("gpluspost"))
+		if (plugin_enabled("gpluspost")) {
 			$r[] = array("photo" => "images/googleplus.png", "name" => "Google+");
+		}
 
-		//if (plugin_enabled("ijpost"))
+		//if (plugin_enabled("ijpost")) {
 		//	$r[] = array("photo" => "images/", "name" => "");
+		//}
 
-		if (plugin_enabled("libertree"))
+		if (plugin_enabled("libertree")) {
 			$r[] = array("photo" => "images/libertree.png", "name" => "Libertree");
+		}
 
-		//if (plugin_enabled("ljpost"))
+		//if (plugin_enabled("ljpost")) {
 		//	$r[] = array("photo" => "images/", "name" => "");
+		//}
 
-		if (plugin_enabled("pumpio"))
+		if (plugin_enabled("pumpio")) {
 			$r[] = array("photo" => "images/pumpio.png", "name" => "pump.io");
+		}
 
-		if (plugin_enabled("tumblr"))
+		if (plugin_enabled("tumblr")) {
 			$r[] = array("photo" => "images/tumblr.png", "name" => "Tumblr");
+		}
 
-		if (plugin_enabled("twitter"))
+		if (plugin_enabled("twitter")) {
 			$r[] = array("photo" => "images/twitter.png", "name" => "Twitter");
+		}
 
-		if (plugin_enabled("wppost"))
+		if (plugin_enabled("wppost")) {
 			$r[] = array("photo" => "images/wordpress.png", "name" => "Wordpress");
+		}
 
-		if(function_exists("imap_open") AND !get_config("system","imap_disabled") AND !get_config("system","dfrn_only"))
+		if (function_exists("imap_open") AND !get_config("system","imap_disabled") AND !get_config("system","dfrn_only")) {
 			$r[] = array("photo" => "images/mail.png", "name" => "E-Mail");
+		}
 
 		$tpl = get_markup_template('ch_connectors.tpl');
 
@@ -374,7 +391,7 @@ function vier_community_info() {
 			$con_services['title'] = Array("", t('Connect Services'), "", "");
 			$aside['$con_services'] = $con_services;
 
-			foreach($r as $rr) {
+			foreach ($r as $rr) {
 				$entry = replace_macros($tpl,array(
 					'$url' => $url,
 					'$photo' => $rr['photo'],