Merge pull request #4035 from friendica/revert-4031-task/3878-move-objects-to-model

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

diff --git a/view/theme/vier/config.php b/view/theme/vier/config.php
index 7c51b4ec95be31c7af31825fc362b18ced52104c..97aaa1e5a49622dcdf4c0e697ab793d8eeabd4bf 100644 (file)
--- a/view/theme/vier/config.php
+++ b/view/theme/vier/config.php
@@ -1,24 +1,32 @@
 <?php
+
 /**
  * Theme settings
  */
 
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+use Friendica\Core\System;
 
-
-function theme_content(&$a){
-       if(!local_user())
+function theme_content(App $a) {
+       if (!local_user()) {
                return;
+       }
 
-       if (!function_exists('get_vier_config'))
+       if (!function_exists('get_vier_config')) {
                return;
+       }
 
-       $style = get_pconfig(local_user(), 'vier', 'style');
+       $style = PConfig::get(local_user(), 'vier', 'style');
 
-       if ($style == "")
-               $style = get_config('vier', 'style');
+       if ($style == "") {
+               $style = Config::get('vier', 'style');
+       }
 
-       if ($style == "")
+       if ($style == "") {
                $style = "plus";
+       }
 
        $show_pages = get_vier_config('show_pages', true);
        $show_profiles = get_vier_config('show_profiles', true);
@@ -31,33 +39,34 @@ function theme_content(&$a){
                        $show_services, $show_friends, $show_lastusers);
 }
 
-function theme_post(&$a){
-       if(! local_user())
+function theme_post(App $a) {
+       if (! local_user()) {
                return;
+       }
 
        if (isset($_POST['vier-settings-submit'])){
-               set_pconfig(local_user(), 'vier', 'style', $_POST['vier_style']);
-               set_pconfig(local_user(), 'vier', 'show_pages', $_POST['vier_show_pages']);
-               set_pconfig(local_user(), 'vier', 'show_profiles', $_POST['vier_show_profiles']);
-               set_pconfig(local_user(), 'vier', 'show_helpers', $_POST['vier_show_helpers']);
-               set_pconfig(local_user(), 'vier', 'show_services', $_POST['vier_show_services']);
-               set_pconfig(local_user(), 'vier', 'show_friends', $_POST['vier_show_friends']);
-               set_pconfig(local_user(), 'vier', 'show_lastusers', $_POST['vier_show_lastusers']);
+               PConfig::set(local_user(), 'vier', 'style', $_POST['vier_style']);
+               PConfig::set(local_user(), 'vier', 'show_pages', $_POST['vier_show_pages']);
+               PConfig::set(local_user(), 'vier', 'show_profiles', $_POST['vier_show_profiles']);
+               PConfig::set(local_user(), 'vier', 'show_helpers', $_POST['vier_show_helpers']);
+               PConfig::set(local_user(), 'vier', 'show_services', $_POST['vier_show_services']);
+               PConfig::set(local_user(), 'vier', 'show_friends', $_POST['vier_show_friends']);
+               PConfig::set(local_user(), 'vier', 'show_lastusers', $_POST['vier_show_lastusers']);
        }
 }
 
 
-function theme_admin(&$a){
+function theme_admin(App $a) {
 
        if (!function_exists('get_vier_config'))
                return;
 
-       $style = get_config('vier', 'style');
+       $style = Config::get('vier', 'style');
 
-       $helperlist = get_config('vier', 'helperlist');
+       $helperlist = Config::get('vier', 'helperlist');
 
        if ($helperlist == "")
-               $helperlist = "https://helpers.pyxis.uberspace.de/profile/helpers";
+               $helperlist = "https://forum.friendi.ca/profile/helpers";
 
        $t = get_markup_template("theme_admin_settings.tpl");
        $o .= replace_macros($t, array(
@@ -76,28 +85,29 @@ function theme_admin(&$a){
        return $o;
 }
 
-function theme_admin_post(&$a){
+function theme_admin_post(App $a) {
        if (isset($_POST['vier-settings-submit'])){
-               set_config('vier', 'style', $_POST['vier_style']);
-               set_config('vier', 'show_pages', $_POST['vier_show_pages']);
-               set_config('vier', 'show_profiles', $_POST['vier_show_profiles']);
-               set_config('vier', 'show_helpers', $_POST['vier_show_helpers']);
-               set_config('vier', 'show_services', $_POST['vier_show_services']);
-               set_config('vier', 'show_friends', $_POST['vier_show_friends']);
-               set_config('vier', 'show_lastusers', $_POST['vier_show_lastusers']);
-               set_config('vier', 'helperlist', $_POST['vier_helperlist']);
+               Config::set('vier', 'style', $_POST['vier_style']);
+               Config::set('vier', 'show_pages', $_POST['vier_show_pages']);
+               Config::set('vier', 'show_profiles', $_POST['vier_show_profiles']);
+               Config::set('vier', 'show_helpers', $_POST['vier_show_helpers']);
+               Config::set('vier', 'show_services', $_POST['vier_show_services']);
+               Config::set('vier', 'show_friends', $_POST['vier_show_friends']);
+               Config::set('vier', 'show_lastusers', $_POST['vier_show_lastusers']);
+               Config::set('vier', 'helperlist', $_POST['vier_helperlist']);
        }
 }
 
-
-function vier_form(&$a, $style, $show_pages, $show_profiles, $show_helpers, $show_services, $show_friends, $show_lastusers){
+/// @TODO $a is no longer used
+function vier_form(App $a, $style, $show_pages, $show_profiles, $show_helpers, $show_services, $show_friends, $show_lastusers) {
        $styles = array(
-               "plus"=>"Plus",
                "breathe"=>"Breathe",
-               "dark"=>"Dark",
-               "shadow"=>"Shadow",
                "netcolour"=>"Coloured Networks",
-               "flat"=>"Flat"
+               "dark"=>"Dark",
+               "flat"=>"Flat",
+               "plus"=>"Plus",
+               "plusminus"=>"Plus Minus",
+               "shadow"=>"Shadow"
        );
 
        $show_or_not = array('0'=>t("don't show"),     '1'=>t("show"),);
@@ -105,7 +115,7 @@ function vier_form(&$a, $style, $show_pages, $show_profiles, $show_helpers, $sho
        $t = get_markup_template("theme_settings.tpl");
        $o .= replace_macros($t, array(
                '$submit' => t('Submit'),
-               '$baseurl' => $a->get_baseurl(),
+               '$baseurl' => System::baseUrl(),
                '$title' => t("Theme settings"),
                '$style' => array('vier_style',t ('Set style'),$style,'',$styles),
                '$show_pages' => array('vier_show_pages', t('Community Pages'), $show_pages, '', $show_or_not),