Merge pull request #2105 from rabuzarus/2811_forums_contact_pages

add missing info about if contact is forum to contact related pages

diff --git a/mod/dirfind.php b/mod/dirfind.php
index 6a4c7f1ced21a542c33225f400b2f0913e39ea27..3f9c82576a3bf02845082e266ba1dfb0e66095cf 100644 (file)
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -205,6 +205,7 @@ function dirfind_content(&$a, $prefix = "") {
                                        'details'       => $contact_details['location'],
                                        'tags'          => $contact_details['keywords'],
                                        'about'         => $contact_details['about'],
+                                       'account_type'  => (($contact_details['community']) ? t('Forum') : ''),
                                        'network' => network_to_name($jj->network, $jj->url),
                                        'id' => ++$id,
                                );

diff --git a/mod/match.php b/mod/match.php
index db1cac0f7876d8b7106c87b8559c9d0f5e492974..3b0367b4290e1efd02ccbd945eca34fb4e79bb4d 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -79,6 +79,7 @@ function match_content(&$a) {
                                                'details'       => $contact_details['location'],
                                                'tags'          => $contact_details['keywords'],
                                                'about'         => $contact_details['about'],
+                                               'account_type'  => (($contact_details['community']) ? t('Forum') : ''),
                                                'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
                                                'inttxt' => ' ' . t('is interested in:'),
                                                'conntxt' => t('Connect'),

diff --git a/mod/suggest.php b/mod/suggest.php
index 578338b5058055ff85d57dbb22d7c6abff4aab9f..b73c2cd1b61eef34a248ff9e507d92b4182f419b 100644 (file)
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -36,7 +36,7 @@ function suggest_init(&$a) {
                }
                // Now check how the user responded to the confirmation query
                if(!$_REQUEST['canceled']) {
-                       q("insert into gcign ( uid, gcid ) values ( %d, %d ) ",
+                       q("INSERT INTO `gcign` ( `uid`, `gcid` ) VALUES ( %d, %d ) ",
                                intval(local_user()),
                                intval($_GET['ignore'])
                        );
@@ -90,8 +90,9 @@ function suggest_content(&$a) {
                        'name' => $rr['name'],
                        'thumb' => proxy_url($rr['photo'], false, PROXY_SIZE_THUMB),
                        'details'       => $contact_details['location'],
-                        'tags'          => $contact_details['keywords'],
-                        'about'         => $contact_details['about'],
+                       'tags'          => $contact_details['keywords'],
+                       'about'         => $contact_details['about'],
+                       'account_type'  => (($contact_details['community']) ? t('Forum') : ''),
                        'ignlnk' => $ignlnk,
                        'ignid' => $rr['id'],
                        'conntxt' => t('Connect'),

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index f199574c69483945f63f4e632c155aa49ba500d2..c7f139e1e48aa9732773db0c98f586928a6c789d 100644 (file)
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -26,7 +26,7 @@ function viewcontacts_content(&$a) {
        }
 
 
-       $r = q("SELECT COUNT(*) as `total` FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0 ",
+       $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0 ",
                intval($a->profile['uid'])
        );
        if(count($r))
@@ -68,8 +68,9 @@ function viewcontacts_content(&$a) {
                        'name' => htmlentities(substr($rr['name'],0,20)),
                        'username' => htmlentities($rr['name']),
                        'details'       => $contact_details['location'],
-                        'tags'          => $contact_details['keywords'],
-                        'about'         => $contact_details['about'],
+                       'tags'          => $contact_details['keywords'],
+                       'about'         => $contact_details['about'],
+                       'account_type'  => (($contact_details['community']) ? t('Forum') : ''),
                        'url' => $url,
                        'sparkle' => '',
                        'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),