Преглед изворни кода

Fix "generate password" on Add/Edit Mail Account (#3142)

Alec Rust пре 3 година
родитељ
комит
b4dc9bb0cf

+ 1 - 1
web/js/pages/add_db.js

@@ -102,7 +102,7 @@ App.Listeners.DB.keypress_v_password();
 App.Listeners.DB.keypress_db_username();
 App.Listeners.DB.keypress_db_username();
 App.Listeners.DB.keypress_db_databasename();
 App.Listeners.DB.keypress_db_databasename();
 
 
-applyRandomString = function (min_length = 16) {
+applyRandomPassword = function (min_length = 16) {
 	$('input[name=v_password]').val(randomString(min_length));
 	$('input[name=v_password]').val(randomString(min_length));
 	App.Actions.DB.update_password_meter();
 	App.Actions.DB.update_password_meter();
 };
 };

+ 5 - 5
web/js/pages/add_mail_acc.js

@@ -109,12 +109,12 @@ App.Listeners.MAIL_ACC.keypress_v_password = function () {
 
 
 App.Listeners.MAIL_ACC.keypress_v_password();
 App.Listeners.MAIL_ACC.keypress_v_password();
 
 
-applyRandomString = function (min_length = 16) {
-	var randomString = randomString(min_length);
-	$('input[name=v_password]').val(randomString);
+applyRandomPassword = function (min_length = 16) {
+	var randomPassword = randomString(min_length);
+	$('input[name=v_password]').val(randomPassword);
 	if ($('input[name=v_password]').attr('type') == 'text')
 	if ($('input[name=v_password]').attr('type') == 'text')
-		$('.js-password-output').text(randomString);
-	else $('.js-password-output').text(Array(randomString.length + 1).join('*'));
+		$('.js-password-output').text(randomPassword);
+	else $('.js-password-output').text(Array(randomPassword.length + 1).join('*'));
 	App.Actions.MAIL_ACC.update_password_meter();
 	App.Actions.MAIL_ACC.update_password_meter();
 	generate_mail_credentials();
 	generate_mail_credentials();
 };
 };

+ 1 - 1
web/js/pages/add_user.js

@@ -13,7 +13,7 @@ $(function () {
 	});
 	});
 });
 });
 
 
-applyRandomString = function (min_length = 16) {
+applyRandomPassword = function (min_length = 16) {
 	$('input[name=v_password]').val(randomString(min_length));
 	$('input[name=v_password]').val(randomString(min_length));
 	App.Actions.WEB.update_password_meter();
 	App.Actions.WEB.update_password_meter();
 };
 };

+ 1 - 1
web/js/pages/edit_db.js

@@ -109,7 +109,7 @@ App.Listeners.DB.keypress_v_password();
 App.Listeners.DB.keypress_db_username();
 App.Listeners.DB.keypress_db_username();
 App.Listeners.DB.keypress_db_databasename();
 App.Listeners.DB.keypress_db_databasename();
 
 
-applyRandomString = function (min_length = 16) {
+applyRandomPassword = function (min_length = 16) {
 	$('input[name=v_password]').val(randomString(min_length));
 	$('input[name=v_password]').val(randomString(min_length));
 	App.Actions.DB.update_password_meter();
 	App.Actions.DB.update_password_meter();
 };
 };

+ 5 - 5
web/js/pages/edit_mail_acc.js

