Merge branch 'develop' into rewrites/dbm_is_result

Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/events.php
	mod/fbrowser.php
	mod/group.php
	view/theme/quattro/theme.php

boot.php

@@ -1537,7 +1537,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');
 
@@ -1559,7 +1559,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 +1675,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 +2410,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
 

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
 ---

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();
     

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

doc/themes.md

@@ -122,7 +122,7 @@ 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())
             return;
@@ -167,7 +167,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 +250,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');
     }

include/acl_selectors.php

@@ -678,7 +678,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');
 

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";

include/cron.php

@@ -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));

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;

include/identity.php

@@ -599,7 +599,7 @@ function get_events() {
 	));
 }
 
-function advanced_profile(&$a) {
+function advanced_profile(App &$a) {
 
 	$o = '';
 	$uid = $a->profile['uid'];
@@ -807,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)) {
 

include/nav.php

@@ -1,6 +1,6 @@
 <?php
 
-function nav(&$a) {
+function nav(App &$a) {
 
 	/*
 	 *

include/text.php

@@ -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");

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');

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']);

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);
 }
 

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()) {
@@ -127,7 +127,7 @@ 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);
@@ -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
 	//
@@ -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",
@@ -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;
 	}
@@ -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();
@@ -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 = '';
 
@@ -1155,7 +1155,7 @@ function admin_page_dbsync(&$a) {
  * 
  * @param App $a
  */
-function admin_page_users_post(&$a){
+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']	: '');
@@ -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));
@@ -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
@@ -1666,7 +1666,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);
@@ -1847,7 +1847,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 +1881,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',
@@ -1938,7 +1938,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 +1980,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 +2026,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();

mod/allfriends.php

@@ -5,7 +5,7 @@ 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()) {
@@ -19,7 +19,7 @@ function allfriends_content(&$a) {
 	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),

mod/amcd.php

@@ -1,6 +1,6 @@
 <?php
 
-function amcd_content(&$a) {
+function amcd_content(App &$a) {
 //header("Content-type: text/json");
 echo <<< EOT
 {

mod/api.php

@@ -20,7 +20,7 @@ function oauth_get_client($request){
 	return $r[0];
 }
 
-function api_post(&$a) {
+function api_post(App &$a) {
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
@@ -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

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())))  {

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);

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>';
 

mod/bookmarklet.php

@@ -3,11 +3,11 @@
 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) {
+function bookmarklet_content(App &$a) {
 	if(!local_user()) {
 		$o = '<h2>'.t('Login').'</h2>';
 		$o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true);

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';

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;

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 = '';
 

mod/community.php

@@ -1,6 +1,6 @@
 <?php
 
-function community_init(&$a) {
+function community_init(App &$a) {
 	if(! local_user()) {
 		unset($_SESSION['theme']);
 		unset($_SESSION['mobile-theme']);

mod/contactgroup.php

@@ -2,7 +2,7 @@
 
 require_once('include/group.php');
 
-function contactgroup_content(&$a) {
+function contactgroup_content(App &$a) {
 
 
 	if(! local_user()) {

mod/contacts.php

@@ -7,7 +7,7 @@ require_once('include/Scrape.php');
 require_once('mod/proxy.php');
 require_once('include/Photo.php');
 
-function contacts_init(&$a) {
+function contacts_init(App &$a) {
 	if(! local_user())
 		return;
 
@@ -91,7 +91,7 @@ function contacts_init(&$a) {
 
 }
 
-function contacts_batch_actions(&$a){
+function contacts_batch_actions(App &$a){
 	$contacts_id = $_POST['contact_batch'];
 	if (!is_array($contacts_id)) return;
 
@@ -136,7 +136,7 @@ function contacts_batch_actions(&$a){
 }
 
 
-function contacts_post(&$a) {
+function contacts_post(App &$a) {
 
 	if(! local_user())
 		return;
@@ -339,7 +339,7 @@ function _contact_drop($contact_id, $orig_record) {
 }
 
 
-function contacts_content(&$a) {
+function contacts_content(App &$a) {
 
 	$sort_type = 0;
 	$o = '';

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'));

mod/crepair.php

@@ -2,7 +2,7 @@
 require_once("include/contact_selectors.php");
 require_once("mod/contacts.php");
 
-function crepair_init(&$a) {
+function crepair_init(App &$a) {
 	if(! local_user())
 		return;
 
@@ -30,7 +30,7 @@ function crepair_init(&$a) {
 }
 
 
-function crepair_post(&$a) {
+function crepair_post(App &$a) {
 	if(! local_user())
 		return;
 
@@ -95,7 +95,7 @@ function crepair_post(&$a) {
 
 
 
-function crepair_content(&$a) {
+function crepair_content(App &$a) {
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);

mod/delegate.php

@@ -1,12 +1,12 @@
 <?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()) {
 		notice( t('Permission denied.') . EOL);

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);
@@ -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')) {
 

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']              : '');
@@ -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']            : '');
@@ -383,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');

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));
@@ -654,7 +654,7 @@ function dfrn_request_post(&$a) {
 }
 
 
-function dfrn_request_content(&$a) {
+function dfrn_request_content(App &$a) {
 
 	if (($a->argc != 2) || (! count($a->profile))) {
 		return "";

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");

mod/dirfind.php

@@ -5,7 +5,7 @@ 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()) {
 		notice( t('Permission denied.') . EOL );

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;

mod/editpost.php

@@ -2,7 +2,7 @@
 
 require_once('include/acl_selectors.php');
 
-function editpost_content(&$a) {
+function editpost_content(App &$a) {
 
 	$o = '';
 

mod/events.php

@@ -8,11 +8,11 @@ require_once('include/datetime.php');
 require_once('include/event.php');
 require_once('include/items.php');
 
-function events_init(&$a) {
+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')
@@ -20,8 +20,9 @@ function events_init(&$a) {
 
 		$cal_widget = widget_events();
 
-		if(! x($a->page,'aside'))
+		if (! x($a->page,'aside')) {
 			$a->page['aside'] = '';
+		}
 
 		$a->page['aside'] .= $cal_widget;
 	}
@@ -29,7 +30,7 @@ function events_init(&$a) {
 	return;
 }
 
-function events_post(&$a) {
+function events_post(App &$a) {
 
 	logger('post: ' . print_r($_REQUEST,true));
 
@@ -184,38 +185,41 @@ function events_post(&$a) {
 
 
 
-function events_content(&$a) {
+function events_content(App &$a) {
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
 
-	if($a->argc == 1)
+	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();

mod/fbrowser.php

@@ -10,8 +10,7 @@ require_once('include/Photo.php');
 /**
  * @param App $a
  */
-/// @TODO & is missing or App ?
-function fbrowser_content($a){
+function fbrowser_content(App &$a){
 
 	if (!local_user())
 		killme();

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'));

mod/filer.php

@@ -5,7 +5,7 @@ require_once('include/bbcode.php');
 require_once('include/items.php');
 
 
-function filer_content(&$a) {
+function filer_content(App &$a) {
 
 	if(! local_user()) {
 		killme();

mod/filerm.php

@@ -1,6 +1,6 @@
 <?php
 
-function filerm_content(&$a) {
+function filerm_content(App &$a) {
 
 	if(! local_user()) {
 		killme();

mod/follow.php

@@ -5,7 +5,7 @@ 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()) {
 		notice( t('Permission denied.') . EOL);
@@ -149,7 +149,7 @@ function follow_content(&$a) {
 	return $o;
 }
 
-function follow_post(&$a) {
+function follow_post(App &$a) {
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);

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');
 
@@ -59,7 +59,7 @@ function friendica_init(&$a) {
 
 
 
-function friendica_content(&$a) {
+function friendica_content(App &$a) {
 
 	$o = '';
 	$o .= '<h3>Friendica</h3>';

mod/fsuggest.php

@@ -1,7 +1,7 @@
 <?php
 
 
-function fsuggest_post(&$a) {
+function fsuggest_post(App &$a) {
 
 	if(! local_user()) {
 		return;
@@ -70,7 +70,7 @@ function fsuggest_post(&$a) {
 
 
 
-function fsuggest_content(&$a) {
+function fsuggest_content(App &$a) {
 
 	require_once('include/acl_selectors.php');
 

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,7 +13,7 @@ function group_init(&$a) {
 
 
 
-function group_post(&$a) {
+function group_post(App &$a) {
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
@@ -28,15 +28,18 @@ function group_post(&$a) {
 		if($r) {
 			info( t('Group created.') . EOL );
 			$r = group_byname(local_user(),$name);
-			if($r)
+			if ($r) {
 				goaway(App::get_baseurl() . '/group/' . $r);
+			}
 		}
-		else
+		else {
 			notice( t('Could not create group.') . EOL );
+		}
 		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",
@@ -50,14 +53,16 @@ function group_post(&$a) {
 		}
 		$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,7 +70,7 @@ function group_post(&$a) {
 	return;
 }
 
-function group_content(&$a) {
+function group_content(App &$a) {
 	$change = false;
 
 	if(! local_user()) {

mod/hcard.php

@@ -1,6 +1,6 @@
 <?php
 
-function hcard_init(&$a) {
+function hcard_init(App &$a) {
 
 	$blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
 

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');
 

mod/home.php

@@ -1,7 +1,7 @@
 <?php
 
 if(! function_exists('home_init')) {
-function home_init(&$a) {
+function home_init(App &$a) {
 
 	$ret = array();
 	call_hooks('home_init',$ret);
@@ -17,7 +17,7 @@ function home_init(&$a) {
 
 
 if(! function_exists('home_content')) {
-function home_content(&$a) {
+function home_content(App &$a) {
 
 	$o = '';
 

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');

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";
 }

mod/ignored.php

@@ -1,7 +1,7 @@
 <?php
 
 
-function ignored_init(&$a) {
+function ignored_init(App &$a) {
 
 	$ignored = 0;
 

mod/install.php

@@ -4,7 +4,7 @@ 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") {
@@ -25,7 +25,7 @@ function install_init(&$a){
 
 }
 
-function install_post(&$a) {
+function install_post(App &$a) {
 	global $install_wizard_pass, $db;
 
 	switch($install_wizard_pass) {
@@ -131,7 +131,7 @@ function get_db_errno() {
 		return mysql_errno();
 }
 
-function install_content(&$a) {
+function install_content(App &$a) {
 
 	global $install_wizard_pass, $db;
 	$o = '';
@@ -560,7 +560,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>";

mod/invite.php

@@ -9,7 +9,7 @@
 
 require_once('include/email.php');
 
-function invite_post(&$a) {
+function invite_post(App &$a) {
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
@@ -95,7 +95,7 @@ function invite_post(&$a) {
 }
 
 
-function invite_content(&$a) {
+function invite_content(App &$a) {
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);

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;
@@ -1065,7 +1065,7 @@ function item_post_return($baseurl, $api_source, $return_path) {
 
 
 
-function item_content(&$a) {
+function item_content(App &$a) {
 
 	if((! local_user()) && (! remote_user()))
 		return;

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;
 	}

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';

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)) {

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'))

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)
@@ -77,7 +77,7 @@ function lostpass_post(&$a) {
 }
 
 
-function lostpass_content(&$a) {
+function lostpass_content(App &$a) {
 
 
 	if(x($_GET,'verify')) {

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');

mod/manage.php

@@ -3,7 +3,7 @@
 require_once("include/text.php");
 
 
-function manage_post(&$a) {
+function manage_post(App &$a) {
 
 	if(! local_user())
 		return;
@@ -91,7 +91,7 @@ function manage_post(&$a) {
 
 
 
-function manage_content(&$a) {
+function manage_content(App &$a) {
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);

mod/match.php

@@ -13,7 +13,7 @@ require_once('mod/proxy.php');
  * @param App &$a
  * @return void|string
  */
-function match_content(&$a) {
+function match_content(App &$a) {
 
 	$o = '';
 	if(! local_user())

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 = '';
 
@@ -40,7 +40,7 @@ function message_init(&$a) {
 
 }
 
-function message_post(&$a) {
+function message_post(App &$a) {
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
@@ -173,7 +173,7 @@ function item_redir_and_replace_images($body, $images, $cid) {
 
 
 
-function message_content(&$a) {
+function message_content(App &$a) {
 
 	$o = '';
 	nav_set_selected('messages');
@@ -364,7 +364,7 @@ function message_content(&$a) {
 
 	$_SESSION['return_url'] = $a->query_string;
 
-	if($a->argc == 1) {
+	if ($a->argc == 1) {
 
 		// List messages
 

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();

mod/mood.php

@@ -5,7 +5,7 @@ require_once('include/bbcode.php');
 require_once('include/items.php');
 
 
-function mood_init(&$a) {
+function mood_init(App &$a) {
 
 	if(! local_user())
 		return;
@@ -108,7 +108,7 @@ function mood_init(&$a) {
 
 
 
-function mood_content(&$a) {
+function mood_content(App &$a) {
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);

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);

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);
 

mod/network.php

@@ -1,5 +1,5 @@
 <?php
-function network_init(&$a) {
+function network_init(App &$a) {
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
@@ -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])) {
@@ -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">';

mod/newmember.php

@@ -1,6 +1,6 @@
 <?php
 
-function newmember_content(&$a) {
+function newmember_content(App &$a) {
 
 
 	$o = '<h1>' . t('Welcome to Friendica') . '</h1>';

mod/nodeinfo.php

@@ -7,7 +7,7 @@
 
 require_once("include/plugin.php");
 
-function nodeinfo_wellknown(&$a) {
+function nodeinfo_wellknown(App &$a) {
 	if (!get_config("system", "nodeinfo")) {
 		http_status_exit(404);
 		killme();
@@ -20,7 +20,7 @@ function nodeinfo_wellknown(&$a) {
 	exit;
 }
 
-function nodeinfo_init(&$a){
+function nodeinfo_init(App &$a){
 	if (!get_config("system", "nodeinfo")) {
 		http_status_exit(404);
 		killme();

mod/nogroup.php

@@ -4,7 +4,7 @@ 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())
 		return;
@@ -19,7 +19,7 @@ function nogroup_init(&$a) {
 }
 
 
-function nogroup_content(&$a) {
+function nogroup_content(App &$a) {
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);

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];

mod/notes.php

@@ -1,6 +1,6 @@
 <?php
 
-function notes_init(&$a) {
+function notes_init(App &$a) {
 
 	if(! local_user())
 		return;

mod/notice.php

@@ -1,7 +1,7 @@
 <?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)

mod/notifications.php

@@ -9,7 +9,7 @@ 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()) {
 		goaway(z_root());
@@ -65,7 +65,7 @@ function notifications_post(&$a) {
 	}
 }
 
-function notifications_content(&$a) {
+function notifications_content(App &$a) {
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);

mod/notify.php

@@ -2,7 +2,7 @@
 require_once('include/NotificationsManager.php');
 
 
-function notify_init(&$a) {
+function notify_init(App &$a) {
 	if(! local_user()) return;
 	$nm = new NotificationsManager();
 		
@@ -36,7 +36,7 @@ function notify_init(&$a) {
 
 }
 
-function notify_content(&$a) {
+function notify_content(App &$a) {
 	if(! local_user()) return login();
 
 	$nm = new NotificationsManager();

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'){

mod/oexchange.php

@@ -1,7 +1,7 @@
 <?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');
@@ -14,7 +14,7 @@ function oexchange_init(&$a) {
 
 }
 
-function oexchange_content(&$a) {
+function oexchange_content(App &$a) {
 
 	if(! local_user()) {
 		$o = login(false);

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)

mod/opensearch.php

@@ -1,5 +1,5 @@
 <?php
-    function opensearch_content(&$a) {
+    function opensearch_content(App &$a) {
     	
 		$tpl = get_markup_template('opensearch.tpl');
 	

mod/ostatus_subscribe.php

@@ -3,7 +3,7 @@
 require_once('include/Scrape.php');
 require_once('include/follow.php');
 
-function ostatus_subscribe_content(&$a) {
+function ostatus_subscribe_content(App &$a) {
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);

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 = "";

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;

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);
 
@@ -928,7 +928,7 @@ function photos_post(&$a) {
 
 
 
-function photos_content(&$a) {
+function photos_content(App &$a) {
 
 	// URLs:
 	// photos/name

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;

mod/poke.php

@@ -19,7 +19,7 @@ require_once('include/bbcode.php');
 require_once('include/items.php');
 
 
-function poke_init(&$a) {
+function poke_init(App &$a) {
 
 	if(! local_user())
 		return;
@@ -144,7 +144,7 @@ function poke_init(&$a) {
 
 
 
-function poke_content(&$a) {
+function poke_content(App &$a) {
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);

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 {

mod/pretheme.php

@@ -1,6 +1,6 @@
 <?php
 
-function pretheme_init(&$a) {
+function pretheme_init(App &$a) {
 	
 	if($_REQUEST['theme']) {
 		$theme = $_REQUEST['theme'];

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>';
 

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'] = '';

mod/profile_photo.php

@@ -2,7 +2,7 @@
 
 require_once("include/Photo.php");
 
-function profile_photo_init(&$a) {
+function profile_photo_init(App &$a) {
 
 	if(! local_user()) {
 		return;
@@ -13,7 +13,7 @@ function profile_photo_init(&$a) {
 }
 
 
-function profile_photo_post(&$a) {
+function profile_photo_post(App &$a) {
 
 	if(! local_user()) {
 		notice ( t('Permission denied.') . EOL );
@@ -169,7 +169,7 @@ 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()) {
 		notice( t('Permission denied.') . EOL );

mod/profiles.php

@@ -2,7 +2,7 @@
 require_once("include/Contact.php");
 require_once('include/Probe.php');
 
-function profiles_init(&$a) {
+function profiles_init(App &$a) {
 
 	nav_set_selected('profiles');
 
@@ -160,7 +160,7 @@ function profile_clean_keywords($keywords) {
 	return $keywords;
 }
 
-function profiles_post(&$a) {
+function profiles_post(App &$a) {
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
@@ -599,7 +599,7 @@ function profile_activity($changed, $value) {
 }
 
 
-function profiles_content(&$a) {
+function profiles_content(App &$a) {
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);

mod/profperm.php

@@ -1,6 +1,6 @@
 <?php
 
-function profperm_init(&$a) {
+function profperm_init(App &$a) {
 
 	if(! local_user())
 		return;
@@ -13,7 +13,7 @@ function profperm_init(&$a) {
 }
 
 
-function profperm_content(&$a) {
+function profperm_content(App &$a) {
 
 	if(! local_user()) {
 		notice( t('Permission denied') . EOL);

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 );
@@ -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');
 

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')) {

mod/qsearch.php

@@ -1,6 +1,6 @@
 <?php
 
-function qsearch_init(&$a) {
+function qsearch_init(App &$a) {
 
 	if(! local_user())
 		killme();

mod/randprof.php

@@ -1,7 +1,7 @@
 <?php
 
 
-function randprof_init(&$a) {
+function randprof_init(App &$a) {
 	require_once('include/Contact.php');
 	$x = random_profile();
 	if($x)