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

diff --git a/mod/hovercard.php b/mod/hovercard.php
index 553d5d2232f9116559b4f397c9ab01c112793599..ec749db2088fbcfa1816185a0e198debd679e086 100644 (file)
--- 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(App &$a) {
+function hovercard_init(App $a) {
        // Just for testing purposes
        $_GET["mode"] = "minimal";
 }
@@ -96,10 +96,10 @@ function hovercard_content() {
 
 /**
  * @brief Get the raw content of a template file
- * 
+ *
  * @param string $template The name of the template
  * @param string $root Directory of the template
- * 
+ *
  * @return string|bool Output the raw content if existent, otherwise false
  */
 function get_template_content($template, $root = "") {

diff --git a/mod/ignored.php b/mod/ignored.php
index 99b3a3ddcca3c486420d860336b0eeb5891f8734..0065d51c58e3b8386b53ac93ea095d1ceca5b76d 100644 (file)
--- a/mod/ignored.php
+++ b/mod/ignored.php
@@ -1,7 +1,7 @@
 <?php
 
 
-function ignored_init(App &$a) {
+function ignored_init(App $a) {
 
        $ignored = 0;
 

diff --git a/mod/install.php b/mod/install.php
index 382fcefd76a7564401fc16d3011fd10b0c9c9fa2..106ba684ff10b0999f5ff7d4c45f0688ec2d5d4a 100755 (executable)
--- a/mod/install.php
+++ b/mod/install.php
@@ -4,7 +4,7 @@ require_once "include/Photo.php";
 $install_wizard_pass=1;
 
 
-function install_init(App &$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") {
@@ -24,7 +24,7 @@ function install_init(App &$a){
 
 }
 
-function install_post(App &$a) {
+function install_post(App $a) {
        global $install_wizard_pass, $db;
 
        switch($install_wizard_pass) {
@@ -132,7 +132,7 @@ function get_db_errno() {
        }
 }
 
-function install_content(App &$a) {
+function install_content(App $a) {
 
        global $install_wizard_pass, $db;
        $o = '';
@@ -565,7 +565,7 @@ function check_imagik(&$checks) {
        }
 }
 
-function manual_config(App &$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>";

diff --git a/mod/invite.php b/mod/invite.php
index a7739fc774bf9b4b3fd812921f068ff0e942876b..f5c60e1ed393713c30e87c7f526492f135cb3ddd 100644 (file)
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -9,7 +9,7 @@
 
 require_once('include/email.php');
 
-function invite_post(App &$a) {
+function invite_post(App $a) {
 
        if (! local_user()) {
                notice( t('Permission denied.') . EOL);
@@ -73,8 +73,8 @@ function invite_post(App &$a) {
                        $nmessage = $message;
                }
 
-               $res = mail($recip, email_header_encode( t('Please join us on Friendica'),'UTF-8'), 
-                       $nmessage, 
+               $res = mail($recip, email_header_encode( t('Please join us on Friendica'),'UTF-8'),
+                       $nmessage,
                        "From: " . $a->user['email'] . "\n"
                        . 'Content-type: text/plain; charset=UTF-8' . "\n"
                        . 'Content-transfer-encoding: 8bit' );
@@ -97,7 +97,7 @@ function invite_post(App &$a) {
 }
 
 
-function invite_content(App &$a) {
+function invite_content(App $a) {
 
        if (! local_user()) {
                notice( t('Permission denied.') . EOL);
@@ -136,7 +136,7 @@ function invite_content(App &$a) {
                '$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" . (($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" . 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')

diff --git a/mod/item.php b/mod/item.php
index 1c7a970c2da2eda04026e624bbdc35494ab826ad..c9306c523adf8708f62802632e25f1db7dfad306 100644 (file)
--- 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(App &$a) {
+function item_post(App $a) {
 
        if((! local_user()) && (! remote_user()) && (! x($_REQUEST,'commenter')))
                return;
@@ -1066,7 +1066,7 @@ function item_post_return($baseurl, $api_source, $return_path) {
 
 
 
-function item_content(App &$a) {
+function item_content(App $a) {
 
        if ((! local_user()) && (! remote_user())) {
                return;

diff --git a/mod/like.php b/mod/like.php
index ff1e238ac180b9c104f1b2a85c630fac3842b275..1f6a233f3dc26599f8a37152ea71f0fef276952b 100755 (executable)
--- 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(App &$a) {
+function like_content(App $a) {
        if(! local_user() && ! remote_user()) {
                return false;
        }

diff --git a/mod/localtime.php b/mod/localtime.php
index 00a7c59094ef6313ecf992476fe9be37e4235e20..535308903153af6d3cf81ef4d310ccc8705034db 100644 (file)
--- a/mod/localtime.php
+++ b/mod/localtime.php
@@ -3,7 +3,7 @@
 require_once('include/datetime.php');
 
 
-function localtime_post(App &$a) {
+function localtime_post(App $a) {
 
        $t = $_REQUEST['time'];
        if(! $t)
@@ -16,7 +16,7 @@ function localtime_post(App &$a) {
 
 }
 
-function localtime_content(App &$a) {
+function localtime_content(App $a) {
        $t = $_REQUEST['time'];
        if(! $t)
                $t = 'now';
@@ -38,7 +38,7 @@ function localtime_content(App &$a) {
 
        $o .= '<form action ="' . App::get_baseurl() . '/localtime?f=&time=' . $t . '" method="post" >';
 
-       $o .= '<p>' . t('Please select your timezone:') . '</p>'; 
+       $o .= '<p>' . t('Please select your timezone:') . '</p>';
 
        $o .= select_timezone(($_REQUEST['timezone']) ? $_REQUEST['timezone'] : 'America/Los_Angeles');
 

diff --git a/mod/lockview.php b/mod/lockview.php
index 746df28cd9478bbbef134dbbe8a797c3c8a0750c..38a308634e772467381468fe322dd76840cd980a 100644 (file)
--- a/mod/lockview.php
+++ b/mod/lockview.php
@@ -1,8 +1,8 @@
 <?php
 
 
-function lockview_content(App &$a) {
-  
+function lockview_content(App $a) {
+
        $type = (($a->argc > 1) ? $a->argv[1] : 0);
        if (is_numeric($type)) {
                $item_id = intval($type);
@@ -10,13 +10,13 @@ function lockview_content(App &$a) {
        } else {
                $item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
        }
-  
+
        if(! $item_id)
                killme();
 
        if (!in_array($type, array('item','photo','event')))
                killme();
-     
+
        $r = q("SELECT * FROM `%s` WHERE `id` = %d LIMIT 1",
                dbesc($type),
                intval($item_id)
@@ -34,7 +34,7 @@ function lockview_content(App &$a) {
        }
 
 
-       if(($item['private'] == 1) && (! strlen($item['allow_cid'])) && (! strlen($item['allow_gid'])) 
+       if(($item['private'] == 1) && (! strlen($item['allow_cid'])) && (! strlen($item['allow_gid']))
                && (! strlen($item['deny_cid'])) && (! strlen($item['deny_gid']))) {
 
                echo t('Remote privacy information not available.') . '<br />';
@@ -54,7 +54,7 @@ function lockview_content(App &$a) {
                        dbesc(implode(', ', $allowed_groups))
                );
                if (dbm::is_result($r))
-                       foreach($r as $rr) 
+                       foreach($r as $rr)
                                $l[] = '<b>' . $rr['name'] . '</b>';
        }
        if(count($allowed_users)) {
@@ -62,7 +62,7 @@ function lockview_content(App &$a) {
                        dbesc(implode(', ',$allowed_users))
                );
                if (dbm::is_result($r))
-                       foreach($r as $rr) 
+                       foreach($r as $rr)
                                $l[] = $rr['name'];
 
        }
@@ -72,7 +72,7 @@ function lockview_content(App &$a) {
                        dbesc(implode(', ', $deny_groups))
                );
                if (dbm::is_result($r))
-                       foreach($r as $rr) 
+                       foreach($r as $rr)
                                $l[] = '<b><strike>' . $rr['name'] . '</strike></b>';
        }
        if(count($deny_users)) {
@@ -80,7 +80,7 @@ function lockview_content(App &$a) {
                        dbesc(implode(', ',$deny_users))
                );
                if (dbm::is_result($r))
-                       foreach($r as $rr) 
+                       foreach($r as $rr)
                                $l[] = '<strike>' . $rr['name'] . '</strike>';
 
        }

diff --git a/mod/login.php b/mod/login.php
index db49ba20ac50dda49c9e53b8f5e3de734c9efb50..8fd28c72304c9015a3261635d7a2dd5b558026e7 100644 (file)
--- a/mod/login.php
+++ b/mod/login.php
@@ -1,6 +1,6 @@
 <?php
 
-function login_content(App &$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 f9e9400fc2caf47318c49be9babe156a5f3a159e..455a9b1e2eed697580cd17fb8e4dcfe2b53da43d 100644 (file)
--- 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(App &$a) {
+function lostpass_post(App $a) {
 
        $loginame = notags(trim($_POST['login-name']));
        if(! $loginame)
@@ -77,7 +77,7 @@ function lostpass_post(App &$a) {
 }
 
 
-function lostpass_content(App &$a) {
+function lostpass_content(App $a) {
 
 
        if(x($_GET,'verify')) {

diff --git a/mod/maintenance.php b/mod/maintenance.php
index ce432f9307b4ba26c4c51fb9ab32f33a3b9e0417..dcdc44194ed9cb090a29a7169c49545d33c97844 100644 (file)
--- a/mod/maintenance.php
+++ b/mod/maintenance.php
@@ -1,6 +1,6 @@
 <?php
 
-function maintenance_content(App &$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 835a7fbcb7b781c0ad988692d3a2a702494417c8..4beb8e46c65384d545951fb39d7b72df37769dc6 100644 (file)
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -3,7 +3,7 @@
 require_once("include/text.php");
 
 
-function manage_post(App &$a) {
+function manage_post(App $a) {
 
        if (! local_user()) {
                return;
@@ -92,7 +92,7 @@ function manage_post(App &$a) {
 
 
 
-function manage_content(App &$a) {
+function manage_content(App $a) {
 
        if (! local_user()) {
                notice( t('Permission denied.') . EOL);

diff --git a/mod/match.php b/mod/match.php
index f7274e436666e727f0cd57c3d2c3c0964dfbf2a8..44f5141ad889e10df007195db88874743dfb1fff 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -10,10 +10,10 @@ require_once('mod/proxy.php');
  * It takes keywords from your profile and queries the directory server for
  * matching keywords from other profiles.
  *
- * @param App &$a
+ * @param App $a
  * @return void|string
  */
-function match_content(App &$a) {
+function match_content(App $a) {
 
        $o = '';
        if (! local_user()) {

diff --git a/mod/message.php b/mod/message.php
index 776a23bccdced6baec9f83b64185c860473ee9b8..5f5f9f98efbd8f432048fcf2dc1f7ec87a6f7d5d 100644 (file)
--- 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(App &$a) {
+function message_init(App $a) {
 
        $tabs = '';
 
@@ -40,7 +40,7 @@ function message_init(App &$a) {
 
 }
 
-function message_post(App &$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(App &$a) {
+function message_content(App $a) {
 
        $o = '';
        nav_set_selected('messages');

diff --git a/mod/modexp.php b/mod/modexp.php
index 5fc7012909e30b8a9380dd873cb66738abd2d005..4cc9522479c182767b60a013ade77205863f0287 100644 (file)
--- a/mod/modexp.php
+++ b/mod/modexp.php
@@ -2,7 +2,7 @@
 
 require_once('library/asn1.php');
 
-function modexp_init(App &$a) {
+function modexp_init(App $a) {
 
        if($a->argc != 2)
                killme();

diff --git a/mod/mood.php b/mod/mood.php
index 0e603c869a110e5155819b611a42c2bf58f4102c..e80a7f0976e6550ac60c20e6b48db9fe63856472 100644 (file)
--- a/mod/mood.php
+++ b/mod/mood.php
@@ -5,7 +5,7 @@ require_once('include/bbcode.php');
 require_once('include/items.php');
 
 
-function mood_init(App &$a) {
+function mood_init(App $a) {
 
        if (! local_user()) {
                return;
@@ -60,7 +60,7 @@ function mood_init(App &$a) {
 
        $uri = item_new_uri($a->get_hostname(),$uid);
 
-       $action = sprintf( t('%1$s is currently %2$s'), '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' , $verbs[$verb]); 
+       $action = sprintf( t('%1$s is currently %2$s'), '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' , $verbs[$verb]);
 
        $arr = array();
        $arr['guid']          = get_guid(32);
@@ -109,7 +109,7 @@ function mood_init(App &$a) {
 
 
 
-function mood_content(App &$a) {
+function mood_content(App $a) {
 
        if (! local_user()) {
                notice( t('Permission denied.') . EOL);

diff --git a/mod/msearch.php b/mod/msearch.php
index 4b5205ac0848d937fb9c1d337eeeeac8bcbf1a29..277242afff803f19eecc1241600f849b75ccafdf 100644 (file)
--- a/mod/msearch.php
+++ b/mod/msearch.php
@@ -1,6 +1,6 @@
 <?php
 
-function msearch_post(App &$a) {
+function msearch_post(App $a) {
 
        $perpage = (($_POST['n']) ? $_POST['n'] : 80);
        $page = (($_POST['p']) ? intval($_POST['p'] - 1) : 0);
@@ -28,8 +28,8 @@ function msearch_post(App &$a) {
        if (dbm::is_result($r)) {
                foreach($r as $rr)
                        $results[] = array(
-                               'name' => $rr['name'], 
-                               'url' => App::get_baseurl() . '/profile/' . $rr['nickname'], 
+                               'name' => $rr['name'],
+                               '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 d69c76a843513e810d10db9b31f10d72d14aed9d..be1b522e9cba1b20d851f1a0ceb03254230c9729 100644 (file)
--- a/mod/navigation.php
+++ b/mod/navigation.php
@@ -2,7 +2,7 @@
 
 require_once("include/nav.php");
 
-function navigation_content(App &$a) {
+function navigation_content(App $a) {
 
        $nav_info = nav_info($a);
 

diff --git a/mod/network.php b/mod/network.php
index 61df38fb12b69b4f2a75c2bf3dec1862b5a23b68..2f33c62f72ecb19e205f217b86a51b99ebec8aa9 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -1,5 +1,5 @@
 <?php
-function network_init(App &$a) {
+function network_init(App $a) {
        if (! local_user()) {
                notice( t('Permission denied.') . EOL);
                return;
@@ -221,7 +221,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(App &$a) {
+function network_query_get_sel_tab(App $a) {
        $no_active='';
        $starred_active = '';
        $new_active = '';
@@ -292,7 +292,7 @@ function network_query_get_sel_net() {
        return $network;
 }
 
-function network_query_get_sel_group(App &$a) {
+function network_query_get_sel_group(App $a) {
        $group = false;
 
        if($a->argc >= 2 && is_numeric($a->argv[1])) {
@@ -303,7 +303,7 @@ function network_query_get_sel_group(App &$a) {
 }
 
 
-function network_content(&$a, $update = 0) {
+function network_content(App $a, $update = 0) {
 
        require_once('include/conversation.php');
 
@@ -728,7 +728,7 @@ function network_content(&$a, $update = 0) {
                                        intval($parents),
                                        intval($max_comments + 1)
                                );
-       
+
                                if (dbm::is_result($thread_items))
                                        $items = array_merge($items, $thread_items);
                        }
@@ -805,11 +805,11 @@ function network_content(&$a, $update = 0) {
 
 /**
  * @brief Get the network tabs menu
- * 
+ *
  * @param app $a The global App
  * @return string Html of the networktab
  */
-function network_tabs(App &$a) {
+function network_tabs(App $a) {
        // item filter tabs
        /// @TODO fix this logic, reduce duplication
        /// $a->page['content'] .= '<div class="tabs-wrapper">';
@@ -892,7 +892,7 @@ function network_tabs(App &$a) {
 
        $arr = array('tabs' => $tabs);
        call_hooks('network_tabs', $arr);
-       
+
        $tpl = get_markup_template('common_tabs.tpl');
 
        return replace_macros($tpl, array('$tabs' => $arr['tabs']));

diff --git a/mod/newmember.php b/mod/newmember.php
index 1ef0985066e1971bdedee1e4a2ba80b02aeb2297..a5e41f1e2444204dd95e174b3390b83eaf59b248 100644 (file)
--- a/mod/newmember.php
+++ b/mod/newmember.php
@@ -1,6 +1,6 @@
 <?php
 
-function newmember_content(App &$a) {
+function newmember_content(App $a) {
 
 
        $o = '<h1>' . t('Welcome to Friendica') . '</h1>';
@@ -15,7 +15,7 @@ function newmember_content(App &$a) {
 
        $o .= '<ul>';
 
-       $o .= '<li> ' . '<a target="newmember" href="help/guide">' . t('Friendica Walk-Through') . '</a><br />' . t('On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join.') . '</li>' . EOL; 
+       $o .= '<li> ' . '<a target="newmember" href="help/guide">' . t('Friendica Walk-Through') . '</a><br />' . t('On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join.') . '</li>' . EOL;
 
        $o .= '</ul>';
 
@@ -23,7 +23,7 @@ function newmember_content(App &$a) {
 
        $o .= '<ul>';
 
-       $o .= '<li>' . '<a target="newmember" href="settings">' . t('Go to Your Settings') . '</a><br />' . t('On your <em>Settings</em> page -  change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web.') . '</li>' . EOL; 
+       $o .= '<li>' . '<a target="newmember" href="settings">' . t('Go to Your Settings') . '</a><br />' . t('On your <em>Settings</em> page -  change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web.') . '</li>' . EOL;
 
        $o .= '<li>' . t('Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you.') . '</li>' . EOL;
 
@@ -33,7 +33,7 @@ function newmember_content(App &$a) {
 
        $o .= '<ul>';
 
-       $o .= '<li>' . '<a target="newmember" href="profile_photo">' . t('Upload Profile Photo') . '</a><br />' . t('Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not.') . '</li>' . EOL;  
+       $o .= '<li>' . '<a target="newmember" href="profile_photo">' . t('Upload Profile Photo') . '</a><br />' . t('Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not.') . '</li>' . EOL;
 
        $o .= '<li>' . '<a target="newmember" href="profiles">' . t('Edit Your Profile') . '</a><br />' . t('Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors.') . '</li>' . EOL;
 
@@ -46,7 +46,7 @@ function newmember_content(App &$a) {
        $o .= '<ul>';
 
     $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
-       
+
        if(! $mail_disabled)
                $o .= '<li>' . '<a target="newmember" href="settings/connectors">' . t('Importing Emails') . '</a><br />' . t('Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX') . '</li>' . EOL;
 

diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php
index 104fecb755ddc21ea1ad118ffaaeecc84b603700..e084b25da3ed9dafac9345d6ee8e9c643da51f8d 100644 (file)
--- a/mod/nodeinfo.php
+++ b/mod/nodeinfo.php
@@ -1,13 +1,13 @@
 <?php
 /**
  * @file mod/nodeinfo.php
- * 
+ *
  * Documentation: http://nodeinfo.diaspora.software/schema.html
 */
 
 require_once("include/plugin.php");
 
-function nodeinfo_wellknown(App &$a) {
+function nodeinfo_wellknown(App $a) {
        if (!get_config("system", "nodeinfo")) {
                http_status_exit(404);
                killme();
@@ -20,7 +20,7 @@ function nodeinfo_wellknown(App &$a) {
        exit;
 }
 
-function nodeinfo_init(App &$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 c44840627739437ce31dc19a7773e0ee5dc3a3ec..11b7bdc7aa486c0e512dee4782c159a97090fc24 100644 (file)
--- a/mod/nogroup.php
+++ b/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(App &$a) {
+function nogroup_init(App $a) {
 
        if (! local_user()) {
                return;
@@ -21,7 +21,7 @@ function nogroup_init(App &$a) {
 }
 
 
-function nogroup_content(App &$a) {
+function nogroup_content(App $a) {
 
        if (! local_user()) {
                notice( t('Permission denied.') . EOL);

diff --git a/mod/noscrape.php b/mod/noscrape.php
index 758ce8ba5316f1b889d605543d48892629a5aa43..83ab71ce15884f90cb423172f638eab0e6dba000 100644 (file)
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -1,6 +1,6 @@
 <?php
 
-function noscrape_init(App &$a) {
+function noscrape_init(App $a) {
 
        if($a->argc > 1)
                $which = $a->argv[1];

diff --git a/mod/notes.php b/mod/notes.php
index b2aa5487af963e60d1b456dbf39ec1b258b20aea..c7cfe8d70f1a2d3e13f98249785b6fcf9073a7b1 100644 (file)
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -1,6 +1,6 @@
 <?php
 
-function notes_init(App &$a) {
+function notes_init(App $a) {
 
        if (! local_user()) {
                return;
@@ -17,7 +17,7 @@ function notes_init(App &$a) {
 }
 
 
-function notes_content(&$a,$update = false) {
+function notes_content(App $a, $update = false) {
 
        if (! local_user()) {
                notice( t('Permission denied.') . EOL);

diff --git a/mod/notice.php b/mod/notice.php
index e338d8752d5485c6d96bd886897579d2570f27c0..b7029397b5f145c55970dbbb9ff4803b64d35b78 100644 (file)
--- a/mod/notice.php
+++ b/mod/notice.php
@@ -1,7 +1,7 @@
 <?php
        /* identi.ca -> friendica items permanent-url compatibility */
-       
-       function notice_init(App &$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)

diff --git a/mod/notifications.php b/mod/notifications.php
index 47e4cd03405f867f2560f5588f3fd4fa3ac5b840..8cd1b29ea426edc9b98413096f4465b948c074da 100644 (file)
--- a/mod/notifications.php
+++ b/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(App &$a) {
+function notifications_post(App $a) {
 
        if (! local_user()) {
                goaway(z_root());
@@ -65,7 +65,7 @@ function notifications_post(App &$a) {
        }
 }
 
-function notifications_content(App &$a) {
+function notifications_content(App $a) {
 
        if (! local_user()) {
                notice( t('Permission denied.') . EOL);

diff --git a/mod/notify.php b/mod/notify.php
index bd7a7faf495d72e13571455172711c86ba0cc0b3..0026f5ca6eb6f66556c35326966604e81d6f9899 100644 (file)
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -1,7 +1,7 @@
 <?php
 require_once('include/NotificationsManager.php');
 
-function notify_init(App &$a) {
+function notify_init(App $a) {
        if (! local_user()) {
                return;
        }
@@ -12,7 +12,7 @@ function notify_init(App &$a) {
                $note = $nm->getByID($a->argv[2]);
                if ($note) {
                        $nm->setSeen($note);
-               
+
                        // The friendica client has problems with the GUID. this is some workaround
                        if ($a->is_friendica_app()) {
                                require_once("include/items.php");
@@ -39,13 +39,13 @@ function notify_init(App &$a) {
 
 }
 
-function notify_content(App &$a) {
+function notify_content(App $a) {
        if (! local_user()) {
                return login();
        }
 
        $nm = new NotificationsManager();
-       
+
        $notif_tpl = get_markup_template('notifications.tpl');
 
        $not_tpl = get_markup_template('notify.tpl');

diff --git a/mod/oembed.php b/mod/oembed.php
index 1d6e6145cd35cd0c873dec999f59429d2ed59d23..7770c62fb0300356dd26476090638e32d88c16c2 100644 (file)
--- a/mod/oembed.php
+++ b/mod/oembed.php
@@ -1,7 +1,7 @@
 <?php
 require_once("include/oembed.php");
 
-function oembed_content(App &$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 49c5d01f4504fb33e4f6d40186b2f87f0529149b..47547e691ceec4728bc0a4cab06a612e8fd8713d 100644 (file)
--- a/mod/oexchange.php
+++ b/mod/oexchange.php
@@ -1,7 +1,7 @@
 <?php
 
 
-function oexchange_init(App &$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(App &$a) {
 
 }
 
-function oexchange_content(App &$a) {
+function oexchange_content(App $a) {
 
        if (! local_user()) {
                $o = login(false);
@@ -26,13 +26,13 @@ function oexchange_content(App &$a) {
                return;
        }
 
-       $url = (((x($_REQUEST,'url')) && strlen($_REQUEST['url'])) 
+       $url = (((x($_REQUEST,'url')) && strlen($_REQUEST['url']))
                ? urlencode(notags(trim($_REQUEST['url']))) : '');
-       $title = (((x($_REQUEST,'title')) && strlen($_REQUEST['title'])) 
+       $title = (((x($_REQUEST,'title')) && strlen($_REQUEST['title']))
                ? '&title=' . urlencode(notags(trim($_REQUEST['title']))) : '');
-       $description = (((x($_REQUEST,'description')) && strlen($_REQUEST['description'])) 
+       $description = (((x($_REQUEST,'description')) && strlen($_REQUEST['description']))
                ? '&description=' . urlencode(notags(trim($_REQUEST['description']))) : '');
-       $tags = (((x($_REQUEST,'tags')) && strlen($_REQUEST['tags'])) 
+       $tags = (((x($_REQUEST,'tags')) && strlen($_REQUEST['tags']))
                ? '&tags=' . urlencode(notags(trim($_REQUEST['tags']))) : '');
 
        $s = fetch_url(App::get_baseurl() . '/parse_url?f=&url=' . $url . $title . $description . $tags);

diff --git a/mod/openid.php b/mod/openid.php
index ce707c4150b1195dd84572bf79cacc99cc7221de..59a7530140fcac1ed0727c7c33700cdb4e4dda10 100644 (file)
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -4,7 +4,7 @@
 require_once('library/openid.php');
 
 
-function openid_content(App &$a) {
+function openid_content(App $a) {
 
        $noid = get_config('system','no_openid');
        if($noid)
@@ -47,7 +47,7 @@ function openid_content(App &$a) {
                                require_once('include/security.php');
                                authenticate_success($r[0],true,true);
 
-                               // just in case there was no return url set 
+                               // just in case there was no return url set
                                // and we fell through
 
                                goaway(z_root());

diff --git a/mod/opensearch.php b/mod/opensearch.php
index 1a7d4cd30715bff0b23d91ba4bbfcd42158b4ab7..a599ddc1eddadfea648c9d755ed7a6ca1783a6a8 100644 (file)
--- a/mod/opensearch.php
+++ b/mod/opensearch.php
@@ -1,18 +1,18 @@
 <?php
-    function opensearch_content(App &$a) {
-       
+    function opensearch_content(App $a) {
+
                $tpl = get_markup_template('opensearch.tpl');
-       
+
                header("Content-type: application/opensearchdescription+xml");
-       
+
                $o = replace_macros($tpl, array(
                        '$baseurl' => App::get_baseurl(),
                        '$nodename' => $a->get_hostname(),
                ));
-               
+
                echo $o;
-               
+
                killme();
-               
+
        }
 ?>
\ No newline at end of file

diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index b2f536e6df310a2f0962a3b2a66cb1215f200562..a9f7c3a909111ed329904b990807db31b1355bda 100644 (file)
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -3,7 +3,7 @@
 require_once('include/Scrape.php');
 require_once('include/follow.php');
 
-function ostatus_subscribe_content(App &$a) {
+function ostatus_subscribe_content(App $a) {
 
        if (! local_user()) {
                notice( t('Permission denied.') . EOL);

diff --git a/mod/parse_url.php b/mod/parse_url.php
index 44cf80935e2bd237aa437a55969c82c1f2823c84..2c610f275138cc4b489cd3f431e022192cee667c 100644 (file)
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -1,9 +1,9 @@
 <?php
 
-/** 
+/**
  * @file mod/parse_url.php
  * @brief The parse_url module
- * 
+ *
  * This module does parse an url for embedable content (audio, video, image files or link)
  * information and does format this information to BBCode or html (this depends
  * on the user settings - default is BBCode output).
@@ -11,15 +11,15 @@
  * (Note: This is not always possible and in some case not useful because
  * the richtext editor doesn't support all kind of html).
  * Otherwise the output will be constructed BBCode.
- * 
- * @see ParseUrl::getSiteinfo() for more information about scraping embeddable content 
+ *
+ * @see ParseUrl::getSiteinfo() for more information about scraping embeddable content
 */
 
 use \Friendica\ParseUrl;
 
 require_once("include/items.php");
 
-function parse_url_content(App &$a) {
+function parse_url_content(App $a) {
 
        $text = null;
        $str_tags = "";
@@ -153,20 +153,20 @@ function parse_url_content(App &$a) {
 
 /**
  * @brief Legacy function to call ParseUrl::getSiteinfoCached
- * 
+ *
  * Note: We have moved the function to ParseUrl.php. This function is only for
  * legacy support and will be remove in the future
- * 
+ *
  * @param type $url The url of the page which should be scraped
  * @param type $no_guessing If true the parse doens't search for
  *    preview pictures
  * @param type $do_oembed The false option is used by the function fetch_oembed()
  *    to avoid endless loops
- * 
+ *
  * @return array which contains needed data for embedding
- * 
+ *
  * @see ParseUrl::getSiteinfoCached()
- * 
+ *
  * @todo Remove this function after all Addons has been changed to use
  *    ParseUrl::getSiteinfoCached
  */

diff --git a/mod/photo.php b/mod/photo.php
index 9744b9f239b246a595f3b722b7e4e7c5dda13c39..6562599ca3cf0ccc5b19e997b2734fcbdd408e0d 100644 (file)
--- 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(App &$a) {
+function photo_init(App $a) {
        global $_SERVER;
 
        $prvcachecontrol = false;

diff --git a/mod/photos.php b/mod/photos.php
index b451535e42aff45812cc5b15915d7cbe5e7594da..3371233a34f2088a66e6c143b2ed920bf89a10fb 100644 (file)
--- 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(App &$a) {
+function photos_init(App $a) {
 
        if ($a->argc > 1)
                auto_redir($a, $a->argv[1]);
@@ -112,7 +112,7 @@ function photos_init(App &$a) {
 
 
 
-function photos_post(App &$a) {
+function photos_post(App $a) {
 
        logger('mod-photos: photos_post: begin' , LOGGER_DEBUG);
 
@@ -945,7 +945,7 @@ function photos_post(App &$a) {
 
 
 
-function photos_content(App &$a) {
+function photos_content(App $a) {
 
        // URLs:
        // photos/name
@@ -1307,7 +1307,7 @@ function photos_content(App &$a) {
 
        }
 
-       /** 
+       /**
         * Display one photo
         */
 

diff --git a/mod/poco.php b/mod/poco.php
index 0415e1a2ceb919d05220320416edb0cd2c3b1c53..4ce075301cb9b1ed5ad27496fb3025bddf5ad06d 100644 (file)
--- 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(App &$a) {
+function poco_init(App $a) {
        require_once("include/bbcode.php");
 
        $system_mode = false;

diff --git a/mod/poke.php b/mod/poke.php
index 2e15ed853ff395be7363279c8d9499871d3348a4..5161129b31c38f2c9dec070cd98f4b290a75e2fa 100644 (file)
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -4,11 +4,11 @@
  *
  * Poke, prod, finger, or otherwise do unspeakable things to somebody - who must be a connection in your address book
  * This function can be invoked with the required arguments (verb and cid and private and possibly parent) silently via ajax or
- * other web request. You must be logged in and connected to a profile. 
+ * other web request. You must be logged in and connected to a profile.
  * If the required arguments aren't present, we'll display a simple form to choose a recipient and a verb.
  * parent is a special argument which let's you attach this activity as a comment to an existing conversation, which
  * may have started with somebody else poking (etc.) somebody, but this isn't necessary. This can be used in the more pokes
- * plugin version to have entire conversations where Alice poked Bob, Bob fingered Alice, Alice hugged Bob, etc.  
+ * plugin version to have entire conversations where Alice poked Bob, Bob fingered Alice, Alice hugged Bob, etc.
  *
  * private creates a private conversation with the recipient. Otherwise your profile's default post privacy is used.
  *
@@ -19,7 +19,7 @@ require_once('include/bbcode.php');
 require_once('include/items.php');
 
 
-function poke_init(App &$a) {
+function poke_init(App $a) {
 
        if (! local_user()) {
                return;
@@ -148,7 +148,7 @@ function poke_init(App &$a) {
 
 
 
-function poke_content(App &$a) {
+function poke_content(App $a) {
 
        if (! local_user()) {
                notice( t('Permission denied.') . EOL);

diff --git a/mod/post.php b/mod/post.php
index 076587839d96765577d270403dbfb9e4c7ae96ae..c8a88e66cd329c5bd853084f638a33a52e29e1fb 100644 (file)
--- a/mod/post.php
+++ b/mod/post.php
@@ -9,8 +9,8 @@ require_once('include/salmon.php');
 require_once('include/crypto.php');
 // not yet ready for prime time
 //require_once('include/zot.php');
-       
-function post_post(App &$a) {
+
+function post_post(App $a) {
 
        $bulk_delivery = false;
 
@@ -19,7 +19,7 @@ function post_post(App &$a) {
        }
        else {
                $nickname = $a->argv[2];
-               $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' 
+               $r = q("SELECT * FROM `user` WHERE `nickname` = '%s'
                                AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
                        dbesc($nickname)
                );

diff --git a/mod/pretheme.php b/mod/pretheme.php
index 694fd5ba2796a6f6ea19dcafcf7e75a1feeb9764..6dd6b781ac3837e25db989ea261f6650be9d739d 100644 (file)
--- a/mod/pretheme.php
+++ b/mod/pretheme.php
@@ -1,7 +1,7 @@
 <?php
 
-function pretheme_init(App &$a) {
-       
+function pretheme_init(App $a) {
+
        if($_REQUEST['theme']) {
                $theme = $_REQUEST['theme'];
                $info = get_theme_info($theme);

diff --git a/mod/probe.php b/mod/probe.php
index c368a50f584be647e332b41c761144be32c0a291..95f856bfa1499b77c495119196b6fd4ede39eebe 100644 (file)
--- a/mod/probe.php
+++ b/mod/probe.php
@@ -2,13 +2,13 @@
 
 require_once('include/Scrape.php');
 
-function probe_content(App &$a) {
+function probe_content(App $a) {
 
        $o .= '<h3>Probe Diagnostic</h3>';
 
        $o .= '<form action="probe" method="get">';
        $o .= 'Lookup address: <input type="text" style="width: 250px;" name="addr" value="' . $_GET['addr'] .'" />';
-       $o .= '<input type="submit" name="submit" value="Submit" /></form>'; 
+       $o .= '<input type="submit" name="submit" value="Submit" /></form>';
 
        $o .= '<br /><br />';
 

diff --git a/mod/profile.php b/mod/profile.php
index 32d3985b7f844f11bd4618290a965af737bd8ab0..5dd8293c7fd0613d083f6b93dfcbb5a5f4df502e 100644 (file)
--- 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(App &$a) {
+function profile_init(App $a) {
 
        if(! x($a->page,'aside'))
                $a->page['aside'] = '';
@@ -71,7 +71,7 @@ function profile_init(App &$a) {
 }
 
 
-function profile_content(&$a, $update = 0) {
+function profile_content(App $a, $update = 0) {
 
        $category = $datequery = $datequery2 = '';
 

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index c600dd1f868426c9759a89df47778540986c310a..f9bf60cf543605b0322a01903d115669baa3bd24 100644 (file)
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -2,7 +2,7 @@
 
 require_once("include/Photo.php");
 
-function profile_photo_init(App &$a) {
+function profile_photo_init(App $a) {
 
        if (! local_user()) {
                return;
@@ -13,7 +13,7 @@ function profile_photo_init(App &$a) {
 }
 
 
-function profile_photo_post(App &$a) {
+function profile_photo_post(App $a) {
 
        if (! local_user()) {
                notice ( t('Permission denied.') . EOL );
@@ -174,13 +174,13 @@ function profile_photo_post(App &$a) {
 
 
 if(! function_exists('profile_photo_content')) {
-function profile_photo_content(App &$a) {
+function profile_photo_content(App $a) {
 
        if (! local_user()) {
                notice( t('Permission denied.') . EOL );
                return;
        }
-       
+
        $newuser = false;
 
        if($a->argc == 2 && $a->argv[1] === 'new')
@@ -191,9 +191,9 @@ function profile_photo_content(App &$a) {
                        notice( t('Permission denied.') . EOL );
                        return;
                };
-               
+
 //             check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
-        
+
                $resource_id = $a->argv[2];
                //die(":".local_user());
                $r=q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' ORDER BY `scale` ASC",
@@ -246,7 +246,7 @@ function profile_photo_content(App &$a) {
 
 
        if(! x($a->config,'imagecrop')) {
-       
+
                $tpl = get_markup_template('profile_photo.tpl');
 
                $o .= replace_macros($tpl,array(
@@ -284,7 +284,7 @@ function profile_photo_content(App &$a) {
 
 
 if(! function_exists('profile_photo_crop_ui_head')) {
-function profile_photo_crop_ui_head(&$a, $ph){
+function profile_photo_crop_ui_head(App $a, $ph) {
        $max_length = get_config('system','max_image_length');
        if (! $max_length) {
                $max_length = MAX_IMAGE_LENGTH;
@@ -303,11 +303,11 @@ function profile_photo_crop_ui_head(&$a, $ph){
        }
 
        $hash = photo_new_resource();
-       
+
 
        $smallest = 0;
 
-       $r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 0 );   
+       $r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 0 );
 
        if ($r) {
                info( t('Image uploaded successfully.') . EOL );
@@ -317,7 +317,7 @@ function profile_photo_crop_ui_head(&$a, $ph){
 
        if ($width > 640 || $height > 640) {
                $ph->scaleImage(640);
-               $r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 1 );   
+               $r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 1 );
 
                if ($r === false) {
                        notice( sprintf(t('Image size reduction [%s] failed.'),"640") . EOL );