---
.../prog/en/modules/members/member-password.tmpl | 6 +++---
.../prog/en/modules/members/memberentrygen.tmpl | 2 +-
members/member-password.pl | 2 +-
members/memberentry.pl | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl
index 1d51ef8..cdd852d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl
@@ -26,13 +26,13 @@
<input type="hidden" name="borrowernumber" id="borrowernumber" value="<!--
TMPL_VAR NAME="borrowernumber" -->" />
<!-- TMPL_IF NAME="errormsg" -->
<!-- TMPL_IF NAME="BADUSERID" -->
- <p class="warning">You have entered a User ID that already
exists. Please choose another one.</p>
+ <div class="dialog alert">You have entered a User ID that
already exists. Please choose another one.</div>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="SHORTPASSWORD" -->
- <p class="warning">The Password entered is too short.</p>
+ <div class="dialog alert"><strong>The password entered is too
short</strong>. Password must be at least <!-- TMPL_VAR
NAME="minPasswordLength" --> characters.</div>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="NOPERMISSION" -->
- <p class="warning">You do not have permission to edit this
member's login information.</p>
+ <div class="dialog alert">You do not have permission to edit
this patron's login information.</div>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
index 60f3b95..90140ae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -828,7 +828,7 @@
<!-- /TMPL_IF -->
<!--/TMPL_IF-->
<!--/TMPL_IF-->
- <!-- TMPL_IF NAME="mandatorypassword" --><span
class="required">Required</span><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="mandatorypassword" --><span
class="required">Required</span><!-- /TMPL_IF --><!-- TMPL_IF
NAME="ERROR_short_password" --><span class="required">Password is too
short</span><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="minPasswordLength" --><div class="hint">Minimum password
length: <!-- TMPL_VAR NAME="minPasswordLength" --></div><!-- /TMPL_IF -->
</li></ol>
</fieldset>
diff --git a/members/member-password.pl b/members/member-password.pl
index 4845a06..f18db80 100755
--- a/members/member-password.pl
+++ b/members/member-password.pl
@@ -45,7 +45,7 @@ if(( $member ne $loggedinuser ) && ($bor->{'category_type'}
eq 'S' ) ) {
}
my $newpassword = $input->param('newpassword');
my $minpw = C4::Context->preference('minPasswordLength');
-$errormsg = 'SHORTPASSWORD' if( $newpassword && $minpw & (length($newpassword)
< $minpw ) );
+$errormsg = 'SHORTPASSWORD' if( $newpassword && $minpw &&
(length($newpassword) < $minpw ) );
if ( $newpassword && ! $errormsg ) {
my $digest=md5_base64($input->param('newpassword'));
diff --git a/members/memberentry.pl b/members/memberentry.pl
index 16fde6f..a1a3f7f 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -217,7 +217,7 @@ if ($op eq 'save' || $op eq 'insert'){
}
my $password = $input->param('password');
- push @errors, "ERROR_short_password" if( $password && $minpw &
(length($password) < $minpw ) );
+ push @errors, "ERROR_short_password" if( $password && $minpw &&
(length($password) < $minpw ) );
if (C4::Context->preference('ExtendedPatronAttributes')) {
$extended_patron_attributes = parse_extended_patron_attributes($input);
--
1.5.5.GIT
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha.org/mailman/listinfo/koha-patches
