mirror of
https://github.com/friendica/friendica
synced 2024-11-10 02:22:55 +00:00
automatically subscribe to hub if conditions are right
This commit is contained in:
parent
f5615068ca
commit
7658acbe0a
3 changed files with 2 additions and 18 deletions
|
@ -164,7 +164,7 @@
|
|||
consume_feed($xml,$importer,$contact,$hub);
|
||||
|
||||
|
||||
if($contact['usehub'] && strlen($hub)) {
|
||||
if((strlen($hub)) && (contact['rel'] == REL_BUD) && ($contact['priority'] == 0)) {
|
||||
subscribe_to_hub($hub,$importer,$contact);
|
||||
}
|
||||
|
||||
|
|
|
@ -42,10 +42,6 @@ function contacts_post(&$a) {
|
|||
}
|
||||
}
|
||||
|
||||
$usehub = ((intval($_POST['usehub'])) ? 1 : 0);
|
||||
if($orig_record[0]['usehub'] && (! $usehub)) {
|
||||
// remove hub subscription
|
||||
}
|
||||
|
||||
$priority = intval($_POST['priority']);
|
||||
if($priority == (-1))
|
||||
|
@ -59,10 +55,9 @@ function contacts_post(&$a) {
|
|||
|
||||
$reason = notags(trim($_POST['reason']));
|
||||
|
||||
$r = q("UPDATE `contact` SET `profile-id` = %d, `usehub` = %d, `priority` = %d , `rating` = %d, `reason` = '%s'
|
||||
$r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `rating` = %d, `reason` = '%s'
|
||||
WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
intval($profile_id),
|
||||
intval($usehub),
|
||||
intval($priority),
|
||||
intval($rating),
|
||||
dbesc($reason),
|
||||
|
@ -186,18 +181,8 @@ function contacts_content(&$a) {
|
|||
$sparkle = '';
|
||||
}
|
||||
|
||||
$huburl = get_config('system','huburl');
|
||||
if($huburl) {
|
||||
// finish selector
|
||||
$hubenable = '';
|
||||
}
|
||||
else
|
||||
$hubenable = '';
|
||||
|
||||
|
||||
$o .= replace_macros($tpl,array(
|
||||
'$poll_interval' => contact_poll_interval($r[0]['priority']),
|
||||
'$hubenable' => $hubenable,
|
||||
'$last_update' => (($r[0]['last-update'] == '0000-00-00 00:00:00')
|
||||
? t('Never')
|
||||
: datetime_convert('UTC',date_default_timezone_get(),$r[0]['last-update'],'D, j M Y, g:i A')),
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
<div id="contact-edit-last-update-text">Last updated: <span id="contact-edit-last-updated">$last_update</span</div>
|
||||
<div id="contact-edit-poll-text">Update public posts: </div>
|
||||
$poll_interval
|
||||
$hubenable
|
||||
</div>
|
||||
</div>
|
||||
<div id="contact-edit-end" ></div>
|
||||
|
|
Loading…
Reference in a new issue