@@ -1,27 +1,27 @@

 <!-- indexer::stop -->

-<div class="<?php echo $this->class; ?> <?php echo $this->tableless ? 'tableless' : 'tableform'; ?> block"<?php echo $this->cssID; ?><?php if ($this->style): ?> style="<?php echo $this->style; ?>"<?php endif; ?>>

+<div class="<?= $this->class; ?> <?php echo $this->tableless ? 'tableless' : 'tableform'; ?> block"<?php echo $this->cssID; ?><?php if ($this->style): ?> style="<?php echo $this->style; ?>"<?php endif; ?>>

   <?php if ($this->headline): ?>

-    <<?php echo $this->hl; ?>><?php echo $this->headline; ?></<?php echo $this->hl; ?>>

+    <<?= $this->hl; ?>><?php echo $this->headline; ?></<?php echo $this->hl; ?>>

   <?php endif; ?>

-  <form<?php if ($this->action): ?> action="<?php echo $this->action; ?>"<?php endif; ?> id="<?php echo $this->formId; ?>" method="<?php echo $this->method; ?>" enctype="<?php echo $this->enctype; ?>"<?php echo $this->attributes; ?><?php echo $this->novalidate; ?>>

+  <form<?php if ($this->action): ?> action="<?= $this->action; ?>"<?php endif; ?> id="<?php echo $this->formId; ?>" method="<?php echo $this->method; ?>" enctype="<?php echo $this->enctype; ?>"<?php echo $this->attributes; ?><?php echo $this->novalidate; ?>>

     <div class="formbody">

       <?php if ($this->method != 'get'): ?>

-        <input type="hidden" name="FORM_SUBMIT" value="<?php echo $this->formSubmit; ?>">

+        <input type="hidden" name="FORM_SUBMIT" value="<?= $this->formSubmit; ?>">

         <input type="hidden" name="REQUEST_TOKEN" value="{{request_token}}">

         <?php if ($this->maxFileSize): ?>

-          <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $this->maxFileSize; ?>">

+          <input type="hidden" name="MAX_FILE_SIZE" value="<?= $this->maxFileSize; ?>">

         <?php endif; ?>

       <?php endif; ?>

-      <?php echo $this->hidden; ?>

+      <?= $this->hidden; ?>

       <?php if (!$this->tableless): ?>

         <table>

-          <?php echo $this->fields; ?>

+          <?= $this->fields; ?>

         </table>

       <?php else: ?>

-        <?php echo $this->fields; ?>

+        <?= $this->fields; ?>

       <?php endif; ?>

     </div>

   </form>

@@ -2,24 +2,24 @@

 <?php $this->block('label'); ?>

   <?php if ($this->hasErrors()): ?>

-    <span class="errortip" title="<?php echo htmlspecialchars($this->getErrorsAsString()); ?>" data-tooltip="position: top; offsetY: 10; theme: tooltipster-error; contentAsHTML: true;">?</span>

+    <span class="errortip" title="<?= htmlspecialchars($this->getErrorsAsString()); ?>" data-tooltip="position: top; offsetY: 10; theme: tooltipster-error; contentAsHTML: true;">?</span>

   <?php endif; ?>

   <?php if ($this->label): ?>

-    <label for="ctrl_<?php echo $this->id; ?>"<?php if ($this->class): ?> class="<?php echo $this->class; ?>"<?php endif; ?>>

+    <label for="ctrl_<?= $this->id; ?>"<?php if ($this->class): ?> class="<?php echo $this->class; ?>"<?php endif; ?>>

       <?php if ($this->mandatory): ?>

-        <span class="invisible"><?php echo $this->mandatoryField; ?></span> <?php echo $this->getQuestion(); ?><span class="mandatory">*</span>

+        <span class="invisible"><?= $this->mandatoryField; ?></span> <?php echo $this->getQuestion(); ?><span class="mandatory">*</span>

       <?php else: ?>

-        <?php echo $this->getQuestion(); ?>

+        <?= $this->getQuestion(); ?>

       <?php endif; ?>

     </label>

   <?php endif; ?>

 <?php $this->endblock(); ?>

 <?php $this->block('field'); ?>

-  <input type="text" name="<?php echo $this->name; ?>" id="ctrl_<?php echo $this->id; ?>" class="captcha mandatory<?php if ($this->class) echo ' ' . $this->class; ?>" value=""<?php echo $this->getAttributes(); ?>>

