Merge pull request #8092 from annando/inverted

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

diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index e7c2510783ab7080e5023af94a2527e177ecea0e..2cd30ad1f1f4e9495fb1f329ccde8e7c68b8f666 100644 (file)
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -17,6 +17,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model;
 use Friendica\Module;
 use Friendica\Util\Strings;
@@ -34,13 +35,21 @@ function frio_init(App $a)
 
        // 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) {
-               $a->page['htmlhead'] .= <<< EOT
+       if (DI::mode()->isMobile() || DI::mode()->isMobile()) {
+               DI::page()['htmlhead'] .= <<< EOT
                        <script type="text/javascript">
                                var is_mobile = 1;
                        </script>
 EOT;
        }
+
+       $enable_compose = \Friendica\Core\PConfig::get(local_user(), 'frio', 'enable_compose');
+       $compose = $enable_compose === '1' || $enable_compose === null && Config::get('frio', 'enable_compose') ? 1 : 0;
+       DI::page()['htmlhead'] .= <<< HTML
+               <script type="text/javascript">
+                       var compose = $compose;
+               </script>
+HTML;
 }
 
 function frio_install()
@@ -231,7 +240,7 @@ function frio_remote_nav($a, &$nav)
                // user info
                $r = q("SELECT `micro` FROM `contact` WHERE `uid` = %d AND `self`", intval($a->user['uid']));
 
-               $r[0]['photo'] = (DBA::isResult($r) ? $a->removeBaseURL($r[0]['micro']) : 'images/person-48.jpg');
+               $r[0]['photo'] = (DBA::isResult($r) ? DI::baseUrl()->remove($r[0]['micro']) : 'images/person-48.jpg');
                $r[0]['name'] = $a->user['username'];
        } elseif (!local_user() && remote_user()) {
                $r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user()));
@@ -255,8 +264,6 @@ function frio_remote_nav($a, &$nav)
        }
 
        if (!local_user() && !empty($server_url) && !is_null($remoteUser)) {
-               $nav['logout'] = [$server_url . '/logout', L10n::t('Logout'), '', L10n::t('End this session')];
-
                // user menu
                $nav['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'], L10n::t('Status'), '', L10n::t('Your posts and conversations')];
                $nav['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'] . '?tab=profile', L10n::t('Profile'), '', L10n::t('Your profile page')];