]> git.mxchange.org Git - friendica.git/commitdiff
Replace deprecated calls to defaults() by ?? and ?: in src/
authorHypolite Petovan <hypolite@mrpetovan.com>
Wed, 16 Oct 2019 12:35:14 +0000 (08:35 -0400)
committerHypolite Petovan <hypolite@mrpetovan.com>
Wed, 16 Oct 2019 12:38:52 +0000 (08:38 -0400)
41 files changed:
src/App/Arguments.php
src/App/BaseURL.php
src/Content/Pager.php
src/Content/Text/BBCode.php
src/Content/Text/HTML.php
src/Content/Widget/CalendarExport.php
src/Content/Widget/ContactBlock.php
src/Core/ACL.php
src/Core/Authentication.php
src/Core/NotificationsManager.php
src/Core/Renderer.php
src/Core/Search.php
src/Core/Session.php
src/Core/StorageManager.php
src/Database/DBStructure.php
src/Model/Contact.php
src/Model/Conversation.php
src/Model/Event.php
src/Model/GContact.php
src/Model/GServer.php
src/Model/Item.php
src/Model/ItemContent.php
src/Model/PermissionSet.php
src/Model/Profile.php
src/Model/Storage/Filesystem.php
src/Model/Term.php
src/Network/CurlResult.php
src/Network/Probe.php
src/Object/Post.php
src/Protocol/ActivityPub.php
src/Protocol/ActivityPub/Processor.php
src/Protocol/ActivityPub/Receiver.php
src/Protocol/DFRN.php
src/Protocol/Email.php
src/Protocol/OStatus.php
src/Util/Emailer.php
src/Util/Network.php
src/Util/ParseUrl.php
src/Util/Profiler.php
src/Worker/Delivery.php
src/Worker/GProbe.php

index 8047186a0762d3dec2cb89893331e0268a93fad2..e65309f6b0ab18dd38bc4ffebd0dcaa266139683 100644 (file)
@@ -70,7 +70,7 @@ class Arguments
 
        /**
         * Returns the value of a argv key
-        * @todo there are a lot of $a->argv usages in combination with defaults() which can be replaced with this method
+        * @todo there are a lot of $a->argv usages in combination with ?? which can be replaced with this method
         *
         * @param int   $position the position of the argument
         * @param mixed $default  the default value if not found
index ad5fd0d4ede3d360b2dd76f5f2c84d8cd95b2155..9d9a2711e9530e4ab12d40294ecc86fa6052989f 100644 (file)
@@ -338,12 +338,12 @@ class BaseURL
                /* Relative script path to the web server root
                 * Not all of those $_SERVER properties can be present, so we do by inverse priority order
                 */
-               $relative_script_path = '';
-               $relative_script_path = defaults($this->server, 'REDIRECT_URL', $relative_script_path);
-               $relative_script_path = defaults($this->server, 'REDIRECT_URI', $relative_script_path);
-               $relative_script_path = defaults($this->server, 'REDIRECT_SCRIPT_URL', $relative_script_path);
-               $relative_script_path = defaults($this->server, 'SCRIPT_URL', $relative_script_path);
-               $relative_script_path = defaults($this->server, 'REQUEST_URI', $relative_script_path);
+               $relative_script_path =
+                       ($this->server['REDIRECT_URL']        ?? '' ) ?:
+                       ($this->server['REDIRECT_URI']        ?? '' ) ?:
+                       ($this->server['REDIRECT_SCRIPT_URL'] ?? '' ) ?:
+                       ($this->server['SCRIPT_URL']          ?? '' ) ?:
+                        $this->server['REQUEST_URI']         ?? '';
 
                /* $relative_script_path gives /relative/path/to/friendica/module/parameter
                 * QUERY_STRING gives pagename=module/parameter
index c9acb63f236c4c361479a22bdf8af3b918776c67..c12608d45d84bbfb10173486c59978230f943522 100644 (file)
@@ -39,7 +39,7 @@ class Pager
        {
                $this->setQueryString($queryString);
                $this->setItemsPerPage($itemsPerPage);
-               $this->setPage(defaults($_GET, 'page', 1));
+               $this->setPage(($_GET['page'] ?? 0) ?: 1);
        }
 
        /**
index 760247f2cb6bd22dce37535f08ea5a9b686adb87..75f5d506e1b60339943db55943c7ae1afc71c96d 100644 (file)
@@ -244,7 +244,7 @@ class BBCode extends BaseObject
                */
 
                $has_title = !empty($item['title']);
-               $plink = defaults($item, 'plink', '');
+               $plink = $item['plink'] ?? '';
                $post = self::getAttachmentData($body);
 
                // Get all linked images with alternative image description
@@ -610,7 +610,7 @@ class BBCode extends BaseObject
                                        throw new Exception('OEmbed is disabled for this attachment.');
                                }
                        } catch (Exception $e) {
-                               $data['title'] = defaults($data, 'title', $data['url']);
+                               $data['title'] = ($data['title'] ?? '') ?: $data['url'];
 
                                if ($simplehtml != 4) {
                                        $return = sprintf('<div class="type-%s">', $data['type']);
@@ -645,7 +645,7 @@ class BBCode extends BaseObject
                        }
                }
 
-               return trim(defaults($data, 'text', '') . ' ' . $return . ' ' . defaults($data, 'after', ''));
+               return trim(($data['text'] ?? '') . ' ' . $return . ' ' . ($data['after'] ?? ''));
        }
 
        public static function removeShareInformation($Text, $plaintext = false, $nolink = false)
@@ -655,10 +655,10 @@ class BBCode extends BaseObject
                if (!$data) {
                        return $Text;
                } elseif ($nolink) {
-                       return $data['text'] . defaults($data, 'after', '');
+                       return $data['text'] . ($data['after'] ?? '');
                }
 
