openrat-cms

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README

commit 494425054102f4683e16a96f7ca29de9ef9d0565
parent 364522041885bd23c8c03033a10c854b985ac4f9
Author: dankert <openrat@jandankert.de>
Date:   Wed,  9 Mar 2022 13:28:52 +0100

Refactoring: Checkbox values are always sent to the server. In the actions we must test the value with 'isTrue()'

Diffstat:
Mmodules/cms/Dispatcher.class.php | 4++--
Mmodules/cms/action/PageAction.class.php | 8++++----
Mmodules/cms/action/PageelementAction.class.php | 50++++++++++++++++++++++----------------------------
Mmodules/cms/action/RequestParams.class.php | 45++++++---------------------------------------
Mmodules/cms/action/element/ElementAdvancedAction.class.php | 111++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------
Mmodules/cms/action/element/ElementRemoveAction.class.php | 3---
Mmodules/cms/action/file/FileEditAction.class.php | 4++--
Mmodules/cms/action/folder/FolderAdvancedAction.class.php | 6+++---
Mmodules/cms/action/folder/FolderCreatefileAction.class.php | 7+++----
Mmodules/cms/action/folder/FolderCreateimageAction.class.php | 3+--
Mmodules/cms/action/folder/FolderCreatetextAction.class.php | 50+++++++++++++++++++++-----------------------------
Mmodules/cms/action/folder/FolderPubAction.class.php | 8++++----
Mmodules/cms/action/folder/FolderRemoveAction.class.php | 14++++++++------
Mmodules/cms/action/group/GroupMembershipsAction.class.php | 4++--
Mmodules/cms/action/image/ImageSizeAction.class.php | 16++++++++--------
Mmodules/cms/action/language/LanguagePropAction.class.php | 8+++++---
Mmodules/cms/action/login/LoginLoginAction.class.php | 2+-
Mmodules/cms/action/login/LoginOidcAction.class.php | 6++----
Mmodules/cms/action/model/ModelPropAction.class.php | 6+++---
Mmodules/cms/action/model/ModelRemoveAction.class.php | 2+-
Mmodules/cms/action/object/ObjectAclformAction.class.php | 22+++++++++++-----------
Mmodules/cms/action/object/ObjectInheritAction.class.php | 2+-
Mmodules/cms/action/object/ObjectNameAction.class.php | 14+++++++++-----
Mmodules/cms/action/object/ObjectPropAction.class.php | 13++++++-------
Mmodules/cms/action/object/ObjectSettingsAction.class.php | 27+++++++++++++++++++--------
Mmodules/cms/action/page/PageAllAction.class.php | 8++++----
Mmodules/cms/action/profile/ProfileEditAction.class.php | 4++--
Mmodules/cms/action/project/ProjectCopyAction.class.php | 2+-
Mmodules/cms/action/search/SearchEditAction.class.php | 12++++++------
Mmodules/cms/action/template/TemplateAddelAction.class.php | 2+-
Mmodules/cms/action/template/TemplatePropAction.class.php | 8+++++---
Mmodules/cms/action/text/TextValueAction.class.php | 2+-
Mmodules/cms/action/user/UserMembershipsAction.class.php | 4++--
Mmodules/cms/action/user/UserPropAction.class.php | 2+-
Mmodules/cms/action/user/UserPwAction.class.php | 4++--
Dmodules/cms/base/HttpRequest.class.php | 19-------------------
Dmodules/cms/base/HttpResponse.class.php | 11-----------
Mmodules/cms/ui/action/tree/TreeBranchAction.class.php | 4++--
Mmodules/cms/ui/themes/default/html/views/element/advanced.php | 12++++++++----
Mmodules/cms/ui/themes/default/html/views/element/remove.php | 3++-
Mmodules/cms/ui/themes/default/html/views/file/remove.php | 3++-
Mmodules/cms/ui/themes/default/html/views/folder/advanced.php | 6++++--
Mmodules/cms/ui/themes/default/html/views/folder/pub.php | 12++++++++----
Mmodules/cms/ui/themes/default/html/views/folder/remove.php | 6++++--
Mmodules/cms/ui/themes/default/html/views/group/memberships.php | 12+++++-------
Mmodules/cms/ui/themes/default/html/views/group/memberships.tpl.src.xml | 10++--------
Mmodules/cms/ui/themes/default/html/views/group/remove.php | 3++-
Mmodules/cms/ui/themes/default/html/views/image/size.php | 3++-
Mmodules/cms/ui/themes/default/html/views/language/prop.php | 3++-
Mmodules/cms/ui/themes/default/html/views/language/remove.php | 3++-
Mmodules/cms/ui/themes/default/html/views/link/remove.php | 3++-
Mmodules/cms/ui/themes/default/html/views/login/login.php | 3++-
Mmodules/cms/ui/themes/default/html/views/model/prop.php | 3++-
Mmodules/cms/ui/themes/default/html/views/model/remove.php | 3++-
Mmodules/cms/ui/themes/default/html/views/object/aclform.php | 3++-
Mmodules/cms/ui/themes/default/html/views/object/inherit.php | 3++-
Mmodules/cms/ui/themes/default/html/views/page/all.php | 6++++--
Mmodules/cms/ui/themes/default/html/views/page/name.php | 6+++++-
Mmodules/cms/ui/themes/default/html/views/page/name.tpl.src.xml | 2+-
Mmodules/cms/ui/themes/default/html/views/page/pub.php | 3++-
Mmodules/cms/ui/themes/default/html/views/page/remove.php | 3++-
Mmodules/cms/ui/themes/default/html/views/pageelement/link.php | 16++++++++--------
Mmodules/cms/ui/themes/default/html/views/pageelement/link.tpl.src.xml | 12++----------
Mmodules/cms/ui/themes/default/html/views/pageelement/pub.php | 3++-
Mmodules/cms/ui/themes/default/html/views/pageelement/value.php | 6++++--
Mmodules/cms/ui/themes/default/html/views/profile/edit.php | 6++++--
Mmodules/cms/ui/themes/default/html/views/project/prop.php | 15++++++++++-----
Mmodules/cms/ui/themes/default/html/views/project/remove.php | 3++-
Mmodules/cms/ui/themes/default/html/views/search/edit.php | 15++++++++++-----
Mmodules/cms/ui/themes/default/html/views/template/addel.php | 3++-
Mmodules/cms/ui/themes/default/html/views/template/prop.php | 3++-
Mmodules/cms/ui/themes/default/html/views/template/remove.php | 3++-
Mmodules/cms/ui/themes/default/html/views/template/src.php | 3++-
Mmodules/cms/ui/themes/default/html/views/text/value.php | 3++-
Mmodules/cms/ui/themes/default/html/views/url/remove.php | 3++-
Mmodules/cms/ui/themes/default/html/views/user/info.php | 6++++--
Mmodules/cms/ui/themes/default/html/views/user/memberships.php | 12+++++-------
Mmodules/cms/ui/themes/default/html/views/user/memberships.tpl.src.xml | 10++--------
Mmodules/cms/ui/themes/default/html/views/user/prop.php | 9++++++---
Mmodules/cms/ui/themes/default/html/views/user/pw.php | 6++++--
Mmodules/cms/ui/themes/default/html/views/user/remove.php | 3++-
Mmodules/cms/ui/themes/default/script/openrat/components.js | 8+++++---
Mmodules/cms/ui/themes/default/script/openrat/components.min.js | 8+++++---
Mmodules/template_engine/components/html/component_checkbox/CheckboxComponent.class.php | 5++++-
Amodules/template_engine/components/html/component_checkbox/checkbox.js | 14++++++++++++++
Amodules/template_engine/components/html/component_checkbox/checkbox.min.js | 7+++++++
86 files changed, 422 insertions(+), 391 deletions(-)

