Replace deprecated defaults() calls by a combination of ?? and ?: operators in mod/

diff --git a/mod/cal.php b/mod/cal.php
index eba8d975865b2728a114b8981be0035375d8216b..51d17a10a43b98cb850d25bb39d7197b0f5969d1 100644 (file)
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -200,7 +200,7 @@ function cal_content(App $a)
 
                // put the event parametes in an array so we can better transmit them
                $event_params = [
-                       'event_id'      => intval(defaults($_GET, 'id', 0)),
+                       'event_id'      => intval($_GET['id'] ?? 0),
                        'start'         => $start,
                        'finish'        => $finish,
                        'adjust_start'  => $adjust_start,

diff --git a/mod/common.php b/mod/common.php
index a2821921c6ca21a4f4c8a0ba48999b4e6619782f..9d441f18a7c5aaa81d343ca08a14260df5d06c34 100644 (file)
--- a/mod/common.php
+++ b/mod/common.php
@@ -118,7 +118,7 @@ function common_content(App $a)
 
                $entry = [
                        'url'          => Model\Contact::magicLink($common_friend['url']),
-                       'itemurl'      => defaults($contact_details, 'addr', $common_friend['url']),
+                       'itemurl'      => ($contact_details['addr'] ?? '') ?: $common_friend['url'],
                        'name'         => $contact_details['name'],
                        'thumb'        => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB),
                        'img_hover'    => $contact_details['name'],

diff --git a/mod/crepair.php b/mod/crepair.php
index ce27b44982a26a295dd68d75ea2bdaa76b339b02..84cb458fa2ab77dd5f4bb1b3f67d1d22db10757e 100644 (file)
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -38,17 +38,17 @@ function crepair_post(App $a)
                return;
        }
 
