keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Normalize uses of defaults() in Module\Contact

Browse source 
- Remove uses without default value
- Add relevant uses
This commit is contained in:
Hypolite Petovan 2018-10-14 18:17:22 -04:00
parent 756a4f1111
commit 57e8fb5cb1
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/Module/Contact.php
View file

@ -83,7 +83,7 @@ class Contact extends BaseModule
'$name' => htmlentities($a->data['contact']['name']), '$name' => htmlentities($a->data['contact']['name']),
'$photo' => $a->data['contact']['photo'], '$photo' => $a->data['contact']['photo'],
'$url' => Model\Contact::MagicLink($a->data['contact']['url']), '$url' => Model\Contact::MagicLink($a->data['contact']['url']),
'$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""), '$addr' => defaults($contact, 'addr', ''),
'$network_name' => $networkname, '$network_name' => $networkname,
'$network' => L10n::t('Network:'), '$network' => L10n::t('Network:'),
'$account_type' => Model\Contact::getAccountType($a->data['contact']) '$account_type' => Model\Contact::getAccountType($a->data['contact'])
@ -140,25 +140,24 @@ class Contact extends BaseModule
$count_actions = 0; $count_actions = 0;
foreach ($orig_records as $orig_record) { foreach ($orig_records as $orig_record) {
$contact_id = $orig_record['id']; $contact_id = $orig_record['id'];
if (defaults($_POST, 'contacts_batch_update', '')) { if (!empty($_POST['contacts_batch_update'])) {
self::updateContactFromPoll($contact_id); self::updateContactFromPoll($contact_id);
$count_actions++; $count_actions++;
} }
if (defaults($_POST, 'contacts_batch_block', '')) { if (!empty($_POST['contacts_batch_block'])) {
self::blockContact($contact_id); self::blockContact($contact_id);
$count_actions++; $count_actions++;
} }
if (defaults($_POST, 'contacts_batch_ignore', '')) { if (!empty($_POST['contacts_batch_ignore'])) {
self::ignoreContact($contact_id); self::ignoreContact($contact_id);
$count_actions++; $count_actions++;
} }
if (defaults($_POST, 'contacts_batch_archive', '')) { if (!empty($_POST['contacts_batch_archive'])
$r = self::archiveContact($contact_id, $orig_record); && self::archiveContact($contact_id, $orig_record)
if ($r) { ) {
$count_actions++; $count_actions++;
} }
} if (!empty($_POST['contacts_batch_drop'])) {
if (defaults($_POST, 'contacts_batch_drop', '')) {
self::dropContact($orig_record); self::dropContact($orig_record);
$count_actions++; $count_actions++;
} }
@ -204,9 +203,9 @@ class Contact extends BaseModule
} }
} }
$hidden = defaults($_POST['hidden']); $hidden = !empty($_POST['hidden']);
$notify = defaults($_POST['notify']); $notify = !empty($_POST['notify']);
$fetch_further_information = intval(defaults($_POST, 'fetch_further_information', 0)); $fetch_further_information = intval(defaults($_POST, 'fetch_further_information', 0));
@ -437,8 +436,8 @@ class Contact extends BaseModule
if ($cmd === 'drop' && ($orig_record['uid'] != 0)) { if ($cmd === 'drop' && ($orig_record['uid'] != 0)) {
// Check if we should do HTML-based delete confirmation // Check if we should do HTML-based delete confirmation
if (defaults($_REQUEST, 'confirm')) { if (!empty($_REQUEST['confirm'])) {
// <form> can't take arguments in its "action" parameter // <form> can't take arguments in its 'action' parameter
// so add any arguments as hidden inputs // so add any arguments as hidden inputs
$query = explode_querystring($a->query_string); $query = explode_querystring($a->query_string);
$inputs = []; $inputs = [];
@ -464,7 +463,7 @@ class Contact extends BaseModule
]); ]);
} }
// Now check how the user responded to the confirmation query // Now check how the user responded to the confirmation query
if (defaults($_REQUEST, 'canceled')) { if (!empty($_REQUEST['canceled'])) {
goaway('contact'); goaway('contact');
} }
@ -484,7 +483,7 @@ class Contact extends BaseModule
$_SESSION['return_url'] = $a->query_string; $_SESSION['return_url'] = $a->query_string;
if ((defaults($a->data, 'contact')) && (is_array($a->data['contact']))) { if (!empty($a->data['contact']) && is_array($a->data['contact'])) {
$contact_id = $a->data['contact']['id']; $contact_id = $a->data['contact']['id'];
$contact = $a->data['contact']; $contact = $a->data['contact'];
@ -705,8 +704,8 @@ class Contact extends BaseModule
$sql_extra .= sprintf(" AND `network` != '%s' ", Protocol::PHANTOM); $sql_extra .= sprintf(" AND `network` != '%s' ", Protocol::PHANTOM);
$search = defaults($_GET, 'search') ? notags(trim($_GET['search'])) : ''; $search = notags(trim(defaults($_GET, 'search', '')));
$nets = defaults($_GET, 'nets' ) ? notags(trim($_GET['nets'])) : ''; $nets = notags(trim(defaults($_GET, 'nets' , '')));
$tabs = [ $tabs = [
[ [
@ -1043,7 +1042,7 @@ class Contact extends BaseModule
'username' => htmlentities($rr['name']), 'username' => htmlentities($rr['name']),
'account_type' => Model\Contact::getAccountType($rr), 'account_type' => Model\Contact::getAccountType($rr),
'sparkle' => $sparkle, 'sparkle' => $sparkle,
'itemurl' => (($rr['addr'] != "") ? $rr['addr'] : $rr['url']), 'itemurl' => defaults($rr, 'addr', $rr['url']),
'url' => $url, 'url' => $url,
'network' => ContactSelector::networkToName($rr['network'], $rr['url']), 'network' => ContactSelector::networkToName($rr['network'], $rr['url']),
'nick' => htmlentities($rr['nick']), 'nick' => htmlentities($rr['nick']),