Add storage options form in admin/site page

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

diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index aa59081d91969cad9eebec4e9541466c78ef8486..9bae9053af09e7a7e8ba65433beedcafb3b65995 100644 (file)
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -22,26 +22,17 @@ use Friendica\Model;
 use Friendica\Module;
 use Friendica\Util\Strings;
 
-$frio = 'view/theme/frio';
-
-global $frio;
-
 function frio_init(App $a)
 {
+       global $frio;
+       $frio = 'view/theme/frio';
+
        // disable the events module link in the profile tab
        $a->theme_events_in_profile = false;
        $a->videowidth = 622;
 
        Renderer::setActiveTemplateEngine('smarty3');
 
-       $baseurl = System::baseUrl();
-
-       $style = PConfig::get(local_user(), 'frio', 'style');
-
-       $frio = 'view/theme/frio';
-
-       global $frio;
-
        // if the device is a mobile device set js is_mobile
        // variable so the js scripts can use this information
        if ($a->is_mobile || $a->is_tablet) {
@@ -51,10 +42,6 @@ function frio_init(App $a)
                        </script>
 EOT;
        }
-
-       if ($style == '') {
-               $style = Config::get('frio', 'style');
-       }
 }
 
 function frio_install()
@@ -301,7 +288,7 @@ function frio_remote_nav($a, &$nav)
  */
 function frio_acl_lookup(App $a, &$results)
 {
-       $nets = x($_GET, 'nets') ? Strings::escapeTags(trim($_GET['nets'])) : '';
+       $nets = !empty($_GET['nets']) ? Strings::escapeTags(trim($_GET['nets'])) : '';
 
        // we introduce a new search type, r should do the same query like it's
        // done in /src/Module/Contact.php for connections
@@ -321,14 +308,14 @@ function frio_acl_lookup(App $a, &$results)
 
        $total = 0;
        $r = q("SELECT COUNT(*) AS `total` FROM `contact`
-               WHERE `uid` = %d AND NOT `self` AND NOT `pending` $sql_extra ", intval($_SESSION['uid']));
+               WHERE `uid` = %d AND NOT `self` AND NOT `deleted` AND NOT `pending` $sql_extra ", intval($_SESSION['uid']));
        if (DBA::isResult($r)) {
                $total = $r[0]['total'];
        }
 
        $sql_extra3 = Widget::unavailableNetworks();
 
-       $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `pending` $sql_extra $sql_extra3 ORDER BY `name` ASC LIMIT %d, %d ",
+       $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `deleted` AND NOT `pending` $sql_extra $sql_extra3 ORDER BY `name` ASC LIMIT %d, %d ",
                intval($_SESSION['uid']), intval($results['start']), intval($results['count'])
        );