commit 49ef887d824c27977862c700c5d7a74460b1a8b2
parent 0c492fa52c32da2d80f71af0f3a911b133c0e1fe
Author: Jan Dankert <develop@jandankert.de>
Date: Thu, 10 Sep 2020 23:49:43 +0200
Some cleanup.
Diffstat:
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/modules/cms/action/Action.class.php b/modules/cms/action/Action.class.php
@@ -18,6 +18,7 @@ namespace {
namespace cms\action {
use cms\model\BaseObject;
+ use cms\model\ModelBase;
use cms\model\User;
use util\ClassUtils;
use util\exception\ValidationException;
@@ -223,7 +224,7 @@ namespace cms\action {
/**
- * @param $baseObject BaseObject
+ * @param $baseObject ModelBase
* @param $key String
* @param array $vars
* @param string $message
@@ -233,7 +234,7 @@ namespace cms\action {
}
/**
- * @param $baseObject BaseObject
+ * @param $baseObject ModelBase
* @param $key String
* @param array $vars
* @param string $message
@@ -243,7 +244,7 @@ namespace cms\action {
}
/**
- * @param $baseObject BaseObject
+ * @param $baseObject ModelBase
* @param $key String
* @param array $vars
* @param string $message
@@ -253,7 +254,7 @@ namespace cms\action {
}
/**
- * @param $baseObject BaseObject
+ * @param $baseObject ModelBase
* @param $key String
* @param array $vars
* @param string $message
@@ -293,7 +294,7 @@ namespace cms\action {
'name' => $name,
'key' => $text,
'vars' => $vars,
- 'text' => lang('NOTICE_' . $text, $vars),
+ 'text' => lang($text, $vars),
'log' => $log,
'status' => $status);
}
diff --git a/modules/cms/ui/action/IndexAction.class.php b/modules/cms/ui/action/IndexAction.class.php
@@ -9,6 +9,7 @@ use cms\model\User;
use cms\model\Value;
use Exception;
use JSON;
+use language\Messages;
use util\JSqueeze;
use \Less_Parser;
use logger\Logger;
@@ -136,10 +137,10 @@ class IndexAction extends Action
$messageOfTheDay = config('login', 'motd');
if ( !empty($messageOfTheDay) )
- $this->addNotice('user','','MOTD',OR_NOTICE_INFO,array('motd'=>$messageOfTheDay) );
+ $this->addInfoFor( new User(),Messages::MOTD,array('motd'=>$messageOfTheDay) );
if ( DEVELOPMENT )
- $this->addNotice('user','','DEVELOPMENT_MODE',OR_NOTICE_INFO );
+ $this->addInfoFor( new User(),Messages::DEVELOPMENT_MODE );
$methods = array(
'edit' => true,