openrat-cms

OpenRat Content Management System
git clone http://git.code.weiherhei.de/openrat-cms.git
Log | Files | Refs | README

commit 384804d0698ad0b1603bed404faec8905e8dadb6
parent 4a0b87e0618ad42a30ca2039550ba432ba170a8a
Author: Jan Dankert <develop@jandankert.de>
Date:   Thu, 19 Nov 2020 12:28:33 +0100

Fix: nextSubAction() is depracated and should not be used.

Diffstat:
Mmodules/cms/action/configuration/ConfigurationEditAction.class.php | 35++++++++++++++++++++++++++++++++---
Rmodules/cms/ui/themes/default/html/views/configuration/show.php -> modules/cms/ui/themes/default/html/views/configuration/edit.php | 0
Rmodules/cms/ui/themes/default/html/views/configuration/show.tpl.src.xml -> modules/cms/ui/themes/default/html/views/configuration/edit.tpl.src.xml | 0
3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/modules/cms/action/configuration/ConfigurationEditAction.class.php b/modules/cms/action/configuration/ConfigurationEditAction.class.php @@ -2,12 +2,41 @@ namespace cms\action\configuration; use cms\action\ConfigurationAction; use cms\action\Method; +use cms\base\DefaultConfig; +use util\Session; class ConfigurationEditAction extends ConfigurationAction implements Method { - public function view() { - $this->nextSubAction('show'); - } + + public function view() { + + $defaultConfig = DefaultConfig::get();; + $currentConfig = Session::getConfig(); + + $currentConfig['system'] = $this->getSystemConfiguration(); + + // Language are to much entries + unset($currentConfig['language']); + + $pad = str_repeat("\xC2\xA0",10); // Hard spaces + + $flatDefaultConfig = \util\ArrayUtils::dryFlattenArray( $defaultConfig , $pad ); + $flatCMSConfig = \util\ArrayUtils::dryFlattenArray( Session::getConfig(), $pad ); + $flatConfig = \util\ArrayUtils::dryFlattenArray( $currentConfig , $pad ); + + $config = array_map( function($key,$value) use ($flatConfig,$flatCMSConfig,$flatDefaultConfig) { + + if ( strpos($key,'password') !== false ) + $value = '*'; + + return ['key'=>$key,'value'=>$value,'class'=>(empty($flatCMSConfig[$key])?'readonly':(isset($flatDefaultConfig[$key]) && $flatDefaultConfig[$key]==$flatConfig[$key]?'default':'changed'))]; + + },array_keys($flatConfig),$flatConfig); + + $this->setTemplateVar('config',$config ); + } + + public function post() { } } diff --git a/modules/cms/ui/themes/default/html/views/configuration/show.php b/modules/cms/ui/themes/default/html/views/configuration/edit.php diff --git a/modules/cms/ui/themes/default/html/views/configuration/show.tpl.src.xml b/modules/cms/ui/themes/default/html/views/configuration/edit.tpl.src.xml