Merge pull request #4754 from annando/frio-accessibility

[friendica.git] / view / theme / frio / theme.php

diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 3c4d5120cf84dc46e9cf14e6c6ce69a210c2aebe..74b1577ddf2837788c90a9c27e2b84b7bc2bb249 100644 (file)
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -6,7 +6,9 @@
  * Author: Rabuzarus <https://friendica.kommune4.de/profile/rabuzarus>
  *
  */
+
 use Friendica\App;
+use Friendica\Content\Text\Plaintext;
 use Friendica\Content\Widget;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
@@ -15,7 +17,6 @@ use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Profile;
-use Friendica\Object\Image;
 
 $frio = "view/theme/frio";
 
@@ -90,10 +91,8 @@ function frio_uninstall()
  */
 function frio_item_photo_links(App $a, &$body_info)
 {
-       $phototypes = Image::supportedTypes();
-       $occurence = 1;
-       $p = bb_find_open_close($body_info['html'], "<a", ">");
-
+       $occurence = 0;
+       $p = Plaintext::getBoundariesPosition($body_info['html'], "<a", ">");
        while ($p !== false && ($occurence++ < 500)) {
                $link = substr($body_info['html'], $p['start'], $p['end'] - $p['start']);
                $matches = [];
@@ -112,7 +111,7 @@ function frio_item_photo_links(App $a, &$body_info)
                        $body_info['html'] = str_replace($link, $newlink, $body_info['html']);
                }
 
-               $p = bb_find_open_close($body_info['html'], "<a", ">", $occurence);
+               $p = Plaintext::getBoundariesPosition($body_info['html'], "<a", ">", $occurence);
        }
 }
 
@@ -218,6 +217,7 @@ function frio_remote_nav($a, &$nav)
        // And construct a webbie (e.g. mickey@friendica.domain.com for the search in gcontact
        // We use the webbie for search in gcontact because we don't know if gcontact table stores
        // the right value if its http or https protocol
+       $webbie = '';
        if (count($url_parts)) {
                $server_url = $url_parts[1] . $url_parts[2];
                $webbie = $url_parts[4] . '@' . $url_parts[2];
@@ -297,14 +297,9 @@ function frio_acl_lookup(App $a, &$results)
                return;
        }
 
-       $searching = false;
+       $sql_extra = '';
        if ($results["search"]) {
                $search_txt = dbesc(protect_sprintf(preg_quote($results["search"])));
-               $searching = true;
-       }
-       
-       $sql_extra = '';
-       if ($searching) {
                $sql_extra .= " AND (`attag` LIKE '%%" . dbesc($search_txt) . "%%' OR `name` LIKE '%%" . dbesc($search_txt) . "%%' OR `nick` LIKE '%%" . dbesc($search_txt) . "%%') ";
        }
 
@@ -312,6 +307,7 @@ function frio_acl_lookup(App $a, &$results)
                $sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets));
        }
 
+       $total = 0;
        $r = q("SELECT COUNT(*) AS `total` FROM `contact`
                WHERE `uid` = %d AND NOT `self` AND NOT `pending` $sql_extra ", intval($_SESSION['uid']));
        if (DBM::is_result($r)) {