+  <input type="text" name="<?= $this->name; ?>" id="ctrl_<?php echo $this->id; ?>" class="captcha mandatory<?php if ($this->class) echo ' ' . $this->class; ?>" value=""<?php echo $this->getAttributes(); ?>>

   <?php if ($this->addSubmit): ?>

-    <input type="submit" id="ctrl_<?php echo $this->id; ?>_submit" class="submit" value="<?php echo $this->slabel; ?>">

+    <input type="submit" id="ctrl_<?= $this->id; ?>_submit" class="submit" value="<?php echo $this->slabel; ?>">

   <?php endif; ?>

 <?php $this->endblock(); ?>

@@ -2,24 +2,24 @@

 <?php $this->block('field'); ?>

 <?php if ($this->hasErrors()): ?>

-  <span class="errortip" title="<?php echo htmlspecialchars($this->getErrorsAsString()); ?>" data-tooltip="position: top; offsetY: 10; theme: tooltipster-error; contentAsHTML: true;">?</span>

+  <span class="errortip" title="<?= htmlspecialchars($this->getErrorsAsString()); ?>" data-tooltip="position: top; offsetY: 10; theme: tooltipster-error; contentAsHTML: true;">?</span>

 <?php endif; ?>

-  <fieldset id="ctrl_<?php echo $this->id; ?>" class="checkbox_container<?php if ($this->class) echo ' ' . $this->class; ?>">

+  <fieldset id="ctrl_<?= $this->id; ?>" class="checkbox_container<?php if ($this->class) echo ' ' . $this->class; ?>">

     <?php if ($this->label): ?>

       <legend>

         <?php if ($this->mandatory): ?>

-          <span class="invisible"><?php echo $this->mandatoryField; ?></span> <?php echo $this->label; ?><span class="mandatory">*</span>

+          <span class="invisible"><?= $this->mandatoryField; ?></span> <?php echo $this->label; ?><span class="mandatory">*</span>

         <?php else: ?>

-          <?php echo $this->label; ?>

+          <?= $this->label; ?>

         <?php endif; ?>

       </legend>

     <?php endif; ?>

-    <input type="hidden" name="<?php echo $this->name; ?>" value="">

+    <input type="hidden" name="<?= $this->name; ?>" value="">

     <?php foreach ($this->getOptions() as $option): ?>

-      <span><input type="checkbox" name="<?php echo $option['name']; ?>" id="opt_<?php echo $option['id']; ?>" class="checkbox" value="<?php echo $option['value']; ?>"<?php echo $option['checked']; ?><?php echo $option['attributes']; ?>> <label id="lbl_<?php echo $option['id']; ?>" for="opt_<?php echo $option['id']; ?>"><?php echo $option['label']; ?></label></span>

+      <span><input type="checkbox" name="<?= $option['name']; ?>" id="opt_<?php echo $option['id']; ?>" class="checkbox" value="<?php echo $option['value']; ?>"<?php echo $option['checked']; ?><?php echo $option['attributes']; ?>> <label id="lbl_<?php echo $option['id']; ?>" for="opt_<?php echo $option['id']; ?>"><?php echo $option['label']; ?></label></span>

     <?php endforeach; ?>

   </fieldset>

@@ -1,14 +1,14 @@

 <?php if ($this->tableless): ?>

-  <div class="<?php echo $this->prefix; ?> explanation<?php if ($this->eSM_fl_width): ?> w<?php echo $this->eSM_fl_width; ?><?php endif; ?><?php if ($this->eSM_fl_clear): ?> clr<?php endif; ?>">

-    <?php echo $this->generate(); ?>

+  <div class="<?= $this->prefix; ?> explanation<?php if ($this->eSM_fl_width): ?> w<?php echo $this->eSM_fl_width; ?><?php endif; ?><?php if ($this->eSM_fl_clear): ?> clr<?php endif; ?>">

+    <?= $this->generate(); ?>

   </div>

 <?php else: ?>

-  <tr class="<?php echo $this->rowClass; ?>">

-    <td colspan="2" class="colspan explanation"><?php echo $this->generate(); ?></td>

+  <tr class="<?= $this->rowClass; ?>">

+    <td colspan="2" class="colspan explanation"><?= $this->generate(); ?></td>

   </tr>

 <?php endif; ?>

@@ -1,9 +1,9 @@

 <?php if ($this->fsType == 'fsStart'): ?>

-  <fieldset<?php if ($this->class): ?> class="<?php echo $this->class; ?>"<?php endif; ?>>

