commit 964d2118f1ec159a1c9ca088b182ad651703a521 parent 260ee350d5634f4d3a735f83966a33ce61740c9f Author: Jan Dankert <develop@jandankert.de> Date: Wed, 10 Mar 2021 23:51:22 +0100 Refactoring: Cleaned the Request params. Diffstat:
30 files changed, 183 insertions(+), 653 deletions(-)
diff --git a/modules/cms/Dispatcher.class.php b/modules/cms/Dispatcher.class.php @@ -359,7 +359,7 @@ class Dispatcher $method = new \ReflectionMethod($do,$subactionMethodName); $params = []; foreach( $method->getParameters() as $parameter ) { - $params[ $parameter->getName() ] = $this->request->getRequiredVar($parameter->getName(),RequestParams::FILTER_RAW); + $params[ $parameter->getName() ] = $this->request->getRequiredRaw($parameter->getName()); } $method->invokeArgs($do,$params); // <== Executing the Action diff --git a/modules/cms/action/RequestParams.class.php b/modules/cms/action/RequestParams.class.php @@ -19,15 +19,6 @@ class RequestParams const PARAM_PROJECT_ID = 'projectid' ; const PARAM_DATABASE_ID = 'dbid' ; - /* Filter Types */ - const FILTER_ALPHA ='abc'; - const FILTER_ALPHANUM ='abc123'; - const FILTER_FILENAME = 'file'; - const FILTER_MAIL = 'mail'; - const FILTER_TEXT = 'text'; - const FILTER_NUMBER = '123'; - const FILTER_RAW = 'raw'; - public $action; public $method; public $id; @@ -95,57 +86,118 @@ class RequestParams } - public function getRequiredVar($varName, $transcode ) { - $value = $this->getVar($varName,$transcode); + /** + * Ermittelt den Inhalt der gew�nschten Request-Variablen. + * Falls nicht vorhanden, wird "" zur�ckgegeben. + * + * @param String $varName Schl�ssel + * @return String Inhalt + */ + protected function getValue($varName) + { + if ( ! $this->hasKey($varName) ) + return null; - if ( empty( $value ) ) - throw new ValidationException($varName); + return $this->parameter[$varName]; + } - return $value; + protected function requireVar( $varName ) + { + if ( ! $this->hasKey($varName) ) + throw new ValidationException( $varName ); + + return; + } + + + public function getAlphanum($varName ) { + return Text::clean( $this->getValue($varName), 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789.,_-!?%&/()' ); + } + + + public function getFilename($varName ) { + + // RFC 1738, Section 2.2: + // Thus, only alphanumerics, the special characters "$-_.+!*'(),", and + // reserved characters used for their reserved purposes may be used + // unencoded within a URL. + return Text::clean( $this->getValue($varName), 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789$-_.+!*(),\'' ); } /** - * Gets the value of the request parameter. + * Gets a mail adress out of the request. * - * @param $nameOfRequestParameter + * @param $varName * @return String - * @throws ValidationException */ - public function getRequiredText( $nameOfRequestParameter ) { - return $this->getRequiredVar( $nameOfRequestParameter, self::FILTER_TEXT ); + public function getMail($varName ) { + return Text::clean( $this->getValue($varName), 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789._-+@' ); + } + + + public function getRaw($varName ) { + return $this->getValue( $varName ); } /** - * Ermittelt den Inhalt der gew�nschten Request-Variablen. - * Falls nicht vorhanden, wird "" zur�ckgegeben. + * Get required parameter value. * - * @param String $varName Schl�ssel - * @return String Inhalt + * @param $varName + * @return String|null + * @throws ValidationException */ - public function getVar($varName, $transcode = self::FILTER_TEXT) - { - if (!isset($this->parameter[$varName])) - return ''; + public function getRequiredRaw($varName ) { + + $this->requireVar( $varName ); - return $this->cleanText( $this->parameter[$varName], $transcode ); + return $this->getValue( $varName ); } - public function getAlphanum($varName ) { - return $this->getVar( $varName,self::FILTER_ALPHANUM ); + /** + * @param $varName + * @return string|null + */ + public function getText( $varName ) { + + if ( ! $this->hasKey($varName )) + return null; + + // Allow all UTF-8 characters. + return mb_convert_encoding($this->getValue($varName), 'UTF-8', 'UTF-8'); } - public function getRaw($varName ) { - return $this->getVar( $varName,self::FILTER_RAW ); + + /** + * Gets the value of the request parameter. + * + * @param $nameOfRequestParameter + * @return String + * @throws ValidationException + */ + public function getRequiredText( $nameOfRequestParameter ) { + + $this->requireVar( $nameOfRequestParameter ); + + return $this->getText( $nameOfRequestParameter ); } - public function getText($varName ) { - return $this->getVar( $varName,self::FILTER_TEXT ); + + /** + * Checks if the request contains the parameter. + * + * @param String $varName Schl�ssel + * @return boolean true, falls vorhanden. + */ + public function hasKey($varName) + { + return isset( $this->parameter[$varName] ); } + /** * Ermittelt, ob der aktuelle Request eine Variable mit dem * angegebenen Namen enth�lt. @@ -159,16 +211,6 @@ class RequestParams } - public function getRequiredId($varName ) { - - $id = intval($this->getVar( $varName )); - - if ( $id == 0 ) - throw new ValidationException($varName); - - return $id; - } - /** * Gets the ID for the current action. * @@ -176,7 +218,7 @@ class RequestParams */ public function getId() { - return $this->getVar( self::PARAM_ID ,self::FILTER_ALPHANUM ); + return $this->getAlphanum( self::PARAM_ID ); } @@ -188,12 +230,30 @@ class RequestParams * @param string $varName name of parameter * @return Integer */ - public function getNumber($varName ) + public function getNumber( $varName ) + { + if ( ! $this->hasKey($varName )) + return null; + + return intval($this->getValue( $varName )); + } + + + + /** + * Checks if the parameter value is true. + * + * @param string $varName name of parameter + * @return Integer + */ + public function isTrue( $varName ) { - return $this->getVar( $varName,self::FILTER_NUMBER ); + return boolval($this->getValue( $varName )); } + + /** * Ermittelt die aktuelle Id aus dem Request.<br> * Um welche ID es sich handelt, ist abh�ngig von der Action. @@ -203,7 +263,9 @@ class RequestParams */ public function getRequiredNumber($varName ) { - return $this->getRequiredVar( $varName,self::FILTER_NUMBER ); + $this->requireVar( $varName ); + + return $this->getNumber( $varName ); } @@ -217,7 +279,7 @@ class RequestParams public function getLanguageId() { - return $this->getVar(self::PARAM_LANGUAGE_ID,self::FILTER_NUMBER); + return $this->getNumber(self::PARAM_LANGUAGE_ID); } public function hasModelId() @@ -227,58 +289,16 @@ class RequestParams public function getModelId() { - return $this->getVar(self::PARAM_MODEL_ID,self::FILTER_NUMBER); + return $this->getNumber(self::PARAM_MODEL_ID ); } public function getProjectId() { - return $this->getVar(self::PARAM_PROJECT_ID,self::FILTER_NUMBER); + return $this->getNumber(self::PARAM_PROJECT_ID ); } public function getToken() { - return $this->getVar(self::PARAM_TOKEN,self::FILTER_ALPHANUM); - } - - - protected function cleanText( $value, $transcode ) - { - switch ($transcode) { - case self::FILTER_ALPHA: - $white = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'; - break; - - case self::FILTER_ALPHANUM: - $white = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789.,_-!?%&/()'; - break; - - case self::FILTER_FILENAME: - // RFC 1738, Section 2.2: - // Thus, only alphanumerics, the special characters "$-_.+!*'(),", and - // reserved characters used for their reserved purposes may be used - // unencoded within a URL. - $white = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789$-_.+!*(),' . "'"; - break; - - case self::FILTER_MAIL: - $white = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789._-@'; - break; - - case self::FILTER_TEXT: - // Allow all UTF-8 characters. - return mb_convert_encoding($value, 'UTF-8', 'UTF-8'); - - case self::FILTER_NUMBER: - $white = '1234567890.'; - break; - - case self::FILTER_RAW: - return $value; - - default: - throw new \LogicException('Unknown request filter', 'not found: ' . $transcode); - } - - return Text::clean($value, $white); + return $this->getAlphanum(self::PARAM_TOKEN ); } diff --git a/modules/cms/action/element/ElementAdvancedAction.class.php b/modules/cms/action/element/ElementAdvancedAction.class.php @@ -465,7 +465,7 @@ class ElementAdvancedAction extends ElementAction implements Method { $this->element->setPrefix( $this->request->getText('linkelement') ); if ( $this->request->has('parameters')) - $this->element->code = $this->request->getVar('parameters',RequestParams::FILTER_RAW); + $this->element->code = $this->request->getText('parameters'); $this->element->save(); $this->addNoticeFor( $this->element, Messages::SAVED); diff --git a/modules/cms/action/element/ElementPropAction.class.php b/modules/cms/action/element/ElementPropAction.class.php @@ -35,15 +35,15 @@ class ElementPropAction extends ElementAction implements Method { public function post() { - if ( !$this->userIsAdmin() && $this->request->getVar('type') == 'code' ) + if ( !$this->userIsAdmin() && $this->request->getText('type') == 'code' ) // Code-Elemente fuer Nicht-Administratoren nicht benutzbar throw new \util\exception\ValidationException('type'); $this->element->typeid = $this->request->getNumber('typeid'); - $this->element->name = $this->request->getVar('name' ,RequestParams::FILTER_ALPHANUM); - $this->element->label= $this->request->getVar('label' ,RequestParams::FILTER_TEXT); - $this->element->desc = $this->request->getVar('description',RequestParams::FILTER_TEXT); + $this->element->name = $this->request->getAlphanum('name' ); + $this->element->label= $this->request->getText('label' ); + $this->element->desc = $this->request->getText('description'); $this->element->save(); diff --git a/modules/cms/action/element/ElementRemoveAction.class.php b/modules/cms/action/element/ElementRemoveAction.class.php @@ -15,7 +15,7 @@ class ElementRemoveAction extends ElementAction implements Method { if ( !$this->request->has('confirm') ) throw new \util\exception\ValidationException('confirm'); - $type = $this->request->getVar('type','abc'); + $type = $this->request->getAlphanum('type'); if ( $type == 'value' ) { diff --git a/modules/cms/action/file/FileAdvancedAction.class.php b/modules/cms/action/file/FileAdvancedAction.class.php @@ -29,9 +29,9 @@ class FileAdvancedAction extends FileAction implements Method { public function post() { - $this->file->extension = $this->request->getVar('extension' ,RequestParams::FILTER_FILENAME); + $this->file->extension = $this->request->getFilename('extension'); - $typeid = $this->request->getVar('type',RequestParams::FILTER_NUMBER ); + $typeid = $this->request->getNumber('type' ); if ( ! in_array($typeid,[BaseObject::TYPEID_FILE,BaseObject::TYPEID_IMAGE,BaseObject::TYPEID_TEXT])) throw new ValidationException('type'); diff --git a/modules/cms/action/file/FileCompressAction.class.php b/modules/cms/action/file/FileCompressAction.class.php @@ -17,12 +17,12 @@ class FileCompressAction extends FileAction implements Method { $this->setTemplateVar('formats' ,$formats ); } public function post() { - $format = $this->request->getVar('format',RequestParams::FILTER_ALPHANUM); + $format = $this->request->getAlphanum('format'); switch( $format ) { case 'gz': - if ( $this->request->getVar('replace',RequestParams::FILTER_NUMBER)=='1' ) + if ( $this->request->getNumber('replace' ) =='1' ) { $this->file->value = gzencode( $this->file->loadValue(),1 ); $this->file->parse_filename( $this->file->filename.'.'.$this->file->extension.'.gz',FORCE_GZIP ); diff --git a/modules/cms/action/file/FileUncompressAction.class.php b/modules/cms/action/file/FileUncompressAction.class.php @@ -16,7 +16,7 @@ class FileUncompressAction extends FileAction implements Method { switch( $this->file->extension ) { case 'gz': - if ( $this->request->getVar('replace') ) + if ( $this->request->getNumber('replace') ) { if ( strcmp(substr($this->file->loadValue(),0,2),"\x1f\x8b")) { @@ -45,7 +45,7 @@ class FileUncompressAction extends FileAction implements Method { break; case 'bz2': - if ( $this->request->getVar('replace') ) + if ( $this->request->getNumber('replace') ) { $this->file->value = bzdecompress($this->file->loadValue()); $this->file->parse_filename( $this->file->filename ); diff --git a/modules/cms/action/group/GroupPropAction.class.php b/modules/cms/action/group/GroupPropAction.class.php @@ -4,10 +4,14 @@ use cms\action\GroupAction; use cms\action\Method; use cms\model\Group; use language\Messages; +use util\exception\ValidationException; class GroupPropAction extends GroupAction implements Method { + /** + * Reads the properties of this group. + */ public function view() { $this->setTemplateVars( $this->group->getProperties() ); @@ -22,17 +26,21 @@ class GroupPropAction extends GroupAction implements Method { $this->setTemplateVar('groups',$otherGroups ); } - public function post() { - if ( ! $this->request->getText('name') ) - throw new \util\exception\ValidationException('name'); + /** + * Store the group properties. + * + * @throws ValidationException + */ + public function post() { - $this->group->name = $this->request->getText('name'); + $this->group->name = $this->request->getRequiredText('name'); $this->group->parentid = $this->request->getNumber('parentid'); + if ( ! $this->group->parentid ) $this->group->parentid = null; - $this->group->save(); + $this->group->persist(); $this->addNoticeFor($this->group,Messages::SAVED); } diff --git a/modules/cms/action/login/LoginLoginAction.class.php b/modules/cms/action/login/LoginLoginAction.class.php @@ -78,10 +78,10 @@ class LoginLoginAction extends LoginAction implements Method { throw new SecurityException('login disabled'); $loginName = $this->request->getAlphanum('login_name' ); - $loginPassword = $this->request->getVar('login_password',RequestParams::FILTER_ALPHANUM); - $newPassword1 = $this->request->getVar('password1' ,RequestParams::FILTER_ALPHANUM); - $newPassword2 = $this->request->getVar('password2' ,RequestParams::FILTER_ALPHANUM); - $token = $this->request->getVar('user_token' ,RequestParams::FILTER_ALPHANUM); + $loginPassword = $this->request->getText('login_password'); + $newPassword1 = $this->request->getText('password1' ); + $newPassword2 = $this->request->getText('password2' ); + $token = $this->request->getText('user_token' ); // Jedes Authentifizierungsmodul durchlaufen, bis ein Login erfolgreich ist. diff --git a/modules/cms/action/login/LoginRegisterAction.class.php b/modules/cms/action/login/LoginRegisterAction.class.php @@ -6,6 +6,7 @@ use cms\action\RequestParams; use cms\model\User; use language\Messages; use logger\Logger; +use util\exception\ValidationException; use util\Mail; use util\Session; use util\text\TextMessage; @@ -15,15 +16,13 @@ class LoginRegisterAction extends LoginAction implements Method { public function view() { } + public function post() { - $email_address = $this->request->getVar('mail',RequestParams::FILTER_MAIL); + $email_address = $this->request->getMail('mail'); if ( ! Mail::checkAddress($email_address) ) - { - $this->addValidationError('mail'); - return; - } + throw new ValidationException('mail'); Session::set( Session::KEY_REGISTER_MAIL,$email_address ); diff --git a/modules/cms/action/object/ObjectCopyAction.class.php b/modules/cms/action/object/ObjectCopyAction.class.php @@ -23,7 +23,7 @@ class ObjectCopyAction extends ObjectAction implements Method { $sourceObject = new BaseObject( $this->request->getId()); $sourceObject->load(); - $targetFolder = new BaseObject( $this->request->getText('targetFolderId',RequestParams::FILTER_NUMBER)); + $targetFolder = new BaseObject( $this->request->getNumber('targetFolderId')); $targetFolder->load(); $this->setTemplateVar('source' ,$sourceObject->getProperties() ); @@ -40,7 +40,7 @@ class ObjectCopyAction extends ObjectAction implements Method { public function post() { $type = $this->request->getText('type'); $targetObjectId = $this->request->getNumber('targetid'); - $sourceObjectId = $this->request->getVar('sourceid',RequestParams::FILTER_NUMBER); + $sourceObjectId = $this->request->getNumber('sourceid'); $sourceObject = new BaseObject( $sourceObjectId ); $sourceObject->load(); diff --git a/modules/cms/action/object/ObjectPropAction.class.php b/modules/cms/action/object/ObjectPropAction.class.php @@ -49,7 +49,7 @@ class ObjectPropAction extends ObjectAction implements Method { // Should we do this? if ( $this->request->has('creationTimestamp') && $this->userIsAdmin() ) - $this->baseObject->createDate = $this->request->getVar('creationTimestamp',RequestParams::FILTER_NUMBER); + $this->baseObject->createDate = $this->request->getNumber('creationTimestamp'); $this->baseObject->setCreationTimestamp(); diff --git a/modules/cms/action/page/PageAllAction.class.php b/modules/cms/action/page/PageAllAction.class.php @@ -32,7 +32,7 @@ class PageAllAction extends PageAction implements Method { public function view() { - $languageid = $this->request->getRequiredId('languageid'); + $languageid = $this->request->getRequiredNumber('languageid'); $language = new Language($languageid); $language->load(); @@ -204,10 +204,10 @@ class PageAllAction extends PageAction implements Method { switch ($element->typeid) { case Element::ELEMENT_TYPE_TEXT: - $value->text = $this->request->getVar($element->name, 'raw'); + $value->text = $this->request->getText($element->name); break; case Element::ELEMENT_TYPE_LONGTEXT: - $value->text = $this->compactOIDs($this->request->getVar($element->name, 'raw')); + $value->text = $this->compactOIDs($this->request->getText($element->name)); break; case Element::ELEMENT_TYPE_DATE: @@ -219,11 +219,11 @@ class PageAllAction extends PageAction implements Method { break; case Element::ELEMENT_TYPE_LINK: case Element::ELEMENT_TYPE_INSERT: - $value->linkToObjectId = intval($this->request->getVar($element->name)); + $value->linkToObjectId = intval($this->request->getNumber($element->name)); break; case Element::ELEMENT_TYPE_NUMBER: - $value->number = $this->request->getVar($element->name) * pow(10, $value->element->decimals); + $value->number = $this->request->getText($element->name) * pow(10, $value->element->decimals); break; default: throw new \LogicException('Unknown element type: '.$element->getTypeName() ); @@ -238,7 +238,7 @@ class PageAllAction extends PageAction implements Method { $value->publish = $value->page->hasRight(Permission::ACL_RELEASE) && $this->request->has('release'); // Up-To-Date-Check - $lastChangeTime = $value->getLastChangeSinceByAnotherUser($this->request->getVar('value_time'), Session::getUser()->userid); + $lastChangeTime = $value->getLastChangeSinceByAnotherUser($this->request->getNumber('value_time'), Session::getUser()->userid); if ($lastChangeTime) $this->addWarningFor($value, Messages::CONCURRENT_VALUE_CHANGE, array('last_change_time' => date(L::lang('DATE_FORMAT'), $lastChangeTime))); diff --git a/modules/cms/action/page/PageEditAction.class.php b/modules/cms/action/page/PageEditAction.class.php @@ -39,147 +39,9 @@ class PageEditAction extends PageAction implements Method { $this->setTemplateVar('languages',$languages); } - public function post() { - $value = new Value(); - $value->languageid = $this->page->languageid; - $value->objectid = $this->page->objectid; - $value->pageid = Page::getPageIdFromObjectId( $this->page->objectid ); - - if ( ! $this->request->has('elementid') ) - $this->addValidationError('elementid' ); - - $value->element = new Element( $this->request->getText('elementid') ); - - $value->element->load(); - $value->load(); - - $value->number = $this->request->getText('number') * pow(10,$value->element->decimals); - $value->linkToObjectId = intval($this->request->getText('linkobjectid')); - $value->text = $this->request->getText('text'); - - // Vorschau anzeigen - if ( $value->element->type=='longtext' && ($this->request->has('preview')||$this->request->has('addmarkup')) ) - { - /* - if ( $this->request->hasRequestVar('preview') ) - { - $value->page = $this->page; - $value->simple = false; - $value->page->languageid = $value->languageid; - $value->page->load(); - $value->generate(); - $this->setTemplateVar('preview_text',$value->value ); - }*/ - - if ( $this->request->has('addmarkup') ) - { - $addText = $this->request->getText('addtext'); - - if ( !empty($addText) ) // Nur, wenn ein Text eingegeben wurde - { - $addText = $this->request->getText('addtext'); - - if ( $this->request->has('strong') ) - $value->text .= '*'.$addText.'*'; - - if ( $this->request->has('emphatic') ) - $value->text .= '_'.$addText.'_'; - - if ( $this->request->has('link') ) - $value->text .= '"'.$addText.'"->"'.$this->request->getText('objectid').'"'; - } - - if ( $this->request->has('table') ) - $value->text .= "|$addText | |\n|$addText | |\n|$addText | |\n"; - if ( $this->request->has('list') ) - $value->text .= "\n- ".$addText."\n".'- '.$addText."\n".'- '.$addText."\n"; - if ( $this->request->has('numlist') ) - $value->text .= "\n# ".$addText."\n".'# '.$addText."\n".'# '.$addText."\n"; - - if ( $this->request->has('image') ) - $value->text .= '{'.$this->request->getText('objectid').'}'; - } - - // Ermitteln aller verlinkbaren Objekte (fuer Editor) - $objects = array(); - - foreach( Folder::getAllObjectIds() as $id ) - { - $o = new BaseObject( $id ); - $o->load(); - - if ( $o->getType() != 'folder' ) - { - $f = new Folder( $o->parentid ); - $objects[ $id ] = \cms\base\Language::lang( ''.$o->getType() ).': '; - $objects[ $id ] .= implode( \util\Text::FILE_SEP,$f->parentObjectNames(false,true) ); - $objects[ $id ] .= \util\Text::FILE_SEP.$o->name; - } - } - asort($objects); - $this->setTemplateVar( 'objects' ,$objects ); - - $this->setTemplateVar( 'release' ,$this->page->hasRight(Permission::ACL_RELEASE) ); - $this->setTemplateVar( 'publish' ,$this->page->hasRight(Permission::ACL_PUBLISH) ); - $this->setTemplateVar( 'html' ,$value->element->html ); - $this->setTemplateVar( 'wiki' ,$value->element->wiki ); - $this->setTemplateVar( 'text' ,$value->text ); - $this->setTemplateVar( 'name' ,$value->element->name ); - $this->setTemplateVar( 'desc' ,$value->element->desc ); - $this->setTemplateVar( 'objectid',$this->page->objectid ); - return; - } - - if ( $this->request->has('year') ) // Wird ein Datum gespeichert? - { - // Wenn ein ANSI-Datum eingegeben wurde, dann dieses verwenden - if ( $this->request->getVar('ansidate') != $this->request->getVar('ansidate_orig') ) - $value->date = strtotime($this->request->getVar('ansidate') ); - else - // Sonst die Zeitwerte einzeln zu einem Datum zusammensetzen - $value->date = mktime( $this->request->getVar('hour' ), - $this->request->getVar('minute'), - $this->request->getVar('second'), - $this->request->getVar('month' ), - $this->request->getVar('day' ), - $this->request->getVar('year' ) ); - } - else $value->date = 0; // Datum nicht gesetzt. - - $value->text = $this->request->getVar('text'); - - $value->page = new Page( $value->objectid ); - $value->page->load(); - - // Inhalt sofort freigegeben, wenn - // - Recht vorhanden - // - Freigabe gewuenscht - if ( $value->page->hasRight( Permission::ACL_RELEASE ) && $this->request->getVar('release')!='' ) - $value->publish = true; - else - $value->publish = false; - - // Inhalt speichern - - // Wenn Inhalt in allen Sprachen gleich ist, dann wird der Inhalt - // fuer jede Sprache einzeln gespeichert. - if ( $value->element->allLanguages ) - { - $project = new Project( $this->page->projectid ); - foreach( $project->getLanguageIds() as $languageid ) - { - $value->languageid = $languageid; - $value->add(); - } - } - else - { - // sonst nur 1x speichern (fuer die aktuelle Sprache) - $value->add(); - } + public function post() { - $this->page->setTimestamp(); // "Letzte Aenderung" setzen } } diff --git a/modules/cms/action/page/PageFormAction.class.php b/modules/cms/action/page/PageFormAction.class.php @@ -1,179 +0,0 @@ -<?php -namespace cms\action\page; -use cms\action\Method; -use cms\action\PageAction; -use cms\model\Permission; -use cms\model\BaseObject; -use cms\model\Element; -use cms\model\Folder; -use cms\model\Page; -use cms\model\Project; -use cms\model\Value; - -class PageFormAction extends PageAction implements Method { - - public function getRequiredPermission() { - return Permission::ACL_WRITE; - } - - public function view() { - $list = array(); - - foreach( $this->page->values as $id=>$value ) - { - if ( $value->element->isWritable() ) - { - $list[$id] = array(); - $list[$id]['name'] = $value->element->name; - $list[$id]['desc'] = $value->element->desc; - $list[$id]['type'] = $value->element->type; - $list[$id]['id' ] = 'id'.$value->element->elementid; - $list[$id]['saveid'] = 'saveid'.$value->element->elementid; - - switch( $value->element->type ) - { - case 'text': - case 'longtext': - $list[$id]['value'] = $value->text; - break; - - case 'date': - $list[$id]['value'] = date( 'Y-m-d H:i:s',$value->date ); - break; - - case 'number': - $list[$id]['value'] = $value->number / pow(10,$value->element->decimals); - break; - - case 'select': - $list[$id]['list' ] = $value->element->getSelectItems(); - $list[$id]['value'] = $value->text; - break; - - case 'link': - $objects = array(); - - foreach( Folder::getAllObjectIds() as $oid ) - { - $o = new BaseObject( $oid ); - $o->load(); - - if ( $o->getType() != 'folder' ) - { - $f = new Folder( $o->parentid ); - $f->load(); - - $objects[ $oid ] = \cms\base\Language::lang( $o->getType() ).': '; - $objects[ $oid ] .= implode( ' » ',$f->parentObjectNames(false,true) ); - $objects[ $oid ] .= ' » '.$o->name; - } - } - - asort( $objects ); // Sortieren - - $list[$id]['list' ] = $objects; - $list[$id]['value'] = $value->linkToObjectId; - break; - - case 'list': - $objects = array(); - foreach( Folder::getAllFolders() as $oid ) - { - $f = new Folder( $oid ); - $f->load(); - - $objects[ $oid ] = \cms\base\Language::lang( $f->getType() ).': '; - $objects[ $oid ] .= implode( ' » ',$f->parentObjectNames(false,true) ); - } - - asort( $objects ); // Sortieren - - $this->setTemplateVar('list' ,$objects); - $this->setTemplateVar('value',$this->value->linkToObjectId); - - break; - } - } - } - - $this->setTemplateVar( 'release',$this->page->hasRight(Permission::ACL_RELEASE) ); - $this->setTemplateVar( 'publish',$this->page->hasRight(Permission::ACL_PUBLISH) ); - - $this->setTemplateVar('el',$list); - } - - - public function post() { - foreach( $this->page->getElements() as $elementid=>$name ) - { - if ( $this->request->has('saveid'.$elementid) ) - { - $value = new Value(); - $value->objectid = $this->page->objectid; - $value->pageid = Page::getPageIdFromObjectId( $value->objectid ); - $value->element = new Element( $elementid ); - $value->element->load(); - $value->load(); - - // Eingegebenen Inhalt aus dem Request lesen - $inhalt = $this->request->getText( 'id'.$elementid ); - - // Den Inhalt speichern. - switch( $value->element->type ) - { - case 'number': - $value->number = $inhalt * pow(10,$value->element->decimals); - break; - - case 'date': - $value->date = strtotime( $inhalt ); - break; - - case 'text': - case 'longtext': - case 'select': - $value->text = $inhalt; - break; - - case 'link': - case 'list': - case 'insert': - $value->linkToObjectId = intval($inhalt); - break; - } - - $value->page = &$this->page; - - // Ermitteln, ob Inhalt sofort freigegeben werden kann und soll - if ( $this->page->hasRight( Permission::ACL_RELEASE ) && $this->request->has('release') ) - $value->publish = true; - else - $value->publish = false; - -// Html::debug($inhalt,'Eingabe'); -// Html::debug($value,'Inhalt'); - - // Inhalt speichern. - // Inhalt in allen Sprachen gleich? - if ( $value->element->allLanguages ) - { - // Inhalt fuer jede Sprache einzeln speichern. - $p = new Project(); - foreach( $p->getLanguageIds() as $languageid ) - { - $value->languageid = $languageid; - $value->add(); - } - } - else - { - // sonst nur 1x speichern (fuer die aktuelle Sprache) - $value->languageid = $this->request->getVar(RequestParams::PARAM_LANGUAGE_ID); - $value->add(); - } - } - } - $this->page->setTimestamp(); // "Letzte Aenderung" setzen - - } -} diff --git a/modules/cms/action/pageelement/PageelementDiffAction.class.php b/modules/cms/action/pageelement/PageelementDiffAction.class.php @@ -10,8 +10,8 @@ use util\Text; class PageelementDiffAction extends PageelementAction implements Method { public function view() { - $value1id = $this->request->getText('compareid'); - $value2id = $this->request->getVar('withid' ); + $value1id = $this->request->getNumber('compareid'); + $value2id = $this->request->getNumber('withid' ); // Wenn Value1-Id groesser als Value2-Id, dann Variablen tauschen if ( $value1id == $value2id ) diff --git a/modules/cms/action/pageelement/PageelementReleaseAction.class.php b/modules/cms/action/pageelement/PageelementReleaseAction.class.php @@ -25,7 +25,7 @@ class PageelementReleaseAction extends PageelementAction implements Method { $this->value->elementid = $this->element->elementid; $this->value->element->load(); - $this->value->valueid = intval($this->request->getVar('valueid')); + $this->value->valueid = $this->request->getNumber('valueid'); $this->value->loadWithId(); if ( $this->value->pageid != $this->page->pageid ) diff --git a/modules/cms/action/project/ProjectCopyAction.class.php b/modules/cms/action/project/ProjectCopyAction.class.php @@ -27,7 +27,7 @@ class ProjectCopyAction extends ProjectAction implements Method { if ( $this->request->has('ok') ) { - $this->project->export( $this->request->getVar('dbid') ); + $this->project->export( $this->request->getNumber('dbid') ); $this->addNoticeFor($this->project,Messages::DONE); } diff --git a/modules/cms/action/project/ProjectPropAction.class.php b/modules/cms/action/project/ProjectPropAction.class.php @@ -19,17 +19,17 @@ class ProjectPropAction extends ProjectAction implements Method { public function post() { if ( $this->request->getText('name') != '') { - $this->project->name = $this->request->getVar('name' ,RequestParams::FILTER_ALPHANUM); - $this->project->url = $this->request->getVar('url' ,RequestParams::FILTER_ALPHANUM); - $this->project->target_dir = $this->request->getVar('target_dir' ,RequestParams::FILTER_RAW ); - $this->project->ftp_url = $this->request->getVar('ftp_url' ,RequestParams::FILTER_RAW ); - $this->project->ftp_passive = $this->request->getVar('ftp_passive' ,RequestParams::FILTER_RAW ); - $this->project->cmd_after_publish = $this->request->getVar('cmd_after_publish' ,RequestParams::FILTER_RAW ); - $this->project->content_negotiation = $this->request->getVar('content_negotiation',RequestParams::FILTER_NUMBER ); - $this->project->cut_index = $this->request->getVar('cut_index' ,RequestParams::FILTER_NUMBER ); - $this->project->publishFileExtension = $this->request->getVar('publishFileExtension',RequestParams::FILTER_NUMBER ); - $this->project->publishPageExtension = $this->request->getVar('publishPageExtension',RequestParams::FILTER_NUMBER ); - $this->project->linkAbsolute = $this->request->getVar('linksAbsolute' ,RequestParams::FILTER_NUMBER ) == '1'; + $this->project->name = $this->request->getAlphanum('name' ); + $this->project->url = $this->request->getAlphanum('url' ); + $this->project->target_dir = $this->request->getRaw('target_dir' ); + $this->project->ftp_url = $this->request->getRaw('ftp_url' ); + $this->project->ftp_passive = $this->request->getRaw('ftp_passive' ); + $this->project->cmd_after_publish = $this->request->getRaw('cmd_after_publish' ); + $this->project->content_negotiation = $this->request->getNumber('content_negotiation' ); + $this->project->cut_index = $this->request->getNumber('cut_index' ); + $this->project->publishFileExtension = $this->request->getNumber('publishFileExtension' ); + $this->project->publishPageExtension = $this->request->getNumber('publishPageExtension' ); + $this->project->linkAbsolute = $this->request->getNumber('linksAbsolute' ); $this->addNoticeFor($this->project,Messages::SAVED); $this->project->save(); // speichern diff --git a/modules/cms/action/template/TemplateAddelAction.class.php b/modules/cms/action/template/TemplateAddelAction.class.php @@ -32,7 +32,7 @@ class TemplateAddelAction extends TemplateAction implements Method { } public function post() { - $name = $this->request->getVar('name',RequestParams::FILTER_ALPHANUM); + $name = $this->request->getAlphanum('name'); if ( empty($name) ) throw new \util\exception\ValidationException('name'); diff --git a/modules/cms/action/text/TextValueAction.class.php b/modules/cms/action/text/TextValueAction.class.php @@ -21,7 +21,7 @@ class TextValueAction extends TextAction implements Method { public function post() { - $this->text->value = $this->request->getVar('text', RequestParams::FILTER_RAW); + $this->text->value = $this->request->getText('text'); $this->text->saveValue(); $this->addNoticeFor($this->text,Messages::VALUE_SAVED); diff --git a/modules/cms/action/url/UrlValueAction.class.php b/modules/cms/action/url/UrlValueAction.class.php @@ -23,7 +23,7 @@ class UrlValueAction extends UrlAction implements Method { public function post() { - $this->url->url = $this->request->getVar('url'); + $this->url->url = $this->request->getText('url'); $this->url->save(); $this->addNoticeFor( $this->url,Messages::SAVED ); diff --git a/modules/cms/action/user/UserAddgrouptouserAction.class.php b/modules/cms/action/user/UserAddgrouptouserAction.class.php @@ -10,7 +10,7 @@ class UserAddgrouptouserAction extends UserAction implements Method { } public function post() { - $group = new Group( $this->request->getRequiredId('groupid' ) ); + $group = new Group( $this->request->getRequiredNumber('groupid' ) ); $group->load(); $this->user->addGroup( $group->groupid ); diff --git a/modules/cms/action/user/UserPwAction.class.php b/modules/cms/action/user/UserPwAction.class.php @@ -20,7 +20,7 @@ class UserPwAction extends UserAction implements Method { $password = $this->request->getText('password'); if ( !$password ) - $password = $this->request->getVar('password_proposal'); + $password = $this->request->getText('password_proposal'); if ( strlen($password) < Configuration::subset(['security','password'])->get('min_length',8) ) throw new ValidationException('password',Messages::PASSWORD_MINLENGTH ); diff --git a/modules/cms/model/Group.class.php b/modules/cms/model/Group.class.php @@ -118,7 +118,7 @@ class Group extends ModelBase $sql->setInt( 'groupid',$this->groupid ); $row = $sql->getRow(); - if ( count($row) > 0 ) { + if ( $row ) { $this->name = $row['name' ]; $this->parentid = $row['parentid']; } diff --git a/modules/cms/ui/action/tree/TreeBranchAction.class.php b/modules/cms/ui/action/tree/TreeBranchAction.class.php @@ -7,7 +7,7 @@ use util\Tree; class TreeBranchAction extends TreeAction implements Method { public function view() { - $type = $this->request->getVar('type'); + $type = $this->request->getAlphanum('type'); $branch = $this->loadTreeBranch( $type ); @@ -27,7 +27,7 @@ class TreeBranchAction extends TreeAction implements Method { { $method = new \ReflectionMethod($tree,$type); if ( $this->request->has('id')) - $method->invoke($tree, $this->request->getVar('id') ); + $method->invoke($tree, $this->request->getId() ); else $method->invoke($tree); // <== Executing the Action } diff --git a/modules/cms/ui/action/tree/TreePathAction.class.php b/modules/cms/ui/action/tree/TreePathAction.class.php @@ -18,8 +18,8 @@ use cms\action\Method; class TreePathAction extends TreeAction implements Method { public function view() { - $type = $this->request->getVar('type'); - $id = $this->request->getVar('id', RequestParams::FILTER_ALPHANUM); + $type = $this->request->getAlphanum('type'); + $id = $this->request->getAlphanum('id' ); // Calculating the path to the actual object $result = $this->calculatePath($type, $id); diff --git a/modules/cms/ui/themes/default/html/views/page/form.php b/modules/cms/ui/themes/default/html/views/page/form.php @@ -1,105 +0,0 @@ -<?php /* THIS FILE IS GENERATED from form.tpl.src.xml - DO NOT CHANGE */ defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> - <form name="<?php echo O::escapeHtml('') ?>" target="<?php echo O::escapeHtml('_self') ?>" data-target="<?php echo O::escapeHtml('view') ?>" action="<?php echo O::escapeHtml('./') ?>" data-method="<?php echo O::escapeHtml('form') ?>" data-action="<?php echo O::escapeHtml('page') ?>" data-id="<?php echo O::escapeHtml(''.@$_id.'') ?>" method="<?php echo O::escapeHtml('POST') ?>" enctype="<?php echo O::escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo O::escapeHtml('') ?>" data-autosave="<?php echo O::escapeHtml('') ?>" class="<?php echo O::escapeHtml('or-form or-page') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('or-form-headline') ?>"><?php echo O::escapeHtml('') ?></div> - <div class="<?php echo O::escapeHtml('or-form-content') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('token') ?>" value="<?php echo O::escapeHtml(''.@$_token.'') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('action') ?>" value="<?php echo O::escapeHtml('page') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('subaction') ?>" value="<?php echo O::escapeHtml('form') ?>" /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('id') ?>" value="<?php echo O::escapeHtml(''.@$_id.'') ?>" /><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input or-table-filter-input') ?>" /><?php echo O::escapeHtml('') ?> - </div> - <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('') ?> - <?php $if4=(($el)==FALSE); if($if4) { ?> - <tr><?php echo O::escapeHtml('') ?> - <td colspan="<?php echo O::escapeHtml('4') ?>"><?php echo O::escapeHtml('') ?> - <span><?php echo O::escapeHtml(''.@O::lang('NOT_FOUND').'') ?></span> - </td> - </tr> - <?php } ?> - <?php $if4=!(($el)==FALSE); if($if4) { ?> - <tr><?php echo O::escapeHtml('') ?> - <td class="<?php echo O::escapeHtml('or-help') ?>"><?php echo O::escapeHtml('') ?> - <span><?php echo O::escapeHtml(''.@O::lang('PAGE_ELEMENT_NAME').'') ?></span> - </td> - <td class="<?php echo O::escapeHtml('or-help') ?>"><?php echo O::escapeHtml('') ?> - <span><?php echo O::escapeHtml(''.@O::lang('CHANGE').'') ?></span> - </td> - <td class="<?php echo O::escapeHtml('or-help') ?>"><?php echo O::escapeHtml('') ?> - <span><?php echo O::escapeHtml(''.@O::lang('VALUE').'') ?></span> - </td> - </tr> - <?php foreach((array)@$el 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('') ?> - <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-el_'.@$type.'') ?>"><?php echo O::escapeHtml('') ?></i> - <span><?php echo O::escapeHtml(''.@$name.'') ?></span> - </label> - </td> - <td><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml(''.@$saveid.'') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$$saveid){ ?>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('') ?> - <?php $if8=(in_array($type,explode(",",text,date,number)); if($if8) { ?> - <input name="<?php echo O::escapeHtml(''.@$id.'') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('255') ?>" value="<?php echo O::escapeHtml(''.@$value.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> - <?php } ?> - <?php $if8=($type=='longtext'); if($if8) { ?> - <textarea name="<?php echo O::escapeHtml(''.@$id.'') ?>" class="<?php echo O::escapeHtml('or-input or-inputarea') ?>"><?php echo O::escapeHtml(''.@$value.'') ?></textarea> - <?php } ?> - <?php $if8=(in_array($type,explode(",",select,link,list)); if($if8) { ?> - <select name="<?php echo O::escapeHtml(''.@$id.'') ?>" size="<?php echo O::escapeHtml('1') ?>" class="<?php echo O::escapeHtml('or-input') ?>"><?php echo O::escapeHtml('') ?> - <?php foreach($list as $_key=>$_value) { ?> - <option value="<?php echo O::escapeHtml(''.@$_key.'') ?>" <?php if($_key==$value){ ?>selected="<?php echo O::escapeHtml('selected') ?>"<?php } ?>><?php echo O::escapeHtml(''.@$_value.'') ?></option> - <?php } ?> - </select> - <?php } ?> - </td> - </tr> - <?php } ?> - <?php } ?> - </table> - </div> - </div> - <section class="<?php echo O::escapeHtml('or-group or-collapsible or-collapsible--is-open or-collapsible--show') ?>"><?php echo O::escapeHtml('') ?> - <h2 class="<?php echo O::escapeHtml('or-collapsible-title or-group-title or-collapsible-act-switch') ?>"><?php echo O::escapeHtml('') ?> - <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--node-closed or-collapsible--on-closed') ?>"><?php echo O::escapeHtml('') ?></i> - <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--node-open or-collapsible--on-open') ?>"><?php echo O::escapeHtml('') ?></i> - <span><?php echo O::escapeHtml(''.@O::lang('options').'') ?></span> - </h2> - <div class="<?php echo O::escapeHtml('or-collapsible-value or-group-value') ?>"><?php echo O::escapeHtml('') ?> - <?php $if4=(isset($release)); if($if4) { ?> - <div class="<?php echo O::escapeHtml('or-') ?>"><?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> - </div> - <?php } ?> - <?php $if4=(isset($publish)); if($if4) { ?> - <div class="<?php echo O::escapeHtml('or-') ?>"><?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> - </div> - <?php } ?> - </div> - </section> - - </div> - <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('or-btn or-btn--control or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> - <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--form-cancel') ?>"><?php echo O::escapeHtml('') ?></i> - <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('CANCEL').'') ?></span> - </div> - <div class="<?php echo O::escapeHtml('or-btn or-btn--control or-btn--primary or-act-form-save') ?>"><?php echo O::escapeHtml('') ?> - <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--form-ok') ?>"><?php echo O::escapeHtml('') ?></i> - <span class="<?php echo O::escapeHtml('or-form-btn-label') ?>"><?php echo O::escapeHtml(''.@O::lang('button_ok').'') ?></span> - </div> - </div> - </form>- \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/page/form.tpl.src.xml b/modules/cms/ui/themes/default/html/views/page/form.tpl.src.xml @@ -1,74 +0,0 @@ -<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <form> - <table> - <if empty="${el}"> - <row> - <column colspan="4"> - <text value="${message:NOT_FOUND}"/> - </column> - </row> - </if> - <if not="" empty="${el}"> - <row> - <column class="help"> - <text value="${message:PAGE_ELEMENT_NAME}"/> - </column> - <column class="help"> - <text value="${message:CHANGE}"/> - </column> - <column class="help"> - <text value="${message:VALUE}"/> - </column> - </row> - <list list="${el}" extract="true"> - <row class="data"> - <column> - <label for="${saveid}"> - <image elementtype="${type}"/> - <text value="${name}"/> - </label> - </column> - <column> - <checkbox name="${saveid}" default="false" readonly="false"/> - </column> - <column> - <if value="${type}" contains="text,date,number"> - <input index="true" type="text" name="${id}" default="${value}" size="40" - maxlength="255" onchange="onchange"/> - </if> - <if value="${type}" equals="longtext"> - <inputarea index="true" name="${id}" rows="7" cols="50" onchange="onchange" - default="${value}"/> - </if> - <if value="${type}" contains="select,link,list"> - <selectbox name="${id}" list="list" default="${value}"/> - </if> - </column> - </row> - </list> - </if> - </table> - <group title="${message:options}"> - <if present="release"> - <part> - <checkbox name="release"/> - <label for="release"> - <text value=" "/> - <text value="${message:RELEASE}"/> - </label> - </part> - </if> - <if present="publish"> - <part> - <checkbox name="publish"/> - <label for="publish"> - <text value=" "/> - <text value="${message:PAGE_PUBLISH_AFTER_SAVE}"/> - </label> - </part> - </if> - </group> - <button type="ok"/> - </form> -</output>