aboutsummaryrefslogtreecommitdiffstats
path: root/mod/contacts.php
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-01-31 09:54:08 +0100
committerFabio Comuni <fabrix.xm@gmail.com>2011-01-31 09:54:08 +0100
commite962561f8d511129d87b5e50eede8e96b2bdfb7c (patch)
treece3a0404855e11a59679f4b108433a74e38b3256 /mod/contacts.php
parentbf8dadb9700fd0600a38116bf03588883350aab1 (diff)
parentd8877b88d6c26e29019312f02297411817692361 (diff)
downloadvolse-hubzilla-e962561f8d511129d87b5e50eede8e96b2bdfb7c.tar.gz
volse-hubzilla-e962561f8d511129d87b5e50eede8e96b2bdfb7c.tar.bz2
volse-hubzilla-e962561f8d511129d87b5e50eede8e96b2bdfb7c.zip
Merge remote branch 'friendika-master/master'
Diffstat (limited to 'mod/contacts.php')
-rw-r--r--mod/contacts.php10
1 files changed, 10 insertions, 0 deletions
diff --git a/mod/contacts.php b/mod/contacts.php
index 177ca9973..4c627c88f 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -121,6 +121,15 @@ function contacts_content(&$a) {
return; // NOTREACHED
}
+ if($cmd === 'update') {
+
+ // pull feed and consume it, which should subscribe to the hub.
+
+ $php_path = ((x($a->config,'php_path') && strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+ proc_run($php_path,"include/poller.php","$contact_id");
+ goaway($a->get_baseurl() . '/contacts/' . $contact_id);
+ // NOTREACHED
+ }
if($cmd === 'block') {
$blocked = (($orig_record[0]['blocked']) ? 0 : 1);
@@ -248,6 +257,7 @@ function contacts_content(&$a) {
'$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')),
+ '$udnow' => t('Update now'),
'$profile_select' => contact_profile_assign($r[0]['profile-id'],(($r[0]['network'] !== 'dfrn') ? true : false)),
'$contact_id' => $r[0]['id'],
'$block_text' => (($r[0]['blocked']) ? t('Unblock this contact') : t('Block this contact') ),