Merge pull request #2888 from annando/1610-priority-dbclean

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 6ebedbcae8ff27f9ce63516080dacee98508cadf..559bad0a3e332208c6795898135007f7674ced82 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -122,7 +122,7 @@ function network_init(&$a) {
        $search = ((x($_GET,'search')) ? escape_tags($_GET['search']) : '');
 
        if(x($_GET,'save')) {
-               $r = q("SELECT * FROM `search` WHERE `uid` = %d AND `term` = '%s' LIMIT 1",
+               $r = qu("SELECT * FROM `search` WHERE `uid` = %d AND `term` = '%s' LIMIT 1",
                        intval(local_user()),
                        dbesc($search)
                );
@@ -176,7 +176,7 @@ function saved_searches($search) {
 
        $o = '';
 
-       $r = q("SELECT `id`,`term` FROM `search` WHERE `uid` = %d",
+       $r = qu("SELECT `id`,`term` FROM `search` WHERE `uid` = %d",
                intval(local_user())
        );
 
@@ -375,7 +375,7 @@ function network_content(&$a, $update = 0) {
                $def_acl = array('allow_cid' => '<' . intval($cid) . '>');
 
        if($nets) {
-               $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND network = '%s' AND `self` = 0",
+               $r = qu("SELECT `id` FROM `contact` WHERE `uid` = %d AND network = '%s' AND `self` = 0",
                        intval(local_user()),
                        dbesc($nets)
                );
@@ -408,7 +408,7 @@ function network_content(&$a, $update = 0) {
 
                if ($cid) {
                        // If $cid belongs to a communitity forum or a privat goup,.add a mention to the status editor
-                       $contact = q("SELECT `nick` FROM `contact` WHERE `id` = %d AND `uid` = %d AND (`forum` OR `prv`) ",
+                       $contact = qu("SELECT `nick` FROM `contact` WHERE `id` = %d AND `uid` = %d AND (`forum` OR `prv`) ",
                                intval($cid),
                                intval(local_user())
                        );
@@ -458,7 +458,7 @@ function network_content(&$a, $update = 0) {
        $sql_nets = (($nets) ? sprintf(" and $sql_table.`network` = '%s' ", dbesc($nets)) : '');
 
        if($group) {
-               $r = q("SELECT `name`, `id` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+               $r = qu("SELECT `name`, `id` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                        intval($group),
                        intval($_SESSION['uid'])
                );
@@ -479,7 +479,7 @@ function network_content(&$a, $update = 0) {
 
                        $contact_str = implode(',',$contacts);
                        $gcontact_str = implode(',',$gcontacts);
-                       $self = q("SELECT `contact`.`id`, `gcontact`.`id` AS `gid` FROM `contact`
+                       $self = qu("SELECT `contact`.`id`, `gcontact`.`id` AS `gid` FROM `contact`
                                        INNER JOIN `gcontact` ON `gcontact`.`nurl` = `contact`.`nurl`
                                        WHERE `uid` = %d AND `self`", intval($_SESSION['uid']));
                        if (count($self)) {
@@ -502,7 +502,7 @@ function network_content(&$a, $update = 0) {
        }
        elseif($cid) {
 
-               $r = q("SELECT `id`,`name`,`network`,`writable`,`nurl`, `forum`, `prv`, `addr`, `thumb`, `location` FROM `contact` WHERE `id` = %d
+               $r = qu("SELECT `id`,`name`,`network`,`writable`,`nurl`, `forum`, `prv`, `contact-type`, `addr`, `thumb`, `location` FROM `contact` WHERE `id` = %d
                                AND `blocked` = 0 AND `pending` = 0 LIMIT 1",
                        intval($cid)
                );
@@ -514,10 +514,11 @@ function network_content(&$a, $update = 0) {
                                'name' => htmlentities($r[0]['name']),
                                'itemurl' => (($r[0]['addr']) ? ($r[0]['addr']) : ($r[0]['nurl'])),
                                'thumb' => proxy_url($r[0]['thumb'], false, PROXY_SIZE_THUMB),
-                               'account_type' => (($r[0]['forum']) || ($r[0]['prv']) ? t('Forum') : ''),
                                'details' => $r[0]['location'],
                        );
 
+                       $entries[0]["account_type"] = account_type($r[0]);
+
                        $o = replace_macros(get_markup_template("viewcontact_template.tpl"),array(
                                'contacts' => $entries,
                                'id' => 'network',
@@ -599,7 +600,7 @@ function network_content(&$a, $update = 0) {
        }
        else {
                if(get_config('system', 'old_pager')) {
-                       $r = q("SELECT COUNT(*) AS `total`
+                       $r = qu("SELECT COUNT(*) AS `total`
                                FROM $sql_table $sql_post_table INNER JOIN `contact` ON `contact`.`id` = $sql_table.`contact-id`
                                AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
                                WHERE $sql_table.`uid` = %d AND $sql_table.`visible` AND NOT $sql_table.`deleted`
@@ -639,7 +640,7 @@ function network_content(&$a, $update = 0) {
                        $sql_order = "`item`.`received`";
 
                // "New Item View" - show all items unthreaded in reverse created date order
-               $items = q("SELECT %s FROM $sql_table $sql_post_table %s
+               $items = qu("SELECT %s FROM $sql_table $sql_post_table %s
                        WHERE %s AND `item`.`uid` = %d
                        $simple_update
                        $sql_extra $sql_nets
@@ -677,7 +678,7 @@ function network_content(&$a, $update = 0) {
                        else
                                $sql_extra4 = "";
 
-                       $r = q("SELECT `item`.`parent` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid`
+                       $r = qu("SELECT `item`.`parent` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid`
                                FROM $sql_table $sql_post_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
                                AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
                                WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted` $sql_extra4
@@ -687,7 +688,7 @@ function network_content(&$a, $update = 0) {
                                intval(local_user())
                        );
                } else {
-                       $r = q("SELECT `thread`.`iid` AS `item_id`, `thread`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid`
+                       $r = qu("SELECT `thread`.`iid` AS `item_id`, `thread`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid`
                                FROM $sql_table $sql_post_table STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
                                AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
                                WHERE `thread`.`uid` = %d AND `thread`.`visible` AND NOT `thread`.`deleted`
@@ -721,7 +722,7 @@ function network_content(&$a, $update = 0) {
                        $items = array();
 
                        foreach ($parents_arr AS $parents) {
-                               $thread_items = q(item_query()." AND `item`.`uid` = %d
+                               $thread_items = qu(item_query()." AND `item`.`uid` = %d
                                        AND `item`.`parent` = %d
                                        ORDER BY `item`.`commented` DESC LIMIT %d",
                                        intval(local_user()),