-               $title = htmlentities(defaults($data, 'title', ''), ENT_QUOTES, 'UTF-8', false);
+               $title = htmlentities($data['title'] ?? '', ENT_QUOTES, 'UTF-8', false);
                $text = htmlentities($data['text'], ENT_QUOTES, 'UTF-8', false);
                if ($plaintext || (($title != '') && strstr($text, $title))) {
                        $data['title'] = $data['url'];
@@ -941,7 +941,7 @@ class BBCode extends BaseObject
                                $attributes = [];
                                foreach(['author', 'profile', 'avatar', 'link', 'posted'] as $field) {
                                        preg_match("/$field=(['\"])(.+?)\\1/ism", $attribute_string, $matches);
-                                       $attributes[$field] = html_entity_decode(defaults($matches, 2, ''), ENT_QUOTES, 'UTF-8');
+                                       $attributes[$field] = html_entity_decode($matches[2] ?? '', ENT_QUOTES, 'UTF-8');
                                }
 
                                // We only call this so that a previously unknown contact can be added.
@@ -960,11 +960,11 @@ class BBCode extends BaseObject
                                Contact::getIdForURL($attributes['profile'], 0, true, $default);
 
                                $author_contact = Contact::getDetailsByURL($attributes['profile']);
-                               $author_contact['addr'] = defaults($author_contact, 'addr' , Protocol::getAddrFromProfileUrl($attributes['profile']));
+                               $author_contact['addr'] = ($author_contact['addr']  ?? '') ?: Protocol::getAddrFromProfileUrl($attributes['profile']);
 
-                               $attributes['author']   = defaults($author_contact, 'name' , $attributes['author']);
-                               $attributes['avatar']   = defaults($author_contact, 'micro', $attributes['avatar']);
-                               $attributes['profile']  = defaults($author_contact, 'url'  , $attributes['profile']);
+                               $attributes['author']   = ($author_contact['name']  ?? '') ?: $attributes['author'];
+                               $attributes['avatar']   = ($author_contact['micro'] ?? '') ?: $attributes['avatar'];
+                               $attributes['profile']  = ($author_contact['url']   ?? '') ?: $attributes['profile'];
 
                                if ($attributes['avatar']) {
                                        $attributes['avatar'] = ProxyUtils::proxifyUrl($attributes['avatar'], false, ProxyUtils::SIZE_THUMB);
@@ -1241,7 +1241,7 @@ class BBCode extends BaseObject
                $try_oembed_callback = function ($match)
                {
                        $url = $match[1];
-                       $title = defaults($match, 2, null);
+                       $title = $match[2] ?? null;
 
                        try {
                                $return = OEmbed::getHTML($url, $title);
index 549025dec00b4b26c9d6865a5cd133517b206a1d..390a97f0f575dce34a4a4bab3150a467dfede47a 100644 (file)
@@ -872,8 +872,8 @@ class HTML
                        $url = '';
                }
 
-               return Renderer::replaceMacros(Renderer::getMarkupTemplate(($textmode)?'micropro_txt.tpl':'micropro_img.tpl'), [
-                       '$click' => defaults($contact, 'click', ''),
+               return Renderer::replaceMacros(Renderer::getMarkupTemplate($textmode ? 'micropro_txt.tpl' : 'micropro_img.tpl'), [
+                       '$click' => $contact['click'] ?? '',
                        '$class' => $class,
                        '$url' => $url,
                        '$photo' => ProxyUtils::proxifyUrl($contact['thumb'], false, ProxyUtils::SIZE_THUMB),
index 829d267d8fd5ea9ee5668efade3a72cef6fdd936..c78ca21ebe6f4ad286c999c2b493186d0c4026cf 100644 (file)
@@ -57,7 +57,7 @@ class CalendarExport
 
                // $a->data is only available if the profile page is visited. If the visited page is not part
                // of the profile page it should be the personal /events page. So we can use $a->user.
-               $user = defaults($a->data['user'], 'nickname', $a->user['nickname']);
+               $user = ($a->data['user']['nickname'] ?? '') ?: $a->user['nickname'];
 
                $tpl = Renderer::getMarkupTemplate("widget/events.tpl");
                $return = Renderer::replaceMacros($tpl, [
index ef152f900846fbfcaa7061475eb37499a29e94cc..ec78dae9224cff7d789ee68a26e18c42e14e0d68 100644 (file)
@@ -61,7 +61,7 @@ class ContactBlock
 
                if ($total) {
                        // Only show followed for personal accounts, followers for pages
-                       if (defaults($profile, 'account-type', User::ACCOUNT_TYPE_PERSON) == User::ACCOUNT_TYPE_PERSON) {
+                       if ((($profile['account-type'] ?? '') ?: User::ACCOUNT_TYPE_PERSON) == User::ACCOUNT_TYPE_PERSON) {
                                $rel = [Contact::SHARING, Contact::FRIEND];
                        } else {
                                $rel = [Contact::FOLLOWER, Contact::FRIEND];
index fd9bfc6e22e574f23bdfe6f2623b0204d67d7110..df2f86e2b7a296288f41fd6814eba8fb146dd6ce 100644 (file)
@@ -41,12 +41,12 @@ class ACL extends BaseObject
 
                $networks = null;
 
-               $size = defaults($options, 'size', 4);
+               $size = ($options['size'] ?? 0) ?: 4;
                $mutual = !empty($options['mutual_friends']);
                $single = !empty($options['single']) && empty($options['multiple']);
-               $exclude = defaults($options, 'exclude', false);
+               $exclude = $options['exclude'] ?? false;
 
-               switch (defaults($options, 'networks', Protocol::PHANTOM)) {
+               switch (($options['networks'] ?? '') ?: Protocol::PHANTOM) {
                        case 'DFRN_ONLY':
                                $networks = [Protocol::DFRN];
                                break;
@@ -226,13 +226,13 @@ class ACL extends BaseObject
 
                $acl_regex = '/<([0-9]+)>/i';
 
-               preg_match_all($acl_regex, defaults($user, 'allow_cid', ''), $matches);
+               preg_match_all($acl_regex, $user['allow_cid'] ?? '', $matches);
                $allow_cid = $matches[1];
-               preg_match_all($acl_regex, defaults($user, 'allow_gid', ''), $matches);
+               preg_match_all($acl_regex, $user['allow_gid'] ?? '', $matches);
                $allow_gid = $matches[1];
-               preg_match_all($acl_regex, defaults($user, 'deny_cid', ''), $matches);
+               preg_match_all($acl_regex, $user['deny_cid'] ?? '', $matches);
                $deny_cid = $matches[1];
-               preg_match_all($acl_regex, defaults($user, 'deny_gid', ''), $matches);
+               preg_match_all($acl_regex, $user['deny_gid'] ?? '', $matches);
                $deny_gid = $matches[1];
 
                // Reformats the ACL data so that it is accepted by the JS frontend
@@ -301,10 +301,10 @@ class ACL extends BaseObject
                        '$showall' => L10n::t('Visible to everybody'),
                        '$show' => L10n::t('show'),
                        '$hide' => L10n::t('don\'t show'),
-                       '$allowcid' => json_encode(defaults($default_permissions, 'allow_cid', [])), // we need arrays for Javascript since we call .remove() and .push() on this values
-                       '$allowgid' => json_encode(defaults($default_permissions, 'allow_gid', [])),
-                       '$denycid' => json_encode(defaults($default_permissions, 'deny_cid', [])),
-                       '$denygid' => json_encode(defaults($default_permissions, 'deny_gid', [])),
+                       '$allowcid' => json_encode(($default_permissions['allow_cid'] ?? '') ?: []), // We need arrays for
+                       '$allowgid' => json_encode(($default_permissions['allow_gid'] ?? '') ?: []), // Javascript since we
+                       '$denycid'  => json_encode(($default_permissions['deny_cid']  ?? '') ?: []), // call .remove() and
+                       '$denygid'  => json_encode(($default_permissions['deny_gid']  ?? '') ?: []), // .push() on these values
                        '$networks' => $show_jotnets,
                        '$emailcc' => L10n::t('CC: email addresses'),
                        '$emtitle' => L10n::t('Example: bob@example.com, mary@example.com'),
index d67a67bba59ea09c3986b2546411a82716dd30c9..6d017664aa1ec5c5d37a49df3546672bbe206c12 100644 (file)
@@ -49,7 +49,7 @@ class Authentication extends BaseObject
                        $value = json_encode([
                                "uid" => $user["uid"],
                                "hash" => self::getCookieHashForUser($user),
-                               "ip" => defaults($_SERVER, 'REMOTE_ADDR', '0.0.0.0')
+                               "ip" => ($_SERVER['REMOTE_ADDR'] ?? '') ?: '0.0.0.0'
                        ]);
                } else {
                        $value = "";
index a6a5c24e013f060944beaa54f50e0612480e18a4..3c8367c91e2938532d0181449804c51bb411a43d 100644 (file)
@@ -137,7 +137,7 @@ class NotificationsManager extends BaseObject
         */
        public function getTabs()
        {
-               $selected = defaults(self::getApp()->argv, 1, '');
+               $selected = self::getApp()->argv[1] ?? '';
 
                $tabs = [
                        [
index fd5e73302512f0d8328690958941d2e356b8415c..d9d913050fe32a34f324e6900640eff1cc853ceb 100644 (file)
@@ -136,7 +136,7 @@ class Renderer extends BaseObject
         */
        public static function getTemplateEngine()
        {
-               $template_engine = defaults(self::$theme, 'template_engine', 'smarty3');
+               $template_engine = (self::$theme['template_engine'] ?? '') ?: 'smarty3';
 
                if (isset(self::$template_engines[$template_engine])) {
                        if (isset(self::$template_engine_instance[$template_engine])) {
index 5792fb1c9e57c3e525474e8389563c9561fd3154..9700c647225882fe308e4be6568babcbc6645778 100644 (file)
@@ -56,21 +56,20 @@ class Search extends BaseObject
                        }
 
                        // Ensure that we do have a contact entry
-                       Contact::getIdForURL(defaults($user_data, 'url', ''));
+                       Contact::getIdForURL($user_data['url'] ?? '');
 
-                       $contactDetails = Contact::getDetailsByURL(defaults($user_data, 'url', ''), local_user());
-                       $itemUrl        = defaults($contactDetails, 'addr', defaults($user_data, 'url', ''));
+                       $contactDetails = Contact::getDetailsByURL($user_data['url'] ?? '', local_user());
 
                        $result = new ContactResult(
-                               defaults($user_data, 'name', ''),
-                               defaults($user_data, 'addr', ''),
-                               $itemUrl,
-                               defaults($user_data, 'url', ''),
-                               defaults($user_data, 'photo', ''),
-                               defaults($user_data, 'network', ''),
-                               defaults($contactDetails, 'id', 0),
+                               $user_data['name'] ?? '',
+                               $user_data['addr'] ?? '',
+                               ($contactDetails['addr'] ?? '') ?: ($user_data['url'] ?? ''),
+                               $user_data['url'] ?? '',
+                               $user_data['photo'] ?? '',
+                               $user_data['network'] ?? '',
+                               $contactDetails['id'] ?? 0,
                                0,
-                               defaults($user_data, 'tags', '')
+                               $user_data['tags'] ?? ''
                        );
 
                        return new ResultList(1, 1, 1, [$result]);
@@ -117,27 +116,28 @@ class Search extends BaseObject
                $results = json_decode($resultJson, true);
 
                $resultList = new ResultList(
-                       defaults($results, 'page', 1),
-                       defaults($results, 'count', 0),
-                       defaults($results, 'itemsperpage', 30)
+                       ($results['page']         ?? 0) ?: 1,
+                        $results['count']        ?? 0,
+                       ($results['itemsperpage'] ?? 0) ?: 30
                );
 
-               $profiles = defaults($results, 'profiles', []);
+               $profiles = $results['profiles'] ?? [];
 
                foreach ($profiles as $profile) {
-                       $contactDetails = Contact::getDetailsByURL(defaults($profile, 'profile_url', ''), local_user());
-                       $itemUrl        = defaults($contactDetails, 'addr', defaults($profile, 'profile_url', ''));
+                       $profile_url = $profile['profile_url'] ?? '';
+                       $contactDetails = Contact::getDetailsByURL($profile_url, local_user());
 
                        $result = new ContactResult(
-                               defaults($profile, 'name', ''),
-                               defaults($profile, 'addr', ''),
-                               $itemUrl,
-                               defaults($profile, 'profile_url', ''),
-                               defaults($profile, 'photo', ''),
+                               $profile['name'] ?? '',
+                               $profile['addr'] ?? '',
+                               ($contactDetails['addr'] ?? '') ?: $profile_url,
+                               $profile_url,
+                               $profile['photo'] ?? '',
                                Protocol::DFRN,
-                               defaults($contactDetails, 'cid', 0),
+                               $contactDetails['cid'] ?? 0,
                                0,
-                               defaults($profile, 'tags', ''));
+                               $profile['tags'] ?? ''
+                       );
 
                        $resultList->addResult($result);
                }
index 3a0da3ab0825ad6261703780ea92dd23e2720434..aaead868a0377cdff2999e7788a63e05c628d292 100644 (file)
@@ -128,7 +128,7 @@ class Session
                        'page_flags'    => $user_record['page-flags'],
                        'my_url'        => $a->getBaseURL() . '/profile/' . $user_record['nickname'],
                        'my_address'    => $user_record['nickname'] . '@' . substr($a->getBaseURL(), strpos($a->getBaseURL(), '://') + 3),
-                       'addr'          => defaults($_SERVER, 'REMOTE_ADDR', '0.0.0.0')
+                       'addr'          => ($_SERVER['REMOTE_ADDR'] ?? '') ?: '0.0.0.0'
                ]);
 
                self::setVisitorsContacts();
index 8cd7d439531824b3b836e086a4cfd0d71db2ca05..832d9819c5c3ea8423b03dac17cbf8af4d7c08ae 100644 (file)
@@ -48,7 +48,7 @@ class StorageManager
        public static function getByName($name)
        {
                self::setup();
-               return defaults(self::$backends, $name, '');
+               return self::$backends[$name] ?? '';
        }
 
        /**
index 72b903e076d6e6e931ff41981848a386b3a7752f..0c775377e493c7a2353538c0e7262d39c4b36711 100644 (file)
@@ -421,7 +421,7 @@ class DBStructure
                                }
 
                                if (isset($database[$name]["table_status"]["Comment"])) {
-                                       $structurecomment = defaults($structure, "comment", "");
+                                       $structurecomment = $structure["comment"] ?? '';
                                        if ($database[$name]["table_status"]["Comment"] != $structurecomment) {
                                                $sql2 = "COMMENT = '" . DBA::escape($structurecomment) . "'";
 
@@ -465,7 +465,7 @@ class DBStructure
                                // Compare the field structure field by field
                                foreach ($structure["fields"] AS $fieldname => $parameters) {
                                        // Compare the field definition
-                                       $field_definition = defaults($database[$name]["fields"], $fieldname, ['Collation' => '']);
+                                       $field_definition = ($database[$name]["fields"][$fieldname] ?? '') ?: ['Collation' => ''];
 
                                        // Define the default collation if not given
                                        if (!isset($parameters['Collation']) && !empty($field_definition['Collation'])) {
index 5ae99552235fae196192adf784edd6eb6873296a..3033bb90b1045e844e8146470f6af3663d6d443c 100644 (file)
@@ -1078,14 +1078,14 @@ class Contact extends BaseObject
                        $profile["micro"] = $profile["thumb"];
                }
 
-               if ((empty($profile["addr"]) || empty($profile["name"])) && (defaults($profile, "gid", 0) != 0)
+               if ((empty($profile["addr"]) || empty($profile["name"])) && !empty($profile["gid"])
                        && in_array($profile["network"], Protocol::FEDERATED)
                ) {
                        Worker::add(PRIORITY_LOW, "UpdateGContact", $url);
                }
 
                // Show contact details of Diaspora contacts only if connected
-               if ((defaults($profile, "cid", 0) == 0) && (defaults($profile, "network", "") == Protocol::DIASPORA)) {
+               if (empty($profile["cid"]) && ($profile["network"] ?? "") == Protocol::DIASPORA) {
                        $profile["location"] = "";
                        $profile["about"] = "";
                        $profile["gender"] = "";
@@ -1504,25 +1504,25 @@ class Contact extends BaseObject
                                'created'   => DateTimeFormat::utcNow(),
                                'url'       => $data['url'],
                                'nurl'      => Strings::normaliseLink($data['url']),
-                               'addr'      => defaults($data, 'addr', ''),
-                               'alias'     => defaults($data, 'alias', ''),
-                               'notify'    => defaults($data, 'notify', ''),
-                               'poll'      => defaults($data, 'poll', ''),
-                               'name'      => defaults($data, 'name', ''),
-                               'nick'      => defaults($data, 'nick', ''),
-                               'photo'     => defaults($data, 'photo', ''),
-                               'keywords'  => defaults($data, 'keywords', ''),
-                               'location'  => defaults($data, 'location', ''),
-                               'about'     => defaults($data, 'about', ''),
+                               'addr'      => $data['addr'] ?? '',
+                               'alias'     => $data['alias'] ?? '',
+                               'notify'    => $data['notify'] ?? '',
+                               'poll'      => $data['poll'] ?? '',
+                               'name'      => $data['name'] ?? '',
+                               'nick'      => $data['nick'] ?? '',
+                               'photo'     => $data['photo'] ?? '',
+                               'keywords'  => $data['keywords'] ?? '',
+                               'location'  => $data['location'] ?? '',
+                               'about'     => $data['about'] ?? '',
                                'network'   => $data['network'],
-                               'pubkey'    => defaults($data, 'pubkey', ''),
+                               'pubkey'    => $data['pubkey'] ?? '',
                                'rel'       => self::SHARING,
-                               'priority'  => defaults($data, 'priority', 0),
-                               'batch'     => defaults($data, 'batch', ''),
-                               'request'   => defaults($data, 'request', ''),
-                               'confirm'   => defaults($data, 'confirm', ''),
-                               'poco'      => defaults($data, 'poco', ''),
-                               'baseurl'   => defaults($data, 'baseurl', ''),
+                               'priority'  => $data['priority'] ?? 0,
+                               'batch'     => $data['batch'] ?? '',
+                               'request'   => $data['request'] ?? '',
+                               'confirm'   => $data['confirm'] ?? '',
+                               'poco'      => $data['poco'] ?? '',
+                               'baseurl'   => $data['baseurl'] ?? '',
                                'name-date' => DateTimeFormat::utcNow(),
                                'uri-date'  => DateTimeFormat::utcNow(),
                                'avatar-date' => DateTimeFormat::utcNow(),
@@ -1589,7 +1589,7 @@ class Contact extends BaseObject
                        $fields = ['addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'baseurl'];
 
                        foreach ($fields as $field) {
-                               $updated[$field] = defaults($data, $field, $contact[$field]);
+                               $updated[$field] = ($data[$field] ?? '') ?: $contact[$field];
                        }
 
                        if (($updated['addr'] != $contact['addr']) || (!empty($data['alias']) && ($data['alias'] != $contact['alias']))) {
@@ -2469,9 +2469,9 @@ class Contact extends BaseObject
                        return false;
                }
 
-               $url = defaults($datarray, 'author-link', $pub_contact['url']);
+               $url = ($datarray['author-link'] ?? '') ?: $pub_contact['url'];
                $name = $pub_contact['name'];
-               $photo = defaults($pub_contact, 'avatar', $pub_contact["photo"]);
+               $photo = ($pub_contact['avatar'] ?? '') ?: $pub_contact["photo"];
                $nick = $pub_contact['nick'];
                $network = $pub_contact['network'];
 
index 06d3ba536d0567544af65558a85dc74d14eb47f3..2ef58636a0c8f0c51eab0a13a8881d42603dcd40 100644 (file)
@@ -39,7 +39,7 @@ class Conversation
         */
        public static function insert(array $arr)
        {
-               if (in_array(defaults($arr, 'network', Protocol::PHANTOM),
+               if (in_array(($arr['network'] ?? '') ?: Protocol::PHANTOM,
                        [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, Protocol::TWITTER]) && !empty($arr['uri'])) {
                        $conversation = ['item-uri' => $arr['uri'], 'received' => DateTimeFormat::utcNow()];
 
@@ -76,8 +76,13 @@ class Conversation
                                        unset($old_conv['source']);
                                }
                                // Update structure data all the time but the source only when its from a better protocol.
-                               if (empty($conversation['source']) || (!empty($old_conv['source']) &&
-                                       ($old_conv['protocol'] < defaults($conversation, 'protocol', self::PARCEL_UNKNOWN)))) {
+                               if (
+                                       empty($conversation['source'])
+                                       || (
+                                               !empty($old_conv['source'])
+                                               && ($old_conv['protocol'] < (($conversation['protocol'] ?? '') ?: self::PARCEL_UNKNOWN))
+                                       )
+                               ) {
                                        unset($conversation['protocol']);
                                        unset($conversation['source']);
                                }
index 42742f18e0684170db80adfb9969420d39baf6e8..91521808447ad472b8d3935474673685ff65d56c 100644 (file)
@@ -242,30 +242,30 @@ class Event extends BaseObject
        public static function store($arr)
        {
                $event = [];
-               $event['id']        = intval(defaults($arr, 'id'       , 0));
-               $event['uid']       = intval(defaults($arr, 'uid'      , 0));
-               $event['cid']       = intval(defaults($arr, 'cid'      , 0));
-               $event['guid']      =        defaults($arr, 'guid'     , System::createUUID());
-               $event['uri']       =        defaults($arr, 'uri'      , Item::newURI($event['uid'], $event['guid']));
-               $event['type']      =        defaults($arr, 'type'     , 'event');
-               $event['summary']   =        defaults($arr, 'summary'  , '');
-               $event['desc']      =        defaults($arr, 'desc'     , '');
-               $event['location']  =        defaults($arr, 'location' , '');
-               $event['allow_cid'] =        defaults($arr, 'allow_cid', '');
-               $event['allow_gid'] =        defaults($arr, 'allow_gid', '');
-               $event['deny_cid']  =        defaults($arr, 'deny_cid' , '');
-               $event['deny_gid']  =        defaults($arr, 'deny_gid' , '');
-               $event['adjust']    = intval(defaults($arr, 'adjust'   , 0));
-               $event['nofinish']  = intval(defaults($arr, 'nofinish' , !empty($event['start']) && empty($event['finish'])));
-
-               $event['created']   = DateTimeFormat::utc(defaults($arr, 'created'  , 'now'));
-               $event['edited']    = DateTimeFormat::utc(defaults($arr, 'edited'   , 'now'));
-               $event['start']     = DateTimeFormat::utc(defaults($arr, 'start'    , DBA::NULL_DATETIME));
-               $event['finish']    = DateTimeFormat::utc(defaults($arr, 'finish'   , DBA::NULL_DATETIME));
+               $event['id']        = intval($arr['id']        ?? 0);
+               $event['uid']       = intval($arr['uid']       ?? 0);
+               $event['cid']       = intval($arr['cid']       ?? 0);
+               $event['guid']      =       ($arr['guid']      ?? '') ?: System::createUUID();
+               $event['uri']       =       ($arr['uri']       ?? '') ?: Item::newURI($event['uid'], $event['guid']);
+               $event['type']      =       ($arr['type']      ?? '') ?: 'event';
+               $event['summary']   =        $arr['summary']   ?? '';
+               $event['desc']      =        $arr['desc']      ?? '';
+               $event['location']  =        $arr['location']  ?? '';
+               $event['allow_cid'] =        $arr['allow_cid'] ?? '';
+               $event['allow_gid'] =        $arr['allow_gid'] ?? '';
+               $event['deny_cid']  =        $arr['deny_cid']  ?? '';
+               $event['deny_gid']  =        $arr['deny_gid']  ?? '';
+               $event['adjust']    = intval($arr['adjust']    ?? 0);
+               $event['nofinish']  = intval(!empty($arr['nofinish'] || !empty($event['start']) && empty($event['finish'])));
+
+               $event['created']   = DateTimeFormat::utc(($arr['created'] ?? '') ?: 'now');
+               $event['edited']    = DateTimeFormat::utc(($arr['edited']  ?? '') ?: 'now');
+               $event['start']     = DateTimeFormat::utc(($arr['start']   ?? '') ?: DBA::NULL_DATETIME);
+               $event['finish']    = DateTimeFormat::utc(($arr['finish']  ?? '') ?: DBA::NULL_DATETIME);
                if ($event['finish'] < DBA::NULL_DATETIME) {
                        $event['finish'] = DBA::NULL_DATETIME;
                }
-               $private = intval(defaults($arr, 'private', 0));
+               $private = intval($arr['private'] ?? 0);
 
                $conditions = ['uid' => $event['uid']];
                if ($event['cid']) {
@@ -333,7 +333,7 @@ class Event extends BaseObject
                                $item_arr['uri']           = $event['uri'];
                                $item_arr['parent-uri']    = $event['uri'];
                                $item_arr['guid']          = $event['guid'];
-                               $item_arr['plink']         = defaults($arr, 'plink', '');
+                               $item_arr['plink']         = $arr['plink'] ?? '';
                                $item_arr['post-type']     = Item::PT_EVENT;
                                $item_arr['wall']          = $event['cid'] ? 0 : 1;
                                $item_arr['contact-id']    = $contact['id'];
index d6d69e98c2acd55b9591524887f28e51a8ff7f90..f3ce0c92cc64f133731ca75d4f86795a55f14b88 100644 (file)
@@ -686,9 +686,9 @@ class GContact
                                $doprobing = (((time() - $last_contact) > (90 * 86400)) && ((time() - $last_failure) > (90 * 86400)));
                        }
                } else {
-                       $contact['location'] = defaults($contact, 'location', '');
-                       $contact['about'] = defaults($contact, 'about', '');
-                       $contact['generation'] = defaults($contact, 'generation', 0);
+                       $contact['location'] = $contact['location'] ?? '';
+                       $contact['about'] = $contact['about'] ?? '';
+                       $contact['generation'] = $contact['generation'] ?? 0;
 
                        q(
                                "INSERT INTO `gcontact` (`name`, `nick`, `addr` , `network`, `url`, `nurl`, `photo`, `created`, `updated`, `location`, `about`, `hide`, `generation`)
index b86b5506cecb52508101df9065f55e204b8ae2c2..d759a24dff88f44adf9a6404cfccce754490866b 100644 (file)
@@ -814,7 +814,7 @@ class GServer
 
                if (!empty($data['version'])) {
                        $serverdata['platform'] = 'mastodon';
-                       $serverdata['version'] = defaults($data, 'version', '');
+                       $serverdata['version'] = $data['version'] ?? '';
                        $serverdata['network'] = Protocol::ACTIVITYPUB;
                }
 
@@ -1010,7 +1010,7 @@ class GServer
                        $serverdata['info'] = trim($data['info']);
                }
 
-               $register_policy = defaults($data, 'register_policy', 'REGISTER_CLOSED');
+               $register_policy = ($data['register_policy'] ?? '') ?: 'REGISTER_CLOSED';
                switch ($register_policy) {
                        case 'REGISTER_OPEN':
                                $serverdata['register_policy'] = Register::OPEN;
@@ -1030,7 +1030,7 @@ class GServer
                                break;
                }
 
-               $serverdata['platform'] = defaults($data, 'platform', '');
+               $serverdata['platform'] = $data['platform'] ?? '';
 
                return $serverdata;
        }
index c73ea99b1bfb3d863207f1827253fb6ad59ec7c4..ff0f46676f0e6d560991a0551505c9fb0a9db599 100644 (file)
@@ -1313,11 +1313,11 @@ class Item extends BaseObject
                                $priority = $notify;
                        }
                } else {
-                       $item['network'] = trim(defaults($item, 'network', Protocol::PHANTOM));
+                       $item['network'] = trim(($item['network'] ?? '') ?: Protocol::PHANTOM);
                }
 
                $item['guid'] = self::guid($item, $notify);
-               $item['uri'] = Strings::escapeTags(trim(defaults($item, 'uri', self::newURI($item['uid'], $item['guid']))));
+               $item['uri'] = Strings::escapeTags(trim(($item['uri'] ?? '') ?: self::newURI($item['uid'], $item['guid'])));
 
                // Store URI data
                $item['uri-id'] = ItemURI::insert(['uri' => $item['uri'], 'guid' => $item['guid']]);
@@ -1419,47 +1419,47 @@ class Item extends BaseObject
                        }
                }
 
-               $item['wall']          = intval(defaults($item, 'wall', 0));
-               $item['extid']         = trim(defaults($item, 'extid', ''));
-               $item['author-name']   = trim(defaults($item, 'author-name', ''));
-               $item['author-link']   = trim(defaults($item, 'author-link', ''));
-               $item['author-avatar'] = trim(defaults($item, 'author-avatar', ''));
-               $item['owner-name']    = trim(defaults($item, 'owner-name', ''));
-               $item['owner-link']    = trim(defaults($item, 'owner-link', ''));
-               $item['owner-avatar']  = trim(defaults($item, 'owner-avatar', ''));
+               $item['wall']          = intval($item['wall'] ?? 0);
+               $item['extid']         = trim($item['extid'] ?? '');
+               $item['author-name']   = trim($item['author-name'] ?? '');
+               $item['author-link']   = trim($item['author-link'] ?? '');
+               $item['author-avatar'] = trim($item['author-avatar'] ?? '');
+               $item['owner-name']    = trim($item['owner-name'] ?? '');
+               $item['owner-link']    = trim($item['owner-link'] ?? '');
+               $item['owner-avatar']  = trim($item['owner-avatar'] ?? '');
                $item['received']      = (isset($item['received'])  ? DateTimeFormat::utc($item['received'])  : DateTimeFormat::utcNow());
                $item['created']       = (isset($item['created'])   ? DateTimeFormat::utc($item['created'])   : $item['received']);
                $item['edited']        = (isset($item['edited'])    ? DateTimeFormat::utc($item['edited'])    : $item['created']);
                $item['changed']       = (isset($item['changed'])   ? DateTimeFormat::utc($item['changed'])   : $item['created']);
                $item['commented']     = (isset($item['commented']) ? DateTimeFormat::utc($item['commented']) : $item['created']);
-               $item['title']         = trim(defaults($item, 'title', ''));
-               $item['location']      = trim(defaults($item, 'location', ''));
-               $item['coord']         = trim(defaults($item, 'coord', ''));
+               $item['title']         = trim($item['title'] ?? '');
+               $item['location']      = trim($item['location'] ?? '');
+               $item['coord']         = trim($item['coord'] ?? '');
                $item['visible']       = (isset($item['visible']) ? intval($item['visible']) : 1);
                $item['deleted']       = 0;
-               $item['parent-uri']    = trim(defaults($item, 'parent-uri', $item['uri']));
-               $item['post-type']     = defaults($item, 'post-type', self::PT_ARTICLE);
-               $item['verb']          = trim(defaults($item, 'verb', ''));
-               $item['object-type']   = trim(defaults($item, 'object-type', ''));
-               $item['object']        = trim(defaults($item, 'object', ''));
-               $item['target-type']   = trim(defaults($item, 'target-type', ''));
-               $item['target']        = trim(defaults($item, 'target', ''));
-               $item['plink']         = trim(defaults($item, 'plink', ''));
-               $item['allow_cid']     = trim(defaults($item, 'allow_cid', ''));
-               $item['allow_gid']     = trim(defaults($item, 'allow_gid', ''));
-               $item['deny_cid']      = trim(defaults($item, 'deny_cid', ''));
-               $item['deny_gid']      = trim(defaults($item, 'deny_gid', ''));
-               $item['private']       = intval(defaults($item, 'private', 0));
-               $item['body']          = trim(defaults($item, 'body', ''));
-               $item['tag']           = trim(defaults($item, 'tag', ''));
-               $item['attach']        = trim(defaults($item, 'attach', ''));
-               $item['app']           = trim(defaults($item, 'app', ''));
-               $item['origin']        = intval(defaults($item, 'origin', 0));
-               $item['postopts']      = trim(defaults($item, 'postopts', ''));
-               $item['resource-id']   = trim(defaults($item, 'resource-id', ''));
-               $item['event-id']      = intval(defaults($item, 'event-id', 0));
-               $item['inform']        = trim(defaults($item, 'inform', ''));
-               $item['file']          = trim(defaults($item, 'file', ''));
+               $item['parent-uri']    = trim(($item['parent-uri'] ?? '') ?: $item['uri']);
+               $item['post-type']     = ($item['post-type'] ?? '') ?: self::PT_ARTICLE;
+               $item['verb']          = trim($item['verb'] ?? '');
+               $item['object-type']   = trim($item['object-type'] ?? '');
+               $item['object']        = trim($item['object'] ?? '');
+               $item['target-type']   = trim($item['target-type'] ?? '');
+               $item['target']        = trim($item['target'] ?? '');
+               $item['plink']         = trim($item['plink'] ?? '');
+               $item['allow_cid']     = trim($item['allow_cid'] ?? '');
+               $item['allow_gid']     = trim($item['allow_gid'] ?? '');
+               $item['deny_cid']      = trim($item['deny_cid'] ?? '');
+               $item['deny_gid']      = trim($item['deny_gid'] ?? '');
+               $item['private']       = intval($item['private'] ?? 0);
+               $item['body']          = trim($item['body'] ?? '');
+               $item['tag']           = trim($item['tag'] ?? '');
+               $item['attach']        = trim($item['attach'] ?? '');
+               $item['app']           = trim($item['app'] ?? '');
+               $item['origin']        = intval($item['origin'] ?? 0);
+               $item['postopts']      = trim($item['postopts'] ?? '');
+               $item['resource-id']   = trim($item['resource-id'] ?? '');
+               $item['event-id']      = intval($item['event-id'] ?? 0);
+               $item['inform']        = trim($item['inform'] ?? '');
+               $item['file']          = trim($item['file'] ?? '');
 
                // When there is no content then we don't post it
                if ($item['body'].$item['title'] == '') {
@@ -1479,12 +1479,12 @@ class Item extends BaseObject
                        $item['edited'] = DateTimeFormat::utcNow();
                }
 
-               $item['plink'] = defaults($item, 'plink', System::baseUrl() . '/display/' . urlencode($item['guid']));
+               $item['plink'] = ($item['plink'] ?? '') ?: System::baseUrl() . '/display/' . urlencode($item['guid']);
 
                $default = ['url' => $item['author-link'], 'name' => $item['author-name'],
                        'photo' => $item['author-avatar'], 'network' => $item['network']];
 
-               $item['author-id'] = defaults($item, 'author-id', Contact::getIdForURL($item['author-link'], 0, false, $default));
+               $item['author-id'] = ($item['author-id'] ?? 0) ?: Contact::getIdForURL($item['author-link'], 0, false, $default);
 
                if (Contact::isBlocked($item['author-id'])) {
                        Logger::notice('Author is blocked node-wide', ['author-link' => $item['author-link'], 'item-uri' => $item['uri']]);
@@ -1504,7 +1504,7 @@ class Item extends BaseObject
                $default = ['url' => $item['owner-link'], 'name' => $item['owner-name'],
                        'photo' => $item['owner-avatar'], 'network' => $item['network']];
 
-               $item['owner-id'] = defaults($item, 'owner-id', Contact::getIdForURL($item['owner-link'], 0, false, $default));
+               $item['owner-id'] = ($item['owner-id'] ?? 0) ?: Contact::getIdForURL($item['owner-link'], 0, false, $default);
 
                if (Contact::isBlocked($item['owner-id'])) {
                        Logger::notice('Owner is blocked node-wide', ['owner-link' => $item['owner-link'], 'item-uri' => $item['uri']]);
@@ -2453,7 +2453,7 @@ class Item extends BaseObject
                        Contact::unmarkForArchival($contact);
                }
 
-               $update = (!$arr['private'] && ((defaults($arr, 'author-link', '') === defaults($arr, 'owner-link', '')) || ($arr["parent-uri"] === $arr["uri"])));
+               $update = (!$arr['private'] && ((($arr['author-link'] ?? '') === ($arr['owner-link'] ?? '')) || ($arr["parent-uri"] === $arr["uri"])));
 
                // Is it a forum? Then we don't care about the rules from above
                if (!$update && in_array($arr["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN]) && ($arr["parent-uri"] === $arr["uri"])) {
@@ -3334,8 +3334,8 @@ class Item extends BaseObject
        {
                $body = $item["body"];
 
-               $rendered_hash = defaults($item, 'rendered-hash', '');
-               $rendered_html = defaults($item, 'rendered-html', '');
+               $rendered_hash = $item['rendered-hash'] ?? '';
+               $rendered_html = $item['rendered-html'] ?? '';
 
                if ($rendered_hash == ''
                        || $rendered_html == ""
@@ -3491,7 +3491,7 @@ class Item extends BaseObject
                                $filesubtype = 'unkn';
                        }
 
-                       $title = Strings::escapeHtml(trim(defaults($mtch, 4, $mtch[1])));
+                       $title = Strings::escapeHtml(trim(($mtch[4] ?? '') ?: $mtch[1]));
                        $title .= ' ' . $mtch[2] . ' ' . L10n::t('bytes');
 
                        $icon = '<div class="attachtype icon s22 type-' . $filetype . ' subtype-' . $filesubtype . '"></div>';
index 6d03ae3253b28c8e51ae6de236b9b5803756c248..68b42af92857b42b6de41af5703f76c729637fab 100644 (file)
@@ -90,7 +90,7 @@ class ItemContent extends BaseObject
                        }
                }
 
-               $html = Text\BBCode::convert($post['text'] . defaults($post, 'after', ''), false, $htmlmode);
+               $html = Text\BBCode::convert($post['text'] . ($post['after'] ?? ''), false, $htmlmode);
                $msg = Text\HTML::toPlaintext($html, 0, true);
                $msg = trim(html_entity_decode($msg, ENT_QUOTES, 'UTF-8'));
 
@@ -99,7 +99,7 @@ class ItemContent extends BaseObject
                        if ($post['type'] == 'link') {
                                $link = $post['url'];
                        } elseif ($post['type'] == 'text') {
-                               $link = defaults($post, 'url', '');
+                               $link = $post['url'] ?? '';
                        } elseif ($post['type'] == 'video') {
                                $link = $post['url'];
                        } elseif ($post['type'] == 'photo') {
index 90448806d8bd1e8cc62022bf33117dc1e0662310..c9a0697ebc9800ee3a42eadfed7e0648174dc542 100644 (file)
@@ -22,10 +22,10 @@ class PermissionSet extends BaseObject
        public static function fetchIDForPost(&$postarray)
        {
                $condition = ['uid' => $postarray['uid'],
-                       'allow_cid' => self::sortPermissions(defaults($postarray, 'allow_cid', '')),
-                       'allow_gid' => self::sortPermissions(defaults($postarray, 'allow_gid', '')),
-                       'deny_cid' => self::sortPermissions(defaults($postarray, 'deny_cid', '')),
-                       'deny_gid' => self::sortPermissions(defaults($postarray, 'deny_gid', ''))];
+                       'allow_cid' => self::sortPermissions($postarray['allow_cid'] ?? ''),
+                       'allow_gid' => self::sortPermissions($postarray['allow_gid'] ?? ''),
+                       'deny_cid'  => self::sortPermissions($postarray['deny_cid']  ?? ''),
+                       'deny_gid'  => self::sortPermissions($postarray['deny_gid']  ?? '')];
 
                $set = DBA::selectFirst('permissionset', ['id'], $condition);
 
index 67c6a0eb68cd3ccdfe3f525248df802c4a55d58a..0c1ae01e413d71908c92211f07fa6ce5ff876993 100644 (file)
@@ -90,7 +90,7 @@ class Profile
                        $location .= $profile['locality'];
                }
 
-               if (!empty($profile['region']) && (defaults($profile, 'locality', '') != $profile['region'])) {
+               if (!empty($profile['region']) && (($profile['locality'] ?? '') != $profile['region'])) {
                        if ($location) {
                                $location .= ', ';
                        }
@@ -322,7 +322,7 @@ class Profile
                        return $o;
                }
 
-               $profile['picdate'] = urlencode(defaults($profile, 'picdate', ''));
+               $profile['picdate'] = urlencode($profile['picdate'] ?? '');
 
                if (($profile['network'] != '') && ($profile['network'] != Protocol::DFRN)) {
                        $profile['network_link'] = Strings::formatNetworkName($profile['network'], $profile['url']);
@@ -384,7 +384,7 @@ class Profile
 
                        if (Contact::canReceivePrivateMessages($profile)) {
                                if ($visitor_is_followed || $visitor_is_following) {
-                                       $wallmessage_link = $visitor_base_path . '/message/new/' . base64_encode(defaults($profile, 'addr', ''));
+                                       $wallmessage_link = $visitor_base_path . '/message/new/' . base64_encode($profile['addr'] ?? '');
                                } elseif ($visitor_is_authenticated && !empty($profile['unkmail'])) {
                                        $wallmessage_link = 'wallmessage/' . $profile['nickname'];
                                }
@@ -465,9 +465,9 @@ class Profile
                                'fullname' => $profile['name'],
                                'firstname' => $firstname,
                                'lastname' => $lastname,
-                               'photo300' => defaults($profile, 'contact_photo', ''),
-                               'photo100' => defaults($profile, 'contact_thumb', ''),
-                               'photo50' => defaults($profile, 'contact_micro', ''),
+                               'photo300' => $profile['contact_photo'] ?? '',
+                               'photo100' => $profile['contact_thumb'] ?? '',
+                               'photo50' => $profile['contact_micro'] ?? '',
                        ];
                } else {
                        $diaspora = false;
@@ -530,7 +530,7 @@ class Profile
                        $p['photo'] = ProxyUtils::proxifyUrl($p['photo'], false, ProxyUtils::SIZE_SMALL);
                }
 
-               $p['url'] = Contact::magicLink(defaults($p, 'url', $profile_url));
+               $p['url'] = Contact::magicLink(($p['url'] ?? '') ?: $profile_url);
 
                $tpl = Renderer::getMarkupTemplate('profile_vcard.tpl');
                $o .= Renderer::replaceMacros($tpl, [
index 82e638158c57933125ee435e820246bb0e60a692..ff7c59444e363cfe4f85fa732607b2044dcb4f82 100644 (file)
@@ -132,7 +132,7 @@ class Filesystem implements IStorage
        
        public static function saveOptions($data)
        {
-               $storagepath = defaults($data, 'storagepath', '');
+               $storagepath = $data['storagepath'] ?? '';
                if ($storagepath === '' || !is_dir($storagepath)) {
                        return [
                                'storagepath' => L10n::t('Enter a valid existing folder')
index 1de93fb05b64faffd1d174456923fb4bd27dd562..01169c52265b0f235d4a41ebab8bbbb4d4a7af83 100644 (file)
@@ -210,7 +210,7 @@ class Term
        {
                $profile_base = System::baseUrl();
                $profile_data = parse_url($profile_base);
-               $profile_path = defaults($profile_data, 'path', '');
+               $profile_path = $profile_data['path'] ?? '';
                $profile_base_friendica = $profile_data['host'] . $profile_path . '/profile/';
                $profile_base_diaspora = $profile_data['host'] . $profile_path . '/u/';
 
index c12bb28266a35d09d9afe92244ed6c9d18cecf13..5b77c3963c7e69e7593107f0c69f8d6d5f2d7877 100644 (file)
@@ -167,7 +167,7 @@ class CurlResult
                }
 
                if ($this->returnCode == 301 || $this->returnCode == 302 || $this->returnCode == 303 || $this->returnCode== 307) {
-                       $redirect_parts = parse_url(defaults($this->info, 'redirect_url', ''));
+                       $redirect_parts = parse_url($this->info['redirect_url'] ?? '');
                        if (empty($redirect_parts)) {
                                $redirect_parts = [];
                        }
@@ -179,7 +179,7 @@ class CurlResult
                                }
                        }
 
-                       $parts = parse_url(defaults($this->info, 'url', ''));
+                       $parts = parse_url($this->info['url'] ?? '');
                        if (empty($parts)) {
                                $parts = [];
                        }
index 3f10895c3c5c8874054066735ef4b259061da1ab..d6ea766312a226ad2ea7679330da3b726322a0e3 100644 (file)
@@ -348,7 +348,7 @@ class Probe
                if (!self::$istimeout) {
                        $ap_profile = ActivityPub::probeProfile($uri);
 
-                       if (empty($data) || (!empty($ap_profile) && empty($network) && (defaults($data, 'network', '') != Protocol::DFRN))) {
+                       if (empty($data) || (!empty($ap_profile) && empty($network) && (($data['network'] ?? '') == Protocol::DFRN))) {
                                $data = $ap_profile;
                        } elseif (!empty($ap_profile)) {
                                $ap_profile['batch'] = '';
@@ -363,7 +363,7 @@ class Probe
                }
 
                if (!empty($data['photo'])) {
-                       $data['baseurl'] = Network::getUrlMatch(Strings::normaliseLink(defaults($data, 'baseurl', '')), Strings::normaliseLink($data['photo']));
+                       $data['baseurl'] = Network::getUrlMatch(Strings::normaliseLink($data['baseurl'] ?? ''), Strings::normaliseLink($data['photo']));
                } else {
                        $data['photo'] = System::baseUrl() . '/images/person-300.jpg';
                }
@@ -424,7 +424,7 @@ class Probe
                }
 
                // If the file is too large then exit
-               if (defaults($curlResult->getInfo(), 'download_content_length', 0) > 1000000) {
+               if (($curlResult->getInfo()['download_content_length'] ?? 0) > 1000000) {
                        return false;
                }
 
@@ -547,7 +547,7 @@ class Probe
                                return [];
                        }
 
-                       $path_parts = explode("/", trim(defaults($parts, 'path', ''), "/"));
+                       $path_parts = explode("/", trim($parts['path'] ?? '', "/"));
 
                        while (!$lrdd && (sizeof($path_parts) > 1)) {
                                $host .= "/".array_shift($path_parts);
@@ -921,19 +921,19 @@ class Probe
 
                if (empty($data["addr"]) || empty($data["nick"])) {
                        $probe_data = self::uri($profile_link);
-                       $data["addr"] = defaults($data, "addr", $probe_data["addr"]);
-                       $data["nick"] = defaults($data, "nick", $probe_data["nick"]);
+                       $data["addr"] = ($data["addr"] ?? '') ?: $probe_data["addr"];
+                       $data["nick"] = ($data["nick"] ?? '') ?: $probe_data["nick"];
                }
 
                $prof_data["addr"]         = $data["addr"];
                $prof_data["nick"]         = $data["nick"];
-               $prof_data["dfrn-request"] = defaults($data, 'request', null);
-               $prof_data["dfrn-confirm"] = defaults($data, 'confirm', null);
-               $prof_data["dfrn-notify"]  = defaults($data, 'notify' , null);
-               $prof_data["dfrn-poll"]    = defaults($data, 'poll'   , null);
-               $prof_data["photo"]        = defaults($data, 'photo'  , null);
-               $prof_data["fn"]           = defaults($data, 'name'   , null);
-               $prof_data["key"]          = defaults($data, 'pubkey' , null);
+               $prof_data["dfrn-request"] = $data['request'] ?? null;
+               $prof_data["dfrn-confirm"] = $data['confirm'] ?? null;
+               $prof_data["dfrn-notify"]  = $data['notify']  ?? null;
+               $prof_data["dfrn-poll"]    = $data['poll']    ?? null;
+               $prof_data["photo"]        = $data['photo']   ?? null;
+               $prof_data["fn"]           = $data['name']    ?? null;
+               $prof_data["key"]          = $data['pubkey']  ?? null;
 
                Logger::log("Result for profile ".$profile_link.": ".print_r($prof_data, true), Logger::DEBUG);
 
@@ -959,7 +959,7 @@ class Probe
                                $data["network"] = Protocol::DFRN;
                        } elseif (($link["rel"] == NAMESPACE_FEED) && !empty($link["href"])) {
                                $data["poll"] = $link["href"];
-                       } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") && (defaults($link, "type", "") == "text/html") && !empty($link["href"])) {
+                       } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") && (($link["type"] ?? "") == "text/html") && !empty($link["href"])) {
                                $data["url"] = $link["href"];
                        } elseif (($link["rel"] == "http://microformats.org/profile/hcard") && !empty($link["href"])) {
                                $hcard_url = $link["href"];
@@ -1169,7 +1169,7 @@ class Probe
                                $data["baseurl"] = trim($link["href"], '/');
                        } elseif (($link["rel"] == "http://joindiaspora.com/guid") && !empty($link["href"])) {
                                $data["guid"] = $link["href"];
-                       } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") && (defaults($link, "type", "") == "text/html") && !empty($link["href"])) {
+                       } elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") && (($link["type"] ?? "") == "text/html") && !empty($link["href"])) {
                                $data["url"] = $link["href"];
                        } elseif (($link["rel"] == NAMESPACE_FEED) && !empty($link["href"])) {
                                $data["poll"] = $link["href"];
@@ -1267,7 +1267,7 @@ class Probe
                        // See: https://tools.ietf.org/html/rfc7033#section-4.4.4
                        foreach (array_reverse($webfinger["links"]) as $link) {
                                if (($link["rel"] == "http://webfinger.net/rel/profile-page")
-                                       && (defaults($link, "type", "") == "text/html")
+                                       && (($link["type"] ?? "") == "text/html")
                                        && ($link["href"] != "")
                                ) {
                                        $data["url"] = $link["href"];
@@ -1436,7 +1436,7 @@ class Probe
                // See: https://tools.ietf.org/html/rfc7033#section-4.4.4
                foreach (array_reverse($webfinger["links"]) as $link) {
                        if (($link["rel"] == "http://webfinger.net/rel/profile-page")
-                               && (defaults($link, "type", "") == "text/html")
+                               && (($link["type"] ?? "") == "text/html")
                                && ($link["href"] != "")
                        ) {
                                $data["url"] = $link["href"];
index 2ef53d075ce1c467770539a3a145a569ced16803..04775bbd0e2f964c3a3a3b6202e7c4d85e85b467 100644 (file)
@@ -805,7 +805,7 @@ class Post extends BaseObject
                $terms = Term::tagArrayFromItemId($this->getId(), [Term::MENTION, Term::IMPLICIT_MENTION]);
                foreach ($terms as $term) {
                        $profile = Contact::getDetailsByURL($term['url']);
-                       if (!empty($profile['addr']) && (defaults($profile, 'contact-type', Contact::TYPE_UNKNOWN) != Contact::TYPE_COMMUNITY) &&
+                       if (!empty($profile['addr']) && ((($profile['contact-type'] ?? '') ?: Contact::TYPE_UNKNOWN) != Contact::TYPE_COMMUNITY) &&
                                ($profile['addr'] != $owner['addr']) && !strstr($text, $profile['addr'])) {
                                $text .= '@' . $profile['addr'] . ' ';
                        }
index 3a8a5e5b12ab82c7552b86d72eb1fd4b0aed1816..522fee97eff2706023993de7261570cdad2b09e3 100644 (file)
@@ -57,8 +57,8 @@ class ActivityPub
         */
        public static function isRequest()
        {
-               return stristr(defaults($_SERVER, 'HTTP_ACCEPT', ''), 'application/activity+json') ||
-                       stristr(defaults($_SERVER, 'HTTP_ACCEPT', ''), 'application/ld+json');
+               return stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/activity+json') ||
+                       stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/ld+json');
        }
 
        /**
index 7639d0f2a325d97ee6dc3ea6a9f2fb48a4f0d6b4..48af31cc65e9775fe423dd0b0a32a56baecfd000 100644 (file)
@@ -75,7 +75,7 @@ class Processor
 
                $tag_text = '';
                foreach ($tags as $tag) {
-                       if (in_array(defaults($tag, 'type', ''), ['Mention', 'Hashtag'])) {
+                       if (in_array($tag['type'] ?? '', ['Mention', 'Hashtag'])) {
                                if (!empty($tag_text)) {
                                        $tag_text .= ',';
                                }
@@ -125,7 +125,7 @@ class Processor
                                if (!isset($attach['length'])) {
                                        $attach['length'] = "0";
                                }
-                               $item["attach"] .= '[attach]href="'.$attach['url'].'" length="'.$attach['length'].'" type="'.$attach['mediaType'].'" title="'.defaults($attach, 'name', '').'"[/attach]';
+                               $item["attach"] .= '[attach]href="'.$attach['url'].'" length="'.$attach['length'].'" type="'.$attach['mediaType'].'" title="'.($attach['name'] ?? '') .'"[/attach]';
                        }
                }
 
@@ -183,7 +183,7 @@ class Processor
                        self::fetchMissingActivity($activity['reply-to-id'], $activity);
                }
 
-               $item['diaspora_signed_text'] = defaults($activity, 'diaspora:comment', '');
+               $item['diaspora_signed_text'] = $activity['diaspora:comment'] ?? '';
 
                self::postItem($activity, $item);
        }
@@ -256,7 +256,7 @@ class Processor
                $item['gravity'] = GRAVITY_ACTIVITY;
                $item['object-type'] = ACTIVITY_OBJ_NOTE;
 
-               $item['diaspora_signed_text'] = defaults($activity, 'diaspora:like', '');
+               $item['diaspora_signed_text'] = $activity['diaspora:like'] ?? '';
 
                self::postItem($activity, $item);
        }
@@ -404,7 +404,7 @@ class Processor
                        return;
                }
 
-               $item['plink'] = defaults($activity, 'alternate-url', $item['uri']);
+               $item['plink'] = $activity['alternate-url'] ?? $item['uri'];
 
                $item = self::constructAttachList($activity['attachments'], $item, !empty($activity['source']));
 
@@ -583,8 +583,8 @@ class Processor
                $activity['@context'] = $object['@context'];
                unset($object['@context']);
                $activity['id'] = $object['id'];
-               $activity['to'] = defaults($object, 'to', []);
-               $activity['cc'] = defaults($object, 'cc', []);
+               $activity['to'] = $object['to'] ?? [];
+               $activity['cc'] = $object['cc'] ?? [];
                $activity['actor'] = $actor;
                $activity['object'] = $object;
                $activity['published'] = $published;
@@ -628,7 +628,7 @@ class Processor
                $item = ['author-id' => Contact::getIdForURL($activity['actor']),
                        'author-link' => $activity['actor']];
 
-               $note = Strings::escapeTags(trim(defaults($activity, 'content', '')));
+               $note = Strings::escapeTags(trim($activity['content'] ?? ''));
 
                // Ensure that the contact has got the right network type
                self::switchContact($item['author-id']);
index 058d210a24072d484d799a9ff2f4933e2c29cce3..f23269615e566836ace45a78425d5474c7ba7c73 100644 (file)
@@ -46,8 +46,8 @@ class Receiver
         */
        public static function isRequest()
        {
-               return stristr(defaults($_SERVER, 'HTTP_ACCEPT', ''), 'application/activity+json') ||
-                       stristr(defaults($_SERVER, 'HTTP_ACCEPT', ''), 'application/ld+json');
+               return stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/activity+json') ||
+                       stristr($_SERVER['HTTP_ACCEPT'] ?? '', 'application/ld+json');
        }
 
        /**
@@ -260,7 +260,7 @@ class Receiver
                $object_data['type'] = $type;
                $object_data['actor'] = $actor;
                $object_data['item_receiver'] = $receivers;
-               $object_data['receiver'] = array_merge(defaults($object_data, 'receiver', []), $receivers);
+               $object_data['receiver'] = array_merge($object_data['receiver'] ?? [], $receivers);
 
                Logger::log('Processing ' . $object_data['type'] . ' ' . $object_data['object_type'] . ' ' . $object_data['id'], Logger::DEBUG);
 
@@ -301,9 +301,9 @@ class Receiver
                $conversation = [
                        'protocol' => Conversation::PARCEL_ACTIVITYPUB,
                        'item-uri' => $activity['id'],
-                       'reply-to-uri' => defaults($activity, 'reply-to-id', ''),
-                       'conversation-href' => defaults($activity, 'context', ''),
-                       'conversation-uri' => defaults($activity, 'conversation', ''),
+                       'reply-to-uri' => $activity['reply-to-id'] ?? '',
+                       'conversation-href' => $activity['context'] ?? '',
+                       'conversation-uri' => $activity['conversation'] ?? '',
                        'source' => $body,
                        'received' => DateTimeFormat::utcNow()];
 
@@ -508,7 +508,7 @@ class Receiver
 
                if (!empty($actor)) {
                        $profile = APContact::getByURL($actor);
-                       $followers = defaults($profile, 'followers', '');
+                       $followers = $profile['followers'] ?? '';
 
                        Logger::log('Actor: ' . $actor . ' - Followers: ' . $followers, Logger::DEBUG);
                } else {
index 7dee12b56ca498d0bdb61f9c177a0f774b59859c..d557af0692fb761db121bb815a59f93bf024aa8b 100644 (file)
@@ -119,8 +119,8 @@ class DFRN
                foreach ($items as $item) {
                        // These values aren't sent when sending from the queue.
                        /// @todo Check if we can set these values from the queue or if they are needed at all.
-                       $item["entry:comment-allow"] = defaults($item, "entry:comment-allow", true);
-                       $item["entry:cid"] = defaults($item, "entry:cid", 0);
+                       $item["entry:comment-allow"] = ($item["entry:comment-allow"] ?? '') ?: true;
+                       $item["entry:cid"] = $item["entry:cid"] ?? 0;
 
                        $entry = self::entry($doc, "text", $item, $owner, $item["entry:comment-allow"], $item["entry:cid"]);
                        if (isset($entry)) {
@@ -1259,7 +1259,7 @@ class DFRN
                $sent_dfrn_id = hex2bin((string) $res->dfrn_id);
                $challenge    = hex2bin((string) $res->challenge);
                $perm         = (($res->perm) ? $res->perm : null);
-               $dfrn_version = (float) (($res->dfrn_version) ? $res->dfrn_version : 2.0);
+               $dfrn_version = floatval($res->dfrn_version ?: 2.0);
                $rino_remote_version = intval($res->rino);
                $page         = (($owner['page-flags'] == User::PAGE_FLAGS_COMMUNITY) ? 1 : 0);
 
@@ -2019,8 +2019,8 @@ class DFRN
                                return false;
                        }
 
-                       $fields = ['title' => defaults($item, 'title', ''), 'body' => defaults($item, 'body', ''),
-                                       'tag' => defaults($item, 'tag', ''), 'changed' => DateTimeFormat::utcNow(),
+                       $fields = ['title' => $item['title'] ?? '', 'body' => $item['body'] ?? '',
+                                       'tag' => $item['tag'] ?? '', 'changed' => DateTimeFormat::utcNow(),
                                        'edited' => DateTimeFormat::utc($item["edited"])];
 
                        $condition = ["`uri` = ? AND `uid` IN (0, ?)", $item["uri"], $importer["importer_uid"]];
index a6090ce91f6a75dd9101bec6927bf394749ec87a..06cf8612502ae65679019ef197acbfafa96f6570 100644 (file)
@@ -544,7 +544,7 @@ class Email
                        }
 
                        $quotelevel = 0;
-                       $nextline = trim(defaults($arrbody, $i + 1, ''));
+                       $nextline = trim($arrbody[$i + 1] ?? '');
                        while ((strlen($nextline)>0) && ((substr($nextline, 0, 1) == '>')
                                || (substr($nextline, 0, 1) == ' '))) {
                                if (substr($nextline, 0, 1) == '>') {
index 054eaf51b2812939153424fa80058c9485ee18d9..afd406f972f27cc154771e0d3cf3e78c5d99e02d 100644 (file)
@@ -74,7 +74,7 @@ class OStatus
                }
                $author["author-id"] = Contact::getIdForURL($author["author-link"]);
 
-               $author['contact-id'] = defaults($contact, 'id', $author['author-id']);
+               $author['contact-id'] = ($contact['id'] ?? 0) ?: $author['author-id'];
 
                $contact = [];
 
@@ -1131,7 +1131,7 @@ class OStatus
                                                        if (!isset($attribute['length'])) {
                                                                $attribute['length'] = "0";
                                                        }
-                                                       $item["attach"] .= '[attach]href="'.$attribute['href'].'" length="'.$attribute['length'].'" type="'.$attribute['type'].'" title="'.defaults($attribute, 'title', '').'"[/attach]';
+                                                       $item["attach"] .= '[attach]href="'.$attribute['href'].'" length="'.$attribute['length'].'" type="'.$attribute['type'].'" title="'.($attribute['title'] ?? '') .'"[/attach]';
                                                }
                                                break;
                                        case "related":
@@ -1403,7 +1403,8 @@ class OStatus
                                                "href" => $siteinfo["url"],
                                                "type" => "text/html; charset=UTF-8",
                                                "length" => "",
-                                               "title" => defaults($siteinfo, "title", $siteinfo["url"])];
+                                               "title" => ($siteinfo["title"] ?? '') ?: $siteinfo["url"],
+                               ];
                                XML::addElement($doc, $root, "link", "", $attributes);
                                break;
                        default:
index 4310046c234411b1f6fd6907f8613a4075ebc7c3..d7ca234a98da82d7287f344f9bfd4929ba61044d 100644 (file)
@@ -57,7 +57,7 @@ class Emailer
                                .rand(10000, 99999);
 
                // generate a multipart/alternative message header
-               $messageHeader = defaults($params, 'additionalMailHeader', '') .
+               $messageHeader = ($params['additionalMailHeader'] ?? '') .
                                                "From: $fromName <{$params['fromEmail']}>\n" .
                                                "Reply-To: $fromName <{$params['replyTo']}>\n" .
                                                "MIME-Version: 1.0\n" .
index cd66abe0b2864b019341bd15139fc3dd68f198d4..348bff50e39f0cf84c51d194a8c8174ed02c6847 100644 (file)
@@ -104,7 +104,7 @@ class Network
 
                $parts2 = [];
                $parts = parse_url($url);
-               $path_parts = explode('/', defaults($parts, 'path', ''));
+               $path_parts = explode('/', $parts['path'] ?? '');
                foreach ($path_parts as $part) {
                        if (strlen($part) <> mb_strlen($part)) {
                                $parts2[] = rawurlencode($part);
@@ -801,8 +801,8 @@ class Network
                $i = 0;
                $path = "";
                do {
-                       $path1 = defaults($pathparts1, $i, '');
-                       $path2 = defaults($pathparts2, $i, '');
+                       $path1 = $pathparts1[$i] ?? '';
+                       $path2 = $pathparts2[$i] ?? '';
 
                        if ($path1 == $path2) {
                                $path .= $path1."/";
index 9a3de88cf2ac789d5866edf28d41e35bdf6c412e..4590f39a99cfa83aa813199619ce0323eff8d47f 100644 (file)
@@ -141,7 +141,7 @@ class ParseUrl
                }
 
                // If the file is too large then exit
-               if (defaults($curlResult->getInfo(), 'download_content_length', 0) > 1000000) {
+               if (($curlResult->getInfo()['download_content_length'] ?? 0) > 1000000) {
                        return $siteinfo;
                }
 
index dc140469c671e945e42408a1b41ff5bd67fd14f9..b42d0facca03678fdc536ec56b2e070dd83715be 100644 (file)
@@ -79,7 +79,7 @@ class Profiler implements ContainerInterface
                        return;
                }
 
-               $duration = (float) (microtime(true) - $timestamp);
+               $duration = floatval(microtime(true) - $timestamp);
 
                if (!isset($this->performance[$value])) {
                        // Prevent ugly E_NOTICE
index 8652885630d5693543933d4a9a2427d8e6a81827..1c10b085932956599ea946104010dacc1cfd771e 100644 (file)
@@ -250,7 +250,7 @@ class Delivery extends BaseObject
         */
        private static function deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup)
        {
-               Logger::log('Deliver ' . defaults($target_item, 'guid', $target_item['id']) . ' via DFRN to ' . (empty($contact['addr']) ? $contact['url'] : $contact['addr']));
+               Logger::info('Deliver ' . (($target_item['guid'] ?? '') ?: $target_item['id']) . ' via DFRN to ' . (($contact['addr'] ?? '') ?: $contact['url']));
 
                if ($cmd == self::MAIL) {
                        $item = $target_item;
@@ -278,7 +278,7 @@ class Delivery extends BaseObject
                        $atom = DFRN::entries($msgitems, $owner);
                }
 
-               Logger::log('Notifier entry: ' . $contact["url"] . ' ' . defaults($target_item, 'guid', $target_item['id']) . ' entry: ' . $atom, Logger::DATA);
+               Logger::debug('Notifier entry: ' . $contact["url"] . ' ' . (($target_item['guid'] ?? '') ?: $target_item['id']) . ' entry: ' . $atom, Logger::DATA);
 
                $basepath =  implode('/', array_slice(explode('/', $contact['url']), 0, 3));
 
@@ -359,7 +359,7 @@ class Delivery extends BaseObject
                        $protocol = Model\ItemDeliveryData::LEGACY_DFRN;
                }
 
-               Logger::info('DFRN Delivery', ['cmd' => $cmd, 'url' => $contact['url'], 'guid' => defaults($target_item, 'guid', $target_item['id']), 'return' => $deliver_status]);
+               Logger::info('DFRN Delivery', ['cmd' => $cmd, 'url' => $contact['url'], 'guid' => ($target_item['guid'] ?? '') ?: $target_item['id'], 'return' => $deliver_status]);
 
                if (($deliver_status >= 200) && ($deliver_status <= 299)) {
                        // We successfully delivered a message, the contact is alive
@@ -372,7 +372,7 @@ class Delivery extends BaseObject
                        // The message could not be delivered. We mark the contact as "dead"
                        Model\Contact::markForArchival($contact);
 
-                       Logger::info('Delivery failed: defer message', ['id' => defaults($target_item, 'guid', $target_item['id'])]);
+                       Logger::info('Delivery failed: defer message', ['id' => ($target_item['guid'] ?? '') ?: $target_item['id']]);
                        if (!Worker::defer() && in_array($cmd, [Delivery::POST, Delivery::POKE])) {
                                Model\ItemDeliveryData::incrementQueueFailed($target_item['id']);
                        }
@@ -463,7 +463,7 @@ class Delivery extends BaseObject
                        }
 
                        if (empty($contact['contact-type']) || ($contact['contact-type'] != Model\Contact::TYPE_RELAY)) {
-                               Logger::info('Delivery failed: defer message', ['id' => defaults($target_item, 'guid', $target_item['id'])]);
+                               Logger::info('Delivery failed: defer message', ['id' => ($target_item['guid'] ?? '') ?: $target_item['id']]);
                                // defer message for redelivery
                                if (!Worker::defer() && in_array($cmd, [Delivery::POST, Delivery::POKE])) {
                                        Model\ItemDeliveryData::incrementQueueFailed($target_item['id']);
index 3c71363470a6d8b18b4c57ad41f024186e4ec527..415c8f3ae23077157e8822eda840855efa9df51b 100644 (file)
@@ -35,7 +35,7 @@ class GProbe {
                        $result = Cache::get("gprobe:".$urlparts["host"]);
                        if (!is_null($result)) {
                                if (in_array($result["network"], [Protocol::FEED, Protocol::PHANTOM])) {
-                                       Logger::log("DDoS attempt detected for ".$urlparts["host"]." by ".defaults($_SERVER, "REMOTE_ADDR", '').". server data: ".print_r($_SERVER, true), Logger::DEBUG);
+                                       Logger::debug("DDoS attempt detected for " . $urlparts["host"] . " by " . ($_SERVER["REMOTE_ADDR"] ?? ''), ['$_SERVER' => $_SERVER]);
                                        return;
                                }
                        }