Merge pull request #7540 from vinzv/patch-1

[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 24c722e8e3f51347215e696f11c091d82c79b12b..22bb995804a474cd032d74f1bb479351fdf7577a 100644 (file)
--- a/view/theme/frio/php/default.php
+++ b/view/theme/frio/php/default.php
@@ -36,18 +36,15 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
                 // if the page is an standard page (so we don't have it twice for modals)
                 //
                 /// @todo Think about to move js stuff in the footer
-               if (!$minimal && x($page, 'htmlhead')) {
+               if (!$minimal && !empty($page['htmlhead'])) {
                         echo $page['htmlhead'];
                 }
  
                 // Add the theme color meta
                 // It makes mobile Chrome UI match Frio's top bar color.
-               $uid = $a->profile_uid;
-               if (is_null($uid)) {
-                       $uid = Profile::getThemeUid();
-               }
+               $uid = Profile::getThemeUid($a);
                 $scheme = PConfig::get($uid, 'frio', 'scheme', PConfig::get($uid, 'frio', 'schema'));
-               if ($scheme && ($scheme != '---')) {
+               if ($scheme && is_string($scheme) && $scheme != '---') {
                         if (file_exists('view/theme/frio/scheme/' . $scheme . '.php')) {
                                 $schemefile = 'view/theme/frio/scheme/' . $scheme . '.php';
                                 require_once $schemefile;
@@ -57,6 +54,10 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
                 }
  
                 if (empty($nav_bg)) {
+                       $nav_bg = Config::get('frio', 'nav_bg');
+               }
+
+               if (empty($nav_bg) || !is_string($nav_bg)) {
                         $nav_bg = "#708fa0";
                 }
  
@@ -67,7 +68,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
         <body id="top" class="mod-<?php echo $a->module . " " . $is_singleuser_class . " " . $view_mode_class;?>">
                 <a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
  <?php
-       if (x($page, 'nav') && !$minimal) {
+       if (!empty($page['nav']) && !$minimal) {
                 echo str_replace(
                         "~config.sitename~",
                         Config::get('config', 'sitename'),
@@ -82,8 +83,9 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
         // special minimal style for modal dialogs
         if ($minimal) {
  ?>
-               <section class="minimal" style="margin:0px!important; padding:0px!important; float:none!important; display:block!important;">
-                       <?php if (x($page, 'content')) echo $page['content']; ?>
+               <!-- <?php echo __FILE__ ?> -->
+               <section class="minimal">
+                       <?php if (!empty($page['content'])) echo $page['content']; ?>
                         <div id="page-footer"></div>
                 </section>
  <?php
@@ -94,15 +96,15 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
                         <div class="container">
                                 <div class="row">
  <?php
-                               if ((!x($_REQUEST, 'pagename') || $_REQUEST['pagename'] != "lostpass") && ($_SERVER['REQUEST_URI'] != $basepath)) {
+                               if ((empty($_REQUEST['pagename']) || $_REQUEST['pagename'] != "lostpass") && ($_SERVER['REQUEST_URI'] != $basepath)) {
                                         echo '
                                         <aside class="col-lg-3 col-md-3 offcanvas-sm offcanvas-xs">';
  
-                                               if (x($page, 'aside')) {
+                                               if (!empty($page['aside'])) {
                                                         echo $page['aside'];
                                                 }
  
-                                               if (x($page, 'right_aside')) {
+                                               if (!empty($page['right_aside'])) {
                                                         echo $page['right_aside'];
                                                 }
  
@@ -113,7 +115,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
                                                 <section class="sectiontop ';
                                                         echo $a->argv[0];
                                                         echo '-content-wrapper">';
-                                                       if (x($page, 'content')) {
+                                                       if (!empty($page['content'])) {
                                                                 echo $page['content'];
                                                         }
                                                         echo '
@@ -124,7 +126,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser";
                                 } else {
                                         echo '
                                         <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12" id="content" style="margin-top:50px;">';
-                                               if (x($page, 'content')) {
+                                               if (!empty($page['content'])) {
                                                         echo $page['content'];
                                                 }
                                                 echo '