commit 3789418251ca93db25622330b64b524cf3816671
parent 3498f2f27b3df87d76d3d8a29301a28f2900ae2c
Author: Jan Dankert <devnull@localhost>
Date: Sun, 9 Dec 2018 23:36:39 +0100
Neues Makro für den Aufbau eines Suchindexes.
Diffstat:
9 files changed, 113 insertions(+), 48 deletions(-)
diff --git a/modules/cms-macros/macro/SearchIndex.class.php b/modules/cms-macros/macro/SearchIndex.class.php
@@ -0,0 +1,65 @@
+<?php
+
+use cms\model\Folder;
+use cms\model\Page;
+use cms\model\Project;
+use cms\publish\PublishEdit;
+
+
+/**
+ * Creates a search index for all pages in this project.
+ * @author Jan Dankert
+ */
+class SearchIndex extends Macro
+{
+ /**
+ * Beschreibung dieser Klasse
+ * @type String
+ */
+ var $description = '';
+
+
+ /**
+ * Creates a search index for alle pages in the current project.
+ */
+ function execute()
+ {
+ $searchIndex = array();
+
+ $project = new Project( $this->page->projectid );
+
+ $f = new Folder( $project->getRootObjectId() );
+ $f->load();
+
+ foreach ($f->getAllSubFolderIds() as $fid) {
+
+ $tf = new Folder($fid);
+ $tf->load();
+ foreach( $tf->getPages() as $pageid )
+ {
+ $page = new Page( $pageid );
+
+ // Den einfachen Publisher benutzen, damit nur beschreibbare Inhalte auch in den Index wandern.
+ $page->publisher = new PublishEdit();
+ $page->load();
+ $page->generate();
+ $searchIndex[ $pageid ] = array(
+ 'url' => $this->page->path_to_object( $pageid ),
+ 'content'=> array_reduce(
+ $page->values,
+ function($act, $value)
+ {
+ return $act.' '.$value->value;
+ },
+ ''
+ )
+ );
+ }
+ }
+
+ // Output search index as JSON
+ $json = new JSON();
+ $this->output( $json->encode( $searchIndex ) );
+ }
+
+}+
\ No newline at end of file
diff --git a/modules/cms-publish/PublishEdit.class.php b/modules/cms-publish/PublishEdit.class.php
@@ -18,7 +18,7 @@ class PublishEdit extends Publish
*/
public function linkToObject( $from, $to )
{
- return '';
+ return '->'.$to;
}
public function isPublic()
diff --git a/modules/cms-ui/themes/default/html/views/element/advanced.php b/modules/cms-ui/themes/default/html/views/element/advanced.php
@@ -6,7 +6,7 @@
<fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div>
<div class="line">
<div class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('ELEMENT_TYPE')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('ELEMENT_TYPE')))); ?></span>
</div>
<div class="input">
diff --git a/modules/cms-ui/themes/default/html/views/element/prop.php b/modules/cms-ui/themes/default/html/views/element/prop.php
@@ -5,7 +5,7 @@
<?php $if2=(config('security','disable_dynamic_code')); if($if2){?>
<?php $if3=(!'1'); if($if3){?>
<div class="message warn">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'NOTICE_CODE_DISABLED'.'')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'NOTICE_CODE_DISABLED'.'')))); ?></span>
</div>
<?php } ?>
@@ -15,7 +15,7 @@
<?php $if4=(isset($subtype)); if($if4){?>
<div class="line">
<div class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('ELEMENT_SUBTYPE')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('ELEMENT_SUBTYPE')))); ?></span>
</div>
<div class="input">
@@ -24,7 +24,7 @@
</select></div>
<?php } ?>
<?php $if7=!(isset($subtypes)); if($if7){?>
- <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_subtype" name="subtype<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="text" value="<?php echo Text::encodeHtml(@$subtype) ?>" /><?php if ('') { ?><input type="hidden" name="subtype" value="<?php $subtype ?>"/><?php } ?></div>
+ <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_subtype" name="<?php if ('') echo ''.'_' ?>subtype<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$subtype) ?>" /><?php if ('') { ?><input type="hidden" name="subtype" value="<?php $subtype ?>"/><?php } ?></div>
<?php } ?>
</div>
@@ -50,7 +50,7 @@
} ?>
<label for="<?php echo REQUEST_ID ?>_with_icon" class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_WITH_ICON')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_WITH_ICON')))); ?></span>
</label>
</div>
@@ -76,7 +76,7 @@
} ?>
<label for="<?php echo REQUEST_ID ?>_inherit" class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_INHERIT')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_INHERIT')))); ?></span>
</label>
</div>
@@ -102,7 +102,7 @@
} ?>
<label for="<?php echo REQUEST_ID ?>_all_languages" class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_ALL_LANGUAGES')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_ALL_LANGUAGES')))); ?></span>
</label>
</div>
@@ -128,7 +128,7 @@
} ?>
<label for="<?php echo REQUEST_ID ?>_writable" class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_writable')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_writable')))); ?></span>
</label>
</div>
@@ -137,11 +137,11 @@
<?php $if4=(isset($width)); if($if4){?>
<div class="line">
<div class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('width')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('width')))); ?></span>
</div>
<div class="input">
- <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_width" name="width<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="text" value="<?php echo Text::encodeHtml(@$width) ?>" /><?php if ('') { ?><input type="hidden" name="width" value="<?php $width ?>"/><?php } ?></div>
+ <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_width" name="<?php if ('') echo ''.'_' ?>width<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$width) ?>" /><?php if ('') { ?><input type="hidden" name="width" value="<?php $width ?>"/><?php } ?></div>
</div>
</div>
@@ -149,11 +149,11 @@
<?php $if4=(isset($height)); if($if4){?>
<div class="line">
<div class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('height')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('height')))); ?></span>
</div>
<div class="input">
- <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_height" name="height<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="text" value="<?php echo Text::encodeHtml(@$height) ?>" /><?php if ('') { ?><input type="hidden" name="height" value="<?php $height ?>"/><?php } ?></div>
+ <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_height" name="<?php if ('') echo ''.'_' ?>height<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$height) ?>" /><?php if ('') { ?><input type="hidden" name="height" value="<?php $height ?>"/><?php } ?></div>
</div>
</div>
@@ -161,7 +161,7 @@
<?php $if4=(isset($dateformat)); if($if4){?>
<div class="line">
<div class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DATEFORMAT')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DATEFORMAT')))); ?></span>
</div>
<div class="input">
@@ -173,7 +173,7 @@
<?php $if4=(isset($format)); if($if4){?>
<div class="line">
<div class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_FORMAT')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_FORMAT')))); ?></span>
</div>
<div class="input">
@@ -185,11 +185,11 @@
<?php $if4=(isset($decimals)); if($if4){?>
<div class="line">
<div class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DECIMALS')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DECIMALS')))); ?></span>
</div>
<div class="input">
- <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_decimals" name="decimals<?php if ('') echo '_disabled' ?>" type="text" maxlength="2" class="text" value="<?php echo Text::encodeHtml(@$decimals) ?>" /><?php if ('') { ?><input type="hidden" name="decimals" value="<?php $decimals ?>"/><?php } ?></div>
+ <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_decimals" name="<?php if ('') echo ''.'_' ?>decimals<?php if ('') echo '_disabled' ?>" type="text" maxlength="2" class="" value="<?php echo Text::encodeHtml(@$decimals) ?>" /><?php if ('') { ?><input type="hidden" name="decimals" value="<?php $decimals ?>"/><?php } ?></div>
</div>
</div>
@@ -197,11 +197,11 @@
<?php $if4=(isset($dec_point)); if($if4){?>
<div class="line">
<div class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DEC_POINT')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DEC_POINT')))); ?></span>
</div>
<div class="input">
- <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_dec_point" name="dec_point<?php if ('') echo '_disabled' ?>" type="text" maxlength="5" class="text" value="<?php echo Text::encodeHtml(@$dec_point) ?>" /><?php if ('') { ?><input type="hidden" name="dec_point" value="<?php $dec_point ?>"/><?php } ?></div>
+ <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_dec_point" name="<?php if ('') echo ''.'_' ?>dec_point<?php if ('') echo '_disabled' ?>" type="text" maxlength="5" class="" value="<?php echo Text::encodeHtml(@$dec_point) ?>" /><?php if ('') { ?><input type="hidden" name="dec_point" value="<?php $dec_point ?>"/><?php } ?></div>
</div>
</div>
@@ -209,11 +209,11 @@
<?php $if4=(isset($thousand_sep)); if($if4){?>
<div class="line">
<div class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_thousand_sep')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_thousand_sep')))); ?></span>
</div>
<div class="input">
- <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_thousand_sep" name="thousand_sep<?php if ('') echo '_disabled' ?>" type="text" maxlength="1" class="text" value="<?php echo Text::encodeHtml(@$thousand_sep) ?>" /><?php if ('') { ?><input type="hidden" name="thousand_sep" value="<?php $thousand_sep ?>"/><?php } ?></div>
+ <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_thousand_sep" name="<?php if ('') echo ''.'_' ?>thousand_sep<?php if ('') echo '_disabled' ?>" type="text" maxlength="1" class="" value="<?php echo Text::encodeHtml(@$thousand_sep) ?>" /><?php if ('') { ?><input type="hidden" name="thousand_sep" value="<?php $thousand_sep ?>"/><?php } ?></div>
</div>
</div>
@@ -221,11 +221,11 @@
<?php $if4=(isset($default_text)); if($if4){?>
<div class="line">
<div class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_default_text')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_default_text')))); ?></span>
</div>
<div class="input">
- <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_default_text" name="default_text<?php if ('') echo '_disabled' ?>" type="text" maxlength="255" class="text" value="<?php echo Text::encodeHtml(@$default_text) ?>" /><?php if ('') { ?><input type="hidden" name="default_text" value="<?php $default_text ?>"/><?php } ?></div>
+ <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_default_text" name="<?php if ('') echo ''.'_' ?>default_text<?php if ('') echo '_disabled' ?>" type="text" maxlength="255" class="" value="<?php echo Text::encodeHtml(@$default_text) ?>" /><?php if ('') { ?><input type="hidden" name="default_text" value="<?php $default_text ?>"/><?php } ?></div>
</div>
</div>
@@ -233,11 +233,11 @@
<?php $if4=(isset($default_longtext)); if($if4){?>
<div class="line">
<div class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_default_longtext')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_default_longtext')))); ?></span>
</div>
<div class="input">
- <div class="inputholder"><textarea class="inputarea" name="default_longtext"><?php echo Text::encodeHtml($default_longtext) ?></textarea></div>
+ <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>default_longtext<?php if ('') echo '_disabled' ?>"><?php echo Text::encodeHtml($default_longtext) ?></textarea></div>
</div>
</div>
@@ -245,11 +245,11 @@
<?php $if4=(isset($parameters)); if($if4){?>
<div class="line">
<div class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DYNAMIC_PARAMETERS')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DYNAMIC_PARAMETERS')))); ?></span>
</div>
<div class="input">
- <div class="inputholder"><textarea class="inputarea" name="parameters"><?php echo Text::encodeHtml($parameters) ?></textarea></div>
+ <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>parameters<?php if ('') echo '_disabled' ?>"><?php echo Text::encodeHtml($parameters) ?></textarea></div>
</div>
</div>
@@ -258,15 +258,15 @@
</div>
<div class="input">
<?php foreach($dynamic_class_parameters as $paramName=>$defaultValue){ ?>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities($paramName))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities($paramName))); ?></span>
- <span class="text"><?php echo nl2br(' ('); ?></span>
+ <span><?php echo nl2br(' ('); ?></span>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_DEFAULT')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_DEFAULT')))); ?></span>
- <span class="text"><?php echo nl2br(') = '); ?></span>
+ <span><?php echo nl2br(') = '); ?></span>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities($defaultValue))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities($defaultValue))); ?></span>
<br/>
@@ -277,11 +277,11 @@
<?php $if4=(isset($select_items)); if($if4){?>
<div class="line">
<div class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_select_items')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_select_items')))); ?></span>
</div>
<div class="input">
- <div class="inputholder"><textarea class="inputarea" name="select_items"><?php echo Text::encodeHtml($select_items) ?></textarea></div>
+ <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>select_items<?php if ('') echo '_disabled' ?>"><?php echo Text::encodeHtml($select_items) ?></textarea></div>
</div>
</div>
@@ -289,7 +289,7 @@
<?php $if4=(isset($linkelement)); if($if4){?>
<div class="line">
<div class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_LINK')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_LINK')))); ?></span>
</div>
<div class="input">
@@ -301,7 +301,7 @@
<?php $if4=(isset($name)); if($if4){?>
<div class="line">
<div class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('ELEMENT_NAME')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('ELEMENT_NAME')))); ?></span>
</div>
<div class="input">
@@ -313,7 +313,7 @@
<?php $if4=(isset($folderobjectid)); if($if4){?>
<div class="line">
<div class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DEFAULT_FOLDEROBJECT')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DEFAULT_FOLDEROBJECT')))); ?></span>
</div>
<div class="input">
@@ -325,7 +325,7 @@
<?php $if4=(isset($default_objectid)); if($if4){?>
<div class="line">
<div class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DEFAULT_OBJECT')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DEFAULT_OBJECT')))); ?></span>
</div>
<div class="input">
@@ -337,11 +337,11 @@
<?php $if4=(isset($code)); if($if4){?>
<div class="line">
<div class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_code')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_code')))); ?></span>
</div>
<div class="input">
- <div class="inputholder"><textarea class="inputarea" name="code"><?php echo Text::encodeHtml($code) ?></textarea></div>
+ <div class="inputholder"><textarea class="inputarea" name="<?php if ('') echo ''.'_' ?>code<?php if ('') echo '_disabled' ?>"><?php echo Text::encodeHtml($code) ?></textarea></div>
</div>
</div>
diff --git a/modules/cms-ui/themes/default/html/views/file/edit.php b/modules/cms-ui/themes/default/html/views/file/edit.php
@@ -9,7 +9,7 @@
<div class="input">
<br/>
- <input size="40" id="req15442280991882256107_file" type="file" name="file" class="upload" />
+ <input size="40" id="req1544228380881665885_file" type="file" name="file" class="upload" />
<br/>
diff --git a/modules/cms-ui/themes/default/html/views/pageelement/pub.php b/modules/cms-ui/themes/default/html/views/pageelement/pub.php
@@ -27,7 +27,7 @@
} ?>
<label for="<?php echo REQUEST_ID ?>_files" class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_files')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_files')))); ?></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
@@ -5,17 +5,17 @@
<form name="" target="_self" data-target="view" action="./" data-method="addel" data-action="template" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form template" data-async="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="template" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="addel" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" />
<div class="line">
<div class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_name')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_name')))); ?></span>
</div>
<div class="input">
- <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="name<?php if ('') echo '_disabled' ?>" required="required" autofocus="autofocus" type="text" maxlength="50" class="text" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if ('') { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div>
+ <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if ('') echo '_disabled' ?>" required="required" autofocus="autofocus" type="text" maxlength="50" class="" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if ('') { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div>
</div>
</div>
<div class="line">
<div class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('element_type')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('element_type')))); ?></span>
</div>
<div class="input">
@@ -46,7 +46,7 @@
}
} ?>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_template_srcelement'.'')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_template_srcelement'.'')))); ?></span>
</label>
</div>
diff --git a/modules/cms-ui/themes/default/html/views/template/extension.php b/modules/cms-ui/themes/default/html/views/template/extension.php
@@ -5,7 +5,7 @@
<fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo $name ?></legend><div>
<?php $$name= $extension; ?>
- <label class="or-form-row"><span class="or-form-label">?extension?</span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_<?php echo $name ?>" name="<?php echo $name ?><?php if ('') echo '_disabled' ?>" required="required" type="text" maxlength="10" class="text" value="<?php echo Text::encodeHtml(@$$name) ?>" /><?php if ('') { ?><input type="hidden" name="<?php echo $name ?>" value="<?php $$name ?>"/><?php } ?></div></span></label>
+ <label class="or-form-row"><span class="or-form-label">?extension?</span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_<?php echo $name ?>" name="<?php if ('') echo ''.'_' ?><?php echo $name ?><?php if ('') echo '_disabled' ?>" required="required" type="text" maxlength="10" class="" value="<?php echo Text::encodeHtml(@$$name) ?>" /><?php if ('') { ?><input type="hidden" name="<?php echo $name ?>" value="<?php $$name ?>"/><?php } ?></div></span></label>
</div></fieldset>
<?php } ?>
diff --git a/modules/util/Macro.class.php b/modules/util/Macro.class.php
@@ -32,7 +32,6 @@ class Macro
/**
* @var \cms\model\Project Projekt
*/
- var $project;
var $output = '';
var $objectid = 0;