-       $name        = defaults($_POST, 'name'       , $contact['name']);
-       $nick        = defaults($_POST, 'nick'       , '');
-       $url         = defaults($_POST, 'url'        , '');
-       $alias       = defaults($_POST, 'alias'      , '');
-       $request     = defaults($_POST, 'request'    , '');
-       $confirm     = defaults($_POST, 'confirm'    , '');
-       $notify      = defaults($_POST, 'notify'     , '');
-       $poll        = defaults($_POST, 'poll'       , '');
-       $attag       = defaults($_POST, 'attag'      , '');
-       $photo       = defaults($_POST, 'photo'      , '');
-       $remote_self = defaults($_POST, 'remote_self', false);
+       $name        = ($_POST['name']        ?? '') ?: $contact['name'];
+       $nick        =  $_POST['nick']        ?? '';
+       $url         =  $_POST['url']         ?? '';
+       $alias       =  $_POST['alias']       ?? '';
+       $request     =  $_POST['request']     ?? '';
+       $confirm     =  $_POST['confirm']     ?? '';
+       $notify      =  $_POST['notify']      ?? '';
+       $poll        =  $_POST['poll']        ?? '';
+       $attag       =  $_POST['attag']       ?? '';
+       $photo       =  $_POST['photo']       ?? '';
+       $remote_self =  $_POST['remote_self'] ?? false;
        $nurl        = Strings::normaliseLink($url);
 
        $r = DBA::update(

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 9f9684e0936e9b40ede108ac7a00b7903d4d78c6..944ba98be2fffb4bff09bb99b6ccf9a1c80bb8ec 100644 (file)
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -59,7 +59,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
         * since we are operating on behalf of our registered user to approve a friendship.
         */
        if (empty($_POST['source_url'])) {
-               $uid = defaults($handsfree, 'uid', local_user());
+               $uid = ($handsfree['uid'] ?? 0) ?: local_user();
                if (!$uid) {
                        notice(L10n::t('Permission denied.') . EOL);
                        return;
@@ -78,13 +78,13 @@ function dfrn_confirm_post(App $a, $handsfree = null)
                        $intro_id = $handsfree['intro_id'];
                        $duplex   = $handsfree['duplex'];
                        $cid      = 0;
-                       $hidden   = intval(defaults($handsfree, 'hidden'  , 0));
+                       $hidden   = intval($handsfree['hidden'] ?? 0);
                } else {
-                       $dfrn_id  = Strings::escapeTags(trim(defaults($_POST, 'dfrn_id'   , '')));
-                       $intro_id =      intval(defaults($_POST, 'intro_id'  , 0));
-                       $duplex   =      intval(defaults($_POST, 'duplex'    , 0));
-                       $cid      =      intval(defaults($_POST, 'contact_id', 0));
-                       $hidden   =      intval(defaults($_POST, 'hidden'    , 0));
+                       $dfrn_id  = Strings::escapeTags(trim($_POST['dfrn_id'] ?? ''));
+                       $intro_id = intval($_POST['intro_id']   ?? 0);
+                       $duplex   = intval($_POST['duplex']     ?? 0);
+                       $cid      = intval($_POST['contact_id'] ?? 0);
+                       $hidden   = intval($_POST['hidden']     ?? 0);
                }
 
                /*
@@ -347,12 +347,12 @@ function dfrn_confirm_post(App $a, $handsfree = null)
         */
        if (!empty($_POST['source_url'])) {
                // We are processing an external confirmation to an introduction created by our user.
-               $public_key =         defaults($_POST, 'public_key', '');
-               $dfrn_id    = hex2bin(defaults($_POST, 'dfrn_id'   , ''));
-               $source_url = hex2bin(defaults($_POST, 'source_url', ''));
-               $aes_key    =         defaults($_POST, 'aes_key'   , '');
-               $duplex     =  intval(defaults($_POST, 'duplex'    , 0));
-               $page       =  intval(defaults($_POST, 'page'      , 0));
+               $public_key =         $_POST['public_key'] ?? '';
+               $dfrn_id    = hex2bin($_POST['dfrn_id']    ?? '');
+               $source_url = hex2bin($_POST['source_url'] ?? '');
+               $aes_key    =         $_POST['aes_key']    ?? '';
+               $duplex     =  intval($_POST['duplex']     ?? 0);
+               $page       =  intval($_POST['page']       ?? 0);
 
                $forum = (($page == 1) ? 1 : 0);
                $prv   = (($page == 2) ? 1 : 0);

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 3f0ecba005e8e8333ee97dee626ff61c45dac13a..dee6bad779538e3c540ba856befc2781a6df88e8 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -26,7 +26,7 @@ function dfrn_notify_post(App $a) {
        if (empty($_POST) || !empty($postdata)) {
                $data = json_decode($postdata);
                if (is_object($data)) {
-                       $nick = defaults($a->argv, 1, '');
+                       $nick = $a->argv[1] ?? '';
 
                        $user = DBA::selectFirst('user', [], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]);
                        if (!DBA::isResult($user)) {
@@ -42,8 +42,8 @@ function dfrn_notify_post(App $a) {
        $dfrn_id      = (!empty($_POST['dfrn_id'])      ? Strings::escapeTags(trim($_POST['dfrn_id']))   : '');
        $dfrn_version = (!empty($_POST['dfrn_version']) ? (float) $_POST['dfrn_version']    : 2.0);
        $challenge    = (!empty($_POST['challenge'])    ? Strings::escapeTags(trim($_POST['challenge'])) : '');
-       $data         = defaults($_POST, 'data', '');
-       $key          = defaults($_POST, 'key', '');
+       $data         = $_POST['data'] ?? '';
+       $key          = $_POST['key'] ?? '';
        $rino_remote  = (!empty($_POST['rino'])         ? intval($_POST['rino'])            :  0);
        $dissolve     = (!empty($_POST['dissolve'])     ? intval($_POST['dissolve'])        :  0);
        $perm         = (!empty($_POST['perm'])         ? Strings::escapeTags(trim($_POST['perm']))      : 'r');

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index c6134bb45d48ee636606a0059377d0776c376a84..ca60cc87a100f07dca83f88395f8ac8f4cf39d27 100644 (file)
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -22,17 +22,17 @@ function dfrn_poll_init(App $a)
 {
        Login::sessionAuth();
 
-       $dfrn_id         = defaults($_GET, 'dfrn_id'        , '');
-       $type            = defaults($_GET, 'type'           , 'data');
-       $last_update     = defaults($_GET, 'last_update'    , '');
-       $destination_url = defaults($_GET, 'destination_url', '');
-       $challenge       = defaults($_GET, 'challenge'      , '');
-       $sec             = defaults($_GET, 'sec'            , '');
-       $dfrn_version    = (float) defaults($_GET, 'dfrn_version'   , 2.0);
+       $dfrn_id         =  $_GET['dfrn_id']         ?? '';
+       $type            = ($_GET['type']            ?? '') ?: 'data';
+       $last_update     =  $_GET['last_update']     ?? '';
+       $destination_url =  $_GET['destination_url'] ?? '';
+       $challenge       =  $_GET['challenge']       ?? '';
+       $sec             =  $_GET['sec']             ?? '';
+       $dfrn_version    = floatval(($_GET['dfrn_version'] ?? 0.0) ?: 2.0);
        $quiet                   = !empty($_GET['quiet']);
 
        // Possibly it is an OStatus compatible server that requests a user feed
-       $user_agent = defaults($_SERVER, 'HTTP_USER_AGENT', '');
+       $user_agent = $_SERVER['HTTP_USER_AGENT'] ?? '';
        if (($a->argc > 1) && ($dfrn_id == '') && !strstr($user_agent, 'Friendica')) {
                $nickname = $a->argv[1];
                header("Content-type: application/atom+xml");
@@ -225,13 +225,13 @@ function dfrn_poll_init(App $a)
 
 function dfrn_poll_post(App $a)
 {
-       $dfrn_id      = defaults($_POST, 'dfrn_id'  , '');
-       $challenge    = defaults($_POST, 'challenge', '');
-       $url          = defaults($_POST, 'url'      , '');
-       $sec          = defaults($_POST, 'sec'      , '');
-       $ptype        = defaults($_POST, 'type'     , '');
-       $perm         = defaults($_POST, 'perm'     , 'r');
-       $dfrn_version = !empty($_POST['dfrn_version']) ? (float) $_POST['dfrn_version'] : 2.0;
+       $dfrn_id      =  $_POST['dfrn_id']   ?? '';
+       $challenge    =  $_POST['challenge'] ?? '';
+       $url          =  $_POST['url']       ?? '';
+       $sec          =  $_POST['sec']       ?? '';
+       $ptype        =  $_POST['type']      ?? '';
+       $perm         = ($_POST['perm']      ?? '') ?: 'r';
+       $dfrn_version = floatval(($_GET['dfrn_version'] ?? 0.0) ?: 2.0);
 
        if ($ptype === 'profile-check') {
                if (strlen($challenge) && strlen($sec)) {
@@ -391,12 +391,12 @@ function dfrn_poll_post(App $a)
 
 function dfrn_poll_content(App $a)
 {
-       $dfrn_id         = defaults($_GET, 'dfrn_id'        , '');
-       $type            = defaults($_GET, 'type'           , 'data');
-       $last_update     = defaults($_GET, 'last_update'    , '');
-       $destination_url = defaults($_GET, 'destination_url', '');
-       $sec             = defaults($_GET, 'sec'            , '');
-       $dfrn_version    = !empty($_GET['dfrn_version'])    ? (float) $_GET['dfrn_version'] : 2.0;
+       $dfrn_id         =  $_GET['dfrn_id']         ?? '';
+       $type            = ($_GET['type']            ?? '') ?: 'data';
+       $last_update     =  $_GET['last_update']     ?? '';
+       $destination_url =  $_GET['destination_url'] ?? '';
+       $sec             =  $_GET['sec']             ?? '';
+       $dfrn_version    = floatval(($_GET['dfrn_version'] ?? 0.0) ?: 2.0);
        $quiet           = !empty($_GET['quiet']);
 
        $direction = -1;

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index f78da7fb04d70a40c5b841de3d2b82c5edf5da75..f37064573bf0762a852c508b4d08b888c0abee1a 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -80,7 +80,7 @@ function dfrn_request_post(App $a)
                if (local_user() && ($a->user['nickname'] == $a->argv[1]) && !empty($_POST['dfrn_url'])) {
                        $dfrn_url    = Strings::escapeTags(trim($_POST['dfrn_url']));
                        $aes_allow   = !empty($_POST['aes_allow']);
-                       $confirm_key = defaults($_POST, 'confirm_key', "");
+                       $confirm_key = $_POST['confirm_key'] ?? '';
                        $hidden      = (!empty($_POST['hidden-contact']) ? intval($_POST['hidden-contact']) : 0);
                        $contact_record = null;
                        $blocked     = 1;
@@ -169,7 +169,7 @@ function dfrn_request_post(App $a)
                                $r = q("SELECT `id`, `network` FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `site-pubkey` = '%s' LIMIT 1",
                                        intval(local_user()),
                                        DBA::escape($dfrn_url),
-                                       defaults($parms, 'key', '') // Potentially missing
+                                       $parms['key'] ?? '' // Potentially missing
                                );
                                if (DBA::isResult($r)) {
                                        Group::addMember(User::getDefaultGroup(local_user(), $r[0]["network"]), $r[0]['id']);
@@ -423,7 +423,7 @@ function dfrn_request_post(App $a)
                                        intval($uid),
                                        intval($contact_record['id']),
                                        intval(!empty($_POST['knowyou'])),
-                                       DBA::escape(Strings::escapeTags(trim(defaults($_POST, 'dfrn-request-message', '')))),
+                                       DBA::escape(Strings::escapeTags(trim($_POST['dfrn-request-message'] ?? ''))),
                                        DBA::escape($hash),
                                        DBA::escape(DateTimeFormat::utcNow())
                                );
@@ -499,7 +499,7 @@ function dfrn_request_content(App $a)
 
                $dfrn_url = Strings::escapeTags(trim(hex2bin($_GET['dfrn_url'])));
                $aes_allow = !empty($_GET['aes_allow']);
-               $confirm_key = defaults($_GET, 'confirm_key', "");
+               $confirm_key = $_GET['confirm_key'] ?? '';
 
                // Checking fastlane for validity
                if (!empty($_SESSION['fastlane']) && (Strings::normaliseLink($_SESSION["fastlane"]) == Strings::normaliseLink($dfrn_url))) {

diff --git a/mod/display.php b/mod/display.php
index 8513788dfca9eb9244434b67b1d13bd3868a323e..12fa8d7ecefb9c320e71b641b2f0e9af216cc2d0 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -276,8 +276,8 @@ function display_content(App $a, $update = false, $update_uid = 0)
        if (isset($item_parent_uri)) {
                $parent = Item::selectFirst(['uid'], ['uri' => $item_parent_uri, 'wall' => true]);
                if (DBA::isResult($parent)) {
-                       $a->profile['uid'] = defaults($a->profile, 'uid', $parent['uid']);
-                       $a->profile['profile_uid'] = defaults($a->profile, 'profile_uid', $parent['uid']);
+                       $a->profile['uid'] = ($a->profile['uid'] ?? 0) ?: $parent['uid'];
+                       $a->profile['profile_uid'] = ($a->profile['profile_uid'] ?? 0) ?: $parent['uid'];
                        $is_remote_contact = Session::getRemoteContactID($a->profile['profile_uid']);
                        if ($is_remote_contact) {
                                $item_uid = $parent['uid'];

diff --git a/mod/events.php b/mod/events.php
index 82257a84814f653bf8bc3b7c8a2e678c16a0f531..649a25ab1b35505e29c5ee5b121f836c400446a0 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -59,11 +59,11 @@ function events_post(App $a)
        $cid = !empty($_POST['cid']) ? intval($_POST['cid']) : 0;
        $uid = local_user();
 
-       $start_text  = Strings::escapeHtml(defaults($_REQUEST, 'start_text', ''));
-       $finish_text = Strings::escapeHtml(defaults($_REQUEST, 'finish_text', ''));
+       $start_text  = Strings::escapeHtml($_REQUEST['start_text'] ?? '');
+       $finish_text = Strings::escapeHtml($_REQUEST['finish_text'] ?? '');
 
-       $adjust   = intval(defaults($_POST, 'adjust', 0));
-       $nofinish = intval(defaults($_POST, 'nofinish', 0));
+       $adjust   = intval($_POST['adjust'] ?? 0);
+       $nofinish = intval($_POST['nofinish'] ?? 0);
 
        // The default setting for the `private` field in event_store() is false, so mirror that
        $private_event = false;
@@ -96,9 +96,9 @@ function events_post(App $a)
        // and we'll waste a bunch of time responding to it. Time that
        // could've been spent doing something else.
 
-       $summary  = trim(defaults($_POST, 'summary' , ''));
-       $desc     = trim(defaults($_POST, 'desc'    , ''));
-       $location = trim(defaults($_POST, 'location', ''));
+       $summary  = trim($_POST['summary']  ?? '');
+       $desc     = trim($_POST['desc']     ?? '');
+       $location = trim($_POST['location'] ?? '');
        $type     = 'event';
 
        $params = [
@@ -132,7 +132,7 @@ function events_post(App $a)
                $a->internalRedirect($onerror_path);
        }
 
-       $share = intval(defaults($_POST, 'share', 0));
+       $share = intval($_POST['share'] ?? 0);
 
        $c = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
                intval(local_user())
@@ -146,10 +146,10 @@ function events_post(App $a)
 
 
        if ($share) {
-               $str_group_allow   = perms2str(defaults($_POST, 'group_allow'  , ''));
-               $str_contact_allow = perms2str(defaults($_POST, 'contact_allow', ''));
-               $str_group_deny    = perms2str(defaults($_POST, 'group_deny'   , ''));
-               $str_contact_deny  = perms2str(defaults($_POST, 'contact_deny' , ''));
+               $str_group_allow   = perms2str($_POST['group_allow']   ?? '');
+               $str_contact_allow = perms2str($_POST['contact_allow'] ?? '');
+               $str_group_deny    = perms2str($_POST['group_deny']    ?? '');
+               $str_contact_deny  = perms2str($_POST['contact_deny']  ?? '');
 
                // Undo the pseudo-contact of self, since there are real contacts now
                if (strpos($str_contact_allow, '<' . $self . '>') !== false) {

diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index f2bccb085a6f0d4d93c9a981728d94698b1727cd..102d0c613d1a9cfb22f2d862939e0bd7b624f016 100644 (file)
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -29,7 +29,7 @@ function fbrowser_content(App $a)
        }
 
        // Needed to match the correct template in a module that uses a different theme than the user/site/default
-       $theme = Strings::sanitizeFilePathItem(defaults($_GET, 'theme', null));
+       $theme = Strings::sanitizeFilePathItem($_GET['theme'] ?? null);
        if ($theme && is_file("view/theme/$theme/config.php")) {
                $a->setCurrentTheme($theme);
        }

diff --git a/mod/follow.php b/mod/follow.php
index c7a96f734f6a01ad7dd9b0449618eee1e95787d3..31b92aa0dc06eb6873de05af9f3a647febc5901e 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -62,7 +62,7 @@ function follow_content(App $a)
        $uid = local_user();
 
        // Issue 4815: Silently removing a prefixing @
-       $url = ltrim(Strings::escapeTags(trim(defaults($_REQUEST, 'url', ''))), '@!');
+       $url = ltrim(Strings::escapeTags(trim($_REQUEST['url'] ?? '')), '@!');
 
        // Issue 6874: Allow remote following from Peertube
        if (strpos($url, 'acct:') === 0) {

diff --git a/mod/fsuggest.php b/mod/fsuggest.php
index 2bddf48133103510becfb1c90290c86a2c820059..d41363ad7b38d153043b2afa7484bff30fdd8370 100644 (file)
--- a/mod/fsuggest.php
+++ b/mod/fsuggest.php
@@ -45,7 +45,7 @@ function fsuggest_post(App $a)
                return;
        }
 
-       $note = Strings::escapeHtml(trim(defaults($_POST, 'note', '')));
+       $note = Strings::escapeHtml(trim($_POST['note'] ?? ''));
 
        $fields = ['uid' => local_user(),'cid' => $contact_id, 'name' => $contact['name'],
                'url' => $contact['url'], 'request' => $contact['request'],

diff --git a/mod/hcard.php b/mod/hcard.php
index ad84e24e545dd506911edf9ce7fc78adc689c7fa..013619bcba6ca94a9aeb0d273cf979f3398e3e1f 100644 (file)
--- a/mod/hcard.php
+++ b/mod/hcard.php
@@ -41,7 +41,7 @@ function hcard_init(App $a)
        }
 
        if (!$blocked) {
-               $keywords = defaults($a->profile, 'pub_keywords', '');
+               $keywords = $a->profile['pub_keywords'] ?? '';
                $keywords = str_replace([',',' ',',,'], [' ',',',','], $keywords);
                if (strlen($keywords)) {
                        $a->page['htmlhead'] .= '<meta name="keywords" content="' . $keywords . '" />' . "\r\n";

diff --git a/mod/hovercard.php b/mod/hovercard.php
index ca399196368b71b3151d616924b8e59a8ab19cca..d5951dbe00fa19457eed86c2f4d267818ce2a5d7 100644 (file)
--- a/mod/hovercard.php
+++ b/mod/hovercard.php
@@ -26,8 +26,8 @@ function hovercard_init(App $a)
 
 function hovercard_content()
 {
-       $profileurl = defaults($_REQUEST, 'profileurl', '');
-       $datatype   = defaults($_REQUEST, 'datatype'  , 'json');
+       $profileurl =  $_REQUEST['profileurl'] ?? '';
+       $datatype   = ($_REQUEST['datatype']   ?? '') ?: 'json';
 
        // Get out if the system doesn't have public access allowed
        if (intval(Config::get('system', 'block_public'))) {
@@ -50,7 +50,7 @@ function hovercard_content()
        if (strpos($profileurl, 'redir/') === 0) {
                $cid = intval(substr($profileurl, 6));
                $remote_contact = DBA::selectFirst('contact', ['nurl'], ['id' => $cid]);
-               $profileurl = defaults($remote_contact, 'nurl', '');
+               $profileurl = $remote_contact['nurl'] ?? '';
        }
 
        $contact = [];
@@ -97,7 +97,7 @@ function hovercard_content()
        $profile = [
                'name'         => $contact['name'],
                'nick'         => $contact['nick'],
-               'addr'         => defaults($contact, 'addr', $contact['url']),
+               'addr'         => ($contact['addr'] ?? '') ?: $contact['url'],
                'thumb'        => ProxyUtils::proxifyUrl($contact['thumb'], false, ProxyUtils::SIZE_THUMB),
                'url'          => Contact::magicLink($contact['url']),
                'nurl'         => $contact['nurl'], // We additionally store the nurl as identifier

diff --git a/mod/ignored.php b/mod/ignored.php
index 64edf6e151c17d7a6dac97ee727259d016ef6883..6e0cf92a65912b9906f2d1d4693d6a2d5c79e7bc 100644 (file)
--- a/mod/ignored.php
+++ b/mod/ignored.php
@@ -33,7 +33,7 @@ function ignored_init(App $a)
        }
 
        // See if we've been passed a return path to redirect to
-       $return_path = defaults($_REQUEST, 'return', '');
+       $return_path = $_REQUEST['return'] ?? '';
        if ($return_path) {
                $rand = '_=' . time();
                if (strpos($return_path, '?')) {

diff --git a/mod/item.php b/mod/item.php
index b1c0355e01a5c2032fd73a1aac76c5f7056aa486..18d8979acf24dde33aca982ff4dc8a1fdad3bd94 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -64,12 +64,12 @@ function item_post(App $a) {
 
        Logger::log('postvars ' . print_r($_REQUEST, true), Logger::DATA);
 
-       $api_source = defaults($_REQUEST, 'api_source', false);
+       $api_source = $_REQUEST['api_source'] ?? false;
 
        $message_id = ((!empty($_REQUEST['message_id']) && $api_source) ? strip_tags($_REQUEST['message_id']) : '');
 
-       $return_path = defaults($_REQUEST, 'return', '');
-       $preview = intval(defaults($_REQUEST, 'preview', 0));
+       $return_path = $_REQUEST['return'] ?? '';
+       $preview = intval($_REQUEST['preview'] ?? 0);
 
        /*
         * Check for doubly-submitted posts, and reject duplicates
@@ -86,8 +86,8 @@ function item_post(App $a) {
        }
 
        // Is this a reply to something?
-       $toplevel_item_id = intval(defaults($_REQUEST, 'parent', 0));
-       $thr_parent_uri = trim(defaults($_REQUEST, 'parent_uri', ''));
+       $toplevel_item_id = intval($_REQUEST['parent'] ?? 0);
+       $thr_parent_uri = trim($_REQUEST['parent_uri'] ?? '');
 
        $thread_parent_id = 0;
        $thread_parent_contact = null;
@@ -98,8 +98,8 @@ function item_post(App $a) {
        $parent_contact = null;
 
        $objecttype = null;
-       $profile_uid = defaults($_REQUEST, 'profile_uid', local_user());
-       $posttype = defaults($_REQUEST, 'post_type', Item::PT_ARTICLE);
+       $profile_uid = ($_REQUEST['profile_uid'] ?? 0) ?: local_user();
+       $posttype = ($_REQUEST['post_type'] ?? '') ?: Item::PT_ARTICLE;
 
        if ($toplevel_item_id || $thr_parent_uri) {
                if ($toplevel_item_id) {
@@ -138,10 +138,10 @@ function item_post(App $a) {
                Logger::info('mod_item: item_post parent=' . $toplevel_item_id);
        }
 
-       $post_id     = intval(defaults($_REQUEST, 'post_id', 0));
-       $app         = strip_tags(defaults($_REQUEST, 'source', ''));
-       $extid       = strip_tags(defaults($_REQUEST, 'extid', ''));
-       $object      = defaults($_REQUEST, 'object', '');
+       $post_id     = intval($_REQUEST['post_id'] ?? 0);
+       $app         = strip_tags($_REQUEST['source'] ?? '');
+       $extid       = strip_tags($_REQUEST['extid'] ?? '');
+       $object      = $_REQUEST['object'] ?? '';
 
        // Don't use "defaults" here. It would turn 0 to 1
        if (!isset($_REQUEST['wall'])) {
@@ -194,20 +194,20 @@ function item_post(App $a) {
        $categories = '';
        $postopts = '';
        $emailcc = '';
-       $body = defaults($_REQUEST, 'body', '');
-       $has_attachment = defaults($_REQUEST, 'has_attachment', 0);
+       $body = $_REQUEST['body'] ?? '';
+       $has_attachment = $_REQUEST['has_attachment'] ?? 0;
 
        // If we have a speparate attachment, we need to add it to the body.
        if (!empty($has_attachment)) {
-               $attachment_type  = defaults($_REQUEST, 'attachment_type',  '');
-               $attachment_title = defaults($_REQUEST, 'attachment_title', '');
-               $attachment_text  = defaults($_REQUEST, 'attachment_text',  '');
+               $attachment_type  = $_REQUEST['attachment_type'] ??  '';
+               $attachment_title = $_REQUEST['attachment_title'] ?? '';
+               $attachment_text  = $_REQUEST['attachment_text'] ??  '';
 
-               $attachment_url     = hex2bin(defaults($_REQUEST, 'attachment_url',     ''));
-               $attachment_img_src = hex2bin(defaults($_REQUEST, 'attachment_img_src', ''));
+               $attachment_url     = hex2bin($_REQUEST['attachment_url'] ??     '');
+               $attachment_img_src = hex2bin($_REQUEST['attachment_img_src'] ?? '');
 
-               $attachment_img_width  = defaults($_REQUEST, 'attachment_img_width',  0);
-               $attachment_img_height = defaults($_REQUEST, 'attachment_img_height', 0);
+               $attachment_img_width  = $_REQUEST['attachment_img_width'] ??  0;
+               $attachment_img_height = $_REQUEST['attachment_img_height'] ?? 0;
                $attachment = [
                        'type'   => $attachment_type,
                        'title'  => $attachment_title,
@@ -266,22 +266,22 @@ function item_post(App $a) {
                        $str_contact_deny  = $user['deny_cid'];
                } else {
                        // use the posted permissions
-                       $str_group_allow   = perms2str(defaults($_REQUEST, 'group_allow', ''));
-                       $str_contact_allow = perms2str(defaults($_REQUEST, 'contact_allow', ''));
-                       $str_group_deny    = perms2str(defaults($_REQUEST, 'group_deny', ''));
-                       $str_contact_deny  = perms2str(defaults($_REQUEST, 'contact_deny', ''));
+                       $str_group_allow   = perms2str($_REQUEST['group_allow'] ?? '');
+                       $str_contact_allow = perms2str($_REQUEST['contact_allow'] ?? '');
+                       $str_group_deny    = perms2str($_REQUEST['group_deny'] ?? '');
+                       $str_contact_deny  = perms2str($_REQUEST['contact_deny'] ?? '');
                }
 
-               $title             = Strings::escapeTags(trim(defaults($_REQUEST, 'title'   , '')));
-               $location          = Strings::escapeTags(trim(defaults($_REQUEST, 'location', '')));
-               $coord             = Strings::escapeTags(trim(defaults($_REQUEST, 'coord'   , '')));
-               $verb              = Strings::escapeTags(trim(defaults($_REQUEST, 'verb'    , '')));
-               $emailcc           = Strings::escapeTags(trim(defaults($_REQUEST, 'emailcc' , '')));
+               $title             = Strings::escapeTags(trim($_REQUEST['title']    ?? ''));
+               $location          = Strings::escapeTags(trim($_REQUEST['location'] ?? ''));
+               $coord             = Strings::escapeTags(trim($_REQUEST['coord']    ?? ''));
+               $verb              = Strings::escapeTags(trim($_REQUEST['verb']     ?? ''));
+               $emailcc           = Strings::escapeTags(trim($_REQUEST['emailcc']  ?? ''));
                $body              = Strings::escapeHtml(trim($body));
-               $network           = Strings::escapeTags(trim(defaults($_REQUEST, 'network' , Protocol::DFRN)));
+               $network           = Strings::escapeTags(trim(($_REQUEST['network']  ?? '') ?: Protocol::DFRN));
                $guid              = System::createUUID();
 
-               $postopts = defaults($_REQUEST, 'postopts', '');
+               $postopts = $_REQUEST['postopts'] ?? '';
 
                $private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0);
 
@@ -304,7 +304,7 @@ function item_post(App $a) {
                        $wall              = $toplevel_item['wall'];
                }
 
-               $pubmail_enabled = defaults($_REQUEST, 'pubmail_enable', false) && !$private;
+               $pubmail_enabled = ($_REQUEST['pubmail_enable'] ?? false) && !$private;
 
                // if using the API, we won't see pubmail_enable - figure out if it should be set
                if ($api_source && $profile_uid && $profile_uid == local_user() && !$private) {
@@ -332,7 +332,7 @@ function item_post(App $a) {
 
        // save old and new categories, so we can determine what needs to be deleted from pconfig
        $categories_old = $categories;
-       $categories = FileTag::listToFile(trim(defaults($_REQUEST, 'category', '')), 'category');
+       $categories = FileTag::listToFile(trim($_REQUEST['category'] ?? ''), 'category');
        $categories_new = $categories;
 
        if (!empty($filedas) && is_array($filedas)) {
@@ -1012,7 +1012,7 @@ function handle_tag(&$body, &$inform, &$str_tags, $profile_uid, $tag, $network =
 
                        $profile = $contact["url"];
                        $alias   = $contact["alias"];
-                       $newname = defaults($contact, "name", $contact["nick"]);
+                       $newname = ($contact["name"] ?? '') ?: $contact["nick"];
                }
 
                //if there is an url for this persons profile

diff --git a/mod/match.php b/mod/match.php
index 2b3c7ca525b695ae45571afb9e9f193676869301..41346bc89d6a12e3788b616246e4a1c92abc6212 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -66,7 +66,7 @@ function match_content(App $a)
 
        $msearch = json_decode($msearch_json);
 
-       $start = defaults($_GET, 'start', 0);
+       $start = $_GET['start'] ?? 0;
        $entries = [];
        $paginate = '';
 
@@ -92,11 +92,11 @@ function match_content(App $a)
 
                        $entry = [
                                'url'          => Contact::magicLink($profile->url),
-                               'itemurl'      => defaults($contact_details, 'addr', $profile->url),
+                               'itemurl'      => $contact_details['addr'] ?? $profile->url,
                                'name'         => $profile->name,
-                               'details'      => defaults($contact_details, 'location', ''),
-                               'tags'         => defaults($contact_details, 'keywords', ''),
-                               'about'        => defaults($contact_details, 'about', ''),
+                               'details'      => $contact_details['location'] ?? '',
+                               'tags'         => $contact_details['keywords'] ?? '',
+                               'about'        => $contact_details['about'] ?? '',
                                'account_type' => Contact::getAccountType($contact_details),
                                'thumb'        => ProxyUtils::proxifyUrl($profile->photo, false, ProxyUtils::SIZE_THUMB),
                                'conntxt'      => L10n::t('Connect'),

diff --git a/mod/message.php b/mod/message.php
index fe4429e0008b8bf8741d5edde312e52e03be1015..393d5d276bdee950a8ca48049e4b1ede011d5121 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -249,8 +249,8 @@ function message_content(App $a)
                        '$prefill'    => $prefill,
                        '$preid'      => $preid,
                        '$subject'    => L10n::t('Subject:'),
-                       '$subjtxt'    => defaults($_REQUEST, 'subject', ''),
-                       '$text'       => defaults($_REQUEST, 'body', ''),
+                       '$subjtxt'    => $_REQUEST['subject'] ?? '',
+                       '$text'       => $_REQUEST['body'] ?? '',
                        '$readonly'   => '',
                        '$yourmessage'=> L10n::t('Your message:'),
                        '$select'     => $select,
@@ -530,7 +530,7 @@ function render_messages(array $msg, $t)
                        '$id' => $rr['id'],
                        '$from_name' => $participants,
                        '$from_url' => Contact::magicLink($rr['url']),
-                       '$from_addr' => defaults($contact, 'addr', ''),
+                       '$from_addr' => $contact['addr'] ?? '',
                        '$sparkle' => ' sparkle',
                        '$from_photo' => ProxyUtils::proxifyUrl($from_photo, false, ProxyUtils::SIZE_THUMB),
                        '$subject' => $rr['title'],

diff --git a/mod/msearch.php b/mod/msearch.php
index fcb93a32f01b5ec495b38f4641d817eadf3a45ec..e87a8f522c8d4ef11aeaa9be41291bc8b58ef48d 100644 (file)
--- a/mod/msearch.php
+++ b/mod/msearch.php
@@ -6,9 +6,9 @@ use Friendica\Database\DBA;
 
 function msearch_post(App $a)
 {
-       $search = defaults($_POST, 's', '');
-       $perpage  = intval(defaults($_POST, 'n', 80));
-       $page     = intval(defaults($_POST, 'p', 1));
+       $search = $_POST['s'] ?? '';
+       $perpage  = intval(($_POST['n'] ?? 0) ?: 80);
+       $page     = intval(($_POST['p'] ?? 0) ?: 1);
        $startrec = ($page - 1) * $perpage;
 
        $total = 0;

diff --git a/mod/network.php b/mod/network.php
index 515219827adea97c87a97b0fec33325541795ae4..0438be7059d7680ba8dbd926ef922473ed4bd9b5 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -66,7 +66,7 @@ function network_init(App $a)
 
        // fetch last used network view and redirect if needed
        if (!$is_a_date_query) {
-               $sel_nets = defaults($_GET, 'nets', '');
+               $sel_nets = $_GET['nets'] ?? '';
                $sel_tabs = network_query_get_sel_tab($a);
                $sel_groups = network_query_get_sel_group($a);
                $last_sel_tabs = PConfig::get(local_user(), 'network.view', 'tab.selected');
@@ -138,9 +138,9 @@ function network_init(App $a)
        $a->page['aside'] .= Group::sidebarWidget('network/0', 'network', 'standard', $group_id);
        $a->page['aside'] .= ForumManager::widget(local_user(), $cid);
        $a->page['aside'] .= Widget::postedByYear('network', local_user(), false);
-       $a->page['aside'] .= Widget::networks('network', defaults($_GET, 'nets', '') );
+       $a->page['aside'] .= Widget::networks('network', $_GET['nets'] ?? '');
        $a->page['aside'] .= Widget\SavedSearches::getHTML($a->query_string);
-       $a->page['aside'] .= Widget::fileAs('network', defaults($_GET, 'file', '') );
+       $a->page['aside'] .= Widget::fileAs('network', $_GET['file'] ?? '');
 }
 
 /**
@@ -356,7 +356,7 @@ function networkFlatView(App $a, $update = 0)
 
        $o = '';
 
-       $file = defaults($_GET, 'file', '');
+       $file = $_GET['file'] ?? '';
 
        if (!$update && !$rawmode) {
                $tabs = network_tabs($a);
@@ -479,12 +479,12 @@ function networkThreadedView(App $a, $update, $parent)
 
        $o = '';
 
-       $cid   = intval(defaults($_GET, 'cid'  , 0));
-       $star  = intval(defaults($_GET, 'star' , 0));
-       $bmark = intval(defaults($_GET, 'bmark', 0));
-       $conv  = intval(defaults($_GET, 'conv' , 0));
-       $order = Strings::escapeTags(defaults($_GET, 'order', 'comment'));
-       $nets  =        defaults($_GET, 'nets' , '');
+       $cid   = intval($_GET['cid']   ?? 0);
+       $star  = intval($_GET['star']  ?? 0);
+       $bmark = intval($_GET['bmark'] ?? 0);
+       $conv  = intval($_GET['conv']  ?? 0);
+       $order = Strings::escapeTags(($_GET['order'] ?? '') ?: 'comment');
+       $nets  =        $_GET['nets']  ?? '';
 
        $allowedCids = [];
        if ($cid) {
@@ -623,7 +623,7 @@ function networkThreadedView(App $a, $update, $parent)
                        $entries[0] = [
                                'id' => 'network',
                                'name' => $contact['name'],
-                               'itemurl' => defaults($contact, 'addr', $contact['nurl']),
+                               'itemurl' => ($contact['addr'] ?? '') ?: $contact['nurl'],
                                'thumb' => ProxyUtils::proxifyUrl($contact['thumb'], false, ProxyUtils::SIZE_THUMB),
                                'details' => $contact['location'],
                        ];
@@ -1013,7 +1013,7 @@ function network_infinite_scroll_head(App $a, &$htmlhead)
        global $pager;
 
        if (PConfig::get(local_user(), 'system', 'infinite_scroll')
-               && defaults($_GET, 'mode', '') != 'minimal'
+               && ($_GET['mode'] ?? '') != 'minimal'
        ) {
                $tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl');
                $htmlhead .= Renderer::replaceMacros($tpl, [

diff --git a/mod/noscrape.php b/mod/noscrape.php
index 5761df3ff902be078a0d91d0baec9cdbd8a4f5e0..7b8c0bdeb1f234b5310d605a117fd54089fe1085 100644 (file)
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -49,7 +49,7 @@ function noscrape_init(App $a)
                exit;
        }
 
-       $keywords = defaults($a->profile, 'pub_keywords', '');
+       $keywords = $a->profile['pub_keywords'] ?? '';
        $keywords = str_replace(['#',',',' ',',,'], ['',' ',',',','], $keywords);
        $keywords = explode(',', $keywords);
 

diff --git a/mod/notifications.php b/mod/notifications.php
index cd572895f14b3abd23e83ca56c9558f04c0aa784..8fbc5dac4964599967fc69df58276f1fbb5dbc64 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -78,8 +78,8 @@ function notifications_content(App $a)
                return Login::form();
        }
 
-       $page = defaults($_REQUEST, 'page', 1);
-       $show = defaults($_REQUEST, 'show', 0);
+       $page = ($_REQUEST['page'] ?? 0) ?: 1;
+       $show =  $_REQUEST['show'] ?? 0;
 
        Nav::setSelected('notifications');
 
@@ -158,7 +158,7 @@ function notifications_content(App $a)
        ];
 
        // Process the data for template creation
-       if (defaults($notifs, 'ident', '') === 'introductions') {
+       if (($notifs['ident'] ?? '') == 'introductions') {
                $sugg = Renderer::getMarkupTemplate('suggestions.tpl');
                $tpl = Renderer::getMarkupTemplate('intros.tpl');
 

diff --git a/mod/photos.php b/mod/photos.php
index 84be1c8285d0f0080bbdbe1e71470379c1e226c2..1789c0710e1ea6d74fcf34b3f22dba1dc597576d 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -63,9 +63,9 @@ function photos_init(App $a) {
                $vcard_widget = Renderer::replaceMacros($tpl, [
                        '$name' => $profile['name'],
                        '$photo' => $profile['photo'],
-                       '$addr' => defaults($profile, 'addr', ''),
+                       '$addr' => $profile['addr'] ?? '',
                        '$account_type' => $account_type,
-                       '$pdesc' => defaults($profile, 'pdesc', ''),
+                       '$pdesc' => $profile['pdesc'] ?? '',
                ]);
 
                $albums = Photo::getAlbums($a->data['user']['uid']);
@@ -630,10 +630,10 @@ function photos_post(App $a)
                $visible = 0;
        }
 
-       $group_allow   = defaults($_REQUEST, 'group_allow'  , []);
-       $contact_allow = defaults($_REQUEST, 'contact_allow', []);
-       $group_deny    = defaults($_REQUEST, 'group_deny'   , []);
-       $contact_deny  = defaults($_REQUEST, 'contact_deny' , []);
+       $group_allow   = $_REQUEST['group_allow']   ?? [];
+       $contact_allow = $_REQUEST['contact_allow'] ?? [];
+       $group_deny    = $_REQUEST['group_deny']    ?? [];
+       $contact_deny  = $_REQUEST['contact_deny']  ?? [];
 
        $str_group_allow   = perms2str(is_array($group_allow)   ? $group_allow   : explode(',', $group_allow));
        $str_contact_allow = perms2str(is_array($contact_allow) ? $contact_allow : explode(',', $contact_allow));
@@ -666,7 +666,7 @@ function photos_post(App $a)
                                notice(L10n::t('Image exceeds size limit of %s', ini_get('upload_max_filesize')) . EOL);
                                break;
                        case UPLOAD_ERR_FORM_SIZE:
-                               notice(L10n::t('Image exceeds size limit of %s', Strings::formatBytes(defaults($_REQUEST, 'MAX_FILE_SIZE', 0))) . EOL);
+                               notice(L10n::t('Image exceeds size limit of %s', Strings::formatBytes($_REQUEST['MAX_FILE_SIZE'] ?? 0)) . EOL);
                                break;
                        case UPLOAD_ERR_PARTIAL:
                                notice(L10n::t('Image upload didn\'t complete, please try again') . EOL);
@@ -1006,7 +1006,7 @@ function photos_content(App $a)
                $pager = new Pager($a->query_string, 20);
 
                /// @TODO I have seen this many times, maybe generalize it script-wide and encapsulate it?
-               $order_field = defaults($_GET, 'order', '');
+               $order_field = $_GET['order'] ?? '';
                if ($order_field === 'posted') {
                        $order = 'ASC';
                } else {
@@ -1158,7 +1158,7 @@ function photos_content(App $a)
                 * By now we hide it if someone wants to.
                 */
                if ($cmd === 'view' && !Config::get('system', 'no_count', false)) {
-                       $order_field = defaults($_GET, 'order', '');
+                       $order_field = $_GET['order'] ?? '';
 
                        if ($order_field === 'posted') {
                                $order = 'ASC';

diff --git a/mod/poco.php b/mod/poco.php
index c288f6b6393bf8a7bf3eb082b8714cb3dc4a914a..2ed871285b76586b38e30eb63def4c6d49816cb9 100644 (file)
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -36,7 +36,7 @@ function poco_init(App $a) {
                $system_mode = true;
        }
 
-       $format = defaults($_GET, 'format', 'json');
+       $format = ($_GET['format'] ?? '') ?: 'json';
 
        $justme = false;
        $global = false;

diff --git a/mod/pubsub.php b/mod/pubsub.php
index d10d7031d6e203507817288afed647e69a47ecc6..c008fb09dac3b93d887005f66c8874f576f45148 100644 (file)
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -33,10 +33,10 @@ function pubsub_init(App $a)
        $contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
 
        if ($_SERVER['REQUEST_METHOD'] === 'GET') {
-               $hub_mode      = Strings::escapeTags(trim(defaults($_GET, 'hub_mode', '')));
-               $hub_topic     = Strings::escapeTags(trim(defaults($_GET, 'hub_topic', '')));
-               $hub_challenge = Strings::escapeTags(trim(defaults($_GET, 'hub_challenge', '')));
-               $hub_verify    = Strings::escapeTags(trim(defaults($_GET, 'hub_verify_token', '')));
+               $hub_mode      = Strings::escapeTags(trim($_GET['hub_mode'] ?? ''));
+               $hub_topic     = Strings::escapeTags(trim($_GET['hub_topic'] ?? ''));
+               $hub_challenge = Strings::escapeTags(trim($_GET['hub_challenge'] ?? ''));
+               $hub_verify    = Strings::escapeTags(trim($_GET['hub_verify_token'] ?? ''));
 
                Logger::log('Subscription from ' . $_SERVER['REMOTE_ADDR'] . ' Mode: ' . $hub_mode . ' Nick: ' . $nick);
                Logger::log('Data: ' . print_r($_GET,true), Logger::DATA);

diff --git a/mod/redir.php b/mod/redir.php
index 12d93186e29d65e9a02052fa599ef9661cd59961..9d86f27a9624a70adcc8b86d11e76d4f20a63ee8 100644 (file)
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -13,7 +13,7 @@ use Friendica\Util\Strings;
 
 function redir_init(App $a) {
 
-       $url = defaults($_GET, 'url', '');
+       $url = $_GET['url'] ?? '';
        $quiet = !empty($_GET['quiet']) ? '&quiet=1' : '';
 
        if ($a->argc > 1 && intval($a->argv[1])) {
@@ -38,7 +38,7 @@ function redir_init(App $a) {
                if (!Session::isAuthenticated() // Visitors (not logged in or not remotes) can't authenticate.
                        || (!empty($a->contact['id']) && $a->contact['id'] == $cid)) // Local user is already authenticated.
                {
-                       $a->redirect(defaults($url, $contact_url));
+                       $a->redirect($url ?: $contact_url);
                }
 
                if ($contact['uid'] == 0 && local_user()) {
@@ -52,7 +52,7 @@ function redir_init(App $a) {
 
                        if (!empty($a->contact['id']) && $a->contact['id'] == $cid) {
                                // Local user is already authenticated.
-                               $target_url = defaults($url, $contact_url);
+                               $target_url = $url ?: $contact_url;
                                Logger::log($contact['name'] . " is already authenticated. Redirecting to " . $target_url, Logger::DEBUG);
                                $a->redirect($target_url);
                        }
@@ -68,7 +68,7 @@ function redir_init(App $a) {
                        // contact.
                        if (($host == $remotehost) && (Session::getRemoteContactID(Session::get('visitor_visiting')) == Session::get('visitor_id'))) {
                                // Remote user is already authenticated.
-                               $target_url = defaults($url, $contact_url);
+                               $target_url = $url ?: $contact_url;
                                Logger::log($contact['name'] . " is already authenticated. Redirecting to " . $target_url, Logger::DEBUG);
                                $a->redirect($target_url);
                        }
@@ -101,7 +101,7 @@ function redir_init(App $a) {
                                . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest . $quiet);
                }
 
-               $url = defaults($url, $contact_url);
+               $url = $url ?: $contact_url;
        }
 
        // If we don't have a connected contact, redirect with
@@ -142,7 +142,7 @@ function redir_magic($a, $cid, $url)
                }
        } else {
                $contact_url = $contact['url'];
-               $target_url = defaults($url, $contact_url);
+               $target_url = $url ?: $contact_url;
        }
 
        $basepath = Contact::getBasepath($contact_url);

diff --git a/mod/regmod.php b/mod/regmod.php
index 6cf4c8836c8de48a5c2b617ff625b3253f58ce20..295d8df25f5a02066c41d74376f8bdd0941f7bb4 100644 (file)
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -44,7 +44,7 @@ function user_allow($hash)
                $user,
                Config::get('config', 'sitename'),
                $a->getBaseUrl(),
-               defaults($register, 'password', 'Sent in a previous email')
+               ($register['password'] ?? '') ?: 'Sent in a previous email'
        );
 
        L10n::popLang();

diff --git a/mod/settings.php b/mod/settings.php
index 0d519e5a073ac3d26dbc3b14f02e06989c08d24b..b5011881cb9b5871308dba82c7d5f4211c955589 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -35,7 +35,7 @@ function get_theme_config_file($theme)
        $theme = Strings::sanitizeFilePathItem($theme);
 
        $a = \get_app();
-       $base_theme = defaults($a->theme_info, 'extends');
+       $base_theme = $a->theme_info['extends'] ?? '';
 
        if (file_exists("view/theme/$theme/config.php")) {
                return "view/theme/$theme/config.php";
@@ -180,11 +180,11 @@ function settings_post(App $a)
        if (($a->argc > 2) && ($a->argv[1] === 'oauth')  && ($a->argv[2] === 'edit'||($a->argv[2] === 'add')) && !empty($_POST['submit'])) {
                BaseModule::checkFormSecurityTokenRedirectOnError('/settings/oauth', 'settings_oauth');
 
-               $name     = defaults($_POST, 'name'    , '');
-               $key      = defaults($_POST, 'key'     , '');
-               $secret   = defaults($_POST, 'secret'  , '');
-               $redirect = defaults($_POST, 'redirect', '');
-               $icon     = defaults($_POST, 'icon'    , '');
+               $name     = $_POST['name']     ?? '';
+               $key      = $_POST['key']      ?? '';
+               $secret   = $_POST['secret']   ?? '';
+               $redirect = $_POST['redirect'] ?? '';
+               $icon     = $_POST['icon']     ?? '';
 
                if ($name == "" || $key == "" || $secret == "") {
                        notice(L10n::t("Missing some important data!"));
@@ -241,24 +241,21 @@ function settings_post(App $a)
                        PConfig::set(local_user(), 'ostatus', 'default_group', $_POST['group-selection']);
                        PConfig::set(local_user(), 'ostatus', 'legacy_contact', $_POST['legacy_contact']);
                } elseif (!empty($_POST['imap-submit'])) {
-
-                       $mail_server       = defaults($_POST, 'mail_server', '');
-                       $mail_port         = defaults($_POST, 'mail_port', '');
-                       $mail_ssl          = (!empty($_POST['mail_ssl']) ? strtolower(trim($_POST['mail_ssl'])) : '');
-                       $mail_user         = defaults($_POST, 'mail_user', '');
-                       $mail_pass         = (!empty($_POST['mail_pass']) ? trim($_POST['mail_pass']) : '');
-                       $mail_action       = (!empty($_POST['mail_action']) ? trim($_POST['mail_action']) : '');
-                       $mail_movetofolder = (!empty($_POST['mail_movetofolder']) ? trim($_POST['mail_movetofolder']) : '');
-                       $mail_replyto      = defaults($_POST, 'mail_replyto', '');
-                       $mail_pubmail      = defaults($_POST, 'mail_pubmail', '');
-
-
-                       $mail_disabled = ((function_exists('imap_open') && (!Config::get('system', 'imap_disabled'))) ? 0 : 1);
-                       if (Config::get('system', 'dfrn_only')) {
-                               $mail_disabled = 1;
-                       }
-
-                       if (!$mail_disabled) {
+                       $mail_server       =                 $_POST['mail_server']       ?? '';
+                       $mail_port         =                 $_POST['mail_port']         ?? '';
+                       $mail_ssl          = strtolower(trim($_POST['mail_ssl']          ?? ''));
+                       $mail_user         =                 $_POST['mail_user']         ?? '';
+                       $mail_pass         =            trim($_POST['mail_pass']         ?? '');
+                       $mail_action       =            trim($_POST['mail_action']       ?? '');
+                       $mail_movetofolder =            trim($_POST['mail_movetofolder'] ?? '');
+                       $mail_replyto      =                 $_POST['mail_replyto']      ?? '';
+                       $mail_pubmail      =                 $_POST['mail_pubmail']      ?? '';
+
+                       if (
+                               !Config::get('system', 'dfrn_only')
+                               && function_exists('imap_open')
+                               && !Config::get('system', 'imap_disabled')
+                       ) {
                                $failed = false;
                                $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
                                        intval(local_user())

diff --git a/mod/tagrm.php b/mod/tagrm.php
index f6f2a9a29ebe99a614e07100ec494c8012a03588..3f091f298ac5ac4e159964cd73abe513c0e77225 100644 (file)
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
@@ -22,11 +22,11 @@ function tagrm_post(App $a)
        }
 
        $tags = [];
-       foreach (defaults($_POST, 'tag', []) as $tag) {
+       foreach ($_POST['tag'] ?? [] as $tag) {
                $tags[] = hex2bin(Strings::escapeTags(trim($tag)));
        }
 
-       $item_id = defaults($_POST,'item', 0);
+       $item_id = $_POST['item'] ?? 0;
        update_tags($item_id, $tags);
        info(L10n::t('Tag(s) removed') . EOL);
 

diff --git a/mod/unfollow.php b/mod/unfollow.php
index a66c88aefd2d9dcfe993c4d81cef222f11efcbd7..7afd82c98a95b25f3e5e8a9ed3849e3706ec5ee1 100644 (file)
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -25,7 +25,7 @@ function unfollow_post(App $a)
        }
 
        $uid = local_user();
-       $url = Strings::escapeTags(trim(defaults($_REQUEST, 'url', '')));
+       $url = Strings::escapeTags(trim($_REQUEST['url'] ?? ''));
 
        $condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?)",
                $uid, Contact::SHARING, Contact::FRIEND, Strings::normaliseLink($url),

diff --git a/mod/videos.php b/mod/videos.php
index 48027a603e9450711b8b89d1dea4303740c1f58c..4174c7f48a2fed181d9fac8ed88560f4a319ca0f 100644 (file)
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -51,9 +51,9 @@ function videos_init(App $a)
                $vcard_widget = Renderer::replaceMacros($tpl, [
                        '$name' => $profile['name'],
                        '$photo' => $profile['photo'],
-                       '$addr' => defaults($profile, 'addr', ''),
+                       '$addr' => $profile['addr'] ?? '',
                        '$account_type' => $account_type,
-                       '$pdesc' => defaults($profile, 'pdesc', ''),
+                       '$pdesc' => $profile['pdesc'] ?? '',
                ]);
 
                // If not there, create 'aside' empty

diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index 780230b8c700e479dfc28744b41877ddb9b88f40..ad8ca96675d638b5a3a80651843423af9339c9f3 100644 (file)
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -131,8 +131,8 @@ function wallmessage_content(App $a) {
                '$subject'    => L10n::t('Subject:'),
                '$recipname'  => $user['username'],
                '$nickname'   => $user['nickname'],
-               '$subjtxt'    => defaults($_REQUEST, 'subject', ''),
-               '$text'       => defaults($_REQUEST, 'body', ''),
+               '$subjtxt'    => $_REQUEST['subject'] ?? '',
+               '$text'       => $_REQUEST['body'] ?? '',
                '$readonly'   => '',
                '$yourmessage'=> L10n::t('Your message:'),
                '$parent'     => '',