+  <fieldset<?php if ($this->class): ?> class="<?= $this->class; ?>"<?php endif; ?>>

   <?php if ($this->label): ?>

-    <legend><?php echo $this->label; ?></legend>

+    <legend><?= $this->label; ?></legend>

   <?php endif; ?>

 <?php else: ?>

@@ -1,14 +1,14 @@

 <?php if ($this->tableless): ?>

-  <div class="<?php echo $this->prefix; ?> headline w100">

-    <?php echo $this->generate(); ?>

+  <div class="<?= $this->prefix; ?> headline w100">

+    <?= $this->generate(); ?>

   </div>

 <?php else: ?>

-  <tr class="<?php echo $this->rowClass; ?>">

-    <td colspan="2" class="colspan headline"><?php echo $this->generate(); ?></td>

+  <tr class="<?= $this->rowClass; ?>">

+    <td colspan="2" class="colspan headline"><?= $this->generate(); ?></td>

   </tr>

 <?php endif; ?>

@@ -1,2 +1,2 @@

-<input type="hidden" name="<?php echo $this->name; ?>" value="<?php echo $this->value; ?>">

+<input type="hidden" name="<?= $this->name; ?>" value="<?php echo $this->value; ?>">

@@ -1,2 +1,2 @@

-<?php echo $this->html; ?>

+<?= $this->html; ?>

@@ -1,14 +1,14 @@

 <?php if ($this->tableless): ?>

-  <div class="<?php echo $this->class; ?>">

-    <?php echo $this->message; ?>

+  <div class="<?= $this->class; ?>">

+    <?= $this->message; ?>

   </div>

 <?php else: ?>

-  <tr class="<?php echo $this->class; ?>">

-    <td colspan="2"><div class="colspan"><?php echo $this->message; ?></div></td>

+  <tr class="<?= $this->class; ?>">

+    <td colspan="2"><div class="colspan"><?= $this->message; ?></div></td>

   </tr>

 <?php endif; ?>

@@ -2,40 +2,40 @@

 <?php $this->block('label'); ?>

   <?php if ($this->hasErrors()): ?>

-    <span class="errortip" title="<?php echo htmlspecialchars($this->getErrorsAsString()); ?>" data-tooltip="position: top; offsetY: 10; theme: tooltipster-error; contentAsHTML: true;">?</span>

+    <span class="errortip" title="<?= htmlspecialchars($this->getErrorsAsString()); ?>" data-tooltip="position: top; offsetY: 10; theme: tooltipster-error; contentAsHTML: true;">?</span>

   <?php endif; ?>

   <?php if ($this->label): ?>

-    <label for="ctrl_<?php echo $this->id; ?>"<?php if ($this->class): ?> class="<?php echo $this->class; ?>"<?php endif; ?>>

+    <label for="ctrl_<?= $this->id; ?>"<?php if ($this->class): ?> class="<?php echo $this->class; ?>"<?php endif; ?>>

       <?php if ($this->mandatory): ?>

-        <span class="invisible"><?php echo $this->mandatoryField; ?></span> <?php echo $this->label; ?><span class="mandatory">*</span>

+        <span class="invisible"><?= $this->mandatoryField; ?></span> <?php echo $this->label; ?><span class="mandatory">*</span>

       <?php else: ?>

-        <?php echo $this->label; ?>

+        <?= $this->label; ?>

       <?php endif; ?>

     </label>

   <?php endif; ?>

 <?php $this->endblock(); ?>

 <?php $this->block('field'); ?>

-  <input type="password" name="<?php echo $this->name; ?>" id="ctrl_<?php echo $this->id; ?>" class="text password<?php if ($this->class) echo ' ' . $this->class; ?>" value=""<?php echo $this->getAttributes(); ?>>

+  <input type="password" name="<?= $this->name; ?>" id="ctrl_<?php echo $this->id; ?>" class="text password<?php if ($this->class) echo ' ' . $this->class; ?>" value=""<?php echo $this->getAttributes(); ?>>

   <?php if ($this->addSubmit): ?>

-    <input type="submit" id="ctrl_<?php echo $this->id; ?>_submit" class="submit" value="<?php echo $this->slabel; ?>">

+    <input type="submit" id="ctrl_<?= $this->id; ?>_submit" class="submit" value="<?php echo $this->slabel; ?>">

   <?php endif; ?>

 <?php $this->endblock(); ?>

 <?php $this->block('label2'); ?>

   <?php if ($this->confirmLabel): ?>

