Add Theme::getBackgroundColor and Theme::getThemeColor methods

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

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index ebe4011e654b2b0fc9e1beb3050a2233bf378dd1..fcbb148dc7a3518c5eacf3ac194b143e1e089a85 100644 (file)
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -12,9 +12,6 @@
 use Friendica\App;
 use Friendica\Content\ForumManager;
 use Friendica\Core\Addon;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\Search;
 use Friendica\Database\DBA;
@@ -91,13 +88,13 @@ EOT;
 function get_vier_config($key, $default = false, $admin = false)
 {
        if (local_user() && !$admin) {
-               $result = PConfig::get(local_user(), "vier", $key);
+               $result = DI::pConfig()->get(local_user(), "vier", $key);
                if (!is_null($result)) {
                        return $result;
                }
        }
 
-       $result = Config::get("vier", $key);
+       $result = DI::config()->get("vier", $key);
        if (!is_null($result)) {
                return $result;
        }
@@ -126,7 +123,7 @@ function vier_community_info()
 
                $tpl = Renderer::getMarkupTemplate('ch_directory_item.tpl');
                if (DBA::isResult($r)) {
-                       $aside['$comunity_profiles_title'] = L10n::t('Community Profiles');
+                       $aside['$comunity_profiles_title'] = DI::l10n()->t('Community Profiles');
                        $aside['$comunity_profiles_items'] = [];
 
                        foreach ($r as $rr) {
@@ -143,24 +140,24 @@ function vier_community_info()
 
        // last 9 users
        if ($show_lastusers) {
-               $publish = (Config::get('system', 'publish_all') ? '' : " AND `publish` = 1 ");
+               $publish = (DI::config()->get('system', 'publish_all') ? '' : "`publish` = 1");
                $order = " ORDER BY `register_date` DESC ";
 
                $tpl = Renderer::getMarkupTemplate('ch_directory_item.tpl');
 
-               $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`
+               $r = q("SELECT `profile`.*, `user`.`nickname`
                                FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
-                               WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $order LIMIT %d , %d ",
+                               WHERE $publish AND `user`.`blocked` = 0 $order LIMIT %d , %d ",
                        0,
                        9
                );
 
                if (DBA::isResult($r)) {
-                       $aside['$lastusers_title'] = L10n::t('Last users');
+                       $aside['$lastusers_title'] = DI::l10n()->t('Last users');
                        $aside['$lastusers_items'] = [];
 
                        foreach ($r as $rr) {
-                               $profile_link = 'profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
+                               $profile_link = 'profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['uid']);
                                $entry = Renderer::replaceMacros($tpl, [
                                        '$id' => $rr['id'],
                                        '$profile_link' => $profile_link,
@@ -174,18 +171,18 @@ function vier_community_info()
        //right_aside FIND FRIENDS
        if ($show_friends && local_user()) {
                $nv = [];
-               $nv['findpeople'] = L10n::t('Find People');
-               $nv['desc'] = L10n::t('Enter name or interest');
-               $nv['label'] = L10n::t('Connect/Follow');
-               $nv['hint'] = L10n::t('Examples: Robert Morgenstein, Fishing');
-               $nv['findthem'] = L10n::t('Find');
-               $nv['suggest'] = L10n::t('Friend Suggestions');
-               $nv['similar'] = L10n::t('Similar Interests');
-               $nv['random'] = L10n::t('Random Profile');
-               $nv['inv'] = L10n::t('Invite Friends');
-               $nv['directory'] = L10n::t('Global Directory');
+               $nv['findpeople'] = DI::l10n()->t('Find People');
+               $nv['desc'] = DI::l10n()->t('Enter name or interest');
+               $nv['label'] = DI::l10n()->t('Connect/Follow');
+               $nv['hint'] = DI::l10n()->t('Examples: Robert Morgenstein, Fishing');
+               $nv['findthem'] = DI::l10n()->t('Find');
+               $nv['suggest'] = DI::l10n()->t('Friend Suggestions');
+               $nv['similar'] = DI::l10n()->t('Similar Interests');
+               $nv['random'] = DI::l10n()->t('Random Profile');
+               $nv['inv'] = DI::l10n()->t('Invite Friends');
+               $nv['directory'] = DI::l10n()->t('Global Directory');
                $nv['global_dir'] = Search::getGlobalDirectory();
-               $nv['local_directory'] = L10n::t('Local Directory');
+               $nv['local_directory'] = DI::l10n()->t('Local Directory');
 
                $aside['$nv'] = $nv;
        }
@@ -225,12 +222,12 @@ function vier_community_info()
                        $page = Renderer::replaceMacros(
                                $tpl,
                                [
-                                       '$title'          => L10n::t('Forums'),
+                                       '$title'          => DI::l10n()->t('Forums'),
                                        '$forums'         => $entries,
-                                       '$link_desc'      => L10n::t('External link to forum'),
+                                       '$link_desc'      => DI::l10n()->t('External link to forum'),
                                        '$total'          => $total,
                                        '$visible_forums' => $visible_forums,
-                                       '$showmore'       => L10n::t('show more')]
+                                       '$showmore'       => DI::l10n()->t('show more')]
                        );
 
                        $aside['$page'] = $page;
@@ -242,7 +239,7 @@ function vier_community_info()
        if ($show_helpers) {
                $r = [];
 
-               $helperlist = Config::get("vier", "helperlist");
+               $helperlist = DI::config()->get("vier", "helperlist");
 
                $helpers = explode(",", $helperlist);
 
@@ -263,13 +260,13 @@ function vier_community_info()
                        $r[$index]["url"] = Contact::magicLink($helper["url"]);
                }
 
-               $r[] = ["url" => "help/Quick-Start-guide", "name" => L10n::t("Quick Start")];
+               $r[] = ["url" => "help/Quick-Start-guide", "name" => DI::l10n()->t("Quick Start")];
 
                $tpl = Renderer::getMarkupTemplate('ch_helpers.tpl');
 
                if ($r) {
                        $helpers = [];
-                       $helpers['title'] = ["", L10n::t('Help'), "", ""];
+                       $helpers['title'] = ["", DI::l10n()->t('Help'), "", ""];
 
                        $aside['$helpers_items'] = [];
 
@@ -340,7 +337,7 @@ function vier_community_info()
                        $r[] = ["photo" => "images/wordpress.png", "name" => "Wordpress"];
                }
 
-               if (function_exists("imap_open") && !Config::get("system", "imap_disabled") && !Config::get("system", "dfrn_only")) {
+               if (function_exists("imap_open") && !DI::config()->get("system", "imap_disabled") && !DI::config()->get("system", "dfrn_only")) {
                        $r[] = ["photo" => "images/mail.png", "name" => "E-Mail"];
                }
 
@@ -348,7 +345,7 @@ function vier_community_info()
 
                if (DBA::isResult($r)) {
                        $con_services = [];
-                       $con_services['title'] = ["", L10n::t('Connect Services'), "", ""];
+                       $con_services['title'] = ["", DI::l10n()->t('Connect Services'), "", ""];
                        $aside['$con_services'] = $con_services;
 
                        foreach ($r as $rr) {
@@ -367,3 +364,25 @@ function vier_community_info()
        $tpl = Renderer::getMarkupTemplate('communityhome.tpl');
        DI::page()['right_aside'] = Renderer::replaceMacros($tpl, $aside);
 }
+
+/**
+ * @param int|null $uid
+ * @return null
+ * @see \Friendica\Core\Theme::getBackgroundColor()
+ * @TODO Implement this function
+ */
+function vier_get_background_color(int $uid = null)
+{
+       return null;
+}
+
+/**
+ * @param int|null $uid
+ * @return null
+ * @see \Friendica\Core\Theme::getThemeColor()
+ * @TODO Implement this function
+ */
+function vier_get_theme_color(int $uid = null)
+{
+       return null;
+}