From 974a52a16d3440b6d361b883412c00edd15e770b Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 18 Dec 2011 01:08:32 -0800 Subject: [PATCH] add connect link to friend suggest --- mod/follow.php | 2 +- mod/suggest.php | 8 ++++++-- view/suggest_friends.tpl | 3 +++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/mod/follow.php b/mod/follow.php index 2d643400a7..5fdb938157 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -10,7 +10,7 @@ function follow_post(&$a) { // NOTREACHED } - $url = $orig_url = notags(trim($_POST['url'])); + $url = $orig_url = notags(trim($_REQUEST['url'])); // remove ajax junk, e.g. Twitter diff --git a/mod/suggest.php b/mod/suggest.php index aedf3fd46a..bbffe8fb0f 100644 --- a/mod/suggest.php +++ b/mod/suggest.php @@ -39,19 +39,23 @@ function suggest_content(&$a) { $r = suggestion_query(local_user()); if(! count($r)) { - $o .= t('No suggestions. This works best when you have more than one contact/friend.'); + $o .= t('No suggestions available. If this is a new site, please try again in 24 hours.'); return $o; } $tpl = get_markup_template('suggest_friends.tpl'); foreach($r as $rr) { - + + $connlink = $a->get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']); + $o .= replace_macros($tpl,array( '$url' => $rr['url'], '$name' => $rr['name'], '$photo' => $rr['photo'], '$ignlnk' => $a->get_baseurl() . '/suggest?ignore=' . $rr['id'], + '$conntxt' => t('Connect'), + '$connlnk' => $connlnk, '$ignore' => t('Ignore/Hide') )); } diff --git a/view/suggest_friends.tpl b/view/suggest_friends.tpl index 8e60564944..c66cdd65d1 100644 --- a/view/suggest_friends.tpl +++ b/view/suggest_friends.tpl @@ -9,5 +9,8 @@
$name
+ {{ if $connlnk }} +
$conntxt
+ {{ endif }}
\ No newline at end of file