diff options
| author | Mike Macgirvin <mike@macgirvin.com> | 2010-10-01 04:41:53 -0700 |
|---|---|---|
| committer | Mike Macgirvin <mike@macgirvin.com> | 2010-10-01 04:41:53 -0700 |
| commit | 7658acbe0adfb499d9460172849f7530b476a8bb (patch) | |
| tree | 6cd20f3e1bb19c0c3e4688f713091929bf03044b | |
| parent | f5615068ca338153ab7dacf5c9ce46c6ed7b1ab4 (diff) | |
| download | volse-hubzilla-7658acbe0adfb499d9460172849f7530b476a8bb.tar.gz volse-hubzilla-7658acbe0adfb499d9460172849f7530b476a8bb.tar.bz2 volse-hubzilla-7658acbe0adfb499d9460172849f7530b476a8bb.zip | |
automatically subscribe to hub if conditions are right
| -rw-r--r-- | include/poller.php | 2 | ||||
| -rw-r--r-- | mod/contacts.php | 17 | ||||
| -rw-r--r-- | view/contact_edit.tpl | 1 |
3 files changed, 2 insertions, 18 deletions
diff --git a/include/poller.php b/include/poller.php index fc77946f9..ab3987d65 100644 --- a/include/poller.php +++ b/include/poller.php @@ -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); } diff --git a/mod/contacts.php b/mod/contacts.php index 8c2446979..dfd98961b 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -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')), diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl index 0771849de..acea1da4e 100644 --- a/view/contact_edit.tpl +++ b/view/contact_edit.tpl @@ -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> |