X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fcontacts.php;h=017b1d6435fd8456953d3fadcc312312fdc0b6e7;hb=41fe07e12821a25e3ad8279abc5344b8bbe011ab;hp=bdf49898936658ca6752b92080737f6dd1e103c9;hpb=1f09e7ad23f1f3982f44e9b2c9a1e6d08da7f825;p=friendica.git
diff --git a/mod/contacts.php b/mod/contacts.php
index bdf4989893..017b1d6435 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -2,6 +2,10 @@
require_once('include/Contact.php');
require_once('include/socgraph.php');
+require_once('include/contact_selectors.php');
+require_once('include/Scrape.php');
+require_once('mod/proxy.php');
+require_once('include/Photo.php');
function contacts_init(&$a) {
if(! local_user())
@@ -23,33 +27,51 @@ function contacts_init(&$a) {
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($contact_id) {
$a->data['contact'] = $r[0];
- $o .= '
';
- $o .= '
' . $a->data['contact']['name'] . '
';
- $o .= '
';
- $o .= '
';
- $a->page['aside'] .= $o;
-
- }
- else
- $a->page['aside'] .= follow_widget();
-
- $a->page['aside'] .= group_side('contacts','group',false,0,$contact_id);
+ $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array(
+ '$name' => htmlentities($a->data['contact']['name']),
+ '$photo' => $a->data['contact']['photo'],
+ '$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? $a->get_baseurl()."/redir/".$a->data['contact']['id'] : $a->data['contact']['url']
+ ));
+ $finpeople_widget = '';
+ $follow_widget = '';
+ $networks_widget = '';
+ }
+ else {
+ $vcard_widget = '';
+ $networks_widget .= networks_widget('contacts',$_GET['nets']);
+ if (isset($_GET['add']))
+ $follow_widget = follow_widget($_GET['add']);
+ else
+ $follow_widget = follow_widget();
+
+ $findpeople_widget .= findpeople_widget();
+ }
- $a->page['aside'] .= findpeople_widget();
+ $groups_widget .= group_side('contacts','group',false,0,$contact_id);
+
+ $a->page['aside'] .= replace_macros(get_markup_template("contacts-widget-sidebar.tpl"),array(
+ '$vcard_widget' => $vcard_widget,
+ '$findpeople_widget' => $findpeople_widget,
+ '$follow_widget' => $follow_widget,
+ '$groups_widget' => $groups_widget,
+ '$networks_widget' => $networks_widget
+ ));
- $a->page['aside'] .= networks_widget('contacts',$_GET['nets']);
$base = $a->get_baseurl();
-
$tpl = get_markup_template("contacts-head.tpl");
$a->page['htmlhead'] .= replace_macros($tpl,array(
'$baseurl' => $a->get_baseurl(true),
'$base' => $base
));
+
$tpl = get_markup_template("contacts-end.tpl");
$a->page['end'] .= replace_macros($tpl,array(
'$baseurl' => $a->get_baseurl(true),
@@ -59,11 +81,61 @@ function contacts_init(&$a) {
}
+function contacts_batch_actions(&$a){
+ $contacts_id = $_POST['contact_batch'];
+ 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) {
+ $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++;
+ }
+ if (x($_POST, 'contacts_batch_ignore')) {
+ $r = _contact_ignore($contact_id, $orig_record);
+ if ($r) $count_actions++;
+ }
+ if (x($_POST, 'contacts_batch_archive')) {
+ $r = _contact_archive($contact_id, $orig_record);
+ if ($r) $count_actions++;
+ }
+ if (x($_POST, 'contacts_batch_drop')) {
+ _contact_drop($contact_id, $orig_record);
+ $count_actions++;
+ }
+ }
+ if ($count_actions>0) {
+ info ( sprintf( tt("%d contact edited.", "%d contacts edited", $count_actions), $count_actions) );
+ }
+
+ if(x($_SESSION,'return_url'))
+ goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+ else
+ goaway($a->get_baseurl(true) . '/contacts');
+
+}
+
+
function contacts_post(&$a) {
-
+
if(! local_user())
return;
+ if ($a->argv[1]==="batch") {
+ contacts_batch_actions($a);
+ return;
+ }
+
$contact_id = intval($a->argv[1]);
if(! $contact_id)
return;
@@ -95,6 +167,12 @@ function contacts_post(&$a) {
$hidden = intval($_POST['hidden']);
+ $notify = intval($_POST['notify']);
+
+ $fetch_further_information = intval($_POST['fetch_further_information']);
+
+ $ffi_keyword_blacklist = fix_mce_lf(escape_tags(trim($_POST['ffi_keyword_blacklist'])));
+
$priority = intval($_POST['poll']);
if($priority > 5 || $priority < 0)
$priority = 0;
@@ -102,11 +180,15 @@ function contacts_post(&$a) {
$info = fix_mce_lf(escape_tags(trim($_POST['info'])));
$r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `info` = '%s',
- `hidden` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ `hidden` = %d, `notify_new_posts` = %d, `fetch_further_information` = %d,
+ `ffi_keyword_blacklist` = '%s' WHERE `id` = %d AND `uid` = %d",
intval($profile_id),
intval($priority),
dbesc($info),
intval($hidden),
+ intval($notify),
+ intval($fetch_further_information),
+ dbesc($ffi_keyword_blacklist),
intval($contact_id),
intval(local_user())
);
@@ -126,6 +208,139 @@ function contacts_post(&$a) {
}
+/*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"];
+
+ if ($uid != local_user())
+ return;
+
+ if ($r[0]["network"] == NETWORK_OSTATUS) {
+ $result = new_contact($uid, $r[0]["url"], false);
+
+ if ($result['success'])
+ $r = q("UPDATE `contact` SET `subhub` = 1 WHERE `id` = %d",
+ intval($contact_id));
+ } else
+ // pull feed and consume it, which should subscribe to the hub.
+ proc_run('php',"include/onepoll.php","$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)
+ return;
+
+ $uid = $r[0]["uid"];
+
+ if ($uid != local_user())
+ return;
+
+ $data = probe_url($r[0]["url"]);
+
+ // "Feed" or "Unknown" is mostly a sign of communication problems
+ if ((in_array($data["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) AND ($data["network"] != $r[0]["network"]))
+ return;
+
+ $updatefields = array("name", "nick", "url", "addr", "batch", "notify", "poll", "request", "confirm",
+ "poco", "network", "alias");
+ $update = array();
+
+ if ($data["network"] == NETWORK_OSTATUS) {
+ $result = new_contact($uid, $data["url"], false);
+
+ if ($result['success'])
+ $update["subhub"] = true;
+ }
+
+ foreach($updatefields AS $field)
+ if (isset($data[$field]) AND ($data[$field] != ""))
+ $update[$field] = $data[$field];
+
+ $update["nurl"] = normalise_link($data["url"]);
+
+ $query = "";
+
+ if (isset($data["priority"]) AND ($data["priority"] != 0))
+ $query = "`priority` = ".intval($data["priority"]);
+
+ foreach($update AS $key => $value) {
+ if ($query != "")
+ $query .= ", ";
+
+ $query .= "`".$key."` = '".dbesc($value)."'";
+ }
+
+ if ($query == "")
+ return;
+
+ $r = q("UPDATE `contact` SET $query WHERE `id` = %d AND `uid` = %d",
+ intval($contact_id),
+ intval(local_user())
+ );
+
+ $photos = import_profile_photo($data['photo'], local_user(), $contact_id);
+
+ $r = q("UPDATE `contact` SET `photo` = '%s',
+ `thumb` = '%s',
+ `micro` = '%s',
+ `name-date` = '%s',
+ `uri-date` = '%s',
+ `avatar-date` = '%s'
+ WHERE `id` = %d",
+ dbesc($photos[0]),
+ dbesc($photos[1]),
+ dbesc($photos[2]),
+ dbesc(datetime_convert()),
+ dbesc(datetime_convert()),
+ dbesc(datetime_convert()),
+ intval($contact_id)
+ );
+
+}
+
+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;
+
+}
+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;
+}
+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),
+ intval($contact_id),
+ intval(local_user())
+ );
+ if ($archived) {
+ q("UPDATE `item` SET `private` = 2 WHERE `contact-id` = %d AND `uid` = %d", intval($contact_id), intval(local_user()));
+ }
+ return $r;
+}
+function _contact_drop($contact_id, $orig_record) {
+ require_once('include/Contact.php');
+ $a = get_app();
+
+ terminate_friendship($a->user,$a->contact,$orig_record);
+ contact_remove($orig_record['id']);
+}
function contacts_content(&$a) {
@@ -158,67 +373,90 @@ function contacts_content(&$a) {
goaway($a->get_baseurl(true) . '/contacts');
return; // NOTREACHED
}
-
- if($cmd === 'update') {
- // pull feed and consume it, which should subscribe to the hub.
- proc_run('php',"include/poller.php","$contact_id");
+ if($cmd === 'update') {
+ _contact_update($contact_id);
goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
// NOTREACHED
}
+ if($cmd === 'updateprofile') {
+ _contact_update_profile($contact_id);
+ goaway($a->get_baseurl(true) . '/crepair/' . $contact_id);
+ // NOTREACHED
+ }
+
if($cmd === 'block') {
- $blocked = (($orig_record[0]['blocked']) ? 0 : 1);
- $r = q("UPDATE `contact` SET `blocked` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
- intval($blocked),
- intval($contact_id),
- intval(local_user())
- );
+ $r = _contact_block($contact_id, $orig_record[0]);
if($r) {
- //notice( t('Contact has been ') . (($blocked) ? t('blocked') : t('unblocked')) . EOL );
- info( (($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')) . EOL );
+ $blocked = (($orig_record[0]['blocked']) ? 0 : 1);
+ info((($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')).EOL);
}
+
goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
return; // NOTREACHED
}
if($cmd === 'ignore') {
- $readonly = (($orig_record[0]['readonly']) ? 0 : 1);
- $r = q("UPDATE `contact` SET `readonly` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
- intval($readonly),
- intval($contact_id),
- intval(local_user())
- );
+ $r = _contact_ignore($contact_id, $orig_record[0]);
if($r) {
- info( (($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')) . EOL );
+ $readonly = (($orig_record[0]['readonly']) ? 0 : 1);
+ info((($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')).EOL);
}
+
goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
return; // NOTREACHED
}
if($cmd === 'archive') {
- $archived = (($orig_record[0]['archive']) ? 0 : 1);
- $r = q("UPDATE `contact` SET `archive` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
- intval($archived),
- intval($contact_id),
- intval(local_user())
- );
+ $r = _contact_archive($contact_id, $orig_record[0]);
if($r) {
- //notice( t('Contact has been ') . (($archived) ? t('archived') : t('unarchived')) . EOL );
- info( (($archived) ? t('Contact has been archived') : t('Contact has been unarchived')) . EOL );
+ $archived = (($orig_record[0]['archive']) ? 0 : 1);
+ info((($archived) ? t('Contact has been archived') : t('Contact has been unarchived')).EOL);
}
+
goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
return; // NOTREACHED
}
if($cmd === 'drop') {
- require_once('include/Contact.php');
-
- terminate_friendship($a->user,$a->contact,$orig_record[0]);
+ // Check if we should do HTML-based delete confirmation
+ if($_REQUEST['confirm']) {
+ //