-    <label for="ctrl_<?php echo $this->id; ?>_confirm" class="confirm<?php if ($this->class) echo ' ' . $this->class; ?>">

+    <label for="ctrl_<?= $this->id; ?>_confirm" class="confirm<?php if ($this->class) echo ' ' . $this->class; ?>">

       <?php if ($this->mandatory): ?>

-        <span class="invisible"><?php echo $this->mandatoryField; ?></span> <?php echo $this->confirmLabel; ?><span class="mandatory">*</span>

+        <span class="invisible"><?= $this->mandatoryField; ?></span> <?php echo $this->confirmLabel; ?><span class="mandatory">*</span>

       <?php else: ?>

-        <?php echo $this->confirmLabel; ?>

+        <?= $this->confirmLabel; ?>

       <?php endif; ?>

     </label>

   <?php endif; ?>

 <?php $this->endblock(); ?>

 <?php $this->block('field2'); ?>

-  <input type="password" name="<?php echo $this->name; ?>_confirm" id="ctrl_<?php echo $this->id; ?>_confirm" class="text password<?php if ($this->class) echo ' ' . $this->class; ?>" value=""<?php echo $this->getAttributes(); ?>>

+  <input type="password" name="<?= $this->name; ?>_confirm" id="ctrl_<?php echo $this->id; ?>_confirm" class="text password<?php if ($this->class) echo ' ' . $this->class; ?>" value=""<?php echo $this->getAttributes(); ?>>

 <?php $this->endblock(); ?>

@@ -2,22 +2,22 @@

 <?php $this->block('field'); ?>

   <?php if ($this->hasErrors()): ?>

-  <span class="errortip" title="<?php echo htmlspecialchars($this->getErrorsAsString()); ?>" data-tooltip="position: top; offsetY: 10; theme: tooltipster-error; contentAsHTML: true;">?</span>

+  <span class="errortip" title="<?= htmlspecialchars($this->getErrorsAsString()); ?>" data-tooltip="position: top; offsetY: 10; theme: tooltipster-error; contentAsHTML: true;">?</span>

   <?php endif; ?>

-  <fieldset id="ctrl_<?php echo $this->id; ?>" class="radio_container<?php if ($this->class) echo ' ' . $this->class; ?>">

+  <fieldset id="ctrl_<?= $this->id; ?>" class="radio_container<?php if ($this->class) echo ' ' . $this->class; ?>">

     <?php if ($this->label): ?>

       <legend>

         <?php if ($this->mandatory): ?>

-          <span class="invisible"><?php echo $this->mandatoryField; ?></span> <?php echo $this->label; ?><span class="mandatory">*</span>

+          <span class="invisible"><?= $this->mandatoryField; ?></span> <?php echo $this->label; ?><span class="mandatory">*</span>

         <?php else: ?>

-          <?php echo $this->label; ?>

+          <?= $this->label; ?>

         <?php endif; ?>

       </legend>

     <?php endif; ?>

     <?php foreach ($this->getOptions() as $option): ?>

-      <span><input type="radio" name="<?php echo $option['name']; ?>" id="opt_<?php echo $option['id']; ?>" class="radio" value="<?php echo $option['value']; ?>"<?php echo $option['checked']; ?><?php echo $option['attributes']; ?>> <label id="lbl_<?php echo $option['id']; ?>" for="opt_<?php echo $option['id']; ?>"><?php echo $option['label']; ?></label></span>

+      <span><input type="radio" name="<?= $option['name']; ?>" id="opt_<?php echo $option['id']; ?>" class="radio" value="<?php echo $option['value']; ?>"<?php echo $option['checked']; ?><?php echo $option['attributes']; ?>> <label id="lbl_<?php echo $option['id']; ?>" for="opt_<?php echo $option['id']; ?>"><?php echo $option['label']; ?></label></span>

     <?php endforeach; ?>

   </fieldset>

@@ -1,7 +1,7 @@

 <?php if ($this->tableless): ?>

-  <div class="<?php echo $this->prefix; ?><?php if ($this->class) echo ' ' . $this->class; ?><?php if ($this->eSM_fl_width): ?> w<?php echo $this->eSM_fl_width; ?><?php endif; ?><?php if ($this->eSM_fl_clear): ?> clr<?php endif; ?><?php if ($this->eSM_fl_class): ?> <?php echo $this->eSM_fl_class; ?><?php endif; ?>">

