Skip to content

Commit 87a4a74

Browse files
AlecRustAlecRust
authored
Add required attribute to login forms (hestiacp#3376)
* Add required attribute to login forms * Bump Node dependencies * Fix some syntax * Apply some Prettier formatting * Fix list_search.php formatting * Revert "Bump Node dependencies" This reverts commit 394fcf6.
1 parent 39b8f5e commit 87a4a74

26 files changed

+197
-199
lines changed

‎web/templates/pages/edit_server.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<h1 class="form-title">
5656
<?= _("Configuring Server") ?>
5757
</h1>
58-
<?php show_alert_message($_SESSION) ?>
58+
<?php show_alert_message($_SESSION); ?>
5959

6060
<!-- Basic options section -->
6161
<details class="collapse u-mb10">
@@ -106,7 +106,7 @@ class="form-check-input"
106106
type="checkbox"
107107
name="v_policy_user_change_theme"
108108
id="v_policy_user_change_theme"
109-
<?= $_SESSION["POLICY_USER_CHANGE_THEME"] == "no" ? "checked" : "" ?>
109+
<?= $_SESSION["POLICY_USER_CHANGE_THEME"] == "no" ? "checked" : "" ?>
110110
>
111111
<label for="v_policy_user_change_theme">
112112
<?= _("Set as selected theme for all users") ?>
@@ -178,7 +178,7 @@ class="form-check-input"
178178
type="checkbox"
179179
name="v_experimental_features"
180180
id="v_experimental_features"
181-
<?= $_SESSION["POLICY_SYSTEM_ENABLE_BACON"] == "true" ? "checked" : "" ?>
181+
<?= $_SESSION["POLICY_SYSTEM_ENABLE_BACON"] == "true" ? "checked" : "" ?>
182182
>
183183
<label for="v_experimental_features">
184184
<?= _("Enable preview features") ?>
@@ -353,7 +353,7 @@ class="form-check-input"
353353
?>
354354
<div>
355355
<label for="v_dns_remote_host" class="form-label">
356-
<?= _("Host"). " #" . $i ?>
356+
<?= _("Host") . " #" . $i ?>
357357
</label>
358358
<input
359359
type="text"
@@ -543,7 +543,7 @@ class="form-control"
543543
class="form-select"
544544
name="v_phpmyadmin_key"
545545
id="v_phpmyadmin_key"
546-
<?php $_SESSION["API"] != "yes" ? "disabled" : "" ?>
546+
<?php $_SESSION["API"] != "yes" ? "disabled" : ""; ?>
547547
>
548548
<option value="no">
549549
<?= _("Disabled") ?>
@@ -696,7 +696,7 @@ class="u-ml5"
696696
<option value="gzip">
697697
gzip
698698
</option>
699-
<option value="zstd" <?= $v_backup_mode == "zstd" ? "selected" :"" ?>>
699+
<option value="zstd" <?= $v_backup_mode == "zstd" ? "selected" : "" ?>>
700700
zstd
701701
</option>
702702
</select>
@@ -934,7 +934,7 @@ class="form-control"
934934
/
935935
<a
936936
class="form-link"
937-
href="/generate/ssl/?domain=<?= htmlentities(trim($v_hostname,'"')) ?>"
937+
href="/generate/ssl/?domain=<?= htmlentities(trim($v_hostname, '"')) ?>"
938938
target="_blank"
939939
>
940940
<?= _("Generate CSR") ?>
@@ -1122,7 +1122,7 @@ class="form-select"
11221122
</div>
11231123
</div>
11241124

1125-
<?php if (($_SESSION["userContext"] === "admin") && ($_SESSION["user"] === "admin")) { ?>
1125+
<?php if ($_SESSION["userContext"] === "admin" && $_SESSION["user"] === "admin") { ?>
11261126
<h2 x-on:click="showProtectionOptions = !showProtectionOptions" class="section-title">
11271127
<?= _("System Protection") ?>
11281128
<i
@@ -1146,7 +1146,7 @@ class="form-select"
11461146
<option value="yes">
11471147
<?= _("Yes") ?>
11481148
</option>
1149-
<option value="no" <?= $_SESSION["POLICY_SYSTEM_PROTECTED_ADMIN"] !== "yes" ?"selected" : "" ?>>
1149+
<option value="no" <?= $_SESSION["POLICY_SYSTEM_PROTECTED_ADMIN"] !== "yes" ? "selected" : "" ?>>
11501150
<?= _("No") ?>
11511151
</option>
11521152
</select>
@@ -1163,7 +1163,7 @@ class="form-select"
11631163
<option value="yes">
11641164
<?= _("Yes") ?>
11651165
</option>
1166-
<option value="no" <?= $_SESSION["POLICY_SYSTEM_HIDE_ADMIN"] !== "yes" ?"selected" : "" ?>>
1166+
<option value="no" <?= $_SESSION["POLICY_SYSTEM_HIDE_ADMIN"] !== "yes" ? "selected" : "" ?>>
11671167
<?= _("No") ?>
11681168
</option>
11691169
</select>
@@ -1180,7 +1180,7 @@ class="form-select"
11801180
<option value="yes">
11811181
<?= _("Yes") ?>
11821182
</option>
1183-
<option value="no" <?= $_SESSION["POLICY_SYSTEM_HIDE_SERVICES"] !== "yes" ?"selected" : "" ?>>
1183+
<option value="no" <?= $_SESSION["POLICY_SYSTEM_HIDE_SERVICES"] !== "yes" ? "selected" : "" ?>>
11841184
<?= _("No") ?>
11851185
</option>
11861186
</select>

‎web/templates/pages/list_access_keys.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<li entity="sort-comment"><span class="name"><?= _("Comment") ?> <i class="fas fa-arrow-down-a-z"></i></span><span class="up"><i class="fas fa-arrow-up-a-z"></i></span></li>
1717
</ul>
1818
<form x-data x-bind="BulkEdit" action="/bulk/access-key/" method="post">
19-
<input type="hidden" name="token" value="<?=$_SESSION['token']?>">
19+
<input type="hidden" name="token" value="<?= $_SESSION["token"] ?>">
2020
<select class="form-select" name="action">
2121
<option value=""><?= _("apply to selected") ?></option>
2222
<option value="delete"><?= _("delete") ?></option>
@@ -66,10 +66,10 @@
6666

6767
<div class="l-unit__col l-unit__col--right">
6868
<div class="clearfix l-unit__stat-col--left super-compact">
69-
<input id="check<?=$i ?>" class="ch-toggle" type="checkbox" title="<?= _("Select") ?>" name="key[]" value="<?=$key?>">
69+
<input id="check<?= $i ?>" class="ch-toggle" type="checkbox" title="<?= _("Select") ?>" name="key[]" value="<?= $key ?>">
7070
</div>
7171
<div class="clearfix l-unit__stat-col--left wide-6">
72-
<b><a href="/list/access-key/?key=<?=htmlentities($key);?>&token=<?=$_SESSION['token']?>" title="<?= _("Access Key") ?>: <?=$key;?>"><?=$key;?></a></b>
72+
<b><a href="/list/access-key/?key=<?= htmlentities($key) ?>&token=<?= $_SESSION["token"] ?>" title="<?= _("Access Key") ?>: <?= $key ?>"><?= $key ?></a></b>
7373
</div>
7474

7575
<!-- START QUICK ACTION TOOLBAR AREA -->

‎web/templates/pages/list_backup.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<div class="l-unit__col l-unit__col--right">
4040
<div>
4141
<div class="clearfix l-unit__stat-col--left super-compact">
42-
<input type="checkbox" class="js-toggle-all" title="<?= _("Select all") ?>" <?=$display_mode;?>>
42+
<input type="checkbox" class="js-toggle-all" title="<?= _("Select all") ?>" <?= $display_mode ?>>
4343
</div>
4444
<div class="clearfix l-unit__stat-col--left wide-4"><b><?= _("File Name") ?></b></div>
4545
<div class="clearfix l-unit__stat-col--left compact-4 u-text-right"><b>&nbsp;</b></div>
@@ -73,34 +73,34 @@
7373
<div class="l-unit__col l-unit__col--right">
7474
<div>
7575
<div class="clearfix l-unit__stat-col--left super-compact">
76-
<input id="check<?=$i ?>" class="ch-toggle" type="checkbox" title="<?= _("Select") ?>" name="backup[]" value="<?=$key?>" <?=$display_mode;?>>
76+
<input id="check<?= $i ?>" class="ch-toggle" type="checkbox" title="<?= _("Select") ?>" name="backup[]" value="<?= $key ?>" <?= $display_mode ?>>
7777
</div>
7878
<div class="clearfix l-unit__stat-col--left wide-4 truncate">
7979
<b>
80-
<?php if ($read_only === 'true') {?>
81-
<?=$key?>
80+
<?php if ($read_only === "true") { ?>
81+
<?= $key ?>
8282
<?php } else { ?>
83-
<a href="/list/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("restore") ?>"><?=$key?></a>
83+
<a href="/list/backup/?backup=<?= $key ?>&token=<?= $_SESSION["token"] ?>" title="<?= _("restore") ?>"><?= $key ?></a>
8484
<?php } ?>
8585
</b>
8686
</div>
8787
<!-- START QUICK ACTION TOOLBAR AREA -->
8888
<div class="clearfix l-unit__stat-col--left compact-4 u-text-right">
8989
<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
9090
<div class="actions-panel clearfix">
91-
<?php if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($read_only === 'true')) {?>
91+
<?php if ($_SESSION["userContext"] === "admin" && $_SESSION["look"] === "admin" && $read_only === "true") { ?>
9292
<!-- Restrict ability to restore or delete backups when impersonating 'admin' account -->
9393
&nbsp;
9494
<?php } else { ?>
9595
<div class="actions-panel__col actions-panel__download shortcut-d" key-action="href"><a href="/download/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("download") ?>"><i class="fas fa-file-arrow-down icon-lightblue icon-dim"></i></a></div>
9696
<?php if ($read_only !== 'true') {?>
9797
<div class="actions-panel__col actions-panel__list shortcut-enter" key-action="href"><a href="/list/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("restore") ?>"><i class="fas fa-arrow-rotate-left icon-green icon-dim"></i></a></div>
9898
<div class="actions-panel__col actions-panel__delete shortcut-delete" key-action="js">
99-
<a id="delete_link_<?=$i?>" class="data-controls do_delete" title="<?= _("delete") ?>">
99+
<a id="delete_link_<?= $i ?>" class="data-controls do_delete" title="<?= _("delete") ?>">
100100
<i class="fas fa-trash icon-red icon-dim do_delete"></i>
101-
<input type="hidden" name="delete_url" value="/delete/backup/?backup=<?=$key?>&token=<?=$_SESSION['token']?>">
102-
<div id="delete_dialog_<?=$i?>" class="dialog js-confirm-dialog-delete" title="<?= _("Confirmation") ?>">
103-
<p><?=sprintf(_('DELETE_BACKUP_CONFIRMATION'),$key)?></p>
101+
<input type="hidden" name="delete_url" value="/delete/backup/?backup=<?= $key ?>&token=<?= $_SESSION["token"] ?>">
102+
<div id="delete_dialog_<?= $i ?>" class="dialog js-confirm-dialog-delete" title="<?= _("Confirmation") ?>">
103+
<p><?= sprintf(_("DELETE_BACKUP_CONFIRMATION"), $key) ?></p>
104104
</div>
105105
</a>
106106
</div>

‎web/templates/pages/list_backup_detail.php‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,19 @@
5454
<div class="l-unit animate__animated animate__fadeIn">
5555
<div class="l-unit__col l-unit__col--right">
5656
<div class="clearfix l-unit__stat-col--left super-compact">
57-
<input id="check<?=$i?>" class="ch-toggle" type="checkbox" name="web[]" value="<?=$key?>">
57+
<input id="check<?= $i ?>" class="ch-toggle" type="checkbox" name="web[]" value="<?= $key ?>">
5858
</div>
5959
<div class="clearfix l-unit__stat-col--left compact-4">
6060
<div class="l-unit__stat-col l-unit__stat-col--left"><?= _("Web domain") ?></div>
6161
</div>
6262
<div class="clearfix l-unit__stat-col--left wide-7">
63-
<div class="l-unit__stat-col l-unit__stat-col--left wide-7"><b><?=$key?></b></div>
63+
<div class="l-unit__stat-col l-unit__stat-col--left wide-7"><b><?= $key ?></b></div>
6464
</div>
6565
<div class="clearfix l-unit__stat-col--left compact-4 u-text-right">
6666
<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
6767
<div class="actions-panel clearfix">
6868
<div class="actions-panel__col actions-panel__list shortcut-enter" key-action="href">
69-
<a href="/schedule/restore/?backup=<?=$backup?>&type=web&object=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Restore") ?>">
69+
<a href="/schedule/restore/?backup=<?= $backup ?>&type=web&object=<?= $key ?>&token=<?= $_SESSION["token"] ?>" title="<?= _("Restore") ?>">
7070
<i class="fas fa-arrow-rotate-left icon-green icon-dim u-mr5"></i>
7171
</a>
7272
</div>
@@ -86,19 +86,19 @@
8686
<div class="l-unit">
8787
<div class="l-unit__col l-unit__col--right">
8888
<div class="clearfix l-unit__stat-col--left super-compact">
89-
<input id="check2<?=$i?>" class="ch-toggle" type="checkbox" name="mail[]" value="<?=$key?>">
89+
<input id="check2<?= $i ?>" class="ch-toggle" type="checkbox" name="mail[]" value="<?= $key ?>">
9090
</div>
9191
<div class="clearfix l-unit__stat-col--left compact-4">
9292
<div class="l-unit__stat-col l-unit__stat-col--left"><?= _("Mail domain") ?></div>
9393
</div>
9494
<div class="clearfix l-unit__stat-col--left wide-7">
95-
<div class="l-unit__stat-col l-unit__stat-col--left wide-7"><b><?=$key?></b></div>
95+
<div class="l-unit__stat-col l-unit__stat-col--left wide-7"><b><?= $key ?></b></div>
9696
</div>
9797
<div class="clearfix l-unit__stat-col--left compact-4 u-text-right">
9898
<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
9999
<div class="actions-panel clearfix">
100100
<div class="actions-panel__col actions-panel__list shortcut-enter" key-action="href">
101-
<a href="/schedule/restore/?backup=<?=$backup?>&type=mail&object=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Restore") ?>">
101+
<a href="/schedule/restore/?backup=<?= $backup ?>&type=mail&object=<?= $key ?>&token=<?= $_SESSION["token"] ?>" title="<?= _("Restore") ?>">
102102
<i class="fas fa-arrow-rotate-left icon-green icon-dim"></i>
103103
</a>
104104
</div>
@@ -118,19 +118,19 @@
118118
<div class="l-unit">
119119
<div class="l-unit__col l-unit__col--right">
120120
<div class="clearfix l-unit__stat-col--left super-compact">
121-
<input id="check3<?=$i?>" class="ch-toggle" type="checkbox" name="dns[]" value="<?=$key?>">
121+
<input id="check3<?= $i ?>" class="ch-toggle" type="checkbox" name="dns[]" value="<?= $key ?>">
122122
</div>
123123
<div class="clearfix l-unit__stat-col--left compact-4">
124124
<div class="l-unit__stat-col l-unit__stat-col--left"><?= _("DNS domain") ?></div>
125125
</div>
126126
<div class="clearfix l-unit__stat-col--left wide-7">
127-
<div class="l-unit__stat-col l-unit__stat-col--left wide-7"><b><?=$key?></b></div>
127+
<div class="l-unit__stat-col l-unit__stat-col--left wide-7"><b><?= $key ?></b></div>
128128
</div>
129129
<div class="clearfix l-unit__stat-col--left compact-4 u-text-right">
130130
<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
131131
<div class="actions-panel clearfix">
132132
<div class="actions-panel__col actions-panel__list shortcut-enter" key-action="href">
133-
<a href="/schedule/restore/?backup=<?=$backup?>&type=dns&object=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Restore") ?>">
133+
<a href="/schedule/restore/?backup=<?= $backup ?>&type=dns&object=<?= $key ?>&token=<?= $_SESSION["token"] ?>" title="<?= _("Restore") ?>">
134134
<i class="fas fa-arrow-rotate-left icon-green icon-dim"></i>
135135
</a>
136136
</div>
@@ -150,19 +150,19 @@
150150
<div class="l-unit">
151151
<div class="l-unit__col l-unit__col--right">
152152
<div class="clearfix l-unit__stat-col--left super-compact">
153-
<input id="check4<?=$i?>" class="ch-toggle" type="checkbox" name="db[]" value="<?=$key?>">
153+
<input id="check4<?= $i ?>" class="ch-toggle" type="checkbox" name="db[]" value="<?= $key ?>">
154154
</div>
155155
<div class="clearfix l-unit__stat-col--left compact-4">
156156
<div class="l-unit__stat-col l-unit__stat-col--left"><?= _("Database") ?></div>
157157
</div>
158158
<div class="clearfix l-unit__stat-col--left wide-7">
159-
<div class="l-unit__stat-col l-unit__stat-col--left wide-7"><b><?=$key?></b></div>
159+
<div class="l-unit__stat-col l-unit__stat-col--left wide-7"><b><?= $key ?></b></div>
160160
</div>
161161
<div class="clearfix l-unit__stat-col--left compact-4 u-text-right">
162162
<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
163163
<div class="actions-panel clearfix">
164164
<div class="actions-panel__col actions-panel__list shortcut-enter" key-action="href">
165-
<a href="/schedule/restore/?backup=<?=$backup?>&type=db&object=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Restore") ?>">
165+
<a href="/schedule/restore/?backup=<?= $backup ?>&type=db&object=<?= $key ?>&token=<?= $_SESSION["token"] ?>" title="<?= _("Restore") ?>">
166166
<i class="fas fa-arrow-rotate-left icon-green icon-dim"></i>
167167
</a>
168168
</div>
@@ -211,19 +211,19 @@
211211
<div class="l-unit">
212212
<div class="l-unit__col l-unit__col--right">
213213
<div class="clearfix l-unit__stat-col--left super-compact">
214-
<input id="check6<?=$i?>" class="ch-toggle" type="checkbox" name="udir[]" value="<?=$key?>">
214+
<input id="check6<?= $i ?>" class="ch-toggle" type="checkbox" name="udir[]" value="<?= $key ?>">
215215
</div>
216216
<div class="clearfix l-unit__stat-col--left compact-4">
217217
<div class="l-unit__stat-col l-unit__stat-col--left"><?= _("user dir") ?></div>
218218
</div>
219219
<div class="clearfix l-unit__stat-col--left wide-7">
220-
<div class="l-unit__stat-col l-unit__stat-col--left wide-7"><b><?=$key?></b></div>
220+
<div class="l-unit__stat-col l-unit__stat-col--left wide-7"><b><?= $key ?></b></div>
221221
</div>
222222
<div class="clearfix l-unit__stat-col--left compact-4 u-text-right">
223223
<div class="l-unit-toolbar__col l-unit-toolbar__col--right u-noselect">
224224
<div class="actions-panel clearfix">
225225
<div class="actions-panel__col actions-panel__list shortcut-enter" key-action="href">
226-
<a href="/schedule/restore/?backup=<?=$backup?>&type=udir&object=<?=$key?>&token=<?=$_SESSION['token']?>" title="<?= _("Restore") ?>">
226+
<a href="/schedule/restore/?backup=<?= $backup ?>&type=udir&object=<?= $key ?>&token=<?= $_SESSION["token"] ?>" title="<?= _("Restore") ?>">
227227
<i class="fas fa-arrow-rotate-left icon-green icon-dim"></i>
228228
</a>
229229
</div>
@@ -238,7 +238,7 @@
238238
<footer class="app-footer">
239239
<div class="container app-footer-inner">
240240
<p>
241-
<?php printf(ngettext('%d item', '%d items', $i),$i); ?>
241+
<?php printf(ngettext("%d item", "%d items", $i), $i); ?>
242242
</p>
243243
</div>
244244
</footer>

0 commit comments

Comments
 (0)