Merge pull request #12674 from nupplaphil/bug/config_typesafe

[friendica.git] / view / theme / frio / php / default.php
diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php

index bd5ef7f3ff3318b8ebb036d5bb7c308cf038750e..c6092393bdab5989bd93e2ce9785b2e166258f2b 100644 (file)
--- a/view/theme/frio/php/default.php
+++ b/view/theme/frio/php/default.php
@@ -1,6 +1,6 @@
  <?php
  /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2023, the Friendica project
   *
   * @license GNU AGPL version 3 or any later version
   *
@@ -27,6 +27,7 @@
  use Friendica\DI;
  use Friendica\Model\Profile;
  
+require_once 'view/theme/frio/theme.php';
  require_once 'view/theme/frio/php/frio_boot.php';
  
  //     $minimal = is_modal();
@@ -62,25 +63,21 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
                 if ($scheme && is_string($scheme) && $scheme != '---') {
                         if (file_exists('view/theme/frio/scheme/' . $scheme . '.php')) {
                                 $schemefile = 'view/theme/frio/scheme/' . $scheme . '.php';
+                               $scheme_accent =
+                                       DI::pConfig()->get($uid, 'frio', 'scheme_accent') ?:
+                                               DI::config()->get('frio', 'scheme_accent') ?: FRIO_SCHEME_ACCENT_BLUE;
+
                                 require_once $schemefile;
                         }
-               } else {
-                       $nav_bg = DI::pConfig()->get($uid, 'frio', 'nav_bg');
-               }
-
-               if (empty($nav_bg)) {
-                       $nav_bg = DI::config()->get('frio', 'nav_bg');
                 }
  
-               if (empty($nav_bg) || !is_string($nav_bg)) {
-                       $nav_bg = "#708fa0";
-               }
+               $nav_bg = $nav_bg ?? DI::pConfig()->get($uid, 'frio', 'nav_bg', DI::config()->get('frio', 'nav_bg', '#708fa0'));
  
                 echo '<meta name="theme-color" content="' . $nav_bg . '" />';
  ?>
         </head>
  
-       <body id="top" class="mod-<?php echo DI::module()->getName() . " " . $is_singleuser_class . " " . $view_mode_class;?>">
+       <body id="top" class="mod-<?php echo $page['module'] . " " . $is_singleuser_class . " " . $view_mode_class;?>">
                 <a href="#content" class="sr-only sr-only-focusable"><?php echo DI::l10n()->t('Skip to main content'); ?></a>
  <?php
         if (!empty($page['nav']) && !$minimal) {
@@ -128,7 +125,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
  
                                         <div class="col-lg-7 col-md-7 col-sm-12 col-xs-12" id="content">
                                                 <section class="sectiontop ';
-                                                       echo $a->argv[0];
+                                                       echo $page['section'] ?? '';
                                                         echo '-content-wrapper">';
                                                         if (!empty($page['content'])) {
                                                                 echo $page['content'];
@@ -152,7 +149,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
                                 </div><!--row-->
                         </div><!-- container -->
  
-                       <div id="back-to-top" title="back to top">&#8679;</div>
+                       <div id="back-to-top" title="<?php echo DI::l10n()->t('Back to top')?>">⇧</div>
                 </main>
  
                 <footer>