From 39421cf1a47a49c1ef8a639bd6f480d5adb6a779 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Thu, 10 May 2018 15:31:19 +0200 Subject: [PATCH] Continued: - added array as type-hint - don't forget & (call-by-reference) here as $b is maybe being modified in the function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- blockem/blockem.php | 12 ++++-------- dwpost/dwpost.php | 8 ++++---- fromgplus/fromgplus.php | 2 +- irc/irc.php | 2 +- js_upload/js_upload.php | 8 ++++---- pageheader/pageheader.php | 2 +- smilies_adult/smilies_adult.php | 4 ++-- statusnet/statusnet.php | 2 +- tumblr/tumblr.php | 6 +++--- twitter/twitter.php | 4 ++-- unicode_smilies/unicode_smilies.php | 2 +- 11 files changed, 24 insertions(+), 28 deletions(-) diff --git a/blockem/blockem.php b/blockem/blockem.php index 7c1c4292..2510e042 100644 --- a/blockem/blockem.php +++ b/blockem/blockem.php @@ -70,7 +70,7 @@ function blockem_addon_settings(&$a, &$s) } -function blockem_addon_settings_post(App $a, $b) { +function blockem_addon_settings_post(App $a, array &$b) { if(! local_user()) return; @@ -81,7 +81,7 @@ function blockem_addon_settings_post(App $a, $b) { } } -function blockem_enotify_store(App $a, $b) { +function blockem_enotify_store(App $a, array &$b) { $words = PConfig::get($b['uid'],'blockem','words'); if($words) { @@ -140,16 +140,12 @@ function blockem_prepare_body_content_filter(App $a, array &$hook_data) } function blockem_display_item(App $a, array &$b) { - if (empty($b['output']['body'])) { - return; - } - if (strstr($b['output']['body'],'id="blockem-wrap-')) { $b['output']['thumb'] = $a->get_baseurl() . "/images/person-80.jpg"; } } -function blockem_conversation_start(App $a, $b) { +function blockem_conversation_start(App $a, array &$b) { if(! local_user()) return; @@ -177,7 +173,7 @@ EOT; } -function blockem_item_photo_menu(App $a, $b) { +function blockem_item_photo_menu(App $a, array &$b) { if((! local_user()) || ($b['item']['self'])) return; diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php index d95a97a5..3c2156ba 100644 --- a/dwpost/dwpost.php +++ b/dwpost/dwpost.php @@ -34,7 +34,7 @@ function dwpost_uninstall() { } -function dwpost_jot_nets(App $a, $b) { +function dwpost_jot_nets(App $a, array &$b) { if(! local_user()) return; @@ -108,7 +108,7 @@ function dwpost_settings(App $a, $s) { } -function dwpost_settings_post(App $a, $b) { +function dwpost_settings_post(App $a, array &$b) { if(x($_POST,'dwpost-submit')) { @@ -121,7 +121,7 @@ function dwpost_settings_post(App $a, $b) { } -function dwpost_post_local(App $a, $b) { +function dwpost_post_local(App $a, array &$b) { // This can probably be changed to allow editing by pointing to a different API endpoint @@ -152,7 +152,7 @@ function dwpost_post_local(App $a, $b) { -function dwpost_send(App $a, $b) { +function dwpost_send(App $a, array &$b) { if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) return; diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php index 9bb64970..c48155f2 100644 --- a/fromgplus/fromgplus.php +++ b/fromgplus/fromgplus.php @@ -80,7 +80,7 @@ class="settings-submit" value="' . L10n::t('Save Settings') . '" />'; return; } -function fromgplus_addon_settings_post(App $a, $b) { +function fromgplus_addon_settings_post(App $a, array &$b) { if(! local_user()) return; diff --git a/irc/irc.php b/irc/irc.php index f2d0c684..41f857ea 100644 --- a/irc/irc.php +++ b/irc/irc.php @@ -52,7 +52,7 @@ function irc_addon_settings(App $a, $s) { } -function irc_addon_settings_post(App $a, $b) { +function irc_addon_settings_post(App $a, array &$b) { if(! local_user()) return; diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php index 6317bf48..cb46c191 100644 --- a/js_upload/js_upload.php +++ b/js_upload/js_upload.php @@ -36,7 +36,7 @@ function js_upload_uninstall() { } -function js_upload_form(App $a, $b) { +function js_upload_form(App $a, array &$b) { $b['default_upload'] = false; @@ -136,7 +136,7 @@ EOT; } -function js_upload_post_init(App $a, $b) { +function js_upload_post_init(App $a, array &$b) { // list of valid extensions, ex. array("jpeg", "xml", "bmp") @@ -164,7 +164,7 @@ function js_upload_post_init(App $a, $b) { } -function js_upload_post_file(App $a, $b) { +function js_upload_post_file(App $a, array &$b) { $result = $a->data['upload_result']; @@ -175,7 +175,7 @@ function js_upload_post_file(App $a, $b) { } -function js_upload_post_end(App $a, $b) { +function js_upload_post_end(App $a, array &$b) { logger('upload_post_end'); if(x($a->data,'upload_jsonresponse')) { diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php index 034f5cae..958249f8 100644 --- a/pageheader/pageheader.php +++ b/pageheader/pageheader.php @@ -61,7 +61,7 @@ function pageheader_addon_settings(App $a, $s) { } -function pageheader_addon_settings_post(App $a, $b) { +function pageheader_addon_settings_post(App $a, array &$b) { if(! is_site_admin()) return; diff --git a/smilies_adult/smilies_adult.php b/smilies_adult/smilies_adult.php index 2a7dbebb..6e81b424 100644 --- a/smilies_adult/smilies_adult.php +++ b/smilies_adult/smilies_adult.php @@ -22,7 +22,7 @@ function smilies_adult_uninstall() { -function smilies_adult_smilies(App $a, $b) { +function smilies_adult_smilies(App $a, array &$b) { $b['texts'][] = '(o)(o)'; $b['icons'][] = '' . '(o)(o)' . ''; @@ -42,4 +42,4 @@ function smilies_adult_smilies(App $a, $b) { $b['texts'][] = ':finger'; $b['icons'][] = '' . ':finger' . ''; -} \ No newline at end of file +} diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index d9d0f5b9..253021a6 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -712,7 +712,7 @@ function statusnet_prepare_body(App $a, array &$b) } } -function statusnet_cron(App $a, $b) +function statusnet_cron(App $a, array &$b) { $last = Config::get('statusnet', 'last_poll'); diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php index f86382e2..368b62f0 100644 --- a/tumblr/tumblr.php +++ b/tumblr/tumblr.php @@ -172,7 +172,7 @@ function tumblr_callback($a) { return $o; } -function tumblr_jot_nets(App $a, $b) { +function tumblr_jot_nets(App $a, array &$b) { if (! local_user()) { return; } @@ -270,7 +270,7 @@ function tumblr_settings(App $a, $s) { } -function tumblr_settings_post(App $a, $b) { +function tumblr_settings_post(App $a, array &$b) { if(x($_POST,'tumblr-submit')) { @@ -320,7 +320,7 @@ function tumblr_post_local(App $a, array &$b) { -function tumblr_send(App $a, $b) { +function tumblr_send(App $a, array &$b) { if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) { return; diff --git a/twitter/twitter.php b/twitter/twitter.php index 0338da40..328c2c80 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -658,7 +658,7 @@ function twitter_addon_admin(App $a, &$o) ]); } -function twitter_cron(App $a, $b) +function twitter_cron(App $a, array &$b) { $last = Config::get('twitter', 'last_poll'); @@ -726,7 +726,7 @@ function twitter_cron(App $a, $b) Config::set('twitter', 'last_poll', time()); } -function twitter_expire(App $a, $b) +function twitter_expire(App $a, array &$b) { $days = Config::get('twitter', 'expire'); diff --git a/unicode_smilies/unicode_smilies.php b/unicode_smilies/unicode_smilies.php index db8d098d..93eefc3e 100644 --- a/unicode_smilies/unicode_smilies.php +++ b/unicode_smilies/unicode_smilies.php @@ -18,7 +18,7 @@ function unicode_smilies_uninstall() { Addon::unregisterHook('smilie', 'addon/unicode_smilies/unicode_smilies.php', 'unicode_smilies_smilies'); } -function unicode_smilies_smilies(App $a, $b) { +function unicode_smilies_smilies(App $a, array &$b) { Smilies::add($b, ':-)', '😀'); Smilies::add($b, ':)', '😀'); Smilies::add($b, ':-(', '🙁');