+  <div class="<?= $this->prefix; ?><?php if ($this->class) echo ' ' . $this->class; ?><?php if ($this->eSM_fl_width): ?> w<?php echo $this->eSM_fl_width; ?><?php endif; ?><?php if ($this->eSM_fl_clear): ?> clr<?php endif; ?><?php if ($this->eSM_fl_class): ?> <?php echo $this->eSM_fl_class; ?><?php endif; ?>">

     <?php $this->block('label'); ?>

     <?php $this->endblock(); ?>

@@ -15,7 +15,7 @@

 <?php else: ?>

-  <tr class="<?php echo $this->rowClass; ?>">

+  <tr class="<?= $this->rowClass; ?>">

     <td class="col_0 col_first">

       <?php $this->block('label'); ?>

          

@@ -1,7 +1,7 @@

 <?php if ($this->tableless): ?>

-  <div class="<?php echo $this->prefix; ?><?php if ($this->class) echo ' ' . $this->class; ?>">

+  <div class="<?= $this->prefix; ?><?php if ($this->class) echo ' ' . $this->class; ?>">

     <?php $this->block('label'); ?>

     <?php $this->endblock(); ?>

@@ -9,7 +9,7 @@

     <?php $this->endblock(); ?>

   </div>

-  <div class="<?php echo $this->prefix; ?> confirm<?php if ($this->class) echo ' ' . $this->class; ?>">

+  <div class="<?= $this->prefix; ?> confirm<?php if ($this->class) echo ' ' . $this->class; ?>">

     <?php $this->block('label2'); ?>

     <?php $this->endblock(); ?>

@@ -19,7 +19,7 @@

 <?php else: ?>

-  <tr class="<?php echo $this->rowClass; ?>">

+  <tr class="<?= $this->rowClass; ?>">

     <td class="col_0 col_first">

       <?php $this->block('label'); ?>

          

@@ -31,7 +31,7 @@

       <?php $this->endblock(); ?>

     </td>

   </tr>

-  <tr class="<?php echo $this->rowClassConfirm; ?>">

+  <tr class="<?= $this->rowClassConfirm; ?>">

     <td class="col_0 col_first">

       <?php $this->block('label2'); ?>

          

@@ -2,29 +2,29 @@

 <?php $this->block('label'); ?>

   <?php if ($this->hasErrors()): ?>

-    <span class="errortip" title="<?php echo htmlspecialchars($this->getErrorsAsString()); ?>" data-tooltip="position: top; offsetY: 10; theme: tooltipster-error; contentAsHTML: true;">?</span>

+    <span class="errortip" title="<?= htmlspecialchars($this->getErrorsAsString()); ?>" data-tooltip="position: top; offsetY: 10; theme: tooltipster-error; contentAsHTML: true;">?</span>

   <?php endif; ?>

   <?php if ($this->label): ?>

-    <label for="ctrl_<?php echo $this->id; ?>"<?php if ($this->class): ?> class="<?php echo $this->class; ?>"<?php endif; ?>>

+    <label for="ctrl_<?= $this->id; ?>"<?php if ($this->class): ?> class="<?php echo $this->class; ?>"<?php endif; ?>>

       <?php if ($this->mandatory): ?>

-        <span class="invisible"><?php echo $this->mandatoryField; ?></span> <?php echo $this->label; ?><span class="mandatory">*</span>

+        <span class="invisible"><?= $this->mandatoryField; ?></span> <?php echo $this->label; ?><span class="mandatory">*</span>

       <?php else: ?>

-        <?php echo $this->label; ?>

+        <?= $this->label; ?>

       <?php endif; ?>

     </label>

   <?php endif; ?>

 <?php $this->endblock(); ?>

 <?php $this->block('field'); ?>

-  <select name="<?php echo $this->name; ?>" id="ctrl_<?php echo $this->id; ?>" class="<?php echo $this->class; ?>"<?php echo $this->getAttributes(); ?>>

+  <select name="<?= $this->name; ?>" id="ctrl_<?php echo $this->id; ?>" class="<?php echo $this->class; ?>"<?php echo $this->getAttributes(); ?>>

     <?php foreach ($this->getOptions() as $option): ?>

       <?php if ($option['type'] == 'group_start'): ?>

-        <optgroup label="<?php echo $option['label']; ?>">

+        <optgroup label="<?= $option['label']; ?>">

       <?php endif; ?>

       <?php if ($option['type'] == 'option'): ?>

-        <option value="<?php echo $option['value']; ?>"<?php echo $option['selected']; ?>><?php echo $option['label']; ?></option>

+        <option value="<?= $option['value']; ?>"<?php echo $option['selected']; ?>><?php echo $option['label']; ?></option>

       <?php endif; ?>

       <?php if ($option['type'] == 'group_end'): ?>

@@ -1,23 +1,23 @@

 <?php if ($this->tableless): ?>

-  <div class="submit_container widget<?php if ($this->class) echo ' ' . $this->class; ?><?php if ($this->eSM_fl_width): ?> w<?php echo $this->eSM_fl_width; ?><?php endif; ?><?php if ($this->eSM_fl_clear): ?> clr<?php endif; ?><?php if ($this->eSM_fl_class): ?> <?php echo $this->eSM_fl_class; ?><?php endif; ?><?php if ($this->eSM_fl_lblpadding): ?> lblp<?php endif; ?><?php if ($this->eSM_fl_alignment): ?> <?php echo $this->eSM_fl_alignment; ?><?php endif; ?>">

+  <div class="submit_container widget<?php if ($this->class) echo ' ' . $this->class; ?><?php if ($this->eSM_fl_width): ?> w<?= $this->eSM_fl_width; ?><?php endif; ?><?php if ($this->eSM_fl_clear): ?> clr<?php endif; ?><?php if ($this->eSM_fl_class): ?> <?php echo $this->eSM_fl_class; ?><?php endif; ?><?php if ($this->eSM_fl_lblpadding): ?> lblp<?php endif; ?><?php if ($this->eSM_fl_alignment): ?> <?php echo $this->eSM_fl_alignment; ?><?php endif; ?>">

     <?php if ($this->src): ?>

-      <input type="image" src="<?php echo $this->src; ?>" id="ctrl_<?php echo $this->id; ?>" class="submit<?php if ($this->class) echo ' ' . $this->class; ?>" title="<?php echo specialchars($this->slabel); ?>" alt="<?php echo specialchars($this->slabel); ?>"<?php echo $this->getAttributes(); ?>>

+      <input type="image" src="<?= $this->src; ?>" id="ctrl_<?php echo $this->id; ?>" class="submit<?php if ($this->class) echo ' ' . $this->class; ?>" title="<?php echo specialchars($this->slabel); ?>" alt="<?php echo specialchars($this->slabel); ?>"<?php echo $this->getAttributes(); ?>>

     <?php else: ?>

-      <button type="submit" id="ctrl_<?php echo $this->id; ?>" class="submit<?php if ($this->class) echo ' ' . $this->class; ?>"<?php echo $this->getAttributes(); ?>><?php echo specialchars($this->slabel); ?></button>

+      <button type="submit" id="ctrl_<?= $this->id; ?>" class="submit<?php if ($this->class) echo ' ' . $this->class; ?>"<?php echo $this->getAttributes(); ?>><?php echo specialchars($this->slabel); ?></button>

     <?php endif; ?>

   </div>

 <?php else: ?>

-  <tr class="<?php echo $this->rowClass; ?>">

+  <tr class="<?= $this->rowClass; ?>">

     <td class="col_0 col_first">&nbsp;</td>

     <td class="col_1 col_last">

       <div class="submit_container">

         <?php if ($this->src): ?>

-          <input type="image" src="<?php echo $this->src; ?>" id="ctrl_<?php echo $this->id; ?>" class="submit<?php if ($this->class) echo ' ' . $this->class; ?>" title="<?php echo specialchars($this->slabel); ?>" alt="<?php echo specialchars($this->slabel); ?>"<?php echo $this->getAttributes(); ?>>

+          <input type="image" src="<?= $this->src; ?>" id="ctrl_<?php echo $this->id; ?>" class="submit<?php if ($this->class) echo ' ' . $this->class; ?>" title="<?php echo specialchars($this->slabel); ?>" alt="<?php echo specialchars($this->slabel); ?>"<?php echo $this->getAttributes(); ?>>

         <?php else: ?>

-          <input type="submit" id="ctrl_<?php echo $this->id; ?>" class="submit<?php if ($this->class) echo ' ' . $this->class; ?>" value="<?php echo specialchars($this->slabel); ?>"<?php echo $this->getAttributes(); ?>>

+          <input type="submit" id="ctrl_<?= $this->id; ?>" class="submit<?php if ($this->class) echo ' ' . $this->class; ?>" value="<?php echo specialchars($this->slabel); ?>"<?php echo $this->getAttributes(); ?>>

         <?php endif; ?>

       </div>

     </td>

@@ -2,19 +2,19 @@

 <?php $this->block('label'); ?>

   <?php if ($this->hasErrors()): ?>

-    <span class="errortip" title="<?php echo htmlspecialchars($this->getErrorsAsString()); ?>" data-tooltip="position: top; offsetY: 10; theme: tooltipster-error; contentAsHTML: true;">?</span>

+    <span class="errortip" title="<?= htmlspecialchars($this->getErrorsAsString()); ?>" data-tooltip="position: top; offsetY: 10; theme: tooltipster-error; contentAsHTML: true;">?</span>

   <?php endif; ?>

   <?php if ($this->label): ?>

-    <label for="ctrl_<?php echo $this->id; ?>"<?php if ($this->class): ?> class="<?php echo $this->class; ?>"<?php endif; ?>>

+    <label for="ctrl_<?= $this->id; ?>"<?php if ($this->class): ?> class="<?php echo $this->class; ?>"<?php endif; ?>>

       <?php if ($this->mandatory): ?>

-        <span class="invisible"><?php echo $this->mandatoryField; ?></span> <?php echo $this->label; ?><span class="mandatory">*</span>

+        <span class="invisible"><?= $this->mandatoryField; ?></span> <?php echo $this->label; ?><span class="mandatory">*</span>

       <?php else: ?>

-        <?php echo $this->label; ?>

+        <?= $this->label; ?>

       <?php endif; ?>

     </label>

   <?php endif; ?>

 <?php $this->endblock(); ?>

 <?php $this->block('field'); ?>

-  <textarea name="<?php echo $this->name; ?>" id="ctrl_<?php echo $this->id; ?>" class="textarea<?php if ($this->class) echo ' ' . $this->class; ?>" rows="<?php echo $this->rows; ?>" cols="<?php echo $this->cols; ?>"<?php echo $this->getAttributes(); ?>><?php echo $this->value; ?></textarea>

+  <textarea name="<?= $this->name; ?>" id="ctrl_<?php echo $this->id; ?>" class="textarea<?php if ($this->class) echo ' ' . $this->class; ?>" rows="<?php echo $this->rows; ?>" cols="<?php echo $this->cols; ?>"<?php echo $this->getAttributes(); ?>><?php echo $this->value; ?></textarea>

 <?php $this->endblock(); ?>

@@ -2,19 +2,19 @@

 <?php $this->block('label'); ?>

   <?php if ($this->hasErrors()): ?>

-    <span class="errortip" title="<?php echo htmlspecialchars($this->getErrorsAsString()); ?>" data-tooltip="position: top; offsetY: 10; theme: tooltipster-error; contentAsHTML: true;">?</span>

+    <span class="errortip" title="<?= htmlspecialchars($this->getErrorsAsString()); ?>" data-tooltip="position: top; offsetY: 10; theme: tooltipster-error; contentAsHTML: true;">?</span>

   <?php endif; ?>

   <?php if ($this->label): ?>

-    <label for="ctrl_<?php echo $this->id; ?>"<?php if ($this->class): ?> class="<?php echo $this->class; ?>"<?php endif; ?>>

+    <label for="ctrl_<?= $this->id; ?>"<?php if ($this->class): ?> class="<?php echo $this->class; ?>"<?php endif; ?>>

       <?php if ($this->mandatory): ?>

-        <span class="invisible"><?php echo $this->mandatoryField; ?></span> <?php echo $this->label; ?><span class="mandatory">*</span>

+        <span class="invisible"><?= $this->mandatoryField; ?></span> <?php echo $this->label; ?><span class="mandatory">*</span>

       <?php else: ?>

-        <?php echo $this->label; ?>

+        <?= $this->label; ?>

       <?php endif; ?>

     </label>

   <?php endif; ?>

 <?php $this->endblock(); ?>

 <?php $this->block('field'); ?>

-  <input type="<?php echo $this->type; ?>" name="<?php echo $this->name; ?>" id="ctrl_<?php echo $this->id; ?>" class="text<?php if ($this->hideInput) echo ' password'; ?><?php if ($this->class) echo ' ' . $this->class; ?>" value="<?php echo specialchars($this->value); ?>"<?php echo $this->getAttributes(); ?>>

+  <input type="<?= $this->type; ?>" name="<?php echo $this->name; ?>" id="ctrl_<?php echo $this->id; ?>" class="text<?php if ($this->hideInput) echo ' password'; ?><?php if ($this->class) echo ' ' . $this->class; ?>" value="<?php echo specialchars($this->value); ?>"<?php echo $this->getAttributes(); ?>>

 <?php $this->endblock(); ?>

@@ -2,20 +2,20 @@

 <?php $this->block('label'); ?>

   <?php if ($this->hasErrors()): ?>

-    <span class="errortip" title="<?php echo htmlspecialchars($this->getErrorsAsString()); ?>" data-tooltip="position: top; offsetY: 10; theme: tooltipster-error; contentAsHTML: true;">?</span>

+    <span class="errortip" title="<?= htmlspecialchars($this->getErrorsAsString()); ?>" data-tooltip="position: top; offsetY: 10; theme: tooltipster-error; contentAsHTML: true;">?</span>

   <?php endif; ?>

   <?php if ($this->label): ?>

-    <label for="ctrl_<?php echo $this->id; ?>"<?php if ($this->class): ?> class="<?php echo $this->class; ?>"<?php endif; ?>>

+    <label for="ctrl_<?= $this->id; ?>"<?php if ($this->class): ?> class="<?php echo $this->class; ?>"<?php endif; ?>>

       <?php if ($this->mandatory): ?>

-        <span class="invisible"><?php echo $this->mandatoryField; ?></span> <?php echo $this->label; ?><span class="mandatory">*</span>

+        <span class="invisible"><?= $this->mandatoryField; ?></span> <?php echo $this->label; ?><span class="mandatory">*</span>

       <?php else: ?>

-        <?php echo $this->label; ?>

+        <?= $this->label; ?>

       <?php endif; ?>

     </label>

   <?php endif; ?>

 <?php $this->endblock(); ?>

 <?php $this->block('field'); ?>

-  <input type="file" name="<?php echo $this->name; ?>" id="ctrl_<?php echo $this->id; ?>" class="upload<?php if ($this->class) echo ' ' . $this->class; ?>"<?php echo $this->getAttributes(); ?>>

+  <input type="file" name="<?= $this->name; ?>" id="ctrl_<?php echo $this->id; ?>" class="upload<?php if ($this->class) echo ' ' . $this->class; ?>"<?php echo $this->getAttributes(); ?>>

 <?php $this->endblock(); ?>

@@ -1,9 +1,9 @@

 <?php if (!$this->tableless): ?>

-  <tr class="<?php echo $this->rowClass; ?>">

-    <td class="col_0 col_first"><?php echo $this->generateLabel(); ?></td>

-    <td class="col_1 col_last"><?php echo $this->generateWithError(); ?></td>

+  <tr class="<?= $this->rowClass; ?>">

+    <td class="col_0 col_first"><?= $this->generateLabel(); ?></td>

+    <td class="col_1 col_last"><?= $this->generateWithError(); ?></td>

   </tr>

 <?php else: ?>

-  <?php echo $this->generateLabel(); ?>

-  <?php echo $this->generateWithError(); ?><br>

+  <?= $this->generateLabel(); ?>

+  <?= $this->generateWithError(); ?><br>

 <?php endif; ?>

\ No newline at end of file

@@ -1,4 +1,4 @@

-<?php echo '<?'; ?>xml version="1.0" encoding="<?php echo $this->charset; ?>" standalone="yes" ?>

+<?= '<?'; ?>xml version="1.0" encoding="<?php echo $this->charset; ?>" standalone="yes" ?>

 <!DOCTYPE form [

   <!ELEMENT form (field)+>

   <!ELEMENT field (name, value+)>

@@ -8,9 +8,9 @@

 <form>

   <?php foreach ($this->fields as $field): ?>

     <field>

-      <name><?php echo $field['name']; ?></name>

+      <name><?= $field['name']; ?></name>

       <?php foreach ($field['values'] as $value): ?>

-        <value><?php echo $value; ?></value>

+        <value><?= $value; ?></value>

       <?php endforeach; ?>

     </field>

   <?php endforeach; ?>

@@ -1,3 +1,3 @@

 <?php $this->block('addSubmit'); ?>

-    <button type="submit" id="ctrl_<?php echo $this->id; ?>_submit" class="submit"><?php echo $this->slabel; ?></button>

+    <button type="submit" id="ctrl_<?= $this->id; ?>_submit" class="submit"><?php echo $this->slabel; ?></button>

 <?php $this->endblock(); ?>