X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcontacts.php;h=682d427c6d175fdfbdc22fcd4d9e54e7912c2dbb;hb=0f546f7f0f8b41bd7510bd3644419c002746ce34;hp=1859c2aa60fa4659452b3f3711192dd69e41455a;hpb=b85c94a60d5142adc9aa77d2de7c05b91021c450;p=friendica.git diff --git a/mod/contacts.php b/mod/contacts.php index 1859c2aa60..682d427c6d 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -1,177 +1,174 @@ argc == 2) && intval($a->argv[1])) || (($a->argc == 3) && intval($a->argv[1]) && ($a->argv[2] == "posts"))) { - $contact_id = intval($a->argv[1]); - $r = q("SELECT * FROM `contact` WHERE `uid` = %d and `id` = %d LIMIT 1", - intval(local_user()), - intval($contact_id) - ); - if (! DBM::is_result($r)) { - $contact_id = 0; - } + $nets = defaults($_GET, 'nets', ''); + if ($nets == "all") { + $nets = ""; } - require_once 'include/group.php'; - require_once 'include/contact_widgets.php'; - - if ($_GET['nets'] == "all") { - $_GET['nets'] = ""; + if (!x($a->page, 'aside')) { + $a->page['aside'] = ''; } - if (! x($a->page,'aside')) { - $a->page['aside'] = ''; + $contact_id = null; + $contact = null; + if ((($a->argc == 2) && intval($a->argv[1])) || (($a->argc == 3) && intval($a->argv[1]) && ($a->argv[2] == "posts"))) { + $contact_id = intval($a->argv[1]); + $contact = dba::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user()]); } - if ($contact_id) { - $a->data['contact'] = $r[0]; + if (DBM::is_result($contact)) { + $a->data['contact'] = $contact; if (($a->data['contact']['network'] != "") && ($a->data['contact']['network'] != NETWORK_DFRN)) { - $networkname = format_network_name($a->data['contact']['network'],$a->data['contact']['url']); + $networkname = format_network_name($a->data['contact']['network'], $a->data['contact']['url']); } else { $networkname = ''; } /// @TODO Add nice spaces - $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array( + $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"), [ '$name' => htmlentities($a->data['contact']['name']), '$photo' => $a->data['contact']['photo'], - '$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? "redir/".$a->data['contact']['id'] : $a->data['contact']['url'], + '$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? "redir/" . $a->data['contact']['id'] : $a->data['contact']['url'], '$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""), '$network_name' => $networkname, '$network' => t('Network:'), '$account_type' => Contact::getAccountType($a->data['contact']) - )); + ]); - $finpeople_widget = ''; + $findpeople_widget = ''; $follow_widget = ''; $networks_widget = ''; } else { $vcard_widget = ''; - $networks_widget .= networks_widget('contacts',$_GET['nets']); + $networks_widget = Widget::networks('contacts', $nets); if (isset($_GET['add'])) { - $follow_widget = follow_widget($_GET['add']); + $follow_widget = Widget::follow($_GET['add']); } else { - $follow_widget = follow_widget(); + $follow_widget = Widget::follow(); } - $findpeople_widget .= findpeople_widget(); + $findpeople_widget = Widget::findPeople(); } - $groups_widget .= group_side('contacts','group','full',0,$contact_id); + $groups_widget = Group::sidebarWidget('contacts', 'group', 'full', 0, $contact_id); - $a->page['aside'] .= replace_macros(get_markup_template("contacts-widget-sidebar.tpl"),array( + $a->page['aside'] .= replace_macros(get_markup_template("contacts-widget-sidebar.tpl"), [ '$vcard_widget' => $vcard_widget, '$findpeople_widget' => $findpeople_widget, '$follow_widget' => $follow_widget, '$groups_widget' => $groups_widget, '$networks_widget' => $networks_widget - )); + ]); $base = System::baseUrl(); $tpl = get_markup_template("contacts-head.tpl"); - $a->page['htmlhead'] .= replace_macros($tpl,array( + $a->page['htmlhead'] .= replace_macros($tpl, [ '$baseurl' => System::baseUrl(true), '$base' => $base - )); + ]); $tpl = get_markup_template("contacts-end.tpl"); - $a->page['end'] .= replace_macros($tpl,array( + $a->page['end'] .= replace_macros($tpl, [ '$baseurl' => System::baseUrl(true), '$base' => $base - )); - - + ]); } -function contacts_batch_actions(App $a) { +function contacts_batch_actions(App $a) +{ $contacts_id = $_POST['contact_batch']; - if (!is_array($contacts_id)) return; + if (!is_array($contacts_id)) { + return; + } $orig_records = q("SELECT * FROM `contact` WHERE `id` IN (%s) AND `uid` = %d AND `self` = 0", implode(",", $contacts_id), intval(local_user()) ); - $count_actions=0; - foreach($orig_records as $orig_record) { + $count_actions = 0; + foreach ($orig_records as $orig_record) { $contact_id = $orig_record['id']; if (x($_POST, 'contacts_batch_update')) { _contact_update($contact_id); $count_actions++; } if (x($_POST, 'contacts_batch_block')) { - $r = _contact_block($contact_id, $orig_record); - if ($r) $count_actions++; + $r = _contact_block($contact_id, $orig_record); + if ($r) { + $count_actions++; + } } if (x($_POST, 'contacts_batch_ignore')) { $r = _contact_ignore($contact_id, $orig_record); - if ($r) $count_actions++; + if ($r) { + $count_actions++; + } } if (x($_POST, 'contacts_batch_archive')) { $r = _contact_archive($contact_id, $orig_record); - if ($r) $count_actions++; + if ($r) { + $count_actions++; + } } if (x($_POST, 'contacts_batch_drop')) { _contact_drop($orig_record); $count_actions++; } } - if ($count_actions>0) { - info ( sprintf( tt("%d contact edited.", "%d contacts edited.", $count_actions), $count_actions) ); + if ($count_actions > 0) { + info(tt("%d contact edited.", "%d contacts edited.", $count_actions)); } - if (x($_SESSION,'return_url')) { + if (x($_SESSION, 'return_url')) { goaway('' . $_SESSION['return_url']); - } - else { + } else { goaway('contacts'); } - } - -function contacts_post(App $a) { - - if (! local_user()) { +function contacts_post(App $a) +{ + if (!local_user()) { return; } - if ($a->argv[1]==="batch") { + if ($a->argv[1] === "batch") { contacts_batch_actions($a); return; } $contact_id = intval($a->argv[1]); - if (! $contact_id) { + if (!$contact_id) { return; } - $orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($contact_id), - intval(local_user()) - ); - - if (! count($orig_record)) { - notice( t('Could not access contact record.') . EOL); + if (!dba::exists('contact', ['id' => $contact_id, 'uid' => local_user()])) { + notice(t('Could not access contact record.') . EOL); goaway('contacts'); return; // NOTREACHED } @@ -180,12 +177,8 @@ function contacts_post(App $a) { $profile_id = intval($_POST['profile-assign']); if ($profile_id) { - $r = q("SELECT `id` FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($profile_id), - intval(local_user()) - ); - if (! DBM::is_result($r)) { - notice( t('Could not locate selected profile.') . EOL); + if (!dba::exists('profile', ['id' => $profile_id, 'uid' => local_user()])) { + notice(t('Could not locate selected profile.') . EOL); return; } } @@ -199,8 +192,9 @@ function contacts_post(App $a) { $ffi_keyword_blacklist = escape_tags(trim($_POST['ffi_keyword_blacklist'])); $priority = intval($_POST['poll']); - if($priority > 5 || $priority < 0) + if ($priority > 5 || $priority < 0) { $priority = 0; + } $info = escape_tags(trim($_POST['info'])); @@ -217,91 +211,96 @@ function contacts_post(App $a) { intval($contact_id), intval(local_user()) ); - if($r) - info( t('Contact updated.') . EOL); - else - notice( t('Failed to update contact record.') . EOL); + if (DBM::is_result($r)) { + info(t('Contact updated.') . EOL); + } else { + notice(t('Failed to update contact record.') . EOL); + } - $r = q("select * from contact where id = %d and uid = %d limit 1", - intval($contact_id), - intval(local_user()) - ); - if($r && DBM::is_result($r)) - $a->data['contact'] = $r[0]; + $contact = dba::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user()]); + if (DBM::is_result($contact)) { + $a->data['contact'] = $contact; + } return; - } -/*contact actions*/ -function _contact_update($contact_id) { - $r = q("SELECT `uid`, `url`, `network` FROM `contact` WHERE `id` = %d", intval($contact_id)); - if (!$r) - return; - - $uid = $r[0]["uid"]; +/* contact actions */ - if ($uid != local_user()) +function _contact_update($contact_id) +{ + $contact = dba::selectFirst('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user()]); + if (!DBM::is_result($contact)) { return; + } - if ($r[0]["network"] == NETWORK_OSTATUS) { - $result = new_contact($uid, $r[0]["url"], false, $r[0]["network"]); + $uid = $contact["uid"]; - if ($result['success']) - $r = q("UPDATE `contact` SET `subhub` = 1 WHERE `id` = %d", - intval($contact_id)); - } else + if ($contact["network"] == NETWORK_OSTATUS) { + $result = Contact::createFromProbe($uid, $contact["url"], false, $contact["network"]); + + if ($result['success']) { + q("UPDATE `contact` SET `subhub` = 1 WHERE `id` = %d", intval($contact_id)); + } + } else { // pull feed and consume it, which should subscribe to the hub. Worker::add(PRIORITY_HIGH, "OnePoll", $contact_id, "force"); + } } -function _contact_update_profile($contact_id) { - $r = q("SELECT `uid`, `url`, `network` FROM `contact` WHERE `id` = %d", intval($contact_id)); - if (!$r) +function _contact_update_profile($contact_id) +{ + $contact = dba::selectFirst('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user()]); + if (!DBM::is_result($contact)) { return; + } - $uid = $r[0]["uid"]; - - if ($uid != local_user()) - return; + $uid = $contact["uid"]; - $data = Probe::uri($r[0]["url"], "", 0, false); + $data = Probe::uri($contact["url"], "", 0, false); // "Feed" or "Unknown" is mostly a sign of communication problems - if ((in_array($data["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) && ($data["network"] != $r[0]["network"])) + if ((in_array($data["network"], [NETWORK_FEED, NETWORK_PHANTOM])) && ($data["network"] != $contact["network"])) { return; + } - $updatefields = array("name", "nick", "url", "addr", "batch", "notify", "poll", "request", "confirm", - "poco", "network", "alias"); - $update = array(); + $updatefields = ["name", "nick", "url", "addr", "batch", "notify", "poll", "request", "confirm", + "poco", "network", "alias"]; + $update = []; if ($data["network"] == NETWORK_OSTATUS) { - $result = new_contact($uid, $data["url"], false); + $result = Contact::createFromProbe($uid, $data["url"], false); - if ($result['success']) + if ($result['success']) { $update["subhub"] = true; + } } - foreach($updatefields AS $field) - if (isset($data[$field]) && ($data[$field] != "")) + foreach ($updatefields AS $field) { + if (isset($data[$field]) && ($data[$field] != "")) { $update[$field] = $data[$field]; + } + } $update["nurl"] = normalise_link($data["url"]); $query = ""; - if (isset($data["priority"]) && ($data["priority"] != 0)) - $query = "`priority` = ".intval($data["priority"]); + if (isset($data["priority"]) && ($data["priority"] != 0)) { + $query = "`priority` = " . intval($data["priority"]); + } - foreach($update AS $key => $value) { - if ($query != "") + foreach ($update AS $key => $value) { + if ($query != "") { $query .= ", "; + } - $query .= "`".$key."` = '".dbesc($value)."'"; + $query .= "`" . $key . "` = '" . dbesc($value) . "'"; } - if ($query == "") + if ($query == "") { return; + } $r = q("UPDATE `contact` SET $query WHERE `id` = %d AND `uid` = %d", intval($contact_id), @@ -309,32 +308,36 @@ function _contact_update_profile($contact_id) { ); // Update the entry in the contact table - update_contact_avatar($data['photo'], local_user(), $contact_id, true); + Contact::updateAvatar($data['photo'], local_user(), $contact_id, true); // Update the entry in the gcontact table - GlobalContact::updateFromProbe($data["url"]); + GContact::updateFromProbe($data["url"]); } -function _contact_block($contact_id, $orig_record) { +function _contact_block($contact_id, $orig_record) +{ $blocked = (($orig_record['blocked']) ? 0 : 1); $r = q("UPDATE `contact` SET `blocked` = %d WHERE `id` = %d AND `uid` = %d", intval($blocked), intval($contact_id), intval(local_user()) ); - return $r; - + return DBM::is_result($r); } -function _contact_ignore($contact_id, $orig_record) { + +function _contact_ignore($contact_id, $orig_record) +{ $readonly = (($orig_record['readonly']) ? 0 : 1); $r = q("UPDATE `contact` SET `readonly` = %d WHERE `id` = %d AND `uid` = %d", intval($readonly), intval($contact_id), intval(local_user()) ); - return $r; + return DBM::is_result($r); } -function _contact_archive($contact_id, $orig_record) { + +function _contact_archive($contact_id, $orig_record) +{ $archived = (($orig_record['archive']) ? 0 : 1); $r = q("UPDATE `contact` SET `archive` = %d WHERE `id` = %d AND `uid` = %d", intval($archived), @@ -344,7 +347,7 @@ function _contact_archive($contact_id, $orig_record) { if ($archived) { q("UPDATE `item` SET `private` = 2 WHERE `contact-id` = %d AND `uid` = %d", intval($contact_id), intval(local_user())); } - return $r; + return DBM::is_result($r); } function _contact_drop($orig_record) @@ -363,104 +366,96 @@ function _contact_drop($orig_record) Contact::remove($orig_record['id']); } - -function contacts_content(App $a) { - +function contacts_content(App $a) +{ $sort_type = 0; $o = ''; - nav_set_selected('contacts'); - + Nav::setSelected('contacts'); - if (! local_user()) { - notice( t('Permission denied.') . EOL); + if (!local_user()) { + notice(t('Permission denied.') . EOL); return; } - if($a->argc == 3) { - + if ($a->argc == 3) { $contact_id = intval($a->argv[1]); - if(! $contact_id) + if (!$contact_id) { return; + } $cmd = $a->argv[2]; - $orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 LIMIT 1", - intval($contact_id), - intval(local_user()) - ); - - if(! count($orig_record)) { - notice( t('Could not access contact record.') . EOL); + $orig_record = dba::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user(), 'self' => false]); + if (!DBM::is_result($orig_record)) { + notice(t('Could not access contact record.') . EOL); goaway('contacts'); return; // NOTREACHED } - if($cmd === 'update') { + if ($cmd === 'update') { _contact_update($contact_id); goaway('contacts/' . $contact_id); // NOTREACHED } - if($cmd === 'updateprofile') { + if ($cmd === 'updateprofile') { _contact_update_profile($contact_id); goaway('crepair/' . $contact_id); // NOTREACHED } - if($cmd === 'block') { - $r = _contact_block($contact_id, $orig_record[0]); + if ($cmd === 'block') { + $r = _contact_block($contact_id, $orig_record); if ($r) { - $blocked = (($orig_record[0]['blocked']) ? 0 : 1); - info((($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')).EOL); + $blocked = (($orig_record['blocked']) ? 0 : 1); + info((($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')) . EOL); } goaway('contacts/' . $contact_id); return; // NOTREACHED } - if($cmd === 'ignore') { - $r = _contact_ignore($contact_id, $orig_record[0]); + if ($cmd === 'ignore') { + $r = _contact_ignore($contact_id, $orig_record); if ($r) { - $readonly = (($orig_record[0]['readonly']) ? 0 : 1); - info((($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')).EOL); + $readonly = (($orig_record['readonly']) ? 0 : 1); + info((($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')) . EOL); } goaway('contacts/' . $contact_id); return; // NOTREACHED } - - if($cmd === 'archive') { - $r = _contact_archive($contact_id, $orig_record[0]); + if ($cmd === 'archive') { + $r = _contact_archive($contact_id, $orig_record); if ($r) { - $archived = (($orig_record[0]['archive']) ? 0 : 1); - info((($archived) ? t('Contact has been archived') : t('Contact has been unarchived')).EOL); + $archived = (($orig_record['archive']) ? 0 : 1); + info((($archived) ? t('Contact has been archived') : t('Contact has been unarchived')) . EOL); } goaway('contacts/' . $contact_id); return; // NOTREACHED } - if($cmd === 'drop') { - + if ($cmd === 'drop') { // Check if we should do HTML-based delete confirmation - if($_REQUEST['confirm']) { + if (x($_REQUEST, 'confirm')) { //