Merge pull request #3093 from annando/issue-3011

[friendica.git] / include / text.php

diff --git a/include/text.php b/include/text.php
index 1197f24ee169421e9ab45336b454ad79ae8e18db..77a9f25af9578f4909d0595f290d8b32e6fd1544 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -23,7 +23,7 @@ function replace_macros($s,$r) {
        $a = get_app();
 
        // pass $baseurl to all templates
-       $r['$baseurl'] = $a->get_baseurl();
+       $r['$baseurl'] = App::get_baseurl();
 
 
        $t = $a->template_engine();
@@ -276,7 +276,7 @@ if(! function_exists('paginate_data')) {
  * @param int $count [optional] item count (used with alt pager)
  * @return Array data for pagination template
  */
-function paginate_data(&$a, $count=null) {
+function paginate_data(App $a, $count=null) {
        $stripped = preg_replace('/([&?]page=[0-9]*)/','',$a->query_string);
 
        $stripped = str_replace('q=','',$stripped);
@@ -369,7 +369,7 @@ if(! function_exists('paginate')) {
  * @param App $a App instance
  * @return string html for pagination #FIXME remove html
  */
-function paginate(&$a) {
+function paginate(App $a) {
 
        $data = paginate_data($a);
        $tpl = get_markup_template("paginate.tpl");
@@ -384,7 +384,7 @@ if(! function_exists('alt_pager')) {
  * @param int $i
  * @return string html for pagination #FIXME remove html
  */
-function alt_pager(&$a, $i) {
+function alt_pager(App $a, $i) {
 
        $data = paginate_data($a, $i);
        $tpl = get_markup_template("paginate.tpl");
@@ -491,7 +491,7 @@ function item_new_uri($hostname,$uid, $guid = "") {
 
                $r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
                        dbesc($uri));
-               if(count($r))
+               if (dbm::is_result($r))
                        $dups = true;
        } while($dups == true);
        return $uri;
@@ -515,7 +515,7 @@ function photo_new_resource() {
                $r = q("SELECT `id` FROM `photo` WHERE `resource-id` = '%s' LIMIT 1",
                        dbesc($resource)
                );
-               if(count($r))
+               if (dbm::is_result($r))
                        $found = true;
        } while($found == true);
        return $resource;
@@ -699,7 +699,7 @@ $LOGGER_LEVELS = array();
  * @param int $level
  */
 function logger($msg, $level = 0) {
-       global $a;
+       $a = get_app();
        global $db;
        global $LOGGER_LEVELS;
 
@@ -882,7 +882,7 @@ function contact_block() {
                        dbesc(NETWORK_OSTATUS),
                        dbesc(NETWORK_DIASPORA)
        );
-       if(count($r)) {
+       if (dbm::is_result($r)) {
                $total = intval($r[0]['total']);
        }
        if(! $total) {
@@ -901,17 +901,18 @@ function contact_block() {
                                dbesc(NETWORK_DIASPORA),
                                intval($shown)
                );
-               if ($r) {
+               if (dbm::is_result($r)) {
                        $contacts = "";
                        foreach ($r AS $contact)
                                $contacts[] = $contact["id"];
 
                        $r = q("SELECT `id`, `uid`, `addr`, `url`, `name`, `thumb`, `network` FROM `contact` WHERE `id` IN (%s)",
                                dbesc(implode(",", $contacts)));
-                       if(count($r)) {
+
+                       if (dbm::is_result($r)) {
                                $contacts = sprintf( tt('%d Contact','%d Contacts', $total),$total);
                                $micropro = Array();
-                               foreach($r as $rr) {
+                               foreach ($r as $rr) {
                                        $micropro[] = micropro($rr,true,'mpfriend');
                                }
                        }
@@ -1366,7 +1367,7 @@ function prepare_body(&$item,$attach = false, $preview = false) {
        // map
        if(strpos($s,'<div class="map">') !== false && $item['coord']) {
                $x = generate_map(trim($item['coord']));
-               if($x) {
+               if ($x) {
                        $s = preg_replace('/\<div class\=\"map\"\>/','$0' . $x,$s);
                }
        }
@@ -1716,7 +1717,7 @@ function bb_translate_video($s) {
 
        $matches = null;
        $r = preg_match_all("/\[video\](.*?)\[\/video\]/ism",$s,$matches,PREG_SET_ORDER);
-       if($r) {
+       if ($r) {
                foreach($matches as $mtch) {
                        if((stristr($mtch[1],'youtube')) || (stristr($mtch[1],'youtu.be')))
                                $s = str_replace($mtch[0],'[youtube]' . $mtch[1] . '[/youtube]',$s);
@@ -1931,7 +1932,7 @@ function file_tag_update_pconfig($uid,$file_old,$file_new,$type = 'file') {
                        //      intval($uid)
                        //);
 
-                       if(count($r)) {
+                       if (dbm::is_result($r)) {
                                unset($deleted_tags[$key]);
                        }
                        else {
@@ -1961,7 +1962,7 @@ function file_tag_save_file($uid,$item,$file) {
                intval($item),
                intval($uid)
        );
-       if(count($r)) {
+       if (dbm::is_result($r)) {
                if(! stristr($r[0]['file'],'[' . file_tag_encode($file) . ']'))
                        q("UPDATE `item` SET `file` = '%s' WHERE `id` = %d AND `uid` = %d",
                                dbesc($r[0]['file'] . '[' . file_tag_encode($file) . ']'),
@@ -1999,8 +2000,9 @@ function file_tag_unsave_file($uid,$item,$file,$cat = false) {
                intval($item),
                intval($uid)
        );
-       if(! count($r))
+       if (! dbm::is_result($r)) {
                return false;
+       }
 
        q("UPDATE `item` SET `file` = '%s' WHERE `id` = %d AND `uid` = %d",
                dbesc(str_replace($pattern,'',$r[0]['file'])),
@@ -2019,11 +2021,11 @@ function file_tag_unsave_file($uid,$item,$file,$cat = false) {
        //$r = q("select file from item where uid = %d and deleted = 0 " . file_tag_file_query('item',$file,(($cat) ? 'category' : 'file')),
        //);
 
-       if(! count($r)) {
+       if (! dbm::is_result($r)) {
                $saved = get_pconfig($uid,'system','filetags');
                set_pconfig($uid,'system','filetags',str_replace($pattern,'',$saved));
-
        }
+
        return true;
 }