From bd981d88dc40f7361567d5d2f444628042d1640d Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sat, 11 May 2019 18:38:13 +0200
Subject: [PATCH] system: work through previous style update

Several subtle improvements along the way.
---
 src/www/diag_confbak.php | 413 +++++++++++++++++++--------------------
 1 file changed, 206 insertions(+), 207 deletions(-)

diff --git a/src/www/diag_confbak.php b/src/www/diag_confbak.php
index 92813c0be..493746dd9 100644
--- a/src/www/diag_confbak.php
+++ b/src/www/diag_confbak.php
@@ -145,56 +145,56 @@ include("head.inc");
 ?>
 
 <script>
-    //<![CDATA[
-    $(document).ready(function () {
-        // revert config dialog
-        $(".act_revert").click(function () {
-            var id = $(this).data('id');
-            BootstrapDialog.show({
-                type: BootstrapDialog.TYPE_INFO,
-                title: "<?= gettext("Action");?>",
-                message: "<?=gettext("Restore from Configuration Backup");?> <br/> <?=gettext('Version');?>: " + id,
-                buttons: [{
-                    label: "<?= gettext("No");?>",
-                    action: function (dialogRef) {
-                        dialogRef.close();
-                    }
-                }, {
-                    label: "<?= gettext("Yes");?>",
-                    action: function (dialogRef) {
-                        $("#time").val(id);
-                        $("#action").val("revert");
-                        $("#iform").submit()
-                    }
-                }]
-            });
+//<![CDATA[
+$(document).ready(function () {
+    // revert config dialog
+    $(".act_revert").click(function () {
+        var id = $(this).data('id');
+        BootstrapDialog.show({
+            type: BootstrapDialog.TYPE_INFO,
+            title: "<?= html_safe(gettext('Action')) ?>",
+            message: "<?= html_safe(gettext('Restore from Configuration Backup')) ?> <br/> <?= html_safe(gettext('Version')) ?>: " + id,
+            buttons: [{
+                label: "<?= html_safe(gettext('No')) ?>",
+                action: function (dialogRef) {
+                    dialogRef.close();
+                }
+            }, {
+                label: "<?= html_safe(gettext('Yes')) ?>",
+                action: function (dialogRef) {
+                    $("#time").val(id);
+                    $("#action").val("revert");
+                    $("#iform").submit()
+                }
+            }]
         });
-
-        // delete backup dialog
-        $(".act_delete").click(function () {
-            var id = $(this).data('id');
-            BootstrapDialog.show({
-                type: BootstrapDialog.TYPE_DANGER,
-                title: "<?= gettext("Action");?>",
-                message: "<?=gettext("Remove Configuration Backup");?> <br/> <?=gettext('Version');?>: " + id,
-                buttons: [{
-                    label: "<?= gettext("No");?>",
-                    action: function (dialogRef) {
-                        dialogRef.close();
-                    }
-                }, {
-                    label: "<?= gettext("Yes");?>",
-                    action: function (dialogRef) {
-                        $("#time").val(id);
-                        $("#action").val("delete");
-                        $("#iform").submit()
-                    }
-                }]
-            });
-        });
-
     });
-    //]]>
+
+    // delete backup dialog
+    $(".act_delete").click(function () {
+        var id = $(this).data('id');
+        BootstrapDialog.show({
+            type: BootstrapDialog.TYPE_DANGER,
+            title: "<?= html_safe(gettext('Action')) ?>",
+            message: "<?= html_safe(gettext('Remove Configuration Backup')) ?> <br/> <?= html_safe(gettext('Version')) ?>: " + id,
+            buttons: [{
+                label: "<?= html_safe(gettext('No')) ?>",
+                action: function (dialogRef) {
+                    dialogRef.close();
+                }
+            }, {
+                label: "<?= html_safe(gettext('Yes')) ?>",
+                action: function (dialogRef) {
+                    $("#time").val(id);
+                    $("#action").val("delete");
+                    $("#iform").submit()
+                }
+            }]
+        });
+    });
+
+});
+//]]>
 </script>
 
 <body>
@@ -204,164 +204,163 @@ include("head.inc");
 include("fbegin.inc");
 
 ?>
-<section class="page-content-main">
+  <section class="page-content-main">
     <div class="container-fluid">
-        <div class="row">
-            <?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
-            <?php if ($savemsg) print_info_box($savemsg); ?>
-            <section class="col-xs-12">
-                <form method="post" id="iform">
-                    <input type="hidden" id="time" name="time" value=""/>
-                    <input type="hidden" id="action" name="act" value=""/>
-                    <div class="content-box tab-content table-responsive __mb">
-                        <table class="table table-striped">
-                            <tr>
-                                <th colspan="2"><?= gettext('Backup Count') ?></th>
-                            </tr>
-                            <tr>
-                                <td><input name="backupcount" type="text" class="formfld unknown" size="5"
-                                           value="<?= htmlspecialchars($pconfig['backupcount']); ?>"/></td>
-                                <td><?= gettext("Enter the number of older configurations to keep in the local backup cache."); ?></td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <input name="save" type="submit" class="btn btn-primary"
-                                           value="<?= html_safe(gettext('Save')); ?>"/>
-                                </td>
-                                <td>
-                                    <?= gettext('Be aware of how much space is consumed by backups before adjusting this value.'); ?>
-                                    <?php if (isset($confvers) && count($confvers) > 0) {
-                                        print gettext('Current space used:') . ' ' . exec("/usr/bin/du -sh /conf/backup | /usr/bin/awk '{print $1;}'");
-                                    } ?>
-                                </td>
-                            </tr>
-                        </table>
-                    </div>
-                </form>
-                <?php if ($diff): ?>
-                    <div class="content-box tab-content table-responsive __mb" style="overflow: scroll;">
-                        <table class="table table-striped">
-                            <tr>
-                                <th colspan="2">
-                                    <?= sprintf(
-                                        gettext('Configuration diff from %s to %s'),
-                                        date(gettext('n/j/y H:i:s'), $oldtime),
-                                        date(gettext('n/j/y H:i:s'), $newtime)
-                                    ); ?>
-                                </th>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <?php
-                                    foreach ($diff as $line):
-                                        switch (substr($line, 0, 1)) {
-                                            case '+':
-                                                $color = '#3bbb33';
-                                                break;
-                                            case '-':
-                                                $color = '#c13928';
-                                                break;
-                                            case '@':
-                                                $color = '#3bb9c3';
-                                                break;
-                                            default:
-                                                $color = '#000000';
-                                        } ?>
-                                        <span style="color: <?= $color; ?>; white-space: pre-wrap; font-family: monospace;"><?= htmlentities($line); ?></span>
-                                        <br/>
-                                    <?php endforeach; ?>
-                                </td>
-                            </tr>
-                        </table>
-                    </div>
-                <?php endif; ?>
-                <?php if (count($confvers)): ?>
-                    <form method="get">
-                        <section>
-                            <div class="content-box tab-content table-responsive">
-                                <table class="table table-striped">
-                                    <tr>
-                                        <th colspan="2"><?= gettext('History') ?></th>
-                                    </tr>
-                                    <tr>
-                                        <td>
-                                            <button type="submit" name="diff" class="btn btn-primary pull-left"
-                                                    value="Diff">
-                                                <?= gettext('View differences'); ?>
-                                            </button>
-                                        </td>
-                                        <td>
-                                            <?= gettext("To view the differences between an older configuration and a newer configuration, select the older configuration using the left column of radio options and select the newer configuration in the right column, then press the button."); ?>
-                                        </td>
-                                    </tr>
-                                </table>
-                                <table class="table table-striped">
-                                    <tbody>
-                                    <tr>
-                                        <th colspan="2"><?= gettext("Diff"); ?></th>
-                                        <th><?= gettext("Date"); ?></th>
-                                        <th><?= gettext("Size"); ?></th>
-                                        <th><?= gettext("Configuration Change"); ?></th>
-                                        <th class="text-nowrap"></th>
-                                    </tr>
-                                    <tr>
-                                        <td></td>
-                                        <td>
-                                            <input type="radio" name="newtime"
-                                                   value="current" <?= !isset($newcheck) || $newcheck == 'current' ? 'checked="checked"' : '' ?>/>
-                                        </td>
-                                        <td><?= date(gettext("n/j/y H:i:s"), $config['revision']['time']) ?></td>
-                                        <td><?= format_bytes(filesize("/conf/config.xml")) ?></td>
-                                        <td><?= "{$config['revision']['username']}: {$config['revision']['description']}" ?></td>
-                                        <td class="text-nowrap"><strong><?= gettext("Current"); ?></strong></td>
-                                    </tr>
-                                    <?php
-                                    $last = count($confvers);
-                                    $curr = 1;
-                                    foreach ($confvers as $version):?>
-                                        <tr>
-                                            <td>
-                                                <input type="radio" name="oldtime"
-                                                       value="<?= $version['time']; ?>" <?= (!isset($oldcheck) && $curr == 1) || (isset($oldcheck) && $oldcheck == $version['time']) ? 'checked="checked"' : '' ?>/>
-                                            </td>
-                                            <td>
-                                                <?php if ($curr != $last): ?>
-                                                    <input type="radio" name="newtime"
-                                                           value="<?= $version['time']; ?>" <?= isset($newcheck) && $newcheck == $version['time'] ? 'checked="checked"' : '' ?>/>
-                                                <?php endif ?>
-                                            </td>
-                                            <td><?= date(gettext("n/j/y H:i:s"), $version['time']) ?></td>
-                                            <td><?= format_bytes($version['filesize']) ?></td>
-                                            <td><?= "{$version['username']}: {$version['description']}" ?></td>
-                                            <td class="text-nowrap">
-                                                <a data-id="<?= $version['time']; ?>" href="#"
-                                                   class="act_revert btn btn-default btn-xs" data-toggle="tooltip"
-                                                   title="<?= gettext("Revert to this configuration"); ?>">
-                                                    <i class="fa fa-sign-in fa-fw"></i>
-                                                </a>
-                                                <a data-id="<?= $version['time']; ?>" href="#"
-                                                   class="act_delete btn btn-default btn-xs" data-toggle="tooltip"
-                                                   title="<?= gettext("Remove this backup"); ?>">
-                                                    <i class="fa fa-trash fa-fw"></i>
-                                                </a>
-                                                <a href="diag_confbak.php?getcfg=<?= $version['time']; ?>"
-                                                   class="btn btn-default btn-xs" data-toggle="tooltip"
-                                                   title="<?= gettext("Download this backup"); ?>">
-                                                    <i class="fa fa-download fa-fw"></i>
-                                                </a>
-                                            </td>
-                                        </tr>
-                                        <?php
-                                        $curr++;
-                                    endforeach; ?>
-                                    </tbody>
-                                </table>
-                            </div>
-                        </section>
-                    </form>
-                <?php endif ?>
-            </section>
-        </div>
+      <div class="row">
+        <?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
+        <?php if ($savemsg) print_info_box($savemsg); ?>
+        <section class="col-xs-12">
+          <form method="post" id="iform">
+            <input type="hidden" id="time" name="time" value="" />
+            <input type="hidden" id="action" name="act" value="" />
+            <div class="content-box tab-content table-responsive __mb">
+              <table class="table table-striped">
+                <tbody>
+                  <tr>
+                    <td colspan="2"><strong><?= gettext('Backup Count') ?></strong></td>
+                  </tr>
+                  <tr>
+                    <td>
+                      <input name="backupcount" type="text" class="formfld unknown" size="5"
+                        value="<?= html_safe($pconfig['backupcount']) ?>"/>
+                    </td>
+                    <td><?= gettext("Enter the number of older configurations to keep in the local backup cache."); ?></td>
+                  </tr>
+                  <tr>
+                    <td>
+                      <input name="save" type="submit" class="btn btn-primary" value="<?= html_safe(gettext('Save')) ?>"/>
+                    </td>
+                    <td>
+                      <?= gettext('Be aware of how much space is consumed by backups before adjusting this value.'); ?>
+<?php if (isset($confvers) && count($confvers) > 0): ?>
+                      <?= gettext('Current space used:') . ' ' . exec("/usr/bin/du -sh /conf/backup | /usr/bin/awk '{print $1;}'") ?>
+<?php endif ?>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+          </form>
+<?php if ($diff): ?>
+          <div class="content-box tab-content table-responsive __mb" style="overflow: scroll;">
+            <table class="table table-striped">
+              <tbody>
+                <tr>
+                  <td colspan="2">
+                    <strong><?= sprintf(
+                      gettext('Configuration diff from %s to %s'),
+                      date(gettext('n/j/y H:i:s'), $oldtime),
+                      date(gettext('n/j/y H:i:s'), $newtime)
+                    ) ?></strong>
+                  </td>
+                </tr>
+                <tr>
+                  <td>
+                    <?php
+                    foreach ($diff as $line):
+                        switch (substr($line, 0, 1)) {
+                            case '+':
+                                $color = '#3bbb33';
+                                break;
+                            case '-':
+                                $color = '#c13928';
+                                break;
+                            case '@':
+                                $color = '#3bb9c3';
+                                break;
+                            default:
+                                $color = '#000000';
+                        } ?>
+                      <span style="color: <?= $color; ?>; white-space: pre-wrap; font-family: monospace;"><?= htmlentities($line); ?></span>
+                      <br/>
+                    <?php endforeach; ?>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+<?php endif ?>
+<?php if (count($confvers)): ?>
+          <form method="get">
+            <div class="content-box tab-content table-responsive">
+              <table class="table table-striped">
+                <tbody>
+                  <tr>
+                    <td colspan="2"><strong><?= gettext('History') ?></strong></td>
+                  </tr>
+                  <tr>
+                    <td>
+                        <button type="submit" name="diff" class="btn btn-primary pull-left" value="Diff">
+                        <?= gettext('View differences'); ?>
+                        </button>
+                    </td>
+                    <td>
+                      <?= gettext("To view the differences between an older configuration and a newer configuration, select the older configuration using the left column of radio options and select the newer configuration in the right column, then press the button."); ?>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+              <table class="table table-striped">
+                <tbody>
+                  <tr>
+                    <th colspan="2"><?= gettext("Diff"); ?></th>
+                    <th><?= gettext("Date"); ?></th>
+                    <th><?= gettext("Size"); ?></th>
+                    <th><?= gettext("Configuration Change"); ?></th>
+                    <th class="text-nowrap"></th>
+                  </tr>
+                  <tr>
+                    <td></td>
+                    <td>
+                      <input type="radio" name="newtime" value="current" <?= !isset($newcheck) || $newcheck == 'current' ? 'checked="checked"' : '' ?>/>
+                    </td>
+                    <td><?= date(gettext("n/j/y H:i:s"), $config['revision']['time']) ?></td>
+                    <td><?= format_bytes(filesize("/conf/config.xml")) ?></td>
+                    <td><?= "{$config['revision']['username']}: {$config['revision']['description']}" ?></td>
+                    <td class="text-nowrap"><strong><?= gettext("Current"); ?></strong></td>
+                  </tr>
+<?php $last = count($confvers); $curr = 1; foreach ($confvers as $version): ?>
+                  <tr>
+                    <td>
+                      <input type="radio" name="oldtime"
+                        value="<?= $version['time']; ?>" <?= (!isset($oldcheck) && $curr == 1) || (isset($oldcheck) && $oldcheck == $version['time']) ? 'checked="checked"' : '' ?>/>
+                    </td>
+                    <td>
+<?php if ($curr != $last): ?>
+                      <input type="radio" name="newtime" value="<?= $version['time']; ?>" <?= isset($newcheck) && $newcheck == $version['time'] ? 'checked="checked"' : '' ?>/>
+<?php endif ?>
+                    </td>
+                    <td><?= date(gettext("n/j/y H:i:s"), $version['time']) ?></td>
+                    <td><?= format_bytes($version['filesize']) ?></td>
+                    <td><?= "{$version['username']}: {$version['description']}" ?></td>
+                    <td class="text-nowrap">
+                      <a data-id="<?= $version['time']; ?>" href="#"
+                        class="act_revert btn btn-default btn-xs" data-toggle="tooltip"
+                        title="<?= html_safe(gettext('Revert to this configuration')) ?>">
+                        <i class="fa fa-sign-in fa-fw"></i>
+                      </a>
+                      <a data-id="<?= $version['time']; ?>" href="#"
+                        class="act_delete btn btn-default btn-xs" data-toggle="tooltip"
+                        title="<?= html_safe(gettext('Remove this backup')) ?>">
+                        <i class="fa fa-trash fa-fw"></i>
+                      </a>
+                      <a href="diag_confbak.php?getcfg=<?= $version['time']; ?>"
+                        class="btn btn-default btn-xs" data-toggle="tooltip"
+                        title="<?= html_safe(gettext('Download this backup')) ?>">
+                        <i class="fa fa-download fa-fw"></i>
+                      </a>
+                    </td>
+                  </tr>
+<?php $curr++; endforeach ?>
+                </tbody>
+              </table>
+            </div>
+          </form>
+<?php endif ?>
+        </section>
+      </div>
     </div>
-</section>
-<?php include("foot.inc"); ?>
+  </section>
+<?php
+
+include 'foot.inc';