menu entry for "Delegations" moved to the settings.

[friendica.git] / include / acl_selectors.php

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 886bce877387ade50d3bb9ab0c886849a8677938..ee74ccc16ab440309f1fe9ac8e24ebee026dd023 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -320,7 +320,7 @@ function populate_acl($user = null,$celeb = false) {
        $o .= '</div>';
        $o .= '</div>' . "\r\n";
        $o .= '<div id="acl-wrapper-end"></div>' . "\r\n";*/
-       
+
        $tpl = get_markup_template("acl_selector.tpl");
        $o = replace_macros($tpl, array(
                '$showall'=> t("Visible to everybody"),
@@ -334,8 +334,8 @@ function populate_acl($user = null,$celeb = false) {
                        "aclautomention"=>(feature_enabled($user['uid'],"aclautomention")?"true":"false")
                ),
        ));
-       
-       
+
+
        return $o;
 
 }
@@ -399,19 +399,19 @@ function acl_lookup(&$a, $out_type = 'json') {
        } else {
                $sql_extra = $sql_extra2 = "";
        }
-       
+
        // count groups and contacts
        if ($type=='' || $type=='g'){
-               $r = q("SELECT COUNT(`id`) AS g FROM `group` WHERE `deleted` = 0 AND `uid` = %d $sql_extra",
+               $r = q("SELECT COUNT(*) AS g FROM `group` WHERE `deleted` = 0 AND `uid` = %d $sql_extra",
                        intval(local_user())
                );
                $group_count = (int)$r[0]['g'];
        } else {
                $group_count = 0;
        }
-       
+
        if ($type=='' || $type=='c'){
-               $r = q("SELECT COUNT(`id`) AS c FROM `contact` 
+               $r = q("SELECT COUNT(*) AS c FROM `contact` 
                                WHERE `uid` = %d AND `self` = 0 
                                AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0
                                AND `notify` != '' $sql_extra2" ,
@@ -423,7 +423,7 @@ function acl_lookup(&$a, $out_type = 'json') {
 
                // autocomplete for Private Messages
 
-               $r = q("SELECT COUNT(`id`) AS c FROM `contact` 
+               $r = q("SELECT COUNT(*) AS c FROM `contact` 
                                WHERE `uid` = %d AND `self` = 0 
                                AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 
                                AND `network` IN ('%s','%s','%s') $sql_extra2" ,
@@ -439,7 +439,7 @@ function acl_lookup(&$a, $out_type = 'json') {
 
                // autocomplete for Contacts
 
-               $r = q("SELECT COUNT(`id`) AS c FROM `contact` 
+               $r = q("SELECT COUNT(*) AS c FROM `contact` 
                                WHERE `uid` = %d AND `self` = 0 
                                AND `pending` = 0 $sql_extra2" ,
                        intval(local_user())