Merge pull request #3079 from Hypolite/issue/#3039-mod-3of3

Normalize App parameter declaration (mod folder, 3 out of 3)

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

diff --git a/mod/profperm.php b/mod/profperm.php
index bbb055b021c382e639dd5e50d20cb5b29419bd70..a414d8947bf35369a819b9966239585468889b59 100644 (file)
--- a/mod/profperm.php
+++ b/mod/profperm.php
@@ -1,6 +1,6 @@
 <?php
 
-function profperm_init(App &$a) {
+function profperm_init(App $a) {
 
        if (! local_user()) {
                return;
@@ -14,7 +14,7 @@ function profperm_init(App &$a) {
 }
 
 
-function profperm_content(App &$a) {
+function profperm_content(App $a) {
 
        if (! local_user()) {
                notice( t('Permission denied') . EOL);
@@ -109,9 +109,9 @@ function profperm_content(App &$a) {
        }
 
        $o .= '<div id="prof-update-wrapper">';
-       if($change) 
+       if($change)
                $o = '';
-       
+
        $o .= '<div id="prof-members-title">';
        $o .= '<h3>' . t('Visible To') . '</h3>';
        $o .= '</div>';

diff --git a/mod/pubsub.php b/mod/pubsub.php
index 308e237d5d55bbebe91e12e36a927184bfaf6177..2ba1958a25050cbce35e075d04d6081aa5d71907 100644 (file)
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -26,7 +26,7 @@ function hub_post_return() {
 
 
 
-function pubsub_init(App &$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 );
@@ -57,7 +57,7 @@ function pubsub_init(App &$a) {
 
                $sql_extra = ((strlen($hub_verify)) ? sprintf(" AND `hub-verify` = '%s' ", dbesc($hub_verify)) : '');
 
-               $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d 
+               $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d
                        AND `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1",
                        intval($contact_id),
                        intval($owner['uid'])
@@ -75,7 +75,7 @@ function pubsub_init(App &$a) {
 
                $contact = $r[0];
 
-               // We must initiate an unsubscribe request with a verify_token. 
+               // We must initiate an unsubscribe request with a verify_token.
                // Don't allow outsiders to unsubscribe us.
 
                if($hub_mode === 'unsubscribe') {
@@ -98,7 +98,7 @@ function pubsub_init(App &$a) {
 
 require_once('include/security.php');
 
-function pubsub_post(App &$a) {
+function pubsub_post(App $a) {
 
        $xml = file_get_contents('php://input');
 

diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php
index a6c36631aefa5fb77a6d383d2a39d1cff23156f3..dceb16ae1f260cf9415e9e7378e54582a35ee182 100644 (file)
--- 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(App &$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 118c93d9fa31a3d75d8508237a2f3869beed27e8..8512bea51e622aaf52ed1dd4d210b4f3815867dc 100644 (file)
--- a/mod/qsearch.php
+++ b/mod/qsearch.php
@@ -1,6 +1,6 @@
 <?php
 
-function qsearch_init(App &$a) {
+function qsearch_init(App $a) {
 
        if (! local_user()) {
                killme();

diff --git a/mod/randprof.php b/mod/randprof.php
index 08157a3851a40ff8bba7723112498a817c90de21..d8cffb380ccd46de6552fb72b12cd576b45de058 100644 (file)
--- a/mod/randprof.php
+++ b/mod/randprof.php
@@ -1,7 +1,7 @@
 <?php
 
 
-function randprof_init(App &$a) {
+function randprof_init(App $a) {
        require_once('include/Contact.php');
 
        $x = random_profile();

diff --git a/mod/receive.php b/mod/receive.php
index ec46ee742e24d3268d19f0cf68cc8d371c40b8e1..3563f2d705a487f23b7a3b3652bdf308957f62bb 100644 (file)
--- 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(App &$a) {
+function receive_post(App $a) {
 
 
        $enabled = intval(get_config('system','diaspora_enabled'));

diff --git a/mod/redir.php b/mod/redir.php
index e951b2d2a9871251c7256ccff4b7f60b8c5e7206..12f53900a7528c8826788aad408b384c23f4d176 100644 (file)
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -1,6 +1,6 @@
 <?php
 
-function redir_init(App &$a) {
+function redir_init(App $a) {
 
        $url = ((x($_GET,'url')) ? $_GET['url'] : '');
        $quiet = ((x($_GET,'quiet')) ? '&quiet=1' : '');
@@ -57,9 +57,9 @@ function redir_init(App &$a) {
                        intval(time() + 45)
                );
 
-               logger('mod_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG); 
+               logger('mod_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG);
                $dest = (($url) ? '&destination_url=' . $url : '');
-               goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id 
+               goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id
                        . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest . $quiet );
        }
 

diff --git a/mod/register.php b/mod/register.php
index dd953de35619119cb7a7d898a4e11f974bec9452..81e8c3ad83927c03bd06fdc6a175eadf7d7c6838 100644 (file)
--- 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(App &$a) {
+function register_post(App $a) {
 
        global $lang;
 
@@ -172,7 +172,7 @@ function register_post(App &$a) {
 
 
 if(! function_exists('register_content')) {
-function register_content(App &$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 44bdfe66449029aa9bc1b6380afcb44f8ff6fa10..1983ca0899ddbf0608b43bcccb601046c355d44b 100644 (file)
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -97,7 +97,7 @@ function user_deny($hash) {
 
 }
 
-function regmod_content(App &$a) {
+function regmod_content(App $a) {
 
        global $lang;
 

diff --git a/mod/removeme.php b/mod/removeme.php
index 4257667c4b1bf663325cbc2e4fdbe1950a2456a9..40033624d8889ac330a8be2c7f725febef8e2cfc 100644 (file)
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -1,6 +1,6 @@
 <?php
 
-function removeme_post(App &$a) {
+function removeme_post(App $a) {
 
        if (! local_user()) {
                return;
@@ -32,7 +32,7 @@ function removeme_post(App &$a) {
 
 }
 
-function removeme_content(App &$a) {
+function removeme_content(App $a) {
 
        if (! local_user()) {
                goaway(z_root());

diff --git a/mod/repair_ostatus.php b/mod/repair_ostatus.php
index 07721220a087150f14a42bedb3d60235381e4c4e..3e9130e0e8e42a233b5bd5090a383adc3ff599ff 100755 (executable)
--- a/mod/repair_ostatus.php
+++ b/mod/repair_ostatus.php
@@ -3,7 +3,7 @@
 require_once('include/Scrape.php');
 require_once('include/follow.php');
 
-function repair_ostatus_content(App &$a) {
+function repair_ostatus_content(App $a) {
 
        if (! local_user()) {
                notice( t('Permission denied.') . EOL);

diff --git a/mod/rsd_xml.php b/mod/rsd_xml.php
index 13c84c3fcc47049e4367803bc12590d768488c80..3b74a143df7d9b32394b81f92d73ce4b2f1ebf85 100644 (file)
--- a/mod/rsd_xml.php
+++ b/mod/rsd_xml.php
@@ -2,7 +2,7 @@
 
 
 
-function rsd_xml_content(App &$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">

diff --git a/mod/salmon.php b/mod/salmon.php
index 6c3aea211447f4676229f349cd9352dca1be3cfb..69809f5234fe9007ac4f979039a48f6d242a0d7b 100644 (file)
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -19,7 +19,7 @@ function salmon_return($val) {
 
 }
 
-function salmon_post(App &$a) {
+function salmon_post(App $a) {
 
        $xml = file_get_contents('php://input');
 
@@ -156,7 +156,7 @@ function salmon_post(App &$a) {
                if(get_pconfig($importer['uid'],'system','ostatus_autofriend')) {
                        $result = new_contact($importer['uid'],$author_link);
                        if($result['success']) {
-                               $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s') 
+                               $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s')
                                        AND `uid` = %d LIMIT 1",
                                        dbesc(NETWORK_OSTATUS),
                                        dbesc($author_link),

diff --git a/mod/search.php b/mod/search.php
index 22879f7f9e6aea569db9d61fe493ca1b7c864bf6..df604e367c7724a46118dec997da42e1183b5fce 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -43,7 +43,7 @@ function search_saved_searches() {
 }
 
 
-function search_init(App &$a) {
+function search_init(App $a) {
 
        $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
@@ -81,13 +81,13 @@ function search_init(App &$a) {
 
 
 
-function search_post(App &$a) {
+function search_post(App $a) {
        if(x($_POST,'search'))
                $a->data['search'] = $_POST['search'];
 }
 
 
-function search_content(App &$a) {
+function search_content(App $a) {
 
        if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
                notice( t('Public access denied.') . EOL);

diff --git a/mod/session.php b/mod/session.php
index 22c855edba6dcd0168608e98ff69f1889c2dbc5e..a73bcc78fabce3938c021534d5c20c8e52f03873 100644 (file)
--- a/mod/session.php
+++ b/mod/session.php
@@ -1,5 +1,5 @@
 <?php
 
-function session_content(&$a) {
+function session_content(App $a) {
 
 }

diff --git a/mod/settings.php b/mod/settings.php
index 1fbd24325d14d23bed3b66e5483e7709d7520532..32ccaf541af0aa738469642a3274049b6d6f1d06 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -16,7 +16,7 @@ function get_theme_config_file($theme){
        return null;
 }
 
-function settings_init(App &$a) {
+function settings_init(App $a) {
 
        if (! local_user()) {
                notice( t('Permission denied.') . EOL );
@@ -116,7 +116,7 @@ function settings_init(App &$a) {
 }
 
 
-function settings_post(App &$a) {
+function settings_post(App $a) {
 
        if (! local_user()) {
                return;
@@ -654,7 +654,7 @@ function settings_post(App &$a) {
 }
 
 
-function settings_content(App &$a) {
+function settings_content(App $a) {
 
        $o = '';
        nav_set_selected('settings');

diff --git a/mod/share.php b/mod/share.php
index f2e016708fef321a74937e3c8c9be93e5ba87401..928ccdef263efc45b7f24f66c6c8c123f945888a 100644 (file)
--- a/mod/share.php
+++ b/mod/share.php
@@ -1,12 +1,12 @@
 <?php
-function share_init(App &$a) {
+function share_init(App $a) {
 
        $post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);
        if((! $post_id) || (! local_user()))
                killme();
 
-       $r = q("SELECT item.*, contact.network FROM `item` 
-               inner join contact on `item`.`contact-id` = `contact`.`id` 
+       $r = q("SELECT item.*, contact.network FROM `item`
+               inner join contact on `item`.`contact-id` = `contact`.`id`
                WHERE `item`.`id` = %d AND `item`.`uid` = %d LIMIT 1",
 
                intval($post_id),

diff --git a/mod/smilies.php b/mod/smilies.php
index 8e04d5d054497ef2b42cb3c742b52b9cdbaba82a..4d8ab6bcaa55fcdb3dbd2d1929efc01a8296fd63 100644 (file)
--- a/mod/smilies.php
+++ b/mod/smilies.php
@@ -6,7 +6,7 @@
 
 require_once("include/Smilies.php");
 
-function smilies_content(App &$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 c23b07b8b595b22757b0fd1a0c7f31f4eed5ac3c..46d3fcff66835644c0b802bfb98db8a8d3a06edf 100644 (file)
--- a/mod/starred.php
+++ b/mod/starred.php
@@ -1,7 +1,7 @@
 <?php
 
 
-function starred_init(App &$a) {
+function starred_init(App $a) {
 
        require_once("include/threads.php");
 

diff --git a/mod/statistics_json.php b/mod/statistics_json.php
index 2f2adaafe7980c40e564bfc7e8499bae4a2e3af8..07444d2bb525f7facb01e51ba9f77ce6146fde7d 100644 (file)
--- a/mod/statistics_json.php
+++ b/mod/statistics_json.php
@@ -5,7 +5,7 @@
 
 require_once("include/plugin.php");
 
-function statistics_json_init(App &$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 c689f7f6cb57c50e089212e12cc784a8b3aba53a..646a4230c5f486819100624ddf754231b52814d1 100644 (file)
--- 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(App &$a) {
+function subthread_content(App $a) {
 
        if(! local_user() && ! remote_user()) {
                return;
@@ -49,7 +49,7 @@ function subthread_content(App &$a) {
                }
        }
 
-       // this represents the post owner on this system. 
+       // this represents the post owner on this system.
 
        $r = q("SELECT `contact`.*, `user`.`nickname` FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
                WHERE `contact`.`self` = 1 AND `contact`.`uid` = %d LIMIT 1",

diff --git a/mod/suggest.php b/mod/suggest.php
index a6c4b6e5680219e549e0391048b0190c8d2b7634..dd24fc0a2a3a01a120557f7bf659d638c30440cf 100644 (file)
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -3,7 +3,7 @@
 require_once('include/socgraph.php');
 require_once('include/contact_widgets.php');
 
-function suggest_init(App &$a) {
+function suggest_init(App $a) {
        if (! local_user()) {
                return;
        }
@@ -49,7 +49,7 @@ function suggest_init(App &$a) {
 
 
 
-function suggest_content(App &$a) {
+function suggest_content(App $a) {
 
        require_once("mod/proxy.php");
 

diff --git a/mod/tagger.php b/mod/tagger.php
index da5c4700f95a69a5adde0f87fd0f57c24ff3f9b1..50099ac69ca4e85627748c6b30736a3d4f4f5b32 100644 (file)
--- 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(App &$a) {
+function tagger_content(App $a) {
 
        if(! local_user() && ! remote_user()) {
                return;

diff --git a/mod/tagrm.php b/mod/tagrm.php
index 2a9a26e37bfd4ead658a459076ae082abfa8f4c9..2e7f8b97082436e8061998997f0150d666147fcb 100644 (file)
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
@@ -2,7 +2,7 @@
 
 require_once('include/bbcode.php');
 
-function tagrm_post(App &$a) {
+function tagrm_post(App $a) {
 
        if (! local_user()) {
                goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
@@ -42,14 +42,14 @@ function tagrm_post(App &$a) {
 
        info( t('Tag removed') . EOL );
        goaway(App::get_baseurl() . '/' . $_SESSION['photo_return']);
-       
+
        // NOTREACHED
 
 }
 
 
 
-function tagrm_content(App &$a) {
+function tagrm_content(App $a) {
 
        $o = '';
 

diff --git a/mod/toggle_mobile.php b/mod/toggle_mobile.php
index 89b73cd4484db62294a05c51724fee32f235f802..f858d8913e9c26fc2cea16a967439ca139560bf9 100644 (file)
--- a/mod/toggle_mobile.php
+++ b/mod/toggle_mobile.php
@@ -1,6 +1,6 @@
 <?php
 
-function toggle_mobile_init(App &$a) {
+function toggle_mobile_init(App $a) {
 
        if (isset($_GET['off'])) {
                $_SESSION['show-mobile'] = false;

diff --git a/mod/uexport.php b/mod/uexport.php
index 1ca046d22498860c323d3b1fc587ebf4c0bd0ff4..d886e13b27f115d06d8538854e83592cfa1c72b8 100644 (file)
--- a/mod/uexport.php
+++ b/mod/uexport.php
@@ -1,6 +1,6 @@
 <?php
 
-function uexport_init(App &$a){
+function uexport_init(App $a) {
        if (! local_user()) {
                killme();
        }
@@ -10,7 +10,7 @@ function uexport_init(App &$a){
 }
 
 /// @TODO Change space -> tab where wanted
-function uexport_content(App &$a){
+function uexport_content(App $a) {
 
     if ($a->argc > 1) {
         header("Content-type: application/json");
@@ -124,7 +124,7 @@ function uexport_account($a){
 /**
  * echoes account data and items as separated json, one per line
  */
-function uexport_all(App &$a) {
+function uexport_all(App $a) {
 
        uexport_account($a);
        echo "\n";

diff --git a/mod/uimport.php b/mod/uimport.php
index 15bc8322b97fdd3337c0293580e0f64cea59101a..e9934393e8a29e41435d32453f709124bbd872a0 100644 (file)
--- a/mod/uimport.php
+++ b/mod/uimport.php
@@ -6,7 +6,7 @@
 \r
 require_once("include/uimport.php");\r
 \r
-function uimport_post(App &$a) {\r
+function uimport_post(App $a) {\r
        switch($a->config['register_policy']) {\r
         case REGISTER_OPEN:\r
             $blocked = 0;\r
@@ -28,7 +28,7 @@ function uimport_post(App &$a) {
             $verified = 0;\r
             break;\r
        }\r
-    \r
+\r
     if (x($_FILES,'accountfile')){\r
         /// @TODO Pass $blocked / $verified, send email to admin on REGISTER_APPROVE\r
         import_account($a, $_FILES['accountfile']);\r
@@ -36,8 +36,8 @@ function uimport_post(App &$a) {
     }\r
 }\r
 \r
-function uimport_content(App &$a) {\r
-       \r
+function uimport_content(App $a) {\r
+\r
        if((! local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) {\r
                notice("Permission denied." . EOL);\r
                return;\r
@@ -52,8 +52,8 @@ function uimport_content(App &$a) {
                        return;\r
                }\r
        }\r
-       \r
-       \r
+\r
+\r
        if(x($_SESSION,'theme'))\r
                unset($_SESSION['theme']);\r
        if(x($_SESSION,'mobile-theme'))\r

diff --git a/mod/update_community.php b/mod/update_community.php
index 179e9c61c4d991fdb457803a963caf027c98022e..9a39489dcfb822a39143b235b506a0d8c3905fec 100644 (file)
--- a/mod/update_community.php
+++ b/mod/update_community.php
@@ -4,7 +4,7 @@
 
 require_once("mod/community.php");
 
-function update_community_content(App &$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 230bbaa0b460d20cdabfb28e4ce5760f7a9b8019..86f4db8259f83c4db9fdd580666c91da42060c16 100644 (file)
--- 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(App &$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 c6d33132cc7557d33eae48a3681c0f8ac713efce..869973ace4f07af1b8c2750103849a36f6f85f5d 100644 (file)
--- 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(App &$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 b21f698054b9fa3d92f9bdd2ba1ae2280ff5517e..d27cc4ca9672bfcfe1007b2289bfd9bcb14dc71c 100644 (file)
--- a/mod/update_notes.php
+++ b/mod/update_notes.php
@@ -7,7 +7,7 @@
 
 require_once("mod/notes.php");
 
-function update_notes_content(App &$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 e16b0b5cccbe58126ca678c126aaefeba60ce7f7..b77a9cdcfc5e4d40755c38bb22172364f9cdb7fb 100644 (file)
--- a/mod/update_profile.php
+++ b/mod/update_profile.php
@@ -7,7 +7,7 @@
 
 require_once("mod/profile.php");
 
-function update_profile_content(App &$a) {
+function update_profile_content(App $a) {
 
        $profile_uid = intval($_GET["p"]);
 

diff --git a/mod/videos.php b/mod/videos.php
index 433ce5fc63f82e2e150b7b7c9ce87325553ba50e..3828b8f1fefb649df1a5973261639dac46636b10 100644 (file)
--- 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(App &$a) {
+function videos_init(App $a) {
 
        if($a->argc > 1)
                auto_redir($a, $a->argv[1]);
@@ -102,7 +102,7 @@ function videos_init(App &$a) {
 
 
 
-function videos_post(App &$a) {
+function videos_post(App $a) {
 
        $owner_uid = $a->data['user']['uid'];
 
@@ -182,7 +182,7 @@ function videos_post(App &$a) {
 
 
 
-function videos_content(App &$a) {
+function videos_content(App $a) {
 
        // URLs (most aren't currently implemented):
        // videos/name

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index 9c72a46e9c7c2437ea41784c0e16696f819a6d91..55afda9b635f0840597e18423709b33a756e4b15 100644 (file)
--- 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(App &$a) {
+function viewcontacts_init(App $a) {
 
        if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
                return;
@@ -29,7 +29,7 @@ function viewcontacts_init(App &$a) {
 }
 
 
-function viewcontacts_content(App &$a) {
+function viewcontacts_content(App $a) {
        require_once("mod/proxy.php");
 
        if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {

diff --git a/mod/viewsrc.php b/mod/viewsrc.php
index 8510bd539573ac72ebbd07b1636b53ad06bb61ce..a3f0affb531971cfc1eb63e06fd02d073ce34b74 100644 (file)
--- a/mod/viewsrc.php
+++ b/mod/viewsrc.php
@@ -1,7 +1,7 @@
 <?php
 
 
-function viewsrc_content(App &$a) {
+function viewsrc_content(App $a) {
 
        if (! local_user()) {
                notice( t('Access denied.') . EOL);
@@ -16,7 +16,7 @@ function viewsrc_content(App &$a) {
                return;
        }
 
-       $r = q("SELECT `item`.`body` FROM `item` 
+       $r = q("SELECT `item`.`body` FROM `item`
                WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
                and `item`.`moderated` = 0
                AND `item`.`id` = '%s' LIMIT 1",

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 5a74717825273254f119cc0f22374510e2471f65..0fc8b8a6a3aae79a60dc1bf70459de1bde6bed01 100644 (file)
--- 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(App &$a) {
+function wall_attach_post(App $a) {
 
        $r_json = (x($_GET,'response') && $_GET['response']=='json');
 

diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index c789262c648b4175e018078f4d4798e41b091f50..82cd3652b3f2549a4b24063eaeaba94a60ed447e 100644 (file)
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -2,7 +2,7 @@
 
 require_once('include/Photo.php');
 
-function wall_upload_post(&$a, $desktopmode = true) {
+function wall_upload_post(App $a, $desktopmode = true) {
 
        logger("wall upload: starting new upload", LOGGER_DEBUG);
 

diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index e0c702cdb0ca45abfcb9e1cdd96e405c058325a1..c0a30bdcf4cc8efc0811cc4c2ffbe8e1052dff78 100644 (file)
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -2,7 +2,7 @@
 
 require_once('include/message.php');
 
-function wallmessage_post(App &$a) {
+function wallmessage_post(App $a) {
 
        $replyto = get_my_url();
        if(! $replyto) {
@@ -73,7 +73,7 @@ function wallmessage_post(App &$a) {
 }
 
 
-function wallmessage_content(App &$a) {
+function wallmessage_content(App $a) {
 
        if(! get_my_url()) {
                notice( t('Permission denied.') . EOL);
@@ -134,9 +134,9 @@ function wallmessage_content(App &$a) {
                '$nickname' => $user['nickname'],
                '$linkurl' => t('Please enter a link URL:')
        ));
-       
 
-       
+
+
        $tpl = get_markup_template('wallmessage.tpl');
        $o .= replace_macros($tpl,array(
                '$header' => t('Send Private Message'),

diff --git a/mod/webfinger.php b/mod/webfinger.php
index f08451ba70446d380b75170c04272f721594d13e..eee0580e3178c8b8a492ecf73fcbd1c718bb82fa 100644 (file)
--- a/mod/webfinger.php
+++ b/mod/webfinger.php
@@ -1,7 +1,7 @@
 <?php
 require_once("include/Probe.php");
 
-function webfinger_content(App &$a) {
+function webfinger_content(App $a) {
 
        $o .= '<h3>Webfinger Diagnostic</h3>';
 

diff --git a/mod/xrd.php b/mod/xrd.php
index a56c7fbdffaa0503a971fd3891a6de7b76960e28..7b812a7f9d94610d804515ba2e454cdf855762b0 100644 (file)
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -2,7 +2,7 @@
 
 require_once('include/crypto.php');
 
-function xrd_init(App &$a) {
+function xrd_init(App $a) {
 
        $uri = urldecode(notags(trim($_GET['uri'])));