@@ -100,12 +100,12 @@ $('#v_blackhole').on('click', function (evt) {
 
 
 App.Listeners.MAIL_ACC.keypress_v_password();
 App.Listeners.MAIL_ACC.keypress_v_password();
 
 
-applyRandomString = function (min_length = 16) {
-	var randomString = randomString(min_length);
-	$('input[name=v_password]').val(randomString);
+applyRandomPassword = function (min_length = 16) {
+	var randomPassword = randomString(min_length);
+	$('input[name=v_password]').val(randomPassword);
 	if ($('input[name=v_password]').attr('type') == 'text')
 	if ($('input[name=v_password]').attr('type') == 'text')
-		$('.js-password-output').text(randomString);
-	else $('.js-password-output').text(Array(randomString.length + 1).join('*'));
+		$('.js-password-output').text(randomPassword);
+	else $('.js-password-output').text(Array(randomPassword.length + 1).join('*'));
 	App.Actions.MAIL_ACC.update_password_meter();
 	App.Actions.MAIL_ACC.update_password_meter();
 	generate_mail_credentials();
 	generate_mail_credentials();
 };
 };

+ 1 - 1
web/js/pages/edit_user.js

@@ -1,4 +1,4 @@
-function applyRandomString(min_length = 16) {
+function applyRandomPassword(min_length = 16) {
 	document.querySelector('input[name=v_password]').value = randomString(min_length);
 	document.querySelector('input[name=v_password]').value = randomString(min_length);
 	App.Actions.WEB.update_password_meter();
 	App.Actions.WEB.update_password_meter();
 }
 }

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

@@ -75,7 +75,7 @@
 				<div class="u-mb10">
 				<div class="u-mb10">
 					<label for="v_password" class="form-label">
 					<label for="v_password" class="form-label">
 						<?= _("Password") ?>
 						<?= _("Password") ?>
-						<a href="javascript:applyRandomString();" title="<?= _("generate") ?>" class="u-ml5"><i class="fas fa-arrows-rotate status-icon green icon-large"></i></a>
+						<a href="javascript:applyRandomPassword();" title="<?= _("generate") ?>" class="u-ml5"><i class="fas fa-arrows-rotate status-icon green icon-large"></i></a>
 					</label>
 					</label>
 					<div class="u-pos-relative u-mb10">
 					<div class="u-pos-relative u-mb10">
 						<input type="text" class="form-control js-password-input" name="v_password" id="v_password">
 						<input type="text" class="form-control js-password-input" name="v_password" id="v_password">

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

@@ -45,7 +45,7 @@
 					<div class="u-mb10">
 					<div class="u-mb10">
 						<label for="v_password" class="form-label">
 						<label for="v_password" class="form-label">
 							<?= _("Password") ?>
 							<?= _("Password") ?>
-							<a href="javascript:applyRandomString();" title="<?= _("generate") ?>" class="u-ml5"><i class="fas fa-arrows-rotate status-icon green icon-large"></i></a>
+							<a href="javascript:applyRandomPassword();" title="<?= _("generate") ?>" class="u-ml5"><i class="fas fa-arrows-rotate status-icon green icon-large"></i></a>
 						</label>
 						</label>
 						<div class="u-pos-relative u-mb10">
 						<div class="u-pos-relative u-mb10">
 							<input type="text" class="form-control js-password-input" name="v_password" id="v_password">
 							<input type="text" class="form-control js-password-input" name="v_password" id="v_password">

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

@@ -46,7 +46,7 @@
 			<div class="u-mb10">
 			<div class="u-mb10">
 				<label for="v_password" class="form-label">
 				<label for="v_password" class="form-label">
 					<?= _("Password") ?>
 					<?= _("Password") ?>
-					<a href="javascript:applyRandomString();" title="<?= _("generate") ?>" class="u-ml5"><i class="fas fa-arrows-rotate status-icon green icon-large"></i></a>
+					<a href="javascript:applyRandomPassword();" title="<?= _("generate") ?>" class="u-ml5"><i class="fas fa-arrows-rotate status-icon green icon-large"></i></a>
 				</label>
 				</label>
 				<div class="u-pos-relative u-mb10">
 				<div class="u-pos-relative u-mb10">
 					<input type="text" class="form-control js-password-input" name="v_password" id="v_password" value="<?= htmlentities(trim($v_password, "'")) ?>" tabindex="4">
 					<input type="text" class="form-control js-password-input" name="v_password" id="v_password" value="<?= htmlentities(trim($v_password, "'")) ?>" tabindex="4">

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

@@ -40,7 +40,7 @@
 			<div class="u-mb10">
 			<div class="u-mb10">
 				<label for="v_password" class="form-label">
 				<label for="v_password" class="form-label">
 					<?= _("Password") ?>
 					<?= _("Password") ?>
-					<a href="javascript:applyRandomString();" title="<?= _("generate") ?>" class="u-ml5"><i class="fas fa-arrows-rotate status-icon green icon-large"></i></a>
+					<a href="javascript:applyRandomPassword();" title="<?= _("generate") ?>" class="u-ml5"><i class="fas fa-arrows-rotate status-icon green icon-large"></i></a>
 				</label>
 				</label>
 				<div class="u-pos-relative u-mb10">
 				<div class="u-pos-relative u-mb10">
 					<input type="text" class="form-control js-password-input" name="v_password" id="v_password" value="<?= htmlentities(trim($v_password, "'")) ?>">
 					<input type="text" class="form-control js-password-input" name="v_password" id="v_password" value="<?= htmlentities(trim($v_password, "'")) ?>">

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

@@ -43,7 +43,7 @@
 					<div class="u-mb10">
 					<div class="u-mb10">
 						<label for="v_password" class="form-label">
 						<label for="v_password" class="form-label">
 							<?= _("Password") ?>
 							<?= _("Password") ?>
-							<a href="javascript:applyRandomString();" title="<?= _("generate") ?>" class="u-ml5"><i class="fas fa-arrows-rotate status-icon green icon-large"></i></a>
+							<a href="javascript:applyRandomPassword();" title="<?= _("generate") ?>" class="u-ml5"><i class="fas fa-arrows-rotate status-icon green icon-large"></i></a>
 						</label>
 						</label>
 						<div class="u-pos-relative u-mb10">
 						<div class="u-pos-relative u-mb10">
 							<input type="text" class="form-control js-password-input" name="v_password" id="v_password" value="<?= htmlentities(trim($v_password, "'")) ?>">
 							<input type="text" class="form-control js-password-input" name="v_password" id="v_password" value="<?= htmlentities(trim($v_password, "'")) ?>">

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

@@ -97,7 +97,7 @@
 			<div class="u-mb10">
 			<div class="u-mb10">
 				<label for="v_password" class="form-label">
 				<label for="v_password" class="form-label">
 					<?= _("Password") ?>
 					<?= _("Password") ?>
-					<a href="javascript:applyRandomString();" title="<?= _("generate") ?>" class="u-ml5"><i class="fas fa-arrows-rotate status-icon green icon-large"></i></a>
+					<a href="javascript:applyRandomPassword();" title="<?= _("generate") ?>" class="u-ml5"><i class="fas fa-arrows-rotate status-icon green icon-large"></i></a>
 				</label>
 				</label>
 				<div class="u-pos-relative u-mb10">
 				<div class="u-pos-relative u-mb10">
 					<input type="text" class="form-control js-password-input" name="v_password" id="v_password" value="<?= htmlentities(trim($v_password, "'")) ?>">
 					<input type="text" class="form-control js-password-input" name="v_password" id="v_password" value="<?= htmlentities(trim($v_password, "'")) ?>">