diff options
| author | friendica <info@friendica.com> | 2011-12-18 01:08:32 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2011-12-18 01:08:32 -0800 |
| commit | 974a52a16d3440b6d361b883412c00edd15e770b (patch) | |
| tree | 15a07550f0d5b1bd804148f83cf815117c11d585 | |
| parent | e6b538c0466fb73bc3bf781266f85f45f8b39ea3 (diff) | |
| download | volse-hubzilla-974a52a16d3440b6d361b883412c00edd15e770b.tar.gz volse-hubzilla-974a52a16d3440b6d361b883412c00edd15e770b.tar.bz2 volse-hubzilla-974a52a16d3440b6d361b883412c00edd15e770b.zip | |
add connect link to friend suggest
| -rw-r--r-- | mod/follow.php | 2 | ||||
| -rw-r--r-- | mod/suggest.php | 8 | ||||
| -rw-r--r-- | view/suggest_friends.tpl | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/mod/follow.php b/mod/follow.php index 2d643400a..5fdb93815 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 aedf3fd46..bbffe8fb0 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 8e6056494..c66cdd65d 100644 --- a/view/suggest_friends.tpl +++ b/view/suggest_friends.tpl @@ -9,5 +9,8 @@ <div class="profile-match-name"> <a href="$url" title="$name">$name</a> </div> + {{ if $connlnk }} + <div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div> + {{ endif }} <div class="profile-match-end"></div> </div>
\ No newline at end of file |