Skip to content

Commit

Permalink
2.1.27
Browse files Browse the repository at this point in the history
Fix for #2408, #2326
  • Loading branch information
nilsteampassnet authored and nilsteampassnet committed Sep 9, 2018
1 parent 06b9e82 commit fb40197
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
1 change: 1 addition & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
2.1.27
22/
#2408 Password complexity not enforced
#2326 link copy doesn't work corectly

21/
Expand Down
10 changes: 7 additions & 3 deletions items.load.php
Original file line number Diff line number Diff line change
Expand Up @@ -979,6 +979,9 @@ function EditerItem()
url = "https://"+url;
}

// Get complexity respected?
var complexityIsOk = parseInt($("#edit_mypassword_complex").val()) >= parseInt($("#complexite_groupe").val()) ? true : false;

// do checks
if ($('#edit_label').val() == "") erreur = "<?php echo addslashes($LANG['error_label']); ?>";
else if ($("#edit_pw1").val() === "" && $("#create_item_without_password").val() !== "1") erreur = "<?php echo addslashes($LANG['error_pw']); ?>";
Expand All @@ -989,15 +992,16 @@ function EditerItem()
//Check pw complexity level
if ((
$("#bloquer_modification_complexite").val() == 0 &&
parseInt($("#edit_mypassword_complex").val()) >= parseInt($("#complexite_groupe").val())
complexityIsOk === true
)
||
($("#bloquer_modification_complexite").val() == 1)
||
($('#recherche_group_pf').val() == 1 && $('#personal_sk_set').val() == 1)
||
($("#create_item_without_password").val() === "1" && $("#pw1").val !== "")
) {
($("#create_item_without_password").val() === "1" && $("#pw1").val !== "" && ($("#edit_pw1").val() === '' || complexityIsOk === true))
) {

LoadingPage(); //afficher image de chargement
var annonce = 0;
if ($('#edit_annonce').attr('checked')) annonce = 1;
Expand Down
3 changes: 1 addition & 2 deletions load.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<link rel="stylesheet" href="includes/js/select2/css/select2.min.css" type="text/css" />
<script type="text/javascript" src="includes/js/select2/js/select2.full.min.js"></script>
<script type="text/javascript" src="includes/js/platform/platform.js"></script>
<script type="text/javascript" src="includes/js/clipboard/clipboard.min.js"></script>
<script type="text/javascript" src="includes/libraries/Authentication/agses/agses.jquery.js"></script>
<link rel="stylesheet" href="includes/libraries/Authentication/agses/agses.css" type="text/css" />
Expand All @@ -69,7 +69,6 @@
<link rel="stylesheet" type="text/css" href="includes/js/multiselect/jquery.multiselect.filter.css" />
<script type="text/javascript" src="includes/js/multiselect/jquery.multiselect.filter.js"></script>
<script type="text/javascript" src="includes/js/tinysort/jquery.tinysort.min.js"></script>
<script type="text/javascript" src="includes/js/clipboard/clipboard.min.js"></script>
<script type="text/javascript" src="includes/js/verimail/verimail.min.js"></script>
<!--
<link rel="stylesheet" href="includes/bootstrap/css/bootstrap.min.css" />
Expand Down

0 comments on commit fb40197

Please sign in to comment.