commit 09f577cf177b22d093ab40142fd3ec6988dd0d6f parent fbf804f4006d3cdbb51e062ca9963d151f2bf0af Author: Jan Dankert <develop@jandankert.de> Date: Thu, 19 Nov 2020 14:49:58 +0100 Fix: Action::addNotice() is replaced by Action::addNoticeFor() Diffstat:
65 files changed, 281 insertions(+), 314 deletions(-)
diff --git a/modules/cms/action/Action.class.php b/modules/cms/action/Action.class.php @@ -177,12 +177,6 @@ class Action } - public function handleResult($result) - { - // TODO - - } - - /** * @param $baseObject ModelBase * @param $key String @@ -220,7 +214,17 @@ class Action * @param string $message */ protected function addErrorFor($baseObject,$key,$vars = array(), $message='') { - $this->addNotice(strtolower(ClassUtils::getSimpleClassName($baseObject)), $baseObject->getId(), $baseObject->getName(), $key, Action::NOTICE_ERROR, $vars, $message); + if ( is_object($baseObject) ) { + $type = strtolower(ClassUtils::getSimpleClassName($baseObject)); + $id = $baseObject->getId(); + $name = $baseObject->getName(); + } else { + $type = ''; + $id = ''; + $name = ''; + } + + $this->addNotice($type,$id,$name, $key, Action::NOTICE_ERROR, $vars, $message); } /** @@ -234,7 +238,7 @@ class Action * @param array $vars Variablen f�r den Textschl�ssel * @param string|array $log Weitere Hinweistexte f�r diese Meldung. */ - protected function addNotice($type, $id, $name, $text, $status = Action::NOTICE_OK, $vars = array(), $log = array()) + private function addNotice($type, $id, $name, $text, $status = Action::NOTICE_OK, $vars = array(), $log = array()) { if ($status === true) $status = Action::NOTICE_OK; @@ -263,6 +267,11 @@ class Action } + /** + * Getting the output data. + * + * @return array[] + */ public function getOutputData() { return $this->templateVars; @@ -270,12 +279,14 @@ class Action /** - * Ermitteln, ob Benutzer Administratorrechte besitzt - * @return Boolean TRUE, falls der Benutzer ein Administrator ist. + * Has the current user administration rights? + * + * @return boolean true, if current user is an administrator */ protected function userIsAdmin() { $user = $this->getUserFromSession(); + return is_object($user) && $user->isAdmin; } diff --git a/modules/cms/action/LoginAction.class.php b/modules/cms/action/LoginAction.class.php @@ -61,111 +61,6 @@ class LoginAction extends BaseAction - /** - * Führt ein Login durch. - * @param $name string Benutzername - * @param $pw string Password - * @param $pw1 string new Password - * @param $pw2 string new Password repeated - * @return bool - * @throws ObjectNotFoundException - */ - protected function checkLogin($name, $pw, $pw1, $pw2 ) - { - Logger::debug( "Login user: '$name'.'" ); - - Session::setUser(null); - - - $db = \cms\base\DB::get(); - - if ( !is_object($db) ) - { - $this->addNotice('database', 0, '', 'DATABASE_CONNECTION_ERROR', Action::NOTICE_ERROR, array(), array('no connection')); - //$this->callSubAction('showlogin'); - return false; - } - - if ( !$db->available ) - { - $this->addNotice('database', 0, $db->conf['description'], 'DATABASE_CONNECTION_ERROR', Action::NOTICE_ERROR, array(), array('Database Error: ' . $db->error)); - //$this->callSubAction('showlogin'); - return false; - } - - $ip = getenv("REMOTE_ADDR"); - - $user = new User(); - $user->name = $name; - - $ok = $user->checkPassword( $pw ); - - $mustChangePassword = $user->mustChangePassword; - - $passwordConfig = Configuration::subset(['security','password']); - - if ( $mustChangePassword ) - { - // Der Benutzer hat zwar ein richtiges Kennwort eingegeben, aber dieses ist abgelaufen. - // Wir versuchen hier, das neue zu setzen (sofern eingegeben). - if ( empty($pw1) ) - { - } - elseif ( $pw1 != $pw2 ) - { - $this->addValidationError('password1',Messages::PASSWORDS_DO_NOT_MATCH); - $this->addValidationError('password2',''); - } - elseif ( strlen($pw2) < $passwordConfig->get('min_length',10) ) - { - $this->addValidationError('password1',Messages::PASSWORD_MINLENGTH,[ - 'minlength'=>$passwordConfig->get('min_length',10) - ]); - $this->addValidationError('password2',''); - } - else - { - // Kennw?rter identisch und lang genug. - $user->setPassword( $pw1,true ); - - // Das neue Kennwort ist gesetzt, die Anmeldung ist also doch noch gelungen. - $ok = true; - $mustChangePassword = false; - - $pw = $pw1; - } - } - - // Falls Login erfolgreich - if ( $ok ) - { - // Login war erfolgreich! - $user->load(); - $user->setCurrent(); - - if ($user->passwordAlgo != Password::bestAlgoAvailable() ) - // Re-Hash the password with a better hash algo. - $user->setPassword($pw); - - - Logger::info( "login successful for {$user->name} from IP $ip" ); - - return true; - } - else - { - Logger::info( TextMessage::create('login failed for user ${name} from IP ${ip}', - [ - 'name' => $user->name, - 'ip' => $ip - ] - ) ); - - return false; - } - } - - /** * get all enabled databases. * @return Config[] diff --git a/modules/cms/action/PageelementAction.class.php b/modules/cms/action/PageelementAction.class.php @@ -17,6 +17,7 @@ use cms\model\BaseObject; use cms\model\Element; use cms\model\Folder; use cms\model\Page; +use cms\model\Pageelement; use cms\model\Project; use cms\model\Template; use cms\model\User; @@ -73,6 +74,12 @@ class PageelementAction extends BaseAction /** + * @type Pageelement + */ + protected $pageelement; + + + /** * Enth�lt den Inhalt * * @var Value @@ -122,6 +129,8 @@ class PageelementAction extends BaseAction $this->elementid = $elementid; $this->element = new Element( $elementid ); } + + $this->pageelement = new Pageelement($id); } @@ -381,7 +390,8 @@ class PageelementAction extends BaseAction $value->add(); } - $this->addNotice('pageelement', 0, $value->element->label, 'SAVED', Action::NOTICE_OK); + $this->addNoticeFor( $this->pageelement, Messages::SAVED); + $this->page->setTimestamp(); // "Letzte Aenderung" setzen // Falls ausgewaehlt die Seite sofort veroeffentlichen diff --git a/modules/cms/action/element/ElementAdvancedAction.class.php b/modules/cms/action/element/ElementAdvancedAction.class.php @@ -10,6 +10,7 @@ use cms\model\Element; use cms\model\Folder; use cms\model\Project; use cms\model\Template; +use language\Messages; use ReflectionClass; use ReflectionProperty; use util\Text; @@ -324,7 +325,7 @@ class ElementAdvancedAction extends ElementAction implements Method { case Element::ELEMENT_TYPE_CODE: if ( Configuration::subset('security')->is('disable_dynamic_code',true ) ) - $this->addNotice('element', 0, $this->element->name, 'CODE_DISABLED', Action::NOTICE_WARN); + $this->addWarningFor( $this->element, Messages::CODE_DISABLED); $this->setTemplateVar('code',$this->element->code); break; @@ -467,7 +468,7 @@ class ElementAdvancedAction extends ElementAction implements Method { $this->element->code = $this->getRequestVar('parameters',RequestParams::FILTER_RAW); $this->element->save(); - $this->addNotice('element', 0, $this->element->name, 'SAVED'); + $this->addNoticeFor( $this->element, Messages::SAVED); } } diff --git a/modules/cms/action/element/ElementPropAction.class.php b/modules/cms/action/element/ElementPropAction.class.php @@ -5,6 +5,7 @@ use cms\action\ElementAction; use cms\action\Method; use cms\action\RequestParams; use cms\model\Element; +use language\Messages; class ElementPropAction extends ElementAction implements Method { @@ -46,6 +47,6 @@ class ElementPropAction extends ElementAction implements Method { $this->element->save(); - $this->addNotice('element', 0, $this->element->name, 'SAVED', Action::NOTICE_OK); + $this->addNoticeFor( $this->element, Messages::SAVED); } } diff --git a/modules/cms/action/element/ElementRemoveAction.class.php b/modules/cms/action/element/ElementRemoveAction.class.php @@ -3,6 +3,7 @@ namespace cms\action\element; use cms\action\Action; use cms\action\ElementAction; use cms\action\Method; +use language\Messages; class ElementRemoveAction extends ElementAction implements Method { @@ -20,13 +21,13 @@ class ElementRemoveAction extends ElementAction implements Method { { // Nur Inhalte löschen $this->element->deleteValues(); - $this->addNotice('element', 0, $this->element->name, 'DELETED', Action::NOTICE_OK); + $this->addNoticeFor( $this->element, Messages::DELETED); } elseif ( $type == 'all' ) { // Element löschen $this->element->delete(); - $this->addNotice('element', 0, $this->element->name, 'DELETED', Action::NOTICE_OK); + $this->addNoticeFor( $this->element, Messages::DELETED); } } } diff --git a/modules/cms/action/file/FileAdvancedAction.class.php b/modules/cms/action/file/FileAdvancedAction.class.php @@ -4,6 +4,7 @@ use cms\action\FileAction; use cms\action\Method; use cms\action\RequestParams; use cms\model\BaseObject; +use language\Messages; use util\exception\ValidationException; @@ -35,6 +36,6 @@ class FileAdvancedAction extends FileAction implements Method { $this->file->updateType(); $this->file->save(); - $this->addNotice($this->file->getType(), 0, $this->file->filename, 'PROP_SAVED', 'ok'); + $this->addNoticeFor( $this->file, Messages::PROP_SAVED); } } diff --git a/modules/cms/action/file/FileCompressAction.class.php b/modules/cms/action/file/FileCompressAction.class.php @@ -5,6 +5,7 @@ use cms\action\FileAction; use cms\action\Method; use cms\action\RequestParams; use cms\model\File; +use language\Messages; class FileCompressAction extends FileAction implements Method { @@ -65,6 +66,6 @@ class FileCompressAction extends FileAction implements Method { throw new \util\exception\UIException('unknown compress type: ' . $format ); } - $this->addNotice('file', 0, $this->file->name, 'DONE', Action::NOTICE_OK); + $this->addNoticeFor( $this->file, Messages::DONE); } } diff --git a/modules/cms/action/file/FileEditAction.class.php b/modules/cms/action/file/FileEditAction.class.php @@ -2,6 +2,7 @@ namespace cms\action\file; use cms\action\FileAction; use cms\action\Method; +use language\Messages; use util\exception\ValidationException; use util\Upload; @@ -53,6 +54,6 @@ class FileEditAction extends FileAction implements Method { $this->file->setTimestamp(); - $this->addNotice($this->file->getType(), 0, $this->file->filename, 'VALUE_SAVED', 'ok'); + $this->addNoticeFor( $this->file, Messages::VALUE_SAVED ); } } diff --git a/modules/cms/action/file/FileExtractAction.class.php b/modules/cms/action/file/FileExtractAction.class.php @@ -4,6 +4,7 @@ use cms\action\FileAction; use cms\action\Method; use cms\model\File; use cms\model\Folder; +use language\Messages; use util\ArchiveTar; use util\ArchiveUnzip; @@ -36,8 +37,8 @@ class FileExtractAction extends FileAction implements Method { $newFile->parse_filename( $file['name'] ); $newFile->lastchangeDate = $file['time']; $newFile->persist(); - - $this->addNotice('file', 0, $newFile->name, 'ADDED'); + + $this->addNoticeFor( $newFile, Messages::ADDED ); } unset($tar); @@ -69,8 +70,8 @@ class FileExtractAction extends FileAction implements Method { $newFile->value = $zip->unzip($fileName); $newFile->persist(); - - $this->addNotice('file', 0, $newFile->name, 'ADDED'); + + $this->addNoticeFor( $newFile, Messages::ADDED); unset($newFile); } diff --git a/modules/cms/action/file/FileRemoveAction.class.php b/modules/cms/action/file/FileRemoveAction.class.php @@ -1,23 +1,23 @@ <?php namespace cms\action\file; -use cms\action\Action; use cms\action\FileAction; use cms\action\Method; +use language\Messages; +/** + * Removing a file. + */ class FileRemoveAction extends FileAction implements Method { + public function view() { $this->setTemplateVar( 'name',$this->file->filename ); } + + public function post() { - if ( $this->getRequestVar('delete') != '' ) - { - $this->file->delete(); - $this->addNotice('template', 0, $this->file->filename, 'DELETED', Action::NOTICE_OK); - } - else - { - $this->addNotice('template', 0, $this->file->filename, 'CANCELED', Action::NOTICE_WARN); - } + + $this->file->delete(); + $this->addNoticeFor( $this->file, Messages::DELETED); } } diff --git a/modules/cms/action/file/FileUncompressAction.class.php b/modules/cms/action/file/FileUncompressAction.class.php @@ -4,6 +4,7 @@ use cms\action\Action; use cms\action\FileAction; use cms\action\Method; use cms\model\File; +use language\Messages; class FileUncompressAction extends FileAction implements Method { @@ -67,6 +68,6 @@ class FileUncompressAction extends FileAction implements Method { throw new \util\exception\UIException('','cannot uncompress file with extension: ' . $this->file->extension ); } - $this->addNotice('file', 0, $this->file->name, 'DONE', Action::NOTICE_OK); + $this->addNoticeFor( $this->file, Messages::DONE ); } } diff --git a/modules/cms/action/folder/FolderAdvancedAction.class.php b/modules/cms/action/folder/FolderAdvancedAction.class.php @@ -12,6 +12,7 @@ use cms\model\Link; use cms\model\Page; use cms\model\Project; use cms\model\Url; +use language\Messages; use util\ArchiveTar; use util\Html; @@ -155,7 +156,7 @@ class FolderAdvancedAction extends FolderAction implements Method { $type == 'delete' && $o->hasRight( Acl::ACL_DELETE ) ) $objectList[ $id ] = $o->getProperties(); else - $this->addNotice($o->getType(), 0, $o->name, 'no_rights', Action::NOTICE_WARN); + $this->addNoticeFor($o,Messages::NO_RIGHTS ); } $ids = array_keys($objectList); @@ -194,7 +195,7 @@ class FolderAdvancedAction extends FolderAction implements Method { else { // Was anderes als Dateien ignorieren. - $this->addNotice($o->getType(), 0, $o->name, 'NOTHING_DONE', Action::NOTICE_WARN); + $this->addNoticeFor($o,Messages::NOTHING_DONE); } } @@ -234,18 +235,18 @@ class FolderAdvancedAction extends FolderAction implements Method { // dann verschieben if ( !in_array($targetObjectId,$allsubfolders) && $id != $targetObjectId ) { - $this->addNotice($o->getType(), 0, $o->name, 'MOVED', 'ok'); + $this->addNoticeFor($o,Messages::MOVED); $o->setParentId( $targetObjectId ); } else { - $this->addNotice($o->getType(), 0, $o->name, 'ERROR', 'error'); + $this->addErrorFor($o,Messages::ERROR); } } else { $o->setParentId( $targetObjectId ); - $this->addNotice($o->getType(), 0, $o->name, 'MOVED', 'ok'); + $this->addNoticeFor($o,Messages::MOVED); } break; @@ -255,7 +256,7 @@ class FolderAdvancedAction extends FolderAction implements Method { case 'folder': // Ordner zur Zeit nicht kopieren // Funktion waere zu verwirrend - $this->addNotice($o->getType(), 0, $o->name, 'CANNOT_COPY_FOLDER', 'error'); + $this->addErrorFor($o,Messages::CANNOT_COPY_FOLDER); break; case 'file': @@ -267,7 +268,7 @@ class FolderAdvancedAction extends FolderAction implements Method { $f->persist(); $f->copyValueFromFile( $id ); - $this->addNotice($o->getType(), 0, $o->name, 'COPIED', 'ok'); + $this->addNoticeFor($o,Messages::COPIED); break; case 'page': @@ -278,7 +279,7 @@ class FolderAdvancedAction extends FolderAction implements Method { $p->parentid = $targetObjectId; $p->persist(); $p->copyValuesFromPage( $id ); - $this->addNotice($o->getType(), 0, $o->name, 'COPIED', 'ok'); + $this->addNoticeFor($o,Messages::COPIED); break; case 'link': @@ -288,7 +289,7 @@ class FolderAdvancedAction extends FolderAction implements Method { $l->name = \cms\base\Language::lang('COPY_OF').' '.$l->name; $l->parentid = $targetObjectId; $l->persist(); - $this->addNotice($o->getType(), 0, $o->name, 'COPIED', 'ok'); + $this->addNoticeFor($o,Messages::COPIED); break; default: @@ -311,11 +312,11 @@ class FolderAdvancedAction extends FolderAction implements Method { $link->isLinkToObject = true; $link->name = \cms\base\Language::lang('LINK_TO').' '.$o->name; $link->persist(); - $this->addNotice($o->getType(), 0, $o->name, 'LINKED', 'ok'); + $this->addNoticeFor($o,Messages::LINKED); } else { - $this->addNotice($o->getType(), 0, $o->name, 'ERROR', 'error'); + $this->addErrorFor($o,Messages::ERROR); } break; @@ -354,17 +355,17 @@ class FolderAdvancedAction extends FolderAction implements Method { default: throw new \LogicException("Error while deleting: Unknown type: {$o->getType()}"); } - $this->addNotice($o->getType(), 0, $o->name, 'DELETED', Action::NOTICE_OK); + $this->addNoticeFor($o,Messages::DELETED); } else { - $this->addNotice($o->getType(), 0, $o->name, 'NOTHING_DONE', Action::NOTICE_WARN); + $this->addNoticeFor($o,Messages::NOTHING_DONE); } break; default: - $this->addNotice($o->getType(), 0, $o->name, 'ERROR', 'error'); + $this->addErrorFor($o,Messages::ERROR); } } diff --git a/modules/cms/action/folder/FolderCreatepageAction.class.php b/modules/cms/action/folder/FolderCreatepageAction.class.php @@ -20,7 +20,7 @@ class FolderCreatepageAction extends FolderAction implements Method { $this->setTemplateVar('objectid' ,$this->folder->objectid ); if ( count($all_templates) == 0 ) - $this->addNotice('folder', 0, $this->folder->name, 'NO_TEMPLATES_AVAILABLE', Action::NOTICE_WARN); + $this->addWarningFor($this->folder,Messages::NO_TEMPLATES_AVAILABLE ); } diff --git a/modules/cms/action/group/GroupMembershipsAction.class.php b/modules/cms/action/group/GroupMembershipsAction.class.php @@ -3,8 +3,10 @@ namespace cms\action\group; use cms\action\GroupAction; use cms\action\Method; use cms\model\User; +use language\Messages; class GroupMembershipsAction extends GroupAction implements Method { + public function view() { // Mitgliedschaften ermitteln // @@ -27,7 +29,9 @@ class GroupMembershipsAction extends GroupAction implements Method { } $this->setTemplateVar('memberships',$userliste); } + public function post() { + $allUsers = User::listAll(); $groupUsers = $this->group->getUsers(); @@ -36,16 +40,12 @@ class GroupMembershipsAction extends GroupAction implements Method { $hasUser = array_key_exists($id,$groupUsers); if ( !$hasUser && $this->hasRequestVar('user'.$id) ) - { $this->group->addUser($id); - $this->addNotice('user', 0, $name, 'ADDED'); - } if ( $hasUser && !$this->hasRequestVar('user'.$id) ) - { $this->group->delUser($id); - $this->addNotice('user', 0, $name, 'DELETED'); - } } + + $this->addNoticeFor($this->group, Messages::USER_ADDED_TO_GROUP); } } diff --git a/modules/cms/action/group/GroupPropAction.class.php b/modules/cms/action/group/GroupPropAction.class.php @@ -2,6 +2,7 @@ namespace cms\action\group; use cms\action\GroupAction; use cms\action\Method; +use language\Messages; class GroupPropAction extends GroupAction implements Method { @@ -15,6 +16,6 @@ class GroupPropAction extends GroupAction implements Method { $this->group->name = $this->getRequestVar('name'); $this->group->save(); - $this->addNotice('group', 0, $this->group->name, 'SAVED', 'ok'); + $this->addNoticeFor($this->group,Messages::SAVED); } } diff --git a/modules/cms/action/group/GroupRemoveAction.class.php b/modules/cms/action/group/GroupRemoveAction.class.php @@ -1,24 +1,22 @@ <?php namespace cms\action\group; -use cms\action\Action; use cms\action\GroupAction; use cms\action\Method; +use language\Messages; +/** + * Removing this group. + */ class GroupRemoveAction extends GroupAction implements Method { + public function view() { $this->setTemplateVars( $this->group->getProperties() ); } + public function post() { - if ( $this->hasRequestVar('confirm') ) - { - $this->group->delete(); - - $this->addNotice('group', 0, $this->group->name, 'DELETED', Action::NOTICE_OK); - } - else - { - $this->addNotice('group', 0, $this->group->name, 'NOTHING_DONE', Action::NOTICE_WARN); - } + + $this->group->delete(); + $this->addNoticeFor($this->group, Messages::DELETED); } } diff --git a/modules/cms/action/grouplist/GrouplistAddAction.class.php b/modules/cms/action/grouplist/GrouplistAddAction.class.php @@ -3,17 +3,20 @@ namespace cms\action\grouplist; use cms\action\GrouplistAction; use cms\action\Method; use cms\model\Group; +use language\Messages; class GrouplistAddAction extends GrouplistAction implements Method { - public function view() { + + public function view() { } + public function post() { if ( $this->getRequestVar('name') != '') { $this->group = new Group(); $this->group->name = $this->getRequestVar('name'); $this->group->persist(); - $this->addNotice('group', 0, $this->group->name, 'ADDED', 'ok'); + $this->addNoticeFor( $this->group, Messages::ADDED); } else { diff --git a/modules/cms/action/image/ImageSizeAction.class.php b/modules/cms/action/image/ImageSizeAction.class.php @@ -4,6 +4,7 @@ use cms\action\Action; use cms\action\ImageAction; use cms\action\Method; use cms\model\Image; +use language\Messages; class ImageSizeAction extends ImageAction implements Method { public function view() { @@ -13,13 +14,13 @@ class ImageSizeAction extends ImageAction implements Method { if ( $format == 0 ) { - $this->addNotice('image', 0, '', 'IMAGE_RESIZING_UNKNOWN_TYPE', Action::NOTICE_WARN); + $this->addWarningFor( $this->image,Messages::IMAGE_RESIZING_UNKNOWN_TYPE); } $formats = $this->imageFormats(); if ( empty($formats) ) - $this->addNotice('image', 0, '', 'IMAGE_RESIZING_NOT_AVAILABLE', Action::NOTICE_WARN); + $this->addWarningFor($this->image,Messages::IMAGE_RESIZING_NOT_AVAILABLE); $sizes = array(); foreach( array(10,25,50,75,100,125,150,175,200,250,300,350,400,500,600,800) as $s ) @@ -91,6 +92,6 @@ class ImageSizeAction extends ImageAction implements Method { $imageFile->save(); // Um z.B. Groesse abzuspeichern $imageFile->saveValue(); - $this->addNotice($imageFile->getType(), 0, $imageFile->name, 'IMAGE_RESIZED', 'ok'); + $this->addNoticeFor($imageFile,Messages::IMAGE_RESIZED); } } diff --git a/modules/cms/action/language/LanguagePropAction.class.php b/modules/cms/action/language/LanguagePropAction.class.php @@ -4,14 +4,17 @@ use cms\action\Action; use cms\action\LanguageAction; use cms\action\Method; use cms\base\Configuration; +use language\Messages; class LanguagePropAction extends LanguageAction implements Method { + public function view() { $this->setTemplateVar('isocode' ,$this->language->isoCode ); $this->setTemplateVar('name' ,$this->language->name ); $this->setTemplateVar('is_default',$this->language->isDefault ); } + public function post() { if ( $this->hasRequestVar('name') ) { @@ -31,6 +34,6 @@ class LanguagePropAction extends LanguageAction implements Method { $this->language->save(); - $this->addNotice('language', 0, $this->language->name, 'DONE', Action::NOTICE_OK); + $this->addNoticeFor($this->language,Messages::DONE); } } diff --git a/modules/cms/action/language/LanguageSetdefaultAction.class.php b/modules/cms/action/language/LanguageSetdefaultAction.class.php @@ -3,6 +3,7 @@ namespace cms\action\language; use cms\action\Action; use cms\action\LanguageAction; use cms\action\Method; +use language\Messages; class LanguageSetdefaultAction extends LanguageAction implements Method { @@ -11,6 +12,6 @@ class LanguageSetdefaultAction extends LanguageAction implements Method { public function post() { $this->language->setDefault(); - $this->addNotice('language', 0, $this->language->name, 'DONE', Action::NOTICE_OK); + $this->addNoticeFor($this->language,Messages::DONE); } } diff --git a/modules/cms/action/link/LinkEditAction.class.php b/modules/cms/action/link/LinkEditAction.class.php @@ -3,6 +3,7 @@ namespace cms\action\link; use cms\action\Action; use cms\action\LinkAction; use cms\action\Method; +use language\Messages; class LinkEditAction extends LinkAction implements Method { @@ -18,6 +19,6 @@ class LinkEditAction extends LinkAction implements Method { $this->link->linkedObjectId = $this->getRequestVar('targetobjectid'); $this->link->save(); - $this->addNotice('link', 0, $this->link->name, 'SAVED', Action::NOTICE_OK); + $this->addNoticeFor( $this->link, Messages::SAVED); } } diff --git a/modules/cms/action/link/LinkRemoveAction.class.php b/modules/cms/action/link/LinkRemoveAction.class.php @@ -3,18 +3,17 @@ namespace cms\action\link; use cms\action\Action; use cms\action\LinkAction; use cms\action\Method; +use language\Messages; class LinkRemoveAction extends LinkAction implements Method { + public function view() { $this->setTemplateVar( 'name',$this->link->filename ); } + public function post() { - if ($this->getRequestVar('delete') != '') { - $this->link->delete(); - $this->addNotice('link', 0, $this->link->filename, 'DELETED', Action::NOTICE_OK); - } else { - $this->addNotice('link', 0, $this->link->filename, 'CANCELED', Action::NOTICE_WARN); - } + $this->link->delete(); + $this->addNoticeFor( $this->link, Messages::DELETED ); } } diff --git a/modules/cms/action/login/LoginLoginAction.class.php b/modules/cms/action/login/LoginLoginAction.class.php @@ -64,7 +64,7 @@ class LoginLoginAction extends LoginAction implements Method { if ( empty($dbids) ) - $this->addNotice('', 0, '', 'no_database_configuration', Action::NOTICE_WARN); + $this->addWarningFor( null,Messages::NO_DATABASE_CONFIGURATION ); $this->setTemplateVar( 'dbids',$dbids ); @@ -143,14 +143,14 @@ class LoginLoginAction extends LoginAction implements Method { if ( $tokenFailed ) { // Token falsch. - $this->addNotice('user', 0, $loginName, 'LOGIN_FAILED_TOKEN_FAILED', 'error'); + $this->addErrorFor(null,Messages::LOGIN_FAILED_TOKEN_FAILED ); $this->addValidationError('user_token',''); return; } if ( $mustChangePassword ) { // Anmeldung gescheitert, Benutzer muss Kennwort ?ndern. - $this->addNotice('user', 0, $loginName, 'LOGIN_FAILED_MUSTCHANGEPASSWORD', 'error'); + $this->addErrorFor( null,Messages::LOGIN_FAILED_MUSTCHANGEPASSWORD); $this->addValidationError('password1',''); $this->addValidationError('password2',''); return; @@ -167,8 +167,8 @@ class LoginLoginAction extends LoginAction implements Method { )); // Anmeldung gescheitert. - $this->addNotice('user', 0, $loginName, 'LOGIN_FAILED', 'error', array('name' => $loginName)); - $this->addValidationError('login_name', ''); + $this->addErrorFor( null,Messages::LOGIN_FAILED, ['name' => $loginName] ); + $this->addValidationError('login_name' , ''); $this->addValidationError('login_password', ''); return; } @@ -204,7 +204,7 @@ class LoginLoginAction extends LoginAction implements Method { // Anmeldung gescheitert. Logger::warn( TextMessage::create('user ${0} authenticated successful, but not found in internal user table',[$loginName]) ); - $this->addNotice('user', 0, $loginName, 'LOGIN_FAILED', 'error', array('name' => $loginName)); + $this->addErrorFor(null,Messages::LOGIN_FAILED, ['name' => $loginName ]); $this->addValidationError('login_name', ''); $this->addValidationError('login_password', ''); diff --git a/modules/cms/action/login/LoginPasswordcodeAction.class.php b/modules/cms/action/login/LoginPasswordcodeAction.class.php @@ -3,6 +3,9 @@ namespace cms\action\login; use cms\action\LoginAction; use cms\action\Method; use cms\model\User; +use language\Messages; +use logger\Logger; +use security\Password; use util\Mail; use util\Session; @@ -12,6 +15,7 @@ class LoginPasswordcodeAction extends LoginAction implements Method { } public function post() { + $username = $this->getSessionVar(Session::KEY_PASSWORD_COMMIT_NAME); if ( $this->getRequestVar("code")=='' || @@ -23,29 +27,29 @@ class LoginPasswordcodeAction extends LoginAction implements Method { $user = User::loadWithName( $username,User::AUTH_TYPE_INTERNAL ); - if ( !$user->isValid() ) + if ( $user && $user->isValid() ) { - // Benutzer konnte nicht geladen werden. - $this->addNotice('user', 0, $username, 'error', Action::NOTICE_ERROR); - return; - } - - $newPw = $user->createPassword(); // Neues Kennwort erzeugen. - - $eMail = new Mail( $user->mail,'password_new' ); - $eMail->setVar('name' ,$user->getName()); - $eMail->setVar('password',$newPw ); + $newPw = $user->createPassword(); // Neues Kennwort erzeugen. - if ( $eMail->send() ) - { - $user->setPassword( $newPw, false ); // Kennwort muss beim n?. Login ge?ndert werden. - $this->addNotice('user', 0, $username, 'mail_sent', Action::NOTICE_OK); - } - else - { - // Sollte eigentlich nicht vorkommen, da der Benutzer ja auch schon den - // Code per E-Mail erhalten hat. - $this->addNotice('user', 0, $username, 'error', Action::NOTICE_ERROR, array(), $eMail->error); + $eMail = new Mail( $user->mail,'password_new' ); + $eMail->setVar('name' ,$user->getName()); + $eMail->setVar('password',$newPw ); + + try { + if ( $eMail->send() ) + $user->setPassword( $newPw, false ); // Kennwort muss beim n?. Login ge?ndert werden. + else + Logger::warn('Mail could not be sent: '.$eMail->error); + } catch( \Exception $e ) { + Logger::warn( $e ); + } } + + sleep(1); + Password::delay(); + + // For security reasons: + // Always display this message, so no one is able to find out if a username exists. + $this->addNoticeFor( null,Messages::MAIL_SENT ); } } diff --git a/modules/cms/action/login/LoginRegistercodeAction.class.php b/modules/cms/action/login/LoginRegistercodeAction.class.php @@ -64,6 +64,6 @@ class LoginRegistercodeAction extends LoginAction implements Method { $newUser->setPassword( $this->getRequestVar('password'),true ); - $this->addNotice('user', 0, $newUser->name, 'user_added', 'ok'); + $this->addNoticeFor( $newUser,Messages::USER_ADDED); } } diff --git a/modules/cms/action/object/ObjectAclformAction.class.php b/modules/cms/action/object/ObjectAclformAction.class.php @@ -10,6 +10,7 @@ use cms\model\Folder; use cms\model\Group; use cms\model\Project; use cms\model\User; +use language\Messages; class ObjectAclformAction extends ObjectAction implements Method { public function view() { @@ -111,7 +112,7 @@ class ObjectAclformAction extends ObjectAction implements Method { - $this->addNotice('', 0, '', 'ADDED', Action::NOTICE_OK); + $this->addNoticeFor( $this->baseObject,Messages::ADDED); $o->setTimestamp(); } diff --git a/modules/cms/action/object/ObjectCopyAction.class.php b/modules/cms/action/object/ObjectCopyAction.class.php @@ -10,6 +10,7 @@ use cms\model\File; use cms\model\Folder; use cms\model\Link; use cms\model\Page; +use language\Messages; class ObjectCopyAction extends ObjectAction implements Method { @@ -28,7 +29,7 @@ class ObjectCopyAction extends ObjectAction implements Method { if ( ! $targetFolder->hasRight(Acl::ACL_WRITE) ) { - $this->addNotice('folder', 0, $targetFolder->name, 'NOT_WRITABLE', Action::NOTICE_ERROR); + $this->addErrorFor( $this->baseObject,Messages::FOLDER_NOT_WRITABLE ); } } public function post() { @@ -45,7 +46,7 @@ class ObjectCopyAction extends ObjectAction implements Method { // Prüfen, ob Schreibrechte im Zielordner bestehen. if ( ! $targetFolder->hasRight(Acl::ACL_WRITE) ) { - $this->addNotice('folder', 0, $targetFolder->name, 'NOT_WRITABLE', Action::NOTICE_ERROR); + $this->addErrorFor( $targetFolder,Messages::FOLDER_NOT_WRITABLE ); return; } @@ -67,7 +68,7 @@ class ObjectCopyAction extends ObjectAction implements Method { // dann verschieben if ( in_array($targetObjectId,$allsubfolders) || $sourceObjectId == $targetObjectId ) { - $this->addNotice('folder', 0, $sourceObject->name, 'ERROR', Action::NOTICE_ERROR); + $this->addErrorFor( $sourceObject,Messages::ERROR); return; } } @@ -76,7 +77,7 @@ class ObjectCopyAction extends ObjectAction implements Method { // Beim Verschieben und Kopieren muss im Zielordner die Berechtigung // zum Erstellen von Ordner, Dateien oder Seiten vorhanden sein. $sourceObject->setParentId( $targetObjectId ); - $this->addNotice($sourceObject->type, 0, $sourceObject->name, 'moved'); + $this->addNoticeFor( $sourceObject,Messages::MOVED); break; case 'moveandlink': @@ -84,7 +85,7 @@ class ObjectCopyAction extends ObjectAction implements Method { $oldParentId = $sourceObject->parentid; $sourceObject->setParentId( $targetObjectId ); - $this->addNotice($sourceObject->type, 0, $sourceObject->name, 'moved'); + $this->addNoticeFor($sourceObject,Messages::MOVED); $link = new Link(); $link->parentid = $oldParentId; @@ -92,7 +93,7 @@ class ObjectCopyAction extends ObjectAction implements Method { $link->filename = $sourceObject->filename; $link->linkedObjectId = $sourceObjectId; $link->persist(); - $this->addNotice('link', 0, $link->name, 'added'); + $this->addNoticeFor($link,Messages::ADDED); break; @@ -103,7 +104,7 @@ class ObjectCopyAction extends ObjectAction implements Method { case 'folder': // Ordner zur Zeit nicht kopieren // Funktion waere zu verwirrend - $this->addNotice($sourceObject->getType(), 0, $sourceObject->name, 'CANNOT_COPY_FOLDER', 'error'); + $this->addErrorFor($sourceObject,Messages::CANNOT_COPY_FOLDER); break; case 'file': @@ -114,8 +115,8 @@ class ObjectCopyAction extends ObjectAction implements Method { $f->parentid = $targetObjectId; $f->persist(); $f->copyValueFromFile( $sourceObjectId ); - - $this->addNotice($sourceObject->getType(), 0, $sourceObject->name, 'COPIED', 'ok'); + + $this->addNoticeFor($sourceObject,Messages::COPIED); break; case 'page': @@ -126,7 +127,7 @@ class ObjectCopyAction extends ObjectAction implements Method { $p->parentid = $targetObjectId; $p->persist(); $p->copyValuesFromPage( $sourceObjectId ); - $this->addNotice($sourceObject->getType(), 0, $sourceObject->name, 'COPIED', 'ok'); + $this->addNoticeFor($sourceObject,Messages::COPIED); break; case 'link': @@ -136,7 +137,7 @@ class ObjectCopyAction extends ObjectAction implements Method { $l->name = \cms\base\Language::lang('COPY_OF').' '.$l->name; $l->parentid = $targetObjectId; $l->persist(); - $this->addNotice($sourceObject->getType(), 0, $sourceObject->name, 'COPIED', 'ok'); + $this->addNoticeFor($sourceObject,Messages::COPIED); break; default: @@ -150,7 +151,7 @@ class ObjectCopyAction extends ObjectAction implements Method { // von Verkn�pfungen vorhanden sein. if ( ! $targetFolder->hasRight(Acl::ACL_CREATE_LINK) ) { - $this->addNotice('folder', 0, $targetFolder->name, 'NOT_WRITABLE', Action::NOTICE_ERROR); + $this->addErrorFor($targetFolder,Messages::FOLDER_NOT_WRITABLE); return; } @@ -161,7 +162,7 @@ class ObjectCopyAction extends ObjectAction implements Method { $link->linkedObjectId = $sourceObjectId; $link->isLinkToObject = true; $link->persist(); - $this->addNotice('link', 0, $link->name, 'added'); + $this->addNoticeFor($link,Messages::ADDED); // OK break; diff --git a/modules/cms/action/object/ObjectDelaclAction.class.php b/modules/cms/action/object/ObjectDelaclAction.class.php @@ -5,6 +5,7 @@ use cms\action\Method; use cms\action\ObjectAction; use cms\model\Acl; use cms\model\BaseObject; +use language\Messages; use util\Http; class ObjectDelaclAction extends ObjectAction implements Method { @@ -23,6 +24,6 @@ class ObjectDelaclAction extends ObjectAction implements Method { $acl->delete(); // Weg mit der ACL - $this->addNotice('', 0, '', 'DELETED', Action::NOTICE_OK); + $this->addNoticeFor( $o,Messages::DELETED ); } } diff --git a/modules/cms/action/object/ObjectInheritAction.class.php b/modules/cms/action/object/ObjectInheritAction.class.php @@ -6,6 +6,7 @@ use cms\action\ObjectAction; use cms\model\Acl; use cms\model\BaseObject; use cms\model\Folder; +use language\Messages; use logger\Logger; use util\Session; @@ -26,7 +27,7 @@ class ObjectInheritAction extends ObjectAction implements Method { if ( ! $this->hasRequestVar('inherit') ) { - $this->addNotice('folder', 0, $folder->name, 'NOTHING_DONE', Action::NOTICE_WARN); + $this->addWarningFor( $folder,Messages::NOTHING_DONE); return; } @@ -74,6 +75,6 @@ class ObjectInheritAction extends ObjectAction implements Method { } } - $this->addNotice('folder', 0, $folder->name, 'SAVED', Action::NOTICE_OK); + $this->addNoticeFor($folder,Messages::SAVED); } } diff --git a/modules/cms/action/object/ObjectPropAction.class.php b/modules/cms/action/object/ObjectPropAction.class.php @@ -5,6 +5,7 @@ use cms\action\ObjectAction; use cms\action\RequestParams; use cms\model\BaseObject; use cms\model\Project; +use language\Messages; use util\exception\ValidationException; @@ -45,6 +46,6 @@ class ObjectPropAction extends ObjectAction implements Method { $this->baseObject->setCreationTimestamp(); - $this->addNotice($this->baseObject->getType(), 0, $this->baseObject->filename, 'PROP_SAVED', 'ok'); + $this->addNoticeFor( $this->baseObject,Messages::PROP_SAVED); } } diff --git a/modules/cms/action/object/ObjectSettingsAction.class.php b/modules/cms/action/object/ObjectSettingsAction.class.php @@ -3,6 +3,7 @@ namespace cms\action\object; use cms\action\Action; use cms\action\Method; use cms\action\ObjectAction; +use language\Messages; use util\exception\ValidationException; @@ -43,6 +44,6 @@ class ObjectSettingsAction extends ObjectAction implements Method { $this->baseObject->save(); - $this->addNotice($this->baseObject->getType(), 0, $this->baseObject->filename, 'SAVED', Action::NOTICE_OK); + $this->addNoticeFor( $this->baseObject,Messages::SAVED); } } diff --git a/modules/cms/action/page/PageChangetemplateselectelementsAction.class.php b/modules/cms/action/page/PageChangetemplateselectelementsAction.class.php @@ -5,6 +5,7 @@ use cms\action\Method; use cms\action\PageAction; use cms\model\Element; use cms\model\Template; +use language\Messages; class PageChangetemplateselectelementsAction extends PageAction implements Method { @@ -63,9 +64,9 @@ class PageChangetemplateselectelementsAction extends PageAction implements Metho if ( $newTemplateId != 0 ) { $this->page->replaceTemplate( $newTemplateId,$replaceElementMap ); - $this->addNotice('page', 0, $this->page->name, 'SAVED', Action::NOTICE_OK); + $this->addNoticeFor( $this->page,Messages::SAVED); } else - $this->addNotice('page', 0, $this->page->name, 'NOT_SAVED', Action::NOTICE_WARN); + $this->addWarningFor( $this->page,Messages::NOT_SAVED); } } diff --git a/modules/cms/action/page/PageNameAction.class.php b/modules/cms/action/page/PageNameAction.class.php @@ -6,6 +6,7 @@ use cms\action\object\ObjectNameAction; use cms\action\PageAction; use cms\model\BaseObject; use cms\model\Project; +use language\Messages; class PageNameAction extends PageAction implements Method { @@ -44,12 +45,12 @@ class PageNameAction extends PageAction implements Method { if ( ! $alias->filename ) { $alias->delete(); - $this->addNotice($alias->getType(), 0, '', 'DELETED', 'ok'); + $this->addNoticeFor( $alias,Messages::DELETED); } else { $alias->persist(); - $this->addNotice($alias->getType(), 0, $alias->filename, 'SAVED', 'ok'); + $this->addNoticeFor( $alias,Messages::SAVED); } } diff --git a/modules/cms/action/page/PageRemoveAction.class.php b/modules/cms/action/page/PageRemoveAction.class.php @@ -1,22 +1,17 @@ <?php namespace cms\action\page; -use cms\action\Action; use cms\action\Method; use cms\action\PageAction; +use language\Messages; class PageRemoveAction extends PageAction implements Method { - public function view() { + + public function view() { $this->setTemplateVar( 'name',$this->page->filename ); } + public function post() { - if ( $this->getRequestVar('delete') != '' ) - { - $this->page->delete(); - $this->addNotice('page', 0, $this->page->filename, 'DELETED', Action::NOTICE_OK); - } - else - { - $this->addNotice('page', 0, $this->page->filename, 'CANCELED', Action::NOTICE_WARN); - } + $this->page->delete(); + $this->addNoticeFor( $this->page,Messages::DELETED); } } diff --git a/modules/cms/action/pageelement/PageelementRestoreAction.class.php b/modules/cms/action/pageelement/PageelementRestoreAction.class.php @@ -4,10 +4,13 @@ use cms\action\Action; use cms\action\Method; use cms\action\PageelementAction; use cms\model\Element; +use language\Messages; class PageelementRestoreAction extends PageelementAction implements Method { + public function view() { } + public function post() { $this->value->valueid = $this->getRequestVar('valueid'); $this->value->loadWithId(); @@ -23,6 +26,6 @@ class PageelementRestoreAction extends PageelementAction implements Method { // Inhalt wieder herstellen, in dem er neu gespeichert wird. $this->value->add(); - $this->addNotice('pageelement', 0, $this->value->element->name, 'PAGEELEMENT_USE_FROM_ARCHIVE', Action::NOTICE_OK); + $this->addNoticeFor( $this->pageelement,Messages::PAGEELEMENT_USE_FROM_ARCHIVE ); } } diff --git a/modules/cms/action/profile/ProfilePwAction.class.php b/modules/cms/action/profile/ProfilePwAction.class.php @@ -4,6 +4,7 @@ use cms\action\Method; use cms\action\ProfileAction; use cms\base\Configuration; use cms\model\User; +use language\Messages; class ProfilePwAction extends ProfileAction implements Method { public function view() { @@ -40,7 +41,7 @@ class ProfilePwAction extends ProfileAction implements Method { else { $this->user->setPassword( $this->getRequestVar('password1') ); - $this->addNotice('user', 0, $this->user->name, 'SAVED', 'ok'); + $this->addNoticeFor( $this->user,Messages::SAVED); } } } diff --git a/modules/cms/action/project/ProjectCopyAction.class.php b/modules/cms/action/project/ProjectCopyAction.class.php @@ -4,11 +4,12 @@ use cms\action\Method; use cms\action\ProjectAction; use cms\base\Configuration; use cms\base\DB; +use language\Messages; class ProjectCopyAction extends ProjectAction implements Method { public function view() { - } + public function post() { $db = DB::get(); $this->setTemplateVar( 'dbid',$db->id ); @@ -28,8 +29,7 @@ class ProjectCopyAction extends ProjectAction implements Method { { $this->project->export( $this->getRequestVar('dbid') ); - $this->addNotice('project', 0, $this->project->name, 'DONE'); - $this->setTemplateVar('done',true); + $this->addNoticeFor($this->project,Messages::DONE); } } } diff --git a/modules/cms/action/project/ProjectRemoveAction.class.php b/modules/cms/action/project/ProjectRemoveAction.class.php @@ -2,24 +2,21 @@ namespace cms\action\project; use cms\action\Method; use cms\action\ProjectAction; +use language\Messages; class ProjectRemoveAction extends ProjectAction implements Method { + public function view() { + $this->setTemplateVar( 'name',$this->project->name ); } public function post() { - if ( !$this->hasRequestVar('delete') ) - { - $this->addValidationError('delete'); - return; - } - + // Gesamtes Projekt loeschen $this->project->delete(); - $this->setTemplateVar('tree_refresh',true); - $this->addNotice('project', 0, $this->project->name, 'DELETED'); + $this->addNoticeFor( $this->project,Messages::DELETED); } } diff --git a/modules/cms/action/template/TemplateAddelAction.class.php b/modules/cms/action/template/TemplateAddelAction.class.php @@ -7,6 +7,7 @@ use cms\action\TemplateAction; use cms\model\Element; use cms\model\Project; use cms\model\Template; +use language\Messages; class TemplateAddelAction extends TemplateAction implements Method { @@ -54,6 +55,6 @@ class TemplateAddelAction extends TemplateAction implements Method { } - $this->addNotice('template', 0, $this->template->name, 'SAVED', Action::NOTICE_OK); + $this->addNoticeFor($this->template,Messages::SAVED); } } diff --git a/modules/cms/action/template/TemplateExtensionAction.class.php b/modules/cms/action/template/TemplateExtensionAction.class.php @@ -4,6 +4,7 @@ use cms\action\Method; use cms\action\TemplateAction; use cms\model\Project; use cms\model\TemplateModel; +use language\Messages; class TemplateExtensionAction extends TemplateAction implements Method { @@ -21,7 +22,7 @@ class TemplateExtensionAction extends TemplateAction implements Method { // Validierung: Werte dürfen nicht doppelt vorkommen. if ( in_array($input, $extensions) ) { - $this->addNotice('template', 0, $this->template->name, 'DUPLICATE_INPUT', 'error'); + $this->addErrorFor($this->template,Messages::DUPLICATE_INPUT); throw new \util\exception\ValidationException( $modelName ); } @@ -38,6 +39,6 @@ class TemplateExtensionAction extends TemplateAction implements Method { $templatemodel->persist(); } - $this->addNotice('template', 0, $this->template->name, 'SAVED', 'ok'); + $this->addNoticeFor($this->template,Messages::SAVED); } } diff --git a/modules/cms/action/template/TemplatePropAction.class.php b/modules/cms/action/template/TemplatePropAction.class.php @@ -3,6 +3,7 @@ namespace cms\action\template; use cms\action\Action; use cms\action\Method; use cms\action\TemplateAction; +use language\Messages; class TemplatePropAction extends TemplateAction implements Method { @@ -23,7 +24,7 @@ class TemplatePropAction extends TemplateAction implements Method { { $this->template->name = $this->getRequestVar('name'); $this->template->save(); - $this->addNotice('template', 0, $this->template->name, 'SAVED', Action::NOTICE_OK); + $this->addNoticeFor($this->template,Messages::SAVED); } } } diff --git a/modules/cms/action/template/TemplatePubAction.class.php b/modules/cms/action/template/TemplatePubAction.class.php @@ -4,6 +4,7 @@ use cms\action\Method; use cms\action\TemplateAction; use cms\model\Acl; use cms\model\Page; +use language\Messages; use util\Session; @@ -31,7 +32,7 @@ class TemplatePubAction extends TemplateAction implements Method { $page->publish(); } - $this->addNotice('template', 0, $this->template->name, 'PUBLISHED', Action::NOTICE_OK, array(), array_map(function ($obj) { + $this->addNoticeFor($this->template,Messages::PUBLISHED, array_map(function ($obj) { return $obj['full_filename']; }, $publisher->publishedObjects)); diff --git a/modules/cms/action/template/TemplateRemoveAction.class.php b/modules/cms/action/template/TemplateRemoveAction.class.php @@ -3,6 +3,7 @@ namespace cms\action\template; use cms\action\Action; use cms\action\Method; use cms\action\TemplateAction; +use language\Messages; class TemplateRemoveAction extends TemplateAction implements Method { @@ -10,14 +11,7 @@ class TemplateRemoveAction extends TemplateAction implements Method { $this->setTemplateVar('name',$this->template->name); } public function post() { - if ( $this->getRequestVar('delete') != '' ) - { - $this->template->delete(); - $this->addNotice('template', 0, $this->template->name, 'DELETED', Action::NOTICE_OK); - } - else - { - $this->addNotice('template', 0, $this->template->name, 'CANCELED', Action::NOTICE_WARN); - } + $this->template->delete(); + $this->addNoticeFor($this->template,Messages::DELETED); } } diff --git a/modules/cms/action/template/TemplateSrcAction.class.php b/modules/cms/action/template/TemplateSrcAction.class.php @@ -7,6 +7,7 @@ use cms\action\TemplateAction; use cms\model\Element; use cms\model\Project; use cms\model\TemplateModel; +use language\Messages; class TemplateSrcAction extends TemplateAction implements Method { @@ -77,6 +78,6 @@ class TemplateSrcAction extends TemplateAction implements Method { $templatemodel->extension = $this->getRequestVar('extension'); $templatemodel->persist(); - $this->addNotice('template', 0, $this->template->name, 'SAVED', Action::NOTICE_OK); + $this->addNoticeFor($this->template,Messages::SAVED); } } diff --git a/modules/cms/action/url/UrlRemoveAction.class.php b/modules/cms/action/url/UrlRemoveAction.class.php @@ -3,22 +3,18 @@ namespace cms\action\url; use cms\action\Action; use cms\action\Method; use cms\action\UrlAction; +use language\Messages; class UrlRemoveAction extends UrlAction implements Method { + public function view() { $this->setTemplateVar( 'name',$this->url->filename ); } + public function post() { - if ( $this->getRequestVar('delete') != '' ) - { - $this->url->delete(); - $this->addNotice('url', 0, $this->url->filename, 'DELETED', Action::NOTICE_OK); - } - else - { - $this->addNotice('url', 0, $this->url->filename, 'CANCELED', Action::NOTICE_WARN); - } + $this->url->delete(); + $this->addNoticeFor($this->url,Messages::DELETED); } } diff --git a/modules/cms/action/user/UserMembershipsAction.class.php b/modules/cms/action/user/UserMembershipsAction.class.php @@ -3,6 +3,7 @@ namespace cms\action\user; use cms\action\Method; use cms\action\UserAction; use cms\model\Group; +use language\Messages; class UserMembershipsAction extends UserAction implements Method { @@ -37,21 +38,12 @@ class UserMembershipsAction extends UserAction implements Method { $hasGroup = array_key_exists($id,$userGroups); if ( !$hasGroup && $this->hasRequestVar('group'.$id) ) - { $this->user->addGroup($id); - $this->addNotice('group', 0, $name, 'ADDED'); - $aenderung = true; - } if ( $hasGroup && !$this->hasRequestVar('group'.$id) ) - { $this->user->delGroup($id); - $this->addNotice('group', 0, $name, 'DELETED'); - $aenderung = true; - } } - if ( ! $aenderung ) - $this->addNotice('group', 0, $name, 'NOTHING_DONE'); + $this->addNoticeFor($this->user,Messages::GROUP_MEMBERSHIPS_UPDATED); } } diff --git a/modules/cms/action/user/UserPropAction.class.php b/modules/cms/action/user/UserPropAction.class.php @@ -42,6 +42,7 @@ class UserPropAction extends UserAction implements Method { } public function post() { + if ( ! $this->getRequestVar('name') ) throw new \util\exception\ValidationException( 'name'); @@ -62,6 +63,6 @@ class UserPropAction extends UserAction implements Method { $this->user->style = $this->getRequestVar('style' ); $this->user->persist(); - $this->addNotice('user', 0, $this->user->name, 'SAVED', 'ok'); + $this->addNoticeFor($this->user,Messages::SAVED); } } diff --git a/modules/cms/action/user/UserRightsAction.class.php b/modules/cms/action/user/UserRightsAction.class.php @@ -9,6 +9,7 @@ use cms\model\Group; use cms\model\Language; use cms\model\Project; use cms\model\User; +use language\Messages; class UserRightsAction extends UserAction implements Method { @@ -82,7 +83,7 @@ class UserRightsAction extends UserAction implements Method { $this->setTemplateVar('show',Acl::getAvailableRights() ); if ( $this->user->isAdmin ) - $this->addNotice('user', 0, $this->user->name, 'ADMIN_NEEDS_NO_RIGHTS', Action::NOTICE_WARN); + $this->addWarningFor($this->user,Messages::ADMIN_NEEDS_NO_RIGHTS); } public function post() { } diff --git a/modules/cms/model/Pageelement.class.php b/modules/cms/model/Pageelement.class.php @@ -47,6 +47,11 @@ class Pageelement extends ModelBase } + /** + * Gets the label of the element + * @see Element + * @return string + */ public function getName() { $e = new Element( $this->elementid ); diff --git a/modules/cms/ui/themes/default/html/views/configuration/edit.php b/modules/cms/ui/themes/default/html/views/configuration/edit.php @@ -1,4 +1,4 @@ -<?php /* THIS FILE IS GENERATED from show.tpl.src.xml - DO NOT CHANGE */ defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> +<?php /* THIS FILE IS GENERATED from edit.tpl.src.xml - DO NOT CHANGE */ defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input or-table-filter-input') ?>" /><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/folder/add.php b/modules/cms/ui/themes/default/html/views/folder/add.php @@ -1,4 +1,4 @@ -<?php /* THIS FILE IS GENERATED from create.tpl.src.xml - DO NOT CHANGE */ defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> +<?php /* THIS FILE IS GENERATED from add.tpl.src.xml - DO NOT CHANGE */ defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-linklist') ?>"><?php echo O::escapeHtml('') ?> <?php $if3=($mayCreateFolder); if($if3) { ?> <div class="<?php echo O::escapeHtml('or-act-clickable or-linklist-line or-round-corners or-hover-effect') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/grouplist/edit.php b/modules/cms/ui/themes/default/html/views/grouplist/edit.php @@ -1,4 +1,4 @@ -<?php /* THIS FILE IS GENERATED from show.tpl.src.xml - DO NOT CHANGE */ defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> +<?php /* THIS FILE IS GENERATED from edit.tpl.src.xml - DO NOT CHANGE */ defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input or-table-filter-input') ?>" /><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/languagelist/edit.php b/modules/cms/ui/themes/default/html/views/languagelist/edit.php @@ -1,4 +1,4 @@ -<?php /* THIS FILE IS GENERATED from show.tpl.src.xml - DO NOT CHANGE */ defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> +<?php /* THIS FILE IS GENERATED from edit.tpl.src.xml - DO NOT CHANGE */ defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input or-table-filter-input') ?>" /><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/modellist/edit.php b/modules/cms/ui/themes/default/html/views/modellist/edit.php @@ -1,4 +1,4 @@ -<?php /* THIS FILE IS GENERATED from show.tpl.src.xml - DO NOT CHANGE */ defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> +<?php /* THIS FILE IS GENERATED from edit.tpl.src.xml - DO NOT CHANGE */ defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input or-table-filter-input') ?>" /><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/templatelist/edit.php b/modules/cms/ui/themes/default/html/views/templatelist/edit.php @@ -1,4 +1,4 @@ -<?php /* THIS FILE IS GENERATED from show.tpl.src.xml - DO NOT CHANGE */ defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> +<?php /* THIS FILE IS GENERATED from edit.tpl.src.xml - DO NOT CHANGE */ defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input or-table-filter-input') ?>" /><?php echo O::escapeHtml('') ?> diff --git a/modules/language/Language_CN.class.php b/modules/language/Language_CN.class.php @@ -517,6 +517,7 @@ public function get() { return [ 'YEARS'=>'Years', 'GROUP_DELETE_DESC'=>'Delete the group. All rights and memberships will be lost!', 'GROUP_MEMBERSHIPS'=>'Membershipss', +'GROUP_MEMBERSHIPS_UPDATED'=>'Memberships updated', 'HELP_DATE_ANSIDATE'=>'you can input the date in ANSI-format', 'HELP_DATE'=>'Please choose a date as value', 'HELP'=>'Help', @@ -1051,7 +1052,7 @@ Thank you.', 'SEQUENCE_CHANGED'=>'The sequence was changed', 'UNEXPECTED_CHARS'=>'shūrù shùjù bāohán yìwài de zìfú ér bèi chāichú.', 'USER_ADDED'=>'The user was added', -'USER_ADDED_TO_GROUP'=>'The memberships of this group are updated, ${count} users were added.', +'USER_ADDED_TO_GROUP'=>'The memberships of this group are updated.', 'USER_ALREADY_IN_DATABASE'=>'The user is already there, please select another username.', 'VALUE_SAVED'=>'Content was saved', 'OPENID_NOT_ENABLED'=>'Login with openid is disabled', @@ -1327,5 +1328,7 @@ Thank you.', 'RESTORE'=>'Restore', 'RESTORE_DESC'=>'Restore this value', 'VALUE_PUBLIC'=>'public', +'NO_RIGHTS'=>'No rights', +'FOLDER_NOT_WRITABLE'=>'Directory not writable', ];} } \ No newline at end of file diff --git a/modules/language/Language_DE.class.php b/modules/language/Language_DE.class.php @@ -517,6 +517,7 @@ public function get() { return [ 'YEARS'=>'Jahre', 'GROUP_DELETE_DESC'=>'Löschen der Gruppe. Alle Berechtigungen und Gruppenzugehörigkeiten werden gelöscht!', 'GROUP_MEMBERSHIPS'=>'Mitgliedschaften', +'GROUP_MEMBERSHIPS_UPDATED'=>'Die Gruppenmitgliedschaften wurden aktualisiert', 'HELP_DATE_ANSIDATE'=>'Alternativ können Sie Datum/Zeit im ANSI-Format eingeben', 'HELP_DATE'=>'Legen Sie einen Zeitpunkt als Platzhalterinhalt fest', 'HELP'=>'Hilfe', @@ -1056,7 +1057,7 @@ Vielen Dank.', 'SEQUENCE_CHANGED'=>'Die Reihenfolge wurde geändert.', 'UNEXPECTED_CHARS'=>'Ihre Eingabe enthielt ungültige Zeichen, diese wurden entfernt.', 'USER_ADDED'=>'Der Benutzer wurde hinzugefügt.', -'USER_ADDED_TO_GROUP'=>'Die Mitgliedschaften in der Gruppe wurden aktualisiert, ${count} Benutzer hinzugefügt.', +'USER_ADDED_TO_GROUP'=>'Die Mitgliedschaften in der Gruppe wurden aktualisiert.', 'USER_ALREADY_IN_DATABASE'=>'Der Benutzer ist bereits vorhanden. Bitte wählen Sie einen anderen Benutzernamen.', 'VALUE_SAVED'=>'Inhalt wurde gespeichert.', 'OPENID_NOT_ENABLED'=>'Das Login mit OpenId ist deaktiviert.', @@ -1332,5 +1333,7 @@ Vielen Dank.', 'RESTORE'=>'Wiederherstellen', 'RESTORE_DESC'=>'Diesen Inhalt wieder herstellen', 'VALUE_PUBLIC'=>'öffentlich', +'NO_RIGHTS'=>'Keine Berechtigung', +'FOLDER_NOT_WRITABLE'=>'Keine Schreibrechte im Verzeichnis', ];} } \ No newline at end of file diff --git a/modules/language/Language_EN.class.php b/modules/language/Language_EN.class.php @@ -517,6 +517,7 @@ public function get() { return [ 'YEARS'=>'Years', 'GROUP_DELETE_DESC'=>'Delete the group. All rights and memberships will be lost!', 'GROUP_MEMBERSHIPS'=>'Membershipss', +'GROUP_MEMBERSHIPS_UPDATED'=>'Memberships updated', 'HELP_DATE_ANSIDATE'=>'you can input the date in ANSI-format', 'HELP_DATE'=>'Please choose a date as value', 'HELP'=>'Help', @@ -1051,7 +1052,7 @@ Thank you.', 'SEQUENCE_CHANGED'=>'The sequence was changed', 'UNEXPECTED_CHARS'=>'The input data contains unexpected chars which were removed.', 'USER_ADDED'=>'The user was added', -'USER_ADDED_TO_GROUP'=>'The memberships of this group are updated, ${count} users were added.', +'USER_ADDED_TO_GROUP'=>'The memberships of this group are updated.', 'USER_ALREADY_IN_DATABASE'=>'The user is already there, please select another username.', 'VALUE_SAVED'=>'Content was saved', 'OPENID_NOT_ENABLED'=>'Login with openid is disabled', @@ -1327,5 +1328,7 @@ Thank you.', 'RESTORE'=>'Restore', 'RESTORE_DESC'=>'Restore this value', 'VALUE_PUBLIC'=>'public', +'NO_RIGHTS'=>'No rights', +'FOLDER_NOT_WRITABLE'=>'Directory not writable', ];} } \ No newline at end of file diff --git a/modules/language/Language_ES.class.php b/modules/language/Language_ES.class.php @@ -517,6 +517,7 @@ public function get() { return [ 'YEARS'=>'Années', 'GROUP_DELETE_DESC'=>'Supprimer le groupe. Toutes les droites et adhésions seront perdues !', 'GROUP_MEMBERSHIPS'=>'Membershipss', +'GROUP_MEMBERSHIPS_UPDATED'=>'Memberships updated', 'HELP_DATE_ANSIDATE'=>'vous pouvez entrer la date dans le Norme ANSI-format', 'HELP_DATE'=>'Veuillez choisir une date comme valeur', 'HELP'=>'Help', @@ -1076,7 +1077,7 @@ MENU_INDEX_ADMINISTRATION_DESC =', 'SEQUENCE_CHANGED'=>'la secuencia eran', 'UNEXPECTED_CHARS'=>'The input data contains unexpected chars which were removed.', 'USER_ADDED'=>'El usuario era', -'USER_ADDED_TO_GROUP'=>'The memberships of this group are updated, ${count} users were added.', +'USER_ADDED_TO_GROUP'=>'The memberships of this group are updated.', 'USER_ALREADY_IN_DATABASE'=>'The user is already there, please select another username.', 'VALUE_SAVED'=>'contenido cambiante fueron ahorradas', 'OPENID_NOT_ENABLED'=>'Login with openid is disabled', @@ -1352,5 +1353,7 @@ MENU_INDEX_ADMINISTRATION_DESC =', 'RESTORE'=>'Restore', 'RESTORE_DESC'=>'Restore this value', 'VALUE_PUBLIC'=>'public', +'NO_RIGHTS'=>'No rights', +'FOLDER_NOT_WRITABLE'=>'Directory not writable', ];} } \ No newline at end of file diff --git a/modules/language/Language_FR.class.php b/modules/language/Language_FR.class.php @@ -517,6 +517,7 @@ public function get() { return [ 'YEARS'=>'Années', 'GROUP_DELETE_DESC'=>'Supprimer le groupe. Toutes les droites et adhésions seront perdues !', 'GROUP_MEMBERSHIPS'=>'Membershipss', +'GROUP_MEMBERSHIPS_UPDATED'=>'Memberships updated', 'HELP_DATE_ANSIDATE'=>'vous pouvez entrer la date dans le Norme ANSI-format', 'HELP_DATE'=>'Veuillez choisir une date comme valeur', 'HELP'=>'Help', @@ -1052,7 +1053,7 @@ Merci.', 'SEQUENCE_CHANGED'=>'L\'ordre a été changé', 'UNEXPECTED_CHARS'=>'The input data contains unexpected chars which were removed.', 'USER_ADDED'=>'L\'utilisateur a été ajouté', -'USER_ADDED_TO_GROUP'=>'The memberships of this group are updated, ${count} users were added.', +'USER_ADDED_TO_GROUP'=>'The memberships of this group are updated.', 'USER_ALREADY_IN_DATABASE'=>'The user is already there, please select another username.', 'VALUE_SAVED'=>'Le contenu a été sauvé', 'OPENID_NOT_ENABLED'=>'Login with openid is disabled', @@ -1328,5 +1329,7 @@ Merci.', 'RESTORE'=>'Restore', 'RESTORE_DESC'=>'Restore this value', 'VALUE_PUBLIC'=>'public', +'NO_RIGHTS'=>'No rights', +'FOLDER_NOT_WRITABLE'=>'Directory not writable', ];} } \ No newline at end of file diff --git a/modules/language/Language_IT.class.php b/modules/language/Language_IT.class.php @@ -517,6 +517,7 @@ public function get() { return [ 'YEARS'=>'Años', 'GROUP_DELETE_DESC'=>'Suprimir a grupo. ¡Todas las derechas y calidades de miembro serán perdidas!', 'GROUP_MEMBERSHIPS'=>'Membershipss', +'GROUP_MEMBERSHIPS_UPDATED'=>'Memberships updated', 'HELP_DATE_ANSIDATE'=>'puedes entrar la fecha en ANSI-formato', 'HELP_DATE'=>'Elegir por favor una fecha como valor', 'HELP'=>'Help', @@ -1052,7 +1053,7 @@ Gracias.', 'SEQUENCE_CHANGED'=>'la sequenza erano', 'UNEXPECTED_CHARS'=>'The input data contains unexpected chars which were removed.', 'USER_ADDED'=>'L\'utente era', -'USER_ADDED_TO_GROUP'=>'The memberships of this group are updated, ${count} users were added.', +'USER_ADDED_TO_GROUP'=>'The memberships of this group are updated.', 'USER_ALREADY_IN_DATABASE'=>'The user is already there, please select another username.', 'VALUE_SAVED'=>'soddisfare cambiato sono state risparmiate', 'OPENID_NOT_ENABLED'=>'Login with openid is disabled', @@ -1328,5 +1329,7 @@ Gracias.', 'RESTORE'=>'Restore', 'RESTORE_DESC'=>'Restore this value', 'VALUE_PUBLIC'=>'public', +'NO_RIGHTS'=>'No rights', +'FOLDER_NOT_WRITABLE'=>'Directory not writable', ];} } \ No newline at end of file diff --git a/modules/language/Language_RU.class.php b/modules/language/Language_RU.class.php @@ -517,6 +517,7 @@ public function get() { return [ 'YEARS'=>'Год Годы', 'GROUP_DELETE_DESC'=>'Удаление группы. Все права и подписки будут утеряны!', 'GROUP_MEMBERSHIPS'=>'Membershipss', +'GROUP_MEMBERSHIPS_UPDATED'=>'Memberships updated', 'HELP_DATE_ANSIDATE'=>'Вы можете задать дату в формате ANSI -', 'HELP_DATE'=>'Membershipss Выберите дату как значение', 'HELP'=>'Help', @@ -1052,7 +1053,7 @@ if you do not know where this mail comes from, please ignore it.', 'SEQUENCE_CHANGED'=>'Последовательность изменения содержимого', 'UNEXPECTED_CHARS'=>'The input data contains unexpected chars which were removed.', 'USER_ADDED'=>'Пользователь был добавлен', -'USER_ADDED_TO_GROUP'=>'The memberships of this group are updated, ${count} users were added.', +'USER_ADDED_TO_GROUP'=>'The memberships of this group are updated.', 'USER_ALREADY_IN_DATABASE'=>'The user is already there, please select another username.', 'VALUE_SAVED'=>'спас', 'OPENID_NOT_ENABLED'=>'Login with openid is disabled', @@ -1328,5 +1329,7 @@ if you do not know where this mail comes from, please ignore it.', 'RESTORE'=>'Restore', 'RESTORE_DESC'=>'Restore this value', 'VALUE_PUBLIC'=>'public', +'NO_RIGHTS'=>'No rights', +'FOLDER_NOT_WRITABLE'=>'Directory not writable', ];} } \ No newline at end of file diff --git a/modules/language/Messages.class.php b/modules/language/Messages.class.php @@ -517,6 +517,7 @@ class Messages { const YEARS = 'YEARS'; const GROUP_DELETE_DESC = 'GROUP_DELETE_DESC'; const GROUP_MEMBERSHIPS = 'GROUP_MEMBERSHIPS'; + const GROUP_MEMBERSHIPS_UPDATED = 'GROUP_MEMBERSHIPS_UPDATED'; const HELP_DATE_ANSIDATE = 'HELP_DATE_ANSIDATE'; const HELP_DATE = 'HELP_DATE'; const HELP = 'HELP'; @@ -1289,4 +1290,6 @@ class Messages { const RESTORE = 'RESTORE'; const RESTORE_DESC = 'RESTORE_DESC'; const VALUE_PUBLIC = 'VALUE_PUBLIC'; + const NO_RIGHTS = 'NO_RIGHTS'; + const FOLDER_NOT_WRITABLE = 'FOLDER_NOT_WRITABLE'; } \ No newline at end of file diff --git a/modules/language/language.yml b/modules/language/language.yml @@ -2665,6 +2665,9 @@ GROUP_DELETE_DESC: GROUP_MEMBERSHIPS: de: Mitgliedschaften en: Membershipss +GROUP_MEMBERSHIPS_UPDATED: + de: Die Gruppenmitgliedschaften wurden aktualisiert + en: Memberships updated HELP_DATE_ANSIDATE: de: Alternativ können Sie Datum/Zeit im ANSI-Format eingeben en: you can input the date in ANSI-format @@ -5183,8 +5186,8 @@ USER_ADDED: it: "L'utente era" ru: Пользователь был добавлен USER_ADDED_TO_GROUP: - de: 'Die Mitgliedschaften in der Gruppe wurden aktualisiert, ${count} Benutzer hinzugefügt.' - en: 'The memberships of this group are updated, ${count} users were added.' + de: 'Die Mitgliedschaften in der Gruppe wurden aktualisiert.' + en: 'The memberships of this group are updated.' USER_ALREADY_IN_DATABASE: de: Der Benutzer ist bereits vorhanden. Bitte wählen Sie einen anderen Benutzernamen. en: The user is already there, please select another username. @@ -6439,4 +6442,10 @@ RESTORE_DESC: en: Restore this value VALUE_PUBLIC: en: public - de: öffentlich- \ No newline at end of file + de: öffentlich +NO_RIGHTS: + de: Keine Berechtigung + en: No rights +FOLDER_NOT_WRITABLE: + de: Keine Schreibrechte im Verzeichnis + en: Directory not writable+ \ No newline at end of file