Merge pull request #8388 from annando/fetch

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

diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index e0ec910d4267ce484db1646c1b51f77ef85f1eb2..22afbc9a7cf63394680a9d2f4baaf53ae52e113c 100644 (file)
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -10,7 +10,6 @@
 use Friendica\App;
 use Friendica\Content\Text\Plaintext;
 use Friendica\Content\Widget;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -41,14 +40,6 @@ function frio_init(App $a)
                        </script>
 EOT;
        }
-
-       $enable_compose = DI::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()
@@ -265,7 +256,7 @@ function frio_remote_nav($a, &$nav)
        if (!local_user() && !empty($server_url) && !is_null($remoteUser)) {
                // user menu
                $nav['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'], DI::l10n()->t('Status'), '', DI::l10n()->t('Your posts and conversations')];
-               $nav['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'] . '?tab=profile', DI::l10n()->t('Profile'), '', DI::l10n()->t('Your profile page')];
+               $nav['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'] . '/profile', DI::l10n()->t('Profile'), '', DI::l10n()->t('Your profile page')];
                $nav['usermenu'][] = [$server_url . '/photos/' . $remoteUser['nick'], DI::l10n()->t('Photos'), '', DI::l10n()->t('Your photos')];
                $nav['usermenu'][] = [$server_url . '/videos/' . $remoteUser['nick'], DI::l10n()->t('Videos'), '', DI::l10n()->t('Your videos')];
                $nav['usermenu'][] = [$server_url . '/events/', DI::l10n()->t('Events'), '', DI::l10n()->t('Your events')];
@@ -276,7 +267,7 @@ function frio_remote_nav($a, &$nav)
                $nav['messages'] = [$server_url . '/message', DI::l10n()->t('Messages'), '', DI::l10n()->t('Private mail')];
                $nav['settings'] = [$server_url . '/settings', DI::l10n()->t('Settings'), '', DI::l10n()->t('Account settings')];
                $nav['contacts'] = [$server_url . '/contact', DI::l10n()->t('Contacts'), '', DI::l10n()->t('Manage/edit friends and contacts')];
-               $nav['sitename'] = Config::get('config', 'sitename');
+               $nav['sitename'] = DI::config()->get('config', 'sitename');
        }
 }
 
@@ -361,9 +352,57 @@ function frio_display_item(App $a, &$arr)
                $subthread = [
                        'menu'   => 'follow_thread',
                        'title'  => DI::l10n()->t('Follow Thread'),
-                       'action' => 'dosubthread(' . $arr['item']['id'] . '); return false;',
+                       'action' => 'dosubthread(' . $arr['item']['id'] . ');',
                        'href'   => '#'
                ];
        }
        $arr['output']['subthread'] = $subthread;
 }
+
+/**
+ * @param int|null $uid
+ * @return string
+ * @see \Friendica\Core\Theme::getBackgroundColor()
+ */
+function frio_get_background_color(int $uid = null)
+{
+       $background_color = DI::config()->get('frio', 'background_color') ?: '#ededed';
+
+       if ($uid) {
+               $background_color = DI::pConfig()->get($uid, 'frio', 'background_color') ?: $background_color;
+       }
+
+       $scheme = DI::config()->get('frio', 'scheme', DI::config()->get('frio', 'schema'));
+       $scheme = Strings::sanitizeFilePathItem($scheme);
+
+       if ($scheme && ($scheme != '---') && file_exists('view/theme/frio/scheme/' . $scheme . '.php')) {
+               $schemefile = 'view/theme/frio/scheme/' . $scheme . '.php';
+               require_once $schemefile;
+       }
+
+       return $background_color;
+}
+
+/**
+ * @param int|null $uid
+ * @return string
+ * @see \Friendica\Core\Theme::getThemeColor()
+ */
+function frio_get_theme_color(int $uid = null)
+{
+       $nav_bg = DI::config()->get('frio', 'nav_bg') ?: '#708fa0';
+
+       if ($uid) {
+               $nav_bg = DI::pConfig()->get($uid, 'frio', 'background_color') ?: $nav_bg;
+       }
+
+       $scheme = DI::config()->get('frio', 'scheme', DI::config()->get('frio', 'schema'));
+       $scheme = Strings::sanitizeFilePathItem($scheme);
+
+       if ($scheme && ($scheme != '---') && file_exists('view/theme/frio/scheme/' . $scheme . '.php')) {
+               $schemefile = 'view/theme/frio/scheme/' . $scheme . '.php';
+               require_once $schemefile;
+       }
+
+       return $nav_bg;
+}