mirror of
https://github.com/friendica/friendica
synced 2025-04-30 21:44:22 +02:00
Replace deprecated calls to defaults() by ?? and ?: in src/
This commit is contained in:
Hypolite Petovan
parent
c0b78a9720
commit
146646c4d4
41 changed files with 239 additions and 233 deletions
|
|
@ -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'),
|
||||
|
|
|
|||
|
|
@ -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 = "";
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ class NotificationsManager extends BaseObject
|
|||
*/
|
||||
public function getTabs()
|
||||
{
|
||||
$selected = defaults(self::getApp()->argv, 1, '');
|
||||
$selected = self::getApp()->argv[1] ?? '';
|
||||
|
||||
$tabs = [
|
||||
[
|
||||
|
|
|
|||
|
|
@ -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])) {
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ class StorageManager
|
|||
public static function getByName($name)
|
||||
{
|
||||
self::setup();
|
||||
return defaults(self::$backends, $name, '');
|
||||
return self::$backends[$name] ?? '';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue