Remove sequentially echos (part 2)

Author: nikosev

themes/ssp/authX509/X509error.php

@@ -26,16 +26,16 @@ class="float-l"
     <?= $this->t('{login:login_button}') ?>
 </a>
 
-<?php
-
-if (!empty($this->data['links'])) {
-    echo '<ul class="links list-unstyled" style="margin-top: 2em">';
-    foreach ($this->data['links'] as $l) {
-        echo '<li><a href="' . htmlspecialchars($l['href']) . '">'
-        . htmlspecialchars($this->t($l['text']))
-        . '</a></li>';
-    }
-    echo '</ul>';
-}
+<?php if (!empty($this->data['links'])) : ?>
+<ul class="links list-unstyled" style="margin-top: 2em">
+    <?php foreach ($this->data['links'] as $l) : ?>
+    <li>
+        <a href="<?= htmlspecialchars($l['href']) ?>">
+            <?= htmlspecialchars($this->t($l['text'])) ?>
+        </a>
+    </li>
+    <?php endforeach; ?>
+</ul>
+<?php endif;
 
 $this->includeAtTemplateBase('includes/footer.php');

themes/ssp/consent/consentform.php

@@ -212,11 +212,10 @@ class="ssp-btn ssp-btn__secondary btn ssp-btns-container--btn__right text-upperc
     </div> <!-- /ssp-content-group -->
 </div> <!-- /row -->
 
-<?php
-if ($this->data['sppp'] !== false) {
-    echo "<p>" . htmlspecialchars($this->t('{consent:consent:consent_privacypolicy}')) . " ";
-    echo '<a target="_blank" href="' . htmlspecialchars($this->data['sppp']) . '">' . $dstName . "</a>";
-    echo "</p>";
-}
+<?php if ($this->data['sppp'] !== false) : ?>
+<p><?= htmlspecialchars($this->t('{consent:consent:consent_privacypolicy}')) ?> 
+<a target="_blank" href="<?= htmlspecialchars($this->data['sppp']) ?>"><?= $dstName ?></a>
+</p>
+<?php endif;
 
 $this->includeAtTemplateBase('includes/footer.php');

themes/ssp/consent/logout_completed.php

@@ -3,8 +3,10 @@
 $this->data['header'] = $this->t('{logout:title}');
 $this->data['jquery'] = ['core' => true];
 $this->includeAtTemplateBase('includes/header.php');
+?>
 
-echo '<h2>' . $this->data['header'] . '</h2>';
-echo '<p>' . $this->t('{logout:logged_out_text}') . '</p>';
+<h2><?= $this->data['header'] ?></h2>
+<p><?= $this->t('{logout:logged_out_text}') ?></p>
 
+<?php
 $this->includeAtTemplateBase('includes/footer.php');

themes/ssp/default/includes/header.php

@@ -141,13 +141,11 @@
 <body<?= $onLoad ?>>
 
     <div class="header">
-        <?php
-        if (!empty($ribbonText)) {
-            echo '<div class="corner-ribbon red">';
-            echo $ribbonText;
-            echo '</div>';
-        }
-        ?>
+        <?php if (!empty($ribbonText)) : ?>
+        <div class="corner-ribbon red">
+            <?= $ribbonText ?>
+        </div>
+        <?php endif; ?>
         <div class="text-center ssp-logo">
             <a
                 <?=