Просмотр исходного кода

Fix package in user listing, plus 2FA and IP restriction (#3312)

* Fix 2fa and ip list for users

* Fix system package in user list
Jakob Bouchard 3 лет назад
Родитель
Сommit
4fff6c7d97
2 измененных файлов с 3 добавлено и 3 удалено
  1. 2 2
      web/templates/pages/edit_user.php
  2. 1 1
      web/templates/pages/list_user.php

+ 2 - 2
web/templates/pages/edit_user.php

@@ -121,7 +121,7 @@
 						</label>
 					</div>
 				<?php } ?>
-				<div x-cloak x-show="loginDisabled" id="password-options">
+				<div x-cloak x-show="!loginDisabled" id="password-options">
 					<div class="form-check u-mt15">
 						<input class="form-check-input" type="checkbox" name="v_twofa" id="v_twofa" <?php if(!empty($v_twofa)) echo 'checked' ?>>
 						<label for="v_twofa">
@@ -134,7 +134,7 @@
 						<div><img class="qr-code" src="<?= htmlentities($v_qrcode) ?>" alt=""></div>
 					<?php } ?>
 				</div>
-				<div x-cloak x-show="loginDisabled" id="password-options-ip">
+				<div x-cloak x-show="!loginDisabled" id="password-options-ip">
 					<div class="form-check">
 						<input x-model="useIpAllowList" class="form-check-input" type="checkbox" name="v_login_use_iplist" id="v_login_use_iplist">
 						<label for="v_login_use_iplist">

+ 1 - 1
web/templates/pages/list_user.php

@@ -157,7 +157,7 @@
 				<!-- END QUICK ACTION TOOLBAR AREA -->
 				<div class="clearfix l-unit__stat-col--left u-text-center">
 					<b>
-						<?php if ($data[$key]["PACKAGE"] === "default") { ?>
+						<?php if ($data[$key]["PACKAGE"] === "system") { ?>
 							<?= $data[$key]["PACKAGE"] ?>
 						<?php } else { ?>
 							<a href="/edit/package/?package=<?= $data[$key]["PACKAGE"] ?>&token=<?= $_SESSION["token"] ?>" title="<?= _("Edit Package") ?>"><?= $data[$key]["PACKAGE"] ?></a>