diff --git a/modules/cms/Dispatcher.class.php b/modules/cms/Dispatcher.class.php @@ -430,8 +430,8 @@ class Dispatcher $possibleDbIds = []; - if ( $this->request->has(RequestParams::PARAM_DATABASE_ID ) ) - $possibleDbIds[] = $this->request->getDatabaseId(); + if ( $databaseId = $this->request->getDatabaseId() ) + $possibleDbIds[] = $databaseId; if ( Session::getDatabaseId() ) $possibleDbIds[] = Session::getDatabaseId(); diff --git a/modules/cms/action/PageAction.class.php b/modules/cms/action/PageAction.class.php @@ -104,11 +104,11 @@ class PageAction extends ObjectAction $context = new PageContext( $this->page->objectid,$scheme ); - if ( $this->request->hasLanguageId()) - $context->languageId = $this->request->getLanguageId(); + if ( $languageId = $this->request->getLanguageId()) + $context->languageId = $languageId; - if ( $this->request->hasModelId()) - $context->modelId = $this->request->getModelId(); + if ( $modelId = $this->request->getModelId()) + $context->modelId = $modelId; if ( !$context->languageId ) $context->languageId = $this->page->getProject()->getDefaultLanguageId(); diff --git a/modules/cms/action/PageelementAction.class.php b/modules/cms/action/PageelementAction.class.php @@ -126,12 +126,12 @@ class PageelementAction extends BaseAction $this->element = new Element( $elementid ); } - if ( $this->request->has('languageid')) { + if ( $languageId = $this->request->getLanguageId() ) { $this->pageContent = new PageContent(); - $this->pageContent->pageId = $this->page->pageid; - $this->pageContent->elementId = $this->element->elementid; - $this->pageContent->languageid = $this->request->getNumber('languageid'); + $this->pageContent->pageId = $this->page->pageid; + $this->pageContent->elementId = $this->element->elementid; + $this->pageContent->languageid = $languageId; $this->pageContent->load(); } @@ -150,11 +150,11 @@ class PageelementAction extends BaseAction $pageContext = new PageContext( $this->page->objectid,$scheme ); - if ( $this->request->hasLanguageId()) - $pageContext->languageId = $this->request->getLanguageId(); + if ( $languageId = $this->request->getLanguageId()) + $pageContext->languageId = $languageId; - if ( $this->request->hasModelId()) - $pageContext->modelId = $this->request->getModelId(); + if ( $modelId = $this->request->getModelId()) + $pageContext->modelId = $modelId; if ( !$pageContext->languageId ) $pageContext->languageId = $this->page->getProject()->getDefaultLanguageId(); @@ -292,9 +292,9 @@ class PageelementAction extends BaseAction */ protected function editLongtext() { - if ( $this->request->has('format') ) + if ( $f = $this->request->getNumber('format') ) // Individual format from request. - $format = $this->request->getNumber('format'); + $format = $f; elseif ( $this->value->format != null ) $format = $this->value->format; else @@ -331,11 +331,8 @@ class PageelementAction extends BaseAction $value->contentid = $this->pageContent->contentId; $value->load(); - if ( !$this->request->has('elementid') ) - throw new ValidationException('elementid'); - - if ( $this->request->has('linkobjectid') ) - $value->linkToObjectId = $this->request->getText('linkobjectid'); + if ( $linkObjectId = $this->request->getNumber('linkobjectid') ) + $value->linkToObjectId = $linkObjectId; else $value->text = $this->request->getRaw('text'); @@ -360,7 +357,7 @@ class PageelementAction extends BaseAction // Inhalt sofort freigegeben, wenn // - Recht vorhanden // - Freigabe gewuenscht - $value->publish = $this->page->hasRight( Permission::ACL_RELEASE ) && $this->request->has('release'); + $value->publish = $this->page->hasRight( Permission::ACL_RELEASE ) && $this->request->isTrue('release'); // Up-To-Date-Check $content = new Content( $this->pageContent->contentId ); @@ -399,7 +396,7 @@ class PageelementAction extends BaseAction $this->page->setTimestamp(); // "Letzte Aenderung" setzen // Falls ausgewaehlt die Seite sofort veroeffentlichen - if ( $this->page->hasRight( Permission::ACL_PUBLISH ) && $this->request->has('publish') ) + if ( $this->page->hasRight( Permission::ACL_PUBLISH ) && $this->request->isTrue('publish') ) { $this->publishPage(); } @@ -417,7 +414,7 @@ class PageelementAction extends BaseAction $value->contentid = $this->pageContent->contentId; $value->load(); - if ( $this->request->has('format') ) + if ( $this->request->isTrue('format') ) $value->format = $this->request->getNumber('format'); else // Fallback: Format of the element. @@ -439,8 +436,8 @@ class PageelementAction extends BaseAction $value = new Value(); $value->contentid = $this->pageContent->contentId; - if ( $this->request->has('linkobjectid') ) - $value->linkToObjectId = $this->request->getText('linkobjectid'); + if ( $linkTo = $this->request->getNumber('linkobjectid') ) + $value->linkToObjectId = $linkTo; else { $value->date = strtotime( $this->request->getText( 'date' ).' '.$this->request->getText( 'time' ) ); @@ -462,10 +459,7 @@ class PageelementAction extends BaseAction $value->contentid = $this->pageContent->contentId; $value->load(); - if ( !$this->request->has('elementid') ) - throw new ValidationException('elementid'); - - $value->text = $this->request->getText('text'); + $value->text = $this->request->getRequiredText('text'); $this->afterSave($value); } @@ -484,8 +478,8 @@ class PageelementAction extends BaseAction $value->load(); - if ( $this->request->has('linkurl') ) - $value->linkToObjectId = $this->parseSimpleOID($this->request->getText('linkurl')); + if ( $linkUrl = $this->request->getText('linkurl') ) + $value->linkToObjectId = $this->parseSimpleOID($linkUrl); else $value->linkToObjectId = intval($this->request->getText('linkobjectid')); @@ -535,8 +529,8 @@ class PageelementAction extends BaseAction $value->contentid = $this->pageContent->contentId; - if ( $this->request->has('linkobjectid') ) - $value->linkToObjectId = $this->request->getText('linkobjectid'); + if ( $linkTo = $this->request->getText('linkobjectid') ) + $value->linkToObjectId = $linkTo; else $value->number = $this->request->getText('number') * pow(10,$this->element->decimals); diff --git a/modules/cms/action/RequestParams.class.php b/modules/cms/action/RequestParams.class.php @@ -214,8 +214,8 @@ class RequestParams /** - * @param $varName - * @param $callback + * @param $varName string name of request parameter + * @param $callback callable only called if the request parameter is given by the client */ public function handleText( $varName,$callback ) { @@ -237,19 +237,9 @@ class RequestParams * @param $varName * @param $callback */ - public function handleBool( $varName,$callback ) { + public function handleBool($varName, $callback ) { - if ( $this->hasKey($varName ) ) - call_user_func( $callback, in_array( $this->getText($varName),['1','true','on']) ); - } - - /** - * @param $varName - * @param $callback - */ - public function handleBoolDefaultFalse( $varName,$callback ) { - - call_user_func( $callback, in_array( $this->getText($varName),['1','true','on']) ); + call_user_func( $callback, $this->isTrue($varName) ); } @@ -274,26 +264,13 @@ class RequestParams * @param String $varName Schl�ssel * @return boolean true, falls vorhanden. */ - public function hasKey($varName) + protected function hasKey($varName) { return isset( $this->parameter[$varName] ); } /** - * Ermittelt, ob der aktuelle Request eine Variable mit dem - * angegebenen Namen enth�lt. - * - * @param String $varName Schl�ssel - * @return boolean true, falls vorhanden. - */ - public function has($varName) - { - return (isset($this->parameter[$varName]) && (!empty($this->parameter[$varName]) || $this->parameter[$varName] == '0')); - } - - - /** * Gets the ID for the current action. * * @return Integer @@ -328,7 +305,7 @@ class RequestParams */ public function isTrue( $varName ) { - return boolval($this->getValue( $varName )); + return in_array( $this->getValue($varName),['1','true','on']); } @@ -349,22 +326,12 @@ class RequestParams } - public function hasLanguageId() - { - return $this->has(self::PARAM_LANGUAGE_ID); - } - public function getLanguageId() { return $this->getNumber(self::PARAM_LANGUAGE_ID); } - public function hasModelId() - { - return $this->has(self::PARAM_MODEL_ID); - } - public function getModelId() { return $this->getNumber(self::PARAM_MODEL_ID ); diff --git a/modules/cms/action/element/ElementAdvancedAction.class.php b/modules/cms/action/element/ElementAdvancedAction.class.php @@ -424,48 +424,77 @@ class ElementAdvancedAction extends ElementAction implements Method { public function post() { - $ini_date_format = Configuration::subset('date')->get('format',[] ); - if ( $this->request->has('format')) - $this->element->format = $this->request->getNumber('format'); - - - if ( $this->request->has('dateformat')) - $this->element->dateformat = @$ini_date_format[$this->request->getText('dateformat')]; - - - if ( $this->request->has('default_longtext')) - $this->element->defaultText = $this->request->getText('default_longtext'); - else - $this->element->defaultText = $this->request->getText('default_text'); - - $this->element->subtype = $this->request->getText('subtype'); - - $this->element->html = $this->request->has('html'); - $this->element->withIcon = $this->request->has('with_icon'); - $this->element->allLanguages = $this->request->has('all_languages'); - $this->element->writable = $this->request->has('writable'); - $this->element->inherit = $this->request->has('inherit'); - - $this->element->decimals = $this->request->getText('decimals'); - $this->element->decPoint = $this->request->getText('dec_point'); - $this->element->thousandSep = $this->request->getText('thousand_sep'); - $this->element->folderObjectId = $this->request->getText('folderobjectid' ); - $this->element->defaultObjectId = $this->request->getText('default_objectid'); - - if ( $this->request->has('select_items')) - $this->element->code = $this->request->getText('select_items'); - else - $this->element->code = $this->request->getRaw('code'); - - if ( $this->request->has('name') ) - $this->element->name = $this->request->getText('name'); - - if ( $this->request->has('linkelement') ) - $this->element->setPrefix( $this->request->getText('linkelement') ); - - if ( $this->request->has('parameters')) - $this->element->code = $this->request->getText('parameters'); + $this->request->handleNumber('format',function($value) { + $this->element->format = $value; + }); + + + $this->request->handleText('dateformat',function($value) { + $this->element->dateformat = @Configuration::subset('date')->get('format',[] )[$value]; + }); + + + $this->request->handleText('default_longtext',function($value) { + $this->element->defaultText = $value; + }); + $this->request->handleText('default_text',function($value) { + $this->element->defaultText = $value; + }); + + $this->request->handleText('subtype',function($value) { + $this->element->subtype = $value; + }); + + $this->request->handleBool('html',function($value) { + $this->element->html = $value; + }); + $this->request->handleBool('with_icon',function($value) { + $this->element->withIcon = $value; + }); + $this->request->handleBool('all_languages',function($value) { + $this->element->allLanguages = $value; + }); + $this->request->handleBool('writable',function($value) { + $this->element->writable = $value; + }); + $this->request->handleBool('inherit',function($value) { + $this->element->inherit = $value; + }); + + $this->request->handleText('decimals',function($value) { + $this->element->decimals = $value; + }); + $this->request->handleText('dec_point',function($value) { + $this->element->decPoint = $value; + }); + $this->request->handleText('thousand_sep',function($value) { + $this->element->thousandSep = $value; + }); + $this->request->handleText('folderobjectid',function($value) { + $this->element->folderObjectId = $value; + }); + $this->request->handleText('default_objectid',function($value) { + $this->element->defaultObjectId = $value; + }); + + + $this->request->handleText('select_items',function($value) { + $this->element->code = $value; + }); + $this->request->handleText('code',function($value) { + $this->element->code = $value; + }); + + $this->request->handleText('name',function($value) { + $this->element->name = $value; + }); + $this->request->handleText('linkelement',function($value) { + $this->element->setPrefix( $value ); + }); + $this->request->handleText('parameters',function($value) { + $this->element->code = $value; + }); $this->element->save(); $this->addNoticeFor( $this->element, Messages::SAVED); diff --git a/modules/cms/action/element/ElementRemoveAction.class.php b/modules/cms/action/element/ElementRemoveAction.class.php @@ -12,9 +12,6 @@ class ElementRemoveAction extends ElementAction implements Method { } public function post() { - if ( !$this->request->has('confirm') ) - throw new \util\exception\ValidationException('confirm'); - $type = $this->request->getAlphanum('type'); if ( $type == 'value' ) diff --git a/modules/cms/action/file/FileEditAction.class.php b/modules/cms/action/file/FileEditAction.class.php @@ -35,10 +35,10 @@ class FileEditAction extends FileAction implements Method { $this->file->value = $upload->value; $this->file->saveValue(); } - elseif( $this->request->has('value') ) + elseif( $value = $this->request->getText('value') ) { // File value received - $this->file->value = $this->request->getText('value'); + $this->file->value = $value; if ( strtolower($this->request->getText('encoding')) == 'base64') // file value is base64-encoded diff --git a/modules/cms/action/folder/FolderAdvancedAction.class.php b/modules/cms/action/folder/FolderAdvancedAction.class.php @@ -50,7 +50,7 @@ class FolderAdvancedAction extends FolderAction implements Method { $list[$id]['date'] = date( \cms\base\Language::lang('DATE_FORMAT'),$o->lastchangeDate ); $list[$id]['user'] = $o->lastchangeUser; - if ( $this->request->has("markall") || $this->request->has('obj'.$id) ) + if ( $this->request->isTrue("markall") || $this->request->isTrue('obj'.$id) ) $this->setTemplateVar('obj'.$id,'1'); } } @@ -137,7 +137,7 @@ class FolderAdvancedAction extends FolderAction implements Method { foreach( $ids as $id ) { // Nur, wenn Objekt ausgewaehlt wurde - if ( !$this->request->has('obj'.$id) ) + if ( !$this->request->isTrue('obj'.$id) ) continue; $o = new BaseObject( $id ); @@ -317,7 +317,7 @@ class FolderAdvancedAction extends FolderAction implements Method { case 'delete': - if ( $this->request->has('confirm') ) + if ( $this->request->isTrue('confirm') ) { switch( $o->getType() ) { diff --git a/modules/cms/action/folder/FolderCreatefileAction.class.php b/modules/cms/action/folder/FolderCreatefileAction.class.php @@ -35,9 +35,8 @@ class FolderCreatefileAction extends FolderAction implements Method { $file = new File(); // Die neue Datei wird über eine URL geladen und dann im CMS gespeichert. - if ( $this->request->has('url') ) + if ( $url = $this->request->getText('url') ) { - $url = $this->request->getText('url'); $http = new Http(); $http->setUrl( $url ); @@ -55,11 +54,11 @@ class FolderCreatefileAction extends FolderAction implements Method { $file->parentid = $this->folder->objectid; $file->projectid = $this->folder->projectid; } - elseif ( $this->request->has('value') ) + elseif ( $value = $this->request->getText('value') ) { // New file is inserted. $file->filename = BaseObject::urlify( $filename ); - $file->value = $this->request->getText('value'); + $file->value = $value; $file->size = strlen($file->value); $file->parentid = $this->folder->objectid; $file->projectid = $this->folder->projectid; diff --git a/modules/cms/action/folder/FolderCreateimageAction.class.php b/modules/cms/action/folder/FolderCreateimageAction.class.php @@ -35,9 +35,8 @@ class FolderCreateimageAction extends FolderAction implements Method { $image = new Image(); // Die neue Datei wird über eine URL geladen und dann im CMS gespeichert. - if ( $this->request->has('url') ) + if ( $url = $this->request->getText('url') ) { - $url = $this->request->getText('url'); $http = new Http(); $http->setUrl( $url ); diff --git a/modules/cms/action/folder/FolderCreatetextAction.class.php b/modules/cms/action/folder/FolderCreatetextAction.class.php @@ -27,6 +27,7 @@ class FolderCreatetextAction extends FolderAction implements Method { public function post() { + $name = $this->request->getText('name' ); $description = $this->request->getText('description'); @@ -35,9 +36,8 @@ class FolderCreatetextAction extends FolderAction implements Method { $text->projectid = $this->folder->projectid; // Die neue Datei wird über eine URL geladen und dann im CMS gespeichert. - if ( $this->request->has('url') ) + $this->request->handleText('url', function($url) use ($text) { - $url = $this->request->getText('url'); $http = new Http(); $http->setUrl( $url ); @@ -53,42 +53,34 @@ class FolderCreatetextAction extends FolderAction implements Method { $text->filename = BaseObject::urlify( basename($url) ); $text->size = strlen($http->body); $text->value = $http->body; - } - elseif ( $this->request->has('text') ) - { + }); + + $this->request->handleText('text',function($value) use ($text) { $text->filename = $this->request->getRequiredText('filename' ); $text->extension = $this->request->getRequiredText('extension'); $text->value = $this->request->getRequiredText('text' ); $text->size = strlen( $text->value ); - } - else - { - $upload = new Upload(); + }); - if ( $upload->isAvailable() ) { + $upload = new Upload(); - try - { - $upload->processUpload(); - } - catch( \Exception $e ) - { - // TODO: make a UIException? - throw $e; - } + if ( $upload->isAvailable() ) { - $text->filename = BaseObject::urlify( $upload->filename ); - $text->extension = $upload->extension; - $text->size = $upload->size; - - $text->value = $upload->value; + try + { + $upload->processUpload(); } - else { - $text->filename = $this->request->getText('filename'); - $text->extension = $this->request->getText('extension'); - $text->value = $this->request->getText('text'); - $text->size = strlen( $text->value ); + catch( \Exception $e ) + { + // TODO: make a UIException? + throw $e; } + + $text->filename = BaseObject::urlify( $upload->filename ); + $text->extension = $upload->extension; + $text->size = $upload->size; + + $text->value = $upload->value; } $text->persist(); // Datei hinzufuegen diff --git a/modules/cms/action/folder/FolderPubAction.class.php b/modules/cms/action/folder/FolderPubAction.class.php @@ -56,7 +56,7 @@ class FolderPubAction extends FolderAction implements Method { $folderList = [ $this->folder->objectid ]; // Add all subfolders to the list - if ( $this->request->has('subdirs') ) + if ( $this->request->isTrue('subdirs') ) $folderList = array_merge( $folderList, $this->folder->getAllSubFolderIds() ); foreach( $folderList as $folderId ) { @@ -65,7 +65,7 @@ class FolderPubAction extends FolderAction implements Method { $folder->load(); // Publish all pages - if ( $this->request->has('pages' ) ) { + if ( $this->request->isTrue('pages' ) ) { foreach( $folder->getPages() as $pageObjectId ) { @@ -98,7 +98,7 @@ class FolderPubAction extends FolderAction implements Method { // Publish all files - if ( $this->request->has('files' ) ) { + if ( $this->request->isTrue('files' ) ) { foreach( $folder->getFiles() as $fileid ) { @@ -117,7 +117,7 @@ class FolderPubAction extends FolderAction implements Method { // Cleanup the target directory (if supported by the underlying target) - if ( $this->request->has('clean') ) + if ( $this->request->isTrue('clean') ) $publisher->cleanOlderThan( Startup::getStartTime() ); diff --git a/modules/cms/action/folder/FolderRemoveAction.class.php b/modules/cms/action/folder/FolderRemoveAction.class.php @@ -26,13 +26,15 @@ class FolderRemoveAction extends FolderAction implements Method { // Could not delete the root folder on user request. throw new ValidationException("parent",Messages::FOLDER_ROOT); - if ( $this->request->has( 'withChildren')) - $this->folder->deleteAll(); // Delete with children + if ( $this->folder->hasChildren() ) { + if ($this->request->isTrue('withChildren')) + $this->folder->deleteAll(); // Delete with children + else + throw new ValidationException("withChildren",Messages::CONTAINS_CHILDREN); + + } else - if ( $this->folder->hasChildren() ) - throw new ValidationException("withChildren",Messages::CONTAINS_CHILDREN); - else - $this->folder->delete(); // Only delete current folder. + $this->folder->delete(); // Only delete current folder. $this->addNoticeFor($this->folder, Messages::DELETED); } diff --git a/modules/cms/action/group/GroupMembershipsAction.class.php b/modules/cms/action/group/GroupMembershipsAction.class.php @@ -39,10 +39,10 @@ class GroupMembershipsAction extends GroupAction implements Method { { $hasUser = array_key_exists($id,$groupUsers); - if ( !$hasUser && $this->request->has('user'.$id) ) + if ( !$hasUser && $this->request->isTrue('user'.$id) ) $this->group->addUser($id); - if ( $hasUser && !$this->request->has('user'.$id) ) + if ( $hasUser && !$this->request->isTrue('user'.$id) ) $this->group->delUser($id); } diff --git a/modules/cms/action/image/ImageSizeAction.class.php b/modules/cms/action/image/ImageSizeAction.class.php @@ -51,21 +51,21 @@ class ImageSizeAction extends ImageAction implements Method { public function post() { - $width = intval($this->request->getText('width' )); - $height = intval($this->request->getText('height' )); - $jpegcompression = $this->request->getText('jpeg_compression') ; - $format = $this->request->getText('format' ) ; - $factor = $this->request->getText('factor' ) ; + $width = $this->request->getNumber('width' ); + $height = $this->request->getNumber('height' ); + $jpegcompression = $this->request->getText('jpeg_compression'); + $format = $this->request->getText('format' ); + $factor = $this->request->getText('factor' ); if ( $this->request->getText('type') == 'input' && - ! $this->request->has('width' ) && - ! $this->request->has('height') ) + ! $width && + ! $height ) { $this->addWarningFor(null,Messages::INPUT_NEW_IMAGE_SIZE); throw new ValidationException('width' ); } - if ( $this->request->has('copy') ) + if ( $this->request->isTrue('copy') ) { // Datei neu anlegen. $imageFile = new Image(); diff --git a/modules/cms/action/language/LanguagePropAction.class.php b/modules/cms/action/language/LanguagePropAction.class.php @@ -15,10 +15,12 @@ class LanguagePropAction extends LanguageAction implements Method { $this->setTemplateVar('is_default',$this->language->isDefault ); } + public function post() { - if ( $this->request->has('name') ) + + if ( $name = $this->request->getText('name') ) { - $this->language->name = $this->request->getText('name' ); + $this->language->name = $name; $this->language->isoCode = $this->request->getText('isocode'); } else @@ -29,7 +31,7 @@ class LanguagePropAction extends LanguageAction implements Method { $this->language->isoCode = strtolower( $iso ); } - if ( $this->request->has('is_default') ) + if ( $this->request->isTrue('is_default') ) $this->language->setDefault(); $this->language->save(); diff --git a/modules/cms/action/login/LoginLoginAction.class.php b/modules/cms/action/login/LoginLoginAction.class.php @@ -184,7 +184,7 @@ class LoginLoginAction extends LoginAction implements Method { $this->setCookie(Action::COOKIE_DB_ID ,DB::get()->id ); $this->setCookie(Action::COOKIE_USERNAME,$user->name ); - if ( $this->request->has('remember') ) { + if ( $this->request->isTrue('remember') ) { // Sets the login token cookie $this->setCookie(Action::COOKIE_TOKEN ,$user->createNewLoginToken() ); } diff --git a/modules/cms/action/login/LoginOidcAction.class.php b/modules/cms/action/login/LoginOidcAction.class.php @@ -18,12 +18,10 @@ class LoginOidcAction extends LoginAction implements Method { public function view() { - if ( $this->request->has("id")) { - $providerName = $this->request->getAlphanum('id'); + if ( $providerName = $this->request->getAlphanum('id') ) Session::set(Session::KEY_OIDC_PROVIDER,$providerName); - }else { + else $providerName = Session::get( Session::KEY_OIDC_PROVIDER); - } $providerConfig = Configuration::subset(['security','oidc','provider',$providerName]); diff --git a/modules/cms/action/model/ModelPropAction.class.php b/modules/cms/action/model/ModelPropAction.class.php @@ -13,12 +13,12 @@ class ModelPropAction extends ModelAction implements Method { } public function post() { - if ( $this->request->has('name') ) { - $this->model->name = $this->request->getText('name'); + if ( $name = $this->request->getText('name') ) { + $this->model->name = $name; $this->model->save(); } - if ( $this->request->has('is_default') ) + if ( $this->request->isTrue('is_default') ) $this->model->setDefault(); $this->addNoticeFor( $this->model, Messages::DONE ); diff --git a/modules/cms/action/model/ModelRemoveAction.class.php b/modules/cms/action/model/ModelRemoveAction.class.php @@ -12,7 +12,7 @@ class ModelRemoveAction extends ModelAction implements Method { $this->setTemplateVar( 'name',$this->model->name ); } public function post() { - if ( $this->request->has('confirm') ) + if ( $this->request->isTrue('confirm') ) { $this->model->delete(); $this->addNoticeFor( $this->model, Messages::DONE ); diff --git a/modules/cms/action/object/ObjectAclformAction.class.php b/modules/cms/action/object/ObjectAclformAction.class.php @@ -69,17 +69,17 @@ class ObjectAclformAction extends ObjectAction implements Method { $permission->languageid = $this->request->getLanguageId(); - $permission->write = ( $this->request->has('write' ) ); - $permission->prop = ( $this->request->has('prop' ) ); - $permission->delete = ( $this->request->has('delete' ) ); - $permission->release = ( $this->request->has('release' ) ); - $permission->publish = ( $this->request->has('publish' ) ); - $permission->create_folder = ( $this->request->has('create_folder') ); - $permission->create_file = ( $this->request->has('create_file' ) ); - $permission->create_link = ( $this->request->has('create_link' ) ); - $permission->create_page = ( $this->request->has('create_page' ) ); - $permission->grant = ( $this->request->has('grant' ) ); - $permission->transmit = ( $this->request->has('transmit' ) ); + $permission->write = ( $this->request->isTrue('write' ) ); + $permission->prop = ( $this->request->isTrue('prop' ) ); + $permission->delete = ( $this->request->isTrue('delete' ) ); + $permission->release = ( $this->request->isTrue('release' ) ); + $permission->publish = ( $this->request->isTrue('publish' ) ); + $permission->create_folder = ( $this->request->isTrue('create_folder') ); + $permission->create_file = ( $this->request->isTrue('create_file' ) ); + $permission->create_link = ( $this->request->isTrue('create_link' ) ); + $permission->create_page = ( $this->request->isTrue('create_page' ) ); + $permission->grant = ( $this->request->isTrue('grant' ) ); + $permission->transmit = ( $this->request->isTrue('transmit' ) ); $permission->persist(); diff --git a/modules/cms/action/object/ObjectInheritAction.class.php b/modules/cms/action/object/ObjectInheritAction.class.php @@ -34,7 +34,7 @@ class ObjectInheritAction extends ObjectAction implements Method { $baseObject = new Folder( $this->request->getId() ); $baseObject->load(); - if ( ! $this->request->has('inherit') ) + if ( ! $this->request->isTrue('inherit') ) { $this->addWarningFor( $baseObject,Messages::NOTHING_DONE); return; diff --git a/modules/cms/action/object/ObjectNameAction.class.php b/modules/cms/action/object/ObjectNameAction.class.php @@ -19,14 +19,18 @@ class ObjectNameAction extends ObjectAction implements Method { $nameProps[ 'languageName' ] = $language->name; $this->setTemplateVars( $nameProps ); } - public function post() { - if ( ! $this->request->has('name' ) ) - throw new ValidationException('name'); + + public function post() { $name = $this->baseObject->getNameForLanguage( $this->request->getLanguageId() ); - $name->name = $this->request->getText( 'name' ); - $name->description = $this->request->getText( 'description' ); + $this->request->handleText('name',function($value) use ($name) { + $name->name = $value; + }); + + $this->request->handleText('description',function($value) use ($name) { + $name->description = $value; + }); $name->persist(); diff --git a/modules/cms/action/object/ObjectPropAction.class.php b/modules/cms/action/object/ObjectPropAction.class.php @@ -30,10 +30,7 @@ class ObjectPropAction extends ObjectAction implements Method { public function post() { - if ( ! $this->request->has('filename' ) ) - throw new ValidationException('filename'); - - $this->baseObject->filename = BaseObject::urlify( $this->request->getText('filename') ); + $this->baseObject->filename = BaseObject::urlify( $this->request->getRequiredText('filename') ); $this->baseObject->save(); $alias = $this->baseObject->getAliasForLanguage(null); @@ -48,9 +45,11 @@ class ObjectPropAction extends ObjectAction implements Method { // Should we do this? - if ( $this->request->has('creationTimestamp') && $this->userIsAdmin() ) - $this->baseObject->createDate = $this->request->getNumber('creationTimestamp'); - $this->baseObject->setCreationTimestamp(); + if ( $this->userIsAdmin() ) + $this->request->handleNumber('creationTimestamp',function($value) { + $this->baseObject->createDate = $value; + $this->baseObject->setCreationTimestamp(); + }); $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 @@ -5,6 +5,7 @@ use cms\action\Method; use cms\action\ObjectAction; use cms\model\Permission; use language\Messages; +use template_engine\components\html\component_else\ElseComponent; use util\exception\ValidationException; @@ -28,19 +29,20 @@ class ObjectSettingsAction extends ObjectAction implements Method { } catch( \Exception $e ) { + $this->addWarningFor( $this->baseObject,"Invalid YAML"); throw new ValidationException( 'settings' ); } // Gültigkeitszeiträume speichern. - if ($this->request->has( 'valid_from_date' )) - $this->baseObject->validFromDate = strtotime( $this->request->getText( 'valid_from_date' ).' '.$this->request->getText( 'valid_from_time' ) ); - else - $this->baseObject->validFromDate = null; + $this->baseObject->validFromDate = $this->toTimestamp( + $this->request->getText( 'valid_from_date' ), + $this->request->getText( 'valid_from_time' ) + ); - if ($this->request->has( 'valid_until_date')) - $this->baseObject->validToDate = strtotime( $this->request->getText( 'valid_until_date').' '.$this->request->getText( 'valid_until_time') ); - else - $this->baseObject->validToDate = null; + $this->baseObject->validToDate = $this->toTimestamp( + $this->request->getText( 'valid_until_date'), + $this->request->getText( 'valid_until_time') + ); $this->baseObject->save(); @@ -49,6 +51,15 @@ class ObjectSettingsAction extends ObjectAction implements Method { } + protected function toTimestamp( $date, $time ) { + if ( $date && $time ) + return strtotime( $date.' '.$time ); + if ( $date ) + return strtotime( $date ); + else + return null; + } + /** * @return int Permission-flag. diff --git a/modules/cms/action/page/PageAllAction.class.php b/modules/cms/action/page/PageAllAction.class.php @@ -151,9 +151,9 @@ class PageAllAction extends PageAction implements Method { break; case Element::ELEMENT_TYPE_LONGTEXT: - if ($this->request->has('format')) + if ($requestFormat = $this->request->getText('format')) // Individual format from request. - $format = $this->request->getNumber('format'); + $format = $requestFormat; elseif ($value->format != null) $format = $value->format; else @@ -244,7 +244,7 @@ class PageAllAction extends PageAction implements Method { // Inhalt sofort freigegeben, wenn // - Recht vorhanden // - Freigabe gewuenscht - $value->publish = $this->page->hasRight(Permission::ACL_RELEASE) && $this->request->has('release'); + $value->publish = $this->page->hasRight(Permission::ACL_RELEASE) && $this->request->isTrue('release'); // Up-To-Date-Check $content = new Content( $pageContent->contentId ); @@ -287,7 +287,7 @@ class PageAllAction extends PageAction implements Method { } // Falls ausgewaehlt die Seite sofort veroeffentlichen - if ($this->page->hasRight(Permission::ACL_PUBLISH) && $this->request->has('publish')) { + if ($this->page->hasRight(Permission::ACL_PUBLISH) && $this->request->isTrue('publish')) { $this->publishPage( $languageid ); } diff --git a/modules/cms/action/profile/ProfileEditAction.class.php b/modules/cms/action/profile/ProfileEditAction.class.php @@ -77,11 +77,11 @@ class ProfileEditAction extends ProfileAction implements Method { $this->user->timezone = $value; }); - $this->request->handleBoolDefaultFalse('hotp',function($value) { + $this->request->handleBool('hotp',function($value) { $this->user->hotp = $value; }); - $this->request->handleBoolDefaultFalse('totp',function($value) { + $this->request->handleBool('totp',function($value) { $this->user->totp = $value; }); diff --git a/modules/cms/action/project/ProjectCopyAction.class.php b/modules/cms/action/project/ProjectCopyAction.class.php @@ -25,7 +25,7 @@ class ProjectCopyAction extends ProjectAction implements Method { $this->setTemplateVar( 'dbids',$dbids ); - if ( $this->request->has('ok') ) + if ( $this->request->isTrue('ok') ) { $this->project->export( $this->request->getDatabaseId() ); diff --git a/modules/cms/action/search/SearchEditAction.class.php b/modules/cms/action/search/SearchEditAction.class.php @@ -13,7 +13,7 @@ class SearchEditAction extends SearchAction implements Method { $searchConfig = Configuration::subset('search')->subset('quicksearch'); $flag = $searchConfig->subset('flag'); - $initial = ! $this->request->has('repeat'); + $initial = ! $this->request->isTrue('repeat'); if ( $initial ) { $searchById = $flag->is('id' ); @@ -22,11 +22,11 @@ class SearchEditAction extends SearchAction implements Method { $searchByDesc = $flag->is('description'); $searchByContent = $flag->is('content' ); } else { - $searchById = $this->request->has('oid' ); - $searchByName = $this->request->has('name' ); - $searchByFilename = $this->request->has('filename' ); - $searchByDesc = $this->request->has('description'); - $searchByContent = $this->request->has('content' ); + $searchById = $this->request->isTrue('oid' ); + $searchByName = $this->request->isTrue('name' ); + $searchByFilename = $this->request->isTrue('filename' ); + $searchByDesc = $this->request->isTrue('description'); + $searchByContent = $this->request->isTrue('content' ); } $this->setTemplateVar('oid' ,$searchById ); diff --git a/modules/cms/action/template/TemplateAddelAction.class.php b/modules/cms/action/template/TemplateAddelAction.class.php @@ -39,7 +39,7 @@ class TemplateAddelAction extends TemplateAction implements Method { $newElement = $this->template->addElement( $name,$this->request->getText('description'),$this->request->getText('typeid') ); - if ( $this->request->has('addtotemplate') ) + if ( $this->request->isTrue('addtotemplate') ) { $project = new Project( $this->template->projectid); $modelIds = $project->getModelIds(); diff --git a/modules/cms/action/template/TemplatePropAction.class.php b/modules/cms/action/template/TemplatePropAction.class.php @@ -1,6 +1,5 @@ <?php namespace cms\action\template; -use cms\action\Action; use cms\action\Method; use cms\action\TemplateAction; use language\Messages; @@ -18,8 +17,11 @@ class TemplatePropAction extends TemplateAction implements Method { public function post() { - $this->template->name = $this->request->getRequiredText('name'); - $this->template->publish = $this->request->has('publish'); + $this->request->handleText('name',function($value) { + $this->template->name = $value; + }); + + $this->template->publish = $this->request->isTrue('publish'); $this->template->save(); $this->addNoticeFor($this->template,Messages::SAVED); diff --git a/modules/cms/action/text/TextValueAction.class.php b/modules/cms/action/text/TextValueAction.class.php @@ -22,7 +22,7 @@ class TextValueAction extends TextAction implements Method { public function post() { $this->text->value = $this->request->getText('text'); - $this->text->public = $this->request->has('release'); + $this->text->public = $this->request->isTrue('release'); $this->text->saveValue(); $this->addNoticeFor($this->text,Messages::VALUE_SAVED); diff --git a/modules/cms/action/user/UserMembershipsAction.class.php b/modules/cms/action/user/UserMembershipsAction.class.php @@ -37,10 +37,10 @@ class UserMembershipsAction extends UserAction implements Method { { $hasGroup = array_key_exists($id,$userGroups); - if ( !$hasGroup && $this->request->has('group'.$id) ) + if ( !$hasGroup && $this->request->isTrue('group'.$id) ) $this->user->addGroup($id); - if ( $hasGroup && !$this->request->has('group'.$id) ) + if ( $hasGroup && !$this->request->isTrue('group'.$id) ) $this->user->delGroup($id); } diff --git a/modules/cms/action/user/UserPropAction.class.php b/modules/cms/action/user/UserPropAction.class.php @@ -56,7 +56,7 @@ class UserPropAction extends UserAction implements Method { $this->user->fullname = $fullname; }); - $this->request->handleBoolDefaultFalse('is_admin', function($isAdmin) { + $this->request->handleBool('is_admin', function($isAdmin) { $this->user->isAdmin = $isAdmin; }); diff --git a/modules/cms/action/user/UserPwAction.class.php b/modules/cms/action/user/UserPwAction.class.php @@ -27,10 +27,10 @@ class UserPwAction extends UserAction implements Method { if ( strlen($password) < Configuration::subset(['security','password'])->get('min_length',8) ) throw new ValidationException('password',Messages::PASSWORD_MINLENGTH ); - $this->user->setPassword($password,!$this->request->has('timeout') ); // Kennwort setzen + $this->user->setPassword($password,!$this->request->isTrue('timeout') ); // Kennwort setzen // E-Mail mit dem neuen Kennwort an Benutzer senden - if ( $this->request->has('email') && + if ( $this->request->isTrue('email') && $this->user->mail && // user has an e-mail. Configuration::subset('mail')->is('enabled',true) ) { diff --git a/modules/cms/base/HttpRequest.class.php b/modules/cms/base/HttpRequest.class.php @@ -1,18 +0,0 @@ -<?php - - -namespace modules\cms\base; - - -class HttpRequest -{ - - public static function isPost() { - - return $_SERVER['REQUEST_METHOD'] == 'POST'; - } - - public static function getToken() { - return $_REQUEST['REQUEST_METHOD'] == 'POST'; - } -} -\ No newline at end of file diff --git a/modules/cms/base/HttpResponse.class.php b/modules/cms/base/HttpResponse.class.php @@ -1,10 +0,0 @@ -<?php - - -namespace modules\cms\base; - - -class HttpResponse -{ - -} -\ No newline at end of file diff --git a/modules/cms/ui/action/tree/TreeBranchAction.class.php b/modules/cms/ui/action/tree/TreeBranchAction.class.php @@ -26,8 +26,8 @@ class TreeBranchAction extends TreeAction implements Method { try { $method = new \ReflectionMethod($tree,$type); - if ( $this->request->has('id')) - $method->invoke($tree, $this->request->getId() ); + if ( $id = $this->request->getId() ) + $method->invoke($tree, $id ); else $method->invoke($tree); // <== Executing the Action } diff --git a/modules/cms/ui/themes/default/html/views/element/advanced.php b/modules/cms/ui/themes/default/html/views/element/advanced.php @@ -39,7 +39,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('with_icon') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$with_icon){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$with_icon){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('with_icon') ?>" <?php if(@$with_icon){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('EL_PROP_WITH_ICON').'') ?></span> </label> </div> @@ -50,7 +51,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('inherit') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$inherit){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$inherit){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('inherit') ?>" <?php if(@$inherit){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('EL_PROP_INHERIT').'') ?></span> </label> </div> @@ -61,7 +63,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('all_languages') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$all_languages){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$all_languages){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('all_languages') ?>" <?php if(@$all_languages){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('EL_PROP_ALL_LANGUAGES').'') ?></span> </label> </div> @@ -72,7 +75,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('writable') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$writable){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$writable){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('writable') ?>" <?php if(@$writable){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('EL_PROP_writable').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/element/remove.php b/modules/cms/ui/themes/default/html/views/element/remove.php @@ -28,7 +28,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('confirm') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$confirm){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> required="<?php echo O::escapeHtml('required') ?>" class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$confirm){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> required="<?php echo O::escapeHtml('required') ?>" class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('confirm') ?>" <?php if(@$confirm){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CONFIRM_DELETE').'') ?></span> </label> <label><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/file/remove.php b/modules/cms/ui/themes/default/html/views/file/remove.php @@ -11,7 +11,8 @@ <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@$name.'') ?></span> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('delete') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$delete){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> required="<?php echo O::escapeHtml('required') ?>" class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$delete){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> required="<?php echo O::escapeHtml('required') ?>" class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('delete') ?>" <?php if(@$delete){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('DELETE').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/folder/advanced.php b/modules/cms/ui/themes/default/html/views/folder/advanced.php @@ -28,7 +28,8 @@ <td><?php echo O::escapeHtml('') ?> <?php $if7=($writable); if($if7) { ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml(''.@$id.'') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$$id){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$$id){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml(''.@$id.'') ?>" <?php if(@$$id){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@$name.'') ?></span> </label> <?php } ?> @@ -72,7 +73,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('confirm') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$confirm){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$confirm){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('confirm') ?>" <?php if(@$confirm){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CONFIRM_DELETE').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/folder/pub.php b/modules/cms/ui/themes/default/html/views/folder/pub.php @@ -23,7 +23,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('pages') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$pages){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$pages){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('pages') ?>" <?php if(@$pages){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('pages').'') ?></span> </label> </div> @@ -34,7 +35,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('files') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$files){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$files){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('files') ?>" <?php if(@$files){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('files').'') ?></span> </label> </div> @@ -54,7 +56,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('subdirs') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$subdirs){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$subdirs){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('subdirs') ?>" <?php if(@$subdirs){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('PUBLISH_WITH_SUBDIRS').'') ?></span> </label> </div> @@ -65,7 +68,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('clean') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$clean){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$clean){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('clean') ?>" <?php if(@$clean){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CLEAN_AFTER_PUBLISH').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/folder/remove.php b/modules/cms/ui/themes/default/html/views/folder/remove.php @@ -21,11 +21,13 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('delete') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$delete){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$delete){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('delete') ?>" <?php if(@$delete){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('DELETE').'') ?></span> </label> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('withChildren') ?>" disabled="<?php echo O::escapeHtml('disabled') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$withChildren){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" disabled="<?php echo O::escapeHtml('disabled') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$withChildren){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('withChildren') ?>" <?php if(@$withChildren){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('DELETE_WITH_CHILDREN').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/group/memberships.php b/modules/cms/ui/themes/default/html/views/group/memberships.php @@ -13,20 +13,18 @@ <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table class="<?php echo O::escapeHtml('or-table') ?>"><?php echo O::escapeHtml('') ?> <tr class="<?php echo O::escapeHtml('or-table-header') ?>"><?php echo O::escapeHtml('') ?> - <th class="<?php echo O::escapeHtml('or-table-column-action') ?>"><?php echo O::escapeHtml('') ?></th> <th><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-user') ?>"><?php echo O::escapeHtml('') ?></i> <span><?php echo O::escapeHtml(''.@O::lang('name').'') ?></span> </th> </tr> <?php foreach((array)@$memberships as $list_key=>$list_value) { extract($list_value); ?> <tr class="<?php echo O::escapeHtml('or-data') ?>"><?php echo O::escapeHtml('') ?> <td><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml(''.@$var.'') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$$var){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> - </td> - <td><?php echo O::escapeHtml('') ?> - <label class="<?php echo O::escapeHtml('or-label') ?>"><?php echo O::escapeHtml('') ?> - <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-user') ?>"><?php echo O::escapeHtml('') ?></i> - <span><?php echo O::escapeHtml(''.@$name.'') ?></span> + <label><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$$var){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml(''.@$var.'') ?>" <?php if(@$$var){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> + <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@$name.'') ?></span> </label> </td> </tr> diff --git a/modules/cms/ui/themes/default/html/views/group/memberships.tpl.src.xml b/modules/cms/ui/themes/default/html/views/group/memberships.tpl.src.xml @@ -2,21 +2,15 @@ <form autosave="true"> <table> <row header="true"> - <column header="true" class="table-column-action" /> <column header="true"> + <image action="user"/> <text value="${message:name}"/> </column> </row> <list list="${memberships}" extract="true"> <row class="data"> <column> - <checkbox name="${var}"/> - </column> - <column> - <label for="${var}"> - <image action="user"/> - <text value="${name}"/> - </label> + <checkbox name="${var}" label="${name}" /> </column> </row> </list> diff --git a/modules/cms/ui/themes/default/html/views/group/remove.php b/modules/cms/ui/themes/default/html/views/group/remove.php @@ -23,7 +23,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('confirm') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$confirm){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> required="<?php echo O::escapeHtml('required') ?>" class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$confirm){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> required="<?php echo O::escapeHtml('required') ?>" class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('confirm') ?>" <?php if(@$confirm){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('DELETE').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/image/size.php b/modules/cms/ui/themes/default/html/views/image/size.php @@ -98,7 +98,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('copy') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$copy){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$copy){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('copy') ?>" <?php if(@$copy){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('copy').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/language/prop.php b/modules/cms/ui/themes/default/html/views/language/prop.php @@ -22,7 +22,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('is_default') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$is_default){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$is_default){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('is_default') ?>" <?php if(@$is_default){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('is_default').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/language/remove.php b/modules/cms/ui/themes/default/html/views/language/remove.php @@ -30,7 +30,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('confirm') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$confirm){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> required="<?php echo O::escapeHtml('required') ?>" class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$confirm){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> required="<?php echo O::escapeHtml('required') ?>" class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('confirm') ?>" <?php if(@$confirm){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CONFIRM_DELETE').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/link/remove.php b/modules/cms/ui/themes/default/html/views/link/remove.php @@ -11,7 +11,8 @@ <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@$name.'') ?></span> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('delete') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$delete){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> required="<?php echo O::escapeHtml('required') ?>" class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$delete){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> required="<?php echo O::escapeHtml('required') ?>" class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('delete') ?>" <?php if(@$delete){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('DELETE').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/login/login.php b/modules/cms/ui/themes/default/html/views/login/login.php @@ -71,7 +71,8 @@ <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--visible or-act-make-visible or-btn') ?>"><?php echo O::escapeHtml('') ?></i> </span> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('remember') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$remember){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$remember){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('remember') ?>" <?php if(@$remember){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('REMEMBER_ME').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/model/prop.php b/modules/cms/ui/themes/default/html/views/model/prop.php @@ -16,7 +16,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('is_default') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$is_default){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$is_default){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('is_default') ?>" <?php if(@$is_default){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('is_default').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/model/remove.php b/modules/cms/ui/themes/default/html/views/model/remove.php @@ -30,7 +30,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('confirm') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$confirm){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> required="<?php echo O::escapeHtml('required') ?>" class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$confirm){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> required="<?php echo O::escapeHtml('required') ?>" class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('confirm') ?>" <?php if(@$confirm){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CONFIRM_DELETE').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/object/aclform.php b/modules/cms/ui/themes/default/html/views/object/aclform.php @@ -105,7 +105,8 @@ <?php { unset($$t) ?> <?php } ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml(''.@$t.'') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$$t){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$$t){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml(''.@$t.'') ?>" <?php if(@$$t){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('acl_'.@$t.'').'') ?></span> </label> <?php } ?> diff --git a/modules/cms/ui/themes/default/html/views/object/inherit.php b/modules/cms/ui/themes/default/html/views/object/inherit.php @@ -20,7 +20,8 @@ <?php { $inherit= 1; ?> <?php } ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('inherit') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$inherit){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$inherit){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('inherit') ?>" <?php if(@$inherit){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('inherit_rights').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/page/all.php b/modules/cms/ui/themes/default/html/views/page/all.php @@ -154,7 +154,8 @@ <?php $if5=(isset($release)); if($if5) { ?> <div class="<?php echo O::escapeHtml('or-') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('release') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$release){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$release){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('release') ?>" <?php if(@$release){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('RELEASE').'') ?></span> </label> </div> @@ -162,7 +163,8 @@ <?php $if5=(isset($publish)); if($if5) { ?> <div class="<?php echo O::escapeHtml('or-') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('publish') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$publish){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$publish){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('publish') ?>" <?php if(@$publish){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('PAGE_PUBLISH_AFTER_SAVE').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/page/name.php b/modules/cms/ui/themes/default/html/views/page/name.php @@ -54,7 +54,11 @@ <section class="<?php echo O::escapeHtml('or-fieldset') ?>"><?php echo O::escapeHtml('') ?> <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml(''.@O::lang('leave_link').'') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('leave_link') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$leave_link){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <label><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$leave_link){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('leave_link') ?>" <?php if(@$leave_link){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> + <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('leave_link').'') ?></span> + </label> </div> </section> </div> diff --git a/modules/cms/ui/themes/default/html/views/page/name.tpl.src.xml b/modules/cms/ui/themes/default/html/views/page/name.tpl.src.xml @@ -20,7 +20,7 @@ <selectbox name="alias_folderid" list="folders"/> </fieldset> <fieldset label="${message:leave_link}"> - <checkbox name="leave_link" default="0"/> + <checkbox name="leave_link" default="0" label="${message:leave_link}" /> </fieldset> </group> </form> diff --git a/modules/cms/ui/themes/default/html/views/page/pub.php b/modules/cms/ui/themes/default/html/views/page/pub.php @@ -22,7 +22,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('files') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$files){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$files){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('files') ?>" <?php if(@$files){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('files').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/page/remove.php b/modules/cms/ui/themes/default/html/views/page/remove.php @@ -11,7 +11,8 @@ <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@$name.'') ?></span> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('delete') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$delete){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> required="<?php echo O::escapeHtml('required') ?>" class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$delete){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> required="<?php echo O::escapeHtml('required') ?>" class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('delete') ?>" <?php if(@$delete){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('DELETE').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/pageelement/link.php b/modules/cms/ui/themes/default/html/views/pageelement/link.php @@ -39,10 +39,10 @@ <?php $if3=(isset($release)); if($if3) { ?> <tr><?php echo O::escapeHtml('') ?> <td colspan="<?php echo O::escapeHtml('2') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('release') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$release){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> - <label class="<?php echo O::escapeHtml('or-label') ?>"><?php echo O::escapeHtml('') ?> - <span><?php echo O::escapeHtml(' ') ?></span> - <span><?php echo O::escapeHtml(''.@O::lang('RELEASE').'') ?></span> + <label><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$release){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('release') ?>" <?php if(@$release){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> + <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('RELEASE').'') ?></span> </label> </td> </tr> @@ -50,10 +50,10 @@ <?php $if3=(isset($publish)); if($if3) { ?> <tr><?php echo O::escapeHtml('') ?> <td colspan="<?php echo O::escapeHtml('2') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('publish') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$publish){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> - <label class="<?php echo O::escapeHtml('or-label') ?>"><?php echo O::escapeHtml('') ?> - <span><?php echo O::escapeHtml(' ') ?></span> - <span><?php echo O::escapeHtml(''.@O::lang('PAGE_PUBLISH_AFTER_SAVE').'') ?></span> + <label><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$publish){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('publish') ?>" <?php if(@$publish){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> + <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('PAGE_PUBLISH_AFTER_SAVE').'') ?></span> </label> </td> </tr> diff --git a/modules/cms/ui/themes/default/html/views/pageelement/link.tpl.src.xml b/modules/cms/ui/themes/default/html/views/pageelement/link.tpl.src.xml @@ -22,22 +22,14 @@ <if present="release"> <row> <column colspan="2"> - <checkbox name="release"/> - <label for="release"> - <text value=" "/> - <text value="${message:RELEASE}"/> - </label> + <checkbox name="release" label="${message:RELEASE}"/> </column> </row> </if> <if present="publish"> <row> <column colspan="2"> - <checkbox name="publish"/> - <label for="publish"> - <text value=" "/> - <text value="${message:PAGE_PUBLISH_AFTER_SAVE}"/> - </label> + <checkbox name="publish" label="${message:PAGE_PUBLISH_AFTER_SAVE}" /> </column> </row> </if> diff --git a/modules/cms/ui/themes/default/html/views/pageelement/pub.php b/modules/cms/ui/themes/default/html/views/pageelement/pub.php @@ -22,7 +22,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('files') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$files){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$files){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('files') ?>" <?php if(@$files){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('files').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/pageelement/value.php b/modules/cms/ui/themes/default/html/views/pageelement/value.php @@ -251,7 +251,8 @@ <?php $if5=(isset($release)); if($if5) { ?> <div class="<?php echo O::escapeHtml('or-') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('release') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$release){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$release){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('release') ?>" <?php if(@$release){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('RELEASE').'') ?></span> </label> </div> @@ -259,7 +260,8 @@ <?php $if5=(isset($publish)); if($if5) { ?> <div class="<?php echo O::escapeHtml('or-') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('publish') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$publish){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$publish){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('publish') ?>" <?php if(@$publish){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('PAGE_PUBLISH_AFTER_SAVE').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/profile/edit.php b/modules/cms/ui/themes/default/html/views/profile/edit.php @@ -118,7 +118,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('totp') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$totp){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$totp){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('totp') ?>" <?php if(@$totp){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('user_totp').'') ?></span> </label> <i data-qrcode="<?php echo O::escapeHtml(''.@$totpSecretUrl.'') ?>" title="<?php echo O::escapeHtml(''.@O::lang('QRCODE_SHOW').'') ?>" class="<?php echo O::escapeHtml('or-btn or-image-icon or-image-icon--menu-qrcode or-qrcode or-info') ?>"><?php echo O::escapeHtml('') ?></i> @@ -128,7 +129,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('hotp') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$hotp){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$hotp){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('hotp') ?>" <?php if(@$hotp){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('user_hotp').'') ?></span> </label> <i data-qrcode="<?php echo O::escapeHtml(''.@$hotpSecretUrl.'') ?>" title="<?php echo O::escapeHtml(''.@O::lang('QRCODE_SHOW').'') ?>" class="<?php echo O::escapeHtml('or-btn or-image-icon or-image-icon--menu-qrcode or-qrcode or-info') ?>"><?php echo O::escapeHtml('') ?></i> diff --git a/modules/cms/ui/themes/default/html/views/project/prop.php b/modules/cms/ui/themes/default/html/views/project/prop.php @@ -52,11 +52,13 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml(''.@O::lang('file_extension').'') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('publishFileExtension') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$publishFileExtension){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$publishFileExtension){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('publishFileExtension') ?>" <?php if(@$publishFileExtension){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('PROJECT_publish_File_Extension').'') ?></span> </label> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('publishPageExtension') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$publishPageExtension){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$publishPageExtension){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('publishPageExtension') ?>" <?php if(@$publishPageExtension){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('PROJECT_publish_page_Extension').'') ?></span> </label> </div> @@ -88,7 +90,8 @@ <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <input name="<?php echo O::escapeHtml('ftp_url') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('256') ?>" value="<?php echo O::escapeHtml(''.@$ftp_url.'') ?>" class="<?php echo O::escapeHtml('or-filename or-input') ?>" /><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('ftp_passive') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$ftp_passive){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$ftp_passive){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('ftp_passive') ?>" <?php if(@$ftp_passive){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('PROJECT_FTP_PASSIVE').'') ?></span> </label> </div> @@ -106,11 +109,13 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml(''.@O::lang('OPTIONS').'') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('content_negotiation') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$content_negotiation){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$content_negotiation){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('content_negotiation') ?>" <?php if(@$content_negotiation){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('PROJECT_CONTENT_NEGOTIATION').'') ?></span> </label> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('cut_index') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$cut_index){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$cut_index){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('cut_index') ?>" <?php if(@$cut_index){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('PROJECT_CUT_INDEX').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/project/remove.php b/modules/cms/ui/themes/default/html/views/project/remove.php @@ -21,7 +21,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('delete') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$delete){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> required="<?php echo O::escapeHtml('required') ?>" class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$delete){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> required="<?php echo O::escapeHtml('required') ?>" class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('delete') ?>" <?php if(@$delete){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CONFIRM_DELETE').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/search/edit.php b/modules/cms/ui/themes/default/html/views/search/edit.php @@ -31,23 +31,28 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml(''.@O::lang('search_prop').'') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('oid') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$oid){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$oid){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('oid') ?>" <?php if(@$oid){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('id').'') ?></span> </label> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('name') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$name){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$name){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('name') ?>" <?php if(@$name){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('name').'') ?></span> </label> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('filename') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$filename){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$filename){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('filename') ?>" <?php if(@$filename){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('filename').'') ?></span> </label> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('description') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$description){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$description){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('description') ?>" <?php if(@$description){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('description').'') ?></span> </label> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('content') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$content){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$content){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('content') ?>" <?php if(@$content){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('content').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/template/addel.php b/modules/cms/ui/themes/default/html/views/template/addel.php @@ -35,7 +35,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('addtotemplate') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(1){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(1){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('addtotemplate') ?>" <?php if(1){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('menu_template_srcelement').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/template/prop.php b/modules/cms/ui/themes/default/html/views/template/prop.php @@ -23,7 +23,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml(''.@O::lang('PUBLISH').'') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('publish') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$publish){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$publish){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('publish') ?>" <?php if(@$publish){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('publish').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/template/remove.php b/modules/cms/ui/themes/default/html/views/template/remove.php @@ -32,7 +32,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('delete') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$delete){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> required="<?php echo O::escapeHtml('required') ?>" class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$delete){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> required="<?php echo O::escapeHtml('required') ?>" class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('delete') ?>" <?php if(@$delete){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CONFIRM_DELETE').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/template/src.php b/modules/cms/ui/themes/default/html/views/template/src.php @@ -47,7 +47,8 @@ <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('release') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$release){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$release){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('release') ?>" <?php if(@$release){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('RELEASE').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/text/value.php b/modules/cms/ui/themes/default/html/views/text/value.php @@ -36,7 +36,8 @@ <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('release') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$release){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$release){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('release') ?>" <?php if(@$release){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('RELEASE').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/url/remove.php b/modules/cms/ui/themes/default/html/views/url/remove.php @@ -11,7 +11,8 @@ <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('NAME').'') ?></span> </label> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('delete') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$delete){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$delete){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('delete') ?>" <?php if(@$delete){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('DELETE').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/user/info.php b/modules/cms/ui/themes/default/html/views/user/info.php @@ -98,7 +98,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('is_admin') ?>" disabled="<?php echo O::escapeHtml('disabled') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$is_admin){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" disabled="<?php echo O::escapeHtml('disabled') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$is_admin){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('is_admin') ?>" <?php if(@$is_admin){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('user_admin').'') ?></span> </label> </div> @@ -152,7 +153,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml(''.@O::lang('user_totp').'') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('totp') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$totp){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$totp){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('totp') ?>" <?php if(@$totp){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('user_totp').'') ?></span> </label> <i data-qrcode="<?php echo O::escapeHtml(''.@$totpSecretUrl.'') ?>" title="<?php echo O::escapeHtml(''.@O::lang('QRCODE_SHOW').'') ?>" class="<?php echo O::escapeHtml('or-btn or-image-icon or-image-icon--menu-qrcode or-qrcode or-info') ?>"><?php echo O::escapeHtml('') ?></i> diff --git a/modules/cms/ui/themes/default/html/views/user/memberships.php b/modules/cms/ui/themes/default/html/views/user/memberships.php @@ -13,20 +13,18 @@ <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> <table class="<?php echo O::escapeHtml('or-table') ?>"><?php echo O::escapeHtml('') ?> <tr class="<?php echo O::escapeHtml('or-table-header') ?>"><?php echo O::escapeHtml('') ?> - <th class="<?php echo O::escapeHtml('or-table-column-action') ?>"><?php echo O::escapeHtml('') ?></th> <th><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-group') ?>"><?php echo O::escapeHtml('') ?></i> <span><?php echo O::escapeHtml(''.@O::lang('group').'') ?></span> </th> </tr> <?php foreach((array)@$memberships as $list_key=>$list_value) { extract($list_value); ?> <tr class="<?php echo O::escapeHtml('or-data') ?>"><?php echo O::escapeHtml('') ?> <td><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml(''.@$var.'') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$$var){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> - </td> - <td><?php echo O::escapeHtml('') ?> - <label class="<?php echo O::escapeHtml('or-label') ?>"><?php echo O::escapeHtml('') ?> - <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-group') ?>"><?php echo O::escapeHtml('') ?></i> - <span><?php echo O::escapeHtml(''.@$name.'') ?></span> + <label><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$$var){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml(''.@$var.'') ?>" <?php if(@$$var){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> + <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@$name.'') ?></span> </label> </td> </tr> diff --git a/modules/cms/ui/themes/default/html/views/user/memberships.tpl.src.xml b/modules/cms/ui/themes/default/html/views/user/memberships.tpl.src.xml @@ -2,21 +2,15 @@ <form> <table> <row header="true"> - <column header="true" class="table-column-action" /> <column header="true"> + <image action="group"/> <text value="${message:group}"/> </column> </row> <list list="${memberships}" extract="true"> <row class="data"> <column> - <checkbox name="${var}"/> - </column> - <column> - <label for="${var}"> - <image action="group"/> - <text value="${name}"/> - </label> + <checkbox name="${var}" label="${name}"/> </column> </row> </list> diff --git a/modules/cms/ui/themes/default/html/views/user/prop.php b/modules/cms/ui/themes/default/html/views/user/prop.php @@ -80,7 +80,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('is_admin') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$is_admin){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$is_admin){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('is_admin') ?>" <?php if(@$is_admin){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('user_admin').'') ?></span> </label> </div> @@ -108,7 +109,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('totp') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$totp){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$totp){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('totp') ?>" <?php if(@$totp){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('user_totp').'') ?></span> </label> </div> @@ -117,7 +119,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('hotp') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$hotp){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$hotp){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('hotp') ?>" <?php if(@$hotp){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('user_hotp').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/user/pw.php b/modules/cms/ui/themes/default/html/views/user/pw.php @@ -30,7 +30,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('email') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$email){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$email){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('email') ?>" <?php if(@$email){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('user_mail_new_password').'') ?></span> </label> </div> @@ -41,7 +42,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('timeout') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$timeout){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$timeout){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('timeout') ?>" <?php if(@$timeout){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('user_password_timeout').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/html/views/user/remove.php b/modules/cms/ui/themes/default/html/views/user/remove.php @@ -32,7 +32,8 @@ <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('confirm') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$confirm){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> required="<?php echo O::escapeHtml('required') ?>" class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$confirm){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> required="<?php echo O::escapeHtml('required') ?>" class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('confirm') ?>" <?php if(@$confirm){ ?>value="<?php echo O::escapeHtml('1') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('delete').'') ?></span> </label> </div> diff --git a/modules/cms/ui/themes/default/script/openrat/components.js b/modules/cms/ui/themes/default/script/openrat/components.js @@ -4,6 +4,7 @@ import link from '../../../../../../template_engine/components/html/component_ import qrcode from '../../../../../../template_engine/components/html/component_qrcode/qrcode.js'; import table from '../../../../../../template_engine/components/html/component_table/table.js'; import upload from '../../../../../../template_engine/components/html/component_upload/upload.js'; +import form from '../../../../../../template_engine/components/html/component_checkbox/checkbox.js'; import Callback from "./callback.js"; export default class Components { @@ -12,11 +13,12 @@ export default class Components { console.debug('registering component scripts'); Callback.afterViewLoadedHandler.add(editor); - Callback.afterViewLoadedHandler.add(group); - Callback.afterViewLoadedHandler.add(link); + Callback.afterViewLoadedHandler.add(group ); + Callback.afterViewLoadedHandler.add(link ); Callback.afterViewLoadedHandler.add(qrcode); - Callback.afterViewLoadedHandler.add(table); + Callback.afterViewLoadedHandler.add(table ); Callback.afterViewLoadedHandler.add(upload); + Callback.afterViewLoadedHandler.add(form ); } } diff --git a/modules/cms/ui/themes/default/script/openrat/components.min.js b/modules/cms/ui/themes/default/script/openrat/components.min.js @@ -4,15 +4,17 @@ import link from '../../../../../../template_engine/components/html/component_ import qrcode from '../../../../../../template_engine/components/html/component_qrcode/qrcode.min.js'; import table from '../../../../../../template_engine/components/html/component_table/table.min.js'; import upload from '../../../../../../template_engine/components/html/component_upload/upload.min.js'; +import form from '../../../../../../template_engine/components/html/component_checkbox/checkbox.min.js'; import Callback from "./callback.min.js"; export default class Components { registerComponents() { console.debug('registering component scripts'); Callback.afterViewLoadedHandler.add(editor); -Callback.afterViewLoadedHandler.add(group); -Callback.afterViewLoadedHandler.add(link); +Callback.afterViewLoadedHandler.add(group ); +Callback.afterViewLoadedHandler.add(link ); Callback.afterViewLoadedHandler.add(qrcode); -Callback.afterViewLoadedHandler.add(table); +Callback.afterViewLoadedHandler.add(table ); Callback.afterViewLoadedHandler.add(upload); +Callback.afterViewLoadedHandler.add(form ); } } \ No newline at end of file diff --git a/modules/template_engine/components/html/component_checkbox/CheckboxComponent.class.php b/modules/template_engine/components/html/component_checkbox/CheckboxComponent.class.php @@ -23,7 +23,9 @@ class CheckboxComponent extends Component ->addAttribute('type','checkbox') ->addStyleClass('form-checkbox'); - $checkbox->addAttribute('name',$this->name); + if ( !$this->label ) + $checkbox->addAttribute('name',$this->name); + if ( $this->readonly ) $checkbox->addAttribute('disabled','disabled'); $checkbox->addAttribute('value','1'); @@ -46,6 +48,7 @@ class CheckboxComponent extends Component $label = (new CMSElement('label')) //->addStyleClass('form-checkbox') ->addChild($checkbox) + ->addChild( (new CMSElement('input'))->addAttribute('type','hidden')->addAttribute('name',$this->name)->addConditionalAttribute('value', $condition, '1') ) ->addChild( (new CMSElement('span')) ->addStyleClass('form-label') ->content($this->label)); diff --git a/modules/template_engine/components/html/component_checkbox/checkbox.js b/modules/template_engine/components/html/component_checkbox/checkbox.js @@ -0,0 +1,14 @@ +import $ from '../../../../cms/ui/themes/default/script/jquery-global.js'; + + +export default function(element ) { + + // Wrapper Checkboxes will control the "hidden checkbox". + // So unchecked checkboxes will posted too. + $(element).find('.or-form-checkbox').change(function(e) { + this.nextElementSibling.value = this.checked ? 'on' : 'off'; + }); + +}; + + diff --git a/modules/template_engine/components/html/component_checkbox/checkbox.min.js b/modules/template_engine/components/html/component_checkbox/checkbox.min.js @@ -0,0 +1,6 @@ +import $ from '../../../../cms/ui/themes/default/script/jquery-global.min.js'; +export default function(element ) { +$(element).find('.or-form-checkbox').change(function(e) { +this.nextElementSibling.value = this.checked ? 'on' : 'off'; +}); +}; +\ No newline at end of file