used more App::get_baseurl() instead of get_app()->get_baseurl().

[friendica.git] / include / acl_selectors.php

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index ed9c634c23a8073950eb6ae40e146444e8554737..dc86ba03455f31f61190235c136bfb5ca1650194 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -34,7 +34,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
        call_hooks($a->module . '_pre_' . $selname, $arr);
 
        if (dbm::is_result($r)) {
-               foreach($r as $rr) {
+               foreach ($r as $rr) {
                        if((is_array($preselected)) && in_array($rr['id'], $preselected))
                                $selected = " selected=\"selected\" ";
                        else
@@ -145,7 +145,7 @@ function contact_selector($selname, $selclass, $preselected = false, $options) {
        call_hooks($a->module . '_pre_' . $selname, $arr);
 
        if (dbm::is_result($r)) {
-               foreach($r as $rr) {
+               foreach ($r as $rr) {
                        if((is_array($preselected)) && in_array($rr['id'], $preselected))
                                $selected = " selected=\"selected\" ";
                        else
@@ -221,16 +221,20 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
        $receiverlist = array();
 
        if (dbm::is_result($r)) {
-               foreach($r as $rr) {
-                       if((is_array($preselected)) && in_array($rr['id'], $preselected))
+               foreach ($r as $rr) {
+                       if ((is_array($preselected)) && in_array($rr['id'], $preselected)) {
                                $selected = " selected=\"selected\" ";
-                       else
+                       }
+                       else {
                                $selected = '';
+                       }
 
-                       if($privmail)
+                       if ($privmail) {
                                $trimmed = GetProfileUsername($rr['url'], $rr['name'], false);
-                       else
+                       }
+                       else {
                                $trimmed = mb_substr($rr['name'],0,20);
+                       }
 
                        $receiverlist[] = $trimmed;
 
@@ -260,7 +264,7 @@ function prune_deadguys($arr) {
                return $arr;
        $str = dbesc(implode(',',$arr));
        $r = q("SELECT `id` FROM `contact` WHERE `id` IN ( " . $str . ") AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 ");
-       if($r) {
+       if ($r) {
                $ret = array();
                foreach($r as $rr)
                        $ret[] = intval($rr['id']);
@@ -392,8 +396,9 @@ function construct_acl_data(&$a, $user) {
 
 function acl_lookup(&$a, $out_type = 'json') {
 
-       if(!local_user())
-               return "";
+       if (!local_user()) {
+               return '';
+       }
 
        $start  =       (x($_REQUEST,'start')           ? $_REQUEST['start']            : 0);
        $count  =       (x($_REQUEST,'count')           ? $_REQUEST['count']            : 100);
@@ -553,7 +558,7 @@ function acl_lookup(&$a, $out_type = 'json') {
                // autocomplete for global contact search (e.g. navbar search)
                $r = navbar_complete($a);
                $contacts = array();
-               if($r) {
+               if ($r) {
                        foreach($r as $g) {
                                $contacts[] = array(
                                        "photo"    => proxy_url($g['photo'], false, PROXY_SIZE_MICRO),